@librechat/agents 3.1.79 → 3.1.80-dev.1

package/src/tools/ToolNode.ts

@@ -249,22 +249,73 @@ function normalizeApprovalDecisions(
  *  - `artifact.session_id` (the `sessionId` arg here) is the EXEC session
  *    — the sandbox VM that ran the code. It's transient and torn down
  *    post-execution; subsequent calls cannot reuse it as a sandbox.
- *  - `file.session_id` on each `artifact.files[i]` is the STORAGE
+ *  - `file.storage_session_id` on each `artifact.files[i]` is the STORAGE
  *    session — the file-server bucket prefix where the artifact actually
  *    lives and is served from.
  *
- * Per-file `session_id` is preserved (not overwritten with the exec id)
- * because `_injected_files` are looked up against the file-server's
- * storage path on subsequent tool calls. Stomping the storage id with
- * the exec id silently 404s every follow-up tool call within the same
- * run — `cat /mnt/data/foo.txt` reports "No such file or directory"
- * because the worker can't mount a file at a path the storage doesn't
- * know about. Fall back to `sessionId` only when the per-file id is
- * absent (older worker payloads).
+ * Per-file `storage_session_id` is preserved (not overwritten with the
+ * exec id) because `_injected_files` are looked up against the
+ * file-server's storage path on subsequent tool calls. Stomping the
+ * storage id with the exec id silently 404s every follow-up tool call
+ * within the same run — `cat /mnt/data/foo.txt` reports "No such file
+ * or directory" because the worker can't mount a file at a path the
+ * storage doesn't know about. Fall back to the exec id only when the
+ * per-file id is absent (e.g. inline `content` files have no persistent
+ * storage location).
  */
+/**
+ * Builds a `CodeEnvFile` ref from an arbitrary `FileRef`-like input,
+ * narrowing onto the discriminated union: `kind: 'skill'` requires
+ * `version`, other kinds forbid it.
+ *
+ * Defaults `kind` to `'user'` when unset — most ad-hoc files are
+ * user-private; shared resources (skills/agents) populate their kind
+ * upstream. A skill ref missing `version` falls back to `'user'` so
+ * the upstream contract bug surfaces as a degraded sessionKey rather
+ * than a runtime crash; primeSkillFiles is the only writer, and it
+ * always sets `version` — see LC packages/api/src/agents/skillFiles.ts.
+ *
+ * `resource_id` carries the entity-that-owns-this-file's-session
+ * identity (skill `_id` etc.); falls back to `id` (the storage
+ * file_id) for inputs that haven't been updated to send the field
+ * explicitly. The fallback degrades sessionKey resolution on the
+ * codeapi side for shared kinds (it'll match the storage nanoid
+ * against a skill _id and 403) — but won't crash, so an unmigrated
+ * client still produces a diagnosable error instead of a stack
+ * trace.
+ */
+function toInjectedFileRef(
+  file: {
+    id: string;
+    resource_id?: string;
+    name: string;
+    storage_session_id?: string;
+    kind?: t.CodeEnvKind;
+    version?: number;
+  },
+  execSessionId: string
+): t.CodeEnvFile {
+  const base = {
+    id: file.id,
+    resource_id: file.resource_id ?? file.id,
+    name: file.name,
+    /* Inline `content` files have no persistent storage location;
+     * fall back to the execution session id for those entries. */
+    storage_session_id: file.storage_session_id ?? execSessionId,
+  };
+  const kind = file.kind ?? 'user';
+  if (kind === 'skill' && file.version != null) {
+    return { ...base, kind: 'skill', version: file.version };
+  }
+  if (kind === 'agent') {
+    return { ...base, kind: 'agent' };
+  }
+  return { ...base, kind: 'user' };
+}
+
 function updateCodeSession(
   sessions: t.ToolSessionMap,
-  sessionId: string,
+  execSessionId: string,
   files: t.FileRefs | undefined
 ): void {
   const newFiles = files ?? [];
@@ -276,20 +327,20 @@ function updateCodeSession(
   if (newFiles.length > 0) {
     const filesWithSession: t.FileRefs = newFiles.map((file) => ({
       ...file,
-      session_id: file.session_id ?? sessionId,
+      storage_session_id: file.storage_session_id ?? execSessionId,
     }));
     const newFileNames = new Set(filesWithSession.map((f) => f.name));
     const filteredExisting = existingFiles.filter(
       (f) => !newFileNames.has(f.name)
     );
     sessions.set(Constants.EXECUTE_CODE, {
-      session_id: sessionId,
+      session_id: execSessionId,
       files: [...filteredExisting, ...filesWithSession],
       lastUpdated: Date.now(),
     });
   } else {
     sessions.set(Constants.EXECUTE_CODE, {
-      session_id: sessionId,
+      session_id: execSessionId,
       files: existingFiles,
       lastUpdated: Date.now(),
     });
@@ -400,7 +451,10 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
     this.loadRuntimeTools = loadRuntimeTools;
     this.errorHandler = errorHandler;
     this.toolUsageCount = new Map<string, number>();
-    this.toolRegistry = resolveLocalToolRegistry({ toolRegistry, toolExecution });
+    this.toolRegistry = resolveLocalToolRegistry({
+      toolRegistry,
+      toolExecution,
+    });
     this.sessions = sessions;
     this.eventDrivenMode = eventDrivenMode ?? false;
     this.agentId = agentId;
@@ -581,8 +635,10 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
       resolveFn = <T>(_runId: string | undefined, args: T): ResolveResult<T> =>
         preBatchSnapshot.resolve(args);
     } else if (registry != null) {
-      resolveFn = <T>(runIdArg: string | undefined, args: T): ResolveResult<T> =>
-        registry.resolve(runIdArg, args);
+      resolveFn = <T>(
+        runIdArg: string | undefined,
+        args: T
+      ): ResolveResult<T> => registry.resolve(runIdArg, args);
     }
     /**
      * Precompute the reference key once per call — captured locally
@@ -717,20 +773,17 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
         const codeSession = this.sessions?.get(Constants.EXECUTE_CODE) as
           | t.CodeSessionContext
           | undefined;
-        if (codeSession?.session_id != null && codeSession.session_id !== '') {
+        const execSessionId = codeSession?.session_id;
+        if (execSessionId != null && execSessionId !== '') {
           invokeParams = {
             ...invokeParams,
-            session_id: codeSession.session_id,
+            session_id: execSessionId,
           };
 
-          if (codeSession.files != null && codeSession.files.length > 0) {
-            const fileRefs: t.CodeEnvFile[] = codeSession.files.map((file) => ({
-              session_id: file.session_id ?? codeSession.session_id,
-              id: file.id,
-              name: file.name,
-              ...(file.entity_id != null ? { entity_id: file.entity_id } : {}),
-            }));
-            invokeParams._injected_files = fileRefs;
+          if (codeSession?.files != null && codeSession.files.length > 0) {
+            invokeParams._injected_files = codeSession.files.map((file) =>
+              toInjectedFileRef(file, execSessionId)
+            );
           }
         }
       }
@@ -950,10 +1003,8 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
   ): Promise<BaseMessage | Command> {
     const runId = (config.configurable?.run_id as string | undefined) ?? '';
     const hookRegistry = this.hookRegistry;
-    const hasPreHook =
-      hookRegistry?.hasHookFor('PreToolUse', runId) === true;
-    const hasPostHook =
-      hookRegistry?.hasHookFor('PostToolUse', runId) === true;
+    const hasPreHook = hookRegistry?.hasHookFor('PreToolUse', runId) === true;
+    const hasPostHook = hookRegistry?.hasHookFor('PostToolUse', runId) === true;
     const hasFailureHook =
       hookRegistry?.hasHookFor('PostToolUseFailure', runId) === true;
 
@@ -989,8 +1040,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
     // assignment.)
     const cachedTurn =
       call.id != null && call.id !== ''
-        ? this.directPathTurns.get(call.id) ??
-          this.toolCallTurns.get(call.id)
+        ? (this.directPathTurns.get(call.id) ?? this.toolCallTurns.get(call.id))
         : undefined;
     if (cachedTurn != null) {
       usageCount = cachedTurn;
@@ -1156,10 +1206,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
             return this.blockDirectCall({
               call,
               resolvedArgs,
-              reason:
-                decision.reason ??
-                preResult.reason ??
-                'Rejected by user',
+              reason: decision.reason ?? preResult.reason ?? 'Rejected by user',
               hookRegistry,
               runId,
               threadId,
@@ -1173,7 +1220,8 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
               return this.blockDirectCall({
                 call,
                 resolvedArgs,
-                reason: 'Approval payload `respond` was missing a string `responseText`',
+                reason:
+                  'Approval payload `respond` was missing a string `responseText`',
                 hookRegistry,
                 runId,
                 threadId,
@@ -1464,17 +1512,15 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
       return undefined;
     }
 
+    const execSessionId = codeSession.session_id;
     const context: NonNullable<t.ToolCallRequest['codeSessionContext']> = {
-      session_id: codeSession.session_id,
+      session_id: execSessionId,
     };
 
     if (codeSession.files && codeSession.files.length > 0) {
-      context.files = codeSession.files.map((file) => ({
-        session_id: file.session_id ?? codeSession.session_id,
-        id: file.id,
-        name: file.name,
-        ...(file.entity_id != null ? { entity_id: file.entity_id } : {}),
-      }));
+      context.files = codeSession.files.map((file) =>
+        toInjectedFileRef(file, execSessionId)
+      );
     }
 
     return context;
@@ -1509,11 +1555,12 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
       }
 
       const artifact = result.artifact as t.CodeExecutionArtifact | undefined;
-      if (artifact?.session_id == null || artifact.session_id === '') {
+      const execSessionId = artifact?.session_id;
+      if (execSessionId == null || execSessionId === '') {
         continue;
       }
 
-      updateCodeSession(this.sessions, artifact.session_id!, artifact.files);
+      updateCodeSession(this.sessions, execSessionId, artifact?.files);
     }
   }
 
@@ -1558,8 +1605,9 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
         const artifact = toolMessage.artifact as
           | t.CodeExecutionArtifact
           | undefined;
-        if (artifact?.session_id != null && artifact.session_id !== '') {
-          updateCodeSession(this.sessions, artifact.session_id, artifact.files);
+        const execSessionId = artifact?.session_id;
+        if (execSessionId != null && execSessionId !== '') {
+          updateCodeSession(this.sessions, execSessionId, artifact?.files);
         }
       }
 

package/src/tools/__tests__/ProgrammaticToolCalling.test.ts

@@ -1064,8 +1064,11 @@ for member in team:
   });
 
   describe('bash bridge script does not require python3 (Codex P2 #19)', () => {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { _createBashProgramForTests } = require('../local/LocalProgrammaticToolCalling');
+    /* eslint-disable @typescript-eslint/no-require-imports */
+    const {
+      _createBashProgramForTests,
+    } = require('../local/LocalProgrammaticToolCalling');
+    /* eslint-enable @typescript-eslint/no-require-imports */
 
     it('uses curl as the primary HTTP helper with python3 only as fallback', () => {
       const script: string = _createBashProgramForTests(
@@ -1129,6 +1132,7 @@ for member in team:
       const registry = new HookRegistry();
       registry.register('PreToolUse', {
         hooks: [
+          // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
           async (input) => {
             if (input.toolName === 'write_file') {
               return { decision: 'deny', reason: 'no writes from bridge' };
@@ -1179,6 +1183,7 @@ for member in team:
 
       const registry = new HookRegistry();
       registry.register('PreToolUse', {
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
         hooks: [async () => ({ decision: 'allow' })],
       });
 
@@ -1200,6 +1205,7 @@ for member in team:
       const registry = new HookRegistry();
       registry.register('PreToolUse', {
         hooks: [
+          // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
           async () => ({
             decision: 'allow',
             updatedInput: { file_path: '/tmp/rewritten' },
@@ -1224,6 +1230,7 @@ for member in team:
 
       const registry = new HookRegistry();
       registry.register('PreToolUse', {
+        // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
         hooks: [async () => ({ decision: 'ask' })],
       });