@qwen-code/qwen-code 0.22.0-nightly.20260825.22bb5e8b9f → 0.22.1

package/chunks/{startInteractiveUI-7HPDSR7W.js → startInteractiveUI-O6BI2OSA.js}

@@ -1,5 +1,8 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  useAutoAcceptIndicator
+} from "./chunk-3BV7TZNQ.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -10,7 +13,7 @@ import {
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-FMDWTE5I.js";
+} from "./chunk-OI2DR6QB.js";
 import {
   MAX_SUGGESTIONS_TO_SHOW,
   SESSION_MENTION_PREFIX,
@@ -23,10 +26,10 @@ import {
   normalizePartList,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-JHZIPJWY.js";
+} from "./chunk-EEQYTWGU.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-M4TV7AJX.js";
+} from "./chunk-LI2HEMKO.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -73,17 +76,18 @@ import {
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-U7GJPTEY.js";
+} from "./chunk-2YEZNBSD.js";
+import "./chunk-KCOXDRQL.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-455ZIBFX.js";
+} from "./chunk-K63NK3KL.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
   loadHierarchicalGeminiMemory
-} from "./chunk-EJ2GPZDU.js";
+} from "./chunk-ZXDM7DYV.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -161,20 +165,40 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-3ROKI6MD.js";
+} from "./chunk-5ZYZPDDF.js";
+import {
+  KeypressProvider,
+  useFocus,
+  useKeypress,
+  useKeypressContext
+} from "./chunk-O5YGAEQS.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-SKXXO64C.js";
+} from "./chunk-6E4WHQJV.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-KUDADN3R.js";
+} from "./chunk-OT26ITEY.js";
+import {
+  BEL,
+  OSC_PREFIX,
+  cleanupOldClipboardImages,
+  clipboardHasImage,
+  detectTerminal,
+  generateKittyId,
+  oscGhosttyNotify,
+  oscITerm2Notify,
+  oscKittyNotify,
+  saveClipboardImage,
+  writeOsc52
+} from "./chunk-2FN2HNTI.js";
+import "./chunk-4WGODMVR.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-EFT2T2LA.js";
+} from "./chunk-IJVDHPKD.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
@@ -187,11 +211,12 @@ import {
   build_default,
   expandCollapsedHistory,
   isCollapsibleTool,
+  recoalesceFindingsHistoryItems,
   shouldDisplayGoalStateCause,
   useStreamingContext,
   waitForGoalRuntime,
   wrapAnsi
-} from "./chunk-L6PFEZUM.js";
+} from "./chunk-2ZV3CZKI.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -199,98 +224,74 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   theme
-} from "./chunk-5PVLDRGJ.js";
+} from "./chunk-FPH6TXD3.js";
+import {
+  require_jsx_runtime
+} from "./chunk-SV5PQVQE.js";
+import {
+  Box_default,
+  Static,
+  Text,
+  base_exports,
+  getFrameController,
+  measure_element_default,
+  render_default,
+  use_box_metrics_default,
+  use_cursor_default,
+  use_is_screen_reader_enabled_default,
+  use_stdin_default,
+  use_stdout_default
+} from "./chunk-5Q372OFJ.js";
 import {
   stopAndGetCapturedInput
-} from "./chunk-J752LLEJ.js";
+} from "./chunk-GNMJNDZE.js";
 import {
   disableKittyProtocol,
   isKittyProtocolEnabled,
   isKittyProtocolSupported,
   pushKittyProtocolFlags
 } from "./chunk-NYX53SV4.js";
+import "./chunk-BKDAF7ES.js";
 import {
-  useAutoAcceptIndicator
-} from "./chunk-DE24WTEJ.js";
-import {
-  KeypressProvider,
-  useFocus,
-  useKeypress,
-  useKeypressContext
-} from "./chunk-QOUFO7TV.js";
-import {
-  BEL,
-  OSC_PREFIX,
-  cleanupOldClipboardImages,
-  clipboardHasImage,
-  detectTerminal,
-  generateKittyId,
-  oscGhosttyNotify,
-  oscITerm2Notify,
-  oscKittyNotify,
-  saveClipboardImage,
-  writeOsc52
-} from "./chunk-YX4II73B.js";
-import {
-  require_jsx_runtime
-} from "./chunk-SV5PQVQE.js";
-import "./chunk-MBLNXX3G.js";
-import "./chunk-4WGODMVR.js";
+  MAX_INLINE_IMAGES_PER_ITEM,
+  collectInlineImages,
+  getInlineImageData
+} from "./chunk-EC5BONC3.js";
 import {
   setUpdateHandler
-} from "./chunk-6Y7XMJFF.js";
+} from "./chunk-6HTMIKXZ.js";
 import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-OXMS5HCS.js";
