@spectratools/assembly-cli 0.3.0 → 0.4.0

package/dist/cli.js

@@ -4392,6 +4392,18 @@ council.command("seat", {
   examples: [{ args: { id: 0 }, description: "Inspect seat #0" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const seatCount = await client.readContract({
+      abi: councilSeatsAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.councilSeats,
+      functionName: "seatCount"
+    });
+    if (c.args.id >= Number(seatCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Seat id ${c.args.id} does not exist (seatCount: ${seatCount})`,
+        retryable: false
+      });
+    }
     const seatTuple = await client.readContract({
       abi: councilSeatsAbi,
       address: ABSTRACT_MAINNET_ADDRESSES.councilSeats,
@@ -4823,17 +4835,20 @@ var forum = Cli2.create("forum", {
 forum.command("threads", {
   description: "List forum threads with author and creation metadata.",
   env: env2,
-  output: z2.array(
-    z2.object({
-      id: z2.number(),
-      kind: z2.number(),
-      author: z2.string(),
-      createdAt: z2.number(),
-      createdAtRelative: z2.string(),
-      category: z2.string().nullable().optional(),
-      title: z2.string().nullable().optional()
-    })
-  ),
+  output: z2.object({
+    threads: z2.array(
+      z2.object({
+        id: z2.number(),
+        kind: z2.number(),
+        author: z2.string(),
+        createdAt: z2.number(),
+        createdAtRelative: z2.string(),
+        category: z2.string().nullable().optional(),
+        title: z2.string().nullable().optional()
+      })
+    ),
+    count: z2.number()
+  }),
   examples: [{ description: "List all forum threads" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
@@ -4853,16 +4868,20 @@ forum.command("threads", {
       }))
     }) : [];
     const items = threadTuples.map(decodeThread);
+    const threads = items.map((x) => ({
+      id: x.id,
+      kind: x.kind,
+      author: x.author,
+      createdAt: x.createdAt,
+      createdAtRelative: relTime(x.createdAt),
+      category: x.category ?? null,
+      title: x.title ?? null
+    }));
     return c.ok(
-      items.map((x) => ({
-        id: x.id,
-        kind: x.kind,
-        author: x.author,
-        createdAt: x.createdAt,
-        createdAtRelative: relTime(x.createdAt),
-        category: x.category ?? null,
-        title: x.title ?? null
-      })),
+      {
+        threads,
+        count: threads.length
+      },
       {
         cta: {
           description: "Inspect or comment:",
@@ -4888,6 +4907,18 @@ forum.command("thread", {
   examples: [{ args: { id: 1 }, description: "Fetch thread #1 and its comments" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const threadCount = await client.readContract({
+      abi: forumAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.forum,
+      functionName: "threadCount"
+    });
+    if (c.args.id > Number(threadCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Thread id ${c.args.id} does not exist (threadCount: ${threadCount})`,
+        retryable: false
+      });
+    }
     const [threadTuple, commentCount] = await Promise.all([
       client.readContract({
         abi: forumAbi,
@@ -4960,6 +4991,18 @@ forum.command("comment", {
   examples: [{ args: { id: 1 }, description: "Fetch comment #1" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const commentCount = await client.readContract({
+      abi: forumAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.forum,
+      functionName: "commentCount"
+    });
+    if (c.args.id > Number(commentCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Comment id ${c.args.id} does not exist (commentCount: ${commentCount})`,
+        retryable: false
+      });
+    }
     const commentTuple = await client.readContract({
       abi: forumAbi,
       address: ABSTRACT_MAINNET_ADDRESSES.forum,
@@ -5005,6 +5048,18 @@ forum.command("petition", {
   examples: [{ args: { id: 1 }, description: "Fetch petition #1" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const petitionCount = await client.readContract({
+      abi: forumAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.forum,
+      functionName: "petitionCount"
+    });
+    if (c.args.id > Number(petitionCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Petition id ${c.args.id} does not exist (petitionCount: ${petitionCount})`,
+        retryable: false
+      });
+    }
     const petition = decodePetition(
       await client.readContract({
         abi: forumAbi,
@@ -5187,16 +5242,19 @@ var governance = Cli3.create("governance", {
 governance.command("proposals", {
   description: "List governance proposals with status and vote end time.",
   env: env3,
-  output: z3.array(
-    z3.object({
-      id: z3.number(),
-      kind: z3.number(),
-      status: z3.number(),
-      title: z3.string().nullable().optional(),
-      voteEndAt: z3.number(),
-      voteEndRelative: z3.string()
-    })
-  ),
+  output: z3.object({
+    proposals: z3.array(
+      z3.object({
+        id: z3.number(),
+        kind: z3.number(),
+        status: z3.number(),
+        title: z3.string().nullable().optional(),
+        voteEndAt: z3.number(),
+        voteEndRelative: z3.string()
+      })
+    ),
+    count: z3.number()
+  }),
   examples: [{ description: "List all proposals" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
@@ -5216,15 +5274,19 @@ governance.command("proposals", {
       }))
     }) : [];
     const proposals = proposalTuples.map(decodeProposal);
+    const items = proposals.map((p, i) => ({
+      id: i + 1,
+      kind: asNum(p.kind),
+      status: asNum(p.status),
+      title: p.title ?? null,
+      voteEndAt: asNum(p.voteEndAt),
+      voteEndRelative: relTime(p.voteEndAt)
+    }));
     return c.ok(
-      proposals.map((p, i) => ({
-        id: i + 1,
-        kind: asNum(p.kind),
-        status: asNum(p.status),
-        title: p.title ?? null,
-        voteEndAt: asNum(p.voteEndAt),
-        voteEndRelative: relTime(p.voteEndAt)
-      })),
+      {
+        proposals: items,
+        count: items.length
+      },
       {
         cta: {
           description: "Inspect or vote:",
@@ -5247,6 +5309,18 @@ governance.command("proposal", {
   examples: [{ args: { id: 1 }, description: "Fetch proposal #1" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const proposalCount = await client.readContract({
+      abi: governanceAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.governance,
+      functionName: "proposalCount"
+    });
+    if (c.args.id > Number(proposalCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Proposal id ${c.args.id} does not exist (proposalCount: ${proposalCount})`,
+        retryable: false
+      });
+    }
     const proposal = decodeProposal(
       await client.readContract({
         abi: governanceAbi,
@@ -5470,17 +5544,20 @@ var members = Cli4.create("members", {
 members.command("list", {
   description: "List members from an indexer snapshot (or Registered event fallback) plus on-chain active state.",
   env: env4,
-  output: z4.array(
-    z4.object({
-      address: z4.string(),
-      active: z4.boolean(),
-      registered: z4.boolean(),
-      activeUntil: z4.number(),
-      activeUntilRelative: z4.string(),
-      lastHeartbeatAt: z4.number(),
-      lastHeartbeatRelative: z4.string()
-    })
-  ),
+  output: z4.object({
+    members: z4.array(
+      z4.object({
+        address: z4.string(),
+        active: z4.boolean(),
+        registered: z4.boolean(),
+        activeUntil: z4.number(),
+        activeUntilRelative: z4.string(),
+        lastHeartbeatAt: z4.number(),
+        lastHeartbeatRelative: z4.string()
+      })
+    ),
+    count: z4.number()
+  }),
   examples: [
     { description: "List members using default indexer snapshot" },
     { description: "Override ASSEMBLY_INDEXER_URL to use a custom snapshot source" }
@@ -5549,11 +5626,9 @@ members.command("list", {
         lastHeartbeatRelative: relTime(info.lastHeartbeatAt)
       };
     });
-    return c.ok(rows, {
-      cta: {
-        description: fallbackReason ? `Indexer unavailable (${indexerIssue(fallbackReason)}); using on-chain Registered event fallback. Inspect one member:` : "Inspect one member:",
-        commands: [{ command: "members info", args: { address: "<addr>" } }]
-      }
+    return c.ok({
+      members: rows,
+      count: rows.length
     });
   }
 });
@@ -5774,6 +5849,18 @@ treasury.command("executed", {
   examples: [{ args: { proposalId: 1 }, description: "Check execution status for proposal #1" }],
   async run(c) {
     const client = createAssemblyPublicClient(c.env.ABSTRACT_RPC_URL);
+    const proposalCount = await client.readContract({
+      abi: governanceAbi,
+      address: ABSTRACT_MAINNET_ADDRESSES.governance,
+      functionName: "proposalCount"
+    });
+    if (c.args.proposalId > Number(proposalCount)) {
+      return c.error({
+        code: "OUT_OF_RANGE",
+        message: `Proposal id ${c.args.proposalId} does not exist (proposalCount: ${proposalCount})`,
+        retryable: false
+      });
+    }
     const executed = await client.readContract({
       abi: treasuryAbi,
       address: ABSTRACT_MAINNET_ADDRESSES.treasury,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectratools/assembly-cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "CLI for Assembly governance on Abstract (members, council, forum, proposals, and treasury).",
   "type": "module",
   "license": "MIT",
@@ -28,12 +28,6 @@
   "bin": {
     "assembly-cli": "./dist/cli.js"
   },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    }
-  },
   "dependencies": {
     "incur": "^0.2.2",
     "ox": "^0.14.0",