minimal-agent 0.8.2 → 0.10.0

package/src/config/configFile.js

@@ -1,112 +1,470 @@
-/**
- * ============================================================
- *  src/config/configFile.ts —— 模式 B 向导写的 provider 配置
- * ------------------------------------------------------------
- *  与 src/config.ts 的关系：
- *    - config.ts 负责"读取 process.env 拼装 Provider"（模式 A）
- *    - 本文件负责"读写 ~/.minimal-agent/config.json"（模式 B）
- *    - 上层（loadProviderLayered）先看 env、再看本文件
- *
- *  与 src/context/persistContext.ts 的关系：
- *    - 复用同一个目录 ~/.minimal-agent/
- *    - 同样"解析失败返回 null、写失败静默"模式
- *
- *  为什么用 JSON 而非 .env 格式：
- *    - 解析无歧义（dotenv 各家行为略有差异）
- *    - 显式区分"向导写的" vs "用户写的 .env"，避免互相覆盖
- *    - JSON 还可以放结构化扩展（如 savedAt 用于排查）
- * ============================================================
- */
-import { chmod, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import { chmod, copyFile, mkdir, readFile, rename, rm, stat, unlink, writeFile } from 'node:fs/promises';
 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: [],
+};
+const DEFAULT_CONTEXT_WINDOW = 128_000;
+const LOCK_STALE_MS = 120_000;
+const LOCK_WAIT_MS = 15_000;
 /**
- * 配置文件的**写**路径（带环境变量覆盖，主要给测试用）。
- * `saveConfig()` / 首次配置向导只写这里——env override 或 home，**绝不写 exe 同级**
- * （U 盘可能只读，且不该污染产品目录）。读路径见 readSavedConfig 的分层。
+ * 建议的单次输出 token 上限：min(32768, max(4096, contextWindow×0.25))。
+ * 上限 32768（非更保守的 16384）呼应 .env.example 的实测教训——16384 偏紧，写大 JSON
+ * 输出时会被截断；maxTokens 是上限不是预订额度，设大不额外花钱。
  */
+export function defaultMaxTokens(contextWindow) {
+    return Math.min(32_768, Math.max(4_096, Math.round(contextWindow * 0.25)));
+}
+function homeConfigPath() {
+    return join(process.env.MINIMAL_AGENT_HOME ?? homedir(), '.minimal-agent', 'config.json');
+}
 export function getConfigFilePath() {
     return process.env.MINIMAL_AGENT_CONFIG_FILE ?? homeConfigPath();
 }
