zidane 5.12.4 → 5.12.6

package/dist/{tools-BlMV33N1.js → tools-CbuxYK28.js}

@@ -1,9 +1,9 @@
+import { F as canonicalizePrompt, L as fnv1aBase36, O as appendStaticSection, P as buildPromptMessage, a as detectTurnInterruption, c as filterUnresolvedToolUses, d as remintDuplicateToolCallIds, f as resolveContentRefsInMessages, j as renderSystemForWire, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, o as ensureEndsWithUserMessage, s as ensureToolResultPairing } from "./messages-CV_K9I6j.js";
 import { r as utf8ByteLength } from "./utils-ngQzYzZD.js";
 import { t as buildContextBreakdown } from "./context-breakdown-kO-pDsay.js";
 import { a as formatTaskStatus, i as formatDuration, o as formatTaskSummary, s as previewLine } from "./format-BNOXpl-1.js";
-import { _ as ANTHROPIC_EXTRA_MODELS, a as local, c as generatePkce, f as arcee, g as writeFileAtomicAsync, i as openai, l as cerebras, n as createXaiOAuthProvider, p as anthropic, r as openrouter, s as createCursorOAuthProvider, t as xai, u as baseten, v as FAST_MODE_OPTIONS } from "./providers-C_zClj1S.js";
+import { _ as ANTHROPIC_EXTRA_MODELS, a as local, c as generatePkce, f as arcee, g as writeFileAtomicAsync, i as openai, l as cerebras, n as createXaiOAuthProvider, p as anthropic, r as openrouter, s as createCursorOAuthProvider, t as xai, u as baseten, v as FAST_MODE_OPTIONS } from "./providers-C6rpOk0l.js";
 import { i as AgentProviderError, l as errorMessage, m as toTypedError, n as AgentBudgetExceededError, o as AgentToolPairingError, t as AgentAbortedError, u as isAbortLikeError } from "./errors-BpPfMo_4.js";
-import { F as canonicalizePrompt, O as appendStaticSection, P as buildPromptMessage, a as detectTurnInterruption, c as filterUnresolvedToolUses, d as remintDuplicateToolCallIds, f as resolveContentRefsInMessages, j as renderSystemForWire, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, o as ensureEndsWithUserMessage, s as ensureToolResultPairing } from "./messages-9wyCuvLF.js";
 import { n as reconcileImageMediaType } from "./media-sniff-Bn76JxAu.js";
 import { a as toolOutputByteLength, i as toolOutputBudgetByteLength, o as toolResultToText, r as documentBlockMarker, t as DEFAULT_AGENT_CLOCK } from "./types-DxHDaqN7.js";
 import { r as createProcessContext, t as resolveDetachedTasksCapability } from "./contexts-DglWSzmR.js";
