bereach-openclaw 1.6.3 → 1.6.4

package/node_modules/@bereach/tools/src/enforcement-types.ts

@@ -198,10 +198,6 @@ export interface PluginConfig {
   writePacingMax?: number;
   /** Minimum minutes between direct DM sends (default 5). Override via dm_pacing_minutes context. */
   dmPacingMinutes?: number;
-  /** Gateway URL for webhook execution */
-  gatewayUrl?: string;
-  /** Gateway hooks auth token */
-  hooksToken?: string;
 }
 
 // ---------------------------------------------------------------------------

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "bereach-openclaw",
   "name": "BeReach",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "LinkedIn outreach automation — 75+ tools, hook-based enforcement, dynamic context",
   "configSchema": {
     "type": "object",
@@ -66,14 +66,6 @@
         "maximum": 30,
         "default": 10,
         "description": "Maximum delay (seconds) before write operations (default: 10s)"
-      },
-      "gatewayUrl": {
-        "type": "string",
-        "description": "Gateway URL for webhook execution (default: http://localhost:18789)"
-      },
-      "hooksToken": {
-        "type": "string",
-        "description": "Gateway hooks auth token (set by /bereach setup)"
       }
     }
   },

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "bereach-openclaw",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "BeReach LinkedIn automation plugin for OpenClaw",
   "license": "AGPL-3.0",
   "exports": {
     ".": "./src/index.ts"
   },
