openclaw-manager 0.1.4 → 0.1.5

package/bin/commands/reset.js

@@ -1,66 +1,19 @@
-import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
-import { resolveConfigPaths } from "../lib/config.js";
 import { stopAll } from "./stop-all.js";
-import { listSandboxDirs, removeSandboxDir } from "../lib/sandbox.js";
+import { listSandboxDirs } from "../lib/sandbox.js";
+import { resetEnvironmentShared } from "../lib/reset-shared.js";
 export function resetManager(flags) {
-    const messages = [];
-    const errors = [];
-    const stopResult = stopAll(flags);
-    messages.push(...stopResult.messages);
-    if (!stopResult.ok && stopResult.error) {
-        messages.push(`warn: stop-all failed (${stopResult.error})`);
-    }
-    const configPath = resolveConfigPaths(flags);
-    if (isSafeConfigDir(configPath.configDir)) {
-        try {
-            if (fs.existsSync(configPath.configDir)) {
-                fs.rmSync(configPath.configDir, { recursive: true, force: true });
-                messages.push(`config: removed (${configPath.configDir})`);
-            }
-            else {
-                messages.push(`config: not found (${configPath.configDir})`);
-            }
-        }
-        catch (err) {
-            errors.push(`config: failed to remove (${configPath.configDir}): ${String(err)}`);
-        }
-    }
-    else {
-        errors.push(`config: refuse remove unsafe path (${configPath.configDir})`);
-    }
-    const sandboxes = listSandboxDirs();
-    if (!sandboxes.length) {
-        messages.push("sandbox: none");
-    }
-    else {
-        for (const dir of sandboxes) {
-            const result = removeSandboxDir(dir);
-            if (result.ok) {
-                messages.push(`sandbox: ${result.message}`);
-            }
-            else {
-                errors.push(`sandbox: ${result.error ?? "remove failed"}`);
-            }
-        }
-    }
-    if (errors.length) {
-        return { ok: false, messages, error: errors.join("; ") };
-    }
-    return { ok: true, messages };
-}
-function isSafeConfigDir(target) {
-    const resolved = path.resolve(target);
-    const home = os.homedir();
-    if (!resolved.startsWith(home))
-        return false;
-    const base = path.basename(resolved);
-    if (base.includes("openclaw-manager") || base.includes("clawdbot-manager")) {
-        return true;
-    }
-    return (resolved.endsWith(".openclaw-manager") ||
-        resolved.endsWith(".clawdbot-manager") ||
-        resolved.includes(`${path.sep}.openclaw-manager${path.sep}`) ||
-        resolved.includes(`${path.sep}.clawdbot-manager${path.sep}`));
+    return resetEnvironmentShared({
+        flags: {
+            dryRun: flags.dryRun,
+            keepClawdbot: flags.keepClawdbot,
+            noStop: flags.noStop,
+            force: flags.force,
+            configDir: flags.configDir,
+            configPath: flags.configPath,
+            installDir: flags.installDir,
+            clawdbotDir: flags.clawdbotDir
+        },
+        stopAll: () => stopAll(flags),
+        sandboxDirs: listSandboxDirs()
+    });
 }

package/bin/lib/args.js

@@ -11,7 +11,13 @@ const longKeyMap = {
     "config-path": "configPath",
     "log-path": "logPath",
     "error-log-path": "errorLogPath",
-    "non-interactive": "nonInteractive"
+    "non-interactive": "nonInteractive",
+    "dry-run": "dryRun",
+    "keep-clawdbot": "keepClawdbot",
+    "no-stop": "noStop",
+    force: "force",
+    "install-dir": "installDir",
+    "clawdbot-dir": "clawdbotDir"
 };
 const shortKeyMap = {
     h: "help",
@@ -32,7 +38,13 @@ export function parseArgs(argv) {
         if (arg.startsWith("--")) {
             const [rawKey, inlineValue] = arg.slice(2).split("=");
             const key = longKeyMap[rawKey] ?? rawKey;
-            if (key === "help" || key === "version" || key === "nonInteractive") {
+            if (key === "help" ||
+                key === "version" ||
+                key === "nonInteractive" ||
+                key === "dryRun" ||
+                key === "keepClawdbot" ||
+                key === "noStop" ||
+                key === "force") {
                 flags[key] = true;
             }
             else if (inlineValue !== undefined) {

package/bin/lib/help.js

@@ -1,7 +1,7 @@
 import { printBanner } from "./banner.js";
 export function printHelp() {
     printBanner();
-    console.log(`\nUsage:\n  openclaw-manager <command> [options]\n\nCommands:\n  start     Start OpenClaw Manager\n  stop      Stop the running Manager process\n  stop-all  Stop Manager, sandboxes, and gateway processes\n  reset     Stop all and remove local manager data\n\nOptions:\n  -h, --help            Show help\n  -v, --version         Show version\n  -u, --user <name>     Admin username (start)\n  -p, --pass <value>    Admin password (start)\n  --non-interactive     Fail instead of prompting for credentials\n  --api-port <port>     API port (default: 17321)\n  --api-host <host>     API host (default: 0.0.0.0)\n  --config-dir <dir>    Config directory\n  --config-path <path>  Config file path\n`);
+    console.log(`\nUsage:\n  openclaw-manager <command> [options]\n\nCommands:\n  start     Start OpenClaw Manager\n  stop      Stop the running Manager process\n  stop-all  Stop Manager, sandboxes, and gateway processes\n  reset     Stop all and remove local manager data\n\nOptions:\n  -h, --help            Show help\n  -v, --version         Show version\n  -u, --user <name>     Admin username (start)\n  -p, --pass <value>    Admin password (start)\n  --non-interactive     Fail instead of prompting for credentials\n  --api-port <port>     API port (default: 17321)\n  --api-host <host>     API host (default: 0.0.0.0)\n  --config-dir <dir>    Config directory\n  --config-path <path>  Config file path\n  --install-dir <dir>   Install directory (reset)\n  --clawdbot-dir <dir>  Clawdbot data directory (reset)\n  --dry-run             Print removals without deleting (reset)\n  --keep-clawdbot       Keep ~/.clawdbot (reset)\n  --no-stop             Skip stopping services (reset)\n  --force               Allow removing non-default paths (reset)\n`);
 }
 export function printWelcome() {
     printBanner();

package/bin/lib/reset-shared.js

@@ -0,0 +1,137 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+export function resetEnvironmentShared(params) {
+    const messages = [];
+    const errors = [];
+    const flags = params.flags ?? {};
+    if (!flags.noStop && params.stopAll) {
+        const stopResult = params.stopAll();
+        messages.push(...stopResult.messages);
+        if (!stopResult.ok && stopResult.error) {
+            messages.push(`warn: stop-all failed (${stopResult.error})`);
+        }
+    }
+    else {
+        messages.push("manager: skipped");
+    }
+    const targets = buildResetTargets(flags, params.sandboxDirs);
+    const seen = new Set();
+    for (const target of targets) {
+        const resolved = path.resolve(target.path);
+        if (!resolved || seen.has(resolved))
+            continue;
+        seen.add(resolved);
+        if (!isSafeResetPath(resolved)) {
+            errors.push(`refuse remove unsafe path (${resolved})`);
+            continue;
+        }
+        if (!flags.force && !isExpectedResetPath(resolved)) {
+            errors.push(`refuse remove ${resolved} (use --force)`);
+            continue;
+        }
+        if (flags.dryRun) {
+            messages.push(`[dry-run] ${target.label}: remove ${resolved}`);
+            continue;
+        }
+        if (!fs.existsSync(resolved)) {
+            messages.push(`${target.label}: not found (${resolved})`);
+            continue;
+        }
+        try {
+            fs.rmSync(resolved, { recursive: true, force: true });
+            messages.push(`${target.label}: removed (${resolved})`);
+        }
+        catch (err) {
+            errors.push(`${target.label}: failed to remove (${resolved}): ${String(err)}`);
+        }
+    }
+    if (errors.length) {
+        return { ok: false, error: errors.join("; "), messages };
+    }
+    return { ok: true, messages };
+}
+function buildResetTargets(flags, sandboxDirs) {
+    const configDirs = resolveConfigDirs(flags);
+    const installDirs = resolveInstallDirs(flags);
+    const clawdbotDir = flags.keepClawdbot ? "" : resolveClawdbotDir(flags);
+    const sandboxes = sandboxDirs && sandboxDirs.length ? sandboxDirs : listSandboxDirs();
+    const targets = [
+        ...configDirs.map((dir) => ({ label: "config", path: dir })),
+        ...installDirs.map((dir) => ({ label: "install", path: dir })),
+        ...sandboxes.map((dir) => ({ label: "sandbox", path: dir }))
+    ];
+    if (clawdbotDir) {
+        targets.push({ label: "clawdbot", path: clawdbotDir });
+    }
+    return targets.filter((entry) => Boolean(entry.path));
+}
+function resolveConfigDirs(flags) {
+    const explicitDir = normalizePath(flags.configDir) ?? normalizePath(process.env.MANAGER_CONFIG_DIR);
+    const explicitPath = normalizePath(flags.configPath) ?? normalizePath(process.env.MANAGER_CONFIG_PATH);
+    if (explicitDir)
+        return [explicitDir];
+    if (explicitPath)
+        return [path.dirname(explicitPath)];
+    const home = os.homedir();
+    if (isRootUser()) {
+        return ["/etc/openclaw-manager", "/etc/clawdbot-manager"];
+    }
+    return [path.join(home, ".openclaw-manager"), path.join(home, ".clawdbot-manager")];
+}
+function resolveInstallDirs(flags) {
+    const explicit = normalizePath(flags.installDir) ?? normalizePath(process.env.MANAGER_INSTALL_DIR);
+    if (explicit)
+        return [explicit];
+    const home = os.homedir();
+    if (isRootUser()) {
+        return ["/opt/openclaw-manager", "/opt/clawdbot-manager"];
+    }
+    return [path.join(home, "openclaw-manager"), path.join(home, "clawdbot-manager")];
+}
+function resolveClawdbotDir(flags) {
+    const explicit = normalizePath(flags.clawdbotDir) ?? normalizePath(process.env.CLAWDBOT_DIR);
+    if (explicit)
+        return explicit;
+    return path.join(os.homedir(), ".clawdbot");
+}
+function listSandboxDirs() {
+    const dir = os.tmpdir();
+    let entries = [];
+    try {
+        entries = fs.readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return [];
+    }
+    return entries
+        .filter((entry) => {
+        return (entry.isDirectory() &&
+            (entry.name.startsWith("openclaw-manager-sandbox-") ||
+                entry.name.startsWith("clawdbot-manager-sandbox-")));
+    })
+        .map((entry) => path.join(dir, entry.name));
+}
+function isSafeResetPath(resolved) {
+    if (!resolved)
+        return false;
+    const blocked = new Set([path.resolve("/"), path.resolve(os.homedir()), path.resolve(os.tmpdir())]);
+    return !blocked.has(path.resolve(resolved));
+}
+function isExpectedResetPath(resolved) {
+    const normalized = resolved.replace(/\\/g, "/");
+    return (normalized.includes("/openclaw-manager") ||
+        normalized.includes("/.openclaw-manager") ||
+        normalized.includes("/clawdbot-manager") ||
+        normalized.includes("/.clawdbot-manager") ||
+        normalized.includes("/.clawdbot"));
+}
+function normalizePath(value) {
+    if (typeof value !== "string")
+        return null;
+    const trimmed = value.trim();
+    return trimmed ? trimmed : null;
+}
+function isRootUser() {
+    return typeof process.getuid === "function" && process.getuid() === 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-manager",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "bin": {
     "openclaw-manager": "bin/openclaw-manager.js"