pi2dsh 0.9.0 → 0.11.0

package/dist/{runtime-DMEJknhK.mjs → runtime-DFD6u4NO.mjs}

@@ -1,7 +1,7 @@
 
-import { P as AssistantMessageEventStream, i as builtinProviders, r as __setPiAiLlmBridge } from "./pi-ai-BA3h0Dwv.mjs";
+import { F as AssistantMessageEventStream, a as builtinProviders, i as __setPiAiLlmBridge } from "./pi-ai-Dyg4zyLZ.mjs";
+import { P as generateBranchSummary, Tn as PiCapabilityError, b as Theme, d as ExtensionRunner, w as __setSubagentSessionFactory, wn as CapabilityLedger } from "./pi-coding-agent-Ctw-BhoY.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-CznNsOnV.mjs";
 import { a as resolvePiProviderAuth, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-CfyImWx4.mjs";
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
@@ -94,6 +94,17 @@ var PiSessionBridge = class {
 		});
 		return id;
 	}
+	appendBranchSummary(sessionId, summary, fromId) {
+		const id = randomUUID();
+		this.persist(sessionId, {
+			kind: "branch_summary",
+			id,
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			summary,
+			fromId
+		});
+		return id;
+	}
 	appendLabel(sessionId, targetId, label) {
 		this.persist(sessionId, {
 			kind: "label",
@@ -197,6 +208,16 @@ var PiSessionBridge = class {
 					...record.data === void 0 ? {} : { data: record.data }
 				}
 			});
+			else if (record.kind === "branch_summary") merged.push({
+				time,
+				entry: {
+					type: "branch_summary",
+					id: record.id,
+					timestamp: record.timestamp,
+					summary: record.summary,
+					fromId: record.fromId
+				}
+			});
 			else if (record.kind === "label") merged.push({
 				time,
 				entry: {
@@ -282,9 +303,22 @@ var PiSessionBridge = class {
 //#endregion
 //#region src/subagent-bridge.ts
 let subagentSerial = 0;
+/** Flatten a Pi message's content to text for transcript seeding. */
+function piMessageText(message) {
+	const content = message.content;
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	return content.map((block) => {
+		const record = block;
+		if (record?.type === "text" && typeof record.text === "string") return record.text;
+		if (record?.type === "toolCall" && typeof record.name === "string") return `(tool ${record.name})`;
+		return "";
+	}).filter((text) => text.length > 0).join("\n");
+}
 var PiBridgedAgentSession = class {
 	agent = {};
 	messages = [];
+	#seed = [];
 	#host;
 	#handle;
 	#session;
@@ -292,6 +326,10 @@ var PiBridgedAgentSession = class {
 	#subscribers = /* @__PURE__ */ new Set();
 	#disposers = [];
 	#activeToolNames;
+	#state;
+	#model;
+	#streaming = false;
+	#pendingToolCalls = /* @__PURE__ */ new Set();
 	#sessionName = "";
 	#turns = 0;
 	#aborted = false;
@@ -320,6 +358,51 @@ var PiBridgedAgentSession = class {
 			return next();
 		});
 		this.#disposers.push(offEvents, offPre);
+		const session = this;
+		this.#state = {
+			get systemPrompt() {
+				return "";
+			},
+			get model() {
+				return session.#model;
+			},
+			get thinkingLevel() {
+				return "off";
+			},
+			get tools() {
+				return [...session.#tools];
+			},
+			set tools(_next) {},
+			get messages() {
+				return [...session.messages];
+			},
+			set messages(next) {
+				session.#assignTranscript(next);
+			},
+			get isStreaming() {
+				return session.#streaming;
+			},
+			get pendingToolCalls() {
+				return new Set(session.#pendingToolCalls);
+			}
+		};
+		this.agent.state = this.#state;
+	}
+	/** Pi's AgentState projection, shared by `session.state` and `session.agent.state`. */
+	get state() {
+		return this.#state;
+	}
+	/**
+	* Pi's `state.messages = …` assignment. Messages already present in this
+	* child's projection stay as they are (they are durable); anything new is
+	* queued and delivered with the next prompt so the child model really sees
+	* the transcript the package seeded.
+	*/
+	#assignTranscript(next) {
+		const identity = (message) => JSON.stringify([message.role, message.content]);
+		const known = new Set(this.messages.map(identity));
+		this.#seed = next.filter((message) => !known.has(identity(message)));
+		for (const message of this.#seed) this.messages.push(message);
 	}
 	#project(event) {
 		const type = event.type;
@@ -328,12 +411,27 @@ var PiBridgedAgentSession = class {
 				handler(piEvent);
 			} catch {}
 		};
-		if (type === "turn/start") emit({
-			type: "turn_start",
-			turnIndex: Number(event.data.turn ?? 1) - 1
-		});
+		if (type === "turn/start") {
+			this.#streaming = true;
+			emit({
+				type: "turn_start",
+				turnIndex: Number(event.data.turn ?? 1) - 1
+			});
+		}
+		if (type === "request/header") {
+			const config = event.data.config ?? {};
+			if (typeof config.model === "string") this.#model = {
+				id: config.model,
+				provider: String(config.provider ?? "")
+			};
+		}
+		if (type === "tools/result" || type === "tool/result") {
+			const data = event.data;
+			this.#pendingToolCalls.delete(String(data.callId ?? ""));
+		}
 		if (type === "tool/call") {
 			const data = event.data;
+			this.#pendingToolCalls.add(String(data.callId ?? ""));
 			let args = {};
 			try {
 				args = JSON.parse(String(data.arguments ?? "{}"));
@@ -380,6 +478,8 @@ var PiBridgedAgentSession = class {
 		}
 		if (type === "turn/end") {
 			this.#turns += 1;
+			this.#streaming = false;
+			this.#pendingToolCalls.clear();
 			emit({
 				type: "turn_end",
 				turnIndex: Number(event.data.turn ?? 1) - 1,
@@ -396,6 +496,28 @@ var PiBridgedAgentSession = class {
 		return () => this.#subscribers.delete(handler);
 	}
 	async prompt(text) {
+		if (this.#seed.length > 0) {
+			const seeded = this.#seed;
+			this.#seed = [];
+			const rendered = seeded.map((message) => {
+				const role = String(message.role ?? "user");
+				const content = piMessageText(message);
+				return content.length === 0 ? void 0 : `[${role}]: ${content}`;
+			}).filter((line) => line !== void 0);
+			if (rendered.length > 0) {
+				const seedBlocks = await this.#host.piContentToDsh([{
+					type: "text",
+					text: `<prior-conversation>\n${rendered.join("\n\n")}\n</prior-conversation>`
+				}]);
+				this.#host.deliver(this.#handle.agent, createUserMessage({
+					content: seedBlocks,
+					source: {
+						kind: "plugin",
+						plugin: this.#host.messageSource
+					}
+				}), "inject");
+			}
+		}
 		const blocks = await this.#host.piContentToDsh([{
 			type: "text",
 			text: String(text)
@@ -475,6 +597,18 @@ var PiBridgedAgentSession = class {
 		await this.#handle.dispose();
 	}
 };
+/**
+* The name DSH's own child catalog shows for a side thread. Pi packages rarely
+* label a child, so the package that started it is the honest fallback: with
+* several Pi packages installed, their threads stay apart in one list.
+* @param requested - a label the calling package supplied, if any.
+* @param packageName - the Pi package the call came from.
+*/
+function childLabel(requested, packageName) {
+	if (typeof requested === "string" && requested.trim().length > 0) return requested.trim().slice(0, 80);
+	const owner = packageName?.trim();
+	return owner === void 0 || owner.length === 0 ? "Pi side conversation" : `${owner} side conversation`;
+}
 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");
@@ -515,6 +649,17 @@ async function createBridgedAgentSession(host, options) {
 		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)})`);
 	}
 	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 {
+		childSession.append("subagent/descriptor", {
+			version: 2,
+			mode: "continuable",
+			provider: "pi2dsh",
+			label: childLabel(options.label, host.packageName)
+		});
+	} 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) };
 }
 //#endregion
@@ -1493,6 +1638,11 @@ function cwdOf(agent) {
 function unsupported(name) {
 	throw new Error(`pi2dsh: Pi API ${name} requires a native DSH port; inspect the compatibility report`);
 }
+function capabilityLedgerOf(ctx, state) {
+	const shared = state.shared;
+	if (shared.capabilityLedger === void 0) shared.capabilityLedger = new CapabilityLedger((message) => logger(ctx).warn(message));
+	return shared.capabilityLedger;
+}
 function optionalService(ctx, name) {
 	return ctx.get(name);
 }
@@ -1551,7 +1701,45 @@ function thinkingLevelOf(state, agent) {
 	}
 	return state.globalThinkingLevel;
 }
-function contextFor(ctx, state, agent, signal, command = false) {
+function durableSeqOf(entryId) {
+	const match = /^dsh-(\d+)$/.exec(entryId);
+	return match === null ? void 0 : Number(match[1]);
+}
+function shrinkToTurnBoundary(events, boundary) {
+	const slice = events.slice(0, boundary + 1);
+	for (let i = slice.length - 1; i >= 0; i--) {
+		const type = slice[i]?.type;
+		if (type === "turn/end") return boundary;
+		if (type === "turn/start") return Number(slice[i].seq) - 1;
+	}
+	return boundary;
+}
+async function summarizeAbandonedBranch(ctx, state, agent, events, boundary, options) {
+	const abandoned = events.slice(boundary + 1);
+	if (abandoned.length === 0) return void 0;
+	const model = agent === void 0 ? void 0 : currentPiModel(state, agent);
+	if (model === void 0) {
+		logger(ctx).warn("[pi2dsh] ctx.navigateTree: no current model route, navigating without a branch summary");
+		return;
+	}
+	const entries = state.bridge.readonlySessionManager({
+		id: "pi2dsh-abandoned-branch",
+		events: abandoned
+	}, cwdOf(agent)).getEntries?.() ?? [];
+	if (entries.length === 0) return void 0;
+	const result = await generateBranchSummary(entries, {
+		model,
+		signal: new AbortController().signal,
+		...typeof options.customInstructions === "string" ? { customInstructions: options.customInstructions } : {},
+		...options.replaceInstructions === true ? { replaceInstructions: true } : {}
+	});
+	if (result.error !== void 0) {
+		logger(ctx).warn(`[pi2dsh] ctx.navigateTree: branch summarization failed (${result.error}), navigating without a summary`);
+		return;
+	}
+	return result.summary;
+}
+function contextFor(ctx, state, agent, signal, command = false, sessionOverride) {
 	const notices = [];
 	const userQuestions = optionalService(ctx, "userQuestions");
 	const ui = {
@@ -1626,7 +1814,7 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			state.toolsExpanded = expanded === true;
 		}
 	};
-	const session = agentSession(agent);
+	const session = sessionOverride ?? agentSession(agent);
 	const providerConfig = (name) => state.providers.get(name);
 	const catalog = state.modelCatalog;
 	const piNativeEntry = (provider, id) => {
@@ -1666,119 +1854,121 @@ function contextFor(ctx, state, agent, signal, command = false) {
 		stream: dshRoutedStream,
 		streamSimple: dshRoutedStream
 	});
-	const base = {
-		ui,
-		mode: "rpc",
-		hasUI: userQuestions !== void 0,
-		cwd: cwdOf(agent),
-		sessionManager: session === void 0 ? state.bridge.readonlySessionManager({
-			id: "pi2dsh-detached",
-			events: []
-		}, cwdOf(agent)) : state.bridge.readonlySessionManager(session, cwdOf(agent)),
-		modelRegistry: {
-			getAll: () => allModels(),
-			getAvailable: () => allModels(),
-			find: (provider, modelId) => {
-				const entry = catalog?.find(provider, modelId);
-				return entry === void 0 ? void 0 : restorePiShape(entry);
-			},
-			getError: () => void 0,
-			hasConfiguredAuth: (model) => {
-				const provider = String(model?.provider ?? "");
-				if (provider.length === 0) return false;
-				return state.providers.has(provider) || (catalog?.all() ?? []).some((entry) => entry.provider === provider);
-			},
-			getApiKeyAndHeaders: async (model) => {
-				const provider = String(model?.provider ?? "");
-				const config = providerConfig(provider);
-				if (config !== void 0) {
-					const auth = (await resolvePiProviderAuth({
-						providerId: provider,
-						providerConfig: config,
-						store: oauthStoreOf(state)
-					}))?.auth;
-					if (auth?.apiKey === void 0) return { ok: false };
-					return {
-						ok: true,
-						apiKey: auth.apiKey,
-						...auth.headers === void 0 ? {} : { headers: auth.headers },
-						...auth.baseUrl === void 0 && config.baseUrl === void 0 ? {} : { baseUrl: auth.baseUrl ?? config.baseUrl }
-					};
-				}
-				try {
-					const entry = llmOf(ctx)?.listConfigurableProviders?.()?.find((candidate) => candidate.provider === provider);
-					if (entry === void 0) return { ok: false };
-					const section = ctx.get("settings")?.get(entry.settingsNs);
-					const ref = entry.settingsPath.reduce((node, key) => typeof node === "object" && node !== null ? node[key] : void 0, section)?.apiKeyEnv;
-					if (typeof ref !== "string" || ref.length === 0) return { ok: false };
-					const resolved = await ctx.get("credentials")?.resolve(ref);
-					if (typeof resolved?.value !== "string" || resolved.value.length === 0) return { ok: false };
-					return {
-						ok: true,
-						apiKey: resolved.value
-					};
-				} catch {
-					return { ok: false };
-				}
-			},
-			getProviderAuthStatus: (provider) => providerSupportsOAuth(providerConfig(provider)) ? "oauth" : "none",
-			getProvider: (provider) => {
-				const base = providerConfig(provider);
-				if (base !== void 0) return state.providerRouteDisposers.has(provider) ? dshRoutedPiProvider(base, provider) : base;
-				if ((catalog?.all() ?? []).some((entry) => entry.provider === provider)) return dshRoutedPiProvider({
-					id: provider,
-					name: provider
-				}, provider);
-			},
-			complete: async (model, context, options) => {
-				const result = await dshRoutedStream(model, context ?? {}, options).result();
-				if (result instanceof Error) throw result;
-				return result;
-			},
-			getRegisteredProviderConfig: (provider) => providerConfig(provider),
-			getRegisteredProviderIds: () => [...state.providers.keys()],
-			getProviderDisplayName: (provider) => {
-				const config = providerConfig(provider);
-				return typeof config?.name === "string" ? config.name : provider;
-			},
-			getProviderAuth: async (provider) => {
-				const config = providerConfig(provider);
-				if (config === void 0) return void 0;
-				const resolved = await resolvePiProviderAuth({
-					providerId: provider,
-					providerConfig: config,
-					store: oauthStoreOf(state)
-				});
-				if (resolved?.auth === void 0) return resolved;
-				return resolved.auth.baseUrl === void 0 && config.baseUrl !== void 0 ? {
-					...resolved,
-					auth: {
-						...resolved.auth,
-						baseUrl: config.baseUrl
-					}
-				} : resolved;
-			},
-			getApiKeyForProvider: async (provider) => {
-				const config = providerConfig(provider);
-				if (config === void 0) return void 0;
-				return ((await resolvePiProviderAuth({
+	const modelRegistry = {
+		getAll: () => allModels(),
+		getAvailable: () => allModels(),
+		find: (provider, modelId) => {
+			const entry = catalog?.find(provider, modelId);
+			return entry === void 0 ? void 0 : restorePiShape(entry);
+		},
+		getError: () => void 0,
+		hasConfiguredAuth: (model) => {
+			const provider = String(model?.provider ?? "");
+			if (provider.length === 0) return false;
+			return state.providers.has(provider) || (catalog?.all() ?? []).some((entry) => entry.provider === provider);
+		},
+		getApiKeyAndHeaders: async (model) => {
+			const provider = String(model?.provider ?? "");
+			const config = providerConfig(provider);
+			if (config !== void 0) {
+				const auth = (await resolvePiProviderAuth({
 					providerId: provider,
 					providerConfig: config,
 					store: oauthStoreOf(state)
-				}))?.auth)?.apiKey;
-			},
-			isUsingOAuth: (model) => {
-				const provider = String(model?.provider ?? "");
-				return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
-			},
-			refresh: async () => {
-				await catalog?.refresh();
+				}))?.auth;
+				if (auth?.apiKey === void 0) return { ok: false };
+				return {
+					ok: true,
+					apiKey: auth.apiKey,
+					...auth.headers === void 0 ? {} : { headers: auth.headers },
+					...auth.baseUrl === void 0 && config.baseUrl === void 0 ? {} : { baseUrl: auth.baseUrl ?? config.baseUrl }
+				};
+			}
+			try {
+				const entry = llmOf(ctx)?.listConfigurableProviders?.()?.find((candidate) => candidate.provider === provider);
+				if (entry === void 0) return { ok: false };
+				const section = ctx.get("settings")?.get(entry.settingsNs);
+				const ref = entry.settingsPath.reduce((node, key) => typeof node === "object" && node !== null ? node[key] : void 0, section)?.apiKeyEnv;
+				if (typeof ref !== "string" || ref.length === 0) return { ok: false };
+				const resolved = await ctx.get("credentials")?.resolve(ref);
+				if (typeof resolved?.value !== "string" || resolved.value.length === 0) return { ok: false };
 				return {
-					models: allModels(),
-					errors: []
+					ok: true,
+					apiKey: resolved.value
 				};
+			} catch {
+				return { ok: false };
 			}
 		},
+		getProviderAuthStatus: (provider) => providerSupportsOAuth(providerConfig(provider)) ? "oauth" : "none",
+		getProvider: (provider) => {
+			const base = providerConfig(provider);
+			if (base !== void 0) return state.providerRouteDisposers.has(provider) ? dshRoutedPiProvider(base, provider) : base;
+			if ((catalog?.all() ?? []).some((entry) => entry.provider === provider)) return dshRoutedPiProvider({
+				id: provider,
+				name: provider
+			}, provider);
+		},
+		complete: async (model, context, options) => {
+			const result = await dshRoutedStream(model, context ?? {}, options).result();
+			if (result instanceof Error) throw result;
+			return result;
+		},
+		getRegisteredProviderConfig: (provider) => providerConfig(provider),
+		getRegisteredProviderIds: () => [...state.providers.keys()],
+		getProviderDisplayName: (provider) => {
+			const config = providerConfig(provider);
+			return typeof config?.name === "string" ? config.name : provider;
+		},
+		getProviderAuth: async (provider) => {
+			const config = providerConfig(provider);
+			if (config === void 0) return void 0;
+			const resolved = await resolvePiProviderAuth({
+				providerId: provider,
+				providerConfig: config,
+				store: oauthStoreOf(state)
+			});
+			if (resolved?.auth === void 0) return resolved;
+			return resolved.auth.baseUrl === void 0 && config.baseUrl !== void 0 ? {
+				...resolved,
+				auth: {
+					...resolved.auth,
+					baseUrl: config.baseUrl
+				}
+			} : resolved;
+		},
+		getApiKeyForProvider: async (provider) => {
+			const config = providerConfig(provider);
+			if (config === void 0) return void 0;
+			return ((await resolvePiProviderAuth({
+				providerId: provider,
+				providerConfig: config,
+				store: oauthStoreOf(state)
+			}))?.auth)?.apiKey;
+		},
+		isUsingOAuth: (model) => {
+			const provider = String(model?.provider ?? "");
+			return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
+		},
+		refresh: async () => {
+			await catalog?.refresh();
+			return {
+				models: allModels(),
+				errors: []
+			};
+		}
+	};
+	const contextCwd = typeof (sessionOverride?.header)?.cwd === "string" ? sessionOverride.header.cwd : cwdOf(agent);
+	const base = {
+		ui,
+		mode: "rpc",
+		hasUI: userQuestions !== void 0,
+		cwd: contextCwd,
+		sessionManager: session === void 0 ? state.bridge.readonlySessionManager({
+			id: "pi2dsh-detached",
+			events: []
+		}, contextCwd) : state.bridge.readonlySessionManager(session, contextCwd),
+		modelRegistry,
 		model: agent === void 0 ? void 0 : currentPiModel(state, agent),
 		scopedModels: catalog?.all() ?? [],
 		thinkingLevel: thinkingLevelOf(state, agent),
@@ -1794,9 +1984,55 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			});
 		},
 		hasPendingMessages: () => false,
-		shutdown: () => unsupported("ctx.shutdown"),
+		shutdown: () => {
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.shutdown",
+				reason: "Pi delegates shutdown behavior to the host, and on DSH the user owns process exit.",
+				guidance: "The shutdown request was recorded and ignored.",
+				packageName: state.packageName
+			});
+		},
 		getContextUsage: () => void 0,
-		compact: () => unsupported("ctx.compact"),
+		compact: (options) => {
+			const ledger = capabilityLedgerOf(ctx, state);
+			const compaction = optionalService(ctx, "compaction");
+			const target = agent;
+			const onError = options?.onError;
+			if (compaction === void 0 || typeof target?.runMaintenance !== "function") {
+				const gap = new PiCapabilityError({
+					capability: "ctx.compact",
+					reason: compaction === void 0 ? "this DSH composition mounts no compaction service." : "compaction needs a live DSH agent for this turn.",
+					guidance: "Compaction runs through the host compaction plugin when one is composed.",
+					packageName: state.packageName
+				});
+				ledger.reportDegraded({
+					capability: "ctx.compact",
+					reason: gap.message,
+					guidance: "",
+					packageName: state.packageName
+				});
+				onError?.(gap);
+				return;
+			}
+			compaction.compactNow(target, new AbortController().signal).then((result) => {
+				if (result === null || result === void 0) return;
+				const dsh = result;
+				const summaryText = (Array.isArray(dsh.summary) ? dsh.summary : []).filter((block) => typeof block === "object" && block !== null && block.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n");
+				const onComplete = options?.onComplete;
+				onComplete?.({
+					summary: summaryText,
+					firstKeptEntryId: "",
+					tokensBefore: dsh.shadowedTokenCount ?? 0
+				});
+			}).catch((error) => {
+				const failure = error instanceof Error ? error : new Error(String(error));
+				if (onError !== void 0) {
+					onError(failure);
+					return;
+				}
+				logger(ctx).warn(`[pi2dsh] plugin "${state.packageName}": ctx.compact failed: ${failure.message}`);
+			});
+		},
 		getSystemPrompt: () => state.currentSystemPrompt,
 		__agent: agent,
 		__notices: notices
@@ -1807,11 +2043,139 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			const wait = agent?.whenIdle;
 			if (typeof wait === "function") await wait.call(agent);
 		},
-		newSession: () => unsupported("ctx.newSession"),
-		fork: () => unsupported("ctx.fork"),
-		navigateTree: () => unsupported("ctx.navigateTree"),
-		switchSession: () => unsupported("ctx.switchSession"),
-		reload: () => unsupported("ctx.reload")
+		newSession: async (options) => {
+			const sessions = optionalService(ctx, "sessions");
+			if (sessions === void 0) {
+				capabilityLedgerOf(ctx, state).reportDegraded({
+					capability: "ctx.newSession",
+					reason: "this DSH composition mounts no session service.",
+					guidance: "",
+					packageName: state.packageName
+				});
+				return { cancelled: true };
+			}
+			const parent = agentSession(agent);
+			const created = sessions.create(void 0, { meta: {
+				cwd: cwdOf(agent),
+				...parent?.id === void 0 ? {} : { parentSession: parent.id }
+			} });
+			const withSession = options?.withSession;
+			await withSession?.(contextFor(ctx, state, agent, signal, true, created));
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.newSession",
+				reason: `a new DSH session was created (${String(created.id)}).`,
+				guidance: "Which session the surface shows stays a host choice — open it from the DSH session list.",
+				packageName: state.packageName
+			});
+			return { cancelled: false };
+		},
+		fork: async (entryId, options) => {
+			const sessions = optionalService(ctx, "sessions");
+			const source = agentSession(agent);
+			if (sessions === void 0 || source === void 0) {
+				capabilityLedgerOf(ctx, state).reportDegraded({
+					capability: "ctx.fork",
+					reason: sessions === void 0 ? "this DSH composition mounts no session service." : "forking needs the live session of an active agent.",
+					guidance: "",
+					packageName: state.packageName
+				});
+				return { cancelled: true };
+			}
+			const seq = durableSeqOf(String(entryId));
+			if (seq === void 0) throw new Error(`pi2dsh: ctx.fork(${JSON.stringify(String(entryId))}) — only durable-log entries (projected ids "dsh-<seq>") can anchor a fork; package-appended sidecar entries are not part of the DSH durable log`);
+			const position = options?.position ?? "before";
+			const events = source.events ?? [];
+			const requested = Math.min(position === "at" ? seq : seq - 1, events.length - 1);
+			const boundary = requested < 0 ? -1 : shrinkToTurnBoundary(events, requested);
+			const child = boundary < 0 ? sessions.create(void 0, { meta: {
+				cwd: cwdOf(agent),
+				parentSession: source.id
+			} }) : sessions.fork(source, boundary);
+			const withSession = options?.withSession;
+			await withSession?.(contextFor(ctx, state, agent, signal, true, child));
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.fork",
+				reason: `the session was forked on DSH's official prefix-fork surface (child ${String(child.id)}; DSH forks land on completed-turn boundaries).`,
+				guidance: "Open the forked session from the DSH session list.",
+				packageName: state.packageName
+			});
+			return { cancelled: false };
+		},
+		navigateTree: async (targetId, options) => {
+			const sessions = optionalService(ctx, "sessions");
+			const source = agentSession(agent);
+			if (sessions === void 0 || source === void 0) {
+				capabilityLedgerOf(ctx, state).reportDegraded({
+					capability: "ctx.navigateTree",
+					reason: sessions === void 0 ? "this DSH composition mounts no session service." : "tree navigation needs the live session of an active agent.",
+					guidance: "",
+					packageName: state.packageName
+				});
+				return { cancelled: true };
+			}
+			const seq = durableSeqOf(String(targetId));
+			if (seq === void 0) throw new Error(`pi2dsh: ctx.navigateTree(${JSON.stringify(String(targetId))}) — only durable-log entries (projected ids "dsh-<seq>") can be navigation targets; package-appended sidecar entries are not part of the DSH durable log`);
+			const events = source.events ?? [];
+			const capped = Math.min(seq, events.length - 1);
+			const boundary = capped < 0 ? -1 : shrinkToTurnBoundary(events, capped);
+			const child = boundary < 0 ? sessions.create(void 0, { meta: {
+				cwd: cwdOf(agent),
+				parentSession: source.id
+			} }) : sessions.fork(source, boundary);
+			if (options?.summarize === true) {
+				const summary = await summarizeAbandonedBranch(ctx, state, agent, events, boundary, options);
+				if (summary !== void 0) state.bridge.appendBranchSummary(String(child.id), summary, String(targetId));
+			}
+			if (typeof options?.label === "string") state.bridge.appendLabel(String(child.id), String(targetId), options.label);
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.navigateTree",
+				reason: `navigation forked the session at the target on DSH's official surface (child ${String(child.id)}; the DSH tree lives BETWEEN sessions via fork lineage, not inside one log).`,
+				guidance: "Open the navigated session from the DSH session list.",
+				packageName: state.packageName
+			});
+			return { cancelled: false };
+		},
+		switchSession: async (sessionPath, options) => {
+			const sessions = optionalService(ctx, "sessions");
+			if (sessions === void 0) {
+				capabilityLedgerOf(ctx, state).reportDegraded({
+					capability: "ctx.switchSession",
+					reason: "this DSH composition mounts no session service.",
+					guidance: "",
+					packageName: state.packageName
+				});
+				return { cancelled: true };
+			}
+			const raw = String(sessionPath);
+			const base = raw.replace(/\\/g, "/").split("/").pop() ?? raw;
+			const candidate = base.endsWith(".jsonl") ? base.slice(0, -6) : base;
+			const target = sessions.get(candidate) ?? sessions.list().find((entry) => String(entry.id) === candidate);
+			if (target === void 0) throw new Error(`pi2dsh: ctx.switchSession(${JSON.stringify(raw)}) — no live DSH session ${JSON.stringify(candidate)}; switching to persisted sessions is host-owned (resume them from the DSH surface first)`);
+			const withSession = options?.withSession;
+			await withSession?.(contextFor(ctx, state, agent, signal, true, target));
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.switchSession",
+				reason: `the live DSH session ${JSON.stringify(candidate)} was targeted.`,
+				guidance: "Which session the surface shows stays a host choice — open it from the DSH session list.",
+				packageName: state.packageName
+			});
+			return { cancelled: false };
+		},
+		reload: async () => {
+			const remounts = state.shared.packageRemounts;
+			if (remounts === void 0 || remounts.size === 0) return;
+			for (const [name, remount] of remounts) try {
+				await remount();
+			} catch (error) {
+				logger(ctx).warn(`[pi2dsh] ctx.reload: remounting "${name}" failed: ${error instanceof Error ? error.message : String(error)}`);
+			}
+			capabilityLedgerOf(ctx, state).reportHostDecision({
+				capability: "ctx.reload",
+				reason: "extension entries were disposed and remounted through a fresh loader.",
+				guidance: "Skills, prompts, and themes are host-managed and reload when dsh restarts.",
+				packageName: state.packageName
+			});
+		}
 	});
 	return base;
 }
