fix: allow users to put image paths anywhere in the message

Author: brandonkachen

npm-app/src/__tests__/image-upload.test.ts

@@ -1,6 +1,8 @@
-import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
-import { writeFileSync, unlinkSync, mkdirSync, rmSync } from 'fs'
+import { writeFileSync, mkdirSync, rmSync } from 'fs'
 import path from 'path'
+
+import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
+
 import {
   processImageFile,
   isImageFile,
@@ -163,14 +165,47 @@ describe('Image Upload Functionality', () => {
       expect(paths).toEqual([])
     })
 
+    test('should auto-detect bare relative paths with separators', () => {
+      const input = 'Check assets/multi-agents.png and images/logo.jpg'
+      const paths = extractImagePaths(input)
+      expect(paths).toEqual(['assets/multi-agents.png', 'images/logo.jpg'])
+    })
+
+    test('should auto-detect Windows-style bare relative paths', () => {
+      const input = 'See assets\\windows\\image.png'
+      const paths = extractImagePaths(input)
+      expect(paths).toEqual(['assets\\windows\\image.png'])
+    })
+
+    test('should NOT auto-detect URLs', () => {
+      const input =
+        'Visit https://example.com/image.png and http://site.com/photo.jpg'
+      const paths = extractImagePaths(input)
+      expect(paths).toEqual([])
+    })
+
+    test('should handle expanded trailing punctuation', () => {
+      const input =
+        'Files: assets/logo.png), ./images/banner.jpg], and ~/photos/pic.png>'
+      const paths = extractImagePaths(input)
+      expect(paths.sort()).toEqual(
+        ['./images/banner.jpg', '~/photos/pic.png', 'assets/logo.png'].sort(),
+      )
+    })
+
     test('should handle weird characters and spaces in quoted paths', () => {
-      const input = 'Files: "./ConstellationFS Demo · 1.21am · 09-11.jpeg" and \'../images/café ñoño (2024).png\''
+      const input =
+        'Files: "./ConstellationFS Demo · 1.21am · 09-11.jpeg" and \'../images/café ñoño (2024).png\''
       const paths = extractImagePaths(input)
-      expect(paths).toEqual(['./ConstellationFS Demo · 1.21am · 09-11.jpeg', '../images/café ñoño (2024).png'])
+      expect(paths).toEqual([
+        './ConstellationFS Demo · 1.21am · 09-11.jpeg',
+        '../images/café ñoño (2024).png',
+      ])
     })
 
     test('should require quotes for paths with spaces to avoid false positives', () => {
-      const input = '/Users/brandonchen/Downloads/ConstellationFS Demo · 1.21am · 09-11.jpeg'
+      const input =
+        '/Users/brandonchen/Downloads/ConstellationFS Demo · 1.21am · 09-11.jpeg'
       const paths = extractImagePaths(input)
       // Unquoted paths with spaces are not auto-detected to avoid false positives
       expect(paths).toEqual([])

npm-app/src/client.ts

@@ -1164,15 +1164,38 @@ export class Client {
     )
 
     // Replace each @agentName with @agentName (agentId)
-    cleanPrompt = cleanPrompt.replace(agentRegex, (match) => {
-      const agentName = match.substring(1).trim() // Remove @ and trim
-      const agentId = resolveNameToId(agentName, localAgentInfo)
+    // But skip @mentions that look like file paths (contain / or \)
+    cleanPrompt = cleanPrompt.replace(
+      agentRegex,
+      (match, agentName, offset, string) => {
+        // Check if this @ mention is part of a file path
+        const beforeMatch = string.substring(Math.max(0, offset - 10), offset)
+        const afterMatch = string.substring(
+          offset + match.length,
+          offset + match.length + 20,
+        )
 
-      if (agentId) {
-        return `@${agentName} (agent type: ${agentId})`
-      }
-      return match // Return original if no agent ID found
-    })
+        // Skip if this looks like a file path (contains / or \ nearby)
+        if (
+          beforeMatch.includes('/') ||
+          beforeMatch.includes('\\') ||
+          afterMatch.includes('/') ||
+          afterMatch.includes('\\') ||
+          match.includes('/') ||
+          match.includes('\\')
+        ) {
+          return match // Don't modify file paths
+        }
+
+        const trimmedAgentName = agentName.trim()
+        const agentId = resolveNameToId(trimmedAgentName, localAgentInfo)
+
+        if (agentId) {
+          return `@${trimmedAgentName} (agent type: ${agentId})`
+        }
+        return match // Return original if no agent ID found
+      },
+    )
 
     return cleanPrompt
   }

npm-app/src/utils/image-handler.ts

@@ -1,6 +1,7 @@
 import { readFileSync, statSync } from 'fs'
 import { homedir } from 'os'
 import path from 'path'
+
 import { Jimp } from 'jimp'
 
 import { logger } from './logger'
@@ -175,7 +176,6 @@ export async function processImageFile(
         const originalWidth = image.bitmap.width
         const originalHeight = image.bitmap.height
 
-        let bestBuffer = processedBuffer
         let bestBase64Size = base64Size
         let compressionAttempts = []
 
@@ -241,7 +241,6 @@ export async function processImageFile(
 
               // Keep track of the best attempt so far
               if (testBase64Size < bestBase64Size) {
-                bestBuffer = testBuffer
                 bestBase64Size = testBase64Size
               }
             } catch (attemptError) {
@@ -373,12 +372,17 @@ export function extractImagePaths(input: string): string[] {
   const pathRegexes = [
     // Absolute paths: /path/to/file, ~/path, C:\path (Windows)
     new RegExp(
-      `(?:^|\\s)((?:[~/]|[A-Za-z]:\\\\)[^\\s"']*\\.(?:${imageExts}))(?=\\s|$|[.,!?;])`,
+      `(?:^|\\s)((?:[~/]|[A-Za-z]:\\\\)[^\\s"']*\\.(?:${imageExts}))(?=\\s|$|[.,!?;)\\]}>])`,
       'gi',
     ),
     // Relative paths with separators: ./path/file, ../path/file
     new RegExp(
-      `(?:^|\\s)(\\.\\.?[\\/\\\\][^\\s"']*\\.(?:${imageExts}))(?=\\s|$|[.,!?;])`,
+      `(?:^|\\s)(\\.\\.?[\\/\\\\][^\\s"']*\\.(?:${imageExts}))(?=\\s|$|[.,!?;)\\]}>])`,
+      'gi',
+    ),
+    // Bare relative paths with separators (like assets/image.png)
+    new RegExp(
+      `(?:^|\\s)((?![^\\s]*:\\/\\/)[^\\s"':]*[\\/\\\\][^\\s"']*\\.(?:${imageExts}))(?=\\s|$|[.,!?;)\\]}>])`,
       'gi',
     ),
     // Quoted paths (single or double quotes)
@@ -388,7 +392,7 @@ export function extractImagePaths(input: string): string[] {
   // Extract paths using all regex patterns
   for (const regex of pathRegexes) {
     while ((match = regex.exec(cleanInput)) !== null) {
-      const path = match[1].replace(/[.,!?;]+$/, '') // Remove trailing punctuation
+      const path = match[1].replace(/[.,!?;)\]}>">]+$/, '') // Remove trailing punctuation
       if (isImageFile(path) && !paths.includes(path)) {
         paths.push(path)
       }