@qwen-code/qwen-code 0.21.7 → 0.21.8-nightly.20260810.55e20db328

package/chunks/{chunk-W4B7UBUS.js → chunk-VHXPSL57.js}

@@ -7,22 +7,22 @@ import {
   parseAcpBaseModelId,
   resolveCliGenerationConfig,
   sanitizeProviderBaseUrl
-} from "./chunk-CSZEXZBE.js";
+} from "./chunk-HWXGX534.js";
 import {
   snapshotProcessEnv
-} from "./chunk-TYKC75AX.js";
+} from "./chunk-OR6R3IUW.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-NLREQJFK.js";
+} from "./chunk-DA4HRSBW.js";
 import {
   loadSettings
-} from "./chunk-PQBHU2IA.js";
+} from "./chunk-HKI3KHAO.js";
 import {
   ModelsConfig
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-47ZUMGGY.js";
 import {
   APPROVAL_MODES
-} from "./chunk-BVWVWGLE.js";
+} from "./chunk-WAUGQKUU.js";
 import {
   tokenLimit
 } from "./chunk-ZBVS26BY.js";

package/chunks/{chunk-WUC6ZFXO.js → chunk-VKJ4KTPJ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getGlobalQwenDir
-} from "./chunk-DIEFUBV6.js";
+} from "./chunk-DX3RGJMS.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-MAJS7AT4.js → chunk-VNNWAZSI.js}

@@ -16,7 +16,7 @@ import {
   MODIFIER_SHIFT_BIT,
   MODIFIER_SUPER_BIT,
   clipboardHasImage
-} from "./chunk-YHEEE624.js";
+} from "./chunk-NV3F44FL.js";
 import {
   noteInteraction
 } from "./chunk-KW7NOTN6.js";
@@ -33,7 +33,7 @@ import {
 import {
   KittySequenceOverflowEvent,
   logKittySequenceOverflow
-} from "./chunk-2U3WZGZG.js";
+} from "./chunk-YGT2AUJ7.js";
 import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";

package/chunks/{chunk-BVWVWGLE.js → chunk-WAUGQKUU.js}

@@ -1,15 +1,15 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  getCurrentAgentId
+} from "./chunk-CPG6P4GG.js";
 import {
   getTeammateContext,
   isTeammate
 } from "./chunk-S6LOFUVP.js";
