pi2dsh 0.16.0 → 0.16.2

package/dist/{runtime-C6_pOPmL.mjs → runtime-t-5iWtFO.mjs}

@@ -1,5 +1,5 @@
 
-import { En as PiCapabilityError, F as generateBranchSummary, Tn as CapabilityLedger, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-f3_hNCpd.mjs";
+import { En as PiCapabilityError, F as generateBranchSummary, Tn as CapabilityLedger, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-DXJ_Jzo0.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
 import { $ as AssistantMessageEventStream, S as getSupportedThinkingLevels, c as builtinProviders, et as isContextOverflow, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry } from "./pi-ai-DQPHUR9S.mjs";
 import { W as getKeybindings, _t as stripTerminalSequences } from "./pi-tui-DruSeKmd.mjs";
@@ -7,7 +7,7 @@ import { c as resolvePiProviderAuth, i as oauthCredentialRef, l as storedOAuthCr
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
@@ -69,6 +69,37 @@ var PiSessionBridge = class {
 		const safe = sessionId.replace(/[^a-zA-Z0-9._-]+/gu, "_");
 		return join(sidecarDir(), `${safe}.jsonl`);
 	}
+	/**
+	* The Pi-visible archive file for one DSH session — the established
+	* `<id>.jsonl` convention (getSessionFile/switchSession use the same one).
+	* Guaranteed to EXIST on return: Pi consumers treat the session file as the
+	* durable identity a conversation can be reopened by (pi-subagents guards
+	* its tombstone resurrect with existsSync, and Pi's SessionManager.open
+	* tolerates an empty file), so a merely virtual path would read as "the
+	* conversation is gone".
+	*/
+	archiveFileFor(sessionId) {
+		const path = this.sidecarPath(sessionId);
+		if (!existsSync(path)) {
+			mkdirSync(sidecarDir(), { recursive: true });
+			appendFileSync(path, "");
+		}
+		return path;
+	}
+	/**
+	* The DSH session id an archive-file path names, or undefined for any path
+	* this bridge did not mint (a genuine Pi session file, an in-memory
+	* manager's undefined). The reverse of {@link archiveFileFor} — ids that
+	* survive its sanitization round-trip exactly, which every id this bridge
+	* mints does.
+	*/
+	sessionIdOfArchiveFile(path) {
+		if (typeof path !== "string" || path.length === 0) return void 0;
+		const resolved = resolve(path);
+		if (resolve(dirname(resolved)) !== resolve(sidecarDir())) return void 0;
+		const base = basename(resolved);
+		return base.endsWith(".jsonl") ? base.slice(0, -6) : void 0;
+	}
 	load(sessionId) {
 		if (this.loaded.has(sessionId)) return;
 		this.loaded.add(sessionId);
@@ -307,7 +338,7 @@ var PiSessionBridge = class {
 			getCwd: () => cwd,
 			getSessionDir: () => sidecarDir(),
 			getSessionId: () => session.id,
-			getSessionFile: () => this.sidecarPath(session.id),
+			getSessionFile: () => this.archiveFileFor(session.id),
 			getLeafId: () => leafOf()?.id ?? null,
 			getLeafEntry: () => leafOf(),
 			getEntry: (id) => entriesOf().find((entry) => entry.id === id),
@@ -359,6 +390,26 @@ var PiSessionBridge = class {
 //#region src/subagent-bridge.ts
 let subagentSerial = 0;
 /**
+* Pi built-in tool name → the DSH native tool that serves it. The two
+* vocabularies coincide (read/bash/edit/write/grep); Pi's find and ls are
+* both served by the host's glob.
+*/
+function nativeToolNameOf(name) {
+	return name === "find" || name === "ls" ? "glob" : name;
+}
+/**
+* The tool schemas a CHILD agent actually resolves — its scoped view when the
+* service answers for the agent being built, else the global layer. On
+* roster-owned surfaces the preset tools live above the global layer, so the
+* scoped read is the one that sees them.
+*/
+function childSchemas(toolsService, childCtx) {
+	try {
+		if (childCtx.agent !== void 0) return toolsService.schemas(childCtx.agent);
+	} catch {}
+	return toolsService.schemas();
+}
+/**
 * Cross-scope subscription base. Session events dispatch under the OWNING
 * session's scope; a package instance mounted per Agent registers listeners
 * inside its own Agent's scope and would never see a child session's events.
@@ -385,6 +436,12 @@ function piMessageText(message) {
 var PiBridgedAgentSession = class {
 	agent = {};
 	messages = [];
+	/**
+	* Pi's AgentSession.sessionManager surface, projected over the child's DSH
+	* session. getSessionFile() names the durable archive — what pi-subagents
+	* stores as the conversation's reopenable identity (tombstone resurrect).
+	*/
+	sessionManager;
 	#seed = [];
 	#carried = /* @__PURE__ */ new WeakSet();
 	#host;
@@ -398,8 +455,11 @@ var PiBridgedAgentSession = class {
 	#model;
 	#streaming = false;
 	#pendingToolCalls = /* @__PURE__ */ new Set();
+	/** callId → tool name, so tool_execution_end can name the tool its result belongs to. */
+	#toolCallNames = /* @__PURE__ */ new Map();
 	#sessionName = "";
 	#turns = 0;
+	#restrictionDispose;
 	/** Keeps message projections (which await attachment reads) in log order. */
 	#messageProjection = Promise.resolve();
 	#aborted = false;
@@ -407,6 +467,7 @@ var PiBridgedAgentSession = class {
 		this.#host = host;
 		this.#handle = handle;
 		this.#session = handle.agent.session ?? {};
+		this.sessionManager = host.sessionManagerFor?.(this.#session);
 		this.#tools = tools;
 		this.#activeToolNames = tools.map((tool) => tool?.name).filter((name) => typeof name === "string");
 		const cordis = unscopedEventContext(host.cordis);
@@ -493,6 +554,10 @@ var PiBridgedAgentSession = class {
 				handler(piEvent);
 			} catch {}
 		};
+		if (this.#aborted && (type === "turn/start" || type === "step/start" || type === "request/header")) {
+			this.#cancelChild();
+			return;
+		}
 		if (type === "turn/start") {
 			this.#streaming = true;
 			emit({
@@ -509,11 +574,32 @@ var PiBridgedAgentSession = class {
 		}
 		if (type === "tools/result" || type === "tool/result") {
 			const data = event.data;
-			this.#pendingToolCalls.delete(String(data.callId ?? ""));
+			const message = data.message;
+			const blocks = Array.isArray(message?.content) ? message.content : [];
+			for (const block of blocks) {
+				const record = block;
+				if (record?.type !== "tool-result") continue;
+				const callId = String(record.toolCallId ?? (message?.source)?.callId ?? data.callId ?? "");
+				this.#pendingToolCalls.delete(callId);
+				const isError = record.isError === true;
+				emit({
+					type: "tool_execution_end",
+					toolCallId: callId,
+					toolName: this.#toolCallNames.get(callId) ?? "",
+					result: {
+						content: record.content ?? [],
+						isError
+					},
+					isError
+				});
+				this.#toolCallNames.delete(callId);
+			}
+			if (blocks.length === 0) this.#pendingToolCalls.delete(String(data.callId ?? ""));
 		}
 		if (type === "tool/call") {
 			const data = event.data;
 			this.#pendingToolCalls.add(String(data.callId ?? ""));
+			this.#toolCallNames.set(String(data.callId ?? ""), String(data.name ?? ""));
 			let args = {};
 			try {
 				args = JSON.parse(String(data.arguments ?? "{}"));
@@ -582,6 +668,7 @@ var PiBridgedAgentSession = class {
 		return () => this.#subscribers.delete(handler);
 	}
 	async prompt(text) {
+		this.#aborted = false;
 		if (this.#seed.length > 0) {
 			const seeded = this.#seed;
 			this.#seed = [];
@@ -645,13 +732,28 @@ var PiBridgedAgentSession = class {
 	}
 	abort() {
 		this.#aborted = true;
+		this.#cancelChild();
+	}
+	/** One official Agent.cancel, contained but LOUD: a swallowed cancel is a
+	* child that keeps running after its parent was interrupted. */
+	#cancelChild() {
+		const cancel = this.#handle.agent.cancel;
+		if (cancel === void 0) {
+			const message = "[pi2dsh] subagent abort(): the child agent handle has no cancel — the child cannot be stopped";
+			console.warn(message);
+			this.#host.cordis.logger?.warn?.(message);
+			return;
+		}
 		try {
-			const cancel = this.#handle.agent.cancel;
-			cancel?.({
+			cancel.call(this.#handle.agent, {
 				kind: "hook",
 				reason: "pi2dsh subagent abort()"
 			});
-		} catch {}
+		} catch (error) {
+			const message = `[pi2dsh] subagent abort(): Agent.cancel failed (${error instanceof Error ? error.message : String(error)}) — already disposed, or the child kept running`;
+			console.warn(message);
+			this.#host.cordis.logger?.warn?.(message);
+		}
 	}
 	setSessionName(name) {
 		this.#sessionName = String(name);
@@ -666,14 +768,44 @@ var PiBridgedAgentSession = class {
 			aborted: this.#aborted
 		};
 	}
+	/** The child scope's REAL tool schemas (native + scoped custom), in Pi tool shape. */
+	#scopeTools() {
+		const agentCtx = this.#handle.agent.ctx;
+		const toolsService = typeof agentCtx?.get === "function" ? agentCtx.get("tools") : void 0;
+		try {
+			return [...toolsService?.schemas?.(this.#handle.agent) ?? []];
+		} catch {
+			return [];
+		}
+	}
 	getAllTools() {
-		return [...this.#tools];
+		const custom = new Map(this.#tools.filter((tool) => typeof tool?.name === "string").map((tool) => [String(tool.name), tool]));
+		return this.#scopeTools().map((schema) => custom.get(schema.name) ?? schema);
 	}
 	getActiveToolNames() {
-		return [...this.#activeToolNames];
+		const fromScope = this.#scopeTools().map((schema) => schema.name);
+		return fromScope.length > 0 ? fromScope : [...this.#activeToolNames];
+	}
+	/** Hand over the creation-time restriction so a later setActiveToolsByName
+	* retires it instead of intersecting with it. */
+	adoptRestriction(dispose) {
+		this.#restrictionDispose = dispose;
 	}
 	setActiveToolsByName(names) {
 		this.#activeToolNames = names.filter((name) => typeof name === "string");
+		const agentCtx = this.#handle.agent.ctx;
+		const toolsService = typeof agentCtx?.get === "function" ? agentCtx.get("tools") : void 0;
+		if (toolsService === void 0) return;
+		try {
+			this.#restrictionDispose?.();
+			let known;
+			try {
+				known = new Set(toolsService.schemas(this.#handle.agent).map((schema) => schema.name));
+			} catch {
+				known = new Set(toolsService.schemas().map((schema) => schema.name));
+			}
+			this.#restrictionDispose = toolsService.restrict({ allow: this.#activeToolNames.map(nativeToolNameOf).filter((name) => known.has(name)) });
+		} catch {}
 	}
 	async bindExtensions(_bindings = {}) {}
 	async dispose() {
@@ -708,45 +840,111 @@ function childLabel(requested, packageName) {
 async function createBridgedAgentSession(host, options) {
 	const agents = host.cordis.get("agents");
 	if (agents?.create === void 0) throw new Error("pi2dsh: createAgentSession() needs the DSH agent registry in the host composition");
+	const providedManager = options.sessionManager;
+	const archiveFile = typeof providedManager?.getSessionFile === "function" ? providedManager.getSessionFile() : void 0;
+	const resumeSessionId = host.resumeSessionIdFor?.(archiveFile);
 	subagentSerial += 1;
 	const sessionId = `pi2dsh-sub-${Date.now().toString(36)}-${subagentSerial}`;
 	let handle;
+	let initialRestrictionDispose;
 	try {
 		const requestedModel = options.model;
 		const loader = options.resourceLoader;
 		const overrideText = typeof options.systemPrompt === "string" && options.systemPrompt.length > 0 ? options.systemPrompt : typeof loader?.getSystemPrompt === "function" ? loader.getSystemPrompt() : void 0;
 		const appendTexts = (typeof loader?.getAppendSystemPrompt === "function" ? loader.getAppendSystemPrompt() : []).filter((text) => typeof text === "string" && text.length > 0);
 		const systemPrompt = overrideText !== void 0 && overrideText.length > 0 ? [overrideText, ...appendTexts].join("\n\n") : void 0;
-		handle = await agents.create({
+		const customTools = Array.isArray(options.customTools) ? [...options.customTools] : [];
+		const requestedNames = Array.isArray(options.tools) ? options.tools.filter((name) => typeof name === "string") : void 0;
+		const parentCtx = host.parentAgentContext();
+		const roster = (typeof parentCtx?.get === "function" ? parentCtx.get("agentPresets") : void 0) ?? host.cordis.get?.("agentPresets");
+		let composedPreset = roster?.composedPreset?.(parentCtx);
+		if (roster !== void 0 && composedPreset === void 0 && typeof roster.resolve === "function") composedPreset = await roster.resolve(void 0).then((preset) => preset?.id).catch(() => void 0);
+		const delegated = host.delegatedPolicyOverrides();
+		const route = typeof requestedModel?.id === "string" && requestedModel.id.length > 0 ? {
+			model: requestedModel.id,
+			...typeof requestedModel.provider === "string" && requestedModel.provider.length > 0 ? { provider: requestedModel.provider } : {}
+		} : host.parentModelRoute?.();
+		const agentOptionsFragment = typeof route?.model === "string" && route.model.length > 0 ? { agentOptions: route } : {};
+		const setup = async (childCtx) => {
+			const childSession = childCtx.agent?.session;
+			if (typeof childSession?.append === "function") {
+				if (delegated.sandboxMode !== void 0) childSession.append("sandbox/mode", {
+					mode: delegated.sandboxMode,
+					source: "delegation"
+				});
+				if (delegated.approvalPolicy !== void 0) childSession.append("approval/policy", {
+					policy: delegated.approvalPolicy,
+					source: "delegation"
+				});
+			}
+			if (roster !== void 0) {
+				let joined;
+				try {
+					joined = roster.composeFrom?.(childCtx, parentCtx);
+				} catch {
+					joined = void 0;
+				}
+				if (joined === void 0 && composedPreset !== void 0 && typeof roster.mount === "function") try {
+					await roster.mount(childCtx, composedPreset);
+					joined = composedPreset;
+				} catch {
+					joined = void 0;
+				}
+				if (joined === void 0) host.cordis.logger?.warn?.("[pi2dsh] child agent joined no preset composition; on roster-owned surfaces its tools resolve against the empty global layer");
+			}
+			const restriction = requestedNames !== void 0 ? requestedNames.map(nativeToolNameOf) : options.noTools === "all" || options.noTools === true || options.noTools === "builtin" ? [] : void 0;
+			if (restriction !== void 0) {
+				const toolsService = typeof childCtx.get === "function" ? childCtx.get("tools") : void 0;
+				if (toolsService !== void 0) {
+					const known = new Set(childSchemas(toolsService, childCtx).map((schema) => schema.name));
+					initialRestrictionDispose = toolsService.restrict({ allow: restriction.filter((name) => known.has(name)) });
+				}
+			}
+			const excluded = Array.isArray(options.excludeTools) ? options.excludeTools.filter((name) => typeof name === "string") : [];
+			if (excluded.length > 0) {
+				const toolsService = typeof childCtx.get === "function" ? childCtx.get("tools") : void 0;
+				if (toolsService !== void 0) {
+					const known = new Set(childSchemas(toolsService, childCtx).map((schema) => schema.name));
+					toolsService.restrict({ deny: excluded.map(nativeToolNameOf).filter((name) => known.has(name)) });
+				}
+			}
+			if (customTools.length > 0 && options.noTools !== "all") host.registerChildTools(childCtx, customTools);
+			if (systemPrompt !== void 0) {
+				const prompt = typeof childCtx.get === "function" ? childCtx.get("systemPrompt") : void 0;
+				if (prompt === void 0) throw new Error("pi2dsh: createAgentSession() got a system prompt but the DSH composition has no systemPrompt service to carry it");
+				prompt.section({
+					name: "pi2dsh:subagent-system-prompt",
+					order: -1e6,
+					text: systemPrompt,
+					complete: true
+				});
+			}
+		};
+		if (resumeSessionId !== void 0) {
+			if (typeof agents.resume !== "function") throw new Error("pi2dsh: reopening a child conversation needs the DSH agent registry's persisted-resume seam, which this composition does not provide");
+			handle = await agents.resume({
+				resumeSessionId,
+				...agentOptionsFragment,
+				setup
+			});
+		} else handle = await agents.create({
 			sessionId,
 			meta: {
 				cwd: typeof options.cwd === "string" ? options.cwd : host.cwd(),
 				origin: "subagent",
 				delegationDepth: host.parentDelegationDepth() + 1,
-				...host.parentSessionId() !== void 0 ? { parentSession: host.parentSessionId() } : {}
+				...host.parentSessionId() !== void 0 ? { parentSession: host.parentSessionId() } : {},
+				...typeof composedPreset === "string" && composedPreset.length > 0 ? { agentPreset: composedPreset } : {}
 			},
-			...typeof requestedModel?.id === "string" && requestedModel.id.length > 0 ? { agentOptions: {
-				model: requestedModel.id,
-				...typeof requestedModel.provider === "string" && requestedModel.provider.length > 0 ? { provider: requestedModel.provider } : {}
-			} } : {}
+			...agentOptionsFragment,
+			setup
 		});
-		if (systemPrompt !== void 0) {
-			const agentCtx = handle.agent.ctx;
-			const prompt = typeof agentCtx?.get === "function" ? agentCtx.get("systemPrompt") : void 0;
-			if (prompt === void 0) throw new Error("pi2dsh: createAgentSession() got a system prompt but the DSH composition has no systemPrompt service to carry it");
-			prompt.section({
-				name: "pi2dsh:subagent-system-prompt",
-				order: -1e6,
-				text: systemPrompt,
-				complete: true
-			});
-		}
 	} catch (error) {
-		throw new Error(`pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
+		throw new Error(resumeSessionId !== void 0 ? `pi2dsh: reopening child session ${JSON.stringify(resumeSessionId)} failed — its persisted log may be gone or this composition has no session persistence (${error instanceof Error ? error.message : String(error)})` : `pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
 	}
 	const tools = [...Array.isArray(options.tools) ? options.tools : [], ...Array.isArray(options.customTools) ? options.customTools : []];
 	const childSession = handle.agent.session;
-	if (typeof childSession?.append === "function") try {
+	if (resumeSessionId === void 0 && typeof childSession?.append === "function") try {
 		childSession.append("subagent/descriptor", {
 			version: 2,
 			mode: "continuable",
@@ -756,7 +954,9 @@ async function createBridgedAgentSession(host, options) {
 	} catch (error) {
 		host.cordis.logger?.warn?.(`[pi2dsh] child session could not record its subagent identity: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	return { session: new PiBridgedAgentSession(host, handle, tools) };
+	const session = new PiBridgedAgentSession(host, handle, tools);
+	session.adoptRestriction(initialRestrictionDispose);
+	return { session };
 }
 //#endregion
 //#region src/compat/vendor/pi-open-browser.ts
@@ -2892,12 +3092,91 @@ function mountTuiSurfaceAdapter(ctx, packageName, publish, instanceKey) {
 	}
 }
 /**
-* dsh-TUI handles `/mcp` locally before it asks DSH's command registry. Until
-* it exposes a reserved-command seam, keep its native status command and make
-* an installed Pi MCP manager reachable as `/pi-mcp`.
+* dsh-TUI dispatches its LOCAL commands before it asks DSH's command
+* registry ("locals win on name collisions" — its own commands.ts contract),
+* so a registry command sharing a local name is unreachable from that
+* surface. The host command keeps its name; the incoming command gets a
+* `pi-` source prefix — and ONLY on a composition where dsh-TUI is present;
+* everywhere else the original name stands.
+*
+* The reserved-name list is dsh-TUI's `LOCAL_COMMANDS`, which it exports in
+* code but not through its package exports map (upstream ask filed). Until
+* that lands, the list is pinned per generation from the published sources:
+* 0.8.x reserved only /mcp; 0.9.0 reserves the full set below. Generation is
+* read off the installed package's public ./package.json subpath.
 */
+const DSH_TUI_LOCAL_COMMANDS_0_9 = /* @__PURE__ */ new Set([
+	"new",
+	"clear",
+	"compact",
+	"resume",
+	"rename",
+	"rewind",
+	"export",
+	"btw",
+	"trace",
+	"context",
+	"status",
+	"cost",
+	"config",
+	"settings",
+	"doctor",
+	"init",
+	"agents",
+	"activity",
+	"preset",
+	"theme",
+	"lang",
+	"model",
+	"effort",
+	"thinking",
+	"tokens",
+	"provider",
+	"login",
+	"logout",
+	"add-dir",
+	"hooks",
+	"mcp",
+	"skills",
+	"plugins",
+	"update",
+	"audit",
+	"bug",
+	"practice",
+	"review",
+	"release-notes",
+	"vuln-check",
+	"vim",
+	"terminal-setup",
+	"connect",
+	"workspace",
+	"help",
+	"tips",
+	"exit",
+	"quit",
+	"q",
+	"deepseek"
+]);
+const DSH_TUI_LOCAL_COMMANDS_LEGACY = /* @__PURE__ */ new Set(["mcp"]);
+/** The reserved set for one installed dsh-tui version (undefined = unknown,
+* assume the current generation). */
+function tuiLocalCommandsForVersion(version) {
+	if (version === void 0) return DSH_TUI_LOCAL_COMMANDS_0_9;
+	const [major = 0, minor = 0] = version.split(".").map((part) => Number.parseInt(part, 10));
+	return major > 0 || minor >= 9 ? DSH_TUI_LOCAL_COMMANDS_0_9 : DSH_TUI_LOCAL_COMMANDS_LEGACY;
+}
+let cachedTuiLocalCommands;
+function dshTuiLocalCommands() {
+	if (cachedTuiLocalCommands !== void 0) return cachedTuiLocalCommands;
+	let version;
+	try {
+		version = createRequire(import.meta.url)("@deepseek-harness-tui/dsh-tui/package.json").version;
+	} catch {}
+	cachedTuiLocalCommands = tuiLocalCommandsForVersion(version);
+	return cachedTuiLocalCommands;
+}
 function commandNameForDshTui(name, tuiAvailable) {
-	return tuiAvailable && name === "mcp" ? "pi-mcp" : name;
+	return tuiAvailable && dshTuiLocalCommands().has(name) ? `pi-${name}` : name;
 }
 //#endregion
 //#region src/runtime.ts
@@ -5441,6 +5720,50 @@ function registerTool(ctx, state, tool) {
 	state.toolDisposers.set(tool.name, dispose);
 	if (isKnownImageTool(state.packageName, tool.name)) state.shared.browserSurfaces?.registerImageTool(tool.name);
 }
+/**
+* Register ONE Pi custom tool into a child agent's scope (createAgentSession
+* customTools). Same translation as {@link registerTool}'s definition, but:
+* the registration goes through the CHILD ctx (a scoped registration that
+* unwinds with the child, invisible to the parent and siblings), and the
+* package's own Pi tool ledger is untouched — a child session's custom tools
+* belong to that session in Pi, not to the extension's registered set.
+* Partial-result updates have no Pi-side consumer on this path yet (the
+* façade projects durable events only), so the update callback is a no-op —
+* never a fake dispatch.
+*/
+function registerChildPiTool(childCtx, state, tool) {
+	const normalized = normalizeToolSchema(tool.parameters);
+	for (const warning of normalized.warnings) logger(childCtx).warn(`[pi2dsh] subagent tool ${tool.name}: ${warning}`);
+	const definition = {
+		name: tool.name,
+		description: tool.description,
+		parameters: normalized.schema,
+		output: {
+			schema: {},
+			render: (_args, value) => value.content,
+			presentationMeta: (_args, value) => jsonValue(value.details)
+		},
+		isConcurrencySafe: () => tool.executionMode === "parallel",
+		async execute(args, exec) {
+			const agent = exec.agent;
+			const prepared = validateToolArguments({
+				name: tool.name,
+				parameters: tool.parameters
+			}, {
+				name: tool.name,
+				arguments: tool.prepareArguments?.(cloneJson(args)) ?? args
+			});
+			const result = await normalizeToolResultForDsh(childCtx, await runInPiRuntime(state, agent, () => tool.execute(String(exec.callId), prepared, exec.signal, () => {}, contextFor(childCtx, state, agent, exec.signal))));
+			if (result.terminate === true) exec.concludeTurn();
+			if (result.isError === true) {
+				const message = textBlocks(result.content).map((block) => block.text).filter(Boolean).join("\n");
+				throw new Error(message || `Pi tool ${tool.name} failed`);
+			}
+			return result;
+		}
+	};
+	childCtx.tools.register(definition);
+}
 function unregisterTool(state, name) {
 	const dispose = state.toolDisposers.get(name);
 	if (dispose === void 0) return false;
@@ -5689,9 +6012,10 @@ function normalizedPiCommandName(piName) {
 	return normalized.length > 0 ? normalized : "pi-command";
 }
 function dshCommandName(ctx, state, piName) {
-	const name = commandNameForDshTui(normalizedPiCommandName(piName), state.tuiSurfaces?.available === true || optionalService(ctx, "tuiScenes") !== void 0);
+	const validName = normalizedPiCommandName(piName);
+	const name = commandNameForDshTui(validName, state.tuiSurfaces?.available === true || optionalService(ctx, "tuiScenes") !== void 0);
 	if (name !== piName) {
-		const reason = name === "pi-mcp" ? "because dsh-TUI reserves /mcp for its native MCP status view" : "to satisfy DSH command naming";
+		const reason = name === `pi-${validName}` ? `because dsh-TUI reserves /${validName} for its own local command (locals win on name collisions)` : "to satisfy DSH command naming";
 		logger(ctx).warn(`[pi2dsh] Pi command /${piName} registered as /${name} ${reason}`);
 	}
 	return name;
@@ -6383,7 +6707,39 @@ async function applyPiPackage(ctx, options) {
 		deliver: (agent, message, mode) => deliverAgentMessage(agent, message, mode),
 		messageFromSessionEvent: (event) => messageFromSessionEvent(ctx, event),
 		messageSource: state.messageSource,
-		packageName: state.packageName
+		packageName: state.packageName,
+		parentAgentContext: () => currentAgent(state)?.ctx,
+		registerChildTools: (childCtx, tools) => {
+			for (const tool of tools) registerChildPiTool(childCtx, state, tool);
+		},
+		delegatedPolicyOverrides: () => {
+			const parent = currentAgent(state);
+			const sandboxPolicy = typeof parent?.ctx?.get === "function" ? parent.ctx.get("sandboxPolicy") : void 0;
+			const approval = typeof parent?.ctx?.get === "function" ? parent.ctx.get("approval") : void 0;
+			const sandboxMode = sandboxPolicy?.overrideOf?.(parent?.session);
+			return {
+				...sandboxMode !== void 0 ? { sandboxMode } : {},
+				...approval !== void 0 ? { approvalPolicy: "never" } : {}
+			};
+		},
+		sessionManagerFor: (session) => {
+			const typed = session;
+			const cwd = typeof typed.meta?.cwd === "string" ? typed.meta.cwd : cwdOf(currentAgent(state));
+			return state.bridge.readonlySessionManager(session, cwd);
+		},
+		resumeSessionIdFor: (file) => state.bridge.sessionIdOfArchiveFile(file),
+		parentModelRoute: () => {
+			const parent = currentAgent(state);
+			if (parent === void 0) return void 0;
+			const live = currentPiModel(state, parent);
+			const model = live?.id;
+			if (typeof model !== "string" || model.length === 0) return void 0;
+			const provider = live?.provider;
+			return {
+				model,
+				...typeof provider === "string" && provider.length > 0 ? { provider } : {}
+			};
+		}
 	});
 	await registerPromptCommands(ctx, state, rootDir, options.manifest);
 	const onExtensionError = (failure) => logger(ctx).warn(`[pi2dsh] extension entry failed and was skipped (matching Pi's per-extension error isolation): ${failure}`);
@@ -6425,6 +6781,7 @@ async function applyPiPackage(ctx, options) {
 const runtimeInternals = {
 	compactionReason,
 	resolveOfferedChoice,
+	currentPiModel,
 	dshToPiContent,
 	expandPrompt,
 	isKnownImageTool,
@@ -6437,4 +6794,4 @@ const runtimeInternals = {
 //#endregion
 export { registerVisionCompanions as a, overlayProviderConfig as i, mergeProviderRegistration as n, runtimeInternals as o, normalizeToolSchema as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-C6_pOPmL.mjs.map
+//# sourceMappingURL=runtime-t-5iWtFO.mjs.map