minimal-agent 0.10.0 → 0.12.0

package/src/config/configDiagnostics.ts

@@ -0,0 +1,166 @@
+import type { Provider } from '../types.js';
+import type { ModelConfig } from './configFile.js';
+import { type ConfigService, configService } from './configService.js';
+
+export type ConfigDiagnosticCode =
+  | 'ok'
+  | 'missing-config'
+  | 'timeout'
+  | 'network'
+  | 'invalid-response';
+export interface ConfigDiagnosticResult {
+  ok: boolean;
+  code: ConfigDiagnosticCode;
+  message: string;
+}
+
+function providerFromModel(
+  model: Pick<
+    ModelConfig,
+    | 'apiFormat'
+    | 'displayName'
+    | 'baseURL'
+    | 'apiKey'
+    | 'model'
+    | 'contextWindow'
+    | 'maxTokens'
+    | 'supportsVision'
+    | 'promptCache'
+  >,
+): Provider {
+  return {
+    name: model.displayName ?? model.model,
+    apiFormat: model.apiFormat,
+    baseURL: model.baseURL,
+    apiKey: model.apiKey,
+    model: model.model,
+    contextWindow: model.contextWindow,
+    ...(model.maxTokens ? { maxTokens: model.maxTokens } : {}),
+    supportsVision: model.supportsVision !== false,
+    promptCache: model.promptCache ?? { mode: 'auto' },
+  };
+}
+
+export async function testModelConnection(
+  model: Pick<
+    ModelConfig,
+    | 'apiFormat'
+    | 'displayName'
+    | 'baseURL'
+    | 'apiKey'
+    | 'model'
+    | 'contextWindow'
+    | 'maxTokens'
+    | 'supportsVision'
+    | 'promptCache'
+  >,
+  timeoutMs = 15_000,
+): Promise<ConfigDiagnosticResult> {
+  if (!model.baseURL.trim() || !model.apiKey.trim() || !model.model.trim()) {
+    return {
+      ok: false,
+      code: 'missing-config',
+      message: '缺少 Base URL、模型 ID 或 API Key',
+    };
+  }
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const { chat } = await import('../llm/client.js');
+    let received = false;
+    for await (const event of chat({
+      provider: providerFromModel(model),
+      messages: [{ role: 'user', content: '请只回复 OK' }],
+      tools: [],
+      signal: controller.signal,
+    })) {
+      if (event.type === 'text_delta' && event.delta.trim()) received = true;
+    }
+    return received
+      ? { ok: true, code: 'ok', message: '连接正常' }
+      : {
+          ok: false,
+          code: 'invalid-response',
+          message: '服务已响应，但没有返回文本',
+        };
+  } catch (error) {
+    return (error as Error).name === 'AbortError'
+      ? { ok: false, code: 'timeout', message: '连接超时' }
+      : {
+          ok: false,
+          code: 'network',
+          message: '连接失败，请检查地址、模型名称和凭据',
+        };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export async function testConfiguredModel(
+  modelId: string,
+  service: ConfigService = configService,
+): Promise<ConfigDiagnosticResult> {
+  const model = await service.model(modelId);
+  return model
+    ? testModelConnection(model)
+    : { ok: false, code: 'missing-config', message: '模型不存在或已被删除' };
+}
+
+export async function testAdvisorConnection(
+  service: ConfigService = configService,
+): Promise<ConfigDiagnosticResult> {
+  const advisor = await service.advisor();
+  if (!advisor)
+    return {
+      ok: false,
+      code: 'missing-config',
+      message: '尚未完整配置顾问模型',
+    };
+  const result = await testConfiguredModel(advisor.modelId!, service);
+  return {
+    ...result,
+    message: result.ok ? '顾问模型连接正常' : result.message,
+  };
+}
+
+export async function testToolConnection(
+  tool: 'webSearch' | 'imageGeneration' | 'openRouter' | 'textToSpeech',
+  service: ConfigService = configService,
+): Promise<ConfigDiagnosticResult> {
+  const config = await service.tool(tool);
+  if (!config)
+    return { ok: false, code: 'missing-config', message: '尚未完整配置' };
+  if (tool !== 'webSearch')
+    return {
+      ok: true,
+      code: 'ok',
+      message: '配置完整，将在下一次工具调用时使用',
+    };
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 10_000);
+  try {
+    const response = await fetch('https://api.tavily.com/search', {
+      method: 'POST',
+      signal: controller.signal,
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        api_key: (config as { apiKey: string }).apiKey,
+        query: 'KakadeAI connection test',
+        max_results: 1,
+      }),
+    });
+    return response.ok
+      ? { ok: true, code: 'ok', message: 'Tavily 连接正常' }
+      : {
+          ok: false,
+          code: 'network',
+          message: `Tavily 返回 HTTP ${response.status}`,
+        };
+  } catch (error) {
+    return (error as Error).name === 'AbortError'
+      ? { ok: false, code: 'timeout', message: '连接超时' }
+      : { ok: false, code: 'network', message: '连接失败，请检查网络和凭据' };
+  } finally {
+    clearTimeout(timer);
+  }
+}