-import {
-  isInForkExecution
-} from "./chunk-LZC3B5N2.js";
 import {
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -29,57 +29,6 @@ var ApprovalMode = /* @__PURE__ */ ((ApprovalMode2) => {
 })(ApprovalMode || {});
 var APPROVAL_MODES = Object.values(ApprovalMode);
 
-// packages/core/src/agents/runtime/agent-context.ts
-init_esbuild_shims();
-import { AsyncLocalStorage } from "node:async_hooks";
-var storage = new AsyncLocalStorage();
-function runWithAgentContext(agentId, fn, depthOverride) {
-  const current = storage.getStore() ?? {};
-  const depth = depthOverride ?? (current.depth ?? -1) + 1;
-  return storage.run({ ...current, agentId, depth }, fn);
-}
-__name(runWithAgentContext, "runWithAgentContext");
-function runWithRuntimeContentGenerator(view, fn) {
-  const current = storage.getStore() ?? {};
-  return storage.run({ ...current, runtimeView: view }, fn);
-}
-__name(runWithRuntimeContentGenerator, "runWithRuntimeContentGenerator");
-function getCurrentAgentId() {
-  return storage.getStore()?.agentId ?? null;
-}
-__name(getCurrentAgentId, "getCurrentAgentId");
-function getCurrentAgentDepth() {
-  return storage.getStore()?.depth ?? 0;
-}
-__name(getCurrentAgentDepth, "getCurrentAgentDepth");
-function getRuntimeContentGenerator() {
-  return storage.getStore()?.runtimeView;
-}
-__name(getRuntimeContentGenerator, "getRuntimeContentGenerator");
-function runOutsideAgentContext(fn) {
-  return storage.exit(fn);
-}
-__name(runOutsideAgentContext, "runOutsideAgentContext");
-function isTopLevelSession() {
-  return getCurrentAgentId() === null;
-}
-__name(isTopLevelSession, "isTopLevelSession");
-function childLaunchDepth() {
-  return getCurrentAgentId() !== null ? getCurrentAgentDepth() + 1 : 0;
-}
-__name(childLaunchDepth, "childLaunchDepth");
-function canSpawnNestedAgent(maxDepth) {
-  return childLaunchDepth() + 1 <= maxDepth;
-}
-__name(canSpawnNestedAgent, "canSpawnNestedAgent");
-function spawnBlockReason(maxDepth) {
-  if (!canSpawnNestedAgent(maxDepth)) return "depth";
-  if (isTeammate()) return "teammate";
-  if (isInForkExecution()) return "fork";
-  return null;
-}
-__name(spawnBlockReason, "spawnBlockReason");
-
 // packages/core/src/agents/runtime/subagent-plan-tool-policy.ts
 init_esbuild_shims();
 var SUBAGENT_PLAN_LIFECYCLE_TOOLS = /* @__PURE__ */ new Set([
@@ -188,15 +137,6 @@ __name(buildSubagentPlanToolBlockedResult, "buildSubagentPlanToolBlockedResult")
 
 export {
   APPROVAL_MODES,
-  runWithAgentContext,
-  runWithRuntimeContentGenerator,
-  getCurrentAgentId,
-  getCurrentAgentDepth,
-  getRuntimeContentGenerator,
-  runOutsideAgentContext,
-  isTopLevelSession,
-  childLaunchDepth,
-  spawnBlockReason,
   SUBAGENT_PLAN_LIFECYCLE_TOOLS,
   isSubagentLikeExecutionContext,
   isPlanRequiredTeammateContext,

package/chunks/{chunk-OH2VKQXH.js → chunk-WH6QMLUW.js}

@@ -17,11 +17,11 @@ import {
 import {
   collectInlineImages,
   extractInlineContentRuns
-} from "./chunk-2VSTGY6M.js";
+} from "./chunk-PJRW65JO.js";
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-KXSDEOFU.js";
+} from "./chunk-3KJQZEN3.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -33,21 +33,22 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   t
-} from "./chunk-DBOFL3LQ.js";
+} from "./chunk-BL65MO72.js";
 import {
   getToolResponseDisplayText,
-  stripTrailingUserPromptSubmitContextPart
-} from "./chunk-Y7E5LNLO.js";
+  isGoalCheckpointBookkeepingRecord
+} from "./chunk-47ZUMGGY.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import {
   GoalPersistenceUnavailableError,
