@sideboard-ai/core 0.1.325 → 0.1.326

package/dist/{conductor-KB7L7NQN.js → conductor-4GVTHUUB.js}

@@ -32,10 +32,10 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-WYEST76H.js";
+} from "./chunk-46FECFZU.js";
 import "./chunk-OOXRMTU6.js";
-import "./chunk-APKUI4BP.js";
-import "./chunk-BTF3ATST.js";
+import "./chunk-FWVUGLBG.js";
+import "./chunk-KECHK3ZT.js";
 import "./chunk-ZSHS46V5.js";
 import "./chunk-QKHEVSB5.js";
 import "./chunk-F2PVRF3B.js";
@@ -43,7 +43,7 @@ import "./chunk-OPXEJJBM.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-LG6RJBIY.js";
 import "./chunk-2TUE6JKQ.js";
-import "./chunk-RZJTGBXY.js";
+import "./chunk-QPSKQP6E.js";
 import "./chunk-77WWLBCI.js";
 import {
   stripNestedElectronEnv

package/dist/{conductor-D4KFZF54.js → conductor-TGWI6ETZ.js}

@@ -34,14 +34,14 @@ import {
   tryReservePort,
   tryReservePorts,
   worktreeRunPortsPath
-} from "./chunk-7G27TB4M.js";
+} from "./chunk-XLVLMQKN.js";
 import "./chunk-5MXLDDYF.js";
-import "./chunk-ZHDXLDLA.js";
-import "./chunk-EO6ZFLG6.js";
+import "./chunk-YGVGXQA7.js";
+import "./chunk-75RPUXJS.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-4YXZOXMT.js";
 import "./chunk-YBTSZ2SW.js";
-import "./chunk-CI4M54LS.js";
+import "./chunk-D744HOI5.js";
 import "./chunk-NSTQ6QKD.js";
 import {
   stripNestedElectronEnv

package/dist/{coordinator-prompt-OBXEC63K.js → coordinator-prompt-3E6SIDTM.js}

@@ -7,15 +7,15 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-APKUI4BP.js";
-import "./chunk-BTF3ATST.js";
+} from "./chunk-FWVUGLBG.js";
+import "./chunk-KECHK3ZT.js";
 import "./chunk-ZSHS46V5.js";
 import "./chunk-QKHEVSB5.js";
 import "./chunk-F2PVRF3B.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-LG6RJBIY.js";
 import "./chunk-2TUE6JKQ.js";
-import "./chunk-RZJTGBXY.js";
+import "./chunk-QPSKQP6E.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/{coordinator-prompt-SUO4FRY3.js → coordinator-prompt-WEYJREV6.js}

@@ -9,12 +9,12 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-ZHDXLDLA.js";
-import "./chunk-EO6ZFLG6.js";
+} from "./chunk-YGVGXQA7.js";
+import "./chunk-75RPUXJS.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-4YXZOXMT.js";
 import "./chunk-YBTSZ2SW.js";
-import "./chunk-CI4M54LS.js";
+import "./chunk-D744HOI5.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";

package/dist/{global-workspace-UHU2FXTY.js → global-workspace-FPDZKUPF.js}

@@ -20,12 +20,12 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-ZHDXLDLA.js";
-import "./chunk-EO6ZFLG6.js";
+} from "./chunk-YGVGXQA7.js";
+import "./chunk-75RPUXJS.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-4YXZOXMT.js";
 import "./chunk-YBTSZ2SW.js";
-import "./chunk-CI4M54LS.js";
+import "./chunk-D744HOI5.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";

package/dist/{global-workspace-Z2SURNHA.js → global-workspace-UIEXAG2B.js}

@@ -18,15 +18,15 @@ import {
   remoteCoordinatorSourceRef,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-APKUI4BP.js";
-import "./chunk-BTF3ATST.js";
+} from "./chunk-FWVUGLBG.js";
+import "./chunk-KECHK3ZT.js";
 import "./chunk-ZSHS46V5.js";
 import "./chunk-QKHEVSB5.js";
 import "./chunk-F2PVRF3B.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-LG6RJBIY.js";
 import "./chunk-2TUE6JKQ.js";
-import "./chunk-RZJTGBXY.js";
+import "./chunk-QPSKQP6E.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/index.cjs

