@billjr99/pi-openai-compat 1.1.12 → 1.1.14

package/README.md

@@ -77,12 +77,21 @@ If pi is already running when you install, type `/reload` first.
 > | **Cloudflare Workers AI** | HTTP 405 (no `GET /v1/models`; real catalog at `/ai/models/search`, id field is `name`, mixed task types) | Live discovery — `modelsUrl: …/ai/models/search`, `modelsIdField: name`, `modelsKeepTask: "Text Generation"` |
 > | **Cloudflare AI Gateway** | HTTP 401 (token missing `AI Gateway: Run`) or HTTP 400 *"Please configure AI Gateway"* (gateway slug doesn't exist, or the upstream isn't configured on it) | Built-in fallback list |
 > | **Hugging Face** | Returns HTML rather than JSON | Built-in fallback list |
+>
+> **Auto-heal for older configs:** if you logged in before live discovery
+> existed, your saved provider is missing these `modelsUrl`/`modelsIdField`/
+> `modelsKeepTask` fields. On startup the extension backfills them from the
+> template whenever it can do so without prompting — i.e. when your saved base
+> URL still matches the template (Cloudflare Workers AI). When the base URL
+> itself changed (e.g. GitHub Models' retired `models.inference.ai.azure.com`
+> host), it can't be migrated silently and you'll get a one-time notice to run
+> `/compat-login`.
 
 ---
 
 ## Commands
 
-Only two commands are needed.
+Three commands are available; `/compat-login` is the only one you need to get started.
 
 ### `/compat-login`
 
@@ -98,6 +107,18 @@ After login, the provider's models appear in pi's `/model` command and
 `Ctrl+L` picker immediately.  You can run `/compat-login` again to add a
 second provider — all providers are active simultaneously.
 
+### `/compat-refresh`
+
+Re-fetches the model list for an already-registered provider, reusing the
+saved base URL, API key, and discovery settings — no need to re-enter URLs,
+keys, or account IDs. Use it to pick up models a provider has added (or
+dropped) since you logged in, without restarting your session.
+
+If you have multiple providers registered, you are asked which one to refresh
+(or choose **All providers**); with a single provider it refreshes directly.
+A failed or empty refresh leaves the existing model list untouched, so a flaky
+network call can't blank out a working provider.
+
 ### `/compat-logout`
 
 Unregisters a provider from pi.  If you have multiple providers registered,

package/index.ts

@@ -8,8 +8,9 @@
  *   - Every provider saved in config.json is registered automatically at
  *     startup.  The factory is async so pi waits for registration to complete
  *     before showing the model list — no session_start delay.
- *   - /compat-login  adds a provider (fetches fresh model list, registers).
- *   - /compat-logout removes a provider (unregisters, restores previous model).
+ *   - /compat-login   adds a provider (fetches fresh model list, registers).
+ *   - /compat-refresh re-fetches the model list for a registered provider.
+ *   - /compat-logout  removes a provider (unregisters, restores previous model).
  *   - No activeProviders list — presence in config.providers means registered.
  *
  * Config: ~/.config/pi-openai-compat/config.json
