Repository navigation
sync: upstream through 6b7027b1f4 (1251 commits) - #117
Conversation
…t the web host (pingdotgg#29784) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#35839) 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>
…ect, not its pointer (pingdotgg#35466)
…gg#30299) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#36727) 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>
…d of waiting forever (pingdotgg#31338)
… 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>
…rom another worktree (pingdotgg#34129)
…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>
…gdotgg#35808) 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>
… up other threads' wakes (pingdotgg#37416)
…otgg#37083) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#37302) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Resolution diffs (1/2)Updated for the rebuilt branch (head What each conflict stop resolved to, as
|
Resolution diffs (2/2)Updated for the rebuilt branch (head What each conflict stop resolved to, as
|
Upstream changes to files the fork has changed (367), part 1/2Updated for the rebuilt branch (head These merged without a conflict; listed so a reviewer can check the fork's change still does its job.
|
Upstream changes to files the fork has changed (367), part 2/2Updated for the rebuilt branch (head These merged without a conflict; listed so a reviewer can check the fork's change still does its job.
|
|
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
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>
dc959f9 to
dabb137
Compare
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>
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>
Upstream
7b17bdbcef..6b7027b1f4: 1251 commits. The target was named by hand (--to 6b7027b1f4), so quarantine was not applied.Rebuilt from
mainate3b103e876after #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 withissues: write). GitHub enables it as soon as it lands, and itspushtrigger 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: scripttestadded (vp test run).Packages added to pnpm-lock.yaml (11)
@cursor/sdk@1.3.1and 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.1effect@4.1.3react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-16db4c75.tgzreact-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.57.tgz@cursor/sdkoverride 1.2.0 → 1.3.1, the@pierre/diffscatalog and override, theeffectcatalog), plus upstream's own mobile fork tarballs replacing the previous ones inapps/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.1patch replaces the 1.2.0 one and is 15.8 MB of single-line replacements in the minified bundle; its file list and the readableagent.d.tshunks (an optionalresume()) match the comment inpnpm-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: thereact-native-enriched-markdownentry moves from the497fbe63tarball to16db4c75(the previous tarball had the same permission).minimumReleaseAgeExclude:@pierre/diffsbeta.3 → beta.4.unenvoverride pin and two small patches (@expo/uiAndroid scroll target,@effect/platform-node-sharedinjected 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--concurrency 4to the sharded tests, and moves Mobile Native Static Analysis tomacos-27(ci(mobile): iOS jobs run on macos-27, store builds require the final Xcode 27.1 pingdotgg/t3code#36421). The fork keeps GitHub'smacos-26for that job: it only runsbrew bundleandlint:mobile, nothing that needs Xcode 27.grep -n "runs-on:" .github/workflows/ci.yml | grep -v -E "ubuntu-24.04|macos-26"prints nothing. One workflow is new,issue-vouch.yml(see the top); the rest are edits to workflows disabled here.Agent instructions (these steer our agents) (13)
.agents/skills/test-t3-mobile/SKILL.mdAGENTS.mdevals/mcp-tool-use/backgroundWait.tsevals/mcp-tool-use/cases/background-wait.ndjsonevals/mcp-tool-use/cases/mid-turn-messages.ndjsonevals/mcp-tool-use/cases/orchestration.ndjsonevals/mcp-tool-use/cases/themes.ndjsonevals/mcp-tool-use/cases/threads-vs-tasks.ndjsonevals/mcp-tool-use/devices.test.tsevals/mcp-tool-use/devices.tsevals/mcp-tool-use/README.mdevals/mcp-tool-use/run.test.tsevals/mcp-tool-use/run.tsAGENTS.mdlists 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--configflag 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)
scripts/install.sht3command becomes a small launcher script that execs by absolute path, and only this home's own launchers are replaced) and fix(install): name the archive when its download fails pingdotgg/t3code#35854 (names the archive when its download fails). No new download source;T3CODE_RELEASE_BASE_URLhandling is unchanged.Update and release URLs (7)
apps/desktop/src/updates/DesktopRemoteUpdates.tsapps/desktop/src/updates/DesktopUpdates.tsapps/desktop/src/updates/updatesTestHarness.tsapps/server/src/cli/update.tsapps/server/src/cloud/selfUpdate.tsapps/server/src/desktopUpdate/DesktopAppUpdate.tsapps/server/src/desktopUpdate/DesktopUpdateMarker.tsFORK_UPDATES_MESSAGE/forkReleaseSourceinmanagedPolicy.ts,update.ts,pinnedRuntime.ts,tunnel.ts,DesktopUpdatePolicy.ts,OutdatedServerUpdateSection.tsx).Telemetry endpoints (7)
apps/desktop/src/telemetry/DesktopTelemetryPublisher.tsapps/server/src/observability/RpcInstrumentation.tsapps/server/src/resourceTelemetry/DesktopTelemetryReceiver.tsapps/server/src/telemetry/ProviderDimensions.tsapps/web/src/components/settings/ResourceTelemetryDiagnostics.logic.tsapps/web/src/components/settings/ResourceTelemetryDiagnostics.tsxpackages/contracts/src/resourceTelemetry.tsAnalyticsService.tshas its sixFORK_ANALYTICS_DEFAULTS/forkAnalyticsEnabledlines and noingest.t3.codesorphc_key.Auth, policy and secrets code (41)
Show all
apps/desktop/src/backend/DesktopLocalEnvironmentAuth.tsapps/desktop/src/ipc/methods/providerAuth.tsapps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.ktapps/mobile/src/components/ui/SecretRevealButton.tsxapps/mobile/src/components/ui/SecretTextInput.android.tsxapps/mobile/src/components/ui/SecretTextInput.tsxapps/mobile/src/state/auth.tsapps/server/src/auth/dpop.tsapps/server/src/auth/EnvironmentAuth.tsapps/server/src/auth/http.tsapps/server/src/auth/McpOAuth.tsapps/server/src/auth/mcpOAuthHttp.tsapps/server/src/auth/PairingGrantStore.tsapps/server/src/auth/RpcAuthorization.tsapps/server/src/auth/ServerSecretStore.tsapps/server/src/auth/SessionStore.tsapps/server/src/auth/utils.tsapps/server/src/cli/auth.tsapps/server/src/cliAuthFormat.tsapps/server/src/persistence/AuthConnectDevices.tsapps/server/src/persistence/AuthPairingLinks.tsapps/server/src/persistence/AuthSessions.tsapps/server/src/persistence/Migrations/090_AuthConnectDevices.tsapps/server/src/persistence/Migrations/091_AuthConnectDeniedRequests.tsapps/server/src/provider/antigravityAuthSupport.tsapps/server/src/secrets/SecretCheck.tsapps/server/src/settingsSecrets.tsapps/web/src/components/auth/ApproveAgentSurface.tsxapps/web/src/components/clerk/useT3ConnectAuthPrompt.tsxapps/web/src/components/cloud/ConnectCliAuthSurface.tsxapps/web/src/components/settings/ProviderAuthenticationSection.tsxapps/web/src/components/settings/ProviderAuthTerminal.tsxapps/web/src/components/settings/SecretSourceInput.tsxapps/web/src/components/settings/SettingsScopeSentence.tsxapps/web/src/environments/primary/auth.tspackages/client-runtime/src/state/auth.tspackages/contracts/src/auth.tspackages/contracts/src/settingsSecretValue.tspackages/provider-acp-registry/src/server/auth.tspackages/secret-provider-core/src/server/SecretResolver.tspackages/shared/src/codexAuthCallback.tsConflicts resolved (44)
44 stops: 9 touched only
agentContextBudget.jsonor the lockfile and were resolved by the rules below; the other 35 were resolved by reading both sides. The resolution diffs, asgit show --remerge-diffof each step, are in the comments.agentContextBudget.json(fix(server): t3_thread_read returns the newest items and fits in agent context pingdotgg/t3code#33428, fix(server): thread reads preview linked PRs and list_thread_pull_requests pages pingdotgg/t3code#35858, fix(server): agents point to Settings → Labs when the link tools are hidden pingdotgg/t3code#30371, fix(server): Claude can show the user mid-turn text in full pingdotgg/t3code#36384, feat: agents can restyle T3 Code with theme colors and CSS pingdotgg/t3code#35247, fix(server): t3_thread_list clamps an oversized limit instead of failing pingdotgg/t3code#27814, fix(server): filter scheduled tasks without exposing webhook URLs pingdotgg/t3code#27716, fix(mcp): return delegated task handles before client timeouts pingdotgg/t3code#15622, fix(server): MCP list tools clamp an oversized limit instead of failing pingdotgg/t3code#30976, fix(server): MCP tools no longer advertise non-string enums that Gemini rejects pingdotgg/t3code#37031, fix(server): theme set help names which clients apply the theme pingdotgg/t3code#37259): every stop took upstream's numbers plus the fork's own delta per key (ours - base), so the two instruction budgets keep the fork's ~4.3 KB of question (including feat: dismiss a question card without telling the agent #116's dismiss answer), reply-marker and back-reference text and the MCP tool list number is upstream's. Final:claudeSystemAppendBytes10262 (5930 + 4332),codexAdditionalContextBytes11652 (7324 + 4328),mcpToolListJsonBytes49736. CI's AgentContextBudget test is the check.pnpm-lock.yaml(chore(deps): bump the npm_and_yarn group across 2 directories with 1 update pingdotgg/t3code#33945): took upstream's (checkout --theirs), regenerated after the merge (see Adaptations).CodexAdapterV2.ts(feat(codex): choose a cyber access program for Daybreak-eligible models pingdotgg/t3code#27928): upstream renameddecodeCodexTurnStartParamsWithCollaborationModetodecodeCodexTurnStartParams. Kept the fork's memoryteamContextinadditionalContext; took upstream's decoder.ChatComposer.tsx(fix(web): the collapsed mobile composer shows Stop while a turn runs pingdotgg/t3code#29959): kept the fork'sComposerStatusToggleimport beside upstream'sCollapsedComposerStopActionimport.MessagesTimeline.tsx(fix(web): minimap Next turn no longer sticks on adjacent user messages pingdotgg/t3code#33036): kept the fork'sTimelineMomentsGutterwrapper and its sibling layers; applied upstream'sTIMELINE_MINIMAP_TARGET_OFFSETto the minimap scroll.provider_thread_resume/kiro_transcript.ndjson(test(server): drop the flaky Kiro provider_thread_resume replay pingdotgg/t3code#35867): upstream deleted this flaky replay and its registration; accepted the deletion (the fork's edit was only recorded instruction text).ChatMarkdown.tsx(fix(web): copying an alert callout keeps its alert Markdown pingdotgg/t3code#35932): kept the fork's blockquote context reads (node,threadRef,isStreaming, text) for question quotes; took upstream'salertKindand itsdata-markdown-alertattributes.UsageService.test.ts(test: run clock-free live tests on TestClock pingdotgg/t3code#35868): kept the fork'sreadRatesandreadAccountRecordstests as they were; took upstream'sit.effecton the neighbouring test.AGENTS.md(docs: AGENTS.md and the FAQ list Pi, Muse Code, Kiro, and fx pingdotgg/t3code#33906): took upstream's provider list; kept the fork notice under the title.client-runtime/state/entities.test.ts(fix(client-runtime): imported threads that never ran no longer sit in Working as Waiting pingdotgg/t3code#33042): kept the fork's scheduled-task test and added upstream's imported-thread test.web/session-logic.ts(fix(web,mobile): MCP app calls keep their tool row and result beside the app card pingdotgg/t3code#33347): upstream now pushes the MCP app card after its tool row. Kept the fork's standalone condition for memory proposals and board task cards; dropped the old early-returnmcp-appblock as upstream did.apps/server/src/server.ts(fix(server): proxied usage limits take their reset time from the CLIProxyAPI hub pingdotgg/t3code#36238): kept the fork'sprovideMerge(MemoryLayer.layerForOrchestration)and added upstream'sUsageLimitSources.layerResetFallback.provider-cursoradapter.tsandadapter.test.ts(fix(provider-cursor): Cursor threads report token usage and context fill pingdotgg/t3code#36323): upstream's Cursor adapter now reportsturnTokenUsage(summed turn-ended usage) and the context fill. The fork's status line entry says to take upstream's adapter then and drop the fork's hooks; the fork's diff in both files was only those hooks, so both files are upstream's, and the fork-onlyturnTokenUsage.tsis deleted.session-logic.tsadds upstream'ssentMessageFromToolItemimport andsent-messageentry ahead of the fork's standalone condition, keeping the fork's imports;t3McpToolPresentation.tsaddssend_to_userinside the fork'swithForkT3McpToolLabels(...)wrapper.apps/web/tsconfig.json(fix(cli): tagged source builds report the release version pingdotgg/t3code#36350): kept the fork'sprivate-modules.tsinclude and added upstream'stagged-source-version.ts..github/workflows/ci.yml(ci(mobile): iOS jobs run on macos-27, store builds require the final Xcode 27.1 pingdotgg/t3code#36421): keptruns-on: macos-26for Mobile Native Static Analysis (it runsbrew bundleandlint:mobileonly).message_steering/grok_transcript.ndjson(fix(provider-grok): Grok follow-ups queue instead of cancelling the running tool pingdotgg/t3code#36422): upstream deleted the Grok steering replay (Grok follow-ups now queue); accepted the deletion.ClaudeAdapterV2.ts(perf(server): a new thread's first turn starts sooner pingdotgg/t3code#35710): upstream resolvestoolSearchOverrideearlier, concurrently with the settings reads. Took that; kept the fork'sunlockedQueryOptionsname, which the locked-agent lock applies to later.RunExecutionService.ts(perf(server): a new thread's first turn starts sooner pingdotgg/t3code#35710): upstream moved the baseline capture intocaptureRunBaselineso it can be forked. Took the call; moved the fork's Inbox skip intocaptureRunBaseline's early return beside the side-chat skip.TimelineUserMessageRow.tsx(feat: agents can restyle T3 Code with theme colors and CSS pingdotgg/t3code#35247): kept the fork's{...exchangeBubble}andonContextMenuon the bubble and added upstream'sdata-user-message-bubble.ClaudeAdapterV2.ts(fix(server): Claude on Bedrock runs the model picked in the composer pingdotgg/t3code#24695): upstream compiles the model selection later, against a routed catalog. Kept the fork'sclaudeMemoryQueryKeyaround the query policy key; dropped the earlycompiledSelectionas upstream did.threadVisits.ts(fix(client): retry unread thread visits after reconnect pingdotgg/t3code#36559):elapsedis now computed earlier by upstream; kept the fork'shasUnseenQuestions(shell)dispatch condition without redeclaring it.ProviderTurnStartService.ts(feat(server): resume stopped provider threads natively pingdotgg/t3code#36526): the user text now comes fromproviderMessage(an unsent message on a native resume). Kept the fork'sinboxAgentProviderTextwrapper and fed itproviderMessagefor both the text and the Inbox digest.ThreadManagementService.ts(fix(server): MCP-launched threads no longer flash in Inbox before Working pingdotgg/t3code#36682): strips both upstream's client-suppliedinitialMessageand the fork'svoiceAgentOf.UsageService.test.ts(fix(usage): refetch cached rates early for a model they do not list pingdotgg/t3code#33725): kept the fork's two tests and added upstream's unlisted-model refetch test.citationProcedure.ts/.test.ts(fix(web): Cite is offered for text an agent sent with send_to_user pingdotgg/t3code#36858): Cite now findssend_to_userentries and fails only for a message whose role is neither assistant nor user (upstream fails non-assistant messages; the fork lets user messages resolve for back-references). Kept both tests.ChatMarkdown.tsx(fix(web): Arabic and Hebrew artifact template cards read right to left pingdotgg/t3code#36922): kept the fork's board issue link import and added upstream'stextDirectionimport.ChatComposer.tsx(fix(web): enable Send when the composer holds only a thread context pingdotgg/t3code#23166): sendable content counts thread and environment contexts (upstream) and reply annotations (fork).mcp/toolkits/project/handlers.ts(fix(server): t3_thread_launch worktrees honor the new-worktree setting pingdotgg/t3code#30226): took upstream's singleprojectSettingsread; kept the fork'sinheritsFrom === undefinedcondition for project defaults.TimelineAssistantRows.tsx(fix(web): diff file Open and Reveal reach a file whose name has a backslash pingdotgg/t3code#23167): kept the fork's ExchangeThread, context menu and reply marker imports and added upstream's VCS status imports andNO_VCS_STATUS.DesktopApplicationMenu.test.ts(fix(desktop): Check for Updates says when an update is available pingdotgg/t3code#31957): took upstream's per-test service layers and import. Kept the fork'sDesktopSelfUpdatemock and gave itenabled: false, so upstream's new Check for Updates click tests reach upstream's updater path instead of an empty mock.useChatShortcuts.ts(fix(web): right panel shortcuts work while a side chat has focus pingdotgg/t3code#32117): took upstream's side chat handling (right panel shortcuts still run there); kept the fork'slampLayerOwnsKeyguard ahead of it.advertisedJsonSchema.test.ts(fix(server): MCP tools no longer advertise non-string enums that Gemini rejects pingdotgg/t3code#37031): kept the fork's object-schema test for its Board and Memory toolkits and added upstream's string-enum test.httpCors.ts/McpHttpServer.ts(fix(server): MCP refuses disallowed browser origins with 403 before auth and CORS pingdotgg/t3code#35810): kept the fork's third desktop renderer origin and its toolkit imports; added upstream'sMCP_HTTP_PATH.DesktopConnectionCatalogStore.ts(fix(desktop): saving keeps a connection catalog this build cannot read pingdotgg/t3code#34944): upstream now copies an unreadable catalog aside before a save replaces it. Kept the fork'sget, which reads a catalog it cannot decrypt as missing (the divergence says to keep that); upstream'sdecryptDocument,keepUnreadableCatalogandsetare in. Upstream's new test "keeps a catalog that no longer decrypts when the next save replaces it" expectedgetto fail; changed that one line to expectOption.none(); its assertion that the save keeps a copy is unchanged. On this branch that line is its own commit, folded into the sync merge (see Adaptations), so this stop's resolution diff shows only the store.antigravityUsageReader.ts(fix(server): usage mapped onto a Pi, Cursor or Antigravity model prices at that model's rate pingdotgg/t3code#32219): took upstream'santigravityRateModel; the merge keptexportonwithRateModel, and a follow-up commit moves the thread cost ontoantigravityRateModeland drops that export.ChatView.tsx(fix(web): a side chat's subagent opens its parent as a side chat tab, not a bare page pingdotgg/t3code#32907): kept the fork's Inbox imports and added upstream'sresolveThreadOpenRouteimport.chatViewSend.ts(fix(web): keep thread mentions when editing sent messages pingdotgg/t3code#37183): took upstream'srecallComposerMessageimport; kept the fork'srestoreReplyAnnotationsimport.Adaptations after merging (5)
chore: the lockfile lists the fork's graph packages and koffi again: regenerated in a Codespace withpnpm@12.14.0 install --lockfile-only --ignore-scripts --ignore-pnpmfileand the GitHub tokens unset. The diff against upstream's lockfile only adds the server'skoffiimporter entry and@xyflow/react,elkjsand their dependencies (@xyflow/system,classcat,zustand, thed3-*packages and their types), at the same versions and integrity hashesmainalready had.--ignore-pnpmfiledrops thepnpmfileChecksumline; 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 inthreadCostEstimate.ts. The estimate now does that inrateForand for Cursor's billed records, callsantigravityRateModeldirectly (soantigravityUsageReader.tsis upstream's again), andThreadCost.test.tsgains 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 beforefinish, 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:
grep/git grep) infork/README.mdwas 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 incomponents/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 noinboxAgentinrpc.ts/orchestrationV2.ts), speech output (koffiinpackage.jsonandknip.jsonc), moment cards, defaults on. No conflict markers remain.gh workflow list(after Issue Vouch is disabled) are left to CI and to the merge.ThreadDetailsUsage.tsx,collectProviderUsageLimitsorLITELLM_PREFIXES; the alias change inusageAggregation.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 sharedresolveModelAliases.index.csschanges do not touch the lane paddingExchangeThread.tsxcopies, andComposerSurface.tsx's glass variables are unchanged. No Muse fixture was re-recorded.lockClaudeQueryForLockedAgentis still the last thing applied beforequeryRunner.open.ChatView.logic.tsa 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. ThelatestUserMessageAthook there is intact.main(943d56fce9) toe3b103e876, exceptagentContextBudget.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 (therecord_onlybranch, the five SQL lines inProjectionStore.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.
test(server): Linear board card test reads Grok's new MCP result shape(39b21d2): fix(grok): Grok MCP calls store the real tool, arguments, and result pingdotgg/t3code#35502 moved Grok'sOkayOutputunwrapping into the Grok adapter, which now stores{ content }blocks; the fixture uses that shape.test(server): provide PullRequestService to the locked agent tool gate test(8e2001c): fix(server): reject PR watches when hosting dependencies are unavailable pingdotgg/t3code#33389's PR watch service readsPullRequestService; mocked as upstream's MCP server test does.fix(server): hide the fork's thread-bound MCP tools from outside clients(d5611dc): fix(server): outside MCP clients stop being offered thread-bound tools pingdotgg/t3code#32764 makesMcpToolAccess.toLayerdie unless everyactsAsCaller/readsAsCallertool carriesEnabledWhen: hiddenFromOutsideClients, so the server died at startup onmemory_propose(the desktop launch check). The memory, board, Inbox and voice agent tools carry it now.fix(web): question cards build against upstream's chat view again(cac730c): perf(web): answering a question no longer re-renders the whole chat view pingdotgg/t3code#32324 removedactivePendingProgressfrom the chat view; the card's send scope checksactivePendingUserInput, as upstream's own call sites do. The merge also dropped theChatMarkdownimport fix(server): Claude can show the user mid-turn text in full pingdotgg/t3code#36384'ssend_to_userrow needs.fix(web): the Questions page reads the open question's draft from its own hook(3f7fa32): perf(web): answering a question no longer re-renders the whole chat view pingdotgg/t3code#32324 moved the answers, position and progress tousePendingUserInputDraft.fix(web): memory and board card checks no longer hide every other tool call from the timeline's types(af28d45): the two checks were type guards, so a false result excluded every dynamic tool call and fix(web,mobile): MCP app calls keep their tool row and result beside the app card pingdotgg/t3code#33347's MCP app check after them failed to compile. They return a boolean; the timeline row narrows itself.fix(web): the lamp's dictation stops passing the draft text upstream removed(f5902ac): fix(voice): dictation survives draft changes and Escape in the citation box pingdotgg/t3code#32682 droppeddraftTextfrom the speech input.test(server): name a release source in upstream's new pinned runtime retry tests(bed001d): the fork's release gate failed three new download tests that name no source; they passreleaseBaseUrllike the others.chore: merge main (#118, #122) into the upstream sync(d657de6): main moved after the sync was built. feat(claude): a thread can choose its own auto-compact size #122's per-thread auto-compact size now feeds upstream's own window handling:makeClaudeQueryOptionsputs the thread's window ahead of the provider setting, so it reaches Claude both as theautoCompactWindowsetting and as upstream'sCLAUDE_CODE_AUTO_COMPACT_WINDOWenv override, andresolveAutoCompactWindowchecks it after upstream's compaction-off checks and before the provider setting. The compiled selection keeps upstream'spinnedAliasbeside the window, and the threshold test keeps bothenvironmentandthreadWindow. feat(web): a Labs pane strip shows a thread's panes side by side #118's[data-pane-strip]guard sits beside fix(web): mostly vertical trackpad scrolls no longer navigate back or forward pingdotgg/t3code#30173's vertical-scroll check in the history swipe. fork/README.md's entry for feat(claude): a thread can choose its own auto-compact size #122 names the new hook.Not changed: the
Testjob hit its 10-minute timeout with every suite passing so far, andAgent context budgetneeds a maintainer label.🤖 Generated with Claude Code