+import "./chunk-TKO4TLT6.js";
+import "./chunk-FK4H3V6S.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
-} from "./chunk-X3PRXXUH.js";
+} from "./chunk-WEGXPP5E.js";
 import "./chunk-KW7NOTN6.js";
-import {
-  Box_default,
-  Static,
-  Text,
-  base_exports,
-  getFrameController,
-  measure_element_default,
-  render_default,
-  use_box_metrics_default,
-  use_cursor_default,
-  use_is_screen_reader_enabled_default,
-  use_stdin_default,
-  use_stdout_default
-} from "./chunk-5Q372OFJ.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-6L5EXDDN.js";
+import "./chunk-5CI4AXDD.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-7UVAWPYG.js";
-import "./chunk-UEHH33VE.js";
-import "./chunk-7GECZMES.js";
-import "./chunk-YAF2MQZ6.js";
-import "./chunk-3G6MRLTM.js";
-import {
-  MAX_INLINE_IMAGES_PER_ITEM,
-  collectInlineImages,
-  getInlineImageData
-} from "./chunk-RDPKOVXL.js";
+} from "./chunk-C4WBKZJT.js";
 import {
   relaunchApp
-} from "./chunk-XYUJPDPB.js";
-import "./chunk-U4SJGOBF.js";
+} from "./chunk-NVK4HJYQ.js";
+import "./chunk-2YDYDDE2.js";
+import "./chunk-YAF2MQZ6.js";
+import "./chunk-62PXFOK4.js";
 import "./chunk-6H67XLET.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-TEQKBONY.js";
-import "./chunk-SNWAXNJ4.js";
-import "./chunk-DF6DJZIX.js";
+} from "./chunk-CPPYZHBN.js";
+import "./chunk-HJOWQUE2.js";
+import "./chunk-4TPAG3O7.js";
 import {
   cpLen,
   cpSlice,
@@ -304,7 +305,7 @@ import {
   toCodePoints,
   truncateToWidth
 } from "./chunk-E7REAOTN.js";
-import "./chunk-QKSMM4HF.js";
+import "./chunk-L436XFLJ.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -315,61 +316,63 @@ import {
 } from "./chunk-ZEZKIS2K.js";
 import "./chunk-RXFQM6FQ.js";
 import "./chunk-UXEO7E3V.js";
-import {
-  isInlineModelOverrideAllowed
-} from "./chunk-MSCVPOZR.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-IX3CWNG7.js";
+} from "./chunk-76WGY6LW.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-7KGJGYGA.js";
-import "./chunk-LNKZTLTH.js";
+} from "./chunk-2MHGD7EE.js";
+import "./chunk-2SERYG4T.js";
+import {
+  getExtendedSystemInfo
+} from "./chunk-4DCP3362.js";
+import "./chunk-DCSAVGDJ.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import {
+  isInlineModelOverrideAllowed
+} from "./chunk-GNRVKN76.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-P7DVAZKV.js";
+import "./chunk-SM7ZVKTF.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-GWUZOBCQ.js";
+} from "./chunk-A7X32SCT.js";
 import "./chunk-57OAHC2Y.js";
