colyn-cli 3.1.4

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

@@ -0,0 +1,89 @@
+import type { WorktreeInfo } from '../types/index.js';
+/**
+ * 识别目标类型
+ */
+export type TargetType = 'id' | 'branch' | 'auto';
+/**
+ * 判断目标参数类型
+ */
+export declare function identifyTargetType(target: string | undefined): TargetType;
+/**
+ * 自动识别当前 worktree
+ */
+export declare function autoDetectWorktree(): Promise<number | null>;
+/**
+ * 根据目标参数查找 worktree
+ */
+export declare function findWorktreeTarget(target: string | undefined, mainDir: string, worktreesDir: string): Promise<WorktreeInfo>;
+/**
+ * 检查 git 工作目录状态是否干净
+ */
+export declare function checkGitWorkingDirectory(dirPath: string, dirName: string): Promise<void>;
+/**
+ * 更新结果
+ */
+export interface UpdateResult {
+    success: boolean;
+    conflictFiles?: string[];
+    error?: string;
+}
+/**
+ * 批量更新结果
+ */
+export interface BatchUpdateResult {
+    total: number;
+    succeeded: number;
+    failed: number;
+    skipped: number;
+    results: Array<{
+        worktree: WorktreeInfo;
+        success: boolean;
+        error?: string;
+        skipped?: boolean;
+    }>;
+}
+/**
+ * 拉取主分支最新代码
+ */
+export declare function pullMainBranch(mainDir: string, skipPull?: boolean): Promise<void>;
+/**
+ * 使用 rebase 更新 worktree
+ */
+export declare function rebaseWorktree(worktreePath: string, mainBranch: string): Promise<UpdateResult>;
+/**
+ * 使用 merge 更新 worktree
+ */
+export declare function mergeMainIntoWorktree(worktreePath: string, mainBranch: string): Promise<UpdateResult>;
+/**
+ * 更新单个 worktree
+ */
+export declare function updateSingleWorktree(worktree: WorktreeInfo, mainBranch: string, useRebase: boolean): Promise<UpdateResult>;
+/**
+ * 批量更新所有 worktree
+ */
+export declare function updateAllWorktrees(worktrees: WorktreeInfo[], mainBranch: string, useRebase: boolean): Promise<BatchUpdateResult>;
+/**
+ * 显示检测到的 worktree 信息
+ */
+export declare function displayWorktreeInfo(worktree: WorktreeInfo): void;
+/**
+ * 显示更新成功信息
+ */
+export declare function displayUpdateSuccess(mainBranch: string, worktreeBranch: string, useRebase: boolean): void;
+/**
+ * 显示 rebase 冲突信息
+ */
+export declare function displayRebaseConflict(conflictFiles: string[], _worktreePath: string): void;
+/**
+ * 显示 merge 冲突信息
+ */
+export declare function displayMergeConflict(conflictFiles: string[], _worktreePath: string): void;
+/**
+ * 显示批量更新结果
+ */
+export declare function displayBatchUpdateResult(result: BatchUpdateResult): void;
+/**
+ * 显示发现的 worktree 列表
+ */
+export declare function displayWorktreeList(worktrees: WorktreeInfo[]): void;
+//# sourceMappingURL=update.helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update.helpers.d.ts","sourceRoot":"","sources":["../../src/commands/update.helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAetD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,CAAC;AAElD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAYzE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEjE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,CAAC;QACb,QAAQ,EAAE,YAAY,CAAC;QACvB,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBrF;AAGD;;GAEG;AACH,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC,CA4BvB;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC,CA4BvB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC,CAMvB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,YAAY,EAAE,EACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,iBAAiB,CAAC,CA+C5B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAOhE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,OAAO,GACjB,IAAI,CAMN;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,EAAE,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI,CAuBN;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,MAAM,EAAE,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI,CAuBN;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CA4BxE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,IAAI,CAMnE"}

package/dist/commands/update.helpers.js

