@qwen-code/qwen-code 0.21.6 → 0.21.7-nightly.20260808.4ec0371e6

package/chunks/{chunk-A4VTILZT.js → chunk-BFSQBXHV.js}

@@ -40,7 +40,7 @@ import {
   CronScheduler,
   DEFAULT_RECURRING_MAX_AGE_DAYS,
   normalizeRecurringMaxAge
-} from "./chunk-Z7JILXGX.js";
+} from "./chunk-2UUMVNYT.js";
 import {
   consumeUnread,
   forwardApproval,
@@ -49,13 +49,13 @@ import {
   sendStructuredMessage,
   wrapConfirmWithBadge,
   writeMessage
-} from "./chunk-T5U6IM4C.js";
+} from "./chunk-MVUQRLOH.js";
 import {
   claimTask,
   listTasks,
   onTasksUpdated,
   unassignTeammateTasks
-} from "./chunk-TSERKWCX.js";
+} from "./chunk-XCWO3SMQ.js";
 import {
   assignTeammateColor,
   classifyShutdownResponse,
@@ -63,7 +63,7 @@ import {
   formatAgentId,
   generateUniqueTeammateName,
   writeTeamFile
-} from "./chunk-33FNCQSY.js";
+} from "./chunk-7MH4J33A.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -71,13 +71,13 @@ import {
   RUNTIME_SNAPSHOT_PREFIX,
   buildModelIdContext,
   resolveModelId
-} from "./chunk-DIT4V3XH.js";
+} from "./chunk-RGTB44BO.js";
 import {
   ARTIFACT_TITLE_MAX_LENGTH,
   ARTIFACT_WORKSPACE_PATH_MAX_LENGTH,
   hasControlCharacter,
   hasUnsafeDisplayPayload
-} from "./chunk-3PRJYMXC.js";
+} from "./chunk-HUWENAHO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -105,7 +105,7 @@ import {
   require_dist as require_dist2,
   stringify,
   validateSkillName
-} from "./chunk-4S4OEQ6U.js";
+} from "./chunk-J6SZID63.js";
 import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";
@@ -123,15 +123,15 @@ import {
   createHookOutput,
   getHookKey,
   isToolArtifactLike
-} from "./chunk-A5YZ3FA2.js";
+} from "./chunk-GM463R2B.js";
 import {
   BaseTokenStorage,
   KeychainTokenStorage
-} from "./chunk-YAVY33G4.js";
+} from "./chunk-SEZ556DZ.js";
 import {
   normalizeImageGenerationBaseUrl,
   resolveNetworkTarget
-} from "./chunk-2UISUFHQ.js";
+} from "./chunk-CJXIIILK.js";
 import {
   GoalPersistenceUnavailableError,
   PAUSED_GOAL_SYSTEM_REMINDER,
@@ -139,17 +139,13 @@ import {
   goalRequiresExactPermit,
   goalTurnContext,
   parseGoalStateRecordPayloadV2
-} from "./chunk-MBEMTXQT.js";
+} from "./chunk-3K7FH2KQ.js";
 import {
   APPROVAL_MODES,
   SUBAGENT_PLAN_LIFECYCLE_TOOLS,
   buildSubagentPlanToolBlockedResult,
-  childLaunchDepth,
-  getCurrentAgentDepth,
-  getCurrentAgentId,
   getLeaderOnlyToolUnavailableMessage,
   getPlanRequiredTeammatePreApprovalMessage,
-  getRuntimeContentGenerator,
   getSubagentPlanToolUnavailableMessage,
   isLeaderOnlyToolUnavailableInSubagent,
   isPlanLifecycleToolUnavailableInSubagent,
@@ -157,18 +153,38 @@ import {
   isPlanRequiredTeammateContext,
   isPlanRequiredTeammatePreApprovalAllowedTool,
   isSubagentLikeExecutionContext,
+  shouldUsePlanOnlyReminderInSubagentContext
+} from "./chunk-WAUGQKUU.js";
+import {
+  DEFAULT_OTLP_ENDPOINT,
+  DEFAULT_TELEMETRY_TARGET,
+  addToolArgumentsAttributes,
+  addToolCallResultAttributes,
+  addUserPromptAttributes
+} from "./chunk-L4N6TIP7.js";
+import {
+  supportsOpenAIPrefixCaching
+} from "./chunk-SAH4BD2J.js";
+import {
+  childLaunchDepth,
+  getCurrentAgentDepth,
+  getCurrentAgentId,
+  getRuntimeContentGenerator,
   isTopLevelSession,
   runOutsideAgentContext,
   runWithAgentContext,
   runWithRuntimeContentGenerator,
-  shouldUsePlanOnlyReminderInSubagentContext,
   spawnBlockReason
-} from "./chunk-6WBWIPBF.js";
+} from "./chunk-CPG6P4GG.js";
 import {
   getTeammateContext,
   isTeammate,
   runWithTeammateIdentity
 } from "./chunk-S6LOFUVP.js";
+import {
+  InvalidStreamError,
+  getThoughtSummary
+} from "./chunk-2J3OJGTL.js";
 import {
   BUBBLE_APPROVAL_MODE,
   FORK_AGENT,
@@ -202,7 +218,7 @@ import {
   selectForkHistory,
   stripSystemReminderBlocks,
   validateForkToolList
-} from "./chunk-WVAESIM6.js";
+} from "./chunk-IA7TGCN2.js";
 import {
   collectAvailableSkillEntries,
   renderAvailableSkillsBlock
@@ -220,10 +236,7 @@ import {
   getQwenIgnoreFileNames,
   isPathWithinRoot,
   require_ignore
-} from "./chunk-432XCUHF.js";
-import {
-  DashScopeOpenAICompatibleProvider
-} from "./chunk-HU5TUALO.js";
+} from "./chunk-EQL65XGA.js";
 import {
   openBrowserSecurely,
   shouldAttemptBrowserLaunch
@@ -233,26 +246,7 @@ import {
   isFallbackEligible,
   isUnattendedMode,
   retryWithBackoff
-} from "./chunk-QMBEW7EW.js";
-import {
-  DEFAULT_OPENAI_BASE_URL
-} from "./chunk-GLNBDYUX.js";
-import {
-  combineAbortSignals,
-  createAbortController,
-  createChildAbortController
-} from "./chunk-DJ2GSRLV.js";
-import {
-  DEFAULT_OTLP_ENDPOINT,
-  DEFAULT_TELEMETRY_TARGET,
-  addToolArgumentsAttributes,
-  addToolCallResultAttributes,
-  addUserPromptAttributes
-} from "./chunk-MGSSJT27.js";
-import {
-  InvalidStreamError,
-  getThoughtSummary
-} from "./chunk-2J3OJGTL.js";
+} from "./chunk-BGG4MBYD.js";
 import {
   QUOTA_EXHAUSTED_PREFIX,
   formatQuotaExhaustedMessage,
@@ -262,11 +256,19 @@ import {
   isQuotaExhaustedError,
   isRateLimitError,
   isStructuredError
-} from "./chunk-6O5DVH27.js";
+} from "./chunk-M6HMMKVG.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,
   ContentRetryEvent,
@@ -382,7 +384,7 @@ import {
   updateMCPServerStatus,
   writeLine,
   writeLineSync
-} from "./chunk-PX5DNLSA.js";
+} from "./chunk-XCG76UE6.js";
 import {
   defaultModalities
 } from "./chunk-WOJZWRAZ.js";
@@ -410,10 +412,10 @@ import {
   isManagedMemoryPath,
   isTeamAutoMemPath,
   isUserAutoMemPath
-} from "./chunk-E4WHKETF.js";
+} from "./chunk-FVKHVJZQ.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-ZPPP6VCL.js";
+} from "./chunk-6ZRFAKXK.js";
 import {
   AgentStatistics,
   BaseDeclarativeTool,
@@ -425,13 +427,14 @@ import {
   ToolDisplayNamesMigration,
   ToolNames,
   ToolNamesMigration,
+  canonicalToolName,
   hasCycleInSchema,
   isShellProgressData,
   isTool,
   require_dist,
   require_fast_deep_equal,
   require_fast_uri
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-PYQADEFD.js";
 import {
   AUTH_ENV_MAPPINGS,
   AuthType,
@@ -445,7 +448,7 @@ import {
   createContentGenerator,
   resetPreloadedContentGenerator,
   resolveContentGeneratorConfigWithSources
-} from "./chunk-BOGOR4HB.js";
+} from "./chunk-P7HUJDBZ.js";
 import {
   normalizeMcpToolName,
   sanitizeToolNameForProvider
@@ -465,13 +468,13 @@ import {
   preloadRuntimeFetchModule,
   redactProxyError,
   setResolvedProxyUrlForRuntimeFetch
-} from "./chunk-BFHXDAR7.js";
+} from "./chunk-KKBPOU75.js";
 import {
   atomicWriteFile,
   atomicWriteFileSync,
   atomicWriteJSON,
   renameWithRetry
-} from "./chunk-UH7Z7Y45.js";
+} from "./chunk-FOGU3LJX.js";
 import {
   endHookSpan,
   endInteractionSpan,
@@ -497,7 +500,7 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   truncateSpanError
-} from "./chunk-5L6CQ4ZU.js";
+} from "./chunk-6M26GBKX.js";
 import {
   safeJsonStringify
 } from "./chunk-W4RQUHY3.js";
