@bitkyc08/opencodex 2.67.0-preview.20260926 → 2.68.0-preview.20260927

package/src/update/worker-launch.ts

@@ -0,0 +1,46 @@
+import { spawnSync } from "node:child_process";
+
+/**
+ * How to launch the dashboard update worker on POSIX.
+ *
+ * A worker spawned from the systemd user service stays in that service's cgroup even when
+ * detached, and the generated unit keeps the default `KillMode=control-group`. The updater then
+ * stops `opencodex-proxy.service` and systemd kills the worker with it, leaving the proxy offline
+ * on the old package (#5750). `systemd-run --user --scope` moves the worker into its own
+ * transient scope first; `--scope` execs the command in place, so the returned PID is still the
+ * worker's. Outside a systemd-started process (`INVOCATION_ID` unset), or when `systemd-run` is
+ * missing, the plain detached spawn is unchanged.
+ */
+export const SYSTEMD_SCOPE_ARGS = ["--user", "--scope", "--quiet", "--collect", "--"] as const;
+
+export interface WorkerLaunchContext {
+  platform?: NodeJS.Platform;
+  env?: NodeJS.ProcessEnv;
+  hasSystemdRun?: () => boolean;
+}
+
+let systemdRunProbe: boolean | undefined;
+
+function probeSystemdRun(): boolean {
+  if (systemdRunProbe === undefined) {
+    // Run a real no-op scope rather than `--version`: a present binary without a reachable user
+    // bus would otherwise pass the probe and then fail to start the worker at all.
+    const probe = spawnSync("systemd-run", [...SYSTEMD_SCOPE_ARGS, "true"], { stdio: "ignore", timeout: 5_000 });
+    systemdRunProbe = !probe.error && probe.status === 0;
+  }
+  return systemdRunProbe;
+}
+
+export function guiUpdateWorkerCommand(
+  execPath: string,
+  args: readonly string[],
+  context: WorkerLaunchContext = {},
+): { command: string; argv: string[] } {
+  const platform = context.platform ?? process.platform;
+  const env = context.env ?? process.env;
+  const underSystemd = platform === "linux" && Boolean(env.INVOCATION_ID);
+  if (underSystemd && (context.hasSystemdRun ?? probeSystemdRun)()) {
+    return { command: "systemd-run", argv: [...SYSTEMD_SCOPE_ARGS, execPath, ...args] };
+  }
+  return { command: execPath, argv: [...args] };
+}

package/src/usage/log.ts

@@ -579,6 +579,7 @@ function normalizeUsageValue(usage: OcxUsage | undefined): OcxUsage | undefined
     ...(typeof usage.cacheReadInputTokens === "number" ? { cacheReadInputTokens: usage.cacheReadInputTokens } : {}),
     ...(typeof usage.cacheCreationInputTokens === "number" ? { cacheCreationInputTokens: usage.cacheCreationInputTokens } : {}),
     ...(typeof usage.reasoningOutputTokens === "number" ? { reasoningOutputTokens: usage.reasoningOutputTokens } : {}),
+    ...(isNonNegativeFiniteNumber(usage.providerCredits) ? { providerCredits: usage.providerCredits } : {}),
     ...(usage.estimated ? { estimated: true } : {}),
   };
 }
@@ -622,6 +623,7 @@ function normalizeAttemptUsage(raw: unknown): OcxUsage | null {
     "cacheReadInputTokens",
     "cacheCreationInputTokens",
     "reasoningOutputTokens",
+    "providerCredits",
   ] as const) {
     if (key in usage && !isNonNegativeFiniteNumber(usage[key])) return null;
   }

package/src/web-search/loop.ts

@@ -346,6 +346,7 @@ export interface WebSearchLoopDeps {
     retryAfterHeader: string | null,
     responseHeaders?: Headers,
     retryParsed?: OcxParsedRequest,
+    originalResponse?: Response,
   ) =>
     | { adapter: ProviderAdapter; recoveryKind: AttemptRecoveryKind }
     | null
@@ -569,8 +570,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
       }
       // 429 key-failover parity with the normal routed path: rotate pool keys until one responds
       // or the pool is exhausted (deps.on429 returns null — cooldown map guarantees termination).
-      while (prepared.response.status === 429 && deps.on429) {
-        const rotated = await deps.on429(prepared.response.headers.get("retry-after"), prepared.response.headers, iterParsed);
+      while ((prepared.response.status === 429
+        || (iterParsed._kiroAuthContext && (prepared.response.status === 400 || prepared.response.status === 403))) && deps.on429) {
+        const rotated = await deps.on429(prepared.response.headers.get("retry-after"), prepared.response.headers,
+          iterParsed, prepared.response);
         if (!rotated) break;
         // Never let a broken body's cancel promise outlive the cumulative header deadline. Observe
         // it, but proceed immediately to the rotated fetch under the SAME deadline signal.