zidane 6.4.2 → 6.4.4

package/dist/acp-cli.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-import { Vt as resolveStorageDirs, ht as basic_default } from "./agent-BMJKrD84.js";
+import { Vt as resolveStorageDirs, ht as basic_default } from "./agent-8sUadp5M.js";
 import { r as createProcessContext } from "./contexts-DWVt7MvF.js";
 import { createSandboxContext } from "./contexts/sandbox.js";
-import { m as openaiCompat } from "./openai-compat-0MJq4-g9.js";
-import { n as anthropic } from "./anthropic-BJhMEi7x.js";
+import { m as openaiCompat } from "./openai-compat-B3c_hzwf.js";
+import { n as anthropic } from "./anthropic-D3lkw5mv.js";
 import { arcee } from "./providers/arcee.js";
 import { baseten } from "./providers/baseten.js";
 import { cerebras } from "./providers/cerebras.js";
-import { t as xai } from "./xai-CpPbCGWO.js";
+import { t as xai } from "./xai-BPwMQSuF.js";
 import { openai } from "./providers/openai.js";
 import { openrouter } from "./providers/openrouter.js";
-import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-Ba4OzG71.js";
-import { f as credKeyOf, i as readCredentials, l as BUILTIN_PROVIDERS, r as credentialsPath, t as detectAuth, y as modelsForDescriptor } from "./auth-C2Hmb0tt.js";
+import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-BLO58K3F.js";
+import { f as credKeyOf, i as readCredentials, l as BUILTIN_PROVIDERS, r as credentialsPath, t as detectAuth, y as modelsForDescriptor } from "./auth-BzYbbdN_.js";
 import { createDaytonaProvider } from "./contexts/daytona.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createE2BProvider } from "./contexts/e2b.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { Fp as AgentBehavior, Hm as TurnUsage, Nm as ToolResultContent, Qp as McpServerConfig, Wi as Agent, fh as Session, gh as SessionStore, lm as PromptPart, qi as AgentOptions, qm as ToolDef, rf as Provider, t as Preset, vm as SessionContentBlock } from "./index-Gy9wi80M.js";
+import { $m as ToolDef, Dh as Session, Jm as TurnUsage, Vp as AgentBehavior, Wi as Agent, hm as PromptPart, im as McpServerConfig, jh as SessionStore, qi as AgentOptions, rf as Provider, t as Preset, wm as SessionContentBlock, zm as ToolResultContent } from "./index-C-Nd2ZbV.js";
 import { c as ExecutionContext } from "./types-M2DauK2D.js";
 import { Readable, Writable } from "node:stream";
 

package/dist/acp.js

