@covro/covro 0.6.1-dev.2 → 0.6.1-dev.4

package/dist/cli/service.js

@@ -7,8 +7,8 @@ import { stopAndWait } from "./control.js";
 import { saveJson } from "../updates/files.js";
 import { ensureConfig, packageRoot } from "./paths.js";
 import { macOSLoginService } from "./background.js";
+import { launchRuntime, systemdQuote as unit } from "./runtime-launch.js";
 const exec = promisify(execFile);
-const unit = (value) => `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%")}"`;
 async function service(location, install) {
   if (!["darwin", "linux"].includes(process.platform))
     throw new Error(
@@ -29,15 +29,18 @@ async function service(location, install) {
   const filename = join(directory, `${label}.service`);
   if (install) {
     await mkdir(directory, { recursive: true });
-    if (/[\r\n]/.test([entry, location.config, location.home, process.env.PATH].join("")))
+    const runtime = await launchRuntime(location, entry);
+    if (/[\r\n]/.test(
+      [runtime.node, runtime.entry, location.config, location.home, runtime.path].join("")
+    ))
       throw new Error("\u670D\u52A1\u8DEF\u5F84\u548C PATH \u4E0D\u80FD\u5305\u542B\u6362\u884C");
     await writeFile(
       filename,
       `[Unit]
 Description=Covro
 [Service]
-ExecStart=${[process.execPath, entry, "run", "--config", location.config].map(unit).join(" ")}
-Environment=${unit(`COVRO_HOME=${location.home}`)} ${unit(`PATH=${process.env.PATH ?? "/usr/bin:/bin"}`)}
+ExecStart=${[runtime.node, runtime.entry, "run", "--config", location.config].map(unit).join(" ")}
+Environment=${unit(`COVRO_HOME=${location.home}`)} ${unit(`PATH=${runtime.path}`)}
 Restart=on-failure
 RestartSec=30
 [Install]

package/dist/cli/service.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/service.ts"],
-  "sourcesContent": ["import { execFile } from 'node:child_process';\nimport { promisify } from 'node:util';\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\nimport { mkdir, rm, writeFile } from 'node:fs/promises';\nimport { stopAndWait } from './control.js';\nimport { saveJson } from '../updates/files.js';\nimport { ensureConfig, packageRoot, type CovroPaths } from './paths.js';\nimport { macOSLoginService } from './background.js';\n\nconst exec = promisify(execFile);\nconst unit = (value: string) =>\n  `\"${value.replaceAll('\\\\', '\\\\\\\\').replaceAll('\"', '\\\\\"').replaceAll('%', '%%')}\"`;\n\nexport async function service(location: CovroPaths, install: boolean) {\n  if (!['darwin', 'linux'].includes(process.platform))\n    throw new Error(\n      '\u767B\u5F55\u81EA\u542F\u76EE\u524D\u652F\u6301 macOS launchd \u548C Linux systemd --user\uFF1B\u53EF\u4F7F\u7528 covro start \u540E\u53F0\u8FD0\u884C\u3002',\n    );\n  const label = `dev.covro.${location.key}`;\n  const entry = join(packageRoot, 'bin/covro.mjs');\n  if (process.platform === 'darwin') {\n    if (install) await ensureConfig(location);\n    await macOSLoginService(location, entry, install);\n    return;\n  }\n  if (install) {\n    await stopAndWait(location);\n    await mkdir(location.state, { recursive: true, mode: 0o700 });\n  }\n  const directory = join(homedir(), '.config/systemd/user');\n  const filename = join(directory, `${label}.service`);\n  if (install) {\n    await mkdir(directory, { recursive: true });\n    if (/[\\r\\n]/.test([entry, location.config, location.home, process.env.PATH].join('')))\n      throw new Error('\u670D\u52A1\u8DEF\u5F84\u548C PATH \u4E0D\u80FD\u5305\u542B\u6362\u884C');\n    await writeFile(\n      filename,\n      `[Unit]\\nDescription=Covro\\n[Service]\\nExecStart=${[process.execPath, entry, 'run', '--config', location.config].map(unit).join(' ')}\\nEnvironment=${unit(`COVRO_HOME=${location.home}`)} ${unit(`PATH=${process.env.PATH ?? '/usr/bin:/bin'}`)}\\nRestart=on-failure\\nRestartSec=30\\n[Install]\\nWantedBy=default.target\\n`,\n      { mode: 0o600 },\n    );\n    await exec('systemctl', ['--user', 'daemon-reload']);\n    await exec('systemctl', ['--user', 'enable', '--now', `${label}.service`]);\n    await saveJson(join(location.state, 'service.json'), { platform: 'linux', label });\n  } else {\n    await exec('systemctl', ['--user', 'disable', '--now', `${label}.service`]);\n    await rm(filename);\n    await rm(join(location.state, 'service.json'), { force: true });\n    await exec('systemctl', ['--user', 'daemon-reload']);\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,eAAe;AACxB,SAAS,YAAY;AACrB,SAAS,OAAO,IAAI,iBAAiB;AACrC,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AACzB,SAAS,cAAc,mBAAoC;AAC3D,SAAS,yBAAyB;AAElC,MAAM,OAAO,UAAU,QAAQ;AAC/B,MAAM,OAAO,CAAC,UACZ,IAAI,MAAM,WAAW,MAAM,MAAM,EAAE,WAAW,KAAK,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;AAEjF,eAAsB,QAAQ,UAAsB,SAAkB;AACpE,MAAI,CAAC,CAAC,UAAU,OAAO,EAAE,SAAS,QAAQ,QAAQ;AAChD,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AACF,QAAM,QAAQ,aAAa,SAAS,GAAG;AACvC,QAAM,QAAQ,KAAK,aAAa,eAAe;AAC/C,MAAI,QAAQ,aAAa,UAAU;AACjC,QAAI,QAAS,OAAM,aAAa,QAAQ;AACxC,UAAM,kBAAkB,UAAU,OAAO,OAAO;AAChD;AAAA,EACF;AACA,MAAI,SAAS;AACX,UAAM,YAAY,QAAQ;AAC1B,UAAM,MAAM,SAAS,OAAO,EAAE,WAAW,MAAM,MAAM,IAAM,CAAC;AAAA,EAC9D;AACA,QAAM,YAAY,KAAK,QAAQ,GAAG,sBAAsB;AACxD,QAAM,WAAW,KAAK,WAAW,GAAG,KAAK,UAAU;AACnD,MAAI,SAAS;AACX,UAAM,MAAM,WAAW,EAAE,WAAW,KAAK,CAAC;AAC1C,QAAI,SAAS,KAAK,CAAC,OAAO,SAAS,QAAQ,SAAS,MAAM,QAAQ,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;AAClF,YAAM,IAAI,MAAM,0EAAmB;AACrC,UAAM;AAAA,MACJ;AAAA,MACA;AAAA;AAAA;AAAA,YAAmD,CAAC,QAAQ,UAAU,OAAO,OAAO,YAAY,SAAS,MAAM,EAAE,IAAI,IAAI,EAAE,KAAK,GAAG,CAAC;AAAA,cAAiB,KAAK,cAAc,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,QAAQ,QAAQ,IAAI,QAAQ,eAAe,EAAE,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAC/O,EAAE,MAAM,IAAM;AAAA,IAChB;AACA,UAAM,KAAK,aAAa,CAAC,UAAU,eAAe,CAAC;AACnD,UAAM,KAAK,aAAa,CAAC,UAAU,UAAU,SAAS,GAAG,KAAK,UAAU,CAAC;AACzE,UAAM,SAAS,KAAK,SAAS,OAAO,cAAc,GAAG,EAAE,UAAU,SAAS,MAAM,CAAC;AAAA,EACnF,OAAO;AACL,UAAM,KAAK,aAAa,CAAC,UAAU,WAAW,SAAS,GAAG,KAAK,UAAU,CAAC;AAC1E,UAAM,GAAG,QAAQ;AACjB,UAAM,GAAG,KAAK,SAAS,OAAO,cAAc,GAAG,EAAE,OAAO,KAAK,CAAC;AAC9D,UAAM,KAAK,aAAa,CAAC,UAAU,eAAe,CAAC;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { execFile } from 'node:child_process';\nimport { promisify } from 'node:util';\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\nimport { mkdir, rm, writeFile } from 'node:fs/promises';\nimport { stopAndWait } from './control.js';\nimport { saveJson } from '../updates/files.js';\nimport { ensureConfig, packageRoot, type CovroPaths } from './paths.js';\nimport { macOSLoginService } from './background.js';\nimport { launchRuntime, systemdQuote as unit } from './runtime-launch.js';\n\nconst exec = promisify(execFile);\n\nexport async function service(location: CovroPaths, install: boolean) {\n  if (!['darwin', 'linux'].includes(process.platform))\n    throw new Error(\n      '\u767B\u5F55\u81EA\u542F\u76EE\u524D\u652F\u6301 macOS launchd \u548C Linux systemd --user\uFF1B\u53EF\u4F7F\u7528 covro start \u540E\u53F0\u8FD0\u884C\u3002',\n    );\n  const label = `dev.covro.${location.key}`;\n  const entry = join(packageRoot, 'bin/covro.mjs');\n  if (process.platform === 'darwin') {\n    if (install) await ensureConfig(location);\n    await macOSLoginService(location, entry, install);\n    return;\n  }\n  if (install) {\n    await stopAndWait(location);\n    await mkdir(location.state, { recursive: true, mode: 0o700 });\n  }\n  const directory = join(homedir(), '.config/systemd/user');\n  const filename = join(directory, `${label}.service`);\n  if (install) {\n    await mkdir(directory, { recursive: true });\n    const runtime = await launchRuntime(location, entry);\n    if (\n      /[\\r\\n]/.test(\n        [runtime.node, runtime.entry, location.config, location.home, runtime.path].join(''),\n      )\n    )\n      throw new Error('\u670D\u52A1\u8DEF\u5F84\u548C PATH \u4E0D\u80FD\u5305\u542B\u6362\u884C');\n    await writeFile(\n      filename,\n      `[Unit]\\nDescription=Covro\\n[Service]\\nExecStart=${[runtime.node, runtime.entry, 'run', '--config', location.config].map(unit).join(' ')}\\nEnvironment=${unit(`COVRO_HOME=${location.home}`)} ${unit(`PATH=${runtime.path}`)}\\nRestart=on-failure\\nRestartSec=30\\n[Install]\\nWantedBy=default.target\\n`,\n      { mode: 0o600 },\n    );\n    await exec('systemctl', ['--user', 'daemon-reload']);\n    await exec('systemctl', ['--user', 'enable', '--now', `${label}.service`]);\n    await saveJson(join(location.state, 'service.json'), { platform: 'linux', label });\n  } else {\n    await exec('systemctl', ['--user', 'disable', '--now', `${label}.service`]);\n    await rm(filename);\n    await rm(join(location.state, 'service.json'), { force: true });\n    await exec('systemctl', ['--user', 'daemon-reload']);\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,eAAe;AACxB,SAAS,YAAY;AACrB,SAAS,OAAO,IAAI,iBAAiB;AACrC,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AACzB,SAAS,cAAc,mBAAoC;AAC3D,SAAS,yBAAyB;AAClC,SAAS,eAAe,gBAAgB,YAAY;AAEpD,MAAM,OAAO,UAAU,QAAQ;AAE/B,eAAsB,QAAQ,UAAsB,SAAkB;AACpE,MAAI,CAAC,CAAC,UAAU,OAAO,EAAE,SAAS,QAAQ,QAAQ;AAChD,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AACF,QAAM,QAAQ,aAAa,SAAS,GAAG;AACvC,QAAM,QAAQ,KAAK,aAAa,eAAe;AAC/C,MAAI,QAAQ,aAAa,UAAU;AACjC,QAAI,QAAS,OAAM,aAAa,QAAQ;AACxC,UAAM,kBAAkB,UAAU,OAAO,OAAO;AAChD;AAAA,EACF;AACA,MAAI,SAAS;AACX,UAAM,YAAY,QAAQ;AAC1B,UAAM,MAAM,SAAS,OAAO,EAAE,WAAW,MAAM,MAAM,IAAM,CAAC;AAAA,EAC9D;AACA,QAAM,YAAY,KAAK,QAAQ,GAAG,sBAAsB;AACxD,QAAM,WAAW,KAAK,WAAW,GAAG,KAAK,UAAU;AACnD,MAAI,SAAS;AACX,UAAM,MAAM,WAAW,EAAE,WAAW,KAAK,CAAC;AAC1C,UAAM,UAAU,MAAM,cAAc,UAAU,KAAK;AACnD,QACE,SAAS;AAAA,MACP,CAAC,QAAQ,MAAM,QAAQ,OAAO,SAAS,QAAQ,SAAS,MAAM,QAAQ,IAAI,EAAE,KAAK,EAAE;AAAA,IACrF;AAEA,YAAM,IAAI,MAAM,0EAAmB;AACrC,UAAM;AAAA,MACJ;AAAA,MACA;AAAA;AAAA;AAAA,YAAmD,CAAC,QAAQ,MAAM,QAAQ,OAAO,OAAO,YAAY,SAAS,MAAM,EAAE,IAAI,IAAI,EAAE,KAAK,GAAG,CAAC;AAAA,cAAiB,KAAK,cAAc,SAAS,IAAI,EAAE,CAAC,IAAI,KAAK,QAAQ,QAAQ,IAAI,EAAE,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAC5N,EAAE,MAAM,IAAM;AAAA,IAChB;AACA,UAAM,KAAK,aAAa,CAAC,UAAU,eAAe,CAAC;AACnD,UAAM,KAAK,aAAa,CAAC,UAAU,UAAU,SAAS,GAAG,KAAK,UAAU,CAAC;AACzE,UAAM,SAAS,KAAK,SAAS,OAAO,cAAc,GAAG,EAAE,UAAU,SAAS,MAAM,CAAC;AAAA,EACnF,OAAO;AACL,UAAM,KAAK,aAAa,CAAC,UAAU,WAAW,SAAS,GAAG,KAAK,UAAU,CAAC;AAC1E,UAAM,GAAG,QAAQ;AACjB,UAAM,GAAG,KAAK,SAAS,OAAO,cAAc,GAAG,EAAE,OAAO,KAAK,CAAC;AAC9D,UAAM,KAAK,aAAa,CAAC,UAAU,eAAe,CAAC;AAAA,EACrD;AACF;",
   "names": []
 }

package/dist/codex/account-usage.js

@@ -0,0 +1,132 @@
+import { randomUUID } from "node:crypto";
+import { z } from "zod";
+import { CodexError, isRecord } from "./transport.js";
+const nullable = (value) => value.nullish().transform((v) => v ?? null);
+const text = nullable(z.string());
+const number = nullable(z.number().finite());
+const boolean = nullable(z.boolean());
+const timestamp = nullable(z.number().finite().min(0).max(864e10));
+const window = nullable(
+  z.object({
+    usedPercent: number,
+    windowDurationMins: nullable(z.number().finite().nonnegative()),
+    resetsAt: timestamp
+  })
+);
+const group = z.object({
+  limitId: text,
+  limitName: text,
+  normalModelSlug: text,
+  planType: text,
+  primary: window,
+  secondary: window,
+  credits: nullable(z.object({ hasCredits: boolean, unlimited: boolean, balance: text })),
+  individualLimit: nullable(
+    z.object({
+      limit: text,
+      used: text,
+      remainingPercent: number,
+      resetsAt: timestamp
+    })
+  ),
+  spendControlReached: boolean,
+  rateLimitReachedType: text
+});
+const response = z.object({
+  rateLimits: nullable(group),
+  rateLimitsByLimitId: nullable(z.record(z.string(), group)),
+  ordinaryUsageAllowed: boolean,
+  rateLimitResetCredits: nullable(
+    z.object({ availableCount: nullable(z.number().int().nonnegative()) })
+  )
+});
+function accountUsageValues(input) {
+  const value = response.parse(input);
+  const groups = Object.entries(value.rateLimitsByLimitId ?? {}).map(
+    ([id, entry]) => ({ ...entry, limitId: entry.limitId ?? id })
+  );
+  if (value.rateLimits && (!groups.length || value.rateLimits.limitId !== null && !groups.some((entry) => entry.limitId === value.rateLimits?.limitId))) {
+    groups.unshift(value.rateLimits);
+  }
+  return {
+    groups,
+    ordinaryUsageAllowed: value.ordinaryUsageAllowed,
+    resetCreditsAvailable: value.rateLimitResetCredits?.availableCount ?? null
+  };
+}
+class AccountUsageReader {
+  constructor(source) {
+    this.source = source;
+  }
+  source;
+  sequence = 0;
+  identity;
+  value = this.empty("offline");
+  snapshot() {
+    return structuredClone(this.value);
+  }
+  empty(status) {
+    return {
+      scope: randomUUID(),
+      status,
+      refreshing: false,
+      updatedAt: null,
+      groups: [],
+      ordinaryUsageAllowed: null,
+      resetCreditsAvailable: null
+    };
+  }
+  invalidate(status) {
+    this.sequence++;
+    this.identity = void 0;
+    this.value = this.empty(status);
+    this.source.changed();
+  }
+  async refresh() {
+    const sequence = ++this.sequence;
+    this.value = { ...this.value, refreshing: true };
+    this.source.changed();
+    try {
+      const result = await this.source.account();
+      if (sequence !== this.sequence) return this.snapshot();
+      if (!isRecord(result) || !Object.hasOwn(result, "account") || typeof result.requiresOpenaiAuth !== "boolean")
+        throw new Error("Invalid account response");
+      const identity = JSON.stringify(result.account);
+      if (this.identity !== void 0 && identity !== this.identity) {
+        this.value = this.empty("loading");
+        this.source.changed();
+      }
+      this.identity = identity;
+      this.source.authenticated(result.account !== null || !result.requiresOpenaiAuth);
+      if (!result.account) {
+        this.value = {
+          ...this.empty(result.requiresOpenaiAuth ? "signedOut" : "unsupported"),
+          scope: this.value.scope
+        };
+      } else if (result.account.type !== "chatgpt") {
+        this.value = { ...this.empty("unsupported"), scope: this.value.scope };
+      } else {
+        const values = accountUsageValues(await this.source.limits());
+        if (sequence !== this.sequence) return this.snapshot();
+        this.value = {
+          ...this.value,
+          ...values,
+          status: "ready",
+          refreshing: false,
+          updatedAt: Date.now()
+        };
+      }
+    } catch (error) {
+      if (sequence !== this.sequence) return this.snapshot();
+      const unsupported = error instanceof CodexError && (error.rpcCode === -32601 || error.code === "PROTOCOL_INCOMPATIBLE");
+      this.value = unsupported ? { ...this.empty("unsupported"), scope: this.value.scope } : { ...this.value, status: "error", refreshing: false };
+    }
+    if (sequence === this.sequence) this.source.changed();
+    return this.snapshot();
+  }
+}
+export {
+  AccountUsageReader,
+  accountUsageValues
+};
+//# sourceMappingURL=account-usage.js.map

package/dist/codex/account-usage.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/codex/account-usage.ts"],
+  "sourcesContent": ["import { randomUUID } from 'node:crypto';\nimport { z } from 'zod';\nimport type { GetAccountResponse } from './generated/v2/GetAccountResponse.js';\nimport type { AccountUsage, UsageGroup } from '../shared/account-usage.js';\nimport { CodexError, isRecord } from './transport.js';\n\nconst nullable = <T extends z.ZodType>(value: T) => value.nullish().transform((v) => v ?? null);\nconst text = nullable(z.string());\nconst number = nullable(z.number().finite());\nconst boolean = nullable(z.boolean());\nconst timestamp = nullable(z.number().finite().min(0).max(8.64e12));\nconst window = nullable(\n  z.object({\n    usedPercent: number,\n    windowDurationMins: nullable(z.number().finite().nonnegative()),\n    resetsAt: timestamp,\n  }),\n);\nconst group = z.object({\n  limitId: text,\n  limitName: text,\n  normalModelSlug: text,\n  planType: text,\n  primary: window,\n  secondary: window,\n  credits: nullable(z.object({ hasCredits: boolean, unlimited: boolean, balance: text })),\n  individualLimit: nullable(\n    z.object({\n      limit: text,\n      used: text,\n      remainingPercent: number,\n      resetsAt: timestamp,\n    }),\n  ),\n  spendControlReached: boolean,\n  rateLimitReachedType: text,\n});\nconst response = z.object({\n  rateLimits: nullable(group),\n  rateLimitsByLimitId: nullable(z.record(z.string(), group)),\n  ordinaryUsageAllowed: boolean,\n  rateLimitResetCredits: nullable(\n    z.object({ availableCount: nullable(z.number().int().nonnegative()) }),\n  ),\n});\n\nexport function accountUsageValues(input: unknown) {\n  const value = response.parse(input);\n  const groups: UsageGroup[] = Object.entries(value.rateLimitsByLimitId ?? {}).map(\n    ([id, entry]) => ({ ...entry, limitId: entry.limitId ?? id }),\n  );\n  // The legacy bucket mirrors a map entry. Keep it only when it adds a distinct bucket.\n  if (\n    value.rateLimits &&\n    (!groups.length ||\n      (value.rateLimits.limitId !== null &&\n        !groups.some((entry) => entry.limitId === value.rateLimits?.limitId)))\n  ) {\n    groups.unshift(value.rateLimits);\n  }\n  return {\n    groups,\n    ordinaryUsageAllowed: value.ordinaryUsageAllowed,\n    resetCreditsAvailable: value.rateLimitResetCredits?.availableCount ?? null,\n  };\n}\n\n/** Owns freshness and identity boundaries. Sparse notifications trigger a full read. */\nexport class AccountUsageReader {\n  private sequence = 0;\n  private identity?: string;\n  private value: AccountUsage = this.empty('offline');\n  constructor(\n    private readonly source: {\n      account: () => Promise<GetAccountResponse>;\n      limits: () => Promise<unknown>;\n      changed: () => void;\n      authenticated: (value: boolean) => void;\n    },\n  ) {}\n\n  snapshot(): AccountUsage {\n    return structuredClone(this.value);\n  }\n\n  private empty(status: AccountUsage['status']): AccountUsage {\n    return {\n      scope: randomUUID(),\n      status,\n      refreshing: false,\n      updatedAt: null,\n      groups: [],\n      ordinaryUsageAllowed: null,\n      resetCreditsAvailable: null,\n    };\n  }\n\n  invalidate(status: 'offline' | 'loading'): void {\n    this.sequence++;\n    this.identity = undefined;\n    this.value = this.empty(status);\n    this.source.changed();\n  }\n\n  async refresh(): Promise<AccountUsage> {\n    const sequence = ++this.sequence;\n    this.value = { ...this.value, refreshing: true };\n    this.source.changed();\n    try {\n      const result = await this.source.account();\n      if (sequence !== this.sequence) return this.snapshot();\n      if (\n        !isRecord(result) ||\n        !Object.hasOwn(result, 'account') ||\n        typeof result.requiresOpenaiAuth !== 'boolean'\n      )\n        throw new Error('Invalid account response');\n      const identity = JSON.stringify(result.account);\n      if (this.identity !== undefined && identity !== this.identity) {\n        this.value = this.empty('loading');\n        this.source.changed();\n      }\n      this.identity = identity;\n      this.source.authenticated(result.account !== null || !result.requiresOpenaiAuth);\n      if (!result.account) {\n        this.value = {\n          ...this.empty(result.requiresOpenaiAuth ? 'signedOut' : 'unsupported'),\n          scope: this.value.scope,\n        };\n      } else if (result.account.type !== 'chatgpt') {\n        this.value = { ...this.empty('unsupported'), scope: this.value.scope };\n      } else {\n        const values = accountUsageValues(await this.source.limits());\n        if (sequence !== this.sequence) return this.snapshot();\n        this.value = {\n          ...this.value,\n          ...values,\n          status: 'ready',\n          refreshing: false,\n          updatedAt: Date.now(),\n        };\n      }\n    } catch (error) {\n      if (sequence !== this.sequence) return this.snapshot();\n      const unsupported =\n        error instanceof CodexError &&\n        (error.rpcCode === -32601 || error.code === 'PROTOCOL_INCOMPATIBLE');\n      this.value = unsupported\n        ? { ...this.empty('unsupported'), scope: this.value.scope }\n        : { ...this.value, status: 'error', refreshing: false };\n    }\n    if (sequence === this.sequence) this.source.changed();\n    return this.snapshot();\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/codex/adapter.js

@@ -1,4 +1,5 @@
 import { CODEX_COMPATIBILITY } from "./compatibility.js";
+import { AccountUsageReader } from "./account-usage.js";
 import { SHELL_TIMEOUT_MS, SHELL_OUTPUT_BYTES } from "../shared/shell.js";
 import { spawn, execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -71,7 +72,8 @@ const CAPABILITIES = [
   "config/batchWrite",
   "configRequirements/read",
   "experimentalFeature/list",
-  "account/read"
+  "account/read",
+  "account/rateLimits/read"
 ];
 function permissionPathLabel(path) {
   if (path.type === "path") return path.path;
@@ -98,6 +100,21 @@ class CodexAdapter {
     this.options = options;
   }
   options;
+  accountUsage = new AccountUsageReader({
+    account: () => this.call("account/read", { refreshToken: false }),
+    limits: () => this.call("account/rateLimits/read", { excludeResetCreditDetails: true }),
+    changed: () => this.publishRuntime(),
+    authenticated: (value) => {
+      this.state.authenticated = value;
+    }
+  });
+  async refreshAccountUsage() {
+    if (!this.ready) {
+      this.accountUsage.invalidate("offline");
+      return this.accountUsage.snapshot();
+    }
+    return this.accountUsage.refresh();
+  }
   commandOutputs = /* @__PURE__ */ new Map();
   epoch = randomUUID();
   child;
@@ -137,7 +154,7 @@ class CodexAdapter {
     return this.state.ready;
   }
   diagnostics() {
-    return structuredClone(this.state);
+    return { ...structuredClone(this.state), accountUsage: this.accountUsage.snapshot() };
   }
   onEvent(listener) {
     this.listeners.add(listener);
@@ -172,6 +189,7 @@ class CodexAdapter {
       error: void 0,
       capabilities: []
     };
+    this.accountUsage.invalidate("loading");
     this.publishRuntime();
     try {
       const env = {
@@ -235,6 +253,7 @@ class CodexAdapter {
         this.tokenUsage.clear();
         this.denials.clear();
         this.state.connection = "unavailable";
+        this.accountUsage.invalidate("offline");
         this.state.error = error.message;
         this.expireActions();
         this.publishRuntime();
@@ -319,6 +338,7 @@ class CodexAdapter {
       this.state.connection = "ready";
       this.state.capabilities = CAPABILITIES.filter((method) => !this.disabled.has(method));
       this.publishRuntime();
+      void this.refreshAccountUsage();
     } catch (error) {
       const failure = asCodexError(error);
       this.state.ready = false;
@@ -332,6 +352,7 @@ class CodexAdapter {
   }
   async stop() {
     this.stopped = true;
+    this.accountUsage.invalidate("offline");
     clearTimeout(this.restartTimer);
     this.restartTimer = void 0;
     await this.starting?.catch(() => {
@@ -959,6 +980,14 @@ class CodexAdapter {
     const event = message;
     const p = event.params;
     switch (event.method) {
+      case "account/updated":
+        this.state.authenticated = null;
+        this.accountUsage.invalidate("loading");
+        if (this.ready) void this.refreshAccountUsage();
+        break;
+      case "account/rateLimits/updated":
+        if (this.ready) void this.refreshAccountUsage();
+        break;
       case "command/exec/outputDelta": {
         const { processId, stream, deltaBase64, capReached } = event.params;
         this.commandOutputs.get(processId)?.(