@opentrust/cli 7.3.35 → 7.3.36

package/dist/commands/init.js

@@ -13,9 +13,9 @@ const SCAFFOLD_PKG = {
         status: "opentrust status",
     },
     dependencies: {
-        "@opentrust/core": "^7.3.35",
-        "@opentrust/gateway": "^7.3.35",
-        "@opentrust/dashboard": "^7.3.35",
+        "@opentrust/core": "^7.3.36",
+        "@opentrust/gateway": "^7.3.36",
+        "@opentrust/dashboard": "^7.3.36",
     },
 };
 const ENV_TEMPLATE = `# OpenTrust Configuration

package/dist/lib/command-handler.js

@@ -305,10 +305,24 @@ function findOpenclawBin() {
         "/usr/local/bin/openclaw",
         path.join(os.homedir(), ".openclaw", "bin", "openclaw"),
     ];
+    // Try npm global bin path
+    try {
+        const npmPrefix = execSync("npm config get prefix", { encoding: "utf-8", timeout: 5_000 }).trim();
+        if (npmPrefix)
+            candidates.push(path.join(npmPrefix, "bin", "openclaw"));
+    }
+    catch { }
     for (const p of candidates) {
         if (fs.existsSync(p))
             return p;
     }
+    // Last resort: try `which openclaw`
+    try {
+        const w = execSync("which openclaw", { encoding: "utf-8", timeout: 5_000 }).trim();
+        if (w)
+            return w;
+    }
+    catch { }
     return "openclaw";
 }
 async function handleInstallOpenclaw(payload, progress) {
@@ -337,48 +351,62 @@ async function handleInstallOpenclaw(payload, progress) {
         });
         cmdLog(`Guards URLs → dashboardUrl=${gc.dashboardUrl}, coreUrl=${gc.coreUrl}`);
     }
-    // Step 1: Install OpenClaw via curl
-    cmdLog("[1/3] Installing OpenClaw (curl -fsSL https://openclaw.ai/install.sh | bash)...");
+    // Step 1: Write openclaw.json config FIRST (so install script detects it and skips onboarding)
+    cmdLog("[1/3] Writing ~/.openclaw/openclaw.json ...");
+    await sendProgress();
+    try {
+        const clawHome = path.join(os.homedir(), ".openclaw");
+        fs.mkdirSync(clawHome, { recursive: true });
+        const configFile = path.join(clawHome, "openclaw.json");
+        fs.writeFileSync(configFile, JSON.stringify(config, null, 2) + "\n", "utf-8");
+        cmdLog(`[1/3] Config written to ${configFile}`);
+    }
+    catch (err) {
+        const msg = `Failed to write config: ${(err.message || String(err)).slice(0, 500)}`;
+        cmdLog(`[1/3] ${msg}`);
+        await sendProgress();
+        return { success: false, output: _cmdOutput.join("\n"), error: msg };
+    }
+    await sendProgress();
+    // Step 2: Install OpenClaw via curl (non-interactive: CI=1, pipe stdin to /dev/null)
+    cmdLog("[2/3] Installing OpenClaw (curl -fsSL https://openclaw.ai/install.sh | bash)...");
     await sendProgress();
     try {
         execSync("curl -fsSL https://openclaw.ai/install.sh | bash", {
             encoding: "utf-8",
-            timeout: 180_000,
-            stdio: ["pipe", "inherit", "inherit"],
+            timeout: 300_000,
+            stdio: ["ignore", "inherit", "inherit"],
             cwd: os.homedir(),
-            env: { ...process.env, HOME: os.homedir() },
+            env: {
+                ...process.env,
+                HOME: os.homedir(),
+                CI: "1",
+                NONINTERACTIVE: "1",
+                OPENCLAW_ACCEPT_TOS: "1",
+            },
             shell: "/bin/bash",
         });
-        cmdLog("[1/3] OpenClaw install script completed");
+        cmdLog("[2/3] OpenClaw install script completed");
     }
     catch (err) {
         const code = err.status;
         if (code === 0 || code === null) {
-            cmdLog("[1/3] OpenClaw install script finished (exit code ignored)");
+            cmdLog("[2/3] OpenClaw install script finished (exit code ignored)");
         }
         else {
-            cmdLog(`[1/3] Install script exited with code ${code}`);
+            cmdLog(`[2/3] Install script exited with code ${code}`);
         }
     }
     await sendProgress();
-    // Step 2: Write openclaw.json config
-    cmdLog("[2/3] Writing ~/.openclaw/openclaw.json ...");
-    await sendProgress();
+    // Re-write config (install script may have overwritten it during setup)
     try {
-        const clawHome = path.join(os.homedir(), ".openclaw");
-        fs.mkdirSync(clawHome, { recursive: true });
-        const configFile = path.join(clawHome, "openclaw.json");
+        const configFile = path.join(os.homedir(), ".openclaw", "openclaw.json");
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2) + "\n", "utf-8");
-        cmdLog(`[2/3] Config written to ${configFile}`);
-    }
-    catch (err) {
-        const msg = `Failed to write config: ${(err.message || String(err)).slice(0, 500)}`;
-        cmdLog(`[2/3] ${msg}`);
-        await sendProgress();
-        return { success: false, output: _cmdOutput.join("\n"), error: msg };
+        cmdLog("[2/3] Config re-written (ensuring our template is used)");
     }
+    catch { }
     await sendProgress();
-    // Step 3: Auto-install Guards plugin
+    // Step 3: Auto-install Guards plugin — resolve openclaw binary from multiple locations
     const clawBin = findOpenclawBin();
     cmdLog(`[3/3] Installing Guards plugin (${clawBin} plugins install @opentrust/guards)...`);
     await sendProgress();
@@ -387,14 +415,21 @@ async function handleInstallOpenclaw(payload, progress) {
             path.join(os.homedir(), ".local", "bin"),
             path.join(os.homedir(), ".openclaw", "bin"),
             "/usr/local/bin",
-        ].join(":");
+        ];
+        // Also discover npm global bin directory
+        try {
+            const npmBin = execSync("npm config get prefix", { encoding: "utf-8", timeout: 5_000 }).trim();
+            if (npmBin)
+                extraPaths.push(path.join(npmBin, "bin"));
+        }
+        catch { }
         const { OPENCLAW_HOME: _, ...restEnv } = process.env;
         execSync(`${clawBin} plugins install @opentrust/guards`, {
             encoding: "utf-8",
             timeout: 180_000,
             stdio: ["pipe", "pipe", "pipe"],
             cwd: os.homedir(),
-            env: { ...restEnv, HOME: os.homedir(), PATH: `${extraPaths}:${process.env.PATH ?? ""}` },
+            env: { ...restEnv, HOME: os.homedir(), PATH: `${extraPaths.join(":")}:${process.env.PATH ?? ""}` },
         });
         cmdLog("[3/3] Guards plugin installed successfully");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentrust/cli",
-  "version": "7.3.35",
+  "version": "7.3.36",
   "description": "CLI tool to manage OpenTrust AI Agent Runtime Security Platform — setup, start, stop, status, logs",
   "type": "module",
   "bin": {