@librechat/agents 3.9.5 → 3.9.6

package/src/tools/ToolNode.ts

@@ -129,6 +129,7 @@ import {
   resolveLocalExecutionTools,
 } from '@/tools/local';
 import { stripCodeSessionFileSummary } from '@/tools/CodeSessionFileSummary';
+import { formatToolErrorContent } from '@/tools/toolErrorContent';
 import { Constants, GraphEvents, CODE_EXECUTION_TOOLS } from '@/common';
 import { PreparedSubagentError } from '@/tools/preparedSubagents';
 import { attachRunStepResumeState } from '@/tools/runStepResume';
@@ -2201,9 +2202,11 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           });
         }
       }
-      const errorContent = truncateToolResultContent(
-        `Error: ${e.message}\n Please fix your mistakes.`,
-        this.maxToolResultChars
+      const errorContent = formatToolErrorContent(
+        e.message,
+        this.maxToolResultChars,
+        config.signal,
+        e
       );
       const refMeta =
         unresolvedRefs.length > 0
@@ -4461,9 +4464,10 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
         let finalToolOutput: unknown = result.content;
 
         if (result.status === 'error') {
-          contentString = truncateToolResultContent(
-            `Error: ${result.errorMessage ?? 'Unknown error'}\n Please fix your mistakes.`,
-            this.maxToolResultChars
+          contentString = formatToolErrorContent(
+            result.errorMessage,
+            this.maxToolResultChars,
+            config.signal
           );
           /**
            * Error results bypass registration but stamp the
@@ -4977,9 +4981,10 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
   ): Promise<boolean> {
     const output =
       result.status === 'error'
-        ? truncateToolResultContent(
-          `Error: ${result.errorMessage ?? 'Unknown error'}\n Please fix your mistakes.`,
-          this.maxToolResultChars
+        ? formatToolErrorContent(
+          result.errorMessage,
+          this.maxToolResultChars,
+          config.signal
         )
         : serializeToolOutputWithinLimits(
           result.content,

package/src/tools/toolErrorContent.ts

@@ -0,0 +1,48 @@
+import { PreparedSubagentError } from '@/tools/preparedSubagents';
+import { truncateToolResultContent } from '@/utils/truncation';
+import { StreamLimitExceededError } from '@/llm/streamLimits';
+
+export const STOPPED_RUN_TOOL_ERROR =
+  'STOP. The user doesn\'t want to proceed with this tool use. ' +
+  'The run was stopped; the tool may not have completed, and its effects should not be assumed. ' +
+  'STOP what you are doing and wait for the user to tell you how to proceed.';
+
+/** A host result only carries error text, so require the run signal as well. */
+function isStoppedRunToolError(
+  message: string | undefined,
+  signal?: AbortSignal,
+  error?: Error
+): boolean {
+  if (
+    signal?.aborted !== true ||
+    signal.reason instanceof StreamLimitExceededError ||
+    signal.reason instanceof PreparedSubagentError
+  ) {
+    return false;
+  }
+  if (
+    (error != null && error === signal.reason) ||
+    (error instanceof Error &&
+      (error.name === 'AbortError' ||
+        ('code' in error &&
+          (error.code === 'ABORT_ERR' || error.code === 'ERR_CANCELED'))))
+  ) {
+    return true;
+  }
+  return (
+    message != null &&
+    /AbortError|(?:operation|request|stream) was aborted/i.test(message)
+  );
+}
+
+export function formatToolErrorContent(
+  message: string | undefined,
+  maxChars: number,
+  signal?: AbortSignal,
+  error?: Error
+): string {
+  const content = isStoppedRunToolError(message, signal, error)
+    ? STOPPED_RUN_TOOL_ERROR
+    : `Error: ${message ?? 'Unknown error'}\n Please fix your mistakes.`;
+  return truncateToolResultContent(content, maxChars);
+}