diff --git a/docs/schemas/plans/pipeline.schema.json b/docs/schemas/plans/pipeline.schema.json index 792da87e7d..eb35b6ced9 100644 --- a/docs/schemas/plans/pipeline.schema.json +++ b/docs/schemas/plans/pipeline.schema.json @@ -45,6 +45,9 @@ "additionalProperties": false } }, + "name": { + "type": "string" + }, "setup": { "anyOf": [ { @@ -121,6 +124,9 @@ } ] }, + "state": { + "type": "string" + }, "steps": { "type": "object", "additionalProperties": { diff --git a/packages/agent-code-review/src/mcp.test.ts b/packages/agent-code-review/src/mcp.test.ts index 2c614aaa8d..cf9804f36f 100644 --- a/packages/agent-code-review/src/mcp.test.ts +++ b/packages/agent-code-review/src/mcp.test.ts @@ -1,7 +1,13 @@ import { describe, expect, it, vi } from "vitest"; import { createCodeReviewState } from "./review-store.js"; +import { spawn } from "@poe-code/agent-spawn"; import { createCodeReviewAgentMcpConfig, createCodeReviewAgentMcpGroup } from "./mcp.js"; +vi.mock("@poe-code/agent-spawn", async (importOriginal) => ({ + ...(await importOriginal()), + spawn: vi.fn(async () => ({ stdout: "", stderr: "", exitCode: 0 })) +})); + describe("createCodeReviewAgentMcpConfig", () => { it("launches the MCP server through the shipped root executable", () => { expect( @@ -35,59 +41,138 @@ describe("createCodeReviewAgentMcpConfig", () => { it.each([ ["audit logging", { appendFailure: new Error("Store unavailable") }, "Store unavailable"], ["PR loading", { fetchFailure: new Error("GitHub unavailable") }, "GitHub unavailable"] - ])("marks %s failures as failed instead of leaving pending state", async (_label, failure, message) => { - const states: Array<{ status: string; error?: string }> = []; - const state = createCodeReviewState({ - sessionId: "session-1", - prUrl: "https://github.com/acme/repo/pull/1", - selectedAgent: "codex", - selectedProfiles: ["generic"] - }); - const group = createCodeReviewAgentMcpGroup( - { - role: "orchestrator", - session: "session-1", - actor: "orchestrator", - cwd: "/repo", - agent: "codex" - }, - { - store: { - read: vi.fn(async () => state), - addSubagent: vi.fn(async (_pr, _actor, status) => { - states.push(status); - return state; - }), - updateSubagent: vi.fn(async (_pr, _actor, status) => { - states.push(status); - return state; - }), - appendOrchestratorAction: vi.fn(async () => { - if ("appendFailure" in failure) throw failure.appendFailure; - return state; + ])( + "marks %s failures as failed instead of leaving pending state", + async (_label, failure, message) => { + const states: Array<{ status: string; error?: string }> = []; + const state = createCodeReviewState({ + sessionId: "session-1", + prUrl: "https://github.com/acme/repo/pull/1", + selectedAgent: "codex", + selectedProfiles: ["generic"] + }); + const group = createCodeReviewAgentMcpGroup( + { + role: "orchestrator", + session: "session-1", + actor: "orchestrator", + cwd: "/repo", + agent: "codex" + }, + { + store: { + read: vi.fn(async () => state), + addSubagent: vi.fn(async (_pr, _actor, status) => { + states.push(status); + return state; + }), + updateSubagent: vi.fn(async (_pr, _actor, status) => { + states.push(status); + return state; + }), + appendOrchestratorAction: vi.fn(async () => { + if ("appendFailure" in failure) throw failure.appendFailure; + return state; + }) + } as never, + fetchPr: vi.fn(async () => { + if ("fetchFailure" in failure) throw failure.fetchFailure; + return {}; }) - } as never, - fetchPr: vi.fn(async () => { - if ("fetchFailure" in failure) throw failure.fetchFailure; - return {}; - }) - } - ); - const spawnCommand = group.children.find(({ name }) => name === "code_review_agent_spawn"); + } + ); + const spawnCommand = group.children.find(({ name }) => name === "code_review_agent_spawn"); - expect(spawnCommand).toBeDefined(); - await expect( - spawnCommand?.handler({ - params: { pr: "https://github.com/acme/repo/pull/1", profile: "generic" } - } as never) - ).resolves.toEqual({ actor: "generic", agent: "codex", status: "pending" }); - await vi.waitFor(() => { - expect(states.at(-1)).toMatchObject({ status: "failed", error: message }); - }); - }); + expect(spawnCommand).toBeDefined(); + await expect( + spawnCommand?.handler({ + params: { pr: "https://github.com/acme/repo/pull/1", profile: "generic" } + } as never) + ).resolves.toEqual({ actor: "generic", agent: "codex", status: "pending" }); + await vi.waitFor(() => { + expect(states.at(-1)).toMatchObject({ status: "failed", error: message }); + }); + } + ); }); describe("createCodeReviewAgentMcpGroup orchestrator tools", () => { + it.each(["codex", "claude-code", "claude", "CLAUDE"])( + "spawns %s nested reviewers using stdin-safe prompt transport", + async (agent) => { + const state = createCodeReviewState({ + sessionId: "session-1", + prUrl: "https://github.com/acme/repo/pull/1", + selectedAgent: agent, + selectedProfiles: ["generic"] + }); + const group = createCodeReviewAgentMcpGroup( + { + role: "orchestrator", + session: "session-1", + actor: "orchestrator", + cwd: "/repo", + agent + }, + { + store: { + read: vi.fn(async () => state), + addSubagent: vi.fn(async () => state), + updateSubagent: vi.fn(async () => state), + appendOrchestratorAction: vi.fn(async () => state) + } as never, + fetchPr: vi.fn(async () => ({})) + } + ); + const command = group.children.find(({ name }) => name === "code_review_agent_spawn"); + + vi.mocked(spawn).mockClear(); + await command?.handler({ + params: { pr: "https://github.com/acme/repo/pull/1", profile: "generic" } + } as never); + await vi.waitFor(() => expect(spawn).toHaveBeenCalled()); + expect(spawn).toHaveBeenCalledWith(agent, expect.objectContaining({ useStdin: true })); + } + ); + + it.each(["kimi", "goose"])( + "does not pass raw text stdin to the %s structured-input protocol", + async (agent) => { + const state = createCodeReviewState({ + sessionId: "session-1", + prUrl: "https://github.com/acme/repo/pull/1", + selectedAgent: agent, + selectedProfiles: ["generic"] + }); + const group = createCodeReviewAgentMcpGroup( + { + role: "orchestrator", + session: "session-1", + actor: "orchestrator", + cwd: "/repo", + agent + }, + { + store: { + read: vi.fn(async () => state), + addSubagent: vi.fn(async () => state), + updateSubagent: vi.fn(async () => state), + appendOrchestratorAction: vi.fn(async () => state) + } as never, + fetchPr: vi.fn(async () => ({})) + } + ); + const command = group.children.find(({ name }) => name === "code_review_agent_spawn"); + + vi.mocked(spawn).mockClear(); + await command?.handler({ + params: { pr: "https://github.com/acme/repo/pull/1", profile: "generic" } + } as never); + await vi.waitFor(() => expect(spawn).toHaveBeenCalled()); + expect(spawn).toHaveBeenCalledWith(agent, expect.not.objectContaining({ useStdin: true })); + } + ); + it("exposes local merged-draft edit, delete, and discard commands", async () => { const state = createCodeReviewState({ sessionId: "session-1", diff --git a/packages/agent-code-review/src/mcp.ts b/packages/agent-code-review/src/mcp.ts index 3aaec8ea8c..7e23ce014a 100644 --- a/packages/agent-code-review/src/mcp.ts +++ b/packages/agent-code-review/src/mcp.ts @@ -18,6 +18,7 @@ import type { CodeReviewDraft, CodeReviewInlineComment } from "./review-state.js"; +import { shouldUseTextStdinForCodeReview } from "./prompt-transport.js"; import { CodeReviewYamlStore, resolveCodeReviewStoreDirectory } from "./review-store.js"; export const CODE_REVIEW_AGENT_MCP_ROLES = ["agent", "orchestrator", "subagent"] as const; @@ -491,7 +492,11 @@ async function spawnWithPoeCode( mcpServers: Record; } ): Promise { - return spawn(agent, { prompt, ...options }); + return spawn(agent, { + prompt, + ...options, + ...(shouldUseTextStdinForCodeReview(agent) ? { useStdin: true } : {}) + }); } function renderSubagentPrompt(input: { diff --git a/packages/agent-code-review/src/prompt-transport.ts b/packages/agent-code-review/src/prompt-transport.ts new file mode 100644 index 0000000000..5b220c051a --- /dev/null +++ b/packages/agent-code-review/src/prompt-transport.ts @@ -0,0 +1,6 @@ +import { getSpawnConfig } from "@poe-code/agent-spawn"; + +export function shouldUseTextStdinForCodeReview(agent: string): boolean { + const config = getSpawnConfig(agent); + return config?.kind === "cli" && (config.agentId === "codex" || config.agentId === "claude-code"); +} diff --git a/packages/agent-code-review/src/review.test.ts b/packages/agent-code-review/src/review.test.ts index a7b166c23a..b5ff1876c8 100644 --- a/packages/agent-code-review/src/review.test.ts +++ b/packages/agent-code-review/src/review.test.ts @@ -3,6 +3,12 @@ import { describe, expect, it, vi } from "vitest"; import type { CodeReviewYamlStore } from "./review-store.js"; import { createCodeReviewState } from "./review-store.js"; import { runCodeReview } from "./review.js"; +import { spawn } from "@poe-code/agent-spawn"; + +vi.mock("@poe-code/agent-spawn", async (importOriginal) => ({ + ...(await importOriginal()), + spawn: vi.fn(async () => ({ stdout: "", stderr: "", exitCode: 0 })) +})); const assetMocks = vi.hoisted(() => ({ loadProfile: vi.fn(async () => "custom profile"), @@ -13,11 +19,13 @@ vi.mock("./assets.js", async (importOriginal) => { const actual = await importOriginal(); return { ...actual, - discoverCodeReviewProfiles: vi.fn(async () => [{ - name: "generic", - content: "generic profile", - source: "built-in" as const - }]), + discoverCodeReviewProfiles: vi.fn(async () => [ + { + name: "generic", + content: "generic profile", + source: "built-in" as const + } + ]), loadCodeReviewProfile: assetMocks.loadProfile, loadCodeReviewPrompt: assetMocks.loadPrompt }; @@ -66,4 +74,52 @@ describe("runCodeReview asset paths", () => { expect(assetMocks.loadProfile).toHaveBeenCalledWith(resolve(cwd, "profiles/security.md")); expect(assetMocks.loadPrompt).toHaveBeenCalledWith(resolve(cwd, "prompts/review.md")); }); + + it.each(["codex", "claude-code", "claude", "CLAUDE"])( + "pipes %s text-safe orchestrator prompts through stdin", + async (agent) => { + vi.mocked(spawn).mockClear(); + await runCodeReview( + { prUrl, cwd: "/repo/worktree" }, + { + resolveOptions: async (input) => ({ + ...input, + agent, + draftStore: ".poe-code/code-review/reviews", + humanGate: { provider: "none" } + }), + fetchPr: async () => ({}), + fetchDiff: async () => "", + fetchComments: async () => ({}), + store: createStore() + } + ); + + expect(spawn).toHaveBeenCalledWith(agent, expect.objectContaining({ useStdin: true })); + } + ); + + it.each(["kimi", "goose"])( + "does not pipe raw text into the %s structured-input orchestrator", + async (agent) => { + vi.mocked(spawn).mockClear(); + await runCodeReview( + { prUrl, cwd: "/repo/worktree" }, + { + resolveOptions: async (input) => ({ + ...input, + agent, + draftStore: ".poe-code/code-review/reviews", + humanGate: { provider: "none" } + }), + fetchPr: async () => ({}), + fetchDiff: async () => "", + fetchComments: async () => ({}), + store: createStore() + } + ); + + expect(spawn).toHaveBeenCalledWith(agent, expect.not.objectContaining({ useStdin: true })); + } + ); }); diff --git a/packages/agent-code-review/src/review.ts b/packages/agent-code-review/src/review.ts index 6cf14f6afe..a20a187b80 100644 --- a/packages/agent-code-review/src/review.ts +++ b/packages/agent-code-review/src/review.ts @@ -21,6 +21,7 @@ import { resolveCodeReviewRuntimeOptions } from "./config.js"; import { createCodeReviewAgentMcpConfig } from "./mcp.js"; +import { shouldUseTextStdinForCodeReview } from "./prompt-transport.js"; import type { CodeReviewState } from "./review-state.js"; import { CodeReviewYamlStore, resolveCodeReviewStoreDirectory } from "./review-store.js"; @@ -236,5 +237,9 @@ async function spawnWithPoeCode( prompt: string, options: Omit ): Promise { - return spawn(agent, { prompt, ...options }); + return spawn(agent, { + prompt, + ...options, + ...(shouldUseTextStdinForCodeReview(agent) ? { useStdin: true } : {}) + }); } diff --git a/packages/agent-spawn/src/agent-spawn.test.ts b/packages/agent-spawn/src/agent-spawn.test.ts index b16907e2d3..8c8cacaff0 100644 --- a/packages/agent-spawn/src/agent-spawn.test.ts +++ b/packages/agent-spawn/src/agent-spawn.test.ts @@ -477,6 +477,19 @@ describe("buildSpawnArgs", () => { expect(result.args).not.toContain(prompt); }); + it("does not silently switch buildSpawnArgs callers to stdin for large prompts", () => { + const prompt = "x".repeat(128 * 1024); + const result = buildSpawnArgs("codex", { prompt }); + + expect(result.args).toEqual([ + codexSpawnConfig.promptFlag, + prompt, + ...codexSpawnConfig.defaultArgs, + ...codexSpawnConfig.modes.yolo + ]); + expect(result.args).toContain(prompt); + }); + it("ignores useStdin for agents without stdinMode", () => { const result = buildSpawnArgs("opencode", { prompt: "hello", useStdin: true });