clawt 3.10.3 → 3.10.5

package/src/utils/validate-core.ts

@@ -2,6 +2,8 @@ import { logger } from '../logger/index.js';
 import { ClawtError } from '../errors/index.js';
 import { MESSAGES } from '../constants/index.js';
 import { getCurrentLanguage } from './i18n.js';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import {
   gitAddAll,
   gitCommit,
@@ -22,8 +24,26 @@ import {
   getHeadCommitHash,
   writeSnapshot,
   printWarning,
+  gitCheckIgnored,
+  execCommand,
 } from './index.js';
 
+/**
+ * 根据冲突文件列表生成 git clean 清理命令
+ * 按直接父目录去重，生成针对性的清理命令
+ * @param {string[]} files - 冲突文件的相对路径列表
+ * @returns {string[]} 清理命令列表
+ */
+function buildCleanCommands(files: string[]): string[] {
+  const dirs = new Set<string>();
+  for (const file of files) {
+    const lastSlash = file.lastIndexOf('/');
+    const dir = lastSlash > 0 ? file.substring(0, lastSlash) : '.';
+    dirs.add(dir);
+  }
+  return Array.from(dirs).map(dir => `git clean -fdx ${dir}/`);
+}
+
 /**
  * 通过 patch 将目标分支的全量变更（已提交 + 未提交）迁移到主 worktree
  * 使用 git diff HEAD...branch --binary 获取变更，避免 stash 方式无法检测已提交 commit 的问题
@@ -44,6 +64,16 @@ export function migrateChangesViaPatch(targetWorktreePath: string, mainWorktreeP
       didTempCommit = true;
     }
 
+    // 先执行轻量检测：检测被 .gitignore 忽略的残留文件（幽灵文件），在 apply 之前拦截
+    // 使用 --name-only 远比 --binary 便宜，检测到冲突时可跳过昂贵的 binary diff
+    const ignoredFiles = detectIgnoredFilesInPatch(branchName, mainWorktreePath);
+    if (ignoredFiles.length > 0) {
+      const cleanCommands = buildCleanCommands(ignoredFiles);
+      logger.warn(`检测到 ${ignoredFiles.length} 个被忽略的残留文件冲突`);
+      printWarning(MESSAGES.VALIDATE_IGNORED_FILES_CONFLICT(ignoredFiles, cleanCommands));
+      return { success: false };
+    }
+
     // 在主 worktree 执行三点 diff，获取目标分支自分叉点以来的全量变更
     const patch = gitDiffBinaryAgainstBranch(branchName, mainWorktreePath);
 
@@ -173,3 +203,25 @@ export function switchToValidateBranch(branchName: string, mainWorktreePath: str
   }
   return validateBranchName;
 }
+
+/**
+ * 检测 patch 中被 .gitignore 忽略且物理存在于主 worktree 的文件（幽灵文件）
+ * 这些文件会导致 git apply 失败（"已经存在于工作区中"）
+ * @param {string} branchName - 目标分支名
+ * @param {string} mainWorktreePath - 主 worktree 路径
+ * @returns {string[]} 幽灵文件的相对路径列表
+ */
+export function detectIgnoredFilesInPatch(branchName: string, mainWorktreePath: string): string[] {
+  try {
+    const output = execCommand(`git diff --name-only HEAD...${branchName}`, { cwd: mainWorktreePath });
+    const patchFiles = output.split('\n').filter(Boolean);
+    if (patchFiles.length === 0) return [];
+
+    // 筛选被 .gitignore 忽略且物理存在的文件（幽灵文件）
+    return gitCheckIgnored(patchFiles, mainWorktreePath)
+      .filter(file => existsSync(join(mainWorktreePath, file)));
+  } catch {
+    // diff 失败时跳过检测，降级为当前行为（让 apply 自行报错）
+    return [];
+  }
+}

package/tests/unit/utils/git-core.test.ts

@@ -0,0 +1,43 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { gitCheckIgnored } from '../../../src/utils/git-core.js';
+
+// mock child_process
+vi.mock('node:child_process', () => ({
+  execSync: vi.fn(),
+  execFileSync: vi.fn(),
+  exec: vi.fn(),
+}));
+
+import { execFileSync } from 'node:child_process';
+const mockExecFileSync = vi.mocked(execFileSync);
+
+describe('gitCheckIgnored', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('空数组输入时返回空数组', () => {
+    const result = gitCheckIgnored([]);
+    expect(result).toEqual([]);
+    expect(mockExecFileSync).not.toHaveBeenCalled();
+  });
+
+  it('全部被忽略时返回全部路径', () => {
+    mockExecFileSync.mockReturnValue('docs/superpowers/a.md\ndocs/superpowers/b.md\n');
+    const result = gitCheckIgnored(['docs/superpowers/a.md', 'docs/superpowers/b.md']);
+    expect(result).toEqual(['docs/superpowers/a.md', 'docs/superpowers/b.md']);
+  });
+
+  it('全部不被忽略时返回空数组', () => {
+    // git check-ignore 无匹配时退出码为 1，execFileSync 抛出异常
+    mockExecFileSync.mockImplementation(() => { throw new Error('exit code 1'); });
+    const result = gitCheckIgnored(['src/index.ts']);
+    expect(result).toEqual([]);
+  });
+
+  it('混合场景时仅返回被忽略的路径', () => {
+    mockExecFileSync.mockReturnValue('docs/superpowers/a.md\n');
+    const result = gitCheckIgnored(['docs/superpowers/a.md', 'src/index.ts']);
+    expect(result).toEqual(['docs/superpowers/a.md']);
+  });
+});

