@aj-archipelago/cortex 1.4.28 → 1.4.29

package/lib/fileUtils.js

@@ -1444,33 +1444,36 @@ function getDefaultContext(agentContext) {
  * Load merged file collection from agentContext array
  * Merges all contexts in the array for read operations
  * @param {Array} agentContext - Array of context objects { contextId, contextKey, default }
+ * @param {string|null} chatId - Optional chat ID to filter files by (if provided, only includes files with '*' or this chatId in inCollection)
  * @returns {Promise<Array>} Merged file collection
  */
-async function loadMergedFileCollection(agentContext) {
+async function loadMergedFileCollection(agentContext, chatId = null) {
     if (!agentContext || !Array.isArray(agentContext) || agentContext.length === 0) {
         return [];
     }
     
-    // Load first context as primary - use loadFileCollectionAll to get all files (not filtered by inCollection)
+    // Load first context as primary
+    // If chatId is provided, use loadFileCollection to filter by chatId
+    // Otherwise, use loadFileCollectionAll to get all files (we'll filter by inCollection below)
     const primaryCtx = agentContext[0];
-    const primaryCollection = await loadFileCollectionAll(primaryCtx.contextId, primaryCtx.contextKey || null);
+    const primaryCollection = chatId 
+        ? await loadFileCollection(primaryCtx.contextId, primaryCtx.contextKey || null, true, chatId)
+        : await loadFileCollectionAll(primaryCtx.contextId, primaryCtx.contextKey || null);
     
     // Tag primary files with their source context
-    const collection = primaryCollection.map(f => ({ ...f, _contextId: primaryCtx.contextId }));
-    
-    // If only one context, return early
-    if (agentContext.length === 1) {
-        return collection;
-    }
+    let collection = primaryCollection.map(f => ({ ...f, _contextId: primaryCtx.contextId }));
     
     // Load and merge additional contexts
     for (let i = 1; i < agentContext.length; i++) {
         const ctx = agentContext[i];
         if (!ctx.contextId) continue;
         
-        // Load alternate collection - use loadFileCollectionAll to bypass inCollection filtering
-        // (we want ALL files from the alt context, not just global ones)
-        const altCollection = await loadFileCollectionAll(ctx.contextId, ctx.contextKey || null);
+        // Load alternate collection
+        // If chatId is provided, use loadFileCollection to filter by chatId
+        // Otherwise, use loadFileCollectionAll to get all files
+        const altCollection = chatId
+            ? await loadFileCollection(ctx.contextId, ctx.contextKey || null, true, chatId)
+            : await loadFileCollectionAll(ctx.contextId, ctx.contextKey || null);
         
         // Build set of existing identifiers from current collection
         const existingHashes = new Set(collection.map(f => f.hash).filter(Boolean));
@@ -1488,6 +1491,27 @@ async function loadMergedFileCollection(agentContext) {
         }
     }
     
+    // When chatId is null (includeAllChats=true), filter to only include files with inCollection set
+    // Agent tools should only see files that are actually in the collection (have inCollection set)
+    if (chatId === null) {
+        collection = collection.filter(file => {
+            const inCollection = file.inCollection;
+            
+            // Exclude files without inCollection set or with empty inCollection array/string
+            if (inCollection === undefined || inCollection === null || inCollection === false || inCollection === '') {
+                return false;
+            }
+            
+            // Exclude empty arrays (file not in any collection)
+            if (Array.isArray(inCollection) && inCollection.length === 0) {
+                return false;
+            }
+            
+            // Include files with inCollection set (truthy and non-empty)
+            return true;
+        });
+    }
+    
     return collection;
 }
 
@@ -2491,6 +2515,65 @@ function isTextMimeType(mimeType) {
     return false;
 }
 
+/**
+ * Build a standardized JSON response for file creation tools (image, video, slides).
+ * Provides consistent format with structured file objects and instructional message.
+ * 
+ * @param {Array} successfulFiles - Array of successful file objects, each with optional fileEntry and url/hash
+ * @param {Object} options - Configuration options
+ * @param {string} options.mediaType - Type of media: 'image' or 'video' (default: 'image')
+ * @param {string} options.action - Action description for message: 'Image generation', 'Video generation', etc.
+ * @param {Array} options.legacyUrls - Optional array of URLs for backward compatibility (imageUrls field)
+ * @returns {string} JSON string with success, count, message, files, and optional imageUrls
+ */
+function buildFileCreationResponse(successfulFiles, options = {}) {
+    const { 
+        mediaType = 'image', 
+        action = 'Generation',
+        legacyUrls = []
+    } = options;
+    
+    const files = successfulFiles.map((item) => {
+        if (item.fileEntry) {
+            const fe = item.fileEntry;
+            return {
+                hash: fe.hash || null,
+                displayFilename: fe.displayFilename || null,
+                url: fe.url || item.url,
+                addedDate: fe.addedDate || null,
+                tags: Array.isArray(fe.tags) ? fe.tags : []
+            };
+        } else {
+            return {
+                hash: item.hash || null,
+                displayFilename: null,
+                url: item.url,
+                addedDate: null,
+                tags: []
+            };
+        }
+    });
+    
+    const count = files.length;
+    const displayInstruction = mediaType === 'video'
+        ? 'Display videos using markdown link: [video description](url).'
+        : 'Display images using markdown: ![description](url).';
+    
+    const response = {
+        success: true,
+        count: count,
+        message: `${action} complete. ${count} ${mediaType}(s) uploaded and added to file collection. ${displayInstruction} Reference files by hash or displayFilename.`,
+        files: files
+    };
+    
+    // Add legacyUrls as imageUrls for backward compatibility if provided
+    if (legacyUrls && legacyUrls.length > 0) {
+        response.imageUrls = legacyUrls;
+    }
+    
+    return JSON.stringify(response);
+}
+
 export { 
     computeFileHash,
     computeBufferHash,
@@ -2522,6 +2605,7 @@ export {
     getRedisClient,
     checkHashExists,
     ensureShortLivedUrl,
+    buildFileCreationResponse,
     uploadFileToCloud,
     uploadImageToCloud,
     resolveFileHashesToContent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.4.28",
+  "version": "1.4.29",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "private": false,
   "repository": {

package/pathways/system/entity/tools/sys_tool_codingagent.js

@@ -83,8 +83,6 @@ export default {
         try {
             const { codingTask, userMessage, inputFiles, codingTaskKeywords, contextId } = args;
 
-            // pathwayResolver.executePathway should have already extracted contextId from agentContext,
-            // but validate it's present as a safety check
             if (!contextId) {
                 throw new Error("contextId is required. It should be provided via agentContext or contextId parameter.");
             }

package/pathways/system/entity/tools/sys_tool_editfile.js

@@ -2,7 +2,7 @@
 // Entity tool that modifies existing files by replacing line ranges or exact string matches
 import logger from '../../../../lib/logger.js';
 import { axios } from '../../../../lib/requestExecutor.js';
-import { uploadFileToCloud, findFileInCollection, loadMergedFileCollection, getDefaultContext, getMimeTypeFromFilename, deleteFileByHash, isTextMimeType, updateFileMetadata, writeFileDataToRedis, invalidateFileCollectionCache, getActualContentMimeType } from '../../../../lib/fileUtils.js';
+import { uploadFileToCloud, findFileInCollection, loadMergedFileCollection, getMimeTypeFromFilename, deleteFileByHash, isTextMimeType, updateFileMetadata, writeFileDataToRedis, invalidateFileCollectionCache, getActualContentMimeType } from '../../../../lib/fileUtils.js';
 
 // Maximum file size for editing (50MB) - prevents memory blowup on huge files
 const MAX_EDITABLE_FILE_SIZE = 50 * 1024 * 1024;
@@ -147,17 +147,15 @@ export default {
     executePathway: async ({args, runAllPrompts, resolver}) => {
         const { file, startLine, endLine, content, oldString, newString, replaceAll = false, agentContext, chatId } = args;
         
-        const defaultCtx = getDefaultContext(agentContext);
-        if (!defaultCtx) {
+        const { contextId, contextKey } = args;
+        if (!contextId) {
             const errorResult = {
                 success: false,
-                error: "agentContext with at least one default context is required"
+                error: "contextId is required. It should be provided via agentContext or contextId parameter."
             };
             resolver.tool = JSON.stringify({ toolUsed: "EditFile" });
             return JSON.stringify(errorResult);
         }
-        const contextId = defaultCtx.contextId;
-        const contextKey = defaultCtx.contextKey || null;
         
         // Determine which tool was called based on parameters
         const isSearchReplace = oldString !== undefined && newString !== undefined;

package/pathways/system/entity/tools/sys_tool_file_collection.js

@@ -3,7 +3,7 @@
 // Uses Redis hash maps (FileStoreMap:ctx:<contextId>) for storage
 // Supports atomic rename/tag/notes updates via UpdateFileMetadata
 import logger from '../../../../lib/logger.js';
-import { addFileToCollection, loadFileCollection, loadMergedFileCollection, findFileInCollection, deleteFileByHash, updateFileMetadata, invalidateFileCollectionCache, getDefaultContext } from '../../../../lib/fileUtils.js';
+import { addFileToCollection, loadFileCollection, loadMergedFileCollection, findFileInCollection, deleteFileByHash, updateFileMetadata, invalidateFileCollectionCache } from '../../../../lib/fileUtils.js';
 
 export default {
     prompt: [],
@@ -82,6 +82,10 @@ export default {
                             type: "number",
                             description: "Optional: Maximum number of results to return (default: 20)"
                         },
+                        includeAllChats: {
+                            type: "boolean",
+                            description: "Optional: Only use true if you need to search across all chats. Default (false) searches only the current chat, which is usually what you want."
+                        },
                         userMessage: {
                             type: "string",
                             description: "A user-friendly message that describes what you're doing with this tool"
@@ -114,6 +118,10 @@ export default {
                             type: "number",
                             description: "Optional: Maximum number of results to return (default: 50)"
                         },
+                        includeAllChats: {
+                            type: "boolean",
+                            description: "Optional: Only use true if you need to list files from all chats. Default (false) lists only the current chat, which is usually what you want."
+                        },
                         userMessage: {
                             type: "string",
                             description: "A user-friendly message that describes what you're doing with this tool"
@@ -198,12 +206,10 @@ export default {
     ],
 
     executePathway: async ({args, runAllPrompts, resolver}) => {
-        const defaultCtx = getDefaultContext(args.agentContext);
-        if (!defaultCtx) {
-            throw new Error("agentContext with at least one default context is required");
+        const { contextId, contextKey } = args;
+        if (!contextId) {
+            throw new Error("contextId is required. It should be provided via agentContext or contextId parameter.");
         }
-        const contextId = defaultCtx.contextId;
-        const contextKey = defaultCtx.contextKey || null;
         const chatId = args.chatId || null;
 
         // Determine which function was called based on which parameters are present
@@ -356,7 +362,7 @@ export default {
 
             } else if (isSearch) {
                 // Search collection
-                const { query, tags: filterTags = [], limit = 20 } = args;
+                const { query, tags: filterTags = [], limit = 20, includeAllChats = false } = args;
                 
                 if (!query || typeof query !== 'string') {
                     throw new Error("query is required and must be a string");
@@ -366,8 +372,15 @@ export default {
                 const safeFilterTags = Array.isArray(filterTags) ? filterTags : [];
                 const queryLower = query.toLowerCase();
                 
+                // Normalize query for flexible matching: treat spaces, dashes, underscores as equivalent
+                const normalizeForSearch = (str) => str.toLowerCase().replace(/[-_\s]+/g, ' ').trim();
+                const queryNormalized = normalizeForSearch(query);
+                
+                // Determine which chatId to use for filtering (null if includeAllChats is true)
+                const filterChatId = includeAllChats ? null : chatId;
+                
                 // Load primary collection for lastAccessed updates (only update files in primary context)
-                const primaryFiles = await loadFileCollection(contextId, contextKey, false);
+                const primaryFiles = await loadFileCollection(contextId, contextKey, false, filterChatId);
                 const now = new Date().toISOString();
                 
                 // Find matching files in primary collection and update lastAccessed directly
@@ -376,9 +389,9 @@ export default {
                     
                     // Fallback to filename if displayFilename is not set (for files uploaded before displayFilename was added)
                     const displayFilename = file.displayFilename || file.filename || '';
-                    const filenameMatch = displayFilename.toLowerCase().includes(queryLower);
-                    const notesMatch = file.notes && file.notes.toLowerCase().includes(queryLower);
-                    const tagMatch = Array.isArray(file.tags) && file.tags.some(tag => tag.toLowerCase().includes(queryLower));
+                    const filenameMatch = normalizeForSearch(displayFilename).includes(queryNormalized);
+                    const notesMatch = file.notes && normalizeForSearch(file.notes).includes(queryNormalized);
+                    const tagMatch = Array.isArray(file.tags) && file.tags.some(tag => normalizeForSearch(tag).includes(queryNormalized));
                     const matchesQuery = filenameMatch || notesMatch || tagMatch;
                     
                     const matchesTags = safeFilterTags.length === 0 || 
@@ -396,20 +409,26 @@ export default {
                 }
                 
                 // Load merged collection for search results (includes all agentContext files)
-                const updatedFiles = await loadMergedFileCollection(args.agentContext);
+                // Filter by chatId if includeAllChats is false and chatId is available
+                // loadMergedFileCollection now handles inCollection filtering centrally
+                const updatedFiles = await loadMergedFileCollection(args.agentContext, filterChatId);
                 
                 // Filter and sort results (for display only, not modifying)
                 let results = updatedFiles.filter(file => {
+                    // Filter by query and tags
                     // Fallback to filename if displayFilename is not set
                     const displayFilename = file.displayFilename || file.filename || '';
                     const filename = file.filename || '';
                     
                     // Check both displayFilename and filename for matches
-                    // (displayFilename may be different from filename, so check both)
-                    const filenameMatch = displayFilename.toLowerCase().includes(queryLower) || 
-                                         (filename && filename !== displayFilename && filename.toLowerCase().includes(queryLower));
-                    const notesMatch = file.notes && file.notes.toLowerCase().includes(queryLower);
-                    const tagMatch = Array.isArray(file.tags) && file.tags.some(tag => tag.toLowerCase().includes(queryLower));
+                    // Use normalized matching (treating spaces, dashes, underscores as equivalent)
+                    // so "News Corp" matches "News-Corp" and "News_Corp"
+                    const displayFilenameNorm = normalizeForSearch(displayFilename);
+                    const filenameNorm = normalizeForSearch(filename);
+                    const filenameMatch = displayFilenameNorm.includes(queryNormalized) || 
+                                         (filename && filename !== displayFilename && filenameNorm.includes(queryNormalized));
+                    const notesMatch = file.notes && normalizeForSearch(file.notes).includes(queryNormalized);
+                    const tagMatch = Array.isArray(file.tags) && file.tags.some(tag => normalizeForSearch(tag).includes(queryNormalized));
                     
                     const matchesQuery = filenameMatch || notesMatch || tagMatch;
                     
@@ -426,8 +445,8 @@ export default {
                     // Fallback to filename if displayFilename is not set
                     const aDisplayFilename = a.displayFilename || a.filename || '';
                     const bDisplayFilename = b.displayFilename || b.filename || '';
-                    const aFilenameMatch = aDisplayFilename.toLowerCase().includes(queryLower);
-                    const bFilenameMatch = bDisplayFilename.toLowerCase().includes(queryLower);
+                    const aFilenameMatch = normalizeForSearch(aDisplayFilename).includes(queryNormalized);
+                    const bFilenameMatch = normalizeForSearch(bDisplayFilename).includes(queryNormalized);
                     if (aFilenameMatch && !bFilenameMatch) return -1;
                     if (!aFilenameMatch && bFilenameMatch) return 1;
                     return new Date(b.addedDate) - new Date(a.addedDate);
@@ -437,11 +456,28 @@ export default {
                 results = results.slice(0, limit);
 
                 resolver.tool = JSON.stringify({ toolUsed: "SearchFileCollection" });
+                
+                // Build helpful message when no results found
+                let message;
+                if (results.length === 0) {
+                    const suggestions = [];
+                    if (chatId && !includeAllChats) {
+                        suggestions.push('try includeAllChats=true to search across all chats');
+                    }
+                    suggestions.push('use ListFileCollection to see all available files');
+                    
+                    message = `No files found matching "${query}". Count: 0. Suggestions: ${suggestions.join('; ')}.`;
+                } else {
+                    message = `Found ${results.length} file(s) matching "${query}". Use the hash or displayFilename to reference files in other tools.`;
+                }
+                
                 return JSON.stringify({
                     success: true,
                     count: results.length,
+                    message,
                     files: results.map(f => ({
                         id: f.id,
+                        hash: f.hash || null,
                         displayFilename: f.displayFilename || f.filename || null,
                         url: f.url,
                         gcs: f.gcs || null,
@@ -472,8 +508,9 @@ export default {
                 let filesToProcess = [];
 
                 // Load collection ONCE to find all files and their data
-                // Use useCache: false to get fresh data
-                const collection = await loadFileCollection(contextId, contextKey, false);
+                // Do NOT filter by chatId - remove should be able to delete files from any chat
+                // Use merged collection to include files from all agentContext contexts
+                const collection = await loadMergedFileCollection(args.agentContext, null);
                 
                 // Resolve all files and collect their info in a single pass
                 for (const target of targetFiles) {
@@ -498,7 +535,7 @@ export default {
                 }
 
                 if (filesToProcess.length === 0 && notFoundFiles.length > 0) {
-                    throw new Error(`No files found matching: ${notFoundFiles.join(', ')}`);
+                    throw new Error(`No files found matching: ${notFoundFiles.join(', ')}. Try using the file hash, URL, or filename instead of ID. If the file was found in a search, use the hash or filename from the search results.`);
                 }
 
                 // Import helpers for reference counting
@@ -523,15 +560,23 @@ export default {
                         // No chatId context - fully remove
                         filesToFullyDelete.push(fileInfo);
                     } else {
-                        // Remove this chatId from inCollection
-                        const updatedInCollection = removeChatIdFromInCollection(fileInfo.inCollection, chatId);
+                        // Check if current chatId is in the file's inCollection
+                        const currentChatInCollection = Array.isArray(fileInfo.inCollection) && fileInfo.inCollection.includes(chatId);
                         
-                        if (updatedInCollection.length === 0) {
-                            // No more references - fully delete
+                        if (!currentChatInCollection) {
+                            // File doesn't belong to current chat - fully remove it (cross-chat removal)
                             filesToFullyDelete.push(fileInfo);
                         } else {
-                            // Still has references from other chats - just update inCollection
-                            filesToUpdate.push({ ...fileInfo, updatedInCollection });
+                            // Remove this chatId from inCollection
+                            const updatedInCollection = removeChatIdFromInCollection(fileInfo.inCollection, chatId);
+                            
+                            if (updatedInCollection.length === 0) {
+                                // No more references - fully delete
+                                filesToFullyDelete.push(fileInfo);
+                            } else {
+                                // Still has references from other chats - just update inCollection
+                                filesToUpdate.push({ ...fileInfo, updatedInCollection });
+                            }
                         }
                     }
                 }
@@ -615,10 +660,15 @@ export default {
 
             } else {
                 // List collection (read-only, no locking needed)
-                const { tags: filterTags = [], sortBy = 'date', limit = 50 } = args;
+                const { tags: filterTags = [], sortBy = 'date', limit = 50, includeAllChats = false } = args;
+                
+                // Determine which chatId to use for filtering (null if includeAllChats is true)
+                const filterChatId = includeAllChats ? null : chatId;
                 
                 // Use merged collection to include files from all agentContext contexts
-                const collection = await loadMergedFileCollection(args.agentContext);
+                // Filter by chatId if includeAllChats is false and chatId is available
+                // loadMergedFileCollection now handles inCollection filtering centrally
+                const collection = await loadMergedFileCollection(args.agentContext, filterChatId);
                 let results = collection;
 
                 // Filter by tags if provided
@@ -646,12 +696,32 @@ export default {
                 results = results.slice(0, limit);
 
                 resolver.tool = JSON.stringify({ toolUsed: "ListFileCollection" });
+                
+                // Build helpful message
+                let message;
+                if (results.length === 0) {
+                    const suggestions = [];
+                    if (chatId && !includeAllChats) {
+                        suggestions.push('try includeAllChats=true to see files from all chats');
+                    }
+                    if (filterTags.length > 0) {
+                        suggestions.push('remove tag filters to see more files');
+                    }
+                    message = suggestions.length > 0 
+                        ? `No files in collection. Suggestions: ${suggestions.join('; ')}.`
+                        : 'No files in collection.';
+                } else {
+                    message = (results.length === collection.length) ? `Showing all ${results.length} file(s). These are ALL of the files that you can access. Use the hash or displayFilename to reference files in other tools.` : `Showing ${results.length} of ${collection.length} file(s). Use the hash or displayFilename to reference files in other tools.`;
+                }
+                
                 return JSON.stringify({
                     success: true,
                     count: results.length,
                     totalFiles: collection.length,
+                    message,
                     files: results.map(f => ({
                         id: f.id,
+                        hash: f.hash || null,
                         displayFilename: f.displayFilename || f.filename || null,
                         url: f.url,
                         gcs: f.gcs || null,

package/pathways/system/entity/tools/sys_tool_image.js

@@ -1,7 +1,7 @@
 // sys_tool_image.js
 // Entity tool that creates and modifies images for the entity to show to the user
 import { callPathway } from '../../../../lib/pathwayTools.js';
-import { uploadFileToCloud, addFileToCollection, resolveFileParameter } from '../../../../lib/fileUtils.js';
+import { uploadFileToCloud, addFileToCollection, resolveFileParameter, buildFileCreationResponse } from '../../../../lib/fileUtils.js';
 
 export default {
     prompt: [],
@@ -269,36 +269,13 @@ export default {
                                 };
                             });
                             
-                            // Return image info in the same format as availableFiles for the text message
-                            // Format: hash | filename | url | date | tags
-                            const imageList = successfulImages.map((img) => {
-                                if (img.fileEntry) {
-                                    // Use the file entry data from addFileToCollection
-                                    const fe = img.fileEntry;
-                                    const dateStr = fe.addedDate 
-                                        ? new Date(fe.addedDate).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-                                        : '';
-                                    const tagsStr = Array.isArray(fe.tags) ? fe.tags.join(',') : '';
-                                    return `${fe.hash || ''} | ${fe.displayFilename || ''} | ${fe.url || img.url} | ${dateStr} | ${tagsStr}`;
-                                } else {
-                                    // Fallback if file collection wasn't available
-                                    return `${img.hash || 'unknown'} | | ${img.url} | |`;
-                                }
-                            }).join('\n');
-                            
-                            const count = successfulImages.length;
                             const isModification = args.inputImages && Array.isArray(args.inputImages) && args.inputImages.length > 0;
-                            
-                            // Make the success message very explicit so the agent knows files were created and added to collection
-                            // This format matches availableFiles so the agent can reference them by hash/filename
                             const action = isModification ? 'Image modification' : 'Image generation';
-                            const message = `${action} completed successfully. ${count} image${count > 1 ? 's have' : ' has'} been generated, uploaded to cloud storage, and added to your file collection. The image${count > 1 ? 's are' : ' is'} now available in your file collection:\n\n${imageList}\n\nYou can reference these images by their hash, filename, or URL in future tool calls.`;
                             
-                            // Return JSON object with imageUrls (kept for backward compatibility, but explicit message should prevent looping)
-                            result = JSON.stringify({
-                                success: true,
-                                message: message,
-                                imageUrls: imageUrls
+                            result = buildFileCreationResponse(successfulImages, {
+                                mediaType: 'image',
+                                action: action,
+                                legacyUrls: imageUrls
                             });
                         }
                     }

package/pathways/system/entity/tools/sys_tool_image_gemini.js

@@ -1,7 +1,7 @@
 // sys_tool_image_gemini.js
 // Entity tool that creates and modifies images for the entity to show to the user
 import { callPathway } from '../../../../lib/pathwayTools.js';
-import { uploadImageToCloud, addFileToCollection, resolveFileParameter } from '../../../../lib/fileUtils.js';
+import { uploadImageToCloud, addFileToCollection, resolveFileParameter, buildFileCreationResponse } from '../../../../lib/fileUtils.js';
 
 export default {
     prompt: [],
@@ -247,34 +247,10 @@ export default {
                         };
                     });
                     
-                    // Return image info in the same format as availableFiles for the text message
-                    // Format: hash | filename | url | date | tags
-                    const imageList = successfulImages.map((img) => {
-                        if (img.fileEntry) {
-                            // Use the file entry data from addFileToCollection
-                            const fe = img.fileEntry;
-                            const dateStr = fe.addedDate 
-                                ? new Date(fe.addedDate).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-                                : '';
-                            const tagsStr = Array.isArray(fe.tags) ? fe.tags.join(',') : '';
-                            return `${fe.hash || ''} | ${fe.displayFilename || ''} | ${fe.url || img.url} | ${dateStr} | ${tagsStr}`;
-                        } else {
-                            // Fallback if file collection wasn't available
-                            return `${img.hash || 'unknown'} | | ${img.url} | |`;
-                        }
-                    }).join('\n');
-                    
-                    const count = successfulImages.length;
-                    
-                    // Make the success message very explicit so the agent knows files were created and added to collection
-                    // This format matches availableFiles so the agent can reference them by hash/filename
-                    const message = `Image generation completed successfully. ${count} image${count > 1 ? 's have' : ' has'} been generated, uploaded to cloud storage, and added to your file collection. The image${count > 1 ? 's are' : ' is'} now available in your file collection:\n\n${imageList}\n\nYou can reference these images by their hash, filename, or URL in future tool calls.`;
-                    
-                    // Return JSON object with imageUrls (kept for backward compatibility, but explicit message should prevent looping)
-                    return JSON.stringify({
-                        success: true,
-                        message: message,
-                        imageUrls: imageUrls
+                    return buildFileCreationResponse(successfulImages, {
+                        mediaType: 'image',
+                        action: 'Image generation',
+                        legacyUrls: imageUrls
                     });
                 } else {
                     throw new Error('Image generation failed: Images were generated but could not be uploaded to storage');

package/pathways/system/entity/tools/sys_tool_slides_gemini.js

@@ -1,7 +1,7 @@
 // sys_tool_slides_gemini.js
 // Entity tool that creates slides, infographics, and presentations using Gemini 3 Pro image generation
 import { callPathway } from '../../../../lib/pathwayTools.js';
-import { uploadImageToCloud, addFileToCollection, resolveFileParameter } from '../../../../lib/fileUtils.js';
+import { uploadImageToCloud, addFileToCollection, resolveFileParameter, buildFileCreationResponse } from '../../../../lib/fileUtils.js';
 
 export default {
     prompt: [],
@@ -61,6 +61,7 @@ export default {
     }],
     executePathway: async ({args, runAllPrompts, resolver}) => {
         const pathwayResolver = resolver;
+        const chatId = args.chatId || null;
 
         try {   
             let model = "gemini-pro-3-image";
@@ -184,7 +185,8 @@ export default {
                                         imageHash,
                                         null,
                                         pathwayResolver,
-                                        true // permanent => retention=permanent
+                                        true, // permanent => retention=permanent
+                                        chatId
                                     );
                                     
                                     // Use the file entry data for the return message
@@ -226,35 +228,10 @@ export default {
                         };
                     });
                     
-                    // Return image info in the same format as availableFiles for the text message
-                    // Format: hash | filename | url | date | tags
-                    const imageList = successfulImages.map((img) => {
-                        if (img.fileEntry) {
-                            // Use the file entry data from addFileToCollection
-                            const fe = img.fileEntry;
-                            const dateStr = fe.addedDate 
-                                ? new Date(fe.addedDate).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-                                : '';
-                            const tagsStr = Array.isArray(fe.tags) ? fe.tags.join(',') : '';
-                            return `${fe.hash || ''} | ${fe.displayFilename || ''} | ${fe.url || img.url} | ${dateStr} | ${tagsStr}`;
-                        } else {
-                            // Fallback if file collection wasn't available
-                            return `${img.hash || 'unknown'} | | ${img.url} | |`;
-                        }
-                    }).join('\n');
-                    
-                    const count = successfulImages.length;
-                    
-                    // Make the success message very explicit so the agent knows files were created and added to collection
-                    // This format matches availableFiles so the agent can reference them by hash/filename
-                    const message = `Slide/infographic generation completed successfully. ${count} image${count > 1 ? 's have' : ' has'} been generated, uploaded to cloud storage, and added to your file collection. The image${count > 1 ? 's are' : ' is'} now available in your file collection:\n\n${imageList}\n\nYou can reference these images by their hash, filename, or URL in future tool calls.`;
-                    
-                    // Return JSON object with imageUrls (kept for backward compatibility, but explicit message should prevent looping)
-                    // This prevents the agent from looping because it can't see the generated images
-                    return JSON.stringify({
-                        success: true,
-                        message: message,
-                        imageUrls: imageUrls
+                    return buildFileCreationResponse(successfulImages, {
+                        mediaType: 'image',
+                        action: 'Slide/infographic generation',
+                        legacyUrls: imageUrls
                     });
                 } else {
                     throw new Error('Slide generation failed: Content was generated but could not be uploaded to storage');

package/pathways/system/entity/tools/sys_tool_store_memory.js

@@ -58,8 +58,6 @@ export default {
             });
         }
 
-        // pathwayResolver.executePathway should have already extracted contextId from agentContext,
-        // but validate it's present as a safety check
         const { contextId, contextKey } = args;
         if (!contextId) {
             return JSON.stringify({ 

package/pathways/system/entity/tools/sys_tool_video_veo.js

@@ -1,7 +1,7 @@
 // sys_tool_video_veo.js
 // Entity tool that generates videos using Google Veo 3.1 Fast for the entity to show to the user
 import { callPathway } from '../../../../lib/pathwayTools.js';
-import { uploadFileToCloud, addFileToCollection, resolveFileParameter } from '../../../../lib/fileUtils.js';
+import { uploadFileToCloud, addFileToCollection, resolveFileParameter, buildFileCreationResponse } from '../../../../lib/fileUtils.js';
 import { config } from '../../../../config.js';
 import axios from 'axios';
 
@@ -345,34 +345,10 @@ export default {
                         };
                     });
                     
-                    // Return video info in the same format as availableFiles for the text message
-                    // Format: hash | filename | url | date | tags
-                    const videoList = successfulVideos.map((vid) => {
-                        if (vid.fileEntry) {
-                            // Use the file entry data from addFileToCollection
-                            const fe = vid.fileEntry;
-                            const dateStr = fe.addedDate 
-                                ? new Date(fe.addedDate).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
-                                : '';
-                            const tagsStr = Array.isArray(fe.tags) ? fe.tags.join(',') : '';
-                            return `${fe.hash || ''} | ${fe.displayFilename || ''} | ${fe.url || vid.url} | ${dateStr} | ${tagsStr}`;
-                        } else {
-                            // Fallback if file collection wasn't available
-                            return `${vid.hash || 'unknown'} | | ${vid.url} | |`;
-                        }
-                    }).join('\n');
-                    
-                    const count = successfulVideos.length;
-                    
-                    // Make the success message very explicit so the agent knows files were created and added to collection
-                    // This format matches availableFiles so the agent can reference them by hash/filename
-                    const message = `Video generation completed successfully. ${count} video${count > 1 ? 's have' : ' has'} been generated, uploaded to cloud storage, and added to your file collection. The video${count > 1 ? 's are' : ' is'} now available in your file collection:\n\n${videoList}\n\nYou can reference these videos by their hash, filename, or URL in future tool calls. Videos can be displayed using markdown image syntax, e.g. ![video](url)`;
-                    
-                    // Return JSON object with imageUrls (kept for backward compatibility, but explicit message should prevent looping)
-                    return JSON.stringify({
-                        success: true,
-                        message: message,
-                        imageUrls: imageUrls
+                    return buildFileCreationResponse(successfulVideos, {
+                        mediaType: 'video',
+                        action: 'Video generation',
+                        legacyUrls: imageUrls
                     });
                 } else {
                     // All videos failed to upload

package/pathways/system/entity/tools/sys_tool_view_image.js

@@ -1,7 +1,7 @@
 // sys_tool_view_image.js
 // Tool pathway that allows agents to view image files from the file collection
 import logger from '../../../../lib/logger.js';
-import { loadMergedFileCollection, findFileInCollection, ensureShortLivedUrl, getDefaultContext } from '../../../../lib/fileUtils.js';
+import { loadMergedFileCollection, findFileInCollection, ensureShortLivedUrl } from '../../../../lib/fileUtils.js';
 import { config } from '../../../../config.js';
 
 export default {
@@ -74,8 +74,7 @@ export default {
 
                 // Resolve to short-lived URL if possible
                 const fileHandlerUrl = config.get('whisperMediaApiUrl');
-                const defaultCtx = getDefaultContext(args.agentContext);
-                const fileWithShortLivedUrl = await ensureShortLivedUrl(foundFile, fileHandlerUrl, defaultCtx?.contextId || null);
+                const fileWithShortLivedUrl = await ensureShortLivedUrl(foundFile, fileHandlerUrl, args.contextId || null);
 
                 // Add to imageUrls array
                 imageUrls.push({

package/pathways/system/entity/tools/sys_tool_writefile.js

@@ -57,7 +57,7 @@ export default {
     },
 
     executePathway: async ({args, runAllPrompts, resolver}) => {
-        const { content, filename, tags = [], notes = '', contextId, contextKey } = args;
+        const { content, filename, tags = [], notes = '', contextId, contextKey, chatId } = args;
         
         // Validate inputs and return JSON error if invalid
         if (content === undefined || content === null) {
@@ -176,7 +176,8 @@ export default {
                         uploadResult.hash || null,
                         null, // fileUrl - not needed since we already uploaded
                         resolver,
-                        true // permanent => retention=permanent
+                        true, // permanent => retention=permanent
+                        chatId || null
                     );
                 } catch (collectionError) {
                     // Log but don't fail - file collection is optional
@@ -185,6 +186,19 @@ export default {
             }
 
             const fileSize = Buffer.byteLength(content, 'utf8');
+            
+            // Create explicit success message that clearly indicates completion and file collection status
+            // This format matches image generation tools to prevent agent loops
+            let message;
+            if (fileEntry) {
+                // File was added to collection - provide explicit completion message with reference info
+                const fileRef = fileEntry.hash || fileEntry.id || filename;
+                message = `File creation completed successfully. The file "${filename}" (${formatFileSize(fileSize)}) has been written, uploaded to cloud storage, and added to your file collection. The file is now available in your file collection and can be referenced by its hash (${fileEntry.hash || 'N/A'}), filename (${filename}), fileId (${fileEntry.id || 'N/A'}), or URL in future tool calls.`;
+            } else {
+                // File was uploaded but not added to collection (no contextId provided)
+                message = `File "${filename}" written and uploaded successfully (${formatFileSize(fileSize)}). File URL: ${uploadResult.url}`;
+            }
+            
             const result = {
                 success: true,
                 filename: filename,
@@ -194,7 +208,7 @@ export default {
                 fileId: fileEntry?.id || null,
                 size: fileSize,
                 sizeFormatted: formatFileSize(fileSize),
-                message: `File "${filename}" written and uploaded successfully (${formatFileSize(fileSize)})`
+                message: message
             };
 
             resolver.tool = JSON.stringify({ toolUsed: "WriteFile" });

package/tests/integration/features/tools/fileCollection.test.js

@@ -2389,3 +2389,324 @@ test('loadMergedFileCollection should dedupe files present in both contexts', as
         }
     }
 });
+
+test('File collection: SearchFileCollection filters by chatId by default', async t => {
+    const contextId = createTestContext();
+    const chatId1 = 'chat-1';
+    const chatId2 = 'chat-2';
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add file to chat-1
+        await addFileToCollection(contextId, null, 'https://example.com/chat1-file.pdf', null, 'chat1-file.pdf', [], '', 'hash-chat1', null, null, false, chatId1);
+        
+        // Add file to chat-2
+        await addFileToCollection(contextId, null, 'https://example.com/chat2-file.pdf', null, 'chat2-file.pdf', [], '', 'hash-chat2', null, null, false, chatId2);
+        
+        // Add global file (no chatId)
+        await addFileToCollection(contextId, null, 'https://example.com/global-file.pdf', null, 'global-file.pdf', [], '', 'hash-global', null, null, false, null);
+        
+        // Search from chat-1 - should only see chat-1 file and global file
+        const result1 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            query: 'file',
+            userMessage: 'Search from chat-1'
+        });
+        
+        const parsed1 = JSON.parse(result1);
+        t.is(parsed1.success, true);
+        t.is(parsed1.count, 2, 'Should find chat-1 file and global file');
+        const filenames1 = parsed1.files.map(f => f.displayFilename);
+        t.true(filenames1.includes('chat1-file.pdf'), 'Should include chat-1 file');
+        t.true(filenames1.includes('global-file.pdf'), 'Should include global file');
+        t.false(filenames1.includes('chat2-file.pdf'), 'Should not include chat-2 file');
+        
+        // Search from chat-2 - should only see chat-2 file and global file
+        const result2 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId2,
+            query: 'file',
+            userMessage: 'Search from chat-2'
+        });
+        
+        const parsed2 = JSON.parse(result2);
+        t.is(parsed2.success, true);
+        t.is(parsed2.count, 2, 'Should find chat-2 file and global file');
+        const filenames2 = parsed2.files.map(f => f.displayFilename);
+        t.true(filenames2.includes('chat2-file.pdf'), 'Should include chat-2 file');
+        t.true(filenames2.includes('global-file.pdf'), 'Should include global file');
+        t.false(filenames2.includes('chat1-file.pdf'), 'Should not include chat-1 file');
+        
+        // Search without chatId - should see all files (no filtering when chatId not provided)
+        const result3 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            query: 'file',
+            userMessage: 'Search without chatId'
+        });
+        
+        const parsed3 = JSON.parse(result3);
+        t.is(parsed3.success, true);
+        t.is(parsed3.count, 3, 'Should find all files when chatId not provided');
+        const filenames3 = parsed3.files.map(f => f.displayFilename);
+        t.true(filenames3.includes('chat1-file.pdf'), 'Should include chat-1 file');
+        t.true(filenames3.includes('chat2-file.pdf'), 'Should include chat-2 file');
+        t.true(filenames3.includes('global-file.pdf'), 'Should include global file');
+    } finally {
+        await cleanup(contextId);
+    }
+});
+
+test('File collection: SearchFileCollection with includeAllChats=true shows all files', async t => {
+    const contextId = createTestContext();
+    const chatId1 = 'chat-1';
+    const chatId2 = 'chat-2';
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add file to chat-1
+        await addFileToCollection(contextId, null, 'https://example.com/chat1-file.pdf', null, 'chat1-file.pdf', [], '', 'hash-chat1', null, null, false, chatId1);
+        
+        // Add file to chat-2
+        await addFileToCollection(contextId, null, 'https://example.com/chat2-file.pdf', null, 'chat2-file.pdf', [], '', 'hash-chat2', null, null, false, chatId2);
+        
+        // Add global file
+        await addFileToCollection(contextId, null, 'https://example.com/global-file.pdf', null, 'global-file.pdf', [], '', 'hash-global', null, null, false, null);
+        
+        // Search from chat-1 with includeAllChats=true - should see all files
+        const result = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            query: 'file',
+            includeAllChats: true,
+            userMessage: 'Search all chats from chat-1'
+        });
+        
+        const parsed = JSON.parse(result);
+        t.is(parsed.success, true);
+        t.is(parsed.count, 3, 'Should find all files from all chats');
+        const filenames = parsed.files.map(f => f.displayFilename);
+        t.true(filenames.includes('chat1-file.pdf'), 'Should include chat-1 file');
+        t.true(filenames.includes('chat2-file.pdf'), 'Should include chat-2 file');
+        t.true(filenames.includes('global-file.pdf'), 'Should include global file');
+    } finally {
+        await cleanup(contextId);
+    }
+});
+
+test('File collection: ListFileCollection filters by chatId by default', async t => {
+    const contextId = createTestContext();
+    const chatId1 = 'chat-1';
+    const chatId2 = 'chat-2';
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add file to chat-1
+        await addFileToCollection(contextId, null, 'https://example.com/chat1-file.pdf', null, 'chat1-file.pdf', [], '', 'hash-chat1', null, null, false, chatId1);
+        
+        // Add file to chat-2
+        await addFileToCollection(contextId, null, 'https://example.com/chat2-file.pdf', null, 'chat2-file.pdf', [], '', 'hash-chat2', null, null, false, chatId2);
+        
+        // Add global file
+        await addFileToCollection(contextId, null, 'https://example.com/global-file.pdf', null, 'global-file.pdf', [], '', 'hash-global', null, null, false, null);
+        
+        // List from chat-1 - should only see chat-1 file and global file
+        const result1 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            userMessage: 'List files from chat-1'
+        });
+        
+        const parsed1 = JSON.parse(result1);
+        t.is(parsed1.success, true);
+        t.is(parsed1.count, 2, 'Should find chat-1 file and global file');
+        t.is(parsed1.totalFiles, 2, 'Total should match count');
+        const filenames1 = parsed1.files.map(f => f.displayFilename);
+        t.true(filenames1.includes('chat1-file.pdf'), 'Should include chat-1 file');
+        t.true(filenames1.includes('global-file.pdf'), 'Should include global file');
+        t.false(filenames1.includes('chat2-file.pdf'), 'Should not include chat-2 file');
+        
+        // List from chat-2 - should only see chat-2 file and global file
+        const result2 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId2,
+            userMessage: 'List files from chat-2'
+        });
+        
+        const parsed2 = JSON.parse(result2);
+        t.is(parsed2.success, true);
+        t.is(parsed2.count, 2, 'Should find chat-2 file and global file');
+        const filenames2 = parsed2.files.map(f => f.displayFilename);
+        t.true(filenames2.includes('chat2-file.pdf'), 'Should include chat-2 file');
+        t.true(filenames2.includes('global-file.pdf'), 'Should include global file');
+        t.false(filenames2.includes('chat1-file.pdf'), 'Should not include chat-1 file');
+    } finally {
+        await cleanup(contextId);
+    }
+});
+
+test('File collection: ListFileCollection with includeAllChats=true shows all files', async t => {
+    const contextId = createTestContext();
+    const chatId1 = 'chat-1';
+    const chatId2 = 'chat-2';
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add file to chat-1
+        await addFileToCollection(contextId, null, 'https://example.com/chat1-file.pdf', null, 'chat1-file.pdf', [], '', 'hash-chat1', null, null, false, chatId1);
+        
+        // Add file to chat-2
+        await addFileToCollection(contextId, null, 'https://example.com/chat2-file.pdf', null, 'chat2-file.pdf', [], '', 'hash-chat2', null, null, false, chatId2);
+        
+        // Add global file
+        await addFileToCollection(contextId, null, 'https://example.com/global-file.pdf', null, 'global-file.pdf', [], '', 'hash-global', null, null, false, null);
+        
+        // List from chat-1 with includeAllChats=true - should see all files
+        const result = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            includeAllChats: true,
+            userMessage: 'List all files from chat-1'
+        });
+        
+        const parsed = JSON.parse(result);
+        t.is(parsed.success, true);
+        t.is(parsed.count, 3, 'Should find all files from all chats');
+        t.is(parsed.totalFiles, 3, 'Total should match count');
+        const filenames = parsed.files.map(f => f.displayFilename);
+        t.true(filenames.includes('chat1-file.pdf'), 'Should include chat-1 file');
+        t.true(filenames.includes('chat2-file.pdf'), 'Should include chat-2 file');
+        t.true(filenames.includes('global-file.pdf'), 'Should include global file');
+    } finally {
+        await cleanup(contextId);
+    }
+});
+
+test('File collection: RemoveFileFromCollection can remove files from any chat', async t => {
+    const contextId = createTestContext();
+    const chatId1 = 'chat-1';
+    const chatId2 = 'chat-2';
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add file to chat-1
+        await addFileToCollection(contextId, null, 'https://example.com/chat1-file.pdf', null, 'chat1-file.pdf', [], '', 'hash-chat1', null, null, false, chatId1);
+        
+        // Add file to chat-2
+        await addFileToCollection(contextId, null, 'https://example.com/chat2-file.pdf', null, 'chat2-file.pdf', [], '', 'hash-chat2', null, null, false, chatId2);
+        
+        // Add global file
+        await addFileToCollection(contextId, null, 'https://example.com/global-file.pdf', null, 'global-file.pdf', [], '', 'hash-global', null, null, false, null);
+        
+        // Search from chat-1 to get the file ID for chat-2's file
+        const searchResult = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            query: 'chat2',
+            includeAllChats: true,
+            userMessage: 'Search all chats to find chat-2 file'
+        });
+        const searchParsed = JSON.parse(searchResult);
+        t.is(searchParsed.success, true);
+        const chat2File = searchParsed.files.find(f => f.displayFilename === 'chat2-file.pdf');
+        t.truthy(chat2File, 'Should find chat-2 file when searching all chats');
+        const chat2FileId = chat2File.id || chat2File.hash || chat2File.url;
+        
+        // Remove chat-2's file from chat-1 context (cross-chat removal)
+        const removeResult = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1, // Calling from chat-1
+            fileIds: [chat2FileId],
+            userMessage: 'Remove chat-2 file from chat-1'
+        });
+        
+        const removeParsed = JSON.parse(removeResult);
+        t.is(removeParsed.success, true);
+        t.is(removeParsed.removedCount, 1);
+        t.is(removeParsed.removedFiles.length, 1);
+        t.is(removeParsed.removedFiles[0].displayFilename, 'chat2-file.pdf');
+        
+        // Verify chat-2 file is gone (search from chat-2)
+        const verifyResult = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId2,
+            userMessage: 'List files from chat-2'
+        });
+        const verifyParsed = JSON.parse(verifyResult);
+        t.is(verifyParsed.success, true);
+        t.is(verifyParsed.count, 1, 'Should only have global file left');
+        t.true(verifyParsed.files.some(f => f.displayFilename === 'global-file.pdf'));
+        t.false(verifyParsed.files.some(f => f.displayFilename === 'chat2-file.pdf'));
+        
+        // Verify chat-1 file is still there
+        const chat1Result = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            chatId: chatId1,
+            userMessage: 'List files from chat-1'
+        });
+        const chat1Parsed = JSON.parse(chat1Result);
+        t.is(chat1Parsed.success, true);
+        t.is(chat1Parsed.count, 2, 'Should have chat-1 file and global file');
+        t.true(chat1Parsed.files.some(f => f.displayFilename === 'chat1-file.pdf'));
+        t.true(chat1Parsed.files.some(f => f.displayFilename === 'global-file.pdf'));
+    } finally {
+        await cleanup(contextId);
+    }
+});
+
+test('File collection: SearchFileCollection normalizes separators (space/dash/underscore matching)', async t => {
+    const contextId = createTestContext();
+    
+    try {
+        const { addFileToCollection } = await import('../../../../lib/fileUtils.js');
+        
+        // Add files with different separator conventions
+        await addFileToCollection(contextId, null, 'https://example.com/news-corp-report.pdf', null, 'News-Corp-Report.pdf', [], '', 'hash-dashes', null, null, false, null);
+        await addFileToCollection(contextId, null, 'https://example.com/news_corp_annual.pdf', null, 'News_Corp_Annual.pdf', [], '', 'hash-underscores', null, null, false, null);
+        await addFileToCollection(contextId, null, 'https://example.com/unrelated.pdf', null, 'Unrelated-File.pdf', [], '', 'hash-unrelated', null, null, false, null);
+        
+        // Search with space: "News Corp" should match both "News-Corp" and "News_Corp"
+        const result = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            query: 'News Corp',
+            userMessage: 'Search with spaces'
+        });
+        
+        const parsed = JSON.parse(result);
+        t.is(parsed.success, true);
+        t.is(parsed.count, 2, 'Should find both files with different separators');
+        const filenames = parsed.files.map(f => f.displayFilename);
+        t.true(filenames.includes('News-Corp-Report.pdf'), 'Should match dash-separated');
+        t.true(filenames.includes('News_Corp_Annual.pdf'), 'Should match underscore-separated');
+        t.false(filenames.includes('Unrelated-File.pdf'), 'Should not match unrelated file');
+        
+        // Search with dash: "News-Corp" should also match both
+        const result2 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            query: 'News-Corp',
+            userMessage: 'Search with dashes'
+        });
+        
+        const parsed2 = JSON.parse(result2);
+        t.is(parsed2.success, true);
+        t.is(parsed2.count, 2, 'Dash search should also find both');
+        
+        // Search with underscore: "News_Corp" should also match both
+        const result3 = await callPathway('sys_tool_file_collection', {
+            agentContext: [{ contextId, contextKey: null, default: true }],
+            query: 'News_Corp',
+            userMessage: 'Search with underscores'
+        });
+        
+        const parsed3 = JSON.parse(result3);
+        t.is(parsed3.success, true);
+        t.is(parsed3.count, 2, 'Underscore search should also find both');
+    } finally {
+        await cleanup(contextId);
+    }
+});

package/tests/integration/features/tools/fileOperations.test.js

@@ -73,7 +73,7 @@ test('WriteFile: Write and upload text file', async t => {
         t.is(parsed.filename, filename);
         t.truthy(parsed.url);
         t.is(parsed.size, Buffer.byteLength(content, 'utf8'));
-        t.true(parsed.message.includes('written and uploaded successfully'));
+        t.true(parsed.message.includes('written') && parsed.message.includes('uploaded'));
     } finally {
         await cleanup(contextId);
     }

package/tests/integration/features/tools/writefile.test.js

@@ -70,7 +70,7 @@ test('WriteFile: Write and upload text file', async t => {
         t.is(parsed.filename, filename);
         t.truthy(parsed.url);
         t.is(parsed.size, Buffer.byteLength(content, 'utf8'));
-        t.true(parsed.message.includes('written and uploaded successfully'));
+        t.true(parsed.message.includes('written') && parsed.message.includes('uploaded'));
         
         // Verify it was added to file collection
         const collection = await loadFileCollection(contextId, null, false);