@coreplane/switchboard 1.267.3 → 1.268.0

package/dist/cli.js

@@ -653,7 +653,7 @@ function fit(pipeline) {
   const need = ALLOWANCES.provision + ASKS.coding + reserveMinutes({ kind: "coding", index: 0 }, pipeline);
   return { ok: pipeline.maxMinutes >= need, need, have: pipeline.maxMinutes };
 }
-var SECOND_MS, secondsToMs, MINUTE_MS, minutesToMs, DAY_MS, WEEK_MS, CONFIRMATION_TTL_MS, QUESTION_TTL_MS, AUTHOR_BINDING_TTL_MS, GIT_RECEIVE_PACK_FORWARD_TIMEOUT_MS, GIT_PUBLICATION_SETTLE_TIMEOUT_MS, FIRST_ATTACH_WAIT_MS, ATTACH_REQUEST_MIN_MS, HARNESS_PROBE_WAIT_MS, DRAIN, INTAKE_WINDOW_MAX_MS, INTAKE_RECOVERY_WINDOW_MS, INTAKE_DELIVERY_CLAIM_MS, LOOP_PRESETS, ASKS, PRESET_FLOORS, FLOORS, PULL_SWEEP, PROVIDER_RETRY_BACKOFFS_MS, MODEL_STREAM_HEARTBEAT_MS, HOSTED_DEADLINE_MARGIN_MINUTES, SHIP_WAIT, SHIP_RECORD_VISIBILITY, RESTART_CLAIM_GRACE_MS, PLANE, PACE_WINDOW_MINUTES, ALLOWANCES, POST_STEP_MINUTES, WRAP_UP_WARNING, SANDBOX_CREDENTIAL_WRITE_TIMEOUT_MS, BASH_COMMAND, RUNAWAY_TURNS_PER_MINUTE, DEFAULT_GRANT, GRANT_RENEWALS_MAX, STRUCTURED_RETRIES_MAX, IDLE_DAYS_DEFAULT, IDLE_DAYS_MAX, IDLE_WAKES_MAX;
+var SECOND_MS, secondsToMs, MINUTE_MS, minutesToMs, DAY_MS, WEEK_MS, CONFIRMATION_TTL_MS, QUESTION_TTL_MS, AUTHOR_BINDING_TTL_MS, GIT_RECEIVE_PACK_FORWARD_TIMEOUT_MS, GIT_PUBLICATION_SETTLE_TIMEOUT_MS, FIRST_ATTACH_WAIT_MS, ATTACH_REQUEST_MIN_MS, HARNESS_PROBE_WAIT_MS, DRAIN, INTAKE_WINDOW_MAX_MS, INTAKE_RECOVERY_WINDOW_MS, INTAKE_DELIVERY_CLAIM_MS, LOOP_PRESETS, ASKS, PRESET_FLOORS, FLOORS, PULL_SWEEP, PROVIDER_RETRY_BACKOFFS_MS, MODEL_STREAM_HEARTBEAT_MS, RESIDENT_LISTING_POLL_MS, HOSTED_DEADLINE_MARGIN_MINUTES, SHIP_WAIT, SHIP_RECORD_VISIBILITY, RESTART_CLAIM_GRACE_MS, PLANE, PACE_WINDOW_MINUTES, ALLOWANCES, POST_STEP_MINUTES, WRAP_UP_WARNING, SANDBOX_CREDENTIAL_WRITE_TIMEOUT_MS, BASH_COMMAND, RUNAWAY_TURNS_PER_MINUTE, DEFAULT_GRANT, GRANT_RENEWALS_MAX, STRUCTURED_RETRIES_MAX, IDLE_DAYS_DEFAULT, IDLE_DAYS_MAX, IDLE_WAKES_MAX;
 var init_budgets = __esm({
   "../../src/core/budgets.ts"() {
     "use strict";
@@ -732,6 +732,7 @@ var init_budgets = __esm({
     PULL_SWEEP = { leaseMinutes: 15, spendCapUsd: 5 };
     PROVIDER_RETRY_BACKOFFS_MS = [5e3, 15e3, 45e3];
     MODEL_STREAM_HEARTBEAT_MS = 15e3;
+    RESIDENT_LISTING_POLL_MS = 3e4;
     HOSTED_DEADLINE_MARGIN_MINUTES = 60;
     SHIP_WAIT = { marginMinutes: 5, chunkMinutes: 5, mergeChunkMinutes: 5, busyRetryMinutes: 2 };
     SHIP_RECORD_VISIBILITY = { retries: 3, retryMs: secondsToMs(1) };
@@ -5388,197 +5389,6 @@ var init_modelPricing = __esm({
   }
 });
 
-// ../../src/core/runUsage.ts
-function usageOfEvents(events) {
-  const usage = emptyUsage();
-  const priced = /* @__PURE__ */ new Map();
-  for (const e of events) {
-    if (e.type !== "span_end" || e.name !== MODEL_TURN) continue;
-    const attrs = e.attrs ?? {};
-    const model = typeof attrs.model === "string" && attrs.model ? attrs.model : UNKNOWN_MODEL;
-    const m = usage.byModel[model] ?? {
-      turns: 0,
-      inputTokens: 0,
-      outputTokens: 0,
-      cacheReadTokens: 0,
-      cacheWriteTokens: 0
-    };
-    const counted2 = num(attrs.inputTokens) + num(attrs.outputTokens) + num(attrs.cacheReadTokens) + num(attrs.cacheWriteTokens);
-    m.turns += 1;
-    m.inputTokens += num(attrs.inputTokens);
-    m.outputTokens += num(attrs.outputTokens);
-    m.cacheReadTokens += num(attrs.cacheReadTokens);
-    m.cacheWriteTokens += num(attrs.cacheWriteTokens);
-    usage.byModel[model] = m;
-    usage.turns += 1;
-    const hasUsd = typeof attrs.usd === "number" && Number.isFinite(attrs.usd);
-    const hasSource = typeof attrs.priceSource === "string" && attrs.priceSource !== "";
-    const p = priced.get(model) ?? {
-      usd: 0,
-      feeUsd: 0,
-      feeTurns: 0,
-      pricedTurns: 0,
-      unpricedTokenTurns: 0,
-      sources: /* @__PURE__ */ new Set()
-    };
-    if (counted2 > 0 && !hasUsd) p.unpricedTokenTurns += 1;
-    if (hasUsd) {
-      p.usd += attrs.usd;
-      p.pricedTurns += 1;
-    }
-    if (typeof attrs.feeUsd === "number" && Number.isFinite(attrs.feeUsd)) {
-      p.feeUsd += attrs.feeUsd;
-      p.feeTurns += 1;
-    }
-    if (hasSource) p.sources.add(attrs.priceSource);
-    priced.set(model, p);
-  }
-  for (const [model, p] of priced) {
-    if (p.pricedTurns === 0 && p.sources.size === 0) continue;
-    const m = usage.byModel[model];
-    m.usd = p.unpricedTokenTurns > 0 ? null : p.usd;
-    if (p.feeTurns > 0) m.feeUsd = p.feeUsd;
-    if (p.sources.size > 0) m.priceSources = [...p.sources].sort();
-  }
-  return usage;
-}
-function addUsage(a, b) {
-  const out = { turns: a.turns + b.turns, byModel: {} };
-  for (const src of [a.byModel, b.byModel]) {
-    for (const [model, m] of Object.entries(src)) {
-      const acc = out.byModel[model];
-      if (!acc) {
-        out.byModel[model] = { ...m, ...m.priceSources ? { priceSources: [...m.priceSources] } : {} };
-        continue;
-      }
-      acc.turns += m.turns;
-      acc.inputTokens += m.inputTokens;
-      acc.outputTokens += m.outputTokens;
-      acc.cacheReadTokens += m.cacheReadTokens;
-      acc.cacheWriteTokens += m.cacheWriteTokens;
-      const usd2 = foldUsd(acc.usd, m.usd);
-      if (usd2 === void 0) delete acc.usd;
-      else acc.usd = usd2;
-      if (acc.feeUsd !== void 0 || m.feeUsd !== void 0) acc.feeUsd = (acc.feeUsd ?? 0) + (m.feeUsd ?? 0);
-      const sources = /* @__PURE__ */ new Set([...acc.priceSources ?? [], ...m.priceSources ?? []]);
-      if (sources.size > 0) acc.priceSources = [...sources].sort();
-    }
-  }
-  return out;
-}
-function isRunUsage(v) {
-  if (typeof v !== "object" || v === null) return false;
-  const u = v;
-  if (typeof u.turns !== "number") return false;
-  if (typeof u.byModel !== "object" || u.byModel === null || Array.isArray(u.byModel)) return false;
-  return Object.values(u.byModel).every(isModelUsage);
-}
-function billedTo(run2, batch, lookupParent) {
-  if (!run2.parentRunId) return identityOf(run2);
-  const parent = batch.get(run2.parentRunId) ?? lookupParent(run2.parentRunId);
-  return identityOf(parent ?? run2);
-}
-function aggregateUsage(runs, lookupParent = () => void 0) {
-  const batch = new Map(runs.map((r) => [r.id, r]));
-  const rows = /* @__PURE__ */ new Map();
-  let pending2 = 0;
-  for (const run2 of runs) {
-    const who2 = billedTo(run2, batch, lookupParent);
-    const day2 = dayOf(run2.finishedAt);
-    const agent = run2.agent ?? UNKNOWN_AGENT;
-    const key = JSON.stringify([day2, who2.userId, run2.threadKey, run2.channelId, agent]);
-    const row2 = rows.get(key) ?? {
-      day: day2,
-      userId: who2.userId,
-      threadKey: run2.threadKey,
-      channelId: run2.channelId,
-      agent,
-      runs: 0,
-      wallMs: 0,
-      usage: emptyUsage()
-    };
-    if (who2.userName && !row2.userName) row2.userName = who2.userName;
-    row2.runs += 1;
-    row2.wallMs += Math.max(0, run2.finishedAt - run2.startedAt);
-    if (run2.usage) row2.usage = addUsage(row2.usage, run2.usage);
-    else pending2 += 1;
-    rows.set(key, row2);
-  }
-  const sorted = [...rows.values()].sort((a, b) => {
-    for (const k of CELL_ORDER) {
-      if (a[k] < b[k]) return -1;
-      if (a[k] > b[k]) return 1;
-    }
-    return 0;
-  });
-  return { rows: sorted, pending: pending2 };
-}
-function reportOfUsageRows(rows) {
-  const { rows: cells, pending: pending2 } = aggregateUsage(rows.runs, (id) => rows.parents[id]);
-  return {
-    rows: cells,
-    // The store counts what it could not price; the fold sees the same runs without `usage`.
-    pending: Math.max(pending2, rows.pending),
-    ...rows.earliestFinishedAt !== void 0 ? { earliestFinishedAt: rows.earliestFinishedAt } : {},
-    retentionDays: rows.retentionDays
-  };
-}
-function isUsageRun(v) {
-  if (!isIdentity(v)) return false;
-  const r = v;
-  return typeof r.id === "string" && typeof r.threadKey === "string" && typeof r.channelId === "string" && (r.agent === void 0 || typeof r.agent === "string") && (r.parentRunId === void 0 || typeof r.parentRunId === "string") && typeof r.startedAt === "number" && typeof r.finishedAt === "number" && (r.usage === void 0 || isRunUsage(r.usage));
-}
-function hasReportTail(r) {
-  if (typeof r.pending !== "number" || typeof r.retentionDays !== "number") return false;
-  return r.earliestFinishedAt === void 0 || typeof r.earliestFinishedAt === "number";
-}
-function isRunUsageRows(v) {
-  if (typeof v !== "object" || v === null) return false;
-  const r = v;
-  if (!Array.isArray(r.runs) || !r.runs.every(isUsageRun)) return false;
-  if (typeof r.parents !== "object" || r.parents === null || Array.isArray(r.parents)) return false;
-  if (!Object.values(r.parents).every(isIdentity)) return false;
-  return hasReportTail(r);
-}
-function isRunUsageReport(v) {
-  if (typeof v !== "object" || v === null) return false;
-  const r = v;
-  if (!Array.isArray(r.rows) || !hasReportTail(r)) return false;
-  return r.rows.every(
-    (row2) => isIdentity(row2) && typeof row2.day === "string" && typeof row2.threadKey === "string" && typeof row2.channelId === "string" && typeof row2.agent === "string" && typeof row2.runs === "number" && typeof row2.wallMs === "number" && isRunUsage(row2.usage)
-  );
-}
-var UNKNOWN_MODEL, UNKNOWN_AGENT, MODEL_TURN, num, emptyUsage, foldUsd, isModelUsage, dayOf, identityOf, CELL_ORDER, isIdentity;
-var init_runUsage = __esm({
-  "../../src/core/runUsage.ts"() {
-    "use strict";
-    UNKNOWN_MODEL = "unknown";
-    UNKNOWN_AGENT = "unknown";
-    MODEL_TURN = "model.turn";
-    num = (v) => typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : 0;
-    emptyUsage = () => ({ turns: 0, byModel: {} });
-    foldUsd = (a, b) => a === void 0 || b === void 0 ? void 0 : a === null || b === null ? null : a + b;
-    isModelUsage = (v) => {
-      if (typeof v !== "object" || v === null) return false;
-      const m = v;
-      if (!["turns", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"].every(
-        (k) => typeof m[k] === "number"
-      ))
-        return false;
-      if (m.usd !== void 0 && m.usd !== null && typeof m.usd !== "number") return false;
-      if (m.feeUsd !== void 0 && typeof m.feeUsd !== "number") return false;
-      return m.priceSources === void 0 || Array.isArray(m.priceSources) && m.priceSources.every((s) => typeof s === "string");
-    };
-    dayOf = (epochMs) => new Date(epochMs).toISOString().slice(0, 10);
-    identityOf = (who2) => ({
-      userId: who2.userId,
-      ...who2.userName ? { userName: who2.userName } : {}
-    });
-    CELL_ORDER = ["day", "userId", "threadKey", "channelId", "agent"];
-    isIdentity = (v) => typeof v === "object" && v !== null && typeof v.userId === "string" && (v.userName === void 0 || typeof v.userName === "string");
-  }
-});
-
 // ../../src/core/ship/handoff.ts
 function isEmptyHandoff(h) {
   return LISTS.every((k) => listOf(asLists(h), k).length === 0);
@@ -5803,7 +5613,11 @@ function pullMergedEventType(key) {
   return `${PULL_MERGED_EVENT_PREFIX}${key.instanceId.slice(0, room)}${suffix}`;
 }
 function coordinatorFields(tag) {
-  return tag ? { parentInstanceId: tag.parentInstanceId, idempotencyKey: tag.idempotencyKey } : {};
+  return tag ? {
+    parentInstanceId: tag.parentInstanceId,
+    idempotencyKey: tag.idempotencyKey,
+    ...tag.costCapUsd !== void 0 ? { costCapUsd: tag.costCapUsd } : {}
+  } : {};
 }
 function isCoordinatorInstance(v) {
   if (!isObject(v)) return false;
@@ -5972,6 +5786,221 @@ var init_contract2 = __esm({
   }
 });
 
+// ../../src/core/runUsage.ts
+function usageOfEvents(events) {
+  const usage = emptyUsage();
+  const priced = /* @__PURE__ */ new Map();
+  for (const e of events) {
+    if (e.type !== "span_end" || e.name !== MODEL_TURN) continue;
+    const attrs = e.attrs ?? {};
+    const model = typeof attrs.model === "string" && attrs.model ? attrs.model : UNKNOWN_MODEL;
+    const m = usage.byModel[model] ?? {
+      turns: 0,
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheReadTokens: 0,
+      cacheWriteTokens: 0
+    };
+    const counted2 = num(attrs.inputTokens) + num(attrs.outputTokens) + num(attrs.cacheReadTokens) + num(attrs.cacheWriteTokens);
+    m.turns += 1;
+    m.inputTokens += num(attrs.inputTokens);
+    m.outputTokens += num(attrs.outputTokens);
+    m.cacheReadTokens += num(attrs.cacheReadTokens);
+    m.cacheWriteTokens += num(attrs.cacheWriteTokens);
+    usage.byModel[model] = m;
+    usage.turns += 1;
+    const hasUsd = typeof attrs.usd === "number" && Number.isFinite(attrs.usd);
+    const hasSource = typeof attrs.priceSource === "string" && attrs.priceSource !== "";
+    const p = priced.get(model) ?? {
+      usd: 0,
+      feeUsd: 0,
+      feeTurns: 0,
+      pricedTurns: 0,
+      unpricedTokenTurns: 0,
+      sources: /* @__PURE__ */ new Set()
+    };
+    if (counted2 > 0 && !hasUsd) p.unpricedTokenTurns += 1;
+    if (hasUsd) {
+      p.usd += attrs.usd;
+      p.pricedTurns += 1;
+    }
+    if (typeof attrs.feeUsd === "number" && Number.isFinite(attrs.feeUsd)) {
+      p.feeUsd += attrs.feeUsd;
+      p.feeTurns += 1;
+    }
+    if (hasSource) p.sources.add(attrs.priceSource);
+    priced.set(model, p);
+  }
+  for (const [model, p] of priced) {
+    if (p.pricedTurns === 0 && p.sources.size === 0) continue;
+    const m = usage.byModel[model];
+    m.usd = p.unpricedTokenTurns > 0 ? null : p.usd;
+    if (p.feeTurns > 0) m.feeUsd = p.feeUsd;
+    if (p.sources.size > 0) m.priceSources = [...p.sources].sort();
+  }
+  return usage;
+}
+function addUsage(a, b) {
+  const out = { turns: a.turns + b.turns, byModel: {} };
+  for (const src of [a.byModel, b.byModel]) {
+    for (const [model, m] of Object.entries(src)) {
+      const acc = out.byModel[model];
+      if (!acc) {
+        out.byModel[model] = { ...m, ...m.priceSources ? { priceSources: [...m.priceSources] } : {} };
+        continue;
+      }
+      acc.turns += m.turns;
+      acc.inputTokens += m.inputTokens;
+      acc.outputTokens += m.outputTokens;
+      acc.cacheReadTokens += m.cacheReadTokens;
+      acc.cacheWriteTokens += m.cacheWriteTokens;
+      const usd2 = foldUsd(acc.usd, m.usd);
+      if (usd2 === void 0) delete acc.usd;
+      else acc.usd = usd2;
+      if (acc.feeUsd !== void 0 || m.feeUsd !== void 0) acc.feeUsd = (acc.feeUsd ?? 0) + (m.feeUsd ?? 0);
+      const sources = /* @__PURE__ */ new Set([...acc.priceSources ?? [], ...m.priceSources ?? []]);
+      if (sources.size > 0) acc.priceSources = [...sources].sort();
+    }
+  }
+  return out;
+}
+function isRunUsage(v) {
+  if (typeof v !== "object" || v === null) return false;
+  const u = v;
+  if (typeof u.turns !== "number") return false;
+  if (typeof u.byModel !== "object" || u.byModel === null || Array.isArray(u.byModel)) return false;
+  return Object.values(u.byModel).every(isModelUsage);
+}
+function shipRunsOf(runs) {
+  return runs.flatMap((run2) => {
+    if (!run2.parentInstanceId || !run2.idempotencyKey) return [];
+    const unit = unitOfIdempotencyKey(run2.idempotencyKey);
+    if (!unit) return [];
+    return [
+      {
+        id: run2.id,
+        unitKey: `${run2.parentInstanceId}:${unit}`,
+        finishedAt: run2.finishedAt,
+        ...run2.costCapUsd !== void 0 ? { costCapUsd: run2.costCapUsd } : {},
+        ...run2.usage !== void 0 ? { usage: run2.usage } : {}
+      }
+    ];
+  });
+}
+function billedTo(run2, batch, lookupParent) {
+  if (!run2.parentRunId) return identityOf(run2);
+  const parent = batch.get(run2.parentRunId) ?? lookupParent(run2.parentRunId);
+  return identityOf(parent ?? run2);
+}
+function aggregateUsage(runs, lookupParent = () => void 0) {
+  const batch = new Map(runs.map((r) => [r.id, r]));
+  const rows = /* @__PURE__ */ new Map();
+  let pending2 = 0;
+  for (const run2 of runs) {
+    const who2 = billedTo(run2, batch, lookupParent);
+    const day2 = dayOf(run2.finishedAt);
+    const agent = run2.agent ?? UNKNOWN_AGENT;
+    const key = JSON.stringify([day2, who2.userId, run2.threadKey, run2.channelId, agent]);
+    const row2 = rows.get(key) ?? {
+      day: day2,
+      userId: who2.userId,
+      threadKey: run2.threadKey,
+      channelId: run2.channelId,
+      agent,
+      runs: 0,
+      wallMs: 0,
+      usage: emptyUsage()
+    };
+    if (who2.userName && !row2.userName) row2.userName = who2.userName;
+    row2.runs += 1;
+    row2.wallMs += Math.max(0, run2.finishedAt - run2.startedAt);
+    if (run2.usage) row2.usage = addUsage(row2.usage, run2.usage);
+    else pending2 += 1;
+    rows.set(key, row2);
+  }
+  const sorted = [...rows.values()].sort((a, b) => {
+    for (const k of CELL_ORDER) {
+      if (a[k] < b[k]) return -1;
+      if (a[k] > b[k]) return 1;
+    }
+    return 0;
+  });
+  return { rows: sorted, pending: pending2 };
+}
+function reportOfUsageRows(rows) {
+  const { rows: cells, pending: pending2 } = aggregateUsage(rows.runs, (id) => rows.parents[id]);
+  return {
+    rows: cells,
+    shipRuns: shipRunsOf(rows.runs),
+    // The store counts what it could not price; the fold sees the same runs without `usage`.
+    pending: Math.max(pending2, rows.pending),
+    ...rows.earliestFinishedAt !== void 0 ? { earliestFinishedAt: rows.earliestFinishedAt } : {},
+    retentionDays: rows.retentionDays
+  };
+}
+function isUsageRun(v) {
+  if (!isIdentity(v)) return false;
+  const r = v;
+  return typeof r.id === "string" && typeof r.threadKey === "string" && typeof r.channelId === "string" && (r.agent === void 0 || typeof r.agent === "string") && (r.parentRunId === void 0 || typeof r.parentRunId === "string") && (r.parentInstanceId === void 0 || typeof r.parentInstanceId === "string") && (r.idempotencyKey === void 0 || typeof r.idempotencyKey === "string") && (r.costCapUsd === void 0 || typeof r.costCapUsd === "number" && Number.isFinite(r.costCapUsd) && r.costCapUsd > 0) && typeof r.startedAt === "number" && typeof r.finishedAt === "number" && (r.usage === void 0 || isRunUsage(r.usage));
+}
+function hasReportTail(r) {
+  if (typeof r.pending !== "number" || typeof r.retentionDays !== "number") return false;
+  return r.earliestFinishedAt === void 0 || typeof r.earliestFinishedAt === "number";
+}
+function isRunUsageRows(v) {
+  if (typeof v !== "object" || v === null) return false;
+  const r = v;
+  if (!Array.isArray(r.runs) || !r.runs.every(isUsageRun)) return false;
+  if (typeof r.parents !== "object" || r.parents === null || Array.isArray(r.parents)) return false;
+  if (!Object.values(r.parents).every(isIdentity)) return false;
+  return hasReportTail(r);
+}
+function isRunUsageReport(v) {
+  if (typeof v !== "object" || v === null) return false;
+  const r = v;
+  if (!Array.isArray(r.rows) || !hasReportTail(r)) return false;
+  if (r.shipRuns !== void 0 && (!Array.isArray(r.shipRuns) || !r.shipRuns.every(isShipRunUsage))) return false;
+  return r.rows.every(
+    (row2) => isIdentity(row2) && typeof row2.day === "string" && typeof row2.threadKey === "string" && typeof row2.channelId === "string" && typeof row2.agent === "string" && typeof row2.runs === "number" && typeof row2.wallMs === "number" && isRunUsage(row2.usage)
+  );
+}
+function isShipRunUsage(v) {
+  if (typeof v !== "object" || v === null) return false;
+  const r = v;
+  return typeof r.id === "string" && typeof r.unitKey === "string" && typeof r.finishedAt === "number" && Number.isFinite(r.finishedAt) && (r.costCapUsd === void 0 || typeof r.costCapUsd === "number" && Number.isFinite(r.costCapUsd) && r.costCapUsd > 0) && (r.usage === void 0 || isRunUsage(r.usage));
+}
+var UNKNOWN_MODEL, UNKNOWN_AGENT, MODEL_TURN, num, emptyUsage, foldUsd, isModelUsage, dayOf, identityOf, CELL_ORDER, isIdentity;
+var init_runUsage = __esm({
+  "../../src/core/runUsage.ts"() {
+    "use strict";
+    init_contract2();
+    UNKNOWN_MODEL = "unknown";
+    UNKNOWN_AGENT = "unknown";
+    MODEL_TURN = "model.turn";
+    num = (v) => typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : 0;
+    emptyUsage = () => ({ turns: 0, byModel: {} });
+    foldUsd = (a, b) => a === void 0 || b === void 0 ? void 0 : a === null || b === null ? null : a + b;
+    isModelUsage = (v) => {
+      if (typeof v !== "object" || v === null) return false;
+      const m = v;
+      if (!["turns", "inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"].every(
+        (k) => typeof m[k] === "number"
+      ))
+        return false;
+      if (m.usd !== void 0 && m.usd !== null && typeof m.usd !== "number") return false;
+      if (m.feeUsd !== void 0 && typeof m.feeUsd !== "number") return false;
+      return m.priceSources === void 0 || Array.isArray(m.priceSources) && m.priceSources.every((s) => typeof s === "string");
+    };
+    dayOf = (epochMs) => new Date(epochMs).toISOString().slice(0, 10);
+    identityOf = (who2) => ({
+      userId: who2.userId,
+      ...who2.userName ? { userName: who2.userName } : {}
+    });
+    CELL_ORDER = ["day", "userId", "threadKey", "channelId", "agent"];
+    isIdentity = (v) => typeof v === "object" && v !== null && typeof v.userId === "string" && (v.userName === void 0 || typeof v.userName === "string");
+  }
+});
+
 // ../../src/core/pipelineStanding.ts
 function hostedStageDetail(stage) {
   switch (stage) {
@@ -6589,6 +6618,8 @@ function isRunRecord(v) {
     return false;
   if (r.idempotencyKey !== void 0 && (typeof r.idempotencyKey !== "string" || !IDEMPOTENCY_KEY_PATTERN.test(r.idempotencyKey)))
     return false;
+  if (r.costCapUsd !== void 0 && (r.parentInstanceId === void 0 || typeof r.costCapUsd !== "number" || !Number.isFinite(r.costCapUsd) || r.costCapUsd <= 0))
+    return false;
   if (r.instanceId !== void 0 && (typeof r.instanceId !== "string" || !INSTANCE_ID_PATTERN.test(r.instanceId)))
     return false;
   if (r.pipeline !== void 0 && !isPipelineSummaryShape(r.pipeline)) return false;
@@ -12975,6 +13006,9 @@ async function waitForResident(step, expectedCommit, deadline, io, deps, resourc
   const bearer = RESIDENT_BEARER_ENVS.map((name) => deps.env[name]).find((value) => value?.trim());
   if (resources && !bearer) return `registry unreadable: no ${RESIDENT_BEARER_ENVS.join(" / ")}`;
   let problem = "readiness deadline expired before readback";
+  let lastLoggedProblem = "";
+  let lastLoggedAt = -Infinity;
+  let nextReconcileAt = 0;
   while (deps.now() < deadline) {
     const timeoutMs = Math.min(LIVE_GATE_POLL_MS, deadline - deps.now());
     const [health, registry] = await Promise.all([
@@ -12987,7 +13021,16 @@ async function waitForResident(step, expectedCommit, deadline, io, deps, resourc
     ].filter(Boolean);
     if (problems.length === 0 && deps.now() <= deadline) return void 0;
     problem = problems.join("; ") || "readback arrived after the readiness deadline";
-    io.log(`[deploy:all] resident: waiting for readiness \u2014 ${problem}`);
+    if (problem !== lastLoggedProblem || deps.now() - lastLoggedAt >= MINUTE_MS) {
+      io.log(`[deploy:all] resident: waiting for readiness \u2014 ${problem}`);
+      lastLoggedProblem = problem;
+      lastLoggedAt = deps.now();
+    }
+    if (resources && deps.now() >= nextReconcileAt && deadline - deps.now() > 2 * LIVE_GATE_POLL_MS && !residentWorkerProblem(health, expectedCommit)) {
+      const retry = await reconcileFleet(step, io, deps, false);
+      if (retry && !reconciledResources(retry)) io.log(reconcileLine(step.name, retry));
+      nextReconcileAt = deps.now() + MINUTE_MS;
+    }
     const left = deadline - deps.now();
     if (left > 0) await deps.sleep(Math.min(LIVE_GATE_POLL_MS, left));
   }
@@ -13008,11 +13051,11 @@ async function beginDrain(step, expectedCommit, io, deps) {
   io.log(drainBeganLine(step.name, answer2));
   return { attempted: true, drained: drainSet(answer2), until: drainUntil(answer2) };
 }
-async function reconcileFleet(step, io, deps) {
+async function reconcileFleet(step, io, deps, log = true) {
   const bearer = step.drain ? deps.env[step.drain.tokenEnv] : void 0;
   if (!step.drain || !bearer || !deps.postJson) return;
   const answer2 = await deps.postJson(reconcileUrl(step.drain.url), bearer, {});
-  io.log(reconcileLine(step.name, answer2));
+  if (log) io.log(reconcileLine(step.name, answer2));
   return answer2;
 }
 async function endDrain(step, drain, io, deps) {
@@ -15586,15 +15629,15 @@ function sandboxNoAnswerMessage(route2, budgetMs) {
 function sandboxEmptyFailureMessage(route2) {
   return `sandbox worker ${route2}: failure with an empty message (the Worker's failure shape with its text missing)`;
 }
-function waitForSlot(ms, waitedMs, signal2) {
+function sandboxStopped(route2) {
+  return new ExecInfraError(`sandbox ${route2}: the run was stopped`, "aborted");
+}
+function waitForRetry(ms, route2, signal2) {
   return new Promise((resolve13, reject) => {
-    const stopped = () => new ExecCapacityError(
-      `sandbox fleet busy \u2014 stopped waiting for a free per-thread sandbox after ${Math.round(waitedMs / 1e3)}s: the run was stopped`
-    );
-    if (signal2?.aborted) return reject(stopped());
+    if (signal2?.aborted) return reject(sandboxStopped(route2));
     const onAbort = () => {
       clearTimeout(timer);
-      reject(stopped());
+      reject(sandboxStopped(route2));
     };
     const timer = setTimeout(() => {
       signal2?.removeEventListener("abort", onAbort);
@@ -15629,13 +15672,13 @@ var init_cloudflareSandbox = __esm({
       scrubbed;
       /** The Worker reconnects by thread key, so scrub a reused sandbox before
        * seed, checkout, or any model-visible command can touch its old store. */
-      async prepareCredentialBoundary() {
+      async prepareCredentialBoundary(opts) {
         const result = await this.call(
           "/exec",
           { command: legacySandboxCredentialScrub(SANDBOX_CREDENTIAL_FILE) },
+          opts?.signal,
           void 0,
-          void 0,
-          void 0,
+          opts?.span,
           true
         );
         if (Number(result.exitCode ?? -1) !== 0)
@@ -15691,8 +15734,9 @@ var init_cloudflareSandbox = __esm({
        *  each send runs under. Time spent waiting for a slot never eats into a
        *  send's deadline: nothing ran during it. */
       async call(route2, body, signal2, budgetMs = BASH_TIMEOUT_MS, span, skipScrub = false) {
+        if (signal2?.aborted) throw sandboxStopped(route2);
         if (this.opts.scrubLegacyCredentials && !skipScrub) {
-          this.scrubbed ??= this.prepareCredentialBoundary();
+          this.scrubbed ??= this.prepareCredentialBoundary({ signal: signal2, span });
           await this.scrubbed;
         }
         const envs = await this.opts.resolveEnvs();
@@ -15726,7 +15770,7 @@ var init_cloudflareSandbox = __esm({
           }
           const delay = Math.min(plan3.backoff[Math.min(attempt, plan3.backoff.length - 1)], plan3.budget - waited);
           attempt++;
-          await waitForSlot(delay, waited, signal2);
+          await waitForRetry(delay, route2, signal2);
           waited += delay;
         }
       }
@@ -15740,7 +15784,8 @@ var init_cloudflareSandbox = __esm({
         let lastErr = "";
         let lastStatus = 0;
         for (const delay of delays) {
-          if (delay > 0) await new Promise((r) => setTimeout(r, delay));
+          if (delay > 0) await waitForRetry(delay, route2, signal2);
+          if (signal2?.aborted) throw sandboxStopped(route2);
           let res;
           let text;
           const deadline = execDeadline(sendDeadlineMs(budgetMs), signal2);
@@ -19077,7 +19122,13 @@ async function makeExecutor(opts, ctx, span) {
       const executor2 = await makePerThreadExecutor(opts, perThreadCheckout(opts, ctx));
       await recheckOwner();
       const handle2 = probe.kind === "status" ? probe.seed : void 0;
-      const outcome = handle2 && executor2 instanceof CloudflareSandboxExecutor ? await seedSandbox(executor2, handle2, ctx, () => probeResident(resident, token2, resource, span), span) : void 0;
+      const outcome = handle2 && executor2 instanceof CloudflareSandboxExecutor ? await seedSandbox(
+        executor2,
+        handle2,
+        ctx,
+        () => probeResident(resident, token2, resource, span, ctx.stopSignal),
+        span
+      ) : void 0;
       if (outcome !== void 0) await recheckOwner();
       if (outcome && "seeded" in outcome) {
         return {
@@ -19117,8 +19168,9 @@ async function seedSandbox(executor, handle2, ctx, reprobe, span) {
   for (let retried = false; ; retried = true) {
     let answer2;
     try {
-      answer2 = await executor.seed(seed, { span });
+      answer2 = await executor.seed(seed, { span, signal: ctx.stopSignal });
     } catch (err2) {
+      if (isRunStopError(err2)) throw err2;
       return { why: oneLine(`seed failed (${err2 instanceof Error ? err2.message : String(err2)})`) };
     }
     if (answer2.seeded) {
@@ -19134,6 +19186,7 @@ async function seedSandbox(executor, handle2, ctx, reprobe, span) {
       };
     }
     const fresh = answer2.reason === "seed-missing" && !retried ? await reprobe() : void 0;
+    if (fresh?.kind === "unreachable" && fresh.transport && ctx.stopSignal?.aborted) throw wakeStopped("/status");
     const decision = seedRetryDecision({
       answer: answer2,
       attempted: seed,
@@ -21682,6 +21735,9 @@ function usageReportOfRecords(records, query, lookupParent, retentionDays) {
     userId: r.userId,
     ...r.userName ? { userName: r.userName } : {},
     ...r.parentRunId ? { parentRunId: r.parentRunId } : {},
+    ...r.parentInstanceId ? { parentInstanceId: r.parentInstanceId } : {},
+    ...r.idempotencyKey ? { idempotencyKey: r.idempotencyKey } : {},
+    ...r.costCapUsd !== void 0 ? { costCapUsd: r.costCapUsd } : {},
     threadKey: r.threadKey,
     channelId: r.channelId,
     ...r.agent ? { agent: r.agent } : {},
@@ -21694,7 +21750,13 @@ function usageReportOfRecords(records, query, lookupParent, retentionDays) {
     (m, r) => m === void 0 || r.finishedAt < m ? r.finishedAt : m,
     void 0
   );
-  return { rows, pending: pending2, ...earliest !== void 0 ? { earliestFinishedAt: earliest } : {}, retentionDays };
+  return {
+    rows,
+    shipRuns: shipRunsOf(runs),
+    pending: pending2,
+    ...earliest !== void 0 ? { earliestFinishedAt: earliest } : {},
+    retentionDays
+  };
 }
 function isValidRunId(id) {
   return typeof id === "string" && RUN_ID_PATTERN.test(id);
@@ -22351,6 +22413,43 @@ var init_costsSnapshotStore = __esm({
   }
 });
 
+// ../../src/core/shipSpend.ts
+function recordedUsd(usage) {
+  const models = Object.values(usage?.byModel ?? {});
+  if (!usage || !Number.isSafeInteger(usage.turns) || usage.turns < 0) return null;
+  if (usage.turns === 0 && models.length === 0) return 0;
+  if (models.length === 0 || models.reduce((sum, model) => sum + model.turns, 0) !== usage.turns || models.some((model) => typeof model.usd !== "number" || !Number.isFinite(model.usd) || model.usd < 0))
+    return null;
+  return models.reduce((sum, model) => sum + model.usd, 0);
+}
+function buildShipSpendReport(runs, range) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const run2 of runs) {
+    const day2 = new Date(run2.finishedAt).toISOString().slice(0, 10);
+    if (day2 < range.from || day2 > range.to) continue;
+    groups.set(run2.unitKey, [...groups.get(run2.unitKey) ?? [], run2]);
+  }
+  const units = [...groups].map(([key, children]) => {
+    const ordered = children.sort((a, b) => a.finishedAt - b.finishedAt || a.id.localeCompare(b.id));
+    const caps = new Set(ordered.map((r) => r.costCapUsd));
+    const capUsd = caps.size === 1 ? ordered[0]?.costCapUsd ?? null : null;
+    let cumulative = 0;
+    const points = ordered.map((r) => {
+      const usd2 = recordedUsd(r.usage);
+      cumulative = cumulative === null || usd2 === null ? null : cumulative + usd2;
+      return { id: r.id, finishedAt: r.finishedAt, usd: usd2, cumulativeUsd: cumulative };
+    });
+    return { key, capUsd, totalUsd: cumulative, runs: points };
+  });
+  units.sort((a, b) => (b.runs.at(-1)?.finishedAt ?? 0) - (a.runs.at(-1)?.finishedAt ?? 0));
+  return { range, units };
+}
+var init_shipSpend = __esm({
+  "../../src/core/shipSpend.ts"() {
+    "use strict";
+  }
+});
+
 // ../../src/core/costsService.ts
 async function viewerRunUserIds(userIds, viewer, emailOfSlackUser, cache2) {
   const email = viewer?.email?.toLowerCase();
@@ -22384,7 +22483,12 @@ function createCostsService(cfg, snapshots, deps = {}) {
     groups: () => Object.keys(cfg.groups),
     async report(group, daysParam) {
       const g = groupOf(group);
-      return reportFromSnapshot(await snapshotOrThrow(), group, g, daysParam, meta, deps.billers);
+      const snapshot = await snapshotOrThrow();
+      const daily = reportFromSnapshot(snapshot, group, g, daysParam, meta, deps.billers);
+      return {
+        ...daily,
+        ...snapshot.runUsage?.shipRuns ? { shipSpend: buildShipSpendReport(snapshot.runUsage.shipRuns, daily.range) } : {}
+      };
     },
     async byReport(group, daysParam, dimension, viewer) {
       const g = groupOf(group);
@@ -22487,6 +22591,7 @@ var init_costsService = __esm({
     init_costs();
     init_costsSnapshot();
     init_costsSnapshotStore();
+    init_shipSpend();
     COSTS_OFF_MESSAGE = "Cost reporting isn't configured \u2014 set costs.cloudflareAccountId + costs.groups in config and the CF_ANALYTICS_TOKEN secret to enable this view.";
     NoCostsSnapshotError = class extends Error {
       name = "NoCostsSnapshotError";
@@ -33009,7 +33114,13 @@ function interruptedRunRecord(summary, snap, finishedAt) {
       repo: summary.repo,
       ...summary.parentRunId !== void 0 ? { parentRunId: summary.parentRunId } : {},
       ...summary.seed !== void 0 ? { seed: summary.seed } : {},
-      ...summary.parentInstanceId !== void 0 && summary.idempotencyKey !== void 0 ? { coordinator: { parentInstanceId: summary.parentInstanceId, idempotencyKey: summary.idempotencyKey } } : {},
+      ...summary.parentInstanceId !== void 0 && summary.idempotencyKey !== void 0 ? {
+        coordinator: {
+          parentInstanceId: summary.parentInstanceId,
+          idempotencyKey: summary.idempotencyKey,
+          ...summary.costCapUsd !== void 0 ? { costCapUsd: summary.costCapUsd } : {}
+        }
+      } : {},
       ...summary.hosted ? { hosted: true } : {},
       finishedAt,
       status: "interrupted",
@@ -33058,7 +33169,13 @@ function reclaimedRunRecord(input) {
     ...row2.meta.session !== void 0 ? { session: row2.meta.session } : {},
     // A coordinator's child keeps its instance and key on the close (item 48),
     // so the state Worker's finish still sends the parent its event.
-    ...row2.meta.parentInstanceId !== void 0 && row2.meta.idempotencyKey !== void 0 ? { coordinator: { parentInstanceId: row2.meta.parentInstanceId, idempotencyKey: row2.meta.idempotencyKey } } : {},
+    ...row2.meta.parentInstanceId !== void 0 && row2.meta.idempotencyKey !== void 0 ? {
+      coordinator: {
+        parentInstanceId: row2.meta.parentInstanceId,
+        idempotencyKey: row2.meta.idempotencyKey,
+        ...row2.meta.costCapUsd !== void 0 ? { costCapUsd: row2.meta.costCapUsd } : {}
+      }
+    } : {},
     ...row2.meta.hosted ? { hosted: true } : {},
     finishedAt,
     status: status3,
@@ -36745,7 +36862,7 @@ function addressedBarePrOf(s, text) {
 function contextCueOf(later2) {
   const clause = later2.before.split(/[;\n]/).at(-1) ?? later2.before;
   const action = [
-    ...clause.matchAll(/\b(?:re-?review|review|see|context|example|reference|related|compare|background)\b/gi)
+    ...clause.matchAll(/\b(?:re-?review|review|see|context|example|reference|related|compare|background|packages)\b/gi)
   ].at(-1)?.[0].toLowerCase();
   return action !== void 0 && !/^(?:re-?review|review)$/.test(action) || /^[ \t]*(?:[,:][ \t]*)?(?:for|as)[ \t]+(?:context|reference|background)\b/i.test(later2.after);
 }
@@ -39975,6 +40092,7 @@ function summaryOf(run2, now) {
     ...m?.parentRunId !== void 0 ? { parentRunId: m.parentRunId } : {},
     ...m?.parentInstanceId !== void 0 ? { parentInstanceId: m.parentInstanceId } : {},
     ...m?.idempotencyKey !== void 0 ? { idempotencyKey: m.idempotencyKey } : {},
+    ...m?.costCapUsd !== void 0 ? { costCapUsd: m.costCapUsd } : {},
     ...m?.seed !== void 0 ? { seed: m.seed } : {},
     ...m?.hosted ? { hosted: true } : {},
     ...run2.instanceId !== void 0 ? { instanceId: run2.instanceId } : {},
@@ -47793,6 +47911,7 @@ async function claimRun(deps, ctx) {
     registry.publish(run2.id, {
       type: "coordinator_tag",
       parentInstanceId: coordinator.parentInstanceId,
+      ...coordinator.costCapUsd !== void 0 ? { costCapUsd: coordinator.costCapUsd } : {},
       ...unit !== void 0 ? { unit } : {},
       ...coordinator.branch !== void 0 ? { branch: coordinator.branch } : {},
       ...coordinator.transportWorkflowId !== void 0 ? { transportWorkflowId: coordinator.transportWorkflowId } : {},
@@ -57760,10 +57879,12 @@ function carriedCoordinatorTag(row2, events) {
   const publication = tag?.type === "coordinator_tag" ? tag.publication : void 0;
   const transportWorkflowId = tag?.type === "coordinator_tag" ? tag.transportWorkflowId : void 0;
   const recovery = tag?.type === "coordinator_tag" ? tag.recovery : void 0;
+  const costCapUsd = (tag?.type === "coordinator_tag" ? tag.costCapUsd : void 0) ?? row2.meta.costCapUsd;
   const branch3 = (tag?.type === "coordinator_tag" ? tag.branch : void 0) ?? row2.meta.ref;
   return {
     parentInstanceId,
     idempotencyKey,
+    ...costCapUsd !== void 0 ? { costCapUsd } : {},
     ...branch3 !== void 0 ? { branch: branch3 } : {},
     ...transportWorkflowId !== void 0 ? { transportWorkflowId } : {},
     ...recovery !== void 0 ? { recovery } : {},
@@ -58196,6 +58317,11 @@ __export(dispatcher_exports, {
   dispatch: () => dispatch,
   dispatchClick: () => dispatchClick
 });
+function stripConnectorFooters(text) {
+  let probe = text.trimEnd();
+  while (CONNECTOR_FOOTER_RE.test(probe)) probe = probe.replace(CONNECTOR_FOOTER_RE, "").trimEnd();
+  return probe;
+}
 async function priorDecisionRecord(store, threadKey, repo, taskKey) {
   let before;
   let beforeId;
@@ -58468,11 +58594,19 @@ async function dispatch(deps, msg, io, opts = {}) {
   let resumeRowClosed = false;
   let restartRequest;
   let releaseLegacyOwnership;
+  let pendingStop;
+  const relayStop = (mode) => {
+    if (registered) {
+      registered.control.requestStop(mode);
+      return;
+    }
+    if (mode === "hard" || pendingStop === void 0) pendingStop = mode;
+  };
   const reservationHooks = {
-    onStop: (mode) => void registered?.control.requestStop(mode),
+    onStop: relayStop,
     onFenced: () => {
       fencedWhileAttaching = true;
-      void registered?.control.requestStop("hard");
+      relayStop("hard");
     }
   };
   try {
@@ -58480,7 +58614,7 @@ async function dispatch(deps, msg, io, opts = {}) {
     const typed = parseDirectives(msg.text);
     const typedAgent = typed.agent;
     const explicitPr = explicitPrOf(msg.text);
-    const shipTaskProbe = typed.text.replace(/\s+\*Sent using\* ChatGPT Connector \(Local MCP\)\s*$/i, "");
+    const shipTaskProbe = stripConnectorFooters(typed.text);
     const namedShipTask = typedAgent === "ship" && explicitPr ? shipTaskText(shipTaskProbe, explicitPr.repo) : "";
     const freshShipTask = namedShipTask !== "" && !/^(?:please\s+)?(?:continue|resume|retry|keep going|carry on|finish)(?:\s+(?:with|on))?(?:\s+(?:it|this|the task|the plan|(?:the\s+)?work|working|(?:the\s+)?review|reviewing))?(?:\s+(?:of|on|for|with))?[.!]?$/i.test(
       namedShipTask
@@ -59096,8 +59230,8 @@ async function dispatch(deps, msg, io, opts = {}) {
       hooks: {
         reservation: reservationHooks,
         adopt: {
-          onStop: (mode) => void registered?.control.requestStop(mode),
-          onFenced: () => void registered?.control.requestStop("hard")
+          onStop: relayStop,
+          onFenced: () => relayStop("hard")
         }
       }
     };
@@ -59434,6 +59568,10 @@ async function dispatch(deps, msg, io, opts = {}) {
     });
     const { run: run2, runId: runId3, channelVisibility, liveUrl, events, publishText, publishMeta } = registration;
     registered = run2;
+    if (pendingStop) {
+      run2.control.requestStop(pendingStop);
+      pendingStop = void 0;
+    }
     if (coordinator) io.runStarted?.({ id: runId3 });
     for (const summary of seedNotes)
       events.publish({ type: "run_note", kind: "seed", summary: oneLine(summary), at: clock4() });
@@ -60313,7 +60451,7 @@ async function dispatchClick(deps, click) {
     activeRuns--;
   }
 }
-var activeRuns, FULL_SHA2;
+var CONNECTOR_FOOTER_RE, activeRuns, FULL_SHA2;
 var init_dispatcher = __esm({
   "../../src/core/dispatcher.ts"() {
     "use strict";
@@ -60379,6 +60517,7 @@ var init_dispatcher = __esm({
     init_preflight();
     init_types5();
     init_decisionRecordReservation();
+    CONNECTOR_FOOTER_RE = /(?:^|\s)(?:(\*{1,3}|_{1,3})Sent using\1|Sent using) ChatGPT Connector \(Local MCP\)\s*$/i;
     activeRuns = 0;
     FULL_SHA2 = /^[0-9a-f]{40}$/i;
   }
@@ -72663,7 +72802,12 @@ function residentStateTone(state) {
 }
 function residentsFleetTone(records) {
   if (records.length === 0) return "grey";
-  const tones = new Set(records.map((record4) => residentStateTone(residentLive(rec(record4)).state)));
+  const tones = new Set(
+    records.map((record4) => {
+      const state = residentStateTone(residentLive(rec(record4)).state);
+      return state === "green" && residentImageReport(record4) === "pending" ? "amber" : state;
+    })
+  );
   if (tones.has("red")) return "red";
   if (tones.has("amber")) return "amber";
   return tones.size === 1 && tones.has("green") ? "green" : "grey";
@@ -72676,6 +72820,10 @@ function residentLive(record4) {
   if (typeof live.error === "string") return { ...live, state: "unreachable", reason: live.error };
   return { ...live, state: str8(live.state) || "unknown", reason: str8(live.reason) };
 }
+function residentImageReport(record4) {
+  const report2 = residentLive(record4).imageReport;
+  return report2 === "current" || report2 === "pending" ? report2 : "unknown";
+}
 var RESIDENT_SLUG_RE, str8, rec;
 var init_residentsModel = __esm({
   "../../src/channels/residentsModel.ts"() {
@@ -72806,7 +72954,8 @@ function serveResidentsFeed(source2, sink, onLive) {
     reading = true;
     void source2.listing().then((r) => {
       reading = false;
-      if (!("error" in r)) send(frame({ type: "residents", cap: r.cap, count: r.count, residents: r.residents }));
+      if (!("error" in r))
+        send(frame({ type: "residents", cap: r.cap, count: r.count, draining: r.draining, residents: r.residents }));
       if (queued) {
         queued = false;
         reread();
@@ -72856,7 +73005,7 @@ function serveResidentsFeed(source2, sink, onLive) {
     for (const off of watched2.values()) off();
     watched2.clear();
   });
-  onLive?.();
+  onLive?.(reread);
 }
 var ATTACH_SPAN;
 var init_residentsFeed = __esm({
@@ -72904,7 +73053,7 @@ async function readListing(client) {
     return { status: 502, reason: `resident Worker answered ${r.status} to /residents: ${reason2}` };
   }
   const residents = Array.isArray(r.data.residents) ? r.data.residents : [];
-  return { listing: { cap: r.data.cap, count: r.data.count, residents } };
+  return { listing: { cap: r.data.cap, count: r.data.count, draining: r.data.draining, residents } };
 }
 function createResidentsViewHandler(deps) {
   const { client, page: page2, runs } = deps;
@@ -72936,7 +73085,11 @@ function createResidentsViewHandler(deps) {
           }
         },
         nodeSseSink(req, res),
-        () => startSseHeartbeat(req, res)
+        (reread) => {
+          startSseHeartbeat(req, res);
+          const timer = setInterval(reread, RESIDENT_LISTING_POLL_MS);
+          req.on("close", () => clearInterval(timer));
+        }
       );
       return true;
     }
@@ -72964,6 +73117,7 @@ function createResidentsViewHandler(deps) {
           page: "residents",
           cap: listing.cap,
           count: listing.count,
+          draining: listing.draining,
           residents: listing.residents,
           now: now(),
           runs: live
@@ -72991,6 +73145,7 @@ var init_residentsView = __esm({
   "../../src/channels/residentsView.ts"() {
     "use strict";
     init_authz();
+    init_budgets();
     init_requestTrace();
     init_sse();
     init_viewer();
@@ -74934,6 +75089,9 @@ async function reclaimRuns(opts) {
         const recorded = row2.state.finalStatus;
         status3 = typeof recorded === "string" && TERMINAL.has(recorded) ? recorded : "completed";
         why = "replied before the previous generation died";
+      } else if (row2.stop === "hard" && !row2.meta.hosted && hostingOf(row2.state) === void 0) {
+        status3 = "stopped_hard";
+        why = "hard stop requested before the previous generation ended";
       } else if (run2.reclaimedFrom === "attaching") {
         if (typeof row2.meta.request === "object" && row2.meta.request !== null) {
           outcome.resumable.push({ kind: "restart", row: row2, reclaimedFrom: "attaching", inbox: run2.inbox });
@@ -76680,6 +76838,7 @@ ${foldThreadEvents(folded)}` };
   const tag = {
     parentInstanceId: instance.id,
     idempotencyKey: key,
+    ...instance.grant?.costCapUsd !== void 0 ? { costCapUsd: instance.grant.costCapUsd } : {},
     ...(row2?.branch ?? instance.branch) !== void 0 ? { branch: row2?.branch ?? instance.branch } : {},
     ...row2?.recovery !== void 0 ? { transportWorkflowId: row2.recovery.workflowId } : {},
     ...row2?.recovery !== void 0 && row2.publication !== void 0 ? {