colyn-cli 3.1.4

package/dist/core/config-migration.js

@@ -0,0 +1,340 @@
+/**
+ * 配置版本迁移模块
+ *
+ * 使用 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 { BUILTIN_COMMANDS, TmuxConfigSchema, } from './config-schema.js';
+/**
+ * 废弃的内置命令常量
+ */
+const DEPRECATED_BUILTIN_COMMANDS = {
+    /** V1 废弃 */
+    AUTO_CLAUDE_DANGEROUSLY: 'auto continues claude session with dangerously skip permissions',
+    /** V2 废弃（V3 改为无 "auto" 前缀） */
+    AUTO_CLAUDE_OLD: 'auto continues claude session',
+    AUTO_DEV_SERVER_OLD: 'auto start dev server',
+};
+const V1SettingsSchemaBase = z.object({
+    version: z.literal(1),
+    lang: z.enum(['en', 'zh-CN']).optional(),
+    npm: z.string().optional(),
+    claudeCommand: z.string().optional(),
+    tmux: TmuxConfigSchema.optional(),
+});
+const V1SettingsSchema = V1SettingsSchemaBase.extend({
+    branchOverrides: z
+        .record(z.string(), z.lazy(() => V1SettingsSchema))
+        .optional(),
+});
+const V2SettingsSchemaBase = z.object({
+    version: z.literal(2),
+    lang: z.enum(['en', 'zh-CN']).optional(),
+    systemCommands: z
+        .object({
+        npm: z.string().optional(),
+        claude: z.string().optional(),
+    })
+        .optional(),
+    tmux: TmuxConfigSchema.optional(),
+});
+const V2SettingsSchema = V2SettingsSchemaBase.extend({
+    branchOverrides: z
+        .record(z.string(), z.lazy(() => V2SettingsSchema))
+        .optional(),
+});
+// ============================================================================
+// V0 Settings Schema（无版本号）
+// ============================================================================
+const V0SettingsSchemaBase = z.object({
+    version: z.undefined(),
+    lang: z.enum(['en', 'zh-CN']).optional(),
+    npm: z.string().optional(),
+    claudeCommand: z.string().optional(),
+    tmux: TmuxConfigSchema.optional(),
+});
+const V0SettingsSchema = V0SettingsSchemaBase.extend({
+    branchOverrides: z
+        .record(z.string(), z.lazy(() => V0SettingsSchema))
+        .optional(),
+});
+// ============================================================================
+// 迁移辅助函数
+// ============================================================================
+/**
+ * 迁移单个 Pane 配置中的废弃命令（V1->V2: dangerously）
+ */
+function migratePaneCommandV1ToV2(paneConfig) {
+    if (!paneConfig || !paneConfig.command) {
+        return { pane: paneConfig, needsDangerouslySkipPermissions: false };
+    }
+    if (paneConfig.command === DEPRECATED_BUILTIN_COMMANDS.AUTO_CLAUDE_DANGEROUSLY) {
+        return {
+            pane: {
+                ...paneConfig,
+                command: DEPRECATED_BUILTIN_COMMANDS.AUTO_CLAUDE_OLD,
+            },
+            needsDangerouslySkipPermissions: true,
+        };
+    }
+    return { pane: paneConfig, needsDangerouslySkipPermissions: false };
+}
+/**
+ * 迁移单个 Pane 配置中的命令名称（V2->V3: 去掉 "auto" 前缀）
+ */
+function migratePaneCommandV2ToV3(paneConfig) {
+    if (!paneConfig || !paneConfig.command) {
+        return paneConfig;
+    }
+    if (paneConfig.command === DEPRECATED_BUILTIN_COMMANDS.AUTO_CLAUDE_OLD) {
+        return {
+            ...paneConfig,
+            command: BUILTIN_COMMANDS.AUTO_CLAUDE,
+        };
+    }
+    if (paneConfig.command === DEPRECATED_BUILTIN_COMMANDS.AUTO_DEV_SERVER_OLD) {
+        return {
+            ...paneConfig,
+            command: BUILTIN_COMMANDS.AUTO_DEV_SERVER,
+        };
+    }
+    return paneConfig;
+}
+/**
+ * 迁移 Tmux 配置中的所有废弃命令（V1->V2）
+ */
+function migrateTmuxCommandsV1ToV2(tmuxConfig) {
+    if (!tmuxConfig) {
+        return { tmux: undefined, needsDangerouslySkipPermissions: false };
+    }
+    const migratedTmux = { ...tmuxConfig };
+    let needsFlag = false;
+    // 迁移所有 pane 配置
+    const panes = [
+        'leftPane',
+        'rightPane',
+        'topPane',
+        'bottomPane',
+        'topRightPane',
+        'bottomRightPane',
+        'topLeftPane',
+        'bottomLeftPane',
+    ];
+    for (const paneName of panes) {
+        const { pane, needsDangerouslySkipPermissions } = migratePaneCommandV1ToV2(tmuxConfig[paneName]);
+        migratedTmux[paneName] = pane;
+        needsFlag = needsFlag || needsDangerouslySkipPermissions;
+    }
+    return { tmux: migratedTmux, needsDangerouslySkipPermissions: needsFlag };
+}
+/**
+ * 迁移 Tmux 配置中的命令名称（V2->V3）
+ */
+function migrateTmuxCommandsV2ToV3(tmuxConfig) {
+    if (!tmuxConfig) {
+        return undefined;
+    }
+    const migratedTmux = { ...tmuxConfig };
+    // 迁移所有 pane 配置
+    const panes = [
+        'leftPane',
+        'rightPane',
+        'topPane',
+        'bottomPane',
+        'topRightPane',
+        'bottomRightPane',
+        'topLeftPane',
+        'bottomLeftPane',
+    ];
+    for (const paneName of panes) {
+        migratedTmux[paneName] = migratePaneCommandV2ToV3(tmuxConfig[paneName]);
+    }
+    return migratedTmux;
+}
+// ============================================================================
+// V1 -> V2 迁移
+// ============================================================================
+/**
+ * 递归迁移 V1 Settings 到 V2（处理 branchOverrides）
+ */
+function migrateV1ToV2Recursive(settings, isTopLevel = true) {
+    const result = {
+        version: 2,
+    };
+    // 迁移 lang
+    if (settings.lang) {
+        result.lang = settings.lang;
+    }
+    // 迁移 npm 和 claudeCommand 到 systemCommands
+    const hasOldNpm = 'npm' in settings && settings.npm !== undefined;
+    const hasOldClaudeCommand = 'claudeCommand' in settings && settings.claudeCommand !== undefined;
+    if (hasOldNpm || hasOldClaudeCommand) {
+        result.systemCommands = {};
+        if (hasOldNpm) {
+            result.systemCommands.npm = settings.npm;
+        }
+        if (hasOldClaudeCommand) {
+            result.systemCommands.claude = settings.claudeCommand;
+        }
+    }
+    // 迁移 tmux 配置和废弃命令
+    if (settings.tmux) {
+        const { tmux, needsDangerouslySkipPermissions } = migrateTmuxCommandsV1ToV2(settings.tmux);
+        result.tmux = tmux;
+        // 如果检测到废弃的命令，添加 --dangerously-skip-permissions 到 systemCommands.claude
+        if (needsDangerouslySkipPermissions && isTopLevel) {
+            result.systemCommands = result.systemCommands || {};
+            const currentClaudeCommand = result.systemCommands.claude || 'claude';
+            // 如果还没有 --dangerously-skip-permissions 参数，添加它
+            if (!currentClaudeCommand.includes('--dangerously-skip-permissions')) {
+                result.systemCommands.claude = `${currentClaudeCommand} --dangerously-skip-permissions`;
+            }
+        }
+    }
+    // 递归处理 branchOverrides
+    if (settings.branchOverrides) {
+        result.branchOverrides = {};
+        for (const [branch, branchSettings] of Object.entries(settings.branchOverrides)) {
+            result.branchOverrides[branch] = migrateV1ToV2Recursive(branchSettings, false);
+        }
+    }
+    return result;
+}
+/**
+ * V1 -> V2 Migration Schema
+ */
+const V1ToV2Schema = V1SettingsSchema.transform((v1) => migrateV1ToV2Recursive(v1));
+const V3SettingsSchemaBase = z.object({
+    version: z.literal(3),
+    lang: z.enum(['en', 'zh-CN']).optional(),
+    systemCommands: z
+        .object({
+        npm: z.string().optional(),
+        claude: z.string().optional(),
+    })
+        .optional(),
+    tmux: TmuxConfigSchema.optional(),
+    plugins: z.array(z.string()).optional(),
+    pluginSettings: z
+        .record(z.string(), z.record(z.string(), z.unknown()))
+        .optional(),
+});
+const V3SettingsSchema = V3SettingsSchemaBase.extend({
+    branchOverrides: z
+        .record(z.string(), z.lazy(() => V3SettingsSchema))
+        .optional(),
+});
+// ============================================================================
+// V2 -> V3 迁移
+// ============================================================================
+/**
+ * 递归迁移 V2 Settings 到 V3（处理 branchOverrides）
+ */
+function migrateV2ToV3Recursive(settings) {
+    const result = {
+        version: 3,
+        lang: settings.lang,
+        systemCommands: settings.systemCommands,
+    };
+    // 迁移 tmux 配置中的命令名称
+    if (settings.tmux) {
+        result.tmux = migrateTmuxCommandsV2ToV3(settings.tmux);
+    }
+    // 递归处理 branchOverrides
+    if (settings.branchOverrides) {
+        result.branchOverrides = {};
+        for (const [branch, branchSettings] of Object.entries(settings.branchOverrides)) {
+            result.branchOverrides[branch] = migrateV2ToV3Recursive(branchSettings);
+        }
+    }
+    return result;
+}
+/**
+ * V2 -> V3 Migration Schema
+ */
+const V2ToV3Schema = V2SettingsSchema.transform((v2) => migrateV2ToV3Recursive(v2));
+// ============================================================================
+// V3 -> V4 迁移
+// ============================================================================
+/**
+ * 递归迁移 V3 Settings 到 V4
+ * - 丢弃 plugins 和 pluginSettings（在运行时按需重新检测）
+ * - toolchain 和 projects 设为 undefined（触发按需发现）
+ */
+function migrateV3ToV4Recursive(settings) {
+    const result = {
+        version: 4,
+        lang: settings.lang,
+        systemCommands: settings.systemCommands,
+    };
+    if (settings.tmux) {
+        result.tmux = settings.tmux;
+    }
+    // 递归处理 branchOverrides
+    if (settings.branchOverrides) {
+        result.branchOverrides = {};
+        for (const [branch, branchSettings] of Object.entries(settings.branchOverrides)) {
+            result.branchOverrides[branch] = migrateV3ToV4Recursive(branchSettings);
+        }
+    }
+    // 注意：toolchain 和 projects 故意不设置（undefined），
+    // 这会在命令运行时触发「按需发现」流程重新检测工具链
+    return result;
+}
+/**
+ * V3 -> V4 Migration Schema
+ */
+const V3ToV4Schema = V3SettingsSchema.transform((v3) => migrateV3ToV4Recursive(v3));
+// ============================================================================
+// V0 -> V3 迁移（通过 V1 -> V2 -> V3）
+// ============================================================================
+/**
+ * V0 -> V3 Migration Schema
+ */
+const V0ToV3Schema = V0SettingsSchema.transform((v0) => {
+    // V0 -> V1: 添加版本号
+    const v1 = {
+        ...v0,
+        version: 1,
+    };
+    // V1 -> V2: 迁移配置结构
+    const v2 = migrateV1ToV2Recursive(v1);
+    // V2 -> V3: 重命名内置命令
+    return migrateV2ToV3Recursive(v2);
+});
+// ============================================================================
+// 统一配置 Schema
+// ============================================================================
+import { SettingsSchema } from './config-schema.js';
+/**
+ * 统一的配置 Schema（支持所有版本）
+ * Zod 会自动选择匹配的 Schema 并执行 transform
+ *
+ * 注意：顺序很重要，version literal 更具体的 Schema 放在前面
+ */
+export const ConfigSchema = z.union([
+    V0ToV3Schema, // V0 -> V3（版本号为 undefined）
+    V1ToV2Schema, // V1 -> V2（版本号为 1）
+    V2ToV3Schema, // V2 -> V3（版本号为 2）
+    V3ToV4Schema, // V3 -> V4（版本号为 3，含 plugins/pluginSettings）
+    SettingsSchema, // 当前版本（V4）
+]);
+/**
+ * 加载并自动迁移配置
+ * @param rawConfig 原始配置数据
+ * @returns 迁移后的配置
+ */
+export function loadAndMigrateConfig(rawConfig) {
+    return ConfigSchema.parse(rawConfig);
+}
+//# sourceMappingURL=config-migration.js.map

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

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

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

