@pushpalsdev/cli 1.0.7 → 1.0.8

package/dist/pushpals-cli.js

@@ -1425,9 +1425,10 @@ function runtimeBinaryFilename(serviceName, platformKey) {
   return `pushpals-runtime-${serviceToken}-${platformKey}${extension}`;
 }
 function buildEmbeddedRuntimeEnv(baseEnv, opts) {
+  const env = normalizeChildProcessEnv(baseEnv);
   const useRuntimeConfig = opts.useRuntimeConfig !== false;
   return {
-    ...baseEnv,
+    ...env,
     PUSHPALS_REPO_ROOT_OVERRIDE: opts.repoRoot,
     PUSHPALS_PROJECT_ROOT_OVERRIDE: opts.repoRoot,
     ...useRuntimeConfig ? {
@@ -1436,9 +1437,61 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
     } : {
       PUSHPALS_PROMPTS_ROOT_OVERRIDE: opts.repoRoot
     },
-    PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas")
+    PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas"),
+    ...typeof env.PUSHPALS_GIT_BIN === "string" && env.PUSHPALS_GIT_BIN.trim() ? { PUSHPALS_GIT_BIN: env.PUSHPALS_GIT_BIN.trim() } : {}
   };
 }
+function normalizeChildProcessEnv(baseEnv, platform = process.platform) {
+  const env = {};
+  for (const [key, value] of Object.entries(baseEnv)) {
+    if (typeof value === "string")
+      env[key] = value;
+  }
+  if (platform === "win32") {
+    const resolvedPath = String(env.Path ?? env.PATH ?? process.env.Path ?? process.env.PATH ?? "").trim();
+    if (resolvedPath) {
+      env.Path = resolvedPath;
+      env.PATH = resolvedPath;
+    }
+    const systemRoot = String(env.SystemRoot ?? env.SYSTEMROOT ?? process.env.SystemRoot ?? process.env.SYSTEMROOT ?? "").trim();
+    if (systemRoot) {
+      env.SystemRoot = systemRoot;
+      env.SYSTEMROOT = systemRoot;
+    }
+    const comSpec = String(env.ComSpec ?? env.COMSPEC ?? process.env.ComSpec ?? process.env.COMSPEC ?? "").trim();
+    if (comSpec) {
+      env.ComSpec = comSpec;
+      env.COMSPEC = comSpec;
+    }
+  }
+  return env;
+}
+async function resolveCommandPath(command, cwd, env) {
+  const lookupCommands = process.platform === "win32" ? [
+    ["where.exe", command],
+    ["where", command]
+  ] : [["which", command]];
+  for (const lookup of lookupCommands) {
+    try {
+      const proc = Bun.spawn(lookup, {
+        cwd,
+        env,
+        stdout: "pipe",
+        stderr: "ignore"
+      });
+      const [stdout, exitCode] = await Promise.all([
+        new Response(proc.stdout).text(),
+        proc.exited
+      ]);
+      if (exitCode !== 0)
+        continue;
+      const resolved = stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
+      if (resolved)
+        return resolved;
+    } catch {}
+  }
+  return null;
+}
 function timestampFileToken() {
   return new Date().toISOString().replace(/[:.]/g, "-");
 }
@@ -1546,11 +1599,18 @@ function spawnRuntimeService(name, command, cwd, env, logPath) {
   });
   return service;
 }
