Skip to content

chore(sync): merge upstream v0.1.9 - #111

Merged
wianvdm merged 709 commits into
mainfrom
sync/upstream-v0.1.9
Nov 15, 2026
Merged

wianvdm merged 709 commits into
mainfrom
sync/upstream-v0.1.9

Conversation

@wianvdm

@wianvdm wianvdm commented Nov 15, 2026

Copy link
Copy Markdown
Owner

Traceability

Closes #110

Upstream sync to stable v0.1.9 (24e77473ec), made with scripts/upstream-sync.ts prepare/verify/finish. Merge with a merge commit, never squash. The head is the exact two-parent merge (8ee05a30f1, 24e77473ec).

Problem

The fork last merged upstream at v0.1.7-nightly.20261104.4151 (322f6544df). This brings in upstream stable v0.1.9 (708 commits) on top of the thin-layer cleanups (#101 to #109).

Change

53 conflicting paths resolved per plusplus/ARCHITECTURE.md (full log in the PR comments below once posted):

  • Seams re-applied on upstream's new text: context-bridge.claude-status-skills (ClaudeProvider.ts), context-bridge.settings-schemas (contracts/settings.ts), context-bridge.pi-materialize (upstream's atomic stage-and-rename now writes the per-session source), usage-vendor-icons.import (UsagePage.tsx), plusplus-workspace.knip-workspace (anchor moved to scripts.knip:check:exports).
  • Convergent fork fixes dropped in favour of upstream's: jsonPathFragment in ClaudeAdapterV2.test.ts, the empty-git-config fix in check-changed.test.ts.
  • Legacy files: upstream taken with the fork's intent re-applied (CI workflow and routing, install scripts, adapters, server and web files listed in the log). Where the fork had relocated an upstream body into ++ code, upstream's change is carried into the ++ copy (Gemini Carbon family, Bedrock price alias, runtime file-link sentence, plan-mode removal); retainPublishedUsageAccounts is split out so managedProvider.ts takes upstream's probe logic verbatim with one ++ call.
  • Deleted by the fork, kept deleted: .macroscope/ignore.md, provider-muse/usageLimits.test.ts (upstream's new museUsageToLimits test goes with it). Upstream's own deletions taken: WelcomeWizard.tsx, welcome-wizard.md.
  • Generated: agentContextBudget.json remeasured; pnpm-lock.yaml rebuilt from upstream's lockfile plus the two ++ workspaces.
  • Registry refresh (by verify): upstreamRef 322f6544df -> 24e77473ec, fingerprints and deltas refreshed, six entries dropped (now equal to upstream or gone), one plusplus/sync-history.json entry for v0.1.9 (53 conflicts; features: context-bridge 3, generated, usage-vendor-icons, plusplus-workspace, contract-sidecar).

Semantic-conflict fixes in the merge commit (fork code adapting to v0.1.9; the sync PR head must be the merge commit, so they cannot follow separately):

  • ClaudeAdapterV2.test.ts (12 sites), CodexAdapterV2.test.ts (3): layerTestProviderHost added to upstream's new tests, because the fork's context bridge makes both adapters require ProviderHost.
  • ThreadHandoverService.test.ts (fork-only): stubs for SecretResolver and VcsStatusBroadcaster, now required by v0.1.9's runtime layer.
  • importOldFork.ts (fork-only, 6), CodexAdapterV2.ts:1902: Effect.try with an explicit catch, since v0.1.9 makes the catch-less form an error; same error as before.
  • mcp/toolkits/thread/handlers.ts: diagnostics directive renamed to v0.1.9's globalJsonInEffect.
  • apps/desktop/src/main.ts: fork's process.env read uses Config, as upstream's desktop code does.
  • scripts/upstream-sync.test.ts, .github/scripts/ci-changes.test.cjs: fork tests updated for v0.1.9's desktop_launch output and the 11-package desktop closure.

Compatibility

Shared Persistence Compat stays red: upstream's later change to shipped migration 026 is in v0.1.10 nightlies only, and the fork syncs stable tags; accepted until the next stable sync. The context budget grows with upstream's added context (the fork's +836 bytes over upstream is unchanged).

Verification

  • Every package typechecks (server, desktop, web, mobile, scripts, all 33 packages).
  • node --test .github/scripts/*.test.cjs: 229 passed. Focused vitest across plusplus, plusplus-extensions, provider-core/grok/muse, contracts, web usage, desktop, server context-bridge/pair/settings/storage and scripts pass; the remaining local failures are Windows-only (symlink EPERM, Node 22 vs 26, GNU tar on C: paths, Unix sockets) and reproduce on fork main. Linux CI decides.
  • Known follow-ups (not in this merge): importOldFork.ts passes the UnknownError wrapper to destinationReadError, so SQLITE_BUSY is never detected (pre-existing); plusplus/docs/release.md still says "seven-package Windows lane".

Model and harness: Claude Opus 5.5 (sync resolution, orchestration), via Claude Code in T3 Code.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits November 9, 2026 04:01
…d trip (pingdotgg#33306)

Cold thread opens use the bounded socket snapshot once and fall back to HTTP after any failure, defect, or dropped session. Connects reuse a descriptor a check just read, only over HTTPS, only on an id match, within 5 s. Per-frame socket deflate from pingdotgg#33172 was dropped because the iOS socket already negotiates permessage-deflate.

Continues pingdotgg#33172.

Co-authored-by: Bil0000 <62337003+Bil0000@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#25835)

Co-authored-by: Luca Lucidera <l.lucidera@dkr.srl>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28571)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…#28667)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ploads and terminal state (pingdotgg#29164)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…en its run starts (pingdotgg#29601)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… has one digit (pingdotgg#29851)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…3 ms median) (pingdotgg#30038)

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

Co-authored-by: Justin <159104807+Justin24506@users.noreply.github.com>
…n character (pingdotgg#30392)

Co-authored-by: maria-rcks <maria@kuuro.net>
pingdotgg#30812)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
only21mil and others added 11 commits November 11, 2026 00:08
…ents (pingdotgg#22553)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… base's PR (pingdotgg#22861)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#22996)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he binding changes (pingdotgg#32494)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@wianvdm wianvdm added the upstream-sync Protected sync designation: maintainers/triage only; forces full CI and merge validation. label Nov 15, 2026
@github-actions github-actions Bot added size:XXL seam Advisory: PR touches a fork/upstream integration seam. sync-conflict Advisory: PR touches fork-diverged files likely to conflict on upstream sync. labels Nov 15, 2026
@github-actions

github-actions Bot commented Nov 15, 2026 •

Copy link
Copy Markdown

Upstream sync hotspot report

Generated by the trusted sync-PR automation from validated dry-run data; the artifact's own Markdown is never republished.

  • Source: https://github.com/wianvdm/t3code/actions/runs/43728388362 (artifact upstream-sync-dry-run-report)
  • Upstream tag: v0.1.9
  • Fork base: 8677b8b80a6a69efef4fd9fa440eab0193123031
  • Upstream commit: 24e77473ecf41bc1f7142529c7911c1c1aae1d76
  • PR head (real merge): ca480686eea2f73177b48339f8a6ca26e4f831d6
  • Dry-run status: conflict

Real merge validation

  • Head parents: exactly two, 8677b8b80a6a69efef4fd9fa440eab0193123031 (current PR base) then 24e77473ecf41bc1f7142529c7911c1c1aae1d76 (v0.1.9).

  • Incoming paths and the ++ impact report were recomputed from the real merge and match the report.

  • The resolved tree may differ from the dry run (status: conflict); only a clean dry run with a refreshable registry pins the tree.

  • Incoming paths: 2705

Conflicts (53)

  • ".github/SECURITY.md" (stages 1, 2, 3)
  • ".github/scripts/check-nightly-release.test.cjs" (stages 1, 2, 3)
  • ".github/scripts/ci-changes.cjs" (stages 1, 2, 3)
  • ".github/workflows/ci.yml" (stages 1, 2, 3)
  • ".macroscope/ignore.md" (stages 1, 3)
  • "README.md" (stages 1, 2, 3)
  • "apps/desktop/src/app/DesktopUserData.test.ts" (stages 1, 2, 3)
  • "apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts" (stages 1, 2, 3)
  • "apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts" (stages 1, 2, 3)
  • "apps/server/src/persistence/DatabaseStorage.test.ts" (stages 1, 2, 3)
  • "apps/server/src/project/ProjectService.ts" (stages 1, 2, 3)
  • "apps/server/src/provider/ClaudeProvider.ts" (stages 1, 2, 3)
  • "apps/server/src/provider/Drivers/antigravityUsageReader.test.ts" (stages 1, 2, 3)
  • "apps/server/src/provider/Drivers/antigravityUsageReader.ts" (stages 1, 2, 3)
  • "apps/server/src/provider/agentContextBudget.json" (stages 1, 2, 3)
  • "apps/server/src/provider/antigravityUsageLimits.ts" (stages 1, 2, 3)
  • "apps/server/src/server.ts" (stages 1, 2, 3)
  • "apps/server/src/usage/usagePricing.test.ts" (stages 1, 2, 3)
  • "apps/server/src/usage/usagePricing.ts" (stages 1, 2, 3)
  • "apps/web/src/components/AppSidebarLayout.tsx" (stages 1, 2, 3)
  • "apps/web/src/components/chat/useComposerProviderModel.ts" (stages 1, 2, 3)
  • "apps/web/src/components/onboarding/WelcomeWizard.tsx" (stages 1, 2)
  • "apps/web/src/components/settings/SettingsPanels.tsx" (stages 1, 2, 3)
  • "apps/web/src/components/sidebar/SidebarUpdatePill.tsx" (stages 1, 2, 3)
  • "apps/web/src/components/usage/UsageLimitsPooled.tsx" (stages 1, 2, 3)
  • "apps/web/src/components/usage/UsagePage.tsx" (stages 1, 2, 3)
  • "docs/user/remote-access.md" (stages 1, 2, 3)
  • "docs/user/welcome-wizard.md" (stages 1, 2)
  • "evals/README.md" (stages 1, 2, 3)
  • "package.json" (stages 1, 2, 3)
  • "packages/contracts/src/settings.ts" (stages 1, 2, 3)
  • "packages/plusplus/src/museUsageLimits.test.ts" (stages 1, 2, 3)
  • "packages/provider-core/src/server/managedProvider.ts" (stages 1, 2, 3)
  • "packages/provider-core/src/server/runtimeInstructions.ts" (stages 1, 2, 3)
  • "packages/provider-cursor/src/server/adapter.ts" (stages 1, 2, 3)
  • "packages/provider-grok/src/server/usageLimits.ts" (stages 1, 2, 3)
  • "packages/provider-muse/src/server/usageLimits.ts" (stages 1, 2, 3)
  • "packages/provider-opencode/src/server/driver.ts" (stages 1, 2, 3)
  • "packages/provider-opencode/src/server/v2/adapter.ts" (stages 1, 2, 3)
  • "packages/provider-pi/src/server/adapter.ts" (stages 1, 2, 3)
  • "packages/provider-pi/src/server/mcpBridge.testkit.ts" (stages 1, 2, 3)
  • "packages/provider-pi/src/server/mcpExtensionSource.test.ts" (stages 1, 2, 3)
  • "packages/provider-pi/src/server/mcpExtensionSource.ts" (stages 1, 2, 3)
  • "packages/provider-pi/src/server/mcpInjection.ts" (stages 1, 2, 3)
  • "packages/shared/src/cliRelease.ts" (stages 1, 2, 3)
  • "packages/shared/src/orchestrationV2PendingBackgroundWork.ts" (stages 1, 2, 3)
  • "packages/source-control-github/src/server/driver.ts" (stages 1, 2, 3)
  • "scripts/build-desktop-artifact.test.ts" (stages 1, 2, 3)
  • "scripts/check-changed.test.ts" (stages 1, 2, 3)
  • "scripts/install.ps1" (stages 1, 2, 3)
  • "scripts/install.sh" (stages 1, 2, 3)
  • "scripts/install.test.ts" (stages 1, 2, 3)
  • "scripts/lib/server-compile-cache.test.ts" (stages 1, 2, 3)

++ impact

Registry ref 322f6544dfad0a3c8a0c8cbecf2c7f7874b14268 against 24e77473ecf41bc1f7142529c7911c1c1aae1d76.

context-bridge: Context bridge (#35)

Seam Path Mechanism or ++ file State Conflict
context-bridge.claude-import apps/server/src/provider/ClaudeProvider.ts hook same conflict
context-bridge.claude-probe-skills apps/server/src/provider/ClaudeProvider.ts override same conflict
context-bridge.claude-status-params apps/server/src/provider/ClaudeProvider.ts hook same conflict
context-bridge.claude-status-skills apps/server/src/provider/ClaudeProvider.ts override changed conflict
context-bridge.settings-schemas packages/contracts/src/settings.ts hook changed conflict
context-bridge.settings-field packages/contracts/src/settings.ts mount same conflict
context-bridge.settings-patch packages/contracts/src/settings.ts mount same conflict
context-bridge.pi-imports packages/provider-pi/src/server/mcpInjection.ts override same conflict
context-bridge.pi-node-crypto packages/provider-pi/src/server/mcpInjection.ts hook same conflict
context-bridge.pi-session-paths packages/provider-pi/src/server/mcpInjection.ts hook same conflict
context-bridge.pi-materialize packages/provider-pi/src/server/mcpInjection.ts override changed conflict
context-bridge.pi-launch packages/provider-pi/src/server/mcpInjection.ts hook same conflict
context-bridge.claude-status-skills: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -1,5 +1,5 @@
-  const probeFailure =
-    probeResult && Result.isFailure(probeResult) ? probeResult.failure : undefined;
+    claudeSettings.customModels,
+  );
   const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
   const slashCommands = [COMPACT_SLASH_COMMAND, ...(capabilities?.slashCommands ?? [])];
   const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
context-bridge.settings-schemas: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -1,4 +1,4 @@
-export type StorageCleanupSettings = typeof StorageCleanupSettings.Type;
+});
 
 export const ServerSettings = Schema.Struct({
   // Null means unmigrated; empty is authoritative and must not resurrect cleared preferences.
context-bridge.pi-materialize: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -6,7 +6,16 @@ export const materializePiT3McpExtension = Effect.fn("materializePiT3McpExtensio
   const dest = piT3McpExtensionDestPath(cacheDir);
   const existing = yield* fs.readFileString(dest).pipe(Effect.orElseSucceed(() => ""));
   if (existing !== PI_T3_MCP_EXTENSION_SOURCE) {
-    yield* fs.writeFileString(dest, PI_T3_MCP_EXTENSION_SOURCE);
+    // Concurrent pi launches read this file: stage it in a per-call directory
+    // and rename so readers and other writers never see a partial file.
+    yield* Effect.scoped(
+      Effect.gen(function* () {
+        const stagingDir = yield* fs.makeTempDirectoryScoped({ directory: cacheDir });
+        const staging = `${stagingDir.replace(/\\/g, "/")}/${PI_T3_MCP_EXTENSION_FILENAME}`;
+        yield* fs.writeFileString(staging, PI_T3_MCP_EXTENSION_SOURCE);
+        yield* fs.rename(staging, dest).pipe(Effect.retry({ times: 3 }));
+      }),
+    );
   }
   return dest;
 });

contract-sidecar: ++ contract sidecar (#80)

Seam Path Mechanism or ++ file State Conflict
contract-sidecar.settings packages/contracts/src/settings.ts mount same conflict
contract-sidecar.settings-patch packages/contracts/src/settings.ts mount same conflict

fork-cli: Fork CLI command names (#95)

Seam Path Mechanism or ++ file State Conflict
fork-cli.pair-protocol-hint-test apps/server/src/cli/pair.test.ts override same -
fork-cli.pair-protocol-hint apps/server/src/cli/pair.ts override same -

fork-docs: ++ install and FAQ pages (#92)

Seam Path Mechanism or ++ file State Conflict
fork-docs.faq-pointer docs/user/faq.md config same -
fork-docs.install-pointer docs/user/install.md config same -
fork-docs.install-command-line-pointer docs/user/install.md config same -
sibling docs/user/install.md plusplus/docs/install.md changed -
sibling docs/user/faq.md plusplus/docs/faq.md changed -
sibling docs/user/install.md: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -20,9 +20,12 @@ On Windows, in PowerShell:
 irm https://t3.codes/install.ps1 | iex
 ```
 
-This installs the `t3` binary to `~/.local/bin`. If your shell reports `command not found`
-afterwards, that directory is not on your `PATH` yet; the installer prints the
-line to add. Set `T3CODE_CHANNEL=nightly` to install the nightly train, or
+This installs the `t3` binary to `~/.local/bin`. If that folder is not on your
+`PATH` yet, the installer says so and, for zsh, bash on Linux, and fish, prints
+a command to add it. On Windows, `t3` works in the same PowerShell window right
+away; add the folder to your `PATH` for new windows. If a `t3` that the
+installer or the desktop app did not create is already there, it leaves that
+one alone and stops. Set `T3CODE_CHANNEL=nightly` to install the nightly train, or
 `T3CODE_VERSION` to pin an exact version.
 
 | Task                                             | Command                                                                 |
@@ -44,7 +47,11 @@ instead. Stop it before starting a replacement, or use a different `--base-dir`
 for an independent server.
 
 To try T3 Code once without installing it, run `npx t3@latest` instead (needs
-Node.js for `npx`).
+Node.js for `npx`). It offers to install the `t3` command first. If you say no,
+it asks again at the next minor release, and `npx t3 install` installs it later.
+`npx t3` always runs the version npm picked, even when a `t3` is installed. On
+the nightly train, run your installed `t3` (for example `t3 connect`), not
+`npx t3`, which runs the latest stable release.
 
 ### Intel Macs
 
@@ -75,10 +82,29 @@ or use a package manager:
 | Arch Linux nightly | `yay -S t3code-nightly-bin`                                  |
 | Nix                | `nix profile add github:NixOS/nixpkgs/nixos-unstable#t3code` |
 
+### Linux
+
+AppImage and `.deb` downloads are available for x86_64 and ARM64. Check your
+architecture with `uname -m`: for `x86_64`, choose a file ending in
+`x86_64.AppImage` or `amd64.deb`; for `aarch64`, choose `arm64.AppImage` or
+`arm64.deb`.
+
+To launch an AppImage, open a terminal in its download folder. Replace
+`T3-Code.AppImage` below with the exact filename you downloaded:
+
+```bash
+chmod +x ./T3-Code.AppImage
+./T3-Code.AppImage
+```
+
 The `.deb` updates itself like the other desktop builds. It asks for your
 password to install each update. If your desktop has no password prompt, the
 update fails. Download the new `.deb` and install it the same way.
 
+The AUR packages currently support x86_64 only; on ARM64, use the AppImage.
+Update AUR installs with your AUR helper, such as `yay -Syu`, instead of the
+in-app updater.
+
 ### Nix (nixpkgs)
 
 T3 Code is maintained in [nixpkgs](https://github.com/NixOS/nixpkgs/tree/nixos-unstable/pkgs/by-name/t3/t3code).
@@ -103,12 +129,14 @@ Nix manages both the desktop app and the bundled
 
 ### The `t3` command
 
-The desktop app includes the `t3` command-line tool. To run it from any
-terminal, open **Settings → About** and choose **Install** next to
-**t3 command**. On macOS and Linux it adds a `t3` link to a folder on your
-`PATH`; on Windows it adds the app's command folder to your `PATH`. Open a new
-terminal afterwards. **Remove** takes it off again. If you already have `t3`
-from npm, it stays as it is.
+The desktop app includes the `t3` command-line tool. A new install sets it up
+on first launch; after an update, or any time, choose **Install** next to
+**t3 command** in **Settings → About**. On macOS and Linux it adds a `t3` link
+in `~/.local/bin` (or `~/bin`); on Windows it adds the app's command folder to
+your `PATH`. Open a new terminal afterwards. If the folder is not on your
+`PATH`, **Add to PATH** on the Welcome page or in **Settings → About** adds one
+line to your shell's startup file. **Remove** takes it off, and the app does not
+add it again. If you already have another `t3`, it stays as it is.
 
 ### Windows Subsystem for Linux
 
… 21 more lines
sibling docs/user/faq.md: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -13,7 +13,7 @@ Bring your own: Claude Code, Codex, Cursor, Grok Build, OpenCode, Google Antigra
 We were inspired by the Codex desktop app, Conductor, Claude Desktop, and Cursor Glass, but none met our bar. What you get:
 
 - Bring your own sub. Claude, Codex, and whatever else you already have installed.
-- Best in class remote. Run `npx t3 up` on any box and drive it from anywhere.
+- Best in class remote. Run `t3 up` on any box and drive it from anywhere.
 - Best in class mobile app.
 - Truly 100% open source. If we go the wrong direction, fork it.
 
@@ -37,7 +37,7 @@ T3 Code drives Claude through Anthropic's Agent SDK. I confirmed it's a real bug
 
 ## How do I use T3 Code remotely?
 
-Your agents run wherever T3 Code runs: your desktop, a server, a VPS. You connect to it from anywhere. I do this constantly. Less than 5% of my prompts run on my laptop. Run `npx t3 up` on that machine and you get really good remote support. T3 Connect is the easy path. LAN pairing and Tailscale work too, and [app.t3.codes](https://app.t3.codes) is the web client. [Remote access](./remote-access.md)
+Your agents run wherever T3 Code runs: your desktop, a server, a VPS. You connect to it from anywhere. I do this constantly. Less than 5% of my prompts run on my laptop. Run `t3 up` on that machine and you get really good remote support. T3 Connect is the easy path. LAN pairing and Tailscale work too, and [app.t3.codes](https://app.t3.codes) is the web client. [Remote access](./remote-access.md)
 
 ## How do I use T3 Code on my phone?
 
@@ -73,11 +73,11 @@ No. Your code and prompts go from your machine to your provider (Anthropic, Open
 
 ## Worktrees are eating my disk. How do I clean them up?
 
-Open **Settings > Storage** and turn on automatic worktree cleanup. You can also run it now from there. Worktrees add up fast. One user cleared 500 GB. [Storage cleanup](./project-settings.md#storage-cleanup)
+Open **Settings → Worktrees → Cleanup** and turn on automatic worktree cleanup. You can also run it now from there. Worktrees add up fast. One user cleared 500 GB. [Storage cleanup](./project-settings.md#storage-cleanup)
 
 ## Is there voice input?
 
-On iPhone, yes. You need iOS 26 or later. Tap the mic in the composer, talk, check the text, then send. Web, desktop, and Android do not have it yet. [Voice input on iPhone](./composer.md#voice-input-on-iphone)
+Yes. On iPhone and Android, dictation uses on-device speech by default; you can opt in to a paired environment instead. Web and desktop require you to choose an environment first. The transcript goes into your draft for review. See [Voice input](./voice-input.md).
 
 ## Does it work on Windows, Mac, and Linux?
 

generated: Regenerated files

Seam Path Mechanism or ++ file State Conflict
generated.agent-context-budget apps/server/src/provider/agentContextBudget.json generated changed conflict
generated.agent-context-budget: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -1,5 +1,5 @@
 {
-  "claudeSystemAppendBytes": 5153,
-  "codexAdditionalContextBytes": 6883,
-  "mcpToolListJsonBytes": 47538
+  "claudeSystemAppendBytes": 5597,
+  "codexAdditionalContextBytes": 7327,
+  "mcpToolListJsonBytes": 48217
 }

plusplus-workspace: ++ workspace wiring (#30)

Seam Path Mechanism or ++ file State Conflict
plusplus-workspace.knip-workspace package.json config changed conflict
plusplus-workspace.boundary-script package.json config same conflict
plusplus-workspace.knip-workspace: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -1 +1 @@
-"knip --include files,dependencies --no-config-hints && knip --workspace apps/server --workspace apps/desktop --workspace apps/web --workspace packages/client-runtime --workspace packages/contracts --workspace packages/effect-acp --workspace packages/effect-codex-app-server --workspace packages/shared --workspace packages/ssh --workspace packages/tailscale --workspace packages/provider-core --workspace packages/provider-acp --workspace packages/provider-acp-registry --workspace packages/provider-testing --workspace packages/provider-pi --workspace packages/provider-muse --workspace packages/provider-opencode --workspace packages/provider-cursor --workspace packages/provider-fx --workspace packages/provider-grok --workspace packages/provider-kiro --workspace packages/secret-provider-core --workspace packages/secret-provider-definitions --workspace packages/secret-provider-onepassword --workspace packages/source-control-core --workspace packages/source-control-definitions --workspace packages/source-control-azure-devops --workspace packages/source-control-bitbucket --workspace packages/source-control-forgejo --workspace packages/source-control-gitcafe --workspace packages/source-control-github --workspace packages/source-control-gitlab --workspace packages/source-control-testing --exports --preprocessor ./scripts/knip-schemas.ts --no-config-hints"
+"vp run knip:check:all"

release: ++ release pipeline and runbook (#93)

Seam Path Mechanism or ++ file State Conflict
sibling .github/workflows/release.yml .github/workflows/plusplus-release.yml changed -
sibling .github/workflows/release-desktop.yml .github/workflows/plusplus-release-desktop.yml changed -
sibling docs/operations/release.md plusplus/docs/release.md changed -
sibling .github/workflows/release.yml: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -69,6 +69,8 @@ jobs:
         env:
           DISPATCH_CHANNEL: ${{ inputs.channel }}
         with:
+          # Every call here is a read; retry GitHub's transient 5xx and dropped connections.
+          retries: 3
           script: |
             const {
               assertCommitOnDefaultBranch,
@@ -517,6 +519,8 @@ jobs:
     if: ${{ !cancelled() && needs.preflight.result == 'success' && needs.relay_public_config.result == 'success' }}
     runs-on: blacksmith-32vcpu-ubuntu-2404
     timeout-minutes: 30
+    outputs:
+      npm_launcher_artifact_id: ${{ steps.npm_launcher.outputs.artifact-id }}
     env:
       T3CODE_CLERK_PUBLISHABLE_KEY: ${{ needs.relay_public_config.outputs.clerk_publishable_key }}
       T3CODE_CLERK_JWT_TEMPLATE: ${{ needs.relay_public_config.outputs.clerk_jwt_template }}
@@ -565,22 +569,32 @@ jobs:
       - name: Align package versions to release version
         run: node scripts/update-release-package-versions.ts "${{ needs.preflight.outputs.version }}"
 
-      - uses: ./.github/actions/setup-apt-mirrors
+      # Older release refs lack build:desktop:bundle and use the full build,
+      # which compiles the Linux browser secret helper and needs libsecret.
+      - name: Check bundle-only build support
+        id: bundle_build
+        run: |
+          script="$(node -p "require('./package.json').scripts['build:desktop:bundle'] ? 'build:desktop:bundle' : 'build:desktop'")"
+          echo "script=$script" >> "$GITHUB_OUTPUT"
+
+      - if: steps.bundle_build.outputs.script == 'build:desktop'
+        uses: ./.github/actions/setup-apt-mirrors
 
-      # @t3tools/desktop#build compiles the Linux browser secret helper on a
-      # Linux host before packing, and that needs libsecret headers.
       - name: Install browser secret helper build libraries
+        if: steps.bundle_build.outputs.script == 'build:desktop'
         run: sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
 
-      # Runs t3#build (which depends on @t3tools/web#build) and
-      # @t3tools/desktop#build, so apps/server/dist holds the server bundle
-      # plus the web client and apps/desktop/dist-electron the Electron main.
+      # Runs t3#build (which depends on @t3tools/web#build) and the desktop
+      # bundle, so apps/server/dist holds the server bundle plus the web client
+      # and apps/desktop/dist-electron the Electron main. build:desktop:bundle
+      # skips the Linux browser secret helper, which this artifact does not
+      # carry; each Linux package job compiles its own per arch.
       # The release channel is already stable, nightly, or preview. Builds in
       # other repositories report "dev" telemetry.
       - name: Build JS bundle
         env:
           T3CODE_TELEMETRY_CHANNEL: ${{ github.repository == 'pingdotgg/t3code' && needs.preflight.outputs.release_channel || 'dev' }}
-        run: vp run build:desktop
+        run: vp run ${{ steps.bundle_build.outputs.script }}
 
       # Two paths under apps/ so the artifact root is apps/; consumers download
       # into `apps` to restore both at their original locations.
@@ -594,6 +608,22 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+      # publish_cli publishes this exact tarball, so the trusted publisher
+      # needs no workspace checkout or install. It is version-matched here.
+      - name: Build the npm launcher
+        run: node scripts/build-npm-launcher.ts --version "${{ needs.preflight.outputs.version }}" --output-dir npm-packages
+
+      # GitHub allows a failed-jobs rerun for 30 days. publish_cli downloads
+      # this upload by its ID, which a publish_cli-only rerun keeps.
+      - name: Upload the npm launcher
+        id: npm_launcher
+        uses: actions/upload-artifact@v7
+        with:
+          name: npm-launcher
+          path: npm-packages/t3.tgz
+          if-no-files-found: error
+          retention-days: 30
+
   # One job per platform and architecture (see release-desktop.yml), each
   # gated only on the JS bundle. Windows targets build on Linux and run their
… 176 more lines
sibling .github/workflows/release-desktop.yml: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -77,6 +77,12 @@ on:
         required: false
         default: ""
         type: string
+      # Whether this job saves the workspace pnpm store. Release's two Macs
+      # install the same store on the same runner type, so only one saves it.
+      save_pnpm_store:
+        required: false
+        default: true
+        type: boolean
       version:
         required: true
         type: string
@@ -160,6 +166,7 @@ jobs:
         uses: ./.github/actions/setup-ci-deps
         with:
           install-args: --filter=@t3tools/desktop... --filter=t3... --filter=@t3tools/scripts...
+          save-pnpm-store: ${{ inputs.save_pnpm_store }}
         env:
           pnpm_config_cache_dir: ${{ runner.temp }}/pnpm-metadata
 
@@ -203,6 +210,20 @@ jobs:
             native/hyprland-snap-shot/target/${{ inputs.rust_target }}/release/t3-hyprland-snap-shot
           key: linux-capture-helpers-${{ inputs.rust_target }}-${{ hashFiles('native/kde-snap-shot/Cargo.lock', 'native/kde-snap-shot/Cargo.toml', 'native/kde-snap-shot/src/**', 'native/hyprland-snap-shot/Cargo.lock', 'native/hyprland-snap-shot/Cargo.toml', 'native/hyprland-snap-shot/src/**', 'native/hyprland-snap-shot/protocols/**') }}
 
+      # Every Linux build makes electron-builder fetch the AppImage runtime, FPM
+      # for the deb, and the 7-Zip that unpacks FPM from GitHub releases. It
+      # checks an archive found here against the SHA-256 pinned in those toolset
+      # files and downloads again on a mismatch, so only raw archives are cached.
+      - name: Cache Linux packaging tool archives
+        if: inputs.platform == 'linux'
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+        with:
+          path: |
+            ~/.cache/electron-builder/appimage@*/appimage-tools-runtime-*.tar.gz
+            ~/.cache/electron-builder/fpm@*/fpm-*.7z
+            ~/.cache/electron-builder/7zip@*/7zip-linux-*.tar.gz
+          key: electron-builder-linux-tools-${{ inputs.arch }}-${{ hashFiles('node_modules/.pnpm/app-builder-lib@*/node_modules/app-builder-lib/out/toolsets/linux.js', 'node_modules/.pnpm/app-builder-lib@*/node_modules/app-builder-lib/out/toolsets/7zip.js') }}
+
       - name: Ensure Rosetta for macOS x64 bytecode generation
         if: inputs.platform == 'mac' && inputs.arch == 'x64'
         shell: bash
@@ -408,6 +429,7 @@ jobs:
         run: command -v patchelf || { sudo apt-get update && sudo apt-get install -y patchelf; }
 
       - name: Build CLI archive
+        id: build_cli
         if: inputs.cli_archive
         shell: bash
         env:
@@ -425,37 +447,52 @@ jobs:
           AZURE_TRUSTED_SIGNING_CERTIFICATE_PROFILE_NAME: ${{ secrets.AZURE_TRUSTED_SIGNING_CERTIFICATE_PROFILE_NAME }}
         run: |
           set -euo pipefail
-          if [[ "${{ inputs.platform }}" == "mac" && -n "${APPLE_API_KEY:-}" ]]; then
-            key_path="$RUNNER_TEMP/AuthKey_cli_${APPLE_API_KEY_ID}.p8"
-            printf '%s' "$APPLE_API_KEY" > "$key_path"
-            export APPLE_API_KEY="$key_path"
+          extra_args=()
+          if [[ "${{ inputs.platform }}" == "mac" ]]; then
+            if [[ -n "${APPLE_API_KEY:-}" ]]; then
+              key_dir="$(mktemp -d "$RUNNER_TEMP/t3-cli-notary.XXXXXXXX")"
+              trap 'rm -rf "$key_dir"' EXIT
+              key_path="$key_dir/AuthKey.p8"
+              (umask 077 && printf '%s' "$APPLE_API_KEY" > "$key_path")
+              export APPLE_API_KEY="$key_path"
+            fi
+            # Older release refs lack deferred notarization and still wait here.
+            cli_help="$(node scripts/build-cli-archive.ts --help)"
+            if [[ "$cli_help" == *--notary-submission-file* ]]; then
+              extra_args=(--notary-submission-file "$RUNNER_TEMP/t3-cli-notary-submission")
+              echo "deferred_notarization=true" >> "$GITHUB_OUTPUT"
+            fi
           fi
           node scripts/build-cli-archive.ts \
             --platform "${{ inputs.platform }}" \
             --arch "${{ inputs.arch }}" \
             --version "${{ inputs.version }}" \
             --resource-monitor-dir "$RUNNER_TEMP/cli-resource-monitor" \
-            --output-dir release-cli
… 79 more lines
sibling docs/operations/release.md: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -342,9 +342,9 @@ uploads resume on the next check.
 
 Normal Nightly releases include the newest processed internal-testing APK available
 when the release publishes. Internal builds do not create separate Android releases.
-If Play credentials or a processed APK are unavailable, the Nightly can still publish
-without an APK. Android submissions continue to go to internal testing; promote a
-build to Alpha to publish it as a beta.
+If Play credentials or a processed APK are unavailable, or the download takes more
+than five minutes, the Nightly can still publish without an APK. Android submissions
+continue to go to internal testing; promote a build to Alpha to publish it as a beta.
 
 The APK is the universal APK Play generates and signs from the
 uploaded bundle, so no signing key lives in GitHub. The job skips itself until
@@ -533,9 +533,11 @@ blockmaps, with a 60 MB maximum for a representative sidecar-to-sidecar update.
 
 ## 0) npm OIDC trusted publishing setup (CLI)
 
-After the GitHub Release is published, the workflow runs `node scripts/build-npm-launcher.ts`, then
-`node apps/server/scripts/cli.ts publish --packages-dir npm-packages`, which runs `npm publish` on
-`t3.tgz`. That is the only package published per release.
+`build_bundle` builds the version-matched `t3.tgz` with `node scripts/build-npm-launcher.ts` and
+uploads it as the `npm-launcher` artifact. After the GitHub Release is published, `publish_cli`
+checks out only what it needs to set up the project's Node.js, downloads that exact upload by the
+artifact ID `build_bundle` outputs (never by name), checks the tarball version, and runs
+`npm publish --provenance` on it. That is the only package published per release.
 
 Checklist:
 
@@ -663,7 +665,7 @@ Checklist:
    - preflight passes
    - release quality checks pass
    - `build_bundle` and all platform builds pass
-   - `publish_cli` publishes the exact release version before the release job
+   - `publish_cli` publishes the exact release version after the release job
    - release job uploads expected files
 5. Smoke test downloaded artifacts.
 

usage-limits: Usage accounts and monetary usage on usage limits (#94)

Seam Path Mechanism or ++ file State Conflict
usage-limits.mobile-dependency apps/mobile/package.json config same -
usage-limits.thread-composer-import apps/mobile/src/features/threads/ThreadComposer.tsx override same -
usage-limits.thread-detail-screen-import apps/mobile/src/features/threads/ThreadDetailScreen.tsx override same -
usage-limits.chat-gpt-usage-summary-import apps/mobile/src/features/usage/ChatGptUsageSummary.tsx override same -
usage-limits.subscription-usage-snapshot-import apps/mobile/src/widgets/subscriptionUsageSnapshot.ts override same -
usage-limits.web-dependency apps/web/package.json config same -
usage-limits.composer-usage-limits-import apps/web/src/components/chat/ComposerUsageLimits.tsx override same -
usage-limits.thread-details-usage-import apps/web/src/components/chat/ThreadDetailsUsage.tsx override same -
usage-limits.use-usage-limits-panel-import apps/web/src/components/chat/useUsageLimitsPanel.ts override same -
sibling packages/shared/src/usageLimits.ts packages/plusplus-extensions/src/usageReporting.ts changed -
sibling packages/shared/src/usageLimits.ts: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -11,6 +11,7 @@ import {
   isProviderAvailable,
   PROVIDER_DISPLAY_NAMES,
   type ServerProvider,
+  type ServerProviderResetCredits,
   type ServerProviderUsageLimits,
   type ServerProviderUsageWindow,
   type UsageLimitSourceSnapshots,
@@ -675,6 +676,56 @@ export function formatDuration(ms: number): string {
   return `${minutes}m`;
 }
 
+/** One redeemable reset as clients offer it; `input` already names the chosen credit. */
+export interface ResetCreditChoice {
+  readonly key: string;
+  readonly summary: string;
+  readonly actionLabel: string;
+  readonly confirmDescription: string;
+  readonly availableCount: number;
+  readonly input: ProviderConsumeResetCreditInput;
+}
+
+export function resetCreditChoices(
+  credits: ServerProviderResetCredits,
+  input: ProviderConsumeResetCreditInput,
+  now: number,
+  compact = false,
+): ReadonlyArray<ResetCreditChoice> {
+  const expiresIn = (at: string | undefined) => (at ? formatDuration(Date.parse(at) - now) : null);
+  if (credits.options && "instanceId" in input) {
+    return credits.options.map((option) => {
+      const expires = expiresIn(option.expiresAt);
+      return {
+        key: option.creditId,
+        summary: `${option.label} · ${option.availableCount} left${expires ? ` · expires in ${expires}` : ""}`,
+        actionLabel: "Use",
+        confirmDescription: `${option.label}: ${option.description} This cannot be undone.`,
+        availableCount: option.availableCount,
+        input: { ...input, creditId: option.creditId },
+      };
+    });
+  }
+  const count = credits.availableCount;
+  const expires = expiresIn(credits.nextExpiresAt);
+  return [
+    {
+      key: "next",
+      summary:
+        count === 0
+          ? "No reset credits banked"
+          : compact
+            ? `${count} banked${expires ? ` · expires in ${expires}` : ""}`
+            : `${count} ${count === 1 ? "reset credit" : "reset credits"} banked${expires ? ` · next expires in ${expires}` : ""}`,
+      actionLabel: "Use reset",
+      confirmDescription:
+        "This redeems one credit on your account and clears the current rate-limit windows. It cannot be undone.",
+      availableCount: count,
+      input,
+    },
+  ];
+}
+
 export function formatResetsIn(window: ServerProviderUsageWindow, now: number): string | null {
   const resetsAt = resetMillis(window);
   if (resetsAt === null) return null;
@@ -729,8 +780,15 @@ export function withUsageLimitsCommands(
   providers: readonly ServerProvider[],
   sources: UsageLimitSourceSnapshots,
 ): ServerProvider[] {
+  const supportedDrivers = new Set([
+    ...providersWithLimits(providers).map((provider) => provider.driver),
+    ...sources.flatMap((source) => source.accounts.map((account) => account.driver)),
+  ]);
+  const unreadableSource = sources.some(
+    (source) => source.error !== undefined && source.accounts.length === 0,
+  );
   return providers.map((provider) => {
-    if (!hasProviderUsageLimits(provider.driver, providers, sources)) return provider;
+    if (!unreadableSource && !supportedDrivers.has(provider.driver)) return provider;
     const commands = (items: readonly ServerProviderSlashCommand[]) => [
… 2 more lines

usage-vendor-icons: Model vendor icons on Usage (#82)

Seam Path Mechanism or ++ file State Conflict
usage-vendor-icons.import apps/web/src/components/usage/UsagePage.tsx hook changed conflict
usage-vendor-icons.model-mark apps/web/src/components/usage/UsagePage.tsx override same conflict
usage-vendor-icons.import: upstream changed this region

Adapt the ++ change, or drop it if upstream now does the same.

@@ -1,5 +1,5 @@
-  type UsageMetric,
-} from "./usageShortcuts";
-import { PROVIDER_ORDER, PROVIDER_PRESENTATION, providersWithUsage } from "./usageProviders";
+  providersWithUsage,
+  rankProvidersByMetric,
+} from "./usageProviders";
 import {
   readUsagePagePreferences,

Legacy files upstream touches (166)

  • ".github/SECURITY.md" (conflict)
  • ".github/actions/ci-changes/action.yml"
  • ".github/actions/setup-ci-deps/action.yml"
  • ".github/scripts/check-nightly-release.cjs"
  • ".github/scripts/check-nightly-release.test.cjs" (conflict)
  • ".github/scripts/ci-changes.cjs" (conflict)
  • ".github/scripts/ci-changes.d.cts"
  • ".github/workflows/ci.yml" (conflict)
  • ".github/workflows/desktop-macos-preview.yml"
  • ".github/workflows/mobile-eas-preview-fork.yml"
  • ".github/workflows/mobile-eas-preview.yml"
  • ".github/workflows/mobile-eas-production.yml"
  • ".github/workflows/mobile-showcase-screenshots.yml"
  • ".macroscope/ignore.md" (conflict)
  • "AGENTS.md"
  • "README.md" (conflict)
  • "apps/desktop/package.json"
  • "apps/desktop/src/app/DesktopAppIdentity.test.ts"
  • "apps/desktop/src/app/DesktopCliCommand.test.ts"
  • "apps/desktop/src/app/DesktopLifecycle.test.ts"
  • "apps/desktop/src/app/DesktopPreReadyPlatform.test.ts"
  • "apps/desktop/src/app/DesktopPreReadyPlatform.ts"
  • "apps/desktop/src/app/DesktopUserData.test.ts" (conflict)
  • "apps/desktop/src/app/DesktopUserData.ts"
  • "apps/desktop/src/electron/ElectronProtocol.ts"
  • "apps/desktop/src/main.ts"
  • "apps/desktop/src/preview/DesktopBrowserHost.test.ts"
  • "apps/desktop/src/settings/DesktopAppSettings.test.ts"
  • "apps/desktop/src/settings/DesktopClientSettings.test.ts"
  • "apps/desktop/src/shell/DesktopShellEnvironment.test.ts"
  • "apps/desktop/src/updates/releaseNotes.ts"
  • "apps/desktop/src/window/DesktopWindow.test.ts"
  • "apps/mobile/src/features/usage/UsageLimitsPooled.tsx"
  • "apps/mobile/src/features/usage/UsageLimitsSection.tsx"
  • "apps/server/package.json"
  • "apps/server/src/auth/EnvironmentAuth.test.ts"
  • "apps/server/src/auth/RpcAuthorization.ts"
  • "apps/server/src/binCli.ts"
  • "apps/server/src/cli/update.test.ts"
  • "apps/server/src/mcp/McpHttpServer.ts"
  • "apps/server/src/mcp/toolkits/core.test.ts"
  • "apps/server/src/mcp/toolkits/thread/handlers.ts"
  • "apps/server/src/observability/RpcInstrumentation.ts"
  • "apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts"
  • "apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts" (conflict)
  • "apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts"
  • "apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts" (conflict)
  • "apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts"
  • "apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts"
  • "apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts"
  • "apps/server/src/orchestration-v2/FoundationPersistence.test.ts"
  • "apps/server/src/orchestration-v2/ProjectionStore.test.ts"
  • "apps/server/src/orchestration-v2/runtimeLayer.ts"
  • "apps/server/src/persistence/DatabaseMaintenance.ts"
  • "apps/server/src/persistence/DatabaseStorage.test.ts" (conflict)
  • "apps/server/src/persistence/initializeV2Database.test.ts"
  • "apps/server/src/project/AgentSessionScanner.test.ts"
  • "apps/server/src/project/ProjectService.test.ts"
  • "apps/server/src/project/ProjectService.ts" (conflict)
  • "apps/server/src/provider/AgentContextBudget.test.ts"
  • "apps/server/src/provider/CodexProvider.ts"
  • "apps/server/src/provider/Drivers/AntigravityDriver.test.ts"
  • "apps/server/src/provider/Drivers/AntigravityDriver.ts"
  • "apps/server/src/provider/Drivers/ClaudeDriver.ts"
  • "apps/server/src/provider/Drivers/ClaudeSkills.ts"
  • "apps/server/src/provider/Drivers/CodexDriver.test.ts"
  • "apps/server/src/provider/Drivers/CodexDriver.ts"
  • "apps/server/src/provider/Drivers/CodexManagedProvider.ts"
  • "apps/server/src/provider/Drivers/antigravityUsageReader.test.ts" (conflict)
  • "apps/server/src/provider/Drivers/antigravityUsageReader.ts" (conflict)
  • "apps/server/src/provider/antigravityAuthSupport.ts"
  • "apps/server/src/provider/antigravityUsageLimits.test.ts"
  • "apps/server/src/provider/antigravityUsageLimits.ts" (conflict)
  • "apps/server/src/server.ts" (conflict)
  • "apps/server/src/serverSettings.test.ts"
  • "apps/server/src/storageCleanup.ts"
  • "apps/server/src/terminal/Manager.ts"
  • "apps/server/src/usage/UsageService.test.ts"
  • "apps/server/src/usage/usagePricing.test.ts" (conflict)
  • "apps/server/src/usage/usagePricing.ts" (conflict)
  • "apps/server/src/ws.test.ts"
  • "apps/server/src/ws.ts"
  • "apps/web/src/components/AppSidebarLayout.tsx" (conflict)
  • "apps/web/src/components/ChatView.tsx"
  • "apps/web/src/components/HostedEmptyState.tsx"
  • "apps/web/src/components/chat/OpenInPicker.browser.test.tsx"
  • "apps/web/src/components/chat/useComposerProviderModel.ts" (conflict)
  • "apps/web/src/components/chat/useThreadLifecycle.tsx"
  • "apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx"
  • "apps/web/src/components/onboarding/WelcomeWizard.tsx" (conflict)
  • "apps/web/src/components/settings/ProviderInstanceCard.tsx"
  • "apps/web/src/components/settings/ProviderSettingsPanel.tsx"
  • "apps/web/src/components/settings/SettingsPanels.tsx" (conflict)
  • "apps/web/src/components/settings/settingsSearch.ts"
  • "apps/web/src/components/sidebar/SidebarUpdatePill.tsx" (conflict)
  • "apps/web/src/components/usage/UsageLimits.tsx"
  • "apps/web/src/components/usage/UsageLimitsPooled.tsx" (conflict)
  • "apps/web/src/hooks/useHandleNewThread.test.ts"
  • "apps/web/vite.config.ts"
  • "docs/README.md"
  • "docs/internals/remote.md"
  • "docs/operations/development.md"
  • "docs/user/remote-access.md" (conflict)
  • "docs/user/updating.md"
  • "docs/user/usage.md"
  • "docs/user/welcome-wizard.md" (conflict)
  • "evals/README.md" (conflict)
  • "knip.jsonc"
  • "packages/contracts/src/orchestrationV2.ts"
  • "packages/contracts/src/providerUsageLimits.ts"
  • "packages/contracts/src/rpc.ts"
  • "packages/contracts/src/server.ts"
  • "packages/contracts/src/settings.test.ts"
  • "packages/contracts/src/terminal.ts"
  • "packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts"
  • "packages/provider-acp/src/server/adapter.ts"
  • "packages/provider-core/package.json"
  • "packages/provider-core/src/server/maintenanceResolver.test.ts"
  • "packages/provider-core/src/server/managedProvider.test.ts"
  • "packages/provider-core/src/server/managedProvider.ts" (conflict)
  • "packages/provider-core/src/server/runtimeInstructions.ts" (conflict)
  • "packages/provider-core/src/server/snapshotProbe.ts"
  • "packages/provider-cursor/src/server/adapter.ts" (conflict)
  • "packages/provider-cursor/src/server/driver.ts"
  • "packages/provider-grok/package.json"
  • "packages/provider-grok/src/server/usageLimits.ts" (conflict)
  • "packages/provider-muse/package.json"
  • "packages/provider-muse/src/server/adapter.ts"
  • "packages/provider-muse/src/server/usageLimits.test.ts"
  • "packages/provider-muse/src/server/usageLimits.ts" (conflict)
  • "packages/provider-opencode/package.json"
  • "packages/provider-opencode/src/server/adapter.test.ts"
  • "packages/provider-opencode/src/server/adapter.ts"
  • "packages/provider-opencode/src/server/driver.test.ts"
  • "packages/provider-opencode/src/server/driver.ts" (conflict)
  • "packages/provider-opencode/src/server/usageLimits.ts"
  • "packages/provider-opencode/src/server/v2/adapter.ts" (conflict)
  • "packages/provider-pi/package.json"
  • "packages/provider-pi/src/server/adapter.ts" (conflict)
  • "packages/provider-pi/src/server/driver.ts"
  • "packages/provider-pi/src/server/mcpBridge.testkit.ts" (conflict)
  • "packages/provider-pi/src/server/mcpExtensionSource.test.ts" (conflict)
  • "packages/provider-pi/src/server/mcpExtensionSource.ts" (conflict)
  • "packages/shared/package.json"
  • "packages/shared/src/atomicWrite.test.ts"
  • "packages/shared/src/cliRelease.ts" (conflict)
  • "packages/shared/src/orchestrationV2PendingBackgroundWork.ts" (conflict)
  • "packages/shared/src/relayClient.ts"
  • "packages/shared/src/serverSettings.ts"
  • "packages/source-control-core/src/server/driver.ts"
  • "packages/source-control-github/src/server/driver.ts" (conflict)
  • "pnpm-lock.yaml"
  • "pnpm-workspace.yaml"
  • "scripts/build-cli-archive.ts"
  • "scripts/build-desktop-artifact.test.ts" (conflict)
  • "scripts/build-desktop-artifact.ts"
  • "scripts/build-npm-launcher.test.ts"
  • "scripts/check-changed.test.ts" (conflict)
  • "scripts/check-changed.ts"
  • "scripts/install.ps1" (conflict)
  • "scripts/install.sh" (conflict)
  • "scripts/install.test.ts" (conflict)
  • "scripts/lib/brand-assets.ts"
  • "scripts/lib/server-compile-cache.test.ts" (conflict)
  • "scripts/release-smoke.ts"
  • "vite.config.ts"

Unregistered conflicts (1)

  • "packages/plusplus/src/museUsageLimits.test.ts" (1 hunks)

Unregistered fork deltas (should be none) (0)

(none)

@wianvdm wianvdm added the agent-context-increase Permits an intentionally larger agent context budget. label Nov 15, 2026
@github-actions

github-actions Bot commented Nov 15, 2026 •

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ The exact PR base did not have a successful artifact. Baseline uses the latest successful main measurement shown below.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Codex Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 21.5 KiB 21.5 KiB 0 B (0.0%) 24.4 KiB ✅
Codex Live turn messages 1 1 0 (0.0%) 8 ✅
Claude Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Claude Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 21.9 KiB 21.9 KiB 0 B (0.0%) 24.4 KiB ✅
Claude Live turn messages 1 1 0 (0.0%) 8 ✅

Baseline: 2f15f3e · PR result: ca48068 · Source CI: failure

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

# Conflicts:
#	.github/SECURITY.md
#	.github/scripts/check-nightly-release.test.cjs
#	.github/scripts/ci-changes.cjs
#	.github/workflows/ci.yml
#	.macroscope/ignore.md
#	README.md
#	apps/desktop/src/app/DesktopUserData.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/persistence/DatabaseStorage.test.ts
#	apps/server/src/project/ProjectService.ts
#	apps/server/src/provider/ClaudeProvider.ts
#	apps/server/src/provider/Drivers/antigravityUsageReader.test.ts
#	apps/server/src/provider/Drivers/antigravityUsageReader.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/provider/antigravityUsageLimits.ts
#	apps/server/src/server.ts
#	apps/server/src/usage/usagePricing.test.ts
#	apps/server/src/usage/usagePricing.ts
#	apps/web/src/components/AppSidebarLayout.tsx
#	apps/web/src/components/chat/useComposerProviderModel.ts
#	apps/web/src/components/onboarding/WelcomeWizard.tsx
#	apps/web/src/components/settings/SettingsPanels.tsx
#	apps/web/src/components/sidebar/SidebarUpdatePill.tsx
#	apps/web/src/components/usage/UsageLimitsPooled.tsx
#	apps/web/src/components/usage/UsagePage.tsx
#	docs/user/remote-access.md
#	docs/user/welcome-wizard.md
#	evals/README.md
#	package.json
#	packages/contracts/src/settings.ts
#	packages/plusplus/src/museUsageLimits.test.ts
#	packages/provider-core/src/server/managedProvider.ts
#	packages/provider-core/src/server/runtimeInstructions.ts
#	packages/provider-cursor/src/server/adapter.ts
#	packages/provider-grok/src/server/usageLimits.ts
#	packages/provider-muse/src/server/usageLimits.ts
#	packages/provider-opencode/src/server/driver.ts
#	packages/provider-opencode/src/server/v2/adapter.ts
#	packages/provider-pi/src/server/adapter.ts
#	packages/provider-pi/src/server/mcpBridge.testkit.ts
#	packages/provider-pi/src/server/mcpExtensionSource.test.ts
#	packages/provider-pi/src/server/mcpExtensionSource.ts
#	packages/provider-pi/src/server/mcpInjection.ts
#	packages/shared/src/cliRelease.ts
#	packages/shared/src/orchestrationV2PendingBackgroundWork.ts
#	packages/source-control-github/src/server/driver.ts
#	scripts/build-desktop-artifact.test.ts
#	scripts/check-changed.test.ts
#	scripts/install.ps1
#	scripts/install.sh
#	scripts/install.test.ts
#	scripts/lib/server-compile-cache.test.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Permits an intentionally larger agent context budget. seam Advisory: PR touches a fork/upstream integration seam. size:XXL sync-conflict Advisory: PR touches fork-diverged files likely to conflict on upstream sync. upstream-sync Protected sync designation: maintainers/triage only; forces full CI and merge validation.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Upstream sync]: v0.1.9