minimal-agent 0.10.0 → 0.12.0

package/src/config/configManagement.js

@@ -0,0 +1,126 @@
+import { DEFAULT_BROWSER_CONFIG, DEFAULT_COMPUTER_USE_CONFIG, } from './configDefaults.js';
+/**
+ * CLI 和 Desktop 共用的脱敏配置视图。这里不返回任何凭据，也不读取 Runtime
+ * 状态；它只是把 V4 权威配置稳定地投影成可展示、可比较的管理模型。
+ */
+export function buildConfigManagementView(snapshot) {
+    const config = snapshot.config;
+    if (!config)
+        return null;
+    const drafts = config.drafts?.tools ?? {};
+    const stateFor = (key) => {
+        const configured = !!config.tools[key];
+        if (drafts[key] && Object.keys(drafts[key]).length > 0) {
+            return {
+                state: 'incomplete',
+                configured,
+                message: '配置尚未完整，已安全保存为草稿',
+            };
+        }
+        return { state: configured ? 'configured' : 'unconfigured', configured };
+    };
+    const baseModel = config.models.find((model) => model.id === config.baseModelId);
+    const advisorModel = config.advisor?.modelId
+        ? config.models.find((model) => model.id === config.advisor.modelId)
+        : undefined;
+    const models = config.models.map((model) => ({
+        id: model.id,
+        apiFormat: model.apiFormat,
+        ...(model.displayName ? { displayName: model.displayName } : {}),
+        baseURL: model.baseURL,
+        apiKeyConfigured: model.apiKey.length > 0,
+        model: model.model,
+        contextWindow: model.contextWindow,
+        ...(model.maxTokens ? { maxTokens: model.maxTokens } : {}),
+        ...(model.supportsVision ? { supportsVision: true } : {}),
+        promptCache: model.promptCache ?? { mode: 'auto' },
+        enabled: model.enabled,
+        updatedAt: model.updatedAt,
+    }));
+    return {
+        revision: config.savedAt,
+        source: snapshot.source,
+        readOnly: snapshot.readOnly,
+        models,
+        baseModelId: config.baseModelId,
+        ...(config.compactRatio !== undefined
+            ? { compactRatio: config.compactRatio }
+            : {}),
+        ...(baseModel
+            ? { model: baseModel.model, contextWindow: baseModel.contextWindow }
+            : {}),
+        draftFields: Object.keys(drafts).map((key) => `tools.${key}`),
+        advisor: config.advisor
+            ? {
+                configured: !!advisorModel?.apiKey,
+                ...config.advisor,
+            }
+            : undefined,
+        subagents: { ...config.subagents },
+        browser: { ...(config.browser ?? DEFAULT_BROWSER_CONFIG) },
+        computerUse: { ...(config.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG) },
+        tools: {
+            webSearch: stateFor('webSearch'),
+            imageGeneration: {
+                ...stateFor('imageGeneration'),
+                provider: config.tools.imageGeneration?.provider,
+                baseURL: config.tools.imageGeneration?.baseURL,
+                model: config.tools.imageGeneration?.model,
+                protocol: config.tools.imageGeneration?.protocol ?? 'auto',
+            },
+            openRouter: stateFor('openRouter'),
+            textToSpeech: {
+                ...stateFor('textToSpeech'),
+                groupIdConfigured: !!config.tools.textToSpeech?.groupId,
+            },
+        },
+        toolInput: {
+            ...(typeof drafts.imageGeneration?.provider === 'string'
+                ? { imageProvider: drafts.imageGeneration.provider }
+                : {}),
+            ...(typeof drafts.imageGeneration?.baseURL === 'string'
+                ? { imageBaseURL: drafts.imageGeneration.baseURL }
+                : {}),
+            ...(typeof drafts.imageGeneration?.model === 'string'
+                ? { imageModel: drafts.imageGeneration.model }
+                : {}),
+            ...(drafts.imageGeneration?.protocol === 'auto' ||
+                drafts.imageGeneration?.protocol === 'chat' ||
+                drafts.imageGeneration?.protocol === 'images'
+                ? {
+                    imageProtocol: drafts.imageGeneration.protocol,
+                }
+                : {}),
+            ...(typeof drafts.textToSpeech?.groupId === 'string'
+                ? { ttsGroupId: drafts.textToSpeech.groupId }
+                : {}),
+        },
+    };
+}
+/** 完整 Origin 的唯一规范化入口，供 Desktop 和 CLI 表单共用。 */
+export function normalizeAllowedOrigins(input) {
+    const pieces = Array.isArray(input) ? input : input.split(/[\n,]/);
+    const out = [];
+    for (const piece of pieces) {
+        const raw = piece.trim();
+        if (!raw)
+            continue;
+        try {
+            const url = new URL(raw);
+            if ((url.protocol !== 'http:' && url.protocol !== 'https:') ||
+                url.pathname !== '/' ||
+                url.search ||
+                url.hash ||
+                url.username ||
+                url.password)
+                continue;
+            const origin = url.origin;
+            if (!out.includes(origin))
+                out.push(origin);
+        }
+        catch {
+            // Invalid entries are intentionally omitted; callers compare counts to show feedback.
+        }
+    }
+    return out.slice(0, 100);
+}

