agentbnb 8.2.3 → 8.3.0

package/dist/cli/index.js

@@ -7,51 +7,44 @@ import {
   discoverLocalAgents,
   getPricingStats,
   resolveSelfCli
-} from "../chunk-Z2GEFFDO.js";
+} from "../chunk-O4Q7BRG6.js";
 import {
   createLedger,
   ensureIdentity,
   loadOrRepairIdentity
-} from "../chunk-LKLKYXLV.js";
-import {
-  releaseRequesterEscrow,
-  settleRequesterEscrow
-} from "../chunk-WNXXLCV5.js";
-import {
-  createSignedEscrowReceipt
-} from "../chunk-TUCEDQGM.js";
+} from "../chunk-74LZDEDT.js";
 import {
   AutoRequestor,
   BudgetManager,
-  DEFAULT_BUDGET_CONFIG
-} from "../chunk-QHZGOG3O.js";
+  DEFAULT_BUDGET_CONFIG,
+  requestViaTemporaryRelay
+} from "../chunk-D242QZCR.js";
 import {
   DEFAULT_AUTONOMY_CONFIG
-} from "../chunk-GKVTD4EZ.js";
-import "../chunk-CQFBNTGT.js";
+} from "../chunk-77KGEDH4.js";
+import "../chunk-S7DZHKCG.js";
 import {
   bootstrapAgent,
-  createAgentRecord,
   fetchRemoteCards,
   filterCards,
   getBalance,
   getTransactions,
-  lookupAgent,
-  lookupAgentByOwner,
   mergeResults,
   migrateOwner,
   openCreditDb,
   searchCards
-} from "../chunk-RYISHSHB.js";
-import "../chunk-NWIQJ2CL.js";
+} from "../chunk-F3KIEVJ2.js";
+import "../chunk-NX27AFPA.js";
+import "../chunk-PQIP7EXY.js";
 import {
   requestCapability
-} from "../chunk-CKOOVZOI.js";
+} from "../chunk-YKMBFQC2.js";
 import {
   generateKeyPair,
   loadKeyPair,
   saveKeyPair
-} from "../chunk-EJKW57ZV.js";
+} from "../chunk-GIEJVKZZ.js";
+import "../chunk-U6LP4KWN.js";
 import {
   findPeer,
   loadPeers,
@@ -65,19 +58,26 @@ import {
 } from "../chunk-75OC6E4F.js";
 import {
   parseSoulMd
-} from "../chunk-4IPJJRTP.js";
+} from "../chunk-IGQNP3ZO.js";
 import {
+  attachCanonicalAgentId,
   deleteCard,
   getCard,
   insertCard,
   listCards,
   openDatabase
-} from "../chunk-S3V6R3EN.js";
+} from "../chunk-5AIYALBX.js";
+import {
+  createAgentRecord,
+  lookupAgent,
+  lookupAgentByOwner,
+  updateAgentRecord
+} from "../chunk-WTHMHNKC.js";
 import {
   AgentBnBError,
   AnyCardSchema,
   CapabilityCardV2Schema
-} from "../chunk-WVY2W7AA.js";
+} from "../chunk-I7KWA7OB.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
@@ -188,17 +188,18 @@ function publishFromSoulV2(db, soulContent, owner, sharedSkills) {
     created_at: existingV2?.created_at ?? now,
     updated_at: now
   };
-  CapabilityCardV2Schema.parse(card);
+  const storedCard = attachCanonicalAgentId(db, card);
+  CapabilityCardV2Schema.parse(storedCard);
   if (existingV2) {
     db.prepare(
       "UPDATE capability_cards SET data = ?, updated_at = ? WHERE id = ?"
-    ).run(JSON.stringify(card), now, cardId);
+    ).run(JSON.stringify(storedCard), now, cardId);
   } else {
     db.prepare(
       "INSERT INTO capability_cards (id, owner, data, created_at, updated_at) VALUES (?, ?, ?, ?, ?)"
-    ).run(cardId, owner, JSON.stringify(card), now, now);
+    ).run(cardId, storedCard.owner, JSON.stringify(storedCard), now, now);
   }
