Skip to content

fix(mcp): pin PWD to cwd when spawning a local harness #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drewstone merged 2 commits into from
Jul 13, 2026
Merged

fix(mcp): pin PWD to cwd when spawning a local harness #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1ece2
fix(mcp): pin PWD to cwd when spawning a local harness
drewstone Jul 13, 2026
ed7c667
docs(api): regenerate mcp.md line ref for parseCodexTokenUsage
Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/api/mcp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7677,7 +7677,7 @@ Does NOT throw when:

> **parseCodexTokenUsage**(`stdout`): [`CodexTokenUsage`](#codextokenusage)

Defined in: [mcp/local-harness.ts:1341](https://github.com/tangle-network/agent-runtime/blob/main/src/mcp/local-harness.ts#L1341)
Defined in: [mcp/local-harness.ts:1348](https://github.com/tangle-network/agent-runtime/blob/main/src/mcp/local-harness.ts#L1348)

Parse and validate the one terminal usage event emitted by `codex exec --json`.

Expand Down
9 changes: 8 additions & 1 deletion src/mcp/local-harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,14 @@ export async function runLocalHarness(
: buildHarnessArgs(harness, taskPrompt, options)
if (options.codexReproducible) assertCodexReproducibleInvocation(requestedCommand, args)

const baseEnv = options.env ?? process.env
// We spawn the harness with `cwd`, but a harness that resolves its working
// directory from `$PWD` rather than `getcwd()` (opencode does; the others may)
// inherits the parent's stale `PWD` and edits the WRONG directory — its
// worktree diff then comes back empty and the delegation fails with a phantom
// "empty patch". Pin `PWD` to `cwd` so the harness edits where it was placed.
// `baseEnv` feeds both the codex-isolated and the plain spawn paths below, so
// pinning it here covers every runLocalHarness consumer.
const baseEnv: NodeJS.ProcessEnv = { ...(options.env ?? process.env), PWD: cwd }
const isolated = options.codexReproducible
? await isolateCodexHome({
baseEnv,
Expand Down
Loading