@opensumi/ide-terminal-next 2.13.9 → 2.14.1

package/lib/common/pty.d.ts

@@ -2,12 +2,19 @@ import type vscode from 'vscode';
 import { Terminal as XTerm } from 'xterm';
 import { Uri } from '@opensumi/ide-core-common';
 import { WindowsShellType } from './shell';
+import { IPty as INodePty } from 'node-pty';
+import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
+import { ITerminalError } from './error';
+export interface IPty extends INodePty {
+    /**
+     * @deprecated 请使用 `IPty.launchConfig` 的 shellPath 字段
+     */
+    bin: string;
+    launchConfig: IShellLaunchConfig;
+    parsedName: string;
+}
 export declare const ITerminalServicePath = "ITerminalServicePath";
 export declare const ITerminalProcessPath = "ITerminalProcessPath";
-export declare const ITerminalNodeService: unique symbol;
-export declare const ITerminalProcessService: unique symbol;
-export declare const ITerminalServiceClient: unique symbol;
-export declare const IExternlTerminalService: unique symbol;
 export interface Terminal {
     readonly xterm: XTerm;
     /**
@@ -123,48 +130,63 @@ export interface TerminalOptions {
     args?: any;
     beforeCreate?: (terminalId: string) => void;
 }
+export declare const ITerminalNodeService: unique symbol;
 export interface ITerminalNodeService {
-    create(id: string, rows: number, cols: number, options: TerminalOptions): any;
+    create2(id: string, options: IShellLaunchConfig): Promise<IPty | undefined>;
     onMessage(id: string, msg: string): void;
     resize(id: string, rows: number, cols: number): any;
     getShellName(id: string): string;
     getProcessId(id: string): number;
-    disposeById(id: string): any;
-    dispose(): any;
-    setClient(clientId: string, client: ITerminalServiceClient): any;
-    closeClient(clientId: string): any;
+    disposeById(id: string): void;
+    dispose(): void;
+    setClient(clientId: string, client: ITerminalServiceClient): void;
+    closeClient(clientId: string): void;
     ensureClientTerminal(clientId: string, terminalIdArr: string[]): boolean;
 }
+export declare const ITerminalProcessService: unique symbol;
 export interface ITerminalProcessService {
     getEnv(): Promise<{
         [key in string]: string | undefined;
     }>;
 }
+export interface INodePtyInstance {
+    id: string;
+    name: string;
+    pid: number;
+    proess: string;
+    shellPath?: string;
+}
+export declare const ITerminalServiceClient: unique symbol;
 export interface ITerminalServiceClient {
-    create(id: string, rows: number, cols: number, options: TerminalOptions): Promise<{
-        pid: number;
-        name: string;
-    }> | {
-        pid: number;
-        name: string;
-    };
+    create2(id: string, launchConfig: IShellLaunchConfig): Promise<INodePtyInstance | undefined>;
     onMessage(id: string, msg: string): void;
-    resize(id: string, rows: number, cols: number): any;
-    disposeById(id: string): any;
+    resize(id: string, rows: number, cols: number): void;
+    disposeById(id: string): void;
     getProcessId(id: string): number;
-    clientMessage(id: any, data: any): any;
-    closeClient(id: string, code?: number, signal?: number): void;
-    setConnectionClientId(clientId: string): any;
-    dispose(): any;
+    clientMessage(id: string, data: any): void;
+    closeClient(sessionId: string, data?: ITerminalError | {
+        code?: number;
+        signal?: number;
+    } | number, signal?: number): void;
+    setConnectionClientId(clientId: string): void;
+    dispose(): void;
     getShellName(id: string): string;
     ensureTerminal(terminalIdArr: string[]): boolean;
     $resolveWindowsShellPath(type: WindowsShellType): Promise<string | undefined>;
+    $resolveUnixShellPath(type: string): Promise<string | undefined>;
+    $resolvePotentialUnixShellPath(): Promise<string | undefined>;
+    $resolvePotentialWindowsShellPath(): Promise<{
+        path: string;
+        type: WindowsShellType;
+    }>;
+    $resolveShellPath(paths: string[]): Promise<string | undefined>;
 }
 export interface ITerminalInfo {
     id: string;
     name: string;
     isActive: boolean;
 }
+export declare const IExternlTerminalService: unique symbol;
 /**
  * 使用依赖注入的方式复写这个类型，
  * 支持更多形式的 termial 实现。
@@ -209,4 +231,39 @@ export interface IExternlTerminalService {
      */
     getProcessId(id: string): Promise<number>;
 }
