@vtstech/pi-api 1.1.7 → 1.1.9

package/api.js

@@ -1,9 +1,7 @@
 // .build-npm/api/api.temp.ts
-import * as fs from "node:fs";
-import * as path from "node:path";
-import os from "node:os";
 import { section, ok, info, warn } from "@vtstech/pi-shared/format";
-import { readModelsJson, writeModelsJson, getOllamaBaseUrl, BUILTIN_PROVIDERS, EXTENSION_VERSION } from "@vtstech/pi-shared/ollama";
+import { readModelsJson, readModifyWriteModelsJson, getOllamaBaseUrl, BUILTIN_PROVIDERS, EXTENSION_VERSION, isLocalProvider } from "@vtstech/pi-shared/ollama";
+import { SETTINGS_PATH, readSettings, writeSettings } from "@vtstech/pi-shared/config-io";
 var API_MODES = {
   "anthropic-messages": "Anthropic Claude API and compatibles",
   "openai-completions": "OpenAI Chat Completions API and compatibles",
@@ -38,36 +36,33 @@ var COMPAT_FLAGS = {
     values: ["qwen", "deepseek", "default"]
   }
 };
-var SETTINGS_PATH = path.join(os.homedir(), ".pi", "agent", "settings.json");
-function readSettings() {
-  try {
-    if (fs.existsSync(SETTINGS_PATH)) {
-      return JSON.parse(fs.readFileSync(SETTINGS_PATH, "utf-8"));
-    }
-  } catch {
-  }
-  return {};
-}
-function writeSettings(data) {
-  const dir = path.dirname(SETTINGS_PATH);
-  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(SETTINGS_PATH, JSON.stringify(data, null, 2) + "\n", "utf-8");
-}
 function getLocalProvider(config) {
   for (const [name, provider] of Object.entries(config.providers)) {
-    const url = provider.baseUrl || "";
-    if (url.includes("localhost") || url.includes("127.0.0.1") || url.includes("0.0.0.0") || name === "ollama") {
+    if (isLocalProvider(provider.baseUrl || "", name)) {
       return { name, isLocal: true };
     }
   }
   const first = Object.keys(config.providers)[0];
   return { name: first || "ollama", isLocal: false };
 }
-function resolveProvider(config, explicit) {
-  const target = explicit || getLocalProvider(config).name;
-  const provider = config.providers[target];
+function findProvider(providerName) {
+  const config = readModelsJson();
+  const provider = config.providers[providerName];
+  return provider || null;
+}
+function resolveProvider(config, explicit, currentProvider) {
+  if (explicit) {
+    const provider2 = config.providers[explicit];
+    if (!provider2) return null;
+    return { name: explicit, config: provider2 };
+  }
+  if (currentProvider && config.providers[currentProvider]) {
+    return { name: currentProvider, config: config.providers[currentProvider] };
+  }
+  const local = getLocalProvider(config);
+  const provider = config.providers[local.name];
   if (!provider) return null;
-  return { name: target, config: provider };
+  return { name: local.name, config: provider };
 }
 function api_temp_default(pi) {
   const branding = [
@@ -78,50 +73,52 @@ function api_temp_default(pi) {
   ].join("\n");
   pi.registerCommand("api", {
     description: "View and switch API modes, base URLs, thinking, and compat flags",
-    handler: async (args, ctx) => {
+    handler: async (args, ctx2) => {
       const parts = args.trim().split(/\s+/);
       const sub = parts[0]?.toLowerCase() || "";
       const rest = parts.slice(1).join(" ");
       const config = readModelsJson();
       if (sub !== "provider" && sub !== "providers") {
-        const provider = resolveProvider(config);
+        const currentProvider = getCurrentSessionProvider(ctx2);
+        const provider = resolveProvider(config, void 0, currentProvider);
         if (!provider) {
-          ctx.ui.notify("No providers found in models.json", "error");
+          ctx2.ui.notify("No providers found in models.json", "error");
           return;
         }
         switch (sub) {
           case "":
           case "show":
-            return showConfig(provider);
+            return showConfig(provider, currentProvider);
           case "mode":
-            return setMode(ctx, provider.name, rest);
+            return setMode(ctx2, provider.name, rest);
           case "url":
-            return setUrl(ctx, provider.name, rest);
+            return setUrl(ctx2, provider.name, rest);
           case "think":
-            return setThink(ctx, provider.name, rest);
+            return setThink(ctx2, provider.name, rest);
           case "compat":
-            return handleCompat(ctx, provider.name, rest);
+            return handleCompat(ctx2, provider.name, rest);
           case "reload":
-            return reloadConfig(ctx);
+            return reloadConfig(ctx2);
           case "modes":
             return listModes();
           default:
-            ctx.ui.notify(`Unknown sub-command: "${sub}". Use: mode, url, think, compat, reload, modes, provider, providers`, "error");
+            ctx2.ui.notify(`Unknown sub-command: "${sub}". Use: mode, url, think, compat, reload, modes, provider, providers`, "error");
         }
       }
       if (sub === "provider" || sub === "providers") {
-        return handleProvider(ctx, config, rest);
+        return handleProvider(ctx2, config, rest);
       }
     }
   });
-  function showConfig(provider) {
+  function showConfig(provider, currentProvider) {
     const p = provider.config;
     const compat = p.compat || {};
     const modelCount = p.models?.length || 0;
     const firstModel = p.models?.[0]?.id || "none";
+    const isCurrent = currentProvider === provider.name;
     const lines = [branding];
     lines.push(section("CURRENT PROVIDER CONFIG"));
-    lines.push(info(`Provider: ${provider.name}`));
+    lines.push(info(`Provider: ${provider.name}${isCurrent ? " \u25C0 current" : ""}`));
     lines.push(info(`API mode: ${p.api || "(not set)"}`));
     lines.push(info(`Base URL: ${p.baseUrl || "(not set)"}`));
     lines.push(info(`API key: ${p.apiKey ? "\u2022\u2022\u2022\u2022" + String(p.apiKey).slice(-4) : "(not set)"}`));
@@ -136,15 +133,20 @@ function api_temp_default(pi) {
     lines.push(section("RESOLVED"));
     lines.push(info(`Ollama base: ${ollamaBase}`));
     lines.push(info(`(strip /v1 \u2192 ${ollamaBase})`));
+    if (currentProvider && currentProvider !== provider.name) {
+      lines.push(section("NOTE"));
+      lines.push(info(`Current session is using: ${currentProvider}`));
+      lines.push(info(`Use /api provider set ${provider.name} to switch to this provider`));
+    }
     pi.sendMessage({
       customType: "api-config",
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
   }
-  function setMode(ctx, providerName, mode) {
+  async function setMode(ctx2, providerName, mode) {
     if (!mode) {
-      ctx.ui.notify("Usage: /api mode <mode>. Use /api modes to list available modes.", "error");
+      ctx2.ui.notify("Usage: /api mode <mode>. Use /api modes to list available modes.", "error");
       return;
     }
     const modeLower = mode.toLowerCase();
@@ -153,18 +155,21 @@ function api_temp_default(pi) {
       matched = Object.keys(API_MODES).find((m) => m.includes(modeLower));
     }
     if (!matched) {
-      ctx.ui.notify(`Unknown API mode: "${mode}". Use /api modes to list available modes.`, "error");
+      ctx2.ui.notify(`Unknown API mode: "${mode}". Use /api modes to list available modes.`, "error");
       return;
     }
-    const config = readModelsJson();
-    const provider = config.providers[providerName];
-    if (!provider) {
-      ctx.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
+    let oldMode = "(not set)";
+    const written = await readModifyWriteModelsJson((config) => {
+      const provider = config.providers[providerName];
+      if (!provider) return null;
+      oldMode = provider.api || "(not set)";
+      provider.api = matched;
+      return config;
+    });
+    if (!written) {
+      ctx2.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
       return;
     }
-    const oldMode = provider.api || "(not set)";
-    provider.api = matched;
-    writeModelsJson(config);
     const lines = [branding];
     lines.push(section("API MODE CHANGED"));
     lines.push(ok(`Provider: ${providerName}`));
@@ -177,11 +182,11 @@ function api_temp_default(pi) {
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
-    ctx.ui.notify(`API mode set to ${matched}`, "success");
+    ctx2.ui.notify(`API mode set to ${matched}`, "success");
   }
-  function setUrl(ctx, providerName, url) {
+  async function setUrl(ctx2, providerName, url) {
     if (!url) {
-      ctx.ui.notify("Usage: /api url <base-url>", "error");
+      ctx2.ui.notify("Usage: /api url <base-url>", "error");
       return;
     }
     let normalizedUrl = url.trim();
@@ -191,22 +196,25 @@ function api_temp_default(pi) {
     try {
       new URL(normalizedUrl);
     } catch {
-      ctx.ui.notify(`Invalid URL: "${url}"`, "error");
+      ctx2.ui.notify(`Invalid URL: "${url}"`, "error");
       return;
     }
-    const config = readModelsJson();
-    const provider = config.providers[providerName];
-    if (!provider) {
-      ctx.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
+    let oldUrl = "(not set)";
+    const written = await readModifyWriteModelsJson((config) => {
+      const provider = config.providers[providerName];
+      if (!provider) return null;
+      const apiMode = provider.api || "";
+      if (apiMode.includes("openai") && !normalizedUrl.endsWith("/v1")) {
+        normalizedUrl = normalizedUrl.replace(/\/+$/, "") + "/v1";
+      }
+      oldUrl = provider.baseUrl || "(not set)";
+      provider.baseUrl = normalizedUrl;
+      return config;
+    });
+    if (!written) {
+      ctx2.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
       return;
     }
-    const apiMode = provider.api || "";
-    if (apiMode.includes("openai") && !normalizedUrl.endsWith("/v1")) {
-      normalizedUrl = normalizedUrl.replace(/\/+$/, "") + "/v1";
-    }
-    const oldUrl = provider.baseUrl || "(not set)";
-    provider.baseUrl = normalizedUrl;
-    writeModelsJson(config);
     const lines = [branding];
     lines.push(section("BASE URL CHANGED"));
     lines.push(ok(`Provider: ${providerName}`));
@@ -218,46 +226,49 @@ function api_temp_default(pi) {
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
-    ctx.ui.notify(`Base URL set to ${normalizedUrl}`, "success");
+    ctx2.ui.notify(`Base URL set to ${normalizedUrl}`, "success");
   }
-  function setThink(ctx, providerName, value) {
+  async function setThink(ctx2, providerName, value) {
     if (!value) {
-      ctx.ui.notify("Usage: /api think <on|off|auto>", "error");
-      return;
-    }
-    const config = readModelsJson();
-    const provider = config.providers[providerName];
-    if (!provider) {
-      ctx.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
-      return;
-    }
-    const models = provider.models || [];
-    if (models.length === 0) {
-      ctx.ui.notify(`No models found in provider "${providerName}"`, "error");
+      ctx2.ui.notify("Usage: /api think <on|off|auto>", "error");
       return;
     }
     const valLower = value.toLowerCase();
-    const setAll = (state) => {
-      for (const model of models) {
-        if (state === null) {
-          const name = (model.id || "").toLowerCase();
-          model.reasoning = name.includes("deepseek-r1") || name.includes("qwq") || name.includes("o1") || name.includes("o3") || name.includes("think") || name.includes("qwen3");
-        } else {
-          model.reasoning = state;
+    let models = [];
+    const written = await readModifyWriteModelsJson((config) => {
+      const provider = config.providers[providerName];
+      if (!provider) return null;
+      models = provider.models || [];
+      if (models.length === 0) return null;
+      const setAll = (state) => {
+        for (const model of models) {
+          if (state === null) {
+            const name = (model.id || "").toLowerCase();
+            model.reasoning = name.includes("deepseek-r1") || name.includes("qwq") || name.includes("o1") || name.includes("o3") || name.includes("think") || name.includes("qwen3") || name.includes("glm-4");
+          } else {
+            model.reasoning = state;
+          }
         }
+      };
+      if (valLower === "on" || valLower === "true" || valLower === "1") {
+        setAll(true);
+      } else if (valLower === "off" || valLower === "false" || valLower === "0") {
+        setAll(false);
+      } else if (valLower === "auto") {
+        setAll(null);
+      } else {
+        return null;
       }
-    };
-    if (valLower === "on" || valLower === "true" || valLower === "1") {
-      setAll(true);
-    } else if (valLower === "off" || valLower === "false" || valLower === "0") {
-      setAll(false);
-    } else if (valLower === "auto") {
-      setAll(null);
-    } else {
-      ctx.ui.notify("Invalid value. Use: on, off, or auto", "error");
+      return config;
+    });
+    if (!written) {
+      ctx2.ui.notify(`Provider "${providerName}" not found in models.json`, "error");
+      return;
+    }
+    if (models.length === 0) {
+      ctx2.ui.notify(`No models found in provider "${providerName}"`, "error");
       return;
     }
-    writeModelsJson(config);
     const lines = [branding];
     lines.push(section("THINKING MODE"));
     lines.push(info(`Provider: ${providerName}`));
@@ -272,20 +283,19 @@ function api_temp_default(pi) {
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
-    ctx.ui.notify(`Thinking set to ${valLower} for ${models.length} model(s)`, "success");
+    ctx2.ui.notify(`Thinking set to ${valLower} for ${models.length} model(s)`, "success");
   }
-  function handleCompat(ctx, providerName, args) {
+  async function handleCompat(ctx2, providerName, args) {
     const parts = args.split(/\s+/);
     const key = parts[0];
     const value = parts.slice(1).join(" ");
     if (!key) {
-      const config2 = readModelsJson();
-      const provider2 = config2.providers[providerName];
-      if (!provider2) {
-        ctx.ui.notify(`Provider "${providerName}" not found`, "error");
+      const provider = findProvider(providerName);
+      if (!provider) {
+        ctx2.ui.notify(`Provider "${providerName}" not found`, "error");
         return;
       }
-      const compat = provider2.compat || {};
+      const compat = provider.compat || {};
       const lines2 = [branding];
       lines2.push(section("COMPAT FLAGS"));
       if (Object.keys(compat).length === 0) {
@@ -309,23 +319,15 @@ function api_temp_default(pi) {
       return;
     }
     if (!value) {
-      const config2 = readModelsJson();
-      const provider2 = config2.providers[providerName];
-      if (!provider2) {
-        ctx.ui.notify(`Provider "${providerName}" not found`, "error");
+      const provider = findProvider(providerName);
+      if (!provider) {
+        ctx2.ui.notify(`Provider "${providerName}" not found`, "error");
         return;
       }
-      const current = provider2.compat?.[key];
-      ctx.ui.notify(`${key} = ${current !== void 0 ? JSON.stringify(current) : "(not set)"}`, "info");
+      const current = provider.compat?.[key];
+      ctx2.ui.notify(`${key} = ${current !== void 0 ? JSON.stringify(current) : "(not set)"}`, "info");
       return;
     }
-    const config = readModelsJson();
-    const provider = config.providers[providerName];
-    if (!provider) {
-      ctx.ui.notify(`Provider "${providerName}" not found`, "error");
-      return;
-    }
-    if (!provider.compat) provider.compat = {};
     let parsedValue = value;
     if (value === "true") parsedValue = true;
     else if (value === "false") parsedValue = false;
@@ -336,9 +338,19 @@ function api_temp_default(pi) {
       } catch {
       }
     }
-    const oldValue = provider.compat[key];
-    provider.compat[key] = parsedValue;
-    writeModelsJson(config);
+    let oldValue;
+    const written = await readModifyWriteModelsJson((config) => {
+      const provider = config.providers[providerName];
+      if (!provider) return null;
+      if (!provider.compat) provider.compat = {};
+      oldValue = provider.compat[key];
+      provider.compat[key] = parsedValue;
+      return config;
+    });
+    if (!written) {
+      ctx2.ui.notify(`Provider "${providerName}" not found`, "error");
+      return;
+    }
     const lines = [branding];
     lines.push(section("COMPAT FLAG SET"));
     lines.push(ok(`Provider: ${providerName}`));
@@ -351,9 +363,9 @@ function api_temp_default(pi) {
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
-    ctx.ui.notify(`Compat flag ${key} set to ${JSON.stringify(parsedValue)}`, "success");
+    ctx2.ui.notify(`Compat flag ${key} set to ${JSON.stringify(parsedValue)}`, "success");
   }
-  function reloadConfig(ctx) {
+  function reloadConfig(ctx2) {
     const lines = [branding];
     lines.push(section("RELOAD"));
     lines.push(ok("models.json has been modified"));
@@ -365,13 +377,14 @@ function api_temp_default(pi) {
       content: lines.join("\n"),
       display: { type: "content", content: lines.join("\n") }
     });
-    ctx.ui.notify("Run /reload to apply models.json changes", "info");
+    ctx2.ui.notify("Run /reload to apply models.json changes", "info");
   }
   function listModes() {
     const lines = [branding];
     lines.push(section("SUPPORTED API MODES"));
     const config = readModelsJson();
-    const provider = resolveProvider(config);
+    const currentProvider = getCurrentSessionProvider(ctx);
+    const provider = resolveProvider(config, void 0, currentProvider);
     const currentMode = provider?.config?.api || "(not set)";
     for (const [mode, description] of Object.entries(API_MODES)) {
       const isActive = mode === currentMode;
@@ -386,7 +399,7 @@ function api_temp_default(pi) {
       display: { type: "content", content: lines.join("\n") }
     });
   }
-  function handleProvider(ctx, config, arg) {
+  function handleProvider(ctx2, config, arg) {
     const parts = arg.trim().split(/\s+/);
     const sub = parts[0]?.toLowerCase() || "";
     const rest = parts.slice(1).join(" ");
@@ -410,7 +423,7 @@ function api_temp_default(pi) {
           const url = p.baseUrl || "(no URL)";
           const api = p.api || "(no mode)";
           const isDefault = name === defaultProvider;
-          const isLocal = url.includes("localhost") || url.includes("127.0.0.1") || url.includes("0.0.0.0") || name === "ollama";
+          const isLocal = isLocalProvider(url, name);
           const marker = isDefault ? ok(" \u25C0 default") : "";
           const tag = isLocal ? " (local)" : " (cloud)";
           lines.push(info(`  ${name}${tag}${marker}`));
@@ -455,7 +468,7 @@ function api_temp_default(pi) {
         lines2.push(info("Configured providers:"));
         for (const name of providerNames) {
           const p = config.providers[name];
-          const isLocal = (p.baseUrl || "").includes("localhost") || (p.baseUrl || "").includes("127.0.0.1") || name === "ollama";
+          const isLocal = isLocalProvider(p.baseUrl || "", name);
           lines2.push(info(`  ${name}${isLocal ? " (local)" : " (cloud)"}`));
         }
         const builtins = Object.keys(BUILTIN_PROVIDERS).filter((n) => !providerNames.includes(n));
@@ -470,13 +483,13 @@ function api_temp_default(pi) {
           content: lines2.join("\n"),
           display: { type: "content", content: lines2.join("\n") }
         });
-        ctx.ui.notify("Specify a provider name: /api provider set <name>", "info");
+        ctx2.ui.notify("Specify a provider name: /api provider set <name>", "info");
         return;
       }
       const isBuiltin = targetName in BUILTIN_PROVIDERS;
       if (!config.providers[targetName] && !isBuiltin) {
         const allNames = [...providerNames, ...Object.keys(BUILTIN_PROVIDERS).filter((n) => !providerNames.includes(n))];
-        ctx.ui.notify(`Provider "${targetName}" not found. Available: ${allNames.join(", ")}`, "error");
+        ctx2.ui.notify(`Provider "${targetName}" not found. Available: ${allNames.join(", ")}`, "error");
         return;
       }
       const settings = readSettings();
@@ -508,13 +521,27 @@ function api_temp_default(pi) {
         content: lines.join("\n"),
         display: { type: "content", content: lines.join("\n") }
       });
-      ctx.ui.notify(`Default provider set to ${targetName}`, "success");
+      ctx2.ui.notify(`Default provider set to ${targetName}`, "success");
       return;
     }
     if (providerNames.includes(sub) || sub in BUILTIN_PROVIDERS) {
-      return handleProvider(ctx, config, `set ${sub}`);
+      return handleProvider(ctx2, config, `set ${sub}`);
+    }
+    ctx2.ui.notify(`Unknown sub-command: "${sub}". Use: show, set, list, or a provider name`, "error");
+  }
+  function getCurrentSessionProvider(ctx2) {
+    if (ctx2.session?.state?.provider) {
+      return ctx2.session.state.provider;
+    }
+    if (ctx2.state?.provider) {
+      return ctx2.state.provider;
+    }
+    try {
+      const settings = readSettings();
+      return settings.defaultProvider;
+    } catch {
+      return void 0;
     }
-    ctx.ui.notify(`Unknown sub-command: "${sub}". Use: show, set, list, or a provider name`, "error");
   }
   pi.registerCompletion?.("api", {
     getCompletions: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-api",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "API Mode Switcher extension for Pi Coding Agent",
   "main": "api.js",
   "keywords": ["pi-extensions"],
@@ -14,7 +14,7 @@
     "url": "https://github.com/VTSTech/pi-coding-agent"
   },
   "dependencies": {
-    "@vtstech/pi-shared": "1.1.7"
+    "@vtstech/pi-shared": "1.1.9"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"