@@ -2488,7 +2852,12 @@ function registerLoginCommand(ctx, state) {
 	});
 }
 function registerTool(ctx, state, tool) {
-	if (state.tools.has(tool.name)) unregisterTool(state, tool.name);
+	if (state.tools.has(tool.name)) {
+		const previous = state.tools.get(tool.name);
+		state.tools.set(tool.name, tool);
+		if (JSON.stringify(previous.parameters ?? null) !== JSON.stringify(tool.parameters ?? null)) logger(ctx).warn(`[pi2dsh] tool ${tool.name} was re-registered with a different parameter schema; the new schema takes effect when dsh restarts (behavior is already live)`);
+		return;
+	}
 	const normalized = normalizeToolSchema(tool.parameters);
 	for (const warning of normalized.warnings) logger(ctx).warn(`[pi2dsh] tool ${tool.name}: ${warning}`);
 	state.tools.set(tool.name, tool);
@@ -2503,12 +2872,13 @@ function registerTool(ctx, state, tool) {
 		},
 		isConcurrencySafe: () => tool.executionMode === "parallel",
 		async execute(args, exec) {
+			const live = state.tools.get(tool.name) ?? tool;
 			const mutated = state.argMutations.get(exec);
 			if (mutated !== void 0) state.argMutations.delete(exec);
 			const effective = mutated ?? args;
-			const prepared = tool.prepareArguments?.(cloneJson(effective)) ?? effective;
+			const prepared = live.prepareArguments?.(cloneJson(effective)) ?? effective;
 			const agent = exec.agent;
-			const result = await normalizeToolResultForDsh(ctx, await state.agentScope.run(agent, () => tool.execute(String(exec.callId), prepared, exec.signal, (update) => {
+			const result = await normalizeToolResultForDsh(ctx, await state.agentScope.run(agent, () => live.execute(String(exec.callId), prepared, exec.signal, (update) => {
 				dispatch(state, "tool_execution_update", {
 					type: "tool_execution_update",
 					toolCallId: String(exec.callId),
@@ -2649,8 +3019,8 @@ function dshCommandName(ctx, piName) {
 }
 function registerCommand(ctx, state, command) {
 	if (state.commands.has(command.name)) {
-		state.commandDisposers.get(command.name)?.();
-		state.commandDisposers.delete(command.name);
+		state.commands.set(command.name, command);
+		return;
 	}
 	state.commands.set(command.name, command);
 	const commands = ctx.get("commands");
@@ -2662,11 +3032,12 @@ function registerCommand(ctx, state, command) {
 	const definitionFor = (dshName) => ({
 		name: dshName,
 		description: command.description || `Migrated Pi command /${command.name}`,
-		...command.argumentHint !== void 0 ? { input: { hint: command.argumentHint } } : {},
+		input: { hint: command.argumentHint ?? "arguments (optional)" },
 		async handler(invocation) {
 			const agent = invocation.agent;
 			const commandContext = contextFor(ctx, state, agent, invocation.signal, true);
-			await state.agentScope.run(agent, () => command.handler(String(invocation.rawInput ?? "").trimStart(), commandContext));
+			const live = state.commands.get(command.name) ?? command;
+			await state.agentScope.run(agent, () => live.handler(String(invocation.rawInput ?? "").trimStart(), commandContext));
 			const notices = commandContext.__notices;
 			return {
 				kind: "success",
@@ -2955,7 +3326,7 @@ async function registerPromptCommands(ctx, state, rootDir, manifest) {
 		});
 	}
 }
-async function loadExtensions(rootDir, manifest, api, onExtensionError) {
+async function loadExtensions(rootDir, manifest, api, onExtensionError, onCapabilityGap, onHostInfraReference) {
 	const resolveShim = async (name) => {
 		const compiled = fileURLToPath(new URL(`./compat/${name}.mjs`, import.meta.url));
 		try {
@@ -2995,14 +3366,22 @@ async function loadExtensions(rootDir, manifest, api, onExtensionError) {
 	});
 	const failures = [];
 	let mounted = 0;
-	for (const extension of manifest.extensions) try {
-		const loaded = await jiti.import(join(rootDir, extension));
-		const candidate = typeof loaded === "object" && loaded !== null && "default" in loaded ? loaded.default : loaded;
-		if (typeof candidate !== "function") throw new TypeError(`Pi extension ${extension} has no default factory function`);
-		await candidate(api);
-		mounted += 1;
-	} catch (error) {
-		failures.push(`${extension}: ${error instanceof Error ? error.message : String(error)}`);
+	for (const extension of manifest.extensions) {
+		try {
+			const source = await readFile(join(rootDir, extension), "utf8");
+			const infraImport = /import[^;]*?\b(ModelRuntime|DefaultPackageManager)\b[^;]*?from\s*['"]@(?:earendil-works|mariozechner)\/pi-coding-agent['"]/su.exec(source);
+			if (infraImport !== null) onHostInfraReference?.(infraImport[1], extension);
+		} catch {}
+		try {
+			const loaded = await jiti.import(join(rootDir, extension));
+			const candidate = typeof loaded === "object" && loaded !== null && "default" in loaded ? loaded.default : loaded;
+			if (typeof candidate !== "function") throw new TypeError(`Pi extension ${extension} has no default factory function`);
+			await candidate(api);
+			mounted += 1;
+		} catch (error) {
+			if (error instanceof PiCapabilityError || error instanceof Error && error.name === "PiCapabilityError") onCapabilityGap?.(error, extension);
+			failures.push(`${extension}: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	if (failures.length > 0 && mounted === 0 && manifest.extensions.length > 0) throw new Error(`every Pi extension entry failed to load:\n${failures.map((item) => `- ${item}`).join("\n")}`);
 	for (const failure of failures) onExtensionError?.(failure);
@@ -3023,6 +3402,7 @@ async function applyPiPackage(ctx, options) {
 	const shared = sharedHostStateOf(ctx);
 	const state = {
 		shared,
+		packageName: options.manifest.package.name,
 		handlers: /* @__PURE__ */ new Map(),
 		tools: runtimeTools,
 		runner: new ExtensionRunner(piToolRecords),
@@ -3112,12 +3492,39 @@ async function applyPiPackage(ctx, options) {
 		piContentToDsh: (content) => piToDshContent(ctx, content),
 		deliver: (agent, message, mode) => deliverAgentMessage(agent, message, mode),
 		messageFromSessionEvent,
-		messageSource: state.messageSource
+		messageSource: state.messageSource,
+		packageName: state.packageName
 	}, subagentOptions));
 	ctx.effect(() => () => __setSubagentSessionFactory(void 0));
 	await registerPromptCommands(ctx, state, rootDir, options.manifest);
-	await loadExtensions(rootDir, options.manifest, createPiApi(ctx, state), (failure) => logger(ctx).warn(`[pi2dsh] extension entry failed and was skipped (matching Pi's per-extension error isolation): ${failure}`));
-	logger(ctx).info(`[pi2dsh] loaded ${options.manifest.package.name}: ${state.tools.size} tools, ${state.commands.size} commands, ${options.manifest.skillDirs.length} skill roots`);
+	const onExtensionError = (failure) => logger(ctx).warn(`[pi2dsh] extension entry failed and was skipped (matching Pi's per-extension error isolation): ${failure}`);
+	const onCapabilityGap = (gap) => capabilityLedgerOf(ctx, state).reportUnusable({
+		capability: gap.capability,
+		reason: "this package needs it during startup.",
+		guidance: gap.message,
+		packageName: state.packageName
+	});
+	const onHostInfraReference = (symbol) => capabilityLedgerOf(ctx, state).reportStartupReference({
+		capability: symbol,
+		reason: symbol === "DefaultPackageManager" ? "installing packages is owned by the DSH host and its security gates (dsh plugin add/remove)." : "standalone model stacks are owned by the DSH host llm configuration (packages read ctx.modelRegistry).",
+		guidance: "",
+		packageName: state.packageName
+	});
+	const mountExtensions = () => loadExtensions(rootDir, options.manifest, createPiApi(ctx, state), onExtensionError, onCapabilityGap, onHostInfraReference);
+	await mountExtensions();
+	const remounts = shared.packageRemounts ??= /* @__PURE__ */ new Map();
+	remounts.set(state.packageName, async () => {
+		state.handlers.clear();
+		state.eventBus.removeAllListeners();
+		await registerPromptCommands(ctx, state, rootDir, options.manifest);
+		await mountExtensions();
+	});
+	ctx.effect(() => () => {
+		remounts.delete(state.packageName);
+	});
+	const health = state.shared.capabilityLedger?.healthOf(state.packageName);
+	const healthSuffix = health === void 0 || health.status === "ok" ? "" : ` — ${health.status.toUpperCase()}: missing Pi capabilities ${health.gaps.join(", ")}`;
+	logger(ctx).info(`[pi2dsh] loaded ${options.manifest.package.name}: ${state.tools.size} tools, ${state.commands.size} commands, ${options.manifest.skillDirs.length} skill roots${healthSuffix}`);
 }
 const runtimeInternals = {
 	expandPrompt,
@@ -3128,4 +3535,4 @@ const runtimeInternals = {
 //#endregion
 export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-DMEJknhK.mjs.map
+//# sourceMappingURL=runtime-DFD6u4NO.mjs.map