+import "./chunk-EAV3TENS.js";
+import "./chunk-7JPW6IYH.js";
+import "./chunk-IKN3IUJP.js";
+import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-JVTU5JYO.js";
-import {
-  getExtendedSystemInfo
-} from "./chunk-EEBIINBT.js";
-import "./chunk-7U5G6JXI.js";
-import "./chunk-WCCLLK7X.js";
-import "./chunk-QWTNAHCM.js";
-import "./chunk-XQNWTA4Y.js";
-import "./chunk-SEMN7BNM.js";
-import "./chunk-V6WHFGST.js";
-import "./chunk-LURJYO2T.js";
+} from "./chunk-7AS7QX72.js";
+import "./chunk-MZS7GEC7.js";
+import "./chunk-2AUM35J5.js";
+import "./chunk-OZ6KS6KW.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-7CWEZQ6T.js";
-import "./chunk-IFWUT4GY.js";
+import "./chunk-JVPFTDBK.js";
 import "./chunk-GYTKQYDB.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-UDG5EZJI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-3VUENPWF.js";
-import "./chunk-R544UY5E.js";
-import "./chunk-PIZZIIEA.js";
-import "./chunk-NFDTDV37.js";
+import "./chunk-ELY4QVIB.js";
+import "./chunk-E55H6BZ7.js";
 import "./chunk-IW6RQPQB.js";
 import {
   loadMcpApprovals
-} from "./chunk-2HYQZYPT.js";
+} from "./chunk-MW5AHWOZ.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -391,11 +394,11 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-YS4H3OFV.js";
+} from "./chunk-MDZO5V2O.js";
 import "./chunk-RKUWKYED.js";
 import {
   TOGGLE_TYPES
-} from "./chunk-AIT6BMBI.js";
+} from "./chunk-BDHLBR46.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
 import {
@@ -403,16 +406,19 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-E6BJFSLJ.js";
+} from "./chunk-W2WRNJKX.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-FXNLH7E6.js";
+import "./chunk-2CRNTW2B.js";
 import "./chunk-5PA6UEYA.js";
-import "./chunk-2AUM35J5.js";
-import "./chunk-RLIS2VLZ.js";
+import "./chunk-7DPKPBOQ.js";
+import {
+  getCliVersion
+} from "./chunk-6KS24S3X.js";
+import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-NDJ3436G.js";
+} from "./chunk-XNXWEGKB.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -455,30 +461,28 @@ import {
   startSpeculation,
   subagentGenerator,
   watchRepoBranch
-} from "./chunk-DLYJ3RN7.js";
+} from "./chunk-VMDURMFY.js";
 import {
   saveWorkflowScript,
   validateWorkflowName
-} from "./chunk-EJ5XRNOK.js";
+} from "./chunk-J7MLXFC5.js";
 import "./chunk-XFSFZCM5.js";
