@qwen-code/qwen-code 0.21.8 → 0.21.9

package/chunks/{acpAgent-5UWLFV6V.js → acpAgent-F2NSBCUF.js}

@@ -1,8 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  recomputeMcpGating
-} from "./chunk-YEF7XEO2.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -16,14 +13,17 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-FWBXMANW.js";
+} from "./chunk-THIKWITR.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-YHJFF7KH.js";
+} from "./chunk-UJUM2SRN.js";
+import {
+  recomputeMcpGating
+} from "./chunk-3XVDTHBJ.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -31,27 +31,28 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-7VUERJHS.js";
+} from "./chunk-II6G3EY6.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-NVRDQFCX.js";
+} from "./chunk-XTY5DN4Y.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-XHD7CRP2.js";
+} from "./chunk-5RBDAGC6.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-EN2TKTFH.js";
+import "./chunk-NV3F44FL.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-GOEVOFQI.js";
+} from "./chunk-DH5YXSIF.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-ZHA242R4.js";
-import "./chunk-YAF2MQZ6.js";
 import "./chunk-CTJLZLB5.js";
+import "./chunk-SCAZZ3Q4.js";
+import "./chunk-RVSTTOJ4.js";
+import "./chunk-YAF2MQZ6.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
-import "./chunk-HWX5HPUG.js";
+import "./chunk-LZZLUCRS.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
@@ -59,8 +60,7 @@ import {
   endAcpBootstrapConfigProfiling,
   markAcpStartup
 } from "./chunk-CG3WBKJK.js";
-import "./chunk-EIVICVHM.js";
-import "./chunk-IYES5WOT.js";
+import "./chunk-P2FK2HBV.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -74,7 +74,6 @@ import {
   formatWorkspaceMemoryForgetSummary,
   isCompatibleLiveSessionSource,
   isValidServerName,
-  loadSettingsCached,
   normalizeChannelDeliveryText,
   projectAcpToolResultUpdate,
   redactMcpServerSecrets,
@@ -83,7 +82,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-ZPLALRXZ.js";
+} from "./chunk-FBMCDU63.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -93,9 +92,9 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-2M4K4KYS.js";
+} from "./chunk-P3RBMQ4P.js";
 import "./chunk-OWMAZHIX.js";
-import "./chunk-4ALIARFY.js";
+import "./chunk-UYAUA63Q.js";
 import "./chunk-4NFY2S7N.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
@@ -103,58 +102,67 @@ import {
   isTerminalGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
 import "./chunk-3Z43GZUQ.js";
-import "./chunk-RXFQM6FQ.js";
-import "./chunk-HGCQ5SE7.js";
 import {
-  ACP_ROUTE_ID_PREFIX,
-  buildAcpModelOptions,
-  getCurrentAcpModelId,
-  parseAcpBaseModelId,
-  parseAcpModelOption,
-  resolveAcpModelOption,
-  sanitizeProviderBaseUrl
-} from "./chunk-GBDINRIL.js";
+  buildToolWriteOriginMeta
+} from "./chunk-VGHZT6JR.js";
 import {
-  mapSkillConfigToStatus
-} from "./chunk-BGXZBI5B.js";
+  normalizeSessionIdForLookup,
+  parseCallerSuppliedSessionId
+} from "./chunk-TQOF5KBL.js";
+import "./chunk-HGCQ5SE7.js";
 import {
   PERMISSION_RULE_TYPES,
   PermissionRulesValidationError,
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-KKDVZLGL.js";
+} from "./chunk-BAMN6XSD.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-DQSDACD2.js";
+} from "./chunk-RBHQXGDK.js";
 import {
   readVoiceModel
-} from "./chunk-C5VWPTGT.js";
+} from "./chunk-GAKGOXTC.js";
 import "./chunk-AOHJKPKL.js";
+import "./chunk-NTTBXH7U.js";
+import "./chunk-7S4JBJLU.js";
+import "./chunk-3SH53ANB.js";
+import {
+  ACP_ROUTE_ID_PREFIX,
+  buildAcpModelOptions,
+  getCurrentAcpModelId,
+  parseAcpBaseModelId,
+  parseAcpModelOption,
+  resolveAcpModelOption,
+  sanitizeProviderBaseUrl
+} from "./chunk-KTQGGPGV.js";
+import {
+  mapSkillConfigToStatus
+} from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-E4ZBKMSF.js";
-import "./chunk-QQWD7LZV.js";
+import "./chunk-ATMO54WE.js";
+import "./chunk-HADWBW5R.js";
 import "./chunk-57OAHC2Y.js";
+import "./chunk-LHEC5V6G.js";
+import "./chunk-67EWJE77.js";
+import "./chunk-E2FPSSKP.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-WV5J6Q6N.js";
-import "./chunk-VXZBKKQR.js";
-import "./chunk-3SE7J4DR.js";
-import "./chunk-3SH53ANB.js";
+} from "./chunk-D7BXVKSF.js";
 import {
   SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-FYAXKJK7.js";
+} from "./chunk-P4ZEZSJZ.js";
 import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-RPWVIXDB.js";
+} from "./chunk-I5VM3SKY.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -162,10 +170,8 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-NLREQJFK.js";
-import "./chunk-QXVSWG66.js";
-import "./chunk-KJZ26VBX.js";
-import "./chunk-NGYI5EF5.js";
+} from "./chunk-DA4HRSBW.js";
+import "./chunk-VKJ4KTPJ.js";
 import "./chunk-V6WHFGST.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
@@ -196,13 +202,14 @@ import {
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-J26HHFI5.js";
+} from "./chunk-LP2QGNSP.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-UFALT4LK.js";
+import "./chunk-PBRVUF5B.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
+import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_READY_META_KEY,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
@@ -210,12 +217,11 @@ import {
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV,
   isValidExternalToolGuardDenialReason
 } from "./chunk-BKHCW2BI.js";
-import "./chunk-M5GB774H.js";
 import "./chunk-UVX4Y6IN.js";
-import "./chunk-ZWBUH5UP.js";
 import {
-  ACP_EVENT_LOOP_STALL_RESTART_MS
-} from "./chunk-DIWZNWZT.js";
+  ACP_EVENT_LOOP_STALL_RESTART_MS,
+  CHANNEL_PROMPT_META_KEY
+} from "./chunk-DX3RGJMS.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -224,35 +230,46 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-Y4TETC74.js";
+} from "./chunk-MTCYGTWH.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
+  getUserSettingsPath,
   loadSettings,
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-OHKJVAKG.js";
+} from "./chunk-JUWS2Z5K.js";
+import "./chunk-7GOYZQPR.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
-import "./chunk-IDS7MSUP.js";
 import {
-  SUPPORTED_LANGUAGES,
+  getSystemDefaultsPath,
+  getSystemSettingsPath
+} from "./chunk-IDS7MSUP.js";
+import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-PG62DFWD.js";
+} from "./chunk-WP5VOXF7.js";
+import {
+  SUPPORTED_LANGUAGES
+} from "./chunk-5EJZE3FP.js";
 import {
+  findEnvFiles,
+  preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-B52AWKBB.js";
-import "./chunk-UA5H3DS2.js";
-import "./chunk-IUQ52YJK.js";
-import "./chunk-FN6YXJOP.js";
+} from "./chunk-T6HEQR2Q.js";
+import {
+  ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
+} from "./chunk-VFMASYQA.js";
+import "./chunk-BIRWP6LU.js";
+import "./chunk-IOEZE2YT.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-HA3SAB64.js";
+} from "./chunk-ZOSTTOUJ.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -349,6 +366,7 @@ import {
   getScopedEnvContents,
   getStopHookContinuationReason,
   getToolCallRepeatKey,
+  ideContextStore,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
   isDenialFallbackReason,
