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

package/cbb/worktrees/skills/cbb-worktree-push/scripts/merge-branches.js

@@ -0,0 +1,469 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * 收尾 / 交付合并门禁 —— 直合并通道 + 合并判定（ADR 0007 / 0008）
+ *
+ * 把需求分支合并进目标分支并推送远端：
+ *   - 供 cbb-worktree-close / cbb-local-mode 的收尾门禁调用（默认目标 = 主干）
+ *   - 供 cbb-worktree-push Step 7 的"直接合并"出口调用（--target 可指定测试分支）
+ * 默认交付走 MR（人工在浏览器合入）；本脚本是用户在门禁处**显式确认**后的
+ * "由 agent 直接完成合并"通道。
+ *
+ * 用法：
+ *   node merge-branches.js <ws_root> <branch> [--apps a,b] [--target <分支>] [--allow-checkout] [--dry-run]
+ *   node merge-branches.js <ws_root> <branch> [--apps a,b] [--target <分支>] --check   # 仅判定，不合并
+ *
+ * 目标分支：
+ *   缺省 / --target 等于该仓库探测主干 → 主干快路径（本地主干检出上 merge --no-ff → push）
+ *   --target 指定非主干分支            → 临时 worktree（基于 origin/<target>，不动用户检出）
+ *
+ * 模式：
+ *   --check      逐仓库判定是否已合并到目标（主干含 release-* 中转 / squash / cherry-pick 兜底，
+ *                算法与 cbb-worktree-close 的 safety-check.js 同源）；不修改任何状态
+ *   默认         两阶段（ADR 0007）：
+ *                  1. 预检：逐仓库校验（目标可解析 / 检出干净 / 分支存在）
+ *                     任一不过 → 退出 2，不执行任何合并
+ *                  2. 执行：merge --no-ff → push；执行中失败 → 停止并报告已完成清单（不回滚；重跑幂等）
+ *   --dry-run    只做预检，不执行
+ *
+ * 退出码：0 全部成功（含 skipped / merged）/ 1 参数错误 / 2 预检或执行失败（含 need-mr / unmerged）
+ * 末行：MERGE_RESULT [...] 或 MERGE_CHECK_RESULT [...]
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const os = require('os');
+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 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 '';
+}
+
+// ── 合并判定（与 cbb-worktree-close/scripts/safety-check.js 同源） ──
+// 0=merged, 1=unmerged, 2=to-ref-missing
+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;
+  // 跨平台：不用 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 '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;
+}
+
+/** 目标为具体分支时的已合并判定（含 origin 镜像，不做 release 中转） */
+function mergedToTarget(repoPath, branchName, target) {
+  if (mergedTo(repoPath, branchName, target) === 0) return target;
+  if (mergedTo(repoPath, branchName, 'origin/' + target) === 0) return 'origin/' + target;
+  return null;
+}
+
+function classifyPushError(stderr) {
+  const s = (stderr || '').toLowerCase();
+  if (s.includes('protected branch') || s.includes('deny updating')) return 'branch-protected';
+  if (s.includes('non-fast-forward') || s.includes('fetch first') || s.includes('rejected')) return 'non-fast-forward';
+  if (s.includes('permission denied (publickey)')) return 'ssh-auth-failed';
+  if (s.includes('authentication failed')) return 'https-auth-failed';
+  if (s.includes('could not resolve host') || s.includes('connection refused') || s.includes('hung up')) return 'network-unreachable';
+  return 'unknown';
+}
+
+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 [];
+  }
+}
+
+/** 参与仓库：workspace（根 = 主干检出）+ 各 app（.codespace/<app> = 主干检出） */
+function buildRepos(wsRoot, appFilter) {
+  const repos = [{ name: 'workspace', repo: wsRoot, work: wsRoot }];
+  for (const app of loadApps(wsRoot)) {
+    if (appFilter && !appFilter.has(app.name)) continue;
+    const dir = path.join(wsRoot, '.codespace', app.name);
+    repos.push({ name: app.name, repo: dir, work: dir });
+  }
+  return repos;
+}
+
+function hasRef(repoPath, ref) {
+  return run('git rev-parse --verify --quiet "' + ref + '"', repoPath).ok;
+}
+
+/** 清理临时 worktree（失败仅警告，不阻断） */
+function cleanupTempWorktree(repoPath, tmpDir) {
+  if (!tmpDir) return;
+  const removed = run('git worktree remove --force "' + tmpDir + '"', repoPath);
+  if (!removed.ok && fs.existsSync(tmpDir)) {
+    try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch (e) { /* Windows 锁：留给用户 */ }
+  }
+  run('git worktree prune', repoPath);
+}
+
+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 merge-branches.js <ws_root> <branch> [--apps a,b] [--target b] [--allow-checkout] [--dry-run] [--check]');
+    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 targetIdx = args.indexOf('--target');
+  const targetArg = targetIdx >= 0 ? (args[targetIdx + 1] || '').trim() : '';
+  if (targetIdx >= 0 && !targetArg) {
+    console.error('--target 需要提供分支名');
+    process.exit(1);
+  }
+  const allowCheckout = args.includes('--allow-checkout');
+  const dryRun = args.includes('--dry-run');
+  const checkOnly = args.includes('--check');
+
+  const repos = buildRepos(wsRoot, appFilter);
+
+  // ── --check：仅判定每仓库是否已合并到目标 ─────────────────
+  if (checkOnly) {
+    const results = [];
+    for (const rp of repos) {
+      const rec = { name: rp.name, status: 'unmerged', merged: null, main: null, target: null };
+      if (!fs.existsSync(path.join(rp.repo, '.git'))) {
+        rec.status = 'no-repo';
+        results.push(rec);
+        continue;
+      }
+      run('git fetch --quiet origin', rp.repo);
+      const main = detectMain(rp.repo);
+      if (!main) {
+        rec.status = 'failed';
+        results.push(rec);
+        continue;
+      }
+      rec.main = main;
+      const target = targetArg || main;
+      rec.target = target;
+      if (!hasRef(rp.repo, 'refs/heads/' + branch)) {
+        rec.status = 'no-branch';
+        results.push(rec);
+        continue;
+      }
+      const merged = (!targetArg || target === main)
+        ? mergedToMain(rp.repo, branch, main)
+        : mergedToTarget(rp.repo, branch, target);
+      rec.merged = merged;
+      rec.status = merged ? 'merged' : 'unmerged';
+      results.push(rec);
+    }
+    results.forEach(r => console.log(r.status.toUpperCase() + ' ' + r.name + (r.merged ? ' → ' + r.merged : '') + (r.target ? ' [target: ' + r.target + ']' : '')));
+    const ok = results.every(r => r.status !== 'unmerged' && r.status !== 'failed');
+    console.log('---');
+    console.log('MERGE_CHECK_RESULT', JSON.stringify({ branch, target: targetArg || null, results }));
+    process.exit(ok ? 0 : 2);
+  }
+
+  // ── 阶段 1：预检 ──────────────────────────────────────────
+  const prechecks = [];
+  for (const rp of repos) {
+    const rec = { name: rp.name, status: 'ok', main: null, target: null, temp: false, reason: null };
+    if (!fs.existsSync(path.join(rp.repo, '.git'))) {
+      rec.status = 'skipped';
+      rec.reason = 'no-repo';
+      prechecks.push(rec);
+      continue;
+    }
+    const fetch = run('git fetch --quiet origin', rp.repo);
+    if (!fetch.ok) {
+      rec.status = 'failed';
+      rec.reason = 'fetch-failed';
+      prechecks.push(rec);
+      continue;
+    }
+    const main = detectMain(rp.repo);
+    if (!main) {
+      rec.status = 'failed';
+      rec.reason = 'cannot-detect-main';
+      prechecks.push(rec);
+      continue;
+    }
+    rec.main = main;
+    const target = targetArg || main;
+    rec.target = target;
+
+    if (!hasRef(rp.repo, 'refs/heads/' + branch)) {
+      rec.status = 'skipped';
+      rec.reason = 'no-branch';
+      prechecks.push(rec);
+      continue;
+    }
+    const targetLocal = hasRef(rp.repo, 'refs/heads/' + target);
+    const targetRemote = hasRef(rp.repo, 'refs/remotes/origin/' + target);
+    if (!targetLocal && !targetRemote) {
+      rec.status = 'failed';
+      rec.reason = 'target-not-found';
+      prechecks.push(rec);
+      continue;
+    }
+
+    if (target === main) {
+      // 主干路径（快路径，与 ADR 0007 收尾门禁一致）
+      if (mergedToMain(rp.repo, branch, main)) {
+        rec.status = 'skipped';
+        rec.reason = 'already-merged';
+        prechecks.push(rec);
+        continue;
+      }
+      const status = run('git status --porcelain', rp.work);
+      if (!status.ok || status.out) {
+        rec.status = 'failed';
+        rec.reason = 'dirty-worktree';
+        prechecks.push(rec);
+        continue;
+      }
+      const current = run('git branch --show-current', rp.work);
+      if (current.out && current.out !== main && !allowCheckout) {
+        rec.status = 'failed';
+        rec.reason = 'not-on-main';
+        prechecks.push(rec);
+        continue;
+      }
+      const ahead = run('git rev-list --count "origin/' + main + '..' + main + '"', rp.repo);
+      if (ahead.ok && ahead.out && parseInt(ahead.out, 10) > 0) {
+        rec.status = 'failed';
+        rec.reason = 'main-ahead-of-origin';
+        prechecks.push(rec);
+        continue;
+      }
+    } else {
+      // 指定分支路径：已合并则跳过；当前检出即目标且干净 → 就地；否则临时 worktree
+      if (mergedToTarget(rp.repo, branch, target)) {
+        rec.status = 'skipped';
+        rec.reason = 'already-merged';
+        prechecks.push(rec);
+        continue;
+      }
+      const current = run('git branch --show-current', rp.work);
+      if (current.out === target) {
+        const status = run('git status --porcelain', rp.work);
+        if (!status.ok || status.out) {
+          rec.status = 'failed';
+          rec.reason = 'dirty-worktree';
+          prechecks.push(rec);
+          continue;
+        }
+      } else {
+        rec.temp = true; // 执行阶段创建临时 worktree
+      }
+    }
+    prechecks.push(rec);
+  }
+
+  const hasPrecheckFailure = prechecks.some(p => p.status === 'failed');
+  prechecks.forEach(p => {
+    if (p.status === 'failed') console.log('FAIL ' + p.name + ': ' + p.reason);
+    else if (p.status === 'skipped') console.log('SKIP ' + p.name + ': ' + p.reason);
+    else console.log('OK   ' + p.name + ' → 合并至 ' + p.target + (p.temp ? '（临时 worktree）' : ''));
+  });
+
+  if (hasPrecheckFailure) {
+    console.log('---');
+    console.log('MERGE_RESULT', JSON.stringify({ phase: 'precheck', results: prechecks }));
+    process.exit(2);
+  }
+
+  if (dryRun) {
+    console.log('---');
+    console.log('MERGE_RESULT', JSON.stringify({ phase: 'precheck', dry_run: true, results: prechecks }));
+    process.exit(0);
+  }
+
+  // ── 阶段 2：执行（停止式，不回滚） ────────────────────────
+  const results = prechecks.map(p => ({ ...p, status: p.status, detail: null }));
+  let stopped = false;
+
+  for (let i = 0; i < prechecks.length; i += 1) {
+    const p = prechecks[i];
+    const rp = repos[i];
+    if (p.status !== 'ok') continue;
+    if (stopped) {
+      results[i].status = 'not-attempted';
+      continue;
+    }
+
+    const target = p.target;
+    const mergeMsg = "Merge branch '" + branch + "'";
+
+    if (target === p.main) {
+      // ── 主干路径（快路径） ──
+      const current = run('git branch --show-current', rp.work);
+      if (current.out !== target) {
+        const co = run('git checkout --quiet "' + target + '"', rp.work);
+        if (!co.ok) {
+          results[i].status = 'failed';
+          results[i].detail = 'checkout-failed: ' + co.err.split(/\r?\n/)[0];
+          stopped = true;
+          continue;
+        }
+      }
+      const pull = run('git pull --ff-only --quiet origin "' + target + '"', rp.repo);
+      if (!pull.ok) {
+        results[i].status = 'failed';
+        results[i].detail = 'pull-failed: ' + pull.err.split(/\r?\n/)[0];
+        stopped = true;
+        continue;
+      }
+      const merge = run('git merge --no-ff -m "' + mergeMsg + '" "' + branch + '"', rp.repo);
+      if (!merge.ok) {
+        run('git merge --abort', rp.repo);
+        results[i].status = 'failed';
+        results[i].detail = 'merge-failed: ' + merge.err.split(/\r?\n/)[0];
+        stopped = true;
+        continue;
+      }
+      let push = run('git push origin "' + target + '"', rp.repo);
+      if (!push.ok) {
+        const code = classifyPushError(push.err);
+        if (code === 'non-fast-forward') {
+          const retryPull = run('git pull --ff-only --quiet origin "' + target + '"', rp.repo);
+          push = retryPull.ok ? run('git push origin "' + target + '"', rp.repo) : retryPull;
+        }
+        if (!push.ok) {
+          const code2 = classifyPushError(push.err);
+          if (code2 === 'branch-protected') {
+            results[i].status = 'need-mr';
+            results[i].detail = 'branch-protected（目标分支受保护，请改用 MR 出口）';
+          } else {
+            results[i].status = 'failed';
+            results[i].detail = 'push-failed: ' + (push.err || '').split(/\r?\n/)[0];
+          }
+          stopped = true;
+          continue;
+        }
+      }
+      results[i].status = 'merged';
+      results[i].detail = 'merged+pushed origin/' + target;
+      continue;
+    }
+
+    // ── 指定分支路径（当前检出即目标 → 就地；否则临时 worktree） ──
+    let workDir = rp.work;
+    let tmpDir = null;
+    const current = run('git branch --show-current', rp.work);
+    if (current.out !== target) {
+      tmpDir = path.join(os.tmpdir(), 'cbb-merge-' + process.pid + '-' + i);
+      const base = hasRef(rp.repo, 'refs/remotes/origin/' + target) ? 'origin/' + target : target;
+      const add = run('git worktree add --detach "' + tmpDir + '" "' + base + '"', rp.repo);
+      if (!add.ok) {
+        results[i].status = 'failed';
+        results[i].detail = 'worktree-add-failed: ' + add.err.split(/\r?\n/)[0];
+        stopped = true;
+        continue;
+      }
+      workDir = tmpDir;
+    } else {
+      const pull = run('git pull --ff-only --quiet origin "' + target + '"', rp.repo);
+      if (!pull.ok) {
+        results[i].status = 'failed';
+        results[i].detail = 'pull-failed: ' + pull.err.split(/\r?\n/)[0];
+        stopped = true;
+        continue;
+      }
+    }
+
+    const merge = run('git merge --no-ff -m "' + mergeMsg + '" "' + branch + '"', workDir);
+    if (!merge.ok) {
+      run('git merge --abort', workDir);
+      cleanupTempWorktree(rp.repo, tmpDir);
+      results[i].status = 'failed';
+      results[i].detail = 'merge-failed: ' + merge.err.split(/\r?\n/)[0];
+      stopped = true;
+      continue;
+    }
+
+    let push = run('git push origin "HEAD:refs/heads/' + target + '"', workDir);
+    if (!push.ok) {
+      const code = classifyPushError(push.err);
+      if (code === 'non-fast-forward') {
+        // 远端已前进：在合并工作区 ff 同步后重试一次
+        const retry = run('git fetch --quiet origin "' + target + '" && git reset --hard FETCH_HEAD', workDir);
+        if (retry.ok) {
+          const rem = run('git merge --no-ff -m "' + mergeMsg + '" "' + branch + '"', workDir);
+          if (rem.ok) push = run('git push origin "HEAD:refs/heads/' + target + '"', workDir);
+        }
+      }
+      if (!push.ok) {
+        const code2 = classifyPushError(push.err);
+        cleanupTempWorktree(rp.repo, tmpDir);
+        if (code2 === 'branch-protected') {
+          results[i].status = 'need-mr';
+          results[i].detail = 'branch-protected（目标分支受保护，请改用 MR 出口）';
+        } else {
+          results[i].status = 'failed';
+          results[i].detail = 'push-failed: ' + (push.err || '').split(/\r?\n/)[0];
+        }
+        stopped = true;
+        continue;
+      }
+    }
+    cleanupTempWorktree(rp.repo, tmpDir);
+    results[i].status = 'merged';
+    results[i].detail = 'merged+pushed origin/' + target + (tmpDir ? '（临时 worktree）' : '');
+  }
+
+  results.forEach(r => {
+    console.log(r.status.toUpperCase() + ' ' + r.name + (r.detail ? ' — ' + r.detail : ''));
+  });
+
+  const ok = results.every(r => r.status === 'merged' || r.status === 'skipped');
+  console.log('---');
+  console.log('MERGE_RESULT', JSON.stringify({ phase: 'execute', target: targetArg || null, results }));
+  process.exit(ok ? 0 : 2);
+}
+
+if (require.main === module) main();
+
+module.exports = { run, detectMain, mergedTo, mergedToMain, mergedToTarget, classifyPushError, loadApps, buildRepos };

