oh-pi 0.1.82 → 0.1.84

package/dist/index.js

@@ -1,15 +1,9 @@
-import chalk from "chalk";
 import { selectLanguage, getLocale } from "./i18n.js";
-import { t } from "./i18n.js";
 import { welcome } from "./tui/welcome.js";
 import { selectMode } from "./tui/mode-select.js";
 import { setupProviders } from "./tui/provider-setup.js";
 import { selectPreset } from "./tui/preset-select.js";
-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 { runConfigWizard } from "./tui/config-wizard.js";
 import { confirmApply } from "./tui/confirm-apply.js";
 import { detectEnv } from "./utils/detect.js";
 import { EXTENSIONS } from "./registry.js";
@@ -58,7 +52,7 @@ async function quickFlow(env) {
  */
 async function presetFlow(env) {
     const preset = await selectPreset();
-    return runTabbedFlow(env, preset);
+    return runConfigWizard(env, preset);
 }
 /**
  * 自定义配置流程。用户逐项选择主题、快捷键、扩展、代理等，并可配置高级选项（如自动压缩阈值）。
@@ -67,121 +61,13 @@ async function presetFlow(env) {
  */
 async function customFlow(env) {
     const defaultExtensions = EXTENSIONS.filter(e => e.default).map(e => e.name);
-    return runTabbedFlow(env, {
+    const initial = {
         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 = 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 {
-        providers: finalProviderSetup.providers,
-        providerStrategy: finalProviderSetup.providerStrategy,
-        theme,
-        keybindings,
-        extensions,
-        prompts: initial.prompts,
-        agents,
-        thinking: initial.thinking,
     };
-}
-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(", ") });
-}
-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"))}`,
-    ];
+    return runConfigWizard(env, initial);
 }

package/dist/locales.js

