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

package/src/browser/mcp/tools/components/EditFile.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import { Icon, Popover } from '@opensumi/ide-components';
 import {
@@ -10,7 +10,6 @@ import {
   Uri,
   detectModeId,
   path,
-  useAutorun,
   useInjectable,
 } from '@opensumi/ide-core-browser';
 import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
@@ -18,61 +17,24 @@ import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/com
 import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/model';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
+import { CodeBlockData } from '../../../../common/types';
 import { ChatMarkdown } from '../../../components/ChatMarkdown';
 import { IMCPServerToolComponentProps } from '../../../types';
-import { BaseApplyService, CodeBlockData } from '../../base-apply.service';
+import { BaseApplyService } from '../../base-apply.service';
 
 import styles from './index.module.less';
 
-const renderStatus = (codeBlockData: CodeBlockData) => {
-  const status = codeBlockData.status;
-  switch (status) {
-    case 'generating':
-      return <Loading />;
-    case 'pending':
-      return (
-        <Popover title={status} id={'edit-file-tool-status-pending'}>
-          <Icon iconClass='codicon codicon-circle-large' />
-        </Popover>
-      );
-    case 'success':
-      return (
-        <Popover title={status} id={'edit-file-tool-status-success'}>
-          <Icon iconClass='codicon codicon-check-all' />
-        </Popover>
-      );
-    case 'failed':
-      return (
-        <Popover title={status} id={'edit-file-tool-status-failed'}>
-          <Icon iconClass='codicon codicon-error' color='var(--vscode-input-errorForeground)' />
-        </Popover>
-      );
-    case 'cancelled':
-      return (
-        <Popover title={status} id={'edit-file-tool-status-cancelled'}>
-          <Icon iconClass='codicon codicon-close' color='var(--vscode-input-placeholderForeground)' />
-        </Popover>
-      );
-    default:
-      return null;
-  }
-};
-
 export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   const { args, messageId, toolCallId } = props;
+  const [mode, setMode] = useState<'code' | 'diff'>('code');
   const labelService = useInjectable(LabelService);
   const appConfig = useInjectable<AppConfig>(AppConfig);
   const applyService = useInjectable<BaseApplyService>(BaseApplyService);
   const { target_file = '', code_edit, instructions } = args || {};
   const absolutePath = path.join(appConfig.workspaceDir, target_file);
-
-  const codeBlockData = applyService.getCodeBlock(absolutePath, messageId);
-
-  useAutorun(applyService.codeBlockMapObservable);
-
-  if (toolCallId && codeBlockData) {
-    applyService.initToolCallId(codeBlockData.id, toolCallId);
-  }
+  const [codeBlockData, setCodeBlockData] = useState<CodeBlockData | undefined>(
+    applyService.getCodeBlock(toolCallId, messageId),
+  );
 
   const icon = useMemo(() => {
     if (!target_file) {
@@ -91,40 +53,66 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     return detectedModeId;
   }, [target_file, absolutePath]);
 
+  useEffect(() => {
+    const disposable = applyService.onCodeBlockUpdate((codeBlockData) => {
+      setCodeBlockData({ ...codeBlockData });
+    });
+    return () => {
+      disposable.dispose();
+    };
+  }, []);
+
   // 多次迭代时，仅在首处tool组件中展示
-  if (!args || !codeBlockData || (toolCallId && toolCallId !== codeBlockData.initToolCallId)) {
+  // FIXME: 这个优化有必要吗？每次都展示也挺好？
+  if (!args || !codeBlockData) {
     return null;
   }
 
   return [
     instructions && <p>{instructions}</p>,
-    <div className={styles['edit-file-tool']} key={`edit-file-tool-${codeBlockData.id}`}>
+    <div className={styles['edit-file-tool']} key={'edit-file-tool'}>
       <div
         className={cls(styles['edit-file-tool-header'], {
           clickable: codeBlockData.status === 'pending' || codeBlockData.status === 'success',
         })}
         onClick={() => {
           if (codeBlockData.status === 'pending') {
-            applyService.reRenderPendingApply();
+            applyService.renderApplyResult(codeBlockData, codeBlockData.updatedCode!);
           } else if (codeBlockData.status === 'success') {
-            applyService.revealApplyPosition(codeBlockData.id);
+            applyService.revealApplyPosition(codeBlockData);
           }
         }}
       >
-        {icon && <span className={icon}></span>}
-        <span className={styles['edit-file-tool-file-name']}>{target_file}</span>
-        {codeBlockData.iterationCount > 1 && (
-          <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
-        )}
-        {renderStatus(codeBlockData)}
+        <div className={styles.left}>
+          {icon && <span className={icon}></span>}
+          <span className={styles['edit-file-tool-file-name']}>{target_file}</span>
+          {codeBlockData.iterationCount > 1 && (
+            <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
+          )}
+          {renderStatus(codeBlockData)}
+        </div>
+        <div className={styles.right}>
+          <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
+            <Icon iconClass='codicon codicon-file-code' onClick={() => setMode('code')} />
+          </Popover>
+          {codeBlockData.applyResult?.diff && (
+            <Popover title={'Show Diff'} id={'edit-file-tool-show-diff'}>
+              <Icon iconClass='codicon codicon-diff-multiple' onClick={() => setMode('diff')} />
+            </Popover>
+          )}
+        </div>
       </div>
-      <ChatMarkdown markdown={`\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``} hideInsert={true} />
+      <ChatMarkdown
+        markdown={
+          mode === 'code'
+            ? `\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``
+            : `\`\`\`diff\n${codeBlockData.applyResult?.diff}\n\`\`\``
+        }
+        hideInsert={true}
+      />
     </div>,
     codeBlockData.applyResult && codeBlockData.applyResult.diagnosticInfos.length > 0 && (
-      <div
-        className={styles['edit-file-tool-diagnostic-errors']}
-        key={`edit-file-tool-diagnostic-errors-${codeBlockData.id}`}
-      >
+      <div className={styles['edit-file-tool-diagnostic-errors']} key={'edit-file-tool-diagnostic-errors'}>
         <div className={styles['title']}>Found Lints:</div>
         {codeBlockData.applyResult?.diagnosticInfos.map((info) => (
           <div
@@ -142,3 +130,37 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     ),
   ];
 };
+
+const renderStatus = (codeBlockData: CodeBlockData) => {
+  const status = codeBlockData.status;
+  switch (status) {
+    case 'generating':
+      return <Loading />;
+    case 'pending':
+      return (
+        <Popover title='Pending' id={'edit-file-tool-status-pending'}>
+          <Icon iconClass='codicon codicon-circle-large' />
+        </Popover>
+      );
+    case 'success':
+      return (
+        <Popover title='Success' id={'edit-file-tool-status-success'}>
+          <Icon iconClass='codicon codicon-check-all' />
+        </Popover>
+      );
+    case 'failed':
+      return (
+        <Popover title='Failed' id={'edit-file-tool-status-failed'}>
+          <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
+        </Popover>
+      );
+    case 'cancelled':
+      return (
+        <Popover title='Cancelled' id={'edit-file-tool-status-cancelled'}>
+          <Icon iconClass='codicon codicon-close' style={{ color: 'var(--input-placeholderForeground)' }} />
+        </Popover>
+      );
+    default:
+      return null;
+  }
+};

package/src/browser/mcp/tools/components/index.module.less

@@ -1,15 +1,14 @@
 .edit-file-tool-header {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   padding: 2px 8px;
   border-bottom: 1px solid var(--vscode-commandCenter-inactiveBorder);
   background-color: var(--design-block-background);
   font-size: 10px;
   margin-bottom: -4px;
   border-radius: 8px 8px 0 0;
-  > span {
-    margin-right: 4px;
-  }
+  white-space: nowrap;
   :global(span.codicon) {
     font-size: 12px;
   }
@@ -18,6 +17,26 @@
     align-items: center;
     justify-content: center;
   }
+  .left,
+  .right {
+    display: flex;
+    align-items: center;
+  }
+  &::after {
+    display: none;
+  }
+  .left {
+    > span {
+      margin-right: 4px;
+    }
+  }
+  .right > div {
+    margin-left: 4px;
+  }
+}
+.edit-file-tool-file-name {
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 .edit-file-tool {
   border: 1px solid var(--vscode-commandCenter-inactiveBorder);

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

@@ -69,8 +69,8 @@ You should specify the following arguments before the others: [target_file]`,
     };
   }
 
-  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
-    const result = await this.editFileHandler.handler(args.targetFile, args.codeEdit, args.instructions);
+  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+    const result = await this.editFileHandler.handler(args, args.toolCallId);
     return {
       content: [
         {

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

@@ -12,10 +12,10 @@ export class EditFileHandler {
   @Autowired(BaseApplyService)
   private applyService: BaseApplyService;
 
-  async handler(relativePath: string, updateContent: string, instructions?: string) {
-    // TODO: ignore file
-    this.applyService.registerCodeBlock(relativePath, updateContent);
-    const blockData = await this.applyService.apply(relativePath, updateContent, instructions);
+  async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
+    const { targetFile, codeEdit } = params;
+    const block = this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
+    const blockData = await this.applyService.apply(block);
     return blockData;
   }
 }

package/src/browser/model/msg-history-manager.ts

@@ -66,6 +66,11 @@ export class MsgHistoryManager extends Disposable {
     return this.startIndex;
   }
 
+  public get lastMessageId(): string | undefined {
+    const list = this.messageList;
+    return list[list.length - 1]?.id;
+  }
+
   public getMessages(maxTokens?: number): IHistoryChatMessage[] {
     if (maxTokens && this.totalTokens > maxTokens) {
       while (this.totalTokens > maxTokens) {
@@ -109,9 +114,14 @@ export class MsgHistoryManager extends Disposable {
       return;
     }
 
-    this.messageAdditionalMap.set(id, additional);
+    const oldAdditional = this.messageAdditionalMap.get(id) || {};
+    const newAdditional = {
+      ...oldAdditional,
+      ...additional,
+    };
 
-    this._onMessageAdditionalChange.fire(additional);
+    this.messageAdditionalMap.set(id, newAdditional);
+    this._onMessageAdditionalChange.fire(newAdditional);
   }
 
   public getMessageAdditional(id: string): Record<string, any> {

package/src/browser/types.ts

@@ -368,7 +368,7 @@ export interface IMCPServerToolComponentProps {
   result?: any;
   index?: number;
   messageId?: string;
-  toolCallId?: string;
+  toolCallId: string;
 }
 
 export interface IMCPServerRegistry {

package/src/browser/widget/inline-diff/inline-diff-manager.tsx

@@ -0,0 +1,38 @@
+import React, { useEffect, useState } from 'react';
+
+import { Button } from '@opensumi/ide-components';
+import { localize, useInjectable } from '@opensumi/ide-core-browser';
+import { IResource } from '@opensumi/ide-editor';
+
+import { BaseApplyService } from '../../mcp/base-apply.service';
+
+import styles from './inline-diff-widget.module.less';
+
+export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
+  const applyService = useInjectable<BaseApplyService>(BaseApplyService);
+  const [show, setShow] = useState(true);
+  useEffect(() => {
+    applyService.onCodeBlockUpdate((codeBlock) => {
+      setShow(codeBlock.status === 'pending');
+    });
+  }, []);
+  return (
+    <div className={styles.inlineDiffManager} style={{ display: show ? 'flex' : 'none' }}>
+      <Button
+        onClick={() => {
+          applyService.processAll(props.resource.uri, 'accept');
+        }}
+      >
+        {localize('aiNative.inlineDiff.acceptAll')}
+      </Button>
+      <Button
+        type='ghost'
+        onClick={() => {
+          applyService.processAll(props.resource.uri, 'reject');
+        }}
+      >
+        {localize('aiNative.inlineDiff.rejectAll')}
+      </Button>
+    </div>
+  );
+};

package/src/browser/widget/inline-diff/inline-diff-widget.module.less

@@ -19,3 +19,15 @@
   display: flex;
   position: relative;
 }
+
+.inlineDiffManager {
+  display: flex;
+  padding: 12px 16px;
+  justify-content: center;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  gap: 12px;
+  z-index: 999;
+}

package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -52,6 +52,9 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   protected readonly _onDidEditChange = this.registerDispose(new Emitter<void>());
   public readonly onDidEditChange: Event<void> = this._onDidEditChange.event;
 
+  protected readonly onDiffFinishedEmitter = this.registerDispose(new Emitter<IComputeDiffData>());
+  public readonly onDiffFinished: Event<IComputeDiffData> = this.onDiffFinishedEmitter.event;
+
   public previewerOptions: IDiffPreviewerOptions;
 
   private originalModel: ITextModel;
@@ -445,6 +448,8 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
           this.diffModel.set(currentDiffModel, tx);
         });
 
+        this.onDiffFinishedEmitter.fire(currentDiffModel);
+
         if (this.originalModel.id === this.monacoEditor.getModel()?.id) {
           this.renderDiffEdits(currentDiffModel);
         }
@@ -471,10 +476,13 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
-    // 可能存在 rate editor controller 处理完之后接口层流式才结束
-    if (this.isEditing === false) {
-      this.finallyRender(diffModel);
-    }
+    transaction((tx) => {
+      this.finallyDiffModel.set(diffModel, tx);
+      // 可能存在 rate editor controller 处理完之后接口层流式才结束
+      if (this.isEditing === false) {
+        this.finallyRender(diffModel);
+      }
+    });
   }
 
   public finallyRender(diffModel: IComputeDiffData): void {
@@ -487,6 +495,7 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
       return;
     }
 
+    this.onDiffFinishedEmitter.fire(diffModel);
     this.renderPartialEditWidgets(diffModel);
     this.renderDiffEdits(diffModel);
     this.pushStackElement();

package/src/common/types.ts

@@ -1,3 +1,5 @@
+import { IMarker } from '@opensumi/ide-core-browser';
+
 export enum NearestCodeBlockType {
   Block = 'block',
   Line = 'line',
@@ -46,3 +48,21 @@ export interface MCPTool {
   inputSchema: any;
   providerName: string;
 }
+
+export interface CodeBlockData {
+  toolCallId: string;
+  codeEdit: string;
+  updatedCode?: string;
+  relativePath: string;
+  status: CodeBlockStatus;
+  iterationCount: number;
+  createdAt: number;
+  version: number;
+  instructions?: string;
+  applyResult?: {
+    diff: string;
+    diagnosticInfos: IMarker[];
+  };
+}
+
+export type CodeBlockStatus = 'generating' | 'pending' | 'success' | 'rejected' | 'failed' | 'cancelled';

package/src/node/base-language-model.ts

@@ -60,6 +60,7 @@ export abstract class BaseLanguageModel {
       options.topP,
       options.topK,
       options.providerOptions,
+      options.trimTexts,
       cancellationToken,
     );
   }
@@ -87,6 +88,7 @@ export abstract class BaseLanguageModel {
     topP?: number,
     topK?: number,
     providerOptions?: Record<string, any>,
+    trimTexts?: [string, string],
     cancellationToken?: CancellationToken,
   ): Promise<any> {
     try {
@@ -120,9 +122,42 @@ export abstract class BaseLanguageModel {
         providerOptions,
       });
 
+      // 状态跟踪变量
+      let isFirstChunk = true;
+      let bufferedText = '';
+      const pendingLines: string[] = [];
       for await (const chunk of stream.fullStream) {
         if (chunk.type === 'text-delta') {
-          chatReadableStream.emitData({ kind: 'content', content: chunk.textDelta });
+          if (trimTexts?.length) {
+            // 将收到的文本追加到缓冲区
+            bufferedText += chunk.textDelta;
+
+            // 处理第一个文本块的前缀（只处理一次）
+            if (isFirstChunk && bufferedText.includes(trimTexts[0])) {
+              bufferedText = bufferedText.substring(bufferedText.indexOf(trimTexts[0]) + trimTexts[0].length);
+              isFirstChunk = false;
+            }
+
+            // 检查是否有完整的行，并将它们添加到待发送行队列
+            const lines = bufferedText.split('\n');
+
+            // 最后一个元素可能是不完整的行，保留在缓冲区
+            bufferedText = lines.pop() || '';
+
+            // 将完整的行添加到待发送队列
+            if (lines.length > 0) {
+              pendingLines.push(...lines);
+            }
+
+            // 发送除最后几行外的所有行（保留足够的行以处理后缀）
+            while (pendingLines.length > 3) {
+              // 保留最后3行以确保能完整识别后缀
+              const lineToSend = pendingLines.shift() + '\n';
+              chatReadableStream.emitData({ kind: 'content', content: lineToSend });
+            }
+          } else {
+            chatReadableStream.emitData({ kind: 'content', content: chunk.textDelta });
+          }
         } else if (chunk.type === 'tool-call') {
           chatReadableStream.emitData({
             kind: 'toolCall',
@@ -169,6 +204,33 @@ export abstract class BaseLanguageModel {
         }
       }
 
+      if (trimTexts?.[1]) {
+        // 完成处理所有块后，检查并发送剩余文本
+
+        // 将剩余缓冲区加入待发送行
+        if (bufferedText) {
+          pendingLines.push(bufferedText);
+        }
+
+        // 处理最后一行可能存在的后缀
+        if (pendingLines.length > 0) {
+          let lastLine = pendingLines[pendingLines.length - 1];
+
+          if (lastLine.endsWith(trimTexts[1])) {
+            // 移除后缀
+            lastLine = lastLine.substring(0, lastLine.length - trimTexts[1].length);
+            pendingLines[pendingLines.length - 1] = lastLine;
+          }
+        }
+
+        // 发送所有剩余的行
+        for (let i = 0; i < pendingLines.length; i++) {
+          const isLastLine = i === pendingLines.length - 1;
+          const lineToSend = pendingLines[i] + (isLastLine ? '' : '\n');
+          chatReadableStream.emitData({ kind: 'content', content: lineToSend });
+        }
+      }
+
       chatReadableStream.end();
     } catch (error) {
       // Use a logger service in production instead of console