@haiyangbg/buildbeat 3.1.0 → 3.2.1

package/src/v2/cli/run.js

@@ -64,17 +64,17 @@ Usage:
   buildbeat resume --config <run-config.yaml> [--run <RUN-ID>] [--adopt <sha> --by <name>]   # --adopt: hand fix committed in the worktree; skip fix, resume at verify
   buildbeat status --repo <path> --run <RUN-ID> [--stall-after <minutes>]
   buildbeat inbox --repo <path>
-  buildbeat overview --repo <path> [--work <WORK-ID>] [--json true]
+  buildbeat overview --repo <path> [--work <WORK-ID>] [--json]
   buildbeat approve --repo <path> --run <RUN-ID> --transition <t> [--by <name>] [--config <run-config.yaml>]
   buildbeat reject --repo <path> --run <RUN-ID> [--transition <t>] [--reason <text>] [--by <name>]
   buildbeat accept --repo <path> --work <WORK-ID> --artifact <plan|intent|spec> [--by <name>]
   buildbeat doctor --config <run-config.yaml>
   buildbeat events --repo <path> --run <RUN-ID>
   buildbeat replay --repo <path> --run <RUN-ID>
-  buildbeat metrics --repo <path> [--json true]
+  buildbeat metrics --repo <path> [--json]
   buildbeat stop --repo <path> --run <RUN-ID> --reason <text>
-  buildbeat gc --repo <path> [--apply true] [--force true]
-  buildbeat watch --repo <path> --run <RUN-ID> [--stall-after <minutes>] [--interval <seconds>] [--once true]
+  buildbeat gc --repo <path> [--apply] [--force]
+  buildbeat watch --repo <path> --run <RUN-ID> [--stall-after <minutes>] [--interval <seconds>] [--once]
   buildbeat observe run --config <observe.yaml>
   buildbeat observe status --repo <path>
   buildbeat observe triage --repo <path> --intent <ref> --action <fix_now|schedule|dismiss> [--by <name>] [--note <text>]
