@qwen-code/qwen-code 0.21.12-preview.5 → 0.21.13

package/chunks/{chunk-T7YMWGFY.js → chunk-4S5337WV.js}

@@ -40,7 +40,7 @@ import {
   CronScheduler,
   DEFAULT_RECURRING_MAX_AGE_DAYS,
   normalizeRecurringMaxAge
-} from "./chunk-NM33GGOM.js";
+} from "./chunk-DGZEMW5R.js";
 import {
   consumeUnread,
   forwardApproval,
@@ -49,13 +49,13 @@ import {
   sendStructuredMessage,
   wrapConfirmWithBadge,
   writeMessage
-} from "./chunk-A4BAHMJF.js";
+} from "./chunk-WSH6GRKG.js";
 import {
   claimTask,
   listTasks,
   onTasksUpdated,
   unassignTeammateTasks
-} from "./chunk-ZPZANKVP.js";
+} from "./chunk-CKSJECTU.js";
 import {
   assignTeammateColor,
   classifyShutdownResponse,
@@ -63,7 +63,7 @@ import {
   formatAgentId,
   generateUniqueTeammateName,
   writeTeamFile
-} from "./chunk-A6GQUQ7I.js";
+} from "./chunk-OVZPVYZB.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -71,13 +71,13 @@ import {
   RUNTIME_SNAPSHOT_PREFIX,
   buildModelIdContext,
   resolveModelId
-} from "./chunk-OZTGLK53.js";
+} from "./chunk-5EYKMUUY.js";
 import {
   ARTIFACT_TITLE_MAX_LENGTH,
   ARTIFACT_WORKSPACE_PATH_MAX_LENGTH,
   hasControlCharacter,
   hasUnsafeDisplayPayload
-} from "./chunk-7WUMS2UA.js";
+} from "./chunk-UPDOZBWO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -101,7 +101,7 @@ import {
   isPlanRequiredTeammatePreApprovalAllowedTool,
   isSubagentLikeExecutionContext,
   shouldUsePlanOnlyReminderInSubagentContext
-} from "./chunk-SNHBRO4C.js";
+} from "./chunk-RWDNJBWN.js";
 import {
   SKILL_FILE_NAME,
   SKILL_NAME_PATTERN,
@@ -121,10 +121,7 @@ import {
   require_dist as require_dist2,
   stringify,
   validateSkillName
-} from "./chunk-KTWUFHS4.js";
-import {
-  require_proper_lockfile
-} from "./chunk-KRXPRVGL.js";
+} from "./chunk-25EYDK42.js";
 import {
   DefaultHookOutput,
   HOOKS_CONFIG_FIELDS,
@@ -139,15 +136,18 @@ import {
   createHookOutput,
   getHookKey,
   isToolArtifactLike
-} from "./chunk-2ASWIM4A.js";
+} from "./chunk-MIPFDQAF.js";
+import {
+  require_proper_lockfile
+} from "./chunk-MLXTMF7H.js";
 import {
   BaseTokenStorage,
   KeychainTokenStorage
-} from "./chunk-67F2BEYW.js";
+} from "./chunk-KV27IEHM.js";
 import {
   normalizeImageGenerationBaseUrl,
   resolveNetworkTarget
-} from "./chunk-TNETSI2A.js";
+} from "./chunk-E3DYKPYZ.js";
 import {
   EvidenceSourceUnavailableError,
   GoalEvidenceCheckpointAccumulator,
@@ -173,22 +173,24 @@ import {
   validateTranscriptRecord,
   walkTranscriptUuidChain,
   wrapUserPromptSubmitContext
-} from "./chunk-B66LYK4B.js";
+} from "./chunk-OMLJNPBE.js";
 import {
+  AgentOutputMessageCapture,
   DEFAULT_OTLP_ENDPOINT,
   DEFAULT_TELEMETRY_TARGET,
+  addAgentInputMessageAttributes,
   addDaemonRequestAttribute,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
   addUserPromptAttributes
-} from "./chunk-U5C2GIN2.js";
+} from "./chunk-TIGA2IVL.js";
 import {
   supportsOpenAIPrefixCaching
 } from "./chunk-SAH4BD2J.js";
 import {
   DashScopeOpenAICompatibleProvider,
   selectDashScopeThinkingKnob
-} from "./chunk-2RTRFLWH.js";
+} from "./chunk-XLLKYULU.js";
 import {
   childLaunchDepth,
   getCurrentAgentDepth,
@@ -199,7 +201,7 @@ import {
   runWithAgentContext,
   runWithRuntimeContentGenerator,
   spawnBlockReason
-} from "./chunk-SKRHR6N2.js";
+} from "./chunk-PT4I7NBA.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-SG7ZP5PG.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-KBXKR5R2.js";
+import {
+  openBrowserSecurely,
+  shouldAttemptBrowserLaunch
+} from "./chunk-NAVJD2PQ.js";
+import {
+  isUnattendedMode,
+  retryWithBackoff
+} from "./chunk-2B2BF7P7.js";
+import {
+  classifyRetryError,
+  isFallbackEligible
+} from "./chunk-YZHRN3CF.js";
+import {
+  QUOTA_EXHAUSTED_PREFIX,
+  formatQuotaExhaustedMessage,
+  getRateLimitErrorDetails,
+  getRateLimitRetryDelayMs,
+  isApiError,
+  isQuotaExhaustedError,
+  isRateLimitError,
+  isStructuredError
+} from "./chunk-FAAUPSY2.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-RVOJ2FBP.js";
 import {
   defaultModalities,
   isTieredEffortWireModel
@@ -355,65 +443,13 @@ import {
   isManagedMemoryPath,
   isTeamAutoMemPath,
   isUserAutoMemPath
-} from "./chunk-6OJDN5ZT.js";
+} from "./chunk-CHHABXPE.js";
 import {
   runSideQuery
-} from "./chunk-JRTJEGSP.js";
+} from "./chunk-MA2HEDVP.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-XUJNK7Y6.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-6HY6IF3Z.js";
 import {
   AUTH_ENV_MAPPINGS,
   AuthType,
@@ -466,24 +480,11 @@ import {
   createContentGenerator,
   resetPreloadedContentGenerator,
   resolveContentGeneratorConfigWithSources
-} from "./chunk-VGGNHRYZ.js";
+} from "./chunk-4PKCUT7F.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-CPHEPGAO.js";
+import {
+  atomicWriteFile,
+  atomicWriteFileSync,
+  atomicWriteJSON,
+  renameWithRetry
+} from "./chunk-FDGGZIYW.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-EL5SXY3T.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-BUQDLC2G.js";
 import {
   require_src
 } from "./chunk-AMDSOFFV.js";