+export interface IShellLaunchConfig {
+    shellPath?: string;
+    args?: string[];
+    os?: OperatingSystem;
+    /**
+     * Whether the terminal process environment should be exactly as provided in
+     * `TerminalOptions.env`. When this is false (default), the environment will be based on the
+     * window's environment and also apply configured platform settings like
+     * `terminal.integrated.windows.env` on top. When this is true, the complete environment
+     * must be provided as nothing will be inherited from the process or any configuration.
+     */
+    strictEnv?: boolean;
+    /**
+     * Name of the terminal to be set in environment ($TERM variable).
+     */
+    name?: string;
+    /**
+     * Number of intial cols of the pty.
+     */
+    cols: number;
+    /**
+     * Number of initial rows of the pty.
+     */
+    rows: number;
+    /**
+     * Working directory to be set for the child program.
+     */
+    cwd?: string | Uri;
+    /**
+     * Environment to be set for the child program.
+     */
+    env?: {
+        [key: string]: string | null;
+    };
+}
 //# sourceMappingURL=pty.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,MAAM,WAAW,IAAK,SAAQ,QAAQ;IACpC;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,kBAAkB,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC;;;;;;;;OAQG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnD;;;;OAIG;IACH,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEpC;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IAEb,QAAQ,EAAE,OAAO,CAAC;IAElB,EAAE,EAAE,MAAM,CAAC;IAEX,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAEzC,wBAAwB,QAAG;IAE3B,OAAO,CAAC,IAAI,EAAE,MAAM,OAAE;IAEtB,YAAY,CAAC,EAAE,EAAE,MAAM,OAAE;IAEzB;;OAEG;IACH,OAAO,IAAI,IAAI,CAAC;IAEhB,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB;;OAEG;IACH,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAEvC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,GAAG;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAE,GAAG,MAAM,CAAC,SAAS,CAAC;IAE9D;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAE1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AAED,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;IAC5E,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAE;IAC/C,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,IAAI,IAAI,CAAC;IAChB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAClE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;CAC1E;AAED,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,MAAM,WAAW,uBAAuB;IACtC,MAAM,IAAI,OAAO,CAAC;SAAG,GAAG,IAAI,MAAM,GAAG,MAAM,GAAG,SAAS;KAAE,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAC7F,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACrD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,KAAA,GAAG,IAAI,CAAC;IACtC,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EACD,cAAc,GACd;QACE,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACD,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAAC;IACR,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,OAAO,IAAI,IAAI,CAAC;IAChB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACjD,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9E,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjE,8BAA8B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,iCAAiC,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;IACvF,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAGD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/G;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/D;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACrD;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;;;OAIG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3C;AAGD,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhB,EAAE,CAAC,EAAE,eAAe,CAAC;IAErB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAEnB;;OAEG;IACH,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACxC"}

package/lib/common/pty.js

@@ -4,7 +4,8 @@ exports.IExternlTerminalService = exports.ITerminalServiceClient = exports.ITerm
 exports.ITerminalServicePath = 'ITerminalServicePath';
 exports.ITerminalProcessPath = 'ITerminalProcessPath';
 exports.ITerminalNodeService = Symbol('ITerminalNodeService');
-exports.ITerminalProcessService = Symbol('ITerminalProcessServices');
+exports.ITerminalProcessService = Symbol('ITerminalProcessService');
 exports.ITerminalServiceClient = Symbol('ITerminalServiceClient');
+// 搜了一下代码，在 OpenSumi 里已经没有地方引用了
 exports.IExternlTerminalService = Symbol('IExternlTerminalService');
 //# sourceMappingURL=pty.js.map

package/lib/common/pty.js.map

