mixdog 1.2.1 → 1.2.3

package/src/runtime/agent/orchestrator/session/loop/context-overflow.mjs

@@ -46,6 +46,62 @@ export function agentContextOverflowError(
   );
 }
 
+export const TOOL_SURFACE_EXCEEDS_CONTEXT = 'TOOL_SURFACE_EXCEEDS_CONTEXT';
+
+const tokens = (value) => `${Number(value || 0).toLocaleString('en-US')} tokens`;
+
+// Distinct from AgentContextOverflowError: the request's FIXED overhead (tool
+// definitions, protected system context, configured headroom) leaves no room
+// for any history, so compacting the history cannot help and is not tried.
+// The wording avoids provider context-overflow phrasing on purpose: this is
+// not a "conversation too long" refusal and must not be routed as one.
+export class ToolSurfaceExceedsContextError extends Error {
+  constructor({ sessionId, provider, model, overhead }) {
+    const target = [provider, model].filter(Boolean).join('/') || 'this model';
+    const reserve = overhead.kind === 'configured_reserve';
+    const headline = reserve
+      ? 'The configured compaction headroom leaves no room for conversation history'
+      : 'Tool definitions and system context leave no room for conversation history';
+    const remedy = reserve
+      ? 'Lower the configured headroom (compaction.reservedTokens or MIXDOG_AGENT_COMPACT_RESERVED_TOKENS), or use a model with a larger context window.'
+      : `Use a model with a larger context window, or send a smaller eager tool surface (disable MCP servers or custom tools this session does not need)${
+          overhead.configuredReserveTokens > 0 ? ', or configure fewer reserved tokens (compaction.reservedTokens)' : ''
+        }.`;
+    const largest = overhead.largestTools.map((tool) => `${tool.name} (${tokens(tool.tokens)})`).join(', ');
+    super(
+      [
+        `${headline} (${TOOL_SURFACE_EXCEEDS_CONTEXT}).`,
+        `${target}: context window ${tokens(overhead.contextWindowTokens)}, compaction boundary ${tokens(overhead.boundaryTokens)}.`,
+        `Fixed per-request overhead: tool definitions ${tokens(overhead.toolTokens)} (${overhead.toolCount} tools), ` +
+          `protected system context ${tokens(overhead.systemTokens)}, configured headroom ${tokens(overhead.configuredReserveTokens)}; ` +
+          'nothing remains for conversation history.',
+        ...(overhead.measuredRequestTokens
+          ? [`The provider measured the last request at ${tokens(overhead.measuredRequestTokens)}.`]
+          : []),
+        'Compacting the conversation history cannot reduce these.',
+        remedy,
+        ...(largest ? [`Largest tool definitions: ${largest}.`] : []),
+      ].join('\n')
+    );
+    this.name = 'ToolSurfaceExceedsContextError';
+    this.code = TOOL_SURFACE_EXCEEDS_CONTEXT;
+    this.sessionId = sessionId || null;
+    this.provider = provider || null;
+    this.model = model || null;
+    this.overheadKind = overhead.kind;
+    this.overhead = overhead;
+  }
+}
+
+export function toolSurfaceExceedsContextError({ sessionId, sessionRef, model, overhead }) {
+  return new ToolSurfaceExceedsContextError({
+    sessionId,
+    provider: sessionRef?.provider || null,
+    model: sessionRef?.model || model || null,
+    overhead,
+  });
+}
+
 // Distinct from AgentContextOverflowError: the compaction pipeline itself
 // failed (handoff-summary error, dead Memory runtime,
 // etc.). This is NOT "latest turn cannot fit the context budget" — masking it

package/src/runtime/agent/orchestrator/session/loop/deferred-call-through.mjs

@@ -1,12 +1,10 @@
 // Deferred catalog call-through: inactive catalog tool_use → discovery bookkeeping
 // then normal executeTool routing (runtime errors only; no pre-dispatch schema).
 import { clean } from '../../runtime-core/session-text.mjs';
