@pushpalsdev/cli 1.0.13 → 1.0.15

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"
   });
@@ -2019,6 +2024,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);
@@ -2251,6 +2302,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}`);
@@ -2323,7 +2375,7 @@ ${tail}` : ""}`);
   reportRemoteBuddyAutonomousEngineState();
   const scmHealthy = await probeSourceControlManager(opts.sourceControlManagerPort);
   const scmRemoteAvailable = await repoHasRemote(opts.repoRoot, opts.sourceControlManagerRemote);
-  const gitForScm = typeof runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE === "string" && runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE.trim() ? runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE.trim() : typeof runtimeEnv.PUSHPALS_GIT_BIN === "string" && runtimeEnv.PUSHPALS_GIT_BIN.trim() ? runtimeEnv.PUSHPALS_GIT_BIN.trim() : "git";
+  const gitForScm = typeof runtimeEnv.PUSHPALS_GIT_BIN === "string" && runtimeEnv.PUSHPALS_GIT_BIN.trim() ? runtimeEnv.PUSHPALS_GIT_BIN.trim() : typeof runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE === "string" && runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE.trim() ? runtimeEnv.PUSHPALS_GIT_BIN_ABSOLUTE.trim() : "git";
   const gitProbeCommand = [gitForScm, "--version"];
   const gitAvailableForScm = await canSpawnCommand(gitProbeCommand, opts.repoRoot, runtimeEnv);
   if (!scmHealthy && scmRemoteAvailable) {
@@ -2973,6 +3025,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();

package/package.json

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