fix issue with cc agents

thetronjohnson · 123vivekr · commit 86bd6d6ae742 · 2025-08-11T15:11:35.000+05:30
diff --git a/src-tauri/src/commands/claude.rs b/src-tauri/src/commands/claude.rs
@@ -307,15 +307,6 @@ pub async fn get_home_directory() -> Result<String, String> {
         .ok_or_else(|| "Could not determine home directory".to_string())
 }
 
-/// Opens native folder picker and returns selected path
-#[tauri::command]
-pub async fn pick_folder() -> Result<Option<String>, String> {
-    use tauri_plugin_dialog::DialogExt;
-    
-    // Note: This requires the dialog plugin to be initialized in main.rs
-    // The actual dialog will be shown from the frontend using the plugin
-    Ok(None)
-}
 
 /// Lists all projects in the ~/.claude/projects directory
 #[tauri::command]
diff --git a/src/components/AgentExecution.tsx b/src/components/AgentExecution.tsx
diff --git a/src/components/Agents.tsx b/src/components/Agents.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
-import { Bot, Loader2, Play, Clock, CheckCircle, XCircle, Trash2, Import, ChevronDown, FileJson, Globe, Download, Plus } from 'lucide-react';
+import { Bot, Loader2, Play, Clock, CheckCircle, XCircle, Trash2, Import, ChevronDown, ChevronRight, FileJson, Globe, Download, Plus, History } from 'lucide-react';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -13,12 +13,12 @@ import { Badge } from '@/components/ui/badge';
 import { Card } from '@/components/ui/card';
 import { Toast } from '@/components/ui/toast';
 import { api, type Agent, type AgentRunWithMetrics } from '@/lib/api';
-import { useTabState } from '@/hooks/useTabState';
 import { formatISOTimestamp } from '@/lib/date-utils';
 import { open as openDialog, save } from '@tauri-apps/plugin-dialog';
 import { invoke } from '@tauri-apps/api/core';
 import { GitHubAgentBrowser } from '@/components/GitHubAgentBrowser';
 import { CreateAgent } from '@/components/CreateAgent';