@@ -1 +1 @@
-{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":";;;AAKa,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAE9C,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AACtD,QAAA,uBAAuB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAC7D,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC1D,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/common/pty.ts"],"names":[],"mappings":";;;AAiBa,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AA4I9C,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AActD,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAa5D,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAoCvE,+BAA+B;AAClB,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}

package/lib/common/service.d.ts

@@ -73,7 +73,7 @@ export interface ITerminalService {
      *
      * @param sessionid
      */
-    onExit(handler: (sessionid: IPtyExitEvent) => void): IDisposable;
+    onExit(handler: (event: IPtyExitEvent) => void): IDisposable;
     /**
      * 返回终端环境的 OS
      */

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/common/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,iBAAiB,CAAC,IAAI,MAAM,CAAC;IAC7B;;;OAGG;IACH,UAAU,CAAC,IAAI,gBAAgB,CAAC;IAChC;;;;;OAKG;IACH,KAAK,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C;;;;;;;;OAQG;IACH,MAAM,CACJ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,EACzB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7D;;;;OAIG;IACH,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,WAAW,CAAC;IAC/D;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,aAAa,KAAK,IAAI,GAAG,WAAW,CAAC;IACjE;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,WAAW,wBAAyB,SAAQ,gBAAgB;IAChE,iBAAiB,IAAI,MAAM,CAAC;IAC5B,UAAU,IAAI,gBAAgB,CAAC;IAC/B,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/C"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/common/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,iBAAiB,CAAC,IAAI,MAAM,CAAC;IAC7B;;;OAGG;IACH,UAAU,CAAC,IAAI,gBAAgB,CAAC;IAChC;;;;;OAKG;IACH,KAAK,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C;;;;;;;;OAQG;IACH,MAAM,CACJ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,EACzB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD;;;;;OAKG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7D;;;;OAIG;IACH,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,WAAW,CAAC;IAC/D;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAAG,WAAW,CAAC;IAC7D;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,WAAW,wBAAyB,SAAQ,gBAAgB;IAChE,iBAAiB,IAAI,MAAM,CAAC;IAC5B,UAAU,IAAI,gBAAgB,CAAC;IAC/B,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/C"}

package/lib/common/shell.d.ts

@@ -7,4 +7,5 @@ export declare enum WindowsShellType {
     'powershell' = "powershell",
     'git-bash' = "git-bash"
 }
+export declare type ShellType = WindowsShellType | 'default' | string;
 //# sourceMappingURL=shell.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B;;;CAG3C,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,KAAK,QAAQ;IACb,YAAY,eAAe;IAC3B,UAAU,aAAa;CACxB"}
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B;;;CAG3C,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,KAAK,QAAQ;IACb,YAAY,eAAe;IAC3B,UAAU,aAAa;CACxB;AAED,oBAAY,SAAS,GAAG,gBAAgB,GAAG,SAAS,GAAG,MAAM,CAAC"}

