zidane 7.0.30 → 7.0.32

package/dist/acp-cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { m as openaiCompat } from "./openai-compat-Dy56weK8.js";
-import { xt as basic_default } from "./agent-BipX4BBj.js";
+import { Ct as basic_default } from "./agent-BCG9JcZl.js";
 import { r as createProcessContext } from "./contexts-BSFQVclW.js";
 import { createSandboxContext } from "./contexts/sandbox.js";
 import { p as resolveStorageDirs } from "./plugins-B531Tz5b.js";
@@ -11,8 +11,8 @@ import { cerebras } from "./providers/cerebras.js";
 import { openai } from "./providers/openai.js";
 import { openrouter } from "./providers/openrouter.js";
 import { xai } from "./providers/xai.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-Cu879kus.js";
-import { d as BUILTIN_PROVIDERS, i as readCredentials, m as credKeyOf, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-D4MpTfvF.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-bBDF-dhy.js";
+import { d as BUILTIN_PROVIDERS, i as readCredentials, m as credKeyOf, r as credentialsPath, t as detectAuth, x as modelsForDescriptor } from "./auth-D0BHBb02.js";
 import { createDaytonaProvider } from "./contexts/daytona.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createE2BProvider } from "./contexts/e2b.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { Gg as SessionContentBlock, Ig as PromptPart, S_ as ToolDef, Tg as McpServerConfig, X_ as Session, Xi as AgentOptions, __ as TurnUsage, c_ as ToolResultContent, cg as AgentBehavior, ev as SessionStore, gm as Provider, qi as Agent, t as Preset } from "./index-C0y2tSgk.js";
+import { Dg as McpServerConfig, Q_ as Session, Rg as PromptPart, Xi as AgentOptions, nv as SessionStore, qg as SessionContentBlock, qi as Agent, t as Preset, u_ as ToolResultContent, ug as AgentBehavior, vm as Provider, w_ as ToolDef, y_ as TurnUsage } from "./index-CCB05-JZ.js";
 import { c as ExecutionContext } from "./types-U-rIVUDw.js";
 import { Readable, Writable } from "node:stream";
 

package/dist/acp.js

@@ -1,3 +1,3 @@
 import { n as JsonRpcRemoteError, r as createJsonRpcConnection } from "./json-rpc-rSWMUh9b.js";
-import { a as wrapToolsForAcpClient, c as sessionBlocksToAcp, 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-Cu879kus.js";
+import { a as wrapToolsForAcpClient, c as sessionBlocksToAcp, 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-bBDF-dhy.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-BipX4BBj.js → agent-BCG9JcZl.js}

@@ -15,7 +15,7 @@ import { p as resolveStorageDirs, r as loadAgentPlugin } from "./plugins-B531Tz5
 import { r as createLogger, t as consoleSink } from "./logger--C1VQjwJ.js";
 import { t as escapeXml } from "./xml-D5HBhJle.js";
 import { n as reconcileImageMediaType } from "./media-sniff-UKijEaiQ.js";
-import { f as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-BIWa57eY.js";
+import { f as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-CgNd-f3F.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-2jcOA_5R.js";
 import { a as getExtensionSessionState, c as setExtensionSessionState, l as withExtensionSession, n as currentExtensionSession, r as deleteExtensionSessionState, s as resumeChainRunIds } from "./session-CVy-2mAy.js";
@@ -1627,11 +1627,8 @@ const pullRequestKind = {
 		const meta = metaRecord(artifact);
 		const state = typeof meta.state === "string" ? meta.state : void 0;
 		const badges = [];
-		if (typeof meta.additions === "number" || typeof meta.deletions === "number") badges.push({
-			text: `+${meta.additions ?? 0} −${meta.deletions ?? 0}`,
-			tone: "diff",
-			...typeof meta.changedFiles === "number" ? { title: `${meta.changedFiles} file${meta.changedFiles === 1 ? "" : "s"} changed` } : {}
-		});
+		const diff = diffBadge(meta);
+		if (diff) badges.push(diff);
 		if (typeof meta.reviews === "number" && meta.reviews > 0) badges.push({
 			text: `${meta.reviews} review${meta.reviews === 1 ? "" : "s"}`,
 			tone: "neutral"
@@ -1791,11 +1788,17 @@ const commitKind = {
 				else resolve(stdout.trim());
 			});
 		});
+		const stats = await git("show", "--shortstat", "--format=", revision).then(parseShortstat, () => void 0);
+		const prior = metaRecord(artifact);
+		const base = {
+			...prior,
+			...stats
+		};
+		const patch = (meta) => sameFlatMeta(prior, meta) ? void 0 : { meta };
 		const unlink = () => {
-			const meta = { ...metaRecord(artifact) };
-			if (meta.url === void 0) return void 0;
+			const meta = { ...base };
 			delete meta.url;
-			return { meta };
+			return patch(meta);
 		};
 		try {
 			const origin = await git("remote", "get-url", "origin");
@@ -1804,11 +1807,11 @@ const commitKind = {
 			const sha = await git("rev-parse", "--verify", `${revision}^{commit}`);
 			if (!/^[0-9a-f]{40}$/.test(sha)) return unlink();
 			if (!await git("for-each-ref", `--contains=${sha}`, "--format=%(refname)", "refs/remotes/origin/")) return unlink();
-			return { meta: {
-				...metaRecord(artifact),
+			return patch({
+				...base,
 				sha,
 				url: `https://github.com/${repo[1]}/${repo[2]}/commit/${sha}`
-			} };
+			});
 		} catch {
 			return unlink();
 		}
@@ -1820,10 +1823,39 @@ const commitKind = {
 		return {
 			title: artifact.label,
 			...sha || branch ? { subtitle: [sha, branch].filter(Boolean).join(" · ") } : {},
-			...typeof meta.url === "string" && /^https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/commit\/[0-9a-f]{40}$/.test(meta.url) ? { href: meta.url } : {}
+			...typeof meta.url === "string" && /^https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/commit\/[0-9a-f]{40}$/.test(meta.url) ? { href: meta.url } : {},
+			...diffBadge(meta) ? { badges: [diffBadge(meta)] } : {}
 		};
 	}
 };
+/**
+* `git show --shortstat --format=` → `{ additions, deletions, changedFiles }`
+* (` 4 files changed, 120 insertions(+), 8 deletions(-)`). Any missing
+* clause is 0; an empty stat (empty commit) is `undefined`.
+*/
+function parseShortstat(out) {
+	const files = /(\d+) files? changed/.exec(out);
+	if (!files) return void 0;
+	return {
+		changedFiles: Number(files[1]),
+		additions: Number(/(\d+) insertions?\(\+\)/.exec(out)?.[1] ?? 0),
+		deletions: Number(/(\d+) deletions?\(-\)/.exec(out)?.[1] ?? 0)
+	};
+}
+/** Same keys, same primitive values — the commit meta is flat (sha, branch, message, url, stats). */
+function sameFlatMeta(a, b) {
+	const keys = Object.keys(a);
+	return keys.length === Object.keys(b).length && keys.every((key) => key in b && a[key] === b[key]);
+}
+/** The `+120 −8` badge shared by the PR and commit rows, from `additions` / `deletions` / `changedFiles` meta. */
+function diffBadge(meta) {
+	if (typeof meta.additions !== "number" && typeof meta.deletions !== "number") return void 0;
+	return {
+		text: `+${meta.additions ?? 0} −${meta.deletions ?? 0}`,
+		tone: "diff",
+		...typeof meta.changedFiles === "number" ? { title: `${meta.changedFiles} file${meta.changedFiles === 1 ? "" : "s"} changed` } : {}
+	};
+}
 const branchKind = {
 	kind: ARTIFACT_KINDS.branch,
 	label: "Branch",
@@ -7108,11 +7140,19 @@ function applyToolSearchToUnlocked(catalog, input, unlocked, defaultLimit, addUn
 */
 function createToolSearchTool(options) {
 	const defaultLimit = options.defaultLimit ?? DEFAULT_LIMIT;
+	const dispatcher = options.dispatcherName;
 	return {
 		isConcurrencySafe: true,
 		spec: {
 			name: "tool_search",
-			description: "Discover and load schemas for additional tools listed in <searchable_tools>. Tools listed there are advertised by name + description only; their input schemas are not loaded into context until you surface them through this tool. Pass `query` for a substring search, `names` to load specific tools, or `server` to load every tool from one MCP server. Returned tools become callable for the rest of this run.",
+			description: [
+				"Discover and load schemas for additional tools listed in <searchable_tools>.",
+				"Tools listed there are advertised by name + description only; their input",
+				"schemas are not loaded into context until you surface them through this tool.",
+				"Pass `query` for a substring search, `names` to load specific tools, or `server`",
+				"to load every tool from one MCP server.",
+				dispatcher ? `Returned tools become callable through \`${dispatcher}\` (name + arguments) for the rest of this run.` : "Returned tools become callable for the rest of this run."
+			].join(" "),
 			inputSchema: {
 				type: "object",
 				properties: {
@@ -7154,7 +7194,7 @@ function createToolSearchTool(options) {
 			else {
 				for (const entry of shown) parts.push(formatMatch(entry));
 				parts.push("");
-				parts.push("  These tools are now callable. Invoke them by name in subsequent turns.");
+				parts.push(dispatcher ? `  These tools are now callable through \`${dispatcher}\`: pass the tool name as \`name\` and an object matching its schema as \`arguments\`.` : "  These tools are now callable. Invoke them by name in subsequent turns.");
 				if (truncated) parts.push(`  ${total - shown.length} additional matches were truncated; refine the query or raise \`limit\`.`);
 			}
 			if (misses.length > 0) parts.push(`  <misses>${misses.map(escapeXml).join(", ")}</misses>`);
@@ -11666,6 +11706,72 @@ function textForPersistence(output) {
 	return parts.join("\n");
 }
 //#endregion
+//#region src/tools/call-tool.ts
+const CALL_TOOL_NAME = "call_tool";
+/**
+* Unwrap a `call_tool` envelope. `null` when `name` is not the dispatcher or
+* the envelope is malformed (missing / non-string `name`, non-object
+* `arguments`) — callers then treat the call as a plain `call_tool` call and
+* let the dispatcher's own schema validation produce the error the model
+* needs to fix its input.
+*
+* `arguments` may be omitted for zero-argument tools: it defaults to `{}`.
+*/
+function unwrapCallTool(name, input) {
+	if (name !== "call_tool") return null;
+	if (!input || typeof input !== "object" || Array.isArray(input)) return null;
+	const { name: inner, arguments: args } = input;
+	if (typeof inner !== "string" || inner.length === 0) return null;
+	if (args === void 0) return {
+		name: inner,
+		input: {}
+	};
+	if (!args || typeof args !== "object" || Array.isArray(args)) return null;
+	return {
+		name: inner,
+		input: args
+	};
+}
+/**
+* Build the dispatcher ToolDef. The loop rewrites every envelope around a
+* lazy catalog tool into the inner call before dispatch, so `execute` only
+* runs for envelopes it refused: an inner tool that is not a catalog entry
+* (eager tools are called directly, so their history stays scannable by
+* name) or a malformed shape that slipped past schema validation.
+*/
+function createCallToolTool(options = {}) {
+	const discovery = options.discoveryToolName ?? "tool_search";
+	const isDispatchable = options.isDispatchable ?? (() => true);
+	return {
+		isConcurrencySafe: false,
+		spec: {
+			name: CALL_TOOL_NAME,
+			description: `Invoke a tool listed in <searchable_tools>. Load its schema with \`${discovery}\` first (the result shows the exact \`name\` and input schema), then call it here with \`name\` set to that tool name and \`arguments\` set to an object matching its schema. Arguments are validated against the tool's own schema; a validation error names the offending field.`,
+			inputSchema: {
+				type: "object",
+				properties: {
+					name: {
+						type: "string",
+						description: "Tool name exactly as shown in <searchable_tools> / the tool_search result."
+					},
+					arguments: {
+						type: "object",
+						description: "Input for the tool, matching its schema. Omit for zero-argument tools.",
+						additionalProperties: true
+					}
+				},
+				required: ["name"],
+				additionalProperties: false
+			}
+		},
+		async execute(input) {
+			const target = input.name;
+			if (typeof target === "string" && target.length > 0 && !isDispatchable(target)) throw new Error(`call_tool: "${target}" is not listed in <searchable_tools>. Call it directly by name if it is one of your tools; call_tool is only for surfaced catalog tools.`);
+			throw new Error(`call_tool: malformed envelope for ${typeof target === "string" ? `"${target}"` : "unknown tool"}: expected \`name\` (string) and optional \`arguments\` (object).`);
+		}
+	};
+}
+//#endregion
 //#region src/loop.ts
 const DEFAULT_PROVIDER_STREAM_START_TIMEOUT_MS = 300 * 1e3;
 const DEFAULT_PROVIDER_STREAM_TIMEOUT_MS = 1800 * 1e3;
@@ -13957,6 +14063,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 			})).catch(() => {});
 		}
 	}
+	canonicalToolCalls = unwrapDispatchCalls(ctx, canonicalToolCalls);
 	if (turnTtftMs !== void 0 && result.usage.timeToFirstTokenMs === void 0) result.usage.timeToFirstTokenMs = turnTtftMs;
 	if (result.usage.streamDurationMs === void 0) result.usage.streamDurationMs = Date.now() - streamStartedAt;
 	const assistantTurn = {
@@ -14258,6 +14365,31 @@ async function commitToolState(ctx, callId, toolName) {
 		if (!hookCtx.handled) console.error(`[zidane] tool state commit for ${toolName} (${callId}) failed; the write did NOT land, continuing:`, error);
 	}
 }
+/**
+* Rewrite every well-formed `call_tool` envelope around a lazy catalog tool
+* into the inner call it carries (same `id`, inner wire name → canonical,
+* `arguments` → `input`). No-op unless the run is in dispatch mode
+* ({@link LoopContext.dispatcher}). Left as a `call_tool` call, so the
+* dispatcher itself answers: a malformed envelope (its schema validation
+* reports the shape error) and an inner name outside the catalog (its
+* `execute` says to call the tool directly, or that it does not exist).
+*/
+function unwrapDispatchCalls(ctx, calls) {
+	const dispatcher = ctx.dispatcher;
+	if (!dispatcher) return calls.slice();
+	return calls.map((call) => {
+		if (call.name !== dispatcher.name) return call;
+		const inner = unwrapCallTool(call.name, call.input);
+		if (!inner) return call;
+		const canonical = toCanonicalName(inner.name, ctx.aliasMaps);
+		if (!dispatcher.targets.has(canonical)) return call;
+		return {
+			...call,
+			name: canonical,
+			input: inner.input
+		};
+	});
+}
 async function executeSingleTool(ctx, call, turnId) {
 	const toolDef = ctx.tools[call.name];
 	const callId = call.id;
@@ -15554,7 +15686,12 @@ function createToolStateController(store) {
 			views.delete(callId);
 		},
 		pending: (callId) => views.get(callId)?.[STAGED].pending() ?? [],
-		snapshot: () => Object.fromEntries(snapshot)
+		snapshot: () => Object.fromEntries(snapshot),
+		committed: {
+			get: (key) => snapshot.get(key),
+			has: (key) => snapshot.has(key),
+			keys: () => [...snapshot.keys()].sort()
+		}
 	};
 }
 /**
@@ -16310,13 +16447,15 @@ function buildRunDisclosureState(input) {
 	};
 	const hostDefinedToolSearch = !!baseTools.tool_search;
 	const injectedToolSearch = !hasRunToolOverride && (toolDisclosure === "lazy" || disclosure.lazyEntries.length > 0) && toolSearch?.tool !== false && !hostDefinedToolSearch;
+	const dispatchMode = injectedToolSearch && toolSearch?.mode === "dispatch" && disclosure.lazyEntries.length > 0 && !baseTools["call_tool"];
 	let tools = baseTools;
 	if (injectedToolSearch) {
 		const toolSearchTool = createToolSearchTool({
 			catalog: disclosure.lazyEntries,
 			unlocked,
 			addUnlock: recordUnlock,
-			...toolSearch?.limit !== void 0 ? { defaultLimit: toolSearch.limit } : {}
+			...toolSearch?.limit !== void 0 ? { defaultLimit: toolSearch.limit } : {},
+			...dispatchMode ? { dispatcherName: CALL_TOOL_NAME } : {}
 		});
 		tools = {
 			...baseTools,
@@ -16324,6 +16463,19 @@ function buildRunDisclosureState(input) {
 		};
 		unlocked.add(toolSearchTool.spec.name);
 		initialUnlocked.add(toolSearchTool.spec.name);
+		if (dispatchMode) {
+			const lazyWireNames = new Set(disclosure.lazyEntries.map((entry) => entry.name));
+			const callTool = createCallToolTool({
+				discoveryToolName: toolSearchTool.spec.name,
+				isDispatchable: (name) => lazyWireNames.has(name)
+			});
+			tools = {
+				...tools,
+				[CALL_TOOL_NAME]: callTool
+			};
+			unlocked.add(CALL_TOOL_NAME);
+			initialUnlocked.add(CALL_TOOL_NAME);
+		}
 	}
 	return {
 		disclosure,
@@ -16333,7 +16485,8 @@ function buildRunDisclosureState(input) {
 		recordUnlock,
 		tools,
 		injectedToolSearch,
-		hostDefinedToolSearch
+		hostDefinedToolSearch,
+		dispatchMode
 	};
 }
 /**
@@ -16594,7 +16747,11 @@ function buildSearchableCatalog(entries, options) {
 	}
 	const serverNames = [...byServer.keys()].sort();
 	const parts = [];
-	if (options.discoveryToolName) parts.push("The following tools are available but their input schemas are NOT loaded in your context.", `Call the \`${options.discoveryToolName}\` tool to load schemas for any tool below that you have not already surfaced. Surfaced tools persist for the rest of the run.`, "");
+	if (options.discoveryToolName) {
+		parts.push("The following tools are available but their input schemas are NOT loaded in your context.", `Call the \`${options.discoveryToolName}\` tool to load schemas for any tool below that you have not already surfaced. Surfaced tools persist for the rest of the run.`);
+		if (options.dispatcherName) parts.push(`Surfaced tools are invoked through \`${options.dispatcherName}\` with \`name\` set to the tool name and \`arguments\` matching the loaded schema; they are never added to your tool list directly.`);
+		parts.push("");
+	}
 	parts.push("<searchable_tools>");
 	for (const server of serverNames) {
 		parts.push(`  <server name="${escapeXml(server)}">`);
@@ -16618,14 +16775,15 @@ function buildSearchableCatalog(entries, options) {
 * Returns an uninstall function the run-end teardown calls so handlers
 * never leak across runs.
 */
-function installLazyDisclosureGate(hooks, lazyCanonicalNames, unlocked, discoveryToolName) {
+function installLazyDisclosureGate(hooks, lazyCanonicalNames, unlocked, discoveryToolName, dispatcherName) {
 	if (lazyCanonicalNames.size === 0) return () => {};
 	return hooks.hook("tool:gate", (ctx) => {
 		if (ctx.block) return;
 		if (!lazyCanonicalNames.has(ctx.name)) return;
 		if (unlocked.has(ctx.name)) return;
 		ctx.block = true;
-		ctx.reason = discoveryToolName ? `Tool "${ctx.name}" is listed in <searchable_tools> but its schema has not been loaded. Call the \`${discoveryToolName}\` tool with names: ["${ctx.name}"] first, then re-issue the call.` : `Tool "${ctx.name}" is listed in <searchable_tools> but its schema has not been loaded.`;
+		const reissue = dispatcherName ? `re-issue the call through \`${dispatcherName}\`` : "re-issue the call";
+		ctx.reason = discoveryToolName ? `Tool "${ctx.name}" is listed in <searchable_tools> but its schema has not been loaded. Call the \`${discoveryToolName}\` tool with names: ["${ctx.name}"] first, then ${reissue}.` : `Tool "${ctx.name}" is listed in <searchable_tools> but its schema has not been loaded.`;
 	});
 }
 /**
@@ -17230,7 +17388,7 @@ function createAgent(rawOptions) {
 				executionContext,
 				behavior: resolvedBehavior
 			});
-			const { disclosure, unlocked, initialUnlocked, dynamicUnlockOrder, recordUnlock: recordDynamicUnlock, tools, injectedToolSearch: shouldInjectToolSearch, hostDefinedToolSearch } = buildRunDisclosureState({
+			const { disclosure, unlocked, initialUnlocked, dynamicUnlockOrder, recordUnlock: recordDynamicUnlock, tools, injectedToolSearch: shouldInjectToolSearch, hostDefinedToolSearch, dispatchMode } = buildRunDisclosureState({
 				tools: toolsPreSearch,
 				mcpToolNames,
 				mcpServers,
@@ -17242,7 +17400,10 @@ function createAgent(rawOptions) {
 			const discoveryToolName = shouldInjectToolSearch ? "tool_search" : hostDefinedToolSearch ? effectiveToolAliases?.tool_search ?? "tool_search" : null;
 			let searchableCatalogText;
 			if (disclosure.lazyEntries.length > 0) {
-				searchableCatalogText = buildSearchableCatalog(disclosure.lazyEntries, { discoveryToolName });
+				searchableCatalogText = buildSearchableCatalog(disclosure.lazyEntries, {
+					discoveryToolName,
+					...dispatchMode ? { dispatcherName: CALL_TOOL_NAME } : {}
+				});
 				system = appendStaticSection(system, searchableCatalogText);
 			}
 			if (surfaceMcpInstructions && mcpConnection?.instructions && mcpConnection.instructions.size > 0) {
@@ -17251,10 +17412,11 @@ function createAgent(rawOptions) {
 			}
 			const aliasMaps = buildAliasMaps(effectiveToolAliases, Object.keys(tools));
 			augmentMcpDoubleUnderscoreAliases(aliasMaps, Object.keys(tools));
+			const wireTailLength = () => dispatchMode ? 0 : dynamicUnlockOrder.length;
 			const formattedToolsCache = /* @__PURE__ */ new Map();
 			function buildFormattedTools(forProvider = runProvider) {
 				const cached = formattedToolsCache.get(forProvider);
-				if (cached && cached.tailLen === dynamicUnlockOrder.length) return cached.value;
+				if (cached && cached.tailLen === wireTailLength()) return cached.value;
 				const specs = [];
 				for (const t of Object.values(tools)) {
 					if (!initialUnlocked.has(t.spec.name)) continue;
@@ -17264,7 +17426,7 @@ function createAgent(rawOptions) {
 						inputSchema: t.spec.inputSchema
 					});
 				}
-				for (const canonical of dynamicUnlockOrder) {
+				for (const canonical of dispatchMode ? [] : dynamicUnlockOrder) {
 					const t = tools[canonical];
 					if (!t) continue;
 					specs.push({
@@ -17275,7 +17437,7 @@ function createAgent(rawOptions) {
 				}
 				const value = specs.length > 0 ? forProvider.formatTools(specs) : [];
 				formattedToolsCache.set(forProvider, {
-					tailLen: dynamicUnlockOrder.length,
+					tailLen: wireTailLength(),
 					value
 				});
 				return value;
@@ -17284,13 +17446,14 @@ function createAgent(rawOptions) {
 			function advertisedToolNames() {
 				const names = [];
 				for (const t of Object.values(tools)) if (initialUnlocked.has(t.spec.name)) names.push(toWireName(t.spec.name, aliasMaps));
-				for (const canonical of dynamicUnlockOrder) if (tools[canonical]) names.push(toWireName(canonical, aliasMaps));
+				for (const canonical of dispatchMode ? [] : dynamicUnlockOrder) if (tools[canonical]) names.push(toWireName(canonical, aliasMaps));
 				return names;
 			}
 			{
 				const disclosedTools = [];
+				const onWire = dispatchMode ? initialUnlocked : unlocked;
 				for (const t of Object.values(tools)) {
-					if (!unlocked.has(t.spec.name)) continue;
+					if (!onWire.has(t.spec.name)) continue;
 					const wireName = aliasMaps.aliasByCanonical.get(t.spec.name) ?? t.spec.name;
 					disclosedTools.push({
 						name: wireName,
@@ -17475,7 +17638,7 @@ function createAgent(rawOptions) {
 				recordUnlock: recordDynamicUnlock,
 				defaultLimit: toolSearch?.limit
 			}));
-			perRunUnregisters.push(installLazyDisclosureGate(hooks, disclosure.lazyCanonicalNames, unlocked, discoveryToolName));
+			perRunUnregisters.push(installLazyDisclosureGate(hooks, disclosure.lazyCanonicalNames, unlocked, discoveryToolName, dispatchMode ? CALL_TOOL_NAME : void 0));
 			perRunUnregisters.push(installReadBeforeEditHydrationGate(hooks, resolvedBehavior.requireReadBeforeEdit === true, {
 				session: session ?? void 0,
 				getHandle: () => executionHandle,
@@ -17605,6 +17768,10 @@ function createAgent(rawOptions) {
 					tools,
 					formattedTools,
 					rebuildFormattedTools: buildFormattedTools,
+					...dispatchMode ? { dispatcher: {
+						name: CALL_TOOL_NAME,
+						targets: disclosure.lazyCanonicalNames
+					} } : {},
 					aliasMaps,
 					model,
 					system,
@@ -18152,12 +18319,13 @@ function createAgent(rawOptions) {
 			return skillActivationState.active();
 		},
 		meta: Object.freeze({ ...provider.meta }),
+		toolState: toolStateController.committed,
 		getContextBreakdown,
 		getContextSegments,
 		[Symbol.asyncDispose]: destroy
 	};
 }
 //#endregion
-export { installExtensionFromSpec as $, defaultRepeatGuardTracked as $n, KEYBINDING_DEF_BY_ACTION as $t, selectFilesFromSession as A, resolveExtensionConfig as An, createSkillsRunScriptTool as At, buildUpToCompactPrompt as B, commitKind as Bn, formatModelLine as Bt, resolveLegacySessionDir as C, createDebugLog as Cn, WAIT_TASK_TIMED_OUT_PREFIX as Ct, resolveTasksDir as D, coerceExtensionConfigInput as Dn, isSpawnTool as Dt, resolveSessionDir as E, clampExtensionConfigNumber as En, createSpawnTool as Et, TRAILER as F, createExtensionBus as Fn, tailTruncate as Ft, summaryToTurn as G, renderArtifactRow as Gn, glob as Gt, anchorPreviewFor as H, githubTokenSource as Hn, listFiles as Ht, buildCompactPrompt as I, serializedPayloadBytes as In, readFile$1 as It, CompactPromptTooLongError as J, AUTO_COMPACT_MIN_GROWTH_FRACTION as Jn, artifacts_default as Jt, truncateHeadForPtlRetry as K, resolveArtifactKind as Kn, edit as Kt, buildFromCompactPrompt as L, BUILTIN_ARTIFACT_KINDS as Ln, looksBinary as Lt, compactConversation as M, sanitizeExtensionConfigActionPatch as Mn, shellKill as Mt, BASE_INSTRUCTIONS as N, toWireConfigSchema as Nn, createShellTool as Nt, buildPostCompactAttachments as O, isValidExtensionConfigItem as On, reserveChildLabel as Ot, NO_TOOLS_PREAMBLE as P, EXTENSION_BUS_MAX_PAYLOAD_BYTES as Pn, shell as Pt, fetchExtensionSource as Q, defaultRepeatGuardNormalize as Qn, KEYBINDING_DEFS as Qt, buildFullCompactPrompt as R, artifactKindLabel as Rn, multiEdit as Rt, resolveLegacyPersistDir as S, scanExtensionDirectories as Sn, writeFile$1 as St, resolvePersistDir as T, defineExtension as Tn, createToolSearchTool as Tt, sliceForCompaction as U, pullRequestKind as Un, createInteractionTool as Ut, ANCHOR_PREVIEW_MAX_CHARS as V, fileKind as Vn, matchModelEntries as Vt, stripImagesFromTurns as W, refreshArtifact as Wn, grep as Wt, createExtensionPromptBridge as X, effectiveContextWindow as Xn, recordArtifact as Xt, EMPTY_EXTENSION_REGISTRY as Y, OUTPUT_RESERVE_TOKENS as Yn, RECORD_ARTIFACT_TOOL as Yt, ExtensionInstallError as Z, shouldAutoCompact as Zn, DEFAULT_KEYBINDINGS as Zt, buildPersistedStub as _, defaultExtensionScanPaths as _n, createWorkspaceSurface as _t, stagedToolState as a, matchesBinding as an, hydrateReadStateFromSessionAsync as ar, createExtensionHud as at, migrateSessionArtifactDirs as b, isExtensionDefinition as bn, basicTools as bt, INTERRUPT_MESSAGE_FOR_TOOL_USE as c, readKeybindings as cn, buildExtensionRegistry as ct, TOOL_USE_SKIPPED_MESSAGE as d, stripJsonComments as dn, filterExtensionRegistry as dt, KEYBINDING_KEY_COL_WIDTH as en, normalizeShellCommand as er, listExtensionCandidates as et, applyCompactSummaryCutoff as f, ALTERNATE_CRED_KEY_SUFFIX as fn, filterRegistryPlugins as ft, PERSISTENCE_PREVIEW_BYTES as g, ENTRY_CANDIDATES as gn, createExtensionHostRuntimeBridge as gt, PERSISTED_STUB_PREFIX as h, registerExtensionHostModules as hn, createArtifactsSurface as ht, isToolStateOps as i, keybindingsPath as in, hydrateReadStateFromSession as ir, updateInstalledExtension as it, selectRecentFiles as j, resolveExtensionConfigValue as jn, createSkillsReadTool as jt, selectFilesFromReadState as k, isValidExtensionConfigValue as kn, createSkillsUseTool as kt, SHELL_CASCADE_CANCEL_MESSAGE as l, readKeybindingsRaw as ln, composeExtensionPreset as lt, renderStaleReadNotice as m, isReservedCredKey as mn, partitionExtensionCatalog as mt, DEFAULT_MAX_VALUE_BYTES as n, formatBindingForDisplay as nn, getReadState as nr, readExtensionInstallProvenance as nt, normalizeProviders as o, mergeKeybindings as on, readStateKey as or, discoverAndBuildExtensionRegistry as ot, collectNewlyStaleReadPaths as p, alternateCredKey as pn, mergeContributions as pt, CompactInvalidInputError as q, createArtifactDetectHook as qn, validateToolArgs as qt, createToolStateController as r, groupBindings as rn, hashContent as rr, removeInstalledExtension as rt, resolveModelTargets as s, parseBindingSpec as sn, resolveReadStateMap as sr, buildExtensionPreset as st, createAgent as t, ensureKeybindingsFile as tn, stableStringify as tr, parseExtensionInstallSource as tt, TOOL_USE_CANCELLED_MESSAGE as u, resolveExtensionKeybindings as un, disposeExtensionRegistry as ut, cleanupPersistedSession as v, discoverExtensions as vn, composePresets as vt, resolveMcpWarningsDir as w, setDebugLogSink as wn, waitTask as wt, rehomePersistedStubs as x, parseExtensionScanPathEnv as xn, basic_default as xt, maybePersistToolResult as y, inlineLoadedExtension as yn, definePreset as yt, buildTailCompactPrompt as z, branchKind as zn, createModelSearchTool as zt };
+export { ExtensionInstallError as $, effectiveContextWindow as $n, DEFAULT_KEYBINDINGS as $t, buildPostCompactAttachments as A, isValidExtensionConfigItem as An, reserveChildLabel as At, buildFullCompactPrompt as B, artifactKindLabel as Bn, multiEdit as Bt, rehomePersistedStubs as C, parseExtensionScanPathEnv as Cn, basic_default as Ct, resolvePersistDir as D, defineExtension as Dn, createToolSearchTool as Dt, resolveMcpWarningsDir as E, setDebugLogSink as En, waitTask as Et, BASE_INSTRUCTIONS as F, toWireConfigSchema as Fn, createShellTool as Ft, sliceForCompaction as G, parseShortstat as Gn, createInteractionTool as Gt, buildUpToCompactPrompt as H, commitKind as Hn, formatModelLine as Ht, NO_TOOLS_PREAMBLE as I, EXTENSION_BUS_MAX_PAYLOAD_BYTES as In, shell as It, truncateHeadForPtlRetry as J, renderArtifactRow as Jn, edit as Jt, stripImagesFromTurns as K, pullRequestKind as Kn, grep as Kt, TRAILER as L, createExtensionBus as Ln, tailTruncate as Lt, selectFilesFromSession as M, resolveExtensionConfig as Mn, createSkillsRunScriptTool as Mt, selectRecentFiles as N, resolveExtensionConfigValue as Nn, createSkillsReadTool as Nt, resolveSessionDir as O, clampExtensionConfigNumber as On, createSpawnTool as Ot, compactConversation as P, sanitizeExtensionConfigActionPatch as Pn, shellKill as Pt, createExtensionPromptBridge as Q, OUTPUT_RESERVE_TOKENS as Qn, recordArtifact as Qt, buildCompactPrompt as R, serializedPayloadBytes as Rn, readFile$1 as Rt, migrateSessionArtifactDirs as S, isExtensionDefinition as Sn, basicTools as St, resolveLegacySessionDir as T, createDebugLog as Tn, WAIT_TASK_TIMED_OUT_PREFIX as Tt, ANCHOR_PREVIEW_MAX_CHARS as U, fileKind as Un, matchModelEntries as Ut, buildTailCompactPrompt as V, branchKind as Vn, createModelSearchTool as Vt, anchorPreviewFor as W, githubTokenSource as Wn, listFiles as Wt, CompactPromptTooLongError as X, createArtifactDetectHook as Xn, artifacts_default as Xt, CompactInvalidInputError as Y, resolveArtifactKind as Yn, validateToolArgs as Yt, EMPTY_EXTENSION_REGISTRY as Z, AUTO_COMPACT_MIN_GROWTH_FRACTION as Zn, RECORD_ARTIFACT_TOOL as Zt, PERSISTED_STUB_PREFIX as _, registerExtensionHostModules as _n, createArtifactsSurface as _t, stagedToolState as a, groupBindings as an, getReadState as ar, removeInstalledExtension as at, cleanupPersistedSession as b, discoverExtensions as bn, composePresets as bt, INTERRUPT_MESSAGE_FOR_TOOL_USE as c, mergeKeybindings as cn, hydrateReadStateFromSessionAsync as cr, discoverAndBuildExtensionRegistry as ct, TOOL_USE_SKIPPED_MESSAGE as d, readKeybindingsRaw as dn, composeExtensionPreset as dt, KEYBINDING_DEFS as en, shouldAutoCompact as er, fetchExtensionSource as et, applyCompactSummaryCutoff as f, resolveExtensionKeybindings as fn, disposeExtensionRegistry as ft, unwrapCallTool as g, isReservedCredKey as gn, partitionExtensionCatalog as gt, CALL_TOOL_NAME as h, alternateCredKey as hn, mergeContributions as ht, isToolStateOps as i, formatBindingForDisplay as in, stableStringify as ir, readExtensionInstallProvenance as it, selectFilesFromReadState as j, isValidExtensionConfigValue as jn, createSkillsUseTool as jt, resolveTasksDir as k, coerceExtensionConfigInput as kn, isSpawnTool as kt, SHELL_CASCADE_CANCEL_MESSAGE as l, parseBindingSpec as ln, readStateKey as lr, buildExtensionPreset as lt, renderStaleReadNotice as m, ALTERNATE_CRED_KEY_SUFFIX as mn, filterRegistryPlugins as mt, DEFAULT_MAX_VALUE_BYTES as n, KEYBINDING_KEY_COL_WIDTH as nn, defaultRepeatGuardTracked as nr, listExtensionCandidates as nt, normalizeProviders as o, keybindingsPath as on, hashContent as or, updateInstalledExtension as ot, collectNewlyStaleReadPaths as p, stripJsonComments as pn, filterExtensionRegistry as pt, summaryToTurn as q, refreshArtifact as qn, glob as qt, createToolStateController as r, ensureKeybindingsFile as rn, normalizeShellCommand as rr, parseExtensionInstallSource as rt, resolveModelTargets as s, matchesBinding as sn, hydrateReadStateFromSession as sr, createExtensionHud as st, createAgent as t, KEYBINDING_DEF_BY_ACTION as tn, defaultRepeatGuardNormalize as tr, installExtensionFromSpec as tt, TOOL_USE_CANCELLED_MESSAGE as u, readKeybindings as un, resolveReadStateMap as ur, buildExtensionRegistry as ut, PERSISTENCE_PREVIEW_BYTES as v, ENTRY_CANDIDATES as vn, createExtensionHostRuntimeBridge as vt, resolveLegacyPersistDir as w, scanExtensionDirectories as wn, writeFile$1 as wt, maybePersistToolResult as x, inlineLoadedExtension as xn, definePreset as xt, buildPersistedStub as y, defaultExtensionScanPaths as yn, createWorkspaceSurface as yt, buildFromCompactPrompt as z, BUILTIN_ARTIFACT_KINDS as zn, looksBinary as zt };
 
-//# sourceMappingURL=agent-BipX4BBj.js.map
+//# sourceMappingURL=agent-BCG9JcZl.js.map