zidane 6.2.23 → 6.2.24

package/dist/acp-cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Ft as resolveStorageDirs, lt as basic_default } from "./agent-BSIMsEtD.js";
+import { Ft as resolveStorageDirs, lt as basic_default } from "./agent-tLfGSSQw.js";
 import { r as createProcessContext } from "./contexts-A4ep-iJs.js";
 import { createSandboxContext } from "./contexts/sandbox.js";
 import { m as openaiCompat } from "./openai-compat-pHI0kBWH.js";
@@ -10,7 +10,7 @@ import { cerebras } from "./providers/cerebras.js";
 import { t as xai } from "./xai-BwhzoehX.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-B7wH6LhE.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-CTn1kFvP.js";
 import { f as credKeyOf, i as readCredentials, l as BUILTIN_PROVIDERS, r as credentialsPath, t as detectAuth, y as modelsForDescriptor } from "./auth-CpdQebUy.js";
 import { createDaytonaProvider } from "./contexts/daytona.js";
 import { createDockerContext } from "./contexts/docker.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { $p as Provider, Li as AgentOptions, Md as AgentBehavior, Pf as TurnUsage, Pi as Agent, Tf as ToolResultContent, if as PromptPart, pf as SessionContentBlock, qd as McpServerConfig, rp as Session, sp as SessionStore, t as Preset, zf as ToolDef } from "./index-Bv9qhj4n.js";
+import { Li as AgentOptions, Md as AgentBehavior, Pf as TurnUsage, Pi as Agent, Tf as ToolResultContent, em as Provider, if as PromptPart, pf as SessionContentBlock, qd as McpServerConfig, rp as Session, sp as SessionStore, t as Preset, zf as ToolDef } from "./index-8zm_hwdY.js";
 import { c as ExecutionContext } from "./types-BDccavwj.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-B7wH6LhE.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-CTn1kFvP.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-BSIMsEtD.js → agent-tLfGSSQw.js}

