@pushpalsdev/cli 1.0.57 → 1.0.60

package/dist/pushpals-cli.js

@@ -146,6 +146,36 @@ class ServiceManager {
     this.services.set(spec.name, service);
     return service;
   }
+  replaceService(spec, options = {}) {
+    const existing = this.services.get(spec.name);
+    if (existing && !existing.exited) {
+      try {
+        const pid = existing.proc.pid;
+        if (process.platform === "win32" && typeof pid === "number" && pid > 0) {
+          Bun.spawnSync(["taskkill", "/PID", String(pid), "/T", "/F"], {
+            stdin: "ignore",
+            stdout: "ignore",
+            stderr: "ignore"
+          });
+        } else {
+          existing.proc.kill("SIGKILL");
+        }
+      } catch {}
+    }
+    const state = this.ensureState(spec.name);
+    if (state.pendingRestartTimer) {
+      clearTimeout(state.pendingRestartTimer);
+      state.pendingRestartTimer = null;
+    }
+    state.nextRestartAtMs = 0;
+    state.lastRestartReason = "";
+    if (options.resetAttempts !== false) {
+      state.attempts = 0;
+    }
+    this.degradedServiceReasons.delete(spec.name);
+    this.emitHealthChange();
+    return this.startService(spec);
+  }
   getServices() {
     return Array.from(this.services.values());
   }
@@ -1923,6 +1953,7 @@ function buildWorkerpalSandboxPaths(runtimeRoot) {
     dockerfilePath: join2(root, "apps", "workerpals", "Dockerfile.sandbox"),
     packageJsonPath: join2(root, "package.json"),
     workerpalsDir: join2(root, "apps", "workerpals"),
+    remotebuddyFallbackBundlePath: join2(root, ".pushpals-remotebuddy-fallback.js"),
     sharedDir: join2(root, "packages", "shared"),
     protocolDir: join2(root, "packages", "protocol"),
     configsDir: join2(root, "configs"),
@@ -2558,6 +2589,9 @@ function readLogTail(logPath, maxLines = 40) {
   return lines.slice(-maxLines).join(`
 `);
 }
+function hasStandaloneBunCrashSignature(text) {
+  return /\bpanic\(main thread\)|\bsegmentation fault\b|oh no:\s*bun has crashed\b/i.test(String(text ?? ""));
+}
 function extractRemoteBuddyAutonomousEngineState(logText) {
   const text = String(logText ?? "");
   if (!text)
@@ -3966,17 +4000,23 @@ async function autoStartRuntimeServices(opts) {
       }
     }
   });
-  const launchService = (name, command) => {
+  const buildManagedServiceSpec = (name, command, launchOpts = {}) => {
+    const cwd = launchOpts.cwd ?? opts.repoRoot;
     const logPath = serviceLogPaths[name];
-    const header = `[pushpals] service=${name} command=${command.join(" ")} cwd=${opts.repoRoot}`;
-    writeFileSync(logPath, `${header}
+    const header = `[pushpals] service=${name} command=${command.join(" ")} cwd=${cwd}`;
+    if (launchOpts.appendLog && existsSync5(logPath)) {
+      appendFileSync(logPath, `${header}
 `, "utf8");
+    } else {
+      writeFileSync(logPath, `${header}
+`, "utf8");
+    }
     appendRuntimeServicesLogLine(runtimeServicesLogPath, header);
-    return serviceManager.startService({
+    return {
       name,
       color: "",
       command,
-      cwd: opts.repoRoot,
+      cwd,
       env: runtimeEnv,
       logPath,
       onStdoutLine: (line) => {
@@ -3991,7 +4031,44 @@ async function autoStartRuntimeServices(opts) {
 `, "utf8");
         appendRuntimeServicesLogLine(runtimeServicesLogPath, `[${name}] ${serviceLine}`);
       }
+    };
+  };
+  const launchService = (name, command, launchOpts) => {
+    return serviceManager.startService(buildManagedServiceSpec(name, command, launchOpts));
+  };
+  const replaceService = (name, command, launchOpts) => {
+    return serviceManager.replaceService(buildManagedServiceSpec(name, command, launchOpts));
+  };
+  const sandboxPaths = buildWorkerpalSandboxPaths(runtimeRoot);
+  const remoteBuddyFallbackBun = process.platform === "win32" ? resolveEmbeddedBunExecutableFromEnv(runtimeEnv, process.platform, process.execPath) : "";
+  const remoteBuddySourceFallback = process.platform === "win32" && remoteBuddyFallbackBun && existsSync5(sandboxPaths.remotebuddyFallbackBundlePath) ? {
+    cwd: sandboxPaths.root,
+    bunBin: remoteBuddyFallbackBun,
+    bundlePath: sandboxPaths.remotebuddyFallbackBundlePath
+  } : null;
+  let remoteBuddyFallbackActivated = false;
+  const maybeActivateRemoteBuddyWindowsFallback = () => {
+    if (remoteBuddyFallbackActivated || !remoteBuddySourceFallback)
+      return false;
+    const tail = readLogTail(serviceLogPaths.remotebuddy, 120);
+    if (!hasStandaloneBunCrashSignature(tail))
+      return false;
+    remoteBuddyFallbackActivated = true;
+    lastReportedRemoteBuddyAutonomyState = "unknown";
+    console.warn("[pushpals] Embedded RemoteBuddy standalone binary crashed on Windows; retrying with source fallback under bun.");
+    appendRuntimeServicesLogLine(runtimeServicesLogPath, "[pushpals] embedded remotebuddy standalone binary crashed on Windows; retrying with source fallback under bun.");
+    replaceService("remotebuddy", [
+      remoteBuddySourceFallback.bunBin,
+      remoteBuddySourceFallback.bundlePath,
+      "--server",
+      opts.serverUrl,
+      "--sessionId",
+      opts.sessionId
+    ], {
+      cwd: remoteBuddySourceFallback.cwd,
+      appendLog: true
     });
+    return true;
   };
   const serverHealthy = await probeServer(opts.serverUrl);
   if (!serverHealthy) {
@@ -4129,6 +4206,10 @@ ${tail}` : ""}`);
     reportRemoteBuddyAutonomousEngineState();
     for (const service of serviceManager.getServices()) {
       if (service.exited) {
+        if (service.name === "remotebuddy" && maybeActivateRemoteBuddyWindowsFallback()) {
+          await Bun.sleep(DEFAULT_RUNTIME_BOOT_POLL_MS);
+          continue;
+        }
         if (isOptionalEmbeddedService(service.name)) {
           const runtimeServiceName2 = service.name;
           const serviceLogPath2 = service.logPath ?? serviceLogPaths[runtimeServiceName2];
@@ -4168,6 +4249,10 @@ ${tail}` : ""}`);
         for (const service of serviceManager.getServices()) {
           if (!service.exited)
             continue;
+          if (service.name === "remotebuddy" && maybeActivateRemoteBuddyWindowsFallback()) {
+            await Bun.sleep(250);
+            continue;
+          }
           if (isOptionalEmbeddedService(service.name)) {
             const runtimeServiceName2 = service.name;
             const serviceLogPath2 = service.logPath ?? serviceLogPaths[runtimeServiceName2];

package/package.json

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