[EthanGunter]

Merges upstream/main (pingdotgg/t3code, 434 commits, up to 82465ed26a) into the fork's main as a merge commit.

Fork layer

The fork carries three commits on top of upstream: shell-check gating for scheduled tasks (server, contracts, MCP, RPC scopes, web and mobile editors), editing those checks from web and mobile, and the runtime staging script for the home server image. Upstream did not build anything that overlaps the check feature, so the whole layer stays.

Conflicts (5 files)

• apps/server/src/persistence/Sqlite.ts — Upstream split database setup into makeLayerSetup(migrate) so CLI commands no longer migrate a running server's database (fix(server): CLI commands no longer migrate the database of a running server pingdotgg/t3code#26763). Ours called ensureForkSchema() after runMigrations(). Resolved by taking upstream's structure and calling ensureForkSchema() right after the injected migrate step, so both the server and CLI paths still get the fork columns. Moved ours onto upstream's.
• apps/server/src/scheduledTasks/ScheduledTaskService.ts — Upstream added hasQueuedOccurrence so recurring tasks keep one queued occurrence while their thread is busy (fix(server): recurring tasks keep one queued occurrence while their thread is busy pingdotgg/t3code#23609). Ours added recordCheck/runCheck in the same spot. Kept both. In runTask, upstream's queued-occurrence guard now runs before our shell check, so a busy thread does not run the check command needlessly.
• apps/web/src/components/settings/scheduledTasksSettings.logic.ts — Upstream imported scheduleTimeZoneLabel (fix(scheduler): show short server timezone on fixed-time labels pingdotgg/t3code#23111) where we imported the check draft helpers. Kept both imports.
• apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx — Same import collision as the web file. Kept both.
• packages/client-runtime/package.json — Upstream added the ./scheduled-task-time-zone subpath export next to our ./scheduled-task-check. Kept both.

Overlaps without text conflicts

• Upstream's scheduled task changes (fix(server): scheduled task updates keep the saved workspace unless the binding changes pingdotgg/t3code#32494 keep saved workspace on update, fix(server): recurring tasks keep one queued occurrence while their thread is busy pingdotgg/t3code#23609 queued occurrence, fix(scheduler): show short server timezone on fixed-time labels pingdotgg/t3code#23111 time zone labels) merged cleanly around our check handling in upsert/runTask. Verified by typecheck and the scheduled task test suites.
• Upstream's MCP hardening (fix(server): MCP tools reject top-level arguments they do not declare pingdotgg/t3code#26721 reject undeclared top-level arguments, fix(server): tell outside agents which MCP tools need a thread and that t3_thread_list takes allProjects pingdotgg/t3code#26525 tool descriptions) does not affect our check argument because it is declared in OrchestratorMcpScheduleTaskInput / OrchestratorMcpUpdateScheduledTaskInput.
• No fork schema changes were absorbed by upstream; forkSchema.ts is unchanged.

Checks

• vp i, then vp run typecheck: 41/41 packages pass.
• vp test run on apps/server/src/scheduledTasks, apps/server/src/persistence/{Sqlite,Migrations,initializeV2Database}.test.ts, apps/server/src/mcp/OrchestratorMcpService.test.ts, apps/server/src/auth/RpcAuthorization.test.ts, packages/client-runtime/src/scheduledTask{Check,TimeZone}.test.ts, apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts, and the mobile scheduled task draft/editor tests: all pass (290 tests).
• vp run check:changed: two failures came in with the fork, not the merge, and a follow-up commit on this branch fixes both. All checks now pass.
  • knip flagged scripts/stage-local-runtime.ts as unused. The home server build runs it by path, so it is now listed in knip.jsonc like upstream's other path-run scripts.
  • AgentContextBudget.test.ts measured a bigger MCP tool list than recorded, because the fork's check fields add to the scheduled task tools. agentContextBudget.json now records the measured size. Later syncs may conflict on that number; resolve it by rerunning the test and taking its value.

CI's budget gate refuses growth over main unless the PR has the agent-context-increase label, upstream's way to accept it. The label was created on the fork to match upstream's and added here. Future syncs need it whenever upstream's tool text grows.

The maintainer approved merging once CI is green.

🤖 Generated with Claude Code