package/lib/common/shell.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WindowsShellType = exports.WINDOWS_DEFAULT_SHELL_PATH_MAPS = void 0;
 exports.WINDOWS_DEFAULT_SHELL_PATH_MAPS = {
-    ['powershell']: 'powershell.exe',
-    ['cmd']: 'cmd.exe',
+    powershell: 'powershell.exe',
+    cmd: 'cmd.exe',
 };
 var WindowsShellType;
 (function (WindowsShellType) {

package/lib/common/shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAAG;IAC7C,CAAC,YAAY,CAAC,EAAE,gBAAgB;IAChC,CAAC,KAAK,CAAC,EAAE,SAAS;CACnB,CAAC;AAEF,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+BAAa,CAAA;IACb,6CAA2B,CAAA;IAC3B,yCAAuB,CAAA;AACzB,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAAG;IAC7C,UAAU,EAAE,gBAAgB;IAC5B,GAAG,EAAE,SAAS;CACf,CAAC;AAEF,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+BAAa,CAAA;IACb,6CAA2B,CAAA;IAC3B,yCAAuB,CAAA;AACzB,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B"}

package/lib/common/utils.d.ts

@@ -1,4 +1,4 @@
 export declare const userActionViewUuid: () => string;
 export declare const apiActionViewUuid: () => string;
-export declare const generate: () => string;
+export declare const generateSessionId: () => string;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,cAAsC,CAAC;AAEtE,eAAO,MAAM,iBAAiB,cAAuC,CAAC;AAEtE,eAAO,MAAM,QAAQ,cAAe,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,cAAsC,CAAC;AAEtE,eAAO,MAAM,iBAAiB,cAAuC,CAAC;AAEtE,eAAO,MAAM,iBAAiB,cAAe,CAAC"}

package/lib/common/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = exports.apiActionViewUuid = exports.userActionViewUuid = void 0;
+exports.generateSessionId = exports.apiActionViewUuid = exports.userActionViewUuid = void 0;
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 let i = 0;
 function count() {
@@ -10,6 +10,6 @@ const userActionViewUuid = () => `UI_View_${(0, ide_core_common_1.uuid)()}${coun
 exports.userActionViewUuid = userActionViewUuid;
 const apiActionViewUuid = () => `API_View_${(0, ide_core_common_1.uuid)()}${count()}`;
 exports.apiActionViewUuid = apiActionViewUuid;
-const generate = () => (0, ide_core_common_1.uuid)();
-exports.generate = generate;
+const generateSessionId = () => (0, ide_core_common_1.uuid)();
+exports.generateSessionId = generateSessionId;
 //# sourceMappingURL=utils.js.map

package/lib/common/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,+DAAiD;AAEjD,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,SAAS,KAAK;IACZ,OAAO,CAAC,EAAE,CAAC;AACb,CAAC;AAEM,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,WAAW,IAAA,sBAAI,GAAE,GAAG,KAAK,EAAE,EAAE,CAAC;AAAzD,QAAA,kBAAkB,sBAAuC;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,YAAY,IAAA,sBAAI,GAAE,GAAG,KAAK,EAAE,EAAE,CAAC;AAAzD,QAAA,iBAAiB,qBAAwC;AAE/D,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAI,GAAE,CAAC;AAAxB,QAAA,QAAQ,YAAgB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,+DAAiD;AAEjD,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,SAAS,KAAK;IACZ,OAAO,CAAC,EAAE,CAAC;AACb,CAAC;AAEM,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,WAAW,IAAA,sBAAI,GAAE,GAAG,KAAK,EAAE,EAAE,CAAC;AAAzD,QAAA,kBAAkB,sBAAuC;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,YAAY,IAAA,sBAAI,GAAE,GAAG,KAAK,EAAE,EAAE,CAAC;AAAzD,QAAA,iBAAiB,qBAAwC;AAE/D,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAI,GAAE,CAAC;AAAjC,QAAA,iBAAiB,qBAAgB"}

package/lib/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAYrD,qBACa,qBAAsB,SAAQ,UAAU;IACnD,SAAS,EAAE,QAAQ,EAAE,CAanB;IAEF,YAAY;;;QASV;CACH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAarD,qBACa,qBAAsB,SAAQ,UAAU;IACnD,SAAS,EAAE,QAAQ,EAAE,CAiBnB;IAEF,YAAY;;;QASV;CACH"}

package/lib/node/index.js

@@ -8,6 +8,7 @@ const terminal_service_1 = require("./terminal.service");
 const terminal_service_client_1 = require("./terminal.service.client");
 const common_1 = require("../common");
 const terminal_process_service_1 = require("./terminal-process.service");
+const pty_1 = require("./pty");
 let TerminalNodePtyModule = class TerminalNodePtyModule extends ide_core_node_1.NodeModule {
     constructor() {
         super(...arguments);
@@ -24,6 +25,10 @@ let TerminalNodePtyModule = class TerminalNodePtyModule extends ide_core_node_1.
                 token: common_1.ITerminalProcessService,
                 useClass: terminal_process_service_1.TerminalProcessServiceImpl,
             },
+            {
+                token: pty_1.IPtyService,
+                useClass: pty_1.PtyService,
+            },
         ];
         this.backServices = [
             {

package/lib/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,2DAAqD;AACrD,yDAAyD;AACzD,uEAAsE;AACtE,sCAMmB;AACnB,yEAAwE;AAGxE,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,0BAAU;IAArD;;QACE,cAAS,GAAe;YACtB;gBACE,KAAK,EAAE,6BAAoB;gBAC3B,QAAQ,EAAE,sCAAmB;aAC9B;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,QAAQ,EAAE,mDAAyB;aACpC;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,QAAQ,EAAE,qDAA0B;aACrC;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,6BAAoB;gBACjC,KAAK,EAAE,+BAAsB;aAC9B;YACD;gBACE,WAAW,EAAE,6BAAoB;gBACjC,KAAK,EAAE,gCAAuB;aAC/B;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AA1BY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA0BjC;AA1BY,sDAAqB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,2DAAqD;AACrD,yDAAyD;AACzD,uEAAsE;AACtE,sCAMmB;AACnB,yEAAwE;AACxE,+BAAgD;AAGhD,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,0BAAU;IAArD;;QACE,cAAS,GAAe;YACtB;gBACE,KAAK,EAAE,6BAAoB;gBAC3B,QAAQ,EAAE,sCAAmB;aAC9B;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,QAAQ,EAAE,mDAAyB;aACpC;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,QAAQ,EAAE,qDAA0B;aACrC;YACD;gBACE,KAAK,EAAE,iBAAW;gBAClB,QAAQ,EAAE,gBAAU;aACrB;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,6BAAoB;gBACjC,KAAK,EAAE,+BAAsB;aAC9B;YACD;gBACE,WAAW,EAAE,6BAAoB;gBACjC,KAAK,EAAE,gCAAuB;aAC/B;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AA9BY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CA8BjC;AA9BY,sDAAqB"}

package/lib/node/pty.d.ts

@@ -1,11 +1,19 @@
 import * as pty from 'node-pty';
-import { TerminalOptions } from '../common';
+import { IShellLaunchConfig } from '../common';
+import { IPty } from '../common/pty';
+import { IProcessEnvironment } from '@opensumi/ide-core-common/lib/platform';
 export { pty };
-export interface IPty extends pty.IPty {
-    bin: string;
-}
+export declare const IPtyService: unique symbol;
 export declare class PtyService {
-    create(rows: number, cols: number, options: TerminalOptions): Promise<IPty>;
+    private readonly logger;
+    _validateCwd(cwd: string): Promise<{
+        message: string;
+    } | undefined>;
+    _validateExecutable(options: IShellLaunchConfig, ptyEnv: IProcessEnvironment, cwd: string): Promise<{
+        message: string;
+    } | undefined>;
+    create2(options: IShellLaunchConfig): Promise<IPty>;
+    parseCwd(options: IShellLaunchConfig): string;
     resize(termninal: pty.IPty, rows: number, cols: number): boolean;
 }
 //# sourceMappingURL=pty.d.ts.map

package/lib/node/pty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,MAAM,WAAW,IAAK,SAAQ,GAAG,CAAC,IAAI;IACpC,GAAG,EAAE,MAAM,CAAC;CACb;AAID,qBAAa,UAAU;IACf,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CjF,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CASvD"}
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAOrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,qBACa,UAAU;IAErB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAE/B,YAAY,CAAC,GAAG,EAAE,MAAM;;;IAoBxB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM;;;IA+BzF,OAAO,CAAC,OAAO,EAAE,kBAAkB;IAyDzC,QAAQ,CAAC,OAAO,EAAE,kBAAkB;IAOpC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CASvD"}

package/lib/node/pty.js

@@ -1,17 +1,76 @@
 "use strict";
+/* ---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PtyService = exports.pty = void 0;
+exports.PtyService = exports.IPtyService = exports.pty = void 0;
 const tslib_1 = require("tslib");
-const os_1 = (0, tslib_1.__importDefault)(require("os"));
+// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.63.0/src/vs/platform/terminal/node/terminalProcess.ts
 const pty = (0, tslib_1.__importStar)(require("node-pty"));
 exports.pty = pty;
 const osLocale = (0, tslib_1.__importStar)(require("os-locale"));
+const os_1 = (0, tslib_1.__importDefault)(require("os"));
 const lodash_omit_1 = (0, tslib_1.__importDefault)(require("lodash.omit"));
+const shell_1 = require("./shell");
 const shell_path_1 = require("@opensumi/ide-core-node/lib/bootstrap/shell-path");
-const defaultWindowsType = 'powershell.exe';
-class PtyService {
-    async create(rows, cols, options) {
-        const bin = options.shellPath || (os_1.default.platform() === 'win32' ? defaultWindowsType : process.env['SHELL'] || '/bin/sh');
+const ide_core_node_1 = require("@opensumi/ide-core-node");
+const di_1 = require("@opensumi/di");
+const fs_1 = require("fs");
+const path = (0, tslib_1.__importStar)(require("@opensumi/ide-core-common/lib/path"));
+exports.IPtyService = Symbol('IPtyService');
+let PtyService = class PtyService {
+    async _validateCwd(cwd) {
+        if (cwd) {
+            try {
+                const result = await fs_1.promises.stat(cwd);
+                if (!result.isDirectory()) {
+                    return {
+                        message: `Starting directory (cwd) "${cwd}" is not a directory`,
+                    };
+                }
+            }
+            catch (err) {
+                if ((err === null || err === void 0 ? void 0 : err.code) === 'ENOENT') {
+                    return {
+                        message: `Starting directory (cwd) "${cwd}" does not exist`,
+                    };
+                }
+            }
+        }
+        return undefined;
+    }
+    async _validateExecutable(options, ptyEnv, cwd) {
+        if (!options.shellPath) {
+            return {
+                message: 'IShellLaunchConfig.shellPath not set',
+            };
+        }
+        try {
+            const result = await fs_1.promises.stat(options.shellPath);
+            if (!result.isFile() && !result.isSymbolicLink()) {
+                return {
+                    message: `Path to shell executable "${options.shellPath}" is not a file or a symlink`,
+                };
+            }
+        }
+        catch (err) {
+            if ((err === null || err === void 0 ? void 0 : err.code) === 'ENOENT') {
+                // The executable isn't an absolute path, try find it on the PATH or CWD
+                const envPaths = options.env && options.env.PATH ? options.env.PATH.split(path.delimiter) : undefined;
+                const executable = await (0, shell_1.findExecutable)(options.shellPath, cwd, envPaths, ptyEnv);
+                if (!executable) {
+                    return {
+                        message: `Path to shell executable "${options.shellPath}" does not exist`,
+                    };
+                }
+                // Set the shellPath explicitly here so that node-pty doesn't need to search the
+                // $PATH too.
+                options.shellPath = executable;
+            }
+        }
+    }
+    async create2(options) {
         const locale = osLocale.sync();
         let ptyEnv;
         if (options.strictEnv) {
@@ -38,16 +97,33 @@ class PtyService {
                 PATH: await (0, shell_path_1.getShellPath)(),
             }, options.env);
         }
-        const ptyProcess = pty.spawn(bin, options.shellArgs || [], {
-            name: 'xterm-256color',
-            cols: cols || 100,
-            rows: rows || 30,
-            cwd: options.cwd ? options.cwd.toString() : '',
+        const cwd = this.parseCwd(options);
+        const results = await Promise.all([this._validateCwd(cwd), this._validateExecutable(options, ptyEnv, cwd)]);
+        const firstError = results.find((r) => r !== undefined);
+        if (firstError) {
+            this.logger.error(`validate shell launch config failed: ${firstError.message}`);
+            throw new Error(firstError.message);
+        }
+        // above code will validate shellPath and throw if it doesn't exist
+        const ptyProcess = pty.spawn(options.shellPath, options.args || [], {
+            name: options.name || 'xterm-256color',
+            cols: options.cols || 100,
+            rows: options.rows || 30,
+            cwd,
             env: ptyEnv,
         });
-        ptyProcess.bin = bin;
+        ptyProcess.bin = options.shellPath;
+        ptyProcess.launchConfig = options;
+        const match = options.shellPath.match(/[\w|.]+$/);
+        ptyProcess.parsedName = match ? match[0] : 'sh';
         return ptyProcess;
     }
+    parseCwd(options) {
+        if (options.cwd) {
+            return typeof options.cwd === 'string' ? options.cwd : options.cwd.fsPath;
+        }
+        return os_1.default.homedir();
+    }
     resize(termninal, rows, cols) {
         try {
             termninal.resize(cols, rows);
@@ -57,6 +133,13 @@ class PtyService {
         }
         return true;
     }
-}
+};
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(ide_core_node_1.INodeLogger),
+    (0, tslib_1.__metadata)("design:type", Object)
+], PtyService.prototype, "logger", void 0);
+PtyService = (0, tslib_1.__decorate)([
+    (0, di_1.Injectable)()
+], PtyService);
 exports.PtyService = PtyService;
 //# sourceMappingURL=pty.js.map

package/lib/node/pty.js.map

@@ -1 +1 @@
-{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":";;;;AAAA,yDAAoB;AACpB,2DAAgC;AAMvB,kBAAG;AALZ,iEAAsC;AACtC,2EAA+B;AAE/B,iFAAgF;AAQhF,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,MAAa,UAAU;IACrB,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,IAAY,EAAE,OAAwB;QAC/D,MAAM,GAAG,GACP,OAAO,CAAC,SAAS,IAAI,CAAC,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC;QAC5G,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,MAAiC,CAAC;QAEtC,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,GAAG,OAAO,CAAC,GAAgC,CAAC;SACnD;aAAM;YACL,MAAM,GAAG,MAAM,CAAC,MAAM,CACpB,EAAE,EACF,IAAA,qBAAI,EAAC,OAAO,CAAC,GAAG,EAAE;gBAChB,YAAY;gBACZ,sBAAsB;gBACtB,eAAe;gBACf,eAAe;gBACf,uBAAuB;gBACvB,mBAAmB;gBACnB,sBAAsB;aACvB,CAAC,EACF;gBACE,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ;gBAC3C,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ;gBACzC;;;;;mBAKG;gBACH,IAAI,EAAE,MAAM,IAAA,yBAAY,GAAE;aAC3B,EACD,OAAO,CAAC,GAAG,CACiB,CAAC;SAChC;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE,EAAE;YACzD,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,IAAI,IAAI,GAAG;YACjB,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;YAC/C,GAAG,EAAE,MAAM;SACZ,CAAC,CAAC;QACF,UAAkB,CAAC,GAAG,GAAG,GAAG,CAAC;QAC9B,OAAO,UAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,SAAmB,EAAE,IAAY,EAAE,IAAY;QACpD,IAAI;YACF,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAxDD,gCAwDC"}
+{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"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"}

package/lib/node/shell.d.ts

@@ -1,3 +1,11 @@
+import { IProcessEnvironment } from '@opensumi/ide-core-common/lib/platform';
 export declare const WINDOWS_GIT_BASH_PATHS: string[];
+export declare const exists: (p: string) => Promise<string | undefined>;
+export declare function findShellExecutableAsync(candidate: string[]): Promise<string | undefined>;
+/**
+ * @deprecated use findShellExecutableAsync
+ */
 export declare function findShellExecutable(candidate: string[]): string | undefined;
+export declare function getCaseInsensitive(target: Record<string, any>, key: string): any;
+export declare function findExecutable(command: string, cwd?: string, paths?: string[], env?: IProcessEnvironment): Promise<string | undefined>;
 //# sourceMappingURL=shell.d.ts.map

package/lib/node/shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E"}
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/node/shell.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAQ7E,eAAO,MAAM,sBAAsB,UAQlC,CAAC;AAEF,eAAO,MAAM,MAAM,MAAa,MAAM,gCAOrC,CAAC;AAEF,wBAAsB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM/F;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAIhF;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,GAAG,GAAE,mBAAwD,GAC5D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmD7B"}

package/lib/node/shell.js

@@ -1,9 +1,18 @@
 "use strict";
+/* ---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findShellExecutable = exports.WINDOWS_GIT_BASH_PATHS = void 0;
+exports.findExecutable = exports.getCaseInsensitive = exports.findShellExecutable = exports.findShellExecutableAsync = exports.exists = exports.WINDOWS_GIT_BASH_PATHS = void 0;
 const tslib_1 = require("tslib");
+// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.63.0/src/vs/platform/terminal/node/terminalEnvironment.ts
 const ide_core_common_1 = require("@opensumi/ide-core-common");
+const path = (0, tslib_1.__importStar)(require("@opensumi/ide-core-common/lib/path"));
+const ide_core_node_1 = require("@opensumi/ide-core-node");
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+// TODO: 用户装在 D 盘的不就识别不对了
+// 要增加一些查找方法，此处需要参考 V 老师的进行改进
 exports.WINDOWS_GIT_BASH_PATHS = [
     `${process.env['ProgramW6432']}\\Git\\bin\\bash.exe`,
     `${process.env['ProgramW6432']}\\Git\\usr\\bin\\bash.exe`,
@@ -13,6 +22,27 @@ exports.WINDOWS_GIT_BASH_PATHS = [
     `${process.env['UserProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`,
     `${process.env['AllUsersProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`,
 ];
+const exists = async (p) => {
+    try {
+        await fs_1.default.promises.access((0, ide_core_common_1.normalize)(p));
+        return p;
+    }
+    catch (_a) {
+        return;
+    }
+};
+exports.exists = exists;
+async function findShellExecutableAsync(candidate) {
+    if (candidate.length === 0) {
+        return undefined;
+    }
+    // return the first exists one
+    return Promise.all(candidate.map((v) => findExecutable(v))).then((v) => v.find(Boolean));
+}
+exports.findShellExecutableAsync = findShellExecutableAsync;
+/**
+ * @deprecated use findShellExecutableAsync
+ */
 function findShellExecutable(candidate) {
     if (candidate.length === 0) {
         return undefined;
@@ -25,4 +55,63 @@ function findShellExecutable(candidate) {
     }
 }
 exports.findShellExecutable = findShellExecutable;
+function getCaseInsensitive(target, key) {
+    const lowercaseKey = key.toLowerCase();
+    const equivalentKey = Object.keys(target).find((k) => k.toLowerCase() === lowercaseKey);
+    return equivalentKey ? target[equivalentKey] : target[key];
+}
+exports.getCaseInsensitive = getCaseInsensitive;
+async function findExecutable(command, cwd, paths, env = process.env) {
+    // If we have an absolute path then we take it.
+    if (path.isAbsolute(command)) {
+        return (await (0, exports.exists)(command)) ? command : undefined;
+    }
+    if (cwd === undefined) {
+        cwd = process.cwd();
+    }
+    const dir = path.dirname(command);
+    if (dir !== '.') {
+        // We have a directory and the directory is relative (see above). Make the path absolute
+        // to the current working directory.
+        const fullPath = path.join(cwd, command);
+        return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
+    }
+    const envPath = getCaseInsensitive(env, 'PATH');
+    if (paths === undefined && typeof envPath === 'string') {
+        paths = envPath.split(path.delimiter);
+    }
+    // No PATH environment. Make path absolute to the cwd.
+    if (paths === undefined || paths.length === 0) {
+        const fullPath = path.join(cwd, command);
+        return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
+    }
+    // We have a simple file name. We get the path variable from the env
+    // and try to find the executable on the path.
+    for (let pathEntry of paths) {
+        // The path entry is absolute.
+        let fullPath;
+        if (path.isAbsolute(pathEntry)) {
+            fullPath = path.join(pathEntry, command);
+        }
+        else {
+            fullPath = path.join(cwd, pathEntry, command);
+        }
+        if (await (0, exports.exists)(fullPath)) {
+            return fullPath;
+        }
+        if (ide_core_node_1.isWindows) {
+            let withExtension = fullPath + '.com';
+            if (await (0, exports.exists)(withExtension)) {
+                return withExtension;
+            }
+            withExtension = fullPath + '.exe';
+            if (await (0, exports.exists)(withExtension)) {
+                return withExtension;
+            }
+        }
+    }
+    const fullPath = path.join(cwd, command);
+    return (await (0, exports.exists)(fullPath)) ? fullPath : undefined;
+}
+exports.findExecutable = findExecutable;
 //# sourceMappingURL=shell.js.map