github-router 0.3.153 → 0.3.162

package/dist/{peer-mcp-personas-DMM1akDa.js → peer-mcp-personas-Bfq3FPKc.js}

@@ -1,6 +1,6 @@
-import { t as PATHS } from "./paths-Bt7sqiVr.js";
-import { d as runCommandCapture, l as parseBoolEnv, n as isPidAlive, o as trackChild, p as runManagedExeCapture, r as registerColbertExitHandlers, t as getColbertInstanceUuid, u as resolveExecutable } from "./lifecycle-VTQI28wT.js";
-import { i as registerExitHandlers, n as getInstanceUuid, r as recordWorkerRepo, t as WorktreeRegistry } from "./lifecycle-C4k0pEvn.js";
+import { t as PATHS } from "./paths-CTlT1nTo.js";
+import { d as runCommandCapture, l as parseBoolEnv, n as isPidAlive, o as trackChild, p as runManagedExeCapture, r as registerColbertExitHandlers, t as getColbertInstanceUuid, u as resolveExecutable } from "./lifecycle-ChPBRt6K.js";
+import { i as registerExitHandlers, n as getInstanceUuid, r as recordWorkerRepo, t as WorktreeRegistry } from "./lifecycle-BUXxiltc.js";
 import { createRequire } from "node:module";
 import consola from "consola";
 import { createHash, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
@@ -12858,7 +12858,7 @@ function logAudit$1(record) {
 		try {
 			const fs$2 = await import("node:fs/promises");
 			const path$1 = await import("node:path");
-			const { PATHS: PATHS$1 } = await import("./paths-C9Nkr_NK.js");
+			const { PATHS: PATHS$1 } = await import("./paths-DN3O54iE.js");
 			const dir = path$1.join(PATHS$1.APP_DIR, "browser-mcp");
 			await fs$2.mkdir(dir, { recursive: true });
 			const line = JSON.stringify({
@@ -16818,7 +16818,7 @@ const runtimeBuffer = globalThis.Buffer;
 //#endregion
 //#region src/lib/worker-agent/budget.ts
 const DEFAULT_MAX_TURNS = 500;
-const DEFAULT_MAX_WALLCLOCK_MS = 30 * 6e4;
+const DEFAULT_MAX_WALLCLOCK_MS = 360 * 6e4;
 const DEFAULT_MAX_TOOL_BYTES = 16 * 1024 * 1024;
 const DEFAULT_MAX_TOOL_CALLS = 250;
 const DEFAULT_MAX_REPEATED_CALLS = 3;
@@ -16850,6 +16850,44 @@ function envInt(name) {
 	return n;
 }
 /**
+* Default MCP per-tool-call timeout the launcher injects as
+* `MCP_TIMEOUT` / `MCP_TOOL_TIMEOUT` (see `server-setup.ts`). 6h15m —
+* one `MCP_TIMEOUT_HEADROOM_MS` above the 6h worker wall-clock default so a
+* non-converging worker aborts gracefully (partial work + `[halted:
+* wallclock]`) a full headroom before the harness hard-kills the call.
+*/
+const DEFAULT_MCP_TOOL_TIMEOUT_MS = 225e5;
+/**
+* Teardown headroom between the worker wall-clock ceiling and the MCP
+* per-tool-call timeout — the graceful-abort + result-delivery budget. The
+* worker wall-clock (default AND any per-call override) is clamped to
+* `MCP_TOOL_TIMEOUT − MCP_TIMEOUT_HEADROOM_MS` so a worker is never silently
+* hard-killed by the harness.
+*/
+const MCP_TIMEOUT_HEADROOM_MS = 15 * 6e4;
+/**
+* The MCP per-tool-call timeout the proxy injects into the spawned CLI, in ms.
+* Positive-integer override via `GH_ROUTER_MCP_TOOL_TIMEOUT_MS`; falls back to
+* `DEFAULT_MCP_TOOL_TIMEOUT_MS` on unset/garbage input (same lenient parse as
+* the worker-budget env overrides). Single source of truth for both
+* `server-setup.ts` (which stringifies it into the child env) and the worker
+* MCP boundary (which clamps a per-call wall-clock under it).
+*/
+function resolveMcpToolTimeoutMs() {
+	return envInt("GH_ROUTER_MCP_TOOL_TIMEOUT_MS") ?? DEFAULT_MCP_TOOL_TIMEOUT_MS;
+}
+/**
+* The maximum wall-clock a single worker call may be granted: the MCP
+* tool-call timeout minus the teardown headroom. A per-call `maxWallClockMs`
+* override above this is clamped down to it (see `runWorkerToolCall`) so the
+* worker always aborts gracefully at least `MCP_TIMEOUT_HEADROOM_MS` before the
+* harness would hard-kill the MCP call. The 6h default equals this ceiling on
+* the default MCP timeout (22_500_000 − 900_000 === 21_600_000).
+*/
+function workerWallClockCeilingMs() {
+	return resolveMcpToolTimeoutMs() - MCP_TIMEOUT_HEADROOM_MS;
+}
+/**
 * Resolve a `BudgetConfig` from defaults + env overrides + caller-
 * supplied overrides. Caller overrides win; env wins over defaults.
 *
@@ -17330,6 +17368,148 @@ async function acquireWorkerSlot(signal) {
 	};
 }
 
+//#endregion
+//#region src/services/copilot/responses-request.ts
+/**
+* Copilot's `/responses` endpoint rejects a positive `max_output_tokens` below
+* 16 with an HTTP 400 (verified live on gpt-5.5 and gpt-5.3-codex):
+*   Invalid 'max_output_tokens': integer below minimum value. Expected a value
+*   >= 16, but got 1 instead.
+* Anthropic's `/v1/messages` allows any `max_tokens >= 1`, so a valid low
+* Anthropic request (`max_tokens` 1..15) would otherwise 400 on the Responses
+* path. Clamp a positive sub-16 value UP to this minimum; leave `undefined`
+* and normal (>= 16) values EXACTLY as-is so the worker hot path and all
+* normal requests stay byte-identical. The chat path has NO such minimum
+* (gemini / `/chat/completions` accepts small values, verified HTTP 200), so
+* this clamp lives only here, never in `chat-request.ts`.
+*/
+const RESPONSES_MIN_MAX_OUTPUT_TOKENS = 16;
+/** Build the `data:` URI (base64) or return the verbatim URL for an image part. */
+function imageUrlFor(part) {
+	if (typeof part.url === "string" && part.url.length > 0) return part.url;
+	return `data:${part.mimeType ?? "image/png"};base64,${part.data ?? ""}`;
+}
+/**
+* Map a document part to a Responses `input_file` item. A base64 document is
+* wrapped into a `data:<mime>;base64,<data>` `file_data` URI (the verified-working
+* Copilot shape — gpt-5.5 reads it); a URL document carries `file_url`. Returns
+* null when neither source is present (malformed) so it's dropped, not emitted
+* as an invalid item.
+*/
+function documentInputFile(part) {
+	const filename = part.filename ?? "document.pdf";
+	if (typeof part.data === "string" && part.data.length > 0) return {
+		type: "input_file",
+		filename,
+		file_data: `data:${part.mimeType ?? "application/pdf"};base64,${part.data}`
+	};
+	if (typeof part.url === "string" && part.url.length > 0) return {
+		type: "input_file",
+		filename,
+		file_url: part.url
+	};
+	return null;
+}
+function joinText(parts) {
+	let s = "";
+	for (const p of parts) if (p.type === "text") s += p.text;
+	return s;
+}
+function neutralUserToResponses(m) {
+	if (typeof m.content === "string") return [{
+		role: "user",
+		content: m.content
+	}];
+	if (!m.content.some((c) => c.type === "image" || c.type === "document")) return [{
+		role: "user",
+		content: joinText(m.content)
+	}];
+	const parts = [];
+	for (const c of m.content) if (c.type === "text") parts.push({
+		type: "input_text",
+		text: c.text
+	});
+	else if (c.type === "image") parts.push({
+		type: "input_image",
+		image_url: imageUrlFor(c)
+	});
+	else if (c.type === "document") {
+		const item = documentInputFile(c);
+		if (item) parts.push(item);
+	}
+	return [{
+		role: "user",
+		content: parts
+	}];
+}
+function neutralAssistantToResponses(m) {
+	const items = [];
+	let buffer = "";
+	const flush = () => {
+		if (buffer.length === 0) return;
+		items.push({
+			role: "assistant",
+			content: [{
+				type: "output_text",
+				text: buffer
+			}]
+		});
+		buffer = "";
+	};
+	for (const c of m.content) if (c.type === "text") buffer += c.text;
+	else if (c.type === "toolCall") {
+		flush();
+		items.push({
+			type: "function_call",
+			call_id: c.id,
+			name: c.name,
+			arguments: JSON.stringify(c.arguments ?? {})
+		});
+	}
+	flush();
+	return items;
+}
+/** Translate one neutral message into zero-or-more Responses input items. */
+function neutralMessageToResponsesInput(m) {
+	if (m.role === "user") return neutralUserToResponses(m);
+	if (m.role === "assistant") return neutralAssistantToResponses(m);
+	return [{
+		type: "function_call_output",
+		call_id: m.toolCallId,
+		output: m.output
+	}];
+}
+function neutralToolsToResponses(tools) {
+	if (!tools || tools.length === 0) return void 0;
+	return tools.map((t) => ({
+		type: "function",
+		name: t.name,
+		description: t.description,
+		parameters: t.parameters
+	}));
+}
+/** Assemble the full Responses payload from the neutral request shape. */
+function assembleResponsesPayload(opts) {
+	const input = [];
+	for (const m of opts.messages) for (const item of neutralMessageToResponsesInput(m)) input.push(item);
+	const payload = {
+		model: opts.model,
+		input,
+		stream: opts.stream
+	};
+	if (opts.instructions) payload.instructions = opts.instructions;
+	const tools = neutralToolsToResponses(opts.tools);
+	if (tools && tools.length > 0) {
+		payload.tools = tools;
+		payload.tool_choice = opts.toolChoice ?? "auto";
+	}
+	if (opts.reasoningEffort && opts.reasoningEffort !== "off") payload.reasoning = { effort: opts.reasoningEffort };
+	if (typeof opts.maxOutputTokens === "number" && opts.maxOutputTokens > 0) payload.max_output_tokens = Math.max(opts.maxOutputTokens, RESPONSES_MIN_MAX_OUTPUT_TOKENS);
+	if (opts.stopSequences && opts.stopSequences.length > 0) payload.stop = [...opts.stopSequences];
+	if (opts.parallelToolCalls === false) payload.parallel_tool_calls = false;
+	return payload;
+}
+
 //#endregion
 //#region src/lib/worker-agent/context-budget.ts
 /**
@@ -17943,86 +18123,68 @@ async function runResponsesStreamLoop(stream, context, opts, options) {
 	});
 }
 function buildResponsesPayload(context, resolved) {
-	const input = [];
-	for (const m of context.messages) for (const item of translateMessageToResponses(m)) input.push(item);
-	const payload = {
+	const messages = [];
+	for (const m of context.messages) {
+		const neutral = piMessageToNeutral(m);
+		if (neutral) messages.push(neutral);
+	}
+	return assembleResponsesPayload({
 		model: resolved.modelId,
-		input,
+		instructions: context.systemPrompt || void 0,
+		messages,
+		tools: piToolsToNeutral(context.tools),
+		reasoningEffort: resolved.thinking,
 		stream: true
-	};
-	if (context.systemPrompt) payload.instructions = context.systemPrompt;
-	const tools = translateToolsToResponses(context.tools);
-	if (tools && tools.length > 0) {
-		payload.tools = tools;
-		payload.tool_choice = "auto";
-	}
-	if (resolved.thinking !== "off") payload.reasoning = { effort: resolved.thinking };
-	return payload;
-}
-function translateMessageToResponses(m) {
-	if (m.role === "user") return translateUserToResponses(m);
-	if (m.role === "assistant") return translateAssistantToResponses(m);
-	if (m.role === "toolResult") return [{
-		type: "function_call_output",
-		call_id: m.toolCallId,
-		output: joinTextParts(m.content)
-	}];
-	return [];
-}
-function translateUserToResponses(m) {
-	if (typeof m.content === "string") return [{
-		role: "user",
-		content: m.content
-	}];
-	if (!m.content.some((c) => c.type === "image")) return [{
-		role: "user",
-		content: joinTextParts(m.content)
-	}];
-	const parts = [];
-	for (const c of m.content) if (c.type === "text") parts.push({
-		type: "input_text",
-		text: c.text
-	});
-	else if (c.type === "image") parts.push({
-		type: "input_image",
-		image_url: `data:${c.mimeType};base64,${c.data}`
 	});
-	return [{
-		role: "user",
-		content: parts
-	}];
 }
-function translateAssistantToResponses(m) {
-	const items = [];
-	let buffer = "";
-	const flush = () => {
-		if (buffer.length === 0) return;
-		items.push({
-			role: "assistant",
-			content: [{
-				type: "output_text",
-				text: buffer
-			}]
+function piMessageToNeutral(m) {
+	if (m.role === "user") {
+		if (typeof m.content === "string") return {
+			role: "user",
+			content: m.content
+		};
+		const parts = [];
+		for (const c of m.content) if (c.type === "text") parts.push({
+			type: "text",
+			text: c.text
 		});
-		buffer = "";
-	};
-	for (const c of m.content) if (c.type === "text") buffer += c.text;
-	else if (c.type === "toolCall") {
-		flush();
-		items.push({
-			type: "function_call",
-			call_id: c.id,
+		else if (c.type === "image") parts.push({
+			type: "image",
+			mimeType: c.mimeType,
+			data: c.data
+		});
+		return {
+			role: "user",
+			content: parts
+		};
+	}
+	if (m.role === "assistant") {
+		const parts = [];
+		for (const c of m.content) if (c.type === "text") parts.push({
+			type: "text",
+			text: c.text
+		});
+		else if (c.type === "toolCall") parts.push({
+			type: "toolCall",
+			id: c.id,
 			name: c.name,
-			arguments: JSON.stringify(c.arguments ?? {})
+			arguments: c.arguments
 		});
+		return {
+			role: "assistant",
+			content: parts
+		};
 	}
-	flush();
-	return items;
+	if (m.role === "toolResult") return {
+		role: "toolResult",
+		toolCallId: m.toolCallId,
+		output: joinTextParts(m.content)
+	};
+	return null;
 }
-function translateToolsToResponses(tools) {
+function piToolsToNeutral(tools) {
 	if (!tools || tools.length === 0) return void 0;
 	return tools.map((t) => ({
-		type: "function",
 		name: t.name,
 		description: t.description,
 		parameters: t.parameters
@@ -19301,6 +19463,15 @@ function standInToolEnabled() {
 	const hasGeminiPro = models.some((m) => /^gemini-3\..*pro/i.test(m.id));
 	return hasGpt55 && hasOpus && hasGeminiPro;
 }
+const IMPLEMENTER_SUBAGENT_MODEL = "gpt-5.5";
+/** Return the native implementer subagent model iff it is live with tool calls. */
+function implementerSubagentModel() {
+	const models = state.models?.data;
+	if (!models) return void 0;
+	const found = models.find((m) => m.id === IMPLEMENTER_SUBAGENT_MODEL);
+	if (!found) return void 0;
+	return found.capabilities?.supports?.tool_calls === true ? IMPLEMENTER_SUBAGENT_MODEL : void 0;
+}
 /**
 * Gate for the worker tools (`explore`, `review`, `implement`).
 *
@@ -23252,7 +23423,16 @@ async function createWorktree(workspaceAbs, opts) {
 			])).stdout;
 		} catch {}
 		const lineCount = stat$1.split(/\r?\n/).filter((l) => l.length > 0).length;
-		return `[diff truncated at 256KB; ${Math.max(0, lineCount - 1)} files changed]\n${stat$1}`;
+		const summary = `[diff truncated at 256KB; ${Math.max(0, lineCount - 1)} files changed]\n${stat$1}`;
+		let savedPath = null;
+		let saveError = null;
+		try {
+			savedPath = await saveOverflowPatch(dir);
+		} catch (err) {
+			saveError = err.message;
+		}
+		if (savedPath !== null) return `${summary}\nFull patch (git apply-able; includes binary blobs) saved to: ${savedPath}`;
+		return `${summary}\n[full patch save failed: ${saveError ?? "unknown"}; only the summary above is available]`;
 	};
 	return {
 		dir,
@@ -23261,6 +23441,43 @@ async function createWorktree(workspaceAbs, opts) {
 		remove
 	};
 }
+/**
+* Persist the FULL `git diff --binary --full-index HEAD` of `dir` to a
+* durable, router-owned file under `PATHS.WORKER_DIFFS_DIR` and return its
+* absolute path.
+*
+* Called by `finalize()` ONLY when the inline diff overflows
+* `DIFF_CAP_BYTES`: the worktree is removed immediately after finalize, so a
+* truncated inline diff would otherwise lose the actual patch forever. The
+* durable dir lives under the app dir — never inside the worktree (deleted)
+* nor the user's repo (don't pollute it).
+*
+* `--binary` keeps binary blobs recoverable (git base85-encodes them into
+* the patch) and `--full-index` writes exact 40-char object indexes, so the
+* saved patch reconstructs the change precisely under `git apply`. Uses the
+* same `execFileP` git mechanism the rest of `finalize()` uses (shell:false).
+*
+* Unique filename `<pid>-<8hex>.patch` — collision-free across concurrent
+* workers and repeated finalize calls.
+*/
+async function saveOverflowPatch(dir) {
+	const patch = await execFileP("git", [
+		"-C",
+		dir,
+		"diff",
+		"--binary",
+		"--full-index",
+		"HEAD"
+	], { maxBuffer: 256 * 1024 * 1024 });
+	await fs.mkdir(PATHS.WORKER_DIFFS_DIR, { recursive: true });
+	const name = `${process$1.pid}-${randomBytes(4).toString("hex")}.patch`;
+	const patchPath = nodePath.join(PATHS.WORKER_DIFFS_DIR, name);
+	await fs.writeFile(patchPath, patch.stdout, {
+		mode: 384,
+		flag: "wx"
+	});
+	return patchPath;
+}
 
 //#endregion
 //#region src/lib/worker-agent/engine.ts
@@ -23275,30 +23492,40 @@ async function createWorktree(workspaceAbs, opts) {
 */
 const WORKTREE_REGISTRY = new WorktreeRegistry();
 registerExitHandlers(WORKTREE_REGISTRY);
-/** Default model + thinking for the `explore` mode. `gpt-5.4-mini` at
-*  `xhigh` — fast, cheap, 400k-context, tool-call-capable, with tight
-*  function-calling-loop discipline.
-*
-*  HISTORY / CAVEAT: earlier iterations used `gemini-3.1-pro-preview` then
-*  `gemini-3.5-flash`; both flash defaults early-stopped with empty turns
-*  on the function-calling loop (read a file then end the turn with no
-*  summary), which the single no-output retry couldn't reliably recover.
-*  `gpt-5.4-mini` does not show that pathology and is the proven `browse`
-*  default. Routed through `/responses` by the stream-fn endpoint split.
-*
-*  Exported so the MCP handler + the gate (`workerToolsEnabled`) read the
-*  same constant — drift would ship a tool whose docs/gate disagree with
-*  its runtime default. Caller can override per call via the `model` arg. */
+/** Worker-availability GATE sentinel + final fallback. `gpt-5.4-mini` — cheap,
+*  broadly-available, tool-call-capable, 400k-context, with tight
+*  function-calling-loop discipline (earlier gemini-flash cheap defaults
+*  early-stopped with empty turns on the function-calling loop; gpt-5.4-mini
+*  does not). Exported and aliased as `WORKER_DEFAULT_MODEL`:
+*  `workerToolsEnabled()` gates the ENTIRE worker surface on this id being
+*  present with `tool_calls`. It is no longer `explore`'s default (see
+*  `EXPLORE_DEFAULT_MODEL`) — it stays the gate sentinel because it's the
+*  cheapest broadly-present tool-caller, and the fallback for any unmatched
+*  mode. */
 const DEFAULT_MODEL = "gpt-5.4-mini";
 const DEFAULT_THINKING = "xhigh";
-/** Default model + thinking for the READ-ONLY `review` mode. `gpt-5.5` at
-*  `xhigh` — the strongest reasoning tier, 1M+ context, so the reviewer
-*  has full headroom to verify correctness against the actual code. Same
-*  model as `implement`; like it, this is NOT a `workerToolsEnabled` gate
-*  input — if absent (e.g. a non-enterprise tier) `review` errors helpfully
-*  at call time rather than vanishing the whole worker surface. Caller can
-*  override per call via the `model` arg. */
-const REVIEW_DEFAULT_MODEL = "gpt-5.5";
+/** Default model for the READ-ONLY `explore` mode. `claude-sonnet-5` at `xhigh`
+*  (via `DEFAULT_THINKING`) — a strong, NATIVE (no-shim) tool-caller for repo
+*  research. Native Claude models run as workers over `/chat/completions`, the
+*  same path proven by `PLAN_DEFAULT_MODEL` (claude-opus-4.8). Like `implement`'s
+*  gpt-5.5 this is NOT a `workerToolsEnabled` gate input — if absent (e.g. a
+*  non-enterprise tier) `explore` errors helpfully at call time rather than
+*  vanishing the whole worker surface. The caller (the main model) overrides
+*  BOTH the model and the reasoning per call via the `model` / `thinking` args. */
+const EXPLORE_DEFAULT_MODEL = "claude-sonnet-5";
+/** Default model + thinking for the READ-ONLY `review` mode.
+*  `gemini-3.1-pro-preview` at `xhigh` (clamped to `high` at call time — gemini
+*  advertises no xhigh). DELIBERATELY DECORRELATED FROM THE IMPLEMENTER: bounded
+*  implementation now defaults to gpt-5.5 (OpenAI) — both the `implement` worker
+*  and the native `implementer` subagent — and the main orchestrator is Opus
+*  (Anthropic), so review runs on a THIRD lab (Google) to maximize blind-spot
+*  diversity. A reviewer sharing the implementer's lab catches a correlated slice
+*  of defects; a cross-lab reviewer is the point of the review step. Like
+*  `implement`, this is NOT a `workerToolsEnabled` gate input — if absent (e.g. a
+*  non-enterprise tier) `review` errors helpfully at call time rather than
+*  vanishing the whole worker surface. Caller can override per call via the
+*  `model` arg (e.g. `claude-opus-4.8` for an Anthropic-lab reviewer). */
+const REVIEW_DEFAULT_MODEL = "gemini-3.1-pro-preview";
 const REVIEW_DEFAULT_THINKING = "xhigh";
 /** Default model + thinking for the READ+WRITE `implement` mode. `gpt-5.5`
 *  at `xhigh` — the strongest reasoning tier in the catalog, 1M+ context,
@@ -23428,7 +23655,8 @@ async function runWorkerAgentOnce(opts) {
 		const isPlan = opts.mode === "plan";
 		const isReview = opts.mode === "review";
 		const isWriteCapable = opts.mode === "implement" || opts.mode === "test";
-		const defaultModel = isBrowse ? BROWSE_DEFAULT_MODEL : isPlan ? PLAN_DEFAULT_MODEL : isReview ? REVIEW_DEFAULT_MODEL : isWriteCapable ? IMPLEMENT_DEFAULT_MODEL : DEFAULT_MODEL;
+		const isExplore = opts.mode === "explore";
+		const defaultModel = isBrowse ? BROWSE_DEFAULT_MODEL : isPlan ? PLAN_DEFAULT_MODEL : isReview ? REVIEW_DEFAULT_MODEL : isWriteCapable ? IMPLEMENT_DEFAULT_MODEL : isExplore ? EXPLORE_DEFAULT_MODEL : DEFAULT_MODEL;
 		const defaultThinking = isBrowse ? BROWSE_DEFAULT_THINKING : isPlan ? PLAN_DEFAULT_THINKING : isReview ? REVIEW_DEFAULT_THINKING : isWriteCapable ? IMPLEMENT_DEFAULT_THINKING : DEFAULT_THINKING;
 		const resolved = resolveModelAndThinking({
 			model: opts.model ?? defaultModel,
@@ -23467,7 +23695,7 @@ async function runWorkerAgentOnce(opts) {
 			};
 		}
 		else ws = makeNoWorktreeHandle(workspaceAbs);
-		const budget = new Budget();
+		const budget = new Budget({ maxWallClockMs: opts.maxWallClockMs });
 		const agentHolder = {};
 		const planState = createPlanState();
 		const getMessages = () => agentHolder.agent?.state.messages ?? [];
@@ -23566,7 +23794,7 @@ async function runWorkerAgentOnce(opts) {
 			} catch {}
 			const text = isBrowse ? terminalText ?? finalText : diff ? `${finalText}\n\n${diff}` : finalText;
 			if (lastStopReason === "error") return {
-				text: (terminalText ?? finalText).trim() || "Worker run failed before producing an answer — the model's input likely overflowed (a large tool result), or the upstream errored. Retry with a narrower task: target a specific section / file / element rather than reading everything at once.",
+				text: [(terminalText ?? finalText).trim() || "Worker run failed before producing an answer — the model's input likely overflowed (a large tool result), or the upstream errored. Retry with a narrower task: target a specific section / file / element rather than reading everything at once.", diff].filter(Boolean).join("\n\n"),
 				isError: true
 			};
 			if (!text.trim()) return {
@@ -23576,9 +23804,11 @@ async function runWorkerAgentOnce(opts) {
 			return { text };
 		} catch (err) {
 			let diff = "";
-			if (err instanceof WorkerAbort) try {
+			try {
 				diff = await ws.finalize();
-			} catch {}
+			} catch (err$1) {
+				diff = `[diff capture failed: ${err$1.message}]`;
+			}
 			try {
 				await ws.remove();
 			} catch {}
@@ -26398,6 +26628,10 @@ const NON_PERSONA_MCP_TOOLS = Object.freeze([
 				workspace: {
 					type: "string",
 					description: "Optional absolute path to the workspace the worker operates in. Defaults to the proxy's launch cwd. Use this when the parent agent has multiple workspaces open and the worker must operate in a specific one. Must be absolute (relative paths rejected)."
+				},
+				maxWallClockMs: {
+					type: "integer",
+					description: "Optional per-call wall-clock budget in ms; default 6h (21600000). Clamped just under the MCP tool-call ceiling (the injected MCP tool-call timeout minus a 15-min teardown headroom) so the worker aborts gracefully with its partial work rather than being hard-killed; the effective value is reported in the result when a larger value is clamped down."
 				}
 			}
 		},
@@ -26446,6 +26680,10 @@ const NON_PERSONA_MCP_TOOLS = Object.freeze([
 				workspace: {
 					type: "string",
 					description: "Optional absolute path to the workspace the worker operates in. Defaults to the proxy's launch cwd. Use this when the parent agent has multiple workspaces open and the worker must operate in a specific one. Must be absolute (relative paths rejected). For worktree:true, must be inside a git repo."
+				},
+				maxWallClockMs: {
+					type: "integer",
+					description: "Optional per-call wall-clock budget in ms; default 6h (21600000). Clamped just under the MCP tool-call ceiling (the injected MCP tool-call timeout minus a 15-min teardown headroom) so the worker aborts gracefully with its partial work rather than being hard-killed; the effective value is reported in the result when a larger value is clamped down."
 				}
 			}
 		},
@@ -26490,6 +26728,10 @@ const NON_PERSONA_MCP_TOOLS = Object.freeze([
 				workspace: {
 					type: "string",
 					description: "Optional absolute path to the workspace the worker operates in. Defaults to the proxy's launch cwd. Use this when the parent agent has multiple workspaces open and the worker must operate in a specific one. Must be absolute (relative paths rejected)."
+				},
+				maxWallClockMs: {
+					type: "integer",
+					description: "Optional per-call wall-clock budget in ms; default 6h (21600000). Clamped just under the MCP tool-call ceiling (the injected MCP tool-call timeout minus a 15-min teardown headroom) so the worker aborts gracefully with its partial work rather than being hard-killed; the effective value is reported in the result when a larger value is clamped down."
 				}
 			}
 		},
@@ -26534,6 +26776,10 @@ const NON_PERSONA_MCP_TOOLS = Object.freeze([
 				workspace: {
 					type: "string",
 					description: "Optional absolute path to the workspace the worker operates in. Defaults to the proxy's launch cwd. Use this when the parent agent has multiple workspaces open and the worker must operate in a specific one. Must be absolute (relative paths rejected)."
+				},
+				maxWallClockMs: {
+					type: "integer",
+					description: "Optional per-call wall-clock budget in ms; default 6h (21600000). Clamped just under the MCP tool-call ceiling (the injected MCP tool-call timeout minus a 15-min teardown headroom) so the worker aborts gracefully with its partial work rather than being hard-killed; the effective value is reported in the result when a larger value is clamped down."
 				}
 			}
 		},
@@ -26582,6 +26828,10 @@ const NON_PERSONA_MCP_TOOLS = Object.freeze([
 				workspace: {
 					type: "string",
 					description: "Optional absolute path to the workspace the worker operates in. Defaults to the proxy's launch cwd. Use this when the parent agent has multiple workspaces open and the worker must operate in a specific one. Must be absolute (relative paths rejected). For worktree:true, must be inside a git repo."
+				},
+				maxWallClockMs: {
+					type: "integer",
+					description: "Optional per-call wall-clock budget in ms; default 6h (21600000). Clamped just under the MCP tool-call ceiling (the injected MCP tool-call timeout minus a 15-min teardown headroom) so the worker aborts gracefully with its partial work rather than being hard-killed; the effective value is reported in the result when a larger value is clamped down."
 				}
 			}
 		},
@@ -26986,6 +27236,23 @@ async function runWorkerToolCall(call) {
 		};
 		workspace = args.workspace;
 	}
+	let maxWallClockMs;
+	let clampNote = "";
+	if (args.maxWallClockMs !== void 0) {
+		const raw = args.maxWallClockMs;
+		if (typeof raw !== "number" || !Number.isInteger(raw) || raw <= 0) return {
+			content: [{
+				type: "text",
+				text: `worker_${mode}: arguments.maxWallClockMs must be a positive integer (milliseconds) when provided`
+			}],
+			isError: true
+		};
+		const ceiling = workerWallClockCeilingMs();
+		maxWallClockMs = Math.min(raw, ceiling);
+		if (raw > ceiling) clampNote = `[note: maxWallClockMs ${raw} exceeds the per-call ceiling; clamped to ${ceiling} ms (the MCP tool-call timeout ${resolveMcpToolTimeoutMs()} ms minus the ${MCP_TIMEOUT_HEADROOM_MS} ms teardown headroom) so the worker aborts gracefully rather than being hard-killed mid-run.]
+
+`;
+	}
 	const result = await runWorkerAgent({
 		mode,
 		prompt,
@@ -26993,12 +27260,13 @@ async function runWorkerToolCall(call) {
 		model,
 		thinking,
 		worktree,
+		maxWallClockMs,
 		signal
 	});
 	return {
 		content: [{
 			type: "text",
-			text: result.text
+			text: `${clampNote}${result.text}`
 		}],
 		isError: result.isError
 	};
@@ -27200,5 +27468,5 @@ async function runStandInToolCall(args, signal) {
 }
 
 //#endregion
-export { logStreamError as $, GITHUB_API_BASE_URL as $t, BROWSE_DEFAULT_MODEL as A, DEFAULT_PORT as At, toolbeltEnabled as B, tryRefreshAndRetry as Bt, repoFingerprint as C, shouldUseInsecureTls as Ct, trustRepo as D, DEFAULT_CLAUDE_MODEL_FALLBACKS as Dt, stopReviewStateDir as E, toolbeltPathOverride as Et, appendPlanReminder as F, getPackageVersion as Ft, searchWeb as G, isNullish as Gt, vscodeRipgrepPath as H, cacheModels as Ht, runWorkerAgent as I, withInstallLock as It, buildAdvisorStream as J, sleep as Jt, ADVISOR_INTERNAL_TOOL_NAME as K, resolveCodexModel as Kt, withNoOutputRetry as L, setupCopilotToken as Lt, IMPLEMENT_DEFAULT_MODEL as M, UPSTREAM_INACTIVITY_TIMEOUT_MS as Mt, PLAN_DEFAULT_MODEL as N, generateRandomPort as Nt, resolveSealedGate as O, DEFAULT_CODEX_MODEL as Ot, REVIEW_DEFAULT_MODEL as P, pickClaudeDefault as Pt, isControllerClosedError as Q, forwardError as Qt, availableToolCommands as R, setupGitHubAgentToken as Rt, isSubagentContext as S, extractZipMember as St, stopGateEnabledForRepo as T, collapsePathKeys as Tt, TOOLBELT_TOOLS$1 as U, cacheVSCodeVersion as Ut, toolbeltSkipSet as V, cacheCopilotVersion as Vt, assetFor as W, filterBetaHeader as Wt, isAdvisorRequested as X, fetchWithTransientRetry as Xt, injectAdvisorTool as Y, getModels as Yt, buildOpenAIErrorEvent as Z, HTTPError as Zt, stopReviewEnabled as _, parseJsonOrDiagnose as _t, buildPeerAwarenessSnippet as a, browseAgentEnabled as at, fileLastPromptStore as b, provisionAndIndexColbert as bt, buildSessionBindHookCommand as c, standInToolEnabled as ct, decideStopHook as d, createMessages as dt, copilotBaseUrl as en, readIteratorWithTimeout as et, fileBlockBudget as f, getTokenCount as ft, stopGateId as g, readResponseBodyCapped as gt, stopGateDisabled as h, MAX_RESPONSE_BODY_BYTES as ht, buildAgentPrompt as i, agentToolsEnabled as it, DEFAULT_MODEL as j, UPSTREAM_FETCH_TIMEOUT_MS as jt, liveExec as k, DEFAULT_CODEX_MODEL_FALLBACKS as kt, buildStopHookCommand as l, workerToolsEnabled as lt, launchBaselineKey as m, createChatCompletions as mt, MCP_GROUPS as n, githubHeaders as nn, handleMcpDelete as nt, personasFor as o, browserToolsEnabled as ot, injectStopHookIntoSettingsFile as p, createResponses as pt, ADVISOR_TOOL_INSTRUCTIONS as q, resolveModel as qt, assertMcpToolSurfaceConsistent as r, state as rn, handleMcpPost as rt, buildArtifactOpenHookCommand as s, fleetToolsEnabled as st, GROUP_META as t, copilotHeaders as tn, relayAnthropicStream as tt, captureLaunchBaseline as u, countTokens as ut, fileBaselineStore as v, provisionBrowserAssets as vt, repoRoot as w, ArtifactClient as wt, fileReviewDebounce as x, extractTarGzMember as xt, fileFindingsStore as y, hasSupportedBrowserInstalled as yt, buildToolbeltAwareness as z, setupGitHubToken as zt };
-//# sourceMappingURL=peer-mcp-personas-DMM1akDa.js.map
+export { buildOpenAIErrorEvent as $, resolveModel as $t, BROWSE_DEFAULT_MODEL as A, ArtifactClient as At, buildToolbeltAwareness as B, pickClaudeDefault as Bt, repoFingerprint as C, parseJsonOrDiagnose as Ct, trustRepo as D, extractTarGzMember as Dt, stopReviewStateDir as E, provisionAndIndexColbert as Et, REVIEW_DEFAULT_MODEL as F, DEFAULT_CODEX_MODEL_FALLBACKS as Ft, assetFor as G, setupGitHubToken as Gt, toolbeltSkipSet as H, withInstallLock as Ht, appendPlanReminder as I, DEFAULT_PORT as It, ADVISOR_TOOL_INSTRUCTIONS as J, cacheModels as Jt, searchWeb as K, tryRefreshAndRetry as Kt, runWorkerAgent as L, UPSTREAM_FETCH_TIMEOUT_MS as Lt, EXPLORE_DEFAULT_MODEL as M, toolbeltPathOverride as Mt, IMPLEMENT_DEFAULT_MODEL as N, DEFAULT_CLAUDE_MODEL_FALLBACKS as Nt, resolveSealedGate as O, extractZipMember as Ot, PLAN_DEFAULT_MODEL as P, DEFAULT_CODEX_MODEL as Pt, buildAnthropicErrorEvent as Q, resolveCodexModel as Qt, withNoOutputRetry as R, UPSTREAM_INACTIVITY_TIMEOUT_MS as Rt, isSubagentContext as S, readResponseBodyCapped as St, stopGateEnabledForRepo as T, hasSupportedBrowserInstalled as Tt, vscodeRipgrepPath as U, setupCopilotToken as Ut, toolbeltEnabled as V, getPackageVersion as Vt, TOOLBELT_TOOLS$1 as W, setupGitHubAgentToken as Wt, injectAdvisorTool as X, filterBetaHeader as Xt, buildAdvisorStream as Y, cacheVSCodeVersion as Yt, isAdvisorRequested as Z, isNullish as Zt, stopReviewEnabled as _, resolveMcpToolTimeoutMs as _t, buildPeerAwarenessSnippet as a, GITHUB_API_BASE_URL as an, handleMcpPost as at, fileLastPromptStore as b, createChatCompletions as bt, buildSessionBindHookCommand as c, githubHeaders as cn, browserToolsEnabled as ct, decideStopHook as d, standInToolEnabled as dt, sleep as en, isControllerClosedError as et, fileBlockBudget as f, workerToolsEnabled as ft, stopGateId as g, assembleResponsesPayload as gt, stopGateDisabled as h, getTokenCount as ht, buildAgentPrompt as i, forwardError as in, handleMcpDelete as it, DEFAULT_MODEL as j, collapsePathKeys as jt, liveExec as k, shouldUseInsecureTls as kt, buildStopHookCommand as l, state as ln, fleetToolsEnabled as lt, launchBaselineKey as m, createMessages as mt, MCP_GROUPS as n, fetchWithTransientRetry as nn, readIteratorWithTimeout as nt, personasFor as o, copilotBaseUrl as on, agentToolsEnabled as ot, injectStopHookIntoSettingsFile as p, countTokens as pt, ADVISOR_INTERNAL_TOOL_NAME as q, cacheCopilotVersion as qt, assertMcpToolSurfaceConsistent as r, HTTPError as rn, relayAnthropicStream as rt, buildArtifactOpenHookCommand as s, copilotHeaders as sn, browseAgentEnabled as st, GROUP_META as t, getModels as tn, logStreamError as tt, captureLaunchBaseline as u, implementerSubagentModel as ut, fileBaselineStore as v, pickEndpoint as vt, repoRoot as w, provisionBrowserAssets as wt, fileReviewDebounce as x, MAX_RESPONSE_BODY_BYTES as xt, fileFindingsStore as y, createResponses as yt, availableToolCommands as z, generateRandomPort as zt };
+//# sourceMappingURL=peer-mcp-personas-Bfq3FPKc.js.map