package/cbb/worktrees/skills/cbb-worktree-push/scripts/push-core.js

@@ -3,7 +3,7 @@ require('./silence-popup');
  * openspec-shared 推送核心模块
  *
  * 唯一真源：cbb/worktrees/_shared/scripts/push-core.js
- * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init-worktree / extend-worktree / push-worktrees）。
+ * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / push）。
  *
  * 公开 API：
  *   - tryExec(cmd, cwd, execImpl)             包装 execSync，统一返回 {ok, out|err}

package/cbb/worktrees/skills/cbb-worktree-push/scripts/push-worktrees.js

@@ -7,7 +7,9 @@ require('./silence-popup');
  *   node push-worktrees.js <wt_path>          # wt_path 必须是 <ws_root>/.worktrees/worktree-<branch> 形态
  *
  * 行为：
- *   1. 扫描 <ws_root>/.worktrees/worktree-<branch>/ 下所有 git 仓库（workspace + 各 app 子 worktree）
+ *   1. 按需求名发现参与仓库（ADR 0002 双布局）：
+ *      - worktree 布局：.worktrees/worktree-<branch>/ 的 workspace + 其 .codespace/<app>/ 容器内各 app worktree（镜像主布局，ADR 0003）
+ *      - 本地布局：根 / .codespace/<app>/ 检出恰在 <branch> 分支上
  *   2. 对每个仓库调 push-core.pushSingle（已建立 upstream 时直接 push -u；否则建立 upstream）
  *   3. 逐个报告状态，输出末行 PUSH_RESULT
  *
