zidane 7.0.30 → 7.0.32

package/dist/agent.d.ts

@@ -1,2 +1,2 @@
-import { $i as McpToolWrap, $r as RunSummaryTokens, A_ as hydrateReadStateFromSessionAsync, D_ as getReadState, E_ as ReadStateMap, Gr as RunSummary, Ji as AgentHookMap, Jr as RunSummaryByModel, Kr as RunSummaryBlock, M_ as resolveReadStateMap, Qi as McpToolMeta, Qr as RunSummaryRepeatGuard, T_ as ReadStateEntry, Xi as AgentOptions, Xr as RunSummaryCollectorOptions, Yi as AgentHooks, Yr as RunSummaryCollector, Zi as McpConnector, Zr as RunSummaryError, am as CacheBreakLoggerOptions, cm as CacheDimensionSnapshot, dm as fnv1a32, ea as createAgent, ei as RunSummaryValidation, fm as hashMessages, im as CacheBreakInfo, j_ as readStateKey, k_ as hydrateReadStateFromSession, lm as CacheDriftInfo, mm as snapshotCacheDimensions, om as CacheDimensionDiff, pm as installCacheBreakLogger, qi as Agent, qr as RunSummaryBudget, sm as CacheDimensionName, ti as createRunSummaryCollector, um as diffCacheDimensions, w_ as HydrateReadStateOptions } from "./index-C0y2tSgk.js";
+import { $i as McpToolMeta, $r as RunSummaryTokens, D_ as ReadStateEntry, E_ as HydrateReadStateOptions, Gr as RunSummary, Ji as AgentHookMap, Jr as RunSummaryByModel, Kr as RunSummaryBlock, M_ as hydrateReadStateFromSessionAsync, N_ as readStateKey, O_ as ReadStateMap, P_ as resolveReadStateMap, Qi as McpConnector, Qr as RunSummaryRepeatGuard, Xi as AgentOptions, Xr as RunSummaryCollectorOptions, Yi as AgentHooks, Yr as RunSummaryCollector, Zr as RunSummaryError, cm as CacheDimensionDiff, dm as CacheDriftInfo, ea as McpToolWrap, ei as RunSummaryValidation, fm as diffCacheDimensions, gm as snapshotCacheDimensions, hm as installCacheBreakLogger, j_ as hydrateReadStateFromSession, k_ as getReadState, lm as CacheDimensionName, mm as hashMessages, om as CacheBreakInfo, pm as fnv1a32, qi as Agent, qr as RunSummaryBudget, sm as CacheBreakLoggerOptions, ta as createAgent, ti as createRunSummaryCollector, um as CacheDimensionSnapshot } from "./index-CCB05-JZ.js";
 export { type Agent, type AgentHookMap, type AgentHooks, type AgentOptions, type CacheBreakInfo, type CacheBreakLoggerOptions, type CacheDimensionDiff, type CacheDimensionName, type CacheDimensionSnapshot, type CacheDriftInfo, type HydrateReadStateOptions, type McpConnector, type McpToolMeta, type McpToolWrap, type ReadStateEntry, type ReadStateMap, type RunSummary, type RunSummaryBlock, type RunSummaryBudget, type RunSummaryByModel, type RunSummaryCollector, type RunSummaryCollectorOptions, type RunSummaryError, type RunSummaryRepeatGuard, type RunSummaryTokens, type RunSummaryValidation, createAgent, createRunSummaryCollector, diffCacheDimensions, fnv1a32, getReadState, hashMessages, hydrateReadStateFromSession, hydrateReadStateFromSessionAsync, installCacheBreakLogger, readStateKey, resolveReadStateMap, snapshotCacheDimensions };

package/dist/agent.js

@@ -1,4 +1,4 @@
-import { ar as hydrateReadStateFromSessionAsync, ir as hydrateReadStateFromSession, nr as getReadState, or as readStateKey, sr as resolveReadStateMap, t as createAgent } from "./agent-BipX4BBj.js";
+import { ar as getReadState, cr as hydrateReadStateFromSessionAsync, lr as readStateKey, sr as hydrateReadStateFromSession, t as createAgent, ur as resolveReadStateMap } from "./agent-BCG9JcZl.js";
 import { a as snapshotCacheDimensions, i as installCacheBreakLogger, n as fnv1a32, r as hashMessages, t as diffCacheDimensions } from "./cache-telemetry-ehVdWsg2.js";
 import { t as createRunSummaryCollector } from "./run-summary-BU_NgwUT.js";
 export { createAgent, createRunSummaryCollector, diffCacheDimensions, fnv1a32, getReadState, hashMessages, hydrateReadStateFromSession, hydrateReadStateFromSessionAsync, installCacheBreakLogger, readStateKey, resolveReadStateMap, snapshotCacheDimensions };

package/dist/{approvals-staFZZ5o.js → approvals-DkwGBMZ9.js}

@@ -1,7 +1,7 @@
 import { n as __require } from "./rolldown-runtime-BhDjJH2R.js";
 import { n as THINKING_LEVELS, u as toolResultToText } from "./types-CWgENVLY.js";
