bazilion 0.12.1 → 0.12.2

package/dist/daemon.js

@@ -22265,6 +22265,20 @@ var SERVICES = [
     hint: "MiniMax M2/M3 family via the China endpoint",
     fields: [{ envVar: "MINIMAX_CN_API_KEY", kind: "secret", label: "API key" }]
   },
+  {
+    id: "qwen-token-plan",
+    displayName: "Qwen Token Plan",
+    category: "provider",
+    hint: "Coding-model subscription endpoint in Singapore",
+    fields: [{ envVar: "QWEN_TOKEN_PLAN_API_KEY", kind: "secret", label: "API key" }]
+  },
+  {
+    id: "qwen-token-plan-cn",
+    displayName: "Qwen Token Plan (CN)",
+    category: "provider",
+    hint: "Coding-model subscription endpoint in China",
+    fields: [{ envVar: "QWEN_TOKEN_PLAN_CN_API_KEY", kind: "secret", label: "API key" }]
+  },
   {
     id: "xiaomi",
     displayName: "Xiaomi MiMo",
@@ -24738,17 +24752,28 @@ function selectCausalParent(messages) {
 import { randomUUID as randomUUID21 } from "crypto";
 
 // ../daemon/src/runtime/auth/openai-codex.ts
-import { loginOpenAICodex, refreshOpenAICodexToken } from "@earendil-works/pi-ai/oauth";
+import { openaiCodexProvider } from "@earendil-works/pi-ai/providers/openai-codex";
 var OPENAI_CODEX_SECRET_KEY = "OPENAI_CODEX_OAUTH";
 var REFRESH_MARGIN_MS = 6e4;
 var refreshFlights = /* @__PURE__ */ new WeakMap();
+function openAICodexOAuth() {
+  const oauth = openaiCodexProvider().auth.oauth;
+  if (!oauth) throw new Error("Pi openai-codex provider does not expose OAuth");
+  return oauth;
+}
+async function loginOpenAICodex(interaction) {
+  return openAICodexOAuth().login(interaction);
+}
+async function refreshOpenAICodexToken(credential) {
+  return openAICodexOAuth().refresh(credential);
+}
 function readCredentials(db, authToken) {
   const raw2 = openSecrets(db, authToken).get(OPENAI_CODEX_SECRET_KEY);
   if (!raw2) return null;
   try {
     const parsed = JSON.parse(raw2);
     if (typeof parsed.refresh === "string" && typeof parsed.access === "string" && typeof parsed.expires === "number") {
-      return { refresh: parsed.refresh, access: parsed.access, expires: parsed.expires };
+      return { ...parsed, type: "oauth" };
     }
     return null;
   } catch {
@@ -24809,12 +24834,7 @@ async function refreshExpiredAccessToken(db, authToken) {
   const creds = readCredentials(db, authToken);
   if (!creds) throw credentialsMissingError();
   if (creds.expires > Date.now() + REFRESH_MARGIN_MS) return creds.access;
-  const refreshed = await refreshOpenAICodexToken(creds.refresh);
-  const next = {
-    refresh: refreshed.refresh,
-    access: refreshed.access,
-    expires: refreshed.expires
-  };
+  const next = await refreshOpenAICodexToken(creds);
   const current = readCredentials(db, authToken);
   if (!current) throw credentialsMissingError();
   if (!sameCredentials(current, creds)) {
@@ -24833,11 +24853,7 @@ function sameCredentials(left, right) {
   return left.refresh === right.refresh && left.access === right.access && left.expires === right.expires;
 }
 function saveLoginCredentials(db, authToken, creds) {
-  writeCredentials(db, authToken, {
-    refresh: creds.refresh,
-    access: creds.access,
-    expires: creds.expires
-  });
+  writeCredentials(db, authToken, { ...creds, type: "oauth" });
 }
 
 // ../daemon/src/runtime/memory/files.ts
@@ -25233,37 +25249,142 @@ function piMessagesToProviderView(messages) {
 import { existsSync as existsSync14, mkdirSync as mkdirSync6, readdirSync as readdirSync9, statSync as statSync6 } from "fs";
 import { basename as basename3, join as join19 } from "path";
 import {
-  AuthStorage,
   createAgentSession,
-  createExtensionRuntime,
-  ModelRegistry,
+  DefaultResourceLoader,
   SessionManager,
   SettingsManager
 } from "@earendil-works/pi-coding-agent";
 
-// ../daemon/src/runtime/providers/pi-adapter.ts
-import {
-  getModel,
-  streamSimple,
-  Type
-} from "@earendil-works/pi-ai/compat";
-function defaultBaseUrlFor(providerName) {
+// ../daemon/src/runtime/providers/pi-runtime.ts
+import { InMemoryCredentialStore } from "@earendil-works/pi-ai";
+import { ModelRuntime } from "@earendil-works/pi-coding-agent";
+var PROVIDER_ALIASES = {
+  bedrock: "amazon-bedrock",
+  "azure-openai": "azure-openai-responses"
+};
+var LOCAL_PROVIDERS = {
+  lmstudio: {
+    baseUrl: "http://127.0.0.1:1234/v1",
+    apiKey: "lm-studio",
+    authHeader: false
+  },
+  ollama: { baseUrl: "http://127.0.0.1:11434/v1", apiKey: "ollama", authHeader: false },
+  llamacpp: { baseUrl: "http://127.0.0.1:8080/v1", apiKey: "no-key", authHeader: true }
+};
+var API_KEY_ENV = {
+  anthropic: ["ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],
+  openai: ["OPENAI_API_KEY"],
+  google: ["GEMINI_API_KEY"],
+  "azure-openai": ["AZURE_OPENAI_API_KEY"],
+  mistral: ["MISTRAL_API_KEY"],
+  groq: ["GROQ_API_KEY"],
+  cerebras: ["CEREBRAS_API_KEY"],
+  xai: ["XAI_API_KEY"],
+  zai: ["ZAI_API_KEY"],
+  huggingface: ["HF_TOKEN"],
+  openrouter: ["OPENROUTER_API_KEY"],
+  "vercel-ai-gateway": ["AI_GATEWAY_API_KEY"],
+  deepseek: ["DEEPSEEK_API_KEY"],
+  fireworks: ["FIREWORKS_API_KEY"],
+  together: ["TOGETHER_API_KEY"],
+  moonshotai: ["MOONSHOT_API_KEY"],
+  "moonshotai-cn": ["MOONSHOT_CN_API_KEY"],
+  "kimi-coding": ["KIMI_API_KEY"],
+  minimax: ["MINIMAX_API_KEY"],
+  "minimax-cn": ["MINIMAX_CN_API_KEY"],
+  "qwen-token-plan": ["QWEN_TOKEN_PLAN_API_KEY"],
+  "qwen-token-plan-cn": ["QWEN_TOKEN_PLAN_CN_API_KEY"],
+  xiaomi: ["XIAOMI_API_KEY"],
+  "xiaomi-token-plan-ams": ["XIAOMI_TOKEN_PLAN_AMS_API_KEY"],
+  "xiaomi-token-plan-cn": ["XIAOMI_TOKEN_PLAN_CN_API_KEY"],
+  "xiaomi-token-plan-sgp": ["XIAOMI_TOKEN_PLAN_SGP_API_KEY"],
+  "ant-ling": ["ANT_LING_API_KEY"],
+  nvidia: ["NVIDIA_API_KEY"],
+  opencode: ["OPENCODE_API_KEY"],
+  "opencode-go": ["OPENCODE_GO_API_KEY"],
+  "zai-coding-cn": ["ZAI_CODING_CN_API_KEY"],
+  "github-copilot": ["COPILOT_GITHUB_TOKEN"],
+  "cloudflare-ai-gateway": ["CLOUDFLARE_API_KEY"],
+  "cloudflare-workers-ai": ["CLOUDFLARE_API_KEY"],
+  lmstudio: ["LMSTUDIO_API_KEY"],
+  ollama: ["OLLAMA_API_KEY"],
+  llamacpp: ["LLAMACPP_API_KEY"]
+};
+var PROVIDER_ENV = {
+  bedrock: [
+    "AWS_PROFILE",
+    "AWS_BEARER_TOKEN_BEDROCK",
+    "AWS_ACCESS_KEY_ID",
+    "AWS_SECRET_ACCESS_KEY",
+    "AWS_SESSION_TOKEN",
+    "AWS_REGION",
+    "AWS_DEFAULT_REGION"
+  ],
+  "google-vertex": [
+    "GOOGLE_CLOUD_PROJECT",
+    "GOOGLE_CLOUD_LOCATION",
+    "GOOGLE_APPLICATION_CREDENTIALS"
+  ],
+  "cloudflare-ai-gateway": ["CLOUDFLARE_API_KEY", "CLOUDFLARE_ACCOUNT_ID", "CLOUDFLARE_GATEWAY_ID"],
+  "cloudflare-workers-ai": ["CLOUDFLARE_API_KEY", "CLOUDFLARE_ACCOUNT_ID"]
+};
+function piProviderName(providerName) {
+  return PROVIDER_ALIASES[providerName] ?? providerName;
+}
+function providerApiKey(providerName, env) {
+  for (const name of API_KEY_ENV[providerName] ?? []) {
+    const value = env[name];
+    if (value) return value;
+  }
+  return LOCAL_PROVIDERS[providerName]?.apiKey;
+}
+function providerBaseUrl(providerName, env) {
   switch (providerName) {
     case "lmstudio":
-      return process.env.LMSTUDIO_URL ?? "http://127.0.0.1:1234/v1";
+      return env.LMSTUDIO_URL ?? LOCAL_PROVIDERS.lmstudio?.baseUrl;
     case "ollama":
-      return process.env.OLLAMA_URL ?? "http://127.0.0.1:11434/v1";
+      return env.OLLAMA_URL ?? LOCAL_PROVIDERS.ollama?.baseUrl;
+    case "llamacpp":
+      return env.LLAMACPP_URL ?? LOCAL_PROVIDERS.llamacpp?.baseUrl;
+    case "vercel-ai-gateway":
+      return env.AI_GATEWAY_BASE_URL;
     default:
-      return "";
+      return void 0;
   }
 }
-function buildModelLiteral(cfg, modelId) {
+function providerCredentialEnv(providerName, env) {
+  const result = {};
+  for (const name of PROVIDER_ENV[providerName] ?? []) {
+    const value = env[name];
+    if (value !== void 0) result[name] = value;
+  }
+  return Object.keys(result).length > 0 ? result : void 0;
+}
+function fallbackApi(providerName) {
+  switch (providerName) {
+    case "anthropic":
+      return "anthropic-messages";
+    case "google":
+      return "google-generative-ai";
+    case "google-vertex":
+      return "google-vertex";
+    case "azure-openai":
+      return "azure-openai-responses";
+    case "bedrock":
+      return "bedrock-converse-stream";
+    case "openai-codex":
+      return "openai-codex-responses";
+    default:
+      return "openai-completions";
+  }
+}
+function fallbackPiModel(providerName, modelId, baseUrl) {
   return {
     id: modelId,
     name: modelId,
-    api: cfg.fallbackApi,
-    provider: cfg.providerName,
-    baseUrl: cfg.baseUrl ?? defaultBaseUrlFor(cfg.providerName),
+    api: fallbackApi(providerName),
+    provider: piProviderName(providerName),
+    baseUrl: baseUrl ?? "",
     reasoning: false,
     input: ["text"],
     cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
@@ -25271,21 +25392,47 @@ function buildModelLiteral(cfg, modelId) {
     maxTokens: 4096
   };
 }
-function resolveModel(cfg, modelId) {
-  const lookupName = cfg.piProviderName ?? cfg.providerName;
-  try {
-    const known = getModel(
-      lookupName,
-      modelId
-    );
-    if (known && typeof known === "object" && "api" in known) {
-      if (cfg.baseUrl) return { ...known, baseUrl: cfg.baseUrl };
-      return known;
-    }
-  } catch {
+async function createBazilionPiRuntime(options) {
+  const providerName = options.providerName;
+  const canonicalName = piProviderName(providerName);
+  const credentials = new InMemoryCredentialStore();
+  const apiKey = options.apiKey ?? providerApiKey(providerName, options.env);
+  const credentialEnv = providerCredentialEnv(providerName, options.env);
+  if (apiKey || credentialEnv) {
+    await credentials.modify(canonicalName, async () => ({
+      type: "api_key",
+      ...apiKey ? { key: apiKey } : {},
+      ...credentialEnv ? { env: credentialEnv } : {}
+    }));
   }
-  return buildModelLiteral(cfg, modelId);
+  const runtime = await ModelRuntime.create({ credentials, modelsPath: null });
+  const local = LOCAL_PROVIDERS[providerName];
+  const baseUrl = options.baseUrl ?? providerBaseUrl(providerName, options.env);
+  if (local) {
+    const modelId = options.modelId ?? "model-name";
+    const model = fallbackPiModel(providerName, modelId, baseUrl ?? local.baseUrl);
+    runtime.registerProvider(canonicalName, {
+      baseUrl: baseUrl ?? local.baseUrl,
+      api: "openai-completions",
+      authHeader: local.authHeader,
+      apiKey: apiKey ?? local.apiKey,
+      models: [model]
+    });
+  } else if (baseUrl) {
+    runtime.registerProvider(canonicalName, { baseUrl });
+  }
+  return runtime;
+}
+function resolvePiModel(runtime, providerName, modelId, baseUrl) {
+  const known = runtime.getModel(piProviderName(providerName), modelId);
+  if (known) return baseUrl ? { ...known, baseUrl } : known;
+  return fallbackPiModel(providerName, modelId, baseUrl);
 }
+
+// ../daemon/src/runtime/providers/pi-adapter.ts
+import {
+  Type
+} from "@earendil-works/pi-ai";
 function convertMessages(messages) {
   const out = [];
   const now = Date.now();
@@ -25406,9 +25553,16 @@ function piProvider(cfg) {
   return {
     name: cfg.providerName,
     async chat(req) {
-      const model = resolveModel(cfg, req.model);
       const apiKey = await resolveApiKey(cfg);
-      const stream = streamSimple(
+      const runtime = cfg.runtimeFactory ? await cfg.runtimeFactory() : await createBazilionPiRuntime({
+        providerName: cfg.providerName,
+        env: cfg.env ?? {},
+        ...apiKey ? { apiKey } : {},
+        ...cfg.baseUrl ? { baseUrl: cfg.baseUrl } : {},
+        modelId: req.model
+      });
+      const model = resolvePiModel(runtime, cfg.providerName, req.model, cfg.baseUrl);
+      const stream = runtime.streamSimple(
         model,
         {
           systemPrompt: req.system ?? "",
@@ -25576,6 +25730,7 @@ function withRetry(provider, opts = {}) {
 // ../daemon/src/runtime/providers/registry.ts
 function loadProviderConfigFromEnv(env = process.env, oauth) {
   const config2 = {
+    env,
     lmstudio: {
       ...env.LMSTUDIO_URL !== void 0 ? { baseURL: env.LMSTUDIO_URL } : {},
       ...env.LMSTUDIO_API_KEY !== void 0 ? { apiKey: env.LMSTUDIO_API_KEY } : {}
@@ -25617,6 +25772,12 @@ function loadProviderConfigFromEnv(env = process.env, oauth) {
   if (env.KIMI_API_KEY) config2.kimiCoding = { apiKey: env.KIMI_API_KEY };
   if (env.MINIMAX_API_KEY) config2.minimax = { apiKey: env.MINIMAX_API_KEY };
   if (env.MINIMAX_CN_API_KEY) config2.minimaxCn = { apiKey: env.MINIMAX_CN_API_KEY };
+  if (env.QWEN_TOKEN_PLAN_API_KEY) {
+    config2.qwenTokenPlan = { apiKey: env.QWEN_TOKEN_PLAN_API_KEY };
+  }
+  if (env.QWEN_TOKEN_PLAN_CN_API_KEY) {
+    config2.qwenTokenPlanCn = { apiKey: env.QWEN_TOKEN_PLAN_CN_API_KEY };
+  }
   if (env.XIAOMI_API_KEY) config2.xiaomi = { apiKey: env.XIAOMI_API_KEY };
   if (env.XIAOMI_TOKEN_PLAN_AMS_API_KEY) {
     config2.xiaomiTokenPlanAms = { apiKey: env.XIAOMI_TOKEN_PLAN_AMS_API_KEY };
@@ -25656,7 +25817,6 @@ var PROVIDERS = {
     configured: (c) => !!c.anthropic,
     build: (c) => piProvider({
       providerName: "anthropic",
-      fallbackApi: "anthropic-messages",
       apiKey: c.anthropic?.apiKey,
       baseUrl: c.anthropic?.baseURL
     }),
@@ -25666,7 +25826,6 @@ var PROVIDERS = {
     configured: (c) => !!c.openai,
     build: (c) => piProvider({
       providerName: "openai",
-      fallbackApi: "openai-completions",
       apiKey: c.openai?.apiKey,
       baseUrl: c.openai?.baseURL
     }),
@@ -25684,7 +25843,6 @@ var PROVIDERS = {
       if (!openaiCodex) throw new Error("openai-codex not configured");
       return piProvider({
         providerName: "openai-codex",
-        fallbackApi: "openai-codex-responses",
         apiKey: () => loadAccessToken(openaiCodex.db, openaiCodex.authToken)
       });
     },
@@ -25694,7 +25852,6 @@ var PROVIDERS = {
     configured: (c) => !!c.google,
     build: (c) => piProvider({
       providerName: "google",
-      fallbackApi: "google-generative-ai",
       apiKey: c.google?.apiKey,
       baseUrl: c.google?.baseURL
     }),
@@ -25702,14 +25859,13 @@ var PROVIDERS = {
   },
   "google-vertex": {
     configured: (c) => !!c.googleVertex,
-    build: () => piProvider({ providerName: "google-vertex", fallbackApi: "google-vertex" }),
+    build: (c) => piProvider({ providerName: "google-vertex", env: c.env }),
     hint: "GOOGLE_CLOUD_PROJECT + GOOGLE_CLOUD_LOCATION + ADC (gcloud auth)"
   },
   "azure-openai": {
     configured: (c) => !!c.azureOpenai,
     build: (c) => piProvider({
       providerName: "azure-openai",
-      fallbackApi: "azure-openai-responses",
       apiKey: c.azureOpenai?.apiKey,
       baseUrl: c.azureOpenai?.baseURL
     }),
@@ -25717,10 +25873,9 @@ var PROVIDERS = {
   },
   bedrock: {
     configured: (c) => !!c.bedrock,
-    build: () => piProvider({
+    build: (c) => piProvider({
       providerName: "bedrock",
-      piProviderName: "amazon-bedrock",
-      fallbackApi: "bedrock-converse-stream"
+      env: c.env
     }),
     hint: "AWS_PROFILE or AWS_ACCESS_KEY_ID+AWS_SECRET_ACCESS_KEY"
   },
@@ -25728,7 +25883,6 @@ var PROVIDERS = {
     configured: (c) => !!c.mistral,
     build: (c) => piProvider({
       providerName: "mistral",
-      fallbackApi: "openai-completions",
       apiKey: c.mistral?.apiKey,
       baseUrl: c.mistral?.baseURL
     }),
@@ -25738,7 +25892,6 @@ var PROVIDERS = {
     configured: (c) => !!c.groq,
     build: (c) => piProvider({
       providerName: "groq",
-      fallbackApi: "openai-completions",
       apiKey: c.groq?.apiKey,
       baseUrl: c.groq?.baseURL
     }),
@@ -25748,7 +25901,6 @@ var PROVIDERS = {
     configured: (c) => !!c.cerebras,
     build: (c) => piProvider({
       providerName: "cerebras",
-      fallbackApi: "openai-completions",
       apiKey: c.cerebras?.apiKey,
       baseUrl: c.cerebras?.baseURL
     }),
@@ -25758,7 +25910,6 @@ var PROVIDERS = {
     configured: (c) => !!c.xai,
     build: (c) => piProvider({
       providerName: "xai",
-      fallbackApi: "openai-completions",
       apiKey: c.xai?.apiKey,
       baseUrl: c.xai?.baseURL
     }),
@@ -25768,7 +25919,6 @@ var PROVIDERS = {
     configured: (c) => !!c.zai,
     build: (c) => piProvider({
       providerName: "zai",
-      fallbackApi: "openai-completions",
       apiKey: c.zai?.apiKey,
       baseUrl: c.zai?.baseURL
     }),
@@ -25778,7 +25928,6 @@ var PROVIDERS = {
     configured: (c) => !!c.huggingface,
     build: (c) => piProvider({
       providerName: "huggingface",
-      fallbackApi: "openai-completions",
       apiKey: c.huggingface?.apiKey,
       baseUrl: c.huggingface?.baseURL
     }),
@@ -25788,7 +25937,6 @@ var PROVIDERS = {
     configured: (c) => !!c.openrouter,
     build: (c) => piProvider({
       providerName: "openrouter",
-      fallbackApi: "openai-completions",
       apiKey: c.openrouter?.apiKey,
       baseUrl: c.openrouter?.baseURL
     }),
@@ -25798,7 +25946,6 @@ var PROVIDERS = {
     configured: (c) => !!c.vercelAiGateway,
     build: (c) => piProvider({
       providerName: "vercel-ai-gateway",
-      fallbackApi: "openai-completions",
       apiKey: c.vercelAiGateway?.apiKey,
       baseUrl: c.vercelAiGateway?.baseURL
     }),
@@ -25808,7 +25955,6 @@ var PROVIDERS = {
     configured: (c) => !!c.deepseek,
     build: (c) => piProvider({
       providerName: "deepseek",
-      fallbackApi: "openai-completions",
       apiKey: c.deepseek?.apiKey,
       baseUrl: c.deepseek?.baseURL
     }),
@@ -25818,7 +25964,6 @@ var PROVIDERS = {
     configured: (c) => !!c.fireworks,
     build: (c) => piProvider({
       providerName: "fireworks",
-      fallbackApi: "anthropic-messages",
       apiKey: c.fireworks?.apiKey,
       baseUrl: c.fireworks?.baseURL
     }),
@@ -25828,7 +25973,6 @@ var PROVIDERS = {
     configured: (c) => !!c.together,
     build: (c) => piProvider({
       providerName: "together",
-      fallbackApi: "openai-completions",
       apiKey: c.together?.apiKey,
       baseUrl: c.together?.baseURL
     }),
@@ -25838,7 +25982,6 @@ var PROVIDERS = {
     configured: (c) => !!c.moonshotai,
     build: (c) => piProvider({
       providerName: "moonshotai",
-      fallbackApi: "openai-completions",
       apiKey: c.moonshotai?.apiKey,
       baseUrl: c.moonshotai?.baseURL
     }),
@@ -25848,7 +25991,6 @@ var PROVIDERS = {
     configured: (c) => !!c.moonshotaiCn,
     build: (c) => piProvider({
       providerName: "moonshotai-cn",
-      fallbackApi: "openai-completions",
       apiKey: c.moonshotaiCn?.apiKey,
       baseUrl: c.moonshotaiCn?.baseURL
     }),
@@ -25858,7 +26000,6 @@ var PROVIDERS = {
     configured: (c) => !!c.kimiCoding,
     build: (c) => piProvider({
       providerName: "kimi-coding",
-      fallbackApi: "anthropic-messages",
       apiKey: c.kimiCoding?.apiKey,
       baseUrl: c.kimiCoding?.baseURL
     }),
@@ -25868,7 +26009,6 @@ var PROVIDERS = {
     configured: (c) => !!c.minimax,
     build: (c) => piProvider({
       providerName: "minimax",
-      fallbackApi: "anthropic-messages",
       apiKey: c.minimax?.apiKey,
       baseUrl: c.minimax?.baseURL
     }),
@@ -25878,17 +26018,33 @@ var PROVIDERS = {
     configured: (c) => !!c.minimaxCn,
     build: (c) => piProvider({
       providerName: "minimax-cn",
-      fallbackApi: "anthropic-messages",
       apiKey: c.minimaxCn?.apiKey,
       baseUrl: c.minimaxCn?.baseURL
     }),
     hint: "MINIMAX_CN_API_KEY"
   },
+  "qwen-token-plan": {
+    configured: (c) => !!c.qwenTokenPlan,
+    build: (c) => piProvider({
+      providerName: "qwen-token-plan",
+      apiKey: c.qwenTokenPlan?.apiKey,
+      baseUrl: c.qwenTokenPlan?.baseURL
+    }),
+    hint: "QWEN_TOKEN_PLAN_API_KEY"
+  },
+  "qwen-token-plan-cn": {
+    configured: (c) => !!c.qwenTokenPlanCn,
+    build: (c) => piProvider({
+      providerName: "qwen-token-plan-cn",
+      apiKey: c.qwenTokenPlanCn?.apiKey,
+      baseUrl: c.qwenTokenPlanCn?.baseURL
+    }),
+    hint: "QWEN_TOKEN_PLAN_CN_API_KEY"
+  },
   xiaomi: {
     configured: (c) => !!c.xiaomi,
     build: (c) => piProvider({
       providerName: "xiaomi",
-      fallbackApi: "openai-completions",
       apiKey: c.xiaomi?.apiKey,
       baseUrl: c.xiaomi?.baseURL
     }),
@@ -25898,7 +26054,6 @@ var PROVIDERS = {
     configured: (c) => !!c.xiaomiTokenPlanAms,
     build: (c) => piProvider({
       providerName: "xiaomi-token-plan-ams",
-      fallbackApi: "openai-completions",
       apiKey: c.xiaomiTokenPlanAms?.apiKey,
       baseUrl: c.xiaomiTokenPlanAms?.baseURL
     }),
@@ -25908,7 +26063,6 @@ var PROVIDERS = {
     configured: (c) => !!c.xiaomiTokenPlanCn,
     build: (c) => piProvider({
       providerName: "xiaomi-token-plan-cn",
-      fallbackApi: "openai-completions",
       apiKey: c.xiaomiTokenPlanCn?.apiKey,
       baseUrl: c.xiaomiTokenPlanCn?.baseURL
     }),
@@ -25918,7 +26072,6 @@ var PROVIDERS = {
     configured: (c) => !!c.xiaomiTokenPlanSgp,
     build: (c) => piProvider({
       providerName: "xiaomi-token-plan-sgp",
-      fallbackApi: "openai-completions",
       apiKey: c.xiaomiTokenPlanSgp?.apiKey,
       baseUrl: c.xiaomiTokenPlanSgp?.baseURL
     }),
@@ -25928,7 +26081,6 @@ var PROVIDERS = {
     configured: (c) => !!c.antLing,
     build: (c) => piProvider({
       providerName: "ant-ling",
-      fallbackApi: "openai-completions",
       apiKey: c.antLing?.apiKey,
       baseUrl: c.antLing?.baseURL
     }),
@@ -25938,7 +26090,6 @@ var PROVIDERS = {
     configured: (c) => !!c.nvidia,
     build: (c) => piProvider({
       providerName: "nvidia",
-      fallbackApi: "openai-completions",
       apiKey: c.nvidia?.apiKey,
       baseUrl: c.nvidia?.baseURL
     }),
@@ -25948,7 +26099,6 @@ var PROVIDERS = {
     configured: (c) => !!c.opencode,
     build: (c) => piProvider({
       providerName: "opencode",
-      fallbackApi: "openai-completions",
       apiKey: c.opencode?.apiKey,
       baseUrl: c.opencode?.baseURL
     }),
@@ -25958,7 +26108,6 @@ var PROVIDERS = {
     configured: (c) => !!c.opencodeGo,
     build: (c) => piProvider({
       providerName: "opencode-go",
-      fallbackApi: "openai-completions",
       apiKey: c.opencodeGo?.apiKey,
       baseUrl: c.opencodeGo?.baseURL
     }),
@@ -25968,7 +26117,6 @@ var PROVIDERS = {
     configured: (c) => !!c.zaiCodingCn,
     build: (c) => piProvider({
       providerName: "zai-coding-cn",
-      fallbackApi: "openai-completions",
       apiKey: c.zaiCodingCn?.apiKey,
       baseUrl: c.zaiCodingCn?.baseURL
     }),
@@ -25978,7 +26126,6 @@ var PROVIDERS = {
     configured: (c) => !!c.githubCopilot,
     build: (c) => piProvider({
       providerName: "github-copilot",
-      fallbackApi: "anthropic-messages",
       apiKey: c.githubCopilot?.apiKey
     }),
     hint: "COPILOT_GITHUB_TOKEN (generic GH_TOKEN/GITHUB_TOKEN are ignored)"
@@ -25987,7 +26134,7 @@ var PROVIDERS = {
     configured: (c) => !!c.cloudflareAiGateway,
     build: (c) => piProvider({
       providerName: "cloudflare-ai-gateway",
-      fallbackApi: "anthropic-messages",
+      env: c.env,
       apiKey: c.cloudflareAiGateway?.apiKey
     }),
     hint: "CLOUDFLARE_API_KEY + CLOUDFLARE_ACCOUNT_ID + CLOUDFLARE_GATEWAY_ID"
@@ -25996,7 +26143,7 @@ var PROVIDERS = {
     configured: (c) => !!c.cloudflareWorkersAi,
     build: (c) => piProvider({
       providerName: "cloudflare-workers-ai",
-      fallbackApi: "openai-completions",
+      env: c.env,
       apiKey: c.cloudflareWorkersAi?.apiKey
     }),
     hint: "CLOUDFLARE_API_KEY + CLOUDFLARE_ACCOUNT_ID"
@@ -26005,7 +26152,6 @@ var PROVIDERS = {
     configured: () => true,
     build: (c) => piProvider({
       providerName: "lmstudio",
-      fallbackApi: "openai-completions",
       apiKey: c.lmstudio?.apiKey ?? "lm-studio",
       baseUrl: c.lmstudio?.baseURL ?? "http://127.0.0.1:1234/v1"
     }),
@@ -26015,7 +26161,6 @@ var PROVIDERS = {
     configured: () => true,
     build: (c) => piProvider({
       providerName: "ollama",
-      fallbackApi: "openai-completions",
       apiKey: c.ollama?.apiKey ?? "ollama",
       baseUrl: c.ollama?.baseURL ?? "http://127.0.0.1:11434/v1"
     }),
@@ -26029,7 +26174,6 @@ var PROVIDERS = {
     configured: () => true,
     build: (c) => piProvider({
       providerName: "llamacpp",
-      fallbackApi: "openai-completions",
       apiKey: c.llamacpp?.apiKey ?? "no-key",
       baseUrl: c.llamacpp?.baseURL ?? "http://127.0.0.1:8080/v1"
     }),
@@ -28569,30 +28713,16 @@ async function createBazilionSession(opts) {
   if (enabledProviders.size > 0 && !enabledProviders.has(providerName)) {
     throw new Error(`${providerName} provider is disabled \u2014 enable it on the /config page`);
   }
-  const piProviderName = mapProviderName(providerName);
-  const model = resolveModel(
-    {
-      providerName,
-      piProviderName,
-      fallbackApi: pickFallbackApi(providerName),
-      baseUrl: resolveBaseUrl(providerName, env)
-    },
+  const apiKey = opts.apiKey ?? providerApiKey(providerName, env);
+  const baseUrl = providerBaseUrl(providerName, env);
+  const modelRuntime = await createBazilionPiRuntime({
+    providerName,
+    env,
+    ...apiKey ? { apiKey } : {},
+    ...baseUrl ? { baseUrl } : {},
     modelId
-  );
-  const apiKey = opts.apiKey ?? resolveApiKey2(providerName, env);
-  const authStorage = AuthStorage.inMemory();
-  if (apiKey) {
-    authStorage.setRuntimeApiKey(piProviderName, apiKey);
-  }
-  const modelRegistry = ModelRegistry.inMemory(authStorage);
-  if (providerName === "lmstudio" || providerName === "ollama") {
-    modelRegistry.registerProvider(piProviderName, {
-      baseUrl: model.baseUrl,
-      api: "openai-completions",
-      authHeader: false,
-      apiKey: apiKey ?? "dummy"
-    });
-  }
+  });
+  const model = resolvePiModel(modelRuntime, providerName, modelId, baseUrl);
   const cwd = agent.team.path;
   if (!existsSync14(cwd)) mkdirSync6(cwd, { recursive: true });
   const promptSkills = restricted ? [] : loadPromptSkills(paths.skillsDir, agent.skills);
@@ -28622,7 +28752,17 @@ async function createBazilionSession(opts) {
     skills: promptSkills,
     sandboxMode: shellTools?.config.sandboxMode ?? "off"
   });
-  const resourceLoader = createBazilionResourceLoader(bazilionPrompt);
+  const resourceLoader = new DefaultResourceLoader({
+    cwd,
+    agentDir: join19(paths.home, "pi"),
+    settingsManager,
+    noExtensions: true,
+    noSkills: true,
+    noPromptTemplates: true,
+    noThemes: true,
+    noContextFiles: true,
+    appendSystemPrompt: bazilionPrompt ? [bazilionPrompt] : void 0
+  });
   await resourceLoader.reload();
   const bazilionTools = restricted ? restricted.tools : createBazilionCustomTools({
     agent,
@@ -28646,13 +28786,12 @@ async function createBazilionSession(opts) {
     customTools,
     sessionManager,
     settingsManager,
-    authStorage,
-    modelRegistry,
+    modelRuntime,
     resourceLoader
   });
   if (refreshApiKey) {
     session.agent.getApiKey = async (requestedProvider) => {
-      if (requestedProvider !== piProviderName) return void 0;
+      if (requestedProvider !== piProviderName(providerName)) return void 0;
       try {
         return await refreshApiKey(providerName);
       } catch {
@@ -28674,67 +28813,6 @@ function splitModelString(s) {
   }
   return { providerName: s.slice(0, idx), modelId: s.slice(idx + 1) };
 }
-function mapProviderName(name) {
-  if (name === "bedrock") return "amazon-bedrock";
-  return name;
-}
-function pickFallbackApi(providerName) {
-  switch (providerName) {
-    case "anthropic":
-      return "anthropic-messages";
-    case "google":
-      return "google-generative-ai";
-    case "google-vertex":
-      return "google-vertex";
-    case "azure-openai":
-      return "azure-openai-responses";
-    case "bedrock":
-      return "bedrock-converse-stream";
-    case "openai-codex":
-      return "openai-codex-responses";
-    default:
-      return "openai-completions";
-  }
-}
-function resolveBaseUrl(providerName, env) {
-  if (providerName === "lmstudio") return env.LMSTUDIO_URL ?? "http://127.0.0.1:1234/v1";
-  if (providerName === "ollama") return env.OLLAMA_URL ?? "http://127.0.0.1:11434/v1";
-  return void 0;
-}
-function resolveApiKey2(providerName, env) {
-  switch (providerName) {
-    case "anthropic":
-      return env.ANTHROPIC_OAUTH_TOKEN ?? env.ANTHROPIC_API_KEY;
-    case "openai":
-      return env.OPENAI_API_KEY;
-    case "google":
-      return env.GEMINI_API_KEY;
-    case "mistral":
-      return env.MISTRAL_API_KEY;
-    case "groq":
-      return env.GROQ_API_KEY;
-    case "cerebras":
-      return env.CEREBRAS_API_KEY;
-    case "xai":
-      return env.XAI_API_KEY;
-    case "zai":
-      return env.ZAI_API_KEY;
-    case "huggingface":
-      return env.HF_TOKEN;
-    case "openrouter":
-      return env.OPENROUTER_API_KEY;
-    case "vercel-ai-gateway":
-      return env.AI_GATEWAY_API_KEY;
-    case "azure-openai":
-      return env.AZURE_OPENAI_API_KEY;
-    case "lmstudio":
-      return env.LMSTUDIO_API_KEY ?? "lm-studio";
-    case "ollama":
-      return env.OLLAMA_API_KEY ?? "ollama";
-    default:
-      return void 0;
-  }
-}
 function toPiThinkingLevel(level) {
   switch (level) {
     case "off":
@@ -28748,22 +28826,6 @@ function toPiThinkingLevel(level) {
       return "medium";
   }
 }
-function createBazilionResourceLoader(appendSystemPrompt) {
-  const extensions = { extensions: [], errors: [], runtime: createExtensionRuntime() };
-  return {
-    getExtensions: () => extensions,
-    getSkills: () => ({ skills: [], diagnostics: [] }),
-    getPrompts: () => ({ prompts: [], diagnostics: [] }),
-    getThemes: () => ({ themes: [], diagnostics: [] }),
-    getAgentsFiles: () => ({ agentsFiles: [] }),
-    getSystemPrompt: () => void 0,
-    getAppendSystemPrompt: () => appendSystemPrompt ? [appendSystemPrompt] : [],
-    extendResources: () => {
-    },
-    async reload() {
-    }
-  };
-}
 function loadInitialMessages(agent, paths) {
   const sessionDir = join19(paths.agentDir(agent.agent.id), "sessions");
   if (!existsSync14(sessionDir)) return [];
@@ -28822,7 +28884,7 @@ function findMostRecent(sessionDir) {
 }
 
 // ../daemon/src/runtime/providers/catalog.ts
-import { getModels as piGetModels } from "@earendil-works/pi-ai/compat";
+import { getBuiltinModels } from "@earendil-works/pi-ai/providers/all";
 import { fetch as undiciFetch3 } from "undici";
 var REGISTRY_TO_PI = {
   bedrock: "amazon-bedrock",
@@ -28871,7 +28933,7 @@ function liveEndpointFor(providerName, env) {
 function piModels(providerName) {
   const piName = REGISTRY_TO_PI[providerName] ?? providerName;
   try {
-    const models = piGetModels(piName);
+    const models = getBuiltinModels(piName);
     if (!models) return [];
     return models.map((m2) => m2.id);
   } catch {
@@ -36921,14 +36983,14 @@ authRouter.post("/auth/openai/login", async (c) => {
   const { db, authToken } = getCtx();
   try {
     const creds = await loginOpenAICodex({
-      onAuth: ({ url: url2 }) => openBrowser(url2),
-      onPrompt: () => Promise.reject(
+      notify: (event2) => {
+        if (event2.type === "auth_url") openBrowser(event2.url);
+      },
+      prompt: (prompt) => prompt.type === "select" ? Promise.resolve(prompt.options[0]?.id ?? "") : Promise.reject(
         new Error(
           "interactive paste not supported in the web flow \u2014 cancel and try again, or use `bazilion auth openai login`"
         )
-      ),
-      onProgress: () => {
-      }
+      )
     });
     saveLoginCredentials(db, authToken, creds);
     return c.json(getStatus(db, authToken));
@@ -36942,7 +37004,7 @@ authRouter.post("/providers/test", async (c) => {
     return c.json({ error: "model is required" }, 400);
   }
   const message = typeof body.message === "string" && body.message ? body.message : "say hi briefly";
-  const { db, paths, authToken } = getCtx();
+  const { db, authToken } = getCtx();
   const env = mergeSecretsIntoEnv(db, authToken);
   const reg = createProviderRegistry(loadProviderConfigFromEnv(env, { db, authToken }), {
     enabledSet: providerState_exports.listEnabled(db)