+import { useTabState } from '@/hooks/useTabState';
 
 export const Agents: React.FC = () => {
   const [activeTab, setActiveTab] = useState('agents');
@@ -62,7 +62,7 @@ export const Agents: React.FC = () => {
 
   const loadRunningAgents = async () => {
     try {
-      const runs = await api.listAgentRuns();
+      const runs = await api.listAgentRunsWithMetrics();
       setRunningAgents(runs);
     } catch (error) {
       console.error('Failed to load running agents:', error);
@@ -74,14 +74,33 @@ export const Agents: React.FC = () => {
       setToast({ message: 'Agent ID is missing', type: 'error' });
       return;
     }
+    
+    // Import the dialog function
+    const { open } = await import('@tauri-apps/plugin-dialog');
+    
     try {
-      const runId = await api.executeAgent(agent.id, '', 'Run agent', undefined);
-      createAgentTab(runId.toString(), agent.name);
-      setToast({ message: `Started agent: ${agent.name}`, type: 'success' });
-      loadRunningAgents();
+      // Prompt user to select a project directory
+      const projectPath = await open({
+        directory: true,
+        multiple: false,
+        title: `Select project directory for ${agent.name}`
+      });
+      
+      if (!projectPath) {
+        // User cancelled
+        return;
+      }
+      
+      // Dispatch event to open agent execution in a new tab
+      const tabId = `agent-exec-${agent.id}-${Date.now()}`;
+      window.dispatchEvent(new CustomEvent('open-agent-execution', { 
+        detail: { agent, tabId, projectPath } 
+      }));
+      
+      setToast({ message: `Opening agent: ${agent.name}`, type: 'success' });
     } catch (error) {
-      console.error('Failed to run agent:', error);
-      setToast({ message: `Failed to run agent: ${agent.name}`, type: 'error' });
+      console.error('Failed to open agent:', error);
+      setToast({ message: `Failed to open agent: ${agent.name}`, type: 'error' });
     }
   };
 
@@ -292,8 +311,8 @@ export const Agents: React.FC = () => {
                 Agents ({agents.length})
               </TabsTrigger>
               <TabsTrigger value="running" className="py-2.5 px-3">
-                <Loader2 className="w-4 h-4 mr-2" />
-                Running ({runningAgents.length})
+                <History className="w-4 h-4 mr-2" />
+                History ({runningAgents.length})
               </TabsTrigger>
             </TabsList>
 
@@ -381,8 +400,8 @@ export const Agents: React.FC = () => {
               {runningAgents.length === 0 ? (
                 <Card className="p-12">
                   <div className="flex flex-col items-center justify-center text-center">
-                    <Loader2 className="w-12 h-12 text-muted-foreground mb-4" />
-                    <h3 className="text-lg font-semibold mb-2">No Running Agents</h3>
+                    <History className="w-12 h-12 text-muted-foreground mb-4" />
+                    <h3 className="text-lg font-semibold mb-2">No Agent History</h3>
                     <p className="text-muted-foreground">
                       Run an agent to see it here
                     </p>
@@ -404,26 +423,27 @@ export const Agents: React.FC = () => {
                           </Badge>
                         </div>
                         <Button
-                          size="sm"
-                          variant="outline"
+                          size="icon"
+                          variant="ghost"
                           onClick={() => createAgentTab(run.id?.toString() || '', run.agent_name)}
+                          className="h-8 w-8"
                         >
-                          View
+                          <ChevronRight className="w-4 h-4" />
                         </Button>
                       </div>
 
                       <div className="grid grid-cols-3 gap-4 text-sm">
                         <div>
                           <span className="text-muted-foreground">Started:</span>
-                          <p className="font-medium">{formatISOTimestamp(run.created_at)}</p>
+                          <p className="font-medium">{new Date(run.created_at).toLocaleString()}</p>
                         </div>
                         <div>
                           <span className="text-muted-foreground">Duration:</span>
-                          <p className="font-medium">{run.metrics?.duration_ms ? `${(run.metrics.duration_ms / 1000).toFixed(1)}s` : 'N/A'}</p>
+                          <p className="font-medium">{run.metrics?.duration_ms ? `${(run.metrics.duration_ms / 1000).toFixed(1)}s` : run.duration_ms ? `${(run.duration_ms / 1000).toFixed(1)}s` : '—'}</p>
                         </div>
                         <div>
                           <span className="text-muted-foreground">Tokens:</span>
-                          <p className="font-medium">{run.metrics?.total_tokens?.toLocaleString() || '0'}</p>
+                          <p className="font-medium">{run.metrics?.total_tokens ? run.metrics.total_tokens.toLocaleString() : run.total_tokens ? run.total_tokens.toLocaleString() : '—'}</p>
                         </div>
                       </div>
 
diff --git a/src/components/AgentsModal.tsx b/src/components/AgentsModal.tsx
@@ -94,16 +94,35 @@ export const AgentsModal: React.FC<AgentsModalProps> = ({ open, onOpenChange })
   };
 
   const handleRunAgent = async (agent: Agent) => {
-    // Create a new agent execution tab
-    const tabId = `agent-exec-${agent.id}-${Date.now()}`;
+    // Open directory picker for project path
+    const { open } = await import('@tauri-apps/plugin-dialog');
     
-    // Close modal
-    onOpenChange(false);
-    
-    // Dispatch event to open agent execution in the new tab
-    window.dispatchEvent(new CustomEvent('open-agent-execution', { 
-      detail: { agent, tabId } 
-    }));
+    try {
+      const projectPath = await open({
+        directory: true,
+        multiple: false,
+        title: `Select project directory for ${agent.name}`
+      });
+      
+      if (!projectPath) {
+        // User cancelled
+        return;
+      }
+      
+      // Create a new agent execution tab
+      const tabId = `agent-exec-${agent.id}-${Date.now()}`;
+      
+      // Close modal
+      onOpenChange(false);
+      
+      // Dispatch event to open agent execution in the new tab with project path
+      window.dispatchEvent(new CustomEvent('open-agent-execution', { 
+        detail: { agent, tabId, projectPath } 
+      }));
+    } catch (error) {
+      console.error('Failed to run agent:', error);
+      setToast({ message: `Failed to run agent: ${agent.name}`, type: 'error' });
+    }
   };
 
   const handleDeleteAgent = async (agent: Agent) => {
diff --git a/src/components/ProjectList.tsx b/src/components/ProjectList.tsx
@@ -118,7 +118,7 @@ export const ProjectList: React.FC<ProjectListProps> = ({
         <div className="p-6">
           <div className="flex items-center justify-between">
             <div>
-              <h1 className="text-heading-1">Projects</h1>
+              <h1 className="text-3xl font-bold">Projects</h1>
               <p className="mt-1 text-body-small text-muted-foreground">
                 Select a project to start working with Claude Code
               </p>
diff --git a/src/components/TabContent.tsx b/src/components/TabContent.tsx
@@ -309,6 +309,8 @@ const TabPanel: React.FC<TabPanelProps> = ({ tab, isActive }) => {
         return (
           <AgentExecution
             agent={tab.agentData}
+            projectPath={tab.projectPath}
+            tabId={tab.id}
             onBack={() => {}}
           />
         );
@@ -395,8 +397,8 @@ export const TabContent: React.FC = () => {
     };
 
     const handleOpenAgentExecution = (event: CustomEvent) => {
-      const { agent, tabId } = event.detail;
-      createAgentExecutionTab(agent, tabId);
+      const { agent, tabId, projectPath } = event.detail;
+      createAgentExecutionTab(agent, tabId, projectPath);
     };
 
     const handleOpenCreateAgentTab = () => {
diff --git a/src/contexts/TabContext.tsx b/src/contexts/TabContext.tsx
@@ -10,6 +10,7 @@ export interface Tab {
   agentData?: any; // for agent-execution tabs
   claudeFileId?: string; // for claude-file tabs
   initialProjectPath?: string; // for chat tabs
+  projectPath?: string; // for agent-execution tabs
   status: 'active' | 'idle' | 'running' | 'complete' | 'error';
   hasUnsavedChanges: boolean;
   order: number;
diff --git a/src/hooks/useTabState.ts b/src/hooks/useTabState.ts
@@ -14,7 +14,7 @@ interface UseTabStateReturn {
   // Operations
   createChatTab: (projectId?: string, title?: string, projectPath?: string) => string;
   createAgentTab: (agentRunId: string, agentName: string) => string;
-  createAgentExecutionTab: (agent: any, tabId: string) => string;
+  createAgentExecutionTab: (agent: any, tabId: string, projectPath?: string) => string;
   createProjectsTab: () => string | null;
   createAgentsTab: () => string | null;
   createUsageTab: () => string | null;
@@ -206,11 +206,12 @@ export const useTabState = (): UseTabStateReturn => {
     });
   }, [addTab, tabs, setActiveTab]);
 
-  const createAgentExecutionTab = useCallback((agent: any, _tabId: string): string => {
+  const createAgentExecutionTab = useCallback((agent: any, _tabId: string, projectPath?: string): string => {
     return addTab({
       type: 'agent-execution',
       title: `Run: ${agent.name}`,
       agentData: agent,
+      projectPath: projectPath,
       status: 'idle',
       hasUnsavedChanges: false,
       icon: 'bot'
diff --git a/src/lib/api.ts b/src/lib/api.ts
@@ -848,9 +848,9 @@ export const api = {
   },
 
   /**
-   * Lists agent runs with metrics
+   * Lists agent runs without metrics (basic info only)
    * @param agentId - Optional agent ID to filter runs
-   * @returns Promise resolving to an array of agent runs with metrics
+   * @returns Promise resolving to an array of agent runs
    */
   async listAgentRuns(agentId?: number): Promise<AgentRunWithMetrics[]> {
     try {
@@ -862,6 +862,21 @@ export const api = {
     }
   },
 
+  /**
+   * Lists agent runs with metrics (includes token counts and duration)
+   * @param agentId - Optional agent ID to filter runs
+   * @returns Promise resolving to an array of agent runs with metrics
+   */
+  async listAgentRunsWithMetrics(agentId?: number): Promise<AgentRunWithMetrics[]> {
+    try {
+      return await invoke<AgentRunWithMetrics[]>('list_agent_runs_with_metrics', { agentId });
+    } catch (error) {
+      console.error("Failed to list agent runs with metrics:", error);
+      // Return empty array instead of throwing to prevent UI crashes
+      return [];
+    }
+  },
+
   /**
    * Gets a single agent run by ID with metrics
    * @param id - The run ID