@@ -0,0 +1,19 @@
+/**
+ * 新配置系统统一入口（过渡期）
+ *
+ * 这是新配置系统的入口文件，在完全迁移之前，使用 config-new.ts 作为文件名
+ * 完全迁移后将替换 config.ts
+ *
+ * 提供完整的配置管理功能：
+ * - 配置加载（支持 JSON5 和 YAML）
+ * - 配置合并（多层级、分支覆盖）
+ * - 配置验证（Zod Schema）
+ * - 自动迁移（版本管理）
+ */
+export { type Settings, type TmuxConfig, type PaneConfig, type PaneCommand, type LayoutType, type SystemCommands, BUILTIN_COMMANDS, CURRENT_CONFIG_VERSION, LayoutTypeSchema, validateSettings, validateSettingsWithFriendlyError, } from './config-schema.js';
+export { loadUserConfig, loadProjectConfig, saveConfigFile, findConfigFilePath, getUserConfigDir, getProjectConfigDir, } from './config-loader.js';
+export { mergeConfigs, mergeTmuxConfigs, applyBranchOverrides, } from './config-merger.js';
+export { loadAndMigrateConfig, ConfigSchema } from './config-migration.js';
+import type { Settings } from './config-schema.js';
+export declare function loadEffectiveConfig(projectRoot: string, branchName?: string): Promise<Settings>;
+//# sourceMappingURL=config-new.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config-new.d.ts","sourceRoot":"","sources":["../../src/core/config-new.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,cAAc,EAEnB,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAEhB,gBAAgB,EAChB,iCAAiC,GAClC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAU3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,QAAQ,CAAC,CA4BnB"}

