Skip to content

Commit 06c7fdc

Browse files
ElliotDrelclaude
andcommitted
Merge origin/main into t3/background-provider-updates
Resolves three conflicts against main 8b44f42 by keeping both sides: - apps/mobile/src/App.tsx: keep the Effect/mobileInteraction imports and main's DEFAULT_HOSTED_APP_URL import. - ProjectionRecovery.test.ts: keep main's query-plan index loop for delegated-completions/subagent-results, then this branch's active-work assertion. - ProviderTurnStartService.test.ts: keep this branch's release and releaseUnlessBusy harness fields and main's fallbackEnsureThread. Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents 590da14 + 8b44f42 commit 06c7fdc

28,272 files changed

Lines changed: 1958071 additions & 1639145 deletions

File tree