@@ -0,0 +1,335 @@
+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, outputError, outputWarning, outputBold, outputStep } from '../utils/logger.js';
+import { discoverWorktrees, getCurrentWorktreeId } 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 autoDetectWorktree() {
+    return getCurrentWorktreeId();
+}
+/**
+ * 根据目标参数查找 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 autoDetectWorktree();
+        if (worktreeId === null) {
+            throw new ColynError(t('commands.update.cannotAutoDetect'), t('commands.update.cannotAutoDetectHint'));
+        }
+        worktree = worktrees.find(w => w.id === worktreeId);
+        if (!worktree) {
+            throw new ColynError(t('commands.update.worktreeNotFound', { id: worktreeId }), t('commands.update.worktreeNotFoundHint'));
+        }
+    }
+    else if (targetType === 'id') {
+        // 按 ID 查找
+        const id = parseInt(target);
+        worktree = worktrees.find(w => w.id === id);
+        if (!worktree) {
+            throw new ColynError(t('commands.update.worktreeNotFound', { id }), t('commands.update.branchNotFoundHint'));
+        }
+    }
+    else {
+        // 按分支名查找
+        worktree = worktrees.find(w => w.branch === target);
+        if (!worktree) {
+            throw new ColynError(t('commands.update.branchNotFound', { branch: target ?? '' }), t('commands.update.branchNotFoundHint'));
+        }
+    }
+    return worktree;
+}
+/**
+ * 检查 git 工作目录状态是否干净
+ */
+export async function checkGitWorkingDirectory(dirPath, dirName) {
+    const git = simpleGit(dirPath);
+    const status = await git.status();
+    const changedFiles = getRelevantStatusFiles(status);
+    if (changedFiles.length > 0) {
+        const filesStr = changedFiles.slice(0, 5).map(f => `  - ${f}`).join('\n') +
+            (changedFiles.length > 5 ? `\n  ... ${t('commands.remove.moreFiles', { count: changedFiles.length - 5 })}` : '');
+        throw new ColynError(t('commands.update.dirHasUncommitted', { name: dirName }), t('commands.update.dirHasUncommittedHint', {
+            name: dirName,
+            path: dirPath,
+            count: changedFiles.length,
+            files: filesStr
+        }));
+    }
+}
+/**
+ * 拉取主分支最新代码
+ */
+export async function pullMainBranch(mainDir, skipPull = false) {
+    // 如果指定跳过 pull，直接返回
+    if (skipPull) {
+        return;
+    }
+    const git = simpleGit(mainDir);
+    try {
+        // 检查当前分支是否有上游分支
+        try {
+            await git.raw(['rev-parse', '--abbrev-ref', '@{upstream}']);
+            // 如果命令成功，说明有上游分支，执行 pull
+            await git.pull();
+        }
+        catch {
+            // 没有上游分支，跳过 pull
+            return;
+        }
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new ColynError(t('commands.update.pullFailed'), t('commands.update.pullFailedHint', { error: errorMessage }));
+    }
+}
+/**
+ * 使用 rebase 更新 worktree
+ */
+export async function rebaseWorktree(worktreePath, mainBranch) {
+    const git = simpleGit(worktreePath);
+    try {
+        await git.rebase([mainBranch]);
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // 检查是否是冲突
+        if (errorMessage.includes('CONFLICT') || errorMessage.includes('could not apply')) {
+            // 获取冲突文件列表
+            const status = await git.status();
+            const conflictFiles = status.conflicted;
+            return {
+                success: false,
+                conflictFiles,
+                error: 'rebase_conflict'
+            };
+        }
+        return {
+            success: false,
+            error: errorMessage
+        };
+    }
+}
+/**
+ * 使用 merge 更新 worktree
+ */
+export async function mergeMainIntoWorktree(worktreePath, mainBranch) {
+    const git = simpleGit(worktreePath);
+    try {
+        await git.merge([mainBranch]);
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // 检查是否是冲突
+        if (errorMessage.includes('CONFLICT') || errorMessage.includes('Automatic merge failed')) {
+            // 获取冲突文件列表
+            const status = await git.status();
+            const conflictFiles = status.conflicted;
+            return {
+                success: false,
+                conflictFiles,
+                error: 'merge_conflict'
+            };
+        }
+        return {
+            success: false,
+            error: errorMessage
+        };
+    }
+}
+/**
+ * 更新单个 worktree
+ */
+export async function updateSingleWorktree(worktree, mainBranch, useRebase) {
+    if (useRebase) {
+        return rebaseWorktree(worktree.path, mainBranch);
+    }
+    else {
+        return mergeMainIntoWorktree(worktree.path, mainBranch);
+    }
+}
+/**
+ * 批量更新所有 worktree
+ */
+export async function updateAllWorktrees(worktrees, mainBranch, useRebase) {
+    const results = [];
+    let succeeded = 0;
+    let failed = 0;
+    let skipped = 0;
+    for (const worktree of worktrees) {
+        // 检查工作目录是否干净
+        try {
+            await checkGitWorkingDirectory(worktree.path, `task-${worktree.id}`);
+        }
+        catch {
+            // 工作目录不干净，跳过
+            results.push({
+                worktree,
+                success: false,
+                skipped: true,
+                error: t('commands.update.dirtySkipped')
+            });
+            skipped++;
+            continue;
+        }
+        // 执行更新
+        const result = await updateSingleWorktree(worktree, mainBranch, useRebase);
+        if (result.success) {
+            results.push({ worktree, success: true });
+            succeeded++;
+        }
+        else {
+            results.push({
+                worktree,
+                success: false,
+                error: result.error === 'rebase_conflict' || result.error === 'merge_conflict'
+                    ? t('commands.update.hasConflict')
+                    : result.error
+            });
+            failed++;
+        }
+    }
+    return {
+        total: worktrees.length,
+        succeeded,
+        failed,
+        skipped,
+        results
+    };
+}
+/**
+ * 显示检测到的 worktree 信息
+ */
+export function displayWorktreeInfo(worktree) {
+    outputLine();
+    outputBold(t('commands.update.detectedWorktree'));
+    output(`  ID: ${worktree.id}`);
+    output(`  ${t('commands.update.branchLabel')}: ${worktree.branch}`);
+    output(`  ${t('commands.update.pathLabel')}: ${worktree.path}`);
+    outputLine();
+}
+/**
+ * 显示更新成功信息
+ */
+export function displayUpdateSuccess(mainBranch, worktreeBranch, useRebase) {
+    outputLine();
+    outputSuccess(t('commands.update.updateComplete'));
+    output(`  ${t('commands.update.mainBranchLabel', { branch: mainBranch })} → ${worktreeBranch}`);
+    output(`  ${t('commands.update.strategyLabel')}: ${useRebase ? 'rebase' : 'merge'}`);
+    outputLine();
+}
+/**
+ * 显示 rebase 冲突信息
+ */
+export function displayRebaseConflict(conflictFiles, _worktreePath) {
+    outputLine();
+    outputError(t('commands.update.rebaseConflictTitle'));
+    outputLine();
+    outputBold(t('commands.update.conflictFiles'));
+    for (const file of conflictFiles) {
+        output(`  ${file}`);
+    }
+    outputLine();
+    outputBold(t('commands.update.resolveSteps'));
+    outputStep(`  ${t('commands.update.rebaseStep1')}`);
+    outputLine();
+    outputStep(`  ${t('commands.update.rebaseStep2')}`);
+    output('     git add <file>');
+    outputLine();
+    outputStep(`  ${t('commands.update.rebaseStep3')}`);
+    output('     git rebase --continue');
+    outputLine();
+    outputStep(`  ${t('commands.update.rebaseStep4')}`);
+    output('     git rebase --abort');
+    outputLine();
+}
+/**
+ * 显示 merge 冲突信息
+ */
+export function displayMergeConflict(conflictFiles, _worktreePath) {
+    outputLine();
+    outputError(t('commands.update.mergeConflictTitle'));
+    outputLine();
+    outputBold(t('commands.update.conflictFiles'));
+    for (const file of conflictFiles) {
+        output(`  ${file}`);
+    }
+    outputLine();
+    outputBold(t('commands.update.resolveSteps'));
+    outputStep(`  ${t('commands.update.mergeStep1')}`);
+    outputLine();
+    outputStep(`  ${t('commands.update.mergeStep2')}`);
+    output('     git add <file>');
+    outputLine();
+    outputStep(`  ${t('commands.update.mergeStep3')}`);
+    output('     git commit');
+    outputLine();
+    outputStep(`  ${t('commands.update.mergeStep4')}`);
+    output('     git merge --abort');
+    outputLine();
+}
+/**
+ * 显示批量更新结果
+ */
+export function displayBatchUpdateResult(result) {
+    outputLine();
+    outputBold(t('commands.update.batchResult'));
+    if (result.succeeded > 0) {
+        outputSuccess(`  ${t('commands.update.batchSucceeded', { count: result.succeeded })}`);
+    }
+    if (result.failed > 0) {
+        outputError(`  ${t('commands.update.batchFailed', { count: result.failed })}`);
+    }
+    if (result.skipped > 0) {
+        outputWarning(`  ${t('commands.update.batchSkipped', { count: result.skipped })}`);
+    }
+    outputLine();
+    // 显示失败和跳过的详情
+    const failedResults = result.results.filter(r => !r.success);
+    if (failedResults.length > 0) {
+        outputBold(t('commands.update.failedDetails'));
+        for (const r of failedResults) {
+            if (r.skipped) {
+                output(`  ${chalk.yellow('○')} task-${r.worktree.id} (${r.worktree.branch}): ${r.error}`);
+            }
+            else {
+                output(`  ${chalk.red('✗')} task-${r.worktree.id} (${r.worktree.branch}): ${r.error}`);
+            }
+        }
+        outputLine();
+    }
+}
+/**
+ * 显示发现的 worktree 列表
+ */
+export function displayWorktreeList(worktrees) {
+    outputBold(t('commands.update.foundWorktrees', { count: worktrees.length }));
+    for (const wt of worktrees) {
+        output(`  ${wt.id}. task-${wt.id} (${wt.branch})`);
+    }
+    outputLine();
+}
+//# sourceMappingURL=update.helpers.js.map

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

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

