minimal-agent 0.13.0 → 0.15.0

package/src/config/configFile.ts

@@ -3,17 +3,19 @@ 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';
-import type { PromptCacheConfig } from '../types.js';
 import { normalizePromptCacheMode } from '../llm/promptCache.js';
-import { CONFIG_LIMITS, normalizeLimited } from './numericLimits.js';
+import type { PromptCacheConfig } from '../types.js';
+import { execSiblingDir } from '../utils/greenRoot.js';
 import {
+  DEFAULT_ADVISOR_CONFIG,
   DEFAULT_BROWSER_CONFIG,
   DEFAULT_COMPUTER_USE_CONFIG,
   DEFAULT_SUBAGENTS_CONFIG,
 } from './configDefaults.js';
+import { CONFIG_LIMITS, normalizeLimited } from './numericLimits.js';
 
 export {
+  DEFAULT_ADVISOR_CONFIG,
   DEFAULT_BROWSER_CONFIG,
   DEFAULT_COMPUTER_USE_CONFIG,
   DEFAULT_SUBAGENTS_CONFIG,
@@ -34,12 +36,17 @@ export interface ModelConfig {
   contextWindow: number;
   maxTokens?: number;
   supportsVision?: boolean;
+  /** Provider can reliably honor an OpenAI-compatible JSON Schema response. */
+  supportsJsonSchema?: boolean;
   promptCache?: PromptCacheConfig;
   enabled: boolean;
   createdAt: number;
   updatedAt: number;
 }
 
+/** Portable workflow capability role -> machine-local model id. */
+export type WorkflowModelRoles = Record<string, string>;
+
 export interface AdvisorConfig {
   enabled: boolean;
   mode: 'auto' | 'manual';
@@ -95,8 +102,16 @@ export interface MinimalAgentConfig {
   models: ModelConfig[];
   /** 当前被标记为基座（主循环）的模型 id；null = 尚未选定。 */
   baseModelId: string | null;
+  /**
+   * 团队在线模型服务器的默认地址；null = 未配置，登录命令使用发行版/环境配置解析。
+   * 与 minimal-desktop 的 `desktop.json::socialServerUrl` 是各自独立的持久化（两套
+   * 登录实现互不经过），但共享同一个环境变量名 `KAKADEAI_SOCIAL_SERVER_URL`
+   * 作为跨项目的运维覆盖点——见 configService.ts::resolveTeamServerUrl()。
+   */
+  teamServerUrl: string | null;
   compactRatio?: number;
   advisor?: AdvisorConfig;
+  workflowModels?: WorkflowModelRoles;
   subagents: SubagentsConfig;
   browser?: BrowserConfig;
   computerUse?: ComputerUseConfig;
@@ -185,6 +200,9 @@ function parseModel(value: unknown): ModelConfig | null {
     contextWindow: positiveNumber(raw.contextWindow) ?? DEFAULT_CONTEXT_WINDOW,
     ...(positiveNumber(raw.maxTokens) !== undefined ? { maxTokens: positiveNumber(raw.maxTokens) } : {}),
     supportsVision: raw.supportsVision !== false,
+    ...(typeof raw.supportsJsonSchema === 'boolean'
+      ? { supportsJsonSchema: raw.supportsJsonSchema }
+      : {}),
     promptCache: {
       mode: normalizePromptCacheMode(
         (raw.promptCache as Record<string, unknown> | undefined)?.mode
@@ -197,6 +215,20 @@ function parseModel(value: unknown): ModelConfig | null {
   };
 }
 
+function parseWorkflowModels(value: unknown): WorkflowModelRoles | undefined {
+  if (!value || typeof value !== 'object' || Array.isArray(value))
+    return undefined;
+  const roles: WorkflowModelRoles = {};
+  for (const [role, candidate] of Object.entries(
+    value as Record<string, unknown>,
+  )) {
+    if (!/^[a-z][a-z0-9_-]{0,63}$/i.test(role)) continue;
+    const modelId = nonEmpty(candidate);
+    if (modelId) roles[role] = modelId;
+  }
+  return Object.keys(roles).length > 0 ? roles : undefined;
+}
+
 function parseModels(value: unknown): ModelConfig[] {
   if (!Array.isArray(value)) return [];
   const out: ModelConfig[] = [];
@@ -241,13 +273,14 @@ function parseAdvisor(value: unknown): AdvisorConfig | undefined {
   if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined;
   const raw = value as Record<string, unknown>;
   return {
-    enabled: raw.enabled !== false,
+    // 默认关闭；旧配置显式 enabled:true 仍保持用户选择。
+    enabled: raw.enabled === true,
     mode: raw.mode === 'manual' ? 'manual' : 'auto',
     modelId: nonEmpty(raw.modelId) ?? null,
     contextPolicy: 'full-relevant',
     shareSensitive: raw.shareSensitive === true,
-    inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
-    timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
+    inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
+    timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, DEFAULT_ADVISOR_CONFIG.timeoutMs),
   };
 }
 
@@ -259,7 +292,7 @@ function parseSubagents(value: unknown): SubagentsConfig {
     maxConcurrent: normalizeLimited(raw.maxConcurrent, CONFIG_LIMITS.subagentMaxConcurrent, 3),
     defaultWriteIsolation: raw.defaultWriteIsolation === 'worktree' ? 'worktree' : 'none',
     timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.subagentTimeoutMs, 1_800_000),
-    exploreMaxTurns: normalizeLimited(raw.exploreMaxTurns, CONFIG_LIMITS.subagentExploreMaxTurns, 50),
+    exploreMaxTurns: normalizeLimited(raw.exploreMaxTurns, CONFIG_LIMITS.subagentExploreMaxTurns, 200),
     generalMaxTurns: normalizeLimited(raw.generalMaxTurns, CONFIG_LIMITS.subagentGeneralMaxTurns, 100),
   };
 }
@@ -291,13 +324,16 @@ function parseComputerUse(value: unknown): ComputerUseConfig {
 function parseCurrent(data: Record<string, unknown>): MinimalAgentConfig | null {
   if (data.version !== 4) return null;
   const advisor = parseAdvisor(data.advisor);
+  const workflowModels = parseWorkflowModels(data.workflowModels);
   const compactRatio = parseCompactRatio(data.compactRatio);
   return {
     version: 4,
     models: parseModels(data.models),
     baseModelId: nonEmpty(data.baseModelId) ?? null,
+    teamServerUrl: nonEmpty(data.teamServerUrl) ?? null,
     ...(compactRatio !== undefined ? { compactRatio } : {}),
     ...(advisor ? { advisor } : {}),
+    ...(workflowModels ? { workflowModels } : {}),
     subagents: parseSubagents(data.subagents),
     browser: parseBrowser(data.browser),
     computerUse: parseComputerUse(data.computerUse),
@@ -362,8 +398,8 @@ function parseLegacyAdvisorConfig(value: unknown): LegacyAdvisorConfig | undefin
     provider,
     supportsVision: raw.supportsVision === true,
     shareSensitive: raw.shareSensitive === true,
-    inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
-    timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
+    inputTokenBudget: normalizeLimited(raw.inputTokenBudget, CONFIG_LIMITS.advisorInputTokenBudget, DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
+    timeoutMs: normalizeLimited(raw.timeoutMs, CONFIG_LIMITS.advisorTimeoutMs, DEFAULT_ADVISOR_CONFIG.timeoutMs),
   };
 }
 
@@ -434,6 +470,7 @@ function buildV4FromLegacy(
     version: 4,
     models,
     baseModelId: baseModel.id,
+    teamServerUrl: null,
     ...(legacyProvider.compactRatio !== undefined ? { compactRatio: legacyProvider.compactRatio } : {}),
     ...(advisor ? { advisor } : {}),
     subagents,
@@ -584,14 +621,17 @@ export async function readMinimalAgentConfig(options: { migrate?: boolean } = {}
 }
 
 export async function saveMinimalAgentConfig(
-  config: Omit<MinimalAgentConfig, 'version' | 'savedAt' | 'subagents'> & { subagents?: SubagentsConfig },
+  config: Omit<MinimalAgentConfig, 'version' | 'savedAt' | 'subagents' | 'teamServerUrl'>
+    & { subagents?: SubagentsConfig; teamServerUrl?: string | null },
 ): Promise<MinimalAgentConfig> {
   const next: MinimalAgentConfig = {
     version: 4,
     models: config.models,
     baseModelId: config.baseModelId,
+    teamServerUrl: config.teamServerUrl ?? null,
     ...(config.compactRatio !== undefined ? { compactRatio: config.compactRatio } : {}),
     advisor: config.advisor,
+    workflowModels: config.workflowModels,
     subagents: config.subagents ?? DEFAULT_SUBAGENTS_CONFIG,
     browser: config.browser ?? DEFAULT_BROWSER_CONFIG,
     computerUse: config.computerUse ?? DEFAULT_COMPUTER_USE_CONFIG,
@@ -605,7 +645,8 @@ export async function saveMinimalAgentConfig(
 
 /** Cross-process read-modify-write. The mutator never sees a partially written file. */
 export async function updateMinimalAgentConfig(
-  mutate: (current: MinimalAgentConfig | null) => Omit<MinimalAgentConfig, 'version' | 'savedAt'>,
+  mutate: (current: MinimalAgentConfig | null) => Omit<MinimalAgentConfig, 'version' | 'savedAt' | 'teamServerUrl'>
+    & { teamServerUrl?: string | null },
 ): Promise<MinimalAgentConfig> {
   const file = getConfigFilePath();
   const release = await acquireConfigLock(file);
@@ -616,8 +657,16 @@ export async function updateMinimalAgentConfig(
       version: 4,
       models: value.models,
       baseModelId: value.baseModelId,
+      // 沿用现有值而不是重置为 null——大多数配置写入根本不碰这个字段（如加/删模型、
+      // 改 advisor），不该每次都把用户配置的默认服务器地址悄悄抹掉。同一条纪律见
+      // subagents/browser/computerUse。
+      // ⚠️ 必须用 `!== undefined` 而不是 `??`：清空地址走的是显式 `teamServerUrl: null`，
+      // `??` 会把这个合法的 null 也当成"没提供"处理，退回旧值——清空操作因此悄悄失效。
+      // 这正是仓库自己反复强调的 `undefined ≠ 0`（这里是 `undefined ≠ null`）纪律。
+      teamServerUrl: value.teamServerUrl !== undefined ? value.teamServerUrl : (current?.teamServerUrl ?? null),
       ...(value.compactRatio !== undefined ? { compactRatio: value.compactRatio } : {}),
       advisor: value.advisor,
+      workflowModels: value.workflowModels ?? current?.workflowModels,
       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,