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

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

@@ -1,48 +1,77 @@
-#!/usr/bin/env node
-require('./silence-popup');
-/**
- * cbb-worktree-close 未归档 change 检查
- *
- * 用法：node check-unarchived.js <ws_root>
- *
- * 扫描 openspec/changes/ 目录，筛选出非 archive/ 子目录的 change 名称列表。
- * 本检查为信息收集性质，不阻断流程。
- *
- * 退出码：
- *   0 - 检查完成（无论是否有未归档 change）
- *   1 - 参数错误或 openspec/changes/ 目录不存在
- */
-
-const fs = require('fs');
-const path = require('path');
-
-const wsRoot = process.argv[2];
-
-if (!wsRoot) {
-  console.error('Usage: node check-unarchived.js <ws_root>');
-  process.exit(1);
-}
-
-const changesDir = path.join(wsRoot, 'openspec', 'changes');
-
-if (!fs.existsSync(changesDir)) {
-  console.log('UNARCHIVED_RESULT {"changes":[]}');
-  process.exit(0);
-}
-
-let entries;
-try {
-  entries = fs.readdirSync(changesDir, { withFileTypes: true });
-} catch (e) {
-  console.error('Failed to read openspec/changes/:', e.message);
-  console.log('UNARCHIVED_RESULT {"changes":[]}');
-  process.exit(0);
-}
-
-const unarchived = entries
-  .filter(e => e.isDirectory() && e.name !== 'archive')
-  .map(e => e.name)
-  .sort();
-
-console.log('UNARCHIVED_RESULT', JSON.stringify({ changes: unarchived }));
-process.exit(0);
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * 未归档 change 检查（共享脚本，真源：cbb/worktrees/_shared/scripts/）
+ *
+ * 供 cbb-worktree-close（收尾安全评估）与 cbb-worktree-push（Step 7 直合并前置，ADR 0008）调用。
+ *
+ * 用法：node check-unarchived.js <ws_root> [branch]
+ *
+ * 双扫（ADR 0002）：
+ *   - <ws_root>/openspec/changes/                       → 空间根当前检出（本地模式产物 / 空间根遗留）
+ *   - <ws_root>/.worktrees/worktree-<branch>/openspec/changes/ → worktree 模式产物
+ *     （branch 未传时跳过 worktree 扫描，保持旧调用兼容）
+ *
+ * 输出：changes 为两处合集（去重）；detail 标注每个 change 的来源
+ *       （'root' / 'worktree'，同名两处共存时为 'both'）。
+ * 本检查为信息收集性质，不阻断流程。
+ *
+ * 退出码：
+ *   0 - 检查完成（无论是否有未归档 change）
+ *   1 - 参数错误
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+const branch = process.argv[3];
+
+if (!wsRoot) {
+  console.error('Usage: node check-unarchived.js <ws_root> [branch]');
+  process.exit(1);
+}
+
+/**
+ * 扫描单个 changes 目录，返回未归档 change 名数组（目录不存在返回 []）。
+ */
+function scanDir(changesDir) {
+  if (!fs.existsSync(changesDir)) return [];
+  let entries;
+  try {
+    entries = fs.readdirSync(changesDir, { withFileTypes: true });
+  } catch (e) {
+    console.error('Failed to read ' + changesDir + ':', e.message);
+    return [];
+  }
+  return entries
+    .filter(e => e.isDirectory() && e.name !== 'archive')
+    .map(e => e.name);
+}
+
+const rootChanges = scanDir(path.join(wsRoot, 'openspec', 'changes'));
+
+const worktreeDir = branch
+  ? path.join(wsRoot, '.worktrees', 'worktree-' + branch, 'openspec', 'changes')
+  : null;
+const wtChanges = worktreeDir ? scanDir(worktreeDir) : [];
+
+const detail = {};
+for (const name of rootChanges) detail[name] = 'root';
+for (const name of wtChanges) {
+  detail[name] = detail[name] === 'root' ? 'both' : 'worktree';
+}
+
+const changes = Object.keys(detail).sort();
+
+if (rootChanges.length === 0 && wtChanges.length === 0) {
+  console.log('ℹ️  未发现未归档 change（根与 worktree' + (worktreeDir ? '' : '（未指定 branch，跳过）') + '均无）');
+} else {
+  console.log('ℹ️  未归档 change：' + (changes.join(', ') || '无'));
+  for (const name of changes) {
+    console.log('    - ' + name + '（来源：' + detail[name] + '）');
+  }
+}
+
+console.log('UNARCHIVED_RESULT', JSON.stringify({ changes, detail }));
+process.exit(0);

