@inquiryon/amp-governance 1.1.5 → 1.1.6

package/index.js

@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import { normalizeTool } from './toolNormalization.js';
 
 console.log('[AMP Governance] Plugin module loaded — Phase 4.');
 
@@ -55,13 +56,10 @@ let _lastSender = null;  // { from: string, channelId: string }
 // Set by register() so notifyUser can use the runtime API directly
 let _runtime = null;
 
-// AMP reachability state — flips to false on first connectivity failure,
-// back to true when a request succeeds again.
+// AMP reachability state — flips to false when a real AMP call fails,
+// back to true the next time a real AMP call succeeds.
 let _ampReachable = true;
 let _ampDownNotified = false; // prevent notification spam while AMP is down
-let _recoveryPoller = null;   // setInterval handle for recovery polling
-
-const RECOVERY_POLL_INTERVAL_MS = 15000; // 15 seconds
 
 // ── HOOK AUTO-DEPLOY ─────────────────────────────────────────────────────────
 
@@ -223,39 +221,13 @@ async function notifyUser(sender, message) {
 }
 
 /**
- * Lightweight AMP reachability check — does a quick HTTP GET to a known
- * endpoint. Any HTTP response (even 4xx) means AMP is up; a network-level
- * error (ECONNREFUSED, ETIMEDOUT, etc.) means it is down.
- * Returns true if reachable, false if not.
- */
-async function pingAmp() {
-  try {
-    const apiKey = getAmpApiKey();
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 4000); // 4 s timeout
-    try {
-      await fetch(buildAmpUrl('/api/amp/sse-status'), {
-        method: 'GET',
-        signal: controller.signal,
-      });
-    } finally {
-      clearTimeout(timer);
-    }
-    return true;  // any HTTP response = server is up
-  } catch (_) {
-    return false; // connection refused / timeout / DNS failure
-  }
-}
-
-/**
- * Called whenever AMP is found to be unreachable.
+ * Called whenever a real AMP call fails (init or hitl/request).
  * Sends a clear channel notification on the first occurrence, then stays quiet
  * until AMP recovers (to avoid flooding the user with repeated messages).
  */
 async function notifyAmpDown(tool, errDetail) {
   const ampUrl = (() => { try { return buildAmpUrl('/'); } catch (_) { return config?.AMP_BACKEND_URL || 'unknown'; } })();
 
-  startRecoveryPoller();
   if (!_ampDownNotified) {
     _ampDownNotified = true;
     const msg =
@@ -275,14 +247,13 @@ async function notifyAmpDown(tool, errDetail) {
 }
 
 /**
- * Called when AMP responds successfully after a period of being down.
- * Clears the down state and stops the recovery poller.
+ * Called when a real AMP call succeeds after a period of being down.
+ * Clears the down state so the next failure notifies again.
  */
 async function notifyAmpRecovered() {
   if (!_ampReachable) {
     _ampReachable    = true;
     _ampDownNotified = false;
-    stopRecoveryPoller();
     await notifyUser(_lastSender,
       `✅ *AMP Governance Service Restored*\n\nThe AMP Governance service is back online. OpenClaw is resuming normal operation — your next request will be processed.`
     );
@@ -290,27 +261,6 @@ async function notifyAmpRecovered() {
   }
 }
 
-function stopRecoveryPoller() {
-  if (_recoveryPoller !== null) {
-    clearInterval(_recoveryPoller);
-    _recoveryPoller = null;
-    console.log('[AMP Governance] Recovery poller stopped.');
-  }
-}
-
-function startRecoveryPoller() {
-  if (_recoveryPoller !== null) return; // already running
-  console.log(`[AMP Governance] Starting recovery poller (every ${RECOVERY_POLL_INTERVAL_MS / 1000}s)...`);
-  _recoveryPoller = setInterval(async () => {
-    const reachable = await pingAmp();
-    if (reachable) {
-      await notifyAmpRecovered();
-    } else {
-      console.log('[AMP Governance] Recovery poll: AMP still unreachable.');
-    }
-  }, RECOVERY_POLL_INTERVAL_MS);
-}
-
 // ── HITL POLICY ENGINE ───────────────────────────────────────────────────────
 
 /**
@@ -319,6 +269,7 @@ function startRecoveryPoller() {
  */
 async function requestHitlEval(instanceId, tool, params) {
   const apiKey = getAmpApiKey();
+  const { tool: normTool, action: normAction } = normalizeTool(tool, params);
   const res = await fetch(buildAmpUrl('/api/hitl/request'), {
     method: 'POST',
     headers: { 'X-API-Key': apiKey, 'Content-Type': 'application/json' },
@@ -327,8 +278,8 @@ async function requestHitlEval(instanceId, tool, params) {
       instance_id: instanceId,
       org_id:     config.AMP_ORG_ID,
       agent_name: config.AGENT_NAME,
-      tool,
-      action:     params?.action || '*',
+      tool:       normTool,
+      action:     normAction,
       context:    params || {},
       hitl: {
         enable: true,
@@ -584,23 +535,12 @@ export default {
       _instanceId = null;
     });
 
-    // ── INBOUND MESSAGE: cache sender + probe AMP health ─────────────────────
+    // ── INBOUND MESSAGE: cache sender for HITL/outage notifications ──────────
     api.on('message_received', async (event, ctx) => {
       if (event.from && ctx.channelId) {
         _lastSender = { from: event.from, channelId: ctx.channelId };
         console.log(`[AMP Governance] Sender cached: ${event.from} on ${ctx.channelId}`);
       }
-      // Probe AMP on every inbound message so we catch outages even when the
-      // agent responds without using any tools (e.g. simple greetings).
-      // pingAmp() does a real HTTP check — bypasses any cached instance state.
-      const reachable = await pingAmp();
-      if (!reachable) {
-        _ampReachable = false;
-        await notifyAmpDown('(inbound message)',
-          'Could not reach AMP Governance service — backend may be down or unreachable.');
-      } else if (!_ampReachable) {
-        await notifyAmpRecovered();
-      }
     });
 
     // ── BEFORE TOOL CALL: governance check + logging ─────────────────────────

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@inquiryon/amp-governance",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "AMP governance plugin for OpenClaw",
   "type": "module",
   "files": [
     "index.js",
+    "toolNormalization.js",
     "openclaw.plugin.json",
     "hook/handler.ts",
     "hook/HOOK.md",

package/toolNormalization.js

@@ -0,0 +1,26 @@
+// Normalizes OpenClaw's raw tool names into the same tool/action vocabulary
+// used by AMP's Hermes plugin (AHP's policy.py), so a single AMP policy can
+// govern both agent types identically instead of matching on each agent's
+// own raw tool names.
+
+const TOOL_MAP = {
+  web_search: { tool: 'exec', action: 'web_search' },
+  read:       { tool: 'read', action: 'read' },
+  write:      { tool: 'write', action: 'write' },
+  edit:       { tool: 'write', action: 'edit' },
+  bash:       { tool: 'exec', action: 'exec' },
+  shell:      { tool: 'exec', action: 'exec' },
+};
+
+/**
+ * Returns { tool, action } for a raw OpenClaw tool name.
+ * Unlike Hermes's normalizer (which returns null for anything outside its
+ * known set), unmapped tools fall back to the raw name with action '*' —
+ * so a not-yet-mapped OpenClaw tool still reaches AMP instead of being
+ * silently dropped.
+ */
+export function normalizeTool(rawTool, params) {
+  const mapped = TOOL_MAP[rawTool];
+  if (mapped) return { tool: mapped.tool, action: mapped.action };
+  return { tool: rawTool, action: params?.action || '*' };
+}