+function buildServiceStopCommand(pid, platform = process.platform) {
+  if (platform === "win32" && typeof pid === "number" && pid > 0) {
+    return ["taskkill", "/PID", String(pid), "/T", "/F"];
+  }
+  return null;
+}
 function stopRuntimeServices(services) {
   for (const service of services) {
     try {
-      if (process.platform === "win32" && typeof service.proc.pid === "number" && service.proc.pid > 0) {
-        Bun.spawnSync(["taskkill", "/PID", String(service.proc.pid), "/T", "/F"], {
+      const stopCommand = buildServiceStopCommand(service.proc.pid, process.platform);
+      if (stopCommand) {
+        Bun.spawnSync(stopCommand, {
           stdin: "ignore",
           stdout: "ignore",
           stderr: "ignore"
@@ -1561,6 +1621,24 @@ function stopRuntimeServices(services) {
     } catch {}
   }
 }
+function isOptionalEmbeddedService(name) {
+  return name === "source_control_manager";
+}
+async function canSpawnCommand(command, cwd, env) {
+  try {
+    const proc = Bun.spawn(command, {
+      cwd,
+      env,
+      stdin: "ignore",
+      stdout: "ignore",
+      stderr: "ignore"
+    });
+    const exitCode = await proc.exited;
+    return exitCode === 0;
+  } catch {
+    return false;
+  }
+}
 async function repoHasRemote(repoRoot, remote) {
   const normalizedRemote = remote.trim();
   if (!normalizedRemote)
@@ -1630,6 +1708,10 @@ async function autoStartRuntimeServices(opts) {
     runtimeRoot,
     useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime
   });
+  const resolvedGitBinary = await resolveCommandPath("git", opts.repoRoot, normalizeChildProcessEnv(process.env));
+  if (resolvedGitBinary) {
+    runtimeEnv.PUSHPALS_GIT_BIN = resolvedGitBinary;
+  }
   const services = [];
   const runToken = timestampFileToken();
   const logDir = join2(runtimeRoot, "logs", "bootstrap");
@@ -1678,13 +1760,24 @@ ${tail}` : ""}`);
   console.log(`[pushpals] remotebuddy log: ${remotebuddyService.logPath}`);
   const scmHealthy = await probeSourceControlManager(opts.sourceControlManagerPort);
   const scmRemoteAvailable = await repoHasRemote(opts.repoRoot, opts.sourceControlManagerRemote);
+  const gitProbeCommand = typeof runtimeEnv.PUSHPALS_GIT_BIN === "string" && runtimeEnv.PUSHPALS_GIT_BIN.trim() ? [runtimeEnv.PUSHPALS_GIT_BIN.trim(), "--version"] : ["git", "--version"];
+  const gitAvailableForScm = await canSpawnCommand(gitProbeCommand, opts.repoRoot, runtimeEnv);
   if (!scmHealthy && scmRemoteAvailable) {
-    console.log("[pushpals] Starting embedded SourceControlManager...");
-    const sourceControlManagerService = spawnRuntimeService("source_control_manager", [runtimeBinaries.sourceControlManager, "--skip-clean-check"], opts.repoRoot, runtimeEnv, logPathFor("source_control_manager"));
-    services.push(sourceControlManagerService);
-    console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath}`);
+    if (!gitAvailableForScm) {
+      console.warn("[pushpals] Git is not available to embedded SourceControlManager; skipping SCM startup.");
+    } else {
+      if (runtimeEnv.PUSHPALS_GIT_BIN) {
+        console.log(`[pushpals] Embedded SourceControlManager git=${runtimeEnv.PUSHPALS_GIT_BIN}`);
+      }
+      console.log("[pushpals] Starting embedded SourceControlManager...");
+      const sourceControlManagerService = spawnRuntimeService("source_control_manager", [runtimeBinaries.sourceControlManager, "--skip-clean-check"], opts.repoRoot, runtimeEnv, logPathFor("source_control_manager"));
+      services.push(sourceControlManagerService);
+      console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath}`);
+    }
   } else if (!scmRemoteAvailable) {
     console.log(`[pushpals] Repo has no git remote "${opts.sourceControlManagerRemote}"; skipping embedded SourceControlManager.`);
+  } else if (!gitAvailableForScm) {
+    console.warn("[pushpals] Git is not available to embedded SourceControlManager; skipping SCM startup.");
   } else {
     console.log("[pushpals] SourceControlManager already healthy; skipping embedded start.");
   }
@@ -1693,7 +1786,7 @@ ${tail}` : ""}`);
     for (let i = services.length - 1;i >= 0; i--) {
       const service = services[i];
       if (service.exited) {
-        if (service.name === "source_control_manager") {
+        if (isOptionalEmbeddedService(service.name)) {
           console.warn(`[pushpals] Embedded ${service.name} exited during startup (code=${service.exitCode ?? "unknown"}); continuing without SCM.`);
           const tail2 = readLogTail(service.logPath);
           if (tail2) {
@@ -1714,9 +1807,20 @@ ${tail}` : ""}`);
     if (health?.ok) {
       const stabilityDeadline = Date.now() + DEFAULT_SERVICE_STABILITY_GRACE_MS;
       while (Date.now() < stabilityDeadline) {
-        for (const service of services) {
+        for (let i = services.length - 1;i >= 0; i--) {
+          const service = services[i];
           if (!service.exited)
             continue;
+          if (isOptionalEmbeddedService(service.name)) {
+            const tail2 = readLogTail(service.logPath);
+            console.warn(`[pushpals] Embedded ${service.name} exited immediately after bootstrap (code=${service.exitCode ?? "unknown"}); continuing without SCM.`);
+            if (tail2) {
+              console.warn(`[pushpals] ${service.name} log tail:
+${tail2}`);
+            }
+            services.splice(i, 1);
+            continue;
+          }
           const tail = readLogTail(service.logPath);
           stopRuntimeServices(services);
           throw new Error(`Embedded ${service.name} exited immediately after bootstrap (code=${service.exitCode ?? "unknown"}). ` + `See ${service.logPath}${tail ? `
@@ -2163,15 +2267,17 @@ async function runSessionStream(serverUrl, sessionId, authToken, print, signal)
     }
   }
 }
-async function openMonitoringHub(url) {
-  let cmd = null;
-  if (process.platform === "win32") {
-    cmd = ["cmd", "/c", "start", "", url];
-  } else if (process.platform === "darwin") {
-    cmd = ["open", url];
-  } else {
-    cmd = ["xdg-open", url];
+function buildOpenMonitoringHubCommand(url, platform = process.platform) {
+  if (platform === "win32") {
+    return ["cmd", "/c", "start", "", url];
+  }
+  if (platform === "darwin") {
+    return ["open", url];
   }
+  return ["xdg-open", url];
+}
+async function openMonitoringHub(url) {
+  const cmd = buildOpenMonitoringHubCommand(url, process.platform);
   const proc = Bun.spawn(cmd, {
     stdin: "ignore",
     stdout: "ignore",
@@ -2395,8 +2501,12 @@ if (import.meta.main) {
 }
 export {
   startEmbeddedMonitoringHub,
+  resolveCommandPath,
   resolveBundledRuntimeAssetSource,
   prepareCliRuntime,
+  normalizeChildProcessEnv,
+  buildServiceStopCommand,
+  buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,
   buildEmbeddedMonitoringHubHtml
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushpalsdev/cli",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "PushPals terminal CLI for LocalBuddy -> RemoteBuddy orchestration",
   "license": "MIT",
   "repository": {