oh-pi 0.1.45 → 0.1.46

package/dist/tui/provider-setup.js

@@ -2,22 +2,69 @@ import * as p from "@clack/prompts";
 import chalk from "chalk";
 import { t } from "../i18n.js";
 import { PROVIDERS } from "../types.js";
-/** Fetch models from OpenAI-compatible /v1/models endpoint */
-async function fetchModels(baseUrl, apiKey) {
-    const url = `${baseUrl.replace(/\/+$/, "")}/v1/models`;
+/** Provider API base URLs for dynamic model fetching */
+const PROVIDER_API_URLS = {
+    anthropic: "https://api.anthropic.com",
+    openai: "https://api.openai.com",
+    google: "https://generativelanguage.googleapis.com",
+    groq: "https://api.groq.com",
+    openrouter: "https://openrouter.ai",
+    xai: "https://api.x.ai",
+    mistral: "https://api.mistral.ai",
+};
+/** Fetch models dynamically — tries multiple API styles */
+async function fetchModels(provider, baseUrl, apiKey) {
+    const base = baseUrl.replace(/\/+$/, "");
+    const resolvedKey = process.env[apiKey] ?? apiKey;
+    // Try Anthropic-style: GET /v1/models with x-api-key header
+    if (provider === "anthropic") {
+        try {
+            const res = await fetch(`${base}/v1/models`, {
+                headers: { "x-api-key": resolvedKey, "anthropic-version": "2023-06-01" },
+                signal: AbortSignal.timeout(8000),
+            });
+            if (res.ok) {
+                const json = await res.json();
+                const models = (json.data ?? []).map(m => m.id).sort();
+                if (models.length > 0)
+                    return models;
+            }
+        }
+        catch { /* fall through */ }
+    }
+    // Try Google-style: GET /v1beta/models with key param
+    if (provider === "google") {
+        try {
+            const res = await fetch(`${base}/v1beta/models?key=${resolvedKey}`, {
+                signal: AbortSignal.timeout(8000),
+            });
+            if (res.ok) {
+                const json = await res.json();
+                const models = (json.models ?? [])
+                    .map(m => m.name.replace("models/", ""))
+                    .filter(m => m.includes("gemini"))
+                    .sort();
+                if (models.length > 0)
+                    return models;
+            }
+        }
+        catch { /* fall through */ }
+    }
+    // Try OpenAI-compatible: GET /v1/models with Bearer auth
     try {
-        const res = await fetch(url, {
-            headers: { Authorization: `Bearer ${apiKey}` },
+        const res = await fetch(`${base}/v1/models`, {
+            headers: { Authorization: `Bearer ${resolvedKey}` },
             signal: AbortSignal.timeout(8000),
         });
-        if (!res.ok)
-            return [];
-        const json = await res.json();
-        return (json.data ?? []).map(m => m.id).sort();
-    }
-    catch {
-        return [];
+        if (res.ok) {
+            const json = await res.json();
+            const models = (json.data ?? []).map(m => m.id).sort();
+            if (models.length > 0)
+                return models;
+        }
     }
+    catch { /* fall through */ }
+    return [];
 }
 export async function setupProviders(env) {
     const entries = Object.entries(PROVIDERS);
@@ -95,8 +142,9 @@ export async function setupProviders(env) {
         else {
             apiKey = await promptKey(info.label);
         }
-        // Model selection — try dynamic fetch for custom endpoints, fall back to static list
-        const defaultModel = await selectModel(info.label, info.models, baseUrl, apiKey);
+        // Dynamic model fetch — always try, fall back to static list
+        const fetchUrl = baseUrl || PROVIDER_API_URLS[name];
+        const defaultModel = await selectModel(name, info.label, info.models, fetchUrl, apiKey);
         configs.push({ name, apiKey, defaultModel, baseUrl });
         p.log.success(t("provider.configured", { label: info.label }));
     }
@@ -131,53 +179,39 @@ async function setupCustomProvider() {
         apiKey = await promptKey(name);
     }
     // Dynamic model fetch
-    const s = p.spinner();
-    s.start(t("provider.fetchingModels", { source: baseUrl }));
-    const models = await fetchModels(baseUrl, apiKey);
-    s.stop(models.length > 0 ? t("provider.foundModels", { count: models.length }) : t("provider.noModels"));
-    let defaultModel;
-    if (models.length > 0) {
-        const model = await p.select({
-            message: t("provider.selectModel", { label: name }),
-            options: models.slice(0, 30).map(m => ({ value: m, label: m })),
-        });
-        if (p.isCancel(model)) {
-            p.cancel(t("cancelled"));
-            process.exit(0);
-        }
-        defaultModel = model;
-    }
-    else {
-        const model = await p.text({
-            message: t("provider.modelName", { label: name }),
-            placeholder: t("provider.modelNamePlaceholder"),
-            validate: (v) => (!v || v.trim().length === 0) ? t("provider.modelNameRequired") : undefined,
-        });
-        if (p.isCancel(model)) {
-            p.cancel(t("cancelled"));
-            process.exit(0);
-        }
-        defaultModel = model;
-    }
+    const defaultModel = await selectModel(name, name, [], baseUrl, apiKey);
     p.log.success(t("provider.customConfigured", { name, url: baseUrl }));
     return { name, apiKey, defaultModel, baseUrl };
 }
-async function selectModel(label, staticModels, baseUrl, apiKey) {
+async function selectModel(provider, label, staticModels, baseUrl, apiKey) {
     let models = staticModels;
-    // Try dynamic fetch if custom URL or known provider
+    // Always try dynamic fetch
     if (baseUrl && apiKey) {
         const s = p.spinner();
         s.start(t("provider.fetchingModels", { source: label }));
-        const fetched = await fetchModels(baseUrl, apiKey);
+        const fetched = await fetchModels(provider, baseUrl, apiKey);
         s.stop(fetched.length > 0 ? t("provider.foundModels", { count: fetched.length }) : t("provider.defaultModelList"));
         if (fetched.length > 0)
             models = fetched;
     }
+    if (models.length === 0) {
+        // No models found — manual input
+        const model = await p.text({
+            message: t("provider.modelName", { label }),
+            placeholder: t("provider.modelNamePlaceholder"),
+            validate: (v) => (!v || v.trim().length === 0) ? t("provider.modelNameRequired") : undefined,
+        });
+        if (p.isCancel(model)) {
+            p.cancel(t("cancelled"));
+            process.exit(0);
+        }
+        return model;
+    }
     if (models.length === 1)
         return models[0];
     const model = await p.select({
         message: t("provider.selectModel", { label }),
-        options: models.slice(0, 30).map(m => ({ value: m, label: m })),
+        options: models.slice(0, 50).map(m => ({ value: m, label: m })),
     });
     if (p.isCancel(model)) {
         p.cancel(t("cancelled"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-pi",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "description": "One-click setup for pi-coding-agent. Like oh-my-zsh for pi.",
   "type": "module",
   "bin": {