@pushpalsdev/cli 1.0.14 → 1.0.16

package/dist/pushpals-cli.js

@@ -1361,6 +1361,11 @@ function jsonHtmlBootstrap(value) {
 async function runGit(args, cwd) {
   const proc = Bun.spawn(["git", ...args], {
     cwd,
+    env: {
+      ...process.env,
+      GIT_TERMINAL_PROMPT: "0",
+      GCM_INTERACTIVE: "Never"
+    },
     stdout: "pipe",
     stderr: "pipe"
   });
@@ -1843,12 +1848,14 @@ async function ensureRuntimeBinaries(runtimeRoot, runtimeTag) {
     server: join2(binDir, runtimeBinaryFilename("server", platformKey)),
     localbuddy: join2(binDir, runtimeBinaryFilename("localbuddy", platformKey)),
     remotebuddy: join2(binDir, runtimeBinaryFilename("remotebuddy", platformKey)),
+    workerpals: join2(binDir, runtimeBinaryFilename("workerpals", platformKey)),
     sourceControlManager: join2(binDir, runtimeBinaryFilename("source_control_manager", platformKey))
   };
   const requiredAssets = [
     runtimeBinaries.server,
     runtimeBinaries.localbuddy,
     runtimeBinaries.remotebuddy,
+    runtimeBinaries.workerpals,
     runtimeBinaries.sourceControlManager
   ];
   let downloadedCount = 0;
@@ -2019,6 +2026,52 @@ async function repoHasRemote(repoRoot, remote) {
   const result = await runGit(["remote", "get-url", normalizedRemote], repoRoot);
   return result.ok && Boolean(result.stdout);
 }
+async function checkPushpalsBranchOnRemote(repoRoot, remote, branch) {
+  const normalizedRemote = String(remote ?? "").trim();
+  const normalizedBranch = String(branch ?? "").trim();
+  if (!normalizedRemote || !normalizedBranch) {
+    return { status: "ok" };
+  }
+  const hasRemote = await repoHasRemote(repoRoot, normalizedRemote);
+  if (!hasRemote) {
+    return { status: "missing_remote", remote: normalizedRemote };
+  }
+  const ref = `refs/heads/${normalizedBranch}`;
+  const result = await runGit(["ls-remote", "--heads", normalizedRemote, ref], repoRoot);
+  if (!result.ok) {
+    const detail = result.stderr || result.stdout || `exit ${result.exitCode}`;
+    return {
+      status: "error",
+      remote: normalizedRemote,
+      branch: normalizedBranch,
+      detail
+    };
+  }
+  if (!result.stdout.trim()) {
+    return {
+      status: "missing_branch",
+      remote: normalizedRemote,
+      branch: normalizedBranch
+    };
+  }
+  return { status: "ok" };
+}
+async function enforcePushpalsRemoteBranchPrecheck(repoRoot, remote, branch) {
+  const result = await checkPushpalsBranchOnRemote(repoRoot, remote, branch);
+  if (result.status === "ok")
+    return true;
+  if (result.status === "missing_remote") {
+    console.warn(`[pushpals] Precheck: git remote "${result.remote}" is not configured in this repo; cannot verify pushpals branch.`);
+    return true;
+  }
+  if (result.status === "missing_branch") {
+    console.error(`[pushpals] Precheck failed: remote branch "${result.remote}/${result.branch}" was not found.`);
+    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;
+}
 async function probeServer(serverUrl) {
   try {
     const response = await fetchWithTimeout(`${serverUrl}/healthz`, {}, HTTP_TIMEOUT_MS);
@@ -2233,6 +2286,7 @@ async function autoStartRuntimeServices(opts) {
     useRuntimeConfig: opts.preparedRuntime.preflightUsesEmbeddedRuntime,
     sessionId: opts.sessionId
   });
+  runtimeEnv.PUSHPALS_WORKERPALS_BIN = runtimeBinaries.workerpals;
   if (runtimeEnv.PUSHPALS_GIT_BIN) {
     applyResolvedGitBinaryToRuntimeEnv(runtimeEnv, runtimeEnv.PUSHPALS_GIT_BIN);
   }
@@ -2251,6 +2305,7 @@ async function autoStartRuntimeServices(opts) {
   appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] runtimeRoot=${runtimeRoot}`);
   appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] runtimeTag=${runtimeTag}`);
   appendRuntimeServicesLogLine(runtimeServicesLogPath, `[pushpals] repoRoot=${opts.repoRoot}`);
+  console.log(`[pushpals] pushpals log: ${runtimeServicesLogPath}`);
   console.log(`[pushpals] runtime services log: ${runtimeServicesLogPath}`);
   console.log(`[pushpals] service log (server)=${serviceLogPaths.server}`);
   console.log(`[pushpals] service log (localbuddy)=${serviceLogPaths.localbuddy}`);
@@ -2409,7 +2464,10 @@ ${tail}` : ""}`);
       }
       console.log("[pushpals] Embedded runtime is ready.");
       appendRuntimeServicesLogLine(runtimeServicesLogPath, "[pushpals] embedded runtime is ready.");
-      return services;
+      return {
+        services,
+        pushpalsLogPath: runtimeServicesLogPath
+      };
     }
     await Bun.sleep(DEFAULT_RUNTIME_BOOT_POLL_MS);
   }
