@chrysb/alphaclaw 0.8.7-beta.6 → 0.8.7-beta.8

package/lib/public/js/hooks/use-app-shell-controller.js

@@ -20,6 +20,7 @@ import { showToast } from "../components/toast.js";
 
 export const useAppShellController = ({ location = "" } = {}) => {
   const kInitialStatusPollDelayMs = 5000;
+  const kOpenclawUpdateRestartTimeoutMs = 5 * 60 * 1000;
   const [onboarded, setOnboarded] = useState(null);
   const [authEnabled, setAuthEnabled] = useState(false);
   const [acVersion, setAcVersion] = useState(null);
@@ -249,7 +250,10 @@ export const useAppShellController = ({ location = "" } = {}) => {
       const data = await updateOpenclaw();
       if (data?.ok && data?.restarting) {
         setOpenclawRestarting(true);
-        await waitForAlphaclawRestart();
+        await waitForAlphaclawRestart({
+          timeoutMs: kOpenclawUpdateRestartTimeoutMs,
+          timeoutErrorMessage: "OpenClaw update is taking longer than expected",
+        });
         window.location.reload();
         return { ...data, restartHandled: true };
       }

package/lib/public/js/lib/api.js

@@ -536,6 +536,7 @@ export async function waitForAlphaclawRestart({
   initialDelayMs = 1500,
   intervalMs = 1000,
   timeoutMs = 60000,
+  timeoutErrorMessage = "AlphaClaw restart is taking longer than expected",
 } = {}) {
   const deadline = Date.now() + Math.max(0, Number(timeoutMs) || 0);
   await delay(initialDelayMs);
@@ -559,7 +560,7 @@ export async function waitForAlphaclawRestart({
     await delay(intervalMs);
   }
 
-  throw new Error("AlphaClaw restart is taking longer than expected");
+  throw new Error(String(timeoutErrorMessage || "AlphaClaw restart is taking longer than expected"));
 }
 
 export async function fetchSyncCron() {

package/lib/server/openclaw-runtime.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 
 const { kRootDir } = require("./constants");
@@ -178,24 +179,59 @@ const runManagedOpenclawBundledPluginPostinstall = ({
   }
   const env = { ...process.env };
   delete env[kDisableBundledPluginPostinstallEnv];
-  const output = String(
-    execSyncImpl(
-      `${shellQuote(process.execPath)} ${shellQuote(postinstallScriptPath)} 2>&1`,
-      {
-        cwd: packageRoot,
-        env,
-        encoding: "utf8",
-        stdio: ["ignore", "pipe", "pipe"],
-        timeout: 180000,
-      },
-    ) || "",
-  ).trim();
+  const logDir = fsModule.mkdtempSync(
+    path.join(os.tmpdir(), "openclaw-bundled-postinstall-"),
+  );
+  const logPath = path.join(logDir, "postinstall.log");
+  let commandError = null;
+  let output = "";
+  let stdoutFd;
+  let stderrFd;
+  try {
+    stdoutFd = fsModule.openSync(logPath, "a");
+    stderrFd = fsModule.openSync(logPath, "a");
+    try {
+      execSyncImpl(
+        `${shellQuote(process.execPath)} ${shellQuote(postinstallScriptPath)}`,
+        {
+          cwd: packageRoot,
+          env,
+          stdio: ["ignore", stdoutFd, stderrFd],
+          timeout: 180000,
+        },
+      );
+    } catch (error) {
+      commandError = error;
+    }
+  } finally {
+    if (typeof stdoutFd === "number") {
+      try {
+        fsModule.closeSync(stdoutFd);
+      } catch {}
+    }
+    if (typeof stderrFd === "number") {
+      try {
+        fsModule.closeSync(stderrFd);
+      } catch {}
+    }
+    try {
+      output = String(fsModule.readFileSync(logPath, "utf8") || "").trim();
+    } catch {
+      output = "";
+    }
+    try {
+      fsModule.rmSync(logDir, { recursive: true, force: true });
+    } catch {}
+  }
   if (output) {
     logger.log(output);
   }
   if (output.includes(kBundledPluginPostinstallFailureMarker)) {
     throw new Error(output);
   }
+  if (commandError) {
+    throw commandError;
+  }
   return true;
 };
 

package/lib/server/openclaw-version.js

@@ -1,4 +1,4 @@
-const { execSync } = require("child_process");
+const { execFileSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const {
@@ -7,6 +7,7 @@ const {
   kRootDir,
 } = require("./constants");
 const { normalizeOpenclawVersion } = require("./helpers");
+const { getManagedOpenclawBinPath } = require("./openclaw-runtime");
 const { parseJsonObjectFromNoisyOutput } = require("./utils/json");
 
 const createOpenclawVersionService = ({
@@ -25,6 +26,11 @@ const createOpenclawVersionService = ({
   const buildOpenclawInstallSpec = (version = "latest") =>
     `openclaw@${String(version || "").trim() || "latest"}`;
 
+  const getOpenclawCommandPath = () => {
+    const managedBinPath = getManagedOpenclawBinPath();
+    return fs.existsSync(managedBinPath) ? managedBinPath : "openclaw";
+  };
+
   const readOpenclawVersion = () => {
     const now = Date.now();
     if (
@@ -34,9 +40,9 @@ const createOpenclawVersionService = ({
       return kOpenclawVersionCache.value;
     }
     try {
-      const raw = execSync("openclaw --version", {
+      const raw = execFileSync(getOpenclawCommandPath(), ["--version"], {
         env: gatewayEnv(),
-        timeout: 5000,
+        timeout: 10000,
         encoding: "utf8",
       }).trim();
       const version = normalizeOpenclawVersion(raw);
@@ -60,11 +66,16 @@ const createOpenclawVersionService = ({
       };
     }
     try {
-      const raw = execSync("openclaw update status --json", {
+      const raw = execFileSync(
+        getOpenclawCommandPath(),
+        ["update", "status", "--json"],
+        {
         env: gatewayEnv(),
-        timeout: 8000,
-        encoding: "utf8",
-      }).trim();
+          timeout: 30000,
+          maxBuffer: 4 * 1024 * 1024,
+          encoding: "utf8",
+        },
+      ).trim();
       const parsed = parseJsonObjectFromNoisyOutput(raw);
       if (!parsed) {
         throw new Error("openclaw update status returned invalid JSON payload");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.8.7-beta.6",
+  "version": "0.8.7-beta.8",
   "publishConfig": {
     "access": "public"
   },