@qwen-code/qwen-code 0.21.12-preview.3 → 0.21.12

package/chunks/{chunk-E5BWLU5J.js → chunk-N4SVADAV.js}

@@ -14,14 +14,18 @@ import {
   SPAN_TOOL_EXECUTION,
   TOOL_FAILURE_KIND_ATTRIBUTE,
   TOOL_FAILURE_KIND_CANCELLED,
-  require_src
-} from "./chunk-L2GTEEEU.js";
+  require_src,
+  sessionIdContext
+} from "./chunk-K5IDV3PC.js";
 import {
   createDebugLogger,
   getCurrentSessionId,
+  getErrorType,
+  getSessionIdFromContext,
   setSessionContext,
+  setSessionIdOnContext,
   setShellTracePropagation
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-HOSVOUDK.js";
 import {
   DiagLogLevel,
   ROOT_CONTEXT,
@@ -762,6 +766,55 @@ function recordMemoryRecallDeliveryMetrics(config, latencyMs, attrs) {
 }
 __name(recordMemoryRecallDeliveryMetrics, "recordMemoryRecallDeliveryMetrics");
 
+// packages/core/src/utils/textUtils.ts
+init_esbuild_shims();
+import { stripVTControlCharacters } from "node:util";
+var CONTROL_CHARS_RE = /[\u0000-\u001f\u007f-\u009f]/g;
+function stripAnsiAndControl(text) {
+  return stripVTControlCharacters(text).replace(CONTROL_CHARS_RE, "");
+}
+__name(stripAnsiAndControl, "stripAnsiAndControl");
+function safeLiteralReplace(str, oldString, newString) {
+  if (oldString === "" || !str.includes(oldString)) {
+    return str;
+  }
+  if (!newString.includes("$")) {
+    return str.replaceAll(oldString, newString);
+  }
+  const escapedNewString = newString.replaceAll("$", "$$$$");
+  return str.replaceAll(oldString, escapedNewString);
+}
+__name(safeLiteralReplace, "safeLiteralReplace");
+function isBinary(data, sampleSize = 512) {
+  if (!data) {
+    return false;
+  }
+  const sample = data.length > sampleSize ? data.subarray(0, sampleSize) : data;
+  for (const byte of sample) {
+    if (byte === 0) {
+      return true;
+    }
+  }
+  return false;
+}
+__name(isBinary, "isBinary");
+function normalizeContent(content) {
+  let normalized = content.replace(/^\uFEFF/, "");
+  normalized = normalized.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  return normalized;
+}
+__name(normalizeContent, "normalizeContent");
+
+// packages/core/src/extension/redaction.ts
+init_esbuild_shims();
+var REDACTED_URL_CREDENTIAL = "***REDACTED***";
+var URL_CREDENTIALS_PATTERN = /\b([a-z][a-z0-9+.-]*:\/\/)(?:[^/\s]+@)+/gi;
+var UPLOAD_IDENTITY_PATTERN = /\bupload:v1:[0-9a-fA-F-]+:/gu;
+function redactUrlCredentials(source) {
+  return source.replace(UPLOAD_IDENTITY_PATTERN, "upload:").replace(URL_CREDENTIALS_PATTERN, `$1${REDACTED_URL_CREDENTIAL}@`);
+}
+__name(redactUrlCredentials, "redactUrlCredentials");
+
 // packages/core/src/telemetry/session-tracing.ts
 init_esbuild_shims();
 init_esm();
@@ -939,7 +992,7 @@ function initializeTelemetry(config) {
   telemetryInitPromise ??= (async () => {
     const debugLogger3 = createDebugLogger("OTEL");
     try {
-      const { startTelemetrySdk } = await import("./sdk-impl-5W3JUCWF.js");
+      const { startTelemetrySdk } = await import("./sdk-impl-SK4P5WON.js");
       if (telemetryInitialized) return;
       const started = await startTelemetrySdk(config);
       if (!started) return;
@@ -990,7 +1043,7 @@ function shutdownTelemetry() {
       telemetryShutdownPromise = void 0;
       return;
     }
-    endInteractionSpan("cancelled");
+    endAllInteractionSpans("cancelled");
     const currentSessionId = getCurrentSessionId();
     if (currentSessionId) {
       emitSessionEnd(currentSessionId);
@@ -1084,27 +1137,29 @@ var NOOP_SPAN = trace.wrapSpanContext({
 var interactionContext = new AsyncLocalStorage();
 var toolContext = new AsyncLocalStorage();
 var subagentContext = new AsyncLocalStorage();
+var activeInteractionsByPromptId = /* @__PURE__ */ new Map();
 var interactionIdentityByPromptId = /* @__PURE__ */ new Map();
 function isInNativeSubagentSpan() {
   const ctx = subagentContext.getStore();
   return ctx !== void 0 && !ctx.ended;
 }
 __name(isInNativeSubagentSpan, "isInNativeSubagentSpan");
-function resolveSessionId(parentCtx) {
+function resolveSessionId(parentCtx, explicitSessionId, activeContext = context.active()) {
   const fromParent = parentCtx?.attributes?.["session.id"];
-  return typeof fromParent === "string" && fromParent ? fromParent : getCurrentSessionId();
+  if (typeof fromParent === "string" && fromParent) return fromParent;
+  if (explicitSessionId) return explicitSessionId;
+  return getSessionIdFromContext(activeContext) ?? (sessionIdContext.getStore() || getCurrentSessionId());
 }
 __name(resolveSessionId, "resolveSessionId");
-function resolveGenAiUserId(parentCtx, promptId) {
+function resolveGenAiUserId(parentCtx, promptId, explicitUserId) {
   const logicalParent = parentCtx ?? (promptId ? interactionIdentityByPromptId.get(promptId) : void 0);
   const value = logicalParent?.attributes["gen_ai.user.id"];
-  return typeof value === "string" && value ? value : void 0;
+  return typeof value === "string" && value ? value : explicitUserId;
 }
 __name(resolveGenAiUserId, "resolveGenAiUserId");
 var activeSpans = /* @__PURE__ */ new Map();
 var strongSpans = /* @__PURE__ */ new Map();
 var interactionSequence = 0;
-var lastInteractionCtx;
 var cleanupIntervalStarted = false;
 var SPAN_TTL_MS_DEFAULT = 30 * 60 * 1e3;
 var SPAN_TTL_MS_LONG = 4 * 60 * 60 * 1e3;
@@ -1124,7 +1179,7 @@ function ttlFor(ctx) {
 __name(ttlFor, "ttlFor");
 function sweepStaleSpans(now) {
   for (const [promptId, ctx] of interactionIdentityByPromptId) {
-    if (now - ctx.startTime >= SPAN_TTL_MS_DEFAULT) {
+    if (now - ctx.lastActivityTime >= SPAN_TTL_MS_DEFAULT) {
       interactionIdentityByPromptId.delete(promptId);
     }
   }
@@ -1135,9 +1190,16 @@ function sweepStaleSpans(now) {
       strongSpans.delete(spanId);
       continue;
     }
-    if (now - ctx.startTime < ttlFor(ctx)) continue;
+    const ttlReferenceTime = ctx.type === "interaction" ? ctx.lastActivityTime ?? ctx.startTime : ctx.startTime;
+    if (now - ttlReferenceTime < ttlFor(ctx)) continue;
     if (!ctx.ended) {
       ctx.ended = true;
+      if (ctx.type === "interaction") {
+        const promptId = ctx.attributes["qwen-code.prompt_id"];
+        if (typeof promptId === "string" && activeInteractionsByPromptId.get(promptId) === ctx) {
+          activeInteractionsByPromptId.delete(promptId);
+        }
+      }
       const ageMs = now - ctx.startTime;
       const toolName = ctx.attributes["gen_ai.tool.name"] ?? ctx.attributes["tool.name"];
       const callId = ctx.attributes["tool.call_id"];
@@ -1206,55 +1268,146 @@ function truncateSpanText(s, maxChars = SPAN_TEXT_MAX_CHARS) {
 }
 __name(truncateSpanText, "truncateSpanText");
 function truncateSpanError(s) {
-  return truncateSpanText(s);
+  return truncateSpanText(redactUrlCredentials(stripAnsiAndControl(s)));
 }
 __name(truncateSpanError, "truncateSpanError");
 function getTracer() {
   return trace.getTracer(SERVICE_NAME, "1.0.0");
 }
 __name(getTracer, "getTracer");
-function startInteractionSpan(config, options) {
-  if (!isTelemetrySdkInitialized()) return;
-  ensureCleanupInterval();
-  interactionSequence++;
+function buildInteractionAttributes(config, options) {
+  const sessionId = config.getSessionId();
   const userId = config.getTelemetryUserId();
-  const attributes = {
-    "session.id": config.getSessionId(),
+  return {
+    "session.id": sessionId,
     ...userId ? { "gen_ai.user.id": userId } : {},
+    "gen_ai.operation.name": "invoke_agent",
+    "gen_ai.agent.name": "qwen-code",
+    "gen_ai.conversation.id": sessionId,
+    ...config.getJsonSchema?.() ? { "gen_ai.output.type": "json" } : {},
     "qwen-code.prompt_id": options.promptId,
     "qwen-code.message_type": options.messageType,
     "qwen-code.model": options.model,
     "qwen-code.approval_mode": config.getApprovalMode(),
     "interaction.sequence": interactionSequence
   };
+}
+__name(buildInteractionAttributes, "buildInteractionAttributes");
+function finalizeInteractionContext(spanCtx, status, metadata) {
+  if (spanCtx.ended) return;
+  spanCtx.ended = true;
+  const promptId = spanCtx.attributes["qwen-code.prompt_id"];
+  if (typeof promptId === "string" && activeInteractionsByPromptId.get(promptId) === spanCtx) {
+    activeInteractionsByPromptId.delete(promptId);
+    const identity = interactionIdentityByPromptId.get(promptId);
+    if (identity) identity.lastActivityTime = Date.now();
+  }
+  try {
+    const duration = Date.now() - spanCtx.startTime;
+    const attributes = {
+      "interaction.duration_ms": duration,
+      "qwen-code.turn_status": status
+    };
+    if (status === "error") {
+      attributes["error.type"] = metadata?.errorType || "interaction_error";
+    }
+    spanCtx.span.setAttributes(attributes);
+    if (status === "error") {
+      spanCtx.span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: truncateSpanError(metadata?.errorMessage ?? "unknown error")
+      });
+    }
+  } catch (error) {
+    debugLogger2.warn(
+      `Failed to update interaction span attributes/status: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  try {
+    spanCtx.span.end();
+  } catch (error) {
+    debugLogger2.warn(
+      `Failed to end interaction span: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  const spanId = getSpanId(spanCtx.span);
+  activeSpans.delete(spanId);
+  strongSpans.delete(spanId);
+}
+__name(finalizeInteractionContext, "finalizeInteractionContext");
+function registerInteractionContext(promptId, spanContextObj) {
+  const existing = activeInteractionsByPromptId.get(promptId);
+  if (existing && !existing.ended) {
+    debugLogger2.warn(
+      `Replacing unfinished interaction for promptId=${promptId}; ending the previous span as cancelled`
+    );
+    finalizeInteractionContext(existing, "cancelled", { promptId });
+  }
+  const spanId = getSpanId(spanContextObj.span);
+  activeSpans.set(spanId, new WeakRef(spanContextObj));
+  strongSpans.set(spanId, spanContextObj);
+  activeInteractionsByPromptId.set(promptId, spanContextObj);
+  const userId = spanContextObj.attributes["gen_ai.user.id"];
+  if (typeof userId === "string" && userId) {
+    interactionIdentityByPromptId.set(promptId, {
+      lastActivityTime: spanContextObj.lastActivityTime ?? spanContextObj.startTime,
+      attributes: { "gen_ai.user.id": userId }
+    });
+  } else {
+    interactionIdentityByPromptId.delete(promptId);
+  }
+}
+__name(registerInteractionContext, "registerInteractionContext");
+function getInteractionContext(promptId) {
+  if (promptId !== void 0) {
+    const exact = activeInteractionsByPromptId.get(promptId);
+    return exact && !exact.ended ? exact : void 0;
+  }
+  const current = interactionContext.getStore();
+  return current && !current.ended ? current : void 0;
+}
+__name(getInteractionContext, "getInteractionContext");
+function touchInteractionContext(spanCtx) {
+  if (!spanCtx || spanCtx.type !== "interaction" || spanCtx.ended) return false;
+  const promptId = spanCtx.attributes["qwen-code.prompt_id"];
+  if (typeof promptId !== "string" || activeInteractionsByPromptId.get(promptId) !== spanCtx) {
+    return false;
+  }
+  const now = Date.now();
+  spanCtx.lastActivityTime = now;
+  const identity = interactionIdentityByPromptId.get(promptId);
+  if (identity) identity.lastActivityTime = now;
+  return true;
+}
+__name(touchInteractionContext, "touchInteractionContext");
+function resolveGenAiParentContext(parent) {
+  if (!parent && interactionContext.getStore()) return ROOT_CONTEXT;
+  return resolveParentContext(parent);
+}
+__name(resolveGenAiParentContext, "resolveGenAiParentContext");
+function startInteractionSpan(config, options) {
+  if (!isTelemetrySdkInitialized()) return;
+  ensureCleanupInterval();
+  interactionSequence++;
+  const attributes = buildInteractionAttributes(config, options);
   const span = getTracer().startSpan(
     SPAN_INTERACTION,
     { kind: SpanKind.INTERNAL, attributes },
     ROOT_CONTEXT
   );
-  const spanId = getSpanId(span);
   const spanContextObj = {
     span,
     startTime: Date.now(),
+    lastActivityTime: Date.now(),
     attributes,
     type: "interaction"
   };
-  activeSpans.set(spanId, new WeakRef(spanContextObj));
-  strongSpans.set(spanId, spanContextObj);
-  if (userId) {
-    interactionIdentityByPromptId.set(options.promptId, {
-      startTime: spanContextObj.startTime,
-      attributes: { "gen_ai.user.id": userId }
-    });
-  } else {
-    interactionIdentityByPromptId.delete(options.promptId);
-  }
-  lastInteractionCtx = spanContextObj;
+  registerInteractionContext(options.promptId, spanContextObj);
   interactionContext.enterWith(spanContextObj);
 }
 __name(startInteractionSpan, "startInteractionSpan");
 function endInteractionSpan(status, metadata) {
-  const spanCtx = interactionContext.getStore() ?? lastInteractionCtx;
+  const spanCtx = getInteractionContext(metadata?.promptId);
   if (!spanCtx) return;
   if (spanCtx.ended) {
     debugLogger2.debug(
@@ -1262,42 +1415,24 @@ function endInteractionSpan(status, metadata) {
     );
     return;
   }
-  spanCtx.ended = true;
-  lastInteractionCtx = void 0;
-  const duration = Date.now() - spanCtx.startTime;
-  spanCtx.span.setAttributes({
-    "interaction.duration_ms": duration,
-    "qwen-code.turn_status": status
-  });
-  if (status === "error") {
-    spanCtx.span.setStatus({
-      code: SpanStatusCode.ERROR,
-      message: metadata?.errorMessage ?? "unknown error"
-    });
-  } else {
-    spanCtx.span.setStatus({ code: SpanStatusCode.OK });
+  const current = interactionContext.getStore();
+  finalizeInteractionContext(spanCtx, status, metadata);
+  if (current === spanCtx) interactionContext.enterWith(void 0);
+}
+__name(endInteractionSpan, "endInteractionSpan");
+function endAllInteractionSpans(status = "cancelled") {
+  for (const spanCtx of [...activeInteractionsByPromptId.values()]) {
+    finalizeInteractionContext(spanCtx, status);
   }
-  spanCtx.span.end();
-  const spanId = getSpanId(spanCtx.span);
-  activeSpans.delete(spanId);
-  strongSpans.delete(spanId);
   interactionContext.enterWith(void 0);
 }
-__name(endInteractionSpan, "endInteractionSpan");
+__name(endAllInteractionSpans, "endAllInteractionSpans");
 async function withInteractionSpan(config, options, fn, getResultStatus) {
   if (!isTelemetrySdkInitialized()) return await fn();
   ensureCleanupInterval();
   interactionSequence++;
-  const userId = config.getTelemetryUserId();
-  const attributes = {
-    "session.id": config.getSessionId(),
-    ...userId ? { "gen_ai.user.id": userId } : {},
-    "qwen-code.prompt_id": options.promptId,
-    "qwen-code.message_type": options.messageType,
-    "qwen-code.model": options.model,
-    "qwen-code.approval_mode": config.getApprovalMode(),
-    "interaction.sequence": interactionSequence
-  };
+  const sessionId = config.getSessionId();
+  const attributes = buildInteractionAttributes(config, options);
   const parentContext = options.parentContext ?? ROOT_CONTEXT;
   const span = getTracer().startSpan(
     SPAN_INTERACTION,
@@ -1307,105 +1442,95 @@ async function withInteractionSpan(config, options, fn, getResultStatus) {
     },
     parentContext
   );
-  const spanId = getSpanId(span);
   const spanContextObj = {
     span,
     startTime: Date.now(),
+    lastActivityTime: Date.now(),
     attributes,
     type: "interaction"
   };
-  activeSpans.set(spanId, new WeakRef(spanContextObj));
-  strongSpans.set(spanId, spanContextObj);
-  if (userId) {
-    interactionIdentityByPromptId.set(options.promptId, {
-      startTime: spanContextObj.startTime,
-      attributes: { "gen_ai.user.id": userId }
-    });
-  } else {
-    interactionIdentityByPromptId.delete(options.promptId);
-  }
-  const activeContext = trace.setSpan(parentContext, span);
+  registerInteractionContext(options.promptId, spanContextObj);
+  const activeContext = trace.setSpan(
+    setSessionIdOnContext(parentContext, sessionId),
+    span
+  );
   return await context.with(
     activeContext,
     async () => interactionContext.run(spanContextObj, async () => {
       let terminalStatus = "ok";
-      let errorStatusSet = false;
+      let errorMetadata;
       try {
         const result = await fn();
         terminalStatus = getResultStatus?.(result) ?? "ok";
         return result;
       } catch (error) {
         terminalStatus = "error";
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: truncateSpanError(
-            error instanceof Error ? error.message : String(error)
-          )
-        });
-        errorStatusSet = true;
+        errorMetadata = {
+          promptId: options.promptId,
+          errorMessage: error instanceof Error ? error.message : String(error),
+          errorType: getErrorType(error)
+        };
         throw error;
       } finally {
-        if (!spanContextObj.ended) {
-          spanContextObj.ended = true;
-          const duration = Date.now() - spanContextObj.startTime;
-          span.setAttributes({
-            "interaction.duration_ms": duration,
-            "qwen-code.turn_status": terminalStatus
-          });
-          if (terminalStatus === "ok") {
-            span.setStatus({ code: SpanStatusCode.OK });
-          } else if (terminalStatus === "error" && !errorStatusSet) {
-            span.setStatus({
-              code: SpanStatusCode.ERROR,
-              message: "interaction error"
-            });
-          }
-          span.end();
-          activeSpans.delete(spanId);
-          strongSpans.delete(spanId);
-        }
+        finalizeInteractionContext(spanContextObj, terminalStatus, {
+          promptId: options.promptId,
+          ...terminalStatus === "error" && !errorMetadata ? {
+            errorMessage: "interaction error",
+            errorType: "interaction_error"
+          } : errorMetadata
+        });
       }
     })
   );
 }
 __name(withInteractionSpan, "withInteractionSpan");
-function startLLMRequestSpan(model, promptId, options) {
+function startLLMRequestSpanWithContext(model, promptId, options) {
   if (!isTelemetrySdkInitialized()) {
-    return NOOP_SPAN;
+    return {
+      span: NOOP_SPAN,
+      context: trace.setSpan(context.active(), NOOP_SPAN)
+    };
   }
-  const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
-  const ctx = resolveParentContext(parentCtx);
-  const sessionId = resolveSessionId(parentCtx);
-  const userId = resolveGenAiUserId(parentCtx, promptId);
+  const interactionParentCtx = getInteractionContext(promptId);
+  touchInteractionContext(interactionParentCtx);
+  const parentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionParentCtx;
+  const ctx = resolveGenAiParentContext(parentCtx);
+  const sessionId = resolveSessionId(parentCtx, options?.sessionId, ctx);
+  const userId = resolveGenAiUserId(parentCtx, promptId, options?.userId);
   const attributes = {
     ...sessionId ? { "session.id": sessionId } : {},
     ...sessionId ? { "gen_ai.conversation.id": sessionId } : {},
     ...userId ? { "gen_ai.user.id": userId } : {},
     "qwen-code.prompt_id": promptId,
-    "llm_request.context": subagentContext.getStore() ? "subagent" : interactionContext.getStore() ? "interaction" : "standalone",
+    "llm_request.context": parentCtx?.type === "subagent" ? "subagent" : interactionParentCtx ? "interaction" : "standalone",
     // Emit the version-pinned OTel GenAI semantic convention.
     "gen_ai.request.model": model,
     ...options?.operationName ? { "gen_ai.operation.name": options.operationName } : {},
     ...options?.providerName ? { "gen_ai.provider.name": options.providerName } : {},
     ...options?.outputType ? { "gen_ai.output.type": options.outputType } : {}
   };
+  const sessionContext = setSessionIdOnContext(ctx, sessionId);
   const span = getTracer().startSpan(
     SPAN_LLM_REQUEST,
     { kind: SpanKind.INTERNAL, attributes },
-    ctx
+    sessionContext
   );
   const spanId = getSpanId(span);
   const spanContextObj = {
     span,
     startTime: Date.now(),
+    ...interactionParentCtx ? { interactionOwner: interactionParentCtx } : {},
     attributes,
     type: "llm_request"
   };
   activeSpans.set(spanId, new WeakRef(spanContextObj));
   strongSpans.set(spanId, spanContextObj);
-  return span;
+  return {
+    span,
+    context: trace.setSpan(sessionContext, span)
+  };
 }
-__name(startLLMRequestSpan, "startLLMRequestSpan");
+__name(startLLMRequestSpanWithContext, "startLLMRequestSpanWithContext");
 function endLLMRequestSpan(span, metadata) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
@@ -1472,10 +1597,13 @@ function endLLMRequestSpan(span, metadata) {
       if (metadata.subagentName !== void 0) {
         endAttributes["subagent_name"] = metadata.subagentName;
       }
-      if (metadata.errorType !== void 0) {
+      if (metadata.errorType && !metadata.cancelled) {
         endAttributes["error_type"] = metadata.errorType;
         endAttributes["error.type"] = metadata.errorType;
       }
+      if (!metadata.success && !metadata.cancelled && endAttributes["error.type"] === void 0) {
+        endAttributes["error.type"] = "llm_error";
+      }
       if (metadata.errorStatusCode !== void 0) {
         endAttributes["error_status_code"] = metadata.errorStatusCode;
       }
@@ -1509,9 +1637,7 @@ function endLLMRequestSpan(span, metadata) {
         `Failed to record API request breakdown histogram: ${error instanceof Error ? error.message : String(error)}`
       );
     }
-    if (metadata === void 0 || metadata.success) {
-      spanCtx.span.setStatus({ code: SpanStatusCode.OK });
-    } else {
+    if (metadata !== void 0 && !metadata.success && !metadata.cancelled) {
       spanCtx.span.setStatus({
         code: SpanStatusCode.ERROR,
         message: metadata.error ? truncateSpanError(metadata.error) : "unknown error"
@@ -1531,6 +1657,7 @@ function endLLMRequestSpan(span, metadata) {
   }
   activeSpans.delete(spanId);
   strongSpans.delete(spanId);
+  touchInteractionContext(spanCtx.interactionOwner);
 }
 __name(endLLMRequestSpan, "endLLMRequestSpan");
 function startToolSpan(toolName, attrs, description, promptId) {
@@ -1539,10 +1666,13 @@ function startToolSpan(toolName, attrs, description, promptId) {
   }
   let span;
   try {
-    const parentCtx = subagentContext.getStore() ?? interactionContext.getStore();
-    const ctx = resolveParentContext(parentCtx);
-    const sessionId = resolveSessionId(parentCtx);
+    const interactionParentCtx = getInteractionContext(promptId);
+    touchInteractionContext(interactionParentCtx);
+    const parentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionParentCtx;
+    const ctx = resolveGenAiParentContext(parentCtx);
+    const sessionId = resolveSessionId(parentCtx, void 0, ctx);
     const userId = resolveGenAiUserId(parentCtx, promptId);
+    const agentName = (subagentContext.getStore() ?? interactionParentCtx)?.attributes["gen_ai.agent.name"];
     const attributes = {
       ...sessionId ? { "session.id": sessionId } : {},
       ...attrs,
@@ -1550,6 +1680,7 @@ function startToolSpan(toolName, attrs, description, promptId) {
       "gen_ai.operation.name": "execute_tool",
       "gen_ai.tool.name": toolName,
       "gen_ai.tool.type": "function",
+      ...typeof agentName === "string" ? { "gen_ai.agent.name": agentName } : {},
       ...description ? {
         "gen_ai.tool.description": truncateSpanText(
           description,
@@ -1557,6 +1688,9 @@ function startToolSpan(toolName, attrs, description, promptId) {
         )
       } : {}
     };
+    if (typeof agentName !== "string") {
+      delete attributes["gen_ai.agent.name"];
+    }
     span = getTracer().startSpan(
       SPAN_TOOL,
       { kind: SpanKind.INTERNAL, attributes },
@@ -1566,6 +1700,7 @@ function startToolSpan(toolName, attrs, description, promptId) {
     const spanContextObj = {
       span,
       startTime: Date.now(),
+      ...interactionParentCtx ? { interactionOwner: interactionParentCtx } : {},
       attributes,
       type: "tool"
     };
@@ -1588,7 +1723,11 @@ function runInToolSpanContext(span, fn) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return fn();
-  const otelCtxWithSpan = trace.setSpan(context.active(), span);
+  const sessionId = resolveSessionId(spanCtx);
+  const otelCtxWithSpan = trace.setSpan(
+    setSessionIdOnContext(context.active(), sessionId),
+    span
+  );
   return toolContext.run(spanCtx, () => context.with(otelCtxWithSpan, fn));
 }
 __name(runInToolSpanContext, "runInToolSpanContext");
@@ -1612,17 +1751,16 @@ function endToolSpan(span, metadata) {
       }
       if (metadata.error !== void 0)
         endAttributes["error"] = truncateSpanError(metadata.error);
+      if (metadata.success === false && !metadata.cancelled) {
+        endAttributes["error.type"] = "tool_error";
+      }
       if (metadata.cancelled) {
         endAttributes[TOOL_FAILURE_KIND_ATTRIBUTE] = TOOL_FAILURE_KIND_CANCELLED;
       }
     }
     spanCtx.span.setAttributes(endAttributes);
     if (metadata) {
-      if (metadata.cancelled) {
-        spanCtx.span.setStatus({ code: SpanStatusCode.UNSET });
-      } else if (metadata.success !== false) {
-        spanCtx.span.setStatus({ code: SpanStatusCode.OK });
-      } else {
+      if (!metadata.cancelled && metadata.success === false) {
         spanCtx.span.setStatus({
           code: SpanStatusCode.ERROR,
           message: metadata.error ? truncateSpanError(metadata.error) : "tool error"
@@ -1643,6 +1781,7 @@ function endToolSpan(span, metadata) {
   }
   activeSpans.delete(spanId);
   strongSpans.delete(spanId);
+  touchInteractionContext(spanCtx.interactionOwner);
 }
 __name(endToolSpan, "endToolSpan");
 function startToolExecutionSpan(options) {
@@ -1709,6 +1848,8 @@ function endToolExecutionSpan(span, metadata) {
   spanCtx.ended = true;
   try {
     const duration = Date.now() - spanCtx.startTime;
+    const executionStatus = metadata?.executionStatus;
+    const cancelled = metadata?.cancelled === true || executionStatus === "cancelled";
     const endAttributes = {};
     if (metadata?.attributes) {
       Object.assign(endAttributes, metadata.attributes);
@@ -1722,19 +1863,21 @@ function endToolExecutionSpan(span, metadata) {
       if (metadata.executionStatus !== void 0) {
         endAttributes["execution_status"] = metadata.executionStatus;
       }
-      if (metadata.errorType !== void 0) {
+      if (metadata.errorType) {
         endAttributes["error_type"] = metadata.errorType;
-        endAttributes["error.type"] = metadata.errorType;
+        if (!cancelled) {
+          endAttributes["error.type"] = metadata.errorType;
+        }
+      }
+      const failed = !cancelled && executionStatus !== "not_started" && (executionStatus === void 0 ? metadata.success === false : executionStatus !== "success");
+      if (failed && endAttributes["error.type"] === void 0) {
+        endAttributes["error.type"] = "tool_execution_error";
       }
     }
     spanCtx.span.setAttributes(endAttributes);
-    const executionStatus = metadata?.executionStatus;
-    const cancelled = metadata?.cancelled === true || executionStatus === "cancelled";
     if (metadata && !cancelled && executionStatus !== "not_started") {
       const succeeded = executionStatus === void 0 ? metadata.success !== false : executionStatus === "success";
-      if (succeeded) {
-        spanCtx.span.setStatus({ code: SpanStatusCode.OK });
-      } else {
+      if (!succeeded) {
         spanCtx.span.setStatus({
           code: SpanStatusCode.ERROR,
           message: metadata.error ? truncateSpanError(metadata.error) : "tool execution error"
@@ -1835,6 +1978,7 @@ function startHookSpan(opts) {
   }
   ensureCleanupInterval();
   const parentCtx = toolContext.getStore() ?? subagentContext.getStore() ?? interactionContext.getStore() ?? void 0;
+  touchInteractionContext(interactionContext.getStore());
   const ctx = resolveParentContext(parentCtx);
   const sessionId = resolveSessionId(parentCtx);
   const attributes = {
@@ -1854,6 +1998,7 @@ function startHookSpan(opts) {
   const spanContextObj = {
     span,
     startTime: Date.now(),
+    ...interactionContext.getStore() ? { interactionOwner: interactionContext.getStore() } : {},
     attributes,
     type: "hook"
   };
@@ -1895,6 +2040,8 @@ function endHookSpan(span, metadata) {
         );
       if (metadata.error !== void 0)
         endAttributes["error"] = truncateSpanError(metadata.error);
+      if (metadata.error !== void 0)
+        endAttributes["error.type"] = "hook_error";
     }
     spanCtx.span.setAttributes(endAttributes);
     if (metadata?.error !== void 0) {
@@ -1917,18 +2064,21 @@ function endHookSpan(span, metadata) {
   }
   activeSpans.delete(spanId);
   strongSpans.delete(spanId);
+  touchInteractionContext(spanCtx.interactionOwner);
 }
 __name(endHookSpan, "endHookSpan");
 function startSubagentSpan(opts) {
   if (!isTelemetrySdkInitialized()) return NOOP_SPAN;
   ensureCleanupInterval();
   const parentCtx = subagentContext.getStore() ?? toolContext.getStore() ?? interactionContext.getStore();
+  const sessionId = resolveSessionId(parentCtx, opts.sessionId) ?? opts.sessionId;
   const userId = resolveGenAiUserId(parentCtx);
   const attributes = {
     // Spec-aligned (OTel GenAI Agent Spans, Development status).
     "gen_ai.operation.name": "invoke_agent",
     "gen_ai.agent.name": opts.subagentName,
-    "gen_ai.conversation.id": opts.sessionId,
+    "gen_ai.conversation.id": sessionId,
+    "session.id": sessionId,
     ...userId ? { "gen_ai.user.id": userId } : {},
     // Vendor identity and lifecycle. The per-invocation ID stays private;
     // gen_ai.agent.id is reserved for a stable agent definition identity.
@@ -1988,7 +2138,11 @@ function runInSubagentSpanContext(span, fn) {
   const spanId = getSpanId(span);
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return fn();
-  const otelCtxWithSpan = trace.setSpan(context.active(), span);
+  const sessionId = resolveSessionId(spanCtx);
+  const otelCtxWithSpan = trace.setSpan(
+    setSessionIdOnContext(context.active(), sessionId),
+    span
+  );
   return subagentContext.run(
     spanCtx,
     () => toolContext.run(void 0, () => context.with(otelCtxWithSpan, fn))
@@ -2026,17 +2180,15 @@ function endSubagentSpan(span, metadata) {
     if (metadata.resultSummaryPresent !== void 0) {
       endAttributes["qwen-code.subagent.result_summary_present"] = metadata.resultSummaryPresent;
     }
-    if (metadata.error !== void 0) {
+    if (metadata.status === "failed" && metadata.error !== void 0) {
       const truncated = truncateSpanError(metadata.error);
       endAttributes["exception.message"] = truncated;
     }
-    if (metadata.errorType !== void 0) {
-      endAttributes["error.type"] = metadata.errorType;
+    if (metadata.status === "failed") {
+      endAttributes["error.type"] = metadata.errorType || "subagent_error";
     }
     spanCtx.span.setAttributes(endAttributes);
-    if (metadata.status === "completed") {
-      spanCtx.span.setStatus({ code: SpanStatusCode.OK });
-    } else if (metadata.status === "failed") {
+    if (metadata.status === "failed") {
       spanCtx.span.setStatus({
         code: SpanStatusCode.ERROR,
         message: metadata.error ? truncateSpanError(metadata.error) : "subagent failed"
@@ -2058,12 +2210,16 @@ function endSubagentSpan(span, metadata) {
   strongSpans.delete(spanId);
 }
 __name(endSubagentSpan, "endSubagentSpan");
-function getActiveInteractionSpan() {
-  const ctx = interactionContext.getStore() ?? lastInteractionCtx;
-  if (!ctx || ctx.ended) return void 0;
-  return ctx.span;
+function getActiveInteractionSpan(promptId) {
+  return getInteractionContext(promptId)?.span;
 }
 __name(getActiveInteractionSpan, "getActiveInteractionSpan");
+function recordInteractionActivity(promptId, expectedOwner) {
+  const spanCtx = getInteractionContext(promptId);
+  if (!spanCtx || spanCtx.span !== expectedOwner) return false;
+  return touchInteractionContext(spanCtx);
+}
+__name(recordInteractionActivity, "recordInteractionActivity");
 
 export {
   getMeter,
@@ -2097,12 +2253,17 @@ export {
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   safeSetStatus,
+  stripAnsiAndControl,
+  safeLiteralReplace,
+  isBinary,
+  normalizeContent,
+  redactUrlCredentials,
   isInNativeSubagentSpan,
   truncateSpanError,
   startInteractionSpan,
   endInteractionSpan,
   withInteractionSpan,
-  startLLMRequestSpan,
+  startLLMRequestSpanWithContext,
   endLLMRequestSpan,
   startToolSpan,
   runInToolSpanContext,
@@ -2117,6 +2278,7 @@ export {
   runInSubagentSpanContext,
   endSubagentSpan,
   getActiveInteractionSpan,
+  recordInteractionActivity,
   emitSessionStart,
   emitSessionEnd,
   isTelemetrySdkInitialized,