@opensumi/ide-ai-native 3.7.2-next-1740450374.0 → 3.8.1-next-1740452092.0

package/lib/browser/contrib/intelligent-completions/view/legacy.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LegacyCodeEditsView = void 0;
+const ide_monaco_1 = require("@opensumi/ide-monaco");
+const ide_utils_1 = require("@opensumi/ide-utils");
+const strings_1 = require("@opensumi/ide-utils/lib/strings");
+const rewrite_widget_1 = require("../../../widget/rewrite/rewrite-widget");
+const additions_deletions_decoration_1 = require("../decoration/additions-deletions.decoration");
+const multi_line_decoration_1 = require("../decoration/multi-line.decoration");
+const diff_computer_1 = require("../diff-computer");
+const base_1 = require("./base");
+class LegacyCodeEditsView extends base_1.BaseCodeEditsView {
+    constructor() {
+        super(...arguments);
+        this.multiLineDecorationModel = new multi_line_decoration_1.MultiLineDecorationModel(this.monacoEditor);
+        this.additionsDeletionsDecorationModel = new additions_deletions_decoration_1.AdditionsDeletionsDecorationModel(this.monacoEditor);
+    }
+    get model() {
+        return this.monacoEditor.getModel();
+    }
+    mount() {
+        this.addDispose(ide_utils_1.Event.any(this.monacoEditor.onDidChangeCursorPosition, this.monacoEditor.onDidChangeModelContent, this.monacoEditor.onDidBlurEditorWidget)(() => {
+            this.additionsDeletionsDecorationModel.clearAdditionsDecorations();
+        }));
+    }
+    destroyRewriteWidget() {
+        if (this.rewriteWidget) {
+            this.rewriteWidget.dispose();
+            this.rewriteWidget = null;
+        }
+    }
+    async renderRewriteWidget(wordChanges, model, range, insertTextString) {
+        this.destroyRewriteWidget();
+        const cursorPosition = this.monacoEditor.getPosition();
+        if (!cursorPosition) {
+            return;
+        }
+        this.rewriteWidget = this.injector.get(rewrite_widget_1.RewriteWidget, [this.monacoEditor]);
+        const startOffset = this.model.getOffsetAt({ lineNumber: range.startLineNumber, column: range.startColumn });
+        const endOffset = this.model.getOffsetAt({ lineNumber: range.endLineNumber, column: range.endColumn });
+        const allText = this.model.getValue();
+        // 这里是为了能在 rewrite widget 的 editor 当中完整的复用代码高亮与语法检测的能力
+        const newVirtualContent = allText.substring(0, startOffset) + insertTextString + allText.substring(endOffset);
+        const lineChangesMap = (0, diff_computer_1.wordChangesToLineChangesMap)(wordChanges, range, model);
+        await this.rewriteWidget.defered.promise;
+        const allLineChanges = Object.values(lineChangesMap).map((lineChanges) => ({
+            changes: lineChanges
+                .map((change) => change.filter((item) => item.value.trim() !== strings_1.empty))
+                .filter((change) => change.length > 0),
+        }));
+        this.rewriteWidget.setInsertText(insertTextString);
+        this.rewriteWidget.show({ position: cursorPosition });
+        this.rewriteWidget.setEditArea(range);
+        if (allLineChanges.every(({ changes }) => changes.every((change) => change.every(({ removed }) => removed)))) {
+            // 处理全是删除的情况
+            this.rewriteWidget.renderTextLineThrough(allLineChanges);
+        }
+        else {
+            this.rewriteWidget.renderVirtualEditor(newVirtualContent, wordChanges);
+        }
+    }
+    render(completionModel) {
+        const { items } = completionModel;
+        const { range, insertText } = items[0];
+        // code edits 必须提供 range
+        if (!range) {
+            return;
+        }
+        const position = this.monacoEditor.getPosition();
+        const model = this.monacoEditor.getModel();
+        const insertTextString = insertText.toString();
+        const originalContent = model === null || model === void 0 ? void 0 : model.getValueInRange(range);
+        const eol = this.model.getEOL();
+        const changes = (0, diff_computer_1.computeMultiLineDiffChanges)(originalContent, insertTextString, this.monacoEditor, range.startLineNumber, eol);
+        if (!changes) {
+            return;
+        }
+        const { singleLineCharChanges, charChanges, wordChanges, isOnlyAddingToEachWord } = changes;
+        // 限制 changes 数量，超过这个数量直接显示智能重写
+        const maxCharChanges = 20;
+        const maxWordChanges = 20;
+        if (range &&
+            isOnlyAddingToEachWord &&
+            charChanges.length <= maxCharChanges &&
+            wordChanges.length <= maxWordChanges) {
+            const modificationsResult = this.multiLineDecorationModel.applyInlineDecorations(this.monacoEditor, (0, diff_computer_1.mergeMultiLineDiffChanges)(singleLineCharChanges, eol), range.startLineNumber, position);
+            this.multiLineDecorationModel.clearDecorations();
+            if (!modificationsResult) {
+                this.renderRewriteWidget(wordChanges, model, range, insertTextString);
+            }
+            else if (modificationsResult && modificationsResult.inlineMods) {
+                this.multiLineDecorationModel.updateLineModificationDecorations(modificationsResult.inlineMods);
+            }
+        }
+        else {
+            this.additionsDeletionsDecorationModel.updateDeletionsDecoration(wordChanges, range, eol);
+            this.renderRewriteWidget(wordChanges, model, range, insertTextString);
+        }
+    }
+    accept() {
+        this.multiLineDecorationModel.accept();
+        if (this.rewriteWidget) {
+            this.rewriteWidget.accept();
+            const virtualEditor = this.rewriteWidget.getVirtualEditor();
+            // 采纳完之后将 virtualEditor 的 decorations 重新映射在 editor 上
+            if (virtualEditor) {
+                const editArea = this.rewriteWidget.getEditArea();
+                const decorations = virtualEditor.getDecorationsInRange(ide_monaco_1.Range.lift(editArea));
+                const preAddedDecorations = decorations === null || decorations === void 0 ? void 0 : decorations.filter((decoration) => decoration.options.description === rewrite_widget_1.REWRITE_DECORATION_INLINE_ADD);
+                if (preAddedDecorations) {
+                    this.additionsDeletionsDecorationModel.updateAdditionsDecoration(preAddedDecorations.map((decoration) => decoration.range));
+                }
+            }
+        }
+    }
+    discard() {
+        this.hide();
+    }
+    hide() {
+        this.multiLineDecorationModel.clearDecorations();
+        this.additionsDeletionsDecorationModel.clearDeletionsDecorations();
+        this.destroyRewriteWidget();
+    }
+}
+exports.LegacyCodeEditsView = LegacyCodeEditsView;
+//# sourceMappingURL=legacy.js.map

