agentbnb 7.0.0-beta.1 → 7.0.0

package/dist/skills/agentbnb/bootstrap.js

@@ -12,13 +12,13 @@ import {
   requestViaRelay,
   resolvePendingRequest,
   searchCards
-} from "../../chunk-ETGOKDFR.js";
+} from "../../chunk-B2VJTKO5.js";
 import {
   executeCapabilityBatch,
   executeCapabilityRequest,
   releaseRequesterEscrow,
   settleRequesterEscrow
-} from "../../chunk-EAD4A4KG.js";
+} from "../../chunk-ALX4WS3A.js";
 import {
   bootstrapAgent,
   generateKeyPair,
@@ -51,7 +51,7 @@ import {
   updateSkillAvailability,
   updateSkillIdleRate,
   verifyEscrowReceipt
-} from "../../chunk-K5FO42YF.js";
+} from "../../chunk-7EF3HYVZ.js";
 import "../../chunk-NWIQJ2CL.js";
 import {
   getConfigDir,
@@ -60,16 +60,14 @@ import {
 import {
   AgentBnBError,
   AnyCardSchema
-} from "../../chunk-3CIMVISQ.js";
+} from "../../chunk-WVY2W7AA.js";
 import {
   RelayClient,
   RelayMessageSchema
-} from "../../chunk-PU7LXOQ3.js";
+} from "../../chunk-3LWBH7P3.js";
 
 // skills/agentbnb/bootstrap.ts
 import { join as join5 } from "path";
-import { dirname as dirname4, basename } from "path";
-import { existsSync as existsSync6 } from "fs";
 import { homedir as homedir2 } from "os";
 import { spawnSync } from "child_process";
 import { randomUUID as randomUUID10 } from "crypto";
@@ -918,7 +916,8 @@ var OpenClawBridge = class {
 };
 
 // src/skills/command-executor.ts
-import { execFile as execFile2 } from "child_process";
+import { spawn } from "child_process";
+var KILL_GRACE_MS = 5e3;
 function shellEscape2(value) {
   return "'" + value.replace(/'/g, "'\\''") + "'";
 }
@@ -944,29 +943,89 @@ function safeInterpolateCommand2(template, context) {
     return shellEscape2(String(current));
   });
 }
