WIP

Author: CorieW

genkit-tools/cli/src/commands/ui-start.ts

@@ -152,12 +152,14 @@ async function startAndWaitUntilHealthy(
     );
   }
 
-  // Handles spaces in the command path
-  const command = `"${spawnConfig.command}"`;
-  const args = spawnConfig.args.map((arg) => `"${arg}"`);
-
-  logger.debug(`Spawning: ${command} ${args.join(' ')}`);
-  const child = spawn(command, args, spawnConfig.options);
+  logger.debug(
+    `Spawning: ${spawnConfig.command} ${spawnConfig.args.join(' ')}`
+  );
+  const child = spawn(
+    spawnConfig.command,
+    spawnConfig.args,
+    spawnConfig.options
+  );
 
   // Wait for the process to be ready
   return new Promise<ChildProcess>((resolve, reject) => {

genkit-tools/cli/src/utils/spawn-config.ts

@@ -18,6 +18,7 @@ import { type SpawnOptions } from 'child_process';
 import { access, constants } from 'fs/promises';
 import { SERVER_HARNESS_COMMAND } from '../commands/server-harness';
 import { type RuntimeInfo } from './runtime-detector';
+import { logger } from '@genkit-ai/tools-common/utils';
 
 /**
  * Configuration for spawning a child process
@@ -38,7 +39,11 @@ export interface SpawnConfig {
  */
 export async function validateExecutablePath(path: string): Promise<boolean> {
   try {
-    await access(path, constants.F_OK | constants.X_OK);
+    // Remove surrounding quotes if present (handle quotation)
+    const normalizedPath = path.startsWith('"') && path.endsWith('"')
+      ? path.slice(1, -1)
+      : path;
+    await access(normalizedPath, constants.F_OK | constants.X_OK);
     return true;
   } catch {
     return false;
@@ -91,7 +96,7 @@ export function buildServerHarnessSpawnConfig(
     throw new Error('Log path is required');
   }
 
-  const command = runtime.execPath;
+  let command = runtime.execPath;
   let args: string[];
 
   if (runtime.type === 'compiled-binary') {
@@ -112,6 +117,13 @@ export function buildServerHarnessSpawnConfig(
     shell: runtime.platform === 'win32',
   };
 
+  // Handles spaces in the command and arguments on Windows
+  logger.debug(`Platform: ${runtime.platform}`);
+  if (runtime.platform === 'win32') {
+    command = `"${command}"`;
+    args = args.map((arg) => `"${arg}"`);
+  }
+
   return {
     command,
     args,