From 405b02e4b0026b65b80ae04d6e815979c8cd453c Mon Sep 17 00:00:00 2001
From: Adam Weidman <adamfweidman@google.com>
Date: Tue, 12 May 2026 14:45:11 -0400
Subject: [PATCH] refactor(core,cli): fix missed enum usages in
 SubagentProgressDisplay and tests

---
 .../messages/SubagentProgressDisplay.tsx      | 27 ++++++++++---------
 .../core/src/agents/remote-invocation.test.ts |  4 ++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/ui/components/messages/SubagentProgressDisplay.tsx b/packages/cli/src/ui/components/messages/SubagentProgressDisplay.tsx
index 995c404d9d..b46756c5d3 100644
--- a/packages/cli/src/ui/components/messages/SubagentProgressDisplay.tsx
+++ b/packages/cli/src/ui/components/messages/SubagentProgressDisplay.tsx
@@ -9,9 +9,10 @@ import { Box, Text } from 'ink';
 import { theme } from '../../semantic-colors.js';
 import Spinner from 'ink-spinner';
 import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import type {
-  SubagentProgress,
-  SubagentActivityItem,
+import {
+  type SubagentProgress,
+  type SubagentActivityItem,
+  SubagentState,
 } from '@google/gemini-cli-core';
 import { TOOL_STATUS } from '../../constants.js';
 import { STATUS_INDICATOR_WIDTH } from './ToolShared.js';
@@ -62,13 +63,13 @@ export const SubagentProgressDisplay: React.FC<
   let headerText: string | undefined;
   let headerColor = theme.text.secondary;
 
-  if (progress.state === 'cancelled') {
+  if (progress.state === SubagentState.CANCELLED) {
     headerText = `Subagent ${progress.agentName} was cancelled.`;
     headerColor = theme.status.warning;
-  } else if (progress.state === 'error') {
+  } else if (progress.state === SubagentState.ERROR) {
     headerText = `Subagent ${progress.agentName} failed.`;
     headerColor = theme.status.error;
-  } else if (progress.state === 'completed') {
+  } else if (progress.state === SubagentState.COMPLETED) {
     headerText = `Subagent ${progress.agentName} completed.`;
     headerColor = theme.status.success;
   } else {
@@ -107,13 +108,13 @@ export const SubagentProgressDisplay: React.FC<
               );
             } else if (item.type === 'tool_call') {
               const statusSymbol =
-                item.status === 'running' ? (
+                item.status === SubagentState.RUNNING ? (
                   <Spinner type="dots" />
-                ) : item.status === 'completed' ? (
+                ) : item.status === SubagentState.COMPLETED ? (
                   <Text color={theme.status.success}>
                     {TOOL_STATUS.SUCCESS}
                   </Text>
-                ) : item.status === 'cancelled' ? (
+                ) : item.status === SubagentState.CANCELLED ? (
                   <Text color={theme.status.warning} bold>
                     {TOOL_STATUS.CANCELED}
                   </Text>
@@ -135,7 +136,7 @@ export const SubagentProgressDisplay: React.FC<
                     <Text
                       bold
                       color={theme.text.primary}
-                      strikethrough={item.status === 'cancelled'}
+                      strikethrough={item.status === SubagentState.CANCELLED}
                     >
                       {item.displayName || item.content}
                     </Text>
@@ -144,7 +145,9 @@ export const SubagentProgressDisplay: React.FC<
                         <Text
                           color={theme.text.secondary}
                           wrap="truncate"
-                          strikethrough={item.status === 'cancelled'}
+                          strikethrough={
+                            item.status === SubagentState.CANCELLED
+                          }
                         >
                           {displayArgs}
                         </Text>
@@ -170,7 +173,7 @@ export const SubagentProgressDisplay: React.FC<
           )}
           <MarkdownDisplay
             text={safeJsonToMarkdown(progress.result)}
-            isPending={progress.state !== 'completed'}
+            isPending={progress.state !== SubagentState.COMPLETED}
             terminalWidth={terminalWidth}
           />
         </Box>
diff --git a/packages/core/src/agents/remote-invocation.test.ts b/packages/core/src/agents/remote-invocation.test.ts
index 8b0afa8831..c2b89f49df 100644
--- a/packages/core/src/agents/remote-invocation.test.ts
+++ b/packages/core/src/agents/remote-invocation.test.ts
@@ -825,7 +825,9 @@ describe('RemoteAgentInvocation', () => {
         abortSignal: new AbortController().signal,
       });
 
-      expect(result.returnDisplay).toMatchObject({ state: 'error' });
+      expect(result.returnDisplay).toMatchObject({
+        state: SubagentState.ERROR,
+      });
       // Should contain both the partial output and the error message
       expect(result.returnDisplay).toMatchObject({
         result: expect.stringContaining('Partial response'),