colyn-cli 3.1.4

package/dist/core/paths.js

@@ -0,0 +1,256 @@
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import { ColynError } from '../types/index.js';
+import { t } from '../i18n/index.js';
+/**
+ * 验证是否是有效的 colyn 项目
+ * 避免误判 home 目录等其他包含 .colyn 目录的位置
+ */
+async function isValidColynProject(rootDir) {
+    try {
+        // 1. 检查主分支目录是否存在
+        const mainDirName = path.basename(rootDir);
+        const mainDir = path.join(rootDir, mainDirName);
+        const mainDirStats = await fs.stat(mainDir);
+        if (!mainDirStats.isDirectory()) {
+            return false;
+        }
+        // 2. 检查 worktrees 目录是否存在
+        const worktreesDir = path.join(rootDir, 'worktrees');
+        const worktreesDirStats = await fs.stat(worktreesDir);
+        if (!worktreesDirStats.isDirectory()) {
+            return false;
+        }
+        // 注意：config.json 不是必需的，所以不验证它
+        return true;
+    }
+    catch {
+        // 任何验证失败都返回 false
+        return false;
+    }
+}
+/**
+ * 从当前目录向上查找项目根目录
+ * 根目录的标志是包含 .colyn 目录，并且通过多重验证确保是有效的 colyn 项目
+ */
+export async function findProjectRoot(startDir = process.cwd()) {
+    let currentDir = path.resolve(startDir);
+    // 最多向上查找 20 层，避免无限循环
+    for (let i = 0; i < 20; i++) {
+        const colynDir = path.join(currentDir, '.colyn');
+        try {
+            const stats = await fs.stat(colynDir);
+            if (stats.isDirectory()) {
+                // 找到 .colyn 目录，验证这是一个有效的 colyn 项目
+                if (await isValidColynProject(currentDir)) {
+                    return currentDir;
+                }
+            }
+        }
+        catch (err) {
+            // .colyn 不存在，继续向上查找
+        }
+        // 获取父目录
+        const parentDir = path.dirname(currentDir);
+        // 如果已经到达文件系统根目录，停止查找
+        if (parentDir === currentDir) {
+            break;
+        }
+        currentDir = parentDir;
+    }
+    throw new ColynError(t('errors.projectRootNotFound'), t('errors.projectRootNotFoundHint'));
+}
+/**
+ * 获取项目所有相关路径
+ */
+export async function getProjectPaths(startDir = process.cwd()) {
+    const rootDir = await findProjectRoot(startDir);
+    const mainDirName = path.basename(rootDir);
+    return {
+        rootDir,
+        mainDirName,
+        mainDir: path.join(rootDir, mainDirName),
+        worktreesDir: path.join(rootDir, 'worktrees'),
+        configDir: path.join(rootDir, '.colyn')
+    };
+}
+/**
+ * 获取当前 worktree 信息
+ * 通过读取 .env.local 文件中的 WORKTREE 变量来判断
+ */
+export async function getCurrentWorktreeInfo(startDir = process.cwd()) {
+    const currentDir = path.resolve(startDir);
+    try {
+        // 尝试查找项目根目录
+        const rootDir = await findProjectRoot(currentDir);
+        const relativeToRoot = path.relative(rootDir, currentDir);
+        // 读取当前目录的 .env.local 文件
+        const envFilePath = path.join(currentDir, '.env.local');
+        try {
+            const envContent = await fs.readFile(envFilePath, 'utf-8');
+            // 解析 WORKTREE 变量
+            const worktreeMatch = envContent.match(/^WORKTREE=(.+)$/m);
+            if (worktreeMatch) {
+                const worktreeValue = worktreeMatch[1].trim();
+                // 如果 WORKTREE 是数字，说明在 worktree 中
+                const worktreeId = parseInt(worktreeValue);
+                if (!isNaN(worktreeId)) {
+                    return {
+                        isWorktree: true,
+                        worktreeId,
+                        currentDir,
+                        relativeToRoot
+                    };
+                }
+                // 如果 WORKTREE 是 "main"，说明在主分支中
+                if (worktreeValue === 'main') {
+                    return {
+                        isWorktree: false,
+                        currentDir,
+                        relativeToRoot
+                    };
+                }
+            }
+        }
+        catch {
+            // .env.local 不存在或读取失败，说明不在 worktree 或主分支目录中
+        }
+        // 默认认为不在 worktree 中
+        return {
+            isWorktree: false,
+            currentDir,
+            relativeToRoot
+        };
+    }
+    catch {
+        // 如果找不到项目根目录，返回基本信息
+        return {
+            isWorktree: false,
+            currentDir
+        };
+    }
+}
+/**
+ * 获取当前位置的完整信息
+ * 用于 info 命令
+ */
+export async function getLocationInfo(startDir = process.cwd()) {
+    const currentDir = path.resolve(startDir);
+    // 查找项目根目录
+    const rootDir = await findProjectRoot(currentDir);
+    const mainDirName = path.basename(rootDir);
+    const mainDir = path.join(rootDir, mainDirName);
+    const worktreesDir = path.join(rootDir, 'worktrees');
+    // 检查当前目录是否在主分支目录下
+    if (currentDir === mainDir || currentDir.startsWith(mainDir + path.sep)) {
+        // 在主分支目录中
+        const simpleGit = (await import('simple-git')).default;
+        const git = simpleGit(mainDir);
+        const branchSummary = await git.branch();
+        return {
+            project: mainDirName,
+            projectPath: rootDir,
+            mainBranchPath: mainDir,
+            worktreeId: 0,
+            worktreeDir: mainDirName,
+            worktreePath: mainDir,
+            branch: branchSummary.current,
+            isMainBranch: true
+        };
+    }
+    // 检查当前目录是否在 worktrees 目录下
+    if (currentDir === worktreesDir || currentDir.startsWith(worktreesDir + path.sep)) {
+        // 在 worktrees 目录下，找出是哪个 worktree
+        const relativePath = path.relative(worktreesDir, currentDir);
+        const worktreeDirName = relativePath.split(path.sep)[0];
+        // 检查是否是 task-N 格式
+        const idMatch = worktreeDirName.match(/^task-(\d+)$/);
+        if (idMatch) {
+            const worktreeId = parseInt(idMatch[1]);
+            const worktreePath = path.join(worktreesDir, worktreeDirName);
+            // 获取当前分支
+            const simpleGit = (await import('simple-git')).default;
+            const git = simpleGit(worktreePath);
+            const branchSummary = await git.branch();
+            return {
+                project: mainDirName,
+                projectPath: rootDir,
+                mainBranchPath: mainDir,
+                worktreeId,
+                worktreeDir: worktreeDirName,
+                worktreePath,
+                branch: branchSummary.current,
+                isMainBranch: false
+            };
+        }
+    }
+    // 不在有效位置
+    throw new ColynError(t('commands.info.notInWorktree'), t('commands.info.notInWorktreeHint'));
+}
+/**
+ * 验证目录存在
+ */
+export async function validateDirectoryExists(dirPath, errorMessage) {
+    try {
+        const stats = await fs.stat(dirPath);
+        if (!stats.isDirectory()) {
+            throw new ColynError(errorMessage, t('errors.pathExistsNotDir', { path: dirPath }));
+        }
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            throw new ColynError(errorMessage, t('errors.pathNotFound', { path: dirPath }));
+        }
+        throw err;
+    }
+}
+/**
+ * 验证项目已初始化
+ */
+export async function validateProjectInitialized(paths) {
+    // 检查 .colyn 配置目录是否存在（不再需要 config.json）
+    try {
+        await fs.access(paths.configDir);
+    }
+    catch {
+        throw new ColynError(t('errors.projectNotInitialized'), t('errors.projectNotInitializedHint'));
+    }
+    // 检查主分支目录是否存在
+    await validateDirectoryExists(paths.mainDir, t('errors.mainDirNotFound'));
+    // 检查 worktrees 目录是否存在
+    await validateDirectoryExists(paths.worktreesDir, t('errors.worktreesDirNotFound'));
+}
+/**
+ * 获取指定目录相对于根目录的简短描述
+ */
+export function getDirectoryDescription(currentDir, paths) {
+    const relative = path.relative(paths.rootDir, currentDir);
+    if (relative === '') {
+        return t('output.projectRoot');
+    }
+    if (currentDir === paths.mainDir) {
+        return t('output.mainBranchDir');
+    }
+    if (currentDir.startsWith(paths.worktreesDir)) {
+        return t('output.worktreeDir');
+    }
+    if (currentDir === paths.configDir) {
+        return t('output.configDir');
+    }
+    return t('output.subDir', { path: relative });
+}
+/**
+ * 切换到指定目录执行操作
+ * 执行完成后恢复原目录
+ */
+export async function executeInDirectory(targetDir, operation) {
+    const originalDir = process.cwd();
+    try {
+        process.chdir(targetDir);
+        return await operation();
+    }
+    finally {
+        process.chdir(originalDir);
+    }
+}
+//# sourceMappingURL=paths.js.map

