@opensumi/ide-core-common 2.27.3-rc-1714116491.0 → 2.27.3-rc-1714982362.0

package/lib/ai-native/index.d.ts

@@ -0,0 +1,2 @@
+export * from './views';
+//# sourceMappingURL=index.d.ts.map

package/lib/ai-native/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ai-native/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}

package/lib/ai-native/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./views"), exports);
+//# sourceMappingURL=index.js.map

package/lib/ai-native/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ai-native/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB"}

package/lib/ai-native/views.d.ts

@@ -0,0 +1,2 @@
+export declare const AIInlineChatContentWidgetId = "AI-Inline-Chat-Content-Widget";
+//# sourceMappingURL=views.d.ts.map

package/lib/ai-native/views.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"views.d.ts","sourceRoot":"","sources":["../../src/ai-native/views.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,kCAAkC,CAAC"}

package/lib/ai-native/views.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AIInlineChatContentWidgetId = void 0;
+exports.AIInlineChatContentWidgetId = 'AI-Inline-Chat-Content-Widget';
+//# sourceMappingURL=views.js.map

package/lib/ai-native/views.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"views.js","sourceRoot":"","sources":["../../src/ai-native/views.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,+BAA+B,CAAC"}

package/lib/commands/git.d.ts

@@ -0,0 +1,9 @@
+export declare const MergeConflictCommands: {
+    readonly Previous: "merge-conflict.previous";
+    readonly Next: "merge-conflict.next";
+};
+export declare const GitCommands: {
+    Stage: string;
+    StageAllMerge: string;
+};
+//# sourceMappingURL=git.d.ts.map

package/lib/commands/git.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/commands/git.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC;AAEX,eAAO,MAAM,WAAW;;;CAGvB,CAAC"}

package/lib/commands/git.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GitCommands = exports.MergeConflictCommands = void 0;
+exports.MergeConflictCommands = {
+    Previous: 'merge-conflict.previous',
+    Next: 'merge-conflict.next',
+};
+exports.GitCommands = {
+    Stage: 'git.stage',
+    StageAllMerge: 'git.stageAllMerge',
+};
+//# sourceMappingURL=git.js.map

package/lib/commands/git.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/commands/git.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG;IACnC,QAAQ,EAAE,yBAAyB;IACnC,IAAI,EAAE,qBAAqB;CACnB,CAAC;AAEE,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,mBAAmB;CACnC,CAAC"}

package/lib/index.d.ts

@@ -33,4 +33,5 @@ export * from './clipboard';
 export * from './mime';
 export * from './application.lifecycle';
 export * from './extension.schema';
+export * from './ai-native';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC"}

package/lib/index.js

@@ -36,4 +36,5 @@ tslib_1.__exportStar(require("./clipboard"), exports);
 tslib_1.__exportStar(require("./mime"), exports);
 tslib_1.__exportStar(require("./application.lifecycle"), exports);
 tslib_1.__exportStar(require("./extension.schema"), exports);
