Merge branch 'main' into feat/support-insight-command

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

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

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { Text, Box } from 'ink';
+import { theme } from '../../semantic-colors.js';
+
+interface RetryCountdownMessageProps {
+  text: string;
+}
+
+/**
+ * Displays a retry countdown message in a dimmed/secondary style
+ * to visually distinguish it from error messages.
+ */
+export const RetryCountdownMessage: React.FC<RetryCountdownMessageProps> = ({
+  text,
+}) => {
+  if (!text || text.trim() === '') {
+    return null;
+  }
+
+  const prefix = '↻ ';
+  const prefixWidth = prefix.length;
+
+  return (
+    <Box flexDirection="row">
+      <Box width={prefixWidth}>
+        <Text color={theme.text.secondary}>{prefix}</Text>
+      </Box>
+      <Box flexGrow={1}>
+        <Text wrap="wrap" color={theme.text.secondary}>
+          {text}
+        </Text>
+      </Box>
+    </Box>
+  );
+};

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

@@ -20,6 +20,7 @@ import type {
   PlanResultDisplay,
   AnsiOutput,
   Config,
+  McpToolProgressData,
 } from '@qwen-code/qwen-code-core';
 import { AgentExecutionDisplay } from '../subagents/index.js';
 import { PlanSummaryDisplay } from '../PlanSummaryDisplay.js';
@@ -113,6 +114,22 @@ const useResultDisplayRenderer = (
       };
     }
 
+    // Check for McpToolProgressData
+    if (
+      typeof resultDisplay === 'object' &&
+      resultDisplay !== null &&
+      'type' in resultDisplay &&
+      resultDisplay.type === 'mcp_tool_progress'
+    ) {
+      const progress = resultDisplay as McpToolProgressData;
+      const msg = progress.message ?? `Progress: ${progress.progress}`;
+      const totalStr = progress.total != null ? `/${progress.total}` : '';
+      return {
+        type: 'string',
+        data: `⏳ [${progress.progress}${totalStr}] ${msg}`,
+      };
+    }
+
     // Check for AnsiOutput
     if (
       typeof resultDisplay === 'object' &&