package/dist/core/paths.js.map

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

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

@@ -0,0 +1,174 @@
+/**
+ * Tmux Pane 命令配置模块（使用新配置系统）
+ *
+ * 提供 tmux pane 命令的配置加载和自动检测功能
+ *
+ * 配置文件层级（优先级从低到高）：
+ * 1. 内置默认值
+ * 2. 用户级配置：~/.config/colyn/settings.{json|yaml|yml}
+ * 3. 项目级配置：{projectRoot}/.colyn/settings.{json|yaml|yml}
+ *
+ * 新配置系统特性：
+ * - 支持 JSON5（注释、尾部逗号）和 YAML 格式
+ * - 自动配置版本迁移
+ * - Zod Schema 验证
+ * - 使用 deepmerge 进行配置合并
+ */
+import { type Settings, type TmuxConfig, type PaneConfig, type PaneCommand, type LayoutType, type SystemCommands, BUILTIN_COMMANDS, CURRENT_CONFIG_VERSION } from './config-new.js';
+export { type Settings, type TmuxConfig, type PaneConfig, type PaneCommand, type LayoutType, type SystemCommands, BUILTIN_COMMANDS, CURRENT_CONFIG_VERSION, };
+/**
+ * 窗格名称映射表
+ * 定义每种布局支持的窗格名称
+ */
+export declare const LAYOUT_PANES: Record<LayoutType, string[]>;
+/**
+ * 解析后的 Pane 命令
+ */
+export interface ResolvedPaneCommands {
+    /** Pane 0 命令 */
+    pane0?: string;
+    /** Pane 1 命令 */
+    pane1?: string;
+    /** Pane 2 命令 */
+    pane2?: string;
+    /** Pane 3 命令（四窗格布局） */
+    pane3?: string;
+}
+/**
+ * 解析后的 Pane 布局
+ */
+export interface ResolvedPaneLayout {
+    /** 布局类型 */
+    layout: LayoutType;
+    /** two-pane-horizontal: 左侧大小 */
+    leftSize?: number;
+    /** two-pane-vertical: 上方大小 */
+    topSize?: number;
+    /** three-pane: 左侧大小和右上大小 */
+    rightTopSize?: number;
+    /** four-pane: 水平分割位置（上方占总高度的百分比） */
+    horizontalSplit?: number;
+    /** four-pane: 垂直分割位置（左侧占总宽度的百分比） */
+    verticalSplit?: number;
+    /** four-pane: 各窗格大小（当未同时配置两个 split 时使用） */
+    topLeftSize?: number;
+    topRightSize?: number;
+    bottomLeftSize?: number;
+    bottomRightSize?: number;
+}
+/**
+ * 获取用户级配置目录
+ * 遵循 XDG Base Directory 规范
+ */
+export declare function getUserConfigDir(): string;
+/**
+ * 获取用户级设置文件路径
+ */
+export declare function getUserConfigPath(): string;
+/**
+ * 获取项目级设置文件路径
+ * @param projectRoot 项目根目录
+ */
+export declare function getProjectConfigPath(projectRoot: string): string;
+/**
+ * 从设置文件加载完整设置（用于 config 命令显示）
+ * 自动执行必要的 migration 并保存更新后的配置
+ * @param configPath 设置文件路径
+ * @returns 完整设置对象，如果文件不存在或无法解析则返回 null
+ */
+export declare function loadSettingsFromFile(configPath: string): Promise<Settings | null>;
+/**
+ * 加载 tmux 配置（两层配置机制）
+ *
+ * 配置加载顺序（优先级从低到高）：
+ * 1. 内置默认值
+ * 2. 用户级配置：~/.config/colyn/settings.{json|yaml|yml} 中的 tmux 字段
+ * 3. 项目级配置：{projectRoot}/.colyn/settings.{json|yaml|yml} 中的 tmux 字段
+ *
+ * @param projectRoot 项目根目录
+ * @returns 合并后的配置对象
+ */
+export declare function loadTmuxConfig(projectRoot: string): Promise<TmuxConfig>;
+/**
+ * 检查 worktree 是否存在 Claude session
+ * 通过检查 ~/.claude/projects/{encodedPath} 下是否存在会话文件来判断
+ * @param worktreePath worktree 路径
+ */
+export declare function hasClaudeSession(worktreePath: string): Promise<boolean>;
+/**
+ * 解析所有 pane 命令
+ * @param config tmux 配置
+ * @param worktreePath worktree 路径
+ * @param projectRoot 项目根目录（可选，用于读取 claudeCommand 配置）
+ * @param branchName 分支名称（可选，用于读取分支特定的 claudeCommand 配置）
+ */
+export declare function resolvePaneCommands(config: TmuxConfig, worktreePath: string, projectRoot?: string, branchName?: string): Promise<ResolvedPaneCommands>;
+/**
+ * 解析 Pane 布局
+ * @param config tmux 配置
+ * @returns 解析后的布局信息
+ */
+export declare function resolvePaneLayout(config: TmuxConfig): ResolvedPaneLayout;
+/**
+ * 从设置中加载特定分支的配置
+ * @param settings 完整设置对象
+ * @param branchName 分支名称
+ * @returns 合并后的设置
+ */
+export declare function loadBranchSettings(settings: Settings, branchName: string): Settings;
+/**
+ * 加载特定分支的完整设置
+ *
+ * 配置优先级（从低到高）：
+ * 1. User default（用户级全局配置）
+ * 2. Project default（项目级全局配置）
+ * 3. User override（用户级分支覆盖）
+ * 4. Project override（项目级分支覆盖）
+ *
+ * @param projectRoot 项目根目录
+ * @param branchName 分支名称
+ * @returns 合并后的完整设置
+ */
+export declare function loadSettingsForBranch(projectRoot: string, branchName: string): Promise<Settings>;
+/**
+ * 加载特定分支的 tmux 配置
+ *
+ * 配置优先级（从低到高）：
+ * 1. System builtin（系统内置默认，如 main 分支默认单窗格）
+ * 2. User default（用户级全局配置，~/.config/colyn/settings.{json|yaml|yml} 的 tmux）
+ * 3. Project default（项目级全局配置，.colyn/settings.{json|yaml|yml} 的 tmux）
+ * 4. User override（用户级分支覆盖，~/.config/colyn/settings.{json|yaml|yml} 的 branchOverrides[branch].tmux）
+ * 5. Project override（项目级分支覆盖，.colyn/settings.{json|yaml|yml} 的 branchOverrides[branch].tmux）
+ *
+ * 全部按照字段级覆盖（field-level override）
+ *
+ * @param projectRoot 项目根目录
+ * @param branchName 分支名称
+ * @returns 合并后的 tmux 配置
+ */
+export declare function loadTmuxConfigForBranch(projectRoot: string, branchName: string): Promise<TmuxConfig>;
+/**
+ * 配置验证结果
+ */
+export interface ValidationResult {
+    /** 是否有错误 */
+    hasError: boolean;
+    /** 错误消息列表 */
+    errors: string[];
+    /** 警告消息列表 */
+    warnings: string[];
+}
+/**
+ * 检测布局类型
+ * 根据配置的窗格自动检测布局类型（向后兼容）
+ * @param config tmux 配置
+ * @returns 检测到的布局类型
+ */
+export declare function detectLayoutType(config: TmuxConfig): LayoutType;
+/**
+ * 验证 tmux 配置
+ * @param config tmux 配置
+ * @returns 验证结果
+ */
+export declare function validateTmuxConfig(config: TmuxConfig): ValidationResult;
+//# sourceMappingURL=tmux-config.d.ts.map

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

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