copilot-hub 0.1.13 → 0.1.16

package/packages/core/dist/provider-factory.d.ts

@@ -1,7 +1,21 @@
 import { CodexProvider } from "./codex-provider.js";
-export declare function createAssistantProvider({ providerConfig, providerDefaults, workspaceRoot, turnActivityTimeoutMs, }: {
-    providerConfig: any;
-    providerDefaults: any;
-    workspaceRoot: any;
-    turnActivityTimeoutMs: any;
-}): CodexProvider;
+type ProviderConfig = {
+    kind?: unknown;
+    options?: unknown;
+} | null;
+type ProviderDefaults = {
+    defaultKind?: unknown;
+    codexBin?: unknown;
+    codexHomeDir?: unknown;
+    codexSandbox?: unknown;
+    codexApprovalPolicy?: unknown;
+    codexModel?: unknown;
+} | null;
+type CreateAssistantProviderParams = {
+    providerConfig?: ProviderConfig;
+    providerDefaults?: ProviderDefaults;
+    workspaceRoot: string;
+    turnActivityTimeoutMs?: number;
+};
+export declare function createAssistantProvider({ providerConfig, providerDefaults, workspaceRoot, turnActivityTimeoutMs, }: CreateAssistantProviderParams): CodexProvider;
+export {};

package/packages/core/dist/provider-factory.js

@@ -1,21 +1,33 @@
-// @ts-nocheck
 import { CodexProvider } from "./codex-provider.js";
 export function createAssistantProvider({ providerConfig, providerDefaults, workspaceRoot, turnActivityTimeoutMs, }) {
-    const defaults = providerDefaults ?? {};
-    const kind = String(providerConfig?.kind ?? defaults.defaultKind ?? "codex")
+    const defaults = asRecord(providerDefaults);
+    const provider = asRecord(providerConfig);
+    const kind = String(provider.kind ?? defaults.defaultKind ?? "codex")
         .trim()
         .toLowerCase();
-    const options = providerConfig?.options ?? {};
+    const options = asRecord(provider.options);
     if (kind === "codex") {
-        return new CodexProvider({
+        const codexProviderConfig = {
             codexBin: String(options.codexBin ?? defaults.codexBin ?? "codex"),
-            codexHomeDir: options.codexHomeDir ?? defaults.codexHomeDir ?? null,
+            codexHomeDir: normalizeOptionalString(options.codexHomeDir ?? defaults.codexHomeDir),
             sandboxMode: String(options.sandboxMode ?? defaults.codexSandbox ?? "danger-full-access"),
             approvalPolicy: String(options.approvalPolicy ?? defaults.codexApprovalPolicy ?? "never"),
+            model: normalizeOptionalString(options.model ?? defaults.codexModel),
             workspaceRoot,
-            turnActivityTimeoutMs,
-        });
+            ...(turnActivityTimeoutMs === undefined ? {} : { turnActivityTimeoutMs }),
+        };
+        return new CodexProvider(codexProviderConfig);
     }
     throw new Error(`Unknown assistant provider kind '${kind}'.`);
 }
+function asRecord(value) {
+    return value && typeof value === "object" ? value : {};
+}
+function normalizeOptionalString(value) {
+    if (value === null || value === undefined) {
+        return null;
+    }
+    const normalized = String(value).trim();
+    return normalized || null;
+}
 //# sourceMappingURL=provider-factory.js.map

package/packages/core/dist/provider-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-factory.js","sourceRoot":"","sources":["../src/provider-factory.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,UAAU,uBAAuB,CAAC,EACtC,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,qBAAqB,GACtB;IACC,MAAM,QAAQ,GAAG,gBAAgB,IAAI,EAAE,CAAC;IACxC,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,EAAE,IAAI,IAAI,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC;SACzE,IAAI,EAAE;SACN,WAAW,EAAE,CAAC;IACjB,MAAM,OAAO,GAAG,cAAc,EAAE,OAAO,IAAI,EAAE,CAAC;IAE9C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,IAAI,aAAa,CAAC;YACvB,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC;YAClE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,IAAI,IAAI;YACnE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,QAAQ,CAAC,YAAY,IAAI,oBAAoB,CAAC;YACzF,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC;YACzF,aAAa;YACb,qBAAqB;SACtB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,IAAI,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"provider-factory.js","sourceRoot":"","sources":["../src/provider-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAyBpD,MAAM,UAAU,uBAAuB,CAAC,EACtC,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,qBAAqB,GACS;IAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC;SAClE,IAAI,EAAE;SACN,WAAW,EAAE,CAAC;IACjB,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,MAAM,mBAAmB,GAAG;YAC1B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC;YAClE,YAAY,EAAE,uBAAuB,CAAC,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;YACpF,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,QAAQ,CAAC,YAAY,IAAI,oBAAoB,CAAC;YACzF,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,IAAI,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC;YACzF,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC;YACpE,aAAa;YACb,GAAG,CAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,CAAC;SAC1E,CAAC;QACF,OAAO,IAAI,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,IAAI,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,KAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,OAAO,UAAU,IAAI,IAAI,CAAC;AAC5B,CAAC"}

package/packages/core/dist/telegram-channel.d.ts