-import { A as selectFilesFromSession, Cn as createDebugLog, D as resolveTasksDir, Dt as isSpawnTool, Et as createSpawnTool, G as summaryToTurn, Gn as renderArtifactRow, Gt as glob, Ht as listFiles, It as readFile$1, Jt as artifacts_default, Kt as edit, M as compactConversation, Mt as shellKill, O as buildPostCompactAttachments, Pt as shell, Rn as artifactKindLabel, Rt as multiEdit, St as writeFile$1, T as resolvePersistDir, Wt as grep, Xn as effectiveContextWindow, Y as EMPTY_EXTENSION_REGISTRY, Yn as OUTPUT_RESERVE_TOKENS, b as migrateSessionArtifactDirs, f as applyCompactSummaryCutoff, ft as filterRegistryPlugins, ln as readKeybindingsRaw, lt as composeExtensionPreset, on as mergeKeybindings, st as buildExtensionPreset, t as createAgent, un as resolveExtensionKeybindings, vt as composePresets, w as resolveMcpWarningsDir, wt as waitTask, yt as definePreset } from "./agent-BipX4BBj.js";
-import { F as parseCommandInvocation, M as commandBlocksToContent, P as executeCommand, c as SKILL_EDIT_METADATA_KEY, g as readSkillEditMarker, j as commandBlockToEvent, l as ZIDANE_EXTENSION_SKILL_NAME, m as extensionDirForCwd, s as EXTENSION_EDIT_METADATA_KEY, u as ZIDANE_SKILL_EDIT_SKILL_NAME, v as withZidaneExtensionSkill, w as generateStructuredData, y as withZidaneSkillEditSkill } from "./src-DzzhE2YO.js";
+import { $n as effectiveContextWindow, A as buildPostCompactAttachments, Bn as artifactKindLabel, Bt as multiEdit, D as resolvePersistDir, E as resolveMcpWarningsDir, Et as waitTask, It as shell, Jn as renderArtifactRow, Jt as edit, Kt as grep, M as selectFilesFromSession, Ot as createSpawnTool, P as compactConversation, Pt as shellKill, Qn as OUTPUT_RESERVE_TOKENS, Rt as readFile$1, S as migrateSessionArtifactDirs, Tn as createDebugLog, Wt as listFiles, Xt as artifacts_default, Z as EMPTY_EXTENSION_REGISTRY, bt as composePresets, cn as mergeKeybindings, dn as readKeybindingsRaw, dt as composeExtensionPreset, f as applyCompactSummaryCutoff, fn as resolveExtensionKeybindings, g as unwrapCallTool, k as resolveTasksDir, kt as isSpawnTool, lt as buildExtensionPreset, mt as filterRegistryPlugins, q as summaryToTurn, qt as glob, t as createAgent, wt as writeFile$1, xt as definePreset } from "./agent-BCG9JcZl.js";
+import { F as parseCommandInvocation, M as commandBlocksToContent, P as executeCommand, c as SKILL_EDIT_METADATA_KEY, g as readSkillEditMarker, j as commandBlockToEvent, l as ZIDANE_EXTENSION_SKILL_NAME, m as extensionDirForCwd, s as EXTENSION_EDIT_METADATA_KEY, u as ZIDANE_SKILL_EDIT_SKILL_NAME, v as withZidaneExtensionSkill, w as generateStructuredData, y as withZidaneSkillEditSkill } from "./src-CjkY6fBj.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { r as createProcessContext } from "./contexts-BSFQVclW.js";
 import { u as errorMessage$1 } from "./errors-DKiMrOKq.js";
@@ -9,7 +9,7 @@ import { L as projectUserPaths, R as findGitRoot$1, x as discoverSkills } from "
 import { t as writeFileAtomic } from "./atomic-write-B7zr1ddF.js";
 import { n as defaultPluginDataRoot, p as resolveStorageDirs, r as loadAgentPlugin } from "./plugins-B531Tz5b.js";
 import { r as createLogger, t as consoleSink } from "./logger--C1VQjwJ.js";
