github-router 0.3.269 → 0.3.271

package/dist/{peer-mcp-personas-DSbBlgFt.js → peer-mcp-personas-CN8xaXcV.js}

@@ -1,11 +1,11 @@
 import { t as getPackageVersion } from "./version-_Q1WpsQp.js";
 import { t as PATHS } from "./paths-Bg1_DWhi.js";
-import { C as copilotHeaders, E as githubAgentHeaders, O as state, S as copilotBaseUrl, T as githubAgentGraphQLHeaders, _ as withTransientRetry, b as GITHUB_API_BASE_URL, d as resolveModel, f as sleep$2, g as fetchWithTransientRetry, h as isAllowedCopilotHost, i as tryRefreshAndRetry, v as HTTPError, w as copilotVersion, x as GITHUB_GRAPHQL_URL } from "./token-C_q95GF7.js";
+import { A as state, C as GITHUB_GRAPHQL_URL, D as githubAgentGraphQLHeaders, E as copilotVersion, O as githubAgentHeaders, S as GITHUB_API_BASE_URL, T as copilotHeaders, b as sanitizeTransportText, d as resolveModel, f as sleep$2, g as HTTPError, h as isAllowedCopilotHost, i as tryRefreshAndRetry, v as classifyTransportError, w as copilotBaseUrl, x as withTransientRetry, y as fetchWithTransientRetry } from "./token-iaSGp76k.js";
 import { a as resolveExecutable, c as runManagedExeCapture, i as parseIntEnv, l as spawnTaskkillBestEffort, r as parseBoolEnv } from "./exec-y8C_MU8A.js";
 import { i as registerExitHandlers$1, n as getInstanceUuid, r as recordWorkerRepo, t as WorktreeRegistry } from "./lifecycle-0XrazT05.js";
 import { t as MCP_WORKSPACE_HEADER } from "./mcp-workspace-header-CGJbNeHb.js";
 import { n as ArtifactError, r as applyInsecureTls, t as ArtifactClient } from "./client-CQMfroGV.js";
-import { n as isPidAlive, r as registerColbertExitHandlers, s as trackChild, t as getColbertInstanceUuid } from "./lifecycle-AgNOtFRv.js";
+import { n as isPidAlive$1, r as registerColbertExitHandlers, s as trackChild, t as getColbertInstanceUuid } from "./lifecycle-AgNOtFRv.js";
 import { h as runGateChecks, m as sealedGateIds, p as resolveSealedGate } from "./stop-gate-hook-BqpumJtl.js";
 import { t as liveExec } from "./orchestration-B_Q3ncXI.js";
 import { createRequire } from "node:module";
