pi2dsh 0.5.0 → 0.6.1

package/dist/{runtime-VK4eVnYa.mjs → runtime-CPvg87et.mjs}

@@ -1,13 +1,13 @@
 
-import { C as realBuiltinProvider, R as AssistantMessageEventStream, S as openAIResponsesApi, a as builtinProviders, i as anthropicMessagesApi, r as __setPiAiLlmBridge, x as openAICompletionsApi } from "./pi-ai-B_88Wb0r.mjs";
+import { C as realBuiltinProvider, R as AssistantMessageEventStream, S as openAIResponsesApi, a as builtinProviders, i as anthropicMessagesApi, r as __setPiAiLlmBridge, x as openAICompletionsApi } from "./pi-ai-7HR3ciAs.mjs";
 import { r as normalizePath, t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-C9Y9ql5E.mjs";
-import { a as resolvePiProviderAuth, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-C6fL1qSv.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";
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -2629,7 +2629,7 @@ function contextFor(ctx, state, agent, signal, command = false) {
 				return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
 			},
 			refresh: async () => {
-				await reloadModelsJson(ctx, state);
+				await reloadModelsJson(ctx, state, true);
 				await catalog?.refresh();
 				return {
 					models: allModels(),
@@ -3167,11 +3167,45 @@ async function collectPiImages(ctx, messages) {
 	return images;
 }
 function oauthStoreOf(state) {
-	state.oauthStore ??= new FileCredentialStore(join(getAgentDir(), "auth.json"));
-	return state.oauthStore;
+	state.shared.oauthStore ??= new FileCredentialStore(join(getAgentDir(), "auth.json"));
+	return state.shared.oauthStore;
 }
 const MODELS_JSON_ROUTE_PREFIX = "models.json/";
-async function reloadModelsJson(ctx, state) {
+const SHARED_HOST_STATE = /* @__PURE__ */ new WeakMap();
+function sharedHostStateOf(ctx) {
+	const key = ctx.root ?? ctx;
+	let shared = SHARED_HOST_STATE.get(key);
+	if (shared === void 0) {
+		shared = {
+			modelsJsonProviders: /* @__PURE__ */ new Map(),
+			companionRoutes: /* @__PURE__ */ new Map(),
+			providerRouteDisposers: /* @__PURE__ */ new Map(),
+			providers: /* @__PURE__ */ new Map()
+		};
+		SHARED_HOST_STATE.set(key, shared);
+	}
+	return shared;
+}
+/**
+* Load models.json routes for a host with NO mounted Pi package yet — the
+* single-directory capability (custom providers + image-admission
+* companions in the DSH picker) is the bridge's own, not any plugin's.
+* A later package mount adopts the same shared snapshot.
+*/
+async function ensureModelsJsonRoutes(ctx) {
+	const shared = sharedHostStateOf(ctx);
+	await reloadModelsJson(ctx, {
+		shared,
+		modelsJsonProviders: shared.modelsJsonProviders,
+		companionRoutes: shared.companionRoutes,
+		providerRouteDisposers: shared.providerRouteDisposers
+	});
+}
+async function reloadModelsJson(ctx, state, force = false) {
+	if (!force && state.shared.modelsJson !== void 0) {
+		state.modelsJson = state.shared.modelsJson;
+		return;
+	}
 	for (const [key, dispose] of state.providerRouteDisposers) {
 		if (!key.startsWith(MODELS_JSON_ROUTE_PREFIX)) continue;
 		state.providerRouteDisposers.delete(key);
@@ -3180,6 +3214,7 @@ async function reloadModelsJson(ctx, state) {
 	state.modelsJsonProviders.clear();
 	state.companionRoutes.clear();
 	state.modelsJson = await loadModelsJsonSnapshot(realBuiltinProvider);
+	state.shared.modelsJson = state.modelsJson;
 	for (const problem of state.modelsJson.errors) logger(ctx).warn(`[pi2dsh] models.json: ${problem}`);
 	for (const [providerId, providerConfig] of state.modelsJson.providers) {
 		const models = state.modelsJson.models.filter((model) => model.provider === providerId);
@@ -3260,8 +3295,8 @@ async function materializeAttachmentImage(ctx, attachment) {
 	}
 }
 function ensureLoginCommand(ctx, state) {
-	if (state.loginCommandRegistered === true) return;
-	state.loginCommandRegistered = true;
+	if (state.shared.loginRegistered === true) return;
+	state.shared.loginRegistered = true;
 	try {
 		registerLoginCommand(ctx, state);
 	} catch (error) {
@@ -3829,7 +3864,9 @@ async function applyPiPackage(ctx, options) {
 			origin: "package"
 		}
 	}));
+	const shared = sharedHostStateOf(ctx);
 	const state = {
+		shared,
 		handlers: /* @__PURE__ */ new Map(),
 		tools: runtimeTools,
 		runner: new ExtensionRunner(piToolRecords),
@@ -3837,8 +3874,8 @@ async function applyPiPackage(ctx, options) {
 		toolRestrictions: /* @__PURE__ */ new WeakMap(),
 		commands: /* @__PURE__ */ new Map(),
 		commandDisposers: /* @__PURE__ */ new Map(),
-		modelsJsonProviders: /* @__PURE__ */ new Map(),
-		companionRoutes: /* @__PURE__ */ new Map(),
+		modelsJsonProviders: shared.modelsJsonProviders,
+		companionRoutes: shared.companionRoutes,
 		flags: /* @__PURE__ */ new Map(),
 		notifications: [],
 		activeAgents: /* @__PURE__ */ new Set(),
@@ -3852,7 +3889,7 @@ async function applyPiPackage(ctx, options) {
 		shortcuts: /* @__PURE__ */ new Map(),
 		messageRenderers: /* @__PURE__ */ new Map(),
 		entryRenderers: /* @__PURE__ */ new Map(),
-		providers: /* @__PURE__ */ new Map(),
+		providers: shared.providers,
 		autocompleteProviders: [],
 		editorBuffers: /* @__PURE__ */ new WeakMap(),
 		toolsExpanded: false,
@@ -3863,7 +3900,7 @@ async function applyPiPackage(ctx, options) {
 		argMutations: /* @__PURE__ */ new WeakMap(),
 		streamingTexts: /* @__PURE__ */ new Map(),
 		lastLoggedModels: /* @__PURE__ */ new WeakMap(),
-		providerRouteDisposers: /* @__PURE__ */ new Map()
+		providerRouteDisposers: shared.providerRouteDisposers
 	};
 	subscribeLifecycle(ctx, state);
 	subscribeInterceptors(ctx, state);
@@ -3886,12 +3923,15 @@ async function applyPiPackage(ctx, options) {
 		}
 	}
 	const llm = llmOf(ctx);
-	state.modelCatalog = new ModelCatalog(llm);
+	state.modelCatalog = shared.modelCatalog ??= new ModelCatalog(llm);
 	await reloadModelsJson(ctx, state);
 	if (llm !== void 0) {
-		ctx.on("llm/adapters-updated", () => {
-			state.modelCatalog?.refresh();
-		});
+		if (shared.catalogSubscribed !== true) {
+			shared.catalogSubscribed = true;
+			ctx.on("llm/adapters-updated", () => {
+				shared.modelCatalog?.refresh();
+			});
+		}
 		await state.modelCatalog.refresh();
 		__setPiAiLlmBridge((model, context, callOptions) => streamViaDshLlm(llm, {
 			model,
@@ -3931,6 +3971,6 @@ const runtimeInternals = {
 	textBlocks
 };
 //#endregion
-export { normalizeToolSchema as n, runtimeInternals as r, applyPiPackage as t };
+export { runtimeInternals as i, ensureModelsJsonRoutes as n, normalizeToolSchema as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-VK4eVnYa.mjs.map
+//# sourceMappingURL=runtime-CPvg87et.mjs.map