fix(cli): use dedicated prop for subagent approval waiting state

Author: 思晗

packages/cli/src/ui/components/messages/ToolGroupMessage.tsx

@@ -149,6 +149,12 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
           isFocused &&
           !toolAwaitingApproval &&
           focusedSubagentCallId === tool.callId;
+        // Show the waiting indicator only when this subagent genuinely has a
+        // pending confirmation AND another subagent holds the focus lock.
+        const isWaitingForOtherApproval =
+          isAgentWithPendingConfirmation(tool.resultDisplay) &&
+          focusedSubagentCallId !== null &&
+          focusedSubagentCallId !== tool.callId;
         return (
           <Box key={tool.callId} flexDirection="column" minHeight={1}>
             <Box flexDirection="row" alignItems="center">
@@ -167,6 +173,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                 embeddedShellFocused={embeddedShellFocused}
                 config={config}
                 isFocused={isSubagentFocused}
+                isWaitingForOtherApproval={isWaitingForOtherApproval}
               />
             </Box>
             {tool.status === ToolCallStatus.Confirming &&

packages/cli/src/ui/components/messages/ToolMessage.tsx

@@ -174,13 +174,22 @@ const SubagentExecutionRenderer: React.FC<{
   childWidth: number;
   config: Config;
   isFocused?: boolean;
-}> = ({ data, availableHeight, childWidth, config, isFocused }) => (
+  isWaitingForOtherApproval?: boolean;
+}> = ({
+  data,
+  availableHeight,
+  childWidth,
+  config,
+  isFocused,
+  isWaitingForOtherApproval,
+}) => (
   <AgentExecutionDisplay
     data={data}
     availableHeight={availableHeight}
     childWidth={childWidth}
     config={config}
     isFocused={isFocused}
+    isWaitingForOtherApproval={isWaitingForOtherApproval}
   />
 );
 
@@ -252,6 +261,8 @@ export interface ToolMessageProps extends IndividualToolCallDisplay {
   config?: Config;
   /** Whether this tool's subagent confirmation prompt should respond to keyboard input. */
   isFocused?: boolean;
+  /** Whether another subagent's approval currently holds the focus lock, blocking this one. */
+  isWaitingForOtherApproval?: boolean;
 }
 
 export const ToolMessage: React.FC<ToolMessageProps> = ({
@@ -268,6 +279,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   ptyId,
   config,
   isFocused,
+  isWaitingForOtherApproval,
 }) => {
   const settings = useSettings();
   const isThisShellFocused =
@@ -369,6 +381,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 childWidth={innerWidth}
                 config={config}
                 isFocused={isFocused}
+                isWaitingForOtherApproval={isWaitingForOtherApproval}
               />
             )}
             {displayRenderer.type === 'diff' && (

packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx

@@ -26,6 +26,8 @@ export interface AgentExecutionDisplayProps {
   config: Config;
   /** Whether this display's confirmation prompt should respond to keyboard input. */
   isFocused?: boolean;
+  /** Whether another subagent's approval currently holds the focus lock, blocking this one. */
+  isWaitingForOtherApproval?: boolean;
 }
 
 const getStatusColor = (
@@ -81,6 +83,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
   childWidth,
   config,
   isFocused = true,
+  isWaitingForOtherApproval = false,
 }) => {
   const [displayMode, setDisplayMode] = React.useState<DisplayMode>('compact');
 
@@ -171,7 +174,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
             {/* Inline approval prompt when awaiting confirmation */}
             {data.pendingConfirmation && (
               <Box flexDirection="column" marginTop={1} paddingLeft={1}>
-                {!isFocused && (
+                {isWaitingForOtherApproval && (
                   <Box marginBottom={0}>
                     <Text color={theme.text.secondary} dimColor>
                       ⏳ Waiting for other approval...
@@ -247,7 +250,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
       {/* Inline approval prompt when awaiting confirmation */}
       {data.pendingConfirmation && (
         <Box flexDirection="column">
-          {!isFocused && (
+          {isWaitingForOtherApproval && (
             <Box marginBottom={0}>
               <Text color={theme.text.secondary} dimColor>
                 ⏳ Waiting for other approval...