@qwen-code/qwen-code 0.15.11-preview.1 → 0.15.11-preview.2

package/cli.js

@@ -21650,7 +21650,7 @@ var init_atomicFileWrite = __esm({
 });
 
 // packages/core/src/telemetry/constants.ts
-var SERVICE_NAME, EVENT_USER_PROMPT, EVENT_USER_RETRY, EVENT_TOOL_CALL, EVENT_API_REQUEST, EVENT_API_ERROR, EVENT_API_CANCEL, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_EXTENSION_UPDATE, EVENT_FLASH_FALLBACK, EVENT_RIPGREP_FALLBACK, EVENT_NEXT_SPEAKER_CHECK, EVENT_SLASH_COMMAND, EVENT_IDE_CONNECTION, EVENT_CHAT_COMPRESSION, EVENT_CONTENT_RETRY, EVENT_CONTENT_RETRY_FAILURE, EVENT_CONVERSATION_FINISHED, EVENT_FILE_OPERATION, EVENT_MODEL_SLASH_COMMAND, EVENT_SUBAGENT_EXECUTION, EVENT_SKILL_LAUNCH, EVENT_AUTH, EVENT_USER_FEEDBACK, EVENT_PROMPT_SUGGESTION, EVENT_SPECULATION, EVENT_ARENA_SESSION_STARTED, EVENT_ARENA_AGENT_COMPLETED, EVENT_ARENA_SESSION_ENDED, EVENT_MEMORY_EXTRACT, EVENT_MEMORY_DREAM, EVENT_MEMORY_RECALL;
+var SERVICE_NAME, EVENT_USER_PROMPT, EVENT_USER_RETRY, EVENT_TOOL_CALL, EVENT_API_REQUEST, EVENT_API_ERROR, EVENT_API_CANCEL, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_EXTENSION_UPDATE, EVENT_FLASH_FALLBACK, EVENT_RIPGREP_FALLBACK, EVENT_NEXT_SPEAKER_CHECK, EVENT_SLASH_COMMAND, EVENT_IDE_CONNECTION, EVENT_CHAT_COMPRESSION, EVENT_CONTENT_RETRY, EVENT_CONTENT_RETRY_FAILURE, EVENT_CONVERSATION_FINISHED, EVENT_FILE_OPERATION, EVENT_MODEL_SLASH_COMMAND, EVENT_SUBAGENT_EXECUTION, EVENT_SKILL_LAUNCH, EVENT_AUTH, EVENT_USER_FEEDBACK, EVENT_PROMPT_SUGGESTION, EVENT_SPECULATION, EVENT_ARENA_SESSION_STARTED, EVENT_ARENA_AGENT_COMPLETED, EVENT_ARENA_SESSION_ENDED, EVENT_MEMORY_EXTRACT, EVENT_MEMORY_DREAM, EVENT_MEMORY_RECALL, SPAN_INTERACTION, SPAN_LLM_REQUEST, SPAN_TOOL, SPAN_TOOL_EXECUTION;
 var init_constants = __esm({
   "packages/core/src/telemetry/constants.ts"() {
     "use strict";
@@ -21692,6 +21692,10 @@ var init_constants = __esm({
     EVENT_MEMORY_EXTRACT = "qwen-code.memory.extract";
     EVENT_MEMORY_DREAM = "qwen-code.memory.dream";
     EVENT_MEMORY_RECALL = "qwen-code.memory.recall";
+    SPAN_INTERACTION = "qwen-code.interaction";
+    SPAN_LLM_REQUEST = "qwen-code.llm_request";
+    SPAN_TOOL = "qwen-code.tool";
+    SPAN_TOOL_EXECUTION = "qwen-code.tool.execution";
   }
 });
 
@@ -139636,14 +139640,14 @@ var require_B3MultiPropagator = __commonJS({
       return "";
     }
     __name(getTraceId, "getTraceId");
-    function getSpanId(carrier, getter) {
+    function getSpanId2(carrier, getter) {
       const spanId = getHeaderValue2(carrier, getter, constants_1.X_B3_SPAN_ID);
       if (typeof spanId === "string") {
         return spanId;
       }
       return "";
     }
-    __name(getSpanId, "getSpanId");
+    __name(getSpanId2, "getSpanId");
     function getDebug(carrier, getter) {
       const debug3 = getHeaderValue2(carrier, getter, constants_1.X_B3_FLAGS);
       return debug3 === "1" ? "1" : void 0;
@@ -139680,7 +139684,7 @@ var require_B3MultiPropagator = __commonJS({
       }
       extract(context2, carrier, getter) {
         const traceId = getTraceId(carrier, getter);
-        const spanId = getSpanId(carrier, getter);
+        const spanId = getSpanId2(carrier, getter);
         const traceFlags = getTraceFlags(carrier, getter);
         const debug3 = getDebug(carrier, getter);
         if ((0, api_1.isValidTraceId)(traceId) && (0, api_1.isValidSpanId)(spanId) && isValidSampledValue(traceFlags)) {
@@ -142436,6 +142440,283 @@ var init_tracer = __esm({
   }
 });
 
+// packages/core/src/telemetry/session-tracing.ts
+import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
+function ensureCleanupInterval() {
+  if (cleanupIntervalStarted) return;
+  cleanupIntervalStarted = true;
+  const interval = setInterval(() => {
+    const cutoff = Date.now() - SPAN_TTL_MS;
+    for (const [spanId, weakRef] of activeSpans) {
+      const ctx = weakRef.deref();
+      if (ctx === void 0) {
+        activeSpans.delete(spanId);
+        strongSpans.delete(spanId);
+      } else if (ctx.startTime < cutoff) {
+        if (!ctx.ended) {
+          ctx.ended = true;
+          ctx.span.end();
+        }
+        activeSpans.delete(spanId);
+        strongSpans.delete(spanId);
+      }
+    }
+  }, 6e4);
+  if (typeof interval.unref === "function") {
+    interval.unref();
+  }
+}
+function getSpanId(span) {
+  return span.spanContext().spanId || "";
+}
+function getTracer() {
+  return trace.getTracer(SERVICE_NAME, "1.0.0");
+}
+function startInteractionSpan(config2, options2) {
+  if (!isTelemetrySdkInitialized()) return;
+  ensureCleanupInterval();
+  interactionSequence++;
+  const attributes = {
+    "session.id": config2.getSessionId(),
+    "qwen-code.prompt_id": options2.promptId,
+    "qwen-code.message_type": options2.messageType,
+    "qwen-code.model": options2.model,
+    "qwen-code.approval_mode": config2.getApprovalMode(),
+    "interaction.sequence": interactionSequence
+  };
+  const span = getTracer().startSpan(SPAN_INTERACTION, {
+    kind: SpanKind.INTERNAL,
+    attributes
+  });
+  const spanId = getSpanId(span);
+  const spanContextObj = {
+    span,
+    startTime: Date.now(),
+    attributes,
+    type: "interaction"
+  };
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  lastInteractionCtx = spanContextObj;
+  interactionContext.enterWith(spanContextObj);
+}
+function endInteractionSpan(status, metadata2) {
+  const spanCtx = interactionContext.getStore() ?? lastInteractionCtx;
+  if (!spanCtx || spanCtx.ended) return;
+  spanCtx.ended = true;
+  lastInteractionCtx = void 0;
+  const duration3 = Date.now() - spanCtx.startTime;
+  spanCtx.span.setAttributes({
+    "interaction.duration_ms": duration3,
+    "qwen-code.turn_status": status
+  });
+  if (status === "error") {
+    spanCtx.span.setStatus({
+      code: SpanStatusCode.ERROR,
+      message: metadata2?.errorMessage ?? "unknown error"
+    });
+  } else {
+    spanCtx.span.setStatus({ code: SpanStatusCode.OK });
+  }
+  spanCtx.span.end();
+  const spanId = getSpanId(spanCtx.span);
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+  interactionContext.enterWith(void 0);
+}
+function startLLMRequestSpan(model, promptId) {
+  if (!isTelemetrySdkInitialized()) {
+    return NOOP_SPAN;
+  }
+  const parentCtx = interactionContext.getStore();
+  const ctx = parentCtx ? trace.setSpan(context.active(), parentCtx.span) : context.active();
+  const attributes = {
+    "qwen-code.model": model,
+    "qwen-code.prompt_id": promptId,
+    "llm_request.context": parentCtx ? "interaction" : "standalone"
+  };
+  const span = getTracer().startSpan(
+    SPAN_LLM_REQUEST,
+    { kind: SpanKind.INTERNAL, attributes },
+    ctx
+  );
+  const spanId = getSpanId(span);
+  const spanContextObj = {
+    span,
+    startTime: Date.now(),
+    attributes,
+    type: "llm_request"
+  };
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  return span;
+}
+function endLLMRequestSpan(span, metadata2) {
+  const spanId = getSpanId(span);
+  const spanCtx = activeSpans.get(spanId)?.deref();
+  if (!spanCtx || spanCtx.ended) return;
+  spanCtx.ended = true;
+  const duration3 = metadata2?.durationMs ?? Date.now() - spanCtx.startTime;
+  const endAttributes = { duration_ms: duration3 };
+  if (metadata2) {
+    if (metadata2.inputTokens !== void 0)
+      endAttributes["input_tokens"] = metadata2.inputTokens;
+    if (metadata2.outputTokens !== void 0)
+      endAttributes["output_tokens"] = metadata2.outputTokens;
+    endAttributes["success"] = metadata2.success;
+    if (metadata2.error !== void 0) endAttributes["error"] = metadata2.error;
+  }
+  span.setAttributes(endAttributes);
+  if (metadata2 === void 0 || metadata2.success) {
+    span.setStatus({ code: SpanStatusCode.OK });
+  } else {
+    span.setStatus({
+      code: SpanStatusCode.ERROR,
+      message: metadata2.error ?? "unknown error"
+    });
+  }
+  span.end();
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+}
+function startToolSpan(toolName, attrs) {
+  if (!isTelemetrySdkInitialized()) {
+    return NOOP_SPAN;
+  }
+  const parentCtx = interactionContext.getStore();
+  const ctx = parentCtx ? trace.setSpan(context.active(), parentCtx.span) : context.active();
+  const attributes = {
+    "tool.name": toolName,
+    ...attrs
+  };
+  const span = getTracer().startSpan(
+    SPAN_TOOL,
+    { kind: SpanKind.INTERNAL, attributes },
+    ctx
+  );
+  const spanId = getSpanId(span);
+  const spanContextObj = {
+    span,
+    startTime: Date.now(),
+    attributes,
+    type: "tool"
+  };
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  return span;
+}
+function endToolSpan(span, metadata2) {
+  const spanId = getSpanId(span);
+  const spanCtx = activeSpans.get(spanId)?.deref();
+  if (!spanCtx || spanCtx.ended) return;
+  spanCtx.ended = true;
+  const duration3 = Date.now() - spanCtx.startTime;
+  const endAttributes = { duration_ms: duration3 };
+  if (metadata2) {
+    if (metadata2.success !== void 0)
+      endAttributes["success"] = metadata2.success;
+    if (metadata2.error !== void 0) endAttributes["error"] = metadata2.error;
+  }
+  spanCtx.span.setAttributes(endAttributes);
+  if (metadata2?.success !== false) {
+    spanCtx.span.setStatus({ code: SpanStatusCode.OK });
+  } else {
+    spanCtx.span.setStatus({
+      code: SpanStatusCode.ERROR,
+      message: metadata2?.error ?? "tool error"
+    });
+  }
+  spanCtx.span.end();
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+}
+function startToolExecutionSpan(parentToolSpan) {
+  if (!isTelemetrySdkInitialized()) {
+    return NOOP_SPAN;
+  }
+  const ctx = trace.setSpan(context.active(), parentToolSpan);
+  const span = getTracer().startSpan(
+    SPAN_TOOL_EXECUTION,
+    { kind: SpanKind.INTERNAL },
+    ctx
+  );
+  const spanId = getSpanId(span);
+  const spanContextObj = {
+    span,
+    startTime: Date.now(),
+    attributes: {},
+    type: "tool.execution"
+  };
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  return span;
+}
+function endToolExecutionSpan(span, metadata2) {
+  const spanId = getSpanId(span);
+  const spanCtx = activeSpans.get(spanId)?.deref();
+  if (!spanCtx || spanCtx.ended) return;
+  spanCtx.ended = true;
+  const duration3 = Date.now() - spanCtx.startTime;
+  const endAttributes = { duration_ms: duration3 };
+  if (metadata2) {
+    if (metadata2.success !== void 0)
+      endAttributes["success"] = metadata2.success;
+    if (metadata2.error !== void 0) endAttributes["error"] = metadata2.error;
+  }
+  spanCtx.span.setAttributes(endAttributes);
+  if (metadata2?.success !== false) {
+    spanCtx.span.setStatus({ code: SpanStatusCode.OK });
+  } else {
+    spanCtx.span.setStatus({
+      code: SpanStatusCode.ERROR,
+      message: metadata2?.error ?? "tool execution error"
+    });
+  }
+  spanCtx.span.end();
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+}
+function clearSessionTracingForTesting() {
+  activeSpans.clear();
+  strongSpans.clear();
+  interactionContext.enterWith(void 0);
+  interactionSequence = 0;
+  lastInteractionCtx = void 0;
+}
+var NOOP_SPAN, interactionContext, activeSpans, strongSpans, interactionSequence, lastInteractionCtx, cleanupIntervalStarted, SPAN_TTL_MS;
+var init_session_tracing = __esm({
+  "packages/core/src/telemetry/session-tracing.ts"() {
+    "use strict";
+    init_esbuild_shims();
+    init_esm();
+    init_constants();
+    init_sdk();
+    NOOP_SPAN = trace.wrapSpanContext({
+      traceId: "0".repeat(32),
+      spanId: "0".repeat(16),
+      traceFlags: 0
+    });
+    interactionContext = new AsyncLocalStorage4();
+    activeSpans = /* @__PURE__ */ new Map();
+    strongSpans = /* @__PURE__ */ new Map();
+    interactionSequence = 0;
+    cleanupIntervalStarted = false;
+    SPAN_TTL_MS = 30 * 60 * 1e3;
+    __name(ensureCleanupInterval, "ensureCleanupInterval");
+    __name(getSpanId, "getSpanId");
+    __name(getTracer, "getTracer");
+    __name(startInteractionSpan, "startInteractionSpan");
+    __name(endInteractionSpan, "endInteractionSpan");
+    __name(startLLMRequestSpan, "startLLMRequestSpan");
+    __name(endLLMRequestSpan, "endLLMRequestSpan");
+    __name(startToolSpan, "startToolSpan");
+    __name(endToolSpan, "endToolSpan");
+    __name(startToolExecutionSpan, "startToolExecutionSpan");
+    __name(endToolExecutionSpan, "endToolExecutionSpan");
+    __name(clearSessionTracingForTesting, "clearSessionTracingForTesting");
+  }
+});
+
 // packages/core/src/telemetry/sdk.ts
 function createTelemetryDiagLogger() {
   const debugLogger192 = createDebugLogger("OTEL");
@@ -142617,6 +142898,7 @@ async function shutdownTelemetry() {
   if (!telemetryInitialized || !sdk) {
     return;
   }
+  endInteractionSpan("cancelled");
   const currentSdk = sdk;
   const debugLogger192 = createDebugLogger("OTEL");
   telemetryShutdownPromise = (async () => {
@@ -142688,6 +142970,7 @@ var init_sdk = __esm({
     init_log_to_span_processor();
     init_tracer();
     init_session_context();
+    init_session_tracing();
     __name(createTelemetryDiagLogger, "createTelemetryDiagLogger");
     diag2.setLogger(createTelemetryDiagLogger(), DiagLogLevel.WARN);
     OTLP_SIGNAL_PATHS = {
@@ -147547,13 +147830,13 @@ var init_converter = __esm({
 });
 
 // packages/core/src/core/openaiContentGenerator/requestCaptureContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage5 } from "node:async_hooks";
 var openaiRequestCaptureContext;
 var init_requestCaptureContext = __esm({
   "packages/core/src/core/openaiContentGenerator/requestCaptureContext.ts"() {
     "use strict";
     init_esbuild_shims();
-    openaiRequestCaptureContext = new AsyncLocalStorage4();
+    openaiRequestCaptureContext = new AsyncLocalStorage5();
   }
 });
 
@@ -147646,6 +147929,11 @@ var init_esm_node = __esm({
 import * as path16 from "node:path";
 import { promises as fs19 } from "node:fs";
 import * as os7 from "os";
+function sanitizePromptIdForFilename(promptId) {
+  if (!promptId || !isInternalPromptId(promptId)) return void 0;
+  const sanitized = promptId.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+  return sanitized || void 0;
+}
 var debugLogger12, OpenAILogger, openaiLogger;
 var init_openaiLogger = __esm({
   "packages/core/src/utils/openaiLogger.ts"() {
@@ -147653,7 +147941,9 @@ var init_openaiLogger = __esm({
     init_esbuild_shims();
     init_esm_node();
     init_debugLogger();
+    init_internalPromptIds();
     debugLogger12 = createDebugLogger("OPENAI_LOGGER");
+    __name(sanitizePromptIdForFilename, "sanitizePromptIdForFilename");
     OpenAILogger = class {
       static {
         __name(this, "OpenAILogger");
@@ -147699,15 +147989,18 @@ var init_openaiLogger = __esm({
        * @param request The request sent to OpenAI
        * @param response The response received from OpenAI
        * @param error Optional error if the request failed
+       * @param promptId Optional prompt id; internal prompt ids are appended to
+       *                 the filename after timestamp and id.
        * @returns The file path where the log was written
        */
-      async logInteraction(request4, response, error40) {
+      async logInteraction(request4, response, error40, promptId) {
         if (!this.initialized) {
           await this.initialize();
         }
         const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-");
         const id = v4_default().slice(0, 8);
-        const filename = `openai-${timestamp}-${id}.json`;
+        const promptIdSuffix = sanitizePromptIdForFilename(promptId);
+        const filename = promptIdSuffix ? `openai-${timestamp}-${id}-${promptIdSuffix}.json` : `openai-${timestamp}-${id}.json`;
         const filePath = path16.join(this.logDir, filename);
         const logData = {
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -147891,7 +148184,7 @@ var init_loggingContentGenerator = __esm({
           async (span) => {
             const startTime = Date.now();
             const isInternal = isInternalPromptId(userPromptId);
-            const session = this.startCaptureSession(isInternal);
+            const session = this.startCaptureSession();
             try {
               if (!isInternal) {
                 this.logApiRequest(
@@ -147913,18 +148206,15 @@ var init_loggingContentGenerator = __esm({
                 response.usageMetadata,
                 responseText
               );
-              if (!isInternal) {
-                try {
-                  await this.safelyLogOpenAIInteraction(
-                    await session.resolve(req),
-                    response
-                  );
-                } catch (loggingError) {
-                  debugLogger13.warn(
-                    "Failed to log OpenAI interaction:",
-                    loggingError
-                  );
-                }
+              try {
+                await this.safelyLogOpenAIInteraction(
+                  await session.resolve(req),
+                  response,
+                  void 0,
+                  userPromptId
+                );
+              } catch (loggingError) {
+                debugLogger13.warn("Failed to log OpenAI interaction:", loggingError);
               }
               return response;
             } catch (error40) {
@@ -147936,19 +148226,15 @@ var init_loggingContentGenerator = __esm({
                 req.model,
                 userPromptId
               );
-              if (!isInternal) {
-                try {
-                  await this.safelyLogOpenAIInteraction(
-                    await session.resolve(req),
-                    void 0,
-                    error40
-                  );
-                } catch (loggingError) {
-                  debugLogger13.warn(
-                    "Failed to log OpenAI interaction:",
-                    loggingError
-                  );
-                }
+              try {
+                await this.safelyLogOpenAIInteraction(
+                  await session.resolve(req),
+                  void 0,
+                  error40,
+                  userPromptId
+                );
+              } catch (loggingError) {
+                debugLogger13.warn("Failed to log OpenAI interaction:", loggingError);
               }
               safeSetStatus(span, {
                 code: SpanStatusCode.ERROR,
@@ -147967,7 +148253,7 @@ var init_loggingContentGenerator = __esm({
         const spanContext = trace.setSpan(context.active(), span);
         const startTime = Date.now();
         const isInternal = isInternalPromptId(userPromptId);
-        const session = this.startCaptureSession(isInternal);
+        const session = this.startCaptureSession();
         let stream5;
         try {
           stream5 = await runInContext(async () => {
@@ -147995,21 +148281,20 @@ var init_loggingContentGenerator = __esm({
             span.end();
           } catch {
           }
-          if (!isInternal) {
-            try {
-              await this.safelyLogOpenAIInteraction(
-                await session.resolve(req),
-                void 0,
-                error40
-              );
-            } catch (loggingError) {
-              debugLogger13.warn("Failed to log OpenAI interaction:", loggingError);
-            }
+          try {
+            await this.safelyLogOpenAIInteraction(
+              await session.resolve(req),
+              void 0,
+              error40,
+              userPromptId
+            );
+          } catch (loggingError) {
+            debugLogger13.warn("Failed to log OpenAI interaction:", loggingError);
           }
           throw error40;
         }
         let resolvedRequest;
-        if (!isInternal) {
+        if (this.openaiLogger) {
           try {
             resolvedRequest = await session.resolve(req);
           } catch (loggingError) {
@@ -148028,18 +148313,19 @@ var init_loggingContentGenerator = __esm({
           )
         );
       }
-      startCaptureSession(isInternal) {
+      startCaptureSession() {
         let captured;
-        const skipCapture = isInternal || !this.openaiLogger;
+        const skipCapture = !this.openaiLogger;
         return {
           wrap: /* @__PURE__ */ __name((fn) => skipCapture ? fn() : openaiRequestCaptureContext.run((built) => {
             captured = built;
           }, fn), "wrap"),
-          resolve: /* @__PURE__ */ __name(async (req) => captured ?? await this.buildOpenAIRequestForLogging(req), "resolve")
+          resolve: /* @__PURE__ */ __name(async (req) => this.openaiLogger ? captured ?? await this.buildOpenAIRequestForLogging(req) : void 0, "resolve")
         };
       }
       async *loggingStreamWrapper(stream5, startTime, userPromptId, model, openaiRequest, span, spanContext) {
         const isInternal = isInternalPromptId(userPromptId);
+        const shouldCollectResponses = !isInternal || !!this.openaiLogger;
         const responses = [];
         let firstResponseId = "";
         let firstModelVersion = "";
@@ -148054,7 +148340,7 @@ var init_loggingContentGenerator = __esm({
             if (!firstModelVersion && response.modelVersion) {
               firstModelVersion = response.modelVersion;
             }
-            if (!isInternal) {
+            if (shouldCollectResponses) {
               responses.push(response);
             }
             if (response.usageMetadata) {
@@ -148063,7 +148349,7 @@ var init_loggingContentGenerator = __esm({
             yield response;
           }
           const durationMs = Date.now() - startTime;
-          const consolidatedResponse = isInternal ? void 0 : this.consolidateGeminiResponsesForLogging(responses);
+          const consolidatedResponse = shouldCollectResponses ? this.consolidateGeminiResponsesForLogging(responses) : void 0;
           runInSpan(
             () => this.safelyLogApiResponse(
               firstResponseId,
@@ -148071,14 +148357,17 @@ var init_loggingContentGenerator = __esm({
               firstModelVersion || model,
               userPromptId,
               lastUsageMetadata,
-              this.extractResponseText(consolidatedResponse)
+              isInternal ? void 0 : this.extractResponseText(consolidatedResponse)
+            )
+          );
+          await runInSpan(
+            () => this.safelyLogOpenAIInteraction(
+              openaiRequest,
+              consolidatedResponse,
+              void 0,
+              userPromptId
             )
           );
-          if (!isInternal) {
-            await runInSpan(
-              () => this.safelyLogOpenAIInteraction(openaiRequest, consolidatedResponse)
-            );
-          }
           terminalStatusAttempted = true;
           if (span) {
             safeSetStatus(span, { code: SpanStatusCode.OK });
@@ -148094,11 +148383,14 @@ var init_loggingContentGenerator = __esm({
               userPromptId
             )
           );
-          if (!isInternal) {
-            await runInSpan(
-              () => this.safelyLogOpenAIInteraction(openaiRequest, void 0, error40)
-            );
-          }
+          await runInSpan(
+            () => this.safelyLogOpenAIInteraction(
+              openaiRequest,
+              void 0,
+              error40,
+              userPromptId
+            )
+          );
           terminalStatusAttempted = true;
           if (span) {
             safeSetStatus(span, {
@@ -148165,7 +148457,7 @@ var init_loggingContentGenerator = __esm({
           startTime: 0
         };
       }
-      async logOpenAIInteraction(openaiRequest, response, error40) {
+      async logOpenAIInteraction(openaiRequest, response, error40, promptId) {
         if (!this.openaiLogger || !openaiRequest) {
           return;
         }
@@ -148173,12 +148465,13 @@ var init_loggingContentGenerator = __esm({
         await this.openaiLogger.logInteraction(
           openaiRequest,
           openaiResponse,
-          error40 instanceof Error ? error40 : error40 ? new Error(String(error40)) : void 0
+          error40 instanceof Error ? error40 : error40 ? new Error(String(error40)) : void 0,
+          promptId
         );
       }
-      async safelyLogOpenAIInteraction(openaiRequest, response, error40) {
+      async safelyLogOpenAIInteraction(openaiRequest, response, error40, promptId) {
         try {
-          await this.logOpenAIInteraction(openaiRequest, response, error40);
+          await this.logOpenAIInteraction(openaiRequest, response, error40, promptId);
         } catch (loggingError) {
           debugLogger13.warn("Failed to log OpenAI interaction:", loggingError);
         }
@@ -174155,7 +174448,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.15.11-preview.1";
+  const version2 = "0.15.11-preview.2";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -182417,6 +182710,7 @@ var init_telemetry = __esm({
     init_metrics2();
     init_qwen_logger();
     init_sanitize();
+    init_session_tracing();
     TelemetryTarget = /* @__PURE__ */ ((TelemetryTarget2) => {
       TelemetryTarget2["GCP"] = "gcp";
       TelemetryTarget2["LOCAL"] = "local";
@@ -182517,7 +182811,7 @@ var init_store = __esm({
 });
 
 // packages/core/src/agents/runtime/agent-context.ts
-import { AsyncLocalStorage as AsyncLocalStorage5 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage6 } from "node:async_hooks";
 function runWithAgentContext(agentId, fn) {
   const current = storage.getStore() ?? {};
   return storage.run({ ...current, agentId }, fn);
@@ -182537,7 +182831,7 @@ var init_agent_context = __esm({
   "packages/core/src/agents/runtime/agent-context.ts"() {
     "use strict";
     init_esbuild_shims();
-    storage = new AsyncLocalStorage5();
+    storage = new AsyncLocalStorage6();
     __name(runWithAgentContext, "runWithAgentContext");
     __name(runWithRuntimeContentGenerator, "runWithRuntimeContentGenerator");
     __name(getCurrentAgentId, "getCurrentAgentId");
@@ -226042,7 +226336,7 @@ ${userMemory.trim()}`;
 });
 
 // packages/core/src/tools/agent/fork-subagent.ts
-import { AsyncLocalStorage as AsyncLocalStorage6 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage7 } from "node:async_hooks";
 function runInForkContext(fn) {
   return forkExecutionStorage.run({ marker: true }, fn);
 }
@@ -226125,7 +226419,7 @@ var init_fork_subagent = __esm({
       systemPrompt: "You are a forked worker process. Follow the directive in the conversation history. Execute tasks directly using available tools. Do not spawn sub-agents.",
       level: "session"
     };
-    forkExecutionStorage = new AsyncLocalStorage6();
+    forkExecutionStorage = new AsyncLocalStorage7();
     __name(runInForkContext, "runInForkContext");
     __name(isInForkExecution, "isInForkExecution");
     FORK_PLACEHOLDER_RESULT = "Fork started \u2014 processing in background";
@@ -242206,13 +242500,13 @@ var init_nextSpeakerChecker = __esm({
 });
 
 // packages/core/src/utils/promptIdContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage7 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage8 } from "node:async_hooks";
 var promptIdContext;
 var init_promptIdContext = __esm({
   "packages/core/src/utils/promptIdContext.ts"() {
     "use strict";
     init_esbuild_shims();
-    promptIdContext = new AsyncLocalStorage7();
+    promptIdContext = new AsyncLocalStorage8();
   }
 });
 
@@ -242813,310 +243107,355 @@ var init_client4 = __esm({
         if (messageType === "notification" /* Notification */) {
           this.config.getChatRecordingService()?.recordNotification(request4, options2?.notificationDisplayText);
         }
-        if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */ || messageType === "notification" /* Notification */) {
+        const isTopLevelInteraction = messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */ || messageType === "notification" /* Notification */;
+        if (isTopLevelInteraction) {
           this.loopDetector.reset(prompt_id);
           this.lastPromptId = prompt_id;
+          startInteractionSpan(this.config, {
+            promptId: prompt_id,
+            model: options2?.modelOverride ?? this.config.getModel(),
+            messageType
+          });
         }
-        if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */) {
-          if (this.config.getManagedAutoMemoryEnabled()) {
-            const recallAbortController = new AbortController();
-            const rawRecallPromise = this.config.getMemoryManager().recall(this.config.getProjectRoot(), partToString(request4), {
-              config: this.config,
-              excludedFilePaths: this.surfacedRelevantAutoMemoryPaths,
-              abortSignal: recallAbortController.signal
-            }).catch((error40) => {
-              if (error40 instanceof DOMException && error40.name === "AbortError") {
-                debugLogger61.debug(
-                  "Auto-memory recall aborted by deadline.",
-                  error40
-                );
-              } else {
-                debugLogger61.warn(
-                  "Managed auto-memory recall prefetch failed.",
-                  error40
-                );
-              }
-              return EMPTY_RELEVANT_AUTO_MEMORY_RESULT;
-            });
-            this.pendingRecallAbortController = recallAbortController;
-            relevantAutoMemoryPromise = resolveAutoMemoryWithDeadline(
-              rawRecallPromise,
-              () => recallAbortController.abort()
+        try {
+          if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */) {
+            if (this.config.getManagedAutoMemoryEnabled()) {
+              const recallAbortController = new AbortController();
+              const rawRecallPromise = this.config.getMemoryManager().recall(this.config.getProjectRoot(), partToString(request4), {
+                config: this.config,
+                excludedFilePaths: this.surfacedRelevantAutoMemoryPaths,
+                abortSignal: recallAbortController.signal
+              }).catch((error40) => {
+                if (error40 instanceof DOMException && error40.name === "AbortError") {
+                  debugLogger61.debug(
+                    "Auto-memory recall aborted by deadline.",
+                    error40
+                  );
+                } else {
+                  debugLogger61.warn(
+                    "Managed auto-memory recall prefetch failed.",
+                    error40
+                  );
+                }
+                return EMPTY_RELEVANT_AUTO_MEMORY_RESULT;
+              });
+              this.pendingRecallAbortController = recallAbortController;
+              relevantAutoMemoryPromise = resolveAutoMemoryWithDeadline(
+                rawRecallPromise,
+                () => recallAbortController.abort()
+              );
+            }
+            const attributionService = CommitAttributionService.getInstance();
+            if (messageType === "userQuery" /* UserQuery */) {
+              attributionService.incrementPromptCount();
+            }
+            if (messageType === "cron" /* Cron */) {
+              this.config.getChatRecordingService()?.recordCronPrompt(request4, options2?.notificationDisplayText);
+            } else {
+              this.config.getChatRecordingService()?.recordUserMessage(request4);
+            }
+            const mcResult = microcompactHistory(
+              this.getChat().getHistory(),
+              this.lastApiCompletionTimestamp,
+              this.config.getClearContextOnIdle()
             );
+            if (mcResult.meta) {
+              this.getChat().setHistory(mcResult.history);
+              debugLogger61.debug("[FILE_READ_CACHE] clear after microcompaction");
+              this.config.getFileReadCache().clear();
+              const m3 = mcResult.meta;
+              debugLogger61.debug(
+                `[TIME-BASED MC] gap ${m3.gapMinutes}min > ${m3.thresholdMinutes}min, cleared ${m3.toolsCleared} tool results (~${m3.tokensSaved} tokens), kept last ${m3.toolsKept}`
+              );
+            }
           }
-          const attributionService = CommitAttributionService.getInstance();
-          if (messageType === "userQuery" /* UserQuery */) {
-            attributionService.incrementPromptCount();
-          }
-          if (messageType === "cron" /* Cron */) {
-            this.config.getChatRecordingService()?.recordCronPrompt(request4, options2?.notificationDisplayText);
-          } else {
-            this.config.getChatRecordingService()?.recordUserMessage(request4);
-          }
-          const mcResult = microcompactHistory(
-            this.getChat().getHistory(),
-            this.lastApiCompletionTimestamp,
-            this.config.getClearContextOnIdle()
-          );
-          if (mcResult.meta) {
-            this.getChat().setHistory(mcResult.history);
-            debugLogger61.debug("[FILE_READ_CACHE] clear after microcompaction");
-            this.config.getFileReadCache().clear();
-            const m3 = mcResult.meta;
-            debugLogger61.debug(
-              `[TIME-BASED MC] gap ${m3.gapMinutes}min > ${m3.thresholdMinutes}min, cleared ${m3.toolsCleared} tool results (~${m3.tokensSaved} tokens), kept last ${m3.toolsKept}`
+          if (messageType !== "retry" /* Retry */) {
+            this.config.getChatRecordingService()?.recordAttributionSnapshot(
+              CommitAttributionService.getInstance().toSnapshot()
             );
+            this.sessionTurnCount++;
+            if (this.config.getMaxSessionTurns() > 0 && this.sessionTurnCount > this.config.getMaxSessionTurns()) {
+              this.pendingRecallAbortController?.abort();
+              this.pendingRecallAbortController = void 0;
+              yield { type: "max_session_turns" /* MaxSessionTurns */ };
+              if (isTopLevelInteraction)
+                endInteractionSpan("error", {
+                  errorMessage: "max session turns exceeded"
+                });
+              return new Turn(this.getChat(), prompt_id);
+            }
           }
-        }
-        if (messageType !== "retry" /* Retry */) {
-          this.config.getChatRecordingService()?.recordAttributionSnapshot(
-            CommitAttributionService.getInstance().toSnapshot()
-          );
-          this.sessionTurnCount++;
-          if (this.config.getMaxSessionTurns() > 0 && this.sessionTurnCount > this.config.getMaxSessionTurns()) {
-            this.pendingRecallAbortController?.abort();
-            this.pendingRecallAbortController = void 0;
-            yield { type: "max_session_turns" /* MaxSessionTurns */ };
-            return new Turn(this.getChat(), prompt_id);
-          }
-        }
-        const boundedTurns = Math.min(turns, MAX_TURNS2);
-        if (!boundedTurns) {
-          this.pendingRecallAbortController?.abort();
-          this.pendingRecallAbortController = void 0;
-          return new Turn(this.getChat(), prompt_id);
-        }
-        const sessionTokenLimit = this.config.getSessionTokenLimit();
-        if (sessionTokenLimit > 0) {
-          const lastPromptTokenCount = uiTelemetryService.getLastPromptTokenCount();
-          if (lastPromptTokenCount > sessionTokenLimit) {
+          const boundedTurns = Math.min(turns, MAX_TURNS2);
+          if (!boundedTurns) {
             this.pendingRecallAbortController?.abort();
             this.pendingRecallAbortController = void 0;
-            yield {
-              type: "session_token_limit_exceeded" /* SessionTokenLimitExceeded */,
-              value: {
-                currentTokens: lastPromptTokenCount,
-                limit: sessionTokenLimit,
-                message: `Session token limit exceeded: ${lastPromptTokenCount} tokens > ${sessionTokenLimit} limit. Please start a new session or increase the sessionTokenLimit in your settings.json.`
-              }
-            };
+            if (isTopLevelInteraction)
+              endInteractionSpan("error", { errorMessage: "max turns exhausted" });
             return new Turn(this.getChat(), prompt_id);
           }
-        }
-        const history = this.getHistory();
-        const lastMessage = history.length > 0 ? history[history.length - 1] : void 0;
-        const hasPendingToolCall = !!lastMessage && lastMessage.role === "model" && (lastMessage.parts?.some((p2) => "functionCall" in p2) || false);
-        if (this.config.getIdeMode() && !hasPendingToolCall) {
-          const { contextParts, newIdeContext } = this.getIdeContextParts(
-            this.forceFullIdeContext || history.length === 0
-          );
-          if (contextParts.length > 0) {
-            this.getChat().addHistory({
-              role: "user",
-              parts: [{ text: contextParts.join("\n") }]
-            });
+          const sessionTokenLimit = this.config.getSessionTokenLimit();
+          if (sessionTokenLimit > 0) {
+            const lastPromptTokenCount = uiTelemetryService.getLastPromptTokenCount();
+            if (lastPromptTokenCount > sessionTokenLimit) {
+              this.pendingRecallAbortController?.abort();
+              this.pendingRecallAbortController = void 0;
+              yield {
+                type: "session_token_limit_exceeded" /* SessionTokenLimitExceeded */,
+                value: {
+                  currentTokens: lastPromptTokenCount,
+                  limit: sessionTokenLimit,
+                  message: `Session token limit exceeded: ${lastPromptTokenCount} tokens > ${sessionTokenLimit} limit. Please start a new session or increase the sessionTokenLimit in your settings.json.`
+                }
+              };
+              if (isTopLevelInteraction)
+                endInteractionSpan("error", {
+                  errorMessage: "session token limit exceeded"
+                });
+              return new Turn(this.getChat(), prompt_id);
+            }
           }
-          this.lastSentIdeContext = newIdeContext;
-          this.forceFullIdeContext = false;
-        }
-        const arenaAgentClient = this.config.getArenaAgentClient();
-        if (arenaAgentClient) {
-          const controlSignal = await arenaAgentClient.checkControlSignal();
-          if (controlSignal) {
-            debugLogger61.info(
-              `Arena control signal received: ${controlSignal.type} - ${controlSignal.reason}`
+          const history = this.getHistory();
+          const lastMessage = history.length > 0 ? history[history.length - 1] : void 0;
+          const hasPendingToolCall = !!lastMessage && lastMessage.role === "model" && (lastMessage.parts?.some((p2) => "functionCall" in p2) || false);
+          if (this.config.getIdeMode() && !hasPendingToolCall) {
+            const { contextParts, newIdeContext } = this.getIdeContextParts(
+              this.forceFullIdeContext || history.length === 0
             );
-            await arenaAgentClient.reportCancelled();
-            this.pendingRecallAbortController?.abort();
-            this.pendingRecallAbortController = void 0;
-            return new Turn(this.getChat(), prompt_id);
+            if (contextParts.length > 0) {
+              this.getChat().addHistory({
+                role: "user",
+                parts: [{ text: contextParts.join("\n") }]
+              });
+            }
+            this.lastSentIdeContext = newIdeContext;
+            this.forceFullIdeContext = false;
           }
-        }
-        const turn = new Turn(this.getChat(), prompt_id);
-        const model = options2?.modelOverride ?? this.config.getModel();
-        let requestToSent = await flatMapTextParts(request4, async (text) => [text]);
-        if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */) {
-          const systemReminders = [];
-          this.pendingRecallAbortController = void 0;
-          const relevantAutoMemory = relevantAutoMemoryPromise ? await relevantAutoMemoryPromise : EMPTY_RELEVANT_AUTO_MEMORY_RESULT;
-          const relevantAutoMemoryPrompt = relevantAutoMemory.prompt;
-          if (relevantAutoMemoryPrompt) {
-            systemReminders.push(relevantAutoMemoryPrompt);
-            for (const doc of relevantAutoMemory.selectedDocs) {
-              this.surfacedRelevantAutoMemoryPaths.add(doc.filePath);
-            }
-          }
-          const hasAgentTool = await this.config.getToolRegistry().ensureTool(ToolNames.AGENT);
-          const subagents = (await this.config.getSubagentManager().listSubagents()).filter((subagent) => subagent.level !== "builtin").map((subagent) => subagent.name);
-          if (hasAgentTool && subagents.length > 0) {
-            systemReminders.push(getSubagentSystemReminder(subagents));
-          }
-          if (this.config.getApprovalMode() === "plan" /* PLAN */) {
-            systemReminders.push(
-              getPlanModeSystemReminder(this.config.getSdkMode())
-            );
+          const arenaAgentClient = this.config.getArenaAgentClient();
+          if (arenaAgentClient) {
+            const controlSignal = await arenaAgentClient.checkControlSignal();
+            if (controlSignal) {
+              debugLogger61.info(
+                `Arena control signal received: ${controlSignal.type} - ${controlSignal.reason}`
+              );
+              await arenaAgentClient.reportCancelled();
+              this.pendingRecallAbortController?.abort();
+              this.pendingRecallAbortController = void 0;
+              if (isTopLevelInteraction) endInteractionSpan("cancelled");
+              return new Turn(this.getChat(), prompt_id);
+            }
           }
-          const arenaManager = this.config.getArenaManager();
-          if (arenaManager) {
-            try {
-              const sessionDir = arenaManager.getArenaSessionDir();
-              const configPath = `${sessionDir}/config.json`;
-              systemReminders.push(getArenaSystemReminder(configPath));
-            } catch {
+          const turn = new Turn(this.getChat(), prompt_id);
+          const model = options2?.modelOverride ?? this.config.getModel();
+          let requestToSent = await flatMapTextParts(request4, async (text) => [
+            text
+          ]);
+          if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */) {
+            const systemReminders = [];
+            this.pendingRecallAbortController = void 0;
+            const relevantAutoMemory = relevantAutoMemoryPromise ? await relevantAutoMemoryPromise : EMPTY_RELEVANT_AUTO_MEMORY_RESULT;
+            const relevantAutoMemoryPrompt = relevantAutoMemory.prompt;
+            if (relevantAutoMemoryPrompt) {
+              systemReminders.push(relevantAutoMemoryPrompt);
+              for (const doc of relevantAutoMemory.selectedDocs) {
+                this.surfacedRelevantAutoMemoryPaths.add(doc.filePath);
+              }
+            }
+            const hasAgentTool = await this.config.getToolRegistry().ensureTool(ToolNames.AGENT);
+            const subagents = (await this.config.getSubagentManager().listSubagents()).filter((subagent) => subagent.level !== "builtin").map((subagent) => subagent.name);
+            if (hasAgentTool && subagents.length > 0) {
+              systemReminders.push(getSubagentSystemReminder(subagents));
+            }
+            if (this.config.getApprovalMode() === "plan" /* PLAN */) {
+              systemReminders.push(
+                getPlanModeSystemReminder(this.config.getSdkMode())
+              );
+            }
+            const arenaManager = this.config.getArenaManager();
+            if (arenaManager) {
+              try {
+                const sessionDir = arenaManager.getArenaSessionDir();
+                const configPath = `${sessionDir}/config.json`;
+                systemReminders.push(getArenaSystemReminder(configPath));
+              } catch {
+              }
             }
+            requestToSent = [...systemReminders, ...requestToSent];
           }
-          requestToSent = [...systemReminders, ...requestToSent];
-        }
-        const resultStream = turn.run(model, requestToSent, signal);
-        for await (const event of resultStream) {
-          if (!this.config.getSkipLoopDetection()) {
-            if (this.loopDetector.addAndCheck(event)) {
-              const loopType = this.loopDetector.getLastLoopType();
-              yield {
-                type: "loop_detected" /* LoopDetected */,
-                ...loopType && { value: { loopType } }
-              };
+          const resultStream = turn.run(model, requestToSent, signal);
+          for await (const event of resultStream) {
+            if (!this.config.getSkipLoopDetection()) {
+              if (this.loopDetector.addAndCheck(event)) {
+                const loopType = this.loopDetector.getLastLoopType();
+                yield {
+                  type: "loop_detected" /* LoopDetected */,
+                  ...loopType && { value: { loopType } }
+                };
+                if (arenaAgentClient) {
+                  await arenaAgentClient.reportError("Loop detected");
+                }
+                this.lastApiCompletionTimestamp = Date.now();
+                if (isTopLevelInteraction)
+                  endInteractionSpan("error", { errorMessage: "loop detected" });
+                return turn;
+              }
+            }
+            if (arenaAgentClient && event.type === "finished" /* Finished */) {
+              await arenaAgentClient.updateStatus();
+            }
+            if (event.type === "chat_compressed" /* ChatCompressed */) {
+              this.forceFullIdeContext = true;
+            }
+            yield event;
+            if (event.type === "error" /* Error */) {
               if (arenaAgentClient) {
-                await arenaAgentClient.reportError("Loop detected");
+                const errorMsg = event.value instanceof Error ? event.value.message : "Unknown error";
+                await arenaAgentClient.reportError(errorMsg);
               }
               this.lastApiCompletionTimestamp = Date.now();
+              if (isTopLevelInteraction) {
+                const errMsg = event.value instanceof Error ? "[API error]" : "unknown error";
+                endInteractionSpan("error", { errorMessage: errMsg });
+              }
               return turn;
             }
           }
-          if (arenaAgentClient && event.type === "finished" /* Finished */) {
-            await arenaAgentClient.updateStatus();
-          }
-          if (event.type === "chat_compressed" /* ChatCompressed */) {
-            this.forceFullIdeContext = true;
-          }
-          yield event;
-          if (event.type === "error" /* Error */) {
-            if (arenaAgentClient) {
-              const errorMsg = event.value instanceof Error ? event.value.message : "Unknown error";
-              await arenaAgentClient.reportError(errorMsg);
-            }
-            this.lastApiCompletionTimestamp = Date.now();
-            return turn;
-          }
-        }
-        this.lastApiCompletionTimestamp = Date.now();
-        if (hooksEnabled && messageBus && !turn.pendingToolCalls.length && signal && !signal.aborted && this.config.hasHooksForEvent("Stop")) {
-          const history2 = this.getHistory();
-          const lastModelMessage = history2.filter((msg) => msg.role === "model").pop();
-          const responseText = lastModelMessage?.parts?.filter((p2) => "text" in p2).map((p2) => p2.text).join("") || "[no response text]";
-          const response = await messageBus.request(
-            {
-              type: "hook-execution-request" /* HOOK_EXECUTION_REQUEST */,
-              eventName: "Stop",
-              input: {
-                stop_hook_active: true,
-                last_assistant_message: responseText
+          this.lastApiCompletionTimestamp = Date.now();
+          if (hooksEnabled && messageBus && !turn.pendingToolCalls.length && signal && !signal.aborted && this.config.hasHooksForEvent("Stop")) {
+            const history2 = this.getHistory();
+            const lastModelMessage = history2.filter((msg) => msg.role === "model").pop();
+            const responseText = lastModelMessage?.parts?.filter((p2) => "text" in p2).map((p2) => p2.text).join("") || "[no response text]";
+            const response = await messageBus.request(
+              {
+                type: "hook-execution-request" /* HOOK_EXECUTION_REQUEST */,
+                eventName: "Stop",
+                input: {
+                  stop_hook_active: true,
+                  last_assistant_message: responseText
+                },
+                signal
               },
-              signal
-            },
-            "hook-execution-response" /* HOOK_EXECUTION_RESPONSE */
-          );
-          if (signal.aborted) {
-            return turn;
-          }
-          const hookOutput = response.output ? createHookOutput("Stop", response.output) : void 0;
-          const stopOutput = hookOutput;
-          if (stopOutput?.systemMessage) {
-            yield {
-              type: "hook_system_message" /* HookSystemMessage */,
-              value: stopOutput.systemMessage
-            };
-          }
-          if (stopOutput?.isBlockingDecision() || stopOutput?.shouldStopExecution()) {
+              "hook-execution-response" /* HOOK_EXECUTION_RESPONSE */
+            );
             if (signal.aborted) {
+              if (isTopLevelInteraction) endInteractionSpan("cancelled");
               return turn;
             }
-            const continueReason = stopOutput.getEffectiveReason();
-            const currentIterationCount = (options2?.stopHookState?.iterationCount ?? 0) + 1;
-            const currentReasons = [
-              ...options2?.stopHookState?.reasons ?? [],
-              continueReason
-            ];
-            if (currentIterationCount > 1) {
+            const hookOutput = response.output ? createHookOutput("Stop", response.output) : void 0;
+            const stopOutput = hookOutput;
+            if (stopOutput?.systemMessage) {
               yield {
-                type: "stop_hook_loop" /* StopHookLoop */,
-                value: {
-                  iterationCount: currentIterationCount,
-                  reasons: currentReasons,
-                  stopHookCount: response.stopHookCount ?? 1
-                }
+                type: "hook_system_message" /* HookSystemMessage */,
+                value: stopOutput.systemMessage
               };
             }
-            const continueRequest = [{ text: continueReason }];
-            return yield* this.sendMessageStream(
-              continueRequest,
+            if (stopOutput?.isBlockingDecision() || stopOutput?.shouldStopExecution()) {
+              if (signal.aborted) {
+                if (isTopLevelInteraction) endInteractionSpan("cancelled");
+                return turn;
+              }
+              const continueReason = stopOutput.getEffectiveReason();
+              const currentIterationCount = (options2?.stopHookState?.iterationCount ?? 0) + 1;
+              const currentReasons = [
+                ...options2?.stopHookState?.reasons ?? [],
+                continueReason
+              ];
+              if (currentIterationCount > 1) {
+                yield {
+                  type: "stop_hook_loop" /* StopHookLoop */,
+                  value: {
+                    iterationCount: currentIterationCount,
+                    reasons: currentReasons,
+                    stopHookCount: response.stopHookCount ?? 1
+                  }
+                };
+              }
+              const continueRequest = [{ text: continueReason }];
+              const hookTurn = yield* this.sendMessageStream(
+                continueRequest,
+                signal,
+                prompt_id,
+                {
+                  type: "hook" /* Hook */,
+                  modelOverride: options2?.modelOverride,
+                  stopHookState: {
+                    iterationCount: currentIterationCount,
+                    reasons: currentReasons
+                  }
+                },
+                boundedTurns - 1
+              );
+              if (isTopLevelInteraction)
+                endInteractionSpan(signal.aborted ? "cancelled" : "ok");
+              return hookTurn;
+            }
+          }
+          if (!turn.pendingToolCalls.length && signal && !signal.aborted) {
+            try {
+              const chat = this.getChat();
+              const fullHistory = chat.getHistory(true);
+              const maxHistoryForCache = 40;
+              const cachedHistory = fullHistory.length > maxHistoryForCache ? fullHistory.slice(-maxHistoryForCache) : fullHistory;
+              saveCacheSafeParams(
+                chat.getGenerationConfig(),
+                cachedHistory,
+                this.config.getModel()
+              );
+            } catch {
+            }
+            if (this.config.getSkipNextSpeakerCheck()) {
+              this.runManagedAutoMemoryBackgroundTasks(messageType);
+              if (arenaAgentClient) {
+                await arenaAgentClient.reportCompleted();
+              }
+              if (isTopLevelInteraction) endInteractionSpan("ok");
+              return turn;
+            }
+            const nextSpeakerCheck = await checkNextSpeaker(
+              this.getChat(),
+              this.config,
               signal,
-              prompt_id,
-              {
-                type: "hook" /* Hook */,
-                modelOverride: options2?.modelOverride,
-                stopHookState: {
-                  iterationCount: currentIterationCount,
-                  reasons: currentReasons
-                }
-              },
-              boundedTurns - 1
+              prompt_id
             );
-          }
-        }
-        if (!turn.pendingToolCalls.length && signal && !signal.aborted) {
-          try {
-            const chat = this.getChat();
-            const fullHistory = chat.getHistory(true);
-            const maxHistoryForCache = 40;
-            const cachedHistory = fullHistory.length > maxHistoryForCache ? fullHistory.slice(-maxHistoryForCache) : fullHistory;
-            saveCacheSafeParams(
-              chat.getGenerationConfig(),
-              cachedHistory,
-              this.config.getModel()
+            logNextSpeakerCheck(
+              this.config,
+              new NextSpeakerCheckEvent(
+                prompt_id,
+                turn.finishReason?.toString() || "",
+                nextSpeakerCheck?.next_speaker || ""
+              )
             );
-          } catch {
-          }
-          if (this.config.getSkipNextSpeakerCheck()) {
+            if (nextSpeakerCheck?.next_speaker === "model") {
+              const nextRequest = [{ text: "Please continue." }];
+              const continueTurn = yield* this.sendMessageStream(
+                nextRequest,
+                signal,
+                prompt_id,
+                { ...options2, type: "hook" /* Hook */ },
+                boundedTurns - 1
+              );
+              if (isTopLevelInteraction)
+                endInteractionSpan(signal.aborted ? "cancelled" : "ok");
+              return continueTurn;
+            }
             this.runManagedAutoMemoryBackgroundTasks(messageType);
             if (arenaAgentClient) {
               await arenaAgentClient.reportCompleted();
             }
-            return turn;
           }
-          const nextSpeakerCheck = await checkNextSpeaker(
-            this.getChat(),
-            this.config,
-            signal,
-            prompt_id
-          );
-          logNextSpeakerCheck(
-            this.config,
-            new NextSpeakerCheckEvent(
-              prompt_id,
-              turn.finishReason?.toString() || "",
-              nextSpeakerCheck?.next_speaker || ""
-            )
-          );
-          if (nextSpeakerCheck?.next_speaker === "model") {
-            const nextRequest = [{ text: "Please continue." }];
-            return yield* this.sendMessageStream(
-              nextRequest,
-              signal,
-              prompt_id,
-              options2,
-              boundedTurns - 1
-            );
+          if (signal?.aborted && arenaAgentClient) {
+            await arenaAgentClient.reportCancelled();
           }
-          this.runManagedAutoMemoryBackgroundTasks(messageType);
-          if (arenaAgentClient) {
-            await arenaAgentClient.reportCompleted();
+          if (isTopLevelInteraction) {
+            endInteractionSpan(signal?.aborted ? "cancelled" : "ok");
+          }
+          return turn;
+        } finally {
+          if (isTopLevelInteraction) {
+            endInteractionSpan(signal?.aborted ? "cancelled" : "error", {
+              errorMessage: "unexpected exit"
+            });
           }
         }
-        if (signal?.aborted && arenaAgentClient) {
-          await arenaAgentClient.reportCancelled();
-        }
-        return turn;
       }
       async generateContent(contents, generationConfig, abortSignal, model, promptIdOverride) {
         const promptId = promptIdOverride ?? promptIdContext.getStore() ?? this.lastPromptId;
@@ -319265,6 +319604,7 @@ __export(src_exports2, {
   clearCachedCredentialFile: () => clearCachedCredentialFile,
   clearQwenCredentials: () => clearQwenCredentials,
   clearRuntimeStatus: () => clearRuntimeStatus,
+  clearSessionTracingForTesting: () => clearSessionTracingForTesting,
   clearWelcomeBackState: () => clearWelcomeBackState,
   cliSource: () => cliSource,
   cloneFromGit: () => cloneFromGit,
@@ -319313,6 +319653,10 @@ __export(src_exports2, {
   encodeInsightProgressMessage: () => encodeInsightProgressMessage,
   encodeInsightReadyMessage: () => encodeInsightReadyMessage,
   encodeTagName: () => encodeTagName,
+  endInteractionSpan: () => endInteractionSpan,
+  endLLMRequestSpan: () => endLLMRequestSpan,
+  endToolExecutionSpan: () => endToolExecutionSpan,
+  endToolSpan: () => endToolSpan,
   ensureAutoMemoryScaffold: () => ensureAutoMemoryScaffold,
   ensureCrlfLineEndings: () => ensureCrlfLineEndings,
   ensureMacBinarySigned: () => ensureMacBinarySigned,
@@ -319662,7 +320006,11 @@ __export(src_exports2, {
   splitCommands: () => splitCommands,
   splitCompoundCommand: () => splitCompoundCommand,
   splitConditionalSkills: () => splitConditionalSkills,
+  startInteractionSpan: () => startInteractionSpan,
+  startLLMRequestSpan: () => startLLMRequestSpan,
   startSpeculation: () => startSpeculation,
+  startToolExecutionSpan: () => startToolExecutionSpan,
+  startToolSpan: () => startToolSpan,
   stringify: () => stringify2,
   stripShellWrapper: () => stripShellWrapper,
   stripStartupContext: () => stripStartupContext,
@@ -470165,7 +470513,7 @@ var patchConsole = /* @__PURE__ */ __name((callback) => {
 var dist_default2 = patchConsole;
 
 // node_modules/ink/build/ink.js
-var import_constants37 = __toESM(require_constants12(), 1);
+var import_constants38 = __toESM(require_constants12(), 1);
 
 // node_modules/yoga-layout/dist/src/index.js
 init_esbuild_shims();
@@ -472408,7 +472756,7 @@ var isDev = /* @__PURE__ */ __name(() => process17.env["DEV"] === "true", "isDev
 // node_modules/ink/build/reconciler.js
 init_esbuild_shims();
 var import_react_reconciler = __toESM(require_react_reconciler(), 1);
-var import_constants36 = __toESM(require_constants12(), 1);
+var import_constants37 = __toESM(require_constants12(), 1);
 var Scheduler2 = __toESM(require_scheduler(), 1);
 var import_react = __toESM(require_react(), 1);
 
@@ -474687,7 +475035,7 @@ var cleanupYogaNode = /* @__PURE__ */ __name((node) => {
   node?.unsetMeasureFunc();
   node?.freeRecursive();
 }, "cleanupYogaNode");
-var currentUpdatePriority = import_constants36.NoEventPriority;
+var currentUpdatePriority = import_constants37.NoEventPriority;
 var currentRootNode;
 async function loadPackageJson() {
   const fs154 = await import("node:fs");
@@ -474859,10 +475207,10 @@ var reconciler_default = (0, import_react_reconciler.default)({
   },
   getCurrentUpdatePriority: /* @__PURE__ */ __name(() => currentUpdatePriority, "getCurrentUpdatePriority"),
   resolveUpdatePriority() {
-    if (currentUpdatePriority !== import_constants36.NoEventPriority) {
+    if (currentUpdatePriority !== import_constants37.NoEventPriority) {
       return currentUpdatePriority;
     }
-    return import_constants36.DefaultEventPriority;
+    return import_constants37.DefaultEventPriority;
   },
   maySuspendCommit() {
     return true;
@@ -478793,7 +479141,7 @@ var Ink = class {
     this.lastOutputHeight = 0;
     this.lastTerminalWidth = this.getTerminalWidth();
     this.fullStaticOutput = "";
-    const rootTag = options2.concurrent ? import_constants37.ConcurrentRoot : import_constants37.LegacyRoot;
+    const rootTag = options2.concurrent ? import_constants38.ConcurrentRoot : import_constants38.LegacyRoot;
     this.container = reconciler_default.createContainer(this.rootNode, rootTag, null, false, null, "id", () => {
     }, () => {
     }, () => {
@@ -479243,7 +479591,7 @@ var getInstance = /* @__PURE__ */ __name((stdout, createInstance3, concurrent) =
 
 // node_modules/ink/build/render-to-string.js
 init_esbuild_shims();
-var import_constants38 = __toESM(require_constants12(), 1);
+var import_constants39 = __toESM(require_constants12(), 1);
 
 // node_modules/ink/build/components/Static.js
 init_esbuild_shims();
@@ -491106,7 +491454,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.15.11-preview.1";
+  return "0.15.11-preview.2";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -501739,7 +502087,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds, options2) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "0263fc271";
+var GIT_COMMIT_INFO = "775646e4c";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -585291,7 +585639,7 @@ var QwenAgent = class {
   async initialize(args2) {
     this.clientCapabilities = args2.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version2 = "0.15.11-preview.1";
+    const version2 = "0.15.11-preview.2";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {