zidane 6.1.4 → 6.1.6

package/dist/acp-cli.js

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

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { Ef as ToolDef, Gd as PromptPart, Jf as SessionStore, Li as AgentOptions, Pd as McpServerConfig, Pi as Agent, Wf as Session, ef as SessionContentBlock, ff as ToolResultContent, kp as Provider, t as Preset, xf as TurnUsage, yd as AgentBehavior } from "./index-DC9Iy3Vn.js";
+import { $d as PromptPart, Dd as AgentBehavior, Hd as McpServerConfig, Li as AgentOptions, Lp as Provider, Pf as ToolDef, Pi as Agent, Qf as Session, bf as ToolResultContent, cf as SessionContentBlock, kf as TurnUsage, np as SessionStore, t as Preset } from "./index-CR6uvJ3m.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-CO1EGSwh.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-D-k-L0DX.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-CZKpBI1X.js → agent-BJ1NC1pA.js}

@@ -1019,6 +1019,7 @@ function isValidExtensionConfigItem(item) {
 		case "number": return typeof item.default === "number" && Number.isFinite(item.default) && (item.min === void 0 || item.default >= item.min) && (item.max === void 0 || item.default <= item.max);
 		case "string": return typeof item.default === "string";
 		case "enum": return typeof item.default === "string" && Array.isArray(item.options) && item.options.length > 0 && item.options.every((o) => o && typeof o.value === "string" && typeof o.label === "string") && item.options.some((o) => o.value === item.default);
+		case "model": return typeof item.default === "string";
 		default: return unreachableInvalidItem(item);
 	}
 }
@@ -1057,6 +1058,9 @@ function isValidExtensionConfigValue(item, value) {
 		case "enum":
 			if (typeof value !== "string" || !item.options.some((o) => o.value === value)) return false;
 			break;
+		case "model":
+			if (typeof value !== "string") return false;
+			break;
 		default: return unreachableInvalidItem(item);
 	}
 	if (item.validate) try {
@@ -1110,6 +1114,7 @@ function coerceExtensionConfigInput(item, raw) {
 			return isValidExtensionConfigValue(item, clamped) ? clamped : void 0;
 		}
 		case "string": return isValidExtensionConfigValue(item, raw) ? raw : void 0;
+		case "model": return isValidExtensionConfigValue(item, raw) ? raw : void 0;
 		default: return;
 	}
 }
@@ -5115,7 +5120,8 @@ function buildSpawnTool(options, state) {
 		type: "string",
 		description: buildModelFieldDescription(modelCatalog)
 	} } : {};
