@visorcraft/idlehands 4.0.13 → 4.0.14

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Docs: https://docs.idlehands.ai
 
+## 4.0.14
+
+### Fixes
+
+- Anton preflight reliability: add multi-pass discovery with structured JSON extraction, repair-pass retries, and fallback plan persistence so discovery can recover when models return malformed output or claim success without writing the plan file.
+- Anton preflight redundancy: when discovery reports `incomplete` but no plan file exists, Anton now validates declared paths, attempts deterministic plan recovery, and only advances when a non-empty plan file is verified.
+
 ## 4.0.13
 
 ### Fixes

package/dist/{agent-via-gateway-C1akskt-.js → agent-via-gateway-B0077UOc.js}

@@ -4,7 +4,7 @@ import { t as formatCliCommand } from "./command-format-CPa5ksO_.js";
 import { r as listAgentIds } from "./agent-scope-mLXQGQde.js";
 import { s as normalizeAgentId } from "./session-key-B9ePuoPx.js";
 import { h as GATEWAY_CLIENT_NAMES, l as normalizeMessageChannel, m as GATEWAY_CLIENT_MODES } from "./message-channel-Qpj4ExtQ.js";
-import { D as resolveSessionKeyForRequest, E as agentCommand } from "./subagent-registry-CV8jrQca.js";
+import { D as resolveSessionKeyForRequest, E as agentCommand } from "./subagent-registry-DHwrN9Oj.js";
 import { a as randomIdempotencyKey, n as callGateway } from "./call-DuNslqj2.js";
 import { n as withProgress } from "./progress-B76RkFx7.js";
 

package/dist/{agent-via-gateway-C9xTFnnb.js → agent-via-gateway-BCActbIf.js}

@@ -11,14 +11,14 @@ import { t as formatCliCommand } from "./command-format-BAxx4PW5.js";
 import "./env-BpvqFD5n.js";
 import "./dock-QcCdS4qA.js";
 import "./tokens-Cg4XNE3H.js";
-import { H as callGateway, U as randomIdempotencyKey, a as agentCommand, o as resolveSessionKeyForRequest, v as withProgress } from "./pi-embedded-CNvCKXkm.js";
+import { H as callGateway, U as randomIdempotencyKey, a as agentCommand, o as resolveSessionKeyForRequest, v as withProgress } from "./pi-embedded-bwvtdswf.js";
 import "./plugins-D-_jp4FO.js";
 import "./accounts-BwrguHMw.js";
 import "./bindings-hT7SPhiA.js";
 import "./auth-store-D1JaYlig.js";
 import "./send-J10cQN4A.js";
 import "./send-DLZt92Da.js";
-import "./deliver-5FLCa6tB.js";
+import "./deliver-whAbSPLk.js";
 import "./diagnostic-jHCdo9Am.js";
 import "./diagnostic-session-state-Bx2Le86J.js";
 import "./accounts-BRVjft5i.js";
@@ -26,8 +26,8 @@ import "./send-Dd4xdAHf.js";
 import "./image-ops-BDG-MYYV.js";
 import "./pi-model-discovery-Dic-M5qw.js";
 import { d as GATEWAY_CLIENT_MODES, f as GATEWAY_CLIENT_NAMES, s as normalizeMessageChannel } from "./message-channel-DqqfOIdx.js";
-import "./pi-embedded-helpers-C2j0LfJC.js";
-import "./chrome-DEnkfZ9p.js";
+import "./pi-embedded-helpers-Ct2rwp-P.js";
+import "./chrome-Do5potHV.js";
 import "./ssrf-DappnhDp.js";
 import "./skills-nQcWk6Z6.js";
 import "./path-alias-guards-CGbCFqW8.js";
@@ -40,7 +40,7 @@ import "./accounts-CBoBCTgA.js";
 import "./paths-vOrMwCEQ.js";
 import "./tool-images-CpZSs-zE.js";
 import "./thinking-BFsWfunr.js";
-import "./image-C_aN5P6-.js";
+import "./image-BAsQlUqT.js";
 import "./manager-DYOflU5p.js";
 import "./gemini-auth-m2hi6OmF.js";
 import "./fetch-guard-BdCPmLBP.js";
@@ -54,7 +54,7 @@ import "./ir-BwkcXPZC.js";
 import "./render-Ddkk6wf8.js";
 import "./commands-registry-1-Rv2-IS.js";
 import "./skill-commands-CHpRgsOw.js";
