agor-live 0.22.0 → 0.23.2

package/dist/executor/sdk-handlers/codex/pricing/litellm-pricing.d.ts

@@ -0,0 +1,31 @@
+interface LiteLlmModelPricing {
+    input_cost_per_token?: number;
+    input_cost_per_token_above_272k_tokens?: number;
+    output_cost_per_token?: number;
+    output_cost_per_token_above_272k_tokens?: number;
+    cache_read_input_token_cost?: number;
+    cache_read_input_token_cost_above_272k_tokens?: number;
+}
+export declare function getLiteLlmPricingForModel(modelId: string): LiteLlmModelPricing | undefined;
+export interface CodexEstimatedCostInput {
+    modelId: string;
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens?: number;
+}
+/**
+ * Estimate Codex API-equivalent cost from token usage and LiteLLM's pricing map.
+ *
+ * This is deliberately an estimate:
+ * - Codex SDK does not provide per-turn cost.
+ * - Codex `turn.completed.usage` is cumulative across the agent loop, so it
+ *   cannot tell us whether any single model request crossed a long-context
+ *   pricing tier. Use base per-token prices until a per-request tier signal is
+ *   available.
+ * - ChatGPT subscription/native-auth Codex billing may not equal API pricing.
+ * - Service tiers, batch/flex/priority, regional uplifts, and non-token tool
+ *   charges are not inferred from `turn.completed.usage`.
+ */
+export declare function estimateCodexCostUsd(input: CodexEstimatedCostInput): number | undefined;
+export {};
+//# sourceMappingURL=litellm-pricing.d.ts.map

package/dist/executor/sdk-handlers/codex/pricing/litellm-pricing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"litellm-pricing.d.ts","sourceRoot":"","sources":["../../../../src/sdk-handlers/codex/pricing/litellm-pricing.ts"],"names":[],"mappings":"AAKA,UAAU,mBAAmB;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sCAAsC,CAAC,EAAE,MAAM,CAAC;IAChD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,6CAA6C,CAAC,EAAE,MAAM,CAAC;CACxD;AAQD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAG1F;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAsBvF"}

package/dist/executor/sdk-handlers/codex/pricing/litellm-pricing.js

