@sideboard-ai/core 0.1.325 → 0.1.327

package/dist/{chunk-2UP3XD2D.js → chunk-ECY7WL6T.js}

@@ -4,7 +4,7 @@ import {
 import {
   loadAppSettings,
   saveAppSettings
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-D446IWPP.js";
 
 // src/integrations/optional-services.ts
 var OPTIONAL_SERVICE_IDS = ["vercel", "supabase", "posthog", "sentry"];
@@ -273,7 +273,7 @@ async function connectedCliPresence(integrations) {
   const ids = connectedOptionalServices(integrations).filter((spec) => spec.cli).map((spec) => spec.id);
   if (ids.length === 0) return void 0;
   try {
-    const { optionalCliPresence } = await import("./optional-cli-ULDP3O5S.js");
+    const { optionalCliPresence } = await import("./optional-cli-FN4MGB6W.js");
     return await optionalCliPresence(ids);
   } catch {
     return void 0;

package/dist/{chunk-CI4M54LS.js → chunk-EJRCHCXM.js}

@@ -18,9 +18,6 @@ import {
   withRemovedAccount,
   withSelectedAccount
 } from "./chunk-J2LNLI4S.js";
-import {
-  normalizeThinkingEffort
-} from "./chunk-KGZBYWZ3.js";
 import {
   appDataDir
 } from "./chunk-WOU343SI.js";
@@ -55,6 +52,23 @@ function coerceOrchestratorAgent(agent, fallback = "claude") {
   return isOrchestratorCapableAgent(agent) ? agent : fallback;
 }
 
+// src/types/thinking-effort.ts
+var THINKING_EFFORTS = [
+  "low",
+  "medium",
+  "high",
+  "xhigh",
+  "max"
+];
+var EFFORT_SET = new Set(THINKING_EFFORTS);
+function normalizeThinkingEffort(value) {
+  if (typeof value !== "string") return null;
+  const v = value.trim().toLowerCase();
+  if (v === "normal") return "medium";
+  if (EFFORT_SET.has(v)) return v;
+  return null;
+}
+
 // src/store/thread-option-defaults.ts
 function normalizeAutonomy(value) {
   return value === "default" || value === "full" ? value : void 0;
@@ -531,10 +545,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 } : {}
     };
   }
@@ -2371,6 +2386,7 @@ export {
   isOrchestratorCapableAgent,
   assertOrchestratorCapableAgent,
   coerceOrchestratorAgent,
+  normalizeThinkingEffort,
   getDefaultAgent,
   getDefaultModel,
   getDefaultEffort,
@@ -2390,6 +2406,7 @@ export {
   formatViewerContextDirective,
   formatViewerContextReminder,
   fromInclusiveInputUsage,
+  requestOccupancy,
   subtractUsage,
   sumUsageList,
   applyTurnUsage,

package/dist/{chunk-H36GKGU2.js → chunk-EUIVQAPK.js}

@@ -4,14 +4,14 @@ import {
   normalizeAbleTimeCredential,
   normalizeAbleTimeHost,
   rewriteAbleTimeError
-} from "./chunk-ZEUMWHOH.js";
+} from "./chunk-DACWFN4O.js";
 import {
   httpFetch
 } from "./chunk-JAT3JFOS.js";
 import {
   getAbleTimeAccessToken,
   getAbleTimeHost
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-D446IWPP.js";
 
 // src/integrations/abletime-rest.ts
 var ABLETIME_REST_PREFIX = "/api/public/v2";

package/dist/{chunk-WYEST76H.js → chunk-IXWPCOLQ.js}

@@ -8,11 +8,11 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   isSlackCoordinatorThread
-} from "./chunk-APKUI4BP.js";
+} from "./chunk-RDXODLEN.js";
 import {
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv
-} from "./chunk-BTF3ATST.js";
+} from "./chunk-R2C45NHT.js";
 import {
   REVIEW_TAB_TITLE,
   allocateTeamName,
@@ -24,10 +24,13 @@ import {
   updateThread,
   worktreeNameFromPath,
   writeThread
-} from "./chunk-ZSHS46V5.js";
+} from "./chunk-Y6OHM672.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-QKHEVSB5.js";
+import {
+  lastTopLevelToolIsAskUser
+} from "./chunk-ULWPSBAB.js";
 import {
   clipToolResultForStore
 } from "./chunk-OPXEJJBM.js";
@@ -44,7 +47,7 @@ import {
 import {
   assertOrchestratorCapableAgent,
   contextTokens
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-D446IWPP.js";
 import {
   stripNestedElectronEnv
 } from "./chunk-4TR3HZFT.js";
@@ -161,13 +164,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) {
@@ -553,11 +555,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;
@@ -576,7 +582,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);
   }
@@ -1209,185 +1215,6 @@ function jobTreeAlive(pid) {
   return jobAlive(pid) || processGroupAlive(pid);
 }
 
-// src/plan/ask-user.ts
-function planQuestionsSignature(questions) {
-  return questions.map((q) => {
-    const opts = q.options.map((o) => o.label).join("");
-    return `${q.question}${opts}`;
-  }).join("");
-}
-function asRecord(v) {
-  return v != null && typeof v === "object" && !Array.isArray(v) ? v : null;
-}
-function parseOptions(raw) {
-  if (!Array.isArray(raw)) return [];
-  const out = [];
-  for (const item of raw) {
-    if (typeof item === "string" && item.trim()) {
-      out.push({ label: item.trim() });
-      continue;
-    }
-    const o = asRecord(item);
-    if (!o) continue;
-    const label = typeof o.label === "string" ? o.label.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.title === "string" ? o.title.trim() : "";
-    if (!label) continue;
-    const description = typeof o.description === "string" && o.description.trim() ? o.description.trim() : void 0;
-    out.push({ label, description });
-  }
-  return out;
-}
-function parseOneQuestion(raw) {
-  const o = asRecord(raw);
-  if (!o) return null;
-  const question = typeof o.question === "string" ? o.question.trim() : typeof o.text === "string" ? o.text.trim() : typeof o.prompt === "string" ? o.prompt.trim() : "";
-  if (!question) return null;
-  const options = parseOptions(o.options);
-  if (options.length < 1) return null;
-  const header = typeof o.header === "string" && o.header.trim() ? o.header.trim() : void 0;
-  const multiSelect = Boolean(o.multiSelect ?? o.multi_select);
-  return { question, header, multiSelect, options };
-}
-function parsePlanQuestionsInput(input) {
-  const root = asRecord(input);
-  if (!root) return [];
-  const list = Array.isArray(root.questions) ? root.questions : Array.isArray(root.question) ? root.question : root.question || root.prompt ? [root] : [];
-  const out = [];
-  for (const item of list) {
-    const q = parseOneQuestion(item);
-    if (q) out.push(q);
-  }
-  return out;
-}
-var ASK_USER_TOOL_RE = /^(AskUserQuestion|ask_user|mcp__sideboard__ask_user)$/i;
-function isAskUserToolName(name) {
-  if (!name) return false;
-  const base = name.replace(/^mcp__sideboard__/i, "");
-  return ASK_USER_TOOL_RE.test(name) || /^ask_user$/i.test(base);
-}
-function lastTopLevelToolIsAskUser(parts) {
-  if (!parts?.length) return false;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (part.type === "tool" && !part.parentId) {
-      return isAskUserToolName(part.name);
-    }
-  }
-  return false;
-}
-function hasTopLevelTool(parts) {
-  return Boolean(parts?.some((part) => part.type === "tool" && !part.parentId));
-}
-function questionsFromToolPart(part) {
-  const fromInput = parsePlanQuestionsInput(part.input);
-  if (fromInput.length) return fromInput;
-  const raw = part.result?.trim();
-  if (!raw || !raw.startsWith("{")) return [];
-  try {
-    return parsePlanQuestionsInput(JSON.parse(raw));
-  } catch {
-    return [];
-  }
-}
-function extractPendingPlanQuestions(parts) {
-  if (!parts?.length) return null;
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const p = parts[i];
-    if (p.type !== "tool" || !isAskUserToolName(p.name)) continue;
-    const questions = questionsFromToolPart(p);
-    if (!questions.length) continue;
-    return {
-      id: p.id || `ask-${i}`,
-      signature: planQuestionsSignature(questions),
-      questions,
-      source: p.name || "ask_user"
-    };
-  }
-  return null;
-}
-function pendingFromAskBlock(block, dismissedQuestionSignature) {
-  if (!block || block.source !== "ask_user" || !block.questions?.length) return null;
-  const dismissed = dismissedQuestionSignature?.trim();
-  if (dismissed && (!block.questionSignature || block.questionSignature === dismissed)) {
-    return null;
-  }
-  const signature = block.questionSignature?.trim() || planQuestionsSignature(block.questions);
-  return {
-    id: `ask-block:${signature}`,
-    signature,
-    questions: block.questions,
-    source: "ask_user"
-  };
-}
-function askBlockStillWaiting(block, messages) {
-  if (!messages?.length) return Boolean(block?.at);
-  const askedAt = block?.at;
-  if (!askedAt) return false;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const message = messages[i];
-    if (message.role !== "user" || message.origin === "continue") continue;
-    if (!message.ts) return true;
-    return askedAt > message.ts;
-  }
-  return true;
-}
-function latestPendingPlanQuestions(input) {
-  if (input.userReplied) return null;
-  const fromBlock = () => pendingFromAskBlock(input.agentBlock, input.dismissedQuestionSignature);
-  if (lastTopLevelToolIsAskUser(input.liveParts)) {
-    return extractPendingPlanQuestions(input.liveParts) ?? fromBlock();
-  }
-  const last = input.messages[input.messages.length - 1];
-  if (last?.role === "agent" && lastTopLevelToolIsAskUser(last.parts)) {
-    return extractPendingPlanQuestions(last.parts) ?? fromBlock();
-  }
-  if (hasTopLevelTool(input.liveParts) || last?.role === "agent" && hasTopLevelTool(last.parts)) {
-    return null;
-  }
-  if (input.status === "running" || input.status === "queued") return null;
-  const stamped = fromBlock();
-  if (stamped && askBlockStillWaiting(input.agentBlock, input.messages)) {
-    return stamped;
-  }
-  return null;
-}
-var PLAN_QUESTION_ANSWERS_PREFIX = "Answers to your questions:";
-function isPlanQuestionAnswersMessage(text) {
-  return text.startsWith(PLAN_QUESTION_ANSWERS_PREFIX);
-}
-function formatPlanQuestionAnswers(questions, answers) {
-  const lines = [PLAN_QUESTION_ANSWERS_PREFIX, ""];
-  for (let i = 0; i < questions.length; i++) {
-    const q = questions[i];
-    const a = answers.find((x) => x.questionIndex === i);
-    const header = q.header ? `**${q.header}** \u2014 ` : "";
-    const parts = [];
-    if (a?.selected.length) parts.push(a.selected.join(", "));
-    if (a?.other?.trim()) parts.push(a.other.trim());
-    const body = parts.length ? parts.join(" \xB7 ") : "(no answer)";
-    lines.push(`${i + 1}. ${header}${q.question}  `);
-    lines.push(`   \u2192 ${body}`);
-  }
-  return lines.join("\n");
-}
-function formatPlanQuestionsForChat(questions) {
-  const lines = ["### Questions for you", ""];
-  for (let i = 0; i < questions.length; i++) {
-    const q = questions[i];
-    const header = q.header ? `**${q.header}** \u2014 ` : "";
-    lines.push(`${i + 1}. ${header}${q.question}`);
-    for (let oi = 0; oi < q.options.length; oi++) {
-      const opt = q.options[oi];
-      const desc = opt.description?.trim();
-      lines.push(
-        desc ? `   - **${opt.label}** \u2014 ${desc}` : `   - **${opt.label}**`
-      );
-    }
-    lines.push("");
-  }
-  lines.push("_Answer in the composer below._");
-  return lines.join("\n").trimEnd();
-}
-
 // src/orchestrator/task-state.ts
 function isTerminalTaskState(state) {
   return state !== "submitted" && state !== "working";
@@ -1808,7 +1635,7 @@ var PORT_RANGE_SIZE = 10;
 var RECLAIM_RETRY_DELAY_MS = 40;
 var RECLAIM_TRIES = 8;
 async function killReclaimable(ports, worktreePath, signal) {
-  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-KB7L7NQN.js");
+  const { killListenersOnPorts: killListenersOnPorts2, killStaleWorktreeListeners: killStaleWorktreeListeners2 } = await import("./conductor-CP7TW6TN.js");
   if (worktreePath) killStaleWorktreeListeners2(ports, worktreePath, signal);
   else killListenersOnPorts2(ports);
 }
@@ -2489,17 +2316,6 @@ async function startDevServer(repoPath, worktreePath, onLine, opts) {
 }
 
 export {
-  planQuestionsSignature,
-  parsePlanQuestionsInput,
-  isAskUserToolName,
-  lastTopLevelToolIsAskUser,
-  extractPendingPlanQuestions,
-  askBlockStillWaiting,
-  latestPendingPlanQuestions,
-  PLAN_QUESTION_ANSWERS_PREFIX,
-  isPlanQuestionAnswersMessage,
-  formatPlanQuestionAnswers,
-  formatPlanQuestionsForChat,
   isTerminalTaskState,
   isIncompleteTaskState,
   needsCoordinatorAction,

package/dist/{chunk-EO6ZFLG6.js → chunk-JKHCADKB.js}

@@ -17,17 +17,17 @@ import {
   originCli,
   resolveGhAuthToken
 } from "./chunk-YBTSZ2SW.js";
-import {
-  getGithubGitAuthMode,
-  getGithubPat
-} from "./chunk-CI4M54LS.js";
 import {
   allocateTeamName,
   listThreads,
   normalizeTakenSlug,
   normalizeWorktreePath,
   takenSlugsFromThread
-} from "./chunk-Q3FHTGIW.js";
+} from "./chunk-5Y2C7Q55.js";
+import {
+  getGithubGitAuthMode,
+  getGithubPat
+} from "./chunk-EJRCHCXM.js";
 import {
   worktreesRoot
 } from "./chunk-WOU343SI.js";

package/dist/{chunk-SK6NYGPD.js → chunk-KLVW3J2B.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-2TUE6JKQ.js";
 import {
   resolveAgentExecutable
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-D446IWPP.js";
 
 // src/agents/install.ts
 import { existsSync } from "fs";
@@ -265,7 +265,7 @@ async function loginAgent(agent) {
   };
 }
 async function loginManagedAccount(accountId) {
-  const { loadAppSettings } = await import("./app-settings-UQHUNOLV.js");
+  const { loadAppSettings } = await import("./app-settings-A5D364JD.js");
   const { loginEnvPrefix } = await import("./managed-accounts-JJTAKHMG.js");
   const account = loadAppSettings().accounts.accounts.find((a) => a.id === accountId);
   if (!account) {

package/dist/{chunk-HG6KS7OT.js → chunk-MO46K6WK.js}

@@ -12,13 +12,13 @@ import {
 } from "./chunk-5MXLDDYF.js";
 import {
   isOrchestratorThread
-} from "./chunk-ZHDXLDLA.js";
+} from "./chunk-Q4UPRQOS.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-EO6ZFLG6.js";
+} from "./chunk-JKHCADKB.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -33,12 +33,19 @@ import {
 } from "./chunk-2GPQZZLY.js";
 import {
   listAssignedLinearIssues
-} from "./chunk-MBT6WDAB.js";
+} from "./chunk-UMXBH344.js";
 import {
   githubAgentAuthReady,
   npmGlobalNodeModules,
   run
 } from "./chunk-YBTSZ2SW.js";
