@opensumi/ide-terminal-next 2.17.9 → 2.18.1

package/lib/node/terminal.service.client.js

@@ -4,7 +4,6 @@ exports.TerminalServiceClientImpl = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_connection_1 = require("@opensumi/ide-connection");
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const common_1 = require("../common");
 const shell_1 = require("../common/shell");
@@ -21,6 +20,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     }
     setConnectionClientId(clientId) {
         this.clientId = clientId;
+        this.logger.debug('TerminalServiceClientImpl', 'setConnectionClientId', clientId);
         this.terminalService.setClient(this.clientId, this);
     }
     clientMessage(id, data) {
@@ -44,9 +44,9 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             this.client.$processChange(clientId, processName);
         }
     }
-    // 完成创建之后，前端进行状态同步
-    ensureTerminal(terminalIdArr) {
-        return this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
+    // 检查终端状态，终端是否存活
+    async ensureTerminal(terminalIdArr) {
+        return await this.terminalService.ensureClientTerminal(this.clientId, terminalIdArr);
     }
     async create2(id, cols, rows, launchConfig) {
         try {
@@ -54,6 +54,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             if (pty) {
                 this.terminalService.setClient(this.clientId, this);
                 this.logger.log(`client ${id} create ${pty.pid} with options `, launchConfig);
+                this.logger.log(`terminal client ${id} and clientID: ${this.clientId} create ${pty.pid} with options `, launchConfig);
                 this.terminalMap.set(id, pty);
                 return {
                     id,
@@ -93,44 +94,12 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     async $resolveShellPath(paths) {
         return await (0, shell_2.findShellExecutableAsync)(paths);
     }
-    async $resolvePotentialUnixShellPath() {
-        if (process.env.SHELL) {
-            return process.env.SHELL;
-        }
-        const candidates = ['zsh', 'bash', 'sh'];
-        for (const candidate of candidates) {
-            const path = await this.$resolveUnixShellPath(candidate);
-            if (path) {
-                return path;
-            }
-        }
-    }
-    async $resolvePotentialWindowsShellPath() {
-        let path = await (0, shell_2.findShellExecutableAsync)(shell_2.WINDOWS_GIT_BASH_PATHS);
-        if (path) {
-            return {
-                path,
-                type: shell_1.WindowsShellType['git-bash'],
-            };
-        }
-        path = await (0, shell_2.findExecutable)(shell_1.WINDOWS_DEFAULT_SHELL_PATH_MAPS.powershell);
-        if (path) {
-            return {
-                path,
-                type: shell_1.WindowsShellType.powershell,
-            };
-        }
-        return {
-            path: shell_1.WINDOWS_DEFAULT_SHELL_PATH_MAPS.cmd,
-            type: shell_1.WindowsShellType.cmd,
-        };
-    }
     async detectAvailableProfiles(options) {
         return await this.terminalProfileService.detectAvailableProfiles(options);
     }
     async getCodePlatformKey() {
         // follow vscode
-        return this.getOs() === platform_1.OperatingSystem.Macintosh ? 'osx' : platform_1.OS === platform_1.OperatingSystem.Windows ? 'windows' : 'linux';
+        return this.getOS() === ide_core_node_1.OperatingSystem.Macintosh ? 'osx' : ide_core_node_1.OperatingSystem.Windows ? 'windows' : 'linux';
     }
     async getDefaultSystemShell(os) {
         return await (0, shell_2.getSystemShell)(os);
@@ -156,8 +125,8 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
     getShellName(id) {
         return this.terminalService.getShellName(id);
     }
-    getOs() {
-        return platform_1.OS;
+    getOS() {
+        return ide_core_node_1.isWindows ? ide_core_node_1.OperatingSystem.Windows : ide_core_node_1.isMacintosh ? ide_core_node_1.OperatingSystem.Macintosh : ide_core_node_1.OperatingSystem.Linux;
     }
     dispose() {
         this.terminalService.closeClient(this.clientId);

package/lib/node/terminal.service.client.js.map

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

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

@@ -8,15 +8,16 @@ export declare class TerminalServiceImpl implements ITerminalNodeService {
     static TerminalPtyCloseThreshold: number;
     private terminalProcessMap;
     private clientTerminalMap;
-    private clientTerminalThresholdMap;
     private serviceClientMap;
+    private closeTimeOutMap;
     private injector;
     private logger;
     private appConfig;
+    private readonly ptyServiceManager;
     private batchedPtyDataMap;
     private batchedPtyDataTimer;
     setClient(clientId: string, client: ITerminalServiceClient): void;
-    ensureClientTerminal(clientId: string, terminalIdArr: string[]): boolean;
+    ensureClientTerminal(clientId: string, terminalIdArr: string[]): Promise<boolean>;
     closeClient(clientId: string): void;
     disposeClient(clientId: string): void;
     private flushPtyData;

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAUhE;;;GAGG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,iBAAiB,CAAmD;IAC5E,OAAO,CAAC,0BAA0B,CAA0C;IAE5E,OAAO,CAAC,gBAAgB,CAAkD;IAG1E,OAAO,CAAC,QAAQ,CAAW;IAG3B,OAAO,CAAC,MAAM,CAAc;IAG5B,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,mBAAmB,CAA0C;IAE9D,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAI1D,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;IAS9D,WAAW,CAAC,QAAQ,EAAE,MAAM;IAa5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAYrC,OAAO,CAAC,YAAY;IASP,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAC/E,OAAO,CAClB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAgH5B,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IASjC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IASpD,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,WAAW,CAAC,EAAE,EAAE,MAAM;IAStB,OAAO;IAMP,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"terminal.service.d.ts","sourceRoot":"","sources":["../../src/node/terminal.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,oBAAoB,EAAE,sBAAsB,EAAyB,MAAM,WAAW,CAAC;AACpH,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAWhE;;;GAGG;AACH,qBACa,mBAAoB,YAAW,oBAAoB;IAC9D,MAAM,CAAC,yBAAyB,SAAa;IAE7C,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,iBAAiB,CAAmD;IAE5E,OAAO,CAAC,gBAAgB,CAAkD;IAC1E,OAAO,CAAC,eAAe,CAA0C;IAGjE,OAAO,CAAC,QAAQ,CAAW;IAG3B,OAAO,CAAC,MAAM,CAAc;IAG5B,OAAO,CAAC,SAAS,CAAY;IAG7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,mBAAmB,CAA0C;IAE9D,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB;IAYpD,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;IAgBpE,WAAW,CAAC,QAAQ,EAAE,MAAM;IAY5B,aAAa,CAAC,QAAQ,EAAE,MAAM;IAuBrC,OAAO,CAAC,YAAY;IASP,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAC/E,OAAO,CAClB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAgH5B,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IASjC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IASpD,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAQhC,WAAW,CAAC,EAAE,EAAE,MAAM;IAStB,OAAO;IAMP,OAAO,CAAC,WAAW;CAGpB"}

package/lib/node/terminal.service.js

@@ -7,6 +7,7 @@ const di_1 = require("@opensumi/di");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const common_1 = require("../common");
 const pty_1 = require("./pty");
+const pty_manager_1 = require("./pty.manager");
 // ref: https://github.com/vercel/hyper/blob/4c90d7555c79fb6dc438fa9549f1d0ef7c7a5aa7/app/session.ts#L27-L32
 // 批处理字符最大长度
 const BATCH_MAX_SIZE = 200 * 1024;
@@ -20,35 +21,56 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     constructor() {
         this.terminalProcessMap = new Map();
         this.clientTerminalMap = new Map();
-        this.clientTerminalThresholdMap = new Map();
         this.serviceClientMap = new Map();
+        this.closeTimeOutMap = new Map();
         this.batchedPtyDataMap = new Map();
         this.batchedPtyDataTimer = new Map();
     }
     setClient(clientId, client) {
         this.serviceClientMap.set(clientId, client);
+        // 如果有相同的setClient clientId被调用，则取消延时触发closeClient，否则会导致终端无响应
+        const timeOutHandler = this.closeTimeOutMap.get(clientId);
+        if (timeOutHandler) {
+            global.clearTimeout(timeOutHandler);
+            this.closeTimeOutMap.delete(clientId);
+        }
     }
-    ensureClientTerminal(clientId, terminalIdArr) {
-        if (this.clientTerminalThresholdMap.has(clientId)) {
-            clearTimeout(this.clientTerminalThresholdMap.get(clientId));
-            this.logger.debug(`重连 clientId ${clientId} 窗口的 pty 进程`);
+    // 检查SessionId是否存活，但是因为之前接口设计有问题只返回了boolean，所以不能批量返回SessionId的检查结果
+    // 可以通过多次调用来达成目的，每次调用terminalIdArr只传入一个东西
+    async ensureClientTerminal(clientId, terminalIdArr) {
+        const sessionIdArray = terminalIdArr.map((id) => id.split(common_1.TERMINAL_ID_SEPARATOR)[1]);
+        const sessionCheckResArray = await Promise.all(sessionIdArray.map((sessionId) => this.ptyServiceManager.checkSession(sessionId)));
+        this.logger.log(`ensureClientTerminal ${clientId} ${terminalIdArr} ${sessionCheckResArray}`);
+        // 有一个存活就true，所以为了准确使用，每次调用terminalIdArr只传入一个东西
+        for (const sessionCheckRes of sessionCheckResArray) {
+            if (sessionCheckRes) {
+                return true;
+            }
         }
-        return this.clientTerminalMap.has(clientId);
+        return false;
     }
     closeClient(clientId) {
+        // 延时触发，因为WS本身有重连逻辑，因此通过延时触发来避免断开后不就重连但是回调方法都被dispose的问题
         const closeTimer = global.setTimeout(() => {
             this.disposeClient(clientId);
             this.logger.debug(`删除 clientId ${clientId} 窗口的 pty 进程`);
-            this.clientTerminalThresholdMap.delete(clientId);
         }, (0, ide_core_node_1.isDevelopment)() ? 0 : this.appConfig.terminalPtyCloseThreshold || TerminalServiceImpl_1.TerminalPtyCloseThreshold);
-        this.clientTerminalThresholdMap.set(clientId, closeTimer);
+        this.closeTimeOutMap.set(clientId, closeTimer);
     }
     disposeClient(clientId) {
         const terminalMap = this.clientTerminalMap.get(clientId);
+        // 如果是Electron也要直接kill掉，跟随IDE Server的生命周期
+        const isElectronNodeEnv = (0, ide_core_node_1.isElectronNode)();
         if (terminalMap) {
             terminalMap.forEach((t, id) => {
                 this.terminalProcessMap.delete(id);
-                t.kill();
+                if (t.shellLaunchConfig.disablePersistence ||
+                    t.shellLaunchConfig.isExtensionOwnedTerminal ||
+                    isElectronNodeEnv) {
+                    t.kill(); // terminalProfile有isTransient的参数化，要Kill，不保活
+                }
+                // t.kill(); // 这个是窗口关闭时候触发，终端默认在这种场景下保活, 不kill
+                // TOOD 后续看看有没有更加优雅的方案
             });
             this.clientTerminalMap.delete(clientId);
         }
@@ -62,7 +84,7 @@ let TerminalServiceImpl = TerminalServiceImpl_1 = class TerminalServiceImpl {
     }
     async create2(id, _cols, _rows, _launchConfig) {
         var _a;
-        const clientId = id.split('|')[0];
+        const clientId = id.split(common_1.TERMINAL_ID_SEPARATOR)[0];
         let ptyService;
         let cols = _cols;
         let rows = _rows;
@@ -212,6 +234,10 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_node_1.AppConfig),
     tslib_1.__metadata("design:type", Object)
 ], TerminalServiceImpl.prototype, "appConfig", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(pty_manager_1.PtyServiceManagerToken),
+    tslib_1.__metadata("design:type", Object)
+], TerminalServiceImpl.prototype, "ptyServiceManager", void 0);
 TerminalServiceImpl = TerminalServiceImpl_1 = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], TerminalServiceImpl);

package/lib/node/terminal.service.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-terminal-next",
-  "version": "2.17.9",
+  "version": "2.18.1",
   "files": [
     "lib"
   ],
@@ -16,33 +16,33 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-connection": "2.17.9",
-    "@opensumi/ide-core-common": "2.17.9",
-    "@opensumi/ide-core-node": "2.17.9",
-    "@opensumi/ide-file-service": "2.17.9",
+    "@opensumi/ide-connection": "2.18.1",
+    "@opensumi/ide-core-common": "2.18.1",
+    "@opensumi/ide-core-node": "2.18.1",
+    "@opensumi/ide-file-service": "2.18.1",
     "event-kit": "^2.5.3",
-    "node-pty": "0.10.0",
+    "node-pty": "0.11.0-beta19",
     "os-locale": "^4.0.0",
     "xterm": "4.19.0-beta.15",
     "xterm-addon-fit": "^0.5.0",
     "xterm-addon-search": "0.9.0-beta.16"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.17.9",
-    "@opensumi/ide-core-browser": "2.17.9",
+    "@opensumi/ide-components": "2.18.1",
+    "@opensumi/ide-core-browser": "2.18.1",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.17.9",
-    "@opensumi/ide-main-layout": "2.17.9",
-    "@opensumi/ide-overlay": "2.17.9",
-    "@opensumi/ide-status-bar": "2.17.9",
-    "@opensumi/ide-theme": "2.17.9",
-    "@opensumi/ide-variable": "2.17.9",
-    "@opensumi/ide-workspace": "2.17.9",
+    "@opensumi/ide-editor": "2.18.1",
+    "@opensumi/ide-main-layout": "2.18.1",
+    "@opensumi/ide-overlay": "2.18.1",
+    "@opensumi/ide-status-bar": "2.18.1",
+    "@opensumi/ide-theme": "2.18.1",
+    "@opensumi/ide-variable": "2.18.1",
+    "@opensumi/ide-workspace": "2.18.1",
     "@types/event-kit": "^2.4.0",
     "@types/http-proxy": "^1.17.2",
     "@types/puppeteer": "^2.0.0",
     "http-proxy": "^1.18.0",
     "puppeteer": "^2.0.0"
   },
-  "gitHead": "0f2e164abebb860769f78f6389a6233cf91db241"
+  "gitHead": "30a9b3305261c41d9f1c674b9ff72384998a9c11"
 }

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

@@ -1,7 +0,0 @@
-import { IExtensionTerminalProfile, ITerminalContributions, ITerminalContributionService } from '../common';
-export declare class TerminalContributionService implements ITerminalContributionService {
-    private _terminalProfiles;
-    get terminalProfiles(): IExtensionTerminalProfile[];
-    add(extensionId: string, contributions: ITerminalContributions): void;
-}
-//# sourceMappingURL=terminal.contribution.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"terminal.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.contribution.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAWnB,qBACa,2BAA4B,YAAW,4BAA4B;IAC9E,OAAO,CAAC,iBAAiB,CAAgD;IACzE,IAAI,gBAAgB,gCAEnB;IAED,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,sBAAsB;CAS/D"}

package/lib/browser/terminal.contribution.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalContributionService = void 0;
-const tslib_1 = require("tslib");
-const di_1 = require("@opensumi/di");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
-function hasValidTerminalIcon(profile) {
-    return (!profile.icon ||
-        typeof profile.icon === 'string' ||
-        ide_core_common_1.URI.isUri(profile.icon) ||
-        ('light' in profile.icon && 'dark' in profile.icon && ide_core_common_1.URI.isUri(profile.icon.light) && ide_core_common_1.URI.isUri(profile.icon.dark)));
-}
-let TerminalContributionService = class TerminalContributionService {
-    constructor() {
-        this._terminalProfiles = new Map();
-    }
-    get terminalProfiles() {
-        return Array.from(this._terminalProfiles.values());
-    }
-    add(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._terminalProfiles.set(profile.id, profile);
-        }
-    }
-};
-TerminalContributionService = tslib_1.__decorate([
-    (0, di_1.Injectable)()
-], TerminalContributionService);
-exports.TerminalContributionService = TerminalContributionService;
-//# sourceMappingURL=terminal.contribution.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"terminal.contribution.js","sourceRoot":"","sources":["../../src/browser/terminal.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAgD;AAShD,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;AAGD,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACU,sBAAiB,GAAG,IAAI,GAAG,EAAqC,CAAC;IAc3E,CAAC;IAbC,IAAI,gBAAgB;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,GAAG,CAAC,WAAmB,EAAE,aAAqC;;QAC5D,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,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SACjD;IACH,CAAC;CACF,CAAA;AAfY,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CAevC;AAfY,kEAA2B"}

package/lib/common/menu.d.ts

@@ -1,5 +0,0 @@
-export declare enum MenuId {
-    TermTab = "TermTab",
-    TermPanel = "TermPanel"
-}
-//# sourceMappingURL=menu.d.ts.map

package/lib/common/menu.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../src/common/menu.ts"],"names":[],"mappings":"AAAA,oBAAY,MAAM;IAChB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB"}

package/lib/common/menu.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MenuId = void 0;
-var MenuId;
-(function (MenuId) {
-    MenuId["TermTab"] = "TermTab";
-    MenuId["TermPanel"] = "TermPanel";
-})(MenuId = exports.MenuId || (exports.MenuId = {}));
-//# sourceMappingURL=menu.js.map

package/lib/common/menu.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/common/menu.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,6BAAmB,CAAA;IACnB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB"}