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

package/chunks/{acpAgent-WO6JFCVQ.js → acpAgent-3JCJ6KWG.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   recomputeMcpGating
-} from "./chunk-3LZKY4V4.js";
+} from "./chunk-QKJT5K4Q.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -16,17 +16,14 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-SLSWFHDF.js";
-import {
-  getCommandSubcommandNames
-} from "./chunk-IMOQO6YL.js";
+} from "./chunk-BJKFFPX2.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-GESMMPAK.js";
+} from "./chunk-UKAYEQDU.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -34,24 +31,27 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-XM2O73NC.js";
+} from "./chunk-IMK3SJ43.js";
+import {
+  getCommandSubcommandNames
+} from "./chunk-4Q6N3SNL.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-TOGZTG4X.js";
+} from "./chunk-MIA37QO3.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-3LGZEYOF.js";
+import "./chunk-YHEEE624.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-SKNE3KQC.js";
+} from "./chunk-Z5ZAWED3.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-2POQWYM6.js";
+import "./chunk-RFA6VDCR.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-KKN2IE7Q.js";
+import "./chunk-CTJLZLB5.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
-import "./chunk-GK2H5GRC.js";
+import "./chunk-LMEIS6WW.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
@@ -59,8 +59,8 @@ import {
   endAcpBootstrapConfigProfiling,
   markAcpStartup
 } from "./chunk-W7U4ESW2.js";
-import "./chunk-536SWZTA.js";
-import "./chunk-FZFP7RZI.js";
+import "./chunk-MV7VUCIG.js";
+import "./chunk-H2352CX2.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -83,7 +83,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-U4AF3QLU.js";
+} from "./chunk-L4OW63GW.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -93,10 +93,10 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-W5DXUTXD.js";
-import "./chunk-DYA25Y7U.js";
+} from "./chunk-LDY4J4G6.js";
+import "./chunk-OWMAZHIX.js";
+import "./chunk-O7VQ3F22.js";
 import "./chunk-4NFY2S7N.js";
-import "./chunk-RFUHDCNF.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import {
@@ -113,7 +113,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-5MJGUQU5.js";
+} from "./chunk-XIDHBXUI.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
@@ -123,38 +123,38 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-CA4UIDFU.js";
+} from "./chunk-DPH3MUAP.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-O7V7N4G7.js";
+} from "./chunk-ACHMWGC5.js";
 import {
   readVoiceModel
-} from "./chunk-C4CBJQKY.js";
-import "./chunk-JELIWHXD.js";
+} from "./chunk-LDUGDB5H.js";
+import "./chunk-AOHJKPKL.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-OWSW7EYP.js";
-import "./chunk-G5NNWEYE.js";
+import "./chunk-JACAHYEN.js";
+import "./chunk-HY2INPTA.js";
 import "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-NKSF7HYF.js";
+} from "./chunk-AG3P2RES.js";
 import "./chunk-VXZBKKQR.js";
-import "./chunk-K2B3X3E7.js";
+import "./chunk-26ISE5EG.js";
 import "./chunk-3SH53ANB.js";
 import {
   SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-OP2OHZ7K.js";
-import "./chunk-GLWP3FDB.js";
+} from "./chunk-764F335K.js";
+import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-SQC6K5HI.js";
+} from "./chunk-RPWVIXDB.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -162,10 +162,10 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-UGTWD35F.js";
-import "./chunk-LAAFLUQV.js";
-import "./chunk-VWOVHOTT.js";
-import "./chunk-EMYZIABH.js";
+} from "./chunk-NLREQJFK.js";
+import "./chunk-P74TZRXD.js";
+import "./chunk-KJZ26VBX.js";
+import "./chunk-VDS2WYM5.js";
 import "./chunk-V6WHFGST.js";
 import {
   CHANNEL_STARTUP_PROFILE_META_KEY,
@@ -194,7 +194,7 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import {
@@ -205,11 +205,11 @@ import {
   isValidExternalToolGuardDenialReason
 } from "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-XC2VAFVZ.js";
-import "./chunk-WUC6ZFXO.js";
+import "./chunk-UVX4Y6IN.js";
+import "./chunk-ZWBUH5UP.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS
-} from "./chunk-DIEFUBV6.js";
+} from "./chunk-DIWZNWZT.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -218,7 +218,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-3UOLYNTF.js";
+} from "./chunk-4QJJHIZ5.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -226,7 +226,7 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-PPUOYL77.js";
+} from "./chunk-77WOUGCA.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -234,19 +234,19 @@ import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-KHUA3NQV.js";
+} from "./chunk-TAOSTUHI.js";
 import {
   reloadEnvironment
-} from "./chunk-RK2EE3T7.js";
-import "./chunk-6PEXNQTX.js";
-import "./chunk-JE44IPH6.js";
-import "./chunk-YMBOEAF4.js";
+} from "./chunk-KPMB4JEZ.js";
+import "./chunk-ALFTV7GA.js";
+import "./chunk-SDUDZNF4.js";
+import "./chunk-Z6W3XDLN.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ACZRB7AD.js";
+} from "./chunk-3ARO4N5G.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -255,6 +255,7 @@ import {
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
   ExtensionManager,