@@ -386,7 +404,7 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-GXSNGY5M.js";
+} from "./chunk-XX7QFP34.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
@@ -400,7 +418,7 @@ import "./chunk-7MH4J33A.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-VXZ5HAOV.js";
+import "./chunk-K4ADGWHU.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-GNPNYXJB.js";
@@ -426,7 +444,7 @@ import {
 import {
   APPROVAL_MODES
 } from "./chunk-WAUGQKUU.js";
-import "./chunk-PLFATELK.js";
+import "./chunk-DZUO626D.js";
 import {
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
@@ -434,7 +452,7 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-L4N6TIP7.js";
+} from "./chunk-4TRQPFDP.js";
 import "./chunk-SAH4BD2J.js";
 import {
   runWithRuntimeContentGenerator
@@ -475,6 +493,7 @@ import {
   PRIVATE_ACP_CAPABILITY_ENV,
   PRIVATE_PARENT_CAPABILITY_META_KEY,
   PromptSuggestionEvent,
+  RepeatedToolFailureGuardEvent,
   UserPromptEvent,
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
@@ -487,6 +506,7 @@ import {
   logConversationFinishedEvent,
   logLoopDetected,
   logPromptSuggestion,
+  logRepeatedToolFailureGuard,
   logToolCall,
   logUserPrompt,
   normalizeParts,
@@ -496,7 +516,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-3PY4LPJF.js";
+} from "./chunk-YGT2AUJ7.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import {
@@ -518,7 +538,7 @@ import {
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-M3STHEMM.js";
+} from "./chunk-PVOGHGSF.js";
 import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import {
@@ -536,9 +556,9 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-6M26GBKX.js";
+} from "./chunk-L2AFWWJE.js";
 import "./chunk-W4RQUHY3.js";
-import "./chunk-LKRMNRSN.js";
+import "./chunk-PDPFQ2FO.js";
 import {
   Storage,
   createDebugLogger,
@@ -547,10 +567,10 @@ import {
   isSubpath
 } from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-BF52U4XJ.js";
+import "./chunk-OGDIJKHK.js";
 import {
   runExitCleanup
-} from "./chunk-6TR7CFXH.js";
+} from "./chunk-PNBBJOCP.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -759,11 +779,14 @@ var AcpFileSystemService = class {
     if (!this.capabilities.writeTextFile) {
       return this.fallback.writeTextFile(params);
     }
-    const finalContent = params._meta?.["bom"] && params.content.charCodeAt(0) !== 65279 ? "\uFEFF" + params.content : params.content;
+    const { toolWriteOrigin, _meta: requestMeta, ...wireParams } = params;
+    const finalContent = requestMeta?.["bom"] && params.content.charCodeAt(0) !== 65279 ? "\uFEFF" + params.content : params.content;
+    const wireMeta = buildToolWriteOriginMeta(requestMeta, toolWriteOrigin);
     try {
       await this.connection.writeTextFile({
-        ...params,
+        ...wireParams,
         content: finalContent,
+        ...wireMeta !== void 0 ? { _meta: wireMeta } : {},
         sessionId: this.sessionId
       });
     } catch (error) {
@@ -799,11 +822,126 @@ var AcpFileSystemService = class {
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable, Writable } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import * as fs from "node:fs/promises";
-import * as os2 from "node:os";
-import * as path3 from "node:path";
+import * as fs2 from "node:fs/promises";
+import * as os3 from "node:os";
+import * as path4 from "node:path";
 import { createGunzip } from "node:zlib";
 
+// packages/cli/src/config/settings-cache.ts
+init_esbuild_shims();
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path2 from "node:path";
+var MAX_CACHE_ENTRIES = 64;
+var debugLogger2 = createDebugLogger("SETTINGS_CACHE");
+var cache = /* @__PURE__ */ new Map();
+function statSig(filePath) {
+  const st = fs.statSync(filePath, { throwIfNoEntry: false });
+  return st ? `${st.mtimeMs}:${st.size}:${st.ino}` : "missing";
+}
+__name(statSig, "statSig");
+function realpathOr(p) {
+  try {
+    return fs.realpathSync(p);
+  } catch {
+    return path2.resolve(p);
+  }
+}
+__name(realpathOr, "realpathOr");
+function settingsFileSigs(workspaceDir) {
+  const filePaths = [
+    getSystemSettingsPath(),
+    getSystemDefaultsPath(),
+    getUserSettingsPath(),
+    new Storage(workspaceDir).getWorkspaceSettingsPath()
+  ];
+  return filePaths.map((filePath) => ({ filePath, sig: statSig(filePath) }));
+}
+__name(settingsFileSigs, "settingsFileSigs");
+function envFileSigs(settings, workspaceDir) {
+  return findEnvFiles(settings.merged, workspaceDir).map((filePath) => ({
+    filePath,
+    sig: statSig(filePath)
+  }));
+}
+__name(envFileSigs, "envFileSigs");
+function sameFileSigs(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  return a.every(
+    (sig, i) => sig.filePath === b[i].filePath && sig.sig === b[i].sig
+  );
+}
+__name(sameFileSigs, "sameFileSigs");
+function isEntryFresh(key, entry) {
+  const fp = entry.fingerprint;
+  return ideContextStore.get()?.workspaceState?.isTrusted === fp.ideTrust && realpathOr(key) === fp.realCwd && // homeDir guards the corner where nothing else moves: QWEN_HOME set (so
+  // settings paths don't follow HOME), no .env files anywhere, and the new
+  // home equals the workspace dir — which flips workspaceSettingsActive.
+  realpathOr(os.homedir()) === fp.homeDir && sameFileSigs(settingsFileSigs(key), fp.settingsFiles) && sameFileSigs(envFileSigs(entry.settings, key), fp.envFiles);
+}
+__name(isEntryFresh, "isEntryFresh");
+function loadSettingsCached(workspaceDir) {
+  preResolveHomeEnvOverrides();
+  const key = path2.resolve(workspaceDir);
+  const entry = cache.get(key);
+  if (entry) {
+    let isFresh = false;
+    try {
+      isFresh = isEntryFresh(key, entry);
+    } catch (error) {
+      debugLogger2.warn(
+        `fingerprint check failed for ${key}; reloading:`,
+        error
+      );
+    }
+    if (isFresh) {
+      cache.delete(key);
+      cache.set(key, entry);
+      debugLogger2.debug(`hit ${key}`);
+      return entry.settings;
+    }
+    cache.delete(key);
+  }
+  debugLogger2.debug(`miss ${key}`);
+  let preLoadSigs;
+  try {
+    preLoadSigs = settingsFileSigs(key);
+  } catch (error) {
+    debugLogger2.warn(`pre-load signing failed for ${key}; not caching:`, error);
+  }
+  const settings = loadSettings(key);
+  if (preLoadSigs) {
+    try {
+      cache.set(key, {
+        settings,
+        fingerprint: {
+          settingsFiles: preLoadSigs,
+          // .env discovery needs the merged settings (trust), so it can only
+          // be signed after the load — see difference (2) in the module doc.
+          envFiles: envFileSigs(settings, key),
+          ideTrust: ideContextStore.get()?.workspaceState?.isTrusted,
+          realCwd: realpathOr(key),
+          homeDir: realpathOr(os.homedir())
+        }
+      });
+      if (cache.size > MAX_CACHE_ENTRIES) {
+        const oldest = cache.keys().next().value;
+        if (oldest !== void 0) {
+          cache.delete(oldest);
+          debugLogger2.debug(`evicted LRU entry ${oldest}`);
+        }
+      }
+    } catch (error) {
+      cache.delete(key);
+      debugLogger2.warn(`caching failed for ${key}; serving uncached:`, error);
+    }
+  }
+  return settings;
+}
+__name(loadSettingsCached, "loadSettingsCached");
+
 // packages/cli/src/acp-integration/extension-skills.ts
 init_esbuild_shims();
 function extensionSkillRef(extensionName, skillName) {
@@ -833,16 +971,16 @@ __name(isInactiveExtensionSkill, "isInactiveExtensionSkill");
 init_esbuild_shims();
 import { Buffer as Buffer2 } from "node:buffer";
 import { randomUUID } from "node:crypto";
-import { realpathSync, statSync } from "node:fs";
-import * as os from "node:os";
-import * as path2 from "node:path";
+import { realpathSync as realpathSync2, statSync as statSync2 } from "node:fs";
+import * as os2 from "node:os";
+import * as path3 from "node:path";
 
 // packages/cli/src/serve/live/capture-screen-context.ts
 init_esbuild_shims();
 import { constants } from "node:fs";
 import { open, unlink } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, resolve as resolve2 } from "node:path";
 var MAX_SCREENSHOT_BYTES = 8 * 1024 * 1024;
 var PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
 var CAPTURE_SCREEN_CONTEXT_TOOL_NAME = "capture_screen_context";
@@ -854,9 +992,9 @@ function failure(message) {
   };
 }
 __name(failure, "failure");
-function resolvePrivatePngPath(path4, captureDirectory) {
-  const resolvedPath = resolve(path4);
-  if (dirname(resolvedPath) !== resolve(captureDirectory)) {
+function resolvePrivatePngPath(path5, captureDirectory) {
+  const resolvedPath = resolve2(path5);
+  if (dirname(resolvedPath) !== resolve2(captureDirectory)) {
     throw new Error(
       "Host returned a screenshot outside its private directory."
     );
@@ -864,8 +1002,8 @@ function resolvePrivatePngPath(path4, captureDirectory) {
   return resolvedPath;
 }
 __name(resolvePrivatePngPath, "resolvePrivatePngPath");
-async function readPrivatePng(path4) {
-  const handle = await open(path4, constants.O_RDONLY | constants.O_NOFOLLOW);
+async function readPrivatePng(path5) {
+  const handle = await open(path5, constants.O_RDONLY | constants.O_NOFOLLOW);
   try {
     const stat2 = await handle.stat();
     if (!stat2.isFile() || stat2.size <= 0 || stat2.size > MAX_SCREENSHOT_BYTES) {
@@ -1462,7 +1600,7 @@ function requestPermissionWithAbort(client, params, signal) {
   if (signal.aborted) {
     return Promise.reject(permissionAbortError(signal));
   }
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let settled = false;
     const finish = /* @__PURE__ */ __name((callback) => {
       if (settled) return;
@@ -1480,7 +1618,7 @@ function requestPermissionWithAbort(client, params, signal) {
       return;
     }
     request.then(
-      (response) => finish(() => resolve5(response)),
+      (response) => finish(() => resolve6(response)),
       (error) => finish(() => reject(error))
     );
   });
@@ -1620,7 +1758,7 @@ function toPermissionOptions(confirmation, forceHideAlwaysAllow = false) {
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
-var debugLogger2 = createDebugLogger("ACP_SUBAGENT_TRACKER");
+var debugLogger3 = createDebugLogger("ACP_SUBAGENT_TRACKER");
 var SubAgentTracker = class {
   constructor(ctx, client, parentToolCallId, subagentType, onPermissionCancel, permissionRequester = (params, signal) => requestPermissionWithAbort(this.client, params, signal)) {
     this.ctx = ctx;
@@ -1681,7 +1819,7 @@ var SubAgentTracker = class {
         try {
           invocation = tool.build(event.args);
         } catch (e) {
-          debugLogger2.warn(`Failed to build subagent tool ${event.name}:`, e);
+          debugLogger3.warn(`Failed to build subagent tool ${event.name}:`, e);
         }
       }
       this.toolStates.set(event.callId, {
@@ -1695,7 +1833,7 @@ var SubAgentTracker = class {
         args: event.args,
         subagentMeta: this.subagentMeta
       }).catch((error) => {
-        debugLogger2.debug(
+        debugLogger3.debug(
           `Failed to emit subagent tool start for ${event.name}:`,
           error
         );
@@ -1719,7 +1857,7 @@ var SubAgentTracker = class {
         args: state?.args,
         subagentMeta: this.subagentMeta
       }).catch((error) => {
-        debugLogger2.debug(
+        debugLogger3.debug(
           `Failed to emit subagent tool result for ${event.name}:`,
           error
         );
@@ -1780,7 +1918,7 @@ var SubAgentTracker = class {
           this.onPermissionCancel?.();
         }
       } catch (error) {
-        debugLogger2.error(
+        debugLogger3.error(
           `Permission request failed for subagent tool ${event.name}:`,
           error
         );
@@ -1790,7 +1928,7 @@ var SubAgentTracker = class {
         try {
           await event.respond("cancel" /* Cancel */);
         } catch (respondError) {
-          debugLogger2.error(
+          debugLogger3.error(
             `Failed to cancel subagent tool ${event.name} after permission request failure:`,
             respondError
           );
@@ -1806,7 +1944,7 @@ var SubAgentTracker = class {
       const event = args[0];
       if (abortSignal.aborted) return;
       void this.messageEmitter.emitUsageMetadata(event.usage, "", event.durationMs, this.subagentMeta).catch((error) => {
-        debugLogger2.debug("Failed to emit subagent usage metadata:", error);
+        debugLogger3.debug("Failed to emit subagent usage metadata:", error);
       });
     };
   }
@@ -1825,7 +1963,7 @@ var SubAgentTracker = class {
         void 0,
         this.subagentMeta
       ).catch((error) => {
-        debugLogger2.debug("Failed to emit subagent stream text:", error);
+        debugLogger3.debug("Failed to emit subagent stream text:", error);
       });
     };
   }
@@ -1887,8 +2025,8 @@ var TurnBuffer = class {
 // packages/cli/src/acp-integration/session/rewrite/LlmRewriter.ts
 init_esbuild_shims();
 import { readFileSync, existsSync } from "node:fs";
-import { resolve as resolve2 } from "node:path";
-var debugLogger3 = createDebugLogger("MESSAGE_REWRITER");
+import { resolve as resolve3 } from "node:path";
+var debugLogger4 = createDebugLogger("MESSAGE_REWRITER");
 var DEFAULT_REWRITE_PROMPT = `You are an assistant that rewrites raw coding-agent output into concise, user-friendly progress updates.
 
 The agent is a software engineering assistant that reads files, writes code, runs commands, and uses tools. Its raw output mixes internal reasoning with user-facing information. Your job: extract what the user cares about, drop what they don't.
@@ -1914,14 +2052,14 @@ var LlmRewriter = class {
     this.rewriteModel = rewriteConfig.model || void 0;
     this.contextTurns = rewriteConfig.contextTurns === "all" ? Infinity : rewriteConfig.contextTurns ?? 1;
     if (rewriteConfig.promptFile) {
-      const filePath = resolve2(rewriteConfig.promptFile);
+      const filePath = resolve3(rewriteConfig.promptFile);
       if (existsSync(filePath)) {
         this.prompt = readFileSync(filePath, "utf-8").trim();
-        debugLogger3.info(
+        debugLogger4.info(
           `Loaded rewrite prompt from file: ${filePath} (${this.prompt.length} chars)`
         );
       } else {
-        debugLogger3.warn(
+        debugLogger4.warn(
           `Rewrite prompt file not found: ${filePath}, using default`
         );
         this.prompt = DEFAULT_REWRITE_PROMPT;
@@ -1958,7 +2096,7 @@ var LlmRewriter = class {
     const inputText = inputParts.join("\n\n");
     if (!inputText.trim()) return null;
     if (inputText.length < 10) return null;
-    debugLogger3.info(
+    debugLogger4.info(
       `[REWRITE INPUT] system_prompt_len=${this.prompt.length} input_len=${inputText.length} context_turns=${this.outputHistory.length}
 --- INPUT TEXT ---
 ${inputText}
@@ -1987,10 +2125,10 @@ ${inputText}
       });
       const rewritten = result.text;
       if (!rewritten || rewritten.length < 5) {
-        debugLogger3.info(`[REWRITE OUTPUT] empty or too short, skipping`);
+        debugLogger4.info(`[REWRITE OUTPUT] empty or too short, skipping`);
         return null;
       }
-      debugLogger3.info(
+      debugLogger4.info(
         `[REWRITE OUTPUT] len=${rewritten.length}
 --- OUTPUT ---
 ${rewritten}
@@ -2004,7 +2142,7 @@ ${rewritten}
       }
       return rewritten;
     } catch (error) {
-      debugLogger3.warn(
+      debugLogger4.warn(
         `LLM rewrite failed, skipping: ${error instanceof Error ? error.message : String(error)}`
       );
       return null;
@@ -2013,7 +2151,7 @@ ${rewritten}
 };
 
 // packages/cli/src/acp-integration/session/rewrite/MessageRewriteMiddleware.ts
-var debugLogger4 = createDebugLogger("MESSAGE_REWRITE");
+var debugLogger5 = createDebugLogger("MESSAGE_REWRITE");
 var DEFAULT_REWRITE_TIMEOUT_MS = 3e4;
 var REWRITE_META_EXCLUDED_KEYS = /* @__PURE__ */ new Set([]);
 var MessageRewriteMiddleware = class {
@@ -2096,10 +2234,10 @@ var MessageRewriteMiddleware = class {
         try {
           const rewritten = await this.rewriter.rewrite(content, rewriteSignal);
           if (!rewritten) {
-            debugLogger4.info(`Turn ${turnIdx}: no rewrite output`);
+            debugLogger5.info(`Turn ${turnIdx}: no rewrite output`);
             return;
           }
-          debugLogger4.info(
+          debugLogger5.info(
             `Turn ${turnIdx}: rewritten ${rewritten.length} chars`
           );
           await this.sendUpdate({
@@ -2112,7 +2250,7 @@ var MessageRewriteMiddleware = class {
             }
           });
         } catch (error) {
-          debugLogger4.warn(
+          debugLogger5.warn(
             `Turn ${turnIdx}: rewrite failed: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -2320,8 +2458,217 @@ var DaemonTodoStopGuard = class {
   }
 };
 
+// packages/cli/src/acp-integration/session/repeated-tool-failure-guard.ts
+init_esbuild_shims();
+var REPEATED_TOOL_FAILURE_THRESHOLD = 8;
+var REPEATED_TOOL_FAILURE_BATCH_THRESHOLD = 2;
+var REPEATED_TOOL_FAILURE_REMINDER = "System: the same tool execution has failed repeatedly for the same classified reason. Do not repeat the same approach. Inspect the returned result, change the approach or required preconditions, or explain the blocker.";
+var REPEATED_TOOL_FAILURE_STOP_MESSAGE = "Automatic continuation stopped because the same tool execution failure continued after a corrective reminder. New user input is required to continue.";
+var INELIGIBLE_RESET_REASON_PRECEDENCE = [
+  "contract_violation",
+  "cancelled",
+  "unknown",
+  "not_started",
+  "post_execution_failure"
+];
+function createRepeatedToolFailureGuardState() {
+  return {
+    phase: "idle",
+    failureCount: 0,
+    batchCount: 0,
+    candidateOrdinal: 0,
+    nextCandidateOrdinal: 1,
+    enforcementDisabled: false
+  };
+}
+__name(createRepeatedToolFailureGuardState, "createRepeatedToolFailureGuardState");
+function parseRepeatedToolFailureGuardMode(value) {
+  const normalized = value?.trim().toLowerCase();
+  switch (normalized) {
+    case "off":
+    case "shadow":
+    case "warn":
+    case "enforce":
+      return normalized;
+    default:
+      return void 0;
+  }
+}
+__name(parseRepeatedToolFailureGuardMode, "parseRepeatedToolFailureGuardMode");
+function resetState(state, enforcementDisabled = state.enforcementDisabled) {
+  return {
+    phase: "idle",
+    failureCount: 0,
+    batchCount: 0,
+    candidateOrdinal: 0,
+    nextCandidateOrdinal: state.nextCandidateOrdinal,
+    enforcementDisabled
+  };
+}
+__name(resetState, "resetState");
+function reset(state, reason, enforcementDisabled = state.enforcementDisabled) {
+  const nextState = resetState(state, enforcementDisabled);
+  if (state.phase === "idle" && state.enforcementDisabled === enforcementDisabled) {
+    return { kind: "none", state: nextState };
+  }
+  return { kind: "reset", state: nextState, reason };
+}
+__name(reset, "reset");
+function keysEqual(left, right) {
+  return left?.policyToolName === right.policyToolName && left.executionErrorType === right.executionErrorType;
+}
+__name(keysEqual, "keysEqual");
+function effectiveMode(mode, enforcementDisabled) {
+  return mode === "enforce" && enforcementDisabled ? "warn" : mode;
+}
+__name(effectiveMode, "effectiveMode");
+function reduceRepeatedToolFailureGuard(state, input) {
+  if (input.mode === "off" || state.phase === "latched") {
+    return { kind: "none", state };
+  }
+  if (!input.inputReliable) {
+    return reset(state, "unreliable_input", true);
+  }
+  if (input.hasExternalInput) {
+    return reset(state, "external_input");
+  }
+  if (input.hasQueuedPrompt) {
+    return reset(state, "queued_prompt");
+  }
+  if (!input.batch.complete) {
+    return reset(state, "incomplete");
+  }
+  const observations = input.batch.observations.filter(
+    (observation) => !observation.providerDuplicate
+  );
+  if (observations.length === 0) {
+    return { kind: "none", state };
+  }
+  const eligible = [];
+  const successfulPolicyToolNames = /* @__PURE__ */ new Set();
+  const resetReasons = /* @__PURE__ */ new Set();
+  let enforcementDisabled = state.enforcementDisabled;
+  for (const observation of observations) {
+    const { terminalStatus, executionStatus } = observation;
+    if (terminalStatus === "cancelled") {
+      resetReasons.add("cancelled");
+      continue;
+    }
+    if (executionStatus === void 0 || executionStatus === "unknown") {
+      resetReasons.add("unknown");
+      enforcementDisabled = true;
+      continue;
+    }
+    if (terminalStatus === "success") {
+      if (executionStatus === "error" || executionStatus === "cancelled") {
+        resetReasons.add("contract_violation");
+        enforcementDisabled = true;
+      } else if (executionStatus === "success" || executionStatus === "not_started") {
+        if (observation.policyToolName) {
+          successfulPolicyToolNames.add(observation.policyToolName);
+        } else {
+          resetReasons.add("unknown");
+          enforcementDisabled = true;
+        }
+      } else {
+        resetReasons.add("unknown");
+        enforcementDisabled = true;
+      }
+      continue;
+    }
+    if (executionStatus === "cancelled") {
+      resetReasons.add("cancelled");
+      continue;
+    }
+    if (executionStatus === "not_started") {
+      resetReasons.add("not_started");
+      continue;
+    }
+    if (executionStatus === "success") {
+      resetReasons.add("post_execution_failure");
+      continue;
+    }
+    if (executionStatus !== "error") {
+      resetReasons.add("unknown");
+      enforcementDisabled = true;
+      continue;
+    }
+    if (!observation.policyToolName || observation.executionErrorType === void 0 || observation.executionErrorType === "unknown" /* UNKNOWN */) {
+      resetReasons.add("unknown");
+      enforcementDisabled = true;
+      continue;
+    }
+    eligible.push({
+      policyToolName: observation.policyToolName,
+      executionErrorType: observation.executionErrorType
+    });
+  }
+  const resetReason = INELIGIBLE_RESET_REASON_PRECEDENCE.find(
+    (reason) => resetReasons.has(reason)
+  );
+  if (resetReason !== void 0) {
+    return reset(state, resetReason, enforcementDisabled);
+  }
+  const matchingFailures = eligible.filter(
+    (failure2) => !successfulPolicyToolNames.has(failure2.policyToolName)
+  );
+  const key = matchingFailures[0];
+  if (!key) {
+    if (state.key && successfulPolicyToolNames.has(state.key.policyToolName)) {
+      return reset(state, "success");
+    }
+    if (successfulPolicyToolNames.size > 0) {
+      return { kind: "none", state };
+    }
+    return reset(state, "unknown", true);
+  }
+  if (matchingFailures.some((entry) => !keysEqual(entry, key))) {
+    return reset(state, "mixed");
+  }
+  if (!keysEqual(state.key, key)) {
+    const nextState2 = {
+      phase: "tracking",
+      key,
+      failureCount: matchingFailures.length,
+      batchCount: 1,
+      candidateOrdinal: state.nextCandidateOrdinal,
+      nextCandidateOrdinal: state.nextCandidateOrdinal + 1,
+      enforcementDisabled: state.enforcementDisabled
+    };
+    return { kind: "tracked", state: nextState2 };
+  }
+  const failureCount = state.failureCount + matchingFailures.length;
+  const batchCount = state.batchCount + 1;
+  if (state.phase === "warned") {
+    const nextState2 = {
+      ...state,
+      phase: "latched",
+      failureCount,
+      batchCount
+    };
+    return {
+      kind: effectiveMode(input.mode, state.enforcementDisabled) === "enforce" ? "stop" : "would_stop",
+      state: nextState2
+    };
+  }
+  const nextState = {
+    ...state,
+    failureCount,
+    batchCount
+  };
+  if (failureCount < REPEATED_TOOL_FAILURE_THRESHOLD || batchCount < REPEATED_TOOL_FAILURE_BATCH_THRESHOLD) {
+    return { kind: "tracked", state: nextState };
+  }
+  nextState.phase = "warned";
+  return {
+    kind: effectiveMode(input.mode, state.enforcementDisabled) === "shadow" ? "would_warn" : "warn",
+    state: nextState
+  };
+}
+__name(reduceRepeatedToolFailureGuard, "reduceRepeatedToolFailureGuard");
+
 // packages/cli/src/acp-integration/session/Session.ts
-var debugLogger5 = createDebugLogger("SESSION");
+var debugLogger6 = createDebugLogger("SESSION");
 var permissionRequestTails = /* @__PURE__ */ new WeakMap();
 var USER_CANCEL_ABORT_REASON = "qwen:user-cancel";
 var SESSION_DISPOSE_ABORT_REASON = "qwen:session-dispose";
@@ -2354,7 +2701,7 @@ async function finalizeToolCallPreparations(tracker, includeResolved, streamName
     await tracker.discard(includeResolved);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Failed to discard tool preparations for ${streamName}; continuing stream: ${message}`
     );
   }
@@ -2377,24 +2724,81 @@ var LOOP_DETECTED_SKIP_MESSAGE = "Skipped because loop detection stopped the cur
 var LOOP_DETECTED_CONTEXT_MESSAGE = "System: this turn was terminated because the model exceeded tool-call safety limits. Try a different approach on the next turn.";
 var TOOL_EXECUTION_CANCELLED_MESSAGE = "Tool execution was cancelled.";
 var TOOL_POST_EXECUTION_CANCELLED_MESSAGE = "The tool had already completed; its output was discarded.";
-function createDaemonToolLoopState() {
+function createDaemonToolLoopState(repeatedToolFailureMode) {
   return {
     totalToolCalls: 0,
     invalidToolParamErrors: /* @__PURE__ */ new Map(),
     toolCallKeyCounts: /* @__PURE__ */ new Map(),
     maxToolCallKeyRepeat: 0,
-    loopDetected: false
+    loopDetected: false,
+    repeatedToolFailureMode,
+    repeatedToolFailureState: createRepeatedToolFailureGuardState()
   };
 }
 __name(createDaemonToolLoopState, "createDaemonToolLoopState");
-function recordDaemonLoopDetected(config, promptId, loopType, message, loopState) {
+function repeatedToolFailureCountBucket(count) {
+  if (count === 0) return "0";
+  if (count <= 2) return "1-2";
+  if (count <= 4) return "3-4";
+  if (count <= 7) return "5-7";
+  return "8+";
+}
+__name(repeatedToolFailureCountBucket, "repeatedToolFailureCountBucket");
+function repeatedToolFailureBatchBucket(count) {
+  if (count === 0) return "0";
+  if (count === 1) return "1";
+  if (count === 2) return "2";
+  return "3+";
+}
+__name(repeatedToolFailureBatchBucket, "repeatedToolFailureBatchBucket");
+function recordRepeatedToolFailureDecision(promptId, mode, previousState, decision, batch) {
+  if (mode === "off" || decision.kind === "none") {
+    return;
+  }
+  const countState = decision.kind === "reset" ? previousState : decision.state;
+  const telemetryDecision = decision.kind === "warn" ? "warned" : decision.kind === "stop" ? "stopped" : decision.kind;
+  const key = decision.kind === "reset" ? void 0 : decision.state.key;
+  const matchingToolTypes = new Set(
+    key ? batch.observations.filter(
+      (observation) => !observation.providerDuplicate && observation.policyToolName === key.policyToolName && observation.executionErrorType === key.executionErrorType
+    ).map((observation) => observation.toolType).filter((toolType2) => toolType2 !== void 0) : []
+  );
+  const toolType = matchingToolTypes.size === 1 ? [...matchingToolTypes][0] : void 0;
+  logRepeatedToolFailureGuard(
+    new RepeatedToolFailureGuardEvent({
+      prompt_id: promptId,
+      route: "acp_foreground",
+      mode,
+      phase_before: previousState.phase,
+      phase_after: decision.state.phase,
+      decision: telemetryDecision,
+      failure_count_bucket: repeatedToolFailureCountBucket(
+        countState.failureCount
+      ),
+      batch_count_bucket: repeatedToolFailureBatchBucket(countState.batchCount),
+      candidate_ordinal: countState.candidateOrdinal,
+      ...decision.kind === "reset" ? { reset_reason: decision.reason } : {
+        terminal_status: "error",
+        execution_status: "error",
+        execution_error_type: key?.executionErrorType,
+        tool_type: toolType
+      }
+    })
+  );
+}
+__name(recordRepeatedToolFailureDecision, "recordRepeatedToolFailureDecision");
+function recordDaemonLoopDetected(config, promptId, loopType, message, loopState, options = {}) {
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
-    debugLogger5.warn(message);
+    debugLogger6.warn(message);
     try {
-      logLoopDetected(config, new LoopDetectedEvent(loopType, promptId));
+      logLoopDetected(
+        config,
+        new LoopDetectedEvent(loopType, promptId),
+        options
+      );
     } catch (error) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         "[Session] Failed to record loop detection telemetry",
         error
       );
@@ -2490,7 +2894,7 @@ function isContentBlock(value) {
     case "resource":
       return isEmbeddedResourceResource(value["resource"]);
     default:
-      debugLogger5.warn(`Unknown ContentBlock type: ${value["type"]}`);
+      debugLogger6.warn(`Unknown ContentBlock type: ${value["type"]}`);
       return false;
   }
 }
@@ -2548,7 +2952,7 @@ function hasInlineMediaContentBlock(content) {
 __name(hasInlineMediaContentBlock, "hasInlineMediaContentBlock");
 function capMidTurnDrainItems(items, fieldName) {
   if (items.length <= MAX_MID_TURN_DRAIN_ITEMS) return items;
-  debugLogger5.warn(
+  debugLogger6.warn(
     `Mid-turn drain response had ${items.length} ${fieldName}; processing first ${MAX_MID_TURN_DRAIN_ITEMS}`
   );
   return items.slice(0, MAX_MID_TURN_DRAIN_ITEMS);
@@ -2563,7 +2967,7 @@ function getMidTurnItemDisplayTextForLog(displayText) {
 __name(getMidTurnItemDisplayTextForLog, "getMidTurnItemDisplayTextForLog");
 function getValidMidTurnContentBlocks(content, displayText) {
   if (!Array.isArray(content)) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Dropped invalid mid-turn item: ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -2573,7 +2977,7 @@ function getValidMidTurnContentBlocks(content, displayText) {
   const validBlocks = content.filter(isContentBlock);
   const invalidBlockCount = content.length - validBlocks.length;
   if (invalidBlockCount > 0) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Dropped ${invalidBlockCount} invalid mid-turn content block(s): ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -2619,7 +3023,7 @@ function parseMidTurnDrainResponse(response) {
     );
   }
   if (!Array.isArray(response["messages"])) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Mid-turn drain response had no recognized 'items' or 'messages' field; keys: ${Object.keys(
         response
       ).join(", ")}`
@@ -2704,7 +3108,7 @@ function parsePromptChannelDelivery(params) {
 __name(parsePromptChannelDelivery, "parsePromptChannelDelivery");
 var MAX_NOTIFICATION_QUEUE = 20;
 var MAX_DEFERRED_UNRELATED_CRON_QUEUE = 20;
-function resolveExistingFile(resolved, resolveRealPath2 = realpathSync, statFile = statSync) {
+function resolveExistingFile(resolved, resolveRealPath2 = realpathSync2, statFile = statSync2) {
   try {
     const canonicalPath = resolveRealPath2(resolved);
     const stats = statFile(canonicalPath);
@@ -2716,11 +3120,11 @@ function resolveExistingFile(resolved, resolveRealPath2 = realpathSync, statFile
 __name(resolveExistingFile, "resolveExistingFile");
 function resolveHomeLoopResolverRoots({
   homeQwenDir = Storage.getGlobalQwenDir(),
-  homeDir = os.homedir(),
+  homeDir = os2.homedir(),
   qwenHome = process.env["QWEN_HOME"]
 } = {}) {
   return {
-    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path2.dirname(homeQwenDir),
+    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path3.dirname(homeQwenDir),
     homeQwenDir
   };
 }
@@ -2759,7 +3163,7 @@ async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome,
         callId
       );
     } catch (hookError) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `PermissionDenied hook failed for tool ${callId}: ${hookError instanceof Error ? hookError.message : String(hookError)}`
       );
     }
@@ -2889,7 +3293,7 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
       }
     }
   } catch (error) {
-    debugLogger5.error("Error loading available skills:", error);
+    debugLogger6.error("Error loading available skills:", error);
   }
   for (const command of visibleSlashCommands) {
     if (command.kind !== "skill" /* SKILL */ || !command.skillDetail) {
@@ -2924,6 +3328,14 @@ var Session = class {
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
     const todoStopGuardEnabled = this.settings.merged.experimental?.todoStopGuard === true && !this.config.getBareMode() && !this.config.isSafeMode();
     this.todoStopGuard = new DaemonTodoStopGuard(todoStopGuardEnabled);
+    const configuredGuardMode = process.env[ENV_ACP_REPEATED_TOOL_FAILURE_GUARD];
+    const parsedGuardMode = parseRepeatedToolFailureGuardMode(configuredGuardMode);
+    this.repeatedToolFailureGuardMode = parsedGuardMode ?? "shadow";
+    if (configuredGuardMode?.trim() && parsedGuardMode === void 0) {
+      debugLogger6.warn(
+        `${ENV_ACP_REPEATED_TOOL_FAILURE_GUARD} has an invalid value; defaulting to shadow. Expected off, shadow, warn, or enforce.`
+      );
+    }
     this.todoStopGuardBackgroundBaseline = this.#captureTodoStopGuardBackgroundBaseline();
     this.toolCallEmitter = new ToolCallEmitter(this);
     this.planEmitter = new PlanEmitter(this);
@@ -3000,6 +3412,7 @@ var Session = class {
   // `#drainMidTurnUserMessages`.
   midTurnRecoveredMessages = [];
   todoStopGuard;
+  repeatedToolFailureGuardMode;
   todoStopGuardBackgroundBaseline;
   relatedAgentIds = /* @__PURE__ */ new Set();
   provisionalRelatedAgentCounts = /* @__PURE__ */ new Map();
@@ -3130,7 +3543,7 @@ var Session = class {
         resolved && outcome === "proceed_once" /* ProceedOnce */
       );
     } catch (error) {
-      debugLogger5.error("Workflow permission request failed:", error);
+      debugLogger6.error("Workflow permission request failed:", error);
       await registry.resolvePendingApproval(
         runId,
         approval.approvalId,
@@ -3157,7 +3570,7 @@ var Session = class {
         }
       });
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         "Failed to finalize workflow approval tool call:",
         error
       );
@@ -3326,7 +3739,7 @@ var Session = class {
       }
       return "unavailable";
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Todo Stop Guard continuation claim unavailable [session ${this.sessionId}]: ${this.#formatError(error)}`
       );
       return "unavailable";
@@ -3616,7 +4029,7 @@ var Session = class {
           }
         });
       } catch (error) {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Failed to emit persisted realtime transcript: ${this.#formatError(error)}`
         );
       }
@@ -3641,7 +4054,7 @@ var Session = class {
    */
   startCronScheduler() {
     this.#startCronSchedulerInRuntime().catch((error) => {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Cron scheduler startup failed [session ${this.sessionId}]: ${error}`
       );
     });
@@ -3728,8 +4141,8 @@ var Session = class {
     }
     this.closing = true;
     let resolveGate;
-    const completion = new Promise((resolve5) => {
-      resolveGate = resolve5;
+    const completion = new Promise((resolve6) => {
+      resolveGate = resolve6;
     });
     this.closeGateCompletion = completion;
     this.resolveCloseGate = resolveGate;
@@ -3769,7 +4182,7 @@ var Session = class {
       if (pending.length > 0) {
         await Promise.allSettled(pending);
       }
-      await new Promise((resolve5) => setImmediate(resolve5));
+      await new Promise((resolve6) => setImmediate(resolve6));
     }
   }
   #deferAutomaticQueueDrainUntilTurnsSettle() {
@@ -3843,7 +4256,7 @@ var Session = class {
   installRewriter() {
     const rewriteConfig = loadRewriteConfig(this.settings);
     if (rewriteConfig?.enabled) {
-      debugLogger5.info("Message rewrite middleware enabled");
+      debugLogger6.info("Message rewrite middleware enabled");
       this.messageRewriter = new MessageRewriteMiddleware(
         this.config,
         rewriteConfig,
@@ -3862,7 +4275,7 @@ var Session = class {
   installGoalTerminalObserver() {
     setGoalTerminalObserver(this.sessionId, (event) => {
       void this.messageEmitter.emitGoalTerminal(event).catch((error) => {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Failed to emit goal terminal update: ${this.#formatError(error)}`
         );
       });
@@ -3879,7 +4292,7 @@ var Session = class {
    */
   emitGoalStatus(status) {
     void this.messageEmitter.emitGoalStatus(status).catch((error) => {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Failed to emit goal status update: ${this.#formatError(error)}`
       );
     });
@@ -4152,8 +4565,8 @@ var Session = class {
     const channelDelivery = parsePromptChannelDelivery(params);
     const channelDeliveryCapture = channelDelivery ? { finalText: "" } : void 0;
     let resolveCompletion;
-    this.pendingPromptCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.pendingPromptCompletion = new Promise((resolve6) => {
+      resolveCompletion = resolve6;
     });
     try {
       const result = await this.#executePrompt(
@@ -4275,7 +4688,7 @@ var Session = class {
         const fullHistory = chat.getHistory(true);
         const lastEntry = fullHistory[fullHistory.length - 1];
         if (!lastEntry || lastEntry.role !== "model") {
-          debugLogger5.debug(
+          debugLogger6.debug(
             "Skipping followup suggestion: last history entry is not model"
           );
           return;
@@ -4311,9 +4724,9 @@ var Session = class {
         }
       } catch (error) {
         if (ac.signal.aborted) {
-          debugLogger5.debug("Follow-up suggestion generation aborted");
+          debugLogger6.debug("Follow-up suggestion generation aborted");
         } else {
-          debugLogger5.warn("Follow-up suggestion generation failed", error);
+          debugLogger6.warn("Follow-up suggestion generation failed", error);
         }
       } finally {
         if (this.followupAbort === ac) {
@@ -4389,7 +4802,7 @@ var Session = class {
                 apiHistory: this.#getCurrentChat().getHistory()
               });
               if (!recoveryPlan.continuation) {
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `[Session] continue ${promptId}: no interrupted turn on re-detection, nothing to continue`
                 );
                 logConversationFinishedEvent(
@@ -4507,10 +4920,10 @@ var Session = class {
                   this.config.getChatRecordingService()?.recordFileHistorySnapshot(latestSnapshot);
                 }
               } catch (e) {
-                debugLogger5.error(`FileHistory: recordSnapshot failed: ${e}`);
+                debugLogger6.error(`FileHistory: recordSnapshot failed: ${e}`);
               }
             } catch (e) {
-              debugLogger5.error(`FileHistory: makeSnapshot failed: ${e}`);
+              debugLogger6.error(`FileHistory: makeSnapshot failed: ${e}`);
             }
             const systemReminders = await this.#buildInitialSystemReminders();
             if (systemReminders.length > 0) {
@@ -4554,7 +4967,9 @@ ${this.pendingRecoveredAgentsNotice}
             }
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
-            const toolLoopState = createDaemonToolLoopState();
+            const toolLoopState = createDaemonToolLoopState(
+              promptMetadata?.[CHANNEL_PROMPT_META_KEY] === true ? "off" : this.repeatedToolFailureGuardMode
+            );
             try {
               while (nextMessage !== null) {
                 turnCount++;
@@ -4673,7 +5088,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const hooksEnabledForStopFailure = !this.config.getDisableAllHooks?.();
                   if (hooksEnabledForStopFailure && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
                     hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-                      debugLogger5.warn(`StopFailure hook failed: ${err}`);
+                      debugLogger6.warn(`StopFailure hook failed: ${err}`);
                     });
                   }
                   if (errorStatus === 429) {
@@ -4730,9 +5145,17 @@ ${this.pendingRecoveredAgentsNotice}
                     toolRun,
                     pendingSend.signal,
                     promptId,
+                    toolLoopState,
                     onFullTurnModel
                   );
                   nextMessage = nextAfterTools.message;
+                  if (nextAfterTools.stoppedByRepeatedToolFailure) {
+                    return {
+                      stopReason: getAbortAwareEndTurnStopReason(
+                        pendingSend.signal
+                      )
+                    };
+                  }
                   if (toolRun.loopDetected) {
                     this.todoStopGuard.suspend();
                     await this.#preserveStoppedToolRun(
@@ -4810,7 +5233,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
       if (this.todoStopGuard.needsStopInspection) {
         const drained = await this.#drainMidTurnInput(pendingSend.signal, {
-          watchQueuedPromptForTodoStopGuard: true,
+          watchQueuedPrompt: true,
           onFullTurnModel
         });
         if (drained.parts.length > 0) {
@@ -4894,7 +5317,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         if (this.todoStopGuard.needsStopInspection) {
           const drained = await this.#drainMidTurnInput(pendingSend.signal, {
-            watchQueuedPromptForTodoStopGuard: true,
+            watchQueuedPrompt: true,
             onFullTurnModel
           });
           if (drained.parts.length > 0) {
@@ -4981,7 +5404,7 @@ ${this.pendingRecoveredAgentsNotice}
         );
         this.todoStopGuard.suspend();
         await this.messageEmitter.emitAgentMessage(warning);
-        debugLogger5.warn(warning);
+        debugLogger6.warn(warning);
         return { stopReason: "end_turn" };
       }
       if (!externalReason && !guardContinuation) {
@@ -5035,7 +5458,7 @@ ${this.pendingRecoveredAgentsNotice}
   async #runStopContinuation(pendingSend, streamPromptId, toolPromptId, parts, skipCompression, options = {}) {
     let nextMessage = { role: "user", parts };
     let nextGuardContinuation = options.guardContinuation;
-    const toolLoopState = createDaemonToolLoopState();
+    const toolLoopState = createDaemonToolLoopState("off");
     let initialSend = true;
     let automaticContinuationValidated = false;
     let supersededAutomaticContinuation = false;
@@ -5101,7 +5524,7 @@ ${this.pendingRecoveredAgentsNotice}
               const drained = await this.#drainMidTurnInput(
                 pendingSend.signal,
                 {
-                  watchQueuedPromptForTodoStopGuard: true,
+                  watchQueuedPrompt: true,
                   onFullTurnModel: options.onFullTurnModel
                 }
               );
@@ -5410,7 +5833,7 @@ ${this.pendingRecoveredAgentsNotice}
         const hookSystem = this.config.getHookSystem?.();
         if (!this.config.getDisableAllHooks?.() && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
           hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-            debugLogger5.warn(`StopFailure hook failed: ${err}`);
+            debugLogger6.warn(`StopFailure hook failed: ${err}`);
           });
         }
         if (errorStatus === 429) {
@@ -5466,6 +5889,7 @@ ${this.pendingRecoveredAgentsNotice}
           toolRun,
           pendingSend.signal,
           toolPromptId,
+          toolLoopState,
           options.onFullTurnModel
         );
         nextMessage = nextAfterTools.message;
@@ -5542,7 +5966,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       });
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Failed to emit Todo Stop Guard status: ${this.#formatError(error)}`
       );
     }
@@ -5572,7 +5996,7 @@ ${this.pendingRecoveredAgentsNotice}
     const timer = setTimeout(() => {
       void this.client.extMethod(SERVE_CONTROL_EXT_METHODS.channelDelivery, params).catch((error) => {
         try {
-          debugLogger5.warn(
+          debugLogger6.warn(
             `Channel delivery submission failed: ${error instanceof Error ? error.message : String(error)}`
           );
         } catch {
@@ -5610,7 +6034,7 @@ ${this.pendingRecoveredAgentsNotice}
     return new MessageDisplayDispatcher(
       messageBus,
       signal,
-      (message) => debugLogger5.warn(message)
+      (message) => debugLogger6.warn(message)
     );
   }
   /**
@@ -5631,7 +6055,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Send aborted after pre-compression preparation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -5660,20 +6084,20 @@ ${this.pendingRecoveredAgentsNotice}
         }
       } catch (compressionError) {
         if (abortSignal.aborted) {
-          debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
+          debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
           return { responseStream: null, stopReason: "cancelled" };
         }
         if (this.#isAbortError(compressionError)) {
           throw compressionError;
         }
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Auto-compression failed for prompt ${promptId}; proceeding without compression: ` + this.#formatError(compressionError)
         );
         compressionFailed = true;
       }
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
+      debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
       return { responseStream: null, stopReason: "cancelled" };
     }
     if (!compressionInfo) {
@@ -5683,7 +6107,7 @@ ${this.pendingRecoveredAgentsNotice}
     if (sessionTokenLimit > 0) {
       const lastPromptTokenCount = this.#getPostCompressionTokenCount(compressionInfo);
       if (lastPromptTokenCount > sessionTokenLimit) {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Session token limit exceeded for prompt ${promptId}: ${lastPromptTokenCount} > ${sessionTokenLimit}. Send dropped.`
         );
         await this.#emitAgentDiagnosticMessageSafely(
@@ -5700,7 +6124,7 @@ ${this.pendingRecoveredAgentsNotice}
       );
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Send aborted after compression diagnostic for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -5713,7 +6137,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Send aborted after pre-send validation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -5741,7 +6165,7 @@ ${this.pendingRecoveredAgentsNotice}
     ) ?? [];
     const droppedParts = (message.parts?.length ?? 0) - functionResponseParts.length;
     if (droppedParts > 0) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Dropping ${droppedParts} non-functionResponse part(s) from unsent ACP message after send was skipped.`
       );
     }
@@ -5771,19 +6195,20 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
-  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, onFullTurnModel) {
+  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel) {
     if (toolRun.loopDetected) {
-      debugLogger5.debug("Stopping ACP turn after daemon loop detection.");
+      debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
     }
     if (toolRun.repeatedDuplicateProviderToolCall) {
       this.todoStopGuard.suspend();
-      debugLogger5.debug(
+      debugLogger6.debug(
         "Stopping ACP turn after dropping repeated duplicate provider tool-call response."
       );
       return { message: null, hadMidTurnUserInput: false };
     }
     const drained = await this.#drainMidTurnInput(abortSignal, {
+      watchQueuedPrompt: toolLoopState.repeatedToolFailureMode !== "off",
       onFullTurnModel
     });
     const hadMidTurnUserInput = drained.parts.length > 0;
@@ -5791,11 +6216,90 @@ ${this.pendingRecoveredAgentsNotice}
       this.todoStopGuard.acceptMidTurnUserInput();
     }
     const activeTodoReminder = this.config.takeActiveTodoReminder(promptId);
+    if (abortSignal.aborted) {
+      return {
+        message: {
+          role: "user",
+          parts: [
+            ...toolRun.parts,
+            ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+            ...drained.parts
+          ]
+        },
+        hadMidTurnUserInput
+      };
+    }
+    const previousRepeatedToolFailureState = toolLoopState.repeatedToolFailureState;
+    const repeatedToolFailureBatch = toolRun.repeatedToolFailureBatch ?? {
+      complete: false,
+      observations: []
+    };
+    const repeatedToolFailureDecision = reduceRepeatedToolFailureGuard(
+      previousRepeatedToolFailureState,
+      {
+        mode: toolLoopState.repeatedToolFailureMode,
+        batch: repeatedToolFailureBatch,
+        hasExternalInput: hadMidTurnUserInput,
+        hasQueuedPrompt: drained.hasQueuedPrompt,
+        inputReliable: drained.reliable
+      }
+    );
+    recordRepeatedToolFailureDecision(
+      promptId,
+      toolLoopState.repeatedToolFailureMode,
+      previousRepeatedToolFailureState,
+      repeatedToolFailureDecision,
+      repeatedToolFailureBatch
+    );
+    toolLoopState.repeatedToolFailureState = repeatedToolFailureDecision.state;
+    if (repeatedToolFailureDecision.kind !== "none") {
+      const { state } = repeatedToolFailureDecision;
+      debugLogger6.debug(
+        `[repeated-tool-failure-guard] mode=${toolLoopState.repeatedToolFailureMode} decision=${repeatedToolFailureDecision.kind} phase=${state.phase} candidate=${state.candidateOrdinal} failures=${state.failureCount} batches=${state.batchCount}`
+      );
+    }
     const parts = [
       ...toolRun.parts,
       ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+      ...repeatedToolFailureDecision.kind === "warn" ? [{ text: REPEATED_TOOL_FAILURE_REMINDER }] : [],
       ...drained.parts
     ];
+    if (repeatedToolFailureDecision.kind === "stop") {
+      this.todoStopGuard.suspend();
+      this.#preserveUnsentMessageHistory(
+        {
+          role: "user",
+          parts: [
+            ...parts,
+            { text: `System: ${REPEATED_TOOL_FAILURE_STOP_MESSAGE}` }
+          ]
+        },
+        true
+      );
+      await this.messageRewriter?.waitForPendingRewrites();
+      recordDaemonLoopDetected(
+        this.config,
+        promptId,
+        "repeated_tool_execution_failure" /* REPEATED_TOOL_EXECUTION_FAILURE */,
+        REPEATED_TOOL_FAILURE_STOP_MESSAGE,
+        toolLoopState,
+        { recordToQwenLogger: false }
+      );
+      try {
+        await this.messageEmitter.emitAgentMessage(
+          REPEATED_TOOL_FAILURE_STOP_MESSAGE
+        );
+      } catch (error) {
+        debugLogger6.warn(
+          `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
+        );
+      }
+      return {
+        message: null,
+        hadMidTurnUserInput,
+        stoppedByRepeatedToolFailure: true
+      };
+    }
     return {
       message: { role: "user", parts },
       hadMidTurnUserInput
@@ -5868,7 +6372,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.#emitAgentDiagnosticMessage(text);
     } catch (notifyError) {
-      debugLogger5.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
+      debugLogger6.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
     }
   }
   async #emitAgentDiagnosticMessage(text) {
@@ -5893,7 +6397,8 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       drainPromise = this.client.extMethod(MID_TURN_QUEUE_DRAIN_METHOD, {
         sessionId: this.sessionId,
-        ...options.watchQueuedPromptForTodoStopGuard ? { todoStopGuardWatchQueuedPrompt: true } : {}
+        // Keep the legacy wire name for ACP host compatibility.
+        ...options.watchQueuedPrompt ? { todoStopGuardWatchQueuedPrompt: true } : {}
       });
       let timeoutHandle;
       const timeoutPromise = new Promise((_, reject) => {
@@ -5911,7 +6416,7 @@ ${this.pendingRecoveredAgentsNotice}
       this.midTurnDrainTimeoutStrikes = 0;
       const reliable = isValidMidTurnDrainResponse(
         response,
-        options.watchQueuedPromptForTodoStopGuard === true
+        options.watchQueuedPrompt === true
       );
       return {
         parts: await this.#buildMidTurnParts(
@@ -5934,7 +6439,7 @@ ${this.pendingRecoveredAgentsNotice}
       if (isPermanentError) {
         this.midTurnDrainUnavailable = true;
       }
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Mid-turn queue drain ${isPermanentError ? "permanently " : ""}unavailable [session ${this.sessionId}]: ${errorMessage}`
       );
       return {
@@ -5964,9 +6469,9 @@ ${this.pendingRecoveredAgentsNotice}
     });
     const expired = Symbol("mid-turn-recovery-expired");
     let timer;
-    const deadline = new Promise((resolve5) => {
+    const deadline = new Promise((resolve6) => {
       timer = setTimeout(
-        () => resolve5(expired),
+        () => resolve6(expired),
         MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS
       );
       timer.unref?.();
@@ -5980,14 +6485,14 @@ ${this.pendingRecoveredAgentsNotice}
       clearTimeout(timer);
     }
     if (late === expired) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `[mid-turn] dropped a drain response that arrived after the ${MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS}ms recovery deadline [session ${this.sessionId}]`
       );
       return;
     }
     const lateMessages = parseMidTurnDrainResponse(late);
     if (lateMessages.length > 0) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[mid-turn] recovered ${lateMessages.length} message(s) from a timed-out drain [session ${this.sessionId}]`
       );
       this.midTurnRecoveredMessages.push(...lateMessages);
@@ -6018,7 +6523,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         if (!abortSignal.aborted) {
           const errorMessage = this.#formatError(messageError);
-          debugLogger5.warn(
+          debugLogger6.warn(
             `Failed to resolve mid-turn message: ${errorMessage}`
           );
         }
@@ -6046,7 +6551,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await scheduler.enableDurable(this.sessionId);
     } catch (err) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Durable cron init failed \u2014 persistent tasks will not fire in this session: ${err}`
       );
     }
@@ -6109,7 +6614,7 @@ ${this.pendingRecoveredAgentsNotice}
         unrelatedCount--;
       }
       if (evictedTaskIds.length > 0) {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Cron queue overflow while automatic work is deferred: evicted ${evictedTaskIds.length} unrelated task(s): ${evictedTaskIds.join(", ")}`
         );
       }
@@ -6132,7 +6637,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Cron turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -6143,8 +6648,8 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     this.cronProcessing = true;
     let resolveCompletion;
-    this.cronCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.cronCompletion = new Promise((resolve6) => {
+      resolveCompletion = resolve6;
     });
     try {
       while (this.cronQueue.length > 0) {
@@ -6249,7 +6754,7 @@ ${this.pendingRecoveredAgentsNotice}
                   loopTick = await resolver.resolve(loopMode, trustedAtResolve);
                 } catch (resolveErr) {
                   const code = resolveErr.code ?? "unknown";
-                  debugLogger5.warn(
+                  debugLogger6.warn(
                     `loop.md sentinel resolution failed (mode=${loopMode}, code=${code}) \u2014 check .qwen/loop.md permissions/IO`,
                     resolveErr
                   );
@@ -6272,7 +6777,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
               const modelText = loopTick ? loopTick.modelText : prompt;
               if (loopTick) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   `loop tick: mode=${loopMode ?? autonomousMode} delivery=${loopTick.full ? "full" : loopTick.transientError ? "transient-error" : loopTick.autonomous ? "autonomous-tick" : loopTick.sourceLabel ? "reminder" : "absent"} source=${loopTick.sourceLabel ?? "none"} autonomous=${loopTick.autonomous ?? false} transient=${loopTick.transientError ?? false}`
                 );
               }
@@ -6305,7 +6810,7 @@ ${this.pendingRecoveredAgentsNotice}
                   { text: modelText }
                 ]
               };
-              const toolLoopState = createDaemonToolLoopState();
+              const toolLoopState = createDaemonToolLoopState("off");
               while (nextMessage !== null) {
                 turnCount++;
                 if (ac.signal.aborted) {
@@ -6436,7 +6941,8 @@ ${this.pendingRecoveredAgentsNotice}
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
                     ac.signal,
-                    promptId
+                    promptId,
+                    toolLoopState
                   );
                   nextMessage = nextAfterTools.message;
                   if (toolRun.loopDetected) {
@@ -6470,7 +6976,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
               this.todoStopGuard.pauseForTrustedRetry();
               cronHadError = true;
-              debugLogger5.error("Error processing cron prompt:", error);
+              debugLogger6.error("Error processing cron prompt:", error);
               const msg = error instanceof Error ? error.message : String(error);
               await this.messageEmitter.emitAgentMessage(
                 `[${item.source} error] ${msg}`
@@ -6600,20 +7106,20 @@ ${this.pendingRecoveredAgentsNotice}
           (queued) => !this.#notificationContinuesTodoStopGuardWorkChain(queued)
         );
         if (evictedIndex < 0 && !incomingIsRelated) {
-          debugLogger5.warn(
+          debugLogger6.warn(
             `Notification queue overflow: dropping unrelated task=${item.taskId} kind=${item.kind} while automatic work is deferred`
           );
           return;
         }
         if (evictedIndex < 0) {
-          debugLogger5.warn(
+          debugLogger6.warn(
             `Notification queue overflow: dropping related task=${item.taskId} kind=${item.kind} because all queued items are related`
           );
           return;
         }
       }
       const [evicted] = this.notificationQueue.splice(evictedIndex, 1);
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Notification queue overflow: evicting task=${evicted?.taskId ?? "unknown"} kind=${evicted?.kind ?? "unknown"}`
       );
     }
@@ -6661,7 +7167,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       );
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Daemon notification persistence rejected [session ${this.sessionId}, task ${item.taskId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return false;
@@ -6689,7 +7195,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Notification turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -6700,8 +7206,8 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     this.notificationProcessing = true;
     let resolveCompletion;
-    this.notificationCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.notificationCompletion = new Promise((resolve6) => {
+      resolveCompletion = resolve6;
     });
     try {
       while (this.notificationQueue.length > 0) {
@@ -6786,7 +7292,7 @@ ${this.pendingRecoveredAgentsNotice}
               ...notificationParts
             ]
           };
-          const toolLoopState = createDaemonToolLoopState();
+          const toolLoopState = createDaemonToolLoopState("off");
           while (nextMessage !== null) {
             if (ac.signal.aborted) {
               this.todoStopGuard.suspend();
@@ -6915,7 +7421,8 @@ ${this.pendingRecoveredAgentsNotice}
               const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                 toolRun,
                 ac.signal,
-                promptId
+                promptId,
+                toolLoopState
               );
               nextMessage = nextAfterTools.message;
               if (toolRun.loopDetected) {
@@ -6951,14 +7458,14 @@ ${this.pendingRecoveredAgentsNotice}
             return;
           }
           this.todoStopGuard.pauseForTrustedRetry();
-          debugLogger5.error("Error processing background notification:", error);
+          debugLogger6.error("Error processing background notification:", error);
           const msg = error instanceof Error ? error.message : String(error);
           try {
             await this.messageEmitter.emitAgentMessage(
               `[notification error] ${msg}`
             );
           } catch (emitError) {
-            debugLogger5.error(
+            debugLogger6.error(
               "Failed to emit background notification error:",
               emitError
             );
@@ -7019,7 +7526,7 @@ ${this.pendingRecoveredAgentsNotice}
         source: "background_notification"
       });
     } catch (error) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Background notification end-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -7028,7 +7535,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.sendAvailableCommandsUpdateOrThrow();
     } catch (error) {
-      debugLogger5.error("Error sending available commands update:", error);
+      debugLogger6.error("Error sending available commands update:", error);
     }
   }
   async refreshSkillsFromSettings(options = {}) {
@@ -7050,7 +7557,7 @@ ${this.pendingRecoveredAgentsNotice}
         await skillManager.notifyConfigChanged();
       } catch (error) {
         if (!updateFailed) throw error;
-        debugLogger5.error(
+        debugLogger6.error(
           "SkillManager refresh failed after command update failure:",
           error
         );
@@ -7097,9 +7604,9 @@ ${this.pendingRecoveredAgentsNotice}
         () => void 0,
         () => void 0
       ),
-      new Promise((resolve5) => {
-        if (signal.aborted) return resolve5();
-        abortListener = /* @__PURE__ */ __name(() => resolve5(), "abortListener");
+      new Promise((resolve6) => {
+        if (signal.aborted) return resolve6();
+        abortListener = /* @__PURE__ */ __name(() => resolve6(), "abortListener");
         signal.addEventListener("abort", abortListener, { once: true });
       })
     ]).finally(() => {
@@ -7144,7 +7651,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.sessionId,
       currentModeId: params.modeId
     }).catch((error) => {
-      debugLogger5.debug("mode-update extNotification failed", error);
+      debugLogger6.debug("mode-update extNotification failed", error);
     });
   }
   /**
@@ -7200,7 +7707,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.sessionId,
       currentModelId: currentAcpModelId
     }).catch((error) => {
-      debugLogger5.debug("model-update extNotification failed", error);
+      debugLogger6.debug("model-update extNotification failed", error);
     });
     if (options.persistDefault ?? true) {
       const persistScope = getPersistScopeForModelSelection(this.settings);
@@ -7247,7 +7754,7 @@ ${this.pendingRecoveredAgentsNotice}
       await this.sendUpdate(update);
       legacyFrameSent = true;
     } catch (error) {
-      debugLogger5.debug("current_mode_update notification failed", error);
+      debugLogger6.debug("current_mode_update notification failed", error);
     }
     try {
       await this.client.extNotification("qwen/notify/session/mode-update", {
@@ -7257,7 +7764,7 @@ ${this.pendingRecoveredAgentsNotice}
         legacyFrameSent
       });
     } catch (error) {
-      debugLogger5.debug("mode-update extNotification failed", error);
+      debugLogger6.debug("mode-update extNotification failed", error);
     }
   }
   /**
@@ -7293,10 +7800,24 @@ ${this.pendingRecoveredAgentsNotice}
       });
     }, "queueToolResultRecord");
     const finalizeRunToolResult = /* @__PURE__ */ __name(async (result) => {
-      if (pendingToolResultRecords.length === 0) return result;
       const orderedRecords = [...pendingToolResultRecords].sort(
         (left, right) => left.ordinal - right.ordinal || left.sequence - right.sequence
       );
+      const repeatedToolFailureBatch = {
+        complete: orderedRecords.length === dedupedFunctionCalls.length && new Set(orderedRecords.map((record) => record.ordinal)).size === dedupedFunctionCalls.length,
+        observations: orderedRecords.map((record) => ({
+          callId: record.callId,
+          policyToolName: record.policyToolName,
+          toolType: record.toolType,
+          terminalStatus: record.metadata.status,
+          executionStatus: record.metadata.executionStatus,
+          executionErrorType: record.executionErrorType,
+          providerDuplicate: record.providerDuplicate
+        }))
+      };
+      if (orderedRecords.length === 0) {
+        return { ...result, repeatedToolFailureBatch };
+      }
       const finalized = await finalizeToolResponses(
         this.config,
         orderedRecords.map((record) => ({
@@ -7311,7 +7832,8 @@ ${this.pendingRecoveredAgentsNotice}
       });
       return {
         ...result,
-        parts: finalized.flatMap((entry) => entry.responseParts)
+        parts: finalized.flatMap((entry) => entry.responseParts),
+        repeatedToolFailureBatch
       };
     }, "finalizeRunToolResult");
     let skippedToolCallCounter = 0;
@@ -7350,7 +7872,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         await this.toolCallEmitter.emitError(callId, toolName, error);
       } catch (recordError) {
-        debugLogger5.error("Failed to record skipped tool call:", recordError);
+        debugLogger6.error("Failed to record skipped tool call:", recordError);
       }
       return part;
     }, "recordSkippedToolCall");
@@ -7366,7 +7888,7 @@ ${this.pendingRecoveredAgentsNotice}
     );
     if (repeatedDuplicateCall) {
       const providerCallId = getProviderToolCallId(repeatedDuplicateCall) ?? repeatedDuplicateCall.id;
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[Session.runToolCalls] Dropping batch after repeated duplicate provider tool-call id: ${providerCallId} (tool: ${repeatedDuplicateCall.name ?? "unknown_tool"})`
       );
       return await finalizeRunToolResult({
@@ -7382,7 +7904,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.duplicateProviderToolCallResponseIds
       );
       const response = createDuplicateProviderToolCallResponse(request);
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[Session.runToolCalls] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
       );
       batches.push({ kind: "duplicate", fc, request, response });
@@ -7426,7 +7948,7 @@ ${this.pendingRecoveredAgentsNotice}
           });
         }
       } catch (emitError) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           "[Session.runToolCalls] Failed to emit duplicate tool update",
           emitError
         );
@@ -7436,6 +7958,7 @@ ${this.pendingRecoveredAgentsNotice}
         toolName: request.name,
         responseParts: response.responseParts,
         persistedOutputFiles: response.persistedOutputFiles,
+        providerDuplicate: true,
         metadata: {
           callId: response.callId,
           status: "error",
@@ -7524,13 +8047,13 @@ ${this.pendingRecoveredAgentsNotice}
         memoryWriteCandidates,
         this.config.getProjectRoot()
       );
-      debugLogger5.debug(
+      debugLogger6.debug(
         `ACP session ${this.sessionId} checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
       );
       if (!matchedContextFileWrite) {
         return;
       }
-      debugLogger5.debug(
+      debugLogger6.debug(
         `ACP session ${this.sessionId} refreshing memory after context-file memory write`
       );
       await refreshMemoryInstruction(this.config, {
@@ -7589,7 +8112,7 @@ ${this.pendingRecoveredAgentsNotice}
           results[idx] = r;
           if (r.loopDetected && executing.size > 1 && !warnedWaitingForInFlight) {
             warnedWaitingForInFlight = true;
-            debugLogger5.warn(
+            debugLogger6.warn(
               `Loop detection stopped this ACP turn; waiting for ${executing.size - 1} in-flight tool call(s) to settle before returning.`
             );
           }
@@ -7792,6 +8315,7 @@ ${this.pendingRecoveredAgentsNotice}
     let terminalStatus;
     let toolType = "native";
     let mcpServerName = void 0;
+    const guardContext = {};
     if (toolLoopState?.loopDetected) {
       return {
         parts: [
@@ -7847,7 +8371,7 @@ ${this.pendingRecoveredAgentsNotice}
           mcp_server_name: mcpServerName
         });
       } catch (telemetryError) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           "[Session.runTool] Failed to record terminal tool telemetry",
           telemetryError
         );
@@ -7871,7 +8395,7 @@ ${this.pendingRecoveredAgentsNotice}
         try {
           await this.toolCallEmitter.emitError(callId, toolName2, error);
         } catch (emitError) {
-          debugLogger5.debug(
+          debugLogger6.debug(
             "[Session.runTool] Failed to emit terminal tool update",
             emitError
           );
@@ -7887,6 +8411,9 @@ ${this.pendingRecoveredAgentsNotice}
         callId,
         toolName: toolName2,
         responseParts: errorParts,
+        policyToolName: guardContext.policyToolName,
+        toolType,
+        executionErrorType: executionStatus === "error" ? executionErrorType ?? opts.errorType : void 0,
         metadata: {
           callId,
           status: opts.status,
@@ -7952,6 +8479,7 @@ ${this.pendingRecoveredAgentsNotice}
     toolType = tool instanceof DiscoveredMCPTool ? "mcp" : "native";
     mcpServerName = tool instanceof DiscoveredMCPTool ? tool.serverName : void 0;
     const policyToolName = tool.name;
+    guardContext.policyToolName = policyToolName;
     const originalPolicyRequestArgs = policyToolName === ToolNames.SHELL || policyToolName === ToolNames.MONITOR ? structuredClone(args) : args;
     const toolSpan = startToolSpan(
       policyToolName,
@@ -8149,7 +8677,7 @@ ${this.pendingRecoveredAgentsNotice}
             forceAutoReviewForAllow
           );
           if (finalPermission === "allow" && forceAutoReviewForAllow) {
-            debugLogger5.info(
+            debugLogger6.info(
               `Auto mode: L4 allow overridden by protected-write guard for ${policyToolName}`
             );
           }
@@ -8199,7 +8727,7 @@ ${this.pendingRecoveredAgentsNotice}
                 autoModeAllowed = true;
                 break;
               case "blocked":
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `Auto mode blocked (${outcome.reason}): tool=${policyToolName}, ` + formatDenialStateLog(denialState)
                 );
                 return earlyErrorResponse(
@@ -8215,7 +8743,7 @@ ${this.pendingRecoveredAgentsNotice}
                 wasAutoModeManualFallback = isDenialFallbackReason(outcome.reason) || outcome.reason === "classifier_unavailable";
                 autoModeFallbackMessage = outcome.message;
                 if (wasAutoModeManualFallback) {
-                  debugLogger5.warn(
+                  debugLogger6.warn(
                     `Auto mode fallback to manual approval (${outcome.reason}): ` + formatDenialStateLog(denialState)
                   );
                 }
@@ -8233,12 +8761,12 @@ ${this.pendingRecoveredAgentsNotice}
               const before = this.config.getAutoModeDenialState();
               const after = recordFallbackApprove(before);
               if (after === before) {
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `Auto mode denial counters already clear after fallback approval: ` + formatDenialStateLog(before)
                 );
                 return;
               }
-              debugLogger5.warn(
+              debugLogger6.warn(
                 `Auto mode denial counters reset after fallback approval: ${formatDenialStateLog(before)} -> ${formatDenialStateLog(after)}`
               );
               this.config.setAutoModeDenialState(after);
@@ -8514,7 +9042,7 @@ ${this.pendingRecoveredAgentsNotice}
                   offeredPermissionOptions
                 );
               } catch (error) {
-                debugLogger5.error(
+                debugLogger6.error(
                   `Permission request failed for tool ${toolName}:`,
                   error
                 );
@@ -8523,7 +9051,7 @@ ${this.pendingRecoveredAgentsNotice}
                     "cancel" /* Cancel */
                   );
                 } catch (confirmError) {
-                  debugLogger5.error(
+                  debugLogger6.error(
                     `Failed to cancel tool ${toolName} after permission request failure:`,
                     confirmError
                   );
@@ -8588,7 +9116,7 @@ ${this.pendingRecoveredAgentsNotice}
                 if (outcome !== "cancel" /* Cancel */) {
                   throw error;
                 }
-                debugLogger5.error(
+                debugLogger6.error(
                   `Failed to confirm cancellation for tool ${toolName}:`,
                   error
                 );
@@ -8655,7 +9183,7 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.toolCallEmitter.emitStart(startParams);
             } catch (emitError) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] Failed to emit tool start update",
                 emitError
               );
@@ -8685,7 +9213,7 @@ ${this.pendingRecoveredAgentsNotice}
                   `\u2717 **PreToolUse blocked**: ${toolName} - ${blockReason}`
                 );
               } catch (emitError) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   "[Session.runTool] Failed to emit PreToolUse block message",
                   emitError
                 );
@@ -8699,7 +9227,7 @@ ${this.pendingRecoveredAgentsNotice}
               });
             }
             if (preHookResult.additionalContext) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 `PreToolUse hook additional context for ${toolName}: ${preHookResult.additionalContext}`
               );
             }
@@ -8790,7 +9318,7 @@ ${this.pendingRecoveredAgentsNotice}
               status: "in_progress",
               _meta: { toolName, shellProgress: chunk }
             }).catch((err) => {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 `[Session.runTool] heartbeat update failed for ${callId}: ${err}`
               );
             });
@@ -8815,7 +9343,7 @@ ${this.pendingRecoveredAgentsNotice}
                 invocation.params
               );
             } catch {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] Failed to record tool arguments telemetry"
               );
             }
@@ -8923,7 +9451,7 @@ ${this.pendingRecoveredAgentsNotice}
             }
             if (postHookResult.shouldStop) {
               const stopMessage = postHookResult.stopReason || "Execution stopped by PostToolUse hook";
-              debugLogger5.info(
+              debugLogger6.info(
                 `PostToolUse hook requested stop for ${toolName}: ${stopMessage}`
               );
               this.todoStopGuard.suspend();
@@ -8958,7 +9486,7 @@ ${this.pendingRecoveredAgentsNotice}
                 callId
               );
               if (failureHookResult.additionalContext) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
                 );
               }
@@ -8969,7 +9497,7 @@ ${this.pendingRecoveredAgentsNotice}
                 artifacts: failureHookResult.artifacts
               });
             } catch (hookError) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] PostToolUseFailure hook failed",
                 hookError
               );
@@ -8988,7 +9516,7 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.messageEmitter.emitAgentMessage(visionBridgeNotice);
             } catch (emitError) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] Failed to emit vision bridge notice",
                 emitError
               );
@@ -9018,7 +9546,7 @@ ${this.pendingRecoveredAgentsNotice}
               try {
                 await this.planEmitter.emitPlan(plan, callId);
               } catch (emitError) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   "[Session.runTool] Failed to emit plan update",
                   emitError
                 );
@@ -9037,7 +9565,7 @@ ${this.pendingRecoveredAgentsNotice}
                 artifacts: toolResult.artifacts
               });
             } catch (emitError) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] Failed to emit terminal tool update",
                 emitError
               );
@@ -9064,7 +9592,7 @@ ${this.pendingRecoveredAgentsNotice}
               mcp_server_name: mcpServerName
             });
           } catch (telemetryError) {
-            debugLogger5.debug(
+            debugLogger6.debug(
               "[Session.runTool] Failed to record terminal tool telemetry",
               telemetryError
             );
@@ -9074,6 +9602,9 @@ ${this.pendingRecoveredAgentsNotice}
             toolName,
             responseParts,
             persistedOutputFiles: toolResult.persistedOutputFiles,
+            policyToolName,
+            toolType,
+            executionErrorType: executionStatus === "error" ? executionErrorType : void 0,
             metadata: {
               callId,
               status,
@@ -9092,7 +9623,7 @@ ${this.pendingRecoveredAgentsNotice}
               try {
                 addToolCallResultAttributes(this.config, toolSpan, result);
               } catch {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   "[Session.runTool] Failed to record tool result telemetry"
                 );
               }
@@ -9133,7 +9664,7 @@ ${this.pendingRecoveredAgentsNotice}
                 callId
               );
               if (failureHookResult.additionalContext) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
                 );
               }