package/src/config/configFile.js

@@ -3,21 +3,10 @@ import { chmod, copyFile, mkdir, readFile, rename, rm, stat, unlink, writeFile }
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { execSiblingDir } from '../utils/greenRoot.js';
-export const DEFAULT_SUBAGENTS_CONFIG = {
-    enabled: true,
-    maxCallsPerTurn: 6,
-    maxConcurrent: 3,
-    defaultWriteIsolation: 'none',
-    timeoutMs: 1_800_000,
-    exploreMaxTurns: 50,
-    generalMaxTurns: 100,
-};
-export const DEFAULT_BROWSER_CONFIG = {
-    enabled: true,
-    profileId: 'default',
-    developerMode: false,
-    allowedCdpOrigins: [],
-};
+import { normalizePromptCacheMode } from '../llm/promptCache.js';
+import { CONFIG_LIMITS, normalizeLimited } from './numericLimits.js';
+import { DEFAULT_BROWSER_CONFIG, DEFAULT_COMPUTER_USE_CONFIG, DEFAULT_SUBAGENTS_CONFIG, } from './configDefaults.js';
+export { DEFAULT_BROWSER_CONFIG, DEFAULT_COMPUTER_USE_CONFIG, DEFAULT_SUBAGENTS_CONFIG, } from './configDefaults.js';
 const DEFAULT_CONTEXT_WINDOW = 128_000;
 const LOCK_STALE_MS = 120_000;
 const LOCK_WAIT_MS = 15_000;
