@opensumi/ide-ai-native 3.8.1-next-1740625266.0 → 3.8.1-next-1740725107.0

package/lib/common/llm-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"llm-context.d.ts","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,IAAI,IAAI,CAAC;IAE5B,kBAAkB,IAAI,IAAI,CAAC;IAE3B;;OAEG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB,4BAA4B,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAEnD;;;OAGG;IACH,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IAEtC,gBAAgB;IAChB,SAAS,IAAI,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,sBAAsB,eAA8B,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,aAAa,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjG"}
+{"version":3,"file":"llm-context.d.ts","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAEjE,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,IAAI,IAAI,CAAC;IAE5B,kBAAkB,IAAI,IAAI,CAAC;IAE3B;;OAEG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,gBAAgB,IAAI,IAAI,CAAC;IAEzB,4BAA4B,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAAC;IAExF;;;OAGG;IACH,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1D,gBAAgB;IAChB,SAAS,IAAI,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,eAAO,MAAM,sBAAsB,eAA8B,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;CACzC"}

package/lib/common/llm-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"llm-context.js","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":";;;AAmCa,QAAA,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"llm-context.js","sourceRoot":"","sources":["../../src/common/llm-context.ts"],"names":[],"mappings":";;;AAkCa,QAAA,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}

package/lib/common/prompts/context-prompt-provider.d.ts

@@ -1,4 +1,4 @@
-import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
+import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/browser/types';
 import { SerializedContext } from '../llm-context';
 export declare const ChatAgentPromptProvider: unique symbol;
 export interface ChatAgentPromptProvider {
@@ -6,9 +6,10 @@ export interface ChatAgentPromptProvider {
      * 提供上下文提示
      * @param context 上下文
      */
-    provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
+    provideContextPrompt(context: SerializedContext, userMessage: string): string;
 }
 export declare class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
-    provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
+    protected readonly workbenchEditorService: WorkbenchEditorService;
+    provideContextPrompt(context: SerializedContext, userMessage: string): string;
 }
 //# sourceMappingURL=context-prompt-provider.d.ts.map

package/lib/common/prompts/context-prompt-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;CAC7F;AAED,qBACa,8BAA+B,YAAW,uBAAuB;IAC5E,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;CA4B5F"}
+{"version":3,"file":"context-prompt-provider.d.ts","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/E;AAED,qBACa,8BAA+B,YAAW,uBAAuB;IAE5E,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;CAmC9E"}

package/lib/common/prompts/context-prompt-provider.js

