@sideboard-ai/core 0.1.117 → 0.1.122

package/dist/{chunk-4CDCTYTM.js → chunk-OEBYW4TO.js}

@@ -9,13 +9,13 @@ import {
 } from "./chunk-YMRT2DU6.js";
 import {
   isOrchestratorThread
-} from "./chunk-4NAW5BAQ.js";
+} from "./chunk-O43IRQ2Y.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-WCU3FHEI.js";
+} from "./chunk-OHEFHIG3.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -31,7 +31,7 @@ import {
   resolveClaudeExecutable,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
-} from "./chunk-SGEVS5SY.js";
+} from "./chunk-BMIRX64H.js";
 import {
   appDataDir
 } from "./chunk-BD2ICC4D.js";
@@ -65,18 +65,53 @@ function mergeUsage(a, b) {
     outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
     cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
     cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
+    costUsd: sumOptional(a?.costUsd, b.costUsd),
     lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
   };
 }
+function sumUsageList(list) {
+  let acc = null;
+  for (const u of list) {
+    if (!u) continue;
+    acc = mergeUsage(acc, {
+      inputTokens: u.inputTokens,
+      outputTokens: u.outputTokens,
+      cacheReadTokens: u.cacheReadTokens,
+      cacheWriteTokens: u.cacheWriteTokens,
+      costUsd: u.costUsd
+    });
+  }
+  if (!acc) return null;
+  return {
+    inputTokens: acc.inputTokens,
+    outputTokens: acc.outputTokens,
+    ...acc.cacheReadTokens != null ? { cacheReadTokens: acc.cacheReadTokens } : {},
+    ...acc.cacheWriteTokens != null ? { cacheWriteTokens: acc.cacheWriteTokens } : {},
+    ...acc.costUsd != null ? { costUsd: acc.costUsd } : {}
+  };
+}
+function hasBilledTokens(u) {
+  return Boolean(
+    u.inputTokens || u.outputTokens || u.cacheReadTokens || u.cacheWriteTokens
+  );
+}
 function applyTurnUsage(current, incoming, scope = "request") {
   if (scope === "turn") {
+    if (!hasBilledTokens(incoming) && current && incoming.costUsd != null) {
+      return { ...current, costUsd: incoming.costUsd };
+    }
     return {
       ...incoming,
+      costUsd: incoming.costUsd ?? current?.costUsd,
       lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
     };
   }
   const merged = mergeUsage(current, incoming);
-  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
+  const occ = requestOccupancy(incoming);
+  return {
+    ...merged,
+    lastRequestTokens: occ > 0 ? occ : current?.lastRequestTokens ?? occ
+  };
 }
 function contextTokens(u) {
   if (u.lastRequestTokens != null && u.lastRequestTokens > 0) return u.lastRequestTokens;
@@ -362,11 +397,16 @@ ${prompt}`;
 // src/agents/brightsy.ts
 function usageFromBrightsy(usage) {
   if (!usage) return null;
-  return fromInclusiveInputUsage({
+  const mapped = fromInclusiveInputUsage({
     inputTokens: Number(usage.prompt_tokens ?? 0),
     outputTokens: Number(usage.completion_tokens ?? 0),
     cachedInputTokens: Number(usage.prompt_tokens_details?.cached_tokens ?? 0)
   });
+  if (!mapped) return null;
+  if (usage.cost != null && Number.isFinite(Number(usage.cost))) {
+    mapped.costUsd = Number(usage.cost);
+  }
+  return mapped;
 }
 function parseBrightsyCliLine(line) {
   const trimmed = line.trim();
@@ -903,6 +943,11 @@ function parseDiffStat(result) {
   }
   return {};
 }
+function withPartTimes(next, prev) {
+  const now = Date.now();
+  const startedAt = prev && typeof prev.startedAt === "number" ? prev.startedAt : now;
+  return { ...next, startedAt, updatedAt: now };
+}
 function applyAgentEvent(parts, event) {
   if (event.type === "stdout") {
     const data = event.data;
@@ -910,17 +955,22 @@ function applyAgentEvent(parts, event) {
     const next = [...parts];
     const last = next[next.length - 1];
     if (last?.type === "text" && sameParentId(last.parentId, event.parentId)) {
-      next[next.length - 1] = {
-        type: "text",
-        text: last.text + data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      };
+      next[next.length - 1] = withPartTimes(
+        {
+          type: "text",
+          text: last.text + data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
     } else {
-      next.push({
-        type: "text",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "text",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
     }
     return next;
   }
@@ -932,34 +982,44 @@ function applyAgentEvent(parts, event) {
       for (let i = next.length - 1; i >= 0; i--) {
         const prev = next[i];
         if (prev?.type === "thinking" && sameParentId(prev.parentId, event.parentId)) {
-          next[i] = {
-            type: "thinking",
-            text: data,
-            ...event.parentId ? { parentId: event.parentId } : {}
-          };
+          next[i] = withPartTimes(
+            {
+              type: "thinking",
+              text: data,
+              ...event.parentId ? { parentId: event.parentId } : {}
+            },
+            prev
+          );
           return next;
         }
       }
-      next.push({
-        type: "thinking",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
       return next;
     }
     const last = next[next.length - 1];
     if (last?.type === "thinking" && sameParentId(last.parentId, event.parentId)) {
-      next[next.length - 1] = {
-        type: "thinking",
-        text: last.text + data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      };
+      next[next.length - 1] = withPartTimes(
+        {
+          type: "thinking",
+          text: last.text + data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        },
+        last
+      );
     } else {
-      next.push({
-        type: "thinking",
-        text: data,
-        ...event.parentId ? { parentId: event.parentId } : {}
-      });
+      next.push(
+        withPartTimes({
+          type: "thinking",
+          text: data,
+          ...event.parentId ? { parentId: event.parentId } : {}
+        })
+      );
     }
     return next;
   }
@@ -975,22 +1035,25 @@ function applyAgentEvent(parts, event) {
         ...input ?? {}
       };
       const mergedRecord = Object.keys(mergedInput).length > 0 ? mergedInput : void 0;
-      next[existing] = {
-        ...prev,
-        name: event.name || prev.name,
-        input: mergedRecord,
-        description: toolDescription(event.name || prev.name, mergedRecord),
-        detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
-        filePath: toolFilePath(mergedRecord) ?? prev.filePath,
-        additions: diff.additions ?? prev.additions,
-        deletions: diff.deletions ?? prev.deletions,
-        parentId: event.parentId ?? prev.parentId
-      };
+      next[existing] = withPartTimes(
+        {
+          ...prev,
+          name: event.name || prev.name,
+          input: mergedRecord,
+          description: toolDescription(event.name || prev.name, mergedRecord),
+          detail: toolDetail(event.name || prev.name, mergedRecord) ?? prev.detail,
+          filePath: toolFilePath(mergedRecord) ?? prev.filePath,
+          additions: diff.additions ?? prev.additions,
+          deletions: diff.deletions ?? prev.deletions,
+          parentId: event.parentId ?? prev.parentId
+        },
+        prev
+      );
       return next;
     }
     return [
       ...parts,
-      {
+      withPartTimes({
         type: "tool",
         id: event.id,
         name: event.name,
@@ -1001,7 +1064,7 @@ function applyAgentEvent(parts, event) {
         filePath: toolFilePath(input),
         ...event.parentId ? { parentId: event.parentId } : {},
         ...diff
-      }
+      })
     ];
   }
   if (event.type === "tool_result") {
@@ -1011,7 +1074,7 @@ function applyAgentEvent(parts, event) {
       if (existing < 0) {
         return [
           ...parts,
-          {
+          withPartTimes({
             type: "tool",
             id: event.id,
             name: "tool",
@@ -1019,22 +1082,25 @@ function applyAgentEvent(parts, event) {
             status: event.isError ? "error" : "running",
             result: event.content,
             ...event.parentId ? { parentId: event.parentId } : {}
-          }
+          })
         ];
       }
       return parts.map((p, i) => {
         if (i !== existing || p.type !== "tool") return p;
         if (p.status === "done" || p.status === "error") return p;
-        return {
-          ...p,
-          result: event.content ?? p.result
-        };
+        return withPartTimes(
+          {
+            ...p,
+            result: event.content ?? p.result
+          },
+          p
+        );
       });
     }
     if (existing < 0) {
       return [
         ...parts,
-        {
+        withPartTimes({
           type: "tool",
           id: event.id,
           name: "tool",
@@ -1044,18 +1110,21 @@ function applyAgentEvent(parts, event) {
           ...event.parentId ? { parentId: event.parentId } : {},
           ...fromResult.additions != null ? { additions: fromResult.additions } : {},
           ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-        }
+        })
       ];
     }
     return parts.map((p, i) => {
       if (i !== existing || p.type !== "tool") return p;
-      return {
-        ...p,
-        status: event.isError ? "error" : "done",
-        result: event.content,
-        ...fromResult.additions != null ? { additions: fromResult.additions } : {},
-        ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
-      };
+      return withPartTimes(
+        {
+          ...p,
+          status: event.isError ? "error" : "done",
+          result: event.content,
+          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+        },
+        p
+      );
     });
   }
   return parts;
@@ -1708,6 +1777,28 @@ function usageFromClaude(usage) {
     cacheWriteTokens: cacheWriteTokens || void 0
   };
 }
+function costUsdFromClaudeResult(obj) {
+  const modelUsage = obj.modelUsage ?? obj.model_usage;
+  if (modelUsage && typeof modelUsage === "object") {
+    let sum = 0;
+    let any = false;
+    for (const entry of Object.values(modelUsage)) {
+      if (!entry || typeof entry !== "object") continue;
+      const row = entry;
+      const cost = row.costUSD ?? row.cost_usd;
+      if (cost != null && Number.isFinite(Number(cost))) {
+        sum += Number(cost);
+        any = true;
+      }
+    }
+    if (any) return sum;
+  }
+  const totalCost = obj.total_cost_usd ?? obj.totalCostUsd;
+  if (totalCost != null && Number.isFinite(Number(totalCost))) {
+    return Number(totalCost);
+  }
+  return void 0;
+}
 function claudeResultErrorDetail(obj) {
   const isError = Boolean(obj.is_error) || typeof obj.subtype === "string" && /^error/i.test(obj.subtype);
   const fromResult = typeof obj.result === "string" ? obj.result.trim() : "";
@@ -1913,7 +2004,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-Z37MNYU6.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-4YNYDMLQ.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -2060,7 +2151,11 @@ var claudeAdapter = {
           if (typeof text === "string" && text) events.push({ type: "stdout", data: text });
         }
         const usage = usageFromClaude(obj.usage);
-        if (usage) events.push({ type: "usage", data: usage, scope: "turn" });
+        if (usage) {
+          const costUsd = costUsdFromClaudeResult(obj);
+          if (costUsd != null) usage.costUsd = costUsd;
+          events.push({ type: "usage", data: usage, scope: "turn" });
+        }
         if (events.length === 0) return null;
         return events.length === 1 ? events[0] : events;
       }
@@ -2515,6 +2610,38 @@ function usageFromCursor(usage) {
     cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
   };
 }
+function preferredCursorCostCents(cost) {
+  if (!cost) return void 0;
+  const charged = Number(cost.chargedCents);
+  const raw = Number(cost.rawCostCents);
+  if (Number.isFinite(charged) && charged > 0) return charged;
+  if (Number.isFinite(raw) && raw > 0) return raw;
+  if (Number.isFinite(charged)) return charged;
+  if (Number.isFinite(raw)) return raw;
+  return void 0;
+}
+function turnCostUsdFromCursorUsage(before, after) {
+  if (!after) return void 0;
+  const beforeIds = new Set((before?.runs ?? []).map((r) => r.runId));
+  const newRuns = (after.runs ?? []).filter((r) => !beforeIds.has(r.runId));
+  let sum = 0;
+  let any = false;
+  for (const r of newRuns) {
+    const c = preferredCursorCostCents(r.cost);
+    if (c != null) {
+      sum += c;
+      any = true;
+    }
+  }
+  if (any) return sum / 100;
+  if (before == null) return void 0;
+  const afterCents = preferredCursorCostCents(after.cost);
+  if (afterCents == null) return void 0;
+  const beforeCents = preferredCursorCostCents(before.cost) ?? 0;
+  const delta = afterCents - beforeCents;
+  if (!(delta >= 0) || !Number.isFinite(delta)) return void 0;
+  return delta / 100;
+}
 function asRecord3(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
@@ -3179,7 +3306,12 @@ var opencodeAdapter = {
         const usage = usageFromOpencode(
           part?.tokens ?? obj.tokens
         );
-        return usage ? { type: "usage", data: usage, scope: "request" } : null;
+        if (!usage) return null;
+        const cost = part?.cost ?? obj.cost;
+        if (cost != null && Number.isFinite(Number(cost))) {
+          usage.costUsd = Number(cost);
+        }
+        return { type: "usage", data: usage, scope: "request" };
       }
       return null;
     } catch {
@@ -3691,6 +3823,7 @@ export {
   fallbackTurnFailDetail,
   turnFailChatText,
   formatTurnExitError,
+  sumUsageList,
   applyTurnUsage,
   contextTokens,
   encodeBrightsyTarget,
@@ -3714,6 +3847,8 @@ export {
   claudeAdapter,
   listCodexModels,
   codexAdapter,
+  preferredCursorCostCents,
+  turnCostUsdFromCursorUsage,
   cursorSdkMessageToEvents,
   parseCursorRunnerLine,
   isCursorAutoModel,

package/dist/{chunk-WCU3FHEI.js → chunk-OHEFHIG3.js}

@@ -14,7 +14,7 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-SGEVS5SY.js";
+} from "./chunk-BMIRX64H.js";
 import {
   worktreesRoot
 } from "./chunk-BD2ICC4D.js";