agentbnb 4.0.2 → 5.1.0

package/skills/agentbnb/bootstrap.ts

@@ -1,126 +1,119 @@
 /**
- * AgentBnB Bootstrap — single-call OpenClaw skill lifecycle entry point.
+ * AgentBnB Bootstrap — thin OpenClaw adapter layer.
  *
- * Usage: `const ctx = await activate({ owner: 'alice', soulMdPath: './SOUL.md' });`
+ * Delegates all lifecycle logic to the shared Core Foundation:
+ *   ProcessGuard → ServiceCoordinator → AgentBnBService
+ *
+ * Usage: `const ctx = await activate({ port: 7700 });`
  * Teardown: `await deactivate(ctx);`
  */
 
-import { existsSync, readFileSync } from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
-import type { FastifyInstance } from 'fastify';
+import { homedir } from 'node:os';
 
-import { AgentRuntime } from '../../src/runtime/agent-runtime.js';
-import { publishFromSoulV2 } from '../../src/openclaw/soul-sync.js';
-import { createGatewayServer } from '../../src/gateway/server.js';
-import { IdleMonitor } from '../../src/autonomy/idle-monitor.js';
-import { DEFAULT_AUTONOMY_CONFIG } from '../../src/autonomy/tiers.js';
+import { loadConfig } from '../../src/cli/config.js';
 import { AgentBnBError } from '../../src/types/index.js';
-import { ensureIdentity, type AgentIdentity } from '../../src/identity/identity.js';
-import type { AutonomyConfig } from '../../src/autonomy/tiers.js';
-import type { CapabilityCardV2 } from '../../src/types/index.js';
+import { ProcessGuard } from '../../src/runtime/process-guard.js';
+import { ServiceCoordinator } from '../../src/runtime/service-coordinator.js';
+import type { ServiceOptions, ServiceStatus } from '../../src/runtime/service-coordinator.js';
+import { AgentBnBService } from '../../src/app/agentbnb-service.js';
 
-/** Configuration for bringing an AgentBnB agent online. */
+/** Configuration for bringing an AgentBnB agent online via OpenClaw. */
 export interface BootstrapConfig {
-  /** Agent owner identifier. */
-  owner: string;
-  /** Absolute path to SOUL.md. */
-  soulMdPath: string;
-  /** Registry DB path. Defaults to ~/.agentbnb/registry.db */
-  registryDbPath?: string;
-  /** Credit DB path. Defaults to ~/.agentbnb/credit.db */
-  creditDbPath?: string;
-  /** Gateway port. Defaults to 7700. */
-  gatewayPort?: number;
-  /** Bearer token for gateway auth. Defaults to a random UUID. */
-  gatewayToken?: string;
-  /** Handler URL for capability forwarding. Defaults to http://localhost:{gatewayPort}. */
-  handlerUrl?: string;
-  /** Autonomy tier config. Defaults to DEFAULT_AUTONOMY_CONFIG (Tier 3). */
-  autonomyConfig?: AutonomyConfig;
-  /** Suppress gateway logs. Defaults to false. */
-  silent?: boolean;
-  /** When true, ensures identity.json exists on activate. Defaults to true. */
-  identityRequired?: boolean;
+  /** Gateway port override. Defaults to config value or 7700. */
+  port?: number;
+  /** Registry URL override. */
+  registryUrl?: string;
+  /** Enable WebSocket relay. Defaults to true. */
+  relay?: boolean;
 }
 