@@ -348,6 +349,84 @@ function saveConfig(config: ExtensionConfig): void {
   }
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Discovery-field auto-heal
+//
+// Providers saved before model-discovery overrides existed (modelsUrl/
+// modelsIdField/modelsKeepTask) have none on their config, so /compat-refresh
+// and the session_start rehydrate hit the broken default <baseUrl>/models path
+// (e.g. Cloudflare Workers AI's 405). When a provider's saved baseUrl still
+// matches its template — so we can recover any account-id/slug placeholders —
+// we backfill the discovery fields from the template. Providers whose baseUrl
+// no longer matches the template (e.g. GitHub Models' retired Azure host) can't
+// be healed safely and are reported so the user can re-run /compat-login.
+// ─────────────────────────────────────────────────────────────────────────────
+
+/** Placeholders that may appear in a template's baseUrl / modelsUrl. */
+const URL_PLACEHOLDERS = ["YOUR_ACCOUNT_ID", "YOUR_GATEWAY_SLUG", "YOUR_PROVIDER"];
+
+function escapeRegex(s: string): string {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+/**
+ * Recover placeholder values by matching a saved URL against a template URL.
+ * Returns a map (possibly empty when the template has no placeholders) when the
+ * saved URL is consistent with the template, or null when it isn't — which we
+ * treat as "this provider can't be healed automatically".
+ */
+function recoverPlaceholders(templateUrl: string, savedUrl: string): Record<string, string> | null {
+  const order: string[] = [];
+  const placeholderRe = new RegExp(URL_PLACEHOLDERS.join("|"), "g");
+  let source = "^";
+  let lastIndex = 0;
+  let m: RegExpExecArray | null;
+  while ((m = placeholderRe.exec(templateUrl)) !== null) {
+    source += escapeRegex(templateUrl.slice(lastIndex, m.index)) + "([^/]+)";
+    order.push(m[0]);
+    lastIndex = m.index + m[0].length;
+  }
+  source += escapeRegex(templateUrl.slice(lastIndex)) + "$";
+
+  const match = new RegExp(source).exec(savedUrl);
+  if (!match) return null;
+  const out: Record<string, string> = {};
+  order.forEach((name, i) => { out[name] = match[i + 1]; });
+  return out;
+}
+
+function applyPlaceholders(url: string, values: Record<string, string>): string {
+  let out = url;
+  for (const [name, value] of Object.entries(values)) out = out.split(name).join(value);
+  return out;
+}
+
+/**
+ * Backfill missing discovery fields on saved providers from their template.
+ * Mutates `config` in place; the caller is responsible for persisting when
+ * `healed` is non-empty. `stale` lists providers that need a manual re-login.
+ */
+function migrateDiscoveryFields(config: ExtensionConfig): { healed: string[]; stale: string[] } {
+  const healed: string[] = [];
+  const stale: string[] = [];
+
+  for (const [key, p] of Object.entries(config.providers)) {
+    const tpl = TEMPLATES[key];
+    if (!tpl?.modelsUrl) continue;   // no matching template, or template needs no overrides
+    if (p.modelsUrl) continue;       // already set (fresh login or manual edit) — never clobber
+
+    const values = recoverPlaceholders(tpl.baseUrl, p.baseUrl);
+    if (!values) { stale.push(p.displayName); continue; }
+
+    p.modelsUrl = applyPlaceholders(tpl.modelsUrl, values);
+    p.modelsIdField = tpl.modelsIdField;
+    p.modelsKeepTask = tpl.modelsKeepTask;
+    healed.push(p.displayName);
+  }
+
+  return { healed, stale };
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Networking
 // ─────────────────────────────────────────────────────────────────────────────
@@ -471,6 +550,11 @@ function registerProvider(pi: ExtensionAPI, key: string, p: ProviderConfig): voi
 export default async function (pi: ExtensionAPI) {
   let config = loadConfig();
 
+  // Self-heal older configs: backfill discovery fields (modelsUrl/idField/
+  // keepTask) we can derive from the template without prompting. Persist once
+  // so /compat-refresh and the session_start rehydrate use the fixed values.
+  if (migrateDiscoveryFields(config).healed.length > 0) saveConfig(config);
+
   // Register all saved providers immediately using cached model lists.
   // The factory is async, so pi waits for this to finish before startup
   // continues — providers are visible in /model from the very first render.
@@ -486,6 +570,11 @@ export default async function (pi: ExtensionAPI) {
   pi.on("session_start", async (_event, ctx) => {
     config = loadConfig();
 
+    // Self-heal what we can (silently), and collect providers whose saved
+    // baseUrl no longer matches the template — those need a manual re-login.
+    const { healed, stale } = migrateDiscoveryFields(config);
+    if (healed.length > 0) saveConfig(config);
+
     const registered: string[] = [];
     const failed: string[] = [];
 
@@ -526,6 +615,13 @@ export default async function (pi: ExtensionAPI) {
         "warning"
       );
     }
+    if (stale.length > 0) {
+      ctx.ui.notify(
+        `OpenAI-compat: ${stale.join(", ")} ${stale.length === 1 ? "has" : "have"} an out-of-date ` +
+        `base URL — run /compat-login to update (its endpoint changed and can't be migrated automatically).`,
+        "warning"
+      );
+    }
   });
 
   // ── model_select ───────────────────────────────────────────────────────────
@@ -690,6 +786,72 @@ export default async function (pi: ExtensionAPI) {
     },
   });
 
+  // ── /compat-refresh ──────────────────────────────────────────────────────────
+  // Force a re-fetch of an already-registered provider's model list, reusing
+  // the persisted baseUrl/apiKey and discovery overrides — no need to re-enter
+  // URLs, keys, or account IDs like /compat-login. Picks up newly added (or
+  // dropped) upstream models without restarting the session.
+  pi.registerCommand("compat-refresh", {
+    description: "Re-fetch the model list for a registered OpenAI-compatible provider",
+    handler: async (_args, ctx) => {
+      const providerKeys = Object.keys(config.providers);
+      if (!providerKeys.length) {
+        ctx.ui.notify("No compat providers are registered. Run /compat-login first.", "info");
+        return;
+      }
+
+      // Choose which provider(s) to refresh. With one provider, refresh it
+      // directly; otherwise offer each by name plus an "All providers" option.
+      let keys: string[];
+      if (providerKeys.length === 1) {
+        keys = providerKeys;
+      } else {
+        const ALL = "All providers";
+        const labels = [ALL, ...providerKeys.map((k) => config.providers[k].displayName)];
+        const chosen = await ctx.ui.select("Refresh which provider?", labels);
+        if (!chosen) { ctx.ui.notify("Cancelled.", "info"); return; }
+        keys = chosen === ALL ? providerKeys : [providerKeys[labels.indexOf(chosen) - 1]];
+      }
+
+      const refreshed: string[] = [];
+      const failed: string[] = [];
+      for (const key of keys) {
+        const p = config.providers[key];
+        ctx.ui.notify(`Refreshing ${p.displayName} …`, "info");
+        try {
+          const models = await fetchModels(p.baseUrl, p.apiKey, {
+            url: p.modelsUrl,
+            idField: p.modelsIdField,
+            keepTask: p.modelsKeepTask,
+          });
+          if (models.length > 0) {
+            // Only overwrite the cache on a successful, non-empty fetch — a
+            // flaky refresh must never blank out a working provider's models.
+            p.cachedModels = models;
+            saveConfig(config);
+            registerProvider(pi, key, p);
+            refreshed.push(`${p.displayName} (${models.length})`);
+          } else {
+            failed.push(p.displayName);
+          }
+        } catch {
+          failed.push(p.displayName);
+        }
+      }
+
+      if (refreshed.length > 0) {
+        ctx.ui.notify(`Refreshed: ${refreshed.join(", ")}.`, "success");
+      }
+      if (failed.length > 0) {
+        ctx.ui.notify(
+          `Could not refresh ${failed.join(", ")} — kept the existing model list. ` +
+          `Run /compat-login if the provider's URL or key changed.`,
+          "warning"
+        );
+      }
+    },
+  });
+
   // ── /compat-logout ─────────────────────────────────────────────────────────
   pi.registerCommand("compat-logout", {
     description: "Remove an OpenAI-compatible provider from pi's model list",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@billjr99/pi-openai-compat",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "pi-coding-agent extension: OpenAI-compatible endpoint support (OpenRouter, NVIDIA NIM, Nous Portal, Ollama, custom)",
   "author": "Bill Mongan <https://github.com/BillJr99>",
   "license": "MIT",