pi2dsh 0.13.3 → 0.14.1

package/dist/{runtime-Dd2KhoX-.mjs → runtime-BiD3SeGf.mjs}

@@ -1,9 +1,9 @@
 
-import { En as PiCapabilityError, F as generateBranchSummary, Tn as CapabilityLedger, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-Cvez0jkF.mjs";
+import { En as PiCapabilityError, F as generateBranchSummary, Tn as CapabilityLedger, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-DK8hbJP5.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { $ as isContextOverflow, Q as AssistantMessageEventStream, S as getSupportedThinkingLevels, c as builtinProviders, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry } from "./pi-ai-Dh7HUxbt.mjs";
+import { $ as isContextOverflow, Q as AssistantMessageEventStream, S as getSupportedThinkingLevels, c as builtinProviders, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry } from "./pi-ai-DpqiLdPA.mjs";
 import { W as getKeybindings } from "./pi-tui-DruSeKmd.mjs";
-import { a as FileCredentialStore, c as providerSupportsOAuth, i as oauthCredentialRef, l as resolvePiProviderAuth, o as joinSignals, s as loginPiProvider, u as storedOAuthCredential } from "./credentials-oauth-CAohSLcB.mjs";
+import { a as FileCredentialStore, c as providerSupportsOAuth, i as oauthCredentialRef, l as resolvePiProviderAuth, o as joinSignals, s as loginPiProvider, u as storedOAuthCredential } from "./credentials-oauth-Didpkkjx.mjs";
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
@@ -358,6 +358,18 @@ var PiSessionBridge = class {
 //#endregion
 //#region src/subagent-bridge.ts
 let subagentSerial = 0;
+/**
+* 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.
+* The bridge's callbacks filter by exact session/agent identity, so they
+* subscribe unscoped at the root context — the same posture the old
+* host-level mount had.
+*/
+function unscopedEventContext(cordis) {
+	const host = cordis;
+	return host.root ?? host;
+}
 /** Flatten a Pi message's content to text for transcript seeding. */
 function piMessageText(message) {
 	const content = message.content;
@@ -397,7 +409,7 @@ var PiBridgedAgentSession = class {
 		this.#session = handle.agent.session ?? {};
 		this.#tools = tools;
 		this.#activeToolNames = tools.map((tool) => tool?.name).filter((name) => typeof name === "string");
-		const cordis = host.cordis;
+		const cordis = unscopedEventContext(host.cordis);
 		const offEvents = cordis.on("session/event", (session, event) => {
 			if (session !== this.#session) return;
 			this.#project(event);
@@ -596,7 +608,7 @@ var PiBridgedAgentSession = class {
 			type: "text",
 			text: String(text)
 		}]);
-		const cordis = this.#host.cordis;
+		const cordis = unscopedEventContext(this.#host.cordis);
 		const completed = new Promise((resolve) => {
 			const off = cordis.on("session/event", (session, event) => {
 				if (session !== this.#session) return;
@@ -4013,9 +4025,7 @@ function subscribeLifecycle(ctx, state) {
 			}
 		}
 	});
-	cordis.on("session/event", (session, event) => {
-		const ownedSession = agentSession(state.ownerAgent);
-		if (ownedSession !== void 0 ? session !== ownedSession : isSubagentOrigin(session)) return;
+	const projectSessionEvent = (session, event) => {
 		const agent = [...state.activeAgents].find((candidate) => candidate.session === session);
 		const eventContext = contextFor(ctx, state, agent, void 0);
 		const type = event.type;
@@ -4162,6 +4172,14 @@ function subscribeLifecycle(ctx, state) {
 			}, eventContext);
 			await dispatch(state, "agent_settled", { type: "agent_settled" }, eventContext);
 		}).catch((error) => warn("turn end lifecycle", error));
+	};
+	state.projectSessionEvent = projectSessionEvent;
+	cordis.on("session/event", (session, event) => {
+		if (state.hostAnchor) return;
+		const ownedSession = agentSession(state.ownerAgent);
+		if (ownedSession !== void 0 ? session !== ownedSession : isSubagentOrigin(session)) return;
+		if (ownedSession !== void 0 && state.sessionEventsLive !== true) return;
+		projectSessionEvent(session, event);
 	});
 	cordis.on("agent/request", async (payload, next) => {
 		const config = await next();
@@ -4201,9 +4219,35 @@ function subscribeLifecycle(ctx, state) {
 }
 async function flushPendingSessionStarts(ctx, state) {
 	state.extensionsReady = true;
+	if (state.ownerAgent !== void 0 && !state.pendingSessionStarts.has(state.ownerAgent)) {
+		const owned = state.ownerAgent;
+		if (!state.activeAgents.has(owned)) {
+			state.activeAgents.add(owned);
+			trackRuntimeSession(state, owned);
+			const session = agentSession(owned);
+			if (session !== void 0) state.bridge.load(session.id);
+		}
+		state.pendingSessionStarts.set(owned, "startup");
+	}
 	const pending = [...state.pendingSessionStarts];
 	state.pendingSessionStarts.clear();
 	for (const [agent, reason] of pending) await startPiSession(ctx, state, agent, reason, void 0);
+	if (state.ownerAgent !== void 0 && state.projectSessionEvent !== void 0) {
+		const session = agentSession(state.ownerAgent);
+		if (session !== void 0) {
+			const events = session.events ?? [];
+			let from = -1;
+			for (let index = events.length - 1; index >= 0; index -= 1) {
+				if (events[index].type === "turn/end") break;
+				if (events[index].type === "turn/start") {
+					from = index;
+					break;
+				}
+			}
+			if (from >= 0) for (let index = from; index < events.length; index += 1) state.projectSessionEvent(session, events[index]);
+		}
+		state.sessionEventsLive = true;
+	}
 }
 /**
 * Start freshly reloaded extension handlers in every live Pi host session.
@@ -4354,7 +4398,7 @@ function subscribeInterceptors(ctx, state) {
 		};
 	});
 	const systemPrompt = optionalService(ctx, "systemPrompt");
-	if (systemPrompt !== void 0) ctx.effect(() => systemPrompt.section({
+	if (systemPrompt !== void 0 && !state.hostAnchor) ctx.effect(() => systemPrompt.section({
 		name: `pi2dsh:tool-guidance:${state.packageName ?? "pi"}`,
 		order: 150,
 		text: () => piToolPromptContribution(ctx, state)
@@ -4566,6 +4610,16 @@ function oauthStoreOf(state) {
 }
 const COMPANION_ROUTE_PREFIX = "pi2dsh-companion/";
 const SHARED_HOST_STATE = /* @__PURE__ */ new WeakMap();
+/**
+* The engine's own built-in OAuth directory entries, by object identity.
+* They are login placeholders (no models, no transport), preloaded so
+* `/login <provider>` works before any package is installed — and a package
+* registering the SAME provider id owns the richer definition (transport,
+* catalog, its own flow) and must supersede the placeholder in the shared
+* ledger. Two PACKAGES colliding on one id still keep first-wins, matching
+* the route-ownership rule.
+*/
+const BUILTIN_PROVIDER_SEEDS = /* @__PURE__ */ new WeakSet();
 function sharedHostStateOf(ctx) {
 	const key = ctx.root ?? ctx;
 	let shared = SHARED_HOST_STATE.get(key);
@@ -5011,6 +5065,10 @@ function registerTool(ctx, state, tool) {
 	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);
+	if (state.hostAnchor) {
+		state.toolDisposers.set(tool.name, () => {});
+		return;
+	}
 	const definition = {
 		name: tool.name,
 		description: tool.description,
@@ -5071,6 +5129,7 @@ function currentAgent(state) {
 }
 /** Exact-Agent ownership for scoped mounts; legacy root mounts retain their old host-session rule. */
 function acceptsAgent(state, agent) {
+	if (state.hostAnchor) return false;
 	if (state.ownerAgent !== void 0) return agent === state.ownerAgent;
 	return !isSubagentOrigin(agent);
 }
@@ -5316,6 +5375,7 @@ function registerCommand(ctx, state, command) {
 		return;
 	}
 	state.commands.set(command.name, command);
+	if (state.hostAnchor) return;
 	const commands = ctx.get("commands");
 	if (commands === void 0) {
 		logger(ctx).warn(`[pi2dsh] command /${command.name} was not registered because this DSH composition has no ctx.commands`);
@@ -5490,7 +5550,18 @@ function createPiApi(ctx, state) {
 			const name = typeof providerOrName === "string" ? providerOrName : String(providerOrName?.id ?? providerOrName?.name ?? "unnamed");
 			const value = typeof providerOrName === "string" ? config ?? {} : providerOrName;
 			state.providers.set(name, value);
-			if (!state.shared.providers.has(name)) state.shared.providers.set(name, value);
+			const sharedExisting = state.shared.providers.get(name);
+			if (sharedExisting === void 0 || BUILTIN_PROVIDER_SEEDS.has(sharedExisting)) {
+				state.shared.providers.set(name, value);
+				if (sharedExisting !== void 0) {
+					const stale = state.shared.providerRouteDisposers.get(name);
+					if (stale !== void 0) {
+						state.shared.providerRouteDisposers.delete(name);
+						state.shared.providerRouteOwners.delete(name);
+						stale();
+					}
+				}
+			}
 			if (providerSupportsOAuth(value)) {
 				ensureLoginCommand(ctx, state);
 				logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} supports OAuth — log in with /login ${name}`);
@@ -5782,6 +5853,7 @@ async function applyPiPackage(ctx, options) {
 		shared,
 		packageName: options.manifest.package.name,
 		ownerAgent,
+		hostAnchor: options.hostAnchor === true,
 		handlers: /* @__PURE__ */ new Map(),
 		tools: runtimeTools,
 		runner: new ExtensionRunner(piToolRecords),
@@ -5848,6 +5920,7 @@ async function applyPiPackage(ctx, options) {
 			baseUrl: provider.baseUrl,
 			oauth: provider.auth.oauth
 		};
+		BUILTIN_PROVIDER_SEEDS.add(config);
 		state.providers.set(provider.id, config);
 		if (!shared.providers.has(provider.id)) shared.providers.set(provider.id, config);
 	}
@@ -5857,7 +5930,7 @@ async function applyPiPackage(ctx, options) {
 	} catch (error) {
 		logger(ctx).warn(`[pi2dsh] could not restore the route for logged-in provider ${JSON.stringify(name)}: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	if (options.manifest.skillDirs.length > 0) {
+	if (options.manifest.skillDirs.length > 0 && state.ownerAgent === void 0) {
 		if (ctx.get("skills") === void 0) logger(ctx).warn("[pi2dsh] migrated skills were not mounted because this DSH composition has no ctx.skills");
 		else {
 			const { apply: applyFilesystemSkills } = await import("@deepseek-ai/dsh-skill-filesystem");
@@ -6014,7 +6087,7 @@ async function applyPiPackage(ctx, options) {
 	});
 	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}`);
+	logger(ctx).info(`[pi2dsh] loaded ${options.manifest.package.name}: ${state.tools.size} tools, ${state.commands.size} commands, ${options.manifest.skillDirs.length} skill roots${healthSuffix}${state.hostAnchor ? " (host anchor)" : ""}`);
 }
 const runtimeInternals = {
 	compactionReason,
@@ -6031,4 +6104,4 @@ const runtimeInternals = {
 //#endregion
 export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-Dd2KhoX-.mjs.map
+//# sourceMappingURL=runtime-BiD3SeGf.mjs.map