package/dist/core/config-new.js

@@ -0,0 +1,58 @@
+/**
+ * 新配置系统统一入口（过渡期）
+ *
+ * 这是新配置系统的入口文件，在完全迁移之前，使用 config-new.ts 作为文件名
+ * 完全迁移后将替换 config.ts
+ *
+ * 提供完整的配置管理功能：
+ * - 配置加载（支持 JSON5 和 YAML）
+ * - 配置合并（多层级、分支覆盖）
+ * - 配置验证（Zod Schema）
+ * - 自动迁移（版本管理）
+ */
+// 导出 Schema 和类型
+export { 
+// 常量
+BUILTIN_COMMANDS, CURRENT_CONFIG_VERSION, LayoutTypeSchema, 
+// 验证函数
+validateSettings, validateSettingsWithFriendlyError, } from './config-schema.js';
+// 导出配置加载函数
+export { loadUserConfig, loadProjectConfig, saveConfigFile, findConfigFilePath, getUserConfigDir, getProjectConfigDir, } from './config-loader.js';
+// 导出配置合并函数
+export { mergeConfigs, mergeTmuxConfigs, applyBranchOverrides, } from './config-merger.js';
+// 导出迁移函数
+export { loadAndMigrateConfig, ConfigSchema } from './config-migration.js';
+/**
+ * 加载完整的生效配置
+ * @param projectRoot 项目根目录
+ * @param branchName 分支名称
+ * @returns 合并并应用分支覆盖后的配置
+ */
+import { loadUserConfig, loadProjectConfig } from './config-loader.js';
+import { mergeConfigs, applyBranchOverrides } from './config-merger.js';
+export async function loadEffectiveConfig(projectRoot, branchName) {
+    // 加载用户级和项目级配置
+    const [userConfig, projectConfig] = await Promise.all([
+        loadUserConfig(),
+        loadProjectConfig(projectRoot),
+    ]);
+    // 合并配置（优先级：项目 > 用户）
+    const configs = [];
+    if (userConfig)
+        configs.push(userConfig);
+    if (projectConfig)
+        configs.push(projectConfig);
+    // 如果没有任何配置，返回最小配置
+    if (configs.length === 0) {
+        return {
+            version: 3,
+        };
+    }
+    let mergedConfig = mergeConfigs(...configs);
+    // 应用分支覆盖（如果提供了分支名）
+    if (branchName) {
+        mergedConfig = applyBranchOverrides(mergedConfig, branchName);
+    }
+    return mergedConfig;
+}
+//# sourceMappingURL=config-new.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config-new.js","sourceRoot":"","sources":["../../src/core/config-new.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,gBAAgB;AAChB,OAAO;AAQL,KAAK;AACL,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB;AAChB,OAAO;AACP,gBAAgB,EAChB,iCAAiC,GAClC,MAAM,oBAAoB,CAAC;AAE5B,WAAW;AACX,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAE5B,WAAW;AACX,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAE5B,SAAS;AACT,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE3E;;;;;GAKG;AACH,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGxE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,UAAmB;IAEnB,cAAc;IACd,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,cAAc,EAAE;QAChB,iBAAiB,CAAC,WAAW,CAAC;KAC/B,CAAC,CAAC;IAEH,oBAAoB;IACpB,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,IAAI,UAAU;QAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE/C,kBAAkB;IAClB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO;YACL,OAAO,EAAE,CAAC;SACX,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,CAAC;IAE5C,mBAAmB;IACnB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,GAAG,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}

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

