Skip to content

feat(mcp): expose fork and merge-back commands - #10558

Merged
juliusmarminge merged 1 commit into
agents/mcp-thin/configurationfrom
agents/mcp-thin/conversation-transfer
Sep 7, 2026
Merged

feat(mcp): expose fork and merge-back commands#10558
juliusmarminge merged 1 commit into
agents/mcp-thin/configurationfrom
agents/mcp-thin/conversation-transfer

Conversation

@juliusmarminge

@juliusmarminge juliusmarminge commented Sep 7, 2026

Copy link
Copy Markdown
Member

Part 8/16 of the shared-core and MCP stack. Based on #10557. Next: #10559.

Expose the existing fork and merge-back commands plus transfer status. The caller supplies an existing stable source point; orchestration owns lineage, persistence and provider transfer execution.

Each invocation generates a new command. No additional clientRequestId protocol, transfer journal or provider implementation. Merge targets remain in the calling project.

MCP-only rebuild of #8696, #8697, preserving attribution to Julius Marminge's original work. Original branches remain available for separate service follow-ups.

Validation: The composed stack passes 94 tests across 12 focused files, including shared core MCP and real MCP/V2 integration, attachment intake, project RPC/service contracts, and client model command selection. Server/contracts/shared/client-runtime typechecks and targeted format/lint/diff checks pass. New behavior coverage lives with the shared operation; no per-tool mock suite was added. Current-head CI is shown below.

Layer size: 4 files, +99/-1. No domain-service production implementation or documentation files change in this MCP layer.

Prepared with Codex in the OpenAI agent runtime.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Sep 7, 2026
@juliusmarminge juliusmarminge changed the title feat(mcp): expose existing conversation transfers feat(mcp): expose fork and merge-back commands Sep 7, 2026
@macroscopeapp

macroscopeapp Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds new MCP tools that let agents create thread forks and merge context back into related threads, with persistent orchestration and transfer-state effects. The operations are explicitly destructive and the new MCP handlers lack dedicated tests in this change, so the expanded workflow warrants human review.

No code changes detected at e3e71c7. Prior analysis still applies.

You can add or adjust custom eligibility rules. Learn more.

@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for e3e71c7.

This comment will update automatically after the next completed run.

@juliusmarminge
juliusmarminge force-pushed the agents/mcp-thin/conversation-transfer branch from 110759b to 86cd91d Compare September 7, 2026 19:44
@juliusmarminge
juliusmarminge force-pushed the agents/mcp-thin/conversation-transfer branch from 86cd91d to 0996a06 Compare September 7, 2026 20:39
@juliusmarminge
juliusmarminge force-pushed the agents/mcp-thin/conversation-transfer branch 2 times, most recently from a5b0bae to d359d33 Compare September 7, 2026 20:48
@juliusmarminge
juliusmarminge force-pushed the agents/mcp-thin/conversation-transfer branch from d359d33 to e3e71c7 Compare September 7, 2026 20:55
@juliusmarminge
juliusmarminge merged commit fbb624d into t3code/codex-turn-mapping Sep 7, 2026
25 checks passed
@juliusmarminge
juliusmarminge deleted the agents/mcp-thin/conversation-transfer branch September 7, 2026 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant