@dexto/core 1.8.2 → 1.8.4

package/dist/llm/executor/turn-executor.js

@@ -13,9 +13,11 @@ import { StreamProcessor } from "./stream-processor.js";
 import { truncateToolResult } from "./tool-output-truncator.js";
 import { buildProviderOptions, getEffectiveReasoningBudgetTokens } from "./provider-options.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
-import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
-import { ErrorScope, ErrorType } from "../../errors/types.js";
-import { LLMErrorCode } from "../error-codes.js";
+import { recordOperationSpan } from "../../telemetry/operation-span.js";
+import {
+  extractProviderErrorDetails,
+  mapProviderError as mapCoreProviderError
+} from "./provider-error.js";
 import { toError } from "../../utils/error-conversion.js";
 import { isCodexBaseURL } from "../providers/codex-base-url.js";
 import { createModelToolDefinitions } from "./tool-definitions.js";
@@ -350,11 +352,19 @@ class TurnExecutor {
         this.currentModelStepId = `in-memory-model-step-${stepCount}`;
         modelStepPreparing = true;
         try {
-          preparedModelRequest = await this.prepareNextModelRequest({
-            contributorContext,
-            supportsTools: turn.supportsTools,
-            streaming: options.streaming
-          });
+          preparedModelRequest = await recordOperationSpan(
+            {
+              name: "turn.prepare_model_step",
+              componentName: "TurnExecutor",
+              attributes: { "turn.step_count": stepCount }
+            },
+            () => this.prepareNextModelRequest({
+              contributorContext,
+              supportsTools: turn.supportsTools,
+              streaming: options.streaming
+            }),
+            this.logger
+          );
         } catch (error) {
           currentStepScope[Symbol.dispose]();
           currentStepScope = null;
@@ -380,11 +390,19 @@ class TurnExecutor {
             }
             currentStepScope = this.startModelStepScope();
             this.currentModelStepId = `in-memory-model-step-${stepCount}`;
-            preparedModelRequest = await this.prepareNextModelRequest({
-              contributorContext,
-              supportsTools: turn.supportsTools,
-              streaming: options.streaming
-            });
+            preparedModelRequest = await recordOperationSpan(
+              {
+                name: "turn.prepare_model_step",
+                componentName: "TurnExecutor",
+                attributes: { "turn.step_count": stepCount }
+              },
+              () => this.prepareNextModelRequest({
+                contributorContext,
+                supportsTools: turn.supportsTools,
+                streaming: options.streaming
+              }),
+              this.logger
+            );
           }
           const modelStepRequest = preparedModelRequest;
           if (currentStepScope === null || modelStepRequest === null) {
@@ -576,7 +594,13 @@ class TurnExecutor {
     this.eventBus.emit("llm:error", {
       error: mappedError,
       context: "TurnExecutor",
-      recoverable: false
+      recoverable: false,
+      details: extractProviderErrorDetails({
+        error,
+        provider: this.llmContext.provider,
+        model: this.llmContext.model,
+        sessionId: this.sessionId
+      })
     });
     await this.contextManager.flush();
     this.eventBus.emit("run:complete", {
@@ -773,48 +797,159 @@ class TurnExecutor {
       await this.injectQueuedMessages(coalesced);
     }
     await this.pruneOldToolOutputs();
-    let prepared = await this.contextManager.getFormattedMessagesForLLM(
-      input.contributorContext,
-      this.llmContext
+    let systemPrompt = await recordOperationSpan(
+      {
+        name: "system_prompt.build",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      () => this.contextManager.getSystemPrompt(input.contributorContext),
+      this.logger
     );
-    const toolDefinitions = input.supportsTools ? this.toolManager.filterToolsForSession(
-      await this.toolManager.getAllTools(),
-      this.sessionId
+    let { preparedHistory, formattedMessages } = await recordOperationSpan(
+      {
+        name: "context.build_messages",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      async () => {
+        const preparedHistory2 = (await this.contextManager.prepareHistory()).preparedHistory;
+        const formattedMessages2 = await this.contextManager.getFormattedMessages(
+          input.contributorContext,
+          this.llmContext,
+          systemPrompt,
+          preparedHistory2
+        );
+        return { preparedHistory: preparedHistory2, formattedMessages: formattedMessages2 };
+      },
+      this.logger
+    );
+    const toolDefinitions = input.supportsTools ? await recordOperationSpan(
+      {
+        name: "tools.list",
+        componentName: "TurnExecutor",
+        attributes: { "tools.supports": input.supportsTools },
+        resultAttributes: (tools) => ({ "tools.count": Object.keys(tools).length })
+      },
+      async () => this.toolManager.filterToolsForSession(
+        await this.toolManager.getAllTools(),
+        this.sessionId
+      ),
+      this.logger
     ) : {};
-    let estimatedInputTokens = await this.contextManager.getEstimatedNextInputTokens(
-      prepared.systemPrompt,
-      prepared.preparedHistory,
-      toolDefinitions
+    let estimatedInputTokens = await recordOperationSpan(
+      {
+        name: "context.token_estimate",
+        componentName: "TurnExecutor",
+        attributes: { "tools.count": Object.keys(toolDefinitions).length },
+        resultAttributes: (tokens) => ({ "context.estimated_input_tokens": tokens })
+      },
+      () => this.contextManager.getEstimatedNextInputTokens(
+        systemPrompt,
+        preparedHistory,
+        toolDefinitions
+      ),
+      this.logger
     );
     if (this.shouldCompact(estimatedInputTokens)) {
       this.logger.debug(
         `Pre-check: estimated ${estimatedInputTokens} tokens exceeds threshold, compacting`
       );
-      const didCompact = await this.compactContext(
-        estimatedInputTokens,
-        input.contributorContext,
-        toolDefinitions
+      const didCompact = await recordOperationSpan(
+        {
+          name: "context.compact",
+          componentName: "TurnExecutor",
+          attributes: { "context.estimated_input_tokens": estimatedInputTokens }
+        },
+        () => this.compactContext(
+          estimatedInputTokens,
+          input.contributorContext,
+          toolDefinitions
+        ),
+        this.logger
       );
       if (didCompact) {
-        prepared = await this.contextManager.getFormattedMessagesForLLM(
-          input.contributorContext,
-          this.llmContext
+        systemPrompt = await recordOperationSpan(
+          {
+            name: "system_prompt.build",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "llm.model": this.llmContext.model,
+              "llm.provider": this.llmContext.provider
+            }
+          },
+          () => this.contextManager.getSystemPrompt(input.contributorContext),
+          this.logger
         );
-        estimatedInputTokens = await this.contextManager.getEstimatedNextInputTokens(
-          prepared.systemPrompt,
-          prepared.preparedHistory,
-          toolDefinitions
+        ({ preparedHistory, formattedMessages } = await recordOperationSpan(
+          {
+            name: "context.build_messages",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "llm.model": this.llmContext.model,
+              "llm.provider": this.llmContext.provider
+            }
+          },
+          async () => {
+            const preparedHistory2 = (await this.contextManager.prepareHistory()).preparedHistory;
+            const formattedMessages2 = await this.contextManager.getFormattedMessages(
+              input.contributorContext,
+              this.llmContext,
+              systemPrompt,
+              preparedHistory2
+            );
+            return { preparedHistory: preparedHistory2, formattedMessages: formattedMessages2 };
+          },
+          this.logger
+        ));
+        estimatedInputTokens = await recordOperationSpan(
+          {
+            name: "context.token_estimate",
+            componentName: "TurnExecutor",
+            attributes: {
+              "context.after_compaction": true,
+              "tools.count": Object.keys(toolDefinitions).length
+            },
+            resultAttributes: (tokens) => ({
+              "context.estimated_input_tokens": tokens
+            })
+          },
+          () => this.contextManager.getEstimatedNextInputTokens(
+            systemPrompt,
+            preparedHistory,
+            toolDefinitions
+          ),
+          this.logger
         );
         this.logger.debug(
           `Post-compaction: recomputed estimate is ${estimatedInputTokens} tokens`
         );
       }
     }
-    const providerOptions = buildProviderOptions({
-      provider: this.llmContext.provider,
-      model: this.llmContext.model,
-      reasoning: this.config.reasoning
-    });
+    const providerOptions = await recordOperationSpan(
+      {
+        name: "llm.request_setup",
+        componentName: "TurnExecutor",
+        attributes: {
+          "llm.model": this.llmContext.model,
+          "llm.provider": this.llmContext.provider
+        }
+      },
+      () => buildProviderOptions({
+        provider: this.llmContext.provider,
+        model: this.llmContext.model,
+        reasoning: this.config.reasoning
+      }),
+      this.logger
+    );
     this.logger.debug("LLM request options", {
       provider: this.llmContext.provider,
       model: this.llmContext.model,
@@ -831,7 +966,7 @@ class TurnExecutor {
       ...reasoningBudgetTokens !== void 0 && { reasoningBudgetTokens }
     } : void 0;
     return {
-      messages: prepared.formattedMessages,
+      messages: formattedMessages,
       tools: input.supportsTools ? createModelToolDefinitions(toolDefinitions) : {},
       toolDefinitions,
       estimatedInputTokens,
@@ -862,7 +997,8 @@ class TurnExecutor {
       this.stepAbortController.signal,
       this.getStreamProcessorConfig(request.estimatedInputTokens, request.reasoning),
       this.logger,
-      request.streaming
+      request.streaming,
+      false
     );
     return streamProcessor.process(
       () => streamText({
@@ -1499,84 +1635,12 @@ class TurnExecutor {
    * Map provider errors to DextoRuntimeError.
    */
   mapProviderError(err) {
-    if (APICallError.isInstance?.(err)) {
-      const status = err.statusCode;
-      const headers = err.responseHeaders || {};
-      const retryAfter = headers["retry-after"] ? Number(headers["retry-after"]) : void 0;
-      const body = typeof err.responseBody === "string" ? err.responseBody : JSON.stringify(err.responseBody ?? "");
-      if (status === 402) {
-        let balance;
-        try {
-          const parsed = JSON.parse(body);
-          const msg = parsed?.error?.message || "";
-          const match = msg.match(/Balance:\s*\$?([\d.]+)/i);
-          if (match) {
-            balance = parseFloat(match[1]);
-          }
-        } catch {
-        }
-        return new DextoRuntimeError(
-          LLMErrorCode.INSUFFICIENT_CREDITS,
-          ErrorScope.LLM,
-          ErrorType.PAYMENT_REQUIRED,
-          `Insufficient Dexto credits${balance !== void 0 ? `. Balance: $${balance.toFixed(2)}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            balance,
-            body
-          },
-          "Run `dexto billing` to check your balance"
-        );
-      }
-      if (status === 429) {
-        return new DextoRuntimeError(
-          LLMErrorCode.RATE_LIMIT_EXCEEDED,
-          ErrorScope.LLM,
-          ErrorType.RATE_LIMIT,
-          `Rate limit exceeded${body ? ` - ${body}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            retryAfter,
-            body
-          }
-        );
-      }
-      if (status === 408) {
-        return new DextoRuntimeError(
-          LLMErrorCode.GENERATION_FAILED,
-          ErrorScope.LLM,
-          ErrorType.TIMEOUT,
-          `Provider timed out${body ? ` - ${body}` : ""}`,
-          {
-            sessionId: this.sessionId,
-            provider: this.llmContext.provider,
-            model: this.llmContext.model,
-            status,
-            body
-          }
-        );
-      }
-      return new DextoRuntimeError(
-        LLMErrorCode.GENERATION_FAILED,
-        ErrorScope.LLM,
-        ErrorType.THIRD_PARTY,
-        `Provider error ${status}${body ? ` - ${body}` : ""}`,
-        {
-          sessionId: this.sessionId,
-          provider: this.llmContext.provider,
-          model: this.llmContext.model,
-          status,
-          body
-        }
-      );
-    }
-    return toError(err, this.logger);
+    return mapCoreProviderError({
+      error: err,
+      provider: this.llmContext.provider,
+      model: this.llmContext.model,
+      sessionId: this.sessionId
+    });
   }
 }
 export {

package/dist/session/chat-session.cjs

@@ -29,6 +29,7 @@ var import_errors = require("../errors/index.js");
 var import_error_codes = require("../hooks/error-codes.js");
 var import_message_queue = require("./message-queue.js");
 var import_usage_metadata = require("../llm/usage-metadata.js");
+var import_codex_base_url = require("../llm/providers/codex-base-url.js");
 var import_errors2 = require("./errors.js");
 class ChatSession {
   /**
@@ -134,29 +135,37 @@ class ChatSession {
    */
   setupTokenAccumulation() {
     this.tokenAccumulatorListener = (payload) => {
-      if (payload.tokenUsage) {
-        const tokenUsage = (0, import_usage_metadata.normalizeTokenUsageForAccounting)(payload.tokenUsage);
-        const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-        const modelInfo = {
-          provider: payload.provider ?? llmConfig.provider,
-          model: payload.model ?? llmConfig.model
-        };
-        const pricingMetadata = (0, import_usage_metadata.getUsagePricingMetadata)({
-          provider: modelInfo.provider,
-          model: modelInfo.model,
-          tokenUsage
-        });
-        this.services.sessionManager.accumulateTokenUsage(
-          this.id,
-          tokenUsage,
-          payload.estimatedCost ?? pricingMetadata.estimatedCost,
-          modelInfo
-        ).catch((err) => {
+      const tokenUsage = (0, import_usage_metadata.normalizeTokenUsageForAccounting)(payload.tokenUsage);
+      const llmConfig = this.services.stateManager.getLLMConfig(this.id);
+      const isChatGPTLogin = llmConfig.provider === "openai-compatible" && (0, import_codex_base_url.parseCodexBaseURL)(llmConfig.baseURL)?.authMode === "chatgpt";
+      const hasMeaningfulUsage = (0, import_usage_metadata.hasMeaningfulTokenUsage)(tokenUsage);
+      if (isChatGPTLogin && !hasMeaningfulUsage) {
+        this.services.sessionManager.markUntrackedChatGPTLoginUsage(this.id).catch((err) => {
           this.logger.warn(
-            `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
+            `Failed to mark ChatGPT Login usage as untracked: ${err instanceof Error ? err.message : String(err)}`
           );
         });
+        return;
       }
+      const modelInfo = {
+        provider: payload.provider,
+        model: payload.model
+      };
+      const pricingMetadata = (0, import_usage_metadata.getUsagePricingMetadata)({
+        provider: modelInfo.provider,
+        model: modelInfo.model,
+        tokenUsage
+      });
+      this.services.sessionManager.accumulateTokenUsage(
+        this.id,
+        tokenUsage,
+        payload.estimatedCost ?? pricingMetadata.estimatedCost,
+        modelInfo
+      ).catch((err) => {
+        this.logger.warn(
+          `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
+        );
+      });
     };
     this.eventBus.on("llm:response", this.tokenAccumulatorListener);
   }
@@ -215,8 +224,9 @@ class ChatSession {
       content: [{ type: "text", text: "[Blocked by content policy: input redacted]" }]
     };
     const errorContent = `Error: ${errorMessage}`;
+    const assistantMessageId = (0, import_crypto.randomUUID)();
     const assistantMessage = {
-      id: (0, import_crypto.randomUUID)(),
+      id: assistantMessageId,
       role: "assistant",
       timestamp: timestamp + 1,
       content: [{ type: "text", text: errorContent }]
@@ -224,11 +234,16 @@ class ChatSession {
     await this.conversationStore.saveMessage({ sessionId: this.id, message: userMessage });
     await this.conversationStore.saveMessage({ sessionId: this.id, message: assistantMessage });
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-    this.eventBus.emit("llm:response", {
+    this.eventBus.emit("interaction:blocked", {
       content: errorContent,
       provider: llmConfig.provider,
       model: llmConfig.model,
-      ...assistantMessage.id && { messageId: assistantMessage.id }
+      messageId: assistantMessageId
+    });
+    this.eventBus.emit("run:complete", {
+      finishReason: "stop",
+      stepCount: 0,
+      durationMs: 0
     });
   }
   normalizeContent(content) {

package/dist/session/chat-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAA2B,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACH,eAAe,EACf,aAAa,EAGhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEpF,MAAM,MAAM,0BAA0B,GAChC;IACI,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,eAAe,CAAC;CAChC,GACD;IACI,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAER;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,qBAAa,WAAW;IAgEhB,OAAO,CAAC,QAAQ;aAiBA,EAAE,EAAE,MAAM;IAhF9B;;;;;;;;;;OAUG;IACH,SAAgB,QAAQ,EAAE,eAAe,CAAC;IAE1C;;;OAGG;IACH,OAAO,CAAC,iBAAiB,CAAqB;IAE9C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAAoB;IAEtC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,aAAa,CAAuB;IAE5C,OAAO,CAAC,sBAAsB,CAA6B;IAE3D;;OAEG;IACH,OAAO,CAAC,wBAAwB,CACvB;IAET;;;OAGG;IACH,OAAO,CAAC,oBAAoB,CAAgC;IAE5D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B;;;;;;;;;;;OAWG;gBAES,QAAQ,EAAE;QACd,YAAY,EAAE,iBAAiB,CAAC;QAChC,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,WAAW,EAAE,WAAW,CAAC;QACzB,aAAa,EAAE,aAAa,CAAC;QAC7B,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,CAAC;QACjE,WAAW,EAAE,WAAW,CAAC;QACzB,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,OAAO,sBAAsB,EAAE,cAAc,CAAC;QAC9D,eAAe,EAAE,wBAAwB,CAAC;QAC1C,kBAAkB,EAAE,wBAAwB,CAAC;QAC7C,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;QACtC,gBAAgB,CAAC,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC;QACtE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAC;KACjD,EACe,EAAE,EAAE,MAAM,EAC1B,MAAM,EAAE,MAAM;IA0BlB;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,OAAO,CAAC,wBAAwB;IAmBhC;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAiD9B;;OAEG;YACW,kBAAkB;YAelB,uBAAuB;IA4BrC;;;;;;;;;;OAUG;YACW,sBAAsB;IAiDpC,OAAO,CAAC,gBAAgB;YAIV,gBAAgB;YAmEhB,wBAAwB;IA8BtC;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,MAAM,CACf,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,UAAU,CAAC,EAAE,eAAe,CAAC;KAChC,GACF,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAyGf,gBAAgB,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,UAAU,CAAC;IAiDrF,OAAO,CAAC,cAAc;IA8DtB;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,UAAU;IAIvB;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;;;OAIG;IACI,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAInD;;;;OAIG;IACI,aAAa,IAAI,gBAAgB;IAIxC;;;;;;;;;;;;;;;;;;OAkBG;IACU,SAAS,CAAC,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvE;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBrC;;;;;;OAMG;IACI,OAAO,IAAI,IAAI;IAetB;;;OAGG;IACI,MAAM,IAAI,OAAO;IAIxB;;;;;;OAMG;IACU,KAAK,CACd,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAI1D;;;;;OAKG;IACU,QAAQ,CACjB,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IAI1D;;;OAGG;IACI,gBAAgB,IAAI,aAAa,EAAE;IAI1C;;;OAGG;IACI,mBAAmB,IAAI,aAAa,EAAE;IAI7C;;;;OAIG;IACU,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7D;;;;OAIG;IACU,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/C;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAOlD;;;OAGG;IACU,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAQjD;;;OAGG;IACI,MAAM,IAAI,OAAO;CAa3B"}

package/dist/session/chat-session.js

@@ -11,8 +11,10 @@ import { HookErrorCode } from "../hooks/error-codes.js";
 import { MessageQueueService } from "./message-queue.js";
 import {
   getUsagePricingMetadata,
+  hasMeaningfulTokenUsage,
   normalizeTokenUsageForAccounting
 } from "../llm/usage-metadata.js";
+import { parseCodexBaseURL } from "../llm/providers/codex-base-url.js";
 import { SessionError } from "./errors.js";
 class ChatSession {
   /**
@@ -118,29 +120,37 @@ class ChatSession {
    */
   setupTokenAccumulation() {
     this.tokenAccumulatorListener = (payload) => {
-      if (payload.tokenUsage) {
-        const tokenUsage = normalizeTokenUsageForAccounting(payload.tokenUsage);
-        const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-        const modelInfo = {
-          provider: payload.provider ?? llmConfig.provider,
-          model: payload.model ?? llmConfig.model
-        };
-        const pricingMetadata = getUsagePricingMetadata({
-          provider: modelInfo.provider,
-          model: modelInfo.model,
-          tokenUsage
-        });
-        this.services.sessionManager.accumulateTokenUsage(
-          this.id,
-          tokenUsage,
-          payload.estimatedCost ?? pricingMetadata.estimatedCost,
-          modelInfo
-        ).catch((err) => {
+      const tokenUsage = normalizeTokenUsageForAccounting(payload.tokenUsage);
+      const llmConfig = this.services.stateManager.getLLMConfig(this.id);
+      const isChatGPTLogin = llmConfig.provider === "openai-compatible" && parseCodexBaseURL(llmConfig.baseURL)?.authMode === "chatgpt";
+      const hasMeaningfulUsage = hasMeaningfulTokenUsage(tokenUsage);
+      if (isChatGPTLogin && !hasMeaningfulUsage) {
+        this.services.sessionManager.markUntrackedChatGPTLoginUsage(this.id).catch((err) => {
           this.logger.warn(
-            `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
+            `Failed to mark ChatGPT Login usage as untracked: ${err instanceof Error ? err.message : String(err)}`
           );
         });
+        return;
       }
+      const modelInfo = {
+        provider: payload.provider,
+        model: payload.model
+      };
+      const pricingMetadata = getUsagePricingMetadata({
+        provider: modelInfo.provider,
+        model: modelInfo.model,
+        tokenUsage
+      });
+      this.services.sessionManager.accumulateTokenUsage(
+        this.id,
+        tokenUsage,
+        payload.estimatedCost ?? pricingMetadata.estimatedCost,
+        modelInfo
+      ).catch((err) => {
+        this.logger.warn(
+          `Failed to accumulate token usage: ${err instanceof Error ? err.message : String(err)}`
+        );
+      });
     };
     this.eventBus.on("llm:response", this.tokenAccumulatorListener);
   }
@@ -199,8 +209,9 @@ class ChatSession {
       content: [{ type: "text", text: "[Blocked by content policy: input redacted]" }]
     };
     const errorContent = `Error: ${errorMessage}`;
+    const assistantMessageId = randomUUID();
     const assistantMessage = {
-      id: randomUUID(),
+      id: assistantMessageId,
       role: "assistant",
       timestamp: timestamp + 1,
       content: [{ type: "text", text: errorContent }]
@@ -208,11 +219,16 @@ class ChatSession {
     await this.conversationStore.saveMessage({ sessionId: this.id, message: userMessage });
     await this.conversationStore.saveMessage({ sessionId: this.id, message: assistantMessage });
     const llmConfig = this.services.stateManager.getLLMConfig(this.id);
-    this.eventBus.emit("llm:response", {
+    this.eventBus.emit("interaction:blocked", {
       content: errorContent,
       provider: llmConfig.provider,
       model: llmConfig.model,
-      ...assistantMessage.id && { messageId: assistantMessage.id }
+      messageId: assistantMessageId
+    });
+    this.eventBus.emit("run:complete", {
+      finishReason: "stop",
+      stepCount: 0,
+      durationMs: 0
     });
   }
   normalizeContent(content) {

package/dist/session/title-generator.cjs

@@ -53,9 +53,12 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
     });
     const processed = postProcessTitle(result.text);
     if (!processed) {
-      return { error: "LLM returned empty title" };
+      return {
+        error: "LLM returned empty title",
+        usage: toSessionTitleTokenUsage(result.totalUsage)
+      };
     }
-    return { title: processed };
+    return { title: processed, usage: toSessionTitleTokenUsage(result.totalUsage) };
   } catch (error) {
     if (controller?.signal.aborted) {
       return { timedOut: true, error: "Timed out while waiting for LLM response" };
@@ -68,6 +71,20 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
     }
   }
 }
+function toSessionTitleTokenUsage(usage) {
+  const tokenUsage = {};
+  copyTokenUsageNumber(tokenUsage, "cachedInputTokens", usage.cachedInputTokens);
+  copyTokenUsageNumber(tokenUsage, "inputTokens", usage.inputTokens);
+  copyTokenUsageNumber(tokenUsage, "outputTokens", usage.outputTokens);
+  copyTokenUsageNumber(tokenUsage, "reasoningTokens", usage.reasoningTokens);
+  copyTokenUsageNumber(tokenUsage, "totalTokens", usage.totalTokens);
+  return tokenUsage;
+}
+function copyTokenUsageNumber(target, key, value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    target[key] = value;
+  }
+}
 function deriveHeuristicTitle(userText) {
   const sanitized = sanitizeUserText(userText, 120);
   if (!sanitized) return void 0;

package/dist/session/title-generator.d.ts

@@ -1,10 +1,18 @@
 import type { ValidatedLLMConfig } from '../llm/schemas.js';
 import type { Logger } from '../logger/v2/types.js';
 import type { DextoProviderContext, LanguageModelFactory } from '../llm/services/types.js';
+export interface GenerateSessionTitleTokenUsage {
+    cachedInputTokens?: number;
+    inputTokens?: number;
+    outputTokens?: number;
+    reasoningTokens?: number;
+    totalTokens?: number;
+}
 export interface GenerateSessionTitleResult {
     title?: string;
     error?: string;
     timedOut?: boolean;
+    usage?: GenerateSessionTitleTokenUsage;
 }
 /**
  * Generate a concise title for a chat based on the first user message.

package/dist/session/title-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IACF,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,0BAA0B,CAAC,CAgDrC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8BzE"}
+{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,WAAW,8BAA8B;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,8BAA8B,CAAC;CAC1C;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IACF,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,0BAA0B,CAAC,CAmDrC;AAsBD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8BzE"}