minimal-agent 0.8.2 → 0.10.0

package/src/cli/wizards/advisorWizard.js

@@ -0,0 +1,147 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * ============================================================
+ *  src/cli/wizards/advisorWizard.tsx —— 顾问模型子向导
+ * ------------------------------------------------------------
+ *  v4 模型列表 schema 下，顾问不再自带一整套独立凭据——默认从已配置的模型列表
+ *  选一个复用。但顾问常常需要一个跟基座完全不同的 provider（对比不同模型的
+ *  第二意见才有意义），而 CLI 的「配置基座模型」向导只管理基座这一个槽位、
+ *  没有别的入口能新增模型——所以这里的模型选择字段里多一项「+ 新建模型」，
+ *  选它会先走一小段收集新模型字段的表单，新建成功后再回落到常规的顾问行为
+ *  字段（启用/调用模式/预算/超时/敏感共享）。三阶段状态机，全部落盘只发生在
+ *  最后一步提交时（ESC 在任何阶段取消都不留半成品模型）。
+ * ============================================================
+ */
+import { useState } from 'react';
+import { configService } from '../../config/configService.js';
+import { FieldForm } from './fieldForm.js';
+const NEW_MODEL_OPTION = '+ 新建模型（作为顾问专用，可与基座用不同 provider）';
+function parsePositiveInt(value, fallback) {
+    const parsed = Number.parseInt(String(value ?? ''), 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+export function AdvisorWizard({ existing, models, onDone, onCancel }) {
+    const enabledModels = models.filter((m) => m.enabled);
+    const labelFor = (m, index) => `${index + 1}. ${m.displayName || m.model}`;
+    const existingOptions = enabledModels.map(labelFor);
+    const labelToId = new Map(enabledModels.map((m, i) => [labelFor(m, i), m.id]));
+    const currentLabel = (() => {
+        const index = enabledModels.findIndex((m) => m.id === existing?.modelId);
+        return index >= 0 ? labelFor(enabledModels[index], index) : undefined;
+    })();
+    const [phase, setPhase] = useState('model-choice');
+    const [chosenModelId, setChosenModelId] = useState(null);
+    const [newModelDraft, setNewModelDraft] = useState(null);
+    if (phase === 'model-choice') {
+        return (_jsx(FieldForm, { title: "\u914D\u7F6E\u987E\u95EE\u6A21\u578B\uFF08Advisor \u5DE5\u5177\uFF09", fields: [
+                {
+                    key: 'modelLabel',
+                    label: '使用哪个模型',
+                    type: 'select',
+                    options: [...existingOptions, NEW_MODEL_OPTION],
+                    default: currentLabel ?? (existingOptions[0] ?? NEW_MODEL_OPTION),
+                    hint: enabledModels.length === 0
+                        ? '还没有已配置的模型，只能新建'
+                        : '可以直接复用基座模型，也可以新建一个专属 provider',
+                },
+            ], onSubmit: async (values) => {
+                const label = String(values.modelLabel ?? '');
+                if (label === NEW_MODEL_OPTION) {
+                    setPhase('new-model');
+                    return;
+                }
+                const id = labelToId.get(label);
+                if (!id)
+                    throw new Error('请选择一个模型');
+                setChosenModelId(id);
+                setPhase('advisor-fields');
+            }, onCancel: onCancel }));
+    }
+    if (phase === 'new-model') {
+        return (_jsx(FieldForm, { title: "\u65B0\u5EFA\u987E\u95EE\u4E13\u7528\u6A21\u578B\uFF08\u56FA\u5B9A OpenAI \u517C\u5BB9\u683C\u5F0F\uFF1BAnthropic \u683C\u5F0F\u8BF7\u7528 Desktop \u6DFB\u52A0\uFF09", fields: [
+                { key: 'baseURL', label: 'API 完整端点地址（含 /chat/completions 后缀）', type: 'text', default: '' },
+                { key: 'apiKey', label: 'API Key', type: 'password', default: '' },
+                { key: 'model', label: 'Model', type: 'text', default: '' },
+                { key: 'contextWindow', label: 'Context Window（token 数）', type: 'text', default: '128000', optional: true },
+            ], onSubmit: async (values) => {
+                const baseURL = String(values.baseURL ?? '').trim();
+                const apiKey = String(values.apiKey ?? '').trim();
+                const model = String(values.model ?? '').trim();
+                if (!baseURL || !apiKey || !model)
+                    throw new Error('Base URL / API Key / Model 均不能为空');
+                setNewModelDraft({
+                    baseURL,
+                    apiKey,
+                    model,
+                    contextWindow: parsePositiveInt(values.contextWindow, 128_000),
+                    supportsVision: true,
+                });
+                setPhase('advisor-fields');
+            }, onCancel: onCancel }));
+    }
+    // phase === 'advisor-fields'
+    return (_jsx(FieldForm, { title: "\u914D\u7F6E\u987E\u95EE\u6A21\u578B \u00B7 \u884C\u4E3A\u8BBE\u7F6E", fields: [
+            { key: 'enabled', label: '是否启用', type: 'boolean', default: existing?.enabled ?? true },
+            {
+                key: 'mode',
+                label: '调用模式',
+                type: 'select',
+                options: ['auto', 'manual'],
+                default: existing?.mode ?? 'auto',
+                hint: 'auto=主循环自主判断时机调用 · manual=仅 /advisor ask 手动触发',
+            },
+            {
+                key: 'timeoutSeconds',
+                label: '最长等待（秒）',
+                type: 'text',
+                default: String(Math.round((existing?.timeoutMs ?? 180_000) / 1000)),
+                optional: true,
+            },
+            {
+                key: 'shareSensitive',
+                label: '是否允许把敏感内容一并发给顾问',
+                type: 'boolean',
+                default: existing?.shareSensitive ?? false,
+            },
+        ], onSubmit: async (values) => {
+            // 只在这最后一步才真正落盘——ESC 在任何前置阶段取消都不留半成品模型。
+            // newModelDraft 在 add 成功后立即清空 + 把新 id 记入 chosenModelId：若紧接着
+            // 的顾问 patch 失败，FieldForm 在同一 phase 内回到第 1 项重试会重新调这个
+            // onSubmit，若不清空 newModelDraft 会重新执行一次 add，产生重复模型。
+            let modelId = chosenModelId;
+            if (!modelId && newModelDraft) {
+                const beforeIds = new Set(models.map((m) => m.id));
+                const saved = await configService.savePatch({
+                    models: [{
+                            op: 'add',
+                            model: {
+                                apiFormat: 'openai',
+                                baseURL: newModelDraft.baseURL,
+                                apiKey: newModelDraft.apiKey,
+                                model: newModelDraft.model,
+                                contextWindow: newModelDraft.contextWindow,
+                                supportsVision: newModelDraft.supportsVision,
+                                enabled: true,
+                            },
+                        }],
+                });
+                modelId = saved.config?.models.find((m) => !beforeIds.has(m.id))?.id ?? null;
+                if (modelId) {
+                    setChosenModelId(modelId);
+                    setNewModelDraft(null);
+                }
+            }
+            if (!modelId)
+                throw new Error('未能确定要使用的模型');
+            await configService.savePatch({
+                advisor: {
+                    enabled: values.enabled,
+                    mode: values.mode === 'manual' ? 'manual' : 'auto',
+                    modelId,
+                    shareSensitive: values.shareSensitive,
+                    timeoutMs: Math.min(180_000, Math.max(15_000, parsePositiveInt(values.timeoutSeconds, 180) * 1000)),
+                },
+            });
+            onDone();
+        }, onCancel: onCancel }));
+}

package/src/cli/wizards/fieldForm.js

@@ -0,0 +1,149 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * ============================================================
+ *  src/cli/wizards/fieldForm.tsx —— 通用顺序字段录入组件
+ * ------------------------------------------------------------
+ *  搜索引擎/生图模型/顾问模型/语音合成/OpenRouter 这 5 个子向导只是
+ *  "字段不同、保存目标不同"，录入交互本身完全一样：一次问一个字段，
+ *  Enter 确认进入下一个，最后一个字段确认后调用 onSubmit(values)。
+ *  抽成通用组件避免 5 份几乎相同的状态机（仓库"轻量简洁"原则）。
+ *
+ *  不支持"返回上一步"——和旧版 configWizard 一致的取舍：ESC 直接取消
+ *  整个表单回上一级菜单，不做逐字段回退，简化键位逻辑。
+ * ============================================================
+ */
+import { useCallback, useMemo, useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+/** 进入某字段时的 draft 预填：以 seed（已录入值或 default）为准。 */
+function initialDraft(f, seed) {
+    if (!f)
+        return '';
+    if (f.type === 'select') {
+        const opts = f.options ?? [];
+        const idx = opts.indexOf(String(seed ?? ''));
+        return opts[idx >= 0 ? idx : 0] ?? '';
+    }
+    if (f.type === 'boolean')
+        return '';
+    return seed !== undefined ? String(seed) : '';
+}
+/** 进入某字段时的高亮预选：boolean 按 seed 定 是/否，select 定位到 seed 项。 */
+function initialSelect(f, seed) {
+    if (!f)
+        return 0;
+    if (f.type === 'select') {
+        const opts = f.options ?? [];
+        const idx = opts.indexOf(String(seed ?? ''));
+        return idx >= 0 ? idx : 0;
+    }
+    if (f.type === 'boolean')
+        return seed === true ? 0 : 1;
+    return 0;
+}
+export function FieldForm({ title, fields, onSubmit, onCancel }) {
+    const [index, setIndex] = useState(0);
+    const [values, setValues] = useState(() => {
+        const initial = {};
+        for (const f of fields)
+            if (f.default !== undefined)
+                initial[f.key] = f.default;
+        return initial;
+    });
+    // 首字段不经过 enterField，预填必须在 useState 初始化器里做——否则
+    // boolean 首字段的高亮永远停在"是"（default=false 时直接 Enter 会误改值）。
+    const [draft, setDraft] = useState(() => initialDraft(fields[0], fields[0]?.default));
+    const [selectIndex, setSelectIndex] = useState(() => initialSelect(fields[0], fields[0]?.default));
+    const [phase, setPhase] = useState('input');
+    const [errorMsg, setErrorMsg] = useState(null);
+    const field = fields[index];
+    const enterField = useCallback((i) => {
+        const f = fields[i];
+        setErrorMsg(null);
+        // 优先用已录入的值（保存失败重试时不吞用户敲过的输入），其次才是 default。
+        const seed = values[f.key] !== undefined ? values[f.key] : f.default;
+        setSelectIndex(initialSelect(f, seed));
+        setDraft(initialDraft(f, seed));
+        setIndex(i);
+        setPhase('input');
+    }, [fields, values]);
+    const finish = useCallback(async (finalValues) => {
+        setPhase('submitting');
+        setErrorMsg(null);
+        try {
+            await onSubmit(finalValues);
+        }
+        catch (e) {
+            setErrorMsg(e.message || '保存失败');
+            setPhase('error');
+        }
+    }, [onSubmit]);
+    const commitField = useCallback((value) => {
+        const next = { ...values, [field.key]: value };
+        setValues(next);
+        if (index + 1 < fields.length) {
+            enterField(index + 1);
+        }
+        else {
+            void finish(next);
+        }
+    }, [values, field, index, fields, enterField, finish]);
+    useInput((input, key) => {
+        if (phase === 'submitting')
+            return;
+        if (phase === 'error') {
+            if (key.return)
+                enterField(0);
+            else if (key.escape)
+                onCancel();
+            return;
+        }
+        if (key.escape) {
+            onCancel();
+            return;
+        }
+        if (!field)
+            return;
+        if (field.type === 'boolean') {
+            if (key.upArrow || key.downArrow) {
+                setSelectIndex((i) => (i === 0 ? 1 : 0));
+            }
+            else if (key.return) {
+                commitField(selectIndex === 0);
+            }
+            return;
+        }
+        if (field.type === 'select') {
+            const opts = field.options ?? [];
+            if (key.upArrow) {
+                setSelectIndex((i) => (i - 1 + opts.length) % opts.length);
+            }
+            else if (key.downArrow) {
+                setSelectIndex((i) => (i + 1) % opts.length);
+            }
+            else if (key.return) {
+                commitField(opts[selectIndex] ?? '');
+            }
+            return;
+        }
+        // text / password
+        if (key.return) {
+            const trimmed = draft.trim();
+            if (trimmed.length === 0) {
+                // 留空 Enter：可选字段沿用 default（通常是"保持原值不变"）；必填字段拦下不提交。
+                if (!field.optional)
+                    return;
+                commitField(field.default !== undefined ? String(field.default) : '');
+                return;
+            }
+            commitField(trimmed);
+        }
+        else if (key.backspace || key.delete) {
+            setDraft((s) => s.slice(0, -1));
+        }
+        else if (input && !key.meta && !key.ctrl) {
+            setDraft((s) => s + input);
+        }
+    });
+    const masked = useMemo(() => '*'.repeat(Math.min(draft.length, 32)), [draft]);
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "cyan", bold: true, children: title }) }), phase !== 'error' && field && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["\u7B2C ", index + 1, "/", fields.length, " \u9879 \u00B7 ", field.label] }), field.type === 'boolean' && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: ['是', '否'].map((label, i) => (_jsxs(Text, { color: i === selectIndex ? 'cyan' : undefined, children: [i === selectIndex ? '> ' : '  ', label] }, label))) })), field.type === 'select' && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: (field.options ?? []).map((opt, i) => (_jsxs(Text, { color: i === selectIndex ? 'cyan' : undefined, children: [i === selectIndex ? '> ' : '  ', opt] }, opt))) })), (field.type === 'text' || field.type === 'password') && (_jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: (field.type === 'password' ? masked : draft) || ' ' }) })), field.hint && (_jsx(Text, { color: "gray", children: field.hint })), _jsxs(Text, { color: "gray", children: ["Enter \u786E\u8BA4", field.optional ? '（留空保持不变）' : '', " \u00B7 ESC \u53D6\u6D88\u56DE\u83DC\u5355"] })] })), phase === 'submitting' && (_jsx(Text, { color: "yellow", children: "\u23F3 \u6B63\u5728\u4FDD\u5B58..." })), phase === 'error' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "red", children: "\u2717 \u4FDD\u5B58\u5931\u8D25" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "red", children: errorMsg ?? '未知错误' }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: "\u6309 Enter \u56DE\u5230\u7B2C 1 \u9879\u91CD\u8BD5 \u00B7 ESC \u53D6\u6D88\u56DE\u83DC\u5355" }) })] }))] }));
+}

