colyn-cli 3.1.4

package/dist/commands/remove.helpers.js

@@ -0,0 +1,190 @@
+import chalk from 'chalk';
+import simpleGit from 'simple-git';
+import { ColynError } from '../types/index.js';
+import { getRelevantStatusFiles } from '../core/git.js';
+import { output, outputLine, outputSuccess, outputWarning, outputBold, outputStep } from '../utils/logger.js';
+import { discoverWorktrees, getCurrentWorktreeId, getMainBranch } from '../core/discovery.js';
+import { t } from '../i18n/index.js';
+/**
+ * 判断目标参数类型
+ */
+export function identifyTargetType(target) {
+    if (!target) {
+        return 'auto';
+    }
+    // 纯数字视为 ID
+    if (/^\d+$/.test(target)) {
+        return 'id';
+    }
+    // 包含任何字符视为分支名
+    return 'branch';
+}
+/**
+ * 根据目标参数查找 worktree
+ */
+export async function findWorktreeTarget(target, mainDir, worktreesDir) {
+    const worktrees = await discoverWorktrees(mainDir, worktreesDir);
+    const targetType = identifyTargetType(target);
+    let worktree;
+    if (targetType === 'auto') {
+        // 自动识别当前 worktree
+        const worktreeId = await getCurrentWorktreeId();
+        if (worktreeId === null) {
+            throw new ColynError(t('commands.remove.cannotAutoDetect'), t('commands.remove.cannotAutoDetectHint'));
+        }
+        worktree = worktrees.find(w => w.id === worktreeId);
+        if (!worktree) {
+            throw new ColynError(t('commands.remove.worktreeNotFound', { id: worktreeId }), t('commands.remove.worktreeNotFoundHint'));
+        }
+    }
+    else if (targetType === 'id') {
+        // 按 ID 查找
+        const id = parseInt(target);
+        worktree = worktrees.find(w => w.id === id);
+        if (!worktree) {
+            throw new ColynError(t('commands.remove.worktreeNotFound', { id }), t('commands.remove.branchNotFoundHint'));
+        }
+    }
+    else {
+        // 按分支名查找
+        worktree = worktrees.find(w => w.branch === target);
+        if (!worktree) {
+            throw new ColynError(t('commands.remove.branchNotFound', { branch: target ?? '' }), t('commands.remove.branchNotFoundHint'));
+        }
+    }
+    return worktree;
+}
+/**
+ * 检查 worktree 是否有未提交的更改
+ */
+export async function checkUncommittedChanges(worktreePath) {
+    const git = simpleGit(worktreePath);
+    const status = await git.status();
+    const changedFiles = getRelevantStatusFiles(status);
+    if (changedFiles.length === 0) {
+        return { hasChanges: false, changedFiles: [] };
+    }
+    return { hasChanges: true, changedFiles };
+}
+/**
+ * 检查分支是否已合并到主分支
+ */
+export async function checkBranchMerged(mainDir, branch) {
+    const git = simpleGit(mainDir);
+    const mainBranch = await getMainBranch(mainDir);
+    try {
+        // 获取已合并到主分支的分支列表（* 表示当前分支，+ 表示 worktree 分支）
+        const result = await git.raw(['branch', '--merged', mainBranch]);
+        const mergedBranches = result
+            .split('\n')
+            .map(b => b.trim().replace(/^[*+] /, ''))
+            .filter(b => b.length > 0);
+        return mergedBranches.includes(branch);
+    }
+    catch {
+        // 如果检查失败，假设未合并
+        return false;
+    }
+}
+/**
+ * 检查当前目录是否在指定 worktree 内部
+ */
+export function isCurrentDirInWorktree(worktreePath) {
+    const cwd = process.cwd();
+    // 规范化路径，确保比较正确
+    const normalizedCwd = cwd.replace(/\/$/, '');
+    const normalizedWorktreePath = worktreePath.replace(/\/$/, '');
+    return normalizedCwd === normalizedWorktreePath ||
+        normalizedCwd.startsWith(normalizedWorktreePath + '/');
+}
+/**
+ * 执行 worktree 删除
+ */
+export async function executeWorktreeRemove(mainDir, worktreePath, force) {
+    const git = simpleGit(mainDir);
+    try {
+        const args = ['worktree', 'remove'];
+        if (force) {
+            args.push('--force');
+        }
+        args.push(worktreePath);
+        await git.raw(args);
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return { success: false, error: errorMessage };
+    }
+}
+/**
+ * 删除本地分支
+ */
+export async function deleteLocalBranch(mainDir, branch, force) {
+    const git = simpleGit(mainDir);
+    try {
+        const args = ['branch'];
+        args.push(force ? '-D' : '-d');
+        args.push(branch);
+        await git.raw(args);
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return { success: false, error: errorMessage };
+    }
+}
+/**
+ * 显示 worktree 信息
+ */
+export function displayWorktreeInfo(worktree) {
+    outputLine();
+    outputBold(t('commands.remove.toBeDeleted'));
+    output(`  ID: ${worktree.id}`);
+    output(`  ${t('commands.add.infoBranch', { branch: '' }).replace(': ', '')}: ${worktree.branch}`);
+    output(`  ${t('commands.add.infoPath', { path: '' }).replace(': ', '')}: ${worktree.path}`);
+    output(`  ${t('commands.add.infoPort', { port: '' }).replace(': ', '')}: ${worktree.port}`);
+    outputLine();
+}
+/**
+ * 显示未提交更改警告
+ */
+export function displayUncommittedChanges(changedFiles) {
+    outputWarning(t('commands.remove.uncommittedChanges'));
+    outputLine();
+    outputBold(t('commands.remove.changedFiles'));
+    for (const file of changedFiles.slice(0, 5)) {
+        output(`  - ${file}`);
+    }
+    if (changedFiles.length > 5) {
+        output(`  ${t('commands.remove.moreFiles', { count: changedFiles.length - 5 })}`);
+    }
+    outputLine();
+}
+/**
+ * 显示未合并警告
+ */
+export function displayUnmergedWarning(branch, mainBranch) {
+    outputWarning(t('commands.remove.unmergedWarning', { branch, main: mainBranch }));
+    output(chalk.gray(`  ${t('commands.remove.unmergedWarningHint')}`));
+    outputLine();
+}
+/**
+ * 显示删除成功信息
+ */
+export function displayRemoveSuccess(worktree, branchDeleted, switchedToMain, mainDir) {
+    outputLine();
+    outputSuccess(t('commands.remove.successTitle'));
+    outputLine();
+    outputBold(t('commands.remove.deleteInfo'));
+    output(`  ID: ${worktree.id}`);
+    const branchStatus = branchDeleted ? t('commands.remove.branchStatusDeleted') : t('commands.remove.branchStatusKept');
+    output(`  ${t('commands.remove.branchStatus', { branch: worktree.branch, status: branchStatus })}`);
+    output(`  ${t('commands.add.infoPath', { path: '' }).replace(': ', '')}: ${worktree.path}`);
+    outputLine();
+    if (switchedToMain) {
+        outputStep(t('commands.remove.switchedToMain'));
+        output(`  ${mainDir}`);
+        outputLine();
+    }
+}
+//# sourceMappingURL=remove.helpers.js.map

