@librechat/agents 3.8.2 → 3.8.4

package/dist/esm/tools/toolBatchReplay.mjs

@@ -20,9 +20,19 @@ function restoreToolReplayConfig(configurable, interruptId, payload) {
 	const publicPayload = getPublicToolInterruptPayload(payload);
 	const review = createToolApprovalReviewEvidence(interruptId, publicPayload, state?.approvalOwner);
 	if (isToolApprovalInterrupt(publicPayload) && (review == null || state != null && state.approvalOwner == null)) throw new Error("Invalid tool approval checkpoint");
-	if (state != null) configurable[TOOL_BATCH_REPLAY_KEY] = state;
+	if (state != null) configurable[TOOL_BATCH_REPLAY_KEY] = {
+		...state,
+		interruptId
+	};
 	if (review != null) configurable[TOOL_APPROVAL_REVIEW_CONFIG_KEY] = review;
 }
+function isToolReplayResume(config, interruptId, isChildReplay) {
+	const resumeMap = config.configurable?.__pregel_resume_map;
+	if (interruptId != null && resumeMap != null && !Object.prototype.hasOwnProperty.call(resumeMap, interruptId)) return false;
+	if (isChildReplay && resumeMap != null) return true;
+	const scratchpad = config.configurable?.__pregel_scratchpad;
+	return scratchpad == null || (scratchpad.resume?.length ?? 0) > 0 || scratchpad.nullResume !== void 0;
+}
 function getToolBatchReplayOwner(config, agentId) {
 	return JSON.stringify([
 		getToolBatchReplayScope(config),
@@ -34,7 +44,7 @@ function getToolBatchReplayScope(config) {
 	const scope = config.configurable?.["__librechat_tool_approval_execution_scope"] ?? config.configurable?.thread_id;
 	return typeof scope === "string" && scope.length > 0 ? scope : void 0;
 }
-function isChildToolApprovalOwner(config, owner, trustedParentCallIds) {
+function isChildToolReplayOwner(config, owner, trustedParentCallIds) {
 	const manifest = requireValidSubagentResumeManifest(config.configurable);
 	if (manifest == null || trustedParentCallIds.size === 0) return false;
 	const identity = JSON.parse(owner);
@@ -88,7 +98,7 @@ function getToolBatchReplayState(payload) {
 	const candidate = value[TOOL_BATCH_REPLAY_KEY];
 	if (candidate === void 0) return;
 	const state = candidate;
-	if (state?.version !== 1 || state.wrappedPayload != null && typeof state.wrappedPayload !== "boolean" || state.approvalOwner != null && typeof state.approvalOwner !== "string" || !Array.isArray(state.records) || state.records.some((value) => {
+	if (state?.version !== 1 || state.wrappedPayload != null && typeof state.wrappedPayload !== "boolean" || state.approvalOwner != null && typeof state.approvalOwner !== "string" || state.interruptId != null && typeof state.interruptId !== "string" || !Array.isArray(state.records) || state.records.some((value) => {
 		if (value == null || typeof value !== "object") return true;
 		const record = value;
 		return typeof record.owner !== "string" || typeof record.batch !== "string" || typeof record.encoding !== "string" || typeof record.data !== "string" || record.turnState != null && !isToolNodeResumeState(record.turnState) || record.referenceState != null && !isToolOutputReferenceState(record.referenceState);
@@ -171,6 +181,6 @@ async function restoreToolBatchReplayState(config, owner) {
 	}));
 }
 //#endregion
-export { TOOL_BATCH_REPLAY_KEY, attachToolBatchReplayState, getPublicToolInterruptPayload, getToolBatchReplayOwner, getToolBatchReplayScope, getToolBatchReplayState, isChildToolApprovalOwner, rebindToolBatchReplayPayload, rebindToolBatchReplayScope, restoreToolBatchReplayState, restoreToolReplayConfig, stripToolBatchReplayState };
+export { TOOL_BATCH_REPLAY_KEY, attachToolBatchReplayState, getPublicToolInterruptPayload, getToolBatchReplayOwner, getToolBatchReplayScope, getToolBatchReplayState, isChildToolReplayOwner, isToolReplayResume, rebindToolBatchReplayPayload, rebindToolBatchReplayScope, restoreToolBatchReplayState, restoreToolReplayConfig, stripToolBatchReplayState };
 
 //# sourceMappingURL=toolBatchReplay.mjs.map

package/dist/esm/tools/toolBatchReplay.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"toolBatchReplay.mjs","names":[],"sources":["../../../src/tools/toolBatchReplay.ts"],"mappings":"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"}
+{"version":3,"file":"toolBatchReplay.mjs","names":[],"sources":["../../../src/tools/toolBatchReplay.ts"],"mappings":"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"}

package/dist/types/hooks/index.d.ts

@@ -47,3 +47,5 @@ export type { OutsideAccessPolicy, WorkspacePolicyConfig, PathExtractor, } from
 export { HOOK_EVENTS, TOOL_APPROVAL_EXECUTION_SCOPE_CONFIG_KEY } from './types';
 export type { HookEvent, HookInput, HookOutput, HookCallback, HookMatcher, HooksByEvent, HookInputByEvent, HookOutputByEvent, BaseHookInput, BaseHookOutput, ToolDecision, StopDecision, ToolApprovalReplayKey, ToolApprovalReplaySnapshot, AggregatedHookResult, RunStartHookInput, UserPromptSubmitHookInput, PreToolUseHookInput, PostToolUseHookInput, PostToolUseFailureHookInput, PostToolBatchHookInput, PostToolBatchEntry, PreemptBoundaryHookInput, PermissionDeniedHookInput, SubagentStartHookInput, SubagentStopHookInput, StopHookInput, StopFinalizeHookInput, StopFailureHookInput, PreCompactHookInput, PostCompactHookInput, RunStartHookOutput, UserPromptSubmitHookOutput, PreToolUseHookOutput, PostToolUseHookOutput, PostToolUseFailureHookOutput, PostToolBatchHookOutput, PreemptBoundaryHookOutput, PermissionDeniedHookOutput, SubagentStartHookOutput, SubagentStopHookOutput, StopHookOutput, StopFinalizeHookOutput, StopFailureHookOutput, PreCompactHookOutput, PostCompactHookOutput, } from './types';
 export type { ExecuteHooksOptions } from './executeHooks';
+/** Hosts may opt into stable generation scopes across every ToolNode interrupt type. */
+export declare const TOOL_APPROVAL_EXECUTION_SCOPE_CAPABLE = true;

package/dist/types/hooks/types.d.ts

@@ -9,6 +9,12 @@ import type { InjectedMessage } from '@/types/tools';
  * `@librechat/agents` emission points.
  */
 export declare const HOOK_EVENTS: readonly ["RunStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "PostToolUseFailure", "PostToolBatch", "PreemptBoundary", "PermissionDenied", "SubagentStart", "SubagentStop", "Stop", "StopFinalize", "StopFailure", "PreCompact", "PostCompact"];
+/**
+ * Host-owned generation identity, stable across every resume and rebuilt Run.
+ * A new generation must use a new scope, even when it reuses a thread or response
+ * id. Explicit scoping keeps LangGraph task namespaces out of approval owners;
+ * the executing agent id remains part of the owner and cannot change on resume.
+ */
 export declare const TOOL_APPROVAL_EXECUTION_SCOPE_CONFIG_KEY = "__librechat_tool_approval_execution_scope";
 export type HookEvent = (typeof HOOK_EVENTS)[number];
 /** Tool-gating decision; executeHooks folds with `deny > ask > allow` precedence. */

package/dist/types/tools/CodeExecutor.d.ts

@@ -50,7 +50,9 @@ export declare const CODE_API_AUTHORIZATION_ERROR_MESSAGE = "Code execution is n
 export declare const CODE_API_EXECUTION_FAILED_ERROR_MESSAGE = "Code execution failed.";
 export declare const CODE_API_INVALID_REQUEST_ERROR_MESSAGE = "The code execution request was rejected. Please check the tool input and try again.";
 export declare const CODE_API_RATE_LIMITED_ERROR_MESSAGE = "Code execution is temporarily rate-limited. Please retry shortly.";
+export declare const CODE_API_CAPABILITY_ERROR_MESSAGE = "Code execution is not supported by the selected environment.";
 export declare class CodeApiRequestError extends Error {
+    readonly retryable: boolean;
     constructor(message?: string);
 }
 export declare function normalizeCodeApiRequestError(error: unknown): CodeApiRequestError;

package/dist/types/tools/toolBatchReplay.d.ts

@@ -27,15 +27,24 @@ export interface ToolBatchReplayRecord {
 interface ToolBatchReplayState {
     version: 1;
     approvalOwner?: string;
+    /** Populated from the pending interrupt by Run, including question pauses. */
+    interruptId?: string;
     records: ToolBatchReplayRecord[];
     wrappedPayload?: boolean;
 }
 /** The only host-to-runtime entry point for checkpoint-owned tool replay state. */
 export declare function restoreToolReplayConfig(configurable: Record<string, unknown>, interruptId: string | undefined, payload: unknown): void;
+/**
+ * Resume maps identify the checkpointed interrupt, while the task scratchpad
+ * identifies the node that can consume it. Config survives into later graph
+ * steps, so the presence of replay evidence alone does not imply a resume.
+ * A parent replaying a checkpointed child has no local resume value.
+ */
+export declare function isToolReplayResume(config: RunnableConfig, interruptId: string | undefined, isChildReplay: boolean): boolean;
 export declare function getToolBatchReplayOwner(config: RunnableConfig, agentId: string): string;
 export declare function getToolBatchReplayScope(config: RunnableConfig): string | undefined;
-/** Foreign approval evidence may only transit a checkpoint-proven child path. */
-export declare function isChildToolApprovalOwner(config: RunnableConfig, owner: string, trustedParentCallIds: ReadonlySet<string>): boolean;
+/** Foreign replay evidence may only transit a checkpoint-proven child path. */
+export declare function isChildToolReplayOwner(config: RunnableConfig, owner: string, trustedParentCallIds: ReadonlySet<string>): boolean;
 /** Rebind only the checkpoint-proven source execution when a child fork is created. */
 export declare function rebindToolBatchReplayScope(configurable: Record<string, unknown>, sourceScope: string, destinationScope: string): void;
 /** A fork may be paused again before it consumes its pending interrupt. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "reova": {
     "enabled": true,
     "endpoint": "https://telemetry.reo.dev/data"

package/src/hooks/index.ts

@@ -116,3 +116,6 @@ export type {
   PostCompactHookOutput,
 } from './types';
 export type { ExecuteHooksOptions } from './executeHooks';
+
+/** Hosts may opt into stable generation scopes across every ToolNode interrupt type. */
+export const TOOL_APPROVAL_EXECUTION_SCOPE_CAPABLE = true;

package/src/hooks/types.ts

@@ -28,6 +28,12 @@ export const HOOK_EVENTS = [
   'PostCompact',
 ] as const;
 
+/**
+ * Host-owned generation identity, stable across every resume and rebuilt Run.
+ * A new generation must use a new scope, even when it reuses a thread or response
+ * id. Explicit scoping keeps LangGraph task namespaces out of approval owners;
+ * the executing agent id remains part of the owner and cannot change on resume.
+ */
 export const TOOL_APPROVAL_EXECUTION_SCOPE_CONFIG_KEY =
   '__librechat_tool_approval_execution_scope';
 

package/src/tools/BashExecutor.ts

@@ -279,7 +279,7 @@ function createBashExecutionTool(
         };
 
         const proxyAgent = resolveFetchProxyAgent(execEndpoint);
-        if (proxyAgent) {
+        if (proxyAgent != null) {
           fetchOptions.agent = proxyAgent;
         }
         const response = await fetch(execEndpoint, fetchOptions);
@@ -343,7 +343,7 @@ function createBashExecutionTool(
           normalizeCodeApiRequestError(error).message,
           command
         );
-        throw new Error(`Execution error:\n\n${messageWithReminder}`);
+        throw new CodeApiRequestError(`Execution error:\n\n${messageWithReminder}`);
       }
     },
     {

package/src/tools/BashProgrammaticToolCalling.ts

@@ -542,9 +542,11 @@ export function createBashProgrammaticToolCallingTool(
           (error as Error).message,
           code
         );
-        throw new Error(
-          `Bash programmatic execution failed: ${messageWithReminder}`
-        );
+        const message = `Bash programmatic execution failed: ${messageWithReminder}`;
+        if (error instanceof CodeApiRequestError) {
+          throw new CodeApiRequestError(message);
+        }
+        throw new Error(message, { cause: error });
       }
     },
     {

package/src/tools/CodeExecutor.ts

@@ -70,6 +70,7 @@ export function appendFailedExecutionFileReminder(
   code: string
 ): string {
   if (
+    output.includes(CODE_API_CAPABILITY_ERROR_MESSAGE) ||
     !MNT_DATA_PATH_PATTERN.test(code) ||
     output.includes(FAILED_EXECUTION_FILE_REMINDER)
   ) {
@@ -157,10 +158,67 @@ const SAFE_CODE_API_EXECUTION_ERROR_DETAILS: Readonly<
   'stdout length exceeded': 'Execution output exceeded the size limit.',
 };
 
+export const CODE_API_CAPABILITY_ERROR_MESSAGE =
+  'Code execution is not supported by the selected environment.';
+const CODE_API_CAPABILITY_ERROR_GUIDANCE =
+  'This is a permanent capability mismatch. Do not retry this tool in this environment; select a compatible environment or use an available workspace tool.';
+
+const CODE_API_CAPABILITY_LIMITATIONS: Readonly<
+  Partial<Record<string, string>>
+> = {
+  bridge_worker_mismatch:
+    'The selected worker does not support the requested execution capabilities (such as the stateful workspace required by programmatic tool calling).',
+  execution_profile_mismatch:
+    'The selected environment does not provide the requested execution profile.',
+  capability_mismatch:
+    'The selected environment lacks a required execution capability.',
+  unsupported_capability:
+    'The selected environment lacks a required execution capability.',
+  stateful_workspace_unsupported:
+    'The selected worker does not provide a stateful workspace.',
+};
+
+function getCodeApiCapabilityErrorMessage(
+  responseBody: string
+): string | undefined {
+  try {
+    const parsed = JSON.parse(responseBody) as {
+      error?: string;
+      code?: string;
+      message?: string;
+    } | null;
+    const code = parsed?.code ?? parsed?.error;
+    if (typeof code !== 'string') return undefined;
+    const normalizedCode = code.toLowerCase();
+    if (!Object.hasOwn(CODE_API_CAPABILITY_LIMITATIONS, normalizedCode))
+      return undefined;
+    let limitation = CODE_API_CAPABILITY_LIMITATIONS[normalizedCode];
+    if (limitation == null) return undefined;
+    if (
+      normalizedCode === 'bridge_worker_mismatch' &&
+      typeof parsed?.message === 'string' &&
+      /^Bridge worker [A-Za-z0-9._:-]+ does not provide a stateful workspace$/.test(
+        parsed.message
+      )
+    ) {
+      limitation =
+        CODE_API_CAPABILITY_LIMITATIONS.stateful_workspace_unsupported;
+    }
+    return `${CODE_API_CAPABILITY_ERROR_MESSAGE} ${limitation} ${CODE_API_CAPABILITY_ERROR_GUIDANCE}`;
+  } catch {
+    return undefined;
+  }
+}
+
 export class CodeApiRequestError extends Error {
+  readonly retryable: boolean;
+
   constructor(message = CODE_API_UNAVAILABLE_ERROR_MESSAGE) {
     super(message);
     this.name = 'CodeApiRequestError';
+    this.retryable =
+      message.includes(CODE_API_UNAVAILABLE_ERROR_MESSAGE) ||
+      message.includes('Code execution is temporarily rate-limited.');
   }
 }
 
@@ -277,11 +335,7 @@ type CodeApiErrorResponse = {
   body?: NodeJS.ReadableStream | null;
 };
 
-/**
- * Only the 429 branch reads the body, and node-fetch keeps the stream and its
- * socket alive until something does. Repeated backend failures would otherwise
- * accumulate connections holding payloads this module deliberately discards.
- */
+/** Releases unread or incomplete error responses after bounded classification. */
 function discardResponseBody(response: CodeApiErrorResponse): void {
   const body = response.body;
   if (body == null || !('destroy' in body)) {
@@ -298,6 +352,48 @@ function discardResponseBody(response: CodeApiErrorResponse): void {
   }
 }
 
+const MAX_CODE_API_ERROR_BODY_BYTES = 64 * 1024;
+const CODE_API_ERROR_BODY_TIMEOUT_MS = 1_000;
+
+/** Reads only small error envelopes, with a deadline for stalled upstreams. */
+async function readCodeApiErrorBody(
+  response: CodeApiErrorResponse
+): Promise<string> {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  try {
+    const read = async (): Promise<string> => {
+      if (response.body != null && Symbol.asyncIterator in response.body) {
+        let bytes = 0;
+        const chunks: Buffer[] = [];
+        for await (const chunk of response.body as AsyncIterable<
+          Buffer | string
+        >) {
+          const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+          bytes += buffer.length;
+          if (bytes > MAX_CODE_API_ERROR_BODY_BYTES) return '';
+          chunks.push(buffer);
+        }
+        return Buffer.concat(chunks).toString('utf8');
+      }
+      const body = await response.text();
+      return Buffer.byteLength(body) <= MAX_CODE_API_ERROR_BODY_BYTES
+        ? body
+        : '';
+    };
+    return await Promise.race([
+      read(),
+      new Promise<string>((resolve) => {
+        timer = setTimeout(() => resolve(''), CODE_API_ERROR_BODY_TIMEOUT_MS);
+      }),
+    ]);
+  } catch {
+    return '';
+  } finally {
+    clearTimeout(timer);
+    discardResponseBody(response);
+  }
+}
+
 export async function buildCodeApiHttpErrorMessage(
   method: CodeApiMethod,
   _endpoint: string,
@@ -305,8 +401,8 @@ export async function buildCodeApiHttpErrorMessage(
   options?: { recoverable?: boolean; profile?: t.CodeApiExecutionProfile }
 ): Promise<string> {
   /* Logged before the body is touched. A non-OK response can leave a chunked
-     body open, and there is no read timeout here, so draining first would
-     withhold the diagnostic indefinitely for exactly the backend it identifies.
+     body open, so logging first preserves the diagnostic even if the bounded
+     classification read times out.
      The body itself is never logged — it is upstream free text that can echo
      the header that was sent — and the endpoint is host-configured, so the
      backend is named by the profile this module chose rather than by its
@@ -325,16 +421,12 @@ export async function buildCodeApiHttpErrorMessage(
       }
     );
   }
-  if (response.status !== 429) {
-    discardResponseBody(response);
+  const responseBody = await readCodeApiErrorBody(response);
+  const capabilityError = getCodeApiCapabilityErrorMessage(responseBody);
+  if (capabilityError != null) {
+    return capabilityError;
   }
   if (response.status === 429) {
-    let responseBody = '';
-    try {
-      responseBody = await response.text();
-    } catch {
-      responseBody = '';
-    }
     const retryAfterSeconds = getRetryAfterSeconds(responseBody);
     return retryAfterSeconds != null
       ? `Code execution is temporarily rate-limited. Retry after ${retryAfterSeconds} seconds.`
@@ -543,7 +635,7 @@ function createCodeExecutionTool(
         };
 
         const proxyAgent = resolveFetchProxyAgent(execEndpoint);
-        if (proxyAgent) {
+        if (proxyAgent != null) {
           fetchOptions.agent = proxyAgent;
         }
         const response = await fetch(execEndpoint, fetchOptions);
@@ -610,7 +702,9 @@ function createCodeExecutionTool(
           normalizeCodeApiRequestError(error).message,
           code
         );
-        throw new Error(`Execution error:\n\n${messageWithReminder}`);
+        throw new CodeApiRequestError(
+          `Execution error:\n\n${messageWithReminder}`
+        );
       }
     },
     {

package/src/tools/ProgrammaticToolCalling.ts

@@ -469,7 +469,7 @@ export async function fetchSessionFiles(
     };
 
     const proxyAgent = resolveFetchProxyAgent(filesEndpoint, proxy);
-    if (proxyAgent) {
+    if (proxyAgent != null) {
       fetchOptions.agent = proxyAgent;
     }
 
@@ -531,7 +531,7 @@ export async function makeRequest(
     };
 
     const proxyAgent = resolveFetchProxyAgent(endpoint, proxy);
-    if (proxyAgent) {
+    if (proxyAgent != null) {
       fetchOptions.agent = proxyAgent;
     }
 
@@ -689,7 +689,7 @@ type ToolInputSchemaKind = {
 function detectSchemaKind(schema: unknown): ToolInputSchemaKind {
   const kind: ToolInputSchemaKind = { object: false, string: false };
 
-  if (!schema || typeof schema !== 'object') {
+  if (schema == null || typeof schema !== 'object') {
     return kind;
   }
 
@@ -704,7 +704,7 @@ function detectSchemaKind(schema: unknown): ToolInputSchemaKind {
   }
 
   const zodDef = (schema as { _def?: unknown })._def;
-  if (!zodDef || typeof zodDef !== 'object') {
+  if (zodDef == null || typeof zodDef !== 'object') {
     return kind;
   }
 
@@ -726,7 +726,7 @@ function detectSchemaKind(schema: unknown): ToolInputSchemaKind {
         type?: unknown;
       }
     ).innerType ?? (zodDef as { schema?: unknown }).schema;
-  if (innerSchema) {
+  if (innerSchema != null) {
     const innerKind = detectSchemaKind(innerSchema);
     kind.object ||= innerKind.object;
     kind.string ||= innerKind.string;
@@ -1221,9 +1221,11 @@ export function createProgrammaticToolCallingTool(
           (error as Error).message,
           code
         );
-        throw new Error(
-          `Programmatic execution failed: ${messageWithReminder}`
-        );
+        const message = `Programmatic execution failed: ${messageWithReminder}`;
+        if (error instanceof CodeApiRequestError) {
+          throw new CodeApiRequestError(message);
+        }
+        throw new Error(message, { cause: error });
       }
     },
     {

package/src/tools/ToolNode.ts

@@ -128,7 +128,8 @@ import {
   attachToolBatchReplayState,
   restoreToolBatchReplayState,
   getToolBatchReplayState,
-  isChildToolApprovalOwner,
+  isChildToolReplayOwner,
+  isToolReplayResume,
 } from '@/tools/toolBatchReplay';
 
 function stripToolApprovalReviewConfig(
@@ -908,19 +909,36 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           config,
           this.executingAgentId ?? this.agentId ?? ''
         );
-        const reviewEvidence = getToolApprovalReviewEvidence(config);
-        if (reviewEvidence?.owner != null && reviewEvidence.owner !== replayOwner) {
+        let reviewEvidence = getToolApprovalReviewEvidence(config);
+        const replayState = getToolBatchReplayState(config.configurable);
+        const ownsParentBatch = replayState?.records.some(
+          (record) => record.owner === replayOwner && record.batch === activeReplayKey
+        ) === true;
+        let isChildReplay = false;
+        if (ownsParentBatch) {
           const calls = this.isSendInput(input) ? [input.lg_tool_call] : assistantBatch?.message.tool_calls ?? [];
           const trustedParentCallIds = new Set(calls.filter((call) =>
             call.name === Constants.SUBAGENT &&
             (this.toolMap.get(call.name) as ReplayableSubagentTool | undefined)?.[SUBAGENT_REPLAY_CONTROLLER] != null
           ).map((call) => call.id ?? ''));
-          const ownsParentBatch = getToolBatchReplayState(config.configurable)?.records.some(
-            (record) => record.owner === replayOwner && record.batch === activeReplayKey
-          ) === true;
-          if (!ownsParentBatch || !isChildToolApprovalOwner(config, reviewEvidence.owner, trustedParentCallIds)) {
-            throw new Error('Tool approval execution owner changed before resume — failing closed');
-          }
+          isChildReplay = reviewEvidence?.owner != null
+            ? isChildToolReplayOwner(config, reviewEvidence.owner, trustedParentCallIds)
+            : replayState.records.some((record) => isChildToolReplayOwner(config, record.owner, trustedParentCallIds));
+        }
+        if ((reviewEvidence?.owner != null || replayState != null) &&
+          !isToolReplayResume(config, reviewEvidence?.interruptId ?? replayState?.interruptId, isChildReplay)) {
+          config = {
+            ...config,
+            configurable: {
+              ...config.configurable,
+              [TOOL_APPROVAL_REVIEW_CONFIG_KEY]: undefined,
+              [TOOL_BATCH_REPLAY_KEY]: undefined,
+            },
+          };
+          reviewEvidence = undefined;
+        }
+        if (reviewEvidence?.owner != null && reviewEvidence.owner !== replayOwner && !isChildReplay) {
+          throw new Error('Tool approval execution owner changed before resume — failing closed');
         }
         const referenceReplay: { state?: ToolOutputReferenceState } = {};
         const restoredBatches = await restoreToolBatchReplayState(config, replayOwner);

package/src/tools/toolBatchReplay.ts

@@ -49,6 +49,8 @@ export interface ToolBatchReplayRecord {
 interface ToolBatchReplayState {
   version: 1;
   approvalOwner?: string;
+  /** Populated from the pending interrupt by Run, including question pauses. */
+  interruptId?: string;
   records: ToolBatchReplayRecord[];
   wrappedPayload?: boolean;
 }
@@ -80,13 +82,40 @@ export function restoreToolReplayConfig(
     throw new Error('Invalid tool approval checkpoint');
   }
   if (state != null) {
-    configurable[TOOL_BATCH_REPLAY_KEY] = state;
+    configurable[TOOL_BATCH_REPLAY_KEY] = { ...state, interruptId };
   }
   if (review != null) {
     configurable[TOOL_APPROVAL_REVIEW_CONFIG_KEY] = review;
   }
 }
 
+/**
+ * Resume maps identify the checkpointed interrupt, while the task scratchpad
+ * identifies the node that can consume it. Config survives into later graph
+ * steps, so the presence of replay evidence alone does not imply a resume.
+ * A parent replaying a checkpointed child has no local resume value.
+ */
+export function isToolReplayResume(
+  config: RunnableConfig,
+  interruptId: string | undefined,
+  isChildReplay: boolean
+): boolean {
+  const resumeMap: object | undefined = config.configurable?.__pregel_resume_map;
+  if (interruptId != null &&
+    resumeMap != null &&
+    !Object.prototype.hasOwnProperty.call(resumeMap, interruptId)) {
+    return false;
+  }
+  if (isChildReplay && resumeMap != null) {
+    return true;
+  }
+  const scratchpad: { resume?: { length: number }; nullResume?: unknown } | undefined =
+    config.configurable?.__pregel_scratchpad;
+  return scratchpad == null ||
+    (scratchpad.resume?.length ?? 0) > 0 ||
+    scratchpad.nullResume !== undefined;
+}
+
 export function getToolBatchReplayOwner(
   config: RunnableConfig,
   agentId: string
@@ -109,8 +138,8 @@ export function getToolBatchReplayScope(
   return typeof scope === 'string' && scope.length > 0 ? scope : undefined;
 }
 
-/** Foreign approval evidence may only transit a checkpoint-proven child path. */
-export function isChildToolApprovalOwner(
+/** Foreign replay evidence may only transit a checkpoint-proven child path. */
+export function isChildToolReplayOwner(
   config: RunnableConfig,
   owner: string,
   trustedParentCallIds: ReadonlySet<string>
@@ -208,6 +237,7 @@ export function getToolBatchReplayState(
     (state.wrappedPayload != null &&
       typeof state.wrappedPayload !== 'boolean') ||
     (state.approvalOwner != null && typeof state.approvalOwner !== 'string') ||
+    (state.interruptId != null && typeof state.interruptId !== 'string') ||
     !Array.isArray(state.records) ||
     state.records.some((value: unknown) => {
       if (value == null || typeof value !== 'object') {