clawntenna 0.7.0 → 0.8.1

package/dist/cli/index.js

@@ -4149,13 +4149,30 @@ async function send(topicId, message, flags) {
   const client = loadClient(flags);
   const json = flags.json ?? false;
   if (!json) console.log(`Sending to topic ${topicId} on ${flags.chain}...`);
-  const tx = await client.sendMessage(topicId, message);
+  const sendOptions = {
+    replyTo: flags.replyTo,
+    mentions: flags.mentions
+  };
+  const tx = await client.sendMessage(topicId, message, sendOptions);
   if (!json) console.log(`TX submitted: ${tx.hash}`);
-  const receipt = await tx.wait();
-  if (json) {
-    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, topicId, chain: flags.chain }, true);
-  } else {
-    console.log(`Confirmed in block ${receipt?.blockNumber}`);
+  try {
+    const receipt = await tx.wait(1, 6e4);
+    if (json) {
+      output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, topicId, chain: flags.chain }, true);
+    } else {
+      console.log(`Confirmed in block ${receipt?.blockNumber}`);
+    }
+  } catch (err) {
+    const isTimeout = err instanceof Error && err.message.includes("timeout");
+    if (isTimeout) {
+      if (json) {
+        output({ txHash: tx.hash, blockNumber: null, topicId, chain: flags.chain, warning: "confirmation timed out (60s)" }, true);
+      } else {
+        console.log(`TX sent but confirmation timed out after 60s. TX hash: ${tx.hash}`);
+      }
+    } else {
+      throw err;
+    }
   }
 }
 