@@ -71,6 +71,66 @@ function toCanonicalName(wire, maps) {
 	return maps.canonicalByAlias.get(wire) ?? wire;
 }
 /**
+* Tool names must match `^[a-zA-Z0-9_-]{1,N}$`. The charset is universal; the
+* length cap is taken as the STRICTEST across providers (OpenAI/-compat: 64;
+* Anthropic allows 128) so a sanitized name is valid on EVERY provider — and so
+* a mid-session model switch can never make the provider-level drop guard
+* (`sanitizeToolSpecs`) discard a tool we could have kept.
+*
+* MCP tool names are minted verbatim as `mcp_<server>_<tool>` (see
+* `connectMcpServers`), so a server configured as `SSH Ipseity` yields
+* `mcp_SSH Ipseity_exec` — the space (and `.`/`:`/`/`, unicode, or a >64-char
+* join) 400s the request the instant that tool lands in the `tools` array:
+* `tools.N.custom.name: String should match pattern ...`.
+*/
+const WIRE_NAME_MAX = 64;
+const WIRE_NAME_OK = /^[\w-]{1,64}$/;
+const WIRE_NAME_BAD_CHAR = /[^\w-]/g;
+/**
+* Build OUTBOUND wire aliases that coerce any tool name violating the provider
+* name constraint into a valid one. Only offenders get an entry; clean setups
+* return `undefined` (no alias map churn, prompt cache untouched).
+*
+* Returned as a `Record` so it merges into `effectiveToolAliases` upstream of
+* BOTH wire-name computations — the `tool_search` catalog and the `tools` array
+* — keeping them in lockstep. Canonical names (dispatch, hooks, persisted
+* turns) never change; only the bytes the model sees do.
+*
+* Scoped to MCP names (the only third-party-controlled, thus only realistically
+* invalid, source). The hash suffix keeps distinct originals distinct even when
+* they collapse to the same replacement; `taken` guards the residual collision.
+*/
+function buildSanitizedWireAliases(names, existing) {
+	const wireOf = (name) => {
+		const alias = existing?.[name];
+		return typeof alias === "string" && alias.length > 0 ? alias : name;
+	};
+	const taken = /* @__PURE__ */ new Set();
+	const offenders = [];
+	for (const name of names) {
+		const wire = wireOf(name);
+		if (WIRE_NAME_OK.test(wire)) taken.add(wire);
+		else offenders.push(name);
+	}
+	if (offenders.length === 0) return void 0;
+	const out = {};
+	for (const name of offenders) {
+		const sanitized = sanitizeWireName(wireOf(name), taken);
+		out[name] = sanitized;
+		taken.add(sanitized);
+	}
+	return out;
+}
+function sanitizeWireName(name, taken) {
+	let base = name.replace(WIRE_NAME_BAD_CHAR, "_");
+	if (base.length === 0) base = "tool";
+	const hash = fnv1aBase36(name);
+	const withSuffix = (suffix) => `${base.slice(0, Math.max(1, WIRE_NAME_MAX - suffix.length))}${suffix}`;
+	let candidate = withSuffix(`_${hash}`);
+	for (let n = 1; taken.has(candidate); n++) candidate = withSuffix(`_${hash}_${n}`);
+	return candidate;
+}
+/**
 * Augment {@link AliasMaps} with INBOUND-ONLY aliases for the Claude Code
 * `mcp__server__tool` double-underscore naming convention. For every MCP
 * tool registered with the canonical `mcp_<server>_<tool>` form, add a
@@ -3080,6 +3140,24 @@ const RETRY_DEFAULTS = {
 	maxDelayMs: 3e4
 };
 /**
+* Reactive context-overflow recovery schedule. When a turn is rejected with
+* `context_exceeded` (pre-stream — the request was too big for the model's
+* window), the loop emergency-compacts older `tool_result` bodies via
+* {@link applyTailCompaction} and re-issues, instead of surfacing the error.
+*
+* Each entry is the `keepTurns` floor for one recovery pass: the first pass
+* keeps the last 4 turns' tool output intact, then 1, then everything is
+* eligible. Progressive so the model loses as little fresh context as possible
+* while still shrinking enough to fit. The array length bounds the number of
+* recoveries per turn. Runs regardless of `behavior.compactStrategy` (calls the
+* compactor directly), so it protects runs that never opted into compaction.
+*/
+const CONTEXT_OVERFLOW_KEEP_TURNS = [
+	4,
+	1,
+	0
+];
+/**
 * Normalize a user-supplied `RetryConfig` (any field may be missing or invalid)
 * into a fully-populated config the retry loop can use without per-field guards.
 *
@@ -3272,6 +3350,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 	const retryCfg = resolveRetryConfig(ctx.retry);
 	let result;
 	let attempt = 0;
+	let overflowRecoveries = 0;
 	while (true) {
 		attempt += 1;
 		try {
@@ -3322,7 +3401,8 @@ async function executeTurn(ctx, turn, priorUsage) {
 			let wasAborted = ctx.signal.aborted || caught instanceof Error && caught.name === "AbortError";
 			const classified = !wasAborted ? ctx.provider.classifyError?.(caught) : null;
 			const isRetryable = classified?.kind === "provider_error" && classified.retryable === true;
-			if (!wasAborted && isRetryable && currentText === "" && currentThinking === "" && attempt < retryCfg.maxAttempts) {
+			const cleanSlate = currentText === "" && currentThinking === "";
+			if (!wasAborted && isRetryable && cleanSlate && attempt < retryCfg.maxAttempts) {
 				const meta = extractStreamErrorMeta(caught);
 				const delayMs = computeRetryDelayMs(attempt, retryCfg, extractRetryAfterMs(caught));
 				await ctx.hooks.callHook("stream:retry", {
@@ -3343,6 +3423,36 @@ async function executeTurn(ctx, turn, priorUsage) {
 					wasAborted = true;
 				}
 			}
+			if (!wasAborted && classified?.kind === "context_exceeded" && cleanSlate && overflowRecoveries < CONTEXT_OVERFLOW_KEEP_TURNS.length) {
+				const { readPathByCallId, toolNameByCallId } = collectCallMaps(canonicalMessages);
+				let recoveredMessages;
+				let elidedReadPaths = [];
+				for (let k = overflowRecoveries; k < CONTEXT_OVERFLOW_KEEP_TURNS.length; k++) {
+					const compacted = applyTailCompaction(streamOptions.messages, 0, CONTEXT_OVERFLOW_KEEP_TURNS[k], {
+						readPathByCallId,
+						toolNameByCallId,
+						chunkTurns: 1
+					});
+					if (compacted.messages !== streamOptions.messages) {
+						recoveredMessages = compacted.messages;
+						elidedReadPaths = compacted.elidedReadPaths;
+						overflowRecoveries = k + 1;
+						break;
+					}
+				}
+				if (recoveredMessages) {
+					markReadStateForElidedPaths(ctx, ctx.handle.cwd, elidedReadPaths);
+					let repaired = applyPairingRepair(ctx, recoveredMessages, turnId);
+					repaired = ensureEndsWithUserMessage(repaired, ctx.provider);
+					streamOptions.messages = repaired;
+					await ctx.hooks.callHook("context:overflow", {
+						turnId,
+						attempt: overflowRecoveries,
+						err: caught
+					});
+					continue;
+				}
+			}
 			await streamHookChain;
 			const errorUsage = {
 				input: 0,
@@ -6079,6 +6189,7 @@ const HOOK_EVENT_SET = new Set([
 	"stream:server_tool_result",
 	"stream:error",
 	"stream:retry",
+	"context:overflow",
 	"oauth:refresh",
 	"content-ref:resolve",
 	"tool:gate",
@@ -6685,10 +6796,15 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			} : sourceTools;
 			const mcpToolNames = options.tools === void 0 && mcpConnection ? new Set(Object.keys(mcpConnection.tools)) : /* @__PURE__ */ new Set();
 			const generatedMcpToolAliases = buildMcpToolNameSeparatorAliases(mcpToolNames, mcpServers, mcpToolNameSeparator);
