@codexhost/cli-darwin-x64 0.2.1 → 0.2.2

package/README.md

@@ -7,7 +7,7 @@ Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.
 ## Install
 
 ```bash
-npm install -g @codexhost/cli@0.2.1
+npm install -g @codexhost/cli@0.2.2
 ```
 
 Do not install this package directly. npm selects it through the optional dependencies of `@codexhost/cli`.
@@ -32,7 +32,7 @@ The `codexhost` command launches the packaged Rust launcher with:
 ## Requirements
 
 - Node.js 22 or 24 (Node 20 and older are not supported)
-- Official Codex Desktop for macOS or Windows
+- Official ChatGPT/Codex Desktop for macOS, Windows, or Linux
 - Pi on `PATH` when using the Pi agent
 - Claude Code installed when using the Claude Code adapter
 

package/app/codexhost-distribution.json

@@ -1 +1 @@
-{"schemaVersion":1,"version":"0.2.1","distribution":"npm","target":"macos-x64"}
+{"schemaVersion":1,"version":"0.2.2","distribution":"npm","target":"macos-x64"}

package/app/host-runtime.mjs

@@ -51911,6 +51911,7 @@ function isSyntheticGrokTurnKey(nativeTurnKey3) {
   return taskCompletedTurnKeyPattern.test(nativeTurnKey3);
 }
 function mapGrokReplay(replay, harnessId, sessionId, knownTurnRefs = []) {
+  const knownByNativeKey = new Map(knownTurnRefs.filter((ref) => ref.harnessId === harnessId && ref.nativeSessionId === sessionId).map((ref) => [ref.nativeTurnKey, ref]));
   const turns = [];
   let input = "";
   let items = [];
@@ -51941,13 +51942,11 @@ function mapGrokReplay(replay, harnessId, sessionId, knownTurnRefs = []) {
   const completeTurn = (outcome, terminalKey) => {
     if (input.length === 0)
       return;
-    const known = knownTurnRefs[turnIndex];
-    if (known && (known.harnessId !== harnessId || known.nativeSessionId !== sessionId)) {
-      throw new Error("Known Grok Turn identity does not belong to the Native Session");
-    }
-    const stableKey = known?.nativeTurnKey ?? terminalKey ?? nativeTurnKey3;
-    if (!stableKey)
+    const reconstructedKey = terminalKey ?? nativeTurnKey3;
+    if (!reconstructedKey)
       throw new Error("Grok Native history Turn has no stable identity");
+    const known = knownByNativeKey.get(reconstructedKey);
+    const stableKey = known?.nativeTurnKey ?? reconstructedKey;
     completeReasoning();
     completeAgent();
     completeTools();
@@ -52033,9 +52032,6 @@ function mapGrokReplay(replay, harnessId, sessionId, knownTurnRefs = []) {
     }
   }
   completeTurn({ status: "unknown", reason: "Grok Native history has no terminal signal" });
-  if (knownTurnRefs.length > turns.length) {
-    throw new Error("Grok Native history is missing persisted Turns");
-  }
   return { turns };
 }
 
@@ -52297,16 +52293,75 @@ function usageFromSignals(value) {
     return null;
   }
 }