-	return {
+	const tool = {
+		maxConcurrent,
 		get children() {
 			return localChildren;
 		},
@@ -5165,6 +5171,9 @@ function buildSpawnTool(options, state) {
 			}
 		},
 		async execute(input, ctx) {
+			return (await tool.runTask(input, ctx)).message;
+		},
+		async runTask(input, ctx) {
 			const task = input.task;
 			const systemOverride = input.system;
 			const requestedSubagentType = typeof input.subagent_type === "string" ? input.subagent_type : void 0;
@@ -5173,7 +5182,11 @@ function buildSpawnTool(options, state) {
 			if (requestedModel && modelCatalog && !modelCatalog.some((e) => e.model.id === requestedModel)) {
 				const near = matchModelEntries(modelCatalog, requestedModel).slice(0, 8);
 				const shown = near.length > 0 ? near : modelCatalog.slice(0, 8);
-				return `Cannot spawn: unknown model "${requestedModel}". ${near.length > 0 ? "Closest matches" : "Available"}: ${shown.map((e) => e.model.id).join(", ")}${modelCatalog.length > shown.length ? ` … (${modelCatalog.length} total — use model_search to browse)` : ""}`;
+				return {
+					status: "rejected",
+					text: "",
+					message: `Cannot spawn: unknown model "${requestedModel}". ${near.length > 0 ? "Closest matches" : "Available"}: ${shown.map((e) => e.model.id).join(", ")}${modelCatalog.length > shown.length ? ` … (${modelCatalog.length} total — use model_search to browse)` : ""}`
+				};
 			}
 			const chosenModelId = requestedModel ?? subagentDef?.model ?? options.model;
 			let childProvider = ctx.provider;
@@ -5181,16 +5194,32 @@ function buildSpawnTool(options, state) {
 			if (chosenEntry) {
 				const routed = resolveProviderByName(chosenEntry.provider, ctx);
 				if (routed) childProvider = routed;
-				else if (requestedModel !== void 0) return `Cannot spawn: model "${chosenModelId}" is served by provider "${chosenEntry.provider}", which is not available in this run. Pick a model from an available provider${modelCatalog && modelCatalog.length > EMBEDDED_CATALOG_MAX ? " (use model_search)" : ""}.`;
+				else if (requestedModel !== void 0) return {
+					status: "rejected",
+					text: "",
+					message: `Cannot spawn: model "${chosenModelId}" is served by provider "${chosenEntry.provider}", which is not available in this run. Pick a model from an available provider${modelCatalog && modelCatalog.length > EMBEDDED_CATALOG_MAX ? " (use model_search)" : ""}.`
+				};
 			}
 			const inheritedModel = childProvider === ctx.provider ? ctx.model : void 0;
 			const childModel = chosenModelId ?? inheritedModel;
 			const announcedModel = childModel ?? childProvider.meta.defaultModel;
 			const parentDepth = ctx.depth ?? 0;
 			const childDepth = parentDepth + 1;
-			if (childDepth > maxDepth) return `Cannot spawn: maxDepth=${maxDepth} reached (parent depth=${parentDepth}). Deepen the cap with createSpawnTool({ maxDepth }).`;
-			if (state.activeCount >= maxConcurrent) return `Cannot spawn: ${state.activeCount}/${maxConcurrent} sub-agents already running. Wait for one to complete.`;
-			if (ctx.signal.aborted) return `[sub-agent pre-aborted] Parent signal was already aborted — skipped "${task.slice(0, 80)}"`;
+			if (childDepth > maxDepth) return {
+				status: "rejected",
+				text: "",
+				message: `Cannot spawn: maxDepth=${maxDepth} reached (parent depth=${parentDepth}). Deepen the cap with createSpawnTool({ maxDepth }).`
+			};
+			if (state.activeCount >= maxConcurrent) return {
+				status: "rejected",
+				text: "",
+				message: `Cannot spawn: ${state.activeCount}/${maxConcurrent} sub-agents already running. Wait for one to complete.`
+			};
+			if (ctx.signal.aborted) return {
+				status: "aborted",
+				text: "",
+				message: `[sub-agent pre-aborted] Parent signal was already aborted — skipped "${task.slice(0, 80)}"`
+			};
 			const id = ctx.session ? reserveChildLabel(ctx.session) : `child-${++state.counter}`;
 			state.activeCount++;
 			const child = {
@@ -5204,6 +5233,7 @@ function buildSpawnTool(options, state) {
 			let childRunStatus = "completed";
 			let finalStats;
 			let result = "";
+			let responseText = "";
 			let unbubble;
 			try {
 				const filteredTools = subagentDef ? filterToolsForSubagent(ctx.tools, subagentDef) : ctx.tools;
@@ -5272,6 +5302,7 @@ function buildSpawnTool(options, state) {
 						result = [`[sub-agent ${id}] Aborted after ${treeTurns} turns (${finalStats.elapsed}ms)`, `Tokens: ${usage}`].join("\n");
 					} else {
 						const response = extractText(agent.turns.at(-1));
+						responseText = response ?? "";
 						result = [
 							`[sub-agent ${id}] Completed in ${treeTurns} turns (${finalStats.elapsed}ms)`,
 							`Tokens: ${usage}`,
@@ -5368,7 +5399,13 @@ function buildSpawnTool(options, state) {
 					provider: childProvider.name,
 					error: destroyError
 				});
-				return result;
+				return {
+					id,
+					status: childRunStatus,
+					text: responseText,
+					message: result,
+					...finalStats ? { stats: finalStats } : {}
+				};
 			} finally {
 				unbubble?.();
 				state.activeCount--;
@@ -5376,6 +5413,7 @@ function buildSpawnTool(options, state) {
 			}
 		}
 	};
+	return tool;
 }
 //#endregion
 //#region src/tools/tool-search.ts
@@ -6954,6 +6992,7 @@ function makeContext(opts) {
 		submitPrompt: (text, submitOpts) => promptBridge?.submit(text, submitOpts) ?? false,
 		runtime: {
 			model: () => hostRuntime?.current()?.model() ?? null,
+			models: () => hostRuntime?.current()?.models?.() ?? [],
 			thinking: () => hostRuntime?.current()?.thinking() ?? null,
 			setThinking: (level) => hostRuntime?.current()?.setThinking(level) ?? false
 		},
@@ -14677,4 +14716,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 _, defaultRepeatGuardTracked as _n, createSkillsRunScriptTool as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, clampExtensionConfigNumber as an, createWorkspaceSurface as at, selectRecentFiles as b, createShellTool as bt, applyCompactSummaryCutoff as c, isValidExtensionConfigValue as cn, basicTools as ct, buildPersistedStub as d, toWireConfigSchema as dn, WAIT_TASK_TIMED_OUT_PREFIX as dt, inlineLoadedExtension as en, disposeExtensionRegistry as et, cleanupPersistedSession as f, AUTO_COMPACT_MIN_GROWTH_FRACTION as fn, waitTask as ft, resolveTasksDir as g, defaultRepeatGuardNormalize as gn, createSkillsUseTool as gt, resolvePersistDir as h, shouldAutoCompact 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, effectiveContextWindow 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, OUTPUT_RESERVE_TOKENS 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, normalizeShellCommand as vn, createSkillsReadTool as vt, TRAILER as w, looksBinary as wt, compactConversation as x, shell as xt, selectFilesFromSession as y, stableStringify as yn, shellKill as yt, createExtensionPromptBridge as z, KEYBINDING_KEY_COL_WIDTH as zt };
 
-//# sourceMappingURL=agent-CZKpBI1X.js.map
+//# sourceMappingURL=agent-BJ1NC1pA.js.map