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

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

@@ -7,7 +7,9 @@ require('./silence-popup');
  *   node commit-worktrees.js <wt_path> --message "msg" [options]
  *
  * 行为：
- *   1. 扫描 <ws_root>/.worktrees/worktree-<branch>/ 下所有 git 仓库
+ *   1. 按需求名发现参与仓库（ADR 0002 双布局）：
+ *      - worktree 布局：.worktrees/worktree-<branch>/ 的 workspace + 其 .codespace/<app>/ 容器内各 app worktree（镜像主布局，ADR 0003）
+ *      - 本地布局：根 / .codespace/<app>/ 检出恰在 <branch> 分支上
  *   2. 对每个仓库：
  *      a. git status --porcelain 检测 dirty
  *      b. 若 clean 或已有 ahead commit → 跳过
@@ -95,23 +97,79 @@ function isGitRepo(p) {
   return fs.existsSync(path.join(p, '.git'));
 }
 
+/** 读取 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 ''; }
+}
+
+/**
+ * 按需求名发现参与仓库（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' });
+      }
+    }
   }
-  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' });
   }
-  const entries = fs.readdirSync(wtRoot, { withFileTypes: true });
-  for (const e of entries) {
-    if (!e.isDirectory() || 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 };
 }
 
 function run(cmd, cwd) {

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

@@ -1,96 +1,148 @@
-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('   请先执行 cbb-worktree-init 创建 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('   请先执行 cbb-worktree-init 创建 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);
+require('./silence-popup');
+/**
+ * openspec-shared 目标需求名识别
+ *
+ * 唯一真源：cbb/worktrees/_shared/scripts/find-target-worktree.js
+ * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（close / push）。
+ *
+ * 用法：node find-target-worktree.js <ws_root>
+ *
+ * 优先级（ADR 0002 双布局）：
+ *   1. cwd 在 .worktrees/worktree-xxx/ 内 → 自动从路径反推
+ *   2. 收集候选：worktree 目录（.worktrees/worktree-xxx）
+ *      + 本地布局（根 / .codespace/<app>/ 检出在非主干分支，本地模式进行中）
+ *      同一需求名两种布局共存时合并为一项（标 both）
+ *   3. 唯一候选 → 自动选用；多个 → 按 mtime 倒序列出（本地布局用分支检出时间）
+ *
+ * 输出：
+ *   末行输出需求名（用于 AI agent 解析）
+ *   多个时按 [1] xxx ⭐ / [2] yyy 列出
+ *
+ * 退出码：
+ *   0 - 唯一识别（自动或唯一）
+ *   1 - 多个候选，需用户输入
+ *   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);
+}
+
+function run(cmd, cwd) {
+  try {
+    return execSync(cmd, { cwd, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+  } catch (e) { return null; }
+}
+
+function currentBranch(cwd) {
+  return run('git branch --show-current', cwd) || '';
+}
+
+/** 主干名（探测失败返回 null → 该仓库任何非空检出都视为候选） */
+function detectMain(cwd) {
+  const remotes = run('git remote', cwd);
+  if (remotes) {
+    const r = remotes.split(/\r?\n/)[0];
+    const sym = run('git symbolic-ref "refs/remotes/' + r + '/HEAD"', cwd);
+    if (sym) return sym.replace('refs/remotes/' + r + '/', '');
+  }
+  if (run('git rev-parse --verify --quiet refs/heads/main', cwd)) return 'main';
+  if (run('git rev-parse --verify --quiet refs/heads/master', cwd)) return 'master';
+  return null;
+}
+
+// 优先级 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);
+}
+
+// 优先级 2a：worktree 目录候选
+const candidates = new Map(); // name → { layouts: Set, mtime }
+
+const worktreesDir = path.join(wsRoot, '.worktrees');
+if (fs.existsSync(worktreesDir)) {
+  const entries = fs.readdirSync(worktreesDir, { withFileTypes: true })
+    .filter(e => e.isDirectory() && e.name.startsWith('worktree-'));
+  for (const e of entries) {
+    const name = e.name.substring('worktree-'.length);
+    const full = path.join(worktreesDir, e.name);
+    const item = candidates.get(name) || { layouts: new Set(), mtime: 0 };
+    item.layouts.add('worktree');
+    item.mtime = Math.max(item.mtime, fs.statSync(full).mtime.getTime());
+    candidates.set(name, item);
+  }
+}
+
+// 优先级 2b：本地布局候选（根 + .codespace/<app>/ 检出在非主干分支）
+function addLocalCandidate(name, cwdPath) {
+  if (!name) return;
+  const item = candidates.get(name) || { layouts: new Set(), mtime: 0 };
+  item.layouts.add('local');
+  try {
+    item.mtime = Math.max(item.mtime, fs.statSync(path.join(cwdPath, '.git')).mtime.getTime());
+  } catch (_) { /* .git 状态时间不可读则保持 */ }
+  candidates.set(name, item);
+}
+
+const rootMain = detectMain(wsRoot);
+const rootBranch = currentBranch(wsRoot);
+if (rootBranch && (!rootMain || rootBranch !== rootMain)) {
+  addLocalCandidate(rootBranch, wsRoot);
+}
+
+const codeDir = path.join(wsRoot, '.codespace');
+if (fs.existsSync(codeDir)) {
+  for (const app of fs.readdirSync(codeDir).sort()) {
+    const appDir = path.join(codeDir, app);
+    if (!fs.existsSync(path.join(appDir, '.git'))) continue;
+    const appMain = detectMain(appDir);
+    const appBranch = currentBranch(appDir);
+    if (appBranch && (!appMain || appBranch !== appMain)) {
+      addLocalCandidate(appBranch, appDir);
+    }
+  }
+}
+
+if (candidates.size === 0) {
+  console.error('❌ 未找到任何进行中的需求（无 worktree，且无仓库检出在非主干分支）');
+  console.error('   worktree 模式请先执行 cbb-worktree-init；本地模式请先执行 cbb-local-mode');
+  console.log('---');
+  console.log('NO_WORKTREE');
+  process.exit(2);
+}
+
+// 唯一候选 → 自动选用
+if (candidates.size === 1) {
+  const [name] = [...candidates.keys()];
+  const layouts = [...candidates.get(name).layouts].join('+');
+  console.log('✅ 自动选用唯一进行中需求：' + name + '（' + layouts + '）');
+  console.log('---');
+  console.log(name);
+  process.exit(0);
+}
+
+// 多候选 → 按 mtime 倒序列出
+const sorted = [...candidates.entries()].sort((a, b) => b[1].mtime - a[1].mtime);
+console.log('⚠️  检测到 ' + sorted.length + ' 个进行中的需求（按最近活动排序）：');
+sorted.forEach(([name, item], i) => {
+  const layouts = [...item.layouts].join('+');
+  const tag = i === 0 ? '  ⭐ (推荐：最近活动)' : '';
+  console.log('  [' + (i + 1) + '] ' + name + '（' + layouts + '）' + tag);
+});
+console.log('请在对话中输入序号(1/2/3)或完整分支名：');
+console.log('---');
+console.log('MULTIPLE_WORKTREEES');
+process.exit(1);

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

