pi2dsh 0.14.1 → 0.15.0

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

@@ -4214,7 +4214,7 @@ function subscribeLifecycle(ctx, state) {
 		for (const dispose of state.toolDisposers.values()) dispose();
 		state.toolDisposers.clear();
 		for (const provider of [...state.ownedProviderRoutes]) releaseSharedProviderRoute(state, provider);
-		state.eventBus.removeAllListeners();
+		for (const off of state.eventBusOffs.splice(0)) off();
 	}, "pi2dsh session shutdown");
 }
 async function flushPendingSessionStarts(ctx, state) {
@@ -4611,15 +4611,113 @@ 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.
+* Pi's provider ledger is layered, not flat (model-runtime.ts:742-786 at the
+* pinned upstream): a builtin base map, an extension overlay where defined
+* fields merge over the base (undefined fields expose the base — a package
+* overriding only baseUrl keeps the builtin OAuth flow), later registrations
+* overriding earlier ones, and unregistration restoring the builtin. These
+* helpers vendor that contract for the shared host ledger. One deliberate
+* adaptation: the overlay is slotted per PACKAGE and folded in package
+* first-registration order, because in Pi "last wins" is load order (each
+* session rebuilds the runtime so registration order is always load order),
+* while our host ledger accumulates across sessions — folding raw arrival
+* order would let a later agent's re-registration of package A overturn
+* package B for no Pi-semantic reason.
 */