package/src/cli/wizards/imageWizard.js

@@ -0,0 +1,60 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { configService } from '../../config/configService.js';
+import { FieldForm } from './fieldForm.js';
+export function ImageWizard({ existing, onDone, onCancel }) {
+    return (_jsx(FieldForm, { title: "\u914D\u7F6E\u751F\u56FE\u6A21\u578B\uFF08GenerateImage \u5DE5\u5177\uFF09", fields: [
+            {
+                key: 'provider',
+                label: 'Provider 名称（自由填，如 volces / openrouter）',
+                type: 'text',
+                default: existing?.provider ?? 'custom',
+                optional: true,
+            },
+            {
+                key: 'baseURL',
+                label: 'API Base URL（OpenAI 兼容协议）',
+                type: 'text',
+                default: existing?.baseURL ?? '',
+            },
+            {
+                key: 'apiKey',
+                label: 'API Key',
+                type: 'password',
+                default: existing?.apiKey ?? '',
+                optional: true,
+                hint: '留空 = 保持现有值不变',
+            },
+            {
+                key: 'model',
+                label: 'Model',
+                type: 'text',
+                default: existing?.model ?? '',
+            },
+            {
+                key: 'protocol',
+                label: '协议（不确定选 auto）',
+                type: 'select',
+                options: ['auto', 'chat', 'images'],
+                default: existing?.protocol ?? 'auto',
+            },
+        ], onSubmit: async (values) => {
+            const baseURL = String(values.baseURL ?? '').trim();
+            const apiKey = String(values.apiKey ?? '').trim();
+            const model = String(values.model ?? '').trim();
+            if (!baseURL || !apiKey || !model) {
+                throw new Error('Base URL / API Key / Model 均不能为空');
+            }
+            await configService.savePatch({
+                tools: {
+                    imageGeneration: {
+                        provider: String(values.provider ?? 'custom').trim() || 'custom',
+                        baseURL,
+                        apiKey,
+                        model,
+                        protocol: values.protocol ?? 'auto',
+                    },
+                },
+            });
+            onDone();
+        }, onCancel: onCancel }));
+}