package/tests/unit/utils/validate-core.test.ts

@@ -0,0 +1,60 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+vi.mock('../../../src/utils/git-core.js', async () => {
+  const actual = await vi.importActual('../../../src/utils/git-core.js');
+  return { ...actual, gitCheckIgnored: vi.fn() };
+});
+
+vi.mock('node:fs', () => ({
+  existsSync: vi.fn(),
+  mkdirSync: vi.fn(),
+}));
+
+vi.mock('../../../src/utils/shell.js', async () => {
+  const actual = await vi.importActual('../../../src/utils/shell.js');
+  return { ...actual, execCommand: vi.fn() };
+});
+
+import { detectIgnoredFilesInPatch } from '../../../src/utils/validate-core.js';
+import { gitCheckIgnored } from '../../../src/utils/git-core.js';
+import { existsSync } from 'node:fs';
+import { execCommand } from '../../../src/utils/shell.js';
+
+const mockGitCheckIgnored = vi.mocked(gitCheckIgnored);
+const mockExistsSync = vi.mocked(existsSync);
+const mockExecCommand = vi.mocked(execCommand);
+
+describe('detectIgnoredFilesInPatch', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('无幽灵文件时返回空数组', () => {
+    mockExecCommand.mockReturnValue('src/a.ts\nsrc/b.ts');
+    mockGitCheckIgnored.mockReturnValue([]);
+    const result = detectIgnoredFilesInPatch('feature', '/main');
+    expect(result).toEqual([]);
+  });
+
+  it('检测到幽灵文件时返回文件列表', () => {
+    mockExecCommand.mockReturnValue('docs/superpowers/a.md\nsrc/b.ts');
+    mockGitCheckIgnored.mockReturnValue(['docs/superpowers/a.md']);
+    mockExistsSync.mockImplementation((p: string) => p === '/main/docs/superpowers/a.md');
+    const result = detectIgnoredFilesInPatch('feature', '/main');
+    expect(result).toEqual(['docs/superpowers/a.md']);
+  });
+
+  it('被忽略但物理不存在的文件不包含在结果中', () => {
+    mockExecCommand.mockReturnValue('docs/superpowers/a.md');
+    mockGitCheckIgnored.mockReturnValue(['docs/superpowers/a.md']);
+    mockExistsSync.mockReturnValue(false);
+    const result = detectIgnoredFilesInPatch('feature', '/main');
+    expect(result).toEqual([]);
+  });
+
+  it('git diff --name-only 失败时返回空数组（降级）', () => {
+    mockExecCommand.mockImplementation(() => { throw new Error('fatal'); });
+    const result = detectIgnoredFilesInPatch('feature', '/main');
+    expect(result).toEqual([]);
+  });
+});