@chrysb/alphaclaw 0.8.4-beta.0 → 0.8.5

package/lib/server/alphaclaw-version.js

@@ -1,5 +1,6 @@
 const childProcess = require("child_process");
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 const https = require("https");
 const http = require("http");
@@ -7,6 +8,7 @@ const {
   kLatestVersionCacheTtlMs,
   kAlphaclawRegistryUrl,
   kNpmPackageRoot,
+  kOpenclawUpdateCopyTimeoutMs,
   kRootDir,
 } = require("./constants");
 
@@ -114,7 +116,7 @@ const createAlphaclawVersionService = () => {
       const parent = path.dirname(dir);
       if (
         path.basename(parent) === "node_modules" ||
-        parent.includes("node_modules")
+        parent.includes(`${path.sep}node_modules${path.sep}`)
       ) {
         dir = parent;
         continue;
@@ -123,7 +125,11 @@ const createAlphaclawVersionService = () => {
       if (fs.existsSync(pkgPath)) {
         try {
           const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-          if (pkg.dependencies?.["@chrysb/alphaclaw"]) {
+          if (
+            pkg.dependencies?.["@chrysb/alphaclaw"] ||
+            pkg.devDependencies?.["@chrysb/alphaclaw"] ||
+            pkg.optionalDependencies?.["@chrysb/alphaclaw"]
+          ) {
             return parent;
           }
         } catch {}
@@ -137,19 +143,39 @@ const createAlphaclawVersionService = () => {
   const installLatestAlphaclaw = () =>
     new Promise((resolve, reject) => {
       const installDir = findInstallDir();
+      const tmpDir = fs.mkdtempSync(
+        path.join(os.tmpdir(), "alphaclaw-update-"),
+      );
+
+      const cleanup = () => {
+        try {
+          fs.rmSync(tmpDir, { recursive: true, force: true });
+        } catch {}
+      };
+
+      fs.writeFileSync(
+        path.join(tmpDir, "package.json"),
+        JSON.stringify({
+          private: true,
+          dependencies: { "@chrysb/alphaclaw": "latest" },
+        }),
+      );
+
+      const npmEnv = {
+        ...process.env,
+        npm_config_update_notifier: "false",
+        npm_config_fund: "false",
+        npm_config_audit: "false",
+      };
+
       console.log(
-        `[alphaclaw] Running: npm install @chrysb/alphaclaw@latest (cwd: ${installDir})`,
+        `[alphaclaw] Running: npm install @chrysb/alphaclaw@latest in temp dir (target: ${installDir})`,
       );
       childProcess.exec(
-        "npm install @chrysb/alphaclaw@latest --omit=dev --no-save --save=false --package-lock=false --prefer-online",
+        "npm install --omit=dev --prefer-online --package-lock=false",
         {
-          cwd: installDir,
-          env: {
-            ...process.env,
-            npm_config_update_notifier: "false",
-            npm_config_fund: "false",
-            npm_config_audit: "false",
-          },
+          cwd: tmpDir,
+          env: npmEnv,
           timeout: 180000,
         },
         (err, stdout, stderr) => {
@@ -158,6 +184,7 @@ const createAlphaclawVersionService = () => {
             console.log(
               `[alphaclaw] alphaclaw install error: ${message.slice(0, 200)}`,
             );
+            cleanup();
             return reject(
               new Error(
                 message || "Failed to install @chrysb/alphaclaw@latest",
@@ -169,8 +196,28 @@ const createAlphaclawVersionService = () => {
               `[alphaclaw] alphaclaw install stdout: ${stdout.trim().slice(0, 300)}`,
             );
           }
-          console.log("[alphaclaw] alphaclaw install completed");
-          resolve({ stdout: stdout?.trim(), stderr: stderr?.trim() });
+
+          const src = path.join(tmpDir, "node_modules");
+          const dest = path.join(installDir, "node_modules");
+          childProcess.exec(
+            `cp -af "${src}/." "${dest}/"`,
+            { timeout: kOpenclawUpdateCopyTimeoutMs },
+            (copyErr) => {
+              cleanup();
+              if (copyErr) {
+                console.log(
+                  `[alphaclaw] alphaclaw copy error: ${(copyErr.message || "").slice(0, 200)}`,
+                );
+                return reject(
+                  new Error(
+                    `Failed to copy updated AlphaClaw files: ${copyErr.message}`,
+                  ),
+                );
+              }
+              console.log("[alphaclaw] alphaclaw install completed");
+              resolve({ stdout: stdout?.trim(), stderr: stderr?.trim() });
+            },
+          );
         },
       );
     });

package/lib/server/exec-defaults-config.js

@@ -55,22 +55,21 @@ const ensureManagedExecApprovalsDefaults = (rawFile = {}) => {
   const file =
     rawFile && typeof rawFile === "object" && !Array.isArray(rawFile) ? rawFile : {};
   const before = JSON.stringify(file);
-  if (!Number.isInteger(file.version)) file.version = 1;
-  if (!file.defaults || typeof file.defaults !== "object" || Array.isArray(file.defaults)) {
-    file.defaults = {};
-  }
-  if (!file.agents || typeof file.agents !== "object" || Array.isArray(file.agents)) {
-    file.agents = {};
-  }
-  const defaults = file.defaults;
-  if (!String(defaults.security || "").trim()) {
-    defaults.security = kManagedExecApprovalsDefaults.security;
-  }
-  if (!String(defaults.ask || "").trim()) {
-    defaults.ask = kManagedExecApprovalsDefaults.ask;
-  }
-  if (!String(defaults.askFallback || "").trim()) {
-    defaults.askFallback = kManagedExecApprovalsDefaults.askFallback;
+  const defaults =
+    file.defaults && typeof file.defaults === "object" && !Array.isArray(file.defaults)
+      ? file.defaults
+      : null;
+  const hasNonEmptyDefaults = !!defaults && Object.keys(defaults).length > 0;
+  if (!hasNonEmptyDefaults) {
+    if (!Number.isInteger(file.version)) file.version = 1;
+    file.defaults = {
+      security: kManagedExecApprovalsDefaults.security,
+      ask: kManagedExecApprovalsDefaults.ask,
+      askFallback: kManagedExecApprovalsDefaults.askFallback,
+    };
+    if (!file.agents || typeof file.agents !== "object" || Array.isArray(file.agents)) {
+      file.agents = {};
+    }
   }
   return {
     file,
@@ -85,19 +84,11 @@ const ensureManagedOpenclawExecDefaults = (rawConfig = {}) => {
   if (!config.tools || typeof config.tools !== "object" || Array.isArray(config.tools)) {
     config.tools = {};
   }
-  if (
-    !config.tools.exec ||
-    typeof config.tools.exec !== "object" ||
-    Array.isArray(config.tools.exec)
-  ) {
-    config.tools.exec = {};
-  }
-  const exec = config.tools.exec;
-  if (!String(exec.security || "").trim()) {
-    exec.security = kManagedOpenclawExecDefaults.security;
-  }
-  if (!hasOwn(exec, "strictInlineEval")) {
-    exec.strictInlineEval = kManagedOpenclawExecDefaults.strictInlineEval;
+  if (!hasOwn(config.tools, "exec")) {
+    config.tools.exec = {
+      security: kManagedOpenclawExecDefaults.security,
+      strictInlineEval: kManagedOpenclawExecDefaults.strictInlineEval,
+    };
   }
   return {
     config,

package/package.json

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