zidane 6.2.14 → 6.2.18

package/dist/acp-cli.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-import { Ft as resolveStorageDirs, lt as basic_default } from "./agent-DoEx_WD3.js";
+import { Ft as resolveStorageDirs, lt as basic_default } from "./agent-DBfHPAgz.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";
-import { t as anthropic } from "./anthropic-BYsc6qWj.js";
+import { t as anthropic } from "./anthropic-uKvj1yle.js";
 import { arcee } from "./providers/arcee.js";
 import { baseten } from "./providers/baseten.js";
 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-DxYjSCQW.js";
-import { f as credKeyOf, i as readCredentials, l as BUILTIN_PROVIDERS, r as credentialsPath, t as detectAuth, y as modelsForDescriptor } from "./auth-Bb479DFB.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-CxE1-kHy.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";
 import { createE2BProvider } from "./contexts/e2b.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { Bd as AgentBehavior, Hf as TurnUsage, Li as AgentOptions, Nf as ToolResultContent, Pi as Agent, Zp as Provider, dp as Session, ff as PromptPart, hp as SessionStore, qf as ToolDef, t as Preset, tf as McpServerConfig, xf as SessionContentBlock } from "./index-l0wehkWU.js";
+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-CC0JD-0H.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-DxYjSCQW.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-CxE1-kHy.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-DoEx_WD3.js → agent-DBfHPAgz.js}

@@ -13,13 +13,13 @@ import { C as stripShellInterpolations, O as validateResourcePathReal, S as inte
 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 withInactivityTimeout, i as settleWithinTimeout, n as linkAbortSignal, o as withTimeout$1, r as resolveTimeoutMs, t as OperationTimeoutError } from "./timeout-BDetbuN6.js";
