@pitboss/cli 0.4.8 → 0.4.10

package/dist/event-worker.js

@@ -59,7 +59,8 @@ var BASE_TASK_LOOP = (agentId, repoPath) => `You are an AI worker agent (ID: ${a
    a one-line status on the task thread naming what you are checking) when you begin, then
    run the tests, compare the diff against the spec the task names, then
    \`mcp__relai__submit_review\` \u2014 \`approve\`, or \`reject\` with a specific note the author
-   can act on. Do this even when get_my_tasks is empty.
+   can act on. When the task is a goal's build with a PR, pass \`headSha\`: the full sha of the
+   commit you reviewed. Do this even when get_my_tasks is empty.
    If the change touches a long-running service or a third-party runtime integration (SSE/event streams, launchd/systemd, auth headers, a client library), run the changed path once before approving and quote what it printed. A type cast past a library's own types is a reason to stop and run it.
 
 4. Call \`mcp__relai__get_my_tasks\` \u2014 if it returns no tasks, stop immediately.
@@ -301,7 +302,11 @@ Find the default branch with \`git remote show origin\`.
    \`specialization\` or \`domains\` only to values agents in \`mcp__relai__list_agents\` declare:
    the router never hands out a task whose tag no agent matches. When the repo has \`writer\` agents, set
    \`specialization: "writer"\` on build tasks, so they wait for a writer instead of going to a reviewer.
-   Never name a build task's assignee as the goal's reviewer; the API refuses it. Make them small
+   Before writing any build task, choose the goal's reviewer (for a \`reviewer_agent\` gate): a
+   \`reviewer\` agent, on a different \`workerType\` from the writers when one exists. Never assign that
+   agent a build task, and never leave the only reviewers busy building: a goal whose every reviewer
+   built part of it has nobody left to review it. The API defaults a build task with no
+   \`specialization\` to \`writer\` when the repo has writers. Make them small
    and independently testable so several agents can work at once. Use \`blockedBy\` only where
    one task truly needs another's result. Each description is self-contained: what to change,
    which files, how to test it, and the acceptance criteria.
@@ -444,6 +449,9 @@ var USAGE_NUMBER_KEYS = [
   "cache_read_input_tokens",
   "cache_creation_input_tokens"
 ];
+function notReportedUsage(reason) {
+  return { notReported: true, reason };
+}
 function finiteNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
@@ -511,14 +519,32 @@ async function getTaskStatus(conn, id, logPrefix) {
     return void 0;
   }
 }
-async function sessionTouchedTaskIds(conn, candidates, logPrefix) {
+async function listUpdatedSince(conn, since, logPrefix) {
+  try {
+    const res = await fetch(
+      `${conn.apiUrl}/tasks?repoId=${conn.repoId}&assignedTo=${conn.agentId}&updatedAfter=${encodeURIComponent(since)}`,
+      { headers: { Authorization: `Bearer ${conn.apiSecret}` } }
+    );
+    if (!res.ok) throw new Error(`task list failed (${res.status} ${res.statusText})`);
+    const { data } = await res.json();
+    return (data ?? []).filter((row) => typeof row.id === "string" && row.id.length > 0).filter((row) => row.status !== "assigned").map((row) => row.id);
+  } catch (err) {
+    console.error(
+      `${logPrefix} Could not list tasks updated since the session started:`,
+      err instanceof Error ? err.message : String(err)
+    );
+    return [];
+  }
+}
+async function sessionTouchedTaskIds(conn, candidates, logPrefix, since) {
   const touched = [];
   for (const id of candidates) {
     const status = await getTaskStatus(conn, id, logPrefix);
     if (status !== void 0 && status !== "assigned") touched.push(id);
   }
   const inProgressAtClose = await listSessionTaskIds(conn, logPrefix, "in_progress");
-  return unionTaskIds(touched, inProgressAtClose);
+  const updated = since ? await listUpdatedSince(conn, since, logPrefix) : [];
+  return unionTaskIds(touched, inProgressAtClose, updated);
 }
 function unionTaskIds(...lists) {
   const seen = /* @__PURE__ */ new Set();
@@ -532,34 +558,99 @@ function unionTaskIds(...lists) {
   }
   return out;
 }
-async function writeSessionUsage(conn, taskIds, usage, logPrefix) {
-  const sessionUsage = {
-    ...usage,
-    at: (/* @__PURE__ */ new Date()).toISOString(),
-    sessionTaskIds: [...taskIds]
-  };
+async function writeSessionUsage(conn, taskIds, usage, logPrefix, opts = {}) {
   const headers = { "Content-Type": "application/json", Authorization: `Bearer ${conn.apiSecret}` };
   for (const id of taskIds) {
+    const slice = taskIds.length > 1 && !usage.notReported ? opts.slices?.[id] : void 0;
+    const share = usage.notReported ? void 0 : slice || taskIds.length === 1 ? "task" : "session";
+    const body = {
+      usage: slice ?? usage,
+      sessionTaskIds: taskIds,
+      ...opts.model ? { model: opts.model } : {},
+      ...share ? { share } : {}
+    };
     try {
-      const put = await fetch(`${conn.apiUrl}/tasks/${id}`, {
-        method: "PUT",
+      const res = await fetch(`${conn.apiUrl}/tasks/${id}/usage-report`, {
+        method: "POST",
         headers,
-        body: JSON.stringify({ metadata: { sessionUsage } })
+        body: JSON.stringify(body)
       });
-      if (!put.ok) {
-        console.error(`${logPrefix} Could not write sessionUsage on ${id} (${put.status} ${put.statusText})`);
+      if (!res.ok) {
+        console.error(`${logPrefix} Could not report usage on ${id} (${res.status} ${res.statusText})`);
       }
     } catch (err) {
       console.error(
-        `${logPrefix} Could not write sessionUsage on ${id}:`,
+        `${logPrefix} Could not report usage on ${id}:`,
         err instanceof Error ? err.message : String(err)
       );
     }
   }
 }
-async function recordSessionUsage(conn, startIds, usage, logPrefix) {
+async function recordSessionUsage(conn, startIds, usage, logPrefix, opts = {}) {
   const start = await startIds;
-  await writeSessionUsage(conn, await sessionTouchedTaskIds(conn, start, logPrefix), usage, logPrefix);
+  const { since, ...rest } = opts;
+  await writeSessionUsage(conn, await sessionTouchedTaskIds(conn, start, logPrefix, since), usage, logPrefix, rest);
+}
+var BOUNDARY_STATUSES = /* @__PURE__ */ new Set(["completed", "blocked", "pending_verification"]);
+function addUsage(into, from) {
+  into.num_turns = (into.num_turns ?? 0) + (from.num_turns ?? 0);
+  const total = into.usage ?? {};
+  for (const key of USAGE_NUMBER_KEYS) {
+    const n = from.usage?.[key];
+    if (n !== void 0) total[key] = (total[key] ?? 0) + n;
+  }
+  into.usage = total;
+}
+function createUsageTracker() {
+  let model;
+  let pending = /* @__PURE__ */ new Map();
+  const slices = {};
+  let anon = 0;
+  function cut(taskId) {
+    const slice = slices[taskId] ?? {};
+    for (const messageUsage of pending.values()) addUsage(slice, messageUsage);
+    pending = /* @__PURE__ */ new Map();
+    if (slice.usage) slices[taskId] = slice;
+  }
+  return {
+    observe(event) {
+      if (event.type === "system" && event.subtype === "init") {
+        if (typeof event.model === "string" && event.model) model = event.model;
+        return;
+      }
+      if (event.type !== "assistant") return;
+      const message = event.message ?? {};
+      const raw = message.usage;
+      if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+        const usage = pickNumbers(raw, USAGE_NUMBER_KEYS);
+        if (Object.keys(usage).length > 0) {
+          pending.set(typeof message.id === "string" ? message.id : `anon_${anon++}`, { num_turns: 1, usage });
+        }
+      }
+      const content = Array.isArray(message.content) ? message.content : [];
+      for (const block of content) {
+        if (block.type !== "tool_use" || typeof block.name !== "string" || !block.name.endsWith("update_task_status")) continue;
+        const input = block.input ?? {};
+        if (typeof input.taskId === "string" && typeof input.status === "string" && BOUNDARY_STATUSES.has(input.status)) {
+          cut(input.taskId);
+        }
+      }
+    },
+    model: () => model,
+    opts: () => ({ ...model ? { model } : {}, slices })
+  };
+}
+
+// ../claude-worker/src/model.ts
+import { readFileSync } from "node:fs";
+function pinnedModel(env = process.env) {
+  const file = env.PITBOSS_MODEL_FILE;
+  if (!file) return void 0;
+  try {
+    return readFileSync(file, "utf-8").trim() || void 0;
+  } catch {
+    return void 0;
+  }
 }
 
 // ../claude-worker/src/session.ts
@@ -594,26 +685,36 @@ function writeMcpConfig(config2, prefix = "claude-worker") {
   writeFileSync(path, JSON.stringify(mcpConfig), { mode: 384 });
   return path;
 }
+function claudeArgs(opts) {
+  return [
+    "--print",
+    "--mcp-config",
+    opts.mcpConfigPath,
+    "--no-session-persistence",
+    "--dangerously-skip-permissions",
+    "--output-format",
+    "stream-json",
+    "--verbose",
+    "--model",
+    opts.model,
+    "--add-dir",
+    opts.repoPath,
+    ...opts.isolateUserConfig ? ["--setting-sources", "project,local"] : []
+  ];
+}
 async function runClaudeSession(config2) {
   const prompt = buildPrompt(config2);
   const mcpConfigPath = writeMcpConfig(config2);
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const taskIdsPromise = listSessionTaskIds(config2, "[claude-worker]");
   try {
     return await new Promise((resolve, reject) => {
-      const args = [
-        "--print",
-        "--mcp-config",
+      const args = claudeArgs({
         mcpConfigPath,
-        "--no-session-persistence",
-        "--dangerously-skip-permissions",
-        "--output-format",
-        "stream-json",
-        "--verbose",
-        "--model",
-        config2.model,
-        "--add-dir",
-        config2.repoPath
-      ];
+        model: pinnedModel() ?? config2.model,
+        repoPath: config2.repoPath,
+        isolateUserConfig: process.env.PITBOSS_ISOLATE_USER_CONFIG === "1"
+      });
       console.log(`[claude-worker] Spawning: ${config2.claudeBin} ${args.slice(0, 4).join(" ")} ...`);
       console.log(`[claude-worker] cwd: ${config2.repoPath}`);
       const { ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN, ...workerEnv } = process.env;
@@ -629,6 +730,8 @@ async function runClaudeSession(config2) {
       let buffer = "";
       let resultError = "";
       let sessionUsage;
+      let sawResult = false;
+      const tracker = createUsageTracker();
       proc.stdout.on("data", (chunk) => {
         buffer += chunk.toString();
         const lines = buffer.split("\n");
@@ -637,6 +740,7 @@ async function runClaudeSession(config2) {
           if (!line.trim()) continue;
           try {
             const event = JSON.parse(line);
+            tracker.observe(event);
             if (event.type === "assistant") {
               const content = event.message?.content ?? [];
               for (const block of content) {
@@ -650,6 +754,7 @@ async function runClaudeSession(config2) {
                 }
               }
             } else if (event.type === "result") {
+              sawResult = true;
               const parsed = parseResultUsage(event);
               if (parsed) sessionUsage = parsed;
               if (event.is_error) {
@@ -671,9 +776,9 @@ async function runClaudeSession(config2) {
       proc.on("close", (code, signal) => {
         const unique = [...new Set(toolsUsed)];
         console.log(`[claude-worker] Done \u2014 tools used: ${unique.length ? unique.join(", ") : "none"}`);
-        const usage = sessionUsage;
-        if (usage) console.log(formatSessionUsageLine("[claude-worker]", usage));
-        const finish = usage ? recordSessionUsage(config2, taskIdsPromise, usage, "[claude-worker]") : Promise.resolve();
+        const usage = sessionUsage ?? notReportedUsage(sawResult ? "adapter" : "killed");
+        if (sessionUsage) console.log(formatSessionUsageLine("[claude-worker]", sessionUsage));
+        const finish = recordSessionUsage(config2, taskIdsPromise, usage, "[claude-worker]", { since: startedAt, ...tracker.opts() });
         const settle = () => {
           if (signal || code !== 0 && code !== null) {
             const detail = (resultError || stderrOutput || "").trim();
@@ -731,8 +836,8 @@ function classifySessionError(text) {
 
 // ../claude-worker/src/adapters/cursor.ts
 var bin = () => process.env.CURSOR_BIN ?? "cursor-agent";
-function cursorArgs(repoPath, prompt) {
-  return ["-p", "--trust", "--force", "--output-format", "stream-json", "--workspace", repoPath, prompt];
+function cursorArgs(repoPath, prompt, model) {
+  return ["-p", "--trust", "--force", "--output-format", "stream-json", "--workspace", repoPath, ...model ? ["--model", model] : [], prompt];
 }
 function readCursorEvent(line) {
   let event;
@@ -741,6 +846,9 @@ function readCursorEvent(line) {
   } catch {
     return {};
   }
+  if (event.type === "system" && event.subtype === "init") {
+    return typeof event.model === "string" && event.model ? { model: event.model } : {};
+  }
   if (event.type === "tool_call" && event.subtype === "started") {
     const call = event.tool_call ?? {};
     const [kind] = Object.keys(call);
@@ -756,8 +864,9 @@ function readCursorEvent(line) {
   return {};
 }
 async function runCursorSession(config2) {
-  const args = cursorArgs(config2.repoPath, buildPrompt(config2));
+  const args = cursorArgs(config2.repoPath, buildPrompt(config2), pinnedModel());
   console.log(`[cursor-worker] Spawning: ${bin()} ${args.slice(0, 5).join(" ")} ...`);
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const taskIdsPromise = listSessionTaskIds(config2, "[cursor-worker]");
   return new Promise((resolve, reject) => {
     const proc = spawn2(bin(), args, { cwd: config2.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -767,12 +876,14 @@ async function runCursorSession(config2) {
     let resultError = "";
     let stderrOutput = "";
     let sessionUsage;
+    let model;
     proc.stdout.on("data", (chunk) => {
       buffer += chunk.toString();
       const lines = buffer.split("\n");
       buffer = lines.pop() ?? "";
       for (const line of lines) {
-        const { tool, error, usage } = readCursorEvent(line);
+        const { tool, error, usage, model: initModel } = readCursorEvent(line);
+        if (initModel) model = initModel;
         if (tool) {
           toolsUsed.push(tool);
           process.stdout.write(`  \u2699  ${tool}
