@jspg-ai/coding-bb 0.0.3-beta.3 → 0.0.3-beta.31

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

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

package/cbb/worktrees/skills/cbb-worktree-close/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/ 下（extend / 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-close/scripts/find-workspace-root.js

@@ -5,8 +5,8 @@ require('./silence-popup');
  * 唯一真源：cbb/worktrees/_shared/scripts/find-workspace-root.js
  * 由 scripts/sync-shared.js 展开到各 skill 的 scripts/ 下（init / extend / 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-close/scripts/remove-worktrees.js

@@ -78,19 +78,28 @@ function removeWt(repoPath, wtPath, name) {
 
   // 第 3 层：目录被锁
   lockedDirs.push(wtPath);
-  console.log('⏳ ' + name + ' 元数据已清理，物理目录被锁定（将在下次 init 时自动清理）');
+  console.log('⏳ ' + name + ' 元数据已清理，物理目录被锁定（init 不会自动删除目录，需手动清理）');
   results.push({ name, status: 'locked' });
 }
 
 // 1. 应用 worktrees
-const configPath = path.join(wsRoot, 'workspace-config.json');
+const configPath = path.join(wsRoot, 'CBB-WORKSPACE.json');
 let config = {};
 try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
 
 const apps = config.apps || [];
+/** 解析 app worktree 物理路径：新布局 .codespace/<app> 优先，兼容 ≤beta.23 旧平铺 <app> */
+function resolveAppWt(appName) {
+  const nested = path.join(wtDir, '.codespace', appName);
+  if (fs.existsSync(path.join(nested, '.git'))) return nested;
+  const legacy = path.join(wtDir, appName);
+  if (fs.existsSync(path.join(legacy, '.git'))) return legacy;
+  return nested;
+}
+
 console.log('=== 移除应用 Worktrees ===');
 for (const app of apps) {
-  const appWt = path.join(wtDir, app.name);
+  const appWt = resolveAppWt(app.name);
   const appPath = path.join(wsRoot, '.codespace', app.name);
   removeWt(appPath, appWt, app.name);
 }
@@ -110,7 +119,7 @@ if (lockedDirs.length > 0) {
   console.log('');
   console.log('⏳ 以下目录被外部进程占用（IDE 等），git 元数据已清理，物理目录仍保留：');
   lockedDirs.forEach(d => console.log('   - ' + d));
-  console.log('   → 请关闭占用这些目录的程序（如 IDE）后手动删除；或下次 init-worktree 时自动清理');
+  console.log('   → 请关闭占用这些目录的程序（如 IDE）后手动删除（init 不再自动清理物理目录）');
 }
 
 console.log('---');

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

@@ -152,19 +152,28 @@ function checkRepo(name, repoPath, wtPath) {
   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, 'workspace-config.json');
+const configPath = path.join(wsRoot, 'CBB-WORKSPACE.json');
 let config = {};
 try { config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch (e) {}
 
 const apps = config.apps || [];
 const wtDir = path.join(wsRoot, '.worktrees', 'worktree-' + branch);
 
+/** 解析 app worktree 物理路径：新布局 .codespace/<app> 优先，兼容 ≤beta.23 旧平铺 <app> */
+function resolveAppWt(appName) {
+  const nested = path.join(wtDir, '.codespace', appName);
+  if (fs.existsSync(path.join(nested, '.git'))) return nested;
+  const legacy = path.join(wtDir, appName);
+  if (fs.existsSync(path.join(legacy, '.git'))) return legacy;
+  return nested;
+}
+
 const results = [];
 
 results.push(checkRepo('workspace', wsRoot, wtDir));
 
 for (const app of apps) {
-  const appWt = path.join(wtDir, app.name);
+  const appWt = resolveAppWt(app.name);
   const appPath = path.join(wsRoot, '.codespace', app.name);
   results.push(checkRepo(app.name, appPath, appWt));
 }