@agentvault/agentvault 0.15.2 → 0.16.0

package/dist/openclaw-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openclaw-entry.d.ts","sourceRoot":"","sources":["../src/openclaw-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,KAAK,EACV,iBAAiB,EASlB,MAAM,qBAAqB,CAAC;AAsD7B,gFAAgF;AAChF,eAAO,IAAI,oBAAoB,SAAQ,CAAC;AA6CxC,uEAAuE;AACvE,iBAAS,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAS9C;AAED,qFAAqF;AACrF,iBAAS,yBAAyB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAcT;AAED,sFAAsF;AACtF,iBAAS,cAAc,CACrB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,MAAM,CAiBR;AAk1BD,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,cAAc,EAAE,CAAC;;;;;kBAQrD,iBAAiB;;AAJjC,wBAoRE"}
+{"version":3,"file":"openclaw-entry.d.ts","sourceRoot":"","sources":["../src/openclaw-entry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAUH,OAAO,KAAK,EACV,iBAAiB,EASlB,MAAM,qBAAqB,CAAC;AAsD7B,gFAAgF;AAChF,eAAO,IAAI,oBAAoB,SAAQ,CAAC;AA+CxC,uEAAuE;AACvE,iBAAS,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAS9C;AAED,qFAAqF;AACrF,iBAAS,yBAAyB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAcT;AAED,sFAAsF;AACtF,iBAAS,cAAc,CACrB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,MAAM,CAiBR;AA00BD,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,cAAc,EAAE,CAAC;;;;;kBAQrD,iBAAiB;;AAJjC,wBA8RE"}

package/dist/openclaw-entry.js

@@ -296,32 +296,55 @@ async function handleSendRequest(parsed, channel) {
     return { status: 400, body: { ok: false, error: "Missing 'text' field" } };
   }
   try {
+    let target;
     let a2aTarget = parsed.hub_address ?? parsed.a2a_address ?? parsed.a2aAddress;
     if (!a2aTarget && parsed.channel_id && typeof parsed.channel_id === "string") {
       const hubAddr = channel.resolveA2AChannelHub(parsed.channel_id);
       if (hubAddr) a2aTarget = hubAddr;
     }
-    const roomId = (typeof parsed.room_id === "string" ? parsed.room_id : void 0) ?? channel.lastInboundRoomId;
     if (a2aTarget && typeof a2aTarget === "string") {
-      await channel.sendToAgent(a2aTarget, text);
-    } else if (roomId) {
-      await channel.sendToRoom(roomId, text, {
-        messageType: parsed.message_type,
-        priority: parsed.priority,
-        metadata: parsed.metadata
-      });
+      target = { kind: "a2a", hubAddress: a2aTarget };
+    } else if (typeof parsed.room_id === "string") {
+      target = { kind: "room", roomId: parsed.room_id };
+    } else if (parsed.target === "context") {
+      target = { kind: "context" };
     } else if (parsed.file_path && typeof parsed.file_path === "string") {
-      await channel.sendWithAttachment(text, parsed.file_path, {
-        topicId: parsed.topicId
-      });
+      const receipt2 = await channel.deliver(
+        { kind: "owner" },
+        { type: "attachment", text, filePath: parsed.file_path },
+        { topicId: parsed.topicId }
+      );
+      return {
+        status: receipt2.ok ? 200 : 500,
+        body: {
+          ok: receipt2.ok,
+          destination: receipt2.destination,
+          ...receipt2.error ? { error: receipt2.error } : {}
+        }
+      };
     } else {
-      await channel.send(text, {
-        topicId: parsed.topicId,
-        messageType: parsed.message_type,
-        metadata: parsed.metadata
-      });
+      target = { kind: "owner" };
     }
-    return { status: 200, body: { ok: true } };
+    const receipt = await channel.deliver(
+      target,
+      { type: "text", text },
+      {
+        topicId: parsed.topicId,
+        priority: parsed.priority,
+        metadata: {
+          ...parsed.metadata,
+          ...parsed.message_type ? { message_type: parsed.message_type } : {}
+        }
+      }
+    );
+    return {
+      status: receipt.ok ? 200 : 500,
+      body: {
+        ok: receipt.ok,
+        destination: receipt.destination,
+        ...receipt.error ? { error: receipt.error } : {}
+      }
+    };
   } catch (err) {
     return { status: 500, body: { ok: false, error: String(err) } };
   }
@@ -338,12 +361,19 @@ async function handleActionRequest(parsed, channel) {
       detail: parsed.detail,
       estimated_cost: parsed.estimated_cost
     };
-    if (parsed.room_id && typeof parsed.room_id === "string") {
-      await channel.sendActionConfirmationToRoom(parsed.room_id, confirmation);
-    } else {
-      await channel.sendActionConfirmation(confirmation);
-    }
-    return { status: 200, body: { ok: true } };
+    const target = parsed.room_id && typeof parsed.room_id === "string" ? { kind: "room", roomId: parsed.room_id } : { kind: "owner" };
+    const receipt = await channel.deliver(
+      target,
+      { type: "action_confirmation", confirmation }
+    );
+    return {
+      status: receipt.ok ? 200 : 500,
+      body: {
+        ok: receipt.ok,
+        destination: receipt.destination,
+        ...receipt.error ? { error: receipt.error } : {}
+      }
+    };
   } catch (err) {
     return { status: 500, body: { ok: false, error: String(err) } };
   }