@@ -790,9 +901,9 @@ async function runCursorSession(config2) {
     });
     proc.on("close", (code, signal) => {
       console.log(`[cursor-worker] Done \u2014 tools used: ${toolsUsed.length ? [...new Set(toolsUsed)].join(", ") : "none"}`);
-      const usage = sessionUsage;
-      if (usage) console.log(formatSessionUsageLine("[cursor-worker]", usage));
-      const finish = usage ? recordSessionUsage(config2, taskIdsPromise, usage, "[cursor-worker]") : Promise.resolve();
+      const usage = sessionUsage ?? notReportedUsage("killed");
+      if (sessionUsage) console.log(formatSessionUsageLine("[cursor-worker]", sessionUsage));
+      const finish = recordSessionUsage(config2, taskIdsPromise, usage, "[cursor-worker]", { since: startedAt, ...model ? { model } : {} });
       const settle = () => {
         if (signal || code !== 0 && code !== null) {
           const detail = (resultError || stderrOutput).trim();
@@ -837,10 +948,11 @@ import { unlinkSync as unlinkSync2 } from "fs";
 var bin2 = () => process.env.COPILOT_BIN ?? "copilot";
 var POLICY_BLOCKS = [/access denied by policy/i, /third-party mcp servers are disabled/i];
 var QUOTA = [/premium request/i, /monthly (?:limit|allowance|quota)/i];
-function copilotArgs(repoPath, prompt, mcpConfigPath) {
+function copilotArgs(repoPath, prompt, mcpConfigPath, model) {
   return [
     "-p",
     prompt,
+    ...model ? ["--model", model] : [],
     "--allow-all-tools",
     "--output-format",
     "json",
@@ -862,6 +974,7 @@ function readCopilotEvent(line) {
   const type = typeof event.type === "string" ? event.type : "";
   const data = event.data ?? {};
   const message = typeof data.message === "string" ? data.message : "";
+  if (type === "session.tools_updated" && typeof data.model === "string" && data.model) return { model: data.model };
   if (/^tool\..*start/.test(type) && typeof data.toolName === "string") return { tool: data.toolName };
   if (type === "session.error") return { error: message || "copilot session error" };
   if (type === "result" && typeof event.exitCode === "number" && event.exitCode !== 0) return { error: `copilot finished with exit code ${event.exitCode}` };
@@ -870,7 +983,9 @@ function readCopilotEvent(line) {
 }
 async function runCopilotSession(config2) {
   const mcpConfigPath = writeMcpConfig(config2, "copilot-worker");
-  const args = copilotArgs(config2.repoPath, buildPrompt(config2), mcpConfigPath);
+  const args = copilotArgs(config2.repoPath, buildPrompt(config2), mcpConfigPath, pinnedModel());
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const taskIdsPromise = listSessionTaskIds(config2, "[copilot-worker]");
   console.log(`[copilot-worker] Spawning: ${bin2()} -p <prompt> ${args.slice(2, 6).join(" ")} ...`);
   return new Promise((resolve, reject) => {
     const proc = spawn3(bin2(), args, { cwd: config2.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -879,12 +994,14 @@ async function runCopilotSession(config2) {
     let buffer = "";
     let sessionError = "";
     let stderrOutput = "";
+    let model;
     proc.stdout.on("data", (chunk) => {
       buffer += chunk.toString();
       const lines = buffer.split("\n");
       buffer = lines.pop() ?? "";
       for (const line of lines) {
-        const { tool, error } = readCopilotEvent(line);
+        const { tool, error, model: initModel } = readCopilotEvent(line);
+        if (initModel) model = initModel;
         if (tool) {
           toolsUsed.push(tool);
           process.stdout.write(`  \u2699  ${tool}
@@ -905,12 +1022,15 @@ async function runCopilotSession(config2) {
       } catch {
       }
       console.log(`[copilot-worker] Done \u2014 tools used: ${toolsUsed.length ? [...new Set(toolsUsed)].join(", ") : "none"}`);
-      if (sessionError || signal || code !== 0 && code !== null) {
-        const detail = (sessionError || stderrOutput).trim();
-        reject(new Error(`copilot exited with ${signal ?? `code ${code}`}${detail ? `: ${detail}` : ""}`));
-      } else {
-        resolve([...new Set(toolsUsed)]);
-      }
+      const settle = () => {
+        if (sessionError || signal || code !== 0 && code !== null) {
+          const detail = (sessionError || stderrOutput).trim();
+          reject(new Error(`copilot exited with ${signal ?? `code ${code}`}${detail ? `: ${detail}` : ""}`));
+        } else {
+          resolve([...new Set(toolsUsed)]);
+        }
+      };
+      recordSessionUsage(config2, taskIdsPromise, notReportedUsage("adapter"), "[copilot-worker]", { since: startedAt, ...model ? { model } : {} }).then(settle, settle);
     });
     proc.on("error", (err) => {
       try {
@@ -943,7 +1063,7 @@ var bin3 = () => process.env.CODEX_BIN ?? "codex";
 var codexHome = () => process.env.CODEX_HOME ?? join3(homedir(), ".codex");
 var QUOTA2 = [/usage limit/i, /rate limit reached for/i, /upgrade to (plus|pro)/i];
 var CREDENTIALS = [/not logged in/i, /codex login/i, /401 unauthorized/i];
-function codexArgs(repoPath, prompt, profile) {
+function codexArgs(repoPath, prompt, profile, model) {
   return [
     "exec",
     "--json",
@@ -954,6 +1074,7 @@ function codexArgs(repoPath, prompt, profile) {
     repoPath,
     "-p",
     profile,
+    ...model ? ["-m", model] : [],
     prompt
   ];
 }
@@ -1002,7 +1123,9 @@ async function runCodexSession(config2) {
     } catch {
     }
   };
-  const args = codexArgs(config2.repoPath, buildPrompt(config2), profile);
+  const args = codexArgs(config2.repoPath, buildPrompt(config2), profile, pinnedModel());
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const taskIdsPromise = listSessionTaskIds(config2, "[codex-worker]");
   console.log(`[codex-worker] Spawning: ${bin3()} ${args.slice(0, 6).join(" ")} ...`);
   return new Promise((resolve, reject) => {
     const proc = spawn4(bin3(), args, { cwd: config2.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -1034,12 +1157,15 @@ async function runCodexSession(config2) {
     proc.on("close", (code, signal) => {
       cleanup();
       console.log(`[codex-worker] Done \u2014 tools used: ${toolsUsed.length ? [...new Set(toolsUsed)].join(", ") : "none"}`);
-      if (sessionError || signal || code !== 0 && code !== null) {
-        const detail = (sessionError || stderrOutput).trim();
-        reject(new Error(`codex exited with ${signal ?? `code ${code}`}${detail ? `: ${detail}` : ""}`));
-      } else {
-        resolve([...new Set(toolsUsed)]);
-      }
+      const settle = () => {
+        if (sessionError || signal || code !== 0 && code !== null) {
+          const detail = (sessionError || stderrOutput).trim();
+          reject(new Error(`codex exited with ${signal ?? `code ${code}`}${detail ? `: ${detail}` : ""}`));
+        } else {
+          resolve([...new Set(toolsUsed)]);
+        }
+      };
+      recordSessionUsage(config2, taskIdsPromise, notReportedUsage("adapter"), "[codex-worker]", { since: startedAt }).then(settle, settle);
     });
     proc.on("error", (err) => {
       cleanup();
@@ -1287,6 +1413,10 @@ function loadConfig2() {
   };
 }
 
+// ../event-worker/src/worker.ts
+import { mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname2 } from "node:path";
+
 // ../../node_modules/.pnpm/eventsource-parser@3.0.7/node_modules/eventsource-parser/dist/index.js
 var ParseError = class extends Error {
   constructor(message, options) {
@@ -1847,7 +1977,16 @@ async function runEventWorker(config2) {
     }
     try {
       console.log("[event-worker] Event received \u2014 running session...");
-      await getAdapter(config2.runtime).runSession(config2);
+      const activityFile = process.env.PITBOSS_ACTIVITY_FILE;
+      if (activityFile) {
+        mkdirSync2(dirname2(activityFile), { recursive: true });
+        writeFileSync3(activityFile, String(Date.now()));
+      }
+      try {
+        await getAdapter(config2.runtime).runSession(config2);
+      } finally {
+        if (activityFile) rmSync(activityFile, { force: true });
+      }
       await clearUnavailable(config2, "[event-worker]");
     } catch (err) {
       const text = err instanceof Error ? err.message : String(err);