Use zsh when runing uv in VirtualEnv for macOS. (#460)

src/main-process/comfyDesktopApp.ts

@@ -15,7 +15,7 @@ import { getModelsDirectory, validateHardware } from '../utils';
 import { DownloadManager } from '../models/DownloadManager';
 import { VirtualEnvironment } from '../virtualEnvironment';
 import { InstallWizard } from '../install/installWizard';
-import { Terminal } from '../terminal';
+import { Terminal } from '../shell/terminal';
 import { DesktopConfig } from '../store/desktopConfig';
 import { InstallationValidator } from '../install/installationValidator';
 import { restoreCustomNodes } from '../services/backup';

src/terminal.ts → src/shell/terminal.ts

@@ -1,7 +1,7 @@
-import * as os from 'node:os';
 import * as pty from 'node-pty';
-import { AppWindow } from './main-process/appWindow';
-import { IPC_CHANNELS } from './constants';
+import { AppWindow } from '../main-process/appWindow';
+import { IPC_CHANNELS } from '../constants';
+import { getDefaultShell } from './util';
 
 export class Terminal {
   #pty: pty.IPty | undefined;
@@ -48,7 +48,7 @@ export class Terminal {
   #createPty() {
     const window = this.window;
     // TODO: does this want to be a setting?
-    const shell = this.#getDefaultShell();
+    const shell = getDefaultShell();
     const instance = pty.spawn(shell, [], {
       handleFlowControl: false,
       conptyInheritCursor: false,
@@ -74,15 +74,4 @@ export class Terminal {
 
     return instance;
   }
-
-  #getDefaultShell(): string {
-    switch (os.platform()) {
-      case 'win32':
-        return 'powershell.exe';
-      case 'darwin':
-        return 'zsh';
-      default: // Linux and others
-        return 'bash';
-    }
-  }
 }

src/shell/util.ts

@@ -0,0 +1,12 @@
+import os from 'os';
+
+export function getDefaultShell(): string {
+  switch (os.platform()) {
+    case 'win32':
+      return 'powershell.exe';
+    case 'darwin':
+      return 'zsh';
+    default: // Linux and others
+      return 'bash';
+  }
+}

src/virtualEnvironment.ts

@@ -5,6 +5,7 @@ import { pathAccessible } from './utils';
 import { app } from 'electron';
 import * as pty from 'node-pty';
 import * as os from 'os';
+import { getDefaultShell } from './shell/util';
 
 type ProcessCallbacks = {
   onStdout?: (data: string) => void;
@@ -28,7 +29,7 @@ export class VirtualEnvironment {
 
   get uvPtyInstance() {
     if (!this.uvPty) {
-      const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
+      const shell = getDefaultShell();
       this.uvPty = pty.spawn(shell, [], {
         handleFlowControl: false,
         conptyInheritCursor: false,