package/cbb/worktrees/skills/cbb-worktree-close/scripts/delete-branches.js

@@ -1,136 +1,147 @@
-#!/usr/bin/env node
-require('./silence-popup');
-/**
- * cbb-worktree-close 删除分支 (按用户选择)
- */
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-const wsRoot = process.argv[2];
-const branch = process.argv[3];
-const mode = process.argv[4];
-
-if (!wsRoot || !branch || !mode) {
-  console.error('Usage: node delete-branches.js <ws_root> <branch> <mode>');
-  process.exit(1);
-}
-
-if (mode === 'keep') {
-  console.log('Keep branch, skip delete');
-  console.log('---');
-  console.log('BRANCH_DELETE_RESULT', JSON.stringify({ mode: 'keep', deleted: [] }));
-  process.exit(0);
-}
-
-if (mode !== 'local' && mode !== 'local_remote') {
-  console.error('mode must be keep / local / local_remote');
-  process.exit(1);
-}
-
-function run(cmd, cwd, env) {
-  try {
-    return { ok: true, out: execSync(cmd, { cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env, ...(env || {}) } }).trim() };
-  } catch (e) {
-    return { ok: false, err: (e.stderr || e.message || String(e)).trim() };
-  }
-}
-
-function detectMain(repoPath) {
-  const remote = run('git remote', repoPath);
-  if (!remote.ok || !remote.out) return 'main';
-  const r = remote.out.split(/\r?\n/)[0];
-  const symbolic = run('git symbolic-ref "refs/remotes/' + r + '/HEAD"', repoPath);
-  if (symbolic.ok && symbolic.out) {
-    return symbolic.out.replace('refs/remotes/' + r + '/', '');
-  }
-  return 'main';
-}
-
-function mergedTo(repoPath, from, to) {
-  // 0=merged, 1=unmerged, 2=to-ref-missing
-  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;
-  return 0;
-}
-
-function mergedToMain(repoPath, branchName, main) {
-  if (mergedTo(repoPath, branchName, main) === 0) return true;
-  if (mergedTo(repoPath, branchName, 'origin/' + main) === 0) return true;
-  // release-* transit
-  const releaseList = run('git for-each-ref --format="%(refname:short)" "refs/heads/release-*" "refs/remotes/origin/release-*"', repoPath);
-  if (releaseList.ok && releaseList.out) {
-    const releases = releaseList.out.split(/\r?\n/).filter(Boolean).sort();
-    for (const rel of releases) {
-      if (mergedTo(repoPath, branchName, rel) === 0) {
-        if (mergedTo(repoPath, rel, main) === 0) return true;
-        if (mergedTo(repoPath, rel, 'origin/' + main) === 0) return true;
-      }
-    }
-  }
-  return false;
-}
-
-function deleteBranch(repoPath, name) {
-  const checkLocal = run('git branch --list "' + branch + '"', repoPath);
-  if (checkLocal.ok && checkLocal.out) {
-    const main = detectMain(repoPath);
-    const merged = main ? mergedToMain(repoPath, branch, main) : false;
-    let flag = merged ? '-d' : '-D';
-    const del = run('git branch ' + flag + ' "' + branch + '"', repoPath);
-    if (del.ok) {
-      console.log('OK ' + name + ' local branch deleted (' + flag + ', ' + (merged ? 'merged' : 'unmerged') + ')');
-    } else {
-      if (flag === '-d') {
-        const fallback = run('git branch -D "' + branch + '"', repoPath);
-        if (fallback.ok) {
-          console.log('OK ' + name + ' local branch deleted (squash merge, fallback -D)');
-        } else {
-          console.error('FAIL ' + name + ' local branch delete failed');
-          return false;
-        }
-      } else {
-        console.error('FAIL ' + name + ' local branch delete failed');
-        return false;
-      }
-    }
-  } else {
-    console.log('Skip ' + name + ': no local branch ' + branch);
-  }
-
-  if (mode === 'local_remote') {
-    const remote = run('git remote', repoPath);
-    if (remote.ok && remote.out) {
-      const r = remote.out.split(/\r?\n/)[0];
-      const pushDel = run('git push "' + r + '" --delete "' + branch + '"', repoPath, { GIT_TERMINAL_PROMPT: '0' });
-      if (pushDel.ok) {
-        console.log('OK ' + name + ' remote branch deleted');
-      } else {
-        console.log('Skip ' + name + ': remote has no ' + branch);
-      }
-    }
-  }
-  return true;
-}
-
-const configPath = path.join(wsRoot, 'workspace-config.json');
-let config = {};
-try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
-
-const apps = config.apps || [];
-
-console.log('=== Delete Workspace Branch ===');
-deleteBranch(wsRoot, 'workspace');
-
-console.log('=== Delete App Branches ===');
-for (const app of apps) {
-  const appPath = path.join(wsRoot, '.codespace', app.name);
-  deleteBranch(appPath, app.name);
-}
-
-console.log('---');
-console.log('BRANCH_DELETE_RESULT', JSON.stringify({ mode, ok: true }));
-process.exit(0);
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * 删除需求分支（共享脚本，真源：cbb/worktrees/_shared/scripts/）
+ *
+ * 供 cbb-worktree-close（Step 4.4 交付完成后自动删本地 + 远程分支）与
+ * cbb-local-mode（Step 5.4 收尾删远程分支）调用。
+ *
+ * 用法：node delete-branches.js <ws_root> <branch> <mode>   # mode: keep / local / local_remote
+ *
+ * 逐仓库执行：本地分支按合并判定选 -d / -D（squash 合并 -d 失败回退 -D）；
+ * local_remote 模式追加 git push <remote> --delete。
+ * 清理阶段失败报告并继续其余仓库，不回滚（ADR 0007）。
+ */
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+const branch = process.argv[3];
+const mode = process.argv[4];
+
+if (!wsRoot || !branch || !mode) {
+  console.error('Usage: node delete-branches.js <ws_root> <branch> <mode>');
+  process.exit(1);
+}
+
+if (mode === 'keep') {
+  console.log('Keep branch, skip delete');
+  console.log('---');
+  console.log('BRANCH_DELETE_RESULT', JSON.stringify({ mode: 'keep', ok: true, deleted: [] }));
+  process.exit(0);
+}
+
+if (mode !== 'local' && mode !== 'local_remote') {
+  console.error('mode must be keep / local / local_remote');
+  process.exit(1);
+}
+
+function run(cmd, cwd, env) {
+  try {
+    return { ok: true, out: execSync(cmd, { cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env, ...(env || {}) } }).trim() };
+  } catch (e) {
+    return { ok: false, err: (e.stderr || e.message || String(e)).trim() };
+  }
+}
+
+function detectMain(repoPath) {
+  const remote = run('git remote', repoPath);
+  if (!remote.ok || !remote.out) return 'main';
+  const r = remote.out.split(/\r?\n/)[0];
+  const symbolic = run('git symbolic-ref "refs/remotes/' + r + '/HEAD"', repoPath);
+  if (symbolic.ok && symbolic.out) {
+    return symbolic.out.replace('refs/remotes/' + r + '/', '');
+  }
+  return 'main';
+}
+
+function mergedTo(repoPath, from, to) {
+  // 0=merged, 1=unmerged, 2=to-ref-missing
+  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;
+  // 跨平台：不用 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;
+}
+
+function mergedToMain(repoPath, branchName, main) {
+  if (mergedTo(repoPath, branchName, main) === 0) return true;
+  if (mergedTo(repoPath, branchName, 'origin/' + main) === 0) return true;
+  // release-* transit
+  const releaseList = run('git for-each-ref --format="%(refname:short)" "refs/heads/release-*" "refs/remotes/origin/release-*"', repoPath);
+  if (releaseList.ok && releaseList.out) {
+    const releases = releaseList.out.split(/\r?\n/).filter(Boolean).sort();
+    for (const rel of releases) {
+      if (mergedTo(repoPath, branchName, rel) === 0) {
+        if (mergedTo(repoPath, rel, main) === 0) return true;
+        if (mergedTo(repoPath, rel, 'origin/' + main) === 0) return true;
+      }
+    }
+  }
+  return false;
+}
+
+function deleteBranch(repoPath, name) {
+  const checkLocal = run('git branch --list "' + branch + '"', repoPath);
+  if (checkLocal.ok && checkLocal.out) {
+    const main = detectMain(repoPath);
+    const merged = main ? mergedToMain(repoPath, branch, main) : false;
+    let flag = merged ? '-d' : '-D';
+    const del = run('git branch ' + flag + ' "' + branch + '"', repoPath);
+    if (del.ok) {
+      console.log('OK ' + name + ' local branch deleted (' + flag + ', ' + (merged ? 'merged' : 'unmerged') + ')');
+    } else {
+      if (flag === '-d') {
+        const fallback = run('git branch -D "' + branch + '"', repoPath);
+        if (fallback.ok) {
+          console.log('OK ' + name + ' local branch deleted (squash merge, fallback -D)');
+        } else {
+          console.error('FAIL ' + name + ' local branch delete failed');
+          return false;
+        }
+      } else {
+        console.error('FAIL ' + name + ' local branch delete failed');
+        return false;
+      }
+    }
+  } else {
+    console.log('Skip ' + name + ': no local branch ' + branch);
+  }
+
+  if (mode === 'local_remote') {
+    const remote = run('git remote', repoPath);
+    if (remote.ok && remote.out) {
+      const r = remote.out.split(/\r?\n/)[0];
+      const pushDel = run('git push "' + r + '" --delete "' + branch + '"', repoPath, { GIT_TERMINAL_PROMPT: '0' });
+      if (pushDel.ok) {
+        console.log('OK ' + name + ' remote branch deleted');
+      } else {
+        console.log('Skip ' + name + ': remote has no ' + branch);
+      }
+    }
+  }
+  return true;
+}
+
+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 || [];
+
+console.log('=== Delete Workspace Branch ===');
+deleteBranch(wsRoot, 'workspace');
+
+console.log('=== Delete App Branches ===');
+for (const app of apps) {
+  const appPath = path.join(wsRoot, '.codespace', app.name);
+  deleteBranch(appPath, app.name);
+}
+
+console.log('---');
+console.log('BRANCH_DELETE_RESULT', JSON.stringify({ mode, ok: true }));
+process.exit(0);