@@ -1796,10 +1796,11 @@ function applyTurnUsage(current, incoming, scope = "request") {
         ...incoming.sessionCostUsd != null ? { sessionCostUsd: incoming.sessionCostUsd } : {}
       };
     }
+    const explicit = incoming.lastRequestTokens != null && incoming.lastRequestTokens > 0 ? incoming.lastRequestTokens : void 0;
     return {
       ...incoming,
       costUsd: incoming.costUsd ?? current?.costUsd,
-      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming),
+      lastRequestTokens: current?.lastRequestTokens ?? explicit,
       ...incoming.sessionCostUsd == null && current?.sessionCostUsd != null ? { sessionCostUsd: current.sessionCostUsd } : {}
     };
   }
@@ -19535,13 +19536,16 @@ async function listCodexModels() {
     return cachedCodexModels?.models ?? FALLBACK_CODEX_MODELS;
   }
 }
-function usageFromCodex(usage) {
+function usageFromCodex(usage, asContext = false) {
   if (!usage) return null;
-  return fromInclusiveInputUsage({
+  const mapped = fromInclusiveInputUsage({
     inputTokens: Number(usage.input_tokens ?? 0),
     outputTokens: Number(usage.output_tokens ?? 0),
     cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
   });
+  if (!mapped || !asContext) return mapped;
+  const occ = requestOccupancy(mapped);
+  return occ > 0 ? { ...mapped, lastRequestTokens: occ } : mapped;
 }
 function codexHomeDir() {
   return process.env.CODEX_HOME?.trim() || (0, import_node_path45.join)((0, import_node_os17.homedir)(), ".codex");
@@ -19837,7 +19841,7 @@ var init_codex = __esm({
           }
           if (type === "turn.completed" || type === "turn_completed") {
             const payload = obj;
-            const usage = usageFromCodex(payload.last_token_usage ?? payload.usage);
+            const usage = payload.last_token_usage ? usageFromCodex(payload.last_token_usage, true) : usageFromCodex(payload.usage);
             return usage ? { type: "usage", data: usage, scope: "turn" } : null;
           }
           if (typeof obj.content === "string" && obj.content.trim()) {
@@ -20175,7 +20179,7 @@ function cursorSdkMessageToEvents(msg) {
   }
   if (msg.type === "usage") {
     const usage = usageFromCursor(msg.usage);
-    if (usage) return [{ type: "usage", data: usage, scope: "request" }];
+    if (usage) return [{ type: "usage", data: usage, scope: "turn" }];
   }
   if (msg.type === "status" && msg.status === "ERROR") {
     const rawMessage = msg.message;
@@ -22812,13 +22816,12 @@ function estimateOccupancyTokens(messages) {
 function threadHasCompactedContext(messages) {
   return messages.some((m) => m.role === "summary");
 }
-function forwardOccupancyTokens(messages, usage, windowTokens = 1e6) {
+function forwardOccupancyTokens(messages, usage, windowTokens = 1e6, opts) {
   const estimated = estimateOccupancyTokens(messages);
+  if (opts?.trustProviderOccupancy === false) return estimated;
   if (threadHasCompactedContext(messages) && estimated > 0) return estimated;
-  if (usage) {
-    const last = contextTokens(usage);
-    if (last > 0 && last <= windowTokens) return last;
-  }
+  const explicit = usage?.lastRequestTokens;
+  if (explicit != null && explicit > 0 && explicit <= windowTokens) return explicit;
   return estimated;
 }
 function forwardContextUsage(usage, messages) {
@@ -23212,11 +23215,15 @@ function applyCompaction(messages, summaryText, thresholds = {}) {
   return [summary, ...recent];
 }
 function lastRequestOccupancy(thread) {
+  if (thread.agent === "cursor") return estimateOccupancyTokens(thread.messages);
   for (let i = thread.messages.length - 1; i >= 0; i--) {
     const usage = thread.messages[i]?.usage;
-    if (usage) return contextTokens(usage);
+    if (!usage) continue;
+    const n = usage.lastRequestTokens;
+    if (n != null && n > 0) return n;
+    if (thread.agent === "codex") return estimateOccupancyTokens(thread.messages);
   }
-  return 0;
+  return thread.agent === "codex" ? estimateOccupancyTokens(thread.messages) : 0;
 }
 function shouldResetSessionForOccupancy(thread, occupancyTokens = SESSION_RESET_OCCUPANCY_TOKENS) {
   return lastRequestOccupancy(thread) >= occupancyTokens;
@@ -23235,7 +23242,7 @@ async function maybeCompactContext(thread, thresholds = {}, summarize2 = summari
   });
   let messages = applyCompaction(thread.messages, summary, thresholds);
   const compactedMessages = appendCompactedMessages(thread.compactedMessages, older);
-  const resetSession = shouldResetSessionForOccupancy({ messages: thread.messages });
+  const resetSession = shouldResetSessionForOccupancy(thread);
   if (resetSession) {
     messages = applyForwardOccupancy(messages);
   }
@@ -23260,7 +23267,6 @@ var init_context_compact = __esm({
     "use strict";
     init_message_parts();
     init_error_detail();
-    init_usage();
     init_context_estimate();
     init_summarize();
     init_context_estimate();

package/dist/index.d.cts

@@ -5392,7 +5392,9 @@ declare function threadHasCompactedContext(messages: Array<Pick<ThreadMessage, '
  * fits the window is preferred (provider-accurate); billed leaks fall back
  * to the transcript.
  */
-declare function forwardOccupancyTokens(messages: ThreadMessage[], usage?: TokenUsage | null, windowTokens?: number): number;
+declare function forwardOccupancyTokens(messages: ThreadMessage[], usage?: TokenUsage | null, windowTokens?: number, opts?: {
+    trustProviderOccupancy?: boolean;
+}): number;
 /**
  * Occupancy the next turn will start from.
  * After Sideboard compression the last agent `lastRequestTokens` is still the
@@ -5515,13 +5517,14 @@ interface CompactResult {
     method?: 'claude' | 'extractive';
     olderCount?: number;
 }
-/** Last agent turn's context-window occupancy, or 0. */
-declare function lastRequestOccupancy(thread: Pick<Thread, 'messages'>): number;
-/**
- * True when the CLI session should be dropped so the next turn reseeds from
- * the (possibly compacted) Sideboard transcript instead of overflowing.
- */
-declare function shouldResetSessionForOccupancy(thread: Pick<Thread, 'messages'>, occupancyTokens?: number): boolean;
+/** Window occupancy. A Codex session sum must not reuse an older peak. */
+declare function lastRequestOccupancy(thread: Pick<Thread, 'messages'> & {
+    agent?: Thread['agent'];
+}): number;
+/** Reseed when occupancy is near the window. */
+declare function shouldResetSessionForOccupancy(thread: Pick<Thread, 'messages'> & {
+    agent?: Thread['agent'];
+}, occupancyTokens?: number): boolean;
 /**
  * If the thread transcript is oversized, summarize older turns and keep recent
  * ones. The CLI session stays unless last-request occupancy is near the window

package/dist/index.d.ts

@@ -5392,7 +5392,9 @@ declare function threadHasCompactedContext(messages: Array<Pick<ThreadMessage, '
  * fits the window is preferred (provider-accurate); billed leaks fall back
  * to the transcript.
  */
-declare function forwardOccupancyTokens(messages: ThreadMessage[], usage?: TokenUsage | null, windowTokens?: number): number;
+declare function forwardOccupancyTokens(messages: ThreadMessage[], usage?: TokenUsage | null, windowTokens?: number, opts?: {
+    trustProviderOccupancy?: boolean;
+}): number;
 /**
  * Occupancy the next turn will start from.
  * After Sideboard compression the last agent `lastRequestTokens` is still the
@@ -5515,13 +5517,14 @@ interface CompactResult {
     method?: 'claude' | 'extractive';
     olderCount?: number;
 }
-/** Last agent turn's context-window occupancy, or 0. */
-declare function lastRequestOccupancy(thread: Pick<Thread, 'messages'>): number;
-/**
- * True when the CLI session should be dropped so the next turn reseeds from
- * the (possibly compacted) Sideboard transcript instead of overflowing.
- */
-declare function shouldResetSessionForOccupancy(thread: Pick<Thread, 'messages'>, occupancyTokens?: number): boolean;
+/** Window occupancy. A Codex session sum must not reuse an older peak. */
+declare function lastRequestOccupancy(thread: Pick<Thread, 'messages'> & {
+    agent?: Thread['agent'];
+}): number;
+/** Reseed when occupancy is near the window. */
+declare function shouldResetSessionForOccupancy(thread: Pick<Thread, 'messages'> & {
+    agent?: Thread['agent'];
+}, occupancyTokens?: number): boolean;
 /**
  * If the thread transcript is oversized, summarize older turns and keep recent
  * ones. The CLI session stays unless last-request occupancy is near the window

package/dist/index.js

@@ -17,13 +17,13 @@ import {
   toAbleTimeIssueInfo,
   updateAbleTimeTask,
   verifyAbleTimeConnection
-} from "./chunk-NWGINMEA.js";
+} from "./chunk-PB6HW7SA.js";
 import {
   clearOptionalCliPresenceCache,
   detectOptionalServiceClis,
   installOptionalServiceCli,
   optionalCliPresence
-} from "./chunk-SQQBU7Z6.js";
+} from "./chunk-ZUAYA57W.js";
 import {
   AGENT_GIT_ACTIONS,
   BOARD_COLUMN_DEFS,
@@ -238,7 +238,7 @@ import {
   worktreeCleanupSettings,
   writeAgentBlock,
   writeWorktreeFile
-} from "./chunk-SACHHTBJ.js";
+} from "./chunk-GP3RLZ6A.js";
 import {
   OPTIONAL_SERVICES,
   OPTIONAL_SERVICE_IDS,
@@ -254,7 +254,7 @@ import {
   optionalServiceConnected,
   optionalServiceSpec,
   verifyOptionalService
-} from "./chunk-2UP3XD2D.js";
+} from "./chunk-B244TJWC.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -311,7 +311,7 @@ import {
   startLinearOAuth,
   updateLinearIssue,
   validateLinearApiKey
-} from "./chunk-7LUOLYFM.js";
+} from "./chunk-SO7G6O24.js";
 import {
   downloadAuthenticatedFile,
   extractHttpUrls,
@@ -399,7 +399,7 @@ import {
   userMcpNamesToDisable,
   worktreeMcpToolNames,
   writeInjectedMcpConfig
-} from "./chunk-MFMDZAA6.js";
+} from "./chunk-BBNWKL4I.js";
 import {
   getAgentSetupInfo,
   installAgent,
@@ -411,7 +411,7 @@ import {
   prepareTerminalCommand,
   resolveLoginCommand,
   whichOnPath
-} from "./chunk-SK6NYGPD.js";
+} from "./chunk-4H5MWZ6J.js";
 import {
   brightsyMcpServerName,
   connectBrightsyTeam,
@@ -422,7 +422,7 @@ import {
   listConnectedBrightsyTeams,
   switchBrightsyAccount
 } from "./chunk-S5CJUIPY.js";
-import "./chunk-PPTJMBUY.js";
+import "./chunk-TMCK5TLA.js";
 import {
   BRIGHTSY_SUMMARIZE_CONTEXT_TOOL,
   CHARS_PER_CONTEXT_TOKEN,
@@ -543,7 +543,7 @@ import {
   workspaceAgentChatSummaries,
   worktreeRunPortsPath,
   wrapReviewSkillMarkdown
-} from "./chunk-WYEST76H.js";
+} from "./chunk-46FECFZU.js";
 import {
   STDERR_EVENT_MAX_CHARS,
   STDOUT_EVENT_MAX_CHARS,
@@ -609,10 +609,10 @@ import {
   parseAbleTimeOAuthCallbackUrl,
   resolveAbleTimeOAuthHost,
   startAbleTimeOAuth
-} from "./chunk-SS6CYGLF.js";
+} from "./chunk-RZVOX2MT.js";
 import {
   looksLikeAbleTimeUlid
-} from "./chunk-H36GKGU2.js";
+} from "./chunk-KXRF6RNL.js";
 import {
   ABLETIME_MCP_PATH,
   ABLETIME_MCP_PM_PATH,
@@ -633,7 +633,7 @@ import {
   normalizeAbleTimeCredential,
   normalizeAbleTimeHost,
   rewriteAbleTimeError
-} from "./chunk-ZEUMWHOH.js";
+} from "./chunk-C7HUCBX7.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_CANCELED_REPLY,
@@ -686,7 +686,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-APKUI4BP.js";
+} from "./chunk-FWVUGLBG.js";
 import {
   GITHUB_PR_BODY_MAX_CHARS,
   GITHUB_PR_BODY_SAFE_CHARS,
@@ -775,7 +775,7 @@ import {
   suggestSlug,
   switchWorktreeBranch,
   warmGithubAgentAuth
-} from "./chunk-BTF3ATST.js";
+} from "./chunk-KECHK3ZT.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   allocateTeamName,
@@ -866,7 +866,7 @@ import {
   trustSystemCertificates,
   turnCostUsdFromCursorUsage,
   withMaxOldSpaceSize
-} from "./chunk-U5WO6MEB.js";
+} from "./chunk-NURZOXGN.js";
 import "./chunk-OPXEJJBM.js";
 import {
   ATTACHMENTS_DIR,
@@ -1077,7 +1077,7 @@ import {
   withTurnScopedCost,
   writeSecureJson,
   writeViewerContext
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-QPSKQP6E.js";
 import {
   THINKING_EFFORTS,
   isThinkingEffort,
@@ -7684,7 +7684,7 @@ async function startHeadlessHost(opts) {
   };
   const refreshRunning = async () => {
     try {
-      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-3H4KNGPN.js");
+      const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-7FVDBE7Y.js");
       agentsRunning = getOrchestrator2().getRuntime().running;
     } catch {
       agentsRunning = 0;
@@ -9827,7 +9827,7 @@ async function handleJobStop(params, _ctx) {
   return stopDetachedJob(jobCwd(rec), id, reason ? { reason } : void 0);
 }
 async function defaultTurnWait(ref, timeoutMs) {
-  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-3H4KNGPN.js");
+  const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-7FVDBE7Y.js");
   const orch = getOrchestrator2();
   const thread = await orch.waitForTurn(ref, timeoutMs, {
     resolveIfStillRunning: true
@@ -10180,7 +10180,7 @@ async function startMcpServer() {
     );
   }
   try {
-    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-UQHUNOLV.js");
+    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-RXBH7KY4.js");
     orch.setMaxConcurrent(maxConcurrentAgents2());
   } catch {
   }
@@ -10728,7 +10728,7 @@ async function startMcpServer() {
   if (!worktreeProfile) {
     registerConnectedIssueVendorTools(server);
     const { getCaffeinateHold: getCaffeinateHold2, setCaffeinateHold: setCaffeinateHold2 } = await import("./caffeinate-hold-ZNUEZGHB.js");
-    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-UQHUNOLV.js");
+    const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-RXBH7KY4.js");
     const accountDefaults = resolveThreadDefaults2();
     const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
     server.tool(
@@ -13495,7 +13495,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-3H4KNGPN.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-7FVDBE7Y.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }

package/dist/{linear-SIHEBU3X.js → linear-6S7MK5YK.js}

@@ -27,12 +27,12 @@ import {
   rewriteLinearError,
   updateLinearIssue,
   validateLinearApiKey
-} from "./chunk-EZR6W4B3.js";
+} from "./chunk-LRHUBGEM.js";
 import "./chunk-OYRN356W.js";
 import "./chunk-F6GE7V3Q.js";
 import "./chunk-N2WW62LF.js";
 import "./chunk-2GPQZZLY.js";
-import "./chunk-CI4M54LS.js";
+import "./chunk-D744HOI5.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-WWUABK6B.js";
 import "./chunk-FJZWM2ON.js";

package/dist/{linear-HFUOUJ5H.js → linear-Z2T4KUAQ.js}

@@ -25,12 +25,12 @@ import {
   rewriteLinearError,
   updateLinearIssue,
   validateLinearApiKey
-} from "./chunk-7LUOLYFM.js";
+} from "./chunk-SO7G6O24.js";
 import "./chunk-DBKHL7NC.js";
 import "./chunk-W3ZLE4PO.js";
 import "./chunk-JAT3JFOS.js";
 import "./chunk-6K64FJDD.js";
-import "./chunk-RZJTGBXY.js";
+import "./chunk-QPSKQP6E.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";

package/dist/{linear-list-63I7QUC6.js → linear-list-A37WLUBO.js}

@@ -1,6 +1,6 @@
 import {
   listAssignedLinearIssues
-} from "./chunk-PPTJMBUY.js";
+} from "./chunk-TMCK5TLA.js";
 export {
   listAssignedLinearIssues
 };

package/dist/{linear-list-JFV3EES6.js → linear-list-Q4M7AZO2.js}

@@ -2,7 +2,7 @@
 
 import {
   listAssignedLinearIssues
-} from "./chunk-MBT6WDAB.js";
+} from "./chunk-WUCAVIIP.js";
 export {
   listAssignedLinearIssues
 };

package/dist/mcp/run-stdio.cjs

@@ -4415,10 +4415,11 @@ function applyTurnUsage(current, incoming, scope = "request") {
         ...incoming.sessionCostUsd != null ? { sessionCostUsd: incoming.sessionCostUsd } : {}
       };
     }
+    const explicit = incoming.lastRequestTokens != null && incoming.lastRequestTokens > 0 ? incoming.lastRequestTokens : void 0;
     return {
       ...incoming,
       costUsd: incoming.costUsd ?? current?.costUsd,
-      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming),
+      lastRequestTokens: current?.lastRequestTokens ?? explicit,
       ...incoming.sessionCostUsd == null && current?.sessionCostUsd != null ? { sessionCostUsd: current.sessionCostUsd } : {}
     };
   }
@@ -16350,13 +16351,16 @@ async function listCodexModels() {
     return cachedCodexModels?.models ?? FALLBACK_CODEX_MODELS;
   }
 }
-function usageFromCodex(usage) {
+function usageFromCodex(usage, asContext = false) {
   if (!usage) return null;
-  return fromInclusiveInputUsage({
+  const mapped = fromInclusiveInputUsage({
     inputTokens: Number(usage.input_tokens ?? 0),
     outputTokens: Number(usage.output_tokens ?? 0),
     cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
   });
+  if (!mapped || !asContext) return mapped;
+  const occ = requestOccupancy(mapped);
+  return occ > 0 ? { ...mapped, lastRequestTokens: occ } : mapped;
 }
 function codexHomeDir() {
   return process.env.CODEX_HOME?.trim() || (0, import_node_path39.join)((0, import_node_os16.homedir)(), ".codex");
@@ -16652,7 +16656,7 @@ var init_codex = __esm({
           }
           if (type === "turn.completed" || type === "turn_completed") {
             const payload = obj;
-            const usage = usageFromCodex(payload.last_token_usage ?? payload.usage);
+            const usage = payload.last_token_usage ? usageFromCodex(payload.last_token_usage, true) : usageFromCodex(payload.usage);
             return usage ? { type: "usage", data: usage, scope: "turn" } : null;
           }
           if (typeof obj.content === "string" && obj.content.trim()) {
@@ -19185,11 +19189,15 @@ function applyCompaction(messages, summaryText, thresholds = {}) {
   return [summary, ...recent];
 }
 function lastRequestOccupancy(thread) {
+  if (thread.agent === "cursor") return estimateOccupancyTokens(thread.messages);
   for (let i = thread.messages.length - 1; i >= 0; i--) {
     const usage = thread.messages[i]?.usage;
-    if (usage) return contextTokens(usage);
+    if (!usage) continue;
+    const n = usage.lastRequestTokens;
+    if (n != null && n > 0) return n;
+    if (thread.agent === "codex") return estimateOccupancyTokens(thread.messages);
   }
-  return 0;
+  return thread.agent === "codex" ? estimateOccupancyTokens(thread.messages) : 0;
 }
 function shouldResetSessionForOccupancy(thread, occupancyTokens = SESSION_RESET_OCCUPANCY_TOKENS) {
   return lastRequestOccupancy(thread) >= occupancyTokens;
@@ -19208,7 +19216,7 @@ async function maybeCompactContext(thread, thresholds = {}, summarize = summariz
   });
   let messages = applyCompaction(thread.messages, summary, thresholds);
   const compactedMessages = appendCompactedMessages(thread.compactedMessages, older);
-  const resetSession = shouldResetSessionForOccupancy({ messages: thread.messages });
+  const resetSession = shouldResetSessionForOccupancy(thread);
   if (resetSession) {
     messages = applyForwardOccupancy(messages);
   }
@@ -19233,7 +19241,6 @@ var init_context_compact = __esm({
     "use strict";
     init_message_parts();
     init_error_detail();
-    init_usage();
     init_context_estimate();
     init_summarize();
     init_context_estimate();