@@ -0,0 +1,46 @@
+// Filtered vendored snapshot from LiteLLM's pricing catalog. When OpenAI ships
+// new Codex models or prices change, refresh this file from:
+// https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json
+import modelPrices from './litellm-openai-model-prices.json' with { type: 'json' };
+const prices = modelPrices;
+function normalizeModelId(modelId) {
+    return modelId.trim().replace(/^openai\//, '');
+}
+export function getLiteLlmPricingForModel(modelId) {
+    const normalized = normalizeModelId(modelId);
+    return prices[normalized] ?? prices[modelId];
+}
+/**
+ * Estimate Codex API-equivalent cost from token usage and LiteLLM's pricing map.
+ *
+ * This is deliberately an estimate:
+ * - Codex SDK does not provide per-turn cost.
+ * - Codex `turn.completed.usage` is cumulative across the agent loop, so it
+ *   cannot tell us whether any single model request crossed a long-context
+ *   pricing tier. Use base per-token prices until a per-request tier signal is
+ *   available.
+ * - ChatGPT subscription/native-auth Codex billing may not equal API pricing.
+ * - Service tiers, batch/flex/priority, regional uplifts, and non-token tool
+ *   charges are not inferred from `turn.completed.usage`.
+ */
+export function estimateCodexCostUsd(input) {
+    const pricing = getLiteLlmPricingForModel(input.modelId);
+    if (!pricing)
+        return undefined;
+    const inputTokens = Math.max(0, input.inputTokens || 0);
+    const outputTokens = Math.max(0, input.outputTokens || 0);
+    const cacheReadTokens = Math.min(Math.max(0, input.cacheReadTokens || 0), inputTokens);
+    const uncachedInputTokens = Math.max(0, inputTokens - cacheReadTokens);
+    const inputCostPerToken = pricing.input_cost_per_token;
+    const outputCostPerToken = pricing.output_cost_per_token;
+    const cacheReadCostPerToken = pricing.cache_read_input_token_cost ?? inputCostPerToken;
+    if (uncachedInputTokens > 0 && inputCostPerToken === undefined)
+        return undefined;
+    if (cacheReadTokens > 0 && cacheReadCostPerToken === undefined)
+        return undefined;
+    if (outputTokens > 0 && outputCostPerToken === undefined)
+        return undefined;
+    return (uncachedInputTokens * (inputCostPerToken ?? 0) +
+        cacheReadTokens * (cacheReadCostPerToken ?? 0) +
+        outputTokens * (outputCostPerToken ?? 0));
+}

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts

@@ -23,7 +23,7 @@
  * without cleanup. See issue #133.
  */
 import type { ContextUsageSnapshot } from '@agor/core/types';
-import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
+import type { BranchRepository, MCPOAuthAuthHeadersRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
 import type { TokenUsage } from '../../types/token-usage.js';
 import type { PermissionMode, SessionID, TaskID } from '../../types.js';
 import type { TasksService } from '../base/index.js';
@@ -109,6 +109,7 @@ export declare class CodexPromptService {
     private branchesRepo?;
     private mcpServerRepo?;
     private tasksService?;
+    private mcpOAuthAuthHeadersRepo?;
     private codex?;
     private lastApiKey;
     private lastBaseUrl;
@@ -128,7 +129,7 @@ export declare class CodexPromptService {
      * Logged at DEBUG only (could leak internal hostnames).
      */
     private resolveBaseUrl;
-    constructor(_messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, _usersRepo?: UsersRepository, useNativeAuth?: boolean, tasksService?: TasksService | undefined);
+    constructor(_messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, _usersRepo?: UsersRepository, useNativeAuth?: boolean, tasksService?: TasksService | undefined, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository | undefined);
     /**
      * Delete `agor-codex-instructions-*.md` files in `os.tmpdir()` (and the
      * `~/.agor/tmp` fallback dir) older than 24h. Bounds the disk leak from

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/codex/prompt-service.js

@@ -38,17 +38,16 @@ import { getMcpServersForSession } from '../base/mcp-scoping.js';
 import { forkCodexThreadViaAppServer } from './app-server-client.js';
 import { extractCodexContextSnapshotFromEvent, extractCodexTokenUsage } from './usage.js';
 /**
- * Map Agor's effort level (`low`/`medium`/`high`/`max`) to Codex SDK's
+ * Map Agor's effort level (`low`/`medium`/`high`/`xhigh`/`max`) to Codex SDK's
  * `ModelReasoningEffort` (`minimal`/`low`/`medium`/`high`/`xhigh`).
  *
- * Agor has no equivalent for `minimal`, and Codex has no equivalent for `max`
- * — `max` is the user's "go as deep as possible" intent, which on Codex maps
- * to `xhigh`.
+ * Agor has no equivalent for `minimal`. Codex has no `max` — both Agor `max`
+ * and Agor `xhigh` map to Codex `xhigh` (the Codex ceiling).
  */
 function toCodexReasoningEffort(effort) {
     if (!effort)
         return undefined;
-    return effort === 'max' ? 'xhigh' : effort;
+    return effort === 'max' || effort === 'xhigh' ? 'xhigh' : effort;
 }
 /**
  * Per-MCP-server config snippet that auto-approves all tool calls without
@@ -76,12 +75,68 @@ function applyGatewayMcpStartupGuard(config, requireMcpServers) {
     config.required = true;
     config.startup_timeout_ms = GATEWAY_MCP_STARTUP_TIMEOUT_MS;
 }
+function getCodexHome() {
+    return process.env.CODEX_HOME || path.join(os.homedir(), '.codex');
+}
+async function findCodexRolloutFile(threadId) {
+    if (!threadId)
+        return undefined;
+    const sessionsDir = path.join(getCodexHome(), 'sessions');
+    async function walk(dir) {
+        let entries;
+        try {
+            entries = await fs.readdir(dir, { withFileTypes: true });
+        }
+        catch {
+            return undefined;
+        }
+        for (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isFile() && entry.name.endsWith('.jsonl') && entry.name.includes(threadId)) {
+                return fullPath;
+            }
+            if (entry.isDirectory()) {
+                const found = await walk(fullPath);
+                if (found)
+                    return found;
+            }
+        }
+        return undefined;
+    }
+    return walk(sessionsDir);
+}
+async function extractLatestContextUsageFromRollout(threadId) {
+    const rolloutPath = await findCodexRolloutFile(threadId);
+    if (!rolloutPath)
+        return undefined;
+    let contents;
+    try {
+        contents = await fs.readFile(rolloutPath, 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+    let latest;
+    for (const line of contents.split('\n')) {
+        if (!line.includes('token_count'))
+            continue;
+        try {
+            const parsed = JSON.parse(line);
+            latest = extractCodexContextSnapshotFromEvent(parsed) ?? latest;
+        }
+        catch {
+            // Ignore malformed / partially-written JSONL lines.
+        }
+    }
+    return latest;
+}
 export class CodexPromptService {
     sessionsRepo;
     sessionMCPServerRepo;
     branchesRepo;
     mcpServerRepo;
     tasksService;
+    mcpOAuthAuthHeadersRepo;
     codex;
     lastApiKey = null;
     lastBaseUrl = null;
@@ -104,12 +159,13 @@ export class CodexPromptService {
         const raw = process.env.OPENAI_BASE_URL?.trim();
         return raw && raw.length > 0 ? raw : undefined;
     }
-    constructor(_messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, _reposRepo, apiKey, mcpServerRepo, _usersRepo, useNativeAuth = false, tasksService) {
+    constructor(_messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, _reposRepo, apiKey, mcpServerRepo, _usersRepo, useNativeAuth = false, tasksService, mcpOAuthAuthHeadersRepo) {
         this.sessionsRepo = sessionsRepo;
         this.sessionMCPServerRepo = sessionMCPServerRepo;
         this.branchesRepo = branchesRepo;
         this.mcpServerRepo = mcpServerRepo;
         this.tasksService = tasksService;
+        this.mcpOAuthAuthHeadersRepo = mcpOAuthAuthHeadersRepo;
         // Store API key from base-executor (already resolved with proper precedence)
         this.apiKey = apiKey || '';
         this.lastApiKey = this.apiKey;
@@ -408,6 +464,7 @@ export class CodexPromptService {
         const serversWithSource = await getMcpServersForSession(sessionId, {
             sessionMCPRepo: this.sessionMCPServerRepo,
             mcpServerRepo: this.mcpServerRepo,
+            mcpOAuthAuthHeadersRepo: this.mcpOAuthAuthHeadersRepo,
             forUserId,
         });
         const mcpServers = serversWithSource.map((s) => s.server);
@@ -849,6 +906,7 @@ export class CodexPromptService {
             let todoIdsEmittedViaUpdate = new Set();
             let latestContextUsage;
             let eventCount = 0;
+            let didStop = false;
             for await (const event of events) {
                 eventCount++;
                 codexDebug(`📨 [Codex] Event ${eventCount}: ${event.type}`);
@@ -856,6 +914,7 @@ export class CodexPromptService {
                 if (this.stopRequested.get(sessionId)) {
                     console.log(`🛑 Stop requested for session ${sessionId}, breaking event loop`);
                     this.stopRequested.delete(sessionId);
+                    didStop = true;
                     // Yield stopped event so caller knows execution was stopped early
                     yield {
                         type: 'stopped',
@@ -864,12 +923,62 @@ export class CodexPromptService {
                     break;
                 }
                 if (event.type === 'event_msg') {
-                    // Codex emits token_count as generic event_msg payloads.
-                    // Capture the latest snapshot so turn.completed can return context usage.
-                    const contextSnapshot = extractCodexContextSnapshotFromEvent(event);
-                    if (contextSnapshot) {
-                        latestContextUsage = contextSnapshot;
+                    const eventPayload = event.payload;
+                    const payloadType = eventPayload?.type;
+                    if (payloadType === 'token_count') {
+                        // Codex emits token_count as generic event_msg payloads.
+                        // Capture the latest snapshot so turn.completed can return context usage.
+                        const contextSnapshot = extractCodexContextSnapshotFromEvent(event);
+                        if (contextSnapshot) {
+                            latestContextUsage = contextSnapshot;
+                        }
+                        continue;
+                    }
+                    if (payloadType === 'agent_message') {
+                        // New Codex rollout format: final assistant text surfaces via event_msg
+                        // rather than an item.completed(agent_message) item.
+                        const text = typeof eventPayload?.content === 'string'
+                            ? eventPayload.content
+                            : typeof eventPayload?.text === 'string'
+                                ? eventPayload.text
+                                : typeof eventPayload?.message === 'string'
+                                    ? eventPayload.message
+                                    : '';
+                        if (text) {
+                            currentMessage.push({ type: 'text', text });
+                        }
+                        continue;
                     }
+                    if (payloadType === 'task_complete' || payloadType === 'turn_complete') {
+                        // Terminal completion event from new Codex rollout format.
+                        // Treat as equivalent to turn.completed.
+                        threadId = thread.id || '';
+                        const taskCompleteUsage = extractCodexTokenUsage((eventPayload?.usage ?? eventPayload?.token_usage));
+                        const contextUsage = latestContextUsage ?? (await extractLatestContextUsageFromRollout(thread.id || ''));
+                        // Synthesize final assistant text from last_agent_message unless
+                        // a preceding agent_message event already pushed the same text.
+                        // This preserves distinct progress/final messages without duplicating.
+                        const lastAgentMessage = typeof eventPayload?.last_agent_message === 'string'
+                            ? eventPayload.last_agent_message
+                            : '';
+                        const hasSameTextContent = currentMessage.some((block) => block.type === 'text' && block.text === lastAgentMessage);
+                        if (lastAgentMessage && !hasSameTextContent) {
+                            currentMessage.push({ type: 'text', text: lastAgentMessage });
+                        }
+                        codexDebug(`✅ [Codex] terminal event_msg (${payloadType}) received for session ${shortId(sessionId)}`);
+                        yield {
+                            type: 'complete',
+                            content: currentMessage,
+                            toolUses: allToolUses.length > 0 ? allToolUses : undefined,
+                            threadId,
+                            resolvedModel,
+                            usage: taskCompleteUsage,
+                            rawContextUsage: contextUsage,
+                        };
+                        return;
+                    }
+                    // Unknown event_msg payload type — ignore silently.
+                    codexDebug(`[Codex] Unknown event_msg payload type: ${String(payloadType)}`);
                     continue;
                 }
                 switch (event.type) {
@@ -994,6 +1103,7 @@ export class CodexPromptService {
                         // Turn complete, emit final message
                         threadId = thread.id || '';
                         const mappedUsage = extractCodexTokenUsage(event.usage);
+                        const contextUsage = latestContextUsage ?? (await extractLatestContextUsageFromRollout(thread.id || ''));
                         // Yield complete message with all tool uses
                         yield {
                             type: 'complete',
@@ -1003,7 +1113,7 @@ export class CodexPromptService {
                             resolvedModel,
                             usage: mappedUsage,
                             rawSdkEvent: event, // Pass through the actual SDK event (UNMUTATED)
-                            rawContextUsage: latestContextUsage,
+                            rawContextUsage: contextUsage,
                         };
                         // Exit the event loop after turn completion
                         // Codex SDK doesn't always close the stream properly, so we break manually
@@ -1038,6 +1148,15 @@ export class CodexPromptService {
                         break;
                 }
             }
+            // If we reach here without returning, the stream ended.
+            // A user-requested stop is a valid early exit; anything else means Codex
+            // exited without emitting a terminal event (turn.completed / task_complete / turn_complete),
+            // which is the bug described in issue #1749.
+            if (!didStop) {
+                throw new Error('Codex stream ended without a terminal completion event (turn.completed, task_complete, or turn_complete). ' +
+                    'The Codex process may have exited unexpectedly (check the executor logs for exit code 0 clues). ' +
+                    'This is usually resolved by retrying the prompt; if it persists, restart the session.');
+            }
         }
         catch (error) {
             // Check if this is an AbortError from AbortController.abort()

package/dist/executor/sdk-handlers/codex/usage.d.ts

@@ -53,29 +53,20 @@ export declare function codexUsedPercentage(usedTokens: number, contextWindow: n
  */
 export declare function extractCodexTokenUsage(raw: unknown): TokenUsage | undefined;
 /**
- * Last-resort context-window estimate from a `turn.completed.usage` payload.
- *
- * PREFER `extractCodexContextSnapshotFromEvent` (`event_msg/token_count.last_token_usage`)
- * when available — that comes from Codex CLI itself and is authoritative.
- *
- * This helper is only useful when no `token_count` events were seen (legacy
- * Codex CLI versions, or tasks where the stream ended before any event_msg
- * arrived). It treats per-turn `input_tokens` as a rough proxy for current
- * occupancy, which is approximately correct for a turn that contains a single
- * model API call but UNDER-counts for turns with internal tool loops (each
- * subsequent internal API call sees more context than the previous one).
- *
- * Semantics from OpenAI usage schema:
- * - `input_tokens` already includes cached input tokens.
- * - `cached_input_tokens` is a subset detail, not an additive field.
- * - `output_tokens` are completion tokens and should not count toward
- *   context-window occupancy.
- *
- * Fallback chain:
- * 1) input_tokens / prompt_tokens (preferred)
- * 2) total_tokens - output_tokens (when both are available)
- * 3) total_tokens (legacy fallback)
- * 4) undefined (no usable data)
+ * Extract a context-window estimate from an explicit context payload.
+ *
+ * IMPORTANT: `turn.completed.usage.input_tokens` is NOT used here. For Codex
+ * that field is per model request/turn accounting, includes cached prefixes,
+ * may include tool/system/context replay, and can be much larger than the
+ * model context window on observed first turns. It is useful for token/cost
+ * accounting, but it is not a reliable current context-window occupancy.
+ *
+ * The only Codex context-window source Agor currently trusts is
+ * `event_msg` / `token_count` via `extractCodexContextSnapshotFromEvent()`.
+ * This helper is deliberately narrow and only accepts future/legacy payloads
+ * that name context tokens explicitly. When no explicit context field exists,
+ * return undefined so the UI can hide context percentage instead of showing
+ * a bogus 100% bar.
  */
 export declare function extractCodexContextWindowUsage(raw: unknown): number | undefined;
 /**

package/dist/executor/sdk-handlers/codex/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,QAAS,CAAC;AAWrD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAUrF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAoC3E;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CA+B/E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,OAAO,GACX,oBAAoB,GAAG,SAAS,CAsDlC"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,QAAS,CAAC;AAWrD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAUrF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAoC3E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAmB/E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,OAAO,GACX,oBAAoB,GAAG,SAAS,CAsDlC"}

package/dist/executor/sdk-handlers/codex/usage.js

@@ -93,29 +93,20 @@ export function extractCodexTokenUsage(raw) {
     return usage;
 }
 /**
- * Last-resort context-window estimate from a `turn.completed.usage` payload.
- *
- * PREFER `extractCodexContextSnapshotFromEvent` (`event_msg/token_count.last_token_usage`)
- * when available — that comes from Codex CLI itself and is authoritative.
- *
- * This helper is only useful when no `token_count` events were seen (legacy
- * Codex CLI versions, or tasks where the stream ended before any event_msg
- * arrived). It treats per-turn `input_tokens` as a rough proxy for current
- * occupancy, which is approximately correct for a turn that contains a single
- * model API call but UNDER-counts for turns with internal tool loops (each
- * subsequent internal API call sees more context than the previous one).
- *
- * Semantics from OpenAI usage schema:
- * - `input_tokens` already includes cached input tokens.
- * - `cached_input_tokens` is a subset detail, not an additive field.
- * - `output_tokens` are completion tokens and should not count toward
- *   context-window occupancy.
- *
- * Fallback chain:
- * 1) input_tokens / prompt_tokens (preferred)
- * 2) total_tokens - output_tokens (when both are available)
- * 3) total_tokens (legacy fallback)
- * 4) undefined (no usable data)
+ * Extract a context-window estimate from an explicit context payload.
+ *
+ * IMPORTANT: `turn.completed.usage.input_tokens` is NOT used here. For Codex
+ * that field is per model request/turn accounting, includes cached prefixes,
+ * may include tool/system/context replay, and can be much larger than the
+ * model context window on observed first turns. It is useful for token/cost
+ * accounting, but it is not a reliable current context-window occupancy.
+ *
+ * The only Codex context-window source Agor currently trusts is
+ * `event_msg` / `token_count` via `extractCodexContextSnapshotFromEvent()`.
+ * This helper is deliberately narrow and only accepts future/legacy payloads
+ * that name context tokens explicitly. When no explicit context field exists,
+ * return undefined so the UI can hide context percentage instead of showing
+ * a bogus 100% bar.
  */
 export function extractCodexContextWindowUsage(raw) {
     if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
@@ -125,16 +116,10 @@ export function extractCodexContextWindowUsage(raw) {
     const usage = payload.usage && typeof payload.usage === 'object' && !Array.isArray(payload.usage)
         ? payload.usage
         : payload;
-    const inputTokens = sanitizeTokenCount(normalizeNumber(usage.input_tokens ?? usage.inputTokens ?? usage.prompt_tokens));
-    if (inputTokens !== undefined) {
-        return inputTokens;
-    }
-    const fallbackTotalTokens = sanitizeTokenCount(normalizeNumber(usage.total_tokens ?? usage.totalTokens));
-    const outputTokens = sanitizeTokenCount(normalizeNumber(usage.output_tokens ?? usage.outputTokens ?? usage.completion_tokens));
-    if (fallbackTotalTokens !== undefined && outputTokens !== undefined) {
-        return Math.max(0, fallbackTotalTokens - outputTokens);
-    }
-    return fallbackTotalTokens;
+    return sanitizeTokenCount(normalizeNumber(usage.context_tokens ??
+        usage.contextTokens ??
+        usage.current_context_tokens ??
+        usage.currentContextTokens));
 }
 /**
  * Extract an authoritative context-window snapshot from a Codex

package/dist/executor/sdk-handlers/copilot/copilot-tool.d.ts

@@ -11,7 +11,7 @@
  * - ❌ Session import (deferred)
  * - ❌ Session fork (emulated via new sessions in Phase 2)
  */
-import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
+import type { BranchRepository, MCPOAuthAuthHeadersRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
 import type { PermissionService } from '../../permissions/permission-service.js';
 import type { NormalizedSdkResponse, RawSdkResponse } from '../../types/sdk-response.js';
 import type { TokenUsage } from '../../types/token-usage.js';
@@ -35,7 +35,7 @@ export declare class CopilotTool implements ITool {
     private sessionsRepo?;
     private messagesService?;
     private tasksService?;
-    constructor(messagesRepo?: MessagesRepository, sessionsRepo?: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository, branchesRepo?: BranchRepository, reposRepo?: RepoRepository, apiKey?: string, messagesService?: MessagesService, tasksService?: TasksService, _useNativeAuth?: boolean, mcpServerRepo?: MCPServerRepository, usersRepo?: UsersRepository, permissionService?: PermissionService, sessionsService?: SessionsPatchClient);
+    constructor(messagesRepo?: MessagesRepository, sessionsRepo?: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository, branchesRepo?: BranchRepository, reposRepo?: RepoRepository, apiKey?: string, messagesService?: MessagesService, tasksService?: TasksService, _useNativeAuth?: boolean, mcpServerRepo?: MCPServerRepository, usersRepo?: UsersRepository, permissionService?: PermissionService, sessionsService?: SessionsPatchClient, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository);
     getCapabilities(): ToolCapabilities;
     checkInstalled(): Promise<boolean>;
     /**

package/dist/executor/sdk-handlers/copilot/copilot-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copilot-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/copilot/copilot-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"copilot-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/copilot/copilot-tool.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/copilot/copilot-tool.js

@@ -24,13 +24,13 @@ export class CopilotTool {
     sessionsRepo;
     messagesService;
     tasksService;
-    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, reposRepo, apiKey, messagesService, tasksService, _useNativeAuth, mcpServerRepo, usersRepo, permissionService, sessionsService) {
+    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, reposRepo, apiKey, messagesService, tasksService, _useNativeAuth, mcpServerRepo, usersRepo, permissionService, sessionsService, mcpOAuthAuthHeadersRepo) {
         this.messagesRepo = messagesRepo;
         this.sessionsRepo = sessionsRepo;
         this.messagesService = messagesService;
         this.tasksService = tasksService;
         if (messagesRepo && sessionsRepo) {
-            this.promptService = new CopilotPromptService(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, reposRepo, apiKey, mcpServerRepo, usersRepo, permissionService, messagesService, tasksService, sessionsService);
+            this.promptService = new CopilotPromptService(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, reposRepo, apiKey, mcpServerRepo, usersRepo, permissionService, messagesService, tasksService, sessionsService, mcpOAuthAuthHeadersRepo);
         }
     }
     getCapabilities() {

package/dist/executor/sdk-handlers/copilot/prompt-service.d.ts

@@ -10,7 +10,7 @@
  * - Sessions are created or resumed via the client
  * - Events stream back through the session's event emitter
  */
-import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
+import type { BranchRepository, MCPOAuthAuthHeadersRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
 import type { PermissionService } from '../../permissions/permission-service.js';
 import type { TokenUsage } from '../../types/token-usage.js';
 import type { PermissionMode, SessionID, TaskID } from '../../types.js';
@@ -80,6 +80,7 @@ export declare class CopilotPromptService {
     private sessionMCPServerRepo?;
     private branchesRepo?;
     private mcpServerRepo?;
+    private mcpOAuthAuthHeadersRepo?;
     private client;
     private stopRequested;
     private apiKey;
@@ -89,7 +90,7 @@ export declare class CopilotPromptService {
     private tasksService?;
     private sessionsService?;
     private permissionLocks;
-    constructor(messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, _usersRepo?: UsersRepository, permissionService?: PermissionService, messagesService?: MessagesService, tasksService?: TasksService, sessionsService?: SessionsPatchClient);
+    constructor(messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, _usersRepo?: UsersRepository, permissionService?: PermissionService, messagesService?: MessagesService, tasksService?: TasksService, sessionsService?: SessionsPatchClient, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository | undefined);
     /**
      * Build MCP servers configuration for Copilot session
      *

package/dist/executor/sdk-handlers/copilot/prompt-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/copilot/prompt-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/copilot/prompt-service.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/copilot/prompt-service.js

@@ -24,6 +24,7 @@ export class CopilotPromptService {
     sessionMCPServerRepo;
     branchesRepo;
     mcpServerRepo;
+    mcpOAuthAuthHeadersRepo;
     client = null;
     stopRequested = new Map();
     apiKey;
@@ -34,11 +35,12 @@ export class CopilotPromptService {
     tasksService;
     sessionsService;
     permissionLocks = new Map();
-    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, _reposRepo, apiKey, mcpServerRepo, _usersRepo, permissionService, messagesService, tasksService, sessionsService) {
+    constructor(messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, _reposRepo, apiKey, mcpServerRepo, _usersRepo, permissionService, messagesService, tasksService, sessionsService, mcpOAuthAuthHeadersRepo) {
         this.sessionsRepo = sessionsRepo;
         this.sessionMCPServerRepo = sessionMCPServerRepo;
         this.branchesRepo = branchesRepo;
         this.mcpServerRepo = mcpServerRepo;
+        this.mcpOAuthAuthHeadersRepo = mcpOAuthAuthHeadersRepo;
         this.apiKey = apiKey;
         this.messagesRepo = messagesRepo;
         this.permissionService = permissionService;
@@ -58,6 +60,7 @@ export class CopilotPromptService {
         const serversWithSource = await getMcpServersForSession(sessionId, {
             sessionMCPRepo: this.sessionMCPServerRepo,
             mcpServerRepo: this.mcpServerRepo,
+            mcpOAuthAuthHeadersRepo: this.mcpOAuthAuthHeadersRepo,
         });
         const mcpServers = serversWithSource.map((s) => s.server);
         console.log(`📊 [Copilot MCP] Found ${mcpServers.length} MCP server(s) for session`);

package/dist/executor/sdk-handlers/gemini/gemini-tool.d.ts

@@ -9,7 +9,7 @@
  * - ❌ Import sessions (deferred - need checkpoint format)
  * - ❌ Session creation (handled via live execution)
  */
-import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
+import type { BranchRepository, MCPOAuthAuthHeadersRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
 import type { NormalizedSdkResponse, RawSdkResponse } from '../../types/sdk-response.js';
 import type { TokenUsage } from '../../types/token-usage.js';
 import { type MessageID, type MessageSource, type PermissionMode, type SessionID, type TaskID } from '../../types.js';
@@ -31,7 +31,7 @@ export declare class GeminiTool implements ITool {
     readonly name = "Google Gemini";
     private promptService?;
     constructor(messagesRepo?: MessagesRepository | undefined, sessionsRepo?: SessionRepository, apiKey?: string, messagesService?: MessagesService | undefined, tasksService?: TasksService | undefined, branchesRepo?: BranchRepository, reposRepo?: RepoRepository, mcpServerRepo?: MCPServerRepository, sessionMCPRepo?: SessionMCPServerRepository, mcpEnabled?: boolean, useNativeAuth?: boolean, // Flag to use OAuth when no API key
-    usersRepo?: UsersRepository);
+    usersRepo?: UsersRepository, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository);
     getCapabilities(): ToolCapabilities;
     checkInstalled(): Promise<boolean>;
     /**