@pitboss/cli 0.4.9 → 0.4.10

package/dist/cli.js

@@ -21060,6 +21060,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;
 }
@@ -21127,14 +21130,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();
@@ -21148,34 +21169,87 @@ 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
@@ -21222,26 +21296,36 @@ function writeMcpConfig(config, prefix = "claude-worker") {
   writeFileSync6(path3, JSON.stringify(mcpConfig), { mode: 384 });
   return path3;
 }
+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(config) {
   const prompt = buildPrompt(config);
   const mcpConfigPath = writeMcpConfig(config);
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const taskIdsPromise = listSessionTaskIds(config, "[claude-worker]");
   try {
     return await new Promise((resolve9, reject) => {
-      const args = [
-        "--print",
-        "--mcp-config",
+      const args = claudeArgs({
         mcpConfigPath,
-        "--no-session-persistence",
-        "--dangerously-skip-permissions",
-        "--output-format",
-        "stream-json",
-        "--verbose",
-        "--model",
-        pinnedModel() ?? config.model,
-        "--add-dir",
-        config.repoPath
-      ];
+        model: pinnedModel() ?? config.model,
+        repoPath: config.repoPath,
+        isolateUserConfig: process.env.PITBOSS_ISOLATE_USER_CONFIG === "1"
+      });
       console.log(`[claude-worker] Spawning: ${config.claudeBin} ${args.slice(0, 4).join(" ")} ...`);
       console.log(`[claude-worker] cwd: ${config.repoPath}`);
       const { ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN, ...workerEnv } = process.env;
@@ -21257,6 +21341,8 @@ async function runClaudeSession(config) {
       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");
@@ -21265,6 +21351,7 @@ async function runClaudeSession(config) {
           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) {
@@ -21278,6 +21365,7 @@ async function runClaudeSession(config) {
                 }
               }
             } else if (event.type === "result") {
+              sawResult = true;
               const parsed = parseResultUsage(event);
               if (parsed) sessionUsage = parsed;
               if (event.is_error) {
@@ -21299,9 +21387,9 @@ async function runClaudeSession(config) {
       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(config, taskIdsPromise, usage, "[claude-worker]") : Promise.resolve();
+        const usage = sessionUsage ?? notReportedUsage(sawResult ? "adapter" : "killed");
+        if (sessionUsage) console.log(formatSessionUsageLine("[claude-worker]", sessionUsage));
+        const finish = recordSessionUsage(config, taskIdsPromise, usage, "[claude-worker]", { since: startedAt, ...tracker.opts() });
         const settle = () => {
           if (signal || code !== 0 && code !== null) {
             const detail = (resultError || stderrOutput || "").trim();
@@ -21369,6 +21457,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);
@@ -21386,6 +21477,7 @@ function readCursorEvent(line) {
 async function runCursorSession(config) {
   const args = cursorArgs(config.repoPath, buildPrompt(config), pinnedModel());
   console.log(`[cursor-worker] Spawning: ${bin()} ${args.slice(0, 5).join(" ")} ...`);
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const taskIdsPromise = listSessionTaskIds(config, "[cursor-worker]");
   return new Promise((resolve9, reject) => {
     const proc = spawn3(bin(), args, { cwd: config.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -21395,12 +21487,14 @@ async function runCursorSession(config) {
     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}
@@ -21418,9 +21512,9 @@ async function runCursorSession(config) {
     });
     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(config, taskIdsPromise, usage, "[cursor-worker]") : Promise.resolve();
+      const usage = sessionUsage ?? notReportedUsage("killed");
+      if (sessionUsage) console.log(formatSessionUsageLine("[cursor-worker]", sessionUsage));
+      const finish = recordSessionUsage(config, taskIdsPromise, usage, "[cursor-worker]", { since: startedAt, ...model ? { model } : {} });
       const settle = () => {
         if (signal || code !== 0 && code !== null) {
           const detail = (resultError || stderrOutput).trim();
@@ -21491,6 +21585,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}` };
@@ -21500,6 +21595,8 @@ function readCopilotEvent(line) {
 async function runCopilotSession(config) {
   const mcpConfigPath = writeMcpConfig(config, "copilot-worker");
   const args = copilotArgs(config.repoPath, buildPrompt(config), mcpConfigPath, pinnedModel());
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const taskIdsPromise = listSessionTaskIds(config, "[copilot-worker]");
   console.log(`[copilot-worker] Spawning: ${bin2()} -p <prompt> ${args.slice(2, 6).join(" ")} ...`);
   return new Promise((resolve9, reject) => {
     const proc = spawn4(bin2(), args, { cwd: config.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -21508,12 +21605,14 @@ async function runCopilotSession(config) {
     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}
@@ -21534,12 +21633,15 @@ async function runCopilotSession(config) {
       } 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 {
-        resolve9([...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 {
+          resolve9([...new Set(toolsUsed)]);
+        }
+      };
+      recordSessionUsage(config, taskIdsPromise, notReportedUsage("adapter"), "[copilot-worker]", { since: startedAt, ...model ? { model } : {} }).then(settle, settle);
     });
     proc.on("error", (err) => {
       try {
@@ -21633,6 +21735,8 @@ async function runCodexSession(config) {
     }
   };
   const args = codexArgs(config.repoPath, buildPrompt(config), profile, pinnedModel());
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const taskIdsPromise = listSessionTaskIds(config, "[codex-worker]");
   console.log(`[codex-worker] Spawning: ${bin3()} ${args.slice(0, 6).join(" ")} ...`);
   return new Promise((resolve9, reject) => {
     const proc = spawn5(bin3(), args, { cwd: config.repoPath, env: process.env, stdio: ["ignore", "pipe", "pipe"] });
@@ -21664,12 +21768,15 @@ async function runCodexSession(config) {
     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 {
-        resolve9([...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 {
+          resolve9([...new Set(toolsUsed)]);
+        }
+      };
+      recordSessionUsage(config, taskIdsPromise, notReportedUsage("adapter"), "[codex-worker]", { since: startedAt }).then(settle, settle);
     });
     proc.on("error", (err) => {
       cleanup();
@@ -21781,7 +21888,8 @@ function poolMembers(pool) {
       worktree: join16(pool.worktreeRoot, name),
       specialization: pool.specialization,
       ...pool.tier ? { tier: pool.tier } : {},
-      ...pool.model ? { model: pool.model } : {}
+      ...pool.model ? { model: pool.model } : {},
+      ...pool.isolateUserConfig ? { isolateUserConfig: true } : {}
     };
   });
 }
@@ -21811,6 +21919,12 @@ function modelOf(a, i) {
   }
   return { model: a.model };
 }
+function isolateOf(a, i, runtime) {
+  if (a.isolateUserConfig === void 0 || a.isolateUserConfig === false) return {};
+  if (a.isolateUserConfig !== true) throw new Error(`agents[${i}].isolateUserConfig must be true or false`);
+  if (runtime !== "claude") throw new Error(`agents[${i}]: isolateUserConfig only applies to the claude runtime`);
+  return { isolateUserConfig: true };
+}
 function parsePool(a, i, specDir) {
   if (a.name !== void 0 || a.worktree !== void 0) throw new Error(`agents[${i}] must have either name or pool, not both`);
   if (typeof a.pool !== "string" || !POOL_NAME.test(a.pool)) throw new Error(`agents[${i}].pool must be letters, digits, '.', '_' or '-' (at most 60)`);
@@ -21829,7 +21943,7 @@ function parsePool(a, i, specDir) {
   const base2 = resolve5(specDir, a.base);
   const worktreeRoot = resolve5(specDir, a.worktreeRoot);
   if (isWithin(worktreeRoot, base2)) throw new Error(`agents[${i}].worktreeRoot ${worktreeRoot} is inside base ${base2}; pool worktrees never go inside your checkout`);
-  return { pool: a.pool, runtime, base: base2, worktreeRoot, specialization, ...tierOf(a, i, specialization), ...modelOf(a, i), min, max };
+  return { pool: a.pool, runtime, base: base2, worktreeRoot, specialization, ...tierOf(a, i, specialization), ...modelOf(a, i), ...isolateOf(a, i, runtime), min, max };
 }
 function parseSpec(text, specDir) {
   let raw;
@@ -21856,7 +21970,7 @@ function parseSpec(text, specDir) {
     if (typeof a.worktree !== "string" || !a.worktree) throw new Error(`agents[${i}].worktree is required`);
     const runtime = runtimeOf(a, i);
     const specialization = specializationOf(a, i);
-    agents.push({ name: a.name, runtime, worktree: resolve5(specDir, a.worktree), specialization, ...tierOf(a, i, specialization), ...modelOf(a, i) });
+    agents.push({ name: a.name, runtime, worktree: resolve5(specDir, a.worktree), specialization, ...tierOf(a, i, specialization), ...modelOf(a, i), ...isolateOf(a, i, runtime) });
   });
   for (const p of pools) {
     for (const a of agents) {
@@ -22731,7 +22845,7 @@ function inspectProcess(pid) {
   }
 }
 function childSpec(agent, creds, worker, onDemand = false) {
-  const { ANTHROPIC_API_KEY: _key, ANTHROPIC_AUTH_TOKEN: _tok, ...inherited } = process.env;
+  const { ANTHROPIC_API_KEY: _key, ANTHROPIC_AUTH_TOKEN: _tok, PITBOSS_ISOLATE_USER_CONFIG: _iso, ...inherited } = process.env;
   return {
     name: agent.name,
     command: worker.command,
@@ -22749,7 +22863,8 @@ function childSpec(agent, creds, worker, onDemand = false) {
       SPECIALIZATION: agent.specialization,
       WORKER_RUNTIME: agent.runtime,
       PITBOSS_ACTIVITY_FILE: activityPath(agent.name),
-      PITBOSS_MODEL_FILE: resolve8(modelPath(agent.name))
+      PITBOSS_MODEL_FILE: resolve8(modelPath(agent.name)),
+      ...agent.isolateUserConfig ? { PITBOSS_ISOLATE_USER_CONFIG: "1" } : {}
     }
   };
 }

package/dist/event-worker.js

@@ -449,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;
 }
@@ -516,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();
@@ -537,34 +558,87 @@ 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
@@ -611,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",
-        pinnedModel() ?? 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;
@@ -646,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");
@@ -654,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) {
@@ -667,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) {
@@ -688,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();
@@ -758,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);
@@ -775,6 +866,7 @@ function readCursorEvent(line) {
 async function runCursorSession(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"] });
@@ -784,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}
@@ -807,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();
@@ -880,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}` };
@@ -889,6 +984,8 @@ function readCopilotEvent(line) {
 async function runCopilotSession(config2) {
   const mcpConfigPath = writeMcpConfig(config2, "copilot-worker");
   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"] });
@@ -897,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}
@@ -923,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 {
@@ -1022,6 +1124,8 @@ async function runCodexSession(config2) {
     }
   };
   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"] });
@@ -1053,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pitboss/cli",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "private": false,
   "description": "Connect your coding agents to a pitboss instance",
   "keywords": [