pi2dsh 0.20.0 → 0.22.0

package/dist/{runtime-CBZcd1uU.mjs → runtime-BVrvJuiO.mjs}

@@ -963,6 +963,7 @@ async function createBridgedAgentSession(host, options) {
 	const providedManager = options.sessionManager;
 	const archiveFile = typeof providedManager?.getSessionFile === "function" ? providedManager.getSessionFile() : void 0;
 	const resumeSessionId = host.resumeSessionIdFor?.(archiveFile);
+	const sideline = providedManager !== void 0 && archiveFile === void 0;
 	subagentSerial += 1;
 	const sessionId = `pi2dsh-sub-${Date.now().toString(36)}-${subagentSerial}`;
 	let handle;
@@ -1076,7 +1077,7 @@ async function createBridgedAgentSession(host, options) {
 			version: 2,
 			mode: "continuable",
 			provider: "pi2dsh",
-			label: childLabel(options.label, host.packageName)
+			label: `${sideline ? "Side: " : ""}${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)}`);
@@ -1139,7 +1140,16 @@ function messageText(message) {
 */
 var BrowserSurfaces = class {
 	#byParent = /* @__PURE__ */ new Map();
+	#commandRunners = /* @__PURE__ */ new Map();
 	#surfaces = /* @__PURE__ */ new Map();
+	/**
+	* Retained components from `(tui, theme) => Component` factories, keyed by
+	* their slot (session + package + widget key). Retained because the driver
+	* handed to the factory must stay LIVE: requestRender re-renders this
+	* component into its slot for as long as the package holds the handle.
+	* Replacing or clearing the slot disposes the previous component.
+	*/
+	#factoryComponents = /* @__PURE__ */ new Map();
 	#entrySources = /* @__PURE__ */ new Map();
 	#draftRequests = /* @__PURE__ */ new Map();
 	#liveDrafts = /* @__PURE__ */ new Map();
@@ -1267,6 +1277,32 @@ var BrowserSurfaces = class {
 		};
 	}
 	/**
+	* Register the executor for one package's Pi commands on one session, so
+	* product UI (a side-chat window's input, its action buttons) can run the
+	* package's OWN command handlers — the same code path the composer takes.
+	* Generic by construction: the runner closure carries the package runtime;
+	* this registry only routes (session, package) to it.
+	* @param sessionId - the root session the package is mounted for.
+	* @param packageName - the Pi package owning the commands.
+	* @param runner - executes one registered Pi command by its Pi name.
+	* @returns a disposer that unregisters the runner.
+	*/
+	registerCommandRunner(sessionId, packageName, runner) {
+		const runners = this.#commandRunners.get(sessionId) ?? /* @__PURE__ */ new Map();
+		runners.set(packageName, runner);
+		this.#commandRunners.set(sessionId, runners);
+		return () => {
+			const live = this.#commandRunners.get(sessionId);
+			if (live === void 0) return;
+			if (live.get(packageName) === runner) live.delete(packageName);
+			if (live.size === 0) this.#commandRunners.delete(sessionId);
+		};
+	}
+	/** The registered runner for (session, package), when one is mounted. */
+	commandRunner(sessionId, packageName) {
+		return this.#commandRunners.get(sessionId)?.get(packageName);
+	}
+	/**
 	* The panel's view of one parent session.
 	* @param parentSessionId - session the browser is currently showing.
 	* @returns every side thread opened under it, oldest first.
@@ -1314,11 +1350,56 @@ var BrowserSurfaces = class {
 	setWidget(sessionId, packageName, key, content, theme) {
 		if (sessionId.length === 0) return;
 		const view = this.#view(sessionId, packageName);
+		const slot = `${sessionId}${packageName ?? "pi"}${key}`;
+		this.#factoryComponents.get(slot)?.dispose?.();
+		this.#factoryComponents.delete(slot);
+		if (typeof content === "function") {
+			this.#mountFactory(slot, content, theme, (text) => {
+				const live = this.#view(sessionId, packageName);
+				if (text === void 0) delete live.widgets[key];
+				else live.widgets[key] = text;
+			});
+			return;
+		}
 		const text = surfaceText(content, theme);
 		if (text === void 0) delete view.widgets[key];
 		else view.widgets[key] = text;
 	}
 	/**
+	* Mount one `(tui, theme) => Component` factory: run it with a live driver,
+	* render the retained component now, and re-render it into the same slot on
+	* every requestRender. A factory or render that throws leaves the slot
+	* empty — the package's own bug stays its own — but a RETAINED handle keeps
+	* working for the component's lifetime.
+	* @param slot - identity for the retained component (dispose-on-replace).
+	* @param factory - the package's factory, exactly as passed to setWidget.
+	* @param theme - the bridge's headless theme.
+	* @param store - writes rendered text (or undefined to clear) into the slot.
+	*/
+	#mountFactory(slot, factory, theme, store) {
+		let component;
+		const render = () => {
+			if (component === void 0) return;
+			if (this.#factoryComponents.get(slot) !== component) return;
+			store(surfaceText(component, theme));
+		};
+		const driver = { requestRender: () => {
+			render();
+		} };
+		try {
+			component = factory(driver, theme);
+		} catch {
+			store(void 0);
+			return;
+		}
+		if (component === null || typeof component?.render !== "function") {
+			store(void 0);
+			return;
+		}
+		this.#factoryComponents.set(slot, component);
+		render();
+	}
+	/**
 	* Record one simple presentation call (working chrome, title, header,
 	* footer). The value is a string, a Pi component, a working-indicator
 	* options object, or a header/footer factory; each renders to text here so
@@ -1634,6 +1715,34 @@ function registerBrowserSurfaceRoute(ctx, registry, hooks) {
 				response.end(JSON.stringify(outcome ?? { ok: true }));
 				return;
 			}
+			if (url.pathname === "/pi2dsh/pi-command" && method === "POST") {
+				const chunks = [];
+				const raw = await new Promise((settle) => {
+					const stream = req;
+					stream.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+					stream.on("end", () => settle(Buffer.concat(chunks).toString("utf8")));
+				});
+				try {
+					const payload = JSON.parse(raw || "{}");
+					if (typeof payload.session !== "string" || typeof payload.package !== "string" || typeof payload.command !== "string") throw new TypeError("pi-command needs { session, package, command }");
+					const runner = registry.commandRunner(payload.session, payload.package);
+					if (runner === void 0) {
+						response.writeHead(404, { "content-type": "application/json; charset=utf-8" });
+						response.end(JSON.stringify({ error: `no ${payload.package} command runner mounted for this session` }));
+						return;
+					}
+					const notice = await runner(payload.command, typeof payload.args === "string" ? payload.args : "");
+					response.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+					response.end(JSON.stringify({
+						ok: true,
+						...notice === void 0 ? {} : { notice }
+					}));
+				} catch (error) {
+					response.writeHead(400, { "content-type": "application/json; charset=utf-8" });
+					response.end(JSON.stringify({ error: error instanceof Error ? error.message : String(error) }));
+				}
+				return;
+			}
 			if (method === "POST" && (url.pathname === "/pi2dsh/scene-input" || url.pathname === "/pi2dsh/scene-close")) {
 				const chunks = [];
 				const body = await new Promise((settle) => {
@@ -4174,7 +4283,7 @@ function projectDialogPrompt(title, supplementalDetail, linkMode) {
 		...detail.length === 0 ? {} : { detail }
 	};
 }
-function contextFor(ctx, state, agent, signal, command = false, sessionOverride) {
+function contextFor(ctx, state, agent, signal, command = false, sessionOverride, headlessUi = false) {
 	const notices = [];
 	const userQuestions = optionalService(ctx, "userQuestions");
 	const dialogLinkMode = optionalService(ctx, "tuiScenes") === void 0 ? "markdown" : "terminal";
@@ -4240,6 +4349,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride)
 		setTitle: (title) => putSurface(ctx, state, agent, "title", title),
 		custom: async (factory, options) => {
 			if (typeof factory !== "function") return void 0;
+			if (headlessUi) return void 0;
 			const surfaces = state.tuiSurfaces;
 			if (surfaces !== void 0) return surfaces.custom(factory, state.theme, getKeybindings(), options);
 			const browser = state.shared.browserSurfaces;
@@ -4456,7 +4566,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride)
 		scopedModels: [],
 		thinkingLevel: thinkingLevelOf(state, agent),
 		isIdle: () => command,
-		isProjectTrusted: () => false,
+		isProjectTrusted: () => agent !== void 0 && contextCwd.length > 0,
 		signal,
 		abort: () => {
 			const target = agent;
@@ -5872,16 +5982,16 @@ function ensureLoginCommand(ctx, state) {
 		logger(ctx).debug("[pi2dsh] native terminal owns /login and the authorization service is composed; Pi OAuth flows are available through it");
 		return;
 	}
-	const scoped = scopeOf(ctx);
-	const owner = typeof scoped === "object" && scoped !== null ? scoped : ctx;
-	const registered = state.shared.loginRegistered ??= /* @__PURE__ */ new WeakSet();
-	if (registered.has(owner)) return;
-	registered.add(owner);
+	if (state.shared.loginCommandRegistered === true) return;
+	state.shared.loginCommandRegistered = true;
 	try {
 		registerLoginCommand(ctx, state);
+		ctx.effect(() => () => {
+			state.shared.loginCommandRegistered = false;
+		});
 	} catch (error) {
-		registered.delete(owner);
-		logger(ctx).warn(`[pi2dsh] /login is already registered by an earlier package in this host; this package's providers use that command (${error instanceof Error ? error.message : String(error)})`);
+		state.shared.loginCommandRegistered = false;
+		logger(ctx).warn(`[pi2dsh] /login could not be registered; provider logins remain available on the host's own sign-in surface (${error instanceof Error ? error.message : String(error)})`);
 	}
 }
 /**
@@ -7277,7 +7387,7 @@ async function applyPiPackage(ctx, options) {
 		});
 	}
 	const browserSurfaces = state.shared.browserSurfaces ??= new BrowserSurfaces();
-	if (state.shared.browserSurfacesRouted !== true) {
+	if (options.config?.browserPresentation === true && state.shared.browserSurfacesRouted !== true) {
 		const sessionCwd = (session) => {
 			const cwd = ctx.get("sessions")?.get?.(session)?.header?.cwd;
 			if (typeof cwd === "string" && cwd.length > 0) return cwd;
@@ -7383,6 +7493,21 @@ async function applyPiPackage(ctx, options) {
 		}
 		return rendered;
 	}));
+	const runnerSessionId = ownerAgent === void 0 ? "" : String(agentSession(ownerAgent)?.id ?? "");
+	if (runnerSessionId.length > 0) {
+		const disposeRunner = browserSurfaces.registerCommandRunner(runnerSessionId, state.packageName, async (name, args) => {
+			const live = state.commands.get(name);
+			if (live === void 0) throw new Error(`${state.packageName} has no command ${JSON.stringify(name)}`);
+			const commandContext = contextFor(ctx, state, ownerAgent, void 0, true, void 0, true);
+			await runInPiRuntime(state, ownerAgent, async () => {
+				await ensurePiSessionStarted(ctx, state, ownerAgent, void 0);
+				await live.handler(args, commandContext);
+			});
+			const notices = commandContext.__notices;
+			return notices.length > 0 ? notices.join("\n") : void 0;
+		});
+		ctx.effect(() => disposeRunner);
+	}
 	state.subagentSessionFactory = async (subagentOptions) => {
 		const created = await createBridgedAgentSession(subagentHost(), subagentOptions);
 		const parent = agentSession(currentAgent(state));
@@ -7533,4 +7658,4 @@ const runtimeInternals = {
 //#endregion
 export { overlayProviderConfig as a, runtimeInternals as c, normalizeToolSchema as i, getSharedChildExtensionCatalog as n, registerChildExtensionCatalog as o, mergeProviderRegistration as r, registerVisionCompanions as s, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-CBZcd1uU.mjs.map
+//# sourceMappingURL=runtime-BVrvJuiO.mjs.map