zidane 6.2.22 → 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-IPshmLIF.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-Cwp_Y78H.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-BDtxt4FY.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-Cwp_Y78H.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-IPshmLIF.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-DzrXKLw-.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",
@@ -4878,9 +4880,32 @@ const CHILD_MUTABLE_EVENT_NAME = {
 	"tool:transform": "child:tool:transform"
 };
 const sessionChildCounters = /* @__PURE__ */ new WeakMap();
+/** Chronological child runs (depth > 0) — index + 1 is the `child-N` label. */
+function childRunsOf(session) {
+	return session.runs.filter((r) => (r.depth ?? 0) > 0);
+}
+/**
+* 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) => `- ${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}`;
@@ -5213,6 +5238,10 @@ function buildSpawnTool(options, state) {
 		type: "string",
 		description: buildModelFieldDescription(modelCatalog)
 	} } : {};
+	const resumeProperty = options.persist ? { resume: {
+		type: "string",
+		description: "Child label of a prior stopped/failed sub-agent to resume (e.g. \"child-2\", as reported in its result header). The new run is seeded with that child's full prior conversation; `task` becomes the continuation instruction instead of a fresh task. Only terminal children (aborted / timed out / errored / completed) can be resumed."
+	} } : {};
 	const tool = {
 		maxConcurrent,
 		get children() {
@@ -5245,7 +5274,7 @@ function buildSpawnTool(options, state) {
 		isConcurrencySafe: true,
 		spec: {
 			name: "spawn",
-			description: `Spawn a sub-agent for a self-contained task that benefits from isolation (separate context window, separate retries) — for example, a deep research dive or a long codegen pass on a specific file. The sub-agent inherits your tool set (including \`spawn\` itself, depth-capped) and your system prompt unless overridden, runs independently, and returns its final response. Do NOT spawn for sequential steps you could do yourself.${modelCatalog ? " Children can run on a DIFFERENT model via the `model` field — cost-tier your delegation: mechanical, parallelizable, or high-volume search work belongs on cheaper/faster models, while synthesis and judgment stay on your own model." : ""}`,
+			description: `Spawn a sub-agent for a self-contained task that benefits from isolation (separate context window, separate retries) — for example, a deep research dive or a long codegen pass on a specific file. The sub-agent inherits your tool set (including \`spawn\` itself, depth-capped) and your system prompt unless overridden, runs independently, and returns its final response. Do NOT spawn for sequential steps you could do yourself.${modelCatalog ? " Children can run on a DIFFERENT model via the `model` field — cost-tier your delegation: mechanical, parallelizable, or high-volume search work belongs on cheaper/faster models, while synthesis and judgment stay on your own model." : ""}${options.persist ? " A stopped or failed sub-agent can be CONTINUED instead of restarted: pass `resume` with its child label (e.g. \"child-2\") and put the continuation instruction in `task` — the child picks up with its prior conversation intact." : ""}`,
 			inputSchema: {
 				type: "object",
 				properties: {
@@ -5258,7 +5287,8 @@ function buildSpawnTool(options, state) {
 						description: "Optional system prompt override for this specific sub-agent. REPLACES the entire inherited system prompt — identity, doctrine, and environment info (cwd, platform, date) are all lost. Prefer omitting this and putting specialization in `task`; if you do override, restate the working directory and any constraints the child must keep."
 					},
 					...subagentTypeProperty,
-					...modelProperty
+					...modelProperty,
+					...resumeProperty
 				},
 				required: ["task"]
 			}
@@ -5296,6 +5326,47 @@ function buildSpawnTool(options, state) {
 			const inheritedModel = childProvider === ctx.provider ? ctx.model : void 0;
 			const childModel = chosenModelId ?? inheritedModel;
 			const announcedModel = childModel ?? childProvider.meta.defaultModel;
+			let resumeRun;
+			let resumeLabel;
+			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",
+					text: "",
+					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);
+				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: ${runLabel} is still running. Only terminal children (aborted / error / completed) can be resumed.`
+				};
+				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: ${runLabel} has no persisted turns (it likely failed before producing anything). Spawn a fresh child with a full task instead.`
+				};
+				resumeRun = run;
+				resumeLabel = runLabel;
+			}
 			const parentDepth = ctx.depth ?? 0;
 			const childDepth = parentDepth + 1;
 			if (childDepth > maxDepth) return {
@@ -5370,6 +5441,7 @@ function buildSpawnTool(options, state) {
 				const spawnHookCtx = {
 					id,
 					task,
+					...resumeLabel !== void 0 ? { resumesChildId: resumeLabel } : {},
 					depth: childDepth,
 					model: announcedModel,
 					provider: childProvider.name,
@@ -5386,6 +5458,8 @@ 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 } : {}
 				});
 				try {
@@ -9902,6 +9976,23 @@ function applyMediaAgeout(messages, keep, options) {
 	};
 }
 /**
+* Distinct `read_file` paths called inside the given turns (optionally
+* filtered to an id set). Canonical tool names — the alias rewrite is
+* wire-only, so session turns always carry `read_file` verbatim.
+*/
+function readFilePathsInTurns(turns, ids) {
+	const paths = /* @__PURE__ */ new Set();
+	for (const turn of turns) {
+		if (ids && !ids.has(turn.id)) continue;
+		for (const block of turn.content) {
+			if (block.type !== "tool_call" || block.name !== "read_file") continue;
+			const path = block.input.path;
+			if (typeof path === "string" && path.length > 0) paths.add(path);
+		}
+	}
+	return [...paths];
+}
+/**
 * Build a call_id → file path map for `read_file` tool calls in `messages`.
 * Tail compaction uses it to learn which stubbed `tool_result`s were file
 * reads, so their read-state dedup can be invalidated. Resolve this from the
@@ -10546,8 +10637,9 @@ async function repairInvalidAnthropicThinkingHistory(ctx, streamOptions, repair)
 	}
 	return Math.max(removed, sessionRemoved);
 }
-async function streamWithWatchdogs(ctx, options, callbacks, turnId) {
-	const { startTimeoutMs, totalTimeoutMs } = providerWatchdogTimeouts(ctx);
+async function streamWithWatchdogs(ctx, options, callbacks, turnId, opts) {
+	let { startTimeoutMs, totalTimeoutMs } = providerWatchdogTimeouts(ctx);
+	if (opts?.startTimeoutCapMs !== void 0 && startTimeoutMs > 0) startTimeoutMs = Math.min(startTimeoutMs, opts.startTimeoutCapMs);
 	const callerHistoryRepair = callbacks.onHistoryRepair;
 	callbacks = {
 		...callbacks,
@@ -10711,6 +10803,18 @@ const RETRY_DEFAULTS = {
 	maxDelayMs: 3e4
 };
 /**
+* First-response watchdog cap for RETRY attempts (attempt ≥ 2). The first
+* attempt gets the full `providerStreamStartTimeoutMs` window (large-prompt
+* prefill legitimately takes a while on a cold request), but a healthy
+* re-issue — fired after backoff already waited out any declared
+* rate-limit window — either starts streaming quickly or is dead. Without
+* the cap, retrying watchdog timeouts multiplies worst-case silent latency
+* (3 × 5 min for the defaults) and a stuck provider blocks a whole /ticket
+* stage for that long. Only applied when the start watchdog is enabled —
+* an explicit `0` (disabled) stays disabled on retries too.
+*/
+const RETRY_STREAM_START_TIMEOUT_CAP_MS = 12e4;
+/**
 * Reactive context-overflow recovery schedule. When a turn is rejected with
 * `context_exceeded` (pre-stream — the request was too big for the model's
 * window), the loop emergency-compacts older `tool_result` bodies via
@@ -10862,6 +10966,9 @@ async function maybeAutoCompact(ctx, turn, lastTurnUsage, state) {
 		}
 		ctx.turns.push(summaryTurn, ...restorationTurns);
 		await ctx.persistTurns?.();
+		const absorbedIds = /* @__PURE__ */ new Set([...result.summarizedTurnIds, ...result.droppedDueToPtl]);
+		const onWireReads = new Set(readFilePathsInTurns(applyCompactSummaryCutoff(ctx.turns)));
+		markReadStateForElidedPaths(ctx, ctx.handle.cwd, readFilePathsInTurns(ctx.turns, absorbedIds).filter((p) => !onWireReads.has(p)));
 		const effectiveTokens = (result.usage.output ?? 0) + restorationTokens;
 		state.lastCompactedInputTokens = effectiveTokens;
 		state.consecutiveFailures = 0;
