Merge branch 'v3.8' into chore/improve-chat-context

Author: Aaaaash

packages/ai-native/src/browser/ai-core.contribution.ts

@@ -319,6 +319,13 @@ export class AINativeBrowserContribution
     }
   }
 
+  onReconnect(): void {
+    const { supportsMCP } = this.aiNativeConfigService.capabilities;
+    if (supportsMCP) {
+      this.initMCPServers();
+    }
+  }
+
   onDidStart() {
     runWhenIdle(() => {
       const { supportsRenameSuggestions, supportsInlineChat, supportsMCP } = this.aiNativeConfigService.capabilities;
@@ -339,26 +346,28 @@ export class AINativeBrowserContribution
       }
 
       if (supportsMCP) {
-        // 从 preferences 获取并初始化外部 MCP Servers
-        const mcpServers = this.preferenceService.getValid<MCPServerDescription[]>(
-          AINativeSettingSectionsId.MCPServers,
-        );
+        this.initMCPServers();
+      }
+    });
+  }
 
-        // 查找内置 MCP Server 的配置
-        const builtinServer = mcpServers?.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
+  private initMCPServers() {
+    // 从 preferences 获取并初始化外部 MCP Servers
+    const mcpServers = this.preferenceService.getValid<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers);
 
-        // 总是初始化内置服务器，根据配置决定是否启用
-        this.sumiMCPServerBackendProxy.initBuiltinMCPServer(builtinServer?.enabled ?? true);
+    // 查找内置 MCP Server 的配置
+    const builtinServer = mcpServers?.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
 
-        // 初始化其他外部 MCP Servers
-        if (mcpServers && mcpServers.length > 0) {
-          const externalServers = mcpServers.filter((server) => server.name !== BUILTIN_MCP_SERVER_NAME);
-          if (externalServers.length > 0) {
-            this.sumiMCPServerBackendProxy.initExternalMCPServers(externalServers);
-          }
-        }
+    // 总是初始化内置服务器，根据配置决定是否启用
+    this.sumiMCPServerBackendProxy.initBuiltinMCPServer(builtinServer?.enabled ?? true);
+
+    // 初始化其他外部 MCP Servers
+    if (mcpServers && mcpServers.length > 0) {
+      const externalServers = mcpServers.filter((server) => server.name !== BUILTIN_MCP_SERVER_NAME);
+      if (externalServers.length > 0) {
+        this.sumiMCPServerBackendProxy.initExternalMCPServers(externalServers);
       }
-    });
+    }
   }
 
   private registerFeature() {

packages/ai-native/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts

@@ -290,7 +290,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
           const range = completionModel.items[0].range;
           if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
             runWhenIdle(() => {
-              this.discard.get();
+              this.hide();
             });
           }
         }

packages/ai-native/src/browser/contrib/intelligent-completions/view/default.ts

@@ -1,3 +1,5 @@
+import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { CommandService } from '@opensumi/ide-core-common';
 import {
   InlineCompletionContext,
   InlineCompletionTriggerKind,
@@ -27,6 +29,7 @@ import {
 
 import { CodeEditsResultValue, ICodeEdit, ICodeEditsResult } from '../index';
 
+
 import { BaseCodeEditsView } from './base';
 
 /**
@@ -115,6 +118,10 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
                 return completionModel;
               },
               freeInlineCompletions: () => [],
+              handleRejection: (completions, item) => {
+                const commandService: CommandService = this.injector.get(CommandService);
+                commandService.executeCommand(AI_CODE_EDITS_COMMANDS.DISCARD.id);
+              },
             } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
           ],
         } as unknown as LanguageFeatureRegistry<InlineCompletionsProvider>,

packages/ai-native/src/browser/mcp/tools/components/Terminal.tsx

@@ -3,6 +3,7 @@ import React, { memo, useCallback, useMemo, useState } from 'react';
 import { useInjectable } from '@opensumi/ide-core-browser';
 import { Button, Icon } from '@opensumi/ide-core-browser/lib/components';
 import { localize } from '@opensumi/ide-core-common';
+import { stripAnsi } from '@opensumi/ide-utils/lib/ansi';
 
 import { IMCPServerToolComponentProps } from '../../../types';
 import { RunCommandHandler } from '../handlers/RunCommand';
@@ -58,13 +59,23 @@ export const TerminalToolComponent = memo((props: IMCPServerToolComponentProps)
     <div className={styles.run_cmd_tool}>
       {props.state === 'result' && (
         <div>
+          {args && (
+            <>
+              <div className={styles.command_title}>
+                <Icon icon='terminal' />
+                <span>{localize('ai.native.mcp.terminal.command')}</span>
+              </div>
+              <p className={styles.command_content}>
+                <code>$ {args.command}</code>
+              </p>
+            </>
+          )}
           <div className={styles.command_title}>
-            <Icon icon='terminal' />
             <span>{localize('ai.native.mcp.terminal.output')}</span>
           </div>
           {output ? (
             <div className={styles.command_content}>
-              <code>{output.text}</code>
+              <code>{stripAnsi(output.text)}</code>
             </div>
           ) : (
             ''

packages/core-browser/src/components/ai-native/interactive-input/index.tsx

@@ -173,13 +173,15 @@ export const InteractiveInput = React.forwardRef(
             const value = history.current?.[history.current.length - 1 - historyIndex.current];
             if (value) {
               setInternalValue(value);
+              onValueChange?.(value);
               historyIndex.current = Math.min(historyIndex.current + 1, history.current?.length || 0);
             }
           } else if (event.key === Key.ARROW_DOWN.code) {
             event.preventDefault();
             const value = history.current?.[history.current.length - 1 - historyIndex.current];
             if (value) {
               setInternalValue(value);
+              onValueChange?.(value);
               historyIndex.current = Math.max(historyIndex.current - 1, 0);
             }
           }

packages/i18n/src/common/en-US.lang.ts

@@ -1576,6 +1576,7 @@ export const localizationBundle = {
     'preference.ai.native.mcp.servers.type.sse': 'SSE connection',
 
     // MCP Terminal Tool
+    'ai.native.mcp.terminal.command': 'Command',
     'ai.native.mcp.terminal.output': 'Output',
     'ai.native.mcp.terminal.allow-question': 'Allow the terminal to run the command?',
     'ai.native.mcp.terminal.allow': 'Allow',

packages/i18n/src/common/zh-CN.lang.ts

@@ -1339,6 +1339,7 @@ export const localizationBundle = {
     'preference.ai.native.mcp.servers.type.sse': 'SSE 连接',
 
     // MCP Terminal Tool
+    'ai.native.mcp.terminal.command': '命令',
     'ai.native.mcp.terminal.output': '输出',
     'ai.native.mcp.terminal.allow-question': '是否允许运行命令?',
     'ai.native.mcp.terminal.allow': '允许',