-/** Live handles returned by activate(). Pass to deactivate() for clean teardown. */
+/** Context returned by activate(). Pass to deactivate() for conditional teardown. */
 export interface BootstrapContext {
-  /** AgentRuntime managing DBs and background job lifecycle. */
-  runtime: AgentRuntime;
-  /** Fastify gateway HTTP server instance. */
-  gateway: FastifyInstance;
-  /** IdleMonitor background loop. */
-  idleMonitor: IdleMonitor;
-  /** Published CapabilityCard derived from SOUL.md. */
-  card: CapabilityCardV2;
-  /** Agent identity (created/loaded during activation). */
-  identity: AgentIdentity | null;
+  /** Unified facade — use this for all AgentBnB operations. */
+  service: AgentBnBService;
+  /** Node status snapshot at activation time. */
+  status: ServiceStatus;
+  /** Whether this activate() call started a new node or found one already running. */
+  startDisposition: 'started' | 'already_running';
+  /**
+   * Removes the SIGTERM/SIGINT handlers registered by activate().
+   * Called automatically by deactivate() — do not call manually.
+   * @internal
+   */
+  _removeSignalHandlers: () => void;
 }
 
 /**
- * Brings an agent fully online: Runtime -> publishCard -> gateway.listen -> IdleMonitor.
- * @throws {AgentBnBError} FILE_NOT_FOUND if SOUL.md does not exist.
+ * Brings an AgentBnB node online (idempotent — safe to call when already running).
+ * Registers SIGTERM/SIGINT handlers that conditionally stop the node on process exit.
+ *
+ * @throws {AgentBnBError} CONFIG_NOT_FOUND if ~/.agentbnb/config.json does not exist.
+ *
+ * TODO: Once ServiceCoordinator gains its own signal handling, remove the handlers
+ * registered here to avoid double-handler conflicts. Track in Layer A implementation.
  */