+import {
+  BASE_ALLOWED_TOOLS,
+  CLAUDE_CHROME_ALLOWED_TOOLS,
+  CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS,
+  CLAUDE_PRINT_BG_WAIT_CEILING_MS,
+  mcpAllowToolsFromNames
+} from "./chunk-5Y2C7Q55.js";
 import {
   claudeChromeEnabled,
   fromInclusiveInputUsage,
@@ -46,21 +53,15 @@ import {
   isLinearConnected,
   isPosthogConnected,
   loadAppSettings,
+  requestOccupancy,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-CI4M54LS.js";
+} from "./chunk-EJRCHCXM.js";
 import {
   isElectronLikeCommand,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
 } from "./chunk-WWUABK6B.js";
-import {
-  BASE_ALLOWED_TOOLS,
-  CLAUDE_CHROME_ALLOWED_TOOLS,
-  CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS,
-  CLAUDE_PRINT_BG_WAIT_CEILING_MS,
-  mcpAllowToolsFromNames
-} from "./chunk-Q3FHTGIW.js";
 import {
   appDataDir
 } from "./chunk-WOU343SI.js";
@@ -2965,7 +2966,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-UHU2FXTY.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-Y3UDZYJX.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({
@@ -3192,7 +3193,7 @@ var claudeAdapter = {
     return { file: claude, args, cwd: thread.worktreePath };
   },
   async listLinearIssues(_repoPath) {
-    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-JFV3EES6.js");
+    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-52LEDEWO.js");
     return listAssignedLinearIssues2();
   }
 };
@@ -3277,13 +3278,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() || join11(homedir7(), ".codex");
@@ -3549,7 +3553,7 @@ var codexAdapter = {
       }
       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()) {
@@ -3883,7 +3887,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;
@@ -4663,7 +4667,7 @@ var opencodeAdapter = {
     };
   },
   async listLinearIssues(_repoPath) {
-    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-JFV3EES6.js");
+    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-52LEDEWO.js");
     return listAssignedLinearIssues2();
   }
 };