+import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
-import {
-  getCliVersion
-} from "./chunk-MGEXTDBI.js";
-import "./chunk-YLFLHKDL.js";
-import "./chunk-HTIG2U5C.js";
+import "./chunk-LRKMQPMD.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-2ZH5XAOO.js";
-import "./chunk-DZPWZPGJ.js";
+import "./chunk-47SIHHPL.js";
+import "./chunk-JLGFGPZJ.js";
+import "./chunk-SKNVVYIJ.js";
 import {
   clearWorktreeSession,
   isSessionRuntimeActive,
   readWorktreeSession,
   restoreWorktreeContext
-} from "./chunk-LD76HNCC.js";
-import "./chunk-F37T2S4O.js";
-import "./chunk-IKPQM6I5.js";
-import "./chunk-V6R3IEHF.js";
+} from "./chunk-UCSV2IZW.js";
+import "./chunk-T2HMXHYA.js";
+import "./chunk-3FSBMAYD.js";
+import "./chunk-XJS54K4A.js";
 import "./chunk-ZPJWUGCS.js";
 import {
   osc8Hyperlink,
@@ -486,8 +490,8 @@ import {
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-RLR7K4JJ.js";
-import "./chunk-FZUVUBYH.js";
+} from "./chunk-ZWKGZB2K.js";
+import "./chunk-OX44MOAN.js";
 import {
   ConditionalRulesRegistry,
   CoreToolScheduler,
@@ -544,6 +548,7 @@ import {
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
   metricsToUsageRecord,
+  normalizeDerivedBranchTitle,
   parseAndFormatApiError,
   parseInstallSource,
   parseRule,
@@ -553,24 +558,24 @@ import {
   refreshMemoryInstruction,
   registerSession,
   stripTerminalControlSequences
-} from "./chunk-UFWRXRQ5.js";
+} from "./chunk-XYX474JQ.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
-import "./chunk-J54EA46E.js";
-import "./chunk-PQ4RTSTH.js";
-import "./chunk-3E53DKST.js";
-import "./chunk-DV3KOUUU.js";
+import "./chunk-3UZCLCXR.js";
+import "./chunk-TOF4UZHH.js";
+import "./chunk-O3BUXIPM.js";
+import "./chunk-ZLTEQYNC.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-R7Q5V3A5.js";
+} from "./chunk-AYVIGUUK.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-KDGY3ST4.js";
+import "./chunk-JECO75XD.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
@@ -579,52 +584,52 @@ import {
   GitWorktreeService,
   readWorktreeSessionMarker,
   writeRuntimeStatus
-} from "./chunk-FLTGTSLG.js";
+} from "./chunk-LJP2BBMK.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-NA6AZRDQ.js";
+import "./chunk-5Y2JCJAH.js";
 import {
   HOOKS_CONFIG_FIELDS
-} from "./chunk-ZB7VDPZB.js";
-import "./chunk-CGWPQ6IM.js";
+} from "./chunk-T2CRBIDJ.js";
+import "./chunk-77TOMRBG.js";
 import {
   getGitBranch,
   glob
-} from "./chunk-RSWDOHXS.js";
-import "./chunk-5X33EPHJ.js";
-import "./chunk-CPZQJP6J.js";
-import "./chunk-UY2JOZK7.js";
+} from "./chunk-DEYPMJPD.js";
+import "./chunk-T6OODF2U.js";
+import "./chunk-27ONXAFY.js";
+import "./chunk-ZEADBZLO.js";
 import {
   elapsedActiveTime,
   goalRequiresExactPermit
-} from "./chunk-WANR3VVK.js";
+} from "./chunk-FN5C6C7G.js";
 import {
   APPROVAL_MODES
-} from "./chunk-3KV5KXKU.js";
+} from "./chunk-BVE5EMIG.js";
 import "./chunk-MLXTMF7H.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-OY3ZSNQC.js";
-import "./chunk-AHQBSQYT.js";
+import "./chunk-FVDQ5E67.js";
+import "./chunk-V3GINY6K.js";
 import "./chunk-QHMLYMMS.js";
-import "./chunk-JS55F2GJ.js";
+import "./chunk-SDVF6A42.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-O5ONGZGZ.js";
+import "./chunk-ILPXSKGQ.js";
 import "./chunk-VNOVK4I7.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-CZIF7I53.js";
+import "./chunk-ZKAZP2ZG.js";
 import {
   runOutsideAgentContext
-} from "./chunk-OWE7TE3F.js";
+} from "./chunk-DP7LABIB.js";
 import "./chunk-S6LOFUVP.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
 } from "./chunk-2LD5U7Q3.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-BOQRZ443.js";
+import "./chunk-I6VVOZDK.js";
 import "./chunk-K2OJUPOE.js";
 import "./chunk-CFKIH3D3.js";
-import "./chunk-27HAGBZG.js";
-import "./chunk-JGDTCEBH.js";
+import "./chunk-EB4VDXNI.js";
+import "./chunk-FJWICLG7.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -663,59 +668,59 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-EUZE3GSL.js";
+} from "./chunk-UX3IFLJM.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAllGeminiMdFilenames,
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType
-} from "./chunk-QKGJIP2H.js";
+} from "./chunk-WBT3STGU.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
   getAutoMemoryProjectStateDir,
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-MTKBZIXU.js";
+} from "./chunk-PVBT5QPD.js";
 import {
   runSideQuery
-} from "./chunk-QQQSUCC4.js";
+} from "./chunk-IPQA4SR5.js";
 import "./chunk-WZAD4ZNJ.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-SIC4S3RX.js";
