colyn-cli 3.1.4

package/dist/core/config-loader.d.ts

@@ -0,0 +1,47 @@
+/**
+ * 配置文件加载模块
+ *
+ * 支持从文件系统加载配置文件：
+ * - JSON 格式（使用 JSON5 解析，支持注释）
+ * - YAML 格式
+ *
+ * 配置文件位置：
+ * - 用户级：~/.config/colyn/settings.{json|yaml|yml}
+ * - 项目级：{projectRoot}/.colyn/settings.{json|yaml|yml}
+ */
+import type { Settings } from './config-schema.js';
+/**
+ * 获取用户级配置目录
+ * @returns 用户配置目录路径
+ */
+export declare function getUserConfigDir(): string;
+/**
+ * 获取项目级配置目录
+ * @param projectRoot 项目根目录
+ * @returns 项目配置目录路径
+ */
+export declare function getProjectConfigDir(projectRoot: string): string;
+/**
+ * 加载用户级配置
+ * @returns 用户配置对象，如果不存在则返回 null
+ */
+export declare function loadUserConfig(): Promise<Settings | null>;
+/**
+ * 加载项目级配置
+ * @param projectRoot 项目根目录
+ * @returns 项目配置对象，如果不存在则返回 null
+ */
+export declare function loadProjectConfig(projectRoot: string): Promise<Settings | null>;
+/**
+ * 保存配置到文件
+ * @param filepath 配置文件路径
+ * @param settings 配置对象
+ */
+export declare function saveConfigFile(filepath: string, settings: Settings): Promise<void>;
+/**
+ * 查找配置文件路径
+ * @param dir 配置目录
+ * @returns 找到的配置文件路径，如果不存在则返回 null
+ */
+export declare function findConfigFilePath(dir: string): Promise<string | null>;
+//# sourceMappingURL=config-loader.d.ts.map

package/dist/core/config-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/core/config-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAwGnD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAG/D;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAGrF;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAW5E"}

package/dist/core/config-loader.js