-  return card;
+  return storedCard;
 }
 
 // src/openclaw/heartbeat-writer.ts
@@ -499,6 +500,28 @@ function loadIdentityAuth(owner) {
     privateKey: keys.privateKey
   };
 }
+function syncAgentRecord(db, identity, owner, displayName) {
+  const existingAgent = lookupAgent(db, identity.agent_id) ?? lookupAgentByOwner(db, owner);
+  if (!existingAgent) {
+    createAgentRecord(db, {
+      agent_id: identity.agent_id,
+      display_name: displayName,
+      public_key: identity.public_key,
+      legacy_owner: owner
+    });
+    return;
+  }
+  const updates = {};
+  if (existingAgent.display_name !== displayName) {
+    updates.display_name = displayName;
+  }
+  if (existingAgent.legacy_owner !== owner) {
+    updates.legacy_owner = owner;
+  }
+  if (Object.keys(updates).length > 0) {
+    updateAgentRecord(db, existingAgent.agent_id, updates);
+  }
+}
 async function performInit(opts) {
   const configDir = getConfigDir();
   const dbPath = join2(configDir, "registry.db");
@@ -524,24 +547,25 @@ async function performInit(opts) {
   const identity = identityMaterial.identity;
   const keypairStatus = identityMaterial.status === "generated" ? "generated" : "existing";
   const creditDb = openCreditDb(creditDbPath);
+  const registryDb = openDatabase(dbPath);
+  syncAgentRecord(creditDb, identity, owner, config.display_name ?? owner);
+  syncAgentRecord(registryDb, identity, owner, config.display_name ?? owner);
   if (existingConfig?.owner && existingConfig.owner !== owner) {
     migrateOwner(creditDb, existingConfig.owner, owner);
-    const regDb = openDatabase(dbPath);
-    try {
-      const rows = regDb.prepare("SELECT id, owner, data FROM capability_cards WHERE owner != ?").all(owner);
-      for (const row of rows) {
-        try {
-          const card = JSON.parse(row.data);
-          card.owner = owner;
-          regDb.prepare("UPDATE capability_cards SET owner = ?, data = ? WHERE id = ?").run(owner, JSON.stringify(card), row.id);
-        } catch {
-        }
-      }
-      if (!opts.json && rows.length > 0) {
-        console.log(`Migrated ${rows.length} card(s) \u2192 ${owner}`);
+    const rows = registryDb.prepare("SELECT id, owner, data FROM capability_cards WHERE owner = ?").all(existingConfig.owner);
+    for (const row of rows) {
+      try {
+        const card = JSON.parse(row.data);
+        const updatedCard = attachCanonicalAgentId(registryDb, {
+          ...card,
+          owner
+        });
+        registryDb.prepare("UPDATE capability_cards SET owner = ?, data = ? WHERE id = ?").run(owner, JSON.stringify(updatedCard), row.id);
+      } catch {
       }
-    } finally {
-      regDb.close();
+    }
+    if (!opts.json && rows.length > 0) {
+      console.log(`Migrated ${rows.length} card(s) \u2192 ${owner}`);
     }
     const allOwners = creditDb.prepare("SELECT owner FROM credit_balances WHERE owner != ?").all(owner);
     for (const { owner: oldOwner } of allOwners) {
@@ -569,23 +593,12 @@ async function performInit(opts) {
       console.log(`Migrated local credits: ${existingConfig.owner} \u2192 ${owner}`);
     }
   }
-  const existingAgent = lookupAgent(creditDb, identity.agent_id) ?? lookupAgentByOwner(creditDb, owner);
-  if (!existingAgent) {
-    try {
-      createAgentRecord(creditDb, {
-        agent_id: identity.agent_id,
-        display_name: config.display_name ?? owner,
-        public_key: identity.public_key,
-        legacy_owner: owner
-      });
-    } catch {
-    }
-  }
   if (!config.agent_id || config.agent_id !== identity.agent_id) {
     config.agent_id = identity.agent_id;
     saveConfig(config);
   }
-  bootstrapAgent(creditDb, owner, 100);
+  bootstrapAgent(creditDb, identity.agent_id, 100);
+  registryDb.close();
   creditDb.close();
   let registryBalance;
   if (config.registry) {
@@ -636,13 +649,20 @@ async function performInit(opts) {
       if (yesMode) {
         const db = openDatabase(dbPath);
         try {
+          const storedCard = attachCanonicalAgentId(db, card);
           db.prepare(
             `INSERT OR REPLACE INTO capability_cards (id, owner, data, created_at, updated_at)
              VALUES (?, ?, ?, ?, ?)`
-          ).run(card.id, card.owner, JSON.stringify(card), card.created_at, card.updated_at);
-          publishedCards.push({ id: card.id, name: card.agent_name });
+          ).run(
+            storedCard.id,
+            storedCard.owner,
+            JSON.stringify(storedCard),
+            storedCard.created_at,
+            storedCard.updated_at
+          );
+          publishedCards.push({ id: storedCard.id, name: storedCard.agent_name });
           if (!opts.json) {
-            console.log(`  Published v2.0 card: ${card.agent_name} (${card.skills.length} skills)`);
+            console.log(`  Published v2.0 card: ${storedCard.agent_name} (${storedCard.skills.length} skills)`);
           }
         } finally {
           db.close();
@@ -653,12 +673,19 @@ Publish these ${card.skills.length} capabilities? [y/N] `);
         if (yes) {
           const db = openDatabase(dbPath);
           try {
+            const storedCard = attachCanonicalAgentId(db, card);
             db.prepare(
               `INSERT OR REPLACE INTO capability_cards (id, owner, data, created_at, updated_at)
                VALUES (?, ?, ?, ?, ?)`
-            ).run(card.id, card.owner, JSON.stringify(card), card.created_at, card.updated_at);
-            publishedCards.push({ id: card.id, name: card.agent_name });
-            console.log(`  Published v2.0 card: ${card.agent_name} (${card.skills.length} skills)`);
+            ).run(
+              storedCard.id,
+              storedCard.owner,
+              JSON.stringify(storedCard),
+              storedCard.created_at,
+              storedCard.updated_at
+            );
+            publishedCards.push({ id: storedCard.id, name: storedCard.agent_name });
+            console.log(`  Published v2.0 card: ${storedCard.agent_name} (${storedCard.skills.length} skills)`);
           } finally {
             db.close();
           }
@@ -721,13 +748,20 @@ Publish these ${card.skills.length} capabilities? [y/N] `);
           const card = capabilitiesToV2Card(selected, owner);
           const db = openDatabase(dbPath);
           try {
+            const storedCard = attachCanonicalAgentId(db, card);
             db.prepare(
               `INSERT OR REPLACE INTO capability_cards (id, owner, data, created_at, updated_at)
                VALUES (?, ?, ?, ?, ?)`
-            ).run(card.id, card.owner, JSON.stringify(card), card.created_at, card.updated_at);
-            publishedCards.push({ id: card.id, name: card.agent_name });
+            ).run(
+              storedCard.id,
+              storedCard.owner,
+              JSON.stringify(storedCard),
+              storedCard.created_at,
+              storedCard.updated_at
+            );
+            publishedCards.push({ id: storedCard.id, name: storedCard.agent_name });
             console.log(`
-  Published v2.0 card: ${card.agent_name} (${card.skills.length} skills)`);
+  Published v2.0 card: ${storedCard.agent_name} (${storedCard.skills.length} skills)`);
           } finally {
             db.close();
           }
@@ -885,8 +919,8 @@ Skills: ${skills.skillCount} skill(s) in ${skills.path}`);
   let daemonStatus = { running: false, reason: "skipped" };
   if (!skipServe) {
     try {
-      const { ProcessGuard } = await import("../process-guard-GH5LRNWO.js");
-      const { ServiceCoordinator } = await import("../service-coordinator-KMSA6BST.js");
+      const { ProcessGuard } = await import("../process-guard-TNSUNHSR.js");
+      const { ServiceCoordinator } = await import("../service-coordinator-RY5AKUZS.js");
       const guard = new ProcessGuard(join3(initResult.configDir, ".pid"));
       const coordinator = new ServiceCoordinator(initResult.config, guard);
       const result = await coordinator.ensureRunning({
@@ -948,7 +982,7 @@ Skills: ${skills.skillCount} skill(s) in ${skills.path}`);
 }
 
 // src/cli/index.ts
-var VERSION = "8.2.3";
+var VERSION = true ? "8.3.0" : "0.0.0-dev";
 function loadIdentityAuth2(owner) {
   const configDir = getConfigDir();
   let keys;
@@ -965,6 +999,32 @@ function loadIdentityAuth2(owner) {
     privateKey: keys.privateKey
   };
 }
+function parsePositiveNumber(value) {
+  return typeof value === "number" && value > 0 ? value : void 0;
+}
+function buildTimeoutHintFromCard(card, skillId) {
+  const cardHint = {
+    expected_duration_ms: parsePositiveNumber(card["expected_duration_ms"]),
+    hard_timeout_ms: parsePositiveNumber(card["hard_timeout_ms"])
+  };
+  const skills = card["skills"];
+  if (!Array.isArray(skills)) {
+    return cardHint.expected_duration_ms !== void 0 || cardHint.hard_timeout_ms !== void 0 ? cardHint : void 0;
+  }
+  const selected = skillId ? skills.find((candidate) => {
+    if (!candidate || typeof candidate !== "object") return false;
+    return candidate["id"] === skillId;
+  }) : skills[0];
+  if (!selected || typeof selected !== "object") {
+    return cardHint.expected_duration_ms !== void 0 || cardHint.hard_timeout_ms !== void 0 ? cardHint : void 0;
+  }
+  const selectedRecord = selected;
+  const hint = {
+    expected_duration_ms: parsePositiveNumber(selectedRecord["expected_duration_ms"]) ?? cardHint.expected_duration_ms,
+    hard_timeout_ms: parsePositiveNumber(selectedRecord["hard_timeout_ms"]) ?? cardHint.hard_timeout_ms
+  };
+  return hint.expected_duration_ms !== void 0 || hint.hard_timeout_ms !== void 0 ? hint : void 0;
+}
 function getLanIp2() {
   const nets = networkInterfaces2();
   for (const ifaces of Object.values(nets)) {
@@ -1072,15 +1132,22 @@ program.command("publish <card.json>").description("Publish a Capability Card to
     }
   }
   const db = openDatabase(config.db_path);
+  let localCard = card;
   try {
     if (card.spec_version === "2.0") {
       const now = (/* @__PURE__ */ new Date()).toISOString();
-      const cardWithTimestamps = { ...card, created_at: card.created_at ?? now, updated_at: now };
+      const cardWithTimestamps = attachCanonicalAgentId(db, {
+        ...card,
+        created_at: card.created_at ?? now,
+        updated_at: now
+      });
       db.prepare(
         "INSERT OR REPLACE INTO capability_cards (id, owner, data, created_at, updated_at) VALUES (?, ?, ?, ?, ?)"
       ).run(cardWithTimestamps.id, cardWithTimestamps.owner, JSON.stringify(cardWithTimestamps), cardWithTimestamps.created_at, cardWithTimestamps.updated_at);
+      localCard = cardWithTimestamps;
     } else {
       insertCard(db, card);
+      localCard = attachCanonicalAgentId(db, card);
     }
   } finally {
     db.close();
@@ -1092,7 +1159,7 @@ program.command("publish <card.json>").description("Publish a Capability Card to
   let remoteSuccess = false;
   if (registryUrl) {
     const url = `${registryUrl.replace(/\/$/, "")}/cards`;
-    const remoteCard = { ...card, gateway_url: config.gateway_url };
+    const remoteCard = config.agent_id && localCard.owner === config.owner && localCard.agent_id !== config.agent_id ? { ...localCard, agent_id: config.agent_id, gateway_url: config.gateway_url } : { ...localCard, gateway_url: config.gateway_url };
     try {
       const response = await fetch(url, {
         method: "POST",
@@ -1128,8 +1195,8 @@ program.command("publish-skills").description("Publish capabilities from skills.
     console.error("Error: not initialized. Run `agentbnb init` first.");
     process.exit(1);
   }
-  const { parseSkillsFile } = await import("../skill-config-FETXPNVP.js");
-  const { skillConfigToSkill } = await import("../publish-capability-QDR2QIZ2.js");
+  const { parseSkillsFile } = await import("../skill-config-5O2VR546.js");
+  const { skillConfigToSkill } = await import("../publish-capability-HVYILTPR.js");
   const skillsPath = typeof opts.fromSkills === "string" ? opts.fromSkills : "./skills.yaml";
   let yamlContent;
   try {
@@ -1159,6 +1226,7 @@ program.command("publish-skills").description("Publish capabilities from skills.
     spec_version: "2.0",
     id: randomUUID3(),
     owner: config.owner,
+    agent_id: config.agent_id,
     agent_name: config.owner,
     skills,
     availability: { online: true },
@@ -1167,9 +1235,10 @@ program.command("publish-skills").description("Publish capabilities from skills.
   };
   const db = openDatabase(config.db_path);
   try {
+    const storedCard = attachCanonicalAgentId(db, card);
     db.prepare(
       "INSERT OR REPLACE INTO capability_cards (id, owner, data, created_at, updated_at) VALUES (?, ?, ?, ?, ?)"
-    ).run(card.id, card.owner, JSON.stringify(card), now, now);
+    ).run(storedCard.id, storedCard.owner, JSON.stringify(storedCard), now, now);
   } finally {
     db.close();
   }
@@ -1366,7 +1435,7 @@ ${discovered.length} agent(s) found on local network`);
   console.log(`
 ${outputCards.length} result(s)`);
 });
-program.command("request [card-id]").description("Request a capability from another agent \u2014 direct (card-id) or auto (--query)").option("--params <json>", "Input parameters as JSON string", "{}").option("--peer <name>", "Peer name to send request to (resolves URL+token from peer registry)").option("--skill <id>", "Skill ID within a v2.0 card").option("--cost <credits>", "Credits to commit (required for cross-machine peer requests)").option("--query <text>", "Search query for capability gap (triggers auto-request flow)").option("--max-cost <credits>", "Maximum credits to spend on auto-request (default: 50)").option("--no-receipt", "Skip signed escrow receipt (local-only mode)").option("--batch <file>", "Path to JSON file with batch request payload { requests, strategy, total_budget }").option("--json", "Output as JSON").action(async (cardId, opts) => {
+program.command("request [card-id]").description("Request a capability from another agent \u2014 direct (card-id) or auto (--query)").option("--params <json>", "Input parameters as JSON string", "{}").option("--peer <name>", "Peer name to send request to (resolves URL+token from peer registry)").option("--skill <id>", "Skill ID within a v2.0 card").option("--cost <credits>", "Credits to commit (required for cross-machine peer requests)").option("--query <text>", "Search query for capability gap (triggers auto-request flow)").option("--max-cost <credits>", "Maximum credits to spend on auto-request (default: 50)").option("--timeout <ms>", "Request timeout override in milliseconds").option("--no-receipt", "Skip signed escrow receipt (local-only mode)").option("--batch <file>", "Path to JSON file with batch request payload { requests, strategy, total_budget }").option("--json", "Output as JSON").action(async (cardId, opts) => {
   const config = loadConfig();
   if (!config) {
     console.error("Error: not initialized. Run `agentbnb init` first.");
@@ -1478,10 +1547,20 @@ Batch Results (${res.results.length} items):`);
     console.error("Error: --params must be valid JSON.");
     process.exit(1);
   }
+  let timeoutOverrideMs;
+  if (opts.timeout !== void 0) {
+    timeoutOverrideMs = Number(opts.timeout);
+    if (!Number.isFinite(timeoutOverrideMs) || timeoutOverrideMs <= 0) {
+      console.error("Error: --timeout <ms> must be a positive number.");
+      process.exit(1);
+    }
+  }
   let gatewayUrl;
   let token;
   let isRemoteRequest = false;
   let targetOwner;
+  let targetAgentId;
+  let timeoutHint;
   const identityAuth = loadIdentityAuth2(config.owner);
   if (opts.peer) {
     const peer = findPeer(opts.peer);
@@ -1504,6 +1583,7 @@ Batch Results (${res.results.length} items):`);
     if (localCard && localCard.owner === config.owner) {
       gatewayUrl = config.gateway_url;
       token = config.token;
+      timeoutHint = buildTimeoutHintFromCard(localCard, opts.skill);
     } else {
       const registryUrl = config.registry;
       if (!registryUrl) {
@@ -1525,6 +1605,8 @@ Batch Results (${res.results.length} items):`);
         process.exit(1);
       }
       targetOwner = remoteCard.owner ?? remoteCard.agent_name;
+      targetAgentId = typeof remoteCard.agent_id === "string" ? remoteCard.agent_id : void 0;
+      timeoutHint = buildTimeoutHintFromCard(remoteCard, opts.skill);
       if (remoteCard.gateway_url && typeof remoteCard.gateway_url === "string") {
         gatewayUrl = remoteCard.gateway_url;
       } else if (targetOwner && config.registry) {
@@ -1545,110 +1627,6 @@ Batch Results (${res.results.length} items):`);
       }
     }
   }
-  const useReceipt = isRemoteRequest && opts.receipt !== false;
-  const isRelayOnly = isRemoteRequest && !gatewayUrl;
-  const useRegistryLedger = false;
-  if (useReceipt && !opts.cost && !isRelayOnly) {
-    console.error("Error: --cost <credits> is required for remote requests. Specify the credits to commit.");
-    process.exit(1);
-  }
-  let escrowId;
-  let escrowReceipt;
-  let requestLedger;
-  if (useReceipt) {
-    const amount = Number(opts.cost);
-    if (isNaN(amount) || amount <= 0) {
-      console.error("Error: --cost must be a positive number.");
-      process.exit(1);
-    }
-    if (useRegistryLedger) {
-      const reqIdentityAuth = loadIdentityAuth2(config.owner);
-      requestLedger = createLedger({
-        registryUrl: config.registry,
-        ownerPublicKey: reqIdentityAuth.publicKey,
-        privateKey: reqIdentityAuth.privateKey
-      });
-      try {
-        const { escrowId: heldId } = await requestLedger.hold(config.owner, amount, cardId);
-        escrowId = heldId;
-        if (!opts.json) {
-          console.log(`Escrow: ${amount} credits held via Registry (ID: ${escrowId.slice(0, 8)}...)`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (opts.json) {
-          console.log(JSON.stringify({ success: false, error: msg }, null, 2));
-        } else {
-          console.error(`Error creating escrow via Registry: ${msg}`);
-        }
-        process.exit(1);
-      }
-    } else if (gatewayUrl) {
-      const configDir = getConfigDir();
-      const creditDb = openCreditDb(join4(configDir, "credit.db"));
-      creditDb.pragma("busy_timeout = 5000");
-      try {
-        const keys = loadKeyPair(configDir);
-        const receiptResult = createSignedEscrowReceipt(creditDb, keys.privateKey, keys.publicKey, {
-          owner: config.owner,
-          amount,
-          cardId,
-          skillId: opts.skill
-        });
-        escrowId = receiptResult.escrowId;
-        escrowReceipt = receiptResult.receipt;
-        if (!opts.json) {
-          console.log(`Escrow: ${amount} credits held (ID: ${escrowId.slice(0, 8)}...)`);
-        }
-      } catch (err) {
-        creditDb.close();
-        const msg = err instanceof Error ? err.message : String(err);
-        if (opts.json) {
-          console.log(JSON.stringify({ success: false, error: msg }, null, 2));
-        } else {
-          console.error(`Error creating escrow receipt: ${msg}`);
-        }
-        process.exit(1);
-      }
-      creditDb.close();
-    }
-  }
-  const settleEscrow = async () => {
-    if (useReceipt && escrowId) {
-      if (requestLedger) {
-        await requestLedger.settle(escrowId, targetOwner ?? config.owner);
-        if (!opts.json) console.log(`Escrow settled: ${opts.cost} credits deducted.`);
-      } else if (escrowReceipt) {
-        const configDir = getConfigDir();
-        const creditDb = openCreditDb(join4(configDir, "credit.db"));
-        creditDb.pragma("busy_timeout = 5000");
-        try {
-          settleRequesterEscrow(creditDb, escrowId);
-          if (!opts.json) console.log(`Escrow settled: ${opts.cost} credits deducted.`);
-        } finally {
-          creditDb.close();
-        }
-      }
-    }
-  };
-  const releaseEscrow = async () => {
-    if (useReceipt && escrowId) {
-      if (requestLedger) {
-        await requestLedger.release(escrowId);
-        if (!opts.json) console.log("Escrow released: credits refunded.");
-      } else if (escrowReceipt) {
-        const configDir = getConfigDir();
-        const creditDb = openCreditDb(join4(configDir, "credit.db"));
-        creditDb.pragma("busy_timeout = 5000");
-        try {
-          releaseRequesterEscrow(creditDb, escrowId);
-          if (!opts.json) console.log("Escrow released: credits refunded.");
-        } finally {
-          creditDb.close();
-        }
-      }
-    }
-  };
   const printResult = (result) => {
     if (opts.json) {
       console.log(JSON.stringify({ success: true, result }, null, 2));
@@ -1657,70 +1635,58 @@ Batch Results (${res.results.length} items):`);
       console.log(typeof result === "string" ? result : JSON.stringify(result, null, 2));
     }
   };
-  const isNetworkError = (err) => {
-    const msg = err instanceof Error ? err.message : String(err);
-    return msg.includes("NETWORK_ERROR") || msg.includes("ECONNREFUSED") || msg.includes("fetch failed") || msg.includes("Network error");
-  };
-  const tryViaRelay = async () => {
-    const { RelayClient } = await import("../websocket-client-QOVARTRN.js");
-    const { requestViaRelay } = await import("../client-XOLP5IUZ.js");
-    const requesterId = `${config.owner}:req:${randomUUID3()}`;
-    const tempRelay = new RelayClient({
-      registryUrl: config.registry,
-      owner: requesterId,
-      token: config.token,
-      card: { id: randomUUID3(), owner: requesterId, name: requesterId, description: "Requester", level: 1, spec_version: "1.0", inputs: [], outputs: [], pricing: { credits_per_call: 1 }, availability: { online: false } },
-      onRequest: async () => ({ error: { code: -32601, message: "Not serving" } }),
-      silent: true
-    });
-    try {
-      await tempRelay.connect();
-      const result = await requestViaRelay(tempRelay, {
+  try {
+    let result;
+    if (!isRemoteRequest) {
+      result = await requestCapability({
+        gatewayUrl,
+        token,
+        cardId,
+        params: {
+          ...params,
+          ...opts.skill ? { skill_id: opts.skill } : {},
+          requester: config.owner
+        },
+        timeoutMs: timeoutOverrideMs,
+        timeoutHint,
+        identity: identityAuth
+      });
+    } else if (isRemoteRequest && config.registry && targetOwner) {
+      if (!opts.json) console.log("Requesting via relay...");
+      result = await requestViaTemporaryRelay({
+        registryUrl: config.registry,
+        owner: config.owner,
+        token: config.token,
         targetOwner,
+        targetAgentId,
         cardId,
         skillId: opts.skill,
-        params: { ...params, ...opts.skill ? { skill_id: opts.skill } : {} },
-        requester: config.owner,
-        // actual owner for credit tracking on relay server
-        escrowReceipt
+        params: {
+          ...params,
+          ...opts.skill ? { skill_id: opts.skill } : {},
+          requester: config.owner
+        },
+        timeoutMs: timeoutOverrideMs
+      });
+    } else if (gatewayUrl) {
+      result = await requestCapability({
+        gatewayUrl,
+        token,
+        cardId,
+        params: {
+          ...params,
+          ...opts.skill ? { skill_id: opts.skill } : {},
+          requester: config.owner
+        },
+        timeoutMs: timeoutOverrideMs,
+        timeoutHint,
+        identity: identityAuth
       });
-      return result;
-    } finally {
-      tempRelay.disconnect();
-    }
-  };
-  try {
-    let result;
-    if (!gatewayUrl && isRemoteRequest && config.registry && targetOwner) {
-      if (!opts.json) console.log("No gateway URL, requesting via relay...");
-      result = await tryViaRelay();
     } else {
-      try {
-        result = await requestCapability({
-          gatewayUrl,
-          token,
-          cardId,
-          params: {
-            ...params,
-            ...opts.skill ? { skill_id: opts.skill } : {},
-            requester: config.owner
-          },
-          escrowReceipt,
-          identity: identityAuth
-        });
-      } catch (directErr) {
-        if (isNetworkError(directErr) && isRemoteRequest && config.registry && targetOwner) {
-          if (!opts.json) console.log("Direct connection failed, trying relay...");
-          result = await tryViaRelay();
-        } else {
-          throw directErr;
-        }
-      }
+      throw new Error("Remote request requires a registry URL and target owner. Configure registry with: agentbnb config set registry <url>");
     }
-    await settleEscrow();
     printResult(result);
   } catch (err) {
-    await releaseEscrow();
     const msg = err instanceof Error ? err.message : String(err);
     if (opts.json) {
       console.log(JSON.stringify({ success: false, error: msg }, null, 2));
@@ -1792,8 +1758,8 @@ program.command("serve").description("Start the AgentBnB gateway server").option
     console.error("Error: not initialized. Run `agentbnb init` first.");
     process.exit(1);
   }
-  const { ProcessGuard } = await import("../process-guard-GH5LRNWO.js");
-  const { ServiceCoordinator } = await import("../service-coordinator-KMSA6BST.js");
+  const { ProcessGuard } = await import("../process-guard-TNSUNHSR.js");
+  const { ServiceCoordinator } = await import("../service-coordinator-RY5AKUZS.js");
   const port = opts.port ? parseInt(opts.port, 10) : config.gateway_port;
   const registryPort = parseInt(opts.registryPort, 10);
   if (!Number.isFinite(port) || !Number.isFinite(registryPort)) {
@@ -2167,7 +2133,7 @@ openclaw.command("rules").description("Print HEARTBEAT.md rules block (or inject
   }
 });
 program.command("conduct <task>").description("Orchestrate a complex task across the AgentBnB network").option("--plan-only", "Show execution plan without executing").option("--max-budget <credits>", "Maximum credits to spend", "100").option("--json", "Output as JSON").action(async (task, opts) => {
-  const { conductAction } = await import("../conduct-VPUYTNEA.js");
+  const { conductAction } = await import("../conduct-4JDMWBQD.js");
   const result = await conductAction(task, opts);
   if (opts.json) {
     console.log(JSON.stringify(result, null, 2));
@@ -2279,7 +2245,7 @@ Feedback for skill: ${opts.skill} (${feedbacks.length} entries)
 });
 program.command("quickstart").alias("qs").description("One-command setup: init + skills.yaml + MCP registration + serve daemon").option("--owner <name>", "Agent owner name").option("--port <port>", "Gateway port", "7700").option("--no-serve", "Skip starting background daemon").option("--no-mcp", "Skip MCP registration with Claude Code").option("--json", "Output as JSON").action(runQuickstart);
 program.command("mcp-server").description("Start an MCP (Model Context Protocol) server for IDE integration").action(async () => {
-  const { startMcpServer } = await import("../server-46VEG2W7.js");
+  const { startMcpServer } = await import("../server-YV3XPTX5.js");
   await startMcpServer();
 });
 await program.parseAsync(process.argv);