merge upstream/main into fork

[adampeterhiggins]

The fork was 104 commits behind upstream/main and 201 ahead. This merges upstream through 76d3c96fd5.

What upstream brought that touched fork code:

• One module per server service (refactor(server): one module per service instead of Services/ and Layers/ folders pingdotgg/t3code#16295) and layer/layerXyz naming (refactor: layer variables are named layer or layerXyz pingdotgg/t3code#16282). provider/Layers, provider/Services and the persistence/observability folders are gone.
• Effect 4.0.1, which removed the effect/unstable/* import paths.
• Effect Crypto for ids and hashes (refactor: Effect code gets UUIDs and SHA-256 from Effect's Crypto pingdotgg/t3code#16377).
• The PR watch rewrite: one read per PR every two minutes, a fingerprint check, giving up after 8 failed reads.
• New features alongside the fork's: /goal, html_render, the worktree location setting, secret requests and the t3/ branch prefix.

How the 60 conflicts were resolved. Upstream's structure was taken in each case, with the fork's behaviour rebuilt on top:

• Providers: Devin and Custom ACP moved to the new layout. The fork's ProviderAuthService start options and the provider-registry tests now live in upstream's merged modules. generateIgnoredNames is added once in TextGenerationOperations.fromRunner, so every provider gets it. Devin's text generation now uses fromRunner too, so its thread titles get linked context like the other providers.
• Usage: upstream's atomic cache writes are kept alongside the fork's LiteLLM and Devin rate tables. The Cursor credential read now gets Crypto.
• Server wiring: server.ts takes upstream's graph plus every fork layer: Linear, Slack, Notion, GitHub issues, thread tabs, the agent access MCP, subagent worktree setup, Conductor workspaces, context repositories and the PR watch import.
  • In ws.ts, the combined 215 RPCs exceeded TypeScript's instantiation limit. A small toWsRpcLayer helper reads each handler's required services directly, so missing services are still caught.
• PR watches: upstream's new reactor, plus the fork's pause/resume, follow-up budget, review-decision handling and settled-thread watching. Archiving a thread or pressing Stop ends a watch, as upstream does.
• MCP and orchestration: delegate_task's workspaceStrategy (feat(server): delegated subagents can run in their own worktree #168) is wired into upstream's new SecretRequests dependency. Fork tests have been moved to upstream's names and t3/ prefix.
• Import cycle: upstream's hydration module plus feat(server): delegated subagents can run in their own worktree #168's Claude worktree setup created one. ProviderOrchestrationAdapterInfrastructure.layer is now built lazily, with a comment explaining why.
• Clients:
  • Unions in the open-URL targets, tool kinds, environment capabilities and storage settings.
  • The fork's provider sign-in step stays alongside upstream's local ACP option.
  • The fork's work-log file-change preview stays alongside upstream's output images and live shimmer.
  • The agent transcript shows html_render pages.
• Docs: the four conflicted user guides are merged into one account each. fork-differences.md now reflects the t3/ prefix and upstream ending watches on settle.
• Fork-only files that merged cleanly but broke: about 60 files are moved to the new Effect paths and module names, and upstream's new lint rules are applied (catchTags, it.effect.each).

Verified locally:

• Typecheck: contracts, shared, client-runtime, server, web, mobile and desktop all have no errors.
• Tests:
  • All 18 conflicted test files pass (325 tests).
  • Every test under provider/, textGeneration/ and usage/ passes (1,777 tests).
  • The MCP, orchestration, app-wiring and client tests pass.
  • Two Antigravity file tests and one ServerEnvironment test fail on macOS only, because the temp directory is a /var → /private/var symlink. Those files are identical to upstream's.
• Lint: clean, warnings only, on all 628 source files that differ from upstream.
• Server start: the server starts from source against a throwaway home. It runs all migrations, listens and prints a pairing URL, with no errors.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Built by Claude Opus 5.5 (1M context) in Claude Code, running in T3 Code.

🤖 Generated with Claude Code