wip

Author: ariessa

examples/acp-base/subscription/buyer.ts

@@ -2,25 +2,18 @@
  * Subscription Example - Buyer (Client)
  *
  * Run a specific scenario via --scenario flag:
- *   npx ts-node buyer.ts --scenario 1   # First-time subscription
- *   npx ts-node buyer.ts --scenario 2   # Subsequent job (reuse active subscription)
- *   npx ts-node buyer.ts --scenario 3   # Non-subscription offering (fixed-price)
+ *   npx ts-node buyer.ts --scenario 1   # Subscription offering
+ *   npx ts-node buyer.ts --scenario 2   # Non-subscription offering (fixed-price)
  *
  * Default: scenario 1
  *
  * Scenarios:
- *   1. First-Time Subscription
- *      - No prior subscription exists
+ *   1. Subscription Offering
  *      - Seller creates PAYABLE_REQUEST_SUBSCRIPTION memo
  *      - Buyer pays subscription; job proceeds to delivery
  *
- *   2. Subsequent Job with Active Subscription
- *      - Valid subscription already exists (run Scenario 1 first)
- *      - initiateJob reuses the existing account
- *      - Seller accepts and creates requirement directly; buyer accepts without payment
- *
- *   3. Non-Subscription Offering (Fixed-Price)
- *      - Uses a non-subscription offering (jobOfferings[0])
+ *   2. Non-Subscription Offering (Fixed-Price)
+ *      - Uses a non-subscription offering (jobOfferings[1])
  *      - Seller accepts and creates a payable requirement
  *      - Buyer pays and advances to delivery
  */
@@ -134,44 +127,30 @@ async function buyer() {
 
   switch (SCENARIO) {
     case 1: {
-      console.log("--- Scenario 1: First-Time Subscription ---\n");
+      console.log("--- Scenario 1: Subscription Offering ---\n");
       const jobId1 = await subscriptionOffering.initiateJob(
         {},
         undefined,
         new Date(Date.now() + 1000 * 60 * 15), // 15 min job expiry
         SUBSCRIPTION_TIER,
       );
-      console.log(`\nBuyer: [Scenario 1 — First-Time Subscription] Job ${jobId1} initiated`);
+      console.log(`\nBuyer: [Scenario 1 — Subscription Offering] Job ${jobId1} initiated`);
       break;
     }
 
     case 2: {
-      // Requires Scenario 1 to have been run first (valid subscription must exist)
-      console.log("--- Scenario 2: Subsequent Job with Active Subscription ---\n");
-      console.log("(Ensure Scenario 1 has been run first so a valid subscription exists)\n");
-      const jobId2 = await subscriptionOffering.initiateJob(
-        {},
-        undefined,
-        new Date(Date.now() + 1000 * 60 * 15), // 15 min job expiry
-        SUBSCRIPTION_TIER,
-      );
-      console.log(`\nBuyer: [Scenario 2 — Reusing Active Subscription] Job ${jobId2} initiated`);
-      break;
-    }
-
-    case 3: {
-      console.log("--- Scenario 3: Non-Subscription Offering (Fixed-Price) ---\n");
-      const jobId3 = await fixedOffering.initiateJob(
+      console.log("--- Scenario 2: Non-Subscription Offering (Fixed-Price) ---\n");
+      const jobId2 = await fixedOffering.initiateJob(
         {},
         undefined,
         new Date(Date.now() + 1000 * 60 * 15), // 15 min job expiry
       );
-      console.log(`\nBuyer: [Scenario 3 — Fixed-Price Job] Job ${jobId3} initiated`);
+      console.log(`\nBuyer: [Scenario 2 — Fixed-Price Job] Job ${jobId2} initiated`);
       break;
     }
 
     default:
-      console.error(`Unknown scenario: ${SCENARIO}. Use --scenario 1, 2, or 3.`);
+      console.error(`Unknown scenario: ${SCENARIO}. Use --scenario 1 or 2.`);
       process.exit(1);
   }
 }

src/interfaces.ts

@@ -114,7 +114,7 @@ export interface IAcpClientOptions {
 }
 
 export interface IAcpAgent {
-  id: number;
+  id: string | number;
   name: string;
   description: string;
   walletAddress: Address;

test/integration/acpClient.integration.test.ts

@@ -124,14 +124,16 @@ describe("AcpClient Integration Testing", () => {
     it("should return agents with correct structure", async () => {
       const keyword = "agent";
       const options = {
-        top_k: 3,
+        topK: 3,
       };
 
       const result = await acpClient.browseAgents(keyword, options);
 
       if (result.length > 0) {
         const firstAgent = result[0];
 
+        console.log("firstAgent: ", firstAgent);
+
         expect(firstAgent).toHaveProperty("id");
         expect(firstAgent).toHaveProperty("name");
         expect(firstAgent).toHaveProperty("description");
@@ -140,7 +142,7 @@ describe("AcpClient Integration Testing", () => {
         expect(firstAgent).toHaveProperty("jobOfferings");
         expect(firstAgent).toHaveProperty("twitterHandle");
 
-        expect(typeof firstAgent.id).toBe("number");
+        expect(typeof firstAgent.id).toBe("string");
         expect(typeof firstAgent.name).toBe("string");
         expect(typeof firstAgent.walletAddress).toBe("string");
         expect(Array.isArray(firstAgent.jobOfferings)).toBe(true);
@@ -222,7 +224,7 @@ describe("AcpClient Integration Testing", () => {
       const keyword = "agent";
       const topK = 2;
       const options = {
-        top_k: topK,
+        topK: topK,
       };
 
       const result = await acpClient.browseAgents(keyword, options);