@@ -83,15 +83,33 @@ Usage:
   buildbeat findings adjudicate --repo <path> --work <WORK-ID> --fingerprint <fp> --action <accept|dismiss> [--by <name>] [--note <text>]
 `;
 
+// Switches may stand alone (`--json`) or take an explicit true/false
+// (`--json true`, the older spelling); every other flag needs a value.
+const SWITCHES = new Set(["json", "apply", "force", "once"]);
+
 function parseFlags(argv) {
   const flags = {};
-  for (let index = 0; index < argv.length; index += 2) {
+  for (let index = 0; index < argv.length; index += 1) {
     const key = argv[index];
-    const value = argv[index + 1];
-    if (!key?.startsWith("--") || value === undefined) {
-      throw new Error(`bad arguments near: ${key ?? "(end)"}`);
+    if (!key.startsWith("--") || key === "--") {
+      throw new Error(`unexpected argument: ${key}`);
+    }
+    const name = key.slice(2);
+    const next = argv[index + 1];
+    if (SWITCHES.has(name)) {
+      if (next === "true" || next === "false") {
+        flags[name] = next;
+        index += 1;
+      } else {
+        flags[name] = "true";
+      }
+      continue;
+    }
+    if (next === undefined || next.startsWith("--")) {
+      throw new Error(`${key} needs a value`);
     }
-    flags[key.slice(2)] = value;
+    flags[name] = next;
+    index += 1;
   }
   return flags;
 }
@@ -406,6 +424,7 @@ function loadRunConfig(flags, command) {
     requires: config.requires ?? [],
     reviewTriage: config.reviewTriage === "required" ? "required" : null,
     supersede: config.supersede ?? "waiting",
+    parallel: config.parallel === true,
     stallAfterMs: config.stallAfterMs !== undefined ? Number(config.stallAfterMs) : DEFAULT_STALL_AFTER_MS,
     planDigest: digestOfWorkFile("plan.md"),
     intentDigest: digestOfWorkFile("intent.md"),
@@ -531,7 +550,7 @@ async function commandStart(flags) {
         console.error(`blocked by ${holder}: ${summary}`);
         console.error(`  watch it: buildbeat status --repo ${label} --run ${holder}`);
       }
-      console.error("queue position: next after the holder(s) above stop or wait on a human (the repository allows one driving run at a time; worktrees are already isolated)");
+      console.error("queue position: next after the holder(s) above stop or wait on a human (by default one run drives a repository at a time; works whose run configs both set parallel: true can drive together)");
     }
     throw error;
   }
@@ -829,6 +848,11 @@ function commandDoctor(flags) {
     console.log("environment contract: none declared (implicit PATH facts stay unchecked)");
   }
   console.log(`supersede: ${options.supersede} (new run for the same work ${options.supersede === "off" ? "leaves" : "supersedes"} older WAITING_HUMAN runs)`);
+  console.log(
+    options.parallel
+      ? "concurrency: parallel (runs of other works with parallel: true may drive at the same time; runs of this work stay exclusive; verifiers must not share fixed ports or databases)"
+      : "concurrency: exclusive (default: one driving run per repository; set parallel: true to drive alongside other works)",
+  );
   console.log(`stall threshold: ${formatMs(options.stallAfterMs)} without worker output`);
   const { config: notify, error: notifyError } = notifyConfigFor(options.repoRoot);
   if (notifyError) {
@@ -1078,7 +1102,7 @@ function commandGc(flags) {
   if (flags.apply !== "true") {
     console.log(
       actionable > 0
-        ? `plan only: ${actionable} action(s); rerun with --apply true to execute (branches whose candidate lives only there are always kept)`
+        ? `plan only: ${actionable} action(s); rerun with --apply to execute (branches whose candidate lives only there are always kept)`
         : "nothing to collect",
     );
     return;

package/src/v2/engine/yaml-subset.js

@@ -142,20 +142,26 @@ function parseList(lines, start, indent) {
     }
     const first = childLines[0].content;
     const quotedScalar = first.startsWith('"') || first.startsWith("'");
-    const mapItem = !quotedScalar && MAP_ITEM.test(first);
-    if (childLines.length === 1 && !mapItem) {
-      // Real YAML reads "echo a: b" as a map; rather than guess, ask for quotes.
-      if (!quotedScalar && (first.includes(": ") || first.endsWith(":"))) {
-        throw new YamlSubsetError(
-          `list item ${JSON.stringify(first)} contains ": "; quote it (- ${JSON.stringify(first)}) or write it as key: value`,
-          line.lineNo,
-        );
+    if (childLines.length > 1) {
+      // Multi-line items keep the previous rule and messages unchanged.
+      if (!quotedScalar && first.includes(":")) {
+        result.push(parseMapFromLines(childLines, itemIndent));
+      } else {
+        throw new YamlSubsetError("unsupported list item shape", line.lineNo);
       }
-      result.push(parseScalar(first, childLines[0].lineNo));
-    } else if (mapItem) {
+      index = cursor;
+      continue;
+    }
+    if (!quotedScalar && MAP_ITEM.test(first)) {
       result.push(parseMapFromLines(childLines, itemIndent));
+    } else if (!quotedScalar && (first.includes(": ") || first.endsWith(":"))) {
+      // Real YAML reads "echo a: b" as a map; rather than guess, ask for quotes.
+      throw new YamlSubsetError(
+        `list item ${JSON.stringify(first)} contains ": "; quote it (- ${JSON.stringify(first)}) or write it as key: value`,
+        line.lineNo,
+      );
     } else {
-      throw new YamlSubsetError("unsupported list item shape", line.lineNo);
+      result.push(parseScalar(first, childLines[0].lineNo));
     }
     index = cursor;
   }

package/src/v2/presets/policies/ui-render-gate.yaml

@@ -1,4 +1,4 @@
-# Invariant 22 (v1 lessons #3, machine form): a UI delivery's spec approval
+# Invariant 22 (lessons.md「静态稿拍板 → 返工螺旋」, machine form): a UI delivery's spec approval
 # subject must include renderable proof — a screenshot with a digest —
 # before a human may stamp it. Static prose is not an approvable design.
 kind: policy

package/src/v2/runtime/decisions.js

@@ -2,7 +2,7 @@
 // An approval is recorded only after re-reading the workspace and confirming
 // the subject is still exactly what the request showed — if the candidate
 // moved or the tree is dirty, the request is refreshed instead of stamped
-// (lessons #18: no rubber-stamping a moved target). Every decision lands both
+// (lessons.md「读过期 race」: no rubber-stamping a moved target). Every decision lands both
 // as a DECISION_RECORDED event and as a line in the Git plane
 // (delivery/work/<work>/decisions.jsonl).
 

package/src/v2/runtime/gc.js

@@ -19,7 +19,14 @@ import { join } from "node:path";
 import { execFileSync } from "node:child_process";
 
 import { EventLedger } from "../storage/event-ledger.js";
-import { describeLockOwner, inspectLock, readback, reclaimStaleLock } from "../workspace/workspace-manager.js";
+import {
+  describeLockOwner,
+  inspectLock,
+  isRunLockName,
+  readback,
+  reclaimStaleLock,
+  withRepoGitLock,
+} from "../workspace/workspace-manager.js";
 import { resolveRepoRef } from "./repo-ref.js";
 
 function git(cwd, args) {
@@ -65,18 +72,25 @@ export function planGc(repoRoot) {
   const runsDir = join(repoRoot, ".buildbeat", "runtime", "runs");
   const locksDir = join(repoRoot, ".buildbeat", "runtime", "locks");
   const rows = [];
-  // The repository-wide lock belongs to no run: reclaimable only when its
-  // owner process is provably gone (same host, pid no longer exists).
-  const activeLock = join(locksDir, "active-run.lock");
-  if (existsSync(activeLock)) {
-    const seen = inspectLock(activeLock);
-    const row = { run: "(repository)", status: "active-run lock", actions: [], keep: [] };
+  // Locks that belong to no single run (active-run, and the @work /
+  // @parallel / @repo-git locks): reclaimable only when their owner process
+  // is provably gone (same host, pid no longer exists).
+  const sharedLocks = existsSync(locksDir)
+    ? readdirSync(locksDir)
+        .filter((entry) => entry.endsWith(".lock") && !isRunLockName(entry.slice(0, -".lock".length)))
+        .sort()
+    : [];
+  for (const entry of sharedLocks) {
+    const name = entry.slice(0, -".lock".length);
+    const lockPath = join(locksDir, entry);
+    const seen = inspectLock(lockPath);
+    const row = { run: "(repository)", status: `${name} lock`, actions: [], keep: [] };
     if (seen.state === "dead") {
-      row.actions.push({ kind: "remove-lock", path: activeLock, owner: seen.owner });
+      row.actions.push({ kind: "remove-lock", path: lockPath, owner: seen.owner });
     } else if (seen.state === "unknown") {
-      row.keep.push("active-run lock has no owner record (older buildbeat?); remove it by hand once no buildbeat process is running");
+      row.keep.push(`${name} lock has no owner record (older buildbeat?); remove it by hand once no buildbeat process is running`);
     } else {
-      row.keep.push(`active-run lock held by ${describeLockOwner(seen.owner)}${seen.state === "foreign-host" ? " (another host)" : " (still running)"}`);
+      row.keep.push(`${name} lock held by ${describeLockOwner(seen.owner)}${seen.state === "foreign-host" ? " (another host)" : " (still running)"}`);
     }
     rows.push(row);
   }
@@ -178,24 +192,26 @@ export function applyGc(repoRoot, rows, { force = false } = {}) {
             result.error = "worktree dirty; rerun with --force true to discard";
             continue;
           }
-          if (action.registered) {
-            const args = ["worktree", "remove"];
-            if (force || action.dirty) {
-              args.push("--force");
+          withRepoGitLock(repoRoot, () => {
+            if (action.registered) {
+              const args = ["worktree", "remove"];
+              if (force || action.dirty) {
+                args.push("--force");
+              }
+              args.push(action.path);
+              git(repoRoot, args);
+            } else if (action.present) {
+              rmSync(action.path, { recursive: true, force: true });
             }
-            args.push(action.path);
-            git(repoRoot, args);
-          } else if (action.present) {
-            rmSync(action.path, { recursive: true, force: true });
-          }
-          try {
-            git(repoRoot, ["worktree", "prune"]);
-          } catch {
-            // prune is best-effort
-          }
+            try {
+              git(repoRoot, ["worktree", "prune"]);
+            } catch {
+              // prune is best-effort
+            }
+          });
           result.done = true;
         } else if (action.kind === "delete-branch") {
-          git(repoRoot, ["branch", "-D", action.branch]);
+          withRepoGitLock(repoRoot, () => git(repoRoot, ["branch", "-D", action.branch]));
           result.done = true;
         }
       } catch (error) {

package/src/v2/runtime/metrics.js

@@ -1,6 +1,7 @@
 // buildbeat metrics v0: local, read-only, derived entirely from run ledgers.
-// No collection, no upload (V2-PLAN §6 / lessons #8: without numbers you are
-// forever doing precise work on the wrong thing).
+// No collection, no upload (V2-PLAN §6; lessons.md「流程只管"怎么做对",不管
+// "做的是不是对的事"」: without numbers you are forever doing precise work on
+// the wrong thing).
 
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";