@@ -0,0 +1,221 @@
+/**
+ * 配置文件 Schema 定义
+ *
+ * 使用 Zod 定义配置文件的结构和验证规则
+ * - 类型定义和运行时验证合二为一
+ * - 自动类型推断，无需手写 interface
+ * - 支持配置版本迁移
+ */
+import { z } from 'zod';
+/**
+ * 内置命令常量
+ */
+export declare const BUILTIN_COMMANDS: {
+    /** 启动 dev server */
+    readonly AUTO_DEV_SERVER: "start dev server";
+    /** 继续 Claude 会话 */
+    readonly AUTO_CLAUDE: "continue claude session";
+};
+/**
+ * 布局类型
+ */
+export declare const LayoutTypeSchema: z.ZodEnum<{
+    "single-pane": "single-pane";
+    "two-pane-horizontal": "two-pane-horizontal";
+    "two-pane-vertical": "two-pane-vertical";
+    "three-pane": "three-pane";
+    "four-pane": "four-pane";
+}>;
+export type LayoutType = z.infer<typeof LayoutTypeSchema>;
+/**
+ * Pane 命令 Schema
+ * - 内置命令：使用预定义的自动检测逻辑
+ * - string: 自定义命令
+ * - null: 不执行任何命令
+ */
+export declare const PaneCommandSchema: z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>;
+export type PaneCommand = z.infer<typeof PaneCommandSchema>;
+/**
+ * 单个 Pane 的配置 Schema
+ */
+export declare const PaneConfigSchema: z.ZodObject<{
+    command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+    size: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export type PaneConfig = z.infer<typeof PaneConfigSchema>;
+/**
+ * Tmux 配置 Schema
+ */
+export declare const TmuxConfigSchema: z.ZodObject<{
+    autoRun: z.ZodOptional<z.ZodBoolean>;
+    layout: z.ZodOptional<z.ZodEnum<{
+        "single-pane": "single-pane";
+        "two-pane-horizontal": "two-pane-horizontal";
+        "two-pane-vertical": "two-pane-vertical";
+        "three-pane": "three-pane";
+        "four-pane": "four-pane";
+    }>>;
+    leftPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    rightPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    topPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    bottomPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    topRightPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    bottomRightPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    topLeftPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    bottomLeftPane: z.ZodOptional<z.ZodObject<{
+        command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+        size: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    horizontalSplit: z.ZodOptional<z.ZodString>;
+    verticalSplit: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export type TmuxConfig = z.infer<typeof TmuxConfigSchema>;
+/**
+ * 系统命令配置 Schema
+ */
+export declare const SystemCommandsSchema: z.ZodObject<{
+    npm: z.ZodOptional<z.ZodString>;
+    claude: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export type SystemCommands = z.infer<typeof SystemCommandsSchema>;
+/**
+ * 工具链配置 Schema
+ * 描述单个子项目（或根目录）使用的工具链类型和专属配置
+ */
+export declare const ToolchainConfigSchema: z.ZodObject<{
+    type: z.ZodString;
+    settings: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, z.core.$strip>;
+export type ToolchainConfig = z.infer<typeof ToolchainConfigSchema>;
+/**
+ * 子项目配置 Schema（Mono Repo 模式）
+ */
+export declare const SubProjectSchema: z.ZodObject<{
+    path: z.ZodString;
+    toolchain: z.ZodUnion<readonly [z.ZodObject<{
+        type: z.ZodString;
+        settings: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strip>, z.ZodNull]>;
+}, z.core.$strip>;
+export type SubProject = z.infer<typeof SubProjectSchema>;
+/**
+ * Settings Schema 基础部分（不包含递归的 branchOverrides）
+ */
+declare const SettingsSchemaBase: z.ZodObject<{
+    version: z.ZodNumber;
+    lang: z.ZodOptional<z.ZodEnum<{
+        en: "en";
+        "zh-CN": "zh-CN";
+    }>>;
+    systemCommands: z.ZodOptional<z.ZodObject<{
+        npm: z.ZodOptional<z.ZodString>;
+        claude: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    tmux: z.ZodOptional<z.ZodObject<{
+        autoRun: z.ZodOptional<z.ZodBoolean>;
+        layout: z.ZodOptional<z.ZodEnum<{
+            "single-pane": "single-pane";
+            "two-pane-horizontal": "two-pane-horizontal";
+            "two-pane-vertical": "two-pane-vertical";
+            "three-pane": "three-pane";
+            "four-pane": "four-pane";
+        }>>;
+        leftPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        rightPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        topPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        bottomPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        topRightPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        bottomRightPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        topLeftPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        bottomLeftPane: z.ZodOptional<z.ZodObject<{
+            command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"start dev server">, z.ZodLiteral<"continue claude session">, z.ZodString, z.ZodNull]>>;
+            size: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        horizontalSplit: z.ZodOptional<z.ZodString>;
+        verticalSplit: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
+    toolchain: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+        type: z.ZodString;
+        settings: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strip>, z.ZodNull]>>;
+    projects: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        path: z.ZodString;
+        toolchain: z.ZodUnion<readonly [z.ZodObject<{
+            type: z.ZodString;
+            settings: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+        }, z.core.$strip>, z.ZodNull]>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>;
+/**
+ * Settings 类型（自动从 Schema 推断）
+ */
+export type Settings = z.infer<typeof SettingsSchemaBase> & {
+    branchOverrides?: Record<string, Partial<Settings>>;
+};
+/**
+ * Settings Schema（支持递归的 branchOverrides）
+ */
+export declare const SettingsSchema: z.ZodType<Settings>;
+/**
+ * 当前配置文件版本号
+ */
+export declare const CURRENT_CONFIG_VERSION = 4;
+/**
+ * 验证配置对象
+ * @param data 待验证的数据
+ * @returns 验证后的配置对象
+ * @throws ZodError 如果验证失败
+ */
+export declare function validateSettings(data: unknown): Settings;
+/**
+ * 验证配置对象（带友好的错误提示）
+ * @param filepath 配置文件路径（用于错误提示）
+ * @param data 待验证的数据
+ * @returns 验证后的配置对象
+ * @throws Error 如果验证失败，包含友好的错误信息
+ */
+export declare function validateSettingsWithFriendlyError(filepath: string, data: unknown): Settings;
+export {};
+//# sourceMappingURL=config-schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"config-schema.d.ts","sourceRoot":"","sources":["../../src/core/config-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,eAAO,MAAM,gBAAgB;IAC3B,oBAAoB;;IAEpB,mBAAmB;;CAEX,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;EAM3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,0HAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;iBAK3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAoB3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;iBAK/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,qBAAqB;;;iBAKhC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;iBAK3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsBtB,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,GAAG;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAKtB,CAAC;AAE1B;;GAEG;AACH,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACZ,QAAQ,CAeV"}