@@ -9,16 +9,16 @@ import { c as parseGitLsFiles, r as isOutputExceededMessage, s as GIT_LS_FILES_C
 import { n as alwaysQuote, r as shellQuote } from "./exec-file-size-PXkr-MGA.js";
 import { r as createProcessContext, t as resolveDetachedTasksCapability } from "./contexts-A4ep-iJs.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-DJUxZg9b.js";
-import { C as stripShellInterpolations, O as validateResourcePathReal, S as interpolateShellCommands, _ as lastLine, b as resolveSubdirRoot, d as installAllowedToolsGate, f as createSkillActivationState, g as fetchInstallSource, h as defaultWhich, j as projectUserPaths, l as buildCatalog, m as defaultExec, p as InstallSourceError, t as resolveSkills, v as parseInstallSource, x as escapeXml, y as resolveNpmVersion } from "./resolve-x5mlFtLX.js";
+import { C as stripShellInterpolations, O as validateResourcePathReal, S as interpolateShellCommands, _ as lastLine, b as resolveSubdirRoot, d as installAllowedToolsGate, f as createSkillActivationState, g as fetchInstallSource, h as defaultWhich, j as projectUserPaths, l as buildCatalog, m as defaultExec, p as InstallSourceError, t as resolveSkills, v as parseInstallSource, x as escapeXml, y as resolveNpmVersion } from "./resolve-BPTA1RpX.js";
 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-Bn76JxAu.js";
 import { c as wrapDiscoveredMcpTools, i as nonOwningMcpView, n as connectMcpServers, r as deriveMcpToolMeta } from "./mcp-H6bqyM94.js";
-import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { C as canonicalizePrompt, S as buildPromptMessage } from "./openai-compat-pHI0kBWH.js";
 import { appendStaticSection, renderSystemForWire } from "./prompt.js";
 import { a as detectTurnInterruption, c as filterUnresolvedToolUses, d as remintDuplicateToolCallIds, f as resolveContentRefsInMessages, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, o as ensureEndsWithUserMessage, s as ensureToolResultPairing } from "./messages-CvHfYB7f.js";
-import { a as getExtensionSessionState, c as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as setExtensionSessionState } from "./session-Dbvz1ZUE.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-jLsc_kMH.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";
 import { basename, delimiter, dirname, isAbsolute, join, resolve, sep } from "node:path";
@@ -4838,6 +4838,7 @@ const BUBBLED_EVENTS = [
 	"stream:error",
 	"stream:server_tool_use",
 	"stream:server_tool_result",
+	"stream:retry",
 	"tool:dispatched",
 	"tool:before",
 	"tool:after",
@@ -4861,6 +4862,7 @@ const CHILD_EVENT_NAME = {
 	"stream:error": "child:stream:error",
 	"stream:server_tool_use": "child:stream:server_tool_use",
 	"stream:server_tool_result": "child:stream:server_tool_result",
+	"stream:retry": "child:stream:retry",
 	"tool:dispatched": "child:tool:dispatched",
 	"tool:before": "child:tool:before",
 	"tool:after": "child:tool:after",
@@ -4883,19 +4885,27 @@ function childRunsOf(session) {
 	return session.runs.filter((r) => (r.depth ?? 0) > 0);
 }
 /**
-* Human/model-facing list of this session's child runs, labeled the same
-* way `reserveChildLabel` numbers them (chronological order of depth > 0
-* runs). Rendered into resume-rejection messages so the model can
-* self-correct with a valid label.
+* Human/model-facing list of this session's child runs. Prefers the label
+* persisted at `startRun` (`SessionRun.label`) and falls back to positional
+* numbering for legacy sessions recorded before labels were stored.
+* Rendered into resume-rejection messages so the model can self-correct
+* with a valid label.
 */
 function describeChildRuns(session) {
 	const childRuns = childRunsOf(session);
 	if (childRuns.length === 0) return "No child runs exist in this session.";
-	return childRuns.map((r, i) => `- child-${i + 1} · ${r.status} · ${r.prompt.slice(0, 80)}`).join("\n");
+	return childRuns.map((r, i) => `- ${r.label ?? `child-${i + 1}`} · ${r.status} · ${r.prompt.slice(0, 80)}`).join("\n");
 }
 function reserveChildLabel(session) {
 	let counter = sessionChildCounters.get(session);
-	if (counter === void 0) counter = session.runs.filter((r) => (r.depth ?? 0) > 0).length;
+	if (counter === void 0) {
+		const childRuns = childRunsOf(session);
+		counter = childRuns.length;
+		for (const r of childRuns) {
+			const m = r.label ? /^child-(\d+)$/.exec(r.label) : null;
+			if (m) counter = Math.max(counter, Number(m[1]));
+		}
+	}
 	counter += 1;
 	sessionChildCounters.set(session, counter);
 	return `child-${counter}`;
@@ -5318,7 +5328,12 @@ function buildSpawnTool(options, state) {
 			const announcedModel = childModel ?? childProvider.meta.defaultModel;
 			let resumeRun;
 			let resumeLabel;
-			if (typeof input.resume === "string" && input.resume.trim() !== "") {
+			if (input.resume !== void 0 && input.resume !== null) {
+				if (typeof input.resume !== "string" || input.resume.trim() === "") return {
+					status: "rejected",
+					text: "",
+					message: `Cannot resume: invalid resume value ${JSON.stringify(input.resume)} — pass a child label like "child-2".`
+				};
 				const wanted = input.resume.trim();
 				if (!options.persist || !ctx.session) return {
 					status: "rejected",
@@ -5326,26 +5341,31 @@ function buildSpawnTool(options, state) {
 					message: "Cannot resume: resuming a sub-agent requires the spawn tool to be configured with persist: true and the parent to have a session — no prior child turns are stored here."
 				};
 				const childRuns = childRunsOf(ctx.session);
-				const labelMatch = /^child-(\d+)$/.exec(wanted);
-				const index = labelMatch ? Number(labelMatch[1]) - 1 : childRuns.findIndex((r) => r.id === wanted);
+				let index = childRuns.findIndex((r) => r.label === wanted);
+				if (index < 0) {
+					const labelMatch = /^child-(\d+)$/.exec(wanted);
+					index = labelMatch ? Number(labelMatch[1]) - 1 : childRuns.findIndex((r) => r.id === wanted);
+				}
 				const run = index >= 0 ? childRuns[index] : void 0;
 				if (!run) return {
 					status: "rejected",
 					text: "",
 					message: `Cannot resume: no child run matches "${wanted}". Child runs in this session:\n${describeChildRuns(ctx.session)}`
 				};
+				const runLabel = run.label ?? `child-${index + 1}`;
 				if (run.status === "running") return {
 					status: "rejected",
 					text: "",
-					message: `Cannot resume: child-${index + 1} is still running. Only terminal children (aborted / error / completed) can be resumed.`
+					message: `Cannot resume: ${runLabel} is still running. Only terminal children (aborted / error / completed) can be resumed.`
 				};
-				if (!ctx.session.turns.some((t) => t.runId === run.id)) return {
+				const chain = resumeChainRunIds(ctx.session.runs, run.id);
+				if (!ctx.session.turns.some((t) => t.runId !== void 0 && chain.has(t.runId))) return {
 					status: "rejected",
 					text: "",
-					message: `Cannot resume: child-${index + 1} has no persisted turns (it likely failed before producing anything). Spawn a fresh child with a full task instead.`
+					message: `Cannot resume: ${runLabel} has no persisted turns (it likely failed before producing anything). Spawn a fresh child with a full task instead.`
 				};
 				resumeRun = run;
-				resumeLabel = `child-${index + 1}`;
+				resumeLabel = runLabel;
 			}
 			const parentDepth = ctx.depth ?? 0;
 			const childDepth = parentDepth + 1;
@@ -5438,6 +5458,7 @@ function buildSpawnTool(options, state) {
 					signal: ctx.signal,
 					depth: childDepth,
 					...options.persist && ctx.runId ? { parentRunId: ctx.runId } : {},
+					...options.persist && ctx.session ? { runLabel: id } : {},
 					...resumeRun ? { resumeRunId: resumeRun.id } : {},
 					...propagatedTracing ? { tracingContext: propagatedTracing } : {}
 				});
@@ -11256,6 +11277,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 					turnId,
 					attempt,
 					nextAttempt: attempt + 1,
+					maxAttempts: retryCfg.maxAttempts,
 					delayMs,
 					err: caught,
 					...meta
@@ -12995,6 +13017,7 @@ const HOOK_EVENT_SET = /* @__PURE__ */ new Set([
 	"child:stream:server_tool_use",
 	"child:stream:server_tool_result",
 	"child:stream:error",
+	"child:stream:retry",
 	"child:tool:gate",
 	"child:mcp:tool:gate",
 	"child:tool:dispatched",
@@ -13474,10 +13497,10 @@ function installLazyDisclosureGate(hooks, lazyCanonicalNames, unlocked, discover
 * (`via: 'resume'`) for skills it newly activates. Shared by the run-start
 * resume rehydration and the mid-loop durable-replay gate below.
 */
-async function rehydrateActiveSkillsFromTurns(session, resolvedSkills, state, hooks) {
+async function rehydrateActiveSkillsFromTurns(turns, resolvedSkills, state, hooks) {
 	const skillsByName = new Map(resolvedSkills.map((s) => [s.name, s]));
 	const lastModeBySkill = /* @__PURE__ */ new Map();
-	for (const turn of session.turns) {
+	for (const turn of turns) {
 		if (turn.role !== "assistant") continue;
 		for (const block of turn.content) {
 			if (block.type !== "tool_call" || block.name !== "skills_use") continue;
@@ -13523,7 +13546,7 @@ function installSkillsActivationHydrationGate(hooks, deps) {
 		const skillName = typeof ctx.input?.name === "string" ? ctx.input.name : void 0;
 		if (!skillName || deps.state.isActive(skillName)) return;
 		try {
-			await rehydrateActiveSkillsFromTurns(session, resolvedSkills, deps.state, hooks);
+			await rehydrateActiveSkillsFromTurns(session.turns, resolvedSkills, deps.state, hooks);
 		} catch {}
 	});
 }
@@ -13941,7 +13964,8 @@ function createAgent(rawOptions) {
 		if (options.resumeRunId) {
 			if (!session) throw new Error("resumeRunId requires a session (the prior run's turns live there)");
 			if (!options.prompt) throw new Error("resumeRunId requires a prompt — pass the continuation instruction");
-			if (!session.turns.some((t) => t.runId === options.resumeRunId)) throw new Error(`resumeRunId "${options.resumeRunId}" has no persisted turns in this session — nothing to resume`);
+			const chain = resumeChainRunIds(session.runs, options.resumeRunId);
+			if (!session.turns.some((t) => t.runId !== void 0 && chain.has(t.runId))) throw new Error(`resumeRunId "${options.resumeRunId}" has no persisted turns in this session — nothing to resume`);
 		}
 		const clock = options.clock ?? agentClock ?? DEFAULT_AGENT_CLOCK;
 		let externalAbortListener;
@@ -13963,7 +13987,8 @@ function createAgent(rawOptions) {
 			session?.startRun(runId, promptLabel, {
 				...options.parentRunId ? { parentRunId: options.parentRunId } : {},
 				depth: typeof options.depth === "number" ? options.depth : 0,
-				...options.resumeRunId ? { resumedFromRunId: options.resumeRunId } : {}
+				...options.resumeRunId ? { resumedFromRunId: options.resumeRunId } : {},
+				...options.runLabel ? { label: options.runLabel } : {}
 			});
 			const sessionRun = session?.runs.find((r) => r.id === runId);
 			if (sessionRun) sessionRun.startedAt = runStartedAt;
@@ -14022,7 +14047,14 @@ function createAgent(rawOptions) {
 					});
 				}
 			});
-			if (resolvedSkills && session && session.turns.length > 0 && skillActivationState.active().length === 0) await rehydrateActiveSkillsFromTurns(session, resolvedSkills, skillActivationState, hooks);
+			if (resolvedSkills && session && session.turns.length > 0 && skillActivationState.active().length === 0) {
+				let rehydrationTurns = session.turns;
+				if (options.resumeRunId) {
+					const chain = resumeChainRunIds(session.runs, options.resumeRunId);
+					rehydrationTurns = session.turns.filter((t) => t.runId !== void 0 && chain.has(t.runId));
+				}
+				await rehydrateActiveSkillsFromTurns(rehydrationTurns, resolvedSkills, skillActivationState, hooks);
+			}
 			const thinking = options.thinking ?? "off";
 			const model = targets[0].model;
 			if (runProvider.meta?.clearsContextServerSide) resolvedBehavior.dedupReads = false;
@@ -14191,8 +14223,10 @@ function createAgent(rawOptions) {
 			const turns = [];
 			const isResume = session && session.turns.length > 0 && (session.runs.length > 0 || !options.prompt) && !options.parentRunId && !options.resumeRunId;
 			let seededTurns;
-			if (options.resumeRunId && session) seededTurns = filterUnresolvedToolUses(session.turns.filter((t) => t.runId === options.resumeRunId));
-			else if (isResume) {
+			if (options.resumeRunId && session) {
+				const chain = resumeChainRunIds(session.runs, options.resumeRunId);
+				seededTurns = filterUnresolvedToolUses(session.turns.filter((t) => t.runId !== void 0 && chain.has(t.runId)));
+			} else if (isResume) {
 				const childRunIds = childRunIdSet(session);
 				const resumed = childRunIds.size === 0 ? session.turns : session.turns.filter((t) => !t.runId || !childRunIds.has(t.runId));
 				seededTurns = resumeFilteredTurns && resumed === session.turns ? resumeFilteredTurns : filterUnresolvedToolUses(resumed);
@@ -15068,4 +15102,4 @@ function createAgent(rawOptions) {
 //#endregion
 export { composeExtensionPreset as $, discoverExtensions as $t, ANCHOR_PREVIEW_MAX_CHARS as A, createInteractionTool as At, ExtensionInstallError as B, ensureKeybindingsFile as Bt, NO_TOOLS_PREAMBLE as C, readFile$1 as Ct, buildFullCompactPrompt as D, formatModelLine as Dt, buildFromCompactPrompt as E, createModelSearchTool as Et, truncateHeadForPtlRetry as F, resolveStorageDirs as Ft, readExtensionInstallProvenance as G, mergeKeybindings as Gt, installExtensionFromSpec as H, groupBindings as Ht, CompactInvalidInputError as I, DEFAULT_KEYBINDINGS as It, createExtensionHud as J, readKeybindingsRaw as Jt, removeInstalledExtension as K, parseBindingSpec as Kt, CompactPromptTooLongError as L, KEYBINDING_DEFS as Lt, sliceForCompaction as M, glob as Mt, stripImagesFromTurns as N, edit as Nt, buildTailCompactPrompt as O, matchModelEntries as Ot, summaryToTurn as P, validateToolArgs as Pt, buildExtensionRegistry as Q, defaultExtensionScanPaths as Qt, EMPTY_EXTENSION_REGISTRY as R, KEYBINDING_DEF_BY_ACTION as Rt, BASE_INSTRUCTIONS as S, tailTruncate as St, buildCompactPrompt as T, multiEdit as Tt, listExtensionCandidates as U, keybindingsPath as Ut, fetchExtensionSource as V, formatBindingForDisplay as Vt, parseExtensionInstallSource as W, matchesBinding as Wt, discoverAndBuildExtensionRegistry as X, stripJsonComments as Xt, registerExtensionHostModules as Y, resolveExtensionKeybindings as Yt, buildExtensionPreset as Z, ENTRY_CANDIDATES as Zt, buildPostCompactAttachments as _, defaultRepeatGuardNormalize as _n, createSkillsRunScriptTool as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, clampExtensionConfigNumber as an, createWorkspaceSurface as at, selectRecentFiles as b, stableStringify as bn, createShellTool as bt, applyCompactSummaryCutoff as c, isValidExtensionConfigValue as cn, basicTools as ct, buildPersistedStub as d, sanitizeExtensionConfigActionPatch as dn, WAIT_TASK_TIMED_OUT_PREFIX as dt, inlineLoadedExtension as en, disposeExtensionRegistry as et, cleanupPersistedSession as f, toWireConfigSchema as fn, waitTask as ft, resolveTasksDir as g, shouldAutoCompact as gn, createSkillsUseTool as gt, resolvePersistDir as h, effectiveContextWindow as hn, isSpawnTool as ht, INTERRUPT_MESSAGE_FOR_TOOL_USE as i, defineExtension as in, createExtensionHostRuntimeBridge as it, anchorPreviewFor as j, grep as jt, buildUpToCompactPrompt as k, listFiles as kt, PERSISTED_STUB_PREFIX as l, resolveExtensionConfig as ln, basic_default as lt, resolveMcpWarningsDir as m, OUTPUT_RESERVE_TOKENS as mn, createSpawnTool as mt, normalizeProviders as n, parseExtensionScanPathEnv as nn, mergeContributions as nt, TOOL_USE_CANCELLED_MESSAGE as o, coerceExtensionConfigInput as on, composePresets as ot, maybePersistToolResult as p, AUTO_COMPACT_MIN_GROWTH_FRACTION as pn, createToolSearchTool as pt, updateInstalledExtension as q, readKeybindings as qt, resolveModelTargets as r, scanExtensionDirectories as rn, partitionExtensionCatalog as rt, TOOL_USE_SKIPPED_MESSAGE as s, isValidExtensionConfigItem as sn, definePreset as st, createAgent as t, isExtensionDefinition as tn, filterExtensionRegistry as tt, PERSISTENCE_PREVIEW_BYTES as u, resolveExtensionConfigValue as un, writeFile$1 as ut, selectFilesFromReadState as v, defaultRepeatGuardTracked as vn, createSkillsReadTool as vt, TRAILER as w, looksBinary as wt, compactConversation as x, shell as xt, selectFilesFromSession as y, normalizeShellCommand as yn, shellKill as yt, createExtensionPromptBridge as z, KEYBINDING_KEY_COL_WIDTH as zt };
 
-//# sourceMappingURL=agent-BSIMsEtD.js.map
+//# sourceMappingURL=agent-tLfGSSQw.js.map