package/src/config/configManagement.ts

@@ -0,0 +1,159 @@
+import {
+  DEFAULT_BROWSER_CONFIG,
+  DEFAULT_COMPUTER_USE_CONFIG,
+} from './configDefaults.js';
+import type { ModelConfig } from './configFile.js';
+import type { ConfigSnapshot } from './configService.js';
+
+export type ManagementStatus = 'unconfigured' | 'configured' | 'incomplete';
+
+export interface ManagedToolView {
+  state: ManagementStatus;
+  configured: boolean;
+  message?: string;
+}
+
+export interface ManagedModelView {
+  id: string;
+  apiFormat: ModelConfig['apiFormat'];
+  displayName?: string;
+  baseURL: string;
+  apiKeyConfigured: boolean;
+  model: string;
+  contextWindow: number;
+  maxTokens?: number;
+  supportsVision?: boolean;
+  promptCache: NonNullable<ModelConfig['promptCache']>;
+  enabled: boolean;
+  updatedAt: number;
+}
+
+/**
+ * CLI 和 Desktop 共用的脱敏配置视图。这里不返回任何凭据，也不读取 Runtime
+ * 状态；它只是把 V4 权威配置稳定地投影成可展示、可比较的管理模型。
+ */
+export function buildConfigManagementView(snapshot: ConfigSnapshot) {
+  const config = snapshot.config;
+  if (!config) return null;
+  const drafts = config.drafts?.tools ?? {};
+  const stateFor = (key: keyof typeof config.tools): ManagedToolView => {
+    const configured = !!config.tools[key];
+    if (drafts[key] && Object.keys(drafts[key]!).length > 0) {
+      return {
+        state: 'incomplete',
+        configured,
+        message: '配置尚未完整，已安全保存为草稿',
+      };
+    }
+    return { state: configured ? 'configured' : 'unconfigured', configured };
+  };
+  const baseModel = config.models.find(
+    (model) => model.id === config.baseModelId,
+  );
+  const advisorModel = config.advisor?.modelId
+    ? config.models.find((model) => model.id === config.advisor!.modelId)
+    : undefined;
+  const models: ManagedModelView[] = config.models.map((model) => ({
+    id: model.id,
+    apiFormat: model.apiFormat,
+    ...(model.displayName ? { displayName: model.displayName } : {}),
+    baseURL: model.baseURL,
+    apiKeyConfigured: model.apiKey.length > 0,
+    model: model.model,
+    contextWindow: model.contextWindow,
+    ...(model.maxTokens ? { maxTokens: model.maxTokens } : {}),
+    ...(model.supportsVision ? { supportsVision: true } : {}),
+    promptCache: model.promptCache ?? { mode: 'auto' },
+    enabled: model.enabled,
+    updatedAt: model.updatedAt,
+  }));
+  return {
+    revision: config.savedAt,
+    source: snapshot.source,
+    readOnly: snapshot.readOnly,
+    models,
+    baseModelId: config.baseModelId,
+    ...(config.compactRatio !== undefined
+      ? { compactRatio: config.compactRatio }
+      : {}),
+    ...(baseModel
+      ? { model: baseModel.model, contextWindow: baseModel.contextWindow }
+      : {}),
+    draftFields: Object.keys(drafts).map((key) => `tools.${key}`),
+    advisor: config.advisor
+      ? {
+          configured: !!advisorModel?.apiKey,
+          ...config.advisor,
+        }
+      : undefined,
+    subagents: { ...config.subagents },
+    browser: { ...(config.browser ?? DEFAULT_BROWSER_CONFIG) },
+    computerUse: { ...(config.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG) },
+    tools: {
+      webSearch: stateFor('webSearch'),
+      imageGeneration: {
+        ...stateFor('imageGeneration'),
+        provider: config.tools.imageGeneration?.provider,
+        baseURL: config.tools.imageGeneration?.baseURL,
+        model: config.tools.imageGeneration?.model,
+        protocol: config.tools.imageGeneration?.protocol ?? 'auto',
+      },
+      openRouter: stateFor('openRouter'),
+      textToSpeech: {
+        ...stateFor('textToSpeech'),
+        groupIdConfigured: !!config.tools.textToSpeech?.groupId,
+      },
+    },
+    toolInput: {
+      ...(typeof drafts.imageGeneration?.provider === 'string'
+        ? { imageProvider: drafts.imageGeneration.provider }
+        : {}),
+      ...(typeof drafts.imageGeneration?.baseURL === 'string'
+        ? { imageBaseURL: drafts.imageGeneration.baseURL }
+        : {}),
+      ...(typeof drafts.imageGeneration?.model === 'string'
+        ? { imageModel: drafts.imageGeneration.model }
+        : {}),
+      ...(drafts.imageGeneration?.protocol === 'auto' ||
+      drafts.imageGeneration?.protocol === 'chat' ||
+      drafts.imageGeneration?.protocol === 'images'
+        ? {
+            imageProtocol: drafts.imageGeneration.protocol as
+              | 'auto'
+              | 'chat'
+              | 'images',
+          }
+        : {}),
+      ...(typeof drafts.textToSpeech?.groupId === 'string'
+        ? { ttsGroupId: drafts.textToSpeech.groupId }
+        : {}),
+    },
+  };
+}
+
+/** 完整 Origin 的唯一规范化入口，供 Desktop 和 CLI 表单共用。 */
+export function normalizeAllowedOrigins(input: string | string[]): string[] {
+  const pieces = Array.isArray(input) ? input : input.split(/[\n,]/);
+  const out: string[] = [];
+  for (const piece of pieces) {
+    const raw = piece.trim();
+    if (!raw) continue;
+    try {
+      const url = new URL(raw);
+      if (
+        (url.protocol !== 'http:' && url.protocol !== 'https:') ||
+        url.pathname !== '/' ||
+        url.search ||
+        url.hash ||
+        url.username ||
+        url.password
+      )
+        continue;
+      const origin = url.origin;
+      if (!out.includes(origin)) out.push(origin);
+    } catch {
+      // Invalid entries are intentionally omitted; callers compare counts to show feedback.
+    }
+  }
+  return out.slice(0, 100);
+}

