zidane 6.4.4 → 6.5.0

package/dist/{agent-8sUadp5M.js → agent-SQ6rxfpT.js}

@@ -10,11 +10,12 @@ import { i as isOutputExceededMessage } from "./output-cap-C9zukcCj.js";
 import { r as createProcessContext, t as resolveDetachedTasksCapability } from "./contexts-DWVt7MvF.js";
 import { n as shellQuote, t as alwaysQuote } from "./shell-quote-BmnhZmdM.js";
 import { a as AgentProviderError, d as isAbortLikeError, h as toTypedError, i as AgentLengthResumeExhaustedError, n as AgentBudgetExceededError, s as AgentToolPairingError, t as AgentAbortedError, u as errorMessage } from "./errors-BwBxu3zD.js";
-import { C as stripShellInterpolations, O as validateResourcePathReal, S as interpolateShellCommands, _ as lastLine, b as resolveSubdirRoot, d as installAllowedToolsGate, f as createSkillActivationState, g as fetchInstallSource, h as defaultWhich, j as projectUserPaths, l as buildCatalog, m as defaultExec, p as InstallSourceError, t as resolveSkills, v as parseInstallSource, x as escapeXml, y as resolveNpmVersion } from "./resolve-CZJxds85.js";
+import { A as createSkillActivationState, D as escapeXml, E as buildCatalog, F as validateResourcePathReal, R as projectUserPaths, _ as lastLine, a as interpolateShellCommands, b as resolveSubdirRoot, g as fetchInstallSource, h as defaultWhich, k as installAllowedToolsGate, m as defaultExec, n as resolveSkills, o as stripShellInterpolations, p as InstallSourceError, v as parseInstallSource, y as resolveNpmVersion } from "./skills-Cp9vnBwd.js";
 import { n as writeFileAtomicAsync, t as writeFileAtomic } from "./atomic-write-B7zr1ddF.js";
