@chrysb/alphaclaw 0.1.11 → 0.1.13

package/lib/server/alphaclaw-version.js

@@ -11,7 +11,11 @@ const {
 } = require("./constants");
 
 const createAlphaclawVersionService = () => {
-  let kUpdateStatusCache = { latestVersion: null, hasUpdate: false, fetchedAt: 0 };
+  let kUpdateStatusCache = {
+    latestVersion: null,
+    hasUpdate: false,
+    fetchedAt: 0,
+  };
   let kUpdateInProgress = false;
 
   const readAlphaclawVersion = () => {
@@ -30,22 +34,36 @@ const createAlphaclawVersionService = () => {
       const doGet = (url, redirects = 0) => {
         if (redirects > 3) return reject(new Error("Too many redirects"));
         const get = url.startsWith("https") ? https.get : http.get;
-        get(url, { headers: { Accept: "application/vnd.npm.install-v1+json" } }, (res) => {
-          if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-            res.resume();
-            return doGet(res.headers.location, redirects + 1);
-          }
-          let data = "";
-          res.on("data", (chunk) => { data += chunk; });
-          res.on("end", () => {
-            try {
-              const parsed = JSON.parse(data);
-              resolve(parsed["dist-tags"]?.latest || null);
-            } catch (e) {
-              reject(new Error(`Failed to parse registry response (status ${res.statusCode})`));
+        get(
+          url,
+          { headers: { Accept: "application/vnd.npm.install-v1+json" } },
+          (res) => {
+            if (
+              res.statusCode >= 300 &&
+              res.statusCode < 400 &&
+              res.headers.location
+            ) {
+              res.resume();
+              return doGet(res.headers.location, redirects + 1);
             }
-          });
-        }).on("error", reject);
+            let data = "";
+            res.on("data", (chunk) => {
+              data += chunk;
+            });
+            res.on("end", () => {
+              try {
+                const parsed = JSON.parse(data);
+                resolve(parsed["dist-tags"]?.latest || null);
+              } catch (e) {
+                reject(
+                  new Error(
+                    `Failed to parse registry response (status ${res.statusCode})`,
+                  ),
+                );
+              }
+            });
+          },
+        ).on("error", reject);
       };
       doGet(kAlphaclawRegistryUrl);
     });
@@ -64,7 +82,11 @@ const createAlphaclawVersionService = () => {
     }
     const currentVersion = readAlphaclawVersion();
     const latestVersion = await fetchLatestVersionFromRegistry();
-    const hasUpdate = !!(currentVersion && latestVersion && latestVersion !== currentVersion);
+    const hasUpdate = !!(
+      currentVersion &&
+      latestVersion &&
+      latestVersion !== currentVersion
+    );
     kUpdateStatusCache = { latestVersion, hasUpdate, fetchedAt: Date.now() };
     console.log(
       `[alphaclaw] alphaclaw update status: hasUpdate=${hasUpdate} current=${currentVersion} latest=${latestVersion || "unknown"}`,
@@ -78,7 +100,10 @@ const createAlphaclawVersionService = () => {
     let dir = kNpmPackageRoot;
     while (dir !== path.dirname(dir)) {
       const parent = path.dirname(dir);
-      if (path.basename(parent) === "node_modules" || parent.includes("node_modules")) {
+      if (
+        path.basename(parent) === "node_modules" ||
+        parent.includes("node_modules")
+      ) {
         dir = parent;
         continue;
       }
@@ -100,9 +125,11 @@ const createAlphaclawVersionService = () => {
   const installLatestAlphaclaw = () =>
     new Promise((resolve, reject) => {
       const installDir = findInstallDir();
-      console.log(`[alphaclaw] Running: npm install @chrysb/alphaclaw@latest (cwd: ${installDir})`);
+      console.log(
+        `[alphaclaw] Running: npm install @chrysb/alphaclaw@latest (cwd: ${installDir})`,
+      );
       exec(
-        "npm install @chrysb/alphaclaw@latest --omit=dev --no-save --package-lock=false",
+        "npm install @chrysb/alphaclaw@latest --omit=dev --no-save --package-lock=false --prefer-online",
         {
           cwd: installDir,
           env: {
@@ -116,11 +143,19 @@ const createAlphaclawVersionService = () => {
         (err, stdout, stderr) => {
           if (err) {
             const message = String(stderr || err.message || "").trim();
-            console.log(`[alphaclaw] alphaclaw install error: ${message.slice(0, 200)}`);
-            return reject(new Error(message || "Failed to install @chrysb/alphaclaw@latest"));
+            console.log(
+              `[alphaclaw] alphaclaw install error: ${message.slice(0, 200)}`,
+            );
+            return reject(
+              new Error(
+                message || "Failed to install @chrysb/alphaclaw@latest",
+              ),
+            );
           }
           if (stdout?.trim()) {
-            console.log(`[alphaclaw] alphaclaw install stdout: ${stdout.trim().slice(0, 300)}`);
+            console.log(
+              `[alphaclaw] alphaclaw install stdout: ${stdout.trim().slice(0, 300)}`,
+            );
           }
           console.log("[alphaclaw] alphaclaw install completed");
           resolve({ stdout: stdout?.trim(), stderr: stderr?.trim() });
@@ -157,7 +192,9 @@ const createAlphaclawVersionService = () => {
   const getVersionStatus = async (refresh) => {
     const currentVersion = readAlphaclawVersion();
     try {
-      const { latestVersion, hasUpdate } = await readAlphaclawUpdateStatus({ refresh });
+      const { latestVersion, hasUpdate } = await readAlphaclawUpdateStatus({
+        refresh,
+      });
       return { ok: true, currentVersion, latestVersion, hasUpdate };
     } catch (err) {
       return {
@@ -185,12 +222,19 @@ const createAlphaclawVersionService = () => {
       // Write marker to persistent volume so the update survives container recreation
       const markerPath = path.join(kRootDir, ".alphaclaw-update-pending");
       try {
-        fs.writeFileSync(markerPath, JSON.stringify({ from: previousVersion, ts: Date.now() }));
+        fs.writeFileSync(
+          markerPath,
+          JSON.stringify({ from: previousVersion, ts: Date.now() }),
+        );
         console.log(`[alphaclaw] Update marker written to ${markerPath}`);
       } catch (e) {
         console.log(`[alphaclaw] Could not write update marker: ${e.message}`);
       }
-      kUpdateStatusCache = { latestVersion: null, hasUpdate: false, fetchedAt: 0 };
+      kUpdateStatusCache = {
+        latestVersion: null,
+        hasUpdate: false,
+        fetchedAt: 0,
+      };
       return {
         status: 200,
         body: {

package/lib/server/constants.js

@@ -7,8 +7,8 @@ const parsePositiveIntEnv = (value, fallbackValue) => {
 };
 
 // Portable root directory: --root-dir flag sets ALPHACLAW_ROOT_DIR before require
-const kRootDir = process.env.ALPHACLAW_ROOT_DIR
-  || path.join(os.homedir(), ".alphaclaw");
+const kRootDir =
+  process.env.ALPHACLAW_ROOT_DIR || path.join(os.homedir(), ".alphaclaw");
 const kPackageRoot = path.resolve(__dirname, "..");
 const kNpmPackageRoot = path.resolve(kPackageRoot, "..");
 const kSetupDir = path.join(kPackageRoot, "setup");
@@ -21,7 +21,13 @@ const OPENCLAW_DIR = path.join(kRootDir, ".openclaw");
 const GATEWAY_TOKEN = process.env.OPENCLAW_GATEWAY_TOKEN || "";
 const ENV_FILE_PATH = path.join(kRootDir, ".env");
 const WORKSPACE_DIR = path.join(OPENCLAW_DIR, "workspace");
-const AUTH_PROFILES_PATH = path.join(OPENCLAW_DIR, "agents", "main", "agent", "auth-profiles.json");
+const AUTH_PROFILES_PATH = path.join(
+  OPENCLAW_DIR,
+  "agents",
+  "main",
+  "agent",
+  "auth-profiles.json",
+);
 const CODEX_PROFILE_ID = "openai-codex:codex-cli";
 const CODEX_OAUTH_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
 const CODEX_OAUTH_AUTHORIZE_URL = "https://auth.openai.com/oauth/authorize";
@@ -195,13 +201,15 @@ const SCOPE_MAP = {
 const REVERSE_SCOPE_MAP = Object.fromEntries(
   Object.entries(SCOPE_MAP).map(([k, v]) => [v, k]),
 );
-const BASE_SCOPES = ["openid", "https://www.googleapis.com/auth/userinfo.email"];
+const BASE_SCOPES = [
+  "openid",
+  "https://www.googleapis.com/auth/userinfo.email",
+];
 
 const GOG_CONFIG_DIR = path.join(OPENCLAW_DIR, "gogcli");
 const GOG_CREDENTIALS_PATH = path.join(GOG_CONFIG_DIR, "credentials.json");
 const GOG_STATE_PATH = path.join(GOG_CONFIG_DIR, "state.json");
-const GOG_KEYRING_PASSWORD =
-  process.env.GOG_KEYRING_PASSWORD || "alphaclaw";
+const GOG_KEYRING_PASSWORD = process.env.GOG_KEYRING_PASSWORD || "alphaclaw";
 
 const API_TEST_COMMANDS = {
   gmail: "gmail labels list",

package/lib/server/openclaw-version.js

@@ -1,12 +1,18 @@
 const { exec, execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
 const {
   kVersionCacheTtlMs,
   kLatestVersionCacheTtlMs,
-  kAppDir,
+  kNpmPackageRoot,
 } = require("./constants");
 const { normalizeOpenclawVersion } = require("./helpers");
 
-const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded }) => {
+const createOpenclawVersionService = ({
+  gatewayEnv,
+  restartGateway,
+  isOnboarded,
+}) => {
   let kOpenclawVersionCache = { value: null, fetchedAt: 0 };
   let kOpenclawUpdateStatusCache = {
     latestVersion: null,
@@ -58,7 +64,8 @@ const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded
       }).trim();
       const parsed = JSON.parse(raw);
       const latestVersion = normalizeOpenclawVersion(
-        parsed?.availability?.latestVersion || parsed?.update?.registry?.latestVersion,
+        parsed?.availability?.latestVersion ||
+          parsed?.update?.registry?.latestVersion,
       );
       const hasUpdate = !!parsed?.availability?.available;
       kOpenclawUpdateStatusCache = {
@@ -80,11 +87,42 @@ const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded
 
   const installLatestOpenclaw = () =>
     new Promise((resolve, reject) => {
-      console.log("[alphaclaw] Running: npm install --omit=dev --no-save --package-lock=false openclaw@latest");
+      const installDir = (() => {
+        // Resolve the consumer app root (for example /app in Docker), not this package directory.
+        let dir = kNpmPackageRoot;
+        while (dir !== path.dirname(dir)) {
+          const parent = path.dirname(dir);
+          if (
+            path.basename(parent) === "node_modules" ||
+            parent.includes(`${path.sep}node_modules${path.sep}`)
+          ) {
+            dir = parent;
+            continue;
+          }
+          const pkgPath = path.join(parent, "package.json");
+          if (fs.existsSync(pkgPath)) {
+            try {
+              const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+              if (
+                pkg.dependencies?.["@chrysb/alphaclaw"] ||
+                pkg.devDependencies?.["@chrysb/alphaclaw"] ||
+                pkg.optionalDependencies?.["@chrysb/alphaclaw"]
+              ) {
+                return parent;
+              }
+            } catch {}
+          }
+          dir = parent;
+        }
+        return kNpmPackageRoot;
+      })();
+      console.log(
+        `[alphaclaw] Running: npm install --omit=dev --no-save --package-lock=false --prefer-online openclaw@latest (cwd: ${installDir})`,
+      );
       exec(
-        "npm install --omit=dev --no-save --package-lock=false openclaw@latest",
+        "npm install --omit=dev --no-save --package-lock=false --prefer-online openclaw@latest",
         {
-          cwd: kAppDir,
+          cwd: installDir,
           env: {
             ...process.env,
             npm_config_update_notifier: "false",
@@ -96,14 +134,22 @@ const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded
         (err, stdout, stderr) => {
           if (err) {
             const message = String(stderr || err.message || "").trim();
-            console.log(`[alphaclaw] openclaw install error: ${message.slice(0, 200)}`);
-            return reject(new Error(message || "Failed to install openclaw@latest"));
+            console.log(
+              `[alphaclaw] openclaw install error: ${message.slice(0, 200)}`,
+            );
+            return reject(
+              new Error(message || "Failed to install openclaw@latest"),
+            );
           }
           if (stdout && stdout.trim()) {
-            console.log(`[alphaclaw] openclaw install stdout: ${stdout.trim().slice(0, 300)}`);
+            console.log(
+              `[alphaclaw] openclaw install stdout: ${stdout.trim().slice(0, 300)}`,
+            );
           }
           if (stderr && stderr.trim()) {
-            console.log(`[alphaclaw] openclaw install stderr: ${stderr.trim().slice(0, 300)}`);
+            console.log(
+              `[alphaclaw] openclaw install stderr: ${stderr.trim().slice(0, 300)}`,
+            );
           }
           console.log("[alphaclaw] openclaw install completed");
           resolve({ stdout: stdout.trim(), stderr: stderr.trim() });
@@ -114,7 +160,9 @@ const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded
   const getVersionStatus = async (refresh) => {
     const currentVersion = readOpenclawVersion();
     try {
-      const { latestVersion, hasUpdate } = readOpenclawUpdateStatus({ refresh });
+      const { latestVersion, hasUpdate } = readOpenclawUpdateStatus({
+        refresh,
+      });
       return { ok: true, currentVersion, latestVersion, hasUpdate };
     } catch (err) {
       return {
@@ -141,7 +189,9 @@ const createOpenclawVersionService = ({ gatewayEnv, restartGateway, isOnboarded
       await installLatestOpenclaw();
       kOpenclawVersionCache = { value: null, fetchedAt: 0 };
       const currentVersion = readOpenclawVersion();
-      const { latestVersion, hasUpdate } = readOpenclawUpdateStatus({ refresh: true });
+      const { latestVersion, hasUpdate } = readOpenclawUpdateStatus({
+        refresh: true,
+      });
       let restarted = false;
       if (isOnboarded()) {
         restartGateway();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "publishConfig": {
     "access": "public"
   },