oh-pi 0.1.81 → 0.1.82

package/dist/index.js

@@ -1,4 +1,3 @@
-import * as p from "@clack/prompts";
 import chalk from "chalk";
 import { selectLanguage, getLocale } from "./i18n.js";
 import { t } from "./i18n.js";
@@ -10,6 +9,7 @@ import { selectTheme } from "./tui/theme-select.js";
 import { selectKeybindings } from "./tui/keybinding-select.js";
 import { selectExtensions } from "./tui/extension-select.js";
 import { selectAgents } from "./tui/agents-select.js";
+import { runHorizontalTabs } from "./tui/horizontal-tabs.js";
 import { confirmApply } from "./tui/confirm-apply.js";
 import { detectEnv } from "./utils/detect.js";
 import { EXTENSIONS } from "./registry.js";
@@ -58,8 +58,7 @@ async function quickFlow(env) {
  */
 async function presetFlow(env) {
     const preset = await selectPreset();
-    const providerSetup = await setupProviders(env);
-    return { ...preset, ...providerSetup };
+    return runTabbedFlow(env, preset);
 }
 /**
  * 自定义配置流程。用户逐项选择主题、快捷键、扩展、代理等，并可配置高级选项（如自动压缩阈值）。
@@ -67,67 +66,95 @@ async function presetFlow(env) {
  * @returns 生成的配置对象
  */
 async function customFlow(env) {
+    const defaultExtensions = EXTENSIONS.filter(e => e.default).map(e => e.name);
+    return runTabbedFlow(env, {
+        theme: "dark",
+        keybindings: "default",
+        extensions: defaultExtensions,
+        prompts: ["review", "fix", "explain", "commit", "test", "refactor", "optimize", "security", "document", "pr"],
+        agents: "general-developer",
+        thinking: "medium",
+    });
+}
+async function runTabbedFlow(env, initial) {
     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;
+    let theme = initial.theme;
+    let keybindings = initial.keybindings;
+    let extensions = initial.extensions.length > 0 ? [...initial.extensions] : defaultExtensions;
+    let agents = initial.agents;
+    await runHorizontalTabs({
+        title: t("custom.tabHeader"),
+        canFinish: () => !!providerSetup,
+        finishBlockedMessage: () => t("custom.needProviders"),
+        tabs: [
+            {
+                label: t("custom.tabProviders"),
+                summary: () => summarizeProviders(providerSetup),
+                details: () => providerDetails(providerSetup),
+                edit: async () => {
+                    providerSetup = await setupProviders(env);
+                },
+            },
+            {
+                label: t("custom.tabAppearance"),
+                summary: () => `${t("confirm.theme")} ${theme} · ${t("confirm.keybindings")} ${keybindings}`,
+                details: () => [
+                    `${chalk.dim(t("confirm.theme"))} ${chalk.cyan(theme)}`,
+                    `${chalk.dim(t("confirm.keybindings"))} ${chalk.cyan(keybindings)}`,
+                ],
+                edit: async () => {
+                    theme = await selectTheme();
+                    keybindings = await selectKeybindings();
+                },
+            },
+            {
+                label: t("custom.tabFeatures"),
+                summary: () => t("custom.tabFeaturesHint", { count: extensions.length }),
+                details: () => [
+                    chalk.dim(t("confirm.extensions")),
+                    extensions.length > 0 ? `  ${extensions.join(", ")}` : `  ${t("confirm.none")}`,
+                ],
+                edit: async () => {
+                    extensions = await selectExtensions();
+                },
+            },
+            {
+                label: t("custom.tabAgents"),
+                summary: () => `${t("confirm.agents")} ${agents}`,
+                details: () => [
+                    `${chalk.dim(t("confirm.agents"))} ${chalk.cyan(agents)}`,
+                    `${chalk.dim(t("confirm.thinking"))} ${chalk.cyan(initial.thinking)}`,
+                ],
+                edit: async () => {
+                    agents = await selectAgents();
+                },
+            },
+            {
+                label: t("custom.tabFinish"),
+                summary: () => t("custom.tabFinishHint"),
+                details: () => [
+                    chalk.dim(t("custom.tabFinishHelp")),
+                ],
+                edit: async () => {
+                    // Finish tab is read-only; use key F to complete.
+                },
+            },
+        ],
+    });
+    if (!providerSetup) {
+        throw new Error("Provider setup is required before finishing tabbed flow");
     }
+    const finalProviderSetup = providerSetup;
     return {
-        ...providerSetup,
+        providers: finalProviderSetup.providers,
+        providerStrategy: finalProviderSetup.providerStrategy,
         theme,
         keybindings,
         extensions,
-        prompts: ["review", "fix", "explain", "commit", "test", "refactor", "optimize", "security", "document", "pr"],
+        prompts: initial.prompts,
         agents,
-        thinking: "medium",
+        thinking: initial.thinking,
     };
 }
 function summarizeProviders(setup) {
@@ -144,3 +171,17 @@ function summarizeProviders(setup) {
         return t("confirm.providerStrategyReplace");
     return t("custom.providersReplace", { list: setup.providers.map(p => p.name).join(", ") });
 }
+function providerDetails(setup) {
+    if (!setup)
+        return [chalk.dim(t("custom.needProviders"))];
+    if (setup.providerStrategy === "keep")
+        return [chalk.dim(t("confirm.providerStrategyKeep"))];
+    if (setup.providers.length === 0)
+        return [chalk.dim(t("confirm.none"))];
+    const primary = setup.providers[0];
+    return [
+        `${chalk.dim(t("confirm.providerStrategy"))} ${chalk.cyan(setup.providerStrategy)}`,
+        `${chalk.dim(t("confirm.providers"))} ${chalk.cyan(setup.providers.map(p => p.name).join(", "))}`,
+        `${chalk.dim(t("confirm.model"))} ${chalk.cyan(primary?.defaultModel ?? t("confirm.none"))}`,
+    ];
+}

package/dist/locales.js

@@ -27,6 +27,8 @@ export const messages = {
         "custom.tabAgents": "Agent Profile",
         "custom.tabFinish": "Finish",
         "custom.tabFinishHint": "Review in next step and apply",
+        "custom.tabFinishHelp": "Press F to finish. Press Enter on other tabs to edit.",
+        "custom.tabControls": "Controls: ←/→ switch tabs · Enter edit tab · 1-5 jump · F finish · Ctrl+C cancel",
         "custom.needProviders": "Please configure Providers first.",
         "custom.providersUnset": "Providers: not configured",
         "custom.providersAdd": "Add fallback providers: {list}",
@@ -70,6 +72,8 @@ export const messages = {
         "provider.apiModeResponsesHint": "Modern OpenAI API surface",
         "provider.apiModeCompletions": "Chat Completions API",
         "provider.apiModeCompletionsHint": "Legacy-compatible endpoint",
+        "provider.apiModeNext": "Next Step",
+        "provider.apiModeIntro": "After selecting a model, choose API mode: Responses or Chat Completions.",
         "provider.configureCaps": "Configure model capabilities? (context window, multimodal, reasoning)",
         "provider.contextWindow": "Context window size (tokens):",
         "provider.contextWindowValidation": "Must be a number ≥ 1024",
@@ -190,6 +194,8 @@ export const messages = {
         "custom.tabAgents": "Agent 模板",
         "custom.tabFinish": "完成",
         "custom.tabFinishHint": "下一步可预览并应用",
+        "custom.tabFinishHelp": "按 F 完成；在其他页面按 Enter 进入编辑。",
+        "custom.tabControls": "操作：←/→ 切换标签 · Enter 编辑当前标签 · 1-5 快速跳转 · F 完成 · Ctrl+C 取消",
         "custom.needProviders": "请先配置 Providers。",
         "custom.providersUnset": "Providers：未配置",
         "custom.providersAdd": "新增备用 Providers：{list}",
@@ -232,6 +238,8 @@ export const messages = {
         "provider.apiModeResponsesHint": "OpenAI 新版 API",
         "provider.apiModeCompletions": "Chat Completions API",
         "provider.apiModeCompletionsHint": "兼容旧接口",
+        "provider.apiModeNext": "下一步",
+        "provider.apiModeIntro": "选完模型后，需要再选择 API 模式：Responses 或 Chat Completions。",
         "provider.configureCaps": "配置模型能力？（上下文窗口、多模态、推理）",
         "provider.contextWindow": "上下文窗口大小（tokens）：",
         "provider.contextWindowValidation": "必须是 ≥ 1024 的数字",
@@ -344,6 +352,8 @@ export const messages = {
         "custom.tabAgents": "Profil Agent",
         "custom.tabFinish": "Terminer",
         "custom.tabFinishHint": "Prévisualiser puis appliquer à l'étape suivante",
+        "custom.tabFinishHelp": "Appuyez sur F pour terminer ; appuyez sur Entrée sur les autres onglets pour éditer.",
+        "custom.tabControls": "Contrôles : ←/→ changer d'onglet · Entrée éditer · 1-5 accès rapide · F terminer · Ctrl+C annuler",
         "custom.needProviders": "Veuillez d'abord configurer les fournisseurs.",
         "custom.providersUnset": "Fournisseurs : non configurés",
         "custom.providersAdd": "Ajouter des fournisseurs de secours : {list}",
@@ -386,6 +396,8 @@ export const messages = {
         "provider.apiModeResponsesHint": "Surface API OpenAI moderne",
         "provider.apiModeCompletions": "API Chat Completions",
         "provider.apiModeCompletionsHint": "Endpoint compatible historique",
+        "provider.apiModeNext": "Étape suivante",
+        "provider.apiModeIntro": "Après le choix du modèle, choisissez le mode API : Responses ou Chat Completions.",
         "provider.configureCaps": "Configurer les capacités du modèle ? (fenêtre de contexte, multimodal, raisonnement)",
         "provider.contextWindow": "Taille de la fenêtre de contexte (tokens) :",
         "provider.contextWindowValidation": "Doit être un nombre ≥ 1024",

package/dist/tui/horizontal-tabs.d.ts

@@ -0,0 +1,14 @@
+export interface HorizontalTabItem {
+    label: string;
+    summary: () => string;
+    details?: () => string[];
+    edit: () => Promise<void>;
+}
+interface HorizontalTabsOptions {
+    title: string;
+    tabs: HorizontalTabItem[];
+    canFinish: () => boolean;
+    finishBlockedMessage?: () => string;
+}
+export declare function runHorizontalTabs(opts: HorizontalTabsOptions): Promise<void>;
+export {};

package/dist/tui/horizontal-tabs.js

@@ -0,0 +1,106 @@
+import * as p from "@clack/prompts";
+import chalk from "chalk";
+import { emitKeypressEvents } from "node:readline";
+import { t } from "../i18n.js";
+function clearScreen() {
+    process.stdout.write("\x1b[2J\x1b[H");
+}
+function waitForAction(tabCount) {
+    return new Promise((resolve) => {
+        const stdin = process.stdin;
+        const isRawCapable = !!stdin.isTTY && typeof stdin.setRawMode === "function";
+        emitKeypressEvents(stdin);
+        if (isRawCapable)
+            stdin.setRawMode(true);
+        const done = (action) => {
+            stdin.off("keypress", onKeypress);
+            if (isRawCapable)
+                stdin.setRawMode(false);
+            resolve(action);
+        };
+        const onKeypress = (str, key) => {
+            if (key.ctrl && key.name === "c")
+                return done("cancel");
+            if (key.name === "left")
+                return done("left");
+            if (key.name === "right")
+                return done("right");
+            if (key.name === "return" || key.name === "space" || key.name === "e")
+                return done("edit");
+            if (key.name === "f")
+                return done("finish");
+            if (/^[1-9]$/.test(str)) {
+                const idx = Number(str) - 1;
+                if (idx >= 0 && idx < tabCount)
+                    return done({ jump: idx });
+            }
+        };
+        stdin.on("keypress", onKeypress);
+        if (!stdin.isTTY) {
+            done("cancel");
+        }
+    });
+}
+function renderTabs(title, tabs, activeIndex, notice) {
+    clearScreen();
+    console.log(chalk.bold(title));
+    console.log();
+    const tabLine = tabs
+        .map((tab, i) => {
+        const label = `${i + 1}. ${tab.label}`;
+        return i === activeIndex
+            ? chalk.bgCyan.black(` ${label} `)
+            : chalk.gray(` ${label} `);
+    })
+        .join(chalk.gray("  |  "));
+    console.log(tabLine);
+    console.log(chalk.dim(t("custom.tabControls")));
+    console.log();
+    const active = tabs[activeIndex];
+    console.log(chalk.cyan(active.summary()));
+    const details = active.details?.() ?? [];
+    for (const line of details)
+        console.log(line);
+    if (notice) {
+        console.log();
+        console.log(chalk.yellow(notice));
+    }
+}
+export async function runHorizontalTabs(opts) {
+    const tabs = opts.tabs;
+    let activeIndex = 0;
+    let notice;
+    while (true) {
+        renderTabs(opts.title, tabs, activeIndex, notice);
+        notice = undefined;
+        const action = await waitForAction(tabs.length);
+        if (action === "cancel") {
+            p.cancel(t("cancelled"));
+            process.exit(0);
+        }
+        if (action === "left") {
+            activeIndex = (activeIndex - 1 + tabs.length) % tabs.length;
+            continue;
+        }
+        if (action === "right") {
+            activeIndex = (activeIndex + 1) % tabs.length;
+            continue;
+        }
+        if (action === "finish") {
+            if (opts.canFinish()) {
+                clearScreen();
+                return;
+            }
+            notice = opts.finishBlockedMessage?.() ?? t("custom.needProviders");
+            continue;
+        }
+        if (action === "edit") {
+            await tabs[activeIndex].edit();
+            continue;
+        }
+        if (typeof action === "object" && "jump" in action) {
+            activeIndex = action.jump;
+            continue;
+        }
+    }
+}

package/dist/tui/provider-setup.js

@@ -310,7 +310,7 @@ async function setupProviderChoice(choice) {
     const { defaultModel, discoveredModels, api } = await selectModelWithMeta(name, info.label, info.models, fetchUrl, apiKey);
     let finalApi = api;
     if (name === "openai") {
-        finalApi = await selectOpenAIApiMode(info.label, defaultModel);
+        finalApi = await selectOpenAIApiModeWithHint(info.label, defaultModel);
     }
     p.log.success(t("provider.configured", { label: info.label }));
     return { name, apiKey, defaultModel, baseUrl, api: finalApi, discoveredModels };
@@ -330,6 +330,10 @@ async function selectOpenAIApiMode(label, defaultModel) {
     }
     return resolveOpenAIApiMode(selected, defaultModel);
 }
+async function selectOpenAIApiModeWithHint(label, defaultModel) {
+    p.note(t("provider.apiModeIntro"), t("provider.apiModeNext"));
+    return selectOpenAIApiMode(label, defaultModel);
+}
 /**
  * Interactively configure a custom provider (Ollama, vLLM, or other OpenAI-compatible endpoints).
  * @returns Custom provider config, or null if cancelled
@@ -364,7 +368,7 @@ async function setupCustomProvider() {
     }
     const { defaultModel, discoveredModels, api } = await selectModelWithMeta(name, name, [], baseUrl, apiKey);
     const finalApi = isOpenAICompatibleApi(api)
-        ? await selectOpenAIApiMode(name, defaultModel)
+        ? await selectOpenAIApiModeWithHint(name, defaultModel)
         : api;
     p.log.success(t("provider.customConfigured", { name, url: baseUrl }));
     return { name, apiKey, defaultModel, baseUrl, api: finalApi, discoveredModels };

package/dist/utils/install.d.ts

@@ -11,6 +11,10 @@ export declare function syncDir(src: string, dest: string): void;
  * 应用 OhP 配置，生成并写入 ~/.pi/agent/ 下的所有配置文件
  */
 export declare function applyConfig(config: OhPConfig): void;
+/**
+ * Remove all files/dirs managed by oh-pi before strict replace apply.
+ */
+export declare function cleanupManagedConfig(agentDir: string): void;
 /**
  * 全局安装 pi-coding-agent，安装失败时抛出异常
  */

package/dist/utils/install.js

@@ -3,6 +3,17 @@ import { join } from "node:path";
 import { homedir } from "node:os";
 import { execSync } from "node:child_process";
 import { writeProviderEnv, writeModelConfig, writeKeybindings, writeAgents, writeExtensions, writePrompts, writeSkills, writeTheme } from "./writers.js";
+const MANAGED_CONFIG_ENTRIES = [
+    "auth.json",
+    "settings.json",
+    "models.json",
+    "keybindings.json",
+    "AGENTS.md",
+    "extensions",
+    "prompts",
+    "skills",
+    "themes",
+];
 /**
  * 确保目录存在，若不存在则递归创建
  */
@@ -62,6 +73,9 @@ function copyDir(src, dest) {
 export function applyConfig(config) {
     const agentDir = join(homedir(), ".pi", "agent");
     ensureDir(agentDir);
+    if ((config.providerStrategy ?? "replace") === "replace") {
+        cleanupManagedConfig(agentDir);
+    }
     writeProviderEnv(agentDir, config);
     writeModelConfig(agentDir, config);
     writeKeybindings(agentDir, config);
@@ -71,6 +85,14 @@ export function applyConfig(config) {
     writeSkills(agentDir, config);
     writeTheme(agentDir, config);
 }
+/**
+ * Remove all files/dirs managed by oh-pi before strict replace apply.
+ */
+export function cleanupManagedConfig(agentDir) {
+    for (const entry of MANAGED_CONFIG_ENTRIES) {
+        rmSync(join(agentDir, entry), { recursive: true, force: true });
+    }
+}
 /**
  * 全局安装 pi-coding-agent，安装失败时抛出异常
  */

package/dist/utils/install.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/install.test.js

@@ -0,0 +1,49 @@
+import { describe, it, expect, afterEach } from "vitest";
+import { existsSync, mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { cleanupManagedConfig } from "./install.js";
+const tempDirs = [];
+function makeTempDir() {
+    const dir = mkdtempSync(join(tmpdir(), "oh-pi-install-"));
+    tempDirs.push(dir);
+    return dir;
+}
+afterEach(() => {
+    for (const dir of tempDirs.splice(0)) {
+        rmSync(dir, { recursive: true, force: true });
+    }
+});
+describe("cleanupManagedConfig", () => {
+    it("removes managed files and directories while preserving unmanaged data", () => {
+        const dir = makeTempDir();
+        writeFileSync(join(dir, "auth.json"), "{}");
+        writeFileSync(join(dir, "settings.json"), "{}");
+        writeFileSync(join(dir, "models.json"), "{}");
+        writeFileSync(join(dir, "keybindings.json"), "{}");
+        writeFileSync(join(dir, "AGENTS.md"), "# test");
+        mkdirSync(join(dir, "extensions"), { recursive: true });
+        writeFileSync(join(dir, "extensions", "x.ts"), "export default {}");
+        mkdirSync(join(dir, "prompts"), { recursive: true });
+        writeFileSync(join(dir, "prompts", "x.md"), "prompt");
+        mkdirSync(join(dir, "skills"), { recursive: true });
+        writeFileSync(join(dir, "skills", "x.md"), "skill");
+        mkdirSync(join(dir, "themes"), { recursive: true });
+        writeFileSync(join(dir, "themes", "x.json"), "{}");
+        mkdirSync(join(dir, "sessions"), { recursive: true });
+        writeFileSync(join(dir, "sessions", "keep.json"), "{}");
+        writeFileSync(join(dir, "pi-crash.log"), "keep");
+        cleanupManagedConfig(dir);
+        expect(existsSync(join(dir, "auth.json"))).toBe(false);
+        expect(existsSync(join(dir, "settings.json"))).toBe(false);
+        expect(existsSync(join(dir, "models.json"))).toBe(false);
+        expect(existsSync(join(dir, "keybindings.json"))).toBe(false);
+        expect(existsSync(join(dir, "AGENTS.md"))).toBe(false);
+        expect(existsSync(join(dir, "extensions"))).toBe(false);
+        expect(existsSync(join(dir, "prompts"))).toBe(false);
+        expect(existsSync(join(dir, "skills"))).toBe(false);
+        expect(existsSync(join(dir, "themes"))).toBe(false);
+        expect(existsSync(join(dir, "sessions", "keep.json"))).toBe(true);
+        expect(existsSync(join(dir, "pi-crash.log"))).toBe(true);
+    });
+});

package/package.json

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