merge: PR daggerhashimoto#233 slice/workspace-file-add-to-chat

Author: DerrickBarra

src/App.tsx

@@ -916,6 +916,7 @@ export default function App({ onLogout }: AppProps) {
               <FileTreePanel
                 workspaceAgentId={workspaceAgentId}
                 onOpenFile={openFile}
+                onAddToChat={(path, kind) => chatPanelRef.current?.addWorkspacePath(path, kind)}
                 lastChangedEvent={lastChangedEvent}
                 revealRequest={revealRequest}
                 onRemapOpenPaths={remapOpenPaths}
@@ -942,6 +943,7 @@ export default function App({ onLogout }: AppProps) {
                   <FileTreePanel
                     workspaceAgentId={workspaceAgentId}
                     onOpenFile={openFile}
+                    onAddToChat={(path, kind) => chatPanelRef.current?.addWorkspacePath(path, kind)}
                     lastChangedEvent={lastChangedEvent}
                     revealRequest={revealRequest}
                     onRemapOpenPaths={remapOpenPaths}

src/features/chat/ChatPanel.tsx

@@ -49,6 +49,7 @@ interface ChatPanelProps {
 
 export interface ChatPanelHandle {
   focusInput: () => void;
+  addWorkspacePath: (path: string, kind: 'file' | 'directory') => Promise<void>;
 }
 
 /** Main chat panel with message list, infinite scroll, search, and input bar. */
@@ -119,7 +120,10 @@ export const ChatPanel = forwardRef<ChatPanelHandle, ChatPanelProps>(function Ch
 
   // Expose focusInput to parent
   useImperativeHandle(ref, () => ({
-    focusInput: () => inputBarRef.current?.focus()
+    focusInput: () => inputBarRef.current?.focus(),
+    addWorkspacePath: async (path: string, kind: 'file' | 'directory') => {
+      await inputBarRef.current?.addWorkspacePath(path, kind);
+    },
   }), []);
 
   // Clean up stale messageRefs when messages change

src/features/file-browser/FileTreePanel.test.tsx

@@ -60,6 +60,7 @@ function createDeferred<T>() {
 }
 
 const mockOnOpenFile = vi.fn();
+const mockOnAddToChat = vi.fn();
 const mockOnRemapOpenPaths = vi.fn();
 const mockOnCloseOpenPaths = vi.fn();
 
@@ -200,6 +201,50 @@ describe('FileTreePanel', () => {
     });
   });
 
+  describe('context menu add to chat', () => {
+    it('shows "Add to chat" for files and calls the callback', async () => {
+      render(
+        <FileTreePanel
+          onOpenFile={mockOnOpenFile}
+          onAddToChat={mockOnAddToChat}
+          onRemapOpenPaths={mockOnRemapOpenPaths}
+          onCloseOpenPaths={mockOnCloseOpenPaths}
+          collapsed={false}
+        />
+      );
+
+      fireEvent.contextMenu(screen.getByText('package.json'), new MouseEvent('contextmenu', { bubbles: true }));
+
+      await waitFor(() => {
+        expect(screen.getByText('Add to chat')).toBeInTheDocument();
+      });
+
+      fireEvent.click(screen.getByText('Add to chat'));
+
+      await waitFor(() => {
+        expect(mockOnAddToChat).toHaveBeenCalledWith('package.json', 'file');
+      });
+    });
+
+    it('does not show "Add to chat" for directories', async () => {
+      render(
+        <FileTreePanel
+          onOpenFile={mockOnOpenFile}
+          onAddToChat={mockOnAddToChat}
+          onRemapOpenPaths={mockOnRemapOpenPaths}
+          onCloseOpenPaths={mockOnCloseOpenPaths}
+          collapsed={false}
+        />
+      );
+
+      fireEvent.contextMenu(screen.getByText('src'), new MouseEvent('contextmenu', { bubbles: true }));
+
+      await waitFor(() => {
+        expect(screen.queryByText('Add to chat')).not.toBeInTheDocument();
+      });
+    });
+  });
+
   describe('context menu for deletion', () => {
     it('shows "Move to Trash" for default workspace', async () => {
       render(

src/features/file-browser/FileTreePanel.tsx

@@ -6,7 +6,7 @@
  */
 
 import { useRef, useState, useCallback, useEffect } from 'react';
-import { PanelLeftClose, RefreshCw, Pencil, Trash2, RotateCcw, X } from 'lucide-react';
+import { PanelLeftClose, RefreshCw, Pencil, Trash2, RotateCcw, X, Paperclip } from 'lucide-react';
 import { FileTreeNode } from './FileTreeNode';
 import { useFileTree } from './hooks/useFileTree';
 import { ConfirmDialog } from '../../components/ConfirmDialog';
@@ -59,6 +59,7 @@ export interface FileTreeChangeEvent {
 interface FileTreePanelProps {
   workspaceAgentId: string;
   onOpenFile: (path: string) => void;
+  onAddToChat?: (path: string, kind: 'file' | 'directory') => Promise<void> | void;
   onRemapOpenPaths?: (fromPath: string, toPath: string, targetAgentId?: string) => void;
   onCloseOpenPaths?: (pathPrefix: string, targetAgentId?: string) => void;
   /** Called externally when a file changes (SSE) — refreshes affected directory. */
@@ -100,6 +101,7 @@ function isSameScopedSession<T extends ScopedSessionState>(current: T | null, ta
 export function FileTreePanel({
   workspaceAgentId = 'main',
   onOpenFile,
+  onAddToChat,
   onRemapOpenPaths,
   onCloseOpenPaths,
   lastChangedEvent,
@@ -669,6 +671,7 @@ export function FileTreePanel({
   const menuPath = menuEntry?.path || '';
   const menuInTrash = isTrashItemPath(menuPath);
   const showRestore = menuInTrash;
+  const showAddToChat = Boolean(onAddToChat && menuEntry?.type === 'file' && !menuPath.startsWith('.trash') && menuPath !== '.trash');
   const showRename = Boolean(menuEntry && menuPath !== '.trash');
   const showTrashAction = Boolean(menuEntry && !menuPath.startsWith('.trash') && menuPath !== '.trash');
 
@@ -793,6 +796,19 @@ export function FileTreePanel({
             </button>
           )}
 
+          {showAddToChat && (
+            <button
+              className="w-full px-3 py-1.5 text-left text-xs text-foreground hover:bg-muted/60 flex items-center gap-2"
+              onClick={() => {
+                setContextMenu(null);
+                void onAddToChat?.(menuEntry.path, 'file');
+              }}
+            >
+              <Paperclip size={12} />
+              Add to chat
+            </button>
+          )}
+
           {showRename && (
             <button
               className="w-full px-3 py-1.5 text-left text-xs text-foreground hover:bg-muted/60 flex items-center gap-2"
@@ -813,7 +829,7 @@ export function FileTreePanel({
             </button>
           )}
 
-          {!showRestore && !showRename && !showTrashAction && (
+          {!showRestore && !showAddToChat && !showRename && !showTrashAction && (
             <div className="px-3 py-1.5 text-xs text-muted-foreground">
               No actions
             </div>