-import "./runner-CZW_eyf2.js";
+import "./runner-Bv_BA3vd.js";
 import "./fetch-ChVgjTkv.js";
 import "./channel-activity-C3LJmSjf.js";
 import "./tables-CJKtUpY0.js";
@@ -64,7 +64,7 @@ import "./send-Cn2wvd3W.js";
 import "./resolve-route-BI3VjtwE.js";
 import "./proxy-CNZpb4NE.js";
 import "./replies-CqYEEgmA.js";
-import "./deps-CEc0DzO7.js";
+import "./deps-CIF1pkFi.js";
 
 //#region src/commands/agent-via-gateway.ts
 const NO_GATEWAY_TIMEOUT_MS = 2147e6;

package/dist/{agent-via-gateway-B7gDrTh2.js → agent-via-gateway-D-FbIr6E.js}

@@ -12,7 +12,7 @@ import "./boolean-CE7i9tBR.js";
 import "./env-B5G1qwGc.js";
 import "./dock-BgOmHcbh.js";
 import "./tokens-BRLyURxW.js";
-import { H as randomIdempotencyKey, V as callGateway, a as agentCommand, o as resolveSessionKeyForRequest, v as withProgress } from "./pi-embedded-B4tp4aBd.js";
+import { H as randomIdempotencyKey, V as callGateway, a as agentCommand, o as resolveSessionKeyForRequest, v as withProgress } from "./pi-embedded-ChimfAJ-.js";
 import "./plugins-CRB60mCJ.js";
 import "./accounts-Dk8mJIrQ.js";
 import "./bindings-D3b5Fmc9.js";
@@ -67,7 +67,7 @@ import "./send-D4bMycQu.js";
 import "./resolve-route-DuttYY7A.js";
 import "./proxy-CRB9oCP5.js";
 import "./replies-6_GxvQYe.js";
-import "./deps--Jd_1mvW.js";
+import "./deps-7AsluBQV.js";
 
 //#region src/commands/agent-via-gateway.ts
 const NO_GATEWAY_TIMEOUT_MS = 2147e6;