package/dist/commands/update.js

@@ -0,0 +1,187 @@
+import ora from 'ora';
+import { getProjectPaths, validateProjectInitialized, executeInDirectory } from '../core/paths.js';
+import { getMainBranch, discoverWorktrees } from '../core/discovery.js';
+import { ColynError } from '../types/index.js';
+import { formatError, output, outputResult } from '../utils/logger.js';
+import { checkIsGitRepo } from './add.helpers.js';
+import { findWorktreeTarget, checkGitWorkingDirectory, pullMainBranch, updateSingleWorktree, updateAllWorktrees, displayWorktreeInfo, displayUpdateSuccess, displayRebaseConflict, displayMergeConflict, displayBatchUpdateResult, displayWorktreeList } from './update.helpers.js';
+import { t } from '../i18n/index.js';
+/**
+ * Update 命令：将主分支代码更新到 worktree
+ *
+ * 流程：
+ * 1. 检查 worktree 工作目录状态
+ * 2. 拉取主分支最新代码
+ * 3. 执行 rebase 或 merge
+ */
+async function updateCommand(target, options) {
+    try {
+        // 步骤1: 获取项目路径并验证
+        const paths = await getProjectPaths();
+        await validateProjectInitialized(paths);
+        // 步骤2: 在主分支目录中检查 git 仓库
+        await executeInDirectory(paths.mainDir, async () => {
+            await checkIsGitRepo();
+        });
+        // 获取主分支名称
+        const mainBranch = await getMainBranch(paths.mainDir);
+        // 确定是否使用 rebase（默认 true）
+        const useRebase = !options.noRebase;
+        // 确定是否跳过 fetch/pull（默认 false，即执行 fetch/pull）
+        const skipFetch = options.fetch === false;
+        // 步骤3: 处理批量更新或单个更新
+        if (options.all) {
+            // 批量更新所有 worktree
+            await handleBatchUpdate(paths.mainDir, paths.worktreesDir, mainBranch, useRebase, skipFetch);
+        }
+        else {
+            // 单个更新
+            await handleSingleUpdate(target, paths.mainDir, paths.worktreesDir, mainBranch, useRebase, skipFetch);
+        }
+        // 输出 JSON 结果
+        const result = { success: true };
+        outputResult(result);
+    }
+    catch (error) {
+        formatError(error);
+        outputResult({ success: false });
+        process.exit(1);
+    }
+}
+/**
+ * 处理单个 worktree 更新
+ */
+async function handleSingleUpdate(target, mainDir, worktreesDir, mainBranch, useRebase, skipPull) {
+    // 查找目标 worktree
+    const worktree = await findWorktreeTarget(target, mainDir, worktreesDir);
+    // 显示 worktree 信息
+    displayWorktreeInfo(worktree);
+    // 步骤1: 检查工作目录状态
+    const checkSpinner = ora({
+        text: t('commands.update.checkingStatus'),
+        stream: process.stderr
+    }).start();
+    try {
+        await checkGitWorkingDirectory(worktree.path, `task-${worktree.id}`);
+        checkSpinner.succeed(t('commands.update.statusClean'));
+    }
+    catch (error) {
+        checkSpinner.fail(t('commands.update.statusDirty'));
+        throw error;
+    }
+    // 步骤2: 拉取主分支最新代码
+    const pullSpinner = ora({
+        text: t('commands.update.pullingMain'),
+        stream: process.stderr
+    }).start();
+    try {
+        await pullMainBranch(mainDir, skipPull);
+        pullSpinner.succeed(t('commands.update.pullSuccess'));
+    }
+    catch (error) {
+        pullSpinner.fail(t('commands.update.pullFailed'));
+        throw error;
+    }
+    // 步骤3: 执行更新
+    const strategy = useRebase ? 'rebase' : 'merge';
+    const updateSpinner = ora({
+        text: t('commands.update.updating', { strategy }),
+        stream: process.stderr
+    }).start();
+    output(t('commands.update.updateDir', { path: worktree.path }));
+    output(t('commands.update.updateCmd', { cmd: useRebase ? `git rebase ${mainBranch}` : `git merge ${mainBranch}` }));
+    const result = await updateSingleWorktree(worktree, mainBranch, useRebase);
+    if (!result.success) {
+        updateSpinner.fail(t('commands.update.updateFailed'));
+        if (result.error === 'rebase_conflict') {
+            displayRebaseConflict(result.conflictFiles || [], worktree.path);
+        }
+        else if (result.error === 'merge_conflict') {
+            displayMergeConflict(result.conflictFiles || [], worktree.path);
+        }
+        else {
+            throw new ColynError(t('commands.update.updateFailed'), result.error || t('common.unknownError'));
+        }
+        outputResult({ success: false });
+        process.exit(1);
+    }
+    updateSpinner.succeed(t('commands.update.updateSuccess'));
+    // 显示成功信息
+    displayUpdateSuccess(mainBranch, worktree.branch, useRebase);
+}
+/**
+ * 处理批量更新
+ */
+async function handleBatchUpdate(mainDir, worktreesDir, mainBranch, useRebase, skipPull) {
+    // 发现所有 worktree
+    const worktrees = await discoverWorktrees(mainDir, worktreesDir);
+    if (worktrees.length === 0) {
+        throw new ColynError(t('commands.update.noWorktrees'), t('commands.update.noWorktreesHint'));
+    }
+    // 显示 worktree 列表
+    displayWorktreeList(worktrees);
+    // 步骤1: 拉取主分支最新代码
+    const pullSpinner = ora({
+        text: t('commands.update.pullingMain'),
+        stream: process.stderr
+    }).start();
+    try {
+        await pullMainBranch(mainDir, skipPull);
+        pullSpinner.succeed(t('commands.update.pullSuccess'));
+    }
+    catch (error) {
+        pullSpinner.fail(t('commands.update.pullFailed'));
+        throw error;
+    }
+    // 步骤2: 执行批量更新（内部会检查每个 worktree 的状态）
+    const strategy = useRebase ? 'rebase' : 'merge';
+    output(t('commands.update.batchUpdating', { strategy }));
+    const result = await updateAllWorktrees(worktrees, mainBranch, useRebase);
+    // 显示结果
+    displayBatchUpdateResult(result);
+    // 如果有失败，退出码为 1
+    if (result.failed > 0) {
+        outputResult({ success: false });
+        process.exit(1);
+    }
+}
+/**
+ * 执行 update 命令（供其他命令内部调用，不输出 JSON）
+ */
+export async function executeUpdate(target, options) {
+    // 步骤1: 获取项目路径并验证
+    const paths = await getProjectPaths();
+    await validateProjectInitialized(paths);
+    // 步骤2: 在主分支目录中检查 git 仓库
+    await executeInDirectory(paths.mainDir, async () => {
+        await checkIsGitRepo();
+    });
+    // 获取主分支名称
+    const mainBranch = await getMainBranch(paths.mainDir);
+    // 确定是否使用 rebase（默认 true）
+    const useRebase = !options.noRebase;
+    // 步骤3: 处理批量更新或单个更新
+    if (options.all) {
+        // 批量更新所有 worktree
+        await handleBatchUpdate(paths.mainDir, paths.worktreesDir, mainBranch, useRebase, false);
+    }
+    else {
+        // 单个更新
+        await handleSingleUpdate(target, paths.mainDir, paths.worktreesDir, mainBranch, useRebase, false);
+    }
+}
+/**
+ * 注册 update 命令
+ */
+export function register(program) {
+    program
+        .command('update [target]')
+        .description(t('commands.update.description'))
+        .option('--no-rebase', t('commands.update.noRebaseOption'))
+        .option('--all', t('commands.update.allOption'))
+        .option('--no-fetch', t('commands.update.noFetchOption'))
+        .action(async (target, options) => {
+        await updateCommand(target, options);
+    });
+}
+//# sourceMappingURL=update.js.map

package/dist/commands/update.js.map

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