@@ -387,9 +417,49 @@ function handleStatusRequest(channel) {
     }
   };
 }
+function handleTargetsRequest(channel) {
+  return {
+    status: 200,
+    body: {
+      ok: true,
+      targets: channel.listTargets(),
+      context: channel.lastInboundRoomId ? { kind: "room", roomId: channel.lastInboundRoomId } : { kind: "owner" }
+    }
+  };
+}
 
 // src/openclaw-entry.ts
 init_openclaw_compat();
+
+// src/types.ts
+function parseTarget(raw) {
+  let target = raw;
+  if (target.startsWith("agentvault:")) {
+    target = target.slice("agentvault:".length);
+  }
+  if (target.startsWith("agent:")) {
+    target = "a2a:" + target.slice("agent:".length);
+  }
+  if (target === "owner" || target === "default") {
+    return { kind: "owner" };
+  }
+  if (target === "context") {
+    return { kind: "context" };
+  }
+  if (target.startsWith("room:")) {
+    const roomId = target.slice("room:".length);
+    if (!roomId) throw new Error(`Invalid room target: "${raw}" \u2014 missing room ID`);
+    return { kind: "room", roomId };
+  }
+  if (target.startsWith("a2a:")) {
+    const hubAddress = target.slice("a2a:".length);
+    if (!hubAddress) throw new Error(`Invalid A2A target: "${raw}" \u2014 missing hub address`);
+    return { kind: "a2a", hubAddress };
+  }
+  throw new Error(`Unrecognized delivery target: "${raw}". Use "owner", "room:<id>", "a2a:<addr>", or "context".`);
+}
+
+// src/openclaw-entry.ts
 var _ocRuntime = null;
 var _channels = /* @__PURE__ */ new Map();
 var _messageQueue = [];
@@ -672,12 +742,28 @@ async function handleInbound(params) {
   } catch {
   }
   const core = _ocRuntime;
+  let roomName;
+  let senderDisplayName;
+  if (isRoomMessage && metadata.roomId) {
+    roomName = metadata.roomName;
+    if (!roomName) {
+      const rooms = channel.getRooms?.() ?? [];
+      const room = rooms.find((r) => r.roomId === metadata.roomId);
+      if (room) {
+        roomName = room.name;
+        if (metadata.senderDeviceId) {
+          const member = room.members?.find((m) => m.deviceId === metadata.senderDeviceId);
+          if (member) senderDisplayName = member.displayName;
+        }
+      }
+    }
+  }
   const route = core.channel.routing.resolveAgentRoute({
     cfg,
     channel: "agentvault",
     accountId: account.accountId,
     peer: {
-      kind: isA2AMessage ? "a2a" : "direct",
+      kind: isA2AMessage ? "a2a" : isRoomMessage ? "group" : "direct",
       id: isA2AMessage ? `agentvault:a2a:${metadata.fromHubAddress}` : isRoomMessage ? `agentvault:room:${metadata.roomId}` : "agentvault:owner"
     }
   });