package/dist/{agent-via-gateway-Cq6YTkRw.js → agent-via-gateway-DFnFArbP.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
-import { Mt as resolveSessionKeyForRequest, jt as agentCommand } from "./reply-DuYN0-Pb.js";
+import { Mt as resolveSessionKeyForRequest, jt as agentCommand } from "./reply-Cmj0wbnT.js";
 import { r as listAgentIds } from "./agent-scope-RA0zXRpu.js";
 import { s as normalizeAgentId } from "./session-key-Cuihcz_O.js";
 import { It as loadConfig } from "./model-selection-0dGxYGp8.js";

package/dist/{agents-BEWuTIwE.js → agents-DBtNXoSW.js}

@@ -6,18 +6,18 @@ import { t as formatCliCommand } from "./command-format-CPa5ksO_.js";
 import { a as resolveAgentDir, b as DEFAULT_IDENTITY_FILENAME, d as resolveDefaultAgentId, n as listAgentEntries, u as resolveAgentWorkspaceDir } from "./agent-scope-mLXQGQde.js";
 import { m as DEFAULT_ACCOUNT_ID, s as normalizeAgentId, t as DEFAULT_AGENT_ID } from "./session-key-B9ePuoPx.js";
 import { n as listChannelPlugins, r as normalizeChannelId, t as getChannelPlugin } from "./plugins-CCrfZ49T.js";
-import { M as identityHasValues, P as parseIdentityMarkdown } from "./subagent-registry-CV8jrQca.js";
+import { M as identityHasValues, P as parseIdentityMarkdown } from "./subagent-registry-DHwrN9Oj.js";
 import { l as resolveSessionTranscriptsDirForAgent } from "./paths-CC17i2eK.js";
 import { a as ensureWorkspaceAndSessions, l as moveToTrash } from "./onboard-helpers-Dp6wXNs7.js";
 import { t as WizardCancelledError } from "./prompts-D3HHe1ZZ.js";
 import { t as createClackPrompter } from "./clack-prompter-Bo7vS5xP.js";
 import { t as resolveChannelDefaultAccountId } from "./helpers-CIyuenBU.js";
 import { a as parseBindingSpecs, i as describeBinding, n as applyAgentBindings, o as removeAgentBindings, r as buildChannelBindings, t as requireValidConfigSnapshot } from "./config-validation-BgKexeQb.js";
-import { a as pruneAgentConfig, i as loadAgentIdentity, n as buildAgentSummaries, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-s_1D920P.js";
-import { r as setupChannels } from "./onboard-channels-DAk60Ns1.js";
+import { a as pruneAgentConfig, i as loadAgentIdentity, n as buildAgentSummaries, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-C48CGAxv.js";
+import { r as setupChannels } from "./onboard-channels-CHLOUR52.js";
 import { n as logConfigUpdated } from "./logging-MF6Thoxk.js";
 import { n as promptAuthChoiceGrouped } from "./auth-choice-prompt-kycZqH8q.js";
-import { i as applyAuthChoice, r as warnIfModelConfigLooksOff } from "./auth-choice-CoDCd8IM.js";
+import { i as applyAuthChoice, r as warnIfModelConfigLooksOff } from "./auth-choice-B9F26cWG.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 

package/dist/{agents.config-s_1D920P.js → agents.config-C48CGAxv.js}

@@ -1,6 +1,6 @@
 import { a as resolveAgentDir, d as resolveDefaultAgentId, n as listAgentEntries, u as resolveAgentWorkspaceDir } from "./agent-scope-mLXQGQde.js";
 import { s as normalizeAgentId } from "./session-key-B9ePuoPx.js";
-import { M as identityHasValues, N as loadAgentIdentityFromWorkspace } from "./subagent-registry-CV8jrQca.js";
+import { M as identityHasValues, N as loadAgentIdentityFromWorkspace } from "./subagent-registry-DHwrN9Oj.js";
 
 //#region src/commands/agents.config.ts
 function findAgentEntryIndex(list, agentId) {

package/dist/{agents.config-cH3kcrKU.js → agents.config-a7WEBiP9.js}

@@ -1,4 +1,4 @@
-import { en as identityHasValues, tn as loadAgentIdentityFromWorkspace } from "./reply-DuYN0-Pb.js";
+import { en as identityHasValues, tn as loadAgentIdentityFromWorkspace } from "./reply-Cmj0wbnT.js";
 import { a as resolveAgentDir, d as resolveDefaultAgentId, n as listAgentEntries, u as resolveAgentWorkspaceDir } from "./agent-scope-RA0zXRpu.js";
 import { s as normalizeAgentId } from "./session-key-Cuihcz_O.js";
 

package/dist/{anton-bQ51g5Ec.js → anton-BiE961do.js}

@@ -222,18 +222,19 @@ async function loadAntonConfig() {
 	}
 }
 async function runAgentTask(args) {
-	const { agentCliCommand } = await import("./agent-via-gateway-Cq6YTkRw.js").then((n) => n.n);
+	const { agentCliCommand } = await import("./agent-via-gateway-DFnFArbP.js").then((n) => n.n);
 	const extraSystemPrompt = args.workspaceDir ? `Your working directory is: ${args.workspaceDir}\nAll file paths are relative to this directory. Use this as your cwd for all operations.` : void 0;
-	await agentCliCommand({
+	const result = await agentCliCommand({
 		message: args.message,
 		agent: args.agent,
 		to: args.to,
 		sessionId: args.sessionId,
 		timeout: args.timeout,
-		json: false,
+		json: true,
 		deliver: false,
 		extraSystemPrompt
 	}, args.runtime, args.deps);
+	return { text: (result && typeof result === "object" && "result" in result ? result.result?.payloads ?? [] : []).map((p) => typeof p?.text === "string" ? p.text.trim() : "").filter(Boolean).join("\n\n").trim() };
 }
 function makePlanFilePath(planDir, taskIndex) {
 	return path.join(planDir, `task-${taskIndex}-${Date.now()}.md`);
@@ -249,6 +250,63 @@ async function isPlanFileValid(filePath) {
 		return false;
 	}
 }
+function extractJsonObject(text) {
+	const trimmed = text.trim();
+	if (!trimmed) return null;
+	const tryParse = (candidate) => {
+		try {
+			const parsed = JSON.parse(candidate);
+			if (!parsed || typeof parsed !== "object") return null;
+			return parsed;
+		} catch {
+			return null;
+		}
+	};
+	const direct = tryParse(trimmed);
+	if (direct) return direct;
+	const fencedMatch = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/i);
+	if (fencedMatch?.[1]) {
+		const fenced = tryParse(fencedMatch[1].trim());
+		if (fenced) return fenced;
+	}
+	const first = trimmed.indexOf("{");
+	const last = trimmed.lastIndexOf("}");
+	if (first >= 0 && last > first) {
+		const sliced = tryParse(trimmed.slice(first, last + 1));
+		if (sliced) return sliced;
+	}
+	return null;
+}
+function extractPlanMarkdownFromText(text) {
+	const candidate = text.match(/```(?:markdown|md)?\s*([\s\S]*?)```/i)?.[1]?.trim() ?? text.trim();
+	if (candidate.length < 60) return;
+	return candidate;
+}
+function normalizeDiscoveryFilename(filename, expectedPlanFile) {
+	const trimmed = filename?.trim();
+	if (!trimmed) return expectedPlanFile;
+	return path.resolve(trimmed);
+}
+function buildDiscoveryRepairPrompt(task, taskFile, planFilePath) {
+	return `RETRY: your previous preflight response did not produce a valid plan file.
+
+You MUST complete these steps exactly:
+1) Write the implementation plan to: ${planFilePath}
+2) Verify the file exists and is non-empty
+3) Return ONLY strict JSON: {"status":"incomplete","filename":"${planFilePath}"}
+
+If task is already complete, return ONLY: {"status":"complete","filename":""}
+
+Do not include THOUGHT, markdown fences, or extra commentary.
+Task file: ${taskFile}
+Task: ${task}`;
+}
+async function tryPersistPlanFallback(params) {
+	const planText = (((typeof params.parsed?.planMarkdown === "string" ? params.parsed.planMarkdown : void 0) ?? (typeof params.parsed?.plan === "string" ? params.parsed.plan : void 0))?.trim() || extractPlanMarkdownFromText(params.rawText) || "").trim();
+	if (planText.length < 60) return false;
+	await fs.writeFile(params.planFile, `${planText}\n`, "utf8");
+	return await isPlanFileValid(params.planFile);
+}
 async function runDiscoveryPhase(args) {
 	const planFile = makePlanFilePath(args.planDir, args.taskNum);
 	await ensurePlanDir(args.planDir);
@@ -268,7 +326,7 @@ async function runDiscoveryPhase(args) {
 				task: `Discovery (attempt ${attempt + 1})`,
 				sessionId
 			});
-			await runAgentTask({
+			const firstPass = await runAgentTask({
 				message: buildDiscoveryPrompt(args.task.text, args.taskFile, planFile),
 				sessionId,
 				timeout: args.timeout,
@@ -278,23 +336,91 @@ async function runDiscoveryPhase(args) {
 				deps: args.deps,
 				workspaceDir: args.workspaceDir
 			});
-			if (await isPlanFileValid(planFile)) {
+			const firstParsed = extractJsonObject(firstPass.text);
+			if ((firstParsed?.status ?? "").toLowerCase() === "complete") return { status: "complete" };
+			const declaredPlanFile = normalizeDiscoveryFilename(firstParsed?.filename, planFile);
+			if (await isPlanFileValid(declaredPlanFile)) {
 				await args.notify({
 					phase: "discovery_complete",
 					index: args.taskNum,
 					total: args.total,
 					task: args.task.text,
-					planFile
+					planFile: declaredPlanFile
 				});
 				return {
 					status: "plan_ready",
-					planFile
+					planFile: declaredPlanFile
+				};
+			}
+			if ((firstParsed?.status ?? "").toLowerCase() === "incomplete" && await tryPersistPlanFallback({
+				planFile: declaredPlanFile,
+				parsed: firstParsed,
+				rawText: firstPass.text
+			})) {
+				await args.notify({
+					phase: "discovery_complete",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					planFile: declaredPlanFile
+				});
+				return {
+					status: "plan_ready",
+					planFile: declaredPlanFile
+				};
+			}
+			const repairSessionId = `anton-discovery-repair-${Date.now()}-${args.taskNum}-${attempt}`;
+			await args.notify({
+				phase: "task_agent_spawned",
+				index: args.taskNum,
+				total: args.total,
+				task: `Discovery repair (attempt ${attempt + 1})`,
+				sessionId: repairSessionId
+			});
+			const repairPass = await runAgentTask({
+				message: buildDiscoveryRepairPrompt(args.task.text, args.taskFile, declaredPlanFile),
+				sessionId: repairSessionId,
+				timeout: args.timeout,
+				agent: args.agent,
+				to: args.to,
+				runtime: args.runtime,
+				deps: args.deps,
+				workspaceDir: args.workspaceDir
+			});
+			const repairParsed = extractJsonObject(repairPass.text);
+			if ((repairParsed?.status ?? "").toLowerCase() === "complete") return { status: "complete" };
+			const repairPlanFile = normalizeDiscoveryFilename(repairParsed?.filename, declaredPlanFile);
+			if (await isPlanFileValid(repairPlanFile) || await tryPersistPlanFallback({
+				planFile: repairPlanFile,
+				parsed: repairParsed,
+				rawText: repairPass.text
+			})) {
+				await args.notify({
+					phase: "discovery_complete",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					planFile: repairPlanFile
+				});
+				return {
+					status: "plan_ready",
+					planFile: repairPlanFile
+				};
+			}
+			if (attempt === args.maxRetries) {
+				const reason = "Discovery did not produce a valid plan file after primary + repair passes";
+				await args.notify({
+					phase: "discovery_failed",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					error: reason
+				});
+				return {
+					status: "failed",
+					error: reason
 				};
 			}
-			if (attempt === args.maxRetries) return {
-				status: "failed",
-				error: "Discovery did not produce a valid plan file"
-			};
 		} catch (err) {
 			const errorMsg = err instanceof Error ? err.message : String(err);
 			if (attempt === args.maxRetries) {

package/dist/{anton-gFIz387q.js → anton-BzjiLD-a.js}

@@ -216,18 +216,19 @@ async function loadAntonConfig() {
 	}
 }
 async function runAgentTask(args) {
-	const { agentCliCommand } = await import("./agent-via-gateway-C9xTFnnb.js");
+	const { agentCliCommand } = await import("./agent-via-gateway-BCActbIf.js");
 	const extraSystemPrompt = args.workspaceDir ? `Your working directory is: ${args.workspaceDir}\nAll file paths are relative to this directory. Use this as your cwd for all operations.` : void 0;
-	await agentCliCommand({
+	const result = await agentCliCommand({
 		message: args.message,
 		agent: args.agent,
 		to: args.to,
 		sessionId: args.sessionId,
 		timeout: args.timeout,
-		json: false,
+		json: true,
 		deliver: false,
 		extraSystemPrompt
 	}, args.runtime, args.deps);
+	return { text: (result && typeof result === "object" && "result" in result ? result.result?.payloads ?? [] : []).map((p) => typeof p?.text === "string" ? p.text.trim() : "").filter(Boolean).join("\n\n").trim() };
 }
 function makePlanFilePath(planDir, taskIndex) {
 	return path.join(planDir, `task-${taskIndex}-${Date.now()}.md`);
@@ -243,6 +244,63 @@ async function isPlanFileValid(filePath) {
 		return false;
 	}
 }
+function extractJsonObject(text) {
+	const trimmed = text.trim();
+	if (!trimmed) return null;
+	const tryParse = (candidate) => {
+		try {
+			const parsed = JSON.parse(candidate);
+			if (!parsed || typeof parsed !== "object") return null;
+			return parsed;
+		} catch {
+			return null;
+		}
+	};
+	const direct = tryParse(trimmed);
+	if (direct) return direct;
+	const fencedMatch = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/i);
+	if (fencedMatch?.[1]) {
+		const fenced = tryParse(fencedMatch[1].trim());
+		if (fenced) return fenced;
+	}
+	const first = trimmed.indexOf("{");
+	const last = trimmed.lastIndexOf("}");
+	if (first >= 0 && last > first) {
+		const sliced = tryParse(trimmed.slice(first, last + 1));
+		if (sliced) return sliced;
+	}
+	return null;
+}
+function extractPlanMarkdownFromText(text) {
+	const candidate = text.match(/```(?:markdown|md)?\s*([\s\S]*?)```/i)?.[1]?.trim() ?? text.trim();
+	if (candidate.length < 60) return;
+	return candidate;
+}
+function normalizeDiscoveryFilename(filename, expectedPlanFile) {
+	const trimmed = filename?.trim();
+	if (!trimmed) return expectedPlanFile;
+	return path.resolve(trimmed);
+}
+function buildDiscoveryRepairPrompt(task, taskFile, planFilePath) {
+	return `RETRY: your previous preflight response did not produce a valid plan file.
+
+You MUST complete these steps exactly:
+1) Write the implementation plan to: ${planFilePath}
+2) Verify the file exists and is non-empty
+3) Return ONLY strict JSON: {"status":"incomplete","filename":"${planFilePath}"}
+
+If task is already complete, return ONLY: {"status":"complete","filename":""}
+
+Do not include THOUGHT, markdown fences, or extra commentary.
+Task file: ${taskFile}
+Task: ${task}`;
+}
+async function tryPersistPlanFallback(params) {
+	const planText = (((typeof params.parsed?.planMarkdown === "string" ? params.parsed.planMarkdown : void 0) ?? (typeof params.parsed?.plan === "string" ? params.parsed.plan : void 0))?.trim() || extractPlanMarkdownFromText(params.rawText) || "").trim();
+	if (planText.length < 60) return false;
+	await fs.writeFile(params.planFile, `${planText}\n`, "utf8");
+	return await isPlanFileValid(params.planFile);
+}
 async function runDiscoveryPhase(args) {
 	const planFile = makePlanFilePath(args.planDir, args.taskNum);
 	await ensurePlanDir(args.planDir);
@@ -262,7 +320,7 @@ async function runDiscoveryPhase(args) {
 				task: `Discovery (attempt ${attempt + 1})`,
 				sessionId
 			});
-			await runAgentTask({
+			const firstPass = await runAgentTask({
 				message: buildDiscoveryPrompt(args.task.text, args.taskFile, planFile),
 				sessionId,
 				timeout: args.timeout,
@@ -272,23 +330,91 @@ async function runDiscoveryPhase(args) {
 				deps: args.deps,
 				workspaceDir: args.workspaceDir
 			});
-			if (await isPlanFileValid(planFile)) {
+			const firstParsed = extractJsonObject(firstPass.text);
+			if ((firstParsed?.status ?? "").toLowerCase() === "complete") return { status: "complete" };
+			const declaredPlanFile = normalizeDiscoveryFilename(firstParsed?.filename, planFile);
+			if (await isPlanFileValid(declaredPlanFile)) {
 				await args.notify({
 					phase: "discovery_complete",
 					index: args.taskNum,
 					total: args.total,
 					task: args.task.text,
-					planFile
+					planFile: declaredPlanFile
 				});
 				return {
 					status: "plan_ready",
-					planFile
+					planFile: declaredPlanFile
+				};
+			}
+			if ((firstParsed?.status ?? "").toLowerCase() === "incomplete" && await tryPersistPlanFallback({
+				planFile: declaredPlanFile,
+				parsed: firstParsed,
+				rawText: firstPass.text
+			})) {
+				await args.notify({
+					phase: "discovery_complete",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					planFile: declaredPlanFile
+				});
+				return {
+					status: "plan_ready",
+					planFile: declaredPlanFile
+				};
+			}
+			const repairSessionId = `anton-discovery-repair-${Date.now()}-${args.taskNum}-${attempt}`;
+			await args.notify({
+				phase: "task_agent_spawned",
+				index: args.taskNum,
+				total: args.total,
+				task: `Discovery repair (attempt ${attempt + 1})`,
+				sessionId: repairSessionId
+			});
+			const repairPass = await runAgentTask({
+				message: buildDiscoveryRepairPrompt(args.task.text, args.taskFile, declaredPlanFile),
+				sessionId: repairSessionId,
+				timeout: args.timeout,
+				agent: args.agent,
+				to: args.to,
+				runtime: args.runtime,
+				deps: args.deps,
+				workspaceDir: args.workspaceDir
+			});
+			const repairParsed = extractJsonObject(repairPass.text);
+			if ((repairParsed?.status ?? "").toLowerCase() === "complete") return { status: "complete" };
+			const repairPlanFile = normalizeDiscoveryFilename(repairParsed?.filename, declaredPlanFile);
+			if (await isPlanFileValid(repairPlanFile) || await tryPersistPlanFallback({
+				planFile: repairPlanFile,
+				parsed: repairParsed,
+				rawText: repairPass.text
+			})) {
+				await args.notify({
+					phase: "discovery_complete",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					planFile: repairPlanFile
+				});
+				return {
+					status: "plan_ready",
+					planFile: repairPlanFile
+				};
+			}
+			if (attempt === args.maxRetries) {
+				const reason = "Discovery did not produce a valid plan file after primary + repair passes";
+				await args.notify({
+					phase: "discovery_failed",
+					index: args.taskNum,
+					total: args.total,
+					task: args.task.text,
+					error: reason
+				});
+				return {
+					status: "failed",
+					error: reason
 				};
 			}
-			if (attempt === args.maxRetries) return {
-				status: "failed",
-				error: "Discovery did not produce a valid plan file"
-			};
 		} catch (err) {
 			const errorMsg = err instanceof Error ? err.message : String(err);
 			if (attempt === args.maxRetries) {