-  "bin": {
-    "bereach-openclaw": "./src/connector-cli.ts"
-  },
   "files": [
     "src/",
     "skills/",

package/src/commands/setup.ts

@@ -1,5 +1,4 @@
 import { errMsg } from "@bereach/tools/utils";
-import { randomBytes } from "node:crypto";
 import { API_BASE } from "../hooks/utils";
 import { isApiBaseConfigured } from "../hooks/cache";
 import { readEnv } from "../env";
@@ -50,66 +49,6 @@ export function registerSetupCommand(api: any) {
         issues.push("API Key: NOT configured. Set BEREACH_API_KEY in plugin settings or environment.");
       }
 
-      // 3. Gateway hooks configuration (auto-configure if missing)
-      let hooksConfigured = false;
-      try {
-        if (typeof api?.config?.get === "function") {
-          const hooksEnabled = api.config.get("hooks.enabled");
-          const hooksToken = api.config.get("hooks.token");
-          if (hooksEnabled && hooksToken) {
-            ok.push("Gateway Hooks: enabled (token set)");
-            hooksConfigured = true;
-          } else if (hooksEnabled) {
-            const token = randomBytes(24).toString("hex");
-            api.config.set("hooks.token", token);
-            ok.push(`Gateway Hooks: enabled (token auto-generated: ${token.slice(0, 8)}...)`);
-            hooksConfigured = true;
-          } else {
-            api.config.set("hooks.enabled", true);
-            const token = randomBytes(24).toString("hex");
-            api.config.set("hooks.token", token);
-            ok.push(`Gateway Hooks: auto-enabled (token: ${token.slice(0, 8)}...). Restart gateway to apply.`);
-            hooksConfigured = true;
-          }
-        } else {
-          issues.push("Gateway Hooks: cannot check (api.config not available).");
-        }
-      } catch (err) {
-        issues.push(`Gateway Hooks: error (${errMsg(err)})`);
-      }
-
-      // 4. Gateway webhook probe
-      if (hooksConfigured) {
-        const gatewayUrl = api?.pluginConfig?.gatewayUrl
-          ?? readEnv("OPENCLAW_GATEWAY_URL")
-          ?? "http://localhost:18789";
-        const hooksToken = api?.config?.get?.("hooks.token")
-          ?? api?.pluginConfig?.hooksToken
-          ?? readEnv("OPENCLAW_HOOKS_TOKEN");
-
-        if (hooksToken) {
-          try {
-            const res = await fetch(`${gatewayUrl}/hooks/agent`, {
-              method: "POST",
-              headers: {
-                Authorization: `Bearer ${hooksToken}`,
-                "Content-Type": "application/json",
-              },
-              body: JSON.stringify({ message: "ping", model: "echo" }),
-              signal: AbortSignal.timeout(5000),
-            });
-            if (res.status === 401 || res.status === 403) {
-              issues.push(`Webhook probe: auth rejected (HTTP ${res.status}). Token mismatch between plugin and gateway config.`);
-            } else {
-              ok.push(`Webhook endpoint: reachable at ${gatewayUrl}`);
-            }
-          } catch {
-            // Gateway not up yet is OK during initial setup
-            ok.push(`Webhook endpoint: ${gatewayUrl} (not reachable yet - gateway may need restart)`);
-          }
-        }
-      }
-
       // Build output
       const lines: string[] = [
         "BeReach Setup",

package/src/hooks/context/formatters.ts

@@ -3,7 +3,7 @@
  * These functions take data and return strings — no side effects, no API calls.
  */
 
-import { cacheSet, type CacheStore, type ContextEntry, type OnboardingState, type RecentEvent } from "../cache";
+import { cacheSet, type CacheStore, type OnboardingState, type RecentEvent } from "../cache";
 import { type DbCampaign, type SessionState } from "../types";
 import { errMsg, createLogger, CHAT_BASE, PRICING_URL, apiFetch } from "../utils";
 import { readEnv } from "../../env";

package/src/hooks/context/index.ts

@@ -8,7 +8,7 @@
 
 import { getOrFetch, sessionStart, type CacheStore, type ContextEntry } from "../cache";
 import { SOUL_TEMPLATE } from "../../soul-template-content";
-import { readEnv } from "../../env";
+
 import { type SessionState, detectTaskMode } from "../types";
 import {
   errMsg,
@@ -237,10 +237,8 @@ export function registerContextHook(api: any, apiKey: string | undefined, state:
         const metadata: Record<string, unknown> = { ...(promptCtx?.metadata ?? {}) };
 
         // Parse [TASK_META: ...] from the prompt message (used by Docker test runner
-        // and connector CLI to pass task metadata when env vars can't reach the gateway).
-        // Only applied when no taskType is already set from metadata/env, so the connector's
-        // env-var path always takes priority. In production chat, users don't type TASK_META.
-        if (!metadata.taskType && !readEnv("BEREACH_TASK_TYPE")) {
+        // to pass task metadata). In production chat, users don't type TASK_META.
+        if (!metadata.taskType) {
           const msgs = Array.isArray(promptCtx?.messages) ? promptCtx.messages : [];
           const lastUserMsg = msgs.filter((m: any) => m?.role === "user").pop();
           const msgText = promptCtx?.prompt
@@ -329,5 +327,3 @@ export function registerContextHook(api: any, apiKey: string | undefined, state:
 export const _checkBusinessHours = checkBusinessHours;
 /** @internal — exported for testing only */
 export { rankCampaigns as _rankCampaigns } from "./formatters";
-/** @internal — exported for testing only */
-export const _formatAnthropicKeyWarning = formatAnthropicKeyWarning;

package/src/hooks/detect-task-mode.ts

@@ -4,7 +4,6 @@
  */
 
 import type { TaskModeInfo } from "@bereach/tools/enforcement-types";
-import { readEnv } from "../env";
 
 /** Safely parse maxCredits from any input (string, number, undefined). */
 function parseMaxCredits(value: unknown): number {
@@ -18,7 +17,7 @@ function parseMaxCredits(value: unknown): number {
 
 /**
  * Detect task mode from the sessionKey convention: "hook:{userId}:{campaignId}:{type}"
- * or from metadata / environment variables (for CLI-based connector execution).
+ * or from metadata fields (passed via webhook or promptCtx).
  * Returns TaskModeInfo if this is a task-driven session, null for interactive.
  */
 export function detectTaskMode(sessionKey: string | undefined | null, metadata?: Record<string, unknown>): TaskModeInfo | null {
@@ -53,16 +52,5 @@ export function detectTaskMode(sessionKey: string | undefined | null, metadata?:
     };
   }
 
-  // Strategy 3: environment variables (set when spawning CLI)
-  const envTaskType = readEnv("BEREACH_TASK_TYPE");
-  if (envTaskType) {
-    return {
-      taskId: readEnv("BEREACH_TASK_ID") || fallbackTaskId(),
-      taskType: envTaskType,
-      campaignId: readEnv("BEREACH_TASK_CAMPAIGN_ID") ?? null,
-      maxCredits: parseMaxCredits(readEnv("BEREACH_TASK_MAX_CREDITS")),
-    };
-  }
-
   return null;
 }

package/src/hooks/types.ts

@@ -2,7 +2,7 @@
  * Shared types, constants, and tool categories for BeReach OpenClaw hooks.
  *
  * Re-exports from @bereach/tools (single source of truth).
- * detectTaskMode stays local (reads environment vars).
+ * detectTaskMode stays local (OpenClaw-specific session detection).
  */
 
 // Re-export everything from shared package
@@ -25,5 +25,5 @@ export type {
   DbCampaign,
 } from "@bereach/tools/enforcement-types";
 
-// Keep detectTaskMode locally (reads environment vars — OpenClaw-specific)
+// Keep detectTaskMode locally (OpenClaw-specific session/metadata detection)
 export { detectTaskMode } from "./detect-task-mode";

package/src/index.ts

@@ -9,11 +9,6 @@ import { setTtl, isApiBaseConfigured } from "./hooks/cache";
 import { createSessionState, type PluginConfig } from "./hooks/types";
 import { errMsg, createLogger } from "./hooks/utils";
 import { autoDetectModels } from "./auto-detect-models";
-import { randomBytes } from "node:crypto";
-import { readFileSync, writeFileSync, existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-import { spawn } from "node:child_process";
 import { readEnv } from "./env";
 
 const log = createLogger("init");
@@ -77,12 +72,7 @@ export default function register(api: any) {
     setTtl(config.contextCacheTtlMs);
   }
 
-  // When running as a direct agent child process (openclaw agent), BEREACH_TASK_TYPE
-  // is set per-task. Register only whitelisted tools to reduce token count (~19K savings).
-  // In gateway mode (webhook), register all tools; per-request filtering
-  // is handled via allowedTools in the before_prompt_build hook return.
-  const execFileTaskType = readEnv("BEREACH_TASK_TYPE");
-  registerAllTools(api, execFileTaskType || undefined);
+  registerAllTools(api);
   registerCommands(api, state, apiKey);
   registerSetupCommand(api);
 
@@ -117,67 +107,6 @@ export default function register(api: any) {
   const masked = apiKey ? `...${apiKey.slice(-6)}` : "NOT SET";
   log(`registered: tools, commands, hooks (${registered.join(", ")}), API key: ${masked}`);
 
-  // Auto-configure hooks in openclaw.json so the gateway exposes /hooks/agent.
-  // The OpenClaw plugin API config accessors are undefined, so we read/write
-  // the config file directly - same approach as Docker entrypoint.sh.
-  let hooksToken = config.hooksToken || readEnv("OPENCLAW_HOOKS_TOKEN");
-  let needsRestart = false;
-  if (!hooksToken) {
-    try {
-      const configPath = join(homedir(), ".openclaw", "openclaw.json");
-      if (existsSync(configPath)) {
-        const raw = readFileSync(configPath, "utf8");
-        const cfg = JSON.parse(raw);
-        if (cfg.hooks?.enabled && typeof cfg.hooks.token === "string" && cfg.hooks.token) {
-          // Hooks already configured - grab the existing token
-          hooksToken = cfg.hooks.token;
-          log("discovered hooks token from openclaw.json");
-        } else {
-          // Hooks not configured - generate token and enable them.
-          // The gateway reads config at startup before loading plugins,
-          // so this change requires a restart to take effect.
-          const token = randomBytes(24).toString("hex");
-          cfg.hooks = { ...cfg.hooks, enabled: true, token };
-          writeFileSync(configPath, JSON.stringify(cfg, null, 2));
-          hooksToken = token;
-          needsRestart = true;
-          log("auto-configured hooks in openclaw.json — gateway restart required");
-        }
-      }
-    } catch (err) {
-      log(`hooks auto-config: ${errMsg(err)}`);
-    }
-  }
-
-  // If hooks were just written to config, the gateway must restart to load them.
-  // Spawn a detached process that waits, cleans lock/pid, then restarts the gateway.
-  if (needsRestart) {
-    const ocDir = join(homedir(), ".openclaw");
-    const lockFile = join(ocDir, "gateway.lock");
-    const pidFile = join(ocDir, "gateway.pid");
-
-    try {
-      // Clean up lock + pid files so the gateway can start fresh
-      if (existsSync(lockFile)) unlinkSync(lockFile);
-      if (existsSync(pidFile)) unlinkSync(pidFile);
-    } catch { /* best effort */ }
-
-    try {
-      const child = spawn("sh", ["-c", "sleep 3 && openclaw gateway start"], {
-        detached: true,
-        stdio: "ignore",
-      });
-      child.unref();
-      log("hooks config written — spawned detached restart, exiting in 3s");
-    } catch (err) {
-      log(`restart spawn failed: ${errMsg(err)}`);
-    }
-
-    setTimeout(() => {
-      process.exit(0);
-    }, 3000);
-  }
-
   // Auto-detect LLM provider and set workspace model defaults.
   // Fire-and-forget — non-critical, must not block registration.
   if (apiKey) {

package/src/tools/index.ts

@@ -2,20 +2,15 @@ import { definitions } from "@bereach/tools";
 import { executeApiCall } from "@bereach/tools/api-client";
 import { cacheSet } from "../hooks/cache";
 import { resolveApiKey } from "../index";
-import { getTaskToolWhitelist } from "@bereach/tools/task-tool-whitelist";
 
 const API_BASE = "https://api.bereach.ai";
 
 /**
- * Register tools with OpenClaw.
- * In task mode (execFile), pass a taskType to only register whitelisted tools.
- * In gateway mode (webhook), all tools are registered; per-request filtering
- * is handled via allowedTools in the hook return.
+ * Register all tools with OpenClaw.
+ * Per-request filtering is handled via allowedTools in the before_prompt_build hook.
  */
-export function registerAllTools(api: any, taskType?: string) {
-  const whitelist = taskType ? getTaskToolWhitelist(taskType) : null;
+export function registerAllTools(api: any) {
   let registered = 0;
-  let skipped = 0;
 
   for (const def of definitions) {
     if (!def.apiPath && def.handler !== "__local__" && def.handler !== "__set_api_key__") {
@@ -23,12 +18,6 @@ export function registerAllTools(api: any, taskType?: string) {
       continue;
     }
 
-    // Skip tools not in the whitelist for this task type
-    if (whitelist && !whitelist.has(def.name)) {
-      skipped++;
-      continue;
-    }
-
     registered++;
     api.registerTool({
       name: def.name,
@@ -82,7 +71,4 @@ export function registerAllTools(api: any, taskType?: string) {
     });
   }
 
-  if (whitelist) {
-    console.log(`[bereach:tools] Task mode (${taskType}): registered ${registered} tools, pruned ${skipped}`);
-  }
 }