@@ -11151,7 +11258,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 				onOAuthRefresh(refreshCtx) {
 					return ctx.hooks.callHook("oauth:refresh", refreshCtx);
 				}
-			}, turnId);
+			}, turnId, attempt > 1 ? { startTimeoutCapMs: RETRY_STREAM_START_TIMEOUT_CAP_MS } : void 0);
 			break;
 		} catch (caught) {
 			let terminalErr = caught;
@@ -11159,7 +11266,8 @@ async function executeTurn(ctx, turn, priorUsage) {
 			const classified = !wasAborted ? ctx.provider.classifyError?.(caught) : null;
 			const isRetryable = classified?.kind === "provider_error" && classified.retryable === true;
 			const cleanSlate = currentText === "" && currentThinking === "";
-			const canRetry = !wasAborted && isRetryable && cleanSlate && attempt < retryCfg.maxAttempts;
+			const isStreamWatchdogTimeout = !wasAborted && caught instanceof OperationTimeoutError && (caught.operation === "provider first response" || caught.operation === "provider total stream");
+			const canRetry = !wasAborted && (isRetryable || isStreamWatchdogTimeout) && cleanSlate && attempt < retryCfg.maxAttempts;
 			const retryAfterMs = canRetry ? extractRetryAfterMs(caught) : void 0;
 			const hasNextTarget = ctx.targets !== void 0 && (ctx.activeTargetIndex ?? 0) + 1 < ctx.targets.length;
 			if (canRetry && !(retryAfterMs !== void 0 && retryAfterMs > LONG_RETRY_AFTER_FALLBACK_MS && hasNextTarget)) {
@@ -11169,6 +11277,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 					turnId,
 					attempt,
 					nextAttempt: attempt + 1,
+					maxAttempts: retryCfg.maxAttempts,
 					delayMs,
 					err: caught,
 					...meta
@@ -12908,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",
@@ -13387,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;
@@ -13436,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 {}
 	});
 }
