fix(test): isolate containment fixtures from the Ubuntu runner pid

Why:
- GitHub Node tests on 7c9a093 failed in broker-core, not at the
  30-minute cap. Test 159 expected an active-containment-requester
  skip for fixture pid 2500. After public-surface the Ubuntu
  test-runner pid can be 2500, so containment records
  current-broker-process first.

Changed:
- Process controllers may inject currentPid. Fixtures use a synthetic
  pid so hardcoded process tables cannot match the runner.
- The command-group requester test uses the live runner pid as the
  requester so that collision cannot pass vacuously.
- Add coverage for the current-broker-process skip.

Verification:
- npm run agent:verify -- --profile spec-only --paths CHANGELOG.md --paths broker-core/containment.mjs --paths broker-core/test/broker-core.test.mjs --paths spec/build-and-test.md --session-dir task-sessions/ubuntu-ci-pid-collision
- npm run agent:verify -- --profile implementation --paths CHANGELOG.md --paths broker-core/containment.mjs --paths broker-core/test/broker-core.test.mjs --paths spec/build-and-test.md --session-dir task-sessions/ubuntu-ci-pid-collision

Affected:
- CHANGELOG.md
- broker-core/containment.mjs
- broker-core/test/broker-core.test.mjs
- spec/build-and-test.md

Refs:
- #19
- https://github.com/fiveonecode/simulator-broker/actions/runs/32717787296

Session:
- task-sessions/ubuntu-ci-pid-collision

Author: VladimirBrejcha

CHANGELOG.md

@@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   adapter, client tests run with `--test-concurrency=1` on Ubuntu CI, and
   `service start` stops waiting when spawned `brokerd` exits even if a
   startup lock directory remains.
+- Broker-core process fixtures inject a synthetic controller pid so Ubuntu
+  CI cannot classify a fixture requester as `current-broker-process` when
+  the test-runner pid lands on a hardcoded fixture pid such as `2500`.
 - New project scaffolds require an iPhone for UI purposes without pinning an
   iOS version unless `--ios-version` is explicit.
 - Homebrew CLI and app metadata now require macOS 14 Sonoma, matching the app

broker-core/containment.mjs

@@ -960,6 +960,14 @@ function defaultProcessController() {
   };
 }
 
