pi-straw-boss 0.56.1 → 0.57.1

package/README.md

@@ -206,6 +206,15 @@ The plugin starts reaping as soon as it is installed or linked, with no trial ru
 Run `bash herdr-reaper/run.sh reaper.mjs dry-run` first to see what it would do, and pin the workspaces you want to keep (the pin action works once the plugin is linked, and a `config.json` with `only_under` can be put in the plugin's config directory before that).
 [How it works](docs/how-it-works.md#worktree-reaper) has the rules and the limits.
 
+## Process hygiene
+
+Every pi loads a small extension that marks its environment, so what a worker's bash starts carries the worker's id even when `timeout` or `setsid` moved it to a process group of its own.
+A pi-herdr-agents worker registers with the sb server; when the worker quits or its pane closes, the server stops what it left (SIGTERM, then SIGKILL after 10 s, each step checked by pid and start time) and logs one `procs-reaped` line.
+`worktree_remove` and a bash `git worktree remove` are refused while a process works in the checkout, with the pid, program name, CPU and age of each holder and the command that reaps them: `node dist/server/cli.mjs procs reap --checkout <path>`.
+`cli.mjs procs` lists the workers the server knows.
+Heavy-command slots, Linux cgroups and a runaway-process watchdog are planned for a later release.
+[How it works](docs/how-it-works.md#process-hygiene-and-slots) has the rules and the limits.
+
 ## Learn more
 
 [How it works](docs/how-it-works.md) covers roles, the tower, the dashboard, the browser view, what the extension writes, and how Claude Code or Codex sessions join the net.

package/README.zh-TW.md

@@ -202,6 +202,15 @@ plugin 一安裝或連結就開始清理，沒有試跑，也不會先問：第
 請先執行 `bash herdr-reaper/run.sh reaper.mjs dry-run` 看它會做什麼，並釘選想保留的工作區（plugin 連結後 `pin` 動作才能用；也可以在連結之前，先在 plugin 的設定目錄放一個帶 `only_under` 的 `config.json`）。
 [運作方式](docs/how-it-works.md#worktree-reaper)（英文）有規則和限制。
 
+## 行程清理
+
+每個 pi 都會載入一個小擴充，在環境變數裡留下標記，所以 worker 的 bash 啟動的東西，就算被 `timeout` 或 `setsid` 搬到自己的行程群組，仍帶著 worker 的 id。
+pi-herdr-agents 的 worker 會向 sb 伺服器登記；worker 結束或它的 pane 關掉時，伺服器收掉它留下的行程（先 SIGTERM，10 秒後 SIGKILL，每一步都用 pid 和啟動時間再確認），並記一行 `procs-reaped`。
+`worktree_remove` 和 bash 的 `git worktree remove`，在還有行程以該 checkout 為工作目錄時會被擋下，並列出每個行程的 pid、程式名稱、CPU 和存活時間，以及收掉它們的指令：`node dist/server/cli.mjs procs reap --checkout <path>`。
+`cli.mjs procs` 列出伺服器認得的 worker。
+重型指令的 slot、Linux cgroup 和失控行程的看門狗留待下一版。
+規則與限制見[運作方式](docs/how-it-works.md#process-hygiene-and-slots)。
+
 ## 延伸閱讀
 
 [運作方式](docs/how-it-works.md)（英文）說明角色、塔台、儀表板、瀏覽器畫面、這個擴充套件會寫入什麼，以及 Claude Code 或 Codex 的 session 怎麼加入網。

package/dist/server/{chunk-SEBJ5DZT.mjs → chunk-LJ3SPNF5.mjs}

@@ -2973,7 +2973,7 @@ var spawnDetached = (spec) => {
   return { pid: child.pid, exited: new Promise((resolve2) => (child.once("exit", (code) => resolve2(code)), child.once("error", () => resolve2(-1)))) };
 };
 var isIdentity = (key) => IDENTITY.test(key);
-var IDENTITY = /^(PI_INTERCOM_SESSION_ID|PI_INTERCOM_STABLE_ID|PI_SUBAGENT_.*|STRAW_BOSS_ROLE|HERDR_PANE_ID|HERDR_TAB_ID|HERDR_WORKSPACE_ID)$/;
+var IDENTITY = /^(PI_INTERCOM_SESSION_ID|PI_INTERCOM_STABLE_ID|PI_SUBAGENT_.*|STRAW_BOSS_ROLE|STRAW_BOSS_OWNER|HERDR_PANE_ID|HERDR_TAB_ID|HERDR_WORKSPACE_ID)$/;
 var serverEnv = (env) => Object.fromEntries(Object.entries(env).filter(([key]) => !isIdentity(key)));
 function intercomOf(env, platform = process.platform) {
   const scope = env.PI_INTERCOM_SCOPE_ID?.trim(), tcp = env.PI_INTERCOM_TCP?.trim(), transport = env.PI_INTERCOM_TRANSPORT?.trim().toLowerCase();
@@ -3715,7 +3715,10 @@ export {
   tailLog,
   logSize,
   readFrom2 as readFrom,
+  TEST_ROOT,
   inTestRun,
+  inside,
+  refuse,
   AFTER,
   PROTOCOL,
   newSecret,

package/dist/server/cli.mjs

@@ -48,7 +48,7 @@ import {
   within,
   workspaces,
   writeJson
-} from "./chunk-SEBJ5DZT.mjs";
+} from "./chunk-LJ3SPNF5.mjs";
 
 // src/server/cli.ts
 import { existsSync, realpathSync as realpathSync2 } from "node:fs";
@@ -154,6 +154,34 @@ function onFatal(leave, world = {}) {
   proc.on("unhandledRejection", fatal);
 }
 
+// src/server/procscli.ts
+import { resolve as resolve2 } from "node:path";
+async function runProcs(ctx, flags, { out, err }) {
+  const record = await trusted(ctx);
+  if (!record || !ctx.alive(record.pid)) {
+    err("no sb server is running, so there is no owner registry to ask\n");
+    return 1;
+  }
+  const request = flags.sub === "reap" ? { cmd: "procs-reap", ...flags.owner !== void 0 ? { owner: String(flags.owner) } : { checkout: resolve2(String(flags.checkout)) } } : { cmd: "procs-list" };
+  let reply;
+  try {
+    reply = (await callControl(record.socket, record.secret, request, 6e4)).reply;
+  } catch (error) {
+    err(error instanceof ControlError && error.sent ? `the server took the request but did not answer in time (${error.message}); it may still be running: check with \`procs\` before asking again
+` : `the server did not take the request: ${error.message}
+`);
+    return 1;
+  }
+  if (!reply?.ok) {
+    err(`${String(reply?.error ?? "no answer")}
+`);
+    return 1;
+  }
+  const { ok: _ok, ...rest } = reply;
+  out(rest);
+  return Array.isArray(rest.left) && rest.left.length > 0 ? 1 : 0;
+}
+
 // src/towerprompt/messages.ts
 function localeOf(env) {
   const set = env.LC_ALL || env.LC_MESSAGES || env.LANG || systemLanguage();
@@ -307,7 +335,7 @@ async function runPrompt(o) {
   let chunks = 0, lineChunk = 0, lastDataAt = -Infinity;
   const pasteCapMs = o.pasteCapMs ?? PASTE_CAP_MS;
   let finish;
-  const done = new Promise((resolve2) => finish = resolve2);
+  const done = new Promise((resolve3) => finish = resolve3);
   const say = (line, again = true) => {
     if (terminal) {
       cursorTo(o.output, 0);
@@ -568,6 +596,8 @@ var USAGE = `usage: cli.mjs up [--dir FOLDER --label NAME] [--timeout SECONDS] [
        cli.mjs stop | status
        cli.mjs restart [--reason TEXT] [--by TEXT] [--downgrade]
        cli.mjs logs [--lines N] [--follow]
+       cli.mjs procs [list]
+       cli.mjs procs reap (--owner ID | --checkout PATH)   (kill what an ended worker left; refused while a live worker works in the checkout)
        cli.mjs prompt --workspace ID [--state-dir DIR]   (the tower prompt of a standing pane: the server types it)`;
 var UsageError = class extends Error {
 };
@@ -579,6 +609,7 @@ var FLAGS = {
   restart: { value: ["reason", "by"], switch: ["downgrade"] },
   logs: { value: ["lines"], switch: ["follow"] },
   prompt: { value: ["workspace", "state-dir"], switch: [] },
+  procs: { value: ["owner", "checkout"], switch: [] },
   run: { value: ["by", "detach", "detach-reason", "acl-token"], switch: ["detached"] }
 };
 function parseArgs(argv) {
@@ -588,6 +619,12 @@ function parseArgs(argv) {
   if (!allowed) throw new UsageError(`unknown command ${command}
 ${USAGE}`);
   const flags = {};
+  if (command === "procs") {
+    const sub = rest[0] !== void 0 && !rest[0].startsWith("--") ? rest.shift() : "list";
+    if (sub !== "list" && sub !== "reap") throw new UsageError(`unknown procs command ${sub}
+${USAGE}`);
+    flags.sub = sub;
+  }
   for (let i = 0; i < rest.length; i++) {
     const flag = rest[i].replace(/^--/, "");
     if (!rest[i].startsWith("--")) throw new UsageError(`unexpected argument ${rest[i]}
@@ -602,6 +639,8 @@ ${USAGE}`);
   if (flags.dir === void 0 !== (flags.label === void 0)) throw new UsageError(`--dir and --label go together: the desk steps need both
 ${USAGE}`);
   if (flags.dir !== void 0 && (!String(flags.dir).trim() || !String(flags.label).trim())) throw new UsageError("--dir and --label are not empty");
+  if (command === "procs" && (flags.sub === "reap" ? flags.owner === void 0 === (flags.checkout === void 0) : flags.owner !== void 0 || flags.checkout !== void 0)) throw new UsageError(`procs reap needs --owner or --checkout, one of them; list takes neither
+${USAGE}`);
   if (flags.timeout !== void 0 && !(Number(flags.timeout) > 0)) throw new UsageError("--timeout is a number of seconds");
   if (flags.lines !== void 0 && !(Number.isInteger(Number(flags.lines)) && Number(flags.lines) > 0)) throw new UsageError("--lines is a positive whole number");
   return { command, flags };
@@ -676,6 +715,8 @@ ${USAGE}
         return await runDetached();
       case "prompt":
         return await promptCommand();
+      case "procs":
+        return await runProcs(ctx, flags, { out: json, err });
     }
   } catch (error) {
     if (error instanceof ServerError) return fail(error);
@@ -966,7 +1007,7 @@ if (process.argv[1] && realpath(selfPath()) === realpath(process.argv[1])) {
   setInterval(() => {
   }, 2 ** 30);
   const code = await run(process.argv.slice(2));
-  await new Promise((resolve2) => process.stdout.write("", () => resolve2()));
+  await new Promise((resolve3) => process.stdout.write("", () => resolve3()));
   process.exit(code);
 }
 export {