zidane 5.8.0 → 5.8.3

package/dist/{tools-BmPeBGU1.js → tools-DLRIhCl1.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.
@@ -1976,6 +1988,16 @@ const TOOL_USE_SKIPPED_MESSAGE = "[Tool use skipped — superseded by user messa
 * calls in the batch continue running, in contrast with a full-run abort.
 */
 const TOOL_USE_CANCELLED_MESSAGE = "[Tool call cancelled by user]";
+/** Reason surfaced on `siblingAbort.signal` when a shell error cancels its fleet. */
+const SHELL_CASCADE_REASON = "sibling-shell-error";
+/**
+* Canonical `tool_result.content` text emitted to siblings that were
+* cancelled by a `shell` error in the same batch. Distinct from
+* {@link INTERRUPT_MESSAGE_FOR_TOOL_USE} (user-issued abort) and
+* {@link TOOL_USE_SKIPPED_MESSAGE} (steered) so consumers can split
+* the three causes by string-match.
+*/
+const SHELL_CASCADE_CANCEL_MESSAGE = "Cancelled: a sibling `shell` call in the same batch errored; re-run independently if still needed.";
 /**
 * Sentinel message rejected from the per-call cancellation promise inside
 * {@link executeSingleTool}'s race. Plain-string and module-private — only
@@ -2335,6 +2357,19 @@ function sanitizeStoredToolResults(provider, messages) {
 		} : msg;
 	});
 }
+/**
+* Build the `agent:abort` ctx, attaching the run id and (when present) the
+* string reason carried on `signal.reason` — lets telemetry correlate the
+* abort with its run and distinguish a reasoned abort (e.g. a guard) from a
+* bare `agent.abort()`.
+*/
+function buildAbortCtx(ctx) {
+	const reason = ctx.signal.reason;
+	return {
+		...ctx.runId ? { runId: ctx.runId } : {},
+		...typeof reason === "string" && reason.length > 0 ? { reason } : {}
+	};
+}
 async function runLoop(ctx) {
 	let totalIn = 0;
 	let totalOut = 0;
@@ -2356,7 +2391,7 @@ async function runLoop(ctx) {
 	try {
 		for (let turn = 0; turn < maxTurns; turn++) {
 			if (ctx.signal.aborted) {
-				await ctx.hooks.callHook("agent:abort", {});
+				await ctx.hooks.callHook("agent:abort", buildAbortCtx(ctx));
 				break;
 			}
 			const result = await executeTurn(ctx, turn, {
@@ -2385,7 +2420,7 @@ async function runLoop(ctx) {
 				if (pauseCap > 0 && consecutiveEmptyPauseTurns >= pauseCap) break;
 			} else consecutiveEmptyPauseTurns = 0;
 			if (ctx.signal.aborted) {
-				await ctx.hooks.callHook("agent:abort", {});
+				await ctx.hooks.callHook("agent:abort", buildAbortCtx(ctx));
 				break;
 			}
 			const breach = checkRunBudget({
@@ -2841,6 +2876,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 				turnId,
 				usage: errorUsage,
 				message: errorTurn,
+				aborted: wasAborted,
 				toolCounts: {
 					turn: Object.freeze({}),
 					run: Object.freeze({ ...ctx.runToolCounts })
@@ -2880,6 +2916,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 		turnId,
 		usage: result.usage,
 		message: assistantTurn,
+		aborted: ctx.signal.aborted,
 		toolCounts: {
 			turn: Object.freeze(turnCounts),
 			run: Object.freeze({ ...ctx.runToolCounts })
@@ -3216,6 +3253,7 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 	let output = "";
 	let isError = false;
 	let cancelledByUser = false;
+	let reportedOutcome;
 	const childSignal = typeof AbortSignal.any === "function" ? AbortSignal.any([ctx.signal, perCallAbort.signal]) : ctx.signal;
 	try {
 		const toolCtx = {
@@ -3238,7 +3276,10 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			...ctx.session ? { session: ctx.session } : {},
 			...ctx.readState ? { readState: ctx.readState } : {},
 			...typeof ctx.depth === "number" ? { depth: ctx.depth } : {},
-			clock: ctx.clock
+			clock: ctx.clock,
+			reportOutcome: (outcome) => {
+				reportedOutcome = outcome;
+			}
 		};
 		const bodyPromise = toolDef.execute(effectiveInput, toolCtx);
 		bodyPromise.catch(() => {});
@@ -3261,7 +3302,10 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 		const isOurSentinel = err instanceof Error && err.message === CANCELLED_BY_USER_SENTINEL;
 		const isAbortError = err instanceof Error && err.name === "AbortError";
 		if (isOurSentinel || isAbortError && perCallAbort.signal.aborted) cancelledByUser = true;
-		else {
+		else if (isAbortError && ctx.signal.aborted) {
+			output = ctx.signal.reason === SHELL_CASCADE_REASON ? SHELL_CASCADE_CANCEL_MESSAGE : INTERRUPT_MESSAGE_FOR_TOOL_USE;
+			isError = true;
+		} else {
 			const error = err instanceof Error ? err : new Error(String(err));
 			const errorCtx = {
 				...buildToolHookBase(ctx, turnId, callId, call.name, displayName, effectiveInput),
@@ -3294,7 +3338,8 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 		output,
 		isError,
 		runToolCounts,
-		...coercions ? { coercions } : {}
+		...coercions ? { coercions } : {},
+		...reportedOutcome ? { outcome: reportedOutcome } : {}
 	});
 	return { result: {
 		id: callId,
@@ -3304,12 +3349,14 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 }
 /**
 * Fire `tool:dispatched` with the resolved path discriminator. Every code
-* path in {@link executeSingleTool} that produces a tool_result must call
-* this exactly once — that contract is what makes `tool:dispatched` ↔
-* `tool:after` a guaranteed symmetric pairing for live-event consumers
-* (the chat layer, SDK consumers reconstructing wire history from events,
-* tracing spans that want to record refused calls separately from
-* executed ones).
+* path in {@link executeSingleTool} that produces a tool_result calls this
+* exactly once — so a `tool:dispatched` precedes every terminal event. The
+* terminal that closes a dispatch depends on `outcome`: `execute` closes with
+* `tool:after` OR `tool:cancelled` (in-flight cancel), `gate-substitute` with
+* `tool:after`, and `gate-block`/`invalid-input`/`unknown` carry their result
+* on the dispatch path itself (no `tool:after`). See the `tool:dispatched`
+* hook doc in `agent.ts` for the full per-outcome pairing. The strict
+* direction holds unconditionally: no `tool:after` fires without a dispatch.
 *
 * Helper exists to centralize the optional-field plumbing for `reason`
 * (only set on `gate-block`) without sprinkling spread-conditional logic
@@ -3337,7 +3384,7 @@ async function fireDispatched(ctx, params) {
 * on the wire.
 */
 async function emitToolResult(ctx, params) {
-	const { turnId, callId, name, displayName, input, runToolCounts, coercions } = params;
+	const { turnId, callId, name, displayName, input, runToolCounts, coercions, outcome } = params;
 	let output = params.output;
 	let isError = params.isError;
 	const transformCtx = {
@@ -3350,6 +3397,7 @@ async function emitToolResult(ctx, params) {
 	await ctx.hooks.callHook("tool:transform", transformCtx);
 	output = transformCtx.result;
 	isError = transformCtx.isError;
+	const finalOutcome = isError && outcome && outcome !== "failed" ? "failed" : outcome;
 	const threshold = ctx.persistThreshold;
 	const persistDir = ctx.persistDir;
 	if (threshold && threshold > 0 && persistDir) {
@@ -3371,7 +3419,8 @@ async function emitToolResult(ctx, params) {
 		result: output,
 		outputBytes: toolOutputByteLength(output),
 		runToolCounts,
-		...coercions ? { coercions } : {}
+		...coercions ? { coercions } : {},
+		...finalOutcome ? { outcome: finalOutcome } : {}
 	});
 	return {
 		output,
@@ -3382,16 +3431,6 @@ async function emitToolResult(ctx, params) {
 const DEFAULT_MAX_CONCURRENT_TOOLS = 10;
 /** Canonical name of the shell tool — referenced for cascade-cancel semantics. */
 const SHELL_TOOL_NAME = "shell";
-/** Reason surfaced on `siblingAbort.signal` when a shell error cancels its fleet. */
-const SHELL_CASCADE_REASON = "sibling-shell-error";
-/**
-* Canonical `tool_result.content` text emitted to siblings that were
-* cancelled by a `shell` error in the same batch. Distinct from
-* {@link INTERRUPT_MESSAGE_FOR_TOOL_USE} (user-issued abort) and
-* {@link TOOL_USE_SKIPPED_MESSAGE} (steered) so consumers can split
-* the three causes by string-match.
-*/
-const SHELL_CASCADE_CANCEL_MESSAGE = "Cancelled: a sibling `shell` call in the same batch errored; re-run independently if still needed.";
 /**
 * Resolve a tool's concurrency-safety verdict for a specific call.
 *
@@ -4967,6 +5006,7 @@ const HOOK_EVENT_SET = new Set([
 	"child:turn:after",
 	"mcp:connect",
 	"mcp:error",
+	"mcp:warn",
 	"mcp:close",
 	"mcp:bootstrap:start",
 	"mcp:bootstrap:end",
@@ -5420,9 +5460,9 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 				startedAt: runStartedAt,
 				...options.tracingContext ? { tracingContext: Object.freeze({ ...options.tracingContext }) } : {}
 			});
-			if (externalSignal) if (externalSignal.aborted) abortController.abort();
+			if (externalSignal) if (externalSignal.aborted) abortController.abort(externalSignal.reason);
 			else {
-				externalAbortListener = () => abortController?.abort();
+				externalAbortListener = () => abortController?.abort(externalSignal.reason);
 				externalSignal.addEventListener("abort", externalAbortListener, { once: true });
 			}
 			idlePromise = new Promise((resolve) => {
@@ -5823,6 +5863,11 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			} catch (err) {
 				await flushTurns({ failureFallback: true });
 				if (abortController.signal.aborted) {
+					const abortReason = abortController.signal.reason;
+					await hooks.callHook("agent:abort", {
+						...runId ? { runId } : {},
+						...typeof abortReason === "string" && abortReason.length > 0 ? { reason: abortReason } : {}
+					});
 					session?.abortRun(runId);
 					await finalizeSession("aborted");
 					const stats = {
@@ -5887,10 +5932,14 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 		return await executionContext.killBackground(executionHandle, taskId) !== null;
 	}
 	function steer(message) {
+		if (abortController?.signal.aborted) return false;
 		steeringQueue.push(message);
+		return true;
 	}
 	function followUpFn(message) {
+		if (abortController?.signal.aborted) return false;
 		followUpQueue.push(message);
+		return true;
 	}
 	function waitForIdle() {
 		return idlePromise ?? Promise.resolve();
@@ -6009,6 +6058,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 		if (destroyed) return;
 		destroyed = true;
 		pendingTaskNotifications.clear();
+		if (abortController && !abortController.signal.aborted) abortController.abort("agent-destroyed");
 		for (const controller of pendingToolCancels.values()) if (!controller.signal.aborted) controller.abort("agent-destroyed");
 		pendingToolCancels.clear();
 		if (mcpWarmupPromise) try {
@@ -6301,7 +6351,9 @@ const edit = {
 		try {
 			original = await ctx.execution.readFile(ctx.handle, target);
 		} catch {
-			return `Edit error: file not found: ${target}.${await suggestionFor(ctx.execution, ctx.handle, target)}`;
+			const hint = await suggestionFor(ctx.execution, ctx.handle, target);
+			ctx.reportOutcome?.("failed");
+			return `Edit error: file not found: ${target}.${hint}`;
 		}
 		if (ctx.behavior?.requireReadBeforeEdit) {
 			const readState = resolveReadStateMap(ctx);
@@ -6315,13 +6367,17 @@ const edit = {
 		const match = resolveOldString(original, find);
 		if (!match) {
 			const preview = nearestMatchPreview(original, find);
+			ctx.reportOutcome?.("failed");
 			return preview ? `Edit error: old_string not found in ${target}. Closest match in the file: ${preview}` : `Edit error: old_string not found in ${target}.`;
 		}
 		const { actual, occurrences, via } = match;
 		if (occurrences > 1 && !replaceAll) return `Edit error: old_string appears ${occurrences} times in ${target}. Pass replace_all=true or expand old_string for uniqueness.`;
 		const styledReplacement = styleReplacementForVia(replacement, via, actual);
 		const updated = replaceAll ? original.split(actual).join(styledReplacement) : original.replace(actual, styledReplacement);
-		if (updated === original) return `Edit error: replacement produced no change in ${target}.`;
+		if (updated === original) {
+			ctx.reportOutcome?.("noop");
+			return `Edit error: replacement produced no change in ${target}.`;
+		}
 		await ctx.execution.writeFile(ctx.handle, target, updated);
 		const readState = resolveReadStateMap(ctx);
 		if (readState) {
@@ -6333,6 +6389,7 @@ const edit = {
 				mtimeMs: Date.now()
 			});
 		}
+		ctx.reportOutcome?.("edited");
 		return `Edited ${target}: replaced ${occurrences} occurrence${occurrences === 1 ? "" : "s"}.`;
 	}
 };
@@ -6795,20 +6852,31 @@ const multiEdit = {
 	async execute({ path, edits }, ctx) {
 		const target = path;
 		const steps = edits;
-		if (!Array.isArray(steps) || steps.length === 0) return `multi_edit error: edits must be a non-empty array.`;
+		if (!Array.isArray(steps) || steps.length === 0) {
+			ctx.reportOutcome?.("failed");
+			return `multi_edit error: edits must be a non-empty array.`;
+		}
 		let current;
 		try {
 			current = await ctx.execution.readFile(ctx.handle, target);
 		} catch {
-			return `multi_edit error: file not found: ${target}.${await suggestionFor(ctx.execution, ctx.handle, target)}`;
+			const hint = await suggestionFor(ctx.execution, ctx.handle, target);
+			ctx.reportOutcome?.("failed");
+			return `multi_edit error: file not found: ${target}.${hint}`;
 		}
 		if (ctx.behavior?.requireReadBeforeEdit) {
 			const readState = resolveReadStateMap(ctx);
 			if (readState) {
 				const absKey = readStateKey(ctx.handle.cwd, target);
 				const prior = readState.get(absKey);
-				if (!prior) return `multi_edit error: ${target} has not been read in this session. Call read_file first so the edits apply against the current contents.`;
-				if (prior.contentHash !== hashContent(current)) return `multi_edit error: ${target} has changed on disk since the last read. Re-read the file before editing.`;
+				if (!prior) {
+					ctx.reportOutcome?.("failed");
+					return `multi_edit error: ${target} has not been read in this session. Call read_file first so the edits apply against the current contents.`;
+				}
+				if (prior.contentHash !== hashContent(current)) {
+					ctx.reportOutcome?.("failed");
+					return `multi_edit error: ${target} has changed on disk since the last read. Re-read the file before editing.`;
+				}
 			}
 		}
 		const outcomes = [];
@@ -6864,6 +6932,7 @@ const multiEdit = {
 		const failedCount = outcomes.length - appliedCount;
 		if (appliedCount > 0) {
 			await ctx.execution.writeFile(ctx.handle, target, current);
+			ctx.reportOutcome?.("edited");
 			const readState = resolveReadStateMap(ctx);
 			if (readState) {
 				const absKey = readStateKey(ctx.handle.cwd, target);
@@ -6874,7 +6943,7 @@ const multiEdit = {
 					mtimeMs: Date.now()
 				});
 			}
-		}
+		} else ctx.reportOutcome?.("failed");
 		const n = steps.length;
 		let header;
 		if (appliedCount === n) header = `Edited ${target}: applied ${n} edit${n === 1 ? "" : "s"} (${totalReplacements} replacement${totalReplacements === 1 ? "" : "s"}).`;
@@ -7663,7 +7732,10 @@ const writeFile$1 = {
 			existing = await ctx.execution.readFile(ctx.handle, targetPath);
 		} catch {}
 		const bytes = Buffer.byteLength(targetContent);
-		if (existing === targetContent) return `No change needed: ${targetPath} already at target state (${bytes} bytes).`;
+		if (existing === targetContent) {
+			ctx.reportOutcome?.("noop");
+			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), {
@@ -7673,10 +7745,11 @@ const writeFile$1 = {
 			maxBytes: Number.POSITIVE_INFINITY,
 			mtimeMs: Date.now()
 		});
+		ctx.reportOutcome?.(existing === void 0 ? "created" : "updated");
 		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-BmPeBGU1.js.map
+//# sourceMappingURL=tools-DLRIhCl1.js.map