package/dist/commands/remove.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove.helpers.js","sourceRoot":"","sources":["../../src/commands/remove.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AAOrC;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,WAAW;IACX,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;IACd,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAA0B,EAC1B,OAAe,EACf,YAAoB;IAEpB,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAE9C,IAAI,QAAkC,CAAC;IAEvC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,kBAAkB;QAClB,MAAM,UAAU,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAChD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,UAAU,CAClB,CAAC,CAAC,kCAAkC,CAAC,EACrC,CAAC,CAAC,sCAAsC,CAAC,CAC1C,CAAC;QACJ,CAAC;QACD,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,UAAU,CAClB,CAAC,CAAC,kCAAkC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EACzD,CAAC,CAAC,sCAAsC,CAAC,CAC1C,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC/B,UAAU;QACV,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAO,CAAC,CAAC;QAC7B,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,UAAU,CAClB,CAAC,CAAC,kCAAkC,EAAE,EAAE,EAAE,EAAE,CAAC,EAC7C,CAAC,CAAC,oCAAoC,CAAC,CACxC,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,SAAS;QACT,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,UAAU,CAClB,CAAC,CAAC,gCAAgC,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC,EAC7D,CAAC,CAAC,oCAAoC,CAAC,CACxC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,YAAoB;IAEpB,MAAM,GAAG,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;IAClC,MAAM,YAAY,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAEpD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IACjD,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AAC5C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAe,EACf,MAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,CAAC;QACH,4CAA4C;QAC5C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,MAAM;aAC1B,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;aACxC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE7B,OAAO,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IACzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,eAAe;IACf,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7C,MAAM,sBAAsB,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,aAAa,KAAK,sBAAsB;QACxC,aAAa,CAAC,UAAU,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;AAChE,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAe,EACf,YAAoB,EACpB,KAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAExB,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAe,EACf,MAAc,EACd,KAAc;IAEd,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAElB,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IACjD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAsB;IACxD,UAAU,EAAE,CAAC;IACb,UAAU,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,SAAS,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAClG,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,UAAU,EAAE,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,YAAsB;IAC9D,aAAa,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC;IACvD,UAAU,EAAE,CAAC;IACb,UAAU,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAC9C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACxB,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,UAAU,EAAE,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,UAAkB;IACvE,aAAa,CAAC,CAAC,CAAC,iCAAiC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,qCAAqC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAsB,EACtB,aAAsB,EACtB,cAAuB,EACvB,OAAe;IAEf,UAAU,EAAE,CAAC;IACb,aAAa,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACjD,UAAU,EAAE,CAAC;IAEb,UAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,SAAS,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC;IACtH,MAAM,CAAC,KAAK,CAAC,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;IACpG,MAAM,CAAC,KAAK,CAAC,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,UAAU,EAAE,CAAC;IAEb,IAAI,cAAc,EAAE,CAAC;QACnB,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QACvB,UAAU,EAAE,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/commands/remove.js

