oh-pi 0.1.79 → 0.1.81

package/dist/index.js

@@ -1,4 +1,5 @@
 import * as p from "@clack/prompts";
+import chalk from "chalk";
 import { selectLanguage, getLocale } from "./i18n.js";
 import { t } from "./i18n.js";
 import { welcome } from "./tui/welcome.js";
@@ -11,6 +12,7 @@ import { selectExtensions } from "./tui/extension-select.js";
 import { selectAgents } from "./tui/agents-select.js";
 import { confirmApply } from "./tui/confirm-apply.js";
 import { detectEnv } from "./utils/detect.js";
+import { EXTENSIONS } from "./registry.js";
 /**
  * 主入口函数。检测环境、选择语言、展示欢迎界面，根据用户选择的模式执行对应配置流程，最终确认并应用配置。
  */
@@ -65,19 +67,58 @@ async function presetFlow(env) {
  * @returns 生成的配置对象
  */
 async function customFlow(env) {
-    const providerSetup = await setupProviders(env);
-    const theme = await selectTheme();
-    const keybindings = await selectKeybindings();
-    const extensions = await selectExtensions();
-    const agents = await selectAgents();
-    // Advanced: auto-compaction is now automatic based on model context window
-    const wantAdvanced = await p.confirm({
-        message: t("advanced.configure"),
-        initialValue: false,
-    });
-    if (p.isCancel(wantAdvanced)) {
-        p.cancel(t("cancelled"));
-        process.exit(0);
+    const defaultExtensions = EXTENSIONS.filter(e => e.default).map(e => e.name);
+    let providerSetup = null;
+    let theme = "dark";
+    let keybindings = "default";
+    let extensions = defaultExtensions;
+    let agents = "general-developer";
+    while (true) {
+        const tabBar = [
+            chalk.cyan(`[${t("custom.tabProviders")}]`),
+            chalk.cyan(`[${t("custom.tabAppearance")}]`),
+            chalk.cyan(`[${t("custom.tabFeatures")}]`),
+            chalk.cyan(`[${t("custom.tabAgents")}]`),
+            chalk.green(`[${t("custom.tabFinish")}]`),
+        ].join(chalk.gray("  |  "));
+        const providerStatus = summarizeProviders(providerSetup);
+        p.note(`${tabBar}\n${providerStatus}`, t("custom.tabHeader"));
+        const tab = await p.select({
+            message: t("custom.tabPrompt"),
+            options: [
+                { value: "providers", label: t("custom.tabProviders"), hint: providerStatus },
+                { value: "appearance", label: t("custom.tabAppearance"), hint: `${theme} · ${keybindings}` },
+                { value: "features", label: t("custom.tabFeatures"), hint: t("custom.tabFeaturesHint", { count: extensions.length }) },
+                { value: "agents", label: t("custom.tabAgents"), hint: agents },
+                { value: "finish", label: t("custom.tabFinish"), hint: t("custom.tabFinishHint") },
+            ],
+        });
+        if (p.isCancel(tab)) {
+            p.cancel(t("cancelled"));
+            process.exit(0);
+        }
+        if (tab === "providers") {
+            providerSetup = await setupProviders(env);
+            continue;
+        }
+        if (tab === "appearance") {
+            theme = await selectTheme();
+            keybindings = await selectKeybindings();
+            continue;
+        }
+        if (tab === "features") {
+            extensions = await selectExtensions();
+            continue;
+        }
+        if (tab === "agents") {
+            agents = await selectAgents();
+            continue;
+        }
+        if (!providerSetup) {
+            p.log.warn(t("custom.needProviders"));
+            continue;
+        }
+        break;
     }
     return {
         ...providerSetup,
@@ -89,3 +130,17 @@ async function customFlow(env) {
         thinking: "medium",
     };
 }
+function summarizeProviders(setup) {
+    if (!setup)
+        return t("custom.providersUnset");
+    if (setup.providerStrategy === "keep")
+        return t("confirm.providerStrategyKeep");
+    if (setup.providerStrategy === "add") {
+        return setup.providers.length > 0
+            ? t("custom.providersAdd", { list: setup.providers.map(p => p.name).join(", ") })
+            : t("confirm.providerStrategyAdd");
+    }
+    if (setup.providers.length === 0)
+        return t("confirm.providerStrategyReplace");
+    return t("custom.providersReplace", { list: setup.providers.map(p => p.name).join(", ") });
+}

package/dist/locales.js

@@ -18,6 +18,19 @@ export const messages = {
         "mode.presetHint": "Choose a pre-made configuration",
         "mode.custom": "🎛️  Custom",
         "mode.customHint": "Pick everything yourself",
+        "custom.tabHeader": "Custom Setup Tabs",
+        "custom.tabPrompt": "Select a tab to configure",
+        "custom.tabProviders": "Providers",
+        "custom.tabAppearance": "Appearance",
+        "custom.tabFeatures": "Features",
+        "custom.tabFeaturesHint": "{count} extensions enabled",
+        "custom.tabAgents": "Agent Profile",
+        "custom.tabFinish": "Finish",
+        "custom.tabFinishHint": "Review in next step and apply",
+        "custom.needProviders": "Please configure Providers first.",
+        "custom.providersUnset": "Providers: not configured",
+        "custom.providersAdd": "Add fallback providers: {list}",
+        "custom.providersReplace": "Replace providers with: {list}",
         // provider
         "provider.select": "Select API providers",
         "provider.selectPrimary": "Select your primary API provider",
@@ -28,16 +41,16 @@ export const messages = {
         "provider.customHint": "Ollama, vLLM, LiteLLM, any OpenAI-compatible",
         "provider.foundEnv": "Found {env} in environment. Use it?",
         "provider.customEndpoint": "Custom endpoint for {label}? (proxy, Azure, etc.)",
-        "provider.baseUrl": "Base URL for {label}:",
+        "provider.baseUrl": "Base URL for {label} (usually without /v1):",
         "provider.useCustomUrl": "Use a custom endpoint for {label}? (proxy, self-hosted, etc.)",
-        "provider.baseUrlPlaceholder": "https://your-proxy.example.com",
-        "provider.baseUrlValidation": "Must be a valid URL",
+        "provider.baseUrlPlaceholder": "https://api.openai.com or https://your-proxy.example.com",
+        "provider.baseUrlValidation": "Must be a valid URL (tip: usually omit /v1)",
         "provider.configured": "{label} configured",
         "provider.name": "Provider name:",
         "provider.namePlaceholder": "ollama",
         "provider.nameRequired": "Name required",
-        "provider.baseUrlCustom": "Base URL:",
-        "provider.baseUrlCustomPlaceholder": "http://localhost:11434",
+        "provider.baseUrlCustom": "Base URL (usually without /v1):",
+        "provider.baseUrlCustomPlaceholder": "http://localhost:11434 (add /v1 only if your gateway requires it)",
         "provider.needsKey": "Requires API key?",
         "provider.apiKey": "API key for {label}:",
         "provider.apiKeyRequired": "API key cannot be empty",
@@ -168,6 +181,19 @@ export const messages = {
         "mode.presetHint": "选择预制配置",
         "mode.custom": "🎛️  自定义",
         "mode.customHint": "逐项自选",
+        "custom.tabHeader": "自定义配置 Tabs",
+        "custom.tabPrompt": "选择一个页面进行配置",
+        "custom.tabProviders": "Providers",
+        "custom.tabAppearance": "外观",
+        "custom.tabFeatures": "功能",
+        "custom.tabFeaturesHint": "已启用 {count} 个扩展",
+        "custom.tabAgents": "Agent 模板",
+        "custom.tabFinish": "完成",
+        "custom.tabFinishHint": "下一步可预览并应用",
+        "custom.needProviders": "请先配置 Providers。",
+        "custom.providersUnset": "Providers：未配置",
+        "custom.providersAdd": "新增备用 Providers：{list}",
+        "custom.providersReplace": "替换为 Providers：{list}",
         "provider.select": "选择 API 提供商",
         "provider.selectPrimary": "选择主 Provider",
         "provider.selectAdditional": "选择新增 Provider",
@@ -177,16 +203,16 @@ export const messages = {
         "provider.customHint": "Ollama、vLLM、LiteLLM 等 OpenAI 兼容接口",
         "provider.foundEnv": "在环境变量中找到 {env}，是否使用？",
         "provider.customEndpoint": "为 {label} 设置自定义端点？（代理、Azure 等）",
-        "provider.baseUrl": "{label} 的 Base URL：",
+        "provider.baseUrl": "{label} 的 Base URL（通常不要带 /v1）：",
         "provider.useCustomUrl": "是否使用自定义端点？（代理、自托管等）",
-        "provider.baseUrlPlaceholder": "https://your-proxy.example.com",
-        "provider.baseUrlValidation": "必须是有效的 URL",
+        "provider.baseUrlPlaceholder": "https://api.openai.com 或 https://your-proxy.example.com",
+        "provider.baseUrlValidation": "必须是有效 URL（通常不需要 /v1）",
         "provider.configured": "{label} 配置完成",
         "provider.name": "提供商名称：",
         "provider.namePlaceholder": "ollama",
         "provider.nameRequired": "名称不能为空",
-        "provider.baseUrlCustom": "Base URL：",
-        "provider.baseUrlCustomPlaceholder": "http://localhost:11434",
+        "provider.baseUrlCustom": "Base URL（通常不要带 /v1）：",
+        "provider.baseUrlCustomPlaceholder": "http://localhost:11434（仅当网关要求时再加 /v1）",
         "provider.needsKey": "需要 API 密钥？",
         "provider.apiKey": "{label} 的 API 密钥：",
         "provider.apiKeyRequired": "API 密钥不能为空",
@@ -309,6 +335,19 @@ export const messages = {
         "mode.presetHint": "Choisir une configuration prédéfinie",
         "mode.custom": "🎛️  Personnalisé",
         "mode.customHint": "Tout choisir soi-même",
+        "custom.tabHeader": "Onglets de configuration personnalisée",
+        "custom.tabPrompt": "Choisissez un onglet à configurer",
+        "custom.tabProviders": "Fournisseurs",
+        "custom.tabAppearance": "Apparence",
+        "custom.tabFeatures": "Fonctionnalités",
+        "custom.tabFeaturesHint": "{count} extensions activées",
+        "custom.tabAgents": "Profil Agent",
+        "custom.tabFinish": "Terminer",
+        "custom.tabFinishHint": "Prévisualiser puis appliquer à l'étape suivante",
+        "custom.needProviders": "Veuillez d'abord configurer les fournisseurs.",
+        "custom.providersUnset": "Fournisseurs : non configurés",
+        "custom.providersAdd": "Ajouter des fournisseurs de secours : {list}",
+        "custom.providersReplace": "Remplacer par : {list}",
         "provider.select": "Sélectionner les fournisseurs API",
         "provider.selectPrimary": "Sélectionner le fournisseur API principal",
         "provider.selectAdditional": "Sélectionner un fournisseur supplémentaire",
@@ -318,16 +357,16 @@ export const messages = {
         "provider.customHint": "Ollama, vLLM, LiteLLM, tout compatible OpenAI",
         "provider.foundEnv": "{env} trouvé dans l'environnement. L'utiliser ?",
         "provider.customEndpoint": "Point d'accès personnalisé pour {label} ? (proxy, Azure, etc.)",
-        "provider.baseUrl": "URL de base pour {label} :",
+        "provider.baseUrl": "URL de base pour {label} (généralement sans /v1) :",
         "provider.useCustomUrl": "Utiliser un endpoint personnalisé pour {label} ? (proxy, auto-hébergé, etc.)",
-        "provider.baseUrlPlaceholder": "https://your-proxy.example.com",
-        "provider.baseUrlValidation": "Doit être une URL valide",
+        "provider.baseUrlPlaceholder": "https://api.openai.com ou https://your-proxy.example.com",
+        "provider.baseUrlValidation": "Doit être une URL valide (astuce : sans /v1 dans la plupart des cas)",
         "provider.configured": "{label} configuré",
         "provider.name": "Nom du fournisseur :",
         "provider.namePlaceholder": "ollama",
         "provider.nameRequired": "Nom requis",
-        "provider.baseUrlCustom": "URL de base :",
-        "provider.baseUrlCustomPlaceholder": "http://localhost:11434",
+        "provider.baseUrlCustom": "URL de base (généralement sans /v1) :",
+        "provider.baseUrlCustomPlaceholder": "http://localhost:11434 (ajoutez /v1 seulement si votre passerelle l'exige)",
         "provider.needsKey": "Nécessite une clé API ?",
         "provider.apiKey": "Clé API pour {label} :",
         "provider.apiKeyRequired": "La clé API ne peut pas être vide",

package/dist/tui/provider-setup.d.ts

@@ -1,5 +1,10 @@
 import type { ProviderConfig, ProviderSetupStrategy } from "../types.js";
 import type { EnvInfo } from "../utils/detect.js";
+/**
+ * Normalize user-entered base URL for model discovery probes.
+ * Discovery always calls `${base}/v1/models`, so strip trailing `/v1` to avoid `/v1/v1/models`.
+ */
+export declare function normalizeDiscoveryBaseUrl(baseUrl: string): string;
 /** Block internal/private IPs to prevent SSRF */
 export declare function isUnsafeUrl(urlStr: string): boolean;
 type OpenAIApiMode = "auto" | "openai-responses" | "openai-completions";
@@ -8,6 +13,7 @@ export interface ProviderSetupResult {
     providerStrategy: ProviderSetupStrategy;
 }
 export declare function resolveOpenAIApiMode(mode: OpenAIApiMode, modelId: string): "openai-responses" | "openai-completions";
+export declare function isOpenAICompatibleApi(api?: string): boolean;
 /**
  * Interactively configure API providers with an explicit strategy.
  * Default flow: one primary provider. Advanced flow: optional fallback providers.

package/dist/tui/provider-setup.js

@@ -12,6 +12,14 @@ const PROVIDER_API_URLS = {
     xai: "https://api.x.ai",
     mistral: "https://api.mistral.ai",
 };
+/**
+ * Normalize user-entered base URL for model discovery probes.
+ * Discovery always calls `${base}/v1/models`, so strip trailing `/v1` to avoid `/v1/v1/models`.
+ */
+export function normalizeDiscoveryBaseUrl(baseUrl) {
+    const trimmed = baseUrl.trim().replace(/\/+$/, "");
+    return trimmed.replace(/\/v1$/i, "");
+}
 /** Block internal/private IPs to prevent SSRF */
 export function isUnsafeUrl(urlStr) {
     try {
@@ -50,6 +58,9 @@ export function resolveOpenAIApiMode(mode, modelId) {
         return "openai-responses";
     return "openai-completions";
 }
+export function isOpenAICompatibleApi(api) {
+    return !api || api === "openai-completions" || api === "openai-responses";
+}
 /**
  * 动态获取模型列表，依次尝试 Anthropic、Google、OpenAI 兼容 API 风格。
  * @param provider - 提供商名称
@@ -58,7 +69,7 @@ export function resolveOpenAIApiMode(mode, modelId) {
  * @returns 发现的模型列表及检测到的 API 类型
  */
 async function fetchModels(provider, baseUrl, apiKey) {
-    const base = baseUrl.replace(/\/+$/, "");
+    const base = normalizeDiscoveryBaseUrl(baseUrl);
     const resolvedKey = process.env[apiKey] ?? apiKey;
     // Try Anthropic-style first (for known anthropic or any provider)
     try {
@@ -274,7 +285,7 @@ async function setupProviderChoice(choice) {
     if (useCustomUrl) {
         const url = await p.text({
             message: t("provider.baseUrl", { label: info.label }),
-            placeholder: "https://proxy.example.com",
+            placeholder: t("provider.baseUrlPlaceholder"),
             validate: (v) => (!v || !v.startsWith("http")) ? t("provider.baseUrlValidation") : isUnsafeUrl(v) ? "URL must use HTTPS for remote hosts (private IPs blocked)" : undefined,
         });
         if (p.isCancel(url)) {
@@ -352,8 +363,11 @@ async function setupCustomProvider() {
         apiKey = await promptKey(name);
     }
     const { defaultModel, discoveredModels, api } = await selectModelWithMeta(name, name, [], baseUrl, apiKey);
+    const finalApi = isOpenAICompatibleApi(api)
+        ? await selectOpenAIApiMode(name, defaultModel)
+        : api;
     p.log.success(t("provider.customConfigured", { name, url: baseUrl }));
-    return { name, apiKey, defaultModel, baseUrl, api, discoveredModels };
+    return { name, apiKey, defaultModel, baseUrl, api: finalApi, discoveredModels };
 }
 /**
  * Select a default model by dynamically fetching available models, falling back to a static list or manual input.

package/dist/tui/provider-setup.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { isUnsafeUrl, resolveOpenAIApiMode } from "./provider-setup.js";
+import { isOpenAICompatibleApi, isUnsafeUrl, normalizeDiscoveryBaseUrl, resolveOpenAIApiMode } from "./provider-setup.js";
 describe("isUnsafeUrl", () => {
     it("https remote is safe", () => {
         expect(isUnsafeUrl("https://api.example.com")).toBe(false);
@@ -52,3 +52,31 @@ describe("resolveOpenAIApiMode", () => {
         expect(resolveOpenAIApiMode("auto", "gpt-4o")).toBe("openai-completions");
     });
 });
+describe("normalizeDiscoveryBaseUrl", () => {
+    it("keeps regular host URL", () => {
+        expect(normalizeDiscoveryBaseUrl("https://api.openai.com")).toBe("https://api.openai.com");
+    });
+    it("strips trailing slash", () => {
+        expect(normalizeDiscoveryBaseUrl("https://api.openai.com/")).toBe("https://api.openai.com");
+    });
+    it("strips trailing /v1 to avoid /v1/v1 probe", () => {
+        expect(normalizeDiscoveryBaseUrl("https://proxy.example.com/v1")).toBe("https://proxy.example.com");
+    });
+    it("strips trailing /v1/ to avoid /v1/v1 probe", () => {
+        expect(normalizeDiscoveryBaseUrl("http://localhost:11434/v1/")).toBe("http://localhost:11434");
+    });
+});
+describe("isOpenAICompatibleApi", () => {
+    it("treats undefined as openai-compatible", () => {
+        expect(isOpenAICompatibleApi(undefined)).toBe(true);
+    });
+    it("treats openai-completions as openai-compatible", () => {
+        expect(isOpenAICompatibleApi("openai-completions")).toBe(true);
+    });
+    it("treats openai-responses as openai-compatible", () => {
+        expect(isOpenAICompatibleApi("openai-responses")).toBe(true);
+    });
+    it("treats anthropic api as non-openai-compatible", () => {
+        expect(isOpenAICompatibleApi("anthropic-messages")).toBe(false);
+    });
+});

package/dist/utils/writers.js

@@ -88,16 +88,25 @@ export function writeModelConfig(agentDir, config) {
         return;
     const strategy = config.providerStrategy ?? "replace";
     const modelsPath = join(agentDir, "models.json");
-    const customProviders = config.providers.filter(p => p.baseUrl);
-    if (customProviders.length === 0)
+    // Persist custom endpoints and API mode overrides (e.g. built-in OpenAI responses/completions choice).
+    const modelProviders = config.providers.filter(p => p.baseUrl || (!!p.api && !!PROVIDERS[p.name]));
+    if (modelProviders.length === 0)
         return;
     const providers = strategy === "add"
         ? (readJson(modelsPath)?.providers ?? {})
         : {};
-    for (const cp of customProviders) {
+    for (const cp of modelProviders) {
         const isBuiltin = !!PROVIDERS[cp.name];
+        if (!cp.baseUrl && isBuiltin && cp.api) {
+            providers[cp.name] = { api: cp.api };
+            continue;
+        }
+        if (!cp.baseUrl)
+            continue;
         if (isBuiltin && !cp.discoveredModels?.length) {
             const entry = { baseUrl: cp.baseUrl };
+            if (cp.api)
+                entry.api = cp.api;
             if (cp.apiKey !== "none")
                 entry.apiKey = cp.apiKey;
             providers[cp.name] = entry;

package/dist/utils/writers.test.js

@@ -107,6 +107,41 @@ describe("provider keep strategy", () => {
         expect(text).toContain("\"custom-openai\"");
         expect(text).toContain("\"openai-responses\"");
     });
+    it("writeModelConfig persists API mode for builtin OpenAI without custom baseUrl", () => {
+        const dir = makeTempDir();
+        writeModelConfig(dir, makeConfig({
+            providerStrategy: "replace",
+            providers: [{
+                    name: "openai",
+                    apiKey: "OPENAI_API_KEY",
+                    defaultModel: "gpt-5",
+                    api: "openai-responses",
+                }],
+        }));
+        const modelsPath = join(dir, "models.json");
+        expect(existsSync(modelsPath)).toBe(true);
+        const models = JSON.parse(readFileSync(modelsPath, "utf8"));
+        expect(models.providers.openai.api).toBe("openai-responses");
+        expect(models.providers.openai.baseUrl).toBeUndefined();
+    });
+    it("writeModelConfig keeps API mode when overriding builtin baseUrl without discovered models", () => {
+        const dir = makeTempDir();
+        writeModelConfig(dir, makeConfig({
+            providerStrategy: "replace",
+            providers: [{
+                    name: "openai",
+                    apiKey: "OPENAI_API_KEY",
+                    baseUrl: "https://api.openai.com/v1",
+                    defaultModel: "gpt-4o",
+                    api: "openai-responses",
+                }],
+        }));
+        const modelsPath = join(dir, "models.json");
+        expect(existsSync(modelsPath)).toBe(true);
+        const models = JSON.parse(readFileSync(modelsPath, "utf8"));
+        expect(models.providers.openai.baseUrl).toBe("https://api.openai.com/v1");
+        expect(models.providers.openai.api).toBe("openai-responses");
+    });
     it("writeProviderEnv merges auth/settings when strategy is add", () => {
         const dir = makeTempDir();
         const settingsPath = join(dir, "settings.json");

package/package.json

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