-			const effectiveToolAliases = generatedMcpToolAliases ? {
+			const baseToolAliases = generatedMcpToolAliases ? {
 				...generatedMcpToolAliases,
 				...toolAliases ?? {}
 			} : toolAliases;
+			const sanitizedWireAliases = buildSanitizedWireAliases(mcpToolNames, baseToolAliases);
+			const effectiveToolAliases = sanitizedWireAliases ? {
+				...baseToolAliases ?? {},
+				...sanitizedWireAliases
+			} : baseToolAliases;
 			const mergedWithSkills = options.tools === void 0 && !!resolvedSkills && resolvedSkills.length > 0 && skillsConfig?.tool !== false ? {
 				skills_use: createSkillsUseTool({
 					catalog: resolvedSkills,
@@ -7402,29 +7518,47 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			...mcpConnection.tools
 		} : sourceTools;
 		const mcpNames = new Set(mcpConnection ? Object.keys(mcpConnection.tools) : []);
+		const preRunSeparatorAliases = buildMcpToolNameSeparatorAliases(mcpNames, mcpServers, agentBehavior?.mcpToolNameSeparator ?? "_");
+		const preRunBaseAliases = preRunSeparatorAliases ? {
+			...preRunSeparatorAliases,
+			...toolAliases ?? {}
+		} : toolAliases;
+		const preRunSanitizedAliases = buildSanitizedWireAliases(mcpNames, preRunBaseAliases);
+		const preRunAliases = preRunSanitizedAliases ? {
+			...preRunBaseAliases ?? {},
+			...preRunSanitizedAliases
+		} : preRunBaseAliases;
+		const wireNameFor = (canonical) => preRunAliases?.[canonical] ?? canonical;
 		const disclosedTools = [];
 		const nativeSpecs = [];
 		const mcpSpecs = [];
+		const mcpServerByIndex = [];
 		for (const t of Object.values(baseTools)) {
+			const canonical = t.spec.name;
 			const spec = {
-				name: t.spec.name,
+				name: wireNameFor(canonical),
 				description: t.spec.description || "",
 				inputSchema: t.spec.inputSchema
 			};
-			if (mcpNames.has(t.spec.name)) mcpSpecs.push(spec);
-			else nativeSpecs.push(spec);
+			if (mcpNames.has(canonical)) {
+				mcpSpecs.push(spec);
+				mcpServerByIndex.push(resolveMcpToolParts(canonical, mcpServers)?.server ?? "mcp");
+			} else nativeSpecs.push(spec);
 		}
 		for (const spec of nativeSpecs) disclosedTools.push({
 			name: spec.name,
 			description: spec.description || "",
 			inputSchema: spec.inputSchema
 		});
-		for (const spec of mcpSpecs) disclosedTools.push({
-			name: spec.name,
-			description: spec.description || "",
-			inputSchema: spec.inputSchema,
-			mcpServer: resolveMcpToolParts(spec.name, mcpServers)?.server ?? "mcp"
-		});
+		for (let i = 0; i < mcpSpecs.length; i++) {
+			const spec = mcpSpecs[i];
+			disclosedTools.push({
+				name: spec.name,
+				description: spec.description || "",
+				inputSchema: spec.inputSchema,
+				mcpServer: mcpServerByIndex[i]
+			});
+		}
 		const wireTools = nativeSpecs.length + mcpSpecs.length > 0 ? provider.formatTools([...nativeSpecs, ...mcpSpecs]) : [];
 		const mcpInstructionsText = mcpConnection?.instructions && mcpConnection.instructions.size > 0 ? renderMcpInstructionsSection(mcpConnection.instructions) : void 0;
 		if (mcpInstructionsText) system = appendStaticSection(system, mcpInstructionsText);
@@ -9141,4 +9275,4 @@ const writeFile$1 = {
 //#endregion
 export { restoreModelOptions as $, PERSISTENCE_PREVIEW_BYTES as A, cerebrasDescriptor as B, stableStringify as C, TOOL_USE_SKIPPED_MESSAGE as D, TOOL_USE_CANCELLED_MESSAGE as E, resolvePersistDir as F, getModelInfo as G, effectiveContextWindow as H, resolveTasksDir as I, modelSupportsReasoning as J, localDescriptor as K, BUILTIN_PROVIDERS as L, cleanupPersistedSession as M, maybePersistToolResult as N, validateToolArgs as O, resolveMcpWarningsDir as P, piIdOf as Q, OUTPUT_RESERVE_TOKENS as R, normalizeShellCommand as S, SHELL_CASCADE_CANCEL_MESSAGE as T, enabledModelOptions as U, credKeyOf as V, getContextWindow as W, openaiDescriptor as X, modelsForDescriptor as Y, openrouterDescriptor as Z, createSkillsReadTool as _, multiEdit as a, defaultRepeatGuardNormalize as b, grep as c, createAgent as d, WAIT_TASK_TIMED_OUT_PREFIX as f, createSkillsRunScriptTool as g, createSkillsUseTool as h, readFile$1 as i, buildPersistedStub as j, PERSISTED_STUB_PREFIX as k, glob$1 as l, createToolSearchTool as m, createSpawnTool as n, listFiles as o, waitTask as p, modelOptionsFor as q, shellKill as r, createInteractionTool as s, writeFile$1 as t, edit as u, createShellTool as v, INTERRUPT_MESSAGE_FOR_TOOL_USE as w, defaultRepeatGuardTracked as x, shell as y, anthropicDescriptor as z };
 
-//# sourceMappingURL=tools-BlMV33N1.js.map
+//# sourceMappingURL=tools-CbuxYK28.js.map