pi2dsh 0.3.0 → 0.3.1

package/dist/{runtime-oLd2EInK.mjs → runtime-6DefpI6h.mjs}

@@ -1,9 +1,11 @@
 
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
 import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-Z1hTs61i.mjs";
+import { a as storedOAuthCredential, i as resolveOAuthApiKey, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-BpPrppjR.mjs";
+import { r as builtinProviders } from "./pi-ai-CWFlgigJ.mjs";
 import { createRequire } from "node:module";
-import { access, mkdir, readFile, rename, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { access, readFile } from "node:fs/promises";
+import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -492,358 +494,6 @@ async function createBridgedAgentSession(host, options) {
 	return { session: new PiBridgedAgentSession(host, handle, tools) };
 }
 //#endregion
-//#region src/compat/vendor/pi-ai-abort.ts
-function abortReason(signal) {
-	if (signal.reason !== void 0) return signal.reason;
-	const error = /* @__PURE__ */ new Error("The operation was aborted");
-	error.name = "AbortError";
-	return error;
-}
-/** Create an operation-local signal for public APIs whose signal is optional. */
-function operationSignal(signal) {
-	return signal ?? new AbortController().signal;
-}
-/**
-* Stop waiting for an operation when its signal aborts while continuing to
-* observe the abandoned promise so a later rejection is always handled.
-*/
-function raceWithAbortSignal(operation, signal) {
-	if (signal.aborted) {
-		operation.catch(() => {});
-		return Promise.reject(abortReason(signal));
-	}
-	return new Promise((resolve, reject) => {
-		let settled = false;
-		const cleanup = () => signal.removeEventListener("abort", onAbort);
-		const onAbort = () => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			reject(abortReason(signal));
-		};
-		signal.addEventListener("abort", onAbort, { once: true });
-		operation.then((value) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			resolve(value);
-		}, (error) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			reject(error);
-		});
-		if (signal.aborted) onAbort();
-	});
-}
-//#endregion
-//#region src/compat/vendor/pi-ai-credential-store.ts
-/**
-* Default in-memory credential store. Apps inject persistent stores.
-* Keyed by `Provider.id`, one credential per provider; see `CredentialStore`.
-* Writes are serialized per provider through a promise chain.
-*/
-var InMemoryCredentialStore = class {
-	credentials = /* @__PURE__ */ new Map();
-	chains = /* @__PURE__ */ new Map();
-	/** Serialize tasks per provider id without releasing the chain before active work settles. */
-	enqueue(providerId, task, options) {
-		const signal = operationSignal(options?.signal);
-		const previous = this.chains.get(providerId) ?? Promise.resolve();
-		const queued = (async () => {
-			await previous.catch(() => {});
-			signal.throwIfAborted();
-			return task();
-		})();
-		const tail = queued.catch(() => {});
-		this.chains.set(providerId, tail);
-		tail.then(() => {
-			if (this.chains.get(providerId) === tail) this.chains.delete(providerId);
-		});
-		return raceWithAbortSignal(queued, signal);
-	}
-	async read(providerId, options) {
-		options?.signal?.throwIfAborted();
-		return this.credentials.get(providerId);
-	}
-	async list(options) {
-		options?.signal?.throwIfAborted();
-		return [...this.credentials].map(([providerId, credential]) => ({
-			providerId,
-			type: credential.type
-		}));
-	}
-	modify(providerId, fn, options) {
-		return this.enqueue(providerId, async () => {
-			const current = this.credentials.get(providerId);
-			const next = await fn(current);
-			options?.signal?.throwIfAborted();
-			if (next !== void 0) this.credentials.set(providerId, next);
-			return next ?? current;
-		}, options);
-	}
-	delete(providerId, options) {
-		return this.enqueue(providerId, async () => {
-			this.credentials.delete(providerId);
-		}, options);
-	}
-};
-//#endregion
-//#region src/compat/vendor/pi-ai-diagnostics.ts
-function formatThrownValue(value) {
-	if (value instanceof Error) return value.message || value.name;
-	if (typeof value === "string") return value;
-	return String(value);
-}
-//#endregion
-//#region src/compat/vendor/pi-ai-auth-resolve.ts
-var ModelsError = class extends Error {
-	code;
-	constructor(code, message, options) {
-		super(withCauseDetail(message, options?.cause), options);
-		this.name = "ModelsError";
-		this.code = code;
-	}
-};
-/** Callers surface `error.message` only, so keep the underlying reason in it. */
-function withCauseDetail(message, cause) {
-	if (cause === void 0 || cause === null) return message;
-	const detail = formatThrownValue(cause).trim();
-	if (!detail || message.includes(detail)) return message;
-	return `${message}: ${detail}`;
-}
-/**
-* Auth resolution shared by the `Models` and `ImagesModels` collections.
-* A stored credential owns the provider: ambient/env is consulted only when
-* nothing is stored. No silent env fallback after a failed refresh or for a
-* credential type without a matching handler.
-*/
-function resolveProviderAuth(provider, credentials, authContext, overrides) {
-	const signal = operationSignal(overrides?.signal);
-	return raceWithAbortSignal(resolveProviderAuthWithSignal(provider, credentials, authContext, overrides, signal), signal);
-}
-async function resolveProviderAuthWithSignal(provider, credentials, authContext, overrides, signal) {
-	signal.throwIfAborted();
-	const requestAuthContext = overrides?.env ? overlayEnvAuthContext(authContext, overrides.env) : authContext;
-	if (overrides?.apiKey !== void 0 && provider.auth.apiKey) return resolveApiKey(requestAuthContext, provider.auth.apiKey, provider.id, {
-		type: "api_key",
-		key: overrides.apiKey,
-		env: overrides.env
-	}, signal);
-	const stored = await readCredential(credentials, provider.id, signal);
-	if (stored) {
-		if (stored.type === "oauth" && provider.auth.oauth) return resolveStoredOAuth(credentials, provider.id, provider.auth.oauth, stored, signal, overrides?.minOAuthValidityMs);
-		if (stored.type === "api_key" && provider.auth.apiKey) {
-			const credential = overrides?.env ? {
-				...stored,
-				env: {
-					...stored.env,
-					...overrides.env
-				}
-			} : stored;
-			return resolveApiKey(requestAuthContext, provider.auth.apiKey, provider.id, credential, signal);
-		}
-		return;
-	}
-	return provider.auth.apiKey ? resolveApiKey(requestAuthContext, provider.auth.apiKey, provider.id, void 0, signal) : void 0;
-}
-function overlayEnvAuthContext(base, env) {
-	return {
-		env: async (name) => env[name] || await base.env(name),
-		fileExists: (path) => base.fileExists(path)
-	};
-}
-const DEFAULT_OAUTH_MINIMUM_VALIDITY_MS = 3e5;
-const DEFAULT_OAUTH_REFRESH_TIMEOUT_MS = 15e3;
-/**
-* OAuth resolution with double-checked locking: tokens with less than five
-* minutes remaining lock, re-check expiry under the lock, refresh once
-* globally, and persist the rotated credential before release.
-*/
-async function resolveStoredOAuth(credentials, providerId, oauth, stored, signal, minOAuthValidityMs) {
-	const minimumValidityMs = Math.max(DEFAULT_OAUTH_MINIMUM_VALIDITY_MS, minOAuthValidityMs ?? 0);
-	const expiresSoon = (credential) => Date.now() + minimumValidityMs >= credential.expires;
-	let credential = stored;
-	if (expiresSoon(credential)) {
-		let post;
-		try {
-			post = await credentials.modify(providerId, async (current) => {
-				if (current?.type !== "oauth") return void 0;
-				if (!expiresSoon(current)) return void 0;
-				try {
-					const refreshSignal = AbortSignal.any([signal, AbortSignal.timeout(DEFAULT_OAUTH_REFRESH_TIMEOUT_MS)]);
-					return await oauth.refresh(current, refreshSignal);
-				} catch (error) {
-					throw new ModelsError("oauth", `OAuth refresh failed for ${providerId}`, { cause: error });
-				}
-			}, { signal });
-		} catch (error) {
-			if (error instanceof ModelsError) throw error;
-			throw new ModelsError("auth", `Credential store modify failed for ${providerId}`, { cause: error });
-		}
-		if (post?.type !== "oauth") return void 0;
-		credential = post;
-		if (minOAuthValidityMs !== void 0 && expiresSoon(credential)) throw new ModelsError("oauth", `OAuth refresh returned a token that expires too soon for ${providerId}`);
-	}
-	try {
-		return {
-			auth: await oauth.toAuth(credential),
-			source: "OAuth"
-		};
-	} catch (error) {
-		throw new ModelsError("oauth", `OAuth auth derivation failed for ${providerId}`, { cause: error });
-	}
-}
-async function resolveApiKey(authContext, apiKey, providerId, credential, signal) {
-	try {
-		return await apiKey.resolve({
-			ctx: authContext,
-			credential,
-			signal
-		});
-	} catch (error) {
-		throw new ModelsError("auth", `API key auth failed for provider ${providerId}`, { cause: error });
-	}
-}
-async function readCredential(credentials, providerId, signal) {
-	try {
-		return await credentials.read(providerId, { signal });
-	} catch (error) {
-		throw new ModelsError("auth", `Credential store read failed for ${providerId}`, { cause: error });
-	}
-}
-//#endregion
-//#region src/compat/vendor/pi-oauth-adapt.ts
-function adaptOAuth(config) {
-	return {
-		name: config.name,
-		isSubscription: config.isSubscription,
-		login: async (callbacks) => {
-			return {
-				...await config.login({
-					onAuth: (info) => callbacks.notify({
-						type: "auth_url",
-						...info
-					}),
-					onDeviceCode: (info) => callbacks.notify({
-						type: "device_code",
-						...info
-					}),
-					onPrompt: (prompt) => callbacks.prompt({
-						type: "text",
-						...prompt
-					}),
-					onProgress: (message) => callbacks.notify({
-						type: "progress",
-						message
-					}),
-					onManualCodeInput: () => callbacks.prompt({
-						type: "manual_code",
-						message: "Paste the authorization code"
-					}),
-					onSelect: (prompt) => callbacks.prompt({
-						type: "select",
-						...prompt
-					}),
-					signal: callbacks.signal
-				}),
-				type: "oauth"
-			};
-		},
-		refresh: async (credential, signal) => ({
-			...await config.refreshToken(credential, signal),
-			type: "oauth"
-		}),
-		toAuth: async (credential) => ({ apiKey: config.getApiKey(credential) })
-	};
-}
-//#endregion
-//#region src/oauth-bridge.ts
-var FileCredentialStore = class extends InMemoryCredentialStore {
-	#path;
-	constructor(path) {
-		super();
-		this.#path = path;
-		try {
-			const data = JSON.parse(readFileSync(path, "utf8"));
-			for (const [providerId, credential] of Object.entries(data)) this.credentials.set(providerId, credential);
-		} catch {}
-	}
-	get path() {
-		return this.#path;
-	}
-	async #persist() {
-		const credentials = this.credentials;
-		const data = Object.fromEntries(credentials);
-		await mkdir(dirname(this.#path), { recursive: true });
-		const temp = `${this.#path}.tmp-${process.pid}-${Math.floor(Math.random() * 1e9).toString(36)}`;
-		await writeFile(temp, `${JSON.stringify(data, null, 2)}\n`, { mode: 384 });
-		await rename(temp, this.#path);
-	}
-	modify(providerId, fn, options) {
-		return super.modify(providerId, async (current) => {
-			const next = await fn(current);
-			if (next !== void 0) {
-				this.credentials.set(providerId, next);
-				await this.#persist();
-			}
-			return next;
-		}, options);
-	}
-	delete(providerId, options) {
-		return super.delete(providerId, options).then(() => this.#persist());
-	}
-};
-function oauthInteraction(ui, signal) {
-	return {
-		signal: signal ?? new AbortController().signal,
-		async prompt(prompt) {
-			if (prompt.type === "select") {
-				const options = prompt.options ?? [];
-				const picked = await ui.select(prompt.message, options.map((option) => option.label));
-				return options.find((option) => option.label === picked)?.id ?? picked;
-			}
-			return ui.input(prompt.message, prompt.placeholder);
-		},
-		notify(event) {
-			if (event.type === "auth_url") ui.notify(`Open this URL to authorize: ${event.url}${event.instructions !== void 0 ? `\n${event.instructions}` : ""}`);
-			else if (event.type === "device_code") ui.notify(`Visit ${event.verificationUri} and enter code ${event.userCode}`);
-			else if (event.message !== void 0) ui.notify(event.message);
-		}
-	};
-}
-function oauthConfigOf(providerConfig) {
-	const oauth = providerConfig?.oauth;
-	return typeof oauth === "object" && oauth !== null && typeof oauth.login === "function" ? oauth : void 0;
-}
-function oauthAdapterOf(oauthConfig) {
-	if (typeof oauthConfig.toAuth === "function") return oauthConfig;
-	return adaptOAuth(oauthConfig);
-}
-function providerSupportsOAuth(providerConfig) {
-	return oauthConfigOf(providerConfig) !== void 0;
-}
-async function loginPiProvider(options) {
-	const oauthConfig = oauthConfigOf(options.providerConfig);
-	if (oauthConfig === void 0) throw new Error(`${options.providerName ?? options.providerId} does not support oauth login`);
-	const credential = await oauthAdapterOf(oauthConfig).login(oauthInteraction(options.ui, options.signal));
-	await options.store.modify(options.providerId, async () => credential);
-	return credential;
-}
-async function resolveOAuthApiKey(options) {
-	const oauthConfig = oauthConfigOf(options.providerConfig);
-	if (oauthConfig === void 0) return void 0;
-	return (await resolveProviderAuth({
-		id: options.providerId,
-		name: options.providerName ?? options.providerId,
-		auth: { oauth: oauthAdapterOf(oauthConfig) }
-	}, options.store, { env: async () => void 0 }, options.signal !== void 0 ? { signal: options.signal } : void 0))?.auth?.apiKey;
-}
-async function storedOAuthCredential(store, providerId) {
-	const stored = await store.read(providerId, void 0);
-	return stored?.type === "oauth" ? stored : void 0;
-}
-//#endregion
 //#region src/runtime.ts
 function logger(ctx) {
 	const candidate = ctx.logger;
@@ -2123,6 +1773,12 @@ async function applyPiPackage(ctx, options) {
 	};
 	subscribeLifecycle(ctx, state);
 	subscribeInterceptors(ctx, state);
+	for (const provider of builtinProviders()) state.providers.set(provider.id, {
+		name: provider.name,
+		baseUrl: provider.baseUrl,
+		oauth: provider.auth.oauth
+	});
+	ensureLoginCommand(ctx, state);
 	if (options.manifest.skillDirs.length > 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 {
@@ -2161,4 +1817,4 @@ const runtimeInternals = {
 //#endregion
 export { normalizeToolSchema as n, runtimeInternals as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-oLd2EInK.mjs.map
+//# sourceMappingURL=runtime-6DefpI6h.mjs.map