+import "./chunk-SLEWBQWM.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-O6CS7VRT.js";
+} from "./chunk-ICWGPK23.js";
 import "./chunk-XZA32HII.js";
 import {
   atomicWriteFileSync
-} from "./chunk-UEY5WCRB.js";
-import "./chunk-FNZ42WN7.js";
+} from "./chunk-7QGEJI7M.js";
+import "./chunk-GTUKW3I6.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   endInteractionSpan,
   getActiveInteractionSpan,
   isBinary,
   redactUrlCredentials
-} from "./chunk-ZJWFRMCY.js";
+} from "./chunk-6US7BF3G.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-DD5XZICM.js";
+import "./chunk-VL4YX3FH.js";
 import {
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-COT2IXPM.js";
-import "./chunk-K623ENWT.js";
+} from "./chunk-JUIJ3FXC.js";
+import "./chunk-E6FGMDFQ.js";
 import "./chunk-AQ37AY7B.js";
 import {
   isPathWithinRoot
-} from "./chunk-SJLW5XGQ.js";
+} from "./chunk-RRKNX553.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-3LUGIYS3.js";
+} from "./chunk-KOJ6MHD5.js";
 import {
   Storage,
   UnauthorizedError,
@@ -727,12 +732,12 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-VLEGGCEA.js";
-import "./chunk-H3JIT2M6.js";
+} from "./chunk-2NNTE2ED.js";
+import "./chunk-NER3H7PI.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-MFSV57XN.js";
+} from "./chunk-EKP3M4RF.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -34761,17 +34766,28 @@ function useBranchCommand(options) {
         );
         return;
       }
-      const oldSessionId = config.getSessionId();
       const newSessionId = randomUUID();
       const sessionService = config.getSessionService();
+      let oldSessionId = config.getSessionId();
       let coreSwapped = false;
       let uiSwapped = false;
       let forkCreated = false;
