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

package/cbb/worktrees/_shared/scripts/merge-branches.js

@@ -0,0 +1,580 @@
+#!/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；
+ *                                        检出未提交改动 autostash 让路，交付后自动恢复）
+ *   --target 指定非主干分支：目标 == 当前检出 → 就地合并（同主干快路径处理）
+ *                                        否则 → 临时 worktree（基于 origin/<target>，不动用户检出）
+ *
+ * 模式：
+ *   --check      逐仓库判定是否已合并到目标（主干含 release-* 中转 / squash / cherry-pick 兜底，
+ *                算法与 cbb-worktree-close 的 safety-check.js 同源）；不修改任何状态
+ *   默认         两阶段（ADR 0007）：
+ *                  1. 预检：逐仓库校验（目标可解析 / 分支存在 / 主干不领先 origin）；
+ *                     检出上未提交改动（含未跟踪）不再拦截——执行阶段自动暂存让路（autostash）
+ *                     任一不过 → 退出 2，不执行任何合并
+ *                  2. 执行：autostash（如有）→ checkout 目标 → pull --ff-only → merge --no-ff
+ *                     → push → 自动恢复暂存；执行中失败 → 先恢复暂存再停止并报告已完成清单
+ *                     （不回滚；重跑幂等）。恢复冲突时保留 stash 条目交用户决策
+ *                     （"后提交者解决"：暂存侧改动适配已交付主干，agent 代解或用户手动二选一）
+ *   --dry-run    只做预检，不执行
+ *
+ * 恢复机制取舍：先 pop --index（还原 staged 分区）；若其失败且有冲突，reset --hard 回到
+ *   本次合并的 HEAD 后 plain apply 一次——保证冲突只"单次应用"落盘（双重应用风险为零），
+ *   代价是冲突场景下 staged/unstaged 分区扁平化（内容无损）。ignored 文件不参与暂存。
+ * 退出码：0 全部成功（含 skipped / merged）/ 1 参数错误 / 2 预检或执行失败（含 need-mr /
+ *   unmerged / autostashPending——交付已完成，只是暂存未恢复，按 AUTOSTASH_PENDING 行处理）
+ * 末行：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);
+}
+
+// ── autostash 让路 / 恢复（检出上的未提交改动不阻断直合并，ADR 0008 扩展） ──
+
+/** 统计检出上未提交项（含未跟踪），仅用于预检输出注记；-1 = 状态不可读 */
+function countUncommitted(workPath) {
+  const s = run('git status --porcelain', workPath);
+  if (!s.ok) return -1;
+  return s.out ? s.out.split(/\r?\n/).filter(Boolean).length : 0;
+}
+
+/**
+ * 暂存检出上的未提交改动（含未跟踪，不含 ignored），为合并让路。
+ * 经 refs/stash 前后对比判断是否真的建了条目（无改动时 stash 不建条目）。
+ * 返回 { ok, created, oid, stashId } 或 { ok: false, err }
+ */
+function autostashPush(workPath, tag) {
+  const before = run('git rev-parse -q --verify "refs/stash"', workPath);
+  const stamp = new Date().toISOString().slice(0, 19).replace('T', ' ');
+  const msg = 'cbb-autostash ' + tag + ' [' + stamp + ']';
+  const push = run('git stash push --include-untracked -m "' + msg + '"', workPath);
+  if (!push.ok) return { ok: false, err: (push.err || push.out || 'stash push 失败').split(/\r?\n/)[0] };
+  const after = run('git rev-parse -q --verify "refs/stash"', workPath);
+  const oid = after.out || '';
+  return { ok: true, created: !!oid && oid !== (before.out || ''), oid, stashId: msg };
+}
+
+function conflictedPaths(workPath) {
+  const d = run('git diff --name-only --diff-filter=U', workPath);
+  return d.ok && d.out ? d.out.split(/\r?\n/).filter(Boolean) : [];
+}
+
+/**
+ * 单次恢复尝试 + 分类。返回：
+ *   { done }            完全恢复（pop 成功，或 apply 完整成功 + drop 成功）
+ *   { conflicted }      冲突标记留在树里，stash 条目保留
+ *   { dirty, files }    有改动但非标记冲突 / apply 异常部分应用——现场保留，交人工核对
+ *   { preserved }       无法自动恢复且树未被污染（如未跟踪占位冲突）
+ * 防双重应用：pop --index 失败可能留下"半应用"树（工作区改了、index 没还原），
+ * 盲目 plain pop 会在半应用之上再应用一次。故失败后先 reset --hard 回到 HEAD，
+ * 再 plain apply 一次（干净基线上的单次应用），结果只有"标记冲突"或"完整应用"两种。
+ */
+function tryRestoreStash(workPath, idx) {
+  const ref = '"stash@{' + idx + '}"';
+  const pop = run('git stash pop --index ' + ref, workPath);
+  if (pop.ok) return { done: true };
+  const conflicted = conflictedPaths(workPath);
+  if (conflicted.length === 0) {
+    // 非冲突类失败（如未跟踪文件还原撞车）：树可能已被部分应用——如实分类，绝不谎报"未动"
+    const s = run('git status --porcelain --untracked-files=no', workPath);
+    if (s.ok && s.out) return { dirty: true, files: s.out.split(/\r?\n/).filter(Boolean) };
+    return { preserved: true };
+  }
+  // 有冲突标记：--index 的失败树状态不透明（半应用 + unmerged 索引，checkout -- 会拒绝）。
+  // 先 reset --hard 回到本次合并的 HEAD（用户改动安全躺在 stash 里），再 plain apply 一次，
+  // 让冲突以标准 stash-pop-conflict 形态单次落盘（标记 + 条目保留），杜绝双重应用。
+  const undo = run('git reset --hard --quiet', workPath);
+  if (!undo.ok) return { conflicted: true };
+  const apply = run('git stash apply ' + ref, workPath);
+  if (conflictedPaths(workPath).length > 0) return { conflicted: true };
+  if (!apply.ok) {
+    const s2 = run('git status --porcelain --untracked-files=no', workPath);
+    if (s2.ok && s2.out) return { dirty: true, files: s2.out.split(/\r?\n/).filter(Boolean) };
+    return { preserved: true };
+  }
+  // plain apply 完全成功（首轮失败仅因 --index 还原不了 staged 分区）：补 drop 收尾
+  const drop = run('git stash drop ' + ref, workPath);
+  if (drop.ok) return { done: true };
+  return { dirty: true, files: conflictedPaths(workPath) };
+}
+
+/**
+ * 恢复 autostash。返回 { state, files?, note? }：
+ *   none         未建条目，无需恢复
+ *   restored     已完全恢复
+ *   conflict     恢复冲突（标记在树里、条目保留）——后提交者解决，交用户决策
+ *   dirty        apply 异常 / 部分应用——现场保留交人工核对
+ *   preserved    无法自动恢复且树未被污染——条目保留交人工
+ *   stash-moved  stash 顶层已非本次条目——绝不动别人的 stash，保留现场
+ */
+function autostashPop(workPath, st) {
+  if (!st.ok || !st.created) return { state: 'none' };
+  const cur = run('git rev-parse -q --verify "refs/stash"', workPath);
+  if (!cur.ok || cur.out !== st.oid) {
+    return { state: 'stash-moved', note: 'stash 顶层条目非本次自动暂存（' + st.stashId + '），未自动恢复' };
+  }
+  const list = run('git stash list', workPath);
+  const top = list.ok ? (list.out.split(/\r?\n/)[0] || '') : '';
+  const m = top.match(/^stash@\{(\d+)\}/);
+  if (!m) return { state: 'preserved', note: 'stash 列表解析失败（' + st.stashId + '）' };
+  const r = tryRestoreStash(workPath, m[1]);
+  if (r.done) return { state: 'restored' };
+  if (r.conflicted) return { state: 'conflict', files: conflictedPaths(workPath), note: '条目保留：' + top };
+  if (r.dirty) return { state: 'dirty', files: r.files, note: '条目保留：' + top };
+  return { state: 'preserved', note: '条目保留：' + top };
+}
+
+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, uncommitted: 0 };
+    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;
+      }
+      // 检出脏不再拦截：记录未提交项数，执行阶段 autostash 让路、合并后恢复（ADR 0008 扩展）
+      rec.uncommitted = countUncommitted(rp.work);
+      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 {
+      // 指定分支路径：已合并则跳过；当前检出即目标 → 就地（autostash）；否则临时 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) {
+        // 就地合并：同主干快路径，检出脏不拦截，执行阶段 autostash 让路 / 恢复
+        rec.uncommitted = countUncommitted(rp.work);
+      } else {
+        rec.temp = true; // 执行阶段创建临时 worktree（基于 origin/<target>，不碰用户检出）
+      }
+    }
+    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 {
+      let note = p.temp ? '（临时 worktree）' : '';
+      if (!p.temp && p.uncommitted > 0) note += '（检出有 ' + p.uncommitted + ' 项未提交改动，将自动暂存、合并后恢复）';
+      console.log('OK   ' + p.name + ' → 合并至 ' + p.target + note);
+    }
+  });
+
+  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 + "'";
+    let st = null; // autostash 句柄（仅主干 / 就地路径建）
+    // 统一出口：凡建过暂存，离开本仓库前必恢复；恢复未完全 → autostashPending（退出码 2 交用户决策）
+    const finish = (status, detail) => {
+      let pending = false;
+      if (st) {
+        const pr = autostashPop(rp.work, st);
+        if (pr.state !== 'none' && pr.state !== 'restored') {
+          pending = true;
+          detail += '; autostash-' + pr.state +
+            (pr.files && pr.files.length ? ' [' + pr.files.join(', ') + ']' : '') +
+            (pr.note ? ' ' + pr.note : '');
+        }
+      }
+      results[i].status = status;
+      results[i].detail = detail;
+      results[i].autostashPending = pending;
+      if (status !== 'merged' && status !== 'skipped') stopped = true;
+    };
+
+    if (target === p.main) {
+      // ── 主干路径（快路径）：检出未提交改动 autostash 让路，交付后自动恢复 ──
+      st = autostashPush(rp.work, 'merge-' + branch + '-into-' + target);
+      if (!st.ok) {
+        finish('failed', 'autostash-failed: ' + st.err);
+        continue;
+      }
+      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) {
+          finish('failed', 'checkout-failed: ' + co.err.split(/\r?\n/)[0]);
+          continue;
+        }
+      }
+      const pull = run('git pull --ff-only --quiet origin "' + target + '"', rp.repo);
+      if (!pull.ok) {
+        finish('failed', 'pull-failed: ' + pull.err.split(/\r?\n/)[0]);
+        continue;
+      }
+      const merge = run('git merge --no-ff -m "' + mergeMsg + '" "' + branch + '"', rp.repo);
+      if (!merge.ok) {
+        run('git merge --abort', rp.repo);
+        finish('failed', 'merge-failed: ' + merge.err.split(/\r?\n/)[0]);
+        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') {
+            finish('need-mr', 'branch-protected（目标分支受保护，请改用 MR 出口）');
+          } else {
+            finish('failed', 'push-failed: ' + (push.err || '').split(/\r?\n/)[0]);
+          }
+          continue;
+        }
+      }
+      finish('merged', 'merged+pushed origin/' + target);
+      continue;
+    }
+
+    // ── 指定分支路径（当前检出即目标 → 就地 + autostash；否则临时 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) {
+        finish('failed', 'worktree-add-failed: ' + add.err.split(/\r?\n/)[0]);
+        continue;
+      }
+      workDir = tmpDir;
+    } else {
+      st = autostashPush(rp.work, 'merge-' + branch + '-into-' + target);
+      if (!st.ok) {
+        finish('failed', 'autostash-failed: ' + st.err);
+        continue;
+      }
+      const pull = run('git pull --ff-only --quiet origin "' + target + '"', rp.repo);
+      if (!pull.ok) {
+        finish('failed', 'pull-failed: ' + pull.err.split(/\r?\n/)[0]);
+        continue;
+      }
+    }
+
+    const merge = run('git merge --no-ff -m "' + mergeMsg + '" "' + branch + '"', workDir);
+    if (!merge.ok) {
+      run('git merge --abort', workDir);
+      cleanupTempWorktree(rp.repo, tmpDir);
+      finish('failed', 'merge-failed: ' + merge.err.split(/\r?\n/)[0]);
+      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') {
+          finish('need-mr', 'branch-protected（目标分支受保护，请改用 MR 出口）');
+        } else {
+          finish('failed', 'push-failed: ' + (push.err || '').split(/\r?\n/)[0]);
+        }
+        continue;
+      }
+    }
+    cleanupTempWorktree(rp.repo, tmpDir);
+    finish('merged', 'merged+pushed origin/' + target + (tmpDir ? '（临时 worktree）' : ''));
+  }
+
+  results.forEach(r => {
+    console.log(r.status.toUpperCase() + ' ' + r.name + (r.detail ? ' — ' + r.detail : ''));
+    if (r.autostashPending) {
+      console.log('AUTOSTASH_PENDING ' + r.name + ': 暂存的未提交改动未自动恢复（stash 条目保留）——列冲突点，用户二选一：agent 解决 / 手动解决（协议见 SKILL 解读）');
+    }
+  });
+
+  // autostashPending 按失败退出：交付可能已完成，但用户改动还挂在 stash，必须决策处理后重跑确认
+  const ok = results.every(r => (r.status === 'merged' || r.status === 'skipped') && !r.autostashPending);
+  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, autostashPush, autostashPop };

package/cbb/worktrees/_shared/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/_shared/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 {