Merge pull request #127 from sudocode-ai/acp

properly support copilot in ACP mode and default all manual executions to be persistent executions

Author: alexngai

frontend/src/components/chat-widget/ExecutionSelector.tsx

@@ -29,7 +29,6 @@ const statusConfig: Record<
   pending: { icon: Clock, color: 'text-yellow-500', label: 'Pending' },
   running: { icon: PlayCircle, color: 'text-green-500', label: 'Running' },
   paused: { icon: PauseCircle, color: 'text-orange-500', label: 'Paused' },
-  waiting: { icon: Clock, color: 'text-blue-500', label: 'Waiting' },
   completed: { icon: CheckCircle2, color: 'text-blue-500', label: 'Completed' },
   failed: { icon: XCircle, color: 'text-red-500', label: 'Failed' },
   cancelled: { icon: XCircle, color: 'text-muted-foreground', label: 'Cancelled' },
@@ -69,7 +68,7 @@ export function ExecutionSelector({
 }: ExecutionSelectorProps) {
   // Group executions by status
   const grouped = useMemo(() => {
-    const activeStatuses: ExecutionStatus[] = ['running', 'pending', 'preparing', 'paused', 'waiting']
+    const activeStatuses: ExecutionStatus[] = ['running', 'pending', 'preparing', 'paused']
     const active = executions.filter((e) => activeStatuses.includes(e.status))
     const recent = executions
       .filter((e) => !activeStatuses.includes(e.status))

frontend/src/components/entities/IssueHoverContent.tsx

@@ -48,10 +48,6 @@ const executionStatusConfig: Record<ExecutionStatus, { label: string; color: str
     label: 'Paused',
     color: 'bg-yellow-100 text-yellow-700 dark:bg-yellow-900 dark:text-yellow-300',
   },
-  waiting: {
-    label: 'Waiting',
-    color: 'bg-blue-100 text-blue-700 dark:bg-blue-900 dark:text-blue-300',
-  },
   completed: {
     label: 'Completed',
     color: 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300',

frontend/src/components/executions/AgentConfigPanel.tsx

@@ -395,6 +395,7 @@ export function AgentConfigPanel({
     const defaults: ExecutionConfig = {
       mode: 'worktree',
       cleanupMode: 'manual',
+      sessionMode: 'persistent',
     }
 
     // Try to load from localStorage

frontend/src/components/executions/AgentSettingsDialog.tsx

@@ -373,9 +373,8 @@ export function AgentSettingsDialog({
                     </>
                   )}
 
-                  {/* Persistent Session Toggle (Claude Code only) */}
-                  {agentType === 'claude-code' && (
-                    <div className="space-y-4">
+                  {/* Persistent Session Toggle */}
+                  <div className="space-y-4">
                       <div className="flex items-center justify-between rounded-lg border p-4">
                         <div className="space-y-0.5">
                           <Label htmlFor="persistent-session" className="text-base">
@@ -387,7 +386,7 @@ export function AgentSettingsDialog({
                         </div>
                         <Switch
                           id="persistent-session"
-                          checked={config.sessionMode === 'persistent'}
+                          checked={config.sessionMode !== 'discrete'}
                           onCheckedChange={(checked) =>
                             onConfigChange({
                               sessionMode: checked ? 'persistent' : 'discrete',
@@ -397,7 +396,7 @@ export function AgentSettingsDialog({
                       </div>
 
                       {/* Additional options when persistent mode is enabled */}
-                      {config.sessionMode === 'persistent' && (
+                      {config.sessionMode !== 'discrete' && (
                         <div className="ml-4 space-y-4 border-l-2 border-muted pl-4">
                           <div className="flex items-center justify-between">
                             <div className="space-y-0.5">
@@ -456,7 +455,6 @@ export function AgentSettingsDialog({
                         </div>
                       )}
                     </div>
-                  )}
 
                   <div className="space-y-2">
                     <Label htmlFor="timeout">Timeout (ms)</Label>

frontend/src/components/executions/ExecutionChainTile.tsx

@@ -61,11 +61,6 @@ function renderStatusIcon(status: Execution['status']) {
           icon: <PauseCircle className="h-4 w-4 text-muted-foreground" />,
           label: 'Paused',
         }
-      case 'waiting':
-        return {
-          icon: <Clock className="h-4 w-4 text-blue-600" />,
-          label: 'Waiting',
-        }
       case 'completed':
         return {
           icon: <CheckCircle2 className="h-4 w-4 text-green-600" />,

frontend/src/components/executions/ExecutionHistory.tsx

@@ -39,11 +39,6 @@ const STATUS_CONFIG: Record<
     variant: 'outline',
     icon: <PauseCircle className="h-3 w-3" />,
   },
-  waiting: {
-    label: 'Waiting',
-    variant: 'default',
-    icon: <Clock className="h-3 w-3" />,
-  },
   completed: {
     label: 'Completed',
     variant: 'default',

frontend/src/components/executions/ExecutionMonitor.tsx

@@ -205,7 +205,7 @@ export function ExecutionMonitor({
   // Completed: completed, failed, cancelled, stopped
   const isActive = useMemo(() => {
     if (!executionProp) return true // Default to active if no execution prop
-    const activeStatuses = ['preparing', 'pending', 'running', 'paused', 'waiting']
+    const activeStatuses = ['preparing', 'pending', 'running', 'paused']
     return activeStatuses.includes(executionProp.status)
   }, [executionProp])
 
@@ -246,12 +246,12 @@ export function ExecutionMonitor({
       // For waiting/paused executions with no WebSocket data, use logs
       // This handles page reload where the agent isn't actively streaming
       const isWaitingOrPaused =
-        executionProp?.status === 'waiting' || executionProp?.status === 'paused'
+        executionProp?.status === 'pending' || executionProp?.status === 'paused'
       if (isWaitingOrPaused && !hasWsData && hasLogsData) {
         return {
           connectionStatus: 'connected',
           execution: {
-            status: (executionProp?.status || 'waiting') as ExecutionState['status'],
+            status: (executionProp?.status || 'pending') as ExecutionState['status'],
             runId: executionId,
             error: logsResult.error?.message || null,
             startTime: null,
@@ -302,7 +302,7 @@ export function ExecutionMonitor({
 
       // For PERSISTENT sessions with no WebSocket data yet but logs available,
       // show logs to prevent flash of empty content during transitions
-      // (e.g., when transitioning from 'waiting' to 'running')
+      // (e.g., when transitioning from 'pending' to 'running')
       // Non-persistent sessions skip this - they wait for WebSocket to avoid duplicate content
       if (isPersistentSession && !hasWsData && hasLogsData) {
         return {
@@ -478,9 +478,8 @@ export function ExecutionMonitor({
     if (!onCancel) return
 
     const handleKeyDown = (event: KeyboardEvent) => {
-      // Only cancel if execution is active (not completed/failed/cancelled)
-      const activeStatuses = ['preparing', 'pending', 'running', 'paused', 'waiting']
-      if (event.key === 'Escape' && activeStatuses.includes(execution.status)) {
+      // Only cancel if execution is actively running
+      if (event.key === 'Escape' && execution.status === 'running') {
         event.preventDefault()
         onCancel()
       }
@@ -672,7 +671,7 @@ export function ExecutionMonitor({
       )
     }
 
-    if (execution.status === 'waiting') {
+    if (execution.status === 'pending') {
       return (
         <Badge variant="default" className="flex items-center gap-1 bg-blue-600">
           <Clock className="h-3 w-3" />

frontend/src/components/executions/ExecutionPreview.tsx

@@ -169,7 +169,7 @@ export function ExecutionPreview({
   // Determine if execution is active or completed
   const isActive = useMemo(() => {
     if (!executionProp) return true
-    const activeStatuses = ['preparing', 'pending', 'running', 'paused', 'waiting']
+    const activeStatuses = ['preparing', 'pending', 'running', 'paused']
     return activeStatuses.includes(executionProp.status)
   }, [executionProp])
 

frontend/src/components/executions/ExecutionView.tsx

@@ -458,15 +458,35 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
   }, [])
 
   // Handle cancel action for a specific execution
+  // For persistent sessions, this interrupts (stops current work, keeps session alive)
+  // For non-persistent sessions, this cancels (terminates execution)
   const handleCancel = async (execId: string) => {
     setCancelling(true)
     try {
-      await executionsApi.cancel(execId)
+      // Find the execution to check if it's a persistent session
+      const execution = chainData?.executions.find((e) => e.id === execId)
+      let isPersistentSession = false
+      if (execution?.config) {
+        try {
+          const config = JSON.parse(execution.config)
+          isPersistentSession = config.sessionMode === 'persistent'
+        } catch {
+          // Invalid config JSON, default to non-persistent
+        }
+      }
+
+      if (isPersistentSession) {
+        // Interrupt: stops current work but keeps session alive
+        await executionsApi.interrupt(execId)
+      } else {
+        // Cancel: fully terminates the execution
+        await executionsApi.cancel(execId)
+      }
       // Reload chain to get updated status
       const data = await executionsApi.getChain(executionId)
       setChainData(data)
     } catch (err) {
-      setError(err instanceof Error ? err.message : 'Failed to cancel execution')
+      setError(err instanceof Error ? err.message : 'Failed to stop execution')
     } finally {
       setCancelling(false)
     }
@@ -506,7 +526,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
 
     // Check if this is a persistent session that's ready for another prompt
     const isPersistentSessionReady =
-      lastExecution.status === 'waiting' || lastExecution.status === 'paused'
+      lastExecution.status === 'pending' || lastExecution.status === 'paused'
 
     setSubmittingFollowUp(true)
     try {
@@ -528,7 +548,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
         })
 
         // Send prompt to existing persistent session
-        // WebSocket will update the status back to 'waiting' when complete
+        // WebSocket will update the status back to 'pending' when complete
         await executionsApi.sendPrompt(lastExecution.id, prompt)
       } else {
         // Create a new follow-up execution
@@ -575,7 +595,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
     const lastExecution = chainData.executions[chainData.executions.length - 1]
 
     // Only end if the session is in a state that can be ended
-    if (lastExecution.status !== 'waiting' && lastExecution.status !== 'paused') {
+    if (lastExecution.status !== 'pending' && lastExecution.status !== 'paused') {
       return
     }
 
@@ -866,8 +886,8 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
     if (!chainData || chainData.executions.length === 0) return
     const rootExec = chainData.executions[0]
     const lastExec = chainData.executions[chainData.executions.length - 1]
-    // Only allow cancel for actively running executions (not waiting/paused persistent sessions)
-    const canCancel = ['preparing', 'pending', 'running'].includes(lastExec.status)
+    // Only allow cancel for actively running executions
+    const canCancel = lastExec.status === 'running'
 
     onHeaderDataChange?.(
       {
@@ -940,7 +960,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
     lastExecution.status === 'stopped' ||
     lastExecution.status === 'cancelled'
   const isPersistentSessionReady =
-    lastExecution.status === 'waiting' || lastExecution.status === 'paused'
+    lastExecution.status === 'pending' || lastExecution.status === 'paused'
   const canEnableFollowUp = lastExecutionTerminal || isPersistentSessionReady
 
   // Determine if the execution is actively running (not waiting/paused)
@@ -990,8 +1010,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
                       onTodosUpdate={handleTodosUpdate}
                       onAvailableCommandsUpdate={isLast ? handleAvailableCommandsUpdate : undefined}
                       onCancel={
-                        isLast &&
-                        ['preparing', 'pending', 'running'].includes(execution.status)
+                        isLast && execution.status === 'running'
                           ? () => handleCancel(execution.id)
                           : undefined
                       }
@@ -1050,7 +1069,7 @@ export function ExecutionView({ executionId, onFollowUpCreated, onStatusChange,
                     {endingSession ? 'Ending...' : 'End Session'}
                   </Button>
                   <span className="text-xs text-muted-foreground">
-                    Session {lastExecution.status === 'paused' ? 'paused' : 'waiting'} for input
+                    Session {lastExecution.status === 'paused' ? 'paused' : 'pending'} for input
                   </span>
                 </div>
               )}

frontend/src/contexts/ChatWidgetContext.tsx

@@ -122,7 +122,7 @@ export function ChatWidgetProvider({ children }: ChatWidgetProviderProps) {
 
   // Find the latest active execution (running, pending, or preparing)
   const latestActiveExecution = useMemo(() => {
-    const activeStatuses = ['running', 'pending', 'preparing', 'paused', 'waiting']
+    const activeStatuses = ['running', 'pending', 'preparing', 'paused']
     const activeExecutions = executions.filter((e) => activeStatuses.includes(e.status))
     if (activeExecutions.length === 0) return null
     // Sort by created_at descending