@opensumi/ide-ai-native 3.8.1-next-1740965430.0 → 3.8.1-next-1741061006.0

package/src/browser/mcp/tools/handlers/RunCommand.ts

@@ -49,7 +49,6 @@ export class RunCommandHandler {
   }
 
   async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
-    logger.appendLine(`Executing command: ${args.command}`);
     if (args.require_user_approval) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
@@ -90,7 +89,6 @@ export class RunCommandHandler {
         content: result,
       });
 
-      logger.appendLine(`Command ${args.command} finished with exit code: ${e.code}`);
       terminalClient.term.writeln(
         `\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${
           3000 / 1000

package/src/browser/mcp/tools/runTerminalCmd.ts

@@ -32,7 +32,6 @@ export class RunTerminalCommandTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'run_terminal_cmd',
-      label: 'Run Command',
       description:
         "PROPOSE a command to run on behalf of the user.\nIf you have this tool, note that you DO have the ability to run commands directly on the USER's system.\n\nAdhere to these rules:\n1. Based on the contents of the conversation, you will be told if you are in the same shell as a previous step or a new shell.\n2. If in a new shell, you should `cd` to the right directory and do necessary setup in addition to running the command.\n3. If in the same shell, the state will persist, no need to do things like `cd` to the same directory.\n4. For ANY commands that would use a pager, you should append ` | cat` to the command (or whatever is appropriate). You MUST do this for: git, less, head, tail, more, etc.\n5. For commands that are long running/expected to run indefinitely until interruption, please run them in the background. To run jobs in the background, set `is_background` to true rather than changing the details of the command.\n6. Dont include any newlines in the command.",
       inputSchema,

package/src/browser/preferences/schema.ts

@@ -148,6 +148,7 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
     },
     [AINativeSettingSectionsId.SystemPrompt]: {
       type: 'string',
+      default: '',
       description: localize('preference.ai.native.chat.system.prompt.description'),
     },
   },

package/src/common/llm-context.ts

@@ -15,13 +15,13 @@ export interface LLMContextService {
    */
   cleanFileContext(): void;
 
-  onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[]; version: number }>;
+  onDidContextFilesChangeEvent: Event<FileContext[]>;
 
   /**
    * 从 context 中移除文件
    * @param uri URI
    */
-  removeFileFromContext(uri: URI, isManual?: boolean): void;
+  removeFileFromContext(uri: URI): void;
 
   /** 导出为可序列化格式 */
   serialize(): SerializedContext;
@@ -30,18 +30,12 @@ export interface LLMContextService {
 export interface FileContext {
   uri: URI;
   selection?: [number, number];
+  isManual: boolean;
 }
 
 export const LLMContextServiceToken = Symbol('LLMContextService');
 
-export interface AttachFileContext {
-  content: string;
-  lineErrors: string[];
-  path: string;
-  language: string;
-}
-
 export interface SerializedContext {
   recentlyViewFiles: string[];
-  attachedFiles: Array<AttachFileContext>;
+  attachedFiles: Array<{ content: string; lineErrors: string[]; path: string; language: string }>;
 }

package/src/common/prompts/context-prompt-provider.ts

@@ -1,5 +1,5 @@
-import { Autowired, Injectable } from '@opensumi/di';
-import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common/editor';
+import { Injectable } from '@opensumi/di';
+import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
 
 import { SerializedContext } from '../llm-context';
 
@@ -10,46 +10,37 @@ export interface ChatAgentPromptProvider {
    * 提供上下文提示
    * @param context 上下文
    */
-  provideContextPrompt(context: SerializedContext, userMessage: string): string;
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
 }
 
 @Injectable()
 export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
-  @Autowired(WorkbenchEditorService)
-  protected readonly workbenchEditorService: WorkbenchEditorService;
-
-  provideContextPrompt(context: SerializedContext, userMessage: string): string {
-    const editor = this.workbenchEditorService.currentEditor;
-    const currentModel = editor?.currentDocumentModel;
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string> {
     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}`).join('\n')}
-  </recently_viewed_files>
-  <attached_files>
-    ${context.attachedFiles.map(
-      (file) =>
-        `
-    <file_contents>
-    \`\`\`${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>`;
+          <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>`;
   }
 }