@@ -931,7 +939,7 @@ var require_scan = __commonJS({
       const scanToEnd = opts.parts === true || opts.scanToEnd === true;
       const slashes = [];
       const tokens = [];
-      const parts = [];
+      const parts2 = [];
       let str = input;
       let index = -1;
       let start = 0;
@@ -1188,13 +1196,13 @@ var require_scan = __commonJS({
             state.maxDepth += tokens[idx].depth;
           }
           if (idx !== 0 || value !== "") {
-            parts.push(value);
+            parts2.push(value);
           }
           prevIndex = i;
         }
         if (prevIndex && prevIndex + 1 < input.length) {
           const value = input.slice(prevIndex + 1);
-          parts.push(value);
+          parts2.push(value);
           if (opts.tokens) {
             tokens[tokens.length - 1].value = value;
             depth(tokens[tokens.length - 1]);
@@ -1202,7 +1210,7 @@ var require_scan = __commonJS({
           }
         }
         state.slashes = slashes;
-        state.parts = parts;
+        state.parts = parts2;
       }
       return state;
     }, "scan");
@@ -1241,7 +1249,7 @@ var require_parse = __commonJS({
       return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
     }, "syntaxError");
     var splitTopLevel = /* @__PURE__ */ __name((input) => {
-      const parts = [];
+      const parts2 = [];
       let bracket = 0;
       let paren = 0;
       let quote2 = 0;
@@ -1274,7 +1282,7 @@ var require_parse = __commonJS({
             } else if (ch === ")" && paren > 0) {
               paren--;
             } else if (ch === "|" && paren === 0) {
-              parts.push(value);
+              parts2.push(value);
               value = "";
               continue;
             }
@@ -1282,8 +1290,8 @@ var require_parse = __commonJS({
         }
         value += ch;
       }
-      parts.push(value);
-      return parts;
+      parts2.push(value);
+      return parts2;
     }, "splitTopLevel");
     var isPlainBranch = /* @__PURE__ */ __name((branch) => {
       let escaped = false;
@@ -9443,7 +9451,7 @@ var require_brace_expansion = __commonJS({
     function parseCommaParts(str) {
       if (!str)
         return [""];
-      var parts = [];
+      var parts2 = [];
       var m2 = balanced("{", "}", str);
       if (!m2)
         return str.split(",");
@@ -9457,8 +9465,8 @@ var require_brace_expansion = __commonJS({
         p2[p2.length - 1] += postParts.shift();
         p2.push.apply(p2, postParts);
       }
-      parts.push.apply(parts, p2);
-      return parts;
+      parts2.push.apply(parts2, p2);
+      return parts2;
     }
     __name(parseCommaParts, "parseCommaParts");
     function expandTop(str, options2) {
@@ -13964,12 +13972,12 @@ var require_datepart = __commonJS({
       constructor({
         token,
         date,
-        parts,
+        parts: parts2,
         locales
       }) {
         this.token = token;
         this.date = date || /* @__PURE__ */ new Date();
-        this.parts = parts || [this];
+        this.parts = parts2 || [this];
         this.locales = locales || {};
       }
       up() {
@@ -13983,9 +13991,9 @@ var require_datepart = __commonJS({
       setTo(val) {
       }
       prev() {
-        let parts = [].concat(this.parts).reverse();
-        const currentIdx = parts.indexOf(this);
-        return parts.find((part, idx) => idx > currentIdx && part instanceof _DatePart);
+        let parts2 = [].concat(this.parts).reverse();
+        const currentIdx = parts2.indexOf(this);
+        return parts2.find((part, idx) => idx > currentIdx && part instanceof _DatePart);
       }
       toString() {
         return String(this.date);
@@ -14390,13 +14398,13 @@ var require_date = __commonJS({
             locales: this.locales
           }) : result[idx] || match2);
         }
-        let parts = this.parts.reduce((arr, i) => {
+        let parts2 = this.parts.reduce((arr, i) => {
           if (typeof i === "string" && typeof arr[arr.length - 1] === "string") arr[arr.length - 1] += i;
           else arr.push(i);
           return arr;
         }, []);
         this.parts.splice(0);
-        this.parts.push(...parts);
+        this.parts.push(...parts2);
         this.reset();
       }
       moveCursor(n) {
@@ -16499,10 +16507,10 @@ var require_datepart2 = __commonJS({
       static {
         __name(this, "DatePart");
       }
-      constructor({ token, date, parts, locales }) {
+      constructor({ token, date, parts: parts2, locales }) {
         this.token = token;
         this.date = date || /* @__PURE__ */ new Date();
-        this.parts = parts || [this];
+        this.parts = parts2 || [this];
         this.locales = locales || {};
       }
       up() {
@@ -16516,9 +16524,9 @@ var require_datepart2 = __commonJS({
       setTo(val) {
       }
       prev() {
-        let parts = [].concat(this.parts).reverse();
-        const currentIdx = parts.indexOf(this);
-        return parts.find((part, idx) => idx > currentIdx && part instanceof _DatePart);
+        let parts2 = [].concat(this.parts).reverse();
+        const currentIdx = parts2.indexOf(this);
+        return parts2.find((part, idx) => idx > currentIdx && part instanceof _DatePart);
       }
       toString() {
         return String(this.date);
@@ -16870,14 +16878,14 @@ var require_date2 = __commonJS({
           let idx = result.findIndex((gr2) => gr2 != null);
           this.parts.push(idx in regexGroups ? regexGroups[idx]({ token: result[idx] || match2, date: this.date, parts: this.parts, locales: this.locales }) : result[idx] || match2);
         }
-        let parts = this.parts.reduce((arr, i) => {
+        let parts2 = this.parts.reduce((arr, i) => {
           if (typeof i === "string" && typeof arr[arr.length - 1] === "string")
             arr[arr.length - 1] += i;
           else arr.push(i);
           return arr;
         }, []);
         this.parts.splice(0);
-        this.parts.push(...parts);
+        this.parts.push(...parts2);
         this.reset();
       }
       moveCursor(n) {
@@ -19438,9 +19446,9 @@ function getResponseText(response) {
   return null;
 }
 __name(getResponseText, "getResponseText");
-async function flatMapTextParts(parts, transform) {
+async function flatMapTextParts(parts2, transform) {
   const result = [];
-  const partArray = Array.isArray(parts) ? parts : typeof parts === "string" ? [{ text: parts }] : [parts];
+  const partArray = Array.isArray(parts2) ? parts2 : typeof parts2 === "string" ? [{ text: parts2 }] : [parts2];
   for (const part of partArray) {
     let textToProcess;
     if (typeof part === "string") {
@@ -19508,11 +19516,11 @@ function prependToFirstTextPart(prompt, textToPrepend, separator = "\n\n") {
 __name(prependToFirstTextPart, "prependToFirstTextPart");
 
 // packages/core/src/utils/generateContentResponseUtilities.ts
-function getResponseTextFromParts(parts) {
-  if (!parts) {
+function getResponseTextFromParts(parts2) {
+  if (!parts2) {
     return void 0;
   }
-  const textSegments = parts.map((part) => part.text).filter((text) => typeof text === "string");
+  const textSegments = parts2.map((part) => part.text).filter((text) => typeof text === "string");
   if (textSegments.length === 0) {
     return void 0;
   }
@@ -19528,12 +19536,12 @@ function sanitizeMediaLabel(value) {
   return cleaned.length > 0 ? cleaned : void 0;
 }
 __name(sanitizeMediaLabel, "sanitizeMediaLabel");
-function getToolResponseDisplayText(parts) {
-  if (!parts || parts.length === 0) {
+function getToolResponseDisplayText(parts2) {
+  if (!parts2 || parts2.length === 0) {
     return void 0;
   }
   const segments = [];
-  for (const part of parts) {
+  for (const part of parts2) {
     const fr2 = part.functionResponse;
     if (!fr2) {
       if (typeof part.text === "string" && part.text.length > 0) {
@@ -19568,11 +19576,11 @@ function getToolResponseDisplayText(parts) {
 }
 __name(getToolResponseDisplayText, "getToolResponseDisplayText");
 function getFunctionCalls(response) {
-  const parts = response.candidates?.[0]?.content?.parts;
-  if (!parts) {
+  const parts2 = response.candidates?.[0]?.content?.parts;
+  if (!parts2) {
     return void 0;
   }
-  const functionCallParts = parts.filter((part) => !!part.functionCall).map((part) => part.functionCall);
+  const functionCallParts = parts2.filter((part) => !!part.functionCall).map((part) => part.functionCall);
   if (functionCallParts.length === 2) {
     const [first, second] = functionCallParts;
     const firstHasNameOnly = first.name && (!first.args || Object.keys(first.args).length === 0);
@@ -19943,9 +19951,9 @@ var BaseLlmClient = class {
           );
         }, "onRetry")
       });
-      const functionCalls = getFunctionCalls(result);
-      if (functionCalls && functionCalls.length > 0) {
-        const functionCall = functionCalls.find(
+      const functionCalls2 = getFunctionCalls(result);
+      if (functionCalls2 && functionCalls2.length > 0) {
+        const functionCall = functionCalls2.find(
           (call) => call.name === "respond_in_schema"
         );
         if (functionCall && functionCall.args) {
@@ -20591,12 +20599,12 @@ __name(buildKeepRefs, "buildKeepRefs");
 function buildClearMap(clearRefs) {
   const clearMap = /* @__PURE__ */ new Map();
   for (const ref of clearRefs) {
-    let parts = clearMap.get(ref.contentIndex);
-    if (!parts) {
-      parts = /* @__PURE__ */ new Map();
-      clearMap.set(ref.contentIndex, parts);
+    let parts2 = clearMap.get(ref.contentIndex);
+    if (!parts2) {
+      parts2 = /* @__PURE__ */ new Map();
+      clearMap.set(ref.contentIndex, parts2);
     }
-    parts.set(ref.partIndex, ref.kind);
+    parts2.set(ref.partIndex, ref.kind);
   }
   return clearMap;
 }
@@ -22577,9 +22585,9 @@ function collectTextSlots(entries, includeTopLevelText = true, excludeBudgetExem
   const slots = [];
   for (let entryIndex = 0; entryIndex < entries.length; entryIndex++) {
     const entry = entries[entryIndex];
-    const parts = entry.responseParts;
-    for (let partIndex = 0; partIndex < parts.length; partIndex++) {
-      const part = parts[partIndex];
+    const parts2 = entry.responseParts;
+    for (let partIndex = 0; partIndex < parts2.length; partIndex++) {
+      const part = parts2[partIndex];
       if (includeTopLevelText && typeof part.text === "string") {
         slots.push({
           entryIndex,
@@ -22731,9 +22739,9 @@ function replaceTextSlots(entries, slots, allocations) {
   return result;
 }
 __name(replaceTextSlots, "replaceTextSlots");
-function toolResponseTextLength(parts) {
+function toolResponseTextLength(parts2) {
   return collectTextSlots(
-    [{ callId: "", toolName: "", responseParts: parts }],
+    [{ callId: "", toolName: "", responseParts: parts2 }],
     true,
     false
   ).reduce((total, slot) => total + slot.text.length, 0);
@@ -23443,15 +23451,15 @@ init_esbuild_shims();
 
 // packages/core/src/hooks/user-prompt-submit-context.ts
 init_esbuild_shims();
-function stripTrailingUserPromptSubmitContextPart(parts) {
-  if (parts.length <= 1) {
-    return parts;
+function stripTrailingUserPromptSubmitContextPart(parts2) {
+  if (parts2.length <= 1) {
+    return parts2;
   }
-  const last = parts[parts.length - 1];
+  const last = parts2[parts2.length - 1];
   if (!last || typeof last.text !== "string" || !isUserPromptSubmitContextPartText(last.text)) {
-    return parts;
+    return parts2;
   }
-  return parts.slice(0, -1);
+  return parts2.slice(0, -1);
 }
 __name(stripTrailingUserPromptSubmitContextPart, "stripTrailingUserPromptSubmitContextPart");
 
@@ -24252,20 +24260,20 @@ wordDiff.equals = function(left, right, options2) {
 };
 wordDiff.tokenize = function(value) {
   var options2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  var parts;
+  var parts2;
   if (options2.intlSegmenter) {
     if (options2.intlSegmenter.resolvedOptions().granularity != "word") {
       throw new Error('The segmenter passed must have a granularity of "word"');
     }
-    parts = Array.from(options2.intlSegmenter.segment(value), function(segment) {
+    parts2 = Array.from(options2.intlSegmenter.segment(value), function(segment) {
       return segment.segment;
     });
   } else {
-    parts = value.match(tokenizeIncludingWhitespace) || [];
+    parts2 = value.match(tokenizeIncludingWhitespace) || [];
   }
   var tokens = [];
   var prevPart = null;
-  parts.forEach(function(part) {
+  parts2.forEach(function(part) {
     if (/\s/.test(part)) {
       if (prevPart == null) {
         tokens.push(part);
@@ -25582,17 +25590,17 @@ var MAX_LOG_LIMIT = 200;
 var DEFAULT_LOG_LIMIT = 50;
 var LOG_FORMAT = "%H%x00%h%x00%an%x00%ae%x00%at%x00%s%x00%D%x00%P";
 var LOG_DETAIL_FORMAT = "%H%x00%h%x00%an%x00%ae%x00%at%x00%s%x00%D%x00%P%x00%b";
-function parseLogFields(parts) {
-  if (parts.length !== 8) return null;
+function parseLogFields(parts2) {
+  if (parts2.length !== 8) return null;
   return {
-    sha: parts[0],
-    shortSha: parts[1],
-    authorName: parts[2],
-    authorEmail: parts[3],
-    authorDate: parseInt(parts[4], 10) || 0,
-    subject: parts[5],
-    refs: parts[6],
-    parents: parts[7] ? parts[7].split(" ").filter(Boolean) : []
+    sha: parts2[0],
+    shortSha: parts2[1],
+    authorName: parts2[2],
+    authorEmail: parts2[3],
+    authorDate: parseInt(parts2[4], 10) || 0,
+    subject: parts2[5],
+    refs: parts2[6],
+    parents: parts2[7] ? parts2[7].split(" ").filter(Boolean) : []
   };
 }
 __name(parseLogFields, "parseLogFields");
@@ -25650,10 +25658,10 @@ async function fetchGitCommitDetail(cwd, sha) {
     gitRoot
   );
   if (metaRaw === null) return null;
-  const parts = metaRaw.split("\0");
-  if (parts.at(-1) === "") parts.pop();
-  if (parts.length !== 9) return null;
-  const parents = parts[7] ? parts[7].split(" ").filter(Boolean) : [];
+  const parts2 = metaRaw.split("\0");
+  if (parts2.at(-1) === "") parts2.pop();
+  if (parts2.length !== 9) return null;
+  const parents = parts2[7] ? parts2[7].split(" ").filter(Boolean) : [];
   const diffTreeArgs = parents.length > 1 ? [
     "--no-optional-locks",
     "diff-tree",
@@ -25706,15 +25714,15 @@ async function fetchGitCommitDetail(cwd, sha) {
     });
   }
   return {
-    sha: parts[0],
-    shortSha: parts[1],
-    authorName: parts[2],
-    authorEmail: parts[3],
-    authorDate: parseInt(parts[4], 10) || 0,
-    subject: parts[5],
-    refs: parts[6],
+    sha: parts2[0],
+    shortSha: parts2[1],
+    authorName: parts2[2],
+    authorEmail: parts2[3],
+    authorDate: parseInt(parts2[4], 10) || 0,
+    subject: parts2[5],
+    refs: parts2[6],
     parents,
-    body: parts[8].replace(/\n$/, ""),
+    body: parts2[8].replace(/\n$/, ""),
     files,
     filesCount,
     linesAdded,
@@ -28565,6 +28573,245 @@ function isUserPromptRecord(record2) {
 }
 __name(isUserPromptRecord, "isUserPromptRecord");
 
+// packages/core/src/services/branch-points.ts
+init_esbuild_shims();
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+__name(nonEmptyString, "nonEmptyString");
+function parts(record2) {
+  return (record2.message?.parts ?? []).filter(
+    (part) => part !== null && typeof part === "object"
+  );
+}
+__name(parts, "parts");
+function functionCalls(record2) {
+  return parts(record2).flatMap((part) => {
+    const call = part.functionCall;
+    if (!call) return [];
+    return [
+      {
+        ...nonEmptyString(call.id) ? { id: call.id } : {},
+        ...nonEmptyString(call.name) ? { name: call.name } : {}
+      }
+    ];
+  });
+}
+__name(functionCalls, "functionCalls");
+function functionResponses(record2) {
+  return parts(record2).flatMap((part) => {
+    const response = part.functionResponse;
+    if (!response) return [];
+    return [
+      {
+        ...nonEmptyString(response.id) ? { id: response.id } : {},
+        ...nonEmptyString(response.name) ? { name: response.name } : {}
+      }
+    ];
+  });
+}
+__name(functionResponses, "functionResponses");
+function hasVisibleText(record2) {
+  return parts(record2).some(
+    (part) => part.thought !== true && typeof part.text === "string" && part.text.trim().length > 0
+  );
+}
+__name(hasVisibleText, "hasVisibleText");
+function uniqueNameMatch(pending, matchingIndexes) {
+  if (matchingIndexes.length === 1) return matchingIndexes[0];
+  const freshIndexes = matchingIndexes.filter(
+    (candidateIndex) => pending[candidateIndex]?.carriedFromPrefix !== true
+  );
+  return freshIndexes.length === 1 ? freshIndexes[0] : -1;
+}
+__name(uniqueNameMatch, "uniqueNameMatch");
+function closeToolCall(pending, response) {
+  let index = -1;
+  if (response.id !== void 0) {
+    index = pending.findIndex((call) => call.id === response.id);
+    if (index < 0 && response.name !== void 0) {
+      const matchingIndexes = pending.flatMap(
+        (call, candidateIndex) => call.id === void 0 && call.name === response.name ? [candidateIndex] : []
+      );
+      index = uniqueNameMatch(pending, matchingIndexes);
+    }
+  } else if (response.name !== void 0) {
+    const matchingIndexes = pending.flatMap(
+      (call, candidateIndex) => call.name === response.name ? [candidateIndex] : []
+    );
+    index = uniqueNameMatch(pending, matchingIndexes);
+  }
+  if (index < 0) return false;
+  pending.splice(index, 1);
+  return true;
+}
+__name(closeToolCall, "closeToolCall");
+function resolveCompletedTurnBranchCandidateInRange(input) {
+  const {
+    activeChain,
+    startIndex,
+    endIndex,
+    startExclusiveRecordUuid,
+    pendingCallsAtStart
+  } = input;
+  const pendingCalls = pendingCallsAtStart.map((call) => ({
+    ...call,
+    carriedFromPrefix: true
+  }));
+  let lastToolResultIndex = startIndex;
+  for (let index = startIndex + 1; index <= endIndex; index++) {
+    const record2 = activeChain[index];
+    pendingCalls.push(...functionCalls(record2));
+    const responses = functionResponses(record2);
+    if (record2.type === "tool_result" || responses.length > 0) {
+      lastToolResultIndex = index;
+    }
+    for (const response of responses) {
+      if (!closeToolCall(pendingCalls, response)) return void 0;
+    }
+  }
+  if (pendingCalls.some((call) => !call.carriedFromPrefix)) return void 0;
+  let assistantRecordUuid;
+  for (let index = lastToolResultIndex + 1; index <= endIndex; index++) {
+    const record2 = activeChain[index];
+    if (record2.type !== "assistant" || functionCalls(record2).length > 0 || !hasVisibleText(record2)) {
+      continue;
+    }
+    if (assistantRecordUuid !== void 0) return void 0;
+    assistantRecordUuid = record2.uuid;
+  }
+  if (assistantRecordUuid === void 0) return void 0;
+  return {
+    startExclusiveRecordUuid,
+    endInclusiveRecordUuid: activeChain[endIndex].uuid,
+    assistantRecordUuid
+  };
+}
+__name(resolveCompletedTurnBranchCandidateInRange, "resolveCompletedTurnBranchCandidateInRange");
+function updatePendingBranchToolCalls(pendingCalls, record2) {
+  pendingCalls.push(...functionCalls(record2));
+  for (const response of functionResponses(record2)) {
+    closeToolCall(pendingCalls, response);
+  }
+}
+__name(updatePendingBranchToolCalls, "updatePendingBranchToolCalls");
+function collectPendingBranchToolCalls(records) {
+  const pendingCalls = [];
+  for (const record2 of records) {
+    updatePendingBranchToolCalls(pendingCalls, record2);
+  }
+  return pendingCalls;
+}
+__name(collectPendingBranchToolCalls, "collectPendingBranchToolCalls");
+function resolveCompletedTurnBranchCandidateFromRecords(input) {
+  if (input.records.length === 0) return void 0;
+  return resolveCompletedTurnBranchCandidateInRange({
+    activeChain: input.records,
+    startIndex: -1,
+    endIndex: input.records.length - 1,
+    startExclusiveRecordUuid: input.startExclusiveRecordUuid,
+    pendingCallsAtStart: input.pendingCallsAtStart
+  });
+}
+__name(resolveCompletedTurnBranchCandidateFromRecords, "resolveCompletedTurnBranchCandidateFromRecords");
+function parseBranchCheckpointPayload(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const payload = value;
+  const start = payload["startExclusiveRecordUuid"];
+  const assistantRecordUuid = payload["assistantRecordUuid"];
+  if (payload["v"] !== 1 || start !== null && (typeof start !== "string" || start.length === 0) || typeof assistantRecordUuid !== "string" || assistantRecordUuid.length === 0) {
+    return void 0;
+  }
+  return {
+    v: 1,
+    startExclusiveRecordUuid: start,
+    assistantRecordUuid
+  };
+}
+__name(parseBranchCheckpointPayload, "parseBranchCheckpointPayload");
+function resolveBranchPoints(activeChain) {
+  const points = /* @__PURE__ */ new Map();
+  const recordIndexes = /* @__PURE__ */ new Map();
+  for (let index = 0; index < activeChain.length; index++) {
+    const record2 = activeChain[index];
+    if (typeof record2.uuid !== "string" || record2.uuid.length === 0 || recordIndexes.has(record2.uuid)) {
+      return points;
+    }
+    recordIndexes.set(record2.uuid, index);
+  }
+  const checkpoints = [];
+  const boundaryIndexes = /* @__PURE__ */ new Set();
+  for (let index = 0; index < activeChain.length; index++) {
+    const checkpoint = activeChain[index];
+    if (checkpoint.type !== "system" || checkpoint.subtype !== "branch_checkpoint" || checkpoint.parentUuid === null || activeChain[index - 1]?.uuid !== checkpoint.parentUuid) {
+      continue;
+    }
+    const payload = parseBranchCheckpointPayload(checkpoint.systemPayload);
+    if (!payload) continue;
+    const startIndex = payload.startExclusiveRecordUuid === null ? -1 : recordIndexes.get(payload.startExclusiveRecordUuid) ?? -1;
+    if (payload.startExclusiveRecordUuid !== null && (startIndex < 0 || startIndex >= index - 1)) {
+      continue;
+    }
+    checkpoints.push({
+      checkpoint,
+      checkpointIndex: index,
+      startIndex,
+      payload
+    });
+    if (startIndex >= 0) boundaryIndexes.add(startIndex);
+  }
+  const pendingCallsAtBoundary = /* @__PURE__ */ new Map();
+  const pendingCalls = [];
+  for (let index = 0; index < activeChain.length; index++) {
+    const record2 = activeChain[index];
+    pendingCalls.push(...functionCalls(record2));
+    for (const response of functionResponses(record2)) {
+      closeToolCall(pendingCalls, response);
+    }
+    if (boundaryIndexes.has(index)) {
+      pendingCallsAtBoundary.set(
+        index,
+        pendingCalls.map((call) => ({ ...call }))
+      );
+    }
+  }
+  const checkpointByAssistantUuid = /* @__PURE__ */ new Map();
+  for (const {
+    checkpoint,
+    checkpointIndex,
+    startIndex,
+    payload
+  } of checkpoints) {
+    const candidate = resolveCompletedTurnBranchCandidateInRange({
+      activeChain,
+      startIndex,
+      endIndex: checkpointIndex - 1,
+      startExclusiveRecordUuid: payload.startExclusiveRecordUuid,
+      pendingCallsAtStart: startIndex < 0 ? [] : pendingCallsAtBoundary.get(startIndex) ?? []
+    });
+    if (!candidate || candidate.assistantRecordUuid !== payload.assistantRecordUuid) {
+      continue;
+    }
+    const previousCheckpoint = checkpointByAssistantUuid.get(
+      candidate.assistantRecordUuid
+    );
+    if (previousCheckpoint !== void 0) {
+      points.delete(previousCheckpoint);
+      continue;
+    }
+    points.set(checkpoint.uuid, {
+      ...candidate,
+      checkpointUuid: checkpoint.uuid
+    });
+    checkpointByAssistantUuid.set(
+      candidate.assistantRecordUuid,
+      checkpoint.uuid
+    );
+  }
+  return points;
+}
+__name(resolveBranchPoints, "resolveBranchPoints");
+
 // packages/core/src/services/session-transcript-reader.ts
 var SESSION_TRANSCRIPT_DEFAULT_LIMIT = 100;
 var SESSION_TRANSCRIPT_MAX_LIMIT = 500;
@@ -28731,6 +28978,63 @@ function getExpandedPageBytes() {
   return expandedPageBytesForTest ?? SESSION_TRANSCRIPT_MAX_EXPANDED_PAGE_BYTES;
 }
 __name(getExpandedPageBytes, "getExpandedPageBytes");
+function projectBranchPointParts(record2) {
+  return (record2.message?.parts ?? []).flatMap((rawPart) => {
+    const projected = [];
+    if (rawPart === null || typeof rawPart !== "object") return projected;
+    const part = rawPart;
+    if (part.functionCall) {
+      projected.push({
+        functionCall: {
+          ...part.functionCall.id !== void 0 ? { id: part.functionCall.id } : {},
+          ...part.functionCall.name !== void 0 ? { name: part.functionCall.name } : {}
+        }
+      });
+    }
+    if (part.functionResponse) {
+      projected.push({
+        functionResponse: {
+          ...part.functionResponse.id !== void 0 ? { id: part.functionResponse.id } : {},
+          ...part.functionResponse.name !== void 0 ? { name: part.functionResponse.name } : {}
+        }
+      });
+    }
+    if (record2.type === "assistant" && part.thought !== true && typeof part.text === "string" && part.text.trim().length > 0) {
+      projected.push({ text: "visible" });
+    }
+    return projected;
+  });
+}
+__name(projectBranchPointParts, "projectBranchPointParts");
+function projectBranchPointRecord(record2) {
+  const parts2 = projectBranchPointParts(record2);
+  return {
+    uuid: record2.uuid,
+    parentUuid: record2.parentUuid,
+    type: record2.type,
+    ...record2.subtype !== void 0 ? { subtype: record2.subtype } : {},
+    ...parts2.length > 0 ? { message: { parts: parts2 } } : {},
+    ...record2.subtype === "branch_checkpoint" ? { systemPayload: record2.systemPayload } : {}
+  };
+}
+__name(projectBranchPointRecord, "projectBranchPointRecord");
+function appendBranchPointRecord(records, record2) {
+  const projected = projectBranchPointRecord(record2);
+  const existing = records.get(record2.uuid);
+  if (!existing) {
+    records.set(record2.uuid, projected);
+    return;
+  }
+  const parts2 = [
+    ...existing.message?.parts ?? [],
+    ...projected.message?.parts ?? []
+  ];
+  records.set(record2.uuid, {
+    ...existing,
+    ...parts2.length > 0 ? { message: { parts: parts2 } } : {}
+  });
+}
+__name(appendBranchPointRecord, "appendBranchPointRecord");
 function makeSessionTranscriptNotFoundError(sessionId) {
   const error = new Error(
     `ENOENT: no such file or directory, open '${sessionId}.jsonl'`
@@ -29180,6 +29484,12 @@ function estimateIndexCacheBytes(index) {
   for (const [uuid, entry] of index.byUuid) {
     total += INDEX_ENTRY_BASE_BYTES + INDEX_HINT_BASE_BYTES * 2 + (entry.goalEvidenceHint.parsedGoalContext ? INDEX_HINT_BASE_BYTES : 0) + INDEX_MAP_ENTRY_BYTES + INDEX_CONTAINER_BASE_BYTES + entry.segments.length * INDEX_CONTAINER_SLOT_BYTES + estimateStringBytes(uuid) + estimateStringBytes(entry.parentUuid) + estimateStringBytes(entry.type) + estimateStringBytes(entry.subtype) + estimateStringBytes(entry.turnHint.turnParentUuid) + estimateStringBytes(entry.turnHint.backgroundNotificationTaskId) + estimateStringBytes(entry.goalEvidenceHint.parsedGoalContext?.goalId) + estimateStringBytes(entry.goalEvidenceHint.parsedGoalContext?.turnId) + estimateStringBytes(entry.goalEvidenceHint.claimedGoalId) + estimateStringBytes(entry.goalEvidenceHint.provenance) + entry.segments.length * INDEX_SEGMENT_BYTES;
   }
+  for (const [
+    assistantUuid,
+    checkpointUuid
+  ] of index.branchPointsByAssistantUuid) {
+    total += INDEX_ENTRY_BASE_BYTES + estimateStringBytes(assistantUuid) + estimateStringBytes(checkpointUuid);
+  }
   return total;
 }
 __name(estimateIndexCacheBytes, "estimateIndexCacheBytes");
@@ -29416,6 +29726,7 @@ async function buildIndex(params) {
     `index build start session=${sessionId} snapshotSize=${snapshotSize}`
   );
   const byUuid = /* @__PURE__ */ new Map();
+  const branchPointRecords = /* @__PURE__ */ new Map();
   const goalEvidenceAccumulators = /* @__PURE__ */ new Map();
   let sequence = 0;
   const physicalRecords = [];
@@ -29442,6 +29753,10 @@ async function buildIndex(params) {
           }
           const sideTaskSource = record2.type === "system" && record2.subtype === "session_source" && isObjectRecord(record2.systemPayload) && record2.systemPayload["sourceType"] === "side_task";
           if (isTranscriptConversationRecord(record2)) {
+            appendBranchPointRecord(
+              branchPointRecords,
+              record2
+            );
             if (record2.timestamp) startTime ??= record2.timestamp;
             leafUuid = record2.uuid;
           }
@@ -29557,8 +29872,18 @@ async function buildIndex(params) {
       `active chain terminated: cycle session=${sessionId} uuid=${chain.cycleUuid}`
     );
   }
+  const branchPointsByAssistantUuid = new Map(
+    [
+      ...resolveBranchPoints(
+        replayUuids.flatMap((uuid) => {
+          const record2 = branchPointRecords.get(uuid);
+          return record2 ? [record2] : [];
+        })
+      ).values()
+    ].map((point) => [point.assistantRecordUuid, point.checkpointUuid])
+  );
   debugLogger14.debug(
-    `index build complete session=${sessionId} records=${byUuid.size} runtime=${runtimeUuids.length} replay=${replayUuids.length} gaps=${gaps.length}`
+    `index build complete session=${sessionId} records=${byUuid.size} runtime=${runtimeUuids.length} replay=${replayUuids.length} gaps=${gaps.length} branchPoints=${branchPointsByAssistantUuid.size}`
   );
   await indexBuildCompleteHookForTest?.(filePath);
   return {
@@ -29575,7 +29900,8 @@ async function buildIndex(params) {
     restoreStartTime,
     startTime,
     lastUpdated,
-    byUuid
+    byUuid,
+    branchPointsByAssistantUuid
   };
 }
 __name(buildIndex, "buildIndex");
@@ -30350,6 +30676,13 @@ var SessionTranscriptReader = class {
     const pageUuids = backwardPage?.uuids ?? selectPageUuids(index, position, limit, maxBytes);
     const nextPosition = backwardPage?.nextPosition ?? position + pageUuids.length;
     const records = await readAggregatedRecords(index, pageUuids);
+    const pageBranchPoints = /* @__PURE__ */ Object.create(null);
+    for (const record2 of records) {
+      const checkpointUuid = index.branchPointsByAssistantUuid.get(record2.uuid);
+      if (checkpointUuid !== void 0) {
+        pageBranchPoints[record2.uuid] = checkpointUuid;
+      }
+    }
     const backwardGoalState = direction === "backward" ? await readGoalStatePayloadBeforePosition(index, nextPosition) : void 0;
     const hasMore = direction === "backward" ? nextPosition > 0 : nextPosition < index.replayUuids.length;
     const nextCursorState = hasMore ? {
@@ -30381,7 +30714,8 @@ var SessionTranscriptReader = class {
         }
       } : cursor?.replay !== void 0 ? { replay: cursor.replay } : {},
       startTime: index.startTime,
-      lastUpdated: index.lastUpdated
+      lastUpdated: index.lastUpdated,
+      ...Object.keys(pageBranchPoints).length > 0 ? { branchPointsByAssistantUuid: pageBranchPoints } : {}
     };
   }
 };
@@ -32312,58 +32646,150 @@ var SessionWriterLease = class _SessionWriterLease {
 
 // packages/core/src/services/sessionService.ts
 var debugLogger16 = createDebugLogger("SESSION");
+var BranchPointInvalidError = class extends Error {
+  constructor(recordId) {
+    super(`Invalid or inactive branch point: ${recordId}`);
+    this.recordId = recordId;
+    this.name = "BranchPointInvalidError";
+  }
+  static {
+    __name(this, "BranchPointInvalidError");
+  }
+};
 var MAX_FILES_TO_PROCESS = 1e4;
 var SESSION_LIST_CANCEL_YIELD_INTERVAL = 128;
 var SESSION_TITLE_MAX_LENGTH = 200;
 var SESSION_FILE_PATTERN = /^[0-9a-fA-F-]{32,36}\.jsonl$/;
 var MAX_PROMPT_SCAN_LINES = 10;
 var TAIL_READ_SIZE = 64 * 1024;
-async function copyFileHistoryBackups(sourceSessionId, targetSessionId) {
-  const fsPromises7 = await import("node:fs/promises");
+async function pathExists2(filePath) {
+  try {
+    await fs12.promises.access(filePath);
+    return true;
+  } catch (error) {
+    if (error.code === "ENOENT") return false;
+    throw error;
+  }
+}
+__name(pathExists2, "pathExists");
+async function fsyncPath(filePath) {
+  const handle = await fs12.promises.open(filePath, "r");
+  try {
+    await handle.sync();
+  } finally {
+    await handle.close();
+  }
+}
+__name(fsyncPath, "fsyncPath");
+async function fsyncDirectoryBestEffort(directory) {
+  try {
+    await fsyncPath(directory);
+  } catch (error) {
+    if (process.platform !== "win32") throw error;
+  }
+}
+__name(fsyncDirectoryBestEffort, "fsyncDirectoryBestEffort");
+function validatedBackupPath(directory, name) {
+  if (name.length === 0 || path12.basename(name) !== name) {
+    throw new Error(`Invalid file-history backup name: ${name}`);
+  }
+  const resolvedDirectory = path12.resolve(directory);
+  const resolved = path12.resolve(directory, name);
+  if (path12.dirname(resolved) !== resolvedDirectory) {
+    throw new Error(`File-history backup escapes its directory: ${name}`);
+  }
+  return resolved;
+}
+__name(validatedBackupPath, "validatedBackupPath");
+async function copyFileHistoryBackupsToStaging(sourceSessionId, targetDirectory, backupNames, onMissing) {
+  const copiedNames = /* @__PURE__ */ new Set();
+  if (backupNames.size === 0) return copiedNames;
   const sourceDir = path12.join(
     Storage.getGlobalQwenDir(),
     FILE_HISTORY_DIR,
     sourceSessionId
   );
-  const targetDir = path12.join(
-    Storage.getGlobalQwenDir(),
-    FILE_HISTORY_DIR,
-    targetSessionId
-  );
-  let entries;
-  try {
-    entries = await fsPromises7.readdir(sourceDir);
-  } catch (e) {
-    if (e.code === "ENOENT") return;
-    debugLogger16.warn(`copyFileHistoryBackups: readdir failed: ${e}`);
-    return;
-  }
-  if (entries.length === 0) return;
-  try {
-    await fsPromises7.mkdir(targetDir, { recursive: true });
-  } catch (e) {
-    debugLogger16.warn(`copyFileHistoryBackups: mkdir failed: ${e}`);
-    return;
-  }
-  await Promise.all(
-    entries.map(async (name) => {
-      const src = path12.join(sourceDir, name);
-      const dst = path12.join(targetDir, name);
+  const copyBuffer = Buffer.alloc(64 * 1024);
+  let stagingCreated = false;
+  const ensureStaging = /* @__PURE__ */ __name(async () => {
+    if (stagingCreated) return;
+    await fs12.promises.mkdir(targetDirectory, {
+      recursive: false,
+      mode: 448
+    });
+    stagingCreated = true;
+  }, "ensureStaging");
+  for (const name of backupNames) {
+    const source = validatedBackupPath(sourceDir, name);
+    const target = validatedBackupPath(targetDirectory, name);
+    let sourceHandle;
+    try {
+      sourceHandle = await fs12.promises.open(
+        source,
+        fs12.constants.O_RDONLY | (process.platform === "win32" ? 0 : fs12.constants.O_NOFOLLOW)
+      );
+    } catch (error) {
+      const code = error.code;
+      if (code === "ENOENT" || code === "ELOOP") {
+        onMissing(name);
+        continue;
+      }
+      throw error;
+    }
+    try {
+      const sourceStat = await sourceHandle.stat();
+      let pathStat;
       try {
-        await fsPromises7.link(src, dst);
-      } catch {
-        try {
-          await fsPromises7.copyFile(src, dst);
-        } catch (copyErr) {
-          debugLogger16.warn(
-            `copyFileHistoryBackups: failed to copy ${name}: ${copyErr}`
+        pathStat = await fs12.promises.lstat(source);
+      } catch (error) {
+        if (error.code !== "ENOENT") throw error;
+        onMissing(name);
+        continue;
+      }
+      if (!sourceStat.isFile() || !pathStat.isFile() || sourceStat.dev !== pathStat.dev || sourceStat.ino !== pathStat.ino) {
+        onMissing(name);
+        continue;
+      }
+      await ensureStaging();
+      const targetHandle = await fs12.promises.open(target, "wx", 384);
+      try {
+        let sourceOffset = 0;
+        while (true) {
+          const { bytesRead } = await sourceHandle.read(
+            copyBuffer,
+            0,
+            copyBuffer.length,
+            sourceOffset
           );
+          if (bytesRead === 0) break;
+          let written = 0;
+          while (written < bytesRead) {
+            const result = await targetHandle.write(
+              copyBuffer,
+              written,
+              bytesRead - written,
+              null
+            );
+            if (result.bytesWritten === 0) {
+              throw new Error(`Failed to copy file-history backup: ${name}`);
+            }
+            written += result.bytesWritten;
+          }
+          sourceOffset += bytesRead;
         }
+        await targetHandle.chmod(sourceStat.mode & 4095);
+        await targetHandle.sync();
+      } finally {
+        await targetHandle.close();
       }
-    })
-  );
+      copiedNames.add(name);
+    } finally {
+      await sourceHandle.close();
+    }
+  }
+  return copiedNames;
 }
-__name(copyFileHistoryBackups, "copyFileHistoryBackups");
+__name(copyFileHistoryBackupsToStaging, "copyFileHistoryBackupsToStaging");
 var SessionService = class {
   static {
     __name(this, "SessionService");
@@ -33151,7 +33577,7 @@ var SessionService = class {
       );
     }
     const lastMessage = messages[messages.length - 1];
-    stats ??= fs12.statSync(filePath);
+    stats ??= await fs12.promises.stat(filePath);
     const conversation = {
       sessionId: firstRecord.sessionId,
       projectHash: this.projectHash,
@@ -33498,11 +33924,33 @@ var SessionService = class {
         `Source session does not belong to current project: ${sourceSessionId}`
       );
     }
-    const { messages: activeMessages } = this.reconstructHistory(records);
-    const sourceRecords = includeActiveSideArtifactRecords(
-      records,
+    const { messages: currentActiveMessages } = this.reconstructHistory(records);
+    let boundedRecords = records;
+    let activeMessages = currentActiveMessages;
+    if (options2.atRecordId !== void 0) {
+      const point = resolveBranchPoints(currentActiveMessages).get(
+        options2.atRecordId
+      );
+      if (!point) throw new BranchPointInvalidError(options2.atRecordId);
+      const matchingIndex = records.findIndex(
+        (record2) => record2.uuid === options2.atRecordId
+      );
+      if (matchingIndex < 0) {
+        throw new BranchPointInvalidError(options2.atRecordId);
+      }
+      boundedRecords = records.slice(0, matchingIndex + 1);
+      activeMessages = this.reconstructHistory(boundedRecords, {
+        leafUuid: options2.atRecordId
+      }).messages;
+      if (activeMessages.at(-1)?.uuid !== options2.atRecordId) {
+        throw new BranchPointInvalidError(options2.atRecordId);
+      }
+    }
+    const preFilterRecords = includeActiveSideArtifactRecords(
+      boundedRecords,
       activeMessages
-    ).filter(
+    );
+    const sourceRecords = preFilterRecords.filter(
       // A fork is a fresh top-level session with its own creation metadata.
       // Inheriting either record would falsely attribute the fork to the
       // source session's parent or creator.
@@ -33527,22 +33975,47 @@ var SessionService = class {
     } : void 0;
     let prevUuid = sourceRecord?.uuid ?? null;
     const remappedArtifactIds = /* @__PURE__ */ new Map();
+    const retainedUuids = new Set(sourceRecords.map((record2) => record2.uuid));
+    const nearestRetainedPredecessor = /* @__PURE__ */ new Map();
+    {
+      let lastRetained = null;
+      for (const record2 of preFilterRecords) {
+        if (retainedUuids.has(record2.uuid) && !isSessionArtifactRecord(record2)) {
+          lastRetained = record2.uuid;
+        } else {
+          nearestRetainedPredecessor.set(record2.uuid, lastRetained);
+        }
+      }
+    }
     const forked = [
       ...sourceRecord ? [sourceRecord] : [],
       ...sourceRecords.map((record2) => {
         const isArtifactRecord = isSessionArtifactRecord(record2);
-        const systemPayload = remapSystemPayloadForFork(
+        let systemPayload = remapSystemPayloadForFork(
           record2,
           sourceSessionId,
           newSessionId,
           remappedArtifactIds
         );
+        if (record2.subtype === "branch_checkpoint") {
+          const checkpoint = parseBranchCheckpointPayload(systemPayload);
+          if (checkpoint) {
+            let boundary = checkpoint.startExclusiveRecordUuid;
+            if (boundary !== null && !retainedUuids.has(boundary)) {
+              boundary = nearestRetainedPredecessor.get(boundary) ?? null;
+            }
+            systemPayload = {
+              ...checkpoint,
+              startExclusiveRecordUuid: boundary
+            };
+          }
+        }
         const next = {
           ...record2,
           sessionId: newSessionId,
           cwd: this.projectRoot,
           systemPayload,
-          parentUuid: isArtifactRecord ? record2.parentUuid : prevUuid,
+          parentUuid: isArtifactRecord && record2.parentUuid !== null && retainedUuids.has(record2.parentUuid) ? record2.parentUuid : prevUuid,
           forkedFrom: {
             sessionId: sourceSessionId,
             messageUuid: record2.uuid
@@ -33554,7 +34027,7 @@ var SessionService = class {
         return next;
       })
     ];
-    const sourceSession = await this.loadSession(sourceSessionId);
+    const sourceSession = options2.atRecordId === void 0 ? await this.loadSession(sourceSessionId) : void 0;
     const existingSnapshotPromptIds = collectFileHistorySnapshotPromptIds(forked);
     const remappedSnapshots = sourceSession?.fileHistorySnapshots?.map(
       (snapshot) => remapSnapshotPromptId(snapshot, sourceSessionId, newSessionId)
@@ -33574,43 +34047,129 @@ var SessionService = class {
         }
       };
       forked.push(snapshotRecord);
+      prevUuid = snapshotRecord.uuid;
     }
-    fs12.mkdirSync(chatsDir, { recursive: true });
+    if (options2.title !== void 0) {
+      const titleRecord = {
+        uuid: randomUUID3(),
+        parentUuid: prevUuid,
+        sessionId: newSessionId,
+        type: "system",
+        subtype: "custom_title",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        cwd: this.projectRoot,
+        version: records[0].version,
+        systemPayload: {
+          customTitle: options2.title,
+          titleSource: "manual"
+        }
+      };
+      forked.push(titleRecord);
+      prevUuid = titleRecord.uuid;
+    }
+    const validateTargetBranchPoint = /* @__PURE__ */ __name(() => {
+      if (options2.atRecordId === void 0) return;
+      const targetActive = this.reconstructHistory(forked).messages;
+      if (!resolveBranchPoints(targetActive).has(options2.atRecordId)) {
+        throw new BranchPointInvalidError(options2.atRecordId);
+      }
+    }, "validateTargetBranchPoint");
+    validateTargetBranchPoint();
     const body = forked.map((r) => JSON.stringify(r)).join("\n") + "\n";
-    let fd;
+    const operationId = randomUUID3();
+    const stagedTranscriptPath = path12.join(
+      chatsDir,
+      `.${newSessionId}.${operationId}.tmp`
+    );
+    const backupRoot = path12.join(Storage.getGlobalQwenDir(), FILE_HISTORY_DIR);
+    const stagedBackupPath = path12.join(
+      backupRoot,
+      `.${newSessionId}.${operationId}.tmp`
+    );
+    const targetBackupPath = path12.join(backupRoot, newSessionId);
+    const backupNames = collectReferencedFileHistoryBackupNames(forked);
+    await Promise.all([
+      fs12.promises.mkdir(chatsDir, { recursive: true }),
+      fs12.promises.mkdir(backupRoot, { recursive: true, mode: 448 })
+    ]);
+    let backupPublished = false;
+    let committed = false;
     try {
-      fd = fs12.openSync(targetPath, "wx", 384);
-    } catch (err) {
-      if (err.code === "EEXIST") {
-        throw new Error(`Target session file already exists: ${newSessionId}`);
+      if (await pathExists2(targetPath) || await pathExists2(targetBackupPath)) {
+        throw new Error(`Target session already exists: ${newSessionId}`);
       }
-      throw err;
-    }
-    let targetComplete = false;
-    try {
+      const stagedHandle = await fs12.promises.open(
+        stagedTranscriptPath,
+        "wx",
+        384
+      );
       try {
-        fs12.writeFileSync(fd, body, { encoding: "utf8" });
+        await stagedHandle.writeFile(body, { encoding: "utf8" });
+        await stagedHandle.sync();
       } finally {
-        fs12.closeSync(fd);
+        await stagedHandle.close();
       }
-      await copyFileHistoryBackups(sourceSessionId, newSessionId);
-      targetComplete = true;
-    } finally {
-      if (!targetComplete) {
-        try {
-          this.removeFileIfExists(targetPath);
-        } catch (cleanupError) {
-          this.warn(
-            `forkSession: failed to clean up incomplete target ${newSessionId}: ${cleanupError}`
-          );
+      if (backupNames.size > 0) {
+        const copiedBackupNames = await copyFileHistoryBackupsToStaging(
+          sourceSessionId,
+          stagedBackupPath,
+          backupNames,
+          (name) => {
+            this.warn(
+              `branch ${newSessionId} omitted missing file-history backup ${name}; rewind data for that snapshot is unavailable`
+            );
+          }
+        );
+        if (copiedBackupNames.size > 0) {
+          if (await pathExists2(targetBackupPath)) {
+            throw new Error(`Target session already exists: ${newSessionId}`);
+          }
+          await fs12.promises.rename(stagedBackupPath, targetBackupPath);
+          backupPublished = true;
         }
-        try {
-          this.removeFileHistoryBackups(newSessionId);
-        } catch (cleanupError) {
-          this.warn(
-            `forkSession: failed to clean up file history for incomplete target ${newSessionId}: ${cleanupError}`
-          );
+      }
+      try {
+        await fs12.promises.link(stagedTranscriptPath, targetPath);
+      } catch (error) {
+        const code = error.code;
+        if (code === "EEXIST") {
+          throw new Error(`Target session already exists: ${newSessionId}`);
+        }
+        if (await pathExists2(targetPath)) {
+          throw new Error(`Target session already exists: ${newSessionId}`);
         }
+        await fs12.promises.rename(stagedTranscriptPath, targetPath);
+      }
+      committed = true;
+      try {
+        await fsyncDirectoryBestEffort(chatsDir);
+      } catch (error) {
+        this.warn(
+          `branch committed session=${newSessionId} but final durability confirmation failed: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    } finally {
+      const cleanupFailures = [];
+      await fs12.promises.unlink(stagedTranscriptPath).catch((error) => {
+        if (error.code !== "ENOENT") {
+          cleanupFailures.push(`transcript staging: ${String(error)}`);
+        }
+      });
+      await fs12.promises.rm(stagedBackupPath, { recursive: true, force: true }).catch((error) => {
+        cleanupFailures.push(`backup staging: ${String(error)}`);
+      });
+      if (!committed && backupPublished) {
+        await fs12.promises.rm(targetBackupPath, {
+          recursive: true,
+          force: true
+        }).catch((error) => {
+          cleanupFailures.push(`published backup: ${String(error)}`);
+        });
+      }
+      if (cleanupFailures.length > 0) {
+        this.warn(
+          `branch cleanup incomplete session=${newSessionId}: ${cleanupFailures.join("; ")}`
+        );
       }
     }
     return { filePath: targetPath, copiedCount: forked.length };
@@ -33736,8 +34295,9 @@ var SessionService = class {
       const filePath = path12.join(chatsDir, name);
       const titleInfo = this.readSessionTitleInfoFromFile(filePath);
       if (!titleInfo.title) continue;
-      const normalizedTitle = titleInfo.title.toLowerCase().trim();
-      if (!normalizedTitle.startsWith(normalizedPrefix)) continue;
+      if (!titleInfo.title.toLowerCase().trim().startsWith(normalizedPrefix)) {
+        continue;
+      }
       try {
         const records = await readLines(filePath, 1);
         if (records.length === 0) continue;
@@ -33896,6 +34456,28 @@ function collectFileHistorySnapshotPromptIds(records) {
   return ids;
 }
 __name(collectFileHistorySnapshotPromptIds, "collectFileHistorySnapshotPromptIds");
+function collectReferencedFileHistoryBackupNames(records) {
+  const names = /* @__PURE__ */ new Set();
+  for (const record2 of records) {
+    if (record2.type !== "system" || record2.subtype !== "file_history_snapshot" || !record2.systemPayload) {
+      continue;
+    }
+    const payload = record2.systemPayload;
+    if (!Array.isArray(payload.snapshots)) continue;
+    for (const snapshot of payload.snapshots) {
+      if (!snapshot || typeof snapshot !== "object" || !snapshot.trackedFileBackups || typeof snapshot.trackedFileBackups !== "object") {
+        continue;
+      }
+      for (const backup of Object.values(snapshot.trackedFileBackups)) {
+        if (backup && backup.failed !== true && typeof backup.backupFileName === "string" && backup.backupFileName.length > 0 && backup.backupFileName !== "." && backup.backupFileName !== ".." && path12.basename(backup.backupFileName) === backup.backupFileName) {
+          names.add(backup.backupFileName);
+        }
+      }
+    }
+  }
+  return names;
+}
+__name(collectReferencedFileHistoryBackupNames, "collectReferencedFileHistoryBackupNames");
 function replayUiTelemetryFromConversation(conversation, sessionId) {
   if (sessionId) {
     uiTelemetryService.resetSession(sessionId);
@@ -34065,8 +34647,8 @@ function filterToDialog(history) {
   for (const msg of history.slice(getStartupContextLength(history))) {
     if (msg.role !== "user" && msg.role !== "model") continue;
     const textParts = [];
-    const parts = stripTrailingUserPromptSubmitContextPart(msg.parts ?? []);
-    for (const part of parts) {
+    const parts2 = stripTrailingUserPromptSubmitContextPart(msg.parts ?? []);
+    for (const part of parts2) {
       if (typeof part?.text !== "string" || part.text.trim() === "" || part.thought || part.thoughtSignature) {
         continue;
       }
@@ -34256,6 +34838,12 @@ var ChatRecordingService = class {
   lastRecordUuid = null;
   /** UUID of the last active-tail record confirmed written to disk. */
   lastPersistedRecordUuid = null;
+  /** Active chain mirrored in memory so end-of-turn validation is incremental. */
+  activeBranchRecords = [];
+  /** Parent of the first mirrored record, or the restored tail before appends. */
+  activeBranchBaseUuid = null;
+  /** Unclosed tool calls at the current active tail. */
+  pendingBranchToolCalls = [];
   config;
   /**
    * Tracks the `lastRecordUuid` value just before each user turn was recorded.
@@ -34278,6 +34866,8 @@ var ChatRecordingService = class {
   acceptingWrites = false;
   closePromise;
   handoffRequested = false;
+  /** Prevents asynchronous metadata writers from becoming checkpoint siblings. */
+  topologyFence;
   /** First async JSONL write failure; permanently degrades this recorder. */
   writeFailure;
   integrityFailure;
@@ -34414,6 +35004,9 @@ var ChatRecordingService = class {
     this.currentParentSessionId = void 0;
     this.currentSourceType = void 0;
     this.currentSourceId = void 0;
+    this.activeBranchRecords = [];
+    this.activeBranchBaseUuid = null;
+    this.pendingBranchToolCalls = [];
     this.userDisplayTextsForTitle.length = 0;
     if (!sessionData) return;
     this.rebuildTurnBoundaries(sessionData.conversation.messages);
@@ -34453,6 +35046,7 @@ var ChatRecordingService = class {
   restoreProjectedState(state) {
     this.lastRecordUuid = state.lastCompletedUuid;
     this.lastPersistedRecordUuid = state.lastCompletedUuid;
+    this.activeBranchBaseUuid = state.lastCompletedUuid;
     this.turnParentUuids = [...state.turnParentUuids];
     this.currentCustomTitle = state.customTitle;
     this.currentTitleSource = state.titleSource;
@@ -34532,6 +35126,23 @@ var ChatRecordingService = class {
     }
     return this.integrityFailure ?? this.writeFailure;
   }
+  updateActiveBranch(record2) {
+    const currentTail = this.activeBranchRecords.at(-1)?.uuid ?? null;
+    if (record2.parentUuid !== currentTail) {
+      const parentIndex = record2.parentUuid === null ? -1 : this.activeBranchRecords.findIndex(
+        (candidate) => candidate.uuid === record2.parentUuid
+      );
+      this.activeBranchRecords = parentIndex < 0 ? [] : this.activeBranchRecords.slice(0, parentIndex + 1);
+      if (parentIndex < 0) {
+        this.activeBranchBaseUuid = record2.parentUuid ?? null;
+      }
+      this.pendingBranchToolCalls = collectPendingBranchToolCalls(
+        this.activeBranchRecords
+      );
+    }
+    this.activeBranchRecords.push(record2);
+    updatePendingBranchToolCalls(this.pendingBranchToolCalls, record2);
+  }
   enqueueRecordWrite(record2, legacyConversationFile, updateActiveTail = true) {
     const pendingWrite = this.operationTail.then(async () => {
       if (this.writeFailure) throw this.writeFailure;
@@ -34563,26 +35174,41 @@ var ChatRecordingService = class {
    * descendants are skipped and later fire-and-forget calls become no-ops.
    */
   appendRecord(record2, options2) {
-    if (this.writeFailure || !this.acceptingWrites || this.state !== "active") {
+    if (this.writeFailure || !this.acceptingWrites || this.state !== "active")
+      return;
+    if (this.topologyFence) {
+      this.topologyFence.buffered.push({ record: record2, options: options2 });
       return;
     }
     const legacyConversationFile = this.writerLeaseRequired ? void 0 : this.ensureConversationFile();
     const updateActiveTail = options2?.updateActiveTail !== false;
     if (updateActiveTail) {
       this.lastRecordUuid = record2.uuid;
+      this.updateActiveBranch(record2);
     }
     this.enqueueRecordWrite(record2, legacyConversationFile, updateActiveTail);
     this.updateTitleAnchorTracking(record2);
   }
   async appendRecordStrict(record2, options2) {
     if (this.writeFailure) throw this.writeFailure;
-    if (!this.acceptingWrites || this.state !== "active") {
+    if (!this.acceptingWrites || this.state !== "active")
       throw new SessionWriterUnavailableError();
+    if (this.topologyFence) {
+      await new Promise((resolve41, reject) => {
+        this.topologyFence.buffered.push({
+          record: record2,
+          options: options2,
+          resolve: resolve41,
+          reject
+        });
+      });
+      return;
     }
     const updateActiveTail = options2?.updateActiveTail !== false;
     const legacyConversationFile = this.writerLeaseRequired ? void 0 : this.ensureConversationFile();
     if (updateActiveTail) {
       this.lastRecordUuid = record2.uuid;
+      this.updateActiveBranch(record2);
     }
     const pendingWrite = this.enqueueRecordWrite(
       record2,
@@ -34592,6 +35218,21 @@ var ChatRecordingService = class {
     this.updateTitleAnchorTracking(record2);
     await pendingWrite;
   }
+  releaseTopologyFence(fence) {
+    if (this.topologyFence !== fence) return;
+    this.topologyFence = void 0;
+    for (const intent of fence.buffered) {
+      intent.record.parentUuid = this.lastRecordUuid;
+      if (intent.resolve && intent.reject) {
+        void this.appendRecordStrict(intent.record, intent.options).then(
+          intent.resolve,
+          intent.reject
+        );
+      } else {
+        this.appendRecord(intent.record, intent.options);
+      }
+    }
+  }
   /**
    * Maintain the "title is always in the tail window" invariant by
    * counting bytes accepted since the last `custom_title` record and
@@ -34669,6 +35310,17 @@ var ChatRecordingService = class {
     await this.operationTail;
     if (this.writeFailure) throw this.writeFailure;
   }
+  async readActiveTranscriptChain() {
+    await this.flush();
+    const sessionId = this.getSessionId();
+    const session = await this.config.getSessionService().loadSession(sessionId);
+    if (!session) {
+      throw new Error(
+        `Unable to load active transcript for session ${sessionId}`
+      );
+    }
+    return session.conversation.messages;
+  }
   async runWithWriteBarrier(operation) {
     if (this.writeFailure) throw this.writeFailure;
     if (!this.acceptingWrites || this.state !== "active") {
@@ -34768,20 +35420,63 @@ var ChatRecordingService = class {
   hasWriteOwnership() {
     return this.binding !== void 0;
   }
-  async readActiveTranscriptChain() {
-    await this.flush();
-    const sessionId = this.getSessionId();
-    const session = await this.config.getSessionService().loadSession(sessionId);
-    if (!session) {
-      throw new Error(
-        `Unable to load active transcript for session ${sessionId}`
-      );
-    }
-    return session.conversation.messages;
-  }
   getTranscriptCursor() {
     return { recordId: this.lastRecordUuid };
   }
+  getBranchCheckpointCursor() {
+    return {
+      recordId: this.lastRecordUuid,
+      activeRecordCount: this.activeBranchRecords.length,
+      pendingToolCalls: this.pendingBranchToolCalls.map((call) => ({
+        ...call
+      }))
+    };
+  }
+  async recordBranchCheckpointTransaction(input) {
+    if (input.stopReason !== "end_turn") return void 0;
+    if (this.writeFailure) throw this.writeFailure;
+    if (this.state !== "active") throw new SessionWriterUnavailableError();
+    if (this.topologyFence) {
+      throw new Error("Transcript topology transaction already active");
+    }
+    const fence = { buffered: [] };
+    this.topologyFence = fence;
+    try {
+      await this.flush();
+      const endInclusiveRecordUuid = this.lastRecordUuid;
+      if (endInclusiveRecordUuid === null) return void 0;
+      const cursorRecordId = input.cursor.activeRecordCount === 0 ? this.activeBranchBaseUuid : this.activeBranchRecords[input.cursor.activeRecordCount - 1]?.uuid;
+      if (cursorRecordId !== input.cursor.recordId || this.activeBranchRecords.at(-1)?.uuid !== endInclusiveRecordUuid) {
+        throw new Error("Transcript changed while recording branch checkpoint");
+      }
+      const candidate = resolveCompletedTurnBranchCandidateFromRecords({
+        records: this.activeBranchRecords.slice(input.cursor.activeRecordCount),
+        startExclusiveRecordUuid: input.cursor.recordId,
+        pendingCallsAtStart: input.cursor.pendingToolCalls
+      });
+      if (!candidate) return void 0;
+      const checkpointUuid = randomUUID4();
+      const checkpoint = {
+        ...this.createBaseRecord("system"),
+        uuid: checkpointUuid,
+        parentUuid: endInclusiveRecordUuid,
+        type: "system",
+        subtype: "branch_checkpoint",
+        systemPayload: {
+          v: 1,
+          startExclusiveRecordUuid: input.cursor.recordId,
+          assistantRecordUuid: candidate.assistantRecordUuid
+        }
+      };
+      this.topologyFence = void 0;
+      const checkpointWrite = this.appendRecordStrict(checkpoint);
+      this.topologyFence = fence;
+      await checkpointWrite;
+      return { ...candidate, checkpointUuid };
+    } finally {
+      this.releaseTopologyFence(fence);
+    }
+  }
   async recordGoalState(recordUuid, payload) {
     const record2 = {
       ...this.createBaseRecord("system"),
@@ -35184,6 +35879,9 @@ var ChatRecordingService = class {
    */
   rebuildTurnBoundaries(messages) {
     this.turnParentUuids = [];
+    this.activeBranchRecords = [...messages];
+    this.activeBranchBaseUuid = messages[0]?.parentUuid ?? null;
+    this.pendingBranchToolCalls = collectPendingBranchToolCalls(messages);
     for (let i = 0; i < messages.length; i++) {
       const record2 = messages[i];
       if (record2.type === "user" && record2.subtype !== "goal_runtime" && record2.subtype !== "notification" && record2.subtype !== "cron" && record2.subtype !== "mid_turn_user_message" && record2.subtype !== "realtime_message") {
@@ -35529,9 +36227,9 @@ function collectToolCallIdsFromHistory(history) {
   return ids;
 }
 __name(collectToolCallIdsFromHistory, "collectToolCallIdsFromHistory");
-function normalizeModelToolCallIds(parts, usedIds, rawIdsInCurrentTurn, reservedIds) {
+function normalizeModelToolCallIds(parts2, usedIds, rawIdsInCurrentTurn, reservedIds) {
   const normalized2 = [];
-  for (const part of parts) {
+  for (const part of parts2) {
     const functionCall = part.functionCall;
     if (!functionCall) {
       normalized2.push(part);
@@ -35585,10 +36283,10 @@ function getProviderToolCallId(functionCall) {
   return functionCall[PROVIDER_TOOL_CALL_ID];
 }
 __name(getProviderToolCallId, "getProviderToolCallId");
-function dedupeToolCallsById(functionCalls) {
+function dedupeToolCallsById(functionCalls2) {
   const seenIds = /* @__PURE__ */ new Set();
   const deduped = [];
-  for (const functionCall of functionCalls) {
+  for (const functionCall of functionCalls2) {
     const id = functionCall.id;
     if (id) {
       if (seenIds.has(id)) {
@@ -35607,20 +36305,20 @@ __name(dedupeToolCallsById, "dedupeToolCallsById");
 var ERROR_REPORT_HISTORY_TAIL_COUNT = 8;
 var ERROR_REPORT_TEXT_PREVIEW_CHARS = 200;
 function normalizeRequestParts(req) {
-  const parts = Array.isArray(req) ? req : [req];
-  return parts.map(
+  const parts2 = Array.isArray(req) ? req : [req];
+  return parts2.map(
     (part) => typeof part === "string" ? { text: part } : part
   );
 }
 __name(normalizeRequestParts, "normalizeRequestParts");
-function summarizeParts(parts) {
+function summarizeParts(parts2) {
   return {
-    partCount: parts.length,
-    functionCalls: parts.map((part) => part.functionCall?.name).filter((name) => typeof name === "string"),
-    functionResponses: parts.map((part) => part.functionResponse?.name).filter((name) => typeof name === "string"),
+    partCount: parts2.length,
+    functionCalls: parts2.map((part) => part.functionCall?.name).filter((name) => typeof name === "string"),
+    functionResponses: parts2.map((part) => part.functionResponse?.name).filter((name) => typeof name === "string"),
     textPreview: (() => {
       let textPreview = "";
-      for (const part of parts) {
+      for (const part of parts2) {
         if (typeof part.text !== "string" || part.thought) continue;
         const remaining = ERROR_REPORT_TEXT_PREVIEW_CHARS - textPreview.length;
         if (remaining <= 0) break;
@@ -35710,9 +36408,9 @@ var CompressionStatus = /* @__PURE__ */ ((CompressionStatus2) => {
   return CompressionStatus2;
 })(CompressionStatus || {});
 function getDisplayContentParts(response) {
-  const parts = response.candidates?.[0]?.content?.parts ?? [];
+  const parts2 = response.candidates?.[0]?.content?.parts ?? [];
   const displayParts = [];
-  for (const part of parts) {
+  for (const part of parts2) {
     if (part.thought) {
       continue;
     }
@@ -35820,8 +36518,8 @@ var Turn = class {
             ...hasImage ? { parts: displayParts } : {}
           };
         }
-        const functionCalls = resp.functionCalls ?? [];
-        for (const fnCall of functionCalls) {
+        const functionCalls2 = resp.functionCalls ?? [];
+        for (const fnCall of functionCalls2) {
           const event = this.handlePendingFunctionCall(fnCall);
           if (event) {
             yield event;
@@ -35860,6 +36558,7 @@ ${[...this.pendingCitations].sort().join("\n")}`
         yield { type: "user_cancelled" /* UserCancelled */ };
         return;
       }
+      const originalStatus = getErrorStatus(e);
       const error = toFriendlyError(e);
       if (error instanceof UnauthorizedError) {
         throw error;
@@ -35883,10 +36582,9 @@ ${[...this.pendingCitations].sort().join("\n")}`
         "Turn.run-sendMessageStream",
         { contextAlreadySummarized: true }
       );
-      const status = typeof error === "object" && error !== null && "status" in error && typeof error.status === "number" ? error.status : void 0;
       const structuredError = {
         message: getErrorMessage(error),
-        status
+        status: getErrorStatus(error) ?? originalStatus
       };
       await this.chat.maybeIncludeSchemaDepthContext(structuredError);
       yield { type: "error" /* Error */, value: { error: structuredError } };
@@ -35976,9 +36674,9 @@ function extractRecentFilePaths(history, maxFiles) {
   for (let i = history.length - 1; i >= 0; i--) {
     const content = history[i];
     if (content.role !== "model") continue;
-    const parts = content.parts ?? [];
-    for (let j2 = parts.length - 1; j2 >= 0; j2--) {
-      const part = parts[j2];
+    const parts2 = content.parts ?? [];
+    for (let j2 = parts2.length - 1; j2 >= 0; j2--) {
+      const part = parts2[j2];
       const call = part.functionCall;
       if (!call || !FILE_TOUCHING_TOOLS.has(call.name ?? "")) continue;
       if (call.id && failedCallIds.has(call.id)) continue;
@@ -35994,9 +36692,9 @@ function extractRecentFilePaths(history, maxFiles) {
 __name(extractRecentFilePaths, "extractRecentFilePaths");
 function imagePartsInContentReverse(content) {
   const result = [];
-  const parts = content.parts ?? [];
-  for (let j2 = parts.length - 1; j2 >= 0; j2--) {
-    const part = parts[j2];
+  const parts2 = content.parts ?? [];
+  for (let j2 = parts2.length - 1; j2 >= 0; j2--) {
+    const part = parts2[j2];
     if (part.inlineData?.mimeType?.startsWith("image/")) {
       result.push(part);
       continue;
@@ -36248,15 +36946,15 @@ function buildSubagentSnapshotPart(snaps) {
 }
 __name(buildSubagentSnapshotPart, "buildSubagentSnapshotPart");
 function buildStateReminderParts(options2) {
-  const parts = [];
+  const parts2 = [];
   if (options2.planModeActive) {
-    parts.push(buildPlanModeReminderPart());
+    parts2.push(buildPlanModeReminderPart());
   }
   if (options2.runningSubagents && options2.runningSubagents.length > 0) {
     const snap = buildSubagentSnapshotPart(options2.runningSubagents);
-    if (snap) parts.push(snap);
+    if (snap) parts2.push(snap);
   }
-  return parts;
+  return parts2;
 }
 __name(buildStateReminderParts, "buildStateReminderParts");
 async function composePostCompactHistory(history, summary, options2 = {}) {
@@ -36367,18 +37065,18 @@ function collectActiveSubagents(config) {
 __name(collectActiveSubagents, "collectActiveSubagents");
 function buildCompressionSystemPrompt(userInstructions, hookInstructions) {
   const base = getCompressionPrompt();
-  const parts = [];
+  const parts2 = [];
   if (userInstructions && userInstructions.trim().length > 0) {
-    parts.push(userInstructions.trim());
+    parts2.push(userInstructions.trim());
   }
   if (hookInstructions.length > 0) {
-    parts.push(hookInstructions);
+    parts2.push(hookInstructions);
   }
-  if (parts.length === 0) return base;
+  if (parts2.length === 0) return base;
   return `${base}
 
 Additional Instructions:
-${parts.join("\n\n")}`;
+${parts2.join("\n\n")}`;
 }
 __name(buildCompressionSystemPrompt, "buildCompressionSystemPrompt");
 function supportsCompressionCacheSharing(config) {
@@ -37527,9 +38225,9 @@ function hasNonThoughtCandidateParts(response) {
   );
 }
 __name(hasNonThoughtCandidateParts, "hasNonThoughtCandidateParts");
-function syncFunctionCallsField(response, parts) {
-  const functionCalls = parts.map((part) => part.functionCall).filter((call) => Boolean(call));
-  const value = functionCalls.length > 0 ? functionCalls : void 0;
+function syncFunctionCallsField(response, parts2) {
+  const functionCalls2 = parts2.map((part) => part.functionCall).filter((call) => Boolean(call));
+  const value = functionCalls2.length > 0 ? functionCalls2 : void 0;
   let owner = response;
   let descriptor2;
   while (owner && !descriptor2) {
@@ -37580,7 +38278,7 @@ function redactApprovedPlansInHistory(history, savedPlanContent, planPath) {
   const out = history.map((entry) => {
     if (entry?.role !== "model" || !entry.parts) return entry;
     let entryChanged = false;
-    const parts = entry.parts.map((part) => {
+    const parts2 = entry.parts.map((part) => {
       const fc = part.functionCall;
       if (!fc?.id || canonicalPlanToolName(fc.name) !== ToolNames.EXIT_PLAN_MODE)
         return part;
@@ -37597,7 +38295,7 @@ function redactApprovedPlansInHistory(history, savedPlanContent, planPath) {
     });
     if (!entryChanged) return entry;
     changed = true;
-    return { ...entry, parts };
+    return { ...entry, parts: parts2 };
   });
   return changed ? out : null;
 }
@@ -37776,8 +38474,8 @@ function isPlainTextPart(part) {
   return part !== void 0 && isValidNonThoughtTextPart(part);
 }
 __name(isPlainTextPart, "isPlainTextPart");
-function getPlainTextFromParts(parts) {
-  return (parts ?? []).filter(isPlainTextPart).map((part) => part.text).join("");
+function getPlainTextFromParts(parts2) {
+  return (parts2 ?? []).filter(isPlainTextPart).map((part) => part.text).join("");
 }
 __name(getPlainTextFromParts, "getPlainTextFromParts");
 function sanitizeRecoverySuffixTail(tail) {
@@ -37835,9 +38533,9 @@ function appendRecoveryContinuationParts(previousParts, continuationParts) {
   return [...mergedParts, ...nextParts];
 }
 __name(appendRecoveryContinuationParts, "appendRecoveryContinuationParts");
-function findLastPlainTextPartIndex(parts) {
-  for (let i = parts.length - 1; i >= 0; i -= 1) {
-    if (isPlainTextPart(parts[i])) {
+function findLastPlainTextPartIndex(parts2) {
+  for (let i = parts2.length - 1; i >= 0; i -= 1) {
+    if (isPlainTextPart(parts2[i])) {
       return i;
     }
   }
@@ -37978,13 +38676,13 @@ function stripThoughtPartsFromContent(content) {
   if (!content.parts) {
     return content;
   }
-  const parts = content.parts.filter((part) => !part.thought);
-  if (parts.length === 0) {
+  const parts2 = content.parts.filter((part) => !part.thought);
+  if (parts2.length === 0) {
     return null;
   }
   return {
     ...content,
-    parts
+    parts: parts2
   };
 }
 __name(stripThoughtPartsFromContent, "stripThoughtPartsFromContent");
@@ -38092,9 +38790,9 @@ function scanModelTurn(history, modelIdx) {
   const matched = /* @__PURE__ */ new Map();
   let scanIdx = modelIdx + 1;
   while (scanIdx < history.length && history[scanIdx]?.role === "user") {
-    const parts = history[scanIdx].parts ?? [];
-    for (let pIdx = 0; pIdx < parts.length; pIdx++) {
-      const part = parts[pIdx];
+    const parts2 = history[scanIdx].parts ?? [];
+    for (let pIdx = 0; pIdx < parts2.length; pIdx++) {
+      const part = parts2[pIdx];
       const id = part.functionResponse?.id;
       if (id) {
         const list2 = matched.get(id);
@@ -40020,10 +40718,10 @@ This error was probably caused by cyclic schema references in one of the followi
     const protocolTagDetector = new LeadingProtocolTagLeakDetector();
     let pendingProtocolParts = [];
     const takePendingProtocolParts = /* @__PURE__ */ __name(() => {
-      const parts = pendingProtocolParts;
+      const parts2 = pendingProtocolParts;
       pendingProtocolParts = [];
       const released = [];
-      for (const part of parts) {
+      for (const part of parts2) {
         const previous = released.at(-1);
         if (previous && isValidNonThoughtTextPart(previous) && isValidNonThoughtTextPart(part)) {
           previous.text += part.text;
@@ -40063,12 +40761,12 @@ This error was probably caused by cyclic schema references in one of the followi
             if (protocolTagDetector.leaked) {
               pendingProtocolParts = [];
             } else {
-              const parts = takePendingProtocolParts();
-              if (parts.length > 0) {
+              const parts2 = takePendingProtocolParts();
+              if (parts2.length > 0) {
                 content = {
                   ...content,
                   role: content?.role ?? "model",
-                  parts
+                  parts: parts2
                 };
                 candidate.content = content;
               }
@@ -40193,18 +40891,18 @@ This error was probably caused by cyclic schema references in one of the followi
       if (protocolTagDetector.leaked) {
         pendingProtocolParts = [];
       } else {
-        const parts = normalizeModelToolCallIds(
+        const parts2 = normalizeModelToolCallIds(
           takePendingProtocolParts(),
           usedToolCallIds,
           rawToolCallIdsInCurrentTurn,
           reservedToolCallIds
         );
         const chunk = {
-          candidates: [{ content: { role: "model", parts } }]
+          candidates: [{ content: { role: "model", parts: parts2 } }]
         };
-        syncFunctionCallsField(chunk, parts);
-        hasToolCall ||= parts.some((part) => part.functionCall);
-        allModelParts.push(...parts);
+        syncFunctionCallsField(chunk, parts2);
+        hasToolCall ||= parts2.some((part) => part.functionCall);
+        allModelParts.push(...parts2);
         yield chunk;
       }
     }
@@ -41199,9 +41897,9 @@ function isGeneratedFile(filePath) {
   if (EXCLUDED_EXTENSIONS.has(ext2)) {
     return true;
   }
-  const parts = fileName.split(".");
-  if (parts.length > 2) {
-    const compoundExt = "." + parts.slice(-2).join(".");
+  const parts2 = fileName.split(".");
+  if (parts2.length > 2) {
+    const compoundExt = "." + parts2.slice(-2).join(".");
     if (EXCLUDED_EXTENSIONS.has(compoundExt)) {
       return true;
     }
@@ -42348,10 +43046,10 @@ function parseRule(raw) {
   let specifier = rawSpecifier;
   let toolParamMatchers;
   if (specifierKind === "literal" && !canonicalName.startsWith("mcp__") && rawSpecifier.includes(":")) {
-    const parts = rawSpecifier.split(",").map((p2) => p2.trim());
+    const parts2 = rawSpecifier.split(",").map((p2) => p2.trim());
     const plainParts = [];
     const matchers = [];
-    for (const part of parts) {
+    for (const part of parts2) {
       const colonIdx = part.indexOf(":");
       if (colonIdx > 0) {
         const key = part.substring(0, colonIdx).trim();
@@ -42468,19 +43166,19 @@ function buildPermissionRules(ctx) {
       if (canonicalName.startsWith("mcp__")) {
         return [displayName];
       }
-      const parts = [];
-      if (ctx.specifier) parts.push(ctx.specifier);
+      const parts2 = [];
+      if (ctx.specifier) parts2.push(ctx.specifier);
       const stableParamKeys = /* @__PURE__ */ new Set(["model", "subagent_type", "skill"]);
       if (ctx.toolParams) {
         for (const key of stableParamKeys) {
           const v2 = ctx.toolParams[key];
           if (typeof v2 === "string" || typeof v2 === "number") {
             if (ctx.specifier && String(v2) === ctx.specifier) continue;
-            parts.push(`${key}:${v2}`);
+            parts2.push(`${key}:${v2}`);
           }
         }
       }
-      if (parts.length > 0) return [`${displayName}(${parts.join(",")})`];
+      if (parts2.length > 0) return [`${displayName}(${parts2.join(",")})`];
       return [displayName];
     }
   }
@@ -42515,12 +43213,12 @@ function cleanPathSpecifier(specifier) {
 __name(cleanPathSpecifier, "cleanPathSpecifier");
 function buildHumanReadableRuleLabel(rules) {
   if (!rules.length) return "";
-  const parts = [];
+  const parts2 = [];
   for (const rule of rules) {
     const parenIdx = rule.indexOf("(");
     if (parenIdx === -1) {
       const verb2 = DISPLAY_NAME_TO_VERB[rule] ?? rule.toLowerCase();
-      parts.push(verb2);
+      parts2.push(verb2);
       continue;
     }
     const displayName = rule.substring(0, parenIdx);
@@ -42533,25 +43231,25 @@ function buildHumanReadableRuleLabel(rules) {
     switch (kind) {
       case "path": {
         const cleanPath = cleanPathSpecifier(specifier);
-        parts.push(`${verb} in ${cleanPath}`);
+        parts2.push(`${verb} in ${cleanPath}`);
         break;
       }
       case "command": {
         const cmdVerb = DISPLAY_NAME_TO_VERB[displayName] ?? "run";
         const verbWord = cmdVerb.split(" ")[0];
-        parts.push(`${verbWord} '${specifier}' commands`);
+        parts2.push(`${verbWord} '${specifier}' commands`);
         break;
       }
       case "domain":
-        parts.push(`${verb} ${specifier}`);
+        parts2.push(`${verb} ${specifier}`);
         break;
       case "literal":
       default:
-        parts.push(`${verb} "${specifier}"`);
+        parts2.push(`${verb} "${specifier}"`);
         break;
     }
   }
-  return parts.join(", ");
+  return parts2.join(", ");
 }
 __name(buildHumanReadableRuleLabel, "buildHumanReadableRuleLabel");
 var SHELL_OPERATORS = ["&&", "||", ";;", "|&", "|", ";", "&", "\n"];
@@ -44961,6 +45659,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 +45694,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 +45712,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 +45732,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 +48608,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 +48765,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 {
@@ -52859,14 +53589,14 @@ function detectTurnInterruption(history) {
       trailingUserEntries.unshift(entry);
     }
     const allParts = trailingUserEntries.flatMap((entry) => entry.parts ?? []);
-    const parts = [
+    const parts2 = [
       ...allParts.filter((part) => part.functionResponse),
       ...allParts.filter((part) => !part.functionResponse)
     ];
-    if (parts.length === 0) {
+    if (parts2.length === 0) {
       return { kind: "none" };
     }
-    return { kind: "interrupted_prompt", parts: structuredClone(parts) };
+    return { kind: "interrupted_prompt", parts: structuredClone(parts2) };
   }
   if (last.role === "model") {
     const danglingCalls = [];
@@ -59606,13 +60336,13 @@ var FileTokenStorage = class extends BaseTokenStorage {
     return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
   }
   decrypt(encryptedData) {
-    const parts = encryptedData.split(":");
-    if (parts.length !== 3) {
+    const parts2 = encryptedData.split(":");
+    if (parts2.length !== 3) {
       throw new Error("Invalid encrypted data format");
     }
-    const iv = Buffer.from(parts[0], "hex");
-    const authTag = Buffer.from(parts[1], "hex");
-    const encrypted = parts[2];
+    const iv = Buffer.from(parts2[0], "hex");
+    const authTag = Buffer.from(parts2[1], "hex");
+    const encrypted = parts2[2];
     const decipher = crypto3.createDecipheriv(
       "aes-256-gcm",
       this.encryptionKey,
@@ -59802,7 +60532,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-3XFJ5ZB2.js");
         const keychainStorage = new KeychainTokenStorage2(this.serviceName);
         const isAvailable = await keychainStorage.isAvailable();
         if (isAvailable) {
@@ -61949,7 +62679,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
     });
@@ -67839,26 +68569,26 @@ var GrepToolInvocation = class extends BaseToolInvocation {
       let includedLines = 0;
       const visibleLines = [];
       if (Number.isFinite(charLimit)) {
-        const parts = [];
+        const parts2 = [];
         let currentLength = 0;
         for (const line of linesToInclude) {
           const sep24 = includedLines > 0 ? 1 : 0;
           const projectedLength = currentLength + line.rawLine.length + sep24;
           if (projectedLength <= charLimit) {
-            parts.push(line.rawLine);
+            parts2.push(line.rawLine);
             visibleLines.push(line);
             includedLines++;
             currentLength = projectedLength;
           } else {
             const remaining = Math.max(charLimit - currentLength - sep24, 10);
             const partialLine = line.rawLine.slice(0, remaining);
-            parts.push(partialLine + "...");
+            parts2.push(partialLine + "...");
             visibleLines.push(line);
             truncatedByCharLimit = true;
             break;
           }
         }
-        grepOutput = parts.join("\n");
+        grepOutput = parts2.join("\n");
       } else {
         grepOutput = linesToInclude.map((line) => line.rawLine).join("\n");
         visibleLines.push(...linesToInclude);
@@ -69196,8 +69926,8 @@ var AST = class {
     }
     return this;
   }
-  push(...parts) {
-    for (const p2 of parts) {
+  push(...parts2) {
+    for (const p2 of parts2) {
       if (p2 === "")
         continue;
       if (typeof p2 !== "string" && !(p2 instanceof _a && p2.#parent === this)) {
@@ -69305,7 +70035,7 @@ var AST = class {
     }
     let i = pos + 1;
     let part = new _a(null, ast);
-    const parts = [];
+    const parts2 = [];
     let acc = "";
     while (i < str.length) {
       const c = str.charAt(i++);
@@ -69345,7 +70075,7 @@ var AST = class {
       if (c === "|") {
         part.push(acc);
         acc = "";
-        parts.push(part);
+        parts2.push(part);
         part = new _a(null, ast);
         continue;
       }
@@ -69355,7 +70085,7 @@ var AST = class {
         }
         part.push(acc);
         acc = "";
-        ast.push(...parts, part);
+        ast.push(...parts2, part);
         return i;
       }
       acc += c;
@@ -69971,24 +70701,24 @@ var Minimatch = class {
   }
   // just get rid of adjascent ** portions
   adjascentGlobstarOptimize(globParts) {
-    return globParts.map((parts) => {
+    return globParts.map((parts2) => {
       let gs2 = -1;
-      while (-1 !== (gs2 = parts.indexOf("**", gs2 + 1))) {
+      while (-1 !== (gs2 = parts2.indexOf("**", gs2 + 1))) {
         let i = gs2;
-        while (parts[i + 1] === "**") {
+        while (parts2[i + 1] === "**") {
           i++;
         }
         if (i !== gs2) {
-          parts.splice(gs2, i - gs2);
+          parts2.splice(gs2, i - gs2);
         }
       }
-      return parts;
+      return parts2;
     });
   }
   // get rid of adjascent ** and resolve .. portions
   levelOneOptimize(globParts) {
-    return globParts.map((parts) => {
-      parts = parts.reduce((set, part) => {
+    return globParts.map((parts2) => {
+      parts2 = parts2.reduce((set, part) => {
         const prev = set[set.length - 1];
         if (part === "**" && prev === "**") {
           return set;
@@ -70002,43 +70732,43 @@ var Minimatch = class {
         set.push(part);
         return set;
       }, []);
-      return parts.length === 0 ? [""] : parts;
+      return parts2.length === 0 ? [""] : parts2;
     });
   }
-  levelTwoFileOptimize(parts) {
-    if (!Array.isArray(parts)) {
-      parts = this.slashSplit(parts);
+  levelTwoFileOptimize(parts2) {
+    if (!Array.isArray(parts2)) {
+      parts2 = this.slashSplit(parts2);
     }
     let didSomething = false;
     do {
       didSomething = false;
       if (!this.preserveMultipleSlashes) {
-        for (let i = 1; i < parts.length - 1; i++) {
-          const p2 = parts[i];
-          if (i === 1 && p2 === "" && parts[0] === "")
+        for (let i = 1; i < parts2.length - 1; i++) {
+          const p2 = parts2[i];
+          if (i === 1 && p2 === "" && parts2[0] === "")
             continue;
           if (p2 === "." || p2 === "") {
             didSomething = true;
-            parts.splice(i, 1);
+            parts2.splice(i, 1);
             i--;
           }
         }
-        if (parts[0] === "." && parts.length === 2 && (parts[1] === "." || parts[1] === "")) {
+        if (parts2[0] === "." && parts2.length === 2 && (parts2[1] === "." || parts2[1] === "")) {
           didSomething = true;
-          parts.pop();
+          parts2.pop();
         }
       }
       let dd = 0;
-      while (-1 !== (dd = parts.indexOf("..", dd + 1))) {
-        const p2 = parts[dd - 1];
+      while (-1 !== (dd = parts2.indexOf("..", dd + 1))) {
+        const p2 = parts2[dd - 1];
         if (p2 && p2 !== "." && p2 !== ".." && p2 !== "**") {
           didSomething = true;
-          parts.splice(dd - 1, 2);
+          parts2.splice(dd - 1, 2);
           dd -= 2;
         }
       }
     } while (didSomething);
-    return parts.length === 0 ? [""] : parts;
+    return parts2.length === 0 ? [""] : parts2;
   }
   // First phase: single-pattern processing
   // <pre> is 1 or more portions
@@ -70062,57 +70792,57 @@ var Minimatch = class {
     let didSomething = false;
     do {
       didSomething = false;
-      for (let parts of globParts) {
+      for (let parts2 of globParts) {
         let gs2 = -1;
-        while (-1 !== (gs2 = parts.indexOf("**", gs2 + 1))) {
+        while (-1 !== (gs2 = parts2.indexOf("**", gs2 + 1))) {
           let gss = gs2;
-          while (parts[gss + 1] === "**") {
+          while (parts2[gss + 1] === "**") {
             gss++;
           }
           if (gss > gs2) {
-            parts.splice(gs2 + 1, gss - gs2);
+            parts2.splice(gs2 + 1, gss - gs2);
           }
-          let next = parts[gs2 + 1];
-          const p2 = parts[gs2 + 2];
-          const p22 = parts[gs2 + 3];
+          let next = parts2[gs2 + 1];
+          const p2 = parts2[gs2 + 2];
+          const p22 = parts2[gs2 + 3];
           if (next !== "..")
             continue;
           if (!p2 || p2 === "." || p2 === ".." || !p22 || p22 === "." || p22 === "..") {
             continue;
           }
           didSomething = true;
-          parts.splice(gs2, 1);
-          const other2 = parts.slice(0);
+          parts2.splice(gs2, 1);
+          const other2 = parts2.slice(0);
           other2[gs2] = "**";
           globParts.push(other2);
           gs2--;
         }
         if (!this.preserveMultipleSlashes) {
-          for (let i = 1; i < parts.length - 1; i++) {
-            const p2 = parts[i];
-            if (i === 1 && p2 === "" && parts[0] === "")
+          for (let i = 1; i < parts2.length - 1; i++) {
+            const p2 = parts2[i];
+            if (i === 1 && p2 === "" && parts2[0] === "")
               continue;
             if (p2 === "." || p2 === "") {
               didSomething = true;
-              parts.splice(i, 1);
+              parts2.splice(i, 1);
               i--;
             }
           }
-          if (parts[0] === "." && parts.length === 2 && (parts[1] === "." || parts[1] === "")) {
+          if (parts2[0] === "." && parts2.length === 2 && (parts2[1] === "." || parts2[1] === "")) {
             didSomething = true;
-            parts.pop();
+            parts2.pop();
           }
         }
         let dd = 0;
-        while (-1 !== (dd = parts.indexOf("..", dd + 1))) {
-          const p2 = parts[dd - 1];
+        while (-1 !== (dd = parts2.indexOf("..", dd + 1))) {
+          const p2 = parts2[dd - 1];
           if (p2 && p2 !== "." && p2 !== ".." && p2 !== "**") {
             didSomething = true;
-            const needDot = dd === 1 && parts[dd + 1] === "**";
+            const needDot = dd === 1 && parts2[dd + 1] === "**";
             const splin = needDot ? ["."] : [];
-            parts.splice(dd - 1, 2, ...splin);
-            if (parts.length === 0)
-              parts.push("");
+            parts2.splice(dd - 1, 2, ...splin);
+            if (parts2.length === 0)
+              parts2.push("");
             dd -= 2;
           }
         }
@@ -76549,25 +77279,25 @@ function resolveOwnsModel(config) {
 }
 __name(resolveOwnsModel, "resolveOwnsModel");
 function buildGenerationConfig(spec) {
-  const parts = {};
+  const parts2 = {};
   let hasAny = false;
   if (spec.enableThinking) {
-    parts.extra_body = { enable_thinking: true };
+    parts2.extra_body = { enable_thinking: true };
     hasAny = true;
   }
   if (spec.thinkingMandatory) {
-    parts.thinkingMandatory = true;
+    parts2.thinkingMandatory = true;
     hasAny = true;
   }
   if (spec.contextWindowSize) {
-    parts.contextWindowSize = spec.contextWindowSize;
+    parts2.contextWindowSize = spec.contextWindowSize;
     hasAny = true;
   }
   if (spec.modalities && Object.values(spec.modalities).some(Boolean)) {
-    parts.modalities = spec.modalities;
+    parts2.modalities = spec.modalities;
     hasAny = true;
   }
-  return hasAny ? parts : void 0;
+  return hasAny ? parts2 : void 0;
 }
 __name(buildGenerationConfig, "buildGenerationConfig");
 function buildAdvancedGenerationConfig(advCfg) {
@@ -79717,8 +80447,8 @@ ${WORKTREES_DIR}/
 init_esbuild_shims();
 var debugLogger56 = createDebugLogger("TOOL_RESULT_VISION_BRIDGE");
 function getNestedParts(part) {
-  const parts = part.functionResponse?.parts;
-  return Array.isArray(parts) ? parts : void 0;
+  const parts2 = part.functionResponse?.parts;
+  return Array.isArray(parts2) ? parts2 : void 0;
 }
 __name(getNestedParts, "getNestedParts");
 function appendResponseText(response, text) {
@@ -80064,8 +80794,8 @@ ${body}`;
     }
     return this.visibleTextParts(projection.parts);
   }
-  visibleTextParts(parts) {
-    return parts.filter((p2) => !p2.thought && p2.text).map((p2) => p2.text).join("").trim();
+  visibleTextParts(parts2) {
+    return parts2.filter((p2) => !p2.thought && p2.text).map((p2) => p2.text).join("").trim();
   }
   static TITLE_MAX_LENGTH = 80;
   deriveTitle(records) {
@@ -80420,9 +81150,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 +81174,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;
@@ -82764,14 +83454,14 @@ function attachJsonlTranscriptWriter(emitter, jsonlPath, options2) {
     }
   }, "appendStreamText");
   const onRoundText = /* @__PURE__ */ __name((event) => {
-    const parts = [
+    const parts2 = [
       ...event.thoughtText ? [{ text: event.thoughtText, thought: true }] : [],
       ...event.text ? [{ text: event.text }] : []
     ];
-    if (parts.length === 0 && !event.usageMetadata) return;
+    if (parts2.length === 0 && !event.usageMetadata) return;
     append({
       ...baseFields("assistant"),
-      message: { role: "model", parts },
+      message: { role: "model", parts: parts2 },
       usageMetadata: event.usageMetadata,
       agentRunId: event.runId ?? streamRunId,
       agentRound: event.round
@@ -83339,8 +84029,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 +84039,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 +84307,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();
@@ -88034,8 +88729,8 @@ async function getProcessInfo(pid) {
     if (!trimmedStdout) {
       return { parentPid: 0, name: "", command: "" };
     }
-    const parts = trimmedStdout.split(/\s+/);
-    const ppidString = parts[0];
+    const parts2 = trimmedStdout.split(/\s+/);
+    const ppidString = parts2[0];
     const parentPid = parseInt(ppidString, 10);
     const fullCommand = trimmedStdout.substring(ppidString.length).trim();
     const processName = path48.basename(fullCommand.split(" ")[0]);
@@ -90655,8 +91350,8 @@ var LspResponseNormalizer = class {
       return contents;
     }
     if (Array.isArray(contents)) {
-      const parts = contents.map((item) => this.normalizeHoverContents(item)).map((item) => item.trim()).filter((item) => item.length > 0);
-      return parts.join("\n");
+      const parts2 = contents.map((item) => this.normalizeHoverContents(item)).map((item) => item.trim()).filter((item) => item.length > 0);
+      return parts2.join("\n");
     }
     if (typeof contents === "object") {
       const contentsObj = contents;
@@ -96570,16 +97265,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";
@@ -98833,14 +99518,14 @@ async function cloneFromGit(installMetadata, destination, signal) {
 __name(cloneFromGit, "cloneFromGit");
 function parseGitHubRepoForReleases(source) {
   const parsedUrl = URL.parse(source, "https://github.com");
-  const parts = parsedUrl?.pathname.substring(1).split("/");
-  if (parts?.length !== 2 || parsedUrl?.host !== "github.com") {
+  const parts2 = parsedUrl?.pathname.substring(1).split("/");
+  if (parts2?.length !== 2 || parsedUrl?.host !== "github.com") {
     throw new Error(
       `Invalid GitHub repository source: ${redactUrlCredentials(source)}. Expected "owner/repo" or a github repo uri.`
     );
   }
-  const owner = parts[0];
-  const repo = parts[1].replace(/\.git$/, "");
+  const owner = parts2[0];
+  const repo = parts2[1].replace(/\.git$/, "");
   if (owner.startsWith("git@github.com")) {
     throw new Error(
       `GitHub release-based extensions are not supported for SSH. You must use an HTTPS URI with a personal access token to download releases from private repositories. You can set your personal access token in the GITHUB_TOKEN environment variable and install the extension via SSH.`
@@ -104960,7 +105645,7 @@ var ExtensionManager = class _ExtensionManager {
     } catch {
       return "dir:-";
     }
-    const parts = [];
+    const parts2 = [];
     for (const entry of entries) {
       const extensionRoot = path72.join(this.configDir, entry);
       const installMetadata = this.loadInstallMetadata(extensionRoot);
@@ -104983,9 +105668,9 @@ var ExtensionManager = class _ExtensionManager {
         followManifestSymlink
       );
       if (stamp === "-") continue;
-      parts.push(`ext:${entry}:${stamp}`);
+      parts2.push(`ext:${entry}:${stamp}`);
     }
-    return parts.sort().join("|");
+    return parts2.sort().join("|");
   }
   /**
    * Fingerprints the enablement file and the store's activation state — where
@@ -107484,9 +108169,9 @@ var WatchHelper = class {
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
-    this.dirParts.forEach((parts) => {
-      if (parts.length > 1)
-        parts.pop();
+    this.dirParts.forEach((parts2) => {
+      if (parts2.length > 1)
+        parts2.pop();
     });
     this.followSymlinks = follow;
     this.statMethod = follow ? STAT_METHOD_F : STAT_METHOD_L;
@@ -112959,24 +113644,24 @@ ${_TeamManager.escapeEnvelopeTags(m2.text)}
         }
       }
     }
-    const parts = [
+    const parts2 = [
       "<team_status>",
       `${active} active, ${completed} completed` + (stalled > 0 ? `, ${stalled} stalled.` : "."),
       ...lines
     ];
     if (stalled > 0 && active === 0) {
-      parts.push(
+      parts2.push(
         "",
         "All remaining teammates are stalled. Proceed with the results you have \u2014 write your report now."
       );
     } else {
-      parts.push(
+      parts2.push(
         "",
         "Do NOT call task_list to check on teammates. Their results will arrive as messages. Wait patiently or proceed with other work."
       );
     }
-    parts.push("</team_status>");
-    return parts.join("\n");
+    parts2.push("</team_status>");
+    return parts2.join("\n");
   }
   /**
    * Returns true if all non-terminal teammates are stalled
@@ -114773,9 +115458,9 @@ function reconstructHistory(records, leafUuid) {
   return uuids.map((uuid) => firstByUuid.get(uuid)).filter((record2) => !!record2);
 }
 __name(reconstructHistory, "reconstructHistory");
-function extractText(parts) {
-  if (!parts?.length) return "";
-  return parts.map((part) => "text" in part && part.text ? part.text : "").join("\n").trim();
+function extractText(parts2) {
+  if (!parts2?.length) return "";
+  return parts2.map((part) => "text" in part && part.text ? part.text : "").join("\n").trim();
 }
 __name(extractText, "extractText");
 function coalesceAdjacentUserHistory(messages) {
@@ -116639,8 +117324,8 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
         if (state.abortController?.signal.aborted) break;
         if (event.type !== "chunk" /* CHUNK */) continue;
         const response = event.value;
-        const parts = response.candidates?.[0]?.content?.parts ?? [];
-        for (const part of parts) {
+        const parts2 = response.candidates?.[0]?.content?.parts ?? [];
+        for (const part of parts2) {
           if (part.text && !part["thought"]) {
             modelParts.push({ text: part.text });
           }
@@ -116659,16 +117344,16 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
       if (modelParts.length === 0) break;
       const modelMsg = { role: "model", parts: modelParts };
       messages.push(modelMsg);
-      const functionCalls = modelParts.filter(
+      const functionCalls2 = modelParts.filter(
         (p2) => p2.functionCall !== void 0
       );
-      if (functionCalls.length === 0) {
+      if (functionCalls2.length === 0) {
         break;
       }
-      let functionResponses = [];
+      let functionResponses2 = [];
       const responseEntries = [];
       let hitBoundary = false;
-      for (const part of functionCalls) {
+      for (const part of functionCalls2) {
         const fc = part.functionCall;
         const name = fc.name ?? "";
         const id = fc.id;
@@ -116704,7 +117389,7 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
                 response: { error: `Tool '${name}' not found` }
               }
             };
-            functionResponses.push(responsePart);
+            functionResponses2.push(responsePart);
             responseEntries.push({
               callId: persistenceCallId,
               toolName: name,
@@ -116723,6 +117408,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 } : {}
               }
             );
@@ -116758,7 +117445,7 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
             const { id: _id, ...functionResponse } = responsePart.functionResponse;
             return { ...responsePart, functionResponse };
           });
-          functionResponses.push(...responseParts);
+          functionResponses2.push(...responseParts);
           responseEntries.push({
             callId: persistenceCallId,
             toolName: name,
@@ -116775,7 +117462,7 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
               }
             }
           };
-          functionResponses.push(responsePart);
+          functionResponses2.push(responsePart);
           responseEntries.push({
             callId: persistenceCallId,
             toolName: name,
@@ -116785,14 +117472,14 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
       }
       if (responseEntries.length > 0) {
         const finalized = await finalizeToolResponses(config, responseEntries);
-        functionResponses = finalized.flatMap((entry) => entry.responseParts);
+        functionResponses2 = finalized.flatMap((entry) => entry.responseParts);
       }
       if (hitBoundary) {
-        if (functionResponses.length > 0) {
+        if (functionResponses2.length > 0) {
           let keptFunctionCalls = 0;
           const keptModelParts = modelParts.filter((p2) => {
             if (!p2.functionCall) return true;
-            if (keptFunctionCalls < functionResponses.length) {
+            if (keptFunctionCalls < functionResponses2.length) {
               keptFunctionCalls++;
               return true;
             }
@@ -116803,7 +117490,7 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
               role: "model",
               parts: keptModelParts
             };
-            messages.push({ role: "user", parts: functionResponses });
+            messages.push({ role: "user", parts: functionResponses2 });
           } else {
             messages.pop();
           }
@@ -116829,8 +117516,8 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
           }
         };
       }
-      if (functionResponses.length > 0) {
-        const resultMsg = { role: "user", parts: functionResponses };
+      if (functionResponses2.length > 0) {
+        const resultMsg = { role: "user", parts: functionResponses2 };
         messages.push(resultMsg);
       }
     }
@@ -117328,14 +118015,14 @@ function redactArgsForLog(args) {
 }
 __name(redactArgsForLog, "redactArgsForLog");
 function logCommandProblem(kind, command, args, detail) {
-  const parts = [`[crawler] ${kind}:`, command, redactArgsForLog(args)];
+  const parts2 = [`[crawler] ${kind}:`, command, redactArgsForLog(args)];
   if (detail.code !== void 0 && detail.code !== null) {
-    parts.push(`exit=${String(detail.code)}`);
+    parts2.push(`exit=${String(detail.code)}`);
   }
   if (detail.stderr && detail.stderr.length > 0) {
-    parts.push(truncateStderrSnippet(detail.stderr));
+    parts2.push(truncateStderrSnippet(detail.stderr));
   }
-  console.warn(parts.join(" "));
+  console.warn(parts2.join(" "));
 }
 __name(logCommandProblem, "logCommandProblem");
 function withSafeGitConfig(args) {
@@ -118150,10 +118837,10 @@ function buildResultsFromFileSet(files, extraDirectories = []) {
     dirSet.add(dir);
   }
   for (const file of files) {
-    const parts = file.split("/");
+    const parts2 = file.split("/");
     let current = "";
-    for (let i = 0; i < parts.length - 1; i++) {
-      current = current ? current + "/" + parts[i] : parts[i];
+    for (let i = 0; i < parts2.length - 1; i++) {
+      current = current ? current + "/" + parts2[i] : parts2[i];
       dirSet.add(current + "/");
     }
   }
@@ -120043,16 +120730,16 @@ __name(fetchGitBranches, "fetchGitBranches");
 function parseBranchLines(raw) {
   if (!raw.trim()) return [];
   return raw.trim().split("\n").filter(Boolean).filter((line) => {
-    const parts = line.split(SEPARATOR);
-    return !(parts[6] ?? "");
+    const parts2 = line.split(SEPARATOR);
+    return !(parts2[6] ?? "");
   }).map((line) => {
-    const parts = line.split(SEPARATOR);
-    const name = parts[0] ?? "";
-    const isHead = parts[1] === "*";
-    const upstream = parts[2] || void 0;
-    const track = parts[3] ?? "";
-    const commitDate = parseInt(parts[4] ?? "0", 10) || 0;
-    const commitSubject = parts[5] ?? "";
+    const parts2 = line.split(SEPARATOR);
+    const name = parts2[0] ?? "";
+    const isHead = parts2[1] === "*";
+    const upstream = parts2[2] || void 0;
+    const track = parts2[3] ?? "";
+    const commitDate = parseInt(parts2[4] ?? "0", 10) || 0;
+    const commitSubject = parts2[5] ?? "";
     let ahead = 0;
     let behind = 0;
     const aheadMatch = /ahead (\d+)/.exec(track);
@@ -120074,11 +120761,11 @@ __name(parseBranchLines, "parseBranchLines");
 function parseTagLines(raw) {
   if (!raw.trim()) return [];
   return raw.trim().split("\n").filter(Boolean).map((line) => {
-    const parts = line.split(SEPARATOR);
+    const parts2 = line.split(SEPARATOR);
     return {
-      name: parts[0] ?? "",
-      date: parseInt(parts[1] ?? "0", 10) || 0,
-      subject: parts[2] ?? ""
+      name: parts2[0] ?? "",
+      date: parseInt(parts2[1] ?? "0", 10) || 0,
+      subject: parts2[2] ?? ""
     };
   });
 }
@@ -125127,9 +125814,9 @@ function isMetadataAddress(address) {
 }
 __name(isMetadataAddress, "isMetadataAddress");
 function isBlockedV4(address) {
-  const parts = address.split(".").map(Number);
-  const [a, b2] = parts;
-  if (parts.length !== 4 || a === void 0 || b2 === void 0 || parts.some((n) => Number.isNaN(n))) {
+  const parts2 = address.split(".").map(Number);
+  const [a, b2] = parts2;
+  if (parts2.length !== 4 || a === void 0 || b2 === void 0 || parts2.some((n) => Number.isNaN(n))) {
     return false;
   }
   if (a === 127) return false;
@@ -129740,8 +130427,8 @@ function applySedSubstitution(content, sedInfo) {
   const replaceAll = sedInfo.flags.includes("g");
   try {
     const globalRegex = new RegExp(jsPattern, "g");
-    const parts = content.split(/(\n)/);
-    const processableParts = content.endsWith("\n") ? parts.slice(0, -1) : parts;
+    const parts2 = content.split(/(\n)/);
+    const processableParts = content.endsWith("\n") ? parts2.slice(0, -1) : parts2;
     return processableParts.map((part, index) => {
       if (index % 2 === 1) {
         return part;
@@ -129876,6 +130563,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 +132223,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 +132234,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
         }
@@ -132379,10 +133072,10 @@ To inspect: /tasks (text) or the interactive Background tasks dialog (focus the
           deletedFiles.add(line.slice(2).trim());
           continue;
         }
-        const parts = line.split("	");
-        const status = parts[0] ?? "";
-        if (status.startsWith("R") && parts.length >= 3) {
-          renamedFiles.set(parts[1].trim(), parts[2].trim());
+        const parts2 = line.split("	");
+        const status = parts2[0] ?? "";
+        if (status.startsWith("R") && parts2.length >= 3) {
+          renamedFiles.set(parts2[1].trim(), parts2[2].trim());
         }
       }
       const diffSizes = parseNumstat(numstatOutput);
@@ -132743,7 +133436,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()) {
@@ -132842,8 +133535,8 @@ var GATE_EXEMPT_TOOLS = /* @__PURE__ */ new Set([
 function extractTextFromPartListUnion(c) {
   if (typeof c === "string") return c;
   if (Array.isArray(c)) {
-    const parts = toParts2(c);
-    return parts.map((p2) => p2.text ?? "").join("\n");
+    const parts2 = toParts2(c);
+    return parts2.map((p2) => p2.text ?? "").join("\n");
   }
   if (c && typeof c === "object") {
     if ("text" in c) {
@@ -132892,6 +133585,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 {
   }
@@ -133136,15 +133830,15 @@ function convertToFunctionErrorResponse(toolName, callId, llmContent, fallbackEr
 }
 __name(convertToFunctionErrorResponse, "convertToFunctionErrorResponse");
 function toParts2(input) {
-  const parts = [];
+  const parts2 = [];
   for (const part of Array.isArray(input) ? input : [input]) {
     if (typeof part === "string") {
-      parts.push({ text: part });
+      parts2.push({ text: part });
     } else if (part) {
-      parts.push(part);
+      parts2.push(part);
     }
   }
-  return parts;
+  return parts2;
 }
 __name(toParts2, "toParts");
 var VALIDATION_RETRY_LOOP_THRESHOLD = 3;
@@ -133731,7 +134425,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 +136355,8 @@ var CoreToolScheduler = class {
           toolName: canonicalName,
           args: invocation.params,
           signal,
+          sessionId: this.config.getSessionId(),
+          cwd: this.config.getTargetDir(),
           ...invocationContext ? { invocationContext } : {}
         }
       );
@@ -136212,7 +136909,6 @@ ${body}
           return;
         }
         this.setStatusInternal(callId, "success", successResponse);
-        safeSetStatus(span, { code: SpanStatusCode.OK });
         try {
           span.setAttribute("success", true);
         } catch {
@@ -137431,7 +138127,7 @@ var AgentCore = class {
           promptId,
           timestamp: Date.now()
         });
-        const functionCalls = [];
+        const functionCalls2 = [];
         let roundText = "";
         let roundThoughtText = "";
         let lastUsage = void 0;
@@ -137455,7 +138151,7 @@ var AgentCore = class {
             if (streamEvent.maxOutputTokensEscalated !== void 0) {
               stickyMaxOutputTokens = streamEvent.maxOutputTokensEscalated;
             }
-            functionCalls.length = 0;
+            functionCalls2.length = 0;
             roundText = "";
             roundThoughtText = "";
             lastUsage = void 0;
@@ -137475,13 +138171,13 @@ var AgentCore = class {
               currentResponseId = resp.responseId;
             }
             const chunkFunctionCalls = resp.functionCalls ?? [];
-            functionCalls.push(...chunkFunctionCalls);
+            functionCalls2.push(...chunkFunctionCalls);
             if (resp.candidates?.[0]?.finishReason === FinishReason.MAX_TOKENS) {
               wasOutputTruncated = true;
             }
             const content = resp.candidates?.[0]?.content;
-            const parts = content?.parts || [];
-            for (const p2 of parts) {
+            const parts2 = content?.parts || [];
+            for (const p2 of parts2) {
               const txt = p2.text;
               const isThought = p2.thought ?? false;
               if (txt && isThought) roundThoughtText += txt;
@@ -137577,9 +138273,9 @@ var AgentCore = class {
         if (lastUsage) {
           this.recordTokenUsage(lastUsage, turnCounter, roundStreamStart);
         }
-        if (functionCalls.length > 0) {
+        if (functionCalls2.length > 0) {
           const toolCallResult = await this.processFunctionCalls(
-            functionCalls,
+            functionCalls2,
             roundAbortController,
             promptId,
             turnCounter,
@@ -137864,9 +138560,9 @@ ${text}` : text;
    *
    * Validates each call, schedules authorized calls, collects results, and emits events.
    */
-  async processFunctionCalls(functionCalls, abortController, promptId, currentRound, toolsList, responseId, wasOutputTruncated = false, handledProviderToolCallIds = /* @__PURE__ */ new Set(), duplicateProviderToolCallResponseIds = /* @__PURE__ */ new Set()) {
+  async processFunctionCalls(functionCalls2, abortController, promptId, currentRound, toolsList, responseId, wasOutputTruncated = false, handledProviderToolCallIds = /* @__PURE__ */ new Set(), duplicateProviderToolCallResponseIds = /* @__PURE__ */ new Set()) {
     const responseByCallId = /* @__PURE__ */ new Map();
-    const uniqueFunctionCalls = dedupeToolCallsById(functionCalls);
+    const uniqueFunctionCalls = dedupeToolCallsById(functionCalls2);
     const generatedCallIdBase = randomUUID12();
     const callIdByFunctionCall = new Map(
       uniqueFunctionCalls.map((functionCall, index) => [
@@ -138199,7 +138895,7 @@ ${text}` : text;
         }
       ];
     });
-    if (functionCalls.length > 0 && orderedResponses.length === 0) {
+    if (functionCalls2.length > 0 && orderedResponses.length === 0) {
       orderedResponses.push({
         callId: "tool-call-batch",
         toolName: "tool-call-batch",
@@ -141584,13 +142280,13 @@ async function runForkedAgent(params) {
       for await (const event of stream2) {
         if (event.type !== "chunk" /* CHUNK */) continue;
         const response = event.value;
-        const parts = response.candidates?.[0]?.content?.parts ?? [];
-        if (preserveTools && parts.some((p2) => p2["functionCall"])) {
+        const parts2 = response.candidates?.[0]?.content?.parts ?? [];
+        if (preserveTools && parts2.some((p2) => p2["functionCall"])) {
           debugLogger128.warn(
             "Cache-path forked query received functionCall with preserveTools; discarding."
           );
         }
-        const text = parts.filter((p2) => !p2["thought"]).filter((p2) => !p2["functionCall"]).map((p2) => p2.text ?? "").join("");
+        const text = parts2.filter((p2) => !p2["thought"]).filter((p2) => !p2["functionCall"]).map((p2) => p2.text ?? "").join("");
         if (text) fullText += text;
         if (response.usageMetadata)
           usage = extractQueryUsage(response.usageMetadata);
@@ -142689,10 +143385,10 @@ function toolAliases(toolName) {
     aliases.push(normalized2.split("::").at(-1) ?? "");
   }
   if (normalized2.startsWith("mcp__")) {
-    const parts = normalized2.split("__");
-    if (parts.length >= 3) {
-      aliases.push(parts.slice(2).join("__"));
-      aliases.push(parts.at(-1) ?? "");
+    const parts2 = normalized2.split("__");
+    if (parts2.length >= 3) {
+      aliases.push(parts2.slice(2).join("__"));
+      aliases.push(parts2.at(-1) ?? "");
     }
   }
   return Array.from(
@@ -144123,6 +144819,7 @@ var GeminiClient = class _GeminiClient {
   surfacedRelevantAutoMemoryPaths = /* @__PURE__ */ new Set();
   shutdownRequested = false;
   settledSteerInputs = /* @__PURE__ */ new WeakSet();
+  interactionStartTypeByOwner = /* @__PURE__ */ new WeakMap();
   loopDetector;
   lastPromptId = void 0;
   activeTodoWorkChainPromptId;
@@ -145506,6 +146203,35 @@ 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;
+      }
+      const interactionStartType = this.interactionStartTypeByOwner.get(interactionOwner);
+      const ownsStructuredOutputContract = interactionStartType === "userQuery" /* UserQuery */ || interactionStartType === "retry" /* Retry */;
+      if (status === "ok" && ownsStructuredOutputContract && 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,9 +146389,30 @@ 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 && !this.interactionStartTypeByOwner.has(interactionOwner)) {
+        this.interactionStartTypeByOwner.set(interactionOwner, messageType);
+      }
+      if (interactionOwner && messageType === "userQuery" /* UserQuery */ && typeof options2?.submittedPrompt === "string") {
+        addAgentInputMessageAttributes(
+          this.config,
+          interactionOwner,
+          options2.submittedPrompt
+        );
+      }
+    }
     let userPromptRecordPayload;
     let hooksEnabled;
     let messageBus;
+    let userPromptSubmitFailureMessage = "UserPromptSubmit hook failed";
     try {
       hooksEnabled = !this.config.getDisableAllHooks();
       messageBus = this.config.getMessageBus();
@@ -145690,6 +146437,7 @@ var GeminiClient = class _GeminiClient {
         const hookOutput = response.output ? createHookOutput("UserPromptSubmit", response.output) : void 0;
         if (hookOutput?.isBlockingDecision() || hookOutput?.shouldStopExecution()) {
           if (goalPermit) {
+            userPromptSubmitFailureMessage = "Goal turn finalization failed";
             const runtime = await loadGoalRuntime(true);
             if (!runtime || !goalTurnKey) {
               throw new Error("Goal turn admission is unavailable");
@@ -145703,9 +146451,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 +146484,11 @@ var GeminiClient = class _GeminiClient {
         }
       }
     } catch (error) {
+      endCurrentInteraction(
+        signal.aborted ? "cancelled" : "error",
+        signal.aborted ? void 0 : userPromptSubmitFailureMessage,
+        signal.aborted ? void 0 : getErrorType(error)
+      );
       for (const goalEvent of await finalizeInterruptedGoalTurn()) {
         yield goalEvent;
       }
@@ -145782,6 +146538,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 +146574,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 +146713,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 +146758,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 +146796,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 +146931,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 +146945,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 +146977,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 +146997,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;
@@ -146279,14 +147040,16 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           if (event.type === "error" /* Error */) {
             this.forceFullIdeContext = true;
             if (arenaAgentClient) {
-              const errorMsg = event.value instanceof Error ? event.value.message : "Unknown error";
-              await arenaAgentClient.reportError(errorMsg);
+              const status = event.value.error?.status;
+              const arenaError = status === 401 || status === 403 ? "Authentication failed" : status === 429 ? "Rate limit exceeded" : status !== void 0 && status >= 500 ? "Provider service unavailable" : status !== void 0 ? `API request failed (${status})` : "Provider request failed";
+              try {
+                await arenaAgentClient.reportError(arenaError);
+              } catch {
+                this.config.getDebugLogger().warn("Failed to report Arena provider error");
+              }
             }
             this.lastApiCompletionTimestamp = Date.now();
-            if (isTopLevelInteraction) {
-              const errMsg = event.value instanceof Error ? "[API error]" : "unknown error";
-              endInteractionSpan("error", { errorMessage: errMsg });
-            }
+            endCurrentInteraction("error", "unknown error", "api_error");
             this.cancelPendingMemoryPrefetch("no_safe_delivery_point");
             return turn;
           }
@@ -146294,6 +147057,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 +147086,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 +147127,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 +147159,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 +147183,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 +147212,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 +147228,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 +147260,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 +147295,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 +147331,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 +147359,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 +147389,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 +147428,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 +147445,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");
@@ -146689,6 +147460,13 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
       for (const goalEvent of await finalizeInterruptedGoalTurn()) {
         yield goalEvent;
       }
+      if (error instanceof UnauthorizedError && messageType !== "hook" /* Hook */ && messageType !== "steer" /* Steer */) {
+        try {
+          await this.config.getArenaAgentClient()?.reportError("Authentication failed");
+        } catch {
+          this.config.getDebugLogger().warn("Failed to report Arena authentication error");
+        }
+      }
       throw error;
     } finally {
       if (this.activeAutomaticTodoWorkChainPromptIds.has(prompt_id) && (!normalCompletion || !hasToolCalls)) {
@@ -146707,10 +147485,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 +149491,7 @@ var Config = class _Config {
   runtimeStatusWrite = Promise.resolve();
   fileExclusions;
   truncateToolOutputThreshold;
+  truncateToolOutputThresholdExplicit;
   truncateToolOutputLines;
   toolOutputBatchBudget;
   shellDefaultTimeoutMs;
@@ -148963,6 +149744,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;
@@ -151048,10 +151830,10 @@ var Config = class _Config {
     return this.systemPrompt;
   }
   getAppendSystemPrompt() {
-    const parts = [this.appendSystemPrompt, this.liveAppendSystemPrompt].filter(
+    const parts2 = [this.appendSystemPrompt, this.liveAppendSystemPrompt].filter(
       (part) => Boolean(part?.trim())
     );
-    return parts.length > 0 ? parts.join("\n\n") : void 0;
+    return parts2.length > 0 ? parts2.join("\n\n") : void 0;
   }
   setLiveAppendSystemPrompt(prompt) {
     this.liveAppendSystemPrompt = prompt;
@@ -152820,6 +153602,9 @@ var Config = class _Config {
     }
     return this.truncateToolOutputThreshold;
   }
+  isTruncateToolOutputThresholdExplicit() {
+    return this.truncateToolOutputThresholdExplicit;
+  }
   getTruncateToolOutputLines() {
     if (this.truncateToolOutputLines <= 0) {
       return Number.POSITIVE_INFINITY;
@@ -153370,7 +154155,7 @@ var Config = class _Config {
     }
     if (!enabled) return;
     registry.registerFactory(ToolNames.IMAGE_GEN, async () => {
-      const { ImageGenTool } = await import("./image-gen-HGURQAHX.js");
+      const { ImageGenTool } = await import("./image-gen-EXECB5XM.js");
       return new ImageGenTool(this);
     });
   }
@@ -153400,36 +154185,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-7GWFIDXT.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-VHTNVOKK.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-VHTNVOKK.js");
         return new UpdateGoalTool(this);
       });
     }, "registerGoalWorkerTools");
     if (this.getBareMode()) {
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-2V5GE6ZW.js");
+        const { ReadFileTool } = await import("./read-file-TAFBKMNI.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-CZ23AVP6.js");
+        const { EditTool } = await import("./edit-I4LQFAEC.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-        const { NotebookEditTool } = await import("./notebook-edit-QPYSWPRI.js");
+        const { NotebookEditTool } = await import("./notebook-edit-NTDY4QDU.js");
         return new NotebookEditTool(this);
       });
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-JDSWGVC7.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-3PZULQQV.js");
         return new ShellTool2(this);
       });
       await registerGoalWorkerTools();
@@ -153441,43 +154226,43 @@ var Config = class _Config {
     }
     await registerGoalWorkerTools();
     await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-      const { ToolSearchTool } = await import("./tool-search-SZRO5G72.js");
+      const { ToolSearchTool } = await import("./tool-search-5R2OE4C7.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-XD54ZQMC.js");
       return new ReadMcpResourceTool(this);
     });
     await registerLazy(ToolNames.AGENT, async () => {
-      const { AgentTool: AgentTool2 } = await import("./agent-4AGYD6I6.js");
+      const { AgentTool: AgentTool2 } = await import("./agent-DPTOZFEM.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-OSVDFI6S.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-X37KYTKB.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-VZENRWRH.js");
       return new SendMessageTool(this);
     });
     await registerLazy(ToolNames.SKILL, async () => {
-      const { SkillTool } = await import("./skill-QILHTMYJ.js");
+      const { SkillTool } = await import("./skill-PEVVXQ3L.js");
       return new SkillTool(this);
     });
     await registerLazy(ToolNames.LS, async () => {
-      const { LSTool } = await import("./ls-RPRSX26R.js");
+      const { LSTool } = await import("./ls-D3HUFHDP.js");
       return new LSTool(this);
     });
     await registerLazy(ToolNames.READ_FILE, async () => {
-      const { ReadFileTool } = await import("./read-file-2V5GE6ZW.js");
+      const { ReadFileTool } = await import("./read-file-TAFBKMNI.js");
       return new ReadFileTool(this);
     });
     await registerLazy(ToolNames.ZOOM_IMAGE, async () => {
-      const { ZoomImageTool } = await import("./zoom-image-4QTKAMTP.js");
+      const { ZoomImageTool } = await import("./zoom-image-4BFYJ3HG.js");
       return new ZoomImageTool(this);
     });
     if (this.getUseRipgrep()) {
@@ -153492,7 +154277,7 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       if (useRipgrep) {
         await registerLazy(ToolNames.GREP, async () => {
-          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-MUTMPQSV.js");
+          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-WOEK2PXS.js");
           return new RipGrepTool2(this);
         });
       } else {
@@ -153505,7 +154290,7 @@ var Config = class _Config {
           )
         );
         await registerLazy(ToolNames.GREP, async () => {
-          const { GrepTool } = await import("./grep-KYBZMY36.js");
+          const { GrepTool } = await import("./grep-VJWPLFOT.js");
           return new GrepTool(this);
         });
       }
@@ -153513,77 +154298,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-KYBZMY36.js");
+        const { GrepTool } = await import("./grep-VJWPLFOT.js");
         return new GrepTool(this);
       });
     }
     await registerLazy(ToolNames.GLOB, async () => {
-      const { GlobTool } = await import("./glob-LA5XO2H7.js");
+      const { GlobTool } = await import("./glob-J4RUJAHX.js");
       return new GlobTool(this);
     });
     await registerLazy(ToolNames.EDIT, async () => {
-      const { EditTool } = await import("./edit-CZ23AVP6.js");
+      const { EditTool } = await import("./edit-I4LQFAEC.js");
       return new EditTool(this);
     });
     await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-      const { NotebookEditTool } = await import("./notebook-edit-QPYSWPRI.js");
+      const { NotebookEditTool } = await import("./notebook-edit-NTDY4QDU.js");
       return new NotebookEditTool(this);
     });
     await registerLazy(ToolNames.WRITE_FILE, async () => {
-      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-UBIHUP5M.js");
+      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-EWXKVVXF.js");
       return new WriteFileTool2(this);
     });
     await registerLazy(ToolNames.SHELL, async () => {
-      const { ShellTool: ShellTool2 } = await import("./shell-JDSWGVC7.js");
+      const { ShellTool: ShellTool2 } = await import("./shell-3PZULQQV.js");
       return new ShellTool2(this);
     });
     await registerLazy(ToolNames.TODO_WRITE, async () => {
-      const { TodoWriteTool } = await import("./todoWrite-IE2YTCK7.js");
+      const { TodoWriteTool } = await import("./todoWrite-U2R4NVF4.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-B33XRSB7.js");
         return new AskUserQuestionTool(this);
       });
     }
     if (!this.sdkMode && (supportsUserInteraction || options2?.forSubAgent)) {
       await registerLazy(ToolNames.EXIT_PLAN_MODE, async () => {
-        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-4JH6WLKL.js");
+        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-R4JY7V2O.js");
         return new ExitPlanModeTool2(this);
       });
     }
     if (!this.sdkMode && supportsUserInteraction) {
       await registerLazy(ToolNames.ENTER_PLAN_MODE, async () => {
-        const { EnterPlanModeTool } = await import("./enterPlanMode-TS6KO6DU.js");
+        const { EnterPlanModeTool } = await import("./enterPlanMode-XCPK62ER.js");
         return new EnterPlanModeTool(this);
       });
     }
     await registerLazy(ToolNames.ENTER_WORKTREE, async () => {
-      const { EnterWorktreeTool } = await import("./enter-worktree-4EMS7IRL.js");
+      const { EnterWorktreeTool } = await import("./enter-worktree-YNPOJSRH.js");
       return new EnterWorktreeTool(this);
     });
     await registerLazy(ToolNames.EXIT_WORKTREE, async () => {
-      const { ExitWorktreeTool } = await import("./exit-worktree-Q3NFHYUI.js");
+      const { ExitWorktreeTool } = await import("./exit-worktree-AIIY7SR6.js");
       return new ExitWorktreeTool(this);
     });
     await registerLazy(ToolNames.WEB_FETCH, async () => {
-      const { WebFetchTool } = await import("./web-fetch-LKC2F5DM.js");
+      const { WebFetchTool } = await import("./web-fetch-RTEQTR5Z.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-ON3EYFRD.js");
         return new DisplayImageTool(this);
       });
     }
     if (this.webSearchSettings?.enabled) {
-      const { evaluateWebSearchGate } = await import("./web-search-BHMAMXEU.js");
+      const { evaluateWebSearchGate } = await import("./web-search-5OXHEZPV.js");
       const gate = evaluateWebSearchGate(this);
       if (gate.ok) {
         await registerLazy(ToolNames.WEB_SEARCH, async () => {
-          const { WebSearchTool } = await import("./web-search-BHMAMXEU.js");
+          const { WebSearchTool } = await import("./web-search-5OXHEZPV.js");
           return new WebSearchTool(this);
         });
       } else if (!this.webSearchNoticeEmitted && !options2?.forSubAgent) {
@@ -153594,83 +154379,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-GEXTOPVO.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-SEYFJEJF.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-3QDDJTCS.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-H7UEPDSN.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-H25JIHEZ.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-6SZK7YFM.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-WQS6JYAG.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-KRQULJE6.js");
       return new CreateSubSessionTool(this);
     });
     if (this.isAgentTeamEnabled()) {
       await registerLazy(ToolNames.TEAM_CREATE, async () => {
-        const { TeamCreateTool } = await import("./team-create-YMWUDIE3.js");
+        const { TeamCreateTool } = await import("./team-create-ZAIA7KAV.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-6UMU4XLS.js");
         return new TeamDeleteTool(this);
       });
       await registerLazy(ToolNames.TEAM_PLAN_APPROVAL, async () => {
-        const { TeamPlanApprovalTool } = await import("./team-plan-approval-3GPZAW46.js");
+        const { TeamPlanApprovalTool } = await import("./team-plan-approval-UNIUS7OD.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-FCBDX7UH.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-MYPFVOVM.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-YIYIUFUA.js");
         return new TaskListTool(this);
       });
     }
     if (this.isWorkflowsEnabled()) {
       await registerLazy(ToolNames.WORKFLOW, async () => {
-        const { WorkflowTool } = await import("./workflow-A7AQ52HO.js");
+        const { WorkflowTool } = await import("./workflow-ISQJHPG2.js");
         return new WorkflowTool(this);
       });
     }
     if (this.isComputerUseEnabled()) {
-      const { registerComputerUseTools } = await import("./computer-use-ZFBJYSR3.js");
+      const { registerComputerUseTools } = await import("./computer-use-77C5FHMW.js");
       await registerComputerUseTools(registerLazy, this);
     }
     await registerLazy(ToolNames.MONITOR, async () => {
-      const { MonitorTool } = await import("./monitor-SV64FNV3.js");
+      const { MonitorTool } = await import("./monitor-EE2UYMGE.js");
       return new MonitorTool(this);
     });
     if (this.pendingMcpBudgetCallback) {
@@ -154156,6 +154941,7 @@ export {
   SessionWriterError,
   SESSION_WRITER_RPC_CODES,
   SessionWriterUnavailableError,
+  BranchPointInvalidError,
   SESSION_TITLE_MAX_LENGTH,
   SessionService,
   computeUniqueBranchTitle,
@@ -154231,10 +155017,6 @@ export {
   isEditorAvailable,
   createPatchSmart,
   getDiffStat,
-  stripAnsiAndControl,
-  safeLiteralReplace,
-  isBinary,
-  normalizeContent,
   sanitizeChildEnv,
   formatMemoryUsage,
   getShellContextEnvVars,
@@ -154282,6 +155064,7 @@ export {
   DEFAULT_BUILTIN_SUBAGENT_TYPE,
   BuiltinAgentRegistry,
   toModelVisibleSubagentResult,
+  sanitizeFilenameComponent,
   getSubagentsRootDir,
   getSubagentSessionDir,
   readAgentMeta,
@@ -154307,8 +155090,6 @@ export {
   MessageDisplayDispatcher,
   collectMemoryDiagnostics,
   MCPOAuthTokenStorage,
-  OAUTH_DISPLAY_MESSAGE_EVENT,
-  OAUTH_AUTH_URL_EVENT,
   MCPOAuthProvider,
   mcpServerRequiresOAuth,
   getMCPDiscoveryState,
@@ -154331,7 +155112,6 @@ export {
   isTerminalWorkflowStatus,
   EXTENSIONS_CONFIG_FILENAME,
   So,
-  redactUrlCredentials,
   require_toml,
   convertTomlToMarkdown,
   normalizeClaudeMcpServer,