-function lastTurnUsage(events) {
-  for (let index = events.length - 1; index >= 0; index -= 1) {
-    const event = events[index];
+var summedUsageFields = [
+  "inputTokens",
+  "cachedInputTokens",
+  "cacheWriteInputTokens",
+  "outputTokens",
+  "reasoningOutputTokens",
+  "totalTokens"
+];
+function nativeCostTicks(value) {
+  if (!isRecord12(value))
+    return void 0;
+  const ticks = value.costUsdTicks;
+  if (typeof ticks !== "number" || !Number.isSafeInteger(ticks) || ticks < 0)
+    return void 0;
+  return ticks;
+}
+function historyTurnKey(event, index) {
+  const key = event.nativeTurnKey;
+  if (typeof key === "string" && key.startsWith("task-completed-"))
+    return null;
+  return typeof key === "string" && key.length > 0 ? key : `anon-${index}`;
+}
+function sessionUsageFromHistory(events) {
+  const latestByKey = /* @__PURE__ */ new Map();
+  let lastCacheHitRatePercent;
+  let index = 0;
+  for (const event of events) {
     if (event?.type !== "turn.completed")
       continue;
+    const key = historyTurnKey(event, index);
+    index += 1;
+    if (key === null)
+      continue;
     const usage = usageFromNative(event.usage);
-    if (usage)
-      return usage;
+    if (!usage)
+      continue;
+    const ticks2 = nativeCostTicks(event.usage);
+    latestByKey.set(key, ticks2 === void 0 ? { usage } : { usage, ticks: ticks2 });
+    if (usage.cacheHitRatePercent !== void 0) {
+      lastCacheHitRatePercent = usage.cacheHitRatePercent;
+    }
+  }
+  if (latestByKey.size === 0)
+    return null;
+  const totals = {};
+  let ticks = 0;
+  let hasTicks = false;
+  for (const entry of latestByKey.values()) {
+    for (const field of summedUsageFields) {
+      const value = entry.usage[field];
+      if (value === void 0)
+        continue;
+      totals[field] = (totals[field] ?? 0) + value;
+    }
+    if (entry.ticks === void 0)
+      continue;
+    ticks += entry.ticks;
+    hasTicks = true;
+  }
+  const totalCostUsd = hasTicks ? optionalCostUsd(ticks) : void 0;
+  try {
+    return parseHostUsage({
+      ...totals,
+      ...totalCostUsd !== void 0 ? { totalCostUsd } : {},
+      ...lastCacheHitRatePercent !== void 0 ? { cacheHitRatePercent: lastCacheHitRatePercent } : {}
+    });
+  } catch {
+    return null;
   }
-  return null;
 }
 function usageFromUpdate(update, metadata, contextWindowTokens) {
   try {
@@ -52434,6 +52489,7 @@ var GrokHarnessSession = class {
   #cwd;
   #modelState;
   #onClosed;
+  #refreshCredits;
   #randomUUID;
   #snapshot;
   #toolOutputLimit;
@@ -52449,6 +52505,7 @@ var GrokHarnessSession = class {
     this.#transport = transport;
     this.#modelState = modelState;
     this.#onClosed = onClosed;
+    this.#refreshCredits = options.refreshCredits;
     this.#closeTimeoutMs = options.closeTimeoutMs;
     this.#randomUUID = options.randomUUID;
     this.#toolOutputLimit = options.toolOutputLimit;
@@ -52715,11 +52772,7 @@ var GrokHarnessSession = class {
       this.#startTool(active, event);
     else if (event.type === "tool.update")
       this.#updateTool(active, event);
-    else if (event.type === "turn.completed") {
-      const usage = usageFromNative(event.usage);
-      if (usage)
-        this.#publishUsage(usage, active.command.turnId);
-    } else if (event.type === "usage")
+    else if (event.type === "usage" || event.type === "turn.completed")
       return;
   }
   #appendAgent(active, text, messageId) {
@@ -52856,7 +52909,8 @@ var GrokHarnessSession = class {
         outcome = { status: "failed", error: normalizeError(error52, "protocolError") };
       }
     }
-    this.#finish(active, outcome, lastTurnUsage(history) ?? (response ? usageFromPrompt(response) : null), nativeTurnRef2);
+    await this.#refreshCredits().catch(() => void 0);
+    this.#finish(active, outcome, sessionUsageFromHistory(history) ?? (response ? usageFromPrompt(response) : null), nativeTurnRef2);
   }
   #finish(active, outcome, usage = null, nativeTurnRef2) {
     if (this.#active !== active)
@@ -53086,13 +53140,14 @@ var GrokAdapter = class {
         }
       }
       const history = await transport.getHistory();
-      const initialUsage = input.kind === "resume" ? combineUsage(lastTurnUsage(history), usageFromSignals(opened.signals)) : null;
+      const initialUsage = input.kind === "resume" ? combineUsage(sessionUsageFromHistory(history), usageFromSignals(opened.signals)) : null;
       const openedSession = new GrokHarnessSession(cwd, transport, opened, modelState, () => this.#sessions.delete(openedSession), {
         closeTimeoutMs: this.#closeTimeoutMs,
         history,
         initialUsage,
         ...input.kind === "resume" && input.knownTurnRefs ? { knownTurnRefs: input.knownTurnRefs } : {},
         randomUUID: this.#dependencies.randomUUID,
+        refreshCredits: () => this.refreshCredits(),
         toolOutputLimit: this.#toolOutputLimit
       });
       session = openedSession;
@@ -53558,27 +53613,28 @@ function pathCandidates(command, platform, environment) {
   const extensions = platform === "win32" && targetPath.extname(command) === "" ? (environmentValue2(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter(Boolean) : [""];
   return (environmentValue2(environment, "PATH") ?? "").split(targetPath.delimiter).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean).flatMap((directory) => extensions.map((extension) => targetPath.join(directory, command + extension)));
 }
-function nvmCandidates2(homeDirectory, executableName) {
-  const versionsDirectory = path11.join(homeDirectory, ".nvm", "versions", "node");
+function nvmCandidates2(homeDirectory, executableName, targetPath) {
+  const versionsDirectory = targetPath.join(homeDirectory, ".nvm", "versions", "node");
   try {
-    return readdirSync2(versionsDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => right.localeCompare(left, void 0, { numeric: true })).map((version2) => path11.join(versionsDirectory, version2, "bin", executableName));
+    return readdirSync2(versionsDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => right.localeCompare(left, void 0, { numeric: true })).map((version2) => targetPath.join(versionsDirectory, version2, "bin", executableName));
   } catch {
     return [];
   }
 }
 function userInstallCandidates2(platform, environment, homeDirectory) {
+  const targetPath = platform === "win32" ? path11.win32 : path11.posix;
   if (platform === "win32") {
-    const appData = environment.APPDATA ?? path11.join(homeDirectory, "AppData", "Roaming");
+    const appData = environment.APPDATA ?? targetPath.join(homeDirectory, "AppData", "Roaming");
     return [
-      path11.join(appData, "npm", "pi.cmd"),
-      path11.join(homeDirectory, ".local", "bin", "pi.exe"),
-      path11.join(homeDirectory, ".local", "bin", "pi.cmd")
+      targetPath.join(appData, "npm", "pi.cmd"),
+      targetPath.join(homeDirectory, ".local", "bin", "pi.exe"),
+      targetPath.join(homeDirectory, ".local", "bin", "pi.cmd")
     ];
   }
   return [
-    path11.join(homeDirectory, ".npm-global", "bin", "pi"),
-    path11.join(homeDirectory, ".local", "bin", "pi"),
-    ...nvmCandidates2(homeDirectory, "pi"),
+    targetPath.join(homeDirectory, ".npm-global", "bin", "pi"),
+    targetPath.join(homeDirectory, ".local", "bin", "pi"),
+    ...nvmCandidates2(homeDirectory, "pi", targetPath),
     "/opt/homebrew/bin/pi",
     "/usr/local/bin/pi"
   ];
@@ -56244,6 +56300,18 @@ function isNodeExecutable(value) {
 function lockOwnerIsLive(lock) {
   if (typeof lock.pid !== "number")
     return false;
+  if (lock.pid === process.pid) {
+    if (lock.executablePath && normalizeExecutablePath(lock.executablePath) !== normalizeExecutablePath(process.execPath)) {
+      return false;
+    }
+    if (lock.processStartedAt) {
+      const expected = Date.parse(lock.processStartedAt);
+      const actual = Date.now() - process.uptime() * 1e3;
+      if (Number.isFinite(expected) && Math.abs(actual - expected) > 5e3)
+        return false;
+    }
+    return true;
+  }
   const identity = processIdentity(lock.pid);
   if (!identity)
     return false;
@@ -56423,27 +56491,29 @@ var MappingStore = class {
       if (current.state !== "ready" || !current.nativeSessionRef) {
         throw new MappingStoreError("MAPPING_CONFLICT", "Only a ready Thread can reconcile Snapshot mappings");
       }
-      const merged = this.#mergeMappings(current.turnMappings, mappings);
-      if (merged.length !== mappings.length) {
-        throw new MappingStoreError("MAPPING_CONFLICT", "Snapshot reconciliation must retain every existing Turn mapping");
-      }
-      const mergedByHost = new Map(merged.map((mapping) => [mapping.hostTurnId, mapping]));
-      const ordered = mappings.map(({ hostTurnId }) => {
-        const mapping = mergedByHost.get(hostTurnId);
-        if (!mapping) {
+      const byHost = new Map(current.turnMappings.map((mapping) => [mapping.hostTurnId, mapping]));
+      const byNative = new Map(current.turnMappings.map((mapping) => [nativeTurnKey(mapping), mapping]));
+      const seenHost = /* @__PURE__ */ new Set();
+      const seenNative = /* @__PURE__ */ new Set();
+      const ordered = mappings.map((update) => {
+        const hostMatch = byHost.get(update.hostTurnId);
+        const nativeMatch = byNative.get(nativeTurnKey(update));
+        if (hostMatch && nativeMatch && hostMatch !== nativeMatch) {
+          throw new MappingStoreError("MAPPING_CONFLICT", "Turn identity mapping conflicts");
+        }
+        if (hostMatch && !sameJson(hostMatch.nativeTurnRef, update.nativeTurnRef)) {
+          throw new MappingStoreError("MAPPING_CONFLICT", "Host Turn maps to another Native Turn");
+        }
+        if (nativeMatch && nativeMatch.hostTurnId !== update.hostTurnId) {
+          throw new MappingStoreError("MAPPING_CONFLICT", "Native Turn maps to another Host Turn");
+        }
+        if (seenHost.has(update.hostTurnId) || seenNative.has(nativeTurnKey(update))) {
           throw new MappingStoreError("MAPPING_CONFLICT", "Snapshot reconciliation contains a duplicate Turn mapping");
         }
-        return mapping;
+        seenHost.add(update.hostTurnId);
+        seenNative.add(nativeTurnKey(update));
+        return { ...update };
       });
-      const orderedIndexByHost = new Map(ordered.map(({ hostTurnId }, index) => [hostTurnId, index]));
-      let previousIndex = -1;
-      for (const existing of current.turnMappings) {
-        const nextIndex = orderedIndexByHost.get(existing.hostTurnId);
-        if (nextIndex === void 0 || nextIndex <= previousIndex) {
-          throw new MappingStoreError("MAPPING_CONFLICT", "Snapshot reconciliation reordered an existing Turn mapping");
-        }
-        previousIndex = nextIndex;
-      }
       return sameJson(current.turnMappings, ordered) ? null : { ...current, turnMappings: ordered };
     });
   }
@@ -58454,25 +58524,14 @@ var ExternalThreadRepository = class {
         ...turn.checkpoint ? { nativeCheckpointRef: turn.checkpoint } : {}
       };
       return {
-        existing,
         snapshot: turn,
         mapping: {
           ...mapping,
+          nativeTurnRef: turn.nativeTurnRef,
           ...turn.checkpoint ? { nativeCheckpointRef: turn.checkpoint } : {}
         }
       };
     });
-    let existingIndex = 0;
-    for (const { existing } of aligned) {
-      if (!existing) continue;
-      if (existing.hostTurnId !== record3.turnMappings[existingIndex]?.hostTurnId) {
-        throw new Error("Persisted Turn mappings do not match the Native Snapshot order");
-      }
-      existingIndex += 1;
-    }
-    if (existingIndex !== record3.turnMappings.length) {
-      throw new Error("Persisted Turn mappings do not match the Native Snapshot order");
-    }
     const orderedMappings = aligned.map(({ mapping }) => mapping);
     const mappingsChanged = orderedMappings.length !== record3.turnMappings.length || orderedMappings.some((mapping, index) => {
       const persisted = record3.turnMappings[index];
@@ -59795,6 +59854,7 @@ function officialEnvironment(source) {
     "CODEXHOST_STOCK_CODEX_PATH",
     "CODEXHOST_LAUNCHER_PID",
     "CODEXHOST_LAUNCHER_EXECUTABLE",
+    "CODEXHOST_RUNTIME_DESCRIPTOR_PATH",
     "CODEXHOST_CONTROL_PORT",
     "CODEXHOST_CONTROL_NONCE",
     "CODEXHOST_NPM_NODE_PATH",
@@ -61681,6 +61741,7 @@ function parseUpdateStatus(value) {
 var UPDATE_RUNTIME_ENV = Object.freeze({
   launcherPid: "CODEXHOST_LAUNCHER_PID",
   launcherExecutable: "CODEXHOST_LAUNCHER_EXECUTABLE",
+  runtimeDescriptorPath: "CODEXHOST_RUNTIME_DESCRIPTOR_PATH",
   controllerPort: "CODEXHOST_CONTROL_PORT",
   controllerNonce: "CODEXHOST_CONTROL_NONCE",
   npmNodePath: "CODEXHOST_NPM_NODE_PATH",
@@ -61700,7 +61761,7 @@ function parseDistributionMetadata(value) {
   if (Object.keys(metadata).some((key) => !allowed2.includes(key))) {
     throw new Error("distribution metadata contains unknown fields");
   }
-  if (metadata.schemaVersion !== 1 || metadata.distribution !== "npm" && metadata.distribution !== "installer" || !["macos-arm64", "macos-x64", "windows-x64", "windows-arm64"].includes(String(metadata.target)) || typeof metadata.version !== "string") {
+  if (metadata.schemaVersion !== 1 || metadata.distribution !== "npm" && metadata.distribution !== "installer" || !["macos-arm64", "macos-x64", "windows-x64", "windows-arm64", "linux-x64"].includes(String(metadata.target)) || typeof metadata.version !== "string") {
     throw new Error("distribution metadata is invalid");
   }
   return {
@@ -61731,6 +61792,8 @@ function expectedTarget(platform, architecture) {
     return "windows-arm64";
   if (platform === "win32" && architecture === "x64")
     return "windows-x64";
+  if (platform === "linux" && architecture === "x64")
+    return "linux-x64";
   throw new Error(`unsupported update host ${platform}/${architecture}`);
 }
 function defaultUpdateStateDirectory(platform = process.platform, environment = process.env) {
@@ -61765,6 +61828,7 @@ async function resolveInstalledUpdateContext(options) {
   }
   const launcherPid = positiveEnvironmentInteger(environment, UPDATE_RUNTIME_ENV.launcherPid);
   const launcherExecutable = absoluteEnvironmentPath(environment, UPDATE_RUNTIME_ENV.launcherExecutable);
+  const runtimeDescriptorPath = absoluteEnvironmentPath(environment, UPDATE_RUNTIME_ENV.runtimeDescriptorPath);
   const stateDirectory = path15.normalize(options.stateDirectory ?? defaultUpdateStateDirectory(platform, environment));
   const resourcesRoot = path15.dirname(appDirectory);
   const installationRoot = platform === "darwin" ? path15.dirname(path15.dirname(resourcesRoot)) : resourcesRoot;
@@ -61773,6 +61837,7 @@ async function resolveInstalledUpdateContext(options) {
     version: metadata.version,
     launcherPid,
     launcherExecutable,
+    runtimeDescriptorPath,
     updaterExecutable,
     stateDirectory
   };
@@ -62194,9 +62259,33 @@ async function verifyDownloadedArtifact(source, filePath, result) {
 
 // packages/update-manager/dist/update-manager.js
 var REQUEST_SCHEMA_VERSION = 1;
+var WINDOWS_RENAME_RETRY_DELAYS_MS = [10, 30, 70, 150, 300];
 function errorMessage4(error52) {
   return error52 instanceof Error ? error52.message : String(error52);
 }
+function systemErrorCode2(error52) {
+  return typeof error52 === "object" && error52 !== null && "code" in error52 ? String(error52.code) : null;
+}
+function delay4(milliseconds) {
+  return new Promise((resolve2) => setTimeout(resolve2, milliseconds));
+}
+async function replaceStatusFile(temporaryPath, statusPath) {
+  let retryIndex = 0;
+  for (; ; ) {
+    try {
+      await rename2(temporaryPath, statusPath);
+      return;
+    } catch (error52) {
+      const retryDelay = WINDOWS_RENAME_RETRY_DELAYS_MS[retryIndex];
+      const code = systemErrorCode2(error52);
+      if (process.platform !== "win32" || retryDelay === void 0 || code !== "EACCES" && code !== "EBUSY" && code !== "EPERM") {
+        throw error52;
+      }
+      retryIndex += 1;
+      await delay4(retryDelay);
+    }
+  }
+}
 function requireAbsolutePath(value, label) {
   if (!path17.isAbsolute(value))
     throw new Error(`${label} must be an absolute path`);
@@ -62251,7 +62340,7 @@ function createBackgroundUpdateManager(dependencies = {}) {
         mode: 384,
         flag: "wx"
       });
-      await rename2(temporaryPath, statusPath);
+      await replaceStatusFile(temporaryPath, statusPath);
     } catch (error52) {
       await rm4(temporaryPath, { force: true });
       throw error52;
@@ -62299,6 +62388,7 @@ function createBackgroundUpdateManager(dependencies = {}) {
     const version2 = requireSemanticVersion(options.version);
     const launcherPid = requireLauncherPid(options.launcherPid);
     const launcherExecutable = await requireRegularFile(options.launcherExecutable, "Launcher executable");
+    const runtimeDescriptorPath = requireAbsolutePath(options.runtimeDescriptorPath, "runtime descriptor path");
     const updaterExecutable = await requireRegularFile(options.updaterExecutable, "Updater executable");
     const stateDirectory = requireAbsolutePath(options.stateDirectory, "update state directory");
     await mkdir3(stateDirectory, { recursive: true, mode: 448 });
@@ -62317,6 +62407,7 @@ function createBackgroundUpdateManager(dependencies = {}) {
       version: version2,
       launcherPid,
       launcherExecutable,
+      runtimeDescriptorPath,
       workDirectory,
       helperPath,
       requestPath,
@@ -62352,6 +62443,7 @@ function createBackgroundUpdateManager(dependencies = {}) {
       version: common.version,
       wait_pid: common.launcherPid,
       wait_executable: common.launcherExecutable,
+      runtime_descriptor_path: common.runtimeDescriptorPath,
       status_path: common.statusPath,
       installation
     };
@@ -62469,9 +62561,11 @@ function createHostUpdateCoordinator(options) {
     return publicStatus(discovered.status);
   }
   async function installable(context, release) {
-    if (context.metadata.distribution === "npm") return true;
+    if (context.installation.kind === "npm") return true;
+    const target = context.metadata.target;
+    if (target === "linux-x64") return false;
     try {
-      selectInstallerReleaseArtifact(release, context.metadata.target);
+      selectInstallerReleaseArtifact(release, target);
       return true;
     } catch {
       return false;
@@ -62569,10 +62663,11 @@ function createHostUpdateCoordinator(options) {
                 onPrepared
               });
             } else {
-              const artifact = selectInstallerReleaseArtifact(
-                release,
-                context.metadata.target
-              ).source;
+              const target = context.metadata.target;
+              if (target === "linux-x64") {
+                throw new Error("Linux installer updates are unsupported");
+              }
+              const artifact = selectInstallerReleaseArtifact(release, target).source;
               prepared2 = context.installation.kind === "windows-installer" ? await manager.prepareWindowsInstaller({
                 ...context.installation.options,
                 version: release.version,

package/app/renderer-extension.js

@@ -16429,30 +16429,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   function formatRendererCreditsPercent(value) {
     return `${decimal(value, 1)}%`;
   }
-  function rendererUsageTriggerMaxWidth(hasAccountCredits) {
-    return hasAccountCredits ? "min(300px, 44vw)" : "min(180px, 30vw)";
-  }
-  function formatRendererCreditsReset(value) {
-    const date5 = new Date(value);
-    if (Number.isNaN(date5.getTime())) return value;
-    return date5.toLocaleString(void 0, {
-      month: "long",
-      day: "numeric",
-      hour: "numeric",
-      minute: "2-digit"
-    });
-  }
-  function creditsPeriodLabel(periodType) {
-    if (periodType === "weekly") return "Weekly limit";
-    if (periodType === "monthly") return "Monthly limit";
-    return "Account limit";
-  }
-  function productLabel(product) {
-    if (product === "GrokBuild") return "Build";
-    if (product === "GrokChat") return "Chat";
-    if (product === "GrokImagine") return "Imagine";
-    if (product === "GrokVoice") return "Voice";
-    return product;
+  function rendererUsageTriggerMaxWidth() {
+    return "min(180px, 30vw)";
   }
   function addDetailRow(parent, label, value) {
     const row = document.createElement("div");
@@ -16470,30 +16448,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     row.append(labelElement, valueElement);
     parent.append(row);
   }
-  function renderDetails(popover, usage, accountCredits) {
+  function renderDetails(popover, usage) {
     popover.replaceChildren();
     const heading = document.createElement("div");
     heading.textContent = "Usage";
     heading.style.fontWeight = "600";
     heading.style.marginBottom = "6px";
     popover.append(heading);
-    if (accountCredits) {
-      addDetailRow(
-        popover,
-        creditsPeriodLabel(accountCredits.periodType),
-        formatRendererCreditsPercent(accountCredits.usedPercent)
-      );
-      if (accountCredits.resetsAt) {
-        addDetailRow(popover, "Resets", formatRendererCreditsReset(accountCredits.resetsAt));
-      }
-      for (const product of accountCredits.productUsage ?? []) {
-        addDetailRow(
-          popover,
-          productLabel(product.product),
-          formatRendererCreditsPercent(product.usagePercent)
-        );
-      }
-    }
     if (usage?.contextUsedTokens !== void 0 && usage.contextWindowTokens !== void 0) {
       const contextPercent = usage.contextWindowTokens > 0 ? usage.contextUsedTokens / usage.contextWindowTokens * 100 : null;
       addDetailRow(
@@ -16586,7 +16547,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     trigger.style.display = "inline-flex";
     trigger.style.alignItems = "center";
     trigger.style.width = "fit-content";
-    trigger.style.maxWidth = rendererUsageTriggerMaxWidth(false);
+    trigger.style.maxWidth = rendererUsageTriggerMaxWidth();
     trigger.style.height = "24px";
     trigger.style.padding = "0 4px";
     trigger.style.borderRadius = "9999px";
@@ -16689,33 +16650,281 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     document.body.append(popover);
     return control;
   }
-  function renderRendererUsageControl(control, usage, accountCredits = null) {
+  function renderRendererUsageControl(control, usage) {
     const cacheHitRatePercent = usage?.cacheHitRatePercent;
     const outputTokensPerSecond = usage?.outputTokensPerSecond;
     const totalCostUsd = usage?.totalCostUsd;
     const hasCacheHitRate = cacheHitRatePercent !== void 0;
     const hasOutputSpeed = outputTokensPerSecond !== void 0;
     const hasCost = totalCostUsd !== void 0;
-    const hasCredits = accountCredits !== null;
-    const visible = hasCacheHitRate || hasOutputSpeed || hasCost || hasCredits;
+    const visible = hasCacheHitRate || hasOutputSpeed || hasCost;
     control.root.style.display = visible ? "inline-flex" : "none";
     if (!visible) {
       closePopover(control);
       return false;
     }
     const summary = [
-      accountCredits ? `${creditsPeriodLabel(accountCredits.periodType)} ${formatRendererCreditsPercent(accountCredits.usedPercent)}` : null,
       cacheHitRatePercent !== void 0 ? formatRendererCacheHitRate(cacheHitRatePercent) : null,
       outputTokensPerSecond !== void 0 ? formatRendererTokenRate(outputTokensPerSecond) : null,
       totalCostUsd !== void 0 ? formatRendererCost(totalCostUsd) : null
     ].filter((value) => value !== null);
     const compactSummary = summary.join(" \xB7 ");
     const accessibleSummary = `Thread Usage: ${compactSummary}`;
-    control.trigger.style.maxWidth = rendererUsageTriggerMaxWidth(hasCredits);
+    control.trigger.style.maxWidth = rendererUsageTriggerMaxWidth();
     control.trigger.setAttribute("aria-label", accessibleSummary);
     control.trigger.title = accessibleSummary;
     control.label.textContent = compactSummary;
-    renderDetails(control.popover, usage, accountCredits);
+    renderDetails(control.popover, usage);
+    return true;
+  }
+
+  // src/renderer-credits-control.ts
+  function rendererCreditsTone(usedPercent) {
+    if (usedPercent >= 90) return "hot";
+    if (usedPercent >= 70) return "warn";
+    return "ok";
+  }
+  function formatRendererCreditsReset(value) {
+    const date5 = new Date(value);
+    if (Number.isNaN(date5.getTime())) return value;
+    return date5.toLocaleString(void 0, {
+      month: "long",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit"
+    });
+  }
+  function creditsPeriodLabel(periodType) {
+    if (periodType === "weekly") return "Weekly limit";
+    if (periodType === "monthly") return "Monthly limit";
+    return "Account limit";
+  }
+  function productLabel(product) {
+    if (product === "GrokBuild") return "Build";
+    if (product === "GrokChat") return "Chat";
+    if (product === "GrokImagine") return "Imagine";
+    if (product === "GrokVoice") return "Voice";
+    return product;
+  }
+  function toneColor(tone) {
+    if (tone === "hot") return "#c45c4a";
+    if (tone === "warn") return "#c9a227";
+    return "#3d9a64";
+  }
+  function addDetailRow2(parent, label, value) {
+    const row = document.createElement("div");
+    row.style.display = "grid";
+    row.style.gridTemplateColumns = "minmax(0, 1fr) auto";
+    row.style.gap = "20px";
+    row.style.padding = "4px 0";
+    const labelElement = document.createElement("span");
+    labelElement.textContent = label;
+    labelElement.style.color = "color-mix(in srgb, currentColor 68%, transparent)";
+    const valueElement = document.createElement("span");
+    valueElement.textContent = value;
+    valueElement.style.fontVariantNumeric = "tabular-nums";
+    valueElement.style.textAlign = "right";
+    row.append(labelElement, valueElement);
+    parent.append(row);
+  }
+  function renderDetails2(popover, credits) {
+    popover.replaceChildren();
+    const heading = document.createElement("div");
+    heading.textContent = creditsPeriodLabel(credits.periodType);
+    heading.style.fontWeight = "600";
+    heading.style.marginBottom = "6px";
+    popover.append(heading);
+    addDetailRow2(popover, "Used", formatRendererCreditsPercent(credits.usedPercent));
+    if (credits.resetsAt) {
+      addDetailRow2(popover, "Resets", formatRendererCreditsReset(credits.resetsAt));
+    }
+    for (const product of credits.productUsage ?? []) {
+      addDetailRow2(
+        popover,
+        productLabel(product.product),
+        formatRendererCreditsPercent(product.usagePercent)
+      );
+    }
+  }
+  function popoverIsOpen2(popover) {
+    try {
+      return popover.matches(":popover-open");
+    } catch {
+      return !popover.hidden;
+    }
+  }
+  function positionPopover2(control) {
+    const triggerRect = control.trigger.getBoundingClientRect();
+    const width = Math.min(280, Math.max(220, window.innerWidth - 24));
+    const left = Math.max(12, Math.min(triggerRect.left, window.innerWidth - width - 12));
+    control.popover.style.width = `${width}px`;
+    control.popover.style.left = `${left}px`;
+    control.popover.style.right = "auto";
+    control.popover.style.top = "auto";
+    control.popover.style.bottom = `${Math.max(12, window.innerHeight - triggerRect.top + 8)}px`;
+  }
+  function closePopover2(control) {
+    if (popoverIsOpen2(control.popover) && typeof control.popover.hidePopover === "function") {
+      control.popover.hidePopover();
+    }
+    control.popover.hidden = true;
+    control.trigger.setAttribute("aria-expanded", "false");
+  }
+  function openPopover2(control) {
+    positionPopover2(control);
+    control.popover.hidden = false;
+    if (typeof control.popover.showPopover === "function" && !popoverIsOpen2(control.popover)) {
+      control.popover.showPopover();
+    }
+    control.trigger.setAttribute("aria-expanded", "true");
+  }
+  function togglePopover2(control) {
+    if (control.trigger.getAttribute("aria-expanded") === "true") closePopover2(control);
+    else openPopover2(control);
+  }
+  function mountRendererCreditsControl(composerId, nativeModelClassName) {
+    const root = document.createElement("div");
+    root.dataset.codexhostCreditsControl = composerId;
+    root.className = "relative min-w-0";
+    root.style.display = "none";
+    const trigger = document.createElement("button");
+    const syncNativeModelClassName = (className) => {
+      trigger.className = className?.trim() || RENDERER_MODEL_TRIGGER_FALLBACK_CLASSES;
+    };
+    syncNativeModelClassName(nativeModelClassName);
+    trigger.type = "button";
+    trigger.setAttribute("aria-haspopup", "dialog");
+    trigger.setAttribute("aria-expanded", "false");
+    trigger.setAttribute("aria-label", "Account limit");
+    trigger.title = "Account limit";
+    trigger.style.display = "inline-flex";
+    trigger.style.alignItems = "center";
+    trigger.style.gap = "5px";
+    trigger.style.width = "fit-content";
+    trigger.style.maxWidth = "min(72px, 18vw)";
+    trigger.style.height = "24px";
+    trigger.style.padding = "0 6px";
+    trigger.style.borderRadius = "9999px";
+    trigger.style.fontSize = "12px";
+    trigger.style.lineHeight = "16px";
+    trigger.style.fontVariantNumeric = "tabular-nums";
+    trigger.style.letterSpacing = "0";
+    trigger.style.whiteSpace = "nowrap";
+    trigger.style.cursor = "pointer";
+    const dot = document.createElement("span");
+    dot.dataset.codexhostCreditsDot = "";
+    dot.setAttribute("aria-hidden", "true");
+    dot.style.display = "inline-block";
+    dot.style.width = "7px";
+    dot.style.height = "7px";
+    dot.style.borderRadius = "9999px";
+    dot.style.flex = "0 0 auto";
+    const label = document.createElement("span");
+    label.dataset.codexhostCreditsLabel = "";
+    label.style.display = "inline-block";
+    label.style.maxWidth = "100%";
+    label.style.overflow = "hidden";
+    label.style.textOverflow = "ellipsis";
+    label.style.whiteSpace = "nowrap";
+    trigger.append(dot, label);
+    const popover = document.createElement("div");
+    popover.id = `${composerId}-credits-popover`;
+    popover.setAttribute("role", "dialog");
+    popover.setAttribute("aria-label", "Account limit details");
+    popover.setAttribute("popover", "auto");
+    popover.hidden = typeof popover.showPopover !== "function";
+    popover.style.position = "fixed";
+    popover.style.inset = "auto";
+    popover.style.width = "240px";
+    popover.style.maxWidth = "min(280px, calc(100vw - 24px))";
+    popover.style.padding = "10px 12px";
+    popover.style.border = "1px solid rgba(127, 127, 127, 0.35)";
+    popover.style.borderRadius = "6px";
+    popover.style.background = "Canvas";
+    popover.style.color = "CanvasText";
+    popover.style.boxShadow = "0 8px 24px rgba(0, 0, 0, 0.28)";
+    popover.style.font = "13px/1.35 system-ui, sans-serif";
+    popover.style.letterSpacing = "0";
+    popover.style.zIndex = "2147483647";
+    trigger.setAttribute("aria-controls", popover.id);
+    let placementReference = null;
+    const control = {
+      root,
+      trigger,
+      popover,
+      anchor: null,
+      syncNativeModelClassName,
+      dispose() {
+        closePopover2(control);
+        if (closeTimer !== null) window.clearTimeout(closeTimer);
+        root.remove();
+        popover.remove();
+        placementReference = null;
+      },
+      place(anchor) {
+        if (!anchor?.parentElement) return false;
+        const parent = anchor.parentElement;
+        const next = anchor.nextElementSibling;
+        if (control.anchor === anchor && placementReference === anchor && root.parentElement === parent && root.previousElementSibling === anchor) {
+          return true;
+        }
+        control.anchor = anchor;
+        placementReference = anchor;
+        if (next && next !== root) parent.insertBefore(root, next);
+        else if (next !== root) parent.append(root);
+        return true;
+      }
+    };
+    let closeTimer = null;
+    const cancelClose = () => {
+      if (closeTimer === null) return;
+      window.clearTimeout(closeTimer);
+      closeTimer = null;
+    };
+    const scheduleClose = () => {
+      cancelClose();
+      closeTimer = window.setTimeout(() => {
+        closeTimer = null;
+        if (!trigger.matches(":hover") && !popover.matches(":hover")) closePopover2(control);
+      }, 140);
+    };
+    trigger.addEventListener("click", () => togglePopover2(control));
+    trigger.addEventListener("pointerenter", () => {
+      cancelClose();
+      openPopover2(control);
+    });
+    trigger.addEventListener("pointerleave", scheduleClose);
+    trigger.addEventListener("focus", () => {
+      cancelClose();
+      openPopover2(control);
+    });
+    trigger.addEventListener("blur", scheduleClose);
+    popover.addEventListener("pointerenter", cancelClose);
+    popover.addEventListener("pointerleave", scheduleClose);
+    popover.addEventListener("toggle", () => {
+      trigger.setAttribute("aria-expanded", String(popoverIsOpen2(popover)));
+    });
+    root.append(trigger);
+    document.body.append(popover);
+    return control;
+  }
+  function renderRendererCreditsControl(control, accountCredits) {
+    if (accountCredits === null) {
+      control.root.style.display = "none";
+      closePopover2(control);
+      return false;
+    }
+    const percent = formatRendererCreditsPercent(accountCredits.usedPercent);
+    const title = `${creditsPeriodLabel(accountCredits.periodType)} ${percent}`;
+    const tone = rendererCreditsTone(accountCredits.usedPercent);
+    const dot = control.trigger.querySelector("[data-codexhost-credits-dot]");
+    const label = control.trigger.querySelector("[data-codexhost-credits-label]");
+    if (dot) dot.style.background = toneColor(tone);
+    if (label) label.textContent = percent;
+    control.root.style.display = "inline-flex";
+    control.trigger.setAttribute("aria-label", title);
+    control.trigger.title = title;
+    renderDetails2(control.popover, accountCredits);
     return true;
   }
 
@@ -16830,7 +17039,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   }
   var contextUsageDescriptionPattern = /(context|token|上下文|令牌)/iu;
   function isNativeContextUsageControlCandidate(element) {
-    if (element.hasAttribute("data-codexhost-usage-control")) return false;
+    if (element.hasAttribute("data-codexhost-usage-control") || element.hasAttribute("data-codexhost-credits-control")) {
+      return false;
+    }
     const description = [
       element.getAttribute("aria-label"),
       element.getAttribute("title"),
@@ -16863,6 +17074,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const candidate = nativeModelControlForComposer(control.composer);
     if (!candidate) {
       control.usage.syncNativeModelClassName();
+      control.credits.syncNativeModelClassName();
       return;
     }
     if (candidate !== control.nativeModelControl?.element) {
@@ -16871,6 +17083,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       syncRendererModelTriggerClass(control.modelPicker, candidate.className);
     }
     control.usage.syncNativeModelClassName(candidate.className);
+    control.credits.syncNativeModelClassName(candidate.className);
   }
   function usagePlacementAnchor(control) {
     const context = nativeContextUsageControlForComposer(control.composer);
@@ -16880,14 +17093,44 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const native = control.nativeModelControl?.element;
     return native?.parentElement ? native : null;
   }
+  function firstMaterialChild(parent) {
+    for (const child of parent.children) {
+      if (typeof child.hasAttribute !== "function") continue;
+      const element = child;
+      if (element.hasAttribute("data-codexhost-credits-control")) continue;
+      return element;
+    }
+    return null;
+  }
+  function creditsPlacementAnchor(composer, usageRoot) {
+    let current = usageRoot;
+    while (current && current !== composer) {
+      const parent = current.parentElement;
+      if (!parent) break;
+      const first = firstMaterialChild(parent);
+      if (first && first !== current && !first.contains(usageRoot)) return first;
+      if (parent === composer) break;
+      current = parent;
+    }
+    return null;
+  }
   function refreshUsagePlacement(control) {
     const anchor = usagePlacementAnchor(control);
     if (!anchor) {
       if (control.usage.anchor) control.usage.root.remove();
       control.usage.anchor = null;
+      if (control.credits.anchor) control.credits.root.remove();
+      control.credits.anchor = null;
       return;
     }
     control.usage.place(anchor);
+    const leading = creditsPlacementAnchor(control.composer, control.usage.root);
+    if (!leading) {
+      if (control.credits.anchor) control.credits.root.remove();
+      control.credits.anchor = null;
+      return;
+    }
+    control.credits.place(leading);
   }
   function refreshNativePermissionModeControl(control) {
     const semanticCandidate = semanticNativePermissionModeControlForComposer(control.composer);
@@ -16942,6 +17185,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       onSelectPermissionMode
     );
     const usage = mountRendererUsageControl(composerId, nativeModelControl?.element.className);
+    const credits = mountRendererCreditsControl(composerId, nativeModelControl?.element.className);
     const permissionParent = nativePermissionModeControl?.element.parentElement;
     if (permissionParent && nativePermissionModeControl && nativePermissionModeControlVerified) {
       permissionParent.insertBefore(permissionModePicker.root, nativePermissionModeControl.element);
@@ -16964,6 +17208,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       nativeModelControl,
       nativePermissionModeControl,
       nativePermissionModeControlVerified,
+      credits,
       usage,
       sendButton,
       sendDisabledBeforeSwitch: null
@@ -17008,7 +17253,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       permissionModeView,
       permissionModeVisible
     );
-    renderRendererUsageControl(control.usage, usage, accountCredits);
+    renderRendererUsageControl(control.usage, usage);
+    renderRendererCreditsControl(control.credits, accountCredits);
   }
   function disposeComposerAgentControl(control) {
     if (control.sendDisabledBeforeSwitch !== null) {
@@ -17016,6 +17262,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     }
     restoreNativeControl(control.nativeModelControl);
     restoreNativeControl(control.nativePermissionModeControl);
+    control.credits.dispose();
     control.usage.dispose();
     control.permissionModePicker.dispose();
     control.modelPicker.dispose();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexhost/cli-darwin-x64",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.",
   "type": "module",
   "files": [