-  parseGoalStateRecordPayloadV2
-} from "./chunk-3K7FH2KQ.js";
+  parseGoalStateRecordPayloadV2,
+  projectUserTranscriptForDisplay
+} from "./chunk-67N6HB5H.js";
 import {
   ToolDisplayNames
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2895,6 +2896,7 @@ init_esbuild_shims();
 function shouldDisplayGoalStateCause(cause) {
   switch (cause) {
     case "turn_finished":
+    case "checkpoint":
     case "verifier_accept":
       return false;
     case "verifier_reject":
@@ -2926,17 +2928,6 @@ async function waitForGoalRuntime(config) {
 __name(waitForGoalRuntime, "waitForGoalRuntime");
 
 // packages/cli/src/ui/utils/resumeHistoryUtils.ts
-function extractUserRecordDisplayText(record) {
-  const payload = record.systemPayload;
-  if (payload?.displayText) {
-    return payload.displayText;
-  }
-  const parts = record.message?.parts ?? [];
-  return extractTextFromParts([
-    ...stripTrailingUserPromptSubmitContextPart(parts)
-  ]);
-}
-__name(extractUserRecordDisplayText, "extractUserRecordDisplayText");
 function extractTextFromParts(parts) {
   if (!parts) return "";
   const textParts = [];
@@ -3024,6 +3015,8 @@ function convertToHistoryItems(conversation, config, historyGaps) {
   const gapByChildUuid = indexGapsByChild(historyGaps);
   const pendingAtCommands = [];
   let atCommandCounter = 0;
+  let lastGoalStateSnapshot;
+  let lastGoalStateCause;
   const pendingToolCalls = /* @__PURE__ */ new Map();
   let currentToolGroup = [];
   const buildAtCommandDisplays = /* @__PURE__ */ __name((payload) => {
@@ -3075,21 +3068,33 @@ function convertToHistoryItems(conversation, config, historyGaps) {
         currentToolGroup = [];
       }
       pendingAtCommands.length = 0;
+      lastGoalStateSnapshot = void 0;
+      lastGoalStateCause = void 0;
       items.push(createHistoryGapItem(gap));
     }
     if (record.type === "system") {
       if (record.subtype === "goal_state") {
         const payload = parseGoalStateRecordPayloadV2(record.systemPayload);
-        if (payload && shouldDisplayGoalStateCause(payload.cause)) {
-          if (currentToolGroup.length > 0) {
-            items.push({ type: "tool_group", tools: [...currentToolGroup] });
-            currentToolGroup = [];
-          }
-          items.push({
-            type: "goal_state",
-            snapshot: payload.snapshot,
-            cause: payload.cause
+        if (payload) {
+          const bookkeepingOnly = isGoalCheckpointBookkeepingRecord({
+            cause: payload.cause,
+            previousCause: lastGoalStateCause,
+            previous: lastGoalStateSnapshot,
+            next: payload.snapshot
           });
+          lastGoalStateCause = payload.cause;
+          lastGoalStateSnapshot = payload.snapshot;
+          if (shouldDisplayGoalStateCause(payload.cause) && !bookkeepingOnly) {
+            if (currentToolGroup.length > 0) {
+              items.push({ type: "tool_group", tools: [...currentToolGroup] });
+              currentToolGroup = [];
+            }
+            items.push({
+              type: "goal_state",
+              snapshot: payload.snapshot,
+              cause: payload.cause
+            });
+          }
         }
         continue;
       }
@@ -3158,7 +3163,8 @@ function convertToHistoryItems(conversation, config, historyGaps) {
             currentToolGroup = [];
           }
           const payload = pendingAtCommands.shift();
-          const text2 = payload.userText || extractUserRecordDisplayText(record);
+          const projection2 = projectUserTranscriptForDisplay(record);
+          const text2 = payload.userText || (projection2.displayText ?? extractTextFromParts(projection2.parts));
           if (text2) {
             items.push({ type: "user", text: text2 });
           }
@@ -3178,7 +3184,8 @@ function convertToHistoryItems(conversation, config, historyGaps) {
           });
           currentToolGroup = [];
         }
-        const text = extractUserRecordDisplayText(record);
+        const projection = projectUserTranscriptForDisplay(record);
+        const text = projection.displayText ?? extractTextFromParts(projection.parts);
         if (text) {
           items.push({ type: "user", text });
         }

package/chunks/{chunk-PJOBIWUG.js → chunk-WQYWK4DG.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   registerCleanup
-} from "./chunk-EORNAQDT.js";
+} from "./chunk-RQ6U2JJQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-LEMXGVEP.js → chunk-YFRFZCIP.js}

@@ -2,17 +2,17 @@
 "use strict";
 import {
   performStandaloneUpdate
-} from "./chunk-GSS34377.js";
+} from "./chunk-ZI5IH2HP.js";
 import {
   updateEventEmitter
 } from "./chunk-YAF2MQZ6.js";
 import {
   t
-} from "./chunk-DBOFL3LQ.js";
+} from "./chunk-BL65MO72.js";
 import {
   getInstallationInfo,
   resolveUpdateCommand
-} from "./chunk-HYRDKNUY.js";
+} from "./chunk-2545EHZR.js";
 import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";

package/chunks/{chunk-2U3WZGZG.js → chunk-YGT2AUJ7.js}

@@ -9,20 +9,19 @@ import {
 import {
   isAnyAutoMemPath
 } from "./chunk-FVKHVJZQ.js";
+import {
+  runSideQuery
+} from "./chunk-COBO5EBO.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-NG2R4N5O.js";
+} from "./chunk-6ZRFAKXK.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
-  SchemaValidator,
   StructuredToolError,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
-import {
-  DEFAULT_QWEN_MODEL
-} from "./chunk-6EOI4HOK.js";
+} from "./chunk-PYQADEFD.js";
 import {
   estimateTextTokens,
   generateLegacyMcpToolName,
@@ -51,11 +50,12 @@ import {
   recordMemoryRecallDeliveryMetrics,
   recordMemoryRecallMetrics,
   recordModelSlashCommand,
+  recordRepeatedToolFailureGuardMetrics,
   recordSubagentExecutionMetrics,
   recordTokenUsageMetrics,
   recordToolCallMetrics,
   recordToolExecutionMetrics
-} from "./chunk-6M26GBKX.js";
+} from "./chunk-L2AFWWJE.js";
 import {
   require_src,
   safeJsonStringify
@@ -90,6 +90,7 @@ import {
   EVENT_NEXT_SPEAKER_CHECK,
   EVENT_PROMPT_SUGGESTION,
   EVENT_PROTOCOL_TAG_SANITIZED,
+  EVENT_REPEATED_TOOL_FAILURE_GUARD,
   EVENT_RIPGREP_FALLBACK,
   EVENT_RIPGREP_RUNTIME_RECOVERY,
   EVENT_SKILL_LAUNCH,
@@ -104,7 +105,7 @@ import {
   EVENT_WORKFLOW_KEYWORD,
   EVENT_WORKFLOW_RUN,
   SERVICE_NAME
-} from "./chunk-LKRMNRSN.js";
+} from "./chunk-PDPFQ2FO.js";
 import {
   Storage,
   createDebugLogger,
@@ -13123,8 +13124,10 @@ function logApiResponse(config, event) {
   });
 }
 __name(logApiResponse, "logApiResponse");
-function logLoopDetected(config, event) {
-  QwenLogger.getInstance(config)?.logLoopDetectedEvent(event);
+function logLoopDetected(config, event, options = {}) {
+  if (options.recordToQwenLogger !== false) {
+    QwenLogger.getInstance(config)?.logLoopDetectedEvent(event);
+  }
   if (!isTelemetrySdkInitialized()) return;
   const attributes = {
     ...getCommonAttributes(config),
@@ -13138,6 +13141,36 @@ function logLoopDetected(config, event) {
   logger.emit(logRecord);
 }
 __name(logLoopDetected, "logLoopDetected");
+function logRepeatedToolFailureGuard(event) {
+  runToolTelemetrySink(() => {
+    if (isTelemetrySdkInitialized()) {
+      const logger = import_api_logs.logs.getLogger(SERVICE_NAME);
+      logger.emit({
+        body: `Repeated tool failure guard decision: ${event.decision}.`,
+        attributes: {
+          ...event,
+          "event.name": EVENT_REPEATED_TOOL_FAILURE_GUARD
+        }
+      });
+    }
+  });
+  runToolTelemetrySink(() => {
+    recordRepeatedToolFailureGuardMetrics({
+      route: event.route,
+      mode: event.mode,
+      phase_before: event.phase_before,
+      phase_after: event.phase_after,
+      decision: event.decision,
+      failure_count_bucket: event.failure_count_bucket,
+      batch_count_bucket: event.batch_count_bucket,
+      ...event.reset_reason !== void 0 ? { reset_reason: event.reset_reason } : {},
+      ...event.terminal_status !== void 0 ? { terminal_status: event.terminal_status } : {},
+      ...event.execution_status !== void 0 ? { execution_status: event.execution_status } : {},
+      ...event.tool_type !== void 0 ? { tool_type: event.tool_type } : {}
+    });
+  });
+}
+__name(logRepeatedToolFailureGuard, "logRepeatedToolFailureGuard");
 function logLoopDetectionDisabled(config, _event) {
   QwenLogger.getInstance(config)?.logLoopDetectionDisabledEvent();
 }
@@ -14791,17 +14824,21 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
    * keeping every other field (including the shared underlying
    * `CallableTool` / MCP transport) identical.
    *
-   * pool path: a single shared pool entry produces one
-   * `DiscoveredMCPTool` snapshot; each `SessionMcpView` clones with
-   * its own per-session trust before registering into its session's
-   * `ToolRegistry`. Without this clone, mutating `trust` on the shared
-   * instance would cross-contaminate sessions.
-   *
-   * Trust is the only field that legitimately varies per session;
-   * everything else (transport, schema, name) is transport-level.
+   * Kept as the trust-only convenience used by non-pool callers. Pooled
+   * session views use `withSessionConfig` because eager loading can differ
+   * between sessions too.
    */
   withTrust(trust) {
-    if (trust === this.trust) return this;
+    return this.withSessionConfig(trust, this.alwaysLoad);
+  }
+  /**
+   * Return a per-session projection of metadata that does not belong to the
+   * shared MCP transport snapshot. Pool entries can be shared by sessions
+   * whose trust and eager-loading settings differ, so neither field may be
+   * mutated on the canonical tool instance.
+   */
+  withSessionConfig(trust, alwaysLoad) {
+    if (trust === this.trust && alwaysLoad === this.alwaysLoad) return this;
     return new _DiscoveredMCPTool(
       this.mcpTool,
       this.serverName,
@@ -14819,7 +14856,7 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
       this.mcpTimeout,
       this.mcpToolIdleTimeoutMs,
       this.annotations,
-      this.alwaysLoad,
+      alwaysLoad,
       this.allowInvocationContext
     );
   }
@@ -15311,6 +15348,50 @@ var LoopDetectedEvent = class {
     this.prompt_id = prompt_id;
   }
 };
+var RepeatedToolFailureGuardEvent = class {
+  static {
+    __name(this, "RepeatedToolFailureGuardEvent");
+  }
+  "event.name";
+  "event.timestamp";
+  prompt_id;
+  route;
+  mode;
+  phase_before;
+  phase_after;
+  decision;
+  failure_count_bucket;
+  batch_count_bucket;
+  candidate_ordinal;
+  constructor(params) {
+    this["event.name"] = "repeated_tool_failure_guard";
+    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
+    this.prompt_id = params.prompt_id;
+    this.route = params.route;
+    this.mode = params.mode;
+    this.phase_before = params.phase_before;
+    this.phase_after = params.phase_after;
+    this.decision = params.decision;
+    this.failure_count_bucket = params.failure_count_bucket;
+    this.batch_count_bucket = params.batch_count_bucket;
+    this.candidate_ordinal = params.candidate_ordinal;
+    if (params.reset_reason !== void 0) {
+      this.reset_reason = params.reset_reason;
+    }
+    if (params.terminal_status !== void 0) {
+      this.terminal_status = params.terminal_status;
+    }
+    if (params.execution_status !== void 0) {
+      this.execution_status = params.execution_status;
+    }
+    if (params.execution_error_type !== void 0) {
+      this.execution_error_type = params.execution_error_type;
+    }
+    if (params.tool_type !== void 0) {
+      this.tool_type = params.tool_type;
+    }
+  }
+};
 var LoopDetectionDisabledEvent = class {
   static {
     __name(this, "LoopDetectionDisabledEvent");
@@ -16107,120 +16188,6 @@ __name(getFileReadDefaultPermission, "getFileReadDefaultPermission");
 
 // packages/core/src/services/visionBridge/vision-bridge-service.ts
 init_esbuild_shims();
-
-// packages/core/src/utils/sideQuery.ts
-init_esbuild_shims();
-import { readFile as readFile2 } from "node:fs/promises";
-function buildDefaultPromptId(purpose) {
-  return purpose ? `side-query:${purpose}` : "side-query";
-}
-__name(buildDefaultPromptId, "buildDefaultPromptId");
-function resolveDefaultModel(config, override) {
-  return override ?? config.getFastModel?.() ?? config.getModel() ?? DEFAULT_QWEN_MODEL;
-}
-__name(resolveDefaultModel, "resolveDefaultModel");
-function applyThinkingDefault(callerConfig) {
-  const thinkingOverride = callerConfig?.thinkingConfig;
-  return {
-    ...callerConfig ?? {},
-    thinkingConfig: thinkingOverride ? { includeThoughts: false, ...thinkingOverride } : { includeThoughts: false }
-  };
-}
-__name(applyThinkingDefault, "applyThinkingDefault");
-async function getOutputLanguageInstruction(config) {
-  const outputLanguageFilePath = config.getOutputLanguageFilePath?.();
-  if (!outputLanguageFilePath) return void 0;
-  try {
-    const preference = (await readFile2(outputLanguageFilePath, "utf8")).trim();
-    if (!preference) return void 0;
-    return [
-      "Follow the user-visible output language preference below for this side query.",
-      "This preference overrides any earlier language-selection rule in this system instruction.",
-      preference
-    ].join("\n\n");
-  } catch {
-    return void 0;
-  }
-}
-__name(getOutputLanguageInstruction, "getOutputLanguageInstruction");
-function appendSystemInstruction(systemInstruction, outputLanguageInstruction) {
-  if (!outputLanguageInstruction) return systemInstruction;
-  if (systemInstruction === void 0) return outputLanguageInstruction;
-  if (typeof systemInstruction === "string") {
-    return `${systemInstruction}
-
-${outputLanguageInstruction}`;
-  }
-  if (Array.isArray(systemInstruction)) {
-    return [...systemInstruction, { text: outputLanguageInstruction }];
-  }
-  if (typeof systemInstruction === "object" && "parts" in systemInstruction && Array.isArray(systemInstruction.parts)) {
-    return {
-      ...systemInstruction,
-      parts: [...systemInstruction.parts, { text: outputLanguageInstruction }]
-    };
-  }
-  return [systemInstruction, { text: outputLanguageInstruction }];
-}
-__name(appendSystemInstruction, "appendSystemInstruction");
-function isJsonOptions(options) {
-  return options.schema !== void 0 && options.schema !== null;
-}
-__name(isJsonOptions, "isJsonOptions");
-async function runSideQuery(config, options) {
-  const model = resolveDefaultModel(config, options.model);
-  const promptId = options.promptId ?? buildDefaultPromptId(options.purpose);
-  const requestConfig = applyThinkingDefault(options.config);
-  const outputLanguageInstruction = options.skipOutputLanguagePreference ? void 0 : await getOutputLanguageInstruction(config);
-  const systemInstruction = appendSystemInstruction(
-    options.systemInstruction,
-    outputLanguageInstruction
-  );
-  if (isJsonOptions(options)) {
-    const response = await config.getBaseLlmClient().generateJson({
-      contents: options.contents,
-      schema: options.schema,
-      abortSignal: options.abortSignal,
-      model,
-      systemInstruction,
-      promptId,
-      config: requestConfig,
-      ...options.maxAttempts !== void 0 && {
-        maxAttempts: options.maxAttempts
-      }
-    });
-    const schemaError = SchemaValidator.validate(options.schema, response);
-    if (schemaError) {
-      throw new Error(`Invalid side query response: ${schemaError}`);
-    }
-    const customError2 = options.validate?.(response);
-    if (customError2) {
-      throw new Error(customError2);
-    }
-    return response;
-  }
-  const result = await config.getBaseLlmClient().generateText({
-    contents: options.contents,
-    model,
-    systemInstruction,
-    abortSignal: options.abortSignal,
-    promptId,
-    config: requestConfig,
-    ...options.maxAttempts !== void 0 && {
-      maxAttempts: options.maxAttempts
-    },
-    ...options.stream !== void 0 && { stream: options.stream },
-    ...options.failClosed !== void 0 && { failClosed: options.failClosed }
-  });
-  const customError = options.validate?.(result.text);
-  if (customError) {
-    throw new Error(customError);
-  }
-  return result;
-}
-__name(runSideQuery, "runSideQuery");
-
-// packages/core/src/services/visionBridge/vision-bridge-service.ts
 var debugLogger8 = createDebugLogger("VISION_BRIDGE");
 var turnImageCounts = /* @__PURE__ */ new WeakMap();
 var BRIDGE_MAX_OUTPUT_TOKENS = 2048;
@@ -16961,7 +16928,6 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
 };
 
 export {
-  runSideQuery,
   VISION_BRIDGE_MAX_IMAGES,
   VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES,
   normalizeParts,
@@ -17010,6 +16976,7 @@ export {
   logApiCancel,
   logApiResponse,
   logLoopDetected,
+  logRepeatedToolFailureGuard,
   logLoopDetectionDisabled,
   logNextSpeakerCheck,
   logSlashCommand,
@@ -17119,6 +17086,7 @@ export {
   RipgrepFallbackEvent,
   RipgrepRuntimeRecoveryEvent,
   LoopDetectedEvent,
+  RepeatedToolFailureGuardEvent,
   LoopDetectionDisabledEvent,
   NextSpeakerCheckEvent,
   makeSlashCommandEvent,