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

package/lib/server/gateway.js

@@ -2,6 +2,7 @@ const path = require("path");
 const { spawn, execSync } = require("child_process");
 const fs = require("fs");
 const net = require("net");
+const { getManagedOpenclawBinPath } = require("./openclaw-runtime");
 const {
   ALPHACLAW_DIR,
   OPENCLAW_DIR,
@@ -48,6 +49,16 @@ const gatewayEnv = () => ({
   XDG_CONFIG_HOME: OPENCLAW_DIR,
 });
 
+const shellQuote = (value) =>
+  `'${String(value || "").replace(/'/g, `'\"'\"'`)}'`;
+
+const getOpenclawCommandPath = () => {
+  const managedBinPath = getManagedOpenclawBinPath();
+  return fs.existsSync(managedBinPath) ? managedBinPath : "openclaw";
+};
+
+const getOpenclawCommandPrefix = () => shellQuote(getOpenclawCommandPath());
+
 const writeOnboardingMarker = (reason) => {
   fs.mkdirSync(ALPHACLAW_DIR, { recursive: true });
   fs.writeFileSync(
@@ -119,9 +130,10 @@ const isGatewayRunning = () =>
   });
 
 const runGatewayCmd = (cmd) => {
-  console.log(`[alphaclaw] Running: openclaw gateway ${cmd}`);
+  const openclawCommandPrefix = getOpenclawCommandPrefix();
+  console.log(`[alphaclaw] Running: ${openclawCommandPrefix} gateway ${cmd}`);
   try {
-    const out = execSync(`openclaw gateway ${cmd}`, {
+    const out = execSync(`${openclawCommandPrefix} gateway ${cmd}`, {
       env: gatewayEnv(),
       timeout: 15000,
       encoding: "utf8",
@@ -146,7 +158,7 @@ const launchGatewayProcess = () => {
     return gatewayChild;
   }
   gatewayStderrTail = [];
-  const child = spawn("openclaw", ["gateway", "run"], {
+  const child = spawn(getOpenclawCommandPath(), ["gateway", "run"], {
     env: gatewayEnv(),
     stdio: ["pipe", "pipe", "pipe"],
   });
@@ -306,7 +318,7 @@ const syncChannelConfig = (savedVars, mode = "all") => {
             const appToken = savedMap[def.extraEnvKeys?.[0]];
             if (!appToken) continue;
             execSync(
-              `openclaw channels add --channel slack --bot-token "${token}" --app-token "${appToken}"`,
+              `${getOpenclawCommandPrefix()} channels add --channel slack --bot-token "${token}" --app-token "${appToken}"`,
               { env, timeout: 15000, encoding: "utf8" },
             );
             let raw = fs.readFileSync(configPath, "utf8");
@@ -318,11 +330,14 @@ const syncChannelConfig = (savedVars, mode = "all") => {
             }
             fs.writeFileSync(configPath, raw);
           } else {
-            execSync(`openclaw channels add --channel ${ch} --token "${token}"`, {
-              env,
-              timeout: 15000,
-              encoding: "utf8",
-            });
+            execSync(
+              `${getOpenclawCommandPrefix()} channels add --channel ${ch} --token "${token}"`,
+              {
+                env,
+                timeout: 15000,
+                encoding: "utf8",
+              },
+            );
             const raw = fs.readFileSync(configPath, "utf8");
             if (raw.includes(token)) {
               fs.writeFileSync(
@@ -344,11 +359,14 @@ const syncChannelConfig = (savedVars, mode = "all") => {
       ) {
         console.log(`[alphaclaw] Removing channel: ${ch}`);
         try {
-          execSync(`openclaw channels remove --channel ${ch} --delete`, {
-            env,
-            timeout: 15000,
-            encoding: "utf8",
-          });
+          execSync(
+            `${getOpenclawCommandPrefix()} channels remove --channel ${ch} --delete`,
+            {
+              env,
+              timeout: 15000,
+              encoding: "utf8",
+            },
+          );
           console.log(`[alphaclaw] Channel ${ch} removed`);
         } catch (e) {
           console.error(

package/lib/server/openclaw-runtime.js

@@ -11,7 +11,6 @@ const {
   isPackageRootSymlink,
   packLocalPackageForInstall,
   resolvePackageRootFromEntryPath,
-  seedRuntimeFromBundledInstall,
 } = require("./package-fingerprint");
 
 const getManagedOpenclawRuntimeDir = ({ rootDir = kRootDir } = {}) =>
@@ -157,6 +156,49 @@ 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 output = String(
+    execSyncImpl(
+      `${shellQuote(process.execPath)} ${shellQuote(postinstallScriptPath)} 2>&1`,
+      {
+        cwd: packageRoot,
+        env,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 180000,
+      },
+    ) || "",
+  ).trim();
+  if (output) {
+    logger.log(output);
+  }
+  if (output.includes(kBundledPluginPostinstallFailureMarker)) {
+    throw new Error(output);
+  }
+  return true;
+};
+
 const installManagedOpenclawRuntime = ({
   execSyncImpl,
   fsModule = fs,
@@ -191,6 +233,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,
       },
@@ -198,47 +244,12 @@ const installManagedOpenclawRuntime = ({
   } finally {
     packedSource?.cleanup?.();
   }
-  const installedVersion = readManagedOpenclawRuntimeVersion({
-    fsModule,
-    runtimeDir,
-  });
-  applyManagedOpenclawPatch({
+  runManagedOpenclawBundledPluginPostinstall({
     execSyncImpl,
     fsModule,
     logger,
     runtimeDir,
-    version: installedVersion,
-    alphaclawRoot,
-  });
-  return {
-    spec: normalizedSpec,
-    version: installedVersion,
-  };
-};
-
-const seedManagedOpenclawRuntimeFromBundledInstall = ({
-  execSyncImpl,
-  fsModule = fs,
-  logger = console,
-  runtimeDir,
-  bundledPackageRoot,
-  alphaclawRoot,
-} = {}) => {
-  const seedResult = seedRuntimeFromBundledInstall({
-    fsModule,
-    packageRoot: bundledPackageRoot,
-    runtimeDir,
-    runtimePackageJson: {
-      name: "alphaclaw-openclaw-runtime",
-      private: true,
-    },
   });
-  if (!seedResult.seeded) {
-    return {
-      seeded: false,
-      version: null,
-    };
-  }
   const installedVersion = readManagedOpenclawRuntimeVersion({
     fsModule,
     runtimeDir,
@@ -251,9 +262,8 @@ const seedManagedOpenclawRuntimeFromBundledInstall = ({
     version: installedVersion,
     alphaclawRoot,
   });
-  logger.log("[alphaclaw] Seeded managed OpenClaw runtime from bundled node_modules");
   return {
-    seeded: true,
+    spec: normalizedSpec,
     version: installedVersion,
   };
 };
@@ -323,35 +333,10 @@ const syncManagedOpenclawRuntimeWithBundled = ({
     logger.log(
       runtimeVersion
         ? `[alphaclaw] Managed OpenClaw runtime ${runtimeVersion} is older than bundled ${bundledVersion}; syncing runtime...`
-        : `[alphaclaw] Managed OpenClaw runtime missing; seeding bundled OpenClaw ${bundledVersion}...`,
+        : `[alphaclaw] Managed OpenClaw runtime missing; installing bundled OpenClaw ${bundledVersion}...`,
     );
   }
 
-  if (!runtimeVersion) {
-    try {
-      const seedResult = seedManagedOpenclawRuntimeFromBundledInstall({
-        execSyncImpl,
-        fsModule,
-        logger,
-        runtimeDir,
-        bundledPackageRoot,
-        alphaclawRoot,
-      });
-      if (seedResult.seeded) {
-        return {
-          checked: true,
-          synced: true,
-          bundledVersion,
-          runtimeVersion: seedResult.version || bundledVersion,
-        };
-      }
-    } catch (error) {
-      logger.log(
-        `[alphaclaw] Could not seed managed OpenClaw runtime from bundled node_modules: ${error.message}`,
-      );
-    }
-  }
-
   const installResult = installManagedOpenclawRuntime({
     execSyncImpl,
     fsModule,
@@ -402,6 +387,6 @@ module.exports = {
   prependManagedOpenclawBinToPath,
   readBundledOpenclawVersion,
   readManagedOpenclawRuntimeVersion,
-  seedManagedOpenclawRuntimeFromBundledInstall,
+  runManagedOpenclawBundledPluginPostinstall,
   syncManagedOpenclawRuntimeWithBundled,
 };

package/package.json

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