+import { p as resolveStorageDirs, r as loadAgentPlugin } from "./plugins-2PMTVcp-.js";
 import { r as createLogger, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { n as reconcileImageMediaType } from "./media-sniff-UKijEaiQ.js";
-import { d as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-3GXUBwur.js";
+import { f as wrapDiscoveredMcpTools, i as deriveMcpToolMeta, n as connectMcpServers, s as nonOwningMcpView } from "./mcp-D27rP47I.js";
 import { M as buildPromptMessage, N as canonicalizePrompt } from "./openai-compat-B3c_hzwf.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-C01kKGj0.js";
@@ -1224,6 +1225,43 @@ function defineExtension(definition) {
 	return definition;
 }
 //#endregion
+//#region src/debug-log.ts
+/**
+* `ZIDANE_DEBUG`-gated diagnostic logging.
+*
+* The three subsystems that need this (TUI shell, discovery, extension
+* scanning) each had their own three-line copy, differing only in the scope
+* label and — accidentally — in sink and formatting: one used `console.error`
+* with a raw error object, two used `process.stderr.write` with
+* {@link errorMessage}. The label is a real per-module difference, so it's a
+* parameter; the rest was drift.
+*
+* Distinct from `./logger`, which is the structured, sink-backed `Logger`
+* surfaced to extensions and hosts. This is the unstructured "print it when
+* debugging" path: no levels, no sinks, off unless `ZIDANE_DEBUG` is set, and
+* always stderr so it can never corrupt stdout for a piped host.
+*/
+/**
+* Build a debug logger scoped to a subsystem. Emits
+* `[zidane/<scope>] <label>: <details…>` on stderr when `ZIDANE_DEBUG` is set,
+* and is a no-op otherwise.
+*
+* `details` are flattened through {@link errorMessage}, so an `Error` prints
+* its message rather than `[object Object]` and plain strings pass through.
+*
+* The env var is read per call rather than captured at module load so a test
+* (or a host toggling it at runtime) sees the change; the check is a property
+* read on an already-materialized object, so the cost is irrelevant next to
+* the I/O it guards.
+*/
+function createDebugLog(scope) {
+	return (label, ...details) => {
+		if (!process.env.ZIDANE_DEBUG) return;
+		const tail = details.length > 0 ? `: ${details.map(errorMessage).join(" ")}` : "";
+		process.stderr.write(`[zidane/${scope}] ${label}${tail}\n`);
+	};
+}
+//#endregion
 //#region src/extensions/with-timeout.ts
 /**
 * Internal: race a promise against a timeout. Shared by the discovery
@@ -1246,6 +1284,11 @@ function withTimeout(promise, timeoutMs, message, onTimeout) {
 //#endregion
 //#region src/extensions/discovery.ts
 /**
+* Scoped `ZIDANE_DEBUG` logger. A `const` rather than a hoisted function
+* declaration, so it must precede its call sites.
+*/
+const debugLog = createDebugLog("extensions");
+/**
 * Entry-point filenames probed inside each `<name>/` directory, in
 * preference order. Bun loads `.ts` / `.tsx` natively; `.mjs` / `.js`
 * are accepted so pre-compiled extensions (or vibe-coded JS-only ones)
@@ -1657,9 +1700,6 @@ function isExtensionManifest(value) {
 	const isStringArray = (x) => Array.isArray(x) && x.every((el) => typeof el === "string");
 	return (v.name === void 0 || typeof v.name === "string") && (v.displayName === void 0 || typeof v.displayName === "string") && (v.description === void 0 || typeof v.description === "string") && (v.permissions === void 0 || isStringArray(v.permissions)) && (v.capabilities === void 0 || isStringArray(v.capabilities));
 }
-function debugLog(label, err) {
-	if (process.env.ZIDANE_DEBUG) process.stderr.write(`[zidane/extensions] ${label}: ${errorMessage(err)}\n`);
-}
 //#endregion
 //#region src/extensions/host-modules.ts
 const registered = /* @__PURE__ */ new Set();
@@ -2318,86 +2358,6 @@ function stripJsonComments(input) {
 	return out;
 }
 //#endregion
-//#region src/chat/xdg.ts
-/**
-* XDG Base Directory resolution for zidane.
-*
-* The user's storage spreads across four logical slots:
-*
-*   - **config** — credentials, mcp-credentials, keybindings, config.json,
-*     mcps.json, skills (user-editable surface).
-*   - **data**   — sessions.db (long-lived chat history).
-*   - **state**  — state.json (per-machine UI bookkeeping: last provider,
-*     last model, last agent, settings).
-*   - **cache**  — persisted tool results, background-task logs,
-*     auto-update registry cache (regenerable, safe to wipe).
-*
-* Historically all four collapsed to `~/.zidane/`. This module adds
-* XDG-Base-Directory-aware defaults so a Linux user with no existing
-* `~/.zidane/` lands in the conventional `~/.config/zidane/`,
-* `~/.local/share/zidane/`, `~/.local/state/zidane/`, `~/.cache/zidane/`
-* trio. Existing setups (anyone with a `~/.zidane/` directory or
-* `ZIDANE_STORAGE_DIR` set) keep the single-dir layout unchanged.
-*
-* Resolution flow — applied in this order:
-*
-*   1. Caller passed an explicit `storageDir` (`ChatOptions.storageDir`)
-*      OR `ZIDANE_STORAGE_DIR` is set → **legacy-explicit** single-dir
-*      layout under `<storageDir>/<prefix>`. The four slots collapse to
-*      the same directory.
-*   2. `~/<prefix>/` already exists on disk → **legacy-existing**
-*      single-dir layout under that directory. Upgrades never silently
-*      shift files around.
-*   3. Any `XDG_*_HOME` env var is set OR `process.platform === 'linux'`
-*      → **XDG split**. Each slot lands in its own dir. Per-slot
-*      `ZIDANE_{CONFIG,DATA,CACHE,STATE}_DIR` overrides beat the XDG
-*      vars for surgical tweaks.
-*   4. Otherwise (macOS/Windows, no XDG signal, no existing dir) →
-*      **default** single-dir layout at `~/<prefix>/`. Day-one behavior
-*      on these platforms is unchanged.
-*
-* The `userDir` legacy alias always equals `configDir` so existing code
-* that still references `paths.userDir` keeps reading credentials, mcps,
-* etc. from the right place.
-*/
-/**
-* Resolve the four storage slots according to the precedence above.
-*
-* Pure aside from one filesystem probe (`existsSync(home/<prefix>)`)
-* — the same probe `resolveStoragePaths` would do anyway when
-* computing `paths.userDir`. No directories are created here; the
-* relevant write paths (state store, credentials writer, persist
-* dir) handle their own lazy `mkdirSync` already.
-*/
-function resolveStorageDirs(opts = {}) {
-	const env = opts.env ?? process.env;
-	const home = opts.home ?? homedir();
-	const platform = opts.platform ?? process.platform;
-	const rawPrefix = opts.prefix ?? ".zidane";
-	const prefixBare = rawPrefix.replace(/^\./, "");
-	const explicitStorageDir = opts.storageDir ?? env.ZIDANE_STORAGE_DIR;
-	if (explicitStorageDir) return single(resolve(explicitStorageDir, rawPrefix), "legacy-explicit");
-	const legacyHomeDir = resolve(home, rawPrefix);
-	if (existsSync(legacyHomeDir)) return single(legacyHomeDir, "legacy-existing");
-	if (platform === "linux" || !!env.XDG_CONFIG_HOME || !!env.XDG_DATA_HOME || !!env.XDG_CACHE_HOME || !!env.XDG_STATE_HOME || !!env.ZIDANE_CONFIG_DIR || !!env.ZIDANE_DATA_DIR || !!env.ZIDANE_STATE_DIR || !!env.ZIDANE_CACHE_DIR) return {
-		configDir: env.ZIDANE_CONFIG_DIR ?? resolve(env.XDG_CONFIG_HOME || resolve(home, ".config"), prefixBare),
-		dataDir: env.ZIDANE_DATA_DIR ?? resolve(env.XDG_DATA_HOME || resolve(home, ".local", "share"), prefixBare),
-		stateDir: env.ZIDANE_STATE_DIR ?? resolve(env.XDG_STATE_HOME || resolve(home, ".local", "state"), prefixBare),
-		cacheDir: env.ZIDANE_CACHE_DIR ?? resolve(env.XDG_CACHE_HOME || resolve(home, ".cache"), prefixBare),
-		mode: "xdg"
-	};
-	return single(legacyHomeDir, "default");
-}
-function single(base, mode) {
-	return {
-		configDir: base,
-		dataDir: base,
-		stateDir: base,
-		cacheDir: base,
-		mode
-	};
-}
-//#endregion
 //#region src/tools/path-suggest.ts
 function entryPath$2(entry) {
 	return typeof entry === "string" ? entry : entry.path;
@@ -5444,6 +5404,7 @@ function buildSpawnTool(options, state) {
 			}, state);
 		},
 		isConcurrencySafe: true,
+		runsNestedAgent: true,
 		spec: {
 			name: "spawn",
 			description: `Spawn a sub-agent for a self-contained task that benefits from isolation (separate context window, separate retries): for example, a deep research dive or a long codegen pass on a specific file. The sub-agent inherits your tool set (including \`spawn\` itself, depth-capped) and your system prompt unless overridden, runs independently, and returns its final response. Do NOT spawn for sequential steps you could do yourself.${modelCatalog ? " Children can run on a DIFFERENT model via the `model` field: cost-tier your delegation: mechanical, parallelizable, or high-volume search work belongs on cheaper/faster models, while synthesis and judgment stay on your own model." : ""}${options.persist ? " A stopped or failed sub-agent can be CONTINUED instead of restarted: pass `resume` with its child label (e.g. \"child-2\") and put the continuation instruction in `task`; the child picks up with its prior conversation intact." : ""}`,
@@ -5585,15 +5546,31 @@ function buildSpawnTool(options, state) {
 					...ctx.behavior !== void 0 ? { behavior: ctx.behavior } : {}
 				};
 				const sharedReadState = options.shareReadState ? resolveReadStateMap(ctx) : void 0;
+				const journaledDeadlineMs = ctx.clock?.journaled === true && options.timeoutMs !== void 0 && options.timeoutMs > 0 ? options.timeoutMs : void 0;
 				const agent = createAgent({
 					...parentPreset,
 					...options.preset,
 					...inheritedMcp.mcpConnector !== void 0 && options.preset?.mcpServers === void 0 ? { mcpConnector: inheritedMcp.mcpConnector } : {},
 					provider: childProvider,
 					execution: ctx.execution,
+					...ctx.clock ? { clock: ctx.clock } : {},
+					...options.shareHandle && ctx.handle ? { handle: ctx.handle } : {},
 					...options.persist && ctx.session ? { session: ctx.session } : {},
 					...sharedReadState ? { readState: sharedReadState } : {}
 				});
+				let reportedStats;
+				agent.hooks.hook("agent:done", (stats) => {
+					reportedStats = stats;
+				});
+				const nowMs = () => ctx.clock ? ctx.clock.now() : Date.now();
+				const spawnStartedMs = await nowMs();
+				let deadlineExceeded = false;
+				if (journaledDeadlineMs !== void 0) agent.hooks.hook("turn:after", (turnCtx) => {
+					if (deadlineExceeded) return;
+					if (turnCtx.message.createdAt - spawnStartedMs < journaledDeadlineMs) return;
+					deadlineExceeded = true;
+					agent.abort();
+				});
 				if (forwardHooks) {
 					const unregisterEnricher = agent.hooks.hook("tool:before", async (toolCtx) => {
 						if (toolCtx.name !== "write_file" && toolCtx.name !== "edit" && toolCtx.name !== "multi_edit") return;
@@ -5614,6 +5591,7 @@ function buildSpawnTool(options, state) {
 				const spawnHookCtx = {
 					id,
 					task,
+					...ctx.callId ? { callId: ctx.callId } : {},
 					...resumeLabel !== void 0 ? { resumesChildId: resumeLabel } : {},
 					depth: childDepth,
 					model: announcedModel,
@@ -5631,48 +5609,54 @@ function buildSpawnTool(options, state) {
 					signal: ctx.signal,
 					depth: childDepth,
 					...options.persist && ctx.runId ? { parentRunId: ctx.runId } : {},
+					...ctx.callId ? { parentCallId: ctx.callId } : {},
 					...options.persist && ctx.session ? { runLabel: id } : {},
 					...resumeRun ? { resumeRunId: resumeRun.id } : {},
 					...propagatedTracing ? { tracingContext: propagatedTracing } : {}
 				});
 				try {
-					finalStats = await raceWithTimeout(runPromise, options.timeoutMs);
+					finalStats = await raceWithTimeout(runPromise, journaledDeadlineMs === void 0 ? options.timeoutMs : void 0);
 					const treeTurns = flattenTurns(finalStats).length;
 					const usage = formatTokenUsage(finalStats);
-					if (ctx.signal.aborted) {
+					const elapsedMs = await nowMs() - spawnStartedMs;
+					if (deadlineExceeded) {
+						childRunStatus = "timeout";
+						result = `[sub-agent ${id}] Timed out after ${journaledDeadlineMs}ms`;
+					} else if (ctx.signal.aborted) {
 						childRunStatus = "aborted";
-						result = [`[sub-agent ${id}] Aborted after ${treeTurns} turns (${finalStats.elapsed}ms)`, `Tokens: ${usage}`].join("\n");
+						result = [`[sub-agent ${id}] Aborted after ${treeTurns} turns (${elapsedMs}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)`,
+							`[sub-agent ${id}] Completed in ${treeTurns} turns (${elapsedMs}ms)`,
 							`Tokens: ${usage}`,
 							"",
 							response || "(no text response)"
 						].join("\n");
 					}
 				} catch (err) {
-					if (err instanceof SpawnTimeoutError) {
+					const timedOutAfterMs = err instanceof SpawnTimeoutError ? err.timeoutMs : deadlineExceeded ? journaledDeadlineMs : void 0;
+					if (timedOutAfterMs !== void 0) {
 						childRunStatus = "timeout";
 						agent.abort();
 						try {
 							finalStats = await runPromise;
 						} catch {
-							finalStats = {
+							finalStats = reportedStats ?? {
 								totalIn: 0,
 								totalOut: 0,
 								totalCacheRead: 0,
 								totalCacheCreation: 0,
 								turns: 0,
-								elapsed: err.timeoutMs
+								elapsed: timedOutAfterMs
 							};
 						}
-						result = `[sub-agent ${id}] Timed out after ${err.timeoutMs}ms`;
+						result = `[sub-agent ${id}] Timed out after ${timedOutAfterMs}ms`;
 					} else {
 						const error = err instanceof Error ? err : new Error(String(err));
 						childRunStatus = "error";
-						finalStats = {
+						finalStats = reportedStats ?? {
 							totalIn: 0,
 							totalOut: 0,
 							totalCacheRead: 0,
@@ -5684,6 +5668,7 @@ function buildSpawnTool(options, state) {
 						await ctx.hooks.callHook("spawn:error", {
 							id,
 							task,
+							...ctx.callId ? { callId: ctx.callId } : {},
 							depth: childDepth,
 							model: announcedModel,
 							provider: childProvider.name,
@@ -5692,7 +5677,7 @@ function buildSpawnTool(options, state) {
 					}
 				} finally {
 					const childHandle = agent.handle;
-					if (childHandle && ctx.execution.reassignBackgroundTasks) try {
+					if (childHandle && childHandle.id !== ctx.handle.id && ctx.execution.reassignBackgroundTasks) try {
 						const reassigned = await ctx.execution.reassignBackgroundTasks(childHandle, ctx.handle, (info) => {
 							Promise.resolve(ctx.hooks.callHook("background:exit", info)).catch(() => {});
 						});
@@ -5726,6 +5711,7 @@ function buildSpawnTool(options, state) {
 				const childRunStats = {
 					id,
 					task,
+					...ctx.callId ? { callId: ctx.callId } : {},
 					stats: finalStats,
 					depth: childDepth,
 					status: childRunStatus,
@@ -5736,6 +5722,7 @@ function buildSpawnTool(options, state) {
 				if (destroyError) await ctx.hooks.callHook("spawn:error", {
 					id,
 					task,
+					...ctx.callId ? { callId: ctx.callId } : {},
 					depth: childDepth,
 					model: announcedModel,
 					provider: childProvider.name,
@@ -6262,6 +6249,58 @@ function warnUnsafeKey(logger, method, key) {
 	logger.warn(`${method}: refused unsafe key`, { key });
 }
 /**
+* Resolve a path inside one extension's storage root for the given scope.
+*
+* A module-level function (rather than a closure inside `makeContext`) so
+* `ctx.loadAgentPlugin` can derive its `${PLUGIN_DATA}` parent from the same
+* rules without depending on declaration order within the context builder.
+*/
+function extensionStoragePath(paths, extensionName, scope, ...segments) {
+	const root = resolve(scope === "cache" ? paths.cacheDir : scope === "data" ? paths.dataDir : scope === "project" || scope === "session" ? paths.projectRoot ?? paths.dataDir : paths.configDir ?? paths.dataDir, "extensions", extensionName);
+	const target = resolve(root, ...segments);
+	if (target !== root && !target.startsWith(root + sep)) return root;
+	return target;
+}
+/**
+* Stamp the contributing extension onto a skill.
+*
+* `SkillConfig.source` carries the scope (project / user / inline) and is
+* defaulted here for extensions that don't set it. The extension NAME goes in
+* `metadata` under the `zidane.` prefix the Agent Skills spec reserves for
+* client-specific keys, so the skill stays spec-conformant while a host UI can
+* still say which extension shipped it.
+*/
+function withProvenance(skill, source, extensionName) {
+	return {
+		...skill,
+		source: skill.source ?? source,
+		metadata: {
+			...skill.metadata,
+			"zidane.extension": extensionName
+		}
+	};
+}
+/**
+* Rejected-plugin placeholder for `ctx.loadAgentPlugin` calls that never
+* reach the loader (missing `dir`, or a late call after `setup` resolved).
+* Returning a `LoadedPlugin` with `ok: false` rather than throwing keeps the
+* method's contract uniform — callers branch on `ok`, never on exceptions.
+*/
+function emptyPluginHandle(dir) {
+	return {
+		ok: false,
+		dir,
+		root: dir,
+		skills: [],
+		mcpServers: [],
+		components: {
+			skills: "unsupported",
+			mcp: "unsupported"
+		},
+		diagnostics: []
+	};
+}
+/**
 * Build the merged registry. `loaded` typically comes from
 * `discoverExtensions()` plus any inline ones via `inlineLoadedExtension`.
 *
@@ -6307,6 +6346,7 @@ async function buildExtensionRegistry(loaded, options = {}) {
 			hooks: {},
 			mcpServers: [],
 			skills: [],
+			plugins: [],
 			systemFragments: [],
 			contextBreakdownSections: [],
 			contextPanelSections: [],
@@ -6467,6 +6507,7 @@ function captureContributions(perExtSinks) {
 		hooks: perExtSinks.hooks,
 		mcpServers: perExtSinks.mcpServers,
 		skills: perExtSinks.skills,
+		plugins: perExtSinks.plugins,
 		systemFragments: perExtSinks.systemFragments,
 		contextBreakdownSections: perExtSinks.contextBreakdownSections,
 		contextPanelSections: perExtSinks.contextPanelSections,
@@ -6544,6 +6585,7 @@ function mergeContributions(active, inactive = [], options = {}) {
 	const hooks = {};
 	const mcpServers = [];
 	const skills = [];
+	const plugins = [];
 	const systemFragments = [];
 	const contextBreakdownSections = [];
 	const contextPanelSections = [];
@@ -6586,6 +6628,7 @@ function mergeContributions(active, inactive = [], options = {}) {
 		}
 		mcpServers.push(...c.mcpServers);
 		skills.push(...c.skills);
+		plugins.push(...c.plugins);
 		systemFragments.push(...c.systemFragments);
 		contextBreakdownSections.push(...c.contextBreakdownSections);
 		contextPanelSections.push(...c.contextPanelSections);
@@ -6659,6 +6702,7 @@ function mergeContributions(active, inactive = [], options = {}) {
 		hooks,
 		mcpServers,
 		skills,
+		plugins,
 		systemFragments,
 		contextBreakdownSections,
 		contextPanelSections,
@@ -6777,6 +6821,46 @@ function filterExtensionRegistry(registry, enabled) {
 	const filteredOut = registry.loaded.filter((ext) => !allow.has(ext.name));
 	return mergeContributions(filteredActive, [...registry.inactive, ...filteredOut]);
 }
+/**
+* Drop the contributions of Agent Plugins the user has disabled.
+*
+* `filterExtensionRegistry` keys on EXTENSION names, so it can't express
+* "this extension runs, but the plugin it loaded does not". Plugin skills and
+* MCP servers are fanned into the loading extension's sinks by
+* `ctx.loadAgentPlugin`, which means without this pass `enabledPlugins` would
+* render a checkbox that changes nothing for extension-loaded plugins.
+*
+* Skills are matched by `metadata['zidane.plugin']` (stamped by the loader);
+* MCP servers carry no such marker, so they're matched by identity against
+* the server list on each {@link LoadedPluginRecord}.
+*
+* Returns the input registry unchanged when nothing is disabled, so callers
+* can compare identity to skip recomposing.
+*/
+function filterRegistryPlugins(registry, enabledPlugins, shadowed) {
+	if (registry.plugins.length === 0) return registry;
+	const allow = enabledPlugins === void 0 ? null : new Set(enabledPlugins);
+	const dropped = registry.plugins.filter((record) => allow !== null && !allow.has(record.name) || shadowed?.has(record.name) === true);
+	if (dropped.length === 0) return registry;
+	const droppedNames = new Set(dropped.map((record) => record.name));
+	const droppedServers = new Set(dropped.flatMap((record) => record.plugin.mcpServers));
+	const prune = (ext) => {
+		const contributions = ext.contributions;
+		if (!contributions || contributions.plugins.length === 0) return ext;
+		return {
+			...ext,
+			contributions: {
+				...contributions,
+				skills: contributions.skills.filter((skill) => {
+					const owner = skill.metadata?.["zidane.plugin"];
+					return owner === void 0 || !droppedNames.has(owner);
+				}),
+				mcpServers: contributions.mcpServers.filter((server) => !droppedServers.has(server))
+			}
+		};
+	};
+	return mergeContributions(registry.loaded.map(prune), registry.inactive);
+}
 /** Dispose resources owned by an extension registry. Idempotent per registry. */
 async function disposeExtensionRegistry(registry) {
 	await registry.dispose();
@@ -6845,10 +6929,50 @@ function makeContext(opts) {
 			logger.warn("registerSkill: missing name");
 			return;
 		}
-		sinks.skills.push({
-			...skill,
-			source: skill.source ?? source
+		sinks.skills.push(withProvenance(skill, source, definition.name));
+	};
+	const loadPlugin = async (spec) => {
+		const options = typeof spec === "string" ? { dir: spec } : spec;
+		const requested = options?.dir;
+		if (typeof requested !== "string" || requested.length === 0) {
+			logger.warn("loadAgentPlugin: missing dir");
+			return emptyPluginHandle("");
+		}
+		if (!guardOpen("loadAgentPlugin")) return emptyPluginHandle(requested);
+		const target = isAbsolute(requested) ? requested : resolve(dir ?? paths.cwd, requested);
+		const loaded = await loadAgentPlugin(target, {
+			source,
+			dataRoot: extensionStoragePath(paths, definition.name, "data", "plugin-data"),
+			...options.skills !== void 0 ? { skills: options.skills } : {},
+			...options.mcp !== void 0 ? { mcp: options.mcp } : {},
+			...options.namePrefix !== void 0 ? { namePrefix: options.namePrefix } : {}
 		});
+		for (const diagnostic of loaded.diagnostics) {
+			const detail = {
+				plugin: loaded.manifest?.name ?? target,
+				code: diagnostic.code,
+				...diagnostic.path ? { path: diagnostic.path } : {}
+			};
+			if (diagnostic.severity === "error") logger.error(`loadAgentPlugin: ${diagnostic.message}`, detail);
+			else logger.warn(`loadAgentPlugin: ${diagnostic.message}`, detail);
+		}
+		if (!guardOpen("loadAgentPlugin (completed after setup resolved)")) return loaded;
+		if (loaded.ok) {
+			for (const skill of loaded.skills) sinks.skills.push(withProvenance(skill, source, definition.name));
+			for (const config of loaded.mcpServers) sinks.mcpServers.push(config);
+		}
+		sinks.plugins.push({
+			name: loaded.manifest?.name ?? basename(target),
+			extensionName: definition.name,
+			dir: target,
+			plugin: loaded
+		});
+		logger.debug("loadAgentPlugin: registered", {
+			plugin: loaded.manifest?.name,
+			skills: loaded.skills.length,
+			mcpServers: loaded.mcpServers.length
+		});
+		return loaded;
 	};
 	const registerCompletionProvider = (provider) => {
 		if (!guardOpen("registerCompletionProvider")) return;
@@ -7231,12 +7355,7 @@ function makeContext(opts) {
 		const persisted = readSettings?.()?.extensionConfig?.[definition.name]?.[key];
 		return resolveExtensionConfigValue(item, persisted);
 	} };
-	const storageSurface = { path: (scope, ...segments) => {
-		const root = resolve(scope === "cache" ? paths.cacheDir : scope === "data" ? paths.dataDir : scope === "project" || scope === "session" ? paths.projectRoot ?? paths.dataDir : paths.configDir ?? paths.dataDir, "extensions", definition.name);
-		const target = resolve(root, ...segments);
-		if (target !== root && !target.startsWith(root + sep)) return root;
-		return target;
-	} };
+	const storageSurface = { path: (scope, ...segments) => extensionStoragePath(paths, definition.name, scope, ...segments) };
 	const sessionSurface = {
 		get: (key) => getExtensionSessionState(currentExtensionSession(), definition.name, key),
 		set: (key, value) => setExtensionSessionState(currentExtensionSession(), definition.name, key, value),
@@ -7347,6 +7466,7 @@ function makeContext(opts) {
 		registerHook,
 		registerMcpServer,
 		registerSkill,
+		loadAgentPlugin: loadPlugin,
 		registerCompletionProvider,
 		registerInlineAutocompleteProvider,
 		registerCommand,
@@ -7997,6 +8117,7 @@ const EMPTY_EXTENSION_REGISTRY = Object.freeze({
 	hooks: Object.freeze({}),
 	mcpServers: Object.freeze([]),
 	skills: Object.freeze([]),
+	plugins: Object.freeze([]),
 	systemFragments: Object.freeze([]),
 	contextBreakdownSections: Object.freeze([]),
 	contextPanelSections: Object.freeze([]),
@@ -12511,6 +12632,7 @@ function buildToolHookBase(ctx, turnId, callId, name, displayName, input) {
 		input,
 		...ctx.runId !== void 0 ? { runId: ctx.runId } : {},
 		...ctx.parentRunId !== void 0 ? { parentRunId: ctx.parentRunId } : {},
+		...ctx.parentCallId !== void 0 ? { parentCallId: ctx.parentCallId } : {},
 		...typeof ctx.depth === "number" ? { depth: ctx.depth } : {}
 	};
 }
@@ -12722,6 +12844,7 @@ async function runSingleToolDispatch(ctx, call, turnId, fixed) {
 			callId,
 			runId: ctx.runId,
 			...ctx.parentRunId !== void 0 ? { parentRunId: ctx.parentRunId } : {},
+			...ctx.parentCallId !== void 0 ? { parentCallId: ctx.parentCallId } : {},
 			...ctx.session ? { session: ctx.session } : {},
 			...ctx.readState ? { readState: ctx.readState } : {},
 			...ctx.toolState ? { state: ctx.toolState.begin(callId) } : {},
@@ -13322,6 +13445,7 @@ async function startDurableToolExecution(ctx, call, turnId, index) {
 		callId,
 		runId: ctx.runId,
 		...ctx.parentRunId !== void 0 ? { parentRunId: ctx.parentRunId } : {},
+		...ctx.parentCallId !== void 0 ? { parentCallId: ctx.parentCallId } : {},
 		...ctx.session ? { session: ctx.session } : {},
 		...ctx.readState ? { readState: ctx.readState } : {},
 		...ctx.toolState ? { state: ctx.toolState.begin(callId) } : {},
@@ -15406,6 +15530,7 @@ function createAgent(rawOptions) {
 					...agentReadState ? { readState: agentReadState } : {},
 					toolState: toolStateController,
 					...options.parentRunId ? { parentRunId: options.parentRunId } : {},
+					...options.parentCallId ? { parentCallId: options.parentCallId } : {},
 					depth: runDepth,
 					thinkingBudget,
 					...taskBudget !== void 0 ? { taskBudget } : {},
@@ -16024,6 +16149,6 @@ function createAgent(rawOptions) {
 	};
 }
 //#endregion
-export { removeInstalledExtension as $, readKeybindings as $t, NO_TOOLS_PREAMBLE as A, looksBinary as At, stripImagesFromTurns as B, validateToolArgs as Bt, resolveTasksDir as C, shouldAutoCompact as Cn, createSkillsRunScriptTool as Ct, selectRecentFiles as D, stableStringify as Dn, shell as Dt, selectFilesFromSession as E, normalizeShellCommand as En, createShellTool as Et, buildTailCompactPrompt as F, listFiles as Ft, EMPTY_EXTENSION_REGISTRY as G, KEYBINDING_KEY_COL_WIDTH as Gt, truncateHeadForPtlRetry as H, DEFAULT_KEYBINDINGS as Ht, buildUpToCompactPrompt as I, createInteractionTool as It, fetchExtensionSource as J, groupBindings as Jt, createExtensionPromptBridge as K, ensureKeybindingsFile as Kt, ANCHOR_PREVIEW_MAX_CHARS as L, grep as Lt, buildCompactPrompt as M, createModelSearchTool as Mt, buildFromCompactPrompt as N, formatModelLine as Nt, compactConversation as O, tailTruncate as Ot, buildFullCompactPrompt as P, matchModelEntries as Pt, readExtensionInstallProvenance as Q, parseBindingSpec as Qt, anchorPreviewFor as R, glob as Rt, resolveSessionDir as S, effectiveContextWindow as Sn, createSkillsUseTool as St, selectFilesFromReadState as T, defaultRepeatGuardTracked as Tn, shellKill as Tt, CompactInvalidInputError as U, KEYBINDING_DEFS as Ut, summaryToTurn as V, resolveStorageDirs as Vt, CompactPromptTooLongError as W, KEYBINDING_DEF_BY_ACTION as Wt, listExtensionCandidates as X, matchesBinding as Xt, installExtensionFromSpec as Y, keybindingsPath as Yt, parseExtensionInstallSource as Z, mergeKeybindings as Zt, rehomePersistedStubs as _, resolveExtensionConfigValue as _n, WAIT_TASK_TIMED_OUT_PREFIX as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, defaultExtensionScanPaths as an, composeExtensionPreset as at, resolveMcpWarningsDir as b, AUTO_COMPACT_MIN_GROWTH_FRACTION as bn, createSpawnTool as bt, applyCompactSummaryCutoff as c, isExtensionDefinition as cn, mergeContributions as ct, PERSISTED_STUB_PREFIX as d, defineExtension as dn, createWorkspaceSurface as dt, readKeybindingsRaw as en, updateInstalledExtension as et, PERSISTENCE_PREVIEW_BYTES as f, clampExtensionConfigNumber as fn, composePresets as ft, migrateSessionArtifactDirs as g, resolveExtensionConfig as gn, writeFile$1 as gt, maybePersistToolResult as h, isValidExtensionConfigValue as hn, basic_default as ht, INTERRUPT_MESSAGE_FOR_TOOL_USE as i, ENTRY_CANDIDATES as in, buildExtensionRegistry as it, TRAILER as j, multiEdit as jt, BASE_INSTRUCTIONS as k, readFile$1 as kt, collectNewlyStaleReadPaths as l, parseExtensionScanPathEnv as ln, partitionExtensionCatalog as lt, cleanupPersistedSession as m, isValidExtensionConfigItem as mn, basicTools as mt, normalizeProviders as n, stripJsonComments as nn, discoverAndBuildExtensionRegistry as nt, TOOL_USE_CANCELLED_MESSAGE as o, discoverExtensions as on, disposeExtensionRegistry as ot, buildPersistedStub as p, coerceExtensionConfigInput as pn, definePreset as pt, ExtensionInstallError as q, formatBindingForDisplay as qt, resolveModelTargets as r, registerExtensionHostModules as rn, buildExtensionPreset as rt, TOOL_USE_SKIPPED_MESSAGE as s, inlineLoadedExtension as sn, filterExtensionRegistry as st, createAgent as t, resolveExtensionKeybindings as tn, createExtensionHud as tt, renderStaleReadNotice as u, scanExtensionDirectories as un, createExtensionHostRuntimeBridge as ut, resolveLegacyPersistDir as v, sanitizeExtensionConfigActionPatch as vn, waitTask as vt, buildPostCompactAttachments as w, defaultRepeatGuardNormalize as wn, createSkillsReadTool as wt, resolvePersistDir as x, OUTPUT_RESERVE_TOKENS as xn, isSpawnTool as xt, resolveLegacySessionDir as y, toWireConfigSchema as yn, createToolSearchTool as yt, sliceForCompaction as z, edit as zt };
+export { removeInstalledExtension as $, readKeybindings as $t, NO_TOOLS_PREAMBLE as A, readFile$1 as At, stripImagesFromTurns as B, edit as Bt, resolveTasksDir as C, effectiveContextWindow as Cn, createSkillsUseTool as Ct, selectRecentFiles as D, normalizeShellCommand as Dn, createShellTool as Dt, selectFilesFromSession as E, defaultRepeatGuardTracked as En, shellKill as Et, buildTailCompactPrompt as F, matchModelEntries as Ft, EMPTY_EXTENSION_REGISTRY as G, KEYBINDING_KEY_COL_WIDTH as Gt, truncateHeadForPtlRetry as H, DEFAULT_KEYBINDINGS as Ht, buildUpToCompactPrompt as I, listFiles as It, fetchExtensionSource as J, groupBindings as Jt, createExtensionPromptBridge as K, ensureKeybindingsFile as Kt, ANCHOR_PREVIEW_MAX_CHARS as L, createInteractionTool as Lt, buildCompactPrompt as M, multiEdit as Mt, buildFromCompactPrompt as N, createModelSearchTool as Nt, compactConversation as O, stableStringify as On, shell as Ot, buildFullCompactPrompt as P, formatModelLine as Pt, readExtensionInstallProvenance as Q, parseBindingSpec as Qt, anchorPreviewFor as R, grep as Rt, resolveSessionDir as S, OUTPUT_RESERVE_TOKENS as Sn, isSpawnTool as St, selectFilesFromReadState as T, defaultRepeatGuardNormalize as Tn, createSkillsReadTool as Tt, CompactInvalidInputError as U, KEYBINDING_DEFS as Ut, summaryToTurn as V, validateToolArgs as Vt, CompactPromptTooLongError as W, KEYBINDING_DEF_BY_ACTION as Wt, listExtensionCandidates as X, matchesBinding as Xt, installExtensionFromSpec as Y, keybindingsPath as Yt, parseExtensionInstallSource as Z, mergeKeybindings as Zt, rehomePersistedStubs as _, resolveExtensionConfig as _n, writeFile$1 as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, defaultExtensionScanPaths as an, composeExtensionPreset as at, resolveMcpWarningsDir as b, toWireConfigSchema as bn, createToolSearchTool as bt, applyCompactSummaryCutoff as c, isExtensionDefinition as cn, filterRegistryPlugins as ct, PERSISTED_STUB_PREFIX as d, createDebugLog as dn, createExtensionHostRuntimeBridge as dt, readKeybindingsRaw as en, updateInstalledExtension as et, PERSISTENCE_PREVIEW_BYTES as f, defineExtension as fn, createWorkspaceSurface as ft, migrateSessionArtifactDirs as g, isValidExtensionConfigValue as gn, basic_default as gt, maybePersistToolResult as h, isValidExtensionConfigItem as hn, basicTools as ht, INTERRUPT_MESSAGE_FOR_TOOL_USE as i, ENTRY_CANDIDATES as in, buildExtensionRegistry as it, TRAILER as j, looksBinary as jt, BASE_INSTRUCTIONS as k, tailTruncate as kt, collectNewlyStaleReadPaths as l, parseExtensionScanPathEnv as ln, mergeContributions as lt, cleanupPersistedSession as m, coerceExtensionConfigInput as mn, definePreset as mt, normalizeProviders as n, stripJsonComments as nn, discoverAndBuildExtensionRegistry as nt, TOOL_USE_CANCELLED_MESSAGE as o, discoverExtensions as on, disposeExtensionRegistry as ot, buildPersistedStub as p, clampExtensionConfigNumber as pn, composePresets as pt, ExtensionInstallError as q, formatBindingForDisplay as qt, resolveModelTargets as r, registerExtensionHostModules as rn, buildExtensionPreset as rt, TOOL_USE_SKIPPED_MESSAGE as s, inlineLoadedExtension as sn, filterExtensionRegistry as st, createAgent as t, resolveExtensionKeybindings as tn, createExtensionHud as tt, renderStaleReadNotice as u, scanExtensionDirectories as un, partitionExtensionCatalog as ut, resolveLegacyPersistDir as v, resolveExtensionConfigValue as vn, WAIT_TASK_TIMED_OUT_PREFIX as vt, buildPostCompactAttachments as w, shouldAutoCompact as wn, createSkillsRunScriptTool as wt, resolvePersistDir as x, AUTO_COMPACT_MIN_GROWTH_FRACTION as xn, createSpawnTool as xt, resolveLegacySessionDir as y, sanitizeExtensionConfigActionPatch as yn, waitTask as yt, sliceForCompaction as z, glob as zt };
 
-//# sourceMappingURL=agent-8sUadp5M.js.map
+//# sourceMappingURL=agent-SQ6rxfpT.js.map