oh-pi 0.1.46 → 0.1.48

package/dist/tui/provider-setup.js

@@ -12,27 +12,35 @@ const PROVIDER_API_URLS = {
     xai: "https://api.x.ai",
     mistral: "https://api.mistral.ai",
 };
-/** Fetch models dynamically — tries multiple API styles */
+/** Fetch models dynamically — tries multiple API styles, returns metadata + detected API type */
 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;
+    // Try Anthropic-style first (for known anthropic or any provider)
+    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 data = json.data ?? [];
+            if (data.length > 0 && data[0].owned_by === "anthropic") {
+                return {
+                    api: "anthropic-messages",
+                    models: data.map(m => ({
+                        id: m.id,
+                        reasoning: m.thinking_enabled ?? false,
+                        input: ["text", "image"],
+                        contextWindow: m.max_tokens ?? 200000,
+                        maxTokens: m.thinking_enabled ? Math.min(m.max_tokens ?? 128000, 128000) : Math.min(m.max_tokens ?? 8192, 16384),
+                    })).sort((a, b) => a.id.localeCompare(b.id)),
+                };
             }
         }
-        catch { /* fall through */ }
     }
-    // Try Google-style: GET /v1beta/models with key param
+    catch { /* fall through */ }
+    // Try Google-style
     if (provider === "google") {
         try {
             const res = await fetch(`${base}/v1beta/models?key=${resolvedKey}`, {
@@ -40,17 +48,24 @@ async function fetchModels(provider, baseUrl, apiKey) {
             });
             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;
+                const data = (json.models ?? []).filter((m) => m.name?.includes("gemini"));
+                if (data.length > 0) {
+                    return {
+                        api: "google-generative-ai",
+                        models: data.map((m) => ({
+                            id: m.name.replace("models/", ""),
+                            reasoning: m.name.includes("thinking") || m.name.includes("2.5"),
+                            input: ["text", "image"],
+                            contextWindow: m.inputTokenLimit ?? 1048576,
+                            maxTokens: m.outputTokenLimit ?? 65536,
+                        })).sort((a, b) => a.id.localeCompare(b.id)),
+                    };
+                }
             }
         }
         catch { /* fall through */ }
     }
