@opentrust/cli 7.3.35 → 7.3.37

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.37",
+        "@opentrust/gateway": "^7.3.37",
+        "@opentrust/dashboard": "^7.3.37",
     },
 };
 const ENV_TEMPLATE = `# OpenTrust Configuration

package/dist/lib/command-handler.js

@@ -282,13 +282,13 @@ function runClawPluginCmd(cmd, timeoutMs = 180_000) {
 }
 function handleInstallGuards(payload) {
     const version = payload.version || "latest";
-    const spec = version === "latest" ? "@opentrust/guards" : `@opentrust/guards@${version}`;
+    const spec = version === "latest" ? "@opentrust/opentrust-guard" : `@opentrust/opentrust-guard@${version}`;
     return runClawPluginCmd(`openclaw plugins install ${spec}`);
 }
 function handleUpgradeGuards(payload) {
     const version = payload.version || "latest";
-    const spec = version === "latest" ? "@opentrust/guards" : `@opentrust/guards@${version}`;
-    const uninstall = runClawPluginCmd("openclaw plugins uninstall @opentrust/guards --force", 60_000);
+    const spec = version === "latest" ? "@opentrust/opentrust-guard" : `@opentrust/opentrust-guard@${version}`;
+    const uninstall = runClawPluginCmd("openclaw plugins uninstall @opentrust/opentrust-guard --force", 60_000);
     if (!uninstall.success)
         return uninstall;
     const install = runClawPluginCmd(`openclaw plugins install ${spec}`);
@@ -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,76 +351,152 @@ 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)...");
+    // Ensure plugins.allow includes opentrust-guard
+    if (!config.plugins)
+        config.plugins = {};
+    if (!Array.isArray(config.plugins.allow))
+        config.plugins.allow = [];
+    if (!config.plugins.allow.includes("opentrust-guard")) {
+        config.plugins.allow.push("opentrust-guard");
+    }
+    const clawHome = path.join(os.homedir(), ".openclaw");
+    const configFile = path.join(clawHome, "openclaw.json");
+    // Helper: resolve openclaw binary with extra PATH entries
+    const resolveExtraPaths = () => {
+        const extra = [
+            path.join(os.homedir(), ".local", "bin"),
+            path.join(os.homedir(), ".openclaw", "bin"),
+            "/usr/local/bin",
+        ];
+        try {
+            const npmPrefix = execSync("npm config get prefix", { encoding: "utf-8", timeout: 5_000 }).trim();
+            if (npmPrefix)
+                extra.push(path.join(npmPrefix, "bin"));
+        }
+        catch { }
+        return extra;
+    };
+    const makeEnv = (extraPaths) => {
+        const { OPENCLAW_HOME: _, ...rest } = process.env;
+        return { ...rest, HOME: os.homedir(), PATH: `${extraPaths.join(":")}:${process.env.PATH ?? ""}` };
+    };
+    // Step 1: Write initial config (so install script detects it and skips interactive setup)
+    cmdLog("[1/5] Writing ~/.openclaw/openclaw.json ...");
+    await sendProgress();
+    try {
+        fs.mkdirSync(clawHome, { recursive: true });
+        fs.writeFileSync(configFile, JSON.stringify(config, null, 2) + "\n", "utf-8");
+        cmdLog(`[1/5] Config written to ${configFile}`);
+    }
+    catch (err) {
+        const msg = `Failed to write config: ${(err.message || String(err)).slice(0, 500)}`;
+        cmdLog(`[1/5] ${msg}`);
+        await sendProgress();
+        return { success: false, output: _cmdOutput.join("\n"), error: msg };
+    }
+    await sendProgress();
+    // Step 2: Install OpenClaw via curl (non-interactive)
+    cmdLog("[2/5] 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/5] 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/5] OpenClaw install script finished (exit code ignored)");
         }
         else {
-            cmdLog(`[1/3] Install script exited with code ${code}`);
+            cmdLog(`[2/5] Install script exited with code ${code}`);
         }
     }
     await sendProgress();
-    // Step 2: Write openclaw.json config
-    cmdLog("[2/3] Writing ~/.openclaw/openclaw.json ...");
+    // Step 3: Non-interactive onboarding + daemon install
+    const clawBin = findOpenclawBin();
+    cmdLog(`[3/5] Running onboarding (${clawBin} onboard --non-interactive --install-daemon)...`);
     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(`[2/3] Config written to ${configFile}`);
+        const extraPaths = resolveExtraPaths();
+        execSync(`${clawBin} onboard --non-interactive --install-daemon`, {
+            encoding: "utf-8",
+            timeout: 120_000,
+            stdio: ["ignore", "inherit", "inherit"],
+            cwd: os.homedir(),
+            env: {
+                ...makeEnv(extraPaths),
+                CI: "1",
+                NONINTERACTIVE: "1",
+                OPENCLAW_ACCEPT_TOS: "1",
+                OPENCLAW_ACCEPT_RISK: "1",
+            },
+        });
+        cmdLog("[3/5] Onboarding completed");
     }
     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 };
+        const code = err.status;
+        cmdLog(`[3/5] Onboarding exited with code ${code ?? "unknown"} (continuing)`);
     }
     await sendProgress();
-    // Step 3: Auto-install Guards plugin
-    const clawBin = findOpenclawBin();
-    cmdLog(`[3/3] Installing Guards plugin (${clawBin} plugins install @opentrust/guards)...`);
+    // Step 4: Re-write config (onboarding may have overwritten our template)
+    cmdLog("[4/5] Re-writing config (ensuring our template + plugins.allow)...");
     await sendProgress();
     try {
-        const extraPaths = [
-            path.join(os.homedir(), ".local", "bin"),
-            path.join(os.homedir(), ".openclaw", "bin"),
-            "/usr/local/bin",
-        ].join(":");
-        const { OPENCLAW_HOME: _, ...restEnv } = process.env;
-        execSync(`${clawBin} plugins install @opentrust/guards`, {
+        // Merge: read current config from disk (onboarding may have added fields), overlay our template
+        let merged = config;
+        try {
+            const diskConfig = JSON.parse(fs.readFileSync(configFile, "utf-8"));
+            merged = { ...diskConfig, ...config, plugins: { ...diskConfig.plugins, ...config.plugins } };
+            // Re-ensure plugins.allow
+            if (!Array.isArray(merged.plugins.allow))
+                merged.plugins.allow = [];
+            if (!merged.plugins.allow.includes("opentrust-guard"))
+                merged.plugins.allow.push("opentrust-guard");
+        }
+        catch { }
+        fs.writeFileSync(configFile, JSON.stringify(merged, null, 2) + "\n", "utf-8");
+        cmdLog("[4/5] Config written with plugins.allow: " + JSON.stringify(merged.plugins.allow));
+    }
+    catch (err) {
+        cmdLog(`[4/5] Config re-write failed: ${(err.message || String(err)).slice(0, 200)}`);
+    }
+    await sendProgress();
+    // Step 5: Auto-install Guards plugin
+    cmdLog(`[5/5] Installing Guards plugin (${clawBin} plugins install @opentrust/opentrust-guard)...`);
+    await sendProgress();
+    try {
+        const extraPaths = resolveExtraPaths();
+        execSync(`${clawBin} plugins install @opentrust/opentrust-guard`, {
             encoding: "utf-8",
             timeout: 180_000,
             stdio: ["pipe", "pipe", "pipe"],
             cwd: os.homedir(),
-            env: { ...restEnv, HOME: os.homedir(), PATH: `${extraPaths}:${process.env.PATH ?? ""}` },
+            env: makeEnv(extraPaths),
         });
-        cmdLog("[3/3] Guards plugin installed successfully");
+        cmdLog("[5/5] Guards plugin installed successfully");
     }
     catch (err) {
         const stderr = err.stderr?.toString() || "";
         const stdout = err.stdout?.toString() || "";
         if (isOnlyWarnings(stderr) || isOnlyWarnings(stdout + stderr)) {
-            cmdLog("[3/3] Guards plugin installed (with warnings)");
+            cmdLog("[5/5] Guards plugin installed (with warnings)");
         }
         else {
             const errMsg = (stderr || err.message || String(err)).slice(0, 300);
-            cmdLog(`[3/3] Guards plugin install failed: ${errMsg}`);
+            cmdLog(`[5/5] Guards plugin install failed: ${errMsg}`);
         }
     }
     cmdLog("install_openclaw complete");

package/package.json

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