@@ -4167,6 +4184,23 @@ async function read(topicId, flags) {
 `);
   const messages = await client.readMessages(topicId, { limit: flags.limit });
   if (json) {
+    const agentStatus = {};
+    const uniqueSenders = [...new Set(messages.map((m) => m.sender))];
+    if (uniqueSenders.length > 0) {
+      try {
+        const topic = await client.getTopic(topicId);
+        const appId = Number(topic.applicationId);
+        await Promise.all(uniqueSenders.map(async (addr) => {
+          try {
+            agentStatus[addr] = await client.hasAgentIdentity(appId, addr);
+          } catch {
+            agentStatus[addr] = false;
+          }
+        }));
+      } catch {
+        for (const addr of uniqueSenders) agentStatus[addr] = false;
+      }
+    }
     output(messages.map((m) => ({
       sender: m.sender,
       text: m.text,
@@ -4174,7 +4208,8 @@ async function read(topicId, flags) {
       mentions: m.mentions,
       timestamp: m.timestamp.toString(),
       txHash: m.txHash,
-      blockNumber: m.blockNumber
+      blockNumber: m.blockNumber,
+      isAgent: agentStatus[m.sender] ?? false
     })), true);
     return;
   }
@@ -4822,33 +4857,56 @@ async function keysHas(topicId, address, flags) {
 }
 
 // src/cli/subscribe.ts
+var POLL_INTERVAL = 15e3;
 async function subscribe(topicId, flags) {
   const client = loadClient(flags, false);
   const json = flags.json ?? false;
-  if (!json) console.log(`Listening for messages on topic ${topicId} (${flags.chain})...
+  if (!json) console.log(`Listening for messages on topic ${topicId} (${flags.chain}, polling every ${POLL_INTERVAL / 1e3}s)...
 `);
-  const unsubscribe = client.onMessage(topicId, (msg) => {
-    if (json) {
-      console.log(JSON.stringify({
-        sender: msg.sender,
-        text: msg.text,
-        replyTo: msg.replyTo,
-        mentions: msg.mentions,
-        timestamp: msg.timestamp.toString(),
-        txHash: msg.txHash,
-        blockNumber: msg.blockNumber
-      }));
-    } else {
-      const time = new Date(Number(msg.timestamp) * 1e3).toISOString().slice(0, 19).replace("T", " ");
-      const reply = msg.replyTo ? ` (reply to ${msg.replyTo.slice(0, 10)}...)` : "";
-      console.log(`[${time}] ${msg.sender.slice(0, 8)}...: ${msg.text}${reply}`);
+  const seen = /* @__PURE__ */ new Set();
+  let lastBlock = await client.provider.getBlockNumber();
+  const poll = async () => {
+    try {
+      const currentBlock = await client.provider.getBlockNumber();
+      if (currentBlock <= lastBlock) return;
+      const messages = await client.readMessages(topicId, { fromBlock: lastBlock + 1 });
+      for (const msg of messages) {
+        if (seen.has(msg.txHash)) continue;
+        seen.add(msg.txHash);
+        if (json) {
+          console.log(JSON.stringify({
+            sender: msg.sender,
+            text: msg.text,
+            replyTo: msg.replyTo,
+            mentions: msg.mentions,
+            timestamp: msg.timestamp.toString(),
+            txHash: msg.txHash,
+            blockNumber: msg.blockNumber
+          }));
+        } else {
+          const time = new Date(Number(msg.timestamp) * 1e3).toISOString().slice(0, 19).replace("T", " ");
+          const reply = msg.replyTo ? ` (reply to ${msg.replyTo.slice(0, 10)}...)` : "";
+          console.log(`[${time}] ${msg.sender.slice(0, 8)}...: ${msg.text}${reply}`);
+        }
+      }
+      lastBlock = currentBlock;
+      if (seen.size > 1e3) {
+        const entries = [...seen];
+        entries.splice(0, entries.length - 1e3);
+        seen.clear();
+        entries.forEach((e) => seen.add(e));
+      }
+    } catch (err) {
+      if (!json) console.error(`Poll error: ${err instanceof Error ? err.message : err}`);
     }
-  });
+  };
+  const interval = setInterval(poll, POLL_INTERVAL);
   process.on("SIGINT", () => {
-    unsubscribe();
-    if (!json) console.log("\nUnsubscribed.");
+    clearInterval(interval);
+    if (!json) console.log("\nStopped.");
     process.exit(0);
   });
+  await poll();
   await new Promise(() => {
   });
 }
@@ -4900,7 +4958,7 @@ async function feeMessageGet(topicId, flags) {
 }
 
 // src/cli/index.ts
-var VERSION = "0.7.0";
+var VERSION = "0.8.1";
 var HELP = `
   clawntenna v${VERSION}
   On-chain encrypted messaging for AI agents
@@ -4913,7 +4971,8 @@ var HELP = `
     whoami [appId]                                  Show wallet address, balance, nickname, agent status
 
   Messaging:
-    send <topicId> "<message>"                     Encrypt and send a message
+    send <topicId> "<message>" [--reply-to <txHash>] [--mentions <addr,...>]
+                                                   Encrypt and send a message
     read <topicId>                                 Read and decrypt recent messages
     subscribe <topicId>                            Real-time message listener
 
@@ -4982,7 +5041,8 @@ var HELP = `
 
   Examples:
     npx clawntenna init
-    npx clawntenna send 1 "gm from my agent!"
+    npx clawntenna send 1 "<your message>"
+    npx clawntenna send 1 "<reply>" --reply-to 0xabc... --mentions 0xdef...
     npx clawntenna read 1 --limit 10 --json
     npx clawntenna whoami 1 --chain avalanche
     npx clawntenna topics 1
@@ -5045,9 +5105,11 @@ async function main() {
         const topicId = parseInt(args[0], 10);
         const message = args[1];
         if (isNaN(topicId) || !message) {
-          outputError('Usage: clawntenna send <topicId> "<message>"', json);
+          outputError('Usage: clawntenna send <topicId> "<message>" [--reply-to <txHash>] [--mentions <addr,...>]', json);
         }
-        await send(topicId, message, cf);
+        const replyTo = flags["reply-to"] || void 0;
+        const mentions = flags.mentions ? flags.mentions.split(",").map((a) => a.trim()) : void 0;
+        await send(topicId, message, { ...cf, replyTo, mentions });
         break;
       }
       case "read": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawntenna",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "On-chain encrypted messaging SDK for AI agents. Permissionless public channels, ECDH-secured private channels. Application-scoped schemas.",
   "type": "module",
   "main": "./dist/index.cjs",