feat: improve LLM context service enhance logic

packages/ai-native/src/browser/components/mention-input/mention-input.tsx

@@ -1019,6 +1019,24 @@ export const MentionInput: React.FC<MentionInputProps> = ({
     [attachedFiles],
   );
 
+  const renderModelSelectorTip = React.useCallback(
+    (children: React.ReactNode) => {
+      if (footerConfig.disableModelSelector) {
+        return (
+          <Popover
+            id='ai-chat-model-selector'
+            title={localize('aiNative.chat.modelSelector.disableTip')}
+            position={PopoverPosition.top}
+          >
+            {children}
+          </Popover>
+        );
+      }
+      return children;
+    },
+    [footerConfig.disableModelSelector],
+  );
+
   return (
     <div className={styles.input_container}>
       {mentionState.active && (
@@ -1048,16 +1066,17 @@ export const MentionInput: React.FC<MentionInputProps> = ({
       </div>
       <div className={styles.footer}>
         <div className={styles.left_control}>
-          {footerConfig.showModelSelector && (
-            <Select
-              options={footerConfig.modelOptions || []}
-              value={selectedModel}
-              onChange={handleModelChange}
-              className={styles.model_selector}
-              size='small'
-              disabled={footerConfig.disableModelSelector}
-            />
-          )}
+          {footerConfig.showModelSelector &&
+            renderModelSelectorTip(
+              <Select
+                options={footerConfig.modelOptions || []}
+                value={selectedModel}
+                onChange={handleModelChange}
+                className={styles.model_selector}
+                size='small'
+                disabled={footerConfig.disableModelSelector}
+              />,
+            )}
           {renderButtons(FooterButtonPosition.LEFT)}
         </div>
         <div className={styles.right_control}>

packages/ai-native/src/browser/context/llm-context.service.ts

@@ -48,10 +48,16 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     attachedFolders: FileContext[];
     version: number;
   }>();
+  private hasUserManualReference = false;
   onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
 
   private addFileToList(file: FileContext, list: FileContext[], maxLimit: number) {
-    const existingIndex = list.findIndex((f) => f.uri.toString() === file.uri.toString());
+    const existingIndex = list.findIndex(
+      (f) =>
+        f.uri.toString() === file.uri.toString() &&
+        f.selection?.[0] === file.selection?.[0] &&
+        f.selection?.[1] === file.selection?.[1],
+    );
     if (existingIndex > -1) {
       list.splice(existingIndex, 1);
     }
@@ -85,6 +91,7 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
     if (isManual) {
       this.docModelManager.createModelReference(uri);
+      this.hasUserManualReference = true;
     }
 
     this.addFileToList(file, targetList, maxLimit);
@@ -109,6 +116,7 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
   cleanFileContext() {
     this.attachedFiles = [];
     this.attachedFolders = [];
+    this.hasUserManualReference = false;
     this.notifyContextChange();
   }
 
@@ -127,6 +135,11 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     if (index > -1) {
       targetList.splice(index, 1);
     }
+    if (isManual) {
+      if (this.attachedFiles.length === 0) {
+        this.hasUserManualReference = false;
+      }
+    }
     this.notifyContextChange();
   }
 
@@ -176,14 +189,17 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
             event.payload.selections[0].positionLineNumber,
           ].sort() as [number, number];
 
-          if (selection[0] === selection[1]) {
-            this.addFileToContext(event.payload.editorUri, undefined, false);
-          } else {
-            this.addFileToContext(
-              event.payload.editorUri,
-              selection.sort((a, b) => a - b),
-              false,
-            );
+          if (!this.hasUserManualReference) {
+            // 当没有用户手动引用时，才自动收集
+            if (selection[0] === selection[1]) {
+              this.addFileToContext(event.payload.editorUri, undefined, false);
+            } else {
+              this.addFileToContext(
+                event.payload.editorUri,
+                selection.sort((a, b) => a - b),
+                false,
+              );
+            }
           }
         }
       }),
@@ -275,9 +291,7 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
       }
 
       return {
-        content: ref.instance.getText(
-          file.selection && new Range(file.selection[0], Infinity, file.selection[1], Infinity),
-        ),
+        content: ref.instance.getText(file.selection && new Range(file.selection[0], 0, file.selection[1], Infinity)),
         lineErrors: this.getFileErrors(file.uri),
         path: workspaceRoot.relative(file.uri)!.toString(),
         language: ref.instance.languageId!,

packages/ai-native/src/browser/mcp/config/mcp-config.service.ts

@@ -201,14 +201,14 @@ export class MCPConfigService extends Disposable {
       delete servers[prev.name];
     }
     servers[data.name] = serverConfig;
-    await this.sumiMCPServerBackendProxy.$addOrUpdateServer(data as MCPServerDescription);
     // 更新情况下，如果原有服务是启用状态，则进行如下操作：
     // 1. 关闭旧的服务
     // 2. 启动新的服务
+    await this.preferenceService.set('mcp', { mcpServers: servers });
     if (prev?.enabled) {
-      await this.sumiMCPServerBackendProxy.$removeServer(prev.name);
+      this.sumiMCPServerBackendProxy.$removeServer(prev.name);
     }
-    await this.preferenceService.set('mcp', { mcpServers: servers });
+    this.sumiMCPServerBackendProxy.$addOrUpdateServer(data as MCPServerDescription);
   }
 
   async deleteServer(serverName: string): Promise<void> {

packages/ai-native/src/browser/mcp/mcp-preferences-contribution.ts

@@ -1,8 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import {
-  CodeSchemaId,
   Domain,
-  IJSONSchema,
   IJSONSchemaRegistry,
   JsonSchemaContribution,
   MaybePromise,

packages/ai-native/src/common/prompts/context-prompt-provider.ts

@@ -23,11 +23,12 @@ export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
   protected readonly workspaceService: IWorkspaceService;
 
   async provideContextPrompt(context: SerializedContext, userMessage: string) {
-    const currentFileInfo = await this.getCurrentFileInfo();
+    const currentFileInfo =
+      context.attachedFiles.length > 0 || context.attachedFolders.length > 0 ? null : await this.getCurrentFileInfo();
 
     return this.buildPromptTemplate({
       recentFiles: this.buildRecentFilesSection(context.recentlyViewFiles),
-      attachedFiles: this.buildAttachedFilesSection(context.attachedFiles, context.recentlyViewFiles),
+      attachedFiles: this.buildAttachedFilesSection(context.attachedFiles),
       attachedFolders: this.buildAttachedFoldersSection(context.attachedFolders),
       currentFile: currentFileInfo,
       userMessage,
@@ -91,11 +92,7 @@ ${files.map((file, idx) => `    ${idx + 1}: ${file}`).join('\n')}
 </recently_viewed_files>`;
   }
 
-  private buildAttachedFilesSection(
-    files: { path: string; content: string; lineErrors: string[] }[],
-    recentlyViewFiles: string[],
-  ): string {
-    files = files.filter((file) => !recentlyViewFiles.includes(file.path));
+  private buildAttachedFilesSection(files: { path: string; content: string; lineErrors: string[] }[]): string {
     if (!files.length) {
       return '';
     }

packages/ai-native/src/node/mcp-server.stdio.ts

@@ -24,7 +24,7 @@ export class StdioMCPServer implements IMCPServer {
     private readonly logger?: ILogger,
   ) {
     this.name = name;
-    this.command = command;
+    this.command = command === 'node' ? process.env.NODE_BINARY_PATH || 'node' : command;
     this.args = args;
     this.env = env;
   }
@@ -132,7 +132,7 @@ export class StdioMCPServer implements IMCPServer {
   }
 
   update(command: string, args?: string[], env?: { [key: string]: string }): void {
-    this.command = command;
+    this.command = command === 'node' ? process.env.NODE_BINARY_PATH || 'node' : command;
     this.args = args;
     this.env = env;
   }

packages/components/src/style/variable.less

@@ -51,8 +51,8 @@
 @zindex-back-top: 10;
 @zindex-picker-panel: 10;
 @zindex-popup-close: 10;
-@zindex-modal: 1000;
-@zindex-modal-mask: 1000;
+@zindex-modal: 10000;
+@zindex-modal-mask: 10000;
 @zindex-message: 1010;
 @zindex-notification: 1010;
 @zindex-popover: 1030;

packages/core-browser/src/progress/progress-bar.tsx

@@ -7,10 +7,13 @@ import styles from './progress.module.less';
 
 import { IProgressModel } from '.';
 
-export const ProgressBar: React.FC<{ progressModel: IProgressModel; className?: string }> = ({
+export const ProgressBar: React.FC<{ progressModel?: IProgressModel; className?: string }> = ({
   progressModel,
   className,
 }) => {
+  if (!progressModel) {
+    return null;
+  }
   const worked = useAutorun<number>(progressModel.worked);
   const total = useAutorun<number | undefined>(progressModel.total);
   const show = useAutorun<boolean>(progressModel.show);

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

@@ -1466,6 +1466,8 @@ export const localizationBundle = {
     'aiNative.chat.clearContext': 'Clear Context',
     'aiNative.chat.context.description': 'Total {0} References',
     'aiNative.chat.context.clear': 'Clear References',
+    'aiNative.chat.modelSelector.disableTip': 'Clear or create session to change model',
+
     'aiNative.inline.chat.operate.chat.title': 'Chat({0})',
     'aiNative.inline.chat.operate.check.title': 'Check',
     'aiNative.inline.chat.operate.thumbsup.title': 'Thumbs up',

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

@@ -1234,6 +1234,7 @@ export const localizationBundle = {
     'aiNative.chat.clearContext': '清空上下文',
     'aiNative.chat.context.description': '共 {0} 个引用',
     'aiNative.chat.context.clear': '点击清空引用',
+    'aiNative.chat.modelSelector.disableTip': '如需切换模型，请新建或清空会话',
 
     'aiNative.inline.chat.operate.chat.title': 'Chat({0})',
     'aiNative.inline.chat.operate.check.title': '采纳',

packages/main-layout/src/browser/accordion/section.view.tsx

@@ -212,7 +212,7 @@ export const AccordionSection = ({
         style={bodyStyle}
         ref={contentRef}
       >
-        {<ProgressBar className={styles.progressBar} progressModel={indicator!.progressModel} />}
+        {<ProgressBar className={styles.progressBar} progressModel={indicator?.progressModel} />}
         <ErrorBoundary>
           {metadata.message && <div className={styles.kt_split_panel_message}>{metadata.message}</div>}
           <Component

packages/main-layout/src/browser/tabbar/bar.view.tsx

@@ -17,6 +17,7 @@ import { InlineMenuBar } from '@opensumi/ide-core-browser/lib/components/actions
 import { Layout } from '@opensumi/ide-core-browser/lib/components/layout/layout';
 import { VIEW_CONTAINERS } from '@opensumi/ide-core-browser/lib/layout/view-id';
 import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
+import { observableValue } from '@opensumi/ide-monaco/lib/common/observable';
 
 import { IMainLayoutService } from '../../common';
 
@@ -25,7 +26,6 @@ import styles from './styles.module.less';
 import { TabbarService, TabbarServiceFactory } from './tabbar.service';
 
 import type { ViewBadge } from 'vscode';
-
 function splitVisibleTabs(containers: ComponentRegistryInfo[], visibleCount: number) {
   if (visibleCount >= containers.length) {
     return [containers, []];
@@ -246,7 +246,7 @@ export const IconTabView: FC<{ component: ComponentRegistryProvider }> = ({ comp
   const [component, setComponent] = useState<ComponentRegistryProvider>(defaultComponent);
   const indicator = progressService.getIndicator(component.options?.containerId || '');
 
-  const inProgress = useAutorun(indicator!.progressModel.show);
+  const inProgress = indicator ? useAutorun(indicator.progressModel.show) : false;
 
   const title = useMemo(() => {
     const options = component.options;

packages/quick-open/src/browser/quick-open.view.tsx

@@ -403,13 +403,16 @@ export const QuickOpenProgress = () => {
   const progressService: IProgressService = useInjectable(IProgressService);
   const indicator = progressService.getIndicator(VIEW_CONTAINERS.QUICKPICK_PROGRESS);
 
+  if (!indicator) {
+    return null;
+  }
   React.useEffect(() => {
     widget.updateProgressStatus(!!busy);
   }, [busy]);
 
   return (
     <div id={VIEW_CONTAINERS.QUICKPICK_PROGRESS} className={styles.progress_bar}>
-      <ProgressBar progressModel={indicator!.progressModel} />
+      <ProgressBar progressModel={indicator.progressModel} />
     </div>
   );
 };