github-router 0.3.295 → 0.3.297

package/dist/{server-setup-DsGJnJ_O.js → server-setup-DhG3YZPj.js}

@@ -1,9 +1,10 @@
-import { $ as bucketEffort, $t as assembleResponsesPayload, An as isBudgetClaudeLead, B as resolveAdvisorModel, Bn as stripTrailingOneMSuffix, Dn as UPSTREAM_FETCH_TIMEOUT_MS, E as toolbeltEnabled, F as FAST_ADVISOR_TOOL_INSTRUCTIONS, Fn as classifyMessagesRoute, G as buildAnthropicErrorEvent, Gt as countTokens, H as rememberThinkingHistoryRepair, Ht as resolveModelAlias, I as buildAdvisorStream, In as catalogAdvertises1M, J as logStreamError, Jt as getTokenCount, K as buildOpenAIErrorEvent, Kt as createMessages, L as injectAdvisorTool, Ln as oneMContextDisabled, Lt as LUNA_SONNET_ALIAS_ID, M as searchWeb, Mt as LUNA_DRIVER_ALIAS_ID, N as ADVISOR_INTERNAL_TOOL_NAME, Nn as upstreamAllowH2, Nt as LUNA_HAIKU_ALIAS_ID, On as UPSTREAM_INACTIVITY_TIMEOUT_MS, P as ADVISOR_TOOL_INSTRUCTIONS, Pn as upstreamMaxConnections, Q as UNKNOWN_EFFORT_ANCHOR, R as isAdvisorRequested, Rn as withOneMSuffix, Rt as canonicalizeAliasModel, Sn as BUDGET_SMALL_FAST_SLUG, U as repairKnownThinkingHistory, V as formatThinkingRepairDecline, Vn as withInstallLock, W as repairRejectedThinkingHistory, Wt as shimDefaultsToXhigh, X as relayAnthropicStream, Xt as findLaunchBySecret, Y as readIteratorWithTimeout, Yt as getTokenizerFromModel, Z as EFFORT_ORDER, an as readResponseBodyCapped, bn as toolbeltPathOverride, en as warnOnTokenPriceDrift, et as clampEffort, hn as provisionTreeSitterAssets, i as assertMcpToolSurfaceConsistent, in as MAX_RESPONSE_BODY_BYTES, kn as generateRandomPort, nn as createResponses, nt as handleMcpPost, on as parseJsonOrDiagnose, q as isControllerClosedError, qt as getTextTokenCount, rn as createChatCompletions, sn as normalizeOpenAIUsage, st as agentToolsEnabled, tn as resolveMcpToolTimeoutMs, tt as handleMcpDelete, z as resolveAdvisorEffort, zn as withOneMSuffixForLead } from "./peer-mcp-personas-BwNtC8jt.js";
+import { $ as bucketEffort, An as generateRandomPort, B as resolveAdvisorModel, Bn as withOneMSuffixForLead, Cn as BUDGET_SMALL_FAST_SLUG, E as toolbeltEnabled, F as FAST_ADVISOR_TOOL_INSTRUCTIONS, Fn as upstreamMaxConnections, G as buildAnthropicErrorEvent, Gt as shimDefaultsToXhigh, H as rememberThinkingHistoryRepair, Hn as withInstallLock, I as buildAdvisorStream, In as classifyMessagesRoute, It as LUNA_REAL_MODEL_ID, J as logStreamError, Jt as getTextTokenCount, K as buildOpenAIErrorEvent, Kt as countTokens, L as injectAdvisorTool, Ln as catalogAdvertises1M, M as searchWeb, N as ADVISOR_INTERNAL_TOOL_NAME, Nt as LUNA_DRIVER_ALIAS_ID, On as UPSTREAM_FETCH_TIMEOUT_MS, P as ADVISOR_TOOL_INSTRUCTIONS, Pn as upstreamAllowH2, Pt as LUNA_HAIKU_ALIAS_ID, Q as UNKNOWN_EFFORT_ANCHOR, R as isAdvisorRequested, Rn as oneMContextDisabled, Rt as LUNA_SONNET_ALIAS_ID, U as repairKnownThinkingHistory, Ut as resolveModelAlias, V as formatThinkingRepairDecline, Vn as stripTrailingOneMSuffix, W as repairRejectedThinkingHistory, X as relayAnthropicStream, Xt as getTokenizerFromModel, Y as readIteratorWithTimeout, Yt as getTokenCount, Z as EFFORT_ORDER, Zt as findLaunchBySecret, an as MAX_RESPONSE_BODY_BYTES, cn as normalizeOpenAIUsage, ct as agentToolsEnabled, en as assembleResponsesPayload, et as clampEffort, gn as provisionTreeSitterAssets, i as assertMcpToolSurfaceConsistent, in as createChatCompletions, jn as isBudgetClaudeLead, kn as UPSTREAM_INACTIVITY_TIMEOUT_MS, nn as resolveMcpToolTimeoutMs, nt as handleMcpPost, on as readResponseBodyCapped, q as isControllerClosedError, qt as createMessages, rn as createResponses, sn as parseJsonOrDiagnose, tn as warnOnTokenPriceDrift, tt as handleMcpDelete, xn as toolbeltPathOverride, z as resolveAdvisorEffort, zn as withOneMSuffix, zt as canonicalizeAliasModel } from "./peer-mcp-personas-ce6_YMnX.js";
 import { t as getPackageVersion } from "./version-C8x2hQrZ.js";
 import { i as ensurePaths, t as PATHS } from "./paths-Ci485qSJ.js";
 import { A as state, T as copilotHeaders, _ as forwardError, a as cacheCopilotVersion, c as filterBetaHeader, d as resolveModel, f as sleep, g as HTTPError, i as tryRefreshAndRetry, l as isNullish, n as setupGitHubAgentToken, o as cacheModels, r as setupGitHubToken, s as cacheVSCodeVersion, t as setupCopilotToken, w as copilotBaseUrl, y as fetchWithTransientRetry } from "./token-BtJhjXXu.js";
 import { t as getCopilotUsage } from "./get-copilot-usage-B7Z4XVWj.js";
 import { a as resolveExecutable, n as killManagedTree, o as runCommandCapture, r as parseBoolEnv, s as runCommandVoid } from "./exec-y8C_MU8A.js";