-/** home 默认配置路径（读分层的最后一档；也是 getConfigFilePath 的默认写入位置）。 */
-function homeConfigPath() {
-    return join(homedir(), '.minimal-agent', 'config.json');
+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));
+}
+function nonEmpty(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+// ---------------- v4（当前）解析 ----------------
+function parseModel(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    const raw = value;
+    const id = nonEmpty(raw.id);
+    const baseURL = nonEmpty(raw.baseURL);
+    const model = nonEmpty(raw.model);
+    if (!id || !baseURL || !model)
+        return null;
+    const apiKey = typeof raw.apiKey === 'string' ? raw.apiKey.trim() : '';
+    const displayName = nonEmpty(raw.displayName);
+    const now = Date.now();
+    return {
+        id,
+        apiFormat: raw.apiFormat === 'anthropic' ? 'anthropic' : 'openai',
+        ...(displayName ? { displayName } : {}),
+        baseURL,
+        apiKey,
+        model,
+        contextWindow: positiveNumber(raw.contextWindow) ?? DEFAULT_CONTEXT_WINDOW,
+        ...(positiveNumber(raw.maxTokens) !== undefined ? { maxTokens: positiveNumber(raw.maxTokens) } : {}),
+        supportsVision: raw.supportsVision !== false,
+        enabled: raw.enabled !== false,
+        createdAt: positiveNumber(raw.createdAt) ?? now,
+        updatedAt: positiveNumber(raw.updatedAt) ?? now,
+    };
+}
+function parseModels(value) {
+    if (!Array.isArray(value))
+        return [];
+    const out = [];
+    for (const item of value) {
+        const model = parseModel(item);
+        if (model)
+            out.push(model);
+    }
+    return out;
+}
+function parseTools(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    const raw = value;
+    const out = {};
+    const search = raw.webSearch;
+    const searchKey = nonEmpty(search?.apiKey);
+    if (searchKey)
+        out.webSearch = { provider: 'tavily', apiKey: searchKey };
+    const image = raw.imageGeneration;
+    const imageBaseURL = nonEmpty(image?.baseURL);
+    const imageApiKey = nonEmpty(image?.apiKey);
+    const imageModel = nonEmpty(image?.model);
+    if (imageBaseURL && imageApiKey && imageModel) {
+        const protocol = image?.protocol === 'chat' || image?.protocol === 'images' ? image.protocol : 'auto';
+        out.imageGeneration = {
+            provider: nonEmpty(image?.provider) ?? 'openai',
+            baseURL: imageBaseURL,
+            apiKey: imageApiKey,
+            model: imageModel,
+            protocol,
+        };
+    }
+    const openRouterKey = nonEmpty(raw.openRouter?.apiKey);
+    if (openRouterKey)
+        out.openRouter = { apiKey: openRouterKey };
+    const speech = raw.textToSpeech;
+    const speechKey = nonEmpty(speech?.apiKey);
+    const groupId = nonEmpty(speech?.groupId);
+    if (speechKey && groupId)
+        out.textToSpeech = { provider: 'minimax', apiKey: speechKey, groupId };
+    return out;
+}
+function parseAdvisor(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    const raw = value;
+    return {
+        enabled: raw.enabled !== false,
+        mode: raw.mode === 'manual' ? 'manual' : 'auto',
+        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),
+    };
+}
+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),
+        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),
+    };
+}
+function parseBrowser(value) {
+    const raw = value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    return {
+        enabled: raw.enabled !== false,
+        profileId: 'default',
+        developerMode: raw.developerMode === true,
+        allowedCdpOrigins: Array.isArray(raw.allowedCdpOrigins)
+            ? raw.allowedCdpOrigins.filter((item) => typeof item === 'string' && /^https?:\/\//i.test(item)).slice(0, 100)
+            : [],
+    };
+}
+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;
+    return {
+        version: 4,
+        models: parseModels(data.models),
+        baseModelId: nonEmpty(data.baseModelId) ?? null,
+        ...(compactRatio !== undefined ? { compactRatio } : {}),
+        ...(advisor ? { advisor } : {}),
+        subagents: parseSubagents(data.subagents),
+        browser: parseBrowser(data.browser),
+        tools: parseTools(data.tools),
+        ...(data.drafts && typeof data.drafts === 'object' && !Array.isArray(data.drafts)
+            ? { drafts: structuredClone(data.drafts) }
+            : {}),
+        savedAt: typeof data.savedAt === 'number' ? data.savedAt : 0,
+    };
+}
+function parseLegacyProviderConfig(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    const raw = value;
+    const baseURL = nonEmpty(raw.baseURL);
+    const apiKey = typeof raw.apiKey === 'string' ? raw.apiKey.trim() : undefined;
+    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;
+    return {
+        name: nonEmpty(raw.name) ?? 'env',
+        baseURL,
+        apiKey,
+        model,
+        contextWindow: positiveNumber(raw.contextWindow) ?? DEFAULT_CONTEXT_WINDOW,
+        ...(compactRatio !== undefined ? { compactRatio } : {}),
+        ...(positiveNumber(raw.maxTokens) !== undefined ? { maxTokens: positiveNumber(raw.maxTokens) } : {}),
+    };
+}
+function parseLegacyAdvisorConfig(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    const raw = value;
+    const provider = parseLegacyProviderConfig(raw.provider);
+    if (!provider)
+        return undefined;
+    return {
+        enabled: raw.enabled !== false,
+        mode: raw.mode === 'manual' ? 'manual' : 'auto',
+        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),
+    };
 }
 /**
- * 解析单个 config.json：不存在 / JSON 损坏 / 必填字段缺失 → null；成功 → SavedConfig。
+ * 把「单一基座 provider + 可选单一顾问 provider」的旧形状构造成 v4 的模型列表形状。
+ * v1（无 version 字段的扁平文件）与 v2/v3（provider/advisor 单对象）迁移路径共用这一个函数。
  */
