github-router 0.3.269 → 0.3.270

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

@@ -1,6 +1,6 @@
 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";
@@ -27263,10 +27263,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 +27329,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,24 +27345,42 @@ 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
@@ -27715,10 +27732,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 +27772,7 @@ function buildAdvisorStream(opts) {
 			let messageStartForwarded = false;
 			let nextSyntheticIndex = 0;
 			let turnsRun;
+			let pendingMessageDelta = null;
 			const safeEnqueue = (bytes) => {
 				try {
 					controller.enqueue(bytes);
@@ -27767,9 +27786,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 +27831,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 +27841,8 @@ function buildAdvisorStream(opts) {
 							if (!messageStartForwarded) {
 								if (!safeEnqueueEvent(ev.event, payload)) return {
 									capturedBlocks,
-									advisorToolUse
+									advisorToolUses,
+									clientToolUseCount
 								};
 								messageStartForwarded = true;
 							}
@@ -27800,12 +27854,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 +27873,8 @@ function buildAdvisorStream(opts) {
 									};
 									if (!safeEnqueueEvent(ev.event, translated)) return {
 										capturedBlocks,
-										advisorToolUse
+										advisorToolUses,
+										clientToolUseCount
 									};
 									const captured = {
 										block: {
@@ -27833,13 +27889,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 +27920,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 +27935,8 @@ function buildAdvisorStream(opts) {
 								}
 							} else if (!safeEnqueueEvent(ev.event, payload)) return {
 								capturedBlocks,
-								advisorToolUse
+								advisorToolUses,
+								clientToolUseCount
 							};
 							continue;
 						}
@@ -27889,7 +27949,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 +27959,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 +27988,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,41 +28011,55 @@ 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({
@@ -28022,7 +28090,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);
@@ -34219,4 +34287,4 @@ function enumerateInjectedMcpToolNames(groupKeys, opts = {}) {
 //#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 };
 
-//# sourceMappingURL=peer-mcp-personas-DSbBlgFt.js.map
+//# sourceMappingURL=peer-mcp-personas-pWP3Eyt7.js.map