zidane 5.7.8 → 5.8.2

package/dist/{tools-dkB_jARJ.js → tools-BzQtic6M.js}

@@ -6,7 +6,7 @@ import { t as reconcileImageMediaType } from "./image-sniff-B7uFSNO1.js";
 import { n as createProcessContext } from "./contexts-BD2U_xpi.js";
 import { n as toolOutputByteLength, t as DEFAULT_AGENT_CLOCK } from "./types-BPw_i5vb.js";
 import { b as escapeXml, f as installAllowedToolsGate, g as validateResourcePath, n as resolveSkills, t as interpolateShellCommands, u as buildCatalog, y as createSkillActivationState } from "./interpolate-TySiqKzc.js";
-import { t as connectMcpServers } from "./mcp-Kqzz-Rs_.js";
+import { n as connectMcpServers } from "./mcp-Br3b1Xm3.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { createHooks } from "hookable";
@@ -1382,6 +1382,18 @@ function resolveTasksDir(opts) {
 	return join(opts.userDir, opts.sessionId, "tasks");
 }
 /**
+* Resolve the per-session MCP diagnostic directory under
+* `<userDir>/<sessionId>/mcp-warnings/`.
+*
+* Warning logs are cache/session artifacts like background task logs:
+* useful for debugging, safe to delete, and cleaned up with the session.
+*/
+function resolveMcpWarningsDir(opts) {
+	if (!isAbsolute(opts.userDir)) throw new Error(`resolveMcpWarningsDir: userDir must be absolute, got "${opts.userDir}"`);
+	if (!opts.sessionId) throw new Error("resolveMcpWarningsDir: sessionId must be a non-empty string");
+	return join(opts.userDir, opts.sessionId, "mcp-warnings");
+}
+/**
 * Decide-and-persist for a single tool result. Pure decision + filesystem
 * side-effect; returns the new wire-level `output` string when substitution
 * happened, otherwise tells the caller to leave the result alone.
@@ -3643,6 +3655,183 @@ function buildPromptMessage(provider, parts) {
 	return defaultPromptMessage(parts);
 }
 //#endregion
+//#region src/repeat-guard.ts
+const DEFAULT_BLOCK_THRESHOLD = 4;
+const DEFAULT_ABORT_THRESHOLD = 8;
+/**
+* Default tracked-tool predicate: `shell` exactly, plus any tool whose
+* canonical name ends in `_execute_sql` (the MCP SQL-runner shape,
+* `mcp_<server>_execute_sql`). Both are auto-approved, side-effect-light
+* retry magnets — the exact loop shapes the abort escalation exists for.
+*/
+function defaultRepeatGuardTracked(name) {
+	return name === "shell" || name.endsWith("_execute_sql");
+}
+function compileMatchers(tools) {
+	if (tools === void 0) return defaultRepeatGuardTracked;
+	if (tools.length === 0) return () => false;
+	const exact = /* @__PURE__ */ new Set();
+	const fns = [];
+	for (const m of tools) if (typeof m === "string") exact.add(m);
+	else fns.push(m);
+	return (name) => {
+		if (exact.has(name)) return true;
+		for (const fn of fns) try {
+			if (fn(name)) return true;
+		} catch {}
+		return false;
+	};
+}
+/**
+* Canonicalize a shell command so semantically-identical invocations collapse
+* to one streak key:
+*
+* - strip a leading `cd <path> &&` (or `cd <path>;`) prefix — the model often
+*   re-prefixes the same command with a `cd` into the project root.
+* - strip a trailing verify-tail of the shape `& sleep N ; <anything>` or
+*   `; sleep N && <anything>` that the model appends to poll a just-started
+*   process (`… & sleep 2 ; curl localhost`).
+* - collapse runs of whitespace to single spaces and trim.
+*
+* Conservative on purpose: it does NOT reorder flags or parse the command —
+* it only removes the two wrappers we actually saw inflate distinct-looking
+* retries of the same core command, plus whitespace noise.
+*/
+function normalizeShellCommand(command) {
+	let s = command.trim();
+	for (;;) {
+		const m = /^cd\s+(?:"[^"]*"|'[^']*'|\S+)\s*(?:&&|;)\s*/.exec(s);
+		if (!m) break;
+		s = s.slice(m[0].length);
+	}
+	s = s.replace(/\s*(?:&&|&|;)\s*sleep\s+\d+(?:\.\d+)?\s*(?:&&|&|;)\s.*$/i, "");
+	s = s.replace(/\s*(?:&&|&|;)\s*sleep\s+\d+(?:\.\d+)?\s*$/i, "");
+	s = s.replace(/\s+/g, " ").trim();
+	return s;
+}
+/**
+* Built-in normalizer used when the consumer doesn't supply one. Shell-shaped
+* tools get {@link normalizeShellCommand}; SQL-runner tools get a whitespace-
+* collapsed query; everything else falls back to a stable JSON encoding.
+* Returns `undefined` when there's no meaningful payload to key on (so the
+* call is excluded from streak tracking rather than keyed on `'{}'`).
+*/
+function defaultRepeatGuardNormalize(name, input) {
+	if (name === "shell") {
+		const cmd = input.command;
+		if (typeof cmd !== "string" || cmd.trim().length === 0) return void 0;
+		return `shell:${normalizeShellCommand(cmd)}`;
+	}
+	if (name.endsWith("_execute_sql")) {
+		const q = input.query ?? input.sql ?? input.statement;
+		if (typeof q !== "string" || q.trim().length === 0) return void 0;
+		return `sql:${q.replace(/\s+/g, " ").trim().toLowerCase()}`;
+	}
+	try {
+		return `json:${stableStringify(input)}`;
+	} catch {
+		return;
+	}
+}
+/** Deterministic JSON with sorted keys so key order doesn't split a streak. */
+function stableStringify(value) {
+	return JSON.stringify(value, (_k, v) => {
+		if (v && typeof v === "object" && !Array.isArray(v)) {
+			const sorted = {};
+			for (const k of Object.keys(v).sort()) sorted[k] = v[k];
+			return sorted;
+		}
+		return v;
+	});
+}
+function formatBlockReason(reason, name, count) {
+	if (typeof reason === "string") return reason;
+	if (typeof reason === "function") try {
+		const out = reason(name, count);
+		if (typeof out === "string" && out.length > 0) return out;
+	} catch {}
+	return `Identical \`${name}\` call repeated ${count} times in a row. This is not making progress — do NOT retry the same payload. Change the command/arguments, inspect why it's failing first, or move on to a different step.`;
+}
+/**
+* Install the consecutive-identical repeat guard on a hook bus.
+*
+* `getConfig` returns the resolved `behavior.repeatGuard` (run override merged
+* with agent defaults), called lazily so a config attached after install
+* still takes effect. `abort` is bound to the agent's `AbortController` — the
+* gate calls it at the abort threshold and the loop's existing post-turn
+* `signal.aborted` check terminates the run (mirrors how `toolBudgets`
+* receives `enqueueSteer` rather than reaching into the loop).
+*
+* Returns an `uninstall` fn — the agent calls it in `finally` so handlers and
+* streak state never leak across runs.
+*/
+function installRepeatGuard(hooks, getConfig, abort) {
+	const streaks = /* @__PURE__ */ new Map();
+	function streakKey(runId, name) {
+		return `${runId ?? "-"}::${name}`;
+	}
+	function resolve(config) {
+		const blockThreshold = Math.max(2, Math.floor(typeof config.blockThreshold === "number" && Number.isFinite(config.blockThreshold) ? config.blockThreshold : DEFAULT_BLOCK_THRESHOLD));
+		const rawAbort = typeof config.abortThreshold === "number" && Number.isFinite(config.abortThreshold) ? config.abortThreshold : DEFAULT_ABORT_THRESHOLD;
+		const abortThreshold = rawAbort > 0 ? Math.max(blockThreshold + 1, Math.floor(rawAbort)) : Infinity;
+		return {
+			isTracked: compileMatchers(config.tools),
+			normalize: config.normalize ?? defaultRepeatGuardNormalize,
+			blockThreshold,
+			abortThreshold
+		};
+	}
+	async function gateHandler(ctx) {
+		if (ctx.block || ctx.result !== void 0) return;
+		const config = getConfig();
+		if (!config) return;
+		const { isTracked, normalize, blockThreshold, abortThreshold } = resolve(config);
+		if (!isTracked(ctx.name)) return;
+		let key;
+		try {
+			key = normalize(ctx.name, ctx.input);
+		} catch {
+			return;
+		}
+		if (typeof key !== "string" || key.length === 0) return;
+		const slot = streakKey(ctx.runId, ctx.name);
+		const prior = streaks.get(slot);
+		const count = prior && prior.key === key ? prior.count + 1 : 1;
+		streaks.set(slot, {
+			key,
+			count
+		});
+		if (count < blockThreshold) return;
+		if (count >= abortThreshold) {
+			ctx.block = true;
+			ctx.reason = formatBlockReason(config.blockReason, ctx.name, count);
+			await hooks.callHook("repeat-guard:exceeded", {
+				tool: ctx.name,
+				count,
+				threshold: abortThreshold,
+				turnId: ctx.turnId,
+				action: "abort"
+			});
+			abort();
+			return;
+		}
+		ctx.block = true;
+		ctx.reason = formatBlockReason(config.blockReason, ctx.name, count);
+		await hooks.callHook("repeat-guard:exceeded", {
+			tool: ctx.name,
+			count,
+			threshold: blockThreshold,
+			turnId: ctx.turnId,
+			action: "block"
+		});
+	}
+	const unregister = hooks.hook("tool:gate", gateHandler);
+	return function uninstall() {
+		unregister();
+		streaks.clear();
+	};
+}
+//#endregion
 //#region src/tool-budgets.ts
 /**
 * Install the per-tool soft-budget middleware on a hook bus.
@@ -4790,6 +4979,7 @@ const HOOK_EVENT_SET = new Set([
 	"child:turn:after",
 	"mcp:connect",
 	"mcp:error",
+	"mcp:warn",
 	"mcp:close",
 	"mcp:bootstrap:start",
 	"mcp:bootstrap:end",
@@ -4815,6 +5005,7 @@ const HOOK_EVENT_SET = new Set([
 	"output",
 	"budget:exceeded",
 	"tool-budget:exceeded",
+	"repeat-guard:exceeded",
 	"pairing:repair",
 	"tracing:redact",
 	"agent:abort",
@@ -4905,6 +5096,7 @@ function resolveBehavior(agentBehavior, runBehavior) {
 		dedupTools: runBehavior?.dedupTools ?? agentBehavior?.dedupTools,
 		requireReadBeforeEdit: runBehavior?.requireReadBeforeEdit ?? agentBehavior?.requireReadBeforeEdit,
 		toolBudgets: runBehavior?.toolBudgets ?? agentBehavior?.toolBudgets,
+		repeatGuard: runBehavior?.repeatGuard ?? agentBehavior?.repeatGuard,
 		readLineNumbers: runBehavior?.readLineNumbers ?? agentBehavior?.readLineNumbers,
 		elideStaleReads: runBehavior?.elideStaleReads ?? agentBehavior?.elideStaleReads,
 		toolDisclosure: runBehavior?.toolDisclosure ?? agentBehavior?.toolDisclosure ?? "eager",
@@ -4917,7 +5109,8 @@ function resolveBehavior(agentBehavior, runBehavior) {
 		tasksDir: runBehavior?.tasksDir ?? agentBehavior?.tasksDir,
 		disableBackgroundTasks: runBehavior?.disableBackgroundTasks ?? agentBehavior?.disableBackgroundTasks,
 		strictToolPairing: runBehavior?.strictToolPairing ?? agentBehavior?.strictToolPairing ?? false,
-		maxConsecutivePauseTurns: runBehavior?.maxConsecutivePauseTurns ?? agentBehavior?.maxConsecutivePauseTurns
+		maxConsecutivePauseTurns: runBehavior?.maxConsecutivePauseTurns ?? agentBehavior?.maxConsecutivePauseTurns,
+		persistTurns: runBehavior?.persistTurns ?? agentBehavior?.persistTurns
 	};
 }
 /**
@@ -5291,7 +5484,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			const thinking = options.thinking ?? "off";
 			const model = options.model ?? provider.meta.defaultModel;
 			const resolvedBehavior = resolveBehavior(agentBehavior, options.behavior);
-			const { maxConcurrentTools, maxTurns, maxCostUsd, maxTotalTokens, maxTokens, retry, thinkingBudget, modelOptions: behaviorModelOptions, schema, cache, toolOutputBudget, toolOutputBudgetExcludeTools, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets, elideStaleReads, toolDisclosure, toolSearch, surfaceMcpInstructions, persistThreshold, persistExcludeTools, persistDir, persistMaxBytes, strictToolPairing, maxConsecutivePauseTurns } = resolvedBehavior;
+			const { maxConcurrentTools, maxTurns, maxCostUsd, maxTotalTokens, maxTokens, retry, thinkingBudget, modelOptions: behaviorModelOptions, schema, cache, toolOutputBudget, toolOutputBudgetExcludeTools, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets, repeatGuard, elideStaleReads, toolDisclosure, toolSearch, surfaceMcpInstructions, persistThreshold, persistExcludeTools, persistDir, persistMaxBytes, strictToolPairing, maxConsecutivePauseTurns, persistTurns } = resolvedBehavior;
 			const modelOptions = options.modelOptions ?? behaviorModelOptions;
 			let system = options.system || agentSystem || "You are a helpful assistant.";
 			const baseSystemForBreakdown = renderSystemForWire(system);
@@ -5493,8 +5686,9 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 					count: turns.length
 				});
 			};
-			const unregisterTurnSync = session ? hooks.hook("turn:after", persistPendingTurns) : void 0;
-			const unregisterToolResultsSync = session ? hooks.hook("tool-results:after", persistPendingTurns) : void 0;
+			const perTurnSync = session && persistTurns !== false;
+			const unregisterTurnSync = perTurnSync ? hooks.hook("turn:after", persistPendingTurns) : void 0;
+			const unregisterToolResultsSync = perTurnSync ? hooks.hook("tool-results:after", persistPendingTurns) : void 0;
 			async function flushTurns(opts = {}) {
 				if (!session) return;
 				if (opts.failureFallback) await synthesizeMissingToolResults(turns, await session.generateTurnId?.() ?? clock.randomUUID(), runId, provider, hooks, clock);
@@ -5529,6 +5723,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			}
 			const uninstallAllowedToolsGate = installAllowedToolsGate(hooks, skillActivationState);
 			const uninstallToolBudgets = installToolBudgetsGate(hooks, () => toolBudgets, (msg) => steeringQueue.push(msg));
+			const uninstallRepeatGuard = installRepeatGuard(hooks, () => repeatGuard, () => abortController?.abort());
 			const uninstallDedupTools = installDedupToolsGate(hooks, () => dedupTools, () => session ?? void 0);
 			const uninstallLazyDisclosureGate = installLazyDisclosureGate(hooks, disclosure.lazyCanonicalNames, unlocked, discoveryToolName);
 			const runStartMs = await clock.now();
@@ -5674,6 +5869,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 				await deactivateAllSkills();
 				uninstallAllowedToolsGate();
 				uninstallDedupTools();
+				uninstallRepeatGuard();
 				uninstallToolBudgets();
 				uninstallLazyDisclosureGate();
 				unregisterSpawnHook();
@@ -7482,10 +7678,18 @@ const writeFile$1 = {
 		const bytes = Buffer.byteLength(targetContent);
 		if (existing === targetContent) return `No change needed: ${targetPath} already at target state (${bytes} bytes).`;
 		await ctx.execution.writeFile(ctx.handle, targetPath, targetContent);
+		const readState = resolveReadStateMap(ctx);
+		if (readState) readState.set(readStateKey(ctx.handle.cwd, targetPath), {
+			contentHash: hashContent(targetContent),
+			offset: 0,
+			limit: Number.POSITIVE_INFINITY,
+			maxBytes: Number.POSITIVE_INFINITY,
+			mtimeMs: Date.now()
+		});
 		return existing === void 0 ? `Created ${targetPath} (${bytes} bytes).` : `Updated ${targetPath} (${bytes} bytes).`;
 	}
 };
 //#endregion
-export { getReadState as A, enabledModelOptions as B, PERSISTED_STUB_PREFIX as C, maybePersistToolResult as D, cleanupPersistedSession as E, OUTPUT_RESERVE_TOKENS as F, modelSupportsReasoning as G, getModelInfo as H, anthropicDescriptor as I, openrouterDescriptor as J, modelsForDescriptor as K, cerebrasDescriptor as L, readStateKey as M, resolveReadStateMap as N, resolvePersistDir as O, BUILTIN_PROVIDERS as P, credKeyOf as R, validateToolArgs as S, buildPersistedStub as T, localDescriptor as U, getContextWindow as V, modelOptionsFor as W, restoreModelOptions as X, piIdOf as Y, shell as _, multiEdit as a, TOOL_USE_CANCELLED_MESSAGE as b, grep as c, createAgent as d, createToolSearchTool as f, createShellTool as g, createSkillsReadTool as h, readFile$1 as i, hashContent as j, resolveTasksDir as k, glob$1 as l, createSkillsRunScriptTool as m, createSpawnTool as n, listFiles as o, createSkillsUseTool as p, openaiDescriptor as q, shellKill as r, createInteractionTool as s, writeFile$1 as t, edit as u, INTERRUPT_MESSAGE_FOR_TOOL_USE as v, PERSISTENCE_PREVIEW_BYTES as w, TOOL_USE_SKIPPED_MESSAGE as x, SHELL_CASCADE_CANCEL_MESSAGE as y, effectiveContextWindow as z };
+export { resolveTasksDir as A, effectiveContextWindow as B, PERSISTED_STUB_PREFIX as C, maybePersistToolResult as D, cleanupPersistedSession as E, BUILTIN_PROVIDERS as F, modelOptionsFor as G, getContextWindow as H, OUTPUT_RESERVE_TOKENS as I, openaiDescriptor as J, modelSupportsReasoning as K, anthropicDescriptor as L, hashContent as M, readStateKey as N, resolveMcpWarningsDir as O, resolveReadStateMap as P, cerebrasDescriptor as R, validateToolArgs as S, buildPersistedStub as T, getModelInfo as U, enabledModelOptions as V, localDescriptor as W, piIdOf as X, openrouterDescriptor as Y, restoreModelOptions as Z, shell as _, multiEdit as a, TOOL_USE_CANCELLED_MESSAGE as b, grep as c, createAgent as d, createToolSearchTool as f, createShellTool as g, createSkillsReadTool as h, readFile$1 as i, getReadState as j, resolvePersistDir as k, glob$1 as l, createSkillsRunScriptTool as m, createSpawnTool as n, listFiles as o, createSkillsUseTool as p, modelsForDescriptor as q, shellKill as r, createInteractionTool as s, writeFile$1 as t, edit as u, INTERRUPT_MESSAGE_FOR_TOOL_USE as v, PERSISTENCE_PREVIEW_BYTES as w, TOOL_USE_SKIPPED_MESSAGE as x, SHELL_CASCADE_CANCEL_MESSAGE as y, credKeyOf as z };
 
-//# sourceMappingURL=tools-dkB_jARJ.js.map
+//# sourceMappingURL=tools-BzQtic6M.js.map