kanbot 0.3.0 → 0.4.1

package/src/jobs/prompts.ts

@@ -1,3 +1,4 @@
+import { type Capabilities, capabilitiesSection } from "../capabilities.ts";
 import {
 	type FixJob,
 	type ImplementJob,
@@ -21,6 +22,8 @@ const RULES = `## Ground rules
 - Your final answer must be the structured JSON result. Put everything the human should see in it.
 - Write short and plain: only what the reader needs to act or understand. Don't restate the input or narrate your process.`;
 
+const VALIDATION = "List what you used under Validation in the PR body.";
+
 function quote(text: string) {
 	return text.trim() ? text.trim() : "_(empty)_";
 }
@@ -109,7 +112,11 @@ export function planPrompt(job: PlanJob, explore: number | null) {
 	return parts.join("\n\n");
 }
 
-export function implementPrompt(job: ImplementJob, base: string) {
+export function implementPrompt(
+	job: ImplementJob,
+	base: string,
+	capabilities: Capabilities = {},
+) {
 	const { issue } = job.item;
 	const parts = [
 		issueHeader(issue),
@@ -126,13 +133,18 @@ export function implementPrompt(job: ImplementJob, base: string) {
 			`## Recent human comments on the issue\n${conversation(humanNotes)}`,
 		);
 	parts.push(
+		capabilitiesSection(capabilities, VALIDATION),
 		`## Workspace\n- Branch \`${job.branch}\`, created from \`origin/${base}\`.\n- Commit your work with conventional commit messages. Uncommitted changes are committed for you, but prefer small commits.\n- Run the project's tests and linters before finishing and report them in \`testsRun\`.`,
 		RULES,
 	);
-	return parts.join("\n\n");
+	return parts.filter(Boolean).join("\n\n");
 }
 
-export function reviewPrompt(job: ReviewJob, base: string) {
+export function reviewPrompt(
+	job: ReviewJob,
+	base: string,
+	capabilities: Capabilities = {},
+) {
 	const { issue } = job.item;
 	const { pr } = job;
 	return [
@@ -140,7 +152,8 @@ export function reviewPrompt(job: ReviewJob, base: string) {
 		`## Plan / acceptance criteria\n${extractPlan(issue.body) ?? stripPlan(issue.body)}`,
 		`## Pull request #${pr.number}: ${pr.title}\nBranch \`${pr.headRefName}\` (checked out). Diff with: \`git diff origin/${base}...HEAD\`. CI status: ${pr.checks ?? "none"}.\n\n### PR description\n${quote(stripMarkers(pr.body))}`,
 		humanDecisions(pr),
-		`## Review pass ${job.pass} of ${reviewPasses(issue).length}\nYou only review. Do not edit files or commit.`,
+		capabilitiesSection(capabilities),
+		`## Review pass ${job.pass} of ${reviewPasses(issue).length}: ${job.pass === 1 ? "technical" : "acceptance"}\nYou only review. Do not edit files or commit.${job.pass === 2 && Object.values(capabilities).some((c) => c.required) ? " A required capability that applies but is missing from the PR body's Validation section is a blocker." : ""}`,
 		RULES,
 	]
 		.filter(Boolean)
@@ -148,7 +161,12 @@ export function reviewPrompt(job: ReviewJob, base: string) {
 }
 
 /** `details`: CI logs for a CI fix, the conflicted files for a conflict fix. */
-export function fixPrompt(job: FixJob, base: string, details: string | null) {
+export function fixPrompt(
+	job: FixJob,
+	base: string,
+	details: string | null,
+	capabilities: Capabilities = {},
+) {
 	const { issue } = job.item;
 	const { pr } = job;
 	const parts = [
@@ -156,6 +174,8 @@ export function fixPrompt(job: FixJob, base: string, details: string | null) {
 		`## Plan / acceptance criteria\n${extractPlan(issue.body) ?? stripPlan(issue.body)}`,
 		`## Pull request #${pr.number}: ${pr.title}\nBranch \`${pr.headRefName}\` (checked out). Diff with: \`git diff origin/${base}...HEAD\`.\n\n### Current PR description\n${quote(stripMarkers(pr.body))}`,
 	];
+	const caps = capabilitiesSection(capabilities, VALIDATION);
+	if (caps) parts.push(caps);
 	const r = job.reason;
 	const decisions = r.type === "feedback" ? null : humanDecisions(pr);
 	if (decisions) parts.push(decisions);

package/src/jobs/run.ts

@@ -13,6 +13,7 @@ import {
 	type ReviewJob,
 	reviewPasses,
 	variantOf,
+	withOpenQuestions,
 } from "../daemon/derive.ts";
 import type { Worktrees } from "../daemon/git.ts";
 import type { Notifier } from "../daemon/notify.ts";
@@ -168,11 +169,13 @@ async function plan(job: PlanJob, deps: JobDeps) {
 
 	// Re-read so concurrent human edits to the description are kept.
 	const fresh = await fetchIssue(gh, issue.number);
-	await updateIssueBody(bot, issue.number, withPlan(fresh.body, result.plan));
-
-	const allowed = result.labels.filter(
-		(l) => l === LABELS.technical || l.startsWith(LABELS.typePrefix),
+	await updateIssueBody(
+		bot,
+		issue.number,
+		withPlan(fresh.body, withOpenQuestions(result.plan, result.questions)),
 	);
+
+	const allowed = result.labels.filter((l) => l === LABELS.technical);
 	await addLabels(
 		bot,
 		issue.number,
@@ -208,7 +211,9 @@ async function plan(job: PlanJob, deps: JobDeps) {
 		);
 	}
 	lines.push(
-		"_Comment to refine. Drag the card to **Ready** when the plan is approved._",
+		result.questions.length
+			? "_Answer the questions to refine. kanbot won't start while the plan has open questions._"
+			: "_Comment to refine. Drag the card to **Ready** when the plan is approved._",
 	);
 	lines.push(
 		[marker("plan"), ...job.comments.map((c) => marker("re", c.id))].join("\n"),
@@ -219,6 +224,28 @@ async function plan(job: PlanJob, deps: JobDeps) {
 
 // ---- implement ----------------------------------------------------------------
 
+/**
+ * Always `implementer`. The deprecated `implementers` map still routes by
+ * type:<key> label, and `implementer-backend` serves installs not yet upgraded.
+ */
+export function implementerFor(
+	config: Config,
+	agents: AgentDef[],
+	labels: string[],
+): string {
+	if (config.implementers) {
+		const type = labels
+			.find((l) => l.startsWith(LABELS.typePrefix))
+			?.slice(LABELS.typePrefix.length);
+		const name =
+			config.implementers[type ?? "default"] ?? config.implementers.default;
+		if (name) return name;
+	}
+	return agents.some((a) => a.name === "implementer")
+		? "implementer"
+		: "implementer-backend";
+}
+
 async function implement(job: ImplementJob, deps: JobDeps) {
 	const { gh, bot, config, worktrees } = deps;
 	const { issue } = job.item;
@@ -231,20 +258,14 @@ async function implement(job: ImplementJob, deps: JobDeps) {
 	const cwd = await worktrees.checkout(worktreeName(job), job.branch);
 	let result: z.infer<typeof ImplementResult> | null = null;
 	if (!resumed) {
-		const typeLabel = issue.labels
-			.find((l) => l.startsWith(LABELS.typePrefix))
-			?.slice(LABELS.typePrefix.length);
-		const agentName =
-			config.implementers[typeLabel ?? "default"] ??
-			config.implementers.default ??
-			"implementer-backend";
+		const agentName = implementerFor(config, deps.agents, issue.labels);
 		result = await runAgent(
 			deps,
 			job,
 			agentName,
 			"implement-result",
 			cwd,
-			implementPrompt(job, config.baseBranch),
+			implementPrompt(job, config.baseBranch, config.capabilities),
 		);
 		if (result.status === "blocked") {
 			await addLabels(bot, issue.number, [LABELS.needsHuman]);
@@ -306,9 +327,7 @@ async function implement(job: ImplementJob, deps: JobDeps) {
 		base: config.baseBranch,
 	});
 	if (pr) {
-		const labels = issue.labels.filter(
-			(l) => l.startsWith(LABELS.typePrefix) || l === LABELS.technical,
-		);
+		const labels: string[] = issue.labels.filter((l) => l === LABELS.technical);
 		if (job.variant !== null)
 			labels.push(`${LABELS.variantPrefix}${job.variant}`);
 		await addLabels(bot, pr.number, labels);
@@ -336,8 +355,17 @@ export function absoluteImages(md: string, repo: string, branch: string) {
 
 // ---- review -------------------------------------------------------------------
 
-const PASS_AGENT = { 1: "reviewer-code", 2: "reviewer-spec" } as const;
-const PASS_NAME = { 1: "code", 2: "spec" } as const;
+/** Agent per review pass. The second name serves installs not yet upgraded. */
+export const PASS_AGENTS = {
+	1: ["reviewer", "reviewer-code"],
+	2: ["acceptance-reviewer", "reviewer-spec"],
+} as const;
+const PASS_NAME = { 1: "technical", 2: "acceptance" } as const;
+
+export function passAgent(agents: AgentDef[], pass: 1 | 2): string {
+	const [name, legacy] = PASS_AGENTS[pass];
+	return agents.some((a) => a.name === name) ? name : legacy;
+}
 
 async function review(job: ReviewJob, deps: JobDeps) {
 	const cwd = await deps.worktrees.checkout(
@@ -347,10 +375,10 @@ async function review(job: ReviewJob, deps: JobDeps) {
 	const result = await runAgent(
 		deps,
 		job,
-		PASS_AGENT[job.pass],
+		passAgent(deps.agents, job.pass),
 		"review-result",
 		cwd,
-		reviewPrompt(job, deps.config.baseBranch),
+		reviewPrompt(job, deps.config.baseBranch, deps.config.capabilities),
 	);
 	ReviewResult.parse(result);
 	const icon = result.verdict === "approve" ? "✅" : "🛠️";
@@ -382,7 +410,7 @@ async function fix(job: FixJob, deps: JobDeps) {
 		"fixer",
 		"fix-result",
 		cwd,
-		fixPrompt(job, config.baseBranch, logs),
+		fixPrompt(job, config.baseBranch, logs, config.capabilities),
 	);
 	FixResult.parse(result);
 
@@ -488,7 +516,12 @@ async function mergeBase(job: FixJob, deps: JobDeps, cwd: string) {
 			"fixer",
 			"fix-result",
 			cwd,
-			fixPrompt(job, config.baseBranch, files.map((f) => `- ${f}`).join("\n")),
+			fixPrompt(
+				job,
+				config.baseBranch,
+				files.map((f) => `- ${f}`).join("\n"),
+				config.capabilities,
+			),
 		);
 		FixResult.parse(result);
 		const left: string[] = [];
@@ -551,6 +584,12 @@ export async function applyAction(action: Action, deps: JobDeps) {
 			);
 			return;
 		}
+		case "openQuestions":
+			return postComment(
+				bot,
+				action.item.issue.number,
+				`**Not started: the plan has open questions.**\n\n${action.questions.map((q) => `- ${q}`).join("\n")}\n\nMove the card to **Planning** and answer them, or remove them from the plan. Then move it back to **Ready**.\n${marker("questions")}`,
+			);
 		case "merge": {
 			const { pr } = action;
 			log.info(`merging #${pr.number}, approved by ${action.by}`);

package/src/known-hashes.json

@@ -1,44 +1,46 @@
 {
-	".agents/skills/accessibility/SKILL.md": [
-		"bb8c5148899685168324b8fda3524937e3943b32"
-	],
 	".agents/skills/approach-designer/SKILL.md": [
-		"7fbf6e80562b59e94c8b9615d777afca8a769d29"
-	],
-	".agents/skills/code-review/SKILL.md": [
-		"a35bdecaeb1b6a2469a6330d2cef42a9d61409fe"
-	],
-	".agents/skills/frontend-design/LICENSE.txt": [
-		"f433b1a53f5b830a205fd2df78e2b34974656c7b"
-	],
-	".agents/skills/frontend-design/SKILL.md": [
-		"8ac4bf9b37f7b42ead4b65c35e0e9890fb5354e8"
+		"7fbf6e80562b59e94c8b9615d777afca8a769d29",
+		"d932ed30a58cb32dd91ec03ddd2b1c6c59f77714"
 	],
 	".agents/skills/issue-splitting/SKILL.md": [
 		"01625372d68a81347bf401e8603084420922d04e"
 	],
 	".agents/skills/kanbot-admin/SKILL.md": [
 		"3789c559be9fb6a78f82708ae9857395a5556f6b",
+		"47b16ee8a6c6847450589bbb954d5a08c154f52a",
 		"557532f241c0fc1e04f03ce8edb69efaa7b5165b",
+		"a7a7b2f55be7235ea17ffd092755af8493c8ef76",
+		"b09b9ccc5ca90585418a6645919c10d9a487bad9",
+		"c29ed25fa7f825e64b58c54ed2240823fb22ef6c",
 		"e427c711b532963c0916f07ecc6b11e9b47cb9fa"
 	],
 	".agents/skills/kanbot-guide/SKILL.md": [
+		"1251194ba34a8b6eae8508037b0a76c60d7a26b8",
+		"2c6c77a225c5b880eff023d4b3c1305bfc91bfb3",
+		"2ccb86b12e5af121b79ef9f53c2a35dbbdb2ddeb",
+		"a24c0a655d6485e65bd5dea2a71f3afe67f04404",
 		"cf3e95d137a5a58a273262bca6ba25fbc95fa037"
 	],
 	".agents/skills/kanbot-idea/SKILL.md": [
-		"8ab28cec8d3f30250ffe080106d0de8e3c2eaa8a"
+		"8ab28cec8d3f30250ffe080106d0de8e3c2eaa8a",
+		"9d47113a299a75514a00993060bf6afebb049c6c"
 	],
 	".agents/skills/plan-template/SKILL.md": [
 		"47a5dbbd2870883ca42dd9410d224ef9c0c9979f",
 		"79cfd0bf36110b5d6f452e6400161609b11df0d6",
-		"7bfde45995efaf515e45ccec09c204178203fdb7"
+		"7bfde45995efaf515e45ccec09c204178203fdb7",
+		"841446c304ffe9783c79f293e050a28ceb540b3d",
+		"e6b6e55a42bfc42d0c9ff1a5cdf3a0573ab665c0"
 	],
 	".agents/skills/pr-description/SKILL.md": [
 		"1db6eb751e0bb1ea0014a2b414e04f6af59b1b2d",
 		"6b0cca1be3abe8d031159c94e5d3b4f20307d600",
-		"7e477762c9c5f09ce6d5d51ccd9138ce9743baa8"
+		"7e477762c9c5f09ce6d5d51ccd9138ce9743baa8",
+		"830c94888620de0a5bb7030672c017c5fafa63e5"
 	],
 	".agents/skills/project-conventions/SKILL.md": [
+		"668d904ff8fdf33edbe9768cd6bf223813380c9d",
 		"81d9ff980a15a6f901010646b800b3e6e379e4b0",
 		"dabf1dadc148c020496d8f2f9bb8de6269f56479"
 	],
@@ -48,18 +50,18 @@
 	".agents/skills/project-memory/SKILL.md": [
 		"d354e11310db01362ec2bf5eec1080db77ac053d"
 	],
+	".agents/skills/review-findings/SKILL.md": [
+		"4ba188751544038ca5ab3fdeaf61f40455a3bcec"
+	],
 	".agents/skills/spec-review/SKILL.md": [
 		"03e44fe4f23b04f1b11c907936ee9f6c7c8131f0",
+		"84fbc57a8b8f4fe473258402772185944a54a81c",
 		"f455d1007d589602e5afce0dac4f00d78aa7c67a"
 	],
-	".agents/skills/tdd/SKILL.md": ["5e6b20868e02ae24f6d25824bac431143bd43021"],
 	".agents/skills/user-stories/SKILL.md": [
 		"1b37f8e59c15b934d555070a63d4f0d3939a007f",
-		"1b5d229d043c1bfbd84aecd9ee6191b1d473f1d8"
-	],
-	".agents/skills/verify-ui/SKILL.md": [
-		"c67a0e1d6a1c1d9adf59dd154160ccf58519ea72",
-		"f4d3d07c0ec28a9961d919356d0b4e572b724b43"
+		"1b5d229d043c1bfbd84aecd9ee6191b1d473f1d8",
+		"73455bec36bd5677cdf3c081677ad2856c434954"
 	],
 	".github/ISSUE_TEMPLATE/config.yml": [
 		"0086358db1eb971c0cfa8739c27518bbc18a5ff4"
@@ -71,12 +73,16 @@
 		"d26a148970ba6323d9cfdd86924cb2e82e68b705"
 	],
 	".github/pull_request_template.md": [
-		"57cfbc21472a94ccccb19ef6f19e87a473925649"
+		"57cfbc21472a94ccccb19ef6f19e87a473925649",
+		"b8060c2599769dd12477081b6ec51733a2a82c7b"
 	],
 	".github/workflows/ci.yml": ["dce7bcf80cef91c10923829eb5893d2b311b58e5"],
 	".github/workflows/kanbot-merged.yml": [
 		"8daaea63e23cf1e0d37821bfadaf60018a448de2"
 	],
+	".kanbot/agents/acceptance-reviewer.md": [
+		"e6b65950345c686b4d219026d8d2d185e9735c12"
+	],
 	".kanbot/agents/approach-designer.md": [
 		"7e5f8c16c4d4a4e261bccc5dc8b4fff2d3046a72"
 	],
@@ -86,52 +92,31 @@
 	],
 	".kanbot/agents/fixer.md": [
 		"109c8974fe2d70f5f514f33d97761740f589a6c4",
+		"16c16692f6d2ee29bc0e4d0ca4a1b3cfc4f1ba72",
 		"7c98cf1dc3e798e0e5856fd95a3d78d378884def",
 		"810871ec49fd7be56d111c7df176d22c66748a0f"
 	],
-	".kanbot/agents/implementer-backend.md": [
-		"5d454e29260ba8df0ef6e21f1ece9d02a472d4ed",
-		"6fefffb02bb5551631839abd0863379e58bc7dcc"
+	".kanbot/agents/implementer.md": ["f6000b529b1a8bed0def57af9bfa55c1ca5cd3b6"],
+	".kanbot/agents/plan-critic.md": [
+		"3d1c38922a94712d0f3a725902e3df9cee87bcda",
+		"cd6dd133f4611bd86fe27f8539a62a805e4df6c9"
 	],
-	".kanbot/agents/implementer-docs.md": [
-		"082da045a20bc914f29839e026027b6715c184a9",
-		"c5f01ac3d377133caab5b13422f1e73608d6357e"
-	],
-	".kanbot/agents/implementer-frontend.md": [
-		"0aa9b0e70c3057138b4255ee3d270ac04fc8ab0e",
-		"45a6e3b8f6e6f5a95dac865126c5649dab115fc5"
-	],
-	".kanbot/agents/implementer-technical.md": [
-		"c95dff48eed5db4aadf10d0a47e7ec1285937ebf",
-		"e4bbddb0a810313fb3a6ed3983b3b9335279feef"
-	],
-	".kanbot/agents/plan-critic.md": ["cd6dd133f4611bd86fe27f8539a62a805e4df6c9"],
 	".kanbot/agents/planner.md": [
 		"2283cf8bf6d27b8bbf721f97bb45cd40eaa6d39d",
-		"bdb111213cced70583157edad658247972dcbe45"
-	],
-	".kanbot/agents/reviewer-code.md": [
-		"398035214b63ceb3469a3b3384b07209e4cd63dd",
-		"61f3a45642ca954c6d4a5f41083f0a25f78d2b51"
-	],
-	".kanbot/agents/reviewer-spec.md": [
-		"11c86a654a0b715777b23bfb699a4f0d6cfe91de",
-		"ab8951ab296e96b01f419243d8acfc99c7e64b1c"
-	],
-	".kanbot/agents/test-writer.md": [
-		"dcef7f611a307229974fef4098d53816d7db0555",
-		"ec81c44c021053fae0612683a61e8414634359a0"
-	],
-	".kanbot/agents/ui-verifier.md": [
-		"38615159a8fe7b1e99cacedc49c0be53c69b90d4",
-		"a73abf7e72c654fde41df51b43a5879170978cb0"
+		"6500bea6691685d2b74ea73095f11643e0fcc937",
+		"a4a65d240ab4b23737f4d68d8765cca89cf08864",
+		"bdb111213cced70583157edad658247972dcbe45",
+		"dc50d048164ade2926b58dee48c3919c6b7d9558"
 	],
+	".kanbot/agents/reviewer.md": ["7ff1fdd21df4442d3b82784d3e6077195b32ba5b"],
 	"AGENTS.md": [
+		"0dd205961831f0082e74a3c03b79036e2114c072",
 		"3da9115cbf52b7b7d0feb8325503a8caf43ff2c7",
 		"b821013b5be7051327b349eda603218590a41f33",
 		"c688ed7f42f7a6f6a5ac600de857b42fb04aa613",
 		"cf7ef593ccfda953055dfb76b3e9c267fc9637f6",
-		"e5b76bcbaf155b79a8ff3f2e70977cc0c589566b"
+		"e5b76bcbaf155b79a8ff3f2e70977cc0c589566b",
+		"f820c2f5a9d3bc299eed35a6012bbc5d19615aef"
 	],
 	"CLAUDE.md": ["43c994c2d3617f947bcb5adf1933e21dabe46bb5"]
 }

package/src/providers/claude.ts

@@ -8,6 +8,7 @@ import {
 	CLAUDE_DENY,
 	claudeTools,
 } from "../agents/sync.ts";
+import { mcpConfigPath } from "./mcp.ts";
 import {
 	looksRateLimited,
 	type Provider,
@@ -25,45 +26,54 @@ type ResultEvent = {
 	api_error_status?: number | null;
 };
 
+/** CLI args for a headless run. */
+export function claudeArgs(input: RunInput, agentsFile: string): string[] {
+	const { agent } = input;
+	const cmd = [
+		"claude",
+		"-p",
+		"--agents",
+		agentsFile,
+		"--agent",
+		agent.name,
+		"--output-format",
+		"stream-json",
+		"--verbose",
+		"--json-schema",
+		JSON.stringify(input.schema),
+		"--permission-mode",
+		"acceptEdits",
+		"--allowedTools",
+		...headlessTools(agent),
+		"--disallowedTools",
+		...CLAUDE_DENY,
+		"--no-session-persistence",
+		// Isolate from the user's own setup: no user-level plugins, skills or
+		// MCP servers, so workers only see the repo's agents and skills.
+		"--setting-sources",
+		"project,local",
+		"--strict-mcp-config",
+		"--settings",
+		JSON.stringify(CLAUDE_ATTRIBUTION),
+	];
+	// The repo's committed MCP servers only.
+	const mcp = mcpConfigPath(input.cwd);
+	if (mcp) cmd.push("--mcp-config", mcp);
+	if (agent.models.claude) cmd.push("--model", agent.models.claude);
+	if (agent.effort) cmd.push("--effort", agent.effort);
+	return cmd;
+}
+
 /** Claude Code headless (`claude -p`), using the logged-in subscription. */
 export const claude: Provider = {
 	name: "claude",
 	async run(input: RunInput): Promise<RunResult> {
-		const { agent } = input;
 		// Pass agent definitions explicitly so runs don't depend on what is
 		// committed in the worktree's .claude/agents.
 		const tmp = await mkdtemp(join(tmpdir(), "kanbot-claude-"));
 		const agentsFile = join(tmp, "agents.json");
 		await Bun.write(agentsFile, JSON.stringify(claudeAgentsJson(input.agents)));
-		const cmd = [
-			"claude",
-			"-p",
-			"--agents",
-			agentsFile,
-			"--agent",
-			agent.name,
-			"--output-format",
-			"stream-json",
-			"--verbose",
-			"--json-schema",
-			JSON.stringify(input.schema),
-			"--permission-mode",
-			"acceptEdits",
-			"--allowedTools",
-			...headlessTools(agent),
-			"--disallowedTools",
-			...CLAUDE_DENY,
-			"--no-session-persistence",
-			// Isolate from the user's own setup: no user-level plugins, skills or
-			// MCP servers, so workers only see the repo's agents and skills.
-			"--setting-sources",
-			"project,local",
-			"--strict-mcp-config",
-			"--settings",
-			JSON.stringify(CLAUDE_ATTRIBUTION),
-		];
-		if (agent.models.claude) cmd.push("--model", agent.models.claude);
-		if (agent.effort) cmd.push("--effort", agent.effort);
+		const cmd = claudeArgs(input, agentsFile);
 
 		const res = await spawnWorker(cmd, {
 			cwd: input.cwd,

package/src/providers/codex.ts

@@ -1,8 +1,10 @@
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import type { AgentDef } from "../agents/load.ts";
 import { agentInstructions } from "../agents/sync.ts";
 import { git } from "../daemon/git.ts";
+import { codexMcpArgs, type McpServer, readMcpServers } from "./mcp.ts";
 import {
 	looksRateLimited,
 	type Provider,
@@ -11,6 +13,58 @@ import {
 	spawnWorker,
 } from "./types.ts";
 
+/** CLI args for a headless run. */
+export function codexArgs(o: {
+	agent: AgentDef;
+	cwd: string;
+	gitDir: string;
+	schemaFile: string;
+	lastFile: string;
+	networkAccess: boolean;
+	mcpServers: Record<string, McpServer>;
+}): string[] {
+	const { agent } = o;
+	const sandbox =
+		agent.tools.includes("edit") || agent.tools.includes("bash")
+			? "workspace-write"
+			: "read-only";
+	const cmd = [
+		"codex",
+		"exec",
+		"--json",
+		"--ephemeral",
+		// Isolate from the user's own setup: no user-level plugins or MCP
+		// servers. Auth still comes from CODEX_HOME.
+		"--ignore-user-config",
+		"--sandbox",
+		sandbox,
+		"--cd",
+		o.cwd,
+		"--add-dir",
+		o.gitDir,
+		"--output-schema",
+		o.schemaFile,
+		"--output-last-message",
+		o.lastFile,
+		"-c",
+		`developer_instructions=${JSON.stringify(agentInstructions(agent))}`,
+		// The repo's committed MCP servers only.
+		...codexMcpArgs(o.mcpServers),
+	];
+	if (o.networkAccess)
+		cmd.push("-c", "sandbox_workspace_write.network_access=true");
+	if (agent.models.codex && agent.models.codex !== "default")
+		cmd.push("--model", agent.models.codex);
+	if (agent.effort) {
+		cmd.push(
+			"-c",
+			`model_reasoning_effort="${agent.effort === "max" ? "xhigh" : agent.effort}"`,
+		);
+	}
+	cmd.push("-");
+	return cmd;
+}
+
 /** Codex CLI headless (`codex exec`), using the logged-in ChatGPT plan. */
 export function codex({ networkAccess }: { networkAccess: boolean }): Provider {
 	return {
@@ -29,39 +83,15 @@ export function codex({ networkAccess }: { networkAccess: boolean }): Provider {
 					"--path-format=absolute",
 					"--git-common-dir",
 				);
-				const sandbox =
-					agent.tools.includes("edit") || agent.tools.includes("bash")
-						? "workspace-write"
-						: "read-only";
-				const cmd = [
-					"codex",
-					"exec",
-					"--json",
-					"--ephemeral",
-					"--sandbox",
-					sandbox,
-					"--cd",
-					input.cwd,
-					"--add-dir",
+				const cmd = codexArgs({
+					agent,
+					cwd: input.cwd,
 					gitDir,
-					"--output-schema",
 					schemaFile,
-					"--output-last-message",
 					lastFile,
-					"-c",
-					`developer_instructions=${JSON.stringify(agentInstructions(agent))}`,
-				];
-				if (networkAccess)
-					cmd.push("-c", "sandbox_workspace_write.network_access=true");
-				if (agent.models.codex && agent.models.codex !== "default")
-					cmd.push("--model", agent.models.codex);
-				if (agent.effort) {
-					cmd.push(
-						"-c",
-						`model_reasoning_effort="${agent.effort === "max" ? "xhigh" : agent.effort}"`,
-					);
-				}
-				cmd.push("-");
+					networkAccess,
+					mcpServers: await readMcpServers(input.cwd),
+				});
 
 				const res = await spawnWorker(cmd, {
 					cwd: input.cwd,