+      let swapOpened = false;
       let prevSessionData;
       try {
+        const telemetrySwapOpened = config.getGeminiClient()?.beginTelemetrySwap?.() ?? true;
+        if (!telemetrySwapOpened) {
+          throw new Error(
+            "A session switch is already in progress. Try again in a moment."
+          );
+        }
+        swapOpened = true;
+        oldSessionId = config.getSessionId();
         const outgoingRecording = config.getChatRecordingService();
+        const sourceCustomTitle = outgoingRecording?.getCurrentCustomTitle();
         outgoingRecording?.finalize();
         await outgoingRecording?.flush();
+        const sourceDisplayName = name === void 0 && sourceCustomTitle === void 0 ? await sessionService.getSessionDisplayName(oldSessionId) : void 0;
         try {
           prevSessionData = await sessionService.loadSession(oldSessionId);
         } catch {
@@ -34782,7 +34798,7 @@ function useBranchCommand(options) {
         if (!provisional) {
           throw new Error("Failed to load newly forked session");
         }
-        const baseName = name ?? deriveFirstPrompt(provisional.conversation.messages);
+        const baseName = name ?? (sourceCustomTitle ? normalizeDerivedBranchTitle(sourceCustomTitle) : sourceDisplayName?.trim() || void 0) ?? deriveFirstPrompt(provisional.conversation.messages);
         const effectiveTitle = await computeUniqueBranchTitle(
           baseName,
           sessionService
@@ -34812,10 +34828,11 @@ function useBranchCommand(options) {
           collapsePreviewCount
         );
         startNewSession(newSessionId);
+        uiSwapped = true;
+        config.getGeminiClient()?.commitTelemetrySwap?.();
         clearPendingState?.();
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
-        uiSwapped = true;
         resetBackgroundStateForSessionSwitch(config);
         setSessionName?.(effectiveTitle);
         remount?.();
@@ -34849,6 +34866,9 @@ function useBranchCommand(options) {
               `Rollback after failed /branch init failed: ${rollbackErr}`
             );
           }
+          config.getGeminiClient()?.abortTelemetrySwap?.();
+        } else if (swapOpened) {
+          config.getGeminiClient()?.commitTelemetrySwap?.();
         }
         if (forkCreated && !uiSwapped) {
           try {
@@ -34931,6 +34951,19 @@ function useResumeCommand(options) {
         return;
       }
       closeResumeDialog();
+      let swapOpened = false;
+      const telemetrySwapOpened = config.getGeminiClient()?.beginTelemetrySwap?.() ?? true;
+      if (!telemetrySwapOpened) {
+        addItem(
+          {
+            type: "error" /* ERROR */,
+            text: "A session switch is already in progress. Try again in a moment."
+          },
+          Date.now()
+        );
+        return;
+      }
+      swapOpened = true;
       const oldSessionId = config.getSessionId();
       let coreSwapped = false;
       let uiSwapped = false;
@@ -34940,6 +34973,7 @@ function useResumeCommand(options) {
         const sessionService = new SessionService(cwd3);
         const sessionData = await sessionService.loadSession(sessionId);
         if (!sessionData) {
+          config.getGeminiClient()?.commitTelemetrySwap?.();
           return;
         }
         const customTitle = sessionService.getSessionTitle(sessionId);
@@ -34975,6 +35009,8 @@ function useResumeCommand(options) {
           recoveredBackgroundAgentsNotice = config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length);
         }
         startNewSession(sessionId);
+        uiSwapped = true;
+        config.getGeminiClient()?.commitTelemetrySwap?.();
         setSessionName?.(customTitle ?? null);
         clearPendingState?.();
         clearItems();
@@ -34988,13 +35024,20 @@ function useResumeCommand(options) {
             Date.now()
           );
         }
-        uiSwapped = true;
         remount?.();
       } catch (error) {
         if (coreSwapped && !uiSwapped) {
           try {
             resetBackgroundStateForSessionSwitch(config);
-            config.startNewSession(oldSessionId, void 0);
+            let prevSessionData;
+            try {
+              prevSessionData = await new SessionService(
+                config.getTargetDir()
+              ).loadSession(oldSessionId);
+            } catch {
+            }
+            config.startNewSession(oldSessionId, prevSessionData);
+            await config.getGeminiClient()?.initialize?.();
             await config.loadPausedBackgroundAgents(oldSessionId).catch(() => {
             });
           } catch (rollbackErr) {
@@ -35002,6 +35045,9 @@ function useResumeCommand(options) {
               `Rollback after failed /resume init failed: ${rollbackErr}`
             );
           }
+          config.getGeminiClient()?.abortTelemetrySwap?.();
+        } else if (swapOpened) {
+          config.getGeminiClient()?.commitTelemetrySwap?.();
         }
         addItem(
           {
@@ -38720,10 +38766,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       const reasonClause = eventValue?.triggerReason === "image_overflow" ? `accumulated enough tool screenshots to trigger compaction for ${activeModel}` : `approached the input token limit for ${activeModel}`;
       const warningSuffix = eventValue?.warning ? `
 \u26A0\uFE0F ${eventValue.warning}` : "";
+      const formatCount2 = /* @__PURE__ */ __name((count, isEstimated) => count === void 0 ? "unknown" : isEstimated ? `~${count}` : String(count), "formatCount");
       return addItem(
         {
           type: "info",
-          text: `IMPORTANT: This conversation ${reasonClause}. A compressed context will be sent for future messages (compressed from: ${eventValue?.originalTokenCount ?? "unknown"} to ${eventValue?.newTokenCount ?? "unknown"} tokens).` + warningSuffix
+          text: `IMPORTANT: This conversation ${reasonClause}. A compressed context will be sent for future messages (compressed from: ${formatCount2(eventValue?.originalTokenCount, eventValue?.originalTokenCountIsEstimated)} to ${formatCount2(eventValue?.newTokenCount, eventValue?.newTokenCountIsEstimated)} tokens).` + warningSuffix
         },
         Date.now()
       );
@@ -46904,8 +46951,10 @@ ${currentText}` : popped.modelText
             if (isRealUserTurn(h)) targetTurnIndex++;
           }
           geminiClient2.truncateHistory(apiTruncateIndex);
-          const truncatedUi = expandCollapsedHistory(
-            originalHistory.filter((h) => h.id < userItem.id)
+          const truncatedUi = recoalesceFindingsHistoryItems(
+            expandCollapsedHistory(
+              originalHistory.filter((h) => h.id < userItem.id)
+            )
           );
           clearPendingStateRef.current();
           loadHistoryWithLatchReconciliation(truncatedUi);