@@ -0,0 +1,137 @@
+import Enquirer from 'enquirer';
+import ora from 'ora';
+import { getProjectPaths, validateProjectInitialized, } from '../core/paths.js';
+import { getMainBranch } from '../core/discovery.js';
+import { ColynError } from '../types/index.js';
+import { formatError, output, outputResult } from '../utils/logger.js';
+import { findWorktreeTarget, checkUncommittedChanges, checkBranchMerged, isCurrentDirInWorktree, executeWorktreeRemove, deleteLocalBranch, displayWorktreeInfo, displayUncommittedChanges, displayUnmergedWarning, displayRemoveSuccess } from './remove.helpers.js';
+import { t } from '../i18n/index.js';
+/**
+ * Remove 命令：删除不再需要的 worktree
+ *
+ * 流程：
+ * 1. 目标识别（ID、分支名、自动识别）
+ * 2. 前置检查（未提交更改、未合并警告）
+ * 3. 用户确认
+ * 4. 执行删除
+ * 5. 询问是否删除分支
+ * 6. 目录切换处理
+ */
+async function removeCommand(target, options) {
+    try {
+        // 步骤1: 获取项目路径并验证
+        const paths = await getProjectPaths();
+        await validateProjectInitialized(paths);
+        // 步骤2: 查找目标 worktree
+        const worktree = await findWorktreeTarget(target, paths.mainDir, paths.worktreesDir);
+        // 显示 worktree 信息
+        displayWorktreeInfo(worktree);
+        // 步骤3: 前置检查
+        // 检查未提交更改
+        if (!options.force) {
+            const { hasChanges, changedFiles } = await checkUncommittedChanges(worktree.path);
+            if (hasChanges) {
+                displayUncommittedChanges(changedFiles);
+                throw new ColynError(t('commands.remove.cannotDelete'), t('commands.remove.cannotDeleteHint', { path: worktree.path, id: worktree.id }));
+            }
+        }
+        // 检查是否已合并（仅警告，不阻止）
+        const mainBranch = await getMainBranch(paths.mainDir);
+        const isMerged = await checkBranchMerged(paths.mainDir, worktree.branch);
+        if (!isMerged) {
+            displayUnmergedWarning(worktree.branch, mainBranch);
+        }
+        // 步骤4: 用户确认
+        if (!options.yes) {
+            const enquirer = new Enquirer({ stdout: process.stderr });
+            const confirmResponse = await enquirer.prompt({
+                type: 'confirm',
+                name: 'confirm',
+                message: t('commands.remove.confirmDelete'),
+                initial: false
+            });
+            if (!confirmResponse.confirm) {
+                output(t('commands.remove.deleteCanceled'));
+                outputResult({ success: true });
+                return;
+            }
+        }
+        // 步骤5: 检查当前目录是否在要删除的 worktree 内部
+        const needSwitchDir = isCurrentDirInWorktree(worktree.path);
+        // 步骤6: 执行删除
+        const removeSpinner = ora({ text: t('commands.remove.deleting'), stream: process.stderr }).start();
+        const removeResult = await executeWorktreeRemove(paths.mainDir, worktree.path, options.force || false);
+        if (!removeResult.success) {
+            removeSpinner.fail(t('commands.remove.deleteFailed'));
+            throw new ColynError(t('commands.remove.deleteFailed'), removeResult.error || t('common.unknownError'));
+        }
+        removeSpinner.succeed(t('commands.remove.deleted'));
+        // 步骤7: 询问是否删除分支（--yes 时跳过）
+        let branchDeleted = false;
+        let shouldDeleteBranch = false;
+        if (options.yes) {
+            output(t('commands.remove.skipDeleteBranchPrompt'));
+        }
+        else {
+            // 如果分支已合并，询问是否删除
+            const enquirer = new Enquirer({ stdout: process.stderr });
+            const branchResponse = await enquirer.prompt({
+                type: 'confirm',
+                name: 'deleteBranch',
+                message: t('commands.remove.deleteBranch', { branch: worktree.branch }),
+                initial: isMerged // 如果已合并，默认删除
+            });
+            shouldDeleteBranch = branchResponse.deleteBranch;
+        }
+        if (shouldDeleteBranch) {
+            const branchSpinner = ora({ text: t('commands.remove.deletingBranch'), stream: process.stderr }).start();
+            const branchResult = await deleteLocalBranch(paths.mainDir, worktree.branch, !isMerged // 如果未合并，需要强制删除
+            );
+            if (branchResult.success) {
+                branchSpinner.succeed(t('commands.remove.branchDeleted', { branch: worktree.branch }));
+                branchDeleted = true;
+            }
+            else {
+                branchSpinner.fail(t('commands.remove.branchDeleteFailed', { error: branchResult.error ?? '' }));
+            }
+        }
+        // 步骤8: 显示成功信息
+        displayRemoveSuccess(worktree, branchDeleted, needSwitchDir, paths.mainDir);
+        // 步骤9: 输出 JSON 结果
+        const result = {
+            success: true,
+            // 如果当前目录在被删除的 worktree 内，切换到主分支目录
+            ...(needSwitchDir && {
+                targetDir: paths.mainDir,
+                displayPath: paths.mainDir
+            })
+        };
+        outputResult(result);
+    }
+    catch (error) {
+        // 如果是 enquirer 取消（用户按 Ctrl+C），静默退出
+        if (error instanceof Error && error.message === '') {
+            output(t('common.canceled'));
+            outputResult({ success: false });
+            process.exit(1);
+        }
+        formatError(error);
+        outputResult({ success: false });
+        process.exit(1);
+    }
+}
+/**
+ * 注册 remove 命令
+ */
+export function register(program) {
+    program
+        .command('remove [target]')
+        .alias('rm')
+        .description(t('commands.remove.description'))
+        .option('-f, --force', t('commands.remove.forceOption'))
+        .option('-y, --yes', t('commands.remove.yesOption'))
+        .action(async (target, options) => {
+        await removeCommand(target, options);
+    });
+}
+//# sourceMappingURL=remove.js.map

package/dist/commands/remove.js.map

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

package/dist/commands/repair.d.ts

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+/**
+ * 注册 repair 命令
+ */
+export declare function register(program: Command): void;
+//# sourceMappingURL=repair.d.ts.map

package/dist/commands/repair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../../src/commands/repair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoB/C"}

package/dist/commands/repair.helpers.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 修复项目配置
+ */
+export declare function repairProject(): Promise<void>;
+//# sourceMappingURL=repair.helpers.d.ts.map

package/dist/commands/repair.helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repair.helpers.d.ts","sourceRoot":"","sources":["../../src/commands/repair.helpers.ts"],"names":[],"mappings":"AAqdA;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA2InD"}