@@ -1,2 +1,2 @@
-import { _ as createJsonRpcConnection, a as wrapToolsForAcpClient, c as sessionBlocksToAcp, g as JsonRpcRemoteError, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-Ba4OzG71.js";
+import { _ as createJsonRpcConnection, a as wrapToolsForAcpClient, c as sessionBlocksToAcp, g as JsonRpcRemoteError, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-BLO58K3F.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-BMJKrD84.js → agent-8sUadp5M.js}

@@ -1,7 +1,7 @@
 import { a as rewriteMessagesToWire, i as rewriteContentToCanonical, n as buildAliasMaps, o as toCanonicalName, r as buildSanitizedWireAliases, s as toWireName, t as augmentMcpDoubleUnderscoreAliases } from "./aliasing-lVFbm81n.js";
 import { a as isWireTurn, c as toolOutputByteLength, i as documentBlockMarker, l as toolResultToText, o as sanitizeToolResultMetadata, s as toolOutputBudgetByteLength, t as DEFAULT_AGENT_CLOCK } from "./types-BIarq1qE.js";
 import { i as styleReplacementForVia, n as resolveOldString, r as stripLineNumberPrefixes, t as describeVia } from "./edit-utils-EGosADZq.js";
-import { a as hydrateReadStateFromSessionAsync, c as readStateKey, l as resolveReadStateMap, n as getToolDedupState, o as markReadStateElided, r as hashContent, s as noteStaleRejection, t as getReadState, u as staleRefusalHint } from "./read-state-Dt7UbVsd.js";
+import { a as getReadState, d as noteStaleRejection, f as readStateKey, l as hydrateReadStateFromSessionAsync, m as staleRefusalHint, n as createToolStateController, o as getToolDedupState, p as resolveReadStateMap, s as hashContent, u as markReadStateElided } from "./tool-state-DTs-3ZHH.js";
 import { n as estimateTokens, r as utf8ByteLength } from "./utils-ngQzYzZD.js";
 import { t as buildContextBreakdown } from "./context-breakdown-Dzo25N45.js";
 import { a as formatDuration, c as previewLine, o as formatTaskStatus, s as formatTaskSummary } from "./format-BF745pLL.js";
@@ -14,11 +14,11 @@ import { C as stripShellInterpolations, O as validateResourcePathReal, S as inte
 import { n as writeFileAtomicAsync, t as writeFileAtomic } from "./atomic-write-B7zr1ddF.js";
 import { r as createLogger, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { n as reconcileImageMediaType } from "./media-sniff-UKijEaiQ.js";
-import { d as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-IaEpSauj.js";
-import { M as buildPromptMessage, N as canonicalizePrompt } from "./openai-compat-0MJq4-g9.js";
+import { d as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-3GXUBwur.js";
+import { M as buildPromptMessage, N as canonicalizePrompt } from "./openai-compat-B3c_hzwf.js";
 import { appendStaticSection, renderSystemForWire } from "./prompt.js";
-import { a as detectTurnInterruption, c as ensureToolResultPairing, l as filterUnresolvedToolUses, m as resolveContentRefsInMessages, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, p as remintDuplicateToolCallIds, s as ensureEndsWithUserMessage } from "./messages-D1EryrDs.js";
-import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-B40flcj7.js";
+import { a as detectTurnInterruption, c as ensureToolResultPairing, l as filterUnresolvedToolUses, m as resolveContentRefsInMessages, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, p as remintDuplicateToolCallIds, s as ensureEndsWithUserMessage } from "./messages-C01kKGj0.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-cr9VdoEO.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { a as withInactivityTimeout, i as settleWithinTimeout, n as linkAbortSignal, o as withTimeout$1, r as resolveTimeoutMs, t as OperationTimeoutError } from "./timeout-BDetbuN6.js";
 import { createRequire } from "node:module";
@@ -12514,6 +12514,53 @@ function buildToolHookBase(ctx, turnId, callId, name, displayName, input) {
 		...typeof ctx.depth === "number" ? { depth: ctx.depth } : {}
 	};
 }
+/**
+* Commit a settled call's staged tool state.
+*
+* A store failure must not kill the call: the tool body already ran and
+* already did its side effects, so rejecting here would swallow the
+* `tool_result` and fail the run on a bookkeeping write. The commit is
+* store-first (see `createToolStateController`), so a failure leaves neither
+* the store nor the in-memory snapshot claiming the write — the tool's state
+* write simply didn't happen.
+*
+* Reported UNCONDITIONALLY, not behind `ZIDANE_DEBUG`: a dropped state write is
+* a durable-persistence failure, and the consequence is precisely the class of
+* bug this state exists to prevent (a one-shot re-serving a payload it already
+* delivered, a cursor rewinding). The nearest precedent is the session store's
+* `updateRun` degradation in `agent.ts`, which also logs and continues. A
+* silent drop here would be indistinguishable from success.
+*
+* `tool-state:commit-failed` is the structured seam — it carries the ops that
+* did not land, so a host can alert or replay them. The stderr line is the
+* fallback for hosts that registered nothing; a handler setting `handled`
+* suppresses it. The hook itself is guarded: a throwing consumer must not take
+* down a dispatch path whose tool has already run.
+*/
+async function commitToolState(ctx, callId, toolName) {
+	if (!ctx.toolState) return;
+	const pending = ctx.toolState.pending(callId);
+	try {
+		await ctx.toolState.commit(callId);
+	} catch (err) {
+		ctx.toolState.discard(callId);
+		const error = err instanceof Error ? err : new Error(String(err));
+		const hookCtx = {
+			runId: ctx.runId,
+			callId,
+			toolName,
+			ops: pending,
+			error,
+			handled: false
+		};
+		try {
+			await ctx.hooks.callHook("tool-state:commit-failed", hookCtx);
+		} catch (hookErr) {
+			console.error("[zidane] tool-state:commit-failed handler threw; continuing:", hookErr);
+		}
+		if (!hookCtx.handled) console.error(`[zidane] tool state commit for ${toolName} (${callId}) failed; the write did NOT land, continuing:`, error);
+	}
+}
 async function executeSingleTool(ctx, call, turnId) {
 	const toolDef = ctx.tools[call.name];
 	const callId = call.id;
@@ -12677,6 +12724,7 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			...ctx.parentRunId !== void 0 ? { parentRunId: ctx.parentRunId } : {},
 			...ctx.session ? { session: ctx.session } : {},
 			...ctx.readState ? { readState: ctx.readState } : {},
+			...ctx.toolState ? { state: ctx.toolState.begin(callId) } : {},
 			...typeof ctx.depth === "number" ? { depth: ctx.depth } : {},
 			clock: ctx.clock,
 			reportOutcome: (outcome) => {
@@ -12731,7 +12779,10 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			isError = true;
 		} else {
 			const error = err instanceof Error ? err : new Error(String(err));
-			if (ctx.shouldRethrowToolError?.(error)) throw error;
+			if (ctx.shouldRethrowToolError?.(error)) {
+				ctx.toolState?.discard(callId);
+				throw error;
+			}
 			const errorCtx = {
 				...buildToolHookBase(ctx, turnId, callId, call.name, displayName, effectiveInput),
 				error
@@ -12741,6 +12792,7 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			isError = true;
 		}
 	}
+	await commitToolState(ctx, callId, call.name);
 	if (cancelledByUser) {
 		const reason = typeof perCallAbort.signal.reason === "string" ? perCallAbort.signal.reason : "cancelled-by-user";
 		await ctx.hooks.callHook("tool:cancelled", {
@@ -13081,6 +13133,7 @@ async function executeCustomToolBatch(ctx, toolCalls, turnId, executor) {
 			for (const start of starts) {
 				childCtx.toolCancels?.unregister(start.callId);
 				start.disposeSignal();
+				childCtx.toolState?.discard(start.callId);
 			}
 		}
 	};
@@ -13271,6 +13324,7 @@ async function startDurableToolExecution(ctx, call, turnId, index) {
 		...ctx.parentRunId !== void 0 ? { parentRunId: ctx.parentRunId } : {},
 		...ctx.session ? { session: ctx.session } : {},
 		...ctx.readState ? { readState: ctx.readState } : {},
+		...ctx.toolState ? { state: ctx.toolState.begin(callId) } : {},
 		...typeof ctx.depth === "number" ? { depth: ctx.depth } : {},
 		clock: ctx.clock,
 		reportOutcome: (outcome) => {
@@ -13297,6 +13351,7 @@ async function startDurableToolExecution(ctx, call, turnId, index) {
 	};
 }
 async function completeDurableToolExecution(ctx, start, output) {
+	await commitToolState(ctx, start.callId, start.name);
 	const reportedOutcome = start.reportedOutcome();
 	const emitted = await emitToolResult(ctx, {
 		turnId: start.turnId,
@@ -13318,7 +13373,11 @@ async function completeDurableToolExecution(ctx, start, output) {
 	};
 }
 async function failDurableToolExecution(ctx, start, err, cancelMessage) {
-	if (ctx.shouldRethrowToolError?.(err)) throw err;
+	if (ctx.shouldRethrowToolError?.(err)) {
+		ctx.toolState?.discard(start.callId);
+		throw err;
+	}
+	await commitToolState(ctx, start.callId, start.name);
 	const isAbortError = err instanceof Error && err.name === "AbortError";
 	if (isAbortError && start.perCallAbort.signal.aborted) {
 		const reason = typeof start.perCallAbort.signal.reason === "string" ? start.perCallAbort.signal.reason : "cancelled-by-user";
@@ -13848,6 +13907,7 @@ const HOOK_EVENT_SET = /* @__PURE__ */ new Set([
 	"tool:cancelled",
 	"tool:transform",
 	"tool:unknown",
+	"tool-state:commit-failed",
 	"validation:reject",
 	"validation:coerce",
 	"context:transform",
@@ -14661,12 +14721,13 @@ function warnContextContributorFailureOnce(contributor, err) {
 	process.stderr.write(`[zidane/agent] context breakdown contributor failed${owner}: ${errorMessage(err)}\n`);
 }
 function createAgent(rawOptions) {
-	const { provider: providerOption, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, handle: injectedHandle, mcpServers, session, readState: agentReadState, skills: agentSkills, mcpConnector, mcpToolWrap, eager, hooks: initialHooks, clock: agentClock, toolKill, contextBreakdownSections, runTransforms, behaviorTransforms, toolCatalogTransforms, mcpConfigTransforms, skillPolicies, toolResultMetadata } = foldExtensionRegistry(rawOptions);
+	const { provider: providerOption, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, handle: injectedHandle, mcpServers, session, readState: agentReadState, toolState: toolStateStore, skills: agentSkills, mcpConnector, mcpToolWrap, eager, hooks: initialHooks, clock: agentClock, toolKill, contextBreakdownSections, runTransforms, behaviorTransforms, toolCatalogTransforms, mcpConfigTransforms, skillPolicies, toolResultMetadata } = foldExtensionRegistry(rawOptions);
 	const providers = normalizeProviders(providerOption);
 	const provider = providers[0];
 	const hooks = createHooks();
 	const executionContext = execution ?? createProcessContext();
 	const sourceTools = agentTools ?? {};
+	const toolStateController = createToolStateController(toolStateStore);
 	if (initialHooks) for (const [event, handler] of Object.entries(initialHooks)) {
 		if (!isKnownHookEvent(event)) throw new Error(`Unknown hook event "${event}" passed to createAgent(). See AgentHooks for valid events.`);
 		const handlerList = Array.isArray(handler) ? handler : [handler];
@@ -15294,6 +15355,7 @@ function createAgent(rawOptions) {
 				...compactKeepTurns !== void 0 ? { compactKeepTurns } : {}
 			});
 			try {
+				await toolStateController.hydrate();
 				const stats = await runLoop({
 					provider: runProvider,
 					targets,
@@ -15342,6 +15404,7 @@ function createAgent(rawOptions) {
 					...modelCatalog !== void 0 ? { modelCatalog } : {},
 					...session ? { session } : {},
 					...agentReadState ? { readState: agentReadState } : {},
+					toolState: toolStateController,
 					...options.parentRunId ? { parentRunId: options.parentRunId } : {},
 					depth: runDepth,
 					thinkingBudget,
@@ -15963,4 +16026,4 @@ function createAgent(rawOptions) {
 //#endregion
 export { removeInstalledExtension as $, readKeybindings as $t, NO_TOOLS_PREAMBLE as A, looksBinary as At, stripImagesFromTurns as B, validateToolArgs as Bt, resolveTasksDir as C, shouldAutoCompact as Cn, createSkillsRunScriptTool as Ct, selectRecentFiles as D, stableStringify as Dn, shell as Dt, selectFilesFromSession as E, normalizeShellCommand as En, createShellTool as Et, buildTailCompactPrompt as F, listFiles as Ft, EMPTY_EXTENSION_REGISTRY as G, KEYBINDING_KEY_COL_WIDTH as Gt, truncateHeadForPtlRetry as H, DEFAULT_KEYBINDINGS as Ht, buildUpToCompactPrompt as I, createInteractionTool as It, fetchExtensionSource as J, groupBindings as Jt, createExtensionPromptBridge as K, ensureKeybindingsFile as Kt, ANCHOR_PREVIEW_MAX_CHARS as L, grep as Lt, buildCompactPrompt as M, createModelSearchTool as Mt, buildFromCompactPrompt as N, formatModelLine as Nt, compactConversation as O, tailTruncate as Ot, buildFullCompactPrompt as P, matchModelEntries as Pt, readExtensionInstallProvenance as Q, parseBindingSpec as Qt, anchorPreviewFor as R, glob as Rt, resolveSessionDir as S, effectiveContextWindow as Sn, createSkillsUseTool as St, selectFilesFromReadState as T, defaultRepeatGuardTracked as Tn, shellKill as Tt, CompactInvalidInputError as U, KEYBINDING_DEFS as Ut, summaryToTurn as V, resolveStorageDirs as Vt, CompactPromptTooLongError as W, KEYBINDING_DEF_BY_ACTION as Wt, listExtensionCandidates as X, matchesBinding as Xt, installExtensionFromSpec as Y, keybindingsPath as Yt, parseExtensionInstallSource as Z, mergeKeybindings as Zt, rehomePersistedStubs as _, resolveExtensionConfigValue as _n, WAIT_TASK_TIMED_OUT_PREFIX as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, defaultExtensionScanPaths as an, composeExtensionPreset as at, resolveMcpWarningsDir as b, AUTO_COMPACT_MIN_GROWTH_FRACTION as bn, createSpawnTool as bt, applyCompactSummaryCutoff as c, isExtensionDefinition as cn, mergeContributions as ct, PERSISTED_STUB_PREFIX as d, defineExtension as dn, createWorkspaceSurface as dt, readKeybindingsRaw as en, updateInstalledExtension as et, PERSISTENCE_PREVIEW_BYTES as f, clampExtensionConfigNumber as fn, composePresets as ft, migrateSessionArtifactDirs as g, resolveExtensionConfig as gn, writeFile$1 as gt, maybePersistToolResult as h, isValidExtensionConfigValue as hn, basic_default as ht, INTERRUPT_MESSAGE_FOR_TOOL_USE as i, ENTRY_CANDIDATES as in, buildExtensionRegistry as it, TRAILER as j, multiEdit as jt, BASE_INSTRUCTIONS as k, readFile$1 as kt, collectNewlyStaleReadPaths as l, parseExtensionScanPathEnv as ln, partitionExtensionCatalog as lt, cleanupPersistedSession as m, isValidExtensionConfigItem as mn, basicTools as mt, normalizeProviders as n, stripJsonComments as nn, discoverAndBuildExtensionRegistry as nt, TOOL_USE_CANCELLED_MESSAGE as o, discoverExtensions as on, disposeExtensionRegistry as ot, buildPersistedStub as p, coerceExtensionConfigInput as pn, definePreset as pt, ExtensionInstallError as q, formatBindingForDisplay as qt, resolveModelTargets as r, registerExtensionHostModules as rn, buildExtensionPreset as rt, TOOL_USE_SKIPPED_MESSAGE as s, inlineLoadedExtension as sn, filterExtensionRegistry as st, createAgent as t, resolveExtensionKeybindings as tn, createExtensionHud as tt, renderStaleReadNotice as u, scanExtensionDirectories as un, createExtensionHostRuntimeBridge as ut, resolveLegacyPersistDir as v, sanitizeExtensionConfigActionPatch as vn, waitTask as vt, buildPostCompactAttachments as w, defaultRepeatGuardNormalize as wn, createSkillsReadTool as wt, resolvePersistDir as x, OUTPUT_RESERVE_TOKENS as xn, isSpawnTool as xt, resolveLegacySessionDir as y, toWireConfigSchema as yn, createToolSearchTool as yt, sliceForCompaction as z, edit as zt };
 
-//# sourceMappingURL=agent-BMJKrD84.js.map
+//# sourceMappingURL=agent-8sUadp5M.js.map