package/cbb/worktrees/skills/cbb-worktree-close/scripts/deprecate-branches.js

@@ -0,0 +1,119 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * 收尾合并门禁 —— 废弃分支出口（ADR 0007）
+ *
+ * 用户在门禁处确认"分支废弃、不再交付"后，把各参与仓库远端的需求分支重命名为
+ * <branch>-deprecated（保留历史、去掉占用中的旧名），**不删除任何提交**。
+ * 本地分支保持原名不动；未推送的仓库（远端无该分支）跳过。
+ *
+ * 用法：
+ *   node deprecate-branches.js <ws_root> <branch> [--apps a,b]
+ *
+ * 退出码：0 全部成功（含 skipped）/ 1 参数错误 / 2 存在失败
+ * 末行：DEPRECATE_RESULT [...]
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function run(cmd, cwd) {
+  try {
+    return {
+      ok: true,
+      out: execSync(cmd, {
+        cwd,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+        timeout: 120000,
+        env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+      }).trim(),
+    };
+  } catch (e) {
+    return { ok: false, err: (e.stderr || e.message || String(e)).trim() };
+  }
+}
+
+function loadApps(wsRoot) {
+  try {
+    const config = JSON.parse(fs.readFileSync(path.join(wsRoot, 'CBB-WORKSPACE.json'), 'utf-8'));
+    return Array.isArray(config.apps) ? config.apps : [];
+  } catch (e) {
+    return [];
+  }
+}
+
+/** 对单个仓库执行废弃重命名 */
+function deprecateRepo(name, repo, branch) {
+  const newName = branch + '-deprecated';
+  const rec = { name, status: 'skipped', detail: null };
+  if (!fs.existsSync(path.join(repo, '.git'))) {
+    rec.detail = 'no-repo';
+    return rec;
+  }
+  const remote = run('git remote', repo);
+  if (!remote.ok || !remote.out) {
+    rec.detail = 'no-remote';
+    return rec;
+  }
+  const r = remote.out.split(/\r?\n/)[0];
+  // 仅重命名远端确实存在的分支
+  const exists = run('git ls-remote --heads "' + r + '" "refs/heads/' + branch + '"', repo);
+  if (!exists.ok || !exists.out) {
+    rec.detail = 'remote-has-no-branch';
+    return rec;
+  }
+  const pushNew = run('git push "' + r + '" "refs/heads/' + branch + ':refs/heads/' + newName + '"', repo);
+  if (!pushNew.ok) {
+    rec.status = 'failed';
+    rec.detail = 'push-new-failed: ' + (pushNew.err || '').split(/\r?\n/)[0];
+    return rec;
+  }
+  const delOld = run('git push "' + r + '" --delete "' + branch + '"', repo);
+  if (!delOld.ok) {
+    rec.status = 'failed';
+    rec.detail = 'delete-old-failed: ' + (delOld.err || '').split(/\r?\n/)[0];
+    return rec;
+  }
+  rec.status = 'deprecated';
+  rec.detail = 'remote ' + branch + ' → ' + newName;
+  return rec;
+}
+
+function main() {
+  const args = process.argv.slice(2);
+  const wsRoot = args[0];
+  const branch = args[1];
+
+  if (!wsRoot || !branch || branch.indexOf('--') === 0) {
+    console.error('Usage: node deprecate-branches.js <ws_root> <branch> [--apps a,b]');
+    process.exit(1);
+  }
+
+  const appsIdx = args.indexOf('--apps');
+  const appFilter = appsIdx >= 0
+    ? new Set((args[appsIdx + 1] || '').split(',').map(s => s.trim()).filter(Boolean))
+    : null;
+
+  const repos = [{ name: 'workspace', repo: wsRoot }];
+  for (const app of loadApps(wsRoot)) {
+    if (appFilter && !appFilter.has(app.name)) continue;
+    repos.push({ name: app.name, repo: path.join(wsRoot, '.codespace', app.name) });
+  }
+
+  const results = repos.map(rp => deprecateRepo(rp.name, rp.repo, branch));
+
+  results.forEach(r => {
+    console.log(r.status.toUpperCase() + ' ' + r.name + (r.detail ? ' — ' + r.detail : ''));
+  });
+
+  const ok = results.every(r => r.status !== 'failed');
+  console.log('---');
+  console.log('DEPRECATE_RESULT', JSON.stringify({ branch, new_name: branch + '-deprecated', results }));
+  process.exit(ok ? 0 : 2);
+}
+
+if (require.main === module) main();
+
+module.exports = { run, loadApps, deprecateRepo };