@@ -13851,6 +13961,12 @@ function createAgent(rawOptions) {
 		const targets = resolveModelTargets(providers, options.model);
 		const runProvider = targets[0].provider;
 		const resumeFilteredTurns = validateAndPrepareResume(session, options.prompt, pendingTaskNotifications.size > 0);
+		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");
+			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;
 		const externalSignal = options.signal;
@@ -13870,7 +13986,9 @@ function createAgent(rawOptions) {
 			const promptLabel = typeof options.prompt === "string" ? options.prompt : Array.isArray(options.prompt) ? options.prompt.filter((p) => p.type === "text").map((p) => p.text).join("\n") : "";
 			session?.startRun(runId, promptLabel, {
 				...options.parentRunId ? { parentRunId: options.parentRunId } : {},
-				depth: typeof options.depth === "number" ? options.depth : 0
+				depth: typeof options.depth === "number" ? options.depth : 0,
+				...options.resumeRunId ? { resumedFromRunId: options.resumeRunId } : {},
+				...options.runLabel ? { label: options.runLabel } : {}
 			});
 			const sessionRun = session?.runs.find((r) => r.id === runId);
 			if (sessionRun) sessionRun.startedAt = runStartedAt;
@@ -13929,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;
@@ -14096,15 +14221,22 @@ function createAgent(rawOptions) {
 				});
 			}
 			const turns = [];
-			if (session && session.turns.length > 0 && (session.runs.length > 0 || !options.prompt) && !options.parentRunId) {
+			const isResume = session && session.turns.length > 0 && (session.runs.length > 0 || !options.prompt) && !options.parentRunId && !options.resumeRunId;
+			let seededTurns;
+			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));
-				const filteredForRuntime = resumeFilteredTurns && resumed === session.turns ? resumeFilteredTurns : filterUnresolvedToolUses(resumed);
-				turns.push(...filteredForRuntime);
+				seededTurns = resumeFilteredTurns && resumed === session.turns ? resumeFilteredTurns : filterUnresolvedToolUses(resumed);
+			}
+			if (seededTurns) {
+				turns.push(...seededTurns);
 				if (shouldInjectToolSearch && disclosure.lazyEntries.length > 0) {
 					const resolvedCallIds = /* @__PURE__ */ new Set();
-					for (const turn of filteredForRuntime) for (const block of turn.content) if (block.type === "tool_result" && !block.isError) resolvedCallIds.add(block.callId);
-					for (const turn of filteredForRuntime) for (const block of turn.content) {
+					for (const turn of seededTurns) for (const block of turn.content) if (block.type === "tool_result" && !block.isError) resolvedCallIds.add(block.callId);
+					for (const turn of seededTurns) for (const block of turn.content) {
 						if (block.type !== "tool_call") continue;
 						if (block.name !== "tool_search") continue;
 						if (!resolvedCallIds.has(block.id)) continue;
@@ -14970,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-IPshmLIF.js.map
+//# sourceMappingURL=agent-tLfGSSQw.js.map