+  GLOBAL_DUPLICATE_THRESHOLD,
   IMAGE_CAPABILITY,
   InvalidMcpConfigError,
   InvalidSessionTranscriptCursorError,
@@ -308,12 +309,14 @@ import {
   dedupeToolCallsById,
   detectAutonomousSentinel,
   detectLoopSentinel,
+  didWriteProjectContextFile,
   encodeSessionTranscriptCursor,
   evaluateAutoMode,
   evaluatePermissionFlow,
   evaluatePlanModeShellPolicy,
   evaluateToolInvocationGuard,
   finalizeToolResponses,
+  findBoundaryAtOrBefore,
   findExistingProviderModels,
   findPlanModeEntryBatchBoundaryIndex,
   findProviderById,
@@ -339,11 +342,13 @@ import {
   getProviderToolCallId,
   getScopedEnvContents,
   getStopHookContinuationReason,
+  getToolCallRepeatKey,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
   isDenialFallbackReason,
   isGatedMcpScope,
   isPlanModeBlocked,
+  isReplayTurnStartType,
   markDuplicateProviderToolCallResponseSent,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
@@ -368,6 +373,7 @@ import {
   shouldFallback,
   shouldFirePermissionDeniedForAutoMode,
   shouldForceAutoModeReviewForAllow,
+  shouldHaltOnTurnToolCallCap,
   shouldRunAutoModeForCall,
   subagentGenerator,
   unregisterGoalHook,
@@ -375,25 +381,25 @@ import {
   validatePlanModeShellApproval,
   validatePlanModeShellContext,
   wrapUserPromptSubmitContext
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
-import "./chunk-Z7JILXGX.js";
-import "./chunk-T5U6IM4C.js";
-import "./chunk-TSERKWCX.js";
-import "./chunk-33FNCQSY.js";
+import "./chunk-2UUMVNYT.js";
+import "./chunk-MVUQRLOH.js";
+import "./chunk-XCWO3SMQ.js";
+import "./chunk-7MH4J33A.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-DIT4V3XH.js";
+import "./chunk-RGTB44BO.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-MOHAWIAW.js";
-import "./chunk-3PRJYMXC.js";
+import "./chunk-GNPNYXJB.js";
+import "./chunk-HUWENAHO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -401,56 +407,58 @@ import {
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-4S4OEQ6U.js";
+import "./chunk-J6SZID63.js";
 import "./chunk-KRXPRVGL.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-A5YZ3FA2.js";
-import "./chunk-YAVY33G4.js";
-import "./chunk-2UISUFHQ.js";
-import "./chunk-MBEMTXQT.js";
+} from "./chunk-GM463R2B.js";
+import "./chunk-SEZ556DZ.js";
+import "./chunk-CJXIIILK.js";
+import "./chunk-3K7FH2KQ.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-WAUGQKUU.js";
+import "./chunk-REHWPCG2.js";
+import {
+  addToolArgumentsAttributes,
+  addToolCallResultAttributes,
+  extractDaemonTraceContext,
+  registerAcpEventLoopLagGauge,
+  startEventLoopLagMonitor,
+  withDaemonSpan
+} from "./chunk-L4N6TIP7.js";
+import "./chunk-SAH4BD2J.js";
 import {
-  APPROVAL_MODES,
   runWithRuntimeContentGenerator
-} from "./chunk-6WBWIPBF.js";
+} from "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
+import "./chunk-2J3OJGTL.js";
 import {
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-WVAESIM6.js";
+} from "./chunk-IA7TGCN2.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
-import "./chunk-432XCUHF.js";
-import "./chunk-HU5TUALO.js";
+import "./chunk-EQL65XGA.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-XC656O42.js";
+} from "./chunk-22NBYCPD.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-QYPT3QUD.js";
-import "./chunk-QMBEW7EW.js";
+import "./chunk-3ULCB3NE.js";
+import "./chunk-BGG4MBYD.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-M6HMMKVG.js";
 import "./chunk-DGEIYUC3.js";
 import "./chunk-MPHPFVKK.js";
-import "./chunk-GLNBDYUX.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-QZKYZCN3.js";
-import {
-  addToolArgumentsAttributes,
-  addToolCallResultAttributes,
-  extractDaemonTraceContext,
-  registerAcpEventLoopLagGauge,
-  startEventLoopLagMonitor,
-  withDaemonSpan
-} from "./chunk-MGSSJT27.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-6O5DVH27.js";
+import "./chunk-AXMWHKXA.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
-import "./chunk-2DNKEBXY.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-EI3HZX6C.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -481,33 +489,34 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-PX5DNLSA.js";
+} from "./chunk-XCG76UE6.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-E4WHKETF.js";
-import "./chunk-ZPPP6VCL.js";
+} from "./chunk-FVKHVJZQ.js";
+import "./chunk-6ZRFAKXK.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolConfirmationOutcome,
   ToolNames,
