Skip to content

chore(fork): merge upstream 701e13ceb into atli - #49

Merged
gabynevada merged 746 commits into
atlifrom
update/upstream-701e13ceb
Nov 2, 2026
Merged

gabynevada merged 746 commits into
atlifrom
update/upstream-701e13ceb

Conversation

@gabynevada

Copy link
Copy Markdown

Brings atli up to date with upstream pingdotgg/t3code main: 745 commits, 32ecd71726..701e13ceb.

Notable upstream changes

  • Managed policy: organization-wide T3 Code configuration, including update policy (off / stable-only), now enforced by t3 update and the self-updater.
  • Threads: tags, with tagged threads hidden while recording; side chats beside the main thread; pinned favorite projects and archived old ones; model/effort switches shown in the thread; child approvals surfaced in parent threads.
  • Scheduler: run a scheduled task once at a specific date and time.
  • MCP: link_pull_requests / bulk unlink; preview_open goes straight to a dev-server port; Claude MCP elicitations on the approval card.
  • Web: one control to pick model and effort; context meter shows tokens against the limit; Usage filtered by provider and model; copy app version from settings.
  • CLI/desktop: t3 up asks how other devices reach the machine; short commands like t3 --version no longer load the whole server; the Intel Mac installer exits with a clear error; desktop prepares a server bytecode cache in native builds.
  • Providers: Antigravity runtime 1.4.5; many ACP, OpenCode, Claude, Codex, Cursor, Pi, and Grok fixes.
  • Performance: about 50 perf commits across server reads, git status, ACP terminal output, and web re-render isolation.
  • About 560 fix commits across web (192), server (152), mobile (65), desktop (33), and the rest.

Conflict resolutions

