minimal-agent 0.10.0 → 0.12.0

package/src/cli/wizards/advisorWizard.tsx

@@ -0,0 +1,195 @@
+/**
+ * ============================================================
+ *  src/cli/wizards/advisorWizard.tsx —— 顾问模型子向导
+ * ------------------------------------------------------------
+ *  v4 模型列表 schema 下，顾问不再自带一整套独立凭据——默认从已配置的模型列表
+ *  选一个复用。但顾问常常需要一个跟基座完全不同的 provider（对比不同模型的
+ *  第二意见才有意义），而 CLI 的「配置基座模型」向导只管理基座这一个槽位、
+ *  没有别的入口能新增模型——所以这里的模型选择字段里多一项「+ 新建模型」，
+ *  选它会先走一小段收集新模型字段的表单，新建成功后再回落到常规的顾问行为
+ *  字段（启用/调用模式/预算/超时/敏感共享）。三阶段状态机，全部落盘只发生在
+ *  最后一步提交时（ESC 在任何阶段取消都不留半成品模型）。
+ * ============================================================
+ */
+
+import React, { useState } from 'react';
+
+import type { ModelConfig } from '../../config/configFile.js';
+import { configService } from '../../config/configService.js';
+import { FieldForm, type FieldValues } from './fieldForm.js';
+
+type ResolvedAdvisor = Awaited<ReturnType<typeof configService.advisor>>;
+
+interface Props {
+  existing?: ResolvedAdvisor | null;
+  /** 已配置的模型列表（供选择顾问引用哪一个，或对照展示）；由 configMenu.tsx 一并拉取传入。 */
+  models: ModelConfig[];
+  onDone: () => void;
+  onCancel: () => void;
+}
+
+const NEW_MODEL_OPTION = '+ 新建模型（作为顾问专用，可与基座用不同 provider）';
+
+function parsePositiveInt(value: unknown, fallback: number): number {
+  const parsed = Number.parseInt(String(value ?? ''), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+interface NewModelDraft {
+  baseURL: string;
+  apiKey: string;
+  model: string;
+  contextWindow: number;
+  supportsVision: boolean;
+}
+
+type Phase = 'model-choice' | 'new-model' | 'advisor-fields';
+
+export function AdvisorWizard({ existing, models, onDone, onCancel }: Props): JSX.Element {
+  const enabledModels = models.filter((m) => m.enabled);
+  const labelFor = (m: ModelConfig, index: number) => `${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<Phase>('model-choice');
+  const [chosenModelId, setChosenModelId] = useState<string | null>(null);
+  const [newModelDraft, setNewModelDraft] = useState<NewModelDraft | null>(null);
+
+  if (phase === 'model-choice') {
+    return (
+      <FieldForm
+        title="配置顾问模型（Advisor 工具）"
+        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 (
+      <FieldForm
+        title="新建顾问专用模型（固定 OpenAI 兼容格式；Anthropic 格式请用 Desktop 添加）"
+        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: FieldValues) => {
+          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 (
+    <FieldForm
+      title="配置顾问模型 · 行为设置"
+      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,
+                promptCache: { mode: 'auto' },
+                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 as boolean,
+            mode: values.mode === 'manual' ? 'manual' : 'auto',
+            modelId,
+            shareSensitive: values.shareSensitive as boolean,
+            timeoutMs: Math.min(180_000, Math.max(15_000, parsePositiveInt(values.timeoutSeconds, 180) * 1000)),
+          },
+        });
+        onDone();
+      }}
+      onCancel={onCancel}
+    />
+  );
+}

package/src/cli/wizards/agentRuntimeWizard.js

@@ -0,0 +1,84 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { configService } from '../../config/configService.js';
+import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
+import { FieldForm } from './fieldForm.js';
+const num = (value, fallback) => {
+    const parsed = Number(String(value ?? ''));
+    return Number.isFinite(parsed) ? parsed : fallback;
+};
+export function AgentRuntimeWizard({ subagents, computerUse, onDone, onCancel, }) {
+    return (_jsx(FieldForm, { title: "\u5DE5\u5177\u4E0E\u4EE3\u7406 \u00B7 \u672C\u673A\u80FD\u529B", fields: [
+            {
+                key: 'computerEnabled',
+                label: '启用电脑操作',
+                type: 'boolean',
+                default: computerUse.enabled,
+            },
+            {
+                key: 'maxImagePixels',
+                label: '电脑观察画面像素预算',
+                type: 'text',
+                default: String(computerUse.maxImagePixels),
+            },
+            {
+                key: 'subagentsEnabled',
+                label: '启用子代理',
+                type: 'boolean',
+                default: subagents.enabled,
+            },
+            {
+                key: 'maxCalls',
+                label: '每回合最多子任务数',
+                type: 'text',
+                default: String(subagents.maxCallsPerTurn),
+            },
+            {
+                key: 'maxConcurrent',
+                label: '子任务最大并发',
+                type: 'text',
+                default: String(subagents.maxConcurrent),
+            },
+            {
+                key: 'isolation',
+                label: '默认写入隔离',
+                type: 'select',
+                options: ['none', 'worktree'],
+                default: subagents.defaultWriteIsolation,
+            },
+            {
+                key: 'timeoutMinutes',
+                label: '单个子任务超时（分钟）',
+                type: 'text',
+                default: String(Math.round(subagents.timeoutMs / 60_000)),
+            },
+            {
+                key: 'exploreTurns',
+                label: '只读调研最大轮数',
+                type: 'text',
+                default: String(subagents.exploreMaxTurns),
+            },
+            {
+                key: 'generalTurns',
+                label: '执行任务最大轮数',
+                type: 'text',
+                default: String(subagents.generalMaxTurns),
+            },
+        ], onSubmit: async (values) => {
+            await configService.savePatch({
+                computerUse: {
+                    enabled: values.computerEnabled === true,
+                    maxImagePixels: normalizeLimited(num(values.maxImagePixels, computerUse.maxImagePixels), CONFIG_LIMITS.computerUseMaxImagePixels, computerUse.maxImagePixels),
+                },
+                subagents: {
+                    enabled: values.subagentsEnabled === true,
+                    maxCallsPerTurn: normalizeLimited(num(values.maxCalls, subagents.maxCallsPerTurn), CONFIG_LIMITS.subagentMaxCallsPerTurn, subagents.maxCallsPerTurn),
+                    maxConcurrent: normalizeLimited(num(values.maxConcurrent, subagents.maxConcurrent), CONFIG_LIMITS.subagentMaxConcurrent, subagents.maxConcurrent),
+                    defaultWriteIsolation: values.isolation === 'worktree' ? 'worktree' : 'none',
+                    timeoutMs: normalizeLimited(num(values.timeoutMinutes, subagents.timeoutMs / 60_000) * 60_000, CONFIG_LIMITS.subagentTimeoutMs, subagents.timeoutMs),
+                    exploreMaxTurns: normalizeLimited(num(values.exploreTurns, subagents.exploreMaxTurns), CONFIG_LIMITS.subagentExploreMaxTurns, subagents.exploreMaxTurns),
+                    generalMaxTurns: normalizeLimited(num(values.generalTurns, subagents.generalMaxTurns), CONFIG_LIMITS.subagentGeneralMaxTurns, subagents.generalMaxTurns),
+                },
+            });
+            onDone();
+        }, onCancel: onCancel }));
+}

package/src/cli/wizards/agentRuntimeWizard.tsx

@@ -0,0 +1,134 @@
+import React from 'react';
+
+import type {
+  ComputerUseConfig,
+  SubagentsConfig,
+} from '../../config/configFile.js';
+import { configService } from '../../config/configService.js';
+import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
+import { FieldForm } from './fieldForm.js';
+
+interface Props {
+  subagents: SubagentsConfig;
+  computerUse: ComputerUseConfig;
+  onDone: () => void;
+  onCancel: () => void;
+}
+const num = (value: unknown, fallback: number) => {
+  const parsed = Number(String(value ?? ''));
+  return Number.isFinite(parsed) ? parsed : fallback;
+};
+
+export function AgentRuntimeWizard({
+  subagents,
+  computerUse,
+  onDone,
+  onCancel,
+}: Props): JSX.Element {
+  return (
+    <FieldForm
+      title="工具与代理 · 本机能力"
+      fields={[
+        {
+          key: 'computerEnabled',
+          label: '启用电脑操作',
+          type: 'boolean',
+          default: computerUse.enabled,
+        },
+        {
+          key: 'maxImagePixels',
+          label: '电脑观察画面像素预算',
+          type: 'text',
+          default: String(computerUse.maxImagePixels),
+        },
+        {
+          key: 'subagentsEnabled',
+          label: '启用子代理',
+          type: 'boolean',
+          default: subagents.enabled,
+        },
+        {
+          key: 'maxCalls',
+          label: '每回合最多子任务数',
+          type: 'text',
+          default: String(subagents.maxCallsPerTurn),
+        },
+        {
+          key: 'maxConcurrent',
+          label: '子任务最大并发',
+          type: 'text',
+          default: String(subagents.maxConcurrent),
+        },
+        {
+          key: 'isolation',
+          label: '默认写入隔离',
+          type: 'select',
+          options: ['none', 'worktree'],
+          default: subagents.defaultWriteIsolation,
+        },
+        {
+          key: 'timeoutMinutes',
+          label: '单个子任务超时（分钟）',
+          type: 'text',
+          default: String(Math.round(subagents.timeoutMs / 60_000)),
+        },
+        {
+          key: 'exploreTurns',
+          label: '只读调研最大轮数',
+          type: 'text',
+          default: String(subagents.exploreMaxTurns),
+        },
+        {
+          key: 'generalTurns',
+          label: '执行任务最大轮数',
+          type: 'text',
+          default: String(subagents.generalMaxTurns),
+        },
+      ]}
+      onSubmit={async (values) => {
+        await configService.savePatch({
+          computerUse: {
+            enabled: values.computerEnabled === true,
+            maxImagePixels: normalizeLimited(
+              num(values.maxImagePixels, computerUse.maxImagePixels),
+              CONFIG_LIMITS.computerUseMaxImagePixels,
+              computerUse.maxImagePixels,
+            ),
+          },
+          subagents: {
+            enabled: values.subagentsEnabled === true,
+            maxCallsPerTurn: normalizeLimited(
+              num(values.maxCalls, subagents.maxCallsPerTurn),
+              CONFIG_LIMITS.subagentMaxCallsPerTurn,
+              subagents.maxCallsPerTurn,
+            ),
+            maxConcurrent: normalizeLimited(
+              num(values.maxConcurrent, subagents.maxConcurrent),
+              CONFIG_LIMITS.subagentMaxConcurrent,
+              subagents.maxConcurrent,
+            ),
+            defaultWriteIsolation:
+              values.isolation === 'worktree' ? 'worktree' : 'none',
+            timeoutMs: normalizeLimited(
+              num(values.timeoutMinutes, subagents.timeoutMs / 60_000) * 60_000,
+              CONFIG_LIMITS.subagentTimeoutMs,
+              subagents.timeoutMs,
+            ),
+            exploreMaxTurns: normalizeLimited(
+              num(values.exploreTurns, subagents.exploreMaxTurns),
+              CONFIG_LIMITS.subagentExploreMaxTurns,
+              subagents.exploreMaxTurns,
+            ),
+            generalMaxTurns: normalizeLimited(
+              num(values.generalTurns, subagents.generalMaxTurns),
+              CONFIG_LIMITS.subagentGeneralMaxTurns,
+              subagents.generalMaxTurns,
+            ),
+          },
+        });
+        onDone();
+      }}
+      onCancel={onCancel}
+    />
+  );
+}

package/src/cli/wizards/browserWizard.js

@@ -0,0 +1,55 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { normalizeAllowedOrigins } from '../../config/configManagement.js';
+import { configService } from '../../config/configService.js';
+import { FieldForm } from './fieldForm.js';
+export function BrowserWizard({ existing, onDone, onCancel, }) {
+    return (_jsx(FieldForm, { title: "\u6D4F\u89C8\u5668\u8BBE\u7F6E", fields: [
+            {
+                key: 'enabled',
+                label: '启用内置浏览器',
+                type: 'boolean',
+                default: existing.enabled,
+            },
+            {
+                key: 'developerMode',
+                label: '完整 CDP Developer Mode',
+                type: 'boolean',
+                default: existing.developerMode,
+                hint: '开启后可能读取受信任站点的敏感内部状态',
+            },
+            {
+                key: 'confirmDeveloperRisk',
+                label: '确认只对受信任站点开启 Developer Mode',
+                type: 'boolean',
+                default: existing.developerMode,
+            },
+            {
+                key: 'origins',
+                label: '已授权 Origin（逗号分隔）',
+                type: 'text',
+                default: existing.allowedCdpOrigins.join(', '),
+                optional: true,
+                hint: '仅接受 http(s)://host[:port]，不接受路径、参数或认证信息',
+            },
+        ], onSubmit: async (values) => {
+            const developerMode = values.developerMode === true;
+            if (developerMode && values.confirmDeveloperRisk !== true)
+                throw new Error('开启 Developer Mode 前必须确认风险');
+            const raw = String(values.origins ?? '');
+            const origins = normalizeAllowedOrigins(raw);
+            const nonEmpty = raw
+                .split(/[\n,]/)
+                .map((item) => item.trim())
+                .filter(Boolean);
+            if (developerMode && origins.length !== nonEmpty.length)
+                throw new Error('授权列表含非法 Origin，请删除路径、查询参数或非 HTTP(S) 地址');
+            await configService.savePatch({
+                browser: {
+                    enabled: values.enabled === true,
+                    developerMode,
+                    allowedCdpOrigins: origins,
+                },
+            });
+            onDone();
+        }, onCancel: onCancel }));
+}

package/src/cli/wizards/browserWizard.tsx

@@ -0,0 +1,77 @@
+import React from 'react';
+
+import type { BrowserConfig } from '../../config/configFile.js';
+import { normalizeAllowedOrigins } from '../../config/configManagement.js';
+import { configService } from '../../config/configService.js';
+import { FieldForm } from './fieldForm.js';
+
+interface Props {
+  existing: BrowserConfig;
+  onDone: () => void;
+  onCancel: () => void;
+}
+
+export function BrowserWizard({
+  existing,
+  onDone,
+  onCancel,
+}: Props): JSX.Element {
+  return (
+    <FieldForm
+      title="浏览器设置"
+      fields={[
+        {
+          key: 'enabled',
+          label: '启用内置浏览器',
+          type: 'boolean',
+          default: existing.enabled,
+        },
+        {
+          key: 'developerMode',
+          label: '完整 CDP Developer Mode',
+          type: 'boolean',
+          default: existing.developerMode,
+          hint: '开启后可能读取受信任站点的敏感内部状态',
+        },
+        {
+          key: 'confirmDeveloperRisk',
+          label: '确认只对受信任站点开启 Developer Mode',
+          type: 'boolean',
+          default: existing.developerMode,
+        },
+        {
+          key: 'origins',
+          label: '已授权 Origin（逗号分隔）',
+          type: 'text',
+          default: existing.allowedCdpOrigins.join(', '),
+          optional: true,
+          hint: '仅接受 http(s)://host[:port]，不接受路径、参数或认证信息',
+        },
+      ]}
+      onSubmit={async (values) => {
+        const developerMode = values.developerMode === true;
+        if (developerMode && values.confirmDeveloperRisk !== true)
+          throw new Error('开启 Developer Mode 前必须确认风险');
+        const raw = String(values.origins ?? '');
+        const origins = normalizeAllowedOrigins(raw);
+        const nonEmpty = raw
+          .split(/[\n,]/)
+          .map((item) => item.trim())
+          .filter(Boolean);
+        if (developerMode && origins.length !== nonEmpty.length)
+          throw new Error(
+            '授权列表含非法 Origin，请删除路径、查询参数或非 HTTP(S) 地址',
+          );
+        await configService.savePatch({
+          browser: {
+            enabled: values.enabled === true,
+            developerMode,
+            allowedCdpOrigins: origins,
+          },
+        });
+        onDone();
+      }}
+      onCancel={onCancel}
+    />
+  );
+}

package/src/cli/wizards/contextAdvisorWizard.js

@@ -0,0 +1,84 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { configService } from '../../config/configService.js';
+import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
+import { FieldForm } from './fieldForm.js';
+function numberValue(value, fallback) {
+    const parsed = Number(String(value ?? '').trim());
+    return Number.isFinite(parsed) ? parsed : fallback;
+}
+export function ContextAdvisorWizard({ compactRatio, advisor, models, onDone, onCancel, }) {
+    const enabled = models.filter((model) => model.enabled && model.apiKey);
+    const options = [
+        '不使用顾问',
+        ...enabled.map((model) => `${model.displayName ?? model.model} · ${model.id.slice(0, 8)}`),
+    ];
+    const current = enabled.find((model) => model.id === advisor?.modelId);
+    const currentLabel = current
+        ? `${current.displayName ?? current.model} · ${current.id.slice(0, 8)}`
+        : '不使用顾问';
+    return (_jsx(FieldForm, { title: "\u6A21\u578B\u4E0E\u4E0A\u4E0B\u6587 \u00B7 \u538B\u7F29\u548C\u987E\u95EE", fields: [
+            {
+                key: 'compactPercent',
+                label: '自动压缩阈值（百分比）',
+                type: 'text',
+                default: String(Math.round((compactRatio ?? 0.85) * 100)),
+                hint: '范围 1–100；模型窗口大小仍由模型条目决定',
+            },
+            {
+                key: 'advisorModel',
+                label: '顾问模型',
+                type: 'select',
+                options,
+                default: currentLabel,
+            },
+            {
+                key: 'enabled',
+                label: '启用顾问',
+                type: 'boolean',
+                default: advisor?.enabled ?? true,
+            },
+            {
+                key: 'mode',
+                label: '调用模式',
+                type: 'select',
+                options: ['auto', 'manual'],
+                default: advisor?.mode ?? 'auto',
+            },
+            {
+                key: 'inputTokenBudget',
+                label: '顾问输入 Token 预算',
+                type: 'text',
+                default: String(advisor?.inputTokenBudget ?? 128_000),
+            },
+            {
+                key: 'timeoutSeconds',
+                label: '最长等待（秒）',
+                type: 'text',
+                default: String(Math.round((advisor?.timeoutMs ?? 180_000) / 1000)),
+            },
+            {
+                key: 'shareSensitive',
+                label: '允许向顾问发送敏感内容',
+                type: 'boolean',
+                default: advisor?.shareSensitive ?? false,
+            },
+        ], onSubmit: async (values) => {
+            const ratio = normalizeLimited(numberValue(values.compactPercent, 85) / 100, CONFIG_LIMITS.compactRatio, 0.85);
+            const modelIndex = options.indexOf(String(values.advisorModel));
+            const modelId = modelIndex > 0 ? enabled[modelIndex - 1].id : null;
+            await configService.savePatch({
+                compactRatio: ratio,
+                advisor: modelId
+                    ? {
+                        enabled: values.enabled === true,
+                        mode: values.mode === 'manual' ? 'manual' : 'auto',
+                        modelId,
+                        inputTokenBudget: normalizeLimited(numberValue(values.inputTokenBudget, 128_000), CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
+                        timeoutMs: normalizeLimited(numberValue(values.timeoutSeconds, 180) * 1000, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
+                        shareSensitive: values.shareSensitive === true,
+                    }
+                    : { clear: true },
+            });
+            onDone();
+        }, onCancel: onCancel }));
+}