-function execFileAsync2(file, args, options) {
+function spawnWithKill(command, options, registry) {
   return new Promise((resolve2, reject) => {
-    execFile2(file, args, options, (error, stdout, stderr) => {
-      const stdoutStr = typeof stdout === "string" ? stdout : stdout.toString();
-      const stderrStr = typeof stderr === "string" ? stderr : stderr.toString();
-      if (error) {
-        const enriched = Object.assign(error, { stderr: stderrStr });
-        reject(enriched);
+    const child = spawn("/bin/sh", ["-c", `${command} < /dev/null`], {
+      cwd: options.cwd,
+      env: options.env,
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: true
+    });
+    registry.add(child);
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    let killed = false;
+    let killTimer;
+    child.stdout.on("data", (chunk) => {
+      if (stdout.length < options.maxBuffer) {
+        stdout += chunk.toString();
+      }
+    });
+    child.stderr.on("data", (chunk) => {
+      if (stderr.length < options.maxBuffer) {
+        stderr += chunk.toString();
+      }
+    });
+    const killGroup = (signal) => {
+      try {
+        process.kill(-child.pid, signal);
+      } catch {
+        try {
+          child.kill(signal);
+        } catch {
+        }
+      }
+    };
+    const timeoutId = setTimeout(() => {
+      timedOut = true;
+      killGroup("SIGTERM");
+      killTimer = setTimeout(() => {
+        if (!killed) {
+          killGroup("SIGKILL");
+        }
+      }, KILL_GRACE_MS);
+      killTimer.unref();
+    }, options.timeout);
+    child.on("close", (_code, _signal) => {
+      killed = true;
+      clearTimeout(timeoutId);
+      if (killTimer) clearTimeout(killTimer);
+      registry.delete(child);
+      if (timedOut) {
+        const err = new Error(`Command timed out after ${options.timeout}ms`);
+        err.code = "ETIMEDOUT";
+        reject(err);
+      } else if (_code !== 0) {
+        const err = new Error(stderr.trim() || `Process exited with code ${_code}`);
+        Object.assign(err, { stderr: stderr.trim() });
+        reject(err);
       } else {
-        resolve2({ stdout: stdoutStr, stderr: stderrStr });
+        resolve2({ stdout, stderr });
       }
     });
+    child.on("error", (err) => {
+      killed = true;
+      clearTimeout(timeoutId);
+      registry.delete(child);
+      reject(err);
+    });
   });
 }
 var CommandExecutor = class {
+  /** Active child processes — killed on shutdown(). */
+  activeProcesses = /* @__PURE__ */ new Set();
+  /** In-flight execution count per skill ID for concurrency limiting. */
+  inflight = /* @__PURE__ */ new Map();
   /**
    * Execute a command skill with the provided parameters.
    *
    * Steps:
-   * 1. Security check: base command must be in `allowed_commands` if set.
-   * 2. Interpolate `config.command` using `{ params }` context.
-   * 3. Run via `child_process.exec` with timeout and cwd.
-   * 4. Parse stdout based on `output_type`: text | json | file.
+   * 1. Concurrency check: reject if at capacity.max_concurrent limit.
+   * 2. Security check: base command must be in `allowed_commands` if set.
+   * 3. Interpolate `config.command` using `{ params }` context.
+   * 4. Run via spawn with SIGTERM→SIGKILL timeout handling.
+   * 5. Parse stdout based on `output_type`: text | json | file.
    *
    * @param config - Validated CommandSkillConfig.
    * @param params - Input parameters passed by the caller.
@@ -974,6 +1033,16 @@ var CommandExecutor = class {
    */
   async execute(config, params) {
     const cmdConfig = config;
+    const maxConcurrent = cmdConfig.capacity?.max_concurrent;
+    if (maxConcurrent !== void 0) {
+      const current = this.inflight.get(cmdConfig.id) ?? 0;
+      if (current >= maxConcurrent) {
+        return {
+          success: false,
+          error: `Skill "${cmdConfig.id}" at max concurrency (${maxConcurrent}). Try again later.`
+        };
+      }
+    }
     const baseCommand = cmdConfig.command.trim().split(/\s+/)[0] ?? "";
     if (cmdConfig.allowed_commands && cmdConfig.allowed_commands.length > 0) {
       const effectiveAllowed = cmdConfig.claude_code ? [.../* @__PURE__ */ new Set([...cmdConfig.allowed_commands, "claude"])] : cmdConfig.allowed_commands;
@@ -1004,31 +1073,33 @@ var CommandExecutor = class {
     }
     const timeout = cmdConfig.timeout_ms ?? 3e4;
     const cwd = cmdConfig.working_dir ?? process.cwd();
-    let stdout;
     const env = { ...process.env };
     delete env["CLAUDECODE"];
+    this.inflight.set(cmdConfig.id, (this.inflight.get(cmdConfig.id) ?? 0) + 1);
+    let stdout;
     try {
-      const result = await execFileAsync2("/bin/sh", ["-c", `${interpolatedCommand} < /dev/null`], {
+      const result = await spawnWithKill(interpolatedCommand, {
         timeout,
         cwd,
         env,
         maxBuffer: 10 * 1024 * 1024
         // 10 MB
-      });
+      }, this.activeProcesses);
       stdout = result.stdout;
     } catch (err) {
+      this.decrementInflight(cmdConfig.id);
       if (err instanceof Error) {
-        const message = err.message;
-        const stderrContent = err.stderr ?? "";
-        if (message.includes("timed out") || message.includes("ETIMEDOUT") || err.code === "ETIMEDOUT") {
+        const code = err.code;
+        if (code === "ETIMEDOUT" || err.message.includes("timed out")) {
           return {
             success: false,
             error: `Command timed out after ${timeout}ms`
           };
         }
+        const stderrContent = err.stderr ?? "";
         return {
           success: false,
-          error: stderrContent.trim() || message
+          error: stderrContent.trim() || err.message
         };
       }
       return {
@@ -1036,6 +1107,7 @@ var CommandExecutor = class {
         error: String(err)
       };
     }
+    this.decrementInflight(cmdConfig.id);
     const rawOutput = stdout.trim();
     switch (cmdConfig.output_type) {
       case "text":
@@ -1060,6 +1132,48 @@ var CommandExecutor = class {
         };
     }
   }
+  /**
+   * Kill all active child processes. Called during service shutdown
+   * to prevent zombie processes.
+   */
+  shutdown() {
+    for (const child of this.activeProcesses) {
+      try {
+        process.kill(-child.pid, "SIGTERM");
+      } catch {
+        try {
+          child.kill("SIGTERM");
+        } catch {
+        }
+      }
+      const pid = child.pid;
+      const timer = setTimeout(() => {
+        try {
+          process.kill(-pid, "SIGKILL");
+        } catch {
+        }
+      }, KILL_GRACE_MS);
+      timer.unref();
+    }
+    this.activeProcesses.clear();
+  }
+  /** Returns the number of currently active child processes. */
+  get activeCount() {
+    return this.activeProcesses.size;
+  }
+  /** Returns the in-flight count for a specific skill ID. */
+  getInflight(skillId) {
+    return this.inflight.get(skillId) ?? 0;
+  }
+  /** Decrement the inflight counter for a skill ID. */
+  decrementInflight(skillId) {
+    const current = this.inflight.get(skillId) ?? 0;
+    if (current <= 1) {
+      this.inflight.delete(skillId);
+    } else {
+      this.inflight.set(skillId, current - 1);
+    }
+  }
 };
 
 // src/runtime/agent-runtime.ts
@@ -1077,6 +1191,8 @@ var AgentRuntime = class {
    * Undefined if no skills.yaml was provided or the file does not exist.
    */
   skillExecutor;
+  /** Reference to CommandExecutor for shutdown cleanup of child processes. */
+  commandExecutor;
   draining = false;
   orphanedEscrowAgeMinutes;
   skillsYamlPath;
@@ -1142,8 +1258,8 @@ var AgentRuntime = class {
     }
     const modes = /* @__PURE__ */ new Map();
     if (this.conductorEnabled) {
-      const { ConductorMode } = await import("../../conductor-mode-2VVFMKVE.js");
-      const { registerConductorCard, CONDUCTOR_OWNER } = await import("../../card-REW7BSWW.js");
+      const { ConductorMode } = await import("../../conductor-mode-2GSLHVN6.js");
+      const { registerConductorCard, CONDUCTOR_OWNER } = await import("../../card-EX2EYGCZ.js");
       const { loadPeers } = await import("../../peers-CJ7T4RJO.js");
       registerConductorCard(this.registryDb);
       const resolveAgentUrl = (owner) => {
@@ -1190,10 +1306,11 @@ var AgentRuntime = class {
     const executor = createSkillExecutor(configs, modes);
     if (hasSkillsYaml) {
       const pipelineExecutor = new PipelineExecutor(executor);
+      this.commandExecutor = new CommandExecutor();
       modes.set("api", new ApiExecutor());
       modes.set("pipeline", pipelineExecutor);
       modes.set("openclaw", new OpenClawBridge());
-      modes.set("command", new CommandExecutor());
+      modes.set("command", this.commandExecutor);
     }
     this.skillExecutor = executor;
   }
@@ -1226,6 +1343,9 @@ var AgentRuntime = class {
       return;
     }
     this.draining = true;
+    if (this.commandExecutor) {
+      this.commandExecutor.shutdown();
+    }
     for (const job of this.jobs) {
       job.stop();
     }
@@ -2003,6 +2123,78 @@ function releaseForRelay(creditDb, escrowId) {
   releaseEscrow(creditDb, escrowId);
 }
 
+// src/relay/relay-escrow.ts
+function verifyRelaySignature(data, signature, publicKeyHex) {
+  try {
+    const publicKeyBuf = Buffer.from(publicKeyHex, "hex");
+    return verifyEscrowReceipt(data, signature, publicKeyBuf);
+  } catch {
+    return false;
+  }
+}
+function processEscrowHold(creditDb, consumerAgentId, providerAgentId, skillId, amount, requestId, signature, publicKeyHex) {
+  if (signature && publicKeyHex) {
+    const signData = {
+      consumer_agent_id: consumerAgentId,
+      provider_agent_id: providerAgentId,
+      skill_id: skillId,
+      amount,
+      request_id: requestId
+    };
+    if (!verifyRelaySignature(signData, signature, publicKeyHex)) {
+      throw new Error("Invalid consumer signature on escrow hold");
+    }
+  }
+  const escrowId = holdEscrow(creditDb, consumerAgentId, amount, `${providerAgentId}:${skillId}`);
+  const remaining = getBalance(creditDb, consumerAgentId);
+  return {
+    escrow_id: escrowId,
+    hold_amount: amount,
+    consumer_remaining: remaining
+  };
+}
+function processEscrowSettle(creditDb, escrowId, success, providerAgentId, signature, publicKeyHex, consumerAgentId) {
+  if (signature && publicKeyHex && consumerAgentId) {
+    const signData = {
+      escrow_id: escrowId,
+      success,
+      consumer_agent_id: consumerAgentId
+    };
+    if (!verifyRelaySignature(signData, signature, publicKeyHex)) {
+      throw new Error("Invalid consumer signature on escrow settle");
+    }
+  }
+  const escrowRow = creditDb.prepare("SELECT amount, owner FROM credit_escrow WHERE id = ? AND status = ?").get(escrowId, "held");
+  if (!escrowRow) {
+    throw new Error(`Escrow not found or already settled: ${escrowId}`);
+  }
+  const NETWORK_FEE_RATE = 0.05;
+  if (success) {
+    settleEscrow(creditDb, escrowId, providerAgentId);
+    const networkFee = Math.floor(escrowRow.amount * NETWORK_FEE_RATE);
+    const providerAmount = escrowRow.amount - networkFee;
+    return {
+      escrow_id: escrowId,
+      provider_earned: providerAmount,
+      network_fee: networkFee,
+      consumer_remaining: getBalance(creditDb, escrowRow.owner),
+      provider_balance: getBalance(creditDb, providerAgentId)
+    };
+  } else {
+    releaseEscrow(creditDb, escrowId);
+    return {
+      escrow_id: escrowId,
+      provider_earned: 0,
+      network_fee: 0,
+      consumer_remaining: getBalance(creditDb, escrowRow.owner),
+      provider_balance: getBalance(creditDb, providerAgentId)
+    };
+  }
+}
+function settleWithNetworkFee(creditDb, escrowId, providerOwner) {
+  return processEscrowSettle(creditDb, escrowId, true, providerOwner);
+}
+
 // src/hub-agent/relay-bridge.ts
 import { randomUUID as randomUUID4 } from "crypto";
 
@@ -2392,10 +2584,17 @@ var RATE_LIMIT_WINDOW_MS = 6e4;
 var RELAY_TIMEOUT_MS = 3e5;
 function registerWebSocketRelay(server, db, creditDb) {
   const connections = /* @__PURE__ */ new Map();
+  const agentIdToOwner = /* @__PURE__ */ new Map();
   const pendingRequests = /* @__PURE__ */ new Map();
   const rateLimits = /* @__PURE__ */ new Map();
   const agentCapacities = /* @__PURE__ */ new Map();
   let onAgentOnlineCallback;
+  function resolveConnectionKey(target) {
+    const ownerFromAgentId = agentIdToOwner.get(target);
+    if (ownerFromAgentId && connections.has(ownerFromAgentId)) return ownerFromAgentId;
+    if (connections.has(target)) return target;
+    return void 0;
+  }
   function checkRateLimit(owner) {
     const now = Date.now();
     const entry = rateLimits.get(owner);
@@ -2499,6 +2698,20 @@ function registerWebSocketRelay(server, db, creditDb) {
       }
     }
     connections.set(owner, ws);
+    if (msg.agent_id) {
+      agentIdToOwner.set(msg.agent_id, owner);
+    }
+    if (msg.agents && msg.agents.length > 0) {
+      for (const agentEntry of msg.agents) {
+        agentIdToOwner.set(agentEntry.agent_id, owner);
+        for (const agentCard of agentEntry.cards) {
+          try {
+            upsertCard(agentCard, owner);
+          } catch {
+          }
+        }
+      }
+    }
     const isEphemeral = owner.includes(":req:");
     if (isEphemeral) {
       const cardId2 = card.id ?? owner;
@@ -2542,12 +2755,13 @@ function registerWebSocketRelay(server, db, creditDb) {
       });
       return;
     }
-    const targetWs = connections.get(msg.target_owner);
+    const targetKey = resolveConnectionKey(msg.target_agent_id ?? msg.target_owner);
+    const targetWs = targetKey ? connections.get(targetKey) : void 0;
     if (!targetWs || targetWs.readyState !== 1) {
       sendMessage(ws, {
         type: "response",
         id: msg.id,
-        error: { code: -32603, message: `Agent offline: ${msg.target_owner}` }
+        error: { code: -32603, message: `Agent offline: ${msg.target_agent_id ?? msg.target_owner}` }
       });
       return;
     }
@@ -2661,7 +2875,7 @@ function registerWebSocketRelay(server, db, creditDb) {
     if (pending.escrowId && creditDb) {
       try {
         if (msg.error === void 0) {
-          settleForRelay(creditDb, pending.escrowId, pending.targetOwner);
+          settleWithNetworkFee(creditDb, pending.escrowId, pending.targetOwner);
         } else {
           releaseForRelay(creditDb, pending.escrowId);
         }
@@ -2699,6 +2913,12 @@ function registerWebSocketRelay(server, db, creditDb) {
     connections.delete(owner);
     rateLimits.delete(owner);
     agentCapacities.delete(owner);
+    for (const [agentId, o] of agentIdToOwner) {
+      if (o === owner) {
+        agentIdToOwner.delete(agentId);
+        break;
+      }
+    }
     markOwnerOffline(owner);
     for (const [reqId, pending] of pendingRequests) {
       if (pending.targetOwner === owner) {
@@ -2735,6 +2955,96 @@ function registerWebSocketRelay(server, db, creditDb) {
   function handleHeartbeat(msg) {
     agentCapacities.set(msg.owner, msg.capacity);
   }
+  function handleEscrowHold(ws, msg) {
+    if (!creditDb) {
+      sendMessage(ws, { type: "error", code: "no_credit_db", message: "Credit system not available" });
+      return;
+    }
+    try {
+      const result = processEscrowHold(
+        creditDb,
+        msg.consumer_agent_id,
+        msg.provider_agent_id,
+        msg.skill_id,
+        msg.amount,
+        msg.request_id,
+        msg.signature,
+        msg.public_key
+      );
+      sendMessage(ws, {
+        type: "escrow_hold_confirmed",
+        request_id: msg.request_id,
+        escrow_id: result.escrow_id,
+        hold_amount: result.hold_amount,
+        consumer_remaining: result.consumer_remaining
+      });
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : "Escrow hold failed";
+      const code = errMsg.includes("INSUFFICIENT_CREDITS") ? "insufficient_credits" : "escrow_hold_failed";
+      sendMessage(ws, { type: "error", code, message: errMsg, request_id: msg.request_id });
+    }
+  }
+  function handleEscrowSettle(ws, msg) {
+    if (!creditDb) {
+      sendMessage(ws, { type: "error", code: "no_credit_db", message: "Credit system not available" });
+      return;
+    }
+    try {
+      const escrow = creditDb.prepare("SELECT card_id FROM credit_escrow WHERE id = ? AND status = ?").get(msg.escrow_id, "held");
+      if (!escrow) {
+        sendMessage(ws, { type: "error", code: "escrow_not_found", message: `Escrow not found: ${msg.escrow_id}`, request_id: msg.request_id });
+        return;
+      }
+      const providerAgentId = escrow.card_id.split(":")[0];
+      const result = processEscrowSettle(
+        creditDb,
+        msg.escrow_id,
+        msg.success,
+        providerAgentId,
+        msg.signature,
+        msg.public_key,
+        msg.consumer_agent_id
+      );
+      sendMessage(ws, {
+        type: "escrow_settled",
+        escrow_id: result.escrow_id,
+        request_id: msg.request_id,
+        provider_earned: result.provider_earned,
+        network_fee: result.network_fee,
+        consumer_remaining: result.consumer_remaining,
+        provider_balance: result.provider_balance
+      });
+      const providerKey = resolveConnectionKey(providerAgentId);
+      if (providerKey) {
+        const providerWs = connections.get(providerKey);
+        if (providerWs && providerWs.readyState === 1) {
+          sendMessage(providerWs, {
+            type: "escrow_settled",
+            escrow_id: result.escrow_id,
+            request_id: msg.request_id,
+            provider_earned: result.provider_earned,
+            network_fee: result.network_fee,
+            consumer_remaining: result.consumer_remaining,
+            provider_balance: result.provider_balance
+          });
+        }
+      }
+    } catch (err) {
+      sendMessage(ws, { type: "error", code: "escrow_settle_failed", message: err instanceof Error ? err.message : "Settlement failed", request_id: msg.request_id });
+    }
+  }
+  function handleBalanceSync(ws, msg) {
+    if (!creditDb) {
+      sendMessage(ws, { type: "error", code: "no_credit_db", message: "Credit system not available" });
+      return;
+    }
+    const balance = getBalance(creditDb, msg.agent_id);
+    sendMessage(ws, {
+      type: "balance_sync_response",
+      agent_id: msg.agent_id,
+      balance
+    });
+  }
   void server.register(async (app) => {
     app.get("/ws", { websocket: true }, (rawSocket, _request) => {
       const socket = rawSocket;
@@ -2783,6 +3093,16 @@ function registerWebSocketRelay(server, db, creditDb) {
             case "heartbeat":
               handleHeartbeat(msg);
               break;
+            // V8 Phase 2: Explicit escrow messages
+            case "escrow_hold":
+              handleEscrowHold(socket, msg);
+              break;
+            case "escrow_settle":
+              handleEscrowSettle(socket, msg);
+              break;
+            case "balance_sync":
+              handleBalanceSync(socket, msg);
+              break;
             default:
               break;
           }
@@ -5494,7 +5814,7 @@ async function stopAnnouncement() {
 }
 
 // src/runtime/service-coordinator.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { createRequire } from "module";
 import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -5522,10 +5842,14 @@ var ServiceCoordinator = class {
       if (health.ok && health.agentbnb) {
         return "already_running";
       }
-      throw new AgentBnBError(
-        `AgentBnB lock exists but health check failed (pid=${running.pid}, port=${running.port})`,
-        "SERVICE_UNHEALTHY"
-      );
+      if (opts?.foreground) {
+        this.guard.release();
+      } else {
+        throw new AgentBnBError(
+          `AgentBnB lock exists but health check failed (pid=${running.pid}, port=${running.port})`,
+          "SERVICE_UNHEALTHY"
+        );
+      }
     }
     if (opts?.foreground) {
       return this.startInProcess(opts);
@@ -5640,7 +5964,7 @@ var ServiceCoordinator = class {
       console.log("Conductor mode enabled \u2014 orchestrate/plan skills available via gateway");
     }
     if (opts.conductorEnabled && this.config.conductor?.public) {
-      const { buildConductorCard } = await import("../../card-REW7BSWW.js");
+      const { buildConductorCard } = await import("../../card-EX2EYGCZ.js");
       const conductorCard = buildConductorCard(this.config.owner);
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const existing = this.runtime.registryDb.prepare("SELECT id FROM capability_cards WHERE id = ?").get(conductorCard.id);
@@ -5697,8 +6021,8 @@ var ServiceCoordinator = class {
       }
     }
     if (opts.registryUrl && opts.relay) {
-      const { RelayClient: RelayClient2 } = await import("../../websocket-client-PFGVTXNE.js");
-      const { executeCapabilityRequest: executeCapabilityRequest2 } = await import("../../execute-I4PKSNJM.js");
+      const { RelayClient: RelayClient2 } = await import("../../websocket-client-4Z5P54RU.js");
+      const { executeCapabilityRequest: executeCapabilityRequest2 } = await import("../../execute-EPE6MZLT.js");
       const cards = listCards(this.runtime.registryDb, this.config.owner);
       const card = cards[0] ?? {
         id: randomUUID7(),
@@ -5714,7 +6038,7 @@ var ServiceCoordinator = class {
       };
       const additionalCards = [];
       if (this.config.conductor?.public) {
-        const { buildConductorCard } = await import("../../card-REW7BSWW.js");
+        const { buildConductorCard } = await import("../../card-EX2EYGCZ.js");
         additionalCards.push(
           buildConductorCard(this.config.owner)
         );
@@ -5723,6 +6047,7 @@ var ServiceCoordinator = class {
       this.relayClient = new RelayClient2({
         registryUrl: opts.registryUrl,
         owner: this.config.owner,
+        agent_id: this.config.agent_id,
         token: this.config.token,
         card,
         cards: additionalCards.length > 0 ? additionalCards : void 0,
@@ -5805,7 +6130,7 @@ var ServiceCoordinator = class {
     const runtime = loadPersistedRuntime(getConfigDir());
     const nodeExec = resolveNodeExecutable(runtime);
     const cliArgs = resolveCliLaunchArgs(this.buildServeArgs(opts));
-    const child = spawn(nodeExec, cliArgs, {
+    const child = spawn2(nodeExec, cliArgs, {
       detached: true,
       stdio: "ignore",
       env: { ...process.env }
@@ -6034,6 +6359,7 @@ import { z as z8 } from "zod";
 import { randomUUID as randomUUID8 } from "crypto";
 var EscrowReceiptSchema = z8.object({
   requester_owner: z8.string().min(1),
+  requester_agent_id: z8.string().optional(),
   requester_public_key: z8.string().min(1),
   amount: z8.number().positive(),
   card_id: z8.string().min(1),
@@ -6046,6 +6372,7 @@ function createSignedEscrowReceipt(db, privateKey, publicKey, opts) {
   const escrowId = holdEscrow(db, opts.owner, opts.amount, opts.cardId);
   const receiptData = {
     requester_owner: opts.owner,
+    ...opts.agent_id ? { requester_agent_id: opts.agent_id } : {},
     requester_public_key: publicKey.toString("hex"),
     amount: opts.amount,
     card_id: opts.cardId,
@@ -6408,21 +6735,16 @@ function isNetworkError(err) {
 }
 
 // skills/agentbnb/bootstrap.ts
-function findSoulMd(startDir) {
-  let dir = startDir;
-  while (true) {
-    const candidate = join5(dir, "SOUL.md");
-    if (existsSync6(candidate)) return candidate;
-    const parent = dirname4(dir);
-    if (parent === dir) return null;
-    dir = parent;
-  }
-}
 function resolveWorkspaceDir() {
-  const soulPath = findSoulMd(process.cwd());
-  if (soulPath) {
-    const workspaceName = basename(dirname4(soulPath));
-    return join5(homedir2(), ".agentbnb", workspaceName);
+  if (process.env["AGENTBNB_DIR"]) {
+    return process.env["AGENTBNB_DIR"];
+  }
+  const openclawAgentsDir = join5(homedir2(), ".openclaw", "agents");
+  const cwd = process.cwd();
+  if (cwd.startsWith(openclawAgentsDir + "/")) {
+    const relative = cwd.slice(openclawAgentsDir.length + 1);
+    const agentName = relative.split("/")[0];
+    return join5(openclawAgentsDir, agentName, ".agentbnb");
   }
   return join5(homedir2(), ".agentbnb");
 }
@@ -6486,7 +6808,20 @@ function registerDecomposerCard(configDir, owner) {
   }
 }
 async function activate(config = {}) {
-  if (!process.env["AGENTBNB_DIR"]) {
+  if (config.agentDir) {
+    process.env["AGENTBNB_DIR"] = config.agentDir;
+    process.stderr.write(
+      `[agentbnb] AGENTBNB_DIR set from config.agentDir: ${config.agentDir}
+`
+    );
+  } else if (config.workspaceDir) {
+    const derived = join5(config.workspaceDir, ".agentbnb");
+    process.env["AGENTBNB_DIR"] = derived;
+    process.stderr.write(
+      `[agentbnb] AGENTBNB_DIR derived from config.workspaceDir: ${derived}
+`
+    );
+  } else if (!process.env["AGENTBNB_DIR"]) {
     const workspaceDir = resolveWorkspaceDir();
     process.env["AGENTBNB_DIR"] = workspaceDir;
     process.stderr.write(