clawt 1.3.0 → 2.0.0

package/src/index.ts

@@ -12,6 +12,7 @@ import { registerResumeCommand } from './commands/resume.js';
 import { registerValidateCommand } from './commands/validate.js';
 import { registerMergeCommand } from './commands/merge.js';
 import { registerConfigCommand } from './commands/config.js';
+import { registerSyncCommand } from './commands/sync.js';
 
 // 从 package.json 读取版本号，避免硬编码
 const require = createRequire(import.meta.url);
@@ -36,6 +37,7 @@ registerResumeCommand(program);
 registerValidateCommand(program);
 registerMergeCommand(program);
 registerConfigCommand(program);
+registerSyncCommand(program);
 
 // 全局未捕获异常处理
 process.on('uncaughtException', (error) => {

package/src/types/command.ts

@@ -36,8 +36,6 @@ export interface RemoveOptions {
   all?: boolean;
   /** 分支名 */
   branch?: string;
-  /** 指定索引 */
-  index?: number;
 }
 
 /** resume 命令选项 */
@@ -45,3 +43,9 @@ export interface ResumeOptions {
   /** 要恢复的分支名 */
   branch: string;
 }
+
+/** sync 命令选项 */
+export interface SyncOptions {
+  /** 要同步的分支名 */
+  branch: string;
+}

package/src/types/index.ts

@@ -1,5 +1,5 @@
 export type { ClawtConfig, ConfigItemDefinition, ConfigDefinitions } from './config.js';
-export type { CreateOptions, RunOptions, ValidateOptions, MergeOptions, RemoveOptions, ResumeOptions } from './command.js';
+export type { CreateOptions, RunOptions, ValidateOptions, MergeOptions, RemoveOptions, ResumeOptions, SyncOptions } from './command.js';
 export type { WorktreeInfo, WorktreeStatus } from './worktree.js';
 export type { ClaudeCodeResult } from './claudeCode.js';
 export type { TaskResult, TaskSummary } from './taskResult.js';

package/src/types/worktree.ts

@@ -10,9 +10,9 @@ export interface WorktreeInfo {
 export interface WorktreeStatus {
   /** 相对于主分支的新增提交数 */
   commitCount: number;
-  /** 新增行数 */
+  /** 工作区和暂存区的新增行数 */
   insertions: number;
-  /** 删除行数 */
+  /** 工作区和暂存区的删除行数 */
   deletions: number;
   /** 工作区是否有未提交修改 */
   hasDirtyFiles: boolean;

package/src/utils/git.ts

@@ -190,6 +190,15 @@ export function gitStashPop(index: number = 0, cwd?: string): void {
   execCommand(`git stash pop stash@{${index}}`, { cwd });
 }
 
+/**
+ * git stash drop stash@{index}
+ * @param {number} index - stash 索引
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitStashDrop(index: number = 0, cwd?: string): void {
+  execCommand(`git stash drop stash@{${index}}`, { cwd });
+}
+
 /**
  * git stash list
  * @param {string} cwd - 工作目录
@@ -277,25 +286,14 @@ function parseShortStat(output: string): { insertions: number; deletions: number
 }
 
 /**
- * 获取目标分支的变更统计（已提交 + 未提交）
- * @param {string} branchName - 目标分支名
+ * 获取 worktree 中工作区和暂存区的变更统计
  * @param {string} worktreePath - worktree 目录路径
- * @param {string} [cwd] - 执行 git diff HEAD...branch 的工作目录
- * @returns {{ insertions: number; deletions: number }} 聚合后的新增和删除行数
+ * @returns {{ insertions: number; deletions: number }} 新增和删除行数
  */
-export function getDiffStat(branchName: string, worktreePath: string, cwd?: string): { insertions: number; deletions: number } {
-  // 已提交的变更（当前分支与目标分支的差异）
-  const committedOutput = execCommand(`git diff --shortstat HEAD...${branchName}`, { cwd });
-  const committed = parseShortStat(committedOutput);
-
-  // 未提交的变更（在 worktree 内执行）
-  const uncommittedOutput = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
-  const uncommitted = parseShortStat(uncommittedOutput);
-
-  return {
-    insertions: committed.insertions + uncommitted.insertions,
-    deletions: committed.deletions + uncommitted.deletions,
-  };
+export function getDiffStat(worktreePath: string): { insertions: number; deletions: number } {
+  // 工作区和暂存区相对于 HEAD 的变更
+  const output = execCommand('git diff --shortstat HEAD', { cwd: worktreePath });
+  return parseShortStat(output);
 }
 
 /**
@@ -320,3 +318,54 @@ export function gitDiffCachedBinary(cwd?: string): Buffer {
 export function gitApplyCachedFromStdin(patchContent: Buffer, cwd?: string): void {
   execCommandWithInput('git', ['apply', '--cached'], { input: patchContent, cwd });
 }
+
+/**
+ * 获取当前分支名
+ * @param {string} [cwd] - 工作目录
+ * @returns {string} 当前分支名
+ */
+export function getCurrentBranch(cwd?: string): string {
+  return execCommand('git rev-parse --abbrev-ref HEAD', { cwd });
+}
+
+/**
+ * 获取当前 HEAD 的 commit hash
+ * @param {string} [cwd] - 工作目录
+ * @returns {string} commit hash
+ */
+export function getHeadCommitHash(cwd?: string): string {
+  return execCommand('git rev-parse HEAD', { cwd });
+}
+
+/**
+ * 获取目标分支相对于当前分支的已提交变更（含二进制文件）
+ * 使用三点 diff（HEAD...branchName）获取自分叉点以来的变更
+ * @param {string} branchName - 目标分支名
+ * @param {string} [cwd] - 工作目录（应在主 worktree 中执行）
+ * @returns {Buffer} diff 原始输出
+ */
+export function gitDiffBinaryAgainstBranch(branchName: string, cwd?: string): Buffer {
+  logger.debug(`执行命令: git diff HEAD...${branchName} --binary${cwd ? ` (cwd: ${cwd})` : ''}`);
+  return execSync(`git diff HEAD...${branchName} --binary`, {
+    cwd,
+    stdio: ['pipe', 'pipe', 'pipe'],
+  });
+}
+
+/**
+ * 将 patch 内容通过 stdin 应用到工作目录（不带 --cached）
+ * @param {Buffer} patchContent - patch 内容
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitApplyFromStdin(patchContent: Buffer, cwd?: string): void {
+  execCommandWithInput('git', ['apply'], { input: patchContent, cwd });
+}
+
+/**
+ * git reset --soft HEAD~<count>，撤销 commit 但保留变更在暂存区
+ * @param {number} count - 撤销的 commit 数量
+ * @param {string} [cwd] - 工作目录
+ */
+export function gitResetSoft(count: number = 1, cwd?: string): void {
+  execCommand(`git reset --soft HEAD~${count}`, { cwd });
+}

package/src/utils/index.ts

@@ -20,6 +20,7 @@ export {
   gitStashPush,
   gitStashApply,
   gitStashPop,
+  gitStashDrop,
   gitStashList,
   gitRestoreStaged,
   gitWorktreeList,
@@ -29,6 +30,11 @@ export {
   getDiffStat,
   gitDiffCachedBinary,
   gitApplyCachedFromStdin,
+  getCurrentBranch,
+  getHeadCommitHash,
+  gitDiffBinaryAgainstBranch,
+  gitApplyFromStdin,
+  gitResetSoft,
 } from './git.js';
 export { sanitizeBranchName, generateBranchNames, validateBranchesNotExist } from './branch.js';
 export { validateMainWorktree, validateGitInstalled, validateClaudeCodeInstalled } from './validation.js';
@@ -38,4 +44,4 @@ export { printSuccess, printError, printWarning, printInfo, printSeparator, prin
 export { ensureDir, removeEmptyDir } from './fs.js';
 export { multilineInput } from './prompt.js';
 export { launchInteractiveClaude } from './claude.js';
-export { getSnapshotPath, hasSnapshot, readSnapshot, writeSnapshot, removeSnapshot, removeProjectSnapshots } from './validate-snapshot.js';
+export { getSnapshotPath, hasSnapshot, readSnapshot, writeSnapshot, removeSnapshot, removeProjectSnapshots, readSnapshotHead } from './validate-snapshot.js';

package/src/utils/validate-snapshot.ts

@@ -14,6 +14,16 @@ export function getSnapshotPath(projectName: string, branchName: string): string
   return join(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.patch`);
 }
 
+/**
+ * 获取指定项目和分支的快照 HEAD hash 文件路径
+ * @param {string} projectName - 项目名
+ * @param {string} branchName - 分支名
+ * @returns {string} head 文件的绝对路径
+ */
+function getSnapshotHeadPath(projectName: string, branchName: string): string {
+  return join(VALIDATE_SNAPSHOTS_DIR, projectName, `${branchName}.head`);
+}
+
 /**
  * 判断指定项目和分支是否存在 validate 快照
  * @param {string} projectName - 项目名
@@ -41,12 +51,17 @@ export function readSnapshot(projectName: string, branchName: string): Buffer {
  * @param {string} projectName - 项目名
  * @param {string} branchName - 分支名
  * @param {Buffer} patch - patch 内容（Buffer 格式）
+ * @param {string} [headHash] - 主分支 HEAD commit hash（用于增量 validate 一致性校验）
  */
-export function writeSnapshot(projectName: string, branchName: string, patch: Buffer): void {
+export function writeSnapshot(projectName: string, branchName: string, patch: Buffer, headHash?: string): void {
   const snapshotPath = getSnapshotPath(projectName, branchName);
   const snapshotDir = join(VALIDATE_SNAPSHOTS_DIR, projectName);
   ensureDir(snapshotDir);
   writeFileSync(snapshotPath, patch);
+  // 保存主分支 HEAD hash，用于下次增量 validate 时校验一致性
+  if (headHash) {
+    writeFileSync(getSnapshotHeadPath(projectName, branchName), headHash, 'utf-8');
+  }
   logger.info(`已保存 validate 快照: ${snapshotPath}`);
 }
 
@@ -61,6 +76,25 @@ export function removeSnapshot(projectName: string, branchName: string): void {
     unlinkSync(snapshotPath);
     logger.info(`已删除 validate 快照: ${snapshotPath}`);
   }
+  // 同时删除对应的 .head 文件
+  const headPath = getSnapshotHeadPath(projectName, branchName);
+  if (existsSync(headPath)) {
+    unlinkSync(headPath);
+  }
+}
+
+/**
+ * 读取快照保存时的主分支 HEAD commit hash
+ * @param {string} projectName - 项目名
+ * @param {string} branchName - 分支名
+ * @returns {string | null} HEAD hash，不存在则返回 null
+ */
+export function readSnapshotHead(projectName: string, branchName: string): string | null {
+  const headPath = getSnapshotHeadPath(projectName, branchName);
+  if (!existsSync(headPath)) {
+    return null;
+  }
+  return readFileSync(headPath, 'utf-8').trim();
 }
 
 /**

package/src/utils/worktree.ts

@@ -115,7 +115,7 @@ export function cleanupWorktrees(worktrees: WorktreeInfo[]): void {
 export function getWorktreeStatus(worktree: WorktreeInfo): WorktreeStatus | null {
   try {
     const commitCount = getCommitCountAhead(worktree.branch);
-    const { insertions, deletions } = getDiffStat(worktree.branch, worktree.path);
+    const { insertions, deletions } = getDiffStat(worktree.path);
     const hasDirtyFiles = !isWorkingDirClean(worktree.path);
 
     return { commitCount, insertions, deletions, hasDirtyFiles };