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

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/types/ai-native/index.d.ts

@@ -126,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "2.27.3-rc-1714367598.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-1714367598.0",
+    "@opensumi/ide-utils": "2.27.3-rc-1714982362.0",
     "jschardet": "3.0.0"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "2.27.3-rc-1714367598.0"
+    "@opensumi/ide-dev-tool": "2.27.3-rc-1714982362.0"
   },
-  "gitHead": "ec0fc77694997fa304e16d988886fbe2a0f15768"
+  "gitHead": "197b8ef9917d764baced87ea93e800b1ce43ac82"
 }

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/types/ai-native/index.ts

@@ -162,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 {