zidane 6.3.7 → 6.3.9

package/dist/acp.d.ts

@@ -1,5 +1,5 @@
 import { c as ExecutionContext } from "./types-M2DauK2D.js";
-import { Km as ToolDef, Mm as ToolResultContent, Pp as AgentBehavior, Vm as TurnUsage, Wi as Agent, Zp as McpServerConfig, _m as SessionContentBlock, cm as PromptPart, dh as Session, hh as SessionStore, qi as AgentOptions, rf as Provider, t as Preset } from "./index-DTIe4e1R.js";
+import { Km as ToolDef, Mm as ToolResultContent, Pp as AgentBehavior, Vm as TurnUsage, Wi as Agent, Zp as McpServerConfig, _m as SessionContentBlock, cm as PromptPart, dh as Session, hh as SessionStore, qi as AgentOptions, rf as Provider, t as Preset } from "./index-DEqQQ8tN.js";
 import { Readable, Writable } from "node:stream";
 
 //#region src/acp/types.d.ts

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-CAX3tOEY.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-dthcOo20.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-Emjeo5Ad.js → agent-XcXGROHb.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 resolveReadStateMap, n as getToolDedupState, o as markReadStateElided, r as hashContent, s as readStateKey, t as getReadState } from "./read-state-CNyeMG7W.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 { 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,7 +14,7 @@ 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-8bEHU4WB.js";
+import { d as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-CzUy5luo.js";
 import { E as canonicalizePrompt, T as buildPromptMessage } from "./openai-compat-Bf9uMTMa.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-DoHRwMw-.js";
@@ -2877,6 +2877,7 @@ const edit = {
 			ctx.reportOutcome?.("failed");
 			return `Edit error: file not found: ${target}.${hint}`;
 		}
+		let drift = null;
 		if (ctx.behavior?.requireReadBeforeEdit) {
 			const readState = resolveReadStateMap(ctx);
 			if (readState) {
@@ -2884,23 +2885,26 @@ const edit = {
 				const prior = readState.get(absKey);
 				if (!prior) {
 					ctx.reportOutcome?.("failed");
-					return `Edit error: ${target} has not been read in this session. Call read_file first so the edit applies against the current contents.`;
-				}
-				if (prior.contentHash !== hashContent(original)) {
-					ctx.reportOutcome?.("failed");
-					return `Edit error: ${target} has changed on disk since the last read. Re-read the file before editing.`;
+					return `Edit error: ${target} has not been read in this session. Call read_file first so the edit applies against the current contents — reads through shell (cat, grep, sed) don't register.`;
 				}
+				if (prior.contentHash !== hashContent(original)) drift = {
+					readState,
+					absKey,
+					prior
+				};
 			}
 		}
 		const match = resolveOldString(original, find);
 		if (!match) {
-			const preview = nearestMatchPreview(original, find);
 			ctx.reportOutcome?.("failed");
+			if (drift) return staleEditRefusal(target, drift);
+			const preview = nearestMatchPreview(original, find);
 			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) {
 			ctx.reportOutcome?.("failed");
+			if (drift) return staleEditRefusal(target, drift);
 			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);
@@ -2918,15 +2922,24 @@ const edit = {
 				...prior,
 				contentHash: hashContent(updated),
 				mtimeMs: Date.now(),
-				elided: true
+				elided: true,
+				staleRejections: 0
 			});
 		}
 		ctx.reportOutcome?.("edited");
 		const viaNote = via === "exact" ? "" : ` (old_string was not found verbatim; matched via ${describeVia(via)})`;
-		return `Edited ${target}: replaced ${occurrences} occurrence${occurrences === 1 ? "" : "s"}.${viaNote}`;
+		return `Edited ${target}: replaced ${occurrences} occurrence${occurrences === 1 ? "" : "s"}.${viaNote}${drift ? ` Note: the file had changed on disk since your last read — old_string still anchored cleanly, but re-read before further edits.` : ""}`;
 	}
 };
 /**
+* Drift refusal for `edit`: records the rejection against the read-state
+* entry so consecutive refusals escalate from "re-read the file" to naming
+* the external-writer hypothesis — see {@link staleRefusalHint}.
+*/
+function staleEditRefusal(target, drift) {
+	return `Edit error: ${target} has changed on disk since the last read. Re-read the file before editing.${staleRefusalHint(noteStaleRejection(drift.readState, drift.absKey, drift.prior))}`;
+}
+/**
 * Find the line that shares the longest common prefix with the needle's first
 * line. Cheap heuristic — better than nothing for the common "model has a typo"
 * case (off-by-one indent, trailing whitespace, escape mismatch).
@@ -3619,6 +3632,7 @@ const multiEdit = {
 			ctx.reportOutcome?.("failed");
 			return `multi_edit error: file not found: ${target}.${hint}`;
 		}
+		let drift = null;
 		if (ctx.behavior?.requireReadBeforeEdit) {
 			const readState = resolveReadStateMap(ctx);
 			if (readState) {
@@ -3626,12 +3640,13 @@ const multiEdit = {
 				const prior = readState.get(absKey);
 				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.`;
+					return `multi_edit error: ${target} has not been read in this session. Call read_file first so the edits apply against the current contents — reads through shell (cat, grep, sed) don't register.`;
 				}
+				if (prior.contentHash !== hashContent(current)) drift = {
+					readState,
+					absKey,
+					prior
+				};
 			}
 		}
 		const outcomes = [];
@@ -3698,10 +3713,14 @@ const multiEdit = {
 					...prior,
 					contentHash: hashContent(current),
 					mtimeMs: Date.now(),
-					elided: true
+					elided: true,
+					staleRejections: 0
 				});
 			}
-		} else ctx.reportOutcome?.("failed");
+		} else {
+			ctx.reportOutcome?.("failed");
+			if (drift) return `multi_edit error: ${target} has changed on disk since the last read. Re-read the file before editing.${staleRefusalHint(noteStaleRejection(drift.readState, drift.absKey, drift.prior))}`;
+		}
 		const n = steps.length;
 		let header;
 		if (appliedCount === n) header = `Edited ${target}: applied ${n} edit${n === 1 ? "" : "s"} (${totalReplacements} replacement${totalReplacements === 1 ? "" : "s"}).`;
@@ -3713,6 +3732,7 @@ const multiEdit = {
 			if (o.kind === "failed") failureLines.push(`edit #${i + 1} failed: ${o.reason}`);
 		}
 		const parts = [header];
+		if (drift && appliedCount > 0) parts.push(`Note: the file had changed on disk since your last read — the applied edits anchored cleanly against the current content, but re-read before further edits.`);
 		if (viaNotes.length > 0) parts.push(viaNotes.join("\n"));
 		if (failureLines.length > 0) parts.push(failureLines.join("\n"));
 		if (failedCount > 0) parts.push(annotationFor(outcomes));
@@ -15918,4 +15938,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-Emjeo5Ad.js.map
+//# sourceMappingURL=agent-XcXGROHb.js.map