package/src/config/configService.js

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
-import { readMinimalAgentConfig, updateMinimalAgentConfig, defaultMaxTokens, DEFAULT_SUBAGENTS_CONFIG, DEFAULT_BROWSER_CONFIG, } from './configFile.js';
+import { readMinimalAgentConfig, updateMinimalAgentConfig, defaultMaxTokens, DEFAULT_SUBAGENTS_CONFIG, DEFAULT_BROWSER_CONFIG, DEFAULT_COMPUTER_USE_CONFIG, } from './configFile.js';
+import { CONFIG_LIMITS, normalizeLimited } from './numericLimits.js';
 const DEFAULT_CONTEXT_WINDOW = 128_000;
 function positiveInt(value, fallback) {
     const parsed = Number.parseInt(value ?? '', 10);
@@ -54,6 +55,13 @@ function configFromEnv() {
         model,
         contextWindow,
         maxTokens: positiveInt(process.env.MINIMAL_AGENT_MAX_TOKENS, defaultMaxTokens(contextWindow)),
+        promptCache: {
+            mode: process.env.MINIMAL_AGENT_PROMPT_CACHE_MODE === 'session-key'
+                ? 'session-key'
+                : process.env.MINIMAL_AGENT_PROMPT_CACHE_MODE === 'disabled'
+                    ? 'disabled'
+                    : 'auto',
+        },
         enabled: true,
         createdAt: 0,
         updatedAt: 0,
@@ -72,6 +80,12 @@ function configFromEnv() {
             generalMaxTurns: positiveInt(process.env.AGENT_TOOL_GENERAL_MAX_TURNS, 100),
         },
         browser: DEFAULT_BROWSER_CONFIG,
+        computerUse: {
+            enabled: process.env.MINIMAL_AGENT_COMPUTER_USE_ENABLED !== 'false',
+            imagePolicy: 'single-adaptive',
+            maxImagePixels: Math.min(4_000_000, Math.max(250_000, positiveInt(process.env.MINIMAL_AGENT_COMPUTER_USE_MAX_IMAGE_PIXELS, DEFAULT_COMPUTER_USE_CONFIG.maxImagePixels))),
+            observationFrames: 1,
+        },
         tools,
         savedAt: 0,
     };
@@ -85,6 +99,8 @@ function resolveProvider(entry, compactRatio) {
         contextWindow: entry.contextWindow,
         maxTokens: entry.maxTokens ?? defaultMaxTokens(entry.contextWindow),
         apiFormat: entry.apiFormat,
+        supportsVision: entry.supportsVision !== false,
+        promptCache: entry.promptCache ?? { mode: 'auto' },
         ...(compactRatio !== undefined ? { compactRatio } : {}),
     };
 }