@@ -3,10 +3,10 @@ require('./silence-popup');
  * openspec-shared 工作空间根目录定位
  *
  * 唯一真源：cbb/worktrees/_shared/scripts/find-workspace-root.js
- * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / extend / close / push）。
+ * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（close / push）。
  *
- * 优先：git worktree list 第一行（主仓库根目录，不受 worktree 内 workspace-config.json 副本干扰）
- * 兜底：当前目录含 workspace-config.json
+ * 优先：git worktree list 第一行（主仓库根目录，不受 worktree 内 CBB-WORKSPACE.json 副本干扰）
+ * 兜底：当前目录含 CBB-WORKSPACE.json
  *
  * 退出码：
  *   0 - 定位成功，输出 WS_ROOT 绝对路径
@@ -44,19 +44,19 @@ if (worktreeList.ok) {
   }
 }
 
-// 兜底：当前目录含 workspace-config.json
+// 兜底：当前目录含 CBB-WORKSPACE.json
 if (!wsRoot) {
   const cwd = process.cwd();
-  if (fs.existsSync(path.join(cwd, 'workspace-config.json'))) {
+  if (fs.existsSync(path.join(cwd, 'CBB-WORKSPACE.json'))) {
     wsRoot = cwd;
   }
 }
 
 // 校验
-if (!wsRoot || !fs.existsSync(path.join(wsRoot, 'workspace-config.json'))) {
+if (!wsRoot || !fs.existsSync(path.join(wsRoot, 'CBB-WORKSPACE.json'))) {
   console.error('❌ 未找到工作空间根目录');
-  console.error('   原因：git worktree list 失败且当前目录无 workspace-config.json');
-  console.error('   请在业务工作空间根目录（由 cbb setup 初始化、包含 workspace-config.json）下执行本技能');
+  console.error('   原因：git worktree list 失败且当前目录无 CBB-WORKSPACE.json');
+  console.error('   请在业务工作空间根目录（由 cbb setup 初始化、包含 CBB-WORKSPACE.json）下执行本技能');
   process.exit(1);
 }
 

package/cbb/worktrees/skills/cbb-worktree-push/scripts/make-mr-urls.js

@@ -0,0 +1,211 @@
+#!/usr/bin/env node
+require('./silence-popup');
+/**
+ * cbb-worktree-push MR 链接生成（预填 URL + 可选开浏览器）
+ *
+ * 用法：
+ *   node make-mr-urls.js <ws_root> <branch> <target> [--platform gitlab|github|gitee] [--open]
+ *   node make-mr-urls.js <wt_path> <target> [...]   # wt_path 形态同 push-worktrees
+ *
+ * 行为（对 workspace worktree + 各 app worktree 逐仓库）：
+ *   1. git ls-remote 校验 feature 分支已在远端（push 过）、目标分支存在
+ *   2. git rev-list 判断与目标分支有无差异（无差异 → no-diff 跳过）
+ *   3. 解析 origin URL 判定平台（github.com / gitee.com，其余默认 GitLab；--platform 强制）
+ *   4. 生成预填 MR/PR 创建 URL；--open 时逐个开浏览器
+ *
+ * 安全红线：只生成链接，绝不代为合并、不触碰任何凭据（提交动作由人在平台页面完成）
+ *
+ * 退出码：
+ *   0 - 正常（含全部跳过）
+ *   1 - 参数错误
+ *   2 - 致命（worktree 不存在 / 无仓库）
+ *
+ * 末行 MR_RESULT [{name,status,url|reason}]
+ *   status: ok | no-diff | not-pushed | no-target | manual | no-remote
+ */
+
+const { execSync, spawn } = require('child_process');
+const path = require('path');
+const { scanWorktreeRepos } = require('./push-worktrees');
+
+function parseArgs(argv) {
+  const flags = {};
+  const pos = [];
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === '--open') flags.open = true;
+    else if (a === '--platform') { flags.platform = argv[++i]; }
+    else if (a.startsWith('--platform=')) { flags.platform = a.split('=')[1]; }
+    else pos.push(a);
+  }
+  let inputs;
+  if (pos.length === 2) {
+    const wtPath = path.resolve(pos[0]);
+    const m = wtPath.match(/^(.+)[\\\/]\.worktrees[\\\/]worktree-(.+)$/);
+    if (!m) return { error: '两参数形式时 argv[1] 必须是 <ws_root>/.worktrees/worktree-<branch> 形态' };
+    inputs = { wsRoot: m[1], branch: m[2], target: pos[1] };
+  } else if (pos.length === 3) {
+    inputs = { wsRoot: path.resolve(pos[0]), branch: pos[1], target: pos[2] };
+  } else {
+    return { error: '用法：node make-mr-urls.js <ws_root> <branch> <target> [--platform X] [--open] | node make-mr-urls.js <wt_path> <target> [--open]' };
+  }
+  if (flags.platform && !['gitlab', 'github', 'gitee'].includes(flags.platform)) {
+    return { error: '--platform 仅支持 gitlab / github / gitee' };
+  }
+  return { ...inputs, ...flags };
+}
+
+/** 解析 git remote URL → { webBase }（浏览器可点的仓库主页，无 .git 后缀） */
+function parseRemoteUrl(url) {
+  const u = (url || '').trim().replace(/\.git$/, '');
+  if (!u) return null;
+  // scp 式 ssh：git@host:group/proj
+  let m = u.match(/^[^@/\s]+@([^:]+):(.+)$/);
+  if (m) return { host: m[1], repoPath: m[2], webBase: 'https://' + m[1] + '/' + m[2] };
+  // 显式 ssh:// 或 http(s)://
+  m = u.match(/^(ssh|https?):\/\/(?:[^@/\s]+@)?([^/]+)\/(.+)$/);
+  if (m) {
+    const scheme = m[1] === 'ssh' ? 'https' : m[1];
+    return { host: m[2], repoPath: m[3], webBase: scheme + '://' + m[2] + '/' + m[3] };
+  }
+  return null;
+}
+
+function detectPlatform(remoteUrlStr, override) {
+  if (override) return override;
+  const parsed = parseRemoteUrl(remoteUrlStr);
+  if (!parsed) return null;
+  const host = parsed.host.toLowerCase();
+  if (host === 'github.com' || host.endsWith('.github.com')) return 'github';
+  if (host === 'gitee.com') return 'gitee';
+  // 企业自建以 GitLab 为绝对主流；误判时 --platform 强制覆盖
+  return 'gitlab';
+}
+
+/** 生成预填 MR/PR 创建 URL（branch/target 做 URL 编码） */
+function buildMrUrl(platform, webBase, branch, target) {
+  const b = encodeURIComponent(branch);
+  const t = encodeURIComponent(target);
+  if (platform === 'gitlab') {
+    return webBase + '/-/merge_requests/new?merge_request%5Bsource_branch%5D=' + b + '&merge_request%5Btarget_branch%5D=' + t;
+  }
+  if (platform === 'github') {
+    return webBase + '/compare/' + t + '...' + b + '?expand=1';
+  }
+  if (platform === 'gitee') {
+    return webBase + '/compare/' + t + '...' + b;
+  }
+  return null;
+}
+
+function defaultRun(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() };
+  }
+}
+
+/**
+ * 单仓库判定：ls-remote 拿 source/target 的远端 sha → rev-list 数差异
+ * @returns {{status:'ok'|'no-diff'|'not-pushed'|'no-target'|'no-remote', remote?:string}}
+ */
+function inspectRepo(repoDir, branch, target, execImpl) {
+  const run = execImpl || defaultRun;
+  const remote = run('git remote get-url origin', repoDir);
+  if (!remote.ok) return { status: 'no-remote' };
+  const ls = run('git ls-remote --heads origin "' + branch + '" "' + target + '"', repoDir);
+  if (!ls.ok) return { status: 'no-remote' };
+  const refs = {};
+  ls.out.split('\n').forEach(line => {
+    const m = line.match(/^([0-9a-f]+)\s+refs\/heads\/(.+)$/);
+    if (m) refs[m[2]] = m[1];
+  });
+  if (!refs[branch]) return { status: 'not-pushed', remote: remote.out };
+  if (!refs[target]) return { status: 'no-target', remote: remote.out };
+  const ahead = run('git rev-list --count "' + refs[target] + '..' + refs[branch] + '"', repoDir);
+  if (ahead.ok && ahead.out === '0') return { status: 'no-diff', remote: remote.out };
+  // rev-list 失败（目标 sha 本地不可达等）→ 不阻塞，照常给链接
+  return { status: 'ok', remote: remote.out };
+}
+
+function openBrowser(url, platform) {
+  const os = process.platform;
+  try {
+    if (os === 'win32') spawn('cmd', ['/c', 'start', '""', url], { stdio: 'ignore', detached: true }).unref();
+    else if (os === 'darwin') spawn('open', [url], { stdio: 'ignore', detached: true }).unref();
+    else spawn('xdg-open', [url], { stdio: 'ignore', detached: true }).unref();
+  } catch (e) { /* 打不开不阻塞：URL 清单已输出 */ }
+}
+
+/**
+ * 编排：扫描 worktree 仓库 + 逐仓库判定与生成
+ * @param {{wsRoot:string, branch:string, target:string, platform?:string, execImpl?:Function}} opts
+ */
+function makeMrUrls(opts) {
+  const { wtRoot, repos, error } = scanWorktreeRepos(opts.wsRoot, opts.branch);
+  if (error) return { repos: [], results: [], error };
+  const results = [];
+  for (const r of repos) {
+    const info = inspectRepo(r.wt, opts.branch, opts.target, opts.execImpl);
+    const item = { name: r.name, status: info.status };
+    if (info.status === 'ok') {
+      const platform = detectPlatform(info.remote, opts.platform);
+      const web = parseRemoteUrl(info.remote);
+      const url = platform && web ? buildMrUrl(platform, web.webBase, opts.branch, opts.target) : null;
+      if (url) { item.url = url; item.platform = platform; }
+      else { item.status = 'manual'; item.reason = 'origin 无法解析为已知平台仓库地址'; }
+    } else {
+      item.reason = {
+        'no-diff': '与目标分支无差异，无需 MR',
+        'not-pushed': 'feature 分支未推送到远端（先完成 push）',
+        'no-target': '远端不存在目标分支',
+        'no-remote': '仓库无 origin 远端',
+      }[info.status];
+    }
+    results.push(item);
+  }
+  return { wtRoot, repos, results, error: null };
+}
+
+module.exports = { parseArgs, parseRemoteUrl, detectPlatform, buildMrUrl, inspectRepo, makeMrUrls };
+
+function main() {
+  const args = parseArgs(process.argv.slice(2));
+  if (args.error) {
+    console.error('❌ ' + args.error);
+    process.exit(1);
+  }
+  const { wsRoot, branch, target } = args;
+  console.log('=== 生成 MR 预填链接 ===');
+  console.log('需求分支：' + branch + ' → 目标分支：' + target);
+
+  const { results, error } = makeMrUrls({ wsRoot, branch, target, platform: args.platform });
+  if (error) {
+    console.error('❌ ' + error);
+    process.exit(2);
+  }
+  if (results.length === 0) {
+    console.error('❌ worktree 下未发现任何 git 仓库');
+    process.exit(2);
+  }
+
+  let opened = 0;
+  for (const r of results) {
+    if (r.status === 'ok') {
+      console.log('✅ ' + r.name + ' [' + r.platform + ']: ' + r.url);
+      if (args.open) { openBrowser(r.url); opened++; }
+    } else {
+      console.log('⏭️  ' + r.name + ': ' + r.reason + '（' + r.status + '）');
+    }
+  }
+  if (args.open && opened > 0) console.log('🌐 已在浏览器打开 ' + opened + ' 个 MR 创建页（人工确认标题/评审人后提交）');
+
+  console.log('---');
+  console.log('MR_RESULT', JSON.stringify(results));
+  process.exit(0);
+}
+
+if (require.main === module) {
+  main();
+}