@@ -28,6 +28,7 @@ export const messages = {
         "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.finishReady": "Required sections complete. Proceed to review and apply.",
         "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",
@@ -195,6 +196,7 @@ export const messages = {
         "custom.tabFinish": "完成",
         "custom.tabFinishHint": "下一步可预览并应用",
         "custom.tabFinishHelp": "按 F 完成；在其他页面按 Enter 进入编辑。",
+        "custom.finishReady": "必填项已完成，可进入预览并应用。",
         "custom.tabControls": "操作：←/→ 切换标签 · Enter 编辑当前标签 · 1-5 快速跳转 · F 完成 · Ctrl+C 取消",
         "custom.needProviders": "请先配置 Providers。",
         "custom.providersUnset": "Providers：未配置",
@@ -353,6 +355,7 @@ export const messages = {
         "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.finishReady": "Sections obligatoires terminées. Passez à la revue puis appliquez.",
         "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",

package/dist/tui/agents-select.d.ts

@@ -6,4 +6,4 @@
  *
  * @returns The selected agent template identifier string.
  */
-export declare function selectAgents(): Promise<string>;
+export declare function selectAgents(initialValue?: string): Promise<string>;

package/dist/tui/agents-select.js

@@ -8,7 +8,7 @@ import { t } from "../i18n.js";
  *
  * @returns The selected agent template identifier string.
  */
-export async function selectAgents() {
+export async function selectAgents(initialValue) {
     const agent = await p.select({
         message: t("agent.select"),
         options: [
@@ -18,6 +18,7 @@ export async function selectAgents() {
             { value: "data-ai-engineer", label: t("agent.dataai"), hint: t("agent.dataaiHint") },
             { value: "colony-operator", label: t("agent.colony"), hint: t("agent.colonyHint") },
         ],
+        initialValue,
     });
     if (p.isCancel(agent)) {
         p.cancel(t("cancelled"));

package/dist/tui/config-wizard.d.ts

@@ -0,0 +1,6 @@
+import type { OhPConfig } from "../types.js";
+import type { EnvInfo } from "../utils/detect.js";
+import { type ProviderSetupResult } from "./provider-setup.js";
+export type WizardBaseConfig = Pick<OhPConfig, "theme" | "keybindings" | "extensions" | "prompts" | "agents" | "thinking">;
+export declare function runConfigWizard(env: EnvInfo, initial: WizardBaseConfig): Promise<OhPConfig>;
+export declare function summarizeProviders(setup: ProviderSetupResult | null): string;

package/dist/tui/config-wizard.js

@@ -0,0 +1,126 @@
+import * as p from "@clack/prompts";
+import chalk from "chalk";
+import { t } from "../i18n.js";
+import { EXTENSIONS } from "../registry.js";
+import { selectAgents } from "./agents-select.js";
+import { selectExtensions } from "./extension-select.js";
+import { selectKeybindings } from "./keybinding-select.js";
+import { setupProviders } from "./provider-setup.js";
+import { selectTheme } from "./theme-select.js";
+function sectionLabel(label, done) {
+    return done
+        ? `${label} ${chalk.green("✓")}`
+        : `${label} ${chalk.yellow("•")}`;
+}
+function summarizeAppearance(theme, keybindings) {
+    return `${t("confirm.theme")} ${theme} · ${t("confirm.keybindings")} ${keybindings}`;
+}
+function summarizeFeatures(extensions) {
+    return t("custom.tabFeaturesHint", { count: extensions.length });
+}
+function summarizeAgents(agents) {
+    return `${t("confirm.agents")} ${agents}`;
+}
+function buildWizardOptions(state) {
+    return [
+        {
+            value: "providers",
+            label: sectionLabel(t("custom.tabProviders"), !!state.providerSetup),
+            hint: summarizeProviders(state.providerSetup),
+        },
+        {
+            value: "appearance",
+            label: sectionLabel(t("custom.tabAppearance"), true),
+            hint: summarizeAppearance(state.theme, state.keybindings),
+        },
+        {
+            value: "features",
+            label: sectionLabel(t("custom.tabFeatures"), true),
+            hint: summarizeFeatures(state.extensions),
+        },
+        {
+            value: "agents",
+            label: sectionLabel(t("custom.tabAgents"), true),
+            hint: summarizeAgents(state.agents),
+        },
+        {
+            value: "finish",
+            label: sectionLabel(t("custom.tabFinish"), !!state.providerSetup),
+            hint: state.providerSetup ? t("custom.finishReady") : t("custom.needProviders"),
+        },
+    ];
+}
+export async function runConfigWizard(env, initial) {
+    const defaultExtensions = EXTENSIONS.filter(e => e.default).map(e => e.name);
+    const state = {
+        providerSetup: null,
+        theme: initial.theme,
+        keybindings: initial.keybindings,
+        extensions: initial.extensions.length > 0 ? [...initial.extensions] : defaultExtensions,
+        prompts: initial.prompts,
+        agents: initial.agents,
+        thinking: initial.thinking,
+    };
+    let nextStep = "providers";
+    while (true) {
+        const step = await p.select({
+            message: t("custom.tabPrompt"),
+            options: buildWizardOptions(state),
+            initialValue: nextStep,
+        });
+        if (p.isCancel(step)) {
+            p.cancel(t("cancelled"));
+            process.exit(0);
+        }
+        if (step === "providers") {
+            state.providerSetup = await setupProviders(env);
+            nextStep = "appearance";
+            continue;
+        }
+        if (step === "appearance") {
+            state.theme = await selectTheme(state.theme);
+            state.keybindings = await selectKeybindings(state.keybindings);
+            nextStep = "features";
+            continue;
+        }
+        if (step === "features") {
+            state.extensions = await selectExtensions(state.extensions);
+            nextStep = "agents";
+            continue;
+        }
+        if (step === "agents") {
+            state.agents = await selectAgents(state.agents);
+            nextStep = "finish";
+            continue;
+        }
+        if (!state.providerSetup) {
+            p.log.warn(t("custom.needProviders"));
+            nextStep = "providers";
+            continue;
+        }
+        return {
+            providers: state.providerSetup.providers,
+            providerStrategy: state.providerSetup.providerStrategy,
+            theme: state.theme,
+            keybindings: state.keybindings,
+            extensions: state.extensions,
+            prompts: state.prompts,
+            agents: state.agents,
+            thinking: state.thinking,
+        };
+    }
+}
+export 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/tui/config-wizard.test.d.ts

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

package/dist/tui/config-wizard.test.js

@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import { summarizeProviders } from "./config-wizard.js";
+const setup = (overrides) => ({
+    providerStrategy: "replace",
+    providers: [],
+    ...overrides,
+});
+describe("summarizeProviders", () => {
+    it("returns unset copy when setup is missing", () => {
+        expect(summarizeProviders(null)).toBe("Providers: not configured");
+    });
+    it("returns keep strategy copy", () => {
+        expect(summarizeProviders(setup({ providerStrategy: "keep" }))).toBe("keep existing");
+    });
+    it("returns add copy with provider list", () => {
+        expect(summarizeProviders(setup({
+            providerStrategy: "add",
+            providers: [{ name: "openai", apiKey: "OPENAI_API_KEY", defaultModel: "gpt-4o" }],
+        }))).toBe("Add fallback providers: openai");
+    });
+    it("returns add fallback copy without providers", () => {
+        expect(summarizeProviders(setup({ providerStrategy: "add", providers: [] }))).toBe("keep existing and add fallback providers");
+    });
+    it("returns replace summary with provider list", () => {
+        expect(summarizeProviders(setup({
+            providerStrategy: "replace",
+            providers: [{ name: "anthropic", apiKey: "ANTHROPIC_API_KEY", defaultModel: "claude-sonnet-4-20250514" }],
+        }))).toBe("Replace providers with: anthropic");
+    });
+});

package/dist/tui/extension-select.d.ts

@@ -3,4 +3,4 @@
  * Exits the process if the user cancels the selection.
  * @returns A promise that resolves to an array of selected extension names.
  */
-export declare function selectExtensions(): Promise<string[]>;
+export declare function selectExtensions(initialValues?: string[]): Promise<string[]>;

package/dist/tui/extension-select.js

@@ -6,14 +6,18 @@ import { EXTENSIONS } from "../registry.js";
  * Exits the process if the user cancels the selection.
  * @returns A promise that resolves to an array of selected extension names.
  */
-export async function selectExtensions() {
+export async function selectExtensions(initialValues) {
+    const fallbackDefaults = EXTENSIONS.filter(e => e.default).map(e => e.name);
+    const validValues = new Set(EXTENSIONS.map(e => e.name));
+    const seeded = (initialValues && initialValues.length > 0 ? initialValues : fallbackDefaults)
+        .filter(name => validValues.has(name));
     const exts = await p.multiselect({
         message: t("ext.select"),
         options: EXTENSIONS.map(e => ({
             value: e.name,
             label: e.label,
         })),
-        initialValues: EXTENSIONS.filter(e => e.default).map(e => e.name),
+        initialValues: seeded,
     });
     if (p.isCancel(exts)) {
         p.cancel(t("cancelled"));

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

@@ -10,5 +10,13 @@ interface HorizontalTabsOptions {
     canFinish: () => boolean;
     finishBlockedMessage?: () => string;
 }
+type TabAction = "left" | "right" | "edit" | "finish" | "cancel" | {
+    jump: number;
+};
+interface KeypressLike {
+    name?: string;
+    ctrl?: boolean;
+}
+export declare function mapTabAction(str: string, key: KeypressLike, tabCount: number): TabAction | null;
 export declare function runHorizontalTabs(opts: HorizontalTabsOptions): Promise<void>;
 export {};

package/dist/tui/horizontal-tabs.js

@@ -5,6 +5,24 @@ import { t } from "../i18n.js";
 function clearScreen() {
     process.stdout.write("\x1b[2J\x1b[H");
 }
+export function mapTabAction(str, key, tabCount) {
+    if (key.ctrl && key.name === "c")
+        return "cancel";
+    if (key.name === "left")
+        return "left";
+    if (key.name === "right")
+        return "right";
+    if (key.name === "return" || key.name === "enter" || key.name === "space" || key.name === "e")
+        return "edit";
+    if (key.name === "f")
+        return "finish";
+    if (/^[1-9]$/.test(str)) {
+        const idx = Number(str) - 1;
+        if (idx >= 0 && idx < tabCount)
+            return { jump: idx };
+    }
+    return null;
+}
 function waitForAction(tabCount) {
     return new Promise((resolve) => {
         const stdin = process.stdin;
@@ -19,21 +37,9 @@ function waitForAction(tabCount) {
             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 });
-            }
+            const action = mapTabAction(str, key, tabCount);
+            if (action)
+                done(action);
         };
         stdin.on("keypress", onKeypress);
         if (!stdin.isTTY) {

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

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

package/dist/tui/horizontal-tabs.test.js

@@ -0,0 +1,17 @@
+import { describe, it, expect } from "vitest";
+import { mapTabAction } from "./horizontal-tabs.js";
+describe("mapTabAction", () => {
+    it("maps enter and return to edit", () => {
+        expect(mapTabAction("", { name: "enter" }, 5)).toBe("edit");
+        expect(mapTabAction("", { name: "return" }, 5)).toBe("edit");
+    });
+    it("maps arrows and finish", () => {
+        expect(mapTabAction("", { name: "left" }, 5)).toBe("left");
+        expect(mapTabAction("", { name: "right" }, 5)).toBe("right");
+        expect(mapTabAction("", { name: "f" }, 5)).toBe("finish");
+    });
+    it("maps jump index within range", () => {
+        expect(mapTabAction("3", { name: "3" }, 5)).toEqual({ jump: 2 });
+        expect(mapTabAction("9", { name: "9" }, 5)).toBeNull();
+    });
+});

package/dist/tui/keybinding-select.d.ts

@@ -5,4 +5,4 @@
  *
  * @returns The name of the selected keybinding scheme.
  */
-export declare function selectKeybindings(): Promise<string>;
+export declare function selectKeybindings(initialValue?: string): Promise<string>;

package/dist/tui/keybinding-select.js

@@ -7,7 +7,7 @@ import { t } from "../i18n.js";
  *
  * @returns The name of the selected keybinding scheme.
  */
-export async function selectKeybindings() {
+export async function selectKeybindings(initialValue) {
     const kb = await p.select({
         message: t("kb.select"),
         options: [
@@ -15,6 +15,7 @@ export async function selectKeybindings() {
             { value: "vim", label: t("kb.vim"), hint: t("kb.vimHint") },
             { value: "emacs", label: t("kb.emacs"), hint: t("kb.emacsHint") },
         ],
+        initialValue,
     });
     if (p.isCancel(kb)) {
         p.cancel(t("cancelled"));

package/dist/tui/theme-select.d.ts

@@ -3,4 +3,4 @@
  * Exits the process if the user cancels the selection.
  * @returns The name of the selected theme.
  */
-export declare function selectTheme(): Promise<string>;
+export declare function selectTheme(initialValue?: string): Promise<string>;

package/dist/tui/theme-select.js

@@ -6,13 +6,14 @@ import { THEMES } from "../registry.js";
  * Exits the process if the user cancels the selection.
  * @returns The name of the selected theme.
  */
-export async function selectTheme() {
+export async function selectTheme(initialValue) {
     const theme = await p.select({
         message: t("theme.select"),
         options: THEMES.map(th => ({
             value: th.name,
             label: `${th.style === "dark" ? "🌙" : "☀️"} ${th.label}`,
         })),
+        initialValue,
     });
     if (p.isCancel(theme)) {
         p.cancel(t("cancelled"));

package/package.json

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