@@ -0,0 +1,188 @@
+/**
+ * 配置文件加载模块
+ *
+ * 支持从文件系统加载配置文件：
+ * - JSON 格式（使用 JSON5 解析，支持注释）
+ * - YAML 格式
+ *
+ * 配置文件位置：
+ * - 用户级：~/.config/colyn/settings.{json|yaml|yml}
+ * - 项目级：{projectRoot}/.colyn/settings.{json|yaml|yml}
+ */
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import JSON5 from 'json5';
+import yaml from 'js-yaml';
+import { z } from 'zod';
+import { loadAndMigrateConfig } from './config-migration.js';
+/**
+ * 配置文件名（按优先级排序）
+ */
+const CONFIG_FILENAMES = ['settings.json', 'settings.yaml', 'settings.yml'];
+/**
+ * 配置文件目录
+ */
+const CONFIG_DIR = '.colyn';
+const USER_CONFIG_DIR = '.config/colyn';
+/**
+ * 从文件加载并解析配置
+ * @param filepath 配置文件路径
+ * @returns 包含配置对象和是否发生迁移的信息
+ * @throws Error 如果文件格式错误或验证失败
+ */
+async function loadConfigFile(filepath) {
+    try {
+        const content = await fs.readFile(filepath, 'utf-8');
+        const ext = path.extname(filepath);
+        let rawConfig;
+        if (ext === '.json') {
+            // 使用 JSON5 解析（支持注释和尾部逗号）
+            rawConfig = JSON5.parse(content);
+        }
+        else if (ext === '.yaml' || ext === '.yml') {
+            // 使用 js-yaml 解析
+            rawConfig = yaml.load(content);
+        }
+        else {
+            throw new Error(`不支持的配置文件格式: ${ext}`);
+        }
+        // 检查原始配置的版本号
+        const oldVersion = rawConfig.version ?? 0;
+        // 使用 Zod 验证和迁移配置
+        let migratedConfig;
+        try {
+            migratedConfig = loadAndMigrateConfig(rawConfig);
+        }
+        catch (error) {
+            if (error instanceof z.ZodError) {
+                const messages = error.issues
+                    .map((e) => `  - ${e.path.join('.')}: ${e.message}`)
+                    .join('\n');
+                throw new Error(`配置文件验证失败 (${filepath}):\n${messages}`);
+            }
+            throw error;
+        }
+        // 检查是否发生了迁移
+        const wasMigrated = oldVersion !== migratedConfig.version;
+        return { config: migratedConfig, wasMigrated };
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return null; // 文件不存在
+        }
+        throw error;
+    }
+}
+/**
+ * 从目录加载配置（尝试多个文件名）
+ * @param dir 配置目录路径
+ * @returns 找到的第一个有效配置，如果都不存在则返回 null
+ */
+async function loadConfigFromDir(dir) {
+    for (const filename of CONFIG_FILENAMES) {
+        const filepath = path.join(dir, filename);
+        try {
+            const result = await loadConfigFile(filepath);
+            if (result !== null) {
+                // 如果配置发生了迁移，自动保存
+                if (result.wasMigrated) {
+                    await saveConfigFile(filepath, result.config);
+                }
+                return result.config;
+            }
+        }
+        catch (error) {
+            // 如果是验证错误或格式错误，继续尝试下一个文件
+            // 但如果是其他错误（如权限问题），应该抛出
+            if (error instanceof Error &&
+                (error.message.includes('配置文件验证失败') ||
+                    error.message.includes('不支持的配置文件格式'))) {
+                // 跳过格式错误的文件，继续尝试下一个
+                continue;
+            }
+            // 其他错误直接抛出
+            throw error;
+        }
+    }
+    return null;
+}
+/**
+ * 获取用户级配置目录
+ * @returns 用户配置目录路径
+ */
+export function getUserConfigDir() {
+    return path.join(os.homedir(), USER_CONFIG_DIR);
+}
+/**
+ * 获取项目级配置目录
+ * @param projectRoot 项目根目录
+ * @returns 项目配置目录路径
+ */
+export function getProjectConfigDir(projectRoot) {
+    return path.join(projectRoot, CONFIG_DIR);
+}
+/**
+ * 加载用户级配置
+ * @returns 用户配置对象，如果不存在则返回 null
+ */
+export async function loadUserConfig() {
+    const configDir = getUserConfigDir();
+    return loadConfigFromDir(configDir);
+}
+/**
+ * 加载项目级配置
+ * @param projectRoot 项目根目录
+ * @returns 项目配置对象，如果不存在则返回 null
+ */
+export async function loadProjectConfig(projectRoot) {
+    const configDir = getProjectConfigDir(projectRoot);
+    return loadConfigFromDir(configDir);
+}
+/**
+ * 保存配置到文件
+ * @param filepath 配置文件路径
+ * @param settings 配置对象
+ */
+export async function saveConfigFile(filepath, settings) {
+    const ext = path.extname(filepath);
+    let content;
+    if (ext === '.json') {
+        // JSON 格式（格式化输出）
+        content = JSON.stringify(settings, null, 2);
+    }
+    else if (ext === '.yaml' || ext === '.yml') {
+        // YAML 格式
+        content = yaml.dump(settings, {
+            indent: 2,
+            lineWidth: -1, // 不自动换行
+        });
+    }
+    else {
+        throw new Error(`不支持的配置文件格式: ${ext}`);
+    }
+    // 确保目录存在
+    const dir = path.dirname(filepath);
+    await fs.mkdir(dir, { recursive: true });
+    // 写入文件
+    await fs.writeFile(filepath, content, 'utf-8');
+}
+/**
+ * 查找配置文件路径
+ * @param dir 配置目录
+ * @returns 找到的配置文件路径，如果不存在则返回 null
+ */
+export async function findConfigFilePath(dir) {
+    for (const filename of CONFIG_FILENAMES) {
+        const filepath = path.join(dir, filename);
+        try {
+            await fs.access(filepath);
+            return filepath;
+        }
+        catch {
+            continue;
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=config-loader.js.map

package/dist/core/config-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/core/config-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,MAAM,gBAAgB,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,CAAU,CAAC;AAErF;;GAEG;AACH,MAAM,UAAU,GAAG,QAAQ,CAAC;AAC5B,MAAM,eAAe,GAAG,eAAe,CAAC;AAExC;;;;;GAKG;AACH,KAAK,UAAU,cAAc,CAAC,QAAgB;IAI5C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEnC,IAAI,SAAkB,CAAC;QACvB,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YACpB,yBAAyB;YACzB,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YAC7C,gBAAgB;YAChB,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC;QAED,aAAa;QACb,MAAM,UAAU,GACb,SAAkC,CAAC,OAAO,IAAI,CAAC,CAAC;QAEnD,iBAAiB;QACjB,IAAI,cAAwB,CAAC;QAC7B,IAAI,CAAC;YACH,cAAc,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM;qBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;qBACnD,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,IAAI,KAAK,CAAC,aAAa,QAAQ,OAAO,QAAQ,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,YAAY;QACZ,MAAM,WAAW,GAAG,UAAU,KAAK,cAAc,CAAC,OAAO,CAAC;QAE1D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,CAAC,QAAQ;QACvB,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC1C,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,iBAAiB;gBACjB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC;YACvB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,yBAAyB;YACzB,uBAAuB;YACvB,IACE,KAAK,YAAY,KAAK;gBACtB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;oBACjC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EACvC,CAAC;gBACD,oBAAoB;gBACpB,SAAS;YACX,CAAC;YACD,WAAW;YACX,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IACrC,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,WAAmB;IACzD,MAAM,SAAS,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACnD,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,QAAkB;IAElB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,OAAe,CAAC;IACpB,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;QACpB,iBAAiB;QACjB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QAC7C,UAAU;QACV,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,CAAC;YACT,SAAS,EAAE,CAAC,CAAC,EAAE,QAAQ;SACxB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,SAAS;IACT,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzC,OAAO;IACP,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW;IAClD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC1B,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/core/config-merger.d.ts

@@ -0,0 +1,29 @@
+/**
+ * 配置合并模块
+ *
+ * 使用 deepmerge 实现多层配置的合并
+ * - 支持深度合并对象
+ * - 数组采用替换策略（而非合并）
+ * - 保持字段级覆盖（Field-level Override）
+ */
+import type { Settings, TmuxConfig } from './config-schema.js';
+/**
+ * 合并多个配置对象
+ * @param configs 配置对象数组（null 会被过滤掉）
+ * @returns 合并后的配置对象
+ */
+export declare function mergeConfigs(...configs: Array<Settings | null>): Settings;
+/**
+ * 合并 Tmux 配置
+ * @param configs Tmux 配置对象数组（null 会被过滤掉）
+ * @returns 合并后的 Tmux 配置对象
+ */
+export declare function mergeTmuxConfigs(...configs: Array<TmuxConfig | null | undefined>): TmuxConfig;
+/**
+ * 应用分支特定的配置覆盖
+ * @param settings 基础配置
+ * @param branchName 分支名称
+ * @returns 应用分支覆盖后的配置
+ */
+export declare function applyBranchOverrides(settings: Settings, branchName: string): Settings;
+//# sourceMappingURL=config-merger.d.ts.map

package/dist/core/config-merger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-merger.d.ts","sourceRoot":"","sources":["../../src/core/config-merger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAkB/D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,QAAQ,CAYzE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,OAAO,EAAE,KAAK,CAAC,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC,GAC/C,UAAU,CAcZ;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,GACjB,QAAQ,CA4CV"}

package/dist/core/config-merger.js

@@ -0,0 +1,100 @@
+/**
+ * 配置合并模块
+ *
+ * 使用 deepmerge 实现多层配置的合并
+ * - 支持深度合并对象
+ * - 数组采用替换策略（而非合并）
+ * - 保持字段级覆盖（Field-level Override）
+ */
+import deepmerge from 'deepmerge';
+/**
+ * 合并配置选项
+ */
+const MERGE_OPTIONS = {
+    // 数组替换而非合并
+    // 例如：branchOverrides 中的数组应该完全替换，而不是合并
+    arrayMerge: (_target, source) => source,
+    // 自定义合并函数（可选）
+    customMerge: (_key) => {
+        // 对于特定字段可以自定义合并逻辑
+        // 目前使用默认行为
+        return undefined;
+    },
+};
+/**
+ * 合并多个配置对象
+ * @param configs 配置对象数组（null 会被过滤掉）
+ * @returns 合并后的配置对象
+ */
+export function mergeConfigs(...configs) {
+    const validConfigs = configs.filter((c) => c !== null);
+    if (validConfigs.length === 0) {
+        throw new Error('至少需要一个有效的配置对象');
+    }
+    if (validConfigs.length === 1) {
+        return validConfigs[0];
+    }
+    return deepmerge.all(validConfigs, MERGE_OPTIONS);
+}
+/**
+ * 合并 Tmux 配置
+ * @param configs Tmux 配置对象数组（null 会被过滤掉）
+ * @returns 合并后的 Tmux 配置对象
+ */
+export function mergeTmuxConfigs(...configs) {
+    const validConfigs = configs.filter((c) => c !== null && c !== undefined);
+    if (validConfigs.length === 0) {
+        return {};
+    }
+    if (validConfigs.length === 1) {
+        return validConfigs[0];
+    }
+    return deepmerge.all(validConfigs, MERGE_OPTIONS);
+}
+/**
+ * 应用分支特定的配置覆盖
+ * @param settings 基础配置
+ * @param branchName 分支名称
+ * @returns 应用分支覆盖后的配置
+ */
+export function applyBranchOverrides(settings, branchName) {
+    if (!settings.branchOverrides) {
+        return settings;
+    }
+    // 查找匹配的分支覆盖配置
+    let matchedOverride = null;
+    // 1. 精确匹配（优先级最高）
+    if (settings.branchOverrides[branchName]) {
+        matchedOverride = settings.branchOverrides[branchName];
+    }
+    else {
+        // 2. 通配符匹配
+        for (const [pattern, override] of Object.entries(settings.branchOverrides)) {
+            if (pattern.includes('*')) {
+                // 将通配符模式转换为正则表达式
+                const regexPattern = pattern
+                    .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // 转义特殊字符
+                    .replace(/\*/g, '.*'); // 将 * 替换为 .*
+                const regex = new RegExp(`^${regexPattern}$`);
+                if (regex.test(branchName)) {
+                    matchedOverride = override;
+                    break; // 使用第一个匹配的通配符模式
+                }
+            }
+        }
+    }
+    // 如果没有匹配的覆盖配置，返回原配置
+    if (!matchedOverride) {
+        return settings;
+    }
+    // 合并基础配置和分支覆盖配置
+    // 注意：不包含 branchOverrides 本身，避免无限递归
+    const { branchOverrides, ...baseSettings } = settings;
+    const mergedSettings = deepmerge(baseSettings, matchedOverride, MERGE_OPTIONS);
+    // 保留原始的 branchOverrides
+    return {
+        ...mergedSettings,
+        branchOverrides,
+    };
+}
+//# sourceMappingURL=config-merger.js.map

package/dist/core/config-merger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-merger.js","sourceRoot":"","sources":["../../src/core/config-merger.ts"],"names":[],"mappings":"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"}

package/dist/core/config-migration.d.ts

@@ -0,0 +1,64 @@
+/**
+ * 配置版本迁移模块
+ *
+ * 使用 Zod transform 实现配置文件的版本迁移
+ * - V0 (无版本号) -> V3
+ * - V1 -> V2
+ * - V2 -> V3
+ * - V3 -> V4
+ *
+ * 迁移内容：
+ * - V0 -> V1: 添加版本号
+ * - V1 -> V2: 配置结构重构和废弃命令处理
+ * - V2 -> V3: 重命名内置命令（去掉 "auto" 前缀）
+ * - V3 -> V4: 插件系统重构（plugins/pluginSettings → toolchain/projects）
+ */
+import { z } from 'zod';
+import { type Settings, type TmuxConfig } from './config-schema.js';
+/**
+ * V1 Settings 类型（带有旧字段：npm, claudeCommand）
+ */
+type V1Settings = {
+    version?: number;
+    lang?: string;
+    npm?: string;
+    claudeCommand?: string;
+    tmux?: TmuxConfig;
+    branchOverrides?: Record<string, Partial<V1Settings>>;
+};
+/**
+ * V2 Settings 类型（已有 systemCommands，但内置命令还有 "auto" 前缀）
+ */
+type V2Settings = Omit<Settings, 'version'> & {
+    version: 2;
+};
+/**
+ * V3 Settings 类型（含旧字段：plugins, pluginSettings）
+ */
+type V3Settings = {
+    version: 3;
+    lang?: 'en' | 'zh-CN';
+    systemCommands?: {
+        npm?: string;
+        claude?: string;
+    };
+    tmux?: TmuxConfig;
+    plugins?: string[];
+    pluginSettings?: Record<string, Record<string, unknown>>;
+    branchOverrides?: Record<string, Partial<V3Settings>>;
+};
+/**
+ * 统一的配置 Schema（支持所有版本）
+ * Zod 会自动选择匹配的 Schema 并执行 transform
+ *
+ * 注意：顺序很重要，version literal 更具体的 Schema 放在前面
+ */
+export declare const ConfigSchema: z.ZodUnion<readonly [z.ZodPipe<z.ZodType<V1Settings, unknown, z.core.$ZodTypeInternals<V1Settings, unknown>>, z.ZodTransform<Settings, V1Settings>>, z.ZodPipe<z.ZodType<V1Settings, unknown, z.core.$ZodTypeInternals<V1Settings, unknown>>, z.ZodTransform<V2Settings, V1Settings>>, z.ZodPipe<z.ZodType<V2Settings, unknown, z.core.$ZodTypeInternals<V2Settings, unknown>>, z.ZodTransform<Settings, V2Settings>>, z.ZodPipe<z.ZodType<V3Settings, unknown, z.core.$ZodTypeInternals<V3Settings, unknown>>, z.ZodTransform<Settings, V3Settings>>, z.ZodType<Settings, unknown, z.core.$ZodTypeInternals<Settings, unknown>>]>;
+/**
+ * 加载并自动迁移配置
+ * @param rawConfig 原始配置数据
+ * @returns 迁移后的配置
+ */
+export declare function loadAndMigrateConfig(rawConfig: unknown): Settings;
+export {};
+//# sourceMappingURL=config-migration.d.ts.map

package/dist/core/config-migration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-migration.d.ts","sourceRoot":"","sources":["../../src/core/config-migration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,UAAU,EAEhB,MAAM,oBAAoB,CAAC;AAkB5B;;GAEG;AACH,KAAK,UAAU,GAAG;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;CACvD,CAAC;AAoBF;;GAEG;AACH,KAAK,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG;IAC5C,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAoPF;;GAEG;AACH,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;CACvD,CAAC;AAyIF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,omBAMvB,CAAC;AAEH;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,OAAO,GAAG,QAAQ,CAEjE"}