[riccardovandra]

Merges 222 commits from pingdotgg/t3code main (through 4e493b1492, "docs: read GitHub Actions logs through cafe (pingdotgg#25343)") into the fork. Notable upstream changes: the new design is on by default, Settings and Usage now open as modals under the _chat layout, the orchestration instructions were rewritten into a compact form, and many Effect lint rules became errors.

Conflicts and resolutions

• packages/provider-core/src/server/orchestrationInstructions.ts: upstream compacted the sections and moved the ACP fallback into its own constant. Took upstream's file and re-applied the fork's changes on top: Docs Cloud / project-files sections and the AI PM ideas section appended at the end, plus the docsCloud parameter through t3CodeOrchestrationInstructions, the ACP state and the first-run/system prompt helpers. The fork's old copy of upstream's long worktree-launch text was dropped in favour of upstream's new wording.
• apps/web/src/routeTree.gen.ts and routes: upstream moved settings.* routes to _chat.settings.*. Moved the fork's settings.tools.tsx and settings.mcp-servers.tsx the same way (route ids /_chat/settings/tools and /_chat/settings/mcp-servers; URLs are unchanged) and regenerated the route tree.
• apps/web/src/components/sidebar/mainAppLocation.ts: took upstream's router-subscription tracker and modal-page split; kept /ai-pm as a sidebar utility page.
• apps/web/src/components/ChatView.tsx: kept the fork's resolveProviderInstanceDisplayName import (used by useAgentOpenedDocs); dropped registerFaviconProjectForThread, which upstream no longer calls here.
• apps/web/src/components/settings/settingsSearch.ts: kept the fork's MCP servers entry, using upstream's new sentence-case labels.
• apps/mobile/src/features/settings/SettingsRouteScreen.tsx: took upstream's row-list refactor and re-added the fork's MCP servers row under Server settings.
• apps/mobile/src/features/threads/ThreadFeed.tsx: kept the DocsCloudCard import and took upstream's slimmer assets import.
• apps/server/src/auth/RpcAuthorization.ts: kept the fork's settings-aware requiredScopesForSettingsUpdate(payload, current) and used upstream's shared decodeSettingsUpdate.
• packages/contracts/src/rpc.ts: kept the fork's skills and MCP tools imports; took upstream's reduced threadSearch import.
• apps/server/package.json, knip.jsonc, docs/user/project-settings.md: kept both sides (saxes + skills; apps/docs-cloud + infra/task-cache; the Tools sentence in upstream's reworded paragraph).
• pnpm-lock.yaml: took upstream's and reinstalled. Removed the @pnpm/exe packageManagerDependencies entries that the local install added. The only remaining differences from upstream are the fork's own dependencies (docs-cloud, skills, MCP SDK in server dependencies).

Judgment calls

• Upstream made several Effect diagnostics errors. Updated fork code to match: RpcAuthorization (Effect.undefined, yield the error directly), DocCommentDelivery (filterOrFail), DocsCloudImport (asSome, succeedNone, decodeEffect), the fork's Codex MCP-name read in CodexAdapterV2 (orElseSucceed), and Effect.forEach in two docs test files.
• settingsScopeNavigation.test.ts builds its own router, so its /settings route id is still correct there. The registered route types now say /_chat/settings, so the test compares String(match.routeId).

Verification

• node scripts/fork-brand.ts --check: passes (180 files).
• vp run typecheck: passes in apps/server, apps/web, apps/mobile, packages/contracts, packages/provider-core.
• vp test run on the 111 fork-touched test files plus tests next to conflicted files: all pass except:
  • ServerEnvironment.test.ts "publishes proven install ownership": the known upstream failure on macOS.
  • OpenCode2OrchestratorV2.integration.test.ts: 6 of 9 fail with 60s scenario timeouts. They fail the same way on the fork's current main and pass on pristine upstream/main, so the fork already had this before the merge. Worth a separate fix.
  • apps/docs-cloud compile.test.ts timed out once under parallel load and passes when run alone.

Opus 5.5 via Claude Code in T3 Code.

🤖 Generated with Claude Code