@tablation/crew 0.129.1 → 0.130.1

package/dist/cli.js

@@ -1259,6 +1259,14 @@ var claudePair = {
   removePair: (o) => removeClaudeMcp({ bin: o.bin ?? "claude", dryRun: o.dryRun })
 };
 var inferenceBaseUrl = (baseUrl, workspaceId) => `${baseUrl.replace(/\/+$/, "")}/api/workspaces/${workspaceId}/inference`;
+function inferenceHeaders(inf) {
+  const clean = (v) => v.replace(/[\r\n]+/g, " ").trim();
+  const lines2 = [
+    ...inf.ticket ? [`X-Crew-Ticket: ${clean(inf.ticket)}`] : [],
+    ...inf.runId ? [`X-Crew-Run: ${clean(inf.runId)}`] : []
+  ];
+  return lines2.length > 0 ? lines2.join("\n") : void 0;
+}
 function workspaceSettings(baseUrl) {
   const blank = BILLING_VARS_TO_UNSET.filter((v) => v !== "ANTHROPIC_AUTH_TOKEN");
   return JSON.stringify({ env: { ...Object.fromEntries(blank.map((v) => [v, ""])), ANTHROPIC_BASE_URL: baseUrl } });
@@ -1362,7 +1370,11 @@ var claudeAdapter = {
       // variables are already unset at exec (`unsetEnv`), and a spec-level `env:` entry must not
       // smuggle one back in.
       ...spec.auth === "workspace" ? withoutProviderVars(spec.env) : spec.env,
-      ...spec.auth === "workspace" && spec.inference ? { ANTHROPIC_BASE_URL: spec.inference.baseUrl, ANTHROPIC_AUTH_TOKEN: spec.inference.token } : {}
+      ...spec.auth === "workspace" && spec.inference ? {
+        ANTHROPIC_BASE_URL: spec.inference.baseUrl,
+        ANTHROPIC_AUTH_TOKEN: spec.inference.token,
+        ...inferenceHeaders(spec.inference) ? { ANTHROPIC_CUSTOM_HEADERS: inferenceHeaders(spec.inference) } : {}
+      } : {}
     };
   },
   provider: () => "anthropic",
