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

package/chunks/{chunk-GHOUZ5X4.js → chunk-EBPLKY6U.js}

@@ -40,7 +40,7 @@ import {
   CronScheduler,
   DEFAULT_RECURRING_MAX_AGE_DAYS,
   normalizeRecurringMaxAge
-} from "./chunk-NM33GGOM.js";
+} from "./chunk-QPBFRWCP.js";
 import {
   consumeUnread,
   forwardApproval,
@@ -49,13 +49,13 @@ import {
   sendStructuredMessage,
   wrapConfirmWithBadge,
   writeMessage
-} from "./chunk-A4BAHMJF.js";
+} from "./chunk-JRIVMPD2.js";
 import {
   claimTask,
   listTasks,
   onTasksUpdated,
   unassignTeammateTasks
-} from "./chunk-ZPZANKVP.js";
+} from "./chunk-YILJKX2T.js";
 import {
   assignTeammateColor,
   classifyShutdownResponse,
@@ -63,7 +63,7 @@ import {
   formatAgentId,
   generateUniqueTeammateName,
   writeTeamFile
-} from "./chunk-A6GQUQ7I.js";
+} from "./chunk-D2RNVVH6.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -71,13 +71,13 @@ import {
   RUNTIME_SNAPSHOT_PREFIX,
   buildModelIdContext,
   resolveModelId
-} from "./chunk-JBZYGFIB.js";
+} from "./chunk-I7BT2MME.js";
 import {
   ARTIFACT_TITLE_MAX_LENGTH,
   ARTIFACT_WORKSPACE_PATH_MAX_LENGTH,
   hasControlCharacter,
   hasUnsafeDisplayPayload
-} from "./chunk-7WUMS2UA.js";
+} from "./chunk-DEDESZDL.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -86,22 +86,6 @@ import {
   LEADER_NAME,
   MAX_TEAMMATES
 } from "./chunk-CPBF7KYF.js";
-import {
-  APPROVAL_MODES,
-  READ_ONLY_INSPECTION_TOOLS,
-  SUBAGENT_PLAN_LIFECYCLE_TOOLS,
-  buildSubagentPlanToolBlockedResult,
-  getLeaderOnlyToolUnavailableMessage,
-  getPlanRequiredTeammatePreApprovalMessage,
-  getSubagentPlanToolUnavailableMessage,
-  isLeaderOnlyToolUnavailableInSubagent,
-  isPlanLifecycleToolUnavailableInSubagent,
-  isPlanRequiredTeammateAwaitingApproval,
-  isPlanRequiredTeammateContext,
-  isPlanRequiredTeammatePreApprovalAllowedTool,
-  isSubagentLikeExecutionContext,
-  shouldUsePlanOnlyReminderInSubagentContext
-} from "./chunk-SNHBRO4C.js";
 import {
   SKILL_FILE_NAME,
   SKILL_NAME_PATTERN,
@@ -121,7 +105,7 @@ import {
   require_dist as require_dist2,
   stringify,
   validateSkillName
-} from "./chunk-KTWUFHS4.js";
+} from "./chunk-5RUCD4ED.js";
 import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";