@@ -4966,19 +4966,19 @@ function resolveTierModel(tier) {
 }
 //#endregion
 //#region src/lib/first-mate/classifier.ts
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function firstMessageContent$1(value) {
-	if (!isRecord$1(value) || !Array.isArray(value.choices)) return null;
+	if (!isRecord$2(value) || !Array.isArray(value.choices)) return null;
 	const first = value.choices[0];
-	if (!isRecord$1(first) || !isRecord$1(first.message)) return null;
+	if (!isRecord$2(first) || !isRecord$2(first.message)) return null;
 	return typeof first.message.content === "string" ? first.message.content : null;
 }
 function parseJsonObject(value) {
 	try {
 		const parsed = JSON.parse(value);
-		return isRecord$1(parsed) ? parsed : null;
+		return isRecord$2(parsed) ? parsed : null;
 	} catch {
 		return null;
 	}
@@ -5048,7 +5048,7 @@ async function classifyPlanReady(logExcerpt) {
 		schemaHint: "{\"planReady\":boolean,\"planExcerpt\":\"<=1200 chars from the completed plan, or empty\",\"confidence\":number}",
 		maxTokens: 500,
 		validate(value) {
-			if (!isRecord$1(value)) return null;
+			if (!isRecord$2(value)) return null;
 			const planReady = booleanValue$1(value.planReady);
 			const planExcerpt = stringValue$1(value.planExcerpt);
 			if (planReady === null || planExcerpt === null) return null;
@@ -5065,7 +5065,7 @@ async function classifyQuestionAnswerable(question, acceptanceCriteria) {
 		user: `Acceptance criteria:\n${acceptanceCriteria}\n\nAgent question:\n${question}`,
 		schemaHint: "{\"answerable\":boolean,\"answer\":\"present only when answerable\",\"confidence\":number}",
 		validate(value) {
-			if (!isRecord$1(value)) return null;
+			if (!isRecord$2(value)) return null;
 			const answerable = booleanValue$1(value.answerable);
 			if (answerable === null) return null;
 			const answer = stringValue$1(value.answer);
@@ -5083,7 +5083,7 @@ async function classifyFixAddressed(failureSummary, latestLogExcerpt) {
 		user: `Failure summary:\n${failureSummary}\n\nLatest log excerpt:\n${latestLogExcerpt}`,
 		schemaHint: "{\"addressed\":boolean,\"confidence\":number}",
 		validate(value) {
-			if (!isRecord$1(value)) return null;
+			if (!isRecord$2(value)) return null;
 			const addressed = booleanValue$1(value.addressed);
 			return addressed === null ? null : { addressed };
 		}
@@ -5095,7 +5095,7 @@ async function classifyStuck(logExcerpt) {
 		user: `Log excerpt:\n${logExcerpt}`,
 		schemaHint: "{\"stuck\":boolean,\"confidence\":number}",
 		validate(value) {
-			if (!isRecord$1(value)) return null;
+			if (!isRecord$2(value)) return null;
 			const stuck = booleanValue$1(value.stuck);
 			return stuck === null ? null : { stuck };
 		}
@@ -9975,6 +9975,40 @@ const WIN_RENAME_TRANSIENT = /* @__PURE__ */ new Set([
 	"EBUSY"
 ]);
 /**
+* Owner pid embedded in a `.draining.<pid>.<rand>` or `.claim.<pid>.<rand>`
+* segment. A file can carry both (a claimed orphan keeps the drain segment), so
+* the LAST match is the current owner.
+*/
+const OWNER_SEGMENT_RE = /\.(?:draining|claim)\.(\d+)\./g;
+/**
+* Claims held by a live drainer in THIS process, across instances. Per-instance
+* `inflight` cannot see a peer instance's claim, and both share our pid, so pid
+* liveness cannot separate them either. A claim abandoned on a read error is
+* never added here, which is what keeps it replayable (R3 #4).
+*/
+const heldClaims = /* @__PURE__ */ new Set();
+function ownerPidOf(name) {
+	let pid;
+	for (const match of name.matchAll(OWNER_SEGMENT_RE)) pid = Number(match[1]);
+	return pid !== void 0 && Number.isInteger(pid) && pid > 0 ? pid : void 0;
+}
+/**
+* `process.kill(pid, 0)` probes existence without signalling; `EPERM` means the
+* process exists but is owned by another user (still alive). Mirrors the copies
+* in `lib/paths.ts`, `lib/colbert/lifecycle.ts`, and `lib/worker-agent/
+* lifecycle.ts` — kept local so first-mate takes no dependency on those modules.
+*/
+function isPidAlive(pid) {
+	if (!Number.isInteger(pid) || pid <= 0) return false;
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (err) {
+		if (err.code === "EPERM") return true;
+		return false;
+	}
+}
+/**
 * Atomically claim `from` by renaming it to the process-unique `to`.
 * Returns `true` if THIS caller won the claim, `false` if a peer already took it
 * (source gone). Retries transient Windows sharing violations so two concurrent
@@ -10070,6 +10104,9 @@ var AnswerInbox = class {
 			if (!name.startsWith(`${base}.draining.`)) continue;
 			const orphan = path.join(dir, name);
 			if (this.inflight.has(orphan)) continue;
+			if (heldClaims.has(orphan)) continue;
+			const owner = ownerPidOf(name);
+			if (owner !== void 0 && owner !== process.pid && isPidAlive(owner)) continue;
 			const claim = `${orphan}.claim.${process.pid}.${randomBytes(4).toString("hex")}`;
 			if (!await claimByRename(orphan, claim)) continue;
 			try {
@@ -10086,11 +10123,15 @@ var AnswerInbox = class {
 		} catch (err) {
 			if (err.code !== "ENOENT") consola.warn(`first-mate: deferring unreadable inbox claim ${target} for retry:`, err);
 		}
-		for (const p of claimed) this.inflight.add(p);
+		for (const p of claimed) {
+			this.inflight.add(p);
+			heldClaims.add(p);
+		}
 		const ack = async () => {
 			for (const p of claimed) {
 				await fs$1.unlink(p).catch(() => {});
 				this.inflight.delete(p);
+				heldClaims.delete(p);
 			}
 		};
 		return {
@@ -11499,7 +11540,7 @@ function parsePackageJson(text) {
 	if (text === void 0) return void 0;
 	try {
 		const parsed = JSON.parse(text);
-		if (!isRecord(parsed)) return void 0;
+		if (!isRecord$1(parsed)) return void 0;
 		return {
 			scripts: stringRecord(parsed.scripts),
 			dependencies: stringRecord(parsed.dependencies),
@@ -11699,11 +11740,11 @@ function buildScaffoldPrBody(reports) {
 		"No factory protocol files are seeded; orchestration remains external to the repository."
 	].join("\n");
 }
-function isRecord(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringRecord(value) {
-	if (!isRecord(value)) return {};
+	if (!isRecord$1(value)) return {};
 	const result = {};
 	for (const [key, entry] of Object.entries(value)) if (typeof entry === "string") result[key] = entry;
 	return result;
@@ -15779,7 +15820,7 @@ async function freshnessVerdict(workspace) {
 	};
 	if (meta.status === "building") {
 		const pid = typeof meta.buildPid === "number" ? meta.buildPid : 0;
-		if (isInitInFlight(workspace) || pid > 0 && isPidAlive(pid)) return {
+		if (isInitInFlight(workspace) || pid > 0 && isPidAlive$1(pid)) return {
 			verdict: "building",
 			meta
 		};
@@ -27263,10 +27304,8 @@ function relayAnthropicStream(body, opts) {
 					safeClose(controller);
 					return;
 				}
-				const errName = error instanceof Error ? error.name : "Error";
-				const errMessage = error instanceof Error ? error.message : String(error);
-				consola.error(`Upstream stream interrupted at ${opts.routePath}: bytes=${bytesRelayed} errType=${errName} message=${JSON.stringify(errMessage)}`);
-				const event = buildAnthropicErrorEvent(errName, errMessage);
+				const { errName, errMessage, transport } = logStreamError(opts.routePath, error, bytesRelayed);
+				const event = buildAnthropicErrorEvent(errName, errMessage, transport);
 				try {
 					controller.enqueue(ENCODER$1.encode(event));
 				} catch (enqueueError) {
@@ -27331,12 +27370,13 @@ async function readIteratorWithTimeout(iterator, timeoutMs) {
 *   event: error
 *   data: {"type":"error","error":{"type":"...","message":"..."}}
 */
-function buildAnthropicErrorEvent(errName, errMessage) {
+function buildAnthropicErrorEvent(errName, errMessage, transportDetails) {
+	const details = transportDetails ?? classifyNamedStreamError(errName, errMessage);
 	const payload = {
 		type: "error",
 		error: {
-			type: classifyStreamError(errName),
-			message: `Upstream stream interrupted: ${errName}: ${errMessage}`
+			type: classifyStreamError(details),
+			message: formatStreamErrorMessage(details)
 		}
 	};
 	return `event: error\ndata: ${JSON.stringify(payload)}\n\n`;
@@ -27346,25 +27386,194 @@ function buildAnthropicErrorEvent(errName, errMessage) {
 * followed by the `data: [DONE]` terminator that OpenAI clients expect.
 */
 function buildOpenAIErrorEvent(errName, errMessage) {
+	const details = classifyNamedStreamError(errName, errMessage);
 	const payload = { error: {
-		type: classifyStreamError(errName),
-		message: `Upstream stream interrupted: ${errName}: ${errMessage}`
+		type: classifyStreamError(details),
+		message: formatStreamErrorMessage(details)
 	} };
 	return `data: ${JSON.stringify(payload)}\n\ndata: [DONE]\n\n`;
 }
-function classifyStreamError(errName) {
-	if (errName === "AbortError") return "timeout_error";
-	if (errName === "InactivityTimeout") return "timeout_error";
+function classifyNamedStreamError(errName, errMessage) {
+	const error = Object.assign(new Error(errMessage), { name: errName });
+	return classifyTransportError(error);
+}
+function classifyStreamError(details) {
+	if (details.name === "AbortError" || details.name === "InactivityTimeout" || details.name === "TimeoutError" || details.name === "timeout_error") return "timeout_error";
+	if (details.classification === "transient") return "overloaded_error";
 	return "api_error";
 }
-function logStreamError(routePath, error) {
-	const errName = error instanceof Error ? error.name : "Error";
-	const errMessage = error instanceof Error ? error.message : String(error);
-	consola.error(`Upstream stream interrupted at ${routePath}: errType=${errName} message=${JSON.stringify(errMessage)}`);
+function formatStreamErrorMessage(details) {
+	const code = details.causeCode ?? details.code;
+	const suffix = code ? ` (${sanitizeTransportText(code)})` : "";
+	const diagnostic = `${sanitizeTransportText(details.name)}: ${sanitizeTransportText(details.message)}${suffix}`;
+	if (details.classification === "transient") return `Upstream stream interrupted by a transient transport failure; retry the request. ${diagnostic}`;
+	if (details.classification === "deterministic") return `Upstream stream interrupted by a connectivity or TLS configuration failure. ${diagnostic}`;
+	return `Upstream stream interrupted: ${diagnostic}`;
+}
+function logStreamError(routePath, error, bytesRelayed) {
+	const transport = classifyTransportError(error);
+	const errName = transport.name;
+	const errMessage = transport.message;
+	const byteField = bytesRelayed === void 0 ? "" : ` bytes=${Math.max(0, bytesRelayed)}`;
+	const codeField = transport.code ? ` code=${JSON.stringify(transport.code)}` : "";
+	const causeCodeField = transport.causeCode ? ` causeCode=${JSON.stringify(transport.causeCode)}` : "";
+	consola.error("Upstream stream interrupted", `routePath=${JSON.stringify(routePath)}${byteField} classification=${transport.classification} errType=${errName}${codeField}${causeCodeField} message=${JSON.stringify(errMessage)}`);
 	return {
 		errName,
-		errMessage
+		errMessage,
+		transport
+	};
+}
+//#endregion
+//#region src/lib/thinking-history-repair.ts
+const THINKING_INTEGRITY_ERROR_RES = [/messages\.(\d+)\.content\.\d+:\s*`thinking` or `redacted_thinking` blocks in the latest assistant message cannot be modified/, /messages\.(\d+)\.content\.\d+:\s*Invalid `signature` in `thinking` block/];
+const MAX_REMEMBERED_REPAIRS = 1e3;
+const OMITTED_THINKING_PLACEHOLDER = "[prior reasoning omitted]";
+const repairSalt = randomBytes(32);
+const rememberedRepairs = /* @__PURE__ */ new Set();
+function declined(reason, detail = {}) {
+	return {
+		ok: false,
+		decline: {
+			reason,
+			...detail
+		}
+	};
+}
+/** Render a decline as a single log-safe `key=value` line. */
+function formatThinkingRepairDecline(decline) {
+	return Object.entries(decline).filter(([, value]) => value !== void 0).map(([key, value]) => `${key}=${String(value)}`).join(" ");
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
+}
+/** Count signed blocks without hashing — used only to explain a decline. */
+function countSignedBlocks(content) {
+	return content.filter((block) => isRecord(block) && (block.type === "thinking" || block.type === "redacted_thinking")).length;
+}
+function signedBlockFingerprint(_messageIndex, content) {
+	const hash = createHash("sha256");
+	hash.update(repairSalt);
+	let signedBlocks = 0;
+	for (let index = 0; index < content.length; index++) {
+		const block = content[index];
+		if (!isRecord(block)) continue;
+		if (block.type !== "thinking" && block.type !== "redacted_thinking") continue;
+		signedBlocks++;
+		hash.update(String(index));
+		hash.update(String(block.type));
+		if (typeof block.signature === "string") hash.update(block.signature);
+		if (typeof block.data === "string") hash.update(block.data);
+	}
+	return signedBlocks > 0 ? hash.digest("hex") : void 0;
+}
+function repairMessageAt(parsed, messageIndex) {
+	if (!Array.isArray(parsed.messages)) return declined("no-messages-array", { messageIndex });
+	const messages = [...parsed.messages];
+	const detail = {
+		messageIndex,
+		messageCount: messages.length
+	};
+	const message = messages[messageIndex];
+	if (!isRecord(message)) return declined("message-missing", detail);
+	if (message.role !== "assistant") return declined("message-not-assistant", {
+		...detail,
+		roleAtIndex: typeof message.role === "string" ? message.role : "unknown"
+	});
+	if (!Array.isArray(message.content)) return declined("content-not-array", {
+		...detail,
+		roleAtIndex: "assistant"
+	});
+	const shape = {
+		...detail,
+		roleAtIndex: "assistant",
+		blocksAtIndex: message.content.length,
+		signedBlocksAtIndex: countSignedBlocks(message.content)
+	};
+	const fingerprint = signedBlockFingerprint(messageIndex, message.content);
+	if (!fingerprint) return declined("no-signed-blocks", shape);
+	const repairedContent = message.content.filter((block) => !isRecord(block) || block.type !== "thinking" && block.type !== "redacted_thinking");
+	const removedBlocks = message.content.length - repairedContent.length;
+	if (removedBlocks === 0) return declined("no-blocks-removed", shape);
+	if (repairedContent.length === 0) repairedContent.push({
+		type: "text",
+		text: OMITTED_THINKING_PLACEHOLDER
+	});
+	messages[messageIndex] = {
+		...message,
+		content: repairedContent
 	};
+	parsed.messages = messages;
+	return {
+		ok: true,
+		repair: {
+			body: JSON.stringify(parsed),
+			fingerprint,
+			messageIndex,
+			removedBlocks
+		}
+	};
+}
+/**
+* Build a one-shot repair only for Copilot's known signed-thinking integrity
+* rejections. The upstream error is the oracle: valid omitted-display thinking
+* also has an empty `thinking` string, so request shape alone cannot identify a
+* corrupt signature safely.
+*
+* Returns a discriminated outcome so a caller can report WHY a repair was not
+* applied; a silent decline is what made the original incident undiagnosable.
+*/
+function repairRejectedThinkingHistory(rawBody, upstreamErrorText) {
+	const match = THINKING_INTEGRITY_ERROR_RES.map((pattern) => pattern.exec(upstreamErrorText)).find((candidate) => candidate !== null);
+	if (!match) return declined("error-not-recognized");
+	const messageIndex = Number(match[1]);
+	if (!Number.isSafeInteger(messageIndex) || messageIndex < 0) return declined("message-index-invalid", { messageIndex });
+	let parsed;
+	try {
+		parsed = JSON.parse(rawBody);
+	} catch {
+		return declined("body-not-json", { messageIndex });
+	}
+	return repairMessageAt(parsed, messageIndex);
+}
+/**
+* Reapply a repair already proven successful in this process. Only salted
+* digests are retained; no message, thinking, signature, or tool content is
+* stored.
+*/
+function repairKnownThinkingHistory(rawBody) {
+	if (rememberedRepairs.size === 0) return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(rawBody);
+	} catch {
+		return;
+	}
+	if (!Array.isArray(parsed.messages)) return void 0;
+	let repaired;
+	let totalRemovedBlocks = 0;
+	for (let index = parsed.messages.length - 1; index >= 0; index--) {
+		const message = parsed.messages[index];
+		if (!isRecord(message) || !Array.isArray(message.content)) continue;
+		const fingerprint = signedBlockFingerprint(index, message.content);
+		if (!fingerprint || !rememberedRepairs.has(fingerprint)) continue;
+		const attempt = repairMessageAt(parsed, index);
+		if (!attempt.ok) continue;
+		totalRemovedBlocks += attempt.repair.removedBlocks;
+		repaired = {
+			...attempt.repair,
+			removedBlocks: totalRemovedBlocks
+		};
+	}
+	return repaired;
+}
+function rememberThinkingHistoryRepair(fingerprint) {
+	if (rememberedRepairs.has(fingerprint)) return;
+	if (rememberedRepairs.size >= MAX_REMEMBERED_REPAIRS) {
+		const oldest = rememberedRepairs.values().next().value;
+		if (typeof oldest === "string") rememberedRepairs.delete(oldest);
+	}
+	rememberedRepairs.add(fingerprint);
 }
 //#endregion
 //#region src/services/advisor/advisor.ts
@@ -27715,10 +27924,11 @@ async function runAdvisor(conversation, advisorModel, advisorEffort, signal) {
 * against edge cases that would otherwise emit a malformed block —
 * spec violation in either direction is a 400.
 */
-function toClientServerToolUseId(id, fallbackIndex) {
-	const suffix = id.startsWith("toolu_") ? id.slice(6) : id;
-	if (/^[a-zA-Z0-9_]+$/.test(suffix)) return `srvtoolu_${suffix}`;
-	return `srvtoolu_advisor_${fallbackIndex}`;
+function toClientServerToolUseId(id, _fallbackIndex) {
+	if (!id.startsWith("toolu_")) throw new Error("advisor tool_use id is not round-trippable");
+	const suffix = id.slice(6);
+	if (!/^[a-zA-Z0-9_]+$/.test(suffix)) throw new Error("advisor tool_use id is not round-trippable");
+	return `srvtoolu_${suffix}`;
 }
 /**
 * Build an SSE event line in the canonical Anthropic shape:
@@ -27754,6 +27964,7 @@ function buildAdvisorStream(opts) {
 			let messageStartForwarded = false;
 			let nextSyntheticIndex = 0;
 			let turnsRun;
+			let pendingMessageDelta = null;
 			const safeEnqueue = (bytes) => {
 				try {
 					controller.enqueue(bytes);
@@ -27767,9 +27978,42 @@ function buildAdvisorStream(opts) {
 				}
 			};
 			const safeEnqueueEvent = (type, data) => safeEnqueue(ENCODER.encode(sseEvent(type, data)));
+			const captureMessageDelta = (payload) => {
+				const delta = payload.delta && typeof payload.delta === "object" ? payload.delta : {};
+				const usage = payload.usage && typeof payload.usage === "object" ? payload.usage : {};
+				if (!pendingMessageDelta) pendingMessageDelta = {
+					stopReason: delta.stop_reason ?? null,
+					stopSequence: delta.stop_sequence ?? null,
+					usage: {}
+				};
+				else {
+					if (delta.stop_reason !== void 0) pendingMessageDelta.stopReason = delta.stop_reason;
+					if (delta.stop_sequence !== void 0) pendingMessageDelta.stopSequence = delta.stop_sequence;
+				}
+				for (const [key, value] of Object.entries(usage)) if (typeof value === "number" && Number.isFinite(value)) pendingMessageDelta.usage[key] = (pendingMessageDelta.usage[key] ?? 0) + value;
+			};
+			const emitTerminal = (forcedStopReason) => {
+				if (pendingMessageDelta || forcedStopReason) {
+					const terminal = pendingMessageDelta ?? {
+						stopReason: null,
+						stopSequence: null,
+						usage: {}
+					};
+					if (!safeEnqueueEvent("message_delta", {
+						type: "message_delta",
+						delta: {
+							stop_reason: forcedStopReason ?? terminal.stopReason,
+							stop_sequence: terminal.stopSequence
+						},
+						usage: terminal.usage
+					})) return false;
+				}
+				return safeEnqueueEvent("message_stop", { type: "message_stop" });
+			};
 			async function processOneTurn(response) {
 				const capturedBlocks = [];
-				let advisorToolUse = null;
+				const advisorToolUses = [];
+				let clientToolUseCount = 0;
 				const indexToBlock = /* @__PURE__ */ new Map();
 				for await (const ev of events(response)) {
 					if (!ev.event || !ev.data) continue;
@@ -27779,7 +28023,8 @@ function buildAdvisorStream(opts) {
 					} catch {
 						if (!safeEnqueue(ENCODER.encode(`event: ${ev.event}\ndata: ${ev.data}\n\n`))) return {
 							capturedBlocks,
-							advisorToolUse
+							advisorToolUses,
+							clientToolUseCount
 						};
 						continue;
 					}
@@ -27788,7 +28033,8 @@ function buildAdvisorStream(opts) {
 							if (!messageStartForwarded) {
 								if (!safeEnqueueEvent(ev.event, payload)) return {
 									capturedBlocks,
-									advisorToolUse
+									advisorToolUses,
+									clientToolUseCount
 								};
 								messageStartForwarded = true;
 							}
@@ -27800,12 +28046,13 @@ function buildAdvisorStream(opts) {
 								const myIndex = nextSyntheticIndex++;
 								if (block.type === "tool_use" && block.name === "__anthropic_advisor") {
 									const id = typeof block.id === "string" ? block.id : `toolu_advisor_${myIndex}`;
-									advisorToolUse = {
+									const advisorToolUse = {
 										index: myIndex,
 										id,
 										clientId: toClientServerToolUseId(id, myIndex),
 										inputJson: ""
 									};
+									advisorToolUses.push(advisorToolUse);
 									const translated = {
 										...payload,
 										index: myIndex,
@@ -27818,7 +28065,8 @@ function buildAdvisorStream(opts) {
 									};
 									if (!safeEnqueueEvent(ev.event, translated)) return {
 										capturedBlocks,
-										advisorToolUse
+										advisorToolUses,
+										clientToolUseCount
 									};
 									const captured = {
 										block: {
@@ -27833,13 +28081,15 @@ function buildAdvisorStream(opts) {
 									capturedBlocks.push(captured);
 									indexToBlock.set(upstreamIndex, captured);
 								} else {
+									if (block.type === "tool_use") clientToolUseCount++;
 									const reindexed = {
 										...payload,
 										index: myIndex
 									};
 									if (!safeEnqueueEvent(ev.event, reindexed)) return {
 										capturedBlocks,
-										advisorToolUse
+										advisorToolUses,
+										clientToolUseCount
 									};
 									const captured = {
 										block: { ...block },
@@ -27862,7 +28112,8 @@ function buildAdvisorStream(opts) {
 								};
 								if (!safeEnqueueEvent(ev.event, reindexed)) return {
 									capturedBlocks,
-									advisorToolUse
+									advisorToolUses,
+									clientToolUseCount
 								};
 								if (captured && delta) {
 									if (delta.type === "text_delta" && typeof delta.text === "string") captured.block.text = (captured.block.text ?? "") + delta.text;
@@ -27876,7 +28127,8 @@ function buildAdvisorStream(opts) {
 								}
 							} else if (!safeEnqueueEvent(ev.event, payload)) return {
 								capturedBlocks,
-								advisorToolUse
+								advisorToolUses,
+								clientToolUseCount
 							};
 							continue;
 						}
@@ -27889,7 +28141,8 @@ function buildAdvisorStream(opts) {
 							};
 							if (!safeEnqueueEvent(ev.event, reindexed)) return {
 								capturedBlocks,
-								advisorToolUse
+								advisorToolUses,
+								clientToolUseCount
 							};
 							if (captured) {
 								if (captured.block.type === "tool_use" && captured.partialJson.length > 0) try {
@@ -27898,38 +28151,28 @@ function buildAdvisorStream(opts) {
 									consola.warn(`advisor: malformed input_json_delta for tool_use id=${captured.block.id ?? "?"} name=${captured.block.name ?? "?"} partialJson.length=${captured.partialJson.length} parseError=${err instanceof Error ? err.message : String(err)}`);
 									captured.block.input = {};
 								}
-								if (captured.block.type === "text" && (typeof captured.block.text !== "string" || captured.block.text.length === 0)) captured.dropFromReplay = true;
 							}
 							continue;
 						}
 						case "message_delta":
-							if (!safeEnqueueEvent(ev.event, payload)) return {
-								capturedBlocks,
-								advisorToolUse
-							};
+							captureMessageDelta(payload);
 							continue;
-						case "message_stop":
-							if (advisorToolUse) return {
-								capturedBlocks,
-								advisorToolUse
-							};
-							if (!safeEnqueueEvent(ev.event, payload)) return {
-								capturedBlocks,
-								advisorToolUse
-							};
-							return {
-								capturedBlocks,
-								advisorToolUse
-							};
+						case "message_stop": return {
+							capturedBlocks,
+							advisorToolUses,
+							clientToolUseCount
+						};
 						default: if (!safeEnqueueEvent(ev.event, payload)) return {
 							capturedBlocks,
-							advisorToolUse
+							advisorToolUses,
+							clientToolUseCount
 						};
 					}
 				}
 				return {
 					capturedBlocks,
-					advisorToolUse
+					advisorToolUses,
+					clientToolUseCount
 				};
 			}
 			try {
@@ -27937,13 +28180,16 @@ function buildAdvisorStream(opts) {
 				for (turnsRun = 0; turnsRun < 16; turnsRun++) {
 					if (aborter.signal.aborted) return;
 					if (conversation === null) return;
-					const { capturedBlocks, advisorToolUse } = await processOneTurn(response);
-					if (!advisorToolUse) return;
+					const { capturedBlocks, advisorToolUses, clientToolUseCount } = await processOneTurn(response);
+					if (advisorToolUses.length === 0) {
+						emitTerminal();
+						return;
+					}
 					if (aborter.signal.aborted) return;
 					if (conversation === null) return;
 					const assistantTurn = {
 						role: "assistant",
-						content: capturedBlocks.filter((c) => !c.dropFromReplay).map((c) => {
+						content: capturedBlocks.map((c) => {
 							if (c.advisorReplay) {
 								const input = typeof c.block.input === "object" && c.block.input !== null ? c.block.input : {};
 								return {
@@ -27957,48 +28203,78 @@ function buildAdvisorStream(opts) {
 						})
 					};
 					conversation.push(assistantTurn);
-					let advisorText;
-					try {
-						advisorText = await runAdvisor(conversation, advisorModel, advisorEffort, aborter.signal);
-					} catch (err) {
-						if (aborter.signal.aborted) return;
-						const msg = err instanceof Error ? err.message : String(err);
-						consola.warn(`Advisor model call failed: ${msg}`);
-						advisorText = `[Advisor unavailable: ${msg}. Continuing without external review — proceed with caution and consider self-checking against your primary-source evidence.]`;
-					}
+					const advisorConversation = conversation;
+					const advisorTexts = await Promise.all(advisorToolUses.map(async () => {
+						try {
+							return await runAdvisor(advisorConversation, advisorModel, advisorEffort, aborter.signal);
+						} catch (err) {
+							if (aborter.signal.aborted) throw err;
+							const msg = err instanceof Error ? err.message : String(err);
+							consola.warn(`Advisor model call failed: ${msg}`);
+							return `[Advisor unavailable: ${msg}. Continuing without external review — proceed with caution and consider self-checking against your primary-source evidence.]`;
+						}
+					})).catch((err) => {
+						if (aborter.signal.aborted) return null;
+						throw err;
+					});
+					if (!advisorTexts) return;
 					if (aborter.signal.aborted) return;
 					if (conversation === null) return;
-					const resultIndex = nextSyntheticIndex++;
-					if (!safeEnqueueEvent("content_block_start", {
-						type: "content_block_start",
-						index: resultIndex,
-						content_block: {
-							type: "advisor_tool_result",
-							tool_use_id: advisorToolUse.clientId,
-							content: {
-								type: "advisor_result",
-								text: advisorText
+					for (let index = 0; index < advisorToolUses.length; index++) {
+						const advisorToolUse = advisorToolUses[index];
+						const advisorText = advisorTexts[index];
+						const resultIndex = nextSyntheticIndex++;
+						if (!safeEnqueueEvent("content_block_start", {
+							type: "content_block_start",
+							index: resultIndex,
+							content_block: {
+								type: "advisor_tool_result",
+								tool_use_id: advisorToolUse.clientId,
+								content: {
+									type: "advisor_result",
+									text: advisorText
+								}
 							}
-						}
-					})) return;
-					if (!safeEnqueueEvent("content_block_stop", {
-						type: "content_block_stop",
-						index: resultIndex
-					})) return;
+						})) return;
+						if (!safeEnqueueEvent("content_block_stop", {
+							type: "content_block_stop",
+							index: resultIndex
+						})) return;
+					}
+					if (clientToolUseCount > 0) {
+						emitTerminal("tool_use");
+						return;
+					}
 					conversation.push({
 						role: "user",
-						content: [{
+						content: advisorToolUses.map((advisorToolUse, index) => ({
 							type: "tool_result",
 							tool_use_id: advisorToolUse.id,
-							content: advisorText
-						}]
+							content: advisorTexts[index]
+						}))
 					});
 					if (aborter.signal.aborted) return;
-					response = await createMessages(JSON.stringify({
+					let continuationSend = JSON.stringify({
 						...opts.baseBody,
 						messages: conversation,
 						stream: true
-					}), opts.requestHeaders, aborter.signal, true);
+					});
+					const knownRepair = repairKnownThinkingHistory(continuationSend);
+					if (knownRepair) continuationSend = knownRepair.body;
+					try {
+						response = await createMessages(continuationSend, opts.requestHeaders, aborter.signal, true);
+					} catch (continuationError) {
+						if (!(continuationError instanceof HTTPError)) throw continuationError;
+						const errorBody = await continuationError.response.clone().text().catch(() => "");
+						const outcome = repairRejectedThinkingHistory(continuationSend, errorBody);
+						if (!outcome.ok) {
+							consola.warn(`Advisor continuation thinking-history repair declined: ${formatThinkingRepairDecline(outcome.decline)}`);
+							throw continuationError;
+						}
+						consola.warn(`Advisor continuation: retrying without rejected thinking blocks: message=${outcome.repair.messageIndex} removed_blocks=${outcome.repair.removedBlocks}`);
+						response = await createMessages(outcome.repair.body, opts.requestHeaders, aborter.signal, true);
+						rememberThinkingHistoryRepair(outcome.repair.fingerprint);
+					}
 				}
 				if (aborter.signal.aborted) return;
 				const finalIndex = nextSyntheticIndex++;
@@ -28022,7 +28298,7 @@ function buildAdvisorStream(opts) {
 					type: "content_block_stop",
 					index: finalIndex
 				});
-				safeEnqueueEvent("message_stop", { type: "message_stop" });
+				emitTerminal("end_turn");
 			} catch (err) {
 				if (aborter.signal.aborted) return;
 				const msg = err instanceof Error ? err.message : String(err);
@@ -34217,6 +34493,6 @@ function enumerateInjectedMcpToolNames(groupKeys, opts = {}) {
 	return [...new Set(names)];
 }
 //#endregion
-export { reviewerModel as $, searchWeb as A, DEFAULT_CODEX_MODEL_FALLBACKS as At, readIteratorWithTimeout as B, buildToolbeltAwareness as C, CONDENSED_OPERATING_SEQUENCE as Ct, TOOLBELT_TOOLS$1 as D, toolbeltPathOverride as Dt, vscodeRipgrepPath as E, collapsePathKeys as Et, isAdvisorRequested as F, pickClaudeDefault as Ft, artifactToolsEnabled as G, handleMcpDelete as H, buildAnthropicErrorEvent as I, withOneMSuffix as It, browserCompoundToolsEnabled as J, brainstormModel as K, buildOpenAIErrorEvent as L, withInstallLock as Lt, ADVISOR_TOOL_INSTRUCTIONS as M, UPSTREAM_FETCH_TIMEOUT_MS as Mt, buildAdvisorStream as N, UPSTREAM_INACTIVITY_TIMEOUT_MS as Nt, assetFor as O, DEFAULT_CLAUDE_MODEL_FALLBACKS as Ot, injectAdvisorTool as P, generateRandomPort as Pt, nativeSubagentModel as Q, isControllerClosedError as R, availableToolCommands as S, warmTreeSitterPool as St, toolbeltSkipSet as T, shouldUseInsecureTls as Tt, handleMcpPost as U, relayAnthropicStream as V, agentToolsEnabled as W, fleetToolsEnabled as X, browserToolsEnabled as Y, geminiAvailable as Z, appendPlanReminder as _, hasSupportedBrowserInstalled as _t, buildPeerAwarenessSnippet as a, countTokens as at, runWorkerAgent as b, extractTarGzMember as bt, personasFor as c, assembleResponsesPayload as ct, EXPLORE_DEFAULT_MODEL as d, createResponses as dt, scoutModel as et, EXPLORE_DEFAULT_THINKING as f, createChatCompletions as ft, TEST_DEFAULT_MODEL as g, provisionBrowserAssets as gt, REVIEW_DEFAULT_MODEL as h, parseJsonOrDiagnose as ht, buildAgentPrompt as i, shimDefaultsToXhigh as it, ADVISOR_INTERNAL_TOOL_NAME as j, DEFAULT_PORT as jt, satisfiesMinVersion as k, DEFAULT_CODEX_MODEL as kt, BROWSE_DEFAULT_MODEL as l, resolveMcpToolTimeoutMs as lt, PLAN_DEFAULT_MODEL as m, readResponseBodyCapped as mt, MCP_GROUPS as n, standInToolEnabled as nt, buildPeerAwarenessSummary as o, createMessages as ot, IMPLEMENT_DEFAULT_MODEL as p, MAX_RESPONSE_BODY_BYTES as pt, browseAgentEnabled as q, assertMcpToolSurfaceConsistent as r, workerToolsEnabled as rt, enumerateInjectedMcpToolNames as s, getTokenCount as st, GROUP_META as t, scribeModel as tt, DEFAULT_MODEL as u, pickEndpoint as ut, resolveModeDefaults as v, colbertDegradedWarning as vt, toolbeltEnabled as w, DEFINITION_OF_GREATNESS as wt, buildEnv as x, extractZipMember as xt, resolveWorkerRunOpts as y, provisionAndIndexColbert as yt, logStreamError as z };
+export { browserToolsEnabled as $, searchWeb as A, collapsePathKeys as At, buildAnthropicErrorEvent as B, withOneMSuffix as Bt, buildToolbeltAwareness as C, provisionAndIndexColbert as Ct, TOOLBELT_TOOLS$1 as D, CONDENSED_OPERATING_SEQUENCE as Dt, vscodeRipgrepPath as E, warmTreeSitterPool as Et, isAdvisorRequested as F, DEFAULT_PORT as Ft, relayAnthropicStream as G, isControllerClosedError as H, formatThinkingRepairDecline as I, UPSTREAM_FETCH_TIMEOUT_MS as It, agentToolsEnabled as J, handleMcpDelete as K, rememberThinkingHistoryRepair as L, UPSTREAM_INACTIVITY_TIMEOUT_MS as Lt, ADVISOR_TOOL_INSTRUCTIONS as M, DEFAULT_CLAUDE_MODEL_FALLBACKS as Mt, buildAdvisorStream as N, DEFAULT_CODEX_MODEL as Nt, assetFor as O, DEFINITION_OF_GREATNESS as Ot, injectAdvisorTool as P, DEFAULT_CODEX_MODEL_FALLBACKS as Pt, browserCompoundToolsEnabled as Q, repairKnownThinkingHistory as R, generateRandomPort as Rt, availableToolCommands as S, colbertDegradedWarning as St, toolbeltSkipSet as T, extractZipMember as Tt, logStreamError as U, buildOpenAIErrorEvent as V, withInstallLock as Vt, readIteratorWithTimeout as W, brainstormModel as X, artifactToolsEnabled as Y, browseAgentEnabled as Z, appendPlanReminder as _, MAX_RESPONSE_BODY_BYTES as _t, buildPeerAwarenessSnippet as a, scribeModel as at, runWorkerAgent as b, provisionBrowserAssets as bt, personasFor as c, shimDefaultsToXhigh as ct, EXPLORE_DEFAULT_MODEL as d, getTokenCount as dt, fleetToolsEnabled as et, EXPLORE_DEFAULT_THINKING as f, assembleResponsesPayload as ft, TEST_DEFAULT_MODEL as g, createChatCompletions as gt, REVIEW_DEFAULT_MODEL as h, createResponses as ht, buildAgentPrompt as i, scoutModel as it, ADVISOR_INTERNAL_TOOL_NAME as j, toolbeltPathOverride as jt, satisfiesMinVersion as k, shouldUseInsecureTls as kt, BROWSE_DEFAULT_MODEL as l, countTokens as lt, PLAN_DEFAULT_MODEL as m, pickEndpoint as mt, MCP_GROUPS as n, nativeSubagentModel as nt, buildPeerAwarenessSummary as o, standInToolEnabled as ot, IMPLEMENT_DEFAULT_MODEL as p, resolveMcpToolTimeoutMs as pt, handleMcpPost as q, assertMcpToolSurfaceConsistent as r, reviewerModel as rt, enumerateInjectedMcpToolNames as s, workerToolsEnabled as st, GROUP_META as t, geminiAvailable as tt, DEFAULT_MODEL as u, createMessages as ut, resolveModeDefaults as v, readResponseBodyCapped as vt, toolbeltEnabled as w, extractTarGzMember as wt, buildEnv as x, hasSupportedBrowserInstalled as xt, resolveWorkerRunOpts as y, parseJsonOrDiagnose as yt, repairRejectedThinkingHistory as z, pickClaudeDefault as zt };
 
-//# sourceMappingURL=peer-mcp-personas-DSbBlgFt.js.map
+//# sourceMappingURL=peer-mcp-personas-CN8xaXcV.js.map