27 files conflicted. The main decisions:

  • Claude MCP elicitation: upstream added its own approval-card handler that duplicated the fork's form-capable one (feat: show MCP elicitation forms instead of declining them #39). Kept the fork's handler and removed upstream's duplicate along with its tests. Kept upstream's broader one-time choice spellings (allow_this_time, allow_once_only) in both the Claude and Codex matchers, and its rule that elicitation cards have no feedback field.
  • Runtime instructions: combined the fork's PR-watch-off variant with upstream's session-invariant PULL_REQUEST_LINKING_INSTRUCTIONS and the new pullRequestLinking flag. OpenCode now keeps the watch flag on the turn, since upstream builds the system prompt per prompt.
  • Draft run-stop loading: upstream's threadDetailRef fix replaces the fork's equivalent fix (fix(web): new worktree conversations no longer stay empty #47) and its test.
  • Self-update / install.sh: kept the fork's 5-minute staged preflight timeout and admission checks. Added upstream's managed-policy refusal and launcher recording.
  • check:changed: kept the fork's NUL-safe gitPaths. Took upstream's closest-remote merge base and its node --test split.
  • Background work label: upstream's Waiting · <label> format, with the fork's always-waiting state.
  • Fixed fork tests broken by upstream API changes (ManagedPolicy, BootService.stop, repointLauncher({ baseDir })) and refreshed agentContextBudget.json. The fork's tool-list overhead is the same +121 bytes as before.

Verification

  • Typecheck passes for server, web, mobile, desktop, marketing, contracts, shared, client-runtime, and the provider and source-control packages.
  • Focused tests pass for all conflicted and adjusted files, including the Claude/Codex adapters, Orchestrator, MCP service, runtimeLayer, update/selfUpdate/recover/up, scheduled tasks, threadExecution, runtimeInstructions, check-changed, OpenCode and ACP, and the web sidebar, route, and lifecycle tests.
  • The pre-commit fmt, lint, and knip checks pass.

After merging, run the workflow-disable step from docs/operations/fork-server.md. This update adds no new upstream workflows, but it's a quick check.

🤖 Generated with Claude Code

voltcrash and others added 30 commits November 1, 2026 02:37
…he server attached (pingdotgg#27456)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…rly 404 (pingdotgg#27722)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…branch named t3 exists (pingdotgg#27815)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…n alias (pingdotgg#27859)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Omar <76748259+omar9848492@users.noreply.github.com>
…s hanging (pingdotgg#27924)

Co-authored-by: Trevor Edwards <9443483+trevoedwards@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#27990)

Co-authored-by: Claude Code (claude-opus-5-5) <claude-code@logueos.local>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…T3 runs (pingdotgg#28064)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…op (pingdotgg#28072)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
only21mil and others added 24 commits November 2, 2026 09:20
…r Escape (pingdotgg#28298)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e Mode (pingdotgg#29026)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ct (pingdotgg#29068)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…is slow on a loaded host (pingdotgg#28201)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… reseller marks them up (pingdotgg#28004)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er update (pingdotgg#27992)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…28995)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… work (pingdotgg#28629)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29053)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…server (pingdotgg#29127)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Completion alerts waited two seconds after the client received a completed thread state. Audio was also fetched and decoded only when an alert needed to play, adding a first-play delay.

Notify immediately when the thread shell reports completion, and preload both sounds when a user gesture unlocks audio. Keep completion deduplication and suppression for existing, archived, and stopped runs.

This intentionally removes the continuation grace for completion alerts. A completed run can now notify before an automatic continuation starts. The sidebar's two-second placement grace and server settlement behavior remain in place.

Validation: `vp run check:changed` passes after merging current main, including 40 affected tests, formatting, lint, unused-code checks, affected typechecks, and React compiler checks. Tests cover immediate completion, duplicate suppression across reconnects, preloaded audio reuse, and retrying failed loads on alerts without retrying on every gesture. Audible timing has not been verified in a live client.

Model: GPT 6.1 Sol. Harness: Codex through T3 Code.
…unched T3 (pingdotgg#29169)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merges 745 upstream commits from pingdotgg/t3code main (32ecd71..701e13c).

Conflict resolutions:
- Claude MCP elicitation: upstream added its own approval-card handler; keep
  the fork's form-capable handler and drop upstream's duplicate, adopting its
  broader one-time choice spellings and no-feedback card for elicitations.
- Runtime instructions: keep the fork's watch-off variant alongside upstream's
  session-invariant PULL_REQUEST_LINKING_INSTRUCTIONS and pullRequestLinking.
- OpenCode: carry the fork's pull request watch flag on the turn now that
  upstream builds the system prompt per prompt.
- Draft run-stop loading: take upstream's threadDetailRef fix over the fork's.
- Self-update: keep the fork's staged preflight timeout; add upstream's
  managed update policy and launcher recording.
- check:changed: keep NUL-safe gitPaths; take upstream's merge-base and test split.
- Background work label: upstream "Waiting · <label>" with the fork's always-waiting state.
- Update fork tests for upstream's ManagedPolicy, BootService.stop and
  repointLauncher(baseDir) changes; refresh agentContextBudget.json.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@atli-skald

atli-skald Bot commented Nov 2, 2026

Copy link
Copy Markdown

Skald review status

Skald: review ready (success) at review state version 11, head 92b68f74ca2f29b60c99a5fcfcffccd02b0a127c.

Blocking

Nothing is holding this pull request open.

Cleared

Nothing is cleared at this epoch.

Blocking: 0. Advisory: 0. Cleared: 0. Fenced: 0.
Response required: 0.

Review rounds
  • 92b68f74ca2f29b60c99a5fcfcffccd02b0a127c

@atli-skald atli-skald Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skald review is clean

Reviewed head 92b68f74ca2f29b60c99a5fcfcffccd02b0a127c against base atli (8a850f51bcb8e4c5c005b1053407869ebfaf3071).

First round

Standing summary: open

Review details

Completed reviewers:

  • architecture (hub-dispatch-v2:claude:claude-sonnet-5-5:medium:8ef92ce46d3e55c4)
  • frontend (hub-dispatch-v2:claude:claude-sonnet-5-5:medium:8ef92ce46d3e55c4)
  • security (hub-dispatch-v2:claude:claude-sonnet-5-5:medium:8ef92ce46d3e55c4)
  • testing (hub-dispatch-v2:claude:claude-sonnet-5-5:medium:8ef92ce46d3e55c4)

@gabynevada
gabynevada merged commit 9c56e72 into atli Nov 2, 2026
4 checks passed
gabynevada added a commit that referenced this pull request Nov 2, 2026
chore(fork): restore upstream ancestry lost in the #49 squash merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.