@pushpalsdev/cli 1.1.4 → 1.1.5

package/dist/pushpals-cli.js

@@ -1620,6 +1620,8 @@ var DEFAULT_RUNTIME_BOOT_TIMEOUT_MS = 90000;
 var DEFAULT_RUNTIME_BOOT_POLL_MS = 1000;
 var DEFAULT_SERVER_BOOT_TIMEOUT_MS = 20000;
 var DEFAULT_SERVICE_STABILITY_GRACE_MS = 4000;
+var DEFAULT_STARTUP_GIT_PROBE_TIMEOUT_MS = 5000;
+var DEFAULT_STARTUP_GIT_REMOTE_TIMEOUT_MS = 1e4;
 var EMBEDDED_SERVICE_RESTART_MAX_ATTEMPTS = 4;
 var WORKERPAL_STARTUP_READINESS_PROBE_MAX_MS = 15000;
 var EMBEDDED_RUNTIME_SAFETY_CAP_DISABLE_ENV = "PUSHPALS_DISABLE_EMBEDDED_SAFETY_CAPS";
@@ -1917,6 +1919,31 @@ function parsePositiveInt(value, fallback) {
     return fallback;
   return parsed;
 }
+function clampPositiveInt(value, min, max) {
+  if (!Number.isFinite(value))
+    return min;
+  return Math.max(min, Math.min(max, Math.trunc(value)));
+}
+function resolveStartupGitProbeTimeoutMs(env) {
+  return clampPositiveInt(parsePositiveInt(env.PUSHPALS_STARTUP_GIT_PROBE_TIMEOUT_MS, DEFAULT_STARTUP_GIT_PROBE_TIMEOUT_MS), 1000, 30000);
+}
+function resolveStartupGitRemoteTimeoutMs(env) {
+  return clampPositiveInt(parsePositiveInt(env.PUSHPALS_STARTUP_GIT_REMOTE_TIMEOUT_MS, DEFAULT_STARTUP_GIT_REMOTE_TIMEOUT_MS), 1000, 60000);
+}
+async function withStartupTimeout(promise, timeoutMs, timeoutValue) {
+  let timer = null;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((resolveTimeout) => {
+        timer = setTimeout(() => resolveTimeout(timeoutValue()), Math.max(1, timeoutMs));
+      })
+    ]);
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
 function jsonHtmlBootstrap(value) {
   return JSON.stringify(value).replace(/</g, "\\u003c");
 }
@@ -2000,15 +2027,15 @@ function withWindowsGitSchannelEnv(env, platform = process.platform) {
     return env;
   return appendGitConfigEnv(env, "http.sslBackend", "schannel");
 }
-async function runGitWithEnv(args, cwd, env) {
-  return await runCommandWithEnv(["git", ...args], cwd, withWindowsGitSchannelEnv(env));
+async function runGitWithEnv(args, cwd, env, timeoutMs) {
+  return await runCommandWithEnv(["git", ...args], cwd, withWindowsGitSchannelEnv(env), timeoutMs);
 }
-async function runGit(args, cwd) {
+async function runGit(args, cwd, timeoutMs) {
   return await runGitWithEnv(args, cwd, {
     ...process.env,
     GIT_TERMINAL_PROMPT: "0",
     GCM_INTERACTIVE: "Never"
-  });
+  }, timeoutMs);
 }
 async function resolveCurrentGitRepoRoot(cwd) {
   const inside = await runGit(["rev-parse", "--is-inside-work-tree"], cwd);
@@ -2738,20 +2765,14 @@ function normalizeChildProcessEnv(baseEnv, platform = process.platform) {
   }
   return env;
 }
-async function resolveCommandPath(command, cwd, env) {
+async function resolveCommandPath(command, cwd, env, timeoutMs = resolveStartupGitProbeTimeoutMs(env)) {
   const lookupCommands = process.platform === "win32" ? resolveWindowsWhereExecutableCandidatesForEnv(env, process.platform).map((lookup) => [lookup, 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)
+      const result = await runCommandWithEnv(lookup, cwd, env, timeoutMs);
+      if (!result.ok)
         continue;
-      const resolved = stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
+      const resolved = result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
       if (resolved)
         return resolved;
     } catch {}
@@ -3159,50 +3180,31 @@ function computeEmbeddedServiceRestartBackoffMs(attempt) {
 function shouldRestartEmbeddedService(attempts, maxAttempts = EMBEDDED_SERVICE_RESTART_MAX_ATTEMPTS) {
   return shouldRestartService(attempts, maxAttempts);
 }
-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 canSpawnCommand(command, cwd, env, timeoutMs = resolveStartupGitProbeTimeoutMs(env)) {
+  const result = await runCommandWithEnv(command, cwd, env, timeoutMs);
+  return result.ok;
 }
-async function canSpawnGitViaWindowsShell(commandArgs, cwd, env, platform = process.platform) {
+async function canSpawnGitViaWindowsShell(commandArgs, cwd, env, platform = process.platform, timeoutMs = resolveStartupGitProbeTimeoutMs(env)) {
   if (platform !== "win32")
     return false;
   const commandLine = commandArgs.map((arg) => quoteWindowsCmdArg(arg)).join(" ");
   for (const shellExecutable of resolveWindowsShellExecutableCandidatesForEnv(env, platform)) {
-    try {
-      const proc = Bun.spawn([shellExecutable, "/d", "/s", "/c", commandLine], {
-        cwd,
-        env,
-        stdin: "ignore",
-        stdout: "ignore",
-        stderr: "ignore"
-      });
-      const exitCode = await proc.exited;
-      return exitCode === 0;
-    } catch {}
+    const result = await runCommandWithEnv([shellExecutable, "/d", "/s", "/c", commandLine], cwd, env, timeoutMs);
+    if (result.ok)
+      return true;
   }
   return false;
 }
-async function resolveSourceControlManagerGitProbe(cwd, env, platform = process.platform) {
+async function resolveSourceControlManagerGitProbe(cwd, env, platform = process.platform, timeoutMs = resolveStartupGitProbeTimeoutMs(env)) {
   const candidates = resolveRuntimeGitExecutableCandidates(env, platform);
   for (const candidate of candidates) {
-    if (await canSpawnCommand([candidate, "--version"], cwd, env)) {
+    if (await canSpawnCommand([candidate, "--version"], cwd, env, timeoutMs)) {
       return { ok: true, detail: candidate };
     }
   }
   if (platform === "win32") {
     for (const candidate of candidates) {
-      if (await canSpawnGitViaWindowsShell([candidate, "--version"], cwd, env, platform)) {
+      if (await canSpawnGitViaWindowsShell([candidate, "--version"], cwd, env, platform, timeoutMs)) {
         return { ok: true, detail: `${candidate} via shell` };
       }
     }
@@ -3630,7 +3632,12 @@ async function precheckSourceControlManagerGitAvailability(opts) {
   if (preconfiguredGitBinary) {
     applyResolvedGitBinaryToRuntimeEnv(env, preconfiguredGitBinary, platform);
   }
-  const remoteStatus = opts.gitRemoteCheckFn ? await opts.gitRemoteCheckFn(opts.repoRoot, opts.remote, env) : opts.repoHasRemoteFn ? await opts.repoHasRemoteFn(opts.repoRoot, opts.remote) ? { status: "ok", remote: opts.remote } : { status: "missing_remote", remote: opts.remote } : await checkGitRemoteConfigured(opts.repoRoot, opts.remote, env);
+  const remoteTimeoutMs = resolveStartupGitRemoteTimeoutMs(env);
+  const remoteStatus = await withStartupTimeout(opts.gitRemoteCheckFn ? opts.gitRemoteCheckFn(opts.repoRoot, opts.remote, env) : opts.repoHasRemoteFn ? opts.repoHasRemoteFn(opts.repoRoot, opts.remote).then((hasRemote) => hasRemote ? { status: "ok", remote: opts.remote } : { status: "missing_remote", remote: opts.remote }) : checkGitRemoteConfigured(opts.repoRoot, opts.remote, env, remoteTimeoutMs), remoteTimeoutMs, () => ({
+    status: "error",
+    remote: opts.remote,
+    detail: `timed out after ${remoteTimeoutMs}ms`
+  }));
   if (remoteStatus.status === "missing_remote") {
     return {
       status: "skipped",
@@ -3719,7 +3726,7 @@ function resolveWorkerpalStartupReadinessProbeTimeoutMs(config) {
 function shouldRunEmbeddedRuntimeStartupPrechecks(opts) {
   return !opts.serverHealthy && !opts.noAutoStart;
 }
-async function checkGitRemoteConfigured(repoRoot, remote, env) {
+async function checkGitRemoteConfigured(repoRoot, remote, env, timeoutMs = resolveStartupGitRemoteTimeoutMs(env ?? process.env)) {
   const normalizedRemote = String(remote ?? "").trim();
   if (!normalizedRemote) {
     return { status: "missing_remote", remote: normalizedRemote };
@@ -3728,7 +3735,7 @@ async function checkGitRemoteConfigured(repoRoot, remote, env) {
     ...process.env,
     GIT_TERMINAL_PROMPT: "0",
     GCM_INTERACTIVE: "Never"
-  });
+  }, timeoutMs);
   if (result.ok && result.stdout) {
     return { status: "ok", remote: normalizedRemote };
   }
@@ -3757,7 +3764,7 @@ async function checkPushpalsBranchOnRemote(repoRoot, remote, branch) {
     };
   }
   const ref = `refs/heads/${normalizedBranch}`;
-  const result = await runGit(["ls-remote", "--heads", normalizedRemote, ref], repoRoot);
+  const result = await runGit(["ls-remote", "--heads", normalizedRemote, ref], repoRoot, resolveStartupGitRemoteTimeoutMs(process.env));
   if (!result.ok) {
     const detail = result.stderr || result.stdout || `exit ${result.exitCode}`;
     return {
@@ -3789,8 +3796,9 @@ async function enforcePushpalsRemoteBranchPrecheck(repoRoot, remote, branch) {
     console.error("[pushpals] Precheck failed: create/push that branch first or set source_control_manager.pushpals_branch to an existing remote branch.");
     return false;
   }
-  console.error(`[pushpals] Precheck failed: could not verify remote branch "${result.remote}/${result.branch}": ${result.detail}`);
-  return false;
+  console.warn(`[pushpals] Precheck warning: could not verify remote branch "${result.remote}/${result.branch}": ${result.detail}`);
+  console.warn("[pushpals] Precheck warning: continuing startup without SourceControlManager branch verification because the remote check was inconclusive.");
+  return true;
 }
 function isPathEqualOrWithin(parentPath, childPath) {
   const parent = normalizeRepoPathForComparison(parentPath);
@@ -4459,31 +4467,35 @@ ${tail}` : ""}`);
     recordStartupPhase("workerpal", Date.now(), "disabled");
   }
   const scmHealthy = await probeSourceControlManager(opts.sourceControlManagerPort);
-  const scmGitProbe = await resolveSourceControlManagerGitProbe(opts.repoRoot, runtimeEnv, process.platform);
-  const scmRemoteStatus = await checkGitRemoteConfigured(opts.repoRoot, opts.sourceControlManagerRemote, runtimeEnv);
   if (!scmHealthy) {
     const scmPhaseStartedAt = Date.now();
+    console.log("[pushpals] Checking embedded SourceControlManager git/remote preflight...");
+    appendRuntimeServicesLogLine(runtimeServicesLogPath, "[pushpals] checking embedded source_control_manager git/remote preflight.");
+    const scmGitProbe = await resolveSourceControlManagerGitProbe(opts.repoRoot, runtimeEnv, process.platform);
     if (!scmGitProbe.ok) {
       console.warn("[pushpals] Git is not available to embedded SourceControlManager; skipping SCM startup.");
       appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] source_control_manager skipped: git is unavailable in embedded runtime env (${scmGitProbe.detail}).`);
       recordStartupPhase("source_control_manager", scmPhaseStartedAt, "skipped_no_git");
-    } else if (scmRemoteStatus.status === "error") {
-      console.warn(`[pushpals] Could not inspect SourceControlManager git remote "${opts.sourceControlManagerRemote}"; skipping SCM startup.`);
-      appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] source_control_manager skipped: remote "${opts.sourceControlManagerRemote}" could not be inspected (${scmRemoteStatus.detail}).`);
-      recordStartupPhase("source_control_manager", scmPhaseStartedAt, "skipped_remote_error");
-    } else if (scmRemoteStatus.status === "ok") {
-      console.log(`[pushpals] Embedded SourceControlManager git=${scmGitProbe.detail}`);
-      console.log("[pushpals] Starting embedded SourceControlManager...");
-      const sourceControlManagerService = launchService("source_control_manager", [
-        runtimeBinaries.sourceControlManager,
-        "--skip-clean-check"
-      ]);
-      console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath ?? serviceLogPaths.source_control_manager}`);
-      recordStartupPhase("source_control_manager", scmPhaseStartedAt, "started");
     } else {
-      console.log(`[pushpals] Repo has no git remote "${opts.sourceControlManagerRemote}"; skipping embedded SourceControlManager.`);
-      appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] source_control_manager skipped: repo has no remote "${opts.sourceControlManagerRemote}".`);
-      recordStartupPhase("source_control_manager", scmPhaseStartedAt, "skipped_no_remote");
+      const scmRemoteStatus = await checkGitRemoteConfigured(opts.repoRoot, opts.sourceControlManagerRemote, runtimeEnv);
+      if (scmRemoteStatus.status === "error") {
+        console.warn(`[pushpals] Could not inspect SourceControlManager git remote "${opts.sourceControlManagerRemote}"; skipping SCM startup.`);
+        appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] source_control_manager skipped: remote "${opts.sourceControlManagerRemote}" could not be inspected (${scmRemoteStatus.detail}).`);
+        recordStartupPhase("source_control_manager", scmPhaseStartedAt, "skipped_remote_error");
+      } else if (scmRemoteStatus.status === "ok") {
+        console.log(`[pushpals] Embedded SourceControlManager git=${scmGitProbe.detail}`);
+        console.log("[pushpals] Starting embedded SourceControlManager...");
+        const sourceControlManagerService = launchService("source_control_manager", [
+          runtimeBinaries.sourceControlManager,
+          "--skip-clean-check"
+        ]);
+        console.log(`[pushpals] source_control_manager log: ${sourceControlManagerService.logPath ?? serviceLogPaths.source_control_manager}`);
+        recordStartupPhase("source_control_manager", scmPhaseStartedAt, "started");
+      } else {
+        console.log(`[pushpals] Repo has no git remote "${opts.sourceControlManagerRemote}"; skipping embedded SourceControlManager.`);
+        appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] source_control_manager skipped: repo has no remote "${opts.sourceControlManagerRemote}".`);
+        recordStartupPhase("source_control_manager", scmPhaseStartedAt, "skipped_no_remote");
+      }
     }
   } else {
     recordStartupPhase("source_control_manager", Date.now(), "reused");
@@ -5249,8 +5261,7 @@ async function main() {
       sessionId
     });
     if (scmGitPrecheck.status === "failed") {
-      console.error(`[pushpals] Precheck failed: embedded SourceControlManager git command is unavailable (${scmGitPrecheck.detail}).`);
-      process.exit(1);
+      console.warn(`[pushpals] Embedded SourceControlManager precheck failed (${scmGitPrecheck.detail}); continuing startup without blocking on SCM.`);
     }
     workerpalDockerPrecheck = await precheckWorkerpalDockerAvailability({
       repoRoot,

package/package.json

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