@@ -547,7 +550,7 @@ import {
   tildeifyPath,
   toFriendlyError,
   unescapePath
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import {
   require_src
 } from "./chunk-AMDSOFFV.js";
@@ -8802,16 +8805,16 @@ var require_windows = __commonJS({
       return false;
     }
     __name(checkPathExt, "checkPathExt");
-    function checkStat(stat21, path98, options2) {
-      if (!stat21.isSymbolicLink() && !stat21.isFile()) {
+    function checkStat(stat22, path98, options2) {
+      if (!stat22.isSymbolicLink() && !stat22.isFile()) {
         return false;
       }
       return checkPathExt(path98, options2);
     }
     __name(checkStat, "checkStat");
     function isexe(path98, options2, cb) {
-      fs93.stat(path98, function(er2, stat21) {
-        cb(er2, er2 ? false : checkStat(stat21, path98, options2));
+      fs93.stat(path98, function(er2, stat22) {
+        cb(er2, er2 ? false : checkStat(stat22, path98, options2));
       });
     }
     __name(isexe, "isexe");
@@ -8830,8 +8833,8 @@ var require_mode = __commonJS({
     isexe.sync = sync2;
     var fs93 = __require("fs");
     function isexe(path98, options2, cb) {
-      fs93.stat(path98, function(er2, stat21) {
-        cb(er2, er2 ? false : checkStat(stat21, options2));
+      fs93.stat(path98, function(er2, stat22) {
+        cb(er2, er2 ? false : checkStat(stat22, options2));
       });
     }
     __name(isexe, "isexe");
@@ -8839,14 +8842,14 @@ var require_mode = __commonJS({
       return checkStat(fs93.statSync(path98), options2);
     }
     __name(sync2, "sync");
-    function checkStat(stat21, options2) {
-      return stat21.isFile() && checkMode(stat21, options2);
+    function checkStat(stat22, options2) {
+      return stat22.isFile() && checkMode(stat22, options2);
     }
     __name(checkStat, "checkStat");
-    function checkMode(stat21, options2) {
-      var mod = stat21.mode;
-      var uid = stat21.uid;
-      var gid = stat21.gid;
+    function checkMode(stat22, options2) {
+      var mod = stat22.mode;
+      var uid = stat22.uid;
+      var gid = stat22.gid;
       var myUid = options2.uid !== void 0 ? options2.uid : process.getuid && process.getuid();
       var myGid = options2.gid !== void 0 ? options2.gid : process.getgid && process.getgid();
       var u2 = parseInt("100", 8);
@@ -18227,12 +18230,12 @@ var require_resolve_symlink = __commonJS({
       fs_1.default.realpath(path98, (error, resolvedPath) => {
         if (error)
           return queue.dequeue(suppressErrors ? null : error, state);
-        fs_1.default.stat(resolvedPath, (error2, stat21) => {
+        fs_1.default.stat(resolvedPath, (error2, stat22) => {
           if (error2)
             return queue.dequeue(suppressErrors ? null : error2, state);
-          if (stat21.isDirectory() && isRecursive(path98, resolvedPath, state))
+          if (stat22.isDirectory() && isRecursive(path98, resolvedPath, state))
             return queue.dequeue(null, state);
-          callback(stat21, resolvedPath);
+          callback(stat22, resolvedPath);
           queue.dequeue(null, state);
         });
       });
@@ -18242,10 +18245,10 @@ var require_resolve_symlink = __commonJS({
       queue.enqueue();
       try {
         const resolvedPath = fs_1.default.realpathSync(path98);
-        const stat21 = fs_1.default.statSync(resolvedPath);
-        if (stat21.isDirectory() && isRecursive(path98, resolvedPath, state))
+        const stat22 = fs_1.default.statSync(resolvedPath);
+        if (stat22.isDirectory() && isRecursive(path98, resolvedPath, state))
           return;
-        callback(stat21, resolvedPath);
+        callback(stat22, resolvedPath);
       } catch (e) {
         if (!suppressErrors)
           throw e;
@@ -18564,8 +18567,8 @@ var require_walker = __commonJS({
             this.walkDirectory(this.state, path98, path98, depth - 1, this.walk);
           } else if (this.resolveSymlink && entry.isSymbolicLink()) {
             let path98 = joinPath.joinPathWithBasePath(entry.name, directoryPath);
-            this.resolveSymlink(path98, this.state, (stat21, resolvedPath) => {
-              if (stat21.isDirectory()) {
+            this.resolveSymlink(path98, this.state, (stat22, resolvedPath) => {
+              if (stat22.isDirectory()) {
                 resolvedPath = (0, utils_1.normalizePath)(resolvedPath, this.state.options);
                 if (exclude && exclude(entry.name, useRealPaths ? resolvedPath : path98 + pathSeparator))
                   return;
@@ -19972,7 +19975,8 @@ var BaseLlmClient = class {
       const request = {
         model: requestModel,
         config: requestConfig,
-        contents: requestContents
+        contents: requestContents,
+        ...options2.promptCacheSharing && { promptCacheSharing: true }
       };
       const apiCall = stream2 ? async () => {
         const responseStream = await contentGenerator.generateContentStream(
@@ -20327,12 +20331,12 @@ async function cleanupLegacyOutputFiles(dir, now, maxAgeMs, result) {
 __name(cleanupLegacyOutputFiles, "cleanupLegacyOutputFiles");
 async function tryDeleteIfOld(filePath, now, maxAgeMs, result) {
   try {
-    const stat21 = await fs2.lstat(filePath);
-    if (!stat21.isFile()) return;
-    if (now - stat21.mtimeMs < maxAgeMs) return;
+    const stat22 = await fs2.lstat(filePath);
+    if (!stat22.isFile()) return;
+    if (now - stat22.mtimeMs < maxAgeMs) return;
     await fs2.unlink(filePath);
     result.filesDeleted++;
-    result.bytesFreed += stat21.size;
+    result.bytesFreed += stat22.size;
   } catch (error) {
     if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
       return;
@@ -29106,6 +29110,7 @@ var SESSION_TRANSCRIPT_MAX_LIMIT = 500;
 var SESSION_TRANSCRIPT_CURSOR_VERSION = 1;
 var SESSION_TRANSCRIPT_MAX_INDEX_BYTES = 256 * 1024 * 1024;
 var SESSION_TRANSCRIPT_MAX_PAGE_BYTES = 4 * 1024 * 1024;
+var SESSION_TRANSCRIPT_MAX_EXPANDED_PAGE_BYTES = 16 * 1024 * 1024;
 var InvalidSessionTranscriptCursorError = class extends Error {
   static {
     __name(this, "InvalidSessionTranscriptCursorError");
@@ -29166,6 +29171,11 @@ var debugLogger14 = createDebugLogger("SESSION_TRANSCRIPT");
 var indexCache = /* @__PURE__ */ new Map();
 var cursorHmacKeys = /* @__PURE__ */ new Map();
 var indexCacheMaxBytesForTest;
+var expandedPageBytesForTest;
+function getExpandedPageBytes() {
+  return expandedPageBytesForTest ?? SESSION_TRANSCRIPT_MAX_EXPANDED_PAGE_BYTES;
+}
+__name(getExpandedPageBytes, "getExpandedPageBytes");
 function makeSessionTranscriptNotFoundError(sessionId) {
   const error = new Error(
     `ENOENT: no such file or directory, open '${sessionId}.jsonl'`
@@ -29404,12 +29414,68 @@ function selectPageUuids(index, position, limit, maxBytes) {
   return selected;
 }
 __name(selectPageUuids, "selectPageUuids");
+var REPLAY_MID_TURN_USER_SUBTYPES = /* @__PURE__ */ new Set([
+  "goal_runtime",
+  "notification",
+  "cron",
+  "mid_turn_user_message"
+]);
+function isReplayTurnStartType(type, subtype) {
+  return type === "user" && (subtype === void 0 || !REPLAY_MID_TURN_USER_SUBTYPES.has(subtype));
+}
+__name(isReplayTurnStartType, "isReplayTurnStartType");
 function isReplayTurnStart(index, uuid) {
   const entry = index.byUuid.get(uuid);
-  return entry?.type === "user" && entry.subtype !== "mid_turn_user_message";
+  return isReplayTurnStartType(entry?.type, entry?.subtype);
 }
 __name(isReplayTurnStart, "isReplayTurnStart");
-function selectBackwardPageUuids(index, position, limit, maxBytes) {
+function isReplayPageStart(index, uuid) {
+  const entry = index.byUuid.get(uuid);
+  return entry?.subtype !== "realtime_message" && (entry?.type === "assistant" || isReplayTurnStartType(entry?.type, entry?.subtype));
+}
+__name(isReplayPageStart, "isReplayPageStart");
+function findBoundaryAtOrBefore(items, from, floor, isBoundary) {
+  let candidate = from;
+  while (candidate > floor && !isBoundary(items[candidate])) {
+    candidate--;
+  }
+  return candidate;
+}
+__name(findBoundaryAtOrBefore, "findBoundaryAtOrBefore");
+function findReplayBoundaryAtOrBefore(index, from, floor, isBoundary) {
+  return findBoundaryAtOrBefore(
+    index.activeUuids,
+    from,
+    floor,
+    (uuid) => isBoundary(index, uuid)
+  );
+}
+__name(findReplayBoundaryAtOrBefore, "findReplayBoundaryAtOrBefore");
+function backwardPageBytesFit(index, start, end, budget) {
+  let total = 0;
+  for (let i = start; i < end; i++) {
+    total += recordSegmentBytes(index, index.activeUuids[i]);
+    if (total > budget) return false;
+  }
+  return true;
+}
+__name(backwardPageBytesFit, "backwardPageBytesFit");
+function selectionOrphansToolResult(index, start, end) {
+  for (let i = start; i < end; i++) {
+    if (index.byUuid.get(index.activeUuids[i])?.type !== "tool_result") {
+      continue;
+    }
+    for (let owner = i - 1; owner >= start; owner--) {
+      if (isReplayPageStart(index, index.activeUuids[owner])) return false;
+    }
+    return true;
+  }
+  return false;
+}
+__name(selectionOrphansToolResult, "selectionOrphansToolResult");
+function selectBackwardPageUuids(index, sessionId, position, limit, maxBytes) {
+  if (position === 0) return { uuids: [], nextPosition: 0 };
+  const expansionByteBudget = maxBytes === void 0 ? getExpandedPageBytes() : Math.min(2 * maxBytes, getExpandedPageBytes());
   let start = Math.max(0, position - limit);
   for (let i = start; i < position; i++) {
     if (isReplayTurnStart(index, index.activeUuids[i])) {
@@ -29417,8 +29483,15 @@ function selectBackwardPageUuids(index, position, limit, maxBytes) {
       break;
     }
   }
-  while (start > 0 && !isReplayTurnStart(index, index.activeUuids[start])) {
-    start--;
+  const expansionFloor = Math.max(0, position - 2 * limit);
+  const expandedStart = findReplayBoundaryAtOrBefore(
+    index,
+    start,
+    expansionFloor,
+    isReplayTurnStart
+  );
+  if (isReplayTurnStart(index, index.activeUuids[expandedStart])) {
+    start = expandedStart;
   }
   let selectedStart = position;
   let selectedBytes = 0;
@@ -29431,6 +29504,11 @@ function selectBackwardPageUuids(index, position, limit, maxBytes) {
     selectedStart = i;
     selectedBytes += bytes;
   }
+  const logTurnExpansionSkipped = /* @__PURE__ */ __name((reason) => {
+    debugLogger14.debug(
+      `backward turn expansion skipped session=${sessionId} start=${index.activeUuids[selectedStart]} reason=${reason}`
+    );
+  }, "logTurnExpansionSkipped");
   let alignedToReplayBoundary = false;
   for (let i = selectedStart; i < position; i++) {
     if (isReplayTurnStart(index, index.activeUuids[i])) {
@@ -29440,16 +29518,59 @@ function selectBackwardPageUuids(index, position, limit, maxBytes) {
     }
   }
   if (alignedToReplayBoundary && selectedStart > 0) {
-    let previousTurnStart = selectedStart - 1;
-    while (previousTurnStart >= 0 && !isReplayTurnStart(index, index.activeUuids[previousTurnStart])) {
-      previousTurnStart--;
-    }
+    const previousTurnStart = findReplayBoundaryAtOrBefore(
+      index,
+      selectedStart - 1,
+      -1,
+      isReplayTurnStart
+    );
     if (previousTurnStart < 0) {
-      selectedStart = 0;
+      if (expansionFloor === 0 && backwardPageBytesFit(index, 0, position, expansionByteBudget)) {
+        selectedStart = 0;
+      } else {
+        logTurnExpansionSkipped(
+          expansionFloor === 0 ? "byte-budget" : "record-budget"
+        );
+      }
     }
   } else if (!alignedToReplayBoundary) {
-    while (selectedStart > 0 && !isReplayTurnStart(index, index.activeUuids[selectedStart])) {
-      selectedStart--;
+    const candidate = findReplayBoundaryAtOrBefore(
+      index,
+      selectedStart,
+      expansionFloor,
+      isReplayTurnStart
+    );
+    if (isReplayTurnStart(index, index.activeUuids[candidate])) {
+      if (backwardPageBytesFit(index, candidate, position, expansionByteBudget)) {
+        selectedStart = candidate;
+      } else {
+        logTurnExpansionSkipped("byte-budget");
+      }
+    }
+  }
+  if (selectedStart > 0 && selectionOrphansToolResult(index, selectedStart, position)) {
+    const pairFloor = Math.max(0, selectedStart - limit);
+    const pairStart = findReplayBoundaryAtOrBefore(
+      index,
+      selectedStart,
+      pairFloor,
+      isReplayPageStart
+    );
+    if (!isReplayPageStart(index, index.activeUuids[pairStart])) {
+      debugLogger14.debug(
+        `backward pair extension skipped session=${sessionId} start=${index.activeUuids[selectedStart]} reason=record-budget`
+      );
+    } else if (!backwardPageBytesFit(
+      index,
+      pairStart + 1,
+      selectedStart,
+      expansionByteBudget
+    )) {
+      debugLogger14.debug(
+        `backward pair extension skipped session=${sessionId} start=${index.activeUuids[selectedStart]} reason=byte-budget`
+      );
+    } else {
+      selectedStart = pairStart;
     }
   }
   return {
@@ -29880,7 +30001,7 @@ var SessionTranscriptReader = class {
       );
       throw new InvalidSessionTranscriptCursorError();
     }
-    const backwardPage = direction === "backward" ? selectBackwardPageUuids(index, position, limit, maxBytes) : void 0;
+    const backwardPage = direction === "backward" ? selectBackwardPageUuids(index, sessionId, position, limit, maxBytes) : void 0;
     const pageUuids = backwardPage?.uuids ?? selectPageUuids(index, position, limit, maxBytes);
     const nextPosition = backwardPage?.nextPosition ?? position + pageUuids.length;
     const records = await readAggregatedRecords(index, pageUuids);
@@ -29923,6 +30044,15 @@ import { createHash as createHash3, randomUUID as randomUUID2 } from "node:crypt
 import * as fs11 from "node:fs/promises";
 import * as os3 from "node:os";
 import * as path11 from "node:path";
+
+// packages/core/src/utils/file-identity.ts
+init_esbuild_shims();
+function hasVerifiableInode(ino) {
+  return Number(ino) !== 0;
+}
+__name(hasVerifiableInode, "hasVerifiableInode");
+
+// packages/core/src/services/session-writer-lease.ts
 var LEGACY_LOCK_SCHEMA_VERSION = 1;
 var LOCK_SCHEMA_VERSION = 2;
 var MALFORMED_RETRY_COUNT = 3;
@@ -30000,12 +30130,31 @@ var SessionWriterUnavailableError = class extends SessionWriterError {
   static {
     __name(this, "SessionWriterUnavailableError");
   }
+  // Widened from the literal type so the subclass below can redeclare `name`.
+  // Narrowing this back to a literal makes that subclass fail to compile.
   name = "SessionWriterUnavailableError";
   rpcCode = SESSION_WRITER_RPC_CODES.session_writer_unavailable;
   errorKind = "session_writer_unavailable";
   httpStatus = 503;
   constructor(options2) {
-    super("Session write ownership could not be verified.", options2);
+    super(
+      options2?.message ?? "Session write ownership could not be verified.",
+      options2
+    );
+  }
+};
+var SessionTranscriptIdentityUnavailableError = class extends SessionWriterUnavailableError {
+  static {
+    __name(this, "SessionTranscriptIdentityUnavailableError");
+  }
+  name = "SessionTranscriptIdentityUnavailableError";
+  constructor(cause) {
+    super({
+      message: "Session transcript identity could not be verified on this filesystem.",
+      cause: cause ?? new Error(
+        "The session transcript filesystem does not provide a verifiable inode identity (ino=0)."
+      )
+    });
   }
 };
 function isProcessAlive(pid) {
@@ -30043,11 +30192,11 @@ __name(execFileText, "execFileText");
 async function readProcessStartIdentity(pid) {
   if (process.platform === "linux") {
     try {
-      const [stat21, bootId] = await Promise.all([
+      const [stat22, bootId] = await Promise.all([
         fs11.readFile(`/proc/${pid}/stat`, "utf8"),
         fs11.readFile("/proc/sys/kernel/random/boot_id", "utf8")
       ]);
-      const fields = stat21.slice(stat21.lastIndexOf(")") + 1).trim().split(/\s+/);
+      const fields = stat22.slice(stat22.lastIndexOf(")") + 1).trim().split(/\s+/);
       const startTicks = fields[19];
       if (!startTicks || !/^\d+$/.test(startTicks) || !/^[0-9a-f-]+$/i.test(bootId.trim())) {
         return null;
@@ -30125,22 +30274,46 @@ async function delay(ms2) {
   await new Promise((resolve38) => setTimeout(resolve38, ms2));
 }
 __name(delay, "delay");
-function transcriptFingerprint(stat21) {
+function transcriptFingerprint(stat22) {
   return {
-    dev: stat21.dev,
-    ino: stat21.ino,
-    mode: stat21.mode,
-    uid: stat21.uid,
-    gid: stat21.gid,
-    nlink: stat21.nlink,
-    birthtimeMs: stat21.birthtimeMs,
-    ctimeMs: stat21.ctimeMs,
-    mtimeMs: stat21.mtimeMs
+    dev: stat22.dev,
+    ino: stat22.ino,
+    mode: stat22.mode,
+    uid: stat22.uid,
+    gid: stat22.gid,
+    nlink: stat22.nlink,
+    birthtimeMs: stat22.birthtimeMs,
+    ctimeMs: stat22.ctimeMs,
+    mtimeMs: stat22.mtimeMs
   };
 }
 __name(transcriptFingerprint, "transcriptFingerprint");
+function assertVerifiableTranscriptIdentity(fingerprint2) {
+  if (!hasVerifiableInode(fingerprint2.ino)) {
+    throw new SessionTranscriptIdentityUnavailableError();
+  }
+}
+__name(assertVerifiableTranscriptIdentity, "assertVerifiableTranscriptIdentity");
+async function assertTranscriptFilesystemProvidesIdentity(transcriptPath) {
+  let dir = path11.dirname(transcriptPath);
+  for (; ; ) {
+    try {
+      const stat22 = await fs11.stat(dir);
+      assertVerifiableTranscriptIdentity({ ino: stat22.ino });
+      return;
+    } catch (error) {
+      if (error instanceof SessionWriterError) throw error;
+      const code = error.code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") return;
+      const parent = path11.dirname(dir);
+      if (parent === dir) return;
+      dir = parent;
+    }
+  }
+}
+__name(assertTranscriptFilesystemProvidesIdentity, "assertTranscriptFilesystemProvidesIdentity");
 function sameFileIdentity2(left, right) {
-  return left.dev === right.dev && left.ino === right.ino;
+  return left.ino !== 0 && right.ino !== 0 && left.dev === right.dev && left.ino === right.ino;
 }
 __name(sameFileIdentity2, "sameFileIdentity");
 function sameFileSecurityMetadata(left, right) {
@@ -30159,11 +30332,13 @@ function sameTranscriptState(left, right) {
   return sameHardTranscriptState(left, right) && left.fingerprint.birthtimeMs === right.fingerprint.birthtimeMs && left.fingerprint.ctimeMs === right.fingerprint.ctimeMs && left.fingerprint.mtimeMs === right.fingerprint.mtimeMs;
 }
 __name(sameTranscriptState, "sameTranscriptState");
-function transcriptStateFromStat(stat21) {
+function transcriptStateFromStat(stat22) {
+  const fingerprint2 = transcriptFingerprint(stat22);
+  assertVerifiableTranscriptIdentity(fingerprint2);
   return {
     exists: true,
-    byteLength: stat21.size,
-    fingerprint: transcriptFingerprint(stat21)
+    byteLength: stat22.size,
+    fingerprint: fingerprint2
   };
 }
 __name(transcriptStateFromStat, "transcriptStateFromStat");
@@ -30255,20 +30430,20 @@ async function getOpenTranscriptState(filePath, handle, invalidPathIsChange) {
 }
 __name(getOpenTranscriptState, "getOpenTranscriptState");
 async function inspectTranscriptPath(filePath, invalidPathIsChange) {
-  let stat21;
+  let stat22;
   try {
-    stat21 = await fs11.lstat(filePath);
+    stat22 = await fs11.lstat(filePath);
   } catch (error) {
     if (error.code === "ENOENT") {
       return { exists: false, byteLength: 0 };
     }
     throw error;
   }
-  if (!stat21.isFile() || stat21.isSymbolicLink()) {
+  if (!stat22.isFile() || stat22.isSymbolicLink()) {
     if (invalidPathIsChange) throw new SessionTranscriptChangedError();
     throw new SessionWriterUnavailableError();
   }
-  return transcriptStateFromStat(stat21);
+  return transcriptStateFromStat(stat22);
 }
 __name(inspectTranscriptPath, "inspectTranscriptPath");
 async function openTranscriptForRead(filePath, expectedState) {
@@ -30467,15 +30642,10 @@ async function openTranscriptProof(filePath) {
     if (!beforeStat.isFile() || !pathStat.isFile() || pathStat.isSymbolicLink()) {
       throw new SessionWriterUnavailableError();
     }
-    const beforeState = {
-      exists: true,
-      byteLength: beforeStat.size,
-      fingerprint: transcriptFingerprint(beforeStat)
-    };
-    if (!sameFileIdentity2(
-      beforeState.fingerprint,
-      transcriptFingerprint(pathStat)
-    )) {
+    const beforeState = transcriptStateFromStat(beforeStat);
+    const beforePathFingerprint = transcriptFingerprint(pathStat);
+    assertVerifiableTranscriptIdentity(beforePathFingerprint);
+    if (!sameFileIdentity2(beforeState.fingerprint, beforePathFingerprint)) {
       throw new SessionTranscriptChangedError();
     }
     if (beforeStat.size > 0) {
@@ -30508,15 +30678,10 @@ async function openTranscriptProof(filePath) {
       handle.stat(),
       fs11.lstat(filePath)
     ]);
-    const afterState = {
-      exists: true,
-      byteLength: afterStat.size,
-      fingerprint: transcriptFingerprint(afterStat)
-    };
-    if (!sameTranscriptState(beforeState, afterState) || !afterPathStat.isFile() || afterPathStat.isSymbolicLink() || !sameFileIdentity2(
-      afterState.fingerprint,
-      transcriptFingerprint(afterPathStat)
-    )) {
+    const afterState = transcriptStateFromStat(afterStat);
+    const afterPathFingerprint = transcriptFingerprint(afterPathStat);
+    assertVerifiableTranscriptIdentity(afterPathFingerprint);
+    if (!sameTranscriptState(beforeState, afterState) || !afterPathStat.isFile() || afterPathStat.isSymbolicLink() || !sameFileIdentity2(afterState.fingerprint, afterPathFingerprint)) {
       throw new SessionTranscriptChangedError();
     }
     const proof = {
@@ -30555,12 +30720,10 @@ async function validateOpenTranscriptProof(filePath, proof) {
     if (!handleStat.isFile() || !pathStat.isFile() || pathStat.isSymbolicLink()) {
       throw new SessionWriterUnavailableError();
     }
-    const current = {
-      exists: true,
-      byteLength: handleStat.size,
-      fingerprint: transcriptFingerprint(handleStat)
-    };
-    if (!sameTranscriptState(current, proof.state) || !sameFileIdentity2(current.fingerprint, transcriptFingerprint(pathStat))) {
+    const current = transcriptStateFromStat(handleStat);
+    const pathFingerprint = transcriptFingerprint(pathStat);
+    assertVerifiableTranscriptIdentity(pathFingerprint);
+    if (!sameTranscriptState(current, proof.state) || !sameFileIdentity2(current.fingerprint, pathFingerprint)) {
       throw new SessionTranscriptChangedError();
     }
   } catch (error) {
@@ -30697,8 +30860,8 @@ async function removeExactRecord(candidatePath, expectedRaw) {
 __name(removeExactRecord, "removeExactRecord");
 async function inspectExactRecord(candidatePath, expectedRaw) {
   try {
-    const stat21 = await fs11.lstat(candidatePath);
-    if (!stat21.isFile() || stat21.isSymbolicLink()) return { state: "other" };
+    const stat22 = await fs11.lstat(candidatePath);
+    if (!stat22.isFile() || stat22.isSymbolicLink()) return { state: "other" };
     const raw = await fs11.readFile(candidatePath, "utf8");
     return { state: raw === expectedRaw ? "exact" : "other" };
   } catch (error) {
@@ -30752,8 +30915,8 @@ async function releaseTransitionClaim(claimPath, claimRaw) {
 __name(releaseTransitionClaim, "releaseTransitionClaim");
 async function inspectClaimedPrimary(lockPath, sourceRaw, sessionId) {
   try {
-    const stat21 = await fs11.lstat(lockPath);
-    if (!stat21.isFile() || stat21.isSymbolicLink()) return { state: "other" };
+    const stat22 = await fs11.lstat(lockPath);
+    if (!stat22.isFile() || stat22.isSymbolicLink()) return { state: "other" };
     const raw = await fs11.readFile(lockPath, "utf8");
     if (raw === sourceRaw) return { state: "source" };
     const record2 = parseLockRecord(raw);
@@ -31273,6 +31436,11 @@ var SessionWriterLease = class _SessionWriterLease {
         void 0,
         () => lease.released
       );
+      if (!snapshot.state.exists) {
+        await assertTranscriptFilesystemProvidesIdentity(
+          options2.transcriptPath
+        );
+      }
       await lease.readOwnedLock();
       lease.expectedTranscriptState = snapshot.state;
       lease.expectedTranscriptHasher = snapshot.hasher;
@@ -31299,9 +31467,9 @@ var SessionWriterLease = class _SessionWriterLease {
   }
   static async inspectExistingLock(lockPath, expectedSessionId) {
     for (let attempt = 0; attempt < MALFORMED_RETRY_COUNT; attempt++) {
-      let stat21;
+      let stat22;
       try {
-        stat21 = await fs11.lstat(lockPath);
+        stat22 = await fs11.lstat(lockPath);
       } catch (error) {
         if (error.code === "ENOENT") {
           return { kind: "missing" };
@@ -31310,7 +31478,7 @@ var SessionWriterLease = class _SessionWriterLease {
           cause: error instanceof Error ? error : void 0
         });
       }
-      if (!stat21.isFile() || stat21.isSymbolicLink()) {
+      if (!stat22.isFile() || stat22.isSymbolicLink()) {
         throw new SessionWriterUnavailableError({
           cause: new Error("Session writer lock is not a regular file")
         });
@@ -31346,16 +31514,16 @@ var SessionWriterLease = class _SessionWriterLease {
   }
   async readOwnedLock() {
     if (this.released) throw new SessionWriterLostError();
-    let stat21;
+    let stat22;
     try {
-      stat21 = await fs11.lstat(this.lockPath);
+      stat22 = await fs11.lstat(this.lockPath);
     } catch (error) {
       if (error.code === "ENOENT") {
         throw new SessionWriterLostError();
       }
       throw new SessionWriterUnavailableError();
     }
-    if (!stat21.isFile() || stat21.isSymbolicLink()) {
+    if (!stat22.isFile() || stat22.isSymbolicLink()) {
       throw new SessionWriterLostError();
     }
     let raw;
@@ -31454,6 +31622,7 @@ var SessionWriterLease = class _SessionWriterLease {
       candidateHasher.update(bytes);
       const nextByteLength = expectedBefore.byteLength + bytes.byteLength;
       await this.readOwnedLock();
+      assertVerifiableTranscriptIdentity(beforeState.fingerprint);
       await handle.writeFile(bytes);
       await handle.sync();
       const afterStat = await handle.stat();
@@ -31781,8 +31950,8 @@ var SessionWriterLease = class _SessionWriterLease {
   }
   async inspectReleasePath(candidatePath) {
     try {
-      const stat21 = await fs11.lstat(candidatePath);
-      if (!stat21.isFile() || stat21.isSymbolicLink()) return "other";
+      const stat22 = await fs11.lstat(candidatePath);
+      if (!stat22.isFile() || stat22.isSymbolicLink()) return "other";
       const raw = await fs11.readFile(candidatePath, "utf8");
       return raw === this.lockRecordRaw ? "owned" : "other";
     } catch (error) {
@@ -33476,7 +33645,8 @@ function getResumeTokenCounts(conversation) {
       if (candidate) {
         return {
           promptTokenCount: candidate,
-          outputTokenCount: getUsageOutputTokenCountForPromptEstimate(usage)
+          outputTokenCount: getUsageOutputTokenCountForPromptEstimate(usage),
+          isEstimated: false
         };
       }
     }
@@ -33485,7 +33655,11 @@ function getResumeTokenCounts(conversation) {
       if (payload?.info) {
         return {
           promptTokenCount: payload.info.newTokenCount,
-          outputTokenCount: 0
+          outputTokenCount: 0,
+          // Checkpoints created before provenance was persisted are safest to
+          // treat as estimates: this keeps the output clamp's overhead pad on
+          // and prevents an optimistic resume from overflowing the window.
+          isEstimated: payload.info.newTokenCountIsEstimated ?? true
         };
       }
     }
@@ -35226,6 +35400,30 @@ var CompressionStatus = /* @__PURE__ */ ((CompressionStatus2) => {
   CompressionStatus2[CompressionStatus2["COMPRESSION_FAILED_OUTPUT_TRUNCATED"] = 6] = "COMPRESSION_FAILED_OUTPUT_TRUNCATED";
   return CompressionStatus2;
 })(CompressionStatus || {});
+function getDisplayContentParts(response) {
+  const parts = response.candidates?.[0]?.content?.parts ?? [];
+  const displayParts = [];
+  for (const part of parts) {
+    if (part.thought) {
+      continue;
+    }
+    if (typeof part.text === "string" && part.text.length > 0) {
+      displayParts.push({ text: part.text });
+    }
+    const inlineData = part.inlineData;
+    if (inlineData?.mimeType?.trim().toLowerCase().startsWith("image/") && typeof inlineData.data === "string" && inlineData.data.length > 0) {
+      displayParts.push({
+        inlineData: {
+          data: inlineData.data,
+          mimeType: inlineData.mimeType,
+          ...typeof inlineData.displayName === "string" ? { displayName: inlineData.displayName } : {}
+        }
+      });
+    }
+  }
+  return displayParts;
+}
+__name(getDisplayContentParts, "getDisplayContentParts");
 var Turn = class {
   constructor(chat, prompt_id, goalContext) {
     this.chat = chat;
@@ -35303,9 +35501,15 @@ var Turn = class {
             value: thoughtSummary
           };
         }
-        const text = getResponseText(resp);
-        if (text) {
-          yield { type: "content" /* Content */, value: text };
+        const text = getResponseText(resp) ?? "";
+        const displayParts = getDisplayContentParts(resp);
+        const hasImage = displayParts.some((part) => "inlineData" in part);
+        if (text || hasImage) {
+          yield {
+            type: "content" /* Content */,
+            value: text,
+            ...hasImage ? { parts: displayParts } : {}
+          };
         }
         const functionCalls = resp.functionCalls ?? [];
         for (const fnCall of functionCalls) {
@@ -35409,18 +35613,9 @@ function getCitations(resp) {
 }
 __name(getCitations, "getCitations");
 
-// packages/core/src/core/openaiContentGenerator/prefix-caching.ts
-init_esbuild_shims();
-function supportsOpenAIPrefixCaching(contentGeneratorConfig) {
-  return DashScopeOpenAICompatibleProvider.isDashScopeProvider(
-    contentGeneratorConfig
-  );
-}
-__name(supportsOpenAIPrefixCaching, "supportsOpenAIPrefixCaching");
-
 // packages/core/src/services/postCompactAttachments.ts
 init_esbuild_shims();
-import { readFile as readFile7, stat as stat4 } from "node:fs/promises";
+import { readFile as readFile7, stat as stat5 } from "node:fs/promises";
 import { realpathSync } from "node:fs";
 import { resolve as resolvePath2, sep as pathSep } from "node:path";
 var POST_COMPACT_MAX_FILES_TO_RESTORE = 5;
@@ -35555,7 +35750,7 @@ async function readFileSizeAdaptive(filePath, maxTokens, signal) {
   if (signal?.aborted) return { kind: "missing" };
   const maxChars = maxTokens * CHARS_PER_TOKEN;
   try {
-    const { size } = await stat4(filePath);
+    const { size } = await stat5(filePath);
     if (size > maxChars * 4) return { kind: "reference" };
   } catch {
     return { kind: "missing" };
@@ -35879,9 +36074,12 @@ ${parts.join("\n\n")}`;
 __name(buildCompressionSystemPrompt, "buildCompressionSystemPrompt");
 function supportsCompressionCacheSharing(config) {
   const provider = config.getContentGeneratorConfig();
+  if (provider.authType === "gemini" /* USE_GEMINI */ || provider.authType === "vertex-ai" /* USE_VERTEX_AI */) {
+    return true;
+  }
   if (provider.enableCacheControl === false) return false;
   if (provider.authType === "anthropic" /* USE_ANTHROPIC */) return true;
-  return (provider.authType === "qwen-oauth" /* QWEN_OAUTH */ || provider.authType === "openai" /* USE_OPENAI */) && supportsOpenAIPrefixCaching(provider);
+  return supportsOpenAIPrefixCaching(provider);
 }
 __name(supportsCompressionCacheSharing, "supportsCompressionCacheSharing");
 function hasStateSnapshot(summary) {
@@ -36093,11 +36291,11 @@ Do not call tools; tool execution is disabled for this request. ` + COMPRESSION_
     );
     const usesMainModel = effectiveCompactionModel === config.getModel();
     const providerSupportsCacheSharing = supportsCompressionCacheSharing(config);
-    const hasProviderTokenCount = (chat.getLastPromptTokenCount?.() ?? 0) > 0;
+    const hasProviderTokenCount = (chat.getLastPromptTokenCount?.() ?? 0) > 0 && chat.isLastPromptTokenCountEstimated?.() !== true;
     const sharedRequestFits = sharedPromptTokenCount + sharedDirectiveTokenCount + COMPACT_MAX_OUTPUT_TOKENS <= contextLimit;
     const canShareCache = usesMainModel && providerSupportsCacheSharing && hasProviderTokenCount && sharedRequestFits;
     if (!canShareCache) {
-      const reason = !usesMainModel ? "distinct compaction model" : !providerSupportsCacheSharing ? "provider does not support cache sharing" : !hasProviderTokenCount ? "no provider token-count anchor" : `shared request exceeds context window: prompt=${sharedPromptTokenCount}, directive=${sharedDirectiveTokenCount}, reserve=${COMPACT_MAX_OUTPUT_TOKENS}, window=${contextLimit}`;
+      const reason = !usesMainModel ? "distinct compaction model" : !providerSupportsCacheSharing ? "provider does not support cache sharing" : !hasProviderTokenCount ? "no provider-reported token-count anchor" : `shared request exceeds context window: prompt=${sharedPromptTokenCount}, directive=${sharedDirectiveTokenCount}, reserve=${COMPACT_MAX_OUTPUT_TOKENS}, window=${contextLimit}`;
       debugLogger20.debug(`[compaction] skipping cache sharing: ${reason}`);
     }
     if (canShareCache) {
@@ -36109,6 +36307,7 @@ Do not call tools; tool execution is disabled for this request. ` + COMPRESSION_
         const mainSystemInstruction = generationConfig.systemInstruction;
         delete generationConfig.systemInstruction;
         delete generationConfig.abortSignal;
+        const authType = config.getContentGeneratorConfig().authType;
         const sharedResult = await config.getBaseLlmClient().generateText({
           contents: [
             ...sideQueryHistory,
@@ -36125,7 +36324,7 @@ Do not call tools; tool execution is disabled for this request. ` + COMPRESSION_
           systemInstruction: mainSystemInstruction,
           config: {
             ...generationConfig,
-            ...contentGeneratorConfig.authType === "anthropic" /* USE_ANTHROPIC */ ? {
+            ...authType === "anthropic" /* USE_ANTHROPIC */ ? {
               thinkingConfig: {
                 ...generationConfig.thinkingConfig,
                 // Manual Anthropic thinking requires budget_tokens to be
@@ -36133,13 +36332,19 @@ Do not call tools; tool execution is disabled for this request. ` + COMPRESSION_
                 // compatibility while keeping this bounded request valid.
                 thinkingBudget: COMPACT_MAX_OUTPUT_TOKENS - 1
               }
+            } : authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */ ? {
+              thinkingConfig: {
+                ...generationConfig.thinkingConfig,
+                includeThoughts: false
+              }
             } : {},
             maxOutputTokens: COMPACT_MAX_OUTPUT_TOKENS
           },
           abortSignal,
           promptId,
           stream: true,
-          maxAttempts: 1
+          maxAttempts: 1,
+          promptCacheSharing: true
         });
         if (!sharedResult.hadToolCall && hasStateSnapshot(sharedResult.text)) {
           summaryResult = sharedResult;
@@ -36337,6 +36542,7 @@ Do not call tools; tool execution is disabled for this request. ` + COMPRESSION_
         info: {
           originalTokenCount,
           newTokenCount,
+          newTokenCountIsEstimated: true,
           compressionStatus: 1 /* COMPRESSED */,
           triggerReason,
           ...compactionWarning && { warning: compactionWarning }
@@ -37037,7 +37243,7 @@ function syncFunctionCallsField(response, parts) {
 __name(syncFunctionCallsField, "syncFunctionCallsField");
 function canonicalPlanToolName(toolName) {
   if (!toolName) return "";
-  return ToolNamesMigration[toolName] ?? toolName;
+  return canonicalToolName(toolName);
 }
 __name(canonicalPlanToolName, "canonicalPlanToolName");
 function approvedPlanRedactionText(planPath) {
@@ -37149,7 +37355,7 @@ var TRANSPORT_STREAM_RETRY_CONFIG = {
    */
   maxContinuationRetries: 3
 };
-var FIRST_SEND_CLAMP_OVERHEAD_PAD = 2e4;
+var ESTIMATE_CLAMP_OVERHEAD_PAD = 2e4;
 var MAX_OUTPUT_RECOVERY_ATTEMPTS = 3;
 var RECOVERY_RESUME_INSTRUCTION = "Resume directly \u2014 no apology, no recap of what you were doing. Pick up mid-thought if that is where the cut happened. Break remaining work into smaller pieces.";
 var OUTPUT_RECOVERY_MESSAGE = `Output token limit hit. ${RECOVERY_RESUME_INSTRUCTION}`;
@@ -37253,6 +37459,10 @@ ${suffix}`;
   return continuationText;
 }
 __name(getRecoveryContinuationSuffix, "getRecoveryContinuationSuffix");
+function mergeDeliveredPrefix(deliveredText, continuationText) {
+  return deliveredText + getRecoveryContinuationSuffix(deliveredText, continuationText);
+}
+__name(mergeDeliveredPrefix, "mergeDeliveredPrefix");
 function isPlainTextPart(part) {
   return part !== void 0 && isValidNonThoughtTextPart(part);
 }
@@ -37754,6 +37964,7 @@ var GeminiChat = class {
    * still make compaction decisions based on their *own* context size.
    */
   lastPromptTokenCount = 0;
+  lastPromptTokenCountIsEstimated = false;
   /**
    * Per-chat output-token count from the previous model response. The
    * previous response is appended to local history after `promptTokenCount`
@@ -37902,18 +38113,26 @@ var GeminiChat = class {
    * comes from a different chat instance and should not inherit this chat's
    * last response size.
    */
-  setLastPromptTokenCount(count) {
+  setLastPromptTokenCount(count, isEstimated = false) {
     this.lastPromptTokenCount = count;
+    this.lastPromptTokenCountIsEstimated = isEstimated;
     this.lastOutputTokenCount = 0;
   }
+  isLastPromptTokenCountEstimated() {
+    return this.lastPromptTokenCountIsEstimated;
+  }
+  promptCountIsEstimateDerived() {
+    return this.lastPromptTokenCount === 0 || this.lastPromptTokenCountIsEstimated;
+  }
   /**
    * Seed the restored prompt and previous-response output token counts in one
-   * step. Resume restores chat history plus both counters from the same
-   * assistant usage record, so callers must avoid the normal
+   * step. Resume restores chat history plus both counters and their provenance
+   * from the same checkpoint, so callers must avoid the normal
    * setLastPromptTokenCount() clearing behavior.
    */
-  seedResumeTokenCounts(promptTokenCount, outputTokenCount) {
+  seedResumeTokenCounts(promptTokenCount, outputTokenCount, isEstimated = false) {
     this.lastPromptTokenCount = Number.isFinite(promptTokenCount) ? Math.max(0, promptTokenCount) : 0;
+    this.lastPromptTokenCountIsEstimated = isEstimated;
     this.lastOutputTokenCount = Number.isFinite(outputTokenCount) ? Math.max(0, outputTokenCount) : 0;
   }
   /**
@@ -37928,13 +38147,21 @@ var GeminiChat = class {
    * post-compression guards pass.
    */
   async tryCompress(promptId, force = false, signal, options2) {
+    const originalTokenCountIsEstimated = options2?.originalTokenCountOverride === void 0 && this.promptCountIsEstimateDerived();
+    const originalTokenCount = originalTokenCountIsEstimated ? options2?.precomputedEffectiveTokens ?? estimateContentTokens(
+      options2?.pendingUserMessage ? [...this.getHistoryShallow(true), options2.pendingUserMessage] : this.getHistoryShallow(true),
+      resolveSlimmingConfig(this.config.getChatCompression()).imageTokenEstimate
+    ) : options2?.originalTokenCountOverride ?? this.lastPromptTokenCount;
+    debugLogger22.debug(
+      `[compaction] token-count provenance: prompt_id=${promptId}, originalTokenCount=${originalTokenCount}, estimated=${originalTokenCountIsEstimated}`
+    );
     const service = new ChatCompressionService();
     const { newHistory, info } = await service.compress(this, {
       promptId,
       force,
       config: this.config,
       consecutiveFailures: this.consecutiveFailures,
-      originalTokenCount: options2?.originalTokenCountOverride ?? this.lastPromptTokenCount,
+      originalTokenCount,
       pendingUserMessage: options2?.pendingUserMessage,
       precomputedEffectiveTokens: options2?.precomputedEffectiveTokens,
       requestGenerationConfig: options2?.requestGenerationConfig,
@@ -37943,6 +38170,7 @@ var GeminiChat = class {
       signal
     });
     if (info.compressionStatus === 1 /* COMPRESSED */ && newHistory) {
+      info.newTokenCountIsEstimated ??= true;
       if (!options2?.deferChatCompressionRecord) {
         this.chatRecordingService?.recordChatCompression({
           info,
@@ -37952,8 +38180,10 @@ var GeminiChat = class {
       this.setHistory(newHistory);
       debugLogger22.debug("[FILE_READ_CACHE] clear after auto tryCompress");
       this.config.getFileReadCache().clear();
-      this.lastPromptTokenCount = info.newTokenCount;
-      this.lastOutputTokenCount = 0;
+      this.setLastPromptTokenCount(
+        info.newTokenCount,
+        info.newTokenCountIsEstimated
+      );
       this.telemetryService?.setLastPromptTokenCount(info.newTokenCount);
       this.consecutiveFailures = 0;
       this.hardRescueFailureCount = 0;
@@ -38003,10 +38233,15 @@ var GeminiChat = class {
     }
     const reduction = beforeEstimate - afterEstimate;
     const apiBaseline = this.lastPromptTokenCount || beforeEstimate;
+    const baselineIsEstimated = this.promptCountIsEstimateDerived();
     const adjustedTokenCount = Math.max(0, apiBaseline - reduction);
+    debugLogger22.debug(
+      `[compaction] fast token-count provenance: originalTokenCount=${apiBaseline}, estimated=${baselineIsEstimated}`
+    );
     const info = {
       originalTokenCount: apiBaseline,
       newTokenCount: adjustedTokenCount,
+      newTokenCountIsEstimated: true,
       compressionStatus: 1 /* COMPRESSED */,
       triggerReason: "manual"
     };
@@ -38023,6 +38258,7 @@ var GeminiChat = class {
     );
     this.setHistory(newHistory);
     this.lastPromptTokenCount = adjustedTokenCount;
+    this.lastPromptTokenCountIsEstimated = true;
     this.telemetryService?.setLastPromptTokenCount(adjustedTokenCount);
     this.consecutiveFailures = 0;
     return { info, microcompactMeta: mcMeta };
@@ -38143,6 +38379,7 @@ var GeminiChat = class {
       const shouldForceFromHard = !exactRoute && isHardTier && this.hardRescueFailureCount < MAX_CONSECUTIVE_FAILURES;
       const historyBeforeHardRescue = shouldForceFromHard ? this.getHistoryShallow() : void 0;
       const lastPromptTokenCountBeforeHardRescue = this.lastPromptTokenCount;
+      const lastPromptTokenCountWasEstimatedBeforeHardRescue = this.lastPromptTokenCountIsEstimated;
       const hardRescueFailureCountBeforeHardRescue = this.hardRescueFailureCount;
       if (shouldForceFromHard) {
         debugLogger22.warn(
@@ -38202,6 +38439,7 @@ var GeminiChat = class {
         if (compressionInfo.compressionStatus === 1 /* COMPRESSED */ && historyBeforeHardRescue) {
           this.setHistory(historyBeforeHardRescue);
           this.lastPromptTokenCount = lastPromptTokenCountBeforeHardRescue;
+          this.lastPromptTokenCountIsEstimated = lastPromptTokenCountWasEstimatedBeforeHardRescue;
           this.telemetryService?.setLastPromptTokenCount(
             lastPromptTokenCountBeforeHardRescue
           );
@@ -38263,7 +38501,13 @@ var GeminiChat = class {
         imageTokenEstimate,
         /* conservative= */
         true
-      ) : effectiveTokens + FIRST_SEND_CLAMP_OVERHEAD_PAD;
+      ) : effectiveTokens;
+      if (this.promptCountIsEstimateDerived()) {
+        promptTokensForClamp += ESTIMATE_CLAMP_OVERHEAD_PAD;
+        debugLogger22.debug(
+          `[clamp] estimate-derived prompt count; padded by ${ESTIMATE_CLAMP_OVERHEAD_PAD}: promptTokensForClamp=${promptTokensForClamp}, count=${this.lastPromptTokenCount}`
+        );
+      }
       const clampedMaxOutputTokens = clampOutputTokensToWindow(
         outputCeiling,
         contextWindowForClamp,
@@ -38384,7 +38628,11 @@ var GeminiChat = class {
               params,
               prompt_id,
               requestOverrides,
-              turnGoalContext
+              turnGoalContext,
+              // Captured by value, so the attempt records exactly the prefix
+              // `buildAttemptContents()` just asked the model to resume from,
+              // even if a later branch resets the continuation.
+              transportContinuationPrefix.length > 0 ? transportContinuationPrefix : void 0
             );
             lastFinishReason = void 0;
             for await (const chunk of stream2) {
@@ -38405,10 +38653,7 @@ var GeminiChat = class {
               yield { type: "chunk" /* CHUNK */, value: chunk };
             }
             lastError = null;
-            if (transportContinuationPrefix.length > 0) {
-              self2.prependTextToLastModelTurn(transportContinuationPrefix);
-              transportContinuationPrefix = "";
-            }
+            transportContinuationPrefix = "";
             break;
           } catch (error) {
             lastError = error;
@@ -38816,7 +39061,7 @@ var GeminiChat = class {
             const walkRecoveryEstimate = estimateContentTokens(
               recoveryContents,
               recoveryImageTokenEstimate
-            ) + FIRST_SEND_CLAMP_OVERHEAD_PAD;
+            ) + ESTIMATE_CLAMP_OVERHEAD_PAD;
             const recoveryPromptEstimate = Math.max(
               countBasedRecoveryEstimate,
               walkRecoveryEstimate
@@ -39063,7 +39308,7 @@ var GeminiChat = class {
    * by the fallback chain to call alternative models without duplicating
    * the retry wiring.
    */
-  async makeApiCallAndProcessStream(model, requestContents, params, prompt_id, overrides, goalContext) {
+  async makeApiCallAndProcessStream(model, requestContents, params, prompt_id, overrides, goalContext, transportContinuationPrefix) {
     const generator = overrides?.contentGenerator ?? this.config.getContentGenerator();
     const apiCall = /* @__PURE__ */ __name(() => generator.generateContentStream(
       {
@@ -39120,7 +39365,12 @@ var GeminiChat = class {
         );
       }, "onRetry")
     });
-    return this.processStreamResponse(model, streamResponse, goalContext);
+    return this.processStreamResponse(
+      model,
+      streamResponse,
+      goalContext,
+      transportContinuationPrefix
+    );
   }
   async *makeFallbackStream(model, requestContents, params, prompt_id, contentGenerator, retryAuthType, retryErrorCodes, goalContext) {
     const stream2 = await this.makeApiCallAndProcessStream(
@@ -39441,7 +39691,15 @@ This error was probably caused by cyclic schema references in one of the followi
       }
     }
   }
-  async *processStreamResponse(model, streamResponse, goalContext) {
+  /**
+   * @param transportContinuationPrefix - Text a previous attempt already
+   *   delivered before a socket cut, which this attempt was asked to resume
+   *   from (issue #7832). On success it is folded into the response parts
+   *   before either durable write, so the JSONL transcript and in-memory
+   *   history carry the same merged turn (issue #8094). Undefined on every
+   *   non-continuation send.
+   */
+  async *processStreamResponse(model, streamResponse, goalContext, transportContinuationPrefix) {
     const allModelParts = [];
     const usedToolCallIds = collectToolCallIdsFromHistory(this.history);
     const rawToolCallIdsInCurrentTurn = /* @__PURE__ */ new Set();
@@ -39589,6 +39847,7 @@ This error was probably caused by cyclic schema references in one of the followi
           const lastPromptTokenCount = hasUsablePromptTokenCount ? promptTokenCount : totalTokenCount;
           if (lastPromptTokenCount) {
             this.lastPromptTokenCount = lastPromptTokenCount;
+            this.lastPromptTokenCountIsEstimated = false;
             this.lastOutputTokenCount = hasUsablePromptTokenCount ? getUsageOutputTokenCountForPromptEstimate({
               promptTokenCount,
               ...hasUsableTotalTokenCount ? { totalTokenCount } : {},
@@ -39738,6 +39997,22 @@ This error was probably caused by cyclic schema references in one of the followi
       yield recoveredChunk;
     }
     const willPersistToHistory = streamError === null || hasToolCall && (thoughtContentPart || consolidatedHistoryParts.length > 0);
+    if (streamError === null && transportContinuationPrefix) {
+      const textIndex = consolidatedHistoryParts.findIndex(isPlainTextPart);
+      if (textIndex < 0) {
+        consolidatedHistoryParts.unshift({ text: transportContinuationPrefix });
+      } else {
+        const remainderPart = consolidatedHistoryParts[textIndex];
+        consolidatedHistoryParts[textIndex] = {
+          ...remainderPart,
+          text: mergeDeliveredPrefix(
+            transportContinuationPrefix,
+            remainderPart.text
+          )
+        };
+      }
+      contentText = consolidatedHistoryParts.filter((part) => part.text).map((part) => part.text).join("").trim();
+    }
     if (willPersistToHistory && (thoughtContentPart || contentText || hasToolCall || usageMetadata)) {
       const contextWindowSize = this.config.getContentGeneratorConfig()?.contextWindowSize;
       const recordArgs = {
@@ -39789,49 +40064,6 @@ This error was probably caused by cyclic schema references in one of the followi
       };
     }
   }
-  /**
-   * Prepend already-delivered text to the trailing model turn.
-   *
-   * Used by the transport-continuation path (issue #7832): after a socket cut
-   * mid-response, the caller has seen text that `processStreamResponse`
-   * deliberately did not persist, and the continuation attempt's own turn
-   * carries only the resumed remainder. Without this, durable history would
-   * hold an answer that starts mid-sentence — visibly wrong on `/compress`,
-   * `--resume`, and every later turn's context.
-   *
-   * The delivered text is merged into the turn's first plain-text part (kept
-   * after any leading thought part, matching the
-   * `[thoughtPart?, ...text]` shape `processStreamResponse` produces), or
-   * inserted as a new part when the continuation returned no text of its own.
-   * Overlap is deduped by the same helper the output-recovery merge uses, so a
-   * model that replays part of its previous tail does not double it.
-   */
-  prependTextToLastModelTurn(deliveredText) {
-    if (deliveredText.length === 0) return;
-    const lastEntry = this.history.at(-1);
-    if (lastEntry?.role !== "model") {
-      debugLogger22.warn(
-        "[TRANSPORT_CONTINUATION] Trailing entry is not a model turn; dropping the delivered-text merge.",
-        { role: lastEntry?.role ?? "undefined" }
-      );
-      return;
-    }
-    const parts = [...lastEntry.parts ?? []];
-    const textIndex = parts.findIndex(isPlainTextPart);
-    if (textIndex < 0) {
-      const insertAt = parts.findIndex((part) => !part.thought);
-      parts.splice(insertAt < 0 ? parts.length : insertAt, 0, {
-        text: deliveredText
-      });
-    } else {
-      const continuationPart = parts[textIndex];
-      parts[textIndex] = {
-        ...continuationPart,
-        text: deliveredText + getRecoveryContinuationSuffix(deliveredText, continuationPart.text)
-      };
-    }
-    lastEntry.parts = parts;
-  }
   /**
    * Merge `pairCount` trailing (user_recovery, model_continuation) pairs back
    * into the model turn that precedes them. Used after the output-token
@@ -39903,6 +40135,19 @@ function canonicalizeForHash(value) {
   return value;
 }
 __name(canonicalizeForHash, "canonicalizeForHash");
+function getToolCallRepeatKey(toolName, args) {
+  const argsString = JSON.stringify(canonicalizeForHash(args));
+  const keyString = `${canonicalToolName(toolName)}:${argsString}`;
+  return createHash5("sha256").update(keyString).digest("hex");
+}
+__name(getToolCallRepeatKey, "getToolCallRepeatKey");
+function shouldHaltOnTurnToolCallCap(totalCalls, maxKeyRepeat, cap, isExplicitCap) {
+  if (totalCalls <= cap) return false;
+  const hardCap = cap * ADAPTIVE_CAP_HARD_MULTIPLIER;
+  const stuck = maxKeyRepeat >= GLOBAL_DUPLICATE_THRESHOLD;
+  return isExplicitCap || totalCalls > hardCap || stuck;
+}
+__name(shouldHaltOnTurnToolCallCap, "shouldHaltOnTurnToolCallCap");
 var LoopDetectionService = class _LoopDetectionService {
   static {
     __name(this, "LoopDetectionService");
@@ -39994,9 +40239,7 @@ var LoopDetectionService = class _LoopDetectionService {
     );
   }
   getToolCallKey(toolCall) {
-    const argsString = JSON.stringify(canonicalizeForHash(toolCall.args));
-    const keyString = `${toolCall.name}:${argsString}`;
-    return createHash5("sha256").update(keyString).digest("hex");
+    return getToolCallRepeatKey(toolCall.name, toolCall.args);
   }
   /**
    * Convenience aggregate that runs every tier in order: the always-on
@@ -40456,22 +40699,20 @@ var LoopDetectionService = class _LoopDetectionService {
    */
   checkTurnToolCallCap() {
     this.turnToolCallTotal++;
-    const cap = this.config.getMaxToolCallsPerTurn();
-    if (this.turnToolCallTotal <= cap) {
+    if (!shouldHaltOnTurnToolCallCap(
+      this.turnToolCallTotal,
+      this.capMaxKeyRepeat,
+      this.config.getMaxToolCallsPerTurn(),
+      this.config.isMaxToolCallsPerTurnExplicit()
+    )) {
       return false;
     }
-    const explicitHardCap = this.config.isMaxToolCallsPerTurnExplicit();
-    const hardCap = cap * ADAPTIVE_CAP_HARD_MULTIPLIER;
-    const stuck = this.capMaxKeyRepeat >= GLOBAL_DUPLICATE_THRESHOLD;
-    if (explicitHardCap || this.turnToolCallTotal > hardCap || stuck) {
-      this.lastLoopType = "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */;
-      logLoopDetected(
-        this.config,
-        new LoopDetectedEvent("turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */, this.promptId)
-      );
-      return true;
-    }
-    return false;
+    this.lastLoopType = "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */;
+    logLoopDetected(
+      this.config,
+      new LoopDetectedEvent("turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */, this.promptId)
+    );
+    return true;
   }
   /**
    * Non-consecutive global duplicate detection: the SAME (tool, args) pair
@@ -41747,14 +41988,14 @@ function resolveToolName(rawName) {
   return TOOL_NAME_ALIASES[rawName] ?? rawName;
 }
 __name(resolveToolName, "resolveToolName");
-function getSpecifierKind(canonicalToolName3) {
-  if (SHELL_TOOL_NAMES.has(canonicalToolName3)) {
+function getSpecifierKind(canonicalToolName2) {
+  if (SHELL_TOOL_NAMES.has(canonicalToolName2)) {
     return "command";
   }
-  if (READ_TOOLS.has(canonicalToolName3) || EDIT_TOOLS.has(canonicalToolName3)) {
+  if (READ_TOOLS.has(canonicalToolName2) || EDIT_TOOLS.has(canonicalToolName2)) {
     return "path";
   }
-  if (WEBFETCH_TOOLS.has(canonicalToolName3)) {
+  if (WEBFETCH_TOOLS.has(canonicalToolName2)) {
     return "domain";
   }
   return "literal";
@@ -41881,8 +42122,8 @@ var CANONICAL_TO_RULE_DISPLAY = {
   exit_plan_mode: "ExitPlanMode",
   enter_plan_mode: "EnterPlanMode"
 };
-function getRuleDisplayName(canonicalToolName3) {
-  return CANONICAL_TO_RULE_DISPLAY[canonicalToolName3] ?? canonicalToolName3;
+function getRuleDisplayName(canonicalToolName2) {
+  return CANONICAL_TO_RULE_DISPLAY[canonicalToolName2] ?? canonicalToolName2;
 }
 __name(getRuleDisplayName, "getRuleDisplayName");
 var FILE_TARGETED_TOOLS = /* @__PURE__ */ new Set([
@@ -58724,7 +58965,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-7BT4TQ2A.js");
+        const { KeychainTokenStorage: KeychainTokenStorage2 } = await import("./keychain-token-storage-TVAMTNP7.js");
         const keychainStorage = new KeychainTokenStorage2(this.serviceName);
         const isAvailable = await keychainStorage.isAvailable();
         if (isAvailable) {
@@ -64086,16 +64327,6 @@ var ToolRegistry = class _ToolRegistry {
   }
 };
 
-// packages/core/src/tools/mcp-transport-pool.ts
-init_esbuild_shims();
-
-// packages/core/src/tools/mcp-pool-entry.ts
-init_esbuild_shims();
-import { EventEmitter } from "node:events";
-
-// packages/core/src/tools/mcp-pool-events.ts
-init_esbuild_shims();
-
 // packages/core/src/tools/mcp-discovery-timeout.ts
 init_esbuild_shims();
 var MIN_DISCOVERY_TIMEOUT_MS = 100;
@@ -64138,6 +64369,16 @@ function runWithTimeout(task, timeoutMs, label) {
 }
 __name(runWithTimeout, "runWithTimeout");
 
+// packages/core/src/tools/mcp-transport-pool.ts
+init_esbuild_shims();
+
+// packages/core/src/tools/mcp-pool-entry.ts
+init_esbuild_shims();
+import { EventEmitter } from "node:events";
+
+// packages/core/src/tools/mcp-pool-events.ts
+init_esbuild_shims();
+
 // packages/core/src/tools/mcp-pool-entry.ts
 var debugLogger42 = createDebugLogger("McpPool:Entry");
 function defaultPoolEntryOptions(transport) {
@@ -74778,6 +75019,16 @@ async function checkPriorRead(cache, filePath, verb, options2 = {}) {
       displayMessage: `file changed since last read; re-run ${ToolNames.READ_FILE} first.`
     };
   }
+  if (status.state === "unverifiable") {
+    const verbBare2 = verb === "editing" ? "edit" : "overwrite";
+    const raw2 = `File ${filePath} is on a filesystem that does not provide a verifiable inode identity (ino=0), so the ${verbBare2} tool cannot safely confirm a prior read. Use a different mechanism (for example, the shell tool) to ${verbBare2} this file.`;
+    return {
+      ok: false,
+      type: "prior_read_verification_failed" /* PRIOR_READ_VERIFICATION_FAILED */,
+      rawMessage: raw2,
+      displayMessage: `cannot verify prior read of ${filePath}; use a different mechanism to ${verbBare2} it.`
+    };
+  }
   if (status.state === "fresh" && status.entry.lastReadAt !== void 0 && !status.entry.lastReadCacheable) {
     const verbBare2 = verb === "editing" ? "edit" : "overwrite";
     const raw2 = `File ${filePath} is a binary / image / audio / video / PDF / notebook payload that the ${ToolNames.READ_FILE} tool returns as a structured value rather than as plain text. The Edit / WriteFile tools cannot mutate that payload safely \u2014 re-reading it would not change this. If this is a Jupyter notebook (.ipynb), use the ${ToolNames.NOTEBOOK_EDIT} tool for cell-level edits after reading it. For other non-text files, use a different mechanism (e.g. shell tool with an appropriate writer) if you need to ${verbBare2} it.`;
@@ -76725,6 +76976,10 @@ var FileReadCache = class _FileReadCache {
   static inodeKey(stats) {
     return `${stats.dev}:${stats.ino}`;
   }
+  /** See {@link hasVerifiableInode}. */
+  static hasVerifiableIdentity(stats) {
+    return hasVerifiableInode(stats.ino);
+  }
   /**
    * Record a successful Read of `absPath`.
    *
@@ -76763,8 +77018,21 @@ var FileReadCache = class _FileReadCache {
    * The fast-path `file_unchanged` check still gates on the
    * incoming request's own `isFullRead` (in `read-file.ts`), so a
    * partial read does not get a placeholder it shouldn't.
+   *
+   * When `stats.ino` is `0` the read is not stored and the returned
+   * entry is **detached**: it describes this read for the immediate
+   * caller, but it is not in the map, so mutating it has no effect
+   * and a later {@link check} still reports `unverifiable`.
    */
   recordRead(absPath, stats, opts) {
+    if (!_FileReadCache.hasVerifiableIdentity(stats)) {
+      const entry2 = _FileReadCache.createEntry(absPath, stats);
+      entry2.lastReadAt = Date.now();
+      entry2.readResidentInHistory = opts.full;
+      entry2.lastReadWasFull = opts.full;
+      entry2.lastReadCacheable = opts.cacheable;
+      return entry2;
+    }
     const key = _FileReadCache.inodeKey(stats);
     const existing = this.byInode.get(key);
     const sameFingerprint = existing !== void 0 && existing.mtimeMs === stats.mtimeMs && existing.sizeBytes === stats.size;
@@ -76800,9 +77068,12 @@ var FileReadCache = class _FileReadCache {
    * the default `cacheable: true`; structured writers such as notebook cell
    * editors can set `cacheable: false` so regular Edit / WriteFile still
    * reject the file as a non-text payload.
+   *
+   * As with {@link recordRead}, an `ino === 0` write returns a
+   * **detached** entry that was never added to the map.
    */
   recordWrite(absPath, stats, opts = {}) {
-    const entry = this.upsert(absPath, stats);
+    const entry = _FileReadCache.hasVerifiableIdentity(stats) ? this.upsert(absPath, stats) : _FileReadCache.createEntry(absPath, stats);
     const now = Date.now();
     entry.lastWriteAt = now;
     entry.lastReadAt = now;
@@ -76814,6 +77085,8 @@ var FileReadCache = class _FileReadCache {
   /**
    * Compare the cached fingerprint against `stats` for the same inode.
    *
+   *  - `unverifiable` — the filesystem reported `ino === 0`, so the
+   *    file identity cannot be safely compared or cached.
    *  - `unknown` — no entry. The file has never been Read or written in
    *    this session.
    *  - `stale`   — entry exists but mtime or size differs. The file has
@@ -76828,6 +77101,9 @@ var FileReadCache = class _FileReadCache {
    * `0 occurrences` failure mode, which prompts the model to re-read.
    */
   check(stats) {
+    if (!_FileReadCache.hasVerifiableIdentity(stats)) {
+      return { state: "unverifiable" };
+    }
     const entry = this.byInode.get(_FileReadCache.inodeKey(stats));
     if (!entry) return { state: "unknown" };
     if (entry.mtimeMs !== stats.mtimeMs || entry.sizeBytes !== stats.size) {
@@ -76855,6 +77131,9 @@ var FileReadCache = class _FileReadCache {
    * fall back to {@link clear}.
    */
   markReadEvictedFromHistory(stats) {
+    if (!_FileReadCache.hasVerifiableIdentity(stats)) {
+      return false;
+    }
     const entry = this.byInode.get(_FileReadCache.inodeKey(stats));
     if (entry) {
       entry.readResidentInHistory = false;
@@ -76864,6 +77143,9 @@ var FileReadCache = class _FileReadCache {
   }
   /** Remove the entry for the given Stats, if any. */
   invalidate(stats) {
+    if (!_FileReadCache.hasVerifiableIdentity(stats)) {
+      return;
+    }
     this.byInode.delete(_FileReadCache.inodeKey(stats));
   }
   /**
@@ -76936,8 +77218,13 @@ var FileReadCache = class _FileReadCache {
         this.byInode.delete(oldestKey);
       }
     }
-    const entry = {
-      inodeKey: key,
+    const entry = _FileReadCache.createEntry(absPath, stats);
+    this.byInode.set(key, entry);
+    return entry;
+  }
+  static createEntry(absPath, stats) {
+    return {
+      inodeKey: _FileReadCache.inodeKey(stats),
       realPath: absPath,
       mtimeMs: stats.mtimeMs,
       sizeBytes: stats.size,
@@ -76945,8 +77232,6 @@ var FileReadCache = class _FileReadCache {
       lastReadCacheable: false,
       readResidentInHistory: false
     };
-    this.byInode.set(key, entry);
-    return entry;
   }
 };
 
@@ -77776,8 +78061,8 @@ var GitWorktreeService = class _GitWorktreeService {
   async getRegisteredWorktreeBranch(worktreePath) {
     let resolvedWorktreePath;
     try {
-      const stat21 = await fs29.stat(worktreePath);
-      if (!stat21.isDirectory()) return null;
+      const stat22 = await fs29.stat(worktreePath);
+      if (!stat22.isDirectory()) return null;
       resolvedWorktreePath = await fs29.realpath(worktreePath);
     } catch {
       return null;
@@ -79156,8 +79441,8 @@ async function restoreWorktreeContext(sidecarPath, onWarn) {
   }
   let worktreeAlive = false;
   try {
-    const stat21 = await fs30.stat(session.worktreePath);
-    worktreeAlive = stat21.isDirectory();
+    const stat22 = await fs30.stat(session.worktreePath);
+    worktreeAlive = stat22.isDirectory();
   } catch {
     worktreeAlive = false;
   }
@@ -79866,6 +80151,10 @@ function applyUtf8Prefix(command, shell) {
   }
 }
 __name(applyUtf8Prefix, "applyUtf8Prefix");
+function isSignalTermination(signal) {
+  return signal !== null && signal !== 0;
+}
+__name(isSignalTermination, "isSignalTermination");
 function createPreSpawnAbortedHandle() {
   return {
     pid: void 0,
@@ -80898,7 +81187,7 @@ var ShellExecutionService = class _ShellExecutionService {
                   rawOutput: finalBuffer,
                   output: fullOutput,
                   exitCode,
-                  signal: signal ?? null,
+                  signal: signal === 0 ? null : signal ?? null,
                   error,
                   aborted: abortSignal.aborted,
                   pid: ptyProcess.pid,
@@ -81038,7 +81327,7 @@ var ShellExecutionService = class _ShellExecutionService {
                 }) => {
                   firePostSettle({
                     exitCode,
-                    signal: signal ?? null,
+                    signal: signal === 0 ? null : signal ?? null,
                     endTime: Date.now()
                   });
                 }
@@ -82058,10 +82347,10 @@ function readOutputTail(outputFile) {
   let fd;
   try {
     fd = fs32.openSync(outputFile, getReadOutputOpenFlags());
-    const stat21 = fs32.fstatSync(fd);
-    if (!stat21.isFile() || stat21.size <= 0) return void 0;
-    const length = Math.min(stat21.size, MAX_NOTIFICATION_OUTPUT_TAIL_BYTES);
-    const start = stat21.size - length;
+    const stat22 = fs32.fstatSync(fd);
+    if (!stat22.isFile() || stat22.size <= 0) return void 0;
+    const length = Math.min(stat22.size, MAX_NOTIFICATION_OUTPUT_TAIL_BYTES);
+    const start = stat22.size - length;
     const buffer = Buffer.allocUnsafe(length);
     const bytesRead = fs32.readSync(fd, buffer, 0, length, start);
     let sliceOffset = 0;
@@ -83066,6 +83355,7 @@ function restrictWorkflowConfirmationDetails(details) {
         type: "info",
         title: details.title,
         prompt: details.prompt,
+        renderPromptAsPlainText: details.renderPromptAsPlainText,
         urls: details.urls ? [...details.urls] : void 0,
         hideAlwaysAllow: true
       };
@@ -85500,10 +85790,6 @@ var WRITE_TOOL_NAMES = /* @__PURE__ */ new Set([
   ToolNames.WRITE_FILE,
   ToolNames.EDIT
 ]);
-function canonicalToolName(toolName) {
-  return ToolNamesMigration[toolName] ?? toolName;
-}
-__name(canonicalToolName, "canonicalToolName");
 function candidateFilePath(args) {
   const value = args?.["file_path"] ?? args?.["path"] ?? args?.["target_file"];
   return typeof value === "string" && value.length > 0 ? value : void 0;
@@ -85547,6 +85833,19 @@ function didWriteManagedMemory(candidates, projectRoot) {
   );
 }
 __name(didWriteManagedMemory, "didWriteManagedMemory");
+function didWriteProjectContextFile(candidates, projectRoot) {
+  const contextFilePaths = new Set(
+    getAllGeminiMdFilenames().map((name) => name.trim()).filter((name) => name.length > 0).map((name) => path42.resolve(projectRoot, name))
+  );
+  return candidates.some((candidate) => {
+    if (!isSuccessfulWrite(candidate)) {
+      return false;
+    }
+    const filePath = candidateFilePath(candidate.args);
+    return filePath !== void 0 && contextFilePaths.has(resolveCandidatePath(filePath, projectRoot));
+  });
+}
+__name(didWriteProjectContextFile, "didWriteProjectContextFile");
 async function rebuildWrittenMemoryIndexes(candidates, projectRoot, options2) {
   let wroteProjectMemory = false;
   let wroteUserMemory = false;
@@ -86395,11 +86694,11 @@ var WorkspaceMemoryFileTooLargeError = class extends Error {
 async function composeAppendedContent(filePath, newContent) {
   let existing = "";
   try {
-    const stat21 = await fs41.stat(filePath);
-    if (stat21.size > MAX_EXISTING_FILE_BYTES) {
+    const stat22 = await fs41.stat(filePath);
+    if (stat22.size > MAX_EXISTING_FILE_BYTES) {
       throw new WorkspaceMemoryFileTooLargeError(
         filePath,
-        stat21.size,
+        stat22.size,
         MAX_EXISTING_FILE_BYTES
       );
     }
@@ -87441,13 +87740,13 @@ var IdeClient = class _IdeClient {
       lockFiles.map(async (file) => {
         const fullPath = path47.join(ideDir, file);
         try {
-          const stat21 = await fs42.promises.stat(fullPath);
+          const stat22 = await fs42.promises.stat(fullPath);
           const content = await fs42.promises.readFile(fullPath, "utf8");
           try {
             return {
               file,
               fullPath,
-              mtimeMs: stat21.mtimeMs,
+              mtimeMs: stat22.mtimeMs,
               parsed: JSON.parse(content)
             };
           } catch (error) {
@@ -96596,8 +96895,8 @@ async function collectResources(resourcePaths, pluginRoot, destDir) {
       debugLogger79.warn(`Resource path not found: ${resolvedPath}`);
       continue;
     }
-    const stat21 = fs53.statSync(resolvedPath);
-    if (stat21.isDirectory()) {
+    const stat22 = fs53.statSync(resolvedPath);
+    if (stat22.isDirectory()) {
       const dirName = path56.basename(resolvedPath);
       const finalDestDir = dirName === destFolderName ? destDir : path56.join(destDir, dirName);
       const files = await glob("**/*", {
@@ -98174,7 +98473,7 @@ import * as path62 from "node:path";
 init_esbuild_shims();
 import * as fs59 from "node:fs";
 import * as path61 from "node:path";
-import { stat as stat11 } from "node:fs/promises";
+import { stat as stat12 } from "node:fs/promises";
 var debugLogger83 = createDebugLogger("EXT_MARKETPLACE");
 function parseSourceAndPluginName(source) {
   const urlSchemes = ["http://", "https://", "git@", "sso://"];
@@ -98361,7 +98660,7 @@ async function loadMarketplaceConfigFromSource(source, networkPolicy) {
   const trimmed = source.trim();
   const lowerTrimmed = trimmed.toLowerCase();
   try {
-    const stats = await stat11(trimmed);
+    const stats = await stat12(trimmed);
     if (stats.isDirectory()) {
       return await readLocalMarketplaceConfig(trimmed);
     }
@@ -98434,7 +98733,7 @@ async function parseInstallSource(source, options2 = {}) {
   let marketplaceConfig = null;
   let isLocalPath = false;
   try {
-    await stat11(repo);
+    await stat12(repo);
     isLocalPath = true;
   } catch {
   }
@@ -104454,13 +104753,13 @@ import * as os21 from "os";
 // node_modules/chokidar/esm/index.js
 init_esbuild_shims();
 import { stat as statcb } from "fs";
-import { stat as stat15, readdir as readdir10 } from "fs/promises";
+import { stat as stat16, readdir as readdir10 } from "fs/promises";
 import { EventEmitter as EventEmitter4 } from "events";
 import * as sysPath2 from "path";
 
 // node_modules/readdirp/esm/index.js
 init_esbuild_shims();
-import { stat as stat13, lstat as lstat7, readdir as readdir9, realpath as realpath6 } from "node:fs/promises";
+import { stat as stat14, lstat as lstat7, readdir as readdir9, realpath as realpath6 } from "node:fs/promises";
 import { Readable } from "node:stream";
 import { resolve as presolve, relative as prelative, join as pjoin, sep as psep } from "node:path";
 var EntryTypes = {
@@ -104530,7 +104829,7 @@ var ReaddirpStream = class extends Readable {
     const { root, type } = opts;
     this._fileFilter = normalizeFilter(opts.fileFilter);
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
-    const statMethod = opts.lstat ? lstat7 : stat13;
+    const statMethod = opts.lstat ? lstat7 : stat14;
     if (wantBigintFsStats) {
       this._stat = (path98) => statMethod(path98, { bigint: true });
     } else {
@@ -104685,7 +104984,7 @@ __name(readdirp, "readdirp");
 // node_modules/chokidar/esm/handler.js
 init_esbuild_shims();
 import { watchFile, unwatchFile, watch as fs_watch } from "fs";
-import { open as open8, stat as stat14, lstat as lstat8, realpath as fsrealpath } from "fs/promises";
+import { open as open8, stat as stat15, lstat as lstat8, realpath as fsrealpath } from "fs/promises";
 import * as sysPath from "path";
 import { type as osType } from "os";
 var STR_DATA = "data";
@@ -104712,7 +105011,7 @@ var EVENTS = {
 };
 var EV = EVENTS;
 var THROTTLE_MODE_WATCH = "watch";
-var statMethods = { lstat: lstat8, stat: stat14 };
+var statMethods = { lstat: lstat8, stat: stat15 };
 var KEY_LISTENERS = "listeners";
 var KEY_ERR = "errHandlers";
 var KEY_RAW = "rawEmitters";
@@ -105202,7 +105501,7 @@ var NodeFsHandler = class {
         return;
       if (!newStats || newStats.mtimeMs === 0) {
         try {
-          const newStats2 = await stat14(file);
+          const newStats2 = await stat15(file);
           if (this.fsw.closed)
             return;
           const at2 = newStats2.atimeMs;
@@ -105915,7 +106214,7 @@ var FSWatcher = class extends EventEmitter4 {
       const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path98) : path98;
       let stats2;
       try {
-        stats2 = await stat15(fullPath);
+        stats2 = await stat16(fullPath);
       } catch (err) {
       }
       if (!stats2 || this.closed)
@@ -106043,8 +106342,8 @@ var FSWatcher = class extends EventEmitter4 {
     }
     return this._userIgnored(path98, stats);
   }
-  _isntIgnored(path98, stat21) {
-    return !this._isIgnored(path98, stat21);
+  _isntIgnored(path98, stat22) {
+    return !this._isIgnored(path98, stat22);
   }
   /**
    * Provides a set of common helpers and properties relating to symlink handling.
@@ -107250,12 +107549,12 @@ __name(isWithin, "isWithin");
 async function readBoundedTaskFile(filePath) {
   const handle = await fs68.open(filePath, "r");
   try {
-    const stat21 = await handle.stat();
-    if (!stat21.isFile()) {
+    const stat22 = await handle.stat();
+    if (!stat22.isFile()) {
       return null;
     }
     const cap = LOOP_TASK_FILE_MAX_BYTES + 1;
-    const allocSize = Math.min(cap, stat21.size + 1);
+    const allocSize = Math.min(cap, stat22.size + 1);
     const buffer = Buffer.alloc(allocSize);
     let total = 0;
     while (total < allocSize) {
@@ -114734,7 +115033,7 @@ async function runSpeculativeLoop(config, state, cacheSafe, modelOverride) {
               toolInvocationGuard,
               {
                 callId: persistenceCallId,
-                toolName: canonicalToolName2(name),
+                toolName: canonicalToolName(name),
                 args: invocation.params,
                 signal: state.abortController.signal,
                 ...invocationContext ? { invocationContext } : {}
@@ -115412,12 +115711,12 @@ function resolveGitDir2(crawlDirectory) {
   while (current) {
     const gitPath = path76.join(current, ".git");
     try {
-      const stat21 = fs72.statSync(gitPath);
-      if (stat21.isDirectory()) {
+      const stat22 = fs72.statSync(gitPath);
+      if (stat22.isDirectory()) {
         pathCacheSet(resolveGitDirCache, cacheKey, gitPath);
         return gitPath;
       }
-      if (stat21.isFile()) {
+      if (stat22.isFile()) {
         const contents = fs72.readFileSync(gitPath, "utf8").trim();
         const match2 = contents.match(/^gitdir:\s*(.+)$/i);
         if (!match2) {
@@ -116025,13 +116324,13 @@ async function crawlWithGitLsFiles(stateKey, crawlDirectory, cwd, options2, work
     if (deletedSet.has(normalizedFile)) {
       return true;
     }
-    let stat21;
+    let stat22;
     try {
-      stat21 = fs72.lstatSync(path76.join(gitRoot, ...normalizedFile.split("/")));
+      stat22 = fs72.lstatSync(path76.join(gitRoot, ...normalizedFile.split("/")));
     } catch {
       return true;
     }
-    if (stat21.isDirectory()) {
+    if (stat22.isDirectory()) {
       return true;
     }
     if (relativeToGitRoot && relativeToGitRoot !== "." && normalizedFile === relativeToGitRoot) {
@@ -121910,8 +122209,8 @@ function getWelcomeBackStatePath() {
   return path85.join(process.cwd(), ".qwen", WELCOME_BACK_STATE_FILENAME);
 }
 __name(getWelcomeBackStatePath, "getWelcomeBackStatePath");
-function buildSummaryFingerprint(stat21) {
-  return `${stat21.mtimeMs}:${stat21.size}`;
+function buildSummaryFingerprint(stat22) {
+  return `${stat22.mtimeMs}:${stat22.size}`;
 }
 __name(buildSummaryFingerprint, "buildSummaryFingerprint");
 async function getWelcomeBackState() {
@@ -129393,7 +129692,7 @@ ${result.output}`;
     }
     const elapsedMs = performance.now() - executionStartTime;
     const longRunThreshold = effectiveTimeout === 0 ? null : longRunThresholdFor(effectiveTimeout);
-    const shouldAppendLongRunHint = longRunThreshold !== null && !result.aborted && result.signal === null && elapsedMs >= longRunThreshold;
+    const shouldAppendLongRunHint = longRunThreshold !== null && !result.aborted && !isSignalTermination(result.signal) && elapsedMs >= longRunThreshold;
     debugLogger122.debug(
       `long-run hint: elapsed=${Math.round(elapsedMs)}ms threshold=${longRunThreshold === null ? "disabled" : `${longRunThreshold}ms`} aborted=${result.aborted} signal=${result.signal} \u2192 ${shouldAppendLongRunHint ? "fire" : "suppress"}`
     );
@@ -129407,7 +129706,7 @@ ${result.output}` : result.output;
       } else {
         if (result.aborted) {
           returnDisplayMessage = wasTimeout ? `${timeoutSummary} There was no output before it timed out.` : wasPromoteRefused ? "Command finished before background-promote could be honoured." : "Command cancelled by user.";
-        } else if (result.signal) {
+        } else if (isSignalTermination(result.signal)) {
           returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
         } else if (result.error) {
           returnDisplayMessage = `Command failed: ${getErrorMessage(
@@ -129479,7 +129778,7 @@ ${attributionWarning}`;
 ${longRunHint}` : ""),
         type: "shell_execute_error" /* SHELL_EXECUTE_ERROR */
       }
-    } : isShellExitError(this.params.command, result.exitCode) ? {
+    } : !result.aborted && isSignalTermination(result.signal) || isShellExitError(this.params.command, result.exitCode) ? {
       error: {
         // Schedulers use error.message as the model-facing response.
         message: typeof llmContent === "string" ? llmContent : returnDisplayMessage,
@@ -129679,16 +129978,17 @@ ${longRunHint}` : ""),
     let postPromoteFinalStatus = null;
     const classifySettle = /* @__PURE__ */ __name((info) => {
       if (info.error) return { status: "failed", failMsg: info.error.message };
-      if (info.exitCode === 0) return { status: "completed", failMsg: null };
-      if (info.exitCode !== null)
+      if (isSignalTermination(info.signal)) {
         return {
           status: "failed",
-          failMsg: `Exited with code ${info.exitCode}`
+          failMsg: `Terminated by signal ${info.signal}`
         };
-      if (info.signal !== null)
+      }
+      if (info.exitCode === 0) return { status: "completed", failMsg: null };
+      if (info.exitCode !== null)
         return {
           status: "failed",
-          failMsg: `Terminated by signal ${info.signal}`
+          failMsg: `Exited with code ${info.exitCode}`
         };
       debugLogger122.warn(
         `promote: classifySettle all-null fallback hit for ${shellId} \u2014 exitCode=${info.exitCode}, signal=${info.signal}, error=undefined`
@@ -129699,6 +129999,10 @@ ${longRunHint}` : ""),
       };
     }, "classifySettle");
     const transitionRegistry = /* @__PURE__ */ __name((info) => {
+      if (entryAc.signal.aborted) {
+        registry.cancel(shellId, info.endTime);
+        return;
+      }
       const cls = classifySettle(info);
       if (cls.status === "completed") {
         registry.complete(shellId, info.exitCode, info.endTime);
@@ -129856,8 +130160,8 @@ ${longRunHint}` : ""),
             if (registry.get(shellId)?.status === "running") {
               registry.cancel(shellId, endTime);
             }
-          } else if (result.error || result.exitCode !== null && result.exitCode !== 0 || result.signal !== null) {
-            const reason = result.error ? result.error.message : result.signal !== null ? `terminated by signal ${result.signal}` : `exited with code ${result.exitCode}`;
+          } else if (result.error || result.exitCode !== null && result.exitCode !== 0 || isSignalTermination(result.signal)) {
+            const reason = result.error ? result.error.message : isSignalTermination(result.signal) ? `terminated by signal ${result.signal}` : `exited with code ${result.exitCode}`;
             registry.fail(shellId, reason, endTime);
           } else {
             registry.complete(shellId, result.exitCode ?? 0, endTime);
@@ -130827,12 +131131,8 @@ var FS_PATH_TOOL_NAMES = /* @__PURE__ */ new Set([
   ToolNames.NOTEBOOK_EDIT,
   ToolNames.DISPLAY_IMAGE
 ]);
-function canonicalToolName2(toolName) {
-  return ToolNamesMigration[toolName] ?? toolName;
-}
-__name(canonicalToolName2, "canonicalToolName");
 function isFilesystemPathTool(toolName) {
-  return FS_PATH_TOOL_NAMES.has(canonicalToolName2(toolName));
+  return FS_PATH_TOOL_NAMES.has(canonicalToolName(toolName));
 }
 __name(isFilesystemPathTool, "isFilesystemPathTool");
 function trimTrailingSlash(s3) {
@@ -130862,7 +131162,7 @@ function pushLspPathCandidate(out, v2) {
 }
 __name(pushLspPathCandidate, "pushLspPathCandidate");
 function extractToolFilePaths(toolName, toolInput) {
-  const canonical = canonicalToolName2(toolName);
+  const canonical = canonicalToolName(toolName);
   if (!FS_PATH_TOOL_NAMES.has(canonical)) {
     if (toolInput && typeof toolInput === "object") {
       const obj2 = toolInput;
@@ -131243,7 +131543,7 @@ function withPostToolBatchStop(completedCalls, stopReason) {
 }
 __name(withPostToolBatchStop, "withPostToolBatchStop");
 function isToolCallConcurrencySafe(name, kind, args) {
-  if (canonicalToolName2(name) === ToolNames.AGENT) return true;
+  if (canonicalToolName(name) === ToolNames.AGENT) return true;
   if (kind === "execute" /* Execute */) {
     const command = args?.command;
     if (typeof command !== "string") return false;
@@ -131976,7 +132276,7 @@ var CoreToolScheduler = class {
         Array.isArray(request) ? request : [request]
       );
       const planModeEntryBoundaryIndex = findPlanModeEntryBatchBoundaryIndex(
-        requestsToProcess.map((item) => canonicalToolName2(item.name))
+        requestsToProcess.map((item) => canonicalToolName(item.name))
       );
       if (this.validationRetryCounts.size > 0) {
         const currentToolNames = new Set(requestsToProcess.map((r) => r.name));
@@ -132041,7 +132341,7 @@ var CoreToolScheduler = class {
             });
             continue;
           }
-          const canonicalName = canonicalToolName2(reqInfo.name);
+          const canonicalName = canonicalToolName(reqInfo.name);
           const pm = this.config.getPermissionManager?.();
           const permissionEnabled = pm ? await pm.isToolEnabled(canonicalName) : true;
           if (recordPrevalidationCancellation()) continue;
@@ -132233,7 +132533,7 @@ var CoreToolScheduler = class {
           continue;
         }
         const { request: reqInfo, invocation } = toolCall;
-        const canonicalName = canonicalToolName2(reqInfo.name);
+        const canonicalName = canonicalToolName(reqInfo.name);
         const toolSpan = startToolSpan(
           canonicalName,
           {
@@ -133328,7 +133628,7 @@ var CoreToolScheduler = class {
     }
     let toolSpan = this.toolSpans.get(callId);
     if (!toolSpan) {
-      const canonical = canonicalToolName2(toolName);
+      const canonical = canonicalToolName(toolName);
       toolSpan = startToolSpan(
         canonical,
         {
@@ -133406,12 +133706,13 @@ var CoreToolScheduler = class {
    */
   bounceToAwaitingApprovalForAsk(scheduledCall, reason, toolSpan, signal) {
     const { callId, name: toolName } = scheduledCall.request;
-    const canonicalName = canonicalToolName2(toolName);
+    const canonicalName = canonicalToolName(toolName);
     this.bouncedAwaitingApproval.add(callId);
     const confirmationDetails = {
       type: "info",
       title: `Hook requested confirmation to run ${toolName}`,
       prompt: reason || `A PreToolUse hook requested confirmation before running ${toolName}.`,
+      renderPromptAsPlainText: true,
       hideAlwaysAllow: true,
       onConfirm: /* @__PURE__ */ __name((outcome, payload) => this.handleConfirmationResponse(
         callId,
@@ -133460,7 +133761,7 @@ var CoreToolScheduler = class {
   }
   async _executeToolCallBody(scheduledCall, signal, span) {
     const { callId, name: toolName } = scheduledCall.request;
-    const canonicalName = canonicalToolName2(toolName);
+    const canonicalName = canonicalToolName(toolName);
     const invocation = scheduledCall.invocation;
     const toolInput = scheduledCall.request.args;
     const isPostAskReexecution = this.bouncedAwaitingApproval.delete(callId);
@@ -134540,7 +134841,7 @@ ${failureHookResult.additionalContext}`;
     }
   }
   async maybePersistLargeToolResult(callId, toolName, content) {
-    if (GATE_EXEMPT_TOOLS.has(canonicalToolName2(toolName))) return { content };
+    if (GATE_EXEMPT_TOOLS.has(canonicalToolName(toolName))) return { content };
     const text = extractTextFromPartListUnion(content);
     if (!text || isAlreadyTruncated(text)) return { content };
     const gateThreshold = this.config.getTruncateToolOutputThreshold() + GATE_HEADROOM;
@@ -139872,6 +140173,9 @@ async function runAutoMemoryExtract(params) {
       );
     }) : Promise.resolve();
     await Promise.all([projectRebuild, userRebuild]);
+    await refreshMemoryInstruction(params.config, {
+      logContext: "managed auto-memory extraction"
+    });
   }
   const madeGenuineProgress = agentResult.touchedTopics.length > 0 || agentResult.hasToolActivity;
   const cursor = {
@@ -142078,7 +142382,8 @@ var GeminiClient = class _GeminiClient {
       if (resumeTokenCounts) {
         chat.seedResumeTokenCounts(
           resumeTokenCounts.promptTokenCount,
-          resumeTokenCounts.outputTokenCount
+          resumeTokenCounts.outputTokenCount,
+          resumeTokenCounts.isEstimated
         );
       } else {
         chat.setLastPromptTokenCount(
@@ -144584,15 +144889,15 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
   async tryCompressChat(prompt_id, force = false, signal, customInstructions) {
     const previousSessionStartContext = this.lastSessionStartContext;
     const previousSessionStartSource = this.lastSessionStartSource;
-    const info = await this.getChat().tryCompress(
+    const previousChat = this.getChat();
+    const info = await previousChat.tryCompress(
       prompt_id,
       force,
       signal,
       customInstructions ? { customInstructions } : void 0
     );
     if (info.compressionStatus === 1 /* COMPRESSED */) {
-      const chat = this.getChat();
-      const compressedHistory = chat.getHistoryShallow?.() ?? chat.getHistory();
+      const compressedHistory = previousChat.getHistoryShallow?.() ?? previousChat.getHistory();
       await this.startChat(compressedHistory, "compact" /* Compact */);
       if (!this.lastSessionStartContext && previousSessionStartContext && previousSessionStartSource) {
         this.lastSessionStartContext = previousSessionStartContext;
@@ -144604,7 +144909,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
       }
       debugLogger133.debug("[FILE_READ_CACHE] clear after tryCompressChat");
       this.config.getFileReadCache().clear();
-      this.getChat().setLastPromptTokenCount(info.newTokenCount);
+      this.getChat().setLastPromptTokenCount(
+        info.newTokenCount,
+        info.newTokenCountIsEstimated ?? true
+      );
       this.forceFullIdeContext = true;
     }
     return info;
@@ -150881,7 +151189,7 @@ var Config = class _Config {
     }
     if (!enabled) return;
     registry.registerFactory(ToolNames.IMAGE_GEN, async () => {
-      const { ImageGenTool } = await import("./image-gen-4CQJPQP5.js");
+      const { ImageGenTool } = await import("./image-gen-OE2EEKN3.js");
       return new ImageGenTool(this);
     });
   }
@@ -150911,36 +151219,36 @@ var Config = class _Config {
       if (options2?.forSubAgent) return;
       const schema = this.jsonSchema;
       await registerLazy(ToolNames.STRUCTURED_OUTPUT, async () => {
-        const { SyntheticOutputTool } = await import("./syntheticOutput-BN7E626U.js");
+        const { SyntheticOutputTool } = await import("./syntheticOutput-PEBJQYJV.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-3AZKX5WQ.js");
+        const { GetGoalTool } = await import("./goal-tools-QSYW65HV.js");
         return new GetGoalTool(this);
       });
       await registerLazy(ToolNames.UPDATE_GOAL, async () => {
-        const { UpdateGoalTool } = await import("./goal-tools-3AZKX5WQ.js");
+        const { UpdateGoalTool } = await import("./goal-tools-QSYW65HV.js");
         return new UpdateGoalTool(this);
       });
     }, "registerGoalWorkerTools");
     if (this.getBareMode()) {
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-ZNAN2B26.js");
+        const { ReadFileTool } = await import("./read-file-FMTE6LPA.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-IVQQVYYK.js");
+        const { EditTool } = await import("./edit-72DP57CD.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-        const { NotebookEditTool } = await import("./notebook-edit-OC2V7U5D.js");
+        const { NotebookEditTool } = await import("./notebook-edit-ZUVK2XWE.js");
         return new NotebookEditTool(this);
       });
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-BKII3B6E.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-3D3PMQHE.js");
         return new ShellTool2(this);
       });
       await registerGoalWorkerTools();
@@ -150952,43 +151260,43 @@ var Config = class _Config {
     }
     await registerGoalWorkerTools();
     await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-      const { ToolSearchTool } = await import("./tool-search-S6LRRACA.js");
+      const { ToolSearchTool } = await import("./tool-search-7N4D4O56.js");
       return new ToolSearchTool(this);
     });
     await registerLazy(ToolNames.READ_MCP_RESOURCE, async () => {
-      const { ReadMcpResourceTool } = await import("./read-mcp-resource-RTSSEER5.js");
+      const { ReadMcpResourceTool } = await import("./read-mcp-resource-PZ4ZF6YL.js");
       return new ReadMcpResourceTool(this);
     });
     await registerLazy(ToolNames.AGENT, async () => {
-      const { AgentTool: AgentTool2 } = await import("./agent-AHGLYNZ4.js");
+      const { AgentTool: AgentTool2 } = await import("./agent-DBSC47CD.js");
       return new AgentTool2(this);
     });
     await registerLazy(ToolNames.LIST_AGENTS, async () => {
-      const { ListAgentsTool } = await import("./list-agents-GC4BRET7.js");
+      const { ListAgentsTool } = await import("./list-agents-Z4WABFDZ.js");
       return new ListAgentsTool(this);
     });
     await registerLazy(ToolNames.TASK_STOP, async () => {
-      const { TaskStopTool } = await import("./task-stop-TNXRNAL2.js");
+      const { TaskStopTool } = await import("./task-stop-FPCOIRYX.js");
       return new TaskStopTool(this);
     });
     await registerLazy(ToolNames.SEND_MESSAGE, async () => {
-      const { SendMessageTool } = await import("./send-message-TL6FIMMN.js");
+      const { SendMessageTool } = await import("./send-message-CAMSLG2L.js");
       return new SendMessageTool(this);
     });
     await registerLazy(ToolNames.SKILL, async () => {
-      const { SkillTool } = await import("./skill-6CFOWVGA.js");
+      const { SkillTool } = await import("./skill-TSEYMVQ2.js");
       return new SkillTool(this);
     });
     await registerLazy(ToolNames.LS, async () => {
-      const { LSTool } = await import("./ls-63CC3NNX.js");
+      const { LSTool } = await import("./ls-TVHDGIES.js");
       return new LSTool(this);
     });
     await registerLazy(ToolNames.READ_FILE, async () => {
-      const { ReadFileTool } = await import("./read-file-ZNAN2B26.js");
+      const { ReadFileTool } = await import("./read-file-FMTE6LPA.js");
       return new ReadFileTool(this);
     });
     await registerLazy(ToolNames.ZOOM_IMAGE, async () => {
-      const { ZoomImageTool } = await import("./zoom-image-6RBLD7X6.js");
+      const { ZoomImageTool } = await import("./zoom-image-DPR22XWY.js");
       return new ZoomImageTool(this);
     });
     if (this.getUseRipgrep()) {
@@ -151003,7 +151311,7 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       if (useRipgrep) {
         await registerLazy(ToolNames.GREP, async () => {
-          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-C3KMLZM5.js");
+          const { RipGrepTool: RipGrepTool2 } = await import("./ripGrep-DUIYUZGM.js");
           return new RipGrepTool2(this);
         });
       } else {
@@ -151016,7 +151324,7 @@ var Config = class _Config {
           )
         );
         await registerLazy(ToolNames.GREP, async () => {
-          const { GrepTool } = await import("./grep-Z67Z7EN6.js");
+          const { GrepTool } = await import("./grep-56MTW67B.js");
           return new GrepTool(this);
         });
       }
@@ -151024,77 +151332,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-Z67Z7EN6.js");
+        const { GrepTool } = await import("./grep-56MTW67B.js");
         return new GrepTool(this);
       });
     }
     await registerLazy(ToolNames.GLOB, async () => {
-      const { GlobTool } = await import("./glob-Z4NQFKWS.js");
+      const { GlobTool } = await import("./glob-QNRIUOS6.js");
       return new GlobTool(this);
     });
     await registerLazy(ToolNames.EDIT, async () => {
-      const { EditTool } = await import("./edit-IVQQVYYK.js");
+      const { EditTool } = await import("./edit-72DP57CD.js");
       return new EditTool(this);
     });
     await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-      const { NotebookEditTool } = await import("./notebook-edit-OC2V7U5D.js");
+      const { NotebookEditTool } = await import("./notebook-edit-ZUVK2XWE.js");
       return new NotebookEditTool(this);
     });
     await registerLazy(ToolNames.WRITE_FILE, async () => {
-      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-G5VNGCOG.js");
+      const { WriteFileTool: WriteFileTool2 } = await import("./write-file-2F76RRFE.js");
       return new WriteFileTool2(this);
     });
     await registerLazy(ToolNames.SHELL, async () => {
-      const { ShellTool: ShellTool2 } = await import("./shell-BKII3B6E.js");
+      const { ShellTool: ShellTool2 } = await import("./shell-3D3PMQHE.js");
       return new ShellTool2(this);
     });
     await registerLazy(ToolNames.TODO_WRITE, async () => {
-      const { TodoWriteTool } = await import("./todoWrite-MHWHO5UO.js");
+      const { TodoWriteTool } = await import("./todoWrite-JGV6VLOX.js");
       return new TodoWriteTool(this);
     });
     const supportsUserInteraction = resolveInteractionMode(this) !== "headless";
     if (supportsUserInteraction) {
       await registerLazy(ToolNames.ASK_USER_QUESTION, async () => {
-        const { AskUserQuestionTool } = await import("./askUserQuestion-2EPPBPUZ.js");
+        const { AskUserQuestionTool } = await import("./askUserQuestion-ONW74PKJ.js");
         return new AskUserQuestionTool(this);
       });
     }
     if (!this.sdkMode && (supportsUserInteraction || options2?.forSubAgent)) {
       await registerLazy(ToolNames.EXIT_PLAN_MODE, async () => {
-        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-TUGOB2LL.js");
+        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-4Q7BSQXR.js");
         return new ExitPlanModeTool2(this);
       });
     }
     if (!this.sdkMode && supportsUserInteraction) {
       await registerLazy(ToolNames.ENTER_PLAN_MODE, async () => {
-        const { EnterPlanModeTool } = await import("./enterPlanMode-KKTDVLAD.js");
+        const { EnterPlanModeTool } = await import("./enterPlanMode-TQBWGCPL.js");
         return new EnterPlanModeTool(this);
       });
     }
     await registerLazy(ToolNames.ENTER_WORKTREE, async () => {
-      const { EnterWorktreeTool } = await import("./enter-worktree-P3DF2N6O.js");
+      const { EnterWorktreeTool } = await import("./enter-worktree-B4FY2ZPP.js");
       return new EnterWorktreeTool(this);
     });
     await registerLazy(ToolNames.EXIT_WORKTREE, async () => {
-      const { ExitWorktreeTool } = await import("./exit-worktree-LV5RLOCU.js");
+      const { ExitWorktreeTool } = await import("./exit-worktree-EYUD4YP2.js");
       return new ExitWorktreeTool(this);
     });
     await registerLazy(ToolNames.WEB_FETCH, async () => {
-      const { WebFetchTool } = await import("./web-fetch-JQCJHEEX.js");
+      const { WebFetchTool } = await import("./web-fetch-5ZLLLCDD.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-GUJA352B.js");
+        const { DisplayImageTool } = await import("./display-image-NQRSIBXM.js");
         return new DisplayImageTool(this);
       });
     }
     if (this.webSearchSettings?.enabled) {
-      const { evaluateWebSearchGate } = await import("./web-search-QGZ2KY4G.js");
+      const { evaluateWebSearchGate } = await import("./web-search-NELKANTW.js");
       const gate = evaluateWebSearchGate(this);
       if (gate.ok) {
         await registerLazy(ToolNames.WEB_SEARCH, async () => {
-          const { WebSearchTool } = await import("./web-search-QGZ2KY4G.js");
+          const { WebSearchTool } = await import("./web-search-NELKANTW.js");
           return new WebSearchTool(this);
         });
       } else if (!this.webSearchNoticeEmitted && !options2?.forSubAgent) {
@@ -151105,83 +151413,83 @@ var Config = class _Config {
     await this.registerImageGenerationTool(registry);
     if (this.isArtifactEnabled()) {
       await registerLazy(ToolNames.ARTIFACT, async () => {
-        const { ArtifactTool } = await import("./artifact-tool-RROCCJDA.js");
+        const { ArtifactTool } = await import("./artifact-tool-N652YE4L.js");
         return new ArtifactTool(this);
       });
     }
     if (this.isRecordArtifactEnabled()) {
       await registerLazy(ToolNames.RECORD_ARTIFACT, async () => {
-        const { RecordArtifactTool } = await import("./record-artifact-E6AWQU2Z.js");
+        const { RecordArtifactTool } = await import("./record-artifact-P4HFMS7X.js");
         return new RecordArtifactTool();
       });
     }
     if (this.isLspEnabled() && this.getLspClient()) {
       await registerLazy(ToolNames.LSP, async () => {
-        const { LspTool } = await import("./lsp-P6NVJVNT.js");
+        const { LspTool } = await import("./lsp-CVN6OQPI.js");
         return new LspTool(this);
       });
     }
     await registerStructuredOutputIfRequested();
     if (this.isCronEnabled()) {
       await registerLazy(ToolNames.CRON_CREATE, async () => {
-        const { CronCreateTool } = await import("./cron-create-CCRIULJE.js");
+        const { CronCreateTool } = await import("./cron-create-VONA5JYY.js");
         return new CronCreateTool(this);
       });
       await registerLazy(ToolNames.CRON_LIST, async () => {
-        const { CronListTool } = await import("./cron-list-QDBVCHRF.js");
+        const { CronListTool } = await import("./cron-list-KE4F2CIR.js");
         return new CronListTool(this);
       });
       await registerLazy(ToolNames.CRON_DELETE, async () => {
-        const { CronDeleteTool } = await import("./cron-delete-FCFW6BGP.js");
+        const { CronDeleteTool } = await import("./cron-delete-5JXSP2MI.js");
         return new CronDeleteTool(this);
       });
       await registerLazy(ToolNames.LOOP_WAKEUP, async () => {
-        const { LoopWakeupTool } = await import("./loop-wakeup-SQQSBMEY.js");
+        const { LoopWakeupTool } = await import("./loop-wakeup-UZ5RL5Y2.js");
         return new LoopWakeupTool(this);
       });
     }
     await registerLazy(ToolNames.CREATE_SUB_SESSION, async () => {
-      const { CreateSubSessionTool } = await import("./create-sub-session-6EWLAZD5.js");
+      const { CreateSubSessionTool } = await import("./create-sub-session-QIDZUOPU.js");
       return new CreateSubSessionTool(this);
     });
     if (this.isAgentTeamEnabled()) {
       await registerLazy(ToolNames.TEAM_CREATE, async () => {
-        const { TeamCreateTool } = await import("./team-create-GNC7NFY6.js");
+        const { TeamCreateTool } = await import("./team-create-OTP5SSB2.js");
         return new TeamCreateTool(this);
       });
       await registerLazy(ToolNames.TEAM_DELETE, async () => {
-        const { TeamDeleteTool } = await import("./team-delete-GDO7H2T4.js");
+        const { TeamDeleteTool } = await import("./team-delete-MMQB4OSC.js");
         return new TeamDeleteTool(this);
       });
       await registerLazy(ToolNames.TEAM_PLAN_APPROVAL, async () => {
-        const { TeamPlanApprovalTool } = await import("./team-plan-approval-ECALJLIO.js");
+        const { TeamPlanApprovalTool } = await import("./team-plan-approval-TQX5TMXU.js");
         return new TeamPlanApprovalTool(this);
       });
       await registerLazy(ToolNames.TASK_CREATE, async () => {
-        const { TaskCreateTool } = await import("./task-create-Q727MXHJ.js");
+        const { TaskCreateTool } = await import("./task-create-5NWCQSJF.js");
         return new TaskCreateTool(this);
       });
       await registerLazy(ToolNames.TASK_UPDATE, async () => {
-        const { TaskUpdateTool } = await import("./task-update-YB7PXO4R.js");
+        const { TaskUpdateTool } = await import("./task-update-5HN577LS.js");
         return new TaskUpdateTool(this);
       });
       await registerLazy(ToolNames.TASK_LIST, async () => {
-        const { TaskListTool } = await import("./task-list-G6KPQ5JT.js");
+        const { TaskListTool } = await import("./task-list-53265TRZ.js");
         return new TaskListTool(this);
       });
     }
     if (this.isWorkflowsEnabled()) {
       await registerLazy(ToolNames.WORKFLOW, async () => {
-        const { WorkflowTool } = await import("./workflow-YIT27YWZ.js");
+        const { WorkflowTool } = await import("./workflow-RXKBF3LO.js");
         return new WorkflowTool(this);
       });
     }
     if (this.isComputerUseEnabled()) {
-      const { registerComputerUseTools } = await import("./computer-use-5HXJ2P4X.js");
+      const { registerComputerUseTools } = await import("./computer-use-QLJ27OCZ.js");
       await registerComputerUseTools(registerLazy, this);
     }
     await registerLazy(ToolNames.MONITOR, async () => {
-      const { MonitorTool } = await import("./monitor-4T7W4M6Q.js");
+      const { MonitorTool } = await import("./monitor-FDWEJQWP.js");
       return new MonitorTool(this);
     });
     if (this.pendingMcpBudgetCallback) {
@@ -151661,12 +151969,15 @@ export {
   SESSION_TRANSCRIPT_MAX_LIMIT,
   SESSION_TRANSCRIPT_MAX_INDEX_BYTES,
   SESSION_TRANSCRIPT_MAX_PAGE_BYTES,
+  SESSION_TRANSCRIPT_MAX_EXPANDED_PAGE_BYTES,
   InvalidSessionTranscriptCursorError,
   SessionTranscriptSnapshotUnavailableError,
   SessionTranscriptTooLargeError,
   SessionTranscriptPageTooLargeError,
   SessionTranscriptCursorCodec,
   encodeSessionTranscriptCursor,
+  isReplayTurnStartType,
+  findBoundaryAtOrBefore,
   SessionTranscriptReader,
   SessionWriterError,
   SESSION_WRITER_RPC_CODES,
@@ -151684,7 +151995,10 @@ export {
   acquireSleepInhibitor,
   approxBase64Bytes,
   clampInlineMediaPart,
+  GLOBAL_DUPLICATE_THRESHOLD,
   DEFAULT_MAX_TOOL_CALLS_PER_TURN,
+  getToolCallRepeatKey,
+  shouldHaltOnTurnToolCallCap,
   CommitAttributionService,
   generateToolUseId,
   firePreToolUseHook,
@@ -151751,6 +152065,7 @@ export {
   sessionIdContext,
   getShellContextEnvVars,
   getShellPagerEnv,
+  isSignalTermination,
   ShellExecutionService,
   escape,
   globStream,
@@ -151775,7 +152090,6 @@ export {
   IdeClient,
   bridgeToolResultImages,
   evaluateToolInvocationGuard,
-  canonicalToolName2 as canonicalToolName,
   convertToFunctionResponse,
   convertToFunctionErrorResponse,
   isToolCallConcurrencySafe,
@@ -151810,6 +152124,9 @@ export {
   MAX_RECENT_ACTIVITIES,
   buildBackgroundEntryLabel,
   runForkedAgent,
+  didWriteProjectContextFile,
+  refreshMemoryInstruction,
+  refreshMemoryAfterManagedWrite,
   runManagedAutoMemoryDream,
   MessageDisplayDispatcher,
   collectMemoryDiagnostics,
@@ -151900,6 +152217,7 @@ export {
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
   buildSessionRecoveryPlan,
   buildSessionRecoveryPlanFromApiHistory,
+  runWithTimeout,
   McpTransportPool,
   WorkspaceMcpBudget,
   ClientMcpRegistrar,
@@ -151939,8 +152257,6 @@ export {
   buildManagedRememberPrompt,
   buildBareRememberPrompt,
   runManagedRememberByAgent,
-  refreshMemoryInstruction,
-  refreshMemoryAfterManagedWrite,
   parseLearnVideoInput,
   buildLearnSkillPrompt,
   buildLearnVideoSkillRequest,