-import { n as connectMcpServers, s as wrapDiscoveredMcpTools } from "./mcp-BCaN_Gyg.js";
 import { createRequire } from "node:module";
 import { basename, delimiter, dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { createHooks } from "hookable";
@@ -4932,6 +4932,67 @@ function filterToolsForSubagent(parentTools, def) {
 	return parentTools;
 }
 /**
+* Wrap the parent's live MCP connection as a child `mcpConnector`. The
+* child agent gets the SAME already-connected, already-wrapped tool defs
+* (and instructions) — no re-bootstrap, no re-auth, so servers connected
+* through a custom parent connector (e.g. the TUI's OAuth-aware one) stay
+* reachable from subagents. `close` is a no-op: the parent owns the
+* transports and closes them on its own destroy; a child's destroy must
+* never tear down connections the parent is still using.
+*
+* Shared tool defs keep the hook bus they were built with, so
+* `mcp:tool:gate` / `mcp:tool:transform` fire on the parent's hooks —
+* child MCP calls are governed by the same gate policy as the session
+* that spawned them.
+*/
+function nonOwningMcpConnector(connection) {
+	return async () => nonOwningMcpView(connection);
+}
+/**
+* Decide what MCP state a child inherits, honoring the subagent tool
+* policy. `filterToolsForSubagent` only sees the parent's native registry
+* — MCP tools arrive later via the child's connector — so without this
+* gate a `readonly` or allowlisted subagent would inherit the parent's
+* FULL MCP toolset on top of its filtered natives.
+*
+* Policy mirror of {@link filterToolsForSubagent}:
+*   - no def / unrestricted def → full inheritance (config + shared live
+*     connection when present).
+*   - `readonly: true` → nothing. MCP tools carry unknown mutation risk;
+*     the read-only whitelist is intentionally native-only. Subagents that
+*     need specific MCP reads should use an explicit `tools` list.
+*   - explicit `tools` list → only MCP tools named in the list, and only
+*     through the shared live connection — forwarding configs without one
+*     would re-bootstrap every server and reopen the bypass this exists
+*     to close. Instructions are trimmed to servers that still contribute
+*     a tool.
+*/
+function inheritedMcpForSubagent(ctx, def) {
+	const explicit = def?.tools;
+	if (!(def !== void 0 && (def.readonly === true || explicit !== void 0 && explicit.length > 0))) return {
+		...ctx.mcpServers !== void 0 ? { mcpServers: ctx.mcpServers } : {},
+		...ctx.mcpConnection !== void 0 ? { mcpConnector: nonOwningMcpConnector(ctx.mcpConnection) } : {}
+	};
+	if (!explicit || explicit.length === 0) return {};
+	if (ctx.mcpConnection === void 0) return {};
+	const wanted = new Set(explicit);
+	const tools = {};
+	for (const [key, t] of Object.entries(ctx.mcpConnection.tools)) if (wanted.has(t.spec.name)) tools[key] = t;
+	const surviving = Object.keys(tools);
+	if (surviving.length === 0) return {};
+	const servers = ctx.mcpServers ?? [];
+	const keepServers = new Set(surviving.map((name) => deriveMcpToolMeta(name, servers).server));
+	const instructions = ctx.mcpConnection.instructions;
+	const filteredInstructions = instructions ? new Map([...instructions].filter(([name]) => keepServers.has(name))) : void 0;
+	return {
+		...ctx.mcpServers !== void 0 ? { mcpServers: ctx.mcpServers } : {},
+		mcpConnector: nonOwningMcpConnector({
+			tools,
+			...filteredInstructions !== void 0 && filteredInstructions.size > 0 ? { instructions: filteredInstructions } : {}
+		})
+	};
+}
+/**
 * Render the per-type descriptions into a single schema-field
 * description string the model reads when choosing a `subagent_type`.
 * Falls back to a generic line when the host didn't supply any per-type
@@ -5259,12 +5320,13 @@ function buildSpawnTool(options, state) {
 			let unbubble;
 			try {
 				const filteredTools = subagentDef ? filterToolsForSubagent(ctx.tools, subagentDef) : ctx.tools;
+				const inheritedMcp = inheritedMcpForSubagent(ctx, subagentDef);
 				const parentPreset = {
 					...ctx.name !== void 0 ? { name: ctx.name } : {},
 					...ctx.system !== void 0 ? { system: ctx.system } : {},
 					tools: filteredTools,
 					...ctx.toolAliases !== void 0 ? { toolAliases: ctx.toolAliases } : {},
-					...ctx.mcpServers !== void 0 ? { mcpServers: ctx.mcpServers } : {},
+					...inheritedMcp.mcpServers !== void 0 ? { mcpServers: inheritedMcp.mcpServers } : {},
 					...ctx.skills !== void 0 ? { skills: ctx.skills } : {},
 					...ctx.behavior !== void 0 ? { behavior: ctx.behavior } : {}
 				};
@@ -5272,6 +5334,7 @@ function buildSpawnTool(options, state) {
 				const agent = createAgent({
 					...parentPreset,
 					...options.preset,
+					...inheritedMcp.mcpConnector !== void 0 && options.preset?.mcpServers === void 0 ? { mcpConnector: inheritedMcp.mcpConnector } : {},
 					provider: childProvider,
 					execution: ctx.execution,
 					...options.persist && ctx.session ? { session: ctx.session } : {},
@@ -11459,6 +11522,17 @@ function sanitizeToolOutputForProvider(provider, output) {
 	return sanitized;
 }
 /**
+* `ToolContext.mcpConnection` spread fragment — resolves the loop's lazy
+* connection getter at tool-call time (the agent binds MCP after loop
+* start, so a build-time snapshot would always be null on the first turn).
+* Empty object when the agent has no live connection.
+*/
+function mcpConnectionFor(ctx) {
+	const connection = ctx.agentMcpConnection?.();
+	if (!connection) return {};
+	return { mcpConnection: nonOwningMcpView(connection) };
+}
+/**
 * Build the per-call base for every `tool:*` hook ctx (and the
 * matching shape for `mcp:tool:*`). Centralized so the `runId` /
 * `parentRunId` / `depth` identity fields land uniformly on every
@@ -11634,6 +11708,7 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			...ctx.agentSystem !== void 0 ? { system: ctx.agentSystem } : {},
 			...ctx.agentToolAliases !== void 0 ? { toolAliases: ctx.agentToolAliases } : {},
 			...ctx.agentMcpServers !== void 0 ? { mcpServers: ctx.agentMcpServers } : {},
+			...mcpConnectionFor(ctx),
 			...ctx.agentSkills !== void 0 ? { skills: ctx.agentSkills } : {},
 			...ctx.agentBehavior !== void 0 ? { behavior: ctx.agentBehavior } : {},
 			turnId,
@@ -12226,6 +12301,7 @@ async function startDurableToolExecution(ctx, call, turnId, index) {
 		...ctx.agentSystem !== void 0 ? { system: ctx.agentSystem } : {},
 		...ctx.agentToolAliases !== void 0 ? { toolAliases: ctx.agentToolAliases } : {},
 		...ctx.agentMcpServers !== void 0 ? { mcpServers: ctx.agentMcpServers } : {},
+		...mcpConnectionFor(ctx),
 		...ctx.agentSkills !== void 0 ? { skills: ctx.agentSkills } : {},
 		...ctx.agentBehavior !== void 0 ? { behavior: ctx.agentBehavior } : {},
 		turnId,
@@ -14233,7 +14309,8 @@ function createAgent(rawOptions) {
 					agentSystem,
 					agentTools: sourceTools,
 					agentToolAliases: effectiveToolAliases,
-					agentMcpServers: mcpServers,
+					agentMcpServers: allMcpServers.length > 0 ? allMcpServers : void 0,
+					agentMcpConnection: () => mcpConnection,
 					agentSkills,
 					agentBehavior: resolvedBehavior,
 					tools,
@@ -14877,4 +14954,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-DoEx_WD3.js.map
+//# sourceMappingURL=agent-DBfHPAgz.js.map