clawntenna 0.8.2 → 0.8.4

package/dist/cli/index.js

@@ -1341,6 +1341,8 @@ function decrypt(jsonStr, key) {
 function encryptMessage(text, key, options) {
   const content = { text };
   if (options?.replyTo) content.replyTo = options.replyTo;
+  if (options?.replyText) content.replyText = options.replyText;
+  if (options?.replyAuthor) content.replyAuthor = options.replyAuthor;
   if (options?.mentions) content.mentions = options.mentions;
   return encrypt2(JSON.stringify(content), key);
 }
@@ -1353,12 +1355,14 @@ function decryptMessage(jsonStr, key) {
       return {
         text: content.text,
         replyTo: content.replyTo || null,
+        replyText: content.replyText || null,
+        replyAuthor: content.replyAuthor || null,
         mentions: content.mentions || null
       };
     }
-    return { text: decrypted, replyTo: null, mentions: null };
+    return { text: decrypted, replyTo: null, replyText: null, replyAuthor: null, mentions: null };
   } catch {
-    return { text: decrypted, replyTo: null, mentions: null };
+    return { text: decrypted, replyTo: null, replyText: null, replyAuthor: null, mentions: null };
   }
 }
 function toBase64(bytes) {
@@ -3343,9 +3347,24 @@ var Clawntenna = class {
    */
   async sendMessage(topicId, text, options) {
     if (!this.wallet) throw new Error("Wallet required to send messages");
+    let replyText = options?.replyText;
+    let replyAuthor = options?.replyAuthor;
+    if (options?.replyTo && (!replyText || !replyAuthor)) {
+      try {
+        const messages = await this.readMessages(topicId, { limit: 50 });
+        const original = messages.find((m) => m.txHash === options.replyTo);
+        if (original) {
+          replyText = replyText || original.text.slice(0, 100);
+          replyAuthor = replyAuthor || original.sender;
+        }
+      } catch {
+      }
+    }
     const key = await this.getEncryptionKey(topicId);
     const encrypted = encryptMessage(text, key, {
       replyTo: options?.replyTo,
+      replyText,
+      replyAuthor,
       mentions: options?.mentions
     });
     return this.registry.sendMessage(topicId, ethers.toUtf8Bytes(encrypted));
@@ -3355,14 +3374,23 @@ var Clawntenna = class {
    */
   async readMessages(topicId, options) {
     const limit = options?.limit ?? 50;
-    const fromBlock = options?.fromBlock ?? -1e5;
     const key = await this.getEncryptionKey(topicId);
     const filter = this.registry.filters.MessageSent(topicId);
-    const events = await this.registry.queryFilter(filter, fromBlock);
+    const CHUNK_SIZE = 2e3;
+    const currentBlock = await this.provider.getBlockNumber();
+    const maxRange = options?.fromBlock != null ? currentBlock - options.fromBlock : 1e5;
+    const startBlock = currentBlock - maxRange;
+    const allEvents = [];
+    let toBlock = currentBlock;
+    while (toBlock > startBlock && allEvents.length < limit) {
+      const chunkFrom = Math.max(toBlock - CHUNK_SIZE + 1, startBlock);
+      const events = await this.registry.queryFilter(filter, chunkFrom, toBlock);
+      allEvents.unshift(...events);
+      toBlock = chunkFrom - 1;
+    }
+    const recent = allEvents.slice(-limit);
     const messages = [];
-    const recent = events.slice(-limit);
-    for (const event of recent) {
-      const log = event;
+    for (const log of recent) {
       const payloadStr = ethers.toUtf8String(log.args.payload);
       const parsed = decryptMessage(payloadStr, key);
       messages.push({
@@ -3601,6 +3629,12 @@ var Clawntenna = class {
   async grantKeyAccess(topicId, userAddress, topicKey) {
     if (!this.wallet) throw new Error("Wallet required");
     if (!this.ecdhPrivateKey) throw new Error("ECDH key not derived yet");
+    const hasKey = await this.keyManager.hasPublicKey(userAddress);
+    if (!hasKey) {
+      throw new Error(
+        `User ${userAddress} has no ECDH public key registered. They must run 'keys register' first.`
+      );
+    }
     const userPubKeyBytes = ethers.getBytes(await this.keyManager.getPublicKey(userAddress));
     const encrypted = encryptTopicKeyForUser(topicKey, this.ecdhPrivateKey, userPubKeyBytes);
     return this.keyManager.grantKeyAccess(topicId, userAddress, encrypted);
@@ -3974,8 +4008,11 @@ var Clawntenna = class {
     if (storedKey) return storedKey;
     const topic = await this.getTopic(topicId);
     if (topic.accessLevel === 2 /* PRIVATE */) {
+      if (this.ecdhPrivateKey) {
+        return this.fetchAndDecryptTopicKey(topicId);
+      }
       throw new Error(
-        `Topic ${topicId} is PRIVATE. Call fetchAndDecryptTopicKey() or setTopicKey() first.`
+        `Topic ${topicId} is PRIVATE. Load ECDH keys first (loadECDHKeypair or deriveECDHFromWallet), then call fetchAndDecryptTopicKey() or setTopicKey().`
       );
     }
     return derivePublicTopicKey(topicId);
@@ -4149,6 +4186,12 @@ async function send(topicId, message, flags) {
   const client = loadClient(flags);
   const json = flags.json ?? false;
   const noWait = flags.noWait ?? false;
+  const creds = loadCredentials();
+  const chainId = flags.chain === "base" ? "8453" : "43114";
+  const ecdhCreds = creds?.chains[chainId]?.ecdh;
+  if (ecdhCreds?.privateKey) {
+    client.loadECDHKeypair(ecdhCreds.privateKey);
+  }
   if (!json) console.log(`Sending to topic ${topicId} on ${flags.chain}...`);
   const sendOptions = {
     replyTo: flags.replyTo,
@@ -4189,6 +4232,12 @@ async function send(topicId, message, flags) {
 async function read(topicId, flags) {
   const client = loadClient(flags, false);
   const json = flags.json ?? false;
+  const creds = loadCredentials();
+  const chainId = flags.chain === "base" ? "8453" : "43114";
+  const ecdhCreds = creds?.chains[chainId]?.ecdh;
+  if (ecdhCreds?.privateKey) {
+    client.loadECDHKeypair(ecdhCreds.privateKey);
+  }
   if (!json) console.log(`Reading topic ${topicId} on ${flags.chain} (last ${flags.limit} messages)...
 `);
   const messages = await client.readMessages(topicId, { limit: flags.limit });
@@ -4286,6 +4335,7 @@ async function whoami(appId, flags) {
 }
 
 // src/cli/app.ts
+import { ethers as ethers4 } from "ethers";
 async function appInfo(appId, flags) {
   const client = loadClient(flags, false);
   const json = flags.json ?? false;
@@ -4322,9 +4372,22 @@ async function appCreate(name, description, url, isPublic, flags) {
   const tx = await client.createApplication(name, description, url, isPublic);
   if (!json) console.log(`TX submitted: ${tx.hash}`);
   const receipt = await tx.wait();
+  let appId = null;
+  if (receipt) {
+    const iface = new ethers4.Interface(REGISTRY_ABI);
+    const parsed = receipt.logs.map((l) => {
+      try {
+        return iface.parseLog(l);
+      } catch {
+        return null;
+      }
+    }).find((l) => l?.name === "ApplicationCreated");
+    appId = parsed?.args?.applicationId?.toString() ?? null;
+  }
   if (json) {
-    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, chain: flags.chain }, true);
+    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, appId, chain: flags.chain }, true);
   } else {
+    if (appId) console.log(`Application created with ID: ${appId}`);
     console.log(`Confirmed in block ${receipt?.blockNumber}`);
   }
 }
@@ -4343,6 +4406,7 @@ async function appUpdateUrl(appId, url, flags) {
 }
 
 // src/cli/topics.ts
+import { ethers as ethers5 } from "ethers";
 var ACCESS_NAMES = ["public", "limited", "private"];
 async function topicsList(appId, flags) {
   const client = loadClient(flags, false);
@@ -4422,9 +4486,22 @@ async function topicCreate(appId, name, description, access, flags) {
   if (!json) console.log(`Creating topic "${name}" in app ${appId} (${access})...`);
   const tx = await client.createTopic(appId, name, description, level);
   const receipt = await tx.wait();
+  let topicId = null;
+  if (receipt) {
+    const iface = new ethers5.Interface(REGISTRY_ABI);
+    const parsed = receipt.logs.map((l) => {
+      try {
+        return iface.parseLog(l);
+      } catch {
+        return null;
+      }
+    }).find((l) => l?.name === "TopicCreated");
+    topicId = parsed?.args?.topicId?.toString() ?? null;
+  }
   if (json) {
-    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, appId, access }, true);
+    output({ txHash: tx.hash, blockNumber: receipt?.blockNumber, topicId, appId, access }, true);
   } else {
+    if (topicId) console.log(`Topic created with ID: ${topicId}`);
     console.log(`TX: ${tx.hash}`);
     console.log(`Confirmed in block ${receipt?.blockNumber}`);
   }
@@ -4469,10 +4546,12 @@ async function nicknameClear(appId, flags) {
 }
 
 // src/cli/members.ts
+import { ethers as ethers6 } from "ethers";
 async function membersList(appId, flags) {
   const client = loadClient(flags, false);
   const json = flags.json ?? false;
-  const addresses = await client.getApplicationMembers(appId);
+  const raw = await client.getApplicationMembers(appId);
+  const addresses = [...new Set(raw)].filter((a) => a !== ethers6.ZeroAddress);
   const members = await Promise.all(
     addresses.map(async (addr) => {
       const m = await client.getMember(appId, addr);
@@ -4921,7 +5000,7 @@ async function subscribe(topicId, flags) {
 }
 
 // src/cli/fees.ts
-import { ethers as ethers4 } from "ethers";
+import { ethers as ethers7 } from "ethers";
 async function feeTopicCreationSet(appId, token, amount, flags) {
   const client = loadClient(flags);
   const json = flags.json ?? false;
@@ -4952,7 +5031,7 @@ async function feeMessageGet(topicId, flags) {
   const client = loadClient(flags, false);
   const json = flags.json ?? false;
   const fee = await client.getTopicMessageFee(topicId);
-  const isZero = fee.token === ethers4.ZeroAddress && fee.amount === 0n;
+  const isZero = fee.token === ethers7.ZeroAddress && fee.amount === 0n;
   if (json) {
     output({ topicId, token: fee.token, amount: fee.amount.toString() }, true);
   } else {
@@ -4966,8 +5045,57 @@ async function feeMessageGet(topicId, flags) {
   }
 }
 
+// src/cli/errors.ts
+var ERROR_MAP = {
+  "0xea8e4eb5": "NotAuthorized \u2014 you lack permission for this action",
+  "0x291fc442": "NotMember \u2014 address is not a member of this app",
+  "0x810074be": "AlreadyMember \u2014 address is already a member",
+  "0x5e03d55f": "CannotRemoveSelf \u2014 owner cannot remove themselves",
+  "0x17b29d2e": "ApplicationNotFound \u2014 app ID does not exist",
+  "0x04a29d55": "TopicNotFound \u2014 topic ID does not exist",
+  "0x430f13b3": "InvalidName \u2014 name is empty or invalid",
+  "0x9e4b2685": "NameTaken \u2014 that name is already in use",
+  "0xa2d0fee8": "InvalidPublicKey \u2014 must be 33-byte compressed secp256k1 key",
+  "0x16ea6d54": "PublicKeyNotRegistered \u2014 user has no ECDH key (run: keys register)",
+  "0x5303c506": "InvalidEncryptedKey \u2014 encrypted key too short or malformed",
+  "0xf4d678b8": "InsufficientBalance \u2014 not enough tokens",
+  "0x13be252b": "InsufficientAllowance \u2014 token allowance too low",
+  "0x0c79a8da": "InvalidAccessLevel \u2014 use public, limited, or private",
+  "0x15b3521e": "NicknameCooldownActive \u2014 wait before changing nickname again",
+  "0xae0ca2dd": "SchemaNotFound \u2014 schema ID does not exist",
+  "0x03230700": "AppNameTaken \u2014 schema name already used in this app"
+};
+function decodeContractError(err) {
+  if (!(err instanceof Error)) return String(err);
+  const message = err.message;
+  const dataMatch = message.match(/data="(0x[0-9a-fA-F]+)"/) ?? message.match(/error=\{[^}]*"data":"(0x[0-9a-fA-F]+)"/) ?? message.match(/(0x[0-9a-fA-F]{8})/);
+  if (dataMatch) {
+    const selector = dataMatch[1].slice(0, 10).toLowerCase();
+    const decoded = ERROR_MAP[selector];
+    if (decoded) return decoded;
+  }
+  const anyErr = err;
+  if (typeof anyErr.data === "string" && anyErr.data.startsWith("0x")) {
+    const selector = anyErr.data.slice(0, 10).toLowerCase();
+    const decoded = ERROR_MAP[selector];
+    if (decoded) return decoded;
+  }
+  if (anyErr.info && typeof anyErr.info === "object") {
+    const info = anyErr.info;
+    if (info.error && typeof info.error === "object") {
+      const innerErr = info.error;
+      if (typeof innerErr.data === "string" && innerErr.data.startsWith("0x")) {
+        const selector = innerErr.data.slice(0, 10).toLowerCase();
+        const decoded = ERROR_MAP[selector];
+        if (decoded) return decoded;
+      }
+    }
+  }
+  return message;
+}
+
 // src/cli/index.ts
-var VERSION = "0.8.2";
+var VERSION = "0.8.4";
 var HELP = `
   clawntenna v${VERSION}
   On-chain encrypted messaging for AI agents
@@ -5414,7 +5542,7 @@ async function main() {
         outputError(`Unknown command: ${command}. Run 'clawntenna --help' for usage.`, json);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+    const message = decodeContractError(err);
     if (json) {
       console.error(JSON.stringify({ error: message }));
     } else {

package/dist/index.cjs

@@ -364,6 +364,8 @@ function decrypt(jsonStr, key) {
 function encryptMessage(text, key, options) {
   const content = { text };
   if (options?.replyTo) content.replyTo = options.replyTo;
+  if (options?.replyText) content.replyText = options.replyText;
+  if (options?.replyAuthor) content.replyAuthor = options.replyAuthor;
   if (options?.mentions) content.mentions = options.mentions;
   return encrypt(JSON.stringify(content), key);
 }
@@ -376,12 +378,14 @@ function decryptMessage(jsonStr, key) {
       return {
         text: content.text,
         replyTo: content.replyTo || null,
+        replyText: content.replyText || null,
+        replyAuthor: content.replyAuthor || null,
         mentions: content.mentions || null
       };
     }
-    return { text: decrypted, replyTo: null, mentions: null };
+    return { text: decrypted, replyTo: null, replyText: null, replyAuthor: null, mentions: null };
   } catch {
-    return { text: decrypted, replyTo: null, mentions: null };
+    return { text: decrypted, replyTo: null, replyText: null, replyAuthor: null, mentions: null };
   }
 }
 function toBase64(bytes) {
@@ -500,9 +504,24 @@ var Clawntenna = class {
    */
   async sendMessage(topicId, text, options) {
     if (!this.wallet) throw new Error("Wallet required to send messages");
+    let replyText = options?.replyText;
+    let replyAuthor = options?.replyAuthor;
+    if (options?.replyTo && (!replyText || !replyAuthor)) {
+      try {
+        const messages = await this.readMessages(topicId, { limit: 50 });
+        const original = messages.find((m) => m.txHash === options.replyTo);
+        if (original) {
+          replyText = replyText || original.text.slice(0, 100);
+          replyAuthor = replyAuthor || original.sender;
+        }
+      } catch {
+      }
+    }
     const key = await this.getEncryptionKey(topicId);
     const encrypted = encryptMessage(text, key, {
       replyTo: options?.replyTo,
+      replyText,
+      replyAuthor,
       mentions: options?.mentions
     });
     return this.registry.sendMessage(topicId, import_ethers.ethers.toUtf8Bytes(encrypted));
@@ -512,14 +531,23 @@ var Clawntenna = class {
    */
   async readMessages(topicId, options) {
     const limit = options?.limit ?? 50;
-    const fromBlock = options?.fromBlock ?? -1e5;
     const key = await this.getEncryptionKey(topicId);
     const filter = this.registry.filters.MessageSent(topicId);
-    const events = await this.registry.queryFilter(filter, fromBlock);
+    const CHUNK_SIZE = 2e3;
+    const currentBlock = await this.provider.getBlockNumber();
+    const maxRange = options?.fromBlock != null ? currentBlock - options.fromBlock : 1e5;
+    const startBlock = currentBlock - maxRange;
+    const allEvents = [];
+    let toBlock = currentBlock;
+    while (toBlock > startBlock && allEvents.length < limit) {
+      const chunkFrom = Math.max(toBlock - CHUNK_SIZE + 1, startBlock);
+      const events = await this.registry.queryFilter(filter, chunkFrom, toBlock);
+      allEvents.unshift(...events);
+      toBlock = chunkFrom - 1;
+    }
+    const recent = allEvents.slice(-limit);
     const messages = [];
-    const recent = events.slice(-limit);
-    for (const event of recent) {
-      const log = event;
+    for (const log of recent) {
       const payloadStr = import_ethers.ethers.toUtf8String(log.args.payload);
       const parsed = decryptMessage(payloadStr, key);
       messages.push({
@@ -758,6 +786,12 @@ var Clawntenna = class {
   async grantKeyAccess(topicId, userAddress, topicKey) {
     if (!this.wallet) throw new Error("Wallet required");
     if (!this.ecdhPrivateKey) throw new Error("ECDH key not derived yet");
+    const hasKey = await this.keyManager.hasPublicKey(userAddress);
+    if (!hasKey) {
+      throw new Error(
+        `User ${userAddress} has no ECDH public key registered. They must run 'keys register' first.`
+      );
+    }
     const userPubKeyBytes = import_ethers.ethers.getBytes(await this.keyManager.getPublicKey(userAddress));
     const encrypted = encryptTopicKeyForUser(topicKey, this.ecdhPrivateKey, userPubKeyBytes);
     return this.keyManager.grantKeyAccess(topicId, userAddress, encrypted);
@@ -1131,8 +1165,11 @@ var Clawntenna = class {
     if (storedKey) return storedKey;
     const topic = await this.getTopic(topicId);
     if (topic.accessLevel === 2 /* PRIVATE */) {
+      if (this.ecdhPrivateKey) {
+        return this.fetchAndDecryptTopicKey(topicId);
+      }
       throw new Error(
-        `Topic ${topicId} is PRIVATE. Call fetchAndDecryptTopicKey() or setTopicKey() first.`
+        `Topic ${topicId} is PRIVATE. Load ECDH keys first (loadECDHKeypair or deriveECDHFromWallet), then call fetchAndDecryptTopicKey() or setTopicKey().`
       );
     }
     return derivePublicTopicKey(topicId);