@agentspend/sdk 0.3.2 → 0.3.4

package/dist/index.js

@@ -42,6 +42,27 @@ function createAgentSpend(options) {
     }
     const platformApiBaseUrl = resolvePlatformApiBaseUrl(options.platformApiBaseUrl);
     // -------------------------------------------------------------------
+    // Lazy service_id fetch + cache
+    // -------------------------------------------------------------------
+    let cachedServiceId = null;
+    async function getServiceId() {
+        if (cachedServiceId)
+            return cachedServiceId;
+        if (!options.serviceApiKey)
+            return null;
+        try {
+            const res = await fetchImpl(joinUrl(platformApiBaseUrl, "/v1/service/me"), {
+                headers: { authorization: `Bearer ${options.serviceApiKey}` }
+            });
+            if (res.ok) {
+                const data = (await res.json());
+                cachedServiceId = data.id ?? null;
+            }
+        }
+        catch { /* graceful fallback */ }
+        return cachedServiceId;
+    }
+    // -------------------------------------------------------------------
     // x402 singleton setup (Decision 9)
     // Server-side: facilitator handles verify + settle over HTTP.
     // No client-side EVM scheme needed — we delegate to the facilitator.
@@ -167,6 +188,10 @@ function createAgentSpend(options) {
         }
         catch (error) {
             if (error instanceof AgentSpendChargeError) {
+                if (error.statusCode === 403) {
+                    // No binding — return 402 so agent can discover service_id and bind
+                    return return402Response(c, amountCents, currency);
+                }
                 if (error.statusCode === 402) {
                     return c.json({ error: "Payment required", details: error.details }, 402);
                 }
@@ -192,8 +217,15 @@ function createAgentSpend(options) {
             catch {
                 return c.json({ error: "Invalid payment payload encoding" }, 400);
             }
-            // Resolve the payTo address for verification context
-            const payTo = await resolvePayToAddress();
+            // Extract payTo from the payment payload's accepted requirements
+            // rather than generating a new deposit address.
+            // resolvePayToAddress() creates a fresh Stripe PaymentIntent each
+            // time, which would return a *different* address than the one in the
+            // 402 response the client signed against → facilitator verification
+            // would fail.
+            const acceptedPayTo = paymentPayload
+                .accepted?.payTo;
+            const payTo = acceptedPayTo ?? await resolvePayToAddress();
             // Build the payment requirements that the payment should satisfy
             const paymentRequirements = {
                 scheme: "exact",
@@ -236,6 +268,7 @@ function createAgentSpend(options) {
     // return402Response — x402 Payment-Required format (Decision 8)
     // -------------------------------------------------------------------
     async function return402Response(c, amountCents, currency) {
+        const serviceId = await getServiceId();
         try {
             const payTo = await resolvePayToAddress();
             const paymentRequirements = {
@@ -261,11 +294,34 @@ function createAgentSpend(options) {
             // Set Payment-Required header (base64 encoded)
             const headerValue = Buffer.from(JSON.stringify(paymentRequired)).toString("base64");
             c.header("Payment-Required", headerValue);
-            return c.json({ error: "Payment required", amount_cents: amountCents, currency }, 402);
+            return c.json({
+                error: "Payment required",
+                amount_cents: amountCents,
+                currency,
+                ...(serviceId ? {
+                    agentspend: {
+                        service_id: serviceId,
+                        amount_cents: amountCents,
+                    }
+                } : {})
+            }, 402);
         }
-        catch {
-            // If we can't resolve a payTo address, return a plain 402
-            return c.json({ error: "Payment required", amount_cents: amountCents, currency }, 402);
+        catch (error) {
+            // Log clearly so service developers can diagnose why crypto is unavailable
+            console.error("[agentspend] Failed to resolve crypto payTo address — returning card-only 402:", error instanceof Error ? error.message : error);
+            // Return card-only 402 (no Payment-Required header → crypto clients
+            // will see "Invalid payment required response")
+            return c.json({
+                error: "Payment required",
+                amount_cents: amountCents,
+                currency,
+                ...(serviceId ? {
+                    agentspend: {
+                        service_id: serviceId,
+                        amount_cents: amountCents,
+                    }
+                } : {})
+            }, 402);
         }
     }
     // -------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentspend/sdk",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {

package/src/index.ts

@@ -170,6 +170,26 @@ export function createAgentSpend(options: AgentSpendOptions): AgentSpend {
 
   const platformApiBaseUrl = resolvePlatformApiBaseUrl(options.platformApiBaseUrl);
 
+  // -------------------------------------------------------------------
+  // Lazy service_id fetch + cache
+  // -------------------------------------------------------------------
+  let cachedServiceId: string | null = null;
+
+  async function getServiceId(): Promise<string | null> {
+    if (cachedServiceId) return cachedServiceId;
+    if (!options.serviceApiKey) return null;
+    try {
+      const res = await fetchImpl(joinUrl(platformApiBaseUrl, "/v1/service/me"), {
+        headers: { authorization: `Bearer ${options.serviceApiKey}` }
+      });
+      if (res.ok) {
+        const data = (await res.json()) as { id?: string };
+        cachedServiceId = data.id ?? null;
+      }
+    } catch { /* graceful fallback */ }
+    return cachedServiceId;
+  }
+
   // -------------------------------------------------------------------
   // x402 singleton setup (Decision 9)
   // Server-side: facilitator handles verify + settle over HTTP.
@@ -336,6 +356,10 @@ export function createAgentSpend(options: AgentSpendOptions): AgentSpend {
       c.set(PAYMENT_CONTEXT_KEY, paymentContext);
     } catch (error) {
       if (error instanceof AgentSpendChargeError) {
+        if (error.statusCode === 403) {
+          // No binding — return 402 so agent can discover service_id and bind
+          return return402Response(c, amountCents, currency);
+        }
         if (error.statusCode === 402) {
           return c.json({ error: "Payment required", details: error.details }, 402);
         }
@@ -375,8 +399,15 @@ export function createAgentSpend(options: AgentSpendOptions): AgentSpend {
         return c.json({ error: "Invalid payment payload encoding" }, 400);
       }
 
-      // Resolve the payTo address for verification context
-      const payTo = await resolvePayToAddress();
+      // Extract payTo from the payment payload's accepted requirements
+      // rather than generating a new deposit address.
+      // resolvePayToAddress() creates a fresh Stripe PaymentIntent each
+      // time, which would return a *different* address than the one in the
+      // 402 response the client signed against → facilitator verification
+      // would fail.
+      const acceptedPayTo = (paymentPayload as unknown as { accepted?: { payTo?: string } })
+        .accepted?.payTo;
+      const payTo: string = acceptedPayTo ?? await resolvePayToAddress();
 
       // Build the payment requirements that the payment should satisfy
       const paymentRequirements: PaymentRequirements = {
@@ -446,6 +477,8 @@ export function createAgentSpend(options: AgentSpendOptions): AgentSpend {
     amountCents: number,
     currency: string
   ): Promise<Response> {
+    const serviceId = await getServiceId();
+
     try {
       const payTo = await resolvePayToAddress();
 
@@ -477,11 +510,37 @@ export function createAgentSpend(options: AgentSpendOptions): AgentSpend {
       ).toString("base64");
       c.header("Payment-Required", headerValue);
 
-      return c.json({ error: "Payment required", amount_cents: amountCents, currency }, 402);
-    } catch {
-      // If we can't resolve a payTo address, return a plain 402
+      return c.json({
+        error: "Payment required",
+        amount_cents: amountCents,
+        currency,
+        ...(serviceId ? {
+          agentspend: {
+            service_id: serviceId,
+            amount_cents: amountCents,
+          }
+        } : {})
+      }, 402);
+    } catch (error) {
+      // Log clearly so service developers can diagnose why crypto is unavailable
+      console.error(
+        "[agentspend] Failed to resolve crypto payTo address — returning card-only 402:",
+        error instanceof Error ? error.message : error
+      );
+      // Return card-only 402 (no Payment-Required header → crypto clients
+      // will see "Invalid payment required response")
       return c.json(
-        { error: "Payment required", amount_cents: amountCents, currency },
+        {
+          error: "Payment required",
+          amount_cents: amountCents,
+          currency,
+          ...(serviceId ? {
+            agentspend: {
+              service_id: serviceId,
+              amount_cents: amountCents,
+            }
+          } : {})
+        },
         402
       );
     }