@@ -139,15 +123,15 @@ import {
   createHookOutput,
   getHookKey,
   isToolArtifactLike
-} from "./chunk-2ASWIM4A.js";
+} from "./chunk-YBVVOSOH.js";
 import {
   BaseTokenStorage,
   KeychainTokenStorage
-} from "./chunk-67F2BEYW.js";
+} from "./chunk-CPFFU46D.js";
 import {
   normalizeImageGenerationBaseUrl,
   resolveNetworkTarget
-} from "./chunk-TNETSI2A.js";
+} from "./chunk-ULNWG62W.js";
 import {
   EvidenceSourceUnavailableError,
   GoalEvidenceCheckpointAccumulator,
@@ -173,22 +157,40 @@ import {
   validateTranscriptRecord,
   walkTranscriptUuidChain,
   wrapUserPromptSubmitContext
-} from "./chunk-B66LYK4B.js";
+} from "./chunk-DPTMKFIH.js";
+import {
+  APPROVAL_MODES,
+  READ_ONLY_INSPECTION_TOOLS,
+  SUBAGENT_PLAN_LIFECYCLE_TOOLS,
+  buildSubagentPlanToolBlockedResult,
+  getLeaderOnlyToolUnavailableMessage,
+  getPlanRequiredTeammatePreApprovalMessage,
+  getSubagentPlanToolUnavailableMessage,
+  isLeaderOnlyToolUnavailableInSubagent,
+  isPlanLifecycleToolUnavailableInSubagent,
+  isPlanRequiredTeammateAwaitingApproval,
+  isPlanRequiredTeammateContext,
+  isPlanRequiredTeammatePreApprovalAllowedTool,
+  isSubagentLikeExecutionContext,
+  shouldUsePlanOnlyReminderInSubagentContext
+} from "./chunk-63FNZTWG.js";
 import {
+  AgentOutputMessageCapture,
   DEFAULT_OTLP_ENDPOINT,
   DEFAULT_TELEMETRY_TARGET,
+  addAgentInputMessageAttributes,
   addDaemonRequestAttribute,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
   addUserPromptAttributes
-} from "./chunk-U5C2GIN2.js";
+} from "./chunk-K34GJQOZ.js";
 import {
   supportsOpenAIPrefixCaching
 } from "./chunk-SAH4BD2J.js";
 import {
   DashScopeOpenAICompatibleProvider,
   selectDashScopeThinkingKnob
-} from "./chunk-2RTRFLWH.js";
+} from "./chunk-KLOMACIR.js";
 import {
   childLaunchDepth,
   getCurrentAgentDepth,
@@ -199,7 +201,7 @@ import {
   runWithAgentContext,
   runWithRuntimeContentGenerator,
   spawnBlockReason
-} from "./chunk-SKRHR6N2.js";
+} from "./chunk-VPV7WBVT.js";
 import {
   getTeammateContext,
   isTeammate,
@@ -209,6 +211,92 @@ import {
   InvalidStreamError,
   getThoughtSummary
 } from "./chunk-2J3OJGTL.js";
+import {
+  BUBBLE_APPROVAL_MODE,
+  FORK_AGENT,
+  FORK_DEFAULT_MAX_TURNS,
+  FORK_PLACEHOLDER_RESULT,
+  FORK_SUBAGENT_TYPE,
+  SubagentError,
+  SubagentErrorCode,
+  buildAvailableSkillsReminder,
+  buildChangedAgentsReminder,
+  buildChangedMcpToolsReminder,
+  buildChangedSkillsReminder,
+  buildChildMessage,
+  buildDeferredToolsReminder,
+  buildForkExecutionAllowlist,
+  buildForkedMessages,
+  buildFunctionResponseParts,
+  buildMcpServerInstructionsReminder,
+  buildPinnedWorktreeNotice,
+  buildWorktreeNotice,
+  formatDateForContext,
+  getDirectoryContextString,
+  getFolderStructure,
+  getInitialChatHistory,
+  getStartupContextLength,
+  isSystemReminderContent,
+  normalizeForkTurns,
+  registerForkDisplayImageForCache,
+  resolveForkExecutionAllowedTools,
+  runInForkContext,
+  selectForkHistory,
+  stripSystemReminderBlocks,
+  validateForkToolList
+} from "./chunk-TTRH3RTQ.js";
+import {
+  collectAvailableSkillEntries,
+  renderAvailableSkillsBlock
+} from "./chunk-K623ENWT.js";
+import {
+  escapeSystemReminderTags,
+  escapeXml
+} from "./chunk-AQ37AY7B.js";
+import {
+  DEFAULT_FILE_FILTERING_OPTIONS,
+  DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES,
+  QwenIgnoreParser,
+  WorkspaceContext,
+  formatQwenIgnoreFileNames,
+  getQwenIgnoreFileNames,
+  isPathWithinRoot,
+  require_ignore
+} from "./chunk-FRHQQC2Z.js";
+import {
+  openBrowserSecurely,
+  shouldAttemptBrowserLaunch
+} from "./chunk-NAVJD2PQ.js";
+import {
+  isUnattendedMode,
+  retryWithBackoff
+} from "./chunk-2ZWH53I4.js";
+import {
+  classifyRetryError,
+  isFallbackEligible
+} from "./chunk-TB4YFWXG.js";
+import {
+  QUOTA_EXHAUSTED_PREFIX,
+  formatQuotaExhaustedMessage,
+  getRateLimitErrorDetails,
+  getRateLimitRetryDelayMs,
+  isApiError,
+  isQuotaExhaustedError,
+  isRateLimitError,
+  isStructuredError
+} from "./chunk-D7QGE3RT.js";
+import {
+  DEFAULT_OPENAI_BASE_URL
+} from "./chunk-AXMWHKXA.js";
+import {
+  getToolCallPreparations,
+  setToolCallPreparations
+} from "./chunk-GLCZKT5V.js";
+import {
+  combineAbortSignals,
+  createAbortController,
+  createChildAbortController
+} from "./chunk-DJ2GSRLV.js";
 import {
   ApiRetryEvent,
   COMBINED_PASS_TOLERANCE_FACTOR,
@@ -326,7 +414,7 @@ import {
   updateMCPServerStatus,
   writeLine,
   writeLineSync
-} from "./chunk-UAAWNTOC.js";
+} from "./chunk-4KM2SYK5.js";
 import {
   defaultModalities,
   isTieredEffortWireModel
@@ -355,65 +443,13 @@ import {
   isManagedMemoryPath,
   isTeamAutoMemPath,
   isUserAutoMemPath
-} from "./chunk-6OJDN5ZT.js";
+} from "./chunk-G6MUFRNI.js";
 import {
   runSideQuery
-} from "./chunk-JRTJEGSP.js";
+} from "./chunk-LSRI3ND3.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-C2DR57L6.js";
-import {
-  BUBBLE_APPROVAL_MODE,
-  FORK_AGENT,
-  FORK_DEFAULT_MAX_TURNS,
-  FORK_PLACEHOLDER_RESULT,
-  FORK_SUBAGENT_TYPE,
-  SubagentError,
-  SubagentErrorCode,
-  buildAvailableSkillsReminder,
-  buildChangedAgentsReminder,
-  buildChangedMcpToolsReminder,
-  buildChangedSkillsReminder,
-  buildChildMessage,
-  buildDeferredToolsReminder,
-  buildForkExecutionAllowlist,
-  buildForkedMessages,
-  buildFunctionResponseParts,
-  buildMcpServerInstructionsReminder,
-  buildPinnedWorktreeNotice,
-  buildWorktreeNotice,
-  formatDateForContext,
-  getDirectoryContextString,
-  getFolderStructure,
-  getInitialChatHistory,
-  getStartupContextLength,
-  isSystemReminderContent,
-  normalizeForkTurns,
-  registerForkDisplayImageForCache,
-  resolveForkExecutionAllowedTools,
-  runInForkContext,
-  selectForkHistory,
-  stripSystemReminderBlocks,
-  validateForkToolList
-} from "./chunk-TROB4PZY.js";
-import {
-  collectAvailableSkillEntries,
-  renderAvailableSkillsBlock
-} from "./chunk-K623ENWT.js";
-import {
-  escapeSystemReminderTags,
-  escapeXml
-} from "./chunk-AQ37AY7B.js";
-import {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES,
-  QwenIgnoreParser,
-  WorkspaceContext,
-  formatQwenIgnoreFileNames,
-  getQwenIgnoreFileNames,
-  isPathWithinRoot,
-  require_ignore
-} from "./chunk-UHF5VBKO.js";
+} from "./chunk-PVXEJB66.js";
 import {
   AgentStatistics,
   BaseDeclarativeTool,
@@ -432,29 +468,7 @@ import {
   require_dist,
   require_fast_deep_equal,
   require_fast_uri
-} from "./chunk-ZRT36RSF.js";
-import {
-  openBrowserSecurely,
-  shouldAttemptBrowserLaunch
-} from "./chunk-NAVJD2PQ.js";
-import {
-  isUnattendedMode,
-  retryWithBackoff
-} from "./chunk-QEWAHAW2.js";
-import {
-  classifyRetryError,
-  isFallbackEligible
-} from "./chunk-FTGU6G45.js";
-import {
-  QUOTA_EXHAUSTED_PREFIX,
-  formatQuotaExhaustedMessage,
-  getRateLimitErrorDetails,
-  getRateLimitRetryDelayMs,
-  isApiError,
-  isQuotaExhaustedError,
-  isRateLimitError,
-  isStructuredError
-} from "./chunk-PSTHNTHF.js";
+} from "./chunk-YIGGWOJE.js";
 import {
   AUTH_ENV_MAPPINGS,
   AuthType,
@@ -466,24 +480,11 @@ import {
   createContentGenerator,
   resetPreloadedContentGenerator,
   resolveContentGeneratorConfigWithSources
-} from "./chunk-XJ6IMYUS.js";
+} from "./chunk-KWX56CHZ.js";
 import {
   DEFAULT_QWEN_EMBEDDING_MODEL,
   DEFAULT_QWEN_MODEL
 } from "./chunk-F6WFNA7U.js";
