@pushpalsdev/cli 1.0.10 → 1.0.11

package/dist/pushpals-cli.js

@@ -11,7 +11,7 @@ import {
   readFileSync as readFileSync4,
   writeFileSync
 } from "fs";
-import { dirname, extname, join as join2, resolve as resolve4 } from "path";
+import { basename, delimiter, dirname, extname, join as join2, resolve as resolve4 } from "path";
 import { createInterface } from "readline";
 
 // ../shared/src/client_preflight.ts
@@ -1637,6 +1637,7 @@ function buildEmbeddedRuntimeEnv(baseEnv, opts) {
       PUSHPALS_PROMPTS_ROOT_OVERRIDE: opts.repoRoot
     },
     PUSHPALS_PROTOCOL_SCHEMAS_DIR: join2(opts.runtimeRoot, "protocol", "schemas"),
+    ...opts.forceLocalBuddyEnabled ? { LOCALBUDDY_ENABLED: "1" } : {},
     ...typeof env.PUSHPALS_GIT_BIN === "string" && env.PUSHPALS_GIT_BIN.trim() ? { PUSHPALS_GIT_BIN: env.PUSHPALS_GIT_BIN.trim() } : {}
   };
 }
@@ -1827,6 +1828,34 @@ function stopRuntimeServices(services) {
     } catch {}
   }
 }
+function prependExecutableDirToPath(env, executablePath, platform = process.platform) {
+  const resolvedPath = String(executablePath ?? "").trim();
+  if (!resolvedPath)
+    return env;
+  if (!resolvedPath.includes("/") && !resolvedPath.includes("\\")) {
+    return env;
+  }
+  const executableDir = dirname(resolvedPath);
+  const existingPath = platform === "win32" ? String(env.Path ?? env.PATH ?? "") : String(env.PATH ?? "");
+  const pathEntries = existingPath.split(delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  const hasDir = pathEntries.some((entry) => entry.toLowerCase() === executableDir.toLowerCase());
+  const nextPath = hasDir ? existingPath : [executableDir, ...pathEntries].join(delimiter);
+  if (platform === "win32") {
+    env.Path = nextPath;
+    env.PATH = nextPath;
+  } else {
+    env.PATH = nextPath;
+  }
+  return env;
+}
+function applyResolvedGitBinaryToRuntimeEnv(env, resolvedGitBinary, platform = process.platform) {
+  const resolvedPath = String(resolvedGitBinary ?? "").trim();
+  if (!resolvedPath)
+    return env;
+  prependExecutableDirToPath(env, resolvedPath, platform);
+  env.PUSHPALS_GIT_BIN = basename(resolvedPath);
+  return env;
+}
 function isOptionalEmbeddedService(name) {
   return name === "source_control_manager";
 }
@@ -1915,8 +1944,8 @@ async function autoStartRuntimeServices(opts) {
   const { runtimePreflight } = opts.preparedRuntime;
   const runtimeRoot = opts.preparedRuntime.runtimeRoot;
   const runtimeTag = opts.preparedRuntime.runtimeTag || await resolveRuntimeReleaseTag(opts.requestedRuntimeTag);
-  const localBuddyEnabled = Boolean(runtimePreflight.config.localbuddy.enabled);
   const requireLocalBuddy = opts.requireLocalBuddy ?? true;
+  const localBuddyEnabled = requireLocalBuddy || Boolean(runtimePreflight.config.localbuddy.enabled);
   console.log(`[pushpals] LocalBuddy unavailable. Auto-starting runtime for repo: ${opts.repoRoot}`);
   console.log(`[pushpals] runtimeRoot=${runtimeRoot}`);
   console.log(`[pushpals] runtimeTag=${runtimeTag}`);
@@ -1928,11 +1957,15 @@ async function autoStartRuntimeServices(opts) {
   const runtimeEnv = buildEmbeddedRuntimeEnv(process.env, {
     repoRoot: opts.repoRoot,
     runtimeRoot,
-    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime
+    useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime,
+    forceLocalBuddyEnabled: requireLocalBuddy
   });
+  if (runtimeEnv.PUSHPALS_GIT_BIN) {
+    applyResolvedGitBinaryToRuntimeEnv(runtimeEnv, runtimeEnv.PUSHPALS_GIT_BIN);
+  }
   const resolvedGitBinary = await resolveCommandPath("git", opts.repoRoot, normalizeChildProcessEnv(process.env));
   if (resolvedGitBinary) {
-    runtimeEnv.PUSHPALS_GIT_BIN = resolvedGitBinary;
+    applyResolvedGitBinaryToRuntimeEnv(runtimeEnv, resolvedGitBinary);
   }
   const services = [];
   const runToken = timestampFileToken();
@@ -1973,6 +2006,9 @@ ${tail}` : ""}`);
     console.log("[pushpals] Server already healthy; skipping embedded server start.");
   }
   if (localBuddyEnabled) {
+    if (requireLocalBuddy && !runtimePreflight.config.localbuddy.enabled) {
+      console.log("[pushpals] LocalBuddy is disabled in config; forcing it on for this CLI session.");
+    }
     console.log("[pushpals] Starting embedded LocalBuddy...");
     const localbuddyService = spawnRuntimeService("localbuddy", [runtimeBinaries.localbuddy], opts.repoRoot, runtimeEnv, logPathFor("localbuddy"));
     services.push(localbuddyService);
@@ -2911,5 +2947,6 @@ export {
   buildServiceStopCommand,
   buildOpenMonitoringHubCommand,
   buildEmbeddedRuntimeEnv,
-  buildEmbeddedMonitoringHubHtml
+  buildEmbeddedMonitoringHubHtml,
+  applyResolvedGitBinaryToRuntimeEnv
 };

package/package.json

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