+function currentBrokerPid(processController) {
+  const injected = processController?.currentPid;
+  if (Number.isInteger(injected) && injected > 0) {
+    return injected;
+  }
+  return process.pid;
+}
+
 function killPid(processController, pid, signal) {
   if (typeof processController.killPid === "function") {
     return processController.killPid(pid, signal);
@@ -1004,6 +1012,7 @@ function terminateOwnedProcesses({
   const actions = [];
   const ownedByPid = new Map(discovery.owned.map((processRecord) => [processRecord.pid, processRecord]));
   const ownerPid = discovery.owned.find((processRecord) => processRecord.reasons.includes("owner-pid"))?.pid ?? null;
+  const brokerPid = currentBrokerPid(processController);
   const skippedRequesterPid = normalizePositiveInteger(requesterPid);
   const requesterInCommandGroup = Boolean(
     skippedRequesterPid
@@ -1039,7 +1048,7 @@ function terminateOwnedProcesses({
     .map((processRecord) => processRecord.pid);
 
   for (const pid of sortedPids) {
-    if (pid === process.pid) {
+    if (pid === brokerPid) {
       actions.push({
         ok: true,
         pid,
@@ -1095,7 +1104,7 @@ function terminateOwnedProcesses({
   }
 
   for (const pid of sortedPids) {
-    if (pid === process.pid || pid === skippedRequesterPid || (pid === ownerPid && !killOwner)) {
+    if (pid === brokerPid || pid === skippedRequesterPid || (pid === ownerPid && !killOwner)) {
       continue;
     }
     if (revalidatedOwnedPids && revalidatedOwnedPids.has(pid) === false) {

broker-core/test/broker-core.test.mjs

@@ -236,6 +236,17 @@ function readCapacityTransactions(resolvedPaths) {
     .map((entry) => readJson(path.join(resolvedPaths.capacityTransactionsDir, entry)));
 }
 
+const FIXTURE_CONTROLLER_PID = 2_147_483_646;
+
+function unusedFixturePid(preferred, taken = []) {
+  const blocked = new Set([process.pid, ...taken]);
+  let pid = preferred;
+  while (blocked.has(pid) || pid <= 1) {
+    pid += 1;
+  }
+  return pid;
+}
+
 function makeProcessFixture(records) {
   const table = records.map((record) => ({
     alive: true,
@@ -252,6 +263,7 @@ function makeProcessFixture(records) {
   return {
     actions,
     controller: {
+      currentPid: FIXTURE_CONTROLLER_PID,
       killPid(pid, signal) {
         actions.push({ pid, signal, target: "pid" });
         const record = table.find((candidate) => candidate.pid === pid);
@@ -6670,15 +6682,70 @@ test("forced-abort skips the active containment requester pid", () => {
 });
 
 test("forced-abort avoids command process-group termination when the requester is inside that group", () => {
+  const paths = makePaths();
+  writeBaseHostConfig(paths.hostConfigPath);
+  writeBaseProject(paths.projectFilePath);
+  const resolvedPaths = brokerPaths(paths);
+  const ownerPid = unusedFixturePid(1000);
+  const commandPid = unusedFixturePid(2000, [ownerPid]);
+  const requesterPid = process.pid;
+  const processes = makeProcessFixture([
+    { command: "bash", pgid: ownerPid, pid: ownerPid, ppid: 1, rssBytes: 2 * 1024 * 1024 },
+    { command: "xcodebuild test SIM-UI-1", pgid: commandPid, pid: commandPid, ppid: ownerPid, rssBytes: 40 * 1024 * 1024 },
+    { command: "node client/bin/simbroker.mjs lease contain", pgid: commandPid, pid: requesterPid, ppid: commandPid, rssBytes: 5 * 1024 * 1024 },
+  ]);
+
+  initBroker(resolvedPaths, runtimeOptions(paths, { processExists: () => true }));
+  const lease = acquireLeaseBroker(resolvedPaths, {
+    actorId: "agent-cleanup",
+    actorType: "agent",
+    ownerPgid: ownerPid,
+    ownerPid,
+    processExists: (pid) => pid === ownerPid,
+    processSampler: liveProcessSampler({ command: "with-broker-lease", pgid: ownerPid, pid: ownerPid }),
+    purposeId: "agent-ui-session",
+    simctlAdapter: paths.simctl.adapter,
+  }).lease;
+  registerLeaseProcessBroker(resolvedPaths, {
+    command: "xcodebuild test",
+    commandPgid: commandPid,
+    commandPid,
+    leaseId: lease.leaseId,
+    processExists: (pid) => pid === ownerPid,
+    processSampler: processes.sampler,
+    simctlAdapter: paths.simctl.adapter,
+  });
+
+  const result = containLeaseBroker(resolvedPaths, {
+    leaseId: lease.leaseId,
+    processController: processes.controller,
+    processExists: (pid) => pid === ownerPid,
+    processSampler: processes.sampler,
+    reason: "forced-abort",
+    requesterPid,
+    simctlAdapter: paths.simctl.adapter,
+    termWaitMs: 0,
+  });
+
+  assert.equal(result.contained, true);
+  assert.equal(processes.controller.currentPid, FIXTURE_CONTROLLER_PID);
+  assert.notEqual(processes.controller.currentPid, requesterPid);
+  assert.equal(processes.isAlive(requesterPid), true);
+  assert.equal(processes.isAlive(commandPid), false);
+  assert.equal(result.cleanupActions.some((action) => action.target === "process-group" && action.pgid === commandPid), false);
+  assert.ok(result.cleanupActions.some((action) => action.pid === requesterPid && action.skipped === true && action.why === "active-containment-requester"));
+});
+
+test("forced-abort records current-broker-process when the controller pid is lease-owned", () => {
   const paths = makePaths();
   writeBaseHostConfig(paths.hostConfigPath);
   writeBaseProject(paths.projectFilePath);
   const resolvedPaths = brokerPaths(paths);
   const processes = makeProcessFixture([
     { command: "bash", pgid: 1000, pid: 1000, ppid: 1, rssBytes: 2 * 1024 * 1024 },
-    { command: "xcodebuild test SIM-UI-1", pgid: 2000, pid: 2000, ppid: 1000, rssBytes: 40 * 1024 * 1024 },
-    { command: "node client/bin/simbroker.mjs lease contain", pgid: 2000, pid: 2500, ppid: 2000, rssBytes: 5 * 1024 * 1024 },
+    { command: "xcodebuild test SIM-UI-1", pgid: 1000, pid: 2000, ppid: 1000, rssBytes: 40 * 1024 * 1024 },
   ]);
+  processes.controller.currentPid = 2000;
 
   initBroker(resolvedPaths, runtimeOptions(paths, { processExists: () => true }));
   const lease = acquireLeaseBroker(resolvedPaths, {
@@ -6693,7 +6760,6 @@ test("forced-abort avoids command process-group termination when the requester i
   }).lease;
   registerLeaseProcessBroker(resolvedPaths, {
     command: "xcodebuild test",
-    commandPgid: 2000,
     commandPid: 2000,
     leaseId: lease.leaseId,
     processExists: (pid) => pid === 1000,
@@ -6707,16 +6773,13 @@ test("forced-abort avoids command process-group termination when the requester i
     processExists: (pid) => pid === 1000,
     processSampler: processes.sampler,
     reason: "forced-abort",
-    requesterPid: 2500,
     simctlAdapter: paths.simctl.adapter,
     termWaitMs: 0,
   });
 
   assert.equal(result.contained, true);
-  assert.equal(processes.isAlive(2500), true);
-  assert.equal(processes.isAlive(2000), false);
-  assert.equal(result.cleanupActions.some((action) => action.target === "process-group" && action.pgid === 2000), false);
-  assert.ok(result.cleanupActions.some((action) => action.pid === 2500 && action.skipped === true && action.why === "active-containment-requester"));
+  assert.equal(processes.isAlive(2000), true);
+  assert.ok(result.cleanupActions.some((action) => action.pid === 2000 && action.skipped === true && action.why === "current-broker-process"));
 });
 
 test("forced-abort does not group-kill when the owner process group is unknown", () => {

spec/build-and-test.md

@@ -76,7 +76,10 @@ A first extracted implementation slice now exists:
   checkout must not spawn one `git cat-file` per file. `simbroker service
   start` must fail as soon as the spawned `brokerd` exits without becoming
   ready; it must not keep polling for `serviceStartupTimeoutMs` just because
-  the startup lock directory still exists.
+  the startup lock directory still exists. Broker-core process-table
+  fixtures inject `processController.currentPid` so hardcoded fixture
+  PIDs cannot match the GitHub Actions test-runner pid. Containment still
+  skips the live `process.pid` when `currentPid` is omitted.
 - tagged versions such as `v0.1.0-alpha.2` attach the CLI tarball, the
   packable `simbroker-<version>.tgz`, and the notarized
   `Simulator-Broker-<version>.zip` to a GitHub Release. The CLI and npm