@opensumi/ide-terminal-next 2.17.8 → 2.18.0

package/lib/browser/terminal.internal.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,OAAO,EAEL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAInB,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAEnD,OAAO,CAAC,sBAAsB,CAAkD;IAEhF,iBAAiB;IAIjB,UAAU;IAIV,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIlB,MAAM,CACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,6BAAsB,EAC7B,IAAI,EAAE,MAAM;IAoBR,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQ1D,WAAW,CAAC,SAAS,EAAE,MAAM;IASvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAQpC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;IAIhD,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAI9C,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI;IAI1D,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAIjC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAI1D,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkB5C"}
+{"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAEL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAEnD,OAAO,CAAC,sBAAsB,CAAkD;IAEhF,iBAAiB;IAIjB,UAAU;IAIV,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIlB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQ1D,WAAW,CAAC,SAAS,EAAE,MAAM;IASvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAQpC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;IAIhD,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAI9C,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI;IAI1D,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAIjC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAI1D,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkB5C"}

package/lib/browser/terminal.internal.service.js

@@ -4,7 +4,6 @@ exports.TerminalInternalService = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const common_1 = require("../common");
-const terminal_ext_host_proxy_1 = require("./terminal.ext.host.proxy");
 let TerminalInternalService = class TerminalInternalService {
     constructor() {
         this._processExtHostProxies = new Map();
@@ -21,24 +20,6 @@ let TerminalInternalService = class TerminalInternalService {
     _getExtHostProxy(id) {
         return this._processExtHostProxies.get(id);
     }
-    async attach(sessionId, xterm, rows, cols, options = {}, type) {
-        if (options.isExtensionTerminal) {
-            const proxy = new terminal_ext_host_proxy_1.TerminalProcessExtHostProxy(sessionId, cols, rows, this.controller);
-            proxy.start();
-            proxy.onProcessExit(() => {
-                this._processExtHostProxies.delete(sessionId);
-            });
-            this._processExtHostProxies.set(sessionId, proxy);
-            return {
-                name: options.name || 'ExtensionTerminal-' + sessionId,
-                readonly: false,
-                onData: proxy.onProcessData.bind(proxy),
-                sendData: proxy.input.bind(proxy),
-                onExit: proxy.onProcessExit.bind(proxy),
-            };
-        }
-        return this.service.attach(sessionId, xterm, rows, cols, options, type);
-    }
     async sendText(sessionId, message) {
         const proxy = this._getExtHostProxy(sessionId);
         if (proxy) {
@@ -77,8 +58,8 @@ let TerminalInternalService = class TerminalInternalService {
     onProcessChange(handler) {
         return this.service.onProcessChange(handler);
     }
-    async getOs() {
-        return await this.service.getOs();
+    async getOS() {
+        return await this.service.getOS();
     }
     async getProfiles(autoDetect) {
         return await this.service.getProfiles(autoDetect);
@@ -89,7 +70,7 @@ let TerminalInternalService = class TerminalInternalService {
     async getCodePlatformKey() {
         return await this.service.getCodePlatformKey();
     }
-    async attachByLaunchConfig(sessionId, cols, rows, launchConfig) {
+    async attachByLaunchConfig(sessionId, cols, rows, launchConfig, xterm) {
         if (launchConfig.customPtyImplementation) {
             const proxy = launchConfig.customPtyImplementation(sessionId, cols, rows);
             proxy.start();
@@ -105,7 +86,7 @@ let TerminalInternalService = class TerminalInternalService {
                 onExit: proxy.onProcessExit.bind(proxy),
             };
         }
-        return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig);
+        return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig, xterm);
     }
 };
 tslib_1.__decorate([

package/lib/browser/terminal.internal.service.js.map

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

package/lib/browser/terminal.profile.d.ts

@@ -1,28 +1,37 @@
-import { PreferenceService } from '@opensumi/ide-core-browser';
 import { WithEventBus, IDisposable, Event } from '@opensumi/ide-core-common';
-import { IExtensionTerminalProfile, IRegisterContributedProfileArgs, IShellLaunchConfig, ITerminalContributionService, ITerminalProfile, ITerminalProfileProvider, ITerminalProfileService } from '../common';
+import { IExtensionTerminalProfile, ISaveContributedProfileArgs, IShellLaunchConfig, ITerminalProfile, ITerminalProfileProvider, ITerminalProfileService, ICreateContributedTerminalProfileOptions, ITerminalContributions } from '../common';
 export declare class TerminalProfileService extends WithEventBus implements ITerminalProfileService {
-    private _availableProfiles;
-    private terminalService;
-    preferenceService: PreferenceService;
-    terminalContributionService: ITerminalContributionService;
-    private _profilesReadyBarrier;
+    private readonly terminalService;
+    private readonly preferenceService;
+    private readonly logger;
+    private readonly _profilesReadyBarrier;
+    private onTerminalProfileResolvedEmitter;
+    /**
+     * 当用户创建了一个 Profile 时发出的事件
+     */
+    get onTerminalProfileResolved(): Event<string>;
     get profilesReady(): Promise<void>;
     private readonly _onDidChangeAvailableProfiles;
     get onDidChangeAvailableProfiles(): Event<ITerminalProfile[]>;
     constructor();
     private readonly _profileProviders;
+    private _availableProfiles;
     get availableProfiles(): ITerminalProfile[];
     private _contributedProfiles;
     get contributedProfiles(): IExtensionTerminalProfile[];
     getDefaultProfileName(): string | undefined;
     refreshAvailableProfiles(): void;
     getContributedProfileProvider(extensionIdentifier: string, id: string): ITerminalProfileProvider | undefined;
-    registerTerminalProfileProvider(extensionIdentifierenfifier: string, id: string, profileProvider: ITerminalProfileProvider): IDisposable;
+    createContributedTerminalProfile(extensionIdentifier: string, id: string, options: ICreateContributedTerminalProfileOptions): Promise<void>;
+    registerTerminalProfileProvider(extensionIdentifier: string, id: string, profileProvider: ITerminalProfileProvider): IDisposable;
     private _detectProfiles;
     private _updateContributedProfiles;
     protected _refreshAvailableProfilesNow(): Promise<void>;
     getContributedDefaultProfile(shellLaunchConfig: IShellLaunchConfig): Promise<IExtensionTerminalProfile | undefined>;
-    registerContributedProfile(args: IRegisterContributedProfileArgs): Promise<void>;
+    saveContributedProfile(args: ISaveContributedProfileArgs): Promise<void>;
+    private _rawContributedProfileMap;
+    get rawContributedProfiles(): IExtensionTerminalProfile[];
+    addContributedProfile(extensionId: string, contributions: ITerminalContributions): void;
+    removeContributedProfile(extensionId: string): void;
 }
 //# sourceMappingURL=terminal.profile.d.ts.map

package/lib/browser/terminal.profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAGL,YAAY,EACZ,WAAW,EACX,KAAK,EAKN,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,kBAAkB,EAClB,4BAA4B,EAC5B,gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,EAGxB,MAAM,WAAW,CAAC;AAInB,qBACa,sBAAuB,SAAQ,YAAa,YAAW,uBAAuB;IACzF,OAAO,CAAC,kBAAkB,CAAiC;IAG3D,OAAO,CAAC,eAAe,CAAmB;IAG1C,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,2BAA2B,EAAE,4BAA4B,CAAC;IAE1D,OAAO,CAAC,qBAAqB,CAAkB;IAE/C,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IACD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAqC;IACnF,IAAI,4BAA4B,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAE5D;;IAWD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACtB;IAEZ,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;IAED,OAAO,CAAC,oBAAoB,CAAmC;IAC/D,IAAI,mBAAmB,IAAI,yBAAyB,EAAE,CAErD;IAED,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,wBAAwB,IAAI,IAAI;IAIhC,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAKrG,+BAA+B,CACpC,2BAA2B,EAAE,MAAM,EACnC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,wBAAwB,GACxC,WAAW;YAUA,eAAe;YAIf,0BAA0B;cAyBxB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvD,4BAA4B,CAChC,iBAAiB,EAAE,kBAAkB,GACpC,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAY3C,0BAA0B,CAAC,IAAI,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBvF"}
+{"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,YAAY,EACZ,WAAW,EACX,KAAK,EAMN,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAC3B,kBAAkB,EAClB,gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,EAGvB,wCAAwC,EAExC,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAKnB,qBACa,sBAAuB,SAAQ,YAAa,YAAW,uBAAuB;IAEzF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAGnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAkB;IAExD,OAAO,CAAC,gCAAgC,CAAkC;IAE1E;;OAEG;IACH,IAAI,yBAAyB,kBAE5B;IAED,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IACD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAqC;IACnF,IAAI,4BAA4B,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAE5D;;IAWD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACtB;IAEZ,OAAO,CAAC,kBAAkB,CAAiC;IAC3D,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;IAED,OAAO,CAAC,oBAAoB,CAAmC;IAC/D,IAAI,mBAAmB,IAAI,yBAAyB,EAAE,CAErD;IAED,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,wBAAwB,IAAI,IAAI;IAIhC,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAKtG,gCAAgC,CACpC,mBAAmB,EAAE,MAAM,EAC3B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,wCAAwC,GAChD,OAAO,CAAC,IAAI,CAAC;IAcT,+BAA+B,CACpC,mBAAmB,EAAE,MAAM,EAC3B,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,wBAAwB,GACxC,WAAW;YAUA,eAAe;YAIf,0BAA0B;cAyBxB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvD,4BAA4B,CAChC,iBAAiB,EAAE,kBAAkB,GACpC,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAY3C,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9E,OAAO,CAAC,yBAAyB,CAAgD;IACjF,IAAI,sBAAsB,gCAEzB;IAED,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,sBAAsB;IAYhF,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CASpD"}

package/lib/browser/terminal.profile.internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,+BAA+B,EAC/B,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAMnB,qBACa,8BAA+B,YAAW,+BAA+B;IAEpF,cAAc,EAAE,uBAAuB,CAAC;IAGxC,eAAe,EAAE,gBAAgB,CAAC;IAGlC,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;YAE9C,0BAA0B;IA+BlC,qBAAqB,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAerG,yBAAyB;YASjB,+BAA+B;CAoB9C"}
+{"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,+BAA+B,EAC/B,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAMnB,qBACa,8BAA+B,YAAW,+BAA+B;IAEpF,cAAc,EAAE,uBAAuB,CAAC;IAGxC,eAAe,EAAE,gBAAgB,CAAC;IAGlC,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;YAE9C,0BAA0B;IA+BlC,qBAAqB,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAerG,yBAAyB;YASjB,+BAA+B;CAoB9C"}

package/lib/browser/terminal.profile.internal.js

@@ -8,8 +8,6 @@ exports.TerminalProfileInternalService = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const path = tslib_1.__importStar(require("@opensumi/ide-core-common/lib/path"));
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const common_1 = require("../common");
 const generatedProfileName = 'Generated Profile';
 let TerminalProfileInternalService = class TerminalProfileInternalService {
@@ -23,8 +21,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
         let shellPath = shellType;
         const args = [];
         const platformKey = await this.terminalService.getCodePlatformKey();
-        const terminalOs = await this.terminalService.getOs();
-        if (terminalOs === platform_1.OperatingSystem.Windows) {
+        const terminalOs = await this.terminalService.getOS();
+        if (terminalOs === ide_core_browser_1.OperatingSystem.Windows) {
             shellPath = (_a = (await this.serviceClientRPC.$resolveWindowsShellPath(shellType))) !== null && _a !== void 0 ? _a : shellPath;
         }
         else {
@@ -66,8 +64,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
         const executable = await this.terminalService.getDefaultSystemShell();
         // Finally fallback to a generated profile
         let args;
-        const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.getOs());
-        if (os === platform_1.OperatingSystem.Macintosh && path.parse(executable).name.match(/(zsh|bash)/)) {
+        const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.getOS());
+        if (os === ide_core_browser_1.OperatingSystem.Macintosh && ide_core_browser_1.path.parse(executable).name.match(/(zsh|bash)/)) {
             // macOS should launch a login shell by default
             args = ['--login'];
         }

package/lib/browser/terminal.profile.internal.js.map

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

package/lib/browser/terminal.profile.js

@@ -5,19 +5,30 @@ const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
+const ide_core_common_2 = require("@opensumi/ide-core-common");
 const common_1 = require("../common");
+const { equals } = ide_core_common_1.arrays;
 let TerminalProfileService = class TerminalProfileService extends ide_core_common_1.WithEventBus {
     constructor() {
         super();
+        this.onTerminalProfileResolvedEmitter = new ide_core_common_1.Emitter();
         this._onDidChangeAvailableProfiles = new ide_core_common_1.Emitter();
         this._profileProviders = new Map();
         this._contributedProfiles = [];
+        // #region 外部插件贡献的 Terminal Profiles
+        this._rawContributedProfileMap = new Map();
         // Wait up to 5 seconds for profiles to be ready so it's assured that we know the actual
         // default terminal before launching the first terminal. This isn't expected to ever take
         // this long.
         this._profilesReadyBarrier = new ide_core_common_1.AutoOpenBarrier(5000);
         this.refreshAvailableProfiles();
     }
+    /**
+     * 当用户创建了一个 Profile 时发出的事件
+     */
+    get onTerminalProfileResolved() {
+        return this.onTerminalProfileResolvedEmitter.event;
+    }
     get profilesReady() {
         return this._profilesReadyBarrier.wait().then(() => { });
     }
@@ -40,11 +51,25 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         const extMap = this._profileProviders.get(extensionIdentifier);
         return extMap === null || extMap === void 0 ? void 0 : extMap.get(id);
     }
-    registerTerminalProfileProvider(extensionIdentifierenfifier, id, profileProvider) {
-        let extMap = this._profileProviders.get(extensionIdentifierenfifier);
+    async createContributedTerminalProfile(extensionIdentifier, id, options) {
+        await this.onTerminalProfileResolvedEmitter.fireAndAwait(id);
+        const profileProvider = this.getContributedProfileProvider(extensionIdentifier, id);
+        if (!profileProvider) {
+            this.logger.error(`No terminal profile provider registered for id "${id}"`);
+            return;
+        }
+        try {
+            await profileProvider.createContributedTerminalProfile(options);
+        }
+        catch (e) {
+            this.logger.error('create contributed terminal profile error:', e.message);
+        }
+    }
+    registerTerminalProfileProvider(extensionIdentifier, id, profileProvider) {
+        let extMap = this._profileProviders.get(extensionIdentifier);
         if (!extMap) {
             extMap = new Map();
-            this._profileProviders.set(extensionIdentifierenfifier, extMap);
+            this._profileProviders.set(extensionIdentifier, extMap);
         }
         extMap.set(id, profileProvider);
         return ide_core_common_1.Disposable.create(() => this._profileProviders.delete(id));
@@ -61,14 +86,14 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
                 excludedContributedProfiles.push(profileName);
             }
         }
-        const filteredContributedProfiles = Array.from(this.terminalContributionService.terminalProfiles.filter((p) => !excludedContributedProfiles.includes(p.title)));
-        const contributedProfilesChanged = !(0, ide_core_common_1.equals)(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
+        const filteredContributedProfiles = Array.from(this.rawContributedProfiles.filter((p) => !excludedContributedProfiles.includes(p.title)));
+        const contributedProfilesChanged = !equals(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
         this._contributedProfiles = filteredContributedProfiles;
         return contributedProfilesChanged;
     }
     async _refreshAvailableProfilesNow() {
         const profiles = await this._detectProfiles(true);
-        const profilesChanged = !(0, ide_core_common_1.equals)(profiles, this._availableProfiles, profilesEqual);
+        const profilesChanged = !equals(profiles, this._availableProfiles, profilesEqual);
         const contributedProfilesChanged = await this._updateContributedProfiles();
         if (profilesChanged || contributedProfilesChanged) {
             this._availableProfiles = profiles;
@@ -87,7 +112,7 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         }
         return undefined;
     }
-    async registerContributedProfile(args) {
+    async saveContributedProfile(args) {
         const platformKey = await this.terminalService.getCodePlatformKey();
         const profilesConfig = await this.preferenceService.get(`${"terminal.integrated.profiles." /* Profiles */}${platformKey}`);
         if (typeof profilesConfig === 'object') {
@@ -103,6 +128,25 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         await this.preferenceService.set(`${"terminal.integrated.profiles." /* Profiles */}${platformKey}`, profilesConfig, ide_core_common_1.PreferenceScope.User);
         return;
     }
+    get rawContributedProfiles() {
+        return Array.from(this._rawContributedProfileMap.values());
+    }
+    addContributedProfile(extensionId, contributions) {
+        var _a;
+        const profiles = ((_a = contributions === null || contributions === void 0 ? void 0 : contributions.profiles) === null || _a === void 0 ? void 0 : _a.filter((p) => hasValidTerminalIcon(p)).map((e) => (Object.assign(Object.assign({}, e), { extensionIdentifier: extensionId })))) || [];
+        for (const profile of profiles) {
+            this._rawContributedProfileMap.set(profile.id, profile);
+        }
+        this.refreshAvailableProfiles();
+    }
+    removeContributedProfile(extensionId) {
+        const profiles = this.rawContributedProfiles;
+        for (const profile of profiles) {
+            if (profile.extensionIdentifier === extensionId) {
+                this._rawContributedProfileMap.delete(profile.id);
+            }
+        }
+    }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(common_1.ITerminalService),
@@ -113,9 +157,9 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], TerminalProfileService.prototype, "preferenceService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(common_1.ITerminalContributionService),
+    (0, di_1.Autowired)(ide_core_common_1.ILogger),
     tslib_1.__metadata("design:type", Object)
-], TerminalProfileService.prototype, "terminalContributionService", void 0);
+], TerminalProfileService.prototype, "logger", void 0);
 tslib_1.__decorate([
     (0, ide_core_common_1.throttle)(2000),
     tslib_1.__metadata("design:type", Function),
@@ -143,4 +187,10 @@ function contributedProfilesEqual(one, other) {
         one.id === other.id &&
         one.title === other.title);
 }
+function hasValidTerminalIcon(profile) {
+    return (!profile.icon ||
+        typeof profile.icon === 'string' ||
+        ide_core_common_2.URI.isUri(profile.icon) ||
+        ('light' in profile.icon && 'dark' in profile.icon && ide_core_common_2.URI.isUri(profile.icon.light) && ide_core_common_2.URI.isUri(profile.icon.dark)));
+}
 //# sourceMappingURL=terminal.profile.js.map

package/lib/browser/terminal.profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA+D;AAC/D,+DAWmC;AACnC,+DAAgD;AAEhD,sCAamB;AAGnB,MAAM,EAAE,MAAM,EAAE,GAAG,wBAAM,CAAC;AAG1B,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,8BAAY;IA6BtD;QACE,KAAK,EAAE,CAAC;QAlBF,qCAAgC,GAAoB,IAAI,yBAAO,EAAE,CAAC;QAYzD,kCAA6B,GAAG,IAAI,yBAAO,EAAsB,CAAC;QAclE,sBAAiB,GAChC,IAAI,GAAG,EAAE,CAAC;QAOJ,yBAAoB,GAAgC,EAAE,CAAC;QAiI/D,oCAAoC;QAC5B,8BAAyB,GAAG,IAAI,GAAG,EAAqC,CAAC;QAjJ/E,wFAAwF;QACxF,yFAAyF;QACzF,aAAa;QACb,IAAI,CAAC,qBAAqB,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAtBD;;OAEG;IACH,IAAI,yBAAyB;QAC3B,OAAO,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC;IACrD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;IAClD,CAAC;IAeD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC;IACvC,CAAC;IAGD,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC/B,GAAG,0DAAwC,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,CAC1F,CAAC;IACJ,CAAC;IAGD,wBAAwB;QACtB,IAAI,CAAC,4BAA4B,EAAE,CAAC;IACtC,CAAC;IAED,6BAA6B,CAAC,mBAA2B,EAAE,EAAU;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC/D,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,gCAAgC,CACpC,mBAA2B,EAC3B,EAAU,EACV,OAAiD;QAEjD,MAAM,IAAI,CAAC,gCAAgC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,eAAe,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE,GAAG,CAAC,CAAC;YAC5E,OAAO;SACR;QACD,IAAI;YACF,MAAM,eAAe,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC;SACjE;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SAC5E;IACH,CAAC;IAEM,+BAA+B,CACpC,mBAA2B,EAC3B,EAAU,EACV,eAAyC;QAEzC,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;SACzD;QACD,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAChC,OAAO,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAU,GAAG,IAAI;QAC7C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,2BAA2B,GAAa,EAAE,CAAC;QACjD,MAAM,cAAc,GAA2B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACvE,iDAAqC,WAAW,EAChD,EAAE,CACH,CAAC;QACF,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjE,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,2BAA2B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/C;SACF;QACD,MAAM,2BAA2B,GAAG,KAAK,CAAC,IAAI,CAC5C,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAC1F,CAAC;QAEF,MAAM,0BAA0B,GAAG,CAAC,MAAM,CACxC,2BAA2B,EAC3B,IAAI,CAAC,oBAAoB,EACzB,wBAAwB,CACzB,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,2BAA2B,CAAC;QACxD,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,4BAA4B;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAClF,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,eAAe,IAAI,0BAA0B,EAAE;YACjD,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;YACnC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAClE;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,iBAAqC;QAErC,gFAAgF;QAChF,0EAA0E;QAC1E,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,IAAI,CAAC,CAAC,YAAY,IAAI,iBAAiB,CAAC,EAAE;YACrG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;YAC5D,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,0DAAwC,GAAG,GAAG,EAAE,CAAC,CAAC;YAC3G,MAAM,yBAAyB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC;YACvG,OAAO,yBAAyB,CAAC;SAClC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAiC;QAC5D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,8CAAkC,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/G,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,MAAM,UAAU,GAA8B;gBAC5C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC;YAED,cAA4D,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;SACxF;QACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC9B,GAAG,8CAAkC,GAAG,WAAW,EAAE,EACrD,cAAc,EACd,iCAAe,CAAC,IAAI,CACrB,CAAC;QACF,OAAO;IACT,CAAC;IAID,IAAI,sBAAsB;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,qBAAqB,CAAC,WAAmB,EAAE,aAAqC;;QAC9E,MAAM,QAAQ,GACZ,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,0CACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACtC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAM,CAAC,KAAE,mBAAmB,EAAE,WAAW,IAAG,CAAC,KAAI,EAAE,CAAC;QACpE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SACzD;QAED,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAED,wBAAwB,CAAC,WAAmB;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC7C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,IAAI,OAAO,CAAC,mBAAmB,KAAK,WAAW,EAAE;gBAC/C,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aACnD;SACF;IACH,CAAC;CAEF,CAAA;AAxMC;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;+DACuB;AAGnD;IADC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;iEACyB;AAGtD;IADC,IAAA,cAAS,EAAC,yBAAO,CAAC;;sDACc;AAkDjC;IADC,IAAA,0BAAQ,EAAC,IAAI,CAAC;;;;sEAGd;AA5DU,sBAAsB;IADlC,IAAA,eAAU,GAAE;;GACA,sBAAsB,CA0MlC;AA1MY,wDAAsB;AA4MnC,SAAS,aAAa,CAAC,GAAqB,EAAE,KAAuB;IACnE,OAAO,CACL,GAAG,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW;QACrC,IAAA,iCAAwB,EAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAC9C,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,cAAc,KAAK,KAAK,CAAC,cAAc;QAC3C,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS;QACjC,GAAG,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY;QACvC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CACxB,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,GAA8B,EAAE,KAAgC;IAChG,OAAO,CACL,GAAG,CAAC,mBAAmB,KAAK,KAAK,CAAC,mBAAmB;QACrD,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;QACvB,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;QACnB,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAC1B,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAqC;IACjE,OAAO,CACL,CAAC,OAAO,CAAC,IAAI;QACb,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;QAChC,qBAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACvB,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,qBAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,qBAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACrH,CAAC;AACJ,CAAC"}

package/lib/browser/terminal.restore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,WAEb;IAED,IAAI;IAMJ,OAAO;CAYR"}
+{"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,WAGb;IAED,IAAI;IAMJ,OAAO;CAaR"}

package/lib/browser/terminal.restore.js

@@ -7,7 +7,8 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
 const common_1 = require("../common");
 let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable {
     get storageKey() {
-        return 'KAITIAN';
+        // 集成方根据自己的场景来自定义storageKey做到终端恢复场景的准确性
+        return 'OPENSUMI_TERMINAL_RESTORE';
     }
     save() {
         const json = this.controller.toJSON();
@@ -17,6 +18,7 @@ let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable
     restore() {
         const key = this.storageKey;
         const history = window.localStorage.getItem(key);
+        window.localStorage.removeItem(key); // 触发恢复之后清除掉缓存
         if (history) {
             try {
                 return this.controller.recovery(JSON.parse(history));

package/lib/browser/terminal.restore.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACX,IAAI;gBACF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AA3BC;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;mDACC;AAGhC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;gDACiB;AAL1C,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CA6B3B;AA7BY,0CAAe"}
+{"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,uCAAuC;QACvC,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc;QACnD,IAAI,OAAO,EAAE;YACX,IAAI;gBACF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AA7BC;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;mDACC;AAGhC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;gDACiB;AAL1C,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CA+B3B;AA/BY,0CAAe"}

package/lib/browser/terminal.search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpH,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,IAAI,EAAE,OAAO,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,mBAAmB,CAAC;IAGhC,YAAY,EAAE,yBAAyB,CAAC;IAExC,SAAS,CAAC,OAAO,gBAAuB;IAExC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsB;IAEzC,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,IAAI;IAKJ,KAAK;IAKL,KAAK;IAKL,MAAM;CAGP"}
+{"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpH,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,IAAI,EAAE,OAAO,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,mBAAmB,CAAC;IAGhC,YAAY,EAAE,yBAAyB,CAAC;IAExC,SAAS,CAAC,OAAO,gBAAuB;IAExC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsB;IAEzC,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,IAAI;IAKJ,KAAK;IAKL,KAAK;IAML,MAAM;CAGP"}

package/lib/browser/terminal.search.js

@@ -49,6 +49,12 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(common_1.ITerminalGroupViewService),
     tslib_1.__metadata("design:type", Object)
 ], TerminalSearchService.prototype, "terminalView", void 0);
+tslib_1.__decorate([
+    (0, ide_core_common_1.debounce)(150),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], TerminalSearchService.prototype, "search", null);
 TerminalSearchService = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], TerminalSearchService);

package/lib/browser/terminal.search.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+DAA2D;AAE3D,sCAAoH;AAGpH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QAaY,YAAO,GAAG,IAAI,yBAAO,EAAQ,CAAC;QAExC,WAAM,GAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAwB3C,CAAC;IAtBC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,MAAM;;QACJ,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AArCC;IADC,iBAAU;;mDACG;AAGd;IADC,iBAAU;;oDACG;AAGd;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;yDACC;AAGhC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;2DACG;AAX7B,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAuCjC;AAvCY,sDAAqB"}
+{"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+DAAqE;AAErE,sCAAoH;AAGpH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QAaY,YAAO,GAAG,IAAI,yBAAO,EAAQ,CAAC;QAExC,WAAM,GAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAyB3C,CAAC;IAvBC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAGD,MAAM;;QACJ,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAtCC;IADC,iBAAU;;mDACG;AAGd;IADC,iBAAU;;oDACG;AAGd;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;yDACC;AAGhC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;2DACG;AA0BxC;IADC,IAAA,0BAAQ,EAAC,GAAG,CAAC;;;;mDAGb;AAvCU,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAwCjC;AAxCY,sDAAqB"}

package/lib/browser/terminal.service.d.ts

@@ -1,9 +1,8 @@
-import { Terminal } from 'xterm';
 import { Injector } from '@opensumi/di';
+import { OperatingSystem } from '@opensumi/ide-core-browser';
 import { ILogger, Event } from '@opensumi/ide-core-common';
-import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
-import { ITerminalService, ITerminalError, ITerminalServiceClient, ITerminalConnection, IPtyExitEvent, TerminalOptions, ITerminalProfile, IShellLaunchConfig, IPtyProcessChangeEvent } from '../common';
-import { ShellType } from '../common/shell';
+import { ITerminalService, ITerminalError, ITerminalServiceClient, ITerminalConnection, IPtyExitEvent, ITerminalProfile, IShellLaunchConfig, IPtyProcessChangeEvent } from '../common';
+import { XTerm } from './xterm';
 export interface EventMessage {
     data: string;
 }
@@ -26,18 +25,7 @@ export declare class NodePtyTerminalService implements ITerminalService {
     generateSessionId(): string;
     check(ids: string[]): Promise<boolean>;
     private _createCustomWebSocket;
-    /**
-     *
-     * @param sessionId
-     * @param _
-     * @param rows
-     * @param cols
-     * @param options
-     * @param shellType
-     * @returns
-     */
-    attach(sessionId: string, _: Terminal, rows: number, cols: number, options?: TerminalOptions, shellType?: ShellType): Promise<ITerminalConnection | undefined>;
-    attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig): Promise<ITerminalConnection | undefined>;
+    attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig, _xterm: XTerm): Promise<ITerminalConnection | undefined>;
     private _sendMessage;
     sendText(sessionId: string, message: string): Promise<void>;
     resize(sessionId: string, cols: number, rows: number): Promise<void>;
@@ -62,7 +50,7 @@ export declare class NodePtyTerminalService implements ITerminalService {
         signal?: number;
     }): void;
     $processChange(sessionId: string, processName: string): void;
-    getOs(): Promise<OperatingSystem>;
+    getOS(): Promise<OperatingSystem>;
     getProfiles(autoDetect: boolean): Promise<ITerminalProfile[]>;
     getDefaultSystemShell(): Promise<string>;
     dispose(): void;

package/lib/browser/terminal.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,QAAQ,EAAkB,MAAM,cAAc,CAAC;AAE/E,OAAO,EAA6C,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAW,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAEL,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EAEtB,mBAAmB,EACnB,aAAa,EAGb,gBAAgB,EAChB,kBAAkB,EAElB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd;AACD,qBACa,sBAAuB,YAAW,gBAAgB;IAC7D,MAAM,CAAC,OAAO,SAAK;IAEnB,OAAO,CAAC,SAAS,CAA8B;IAG/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAGtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,OAAO,CAAC,QAAQ,CAAiC;IAC1C,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC,CAAuB;IAE5D,OAAO,CAAC,OAAO,CAAgC;IACxC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAsB;IAEzD,OAAO,CAAC,gBAAgB,CAAyC;IAC1D,eAAe,gCAA+B;IAErD,OAAO,CAAC,iBAAiB,CAAqD;IAC9E,OAAO,CAAC,iBAAiB,CAQrB;IAEJ,iBAAiB;IAWX,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE;IAKzB,OAAO,CAAC,sBAAsB,CAY3B;IAEG,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,EAChC,MAAM,EAAE,KAAK;IAoBf,OAAO,CAAC,YAAY;IAYd,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAM3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAOpD,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAIhE,WAAW,CAAC,SAAS,EAAE,MAAM;IAIvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAIpC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAI5C;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAC7D,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiB/F,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAI/C,KAAK;IAOL,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAa7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9C,OAAO;CAIR"}

package/lib/browser/terminal.service.js

@@ -8,9 +8,7 @@ const di_1 = require("@opensumi/di");
 const ws_channel_handler_1 = require("@opensumi/ide-connection/lib/browser/ws-channel-handler");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const common_1 = require("../common");
-const shell_1 = require("../common/shell");
 let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalService {
     constructor() {
         this._onError = new ide_core_common_1.Emitter();
@@ -38,89 +36,18 @@ let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalSer
         // Electron 环境下，未指定 isRemote 时默认使用本地连接
         // 否则使用 WebSocket 连接
         if (this.appConfig.isElectronRenderer && !this.appConfig.isRemote) {
-            return ide_core_browser_1.electronEnv.metadata.windowClientId + '|' + (0, common_1.generateSessionId)();
+            return ide_core_browser_1.electronEnv.metadata.windowClientId + common_1.TERMINAL_ID_SEPARATOR + (0, common_1.generateSessionId)();
         }
         else {
             const WSChannelHandler = this.injector.get(ws_channel_handler_1.WSChannelHandler);
-            return WSChannelHandler.clientId + '|' + (0, common_1.generateSessionId)();
+            return WSChannelHandler.clientId + common_1.TERMINAL_ID_SEPARATOR + (0, common_1.generateSessionId)();
         }
     }
     async check(ids) {
         const ensureResult = await this.serviceClientRPC.ensureTerminal(ids);
         return ensureResult;
     }
-    /**
-     *
-     * @param sessionId
-     * @param _
-     * @param rows
-     * @param cols
-     * @param options
-     * @param shellType
-     * @returns
-     */
-    async attach(sessionId, _, rows, cols, options = {}, shellType) {
-        let shellPath = options.shellPath;
-        const shellArgs = typeof options.shellArgs === 'string' ? [options.shellArgs] : options.shellArgs || [];
-        const platformKey = await this.getCodePlatformKey();
-        const terminalOs = await this.getOs();
-        if (!shellPath) {
-            // if terminal options.shellPath is not set, we should resolve the shell path from preference: `terminal.type`
-            if (shellType && shellType !== 'default') {
-                if (terminalOs === platform_1.OperatingSystem.Windows) {
-                    shellPath = await this.serviceClientRPC.$resolveWindowsShellPath(shellType);
-                }
-                else {
-                    shellPath = await this.serviceClientRPC.$resolveUnixShellPath(shellType);
-                }
-                if (!shellPath) {
-                    // TODO: we can show error message here
-                    // "the shell you want to launch is not exists"
-                }
-            }
-            // and now, we have the following two situations:
-            if (!shellPath) {
-                if (!shellType || shellType === 'default') {
-                    // 1. `terminal.type` is set to a falsy value, or set to `default`
-                    if (terminalOs === platform_1.OperatingSystem.Windows) {
-                        // in windows, at least we can launch the cmd.exe
-                        const { type: _type, path } = await this.serviceClientRPC.$resolvePotentialWindowsShellPath();
-                        shellType = _type;
-                        shellPath = path;
-                    }
-                    else {
-                        // in unix, at least we can launch the sh
-                        shellPath = await this.serviceClientRPC.$resolvePotentialUnixShellPath();
-                    }
-                }
-                else {
-                    // 2. `terminal.type` is set to a truthy value, but the shell path is not resolved, for example cannot resolve 'git-bash'
-                    //     but in this situation, we preserve the user settings, launch the type as shell path
-                    //     on PtyService we also have a fallback to check the shellPath is valid
-                    shellPath = shellType;
-                }
-            }
-            // if we still can not find the shell path, we use shellType as the target shell path
-            if (!shellPath && shellType !== 'default') {
-                shellPath = shellType;
-            }
-            const platformSpecificArgs = this.preferenceService.get(`${"terminal.integrated.shellArgs." /* ShellArgs */}${platformKey}`, []);
-            shellArgs.push(...platformSpecificArgs);
-            if (shellType === shell_1.WindowsShellType['git-bash']) {
-                shellArgs.push('--login');
-            }
-        }
-        const launchConfig = {
-            executable: shellPath,
-            cwd: options.cwd,
-            args: shellArgs,
-            env: options.env,
-            name: options.name,
-            strictEnv: options.strictEnv,
-        };
-        return this.attachByLaunchConfig(sessionId, cols, rows, launchConfig);
-    }
-    async attachByLaunchConfig(sessionId, cols, rows, launchConfig) {
+    async attachByLaunchConfig(sessionId, cols, rows, launchConfig, _xterm) {
         // If code runs to here, it means that we want to create a real terminal.
         // So if `launchConfig.executable` is not set, we should use the default shell.
         if (!launchConfig.executable) {
@@ -188,11 +115,11 @@ let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalSer
     $processChange(sessionId, processName) {
         this._onProcessChange.fire({ sessionId, processName });
     }
-    async getOs() {
+    async getOS() {
         if (this.backendOs) {
             return this.backendOs;
         }
-        return (this.backendOs = this.serviceClientRPC.getOs());
+        return (this.backendOs = this.serviceClientRPC.getOS());
     }
     async getProfiles(autoDetect) {
         const platformKey = await this.getCodePlatformKey();
@@ -203,7 +130,7 @@ let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalSer
         });
     }
     async getDefaultSystemShell() {
-        return await this.serviceClientRPC.getDefaultSystemShell(await this.getOs());
+        return await this.serviceClientRPC.getDefaultSystemShell(await this.getOS());
     }
     dispose() {
         this._onDataDispatcher.dispose();