@@ -2440,6 +2498,7 @@ function readCliState(pathValue) {
       localAgentUrl: typeof parsed.localAgentUrl === "string" ? parsed.localAgentUrl : undefined,
       sessionId: typeof parsed.sessionId === "string" ? parsed.sessionId : undefined,
       repoRoot: typeof parsed.repoRoot === "string" ? parsed.repoRoot : undefined,
+      pushpalsLogPath: typeof parsed.pushpalsLogPath === "string" ? parsed.pushpalsLogPath : undefined,
       updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : undefined
     };
   } catch {
@@ -2973,6 +3032,10 @@ async function main() {
   } else {
     console.warn("[pushpals] RemoteBuddy autonomy is disabled in config (remotebuddy.autonomy.enabled=false); continuing.");
   }
+  const precheckPassed = await enforcePushpalsRemoteBranchPrecheck(repoRoot, config.sourceControlManager.remote, config.sourceControlManager.mainBranch);
+  if (!precheckPassed) {
+    process.exit(1);
+  }
   const serverUrl = normalizeLoopbackUrl(parsed.serverUrl ?? process.env.PUSHPALS_SERVER_URL, config.server.url);
   const localAgentUrl = normalizeLoopbackUrl(parsed.localAgentUrl ?? process.env.EXPO_PUBLIC_LOCAL_AGENT_URL, config.client.localAgentUrl);
   const sessionId = String(parsed.sessionId ?? process.env.PUSHPALS_SESSION_ID ?? config.sessionId).trim();
@@ -2986,6 +3049,7 @@ async function main() {
     repoRoot
   };
   let autoStartedServices = [];
+  let pushpalsLogPath;
   const stopAutoStartedServices = () => {
     if (autoStartedServices.length === 0)
       return;
@@ -3001,7 +3065,7 @@ async function main() {
   if (!serverHealthy) {
     if (!parsed.noAutoStart) {
       try {
-        autoStartedServices = await autoStartRuntimeServices({
+        const startedRuntime = await autoStartRuntimeServices({
           repoRoot,
           serverUrl,
           localAgentUrl,
@@ -3012,6 +3076,8 @@ async function main() {
           requestedRuntimeTag: parsed.runtimeTag,
           startLocalBuddy: resolveCliLocalBuddyAutostart(parsed.runtimeOnly, Boolean(config.localbuddy.enabled))
         });
+        autoStartedServices = startedRuntime.services;
+        pushpalsLogPath = startedRuntime.pushpalsLogPath;
         serverHealthy = await probeServer(serverUrl);
       } catch (err) {
         console.error(`[pushpals] Auto-start failed: ${String(err)}`);
@@ -3065,6 +3131,7 @@ async function main() {
   }
   const statePath = resolveCliStatePath(repoRoot);
   const saved = statePath ? readCliState(statePath) : {};
+  pushpalsLogPath = pushpalsLogPath || (typeof saved.pushpalsLogPath === "string" ? saved.pushpalsLogPath : undefined);
   const preferredHubUrl = normalizeUrl(parsed.monitoringHubUrl ?? process.env.PUSHPALS_MONITOR_URL ?? saved.monitoringHubUrl ?? "");
   const monitorPort = parsePositiveInt(process.env.PUSHPALS_CLIENT_PORT, DEFAULT_MONITOR_PORT);
   const monitoringHub = await resolveMonitoringHub({
@@ -3080,7 +3147,8 @@ async function main() {
       serverUrl,
       localAgentUrl,
       sessionId: activeSessionId,
-      repoRoot
+      repoRoot,
+      pushpalsLogPath
     });
   } else {
     console.warn("[pushpals] Could not resolve git metadata dir; skipping CLI state persistence.");
@@ -3097,6 +3165,7 @@ async function main() {
   console.log(`[pushpals] serverUrl=${serverUrl}`);
   console.log(`[pushpals] sessionId=${activeSessionId}`);
   console.log(`[pushpals] repoRoot=${repoRoot}`);
+  console.log(`[pushpals] pushpalsLog=${pushpalsLogPath ?? "unavailable"}`);
   console.log(`[pushpals] cliStateFile=${statePath ?? "unavailable"}`);
   if (parsed.runtimeOnly) {
     console.log("[pushpals] runtimeOnly=true");
@@ -3197,6 +3266,7 @@ ${line}
       console.log(`[pushpals] serverUrl=${serverUrl}`);
       console.log(`[pushpals] sessionId=${activeSessionId}`);
       console.log(`[pushpals] repoRoot=${repoRoot}`);
+      console.log(`[pushpals] pushpalsLog=${pushpalsLogPath ?? "unavailable"}`);
       console.log(monitoringHubUrl ? `[pushpals] monitoringHubUrl=${monitoringHubUrl}` : "[pushpals] monitoringHubUrl=unavailable");
       rl.prompt();
       continue;

package/package.json

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