fix: Connect commands not working on other shells

Author: kevinwang5658

package.json

@@ -143,7 +143,7 @@
     "start:vm": "npm run build && npm run pack:macos && npm run start:vm",
     "deploy": "npm run pkg && npm run notarize && npm run upload"
   },
-  "version": "1.0.0-beta4",
+  "version": "1.0.0-beta5",
   "bugs": "https://github.com/codifycli/codify/issues",
   "keywords": [
     "oclif",

src/connect/http-routes/create-command.ts

@@ -4,6 +4,7 @@ import { Router } from 'express';
 import WebSocket from 'ws';
 
 import { Session, SocketServer } from '../socket-server.js';
+import { ShellUtils } from '../../utils/shell.js';
 
 export enum ConnectCommand {
   TERMINAL = 'start terminal',
@@ -59,7 +60,7 @@ export function createCommandHandler({ name, command, spawnCommand, onExit }: Pa
 
     console.log(req.body);
 
-    const pty = spawnCommand ? await spawnCommand(req.body, ws, session) : spawn('zsh', command!, {
+    const pty = spawnCommand ? await spawnCommand(req.body, ws, session) : spawn(ShellUtils.getDefaultShell(), command!, {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/apply-handler.ts

@@ -7,6 +7,7 @@ import { WebSocket } from 'ws';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
 import { ajv } from '../../../utils/ajv.js';
+import { ShellUtils } from '../../../utils/shell.js';
 import { Session } from '../../socket-server.js';
 import { ConnectCommand, createCommandHandler } from '../create-command.js';
 
@@ -29,7 +30,7 @@ export function applyHandler() {
 
     session.additionalData.filePath = filePath;
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} apply -p ${filePath}`], {
+    return spawn(ShellUtils.getDefaultShell(), ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} apply -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/import-handler.ts

@@ -8,6 +8,7 @@ import { WebSocket } from 'ws';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
 import { ajv } from '../../../utils/ajv.js';
+import { ShellUtils } from '../../../utils/shell.js';
 import { Session, SocketServer } from '../../socket-server.js';
 import { ConnectCommand, createCommandHandler } from '../create-command.js';
 
@@ -55,7 +56,7 @@ export function importHandler() {
       } 
     }
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} import ${args} -p ${filePath} --updateExisting`], {
+    return spawn(ShellUtils.getDefaultShell(), ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} import ${args} -p ${filePath} --updateExisting`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/init-handler.ts

@@ -6,6 +6,7 @@ import path from 'node:path';
 import { WebSocket } from 'ws';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
+import { ShellUtils } from '../../../utils/shell.js';
 import { Session, SocketServer } from '../../socket-server.js';
 import { ConnectCommand, createCommandHandler } from '../create-command.js';
 
@@ -17,7 +18,7 @@ export function initHandler() {
     session.additionalData.filePath = filePath;
     session.additionalData.existingFile = '[]';
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} init -p ${filePath}`], {
+    return spawn(ShellUtils.getDefaultShell(), ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} init -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/plan-handler.ts

@@ -7,6 +7,7 @@ import { WebSocket } from 'ws';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
 import { ajv } from '../../../utils/ajv.js';
+import { ShellUtils } from '../../../utils/shell.js';
 import { Session } from '../../socket-server.js';
 import { ConnectCommand, createCommandHandler } from '../create-command.js';
 
@@ -29,7 +30,7 @@ export function planHandler() {
 
     session.additionalData.filePath = filePath;
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} plan -p ${filePath}`], {
+    return spawn(ShellUtils.getDefaultShell(), ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} plan -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/connect/http-routes/handlers/refresh-handler.ts

@@ -8,7 +8,8 @@ import { WebSocket } from 'ws';
 
 import { ConnectOrchestrator } from '../../../orchestrators/connect.js';
 import { ajv } from '../../../utils/ajv.js';
-import { Session, SocketServer } from '../../socket-server.js';
+import { ShellUtils } from '../../../utils/shell.js';
+import { Session } from '../../socket-server.js';
 import { ConnectCommand, createCommandHandler } from '../create-command.js';
 
 enum RefreshType {
@@ -55,7 +56,7 @@ export function refreshHandler() {
       }
     }
 
-    return spawn('zsh', ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} refresh ${args} -p ${filePath}`], {
+    return spawn(ShellUtils.getDefaultShell(), ['-c', `${ConnectOrchestrator.nodeBinary} ${ConnectOrchestrator.rootCommand} refresh ${args} -p ${filePath}`], {
       name: 'xterm-color',
       cols: 80,
       rows: 30,

src/utils/spawn.ts

@@ -4,6 +4,7 @@ import stripAnsi from 'strip-ansi';
 
 import { SpawnError } from '../common/errors.js';
 import { ctx } from '../events/context.js';
+import { OsUtils } from './os-utils.js';
 import { Shell, ShellUtils } from './shell.js';
 
 export interface SpawnResult {
@@ -64,7 +65,14 @@ export async function spawnSafe(cmd: string, options?: SpawnOptions, pluginName?
     const initialCols = process.stdout.columns ?? 80;
     const initialRows = process.stdout.rows ?? 24;
 
-    const command = options?.requiresRoot ? `sudo -k; sudo -SN <<< "${password}" ${cmd}` : cmd;
+    // Mac OS uses -SN instead of -Sn
+    let command;
+    if (OsUtils.isMacOS()) {
+      command = options?.requiresRoot ? `sudo -k; sudo -SN <<< "${password}" ${cmd}` : cmd;
+    } else {
+      command = options?.requiresRoot ? `sudo -k; sudo -Sk <<< "${password}" ${cmd}` : cmd;
+    }
+
     const args = options?.interactive ? ['-i', '-c', command] : ['-c', command]
 
     // Run the command in a pty for interactivity

src/utils/sudo.ts

@@ -1,10 +1,18 @@
 import { execSync } from 'node:child_process';
 
+import { OsUtils } from './os-utils.js';
+
 export const SudoUtils = {
   validate(password?: string): boolean {
     try {
+      if (OsUtils.isMacOS()) {
+        // Sudo with -SNv will not prompt if within sudo cache timeout. Mac OS uses -SNv instead of -Snv
+        execSync(`sudo -SNv ${password ? `<<< ${password}` : ''}`, { stdio: 'ignore' })
+        return true;
+      }
+
       // Sudo with -Snv will not prompt if within sudo cache timeout
-      execSync(`sudo -Snv ${password ? `<<< ${password}` : ''}`, { stdio: 'ignore' })
+      execSync(`sudo -Skv ${password ? `<<< ${password}` : ''} >/dev/null 2>&1`, { stdio: 'ignore' })
       return true;
     } catch {
       return false;