Skip to content

Upstream sync conflict: upstream main (5f29d87c9b) #124

Closed

Description

@chrisohearn

The upstream sync could not merge pingdotgg/t3code upstream main (5f29d87) (5f29d87, 474 commits) into integration/mcp-events-20261109.

Conflicting files:

  • .github/workflows/ci.yml
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/mcp/McpHttpServer.ts
  • apps/server/src/mcp/McpInvocationContext.ts
  • apps/server/src/mcp/OrchestratorMcpService.test.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/mcp/toolkits/core.test.ts
  • apps/server/src/mcp/toolkits/project/handlers.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
  • apps/server/src/orchestration-v2/EffectWorker.ts
  • apps/server/src/orchestration-v2/Orchestrator.ts
  • apps/server/src/orchestration-v2/ProjectionStore.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
  • apps/server/src/orchestration-v2/ThreadLaunchService.ts
  • apps/server/src/orchestration-v2/ThreadManagementService.test.ts
  • apps/server/src/orchestration-v2/ThreadSettlementService.ts
  • apps/server/src/orchestration-v2/TurnItemPositionStore.ts
  • apps/server/src/orchestration-v2/runtimeLayer.test.ts
  • apps/server/src/peer/PeerForwarding.test.ts
  • apps/server/src/peer/PeerForwarding.ts
  • apps/server/src/peer/PeerLinkRequests.test.ts
  • apps/server/src/scheduledTasks/ScheduledTaskService.ts
  • apps/server/src/textGeneration/ClaudeTextGeneration.ts
  • apps/web/test/fakeEnvironment.ts
  • packages/contracts/src/orchestrationV2.ts
  • packages/shared/src/htmlRender.ts

Resolve it in a worktree from fresh origin/integration/mcp-events-20261109, following FORK.md (fork migrations stay in ForkMigrations/), then open a PR into integration/mcp-events-20261109 from a sync/upstream-* branch. The next sync run checks, merges and releases it.

Activity

  1. chrisohearn commented on Nov 15, 2026

    @chrisohearn
    OwnerAuthor

    Resolved by hand in #125 (one-time nightly-track sync).

  2. chrisohearn commented on Nov 15, 2026

    @chrisohearn
    OwnerAuthor

    Resolved and merged in #125 (416418b), released as v0.1.10-preview.20261115.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions