Skip to content

sync: upstream through ffb42a0b77 (178 commits) - #142

Merged
mfituri merged 180 commits into
mainfrom
sync/upstream-20261121-2
Nov 21, 2026
Merged

mfituri merged 180 commits into
mainfrom
sync/upstream-20261121-2

Conversation

@mfituri

@mfituri mfituri commented Nov 21, 2026 •

Copy link
Copy Markdown

Sensitive changes (41)

Upstream changes that run on install or in CI, steer our agents, or decide where data goes or who gets in. Read each one before merging.

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

Review: Checked — adds mobile:audit (#40102), adds --workspace packages/source-control-tanstack-source to knip:check:exports, and adds test/typecheck scripts for the new packages/source-control-tanstack-source package (#40207). Matches upstream PRs; no lifecycle hooks.

  • package.json: script knip:check:exports changed
  • package.json: script mobile:audit added
  • packages/source-control-tanstack-source/package.json: script test added
  • packages/source-control-tanstack-source/package.json: script typecheck added

Packages added to pnpm-lock.yaml (11)

Review: Checked — Effect 4.1.5 upgrade (#40132) and agent-device@0.21.41 bump (#40095). Matches upstream PRs; fork's @xyflow/react, elkjs, and koffi entries remain intact.

  • @effect/atom-react@4.1.5
  • @effect/graphql-generator@4.1.5
  • @effect/openapi-generator@4.1.5
  • @effect/platform-bun@4.1.5
  • @effect/platform-node-shared@4.1.5
  • @effect/platform-node@4.1.5
  • @effect/sql-pg@4.1.5
  • @effect/sql-sqlite-do@4.1.5
  • @effect/vitest@4.1.5
  • agent-device@0.21.41
  • effect@4.1.5

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

Review: Checked — minimumReleaseAgeExclude updated for the Effect 4.1.5 packages (#40132). Matches upstream PR.

  • pnpm-workspace.yaml minimumReleaseAgeExclude: + - "@effect/atom-react@4.1.5", + - "@effect/graphql-generator@4.1.5", + - "@effect/openapi-generator@4.1.5", + - "@effect/platform-bun@4.1.5", + - "@effect/platform-node-shared@4.1.5", + - "@effect/platform-node@4.1.5", + - "@effect/sql-pg@4.1.5", + - "@effect/sql-sqlite-do@4.1.5", + - "@effect/vitest@4.1.5", + - effect@4.1.5

CI workflows and actions (2)

Review: Checked — no new .github/workflows/*.yml files added. agent-context-budget.yml adds a comment explaining HEAD^1 comparison, and mobile-showcase-screenshots.yml (disabled in this fork) bumps agent-device to 0.21.41. All runs-on: in ci.yml remain ubuntu-24.04 / macos-26.

  • .github/workflows/agent-context-budget.yml
  • .github/workflows/mobile-showcase-screenshots.yml

Agent instructions (these steer our agents) (6)

Review: Checked — launch-video/scripts/render.sh uses a temp dir for frames to avoid concurrent render races, test-t3-mobile/SKILL.md documents mobile:audit, .repos/effect/.agents/AGENTS.md updated with Effect 4.1.5, and evals/mcp-tool-use/ updates agent-device help and test cases. Matches upstream PRs.

  • .agents/skills/launch-video/scripts/render.sh
  • .agents/skills/test-t3-mobile/SKILL.md
  • .repos/effect/.agents/AGENTS.md
  • evals/mcp-tool-use/agent-device-help.txt
  • evals/mcp-tool-use/cases/browser-routing.ndjson
  • evals/mcp-tool-use/cases/issues.ndjson

Update and release URLs (1)

Review: Checked — apps/server/src/cli/update.ts updates Windows launcher shim parsing (#40309). No release URLs changed.

  • apps/server/src/cli/update.ts

Telemetry endpoints (2)

Review: Checked — RpcInstrumentation.ts adds aggregate entries for peerLinksPairLink (#40036) and the new multi-repo workspace RPCs (#35925), and infra/relay/src/mobileTelemetry/monitoring.ts adds an Android OS kill anomaly monitor/chart. Matches upstream PRs.

  • apps/server/src/observability/RpcInstrumentation.ts
  • infra/relay/src/mobileTelemetry/monitoring.ts

Auth, policy and secrets code (14)

Review: Checked — corresponds to upstream PRs #31432 (t3 policy settings), #35925 (multi-repository projects), #39610 (NFD filenames), #39964 (headless linked environments hint), #40023 (multi-team Linear issues migration 103_IssueTrackerAdditionalScopes), #40207 (TanStack Source behind T3CODE_TANSTACK_SOURCE), #40316 (queued slash commands), #40424 (transcript cleanup errors), and #40541 (secret check replies tied to attempt). Matches upstream PRs; no unexpected auth bypasses or external endpoints.

  • apps/server/src/auth/http.ts
  • apps/server/src/auth/McpOAuth.ts
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/cli/policy.ts
  • apps/server/src/orchestration-v2/CommandPolicy.ts
  • apps/server/src/orchestration-v2/RuntimePolicy.ts
  • apps/server/src/persistence/Migrations/103_IssueTrackerAdditionalScopes.ts
  • apps/server/src/policy/managedSettings.ts
  • apps/web/src/components/settings/SecretSourceInput.tsx
  • apps/web/src/components/settings/SettingsScopeSentence.tsx
  • packages/provider-acp/src/server/clientPolicy.ts
  • packages/source-control-tanstack-source/src/server/tanStackSourceAuthStatus.ts
  • packages/source-control-tanstack-source/src/server/TanStackSourceCredentials.ts
  • scripts/scenarios/secret-check-keeps-new-attempt-pending.e2e.ts

Upstream 8cfd2b5211..ffb42a0b77: 178 commits.

Target: ffb42a0 was named with --to, so quarantine was not applied.

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

Conflicts resolved (7)

5093d11490 fix(web): numbered jumps and next/previous thread include unsent drafts (pingdotgg#39968)

  • apps/web/src/components/Sidebar.tsx

Kept upstream's useSidebarDrafts import alongside the fork's Inbox agent sidebar imports (SidebarFolderInboxRow, SidebarProjectsSection, messageFromInbox, withoutInboxThreads).

Resolution
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/Sidebar.tsx
index acc8889849..2dcdf9062d 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -270,8 +270,7 @@ import {
   type SidebarProviderEntry,
   type SidebarSweepAction,
 } from "./sidebar/SidebarThreadRow";
-<<<<<<< 419299ea18 (Merge upstream through f680c2026b (12 commits))
-import { SidebarDraftBlock } from "./sidebar/SidebarDraftBlock";
+import { SidebarDraftBlock, useSidebarDrafts } from "./sidebar/SidebarDraftBlock";
 import { SidebarFolderInboxRow } from "./inboxAgent/InboxSidebarRow";
 import { SidebarProjectsSection } from "./inboxAgent/SidebarProjectsSection";
 import { messageFromInbox, messageFromInboxPlan } from "./inboxAgent/messageFromInbox";
@@ -280,9 +279,6 @@ import {
   withMessageFromInboxItem,
 } from "./inboxAgent/messageFromInbox.logic";
 import { withoutInboxThreads } from "../state/inboxAgent.logic";
-=======
-import { SidebarDraftBlock, useSidebarDrafts } from "./sidebar/SidebarDraftBlock";
->>>>>>> 5093d11490 (fix(web): numbered jumps and next/previous thread include unsent drafts (#39968))
 import {
   SidebarProjectFolderHeader,
   sidebarFolderRowId,

4366f400ba feat(cli): t3 thread start --generate-title names the thread like the app does (pingdotgg#28597)

  • apps/server/src/provider/agentContextBudget.json

Kept the fork's claudeSystemAppendBytes (10577) and codexAdditionalContextBytes (11965) while taking upstream's updated mcpToolListJsonBytes (58399).

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 41f505536a..25479c965e 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 41d7168093 (Merge upstream through 26d81d88c1 (18 commits))
   "claudeSystemAppendBytes": 10577,
   "codexAdditionalContextBytes": 11965,
-  "mcpToolListJsonBytes": 58405
-=======
-  "claudeSystemAppendBytes": 6245,
-  "codexAdditionalContextBytes": 7639,
   "mcpToolListJsonBytes": 58399
->>>>>>> 4366f400ba (feat(cli): t3 thread start --generate-title names the thread like the app does (#28597))
 }

e97290a064 chore(deps): upgrade Effect to 4.1.5 (pingdotgg#40132)

  • pnpm-lock.yaml

Took upstream's effect 4.1.5 version bump while keeping the adjacent fork-only elkjs importer entry (along with @xyflow/react and koffi, none of which depend on effect).

Resolution
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
remerge CONFLICT (content): Merge conflict in pnpm-lock.yaml
index a9413499c5..9863079621 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1192,16 +1192,11 @@ importers:
         specifier: ^3.4.17
         version: 3.4.17
       effect:
-<<<<<<< 34f7734faf (Merge upstream through 5ddb3b4b71 (24 commits))
-        specifier: 4.1.3
-        version: 4.1.3
+        specifier: 4.1.5
+        version: 4.1.5
       elkjs:
         specifier: ^0.12.1
         version: 0.12.1
-=======
-        specifier: 4.1.5
-        version: 4.1.5
->>>>>>> e97290a064 (chore(deps): upgrade Effect to 4.1.5 (#40132))
       entities:
         specifier: 8.1.0
         version: 8.1.0

60863edc41 feat(projects): a project covers several repositories (pingdotgg#35925)

  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
  • apps/server/src/orchestration-v2/CheckpointCaptureService.ts
  • apps/server/src/provider/agentContextBudget.json
  • apps/web/src/components/chat/ThreadDetailsPanel.tsx
  • apps/web/src/components/settings/ProjectSettingsPanel.tsx
  • packages/client-runtime/src/state/commandPermissions.test.ts
  • packages/provider-core/src/server/runtimeInstructions.ts

Kept upstream's multi-repository support (turnInput.runtimePolicy.workspace in ClaudeAdapterV2, workspaceContext in CodexAdapterV2, repositoryScopes in CheckpointCaptureService, mcpToolListJsonBytes: 59026, taskFolder/show.repositories in ThreadDetailsPanel, ProjectRepositoriesSettings, workspaceAddTaskFolderRepository permission test, and runtimePolicy/buildWorkspaceInstructions in runtimeInstructions.ts) while preserving all fork hooks (claudeMemoryQueryKey, codexMemoryContext/question/reply/back-ref/live-checkout contexts, Inbox checkpoint skipping for both root and repository scopes, !inbox version-control guard, TeamProjectSettings, memoryUndo permission test, and FORK_DESKTOP.productName + fork instruction blocks).

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 3f67a161ff..d0bdc043d4 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
@@ -13110,18 +13110,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
               ? {}
               : { allowedTools: queryPolicy.allowedTools }),
           });
-<<<<<<< 1c88384af1 (Merge upstream through 3f5492fcf4 (27 commits))
           const queryPolicyKey = yield* claudeMemoryQueryKey(
-            claudeEffectiveQueryPolicyKey(queryPolicy, mcpOverrides),
+            claudeEffectiveQueryPolicyKey(
+              queryPolicy,
+              mcpOverrides,
+              turnInput.runtimePolicy.workspace,
+            ),
             turnInput.memory,
             yield* Ref.get(queryContext),
             liveProcessRunsBackgroundWork,
-=======
-          const queryPolicyKey = claudeEffectiveQueryPolicyKey(
-            queryPolicy,
-            mcpOverrides,
-            turnInput.runtimePolicy.workspace,
->>>>>>> 60863edc41 (feat(projects): a project covers several repositories (#35925))
           );
           const resumeSessionAt = yield* getNativeConversationHeadId(turnInput.providerThread);
           const existing = yield* Ref.get(queryContext);
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 11f8908419..a908093c61 100644
--- a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
@@ -887,7 +887,6 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
               device: input.deviceToolsAvailable ?? false,
             },
           )
-<<<<<<< 1c88384af1 (Merge upstream through 3f5492fcf4 (27 commits))
         : {
             t3_code_question_cards: {
               kind: "application" as const,
@@ -897,26 +896,19 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
             ...backReferenceCodexContext(),
             ...liveAppCheckoutCodexContext(),
           };
-    const teamContext = codexMemoryContext(input.memory);
-    const additionalContext =
-      t3Context === undefined && Object.keys({ ...appContext, ...teamContext }).length === 0
-        ? undefined
-        : { ...t3Context, ...teamContext, ...appContext };
-=======
-        : undefined;
     // Its own entry, so the folder list reaches the model without T3 Code's MCP tools too.
     const workspaceInstructions = buildWorkspaceInstructions(input.runtimePolicy);
     const workspaceContext =
       workspaceInstructions === ""
         ? undefined
         : { t3_code_workspace: { kind: "application" as const, value: workspaceInstructions } };
+    const teamContext = codexMemoryContext(input.memory);
     const additionalContext =
       t3Context === undefined &&
       workspaceContext === undefined &&
-      Object.keys(appContext).length === 0
+      Object.keys({ ...appContext, ...teamContext }).length === 0
         ? undefined
-        : { ...t3Context, ...workspaceContext, ...appContext };
->>>>>>> 60863edc41 (feat(projects): a project covers several repositories (#35925))
+        : { ...t3Context, ...workspaceContext, ...teamContext, ...appContext };
     return yield* decodeCodexTurnStartParams({
       threadId: input.nativeThreadId,
       input: input.codexInput,
diff --git a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/CheckpointCaptureService.ts
index e3e08a73c0..a57f67a77e 100644
--- a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
+++ b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
@@ -121,26 +121,12 @@ export const layer: Layer.Layer<
           // Fork: the Inbox never checkpoints the project root; see fork/README.md.
           forceMissing: sideChat || isInboxThread(input.threadId),
         });
-<<<<<<< 1c88384af1 (Merge upstream through 3f5492fcf4 (27 commits))
-      const threadStartCheckpoint =
-        baselineOrdinalWithinScope === 0 || isPreserved(0) ? null : yield* materializeBaseline(0);
-      const baselineCheckpoint = isPreserved(baselineOrdinalWithinScope)
-        ? null
-        : yield* materializeBaseline(baselineOrdinalWithinScope);
-      const checkpoint = yield* checkpoints.capture({
-        scope,
-        runId: run.id,
-        nodeId: rootNode.id,
-        ordinalWithinScope: run.ordinal,
-        appRunOrdinal: run.ordinal,
-        capturedAt,
-        // Fork: the Inbox never checkpoints the project root; see fork/README.md.
-        forceMissing: sideChat || isInboxThread(input.threadId),
-=======
       // The tracked Git folders the thread reaches now. One added since the turn began has no
       // baseline, so its first checkpoint lists no files; one removed is simply not captured.
+      // Fork: the Inbox never checkpoints the project root or tracked repositories; see fork/README.md.
+      const inbox = isInboxThread(input.threadId);
       const repositoryScopes =
-        sideChat || context.thread === undefined
+        sideChat || inbox || context.thread === undefined
           ? []
           : yield* checkpoints.repositoryScopes({ rootScope: scope, ...context.thread });
       const nested =
@@ -165,11 +151,10 @@ export const layer: Layer.Layer<
           ordinalWithinScope: run.ordinal,
           appRunOrdinal: run.ordinal,
           capturedAt,
-          forceMissing: sideChat,
+          forceMissing: sideChat || inbox,
           ...excluded(scope),
         });
         return { threadStartCheckpoint, baselineCheckpoint, checkpoint };
->>>>>>> 60863edc41 (feat(projects): a project covers several repositories (#35925))
       });
       const recordedScopes = new Map(
         context.repositoryScopes.map((recorded) => [recorded.id, recorded]),
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 3b076848b4..587ca55f84 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 1c88384af1 (Merge upstream through 3f5492fcf4 (27 commits))
   "claudeSystemAppendBytes": 10577,
   "codexAdditionalContextBytes": 11965,
-  "mcpToolListJsonBytes": 58399
-=======
-  "claudeSystemAppendBytes": 6245,
-  "codexAdditionalContextBytes": 7639,
   "mcpToolListJsonBytes": 59026
->>>>>>> 60863edc41 (feat(projects): a project covers several repositories (#35925))
 }
diff --git a/apps/web/src/components/chat/ThreadDetailsPanel.tsx b/apps/web/src/components/chat/ThreadDetailsPanel.tsx
remerge CONFLICT (content): Merge conflict in apps/web/src/components/chat/ThreadDetailsPanel.tsx
index 51a97eed81..f23b5b23e5 100644
--- a/apps/web/src/components/chat/ThreadDetailsPanel.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsPanel.tsx
@@ -110,10 +110,8 @@ export function ThreadDetailsPanel(props: ThreadDetailsPanelProps) {
   const activeThreadRef = { environmentId: props.environmentId, threadId: props.threadId };
   const project = useProject(scopeProjectRef(props.environmentId, props.projectId));
   const serverConfig = useServerConfigs().get(props.environmentId);
-<<<<<<< 1c88384af1 (Merge upstream through 3f5492fcf4 (27 commits))
   // Fork: the Inbox has no source control of its own; see fork/README.md.
   const inbox = useIsInboxThread(props.environmentId, props.threadId);
-=======
... 139 more lines

f4b8be84a0 fix(web): show custom theme backgrounds on the empty New thread screen (pingdotgg#40069)

  • apps/web/src/components/chat/MessagesTimeline.tsx

Took upstream's removal of bg-background on the loading placeholder while keeping {lampLayer.element} for the voice agent glass layer.

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 ee880b4076..4903a9d82c 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -1440,12 +1440,8 @@ const ConversationTimeline = memo(function ConversationTimeline({
       return (
         <>
           {activityAnnouncer}
-<<<<<<< e4bf888b1c (Merge upstream through 982bbcdfe1 (10 commits))
-          <div className="h-full min-h-0 bg-background" data-timeline-loading="true" />
-          {lampLayer.element}
-=======
           <div className="h-full min-h-0" data-timeline-loading="true" />
->>>>>>> f4b8be84a0 (fix(web): show custom theme backgrounds on the empty New thread screen (#40069))
+          {lampLayer.element}
         </>
       );
     }

b427708979 fix(issues): agents can file issues in any bound Linear team (pingdotgg#40299)

  • apps/server/src/provider/agentContextBudget.json

Kept the fork's claudeSystemAppendBytes (10577) and codexAdditionalContextBytes (11965) while taking upstream's updated mcpToolListJsonBytes (59052).

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 eabdfe820f..fc74f654c1 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< 779b010013 (Merge upstream through 27125d7d16 (41 commits))
   "claudeSystemAppendBytes": 10577,
   "codexAdditionalContextBytes": 11965,
-  "mcpToolListJsonBytes": 59026
-=======
-  "claudeSystemAppendBytes": 6245,
-  "codexAdditionalContextBytes": 7639,
   "mcpToolListJsonBytes": 59052
->>>>>>> b427708979 (fix(issues): agents can file issues in any bound Linear team (#40299))
 }

28b413fe12 fix(server): queued messages no longer wait out every timed-out checkpoint in a shared folder (pingdotgg#40411)

  • apps/server/src/orchestration-v2/CheckpointCaptureService.ts

Kept upstream's capturesBeforeLock argument alongside the fork's forceMissing: sideChat || inbox guard.

Resolution
diff --git a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
remerge CONFLICT (content): Merge conflict in apps/server/src/orchestration-v2/CheckpointCaptureService.ts
index 2abaf1b20c..0d033e0f29 100644
--- a/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
+++ b/apps/server/src/orchestration-v2/CheckpointCaptureService.ts
@@ -153,12 +153,8 @@ export const layer: Layer.Layer<
           ordinalWithinScope: run.ordinal,
           appRunOrdinal: run.ordinal,
           capturedAt,
-<<<<<<< a910471810 (Merge upstream through e2035934a6 (14 commits))
           forceMissing: sideChat || inbox,
-=======
-          forceMissing: sideChat,
           capturesBeforeLock,
->>>>>>> 28b413fe12 (fix(server): queued messages no longer wait out every timed-out checkpoint in a shared folder (#40411))
           ...excluded(scope),
         });
         return { threadStartCheckpoint, baselineCheckpoint, checkpoint };

Adaptations after merging (0)

None.

Upstream changes to files the fork has changed (44)

Verification

  • CI (c2e6154d38): All checks passed — Check, Lint, Build and Typecheck, Test, Test Server 1–8, Test Web 1–2, Rust, Mobile Native Static Analysis, Release Smoke, and Agent context budget (with agent-context-increase label for upstream's mcpToolListJsonBytes: 58405 -> 59052).
  • Post-merge test adaptations (c2e6154d38): Adapted 3 new upstream tests (CodexAdapterV2.test.ts, runtimeInstructions.test.ts, and keybindings.test.ts) to account for the fork's extra instruction blocks and default keybindings.
  • Read-only divergence checks: Verified AGENTS.md fork notice, ci.yml runner labels (ubuntu-24.04 / macos-26), productNamePlugin, manifest.webmanifest, FORK_DESKTOP.productName in runtimeInstructions.ts, T3Wordmark.tsx re-export, status strip hooks, Inbox/locked-agent hooks, sendKeepsReaderPlace hooks, zero stale "running in T3 Code" replay fixtures, and gh workflow list (only CI and Agent Context Budget plus GitHub built-ins active).
  • Non-conflicting upstream changes to fork-touched files: Verified 755de001f2 (antigravityRateModel imported directly by threadCostEstimate.ts) and 3a91757430 (AntigravityAdapterV2.ts hasPendingReply orthogonal to locked-agent permission hooks).

LukasFB and others added 30 commits November 20, 2026 18:17
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#39973)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…sues page (pingdotgg#39937)

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

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

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#32989)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ick or when it opens (pingdotgg#39319)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… worktrees (pingdotgg#35721)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#31432)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nd median (pingdotgg#39660)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…efault (pingdotgg#39981)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Gooder24 and others added 25 commits November 21, 2026 10:16
…tgg#37314)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…folder labels (pingdotgg#40464)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n character set (pingdotgg#40476)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40490)

Co-authored-by: x0r <x0r@noreply.x0r.li>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…agent (pingdotgg#40496)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ettlement (pingdotgg#40489)

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

Co-authored-by: Sean Kenneth Doherty <328402569+seankd3@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…entry separators (pingdotgg#40509)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e separators (pingdotgg#40523)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d rule (pingdotgg#40525)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40545)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Upstream: https://github.com/pingdotgg/t3code.git 8cfd2b5..ffb42a0

Conflicts resolved (7):
- 5093d11 fix(web): numbered jumps and next/previous thread include unsent drafts (pingdotgg#39968)
    apps/web/src/components/Sidebar.tsx
- 4366f40 feat(cli): t3 thread start --generate-title names the thread like the app does (pingdotgg#28597)
    apps/server/src/provider/agentContextBudget.json
- e97290a chore(deps): upgrade Effect to 4.1.5 (pingdotgg#40132)
    pnpm-lock.yaml
- 60863ed feat(projects): a project covers several repositories (pingdotgg#35925)
    apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
    apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
    apps/server/src/orchestration-v2/CheckpointCaptureService.ts
    apps/server/src/provider/agentContextBudget.json
    apps/web/src/components/chat/ThreadDetailsPanel.tsx
    apps/web/src/components/settings/ProjectSettingsPanel.tsx
    packages/client-runtime/src/state/commandPermissions.test.ts
    packages/provider-core/src/server/runtimeInstructions.ts
- f4b8be8 fix(web): show custom theme backgrounds on the empty New thread screen (pingdotgg#40069)
    apps/web/src/components/chat/MessagesTimeline.tsx
- b427708 fix(issues): agents can file issues in any bound Linear team (pingdotgg#40299)
    apps/server/src/provider/agentContextBudget.json
- 28b413f fix(server): queued messages no longer wait out every timed-out checkpoint in a shared folder (pingdotgg#40411)
    apps/server/src/orchestration-v2/CheckpointCaptureService.ts

Upstream-Commit: ffb42a0
@cursor

cursor Bot commented Nov 21, 2026

Copy link
Copy Markdown

This PR is too large for Bugbot to review. It changes 67,167 lines and 4,070,414 characters. Split the change into smaller pull requests to get a review.

@mfituri mfituri added the agent-context-increase Raises the agent instruction budget label Nov 21, 2026
@mfituri
mfituri merged commit 3f32eb6 into main Nov 21, 2026
41 of 44 checks passed
@mfituri
mfituri deleted the sync/upstream-20261121-2 branch November 21, 2026 22:30
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.