-const BUILTIN_PROVIDER_SEEDS = /* @__PURE__ */ new WeakSet();
+function mergeProviderRegistration(previous, config) {
+	const effective = { ...previous };
+	for (const [key, value] of Object.entries(config)) if (value !== void 0) effective[key] = value;
+	return effective;
+}
+function overlayProviderConfig(base, overlay) {
+	const merged = { ...base };
+	for (const [key, value] of Object.entries(overlay)) if (value !== void 0) merged[key] = value;
+	const baseModels = base?.models;
+	if (overlay.models === void 0 && typeof overlay.baseUrl === "string" && Array.isArray(baseModels)) merged.models = baseModels.map((entry) => typeof entry === "object" && entry !== null ? {
+		...entry,
+		baseUrl: overlay.baseUrl
+	} : entry);
+	return merged;
+}
+/** Structural fingerprint used to decide whether a recomposition actually
+* changed the canonical shape. Function identities differ on every factory
+* run (each agent instance registers fresh closures), so functions compare
+* by presence — behaviourally equivalent re-registrations keep the existing
+* canonical reference and the route built on it, exactly like today. */
+function providerFingerprint(config) {
+	if (config === void 0) return "absent";
+	return JSON.stringify(config, (_key, value) => typeof value === "function" ? "[function]" : value);
+}
+function recordPackageProviderRegistration(shared, packageName, name, value) {
+	shared.providerPackages ??= /* @__PURE__ */ new Map();
+	shared.providerPackageOrder ??= [];
+	if (!shared.providerPackageOrder.includes(packageName)) shared.providerPackageOrder.push(packageName);
+	let slots = shared.providerPackages.get(name);
+	if (slots === void 0) {
+		slots = /* @__PURE__ */ new Map();
+		shared.providerPackages.set(name, slots);
+	}
+	slots.set(packageName, mergeProviderRegistration(slots.get(packageName), value));
+}
+/** Rebuild the canonical entry for one provider id from builtin + package
+* slots. Returns whether the composed shape changed (callers retire the
+* route on change so it is rebuilt from the new canonical). */
+function recomposeSharedProvider(shared, name) {
+	const builtin = shared.providerBuiltins?.get(name);
+	const slots = shared.providerPackages?.get(name);
+	let canonical;
+	if (slots === void 0 || slots.size === 0) canonical = builtin;
+	else {
+		canonical = { ...builtin ?? {} };
+		for (const packageName of shared.providerPackageOrder ?? []) {
+			const registration = slots.get(packageName);
+			if (registration !== void 0) canonical = overlayProviderConfig(canonical, registration);
+		}
+	}
+	if (!(providerFingerprint(shared.providers.get(name)) !== providerFingerprint(canonical))) return false;
+	if (canonical === void 0) shared.providers.delete(name);
+	else shared.providers.set(name, canonical);
+	return true;
+}
+/** Force-retire a provider's route regardless of refcounts: the canonical
+* definition changed, so a route built on the old shape must not serve it. */
+function retireSharedProviderRoute(shared, name) {
+	const route = shared.providerRouteDisposers.get(name);
+	if (route === void 0) return;
+	shared.providerRouteDisposers.delete(name);
+	shared.providerRouteOwners.delete(name);
+	route();
+}
+function sharedEventBusFor(shared, ownerAgent) {
+	if (ownerAgent === void 0) {
+		if (shared.hostEventBus === void 0) {
+			shared.hostEventBus = new EventEmitter();
+			shared.hostEventBus.setMaxListeners(0);
+		}
+		return shared.hostEventBus;
+	}
+	shared.agentEventBuses ??= /* @__PURE__ */ new WeakMap();
+	let bus = shared.agentEventBuses.get(ownerAgent);
+	if (bus === void 0) {
+		bus = new EventEmitter();
+		bus.setMaxListeners(0);
+		shared.agentEventBuses.set(ownerAgent, bus);
+	}
+	return bus;
+}
+function sharedThemeFor(shared, ownerAgent) {
+	if (ownerAgent === void 0) {
+		shared.hostTheme ??= new Theme();
+		return shared.hostTheme;
+	}
+	shared.agentThemes ??= /* @__PURE__ */ new WeakMap();
+	let theme = shared.agentThemes.get(ownerAgent);
+	if (theme === void 0) {
+		theme = new Theme();
+		shared.agentThemes.set(ownerAgent, theme);
+	}
+	return theme;
+}
 function sharedHostStateOf(ctx) {
 	const key = ctx.root ?? ctx;
 	let shared = SHARED_HOST_STATE.get(key);
@@ -5495,7 +5593,7 @@ function registerSharedProviderRoute(ctx, state, name, value) {
 		return existing;
 	}
 	const canonical = shared.providers.get(name) ?? value;
-	shared.providers.set(name, canonical);
+	if (!shared.providers.has(name)) shared.providers.set(name, canonical);
 	const route = registerPiProviderRoute({
 		llm: llmOf(ctx),
 		ctx,
@@ -5550,31 +5648,27 @@ 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);
-			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)) {
+			recordPackageProviderRegistration(state.shared, state.packageName, name, value);
+			if (recomposeSharedProvider(state.shared, name)) retireSharedProviderRoute(state.shared, name);
+			const canonical = state.shared.providers.get(name) ?? value;
+			if (providerSupportsOAuth(canonical)) {
 				ensureLoginCommand(ctx, state);
 				logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} supports OAuth — log in with /login ${name}`);
 			}
-			if (registerSharedProviderRoute(ctx, state, name, value) !== void 0) {
+			if (registerSharedProviderRoute(ctx, state, name, canonical) !== void 0) {
 				state.modelCatalog?.refresh();
-				if (providerCarriesTransport(value)) logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} registered as a native DSH llm route`);
-			} else if (!providerSupportsOAuth(value)) logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
-			discoverProviderModels(ctx, state, name, value);
+				if (providerCarriesTransport(canonical)) logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} registered as a native DSH llm route`);
+			} else if (!providerSupportsOAuth(canonical)) logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
+			discoverProviderModels(ctx, state, name, canonical);
 		},
 		unregisterProvider(name) {
 			state.providers.delete(name);
 			releaseSharedProviderRoute(state, name);
+			if ((state.shared.providerPackages?.get(name))?.delete(state.packageName) === true && recomposeSharedProvider(state.shared, name)) {
+				retireSharedProviderRoute(state.shared, name);
+				const restored = state.shared.providers.get(name);
+				if (restored !== void 0) registerSharedProviderRoute(ctx, state, name, restored);
+			}
 		},
 		registerMessageRenderer(customType, renderer) {
 			state.messageRenderers.set(customType, renderer);
@@ -5687,7 +5781,11 @@ function createPiApi(ctx, state) {
 					Promise.resolve(handler(data)).catch((error) => logger(ctx).warn(`[pi2dsh] package event ${channel} handler failed: ${String(error)}`));
 				};
 				state.eventBus.on(channel, safeHandler);
-				return () => state.eventBus.off(channel, safeHandler);
+				const off = () => {
+					state.eventBus.off(channel, safeHandler);
+				};
+				state.eventBusOffs.push(off);
+				return off;
 			}
 		}
 	};
@@ -5877,13 +5975,14 @@ async function applyPiPackage(ctx, options) {
 		pendingSessionStarts: /* @__PURE__ */ new Map(),
 		currentSystemPrompt: "",
 		messageSource: `pi2dsh:${options.manifest.package.name}`,
-		eventBus: new EventEmitter(),
+		eventBus: sharedEventBusFor(shared, ownerAgent),
+		eventBusOffs: [],
 		agentScope: new AsyncLocalStorage(),
 		llmBridge: void 0,
 		piAiRegistry: __createPiAiRuntimeRegistry(),
 		subagentSessionFactory: void 0,
 		bridge: new PiSessionBridge(),
-		theme: new Theme(),
+		theme: sharedThemeFor(shared, ownerAgent),
 		shortcuts: /* @__PURE__ */ new Map(),
 		messageRenderers: /* @__PURE__ */ new Map(),
 		entryRenderers: /* @__PURE__ */ new Map(),
@@ -5914,15 +6013,18 @@ async function applyPiPackage(ctx, options) {
 	}, typeof ownerAgent?.id === "string" ? ownerAgent.id : void 0);
 	subscribeLifecycle(ctx, state);
 	subscribeInterceptors(ctx, state);
+	shared.providerBuiltins ??= /* @__PURE__ */ new Map();
 	for (const provider of builtinProviders()) {
 		const config = {
 			name: provider.name,
 			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);
+		if (!shared.providerBuiltins.has(provider.id)) {
+			shared.providerBuiltins.set(provider.id, config);
+			recomposeSharedProvider(shared, provider.id);
+		}
 	}
 	ensureLoginCommand(ctx, state);
 	for (const [name, config] of [...state.providers]) try {
@@ -6073,7 +6175,7 @@ async function applyPiPackage(ctx, options) {
 	remounts.set(state.packageName, async () => {
 		state.extensionsReady = false;
 		state.handlers.clear();
-		state.eventBus.removeAllListeners();
+		for (const off of state.eventBusOffs.splice(0)) off();
 		try {
 			await registerPromptCommands(ctx, state, rootDir, options.manifest);
 			await mountExtensions();
@@ -6102,6 +6204,6 @@ const runtimeInternals = {
 	textBlocks
 };
 //#endregion
-export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
+export { registerVisionCompanions as a, overlayProviderConfig as i, mergeProviderRegistration as n, runtimeInternals as o, normalizeToolSchema as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-BiD3SeGf.mjs.map
+//# sourceMappingURL=runtime-BN4E4OtI.mjs.map