@@ -1,27 +1,114 @@
+import { Bot } from "grammy";
+type TelegramChannelConfig = {
+    kind?: unknown;
+    id?: string;
+    token?: string;
+    allowedChatIds?: string | Array<string | number>;
+};
+type ThreadState = {
+    turnCount?: number;
+    sessionId?: string;
+    updatedAt?: string;
+};
+type PendingApproval = {
+    id: string;
+    kind: string;
+    command?: string;
+    cwd?: string;
+    reason?: string;
+    threadId?: string;
+    metadata?: {
+        chatId?: string;
+    };
+};
+type ApprovalDecision = "accept" | "acceptForSession" | "decline";
+type InterruptResult = {
+    interrupted?: boolean;
+    method?: string;
+    reason?: string;
+    error?: string;
+};
+type TurnInputItem = {
+    type?: string;
+    [key: string]: unknown;
+};
+type ActiveTurn = {
+    threadId: string;
+    token: string;
+};
+type TurnControlState = {
+    token: string;
+    threadId: string;
+    messageId: number;
+};
+type RuntimeLike = {
+    runtimeId?: string;
+    runtimeName?: string;
+    resolveThreadIdForChannel: (args: {
+        channelKind: string;
+        channelId: string;
+        externalUserId: string;
+    }) => Promise<string>;
+    resetThread: (threadId: string) => Promise<unknown>;
+    getThread: (threadId: string) => Promise<{
+        thread: ThreadState;
+    }>;
+    buildWebBotUrl: () => string;
+    listPendingApprovals: (threadId: string) => Promise<PendingApproval[]>;
+    resolvePendingApproval: (args: {
+        threadId: string;
+        approvalId: string;
+        decision: ApprovalDecision;
+    }) => Promise<unknown>;
+    interruptThread: (threadId: string) => Promise<InterruptResult | null>;
+    sendTurn: (args: {
+        threadId: string;
+        prompt: string;
+        inputItems?: TurnInputItem[];
+        source?: string;
+        metadata?: Record<string, unknown>;
+    }) => Promise<{
+        assistantText?: string;
+    }>;
+    getWorkspaceRoot?: () => string;
+    getProviderUsage?: () => Promise<unknown>;
+};
 export declare class TelegramChannel {
     #private;
-    constructor({ channelConfig, runtime }: {
-        channelConfig: any;
-        runtime: any;
+    kind: "telegram";
+    id: string;
+    config: TelegramChannelConfig;
+    runtime: RuntimeLike;
+    allowedChatIds: Set<string>;
+    bot: Bot | null;
+    running: boolean;
+    error: string | null;
+    activeTurnsByChat: Map<string, ActiveTurn>;
+    turnControlByChat: Map<string, TurnControlState>;
+    nextTurnToken: number;
+    constructor({ channelConfig, runtime, }: {
+        channelConfig: TelegramChannelConfig;
+        runtime: unknown;
     });
     start(): Promise<{
-        kind: any;
-        id: any;
-        running: any;
-        error: any;
+        kind: string;
+        id: string;
+        running: boolean;
+        error: string | null;
     }>;
     stop(): Promise<{
-        kind: any;
-        id: any;
-        running: any;
-        error: any;
+        kind: string;
+        id: string;
+        running: boolean;
+        error: string | null;
     }>;
     shutdown(): Promise<void>;
     getStatus(): {
-        kind: any;
-        id: any;
-        running: any;
-        error: any;
+        kind: string;
+        id: string;
+        running: boolean;
+        error: string | null;
     };
-    notifyApproval(approval: any): Promise<void>;
+    notifyApproval(approval: PendingApproval): Promise<void>;
 }
+export {};

package/packages/core/dist/telegram-channel.js

@@ -1,13 +1,27 @@
-// @ts-nocheck
 import fs from "node:fs/promises";
+import os from "node:os";
 import path from "node:path";
 import { Bot } from "grammy";
+import { formatCodexQuotaLine, hasCodexQuotaWindows } from "./codex-quota-display.js";
+const CODEX_USAGE_CACHE_TTL_MS = 60_000;
+let cachedCodexUsage = null;
 export class TelegramChannel {
-    constructor({ channelConfig, runtime }) {
+    kind;
+    id;
+    config;
+    runtime;
+    allowedChatIds;
+    bot;
+    running;
+    error;
+    activeTurnsByChat;
+    turnControlByChat;
+    nextTurnToken;
+    constructor({ channelConfig, runtime, }) {
         this.kind = "telegram";
         this.id = String(channelConfig.id ?? "telegram");
         this.config = channelConfig;
-        this.runtime = runtime;
+        this.runtime = toRuntimeLike(runtime);
         this.allowedChatIds = normalizeAllowedChatIds(channelConfig.allowedChatIds);
         this.bot = null;
         this.running = false;
@@ -320,7 +334,7 @@ export class TelegramChannel {
             console.error(`[${this.runtime.runtimeId}:${this.id}] Telegram error in update ${error.ctx.update.update_id}: ${details}`);
         });
     }
-    async #routeIncomingPrompt({ chatId, prompt, mode = "auto_message", inputItems = null }) {
+    async #routeIncomingPrompt({ chatId, prompt, mode = "auto_message", inputItems = null, }) {
         const normalizedPrompt = String(prompt ?? "").trim();
         if (!normalizedPrompt) {
             if (this.bot) {
@@ -383,7 +397,7 @@ export class TelegramChannel {
             url: dataUrl,
         };
     }
-    async #buildVoicePrompt({ chatId, message }) {
+    async #buildVoicePrompt({ chatId, message, }) {
         const voice = message?.voice;
         if (!voice || !voice.file_id) {
             throw new Error("Telegram update does not contain voice payload.");
@@ -434,7 +448,7 @@ export class TelegramChannel {
         }
         return Buffer.from(await response.arrayBuffer());
     }
-    async #saveTelegramMediaFile({ chatId, fileId, mediaKind, preferredExtension }) {
+    async #saveTelegramMediaFile({ chatId, fileId, mediaKind, preferredExtension, }) {
         if (!this.bot) {
             throw new Error("Telegram bot is not running.");
         }
@@ -468,7 +482,7 @@ export class TelegramChannel {
         }
         return path.resolve(process.cwd());
     }
-    async #processTurn({ chatId, threadId, prompt, inputItems = null }) {
+    async #processTurn({ chatId, threadId, prompt, inputItems = null, }) {
         if (!this.bot) {
             return;
         }
@@ -477,16 +491,19 @@ export class TelegramChannel {
         let controlStatus = "Generation completed.";
         try {
             await this.bot.api.sendChatAction(chatId, "typing");
-            const result = await this.runtime.sendTurn({
+            const payload = {
                 threadId,
                 prompt,
-                inputItems: Array.isArray(inputItems) ? inputItems : undefined,
                 source: "telegram",
                 metadata: {
                     chatId,
                     channelId: this.id,
                 },
-            });
+            };
+            if (Array.isArray(inputItems)) {
+                payload.inputItems = inputItems;
+            }
+            const result = await this.runtime.sendTurn(payload);
             await sendChunkedMessage(this.bot.api, chatId, result.assistantText || "Assistant returned no text output.");
         }
         catch (error) {
@@ -509,7 +526,11 @@ export class TelegramChannel {
         }
     }
     async #handleStopTurn(context) {
-        const chatId = String(context.chat.id);
+        const chatId = getContextChatId(context);
+        if (!chatId) {
+            await context.reply("Unable to resolve chat.");
+            return;
+        }
         if (!this.#isAllowedChat(chatId)) {
             await context.reply("Chat not allowed for this bot.");
             return;
@@ -523,12 +544,16 @@ export class TelegramChannel {
         await context.reply(formatInterruptResult(result));
     }
     async #handleSteer(context) {
-        const chatId = String(context.chat.id);
+        const chatId = getContextChatId(context);
+        if (!chatId) {
+            await context.reply("Unable to resolve chat.");
+            return;
+        }
         if (!this.#isAllowedChat(chatId)) {
             await context.reply("Chat not allowed for this bot.");
             return;
         }
-        const instruction = extractCommandTail(context.message.text);
+        const instruction = extractCommandTail(getContextMessageText(context));
         const threadId = await this.runtime.resolveThreadIdForChannel({
             channelKind: this.kind,
             channelId: this.id,
@@ -621,9 +646,9 @@ export class TelegramChannel {
         const key = String(chatId);
         await this.#closeTurnControls(chatId, null, null);
         try {
-            const quotaLine = await resolveCodexQuotaLine(this.runtime);
-            const inProgressText = quotaLine
-                ? ["Generation in progress.", quotaLine].join("\n")
+            const quota = await resolveCodexQuotaLine(this.runtime);
+            const inProgressText = quota.line
+                ? ["Generation in progress.", quota.line].join("\n")
                 : "Generation in progress.";
             const sent = await this.bot.api.sendMessage(chatId, inProgressText, {
                 reply_markup: buildTurnControlKeyboard(token),
@@ -641,12 +666,12 @@ export class TelegramChannel {
     }
     #scheduleTurnControlQuotaRefresh(chatId, token, attempt) {
         const safeAttempt = Number.isFinite(attempt) ? Number(attempt) : 1;
-        if (safeAttempt > 4) {
+        if (safeAttempt > 12) {
             return;
         }
         setTimeout(() => {
             void this.#refreshTurnControlQuota(chatId, token, safeAttempt);
-        }, 1200);
+        }, 1500);
     }
     async #refreshTurnControlQuota(chatId, token, attempt) {
         if (!this.bot) {
@@ -657,12 +682,17 @@ export class TelegramChannel {
         if (!current || String(current.token) !== String(token)) {
             return;
         }
-        const quotaLine = await resolveCodexQuotaLine(this.runtime);
-        if (!quotaLine) {
+        const quota = await resolveCodexQuotaLine(this.runtime);
+        if (!quota.line) {
+            this.#scheduleTurnControlQuotaRefresh(chatId, token, Number(attempt) + 1);
+            return;
+        }
+        // Keep polling until the real quota percentages arrive (model-only line is not enough).
+        if (!quota.hasQuotaWindows) {
             this.#scheduleTurnControlQuotaRefresh(chatId, token, Number(attempt) + 1);
             return;
         }
-        const inProgressText = ["Generation in progress.", quotaLine].join("\n");
+        const inProgressText = ["Generation in progress.", quota.line].join("\n");
         try {
             await this.bot.api.editMessageText(chatId, current.messageId, inProgressText, {
                 reply_markup: buildTurnControlKeyboard(token),
@@ -706,7 +736,11 @@ export class TelegramChannel {
         }
     }
     async #handleSingleApproval(context, decision) {
-        const chatId = String(context.chat.id);
+        const chatId = getContextChatId(context);
+        if (!chatId) {
+            await context.reply("Unable to resolve chat.");
+            return;
+        }
         if (!this.#isAllowedChat(chatId)) {
             await context.reply("Chat not allowed for this bot.");
             return;
@@ -716,7 +750,7 @@ export class TelegramChannel {
             channelId: this.id,
             externalUserId: chatId,
         });
-        const requestedId = extractFirstCommandArgument(context.message.text);
+        const requestedId = extractFirstCommandArgument(getContextMessageText(context));
         if (requestedId.toLowerCase() === "all") {
             const summary = await this.#resolveAllApprovals({ threadId, decision });
             await context.reply(summary);
@@ -744,7 +778,11 @@ export class TelegramChannel {
         await context.reply(`Approved '${target.id}'.`);
     }
     async #handleBulkApproval(context, decision) {
-        const chatId = String(context.chat.id);
+        const chatId = getContextChatId(context);
+        if (!chatId) {
+            await context.reply("Unable to resolve chat.");
+            return;
+        }
         if (!this.#isAllowedChat(chatId)) {
             await context.reply("Chat not allowed for this bot.");
             return;
@@ -760,7 +798,7 @@ export class TelegramChannel {
         });
         await context.reply(summary);
     }
-    async #resolveAllApprovals({ threadId, decision }) {
+    async #resolveAllApprovals({ threadId, decision, }) {
         const approvals = await this.runtime.listPendingApprovals(threadId);
         if (approvals.length === 0) {
             return "No pending approvals.";
@@ -798,6 +836,15 @@ export class TelegramChannel {
         return set.has(String(chatId));
     }
 }
+function toRuntimeLike(runtime) {
+    return runtime;
+}
+function getContextChatId(context) {
+    return String(context.chat?.id ?? "").trim();
+}
+function getContextMessageText(context) {
+    return String(context.message?.text ?? "").trim();
+}
 async function sendChunkedMessage(botApi, chatId, text) {
     const max = 3900;
     for (let start = 0; start < text.length; start += max) {
@@ -832,7 +879,7 @@ function selectApproval(approvals, requestedId) {
         return approvals.find((approval) => approval.id === wantedId) ?? null;
     }
     if (approvals.length === 1) {
-        return approvals[0];
+        return approvals[0] ?? null;
     }
     return null;
 }
@@ -889,12 +936,12 @@ function isTurnInterruptedError(message) {
         normalized.includes("turn interrupted by user") ||
         normalized.includes("process stopped while waiting for turn completion"));
 }
-async function buildTurnFailureMessage({ runtime, safeError }) {
+async function buildTurnFailureMessage({ runtime, safeError, }) {
     if (isQuotaLimitError(safeError)) {
-        const quotaLine = await resolveCodexQuotaLine(runtime);
+        const quota = await resolveCodexQuotaLine(runtime);
         const base = "Execution paused: Codex quota limit reached for this account.";
-        if (quotaLine) {
-            return `${base}\n${quotaLine}`;
+        if (quota.line) {
+            return `${base}\n${quota.line}`;
         }
         return `${base}\nPlease retry after the quota reset window.`;
     }
@@ -1012,52 +1059,141 @@ function parseTurnControlCallbackData(raw) {
     if (!match) {
         return null;
     }
+    const action = match[1];
+    const token = match[2];
+    if (action !== "stop" || !token) {
+        return null;
+    }
     return {
-        action: match[1],
-        token: match[2],
+        action,
+        token,
     };
 }
 async function resolveCodexQuotaLine(runtime) {
     if (!runtime || typeof runtime.getProviderUsage !== "function") {
-        return "";
+        return resolveCodexQuotaLineFromSnapshot(null);
     }
     try {
         const snapshot = await runtime.getProviderUsage();
-        return formatCodexQuotaLine(snapshot);
+        const first = resolveCodexQuotaLineFromSnapshot(snapshot);
+        if (first.hasQuotaWindows) {
+            return first;
+        }
+        const fallbackSnapshot = await fetchCodexQuotaSnapshotFromAuth();
+        if (!fallbackSnapshot) {
+            return first;
+        }
+        const merged = snapshot && typeof snapshot === "object"
+            ? {
+                ...snapshot,
+                ...fallbackSnapshot,
+            }
+            : fallbackSnapshot;
+        return resolveCodexQuotaLineFromSnapshot(merged);
     }
     catch {
-        return "";
+        return resolveCodexQuotaLineFromSnapshot(null);
     }
 }
-function formatCodexQuotaLine(snapshot) {
-    const windows = [
-        formatQuotaWindow("5h", snapshot?.primary),
-        formatQuotaWindow("weekly", snapshot?.secondary),
-    ].filter(Boolean);
-    if (windows.length === 0) {
-        return "";
-    }
-    return `Codex quota: ${windows.join(" | ")}`;
+function resolveCodexQuotaLineFromSnapshot(snapshot) {
+    const typed = snapshot;
+    return {
+        line: formatCodexQuotaLine(typed),
+        hasQuotaWindows: hasCodexQuotaWindows(typed),
+    };
 }
-function formatQuotaWindow(label, windowSnapshot) {
-    const remaining = Number(windowSnapshot?.remainingPercent);
-    if (!Number.isFinite(remaining)) {
-        return "";
+async function fetchCodexQuotaSnapshotFromAuth() {
+    const now = Date.now();
+    if (cachedCodexUsage && now < cachedCodexUsage.expiresAt) {
+        return cachedCodexUsage.snapshot;
+    }
+    const auth = await readCodexAuthTokens();
+    if (!auth?.accessToken) {
+        return null;
+    }
+    const controller = new AbortController();
+    const timeout = setTimeout(() => {
+        controller.abort();
+    }, 3500);
+    try {
+        const headers = {
+            Authorization: `Bearer ${auth.accessToken}`,
+            Accept: "application/json",
+            "User-Agent": "CopilotHub",
+        };
+        if (auth.accountId) {
+            headers["ChatGPT-Account-Id"] = auth.accountId;
+        }
+        const response = await fetch("https://chatgpt.com/backend-api/wham/usage", {
+            method: "GET",
+            headers,
+            signal: controller.signal,
+        });
+        if (!response.ok) {
+            return null;
+        }
+        const payload = (await response.json());
+        const primary = normalizeWhamWindow(payload?.rate_limit?.primary_window);
+        const secondary = normalizeWhamWindow(payload?.rate_limit?.secondary_window);
+        const hasData = Number.isFinite(Number(primary?.remainingPercent)) ||
+            Number.isFinite(Number(secondary?.remainingPercent));
+        if (!hasData) {
+            return null;
+        }
+        const snapshot = { primary, secondary };
+        cachedCodexUsage = {
+            expiresAt: now + CODEX_USAGE_CACHE_TTL_MS,
+            snapshot,
+        };
+        return snapshot;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        clearTimeout(timeout);
     }
-    const resetAt = Number(windowSnapshot?.resetsAt);
-    const resetLabel = Number.isFinite(resetAt) ? `, reset ${formatEpochSeconds(resetAt)}` : "";
-    return `${label} ${Math.round(clampPercent(remaining))}%${resetLabel}`;
 }
-function formatEpochSeconds(value) {
-    const seconds = Number(value);
-    if (!Number.isFinite(seconds) || seconds <= 0) {
-        return "";
+function normalizeWhamWindow(window) {
+    const used = Number(window?.used_percent);
+    const remainingDirect = Number(window?.remaining_percent);
+    let remaining = null;
+    if (Number.isFinite(remainingDirect)) {
+        remaining = clampPercent(remainingDirect);
+    }
+    else if (Number.isFinite(used)) {
+        remaining = clampPercent(100 - used);
+    }
+    const resetSeconds = Number(window?.reset_at ?? window?.resets_at);
+    const resetsAt = Number.isFinite(resetSeconds) ? resetSeconds : null;
+    return {
+        remainingPercent: remaining,
+        resetsAt,
+    };
+}
+async function readCodexAuthTokens() {
+    const codexHome = resolveCodexHomeDir();
+    const authPath = path.join(codexHome, "auth.json");
+    try {
+        const raw = await fs.readFile(authPath, "utf8");
+        const parsed = JSON.parse(raw);
+        const accessToken = String(parsed?.tokens?.access_token ?? "").trim();
+        if (!accessToken) {
+            return null;
+        }
+        const accountId = String(parsed?.tokens?.account_id ?? "").trim() || null;
+        return { accessToken, accountId };
     }
-    const date = new Date(seconds * 1000);
-    if (!Number.isFinite(date.getTime())) {
-        return "";
+    catch {
+        return null;
+    }
+}
+function resolveCodexHomeDir() {
+    const fromEnv = String(process.env.CODEX_HOME_DIR ?? process.env.CODEX_HOME ?? "").trim();
+    if (fromEnv) {
+        return path.resolve(fromEnv);
     }
-    return date.toISOString().replace(".000Z", "Z");
+    return path.join(os.homedir(), ".codex");
 }
 function clampPercent(value) {
     const n = Number(value);