-export async function activate(config: BootstrapConfig): Promise<BootstrapContext> {
-  const {
-    owner,
-    soulMdPath,
-    registryDbPath = join(homedir(), '.agentbnb', 'registry.db'),
-    creditDbPath = join(homedir(), '.agentbnb', 'credit.db'),
-    gatewayPort = 7700,
-    gatewayToken = randomUUID(),
-    autonomyConfig = DEFAULT_AUTONOMY_CONFIG,
-    silent = false,
-  } = config;
-
-  const identityRequired = config.identityRequired ?? false;
-  const handlerUrl = config.handlerUrl ?? `http://localhost:${gatewayPort}`;
-
-  if (!existsSync(soulMdPath)) {
-    throw new AgentBnBError(`SOUL.md not found at path: ${soulMdPath}`, 'FILE_NOT_FOUND');
+export async function activate(config: BootstrapConfig = {}): Promise<BootstrapContext> {
+  const agentConfig = loadConfig();
+  if (!agentConfig) {
+    throw new AgentBnBError(
+      'AgentBnB config not found. Run: agentbnb init',
+      'CONFIG_NOT_FOUND',
+    );
   }
-  const soulContent = readFileSync(soulMdPath, 'utf8');
 
-  const runtime = new AgentRuntime({ registryDbPath, creditDbPath, owner });
-  await runtime.start();
+  const guard = new ProcessGuard(join(homedir(), '.agentbnb', '.pid'));
+  const coordinator = new ServiceCoordinator(agentConfig, guard);
+  const service = new AgentBnBService(coordinator, agentConfig);
 
-  // Ensure agent identity exists (idempotent — preserves existing identity)
-  let identity: AgentIdentity | null = null;
-  if (identityRequired) {
-    const configDir = join(homedir(), '.agentbnb');
-    identity = ensureIdentity(configDir, owner);
-  }
+  const opts: ServiceOptions = {
+    port: config.port,
+    registryUrl: config.registryUrl,
+    relay: config.relay,
+  };
 
-  const card = publishFromSoulV2(runtime.registryDb, soulContent, owner);
+  const startDisposition = await service.ensureRunning(opts);
+  const status = await service.getNodeStatus();
 
-  const gateway = createGatewayServer({
-    port: gatewayPort,
-    registryDb: runtime.registryDb,
-    creditDb: runtime.creditDb,
-    tokens: [gatewayToken],
-    handlerUrl,
-    silent,
-  });
-  await gateway.listen({ port: gatewayPort, host: '0.0.0.0' });
+  // Register signal handlers.
+  // Use process.once so each signal fires at most once and self-removes.
+  // No process.exit() — closing open handles via service.stop() drains the event loop naturally.
+  // Only stop the node when we were the ones who started it.
+  const onSigterm = () => {
+    if (startDisposition === 'started') {
+      void service.stop();
+    }
+  };
+  const onSigint = () => {
+    if (startDisposition === 'started') {
+      void service.stop();
+    }
+  };
 
-  const idleMonitor = new IdleMonitor({ owner, db: runtime.registryDb, autonomyConfig });
-  const idleJob = idleMonitor.start();
-  runtime.registerJob(idleJob);
+  process.once('SIGTERM', onSigterm);
+  process.once('SIGINT', onSigint);
 
-  return { runtime, gateway, idleMonitor, card, identity };
+  const _removeSignalHandlers = () => {
+    process.removeListener('SIGTERM', onSigterm);
+    process.removeListener('SIGINT', onSigint);
+  };
+
+  return { service, status, startDisposition, _removeSignalHandlers };
 }
 
 /**
- * Tears down all active components: gateway.close() then runtime.shutdown().
- * Idempotent — safe to call multiple times.
+ * Tears down the AgentBnB node — only if this activate() call was the one that started it.
+ * If the node was already running before activate(), it is left untouched.
+ * Always removes the signal handlers registered by activate().
  */
 export async function deactivate(ctx: BootstrapContext): Promise<void> {
-  try {
-    await ctx.gateway.close();
-    await ctx.runtime.shutdown();
-  } catch {
-    // Swallow errors — idempotent teardown
+  ctx._removeSignalHandlers();
+
+  if (ctx.startDisposition === 'started') {
+    try {
+      await ctx.service.stop();
+    } catch {
+      // Swallow errors — idempotent teardown
+    }
   }
 }

package/skills/agentbnb/install.sh

@@ -9,11 +9,12 @@
 #   bash install.sh
 #
 # What it does:
-#   1. Checks Node.js >= 20 and pnpm are available
+#   1. Resolves canonical Node.js runtime and verifies >= 20
 #   2. Installs the agentbnb CLI globally
-#   3. Initializes the ~/.agentbnb/ config directory with defaults
-#   4. Syncs capabilities from SOUL.md if one is found
-#   5. Prints a success summary and next steps
+#   3. Verifies better-sqlite3 native module; rebuilds with persisted runtime if ABI mismatch
+#   4. Initializes the ~/.agentbnb/ config directory with defaults
+#   5. Syncs capabilities from SOUL.md if one is found
+#   6. Prints a success summary and next steps
 
 set -euo pipefail
 
@@ -40,23 +41,52 @@ err()  { echo "${RED}✗${RESET} $*" >&2; }
 step() { echo ""; echo "${BOLD}$*${RESET}"; }
 
 # ---------------------------------------------------------------------------
-# Step 1: Check prerequisites
+# Step 1: Resolve canonical Node runtime + verify version
 # ---------------------------------------------------------------------------
-step "Step 1/5 — Checking prerequisites"
+step "Step 1/6 — Checking prerequisites"
 
-# Node.js >= 20
-if ! command -v node &>/dev/null; then
+# Resolve canonical Node exec path:
+#   1. OPENCLAW_NODE_EXEC (set by OpenClaw harness when it manages the runtime)
+#   2. Fallback: ask the shell's `node` for its own execPath (resolves shims to real binary)
+#
+# The resolved path is persisted to ~/.agentbnb/runtime.json.
+# bootstrap.ts / ServiceCoordinator read this file to ensure all child processes
+# (including better-sqlite3 native module consumers) use the same binary.
+if [ -n "${OPENCLAW_NODE_EXEC:-}" ] && [ -x "$OPENCLAW_NODE_EXEC" ]; then
+  NODE_EXEC="$OPENCLAW_NODE_EXEC"
+  NODE_SOURCE="OPENCLAW_NODE_EXEC"
+  ok "Using Node runtime from OPENCLAW_NODE_EXEC: $NODE_EXEC"
+elif command -v node &>/dev/null; then
+  NODE_EXEC="$(node -e 'process.stdout.write(process.execPath)')"
+  NODE_SOURCE="shell"
+  ok "Using Node runtime (resolved from shell): $NODE_EXEC"
+else
   err "Node.js not found. Please install Node.js 20+ from https://nodejs.org"
   exit 1
 fi
 
-NODE_VERSION=$(node --version | sed 's/v//' | cut -d. -f1)
-if [ "$NODE_VERSION" -lt 20 ]; then
-  err "Node.js >= 20 required (found v${NODE_VERSION}). Please upgrade: https://nodejs.org"
+NODE_VERSION_FULL="$("$NODE_EXEC" --version)"
+NODE_VERSION_MAJOR="$(echo "$NODE_VERSION_FULL" | sed 's/v//' | cut -d. -f1)"
+if [ "$NODE_VERSION_MAJOR" -lt 20 ]; then
+  err "Node.js >= 20 required (found ${NODE_VERSION_FULL}). Please upgrade: https://nodejs.org"
   exit 1
 fi
 
-ok "Node.js $(node --version) found"
+ok "Node.js ${NODE_VERSION_FULL} confirmed"
+
+# Persist the canonical runtime so bootstrap and ServiceCoordinator use the same binary.
+# Schema: { node_exec, node_version, source, detected_at }
+#   node_exec    — absolute path to the node binary
+#   node_version — full version string (e.g. "v20.11.0")
+#   source       — how it was resolved: "OPENCLAW_NODE_EXEC" | "shell"
+#   detected_at  — ISO 8601 UTC timestamp
+AGENTBNB_DIR="$HOME/.agentbnb"
+mkdir -p "$AGENTBNB_DIR"
+DETECTED_AT="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
+printf '{"node_exec":"%s","node_version":"%s","source":"%s","detected_at":"%s"}\n' \
+  "$NODE_EXEC" "$NODE_VERSION_FULL" "$NODE_SOURCE" "$DETECTED_AT" \
+  > "$AGENTBNB_DIR/runtime.json"
+ok "Runtime persisted to ~/.agentbnb/runtime.json (source: ${NODE_SOURCE})"
 
 # pnpm (attempt install if missing)
 if ! command -v pnpm &>/dev/null; then
@@ -73,7 +103,7 @@ fi
 # ---------------------------------------------------------------------------
 # Step 2: Install AgentBnB CLI
 # ---------------------------------------------------------------------------
-step "Step 2/5 — Installing AgentBnB CLI"
+step "Step 2/6 — Installing AgentBnB CLI"
 
 # Check if already installed (idempotent)
 if command -v agentbnb &>/dev/null; then
@@ -113,9 +143,39 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Step 3: Initialize config + connect to public registry
+# Step 3: Verify better-sqlite3 native module; rebuild if ABI mismatch
+# Rebuild always uses the persisted runtime from ~/.agentbnb/runtime.json
+# to ensure the compiled .node binary matches the binary used at runtime.
 # ---------------------------------------------------------------------------
-step "Step 3/5 — Initializing AgentBnB config"
+step "Step 3/6 — Verifying native modules"
+
+if "$NODE_EXEC" -e "require('better-sqlite3')" 2>/dev/null; then
+  ok "better-sqlite3 native module OK for ${NODE_VERSION_FULL}"
+else
+  warn "better-sqlite3 not compiled for ${NODE_VERSION_FULL} — rebuilding..."
+  # Locate the agentbnb package directory
+  AGENTBNB_PKG="$("$NODE_EXEC" -e "
+    try { process.stdout.write(require.resolve('agentbnb/package.json').replace('/package.json','')); }
+    catch { process.stdout.write(''); }
+  " 2>/dev/null || true)"
+
+  if [ -n "$AGENTBNB_PKG" ]; then
+    # Pass --target so node-pre-gyp compiles against the exact persisted runtime version
+    NODE_TARGET="$(echo "$NODE_VERSION_FULL" | sed 's/v//')"
+    (cd "$AGENTBNB_PKG" && npm rebuild better-sqlite3 \
+      --runtime=node \
+      --target="$NODE_TARGET") \
+      && ok "better-sqlite3 rebuilt for node@${NODE_TARGET}" \
+      || warn "Rebuild failed — run manually: cd $AGENTBNB_PKG && npm rebuild better-sqlite3 --runtime=node --target=${NODE_TARGET}"
+  else
+    warn "Could not locate agentbnb package directory — run 'npm rebuild better-sqlite3' manually"
+  fi
+fi
+
+# ---------------------------------------------------------------------------
+# Step 4: Initialize config + connect to public registry
+# ---------------------------------------------------------------------------
+step "Step 4/6 — Initializing AgentBnB config"
 
 # agentbnb init is idempotent — safe to run on existing installs
 if agentbnb init --yes 2>/dev/null; then
@@ -133,20 +193,20 @@ fi
 # Connect to the public AgentBnB registry (only if not already configured)
 CURRENT_REGISTRY=$(agentbnb config get registry 2>/dev/null || echo "")
 if [ -z "$CURRENT_REGISTRY" ]; then
-  if agentbnb config set registry https://hub.agentbnb.dev 2>/dev/null; then
-    ok "Connected to public registry: https://hub.agentbnb.dev"
+  if agentbnb config set registry https://agentbnb.fly.dev 2>/dev/null; then
+    ok "Connected to public registry: https://agentbnb.fly.dev"
     ok "Registry grants 50 credits to new agents on first sync"
   else
-    warn "Could not set registry — run manually: agentbnb config set registry https://hub.agentbnb.dev"
+    warn "Could not set registry — run manually: agentbnb config set registry https://agentbnb.fly.dev"
   fi
 else
   ok "Registry already configured: $CURRENT_REGISTRY"
 fi
 
 # ---------------------------------------------------------------------------
-# Step 4: Sync from SOUL.md
+# Step 5: Sync from SOUL.md
 # ---------------------------------------------------------------------------
-step "Step 4/5 — Syncing capabilities from SOUL.md"
+step "Step 5/6 — Syncing capabilities from SOUL.md"
 
 SOUL_PATH=""
 # Check current directory first, then parent directory
@@ -170,9 +230,9 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Step 5: Print success summary
+# Step 6: Print success summary
 # ---------------------------------------------------------------------------
-step "Step 5/5 — Setup complete"
+step "Step 6/6 — Setup complete"
 
 echo ""
 echo "${GREEN}${BOLD}AgentBnB skill installed successfully!${RESET}"
@@ -180,7 +240,9 @@ echo ""
 echo "What was set up:"
 ok "AgentBnB CLI available as 'agentbnb'"
 ok "Config directory: ~/.agentbnb/"
-ok "Registry: https://hub.agentbnb.dev (public network)"
+ok "Node runtime: ${NODE_EXEC} (${NODE_VERSION_FULL}, source: ${NODE_SOURCE})"
+ok "Runtime persisted to: ~/.agentbnb/runtime.json"
+ok "Registry: https://agentbnb.fly.dev (public network)"
 ok "Default autonomy tier: Tier 3 (ask before all transactions)"
 ok "Default credit reserve: 20 credits"
 
@@ -197,10 +259,18 @@ fi
 
 echo ""
 echo "Next steps:"
-echo "  1. Run ${BOLD}agentbnb serve${RESET} to start accepting requests"
-echo "  2. Run ${BOLD}agentbnb openclaw status${RESET} to see your sync state"
-echo "  3. Run ${BOLD}agentbnb openclaw rules${RESET} to see your autonomy rules"
-echo "  4. Paste the rules into your HEARTBEAT.md (or copy from HEARTBEAT.rules.md)"
+echo ""
+echo "  ${BOLD}If using OpenClaw (recommended):${RESET}"
+echo "    Import activate() from bootstrap.ts — it starts the node automatically."
+echo "    No need to run 'agentbnb serve' manually."
+echo ""
+echo "  ${BOLD}If running standalone (CLI only):${RESET}"
+echo "    Run ${BOLD}agentbnb serve${RESET} to start accepting requests."
+echo ""
+echo "  ${BOLD}Either way:${RESET}"
+echo "    Run ${BOLD}agentbnb openclaw status${RESET} to see your sync state"
+echo "    Run ${BOLD}agentbnb openclaw rules${RESET} to see your autonomy rules"
+echo "    Paste the rules into your HEARTBEAT.md (or copy from HEARTBEAT.rules.md)"
 echo ""
 echo "Configure autonomy thresholds:"
 echo "  ${BOLD}agentbnb config set tier1 10${RESET}   # auto-execute under 10 credits"

package/dist/execute-PNGQOMYO.js

@@ -1,10 +0,0 @@
-import {
-  executeCapabilityRequest
-} from "./chunk-7NA43XCG.js";
-import "./chunk-T7NS2J2B.js";
-import "./chunk-DNWT5FZQ.js";
-import "./chunk-5KFI5X7B.js";
-import "./chunk-WGZ5AGOX.js";
-export {
-  executeCapabilityRequest
-};