package/lib/browser/contrib/intelligent-completions/view/legacy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../../../src/browser/contrib/intelligent-completions/view/legacy.ts"],"names":[],"mappings":"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"}

package/lib/browser/layout/layout.module.less

@@ -23,7 +23,7 @@
     .rce-mbox-text {
       line-height: 18px;
       width: inherit;
-      font-size: 14px;
+      font-size: 12px;
     }
 
     .rce-smsg {

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

@@ -132,6 +132,10 @@
 }
 
 .run_cmd_tool {
+  background-color: var(--design-chatInput-background);
+  padding: 10px;
+  border-radius: 4px;
+
   .command_title {
     display: flex;
     align-items: center;

package/lib/browser/preferences/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preferences/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGzF,oBAAY,sBAAsB;IAChC,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,wBAAwB,EAAE,gBA0HtC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preferences/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKzF,oBAAY,sBAAsB;IAChC,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,wBAAwB,EAAE,gBAgItC,CAAC"}

package/lib/browser/preferences/schema.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aiNativePreferenceSchema = exports.EInlineDiffPreviewMode = void 0;
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
+const intelligent_completions_1 = require("../contrib/intelligent-completions");
 var EInlineDiffPreviewMode;
 (function (EInlineDiffPreviewMode) {
     EInlineDiffPreviewMode["inlineLive"] = "inlineLive";
@@ -60,6 +61,12 @@ exports.aiNativePreferenceSchema = {
             type: 'boolean',
             default: false,
         },
+        [ide_core_browser_1.AINativeSettingSectionsId.CodeEditsRenderType]: {
+            type: 'string',
+            default: intelligent_completions_1.CodeEditsRenderType.Default,
+            enum: [intelligent_completions_1.CodeEditsRenderType.Legacy, intelligent_completions_1.CodeEditsRenderType.Default],
+            description: (0, ide_core_common_1.localize)('preference.ai.native.codeEdits.renderType'),
+        },
         [ide_core_browser_1.AINativeSettingSectionsId.LLMModelSelection]: {
             type: 'string',
             default: 'deepseek',

package/lib/browser/preferences/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/browser/preferences/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/browser/preferences/schema.ts"],"names":[],"mappings":";;;AAAA,iEAAyF;AACzF,+DAAqD;AAErD,gFAAyE;AAEzE,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,mDAAyB,CAAA;IACzB,mDAAyB,CAAA;AAC3B,CAAC,EAHW,sBAAsB,sCAAtB,sBAAsB,QAGjC;AAEY,QAAA,wBAAwB,GAAqB;IACxD,UAAU,EAAE;QACV,CAAC,4CAAyB,CAAC,qBAAqB,CAAC,EAAE;YACjD,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,sBAAsB,CAAC,UAAU,CAAC;YAC5E,gBAAgB,EAAE;gBAChB,IAAA,0BAAQ,EAAC,yDAAyD,CAAC;gBACnE,IAAA,0BAAQ,EAAC,yDAAyD,CAAC;aACpE;YACD,OAAO,EAAE,sBAAsB,CAAC,UAAU;SAC3C;QACD,CAAC,4CAAyB,CAAC,qBAAqB,CAAC,EAAE;YACjD,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SACd;QACD,CAAC,4CAAyB,CAAC,2BAA2B,CAAC,EAAE;YACvD,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SACd;QACD,CAAC,4CAAyB,CAAC,+BAA+B,CAAC,EAAE;YAC3D,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SACd;QACD,CAAC,4CAAyB,CAAC,eAAe,CAAC,EAAE;YAC3C,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC;YACpC,OAAO,EAAE,SAAS;SACnB;QACD,CAAC,4CAAyB,CAAC,8CAA8C,CAAC,EAAE;YAC1E,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SACd;QACD,CAAC,4CAAyB,CAAC,kCAAkC,CAAC,EAAE;YAC9D,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;SACb;QACD,CAAC,4CAAyB,CAAC,kCAAkC,CAAC,EAAE;YAC9D,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SACd;QACD,CAAC,4CAAyB,CAAC,mCAAmC,CAAC,EAAE;YAC/D,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf;QACD,CAAC,4CAAyB,CAAC,mBAAmB,CAAC,EAAE;YAC/C,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf;QACD,CAAC,4CAAyB,CAAC,mBAAmB,CAAC,EAAE;YAC/C,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf;QACD,CAAC,4CAAyB,CAAC,mBAAmB,CAAC,EAAE;YAC/C,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,6CAAmB,CAAC,OAAO;YACpC,IAAI,EAAE,CAAC,6CAAmB,CAAC,MAAM,EAAE,6CAAmB,CAAC,OAAO,CAAC;YAC/D,WAAW,EAAE,IAAA,0BAAQ,EAAC,2CAA2C,CAAC;SACnE;QACD,CAAC,4CAAyB,CAAC,iBAAiB,CAAC,EAAE;YAC7C,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,UAAU;YACnB,IAAI,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC;YACzC,WAAW,EAAE,IAAA,0BAAQ,EAAC,sDAAsD,CAAC;SAC9E;QACD,CAAC,4CAAyB,CAAC,cAAc,CAAC,EAAE;YAC1C,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,kDAAkD,CAAC;SAC1E;QACD,CAAC,4CAAyB,CAAC,eAAe,CAAC,EAAE;YAC3C,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,mDAAmD,CAAC;SAC3E;QACD,CAAC,4CAAyB,CAAC,YAAY,CAAC,EAAE;YACxC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,gDAAgD,CAAC;SACxE;QACD,CAAC,4CAAyB,CAAC,aAAa,CAAC,EAAE;YACzC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,iDAAiD,CAAC;SACzE;QACD,CAAC,4CAAyB,CAAC,UAAU,CAAC,EAAE;YACtC,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,8CAA8C,CAAC;YACrE,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC;gBACrC,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,IAAA,0BAAQ,EAAC,mDAAmD,CAAC;qBAC3E;oBACD,OAAO,EAAE;wBACP,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,IAAA,0BAAQ,EAAC,sDAAsD,CAAC;qBAC9E;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;yBACf;wBACD,WAAW,EAAE,IAAA,0BAAQ,EAAC,mDAAmD,CAAC;qBAC3E;oBACD,GAAG,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,oBAAoB,EAAE;4BACpB,IAAI,EAAE,QAAQ;yBACf;wBACD,WAAW,EAAE,IAAA,0BAAQ,EAAC,kDAAkD,CAAC;wBACzE,OAAO,EAAE,EAAE;qBACZ;iBACF;aACF;SACF;QACD,CAAC,4CAAyB,CAAC,eAAe,CAAC,EAAE;YAC3C,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf;QACD,CAAC,4CAAyB,CAAC,YAAY,CAAC,EAAE;YACxC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,IAAA,0BAAQ,EAAC,qDAAqD,CAAC;SAC7E;KACF;CACF,CAAC"}

package/lib/browser/widget/inline-hint/inline-hint.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inline-hint.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAMlE,qBAAa,oBAAqB,SAAQ,4BAA4B;IACpE,gBAAuB,EAAE,mCAAmC;WAE9C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAInE,OAAO,KAAK,wBAAwB,GAEnC;IAED,KAAK,IAAI,WAAW;IAIpB,OAAO,CAAC,uBAAuB;CAyFhC"}
+{"version":3,"file":"inline-hint.controller.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAMlE,qBAAa,oBAAqB,SAAQ,4BAA4B;IACpE,gBAAuB,EAAE,mCAAmC;WAE9C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAInE,OAAO,KAAK,wBAAwB,GAEnC;IAED,KAAK,IAAI,WAAW;IAIpB,OAAO,CAAC,uBAAuB;CA6FhC"}

package/lib/browser/widget/inline-hint/inline-hint.controller.js

@@ -27,11 +27,13 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
             hintDisposable.dispose();
         };
         const showHint = (position) => {
-            var _a;
             const model = monacoEditor.getModel();
             if (!model) {
                 return;
             }
+            if (position.lineNumber > model.getLineCount()) {
+                return;
+            }
             if (this.inlineCompletionsService.isVisibleCompletion) {
                 return;
             }
@@ -39,7 +41,7 @@ class InlineHintController extends base_1.BaseAIMonacoEditorController {
             const hasPreviewDecoration = decorations.some((dec) => dec.options.description === internal_type_1.InlineInputPreviewDecorationID);
             if (!hasPreviewDecoration) {
                 const inlineHintLineDecoration = this.injector.get(inline_hint_line_widget_1.InlineHintLineDecoration, [monacoEditor]);
-                const lineContent = (_a = monacoEditor.getModel()) === null || _a === void 0 ? void 0 : _a.getLineContent(position.lineNumber);
+                const lineContent = model.getLineContent(position.lineNumber);
                 if (!(lineContent === null || lineContent === void 0 ? void 0 : lineContent.trim())) {
                     inlineHintLineDecoration.show(position);
                 }

package/lib/browser/widget/inline-hint/inline-hint.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"inline-hint.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inline-hint.controller.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-hint/inline-hint.controller.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.7.2-next-1740450374.0",
+  "version": "3.8.1-next-1740452092.0",
   "files": [
     "lib",
     "src"
@@ -23,26 +23,26 @@
     "@ai-sdk/deepseek": "^0.1.8",
     "@ai-sdk/openai": "^1.1.9",
     "@modelcontextprotocol/sdk": "^1.3.1",
-    "@opensumi/ide-addons": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-components": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-connection": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-core-common": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-core-node": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-debug": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-design": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-editor": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-file-search": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-file-service": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-main-layout": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-markers": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-monaco": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-overlay": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-preferences": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-search": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-terminal-next": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-theme": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-utils": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-workspace": "3.7.2-next-1740450374.0",
+    "@opensumi/ide-addons": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-components": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-connection": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-core-common": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-core-node": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-debug": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-design": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-editor": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-file-search": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-file-service": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-main-layout": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-markers": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-monaco": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-overlay": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-preferences": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-search": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-terminal-next": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-theme": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-utils": "3.8.1-next-1740452092.0",
+    "@opensumi/ide-workspace": "3.8.1-next-1740452092.0",
     "@xterm/xterm": "5.5.0",
     "ai": "^4.1.21",
     "ansi-regex": "^2.0.0",
@@ -57,7 +57,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.7.2-next-1740450374.0"
+    "@opensumi/ide-core-browser": "3.8.1-next-1740452092.0"
   },
-  "gitHead": "12458460da12fc6e96c4942034c7012b2381990c"
+  "gitHead": "7141eb9be9489c0442a31e595cfff5d2e420e0de"
 }

package/src/browser/ai-core.contribution.ts

@@ -424,6 +424,10 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.CodeEditsTyping,
             localized: 'preference.ai.native.codeEdits.typing',
           },
+          {
+            id: AINativeSettingSectionsId.CodeEditsRenderType,
+            localized: 'preference.ai.native.codeEdits.renderType',
+          },
           {
             id: AINativeSettingSectionsId.SystemPrompt,
             localized: 'preference.ai.native.chat.system.prompt',

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

@@ -4,7 +4,7 @@
   height: 100%;
   border-radius: 12px;
   overflow: hidden;
-  font-size: 14px;
+  font-size: 12px;
   user-select: text;
 
   border-top-left-radius: 12px;
@@ -75,7 +75,7 @@
 
   .header_container {
     height: 36px;
-    padding: 8px 0 8px 16px;
+    padding: 8px 8px 8px 16px;
     box-sizing: border-box;
     background-color: var(--editorGroupHeader-tabsBackground);
     user-select: none;

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

@@ -83,12 +83,9 @@ export const AIChatView = () => {
   const promptProvider = useInjectable<ChatAgentPromptProvider>(ChatAgentPromptProvider);
 
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
-  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   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 [shortcutCommands, setShortcutCommands] = React.useState<ChatSlashCommandItemModel[]>([]);
 
@@ -110,7 +107,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);
 
   React.useEffect(() => {
     const featureSlashCommands = chatFeatureRegistry.getAllShortcutSlashCommand();
@@ -662,25 +658,6 @@ export const AIChatView = () => {
     };
   }, [aiChatService.sessionModel]);
 
-  useEventEffect(
-    mcpServerProxyService.onChangeMCPServers,
-    () => {
-      mcpServerProxyService.getAllMCPTools().then((tools) => {
-        setMcpToolsCount(tools.length);
-      });
-    },
-    [mcpServerProxyService],
-  );
-
-  const handleShowMCPTools = React.useCallback(async () => {
-    const tools = await mcpServerProxyService.getAllMCPTools();
-    dialogService.open({
-      message: <MCPToolsDialog tools={tools} />,
-      type: MessageType.Empty,
-      buttons: ['关闭'],
-    });
-  }, [mcpServerProxyService, dialogService]);
-
   return (
     <div id={styles.ai_chat_view}>
       <div className={styles.header_container}>
@@ -720,13 +697,6 @@ export const AIChatView = () => {
                   </Popover>
                 ))}
               </div>
-              <div className={styles.header_operate_right}>
-                {aiNativeConfigService.capabilities.supportsMCP && (
-                  <div className={styles.tag} onClick={handleShowMCPTools}>
-                    {`MCP Tools: ${mcpToolsCount}`}
-                  </div>
-                )}
-              </div>
             </div>
             <ChatInputWrapperRender
               onSend={(value, agentId, command) =>
@@ -765,6 +735,9 @@ export function DefaultChatViewHeader({
   handleClear: () => any;
   handleCloseChatView: () => any;
 }) {
+  const dialogService = useInjectable<IDialogService>(IDialogService);
+  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
+  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const aiChatService = useInjectable<ChatInternalService>(IChatInternalService);
   const [historyList, setHistoryList] = React.useState<IChatHistoryItem[]>([]);
   const [currentTitle, setCurrentTitle] = React.useState<string>('');
@@ -786,6 +759,15 @@ export function DefaultChatViewHeader({
     [aiChatService],
   );
 
+  const handleShowMCPTools = React.useCallback(async () => {
+    const tools = await mcpServerProxyService.getAllMCPTools();
+    dialogService.open({
+      message: <MCPToolsDialog tools={tools} />,
+      type: MessageType.Empty,
+      buttons: ['关闭'],
+    });
+  }, [mcpServerProxyService, dialogService]);
+
   React.useEffect(() => {
     const getHistoryList = () => {
       const currentMessages = aiChatService.sessionModel.history.getMessages();
@@ -865,6 +847,23 @@ 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/chat-history.css

@@ -25,7 +25,7 @@
   .dm-chat-history-header-actions {
     display: flex;
     align-items: center;
-    font-size: 14px;
+    font-size: 12px;
 
     .dm-chat-history-header-actions-history {
       cursor: pointer;

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

@@ -35,7 +35,7 @@
 }
 
 .thinking_text {
-  font-size: 14px;
+  font-size: 12px;
 }
 
 .bottom_container {
@@ -480,7 +480,7 @@
 * welcome
 */
 .chat_welcome_head {
-  font-size: 14px;
+  font-size: 12px;
   line-height: 22px;
   a {
     color: #3c8dff;

package/src/browser/contrib/intelligent-completions/index.ts

@@ -1,11 +1,22 @@
 import { Disposable, ECodeEditsSourceTyping } from '@opensumi/ide-core-common';
-import { IModelContentChangedEvent, IPosition, IRange, InlineCompletion } from '@opensumi/ide-monaco';
+import {
+  IModelContentChangedEvent,
+  IPosition,
+  IRange,
+  InlineCompletion,
+  InlineCompletions,
+} from '@opensumi/ide-monaco';
 
 import { ITriggerData } from './source/trigger.source';
 
 import type { ILineChangeData } from './source/line-change.source';
 import type { ILinterErrorData } from './source/lint-error.source';
 
+export enum CodeEditsRenderType {
+  Legacy = 'legacy',
+  Default = 'default',
+}
+
 /**
  * 有效弃用时间（毫秒）
  * 在可见的情况下超过 750ms 弃用才算有效数据，否则视为无效数据
@@ -31,7 +42,7 @@ export interface ICodeEditsContextBean {
   };
 }
 
-export interface ICodeEdit {
+export interface ICodeEdit extends InlineCompletion {
   /**
    * 插入的文本
    */
@@ -41,16 +52,24 @@ export interface ICodeEdit {
    */
   readonly range: IRange;
 }
-export interface ICodeEditsResult {
-  readonly items: ICodeEdit[];
+
+export interface ICodeEditsResult<T extends ICodeEdit = ICodeEdit> extends InlineCompletions<T> {
+  readonly items: readonly T[];
 }
 
-export class CodeEditsResultValue extends Disposable {
-  constructor(private readonly raw: ICodeEditsResult) {
+export class CodeEditsResultValue<T extends ICodeEdit = ICodeEdit> extends Disposable {
+  constructor(private readonly raw: ICodeEditsResult<T>) {
     super();
   }
 
-  public get items(): ICodeEdit[] {
-    return this.raw.items;
+  public get items(): T[] {
+    return this.raw.items.map((item) => ({
+      ...item,
+      isInlineEdit: true,
+    }));
+  }
+
+  public get range(): IRange {
+    return this.raw.items[0].range;
   }
 }