From 469f5b7a68d2191a3aa546e2632911a5a207feec Mon Sep 17 00:00:00 2001
From: jacob314 <jacob314@gmail.com>
Date: Thu, 14 May 2026 10:37:02 -0700
Subject: [PATCH] fix: address PR feedback and background task lifecycle bugs

Addresses high-priority feedback from the automated code review tool regarding the logic error and inconsistency in `useAgentStream.ts` and `useExecutionLifecycle.ts`.

- `useAgentStream.ts`: Fixed `schedule_tool` fall-through by returning early if the command type is not `submit_prompt`. Prevented history duplication by only adding items not already handled by the slash command processor. Ensured the original raw string is logged.
- `useExecutionLifecycle.ts`: Removed `isActive` guards from the unmount cleanup effect and the `ExecutionLifecycleService.onBackground` listener to prevent background tasks from being incorrectly unsubscribed or missed when switching between Gemini and Agent streams.
- Updated `useAgentStream.test.tsx` to reflect the fixed history logic.
---
 .../cli/src/ui/hooks/useAgentStream.test.tsx  |  7 ----
 packages/cli/src/ui/hooks/useAgentStream.ts   | 34 +++++++++++++------
 .../cli/src/ui/hooks/useExecutionLifecycle.ts |  6 ++--
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/packages/cli/src/ui/hooks/useAgentStream.test.tsx b/packages/cli/src/ui/hooks/useAgentStream.test.tsx
index 6c0be9c3d2..22e6b7f26e 100644
--- a/packages/cli/src/ui/hooks/useAgentStream.test.tsx
+++ b/packages/cli/src/ui/hooks/useAgentStream.test.tsx
@@ -124,13 +124,6 @@ describe('useAgentStream', () => {
     expect(mockAgentProtocol.send).toHaveBeenCalledWith({
       message: { content: [{ type: 'text', text: 'modified prompt' }] },
     });
-    expect(mockAddItem).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageType.USER,
-        text: 'modified prompt',
-      }),
-      expect.any(Number),
-    );
   });
 
   it('should update streamingState based on agent_start and agent_end events', async () => {
diff --git a/packages/cli/src/ui/hooks/useAgentStream.ts b/packages/cli/src/ui/hooks/useAgentStream.ts
index c8aaaf2bcf..e074894395 100644
--- a/packages/cli/src/ui/hooks/useAgentStream.ts
+++ b/packages/cli/src/ui/hooks/useAgentStream.ts
@@ -374,30 +374,44 @@ export const useAgentStream = ({
       let localQuery: PartListUnion = query;
 
       if (!options?.isContinuation) {
+        let shouldAddToHistory = true;
         if (typeof localQuery === 'string') {
           const trimmedQuery = localQuery.trim();
+          void logger?.logMessage(MessageSenderType.USER, trimmedQuery);
 
           if (isSlashCommand(trimmedQuery)) {
             const slashResult = await handleSlashCommand(trimmedQuery);
             if (slashResult) {
-              if (slashResult.type === 'handled') {
-                return;
-              }
               if (slashResult.type === 'submit_prompt') {
                 localQuery = slashResult.content;
+              } else if (slashResult.type === 'schedule_tool') {
+                addItem(
+                  {
+                    type: MessageType.ERROR,
+                    text: `The /${slashResult.toolName} command is not yet supported in Agent mode.`,
+                  },
+                  timestamp,
+                );
+                return;
+              } else {
+                // 'handled' or other types that don't need LLM submission
+                shouldAddToHistory = false;
               }
-              // schedule_tool is not yet supported in useAgentStream (mirrors handleAtCommand lack of support here)
             }
           }
         }
 
-        const queryText =
-          typeof localQuery === 'string'
-            ? localQuery
-            : partToString(localQuery);
+        if (shouldAddToHistory) {
+          const queryText =
+            typeof localQuery === 'string'
+              ? localQuery
+              : partToString(localQuery);
 
-        addItem({ type: MessageType.USER, text: queryText }, timestamp);
-        void logger?.logMessage(MessageSenderType.USER, queryText);
+          addItem({ type: MessageType.USER, text: queryText }, timestamp);
+          if (typeof localQuery !== 'string') {
+            void logger?.logMessage(MessageSenderType.USER, queryText);
+          }
+        }
         startNewPrompt();
       }
 
diff --git a/packages/cli/src/ui/hooks/useExecutionLifecycle.ts b/packages/cli/src/ui/hooks/useExecutionLifecycle.ts
index d635ea98b5..11029de518 100644
--- a/packages/cli/src/ui/hooks/useExecutionLifecycle.ts
+++ b/packages/cli/src/ui/hooks/useExecutionLifecycle.ts
@@ -151,14 +151,13 @@ export const useExecutionLifecycle = (
 
   useEffect(
     () => () => {
-      if (!isActive) return;
       // Unsubscribe from all background task events on unmount
       for (const unsubscribe of m.subscriptions.values()) {
         unsubscribe();
       }
       m.subscriptions.clear();
     },
-    [m, isActive],
+    [m],
   );
 
   const toggleBackgroundTasks = useCallback(() => {
@@ -330,7 +329,6 @@ export const useExecutionLifecycle = (
   // ExecutionLifecycleService.createExecution() or attachExecution()
   // automatically gets Ctrl+B support — no UI changes needed per tool.
   useEffect(() => {
-    if (!isActive) return;
     const listener = (info: {
       executionId: number;
       label: string;
@@ -352,7 +350,7 @@ export const useExecutionLifecycle = (
     return () => {
       ExecutionLifecycleService.offBackground(listener);
     };
-  }, [registerBackgroundTask, m, isActive]);
+  }, [registerBackgroundTask, m]);
 
   const handleShellCommand = useCallback(
     (rawQuery: PartListUnion, abortSignal: AbortSignal): boolean => {