@haiyangbg/buildbeat 3.1.0 → 3.2.1

package/src/v2/workspace/workspace-manager.js

@@ -214,19 +214,78 @@ export function acquireLock(repoRoot, runId) {
   return lockPath;
 }
 
-// Run ids currently holding a lock in this repository (the repository-wide
-// active-run marker excluded): who a blocked `start` is queued behind.
+// Locks that belong to no single run: the repository-wide active-run lock,
+// and names starting with "@" (per-work, parallel-run marker, repo-git),
+// which no run id can contain.
+export function isRunLockName(name) {
+  return name !== "active-run" && !name.startsWith("@");
+}
+
+// Run ids currently holding a lock in this repository: who a blocked
+// `start` is queued behind.
 export function listHeldRunLocks(repoRoot) {
   const lockDir = join(repoRoot, ".buildbeat", "runtime", "locks");
   if (!existsSync(lockDir)) {
     return [];
   }
   return readdirSync(lockDir)
-    .filter((entry) => entry.endsWith(".lock") && entry !== "active-run.lock")
+    .filter((entry) => entry.endsWith(".lock"))
     .map((entry) => entry.slice(0, -".lock".length))
+    .filter(isRunLockName)
     .sort();
 }
 
+// Parallel-run markers (@parallel.<RUN>) whose owner is alive or cannot be
+// judged; markers of dead owners are reclaimed on the way and not returned.
+export function liveParallelMarkers(repoRoot) {
+  const lockDir = join(repoRoot, ".buildbeat", "runtime", "locks");
+  if (!existsSync(lockDir)) {
+    return [];
+  }
+  const live = [];
+  for (const entry of readdirSync(lockDir).sort()) {
+    if (!entry.startsWith("@parallel.") || !entry.endsWith(".lock")) {
+      continue;
+    }
+    const lockPath = join(lockDir, entry);
+    const seen = inspectLock(lockPath);
+    if (seen.state === "dead" && reclaimStaleLock(lockPath, seen.owner)) {
+      rmSync(lockPath, { recursive: true, force: true });
+      continue;
+    }
+    live.push({ run: entry.slice("@parallel.".length, -".lock".length), ...seen });
+  }
+  return live;
+}
+
+function pause(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+// Writes to the repository's shared git state (worktree add/remove, branch
+// create/delete, .git/config) are serialised: with parallel runs two drivers
+// could otherwise race on .git/config.lock or index.lock. Held for
+// milliseconds, so a busy lock is waited for (bounded), not reported.
+export function withRepoGitLock(repoRoot, fn, { waitMs = 10_000 } = {}) {
+  const deadline = Date.now() + waitMs;
+  for (;;) {
+    try {
+      acquireLock(repoRoot, "@repo-git");
+      break;
+    } catch (error) {
+      if (!error.lock || Date.now() >= deadline) {
+        throw error;
+      }
+      pause(100);
+    }
+  }
+  try {
+    return fn();
+  } finally {
+    releaseLock(repoRoot, "@repo-git");
+  }
+}
+
 export function releaseLock(repoRoot, runId) {
   rmSync(lockPathFor(repoRoot, runId), { recursive: true, force: true });
 }

package/templates/v2/CLAUDE.md

@@ -3,5 +3,5 @@
 本工作区的会话路由、协作规则、红线,**单点在同目录的 [`AGENTS.md`](AGENTS.md)** —— 请立即读取那份。
 
 > 本文件只为兼容「只认 `CLAUDE.md` 这个文件名的工具」而存在,**永远保持这几行**。
-> 往这里复制任何规则 = 两份文档必然漂移(上游 `lessons.md` 第 1 条:SSOT 腐烂)。
+> 往这里复制任何规则 = 两份文档必然漂移(上游 `lessons.md`「SSOT 腐烂)。
 > 也不要改成符号链接:Windows 上 git 默认 `core.symlinks=false`,clone 出来会静默退化成一个内容是路径字符串的普通文件,装载即失效。

package/templates/v2/run-config.example.yaml

@@ -23,6 +23,8 @@ budgets:
   maxAttempts:
     review: 2
   reviewRoundsPerWork: 6
+# 默认一个仓库同时只驱动一个 Run。确认本项目的测试不抢固定端口、不共用数据库后，
+# 可加 parallel: true，让本 Work 的 Run 与其他同样打开开关的 Work 并行（同一 Work 仍互斥）
 # 同树 + 同命令 + 同信封已通过就复用 verify 证据
 cache:
   verify: tree