@tekmidian/pai 0.38.0 → 0.39.1

package/dist/hooks/worker-status-line.mjs

@@ -150,16 +150,25 @@ var DEFAULT_ROUTING2 = {
   cooldownMinutes: 30,
   retryOnQuota: true
 };
+var DEFAULT_TREE = {
+  maxDepth: 2,
+  maxChildren: 4
+};
+var DEFAULT_MCP_SETS = {
+  desktop: ["clickr"]
+};
 function defaultWorkersConfig() {
   return {
     enabled: false,
     active: null,
     providers: {},
     classes: {},
-    mcpSets: {},
+    mcpSets: { ...DEFAULT_MCP_SETS },
     pane: { ...DEFAULT_PANE },
     logDir: DEFAULT_LOG_DIR,
-    routing: { ...DEFAULT_ROUTING2, order: [] }
+    routing: { ...DEFAULT_ROUTING2, order: [] },
+    tree: { ...DEFAULT_TREE },
+    fallback: null
   };
 }
 var WorkersConfigError = class extends Error {
@@ -330,7 +339,7 @@ function parseWorkersConfig(raw) {
       }
     }
   }
-  const mcpSets = {};
+  const mcpSets = { ...DEFAULT_MCP_SETS };
   if (w.mcpSets !== void 0) {
     if (typeof w.mcpSets !== "object" || w.mcpSets === null || Array.isArray(w.mcpSets)) {
       bad(".mcpSets", "must be an object of set name \u2192 [server names]");
@@ -381,9 +390,63 @@ function parseWorkersConfig(raw) {
       retryOnQuota: r.retryOnQuota === void 0 ? DEFAULT_ROUTING2.retryOnQuota : r.retryOnQuota === true
     };
   }
+  let tree = { ...DEFAULT_TREE };
+  if (w.tree !== void 0) {
+    if (typeof w.tree !== "object" || w.tree === null || Array.isArray(w.tree)) {
+      bad(".tree", "must be an object");
+    }
+    const t = w.tree;
+    if (t.maxDepth !== void 0) {
+      if (typeof t.maxDepth !== "number" || !Number.isInteger(t.maxDepth) || t.maxDepth < 0) {
+        bad(".tree.maxDepth", "must be a non-negative integer");
+      }
+    }
+    if (t.maxChildren !== void 0) {
+      if (typeof t.maxChildren !== "number" || !Number.isInteger(t.maxChildren) || t.maxChildren < 1) {
+        bad(".tree.maxChildren", "must be a positive integer");
+      }
+    }
+    tree = {
+      maxDepth: t.maxDepth === void 0 ? DEFAULT_TREE.maxDepth : t.maxDepth,
+      maxChildren: t.maxChildren === void 0 ? DEFAULT_TREE.maxChildren : t.maxChildren
+    };
+  }
   const active = w.active === void 0 || w.active === null ? null : str(w.active);
   if (active !== null && active !== "auto" && !(active in providers)) {
   }
+  let fallback = null;
+  if (w.fallback !== void 0 && w.fallback !== null) {
+    if (typeof w.fallback !== "object" || Array.isArray(w.fallback)) {
+      bad(".fallback", "must be an object (written by `pai worker fallback on`)");
+    }
+    const f = w.fallback;
+    const provider = str(f.provider);
+    if (!provider) bad(".fallback.provider", "is required");
+    const savedRaw = f.saved;
+    if (typeof savedRaw !== "object" || savedRaw === null || Array.isArray(savedRaw)) {
+      bad(".fallback.saved", "must be an object");
+    }
+    const s = savedRaw;
+    if (typeof s.env !== "object" || s.env === null || Array.isArray(s.env)) {
+      bad(".fallback.saved.env", "must be an object of env key \u2192 previous value or null");
+    }
+    const env = {};
+    for (const [k, v] of Object.entries(s.env)) {
+      env[k] = v === null || typeof v === "string" ? v : null;
+    }
+    if (s.model !== null && s.model !== void 0 && typeof s.model !== "string") {
+      bad(".fallback.saved.model", "must be a string or null");
+    }
+    fallback = {
+      provider,
+      saved: {
+        env,
+        model: typeof s.model === "string" ? s.model : null,
+        envExisted: s.envExisted === true
+      },
+      on: str(f.on) || (/* @__PURE__ */ new Date(0)).toISOString()
+    };
+  }
   return {
     enabled: w.enabled === void 0 ? d.enabled : w.enabled === true,
     active,
@@ -392,11 +455,13 @@ function parseWorkersConfig(raw) {
     mcpSets,
     pane,
     logDir: str(w.logDir) || d.logDir,
-    routing
+    routing,
+    tree,
+    fallback
   };
 }
-function readWorkersSection() {
-  const raw = readJsonStrict(CONFIG_FILE, "~/.config/pai/config.json");
+function readWorkersSection(path = CONFIG_FILE) {
+  const raw = readJsonStrict(path, "~/.config/pai/config.json");
   return { raw, workers: parseWorkersConfig(raw.workers) };
 }
 function expandHome(p) {
@@ -468,7 +533,44 @@ function workerInScope(worker, term2) {
   return tabKey(worker.term) === tabKey(term2) && tabKey(term2) !== "";
 }
 
+// src/workers/handoff.ts
+import { appendFileSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3 } from "node:fs";
+import { dirname, join as join5 } from "node:path";
+function inboxPath(logDir, id) {
+  return join5(logDir, `${id}.inbox.jsonl`);
+}
+function readInbox(logDir, id) {
+  const path = inboxPath(logDir, id);
+  if (!existsSync3(path)) return [];
+  const out = [];
+  for (const line of readFileSync3(path, "utf8").split("\n")) {
+    if (!line.trim()) continue;
+    try {
+      out.push(JSON.parse(line));
+    } catch {
+    }
+  }
+  return out;
+}
+
+// src/workers/tree.ts
+function workerDepth(statuses, id) {
+  const byId = new Map(statuses.map((s) => [s.id, s]));
+  let depth = 0;
+  let cur = byId.get(id);
+  const seen = /* @__PURE__ */ new Set([id]);
+  while (cur?.parent && !seen.has(cur.parent)) {
+    seen.add(cur.parent);
+    const next = byId.get(cur.parent);
+    if (!next) break;
+    depth += 1;
+    cur = next;
+  }
+  return depth;
+}
+
 // src/workers/report.ts
+var OPERATOR_MARK = "[operator]";
 var WORKER_CONTRACT_PROMPT = [
   "You are a headless implementation worker, run non-interactively by an orchestrating session.",
   "No narration, no timestamps, no greetings, no summaries of what you read; act, verify, then stop.",
@@ -476,7 +578,20 @@ var WORKER_CONTRACT_PROMPT = [
   '{"changed":[{"path":"\u2026","summary":"\u2026"}],"commands":["\u2026"],"checks":[{"name":"\u2026","ok":true,"detail":"\u2026"}],"open":["\u2026"],"notes":"one line"}',
   "changed: files you touched (path + one-line summary). commands: the commands that verify the work.",
   "checks: each with ok true/false and the evidence in detail. open: what you could not finish, if anything.",
-  "notes: one line, the headline a reviewer reads first."
+  "notes: one line, the headline a reviewer reads first.",
+  "",
+  `Operator messages: a user turn starting with ${OPERATOR_MARK} was typed by the operator while you`,
+  "run (the prompt of a resumed run is the operator's too). Answer it FIRST, in one or two plain lines \u2014",
+  "a question gets its answer, an instruction gets one line naming what will change \u2014 then continue the",
+  "task you were on.",
+  "",
+  "Sub-workers: you may start your own workers with `pai worker run --class <class> -p '<prompt>'`",
+  "(Bash tool). Your children run on their own provider and report back to you automatically when",
+  "they finish. Send a handoff UP instead of doing work yourself when a cheaper provider would",
+  "suffice, the task is out of your scope, or a decision is needed:",
+  '`pai worker handoff \'{"kind":"proposal","text":"\u2026","data":{\u2026}}\'` (kinds: proposal,',
+  "question, blocker; results are sent for you when you finish). Sibling workers are not a",
+  "coordination path \u2014 there is no sideways channel; everything goes up to your parent."
 ].join("\n");
 
 // src/workers/render.ts
@@ -504,9 +619,9 @@ function contextMeter(c, s, minPct = 0) {
   if (pct > 70) return c("yellow", label);
   return label;
 }
-function renderStatusLine(mine, now = /* @__PURE__ */ new Date(), c = makeColor(true)) {
+function renderStatusLine(mine, now = /* @__PURE__ */ new Date(), c = makeColor(true), all = mine, inbox = {}) {
   if (!mine.length) return "";
-  const running = mine.filter((s) => s.state === "running" && alive(s.pid));
+  const running = mine.filter((s) => s.state === "running" && alive(s.pid)).sort((a, b) => workerDepth(all, a.id) - workerDepth(all, b.id));
   const today = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
   const doneToday = mine.filter((s) => s.state !== "running" && s.started.startsWith(today));
   const ok = doneToday.filter((s) => s.state === "done").length;
@@ -516,7 +631,10 @@ function renderStatusLine(mine, now = /* @__PURE__ */ new Date(), c = makeColor(
   let head = `${providerTag} \u25B6${running.length}`;
   const parts = running.slice(0, 3).map((s) => {
     const meter = contextMeter(c, s, 60);
-    return `${s.id.slice(-4)} ${s.label.slice(0, 26)} ${ageOf(s.started, now)} \xB7 ${s.last.slice(0, 30)}` + (meter ? ` ${meter}` : "");
+    const depth = workerDepth(all, s.id);
+    const lead = depth > 0 ? "  ".repeat(depth - 1) + "\u21B3 " : "";
+    const box = inbox[s.id] ? ` \u25C6${inbox[s.id]}` : "";
+    return `${lead}${s.id.slice(-4)} ${s.label.slice(0, 26)} ${ageOf(s.started, now)} \xB7 ${s.last.slice(0, 30)}${box}` + (meter ? ` ${meter}` : "");
   });
   if (parts.length) head += "  " + parts.join(" | ");
   if (doneToday.length) head += `   \u2713${ok} \u2717${bad2} today`;
@@ -524,6 +642,14 @@ function renderStatusLine(mine, now = /* @__PURE__ */ new Date(), c = makeColor(
 }
 
 // src/workers/viewer.ts
+function inboxCounts(logDir, statuses) {
+  const out = {};
+  for (const s of statuses) {
+    const n = readInbox(logDir, s.id).length;
+    if (n) out[s.id] = n;
+  }
+  return out;
+}
 function statusLineOutput(logDir, term2, cwd2, now = /* @__PURE__ */ new Date()) {
   const statuses = loadStatuses(logDir);
   const mine = statuses.filter((s) => {
@@ -531,7 +657,7 @@ function statusLineOutput(logDir, term2, cwd2, now = /* @__PURE__ */ new Date())
     const sameDir = cwd2 && s.cwd.startsWith(cwd2);
     return sameScope || !term2 && sameDir;
   });
-  return renderStatusLine(mine, now);
+  return renderStatusLine(mine, now, makeColor(false), statuses, inboxCounts(logDir, mine));
 }
 
 // src/workers/standalone/status-line.ts