Skip to content

Upstream sync conflict: upstream 43ce39595b #89

Closed

Description

@chrisohearn

The daily upstream sync could not merge pingdotgg/t3code main (95cb068, 235 commits) into integration/mcp-events-20261109.

Conflicting files:

  • apps/server/src/mcp/McpHttpServer.ts
  • apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/mcp/toolkits/core.test.ts
  • apps/server/src/mcp/toolkits/orchestrator/tools.ts
  • apps/server/src/orchestration-v2/ProjectionStore.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
  • apps/server/src/persistence/Migrations.ts
  • apps/server/src/workspace/WorkspaceEntries.test.ts
  • apps/server/src/workspace/WorkspaceSearchIndex.test.ts
  • apps/server/src/workspace/WorkspaceSearchIndex.ts
  • apps/web/vite.config.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 13, 2026

    @chrisohearn
    OwnerAuthor

    The daily upstream sync could not merge pingdotgg/t3code main (97cfc07, 275 commits) into integration/mcp-events-20261109.

    Conflicting files:

    • apps/server/src/mcp/McpHttpServer.ts
    • apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
    • apps/server/src/mcp/OrchestratorMcpService.ts
    • apps/server/src/mcp/toolkits/core.test.ts
    • apps/server/src/mcp/toolkits/orchestrator/tools.ts
    • apps/server/src/orchestration-v2/ProjectionStore.ts
    • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
    • apps/server/src/persistence/Migrations.ts
    • apps/server/src/workspace/WorkspaceEntries.test.ts
    • apps/server/src/workspace/WorkspaceSearchIndex.test.ts
    • apps/server/src/workspace/WorkspaceSearchIndex.ts
    • apps/web/vite.config.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.

  2. changed the title [-]Upstream sync conflict: upstream 95cb068c10[/-] [+]Upstream sync conflict: upstream 97cfc07759[/+] on Nov 13, 2026
  3. chrisohearn commented on Nov 13, 2026

    @chrisohearn
    OwnerAuthor

    The daily upstream sync could not merge pingdotgg/t3code main (43ce395, 289 commits) into integration/mcp-events-20261109.

    Conflicting files:

    • apps/server/src/mcp/McpHttpServer.ts
    • apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
    • apps/server/src/mcp/OrchestratorMcpService.ts
    • apps/server/src/mcp/toolkits/core.test.ts
    • apps/server/src/mcp/toolkits/orchestrator/tools.ts
    • apps/server/src/orchestration-v2/ProjectionStore.ts
    • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
    • apps/server/src/persistence/Migrations.ts
    • apps/server/src/workspace/WorkspaceEntries.test.ts
    • apps/server/src/workspace/WorkspaceSearchIndex.test.ts
    • apps/server/src/workspace/WorkspaceSearchIndex.ts
    • apps/web/vite.config.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.

  4. changed the title [-]Upstream sync conflict: upstream 97cfc07759[/-] [+]Upstream sync conflict: upstream 43ce39595b[/+] on Nov 13, 2026
  5. chrisohearn commented on Nov 13, 2026

    @chrisohearn
    OwnerAuthor

    Resolved by #99, merged as dc3ee55, preserving fork migration history in t3_fork_migrations. Final-head hosted checks and independent exact-head code/security review pass. The mandatory sync wrapper also passed its complete local checks, release build/smoke and read-only live-DB launcher preflights for protocols 3 and 4, then published https://github.com/chrisohearn/t3code/releases/tag/v0.1.10-preview.20261113.4 . The release tag and merged integration share the exact verified candidate tree, and both archive/checksum assets are verified. Deployment is pending the existing guarded idle updater; .3 still serves, so publication is not being claimed as live deployment.

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