@@ -3,35 +3,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultChatAgentPromptProvider = exports.ChatAgentPromptProvider = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
+const types_1 = require("@opensumi/ide-editor/lib/browser/types");
 exports.ChatAgentPromptProvider = Symbol('ChatAgentPromptProvider');
 let DefaultChatAgentPromptProvider = class DefaultChatAgentPromptProvider {
     provideContextPrompt(context, userMessage) {
+        const editor = this.workbenchEditorService.currentEditor;
+        const currentModel = editor === null || editor === void 0 ? void 0 : editor.currentDocumentModel;
+        currentModel;
         return `
-          <additional_data>
-          Below are some potentially helpful/relevant pieces of information for figuring out to respond
-          <recently_viewed_files>
-          ${context.recentlyViewFiles.map((file, idx) => `${idx + 1} : ${file}`)}
-          </recently_viewed_files>
-          <attached_files>
-          ${context.attachedFiles.map((file) => `
-          <file_contents>
-          \`\`\`${file.language} ${file.path}
-          ${file.content}
-          \`\`\`
-          </file_contents>
-          <linter_errors>
-          ${file.lineErrors.join('\n')}
-          </linter_errors>
-          `)}
-          
-          </attached_files>
-          </additional_data>
-          <user_query>
-          ${userMessage}
-          </user_query>`;
+<additional_data>
+  Below are some potentially helpful/relevant pieces of information for figuring out to respond
+  <recently_viewed_files>
+${context.recentlyViewFiles.map((file, idx) => `    ${idx + 1}: ${file}`).join('\n')}
+  </recently_viewed_files>
+  <attached_files>
+    ${context.attachedFiles.map((file) => `
+    <file_contents>
+    \`\`\`${file.language} ${file.path}
+    ${file.content}
+    \`\`\`
+    </file_contents>
+    <linter_errors>
+    ${file.lineErrors.join('\n')}
+    </linter_errors>
+              `)}
+  </attached_files>
+${currentModel ? `<current_opened_file>
+  \`\`\`${currentModel.languageId} ${currentModel.uri.toString()}
+${currentModel.getText()}
+  \`\`\`
+  </current_opened_file>` : ''}
+</additional_data>
+<user_query>
+${userMessage}
+</user_query>`;
     }
 };
 exports.DefaultChatAgentPromptProvider = DefaultChatAgentPromptProvider;
+tslib_1.__decorate([
+    (0, di_1.Autowired)(types_1.WorkbenchEditorService),
+    tslib_1.__metadata("design:type", types_1.WorkbenchEditorService)
+], DefaultChatAgentPromptProvider.prototype, "workbenchEditorService", void 0);
 exports.DefaultChatAgentPromptProvider = DefaultChatAgentPromptProvider = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], DefaultChatAgentPromptProvider);

package/lib/common/prompts/context-prompt-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-prompt-provider.js","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAK7B,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAWlE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IACzC,oBAAoB,CAAC,OAA0B,EAAE,WAAmB;QAClE,OAAO;;;;YAIC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;;;YAGpE,OAAO,CAAC,aAAa,CAAC,GAAG,CACzB,CAAC,IAAI,EAAE,EAAE,CACP;;kBAEI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;YAChC,IAAI,CAAC,OAAO;;;;YAIZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;WAE3B,CACA;;;;;YAKC,WAAW;wBACC,CAAC;IACvB,CAAC;CACF,CAAA;AA7BY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,eAAU,GAAE;GACA,8BAA8B,CA6B1C"}
+{"version":3,"file":"context-prompt-provider.js","sourceRoot":"","sources":["../../../src/common/prompts/context-prompt-provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,kEAAgF;AAInE,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAWlE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAIzC,oBAAoB,CAAC,OAA0B,EAAE,WAAmB;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC;QACzD,MAAM,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,oBAAoB,CAAC;QAClD,YAAY,CAAA;QACZ,OAAO;;;;EAIT,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;MAG9E,OAAO,CAAC,aAAa,CAAC,GAAG,CACzB,CAAC,IAAI,EAAE,EAAE,CACP;;YAEI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;MAChC,IAAI,CAAC,OAAO;;;;MAIZ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;eAEjB,CACV;;EAEH,YAAY,CAAC,CAAC,CAAC;UACP,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE;EAC9D,YAAY,CAAC,OAAO,EAAE;;yBAEC,CAAC,CAAC,CAAC,EAAE;;;EAG5B,WAAW;cACC,CAAC;IACb,CAAC;CACF,CAAA;AAvCY,wEAA8B;AAEtB;IADlB,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACS,8BAAsB;8EAAC;yCAFvD,8BAA8B;IAD1C,IAAA,eAAU,GAAE;GACA,8BAA8B,CAuC1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.8.1-next-1740625266.0",
+  "version": "3.8.1-next-1740725107.0",
   "files": [
     "lib",
     "src"
@@ -23,26 +23,26 @@
     "@ai-sdk/deepseek": "^0.1.11",
     "@ai-sdk/openai-compatible": "^0.1.11",
     "@modelcontextprotocol/sdk": "^1.3.1",
-    "@opensumi/ide-addons": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-components": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-connection": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-core-common": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-core-node": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-debug": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-design": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-editor": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-file-search": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-file-service": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-main-layout": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-markers": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-monaco": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-overlay": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-preferences": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-search": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-terminal-next": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-theme": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-utils": "3.8.1-next-1740625266.0",
-    "@opensumi/ide-workspace": "3.8.1-next-1740625266.0",
+    "@opensumi/ide-addons": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-components": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-connection": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-core-common": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-core-node": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-debug": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-design": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-editor": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-file-search": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-file-service": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-main-layout": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-markers": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-monaco": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-overlay": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-preferences": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-search": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-terminal-next": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-theme": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-utils": "3.8.1-next-1740725107.0",
+    "@opensumi/ide-workspace": "3.8.1-next-1740725107.0",
     "@xterm/xterm": "5.5.0",
     "ai": "^4.1.45",
     "ansi-regex": "^2.0.0",
@@ -57,7 +57,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.8.1-next-1740625266.0"
+    "@opensumi/ide-core-browser": "3.8.1-next-1740725107.0"
   },
-  "gitHead": "a14ff2753601855bec5fb3fcee04e4d656a7c530"
+  "gitHead": "0b7e00345f78818c5c663ac1461999bdbd272514"
 }

package/src/browser/chat/chat-manager.service.ts

@@ -14,6 +14,8 @@ import {
 import { ChatMessageRole, IChatMessage, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
 import { IChatAgentService, IChatFollowup, IChatRequestMessage, IChatResponseErrorDetails } from '../../common';
+import { LLMContextService, LLMContextServiceToken } from '../../common/llm-context';
+import { ChatAgentPromptProvider } from '../../common/prompts/context-prompt-provider';
 import { MsgHistoryManager } from '../model/msg-history-manager';
 
 import { ChatModel, ChatRequestModel, ChatResponseModel, IChatProgressResponseContent } from './chat-model';
@@ -50,6 +52,12 @@ export class ChatManagerService extends Disposable {
   @Autowired(StorageProvider)
   private storageProvider: StorageProvider;
 
+  @Autowired(ChatAgentPromptProvider)
+  protected readonly promptProvider: ChatAgentPromptProvider;
+
+  @Autowired(LLMContextServiceToken)
+  protected readonly contextService: LLMContextService;
+
   private _chatStorage: IStorage;
 
   protected fromJSON(data: ISessionModel[]) {
@@ -100,12 +108,20 @@ export class ChatManagerService extends Disposable {
   }
 
   startSession() {
-    const model = new ChatModel();
+    const model = new ChatModel({
+      provideContext: this.provideContextPrompt.bind(this),
+    });
     this.#sessionModels.set(model.sessionId, model);
     this.listenSession(model);
     return model;
   }
 
+  private provideContextPrompt(message: string) {
+    const context = this.contextService.serialize();
+    const fullMessage = this.promptProvider.provideContextPrompt(context, message);
+    return fullMessage;
+  }
+
   getSession(sessionId: string): ChatModel | undefined {
     return this.#sessionModels.get(sessionId);
   }

package/src/browser/chat/chat-model.ts

@@ -274,13 +274,22 @@ export class ChatRequestModel implements IChatRequestModel {
 export class ChatModel extends Disposable implements IChatModel {
   private static requestIdPool = 0;
 
-  constructor(initParams?: { sessionId?: string; history?: MsgHistoryManager; requests?: ChatRequestModel[] }) {
+  private provideContextPrompt?: (string) => string;
+
+  constructor(initParams?: {
+    sessionId?: string;
+    history?: MsgHistoryManager;
+    requests?: ChatRequestModel[];
+    provideContext?: (msg: string) => string;
+  }) {
     super();
     this.#sessionId = initParams?.sessionId ?? uuid();
     this.history = initParams?.history ?? new MsgHistoryManager();
     if (initParams?.requests) {
       this.#requests = new Map(initParams.requests.map((r) => [r.requestId, r]));
     }
+
+    this.provideContextPrompt = initParams?.provideContext;
   }
 
   #sessionId: string;
@@ -300,9 +309,15 @@ export class ChatModel extends Disposable implements IChatModel {
   readonly history: MsgHistoryManager;
 
   addRequest(message: IChatRequestMessage): ChatRequestModel {
+    const msg = message;
+    // first msg
+    if (this.provideContextPrompt) {
+      msg.prompt = this.provideContextPrompt(msg.prompt);
+    }
+
     const requestId = `${this.sessionId}_request_${ChatModel.requestIdPool++}`;
-    const response = new ChatResponseModel(requestId, this, message.agentId);
-    const request = new ChatRequestModel(requestId, this, message, response);
+    const response = new ChatResponseModel(requestId, this, msg.agentId);
+    const request = new ChatRequestModel(requestId, this, msg, response);
 
     this.#requests.set(requestId, request);
     return request;

package/src/browser/chat/chat.module.less

@@ -279,7 +279,6 @@
   }
 }
 
-
 .chat_tips_container {
   display: flex;
   align-items: center;
@@ -290,6 +289,6 @@
 }
 
 .chat_history {
-  width: calc(100% - 60px);
+  width: calc(100% - 40px);
   color: var(--design-text-foreground);
 }

package/src/browser/chat/chat.view.tsx

@@ -5,7 +5,6 @@ import {
   AINativeConfigService,
   CommandService,
   getIcon,
-  useEventEffect,
   useInjectable,
   useUpdateOnEvent,
 } from '@opensumi/ide-core-browser';
@@ -42,8 +41,6 @@ import {
   IChatMessageStructure,
   TokenMCPServerProxyService,
 } from '../../common';
-import { LLMContextService, LLMContextServiceToken } from '../../common/llm-context';
-import { ChatAgentPromptProvider } from '../../common/prompts/context-prompt-provider';
 import { ChatContext } from '../components/ChatContext';
 import { CodeBlockWrapperInput } from '../components/ChatEditor';
 import ChatHistory, { IChatHistoryItem } from '../components/ChatHistory';
@@ -82,17 +79,11 @@ export const AIChatView = () => {
   const chatAgentService = useInjectable<IChatAgentService>(IChatAgentService);
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
   const chatRenderRegistry = useInjectable<ChatRenderRegistry>(ChatRenderRegistryToken);
-  const contextService = useInjectable<LLMContextService>(LLMContextServiceToken);
-  const promptProvider = useInjectable<ChatAgentPromptProvider>(ChatAgentPromptProvider);
-  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
 
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
   const msgHistoryManager = aiChatService.sessionModel.history;
   const containerRef = React.useRef<HTMLDivElement>(null);
   const chatInputRef = React.useRef<{ setInputValue: (v: string) => void } | null>(null);
-  const dialogService = useInjectable<IDialogService>(IDialogService);
-  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
-  const commandService = useInjectable<CommandService>(CommandService);
 
   const [shortcutCommands, setShortcutCommands] = React.useState<ChatSlashCommandItemModel[]>([]);
 
@@ -114,8 +105,6 @@ export const AIChatView = () => {
   const [defaultAgentId, setDefaultAgentId] = React.useState<string>('');
   const [command, setCommand] = React.useState('');
   const [theme, setTheme] = React.useState<string | null>(null);
-  const [mcpToolsCount, setMcpToolsCount] = React.useState<number>(0);
-  const [mcpServersCount, setMcpServersCount] = React.useState<number>(0);
 
   React.useEffect(() => {
     const featureSlashCommands = chatFeatureRegistry.getAllShortcutSlashCommand();
@@ -515,10 +504,7 @@ export const AIChatView = () => {
       const { message, agentId, command, reportExtra } = value;
       const { actionType, actionSource } = reportExtra || {};
 
-      const context = contextService.serialize();
-      const fullMessage = await promptProvider.provideContextPrompt(context, message);
-
-      const request = aiChatService.createRequest(fullMessage, agentId!, command);
+      const request = aiChatService.createRequest(message, agentId!, command);
       if (!request) {
         return;
       }
@@ -667,32 +653,6 @@ export const AIChatView = () => {
     };
   }, [aiChatService.sessionModel]);
 
-  useEventEffect(
-    mcpServerProxyService.onChangeMCPServers,
-    () => {
-      mcpServerProxyService.getAllMCPTools().then((tools) => {
-        setMcpToolsCount(tools.length);
-      });
-      mcpServerProxyService.$getServers().then((servers) => {
-        setMcpServersCount(servers.length);
-      });
-    },
-    [mcpServerProxyService],
-  );
-
-  const handleShowMCPTools = React.useCallback(async () => {
-    const tools = await mcpServerProxyService.getAllMCPTools();
-    dialogService.open({
-      message: <MCPToolsDialog tools={tools} />,
-      type: MessageType.Empty,
-      buttons: ['关闭'],
-    });
-  }, [mcpServerProxyService, dialogService]);
-
-  const handleShowMCPConfig = React.useCallback(() => {
-    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
-  }, [commandService]);
-
   return (
     <div id={styles.ai_chat_view}>
       <div className={styles.header_container}>
@@ -732,18 +692,6 @@ export const AIChatView = () => {
                   </Popover>
                 ))}
               </div>
-              <div className={styles.header_operate_right}>
-                {aiNativeConfigService.capabilities.supportsMCP && (
-                  <>
-                    <div className={styles.tag} onClick={handleShowMCPConfig}>
-                      {`MCP Servers: ${mcpServersCount}`}
-                    </div>
-                    <div className={styles.tag} onClick={handleShowMCPTools}>
-                      {`MCP Tools: ${mcpToolsCount}`}
-                    </div>
-                  </>
-                )}
-              </div>
             </div>
             <ChatInputWrapperRender
               onSend={(value, agentId, command) =>
@@ -786,6 +734,8 @@ export function DefaultChatViewHeader({
   const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
   const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const aiChatService = useInjectable<ChatInternalService>(IChatInternalService);
+  const commandService = useInjectable<CommandService>(CommandService);
+
   const [historyList, setHistoryList] = React.useState<IChatHistoryItem[]>([]);
   const [currentTitle, setCurrentTitle] = React.useState<string>('');
   const handleNewChat = React.useCallback(() => {
@@ -806,6 +756,10 @@ export function DefaultChatViewHeader({
     [aiChatService],
   );
 
+  const handleShowMCPConfig = React.useCallback(() => {
+    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
+  }, [commandService]);
+
   const handleShowMCPTools = React.useCallback(async () => {
     const tools = await mcpServerProxyService.getAllMCPTools();
     dialogService.open({
@@ -894,23 +848,6 @@ export function DefaultChatViewHeader({
           ariaLabel={localize('aiNative.operate.clear.title')}
         />
       </Popover>
-      {aiNativeConfigService.capabilities.supportsMCP && (
-        <Popover
-          overlayClassName={styles.popover_icon}
-          id={'ai-chat-header-tools'}
-          position={PopoverPosition.left}
-          title={localize('aiNative.operate.tools.title')}
-        >
-          <EnhanceIcon
-            wrapperClassName={styles.action_btn}
-            className={getIcon('menubar-tool')}
-            onClick={handleShowMCPTools}
-            tabIndex={0}
-            role='button'
-            ariaLabel={localize('aiNative.operate.tools.title')}
-          />
-        </Popover>
-      )}
       <Popover
         overlayClassName={styles.popover_icon}
         id={'ai-chat-header-close'}

package/src/browser/components/ChatContext/index.tsx

@@ -39,7 +39,7 @@ export const ChatContext = memo(() => {
       50,
     )((files) => {
       if (files) {
-        updateAddedFiles(files);
+        updateAddedFiles([...files.attached]);
       }
     }, contextService);
 
@@ -57,7 +57,7 @@ export const ChatContext = memo(() => {
   }, []);
 
   const onDidDeselect = useCallback((uri: URI) => {
-    contextService.removeFileFromContext(uri);
+    contextService.removeFileFromContext(uri, true);
   }, []);
 
   const onDidClickFile = useCallback((uri: URI) => {

package/src/browser/components/ChatInput.tsx

@@ -1,21 +1,31 @@
 import cls from 'classnames';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 
-import { useInjectable, useLatest } from '@opensumi/ide-core-browser';
+import { AINativeConfigService, useInjectable, useLatest } from '@opensumi/ide-core-browser';
 import { Icon, Popover, PopoverPosition, getIcon } from '@opensumi/ide-core-browser/lib/components';
 import { EnhanceIcon } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { InteractiveInput } from '@opensumi/ide-core-browser/lib/components/ai-native/interactive-input/index';
-import { ChatAgentViewServiceToken, ChatFeatureRegistryToken, localize, runWhenIdle } from '@opensumi/ide-core-common';
+import {
+  ChatAgentViewServiceToken,
+  ChatFeatureRegistryToken,
+  MessageType,
+  localize,
+  runWhenIdle,
+} from '@opensumi/ide-core-common';
+import { CommandService } from '@opensumi/ide-core-common/lib/command';
 import { MonacoCommandRegistry } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
+import { IDialogService } from '@opensumi/ide-overlay';
 
-import { AT_SIGN_SYMBOL, IChatAgentService, SLASH_SYMBOL } from '../../common';
+import { AT_SIGN_SYMBOL, IChatAgentService, SLASH_SYMBOL, TokenMCPServerProxyService } from '../../common';
 import { ChatAgentViewService } from '../chat/chat-agent.view.service';
 import { ChatSlashCommandItemModel } from '../chat/chat-model';
 import { ChatProxyService } from '../chat/chat-proxy.service';
 import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
+import { OPEN_MCP_CONFIG_COMMAND } from '../mcp/config/mcp-config.commands';
+import { MCPServerProxyService } from '../mcp/mcp-server-proxy.service';
+import { MCPToolsDialog } from '../mcp/mcp-tools-dialog.view';
 import { IChatSlashCommandItem } from '../types';
 
-import { ChatContext } from './ChatContext';
 import styles from './components.module.less';
 
 const INSTRUCTION_BOTTOM = 8;
@@ -195,12 +205,29 @@ export const ChatInput = React.forwardRef((props: IChatInputProps, ref) => {
   const [isExpand, setIsExpand] = useState(false);
   const [placeholder, setPlaceHolder] = useState(localize('aiNative.chat.input.placeholder.default'));
 
+  const dialogService = useInjectable<IDialogService>(IDialogService);
+  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
+  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const monacoCommandRegistry = useInjectable<MonacoCommandRegistry>(MonacoCommandRegistry);
   const chatAgentService = useInjectable<IChatAgentService>(IChatAgentService);
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
+  const commandService = useInjectable<CommandService>(CommandService);
 
   const currentAgentIdRef = useLatest(agentId);
 
+  const handleShowMCPConfig = React.useCallback(() => {
+    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
+  }, [commandService]);
+
+  const handleShowMCPTools = React.useCallback(async () => {
+    const tools = await mcpServerProxyService.getAllMCPTools();
+    dialogService.open({
+      message: <MCPToolsDialog tools={tools} />,
+      type: MessageType.Empty,
+      buttons: ['关闭'],
+    });
+  }, [mcpServerProxyService, dialogService]);
+
   useImperativeHandle(ref, () => ({
     setInputValue: (v: string) => {
       setValue(v);
@@ -462,6 +489,42 @@ export const ChatInput = React.forwardRef((props: IChatInputProps, ref) => {
         height={inputHeight}
         popoverPosition={PopoverPosition.left}
       />
+      <div className={styles.chat_input_footer}>
+        {aiNativeConfigService.capabilities.supportsMCP && (
+          <div className={styles.mcp_desc}>
+            <Popover
+              overlayClassName={styles.popover_icon}
+              id={'ai-chat-header-mcp-server'}
+              position={PopoverPosition.left}
+              title={'MCP Server'}
+            >
+              <EnhanceIcon
+                wrapperClassName={styles.action_btn}
+                className={'codicon codicon-server'}
+                onClick={handleShowMCPConfig}
+                tabIndex={0}
+                role='button'
+                ariaLabel={'MCP Server'}
+              />
+            </Popover>
+            <Popover
+              overlayClassName={styles.popover_icon}
+              id={'ai-chat-header-tools'}
+              position={PopoverPosition.left}
+              title={localize('aiNative.operate.tools.title')}
+            >
+              <EnhanceIcon
+                wrapperClassName={styles.action_btn}
+                className={getIcon('menubar-tool')}
+                onClick={handleShowMCPTools}
+                tabIndex={0}
+                role='button'
+                ariaLabel={localize('aiNative.operate.tools.title')}
+              />
+            </Popover>
+          </div>
+        )}
+      </div>
     </div>
   );
 });

package/src/browser/components/ChatToolRender.tsx

@@ -67,13 +67,12 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
     <div className={styles['chat-tool-render']}>
       <div className={styles['tool-header']} onClick={toggleExpand}>
         <div className={styles['tool-name']}>
-          <span className={cls(styles['expand-icon'], { [styles.expanded]: isExpanded })}>▶</span>
+          <Icon iconClass={`codicon codicon-triangle-${isExpanded ? 'down' : 'right'}`} />
           {label}
         </div>
         {value.state && (
           <div className={styles['tool-state']}>
             <span className={styles['state-icon']}>{stateInfo.icon}</span>
-            <span className={styles['state-label']}>{stateInfo.label}</span>
           </div>
         )}
       </div>

package/src/browser/components/chat-history.module.less

@@ -3,7 +3,7 @@
   align-items: center;
   justify-content: space-between;
   font-size: 13px;
-  padding: 0 4px 0 12px;
+  padding: 0 0 0 12px;
   color: var(--editor-foreground);
   text-overflow: ellipsis;
   white-space: nowrap;

package/src/browser/components/components.module.less

@@ -96,6 +96,7 @@
 .chat_input_container {
   position: relative;
   border-radius: 9px;
+  padding: 10px 0px 0px 0px;
   border: 1px solid var(--kt-input-border);
   background-color: var(--design-chatInput-background);
   &.active {
@@ -505,3 +506,22 @@
     }
   }
 }
+
+.chat_input_footer {
+  padding: 0px 10px;
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+
+  .model_selector {
+    display: flex;
+    font-size: 11px;
+    align-items: center;
+  }
+
+  .mcp_desc {
+    padding: 5px 0px;
+    display: flex;
+    align-items: center;
+  }
+}