+  canonicalToolName,
   isShellProgressData
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-PYQADEFD.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-BOGOR4HB.js";
+} from "./chunk-P7HUJDBZ.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-ZBVS26BY.js";
-import "./chunk-BFHXDAR7.js";
-import "./chunk-TYERNYH4.js";
-import "./chunk-UH7Z7Y45.js";
+import "./chunk-KKBPOU75.js";
+import "./chunk-EUNWC2VS.js";
+import "./chunk-FOGU3LJX.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -516,7 +525,7 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-5L6CQ4ZU.js";
+} from "./chunk-6M26GBKX.js";
 import "./chunk-W4RQUHY3.js";
 import "./chunk-LKRMNRSN.js";
 import {
@@ -525,12 +534,12 @@ import {
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-VSALQLT7.js";
+import "./chunk-TSYIQDG7.js";
 import {
   runExitCleanup
-} from "./chunk-RHTTKJTP.js";
+} from "./chunk-ZQGHESAS.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -2361,6 +2370,8 @@ function createDaemonToolLoopState() {
   return {
     totalToolCalls: 0,
     invalidToolParamErrors: /* @__PURE__ */ new Map(),
+    toolCallKeyCounts: /* @__PURE__ */ new Map(),
+    maxToolCallKeyRepeat: 0,
     loopDetected: false
   };
 }
@@ -2381,18 +2392,42 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
   return true;
 }
 __name(recordDaemonLoopDetected, "recordDaemonLoopDetected");
