Skip to content

sync: upstream through 6b7027b1f4 (1251 commits) - #117

Merged
mfituri merged 1265 commits into
mainfrom
sync/upstream-20261119
Nov 20, 2026
Merged

mfituri merged 1265 commits into
mainfrom
sync/upstream-20261119

Conversation

@mfituri

@mfituri mfituri commented Nov 19, 2026 •

Copy link
Copy Markdown

Upstream 7b17bdbcef..6b7027b1f4: 1251 commits. The target was named by hand (--to 6b7027b1f4), so quarantine was not applied.

Rebuilt from main at e3b103e876 after #115 and #116 merged and the first branch (dc959f93df) began conflicting. Same upstream target, the same 44 stops resolved the same way, and the same follow-up commits. Compared with the first branch, the tree differs only by #115 and #116 themselves and by the two instruction budgets, which now carry #116's 132 more bytes of question-card text.

Land this with Create a merge commit. A squash merge would drop upstream's history from main.

After merging: this sync adds .github/workflows/issue-vouch.yml (Issue Vouch, labels issues by author trust with issues: write). GitHub enables it as soon as it lands, and its push trigger matches its own path, so it may run once on the merge. Disable it right after merge: gh workflow disable -R 1001-ai/1001-code "Issue Vouch" (see the divergence "Only CI workflows are enabled on GitHub").

Sensitive changes (111)

Upstream changes that run on install or in CI, steer our agents, or decide where data goes or who gets in. Each group was read on the sync branch; notes say what changed and whether it matches its upstream pull request.

package.json scripts, bin and lifecycle hooks (1)

  • apps/marketing/package.json: script test added (vp test run).
  • Note: matches upstream's marketing tests; no lifecycle hook.

Packages added to pnpm-lock.yaml (11)

  • @cursor/sdk@1.3.1 and its five platform packages (-darwin-arm64, -darwin-x64, -linux-arm64, -linux-x64, -win32-x64)
  • @pierre/diffs@1.7.0-beta.4, @pierre/highlights@0.5.1
  • effect@4.1.3
  • react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-16db4c75.tgz
  • react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.57.tgz
  • Note: all are version bumps of packages upstream already used (the @cursor/sdk override 1.2.0 → 1.3.1, the @pierre/diffs catalog and override, the effect catalog), plus upstream's own mobile fork tarballs replacing the previous ones in apps/mobile/deps. Every lockfile entry resolves from registry.npmjs.org except those two in-repo tarballs; there are no git or URL sources. The @cursor/sdk@1.3.1 patch replaces the 1.2.0 one and is 15.8 MB of single-line replacements in the minified bundle; its file list and the readable agent.d.ts hunks (an optional resume()) match the comment in pnpm-workspace.yaml (attribution settings, streamed shell output, agent.resume()), but the minified lines were not read one by one.

Build permissions and release-age settings in pnpm-workspace.yaml (2)

  • allowBuilds: the react-native-enriched-markdown entry moves from the 497fbe63 tarball to 16db4c75 (the previous tarball had the same permission).
  • minimumReleaseAgeExclude: @pierre/diffs beta.3 → beta.4.
  • Note: matches the tarball and diffs bumps above. The same file also adds an unenv override pin and two small patches (@expo/ui Android scroll target, @effect/platform-node-shared injected spawn for Windows worker launches); both were read and do what their comments say.

CI workflows and actions (28)

Show all
  • .github/actions/setup-ci-deps/action.yml
  • .github/workflows/agent-context-budget.yml
  • .github/workflows/ci.yml
  • .github/workflows/deploy-relay.yml
  • .github/workflows/desktop-macos-preview-publish.yml
  • .github/workflows/desktop-macos-preview.yml
  • .github/workflows/issue-labels.yml
  • .github/workflows/issue-vouch.yml
  • .github/workflows/mobile-android-apk.yml
  • .github/workflows/mobile-dev-client.yml
  • .github/workflows/mobile-eas-preview-fork.yml
  • .github/workflows/mobile-eas-preview.yml
  • .github/workflows/mobile-eas-production.yml
  • .github/workflows/mobile-fingerprint-check.yml
  • .github/workflows/mobile-fingerprint-label.yml
  • .github/workflows/mobile-showcase-screenshots.yml
  • .github/workflows/pr-limits.yml
  • .github/workflows/pr-size.yml
  • .github/workflows/pr-vouch.yml
  • .github/workflows/publish-aur.yml
  • .github/workflows/relay-preview-cleanup.yml
  • .github/workflows/relay-preview.yml
  • .github/workflows/release-desktop.yml
  • .github/workflows/release.yml
  • .github/workflows/stale-needs-more-info.yml
  • .github/workflows/thread-transfer-report.yml
  • .github/workflows/web-preview.yml
  • .github/workflows/windows-tests.yml

Agent instructions (these steer our agents) (13)

  • .agents/skills/test-t3-mobile/SKILL.md
  • AGENTS.md
  • evals/mcp-tool-use/backgroundWait.ts
  • evals/mcp-tool-use/cases/background-wait.ndjson
  • evals/mcp-tool-use/cases/mid-turn-messages.ndjson
  • evals/mcp-tool-use/cases/orchestration.ndjson
  • evals/mcp-tool-use/cases/themes.ndjson
  • evals/mcp-tool-use/cases/threads-vs-tasks.ndjson
  • evals/mcp-tool-use/devices.test.ts
  • evals/mcp-tool-use/devices.ts
  • evals/mcp-tool-use/README.md
  • evals/mcp-tool-use/run.test.ts
  • evals/mcp-tool-use/run.ts
  • Note: AGENTS.md lists the newer providers, says how to stop dev servers and not to detach them, and generalizes the forge mirror note; the fork notice stays under the title. The skill adds the device pool --config flag and --prepare. The eval changes are new cases for upstream's new tools (send_to_user, themes, background wait); the only URLs added are upstream issue and PR links. Nothing points agents somewhere unexpected.

Install and setup scripts, and git hooks (1)

Update and release URLs (7)

  • apps/desktop/src/updates/DesktopRemoteUpdates.ts
  • apps/desktop/src/updates/DesktopUpdates.ts
  • apps/desktop/src/updates/updatesTestHarness.ts
  • apps/server/src/cli/update.ts
  • apps/server/src/cloud/selfUpdate.ts
  • apps/server/src/desktopUpdate/DesktopAppUpdate.ts
  • apps/server/src/desktopUpdate/DesktopUpdateMarker.ts
  • Note: no URL, feed or registry changed in these diffs. The changes are update polling (every 4 hours), nightly ordering, prepared-update recovery, and an update command for hand-started servers (fix(web): hand-started t3 servers get an update command that updates them pingdotgg/t3code#29462). The fork's gates are all still in place (FORK_UPDATES_MESSAGE / forkReleaseSource in managedPolicy.ts, update.ts, pinnedRuntime.ts, tunnel.ts, DesktopUpdatePolicy.ts, OutdatedServerUpdateSection.tsx).

Telemetry endpoints (7)

  • apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
  • apps/server/src/observability/RpcInstrumentation.ts
  • apps/server/src/resourceTelemetry/DesktopTelemetryReceiver.ts
  • apps/server/src/telemetry/ProviderDimensions.ts
  • apps/web/src/components/settings/ResourceTelemetryDiagnostics.logic.ts
  • apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
  • packages/contracts/src/resourceTelemetry.ts
  • Note: no endpoint, host or key was added. The changes are local resource diagnostics, RPC span rows for new methods, and the thread binding a scheduled task's analytics record (fix(server): analytics record the thread binding a scheduled task actually got pingdotgg/t3code#28761). The fork's analytics gate is intact: AnalyticsService.ts has its six FORK_ANALYTICS_DEFAULTS / forkAnalyticsEnabled lines and no ingest.t3.codes or phc_ key.

Auth, policy and secrets code (41)

Show all
  • apps/desktop/src/backend/DesktopLocalEnvironmentAuth.ts
  • apps/desktop/src/ipc/methods/providerAuth.ts
  • apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt
  • apps/mobile/src/components/ui/SecretRevealButton.tsx
  • apps/mobile/src/components/ui/SecretTextInput.android.tsx
  • apps/mobile/src/components/ui/SecretTextInput.tsx
  • apps/mobile/src/state/auth.ts
  • apps/server/src/auth/dpop.ts
  • apps/server/src/auth/EnvironmentAuth.ts
  • apps/server/src/auth/http.ts
  • apps/server/src/auth/McpOAuth.ts
  • apps/server/src/auth/mcpOAuthHttp.ts
  • apps/server/src/auth/PairingGrantStore.ts
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/auth/ServerSecretStore.ts
  • apps/server/src/auth/SessionStore.ts
  • apps/server/src/auth/utils.ts
  • apps/server/src/cli/auth.ts
  • apps/server/src/cliAuthFormat.ts
  • apps/server/src/persistence/AuthConnectDevices.ts
  • apps/server/src/persistence/AuthPairingLinks.ts
  • apps/server/src/persistence/AuthSessions.ts
  • apps/server/src/persistence/Migrations/090_AuthConnectDevices.ts
  • apps/server/src/persistence/Migrations/091_AuthConnectDeniedRequests.ts
  • apps/server/src/provider/antigravityAuthSupport.ts
  • apps/server/src/secrets/SecretCheck.ts
  • apps/server/src/settingsSecrets.ts
  • apps/web/src/components/auth/ApproveAgentSurface.tsx
  • apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx
  • apps/web/src/components/cloud/ConnectCliAuthSurface.tsx
  • apps/web/src/components/settings/ProviderAuthenticationSection.tsx
  • apps/web/src/components/settings/ProviderAuthTerminal.tsx
  • apps/web/src/components/settings/SecretSourceInput.tsx
  • apps/web/src/components/settings/SettingsScopeSentence.tsx
  • apps/web/src/environments/primary/auth.ts
  • packages/client-runtime/src/state/auth.ts
  • packages/contracts/src/auth.ts
  • packages/contracts/src/settingsSecretValue.ts
  • packages/provider-acp-registry/src/server/auth.ts
  • packages/secret-provider-core/src/server/SecretResolver.ts
  • packages/shared/src/codexAuthCallback.ts

Conflicts resolved (44)

44 stops: 9 touched only agentContextBudget.json or the lockfile and were resolved by the rules below; the other 35 were resolved by reading both sides. The resolution diffs, as git show --remerge-diff of each step, are in the comments.

Adaptations after merging (5)

  • chore: the lockfile lists the fork's graph packages and koffi again: regenerated in a Codespace with pnpm@12.14.0 install --lockfile-only --ignore-scripts --ignore-pnpmfile and the GitHub tokens unset. The diff against upstream's lockfile only adds the server's koffi importer entry and @xyflow/react, elkjs and their dependencies (@xyflow/system, classcat, zustand, the d3-* packages and their types), at the same versions and integrity hashes main already had. --ignore-pnpmfile drops the pnpmfileChecksum line; it was put back as upstream has it (the pnpmfile is unchanged). The result is byte-for-byte the first branch's lockfile.
  • fix(server): thread cost prices aliased models like the Usage page again: fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate pingdotgg/t3code#32219 prices an alias the rate table does not list under its provider's own rate naming, a precedence change the status line entry says to mirror in threadCostEstimate.ts. The estimate now does that in rateFor and for Cursor's billed records, calls antigravityRateModel directly (so antigravityUsageReader.ts is upstream's again), and ThreadCost.test.ts gains a Pi alias row.
  • docs(fork): the Cursor adapter reports its own token usage now: the status line entry drops the Cursor adapter hooks and their checks.
  • docs(fork): note the catalog store test the fork adjusts.
  • test(desktop): the catalog test expects the fork's get to read an undecryptable catalog as missing: the fix(desktop): saving keeps a connection catalog this build cannot read pingdotgg/t3code#34944 test line above, committed before finish, so it is part of the sync merge commit rather than a separate commit on the branch.

Verification

CI is pending on the rebuilt branch; nothing was built, installed or tested on a machine with credentials. Checked by reading, on the final branch:

  • Every read-only divergence Check (grep / git grep) in fork/README.md was run and shows its hooks: fork notice, knip entries, CI runner labels (no non-GitHub label left), scroll on send, status line, product name, "running in 1001 Code" (and no fixture says "running in T3 Code"), desktop identity seams, icons, wordmark, answer controls, question / reply marker / back-reference seams, analytics gate (no upstream key), update gates, desktop self-update hooks, model manifest, .env.example, reply markers and back-references, live checkout, team catalog and links, graph libraries (only in components/teamProjects/), board, welcome page, thread details tasks, issue links, task cards, thread tool labels, jump back, memory and proposals, agents board, questions and Questions page, automation marker, cite shortcut, reply annotations, voice layer and voice agent, Inbox agent (and no inboxAgent in rpc.ts / orchestrationV2.ts), speech output (koffi in package.json and knip.jsonc), moment cards, defaults on. No conflict markers remain.
  • The checks that run tools (knip, tests, typecheck) and gh workflow list (after Issue Vouch is disabled) are left to CI and to the merge.
  • Every-sync rules: upstream did not touch ThreadDetailsUsage.tsx, collectProviderUsageLimits or LITELLM_PREFIXES; the alias change in usageAggregation.ts (fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate pingdotgg/t3code#32219) is mirrored (see Adaptations); perf(server): resolve model aliases in one memoized traversal pingdotgg/t3code#31197's alias traversal reaches the thread cost through the shared resolveModelAliases. index.css changes do not touch the lane padding ExchangeThread.tsx copies, and ComposerSurface.tsx's glass variables are unchanged. No Muse fixture was re-recorded. lockClaudeQueryForLockedAgent is still the last thing applied before queryRunner.open.
  • The 367 upstream commits that merged cleanly into files the fork changes are listed in a comment. One more than on the first branch: feat: dismiss a question card without telling the agent #116 made ChatView.logic.ts a fork-changed file, which adds fix(web): J and K step the PR guide without clicking into it first pingdotgg/t3code#32302 to the list. The latestUserMessageAt hook there is intact.
  • fix(web): your local agents' board reports no longer repeat their moments #115 and feat: dismiss a question card without telling the agent #116 survived whole: for every file they touched, the diff from the first branch to this one equals the diff from the old main (943d56fce9) to e3b103e876, except agentContextBudget.json, where it is the budget change above. None of those files conflicted, and the read-only Checks print the same output as on the first branch, plus the new "Dismiss a question card without telling the agent" Check, which shows each hook (the record_only branch, the five SQL lines in ProjectionStore.ts, ChatView.logic.ts, TimelineUserMessageRow.tsx, the contract member).

Fixes after the sync

CI run 44590537552 failed on fork code the sync broke. Fixed by reading code; the next CI run checks them.

Not changed: the Test job hit its 10-minute timeout with every suite passing so far, and Agent context budget needs a maintainer label.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 15, 2026 04:42
…t the web host (pingdotgg#29784)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uth and CORS (pingdotgg#35810)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…de (pingdotgg#32157)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ror body (pingdotgg#35809)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…config (pingdotgg#28557)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#30299)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… on its host (pingdotgg#35209)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#34065)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#23354)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… matches (pingdotgg#35916)

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

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

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

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

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

mfituri commented Nov 19, 2026 •

Copy link
Copy Markdown
Author

Resolution diffs (1/2)

Updated for the rebuilt branch (head dabb137907); this replaces the first branch's version.

What each conflict stop resolved to, as git show --remerge-diff of that step's merge.

359daaf367 feat(codex): choose a cyber access program for Daybreak-eligible models (pingdotgg#27928)

  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
Resolution
diff --git a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
index f479003c92..77ddf7b7a1 100644
--- a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
@@ -852,13 +852,8 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
     const additionalContext =
       t3Context === undefined && Object.keys({ ...appContext, ...teamContext }).length === 0
         ? undefined
-<<<<<<< cc59f2ac73 (Merge upstream through 7fab4ef978 (46 commits))
         : { ...t3Context, ...teamContext, ...appContext };
-    return yield* decodeCodexTurnStartParamsWithCollaborationMode({
-=======
-        : { ...t3Context, ...appContext };
     return yield* decodeCodexTurnStartParams({
->>>>>>> 359daaf367 (feat(codex): choose a cyber access program for Daybreak-eligible models (#27928))
       threadId: input.nativeThreadId,
       input: input.codexInput,
       ...(additionalContext ? { additionalContext } : {}),

aa58dc6d22 chore(deps): bump the npm_and_yarn group across 2 directories with 1 update (pingdotgg#33945)

  • pnpm-lock.yaml

Lockfile: took upstream's (checkout --theirs); regenerated after the merge.

e1d59d1884 fix(web): the collapsed mobile composer shows Stop while a turn runs (pingdotgg#29959)

  • apps/web/src/components/chat/ChatComposer.tsx
Resolution
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/ChatComposer.tsx
index fd5ab2b99d..16a8333c8e 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -208,12 +208,8 @@ import {
   ComposerQueuedAttachmentRow,
   ComposerRestingImagePreviews,
 } from "./ComposerAttachmentStrip";
-<<<<<<< 9883a8bd9c (Merge upstream through 613d1ac4f9 (40 commits))
 import { ComposerStatusToggle } from "./ComposerStatusStrip";
-import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
-=======
 import { CollapsedComposerStopAction, ComposerPrimaryActions } from "./ComposerPrimaryActions";
->>>>>>> e1d59d1884 (fix(web): the collapsed mobile composer shows Stop while a turn runs (#29959))
 import { ComposerFooterPrimaryActions } from "./ComposerFooterControls";
 import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
 import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";

c99201cc15 fix(web): minimap Next turn no longer sticks on adjacent user messages (pingdotgg#33036)

  • apps/web/src/components/chat/MessagesTimeline.tsx
Resolution
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/MessagesTimeline.tsx
index da68e7a3ae..b1ba871119 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -1505,7 +1505,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
               ListHeaderComponent={listHeader}
               ListFooterComponent={timelineListFooter}
             />
-<<<<<<< 5ff4d67565 (Merge upstream through ac1cb9232d (50 commits))
             <TimelineMomentsGutter rows={rows} threadRef={citationThreadRef}>
               <TimelineMinimap
                 items={minimapItems}
@@ -1520,7 +1519,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
                   void listRef.current?.scrollToIndex({
                     index: item.rowIndex,
                     animated: !window.matchMedia("(prefers-reduced-motion: reduce)").matches,
-                    viewOffset: 24,
+                    viewOffset: TIMELINE_MINIMAP_TARGET_OFFSET,
                   });
                 }}
               />
@@ -1540,24 +1539,6 @@ const ConversationTimeline = memo(function ConversationTimeline({
               threadKey={routeThreadKey}
               bottomInset={contentInsetEndAdjustment}
               topFadeEnabled={topFadeEnabled}
-=======
-            <TimelineMinimap
-              items={minimapItems}
-              hasPersistentGutter={minimapHasPersistentGutter}
-              hitStripWidth={minimapHitStripWidth}
-              currentIndex={minimapCurrentIndex}
-              atEnd={minimapAtEnd}
-              stripMap={minimapStripMap}
-              onWheel={forwardMinimapWheel}
-              onSelect={(item) => {
-                navigateTimeline();
-                void listRef.current?.scrollToIndex({
-                  index: item.rowIndex,
-                  animated: !window.matchMedia("(prefers-reduced-motion: reduce)").matches,
-                  viewOffset: TIMELINE_MINIMAP_TARGET_OFFSET,
-                });
-              }}
->>>>>>> c99201cc15 (fix(web): minimap Next turn no longer sticks on adjacent user messages (#33036))
             />
           </TooltipScrollDismissArea>
         </TimelineRowActivityCtx>

59e64eef88 fix(server): t3_thread_read returns the newest items and fits in agent context (pingdotgg#33428)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index 2bf05da2c5..f9f978f050 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 80039b9fd3 (Merge upstream through 4137412fe9 (8 commits))
   "claudeSystemAppendBytes": 9929,
   "codexAdditionalContextBytes": 11655,
-  "mcpToolListJsonBytes": 48126
-=======
-  "claudeSystemAppendBytes": 5597,
-  "codexAdditionalContextBytes": 7327,
   "mcpToolListJsonBytes": 48099
->>>>>>> 59e64eef88 (fix(server): t3_thread_read returns the newest items and fits in agent context (#33428))
 }

7fb6098cfd test(server): drop the flaky Kiro provider_thread_resume replay (pingdotgg#35867)

  • apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_transcript.ndjson

Upstream deleted this replay fixture; the deletion was accepted (the fork's edit to it was only recorded instruction text). Diff omitted.

b62e80e0a3 fix(web): copying an alert callout keeps its alert Markdown (pingdotgg#35932)

  • apps/web/src/components/ChatMarkdown.tsx
Resolution
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/ChatMarkdown.tsx
index de007291c6..c5341e3d2d 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -1059,17 +1059,11 @@ const CHAT_MARKDOWN_COMPONENTS = {
       </p>
     );
   },
-<<<<<<< 4e9e2a9e88 (Merge upstream through bedc8658c3 (34 commits))
   blockquote: function MarkdownBlockquote({ node, children, ...props }) {
     const { threadRef, isStreaming } = use(ChatMarkdownRendererContext);
     const text = use(ChatMarkdownTextContext);
-    const alert =
-      GITHUB_ALERT_PRESENTATIONS[String((props as Record<string, unknown>)["data-alert"] ?? "")];
-=======
-  blockquote: function MarkdownBlockquote({ node: _node, children, ...props }) {
     const alertKind = String((props as Record<string, unknown>)["data-alert"] ?? "");
     const alert = GITHUB_ALERT_PRESENTATIONS[alertKind];
->>>>>>> b62e80e0a3 (fix(web): copying an alert callout keeps its alert Markdown (#35932))
     if (!alert) {
       const quote = <blockquote {...props}>{children}</blockquote>;
       const start = node?.position?.start.offset;

43ce39595b test: run clock-free live tests on TestClock (pingdotgg#35868)

  • apps/server/src/usage/UsageService.test.ts
Resolution
diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/usage/UsageService.test.ts
index e70606cc62..0429f795b6 100644
--- a/apps/server/src/usage/UsageService.test.ts
+++ b/apps/server/src/usage/UsageService.test.ts
@@ -3670,7 +3670,6 @@ describe("UsageService", () => {
       }).pipe(Effect.scoped),
   );
 
-<<<<<<< 3dab8ca4e7 (Merge upstream through e018563669 (15 commits))
   it.live("hands out the rate table without waiting on a price download", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
@@ -3739,10 +3738,7 @@ describe("UsageService", () => {
     }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
   );
 
-  it.live("does not orphan an in-flight scan when its first caller is interrupted", () =>
-=======
   it.effect("does not orphan an in-flight scan when its first caller is interrupted", () =>
->>>>>>> 43ce39595b (test: run clock-free live tests on TestClock (#35868))
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const service = yield* UsageService.make.pipe(

38c3b56c68 docs: AGENTS.md and the FAQ list Pi, Muse Code, Kiro, and fx (pingdotgg#33906)

  • AGENTS.md
Resolution
diff --git a/AGENTS.md b/AGENTS.md
remerge CONFLICT (content): Merge conflict in AGENTS.md
index 96462de567..25bba44151 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,12 +1,8 @@
 # T3 Code
 
-<<<<<<< f46ad0989a (Merge upstream through 60f70d98cd (24 commits))
 > This checkout is 1001's fork of T3 Code. Read [fork/README.md](fork/README.md) before you change or sync it: its rules keep upstream mergeable.
 
-T3 Code is a minimal GUI for coding agents. A Node WebSocket server wraps provider CLIs and agents (Codex, Claude Code, Cursor, Grok, OpenCode, Antigravity, Kiro) and serves web, desktop, and mobile clients.
-=======
 T3 Code is a minimal GUI for coding agents. A Node WebSocket server wraps provider CLIs and agents (Codex, Claude Code, Cursor, Grok, OpenCode, Antigravity, Kiro, Pi, Muse Code, fx) and serves web, desktop, and mobile clients.
->>>>>>> 38c3b56c68 (docs: AGENTS.md and the FAQ list Pi, Muse Code, Kiro, and fx (#33906))
 
 You can think of T3 Code as an open source "bring-your-own-subscription" alternative to apps like Claude Desktop, Codex App, Cursor Glass and Conductor.

fb2e5a0128 fix(client-runtime): imported threads that never ran no longer sit in Working as Waiting (pingdotgg#33042)

  • packages/client-runtime/src/state/entities.test.ts
Resolution
diff --git a/packages/client-runtime/src/state/entities.test.ts b/packages/client-runtime/src/state/entities.test.ts
remerge CONFLICT (content): Merge conflict in packages/client-runtime/src/state/entities.test.ts
index 2c14a52cf5..f801245cec 100644
--- a/packages/client-runtime/src/state/entities.test.ts
+++ b/packages/client-runtime/src/state/entities.test.ts
@@ -99,7 +99,6 @@ describe("V2 client presentation", () => {
     ).toBeNull();
   });
 
-<<<<<<< 0a8feec1d0 (Merge upstream through 8cb55fa5a4 (5 commits))
   it("carries the scheduled task that started a thread, and nothing for other threads", () => {
     const startedByScheduledTaskId = ScheduledTaskId.make("scheduled-task:local-error-inbox");
     expect(
@@ -109,7 +108,8 @@ describe("V2 client presentation", () => {
     expect(presentThreadShell(environmentId, v2ThreadShell)).not.toHaveProperty(
       "startedByScheduledTaskId",
     );
-=======
+  });
+
   it("keeps an imported thread that never ran out of Working", () => {
     const imported = presentThreadShell(environmentId, {
       ...v2ThreadShell,
@@ -121,7 +121,6 @@ describe("V2 client presentation", () => {
       pendingBackgroundTasks: [],
     });
     expect(isThreadWorking(imported)).toBe(false);
->>>>>>> fb2e5a0128 (fix(client-runtime): imported threads that never ran no longer sit in Working as Waiting (#33042))
   });
 
   it.each([

dd7918e1e2 fix(web,mobile): MCP app calls keep their tool row and result beside the app card (pingdotgg#33347)

  • apps/web/src/session-logic.ts
Resolution
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/session-logic.ts
index f34527a469..1169838ea5 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -657,31 +657,11 @@ export function deriveTimelineEntriesFromVisibleTurnItems(
       continue;
     }
 
-<<<<<<< 37b53f6c6c (Merge upstream fb2e5a0128: fix(client-runtime): imported threads that never ran no longer sit in Working as Waiting (#33042))
-    const mcpApp = item.type === "dynamic_tool" ? mcpAppFromToolItem(item) : undefined;
-    if (mcpApp !== undefined) {
-      entries.push({
-        id: item.id,
-        kind: "mcp-app",
-        createdAt,
-        runId: item.runId,
-        sourceThreadId: row.sourceThreadId,
-        itemId: row.sourceItemId,
-        revision: turnItemDetailRevision(item),
-        mcpApp,
-        ...attemptMetadata,
-      });
-      continue;
-    }
-
     if (
       STANDALONE_V2_ITEM_TYPES.has(item.type) ||
       isMemoryProposalItem(item) ||
       isBoardTaskItem(item)
     ) {
-=======
-    if (STANDALONE_V2_ITEM_TYPES.has(item.type)) {
->>>>>>> dd7918e1e2 (fix(web,mobile): MCP app calls keep their tool row and result beside the app card (#33347))
       entries.push({
         id: item.id,
         kind: "event",

eb7e63a822 fix(server): thread reads preview linked PRs and list_thread_pull_requests pages (pingdotgg#35858)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index ed82da0955..38d959fe33 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 9a671e3adf (Merge upstream through 082a3e3c52 (10 commits))
   "claudeSystemAppendBytes": 9929,
   "codexAdditionalContextBytes": 11655,
-  "mcpToolListJsonBytes": 48099
-=======
-  "claudeSystemAppendBytes": 5597,
-  "codexAdditionalContextBytes": 7327,
   "mcpToolListJsonBytes": 48094
->>>>>>> eb7e63a822 (fix(server): thread reads preview linked PRs and list_thread_pull_requests pages (#35858))
 }

0568a63aac fix(server): agents point to Settings → Labs when the link tools are hidden (pingdotgg#30371)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index 3e3683802e..33c7056cac 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,10 +1,5 @@
 {
-<<<<<<< c6e1e23c9e (Merge upstream through d3ef7e8e52 (27 commits))
-  "claudeSystemAppendBytes": 9929,
-  "codexAdditionalContextBytes": 11655,
-=======
-  "claudeSystemAppendBytes": 5594,
-  "codexAdditionalContextBytes": 7324,
->>>>>>> 0568a63aac (fix(server): agents point to Settings → Labs when the link tools are hidden (#30371))
+  "claudeSystemAppendBytes": 9926,
+  "codexAdditionalContextBytes": 11652,
   "mcpToolListJsonBytes": 48094
 }

a09e54a363 fix(server): proxied usage limits take their reset time from the CLIProxyAPI hub (pingdotgg#36238)

  • apps/server/src/server.ts
Resolution
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/server.ts
index 6a0680201a..b9d0580b53 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -589,11 +589,8 @@ const layerScheduledTaskWebhookOrigin = Layer.effect(
 );
 
 const layerOrchestrationV2Runtime = RuntimeLayer.layerProduction.pipe(
-<<<<<<< f997015386 (Merge upstream through 7ab4650030 (28 commits))
   Layer.provideMerge(MemoryLayer.layerForOrchestration),
-=======
   Layer.provide(UsageLimitSources.layerResetFallback),
->>>>>>> a09e54a363 (fix(server): proxied usage limits take their reset time from the CLIProxyAPI hub (#36238))
   Layer.provide(layerScheduledTaskWebhookOrigin),
   Layer.provide(ProviderUsageAnalytics.layer),
   Layer.provide(layerCheckpointStore),

c165587702 fix(provider-cursor): Cursor threads report token usage and context fill (pingdotgg#36323)

  • packages/provider-cursor/src/server/adapter.test.ts
  • packages/provider-cursor/src/server/adapter.ts
Resolution
diff --git a/packages/provider-cursor/src/server/adapter.test.ts b/packages/provider-cursor/src/server/adapter.test.ts
remerge CONFLICT (content): Merge conflict in packages/provider-cursor/src/server/adapter.test.ts
index f934918790..9a535eb9b5 100644
--- a/packages/provider-cursor/src/server/adapter.test.ts
+++ b/packages/provider-cursor/src/server/adapter.test.ts
@@ -15,7 +15,6 @@ import {
   RunAttemptId,
   RunId,
   ThreadId,
-  type TurnTokenUsage,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import * as DateTime from "effect/DateTime";
@@ -370,21 +369,9 @@ describe("CursorAdapterV2", () => {
       // delivered, regenerated the closing, then gave up on the run.
       updates: [
         { type: "text-delta", text: "The answer." },
-        {
-          type: "turn-ended",
-          usage: { inputTokens: 100, outputTokens: 40, cacheReadTokens: 900, cacheWriteTokens: 50 },
-        },
+        { type: "turn-ended" },
         { type: "text-delta", text: "A regenerated closing." },
-        {
-          type: "turn-ended",
-          usage: {
-            inputTokens: 10,
-            outputTokens: 5,
-            cacheReadTokens: 1_000,
-            cacheWriteTokens: 0,
-            reasoningTokens: 3,
-          },
-        },
+        { type: "turn-ended" },
       ] satisfies ReadonlyArray<InteractionUpdate>,
       wait: Effect.succeed({
         id: "native-cursor-run",
@@ -395,17 +382,6 @@ describe("CursorAdapterV2", () => {
         durationMs: 1,
       }),
       failure: null,
-      // Every turn-ended in the run counts, with cache reads and writes inside input.
-      turnTokenUsage: {
-        usageScope: "main_agent",
-        usageStatus: "complete",
-        hasSubagents: false,
-        inputTokens: 2_060,
-        outputTokens: 45,
-        cachedInputTokens: 1_900,
-        cacheCreationTokens: 50,
-        reasoningTokens: 3,
-      } satisfies TurnTokenUsage,
     },
     {
       reason: "the error a continuation after the turn ended stopped with",
@@ -442,9 +418,6 @@ describe("CursorAdapterV2", () => {
       failure: null,
       answers: [],
     },
-<<<<<<< 7e201a6820 (Merge upstream through 66ec37079a (17 commits))
-  ])("ends the turn with $reason", ({ updates = [], wait, failure, answers, turnTokenUsage }) =>
-=======
     {
       reason: "the token usage Cursor reported",
       // Cursor's inputTokens already include cache reads and writes.
@@ -478,7 +451,6 @@ describe("CursorAdapterV2", () => {
       contextFill: { usedTokens: 8_304, maxTokens: 200_000 },
     },
   ])("ends the turn with $reason", ({ updates = [], wait, failure, answers, usage, contextFill }) =>
->>>>>>> c165587702 (fix(provider-cursor): Cursor threads report token usage and context fill (#36323))
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
       const workspace = yield* fileSystem.makeTempDirectoryScoped({
@@ -591,15 +563,6 @@ describe("CursorAdapterV2", () => {
           answers,
         );
       }
-<<<<<<< 7e201a6820 (Merge upstream through 66ec37079a (17 commits))
-      if (turnTokenUsage !== undefined) {
-        const finished = events.findLast(
-          (event) =>
-            event.type === "provider_turn.updated" && event.providerTurn.status !== "running",
-        );
-        assert(finished?.type === "provider_turn.updated");
-        assert.deepEqual(finished.providerTurn.turnTokenUsage, turnTokenUsage);
-=======
       if (usage !== undefined) {
         const completedTurn = events.findLast(
           (event) =>
@@ -608,7 +571,6 @@ describe("CursorAdapterV2", () => {
         assert(completedTurn?.type === "provider_turn.updated");
         assert.deepInclude(completedTurn.providerTurn.turnTokenUsage, usage);
         assert.deepInclude(completedTurn.providerTurn.tokenUsage, contextFill);
->>>>>>> c165587702 (fix(provider-cursor): Cursor threads report token usage and context fill (#36323))
       }
     }).pipe(
       Effect.scoped,
diff --git a/packages/provider-cursor/src/server/adapter.ts b/packages/provider-cursor/src/server/adapter.ts
remerge CONFLICT (content): Merge conflict in packages/provider-cursor/src/server/adapter.ts
index 42ce070b57..02ec1ce09d 100644
--- a/packages/provider-cursor/src/server/adapter.ts
+++ b/packages/provider-cursor/src/server/adapter.ts
@@ -49,7 +49,6 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderS
 import * as McpProviderSession from "@t3tools/provider-core/server/mcpSession";
 import { CursorTransportFailure } from "./transportFailure.ts";
 import { cursorContextWindowTokens, cursorSdkModelSelection } from "./sdkModel.ts";
-import { type CursorTurnUsage, cursorTurnTokenUsage } from "./turnTokenUsage.ts";
 import {
   appendCursorInvokedSkills,
   cursorSlashSkillNames,
@@ -965,13 +964,9 @@ interface ActiveCursorTurn {
   finalized: boolean;
   /** The agent's latest turn ended and no new work has started since. */
   turnEnded: boolean;
-<<<<<<< 7e201a6820 (Merge upstream through 66ec37079a (17 commits))
-  readonly usages: CursorTurnUsage[];
-=======
   readonly session: CursorAgentSdk.CursorAgentSdkSession;
   /** What Cursor billed for this run, summed over its turn-ended updates. */
   usage: CursorTurnUsage | undefined;
->>>>>>> c165587702 (fix(provider-cursor): Cursor threads report token usage and context fill (#36323))
 }
 
 type CursorTurnUsage = NonNullable<Extract<InteractionUpdate, { type: "turn-ended" }>["usage"]>;
@@ -2048,13 +2043,9 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
           }
           if (update.type === "turn-ended") {
             context.turnEnded = true;
-<<<<<<< 7e201a6820 (Merge upstream through 66ec37079a (17 commits))
-            if (update.usage !== undefined) context.usages.push(update.usage);
-=======
             if (update.usage !== undefined) {
               context.usage = addCursorTurnUsage(context.usage, update.usage);
             }
->>>>>>> c165587702 (fix(provider-cursor): Cursor threads report token usage and context fill (#36323))
           } else if (
             update.type === "step-started" ||
             update.type === "user-message-appended" ||
@@ -2229,20 +2220,6 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
           yield* emitProviderEvent({
             type: "provider_turn.updated",
             driver: CursorAgentSdk.CURSOR_PROVIDER,
-<<<<<<< 7e201a6820 (Merge upstream through 66ec37079a (17 commits))
-            providerTurn: {
-              ...providerTurnPayload({
-                context: input.context,
-                status: input.status,
-                completedAt,
-              }),
-              turnTokenUsage: cursorTurnTokenUsage(
... 82 more lines

aab388ddb1 fix(server): Claude can show the user mid-turn text in full (pingdotgg#36384)

  • apps/server/src/provider/agentContextBudget.json
  • apps/web/src/session-logic.ts
  • packages/shared/src/t3McpToolPresentation.ts
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index 29f6527073..30ec047401 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< d34913ba38 (Merge upstream through 0517d15c41 (28 commits))
-  "claudeSystemAppendBytes": 9926,
+  "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 48094
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 48566
->>>>>>> aab388ddb1 (fix(server): Claude can show the user mid-turn text in full (#36384))
 }
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/session-logic.ts
index d83a49a963..a637125412 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -25,17 +25,13 @@ import {
 import type { HtmlRenderReference } from "@t3tools/shared/htmlRender";
 import { turnItemDetailRevision } from "@t3tools/client-runtime/work-log/item-detail";
 import type { McpAppReference } from "@t3tools/shared/mcpApp";
-<<<<<<< d34913ba38 (Merge upstream through 0517d15c41 (28 commits))
-import { htmlRenderFromToolItem, mcpAppFromToolItem } from "@t3tools/shared/toolOutput";
-import { isBoardTaskItem } from "./components/board/boardTaskCard.logic";
-import { isMemoryProposalItem } from "./components/memory/memoryProposal.logic";
-=======
 import {
   htmlRenderFromToolItem,
   mcpAppFromToolItem,
   sentMessageFromToolItem,
 } from "@t3tools/shared/toolOutput";
->>>>>>> aab388ddb1 (fix(server): Claude can show the user mid-turn text in full (#36384))
+import { isBoardTaskItem } from "./components/board/boardTaskCard.logic";
+import { isMemoryProposalItem } from "./components/memory/memoryProposal.logic";
 import {
   contextCompactionLabel,
   workEntryIndicatesToolFailure,
@@ -672,13 +668,6 @@ export function deriveTimelineEntriesFromVisibleTurnItems(
       continue;
     }
 
-<<<<<<< d34913ba38 (Merge upstream through 0517d15c41 (28 commits))
-    if (
-      STANDALONE_V2_ITEM_TYPES.has(item.type) ||
-      isMemoryProposalItem(item) ||
-      isBoardTaskItem(item)
-    ) {
-=======
     const sentMessage =
       item.type === "dynamic_tool" && item.status === "completed"
         ? sentMessageFromToolItem(item)
@@ -695,8 +684,11 @@ export function deriveTimelineEntriesFromVisibleTurnItems(
       continue;
     }
 
-    if (STANDALONE_V2_ITEM_TYPES.has(item.type)) {
->>>>>>> aab388ddb1 (fix(server): Claude can show the user mid-turn text in full (#36384))
+    if (
+      STANDALONE_V2_ITEM_TYPES.has(item.type) ||
+      isMemoryProposalItem(item) ||
+      isBoardTaskItem(item)
+    ) {
       entries.push({
         id: item.id,
         kind: "event",
diff --git a/packages/shared/src/t3McpToolPresentation.ts b/packages/shared/src/t3McpToolPresentation.ts
remerge CONFLICT (content): Merge conflict in packages/shared/src/t3McpToolPresentation.ts
index a989f9885a..a7a68c9092 100644
--- a/packages/shared/src/t3McpToolPresentation.ts
+++ b/packages/shared/src/t3McpToolPresentation.ts
@@ -376,12 +376,8 @@ const T3_MCP_TOOLS: Readonly<Record<string, T3McpToolDefinition>> = withForkT3Mc
   t3_thread_send_attachments: tool(["Send", "Sending", "Sent", "attachments"], "attachment-send"),
   html_preview: tool(["Preview", "Previewing", "Previewed", "an HTML page"], "html-preview"),
   html_render: tool(["Render", "Rendering", "Rendered", "an HTML page"], "html-render"),
-<<<<<<< d34913ba38 (Merge upstream through 0517d15c41 (28 commits))
-});
-=======
   send_to_user: tool(["Send", "Sending", "Sent", "a message"], "send-to-user"),
-};
->>>>>>> aab388ddb1 (fix(server): Claude can show the user mid-turn text in full (#36384))
+});
 
 export const T3_MCP_TOOL_NAMES: ReadonlySet<string> = new Set([
   ...Object.keys(T3_MCP_TOOLS),

9f94a876b7 fix(cli): tagged source builds report the release version (pingdotgg#36350)

  • apps/web/tsconfig.json
Resolution
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
remerge CONFLICT (content): Merge conflict in apps/web/tsconfig.json
index d0c3f48dfd..7175038867 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -39,11 +39,8 @@
     "scripts/verify-built-boot.ts",
     "scripts/warm-dep-cache.ts",
     "../../scripts/lib/public-config.ts",
-<<<<<<< a06b50fde9 (Merge upstream aab388ddb1: fix(server): Claude can show the user mid-turn text in full (#36384))
     "../../scripts/lib/private-modules.ts",
-=======
     "../../scripts/lib/tagged-source-version.ts",
->>>>>>> 9f94a876b7 (fix(cli): tagged source builds report the release version (#36350))
     "../../scripts/lib/third-party-licenses.ts"
   ]
 }

70b052904b ci(mobile): iOS jobs run on macos-27, store builds require the final Xcode 27.1 (pingdotgg#36421)

  • .github/workflows/ci.yml
Resolution
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
remerge CONFLICT (content): Merge conflict in .github/workflows/ci.yml
index 7a09dac411..77b60081db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -591,11 +591,7 @@ jobs:
     name: Mobile Native Static Analysis
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.mobile_native != 'false' }}
-<<<<<<< 7950f9953d (Merge upstream through 36f011dfb7 (14 commits))
     runs-on: macos-26
-=======
-    runs-on: blacksmith-6vcpu-macos-27
->>>>>>> 70b052904b (ci(mobile): iOS jobs run on macos-27, store builds require the final Xcode 27.1 (#36421))
     timeout-minutes: 10
     steps:
       - name: Checkout

08b8689a85 fix(provider-grok): Grok follow-ups queue instead of cancelling the running tool (pingdotgg#36422)

  • apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson

Upstream deleted this replay fixture; the deletion was accepted (the fork's edit to it was only recorded instruction text). Diff omitted.

4bab2f3ae7 perf(server): a new thread's first turn starts sooner (pingdotgg#35710)

  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/RunExecutionService.ts
Resolution
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
index 3099822e16..f14e5eb5a6 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
@@ -12260,15 +12260,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
             turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1;
           const shouldResume =
             resumeSessionAt !== undefined || openedWithResume || hasPersistedProviderTurn;
-<<<<<<< 0ede08faa0 (Merge upstream through 44fefbcbc4 (16 commits))
-          const toolSearchOverride = yield* resolveToolSearchOverride(
-            turnInput.runtimePolicy.cwd,
-            launchArgSettings,
-          );
           const unlockedQueryOptions = makeClaudeQueryOptions({
-=======
-          const queryOptions = makeClaudeQueryOptions({
->>>>>>> 4bab2f3ae7 (perf(server): a new thread's first turn starts sooner (#35710))
             modelSelection: turnInput.modelSelection,
             modelCatalog,
             nativeThreadId,
diff --git a/apps/server/src/orchestration-v2/RunExecutionService.ts b/apps/server/src/orchestration-v2/RunExecutionService.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/RunExecutionService.ts
index 58516f120b..25b5ceacae 100644
--- a/apps/server/src/orchestration-v2/RunExecutionService.ts
+++ b/apps/server/src/orchestration-v2/RunExecutionService.ts
@@ -938,7 +938,13 @@ export const layer: Layer.Layer<
       input: RunBaselineInput,
     ) {
       // Side chats share the parent's worktree; a snapshot would capture the parent's edits.
-      if (input.appThread.lineage.sideChat === true) return;
+      if (
+        input.appThread.lineage.sideChat === true ||
+        // Fork: so does the Inbox at the project root; see fork/README.md.
+        isInboxThread(input.appThread.id)
+      ) {
+        return;
+      }
       yield* checkpointService
         .captureBaseline({
           scope: input.checkpointScope,
@@ -1009,30 +1015,7 @@ export const layer: Layer.Layer<
                   .responseStreamingMode,
             ),
           );
-<<<<<<< 0ede08faa0 (Merge upstream through 44fefbcbc4 (16 commits))
-          // Side chats share the parent's worktree; a snapshot would capture the parent's edits.
-          yield* (
-            input.appThread.lineage.sideChat === true ||
-            // Fork: so does the Inbox at the project root; see fork/README.md.
-            isInboxThread(input.appThread.id)
-              ? Effect.void
-              : checkpointService.captureBaseline({
-                  scope: input.checkpointScope,
-                  ordinalWithinScope: Math.max(0, input.run.ordinal - 1),
-                })
-          ).pipe(
-            Effect.catchCauseIf(
-              (cause) => !Cause.hasInterruptsOnly(cause),
-              (_cause) =>
-                Effect.logWarning(
-                  "orchestration V2 checkpoint baseline capture failed; starting provider without a baseline",
-                  { runId: input.run.id },
-                ),
-            ),
-          );
-=======
           yield* input.baseline ?? captureRunBaseline(input);
->>>>>>> 4bab2f3ae7 (perf(server): a new thread's first turn starts sooner (#35710))
           if (
             input.shouldStartProviderTurn !== undefined &&
             !(yield* input.shouldStartProviderTurn())

42057b82d0 feat: agents can restyle T3 Code with theme colors and CSS (pingdotgg#35247)

  • apps/server/src/provider/agentContextBudget.json
  • apps/web/src/components/chat/TimelineUserMessageRow.tsx
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index e296201348..1acd47811e 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 48ffa8e54f (Merge upstream through cbf0f0a83f (4 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 48566
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49806
->>>>>>> 42057b82d0 (feat: agents can restyle T3 Code with theme colors and CSS (#35247))
 }
diff --git a/apps/web/src/components/chat/TimelineUserMessageRow.tsx b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/TimelineUserMessageRow.tsx
index edde29707b..f273db33b4 100644
--- a/apps/web/src/components/chat/TimelineUserMessageRow.tsx
+++ b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
@@ -882,12 +882,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
           !folded && !mediaOnly && !fileCardsOnly && !audioOnly && "p-3",
           folded && expanded && "w-full",
         )}
-<<<<<<< 48ffa8e54f (Merge upstream through cbf0f0a83f (4 commits))
         {...exchangeBubble}
         onContextMenu={messageMenu.onContextMenu}
-=======
         data-user-message-bubble=""
->>>>>>> 42057b82d0 (feat: agents can restyle T3 Code with theme colors and CSS (#35247))
       >
         {/* Outside the fold so a collapsed message still has a heading to navigate to. */}
         {mediaAboveText ? null : (

bf9b8b7845 fix(server): Claude on Bedrock runs the model picked in the composer (pingdotgg#24695)

  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Resolution
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
index b6303a3b6e..5bc6ff95e7 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
@@ -12131,20 +12131,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
               ? {}
               : { allowedTools: queryPolicy.allowedTools }),
           });
-<<<<<<< 472a4cb933 (Merge upstream through a81ec88f58 (67 commits))
           const queryPolicyKey = yield* claudeMemoryQueryKey(
             claudeEffectiveQueryPolicyKey(queryPolicy, mcpOverrides),
             turnInput.memory,
             yield* Ref.get(queryContext),
             liveProcessRunsBackgroundWork,
           );
-          const compiledSelection = compileClaudeModelSelection(
-            turnInput.modelSelection,
-            modelCatalog,
-          );
-=======
-          const queryPolicyKey = claudeEffectiveQueryPolicyKey(queryPolicy, mcpOverrides);
->>>>>>> bf9b8b7845 (fix(server): Claude on Bedrock runs the model picked in the composer (#24695))
           const resumeSessionAt = yield* getNativeConversationHeadId(turnInput.providerThread);
           const existing = yield* Ref.get(queryContext);
           // Continuations drain existing output without prompting; retain the live process regardless of selection.

efae4e9da1 fix(client): retry unread thread visits after reconnect (pingdotgg#36559)

  • packages/client-runtime/src/state/threadVisits.ts
Resolution
diff --git a/packages/client-runtime/src/state/threadVisits.ts b/packages/client-runtime/src/state/threadVisits.ts
remerge CONFLICT (content): Merge conflict in packages/client-runtime/src/state/threadVisits.ts
index b67d3a8308..6e6f081fec 100644
--- a/packages/client-runtime/src/state/threadVisits.ts
+++ b/packages/client-runtime/src/state/threadVisits.ts
@@ -189,17 +189,12 @@ export function createThreadVisitTracker(options: ThreadVisitTrackerOptions) {
         const hasUnseenCompletion =
           !Number.isNaN(completedAtMs) &&
           (Number.isNaN(lastVisitedAtMs) || completedAtMs > lastVisitedAtMs);
-<<<<<<< f092022530 (Merge upstream through 00ec286fef (14 commits))
-        const elapsed = Date.now() - lastDispatchAt;
         if (
           hasUnseenCompletion ||
           hasUnseenQuestions(shell) ||
           wakeIsLatest ||
           elapsed >= VISIT_DISPATCH_THROTTLE_MS
         ) {
-=======
-        if (hasUnseenCompletion || wakeIsLatest || elapsed >= VISIT_DISPATCH_THROTTLE_MS) {
->>>>>>> efae4e9da1 (fix(client): retry unread thread visits after reconnect (#36559))
           dispatch(shell, visitedAt, false);
           return;
         }

9e19b7f7e1 feat(server): resume stopped provider threads natively (pingdotgg#36526)

  • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
Resolution
diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/ProviderTurnStartService.ts
index db36cf450a..de781819f7 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
@@ -775,22 +775,15 @@ export const layer: Layer.Layer<
       });
       let effectiveHandoffs = handoffs;
       let resumeFellBack = false;
-<<<<<<< e83017cc0a (Merge upstream through 651accb100 (36 commits))
       // Fork: an Inbox message carries its digest; see fork/README.md.
       const userText = inboxAgentProviderText(
         projectComposerContextForProvider({
-          text: message.text,
-          records: message.context?.records ?? [],
+          text: providerMessage.text,
+          records: providerMessage.context?.records ?? [],
         }),
-        message,
+        providerMessage,
         projection.thread,
       );
-=======
-      const userText = projectComposerContextForProvider({
-        text: providerMessage.text,
-        records: providerMessage.context?.records ?? [],
-      });
->>>>>>> 9e19b7f7e1 (feat(server): resume stopped provider threads natively (#36526))
       // Native goal commands go verbatim; handoff history waits a turn.
       const goalDriver =
         session.driver === "codex" ||

121f0cf014 fix(server): t3_thread_list clamps an oversized limit instead of failing (pingdotgg#27814)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index 32bc114703..ec918b011c 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 876b03f570 (Merge upstream through 3d3275b067 (34 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49806
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49792
->>>>>>> 121f0cf014 (fix(server): t3_thread_list clamps an oversized limit instead of failing (#27814))
 }

719042d942 fix(server): MCP-launched threads no longer flash in Inbox before Working (pingdotgg#36682)

  • apps/server/src/orchestration-v2/ThreadManagementService.ts
Resolution
diff --git a/apps/server/src/orchestration-v2/ThreadManagementService.ts b/apps/server/src/orchestration-v2/ThreadManagementService.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/ThreadManagementService.ts
index b1d240f5a3..1ac381cb32 100644
--- a/apps/server/src/orchestration-v2/ThreadManagementService.ts
+++ b/apps/server/src/orchestration-v2/ThreadManagementService.ts
@@ -84,20 +84,15 @@ export function withCreationProvenance(
 ): OrchestrationV2Command {
   switch (command.type) {
     case "thread.create": {
-<<<<<<< e4a4ca7909 (Merge upstream through 12102c74a3 (63 commits))
-      // Only the server stamps a link's origin, so a client cannot set one.
-      const { linkOrigin: _linkOrigin, delegatedFrom: _delegatedFrom, ...stamped } = command;
-      // Fork: only the voice agent service names a chat as its thread's parent.
-      const { voiceAgentOf: _voiceAgentOf, ...rest } = stamped;
-=======
       // Only the server stamps a link's origin or folds in a first message, so a client cannot.
       const {
         linkOrigin: _linkOrigin,
         delegatedFrom: _delegatedFrom,
         initialMessage: _initialMessage,
-        ...rest
+        ...stamped
       } = command;
->>>>>>> 719042d942 (fix(server): MCP-launched threads no longer flash in Inbox before Working (#36682))
+      // Fork: only the voice agent service names a chat as its thread's parent.
+      const { voiceAgentOf: _voiceAgentOf, ...rest } = stamped;
       return { ...rest, ...provenance };
     }
     case "message.dispatch":

ed0178487d fix(usage): refetch cached rates early for a model they do not list (pingdotgg#33725)

  • apps/server/src/usage/UsageService.test.ts
Resolution
diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/usage/UsageService.test.ts
index fba5650ac1..1e2abfba66 100644
--- a/apps/server/src/usage/UsageService.test.ts
+++ b/apps/server/src/usage/UsageService.test.ts
@@ -3771,7 +3771,6 @@ describe("UsageService", () => {
       }),
   );
 
-<<<<<<< 7692e0a83c (Merge upstream through f968db10d7 (75 commits))
   it.live("hands out the rate table without waiting on a price download", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
@@ -3838,7 +3837,8 @@ describe("UsageService", () => {
         ),
       );
     }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
-=======
+  );
+
   it.effect("refetches cached rates early for a model they do not list", () =>
     Effect.gen(function* () {
       yield* TestClock.setTime(Date.parse("2026-08-02T00:00:00Z"));
@@ -3887,7 +3887,6 @@ describe("UsageService", () => {
       yield* service.readSummary(WINDOW);
       assert.strictEqual(requests.length, 2);
     }),
->>>>>>> ed0178487d (fix(usage): refetch cached rates early for a model they do not list (#33725))
   );
 
   it.effect("does not orphan an in-flight scan when its first caller is interrupted", () =>

3238db7a86 fix(web): Cite is offered for text an agent sent with send_to_user (pingdotgg#36858)

  • apps/web/src/components/chat/citationProcedure.test.ts
  • apps/web/src/components/chat/citationProcedure.ts
Resolution
diff --git a/apps/web/src/components/chat/citationProcedure.test.ts b/apps/web/src/components/chat/citationProcedure.test.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/citationProcedure.test.ts
index 422059e2fb..0262752041 100644
--- a/apps/web/src/components/chat/citationProcedure.test.ts
+++ b/apps/web/src/components/chat/citationProcedure.test.ts
@@ -178,9 +178,6 @@ describe("resolveCitationPhase", () => {
     });
   });
 
-<<<<<<< 84efc05037 (Merge upstream through ec01233fb6 (22 commits))
-  it("is ready for a user message, which back-references open", () => {
-=======
   it("finds text an agent sent with send_to_user by its item id", () => {
     const sent: TimelineEntry = {
       kind: "sent-message",
@@ -198,8 +195,7 @@ describe("resolveCitationPhase", () => {
     ).toEqual({ _tag: "ready", rowId: messageId });
   });
 
-  it("fails for a citation that names a user message", () => {
->>>>>>> 3238db7a86 (fix(web): Cite is offered for text an agent sent with send_to_user (#36858))
+  it("is ready for a user message, which back-references open", () => {
     const userEntry: TimelineEntry = {
       ...entry,
       message: { ...entry.message, role: "user" },
diff --git a/apps/web/src/components/chat/citationProcedure.ts b/apps/web/src/components/chat/citationProcedure.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/citationProcedure.ts
index 9138ca0902..9ced37782c 100644
--- a/apps/web/src/components/chat/citationProcedure.ts
+++ b/apps/web/src/components/chat/citationProcedure.ts
@@ -93,16 +93,13 @@ export function resolveCitationPhase(input: {
   );
   // The history store can hold the message a render before the entries do.
   if (!source) return { _tag: "loading" };
-<<<<<<< 84efc05037 (Merge upstream through ec01233fb6 (22 commits))
   if (
-    source.kind !== "message" ||
-    (source.message.role !== "assistant" && source.message.role !== "user")
+    source.kind === "message" &&
+    source.message.role !== "assistant" &&
+    source.message.role !== "user"
   ) {
     return { _tag: "failed" };
   }
-=======
-  if (source.kind === "message" && source.message.role !== "assistant") return { _tag: "failed" };
->>>>>>> 3238db7a86 (fix(web): Cite is offered for text an agent sent with send_to_user (#36858))
   const row = input.rows.find(
     (candidate) =>
       (candidate.kind === "message" && candidate.message.id === input.messageId) ||

0035cb55bb fix(server): filter scheduled tasks without exposing webhook URLs (pingdotgg#27716)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index 0e0e509fca..6f986fd60c 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< e62410ecdb (Merge upstream through e5c636219c (40 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49792
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49791
->>>>>>> 0035cb55bb (fix(server): filter scheduled tasks without exposing webhook URLs (#27716))
 }

fa647599e0 fix(web): Arabic and Hebrew artifact template cards read right to left (pingdotgg#36922)

  • apps/web/src/components/ChatMarkdown.tsx
Resolution
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/ChatMarkdown.tsx
index c72693d17a..da550289f6 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -185,11 +185,8 @@ import {
 import { resolvePullRequestPreviewTarget } from "@t3tools/client-runtime/change-request-links";
 import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
 import { useOpenChangeRequestLink } from "~/lib/openPullRequestLink";
-<<<<<<< 1af89debfc (Merge upstream through 42bfd1f377 (22 commits))
 import { boardIssueLinksFirst, useOpenBoardIssueLink } from "./board/boardIssueLinks";
-=======
 import { textDirection } from "~/textDirection";
->>>>>>> fa647599e0 (fix(web): Arabic and Hebrew artifact template cards read right to left (#36922))
 import { useOpenLink } from "../browser/useOpenLink";
 import { writeTextToClipboard } from "../hooks/useCopyToClipboard";
 import { isPreviewAvailableFor } from "../browser/previewRuntime";

5393882fb8 fix(mcp): return delegated task handles before client timeouts (pingdotgg#15622)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index e15c485d46..ac3aa7f17b 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< c924af41b0 (Merge upstream through b9a68e0f57 (4 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49791
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49790
->>>>>>> 5393882fb8 (fix(mcp): return delegated task handles before client timeouts (#15622))
 }

cbdf35f2f0 fix(web): enable Send when the composer holds only a thread context (pingdotgg#23166)

  • apps/web/src/components/chat/ChatComposer.tsx
Resolution
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/ChatComposer.tsx
index 4ec6cce17f..6ce2470b1d 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -1120,14 +1120,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     existingAttachmentCount: editingQueuedAttachments?.length ?? 0,
     terminalContexts: composerTerminalContexts,
     elementContextCount:
-<<<<<<< be450a0a94 (Merge upstream through 632802cd32 (6 commits))
-      composerPreviewAnnotations.length + composerReviewComments.length + replyAnnotations.length,
-=======
       composerPreviewAnnotations.length +
       composerReviewComments.length +
       composerThreadContexts.length +
-      composerEnvironmentContexts.length,
->>>>>>> cbdf35f2f0 (fix(web): enable Send when the composer holds only a thread context (#23166))
+      composerEnvironmentContexts.length +
+      replyAnnotations.length,
   });
   const composerTriggerKind = composerTrigger?.kind ?? null;
   const compactSlashCommandAvailable =

dfd2187ccb fix(server): t3_thread_launch worktrees honor the new-worktree setting (pingdotgg#30226)

  • apps/server/src/mcp/toolkits/project/handlers.ts
Resolution
diff --git a/apps/server/src/mcp/toolkits/project/handlers.ts b/apps/server/src/mcp/toolkits/project/handlers.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/mcp/toolkits/project/handlers.ts
index 6ccb7bc626..71ff5f17d0 100644
--- a/apps/server/src/mcp/toolkits/project/handlers.ts
+++ b/apps/server/src/mcp/toolkits/project/handlers.ts
@@ -229,20 +229,7 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
         // A caller outside a thread has nothing to inherit, so it starts with the
         // project's effective defaults, as the composer does. Its mode stays
         // within the ceiling it was approved with.
-<<<<<<< d72b6cb56e (Merge upstream through c6aea18476 (15 commits))
-        const projectDefaults =
-          inheritsFrom === undefined && project !== undefined
-            ? yield* ServerSettings.ServerSettingsService.pipe(
-                Effect.flatMap((settings) => settings.getSettings),
-                Effect.mapError(unavailable),
-                Effect.map(
-                  (settings) => resolveProjectSettings(settings, projectId, project).settings,
-                ),
-              )
-            : undefined;
-=======
-        const projectDefaults = caller === undefined ? projectSettings : undefined;
->>>>>>> dfd2187ccb (fix(server): t3_thread_launch worktrees honor the new-worktree setting (#30226))
+        const projectDefaults = inheritsFrom === undefined ? projectSettings : undefined;
         const modelSelection =
           input.modelSelection ??
           launchedModel ??

2b6c14bbf1 fix(web): diff file Open and Reveal reach a file whose name has a backslash (pingdotgg#23167)

  • apps/web/src/components/chat/TimelineAssistantRows.tsx
Resolution
diff --git a/apps/web/src/components/chat/TimelineAssistantRows.tsx b/apps/web/src/components/chat/TimelineAssistantRows.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/TimelineAssistantRows.tsx
index c2934505e4..10f22d0e47 100644
--- a/apps/web/src/components/chat/TimelineAssistantRows.tsx
+++ b/apps/web/src/components/chat/TimelineAssistantRows.tsx
@@ -32,7 +32,6 @@ import { readThreadTurnItems } from "../../state/entities";
 import { useV2ItemSupport } from "../../state/v2ItemSupport";
 import { TimelineRowCtx, TimelineRowActivityCtx, type TimelineRow } from "./timelineRowContext";
 import { MESSAGE_HEADING_LEVEL, MessageAuthorHeading } from "./TimelineRowParts";
-<<<<<<< 4deada1256 (Merge upstream through e82050b8b9 (20 commits))
 import {
   ExchangeReLines,
   ExchangeReplyMarker,
@@ -41,13 +40,11 @@ import {
 } from "./ExchangeThread";
 import { useMessageContextMenu } from "./MessageContextMenu";
 import { splitReLines, textAfterReLines } from "@t3tools/shared/replyMarkers";
-=======
 import { useAtomValue } from "@effect/atom-react";
 import { AsyncResult, Atom } from "effect/reactivity";
 import { vcsEnvironment } from "../../state/vcs";
 
 const NO_VCS_STATUS = Atom.make(AsyncResult.initial());
->>>>>>> 2b6c14bbf1 (fix(web): diff file Open and Reveal reach a file whose name has a backslash (#23167))
 
 export function AssistantTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message" }> }) {
   const ctx = use(TimelineRowCtx);

f7b0b3c4d7 fix(server): MCP list tools clamp an oversized limit instead of failing (pingdotgg#30976)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index d2d0521a92..c578f0d062 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 6e8cbee463 (Merge upstream through ec844a3995 (21 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49790
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49749
->>>>>>> f7b0b3c4d7 (fix(server): MCP list tools clamp an oversized limit instead of failing (#30976))
 }

mfituri commented Nov 19, 2026 •

Copy link
Copy Markdown
Author

Resolution diffs (2/2)

Updated for the rebuilt branch (head dabb137907); this replaces the first branch's version.

What each conflict stop resolved to, as git show --remerge-diff of that step's merge.

c1a7ce362b fix(desktop): Check for Updates says when an update is available (pingdotgg#31957)

  • apps/desktop/src/window/DesktopApplicationMenu.test.ts
Resolution
diff --git a/apps/desktop/src/window/DesktopApplicationMenu.test.ts b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
remerge CONFLICT (content): Merge conflict in apps/desktop/src/window/DesktopApplicationMenu.test.ts
index eb9c8ba959..fb2bd8cce7 100644
--- a/apps/desktop/src/window/DesktopApplicationMenu.test.ts
+++ b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
@@ -20,11 +20,8 @@ import * as DesktopApplicationMenu from "./DesktopApplicationMenu.ts";
 import * as DesktopConfig from "../app/DesktopConfig.ts";
 import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
 import * as DesktopUpdates from "../updates/DesktopUpdates.ts";
-<<<<<<< 4bef25c9e8 (Merge upstream through dd3d4a4e4a (36 commits))
 import * as DesktopSelfUpdate from "../updates/DesktopSelfUpdate.ts";
-=======
 import { createInitialDesktopUpdateState } from "../updates/updateMachine.ts";
->>>>>>> c1a7ce362b (fix(desktop): Check for Updates says when an update is available (#31957))
 import * as DesktopWindow from "./DesktopWindow.ts";
 
 const environmentInput = {
@@ -140,14 +137,11 @@ const configureMenu = (
       DesktopApplicationMenu.layer.pipe(
         Layer.provideMerge(layerElectronMenu(applicationMenuTemplate)),
         Layer.provideMerge(layerDesktopWindow(selectedAction)),
-<<<<<<< 4bef25c9e8 (Merge upstream through dd3d4a4e4a (36 commits))
-        Layer.provideMerge(layerDesktopUpdates),
-        Layer.provideMerge(Layer.mock(DesktopSelfUpdate.DesktopSelfUpdate, {})),
-        Layer.provideMerge(layerElectronDialog),
-=======
         Layer.provideMerge(layerDesktopUpdates(services)),
+        Layer.provideMerge(
+          Layer.mock(DesktopSelfUpdate.DesktopSelfUpdate, { enabled: Effect.succeed(false) }),
+        ),
         Layer.provideMerge(layerElectronDialog(services)),
->>>>>>> c1a7ce362b (fix(desktop): Check for Updates says when an update is available (#31957))
         Layer.provideMerge(layerElectronApp),
         Layer.provideMerge(
           DesktopEnvironment.layer({ ...environmentInput, ...environment }).pipe(

d23f479a87 fix(web): right panel shortcuts work while a side chat has focus (pingdotgg#32117)

  • apps/web/src/components/chat/useChatShortcuts.ts
Resolution
diff --git a/apps/web/src/components/chat/useChatShortcuts.ts b/apps/web/src/components/chat/useChatShortcuts.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/useChatShortcuts.ts
index b079cf656b..d30f761763 100644
--- a/apps/web/src/components/chat/useChatShortcuts.ts
+++ b/apps/web/src/components/chat/useChatShortcuts.ts
@@ -72,13 +72,9 @@ export function useChatShortcuts(input: ChatShortcutsInput) {
       event.stopPropagation();
       return;
     }
-<<<<<<< 60b0c6dfa7 (Merge upstream c1a7ce362b: fix(desktop): Check for Updates says when an update is available (#31957))
-    if (!input.enabled || isCommandPaletteOpen() || isInSideChatPane(event.target)) return;
-    if (lampLayerOwnsKey(event)) return;
-=======
     if (!input.enabled || isCommandPaletteOpen()) return;
+    if (lampLayerOwnsKey(event)) return;
     const inSideChatPane = isInSideChatPane(event.target);
->>>>>>> d23f479a87 (fix(web): right panel shortcuts work while a side chat has focus (#32117))
     const terminalFocusOwner = getTerminalFocusOwner();
     if (event.defaultPrevented && terminalFocusOwner === null) return;
     const shortcutContext = input.getShortcutContext(event.target);

9504f65989 fix(server): MCP tools no longer advertise non-string enums that Gemini rejects (pingdotgg#37031)

  • apps/server/src/mcp/advertisedJsonSchema.test.ts
  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/mcp/advertisedJsonSchema.test.ts b/apps/server/src/mcp/advertisedJsonSchema.test.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/mcp/advertisedJsonSchema.test.ts
index 8726d1ff1c..f103545c6c 100644
--- a/apps/server/src/mcp/advertisedJsonSchema.test.ts
+++ b/apps/server/src/mcp/advertisedJsonSchema.test.ts
@@ -3,12 +3,9 @@ import * as Schema from "effect/Schema";
 import { Tool } from "effect/ai";
 
 import { advertisedJsonSchema } from "./advertisedJsonSchema.ts";
-<<<<<<< 855f2dcaab (Merge upstream through 031ee2dd2b (23 commits))
 import { BoardToolkit } from "./toolkits/board/tools.ts";
 import { MemoryToolkit } from "./toolkits/memory/tools.ts";
-=======
 import { ThemeToolkit } from "./toolkits/theme/tools.ts";
->>>>>>> 9504f65989 (fix(server): MCP tools no longer advertise non-string enums that Gemini rejects (#37031))
 
 it("drops JSON noise, merges tagged unions, and keeps null where it is required", () => {
   const Every = Schema.Struct({ ms: Schema.Int });
@@ -50,14 +47,14 @@ it("drops JSON noise, merges tagged unions, and keeps null where it is required"
   });
 });
 
-<<<<<<< 855f2dcaab (Merge upstream through 031ee2dd2b (23 commits))
 // MCP clients reject a whole server when one tool's input schema is not a top-level object.
 it("advertises an object input schema for every fork tool", () => {
   const tools: Record<string, Tool.Any> = { ...BoardToolkit.tools, ...MemoryToolkit.tools };
   for (const [name, tool] of Object.entries(tools)) {
     expect(advertisedJsonSchema(tool), name).toMatchObject({ type: "object" });
   }
-=======
+});
+
 it("advertises only string enum values, which Gemini requires", () => {
   const enumValues: Array<unknown> = [];
   const collect = (node: unknown): void => {
@@ -71,5 +68,4 @@ it("advertises only string enum values, which Gemini requires", () => {
   collect(advertisedJsonSchema(ThemeToolkit.tools.t3_theme_set));
 
   expect(enumValues.filter((value) => typeof value !== "string")).toEqual([]);
->>>>>>> 9504f65989 (fix(server): MCP tools no longer advertise non-string enums that Gemini rejects (#37031))
 });
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index bc5101a4db..7de6067a96 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 855f2dcaab (Merge upstream through 031ee2dd2b (23 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49749
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49738
->>>>>>> 9504f65989 (fix(server): MCP tools no longer advertise non-string enums that Gemini rejects (#37031))
 }

6c0032d655 fix(server): MCP refuses disallowed browser origins with 403 before auth and CORS (pingdotgg#35810)

  • apps/server/src/httpCors.ts
  • apps/server/src/mcp/McpHttpServer.ts
Resolution
diff --git a/apps/server/src/httpCors.ts b/apps/server/src/httpCors.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/httpCors.ts
index 6259e6172c..a4f2ac5619 100644
--- a/apps/server/src/httpCors.ts
+++ b/apps/server/src/httpCors.ts
@@ -10,15 +10,11 @@ export const browserApiCorsAllowedHeaders = [
   ORCHESTRATION_PROTOCOL_HEADER,
 ] as const;
 
-<<<<<<< 459233e80b (Merge upstream through 9791bce798 (40 commits))
 export const DESKTOP_RENDERER_ORIGINS = [
   "t3code://app",
   "t3code-dev://app",
   `${FORK_DESKTOP.scheme}://app`,
 ] as const;
-=======
-export const DESKTOP_RENDERER_ORIGINS = ["t3code://app", "t3code-dev://app"] as const;
 
 /** MCP refuses every browser Origin with 403, so the browser CORS layer must not answer for it. */
 export const MCP_HTTP_PATH = "/mcp";
->>>>>>> 6c0032d655 (fix(server): MCP refuses disallowed browser origins with 403 before auth and CORS (#35810))
diff --git a/apps/server/src/mcp/McpHttpServer.ts b/apps/server/src/mcp/McpHttpServer.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/mcp/McpHttpServer.ts
index 4a5671b053..e3dc179dfa 100644
--- a/apps/server/src/mcp/McpHttpServer.ts
+++ b/apps/server/src/mcp/McpHttpServer.ts
@@ -89,7 +89,6 @@ import * as HtmlHandlers from "./toolkits/html/handlers.ts";
 import { MessageToolkit } from "./toolkits/message/tools.ts";
 import * as MessageHandlers from "./toolkits/message/handlers.ts";
 import { HtmlPreviewTool, HtmlPreviewToolkit, HtmlRenderToolkit } from "./toolkits/html/tools.ts";
-<<<<<<< 459233e80b (Merge upstream through 9791bce798 (40 commits))
 import * as BoardHandlers from "./toolkits/board/handlers.ts";
 import { BoardToolkit } from "./toolkits/board/tools.ts";
 import * as MemoryHandlers from "./toolkits/memory/handlers.ts";
@@ -99,9 +98,7 @@ import * as VoiceAgentHandlers from "./toolkits/voiceAgent/handlers.ts";
 import { VoiceAgentToolkit } from "./toolkits/voiceAgent/tools.ts";
 import * as InboxAgentHandlers from "./toolkits/inboxAgent/handlers.ts";
 import { InboxAgentToolkit } from "./toolkits/inboxAgent/tools.ts";
-=======
 import { MCP_HTTP_PATH } from "../httpCors.ts";
->>>>>>> 6c0032d655 (fix(server): MCP refuses disallowed browser origins with 403 before auth and CORS (#35810))
 import { requestUrl } from "../requestUrl.ts";
 
 const mcpResourceMetadataUrl = (request: HttpServerRequest.HttpServerRequest) =>

9dbb802845 fix(desktop): saving keeps a connection catalog this build cannot read (pingdotgg#34944)

  • apps/desktop/src/app/DesktopConnectionCatalogStore.ts
Resolution
diff --git a/apps/desktop/src/app/DesktopConnectionCatalogStore.ts b/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
remerge CONFLICT (content): Merge conflict in apps/desktop/src/app/DesktopConnectionCatalogStore.ts
index 5b77030e21..e37a7a2318 100644
--- a/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
+++ b/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
@@ -526,7 +526,6 @@ export const make = Effect.gen(function* () {
       if (!(yield* encryptionAvailable)) {
         return Option.none<string>();
       }
-<<<<<<< 8f93de56ef (Merge upstream through 166cb00897 (6 commits))
       const decrypted = yield* decodeSecretBytes(catalogPath, document.value.encryptedCatalog).pipe(
         Effect.flatMap((encryptedCatalog) =>
           safeStorage.decryptString(encryptedCatalog).pipe(
@@ -543,9 +542,6 @@ export const make = Effect.gen(function* () {
         ),
       );
       return decrypted;
-=======
-      return Option.some(yield* decryptDocument(document.value));
->>>>>>> 9dbb802845 (fix(desktop): saving keeps a connection catalog this build cannot read (#34944))
     }).pipe(Effect.withSpan("desktop.connectionCatalogStore.get")),
     set: Effect.fn("desktop.connectionCatalogStore.set")(function* (catalog) {
       if (!(yield* encryptionAvailable)) {

The one-line change to DesktopConnectionCatalogStore.test.ts (expect Option.none() from get) is a separate commit folded into the sync merge; see Adaptations in the description.

0f0c1ca196 fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate (pingdotgg#32219)

  • apps/server/src/provider/Drivers/antigravityUsageReader.ts
Resolution
diff --git a/apps/server/src/provider/Drivers/antigravityUsageReader.ts b/apps/server/src/provider/Drivers/antigravityUsageReader.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/Drivers/antigravityUsageReader.ts
index cff94cc3bc..fa912688e6 100644
--- a/apps/server/src/provider/Drivers/antigravityUsageReader.ts
+++ b/apps/server/src/provider/Drivers/antigravityUsageReader.ts
@@ -129,18 +129,9 @@ const MODEL_IDS: Record<number, string> = {
 };
 
 // Effort and routing variants share the base model's price.
-<<<<<<< 3340854d80 (Merge upstream through 93cd25a99b (41 commits))
-export function withRateModel(record: UsageRecord): UsageRecord {
-  const base = record.model.replace(
-    /-(?:extra-low|low|medium|high|tiered|control|thinking|agent)$/,
-    "",
-  );
-  const rateModel = /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(record.model)
-=======
 export const antigravityRateModel = (model: string) => {
   const base = model.replace(/-(?:extra-low|low|medium|high|tiered|control|thinking|agent)$/, "");
   return /^gemini-3-flash-(?:agent(?:-[ab])?|[ab])$/.test(model)
->>>>>>> 0f0c1ca196 (fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate (#32219))
     ? "gemini-3.5-flash"
     : model === "gemini-3.7-flash-safety-le"
       ? "gemini-3.7-flash"
@@ -149,7 +140,7 @@ export const antigravityRateModel = (model: string) => {
         : base;
 };
 
-function withRateModel(record: UsageRecord): UsageRecord {
+export function withRateModel(record: UsageRecord): UsageRecord {
   const rateModel = antigravityRateModel(record.model);
   return rateModel === record.model ? record : { ...record, rateModel };
 }

4fa5f0e0e6 fix(web): a side chat's subagent opens its parent as a side chat tab, not a bare page (pingdotgg#32907)

  • apps/web/src/components/ChatView.tsx
Resolution
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/ChatView.tsx
index acbf3bcc4f..054898b085 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -208,16 +208,12 @@ import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";
 import { toastManager } from "./ui/toast";
 import { projectScriptIdFromCommand } from "~/projectScripts";
 import { newMessageId } from "~/lib/utils";
-<<<<<<< 56ad22f1c0 (Merge upstream through 37b71a4ffe (63 commits))
-import { isInSideChatPane, type SideChatParentPanel } from "~/lib/sideChatPane";
-import { inboxAgentLockedProvider, isInboxClientThread } from "~/state/inboxAgent.logic";
-=======
 import {
   isInSideChatPane,
   resolveThreadOpenRoute,
   type SideChatParentPanel,
 } from "~/lib/sideChatPane";
->>>>>>> 4fa5f0e0e6 (fix(web): a side chat's subagent opens its parent as a side chat tab, not a bare page (#32907))
+import { inboxAgentLockedProvider, isInboxClientThread } from "~/state/inboxAgent.logic";
 import {
   NO_PROVIDER_MODEL_SELECTION,
   providerInstanceEntriesFor,

8897a6ebe1 fix(web): keep thread mentions when editing sent messages (pingdotgg#37183)

  • apps/web/src/components/chat/chatViewSend.ts
Resolution
diff --git a/apps/web/src/components/chat/chatViewSend.ts b/apps/web/src/components/chat/chatViewSend.ts
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/chatViewSend.ts
index 3da6b8ba44..a5f326007f 100644
--- a/apps/web/src/components/chat/chatViewSend.ts
+++ b/apps/web/src/components/chat/chatViewSend.ts
@@ -46,12 +46,8 @@ import {
   waitForRevertedMessage,
 } from "../ChatView.logic";
 import { readPreparedConnection } from "../../state/session";
-<<<<<<< 161bf46f0e (Merge upstream through 7379f1969b (57 commits))
-import { recallableComposerPrompt } from "./composerPromptHistory";
-import { restoreReplyAnnotations } from "./replyAnnotations";
-=======
 import { recallComposerMessage } from "./composerPromptHistory";
->>>>>>> 8897a6ebe1 (fix(web): keep thread mentions when editing sent messages (#37183))
+import { restoreReplyAnnotations } from "./replyAnnotations";
 
 // Kept per route so a send in flight, and the multiple-model selections, survive
 // ChatView remounting while the user navigates.

2182097b1d fix(server): theme set help names which clients apply the theme (pingdotgg#37259)

  • apps/server/src/provider/agentContextBudget.json
Resolution
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
remerge CONFLICT (content): Merge conflict in apps/server/src/provider/agentContextBudget.json
index f0a9123e46..32683c1e2c 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 73feebfa99 (Merge upstream through 09fc222fed (24 commits))
   "claudeSystemAppendBytes": 10262,
   "codexAdditionalContextBytes": 11652,
-  "mcpToolListJsonBytes": 49738
-=======
-  "claudeSystemAppendBytes": 5930,
-  "codexAdditionalContextBytes": 7324,
   "mcpToolListJsonBytes": 49736
->>>>>>> 2182097b1d (fix(server): theme set help names which clients apply the theme (#37259))
 }

mfituri commented Nov 19, 2026 •

Copy link
Copy Markdown
Author

Upstream changes to files the fork has changed (367), part 1/2

Updated for the rebuilt branch (head dabb137907); this replaces the first branch's version.

These merged without a conflict; listed so a reviewer can check the fork's change still does its job.

mfituri commented Nov 19, 2026 •

Copy link
Copy Markdown
Author

Upstream changes to files the fork has changed (367), part 2/2

Updated for the rebuilt branch (head dabb137907); this replaces the first branch's version.

These merged without a conflict; listed so a reviewer can check the fork's change still does its job.

@cursor

cursor Bot commented Nov 19, 2026

Copy link
Copy Markdown

This PR is too large for Bugbot to review. It changes 41,100 lines and 3,777,407 characters. Split the change into smaller pull requests to get a review.

Upstream: https://github.com/pingdotgg/t3code.git 7b17bdb..6b7027b

Conflicts resolved (44):
- 359daaf feat(codex): choose a cyber access program for Daybreak-eligible models (pingdotgg#27928)
    apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
- aa58dc6 chore(deps): bump the npm_and_yarn group across 2 directories with 1 update (pingdotgg#33945)
    pnpm-lock.yaml
- e1d59d1 fix(web): the collapsed mobile composer shows Stop while a turn runs (pingdotgg#29959)
    apps/web/src/components/chat/ChatComposer.tsx
- c99201c fix(web): minimap Next turn no longer sticks on adjacent user messages (pingdotgg#33036)
    apps/web/src/components/chat/MessagesTimeline.tsx
- 59e64ee fix(server): t3_thread_read returns the newest items and fits in agent context (pingdotgg#33428)
    apps/server/src/provider/agentContextBudget.json
- 7fb6098 test(server): drop the flaky Kiro provider_thread_resume replay (pingdotgg#35867)
    apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_transcript.ndjson
- b62e80e fix(web): copying an alert callout keeps its alert Markdown (pingdotgg#35932)
    apps/web/src/components/ChatMarkdown.tsx
- 43ce395 test: run clock-free live tests on TestClock (pingdotgg#35868)
    apps/server/src/usage/UsageService.test.ts
- 38c3b56 docs: AGENTS.md and the FAQ list Pi, Muse Code, Kiro, and fx (pingdotgg#33906)
    AGENTS.md
- fb2e5a0 fix(client-runtime): imported threads that never ran no longer sit in Working as Waiting (pingdotgg#33042)
    packages/client-runtime/src/state/entities.test.ts
- dd7918e fix(web,mobile): MCP app calls keep their tool row and result beside the app card (pingdotgg#33347)
    apps/web/src/session-logic.ts
- eb7e63a fix(server): thread reads preview linked PRs and list_thread_pull_requests pages (pingdotgg#35858)
    apps/server/src/provider/agentContextBudget.json
- 0568a63 fix(server): agents point to Settings → Labs when the link tools are hidden (pingdotgg#30371)
    apps/server/src/provider/agentContextBudget.json
- a09e54a fix(server): proxied usage limits take their reset time from the CLIProxyAPI hub (pingdotgg#36238)
    apps/server/src/server.ts
- c165587 fix(provider-cursor): Cursor threads report token usage and context fill (pingdotgg#36323)
    packages/provider-cursor/src/server/adapter.test.ts
    packages/provider-cursor/src/server/adapter.ts
- aab388d fix(server): Claude can show the user mid-turn text in full (pingdotgg#36384)
    apps/server/src/provider/agentContextBudget.json
    apps/web/src/session-logic.ts
    packages/shared/src/t3McpToolPresentation.ts
- 9f94a87 fix(cli): tagged source builds report the release version (pingdotgg#36350)
    apps/web/tsconfig.json
- 70b0529 ci(mobile): iOS jobs run on macos-27, store builds require the final Xcode 27.1 (pingdotgg#36421)
    .github/workflows/ci.yml
- 08b8689 fix(provider-grok): Grok follow-ups queue instead of cancelling the running tool (pingdotgg#36422)
    apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson
- 4bab2f3 perf(server): a new thread's first turn starts sooner (pingdotgg#35710)
    apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
    apps/server/src/orchestration-v2/RunExecutionService.ts
- 42057b8 feat: agents can restyle T3 Code with theme colors and CSS (pingdotgg#35247)
    apps/server/src/provider/agentContextBudget.json
    apps/web/src/components/chat/TimelineUserMessageRow.tsx
- bf9b8b7 fix(server): Claude on Bedrock runs the model picked in the composer (pingdotgg#24695)
    apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
- efae4e9 fix(client): retry unread thread visits after reconnect (pingdotgg#36559)
    packages/client-runtime/src/state/threadVisits.ts
- 9e19b7f feat(server): resume stopped provider threads natively (pingdotgg#36526)
    apps/server/src/orchestration-v2/ProviderTurnStartService.ts
- 121f0cf fix(server): t3_thread_list clamps an oversized limit instead of failing (pingdotgg#27814)
    apps/server/src/provider/agentContextBudget.json
- 719042d fix(server): MCP-launched threads no longer flash in Inbox before Working (pingdotgg#36682)
    apps/server/src/orchestration-v2/ThreadManagementService.ts
- ed01784 fix(usage): refetch cached rates early for a model they do not list (pingdotgg#33725)
    apps/server/src/usage/UsageService.test.ts
- 3238db7 fix(web): Cite is offered for text an agent sent with send_to_user (pingdotgg#36858)
    apps/web/src/components/chat/citationProcedure.test.ts
    apps/web/src/components/chat/citationProcedure.ts
- 0035cb5 fix(server): filter scheduled tasks without exposing webhook URLs (pingdotgg#27716)
    apps/server/src/provider/agentContextBudget.json
- fa64759 fix(web): Arabic and Hebrew artifact template cards read right to left (pingdotgg#36922)
    apps/web/src/components/ChatMarkdown.tsx
- 5393882 fix(mcp): return delegated task handles before client timeouts (pingdotgg#15622)
    apps/server/src/provider/agentContextBudget.json
- cbdf35f fix(web): enable Send when the composer holds only a thread context (pingdotgg#23166)
    apps/web/src/components/chat/ChatComposer.tsx
- dfd2187 fix(server): t3_thread_launch worktrees honor the new-worktree setting (pingdotgg#30226)
    apps/server/src/mcp/toolkits/project/handlers.ts
- 2b6c14b fix(web): diff file Open and Reveal reach a file whose name has a backslash (pingdotgg#23167)
    apps/web/src/components/chat/TimelineAssistantRows.tsx
- f7b0b3c fix(server): MCP list tools clamp an oversized limit instead of failing (pingdotgg#30976)
    apps/server/src/provider/agentContextBudget.json
- c1a7ce3 fix(desktop): Check for Updates says when an update is available (pingdotgg#31957)
    apps/desktop/src/window/DesktopApplicationMenu.test.ts
- d23f479 fix(web): right panel shortcuts work while a side chat has focus (pingdotgg#32117)
    apps/web/src/components/chat/useChatShortcuts.ts
- 9504f65 fix(server): MCP tools no longer advertise non-string enums that Gemini rejects (pingdotgg#37031)
    apps/server/src/mcp/advertisedJsonSchema.test.ts
    apps/server/src/provider/agentContextBudget.json
- 6c0032d fix(server): MCP refuses disallowed browser origins with 403 before auth and CORS (pingdotgg#35810)
    apps/server/src/httpCors.ts
    apps/server/src/mcp/McpHttpServer.ts
- 9dbb802 fix(desktop): saving keeps a connection catalog this build cannot read (pingdotgg#34944)
    apps/desktop/src/app/DesktopConnectionCatalogStore.ts
- 0f0c1ca fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate (pingdotgg#32219)
    apps/server/src/provider/Drivers/antigravityUsageReader.ts
- 4fa5f0e fix(web): a side chat's subagent opens its parent as a side chat tab, not a bare page (pingdotgg#32907)
    apps/web/src/components/ChatView.tsx
- 8897a6e fix(web): keep thread mentions when editing sent messages (pingdotgg#37183)
    apps/web/src/components/chat/chatViewSend.ts
- 2182097 fix(server): theme set help names which clients apply the theme (pingdotgg#37259)
    apps/server/src/provider/agentContextBudget.json

Upstream-Commit: 6b7027b
Comment thread packages/shared/src/git.ts Dismissed
Comment thread packages/shared/src/toolOutput.ts Resolved
Comment thread packages/shared/src/themeCss.ts Dismissed
Comment thread packages/shared/src/htmlRender.ts Dismissed
Comment thread packages/shared/src/htmlRender.ts Dismissed
Comment thread packages/shared/src/htmlRender.ts Dismissed
Comment thread packages/shared/src/htmlRender.ts Dismissed
Comment thread packages/shared/src/htmlRender.ts Dismissed
mfituri and others added 4 commits November 19, 2026 18:39
The sync took upstream's lockfile, which lacks the fork's @xyflow/react and
elkjs (team project graph) and the server's direct koffi entry. Regenerated
with pnpm 12.14.0 --lockfile-only --ignore-scripts --ignore-pnpmfile: only
those packages and their dependencies were added, at the versions main
already had. The pnpmfile checksum, which --ignore-pnpmfile drops, stays as
upstream has it; the pnpmfile is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream now prices an alias the rate table does not list under its
provider's own rate naming (antigravityRateModel, cursorRateModel, Pi's
model id), and split Antigravity's naming out of withRateModel. The thread
cost estimate mirrors both: it calls antigravityRateModel directly, so
antigravityUsageReader.ts no longer needs the fork's export, and it applies
the provider naming to unlisted aliases in rateFor and in Cursor's billed
records. ThreadCost.test.ts covers a Pi alias.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's Cursor adapter now sums each run's turn-ended usage into
turnTokenUsage and reads the context fill from Cursor's checkpoint, so the
sync took its adapter and dropped the fork's hooks and turnTokenUsage.ts, as
the status line entry said to. The entry no longer lists those hooks, and
the dashboard pricing note moves to the UsageService bullet that serves it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's new "keeps a catalog that no longer decrypts when the next save
replaces it" test expected get to fail on a catalog it cannot decrypt. The
fork reads that catalog as missing, so the sync changed that one line to
expect Option.none(); the save-keeps-a-copy assertion is upstream's. The
desktop identity entry now says so.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@mfituri
mfituri force-pushed the sync/upstream-20261119 branch from dc959f9 to dabb137 Compare November 19, 2026 18:41
mfituri and others added 8 commits November 19, 2026 18:48
Upstream now rewrites Grok's `{ type: "MCP", output: { OkayOutput } }` result
into the generic ACP `{ content }` blocks in the Grok adapter, and the shared
result reader no longer unwraps the old shape. Use the shape Grok items carry
now in the fixture.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e test

Upstream's PR watch service, which the pull request toolkit layer now builds,
reads PullRequestService. Mock it the way upstream's MCP server test does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream moved the open question's progress out of the chat view (pingdotgg#32324), so the card's send scope blocks sending while a provider question is open by checking the open question itself. The merge also dropped the ChatMarkdown import that upstream's new send_to_user row (pingdotgg#36384) needs beside the fork's question markdown.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… own hook

Upstream split the open question's answers, position and progress out of usePendingThreadRequests into usePendingUserInputDraft (pingdotgg#32324). The page's provider-question panel subscribes to it the way the composer does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…l call from the timeline's types

isMemoryProposalItem and isBoardTaskItem were type guards, so a false result told TypeScript the item was no dynamic tool call at all. Upstream's MCP app row (pingdotgg#33347) now checks for a dynamic tool call after them, which failed to compile. The checks return a plain boolean and the timeline row narrows the item itself.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…removed

Upstream's speech input no longer takes draftText (pingdotgg#32682); it reads the draft through readDraft, which the lamp already provides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream now refuses to build a toolkit whose caller-bound tools (actsAsCaller, readsAsCaller) lack the hiddenFromOutsideClients EnabledWhen annotation (pingdotgg#32764), so the server died at startup on memory_propose. The memory, board, Inbox and voice agent tools carry it now, as upstream's own thread-bound tools do.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…retry tests

The fork refuses to download a release without a named source. Upstream added three download tests (retry on a gateway timeout, retry on a failed body, fail at once offline) that name none, so the fork's gate failed them before any request. They pass releaseBaseUrl like the other download tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@mfituri mfituri added the agent-context-increase Raises the agent instruction budget label Nov 19, 2026
Claude's per-thread auto-compact size (#122) now sits on upstream's newer
adapter: the thread's window is sent as both the autoCompactWindow setting
and CLAUDE_CODE_AUTO_COMPACT_WINDOW ahead of the provider setting, and the
reported threshold checks it after upstream's compaction-off checks. The
compiled selection keeps upstream's pinnedAlias beside the window. The pane
strip (#118) keeps upstream's vertical-scroll guard in the history swipe.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@mfituri
mfituri merged commit 7e24880 into main Nov 20, 2026
26 checks passed
@mfituri
mfituri deleted the sync/upstream-20261119 branch November 20, 2026 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Raises the agent instruction budget

Projects

None yet

Development

Successfully merging this pull request may close these issues.