@sideboard-ai/core 0.1.79 → 0.1.83

package/dist/{chunk-FUUVPN4A.js → chunk-HBBXS2FR.js}

@@ -14,7 +14,7 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-UHGN4KCL.js";
 import {
   worktreesRoot
 } from "./chunk-7MV3RXSC.js";
@@ -884,6 +884,19 @@ function formatGhLandError(raw, opts) {
   }
   return detail || "Failed to create or update pull request";
 }
+function isPrNotMergeableError(text) {
+  return /not mergeable|cannot be cleanly created|cannot merge cleanly|Merge conflict|\bCONFLICTING\b|must be (updated|rebased)|branch is out of date|needs? to be (updated|rebased)|Resolve conflicts or update the branch/i.test(
+    text
+  );
+}
+function formatMergePrError(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return "gh pr merge failed";
+  if (isPrNotMergeableError(trimmed)) {
+    return "This pull request cannot merge cleanly into the base branch. Resolve conflicts or update the branch, then retry.";
+  }
+  return extractGhErrorDetail(trimmed) || trimmed;
+}
 
 // src/git/git-auth-mode.ts
 var HTTPS_REWRITE = [
@@ -1566,6 +1579,41 @@ ${result.stderr}`;
   ].slice(0, 20) : [];
   return { conflicting, base: baseName, files };
 }
+async function probeLocalMergeGate(cwd, gate) {
+  const mergeable = (gate?.mergeable ?? "").toUpperCase();
+  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
+  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const inQueue = gate ? prIsInMergeQueue(gate) : false;
+  if (alreadyConflicting || inQueue) return { gate, files: [] };
+  try {
+    const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
+    if (local.conflicting) {
+      return {
+        gate: {
+          mergeable: "CONFLICTING",
+          mergeStateStatus: "DIRTY",
+          reviewDecision: gate?.reviewDecision ?? null,
+          baseRefName: local.base,
+          url: gate?.url ?? null,
+          isInMergeQueue: false
+        },
+        files: local.files
+      };
+    }
+    if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
+      return {
+        gate: {
+          ...gate,
+          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
+          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
+        },
+        files: []
+      };
+    }
+  } catch {
+  }
+  return { gate, files: [] };
+}
 async function getPrChecks(cwd, selector) {
   const slug = await resolveGithubRepoSlug(cwd);
   const args = [
@@ -1601,47 +1649,9 @@ async function getPrChecks(cwd, selector) {
     }
   }
   let gate = await fetchPrMergeGate(cwd, selector, slug);
-  const mergeable = (gate?.mergeable ?? "").toUpperCase();
-  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
-  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const inQueue = gate ? prIsInMergeQueue(gate) : false;
-  const needsLocalProbe = !alreadyConflicting && !inQueue;
-  if (needsLocalProbe) {
-    try {
-      const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
-      if (local.conflicting) {
-        const fileHint = local.files.length > 0 ? ` Conflicting paths: ${local.files.slice(0, 8).join(", ")}${local.files.length > 8 ? "\u2026" : ""}.` : "";
-        gate = {
-          mergeable: "CONFLICTING",
-          mergeStateStatus: "DIRTY",
-          reviewDecision: gate?.reviewDecision ?? null,
-          baseRefName: local.base,
-          url: gate?.url ?? null,
-          isInMergeQueue: false
-        };
-        const ciFailed2 = ciChecks.some((c) => c.bucket === "fail");
-        const review2 = (gate.reviewDecision ?? "").toUpperCase();
-        const hasReviewRow2 = review2 === "CHANGES_REQUESTED" || review2 === "REVIEW_REQUIRED";
-        const gateRows2 = buildMergeGateChecks(gate, {
-          suppressGenericBlocked: ciFailed2 || hasReviewRow2
-        }).map(
-          (row) => row.kind === "mergeability" && row.name === "Merge conflicts" ? {
-            ...row,
-            description: `${row.description ?? ""}${fileHint}`.trim()
-          } : row
-        );
-        return [...gateRows2, ...ciChecks];
-      }
-      if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
-        gate = {
-          ...gate,
-          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
-          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
-        };
-      }
-    } catch {
-    }
-  }
+  const probed = await probeLocalMergeGate(cwd, gate);
+  gate = probed.gate;
+  const fileHint = probed.files.length > 0 ? ` Conflicting paths: ${probed.files.slice(0, 8).join(", ")}${probed.files.length > 8 ? "\u2026" : ""}.` : "";
   if (!gate) {
     return ciChecks;
   }
@@ -1651,7 +1661,12 @@ async function getPrChecks(cwd, selector) {
   const gateRows = buildMergeGateChecks(gate, {
     // Avoid duplicating "blocked" when CI failures or review rows already explain it.
     suppressGenericBlocked: ciFailed || hasReviewRow
-  });
+  }).map(
+    (row) => fileHint && row.kind === "mergeability" && row.name === "Merge conflicts" ? {
+      ...row,
+      description: `${row.description ?? ""}${fileHint}`.trim()
+    } : row
+  );
   return [...gateRows, ...ciChecks];
 }
 async function getPrMeta(cwd, selector) {
@@ -1661,7 +1676,7 @@ async function getPrMeta(cwd, selector) {
     "view",
     selector,
     "--json",
-    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus"
+    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus,mergeable"
   ];
   if (slug) viewArgs.push("--repo", slug);
   let { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
@@ -1671,7 +1686,7 @@ async function getPrMeta(cwd, selector) {
       "view",
       selector,
       "--json",
-      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus"
+      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus,mergeable"
     ];
     if (slug) retry.push("--repo", slug);
     ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
@@ -1682,16 +1697,28 @@ async function getPrMeta(cwd, selector) {
   }
   try {
     const view = JSON.parse(stdout);
+    const gate = {
+      mergeable: typeof view.mergeable === "string" && view.mergeable ? view.mergeable : null,
+      mergeStateStatus: typeof view.mergeStateStatus === "string" && view.mergeStateStatus ? view.mergeStateStatus : null,
+      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
+      baseRefName: String(view.baseRefName ?? ""),
+      url: String(view.url ?? ""),
+      isInMergeQueue: parseInMergeQueue(view)
+    };
+    const probed = await probeLocalMergeGate(cwd, gate);
+    const resolved = probed.gate ?? gate;
     return {
       number: Number(view.number),
       title: String(view.title ?? ""),
       url: String(view.url ?? ""),
       state: String(view.state ?? ""),
       isDraft: Boolean(view.isDraft),
-      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
-      baseRefName: String(view.baseRefName ?? ""),
+      reviewDecision: resolved.reviewDecision,
+      baseRefName: resolved.baseRefName || String(view.baseRefName ?? ""),
       headRefName: String(view.headRefName ?? ""),
-      isInMergeQueue: parseInMergeQueue(view)
+      isInMergeQueue: Boolean(resolved.isInMergeQueue),
+      mergeable: resolved.mergeable,
+      mergeStateStatus: resolved.mergeStateStatus
     };
   } catch {
     return null;
@@ -2159,7 +2186,9 @@ async function mergePr(cwd, selector, opts) {
   if (slug) args.push("--repo", slug);
   const { exitCode, stderr, stdout } = await gh(args, cwd, { reject: false });
   if (exitCode !== 0) {
-    throw new Error(stderr.trim() || stdout.trim() || "gh pr merge failed");
+    throw new Error(
+      formatMergePrError(stderr.trim() || stdout.trim() || "gh pr merge failed")
+    );
   }
   const after = await gh(viewArgs, cwd, { reject: false });
   if (after.exitCode === 0 && after.stdout.trim()) {

package/dist/chunk-IZ7RPF54.js

@@ -0,0 +1,36 @@
+// src/hook/nested-electron-env.ts
+var NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
+function isNestedElectronEnvKey(key) {
+  return NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function stripNestedElectronEnv(env) {
+  const out = { ...env };
+  for (const key of Object.keys(out)) {
+    if (isNestedElectronEnvKey(key)) delete out[key];
+  }
+  return out;
+}
+function dropNestedElectronEnvFromProcess(env = process.env) {
+  for (const key of Object.keys(env)) {
+    if (isNestedElectronEnvKey(key)) delete env[key];
+  }
+}
+var STRIP_NESTED_ELECTRON_THEN_EXEC = [
+  "vars=`printenv | awk -F= '/^(ELECTRON_|CHROME_)/{print $1}'`",
+  '[ -n "$vars" ] && unset $vars',
+  "export ELECTRON_RUN_AS_NODE=1",
+  'exec "$@"'
+].join("; ");
+function wrapElectronAsNodeLaunch(file, args) {
+  if (process.platform === "win32") return { file, args };
+  return {
+    file: "/bin/sh",
+    args: ["-c", STRIP_NESTED_ELECTRON_THEN_EXEC, "sh", file, ...args]
+  };
+}
+
+export {
+  stripNestedElectronEnv,
+  dropNestedElectronEnvFromProcess,
+  wrapElectronAsNodeLaunch
+};

package/dist/{chunk-P33ZQ7ZC.js → chunk-JMRJ4F5B.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-VROPG6QF.js";
 import {
   isOrchestratorThread
-} from "./chunk-6T2SKGCS.js";
+} from "./chunk-DJFGX4RT.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -21,8 +21,9 @@ import {
   claudeChromeEnabled,
   loadAppSettings,
   resolveAgentExecutable,
-  resolveClaudeExecutable
-} from "./chunk-XKNBSYA7.js";
+  resolveClaudeExecutable,
+  wrapElectronAsNodeLaunch
+} from "./chunk-UHGN4KCL.js";
 import {
   appDataDir
 } from "./chunk-7MV3RXSC.js";
@@ -30,6 +31,46 @@ import {
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
 
+// src/agents/usage.ts
+function sumOptional(a, b) {
+  if (a == null && b == null) return void 0;
+  return (a ?? 0) + (b ?? 0);
+}
+function fromInclusiveInputUsage(opts) {
+  const totalInput = Number(opts.inputTokens) || 0;
+  const outputTokens = Number(opts.outputTokens) || 0;
+  const cached = Number(opts.cachedInputTokens) || 0;
+  if (!totalInput && !outputTokens) return null;
+  const cacheReadTokens = cached > 0 ? Math.min(cached, totalInput) : 0;
+  return {
+    inputTokens: Math.max(0, totalInput - cacheReadTokens),
+    outputTokens,
+    cacheReadTokens: cacheReadTokens || void 0
+  };
+}
+function requestOccupancy(u) {
+  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
+}
+function mergeUsage(a, b) {
+  return {
+    inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
+    outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
+    cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
+    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
+    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
+  };
+}
+function applyTurnUsage(current, incoming, scope = "request") {
+  if (scope === "turn") {
+    return {
+      ...incoming,
+      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
+    };
+  }
+  const merged = mergeUsage(current, incoming);
+  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
+}
+
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
   if (accountId) return `team:${accountId}:${type}:${id}`;
@@ -205,15 +246,11 @@ ${prompt}`;
 // src/agents/brightsy.ts
 function usageFromBrightsy(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.prompt_tokens ?? 0);
-  const outputTokens = Number(usage.completion_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  const cached = Number(usage.prompt_tokens_details?.cached_tokens ?? 0);
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: cached || void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.prompt_tokens ?? 0),
+    outputTokens: Number(usage.completion_tokens ?? 0),
+    cachedInputTokens: Number(usage.prompt_tokens_details?.cached_tokens ?? 0)
+  });
 }
 function parseBrightsyCliLine(line) {
   const trimmed = line.trim();
@@ -552,6 +589,13 @@ function sideboardMcpProfile(env = process.env) {
 function isAsarPath(filePath) {
   return /\.asar([/\\]|$)/.test(filePath);
 }
+function applyNodeLaunch(launch, args) {
+  if (!launch.env.ELECTRON_RUN_AS_NODE) {
+    return { file: launch.file, args, env: launch.env };
+  }
+  const wrapped = wrapElectronAsNodeLaunch(launch.file, args);
+  return { file: wrapped.file, args: wrapped.args, env: launch.env };
+}
 async function resolveNodeLaunch(scriptPath) {
   if (isAsarPath(scriptPath)) {
     return {
@@ -712,11 +756,11 @@ async function resolveSideboardMcpServer() {
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
     const scriptArgs = isCli ? [entry, "mcp"] : [entry];
-    const launch = await resolveNodeLaunch(entry);
+    const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
     return {
       name: "sideboard",
       command: launch.file,
-      args: scriptArgs,
+      args: launch.args,
       ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
@@ -1009,7 +1053,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-RI367AM6.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-OBRWUPZG.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1260,14 +1304,11 @@ async function listCodexModels() {
 }
 function usageFromCodex(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.input_tokens ?? 0);
-  const outputTokens = Number(usage.output_tokens ?? 0) + Number(usage.reasoning_output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: usage.cached_input_tokens ? Number(usage.cached_input_tokens) : void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.input_tokens ?? 0),
+    outputTokens: Number(usage.output_tokens ?? 0),
+    cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
+  });
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
@@ -1834,10 +1875,13 @@ var cursorAdapter = {
     };
     const runner = cursorRunnerPath();
     const isTs = runner.endsWith(".ts");
-    const launch = await resolveNodeLaunch(runner);
+    const launch = applyNodeLaunch(
+      await resolveNodeLaunch(runner),
+      isTs ? ["--import", "tsx", runner] : [runner]
+    );
     return {
       file: launch.file,
-      args: isTs ? ["--import", "tsx", runner] : [runner],
+      args: launch.args,
       cwd: thread.worktreePath,
       stdin: JSON.stringify(req),
       env: {
@@ -2577,6 +2621,7 @@ export {
   fallbackTurnFailDetail,
   humanizeAgentFailDetail,
   formatTurnExitError,
+  applyTurnUsage,
   encodeBrightsyTarget,
   decodeBrightsyTarget,
   parseBrightsyCliLine,

package/dist/{chunk-SHCR6RPU.js → chunk-JW6YFPQE.js}

@@ -1,6 +1,6 @@
 import {
   isOrchestratorThread
-} from "./chunk-5LXWTU3J.js";
+} from "./chunk-NXXT5SE3.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
@@ -19,7 +19,10 @@ import {
   loadAppSettings,
   resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
+import {
+  wrapElectronAsNodeLaunch
+} from "./chunk-IZ7RPF54.js";
 import {
   appDataDir
 } from "./chunk-M37RITA6.js";
@@ -34,6 +37,53 @@ import {
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
 
+// src/agents/usage.ts
+function sumOptional(a, b) {
+  if (a == null && b == null) return void 0;
+  return (a ?? 0) + (b ?? 0);
+}
+function fromInclusiveInputUsage(opts) {
+  const totalInput = Number(opts.inputTokens) || 0;
+  const outputTokens = Number(opts.outputTokens) || 0;
+  const cached = Number(opts.cachedInputTokens) || 0;
+  if (!totalInput && !outputTokens) return null;
+  const cacheReadTokens = cached > 0 ? Math.min(cached, totalInput) : 0;
+  return {
+    inputTokens: Math.max(0, totalInput - cacheReadTokens),
+    outputTokens,
+    cacheReadTokens: cacheReadTokens || void 0
+  };
+}
+function requestOccupancy(u) {
+  return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
+}
+function mergeUsage(a, b) {
+  return {
+    inputTokens: (a?.inputTokens ?? 0) + b.inputTokens,
+    outputTokens: (a?.outputTokens ?? 0) + b.outputTokens,
+    cacheReadTokens: sumOptional(a?.cacheReadTokens, b.cacheReadTokens),
+    cacheWriteTokens: sumOptional(a?.cacheWriteTokens, b.cacheWriteTokens),
+    lastRequestTokens: b.lastRequestTokens ?? a?.lastRequestTokens
+  };
+}
+function applyTurnUsage(current, incoming, scope = "request") {
+  if (scope === "turn") {
+    return {
+      ...incoming,
+      lastRequestTokens: current?.lastRequestTokens ?? requestOccupancy(incoming)
+    };
+  }
+  const merged = mergeUsage(current, incoming);
+  return { ...merged, lastRequestTokens: requestOccupancy(incoming) };
+}
+function totalTokens(u) {
+  return u.inputTokens + u.outputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
+}
+function contextTokens(u) {
+  if (u.lastRequestTokens != null && u.lastRequestTokens > 0) return u.lastRequestTokens;
+  return requestOccupancy(u);
+}
+
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
   if (accountId) return `team:${accountId}:${type}:${id}`;
@@ -131,15 +181,11 @@ var MAX_ANTHROPIC_CACHE_CONTROL_BLOCKS = 4;
 // src/agents/brightsy.ts
 function usageFromBrightsy(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.prompt_tokens ?? 0);
-  const outputTokens = Number(usage.completion_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  const cached = Number(usage.prompt_tokens_details?.cached_tokens ?? 0);
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: cached || void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.prompt_tokens ?? 0),
+    outputTokens: Number(usage.completion_tokens ?? 0),
+    cachedInputTokens: Number(usage.prompt_tokens_details?.cached_tokens ?? 0)
+  });
 }
 function parseBrightsyCliLine(line) {
   const trimmed = line.trim();
@@ -485,6 +531,13 @@ function sideboardMcpProfile(env = process.env) {
 function isAsarPath(filePath) {
   return /\.asar([/\\]|$)/.test(filePath);
 }
+function applyNodeLaunch(launch, args) {
+  if (!launch.env.ELECTRON_RUN_AS_NODE) {
+    return { file: launch.file, args, env: launch.env };
+  }
+  const wrapped = wrapElectronAsNodeLaunch(launch.file, args);
+  return { file: wrapped.file, args: wrapped.args, env: launch.env };
+}
 async function resolveNodeLaunch(scriptPath) {
   if (isAsarPath(scriptPath)) {
     return {
@@ -649,11 +702,11 @@ async function resolveSideboardMcpServer() {
   if (entry) {
     const isCli = /[/\\]cli[/\\]dist[/\\]index\.js$/.test(entry);
     const scriptArgs = isCli ? [entry, "mcp"] : [entry];
-    const launch = await resolveNodeLaunch(entry);
+    const launch = applyNodeLaunch(await resolveNodeLaunch(entry), scriptArgs);
     return {
       name: "sideboard",
       command: launch.file,
-      args: scriptArgs,
+      args: launch.args,
       ...Object.keys(launch.env).length > 0 ? { env: launch.env } : {}
     };
   }
@@ -949,7 +1002,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-VG44RZUH.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-GSLCEB5E.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1200,14 +1253,11 @@ async function listCodexModels() {
 }
 function usageFromCodex(usage) {
   if (!usage) return null;
-  const inputTokens = Number(usage.input_tokens ?? 0);
-  const outputTokens = Number(usage.output_tokens ?? 0) + Number(usage.reasoning_output_tokens ?? 0);
-  if (!inputTokens && !outputTokens) return null;
-  return {
-    inputTokens,
-    outputTokens,
-    cacheReadTokens: usage.cached_input_tokens ? Number(usage.cached_input_tokens) : void 0
-  };
+  return fromInclusiveInputUsage({
+    inputTokens: Number(usage.input_tokens ?? 0),
+    outputTokens: Number(usage.output_tokens ?? 0),
+    cachedInputTokens: Number(usage.cached_input_tokens ?? 0)
+  });
 }
 function codexConfigHasNetworkAccess() {
   const candidates = [
@@ -1603,10 +1653,13 @@ var cursorAdapter = {
     };
     const runner = cursorRunnerPath();
     const isTs = runner.endsWith(".ts");
-    const launch = await resolveNodeLaunch(runner);
+    const launch = applyNodeLaunch(
+      await resolveNodeLaunch(runner),
+      isTs ? ["--import", "tsx", runner] : [runner]
+    );
     return {
       file: launch.file,
-      args: isTs ? ["--import", "tsx", runner] : [runner],
+      args: launch.args,
       cwd: thread.worktreePath,
       stdin: JSON.stringify(req),
       env: {
@@ -2339,6 +2392,12 @@ function allAdapters() {
 }
 
 export {
+  fromInclusiveInputUsage,
+  requestOccupancy,
+  mergeUsage,
+  applyTurnUsage,
+  totalTokens,
+  contextTokens,
   encodeBrightsyTarget,
   decodeBrightsyTarget,
   normalizeTurnInput,

package/dist/{chunk-PW5YHHP3.js → chunk-LVTNWH7B.js}

@@ -1,10 +1,10 @@
 import {
   isGlobalRepoPath
-} from "./chunk-5LXWTU3J.js";
+} from "./chunk-NXXT5SE3.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-YVVXWWCC.js";
+} from "./chunk-GD2FM6FN.js";
 import {
   appDataDir
 } from "./chunk-M37RITA6.js";

package/dist/{chunk-5LXWTU3J.js → chunk-NXXT5SE3.js}

@@ -1,15 +1,15 @@
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-HCGEFU3J.js";
+} from "./chunk-E2MIA7DO.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-YVVXWWCC.js";
+} from "./chunk-GD2FM6FN.js";
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-YO3CYL6B.js";
 import {
   createEmptyThread,
   listThreads,

package/dist/{chunk-5VTWBI3I.js → chunk-RS54WYYH.js}

@@ -2,11 +2,11 @@
 
 import {
   isGlobalRepoPath
-} from "./chunk-6T2SKGCS.js";
+} from "./chunk-DJFGX4RT.js";
 import {
   ensureGhPreferOrigin,
   resolveRepoRoot
-} from "./chunk-FUUVPN4A.js";
+} from "./chunk-HBBXS2FR.js";
 import {
   appDataDir
 } from "./chunk-7MV3RXSC.js";

package/dist/{chunk-XKNBSYA7.js → chunk-UHGN4KCL.js}

@@ -17,6 +17,37 @@ import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { homedir, hostname } from "os";
 import { join as join2 } from "path";
 
+// src/hook/nested-electron-env.ts
+var NESTED_ELECTRON_ENV_PREFIXES = ["ELECTRON_", "CHROME_"];
+function isNestedElectronEnvKey(key) {
+  return NESTED_ELECTRON_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+function stripNestedElectronEnv(env) {
+  const out = { ...env };
+  for (const key of Object.keys(out)) {
+    if (isNestedElectronEnvKey(key)) delete out[key];
+  }
+  return out;
+}
+function dropNestedElectronEnvFromProcess(env = process.env) {
+  for (const key of Object.keys(env)) {
+    if (isNestedElectronEnvKey(key)) delete env[key];
+  }
+}
+var STRIP_NESTED_ELECTRON_THEN_EXEC = [
+  "vars=`printenv | awk -F= '/^(ELECTRON_|CHROME_)/{print $1}'`",
+  '[ -n "$vars" ] && unset $vars',
+  "export ELECTRON_RUN_AS_NODE=1",
+  'exec "$@"'
+].join("; ");
+function wrapElectronAsNodeLaunch(file, args) {
+  if (process.platform === "win32") return { file, args };
+  return {
+    file: "/bin/sh",
+    args: ["-c", STRIP_NESTED_ELECTRON_THEN_EXEC, "sh", file, ...args]
+  };
+}
+
 // src/store/secret-vault.ts
 import { join } from "path";
 
@@ -1062,7 +1093,7 @@ function applyAppEnvironment(target = process.env, settings = loadAppSettings())
 }
 function childEnvWithAppSettings(extra) {
   const settings = loadAppSettings();
-  const env = { ...process.env };
+  const env = stripNestedElectronEnv({ ...process.env });
   applyAppEnvironment(env, settings);
   if (extra) {
     for (const [k, v] of Object.entries(extra)) {
@@ -1076,6 +1107,9 @@ function harnessEnvKey(harness) {
 }
 
 export {
+  stripNestedElectronEnv,
+  dropNestedElectronEnvFromProcess,
+  wrapElectronAsNodeLaunch,
   resolveVaultKey,
   readSecureJson,
   writeSecureJson,