@office-ai/aioncli-core 0.26.0 → 0.30.1

package/dist/src/core/loggingContentGenerator.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, } from '../telemetry/types.js';
@@ -9,6 +9,7 @@ import { CodeAssistServer } from '../code_assist/server.js';
 import { toContents } from '../code_assist/converter.js';
 import { isStructuredError } from '../utils/quotaErrorDetection.js';
 import { runInDevTraceSpan } from '../telemetry/trace.js';
+import { debugLogger } from '../utils/debugLogger.js';
 /**
  * A decorator that wraps a ContentGenerator to add logging to API calls.
  */
@@ -22,14 +23,20 @@ export class LoggingContentGenerator {
     getWrapped() {
         return this.wrapped;
     }
-    logApiRequest(contents, model, promptId, generationConfig, serverDetails) {
+    get userTier() {
+        return this.wrapped.userTier;
+    }
+    get userTierName() {
+        return this.wrapped.userTierName;
+    }
+    logApiRequest(contents, model, promptId, role, generationConfig, serverDetails) {
         const requestText = JSON.stringify(contents);
         logApiRequest(this.config, new ApiRequestEvent(model, {
             prompt_id: promptId,
             contents,
             generate_content_config: generationConfig,
             server: serverDetails,
-        }, requestText));
+        }, requestText, role));
     }
     _getEndpointUrl(req, method) {
         // Case 1: Authenticated with a Google account (`gcloud auth login`).
@@ -58,7 +65,7 @@ export class LoggingContentGenerator {
         // This is used when an API key is provided but not for Vertex AI.
         return { address: `generativelanguage.googleapis.com`, port: 443 };
     }
-    _logApiResponse(requestContents, durationMs, model, prompt_id, responseId, responseCandidates, usageMetadata, responseText, generationConfig, serverDetails) {
+    _logApiResponse(requestContents, durationMs, model, prompt_id, role, responseId, responseCandidates, usageMetadata, responseText, generationConfig, serverDetails) {
         logApiResponse(this.config, new ApiResponseEvent(model, durationMs, {
             prompt_id,
             contents: requestContents,
@@ -67,9 +74,9 @@ export class LoggingContentGenerator {
         }, {
             candidates: responseCandidates,
             response_id: responseId,
-        }, this.config.getContentGeneratorConfig()?.authType, usageMetadata, responseText));
+        }, this.config.getContentGeneratorConfig()?.authType, usageMetadata, responseText, role));
     }
-    _logApiError(durationMs, error, model, prompt_id, requestContents, generationConfig, serverDetails) {
+    _logApiError(durationMs, error, model, prompt_id, requestContents, role, generationConfig, serverDetails) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         const errorType = error instanceof Error ? error.name : 'unknown';
         logApiError(this.config, new ApiErrorEvent(model, errorMessage, durationMs, {
@@ -78,10 +85,11 @@ export class LoggingContentGenerator {
             generate_content_config: generationConfig,
             server: serverDetails,
         }, this.config.getContentGeneratorConfig()?.authType, errorType, isStructuredError(error)
-            ? error.status
-            : undefined));
+            ? // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                error.status
+            : undefined, role));
     }