@@ -9144,7 +9675,7 @@ ${this.pendingRecoveredAgentsNotice}
                 artifacts: failureHookResult.artifacts
               });
             } catch (hookError) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 "[Session.runTool] PostToolUseFailure hook failed",
                 hookError
               );
@@ -9305,8 +9836,8 @@ ${this.pendingRecoveredAgentsNotice}
           collectExtensionMentionRefs(part.text, extensionMentions);
           collectMcpServerMentionRefs(part.text, mcpServerMentions);
           for (const pathSpec of extractAtPathCommands(part.text)) {
-            if (!path2.isAbsolute(pathSpec)) continue;
-            const resolved = path2.resolve(
+            if (!path3.isAbsolute(pathSpec)) continue;
+            const resolved = path3.resolve(
               this.config.getProjectRoot(),
               pathSpec
             );
@@ -9375,7 +9906,7 @@ ${this.pendingRecoveredAgentsNotice}
       ...textPathSpecsToRead.entries(),
       ...atPathCommandParts.flatMap((part) => {
         const fileUri = part.fileData.fileUri;
-        const resolved = path2.resolve(this.config.getTargetDir(), fileUri);
+        const resolved = path3.resolve(this.config.getTargetDir(), fileUri);
         const canonicalPath = resolveExistingFile(resolved);
         return canonicalPath ? [[canonicalPath, fileUri]] : [];
       })
@@ -9388,7 +9919,7 @@ ${this.pendingRecoveredAgentsNotice}
         if (resolveExistingFile(textPath) !== textPath || !this.config.getWorkspaceContext().isPathWithinWorkspace(textPath) || textPathSpecsToRead.has(textPath) && !getSpecificMimeType(textPath)?.startsWith("image/") || this.config.getFileService().shouldIgnoreFile(displayPath, filteringOptions) || this.config.getFileService().shouldIgnoreFile(textPath, filteringOptions)) {
           continue;
         }
-        const stats = statSync(textPath);
+        const stats = statSync2(textPath);
         revalidatedTextPaths.push(textPath);
         displayPaths.set(textPath, displayPath);
         acceptedFileUris.add(displayPath);
@@ -9501,7 +10032,7 @@ ${contextPart.text}`
             formatFullTurnVisionNotice(fullTurnModel)
           );
         } catch (error) {
-          debugLogger5.debug(
+          debugLogger6.debug(
             `full-turn vision: failed to emit notice; continuing error=${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -9510,19 +10041,19 @@ ${contextPart.text}`
     }
     let bridgeResult;
     try {
-      debugLogger5.debug("vision bridge: gate matched, running conversion");
+      debugLogger6.debug("vision bridge: gate matched, running conversion");
       bridgeResult = await runVisionBridge({
         config: this.config,
         parts,
         signal: abortSignal
       });
     } catch (error) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `vision bridge: failed before replacement; falling back to text-only parts error=${String(error instanceof Error ? error.message : error)}`
       );
       return splitImageParts(parts).nonImageParts;
     }
-    debugLogger5.debug(
+    debugLogger6.debug(
       `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}${bridgeResult.error ? ` error=${bridgeResult.error}` : ""}`
     );
     if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
@@ -9531,13 +10062,13 @@ ${contextPart.text}`
           formatVisionBridgeNotice(bridgeResult)
         );
       } catch (error) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           `vision bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug("vision bridge: turn aborted after bridge returned");
+      debugLogger6.debug("vision bridge: turn aborted after bridge returned");
       return splitImageParts(parts).nonImageParts;
     }
     if (bridgeResult.applied && bridgeResult.parts != null) {
@@ -9551,7 +10082,7 @@ ${contextPart.text}`
     }
     const voiceModel = readVoiceModel(this.settings);
     if (!voiceModel) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         "voice bridge: no voice model configured; replacing audio with note"
       );
       return parts.map(
@@ -9570,14 +10101,14 @@ ${contextPart.text}`
       }
       const inlineData = part.inlineData;
       if (approxBase64Bytes(inlineData.data) > MAX_AUDIO_BYTES) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           "voice bridge: audio too large; replacing audio with note"
         );
         converted.push({ text: buildVoiceUnavailableBlock("audio too large") });
         continue;
       }
       try {
-        debugLogger5.debug(`voice bridge: transcribing audio via ${voiceModel}`);
+        debugLogger6.debug(`voice bridge: transcribing audio via ${voiceModel}`);
         const transcript = (await transcribeVoiceAudio(
           {
             data: new Uint8Array(Buffer2.from(inlineData.data, "base64")),
@@ -9594,7 +10125,7 @@ ${contextPart.text}`
           }
         )).trim();
         if (abortSignal.aborted) {
-          debugLogger5.debug("voice bridge: turn aborted after transcription");
+          debugLogger6.debug("voice bridge: turn aborted after transcription");
           return converted;
         }
         if (transcript.length > 0) {
@@ -9607,10 +10138,10 @@ ${contextPart.text}`
         });
       } catch (error) {
         if (abortSignal.aborted) {
-          debugLogger5.debug("voice bridge: transcription cancelled");
+          debugLogger6.debug("voice bridge: transcription cancelled");
           return converted;
         }
-        debugLogger5.debug(
+        debugLogger6.debug(
           `voice bridge: transcription failed; replacing audio with note error=${sanitizeVoiceErrorMessage(String(error instanceof Error ? error.message : error))}`
         );
         converted.push({
@@ -9624,7 +10155,7 @@ ${contextPart.text}`
           transcribedCount > 0 ? this.#formatVoiceBridgeNotice(voiceModel, transcribedCount) : this.#formatVoiceBridgeEgressNotice(voiceModel, egressCount)
         );
       } catch (error) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           `voice bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
@@ -9685,7 +10216,7 @@ ${contextPart.text}`
   }
   debug(msg) {
     if (this.config.getDebugMode()) {
-      debugLogger5.warn(msg);
+      debugLogger6.warn(msg);
     }
   }
   async emitHookArtifactsNotification(args) {
@@ -9725,7 +10256,7 @@ ${contextPart.text}`
         }
       );
     }).catch((err) => {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `ACP terminalSequence notification dropped (session=${this.sessionId}): ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -9734,7 +10265,7 @@ ${contextPart.text}`
 
 // packages/cli/src/acp-integration/active-work-reporter.ts
 init_esbuild_shims();
-var debugLogger6 = createDebugLogger("ACTIVE_WORK");
+var debugLogger7 = createDebugLogger("ACTIVE_WORK");
 var ActiveWorkReporter = class {
   constructor(send, listSources, intervalMs) {
     this.send = send;
@@ -9805,7 +10336,7 @@ var ActiveWorkReporter = class {
         });
       }
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `active-work snapshot collection failed; skipping this report: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -9934,15 +10465,34 @@ function runWithAcpRuntimeOutputDir(settings, cwd, fn) {
 }
 __name(runWithAcpRuntimeOutputDir, "runWithAcpRuntimeOutputDir");
 
+// packages/cli/src/acp-integration/errorCodes.ts
+init_esbuild_shims();
+var ACP_ERROR_CODES = {
+  // Parse error: invalid JSON received by server.
+  PARSE_ERROR: -32700,
+  // Invalid request: JSON is not a valid Request object.
+  INVALID_REQUEST: -32600,
+  // Method not found: method does not exist or is unavailable.
+  METHOD_NOT_FOUND: -32601,
+  // Invalid params: invalid method parameter(s).
+  INVALID_PARAMS: -32602,
+  // Internal error: implementation-defined server error.
+  INTERNAL_ERROR: -32603,
+  // Authentication required: must authenticate before operation.
+  AUTH_REQUIRED: -32e3,
+  // Resource not found: e.g. missing file.
+  RESOURCE_NOT_FOUND: -32002
+};
+
 // packages/cli/src/acp-integration/acpAgent.ts
-var debugLogger7 = createDebugLogger("ACP_AGENT");
+var debugLogger8 = createDebugLogger("ACP_AGENT");
 var QWEN_ACP_LOCAL_READ_ROOTS_ENV = "QWEN_ACP_LOCAL_READ_ROOTS";
 var POSIX_TMP_LOCAL_READ_ROOT = "/tmp";
 var BTW_CHILD_TIMEOUT_MS = 55e3;
 var MCP_OAUTH_START_TIMEOUT_MS = 3e4;
 var SESSION_DRAIN_TIMEOUT_MS = 3e4;
 var WORKSPACE_MEMORY_REMEMBER_CHILD_TIMEOUT_MS = 295e3;
-function createAcpSessionStartProfiler(span) {
+function createAcpSessionProfiler(span, attributePrefix) {
   let failedStage;
   const setAttribute = /* @__PURE__ */ __name((name, value) => {
     try {
@@ -9953,15 +10503,21 @@ function createAcpSessionStartProfiler(span) {
   const recordStage = /* @__PURE__ */ __name((stage, start) => {
     const durationMs = Math.round((performance.now() - start) * 100) / 100;
     if (Number.isFinite(durationMs) && durationMs >= 0) {
-      setAttribute(`qwen-code.daemon.session_start.${stage}_ms`, durationMs);
+      setAttribute(
+        `qwen-code.daemon.${attributePrefix}.${stage}_ms`,
+        durationMs
+      );
     }
   }, "recordStage");
   const recordFailure = /* @__PURE__ */ __name((stage) => {
     if (failedStage !== void 0) return;
     failedStage = stage;
-    setAttribute("qwen-code.daemon.session_start.failed_stage", stage);
+    setAttribute(`qwen-code.daemon.${attributePrefix}.failed_stage`, stage);
   }, "recordFailure");
   return {
+    fail(stage) {
+      recordFailure(stage);
+    },
     async time(stage, fn) {
       if (!span) return await fn();
       const start = performance.now();
@@ -9991,7 +10547,15 @@ function createAcpSessionStartProfiler(span) {
     }
   };
 }
+__name(createAcpSessionProfiler, "createAcpSessionProfiler");
+function createAcpSessionStartProfiler(span) {
+  return createAcpSessionProfiler(span, "session_start");
+}
 __name(createAcpSessionStartProfiler, "createAcpSessionStartProfiler");
+function createAcpSessionRestoreProfiler(span) {
+  return createAcpSessionProfiler(span, "session_restore");
+}
+__name(createAcpSessionRestoreProfiler, "createAcpSessionRestoreProfiler");
 function workspaceMemoryErrorData(code, diagnostics) {
   return {
     errorKind: code,
@@ -10070,10 +10634,10 @@ async function beginSessionCloseAfterCurrentGate(session, timeoutMs) {
   }
 }
 __name(beginSessionCloseAfterCurrentGate, "beginSessionCloseAfterCurrentGate");
-var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger7);
+var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger8);
 function parseAcpLocalReadRootsEnv(raw = process.env[QWEN_ACP_LOCAL_READ_ROOTS_ENV]) {
   if (!raw) return [];
-  return raw.split(path3.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path3.isAbsolute(entry));
+  return raw.split(path4.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path4.isAbsolute(entry));
 }
 __name(parseAcpLocalReadRootsEnv, "parseAcpLocalReadRootsEnv");
 function defaultAcpOnlyLocalReadRoots() {
@@ -10086,8 +10650,8 @@ function buildAcpLocalReadRoots(config) {
     // including auto-memory roots. The ACP-only additions below expand only
     // local read fallback, not read_file's default permission.
     config.storage.getProjectTempDir(),
-    path3.join(config.storage.getProjectDir(), "subagents"),
-    path3.join(config.getSessionRuntimeBaseDir(), "tmp"),
+    path4.join(config.storage.getProjectDir(), "subagents"),
+    path4.join(config.getSessionRuntimeBaseDir(), "tmp"),
     getAutoMemoryRoot(config.getTargetDir()),
     getUserAutoMemoryRoot(),
     ...config.storage.getUserSkillsDirs(),
@@ -10387,7 +10951,7 @@ function readRequiredString(value, fieldName) {
 }
 __name(readRequiredString, "readRequiredString");
 function validateSkillSlug(slug) {
-  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path3.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
+  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path4.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
 }
@@ -10856,7 +11420,7 @@ async function downloadGitHubSkillDirectoryFromApi(githubUrl, directoryPath, rel
     const name = readRequiredString(record["name"], "github.name");
     const itemPath = readRequiredString(record["path"], "github.path");
     const type = readRequiredString(record["type"], "github.type");
-    const relativePath = relativeRoot ? path3.posix.join(relativeRoot, name) : name;
+    const relativePath = relativeRoot ? path4.posix.join(relativeRoot, name) : name;
     if (type === "dir") {
       files.push(
         ...await downloadGitHubSkillDirectoryFromApi(
@@ -10903,7 +11467,7 @@ async function downloadGitHubSkillDirectory(githubUrl, directoryPath) {
     githubUrl,
     directoryPath
   ).catch((error) => {
-    debugLogger7.warn(
+    debugLogger8.warn(
       "GitHub API directory listing failed, falling back to archive download:",
       error
     );
@@ -10916,10 +11480,10 @@ __name(downloadGitHubSkillDirectory, "downloadGitHubSkillDirectory");
 async function downloadSkill(sourceUrl) {
   assertAllowedSkillSourceUrl(sourceUrl);
   const githubUrl = parseGitHubBlobSkillUrl(sourceUrl);
-  if (!githubUrl || path3.posix.basename(githubUrl.filePath) !== "SKILL.md") {
+  if (!githubUrl || path4.posix.basename(githubUrl.filePath) !== "SKILL.md") {
     return downloadSingleSkillFile(sourceUrl);
   }
-  const skillDirectory = path3.posix.dirname(githubUrl.filePath);
+  const skillDirectory = path4.posix.dirname(githubUrl.filePath);
   const files = await downloadGitHubSkillDirectory(githubUrl, skillDirectory);
   const skillFile = files.find((file) => file.relativePath === "SKILL.md");
   if (!skillFile) {
@@ -10935,9 +11499,9 @@ async function downloadSkill(sourceUrl) {
 }
 __name(downloadSkill, "downloadSkill");
 function resolveSkillInstallPath(skillDir, relativePath) {
-  const root = path3.resolve(skillDir);
-  const target = path3.resolve(skillDir, relativePath);
-  if (target !== root && !target.startsWith(root + path3.sep)) {
+  const root = path4.resolve(skillDir);
+  const target = path4.resolve(skillDir, relativePath);
+  if (target !== root && !target.startsWith(root + path4.sep)) {
     throw RequestError.invalidParams(
       void 0,
       `Invalid skill file path: ${relativePath}`
@@ -10947,9 +11511,9 @@ function resolveSkillInstallPath(skillDir, relativePath) {
 }
 __name(resolveSkillInstallPath, "resolveSkillInstallPath");
 function resolveManagedSkillDir(skillsBaseDir, slug) {
-  const root = path3.resolve(skillsBaseDir);
-  const skillDir = path3.resolve(skillsBaseDir, slug);
-  if (!skillDir.startsWith(root + path3.sep)) {
+  const root = path4.resolve(skillsBaseDir);
+  const skillDir = path4.resolve(skillsBaseDir, slug);
+  if (!skillDir.startsWith(root + path4.sep)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
   return skillDir;
@@ -11469,7 +12033,7 @@ function readMcpServers(source, scope) {
       const server = toMcpServerConfig(value);
       return server ? { name, scope, server: redactMcpServerSecrets(server) } : void 0;
     } catch (error) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         `Skipping malformed MCP server config [${scope}:${name}]:`,
         error
       );
@@ -11565,7 +12129,7 @@ function readHooks(source, scope, extensionName) {
           extensionName
         });
       } catch (error) {
-        debugLogger7.warn(
+        debugLogger8.warn(
           `Skipping malformed hook entry [${scope}:${event}:${index}]:`,
           error
         );
@@ -11590,14 +12154,14 @@ function readScopeSettings(settings, scope) {
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
   for (const filename of getAllGeminiMdFilenames()) {
-    const filePath = path3.join(dir, filename);
+    const filePath = path4.join(dir, filename);
     try {
-      await fs.access(filePath);
+      await fs2.access(filePath);
       return filePath;
     } catch {
     }
   }
-  return path3.join(dir, fallbackFilename);
+  return path4.join(dir, fallbackFilename);
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
@@ -11867,7 +12431,7 @@ async function runAcpAgent(config, settings, argv, options) {
             void preloadContentGenerator(
               session.getConfig().getContentGenerator()
             ).catch((error) => {
-              debugLogger7.debug(
+              debugLogger8.debug(
                 `[ACP] Session provider preload failed for ${sessionId}: ${error instanceof Error ? error.message : String(error)}`
               );
             });
@@ -11908,7 +12472,7 @@ async function runAcpAgent(config, settings, argv, options) {
     try {
       await agentInstance.shutdownMcpPool(8e3);
     } catch (err) {
-      debugLogger7.error(`[ACP] MCP pool drain (${label}) error:`, err);
+      debugLogger8.error(`[ACP] MCP pool drain (${label}) error:`, err);
       if (strict) throw err;
     }
   }, "drainPoolBeforeExit");
@@ -11941,7 +12505,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await hookSystem.fireSessionEndEvent(reason);
       } catch (err) {
         if (managedConfigs) failures.push(err);
-        debugLogger7.warn(
+        debugLogger8.warn(
           `SessionEnd hook failed: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -11965,13 +12529,13 @@ async function runAcpAgent(config, settings, argv, options) {
         await terminal.writerShutdown;
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Managed writer shutdown error:", error);
+        debugLogger8.error("[ACP] Managed writer shutdown error:", error);
         const retainedLockPaths = terminal.configs.flatMap((config2) => {
           if (typeof config2.getSessionRuntimeBaseDir !== "function" || typeof config2.getSessionId !== "function") {
             return [];
           }
           return [
-            path3.join(
+            path4.join(
               config2.getSessionRuntimeBaseDir(),
               "tmp",
               "session-writer-locks",
@@ -11992,7 +12556,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await agent.finishManagedShutdown(terminal.configs);
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Managed resource shutdown error:", error);
+        debugLogger8.error("[ACP] Managed resource shutdown error:", error);
       }
       try {
         await drainPoolBeforeExit(label, true);
@@ -12003,7 +12567,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await runExitCleanup();
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Cleanup error:", error);
+        debugLogger8.error("[ACP] Cleanup error:", error);
       }
       if (failures.length > 0) {
         throw new AggregateError(failures, "Managed ACP shutdown failed");
@@ -12014,14 +12578,14 @@ async function runAcpAgent(config, settings, argv, options) {
   const shutdownHandler = /* @__PURE__ */ __name(async () => {
     if (shuttingDown) return;
     shuttingDown = true;
-    debugLogger7.debug("[ACP] Shutdown signal received, closing streams");
+    debugLogger8.debug("[ACP] Shutdown signal received, closing streams");
     if (agentInstance?.isTrustedManagedParent()) {
       let exitCode = 0;
       try {
         await shutdownManagedAgent("other" /* Other */, "signal");
       } catch (err) {
         exitCode = 1;
-        debugLogger7.error("[ACP] Managed shutdown error:", err);
+        debugLogger8.error("[ACP] Managed shutdown error:", err);
       } finally {
         eventLoopMonitor.dispose();
       }
@@ -12046,12 +12610,12 @@ async function runAcpAgent(config, settings, argv, options) {
       }
       await drainPoolBeforeExit("signal");
     } catch (err) {
-      debugLogger7.error("[ACP] Shutdown error:", err);
+      debugLogger8.error("[ACP] Shutdown error:", err);
     } finally {
       eventLoopMonitor.dispose();
     }
     runExitCleanup().catch((err) => {
-      debugLogger7.error("[ACP] Cleanup error:", err);
+      debugLogger8.error("[ACP] Cleanup error:", err);
     }).finally(() => {
       process.exit(0);
     });
@@ -12238,6 +12802,7 @@ var QwenAgent = class {
     __name(this, "QwenAgent");
   }
   sessions = /* @__PURE__ */ new Map();
+  startingSessionIds = /* @__PURE__ */ new Set();
   activePromptCalls = /* @__PURE__ */ new Map();
   workspaceMcpDiscoveryConfig;
   workspaceMcpDiscoveryPromise;
@@ -12260,7 +12825,7 @@ var QwenAgent = class {
   // cadence, so successive calls form a clean delta window independent of tool
   // activity. Init is guarded — `process.cpuUsage()` can throw in restricted
   // containers.
-  childCpuCoreCount = os2.availableParallelism?.() ?? os2.cpus().length ?? 1;
+  childCpuCoreCount = os3.availableParallelism?.() ?? os3.cpus().length ?? 1;
   prevChildCpu = (() => {
     try {
       return process.cpuUsage();
@@ -12326,12 +12891,12 @@ var QwenAgent = class {
       try {
         session.beginCloseIfAvailable();
       } catch (error) {
-        debugLogger7.debug(
+        debugLogger8.debug(
           `Session ${session.getId()} admission close during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       }
       void session.cancelPendingPrompt().catch((error) => {
-        debugLogger7.debug(
+        debugLogger8.debug(
           `Session ${session.getId()} cancel during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       });
@@ -12479,7 +13044,7 @@ var QwenAgent = class {
       await run();
     }).catch((err) => {
       this.workspaceMcpDiscoveryError = err instanceof Error ? err.message : String(err);
-      debugLogger7.error(
+      debugLogger8.error(
         `Workspace MCP ${label} failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }).finally(() => {
@@ -12666,7 +13231,7 @@ var QwenAgent = class {
     try {
       const result = await this.mcpPool.drainAll({ force: true, timeoutMs });
       if (result.forced > 0 || result.errors.length > 0) {
-        debugLogger7.warn(
+        debugLogger8.warn(
           `MCP pool drain: ${result.drained} clean, ${result.forced} timed out, ${result.errors.length} errors`
         );
         throw new Error(
@@ -12674,7 +13239,7 @@ var QwenAgent = class {
         );
       }
     } catch (err) {
-      debugLogger7.error(
+      debugLogger8.error(
         `MCP pool drainAll failed: ${err instanceof Error ? err.message : String(err)}`
       );
       throw err;
@@ -12712,7 +13277,7 @@ var QwenAgent = class {
     this.sessions.delete(sessionId);
     this.activeWorkReporter?.notifyChanged();
     if (cleanupErrors.length > 0) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         `Session ${sessionId} closed after ${cleanupErrors.length} cleanup failure(s): ${cleanupErrors.map(
           (error) => error instanceof Error ? error.message : String(error)
         ).join("; ")}`
@@ -12766,21 +13331,21 @@ var QwenAgent = class {
     try {
       await cleanup();
     } catch (cleanupError) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         `Session cleanup failed while preserving the original request error: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`
       );
     }
     throw mapSessionWriterRequestError(error);
   }
   pendingConfigCleanupKey(runtimeBaseDir, sessionId) {
-    return `${path3.resolve(runtimeBaseDir)}\0${sessionId}`;
+    return `${path4.resolve(runtimeBaseDir)}\0${sessionId}`;
   }
   async retryPendingConfigCleanup(runtimeBaseDir, requiredSessionId) {
-    const resolvedRuntimeBaseDir = path3.resolve(runtimeBaseDir);
+    const resolvedRuntimeBaseDir = path4.resolve(runtimeBaseDir);
     const configs = /* @__PURE__ */ new Set();
     for (const pending of this.pendingConfigCleanup.values()) {
       for (const config of pending) {
-        if (path3.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
+        if (path4.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
           configs.add(config);
         }
       }
@@ -12790,7 +13355,7 @@ var QwenAgent = class {
         await this.cleanupUnstoredConfig(config);
       } catch (error) {
         if (config.getSessionId() === requiredSessionId) throw error;
-        debugLogger7.warn(
+        debugLogger8.warn(
           `Deferred Config cleanup retry failed for session ${config.getSessionId()}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -12828,7 +13393,7 @@ var QwenAgent = class {
           try {
             await session.cancelPendingPrompt();
           } catch (err) {
-            debugLogger7.debug(
+            debugLogger8.debug(
               `Session ${sessionId} cancel during close failed: ${err instanceof Error ? err.message : String(err)}`
             );
           }
@@ -12901,7 +13466,7 @@ var QwenAgent = class {
     return runWithAcpRuntimeOutputDir(settings, cwd, operation);
   }
   async assertLiveSessionScope(config, settings, cwd) {
-    if (path3.resolve(config.storage.getProjectRoot()) !== path3.resolve(cwd)) {
+    if (path4.resolve(config.storage.getProjectRoot()) !== path4.resolve(cwd)) {
       throw RequestError.invalidParams(
         void 0,
         "The live session belongs to another workspace."
@@ -12912,7 +13477,7 @@ var QwenAgent = class {
       cwd,
       () => Storage.getRuntimeBaseDir()
     );
-    if (path3.resolve(config.getSessionRuntimeBaseDir()) !== path3.resolve(requestedRuntimeBaseDir)) {
+    if (path4.resolve(config.getSessionRuntimeBaseDir()) !== path4.resolve(requestedRuntimeBaseDir)) {
       throw mapSessionWriterRequestError(new SessionWriterUnavailableError());
     }
   }
@@ -12935,7 +13500,7 @@ var QwenAgent = class {
         scope: "workspace",
         ...event
       }).catch((err) => {
-        debugLogger7.debug(
+        debugLogger8.debug(
           `MCP workspace budget event delivery to session ${sid} failed (kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -12970,7 +13535,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.8";
+    const version = "0.21.9";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -13063,312 +13628,452 @@ var QwenAgent = class {
       }
     }
   }
+  reserveStartingSessionId(sessionId) {
+    if (this.sessions.has(sessionId) || this.startingSessionIds.has(sessionId)) {
+      throw new RequestError(
+        ACP_ERROR_CODES.INVALID_PARAMS,
+        `Session ${sessionId} is already active or starting.`,
+        { errorKind: "session_id_conflict", sessionId }
+      );
+    }
+    this.startingSessionIds.add(sessionId);
+    let released = false;
+    return () => {
+      if (released) return;
+      released = true;
+      this.startingSessionIds.delete(sessionId);
+    };
+  }
   async newSession(params) {
     const { cwd, mcpServers } = params;
-    const requestedSessionId = typeof params._meta?.[REQUESTED_SESSION_ID_META_KEY] === "string" ? params._meta[REQUESTED_SESSION_ID_META_KEY] : void 0;
-    const sessionSource = getSessionSource(params);
-    const parentContext = extractDaemonTraceContext(params);
-    return await withDaemonSpan(
-      "qwen-code.daemon.session_start",
-      { "qwen-code.daemon.operation": "acp_session_new" },
-      async (span) => {
-        const profiler = createAcpSessionStartProfiler(span);
-        const settings = profiler.timeSync(
-          "settings_load",
-          () => loadSettingsCached(cwd)
-        );
-        this.settings = settings;
-        const config = await profiler.time(
-          "config_setup",
-          () => this.newSessionConfig(
-            cwd,
-            mcpServers,
-            settings,
-            sessionSource,
-            requestedSessionId,
-            void 0,
-            shouldDeferMcpDiscovery(params) ? { skipMcpDiscovery: true } : void 0
-          )
-        );
-        let session;
-        try {
-          await profiler.time("auth", () => this.ensureAuthenticated(config));
-          profiler.timeSync(
-            "file_system_setup",
-            () => this.setupFileSystem(config)
+    const parsedSessionId = parseCallerSuppliedSessionId(
+      params._meta?.[REQUESTED_SESSION_ID_META_KEY]
+    );
+    if (parsedSessionId.kind === "invalid") {
+      throw new RequestError(
+        ACP_ERROR_CODES.INVALID_PARAMS,
+        `\`_meta["${REQUESTED_SESSION_ID_META_KEY}"]\` must be an RFC UUID v1-v5`,
+        { errorKind: "invalid_session_id", httpStatus: 400 }
+      );
+    }
+    const requestedSessionId = parsedSessionId.kind === "valid" ? parsedSessionId.sessionId : void 0;
+    const releaseStartingSessionId = requestedSessionId ? this.reserveStartingSessionId(requestedSessionId) : void 0;
+    try {
+      const sessionSource = getSessionSource(params);
+      const parentContext = extractDaemonTraceContext(params);
+      return await withDaemonSpan(
+        "qwen-code.daemon.session_start",
+        { "qwen-code.daemon.operation": "acp_session_new" },
+        async (span) => {
+          const profiler = createAcpSessionStartProfiler(span);
+          const settings = profiler.timeSync(
+            "settings_load",
+            () => loadSettingsCached(cwd)
           );
-          session = await profiler.time(
-            "session_register",
-            () => this.createAndStoreSession(config, settings)
+          this.settings = settings;
+          const config = await profiler.time(
+            "config_setup",
+            () => this.newSessionConfig(
+              cwd,
+              mcpServers,
+              settings,
+              sessionSource,
+              requestedSessionId,
+              void 0,
+              shouldDeferMcpDiscovery(params) ? { skipMcpDiscovery: true } : void 0
+            )
           );
-        } catch (error) {
-          return this.cleanupAfterRequestFailure(error, async () => {
-            if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
-              await this.cleanupUnstoredConfig(config);
-            }
-          });
-        }
-        profiler.setSessionId(session.getId());
-        return profiler.timeSync("response_build", () => ({
-          sessionId: session.getId(),
-          models: this.buildAvailableModels(config),
-          modes: this.buildModesData(config),
-          configOptions: this.buildConfigOptions(config)
-        }));
+          let session;
+          try {
+            await profiler.time("auth", () => this.ensureAuthenticated(config));
+            profiler.timeSync(
+              "file_system_setup",
+              () => this.setupFileSystem(config)
+            );
+            session = await profiler.time(
+              "session_register",
+              () => this.createAndStoreSession(config, settings)
+            );
+          } catch (error) {
+            return this.cleanupAfterRequestFailure(error, async () => {
+              if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
+                await this.cleanupUnstoredConfig(config);
+              }
+            });
+          }
+          profiler.setSessionId(session.getId());
+          return profiler.timeSync("response_build", () => ({
+            sessionId: session.getId(),
+            models: this.buildAvailableModels(config),
+            modes: this.buildModesData(config),
+            configOptions: this.buildConfigOptions(config)
+          }));
+        },
+        parentContext ? { parentContext } : {}
+      );
+    } finally {
+      releaseStartingSessionId?.();
+    }
+  }
+  async loadSession(params) {
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const parentContext = extractDaemonTraceContext(params);
+    return await withDaemonSpan(
+      "qwen-code.daemon.session_restore",
+      {
+        "qwen-code.daemon.operation": "acp_session_load",
+        "qwen-code.daemon.session_restore.action": "load",
+        "session.id": sessionId
       },
+      async (span) => this.loadSessionWithProfiler(
+        params,
+        sessionId,
+        createAcpSessionRestoreProfiler(span)
+      ),
       parentContext ? { parentContext } : {}
     );
   }
-  async loadSession(params) {
+  async loadSessionWithProfiler(params, initialSessionId, profiler) {
+    let sessionId = initialSessionId;
     const sessionSource = getSessionSource(params);
-    const settings = loadSettingsCached(params.cwd);
-    const liveSession = this.sessions.get(params.sessionId);
+    const liveSession = this.sessions.get(sessionId);
     if (liveSession) {
+      const settings = profiler.timeSync(
+        "settings_load",
+        () => loadSettingsCached(params.cwd)
+      );
       const liveConfig = liveSession.getConfig();
-      await this.assertLiveSessionScope(liveConfig, settings, params.cwd);
-      return this.withLiveSessionRestore(
-        params.sessionId,
-        liveSession,
-        async (config2, sessionData2) => {
-          const response2 = {
-            modes: this.buildModesData(config2),
-            models: this.buildAvailableModels(config2),
-            configOptions: this.buildConfigOptions(config2),
-            ...sessionData2.artifactSnapshot ? { artifactSnapshot: sessionData2.artifactSnapshot } : {}
-          };
-          const records = sessionData2.conversation.messages;
-          const visibleRecords = selectVisibleHistoryRecords(
-            records,
-            shouldHideInheritedHistory(params)
-          );
-          if (visibleRecords.length === 0) return response2;
-          const bulkReplay2 = isBulkLoadReplayRequest(params);
-          const replayPage = bulkReplay2 ? selectRecentHistoryRecords(
-            visibleRecords,
-            getLoadReplayPageSize(params)
-          ) : { records: visibleRecords, hasMore: false };
-          const replay = await collectHistoryReplayUpdates({
-            sessionId: params.sessionId,
-            config: config2,
-            records: replayPage.records,
-            gaps: sessionData2.historyGaps,
-            cumulativeUsage: createReplayCumulativeUsage(),
-            logger: debugLogger7
-          });
-          if (!bulkReplay2) {
-            try {
-              for (const update of replay.updates) {
-                await liveSession.sendUpdate(update);
+      return profiler.time("live_restore", async () => {
+        await this.assertLiveSessionScope(liveConfig, settings, params.cwd);
+        return this.withLiveSessionRestore(
+          sessionId,
+          liveSession,
+          async (config, sessionData) => {
+            const response = profiler.timeSync(
+              "response_build",
+              () => ({
+                modes: this.buildModesData(config),
+                models: this.buildAvailableModels(config),
+                configOptions: this.buildConfigOptions(config),
+                ...sessionData.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+              })
+            );
+            const records = sessionData.conversation.messages;
+            const visibleRecords = selectVisibleHistoryRecords(
+              records,
+              shouldHideInheritedHistory(params)
+            );
+            if (visibleRecords.length === 0) return response;
+            const bulkReplay = isBulkLoadReplayRequest(params);
+            const replayPage = bulkReplay ? selectRecentHistoryRecords(
+              visibleRecords,
+              getLoadReplayPageSize(params)
+            ) : { records: visibleRecords, hasMore: false };
+            const replay = await collectHistoryReplayUpdates({
+              sessionId,
+              config,
+              records: replayPage.records,
+              gaps: sessionData.historyGaps,
+              cumulativeUsage: createReplayCumulativeUsage(),
+              logger: debugLogger8
+            });
+            if (!bulkReplay) {
+              try {
+                for (const update of replay.updates) {
+                  await liveSession.sendUpdate(update);
+                }
+              } finally {
+                liveSession.clearActiveTodoPlanRevision();
               }
-            } finally {
-              liveSession.clearActiveTodoPlanRevision();
-            }
-            if (replay.replayError !== void 0) {
-              throw RequestError.internalError(void 0, replay.replayError);
-            }
-            return response2;
-          }
-          return {
-            ...response2,
-            _meta: {
-              [LOAD_REPLAY_META_KEY]: {
-                v: LOAD_REPLAY_VERSION,
-                updates: replay.updates,
-                ...replay.replayError !== void 0 ? { partial: true, replayError: replay.replayError } : {},
-                ...replayPage.hasMore ? { hasMore: true } : {}
+              if (replay.replayError !== void 0) {
+                throw RequestError.internalError(void 0, replay.replayError);
               }
+              return response;
             }
-          };
-        }
-      );
-    }
-    const exists = await this.runWithPinnedRuntimeBaseDir(
-      settings,
-      params.cwd,
-      async () => {
-        const sessionService = new SessionService(params.cwd);
-        return sessionService.sessionExists(params.sessionId);
-      }
-    );
-    if (!exists) {
-      throw RequestError.resourceNotFound(`session:${params.sessionId}`);
-    }
-    this.settings = settings;
-    const config = await this.newSessionConfig(
-      params.cwd,
-      // `LoadSessionRequest.mcpServers` is required in today's ACP
-      // schema, but mirror `unstable_resumeSession` and tolerate a
-      // future loosening — `newSessionConfig` iterates the list, so
-      // a `null`/`undefined` would otherwise throw `TypeError`.
-      params.mcpServers ?? [],
-      settings,
-      sessionSource,
-      params.sessionId,
-      true
-    );
-    const sessionData = config.getResumedSessionData();
-    const bulkReplay = isBulkLoadReplayRequest(params);
-    const replayPageSize = bulkReplay ? getLoadReplayPageSize(params) : void 0;
-    let replayEnvelope;
-    try {
-      await this.ensureAuthenticated(config);
-      this.setupFileSystem(config);
-      await this.createAndStoreSession(config, settings, sessionData, {
-        enableLiveScreenContext: isCompatibleLiveSessionSource(
-          sessionSource ?? {}
-        ),
-        ...bulkReplay ? { replayHistory: false } : {},
-        beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
-          if (bulkReplay) {
-            const records = sessionData?.conversation.messages;
-            let replayUpdates = [];
-            if (records) {
-              createdSession.primeTurnFromHistory(records);
-              const visibleRecords = selectVisibleHistoryRecords(
-                records,
-                shouldHideInheritedHistory(params)
-              );
-              const replayPage = selectRecentHistoryRecords(
-                visibleRecords,
-                replayPageSize
-              );
-              const replayUsage = createReplayCumulativeUsage();
-              const replay = await collectHistoryReplayUpdates({
-                sessionId: params.sessionId,
-                config,
-                records: replayPage.records,
-                gaps: sessionData?.historyGaps,
-                cumulativeUsage: replayUsage,
-                supersedeUnrestorableGoal: true,
-                logger: debugLogger7
-              });
-              replayUpdates = replay.updates;
-              copyCumulativeUsage(createdSession.cumulativeUsage, replayUsage);
-              if (replay.replayError !== void 0) {
-                replayEnvelope = {
+            return {
+              ...response,
+              _meta: {
+                [LOAD_REPLAY_META_KEY]: {
                   v: LOAD_REPLAY_VERSION,
-                  updates: replayUpdates,
-                  partial: true,
-                  replayError: replay.replayError,
+                  updates: replay.updates,
+                  ...replay.replayError !== void 0 ? {
+                    partial: true,
+                    replayError: replay.replayError
+                  } : {},
                   ...replayPage.hasMore ? { hasMore: true } : {}
-                };
+                }
               }
-              replayEnvelope ??= {
-                v: LOAD_REPLAY_VERSION,
-                updates: replayUpdates,
-                ...replayPage.hasMore ? { hasMore: true } : {}
-              };
-            }
-            replayEnvelope ??= {
-              v: LOAD_REPLAY_VERSION,
-              updates: replayUpdates
             };
           }
-          await this.#restoreWorktreeOnResume(config, createdSession);
-          await this.#restoreBackgroundAgentsOnResume(config, createdSession);
-          this.#restoreGoalOnResume(config, createdSession);
-        }, "beforeStartPostReplayServices")
-      });
-    } catch (error) {
-      return this.cleanupAfterRequestFailure(error, async () => {
-        if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
-          await this.cleanupUnstoredConfig(config);
-        }
+        );
       });
     }
-    const modesData = this.buildModesData(config);
-    const availableModels = this.buildAvailableModels(config);
-    const configOptions = this.buildConfigOptions(config);
-    const response = {
-      modes: modesData,
-      models: availableModels,
-      configOptions,
-      ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
-    };
-    if (!replayEnvelope) {
-      return response;
-    }
-    return {
-      ...response,
-      _meta: {
-        [LOAD_REPLAY_META_KEY]: replayEnvelope
+    const releaseStartingSessionId = this.reserveStartingSessionId(sessionId);
+    try {
+      const settings = profiler.timeSync(
+        "settings_load",
+        () => loadSettingsCached(params.cwd)
+      );
+      const persistedSessionId = await profiler.time(
+        "existence_check",
+        () => this.runWithPinnedRuntimeBaseDir(settings, params.cwd, async () => {
+          const sessionService = new SessionService(params.cwd);
+          if (await sessionService.sessionExists(sessionId)) {
+            return sessionId;
+          }
+          return sessionService.findSessionIdIgnoringCase?.(sessionId);
+        })
+      );
+      if (!persistedSessionId) {
+        profiler.fail("existence_check");
+        throw RequestError.resourceNotFound(`session:${sessionId}`);
+      }
+      sessionId = persistedSessionId;
+      profiler.setSessionId(sessionId);
+      this.settings = settings;
+      const config = await profiler.time(
+        "config_setup",
+        () => this.newSessionConfig(
+          params.cwd,
+          // `LoadSessionRequest.mcpServers` is required in today's ACP
+          // schema, but mirror `unstable_resumeSession` and tolerate a
+          // future loosening — `newSessionConfig` iterates the list, so
+          // a `null`/`undefined` would otherwise throw `TypeError`.
+          params.mcpServers ?? [],
+          settings,
+          sessionSource,
+          sessionId,
+          true
+        )
+      );
+      const sessionData = config.getResumedSessionData();
+      const bulkReplay = isBulkLoadReplayRequest(params);
+      const replayPageSize = bulkReplay ? getLoadReplayPageSize(params) : void 0;
+      let replayEnvelope;
+      try {
+        await profiler.time("auth", () => this.ensureAuthenticated(config));
+        profiler.timeSync(
+          "file_system_setup",
+          () => this.setupFileSystem(config)
+        );
+        await profiler.time(
+          "session_register",
+          () => this.createAndStoreSession(config, settings, sessionData, {
+            enableLiveScreenContext: isCompatibleLiveSessionSource(
+              sessionSource ?? {}
+            ),
+            ...bulkReplay ? { replayHistory: false } : {},
+            beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
+              if (bulkReplay) {
+                const records = sessionData?.conversation.messages;
+                let replayUpdates = [];
+                if (records) {
+                  createdSession.primeTurnFromHistory(records);
+                  const visibleRecords = selectVisibleHistoryRecords(
+                    records,
+                    shouldHideInheritedHistory(params)
+                  );
+                  const replayPage = selectRecentHistoryRecords(
+                    visibleRecords,
+                    replayPageSize
+                  );
+                  const replayUsage = createReplayCumulativeUsage();
+                  const replay = await collectHistoryReplayUpdates({
+                    sessionId,
+                    config,
+                    records: replayPage.records,
+                    gaps: sessionData?.historyGaps,
+                    cumulativeUsage: replayUsage,
+                    supersedeUnrestorableGoal: true,
+                    logger: debugLogger8
+                  });
+                  replayUpdates = replay.updates;
+                  copyCumulativeUsage(
+                    createdSession.cumulativeUsage,
+                    replayUsage
+                  );
+                  if (replay.replayError !== void 0) {
+                    replayEnvelope = {
+                      v: LOAD_REPLAY_VERSION,
+                      updates: replayUpdates,
+                      partial: true,
+                      replayError: replay.replayError,
+                      ...replayPage.hasMore ? { hasMore: true } : {}
+                    };
+                  }
+                  replayEnvelope ??= {
+                    v: LOAD_REPLAY_VERSION,
+                    updates: replayUpdates,
+                    ...replayPage.hasMore ? { hasMore: true } : {}
+                  };
+                }
+                replayEnvelope ??= {
+                  v: LOAD_REPLAY_VERSION,
+                  updates: replayUpdates
+                };
+              }
+              await this.#restoreWorktreeOnResume(config, createdSession);
+              await this.#restoreBackgroundAgentsOnResume(
+                config,
+                createdSession
+              );
+              this.#restoreGoalOnResume(config, createdSession);
+            }, "beforeStartPostReplayServices")
+          })
+        );
+      } catch (error) {
+        return this.cleanupAfterRequestFailure(error, async () => {
+          if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
+            await this.cleanupUnstoredConfig(config);
+          }
+        });
       }
-    };
+      return profiler.timeSync("response_build", () => {
+        const response = {
+          modes: this.buildModesData(config),
+          models: this.buildAvailableModels(config),
+          configOptions: this.buildConfigOptions(config),
+          ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+        };
+        if (!replayEnvelope) return response;
+        return {
+          ...response,
+          _meta: {
+            [LOAD_REPLAY_META_KEY]: replayEnvelope
+          }
+        };
+      });
+    } finally {
+      releaseStartingSessionId();
+    }
   }
   async unstable_resumeSession(params) {
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const parentContext = extractDaemonTraceContext(params);
+    return await withDaemonSpan(
+      "qwen-code.daemon.session_restore",
+      {
+        "qwen-code.daemon.operation": "acp_session_resume",
+        "qwen-code.daemon.session_restore.action": "resume",
+        "session.id": sessionId
+      },
+      async (span) => this.resumeSessionWithProfiler(
+        params,
+        sessionId,
+        createAcpSessionRestoreProfiler(span)
+      ),
+      parentContext ? { parentContext } : {}
+    );
+  }
+  async resumeSessionWithProfiler(params, initialSessionId, profiler) {
+    let sessionId = initialSessionId;
     const sessionSource = getSessionSource(params);
-    const settings = loadSettingsCached(params.cwd);
-    const liveSession = this.sessions.get(params.sessionId);
+    const liveSession = this.sessions.get(sessionId);
     if (liveSession) {
+      const settings = profiler.timeSync(
+        "settings_load",
+        () => loadSettingsCached(params.cwd)
+      );
       const liveConfig = liveSession.getConfig();
-      await this.assertLiveSessionScope(liveConfig, settings, params.cwd);
-      return this.withLiveSessionRestore(
-        params.sessionId,
-        liveSession,
-        async (config2, sessionData2) => ({
-          modes: this.buildModesData(config2),
-          models: this.buildAvailableModels(config2),
-          configOptions: this.buildConfigOptions(config2),
-          ...sessionData2.artifactSnapshot ? { artifactSnapshot: sessionData2.artifactSnapshot } : {}
+      return profiler.time("live_restore", async () => {
+        await this.assertLiveSessionScope(liveConfig, settings, params.cwd);
+        return this.withLiveSessionRestore(
+          sessionId,
+          liveSession,
+          async (config, sessionData) => profiler.timeSync(
+            "response_build",
+            () => ({
+              modes: this.buildModesData(config),
+              models: this.buildAvailableModels(config),
+              configOptions: this.buildConfigOptions(config),
+              ...sessionData.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+            })
+          )
+        );
+      });
+    }
+    const releaseStartingSessionId = this.reserveStartingSessionId(sessionId);
+    try {
+      const settings = profiler.timeSync(
+        "settings_load",
+        () => loadSettingsCached(params.cwd)
+      );
+      const persistedSessionId = await profiler.time(
+        "existence_check",
+        () => this.runWithPinnedRuntimeBaseDir(settings, params.cwd, async () => {
+          const sessionService = new SessionService(params.cwd);
+          if (await sessionService.sessionExists(sessionId)) {
+            return sessionId;
+          }
+          return sessionService.findSessionIdIgnoringCase?.(sessionId);
         })
       );
-    }
-    const exists = await this.runWithPinnedRuntimeBaseDir(
-      settings,
-      params.cwd,
-      async () => {
-        const sessionService = new SessionService(params.cwd);
-        return sessionService.sessionExists(params.sessionId);
+      if (!persistedSessionId) {
+        profiler.fail("existence_check");
+        throw RequestError.resourceNotFound(`session:${sessionId}`);
+      }
+      sessionId = persistedSessionId;
+      profiler.setSessionId(sessionId);
+      this.settings = settings;
+      const config = await profiler.time(
+        "config_setup",
+        () => this.newSessionConfig(
+          params.cwd,
+          params.mcpServers ?? [],
+          settings,
+          sessionSource,
+          sessionId,
+          true
+        )
+      );
+      try {
+        await profiler.time("auth", () => this.ensureAuthenticated(config));
+        profiler.timeSync(
+          "file_system_setup",
+          () => this.setupFileSystem(config)
+        );
+        await profiler.time(
+          "session_register",
+          () => this.createAndStoreSession(
+            config,
+            settings,
+            config.getResumedSessionData(),
+            {
+              enableLiveScreenContext: isCompatibleLiveSessionSource(
+                sessionSource ?? {}
+              ),
+              replayHistory: false,
+              beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
+                await this.#restoreWorktreeOnResume(config, createdSession);
+                await this.#restoreBackgroundAgentsOnResume(
+                  config,
+                  createdSession
+                );
+                this.#restoreGoalOnResume(config, createdSession);
+              }, "beforeStartPostReplayServices")
+            }
+          )
+        );
+      } catch (error) {
+        return this.cleanupAfterRequestFailure(error, async () => {
+          if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
+            await this.cleanupUnstoredConfig(config);
+          }
+        });
       }
-    );
-    if (!exists) {
-      throw RequestError.resourceNotFound(`session:${params.sessionId}`);
-    }
-    this.settings = settings;
-    const config = await this.newSessionConfig(
-      params.cwd,
-      params.mcpServers ?? [],
-      settings,
-      sessionSource,
-      params.sessionId,
-      true
-    );
-    try {
-      await this.ensureAuthenticated(config);
-      this.setupFileSystem(config);
-      await this.createAndStoreSession(
-        config,
-        settings,
-        config.getResumedSessionData(),
-        {
-          enableLiveScreenContext: isCompatibleLiveSessionSource(
-            sessionSource ?? {}
-          ),
-          replayHistory: false,
-          beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
-            await this.#restoreWorktreeOnResume(config, createdSession);
-            await this.#restoreBackgroundAgentsOnResume(config, createdSession);
-            this.#restoreGoalOnResume(config, createdSession);
-          }, "beforeStartPostReplayServices")
-        }
+      const sessionData = config.getResumedSessionData();
+      return profiler.timeSync(
+        "response_build",
+        () => ({
+          modes: this.buildModesData(config),
+          models: this.buildAvailableModels(config),
+          configOptions: this.buildConfigOptions(config),
+          ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+        })
       );
-    } catch (error) {
-      return this.cleanupAfterRequestFailure(error, async () => {
-        if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
-          await this.cleanupUnstoredConfig(config);
-        }
-      });
+    } finally {
+      releaseStartingSessionId();
     }
-    const modesData = this.buildModesData(config);
-    const availableModels = this.buildAvailableModels(config);
-    const configOptions = this.buildConfigOptions(config);
-    const sessionData = config.getResumedSessionData();
-    return {
-      modes: modesData,
-      models: availableModels,
-      configOptions,
-      ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
-    };
   }
   /**
    * Shared worktree restore for both ACP entry points (`loadSession` and
@@ -13384,7 +14089,7 @@ var QwenAgent = class {
         session.pendingWorktreeNotice = restored.contextMessage;
       }
     } catch (error) {
-      debugLogger7.warn(`ACP worktree restore failed: ${error}`);
+      debugLogger8.warn(`ACP worktree restore failed: ${error}`);
     }
   }
   async #restoreBackgroundAgentsOnResume(config, session) {
@@ -13417,7 +14122,7 @@ var QwenAgent = class {
         config
       );
       if (restored.restored) {
-        debugLogger7.info(
+        debugLogger8.info(
           `ACP goal restored sessionId=${config.getSessionId()} condition=${restored.condition}`
         );
       } else if (restored.blockedBy && restored.blockedBy !== "condition-invalid") {
@@ -13463,27 +14168,30 @@ var QwenAgent = class {
     };
   }
   async setSessionMode(params) {
-    const session = this.sessions.get(params.sessionId);
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const session = this.sessions.get(sessionId);
     if (!session) {
       throw RequestError.invalidParams(
         void 0,
-        `Session not found for id: ${params.sessionId}`
+        `Session not found for id: ${sessionId}`
       );
     }
-    return session.setMode(params);
+    return session.setMode({ ...params, sessionId });
   }
   async unstable_setSessionModel(params) {
-    const session = this.sessions.get(params.sessionId);
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const session = this.sessions.get(sessionId);
     if (!session) {
       throw RequestError.invalidParams(
         void 0,
-        `Session not found for id: ${params.sessionId}`
+        `Session not found for id: ${sessionId}`
       );
     }
-    return await session.setModel(params);
+    return await session.setModel({ ...params, sessionId });
   }
   async setSessionConfigOption(params) {
-    const { sessionId, configId, value } = params;
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const { configId, value } = params;
     const session = this.sessions.get(sessionId);
     if (!session) {
       throw RequestError.invalidParams(
@@ -13520,11 +14228,12 @@ var QwenAgent = class {
     };
   }
   async prompt(params) {
-    const session = this.sessions.get(params.sessionId);
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const session = this.sessions.get(sessionId);
     if (!session) {
-      throw new Error(`Session not found: ${params.sessionId}`);
+      throw new Error(`Session not found: ${sessionId}`);
     }
-    const sanitizedParams = { ...params };
+    const sanitizedParams = { ...params, sessionId };
     const meta = params._meta && typeof params._meta === "object" ? { ...params._meta } : {};
     const suppliedContext = meta[INVOCATION_CONTEXT_META_KEY];
     const suppliedModelPrompt = meta[DAEMON_MODEL_PROMPT_META_KEY];
@@ -13554,14 +14263,14 @@ var QwenAgent = class {
     }, "settleCall");
     const call = {
       controller: new AbortController(),
-      settled: new Promise((resolve5) => {
-        settleCall = resolve5;
+      settled: new Promise((resolve6) => {
+        settleCall = resolve6;
       })
     };
-    let calls = this.activePromptCalls.get(params.sessionId);
+    let calls = this.activePromptCalls.get(sessionId);
     if (!calls) {
       calls = /* @__PURE__ */ new Set();
-      this.activePromptCalls.set(params.sessionId, calls);
+      this.activePromptCalls.set(sessionId, calls);
     }
     calls.add(call);
     try {
@@ -13574,16 +14283,17 @@ var QwenAgent = class {
     } finally {
       calls.delete(call);
       if (calls.size === 0) {
-        this.activePromptCalls.delete(params.sessionId);
+        this.activePromptCalls.delete(sessionId);
       }
       settleCall();
       await this.activeWorkReporter?.flush();
     }
   }
   async cancel(params) {
-    const session = this.sessions.get(params.sessionId);
+    const sessionId = normalizeSessionIdForLookup(params.sessionId);
+    const session = this.sessions.get(sessionId);
     if (!session) {
-      throw new Error(`Session not found: ${params.sessionId}`);
+      throw new Error(`Session not found: ${sessionId}`);
     }
     try {
       await session.cancelPendingPrompt();
@@ -13611,7 +14321,7 @@ var QwenAgent = class {
       await extensionManager.refreshCache();
       extensions = extensionManager.getLoadedExtensions();
     } catch (error) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         "Extension loading failed, continuing without extensions:",
         error
       );
@@ -13737,7 +14447,7 @@ var QwenAgent = class {
             pm.addPersistentRule(rule, ruleType);
           }
         } catch (error) {
-          debugLogger7.warn(
+          debugLogger8.warn(
             `Failed to sync permission rules to a live session: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -14295,7 +15005,7 @@ var QwenAgent = class {
       if (!changed) return;
       await config.getSkillManager()?.refreshCache();
     } catch (error) {
-      debugLogger7.warn("Extension source revalidation failed:", error);
+      debugLogger8.warn("Extension source revalidation failed:", error);
     }
   }
   async buildWorkspaceSkillsStatus(config) {
@@ -15192,9 +15902,9 @@ var QwenAgent = class {
       );
     }
     const download = await downloadSkill(request.sourceUrl);
-    const skillsBaseDir = path3.join(Storage.getGlobalQwenDir(), "skills");
+    const skillsBaseDir = path4.join(Storage.getGlobalQwenDir(), "skills");
     const skillDir = resolveManagedSkillDir(skillsBaseDir, request.slug);
-    const skillFile = path3.join(skillDir, "SKILL.md");
+    const skillFile = path4.join(skillDir, "SKILL.md");
     const parsed = skillManager.parseSkillContent(
       download.skillContent,
       skillFile,
@@ -15208,19 +15918,19 @@ var QwenAgent = class {
     }
     const stagingDir = `${skillDir}.installing-${process.pid}-${Date.now()}`;
     try {
-      await fs.rm(stagingDir, { recursive: true, force: true });
+      await fs2.rm(stagingDir, { recursive: true, force: true });
       for (const file of download.files) {
         const targetPath = resolveSkillInstallPath(
           stagingDir,
           file.relativePath
         );
-        await fs.mkdir(path3.dirname(targetPath), { recursive: true });
-        await fs.writeFile(targetPath, file.content);
+        await fs2.mkdir(path4.dirname(targetPath), { recursive: true });
+        await fs2.writeFile(targetPath, file.content);
       }
-      await fs.rm(skillDir, { recursive: true, force: true });
-      await fs.rename(stagingDir, skillDir);
+      await fs2.rm(skillDir, { recursive: true, force: true });
+      await fs2.rename(stagingDir, skillDir);
     } catch (error) {
-      await fs.rm(stagingDir, { recursive: true, force: true }).catch(() => {
+      await fs2.rm(stagingDir, { recursive: true, force: true }).catch(() => {
       });
       throw error;
     }
@@ -15253,17 +15963,17 @@ var QwenAgent = class {
         `Skill name "${parsed.name}" does not match requested slug "${request.slug}"`
       );
     }
-    const resolvedSkillDir = path3.resolve(skillDir);
-    const resolvedSkillFile = path3.resolve(skillFile);
-    const globalDir = path3.resolve(Storage.getGlobalQwenDir());
-    const isDedicatedSkillDir = resolvedSkillFile === path3.join(resolvedSkillDir, "SKILL.md");
-    if (!isDedicatedSkillDir || resolvedSkillDir === path3.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
+    const resolvedSkillDir = path4.resolve(skillDir);
+    const resolvedSkillFile = path4.resolve(skillFile);
+    const globalDir = path4.resolve(Storage.getGlobalQwenDir());
+    const isDedicatedSkillDir = resolvedSkillFile === path4.join(resolvedSkillDir, "SKILL.md");
+    if (!isDedicatedSkillDir || resolvedSkillDir === path4.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to delete unexpected skill directory: ${skillDir}`
       );
     }
-    await fs.rm(skillDir, { recursive: true, force: true });
+    await fs2.rm(skillDir, { recursive: true, force: true });
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -15273,11 +15983,11 @@ var QwenAgent = class {
   async readManagedSkillFile(slug, scope, skillManager, cwd) {
     if (scope === "global") {
       const qwenSkillDir = resolveManagedSkillDir(
-        path3.join(Storage.getGlobalQwenDir(), "skills"),
+        path4.join(Storage.getGlobalQwenDir(), "skills"),
         slug
       );
-      const qwenSkillFile = path3.join(qwenSkillDir, "SKILL.md");
-      const qwenContent = await fs.readFile(qwenSkillFile, "utf8").catch(() => void 0);
+      const qwenSkillFile = path4.join(qwenSkillDir, "SKILL.md");
+      const qwenContent = await fs2.readFile(qwenSkillFile, "utf8").catch(() => void 0);
       if (qwenContent !== void 0) {
         return {
           skillDir: qwenSkillDir,
@@ -15305,34 +16015,34 @@ var QwenAgent = class {
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     }
-    const content = await fs.readFile(skillFile, "utf8").catch(() => {
+    const content = await fs2.readFile(skillFile, "utf8").catch(() => {
       throw RequestError.invalidParams(
         void 0,
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     });
     return {
-      skillDir: path3.dirname(skillFile),
+      skillDir: path4.dirname(skillFile),
       skillFile,
       content
     };
   }
   async findProjectSkillFileFromCwd(slug, cwd, skillManager) {
-    const projectRoot = path3.resolve(cwd);
+    const projectRoot = path4.resolve(cwd);
     for (const configDir of PROJECT_SKILL_DIRS) {
-      const baseDir = path3.join(projectRoot, configDir, SKILLS_DIR);
+      const baseDir = path4.join(projectRoot, configDir, SKILLS_DIR);
       const skills = await skillManager.loadSkillsFromDir(baseDir, "project");
       const skill = skills.find((candidate) => candidate.name === slug);
       const skillFile = skill?.filePath;
       if (!skillFile) continue;
-      const content = await fs.readFile(skillFile, "utf8").catch(() => {
+      const content = await fs2.readFile(skillFile, "utf8").catch(() => {
         throw RequestError.invalidParams(
           void 0,
           `Project skill not found: ${slug}`
         );
       });
       return {
-        skillDir: path3.dirname(skillFile),
+        skillDir: path4.dirname(skillFile),
         skillFile,
         content
       };
@@ -15363,13 +16073,13 @@ var QwenAgent = class {
     }
     const nextContent = setSkillFrontmatterEnabled(content, request.enabled);
     skillManager.parseSkillContent(nextContent, skillFile, level);
-    if (path3.basename(skillFile) !== "SKILL.md") {
+    if (path4.basename(skillFile) !== "SKILL.md") {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to write to unexpected skill file: ${skillFile}`
       );
     }
-    await fs.writeFile(skillFile, nextContent, "utf8");
+    await fs2.writeFile(skillFile, nextContent, "utf8");
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -15379,13 +16089,18 @@ var QwenAgent = class {
   }
   async extMethod(method, params) {
     try {
+      const rawSessionId = params["sessionId"];
+      const normalizedParams = typeof rawSessionId === "string" ? {
+        ...params,
+        sessionId: normalizeSessionIdForLookup(rawSessionId)
+      } : params;
       if (method === SERVE_CONTROL_EXT_METHODS.sessionBackgroundNotification && this.privateParentState !== "trusted") {
         throw RequestError.invalidParams(
           void 0,
           "Background notifications require a trusted private ACP parent"
         );
       }
-      return await this.extMethodInternal(method, params);
+      return await this.extMethodInternal(method, normalizedParams);
     } catch (error) {
       const writerError = getSessionWriterError(error);
       if (writerError) {
@@ -15750,7 +16465,7 @@ var QwenAgent = class {
               config,
               finalizeDangling: !activePromptBeforeRead && !this.activePromptCalls.has(sessionId),
               encodeCursor: /* @__PURE__ */ __name((state) => encodeSessionTranscriptCursor(state, cwd), "encodeCursor"),
-              logger: debugLogger7
+              logger: debugLogger8
             });
             return {
               v: 1,
@@ -15946,7 +16661,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "remember_timeout";
-            debugLogger7.error("Workspace memory remember timed out:", {
+            debugLogger8.error("Workspace memory remember timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -15958,7 +16673,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory remember failed:", {
+          debugLogger8.error("Workspace memory remember failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -16032,7 +16747,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "forget_timeout";
-            debugLogger7.error("Workspace memory forget timed out:", {
+            debugLogger8.error("Workspace memory forget timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -16044,7 +16759,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory forget failed:", {
+          debugLogger8.error("Workspace memory forget failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -16112,7 +16827,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "dream_timeout";
-            debugLogger7.error("Workspace memory dream timed out:", {
+            debugLogger8.error("Workspace memory dream timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -16124,7 +16839,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory dream failed:", {
+          debugLogger8.error("Workspace memory dream failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -16475,10 +17190,10 @@ var QwenAgent = class {
           let resolveStarted;
           let rejectStarted;
           let startedTimer;
-          const started = new Promise((resolve5, reject) => {
+          const started = new Promise((resolve6, reject) => {
             resolveStarted = /* @__PURE__ */ __name((value) => {
               clearTimeout(startedTimer);
-              resolve5(value);
+              resolve6(value);
             }, "resolveStarted");
             rejectStarted = /* @__PURE__ */ __name((reason) => {
               clearTimeout(startedTimer);
@@ -16534,7 +17249,7 @@ var QwenAgent = class {
                   error: error instanceof Error ? error.message : String(error)
                 });
                 rejectStarted(error);
-                debugLogger7.warn(
+                debugLogger8.warn(
                   `MCP OAuth authentication failed for ${serverName}:`,
                   error
                 );
@@ -16546,7 +17261,7 @@ var QwenAgent = class {
                   "discover"
                 );
               } catch (error) {
-                debugLogger7.warn(
+                debugLogger8.warn(
                   `MCP OAuth authenticated for ${serverName}, but tool synchronization failed:`,
                   error
                 );
@@ -16970,7 +17685,7 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path3.isAbsolute(targetPath) || targetPath.includes("\0")) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path4.isAbsolute(targetPath) || targetPath.includes("\0")) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing path (must be an absolute path)"
@@ -16993,7 +17708,7 @@ var QwenAgent = class {
         }
         let stats;
         try {
-          stats = await fs.stat(targetPath);
+          stats = await fs2.stat(targetPath);
         } catch {
           throw new RequestError(-32002, `Directory not found: ${targetPath}`, {
             errorKind: "directory_not_found",
@@ -17006,7 +17721,7 @@ var QwenAgent = class {
             path: targetPath
           });
         }
-        const canonicalPath = await fs.realpath(targetPath);
+        const canonicalPath = await fs2.realpath(targetPath);
         let containmentRoots = allowedRoots;
         let managedTrustAllowed = false;
         if (managedRelocation === "live-conversation") {
@@ -17016,7 +17731,7 @@ var QwenAgent = class {
               "Live managed relocation requires a trusted private ACP parent"
             );
           }
-          if (!Array.isArray(allowedRoots) || allowedRoots.length !== 1 || typeof allowedRoots[0] !== "string" || !path3.isAbsolute(allowedRoots[0]) || allowedRoots[0].includes("\0")) {
+          if (!Array.isArray(allowedRoots) || allowedRoots.length !== 1 || typeof allowedRoots[0] !== "string" || !path4.isAbsolute(allowedRoots[0]) || allowedRoots[0].includes("\0")) {
             throw RequestError.invalidParams(
               void 0,
               "Live managed relocation requires one absolute allowed root"
@@ -17027,9 +17742,9 @@ var QwenAgent = class {
           let canonicalRoot;
           let rootAfter;
           try {
-            rootBefore = await fs.lstat(rootPath);
-            canonicalRoot = await fs.realpath(rootPath);
-            rootAfter = await fs.lstat(canonicalRoot);
+            rootBefore = await fs2.lstat(rootPath);
+            canonicalRoot = await fs2.realpath(rootPath);
+            rootAfter = await fs2.lstat(canonicalRoot);
           } catch {
             throw new RequestError(
               -32004,
@@ -17047,8 +17762,8 @@ var QwenAgent = class {
           let targetBefore;
           let targetAfter;
           try {
-            targetBefore = await fs.lstat(targetPath);
-            targetAfter = await fs.lstat(canonicalPath);
+            targetBefore = await fs2.lstat(targetPath);
+            targetAfter = await fs2.lstat(canonicalPath);
           } catch {
             throw new RequestError(
               -32004,
@@ -17056,8 +17771,8 @@ var QwenAgent = class {
               { errorKind: "containment_violation", path: canonicalPath }
             );
           }
-          const relativeTarget = path3.relative(canonicalRoot, canonicalPath);
-          if (!isOwnerOnlyDirectory(targetBefore) || !isOwnerOnlyDirectory(targetAfter) || targetBefore.dev !== targetAfter.dev || targetBefore.ino !== targetAfter.ino || relativeTarget.length === 0 || relativeTarget.startsWith("..") || path3.isAbsolute(relativeTarget) || relativeTarget.includes(path3.sep)) {
+          const relativeTarget = path4.relative(canonicalRoot, canonicalPath);
+          if (!isOwnerOnlyDirectory(targetBefore) || !isOwnerOnlyDirectory(targetAfter) || targetBefore.dev !== targetAfter.dev || targetBefore.ino !== targetAfter.ino || relativeTarget.length === 0 || relativeTarget.startsWith("..") || path4.isAbsolute(relativeTarget) || relativeTarget.includes(path4.sep)) {
             throw new RequestError(
               -32004,
               "Live managed relocation requires an owner-only direct child",
@@ -17066,7 +17781,7 @@ var QwenAgent = class {
           }
           let rootFinal;
           try {
-            rootFinal = await fs.lstat(canonicalRoot);
+            rootFinal = await fs2.lstat(canonicalRoot);
           } catch {
             throw new RequestError(
               -32004,
@@ -17087,8 +17802,8 @@ var QwenAgent = class {
         if (Array.isArray(containmentRoots) && containmentRoots.length > 0) {
           const contained = containmentRoots.some((root) => {
             if (typeof root !== "string") return false;
-            const rel = path3.relative(root, canonicalPath);
-            return !rel.startsWith("..") && !path3.isAbsolute(rel);
+            const rel = path4.relative(root, canonicalPath);
+            return !rel.startsWith("..") && !path4.isAbsolute(rel);
           });
           if (!contained) {
             throw new RequestError(
@@ -17236,7 +17951,7 @@ var QwenAgent = class {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger7.warn("setLanguageAsync failed:", err);
+          debugLogger8.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -17250,7 +17965,7 @@ var QwenAgent = class {
             language
           );
         } catch (err) {
-          debugLogger7.warn("Failed to persist UI language setting:", err);
+          debugLogger8.warn("Failed to persist UI language setting:", err);
         }
         let outputLanguage = null;
         let refreshed = false;
@@ -17264,7 +17979,7 @@ var QwenAgent = class {
             );
             fileWriteOk = true;
           } catch (err) {
-            debugLogger7.warn("Failed to write output-language.md:", err);
+            debugLogger8.warn("Failed to write output-language.md:", err);
           }
           if (fileWriteOk) {
             try {
@@ -17274,7 +17989,7 @@ var QwenAgent = class {
                 settingValue
               );
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 "Failed to persist output language setting:",
                 err
               );
@@ -17294,7 +18009,7 @@ var QwenAgent = class {
                     writeOutputLanguageAndRegisterPath(settingValue, cfg);
                   }
                 } catch (err) {
-                  debugLogger7.warn(
+                  debugLogger8.warn(
                     `Failed to write output-language.md for session ${s.getId()} (path=${sessionPath ?? "global-default"}):`,
                     err
                   );
@@ -17307,7 +18022,7 @@ var QwenAgent = class {
               (r) => r.status === "rejected"
             ).length;
             if (failedCount > 0) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 `Language refresh failed for ${failedCount}/${results.length} session(s)`
               );
             }
@@ -17325,14 +18040,14 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        debugLogger7.debug(`recap ext-method received for session=${sessionId}`);
+        debugLogger8.debug(`recap ext-method received for session=${sessionId}`);
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
         const recap = await generateSessionRecap(
           config,
           new AbortController().signal
         );
-        debugLogger7.debug(
+        debugLogger8.debug(
           `recap ext-method completed for session=${sessionId} result=${recap ? `len=${recap.length}` : "null"}`
         );
         return { sessionId, recap };
@@ -17414,7 +18129,7 @@ var QwenAgent = class {
         const config = session.getConfig();
         const cacheSafeParams = buildBtwCacheSafeParams(config);
         if (!cacheSafeParams) {
-          debugLogger7.debug(`btw: no cacheSafeParams for session=${sessionId}`);
+          debugLogger8.debug(`btw: no cacheSafeParams for session=${sessionId}`);
           return { sessionId, answer: null };
         }
         const childSignal = AbortSignal.timeout(BTW_CHILD_TIMEOUT_MS);
@@ -17468,7 +18183,7 @@ var QwenAgent = class {
         try {
           hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
-          debugLogger7.debug("Failed to read history before /fork:", error);
+          debugLogger8.debug("Failed to read history before /fork:", error);
         }
         if (!hasHistory) {
           throw RequestError.invalidParams(
@@ -17510,7 +18225,7 @@ var QwenAgent = class {
             ]
           });
         } catch (error) {
-          debugLogger7.debug("Failed to record fork event in history:", error);
+          debugLogger8.debug("Failed to record fork event in history:", error);
         }
         return { sessionId, description, launched: true };
       }
@@ -17573,7 +18288,7 @@ ${outputText}
             'taskKind must be "agent", "shell", or "monitor"'
           );
         }
-        debugLogger7.info(
+        debugLogger8.info(
           `sessionTaskCancel requested sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind}`
         );
         const session = this.sessionOrThrow(sessionId);
@@ -17583,7 +18298,7 @@ ${outputText}
             const task = config.getBackgroundTaskRegistry().get(taskId);
             if (!task || task.status !== "running" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger8.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -17593,7 +18308,7 @@ ${outputText}
             } else {
               config.getBackgroundTaskRegistry().cancel(taskId);
             }
-            debugLogger7.info(
+            debugLogger8.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17602,13 +18317,13 @@ ${outputText}
             const task = config.getBackgroundShellRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger8.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getBackgroundShellRegistry().requestCancel(taskId);
-            debugLogger7.info(
+            debugLogger8.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17617,13 +18332,13 @@ ${outputText}
             const task = config.getMonitorRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger8.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getMonitorRegistry().cancel(taskId);
-            debugLogger7.info(
+            debugLogger8.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17653,7 +18368,7 @@ ${outputText}
             durationMs: Date.now() - cleared.setAt
           });
         }
-        debugLogger7.info(
+        debugLogger8.info(
           `sessionGoalClear sessionId=${sessionId} cleared=${!!cleared} condition=${cleared?.condition ?? "(none)"}`
         );
         return {
@@ -17692,7 +18407,7 @@ ${outputText}
         }
         const session = this.sessionOrThrow(sessionId);
         const result = await session.continueLastTurn();
-        debugLogger7.info(
+        debugLogger8.info(
           `sessionContinue sessionId=${sessionId} accepted=${result.accepted} interruption=${result.interruption}`
         );
         return result;
@@ -17714,7 +18429,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 `workspaceMcpRuntimeAdd: failed to add runtime MCP server '${request.name}' to active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -17737,7 +18452,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 `workspaceMcpRuntimeRemove: failed to remove runtime MCP server '${request.name}' from active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -17846,7 +18561,7 @@ ${outputText}
           }
         );
         if (success) {
-          fireSessionDeleteHook(this.config, sessionId, debugLogger7);
+          fireSessionDeleteHook(this.config, sessionId, debugLogger8);
         }
         return { success };
       }
@@ -17972,7 +18687,7 @@ ${outputText}
             filesFailed = fileResult.filesFailed;
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
-            debugLogger7.error(
+            debugLogger8.error(
               `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
             );
             filesFailed = [`file-history-rewind: ${reason}`];
@@ -18004,7 +18719,7 @@ ${outputText}
         } catch (err) {
           const reason = err instanceof Error ? err.message : String(err);
           artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-          debugLogger7.warn(
+          debugLogger8.warn(
             `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
           );
         }
@@ -18060,7 +18775,7 @@ ${outputText}
           records: sessionData.conversation.messages,
           gaps: sessionData.historyGaps,
           cumulativeUsage: createReplayCumulativeUsage(),
-          logger: debugLogger7
+          logger: debugLogger8
         });
         return {
           updates: replay.updates,
@@ -18416,7 +19131,7 @@ ${outputText}
                   newMerged.providerProtocol ?? {}
                 );
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger8.warn(
                   `reload: reloadModelProvidersConfig failed for session ${id}: ${err}`
                 );
               }
@@ -18426,7 +19141,7 @@ ${outputText}
               try {
                 await config.switchModel(authType, newModelName);
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger8.warn(
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
@@ -18434,7 +19149,7 @@ ${outputText}
               try {
                 await config.refreshAuth(authType);
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger8.warn(
                   `reload: refreshAuth failed for session ${id}: ${err}`
                 );
               }
@@ -18453,7 +19168,7 @@ ${outputText}
                     session.clearTodoStopGuardTrust();
                   }
                 } catch (err) {
-                  debugLogger7.warn(
+                  debugLogger8.warn(
                     `reload: setApprovalMode failed for session ${id}: ${err}`
                   );
                 }
@@ -18462,14 +19177,14 @@ ${outputText}
             try {
               await config.refreshHierarchicalMemory();
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 `reload: refreshHierarchicalMemory failed for session ${id}: ${err}`
               );
             }
             try {
               await config.getGeminiClient()?.refreshSystemInstruction();
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger8.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
               );
             }
@@ -18479,7 +19194,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason = results[i].reason;
-            debugLogger7.warn(
+            debugLogger8.warn(
               `Session ${sessions[i][0]} reload failed: ${reason}`
             );
             skipped.push(sessions[i][0]);
@@ -18524,7 +19239,7 @@ ${outputText}
           );
           for (const result of configResults) {
             if (result.status === "rejected") {
-              debugLogger7.warn(`Skill config refresh failed: ${result.reason}`);
+              debugLogger8.warn(`Skill config refresh failed: ${result.reason}`);
             }
           }
         }
@@ -18543,7 +19258,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason2 = results[i].reason;
-            debugLogger7.warn(
+            debugLogger8.warn(
               `Session ${sessions[i].getId()} skill refresh failed: ${reason2}`
             );
           }
@@ -18587,12 +19302,12 @@ ${outputText}
   disposeTranscriptReplayConfig(config) {
     try {
       void Promise.resolve(config.getToolRegistry()?.stop()).catch((err) => {
-        debugLogger7.debug(
+        debugLogger8.debug(
           `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
     } catch (err) {
-      debugLogger7.debug(
+      debugLogger8.debug(
         `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -18606,7 +19321,7 @@ ${outputText}
     this.transcriptReplayConfigCache.clear();
   }
   async getTranscriptReplayConfig(cwd, settings) {
-    const key = path3.resolve(cwd);
+    const key = path4.resolve(cwd);
     const cached = this.transcriptReplayConfigCache.get(key);
     if (cached?.settings === settings) {
       if (cached.config) {
@@ -18687,7 +19402,10 @@ ${outputText}
       });
     } catch (error) {
       if (error instanceof SessionIdConflictError) {
-        throw RequestError.invalidParams(void 0, error.message);
+        throw new RequestError(ACP_ERROR_CODES.INVALID_PARAMS, error.message, {
+          errorKind: "session_id_conflict",
+          sessionId: error.sessionId
+        });
       }
       const writerError = getSessionWriterError(error);
       if (writerError) {
@@ -18840,7 +19558,7 @@ ${outputText}
           sessionId: sid,
           ...event
         }).catch((err) => {
-          debugLogger7.debug(
+          debugLogger8.debug(
             `MCP budget extNotification dropped (session=${sid}, kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
           );
         });
@@ -18870,7 +19588,7 @@ ${outputText}
     try {
       await config.waitForMcpReady();
     } catch (err) {
-      debugLogger7.error(
+      debugLogger8.error(
         `MCP discovery readiness failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return;
@@ -18894,7 +19612,7 @@ ${outputText}
     try {
       await config.refreshAuth(selectedType, true);
     } catch (e) {
-      debugLogger7.error(`Authentication failed: ${e}`);
+      debugLogger8.error(`Authentication failed: ${e}`);
       throw RequestError.authRequired(
         {
           authMethods: pickAuthMethodsForAuthRequired(selectedType)
@@ -18918,7 +19636,7 @@ ${outputText}
   }
   async createAndStoreSession(config, settings, sessionData, options = {}) {
     this.assertManagedSessionAdmission();
-    const sessionId = config.getSessionId();
+    const sessionId = normalizeSessionIdForLookup(config.getSessionId());
     const geminiClient = config.getGeminiClient();
     const needsInitialize = !geminiClient.isInitialized();
     if (needsInitialize) {
@@ -18926,7 +19644,11 @@ ${outputText}
     }
     this.assertManagedSessionAdmission();
     if (this.sessions.has(sessionId)) {
-      throw new Error(`Session ${sessionId} is already active.`);
+      throw new RequestError(
+        ACP_ERROR_CODES.INVALID_PARAMS,
+        `Session ${sessionId} is already active.`,
+        { errorKind: "session_id_conflict", sessionId }
+      );
     }
     const session = new Session(
       sessionId,
@@ -19113,3 +19835,8 @@ export {
  * Copyright 2025 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */