@jspg-ai/coding-bb 0.0.1

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

@@ -0,0 +1,136 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * openspec-close-worktree 删除分支 (按用户选择)
+ */
+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, '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, '.code', 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/openspec-close-worktree/scripts/discover-apps.js

@@ -0,0 +1,76 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * openspec-close-worktree 发现关联应用 worktree
+ *
+ * 用法：node discover-apps.js <ws_root> <branch>
+ *
+ * 从 CONFIG.json 读取应用列表，扫描 .worktrees/worktree-<branch>/ 实际存在的子目录。
+ *
+ * 输出末行：DISCOVER_RESULT { workspace: <wt_path>, apps: [{name, repo, side, wt_path}] }
+ *
+ * 退出码：
+ *   0 - 找到至少一个 worktree
+ *   1 - 参数错误
+ *   2 - 未找到任何 worktree
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+const branch = process.argv[3];
+
+if (!wsRoot || !branch) {
+  console.error('❌ 用法：node discover-apps.js <ws_root> <branch>');
+  process.exit(1);
+}
+
+const configPath = path.join(wsRoot, 'CONFIG.json');
+if (!fs.existsSync(configPath)) {
+  console.error('❌ CONFIG.json 不存在：' + configPath);
+  process.exit(1);
+}
+
+let config;
+try {
+  config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+} catch (e) {
+  console.error('❌ CONFIG.json 解析失败：' + e.message);
+  process.exit(1);
+}
+
+const apps = config.apps || [];
+const wtDir = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
+
+if (!fs.existsSync(wtDir)) {
+  console.error('❌ 目标 workspace worktree 不存在：' + wtDir);
+  console.log('---');
+  console.log('DISCOVER_RESULT', JSON.stringify({ workspace: null, apps: [] }));
+  process.exit(2);
+}
+
+const found = [];
+for (const app of apps) {
+  const appWt = path.join(wtDir, app.name);
+  if (fs.existsSync(appWt) && fs.existsSync(path.join(appWt, '.git'))) {
+    console.log('✅ ' + app.name + '：存在嵌套 worktree（' + appWt + '）');
+    found.push({
+      name: app.name,
+      repo: app.repo,
+      side: app.side || 'back',
+      wt_path: appWt,
+      app_path: path.join(wsRoot, '.code', app.name),
+    });
+  } else {
+    console.log('⏭️  ' + app.name + '：无关联 worktree，跳过');
+  }
+}
+
+console.log('---');
+console.log('DISCOVER_RESULT', JSON.stringify({
+  workspace: wtDir,
+  workspace_app: wsRoot,
+  apps: found,
+}));
+process.exit(0);

package/cbb/worktrees/skills/openspec-close-worktree/scripts/find-target-worktree.js

@@ -0,0 +1,96 @@
+require('./silence-popup');
+/**
+ * openspec-shared 目标需求名识别
+ *
+ * 唯一真源：cbb/worktrees/_shared/scripts/find-target-worktree.js
+ * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（extend / close / push）。
+ *
+ * 用法：node find-target-worktree.js <ws_root>
+ *
+ * 优先级：
+ *   1. cwd 在 .worktrees/worktree-xxx/ 内 → 自动从路径反推
+ *   2. .worktrees/ 下只有一个 worktree → 自动选用
+ *   3. 多个 worktree → 按 mtime 倒序，第一个为推荐
+ *
+ * 输出：
+ *   末行输出需求名（用于 AI agent 解析）
+ *   多个时按 [1] xxx ⭐ / [2] yyy 列出
+ *
+ * 退出码：
+ *   0 - 唯一识别（自动或唯一）
+ *   1 - 多个 worktree，需用户输入
+ *   2 - 无 worktree
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+
+if (!wsRoot) {
+  console.error('❌ 用法：node find-target-worktree.js <ws_root>');
+  process.exit(1);
+}
+
+// 优先级 1：cwd 反推
+const cwd = process.cwd();
+const cwdMatch = cwd.match(/\.worktrees[\\\/]worktree-([^\\\/]+)/);
+if (cwdMatch) {
+  const branch = cwdMatch[1];
+  console.log('✅ 从 cwd 反推需求名：' + branch);
+  console.log('---');
+  console.log(branch);
+  process.exit(0);
+}
+
+const worktreesDir = path.join(wsRoot, '.worktrees');
+if (!fs.existsSync(worktreesDir)) {
+  console.error('❌ .worktrees 目录不存在：' + worktreesDir);
+  console.error('   请先执行 openspec-init-worktree 创建 worktree');
+  console.log('---');
+  console.log('NO_WORKTREE');
+  process.exit(2);
+}
+
+// 列出所有 worktree-xxx 目录
+const entries = fs.readdirSync(worktreesDir, { withFileTypes: true })
+  .filter(e => e.isDirectory() && e.name.startsWith('worktree-'))
+  .map(e => ({
+    name: e.name.substring('worktree-'.length),
+    fullName: e.name,
+    path: path.join(worktreesDir, e.name),
+    mtime: fs.statSync(path.join(worktreesDir, e.name)).mtime.getTime(),
+  }));
+
+if (entries.length === 0) {
+  console.error('❌ 未找到任何 worktree');
+  console.error('   请先执行 openspec-init-worktree 创建 worktree');
+  console.log('---');
+  console.log('NO_WORKTREE');
+  process.exit(2);
+}
+
+// 优先级 2：唯一
+if (entries.length === 1) {
+  console.log('✅ 自动选用唯一 worktree：' + entries[0].name);
+  console.log('---');
+  console.log(entries[0].name);
+  process.exit(0);
+}
+
+// 优先级 3：多个 → 按 mtime 倒序
+entries.sort((a, b) => b.mtime - a.mtime);
+
+console.log('⚠️  检测到 ' + entries.length + ' 个 worktree（按最近修改排序）：');
+entries.forEach((e, i) => {
+  if (i === 0) {
+    console.log('  [' + (i + 1) + '] ' + e.name + '  ⭐ (推荐：最近修改)');
+  } else {
+    console.log('  [' + (i + 1) + '] ' + e.name);
+  }
+});
+console.log('请在对话中输入序号(1/2/3)或完整分支名：');
+console.log('---');
+console.log('MULTIPLE_WORKTREEES');
+process.exit(1);

package/cbb/worktrees/skills/openspec-close-worktree/scripts/find-workspace-root.js

@@ -0,0 +1,67 @@
+require('./silence-popup');
+/**
+ * openspec-shared 工作空间根目录定位
+ *
+ * 唯一真源：cbb/worktrees/_shared/scripts/find-workspace-root.js
+ * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / extend / close / push）。
+ *
+ * 优先：git worktree list 第一行（主仓库根目录，不受 worktree 内 CONFIG.json 副本干扰）
+ * 兜底：当前目录含 CONFIG.json
+ *
+ * 退出码：
+ *   0 - 定位成功，输出 WS_ROOT 绝对路径
+ *   1 - 未找到工作空间根目录
+ *
+ * 输出格式：
+ *   第一行：人类可读报告
+ *   最后一行：纯路径（便于 AI agent 解析后用于 cd）
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function tryExec(cmd) {
+  try {
+    return { ok: true, out: execSync(cmd, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).trim() };
+  } catch (e) {
+    return { ok: false };
+  }
+}
+
+let wsRoot = '';
+
+// 优先：git worktree list 第一行
+const worktreeList = tryExec('git worktree list');
+if (worktreeList.ok) {
+  const firstLine = worktreeList.out.split('\n')[0];
+  if (firstLine) {
+    // 格式：<path> <sha> [<branch>]
+    const candidate = firstLine.split(/\s+/)[0];
+    if (candidate && fs.existsSync(candidate)) {
+      wsRoot = candidate;
+    }
+  }
+}
+
+// 兜底：当前目录含 CONFIG.json
+if (!wsRoot) {
+  const cwd = process.cwd();
+  if (fs.existsSync(path.join(cwd, 'CONFIG.json'))) {
+    wsRoot = cwd;
+  }
+}
+
+// 校验
+if (!wsRoot || !fs.existsSync(path.join(wsRoot, 'CONFIG.json'))) {
+  console.error('❌ 未找到工作空间根目录');
+  console.error('   原因：git worktree list 失败且当前目录无 CONFIG.json');
+  console.error('   请在业务工作空间根目录（由 cbb setup 初始化、包含 CONFIG.json）下执行本技能');
+  process.exit(1);
+}
+
+console.log('✅ 工作空间根目录：' + wsRoot);
+console.log('---');
+// 最后一行输出纯路径，AI agent 可直接 cd 使用
+console.log(wsRoot);
+process.exit(0);

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

@@ -0,0 +1,124 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * openspec-close-worktree 移除 Worktree（三层降级）
+ *
+ * 用法：node remove-worktrees.js <ws_root> <branch> <force>
+ *   force: "true" 启用 --force，"false" 不启用
+ *
+ * 行为：
+ *   1. 先移除各应用 worktree
+ *   2. 再移除 workspace worktree
+ *   3. 三层降级：git worktree remove → prune+rm → 仅 prune
+ *
+ * 退出码：
+ *   0 - 全部成功
+ *   1 - 参数错误
+ *   2 - 部分失败
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+const branch = process.argv[3];
+const forceStr = process.argv[4];
+
+if (!wsRoot || !branch || !forceStr) {
+  console.error('❌ 用法：node remove-worktrees.js <ws_root> <branch> <force>');
+  process.exit(1);
+}
+
+const force = forceStr === 'true';
+const wtDir = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
+
+function run(cmd, cwd) {
+  try {
+    return { ok: true, out: execSync(cmd, { cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).trim() };
+  } catch (e) {
+    return { ok: false, err: (e.stderr || e.message || String(e)).trim() };
+  }
+}
+
+function removePhysicalDir(dir) {
+  // Windows 用 rmdir /s /q，Unix 用 rm -rf
+  if (process.platform === 'win32') {
+    return run('rmdir /s /q "' + dir + '"');
+  }
+  return run('rm -rf "' + dir + '"');
+}
+
+const lockedDirs = [];
+const results = [];
+
+function removeWt(repoPath, wtPath, name) {
+  if (!fs.existsSync(wtPath)) {
+    console.log('⏭️  ' + name + '：worktree 不存在，跳过');
+    return;
+  }
+
+  const forceFlag = force ? ' --force' : '';
+  // 第 1 层：git worktree remove
+  const r1 = run('git worktree remove' + forceFlag + ' "' + wtPath + '"', repoPath);
+  if (r1.ok) {
+    console.log('✅ ' + name + ' worktree 已移除');
+    results.push({ name, status: 'removed' });
+    return;
+  }
+
+  // 第 2 层：prune + 物理目录清理（解耦）
+  run('git worktree prune', repoPath);
+  const r2 = removePhysicalDir(wtPath);
+  if (r2.ok) {
+    console.log('✅ ' + name + ' worktree 已移除（元数据 prune + 物理目录清理）');
+    results.push({ name, status: 'prune-rm' });
+    return;
+  }
+
+  // 第 3 层：目录被锁
+  lockedDirs.push(wtPath);
+  console.log('⏳ ' + name + ' 元数据已清理，物理目录被锁定（将在下次 init 时自动清理）');
+  results.push({ name, status: 'locked' });
+}
+
+// 1. 应用 worktrees
+const configPath = path.join(wsRoot, 'CONFIG.json');
+let config = {};
+try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
+
+const apps = config.apps || [];
+console.log('=== 移除应用 Worktrees ===');
+for (const app of apps) {
+  const appWt = path.join(wtDir, app.name);
+  const appPath = path.join(wsRoot, '.code', app.name);
+  removeWt(appPath, appWt, app.name);
+}
+
+// 2. workspace worktree
+console.log('=== 移除 Workspace Worktree ===');
+removeWt(wsRoot, wtDir, 'workspace');
+
+// 3. 兜底：清理所有仓库的陈旧 worktree 元数据
+for (const app of apps) {
+  run('git worktree prune', path.join(wsRoot, '.code', app.name));
+}
+run('git worktree prune', wsRoot);
+
+// 报告
+if (lockedDirs.length > 0) {
+  console.log('');
+  console.log('⏳ 以下目录被外部进程占用（IDE 等），git 元数据已清理，物理目录仍保留：');
+  lockedDirs.forEach(d => console.log('   - ' + d));
+  console.log('   → 请关闭占用这些目录的程序（如 IDE）后手动删除；或下次 init-worktree 时自动清理');
+}
+
+console.log('---');
+console.log('REMOVE_RESULT', JSON.stringify({
+  results,
+  locked: lockedDirs,
+  has_locked: lockedDirs.length > 0,
+}));
+
+// 退出码：有 locked 视为部分成功（不报错，因为元数据已清理）
+process.exit(0);

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

@@ -0,0 +1,174 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * openspec-close-worktree 安全检查 (合并判定 + 未提交修改 + 远程推送状态)
+ */
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const wsRoot = process.argv[2];
+const branch = process.argv[3];
+
+if (!wsRoot || !branch) {
+  console.error('Usage: node safety-check.js <ws_root> <branch>');
+  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 '';
+  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 '';
+}
+
+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;
+  return 0;
+}
+
+function mergedToMain(repoPath, branchName, main) {
+  if (mergedTo(repoPath, branchName, main) === 0) return 'main';
+  if (mergedTo(repoPath, branchName, 'origin/' + main) === 0) return 'origin/' + main;
+  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 'main-via-' + rel;
+        if (mergedTo(repoPath, rel, 'origin/' + main) === 0) return 'origin/' + main + '-via-' + rel;
+      }
+    }
+  }
+  return null;
+}
+
+function checkRepo(name, repoPath, wtPath) {
+  console.log('=== ' + name + ' ===');
+  if (!fs.existsSync(wtPath)) {
+    console.log('(no worktree, skip)');
+    console.log('');
+    return { name, wt: null, skipped: true };
+  }
+
+  // 3.0 fetch
+  const remote = run('git remote', repoPath);
+  const remoteName = remote.ok ? (remote.out.split(/\r?\n/)[0] || '') : '';
+  let fetchOk = false;
+  if (remoteName) {
+    const fetch = run('git fetch --quiet "' + remoteName + '"', repoPath, { GIT_TERMINAL_PROMPT: '0' });
+    if (fetch.ok) {
+      fetchOk = true;
+    } else {
+      console.log('WARN fetch failed (offline/permission), using possibly stale refs');
+    }
+  }
+
+  // 3.1 uncommitted
+  const status = run('git status --porcelain', wtPath);
+  const dirtyFiles = status.ok && status.out ? status.out.split(/\r?\n/).filter(Boolean) : [];
+  if (dirtyFiles.length > 0) {
+    console.log('FAIL uncommitted changes:');
+    dirtyFiles.slice(0, 10).forEach(f => console.log('   ' + f));
+  } else {
+    console.log('OK no uncommitted changes');
+  }
+
+  // 3.2 merge
+  const main = detectMain(repoPath);
+  let merged = null;
+  if (main) {
+    merged = mergedToMain(repoPath, branch, main);
+    if (merged) {
+      console.log('OK merged into ' + merged);
+    } else {
+      console.log('WARN not merged into ' + main);
+    }
+  } else {
+    console.log('WARN cannot detect main branch');
+  }
+
+  // 3.3 remote
+  let remoteExists = null;
+  if (fetchOk && remoteName) {
+    const check = run('git rev-parse --verify --quiet "refs/remotes/' + remoteName + '/' + branch + '"', repoPath);
+    if (check.ok) {
+      remoteExists = true;
+      console.log('OK remote has branch');
+    } else {
+      remoteExists = false;
+      console.log('WARN remote has no branch (local only)');
+    }
+  } else if (remoteName) {
+    const ls = run('git ls-remote --heads "' + remoteName + '" "' + branch + '"', repoPath);
+    if (ls.ok && ls.out) {
+      remoteExists = true;
+      console.log('OK remote has branch');
+    } else {
+      remoteExists = false;
+      console.log('WARN remote has no branch (local only)');
+    }
+  } else {
+    console.log('WARN no remote');
+  }
+
+  // 2.4 unpushed commits (ahead of upstream)
+  // 仅在已建立 upstream（fetch_ok + remote_name 存在 + branch 在远程存在）时检测。
+  // 无 upstream 时 ahead 必然为 0（@{u} 解析失败），跳过避免误导。
+  let unpushedCount = 0;
+  if (fetchOk && remoteName && remoteExists === true) {
+    const ahead = run('git rev-list --count "@{u}..HEAD"', wtPath, { GIT_TERMINAL_PROMPT: '0' });
+    if (ahead.ok && ahead.out !== '') {
+      unpushedCount = parseInt(ahead.out, 10) || 0;
+      if (unpushedCount > 0) {
+        console.log('WARN ' + unpushedCount + ' unpushed commit(s) ahead of ' + remoteName + '/' + branch);
+      } else {
+        console.log('OK no unpushed commits');
+      }
+    } else {
+      // @{u} 不存在（本地分支没建立 upstream）
+      unpushedCount = -1;
+      console.log('WARN no upstream tracking branch (run openspec-push-worktrees to set up)');
+    }
+  }
+  console.log('');
+
+  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, 'CONFIG.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);
+
+const results = [];
+
+results.push(checkRepo('workspace', wsRoot, wtDir));
+
+for (const app of apps) {
+  const appWt = path.join(wtDir, app.name);
+  const appPath = path.join(wsRoot, '.code', app.name);
+  results.push(checkRepo(app.name, appPath, appWt));
+}
+
+console.log('---');
+console.log('SAFETY_RESULT', JSON.stringify(results));
+process.exit(0);