codify-plugin-test 0.0.51 → 0.0.53-beta1

package/dist/plugin-process.d.ts

@@ -9,5 +9,5 @@ export declare class PluginProcess {
     apply(data: ApplyRequestData): Promise<void>;
     import(data: ImportRequestData): Promise<ImportResponseData>;
     kill(): void;
-    private handleSudoRequests;
+    private handleIncomingRequests;
 }

package/dist/plugin-process.js

@@ -1,14 +1,17 @@
 import Ajv from 'ajv';
-import { IpcMessageSchema, MessageCmd, SpawnStatus, SudoRequestDataSchema } from 'codify-schemas';
+import { CommandRequestDataSchema, IpcMessageSchema, MessageCmd } from 'codify-schemas';
 import { nanoid } from 'nanoid';
-import { fork, spawn } from 'node:child_process';
+import { fork } from 'node:child_process';
+import fs from 'node:fs/promises';
+import * as os from 'node:os';
 import path from 'node:path';
+import { spawnSafe } from './spawn.js';
 import { CodifyTestUtils } from './test-utils.js';
 const ajv = new Ajv.default({
     strict: true
 });
 const ipcMessageValidator = ajv.compile(IpcMessageSchema);
-const sudoRequestValidator = ajv.compile(SudoRequestDataSchema);
+const commandRequestValidator = ajv.compile(CommandRequestDataSchema);
 export class PluginProcess {
     childProcess;
     constructor(pluginPath) {
@@ -23,7 +26,7 @@ export class PluginProcess {
         });
         this.childProcess.stderr?.pipe(process.stderr);
         this.childProcess.stdout?.pipe(process.stdout);
-        this.handleSudoRequests(this.childProcess);
+        this.handleIncomingRequests(this.childProcess);
     }
     async initialize() {
         return CodifyTestUtils.sendMessageAndAwaitResponse(this.childProcess, {
@@ -63,53 +66,52 @@ export class PluginProcess {
     kill() {
         this.childProcess.kill();
     }
-    handleSudoRequests(process) {
+    handleIncomingRequests(process) {
         process.on('message', async (message) => {
             if (!ipcMessageValidator(message)) {
                 throw new Error(`Invalid message from plugin. ${JSON.stringify(message, null, 2)}`);
             }
-            if (message.cmd === MessageCmd.SUDO_REQUEST) {
+            if (message.cmd === MessageCmd.COMMAND_REQUEST) {
                 const { data, requestId } = message;
-                if (!sudoRequestValidator(data)) {
-                    throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(sudoRequestValidator.errors, null, 2)}`);
+                if (!commandRequestValidator(data)) {
+                    throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(commandRequestValidator.errors, null, 2)}`);
                 }
                 const { command, options } = data;
-                const result = await sudoSpawn(command, options);
+                const result = await spawnSafe(command, options);
                 process.send({
-                    cmd: MessageCmd.SUDO_REQUEST + '_Response',
+                    cmd: MessageCmd.COMMAND_REQUEST + '_Response',
                     data: result,
                     requestId,
                 });
             }
+            if (message.cmd === MessageCmd.PRESS_KEY_TO_CONTINUE_REQUEST) {
+                const { data, requestId } = message;
+                if (!commandRequestValidator(data)) {
+                    throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(commandRequestValidator.errors, null, 2)}`);
+                }
+                process.send({
+                    cmd: MessageCmd.PRESS_KEY_TO_CONTINUE_REQUEST + '_Response',
+                    data: {},
+                    requestId,
+                });
+            }
+            if (message.cmd === MessageCmd.CODIFY_CREDENTIALS_REQUEST) {
+                const { requestId } = message;
+                const loginJson = await fs.readFile(path.join(os.homedir(), '.codify', 'credentials.json'), 'utf8');
+                if (!loginJson) {
+                    throw new Error('Unable to get login credentials');
+                }
+                const login = JSON.parse(loginJson);
+                if (!login) {
+                    throw new Error('Unable to parse login credentials');
+                }
+                process.send({
+                    cmd: MessageCmd.CODIFY_CREDENTIALS_REQUEST + '_Response',
+                    data: login.accessToken,
+                    requestId,
+                });
+            }
         });
     }
 }
-async function sudoSpawn(cmd, opts) {
-    return new Promise((resolve) => {
-        const output = [];
-        const _cmd = `sudo ${cmd}`;
-        const _process = spawn(`source ~/.zshrc; ${_cmd}`, [], {
-            ...opts,
-            shell: 'zsh',
-            stdio: ['ignore', 'pipe', 'pipe'],
-        });
-        const { stderr, stdout } = _process;
-        stdout.setEncoding('utf8');
-        stderr.setEncoding('utf8');
-        stdout.on('data', (data) => {
-            output.push(data.toString());
-        });
-        stderr.on('data', (data) => {
-            output.push(data.toString());
-        });
-        stdout.pipe(process.stdout);
-        stderr.pipe(process.stderr);
-        _process.on('close', (code) => {
-            resolve({
-                data: output.join(''),
-                status: code === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
-            });
-        });
-    });
-}
 //# sourceMappingURL=plugin-process.js.map

package/dist/plugin-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-process.js","sourceRoot":"","sources":["../src/plugin-process.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-process.js","sourceRoot":"","sources":["../src/plugin-process.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAGL,wBAAwB,EAIxB,gBAAgB,EAEhB,UAAU,EAKX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAgB,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC;IAC1B,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC1D,MAAM,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEtE,MAAM,OAAO,aAAa;IACxB,YAAY,CAAc;IAO1B,YAAY,UAAkB;QAC5B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhE,IAAI,CAAC,YAAY,GAAG,IAAI,CACtB,UAAU,EACV,EAAE,EACF;YAGE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;YACvB,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;YAC3C,KAAK,EAAE,MAAM;SACd,CACF,CAAA;QAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE/C,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE;YACpE,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE;YAC3B,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAyB;QACtC,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE;YACpE,GAAG,EAAE,UAAU;YACf,IAAI;YACJ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAqB;QAC9B,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE;YACpE,GAAG,EAAE,MAAM;YACX,IAAI;YACJ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAsB;QAChC,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE;YACpE,GAAG,EAAE,OAAO;YACZ,IAAI;YACJ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAuB;QAClC,OAAO,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,EAAE;YACpE,GAAG,EAAE,QAAQ;YACb,IAAI;YACJ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;IAED,IAAI;QACF,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,sBAAsB,CAAC,OAAqB;QAElD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACtC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACtF,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/C,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;gBACpC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClH,CAAC;gBAED,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAqC,CAAC;gBACnE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEjD,OAAO,CAAC,IAAI,CAAe;oBACzB,GAAG,EAAE,UAAU,CAAC,eAAe,GAAG,WAAW;oBAC7C,IAAI,EAAE,MAAM;oBACZ,SAAS;iBACV,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,6BAA6B,EAAE,CAAC;gBAC7D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;gBACpC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClH,CAAC;gBAED,OAAO,CAAC,IAAI,CAAe;oBACzB,GAAG,EAAE,UAAU,CAAC,6BAA6B,GAAG,WAAW;oBAC3D,IAAI,EAAE,EAAE;oBACR,SAAS;iBACV,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,KAAK,UAAU,CAAC,0BAA0B,EAAE,CAAC;gBAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;gBAE9B,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;gBACpG,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;gBACpD,CAAC;gBAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACpC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;gBACtD,CAAC;gBAED,OAAO,CAAC,IAAI,CAAe;oBACzB,GAAG,EAAE,UAAU,CAAC,0BAA0B,GAAG,WAAW;oBACxD,IAAI,EAAE,KAAK,CAAC,WAAW;oBACvB,SAAS;iBACV,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CAEF"}

package/dist/shell.d.ts

@@ -0,0 +1,12 @@
+export declare enum Shell {
+    ZSH = "zsh",
+    BASH = "bash",
+    SH = "sh",
+    KSH = "ksh",
+    CSH = "csh",
+    FISH = "fish"
+}
+export declare const ShellUtils: {
+    getShell(): Shell | undefined;
+    getDefaultShell(): string;
+};

package/dist/shell.js

@@ -0,0 +1,37 @@
+export var Shell;
+(function (Shell) {
+    Shell["ZSH"] = "zsh";
+    Shell["BASH"] = "bash";
+    Shell["SH"] = "sh";
+    Shell["KSH"] = "ksh";
+    Shell["CSH"] = "csh";
+    Shell["FISH"] = "fish";
+})(Shell || (Shell = {}));
+export const ShellUtils = {
+    getShell() {
+        const shell = process.env.SHELL || '';
+        if (shell.endsWith('bash')) {
+            return Shell.BASH;
+        }
+        if (shell.endsWith('zsh')) {
+            return Shell.ZSH;
+        }
+        if (shell.endsWith('sh')) {
+            return Shell.SH;
+        }
+        if (shell.endsWith('csh')) {
+            return Shell.CSH;
+        }
+        if (shell.endsWith('ksh')) {
+            return Shell.KSH;
+        }
+        if (shell.endsWith('fish')) {
+            return Shell.FISH;
+        }
+        return undefined;
+    },
+    getDefaultShell() {
+        return process.env.SHELL;
+    }
+};
+//# sourceMappingURL=shell.js.map

package/dist/shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,KAOX;AAPD,WAAY,KAAK;IACf,oBAAW,CAAA;IACX,sBAAa,CAAA;IACb,kBAAS,CAAA;IACT,oBAAW,CAAA;IACX,oBAAW,CAAA;IACX,sBAAa,CAAA;AACf,CAAC,EAPW,KAAK,KAAL,KAAK,QAOhB;AAGD,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ;QACN,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAEtC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,IAAI,CAAA;QACnB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,GAAG,CAAA;QAClB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,EAAE,CAAA;QACjB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,GAAG,CAAA;QAClB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,GAAG,CAAA;QAClB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,IAAI,CAAA;QACnB,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO,OAAO,CAAC,GAAG,CAAC,KAAM,CAAC;IAC5B,CAAC;CACF,CAAA"}

package/dist/spawn.d.ts

@@ -0,0 +1,14 @@
+import { SpawnStatus } from 'codify-schemas';
+export interface SpawnResult {
+    status: SpawnStatus;
+    exitCode: number;
+    data: string;
+}
+export interface SpawnOptions {
+    cwd?: string;
+    env?: Record<string, unknown>;
+    interactive?: boolean;
+    requiresRoot?: boolean;
+    stdin?: boolean;
+}
+export declare function spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult>;

package/dist/spawn.js

@@ -0,0 +1,58 @@
+import * as pty from '@homebridge/node-pty-prebuilt-multiarch';
+import { SpawnStatus } from 'codify-schemas';
+import stripAnsi from 'strip-ansi';
+import { Shell, ShellUtils } from './shell.js';
+export function spawnSafe(cmd, options) {
+    if (cmd.toLowerCase().includes('sudo')) {
+        throw new Error('Command must not include sudo');
+    }
+    process.stdout.write(`Running command: ${options?.requiresRoot ? 'sudo' : ''} ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''));
+    return new Promise((resolve) => {
+        const output = [];
+        const historyIgnore = ShellUtils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
+        const env = {
+            ...process.env, ...options?.env,
+            TERM_PROGRAM: 'codify',
+            COMMAND_MODE: 'unix2003',
+            COLORTERM: 'truecolor',
+            ...historyIgnore
+        };
+        const initialCols = process.stdout.columns ?? 80;
+        const initialRows = process.stdout.rows ?? 24;
+        const command = options?.requiresRoot ? `sudo ${cmd}` : cmd;
+        const args = options?.interactive ? ['-i', '-c', command] : ['-c', command];
+        const mPty = pty.spawn(ShellUtils.getDefaultShell(), args, {
+            ...options,
+            cols: initialCols,
+            rows: initialRows,
+            env
+        });
+        mPty.onData((data) => {
+            process.stdout.write(data);
+            output.push(data.toString());
+        });
+        const resizeListener = () => {
+            const { columns, rows } = process.stdout;
+            mPty.resize(columns, rows);
+        };
+        const stdinListener = (data) => {
+            mPty.write(data.toString());
+        };
+        process.stdout.on('resize', resizeListener);
+        if (options?.stdin) {
+            process.stdin.on('data', stdinListener);
+        }
+        mPty.onExit((result) => {
+            process.stdout.off('resize', resizeListener);
+            if (options?.stdin) {
+                process.stdin.off('data', stdinListener);
+            }
+            resolve({
+                status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
+                exitCode: result.exitCode,
+                data: stripAnsi(output.join('\n').trim()),
+            });
+        });
+    });
+}
+//# sourceMappingURL=spawn.js.map

package/dist/spawn.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-test",
-  "version": "0.0.51",
+  "version": "0.0.53-beta1",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -16,12 +16,14 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
-    "codify-schemas": "1.0.61",
+    "codify-schemas": "1.0.86-beta5",
     "lodash.matches": "^4.6.0",
     "lodash.differencewith": "4.5.0",
     "lodash.unionby": "^4.8.0",
     "nanoid": "^5.0.9",
-    "chalk": "^5.4.1"
+    "chalk": "^5.4.1",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
+    "strip-ansi": "^7.1.2"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
@@ -37,7 +39,7 @@
     "tsx": "^4.7.3",
     "typescript": "^5",
     "vitest": "^1.4.0",
-    "codify-plugin-lib": "1.0.171"
+    "codify-plugin-lib": "1.0.182-beta9"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/plugin-process.ts

@@ -1,18 +1,26 @@
 import Ajv from 'ajv';
 import {
-  ApplyRequestData, ImportRequestData, ImportResponseData,
+  ApplyRequestData,
+  CommandRequestData,
+  CommandRequestDataSchema,
+  ImportRequestData,
+  ImportResponseData,
   InitializeResponseData,
   IpcMessageSchema,
   IpcMessageV2,
-  MessageCmd, PlanRequestData, PlanResponseData,
-  SpawnStatus,
-  SudoRequestData,
-  SudoRequestDataSchema, ValidateRequestData, ValidateResponseData
+  MessageCmd,
+  PlanRequestData,
+  PlanResponseData,
+  ValidateRequestData,
+  ValidateResponseData
 } from 'codify-schemas';
 import { nanoid } from 'nanoid';
-import { ChildProcess, SpawnOptions, fork, spawn } from 'node:child_process';
+import { ChildProcess, fork } from 'node:child_process';
+import fs from 'node:fs/promises';
+import * as os from 'node:os';
 import path from 'node:path';
 
+import { spawnSafe } from './spawn.js';
 import { CodifyTestUtils } from './test-utils.js';
 
 const ajv = new Ajv.default({
@@ -20,7 +28,7 @@ const ajv = new Ajv.default({
 });
 
 const ipcMessageValidator = ajv.compile(IpcMessageSchema);
-const sudoRequestValidator = ajv.compile(SudoRequestDataSchema);
+const commandRequestValidator = ajv.compile(CommandRequestDataSchema);
 
 export class PluginProcess {
   childProcess: ChildProcess
@@ -52,7 +60,7 @@ export class PluginProcess {
     this.childProcess.stderr?.pipe(process.stderr);
     this.childProcess.stdout?.pipe(process.stdout);
 
-    this.handleSudoRequests(this.childProcess);
+    this.handleIncomingRequests(this.childProcess);
   }
 
   async initialize(): Promise<InitializeResponseData> {
@@ -99,85 +107,62 @@ export class PluginProcess {
     this.childProcess.kill();
   }
 
-  private handleSudoRequests(process: ChildProcess) {
+  private handleIncomingRequests(process: ChildProcess) {
     // Listen for incoming sudo incoming sudo requests
     process.on('message', async (message) => {
       if (!ipcMessageValidator(message)) {
         throw new Error(`Invalid message from plugin. ${JSON.stringify(message, null, 2)}`);
       }
 
-      if (message.cmd === MessageCmd.SUDO_REQUEST) {
+      if (message.cmd === MessageCmd.COMMAND_REQUEST) {
         const { data, requestId } = message;
-        if (!sudoRequestValidator(data)) {
-          throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(sudoRequestValidator.errors, null, 2)}`);
+        if (!commandRequestValidator(data)) {
+          throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(commandRequestValidator.errors, null, 2)}`);
         }
 
-        const { command, options } = data as unknown as SudoRequestData;
-        const result = await sudoSpawn(command, options);
+        const { command, options } = data as unknown as CommandRequestData;
+        const result = await spawnSafe(command, options);
 
         process.send(<IpcMessageV2>{
-          cmd: MessageCmd.SUDO_REQUEST + '_Response',
+          cmd: MessageCmd.COMMAND_REQUEST + '_Response',
           data: result,
           requestId,
         })
       }
-    })
-  }
-  
-}
 
-type CodifySpawnOptions = {
-  cwd?: string;
-  throws?: boolean,
-} & Omit<SpawnOptions, 'detached' | 'shell' | 'stdio'>
-
-/**
- *
- * @param cmd Command to run. Ex: `rm -rf`
- * @param opts Options for spawn
- *
- * @see promiseSpawn
- * @see spawn
- *
- * @returns SpawnResult { status: SUCCESS | ERROR; data: string }
- */
-async function sudoSpawn(
-  cmd: string,
-  opts: CodifySpawnOptions,
-): Promise<{ data: string, status: SpawnStatus }> {
-  return new Promise((resolve) => {
-    const output: string[] = [];
-
-    const _cmd = `sudo ${cmd}`;
-
-    // Source start up shells to emulate a users environment vs. a non-interactive non-login shell script
-    // Ignore all stdin
-    const _process = spawn(`source ~/.zshrc; ${_cmd}`, [], {
-      ...opts,
-      shell: 'zsh',
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
+      if (message.cmd === MessageCmd.PRESS_KEY_TO_CONTINUE_REQUEST) {
+        const { data, requestId } = message;
+        if (!commandRequestValidator(data)) {
+          throw new Error(`Invalid sudo request from plugin. ${JSON.stringify(commandRequestValidator.errors, null, 2)}`);
+        }
 
-    const { stderr, stdout } = _process
-    stdout.setEncoding('utf8');
-    stderr.setEncoding('utf8');
+        process.send(<IpcMessageV2>{
+          cmd: MessageCmd.PRESS_KEY_TO_CONTINUE_REQUEST + '_Response',
+          data: {},
+          requestId,
+        })
+      }
 
-    stdout.on('data', (data) => {
-      output.push(data.toString());
-    })
+      if (message.cmd === MessageCmd.CODIFY_CREDENTIALS_REQUEST) {
+        const { requestId } = message;
 
-    stderr.on('data', (data) => {
-      output.push(data.toString());
-    })
+        const loginJson = await fs.readFile(path.join(os.homedir(), '.codify', 'credentials.json'), 'utf8');
+        if (!loginJson) {
+          throw new Error('Unable to get login credentials')
+        }
 
-    stdout.pipe(process.stdout);
-    stderr.pipe(process.stderr);
+        const login = JSON.parse(loginJson);
+        if (!login) {
+          throw new Error('Unable to parse login credentials')
+        }
 
-    _process.on('close', (code) => {
-      resolve({
-        data: output.join(''),
-        status: code === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
-      })
+        process.send(<IpcMessageV2>{
+          cmd: MessageCmd.CODIFY_CREDENTIALS_REQUEST + '_Response',
+          data: login.accessToken,
+          requestId,
+        })
+      }
     })
-  })
+  }
+  
 }

package/src/shell.ts

@@ -0,0 +1,45 @@
+export enum Shell {
+  ZSH = 'zsh',
+  BASH = 'bash',
+  SH = 'sh',
+  KSH = 'ksh',
+  CSH = 'csh',
+  FISH = 'fish',
+}
+
+
+export const ShellUtils = {
+  getShell(): Shell | undefined {
+    const shell = process.env.SHELL || '';
+
+    if (shell.endsWith('bash')) {
+      return Shell.BASH
+    }
+
+    if (shell.endsWith('zsh')) {
+      return Shell.ZSH
+    }
+
+    if (shell.endsWith('sh')) {
+      return Shell.SH
+    }
+
+    if (shell.endsWith('csh')) {
+      return Shell.CSH
+    }
+
+    if (shell.endsWith('ksh')) {
+      return Shell.KSH
+    }
+
+    if (shell.endsWith('fish')) {
+      return Shell.FISH
+    }
+
+    return undefined;
+  },
+
+  getDefaultShell(): string {
+    return process.env.SHELL!;
+  }
+}

package/src/spawn.ts

@@ -0,0 +1,91 @@
+import * as pty from '@homebridge/node-pty-prebuilt-multiarch';
+import { SpawnStatus } from 'codify-schemas';
+import stripAnsi from 'strip-ansi';
+
+import { Shell, ShellUtils } from './shell.js';
+
+export interface SpawnResult {
+  status: SpawnStatus;
+  exitCode: number;
+  data: string;
+}
+
+export interface SpawnOptions {
+  cwd?: string;
+  env?: Record<string, unknown>,
+  interactive?: boolean,
+  requiresRoot?: boolean,
+  stdin?: boolean,
+}
+
+export function spawnSafe(cmd: string, options?: SpawnOptions): Promise<SpawnResult> {
+  if (cmd.toLowerCase().includes('sudo')) {
+    throw new Error('Command must not include sudo')
+  }
+
+  process.stdout.write(`Running command: ${options?.requiresRoot ? 'sudo' : ''} ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''))
+
+  return new Promise((resolve) => {
+    const output: string[] = [];
+    const historyIgnore = ShellUtils.getShell() === Shell.ZSH ? { HISTORY_IGNORE: '*' } : { HISTIGNORE: '*' };
+
+    // If TERM_PROGRAM=Apple_Terminal is set then ANSI escape characters may be included
+    // in the response.
+    const env = {
+      ...process.env, ...options?.env,
+      TERM_PROGRAM: 'codify',
+      COMMAND_MODE: 'unix2003',
+      COLORTERM: 'truecolor',
+      ...historyIgnore
+    }
+
+    // Initial terminal dimensions
+    const initialCols = process.stdout.columns ?? 80;
+    const initialRows = process.stdout.rows ?? 24;
+
+    const command = options?.requiresRoot ? `sudo ${cmd}` : cmd;
+    const args = options?.interactive ? ['-i', '-c', command] : ['-c', command]
+
+    // Run the command in a pty for interactivity
+    const mPty = pty.spawn(ShellUtils.getDefaultShell(), args, {
+      ...options,
+      cols: initialCols,
+      rows: initialRows,
+      env
+    });
+
+    mPty.onData((data) => {
+      process.stdout.write(data);
+      output.push(data.toString());
+    })
+
+    const resizeListener = () => {
+      const { columns, rows } = process.stdout;
+      mPty.resize(columns, rows);
+    }
+
+    const stdinListener = (data: any) => {
+      // console.log('stdinListener', data);
+      mPty.write(data.toString());
+    }
+
+    // Listen to resize events for the terminal window;
+    process.stdout.on('resize', resizeListener);
+    if (options?.stdin) {
+      process.stdin.on('data', stdinListener)
+    }
+
+    mPty.onExit((result) => {
+      process.stdout.off('resize', resizeListener);
+      if (options?.stdin) {
+        process.stdin.off('data', stdinListener);
+      }
+
+      resolve({
+        status: result.exitCode === 0 ? SpawnStatus.SUCCESS : SpawnStatus.ERROR,
+        exitCode: result.exitCode,
+        data: stripAnsi(output.join('\n').trim()),
+      })
+    })
+  })
+}