@@ -28,6 +30,7 @@ require('./silence-popup');
 const { pushSingle } = require('./push-core');
 const fs = require('fs');
 const path = require('path');
+const { execSync } = require('child_process');
 
 function resolveInputs(argv) {
   // argv[2] 单独：wt_path 形式
@@ -56,35 +59,79 @@ function isGitRepo(p) {
   }
 }
 
+/** 读取 CBB-WORKSPACE.json 的 app 名列表（旧布局兼容判定用；缺失返回 []） */
+function loadAppNames(wsRoot) {
+  try {
+    const cfg = JSON.parse(fs.readFileSync(path.join(wsRoot, 'CBB-WORKSPACE.json'), 'utf-8'));
+    return Array.isArray(cfg.apps) ? cfg.apps.map(a => a.name).filter(Boolean) : [];
+  } catch (e) {
+    return [];
+  }
+}
+
+function currentBranch(p) {
+  try {
+    return execSync('git branch --show-current', { cwd: p, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).toString().trim();
+  } catch (e) { return ''; }
+}
+
 /**
- * 扫描 worktree 下的所有 git 仓库
- * - workspace worktree：<ws_root>/.worktrees/worktree-<branch>/ 本身
- * - app worktree：<ws_root>/.worktrees/worktree-<branch>/<app_name>/（嵌套子目录）
+ * 按需求名发现参与仓库（ADR 0002 双布局）：
+ *   布局一 worktree：.worktrees/worktree-<branch>/ 的 workspace + 其 .codespace/<app>/ 容器内 app worktree（ADR 0003 镜像主布局；≤beta.23 旧平铺顶层布局按配置 app 名兼容）
+ *   布局二 本地模式：根 / .codespace/<app>/ 的检出恰在 <branch> 分支上（同名仓库以 worktree 布局优先）
+ * 两者皆空 → error。
  */
 function scanWorktreeRepos(wsRoot, branch) {
   const wtRoot = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
   const repos = [];
 
-  if (!fs.existsSync(wtRoot)) {
-    return { wtRoot, repos, error: 'worktree 目录不存在：' + wtRoot };
+  // 布局一：worktree
+  if (fs.existsSync(wtRoot)) {
+    if (isGitRepo(wtRoot)) {
+      repos.push({ name: 'workspace', wt: wtRoot, repo: wsRoot, layout: 'worktree' });
+    }
+    // app worktree 收拢在 .codespace/ 容器内（镜像主布局，ADR 0003）
+    const appContainer = path.join(wtRoot, '.codespace');
+    if (fs.existsSync(appContainer)) {
+      for (const e of fs.readdirSync(appContainer, { withFileTypes: true })) {
+        if (!e.isDirectory()) continue;
+        const appWt = path.join(appContainer, e.name);
+        if (!isGitRepo(appWt)) continue;
+        repos.push({ name: e.name, wt: appWt, repo: path.join(wsRoot, '.codespace', e.name), layout: 'worktree' });
+      }
+    }
+    // 兼容 ≤beta.23 旧平铺布局：按配置 app 名精确匹配（避免把根仓库自带的嵌套 git 目录误判为 app）
+    for (const name of loadAppNames(wsRoot)) {
+      if (repos.some(r => r.name === name)) continue;
+      const legacyWt = path.join(wtRoot, name);
+      if (fs.existsSync(path.join(legacyWt, '.git'))) {
+        console.error('⚠️  ' + name + ' 仍是旧平铺布局（' + legacyWt + '），建议重跑 cbb-worktree-init 迁移到 .codespace/ 容器');
+        repos.push({ name, wt: legacyWt, repo: path.join(wsRoot, '.codespace', name), layout: 'worktree' });
+      }
+    }
   }
 
-  // workspace worktree（自身是 git worktree）
-  if (isGitRepo(wtRoot)) {
-    repos.push({ name: 'workspace', wt: wtRoot, repo: wsRoot });
+  // 布局二：本地模式（检出在需求分支上）
+  const names = new Set(repos.map(r => r.name));
+  if (!names.has('workspace') && isGitRepo(wsRoot) && currentBranch(wsRoot) === branch) {
+    repos.push({ name: 'workspace', wt: wsRoot, repo: wsRoot, layout: 'local' });
   }
-
-  // app worktree（嵌套子目录）
-  const entries = fs.readdirSync(wtRoot, { withFileTypes: true });
-  for (const e of entries) {
-    if (!e.isDirectory()) continue;
-    // 跳过 . 开头的隐藏目录（如 .va、.claude、.qoder）
-    if (e.name.startsWith('.')) continue;
-    const appWt = path.join(wtRoot, e.name);
-    if (!isGitRepo(appWt)) continue;
-    repos.push({ name: e.name, wt: appWt, repo: path.join(wsRoot, '.codespace', e.name) });
+  const codeDir = path.join(wsRoot, '.codespace');
+  if (fs.existsSync(codeDir)) {
+    for (const name of fs.readdirSync(codeDir).sort()) {
+      if (names.has(name)) continue;
+      const appDir = path.join(codeDir, name);
+      if (!isGitRepo(appDir)) continue;
+      if (currentBranch(appDir) === branch) {
+        repos.push({ name, wt: appDir, repo: appDir, layout: 'local' });
+      }
+    }
   }
-  return { wtRoot, repos, error: null };
+
+  const error = repos.length === 0
+    ? ('未发现需求 ' + branch + ' 的参与仓库（worktree 不存在，且无仓库检出在 ' + branch + ' 分支上）')
+    : null;
+  return { wtRoot, repos, error };
 }
 
 /**

package/cbb/worktrees/skills/cbb-worktree-push/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 {

package/config/{workspace-config.sample.json → CBB-WORKSPACE.sample.json}

@@ -1,5 +1,5 @@
 {
-    "_comment": "AI 开发工作空间配置样例（请勿修改本文件，复制为工作空间根目录的 workspace-config.json 后编辑使用）。apps 数组中每个对象需包含：name（应用名，同时作为 .codespace/ 子目录名）、repo（Git 仓库地址，支持 SSH 或 HTTPS）、side（仓库类型，'front' 表示前端工程，'back' 表示后端工程，'mixed' 表示前后端混合工程）；可选 desc（该应用的职责描述，便于人与 AI 理解应用分工）。",
+    "_comment": "AI 开发工作空间配置样例（请勿修改本文件，复制为工作空间根目录的 CBB-WORKSPACE.json 后编辑使用）。apps 数组中每个对象需包含：name（应用名，同时作为 .codespace/ 子目录名）、repo（Git 仓库地址，支持 SSH 或 HTTPS）、side（仓库类型，'front' 表示前端工程，'back' 表示后端工程，'mixed' 表示前后端混合工程）；可选 desc（该应用的职责描述，便于人与 AI 理解应用分工）。",
     "apps":
     [
         {

package/config/openspec/schemas/spec-driven/schema.yaml

@@ -224,6 +224,14 @@ apply:
 
     `plan.md` 跟 change 同住一个目录，archive 阶段会被一起带走。
 
+    **收尾（全部任务翻成 `- [x]` 后执行；本段为项目级硬约束，覆盖官方 apply 模板自带的完成提示语）：**
+
+    1. **未决项自检**（逐项确认，任何一项未过都不得宣布完成）：
+       - change 产物（proposal.md / design.md / specs/** / tasks.md / plan.md）已提交到需求分支（轻量模式：空间根 main 分支）；未提交时先询问用户是否现在提交（可随 cbb-worktree-push 一并推送；轻量模式提交后即 push）
+       - 本会话产生的临时文件与环境改动（备份目录、未回写远端的本地提交、cherry-pick 等）已列清并交用户决策
+    2. **输出顺序纪律**：存在未决项时，本轮只列未决项并等待用户决策；**禁止同轮输出"下一步建议"**，禁止出现"规划与实施均已完成""可运行 archive"之类表述（产物未提交时归档会丢规划产物）
+    3. **全部未决项关闭后，唯一可建议的下一步是 `/opsx:verify`**：本项目工作流为 propose → apply → verify → archive，verify（强制 code-review + 产出 cr.md）是 archive 的前置阶段；**禁止直接建议 archive**，官方模板的 "You can archive this change" 提示语以本段为准
+
 verify:
   tracks: cr.md
   requires: [tasks]
@@ -236,3 +244,15 @@ verify:
        即便 AI 自认能 review,仍必须调 skill。
     2. **MANDATORY 产出 `cr.md`**:把完整 Verification Report 写到 `openspec/changes/<name>/cr.md`,
        缺则视为 verify 未完成。报告必须包含五段:Summary / CRITICAL / WARNING / SUGGESTION / Code Review。
+
+    **收尾（cr.md 产出且无 CRITICAL 遗留后执行；本段为项目级硬约束，覆盖官方 verify 模板自带的完成提示语）：**
+
+    verify 通过后，用 AskUserQuestion（固定选项）向用户提供两条路径并等待选择，禁止替用户决定、禁止单一路径直接建议归档：
+
+    - **路径 A · 先验收后归档（推荐）**：执行 `cbb-worktree-push` 推送 feature 分支并提 MR 到测试分支 → 测试环境部署、用户验收 → 验收要改则在 worktree 内修复后再次 push（小改动无需重跑 verify）→ 验收通过后才 `/opsx:archive`
+    - **路径 B · 先归档后推送**：立即 `/opsx:archive` 落定变更产物（归档移动与 spec 同步发生在 feature 分支上）→ 再执行 `cbb-worktree-push` 一并推送 → 提 MR 到测试分支验收。注意：验收若发现问题，产物已归档，修复需走新 change 或将归档移回后继续；适合改动小、验收把握大的场景
+    - **Step 7 交付选择（ADR 0008）**：两条路径的 `cbb-worktree-push` 推送完成后，除「提 MR」外均可选「直接合并」——合测试分支不要求归档，合主干要求已归档 + 强提醒确认；合并成功不删分支（删除归 `cbb-worktree-close` 收尾门禁）
+
+    用户选定后按该路径执行；官方模板的单一 "suggest archive" 提示语以本段为准。
+
+    **轻量模式变体**（本次 change 完全不涉及应用代码，产物在空间根仓库）：无 worktree push / 测试分支 MR 环节，两条路径替换为——A（推荐）"先 push main 交付、观察无回归后再 archive" / B"立即 archive 落定产物，再 push main"；main 提交不得悬空本地。

package/config/upstream-mirrors.json

@@ -8,5 +8,10 @@
   "openspec": [
     "https://registry.npmmirror.com",
     "https://registry.npmjs.org"
+  ],
+  "external": [
+    "https://gh-proxy.com/",
+    "https://ghfast.top/",
+    ""
   ]
 }

package/external/frontend-design/.version

@@ -0,0 +1,6 @@
+{
+  "repo": "anthropics/skills",
+  "ref": "41bbe19d1a1a7eaab5e7bb9050a417e5c6cffc8f",
+  "path": "skills/frontend-design",
+  "updatedAt": "2026-09-28T07:10:02.694Z"
+}