@jspg-ai/coding-bb 0.0.3-beta.9 → 0.0.5-beta.1

package/cbb/worktrees/skills/cbb-worktree-close/scripts/remove-worktrees.js

@@ -7,6 +7,8 @@ require('./silence-popup');
  *   force: "true" 启用 --force，"false" 不启用
  *
  * 行为：
+ *   0. 物理删除前先显式拆除 AI 配置 junction（源文件零接触，防 Windows
+ *      删除例程遗留/穿透——实测 git worktree remove 遇 junction 会静默残留）
  *   1. 先移除各应用 worktree
  *   2. 再移除 workspace worktree
  *   3. 三层降级：git worktree remove → prune+rm → 仅 prune
@@ -32,6 +34,8 @@ if (!wsRoot || !branch || !forceStr) {
 
 const force = forceStr === 'true';
 const wtDir = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
+// AI 配置 junction 拆除脚本（close 自包含副本；源真 _shared/scripts/junction-ai-config.js）
+const junctionScript = path.join(__dirname, 'junction-ai-config.js');
 
 function run(cmd, cwd) {
   try {
@@ -42,11 +46,14 @@ function run(cmd, cwd) {
 }
 
 function removePhysicalDir(dir) {
-  // Windows 用 rmdir /s /q，Unix 用 rm -rf
-  if (process.platform === 'win32') {
-    return run('rmdir /s /q "' + dir + '"');
+  // 统一 Node fs.rmSync：跨平台；对 reparse point（junction/symlink）只删链接不穿透目标。
+  // 不用 rmdir /s /q / rm -rf——两者对 junction 的行为因实现/版本而异（实测 git 会静默残留目录树）
+  try {
+    fs.rmSync(dir, { recursive: true, force: true });
+    return { ok: true, out: '' };
+  } catch (e) {
+    return { ok: false, err: e.message };
   }
-  return run('rm -rf "' + dir + '"');
 }
 
 const lockedDirs = [];
@@ -58,14 +65,33 @@ function removeWt(repoPath, wtPath, name) {
     return;
   }
 
+  // 第 0 层：显式拆除 AI 配置 junction（只解除链接、源文件零接触；
+  // 实测 Windows 删除例程遇 junction 会静默失败、残留整个目录树）
+  const jr = run('node "' + junctionScript + '" "' + wsRoot + '" "' + wtPath + '" --remove');
+  if (jr.ok) {
+    const m = (jr.out || '').match(/JUNCTION_REMOVE_RESULT (.+)$/m);
+    if (m) {
+      try {
+        const data = JSON.parse(m[1]);
+        if (data.removed && data.removed.length) console.log('🔗 ' + name + ' AI 配置 junction 已拆除：' + data.removed.join(', '));
+      } catch (e) {}
+    }
+  } else {
+    console.log('⚠️ ' + name + ' junction 拆除失败（继续移除）：' + (jr.err || ''));
+  }
+
   const forceFlag = force ? ' --force' : '';
   // 第 1 层：git worktree remove
   const r1 = run('git worktree remove' + forceFlag + ' "' + wtPath + '"', repoPath);
-  if (r1.ok) {
+  if (r1.ok && !fs.existsSync(wtPath)) {
     console.log('✅ ' + name + ' worktree 已移除');
     results.push({ name, status: 'removed' });
     return;
   }
+  if (r1.ok && fs.existsSync(wtPath)) {
+    // git 报成功但物理目录残留（Windows + junction/系统差异的静默失败）→ 物理兜底
+    console.log('⚠️ ' + name + '：git 元数据已移除但物理目录残留，执行物理清理');
+  }
 
   // 第 2 层：prune + 物理目录清理（解耦）
   run('git worktree prune', repoPath);
@@ -78,19 +104,28 @@ function removeWt(repoPath, wtPath, name) {
 
   // 第 3 层：目录被锁
   lockedDirs.push(wtPath);
-  console.log('⏳ ' + name + ' 元数据已清理，物理目录被锁定（将在下次 init 时自动清理）');
+  console.log('⏳ ' + name + ' 元数据已清理，物理目录被锁定（init 不会自动删除目录，需手动清理）');
   results.push({ name, status: 'locked' });
 }
 
 // 1. 应用 worktrees
-const configPath = path.join(wsRoot, 'workspace-config.json');
+const configPath = path.join(wsRoot, 'CBB-WORKSPACE.json');
 let config = {};
 try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
 
 const apps = config.apps || [];
+/** 解析 app worktree 物理路径：新布局 .codespace/<app> 优先，兼容 ≤beta.23 旧平铺 <app> */
+function resolveAppWt(appName) {
+  const nested = path.join(wtDir, '.codespace', appName);
+  if (fs.existsSync(path.join(nested, '.git'))) return nested;
+  const legacy = path.join(wtDir, appName);
+  if (fs.existsSync(path.join(legacy, '.git'))) return legacy;
+  return nested;
+}
+
 console.log('=== 移除应用 Worktrees ===');
 for (const app of apps) {
-  const appWt = path.join(wtDir, app.name);
+  const appWt = resolveAppWt(app.name);
   const appPath = path.join(wsRoot, '.codespace', app.name);
   removeWt(appPath, appWt, app.name);
 }
@@ -110,7 +145,7 @@ if (lockedDirs.length > 0) {
   console.log('');
   console.log('⏳ 以下目录被外部进程占用（IDE 等），git 元数据已清理，物理目录仍保留：');
   lockedDirs.forEach(d => console.log('   - ' + d));
-  console.log('   → 请关闭占用这些目录的程序（如 IDE）后手动删除；或下次 init-worktree 时自动清理');
+  console.log('   → 请关闭占用这些目录的程序（如 IDE）后手动删除（init 不再自动清理物理目录）');
 }
 
 console.log('---');

package/cbb/worktrees/skills/cbb-worktree-close/scripts/safety-check.js

@@ -38,8 +38,10 @@ function mergedTo(repoPath, from, to) {
   if (!run('git rev-parse --verify --quiet "' + from + '"', repoPath).ok) return 1;
   if (!run('git rev-parse --verify --quiet "' + to + '"', repoPath).ok) return 2;
   if (run('git merge-base --is-ancestor "' + from + '" "' + to + '" && echo Y', repoPath).out === 'Y') return 0;
-  const cherry = run('git cherry "' + to + '" "' + from + '" | grep -q "^+" && echo N || echo Y', repoPath);
-  if (cherry.out === 'N') return 1;
+  // 跨平台：不用 grep（Windows 无 grep），解析 git cherry 输出（+ 前缀 = 未合并提交）
+  const cherry = run('git cherry "' + to + '" "' + from + '"', repoPath);
+  if (!cherry.ok) return 1;
+  if (cherry.out.split(/\r?\n/).filter(Boolean).some(l => l.indexOf('+') === 0)) return 1;
   return 0;
 }
 
@@ -152,19 +154,28 @@ function checkRepo(name, repoPath, wtPath) {
   return { name, wt: wtPath, fetch_ok: fetchOk, dirty_files: dirtyFiles, merged, main, remote_exists: remoteExists, remote: remoteName, unpushed_count: unpushedCount };
 }
 
-const configPath = path.join(wsRoot, 'workspace-config.json');
+const configPath = path.join(wsRoot, 'CBB-WORKSPACE.json');
 let config = {};
 try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
 
 const apps = config.apps || [];
 const wtDir = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
 
+/** 解析 app worktree 物理路径：新布局 .codespace/<app> 优先，兼容 ≤beta.23 旧平铺 <app> */
+function resolveAppWt(appName) {
+  const nested = path.join(wtDir, '.codespace', appName);
+  if (fs.existsSync(path.join(nested, '.git'))) return nested;
+  const legacy = path.join(wtDir, appName);
+  if (fs.existsSync(path.join(legacy, '.git'))) return legacy;
+  return nested;
+}
+
 const results = [];
 
 results.push(checkRepo('workspace', wsRoot, wtDir));
 
 for (const app of apps) {
-  const appWt = path.join(wtDir, app.name);
+  const appWt = resolveAppWt(app.name);
   const appPath = path.join(wsRoot, '.codespace', app.name);
   results.push(checkRepo(app.name, appPath, appWt));
 }

package/cbb/worktrees/skills/cbb-worktree-close/scripts/silence-popup.js

@@ -4,7 +4,7 @@
 // koffi is resolved from cbb global install (no local node_modules needed).
 //
 // 唯一真源：cbb/worktrees/_shared/scripts/silence-popup.js
-// 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / extend / close / push）。
+// 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / close / push / local-mode）。
 // skill 内同目录引用：脚本第一行 `require('./silence-popup')`。
 if (process.platform === 'win32') {
   try {