@chrysb/alphaclaw 0.8.7-beta.5 → 0.8.7-beta.7

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");
@@ -156,6 +157,84 @@ const applyManagedOpenclawPatch = ({
   return true;
 };
 
+const kDisableBundledPluginPostinstallEnv =
+  "OPENCLAW_DISABLE_BUNDLED_PLUGIN_POSTINSTALL";
+const kBundledPluginPostinstallFailureMarker =
+  "[postinstall] could not install bundled plugin deps:";
+
+const runManagedOpenclawBundledPluginPostinstall = ({
+  execSyncImpl,
+  fsModule = fs,
+  logger = console,
+  runtimeDir,
+} = {}) => {
+  const packageRoot = getManagedOpenclawPackageRoot({ runtimeDir });
+  const postinstallScriptPath = path.join(
+    packageRoot,
+    "scripts",
+    "postinstall-bundled-plugins.mjs",
+  );
+  if (!fsModule.existsSync(postinstallScriptPath)) {
+    return false;
+  }
+  const env = { ...process.env };
+  delete env[kDisableBundledPluginPostinstallEnv];
+  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;
+};
+
 const installManagedOpenclawRuntime = ({
   execSyncImpl,
   fsModule = fs,
@@ -190,6 +269,10 @@ const installManagedOpenclawRuntime = ({
       `npm install ${shellQuote(installTarget)} --omit=dev --no-save --save=false --package-lock=false --prefer-online`,
       {
         cwd: runtimeDir,
+        env: {
+          ...process.env,
+          [kDisableBundledPluginPostinstallEnv]: "1",
+        },
         stdio: "inherit",
         timeout: 180000,
       },
@@ -197,6 +280,12 @@ const installManagedOpenclawRuntime = ({
   } finally {
     packedSource?.cleanup?.();
   }
+  runManagedOpenclawBundledPluginPostinstall({
+    execSyncImpl,
+    fsModule,
+    logger,
+    runtimeDir,
+  });
   const installedVersion = readManagedOpenclawRuntimeVersion({
     fsModule,
     runtimeDir,
@@ -334,5 +423,6 @@ module.exports = {
   prependManagedOpenclawBinToPath,
   readBundledOpenclawVersion,
   readManagedOpenclawRuntimeVersion,
+  runManagedOpenclawBundledPluginPostinstall,
   syncManagedOpenclawRuntimeWithBundled,
 };

package/package.json

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