package/dist/{chunk-F2PVRF3B.js → chunk-N6ZF3XRP.js}

@@ -84,7 +84,8 @@ var BASE_ALLOWED_TOOLS = [
   "TaskStop",
   "EnterWorktree",
   "ExitWorktree",
-  "Skill"
+  "Skill",
+  "AskUserQuestion"
 ];
 var CLAUDE_PRINT_BG_WAIT_CEILING_MS = 72e5;
 var CLAUDE_CHROME_ALLOWED_TOOLS = [

package/dist/{chunk-MFMDZAA6.js → chunk-NQGLDQYB.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-S5CJUIPY.js";
 import {
   listAssignedLinearIssues
-} from "./chunk-PPTJMBUY.js";
+} from "./chunk-ATQLP22S.js";
 import {
   looksLikeConversationSummary,
   looksLikeSkillBody,
@@ -15,13 +15,13 @@ import {
 } from "./chunk-OOXRMTU6.js";
 import {
   isOrchestratorThread
-} from "./chunk-APKUI4BP.js";
+} from "./chunk-RDXODLEN.js";
 import {
   codexUnattendedGitConfigArgs,
   mergeAgentGitAuthEnv,
   resolveAgentGitAuthEnv,
   resolveCodexGitWritableRoots
-} from "./chunk-BTF3ATST.js";
+} from "./chunk-R2C45NHT.js";
 import {
   loadBrightsyConfig
 } from "./chunk-RSA47QYR.js";
