@librechat/agents 3.1.79 → 3.1.80-dev.1

package/dist/cjs/tools/ToolNode.cjs

@@ -123,39 +123,79 @@ function normalizeApprovalDecisions(callIds, resumeValue) {
  *  - `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).
  */
-function updateCodeSession(sessions, sessionId, files) {
+/**
+ * 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, execSessionId) {
+    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, execSessionId, files) {
     const newFiles = files ?? [];
     const existingSession = sessions.get(_enum.Constants.EXECUTE_CODE);
     const existingFiles = existingSession?.files ?? [];
     if (newFiles.length > 0) {
         const filesWithSession = 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(_enum.Constants.EXECUTE_CODE, {
-            session_id: sessionId,
+            session_id: execSessionId,
             files: [...filteredExisting, ...filesWithSession],
             lastUpdated: Date.now(),
         });
     }
     else {
         sessions.set(_enum.Constants.EXECUTE_CODE, {
-            session_id: sessionId,
+            session_id: execSessionId,
             files: existingFiles,
             lastUpdated: Date.now(),
         });
@@ -242,7 +282,10 @@ class ToolNode extends run.RunnableCallable {
         this.loadRuntimeTools = loadRuntimeTools;
         this.errorHandler = errorHandler;
         this.toolUsageCount = new Map();
-        this.toolRegistry = resolveLocalExecutionTools.resolveLocalToolRegistry({ toolRegistry, toolExecution });
+        this.toolRegistry = resolveLocalExecutionTools.resolveLocalToolRegistry({
+            toolRegistry,
+            toolExecution,
+        });
         this.sessions = sessions;
         this.eventDrivenMode = eventDrivenMode ?? false;
         this.agentId = agentId;
@@ -509,19 +552,14 @@ class ToolNode extends run.RunnableCallable {
              */
             if (_enum.CODE_EXECUTION_TOOLS.has(call.name)) {
                 const codeSession = this.sessions?.get(_enum.Constants.EXECUTE_CODE);
-                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 = 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));
                     }
                 }
             }
@@ -737,8 +775,7 @@ class ToolNode extends run.RunnableCallable {
         // survives `run()`'s clear, so a resume sees the original
         // 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;
@@ -874,9 +911,7 @@ class ToolNode extends run.RunnableCallable {
                         return this.blockDirectCall({
                             call,
                             resolvedArgs,
-                            reason: decision.reason ??
-                                preResult.reason ??
-                                'Rejected by user',
+                            reason: decision.reason ?? preResult.reason ?? 'Rejected by user',
                             hookRegistry,
                             runId,
                             threadId,
@@ -1135,16 +1170,12 @@ class ToolNode extends run.RunnableCallable {
         if (!codeSession) {
             return undefined;
         }
+        const execSessionId = codeSession.session_id;
         const context = {
-            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;
     }
@@ -1169,10 +1200,11 @@ class ToolNode extends run.RunnableCallable {
                 continue;
             }
             const artifact = result.artifact;
-            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);
         }
     }
     /**
@@ -1205,8 +1237,9 @@ class ToolNode extends run.RunnableCallable {
             }
             if (this.sessions && _enum.CODE_EXECUTION_TOOLS.has(call.name)) {
                 const artifact = toolMessage.artifact;
-                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);
                 }
             }
             // Dispatch ON_RUN_STEP_COMPLETED via custom event (same path as dispatchToolEvents)