+tslib_1.__exportStar(require("./ai-native"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,sDAA4B;AAC5B,kEAAwC;AACxC,oDAA0B;AAC1B,mDAAyB;AACzB,sDAA4B;AAC5B,mDAAyB;AACzB,oDAA0B;AAC1B,iDAAuB;AACvB,qDAA2B;AAC3B,kDAAwB;AACxB,wDAA8B;AAC9B,oDAA0B;AAC1B,oDAA0B;AAC1B,gDAAsB;AACtB,wDAA8B;AAC9B,qDAA2B;AAC3B,uDAA6B;AAC7B,sDAA4B;AAC5B,4DAAkC;AAClC,4DAAkC;AAClC,4DAAkC;AAClC,sDAA4B;AAC5B,qDAA2B;AAC3B,kDAAwB;AACxB,gDAAsB;AACtB,uDAA6B;AAC7B,mDAAyB;AACzB,qDAA2B;AAC3B,qDAA2B;AAC3B,kDAAwB;AACxB,sDAA4B;AAC5B,iDAAuB;AACvB,kEAAwC;AACxC,6DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,sDAA4B;AAC5B,kEAAwC;AACxC,oDAA0B;AAC1B,mDAAyB;AACzB,sDAA4B;AAC5B,mDAAyB;AACzB,oDAA0B;AAC1B,iDAAuB;AACvB,qDAA2B;AAC3B,kDAAwB;AACxB,wDAA8B;AAC9B,oDAA0B;AAC1B,oDAA0B;AAC1B,gDAAsB;AACtB,wDAA8B;AAC9B,qDAA2B;AAC3B,uDAA6B;AAC7B,sDAA4B;AAC5B,4DAAkC;AAClC,4DAAkC;AAClC,4DAAkC;AAClC,sDAA4B;AAC5B,qDAA2B;AAC3B,kDAAwB;AACxB,gDAAsB;AACtB,uDAA6B;AAC7B,mDAAyB;AACzB,qDAA2B;AAC3B,qDAA2B;AAC3B,kDAAwB;AACxB,sDAA4B;AAC5B,iDAAuB;AACvB,kEAAwC;AACxC,6DAAmC;AACnC,sDAA4B"}

package/lib/settings/ai-native.d.ts

@@ -4,4 +4,5 @@ export declare enum AINativeSettingSectionsId {
     CHAT_VISIBLE_TYPE = "ai.native.chat.visible.type"
 }
 export declare const AI_NATIVE_SETTING_GROUP_ID = "AI-Native";
+export declare const AI_NATIVE_SETTING_GROUP_TITLE = "AI Native";
 //# sourceMappingURL=ai-native.d.ts.map

package/lib/settings/ai-native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-native.d.ts","sourceRoot":"","sources":["../../src/settings/ai-native.ts"],"names":[],"mappings":"AAAA,oBAAY,yBAAyB;IACnC,wBAAwB,sCAAsC;IAC9D,+BAA+B,4CAA4C;IAC3E,iBAAiB,gCAAgC;CAClD;AACD,eAAO,MAAM,0BAA0B,cAAc,CAAC"}
+{"version":3,"file":"ai-native.d.ts","sourceRoot":"","sources":["../../src/settings/ai-native.ts"],"names":[],"mappings":"AAAA,oBAAY,yBAAyB;IACnC,wBAAwB,sCAAsC;IAC9D,+BAA+B,4CAA4C;IAC3E,iBAAiB,gCAAgC;CAClD;AACD,eAAO,MAAM,0BAA0B,cAAc,CAAC;AACtD,eAAO,MAAM,6BAA6B,cAAc,CAAC"}

package/lib/settings/ai-native.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AI_NATIVE_SETTING_GROUP_ID = exports.AINativeSettingSectionsId = void 0;
+exports.AI_NATIVE_SETTING_GROUP_TITLE = exports.AI_NATIVE_SETTING_GROUP_ID = exports.AINativeSettingSectionsId = void 0;
 var AINativeSettingSectionsId;
 (function (AINativeSettingSectionsId) {
     AINativeSettingSectionsId["INLINE_CHAT_AUTO_VISIBLE"] = "ai.native.inlineChat.auto.visible";
@@ -8,4 +8,5 @@ var AINativeSettingSectionsId;
     AINativeSettingSectionsId["CHAT_VISIBLE_TYPE"] = "ai.native.chat.visible.type";
 })(AINativeSettingSectionsId = exports.AINativeSettingSectionsId || (exports.AINativeSettingSectionsId = {}));
 exports.AI_NATIVE_SETTING_GROUP_ID = 'AI-Native';
+exports.AI_NATIVE_SETTING_GROUP_TITLE = 'AI Native';
 //# sourceMappingURL=ai-native.js.map

package/lib/settings/ai-native.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-native.js","sourceRoot":"","sources":["../../src/settings/ai-native.ts"],"names":[],"mappings":";;;AAAA,IAAY,yBAIX;AAJD,WAAY,yBAAyB;IACnC,2FAA8D,CAAA;IAC9D,wGAA2E,CAAA;IAC3E,8EAAiD,CAAA;AACnD,CAAC,EAJW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAIpC;AACY,QAAA,0BAA0B,GAAG,WAAW,CAAC"}
+{"version":3,"file":"ai-native.js","sourceRoot":"","sources":["../../src/settings/ai-native.ts"],"names":[],"mappings":";;;AAAA,IAAY,yBAIX;AAJD,WAAY,yBAAyB;IACnC,2FAA8D,CAAA;IAC9D,wGAA2E,CAAA;IAC3E,8EAAiD,CAAA;AACnD,CAAC,EAJW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAIpC;AACY,QAAA,0BAA0B,GAAG,WAAW,CAAC;AACzC,QAAA,6BAA6B,GAAG,WAAW,CAAC"}

package/lib/types/ai-native/index.d.ts

@@ -3,10 +3,6 @@ import { CancellationToken, MaybePromise } from '../../utils';
 import { IAIReportCompletionOption } from './reporter';
 export * from './reporter';
 export interface IAINativeCapabilities {
-    /**
-     * Use opensumi design UI style
-     */
-    supportsOpenSumiDesign?: boolean;
     /**
      * Problem panel uses ai capabilities
      */
@@ -40,14 +36,23 @@ export interface IAINativeCapabilities {
      */
     supportsTerminalCommandSuggest?: boolean;
 }
-export interface IAINativeLayout {
+export interface IDesignLayoutConfig {
+    /**
+     * merge right panel with left panel
+     */
     useMergeRightWithLeftPanel?: boolean;
+    /**
+     * use new manubar view
+     */
     useMenubarView?: boolean;
+    /**
+     * set menubar logo
+     */
     menubarLogo?: string;
 }
 export interface IAINativeConfig {
     capabilities?: IAINativeCapabilities;
-    layout?: IAINativeLayout;
+    layout?: IDesignLayoutConfig;
 }
 export interface IAICompletionResultModel {
     sessionId: string;
@@ -121,12 +126,27 @@ export declare const ChatAgentViewServiceToken: unique symbol;
  * Contribute Registry
  */
 export interface IConflictContentMetadata {
+    /**
+     * @threeWay 当前分支的代码
+     * @transitional 当前分支的代码
+     */
     current: string;
+    /**
+     * @threeWay 基础分支的代码
+     * @transitional 无
+     */
     base: string;
+    /**
+     * @threeWay 远程分支的代码
+     * @transitional 远程分支的代码
+     */
     incoming: string;
     currentName?: string;
     baseName?: string;
     incomingName?: string;
+    /**
+     * 如果是用户要求 regenerate 的话，这个字段代表上一次 AI 生成的结果
+     */
     resultContent?: string;
 }
 export interface IResolveConflictHandler {

package/lib/types/ai-native/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":"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"}

package/lib/types/ai-native/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":";;;;AAGA,qDAA2B;AA6Dd,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClD,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AAoDrD,MAAa,aAAa;IACxB,YAAqB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAExC,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,aAAa,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;IAC/G,CAAC;CACF;AAND,sCAMC;AAED,MAAa,aAAa;IACxB,YAAqB,KAAU,EAAW,OAAgB;QAArC,UAAK,GAAL,KAAK,CAAK;QAAW,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAE9D,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,aAAa,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAC7G,CAAC;CACF;AAND,sCAMC;AAED,MAAa,cAAc;IAGzB,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;QAF5B,iBAAY,GAAY,IAAI,CAAC;IAEE,CAAC;IAEzC,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,cAAc,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC;IACrH,CAAC;CACF;AARD,wCAQC;AAID;;GAEG;AACU,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAC1E,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAC9D,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAC5D,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AACtE,QAAA,qCAAqC,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAC;AACxF,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAExD,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":";;;;AAGA,qDAA2B;AA+Dd,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClD,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AAoDrD,MAAa,aAAa;IACxB,YAAqB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAExC,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,aAAa,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;IAC/G,CAAC;CACF;AAND,sCAMC;AAED,MAAa,aAAa;IACxB,YAAqB,KAAU,EAAW,OAAgB;QAArC,UAAK,GAAL,KAAK,CAAK;QAAW,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAE9D,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,aAAa,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAC7G,CAAC;CACF;AAND,sCAMC;AAED,MAAa,cAAc;IAGzB,YAAqB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;QAF5B,iBAAY,GAAY,IAAI,CAAC;IAEE,CAAC;IAEzC,MAAM,CAAC,EAAE,CAAC,QAAa;QACrB,OAAO,QAAQ,YAAY,cAAc,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC;IACrH,CAAC;CACF;AARD,wCAQC;AAID;;GAEG;AACU,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAC1E,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAC9D,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAC5D,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AACtE,QAAA,qCAAqC,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAC;AACxF,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAExD,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "2.27.3-rc-1714116491.0",
+  "version": "2.27.3-rc-1714982362.0",
   "description": "@opensumi/ide-core-common",
   "files": [
     "lib",
@@ -19,11 +19,11 @@
   },
   "dependencies": {
     "@opensumi/di": "^1.4.0",
-    "@opensumi/ide-utils": "2.27.3-rc-1714116491.0",
+    "@opensumi/ide-utils": "2.27.3-rc-1714982362.0",
     "jschardet": "3.0.0"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "2.27.3-rc-1714116491.0"
+    "@opensumi/ide-dev-tool": "2.27.3-rc-1714982362.0"
   },
-  "gitHead": "b3e24dca0866b038e5b93fb14119f30e947f4710"
+  "gitHead": "197b8ef9917d764baced87ea93e800b1ce43ac82"
 }

package/src/ai-native/index.ts

@@ -0,0 +1 @@
+export * from './views';

package/src/ai-native/views.ts

@@ -0,0 +1 @@
+export const AIInlineChatContentWidgetId = 'AI-Inline-Chat-Content-Widget';

package/src/commands/git.ts

@@ -0,0 +1,9 @@
+export const MergeConflictCommands = {
+  Previous: 'merge-conflict.previous',
+  Next: 'merge-conflict.next',
+} as const;
+
+export const GitCommands = {
+  Stage: 'git.stage',
+  StageAllMerge: 'git.stageAllMerge',
+};

package/src/index.ts

@@ -33,3 +33,4 @@ export * from './clipboard';
 export * from './mime';
 export * from './application.lifecycle';
 export * from './extension.schema';
+export * from './ai-native';

package/src/settings/ai-native.ts

@@ -4,3 +4,4 @@ export enum AINativeSettingSectionsId {
   CHAT_VISIBLE_TYPE = 'ai.native.chat.visible.type',
 }
 export const AI_NATIVE_SETTING_GROUP_ID = 'AI-Native';
+export const AI_NATIVE_SETTING_GROUP_TITLE = 'AI Native';

package/src/types/ai-native/index.ts

@@ -4,10 +4,6 @@ import { IAIReportCompletionOption } from './reporter';
 export * from './reporter';
 
 export interface IAINativeCapabilities {
-  /**
-   * Use opensumi design UI style
-   */
-  supportsOpenSumiDesign?: boolean;
   /**
    * Problem panel uses ai capabilities
    */
@@ -42,18 +38,24 @@ export interface IAINativeCapabilities {
   supportsTerminalCommandSuggest?: boolean;
 }
 
-export interface IAINativeLayout {
-  // Use Merge right panel with left panel
+export interface IDesignLayoutConfig {
+  /**
+   * merge right panel with left panel
+   */
   useMergeRightWithLeftPanel?: boolean;
-  // Use ai manubar view
+  /**
+   * use new manubar view
+   */
   useMenubarView?: boolean;
-  // set menubar logo
+  /**
+   * set menubar logo
+   */
   menubarLogo?: string;
 }
 
 export interface IAINativeConfig {
   capabilities?: IAINativeCapabilities;
-  layout?: IAINativeLayout;
+  layout?: IDesignLayoutConfig;
 }
 
 export interface IAICompletionResultModel {
@@ -160,15 +162,29 @@ export const ChatAgentViewServiceToken = Symbol('ChatAgentViewServiceToken');
  * Contribute Registry
  */
 export interface IConflictContentMetadata {
+  /**
+   * @threeWay 当前分支的代码
+   * @transitional 当前分支的代码
+   */
   current: string;
+  /**
+   * @threeWay 基础分支的代码
+   * @transitional 无
+   */
   base: string;
+  /**
+   * @threeWay 远程分支的代码
+   * @transitional 远程分支的代码
+   */
   incoming: string;
 
-  // 各分支的名称
   currentName?: string;
   baseName?: string;
   incomingName?: string;
 
+  /**
+   * 如果是用户要求 regenerate 的话，这个字段代表上一次 AI 生成的结果
+   */
   resultContent?: string;
 }
 export interface IResolveConflictHandler {