From c85ce2161e6f608bbebc432e72f2241d0f572517 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 14 Apr 2026 21:43:41 -0400
Subject: [PATCH] fix: pass entity_id on multi-skill batch upload, consistent
 identifier format

---
 packages/api/src/agents/skillFiles.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/agents/skillFiles.ts b/packages/api/src/agents/skillFiles.ts
index 399147bdc9..46e600eb07 100644
--- a/packages/api/src/agents/skillFiles.ts
+++ b/packages/api/src/agents/skillFiles.ts
@@ -368,10 +368,14 @@ export async function primeInvokedSkills(
 
     if (allFileStreams.length > 0) {
       try {
+        // Use first skill's ID as entity_id — scopes the shared session to a
+        // stable key so freshness checks with ?entity_id= pass session auth.
+        const batchEntityId = skillsWithFiles[0]._id.toString();
         const result = await deps.batchUploadCodeEnvFiles({
           req: deps.req,
           files: allFileStreams,
           apiKey,
+          entity_id: batchEntityId,
         });
 
         sessions = new Map();
@@ -399,13 +403,10 @@ export async function primeInvokedSkills(
                   `[primeInvokedSkills] No skill record found for filename "${f.filename}"`,
                 );
               }
-              const entityId = record?.skill._id?.toString() ?? '';
               return {
                 skillId: record?.skill._id ?? '',
                 relativePath: relPath,
-                codeEnvIdentifier: entityId
-                  ? `${result.session_id}/${f.fileId}?entity_id=${entityId}`
-                  : `${result.session_id}/${f.fileId}`,
+                codeEnvIdentifier: `${result.session_id}/${f.fileId}?entity_id=${batchEntityId}`,
               };
             })
             .filter((u) => u.skillId !== '');