+import { r as FAST_PROFILE_ADVISOR_MODEL } from "./fast-profile-contract-K3P58nj3.js";
 import consola from "consola";
 import * as fs$2 from "node:fs";
 import fs, { existsSync } from "node:fs";
@@ -1497,7 +1498,7 @@ function collectToolFieldKeys(body) {
 //#endregion
 //#region package.json
 var name = "github-router";
-var version = "0.3.295";
+var version = "0.3.297";
 //#endregion
 //#region src/lib/approval.ts
 const awaitApproval = async () => {
@@ -4700,6 +4701,32 @@ function stripWebSearchTool(body) {
 * in probes `shim_advisor_degrade_gpt55` and
 * `shim_advisor_degrade_gemini35flash`.
 */
+function hasNonEmptyTools(rawBody) {
+	let body;
+	try {
+		body = JSON.parse(rawBody);
+	} catch {
+		return false;
+	}
+	return Array.isArray(body.tools) && body.tools.length > 0;
+}
+function fastAdvisorMetadataMismatch(rawBody) {
+	let body;
+	try {
+		body = JSON.parse(rawBody);
+	} catch {
+		return;
+	}
+	if (!Array.isArray(body.tools) || body.tools.length === 0) return void 0;
+	for (const tool of body.tools) {
+		if (!tool || typeof tool !== "object") continue;
+		const type = tool.type;
+		if (typeof type !== "string" || !type.startsWith("advisor_")) continue;
+		const model = tool.model;
+		if (typeof model !== "string") return "the native Advisor tool omitted its fixed model";
+		if (stripTrailingOneMSuffix(model).base !== FAST_PROFILE_ADVISOR_MODEL) return `the native Advisor tool requested ${JSON.stringify(model)} instead of ${JSON.stringify(FAST_PROFILE_ADVISOR_MODEL)}`;
+	}
+}
 function stripAdvisorTool(rawBody) {
 	let body;
 	try {
@@ -4836,6 +4863,30 @@ async function handleCompletion(c) {
 	const fastSubagentRequest = fastProfileRequest && Boolean(c.req.header("x-claude-code-agent-id"));
 	const fastLeadAdvisor = fastProfileRequest && !fastSubagentRequest;
 	const advisorEnabled = advisorRequested && !fastSubagentRequest;
+	const fastAdvisorEnabled = fastLeadAdvisor && advisorRequested && hasNonEmptyTools(rawBody);
+	const advisorBehaviorEnabled = fastLeadAdvisor ? fastAdvisorEnabled : advisorEnabled;
+	let fastAdvisorChoice;
+	if (fastAdvisorEnabled) {
+		const mismatch = fastAdvisorMetadataMismatch(rawBody);
+		if (mismatch) return c.json({
+			type: "error",
+			error: {
+				type: "invalid_request_error",
+				message: `Fast Advisor model mismatch: ${mismatch}. Run \`/advisor ${FAST_PROFILE_ADVISOR_MODEL}[1m]\` to restore the fixed fast profile, or relaunch with \`github-router claude -m fast\`.`
+			}
+		}, 400, { "x-should-retry": "false" });
+		try {
+			fastAdvisorChoice = resolveAdvisorModel(void 0, true);
+		} catch (error) {
+			return c.json({
+				type: "error",
+				error: {
+					type: "api_error",
+					message: error instanceof Error ? error.message : String(error)
+				}
+			}, 503);
+		}
+	}
 	const fastPreprocess = preprocessFastRequest(rawBody, identity.launch);
 	if (fastPreprocess.rejectedAlias || fastPreprocess.rejectedModel) {
 		const message = fastPreprocess.rejectedAlias ? `Router-owned model alias ${JSON.stringify(fastPreprocess.rejectedAlias)} is valid only for an authenticated -m fast launch.` : `Model ${JSON.stringify(fastPreprocess.rejectedModel)} is outside the fixed -m fast model set.`;
@@ -4859,7 +4910,7 @@ async function handleCompletion(c) {
 		}
 	}, 400, { "x-should-retry": "false" });
 	if (loopGuard.body !== void 0) finalBody = loopGuard.body;
-	if (advisorEnabled) {
+	if (advisorBehaviorEnabled) {
 		finalBody = injectAdvisorTool(finalBody, fastLeadAdvisor ? FAST_ADVISOR_TOOL_INSTRUCTIONS : void 0);
 		consola.info("ADVISOR enabled for this request — injecting __anthropic_advisor tool; will translate tool_use → server_tool_use{advisor} on the SSE stream");
 	}
@@ -4884,7 +4935,7 @@ async function handleCompletion(c) {
 			parsedBase = JSON.parse(promptWindowBody);
 		} catch {}
 		const wantsStream = parsedBase?.stream === true;
-		if (advisorEnabled && wantsStream && fastLeadAdvisor) {
+		if (fastAdvisorEnabled && wantsStream) {
 			const initialConversation = Array.isArray(parsedBase.messages) ? parsedBase.messages : [];
 			const parsedInitial = parseAnthropicRequest(parsedBase, modelId, selectedModel);
 			const fastAdvisorAborter = new AbortController();
@@ -4902,7 +4953,7 @@ async function handleCompletion(c) {
 				status: 200,
 				streaming: true
 			}, selectedModel, startTime);
-			const advisorChoice = resolveAdvisorModel(modelId, fastLeadAdvisor);
+			const advisorChoice = fastAdvisorChoice;
 			return new Response(buildAdvisorStream({
 				firstResponse,
 				initialConversation,
@@ -4928,7 +4979,7 @@ async function handleCompletion(c) {
 			});
 		}
 		const shimBody = stripAdvisorTool(promptWindowBody);
-		if (advisorEnabled) consola.info("ADVISOR requested with a non-Claude model — stripping the injected __anthropic_advisor tool and proceeding without advisor (Claude-only feature; gracefully degraded).");
+		if (advisorBehaviorEnabled) consola.info("ADVISOR requested with a non-Claude model — stripping the injected __anthropic_advisor tool and proceeding without advisor (Claude-only feature; gracefully degraded).");
 		const shimOpts = {
 			rawBody: shimBody,
 			modelId,
@@ -4940,7 +4991,7 @@ async function handleCompletion(c) {
 	}
 	if (modelId) logEndpointMismatch(modelId, "/v1/messages");
 	const effectiveBetas = applyDefaultBetas(betaHeaders, resolvedModel ?? originalModel);
-	const advisorAborter = advisorEnabled ? new AbortController() : void 0;
+	const advisorAborter = advisorBehaviorEnabled ? new AbortController() : void 0;
 	const requestHeaders = {
 		...selectedModel?.requestHeaders,
 		...effectiveBetas
@@ -5014,13 +5065,13 @@ async function handleCompletion(c) {
 		if (requestId) streamHeaders["x-request-id"] = requestId;
 		const reqId = response.headers.get("request-id");
 		if (reqId) streamHeaders["request-id"] = reqId;
-		if (advisorEnabled && response.body) {
+		if (advisorBehaviorEnabled && response.body) {
 			let parsedBase = {};
 			try {
 				parsedBase = JSON.parse(nativeBody);
 			} catch {}
 			const initialConversation = Array.isArray(parsedBase.messages) ? parsedBase.messages : [];
-			const advisorChoice = resolveAdvisorModel(originalModel, fastLeadAdvisor);
+			const advisorChoice = fastAdvisorChoice ?? resolveAdvisorModel(originalModel, false);
 			return new Response(buildAdvisorStream({
 				firstResponse: response,
 				initialConversation,
@@ -6552,7 +6603,7 @@ function clearGatewayModelCache(configDir = PATHS.CLAUDE_CONFIG_DIR) {
 */
 function oneMSuffixForAlias(aliasId) {
 	if (oneMContextDisabled()) return aliasId;
-	return catalogAdvertises1M("gpt-5.6-luna") ? `${aliasId}[1m]` : aliasId;
+	return catalogAdvertises1M(LUNA_REAL_MODEL_ID) ? `${aliasId}[1m]` : aliasId;
 }
 function getClaudeCodeEnvVars(serverUrl, model, launchProfileId = "standard") {
 	const vars = {
@@ -6690,4 +6741,4 @@ function getCodexEnvVars(serverUrl) {
 //#endregion
 export { sharedServerArgs as a, stopKeepAwake as c, runSelfUpdate as d, checkClaudeVersion as f, setupAndServe as i, listModelsForEndpoint as l, getCodexEnvVars as n, LAUNCH_SECRET_HEADER as o, updateClaude as p, parseSharedArgs as r, startKeepAwake as s, getClaudeCodeEnvVars as t, enableFileLogging as u };
 
-//# sourceMappingURL=server-setup-DsGJnJ_O.js.map
+//# sourceMappingURL=server-setup-DhG3YZPj.js.map