@@ -691,7 +777,7 @@ async function handleInbound(params) {
   });
   const body = core.channel.reply.formatAgentEnvelope({
     channel: "AgentVault",
-    from: isA2AMessage ? `Agent (${metadata.fromHubAddress})` : isRoomMessage ? "Room" : "Owner",
+    from: isA2AMessage ? `Agent (${metadata.fromHubAddress})` : isRoomMessage ? senderDisplayName ?? "Room Member" : "Owner",
     timestamp: new Date(metadata.timestamp).getTime(),
     previousTimestamp,
     envelope: envelopeOptions,
@@ -716,9 +802,9 @@ async function handleInbound(params) {
     SessionKey: route.sessionKey,
     AccountId: account.accountId,
     ChatType: isA2AMessage ? "a2a" : isRoomMessage ? "room" : "direct",
-    ConversationLabel: isA2AMessage ? `A2A: ${metadata.fromHubAddress}` : isRoomMessage ? "AgentVault Room" : "AgentVault",
-    SenderName: isA2AMessage ? metadata.fromHubAddress : isRoomMessage ? "Room" : "Owner",
-    SenderId: isA2AMessage ? `a2a:${metadata.fromHubAddress}` : isRoomMessage ? `agentvault:room:${metadata.roomId}` : "agentvault:owner",
+    ConversationLabel: isA2AMessage ? `A2A: ${metadata.fromHubAddress}` : isRoomMessage ? roomName ?? "AgentVault Room" : "AgentVault",
+    SenderName: isA2AMessage ? metadata.fromHubAddress : isRoomMessage ? senderDisplayName ?? "Room Member" : "Owner",
+    SenderId: isA2AMessage ? `a2a:${metadata.fromHubAddress}` : isRoomMessage ? `agentvault:room:${metadata.senderDeviceId ?? metadata.roomId}` : "agentvault:owner",
     Provider: "agentvault",
     Surface: "agentvault",
     MessageSid: metadata.messageId,
@@ -756,24 +842,26 @@ async function handleInbound(params) {
             replyCount++;
             totalReplyChars += text.length;
             if (!firstReplyTime) firstReplyTime = replyStart;
+            let replyTarget;
             if (isA2AMessage) {
               if (!_a2aCanReply(metadata.a2aChannelId)) {
                 console.warn(`[AgentVault] A2A reply suppressed (rate limit) for channel ${metadata.a2aChannelId?.slice(0, 8)}...`);
                 return;
               }
-              await channel.sendToAgent(metadata.fromHubAddress, text, {
-                parentSpanId: inferenceSpanId
-              });
-              _a2aRecordReply(metadata.a2aChannelId);
+              replyTarget = { kind: "a2a", hubAddress: metadata.fromHubAddress };
             } else if (isRoomMessage) {
-              await channel.sendToRoom(metadata.roomId, text, {
-                metadata: { content_length: text.length }
-              });
+              replyTarget = { kind: "room", roomId: metadata.roomId };
             } else {
-              await channel.send(text, {
-                conversationId: metadata.conversationId,
-                topicId: metadata.topicId
-              });
+              replyTarget = { kind: "owner" };
+            }
+            await channel.deliver(replyTarget, { type: "text", text }, {
+              conversationId: metadata.conversationId,
+              topicId: metadata.topicId,
+              parentSpanId: inferenceSpanId,
+              metadata: isRoomMessage ? { content_length: text.length } : void 0
+            });
+            if (isA2AMessage) {
+              _a2aRecordReply(metadata.a2aChannelId);
             }
             const replyEnd = Date.now();
             replySpans.push({ startTime: replyStart, endTime: replyEnd, chars: text.length, index: replyCount });
@@ -1134,50 +1222,28 @@ var agentVaultPlugin = {
     // Register valid send targets so OpenClaw's `message` tool can route
     // proactive (agent-initiated) sends — not just replies to inbound messages.
     targets: _outboundTargets,
-    sendText: async ({ to, text, accountId }) => {
+    sendText: async ({ to: rawTo, text, accountId }) => {
       const resolvedId = accountId ?? "default";
       const ch = _channels.get(resolvedId);
       if (!ch) return { ok: false, error: "AgentVault channel not connected" };
       try {
-        const wasReady = ch.state === "ready";
-        if (to.startsWith("a2a:")) {
-          await ch.sendToAgent(to.slice(4), text);
-        } else if (to.startsWith("room:")) {
-          await ch.sendToRoom(to.slice(5), text);
-        } else {
-          const roomId = ch.lastInboundRoomId;
-          if (roomId) {
-            await ch.sendToRoom(roomId, text);
-          } else {
-            await ch.send(text);
-          }
-        }
-        return { ok: true, queued: !wasReady };
+        const target = parseTarget(rawTo);
+        const receipt = await ch.deliver(target, { type: "text", text });
+        return { ok: receipt.ok, queued: receipt.queued, error: receipt.error };
       } catch (err) {
         return { ok: false, error: String(err) };
       }
     },
-    sendMedia: async ({ to, text, mediaUrl, accountId }) => {
+    sendMedia: async ({ to: rawTo, text, mediaUrl, accountId }) => {
       const resolvedId = accountId ?? "default";
       const ch = _channels.get(resolvedId);
       if (!ch) return { ok: false, error: "AgentVault channel not connected" };
       try {
         const message = text ? `${text}
 ${mediaUrl}` : mediaUrl;
-        const wasReady = ch.state === "ready";
-        if (to.startsWith("a2a:")) {
-          await ch.sendToAgent(to.slice(4), message);
-        } else if (to.startsWith("room:")) {
-          await ch.sendToRoom(to.slice(5), message);
-        } else {
-          const roomId = ch.lastInboundRoomId;
-          if (roomId) {
-            await ch.sendToRoom(roomId, message);
-          } else {
-            await ch.send(message);
-          }
-        }
-        return { ok: true, queued: !wasReady };
+        const target = parseTarget(rawTo);
+        const receipt = await ch.deliver(target, { type: "text", text: message });
+        return { ok: receipt.ok, queued: receipt.queued, error: receipt.error };
       } catch (err) {
         return { ok: false, error: String(err) };
       }
@@ -1194,20 +1260,15 @@ ${mediaUrl}` : mediaUrl;
         });
         const text = (payload.text ?? "").trim();
         if (!text && !payload.mediaUrls?.length) return { ok: true };
+        const rawTarget = ctx.to;
+        let target;
+        if (rawTarget && typeof rawTarget === "string") {
+          target = parseTarget(rawTarget);
+        } else {
+          target = { kind: "owner" };
+        }
         const _send = async (msg) => {
-          const target = ctx.to;
-          if (target && typeof target === "string" && target.startsWith("a2a:")) {
-            await ch.sendToAgent(target.slice(4), msg);
-          } else if (target && typeof target === "string" && target.startsWith("room:")) {
-            await ch.sendToRoom(target.slice(5), msg);
-          } else {
-            const roomId = ch.lastInboundRoomId;
-            if (roomId) {
-              await ch.sendToRoom(roomId, msg);
-            } else {
-              await ch.send(msg);
-            }
-          }
+          await ch.deliver(target, { type: "text", text: msg });
         };
         if (text) {
           await _send(text);
@@ -1328,6 +1389,16 @@ var openclaw_entry_default = {
             return { status: result.status, body: result.body };
           }
         });
+        api.registerHttpRoute({
+          path: "/agentvault/targets",
+          method: "GET",
+          handler: async () => {
+            const ch = _channels.values().next().value;
+            if (!ch) return { status: 503, body: { ok: false, error: "Channel not started" } };
+            const result = handleTargetsRequest(ch);
+            return { status: result.status, body: result.body };
+          }
+        });
         isUsingManagedRoutes = true;
       } catch {
       }