-import { h as McpOAuthProvider, l as normalizeMcpServers, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-BIWa57eY.js";
+import { h as McpOAuthProvider, l as normalizeMcpServers, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-CgNd-f3F.js";
 import { appendDynamicSection, joinSystemPrompt, splitSystemPrompt } from "./prompt.js";
 import { o as loadSession, t as createSession } from "./session-CVy-2mAy.js";
 import { n as flattenTurns, r as formatTokenUsage } from "./stats-DAKBEKjc.js";
@@ -18,11 +18,11 @@ import { i as findActiveTriggers, n as collectReferences, o as mergeSuggestions,
 import { p as sanitizeProviderDiagnosticMetadata } from "./anthropic-B4UmPm4H.js";
 import { r as fetchUrl } from "./fetch-url-ma-5_p0p.js";
 import { webSearch } from "./tools/web-search.js";
-import { A as chunkMarkdownForRender, At as MAIN_SESSION_TITLE, Bt as renderSessionEventXml, Ft as artifactsFromTurns, It as isMainSession, J as filterChainFallbacks, Lt as orchestratedBy, Nt as SESSION_ROLE_KEY, Pt as WORKER_REPORT_FRAGMENT, Qt as formatRunReceiptLine, Rt as parseSessionEventXml, St as promptTurnRefs, U as buildRunModel, Ut as sessionEventLabel, _n as mergeApprovalAndBodyOutcomes, bn as rewriteMultiEditHeader, dn as previewEditPayload, et as restoreChainFallbacks, hn as buildEditOutcomesAnnotation, jt as ORCHESTRATED_BY_KEY, kt as MAIN_PLAYBOOK_FRAGMENT, ln as extractEditPayload, m as ownerOf, nn as runReceiptFromRun, tn as hasRunReceipt, u as capTranscriptEvents, vn as parseEditOutcomesFromResult, wn as chatReferenceTokensFromText, xn as stripEditOutcomesAnnotation, yn as resolveApprovalForPayload, zt as renderProjectsBriefing } from "./turn-operations-BgqpLlOG.js";
-import { T as restoreModelOptions, b as modelSupportsReasoning, d as BUILTIN_PROVIDERS, f as anthropicDescriptor, g as getContextWindow, h as enabledModelOptions, i as readCredentials, m as credKeyOf, n as applyApiKeyEnv, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-D4MpTfvF.js";
+import { A as chunkMarkdownForRender, At as MAIN_SESSION_TITLE, Bt as renderSessionEventXml, Ft as artifactsFromTurns, It as isMainSession, J as filterChainFallbacks, Lt as orchestratedBy, Nt as SESSION_ROLE_KEY, Pt as WORKER_REPORT_FRAGMENT, Qt as formatRunReceiptLine, Rt as parseSessionEventXml, St as promptTurnRefs, U as buildRunModel, Ut as sessionEventLabel, _n as mergeApprovalAndBodyOutcomes, bn as rewriteMultiEditHeader, dn as previewEditPayload, et as restoreChainFallbacks, hn as buildEditOutcomesAnnotation, jt as ORCHESTRATED_BY_KEY, kt as MAIN_PLAYBOOK_FRAGMENT, ln as extractEditPayload, m as ownerOf, nn as runReceiptFromRun, tn as hasRunReceipt, u as capTranscriptEvents, vn as parseEditOutcomesFromResult, wn as chatReferenceTokensFromText, xn as stripEditOutcomesAnnotation, yn as resolveApprovalForPayload, zt as renderProjectsBriefing } from "./turn-operations-HX3g3XIc.js";
+import { T as restoreModelOptions, b as modelSupportsReasoning, d as BUILTIN_PROVIDERS, f as anthropicDescriptor, g as getContextWindow, h as enabledModelOptions, i as readCredentials, m as credKeyOf, n as applyApiKeyEnv, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-D0BHBb02.js";
 import { basename, delimiter, dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
 import { Buffer } from "node:buffer";
-import { chmodSync, closeSync, cpSync, createReadStream, createWriteStream, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, closeSync, cpSync, createReadStream, createWriteStream, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
 import { readFile, readdir, stat, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { homedir, tmpdir } from "node:os";
@@ -30,6 +30,7 @@ import { createHash, randomUUID } from "node:crypto";
 import { Fzf } from "fzf";
 import { createGunzip } from "node:zlib";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { Writable } from "node:stream";
 import { jsx } from "react/jsx-runtime";
 //#region src/chat/store.ts
 function ensureStateDir(path) {
@@ -610,7 +611,8 @@ function eventsFromTurns(turns, runs = []) {
 					...tag
 				});
 			} else if (block.type === "tool_call") {
-				let edit = extractEditPayload(block.name, block.input);
+				const { name, input } = unwrapCallTool(block.name, block.input) ?? block;
+				let edit = extractEditPayload(name, input);
 				if (edit) {
 					const resultText = resultByCallId.get(block.id);
 					if (resultText) {
@@ -623,9 +625,9 @@ function eventsFromTurns(turns, runs = []) {
 				}
 				events.push({
 					kind: "tool",
-					text: toolCallPreview(block.name, block.input),
-					tool: block.name,
-					input: block.input,
+					text: toolCallPreview(name, input),
+					tool: name,
+					input,
 					...edit ? { edit } : {},
 					callId: block.id,
 					...tag
@@ -3687,6 +3689,148 @@ function readPackageVersion(dir, packageName) {
 	}
 }
 //#endregion
+//#region src/chat/auto-update-restart.ts
+const UPDATE_APPLIED_MARKER = "update-applied.json";
+function updateAppliedMarkerPath(cacheDir) {
+	return join(cacheDir, UPDATE_APPLIED_MARKER);
+}
+/**
+* Record that an install just landed. Best-effort: a failure to write the
+* marker must never fail the upgrade that succeeded — the poll catches up.
+*/
+function writeUpdateAppliedMarker(cacheDir, marker) {
+	try {
+		mkdirSync(cacheDir, { recursive: true });
+		writeFileSync(updateAppliedMarkerPath(cacheDir), `${JSON.stringify(marker, null, 2)}\n`);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function readUpdateAppliedMarker(cacheDir) {
+	try {
+		const raw = JSON.parse(readFileSync(updateAppliedMarkerPath(cacheDir), "utf8"));
+		if (!raw || typeof raw !== "object") return null;
+		const { at, packages } = raw;
+		if (typeof at !== "number" || !Array.isArray(packages)) return null;
+		return {
+			at,
+			packages: packages.filter((p) => p && typeof p.packageName === "string" && typeof p.version === "string")
+		};
+	} catch {
+		return null;
+	}
+}
+/**
+* Compute the state once — the pure heart of the watcher, exported so a host
+* without a lifecycle (a one-shot IPC handler) can answer "is a restart
+* pending?" without holding a watcher.
+*/
+function probeInstalledVersion(spec, currentVersion, probe = findInstalledCompanion, now = Date.now) {
+	const installed = currentVersion ? probe(spec)?.version ?? null : null;
+	return {
+		running: currentVersion,
+		installed,
+		restartRequired: installed !== null && compareSemver(installed, currentVersion) > 0,
+		checkedAt: now()
+	};
+}
+function watchInstalledVersion(options) {
+	const probe = options.probe ?? findInstalledCompanion;
+	const now = options.now ?? Date.now;
+	const enabled = options.currentVersion.length > 0;
+	let state = probeInstalledVersion(options.spec, options.currentVersion, probe, now);
+	let closed = false;
+	const deliver = (next) => {
+		const changed = next.installed !== state.installed || next.restartRequired !== state.restartRequired;
+		state = next;
+		if (changed && !closed) options.onChange(next);
+	};
+	const check = () => {
+		if (!enabled || closed) return state;
+		deliver(probeInstalledVersion(options.spec, options.currentVersion, probe, now));
+		return state;
+	};
+	let watcher = null;
+	let debounce = null;
+	let poll = null;
+	if (enabled) {
+		if (options.cacheDir) try {
+			mkdirSync(options.cacheDir, { recursive: true });
+			watcher = watch(options.cacheDir, (_event, filename) => {
+				if (filename && filename.toString() !== "update-applied.json") return;
+				if (debounce) clearTimeout(debounce);
+				debounce = setTimeout(() => {
+					debounce = null;
+					check();
+				}, options.debounceMs ?? 500);
+			});
+			watcher.on("error", () => {
+				watcher?.close();
+				watcher = null;
+			});
+		} catch {
+			watcher = null;
+		}
+		const pollMs = options.pollMs ?? 5 * 6e4;
+		if (pollMs > 0) {
+			poll = setInterval(check, pollMs);
+			if (typeof poll === "object" && "unref" in poll) poll.unref();
+		}
+	}
+	return {
+		check,
+		current: () => state,
+		close: () => {
+			closed = true;
+			watcher?.close();
+			if (debounce) clearTimeout(debounce);
+			if (poll) clearInterval(poll);
+		}
+	};
+}
+/** Quick existence check so hosts can decide whether to read the marker at all. */
+function hasUpdateAppliedMarker(cacheDir) {
+	return existsSync(updateAppliedMarkerPath(cacheDir));
+}
+/**
+* `null` until the first probe (or when disabled / no spec), then the live
+* state. Flipping `enabled` off tears the watcher down and clears the state
+* so no stale "restart" chip lingers.
+*/
+function useRestartRequired(options) {
+	const [state, setState] = useState(null);
+	const { spec, currentVersion, cacheDir, enabled, pollMs } = options;
+	const packageName = spec?.packageName;
+	const binName = spec?.binName;
+	useEffect(() => {
+		if (!enabled || !packageName || !currentVersion) {
+			setState(null);
+			return;
+		}
+		const watcher = watchInstalledVersion({
+			spec: binName ? {
+				packageName,
+				binName
+			} : { packageName },
+			currentVersion,
+			cacheDir,
+			pollMs,
+			onChange: setState
+		});
+		setState(watcher.current());
+		return () => watcher.close();
+	}, [
+		enabled,
+		packageName,
+		binName,
+		currentVersion,
+		cacheDir,
+		pollMs
+	]);
+	return state;
+}
+//#endregion
 //#region src/chat/auto-update-cli.ts
 const UPGRADE_HELP = `Usage: zidane upgrade [options]
 
@@ -3780,11 +3924,26 @@ async function runUpdateCommand(options) {
 	for (const e of entries.filter((e) => !e.outdated && e.status.source !== "error")) out.write(`${label(e.name)}  ${statusText(e)}\n`);
 	if (!selfPending && pendingCompanions.length === 0) return { exitCode: 0 };
 	let exitCode = 0;
-	if (selfPending) exitCode = await upgradeSelf();
+	const applied = [];
+	if (selfPending) {
+		exitCode = await upgradeSelf();
+		if (exitCode === 0 && !flags.dryRun && status.latest) applied.push({
+			packageName: self.name,
+			version: status.latest
+		});
+	}
 	for (const c of pendingCompanions) {
 		const code = await upgradeCompanion(c);
+		if (code === 0 && !flags.dryRun && c.status.latest) applied.push({
+			packageName: c.name,
+			version: c.status.latest
+		});
 		if (exitCode === 0) exitCode = code;
 	}
+	if (applied.length > 0 && options.cacheDir) (options.writeMarker ?? writeUpdateAppliedMarker)(options.cacheDir, {
+		at: Date.now(),
+		packages: applied
+	});
 	return { exitCode };
 	/**
 	* Refuse to spawn the PM while the release is not fetchable yet: npm treats
@@ -3887,7 +4046,7 @@ async function runUpdateCommand(options) {
 			return 0;
 		}
 		err.write(`${name}: install finished but ${actual ?? "nothing"} is on disk, expected ${expected}.\n`);
-		err.write(`Reinstall: ${reinstallHint(command, name, channel)}\n`);
+		err.write(`Reinstall: ${reinstallHint$1(command, name, channel)}\n`);
 		return 1;
 	}
 }
@@ -3900,7 +4059,7 @@ function statusText(e) {
 * Volta treats `install` of an already-recorded version as a no-op, so the
 * only way to replace a broken install is to remove it first.
 */
-function reinstallHint(command, packageName, channel) {
+function reinstallHint$1(command, packageName, channel) {
 	const cmd = command.argv.join(" ");
 	return command.id === "volta" ? `volta uninstall ${packageName} && volta install ${packageName}@${channel}` : cmd;
 }
@@ -4127,10 +4286,190 @@ function buildUpdateHint(status, options) {
 		labelColor: options.color
 	};
 }
+/**
+* `↻ v7.0.31` — a newer build is on disk than the one running (this
+* process is stale; see `auto-update-restart.ts`). Takes precedence over
+* the `↑` chip: once the release is installed, "available" is old news and
+* "restart" is the one action left. Same color contract as `buildUpdateHint`.
+*/
+function buildRestartHint(state, options) {
+	if (!state?.restartRequired || !state.installed) return null;
+	return {
+		key: options.glyph ?? "↻",
+		keyColor: options.color,
+		label: options.showVersion === false ? "restart" : `v${stripVPrefix(state.installed)}`,
+		labelColor: options.color
+	};
+}
 function stripVPrefix(v) {
 	return v.startsWith("v") ? v.slice(1) : v;
 }
 //#endregion
+//#region src/chat/auto-update-service.ts
+async function upgradeInstalledPackages(options) {
+	const channel = options.channel ?? "latest";
+	const find = options.findInstalled ?? findInstalledCompanion;
+	const check = options.checkForUpdate ?? checkForUpdate;
+	const available = options.checkTarballAvailable ?? checkTarballAvailable;
+	const install = options.performSelfUpdate ?? performSelfUpdate;
+	const detect = options.detectPackageManager ?? detectPackageManager;
+	const progress = options.onProgress ?? (() => {});
+	const results = [];
+	for (const spec of options.targets) {
+		if (options.signal?.aborted) break;
+		const installed = find(spec);
+		if (!installed) {
+			results.push({
+				packageName: spec.packageName,
+				from: null,
+				to: null,
+				status: "not-installed"
+			});
+			continue;
+		}
+		progress({
+			kind: "check",
+			packageName: spec.packageName
+		});
+		const result = await upgradeOne(installed, await check({
+			packageName: installed.packageName,
+			currentVersion: installed.version,
+			channel,
+			registry: options.registry,
+			cacheDir: options.cacheDir,
+			force: true,
+			timeoutMs: 8e3,
+			signal: options.signal
+		}));
+		progress({
+			kind: "done",
+			result
+		});
+		results.push(result);
+	}
+	const installedAny = results.some((r) => r.status === "updated");
+	if (installedAny && options.cacheDir) (options.writeMarker ?? writeUpdateAppliedMarker)(options.cacheDir, {
+		at: (options.now ?? Date.now)(),
+		packages: results.filter((r) => r.status === "updated" && r.to).map((r) => ({
+			packageName: r.packageName,
+			version: r.to
+		}))
+	});
+	return {
+		results,
+		ok: results.every((r) => r.status !== "failed" && r.status !== "unavailable"),
+		installedAny
+	};
+	async function upgradeOne(installed, status) {
+		const base = {
+			packageName: installed.packageName,
+			from: installed.version,
+			to: status.latest
+		};
+		if (status.source === "error" && !options.force) return {
+			...base,
+			status: "failed",
+			error: `registry check failed: ${status.error ?? "unknown error"}`
+		};
+		if (!(status.latest !== null && compareSemver(status.latest, installed.version) > 0) && !options.force) return {
+			...base,
+			status: "up-to-date"
+		};
+		if (status.latest && !options.force) {
+			if (await available({
+				packageName: installed.packageName,
+				version: status.latest,
+				registry: options.registry
+			}) === "missing") return {
+				...base,
+				status: "unavailable",
+				error: `${installed.packageName} ${status.latest} is published but not downloadable yet. Try again in a few minutes.`
+			};
+		}
+		const command = detect({
+			packageName: installed.packageName,
+			channel,
+			binaryPath: installed.binaryPath
+		});
+		progress({
+			kind: "install",
+			packageName: installed.packageName,
+			from: installed.version,
+			to: status.latest ?? channel,
+			command: command.argv
+		});
+		const outcome = await install({
+			packageName: installed.packageName,
+			channel,
+			packageManager: command.id,
+			signal: options.signal,
+			stdout: lineSink(installed.packageName, "stdout"),
+			stderr: lineSink(installed.packageName, "stderr"),
+			env: {
+				npm_config_loglevel: "error",
+				npm_config_progress: "false"
+			}
+		});
+		if (outcome.spawnError) return {
+			...base,
+			status: "failed",
+			command: command.argv,
+			error: `could not run ${command.argv[0]}: ${outcome.spawnError}`
+		};
+		if (outcome.exitCode !== 0) return {
+			...base,
+			status: "failed",
+			command: command.argv,
+			error: `${command.argv[0]} exited with ${outcome.exitCode ?? "unknown"}`
+		};
+		const after = find(installed);
+		if (status.latest && after && compareSemver(after.version, status.latest) < 0) return {
+			...base,
+			status: "failed",
+			command: command.argv,
+			error: `install finished but ${after.version} is on disk, expected ${status.latest}. Reinstall: ${reinstallHint(command, installed.packageName, channel)}`
+		};
+		return {
+			...base,
+			to: after?.version ?? status.latest,
+			status: "updated",
+			command: command.argv
+		};
+	}
+	/** Split a PM's byte stream into trimmed lines for the progress sink. */
+	function lineSink(packageName, stream) {
+		let buffer = "";
+		const flush = (final) => {
+			const parts = buffer.split(/\r?\n/);
+			buffer = final ? "" : parts.pop() ?? "";
+			for (const part of parts) {
+				const line = part.trim();
+				if (line) progress({
+					kind: "log",
+					packageName,
+					stream,
+					line
+				});
+			}
+		};
+		return new Writable({
+			write(chunk, _enc, cb) {
+				buffer += chunk.toString();
+				flush(false);
+				cb();
+			},
+			final(cb) {
+				flush(true);
+				cb();
+			}
+		});
+	}
+}
+function reinstallHint(command, packageName, channel) {
+	const cmd = command.argv.join(" ");
+	return command.id === "volta" ? `volta uninstall ${packageName} && volta install ${packageName}@${channel}` : cmd;
+}
+//#endregion
 //#region src/chat/boot-profiler.ts
 const enabled = !!process.env.ZIDANE_BOOT_PROFILE;
 /**
@@ -7451,6 +7790,7 @@ const DEFAULT_SETTINGS = {
 	showAllProjects: false,
 	resumeLastSession: true,
 	persistToolResults: true,
+	stableToolList: false,
 	autoCompact: true,
 	autoCompactThreshold: .8,
 	resumeOnMaxTokens: false,
@@ -7590,6 +7930,12 @@ const SETTINGS_TOGGLES = [
 		label: "Persist large tool results",
 		description: "write >8 KiB tool outputs to disk and inline a preview"
 	},
+	{
+		category: "agent",
+		key: "stableToolList",
+		label: "Stable tool list (call_tool)",
+		description: "invoke MCP tools surfaced by tool_search through `call_tool` instead of adding them to the model's tool list, so tool discovery never breaks the prompt cache (next session activation)"
+	},
 	{
 		category: "agent",
 		key: "loadProjectExtensions",
@@ -10334,7 +10680,7 @@ function createOrchestration(deps) {
 		const capped = Math.max(1, Math.min(limit, 50));
 		return data.turns.filter((t) => t.role === "user" || t.role === "assistant").slice(-capped).map((t) => {
 			const text = t.content.filter((b) => b.type === "text").map((b) => b.text).join("\n").trim();
-			const tools = t.content.filter((b) => b.type === "tool_call").map((b) => b.name);
+			const tools = t.content.filter((b) => b.type === "tool_call").map((b) => unwrapCallTool(b.name, b.input)?.name ?? b.name);
 			const body = text || (tools.length ? `[tool calls: ${tools.join(", ")}]` : "[no text]");
 			return `${t.role}: ${truncate(body, 1200)}`;
 		}).join("\n\n");
@@ -11310,6 +11656,10 @@ function createChatHost(env) {
 		const agentBehavior = {
 			...composedPreset.behavior,
 			...persistBehavior,
+			...settings.stableToolList ? { toolSearch: {
+				...composedPreset.behavior?.toolSearch ?? {},
+				mode: "dispatch"
+			} } : {},
 			tasksDir
 		};
 		const agent = createAgent({
@@ -13098,10 +13448,13 @@ function serializeInteractionResponse(response) {
 		const picked = value.map((v) => String(v).trim()).filter((v) => v.length > 0);
 		if (picked.length > 0) answers[id] = picked;
 	}
-	return JSON.stringify({
+	const body = {
 		...automatic,
 		answers
-	});
+	};
+	const instructions = response.instructions?.trim();
+	if (instructions) body.instructions = instructions;
+	return JSON.stringify(body);
 }
 /**
 * Build a protocol-valid user `SessionTurn` that closes a batch of
@@ -13327,7 +13680,7 @@ function createInteractionTools(opts) {
 	};
 }
 const PLAN_DESCRIPTION = "Present a multi-step plan to the user for approval BEFORE executing it. Use this when you have a concrete proposal that materially changes the workspace and want explicit confirmation. The user can approve, reject, or request revisions; revisions come back as a comment alongside a `revise` decision.";
-const QUESTION_DESCRIPTION = "Ask the user one or more clarifying questions and pause until they answer. Batch related questions into a single call instead of asking one at a time — every call pauses the conversation. Each question carries a `type`: `text` (single line), `textarea` (multi-line), `select` (one of `choices`), or `confirm` (yes/no). Use sparingly: only when explicit user input materially changes the next steps.";
+const QUESTION_DESCRIPTION = "Ask the user one or more clarifying questions and pause until they answer. Batch related questions into a single call instead of asking one at a time — every call pauses the conversation. Each question carries a `type`: `text` (single line), `textarea` (multi-line), `select` (one of `choices`), or `confirm` (yes/no). Use sparingly: only when explicit user input materially changes the next steps. The response may carry `instructions`: free text the user added alongside their answers. It refines or overrides the questions and is authoritative.";
 function createPlanTool({ requestInteraction, shouldSkipInteractions }) {
 	return {
 		spec: {
@@ -16677,6 +17030,6 @@ function createApprovalHub(options) {
 	};
 }
 //#endregion
-export { supportsOAuth as $, parseMcpsFile as $n, INTERACTION_GUIDANCE as $r, EditOutcomeLedger as $t, useSafeModeQueue as A, quoteForShell as An, singleAgentRegistry as Ar, makeRequestInteraction as At, USAGE_CACHE_TTL_MS as B, createArtifactsCompletionProvider as Bn, getTodosForRun as Br, extractEditPayloadForGate as Bt, resolveSessionExportTarget as C, stripSpawnTokensLine as Ci, GRUVBOX_DARK as Cn, BUILTIN_AGENTS as Cr, InteractionsProvider as Ct, scopeCwd as D, toolResultText as Di, CATPPUCCIN_MACCHIATO as Dn, PLAN_AGENT as Dr, createInteractionTools as Dt, resolveSessionCwd as E, toolCallPreview as Ei, CATPPUCCIN_LATTE as En, DEFAULT_PERSIST_EXCLUDE_TOOLS as Er, createAutomaticInteractionResponse as Et, matchesSafelistEntry as F, ConfigProvider as Fn, TODO_STATUS_GLYPHS as Fr, STALE_RUN_MARKER_MS as Ft, usageChecksOptedOut as G, importFromClaudeCode as Gn, selectActiveTodos as Gr, createMainSession as Gt, fetchAllProviderUsage as H, useCompletion as Hn, pickActiveRunId as Hr, resolveCwdPath as Ht, projectsFilePath as I, useConfig as In, TODO_WRITE_COUNTS_METADATA_KEY as Ir, createChatHost as It, fetchOAuthRedirect as J, upsertMcpServer as Jn, useActiveTodos as Jr, runEndNotice as Jt, usageSourceFor as K, mcpsWritePath as Kn, setTodosForRun as Kr, modelChainMetadata as Kt, readProjects as L, resolveConfig as Ln, applyTodosSnapshot as Lr, toTodosSnapshot as Lt, addToSafelist as M, DiscoveryProvider as Mn, TODOREAD_TOOL as Mr, serializeInteractionResponse as Mt, getSafelist as N, useDiscovery as Nn, TODOS_METADATA_KEY as Nr, useInteractionsActions as Nt, SafeModeProvider as O, updateToolEventOutcomes as Oi, CATPPUCCIN_MOCHA as On, accentColor as Or, isInteractionTool as Ot, isOnSafelist as P, useDiscoveryOptional as Pn, TODOWRITE_TOOL as Pr, useInteractionsQueue as Pt, runOAuthLogin as Q, discoverProjectMcps as Qn, IDENTITY_PREFIX as Qr, attachMcpWarnLog as Qt, suggestSafelistEntries as R, resolveStoragePaths as Rn, createTodoTools as Rr, installProviderDiagnosticHook as Rt, renderSession as S, serverToolResultSummary as Si, VAPORWAVE_THEME as Sn, BUILD_AGENT as Sr, HOST_INTERACTION_ID_PREFIX as St, folderlessCwd as T, titleFromTurns as Ti, CATPPUCCIN_FRAPPE as Tn, DEFAULT_BUDGET_EXCLUDE_TOOLS as Tr, buildResumedToolResultsTurn as Tt, fetchProviderUsage as U, countClaudeSessionFiles as Un, pruneTodosByRun as Ur, serializePreview as Ut, clearProviderUsageCache as V, scoreArtifacts as Vn, isTodoTool as Vr, readFileSafe as Vt, providerUsageSupported as W, hasClaudeCodeSetup as Wn, sanitizeTodoItems as Wr, createBuiltinCommands as Wt, redirectUriFromAuthUrl as X, dedupMcpServersByName as Xn, COMMUNICATION_DOCTRINE as Xr, discoverProjectPlugins as Xt, normalizeRedirectPaste as Y, buildMcpServers as Yn, ACTIONS_WITH_CARE_DOCTRINE as Yr, buildPluginContributions as Yt, oauthUsesManualCodePaste as Z, defaultMcpsConfigPaths as Zn, DOING_TASKS_DOCTRINE as Zr, parsePluginScanPathEnv as Zt, buildSpawnEndEvent as _, listSessionMeta as _i, useSettings as _n, chatAutoCompactBehavior as _r, useMcpAuthState as _t, renderActiveTodoAnchor as a, buildBuildSystem as ai, buildHints as an, useUpdateCheck as ar, subscribeMcpToolsCache as at, defaultSkillScanPaths as b, noticeTurnContent as bi, resolveChipColor as bn, discoverAgentsMd as br, ASK_USER_TOOL as bt, useSelectStyle as c, chatReferenceTokensForPrompt as ci, useEnabledToggleSet as cn, checkForUpdate as cr, useMcpToolToggleSet as ct, useTheme as d, compactSummaryEvent as di, SETTINGS_CHOICES as dn, detectLibc as dr, parentServerName as dt, INTERACTION_GUIDANCE_NO_PROMPTS as ei, runCompaction as en, tryOpenBrowser as er, clearMcpToolsCache as et, discoverSystemMd as f, createStateStore as fi, SETTINGS_INPUTS as fn, detectPackageManager as fr, createFileMcpCredentialStore as ft, useStreamBuffer as g, lastContextSizeFromTurns as gi, enforceSettingsInvariants as gn, resolvePlatformPackage as gr, useMcpAuthDispatch as gt, userSystemMdPath as h, getSessionMeta as hi, clampFps as hn, performSelfUpdate as hr, McpAuthProvider as ht, createActiveTodoAnchorHooks as i, TOKEN_DISCIPLINE_DOCTRINE as ii, truncateTrailing as in, buildUpdateHint as ir, saveMcpToolsCache as it, IMPLICITLY_SAFE_TOOLS as j, createDiscoverySlot as jn, DEFAULT_MAX_TODO_ITEMS as jr, pendingInteractionsFromTurns as jt, useSafeModeActions as k, usageByModel as ki, parseEditorCommand as kn, resolveAgentId as kr, isModelInteraction as kt, useSurfaces as l, createChatTurnsReadTool as li, DEFAULT_SETTINGS as ln, checkTarballAvailable as lr, buildVisibleMcpRows as lt, userScopeOverridesLoad as m, eventsFromTurns as mi, SettingsProvider as mn, performInPlaceSelfUpdate as mr, patchMcpCredential as mt, createMemoryApprovalsStore as n, PLAN_MODE_DOCTRINE_NO_PROMPTS as ni, clipHintsToWidth as nn, bootProfileEnabled as nr, mcpToolsCachePath as nt, ThemeProvider as o, buildPlanSystem as oi, shortChord as on, runUpdateCommand as or, buildToolToggle as ot, renderSystemMdSeed as p, deriveSessionTitle as pi, SETTINGS_TOGGLES as pn, parseSemver as pr, mcpCredentialsPath as pt, formatPathForCwd as q, removeMcpServer as qn, todoProgressLabel as qr, sessionModelFallbacks as qt, computeTurnAnchors as r, SUBAGENT_GUIDANCE as ri, hintsLength as rn, bootTick as rr, refreshMcpToolsCatalog as rt, useColors as s, envSection as si, listProjectFiles as sn, findInstalledCompanion as sr, useMcpToolToggleMap as st, createApprovalHub as t, PLAN_MODE_DOCTRINE as ti, EMPTY_HINTS as tn, tryRevealPath as tr, loadMcpToolsCache as tt, useSyntaxStyles as u, DEFAULT_SESSION_TITLE as ui, SETTINGS_CATEGORIES as un, compareSemver as ur, indexOfServerRow as ut, buildSpawnStartEvent as v, loadState as vi, BUILTIN_THEMES as vn, groupArtifacts as vr, getMcpAuthStatus as vt, writeSessionExport as w, sumRunCosts as wi, GRUVBOX_LIGHT as wn, DEFAULT_AGENT_ID as wr, PRESENT_PLAN_TOOL as wt, discoverProjectSkills as x, saveState as xi, resolveTheme as xn, renderAgentsMdBlock as xr, AUTOMATIC_INTERACTION_INSTRUCTION as xt, buildSkillsConfig as y, marginTopFor as yi, DEFAULT_THEME as yn, summarizeArtifactCounts as yr, reduceMcpAuth as yt, writeProjects as z, ARTIFACTS_COMPLETION_PROVIDER_ID as zn, getArchivedTodosForRun as zr, createInteractionHub as zt };
+export { supportsOAuth as $, parseMcpsFile as $n, pruneTodosByRun as $r, EditOutcomeLedger as $t, useSafeModeQueue as A, noticeTurnContent as Ai, quoteForShell as An, discoverAgentsMd as Ar, makeRequestInteraction as At, USAGE_CACHE_TTL_MS as B, createArtifactsCompletionProvider as Bn, singleAgentRegistry as Br, extractEditPayloadForGate as Bt, resolveSessionExportTarget as C, deriveSessionTitle as Ci, GRUVBOX_DARK as Cn, parseSemver as Cr, InteractionsProvider as Ct, scopeCwd as D, listSessionMeta as Di, CATPPUCCIN_MACCHIATO as Dn, chatAutoCompactBehavior as Dr, createInteractionTools as Dt, resolveSessionCwd as E, lastContextSizeFromTurns as Ei, CATPPUCCIN_LATTE as En, resolvePlatformPackage as Er, createAutomaticInteractionResponse as Et, matchesSafelistEntry as F, titleFromTurns as Fi, ConfigProvider as Fn, DEFAULT_BUDGET_EXCLUDE_TOOLS as Fr, STALE_RUN_MARKER_MS as Ft, usageChecksOptedOut as G, importFromClaudeCode as Gn, TODO_STATUS_GLYPHS as Gr, createMainSession as Gt, fetchAllProviderUsage as H, useCompletion as Hn, TODOREAD_TOOL as Hr, resolveCwdPath as Ht, projectsFilePath as I, toolCallPreview as Ii, useConfig as In, DEFAULT_PERSIST_EXCLUDE_TOOLS as Ir, createChatHost as It, fetchOAuthRedirect as J, upsertMcpServer as Jn, createTodoTools as Jr, runEndNotice as Jt, usageSourceFor as K, mcpsWritePath as Kn, TODO_WRITE_COUNTS_METADATA_KEY as Kr, modelChainMetadata as Kt, readProjects as L, toolResultText as Li, resolveConfig as Ln, PLAN_AGENT as Lr, toTodosSnapshot as Lt, addToSafelist as M, serverToolResultSummary as Mi, DiscoveryProvider as Mn, BUILD_AGENT as Mr, serializeInteractionResponse as Mt, getSafelist as N, stripSpawnTokensLine as Ni, useDiscovery as Nn, BUILTIN_AGENTS as Nr, useInteractionsActions as Nt, SafeModeProvider as O, loadState as Oi, CATPPUCCIN_MOCHA as On, groupArtifacts as Or, isInteractionTool as Ot, isOnSafelist as P, sumRunCosts as Pi, useDiscoveryOptional as Pn, DEFAULT_AGENT_ID as Pr, useInteractionsQueue as Pt, runOAuthLogin as Q, discoverProjectMcps as Qn, pickActiveRunId as Qr, attachMcpWarnLog as Qt, suggestSafelistEntries as R, updateToolEventOutcomes as Ri, resolveStoragePaths as Rn, accentColor as Rr, installProviderDiagnosticHook as Rt, renderSession as S, createStateStore as Si, VAPORWAVE_THEME as Sn, detectPackageManager as Sr, HOST_INTERACTION_ID_PREFIX as St, folderlessCwd as T, getSessionMeta as Ti, CATPPUCCIN_FRAPPE as Tn, performSelfUpdate as Tr, buildResumedToolResultsTurn as Tt, fetchProviderUsage as U, countClaudeSessionFiles as Un, TODOS_METADATA_KEY as Ur, serializePreview as Ut, clearProviderUsageCache as V, scoreArtifacts as Vn, DEFAULT_MAX_TODO_ITEMS as Vr, readFileSafe as Vt, providerUsageSupported as W, hasClaudeCodeSetup as Wn, TODOWRITE_TOOL as Wr, createBuiltinCommands as Wt, redirectUriFromAuthUrl as X, dedupMcpServersByName as Xn, getTodosForRun as Xr, discoverProjectPlugins as Xt, normalizeRedirectPaste as Y, buildMcpServers as Yn, getArchivedTodosForRun as Yr, buildPluginContributions as Yt, oauthUsesManualCodePaste as Z, defaultMcpsConfigPaths as Zn, isTodoTool as Zr, parsePluginScanPathEnv as Zt, buildSpawnEndEvent as _, envSection as _i, useSettings as _n, findInstalledCompanion as _r, useMcpAuthState as _t, renderActiveTodoAnchor as a, ACTIONS_WITH_CARE_DOCTRINE as ai, buildHints as an, buildRestartHint as ar, subscribeMcpToolsCache as at, defaultSkillScanPaths as b, DEFAULT_SESSION_TITLE as bi, resolveChipColor as bn, compareSemver as br, ASK_USER_TOOL as bt, useSelectStyle as c, IDENTITY_PREFIX as ci, useEnabledToggleSet as cn, runUpdateCommand as cr, useMcpToolToggleSet as ct, useTheme as d, PLAN_MODE_DOCTRINE as di, SETTINGS_CHOICES as dn, probeInstalledVersion as dr, parentServerName as dt, sanitizeTodoItems as ei, runCompaction as en, tryOpenBrowser as er, clearMcpToolsCache as et, discoverSystemMd as f, PLAN_MODE_DOCTRINE_NO_PROMPTS as fi, SETTINGS_INPUTS as fn, readUpdateAppliedMarker as fr, createFileMcpCredentialStore as ft, useStreamBuffer as g, buildPlanSystem as gi, enforceSettingsInvariants as gn, writeUpdateAppliedMarker as gr, useMcpAuthDispatch as gt, userSystemMdPath as h, buildBuildSystem as hi, clampFps as hn, watchInstalledVersion as hr, McpAuthProvider as ht, createActiveTodoAnchorHooks as i, useActiveTodos as ii, truncateTrailing as in, upgradeInstalledPackages as ir, saveMcpToolsCache as it, IMPLICITLY_SAFE_TOOLS as j, saveState as ji, createDiscoverySlot as jn, renderAgentsMdBlock as jr, pendingInteractionsFromTurns as jt, useSafeModeActions as k, marginTopFor as ki, parseEditorCommand as kn, summarizeArtifactCounts as kr, isModelInteraction as kt, useSurfaces as l, INTERACTION_GUIDANCE as li, DEFAULT_SETTINGS as ln, UPDATE_APPLIED_MARKER as lr, buildVisibleMcpRows as lt, userScopeOverridesLoad as m, TOKEN_DISCIPLINE_DOCTRINE as mi, SettingsProvider as mn, useRestartRequired as mr, patchMcpCredential as mt, createMemoryApprovalsStore as n, setTodosForRun as ni, clipHintsToWidth as nn, bootProfileEnabled as nr, mcpToolsCachePath as nt, ThemeProvider as o, COMMUNICATION_DOCTRINE as oi, shortChord as on, buildUpdateHint as or, buildToolToggle as ot, renderSystemMdSeed as p, SUBAGENT_GUIDANCE as pi, SETTINGS_TOGGLES as pn, updateAppliedMarkerPath as pr, mcpCredentialsPath as pt, formatPathForCwd as q, removeMcpServer as qn, applyTodosSnapshot as qr, sessionModelFallbacks as qt, computeTurnAnchors as r, todoProgressLabel as ri, hintsLength as rn, bootTick as rr, refreshMcpToolsCatalog as rt, useColors as s, DOING_TASKS_DOCTRINE as si, listProjectFiles as sn, useUpdateCheck as sr, useMcpToolToggleMap as st, createApprovalHub as t, selectActiveTodos as ti, EMPTY_HINTS as tn, tryRevealPath as tr, loadMcpToolsCache as tt, useSyntaxStyles as u, INTERACTION_GUIDANCE_NO_PROMPTS as ui, SETTINGS_CATEGORIES as un, hasUpdateAppliedMarker as ur, indexOfServerRow as ut, buildSpawnStartEvent as v, chatReferenceTokensForPrompt as vi, BUILTIN_THEMES as vn, checkForUpdate as vr, getMcpAuthStatus as vt, writeSessionExport as w, eventsFromTurns as wi, GRUVBOX_LIGHT as wn, performInPlaceSelfUpdate as wr, PRESENT_PLAN_TOOL as wt, discoverProjectSkills as x, compactSummaryEvent as xi, resolveTheme as xn, detectLibc as xr, AUTOMATIC_INTERACTION_INSTRUCTION as xt, buildSkillsConfig as y, createChatTurnsReadTool as yi, DEFAULT_THEME as yn, checkTarballAvailable as yr, reduceMcpAuth as yt, writeProjects as z, usageByModel as zi, ARTIFACTS_COMPLETION_PROVIDER_ID as zn, resolveAgentId as zr, createInteractionHub as zt };
 
-//# sourceMappingURL=approvals-staFZZ5o.js.map
+//# sourceMappingURL=approvals-DkwGBMZ9.js.map