-import {
-  deferredCatalogUnion,
-  isReadonlySelectable,
-  selectDeferredTools,
-} from '../../runtime-core/tool-catalog.mjs';
+import { deferredCatalogUnion, isReadonlySelectable, selectDeferredTools } from '../../runtime-core/tool-catalog.mjs';
 import { isDeferredToolAvailable } from '../../runtime-core/deferred-tool-availability.mjs';
+import { routeToolExclusionReason } from './provider-tool-exclusions.mjs';
+import { isBridgeReadonlySession, isToolBridgeEnabled } from '../../runtime-core/tool-bridge.mjs';
 
 /** Skill-list plumbing only; mutation/MCP/builtins must use the catalog+mode gate. */
 const INACTIVE_INFRA_BYPASS = new Set(['skills_list', 'skill_view']);
@@ -41,7 +39,7 @@ function toolExecutesWhenInactive(name) {
   return INACTIVE_INFRA_BYPASS.has(name);
 }
 
-function resolveDeferredSelectMode(session) {
+export function resolveDeferredSelectMode(session) {
   const spec = session?.toolSpec;
   if (spec == null || spec === '') return null;
   if (spec === 'readonly') return 'readonly';
@@ -89,20 +87,32 @@ export function prepareDeferredToolCallThrough(sessionRef, name) {
   }
   const tool = lookupDeferredCatalogTool(sessionRef, name);
   if (!tool) return null;
+  const routeExclusion = isToolBridgeEnabled(sessionRef) ? null : routeToolExclusionReason(sessionRef, tool);
+  if (routeExclusion) return denyDeferredCallThrough(`Error: ${routeExclusion}`);
   if (isActiveSessionTool(sessionRef, name)) return null;
   if (toolExecutesWhenInactive(name)) return null;
 
   const toolLabel = clean(tool.name) || clean(name) || 'tool';
+  const bridge = isToolBridgeEnabled(sessionRef);
   const resolvedMode = resolveDeferredSelectMode(sessionRef);
+  // Whatever the exposure, a deferred mutating tool never runs without a
+  // resolved tool mode, and never in a read-only one.
   if (resolvedMode === null) {
     if (!isReadonlySelectable(tool)) {
+      const remedy = bridge ? 'no call was sent.' : `load it with load_tool names:["${toolLabel}"].`;
       return denyDeferredCallThrough(
-        `Error: tool "${toolLabel}" is deferred and cannot be auto-loaded without a resolved tool mode; load it with load_tool names:["${toolLabel}"].`
+        `Error: tool "${toolLabel}" is deferred and cannot be auto-loaded without a resolved tool mode; ${remedy}`
       );
     }
-  } else if (resolvedMode === 'readonly' && !isReadonlySelectable(tool)) {
+  } else if (
+    (resolvedMode === 'readonly' || (bridge && isBridgeReadonlySession(sessionRef))) &&
+    !isReadonlySelectable(tool)
+  ) {
     return denyDeferredCallThrough(`Error: tool "${toolLabel}" is not available in readonly mode`);
   }
+  // Bridge sessions reach deferred tools through call_tool: the fixed
+  // provider surface is never extended.
+  if (bridge) return null;
 
   const selectMode = resolvedMode === null ? 'readonly' : resolvedMode;
   selectDeferredTools(sessionRef, [toolLabel], selectMode);

package/src/runtime/agent/orchestrator/session/loop/loop-state.mjs

@@ -114,6 +114,7 @@ export function createLoopState({ provider, messages, model, tools, cwd, sendOpt
     // One-shot repair of an assistant turn whose stored reasoning replay the
     // API refuses to take back (see thinking-replay-recovery.mjs).
     thinkingReplayRepairUsed: false,
+    toolSchemaDropUsed: false,
     // Pending image-strip retry: identities of the images every attempt leaves
     // out until a send succeeds, and whether to heal them from history then.
     imageStrip: null,

package/src/runtime/agent/orchestrator/session/loop/pre-dispatch-deny.mjs

@@ -13,8 +13,12 @@
 // registry knows its name.
 import { isAgentOwner } from '../../agent-owner.mjs';
 import { isOffReadonlySurface } from './deferred-call-through.mjs';
+import { BRIDGE_CALL_TOOL_NAME, bridgeErrorText, isToolBridgeEnabled } from '../../runtime-core/tool-bridge.mjs';
+import { sessionAllowlistExcludes, sessionDisallows } from '../../runtime-core/deferred-tool-availability.mjs';
+import { providerToolExclusionReason } from './provider-tool-exclusions.mjs';
 
-const WORKER_DENIED_TOOLS = new Set(['agent']);
+const WORKER_DENIED_TOOLS = new Set(['agent', 'ask_user', 'session']);
+const BRIDGE_DISCOVERY_TOOL_NAMES = new Set(['load_tool']);
 
 const IMAGE_PATH_RE = /\.(?:png|jpe?g|gif|webp)(?:$|[?#])/i;
 const COMPACTED_PATCH_LINE_RE = /^\s*\[mixdog compacted\b[^\]\n]*\]/;
@@ -95,17 +99,24 @@ export function routeWebFetchCall(call) {
 export function preDispatchDenyForSession(sessionRef, call) {
   const name = call?.name;
   if (typeof name !== 'string' || !name) return null;
+  // A call_tool request that could not be projected onto its target answers
+  // its wire id with the projection error; call_tool itself never dispatches.
+  if (typeof call.bridgeError === 'string') return call.bridgeError;
+  if (name === BRIDGE_CALL_TOOL_NAME && isToolBridgeEnabled(sessionRef)) {
+    return bridgeErrorText('BRIDGE_RECURSION', 'call_tool runs one tool named in its arguments and cannot be dispatched itself.');
+  }
   const schemaName = String(call?.schemaName || name);
-  if (Array.isArray(sessionRef?.schemaAllowedTools)) {
-    const allowed = new Set(sessionRef.schemaAllowedTools.map((toolName) => String(toolName).toLowerCase()));
-    if (!allowed.has(schemaName.toLowerCase())) {
-      return `Error: tool "${name}" is not available on this session's schema allowlist.`;
-    }
+  // A tool the provider left out of this request still exists in the session;
+  // a call to it is answered with why it is unavailable.
+  const excluded = providerToolExclusionReason(sessionRef, schemaName);
+  if (excluded) return `Error: ${excluded}`;
+  // The bridge's discovery tools grant no authority (every call_tool target
+  // is judged here under its own name), so an allowlist never strands them.
+  const bridgeDiscovery = isToolBridgeEnabled(sessionRef) && BRIDGE_DISCOVERY_TOOL_NAMES.has(schemaName);
+  if (!bridgeDiscovery && sessionAllowlistExcludes(sessionRef, schemaName)) {
+    return `Error: tool "${name}" is not available on this session's schema allowlist.`;
   }
-  if (
-    Array.isArray(sessionRef?.disallowedTools) &&
-    sessionRef.disallowedTools.some((toolName) => String(toolName).toLowerCase() === schemaName.toLowerCase())
-  ) {
+  if (sessionDisallows(sessionRef, schemaName)) {
     return `Error: tool "${name}" is not available in this session.`;
   }
   if (isOffReadonlySurface(sessionRef, schemaName)) {

package/src/runtime/agent/orchestrator/session/loop/provider-tool-exclusions.mjs

@@ -0,0 +1,132 @@
+// Tools a provider left out of a request because it cannot accept their input
+// schema even after the wire's normalization (a schema with an unknown type
+// name, an unresolvable $ref, a non-object root), or that the provider
+// rejected with an HTTP 400 naming the schema (dropped for the session).
+// The user is told once per session and tool on the turn's display-only stage
+// channel (stage 'notice'); a call the model still makes to such a tool is
+// answered with the reason instead of running it.
+import { geminiToolExclusion } from '../../providers/gemini-schema.mjs';
+import { isGeminiFamilyModel } from '../../providers/gemini-family.mjs';
+import { anthropicToolExclusion } from '../../providers/lib/anthropic-request-utils.mjs';
+import { claudeBridgeInputSchema, wireInputSchema } from '../../providers/lib/claude-bridge-schema.mjs';
+import { actionInputUnionFor } from '../../providers/lib/action-input-contract.mjs';
+import { isAntigravityClaude } from '../../providers/antigravity-request.mjs';
+import { isResponsesFreeformTool } from '../../providers/custom-tool-wire.mjs';
+import { ANTHROPIC_NATIVE_PROVIDERS } from '../../runtime-core/tool-catalog-schema.mjs';
+import { finalizeProviderRequestTools, providerNativeToolPrefixCount } from '../../runtime-core/provider-request-tools.mjs';
+
+const sessions = new WeakMap();
+
+function exclusionsFor(sessionRef) {
+  let state = sessions.get(sessionRef);
+  if (!state) {
+    state = { noticed: new Set(), current: new Map(), dropped: new Map() };
+    sessions.set(sessionRef, state);
+  }
+  return state;
+}
+
+const isSessionRef = (value) => value !== null && typeof value === 'object';
+
+/** A new provider request: exclusions describe the latest request only. */
+export function beginProviderToolExclusions(sessionRef) {
+  if (isSessionRef(sessionRef)) sessions.get(sessionRef)?.current.clear();
+}
+
+export function excludedToolNoticeText({ name, pointer, reason }) {
+  return `Tool "${name}" was excluded from this session's requests: its input schema is invalid at ${pointer || '/'} (${reason}). Fix the tool's schema or disable the tool.`;
+}
+
+/** Record `exclusion` ({ name, pointer, reason }) for the session's current
+ *  request and raise the user notice the first time this tool is excluded. */
+export function recordProviderToolExclusion(sessionRef, exclusion, onStageChange) {
+  const name = String(exclusion?.name || '');
+  if (!name || !isSessionRef(sessionRef)) return;
+  const state = exclusionsFor(sessionRef);
+  state.current.set(name, exclusion);
+  if (state.noticed.has(name)) return;
+  state.noticed.add(name);
+  try {
+    onStageChange?.('notice', { tone: 'warn', message: excludedToolNoticeText(exclusion) });
+  } catch {
+    /* display-only */
+  }
+}
+
+const unavailableText = (exclusion) =>
+  `tool "${exclusion.name}" is unavailable with the current model: the provider rejected its input schema at ${exclusion.pointer || '/'} (${exclusion.reason}), so it was left out of the request; no call was sent. Use another tool, or ask the user to fix the tool's schema or disable it.`;
+
+/** Why `name` cannot be called in the session's current request, or null. */
+export function providerToolExclusionReason(sessionRef, name) {
+  if (!isSessionRef(sessionRef)) return null;
+  const state = sessions.get(sessionRef);
+  const key = String(name || '');
+  const exclusion = state?.current.get(key) || state?.dropped.get(key);
+  return exclusion ? unavailableText(exclusion) : null;
+}
+
+/** The provider rejected `exclusion.name`'s schema with an HTTP 400: leave the
+ *  tool out of every later request of the session and tell the user once. */
+export function dropSessionTool(sessionRef, exclusion, onStageChange) {
+  if (!isSessionRef(sessionRef)) return;
+  exclusionsFor(sessionRef).dropped.set(exclusion.name, exclusion);
+  recordProviderToolExclusion(sessionRef, exclusion, onStageChange);
+}
+
+/** The request's tool surface without the tools dropped for the session
+ *  ({ sendTools, requestToolScope }, the same objects when none apply). */
+export function withoutDroppedTools(sessionRef, { sendTools, requestToolScope }) {
+  const dropped = isSessionRef(sessionRef) ? sessions.get(sessionRef)?.dropped : null;
+  if (!dropped?.size) return { sendTools, requestToolScope };
+  const prefix = providerNativeToolPrefixCount(sendTools);
+  const kept = sendTools.filter((tool, index) => index < prefix || !dropped.has(tool?.name));
+  if (kept.length === sendTools.length) return { sendTools, requestToolScope };
+  const next = finalizeProviderRequestTools(kept, prefix);
+  return { sendTools: next, requestToolScope: { ...requestToolScope, requestTools: next } };
+}
+
+// The schema rule of the wire a session's requests use: 'gemini', 'anthropic'
+// (Messages), 'antigravity-claude' (Anthropic bridge behind Antigravity) or
+// 'openai' (Responses, Codex and every OpenAI-compatible chat route).
+function routeSchemaFamily(session) {
+  const provider = String(session?.provider || '').toLowerCase();
+  const wire = session?.wireRoute?.wire;
+  if (provider === 'antigravity-oauth' && isAntigravityClaude(session?.model)) return 'antigravity-claude';
+  if (provider === 'gemini' || isGeminiFamilyModel(session?.model)) return 'gemini';
+  if (ANTHROPIC_NATIVE_PROVIDERS.has(provider) || wire === 'messages') return 'anthropic';
+  return 'openai';
+}
+
+function wireExclusion(tool, result) {
+  return result.schema ? null : { name: tool.name, pointer: result.pointer || '/', reason: result.reason };
+}
+
+// The same normalization + validation the wire applies to `tool`, as
+// { name, pointer, reason } when the route leaves it out of its requests.
+function schemaExclusion(session, family, tool) {
+  switch (family) {
+    case 'gemini':
+      return geminiToolExclusion(tool);
+    case 'anthropic':
+      return anthropicToolExclusion(tool, String(session?.provider || 'anthropic').toLowerCase());
+    case 'antigravity-claude':
+      return wireExclusion(tool, claudeBridgeInputSchema(actionInputUnionFor(tool.inputSchema)));
+    default:
+      if (tool.inputSchema == null) return null;
+      if (/^openai(-oauth)?$/.test(String(session?.provider || '')) && isResponsesFreeformTool(tool)) return null;
+      return wireExclusion(tool, wireInputSchema(tool.inputSchema, 'openai'));
+  }
+}
+
+/** Why `tool` is left out of every request on the session's route, or null.
+ *  Validation is a pure function of the tool's schema and the route's wire, so
+ *  this holds before the tool was ever sent and stays stable across turns; a
+ *  tool the provider rejected with a 400 is dropped for the session. Built-in
+ *  tools are never excluded by the schema rule. */
+export function routeToolExclusionReason(session, tool) {
+  if (!tool) return null;
+  const dropped = isSessionRef(session) ? sessions.get(session)?.dropped.get(String(tool.name || '')) : null;
+  if (dropped) return unavailableText(dropped);
+  const exclusion = schemaExclusion(session, routeSchemaFamily(session), tool);
+  return exclusion ? unavailableText(exclusion) : null;
+}

package/src/runtime/agent/orchestrator/session/loop/request-boundary.mjs

@@ -14,6 +14,10 @@ import {
   providerNativeToolPrefixCount,
   runWithProviderRequestToolsScope,
 } from '../../runtime-core/provider-request-tools.mjs';
+import { TOOL_SURFACE_MIGRATION_INTENT } from '../../runtime-core/tool-exposure.mjs';
+import { migrateToolExposureAtBoundary } from './tool-exposure-migration.mjs';
+import { fixedRequestOverhead, fixedRequestOverheadInputs, resolveWorkerCompactPolicy } from './compact-policy.mjs';
+import { toolSurfaceExceedsContextError } from './context-overflow.mjs';
 
 const isDynamicTool = (tool) =>
   tool.deferLoading === true || tool.defer_loading === true || String(tool.name || '').startsWith('mcp__');
@@ -61,6 +65,18 @@ export async function prepareProviderRequest(state) {
   let compactChanged;
   let sendTools;
   let requestToolScope;
+  // Fixed inputs of the last passing overhead verdict in this boundary.
+  let passedOverheadInputs;
+  // A session persisted with another tool exposure migrates here, once, at a
+  // boundary with no pending calls: new surface and fixed guidance, a fresh
+  // tool snapshot and provider state, and a tagged cache break.
+  if (migrateToolExposureAtBoundary(sessionRef, messages)) {
+    fixedProviderToolSurface = null;
+    providerState = undefined;
+    providerStateCleared = true;
+    delete sessionRef.pendingCacheBreakIntent;
+    opts.cacheBreakIntent = TOOL_SURFACE_MIGRATION_INTENT;
+  }
   refreshDeferredMcpToolCatalog(sessionRef);
   do {
     // Provider-history normalization is part of the request boundary:
@@ -90,6 +106,20 @@ export async function prepareProviderRequest(state) {
       requestTools: sendTools,
       nativePrefixCount: providerNativeToolPrefixCount(sendTools),
     };
+    // A request whose fixed overhead alone leaves no room for history fails
+    // here with an actionable error: no compaction could make it fit. A
+    // passing verdict holds while its fixed inputs (tool schemas, protected
+    // system context, headroom, boundary) are unchanged — a later pass whose
+    // compaction only removed history (and the provider reading with it) is
+    // not re-judged — but adopted MCP schema changes or a re-rooted system
+    // prompt are.
+    const overheadPolicy = resolveWorkerCompactPolicy(sessionRef, sendTools);
+    const overheadInputs = fixedRequestOverheadInputs(overheadPolicy, messages);
+    if (overheadInputs === null || overheadInputs !== passedOverheadInputs) {
+      const overhead = fixedRequestOverhead(overheadPolicy, messages, sendTools, sessionRef);
+      if (overhead) throw toolSurfaceExceedsContextError({ sessionId, sessionRef, model, overhead });
+      passedOverheadInputs = overheadInputs;
+    }
     const pass = await runWithProviderRequestToolsScope(requestToolScope, () =>
       runPreSendCompactPass({
         provider,

package/src/runtime/agent/orchestrator/session/loop/send-phase.mjs

@@ -8,6 +8,7 @@ import { resolveLiveToolCwd } from './tool-exec.mjs';
 import { notifySkillsApplied, prepareExplicitSkills, recordAppliedSkills } from '../explicit-skills.mjs';
 import { addUsage, usageDeltaEvent } from './usage.mjs';
 import { prepareProviderRequest } from './request-boundary.mjs';
+import { applyStepEffort } from './step-auto-effort.mjs';
 import { projectProviderRequest } from './request-projection.mjs';
 import { traceProviderSend, traceOutputTruncation } from './diagnostics.mjs';
 import { createEagerDispatcher } from '../eager-dispatch.mjs';
@@ -16,6 +17,13 @@ import { stripInlineImages } from '../image-strip-recovery.mjs';
 import { runWithProviderRequestToolsScope } from '../../runtime-core/provider-request-tools.mjs';
 import { REPEAT_FAIL_LIMIT } from './loop-state.mjs';
 import { createToolCallIdResolver } from './tool-call-ids.mjs';
+import { captureSideQuestionRequest } from '../side-question-store.mjs';
+import {
+  beginProviderToolExclusions,
+  dropSessionTool,
+  recordProviderToolExclusion,
+  withoutDroppedTools,
+} from './provider-tool-exclusions.mjs';
 
 /**
  * Open an iteration: refresh the live cwd, drain queued steering after a
@@ -72,6 +80,8 @@ export async function beginIteration(state) {
     loopUsageMetricsTurnId: state.usageMetricsTurnId,
     loopUsageMetricsEpoch: state.usageMetricsEpoch,
   });
+  // A tool the provider rejected with a schema 400 stays out of the session.
+  Object.assign(boundary, withoutDroppedTools(sessionRef, boundary));
   state.iterations = boundary.iterations;
   state.lastUsage = boundary.lastUsage;
   state.firstTurnUsage = boundary.firstTurnUsage;
@@ -91,6 +101,10 @@ export async function beginIteration(state) {
   // callers omit the flag and retain legacy live deferred resolution.
   opts.providerToolSnapshotAuthoritative = true;
   opts.providerNativeToolPrefixCount = boundary.requestToolScope.nativePrefixCount;
+  // A tool the provider leaves out of this request (a schema it cannot
+  // accept) is noticed once per session and refused if the model calls it.
+  beginProviderToolExclusions(sessionRef);
+  opts.onToolExcluded = (exclusion) => recordProviderToolExclusion(sessionRef, exclusion, opts.onStageChange);
   state.lastSendTools = boundary.sendTools;
   // Eager-dispatch queue (see ../eager-dispatch.mjs): read-only tools start
   // the instant the provider streams a tool-call event; writes and unknown
@@ -132,6 +146,9 @@ export async function sendProviderRequest(state, round) {
   const sendStartedAt = Date.now();
   const preSendMs = sendStartedAt - round.iterT0;
   const toolResumeMs = state.lastToolBatchEndedAt ? sendStartedAt - state.lastToolBatchEndedAt : null;
+  // The step judgment ran beside opening the iteration; wait for it only up to
+  // its grace, then it rides on this request or on the next.
+  await applyStepEffort(state);
   // Every attempt is built from the live transcript, so a compaction between
   // attempts reaches the provider; a pending image strip only filters it.
   const messageSource = state.imageStrip
@@ -152,26 +169,46 @@ export async function sendProviderRequest(state, round) {
   try {
     opts.onProviderSendStarted?.();
   } catch {}
-  const result = await runWithProviderRequestToolsScope(round.requestToolScope, () =>
-    sendWithRecovery({
-      provider,
-      messages: providerMessages,
-      recoveryMessages: messageSource,
-      model,
-      sendTools: round.sendTools,
-      tools: round.sendTools,
-      opts,
-      sessionId,
-      sessionRef,
-      nextIteration: round.nextIteration,
-      contextOverflowRetryUsed: state.contextOverflowRetryUsed,
-      transportRetriesUsed: state.transportRetriesUsed,
-      transportRetryMax: state.transportRetryMax,
-      imageStripUsed: state.imageStripUsed,
-      thinkingReplayRepairUsed: state.thinkingReplayRepairUsed,
-      signal: state.signal,
-    })
-  );
+  // The request a /btw side question forks: kept while it is in flight, with
+  // its reply once it proceeds, and dropped again if it fails.
+  const sideQuestion = captureSideQuestionRequest({
+    sessionId,
+    sessionRef,
+    provider,
+    model,
+    messages: providerMessages,
+    tools: round.sendTools,
+    opts,
+  });
+  let result;
+  try {
+    result = await runWithProviderRequestToolsScope(round.requestToolScope, () =>
+      sendWithRecovery({
+        provider,
+        messages: providerMessages,
+        recoveryMessages: messageSource,
+        model,
+        sendTools: round.sendTools,
+        tools: round.sendTools,
+        opts,
+        sessionId,
+        sessionRef,
+        nextIteration: round.nextIteration,
+        contextOverflowRetryUsed: state.contextOverflowRetryUsed,
+        transportRetriesUsed: state.transportRetriesUsed,
+        transportRetryMax: state.transportRetryMax,
+        imageStripUsed: state.imageStripUsed,
+        thinkingReplayRepairUsed: state.thinkingReplayRepairUsed,
+        toolSchemaDropUsed: state.toolSchemaDropUsed,
+        signal: state.signal,
+      })
+    );
+  } catch (error) {
+    sideQuestion?.discard();
+    throw error;
+  }
+  if (result.action === 'proceed') sideQuestion?.settle(result.response);
+  else sideQuestion?.discard();
   return {
     result,
     providerMessages,
@@ -213,6 +250,16 @@ export function applyRetryAction(state, result) {
       // transport budget is consumed: nothing was generated.
       state.thinkingReplayRepairUsed = true;
       return true;
+    case 'retry_tool_schema_drop':
+      // The provider named a tool whose schema it rejects: the session drops
+      // it (with the notice) and the turn is rebuilt without it, once. The
+      // frozen tool surface and provider state are rebuilt around the change.
+      state.toolSchemaDropUsed = true;
+      dropSessionTool(state.sessionRef, result.exclusion, state.opts.onStageChange);
+      state.fixedProviderToolSurface = null;
+      state.providerState = undefined;
+      state.providerStateUpdated = true;
+      return true;
     case 'retry_image_strip':
       state.transportRetriesUsed += 1;
       state.imageStripUsed = true;