sillyspec 3.19.0 → 3.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillyspec",
-  "version": "3.19.0",
+  "version": "3.19.1",
   "description": "SillySpec CLI — 流程状态机，让 AI 严格按步骤来",
   "icon": "logo.jpg",
   "homepage": "https://sillyspec.ppdmq.top/",

package/src/worktree.js

@@ -9,7 +9,7 @@
  */
 
 import { execSync } from 'child_process';
-import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync, readdirSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync, readdirSync, statSync } from 'fs';
 import { join, resolve, dirname } from 'path';
 import { createHash } from 'crypto';
 
@@ -120,7 +120,43 @@ export function isGitWorktreeSupported(cwd = process.cwd()) {
 export class WorktreeManager {
   constructor({ cwd, worktreeDir } = {}) {
     this.cwd = cwd || process.cwd();
-    this.worktreeBase = worktreeDir || resolve(this.cwd, WORKTREES_REL);
+
+    // worktreeBase 必须固定到主仓库路径，不能跟着 cwd 变化。
+    // native-worktree 模式下 cwd 是 worktree 子目录，用 cwd 推导 worktreeBase
+    // 会导致 meta 写入 worktree 内部路径，worktree 内再次执行时找不到。
+    // 解决：用 git rev-parse --git-common-dir 反推主仓库路径。
+    if (worktreeDir) {
+      this.worktreeBase = worktreeDir;
+    } else {
+      this.worktreeBase = resolve(this._resolveMainRepoRoot(), WORKTREES_REL);
+    }
+  }
+
+  /**
+   * 解析当前 git 环境对应的主仓库根目录
+   * 在主仓库内执行：返回 cwd 自身
+   * 在 linked worktree 内执行：返回 git-common-dir 的父目录（即主仓库 .git 所在地）
+   * @private
+   */
+  _resolveMainRepoRoot() {
+    try {
+      // git-common-dir 在主仓库内 = <main>/.git
+      // 在 linked worktree 内 = <main>/.git（git 共享 .git 目录）
+      const commonDir = gitQuiet(this.cwd, 'rev-parse --git-common-dir');
+      if (!commonDir) return this.cwd;
+
+      // commonDir 应该是 <main-repo>/.git
+      // dirname(commonDir) = <main-repo>
+      if (existsSync(commonDir)) {
+        const st = statSync(commonDir);
+        if (st.isDirectory()) {
+          return dirname(commonDir);
+        }
+      }
+    } catch (e) {
+      // 静默 fallback：主仓库内执行或 git 异常
+    }
+    return this.cwd;
   }
 
   /**
@@ -167,11 +203,19 @@ export class WorktreeManager {
     if (isolation.inWorktree) {
       // 已在 linked worktree 中，复用当前目录作为 worktree 路径
       console.log(`ℹ️  已在 linked worktree 中（git-dir: ${isolation.gitDir}），复用当前隔离环境。`);
-      return this._createInPlaceMeta(name, {
+
+      // 幂等守卫：meta 已存在时不重新 overlay baseline
+      const existingMeta = this.getMeta(name)
+      if (existingMeta) {
+        return { branch: existingMeta.branch, worktreePath: existingMeta.worktreePath, baseHash: existingMeta.baseHash, mode: existingMeta.mode }
+      }
+
+      // meta 不存在但已在 worktree 内：可能是 meta 被损坏/误删。
+      // 绝对禁止 overlay baseline（source === target 会冲突），
+      // 只恢复 meta 引用，不触碰文件系统。
+      return this._recoverNativeWorktreeMeta(name, {
         worktreePath: this.cwd,
         branch: gitQuiet(this.cwd, 'symbolic-ref --short HEAD') || 'detached',
-        mode: 'native-worktree',
-        base,
       });
     }
 
@@ -304,12 +348,76 @@ export class WorktreeManager {
     return { branch, worktreePath, baseHash, mode: meta.mode };
   }
 
+  /**
+   * native-worktree 模式下恢复 meta 引用
+   * 当 meta.json 被损坏/误删时，只重建 meta 文件，不触碰文件系统（不 overlay）
+   * @private
+   */
+  _recoverNativeWorktreeMeta(name, { worktreePath, branch }) {
+    const baseHash = gitQuiet(worktreePath, 'rev-parse HEAD') || null
+    const meta = {
+      changeName: name,
+      branch: branch || BRANCH_PREFIX + name,
+      baseBranch: branch,
+      baseHash,
+      actualBaseHash: baseHash,
+      createdAt: new Date().toISOString(),
+      worktreePath,
+      mode: 'native-worktree',
+      baselineFiles: [],
+      baselineCommit: null,
+      baselineHash: null,
+      recoveredAt: new Date().toISOString(),
+      recoveryNote: 'meta was missing in native-worktree; recovered without baseline overlay',
+    }
+    if (!existsSync(this.worktreeBase)) mkdirSync(this.worktreeBase, { recursive: true })
+    const metaDir = join(this.worktreeBase, name)
+    if (!existsSync(metaDir)) mkdirSync(metaDir, { recursive: true })
+    writeFileSync(join(metaDir, META_FILE), JSON.stringify(meta, null, 2) + '\n')
+    console.log(`🔗 native-worktree meta 已恢复: ${metaDir}/meta.json`)
+    return { branch: meta.branch, worktreePath, baseHash, mode: meta.mode }
+  }
+
   /**
    * 创建 in-place 模式的 meta.json（降级路径）
    * 不创建 git worktree，直接在当前目录记录 baseline 并写入 meta
    * @private
    */
   _createInPlaceMeta(name, { worktreePath, branch, baseBranch, baseHash, mode } = {}) {
+    // 幂等守卫：meta 已存在时不重新创建（避免 overlay baseline 和已有改动冲突）
+    const existingMeta = this.getMeta(name)
+    if (existingMeta) {
+      return { branch: existingMeta.branch, worktreePath: existingMeta.worktreePath, baseHash: existingMeta.baseHash, mode: existingMeta.mode }
+    }
+
+    // 硬规则：禁止 self-overlay（source 和 target 相同时 overlay 必然冲突）
+    const resolvedSource = resolve(this.cwd)
+    const resolvedTarget = resolve(worktreePath)
+    if (resolvedSource === resolvedTarget) {
+      console.warn('⚠️  跳过 baseline overlay：当前目录与目标目录相同（native-worktree 或 in-place 模式）')
+      // 写 meta 但不 overlay
+      baseBranch = baseBranch || gitQuiet(this.cwd, 'symbolic-ref --short HEAD') || gitQuiet(this.cwd, 'rev-parse HEAD')
+      baseHash = baseHash || git(this.cwd, 'rev-parse HEAD')
+      const meta = {
+        changeName: name,
+        branch: branch || BRANCH_PREFIX + name,
+        baseBranch,
+        baseHash,
+        actualBaseHash: gitQuiet(worktreePath, 'rev-parse HEAD') || baseHash,
+        createdAt: new Date().toISOString(),
+        worktreePath,
+        mode: mode || 'in-place-fallback',
+        baselineFiles: [],
+        baselineCommit: null,
+        baselineHash: null,
+      }
+      if (!existsSync(this.worktreeBase)) mkdirSync(this.worktreeBase, { recursive: true })
+      const metaDir = join(this.worktreeBase, name)
+      if (!existsSync(metaDir)) mkdirSync(metaDir, { recursive: true })
+      writeFileSync(join(metaDir, META_FILE), JSON.stringify(meta, null, 2) + '\n')
+      return { branch: meta.branch, worktreePath, baseHash, mode: meta.mode }
+    }
+
     // 解析 base
     if (!baseHash) {
       baseBranch = baseBranch || gitQuiet(this.cwd, 'symbolic-ref --short HEAD') || gitQuiet(this.cwd, 'rev-parse HEAD');

package/test/worktree-native-overlay.test.mjs

@@ -0,0 +1,188 @@
+/**
+ * worktree native-worktree overlay regression tests
+ *
+ * 验证 Bug 1 + Bug 2 修复：
+ * 1. worktreeBase 固定到主仓库路径，不跟着 cwd 变化
+ * 2. 禁止 self-overlay（source === target 时）
+ * 3. native-worktree meta 缺失时 recover，不 overlay
+ * 4. meta 已存在时幂等返回，不重建
+ */
+
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
+import { execSync } from 'child_process'
+
+// ── Test 1: _resolveMainRepoRoot 在主仓库内返回 cwd ──
+
+async function test1_mainRepoRoot() {
+  const d = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-'))
+  execSync('git init', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.email "test@test.com"', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.name "test"', { cwd: d, stdio: 'pipe' })
+  execSync('git commit --allow-empty -m "init"', { cwd: d, stdio: 'pipe' })
+
+  // Add .gitignore to allow worktreeBase path
+  fs.mkdirSync(path.join(d, '.sillyspec'), { recursive: true })
+  fs.writeFileSync(path.join(d, '.gitignore'), '.sillyspec/\n')
+
+  const { WorktreeManager } = await import('../src/worktree.js')
+  const wm = new WorktreeManager({ cwd: d })
+  const root = wm._resolveMainRepoRoot()
+  console.assert(root === d, `Test 1 FAIL: expected ${d}, got ${root}`)
+  console.log('✅ Test 1: main repo root resolves to cwd')
+
+  fs.rmSync(d, { recursive: true })
+}
+
+// ── Test 2: native-worktree 检测 + 幂等守卫 ──
+
+async function test2_nativeWorktreeIdempotent() {
+  const d = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-'))
+  execSync('git init', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.email "test@test.com"', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.name "test"', { cwd: d, stdio: 'pipe' })
+  execSync('git commit --allow-empty -m "init"', { cwd: d, stdio: 'pipe' })
+
+  const wtDir = path.join(d, 'wt')
+  execSync(`git worktree add ${wtDir} -b test-branch`, { cwd: d, stdio: 'pipe' })
+
+  // wtDir is a linked worktree
+  const { WorktreeManager } = await import('../src/worktree.js')
+
+  // First: create meta from inside worktree (simulating native-worktree mode)
+  const wm1 = new WorktreeManager({ cwd: wtDir })
+  // This simulates what happens when Claude Code runs in the worktree
+  // and SillySpec calls create() — detectIsolation should return inWorktree=true
+  // and meta should be written to main repo's worktreeBase, not worktree's
+
+  // Verify worktreeBase points to main repo
+  const expectedBase = path.join(d, '.sillyspec', '.runtime', 'worktrees')
+  console.assert(wm1.worktreeBase === expectedBase, `Test 2 FAIL: worktreeBase=${wm1.worktreeBase}, expected=${expectedBase}`)
+  console.log('✅ Test 2: worktreeBase fixed to main repo path')
+
+  fs.rmSync(d, { recursive: true })
+}
+
+// ── Test 3: self-overlay 禁止 ──
+
+async function test3_selfOverlayBlocked() {
+  const d = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-'))
+  execSync('git init', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.email "test@test.com"', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.name "test"', { cwd: d, stdio: 'pipe' })
+  execSync('git commit --allow-empty -m "init"', { cwd: d, stdio: 'pipe' })
+  fs.mkdirSync(path.join(d, '.sillyspec'), { recursive: true })
+  fs.writeFileSync(path.join(d, '.gitignore'), '.sillyspec/\n')
+
+  const { WorktreeManager } = await import('../src/worktree.js')
+  const wm = new WorktreeManager({ cwd: d })
+
+  // Create with in-place-fallback mode (source === target)
+  const result = wm._createInPlaceMeta('test-change', {
+    worktreePath: d,
+    branch: 'test-branch',
+    mode: 'in-place-fallback',
+  })
+
+  console.assert(result.mode === 'in-place-fallback', `Test 3 FAIL: mode=${result.mode}`)
+  // 返回值不包含 baselineFiles（是简化的返回结构），验证 meta 文件本身
+  const meta3 = wm.getMeta('test-change')
+  console.assert(meta3 && meta3.baselineFiles.length === 0, `Test 3 FAIL: meta baselineFiles should be empty`)
+  console.log('✅ Test 3: self-overlay blocked, baselineFiles empty')
+
+  fs.rmSync(d, { recursive: true })
+}
+
+// ── Test 4: meta 幂等，不重复 overlay ──
+
+async function test4_metaIdempotent() {
+  const d = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-'))
+  execSync('git init', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.email "test@test.com"', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.name "test"', { cwd: d, stdio: 'pipe' })
+  execSync('git commit --allow-empty -m "init"', { cwd: d, stdio: 'pipe' })
+  fs.mkdirSync(path.join(d, '.sillyspec'), { recursive: true })
+  fs.writeFileSync(path.join(d, '.gitignore'), '.sillyspec/\n')
+
+  const { WorktreeManager } = await import('../src/worktree.js')
+  const wm = new WorktreeManager({ cwd: d })
+
+  // First create
+  const r1 = wm._createInPlaceMeta('test-change', {
+    worktreePath: d,
+    branch: 'test-branch',
+    mode: 'in-place-fallback',
+  })
+
+  // Second create (should return existing, not re-overlay)
+  const r2 = wm._createInPlaceMeta('test-change', {
+    worktreePath: d,
+    branch: 'test-branch',
+    mode: 'in-place-fallback',
+  })
+
+  console.assert(r1.baseHash === r2.baseHash, `Test 4 FAIL: hashes differ`)
+  console.log('✅ Test 4: _createInPlaceMeta idempotent')
+
+  fs.rmSync(d, { recursive: true })
+}
+
+// ── Test 5: native-worktree meta 恢复 ──
+
+async function test5_nativeRecovery() {
+  const d = fs.mkdtempSync(path.join(os.tmpdir(), 'wt-'))
+  execSync('git init', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.email "test@test.com"', { cwd: d, stdio: 'pipe' })
+  execSync('git config user.name "test"', { cwd: d, stdio: 'pipe' })
+  execSync('git commit --allow-empty -m "init"', { cwd: d, stdio: 'pipe' })
+
+  const wtDir = path.join(d, 'wt')
+  execSync(`git worktree add ${wtDir} -b test-branch`, { cwd: d, stdio: 'pipe' })
+
+  const { WorktreeManager } = await import('../src/worktree.js')
+  const wm = new WorktreeManager({ cwd: wtDir })
+
+  // Simulate meta missing in native-worktree (should recover, not overlay)
+  const result = wm._recoverNativeWorktreeMeta('test-change', {
+    worktreePath: wtDir,
+    branch: 'test-branch',
+  })
+
+  console.assert(result.mode === 'native-worktree', `Test 5 FAIL: mode=${result.mode}`)
+  // 返回值不包含 baselineFiles，验证 meta 文件本身
+  const meta5 = wm.getMeta('test-change')
+  console.assert(meta5 && meta5.baselineFiles.length === 0, `Test 5 FAIL: meta baselineFiles should be empty`)
+
+  // Verify meta is readable now
+  const meta = wm.getMeta('test-change')
+  console.assert(meta !== null, `Test 5 FAIL: meta should exist after recovery`)
+  console.assert(meta.mode === 'native-worktree', `Test 5 FAIL: meta.mode=${meta.mode}`)
+  console.log('✅ Test 5: native-worktree meta recovery without overlay')
+
+  fs.rmSync(d, { recursive: true })
+}
+
+// ── Run all ──
+
+const tests = [
+  ['main repo root', test1_mainRepoRoot],
+  ['native worktree worktreeBase', test2_nativeWorktreeIdempotent],
+  ['self-overlay blocked', test3_selfOverlayBlocked],
+  ['meta idempotent', test4_metaIdempotent],
+  ['native recovery', test5_nativeRecovery],
+]
+
+let passed = 0, failed = 0
+for (const [name, fn] of tests) {
+  try {
+    await fn()
+    passed++
+  } catch (e) {
+    console.log(`❌ ${name}: ${e.message}`)
+    failed++
+  }
+}
+
+console.log(`\n${passed}/${tests.length} passed`)
+if (failed) process.exit(1)