package/src/cli/wizards/openRouterWizard.js

@@ -0,0 +1,23 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { configService } from '../../config/configService.js';
+import { FieldForm } from './fieldForm.js';
+export function OpenRouterWizard({ existing, onDone, onCancel }) {
+    return (_jsx(FieldForm, { title: "\u914D\u7F6E OpenRouter", fields: [
+            {
+                key: 'apiKey',
+                label: 'OpenRouter API Key',
+                type: 'password',
+                default: existing?.apiKey ?? '',
+                optional: true,
+                hint: '留空 = 保持现有值不变。申请：https://openrouter.ai/keys',
+            },
+        ], onSubmit: async (values) => {
+            const apiKey = String(values.apiKey ?? '').trim();
+            if (!apiKey) {
+                onDone();
+                return;
+            }
+            await configService.savePatch({ tools: { openRouter: { apiKey } } });
+            onDone();
+        }, onCancel: onCancel }));
+}

package/src/cli/wizards/providerPresets.js

@@ -0,0 +1,95 @@
+/**
+ * ============================================================
+ *  src/cli/wizards/providerPresets.ts —— 基座模型预设表（纯逻辑）
+ * ------------------------------------------------------------
+ *  从旧版 configWizard.tsx 抽出，供 providerWizard.tsx 使用；独立成模块
+ *  是为了可以脱离 Ink 单测，也方便以后别的向导（如生图模型）复用同一份
+ *  baseURL 预设表。
+ * ============================================================
+ */
+// 兜底值：custom 或表外 model 都退到这里。
+// 与 src/config.ts 的同名常量含义对齐（"既没 env、saved 也没填 contextWindow" 的最终兜底）。
+export const FALLBACK_CONTEXT_WINDOW = 128_000;
+export const PRESETS = [
+    {
+        name: 'minimax',
+        label: 'MiniMax (海螺)',
+        baseURL: 'https://api.minimax.chat/v1/chat/completions',
+        models: ['MiniMax-M3', 'MiniMax-M2.7', 'MiniMax-M1', 'abab6.5s-chat'],
+        contextWindow: 204_800,
+    },
+    {
+        // 火山方舟 ARK Coding Plan —— 一个 endpoint 后挂多个 model id，
+        // model 字段大小写严格匹配（'glm-5.1' 而非 'GLM-5.1'）。
+        name: 'volces',
+        label: '火山方舟 Coding Plan (ARK)',
+        baseURL: 'https://ark.cn-beijing.volces.com/api/coding/v3/chat/completions',
+        models: [
+            'doubao-seed-2.0-pro',
+            'doubao-seed-2.0-code',
+            'doubao-seed-code',
+            'glm-5.1',
+            'minimax-latest',
+            'deepseek-v3.2',
+            'kimi-k2.7-code',
+            'kimi-k2.6',
+        ],
+        contextWindow: 204_800,
+        modelContextWindows: {
+            'kimi-k2.7-code': 512_000,
+        },
+    },
+    {
+        name: 'deepseek',
+        label: 'DeepSeek',
+        baseURL: 'https://api.deepseek.com/v1/chat/completions',
+        models: ['deepseek-chat', 'deepseek-reasoner'],
+        contextWindow: 128_000,
+    },
+    {
+        name: 'openai',
+        label: 'OpenAI',
+        baseURL: 'https://api.openai.com/v1/chat/completions',
+        models: ['gpt-4o', 'gpt-4o-mini'],
+        contextWindow: 128_000,
+    },
+    {
+        name: 'anthropic',
+        label: 'Anthropic',
+        baseURL: 'https://api.anthropic.com/v1/messages',
+        models: ['claude-sonnet-4-5', 'claude-opus-4-1'],
+        contextWindow: 200_000,
+        apiFormat: 'anthropic',
+    },
+    {
+        name: 'moonshot',
+        label: 'Moonshot (Kimi)',
+        baseURL: 'https://api.moonshot.cn/v1/chat/completions',
+        models: ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k'],
+        contextWindow: 128_000,
+        modelContextWindows: {
+            'moonshot-v1-8k': 8_000,
+            'moonshot-v1-32k': 32_000,
+            'moonshot-v1-128k': 128_000,
+        },
+    },
+    {
+        name: 'custom',
+        label: '自定义（手动填完整请求地址）',
+        baseURL: '',
+        models: [],
+        contextWindow: FALLBACK_CONTEXT_WINDOW,
+    },
+];
+export function resolveContextWindow(preset, model) {
+    return (preset.modelContextWindows?.[model] ??
+        preset.contextWindow ??
+        FALLBACK_CONTEXT_WINDOW);
+}
+/** 按 name 找预设索引；找不到（如已有配置是自定义 baseURL）落到 'custom'。 */
+export function findPresetIndex(name) {
+    if (!name)
+        return 0;
+    const i = PRESETS.findIndex((p) => p.name === name);
+    return i >= 0 ? i : PRESETS.findIndex((p) => p.name === 'custom');
+}