-function recordDaemonToolCalls(config, promptId, loopState, count) {
+function recordDaemonToolCalls(config, promptId, loopState, calls) {
   if (!loopState || loopState.loopDetected)
     return loopState?.loopDetected ?? false;
-  loopState.totalToolCalls += count;
-  if (loopState.totalToolCalls <= config.getMaxToolCallsPerTurn()) return false;
-  return recordDaemonLoopDetected(
-    config,
-    promptId,
-    "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */,
-    `Stopping ACP turn after ${loopState.totalToolCalls} tool calls in one turn.`,
-    loopState
-  );
+  loopState.totalToolCalls += calls.length;
+  for (const call of calls) {
+    const key = getToolCallRepeatKey(call.name ?? "", call.args ?? {});
+    const count = (loopState.toolCallKeyCounts.get(key) ?? 0) + 1;
+    loopState.toolCallKeyCounts.set(key, count);
+    if (count > loopState.maxToolCallKeyRepeat) {
+      loopState.maxToolCallKeyRepeat = count;
+    }
+  }
+  if (shouldHaltOnTurnToolCallCap(
+    loopState.totalToolCalls,
+    loopState.maxToolCallKeyRepeat,
+    config.getMaxToolCallsPerTurn(),
+    config.isMaxToolCallsPerTurnExplicit()
+  )) {
+    return recordDaemonLoopDetected(
+      config,
+      promptId,
+      "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */,
+      `Stopping ACP turn after ${loopState.totalToolCalls} tool calls in one turn.`,
+      loopState
+    );
+  }
+  if (!config.getSkipLoopDetection() && loopState.maxToolCallKeyRepeat >= GLOBAL_DUPLICATE_THRESHOLD) {
+    return recordDaemonLoopDetected(
+      config,
+      promptId,
+      "global_tool_call_duplicate" /* GLOBAL_TOOL_CALL_DUPLICATE */,
+      `Stopping ACP turn after the same tool call repeated ${loopState.maxToolCallKeyRepeat} times.`,
+      loopState
+    );
+  }
+  return false;
 }
 __name(recordDaemonToolCalls, "recordDaemonToolCalls");
 function recordDaemonInvalidToolParams(config, promptId, loopState, toolName, error) {
@@ -2912,6 +2947,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  refreshContextFilesOnWrite = false;
   activeTodoWorkChainPromptId;
   createdAt = Date.now();
   /**
@@ -4318,6 +4354,9 @@ var Session = class {
             );
             const inputText = firstTextBlock?.text || "";
             const isSlashInput = !isContinue && isSlashCommand(inputText);
+            if (!isSlashInput && !isContinue && !isRetry) {
+              this.refreshContextFilesOnWrite = false;
+            }
             let parts;
             let fullTurnModelOverride;
             const onFullTurnModel = /* @__PURE__ */ __name((model) => {
@@ -7228,27 +7267,6 @@ ${this.pendingRecoveredAgentsNotice}
       }
       return part;
     }, "recordSkippedToolCall");
-    if (recordDaemonToolCalls(
-      this.config,
-      promptId,
-      toolLoopState,
-      dedupedFunctionCalls.length
-    )) {
-      return await finalizeRunToolResult({
-        parts: await Promise.all(
-          dedupedFunctionCalls.map(
-            (fc) => recordSkippedToolCall(
-              fc,
-              LOOP_DETECTED_SKIP_MESSAGE,
-              false,
-              "unknown" /* UNKNOWN */
-            )
-          )
-        ),
-        stopAfterPermissionCancel: false,
-        loopDetected: true
-      });
-    }
     const batches = [];
     const handledProviderToolCallIds = new Set(
       this.#getCurrentChat().getHistoryFunctionResponseIds()
@@ -7358,7 +7376,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         handledProviderToolCallIds.add(providerCallId);
       }
-      const isAgent = fc.name === ToolNames.AGENT;
+      const isAgent = canonicalToolName(fc.name ?? "") === ToolNames.AGENT;
       const last = batches[batches.length - 1];
       if (isAgent && last?.kind === "execute" && last.concurrent) {
         last.calls.push(fc);
@@ -7369,6 +7387,27 @@ ${this.pendingRecoveredAgentsNotice}
     const executableCalls = batches.flatMap(
       (batch) => batch.kind === "execute" ? batch.calls : []
     );
+    if (recordDaemonToolCalls(
+      this.config,
+      promptId,
+      toolLoopState,
+      executableCalls
+    )) {
+      return await finalizeRunToolResult({
+        parts: await Promise.all(
+          dedupedFunctionCalls.map(
+            (fc) => recordSkippedToolCall(
+              fc,
+              LOOP_DETECTED_SKIP_MESSAGE,
+              false,
+              "unknown" /* UNKNOWN */
+            )
+          )
+        ),
+        stopAfterPermissionCancel: false,
+        loopDetected: true
+      });
+    }
     const planModeEntryBoundaryIndex = findPlanModeEntryBatchBoundaryIndex(
       executableCalls.map((call) => call.name)
     );
@@ -7391,20 +7430,35 @@ ${this.pendingRecoveredAgentsNotice}
       await refreshMemoryAfterManagedWrite(this.config, memoryWriteCandidates, {
         logContext: `ACP session ${this.sessionId} memory tool batch`
       });
+      if (!this.refreshContextFilesOnWrite) {
+        return;
+      }
+      const matchedContextFileWrite = didWriteProjectContextFile(
+        memoryWriteCandidates,
+        this.config.getProjectRoot()
+      );
+      debugLogger5.debug(
+        `ACP session ${this.sessionId} checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
+      );
+      if (!matchedContextFileWrite) {
+        return;
+      }
+      debugLogger5.debug(
+        `ACP session ${this.sessionId} refreshing memory after context-file memory write`
+      );
+      await refreshMemoryInstruction(this.config, {
+        logContext: `ACP session ${this.sessionId} context-file memory tool batch`
+      });
     }, "refreshMemoryIfNeeded");
-    const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterPermissionCancel, onStopAfterLoopDetected, shouldSkipUnstarted) => {
-      const configuredMaxConcurrency = parsePositiveIntegerEnv(
+    const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterPermissionCancel, shouldSkipUnstarted) => {
+      const maxConcurrency = parsePositiveIntegerEnv(
         process.env["QWEN_CODE_MAX_TOOL_CONCURRENCY"],
         10
       );
-      const maxConcurrency = toolLoopState ? Math.min(
-        configuredMaxConcurrency,
-        DAEMON_INVALID_TOOL_PARAMS_THRESHOLD
-      ) : configuredMaxConcurrency;
       const results = new Array(calls.length);
       const executing = /* @__PURE__ */ new Set();
-      const fillLoopSkippedFrom = /* @__PURE__ */ __name(async (startIndex2) => {
-        for (let i = startIndex2; i < calls.length; i++) {
+      const fillLoopSkippedFrom = /* @__PURE__ */ __name(async (startIndex) => {
+        for (let i = startIndex; i < calls.length; i++) {
           if (results[i]) continue;
           results[i] = {
             parts: [
@@ -7420,49 +7474,8 @@ ${this.pendingRecoveredAgentsNotice}
           };
         }
       }, "fillLoopSkippedFrom");
-      const fillPermissionSkippedFrom = /* @__PURE__ */ __name(async (startIndex2) => {
-        for (let i = startIndex2; i < calls.length; i++) {
-          if (results[i]) continue;
-          results[i] = {
-            parts: [await recordSkippedToolCall(calls[i])],
-            stopAfterPermissionCancel: false
-          };
-        }
-      }, "fillPermissionSkippedFrom");
-      let startIndex = 0;
-      if (toolLoopState && calls.length > DAEMON_INVALID_TOOL_PARAMS_THRESHOLD) {
-        startIndex = DAEMON_INVALID_TOOL_PARAMS_THRESHOLD;
-        for (let i = 0; i < startIndex; i++) {
-          if (runAbortSignal.aborted && shouldSkipUnstarted?.()) {
-            results[i] = {
-              parts: [await recordSkippedToolCall(calls[i])],
-              stopAfterPermissionCancel: false
-            };
-            continue;
-          }
-          const r = await this.runTool(
-            runAbortSignal,
-            promptId,
-            calls[i],
-            onStopAfterPermissionCancel,
-            toolLoopState,
-            recordSkippedToolCall,
-            queueToolResultRecord,
-            executionCallIds.get(calls[i]),
-            onFullTurnModel
-          );
-          results[i] = r;
-          if (r.loopDetected) {
-            await fillLoopSkippedFrom(i + 1);
-            return results;
-          }
-          if (r.stopAfterPermissionCancel) {
-            await fillPermissionSkippedFrom(i + 1);
-            return results;
-          }
-        }
-      }
-      for (let i = startIndex; i < calls.length; i++) {
+      let warnedWaitingForInFlight = false;
+      for (let i = 0; i < calls.length; i++) {
         const idx = i;
         if (toolLoopState?.loopDetected) {
           await fillLoopSkippedFrom(idx);
@@ -7487,6 +7500,12 @@ ${this.pendingRecoveredAgentsNotice}
           onFullTurnModel
         ).then((r) => {
           results[idx] = r;
+          if (r.loopDetected && executing.size > 1 && !warnedWaitingForInFlight) {
+            warnedWaitingForInFlight = true;
+            debugLogger5.warn(
+              `Loop detection stopped this ACP turn; waiting for ${executing.size - 1} in-flight tool call(s) to settle before returning.`
+            );
+          }
         }).finally(() => {
           executing.delete(p);
         });
@@ -7494,7 +7513,6 @@ ${this.pendingRecoveredAgentsNotice}
         if (executing.size >= maxConcurrency) {
           await Promise.race(executing);
           if (results.some((result) => result?.loopDetected)) {
-            onStopAfterLoopDetected?.();
             await Promise.all(executing);
             await fillLoopSkippedFrom(idx + 1);
             return results;
@@ -7505,7 +7523,6 @@ ${this.pendingRecoveredAgentsNotice}
           if (invalidToolErrorNearThreshold && executing.size > 0) {
             await Promise.all(executing);
             if (results.some((result) => result?.loopDetected)) {
-              onStopAfterLoopDetected?.();
               await fillLoopSkippedFrom(idx + 1);
               return results;
             }
@@ -7559,7 +7576,6 @@ ${this.pendingRecoveredAgentsNotice}
               batch.calls,
               batchAbortController.signal,
               stopBatchAfterPermissionCancel,
-              () => batchAbortController.abort("loop_detected"),
               () => batchStopAfterPermissionCancel
             );
           } finally {
@@ -9122,6 +9138,7 @@ ${this.pendingRecoveredAgentsNotice}
    */
   async #processSlashCommandResult(result, originalPrompt, abortSignal, onFullTurnModel) {
     this.#emitGoalStatusItems(result);
+    this.refreshContextFilesOnWrite = result.type === "submit_prompt" && Boolean(result.refreshContextFilesOnWrite);
     switch (result.type) {
       case "submit_prompt":
         return this.#applyBridgeConversionsIfNeeded(
@@ -9996,9 +10013,24 @@ function getLoadReplayPageSize(params) {
 }
 __name(getLoadReplayPageSize, "getLoadReplayPageSize");
 function isHistoryTurnStart(record) {
-  return record.type === "user" && record.subtype !== "mid_turn_user_message";
+  return isReplayTurnStartType(record.type, record.subtype);
 }
 __name(isHistoryTurnStart, "isHistoryTurnStart");
+function isHistoryPageStart(record) {
+  return record.subtype !== "realtime_message" && (record.type === "assistant" || isHistoryTurnStart(record));
+}
+__name(isHistoryPageStart, "isHistoryPageStart");
+function historyOrphansToolResult(records, start, end) {
+  for (let i = start; i < end; i++) {
+    if (records[i].type !== "tool_result") continue;
+    for (let owner = i - 1; owner >= start; owner--) {
+      if (isHistoryPageStart(records[owner])) return false;
+    }
+    return true;
+  }
+  return false;
+}
+__name(historyOrphansToolResult, "historyOrphansToolResult");
 function selectRecentHistoryRecords(records, pageSize) {
   if (pageSize === void 0 || records.length <= pageSize) {
     return { records, hasMore: false };
@@ -10010,8 +10042,27 @@ function selectRecentHistoryRecords(records, pageSize) {
       break;
     }
   }
-  while (start > 0 && !isHistoryTurnStart(records[start])) {
-    start--;
+  const expansionFloor = Math.max(0, records.length - 2 * pageSize);
+  const aligned = findBoundaryAtOrBefore(
+    records,
+    start,
+    expansionFloor,
+    isHistoryTurnStart
+  );
+  if (isHistoryTurnStart(records[aligned])) {
+    start = aligned;
+  }
+  if (start > 0 && historyOrphansToolResult(records, start, records.length)) {
+    const pairFloor = Math.max(0, start - pageSize);
+    const owner = findBoundaryAtOrBefore(
+      records,
+      start,
+      pairFloor,
+      isHistoryPageStart
+    );
+    if (isHistoryPageStart(records[owner])) {
+      start = owner;
+    }
   }
   return { records: records.slice(start), hasMore: start > 0 };
 }
@@ -12727,7 +12778,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.6";
+    const version = "0.21.7-nightly.20260808.4ec0371e6";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {