fastgrc-openclaw 1.0.23 → 1.0.25

package/dist/bin.js

@@ -91,64 +91,6 @@ function readConfig() {
 function writeConfig(data) {
   fs.writeFileSync(CONFIG_PATH, JSON.stringify(data, null, 2), { mode: 384 });
 }
-var [, , cmd, arg] = process.argv;
-if (cmd === "set-key") {
-  if (!arg) {
-    process.stderr.write("Usage: fastgrc-hook set-key fgrc_k1_...\n");
-    process.exit(1);
-  }
-  writeConfig({ ...readConfig(), apiKey: arg });
-  process.stdout.write(`\u2713 FastGRC API key saved to ${CONFIG_PATH}
-`);
-  process.stdout.write('  Run "fastgrc-hook get-key" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "get-key") {
-  const key = readConfig().apiKey;
-  if (!key) {
-    process.stdout.write("No key stored. Run: fastgrc-hook set-key fgrc_k1_...\n");
-  } else {
-    process.stdout.write(`${key.slice(0, 12)}${"*".repeat(Math.max(0, key.length - 12))}
-`);
-  }
-  process.exit(0);
-}
-if (cmd === "unset-key") {
-  const cfg = readConfig();
-  delete cfg.apiKey;
-  writeConfig(cfg);
-  process.stdout.write("FastGRC API key removed.\n");
-  process.exit(0);
-}
-if (cmd === "set-policy") {
-  if (!arg) {
-    process.stderr.write("Usage: fastgrc-hook set-policy <policy-id>\n");
-    process.exit(1);
-  }
-  writeConfig({ ...readConfig(), policyId: arg });
-  process.stdout.write(`\u2713 FastGRC policy ID saved to ${CONFIG_PATH}
-`);
-  process.stdout.write('  Run "fastgrc-hook get-policy" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "get-policy") {
-  const id = readConfig().policyId;
-  if (!id) {
-    process.stdout.write("No policy ID stored \u2014 org-wide default will be used.\n");
-    process.stdout.write("Run: fastgrc-hook set-policy <policy-id>\n");
-  } else {
-    process.stdout.write(`${id}
-`);
-  }
-  process.exit(0);
-}
-if (cmd === "unset-policy") {
-  const cfg = readConfig();
-  delete cfg.policyId;
-  writeConfig(cfg);
-  process.stdout.write("FastGRC policy ID removed \u2014 org-wide default will be used.\n");
-  process.exit(0);
-}
 function computeHandler() {
   const binPath = process.argv[1];
   const homeDir = os.homedir();
@@ -164,30 +106,7 @@ Test it directly (bypasses OpenClaw):
 `
   );
 }
-if (cmd === "restart-openclaw") {
-  const { spawn, execSync } = require("child_process");
-  try {
-    execSync("pkill -x openclaw", { stdio: "ignore" });
-    process.stdout.write("Stopped existing openclaw process(es).\n");
-  } catch {
-    process.stdout.write("No openclaw process was running.\n");
-  }
-  const logPath = process.env.OPENCLAW_LOG ?? "/tmp/openclaw.log";
-  const workDir = arg || process.cwd();
-  const out = fs.openSync(logPath, "a");
-  const child = spawn("openclaw", [], {
-    detached: true,
-    stdio: ["ignore", out, out],
-    cwd: workDir
-  });
-  child.unref();
-  process.stdout.write(`\u2713 OpenClaw started (PID: ${child.pid}, cwd: ${workDir})
-   Logs: tail -f ${logPath}
-`);
-  process.exit(0);
-}
-if (cmd === "install-hook") {
-  const targetDir = arg || process.cwd();
+function doInstallHook(targetDir) {
   const hookMdPath = path.join(targetDir, "HOOK.md");
   const { handlerStr } = computeHandler();
   const HOOK_ENTRY = `  - matcher: PreToolUse
@@ -206,7 +125,7 @@ if (cmd === "install-hook") {
 Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   const existing = fs.readFileSync(hookMdPath, "utf8");
   if (existing.includes(handlerStr)) {
@@ -214,7 +133,7 @@ Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
    Handler: ${handlerStr}
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   if (existing.includes("fastgrc-hook") || existing.includes("fastgrc-openclaw")) {
     const patched = existing.replace(
@@ -228,7 +147,7 @@ Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
 Restart OpenClaw to activate.
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   const fmEnd = existing.indexOf("\n---", 3);
   let updated;
@@ -247,10 +166,93 @@ ${HOOK_ENTRY}`;
 Restart OpenClaw to activate.
 `);
   printTestSnippet(handlerStr);
+}
+function doUninstallHook(targetDir) {
+  const hookMdPath = path.join(targetDir, "HOOK.md");
+  if (!fs.existsSync(hookMdPath)) {
+    process.stdout.write("No HOOK.md found \u2014 nothing to remove.\n");
+    return;
+  }
+  const existing = fs.readFileSync(hookMdPath, "utf8");
+  const patched = existing.replace(
+    /[ \t]*-[ \t]*matcher:[ \t]*PreToolUse\n[ \t]*handler:[ \t]*"[^"]*(?:fastgrc-hook|fastgrc-openclaw)[^"]*"\n?/,
+    ""
+  );
+  if (patched === existing) {
+    process.stdout.write("FastGRC hook not found in HOOK.md \u2014 nothing to remove.\n");
+  } else {
+    fs.writeFileSync(hookMdPath, patched, "utf8");
+    process.stdout.write(`\u2713 FastGRC hook removed from ${hookMdPath}
+`);
+  }
+}
+var [, , cmd, arg] = process.argv;
+if (cmd === "set-key") {
+  if (!arg) {
+    process.stderr.write("Usage: fastgrc-hook set-key fgrc_k1_...\n");
+    process.exit(1);
+  }
+  writeConfig({ ...readConfig(), apiKey: arg });
+  process.stdout.write(`\u2713 FastGRC API key saved to ${CONFIG_PATH}
+`);
+  process.stdout.write('  Run "fastgrc-hook get-key" to verify.\n');
+  process.exit(0);
+}
+if (cmd === "get-key") {
+  const key = readConfig().apiKey;
+  if (!key) {
+    process.stdout.write("No key stored. Run: fastgrc-hook set-key fgrc_k1_...\n");
+  } else {
+    process.stdout.write(`${key.slice(0, 12)}${"*".repeat(Math.max(0, key.length - 12))}
+`);
+  }
+  process.exit(0);
+}
+if (cmd === "unset-key") {
+  const cfg = readConfig();
+  delete cfg.apiKey;
+  writeConfig(cfg);
+  process.stdout.write("FastGRC API key removed.\n");
+  process.exit(0);
+}
+if (cmd === "set-policy") {
+  if (!arg) {
+    process.stderr.write("Usage: fastgrc-hook set-policy <policy-id>\n");
+    process.exit(1);
+  }
+  writeConfig({ ...readConfig(), policyId: arg });
+  process.stdout.write(`\u2713 FastGRC policy ID saved to ${CONFIG_PATH}
+`);
+  process.stdout.write('  Run "fastgrc-hook get-policy" to verify.\n');
+  process.exit(0);
+}
+if (cmd === "get-policy") {
+  const id = readConfig().policyId;
+  if (!id) {
+    process.stdout.write("No policy ID stored \u2014 org-wide default will be used.\n");
+    process.stdout.write("Run: fastgrc-hook set-policy <policy-id>\n");
+  } else {
+    process.stdout.write(`${id}
+`);
+  }
+  process.exit(0);
+}
+if (cmd === "unset-policy") {
+  const cfg = readConfig();
+  delete cfg.policyId;
+  writeConfig(cfg);
+  process.stdout.write("FastGRC policy ID removed \u2014 org-wide default will be used.\n");
+  process.exit(0);
+}
+if (cmd === "install-hook") {
+  doInstallHook(arg || process.cwd());
+  process.exit(0);
+}
+if (cmd === "uninstall-hook") {
+  doUninstallHook(arg || process.cwd());
   process.exit(0);
 }
 if (cmd === "setup") {
-  const { execSync } = require("child_process");
   const rest = process.argv.slice(3);
   let apiKeyArg;
   let policyIdArg;
@@ -269,71 +271,29 @@ if (cmd === "setup") {
     process.stderr.write("Usage: fastgrc-hook setup --api-key <key> [--policy-id <id>]\n");
     process.exit(1);
   }
-  const selfBin = process.argv[1];
-  process.stdout.write("Step 1/4: Installing OpenClaw plugin as root...\n");
-  try {
-    execSync("sudo openclaw plugins remove fastgrc-openclaw", { stdio: "ignore" });
-  } catch {
-  }
-  execSync("sudo openclaw plugins install fastgrc-openclaw", { stdio: "inherit" });
   writeConfig({ ...readConfig(), apiKey: apiKeyArg });
-  process.stdout.write("Step 2/4: API key saved to ~/.fastgrc.json\n");
+  process.stdout.write("\u2713 API key saved to ~/.fastgrc.json\n");
   if (policyIdArg) {
     writeConfig({ ...readConfig(), policyId: policyIdArg });
-    process.stdout.write("Step 3/4: Policy ID saved to ~/.fastgrc.json\n");
-  } else {
-    process.stdout.write("Step 3/4: No policy ID provided \u2014 org-wide default will be used.\n");
-  }
-  process.stdout.write("Step 4/4: Wiring up HOOK.md and restarting OpenClaw...\n");
-  execSync(`node "${selfBin}" install-hook`, { stdio: "inherit" });
-  execSync(`node "${selfBin}" restart-openclaw`, { stdio: "inherit" });
-  process.stdout.write('\n\u2713 FastGRC setup complete. Run "fastgrc-hook test" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "uninstall-hook") {
-  const targetDir = arg || process.cwd();
-  const hookMdPath = path.join(targetDir, "HOOK.md");
-  if (!fs.existsSync(hookMdPath)) {
-    process.stdout.write("No HOOK.md found \u2014 nothing to remove.\n");
-    process.exit(0);
-  }
-  const existing = fs.readFileSync(hookMdPath, "utf8");
-  const patched = existing.replace(
-    /[ \t]*-[ \t]*matcher:[ \t]*PreToolUse\n[ \t]*handler:[ \t]*"[^"]*(?:fastgrc-hook|fastgrc-openclaw)[^"]*"\n?/,
-    ""
-  );
-  if (patched === existing) {
-    process.stdout.write("FastGRC hook not found in HOOK.md \u2014 nothing to remove.\n");
+    process.stdout.write("\u2713 Policy ID saved to ~/.fastgrc.json\n");
   } else {
-    fs.writeFileSync(hookMdPath, patched, "utf8");
-    process.stdout.write(`\u2713 FastGRC hook removed from ${hookMdPath}
-`);
+    process.stdout.write("  (no policy ID \u2014 org-wide default will be used)\n");
   }
+  doInstallHook(process.cwd());
+  process.stdout.write("\n\u2713 Config and HOOK.md done.\n");
+  process.stdout.write('Run "fastgrc-hook test" to verify the hook.\n');
   process.exit(0);
 }
 if (cmd === "uninstall") {
-  const { execSync } = require("child_process");
-  const selfBin = process.argv[1];
   const targetDir = arg || process.cwd();
-  process.stdout.write("Removing FastGRC from this OpenClaw deployment...\n\n");
-  process.stdout.write("1. Removing OpenClaw plugin...\n");
-  try {
-    execSync("sudo openclaw plugins remove fastgrc-openclaw", { stdio: "inherit" });
-  } catch {
-    process.stdout.write("   (plugin was not installed \u2014 skipped)\n");
-  }
-  process.stdout.write("2. Clearing config...\n");
   const cfg = readConfig();
   delete cfg.apiKey;
   delete cfg.policyId;
   writeConfig(cfg);
-  process.stdout.write("   API key and policy ID removed from ~/.fastgrc.json\n");
-  process.stdout.write("3. Removing hook from HOOK.md...\n");
-  execSync(`node "${selfBin}" uninstall-hook "${targetDir}"`, { stdio: "inherit" });
-  process.stdout.write("4. Restarting OpenClaw...\n");
-  execSync(`node "${selfBin}" restart-openclaw`, { stdio: "inherit" });
+  process.stdout.write("\u2713 API key and policy ID removed from ~/.fastgrc.json\n");
+  doUninstallHook(targetDir);
   process.stdout.write(
-    "\n\u2713 FastGRC removed.\nTo fully remove the CLI: npm uninstall -g fastgrc-openclaw\n"
+    "\n\u2713 Config and HOOK.md cleaned up.\nComplete removal \u2014 run these two commands:\n  rm -rf ~/.openclaw/npm/node_modules/fastgrc-openclaw\n  npm uninstall -g fastgrc-openclaw\n"
   );
   process.exit(0);
 }
@@ -390,7 +350,7 @@ if (cmd === "test") {
 `);
   process.exit(0);
 }
-if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "restart-openclaw" || cmd === "setup" || cmd === "uninstall" || cmd === "uninstall-hook") {
+if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "setup" || cmd === "uninstall" || cmd === "install-hook" || cmd === "uninstall-hook") {
 } else {
   const apiKey = process.env.FASTGRC_API_KEY ?? readConfig().apiKey;
   if (!apiKey) {
@@ -431,7 +391,6 @@ if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "restar
       args,
       agentId,
       apiKey,
-      // narrowed at module level via early-exit guard above
       policyId,
       baseUrl
     });

package/dist/bin.mjs

@@ -1,10 +1,4 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/bin.ts
 import * as fs from "fs";
@@ -74,64 +68,6 @@ function readConfig() {
 function writeConfig(data) {
   fs.writeFileSync(CONFIG_PATH, JSON.stringify(data, null, 2), { mode: 384 });
 }
-var [, , cmd, arg] = process.argv;
-if (cmd === "set-key") {
-  if (!arg) {
-    process.stderr.write("Usage: fastgrc-hook set-key fgrc_k1_...\n");
-    process.exit(1);
-  }
-  writeConfig({ ...readConfig(), apiKey: arg });
-  process.stdout.write(`\u2713 FastGRC API key saved to ${CONFIG_PATH}
-`);
-  process.stdout.write('  Run "fastgrc-hook get-key" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "get-key") {
-  const key = readConfig().apiKey;
-  if (!key) {
-    process.stdout.write("No key stored. Run: fastgrc-hook set-key fgrc_k1_...\n");
-  } else {
-    process.stdout.write(`${key.slice(0, 12)}${"*".repeat(Math.max(0, key.length - 12))}
-`);
-  }
-  process.exit(0);
-}
-if (cmd === "unset-key") {
-  const cfg = readConfig();
-  delete cfg.apiKey;
-  writeConfig(cfg);
-  process.stdout.write("FastGRC API key removed.\n");
-  process.exit(0);
-}
-if (cmd === "set-policy") {
-  if (!arg) {
-    process.stderr.write("Usage: fastgrc-hook set-policy <policy-id>\n");
-    process.exit(1);
-  }
-  writeConfig({ ...readConfig(), policyId: arg });
-  process.stdout.write(`\u2713 FastGRC policy ID saved to ${CONFIG_PATH}
-`);
-  process.stdout.write('  Run "fastgrc-hook get-policy" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "get-policy") {
-  const id = readConfig().policyId;
-  if (!id) {
-    process.stdout.write("No policy ID stored \u2014 org-wide default will be used.\n");
-    process.stdout.write("Run: fastgrc-hook set-policy <policy-id>\n");
-  } else {
-    process.stdout.write(`${id}
-`);
-  }
-  process.exit(0);
-}
-if (cmd === "unset-policy") {
-  const cfg = readConfig();
-  delete cfg.policyId;
-  writeConfig(cfg);
-  process.stdout.write("FastGRC policy ID removed \u2014 org-wide default will be used.\n");
-  process.exit(0);
-}
 function computeHandler() {
   const binPath = process.argv[1];
   const homeDir = os.homedir();
@@ -147,30 +83,7 @@ Test it directly (bypasses OpenClaw):
 `
   );
 }
-if (cmd === "restart-openclaw") {
-  const { spawn, execSync } = __require("child_process");
-  try {
-    execSync("pkill -x openclaw", { stdio: "ignore" });
-    process.stdout.write("Stopped existing openclaw process(es).\n");
-  } catch {
-    process.stdout.write("No openclaw process was running.\n");
-  }
-  const logPath = process.env.OPENCLAW_LOG ?? "/tmp/openclaw.log";
-  const workDir = arg || process.cwd();
-  const out = fs.openSync(logPath, "a");
-  const child = spawn("openclaw", [], {
-    detached: true,
-    stdio: ["ignore", out, out],
-    cwd: workDir
-  });
-  child.unref();
-  process.stdout.write(`\u2713 OpenClaw started (PID: ${child.pid}, cwd: ${workDir})
-   Logs: tail -f ${logPath}
-`);
-  process.exit(0);
-}
-if (cmd === "install-hook") {
-  const targetDir = arg || process.cwd();
+function doInstallHook(targetDir) {
   const hookMdPath = path.join(targetDir, "HOOK.md");
   const { handlerStr } = computeHandler();
   const HOOK_ENTRY = `  - matcher: PreToolUse
@@ -189,7 +102,7 @@ if (cmd === "install-hook") {
 Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   const existing = fs.readFileSync(hookMdPath, "utf8");
   if (existing.includes(handlerStr)) {
@@ -197,7 +110,7 @@ Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
    Handler: ${handlerStr}
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   if (existing.includes("fastgrc-hook") || existing.includes("fastgrc-openclaw")) {
     const patched = existing.replace(
@@ -211,7 +124,7 @@ Restart OpenClaw \u2014 FastGRC will evaluate every tool call.
 Restart OpenClaw to activate.
 `);
     printTestSnippet(handlerStr);
-    process.exit(0);
+    return;
   }
   const fmEnd = existing.indexOf("\n---", 3);
   let updated;
@@ -230,10 +143,93 @@ ${HOOK_ENTRY}`;
 Restart OpenClaw to activate.
 `);
   printTestSnippet(handlerStr);
+}
+function doUninstallHook(targetDir) {
+  const hookMdPath = path.join(targetDir, "HOOK.md");
+  if (!fs.existsSync(hookMdPath)) {
+    process.stdout.write("No HOOK.md found \u2014 nothing to remove.\n");
+    return;
+  }
+  const existing = fs.readFileSync(hookMdPath, "utf8");
+  const patched = existing.replace(
+    /[ \t]*-[ \t]*matcher:[ \t]*PreToolUse\n[ \t]*handler:[ \t]*"[^"]*(?:fastgrc-hook|fastgrc-openclaw)[^"]*"\n?/,
+    ""
+  );
+  if (patched === existing) {
+    process.stdout.write("FastGRC hook not found in HOOK.md \u2014 nothing to remove.\n");
+  } else {
+    fs.writeFileSync(hookMdPath, patched, "utf8");
+    process.stdout.write(`\u2713 FastGRC hook removed from ${hookMdPath}
+`);
+  }
+}
+var [, , cmd, arg] = process.argv;
+if (cmd === "set-key") {
+  if (!arg) {
+    process.stderr.write("Usage: fastgrc-hook set-key fgrc_k1_...\n");
+    process.exit(1);
+  }
+  writeConfig({ ...readConfig(), apiKey: arg });
+  process.stdout.write(`\u2713 FastGRC API key saved to ${CONFIG_PATH}
+`);
+  process.stdout.write('  Run "fastgrc-hook get-key" to verify.\n');
+  process.exit(0);
+}
+if (cmd === "get-key") {
+  const key = readConfig().apiKey;
+  if (!key) {
+    process.stdout.write("No key stored. Run: fastgrc-hook set-key fgrc_k1_...\n");
+  } else {
+    process.stdout.write(`${key.slice(0, 12)}${"*".repeat(Math.max(0, key.length - 12))}
+`);
+  }
+  process.exit(0);
+}
+if (cmd === "unset-key") {
+  const cfg = readConfig();
+  delete cfg.apiKey;
+  writeConfig(cfg);
+  process.stdout.write("FastGRC API key removed.\n");
+  process.exit(0);
+}
+if (cmd === "set-policy") {
+  if (!arg) {
+    process.stderr.write("Usage: fastgrc-hook set-policy <policy-id>\n");
+    process.exit(1);
+  }
+  writeConfig({ ...readConfig(), policyId: arg });
+  process.stdout.write(`\u2713 FastGRC policy ID saved to ${CONFIG_PATH}
+`);
+  process.stdout.write('  Run "fastgrc-hook get-policy" to verify.\n');
+  process.exit(0);
+}
+if (cmd === "get-policy") {
+  const id = readConfig().policyId;
+  if (!id) {
+    process.stdout.write("No policy ID stored \u2014 org-wide default will be used.\n");
+    process.stdout.write("Run: fastgrc-hook set-policy <policy-id>\n");
+  } else {
+    process.stdout.write(`${id}
+`);
+  }
+  process.exit(0);
+}
+if (cmd === "unset-policy") {
+  const cfg = readConfig();
+  delete cfg.policyId;
+  writeConfig(cfg);
+  process.stdout.write("FastGRC policy ID removed \u2014 org-wide default will be used.\n");
+  process.exit(0);
+}
+if (cmd === "install-hook") {
+  doInstallHook(arg || process.cwd());
+  process.exit(0);
+}
+if (cmd === "uninstall-hook") {
+  doUninstallHook(arg || process.cwd());
   process.exit(0);
 }
 if (cmd === "setup") {
-  const { execSync } = __require("child_process");
   const rest = process.argv.slice(3);
   let apiKeyArg;
   let policyIdArg;
@@ -252,71 +248,29 @@ if (cmd === "setup") {
     process.stderr.write("Usage: fastgrc-hook setup --api-key <key> [--policy-id <id>]\n");
     process.exit(1);
   }
-  const selfBin = process.argv[1];
-  process.stdout.write("Step 1/4: Installing OpenClaw plugin as root...\n");
-  try {
-    execSync("sudo openclaw plugins remove fastgrc-openclaw", { stdio: "ignore" });
-  } catch {
-  }
-  execSync("sudo openclaw plugins install fastgrc-openclaw", { stdio: "inherit" });
   writeConfig({ ...readConfig(), apiKey: apiKeyArg });
-  process.stdout.write("Step 2/4: API key saved to ~/.fastgrc.json\n");
+  process.stdout.write("\u2713 API key saved to ~/.fastgrc.json\n");
   if (policyIdArg) {
     writeConfig({ ...readConfig(), policyId: policyIdArg });
-    process.stdout.write("Step 3/4: Policy ID saved to ~/.fastgrc.json\n");
-  } else {
-    process.stdout.write("Step 3/4: No policy ID provided \u2014 org-wide default will be used.\n");
-  }
-  process.stdout.write("Step 4/4: Wiring up HOOK.md and restarting OpenClaw...\n");
-  execSync(`node "${selfBin}" install-hook`, { stdio: "inherit" });
-  execSync(`node "${selfBin}" restart-openclaw`, { stdio: "inherit" });
-  process.stdout.write('\n\u2713 FastGRC setup complete. Run "fastgrc-hook test" to verify.\n');
-  process.exit(0);
-}
-if (cmd === "uninstall-hook") {
-  const targetDir = arg || process.cwd();
-  const hookMdPath = path.join(targetDir, "HOOK.md");
-  if (!fs.existsSync(hookMdPath)) {
-    process.stdout.write("No HOOK.md found \u2014 nothing to remove.\n");
-    process.exit(0);
-  }
-  const existing = fs.readFileSync(hookMdPath, "utf8");
-  const patched = existing.replace(
-    /[ \t]*-[ \t]*matcher:[ \t]*PreToolUse\n[ \t]*handler:[ \t]*"[^"]*(?:fastgrc-hook|fastgrc-openclaw)[^"]*"\n?/,
-    ""
-  );
-  if (patched === existing) {
-    process.stdout.write("FastGRC hook not found in HOOK.md \u2014 nothing to remove.\n");
+    process.stdout.write("\u2713 Policy ID saved to ~/.fastgrc.json\n");
   } else {
-    fs.writeFileSync(hookMdPath, patched, "utf8");
-    process.stdout.write(`\u2713 FastGRC hook removed from ${hookMdPath}
-`);
+    process.stdout.write("  (no policy ID \u2014 org-wide default will be used)\n");
   }
+  doInstallHook(process.cwd());
+  process.stdout.write("\n\u2713 Config and HOOK.md done.\n");
+  process.stdout.write('Run "fastgrc-hook test" to verify the hook.\n');
   process.exit(0);
 }
 if (cmd === "uninstall") {
-  const { execSync } = __require("child_process");
-  const selfBin = process.argv[1];
   const targetDir = arg || process.cwd();
-  process.stdout.write("Removing FastGRC from this OpenClaw deployment...\n\n");
-  process.stdout.write("1. Removing OpenClaw plugin...\n");
-  try {
-    execSync("sudo openclaw plugins remove fastgrc-openclaw", { stdio: "inherit" });
-  } catch {
-    process.stdout.write("   (plugin was not installed \u2014 skipped)\n");
-  }
-  process.stdout.write("2. Clearing config...\n");
   const cfg = readConfig();
   delete cfg.apiKey;
   delete cfg.policyId;
   writeConfig(cfg);
-  process.stdout.write("   API key and policy ID removed from ~/.fastgrc.json\n");
-  process.stdout.write("3. Removing hook from HOOK.md...\n");
-  execSync(`node "${selfBin}" uninstall-hook "${targetDir}"`, { stdio: "inherit" });
-  process.stdout.write("4. Restarting OpenClaw...\n");
-  execSync(`node "${selfBin}" restart-openclaw`, { stdio: "inherit" });
+  process.stdout.write("\u2713 API key and policy ID removed from ~/.fastgrc.json\n");
+  doUninstallHook(targetDir);
   process.stdout.write(
-    "\n\u2713 FastGRC removed.\nTo fully remove the CLI: npm uninstall -g fastgrc-openclaw\n"
+    "\n\u2713 Config and HOOK.md cleaned up.\nComplete removal \u2014 run these two commands:\n  rm -rf ~/.openclaw/npm/node_modules/fastgrc-openclaw\n  npm uninstall -g fastgrc-openclaw\n"
   );
   process.exit(0);
 }
@@ -373,7 +327,7 @@ if (cmd === "test") {
 `);
   process.exit(0);
 }
-if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "restart-openclaw" || cmd === "setup" || cmd === "uninstall" || cmd === "uninstall-hook") {
+if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "setup" || cmd === "uninstall" || cmd === "install-hook" || cmd === "uninstall-hook") {
 } else {
   const apiKey = process.env.FASTGRC_API_KEY ?? readConfig().apiKey;
   if (!apiKey) {
@@ -414,7 +368,6 @@ if (cmd === "test" || cmd === "where" || cmd === "which-hook" || cmd === "restar
       args,
       agentId,
       apiKey,
-      // narrowed at module level via early-exit guard above
       policyId,
       baseUrl
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastgrc-openclaw",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "FastGRC agent compliance plugin for OpenClaw — evaluates every tool call against your policy before it executes",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",