[riccardovandra]

Merges 126 commits from upstream/main (up to 394929af76) into the fork.

Conflicts and resolutions

• Settings reorganisation (SettingsSidebarNav.tsx, settingsSearch.ts, mobile SettingsRouteScreen.tsx): upstream added Threads, Browser, Devices, Worktrees, Access, Maintenance, Labs and About, and renamed Integrations to Browser (old links redirect). Kept the fork's Tools and MCP servers pages and dropped the fork's /settings/integrations entries, which now redirect. On mobile, the fork's MCP servers row now sits under Agents next to Providers.
• routeTree.gen.ts: regenerated with the TanStack router generator. It includes both upstream's new routes and the fork's ai-pm, settings/tools and settings/mcp-servers.
• _chat.tsx: upstream moved the global shortcuts into shortcuts/chatRouteCommands.ts (refactor(web): chat route shortcuts register once instead of rebuilding on every store change pingdotgg/t3code#25366). Took upstream's file and ported the fork's project-scoped "new thread" behaviour (from the multi-project sidebar filter, feat(web): filter the sidebar by several projects at once #67) into chatRouteCommands.ts.
• ChatView.tsx: upstream removed useAgentOpenedPreviews (fix(web): devices agents open in background threads now show up pingdotgg/t3code#25714, the logic moved into useRightPanelActions). Kept the fork's useAgentOpenedDocs call and import, plus upstream's new import.
• ChatComposer.tsx: kept the fork's mergeProjectDisabledSkills import. Dropped the now-unused useDelayedStatus import.
• CodexAdapterV2.ts: kept both sides' imports.
• McpHttpServer.ts: upstream split out layerTools, which the new AgentContextBudget.test.ts uses. layerTools keeps upstream's toolkits only. The fork's toolkits (Docs, AI PM, MCP servers, skill trash, skill library) and the upstream MCP route are merged into layer. T3_MCP_TOOLKITS is unchanged.
• Docs (composer.md, project-settings.md): took upstream's new settings page names and kept the fork's Tools references.

Judgment calls

• Upstream changed the effectFnOpportunity diagnostic from a suggestion to an error. That flagged 30 sites in fork-only server code: DocCommentsService, McpServerOAuth, McpServerRegistry, McpUpstreamClients, McpServerTools, SkillLibrary, the tools toolkit handlers and McpHttpServer. All were rewritten to named Effect.fn("Module.op"). In McpServerOAuth, three functions had a manual withSpan with the same name, so it was removed to avoid a duplicate span.
• AgentContextBudget.test.ts (new upstream test) fails on the fork by design. The fork's own instructions and its additions to the tools toolkit make agent context larger than upstream's committed budget: the Claude system append is 6294 bytes, the Codex context 6842 and the MCP tool list 57676, versus upstream's lower values. I added a SkillLibrary mock so the test can build its layer at all. I left agentContextBudget.json at upstream's values, so the file won't conflict on every sync. The CI workflow that enforces the budget is disabled on the fork. Decision for Riccardo: keep it as a known fork failure, or commit fork budget values and accept occasional conflicts in that JSON.

Verification

• node scripts/fork-brand.ts --check: applies cleanly to 179 files.
• vp run typecheck: clean in apps/server, apps/web, apps/mobile and packages/contracts.
• apps/server fork tests (mcpHub, mcpServers, skills, docs, aipm, ForkSchema, McpHttpServer, MCP toolkits, CodexAdapterV2): 259 passed. The 1 failure is the AgentContextBudget test above.
• apps/web: settingsSearch, sidebarProjectGrouping, docs, chatThreadActions and chatRouteCommands.browser.test.ts all pass.
• vp i lockfile churn was discarded.

Model and harness: Claude Opus 5.5 in Claude Code (T3 Code daily upstream sync task).

🤖 Generated with Claude Code