What to build
Resolve all 23 unresolved <<<<<<< HEAD / >>>>>>> t3-code/main merge conflict markers across 16 files. These originated from the initial fork of t3-code/main and block all subsequent modularization work. Resolve in favor of the fork's additions where the fork diverged from upstream; resolve in favor of upstream where the fork has not modified the affected code.
Affected files
AGENTS.md
packages/shared/package.json
packages/contracts/src/rpc.ts
packages/contracts/src/ipc.ts
packages/client-runtime/src/wsRpcClient.ts
apps/web/src/localApi.test.ts
apps/web/src/environmentApi.ts
apps/web/src/components/ChatView.browser.tsx
apps/web/src/clientPersistenceStorage.ts
apps/server/src/ws.ts
apps/server/src/provider/Layers/ProviderRegistry.test.ts
apps/server/src/provider/Layers/ClaudeAdapter.ts
apps/server/src/persistence/Migrations.ts
apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
apps/server/integration/OrchestrationEngineHarness.integration.ts
Acceptance criteria
Blocked by
None - can start immediately
What to build
Resolve all 23 unresolved
<<<<<<< HEAD/>>>>>>> t3-code/mainmerge conflict markers across 16 files. These originated from the initial fork oft3-code/mainand block all subsequent modularization work. Resolve in favor of the fork's additions where the fork diverged from upstream; resolve in favor of upstream where the fork has not modified the affected code.Affected files
AGENTS.mdpackages/shared/package.jsonpackages/contracts/src/rpc.tspackages/contracts/src/ipc.tspackages/client-runtime/src/wsRpcClient.tsapps/web/src/localApi.test.tsapps/web/src/environmentApi.tsapps/web/src/components/ChatView.browser.tsxapps/web/src/clientPersistenceStorage.tsapps/server/src/ws.tsapps/server/src/provider/Layers/ProviderRegistry.test.tsapps/server/src/provider/Layers/ClaudeAdapter.tsapps/server/src/persistence/Migrations.tsapps/server/src/orchestration/Layers/ProjectionSnapshotQuery.tsapps/server/integration/OrchestrationEngineHarness.integration.tsAcceptance criteria
<<<<<<</>>>>>>>markers removed from all 16 filesvp checkpasses (typecheck + lint)vp testpasses (full test suite)rg "<<<<<<<|>>>>>>>|======="returns emptyBlocked by
None - can start immediately