@@ -38,12 +27,28 @@ export function getConfigFilePath() {
 function positiveNumber(value) {
     return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : undefined;
 }
-function boundedNumber(value, fallback, min, max) {
-    return Math.min(max, Math.max(min, positiveNumber(value) ?? fallback));
+/** compactRatio 是可选字段：缺省/非法一律返回 undefined（让消费方用自己的默认比例），
+ *  存在时按比例语义规整到 4 位小数——`0.8500000000000001` 这种步进累加出来的浮点脏值
+ *  会在下次读盘时被抹平，不会一路带进 provider。 */
+function parseCompactRatio(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0 || value > 1)
+        return undefined;
+    return normalizeLimited(value, CONFIG_LIMITS.compactRatio, CONFIG_LIMITS.compactRatio.max);
 }
 function nonEmpty(value) {
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;
 }
+function defaultPromptCacheMode(baseURL) {
+    try {
+        const hostname = new URL(baseURL).hostname.toLowerCase();
+        return hostname === 'api.moonshot.cn' || hostname.endsWith('.moonshot.cn')
+            ? 'session-key'
+            : 'auto';
+    }
+    catch {
+        return 'auto';
+    }
+}
 // ---------------- v4（当前）解析 ----------------
 function parseModel(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
@@ -67,6 +72,10 @@ function parseModel(value) {
         contextWindow: positiveNumber(raw.contextWindow) ?? DEFAULT_CONTEXT_WINDOW,
         ...(positiveNumber(raw.maxTokens) !== undefined ? { maxTokens: positiveNumber(raw.maxTokens) } : {}),
         supportsVision: raw.supportsVision !== false,
+        promptCache: {
+            mode: normalizePromptCacheMode(raw.promptCache?.mode
+                ?? defaultPromptCacheMode(baseURL)),
+        },
         enabled: raw.enabled !== false,
         createdAt: positiveNumber(raw.createdAt) ?? now,
         updatedAt: positiveNumber(raw.updatedAt) ?? now,
@@ -126,20 +135,20 @@ function parseAdvisor(value) {
         modelId: nonEmpty(raw.modelId) ?? null,
         contextPolicy: 'full-relevant',
         shareSensitive: raw.shareSensitive === true,
-        inputTokenBudget: boundedNumber(raw.inputTokenBudget, 128_000, 8_000, 128_000),
-        timeoutMs: boundedNumber(raw.timeoutMs, 180_000, 15_000, 300_000),
+        inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
+        timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
     };
 }
 function parseSubagents(value) {
     const raw = value && typeof value === 'object' && !Array.isArray(value) ? value : {};
     return {
         enabled: raw.enabled !== false,
-        maxCallsPerTurn: boundedNumber(raw.maxCallsPerTurn, 6, 1, 12),
-        maxConcurrent: boundedNumber(raw.maxConcurrent, 3, 1, 6),
+        maxCallsPerTurn: normalizeLimited(raw.maxCallsPerTurn, CONFIG_LIMITS.subagentMaxCallsPerTurn, 6),
+        maxConcurrent: normalizeLimited(raw.maxConcurrent, CONFIG_LIMITS.subagentMaxConcurrent, 3),
         defaultWriteIsolation: raw.defaultWriteIsolation === 'worktree' ? 'worktree' : 'none',
-        timeoutMs: boundedNumber(raw.timeoutMs, 1_800_000, 60_000, 3_600_000),
-        exploreMaxTurns: boundedNumber(raw.exploreMaxTurns, 50, 5, 100),
-        generalMaxTurns: boundedNumber(raw.generalMaxTurns, 100, 10, 200),
+        timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.subagentTimeoutMs, 1_800_000),
+        exploreMaxTurns: normalizeLimited(raw.exploreMaxTurns, CONFIG_LIMITS.subagentExploreMaxTurns, 50),
+        generalMaxTurns: normalizeLimited(raw.generalMaxTurns, CONFIG_LIMITS.subagentGeneralMaxTurns, 100),
     };
 }
 function parseBrowser(value) {
@@ -153,13 +162,22 @@ function parseBrowser(value) {
             : [],
     };
 }
+function parseComputerUse(value) {
+    const raw = value && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : {};
+    return {
+        enabled: raw.enabled !== false,
+        imagePolicy: 'single-adaptive',
+        maxImagePixels: normalizeLimited(raw.maxImagePixels, CONFIG_LIMITS.computerUseMaxImagePixels, 1_600_000),
+        observationFrames: 1,
+    };
+}
 function parseCurrent(data) {
     if (data.version !== 4)
         return null;
     const advisor = parseAdvisor(data.advisor);
-    const compactRatio = typeof data.compactRatio === 'number' && data.compactRatio > 0 && data.compactRatio <= 1
-        ? data.compactRatio
-        : undefined;
+    const compactRatio = parseCompactRatio(data.compactRatio);
     return {
         version: 4,
         models: parseModels(data.models),
@@ -168,6 +186,7 @@ function parseCurrent(data) {
         ...(advisor ? { advisor } : {}),
         subagents: parseSubagents(data.subagents),
         browser: parseBrowser(data.browser),
+        computerUse: parseComputerUse(data.computerUse),
         tools: parseTools(data.tools),
         ...(data.drafts && typeof data.drafts === 'object' && !Array.isArray(data.drafts)
             ? { drafts: structuredClone(data.drafts) }
@@ -184,9 +203,7 @@ function parseLegacyProviderConfig(value) {
     const model = nonEmpty(raw.model);
     if (!baseURL || apiKey === undefined || !model)
         return null;
-    const compactRatio = typeof raw.compactRatio === 'number' && raw.compactRatio > 0 && raw.compactRatio <= 1
-        ? raw.compactRatio
-        : undefined;
+    const compactRatio = parseCompactRatio(raw.compactRatio);
     return {
         name: nonEmpty(raw.name) ?? 'env',
         baseURL,
@@ -210,8 +227,8 @@ function parseLegacyAdvisorConfig(value) {
         provider,
         supportsVision: raw.supportsVision === true,
         shareSensitive: raw.shareSensitive === true,
-        inputTokenBudget: boundedNumber(raw.inputTokenBudget, 128_000, 8_000, 128_000),
-        timeoutMs: boundedNumber(raw.timeoutMs, 180_000, 15_000, 300_000),
+        inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
+        timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
     };
 }
 /**
@@ -281,6 +298,7 @@ function buildV4FromLegacy(legacyProvider, legacyAdvisor, subagents, tools, save
         ...(advisor ? { advisor } : {}),
         subagents,
         browser: DEFAULT_BROWSER_CONFIG,
+        computerUse: DEFAULT_COMPUTER_USE_CONFIG,
         tools,
         savedAt,
     };
@@ -435,6 +453,7 @@ export async function saveMinimalAgentConfig(config) {
         advisor: config.advisor,
         subagents: config.subagents ?? DEFAULT_SUBAGENTS_CONFIG,
         browser: config.browser ?? DEFAULT_BROWSER_CONFIG,
+        computerUse: config.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG,
         tools: config.tools,
         drafts: config.drafts,
         savedAt: Date.now(),
@@ -457,6 +476,7 @@ export async function updateMinimalAgentConfig(mutate) {
             advisor: value.advisor,
             subagents: value.subagents ?? current?.subagents ?? DEFAULT_SUBAGENTS_CONFIG,
             browser: value.browser ?? current?.browser ?? DEFAULT_BROWSER_CONFIG,
+            computerUse: value.computerUse ?? current?.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG,
             tools: value.tools,
             drafts: value.drafts,
             savedAt: Math.max(Date.now(), (current?.savedAt ?? 0) + 1),