@@ -3210,7 +3222,7 @@ function parseRepoConfig(text2, file) {
   if (!MATCHES.includes(vmatch)) {
     throw new RepoConfigError(`${file}: release.verify.match must be commit|version (got "${vmatch}")`);
   }
-  const num = (v, key, dflt) => {
+  const num2 = (v, key, dflt) => {
     if (v === void 0 || v === null) return dflt;
     const n = Number(v);
     if (!Number.isFinite(n) || n <= 0) {
@@ -3220,8 +3232,8 @@ function parseRepoConfig(text2, file) {
   };
   const verify = {
     match: vmatch,
-    timeoutSeconds: num(raw.release?.verify?.timeoutSeconds, "timeoutSeconds", 600),
-    intervalSeconds: num(raw.release?.verify?.intervalSeconds, "intervalSeconds", 15)
+    timeoutSeconds: num2(raw.release?.verify?.timeoutSeconds, "timeoutSeconds", 600),
+    intervalSeconds: num2(raw.release?.verify?.intervalSeconds, "intervalSeconds", 15)
   };
   if (verify.intervalSeconds > verify.timeoutSeconds) {
     throw new RepoConfigError(
@@ -3794,7 +3806,7 @@ function parseReleaseOverride(raw, where, file) {
   if (versioning !== void 0 && !VERSIONINGS.includes(versioning)) {
     throw new ConfigError(`${file}: ${where}.release.versioning must be auto|none (got "${raw.versioning}")`);
   }
-  const num = (v, key) => {
+  const num2 = (v, key) => {
     if (v === void 0 || v === null) return void 0;
     const n = Number(v);
     if (!Number.isFinite(n) || n <= 0) {
@@ -3802,8 +3814,8 @@ function parseReleaseOverride(raw, where, file) {
     }
     return n;
   };
-  const timeoutSeconds = num(raw.verify?.timeoutSeconds, "timeoutSeconds");
-  const intervalSeconds = num(raw.verify?.intervalSeconds, "intervalSeconds");
+  const timeoutSeconds = num2(raw.verify?.timeoutSeconds, "timeoutSeconds");
+  const intervalSeconds = num2(raw.verify?.intervalSeconds, "intervalSeconds");
   const isolateMax = parseIsolateMax(
     raw.isolateFailures?.maxCandidates,
     `${where}.release.isolateFailures`,
@@ -5496,20 +5508,20 @@ function branchForIssue(cwd, issueKey, templates = { name: "issue-{number}" }, r
   return null;
 }
 function branchCandidates(issueKey, templates, render2) {
-  const num = issueKey.replace(/^\D+/, "");
-  const unpadded = String(Number.parseInt(num, 10));
+  const num2 = issueKey.replace(/^\D+/, "");
+  const unpadded = String(Number.parseInt(num2, 10));
   const candidates2 = [];
   for (const template of [templates.name, templates.push].filter(Boolean)) {
     const exact = render2(template);
     candidates2.push(exact);
-    if (num !== unpadded) candidates2.push(exact.replace(num, unpadded));
+    if (num2 !== unpadded) candidates2.push(exact.replace(num2, unpadded));
     if (template.includes("{slug}")) {
       const prefix = render2(template.slice(0, template.indexOf("{slug}")));
       if (prefix) candidates2.push(`${prefix}*`);
     }
   }
-  candidates2.push(`issue-${num}`);
-  if (num !== unpadded) candidates2.push(`issue-${unpadded}`);
+  candidates2.push(`issue-${num2}`);
+  if (num2 !== unpadded) candidates2.push(`issue-${unpadded}`);
   return [...new Set(candidates2)];
 }
 function remoteBranchForIssue(cwd, remote, issueKey, templates = { name: "issue-{number}" }, render2 = (t) => t.replace(/\{number\}/g, issueKey.replace(/^\D+/, ""))) {
@@ -5580,8 +5592,8 @@ function deleteRemoteBranch(cwd, remote, branch) {
   if (!remoteBranchExists(cwd, remote, branch)) return true;
   return gitOk(cwd, ["push", remote, "--delete", branch]) !== null;
 }
-function worktreeForNumber(cwd, num) {
-  const re = new RegExp(`(?:^|-)${num}$`);
+function worktreeForNumber(cwd, num2) {
+  const re = new RegExp(`(?:^|-)${num2}$`);
   return worktrees(cwd).find((w) => re.test(basename5(w.path))) ?? null;
 }
 var commitBodies = (cwd, range) => gitOk(cwd, ["log", range, "--format=%B"]) ?? "";
@@ -6475,7 +6487,7 @@ import { readFileSync as readFileSync26, existsSync as existsSync25, statSync as
 import { StringDecoder } from "string_decoder";
 import { finished } from "stream/promises";
 import { join as join29, dirname as dirname14, basename as basename9 } from "path";
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash5, randomUUID } from "crypto";
 
 // src/state.ts
 import { readFileSync as readFileSync19, writeFileSync as writeFileSync14, existsSync as existsSync18, mkdirSync as mkdirSync13, rmSync as rmSync10, statSync as statSync7, readdirSync as readdirSync5 } from "fs";
@@ -7302,6 +7314,27 @@ async function revokeSeatKeys(route2, o) {
   }
   const host = hostFromUrl2(route2.baseUrl);
   const base = route2.baseUrl.replace(/\/+$/, "");
+  const headers = { Authorization: `Bearer ${resolveApiKey(route2)}`, "User-Agent": o.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" };
+  const sweepNamedKeys = async (role, agentId) => {
+    const prefix = `crew ${o.shipName} `;
+    try {
+      const res = await doFetch(`${base}/api/workspaces/${resolved.workspaceId}/agents/${agentId}/api-keys`, { headers });
+      if (!res.ok) return;
+      const keys = await res.json();
+      for (const k of Array.isArray(keys) ? keys : []) {
+        if (!k.id || k.revokedAt || !k.name?.startsWith(prefix)) continue;
+        if (o.dryRun) {
+          out.push({ role, action: "revoked", detail: `dry run; key "${k.name}" found on the server` });
+          continue;
+        }
+        const del2 = await doFetch(`${base}/api/workspaces/${resolved.workspaceId}/agents/${agentId}/api-keys/${k.id}`, { method: "DELETE", headers });
+        if (del2.ok || del2.status === 404) out.push({ role, action: "revoked", detail: `key "${k.name}" found on the server, not in the keychain` });
+        else out.push({ role, action: "failed", detail: `key "${k.name}": ${del2.status} ${del2.statusText}` });
+      }
+    } catch (e) {
+      out.push({ role, action: "failed", detail: `could not sweep keys named for this ship (${e.message})` });
+    }
+  };
   for (const { role, agentId } of targets) {
     if (!agentId) {
       out.push({ role, action: "no_agent" });
@@ -7312,6 +7345,7 @@ async function revokeSeatKeys(route2, o) {
       const session = await store.get(host, slug2);
       if (!session?.apiKey) {
         out.push({ role, action: "not_stored" });
+        if (o.shipName) await sweepNamedKeys(role, agentId);
         continue;
       }
       if (!session.keyId) {
@@ -7332,6 +7366,7 @@ async function revokeSeatKeys(route2, o) {
       }
       await store.clear(host, slug2);
       out.push({ role, action: "revoked", detail: del2.ok ? void 0 : "server already had no such key" });
+      if (o.shipName) await sweepNamedKeys(role, agentId);
     } catch (e) {
       out.push({ role, action: "failed", detail: /Command failed|security|sk_|-w /i.test(e.message) ? describeStoreError(e) : e.message });
     }
@@ -9606,8 +9641,8 @@ async function noteTakeover(tracker, result, seat, ships, myShipName, continuing
   }
 }
 function originBranchSha(dir, t, rev) {
-  const num = (t.issue_tag ?? t.issue_id).replace(/^\D+/, "");
-  const names = [...new Set([(t.issue_tag ?? "").toLowerCase(), `issue-${num}`].filter(Boolean))];
+  const num2 = (t.issue_tag ?? t.issue_id).replace(/^\D+/, "");
+  const names = [...new Set([(t.issue_tag ?? "").toLowerCase(), `issue-${num2}`].filter(Boolean))];
   for (const n of names) {
     const sha = rev(dir, `origin/${n}`);
     if (sha) return sha.slice(0, 7);
@@ -9669,8 +9704,8 @@ function planRunWorktree(dir, cfg, t, role, opts = {}) {
       unlock();
     }
   }
-  const num = t.issue_id.replace(/^\D+/, "");
-  const existing = worktreeForNumber(dir, num);
+  const num2 = t.issue_id.replace(/^\D+/, "");
+  const existing = worktreeForNumber(dir, num2);
   const located = locateBranchForTicket(dir, cfg, t, role);
   const baseRef = hasRemote ? `${remote}/${base}` : base;
   if (existing && !existing.prunable && existsSync21(existing.path)) {
@@ -10167,6 +10202,49 @@ async function guardRunStrays(route2, ship, tracker, role, workingId, since2, lo
 }
 
 // src/agent-log.ts
+var num = (v) => typeof v === "number" && Number.isFinite(v) ? v : Number(v) || 0;
+function sumInferenceRows(rows) {
+  const t = { calls: 0, tokensIn: 0, tokensOut: 0, cacheReadTokens: 0, cacheWriteTokens: 0, costUsd: 0 };
+  for (const r of rows) {
+    t.calls++;
+    t.tokensIn += num(r.input_tokens);
+    t.tokensOut += num(r.output_tokens);
+    t.cacheReadTokens += num(r.cache_read_tokens);
+    t.cacheWriteTokens += num(r.cache_write_tokens);
+    t.costUsd += num(r.cost_usd);
+  }
+  return t;
+}
+var INFERENCE_PAGE = 1e3;
+async function listInferenceRows(target, modelId, runId) {
+  const filters = encodeURIComponent(JSON.stringify({
+    combinator: "AND",
+    conditions: [
+      { columnName: "run_id", operator: "EQ", value: runId },
+      { columnName: "client", operator: "EQ", value: "inference" }
+    ]
+  }));
+  const out = [];
+  for (let offset = 0; ; offset += INFERENCE_PAGE) {
+    const page = await request(
+      target,
+      "GET",
+      `/data-models/${modelId}/records?limit=${INFERENCE_PAGE}&offset=${offset}&filters=${filters}`
+    );
+    out.push(...page);
+    if (page.length < INFERENCE_PAGE) return out;
+  }
+}
+async function inferenceTotalsFor(target, runId) {
+  const model = await request(
+    target,
+    "GET",
+    `/data-models/agent_log?workspaceId=${encodeURIComponent(target.workspaceId)}`
+  );
+  if (!(await columnsOf(target, model.id)).has("run_id")) return void 0;
+  const rows = await listInferenceRows(target, model.id, runId);
+  return rows.length > 0 ? sumInferenceRows(rows) : void 0;
+}
 var AgentLogUnreachableError = class extends Error {
 };
 var AgentLogHttpError = class extends Error {
@@ -10331,19 +10409,20 @@ async function reportAgentRun(target, run3) {
     promptVersion: run3.promptVersion,
     promptSha: run3.promptSha
   };
+  const { runId, ...legacyBody } = { ...body, runId: run3.runId };
   const workItem = target.tickets && ticketRecordId ? { workItemTable: target.tickets.issuesModelId, workItemRecordId: ticketRecordId } : {};
   let entry;
   try {
-    entry = await post(target, "/agents/log", { ...body, ...workItem, harness: run3.harness, provider: run3.provider });
+    entry = await post(target, "/agents/log", { ...body, ...runId ? { runId } : {}, ...workItem, harness: run3.harness, provider: run3.provider });
   } catch (e) {
     if (!(e instanceof AgentLogHttpError)) throw new AgentLogUnreachableError(e.message);
     if (e.status >= 500) throw new AgentLogUnreachableError(e.message);
-    if (e.status !== 400 || !run3.harness && !run3.provider && !ticketRecordId) {
+    if (e.status !== 400 || !run3.harness && !run3.provider && !ticketRecordId && !runId) {
       e.row = true;
       throw e;
     }
     try {
-      entry = await post(target, "/agents/log", body);
+      entry = await post(target, "/agents/log", legacyBody);
     } catch (e2) {
       if (e2 instanceof AgentLogHttpError && e2.status < 500) e2.row = true;
       throw e2;
@@ -10362,10 +10441,21 @@ async function reportAgentRun(target, run3) {
     const bounces = await countAcceptanceBounces(target, target.tickets.issuesModelId, ticketRecordId);
     if (bounces !== null) await writeHandoffBounces(target, entry.id, bounces);
   }
-  const counters = target.tickets && ticketRecordId ? await addRunToTicket(target, target.tickets, ticketRecordId, run3) : void 0;
+  let counterWarning;
+  let counted = run3;
+  if (runId && target.tickets && ticketRecordId) {
+    try {
+      const totals = await inferenceTotalsFor(target, runId);
+      if (totals) counted = { ...run3, tokensIn: totals.tokensIn, tokensOut: totals.tokensOut, cacheReadTokens: totals.cacheReadTokens, cacheWriteTokens: totals.cacheWriteTokens, costUsd: totals.costUsd };
+      else counted = { ...run3, ...run3.harnessTotals };
+    } catch (e) {
+      counterWarning = `could not sum run ${runId}'s inference rows for ${run3.ticketReference}: ${e.message}`;
+    }
+  }
+  const counters = target.tickets && ticketRecordId ? await addRunToTicket(target, target.tickets, ticketRecordId, counted) : void 0;
   return {
     agentLogId: entry.id,
-    ...counters?.warning ? { counterWarning: counters.warning } : {},
+    ...counters?.warning || counterWarning ? { counterWarning: [counterWarning, counters?.warning].filter(Boolean).join("; ") } : {},
     ...counters?.retry ? { counterRetry: counters.retry } : {}
   };
 }
@@ -11941,6 +12031,7 @@ function planAgentRun(o) {
   const seat = resolveSeat(o.ship, o.route, o.role, o.agentPersona ?? (o.agentModel ? { model: o.agentModel } : {}), o.repo);
   const { model } = seat;
   let toolchain = seat.toolchain;
+  let workspaceRunId;
   if (toolchain.auth === "workspace") {
     if (!o.apiKey || o.seatKind === "ship") {
       throw new WorkspaceAuthRefused(`${o.role}: toolchain ${toolchain.name} has auth: workspace, which needs the seat's own agent key \u2014 this seat would fall back to the ship key (run \`crew agents sync\`)`);
@@ -11948,7 +12039,8 @@ function planAgentRun(o) {
     if (!o.route.resolved) {
       throw new WorkspaceAuthRefused(`${o.role}: toolchain ${toolchain.name} has auth: workspace, but route ${o.route.route} is not connected (run \`crew connect\`)`);
     }
-    toolchain = { ...toolchain, inference: { baseUrl: inferenceBaseUrl(o.route.baseUrl, o.route.resolved.workspaceId), token: o.apiKey } };
+    workspaceRunId = o.runId ?? randomUUID();
+    toolchain = { ...toolchain, inference: { baseUrl: inferenceBaseUrl(o.route.baseUrl, o.route.resolved.workspaceId), token: o.apiKey, ticket: o.ticket, runId: workspaceRunId } };
   }
   const adapter = adapterFor(toolchain.harness);
   const code = codeBridgeFor(o, adapter.harness);
@@ -12045,7 +12137,8 @@ function planAgentRun(o) {
     routeName: o.route.route,
     agentLog,
     promptVersion: o.route.resolved?.agentPersonas?.[o.role]?.historyId,
-    promptSha
+    promptSha,
+    ...workspaceRunId ? { workspaceRunId } : {}
   };
 }
 function describePlan(p) {
@@ -12099,7 +12192,8 @@ function identityOf(plan, adapterHarness) {
     streamPath: plan.streamPath,
     agentLog: plan.agentLog ? withoutKey(plan.agentLog) : void 0,
     promptVersion: plan.promptVersion,
-    promptSha: plan.promptSha
+    promptSha: plan.promptSha,
+    ...plan.workspaceRunId ? { workspaceRunId: plan.workspaceRunId } : {}
   };
 }
 async function killForDeadline(kill, pid, emit, role, ticket, spawnedAt, limitMinutes) {
@@ -12406,11 +12500,22 @@ async function finishRun(id, obs, emit, startedAt, end, agentLogKey, hintMoved)
       finishedAt: (/* @__PURE__ */ new Date()).toISOString(),
       cycles: obs.cycles,
       model: id.model,
-      tokensIn: result?.inputTokens,
-      tokensOut: result?.outputTokens,
-      cacheReadTokens: result?.cacheReadTokens,
-      cacheWriteTokens: result?.cacheWriteTokens,
-      costUsd: result?.costUsd,
+      // CREW-2980: under `auth: workspace` the endpoint's rows are the accounting; the run row
+      // keeps turns only, and `reportAgentRun` sums those rows into the ticket counters.
+      ...id.workspaceRunId ? { runId: id.workspaceRunId } : {
+        tokensIn: result?.inputTokens,
+        tokensOut: result?.outputTokens,
+        cacheReadTokens: result?.cacheReadTokens,
+        cacheWriteTokens: result?.cacheWriteTokens,
+        costUsd: result?.costUsd
+      },
+      ...id.workspaceRunId ? { harnessTotals: {
+        tokensIn: result?.inputTokens,
+        tokensOut: result?.outputTokens,
+        cacheReadTokens: result?.cacheReadTokens,
+        cacheWriteTokens: result?.cacheWriteTokens,
+        costUsd: result?.costUsd
+      } } : {},
       // Both come from a finished run: without the result line (interrupted) neither is trustworthy.
       ...result?.numTurns !== void 0 ? { numTurns: result.numTurns } : {},
       ...result?.numTurns !== void 0 && obs.prefixTokens !== void 0 ? { prefixTokens: obs.prefixTokens } : {},
@@ -12537,7 +12642,8 @@ function spawnAgent(plan, emit, hintMoved) {
           eventsPath: plan.eventsPath,
           agentLog: id.agentLog,
           promptVersion: plan.promptVersion,
-          promptSha: plan.promptSha
+          promptSha: plan.promptSha,
+          ...plan.workspaceRunId ? { workspaceRunId: plan.workspaceRunId } : {}
         };
         try {
           writeFileSync19(pidPathFor(plan.streamPath), JSON.stringify(sidecar));
@@ -12792,14 +12898,14 @@ function describeRun(run3, route2, seatIds, worktreeOf = (d, n) => {
 }) {
   const ownRoute = run3.route === routeSlug(route2.route);
   const repoDir = run3.repo ? reposOf(route2).find((t) => t.name === run3.repo)?.dir : void 0;
-  const num = run3.ticket?.replace(/^\D+/, "") ?? "";
+  const num2 = run3.ticket?.replace(/^\D+/, "") ?? "";
   return {
     role: run3.role,
     seat: ownRoute ? seatIds[run3.role] ?? null : null,
     ticket: run3.ticket,
     ticketRecordId: run3.ticketRecordId,
     repo: run3.repo ?? null,
-    worktree: repoDir && num ? worktreeOf(repoDir, num) : null,
+    worktree: repoDir && num2 ? worktreeOf(repoDir, num2) : null,
     stream: run3.streamPath,
     pid: run3.pid,
     startedAt: run3.spawnedAt,
@@ -12821,7 +12927,12 @@ function labeledDocker() {
   if (!dockerAvailable()) return { volumes: [], images: [] };
   return {
     volumes: lines(docker(["volume", "ls", "-q", "--filter", `label=${DOCKER_LABEL_OWNER}`, "--filter", `label=${DOCKER_LABEL_CACHE}`])),
-    images: lines(docker(["image", "ls", "-q", "--filter", `label=${DOCKER_LABEL_OWNER}`, "--filter", `label=${DOCKER_LABEL_REPO_LAYER}`]))
+    // CREW-2984: the repository and ship layers are tagged `crew-sandbox/<name>:<hash>` but carry only an `io.crew.sandbox.*` label,
+    // so the label filter alone missed them. The tag namespace is crew's own; the base and crew layers are `crew-sandbox-base`/`-crew`.
+    images: [.../* @__PURE__ */ new Set([
+      ...lines(docker(["image", "ls", "--format", "{{.Repository}}:{{.Tag}}", "--filter", "reference=crew-sandbox/*"])),
+      ...lines(docker(["image", "ls", "-q", "--filter", `label=${DOCKER_LABEL_OWNER}`, "--filter", `label=${DOCKER_LABEL_REPO_LAYER}`]))
+    ])]
   };
 }
 function realDeprovisionDeps(cfg, emit, crewHome, getStore) {
@@ -12855,8 +12966,8 @@ function realDeprovisionDeps(cfg, emit, crewHome, getStore) {
       const tracker = new Tracker(route2, cfg.ship, { apiKey: identity.apiKey });
       const t = await tracker.ticket(run3.ticketRecordId);
       const target = repoTargetFor(route2, t.repo_id);
-      const num = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
-      const wt = target && num ? worktreeForNumber(target.dir, num) : null;
+      const num2 = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
+      const wt = target && num2 ? worktreeForNumber(target.dir, num2) : null;
       let dirty = null;
       try {
         if (wt) dirty = status(wt.path).length > 0;
@@ -18132,10 +18243,10 @@ function dedupeChangelogEntries(entries, ticket) {
     let key = line;
     if (ref) {
       const prefix = ref[1];
-      const num = ref[2];
-      const canonical = own && own[2] === num ? own[1] : prefix;
-      line = `${canonical}-${num}${line.slice(ref[0].length)}`;
-      key = `${canonical}-${num}`;
+      const num2 = ref[2];
+      const canonical = own && own[2] === num2 ? own[1] : prefix;
+      line = `${canonical}-${num2}${line.slice(ref[0].length)}`;
+      key = `${canonical}-${num2}`;
     }
     if (seen.has(key)) continue;
     seen.add(key);
@@ -21343,10 +21454,24 @@ async function showLogEntry(route2, entryId, opts = {}) {
   } catch (e) {
     throw new LogbookError(`no Agent Log entry ${entryId} in this workspace (${e.message})`);
   }
-  if (!opts.withPrompt) return { entry, reconstruction: { status: "not_recorded", reason: "not requested" } };
+  let inference;
+  if (entry.run_id && entry.client !== "inference") {
+    try {
+      const rows = await listInferenceRows(
+        { baseUrl: route2.baseUrl, apiKey: resolveApiKey(route2), userAgent: opts.userAgent ?? "Mozilla/5.0 TablationCrewAgent/1.0" },
+        agentLogModel.id,
+        entry.run_id
+      );
+      if (rows.length > 0) inference = sumInferenceRows(rows);
+    } catch {
+    }
+  }
+  const withInference = inference ? { inference } : {};
+  if (!opts.withPrompt) return { entry, ...withInference, reconstruction: { status: "not_recorded", reason: "not requested" } };
   if (!entry.agent_id || !entry.prompt_version) {
     return {
       entry,
+      ...withInference,
       reconstruction: {
         status: "not_recorded",
         reason: !entry.agent_id ? "this entry has no linked Agents row (predates crew agents sync being run for its role)" : "this entry predates ISSUE-377/529 \u2014 no prompt_version was recorded"
@@ -21358,12 +21483,13 @@ async function showLogEntry(route2, entryId, opts = {}) {
   try {
     historyEntries = await fetchHistoryEntries(route2, agentsModel.id, entry.agent_id, opts.userAgent, 200);
   } catch (e) {
-    return { entry, reconstruction: { status: "approximate", reason: `history lookup failed: ${e.message}` } };
+    return { entry, ...withInference, reconstruction: { status: "approximate", reason: `history lookup failed: ${e.message}` } };
   }
   const match = historyEntries.find((h) => h.history_id === entry.prompt_version);
   if (!match) {
     return {
       entry,
+      ...withInference,
       reconstruction: {
         status: "approximate",
         reason: `history entry ${entry.prompt_version} no longer exists on the Agents row (purged, or the row itself was recreated)`
@@ -21375,6 +21501,7 @@ async function showLogEntry(route2, entryId, opts = {}) {
   const exact = !!entry.prompt_sha && actualSha === entry.prompt_sha;
   return {
     entry,
+    ...withInference,
     reconstruction: {
       status: exact ? "exact" : "approximate",
       historyId: match.history_id,
@@ -21998,8 +22125,8 @@ var BRANCH_STEM = /^(?:.*\/)?([^/]+?-\d+)(?:-.*)?$/;
 function ticketForWorktree(w, byNumber, contract) {
   if (w.branch) {
     const stem = BRANCH_STEM.exec(w.branch)?.[1];
-    const num = stem && /-(\d+)$/.exec(stem)?.[1];
-    const t = num ? byNumber.get(num) : void 0;
+    const num2 = stem && /-(\d+)$/.exec(stem)?.[1];
+    const t = num2 ? byNumber.get(num2) : void 0;
     if (t && ticketStems(t).has(stem)) return t;
   }
   const dir = basename13(w.path);
@@ -22179,11 +22306,11 @@ function deployedBranchStems(tickets, contract) {
 }
 function ticketStems(t) {
   const stems = /* @__PURE__ */ new Set();
-  const num = t.issue_id.replace(/^\D+/, "");
-  const unpadded = String(Number.parseInt(num, 10));
+  const num2 = t.issue_id.replace(/^\D+/, "");
+  const unpadded = String(Number.parseInt(num2, 10));
   const prefixes = ["issue", t.project_issue_prefix?.toLowerCase()].filter((p) => !!p);
   for (const p of prefixes) {
-    stems.add(`${p}-${num}`);
+    stems.add(`${p}-${num2}`);
     stems.add(`${p}-${unpadded}`);
   }
   return stems;
@@ -24161,8 +24288,8 @@ async function reconcileForRoute(ctx, o) {
           if (!memberId) return;
           const t = await tracker.ticket(sc.ticketRecordId);
           const target = repoTargetFor(route2, t.repo_id);
-          const num = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
-          const wt = target && num ? worktreeForNumber(target.dir, num) : null;
+          const num2 = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
+          const wt = target && num2 ? worktreeForNumber(target.dir, num2) : null;
           let dirty = null;
           try {
             if (wt) dirty = status(wt.path).length > 0;
@@ -24196,8 +24323,8 @@ async function postRunKilled(route2, tracker, ticketId, memberId, limitMinutes,
   try {
     const t = await tracker.ticket(ticketId);
     const target = repoTargetFor(route2, t.repo_id);
-    const num = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
-    const wt = target && num ? worktreeForNumber(target.dir, num) : null;
+    const num2 = String(t[tracker.contract.columns.key] ?? "").replace(/^\D+/, "");
+    const wt = target && num2 ? worktreeForNumber(target.dir, num2) : null;
     let dirty = null;
     try {
       if (wt) dirty = status(wt.path).length > 0;
@@ -25545,10 +25672,10 @@ async function handlePeriscopeMcp(d, req, res, segment) {
 function findPeriscope(sidecars, segment) {
   const m = /^(?:([A-Za-z]+)-)?(\d+)$/.exec(segment);
   if (!m) return void 0;
-  const num = String(Number(m[2]));
+  const num2 = String(Number(m[2]));
   return sidecars.find((sc) => {
     const t = /^(?:([A-Za-z]+)-)?0*(\d+)$/.exec(sc.ticket);
-    if (!t || t[2] !== num) return false;
+    if (!t || t[2] !== num2) return false;
     return !m[1] || !t[1] || m[1].toLowerCase() === t[1].toLowerCase();
   });
 }
@@ -28113,7 +28240,7 @@ ${cu.tail.trimEnd()}
       }
       const { personaResult, skillResult } = run3;
       if (flag("revoke-seat-keys")) {
-        for (const o of await revokeSeatKeys(target, { userAgent: cfg.ship.userAgent, dryRun })) {
+        for (const o of await revokeSeatKeys(target, { userAgent: cfg.ship.userAgent, dryRun, shipName: cfg.ship.name })) {
           process.stdout.write(`${describeRevokeOutcome(o)}
 `);
         }
@@ -28636,7 +28763,7 @@ ${cu.tail.trimEnd()}
             );
           }
         } else {
-          const { entry, reconstruction } = await showLogEntry(target, entryId, {
+          const { entry, inference, reconstruction } = await showLogEntry(target, entryId, {
             userAgent: cfg.ship.userAgent,
             withPrompt: flag("prompt")
           });
@@ -28650,6 +28777,9 @@ model:      ${entry.model ?? "?"}
 harness:    ${entry.harness ?? "?"}
 provider:   ${entry.provider ?? "?"}
 ` + (entry.num_turns != null ? `turns:      ${entry.num_turns}
+` : "") + (inference ? `calls:      ${inference.calls}
+tokens:     in ${inference.tokensIn}, out ${inference.tokensOut}, cache read ${inference.cacheReadTokens}, cache write ${inference.cacheWriteTokens}
+cost:       $${inference.costUsd.toFixed(4)}
 ` : "") + (entry.prefix_tokens != null ? `prefix:     ${entry.prefix_tokens} tokens
 ` : "") + (formatBeforeEdit(entry) ? `before edit: ${formatBeforeEdit(entry)}
 ` : "")
@@ -29692,7 +29822,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         process.stderr.write("drop: need a ticket number (326, ISSUE-326, or TABL-326)\n");
         process.exit(2);
       }
-      const num = Number(n);
+      const num2 = Number(n);
       const repos = await resolvedRepos(route2);
       const candidates2 = repos.map((r) => ({ repo: r, found: worktreeForNumber(r.dir, n) })).filter((c) => c.found !== null);
       if (candidates2.length === 0) {
@@ -29713,9 +29843,9 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
       const wt = found.path;
       try {
         const trD = new Tracker(route2, cfg.ship);
-        const tD = (await trD.ticketsByNumbers([n])).find((t) => t.issue_id.replace(/^\D+/, "") === String(num));
+        const tD = (await trD.ticketsByNumbers([n])).find((t) => t.issue_id.replace(/^\D+/, "") === String(num2));
         if (tD && tD[trD.contract.columns.status] === trD.contract.statuses.draft) {
-          process.stderr.write(`drop: ${tD.issue_tag ?? tD.issue_id} is a draft ticket \u2014 its worktree belongs to a periscope; end it with \`crew periscope down ${num} --keep\` or \`--discard\`
+          process.stderr.write(`drop: ${tD.issue_tag ?? tD.issue_id} is a draft ticket \u2014 its worktree belongs to a periscope; end it with \`crew periscope down ${num2} --keep\` or \`--discard\`
 `);
           process.exit(2);
         }
@@ -29725,7 +29855,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         name: target.config.branch.name,
         push: target.config.branch.push
       }, (t) => renderBranchName(t, { key: `ISSUE-${n}`, lowercase: target.config.branch.lowercase }));
-      const pids = pidsInWorktree(wt, num);
+      const pids = pidsInWorktree(wt, num2);
       if (pids.length) {
         emit.emit(`${dryRun ? "would kill" : "killing"} processes still inside ${wt}: ${pids.join(" ")}`);
         if (!dryRun) await killGently(pids);
@@ -30483,7 +30613,7 @@ ${where.join("\n")}`);
         },
         removePair: removePairEntries,
         async revokeSeatKeys(r, dry) {
-          const outcomes = await revokeSeatKeys(r, { userAgent: cfg.ship.userAgent, dryRun: dry });
+          const outcomes = await revokeSeatKeys(r, { userAgent: cfg.ship.userAgent, dryRun: dry, shipName: cfg.ship.name });
           return outcomes.map((o) => ({ line: describeRevokeOutcome(o), ok: o.action !== "failed" }));
         },
         async credential(r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.129.1",
+  "version": "0.130.1",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",