-    async generateContent(req, userPromptId) {
+    async generateContent(req, userPromptId, role) {
         return runInDevTraceSpan({
             name: 'generateContent',
         }, async ({ metadata: spanMetadata }) => {
@@ -89,31 +97,34 @@ export class LoggingContentGenerator {
             const startTime = Date.now();
             const contents = toContents(req.contents);
             const serverDetails = this._getEndpointUrl(req, 'generateContent');
-            this.logApiRequest(contents, req.model, userPromptId, req.config, serverDetails);
+            this.logApiRequest(contents, req.model, userPromptId, role, req.config, serverDetails);
             try {
-                const response = await this.wrapped.generateContent(req, userPromptId);
+                const response = await this.wrapped.generateContent(req, userPromptId, role);
                 spanMetadata.output = {
                     response,
                     usageMetadata: response.usageMetadata,
                 };
                 const durationMs = Date.now() - startTime;
-                this._logApiResponse(contents, durationMs, response.modelVersion || req.model, userPromptId, response.responseId, response.candidates, response.usageMetadata, JSON.stringify({
+                this._logApiResponse(contents, durationMs, response.modelVersion || req.model, userPromptId, role, response.responseId, response.candidates, response.usageMetadata, JSON.stringify({
                     candidates: response.candidates,
                     usageMetadata: response.usageMetadata,
                     responseId: response.responseId,
                     modelVersion: response.modelVersion,
                     promptFeedback: response.promptFeedback,
                 }), req.config, serverDetails);
+                this.config
+                    .refreshUserQuotaIfStale()
+                    .catch((e) => debugLogger.debug('quota refresh failed', e));
                 return response;
             }
             catch (error) {
                 const durationMs = Date.now() - startTime;
-                this._logApiError(durationMs, error, req.model, userPromptId, contents, req.config, serverDetails);
+                this._logApiError(durationMs, error, req.model, userPromptId, contents, role, req.config, serverDetails);
                 throw error;
             }
         });
     }
-    async generateContentStream(req, userPromptId) {
+    async generateContentStream(req, userPromptId, role) {
         return runInDevTraceSpan({
             name: 'generateContentStream',
             noAutoEnd: true,
@@ -121,20 +132,25 @@ export class LoggingContentGenerator {
             spanMetadata.input = { request: req, userPromptId, model: req.model };
             const startTime = Date.now();
             const serverDetails = this._getEndpointUrl(req, 'generateContentStream');
-            this.logApiRequest(toContents(req.contents), req.model, userPromptId, req.config, serverDetails);
+            // For debugging: Capture the latest main agent request payload.
+            // Main agent prompt IDs end with exactly 8 hashes and a turn counter (e.g. "...########1")
+            if (/########\d+$/.test(userPromptId)) {
+                this.config.setLatestApiRequest(req);
+            }
+            this.logApiRequest(toContents(req.contents), req.model, userPromptId, role, req.config, serverDetails);
             let stream;
             try {
-                stream = await this.wrapped.generateContentStream(req, userPromptId);
+                stream = await this.wrapped.generateContentStream(req, userPromptId, role);
             }
             catch (error) {
                 const durationMs = Date.now() - startTime;
-                this._logApiError(durationMs, error, req.model, userPromptId, toContents(req.contents), req.config, serverDetails);
+                this._logApiError(durationMs, error, req.model, userPromptId, toContents(req.contents), role, req.config, serverDetails);
                 throw error;
             }
-            return this.loggingStreamWrapper(req, stream, startTime, userPromptId, spanMetadata, endSpan);
+            return this.loggingStreamWrapper(req, stream, startTime, userPromptId, role, spanMetadata, endSpan);
         });
     }
-    async *loggingStreamWrapper(req, stream, startTime, userPromptId, spanMetadata, endSpan) {
+    async *loggingStreamWrapper(req, stream, startTime, userPromptId, role, spanMetadata, endSpan) {
         const responses = [];
         let lastUsageMetadata;
         const serverDetails = this._getEndpointUrl(req, 'generateContentStream');
@@ -149,13 +165,16 @@ export class LoggingContentGenerator {
             }
             // Only log successful API response if no error occurred
             const durationMs = Date.now() - startTime;
-            this._logApiResponse(requestContents, durationMs, responses[0]?.modelVersion || req.model, userPromptId, responses[0]?.responseId, responses.flatMap((response) => response.candidates || []), lastUsageMetadata, JSON.stringify(responses.map((r) => ({
+            this._logApiResponse(requestContents, durationMs, responses[0]?.modelVersion || req.model, userPromptId, role, responses[0]?.responseId, responses.flatMap((response) => response.candidates || []), lastUsageMetadata, JSON.stringify(responses.map((r) => ({
                 candidates: r.candidates,
                 usageMetadata: r.usageMetadata,
                 responseId: r.responseId,
                 modelVersion: r.modelVersion,
                 promptFeedback: r.promptFeedback,
             }))), req.config, serverDetails);
+            this.config
+                .refreshUserQuotaIfStale()
+                .catch((e) => debugLogger.debug('quota refresh failed', e));
             spanMetadata.output = {
                 streamChunks: responses.map((r) => ({
                     content: r.candidates?.[0]?.content ?? null,
@@ -167,7 +186,7 @@ export class LoggingContentGenerator {
         catch (error) {
             spanMetadata.error = error;
             const durationMs = Date.now() - startTime;
-            this._logApiError(durationMs, error, responses[0]?.modelVersion || req.model, userPromptId, requestContents, req.config, serverDetails);
+            this._logApiError(durationMs, error, responses[0]?.modelVersion || req.model, userPromptId, requestContents, role, req.config, serverDetails);
             throw error;
         }
         finally {

package/dist/src/core/loggingContentGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"loggingContentGenerator.js","sourceRoot":"","sources":["../../../src/core/loggingContentGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loggingContentGenerator.js","sourceRoot":"","sources":["../../../src/core/loggingContentGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAeH,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAqB,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAMtD;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAEf;IACA;IAFnB,YACmB,OAAyB,EACzB,MAAc;QADd,YAAO,GAAP,OAAO,CAAkB;QACzB,WAAM,GAAN,MAAM,CAAQ;IAC9B,CAAC;IAEJ,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC;IAEO,aAAa,CACnB,QAAmB,EACnB,KAAa,EACb,QAAgB,EAChB,IAAa,EACb,gBAAwC,EACxC,aAA6B;QAE7B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC7C,aAAa,CACX,IAAI,CAAC,MAAM,EACX,IAAI,eAAe,CACjB,KAAK,EACL;YACE,SAAS,EAAE,QAAQ;YACnB,QAAQ;YACR,uBAAuB,EAAE,gBAAgB;YACzC,MAAM,EAAE,aAAa;SACtB,EACD,WAAW,EACX,IAAI,CACL,CACF,CAAC;IACJ,CAAC;IAEO,eAAe,CACrB,GAA8B,EAC9B,MAAmD;QAEnD,qEAAqE;QACrE,6DAA6D;QAC7D,IAAI,IAAI,CAAC,OAAO,YAAY,gBAAgB,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI;gBACnB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;gBACxB,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ;oBACzB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,EAAE,CAAC;YACT,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QACzC,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,CAAC;QAE1D,0CAA0C;QAC1C,IAAI,SAAS,EAAE,QAAQ,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACtD,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,EAAE,OAAO,EAAE,GAAG,QAAQ,4BAA4B,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,kEAAkE;QAClE,OAAO,EAAE,OAAO,EAAE,mCAAmC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACrE,CAAC;IAEO,eAAe,CACrB,eAA0B,EAC1B,UAAkB,EAClB,KAAa,EACb,SAAiB,EACjB,IAAa,EACb,UAA8B,EAC9B,kBAAgC,EAChC,aAAoD,EACpD,YAAqB,EACrB,gBAAwC,EACxC,aAA6B;QAE7B,cAAc,CACZ,IAAI,CAAC,MAAM,EACX,IAAI,gBAAgB,CAClB,KAAK,EACL,UAAU,EACV;YACE,SAAS;YACT,QAAQ,EAAE,eAAe;YACzB,uBAAuB,EAAE,gBAAgB;YACzC,MAAM,EAAE,aAAa;SACtB,EACD;YACE,UAAU,EAAE,kBAAkB;YAC9B,WAAW,EAAE,UAAU;SACxB,EACD,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EACjD,aAAa,EACb,YAAY,EACZ,IAAI,CACL,CACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAClB,UAAkB,EAClB,KAAc,EACd,KAAa,EACb,SAAiB,EACjB,eAA0B,EAC1B,IAAa,EACb,gBAAwC,EACxC,aAA6B;QAE7B,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAElE,WAAW,CACT,IAAI,CAAC,MAAM,EACX,IAAI,aAAa,CACf,KAAK,EACL,YAAY,EACZ,UAAU,EACV;YACE,SAAS;YACT,QAAQ,EAAE,eAAe;YACzB,uBAAuB,EAAE,gBAAgB;YACzC,MAAM,EAAE,aAAa;SACtB,EACD,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EACjD,SAAS,EACT,iBAAiB,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,uEAAuE;gBACtE,KAAyB,CAAC,MAAM;YACnC,CAAC,CAAC,SAAS,EACb,IAAI,CACL,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAA8B,EAC9B,YAAoB,EACpB,IAAa;QAEb,OAAO,iBAAiB,CACtB;YACE,IAAI,EAAE,iBAAiB;SACxB,EACD,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;YACnC,YAAY,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC;YAEtE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAc,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;YACnE,IAAI,CAAC,aAAa,CAChB,QAAQ,EACR,GAAG,CAAC,KAAK,EACT,YAAY,EACZ,IAAI,EACJ,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;YAEF,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CACjD,GAAG,EACH,YAAY,EACZ,IAAI,CACL,CAAC;gBACF,YAAY,CAAC,MAAM,GAAG;oBACpB,QAAQ;oBACR,aAAa,EAAE,QAAQ,CAAC,aAAa;iBACtC,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,IAAI,CAAC,eAAe,CAClB,QAAQ,EACR,UAAU,EACV,QAAQ,CAAC,YAAY,IAAI,GAAG,CAAC,KAAK,EAClC,YAAY,EACZ,IAAI,EACJ,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,aAAa,EACtB,IAAI,CAAC,SAAS,CAAC;oBACb,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,aAAa,EAAE,QAAQ,CAAC,aAAa;oBACrC,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,YAAY,EAAE,QAAQ,CAAC,YAAY;oBACnC,cAAc,EAAE,QAAQ,CAAC,cAAc;iBACxC,CAAC,EACF,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;gBACF,IAAI,CAAC,MAAM;qBACR,uBAAuB,EAAE;qBACzB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9D,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,UAAU,EACV,KAAK,EACL,GAAG,CAAC,KAAK,EACT,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;gBACF,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,GAA8B,EAC9B,YAAoB,EACpB,IAAa;QAEb,OAAO,iBAAiB,CACtB;YACE,IAAI,EAAE,uBAAuB;YAC7B,SAAS,EAAE,IAAI;SAChB,EACD,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE;YAC5C,YAAY,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC;YACtE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CACxC,GAAG,EACH,uBAAuB,CACxB,CAAC;YAEF,gEAAgE;YAChE,2FAA2F;YAC3F,IAAI,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,CAAC,aAAa,CAChB,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EACxB,GAAG,CAAC,KAAK,EACT,YAAY,EACZ,IAAI,EACJ,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;YAEF,IAAI,MAA+C,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAC/C,GAAG,EACH,YAAY,EACZ,IAAI,CACL,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,UAAU,EACV,KAAK,EACL,GAAG,CAAC,KAAK,EACT,YAAY,EACZ,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EACxB,IAAI,EACJ,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;gBACF,MAAM,KAAK,CAAC;YACd,CAAC;YAED,OAAO,IAAI,CAAC,oBAAoB,CAC9B,GAAG,EACH,MAAM,EACN,SAAS,EACT,YAAY,EACZ,IAAI,EACJ,YAAY,EACZ,OAAO,CACR,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,CAAC,oBAAoB,CACjC,GAA8B,EAC9B,MAA+C,EAC/C,SAAiB,EACjB,YAAoB,EACpB,IAAa,EACb,YAA0B,EAC1B,OAAmB;QAEnB,MAAM,SAAS,GAA8B,EAAE,CAAC;QAEhD,IAAI,iBAAmE,CAAC;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;QACzE,MAAM,eAAe,GAAc,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;gBACpC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACzB,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;oBAC3B,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC;gBAC7C,CAAC;gBACD,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,wDAAwD;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAC1C,IAAI,CAAC,eAAe,CAClB,eAAe,EACf,UAAU,EACV,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI,GAAG,CAAC,KAAK,EACvC,YAAY,EACZ,IAAI,EACJ,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EACxB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,EAC1D,iBAAiB,EACjB,IAAI,CAAC,SAAS,CACZ,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpB,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,cAAc,EAAE,CAAC,CAAC,cAAc;aACjC,CAAC,CAAC,CACJ,EACD,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;YACF,IAAI,CAAC,MAAM;iBACR,uBAAuB,EAAE;iBACzB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9D,YAAY,CAAC,MAAM,GAAG;gBACpB,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAClC,OAAO,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,IAAI;iBAC5C,CAAC,CAAC;gBACH,aAAa,EAAE,iBAAiB;gBAChC,UAAU;aACX,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;YAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAC1C,IAAI,CAAC,YAAY,CACf,UAAU,EACV,KAAK,EACL,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI,GAAG,CAAC,KAAK,EACvC,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,GAAG,CAAC,MAAM,EACV,aAAa,CACd,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAA0B;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,GAA2B;QAE3B,OAAO,iBAAiB,CACtB;YACE,IAAI,EAAE,cAAc;SACrB,EACD,KAAK,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;YACnC,YAAY,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACpD,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/core/loggingContentGenerator.test.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 export {};

package/dist/src/core/loggingContentGenerator.test.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 const logApiRequest = vi.hoisted(() => vi.fn());
@@ -17,7 +17,8 @@ vi.mock('../telemetry/trace.js', () => ({
 }));
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import { ApiRequestEvent } from '../telemetry/types.js';
+import { UserTierId } from '../code_assist/types.js';
+import { ApiRequestEvent, LlmRole } from '../telemetry/types.js';
 describe('LoggingContentGenerator', () => {
     let wrapped;
     let config;
@@ -35,6 +36,7 @@ describe('LoggingContentGenerator', () => {
             getContentGeneratorConfig: vi.fn().mockReturnValue({
                 authType: 'API_KEY',
             }),
+            refreshUserQuotaIfStale: vi.fn().mockResolvedValue(undefined),
         };
         loggingContentGenerator = new LoggingContentGenerator(wrapped, config);
         vi.useFakeTimers();
@@ -66,10 +68,10 @@ describe('LoggingContentGenerator', () => {
             vi.mocked(wrapped.generateContent).mockResolvedValue(response);
             const startTime = new Date('2025-01-01T00:00:00.000Z');
             vi.setSystemTime(startTime);
-            const promise = loggingContentGenerator.generateContent(req, userPromptId);
+            const promise = loggingContentGenerator.generateContent(req, userPromptId, LlmRole.MAIN);
             vi.advanceTimersByTime(1000);
             await promise;
-            expect(wrapped.generateContent).toHaveBeenCalledWith(req, userPromptId);
+            expect(wrapped.generateContent).toHaveBeenCalledWith(req, userPromptId, LlmRole.MAIN);
             expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
             const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
             expect(responseEvent.duration_ms).toBe(1000);
@@ -84,7 +86,7 @@ describe('LoggingContentGenerator', () => {
             vi.mocked(wrapped.generateContent).mockRejectedValue(error);
             const startTime = new Date('2025-01-01T00:00:00.000Z');
             vi.setSystemTime(startTime);
-            const promise = loggingContentGenerator.generateContent(req, userPromptId);
+            const promise = loggingContentGenerator.generateContent(req, userPromptId, LlmRole.MAIN);
             vi.advanceTimersByTime(1000);
             await expect(promise).rejects.toThrow(error);
             expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
@@ -113,12 +115,12 @@ describe('LoggingContentGenerator', () => {
             vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
             const startTime = new Date('2025-01-01T00:00:00.000Z');
             vi.setSystemTime(startTime);
-            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
+            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId, LlmRole.MAIN);
             vi.advanceTimersByTime(1000);
             for await (const _ of stream) {
                 // consume stream
             }
-            expect(wrapped.generateContentStream).toHaveBeenCalledWith(req, userPromptId);
+            expect(wrapped.generateContentStream).toHaveBeenCalledWith(req, userPromptId, LlmRole.MAIN);
             expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
             const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
             expect(responseEvent.duration_ms).toBe(1000);
@@ -136,7 +138,7 @@ describe('LoggingContentGenerator', () => {
             vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
             const startTime = new Date('2025-01-01T00:00:00.000Z');
             vi.setSystemTime(startTime);
-            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
+            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId, LlmRole.MAIN);
             vi.advanceTimersByTime(1000);
             await expect(async () => {
                 for await (const _ of stream) {
@@ -147,6 +149,36 @@ describe('LoggingContentGenerator', () => {
             const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
             expect(errorEvent.duration_ms).toBe(1000);
         });
+        it('should set latest API request in config for main agent requests', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            // Main agent prompt IDs end with exactly 8 hashes and a turn counter
+            const mainAgentPromptId = 'session-uuid########1';
+            config.setLatestApiRequest = vi.fn();
+            async function* createAsyncGenerator() {
+                yield { candidates: [] };
+            }
+            vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+            await loggingContentGenerator.generateContentStream(req, mainAgentPromptId, LlmRole.MAIN);
+            expect(config.setLatestApiRequest).toHaveBeenCalledWith(req);
+        });
+        it('should NOT set latest API request in config for sub-agent requests', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            // Sub-agent prompt IDs contain fewer hashes, typically separating the agent name and ID
+            const subAgentPromptId = 'codebase_investigator#12345';
+            config.setLatestApiRequest = vi.fn();
+            async function* createAsyncGenerator() {
+                yield { candidates: [] };
+            }
+            vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+            await loggingContentGenerator.generateContentStream(req, subAgentPromptId, LlmRole.SUBAGENT);
+            expect(config.setLatestApiRequest).not.toHaveBeenCalled();
+        });
     });
     describe('getWrapped', () => {
         it('should return the wrapped content generator', () => {
@@ -176,5 +208,15 @@ describe('LoggingContentGenerator', () => {
             expect(result).toBe(response);
         });
     });
+    describe('delegation', () => {
+        it('should delegate userTier to wrapped', () => {
+            wrapped.userTier = UserTierId.STANDARD;
+            expect(loggingContentGenerator.userTier).toBe(UserTierId.STANDARD);
+        });
+        it('should delegate userTierName to wrapped', () => {
+            wrapped.userTierName = 'Standard Tier';
+            expect(loggingContentGenerator.userTierName).toBe('Standard Tier');
+        });
+    });
 });
 //# sourceMappingURL=loggingContentGenerator.test.js.map

package/dist/src/core/loggingContentGenerator.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"loggingContentGenerator.test.js","sourceRoot":"","sources":["../../../src/core/loggingContentGenerator.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loggingContentGenerator.test.js","sourceRoot":"","sources":["../../../src/core/loggingContentGenerator.test.ts"],"names":[],"mappings":"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"}

package/dist/src/core/openaiContentGenerator.d.ts

@@ -7,11 +7,13 @@ import type { CountTokensResponse, GenerateContentParameters, CountTokensParamet
 import { GenerateContentResponse } from '@google/genai';
 import type { ContentGenerator } from './contentGenerator.js';
 import OpenAI from 'openai';
+import type { LlmRole } from '../telemetry/llmRole.js';
 import type { Config } from '../config/config.js';
 export declare class OpenAIContentGenerator implements ContentGenerator {
     protected client: OpenAI;
     private model;
     private config;
+    protected readonly isOpenRouter: boolean;
     private streamingToolCalls;
     private streamingReasoningDetails;
     constructor(apiKey: string, model: string, config: Config);
@@ -37,8 +39,8 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
      * Check if an error is a timeout error
      */
     private isTimeoutError;
-    generateContent(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
-    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    generateContent(request: GenerateContentParameters, userPromptId: string, _role?: LlmRole): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string, _role?: LlmRole): Promise<AsyncGenerator<GenerateContentResponse>>;
     private streamGenerator;
     /**
      * Combine streaming responses for logging purposes

package/dist/src/core/openaiContentGenerator.js

@@ -15,6 +15,7 @@ export class OpenAIContentGenerator {
     client;
     model;
     config;
+    isOpenRouter;
     streamingToolCalls = new Map();
     // Store reasoning_details for OpenRouter reasoning models (Gemini 3 Pro, etc.)
     streamingReasoningDetails = null;
@@ -22,6 +23,7 @@ export class OpenAIContentGenerator {
         this.model = model;
         this.config = config;
         const baseURL = process.env['OPENAI_BASE_URL'] || '';
+        this.isOpenRouter = baseURL.includes('openrouter.ai');
         // Configure timeout settings - using progressive timeouts
         const timeoutConfig = {
             // Base timeout for most requests (2 minutes)
@@ -42,11 +44,9 @@ export class OpenAIContentGenerator {
         // Set up User-Agent header (same format as contentGenerator.ts)
         const version = process.env['CLI_VERSION'] || process.version;
         const userAgent = `QwenCode/${version} (${process.platform}; ${process.arch})`;
-        // Check if using OpenRouter and add required headers
-        const isOpenRouter = baseURL.includes('openrouter.ai');
         const defaultHeaders = {
             'User-Agent': userAgent,
-            ...(isOpenRouter
+            ...(this.isOpenRouter
                 ? {
                     'HTTP-Referer': 'https://aionui.com',
                     'X-Title': 'AionUi',
@@ -127,7 +127,7 @@ export class OpenAIContentGenerator {
             errorMessage.includes('request timed out') ||
             errorMessage.includes('deadline exceeded'));
     }
-    async generateContent(request, userPromptId) {
+    async generateContent(request, userPromptId, _role) {
         const startTime = Date.now();
         const messages = this.convertToOpenAIFormat(request);
         try {
@@ -169,9 +169,7 @@ export class OpenAIContentGenerator {
             }
             // Enable reasoning for Gemini 3 models on OpenRouter
             // This ensures reasoning_details are returned and can be preserved
-            const baseURL = this.client?.baseURL || '';
-            const isOpenRouter = baseURL.includes('openrouter.ai');
-            if (isOpenRouter && this.isGeminiReasoningModel()) {
+            if (this.isOpenRouter && this.isGeminiReasoningModel()) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 createParams.reasoning = {
                     // Use 'high' effort for reliable reasoning token generation
@@ -251,7 +249,7 @@ export class OpenAIContentGenerator {
             throw error;
         }
     }
-    async generateContentStream(request, userPromptId) {
+    async generateContentStream(request, userPromptId, _role) {
         const startTime = Date.now();
         const messages = this.convertToOpenAIFormat(request);
         try {
@@ -292,9 +290,7 @@ export class OpenAIContentGenerator {
             }
             // Enable reasoning for Gemini 3 models on OpenRouter
             // This ensures reasoning_details are returned and can be preserved
-            const baseURL = this.client?.baseURL || '';
-            const isOpenRouter = baseURL.includes('openrouter.ai');
-            if (isOpenRouter && this.isGeminiReasoningModel()) {
+            if (this.isOpenRouter && this.isGeminiReasoningModel()) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 createParams.reasoning = {
                     // Use 'high' effort for reliable reasoning token generation
@@ -677,13 +673,12 @@ export class OpenAIContentGenerator {
         const openAITools = [];
         for (const tool of geminiTools) {
             let actualTool;
-            // Handle CallableTool vs Tool
-            if ('tool' in tool) {
-                // This is a CallableTool
+            // Handle CallableTool vs Tool (callable tools expose an async tool() factory)
+            if ('tool' in tool &&
+                typeof tool.tool === 'function') {
                 actualTool = await tool.tool();
             }
             else {
-                // This is already a Tool
                 actualTool = tool;
             }
             if (actualTool.functionDeclarations) {
@@ -830,8 +825,9 @@ export class OpenAIContentGenerator {
                             content: textParts.join('\n') || null,
                             tool_calls: toolCalls,
                         };
-                        // Add reasoning_details if present (required for OpenRouter reasoning models)
-                        if (reasoningDetails) {
+                        // Add reasoning_details only for OpenRouter reasoning models (Gemini 3 Pro, etc.)
+                        // Other providers (MiniMax, DeepSeek, etc.) don't accept this field and return 400
+                        if (reasoningDetails && this.isOpenRouter) {
                             assistantMessage.reasoning_details = reasoningDetails;
                         }
                         messages.push(assistantMessage);
@@ -844,8 +840,11 @@ export class OpenAIContentGenerator {
                         const text = textParts.join('\n');
                         if (text) {
                             const message = { role, content: text };
-                            // Add reasoning_details if present and this is an assistant message
-                            if (role === 'assistant' && reasoningDetails) {
+                            // Add reasoning_details only for OpenRouter reasoning models
+                            // Other providers (MiniMax, DeepSeek, etc.) don't accept this field and return 400
+                            if (role === 'assistant' &&
+                                reasoningDetails &&
+                                this.isOpenRouter) {
                                 message.reasoning_details = reasoningDetails;
                             }
                             messages.push(message);
@@ -1454,14 +1453,23 @@ export class OpenAIContentGenerator {
                 ? { frequency_penalty: configSamplingParams.frequency_penalty }
                 : {}),
         };
-        // Force temperature to 1 for GPT-5 and GPT-4o models if temperature is present
+        // Force temperature to 1 for models/providers that only accept temperature=1.
+        // Some OpenAI-compatible gateways reject any temperature value other than 1 with
+        // `400 invalid temperature: only 1 is allowed for this model`.
         const modelName = this.model.toLowerCase();
-        if ((modelName.includes('gpt-5') ||
+        const isKimiModel = modelName.includes('kimi-k2.5') ||
+            (modelName.includes('kimi') && modelName.includes('k2.5'));
+        const isRestrictedModel = modelName.includes('gpt-5') ||
             modelName.includes('gpt5') ||
             modelName.includes('gpt-4o') ||
-            modelName.includes('gpt4o')) &&
-            params.temperature !== undefined) {
+            modelName.includes('gpt4o') ||
+            isKimiModel;
+        if (isRestrictedModel) {
             params.temperature = 1.0;
+            // Kimi K2.5 models enforce top_p=0.95
+            if (isKimiModel) {
+                params.top_p = 0.95;
+            }
         }
         return params;
     }