-import {
-  atomicWriteFile,
-  atomicWriteFileSync,
-  atomicWriteJSON,
-  renameWithRetry
-} from "./chunk-NW7SPXVG.js";
-import {
-  DEFAULT_OPENAI_BASE_URL
-} from "./chunk-AXMWHKXA.js";
-import {
-  getToolCallPreparations,
-  setToolCallPreparations
-} from "./chunk-GLCZKT5V.js";
 import {
   normalizeMcpToolName,
   sanitizeToolNameForProvider
@@ -497,18 +498,19 @@ import {
   parsePositiveIntegerEnvValue,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import {
-  combineAbortSignals,
-  createAbortController,
-  createChildAbortController
-} from "./chunk-DJ2GSRLV.js";
 import {
   getOrCreateMcpDispatcher,
   loadUndici,
   preloadRuntimeFetchModule,
   redactProxyError,
   setResolvedProxyUrlForRuntimeFetch
-} from "./chunk-H6BFLALJ.js";
+} from "./chunk-4AOVQPJU.js";
+import {
+  atomicWriteFile,
+  atomicWriteFileSync,
+  atomicWriteJSON,
+  renameWithRetry
+} from "./chunk-YBHUXEC6.js";
 import {
   endHookSpan,
   endInteractionSpan,
@@ -518,10 +520,14 @@ import {
   endToolSpan,
   getActiveInteractionSpan,
   initializeTelemetry,
+  isBinary,
   isPerformanceMonitoringActive,
   isTelemetrySdkInitialized,
+  normalizeContent,
   recordCpuUsage,
+  recordInteractionActivity,
   recordMemoryUsage,
+  redactUrlCredentials,
   refreshSessionContext,
   runInSubagentSpanContext,
   runInToolSpanContext,
@@ -533,8 +539,9 @@ import {
   startToolBlockedOnUserSpan,
   startToolExecutionSpan,
   startToolSpan,
+  stripAnsiAndControl,
   truncateSpanError
-} from "./chunk-3MJ44LNC.js";
+} from "./chunk-N4SVADAV.js";
 import {
   safeJsonStringify
 } from "./chunk-HHJLM3WQ.js";
@@ -576,6 +583,7 @@ import {
   formatTraceparent,
   getErrorMessage,
   getErrorStatus,
+  getErrorType,
   getProjectHash,
   getTraceContext,
   isAbortError,
@@ -591,7 +599,7 @@ import {
   tildeifyPath,
   toFriendlyError,
   unescapePath
-} from "./chunk-YMB77M76.js";
+} from "./chunk-HOSVOUDK.js";
 import {
   require_src
 } from "./chunk-AMDSOFFV.js";
@@ -44961,6 +44969,19 @@ function detectCommandSubstitution(command) {
       }
     }
     if (char === "\\" && !inSingleQuotes) {
+      if (nextChar === "\n" && command[i - 1] === "$") {
+        let dollarStart = i - 1;
+        while (dollarStart > 0 && command[dollarStart - 1] === "$") {
+          dollarStart--;
+        }
+        let escapeStart = dollarStart;
+        while (escapeStart > 0 && command[escapeStart - 1] === "\\") {
+          escapeStart--;
+        }
+        if ((i - dollarStart) % 2 === 1 && (dollarStart - escapeStart) % 2 === 0 && command[i + 2] === "(") {
+          return true;
+        }
+      }
       i += 2;
       continue;
     }
@@ -44983,6 +45004,9 @@ function detectCommandSubstitution(command) {
       if (char === "$" && nextChar === "(") {
         return true;
       }
+      if (char === "$" && nextChar === "{" && /^\$\{[A-Za-z_][A-Za-z0-9_]*@P\}/.test(command.slice(i))) {
+        return true;
+      }
       if (char === "<" && nextChar === "(" && !inDoubleQuotes && !inBackticks) {
         return true;
       }
@@ -44998,7 +45022,7 @@ function detectCommandSubstitution(command) {
   return false;
 }
 __name(detectCommandSubstitution, "detectCommandSubstitution");
-var COMMAND_SUBSTITUTION_WARNING = "Contains command substitution ($(...), backticks, <(...), or >(...)).";
+var COMMAND_SUBSTITUTION_WARNING = "Contains command substitution ($(...), backticks, <(...), >(...), or ${parameter@P}).";
 function hasShellSubstitution(rawCommand) {
   if (typeof rawCommand !== "string" || rawCommand.length === 0) return false;
   if (detectCommandSubstitution(rawCommand)) return true;
@@ -45018,7 +45042,7 @@ async function checkCommandPermissions(command, config, sessionAllowlist) {
     return {
       allAllowed: false,
       disallowedCommands: [command],
-      blockReason: "Command substitution using $(), `` ` ``, <(), or >() is not allowed for security reasons",
+      blockReason: "Command substitution using $(), `` ` ``, <(), >(), or ${parameter@P} is not allowed for security reasons",
       isHardDenial: true
     };
   }
@@ -47894,7 +47918,16 @@ function evaluateSubstitutions(node) {
     /* @__PURE__ */ new Set(["command_substitution", "process_substitution"]),
     true
   );
-  if (substitutions.length === 0) return "read-only";
+  if (substitutions.length === 0) {
+    for (const expansion of collectDescendants(node, /* @__PURE__ */ new Set(["expansion"]))) {
+      for (let i = 0; i < expansion.childCount - 1; i++) {
+        if (expansion.child(i)?.type === "@" && expansion.child(i + 1)?.type === "P") {
+          return "unknown";
+        }
+      }
+    }
+    return "read-only";
+  }
   return mergeSafety(
     "unknown",
     ...substitutions.flatMap((substitution) => substitution.namedChildren).map(evaluateStatementSafety)
@@ -48042,6 +48075,13 @@ async function classifyInternal(command, cwd) {
     const safety = mergeSafety(
       ...root.namedChildren.map(evaluateStatementSafety)
     );
+    if (safety === "read-only" && command.includes("\\\n")) {
+      const normalizedSafety = await classifyInternal(
+        command.replaceAll("\\\n", ""),
+        cwd
+      );
+      if (normalizedSafety !== "read-only") return "unknown";
+    }
     if (safety !== "read-only" || !cwd) return safety;
     return localGitConfigMakesCommandUnsafe(root, cwd) ? "unknown" : "read-only";
   } finally {
@@ -59802,7 +59842,7 @@ var HybridTokenStorage = class extends BaseTokenStorage {
     const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
     if (!forceFileStorage) {
       try {
-        const { KeychainTokenStorage: KeychainTokenStorage2 } = await import("./keychain-token-storage-GU75J2T2.js");
+        const { KeychainTokenStorage: KeychainTokenStorage2 } = await import("./keychain-token-storage-NKKCUHI2.js");
         const keychainStorage = new KeychainTokenStorage2(this.serviceName);
         const isAvailable = await keychainStorage.isAvailable();
         if (isAvailable) {
@@ -61949,7 +61989,7 @@ function populateMcpServerCommand(mcpServers, mcpServerCommand, cwd) {
 __name(populateMcpServerCommand, "populateMcpServerCommand");
 async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig, opts) {
   try {
-    const { mcpToTool } = await import("./node-YSOU44FX.js");
+    const { mcpToTool } = await import("./node-UUDY34IG.js");
     const mcpCallableTool = mcpToTool(mcpClient, {
       timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
     });
@@ -80420,9 +80460,8 @@ init_esbuild_shims();
 
 // packages/core/src/utils/getPty.ts
 init_esbuild_shims();
-var BUN_FORCE_PTY_ENV_VAR = "QWEN_TUI_FORCE_PTY";
 var getPty = /* @__PURE__ */ __name(async () => {
-  if ("bun" in process.versions && process.env[BUN_FORCE_PTY_ENV_VAR] !== "1") {
+  if ("bun" in process.versions) {
     return null;
   }
   try {
@@ -80445,45 +80484,6 @@ import { spawn as cpSpawn, spawnSync as spawnSync3 } from "node:child_process";
 import { TextDecoder as TextDecoder2 } from "node:util";
 import os11 from "node:os";
 
-// packages/core/src/utils/textUtils.ts
-init_esbuild_shims();
-import { stripVTControlCharacters as stripVTControlCharacters2 } from "node:util";
-var CONTROL_CHARS_RE = /[\u0000-\u001f\u007f-\u009f]/g;
-function stripAnsiAndControl(text) {
-  return stripVTControlCharacters2(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 normalized2 = content.replace(/^\uFEFF/, "");
-  normalized2 = normalized2.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  return normalized2;
-}
-__name(normalizeContent, "normalizeContent");
-
 // packages/core/src/utils/load-xterm-headless.ts
 init_esbuild_shims();
 var xtermHeadlessModulePromise;
@@ -83339,8 +83339,8 @@ var BackgroundShellRegistry = class {
   /**
    * Subscribe to new-entry events. Called synchronously inside `register()`.
    * Setting `undefined` clears the existing subscriber. Single-subscriber on
-   * purpose — the UI hook is the only consumer in the codebase, and a list
-   * would invite drift in error-handling.
+   * purpose — each runtime installs one owner callback, and a list would
+   * invite drift in error-handling.
    */
   setRegisterCallback(cb) {
     this.registerCallback = cb;
@@ -83349,14 +83349,19 @@ var BackgroundShellRegistry = class {
     this.notificationCallback = cb;
   }
   /**
-   * Subscribe to status transitions (running → terminal). Called
-   * synchronously inside `complete()` / `fail()` / `cancel()` after the
-   * entry has been mutated. Same single-subscriber rationale as
-   * `setRegisterCallback`.
+   * Subscribe to registration and status transitions (running → terminal).
+   * Called synchronously after the registry has been mutated. Same
+   * single-subscriber rationale as `setRegisterCallback`.
    */
   setStatusChangeCallback(cb) {
     this.statusChangeCallback = cb;
   }
+  /** Retract `cb` only if it is still the installed callback. */
+  clearStatusChangeCallback(cb) {
+    if (this.statusChangeCallback === cb) {
+      this.statusChangeCallback = void 0;
+    }
+  }
   register(registration) {
     const entry = registration;
     entry.id = registration.shellId;
@@ -83612,8 +83617,8 @@ var BackgroundShellRegistry = class {
    * statusChange callback exactly once after the loop. The per-entry
    * `cancel()` path would have triggered both side channels for every
    * running shell — wasteful on shutdown / `/clear` where the only
-   * subscriber (`useBackgroundTaskView`) just re-pulls `getAll()`
-   * regardless of the entry argument.
+   * current subscriber just re-pulls the registry regardless of the entry
+   * argument.
    */
   abortAll() {
     const endTime = Date.now();
@@ -96570,16 +96575,6 @@ import * as fs52 from "node:fs";
 import * as path55 from "node:path";
 import * as os16 from "node:os";
 
-// 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/extension/http-client.ts
 init_esbuild_shims();
 import * as http2 from "node:http";
@@ -116723,6 +116718,8 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
                 toolName: canonicalToolName(name),
                 args: invocation.params,
                 signal: state.abortController.signal,
+                sessionId: config.getSessionId(),
+                cwd: config.getTargetDir(),
                 ...invocationContext ? { invocationContext } : {}
               }
             );
@@ -129876,6 +129873,11 @@ __name(buildReplacement, "buildReplacement");
 
 // packages/core/src/tools/shell.ts
 var debugLogger125 = createDebugLogger("SHELL");
+var DEFAULT_SHELL_OUTPUT_THRESHOLD = 3e4;
+function getShellOutputThreshold(config) {
+  return config.isTruncateToolOutputThresholdExplicit() ? config.getTruncateToolOutputThreshold() : DEFAULT_SHELL_OUTPUT_THRESHOLD;
+}
+__name(getShellOutputThreshold, "getShellOutputThreshold");
 function statusFileGuidance(outputPath) {
   return `status file: ${statusFilePathFor(outputPath)}
 To check whether this process is still running, Read the status file (status: running|completed|failed|cancelled). Do NOT infer liveness from the output file: programs often block-buffer stdout when not attached to a TTY, so an empty output file is normal while the process is alive (for live output, re-run with e.g. \`python -u\` or \`stdbuf -oL\`).`;
@@ -131531,6 +131533,7 @@ ${result.output}` : result.output;
     let persistedOutputFiles;
     if (typeof llmContent === "string") {
       const originalLlmContent = llmContent;
+      const outputThreshold = getShellOutputThreshold(this.config);
       const truncatedResult = await truncateToolOutput(
         this.config,
         ShellTool.Name,
@@ -131541,11 +131544,11 @@ ${result.output}` : result.output;
         // scheduler) so the long-run hint below is appended OUTSIDE the
         // truncation envelope; the scheduler's sentinel makes its later pass a
         // no-op here. lines: Infinity keeps this char-only so the global line
-        // cap can't undercut the declared 30k char budget — many short lines
+        // cap can't undercut the effective Shell char budget — many short lines
         // (e.g. `find /`, `ls -R`) would otherwise truncate while chars remain.
         {
-          threshold: 3e4,
-          previewChars: 4e3,
+          threshold: outputThreshold,
+          previewChars: Math.min(4e3, outputThreshold),
           keep: "both",
           lines: Number.POSITIVE_INFINITY
         }
@@ -132743,7 +132746,7 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
   }
   static Name = ToolNames.SHELL;
   get maxOutputChars() {
-    return 3e4;
+    return getShellOutputThreshold(this.config);
   }
   validateToolParamValues(params) {
     if (!params.command.trim()) {
@@ -132892,6 +132895,7 @@ var TRUNCATION_EDIT_REJECTION = "Your previous response was truncated due to max
 function setToolSpanFailure(span, failureKind, message) {
   try {
     span.setAttribute(TOOL_FAILURE_KIND_ATTRIBUTE, failureKind);
+    span.setAttribute("error.type", failureKind);
     span.setAttribute("success", false);
   } catch {
   }
@@ -133731,7 +133735,8 @@ var CoreToolScheduler = class {
    * second call for the same callId is a no-op.
    *
    * No `metadata` parameter: every caller pre-sets span status via
-   * `setToolSpan{Failure,Cancelled,Ok}` before this call (#4321 review).
+   * `setToolSpan{Failure,Cancelled}` or the success path before this call
+   * (#4321 review).
    */
   finalizeToolSpan(callId, force = false) {
     this.bouncedAwaitingApproval.delete(callId);
@@ -135660,6 +135665,8 @@ var CoreToolScheduler = class {
           toolName: canonicalName,
           args: invocation.params,
           signal,
+          sessionId: this.config.getSessionId(),
+          cwd: this.config.getTargetDir(),
           ...invocationContext ? { invocationContext } : {}
         }
       );
@@ -136212,7 +136219,6 @@ ${body}
           return;
         }
         this.setStatusInternal(callId, "success", successResponse);
-        safeSetStatus(span, { code: SpanStatusCode.OK });
         try {
           span.setAttribute("success", true);
         } catch {
@@ -145506,6 +145512,33 @@ var GeminiClient = class _GeminiClient {
   }
   async *sendMessageStream(request, callerSignal, prompt_id, options2, turns = MAX_TURNS2) {
     const messageType = options2?.type ?? "userQuery" /* UserQuery */;
+    const startsInteraction = messageType === "userQuery" /* UserQuery */ || messageType === "retry" /* Retry */ || messageType === "cron" /* Cron */ || messageType === "notification" /* Notification */ || messageType === "teammate" /* Teammate */ || messageType === "goal" /* Goal */;
+    let interactionOwner = startsInteraction ? void 0 : getActiveInteractionSpan(prompt_id);
+    if (interactionOwner) {
+      recordInteractionActivity(prompt_id, interactionOwner);
+    }
+    const agentOutput = new AgentOutputMessageCapture(this.config);
+    const endCurrentInteraction = /* @__PURE__ */ __name((status, errorMessage, errorType) => {
+      if (!interactionOwner || getActiveInteractionSpan(prompt_id) !== interactionOwner) {
+        return;
+      }
+      if (status === "ok" && this.config.getJsonSchema?.()) {
+        endInteractionSpan("error", {
+          promptId: prompt_id,
+          errorMessage: "model did not produce structured output",
+          errorType: "structured_output_missing"
+        });
+        return;
+      }
+      if (status === "ok") {
+        agentOutput.writeToSpan(interactionOwner);
+      }
+      endInteractionSpan(status, {
+        promptId: prompt_id,
+        ...errorMessage ? { errorMessage } : {},
+        ...errorType ? { errorType } : {}
+      });
+    }, "endCurrentInteraction");
     if (messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */ || messageType === "notification" /* Notification */ || messageType === "teammate" /* Teammate */) {
       await this.config.assertCanStartTurn();
     }
@@ -145663,6 +145696,23 @@ var GeminiClient = class _GeminiClient {
       pushCountAfterStrip = currentPushCount();
     }
     const preHookUserPromptText = messageType === "userQuery" /* UserQuery */ ? partToString(request) : void 0;
+    if (startsInteraction) {
+      this.loopDetector.reset(prompt_id);
+      this.lastPromptId = prompt_id;
+      startInteractionSpan(this.config, {
+        promptId: prompt_id,
+        model: options2?.modelOverride ?? this.config.getModel(),
+        messageType
+      });
+      interactionOwner = getActiveInteractionSpan(prompt_id);
+      if (interactionOwner && messageType === "userQuery" /* UserQuery */ && typeof options2?.submittedPrompt === "string") {
+        addAgentInputMessageAttributes(
+          this.config,
+          interactionOwner,
+          options2.submittedPrompt
+        );
+      }
+    }
     let userPromptRecordPayload;
     let hooksEnabled;
     let messageBus;
@@ -145703,9 +145753,12 @@ var GeminiClient = class _GeminiClient {
             await runtime.finishTurn(goalPermit);
             goalPermitReleased = true;
             closeGoalStateEvents();
+            endCurrentInteraction("cancelled");
             for (const goalEvent of takePendingGoalEvents()) {
               yield goalEvent;
             }
+          } else {
+            endCurrentInteraction("cancelled");
           }
           yield {
             type: "user_prompt_submit_blocked" /* UserPromptSubmitBlocked */,
@@ -145733,6 +145786,11 @@ var GeminiClient = class _GeminiClient {
         }
       }
     } catch (error) {
+      endCurrentInteraction(
+        signal.aborted ? "cancelled" : "error",
+        signal.aborted ? void 0 : "UserPromptSubmit hook failed",
+        signal.aborted ? void 0 : getErrorType(error)
+      );
       for (const goalEvent of await finalizeInterruptedGoalTurn()) {
         yield goalEvent;
       }
@@ -145782,6 +145840,11 @@ var GeminiClient = class _GeminiClient {
       }
       if (goalRuntime) bindGoalStateEvents(goalRuntime);
     } catch (error) {
+      endCurrentInteraction(
+        signal.aborted ? "cancelled" : "error",
+        signal.aborted ? void 0 : "Goal turn admission failed",
+        signal.aborted ? void 0 : getErrorType(error)
+      );
       for (const goalEvent of await finalizeInterruptedGoalTurn()) {
         yield goalEvent;
       }
@@ -145813,20 +145876,12 @@ var GeminiClient = class _GeminiClient {
       );
       this.activeAutomaticTodoWorkChainPromptIds.add(prompt_id);
     }
-    const isTopLevelInteraction = messageType === "userQuery" /* UserQuery */ || messageType === "cron" /* Cron */ || messageType === "notification" /* Notification */ || messageType === "teammate" /* Teammate */;
     if (messageType === "goal" /* Goal */) {
       this.loopDetector.reset(prompt_id);
       this.lastPromptId = prompt_id;
     }
-    if (isTopLevelInteraction) {
-      this.loopDetector.reset(prompt_id);
-      this.lastPromptId = prompt_id;
-      startInteractionSpan(this.config, {
-        promptId: prompt_id,
-        model: options2?.modelOverride ?? this.config.getModel(),
-        messageType
-      });
-      const interactionSpan = getActiveInteractionSpan();
+    if (startsInteraction) {
+      const interactionSpan = interactionOwner;
       if (interactionSpan && this.config.getTelemetryIncludeSensitiveSpanAttributes?.()) {
         addUserPromptAttributes(
           this.config,
@@ -145960,18 +146015,18 @@ var GeminiClient = class _GeminiClient {
         if (this.config.getMaxSessionTurns() > 0 && this.sessionTurnCount > this.config.getMaxSessionTurns()) {
           this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
           yield { type: "max_session_turns" /* MaxSessionTurns */ };
-          if (isTopLevelInteraction)
-            endInteractionSpan("error", {
-              errorMessage: "max session turns exceeded"
-            });
+          endCurrentInteraction(
+            "error",
+            "max session turns exceeded",
+            "max_session_turns"
+          );
           return new Turn(this.getChat(), prompt_id);
         }
       }
       const boundedTurns = messageType === "goal" /* Goal */ ? MAX_TURNS2 : Math.min(turns, MAX_TURNS2);
       if (!boundedTurns) {
         this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
-        if (isTopLevelInteraction)
-          endInteractionSpan("error", { errorMessage: "max turns exhausted" });
+        endCurrentInteraction("error", "max turns exhausted", "max_turns");
         return new Turn(this.getChat(), prompt_id);
       }
       const takeSteerInput = /* @__PURE__ */ __name(async (nextTurnBudget) => {
@@ -146005,10 +146060,11 @@ var GeminiClient = class _GeminiClient {
               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"
-            });
+          endCurrentInteraction(
+            "error",
+            "session token limit exceeded",
+            "session_token_limit"
+          );
           return new Turn(this.getChat(), prompt_id);
         }
       }
@@ -146042,7 +146098,7 @@ var GeminiClient = class _GeminiClient {
           );
           await arenaAgentClient.reportCancelled();
           this.cancelPendingMemoryPrefetch("abort");
-          if (isTopLevelInteraction) endInteractionSpan("cancelled");
+          endCurrentInteraction("cancelled");
           return new Turn(this.getChat(), prompt_id);
         }
       }
@@ -146177,6 +146233,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
         signal,
         (message) => this.config.getDebugLogger().warn(message)
       ) : null;
+      agentOutput.beginResponse();
       const resultStream = turn.run(model, requestToSend, signal);
       let didUpdateIdeContextState = false;
       let steerInputSettled = false;
@@ -146190,6 +146247,14 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             hasToolCalls = true;
           } else if (event.type === "retry" /* Retry */ || event.type === "model_fallback" /* ModelFallback */) {
             hasToolCalls = false;
+            agentOutput.restartAttempt(
+              event.type === "retry" /* Retry */ && event.isContinuation === true
+            );
+          }
+          if (event.type === "content" /* Content */) {
+            agentOutput.appendText(event.value);
+          } else if (event.type === "finished" /* Finished */) {
+            agentOutput.observeFinishReason(event.value?.reason);
           }
           if (messageDisplay && event.type === "content" /* Content */) {
             messageDisplay.addChunk(event.value);
@@ -146214,8 +146279,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               await arenaAgentClient.reportError("Loop detected");
             }
             this.lastApiCompletionTimestamp = Date.now();
-            if (isTopLevelInteraction)
-              endInteractionSpan("error", { errorMessage: "loop detected" });
+            endCurrentInteraction("error", "loop detected", "loop_detected");
             this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
             this.fireLoopDetectedStopFailure(loopType);
             return turn;
@@ -146235,8 +146299,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               await arenaAgentClient.reportError("Loop detected");
             }
             this.lastApiCompletionTimestamp = Date.now();
-            if (isTopLevelInteraction)
-              endInteractionSpan("error", { errorMessage: "loop detected" });
+            endCurrentInteraction("error", "loop detected", "loop_detected");
             this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
             this.fireLoopDetectedStopFailure(loopType);
             return turn;
@@ -146283,10 +146346,12 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               await arenaAgentClient.reportError(errorMsg);
             }
             this.lastApiCompletionTimestamp = Date.now();
-            if (isTopLevelInteraction) {
-              const errMsg = event.value instanceof Error ? "[API error]" : "unknown error";
-              endInteractionSpan("error", { errorMessage: errMsg });
-            }
+            const errMsg = event.value instanceof Error ? "[API error]" : "unknown error";
+            endCurrentInteraction(
+              "error",
+              errMsg,
+              event.value instanceof Error ? getErrorType(event.value) : "api_error"
+            );
             this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
             return turn;
           }
@@ -146294,6 +146359,9 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
       } finally {
         await messageDisplay?.finish();
       }
+      agentOutput.commitResponse(
+        hasToolCalls || turn.pendingToolCalls.length > 0
+      );
       for (const goalEvent of signal.aborted ? await finalizeInterruptedGoalTurn() : takePendingGoalEvents()) {
         yield goalEvent;
       }
@@ -146320,9 +146388,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           } finally {
             settleSteerInput(steerInput, pushCountBefore);
           }
-          if (isTopLevelInteraction)
-            endInteractionSpan(signal.aborted ? "cancelled" : "ok");
           hasToolCalls = steeredTurn.pendingToolCalls.length > 0;
+          if (!hasToolCalls) {
+            endCurrentInteraction(signal.aborted ? "cancelled" : "ok");
+          }
           normalCompletion = true;
           return steeredTurn;
         }
@@ -146360,7 +146429,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           if (activeGoalEvent2) {
             yield activeGoalEvent2;
           }
-          if (isTopLevelInteraction) endInteractionSpan("cancelled");
+          endCurrentInteraction("cancelled");
           return turn;
         }
         const hookOutput = response.output ? createHookOutput("Stop", response.output) : void 0;
@@ -146392,7 +146461,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             for (const goalEvent of await finalizeInterruptedGoalTurn()) {
               yield goalEvent;
             }
-            if (isTopLevelInteraction) endInteractionSpan("ok");
+            endCurrentInteraction("ok");
             return turn;
           } else {
             for (const goalEvent of takePendingGoalEvents()) {
@@ -146416,7 +146485,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               for (const goalEvent of await finalizeInterruptedGoalTurn()) {
                 yield goalEvent;
               }
-              if (isTopLevelInteraction) endInteractionSpan("cancelled");
+              endCurrentInteraction("cancelled");
               return turn;
             }
             const continueRequest = [{ text: continueReason }];
@@ -146445,8 +146514,9 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             } finally {
               settleSteerInput(pendingSteer, pushCountBefore);
             }
-            if (isTopLevelInteraction) {
-              endInteractionSpan(signal.aborted ? "cancelled" : "ok");
+            hasToolCalls = hookTurn.pendingToolCalls.length > 0;
+            if (!hasToolCalls) {
+              endCurrentInteraction(signal.aborted ? "cancelled" : "ok");
             }
             normalCompletion = true;
             return hookTurn;
@@ -146460,7 +146530,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             if (activeGoalEvent3) {
               yield activeGoalEvent3;
             }
-            if (isTopLevelInteraction) endInteractionSpan("cancelled");
+            endCurrentInteraction("cancelled");
             return turn;
           }
           const continueReason = getStopHookContinuationReason(stopOutput);
@@ -146492,7 +146562,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               value: warning
             };
             debugLogger136.warn(warning);
-            if (isTopLevelInteraction) endInteractionSpan("ok");
+            endCurrentInteraction("ok");
             return turn;
           }
           const activeGoalEvent2 = maybeEmitActiveGoalChange(
@@ -146527,7 +146597,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           const discardGoalContinuation = goalContinuationChanged && response.hasNonGoalBlockingStopHook === false;
           const continuationReasonAfterSteer = discardGoalContinuation ? void 0 : goalContinuationChanged && response.hasNonGoalBlockingStopHook === true ? response.nonGoalBlockingStopReason || "No reason provided" : continueReason;
           if (!continuationReasonAfterSteer && !pendingSteer) {
-            if (isTopLevelInteraction) endInteractionSpan("ok");
+            endCurrentInteraction("ok");
             normalCompletion = true;
             return turn;
           }
@@ -146563,9 +146633,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           } finally {
             settleSteerInput(pendingSteer, pushCountBefore);
           }
-          if (isTopLevelInteraction)
-            endInteractionSpan(signal.aborted ? "cancelled" : "ok");
           hasToolCalls = hookTurn.pendingToolCalls.length > 0;
+          if (!hasToolCalls) {
+            endCurrentInteraction(signal.aborted ? "cancelled" : "ok");
+          }
           normalCompletion = true;
           return hookTurn;
         }
@@ -146590,6 +146661,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
         for (const goalEvent of takePendingGoalEvents()) {
           yield goalEvent;
         }
+        endCurrentInteraction("ok");
         normalCompletion = true;
         return turn;
       }
@@ -146619,7 +146691,7 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           if (arenaAgentClient) {
             await arenaAgentClient.reportCompleted();
           }
-          if (isTopLevelInteraction) endInteractionSpan("ok");
+          endCurrentInteraction("ok");
           return turn;
         }
         const nextSpeakerCheck = await checkNextSpeaker(
@@ -146658,9 +146730,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           } finally {
             settleSteerInput(pendingSteer, pushCountBefore);
           }
-          if (isTopLevelInteraction)
-            endInteractionSpan(signal.aborted ? "cancelled" : "ok");
           hasToolCalls = continueTurn.pendingToolCalls.length > 0;
+          if (!hasToolCalls) {
+            endCurrentInteraction(signal.aborted ? "cancelled" : "ok");
+          }
           normalCompletion = true;
           return continueTurn;
         }
@@ -146674,8 +146747,8 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
       if (signal?.aborted && arenaAgentClient) {
         await arenaAgentClient.reportCancelled();
       }
-      if (isTopLevelInteraction) {
-        endInteractionSpan(signal?.aborted ? "cancelled" : "ok");
+      if (!hasToolCalls) {
+        endCurrentInteraction(signal?.aborted ? "cancelled" : "ok");
       }
       if (!hasToolCalls) {
         this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
@@ -146707,10 +146780,12 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           signal?.aborted ? "abort" : "no_safe_delivery_point"
         );
       }
-      if (isTopLevelInteraction) {
-        endInteractionSpan(signal?.aborted ? "cancelled" : "error", {
-          errorMessage: "unexpected exit"
-        });
+      if (!normalCompletion) {
+        endCurrentInteraction(
+          signal?.aborted ? "cancelled" : "error",
+          signal?.aborted ? void 0 : "unexpected exit",
+          signal?.aborted ? void 0 : "unexpected_exit"
+        );
       }
     }
   }
@@ -148711,6 +148786,7 @@ var Config = class _Config {
   runtimeStatusWrite = Promise.resolve();
   fileExclusions;
   truncateToolOutputThreshold;
+  truncateToolOutputThresholdExplicit;
   truncateToolOutputLines;
   toolOutputBatchBudget;
   shellDefaultTimeoutMs;
@@ -148963,6 +149039,7 @@ var Config = class _Config {
       maxBufferedOutputBytes: params.shellExecutionConfig?.maxBufferedOutputBytes
     };
     this.truncateToolOutputThreshold = params.truncateToolOutputThreshold ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
+    this.truncateToolOutputThresholdExplicit = params.truncateToolOutputThreshold != null;
     this.truncateToolOutputLines = params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
     this.toolOutputBatchBudget = params.toolOutputBatchBudget ?? DEFAULT_TOOL_OUTPUT_BATCH_BUDGET;
     this.shellDefaultTimeoutMs = params.shellDefaultTimeoutMs !== void 0 && Number.isInteger(params.shellDefaultTimeoutMs) && params.shellDefaultTimeoutMs >= 0 && params.shellDefaultTimeoutMs <= 2147483647 ? params.shellDefaultTimeoutMs : void 0;
@@ -152820,6 +152897,9 @@ var Config = class _Config {
     }
     return this.truncateToolOutputThreshold;
   }
+  isTruncateToolOutputThresholdExplicit() {
+    return this.truncateToolOutputThresholdExplicit;
+  }
   getTruncateToolOutputLines() {
     if (this.truncateToolOutputLines <= 0) {
       return Number.POSITIVE_INFINITY;
@@ -153370,7 +153450,7 @@ var Config = class _Config {
     }
     if (!enabled) return;
     registry.registerFactory(ToolNames.IMAGE_GEN, async () => {
-      const { ImageGenTool } = await import("./image-gen-DC2IQZ73.js");
+      const { ImageGenTool } = await import("./image-gen-YPK2AZT4.js");
       return new ImageGenTool(this);
     });
   }
@@ -153400,36 +153480,36 @@ var Config = class _Config {
       if (options2?.forSubAgent) return;
       const schema = this.jsonSchema;
       await registerLazy(ToolNames.STRUCTURED_OUTPUT, async () => {
-        const { SyntheticOutputTool } = await import("./syntheticOutput-SEW4NA47.js");
+        const { SyntheticOutputTool } = await import("./syntheticOutput-DVHJMUGV.js");
         return new SyntheticOutputTool(schema);
       });
     }, "registerStructuredOutputIfRequested");
     const registerGoalWorkerTools = /* @__PURE__ */ __name(async () => {
       if (options2?.forSubAgent) return;
       await registerLazy(ToolNames.GET_GOAL, async () => {
-        const { GetGoalTool } = await import("./goal-tools-LQFO4BRY.js");
+        const { GetGoalTool } = await import("./goal-tools-M4UDAZXP.js");
         return new GetGoalTool(this);
       });
       await registerLazy(ToolNames.UPDATE_GOAL, async () => {
-        const { UpdateGoalTool } = await import("./goal-tools-LQFO4BRY.js");
+        const { UpdateGoalTool } = await import("./goal-tools-M4UDAZXP.js");
         return new UpdateGoalTool(this);
       });
     }, "registerGoalWorkerTools");
     if (this.getBareMode()) {
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-IYEBTQT5.js");
+        const { ReadFileTool } = await import("./read-file-LOVUSBJC.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-OXBMFY5B.js");
+        const { EditTool } = await import("./edit-X73LA4YO.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-        const { NotebookEditTool } = await import("./notebook-edit-STSSB5KQ.js");
+        const { NotebookEditTool } = await import("./notebook-edit-QD4TRKLY.js");
         return new NotebookEditTool(this);
       });
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-AR7XFLHA.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-EGTSUO2P.js");
         return new ShellTool2(this);
       });
       await registerGoalWorkerTools();
@@ -153441,43 +153521,43 @@ var Config = class _Config {
     }
     await registerGoalWorkerTools();
     await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-      const { ToolSearchTool } = await import("./tool-search-4UVNFYWU.js");
+      const { ToolSearchTool } = await import("./tool-search-QNBLXUGR.js");
       return new ToolSearchTool(this);
     });
     await registerLazy(ToolNames.READ_MCP_RESOURCE, async () => {
-      const { ReadMcpResourceTool } = await import("./read-mcp-resource-THCSZHXO.js");
+      const { ReadMcpResourceTool } = await import("./read-mcp-resource-GWCP23WG.js");
       return new ReadMcpResourceTool(this);
     });
     await registerLazy(ToolNames.AGENT, async () => {
-      const { AgentTool: AgentTool2 } = await import("./agent-43KVQSB5.js");
+      const { AgentTool: AgentTool2 } = await import("./agent-E6V3VXQR.js");
       return new AgentTool2(this);
     });
     await registerLazy(ToolNames.LIST_AGENTS, async () => {
-      const { ListAgentsTool } = await import("./list-agents-5PNMK2AM.js");
+      const { ListAgentsTool } = await import("./list-agents-O6WSY4CT.js");
       return new ListAgentsTool(this);
     });
     await registerLazy(ToolNames.TASK_STOP, async () => {
-      const { TaskStopTool } = await import("./task-stop-MAYQJ42I.js");
+      const { TaskStopTool } = await import("./task-stop-YFNATTIM.js");
       return new TaskStopTool(this);
     });
     await registerLazy(ToolNames.SEND_MESSAGE, async () => {
-      const { SendMessageTool } = await import("./send-message-P5SLP57G.js");
+      const { SendMessageTool } = await import("./send-message-O7FO63UK.js");
       return new SendMessageTool(this);
     });
     await registerLazy(ToolNames.SKILL, async () => {
-      const { SkillTool } = await import("./skill-K6NOUUYM.js");
+      const { SkillTool } = await import("./skill-IFUD72GF.js");
       return new SkillTool(this);
     });
     await registerLazy(ToolNames.LS, async () => {
-      const { LSTool } = await import("./ls-RPRSX26R.js");
+      const { LSTool } = await import("./ls-6W2D7TKU.js");
       return new LSTool(this);
     });
     await registerLazy(ToolNames.READ_FILE, async () => {
-      const { ReadFileTool } = await import("./read-file-IYEBTQT5.js");
+      const { ReadFileTool } = await import("./read-file-LOVUSBJC.js");
       return new ReadFileTool(this);
     });
     await registerLazy(ToolNames.ZOOM_IMAGE, async () => {
-      const { ZoomImageTool } = await import("./zoom-image-4TQA5GHG.js");
+      const { ZoomImageTool } = await import("./zoom-image-4MVVVM7E.js");
       return new ZoomImageTool(this);
     });
     if (this.getUseRipgrep()) {
@@ -153492,7 +153572,7 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       if (useRipgrep) {
         await registerLazy(ToolNames.GREP, async () => {
-          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-VV2CRCL2.js");
+          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-ZJSHKB6H.js");
           return new RipGrepTool2(this);
         });
       } else {
@@ -153505,7 +153585,7 @@ var Config = class _Config {
           )
         );
         await registerLazy(ToolNames.GREP, async () => {
-          const { GrepTool } = await import("./grep-6CN23ZPS.js");
+          const { GrepTool } = await import("./grep-F4UAR7KX.js");
           return new GrepTool(this);
         });
       }
@@ -153513,77 +153593,77 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_start");
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       await registerLazy(ToolNames.GREP, async () => {
-        const { GrepTool } = await import("./grep-6CN23ZPS.js");
+        const { GrepTool } = await import("./grep-F4UAR7KX.js");
         return new GrepTool(this);
       });
     }
     await registerLazy(ToolNames.GLOB, async () => {
-      const { GlobTool } = await import("./glob-JKVAHWL5.js");
+      const { GlobTool } = await import("./glob-VMEEDDLO.js");
       return new GlobTool(this);
     });
     await registerLazy(ToolNames.EDIT, async () => {
-      const { EditTool } = await import("./edit-OXBMFY5B.js");
+      const { EditTool } = await import("./edit-X73LA4YO.js");
       return new EditTool(this);
     });
     await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-      const { NotebookEditTool } = await import("./notebook-edit-STSSB5KQ.js");
+      const { NotebookEditTool } = await import("./notebook-edit-QD4TRKLY.js");
       return new NotebookEditTool(this);
     });
     await registerLazy(ToolNames.WRITE_FILE, async () => {
-      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-MSFRVUZB.js");
+      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-JJAY7JSP.js");
       return new WriteFileTool2(this);
     });
     await registerLazy(ToolNames.SHELL, async () => {
-      const { ShellTool: ShellTool2 } = await import("./shell-AR7XFLHA.js");
+      const { ShellTool: ShellTool2 } = await import("./shell-EGTSUO2P.js");
       return new ShellTool2(this);
     });
     await registerLazy(ToolNames.TODO_WRITE, async () => {
-      const { TodoWriteTool } = await import("./todoWrite-IE2YTCK7.js");
+      const { TodoWriteTool } = await import("./todoWrite-K5K7NRE5.js");
       return new TodoWriteTool(this);
     });
     const supportsUserInteraction = resolveInteractionMode(this) !== "headless";
     if (supportsUserInteraction) {
       await registerLazy(ToolNames.ASK_USER_QUESTION, async () => {
-        const { AskUserQuestionTool } = await import("./askUserQuestion-IQCA2SOX.js");
+        const { AskUserQuestionTool } = await import("./askUserQuestion-HZJJLR3Z.js");
         return new AskUserQuestionTool(this);
       });
     }
     if (!this.sdkMode && (supportsUserInteraction || options2?.forSubAgent)) {
       await registerLazy(ToolNames.EXIT_PLAN_MODE, async () => {
-        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-QQL27HU4.js");
+        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-WDURQMIU.js");
         return new ExitPlanModeTool2(this);
       });
     }
     if (!this.sdkMode && supportsUserInteraction) {
       await registerLazy(ToolNames.ENTER_PLAN_MODE, async () => {
-        const { EnterPlanModeTool } = await import("./enterPlanMode-J6PDPFFT.js");
+        const { EnterPlanModeTool } = await import("./enterPlanMode-6BDYUQ5T.js");
         return new EnterPlanModeTool(this);
       });
     }
     await registerLazy(ToolNames.ENTER_WORKTREE, async () => {
-      const { EnterWorktreeTool } = await import("./enter-worktree-XS4JX4PO.js");
+      const { EnterWorktreeTool } = await import("./enter-worktree-CLRQTIVN.js");
       return new EnterWorktreeTool(this);
     });
     await registerLazy(ToolNames.EXIT_WORKTREE, async () => {
-      const { ExitWorktreeTool } = await import("./exit-worktree-2RIE6DAO.js");
+      const { ExitWorktreeTool } = await import("./exit-worktree-TFFJXCRT.js");
       return new ExitWorktreeTool(this);
     });
     await registerLazy(ToolNames.WEB_FETCH, async () => {
-      const { WebFetchTool } = await import("./web-fetch-5ANX6FSM.js");
+      const { WebFetchTool } = await import("./web-fetch-MBIVXKPE.js");
       return new WebFetchTool(this);
     });
     if (resolveInteractionMode(this) === "interactive" && !this.sdkMode && !this.getScreenReader() && !options2?.forSubAgent) {
       await registerLazy(ToolNames.DISPLAY_IMAGE, async () => {
-        const { DisplayImageTool } = await import("./display-image-CAD7RAUM.js");
+        const { DisplayImageTool } = await import("./display-image-M2ELAVN4.js");
         return new DisplayImageTool(this);
       });
     }
     if (this.webSearchSettings?.enabled) {
-      const { evaluateWebSearchGate } = await import("./web-search-KQJWWRHW.js");
+      const { evaluateWebSearchGate } = await import("./web-search-4LBIN6VF.js");
       const gate = evaluateWebSearchGate(this);
       if (gate.ok) {
         await registerLazy(ToolNames.WEB_SEARCH, async () => {
-          const { WebSearchTool } = await import("./web-search-KQJWWRHW.js");
+          const { WebSearchTool } = await import("./web-search-4LBIN6VF.js");
           return new WebSearchTool(this);
         });
       } else if (!this.webSearchNoticeEmitted && !options2?.forSubAgent) {
@@ -153594,83 +153674,83 @@ var Config = class _Config {
     await this.registerImageGenerationTool(registry);
     if (this.isArtifactEnabled()) {
       await registerLazy(ToolNames.ARTIFACT, async () => {
-        const { ArtifactTool } = await import("./artifact-tool-RWJAKYBZ.js");
+        const { ArtifactTool } = await import("./artifact-tool-4GCQQDZI.js");
         return new ArtifactTool(this);
       });
     }
     if (this.isRecordArtifactEnabled()) {
       await registerLazy(ToolNames.RECORD_ARTIFACT, async () => {
-        const { RecordArtifactTool } = await import("./record-artifact-76YYQA5F.js");
+        const { RecordArtifactTool } = await import("./record-artifact-IYQDEYMV.js");
         return new RecordArtifactTool();
       });
     }
     if (this.isLspEnabled() && this.getLspClient()) {
       await registerLazy(ToolNames.LSP, async () => {
-        const { LspTool } = await import("./lsp-IWTJWFLT.js");
+        const { LspTool } = await import("./lsp-NJ4KFBI2.js");
         return new LspTool(this);
       });
     }
     await registerStructuredOutputIfRequested();
     if (this.isCronEnabled()) {
       await registerLazy(ToolNames.CRON_CREATE, async () => {
-        const { CronCreateTool } = await import("./cron-create-5WUTNKNF.js");
+        const { CronCreateTool } = await import("./cron-create-2JZ2TWTF.js");
         return new CronCreateTool(this);
       });
       await registerLazy(ToolNames.CRON_LIST, async () => {
-        const { CronListTool } = await import("./cron-list-IXGCA7UR.js");
+        const { CronListTool } = await import("./cron-list-V44KHAF6.js");
         return new CronListTool(this);
       });
       await registerLazy(ToolNames.CRON_DELETE, async () => {
-        const { CronDeleteTool } = await import("./cron-delete-JEQ27YPS.js");
+        const { CronDeleteTool } = await import("./cron-delete-CTPD2P26.js");
         return new CronDeleteTool(this);
       });
       await registerLazy(ToolNames.LOOP_WAKEUP, async () => {
-        const { LoopWakeupTool } = await import("./loop-wakeup-OV65FEGR.js");
+        const { LoopWakeupTool } = await import("./loop-wakeup-GVQRMUKS.js");
         return new LoopWakeupTool(this);
       });
     }
     await registerLazy(ToolNames.CREATE_SUB_SESSION, async () => {
-      const { CreateSubSessionTool } = await import("./create-sub-session-23ULO5PO.js");
+      const { CreateSubSessionTool } = await import("./create-sub-session-XT6DLYOE.js");
       return new CreateSubSessionTool(this);
     });
     if (this.isAgentTeamEnabled()) {
       await registerLazy(ToolNames.TEAM_CREATE, async () => {
-        const { TeamCreateTool } = await import("./team-create-IEEEBLE2.js");
+        const { TeamCreateTool } = await import("./team-create-B6A6MJBT.js");
         return new TeamCreateTool(this);
       });
       await registerLazy(ToolNames.TEAM_DELETE, async () => {
-        const { TeamDeleteTool } = await import("./team-delete-3XVRPQBP.js");
+        const { TeamDeleteTool } = await import("./team-delete-MKYMYBFM.js");
         return new TeamDeleteTool(this);
       });
       await registerLazy(ToolNames.TEAM_PLAN_APPROVAL, async () => {
-        const { TeamPlanApprovalTool } = await import("./team-plan-approval-SJGNS5JL.js");
+        const { TeamPlanApprovalTool } = await import("./team-plan-approval-5WO3CXXU.js");
         return new TeamPlanApprovalTool(this);
       });
       await registerLazy(ToolNames.TASK_CREATE, async () => {
-        const { TaskCreateTool } = await import("./task-create-247EAVF7.js");
+        const { TaskCreateTool } = await import("./task-create-4NC7PDI4.js");
         return new TaskCreateTool(this);
       });
       await registerLazy(ToolNames.TASK_UPDATE, async () => {
-        const { TaskUpdateTool } = await import("./task-update-SU5TMZGG.js");
+        const { TaskUpdateTool } = await import("./task-update-BPLM52GD.js");
         return new TaskUpdateTool(this);
       });
       await registerLazy(ToolNames.TASK_LIST, async () => {
-        const { TaskListTool } = await import("./task-list-ZJN4QHLK.js");
+        const { TaskListTool } = await import("./task-list-LBSRMOC7.js");
         return new TaskListTool(this);
       });
     }
     if (this.isWorkflowsEnabled()) {
       await registerLazy(ToolNames.WORKFLOW, async () => {
-        const { WorkflowTool } = await import("./workflow-C57ZKFUF.js");
+        const { WorkflowTool } = await import("./workflow-LNMA55HY.js");
         return new WorkflowTool(this);
       });
     }
     if (this.isComputerUseEnabled()) {
-      const { registerComputerUseTools } = await import("./computer-use-J5VUY257.js");
+      const { registerComputerUseTools } = await import("./computer-use-F4URV4TU.js");
       await registerComputerUseTools(registerLazy, this);
     }
     await registerLazy(ToolNames.MONITOR, async () => {
-      const { MonitorTool } = await import("./monitor-SLGY7CYB.js");
+      const { MonitorTool } = await import("./monitor-2MM23VDV.js");
       return new MonitorTool(this);
     });
     if (this.pendingMcpBudgetCallback) {
@@ -154231,10 +154311,6 @@ export {
   isEditorAvailable,
   createPatchSmart,
   getDiffStat,
-  stripAnsiAndControl,
-  safeLiteralReplace,
-  isBinary,
-  normalizeContent,
   sanitizeChildEnv,
   formatMemoryUsage,
   getShellContextEnvVars,
@@ -154307,8 +154383,6 @@ export {
   MessageDisplayDispatcher,
   collectMemoryDiagnostics,
   MCPOAuthTokenStorage,
-  OAUTH_DISPLAY_MESSAGE_EVENT,
-  OAUTH_AUTH_URL_EVENT,
   MCPOAuthProvider,
   mcpServerRequiresOAuth,
   getMCPDiscoveryState,
@@ -154331,7 +154405,6 @@ export {
   isTerminalWorkflowStatus,
   EXTENSIONS_CONFIG_FILENAME,
   So,
-  redactUrlCredentials,
   require_toml,
   convertTomlToMarkdown,
   normalizeClaudeMcpServer,