package/cbb/worktrees/skills/cbb-worktree-close/scripts/discover-apps.js

@@ -5,7 +5,7 @@ require('./silence-popup');
  *
  * 用法：node discover-apps.js <ws_root> <branch>
  *
- * 从 workspace-config.json 读取应用列表，扫描 .worktrees/worktree-<branch>/ 实际存在的子目录。
+ * 从 CBB-WORKSPACE.json 读取应用列表，扫描 .worktrees/worktree-<branch>/ 实际存在的子目录。
  *
  * 输出末行：DISCOVER_RESULT { workspace: <wt_path>, apps: [{name, repo, side, wt_path}] }
  *
@@ -26,9 +26,9 @@ if (!wsRoot || !branch) {
   process.exit(1);
 }
 
-const configPath = path.join(wsRoot, 'workspace-config.json');
+const configPath = path.join(wsRoot, 'CBB-WORKSPACE.json');
 if (!fs.existsSync(configPath)) {
-  console.error('❌ workspace-config.json 不存在：' + configPath);
+  console.error('❌ CBB-WORKSPACE.json 不存在：' + configPath);
   process.exit(1);
 }
 
@@ -36,7 +36,7 @@ let config;
 try {
   config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
 } catch (e) {
-  console.error('❌ workspace-config.json 解析失败：' + e.message);
+  console.error('❌ CBB-WORKSPACE.json 解析失败：' + e.message);
   process.exit(1);
 }
 
@@ -50,9 +50,18 @@ if (!fs.existsSync(wtDir)) {
   process.exit(2);
 }
 
+/** 解析 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 found = [];
 for (const app of apps) {
-  const appWt = path.join(wtDir, app.name);
+  const appWt = resolveAppWt(app.name);
   if (fs.existsSync(appWt) && fs.existsSync(path.join(appWt, '.git'))) {
     console.log('✅ ' + app.name + '：存在嵌套 worktree（' + appWt + '）');
     found.push({