@@ -34,7 +34,7 @@ import {
   CLAUDE_POSTHOG_CONNECTOR_ALLOWED_TOOLS,
   CLAUDE_PRINT_BG_WAIT_CEILING_MS,
   mcpAllowToolsFromNames
-} from "./chunk-F2PVRF3B.js";
+} from "./chunk-N6ZF3XRP.js";
 import {
   CURSOR_SDK_INSTALL_HINT,
   applyAgentRunnerHeapEnv,
@@ -48,7 +48,7 @@ import {
   packagedMcpStdioPath,
   parseCursorRunnerLine,
   resolveNodeLaunch
-} from "./chunk-U5WO6MEB.js";
+} from "./chunk-NURZOXGN.js";
 import {
   extractJsonErrorMessage,
   formatUnknownDetail,
@@ -77,9 +77,10 @@ import {
   isLinearConnected,
   isPosthogConnected,
   loadAppSettings,
+  requestOccupancy,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-RZJTGBXY.js";
+} from "./chunk-D446IWPP.js";
 import {
   isElectronLikeCommand,
   unwrapStrippedElectronLaunch
@@ -2658,7 +2659,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-Z2SURNHA.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-4CTLU2BV.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const rpc = worktreeAgentRpc(isOrchestrator);
     const injectedServers = await buildInjectedMcpServers({
@@ -2885,7 +2886,7 @@ var claudeAdapter = {
     return { file: claude, args, cwd: thread.worktreePath };
   },
   async listLinearIssues(_repoPath) {
-    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-63I7QUC6.js");
+    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-FGVN65JU.js");
     return listAssignedLinearIssues2();
   }
 };
@@ -2970,13 +2971,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() || join7(homedir6(), ".codex");
@@ -3242,7 +3246,7 @@ var codexAdapter = {
       }
       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()) {
@@ -3973,7 +3977,7 @@ var opencodeAdapter = {
     };
   },
   async listLinearIssues(_repoPath) {
-    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-63I7QUC6.js");
+    const { listAssignedLinearIssues: listAssignedLinearIssues2 } = await import("./linear-list-FGVN65JU.js");
     return listAssignedLinearIssues2();
   }
 };

package/dist/{chunk-U5WO6MEB.js → chunk-NURZOXGN.js}

@@ -757,7 +757,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;