+function buildV4FromLegacy(legacyProvider, legacyAdvisor, subagents, tools, savedAt) {
+    const now = Date.now();
+    const baseModel = {
+        id: 'migrated-base',
+        apiFormat: 'openai',
+        ...(legacyProvider.name !== 'env' ? { displayName: legacyProvider.name } : {}),
+        baseURL: legacyProvider.baseURL,
+        apiKey: legacyProvider.apiKey,
+        model: legacyProvider.model,
+        contextWindow: legacyProvider.contextWindow,
+        ...(legacyProvider.maxTokens !== undefined ? { maxTokens: legacyProvider.maxTokens } : {}),
+        enabled: true,
+        createdAt: now,
+        updatedAt: now,
+    };
+    const models = [baseModel];
+    let advisor;
+    if (legacyAdvisor) {
+        const sameAsBase = legacyAdvisor.provider.baseURL === baseModel.baseURL
+            && legacyAdvisor.provider.apiKey === baseModel.apiKey
+            && legacyAdvisor.provider.model === baseModel.model;
+        let advisorModelId;
+        if (sameAsBase) {
+            if (legacyAdvisor.supportsVision)
+                baseModel.supportsVision = true;
+            advisorModelId = baseModel.id;
+        }
+        else {
+            const advisorModel = {
+                id: 'migrated-advisor',
+                apiFormat: 'openai',
+                ...(legacyAdvisor.provider.name !== 'advisor' ? { displayName: legacyAdvisor.provider.name } : {}),
+                baseURL: legacyAdvisor.provider.baseURL,
+                apiKey: legacyAdvisor.provider.apiKey,
+                model: legacyAdvisor.provider.model,
+                contextWindow: legacyAdvisor.provider.contextWindow,
+                ...(legacyAdvisor.provider.maxTokens !== undefined ? { maxTokens: legacyAdvisor.provider.maxTokens } : {}),
+                ...(legacyAdvisor.supportsVision ? { supportsVision: true } : {}),
+                enabled: true,
+                createdAt: now,
+                updatedAt: now,
+            };
+            models.push(advisorModel);
+            advisorModelId = advisorModel.id;
+        }
+        advisor = {
+            enabled: legacyAdvisor.enabled,
+            mode: legacyAdvisor.mode,
+            modelId: advisorModelId,
+            contextPolicy: 'full-relevant',
+            shareSensitive: legacyAdvisor.shareSensitive,
+            inputTokenBudget: legacyAdvisor.inputTokenBudget,
+            timeoutMs: legacyAdvisor.timeoutMs,
+        };
+    }
+    return {
+        version: 4,
+        models,
+        baseModelId: baseModel.id,
+        ...(legacyProvider.compactRatio !== undefined ? { compactRatio: legacyProvider.compactRatio } : {}),
+        ...(advisor ? { advisor } : {}),
+        subagents,
+        browser: DEFAULT_BROWSER_CONFIG,
+        tools,
+        savedAt,
+    };
+}
+function migrateV1(data) {
+    const provider = parseLegacyProviderConfig({
+        name: data.provider,
+        baseURL: data.baseURL,
+        apiKey: data.apiKey,
+        model: data.model,
+        contextWindow: data.contextWindow,
+        compactRatio: data.compactRatio,
+        maxTokens: data.maxTokens,
+    });
+    if (!provider)
+        return null;
+    const tools = {};
+    const tavilyApiKey = nonEmpty(data.tavilyApiKey);
+    if (tavilyApiKey)
+        tools.webSearch = { provider: 'tavily', apiKey: tavilyApiKey };
+    return buildV4FromLegacy(provider, undefined, DEFAULT_SUBAGENTS_CONFIG, tools, typeof data.savedAt === 'number' ? data.savedAt : 0);
+}
+function migrateV3(data) {
+    const provider = parseLegacyProviderConfig(data.provider);
+    if (!provider)
+        return null;
+    const advisor = parseLegacyAdvisorConfig(data.advisor);
+    return buildV4FromLegacy(provider, advisor, parseSubagents(data.subagents), parseTools(data.tools), typeof data.savedAt === 'number' ? data.savedAt : 0);
+}
 async function parseConfigFile(file) {
     try {
-        const raw = await readFile(file, 'utf8');
-        const data = JSON.parse(raw);
-        if (typeof data.baseURL !== 'string' ||
-            typeof data.apiKey !== 'string' ||
-            typeof data.model !== 'string' ||
-            data.baseURL.length === 0 ||
-            data.apiKey.length === 0 ||
-            data.model.length === 0) {
+        const data = JSON.parse(await readFile(file, 'utf8'));
+        if (!data || typeof data !== 'object' || Array.isArray(data))
             return null;
+        const object = data;
+        const current = parseCurrent(object);
+        if (current)
+            return { config: current, migrated: object.version !== 4, fromVersion: 4 };
+        if (object.version === 2 || object.version === 3) {
+            const migrated = migrateV3(object);
+            if (migrated)
+                return { config: migrated, migrated: true, fromVersion: object.version };
         }
-        return {
-            baseURL: data.baseURL,
-            apiKey: data.apiKey,
-            model: data.model,
-            provider: typeof data.provider === 'string' ? data.provider : undefined,
-            contextWindow: typeof data.contextWindow === 'number' && data.contextWindow > 0
-                ? data.contextWindow
-                : undefined,
-            compactRatio: typeof data.compactRatio === 'number' &&
-                data.compactRatio > 0 &&
-                data.compactRatio <= 1
-                ? data.compactRatio
-                : undefined,
-            tavilyApiKey: typeof data.tavilyApiKey === 'string' && data.tavilyApiKey.length > 0
-                ? data.tavilyApiKey
-                : undefined,
-            savedAt: typeof data.savedAt === 'number' ? data.savedAt : 0,
-        };
+        const migrated = migrateV1(object);
+        return migrated ? { config: migrated, migrated: true, fromVersion: 1 } : null;
     }
     catch {
         return null;
     }
 }
-/**
- * 读取已保存的 provider 配置（**分层**，按优先级返回第一个有效的）：
- *   1. `MINIMAL_AGENT_CONFIG_FILE` 显式覆盖 —— **只读这一个，不 fallthrough**
- *      （保持既有语义 + 测试隔离）
- *   2. exe 同级 `config.json` —— **绿色版 / U 盘的卖家预置配置**（compile 后
- *      `execSiblingDir()` = 真实 exe 目录；dev/npm 下是 node/bun 二进制目录、无此文件 → 跳过）
- *   3. `~/.minimal-agent/config.json` —— 首次配置向导写出的（原行为）
- *
- * 这层让卖家把配好的 config.json 放进绿色目录即完成预配置，客户端零配置开箱即用
- * （loadProviderLayered 拿到 provider → 不进向导、`-p` 不报 config_error）。
- *
- * 加性保证：dev / npm 模式无 override 时，exe 同级无 config.json → 只命中 home → 行为不变。
- */
-export async function readSavedConfig() {
+function processIsAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === 'EPERM';
+    }
+}
+async function acquireConfigLock(file) {
+    const lockDir = `${file}.lock`;
+    const ownerFile = join(lockDir, 'owner.json');
+    const startedAt = Date.now();
+    await mkdir(dirname(file), { recursive: true, mode: 0o700 });
+    while (true) {
+        try {
+            await mkdir(lockDir, { mode: 0o700 });
+            await writeFile(ownerFile, JSON.stringify({ pid: process.pid, createdAt: Date.now() }), { mode: 0o600 });
+            return async () => { await rm(lockDir, { recursive: true, force: true }); };
+        }
+        catch (error) {
+            if (error.code !== 'EEXIST')
+                throw error;
+            let stale = false;
+            try {
+                const [ownerRaw, info] = await Promise.all([readFile(ownerFile, 'utf8'), stat(lockDir)]);
+                const owner = JSON.parse(ownerRaw);
+                stale = typeof owner.pid === 'number' ? !processIsAlive(owner.pid) : Date.now() - info.mtimeMs > LOCK_STALE_MS;
+            }
+            catch {
+                try {
+                    const info = await stat(lockDir);
+                    stale = Date.now() - info.mtimeMs > LOCK_STALE_MS;
+                }
+                catch {
+                    stale = false;
+                }
+            }
+            if (stale) {
+                await rm(lockDir, { recursive: true, force: true });
+                continue;
+            }
+            if (Date.now() - startedAt > LOCK_WAIT_MS)
+                throw new Error('等待配置文件锁超时');
+            await new Promise((resolve) => setTimeout(resolve, 40));
+        }
+    }
+}
+async function writeConfigFile(file, config) {
+    const release = await acquireConfigLock(file);
+    try {
+        await writeConfigFileUnlocked(file, config);
+    }
+    finally {
+        await release();
+    }
+}
+async function writeConfigFileUnlocked(file, config) {
+    const tmp = `${file}.${process.pid}.${randomUUID()}.tmp`;
+    try {
+        await mkdir(dirname(file), { recursive: true, mode: 0o700 });
+        await writeFile(tmp, JSON.stringify(config, null, 2), { encoding: 'utf8', mode: 0o600 });
+        await rename(tmp, file);
+        await chmod(file, 0o600).catch(() => { });
+    }
+    finally {
+        await unlink(tmp).catch(() => { });
+    }
+}
+function configCandidates() {
     const override = process.env.MINIMAL_AGENT_CONFIG_FILE;
-    if (override)
-        return parseConfigFile(override);
-    for (const file of [join(execSiblingDir(), 'config.json'), homeConfigPath()]) {
-        const cfg = await parseConfigFile(file);
-        if (cfg)
-            return cfg;
+    return override ? [override] : [homeConfigPath(), join(execSiblingDir(), 'config.json')];
+}
+export async function readMinimalAgentConfig(options = {}) {
+    for (const file of configCandidates()) {
+        const parsed = await parseConfigFile(file);
+        if (!parsed)
+            continue;
+        if (options.migrate !== false && (parsed.migrated || file !== getConfigFilePath())) {
+            // 备份只在「原地迁移会覆盖源文件」时才有意义（file == 权威写入位）。
+            // exe 同级（U 盘预置）源文件永不被覆盖，且「绝不写 U 盘」是产品红线——
+            // 曾在此给 U 盘目录写出 config.json.v1.backup（绿色版冒烟实测抓到）。
+            // 备份文件名按来源版本号命名（而非固定 .v1.backup）：一台机器可能先后经历
+            // v1→v3、又 v3→v4 两次迁移，固定文件名会让第二次覆盖第一次的备份。
+            if (parsed.migrated && file === getConfigFilePath()) {
+                await copyFile(file, `${file}.v${parsed.fromVersion}.backup`).catch(() => { });
+            }
+            // A schema-only migration must not invalidate a revision already returned to
+            // another process during startup.
+            await writeConfigFile(getConfigFilePath(), parsed.config);
+        }
+        return parsed.config;
     }
     return null;
 }
-/**
- * 写入向导收集到的配置。
- * unix 上 chmod 600（仅本人可读写），Windows 上 chmod 是 no-op，靠 NTFS ACL。
- */
-export async function saveConfig(cfg) {
+export async function saveMinimalAgentConfig(config) {
+    const next = {
+        version: 4,
+        models: config.models,
+        baseModelId: config.baseModelId,
+        ...(config.compactRatio !== undefined ? { compactRatio: config.compactRatio } : {}),
+        advisor: config.advisor,
+        subagents: config.subagents ?? DEFAULT_SUBAGENTS_CONFIG,
+        browser: config.browser ?? DEFAULT_BROWSER_CONFIG,
+        tools: config.tools,
+        drafts: config.drafts,
+        savedAt: Date.now(),
+    };
+    await writeConfigFile(getConfigFilePath(), next);
+    return next;
+}
+/** Cross-process read-modify-write. The mutator never sees a partially written file. */
+export async function updateMinimalAgentConfig(mutate) {
     const file = getConfigFilePath();
-    await mkdir(dirname(file), { recursive: true });
-    const data = { ...cfg, savedAt: Date.now() };
-    await writeFile(file, JSON.stringify(data, null, 2), 'utf8');
+    const release = await acquireConfigLock(file);
     try {
-        await chmod(file, 0o600);
+        const current = (await parseConfigFile(file))?.config ?? null;
+        const value = mutate(current);
+        const next = {
+            version: 4,
+            models: value.models,
+            baseModelId: value.baseModelId,
+            ...(value.compactRatio !== undefined ? { compactRatio: value.compactRatio } : {}),
+            advisor: value.advisor,
+            subagents: value.subagents ?? current?.subagents ?? DEFAULT_SUBAGENTS_CONFIG,
+            browser: value.browser ?? current?.browser ?? DEFAULT_BROWSER_CONFIG,
+            tools: value.tools,
+            drafts: value.drafts,
+            savedAt: Math.max(Date.now(), (current?.savedAt ?? 0) + 1),
+        };
+        await writeConfigFileUnlocked(file, next);
+        return next;
     }
-    catch {
+    finally {
+        await release();
     }
 }