@opensumi/ide-core-common 2.27.3-rc-1710495297.0 → 2.27.3-rc-1711024024.0

package/lib/index.d.ts

@@ -17,7 +17,6 @@ export * from './json-schema';
 export * from './reporter';
 export * from './connection';
 export * from './comparers';
-export * from './range';
 export * from './problem-pattern';
 export * from './problem-matcher';
 export * from './task-definition';

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,SAAS,CAAC;AACxB,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"}

package/lib/index.js

@@ -20,7 +20,6 @@ tslib_1.__exportStar(require("./json-schema"), exports);
 tslib_1.__exportStar(require("./reporter"), exports);
 tslib_1.__exportStar(require("./connection"), exports);
 tslib_1.__exportStar(require("./comparers"), exports);
-tslib_1.__exportStar(require("./range"), exports);
 tslib_1.__exportStar(require("./problem-pattern"), exports);
 tslib_1.__exportStar(require("./problem-matcher"), exports);
 tslib_1.__exportStar(require("./task-definition"), exports);

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,kDAAwB;AACxB,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"}

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

@@ -1,5 +1,7 @@
 /// <reference types="node" />
-import { CancellationToken } from '../../utils';
+import { CancellationToken, MaybePromise } from '../../utils';
+import { IAIReportCompletionOption } from './reporter';
+export * from './reporter';
 export interface IAINativeCapabilities {
     /**
      * Use opensumi design UI style
@@ -25,9 +27,18 @@ export interface IAINativeCapabilities {
      * Use ai to intelligently resolve conflicts
      */
     supportsConflictResolve?: boolean;
+    /**
+     * Use ai to provide rename suggestions
+     */
+    supportsRenameSuggestions?: boolean;
+}
+export interface IAINativeLayout {
+    useMergeRightWithLeftPanel?: boolean;
+    useMenubarView?: boolean;
 }
 export interface IAINativeConfig {
     capabilities?: IAINativeCapabilities;
+    layout?: IAINativeLayout;
 }
 export interface IAICompletionResultModel {
     sessionId: string;
@@ -57,13 +68,9 @@ export interface IAICompletionOption {
     fileUrl?: string;
     sessionId?: string;
 }
-export interface IAIReportCompletionOption {
-    relationId: string;
-    sessionId: string;
-    accept: boolean;
-    repo?: string;
-    completionUseTime?: number;
-    renderingTime?: number;
+export interface IAIRenameSuggestionOption {
+    prompt: string;
+    language?: string;
 }
 export interface IAIBackService<BaseResponse extends IAIBackServiceResponse = IAIBackServiceResponse, StreamResponse extends NodeJS.ReadableStream = NodeJS.ReadableStream, CompletionResponse = IAICompletionResultModel> {
     request<O extends IAIBackServiceOption>(input: string, options: O, cancelToken?: CancellationToken): Promise<BaseResponse>;
@@ -72,98 +79,47 @@ export interface IAIBackService<BaseResponse extends IAIBackServiceResponse = IA
     reportCompletion<I extends IAIReportCompletionOption>(input: I): Promise<void>;
     destroyStreamRequest?: (sessionId: string) => Promise<void>;
 }
-export declare const AI_REPORTER_NAME = "AI";
-export declare enum AISerivceType {
-    SearchDoc = "searchDoc",
-    SearchCode = "searchCode",
-    Sumi = "sumi",
-    GPT = "chat",
-    Explain = "explain",
-    Run = "run",
-    Test = "test",
-    Optimize = "optimize",
-    Generate = "generate",
-    Completion = "completion",
-    Agent = "agent",
-    MergeConflict = "mergeConflict"
-}
-export interface CommonLogInfo {
-    msgType: AISerivceType | string;
-    relationId: string;
-    replytime: number;
-    success: boolean;
-    message: string;
-    isStart: boolean;
-    isLike: boolean;
-    isValid: boolean;
-    model: string;
-    copy: boolean;
-    insert: boolean;
-}
-export interface QuestionRT extends Partial<CommonLogInfo> {
-    isRetry: boolean;
-    isStop: boolean;
-}
-export interface CodeRT extends Partial<CommonLogInfo> {
-    isReceive: boolean;
-    isDrop: boolean;
-}
-export interface GenerateRT extends Partial<CommonLogInfo> {
-    fileCount: number;
-    requirment: string;
-}
-export interface CommandRT extends Partial<CommonLogInfo> {
-    useCommand: boolean;
-    useCommandSuccess: boolean;
-}
-export interface RunRT extends Partial<CommonLogInfo> {
-    runSuccess: boolean;
-}
-export interface CompletionRT extends Partial<CommonLogInfo> {
-    isReceive?: boolean;
-    isStop?: boolean;
-    completionNum?: number;
-    renderingTime?: number;
-}
-export interface MergeConflictRT extends Partial<CommonLogInfo> {
-    editorMode: '3way' | 'traditional';
-    conflictPointNum: number;
-    useAiConflictPointNum: number;
-    receiveNum: number;
-    clickNum: number;
-    clickAllNum: number;
-    aiOutputNum: number;
-    cancelNum: number;
-}
-export type ReportInfo = Partial<CommonLogInfo> | ({
-    type: AISerivceType.GPT;
-} & QuestionRT) | ({
-    type: AISerivceType.Explain;
-} & QuestionRT) | ({
-    type: AISerivceType.SearchCode;
-} & QuestionRT) | ({
-    type: AISerivceType.SearchDoc;
-} & QuestionRT) | ({
-    type: AISerivceType.Test;
-} & QuestionRT) | ({
-    type: AISerivceType.Optimize;
-} & CodeRT) | ({
-    type: AISerivceType.Generate;
-} & GenerateRT) | ({
-    type: AISerivceType.Sumi;
-} & CommandRT) | ({
-    type: AISerivceType.Run;
-} & RunRT) | ({
-    type: AISerivceType.Completion;
-} & CompletionRT) | ({
-    type: AISerivceType.MergeConflict;
-} & MergeConflictRT);
-export declare const IAIReporter: unique symbol;
-export interface IAIReporter {
-    getCommonReportInfo(): Record<string, unknown>;
-    getCacheReportInfo<T = ReportInfo>(relationId: string): T | undefined;
-    record(data: ReportInfo, relationId?: string): ReportInfo;
-    start(msg: string, data: ReportInfo): string;
-    end(relationId: string, data: ReportInfo): void;
+export declare class ReplyResponse {
+    readonly message: string;
+    constructor(message: string);
+    static is(response: any): boolean;
+}
+export declare class ErrorResponse {
+    readonly error: any;
+    readonly message?: string | undefined;
+    constructor(error: any, message?: string | undefined);
+    static is(response: any): boolean;
+}
+export declare class CancelResponse {
+    readonly message?: string | undefined;
+    readonly cancellation: boolean;
+    constructor(message?: string | undefined);
+    static is(response: any): boolean;
+}
+export type ChatResponse = ReplyResponse | ErrorResponse | CancelResponse;
+/**
+ * DI Token
+ */
+export declare const InlineChatFeatureRegistryToken: unique symbol;
+export declare const ChatFeatureRegistryToken: unique symbol;
+export declare const ResolveConflictRegistryToken: unique symbol;
+export declare const RenameCandidatesProviderRegistryToken: unique symbol;
+export declare const ChatAgentViewServiceToken: unique symbol;
+/**
+ * Contribute Registry
+ */
+export interface IConflictContentMetadata {
+    current: string;
+    base: string;
+    incoming: string;
+}
+export interface IResolveConflictHandler {
+    providerRequest: (contentMetadata: IConflictContentMetadata, options: {
+        isRegenerate: boolean;
+    }, token: CancellationToken) => MaybePromise<ReplyResponse | ErrorResponse | CancelResponse>;
+}
+export interface IInternalResolveConflictRegistry {
+    getThreeWayHandler(): IResolveConflictHandler | undefined;
+    getTraditionalHandler(): IResolveConflictHandler | undefined;
 }
 //# sourceMappingURL=index.d.ts.map

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":";AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,cAAc,YAAY,CAAC;AAE3B,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAE9B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAErC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AAErD,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,CAAC;CACV;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc,CAC7B,YAAY,SAAS,sBAAsB,GAAG,sBAAsB,EACpE,cAAc,SAAS,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,EACpE,kBAAkB,GAAG,wBAAwB;IAE7C,OAAO,CAAC,CAAC,SAAS,oBAAoB,EACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,EACV,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,aAAa,CAAC,CAAC,SAAS,oBAAoB,EAC1C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,EACV,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,cAAc,CAAC,CAAC;IAC3B,iBAAiB,CAAC,CAAC,SAAS,mBAAmB,EAC7C,KAAK,EAAE,CAAC,EACR,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/B,gBAAgB,CAAC,CAAC,SAAS,yBAAyB,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,qBAAa,aAAa;IACZ,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;IAEpC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO;CAGlC;AAED,qBAAa,aAAa;IACZ,QAAQ,CAAC,KAAK,EAAE,GAAG;IAAE,QAAQ,CAAC,OAAO,CAAC;gBAA7B,KAAK,EAAE,GAAG,EAAW,OAAO,CAAC,oBAAQ;IAE1D,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO;CAGlC;AAED,qBAAa,cAAc;IAGb,QAAQ,CAAC,OAAO,CAAC;IAF7B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAQ;gBAEjB,OAAO,CAAC,oBAAQ;IAErC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO;CAGlC;AAED,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,aAAa,GAAG,cAAc,CAAC;AAE1E;;GAEG;AACH,eAAO,MAAM,8BAA8B,eAA2C,CAAC;AACvF,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,eAAO,MAAM,qCAAqC,eAAkD,CAAC;AAErG,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,uBAAuB;IACtC,eAAe,EAAE,CACf,eAAe,EAAE,wBAAwB,EACzC,OAAO,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAClC,KAAK,EAAE,iBAAiB,KACrB,YAAY,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,CAAC,CAAC;CACnE;AACD,MAAM,WAAW,gCAAgC;IAC/C,kBAAkB,IAAI,uBAAuB,GAAG,SAAS,CAAC;IAC1D,qBAAqB,IAAI,uBAAuB,GAAG,SAAS,CAAC;CAC9D"}

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

@@ -1,23 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IAIReporter = exports.AISerivceType = exports.AI_REPORTER_NAME = exports.AIBackSerivcePath = exports.AIBackSerivceToken = void 0;
+exports.ChatAgentViewServiceToken = exports.RenameCandidatesProviderRegistryToken = exports.ResolveConflictRegistryToken = exports.ChatFeatureRegistryToken = exports.InlineChatFeatureRegistryToken = exports.CancelResponse = exports.ErrorResponse = exports.ReplyResponse = exports.AIBackSerivcePath = exports.AIBackSerivceToken = void 0;
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./reporter"), exports);
 exports.AIBackSerivceToken = Symbol('AIBackSerivceToken');
 exports.AIBackSerivcePath = 'AIBackSerivcePath';
-exports.AI_REPORTER_NAME = 'AI';
-var AISerivceType;
-(function (AISerivceType) {
-    AISerivceType["SearchDoc"] = "searchDoc";
-    AISerivceType["SearchCode"] = "searchCode";
-    AISerivceType["Sumi"] = "sumi";
-    AISerivceType["GPT"] = "chat";
-    AISerivceType["Explain"] = "explain";
-    AISerivceType["Run"] = "run";
-    AISerivceType["Test"] = "test";
-    AISerivceType["Optimize"] = "optimize";
-    AISerivceType["Generate"] = "generate";
-    AISerivceType["Completion"] = "completion";
-    AISerivceType["Agent"] = "agent";
-    AISerivceType["MergeConflict"] = "mergeConflict";
-})(AISerivceType = exports.AISerivceType || (exports.AISerivceType = {}));
-exports.IAIReporter = Symbol('IAIReporter');
+class ReplyResponse {
+    constructor(message) {
+        this.message = message;
+    }
+    static is(response) {
+        return response instanceof ReplyResponse || (typeof response === 'object' && response.message !== undefined);
+    }
+}
+exports.ReplyResponse = ReplyResponse;
+class ErrorResponse {
+    constructor(error, message) {
+        this.error = error;
+        this.message = message;
+    }
+    static is(response) {
+        return response instanceof ErrorResponse || (typeof response === 'object' && response.error !== undefined);
+    }
+}
+exports.ErrorResponse = ErrorResponse;
+class CancelResponse {
+    constructor(message) {
+        this.message = message;
+        this.cancellation = true;
+    }
+    static is(response) {
+        return response instanceof CancelResponse || (typeof response === 'object' && response.cancellation !== undefined);
+    }
+}
+exports.CancelResponse = CancelResponse;
+/**
+ * DI Token
+ */
+exports.InlineChatFeatureRegistryToken = Symbol('InlineChatFeatureRegistryToken');
+exports.ChatFeatureRegistryToken = Symbol('ChatFeatureRegistryToken');
+exports.ResolveConflictRegistryToken = Symbol('ResolveConflictRegistryToken');
+exports.RenameCandidatesProviderRegistryToken = Symbol('RenameCandidatesProviderRegistryToken');
+exports.ChatAgentViewServiceToken = Symbol('ChatAgentViewServiceToken');
 //# sourceMappingURL=index.js.map

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":";;;AAuCa,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClD,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AAwDxC,QAAA,gBAAgB,GAAG,IAAI,CAAC;AAErC,IAAY,aAaX;AAbD,WAAY,aAAa;IACvB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,8BAAa,CAAA;IACb,6BAAY,CAAA;IACZ,oCAAmB,CAAA;IACnB,4BAAW,CAAA;IACX,8BAAa,CAAA;IACb,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;IACrB,0CAAyB,CAAA;IACzB,gCAAe,CAAA;IACf,gDAA+B,CAAA;AACjC,CAAC,EAbW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAaxB;AAoFY,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/ai-native/index.ts"],"names":[],"mappings":";;;;AAGA,qDAA2B;AAmDd,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,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AACtE,QAAA,qCAAqC,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAC;AAExF,QAAA,yBAAyB,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAC"}

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

@@ -1,20 +1,12 @@
 export declare const AI_REPORTER_NAME = "AI";
 export declare enum AISerivceType {
-    SearchDoc = "searchDoc",
-    SearchCode = "searchCode",
-    Sumi = "sumi",
-    GPT = "chat",
-    Explain = "explain",
-    Run = "run",
-    Test = "test",
-    Optimize = "optimize",
-    Generate = "generate",
+    Chat = "chat",
     Completion = "completion",
     Agent = "agent",
     MergeConflict = "mergeConflict"
 }
 export interface CommonLogInfo {
-    msgType: AISerivceType;
+    msgType: AISerivceType | string;
     relationId: string;
     replytime: number;
     success: boolean;
@@ -26,33 +18,26 @@ export interface CommonLogInfo {
     copy: boolean;
     insert: boolean;
 }
-export interface QuestionRT extends Partial<CommonLogInfo> {
-    isRetry: boolean;
-    isStop: boolean;
-}
-export interface CodeRT extends Partial<CommonLogInfo> {
-    isReceive: boolean;
-    isDrop: boolean;
-}
-export interface GenerateRT extends Partial<CommonLogInfo> {
-    fileCount: number;
-    requirment: string;
-}
-export interface CommandRT extends Partial<CommonLogInfo> {
-    useCommand: boolean;
-    useCommandSuccess: boolean;
-}
-export interface RunRT extends Partial<CommonLogInfo> {
-    runSuccess: boolean;
-}
 export interface CompletionRT extends Partial<CommonLogInfo> {
     isReceive?: boolean;
     isStop?: boolean;
     completionNum?: number;
     renderingTime?: number;
 }
+export interface IAIReportCompletionOption {
+    relationId: string;
+    sessionId: string;
+    accept: boolean;
+    repo?: string;
+    completionUseTime?: number;
+    renderingTime?: number;
+}
+export declare enum MergeConflictEditorMode {
+    '3way' = "3way",
+    'traditional' = "traditional"
+}
 export interface MergeConflictRT extends Partial<CommonLogInfo> {
-    editorMode: '3way' | 'traditional';
+    editorMode: MergeConflictEditorMode;
     conflictPointNum: number;
     useAiConflictPointNum: number;
     receiveNum: number;
@@ -62,24 +47,6 @@ export interface MergeConflictRT extends Partial<CommonLogInfo> {
     cancelNum: number;
 }
 export type ReportInfo = Partial<CommonLogInfo> | ({
-    type: AISerivceType.GPT;
-} & QuestionRT) | ({
-    type: AISerivceType.Explain;
-} & QuestionRT) | ({
-    type: AISerivceType.SearchCode;
-} & QuestionRT) | ({
-    type: AISerivceType.SearchDoc;
-} & QuestionRT) | ({
-    type: AISerivceType.Test;
-} & QuestionRT) | ({
-    type: AISerivceType.Optimize;
-} & CodeRT) | ({
-    type: AISerivceType.Generate;
-} & GenerateRT) | ({
-    type: AISerivceType.Sumi;
-} & CommandRT) | ({
-    type: AISerivceType.Run;
-} & RunRT) | ({
     type: AISerivceType.Completion;
 } & CompletionRT) | ({
     type: AISerivceType.MergeConflict;

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

@@ -1 +1 @@
-{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../src/types/ai-native/reporter.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,KAAK,UAAU;IACf,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,aAAa,GAAG,MAAM,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAAC,aAAa,CAAC;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,oBAAY,uBAAuB;IACjC,MAAM,SAAS;IACf,aAAa,gBAAgB;CAC9B;AAED,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,aAAa,CAAC;IAE7D,UAAU,EAAE,uBAAuB,CAAC;IAEpC,gBAAgB,EAAE,MAAM,CAAC;IAEzB,qBAAqB,EAAE,MAAM,CAAC;IAE9B,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,MAAM,CAAC;IAEjB,WAAW,EAAE,MAAM,CAAC;IAEpB,WAAW,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,UAAU,GAClB,OAAO,CAAC,aAAa,CAAC,GACtB,CAAC;IAAE,IAAI,EAAE,aAAa,CAAC,UAAU,CAAA;CAAE,GAAG,YAAY,CAAC,GACnD,CAAC;IAAE,IAAI,EAAE,aAAa,CAAC,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,MAAM,WAAW,WAAW;IAC1B,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,kBAAkB,CAAC,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IACtE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAE1D,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC7C,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;CACjD"}

package/lib/types/ai-native/reporter.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IAIReporter = exports.AISerivceType = exports.AI_REPORTER_NAME = void 0;
+exports.IAIReporter = exports.MergeConflictEditorMode = exports.AISerivceType = exports.AI_REPORTER_NAME = void 0;
 exports.AI_REPORTER_NAME = 'AI';
 var AISerivceType;
 (function (AISerivceType) {
-    AISerivceType["SearchDoc"] = "searchDoc";
-    AISerivceType["SearchCode"] = "searchCode";
-    AISerivceType["Sumi"] = "sumi";
-    AISerivceType["GPT"] = "chat";
-    AISerivceType["Explain"] = "explain";
-    AISerivceType["Run"] = "run";
-    AISerivceType["Test"] = "test";
-    AISerivceType["Optimize"] = "optimize";
-    AISerivceType["Generate"] = "generate";
+    AISerivceType["Chat"] = "chat";
     AISerivceType["Completion"] = "completion";
     AISerivceType["Agent"] = "agent";
     AISerivceType["MergeConflict"] = "mergeConflict";
 })(AISerivceType = exports.AISerivceType || (exports.AISerivceType = {}));
+var MergeConflictEditorMode;
+(function (MergeConflictEditorMode) {
+    MergeConflictEditorMode["3way"] = "3way";
+    MergeConflictEditorMode["traditional"] = "traditional";
+})(MergeConflictEditorMode = exports.MergeConflictEditorMode || (exports.MergeConflictEditorMode = {}));
 exports.IAIReporter = Symbol('IAIReporter');
 //# sourceMappingURL=reporter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../src/types/ai-native/reporter.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,IAAI,CAAC;AAErC,IAAY,aAaX;AAbD,WAAY,aAAa;IACvB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,8BAAa,CAAA;IACb,6BAAY,CAAA;IACZ,oCAAmB,CAAA;IACnB,4BAAW,CAAA;IACX,8BAAa,CAAA;IACb,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;IACrB,0CAAyB,CAAA;IACzB,gCAAe,CAAA;IACf,gDAA+B,CAAA;AACjC,CAAC,EAbW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAaxB;AAoFY,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../src/types/ai-native/reporter.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,IAAI,CAAC;AAErC,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,0CAAyB,CAAA;IACzB,gCAAe,CAAA;IACf,gDAA+B,CAAA;AACjC,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB;AAoCD,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,wCAAe,CAAA;IACf,sDAA6B,CAAA;AAC/B,CAAC,EAHW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAGlC;AA0BY,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "2.27.3-rc-1710495297.0",
+  "version": "2.27.3-rc-1711024024.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-1710495297.0",
+    "@opensumi/ide-utils": "2.27.3-rc-1711024024.0",
     "jschardet": "3.0.0"
   },
   "devDependencies": {
     "@opensumi/ide-dev-tool": "1.3.1"
   },
-  "gitHead": "2630351deb02758d25bef1f37135286e0693ab8a"
+  "gitHead": "2b5368401ed5223fc1581bf807fdb0bbf720b04c"
 }

package/src/index.ts

@@ -17,7 +17,6 @@ export * from './json-schema';
 export * from './reporter';
 export * from './connection';
 export * from './comparers';
-export * from './range';
 export * from './problem-pattern';
 export * from './problem-matcher';
 export * from './task-definition';

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

@@ -1,4 +1,7 @@
-import { CancellationToken } from '../../utils';
+import { CancellationToken, MaybePromise } from '../../utils';
+
+import { IAIReportCompletionOption } from './reporter';
+export * from './reporter';
 
 export interface IAINativeCapabilities {
   /**
@@ -25,10 +28,22 @@ export interface IAINativeCapabilities {
    * Use ai to intelligently resolve conflicts
    */
   supportsConflictResolve?: boolean;
+  /**
+   * Use ai to provide rename suggestions
+   */
+  supportsRenameSuggestions?: boolean;
+}
+
+export interface IAINativeLayout {
+  // Use Merge right panel with left panel
+  useMergeRightWithLeftPanel?: boolean;
+  // Use ai manubar view
+  useMenubarView?: boolean;
 }
 
 export interface IAINativeConfig {
   capabilities?: IAINativeCapabilities;
+  layout?: IAINativeLayout;
 }
 
 export interface IAICompletionResultModel {
@@ -62,13 +77,9 @@ export interface IAICompletionOption {
   sessionId?: string;
 }
 
-export interface IAIReportCompletionOption {
-  relationId: string;
-  sessionId: string;
-  accept: boolean;
-  repo?: string;
-  completionUseTime?: number;
-  renderingTime?: number;
+export interface IAIRenameSuggestionOption {
+  prompt: string;
+  language?: string;
 }
 
 export interface IAIBackService<
@@ -94,112 +105,60 @@ export interface IAIBackService<
   destroyStreamRequest?: (sessionId: string) => Promise<void>;
 }
 
-export const AI_REPORTER_NAME = 'AI';
-
-export enum AISerivceType {
-  SearchDoc = 'searchDoc',
-  SearchCode = 'searchCode',
-  Sumi = 'sumi',
-  GPT = 'chat',
-  Explain = 'explain',
-  Run = 'run',
-  Test = 'test',
-  Optimize = 'optimize',
-  Generate = 'generate',
-  Completion = 'completion',
-  Agent = 'agent',
-  MergeConflict = 'mergeConflict',
-}
+export class ReplyResponse {
+  constructor(readonly message: string) {}
 
-export interface CommonLogInfo {
-  msgType: AISerivceType | string;
-  relationId: string;
-  replytime: number;
-  success: boolean;
-  message: string;
-  isStart: boolean;
-  isLike: boolean;
-  // 是否有效
-  isValid: boolean;
-  model: string;
-  copy: boolean;
-  insert: boolean;
+  static is(response: any): boolean {
+    return response instanceof ReplyResponse || (typeof response === 'object' && response.message !== undefined);
+  }
 }
 
-export interface QuestionRT extends Partial<CommonLogInfo> {
-  isRetry: boolean;
-  isStop: boolean;
-}
+export class ErrorResponse {
+  constructor(readonly error: any, readonly message?: string) {}
 
-export interface CodeRT extends Partial<CommonLogInfo> {
-  isReceive: boolean;
-  isDrop: boolean;
+  static is(response: any): boolean {
+    return response instanceof ErrorResponse || (typeof response === 'object' && response.error !== undefined);
+  }
 }
 
-export interface GenerateRT extends Partial<CommonLogInfo> {
-  fileCount: number;
-  requirment: string;
-}
+export class CancelResponse {
+  readonly cancellation: boolean = true;
 
-export interface CommandRT extends Partial<CommonLogInfo> {
-  useCommand: boolean;
-  useCommandSuccess: boolean;
-}
+  constructor(readonly message?: string) {}
 
-export interface RunRT extends Partial<CommonLogInfo> {
-  runSuccess: boolean;
+  static is(response: any): boolean {
+    return response instanceof CancelResponse || (typeof response === 'object' && response.cancellation !== undefined);
+  }
 }
 
-export interface CompletionRT extends Partial<CommonLogInfo> {
-  isReceive?: boolean;
-  // 是否取消
-  isStop?: boolean;
-  // 补全条数
-  completionNum?: number;
-  // 渲染时长
-  renderingTime?: number;
-}
+export type ChatResponse = ReplyResponse | ErrorResponse | CancelResponse;
 
-export interface MergeConflictRT extends Partial<CommonLogInfo> {
-  // 解决冲突模式 （3-way 或 传统模式）
-  editorMode: '3way' | 'traditional';
-  // 冲突点数量（仅包含 AI 冲突点）
-  conflictPointNum: number;
-  // 使用了 ai 处理的冲突点数量
-  useAiConflictPointNum: number;
-  // 被用户采纳了的冲突点数量
-  receiveNum: number;
-  // 点击了 ai 解决冲突的数量
-  clickNum: number;
-  // 点击了一键解决的次数
-  clickAllNum: number;
-  // ai 成功输出了的数量
-  aiOutputNum: number;
-  // 取消次数
-  cancelNum: number;
-}
+/**
+ * DI Token
+ */
+export const InlineChatFeatureRegistryToken = Symbol('InlineChatFeatureRegistryToken');
+export const ChatFeatureRegistryToken = Symbol('ChatFeatureRegistryToken');
+export const ResolveConflictRegistryToken = Symbol('ResolveConflictRegistryToken');
+export const RenameCandidatesProviderRegistryToken = Symbol('RenameCandidatesProviderRegistryToken');
+
+export const ChatAgentViewServiceToken = Symbol('ChatAgentViewServiceToken');
 
-export type ReportInfo =
-  | Partial<CommonLogInfo>
-  | ({ type: AISerivceType.GPT } & QuestionRT)
-  | ({ type: AISerivceType.Explain } & QuestionRT)
-  | ({ type: AISerivceType.SearchCode } & QuestionRT)
-  | ({ type: AISerivceType.SearchDoc } & QuestionRT)
-  | ({ type: AISerivceType.Test } & QuestionRT)
-  | ({ type: AISerivceType.Optimize } & CodeRT)
-  | ({ type: AISerivceType.Generate } & GenerateRT)
-  | ({ type: AISerivceType.Sumi } & CommandRT)
-  | ({ type: AISerivceType.Run } & RunRT)
-  | ({ type: AISerivceType.Completion } & CompletionRT)
-  | ({ type: AISerivceType.MergeConflict } & MergeConflictRT);
-
-export const IAIReporter = Symbol('IAIReporter');
-
-export interface IAIReporter {
-  getCommonReportInfo(): Record<string, unknown>;
-  getCacheReportInfo<T = ReportInfo>(relationId: string): T | undefined;
-  record(data: ReportInfo, relationId?: string): ReportInfo;
-  // 返回关联 ID
-  start(msg: string, data: ReportInfo): string;
-  end(relationId: string, data: ReportInfo): void;
+/**
+ * Contribute Registry
+ */
+export interface IConflictContentMetadata {
+  current: string;
+  base: string;
+  incoming: string;
+}
+export interface IResolveConflictHandler {
+  providerRequest: (
+    contentMetadata: IConflictContentMetadata,
+    options: { isRegenerate: boolean },
+    token: CancellationToken,
+  ) => MaybePromise<ReplyResponse | ErrorResponse | CancelResponse>;
+}
+export interface IInternalResolveConflictRegistry {
+  getThreeWayHandler(): IResolveConflictHandler | undefined;
+  getTraditionalHandler(): IResolveConflictHandler | undefined;
 }

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

@@ -1,22 +1,14 @@
 export const AI_REPORTER_NAME = 'AI';
 
 export enum AISerivceType {
-  SearchDoc = 'searchDoc',
-  SearchCode = 'searchCode',
-  Sumi = 'sumi',
-  GPT = 'chat',
-  Explain = 'explain',
-  Run = 'run',
-  Test = 'test',
-  Optimize = 'optimize',
-  Generate = 'generate',
+  Chat = 'chat',
   Completion = 'completion',
   Agent = 'agent',
   MergeConflict = 'mergeConflict',
 }
 
 export interface CommonLogInfo {
-  msgType: AISerivceType;
+  msgType: AISerivceType | string;
   relationId: string;
   replytime: number;
   success: boolean;
@@ -30,30 +22,6 @@ export interface CommonLogInfo {
   insert: boolean;
 }
 
-export interface QuestionRT extends Partial<CommonLogInfo> {
-  isRetry: boolean;
-  isStop: boolean;
-}
-
-export interface CodeRT extends Partial<CommonLogInfo> {
-  isReceive: boolean;
-  isDrop: boolean;
-}
-
-export interface GenerateRT extends Partial<CommonLogInfo> {
-  fileCount: number;
-  requirment: string;
-}
-
-export interface CommandRT extends Partial<CommonLogInfo> {
-  useCommand: boolean;
-  useCommandSuccess: boolean;
-}
-
-export interface RunRT extends Partial<CommonLogInfo> {
-  runSuccess: boolean;
-}
-
 export interface CompletionRT extends Partial<CommonLogInfo> {
   isReceive?: boolean;
   // 是否取消
@@ -64,9 +32,23 @@ export interface CompletionRT extends Partial<CommonLogInfo> {
   renderingTime?: number;
 }
 
+export interface IAIReportCompletionOption {
+  relationId: string;
+  sessionId: string;
+  accept: boolean;
+  repo?: string;
+  completionUseTime?: number;
+  renderingTime?: number;
+}
+
+export enum MergeConflictEditorMode {
+  '3way' = '3way',
+  'traditional' = 'traditional',
+}
+
 export interface MergeConflictRT extends Partial<CommonLogInfo> {
   // 解决冲突模式 （3-way 或 传统模式）
-  editorMode: '3way' | 'traditional';
+  editorMode: MergeConflictEditorMode;
   // 冲突点数量（仅包含 AI 冲突点）
   conflictPointNum: number;
   // 使用了 ai 处理的冲突点数量
@@ -85,15 +67,6 @@ export interface MergeConflictRT extends Partial<CommonLogInfo> {
 
 export type ReportInfo =
   | Partial<CommonLogInfo>
-  | ({ type: AISerivceType.GPT } & QuestionRT)
-  | ({ type: AISerivceType.Explain } & QuestionRT)
-  | ({ type: AISerivceType.SearchCode } & QuestionRT)
-  | ({ type: AISerivceType.SearchDoc } & QuestionRT)
-  | ({ type: AISerivceType.Test } & QuestionRT)
-  | ({ type: AISerivceType.Optimize } & CodeRT)
-  | ({ type: AISerivceType.Generate } & GenerateRT)
-  | ({ type: AISerivceType.Sumi } & CommandRT)
-  | ({ type: AISerivceType.Run } & RunRT)
   | ({ type: AISerivceType.Completion } & CompletionRT)
   | ({ type: AISerivceType.MergeConflict } & MergeConflictRT);
 

package/lib/range.d.ts

@@ -1,7 +0,0 @@
-import type { IPosition, IRange } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
-/**
- * position 转换 range
- * @param position
- */
-export declare function positionToRange(position: IPosition | number): IRange;
-//# sourceMappingURL=range.d.ts.map

package/lib/range.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"range.d.ts","sourceRoot":"","sources":["../src/range.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,uDAAuD,CAAC;AAE/F;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAiBpE"}

package/lib/range.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.positionToRange = void 0;
-/**
- * position 转换 range
- * @param position
- */
-function positionToRange(position) {
-    if (typeof position === 'number') {
-        return {
-            startLineNumber: position,
-            endLineNumber: position,
-            startColumn: 1,
-            endColumn: 1,
-        };
-    }
-    else {
-        const { lineNumber } = position;
-        return {
-            startLineNumber: lineNumber,
-            endLineNumber: lineNumber,
-            startColumn: 1,
-            endColumn: 1,
-        };
-    }
-}
-exports.positionToRange = positionToRange;
-//# sourceMappingURL=range.js.map

package/lib/range.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"range.js","sourceRoot":"","sources":["../src/range.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,eAAe,CAAC,QAA4B;IAC1D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,OAAO;YACL,eAAe,EAAE,QAAQ;YACzB,aAAa,EAAE,QAAQ;YACvB,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,CAAC;SACb,CAAC;KACH;SAAM;QACL,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QAChC,OAAO;YACL,eAAe,EAAE,UAAU;YAC3B,aAAa,EAAE,UAAU;YACzB,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,CAAC;SACb,CAAC;KACH;AACH,CAAC;AAjBD,0CAiBC"}

package/src/range.ts

@@ -1,24 +0,0 @@
-import type { IPosition, IRange } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
-
-/**
- * position 转换 range
- * @param position
- */
-export function positionToRange(position: IPosition | number): IRange {
-  if (typeof position === 'number') {
-    return {
-      startLineNumber: position,
-      endLineNumber: position,
-      startColumn: 1,
-      endColumn: 1,
-    };
-  } else {
-    const { lineNumber } = position;
-    return {
-      startLineNumber: lineNumber,
-      endLineNumber: lineNumber,
-      startColumn: 1,
-      endColumn: 1,
-    };
-  }
-}