@@ -124,6 +140,7 @@ function applyModelsPatch(models, ops) {
                 contextWindow: m.contextWindow && m.contextWindow > 0 ? m.contextWindow : DEFAULT_CONTEXT_WINDOW,
                 ...(m.maxTokens ? { maxTokens: m.maxTokens } : {}),
                 supportsVision: m.supportsVision !== false,
+                promptCache: m.promptCache ?? { mode: 'auto' },
                 enabled: m.enabled ?? true,
                 createdAt: now,
                 updatedAt: now,
@@ -144,6 +161,7 @@ function applyModelsPatch(models, ops) {
                 ...(patch.contextWindow ? { contextWindow: patch.contextWindow } : {}),
                 ...(patch.maxTokens !== undefined ? { maxTokens: patch.maxTokens || undefined } : {}),
                 ...(patch.supportsVision !== undefined ? { supportsVision: patch.supportsVision !== false } : {}),
+                ...(patch.promptCache ? { promptCache: patch.promptCache } : {}),
                 ...(patch.enabled !== undefined ? { enabled: patch.enabled } : {}),
                 updatedAt: now,
             };
@@ -194,8 +212,8 @@ function applyConfigPatch(base, patch) {
                 modelId: patch.advisor.modelId !== undefined ? patch.advisor.modelId : (advisor?.modelId ?? null),
                 contextPolicy: 'full-relevant',
                 shareSensitive: patch.advisor.shareSensitive ?? advisor?.shareSensitive ?? false,
-                inputTokenBudget: Math.min(128_000, Math.max(8_000, patch.advisor.inputTokenBudget ?? advisor?.inputTokenBudget ?? 128_000)),
-                timeoutMs: patch.advisor.timeoutMs ?? advisor?.timeoutMs ?? 180_000,
+                inputTokenBudget: normalizeLimited(patch.advisor.inputTokenBudget ?? advisor?.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
+                timeoutMs: normalizeLimited(patch.advisor.timeoutMs ?? advisor?.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
             };
         }
     }
@@ -207,20 +225,29 @@ function applyConfigPatch(base, patch) {
         if (!referenced || referenced.enabled === false)
             advisor = { ...advisor, modelId: null };
     }
+    // 比例类：保留 4 位小数（= 百分比 2 位），否则 UI 上下箭头按 0.01 步进会累加出
+    // `0.8500000000000001` 这种浮点脏值直接写进 config.json。
     const compactRatio = patch.compactRatio !== undefined
-        ? (patch.compactRatio > 0 && patch.compactRatio <= 1 ? patch.compactRatio : undefined)
+        ? (patch.compactRatio > 0 && patch.compactRatio <= 1
+            ? normalizeLimited(patch.compactRatio, CONFIG_LIMITS.compactRatio, CONFIG_LIMITS.compactRatio.max)
+            : undefined)
         : base?.compactRatio;
     const tools = { ...(base?.tools ?? {}) };
+    const drafts = structuredClone(base?.drafts ?? {});
     const toolPatch = patch.tools;
     if (toolPatch?.webSearch) {
-        if (toolPatch.webSearch.clear)
+        if (toolPatch.webSearch.clear) {
             delete tools.webSearch;
+            delete drafts.tools?.webSearch;
+        }
         else
             tools.webSearch = mergeRecord(tools.webSearch, { provider: 'tavily', ...toolPatch.webSearch });
     }
     if (toolPatch?.imageGeneration) {
-        if (toolPatch.imageGeneration.clear)
+        if (toolPatch.imageGeneration.clear) {
             delete tools.imageGeneration;
+            delete drafts.tools?.imageGeneration;
+        }
         else {
             const next = mergeRecord(tools.imageGeneration, toolPatch.imageGeneration);
             if (toolPatch.imageGeneration.clearApiKey)
@@ -233,14 +260,18 @@ function applyConfigPatch(base, patch) {
         }
     }
     if (toolPatch?.openRouter) {
-        if (toolPatch.openRouter.clear)
+        if (toolPatch.openRouter.clear) {
             delete tools.openRouter;
+            delete drafts.tools?.openRouter;
+        }
         else
             tools.openRouter = mergeRecord(tools.openRouter, toolPatch.openRouter);
     }
     if (toolPatch?.textToSpeech) {
-        if (toolPatch.textToSpeech.clear)
+        if (toolPatch.textToSpeech.clear) {
             delete tools.textToSpeech;
+            delete drafts.tools?.textToSpeech;
+        }
         else {
             const next = mergeRecord(tools.textToSpeech, { provider: 'minimax', ...toolPatch.textToSpeech });
             if (toolPatch.textToSpeech.clearApiKey)
@@ -252,9 +283,27 @@ function applyConfigPatch(base, patch) {
             tools.textToSpeech = next;
         }
     }
-    const subagents = { ...(base?.subagents ?? DEFAULT_SUBAGENTS_CONFIG), ...(patch.subagents ?? {}) };
+    // 数字字段必须在**写入时**就按同一份边界规整——此前这里是裸 spread，读回时才被
+    // parseSubagents 的边界收窄，于是「存进去 300、读出来 100」，UI 表现成静默变回原值。
+    const mergedSubagents = { ...(base?.subagents ?? DEFAULT_SUBAGENTS_CONFIG), ...(patch.subagents ?? {}) };
+    const subagents = {
+        ...mergedSubagents,
+        maxCallsPerTurn: normalizeLimited(mergedSubagents.maxCallsPerTurn, CONFIG_LIMITS.subagentMaxCallsPerTurn, DEFAULT_SUBAGENTS_CONFIG.maxCallsPerTurn),
+        maxConcurrent: normalizeLimited(mergedSubagents.maxConcurrent, CONFIG_LIMITS.subagentMaxConcurrent, DEFAULT_SUBAGENTS_CONFIG.maxConcurrent),
+        timeoutMs: normalizeLimited(mergedSubagents.timeoutMs, CONFIG_LIMITS.subagentTimeoutMs, DEFAULT_SUBAGENTS_CONFIG.timeoutMs),
+        exploreMaxTurns: normalizeLimited(mergedSubagents.exploreMaxTurns, CONFIG_LIMITS.subagentExploreMaxTurns, DEFAULT_SUBAGENTS_CONFIG.exploreMaxTurns),
+        generalMaxTurns: normalizeLimited(mergedSubagents.generalMaxTurns, CONFIG_LIMITS.subagentGeneralMaxTurns, DEFAULT_SUBAGENTS_CONFIG.generalMaxTurns),
+    };
     const browser = { ...(base?.browser ?? DEFAULT_BROWSER_CONFIG), ...(patch.browser ?? {}), profileId: 'default' };
-    return { models, baseModelId, ...(compactRatio !== undefined ? { compactRatio } : {}), advisor, subagents, browser, tools, drafts: base?.drafts };
+    const computerUse = {
+        ...(base?.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG),
+        ...(patch.computerUse ?? {}),
+    };
+    computerUse.observationFrames = 1;
+    computerUse.maxImagePixels = normalizeLimited(computerUse.maxImagePixels, CONFIG_LIMITS.computerUseMaxImagePixels, DEFAULT_COMPUTER_USE_CONFIG.maxImagePixels);
+    if (!hasEntries(drafts.tools))
+        delete drafts.tools;
+    return { models, baseModelId, ...(compactRatio !== undefined ? { compactRatio } : {}), advisor, subagents, browser, computerUse, tools, ...(hasEntries(drafts) ? { drafts } : {}) };
 }
 export class ConfigService {
     snapshot = { source: 'none', readOnly: false, config: null, revision: 0 };
@@ -330,6 +379,9 @@ export class ConfigService {
     async browser() {
         return (await this.reload()).config?.browser ?? DEFAULT_BROWSER_CONFIG;
     }
+    async computerUse() {
+        return (await this.reload()).config?.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG;
+    }
     async tool(key) {
         return (await this.reload()).config?.tools[key];
     }
@@ -363,6 +415,8 @@ export class ConfigService {
             let active = latest ?? current.config;
             if (patch.subagents)
                 active = { version: 4, ...applyConfigPatch(active, { subagents: patch.subagents }), savedAt: active.savedAt };
+            if (patch.computerUse)
+                active = { version: 4, ...applyConfigPatch(active, { computerUse: patch.computerUse }), savedAt: active.savedAt };
             const drafts = structuredClone(active.drafts ?? {});
             for (const key of Object.keys(patch.tools ?? {})) {
                 const rawPiece = patch.tools[key];
@@ -385,7 +439,8 @@ export class ConfigService {
             return {
                 models: active.models, baseModelId: active.baseModelId,
                 ...(active.compactRatio !== undefined ? { compactRatio: active.compactRatio } : {}),
-                advisor: active.advisor, subagents: active.subagents, browser: active.browser, tools: active.tools,
+                advisor: active.advisor, subagents: active.subagents, browser: active.browser,
+                computerUse: active.computerUse, tools: active.tools,
                 ...(hasEntries(drafts) ? { drafts } : {}),
             };
         });