-    // Try OpenAI-compatible: GET /v1/models with Bearer auth
+    // Try OpenAI-compatible
     try {
         const res = await fetch(`${base}/v1/models`, {
             headers: { Authorization: `Bearer ${resolvedKey}` },
@@ -58,13 +73,23 @@ async function fetchModels(provider, baseUrl, apiKey) {
         });
         if (res.ok) {
             const json = await res.json();
-            const models = (json.data ?? []).map(m => m.id).sort();
-            if (models.length > 0)
-                return models;
+            const data = json.data ?? [];
+            if (data.length > 0) {
+                return {
+                    api: "openai-completions",
+                    models: data.map((m) => ({
+                        id: m.id,
+                        reasoning: m.thinking_enabled ?? m.id.includes("o3") ?? false,
+                        input: ["text", "image"],
+                        contextWindow: m.context_window ?? m.max_tokens ?? 128000,
+                        maxTokens: m.max_output ?? 16384,
+                    })).sort((a, b) => a.id.localeCompare(b.id)),
+                };
+            }
         }
     }
     catch { /* fall through */ }
-    return [];
+    return { models: [] };
 }
 export async function setupProviders(env) {
     const entries = Object.entries(PROVIDERS);
@@ -142,10 +167,10 @@ export async function setupProviders(env) {
         else {
             apiKey = await promptKey(info.label);
         }
-        // Dynamic model fetch — always try, fall back to static list
+        // Dynamic model fetch — always try
         const fetchUrl = baseUrl || PROVIDER_API_URLS[name];
-        const defaultModel = await selectModel(name, info.label, info.models, fetchUrl, apiKey);
-        configs.push({ name, apiKey, defaultModel, baseUrl });
+        const { defaultModel, discoveredModels, api } = await selectModelWithMeta(name, info.label, info.models, fetchUrl, apiKey);
+        configs.push({ name, apiKey, defaultModel, baseUrl, api, discoveredModels });
         p.log.success(t("provider.configured", { label: info.label }));
     }
     return configs;
@@ -178,24 +203,26 @@ async function setupCustomProvider() {
     if (needsKey) {
         apiKey = await promptKey(name);
     }
-    // Dynamic model fetch
-    const defaultModel = await selectModel(name, name, [], baseUrl, apiKey);
+    const { defaultModel, discoveredModels, api } = await selectModelWithMeta(name, name, [], baseUrl, apiKey);
     p.log.success(t("provider.customConfigured", { name, url: baseUrl }));
-    return { name, apiKey, defaultModel, baseUrl };
+    return { name, apiKey, defaultModel, baseUrl, api, discoveredModels };
 }
-async function selectModel(provider, label, staticModels, baseUrl, apiKey) {
-    let models = staticModels;
-    // Always try dynamic fetch
+async function selectModelWithMeta(provider, label, staticModels, baseUrl, apiKey) {
+    let modelIds = staticModels;
+    let discoveredModels;
+    let api;
     if (baseUrl && apiKey) {
         const s = p.spinner();
         s.start(t("provider.fetchingModels", { source: label }));
-        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;
+        const result = await fetchModels(provider, baseUrl, apiKey);
+        s.stop(result.models.length > 0 ? t("provider.foundModels", { count: result.models.length }) : t("provider.defaultModelList"));
+        if (result.models.length > 0) {
+            discoveredModels = result.models;
+            api = result.api;
+            modelIds = result.models.map(m => m.id);
+        }
     }
-    if (models.length === 0) {
-        // No models found — manual input
+    if (modelIds.length === 0) {
         const model = await p.text({
             message: t("provider.modelName", { label }),
             placeholder: t("provider.modelNamePlaceholder"),
@@ -205,19 +232,19 @@ async function selectModel(provider, label, staticModels, baseUrl, apiKey) {
             p.cancel(t("cancelled"));
             process.exit(0);
         }
-        return model;
+        return { defaultModel: model, discoveredModels, api };
     }
-    if (models.length === 1)
-        return models[0];
+    if (modelIds.length === 1)
+        return { defaultModel: modelIds[0], discoveredModels, api };
     const model = await p.select({
         message: t("provider.selectModel", { label }),
-        options: models.slice(0, 50).map(m => ({ value: m, label: m })),
+        options: modelIds.slice(0, 50).map(m => ({ value: m, label: m })),
     });
     if (p.isCancel(model)) {
         p.cancel(t("cancelled"));
         process.exit(0);
     }
-    return model;
+    return { defaultModel: model, discoveredModels, api };
 }
 async function promptKey(label) {
     const key = await p.password({

package/dist/types.d.ts

@@ -1,3 +1,11 @@
+/** 动态发现的模型信息 */
+export interface DiscoveredModel {
+    id: string;
+    reasoning: boolean;
+    input: ("text" | "image")[];
+    contextWindow: number;
+    maxTokens: number;
+}
 /** 模型提供商配置 */
 export interface ProviderConfig {
     /** 提供商名称 */
@@ -8,6 +16,10 @@ export interface ProviderConfig {
     defaultModel?: string;
     /** 自定义 API 地址 */
     baseUrl?: string;
+    /** 检测到的 API 类型 */
+    api?: string;
+    /** 动态发现的所有模型 */
+    discoveredModels?: DiscoveredModel[];
     /** 上下文窗口大小（自定义提供商用） */
     contextWindow?: number;
     /** 最大输出 token 数（自定义提供商用） */

package/dist/utils/install.js

@@ -56,13 +56,12 @@ export function applyConfig(config) {
         writeFileSync(authPath, JSON.stringify(auth, null, 2), { mode: 0o600 });
     }
     // 2. settings.json
-    const primary = config.providers[0];
+    // Issue #4 fix: prefer provider with baseUrl+defaultModel as primary (custom endpoint user intent)
+    const primary = config.providers.find(p => p.baseUrl && p.defaultModel) ?? config.providers[0];
     const providerInfo = primary ? PROVIDERS[primary.name] : undefined;
     const compactThreshold = config.compactThreshold ?? 0.75;
+    const reserveTokens = 32000;
     const primaryModel = primary?.defaultModel ?? providerInfo?.models[0];
-    const primaryCaps = primaryModel ? MODEL_CAPABILITIES[primaryModel] : undefined;
-    const contextWindow = primary?.contextWindow ?? primaryCaps?.contextWindow ?? 128000;
-    const reserveTokens = Math.round(contextWindow * (1 - compactThreshold));
     const settings = {
         ...(primary ? { defaultProvider: primary.name, defaultModel: primaryModel } : {}),
         defaultThinkingLevel: config.thinking,
@@ -74,6 +73,8 @@ export function applyConfig(config) {
     };
     if (config.providers.length > 1) {
         settings.enabledModels = config.providers.flatMap((p) => {
+            if (p.discoveredModels?.length)
+                return p.discoveredModels.map(m => m.id);
             const info = PROVIDERS[p.name];
             return info ? info.models : [];
         });
@@ -85,23 +86,35 @@ export function applyConfig(config) {
         const providers = {};
         for (const cp of customProviders) {
             const isBuiltin = !!PROVIDERS[cp.name];
-            if (isBuiltin) {
-                // Known provider with custom baseUrl — just override endpoint, keep built-in models
+            if (isBuiltin && !cp.discoveredModels?.length) {
+                // Known provider with custom baseUrl, no discovered models — just override endpoint
                 const entry = { baseUrl: cp.baseUrl };
                 if (cp.apiKey !== "none")
                     entry.apiKey = cp.apiKey;
                 providers[cp.name] = entry;
             }
             else {
-                // Fully custom provider — need api, models, etc.
-                const caps = cp.defaultModel ? MODEL_CAPABILITIES[cp.defaultModel] : undefined;
+                // Custom provider or builtin with discovered models — write full config
                 const entry = {
                     baseUrl: cp.baseUrl,
-                    api: "openai-completions",
+                    api: cp.api ?? "openai-completions",
                 };
                 if (cp.apiKey !== "none")
                     entry.apiKey = cp.apiKey;
-                if (cp.defaultModel) {
+                if (cp.discoveredModels?.length) {
+                    // Write ALL discovered models with their metadata
+                    entry.models = cp.discoveredModels.map(m => ({
+                        id: m.id,
+                        name: m.id,
+                        reasoning: m.reasoning,
+                        input: m.input,
+                        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+                        contextWindow: m.contextWindow,
+                        maxTokens: m.maxTokens,
+                    }));
+                }
+                else if (cp.defaultModel) {
+                    const caps = MODEL_CAPABILITIES[cp.defaultModel];
                     entry.models = [{
                             id: cp.defaultModel,
                             name: cp.defaultModel,

package/package.json

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