@virtuals-protocol/acp-node 0.3.0-beta.38 → 0.3.0-beta.39

package/dist/index.mjs

@@ -8,7 +8,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.38",
+      version: "0.3.0-beta.39",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -1346,7 +1346,7 @@ var FareAmount = class extends FareAmountBase {
     super(fare.formatAmount(truncateTo6Decimals(fareAmount.toString())), fare);
   }
   add(other) {
-    if (this.fare.contractAddress !== other.fare.contractAddress) {
+    if (this.fare.contractAddress.toLowerCase() !== other.fare.contractAddress.toLowerCase()) {
       throw new Error("Token addresses do not match");
     }
     return new FareBigInt(this.amount + other.amount, this.fare);
@@ -1379,6 +1379,10 @@ var ACP_V2_ABI = [
     name: "AccessControlUnauthorizedAccount",
     type: "error"
   },
+  { inputs: [], name: "AccountAlreadySubscribed", type: "error" },
+  { inputs: [], name: "AccountDoesNotExist", type: "error" },
+  { inputs: [], name: "AccountManagerNotSet", type: "error" },
+  { inputs: [], name: "AccountNotActive", type: "error" },
   {
     inputs: [{ internalType: "address", name: "target", type: "address" }],
     name: "AddressEmptyCode",
@@ -1389,6 +1393,13 @@ var ACP_V2_ABI = [
     name: "AddressInsufficientBalance",
     type: "error"
   },
+  { inputs: [], name: "AmountMustBeGreaterThanZero", type: "error" },
+  { inputs: [], name: "AmountOrFeeRequired", type: "error" },
+  { inputs: [], name: "AssetManagerNotSet", type: "error" },
+  { inputs: [], name: "BudgetNotReceived", type: "error" },
+  { inputs: [], name: "CannotSetBudgetOnSubscriptionJob", type: "error" },
+  { inputs: [], name: "DestinationEndpointRequired", type: "error" },
+  { inputs: [], name: "DurationMustBeGreaterThanZero", type: "error" },
   {
     inputs: [
       { internalType: "address", name: "implementation", type: "address" }
@@ -1398,22 +1409,46 @@ var ACP_V2_ABI = [
   },
   { inputs: [], name: "ERC1967NonPayable", type: "error" },
   { inputs: [], name: "EnforcedPause", type: "error" },
+  { inputs: [], name: "EvaluatorFeeTooHigh", type: "error" },
   { inputs: [], name: "ExpectedPause", type: "error" },
+  { inputs: [], name: "ExpiredAtMustBeInFuture", type: "error" },
+  { inputs: [], name: "ExpiryTooShort", type: "error" },
   { inputs: [], name: "FailedInnerCall", type: "error" },
+  { inputs: [], name: "InvalidCrossChainMemoType", type: "error" },
   { inputs: [], name: "InvalidInitialization", type: "error" },
+  { inputs: [], name: "InvalidMemoType", type: "error" },
+  { inputs: [], name: "InvalidModuleType", type: "error" },
+  { inputs: [], name: "InvalidPaymentToken", type: "error" },
+  { inputs: [], name: "InvalidRecipient", type: "error" },
+  { inputs: [], name: "JobManagerNotSet", type: "error" },
+  { inputs: [], name: "MemoManagerNotSet", type: "error" },
   { inputs: [], name: "NotInitializing", type: "error" },
+  { inputs: [], name: "OnlyClient", type: "error" },
+  { inputs: [], name: "OnlyMemoManager", type: "error" },
+  { inputs: [], name: "OnlyProvider", type: "error" },
+  { inputs: [], name: "PaymentManagerNotSet", type: "error" },
+  { inputs: [], name: "PlatformFeeTooHigh", type: "error" },
   { inputs: [], name: "ReentrancyGuardReentrantCall", type: "error" },
   {
     inputs: [{ internalType: "address", name: "token", type: "address" }],
     name: "SafeERC20FailedOperation",
     type: "error"
   },
+  { inputs: [], name: "SubscriptionAccountExpired", type: "error" },
+  { inputs: [], name: "SubscriptionJobMustHaveZeroBudget", type: "error" },
+  { inputs: [], name: "SubscriptionJobMustHaveZeroBudgetMemo", type: "error" },
+  { inputs: [], name: "TokenAddressRequired", type: "error" },
+  { inputs: [], name: "TokenMustBeERC20", type: "error" },
   { inputs: [], name: "UUPSUnauthorizedCallContext", type: "error" },
   {
     inputs: [{ internalType: "bytes32", name: "slot", type: "bytes32" }],
     name: "UUPSUnsupportedProxiableUUID",
     type: "error"
   },
+  { inputs: [], name: "UnableToRefund", type: "error" },
+  { inputs: [], name: "Unauthorized", type: "error" },
+  { inputs: [], name: "ZeroAddress", type: "error" },
+  { inputs: [], name: "ZeroAddressProvider", type: "error" },
   {
     anonymous: false,
     inputs: [
@@ -1453,56 +1488,6 @@ var ACP_V2_ABI = [
     name: "AccountStatusUpdated",
     type: "event"
   },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "evaluator",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "evaluatorFee",
-        type: "uint256"
-      }
-    ],
-    name: "ClaimedEvaluatorFee",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "provider",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "providerFee",
-        type: "uint256"
-      }
-    ],
-    name: "ClaimedProviderFee",
-    type: "event"
-  },
   {
     anonymous: false,
     inputs: [
@@ -1554,31 +1539,6 @@ var ACP_V2_ABI = [
     name: "Paused",
     type: "event"
   },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "client",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "RefundedBudget",
-    type: "event"
-  },
   {
     anonymous: false,
     inputs: [
@@ -1726,6 +1686,13 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "claimBudgetFromMemoManager",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [
       { internalType: "address", name: "provider", type: "address" },
@@ -1839,6 +1806,28 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      { internalType: "uint256", name: "jobId", type: "uint256" },
+      { internalType: "string", name: "content", type: "string" },
+      { internalType: "address", name: "token", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" },
+      { internalType: "address", name: "recipient", type: "address" },
+      { internalType: "uint256", name: "feeAmount", type: "uint256" },
+      { internalType: "enum ACPTypes.FeeType", name: "feeType", type: "uint8" },
+      { internalType: "uint256", name: "duration", type: "uint256" },
+      { internalType: "uint256", name: "expiredAt", type: "uint256" },
+      {
+        internalType: "enum ACPTypes.JobPhase",
+        name: "nextPhase",
+        type: "uint8"
+      }
+    ],
+    name: "createSubscriptionMemo",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [
       { internalType: "address", name: "provider", type: "address" },
@@ -1907,7 +1896,8 @@ var ACP_V2_ABI = [
             name: "completedJobCount",
             type: "uint256"
           },
-          { internalType: "bool", name: "isActive", type: "bool" }
+          { internalType: "bool", name: "isActive", type: "bool" },
+          { internalType: "uint256", name: "expiry", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Account",
         name: "",
@@ -2064,13 +2054,6 @@ var ACP_V2_ABI = [
     stateMutability: "view",
     type: "function"
   },
-  {
-    inputs: [],
-    name: "getPhases",
-    outputs: [{ internalType: "string[7]", name: "", type: "string[7]" }],
-    stateMutability: "pure",
-    type: "function"
-  },
   {
     inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
     name: "getRoleAdmin",
@@ -2115,11 +2098,8 @@ var ACP_V2_ABI = [
     type: "function"
   },
   {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "isJobEvaluator",
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "isSubscriptionJob",
     outputs: [{ internalType: "bool", name: "", type: "bool" }],
     stateMutability: "view",
     type: "function"
@@ -2227,6 +2207,13 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "setupEscrowFromMemoManager",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [
       { internalType: "uint256", name: "memoId", type: "uint256" },
@@ -2262,6 +2249,18 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      { internalType: "uint256", name: "accountId", type: "uint256" },
+      { internalType: "uint256", name: "duration", type: "uint256" },
+      { internalType: "string", name: "metadata", type: "string" },
+      { internalType: "address", name: "provider", type: "address" }
+    ],
+    name: "updateAccountSubscriptionFromMemoManager",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [
       { internalType: "uint256", name: "evaluatorFeeBP_", type: "uint256" }
@@ -3612,6 +3611,7 @@ var MemoType = /* @__PURE__ */ ((MemoType3) => {
   MemoType3[MemoType3["PAYABLE_TRANSFER_ESCROW"] = 8] = "PAYABLE_TRANSFER_ESCROW";
   MemoType3[MemoType3["NOTIFICATION"] = 9] = "NOTIFICATION";
   MemoType3[MemoType3["PAYABLE_NOTIFICATION"] = 10] = "PAYABLE_NOTIFICATION";
+  MemoType3[MemoType3["PAYABLE_REQUEST_SUBSCRIPTION"] = 11] = "PAYABLE_REQUEST_SUBSCRIPTION";
   return MemoType3;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases3) => {
@@ -3680,6 +3680,35 @@ ${JSON.stringify(
       );
     }
   }
+  /**
+   * Returns a createAccount operation payload if the contract supports it (V2).
+   * Returns null for V1 or when the ABI does not include createAccount.
+   */
+  createAccount(providerAddress, metadata) {
+    try {
+      const hasCreateAccount = this.abi.some(
+        (item) => item.type === "function" && item.name === "createAccount"
+      );
+      if (!hasCreateAccount) return null;
+      const data = encodeFunctionData({
+        abi: this.abi,
+        functionName: "createAccount",
+        args: [providerAddress, metadata]
+      });
+      return {
+        data,
+        contractAddress: this.contractAddress
+      };
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Returns the new account id from a createAccount user op receipt, or null if not supported.
+   */
+  async getAccountIdFromUserOpHash(_userOpHash) {
+    return null;
+  }
   get walletAddress() {
     return this.agentWalletAddress;
   }
@@ -3772,6 +3801,33 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create payable memo", error);
     }
   }
+  createSubscriptionMemo(jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, duration, nextPhase, expiredAt, token = this.config.baseFare.contractAddress) {
+    try {
+      const data = encodeFunctionData({
+        abi: this.abi,
+        functionName: "createSubscriptionMemo",
+        args: [
+          jobId,
+          content,
+          token,
+          amountBaseUnit,
+          recipient,
+          feeAmountBaseUnit,
+          feeType,
+          duration,
+          Math.floor(expiredAt.getTime() / 1e3),
+          nextPhase
+        ]
+      });
+      const payload = {
+        data,
+        contractAddress: this.contractAddress
+      };
+      return payload;
+    } catch (error) {
+      throw new acpError_default("Failed to create subscription memo", error);
+    }
+  }
   createCrossChainPayableMemo(jobId, content, token, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, type, expiredAt, nextPhase, destinationEid, secured = true) {
     try {
       const data = encodeFunctionData({
@@ -4103,8 +4159,35 @@ function appendBuilderCodeData(data, suffix) {
 // src/acpJobOffering.ts
 import { zeroAddress as zeroAddress2 } from "viem";
 import Ajv from "ajv";
+
+// src/acpAccount.ts
+var AcpAccount = class {
+  constructor(contractClient, id, clientAddress, providerAddress, metadata, expiryAt) {
+    this.contractClient = contractClient;
+    this.id = id;
+    this.clientAddress = clientAddress;
+    this.providerAddress = providerAddress;
+    this.metadata = metadata;
+    this.expiryAt = expiryAt;
+  }
+  async updateMetadata(metadata) {
+    const hash = await this.contractClient.updateAccountMetadata(
+      this.id,
+      JSON.stringify(metadata)
+    );
+    return hash;
+  }
+};
+
+// src/acpJobOffering.ts
+var PriceType = /* @__PURE__ */ ((PriceType2) => {
+  PriceType2["FIXED"] = "fixed";
+  PriceType2["PERCENTAGE"] = "percentage";
+  PriceType2["SUBSCRIPTION"] = "subscription";
+  return PriceType2;
+})(PriceType || {});
 var AcpJobOffering = class {
-  constructor(acpClient, acpContractClient, providerAddress, name, price, priceType, requiredFunds, slaMinutes, requirement, deliverable) {
+  constructor(acpClient, acpContractClient, providerAddress, name, price, priceType = "fixed" /* FIXED */, requiredFunds, slaMinutes, requirement, deliverable, subscriptionTiers = [], isPrivate = false) {
     this.acpClient = acpClient;
     this.acpContractClient = acpContractClient;
     this.providerAddress = providerAddress;
@@ -4115,10 +4198,49 @@ var AcpJobOffering = class {
     this.slaMinutes = slaMinutes;
     this.requirement = requirement;
     this.deliverable = deliverable;
+    this.subscriptionTiers = subscriptionTiers;
+    this.isPrivate = isPrivate;
     this.ajv = new Ajv({ allErrors: true });
   }
-  async initiateJob(serviceRequirement, evaluatorAddress) {
-    const expiredAt = new Date(Date.now() + this.slaMinutes * 60 * 1e3);
+  async initiateJob(serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + this.slaMinutes * 60 * 1e3), preferredSubscriptionTier) {
+    this.validateRequest(serviceRequirement);
+    const finalServiceRequirement = {
+      name: this.name,
+      requirement: serviceRequirement,
+      priceValue: this.price,
+      priceType: this.priceType
+    };
+    const subscriptionRequired = this.isSubscriptionRequired(
+      preferredSubscriptionTier
+    );
+    this.validateSubscriptionTier(preferredSubscriptionTier);
+    const effectivePrice = subscriptionRequired ? 0 : this.price;
+    const effectivePriceType = subscriptionRequired ? "subscription" /* SUBSCRIPTION */ : this.priceType === "subscription" /* SUBSCRIPTION */ ? "fixed" /* FIXED */ : this.priceType;
+    const fareAmount = new FareAmount(
+      effectivePriceType === "fixed" /* FIXED */ ? effectivePrice : 0,
+      this.acpContractClient.config.baseFare
+    );
+    const account = await this.resolveAccount(
+      subscriptionRequired,
+      preferredSubscriptionTier
+    );
+    const jobId = await this.createJob(
+      account,
+      evaluatorAddress,
+      expiredAt,
+      fareAmount,
+      subscriptionRequired,
+      preferredSubscriptionTier ?? ""
+    );
+    await this.sendInitialMemo(jobId, fareAmount, subscriptionRequired, {
+      name: this.name,
+      requirement: finalServiceRequirement,
+      priceValue: effectivePrice,
+      priceType: effectivePriceType
+    });
+    return jobId;
+  }
+  validateRequest(serviceRequirement) {
     if (this.providerAddress === this.acpClient.walletAddress) {
       throw new acpError_default(
         "Provider address cannot be the same as the client address"
@@ -4126,84 +4248,147 @@ var AcpJobOffering = class {
     }
     if (this.requirement && typeof this.requirement === "object") {
       const validator = this.ajv.compile(this.requirement);
-      const valid = validator(serviceRequirement);
-      if (!valid) {
+      if (!validator(serviceRequirement)) {
         throw new acpError_default(this.ajv.errorsText(validator.errors));
       }
     }
-    const finalServiceRequirement = {
-      name: this.name,
-      requirement: serviceRequirement,
-      priceValue: this.price,
-      priceType: this.priceType
-    };
-    const fareAmount = new FareAmount(
-      this.priceType === "fixed" /* FIXED */ ? this.price : 0,
-      this.acpContractClient.config.baseFare
-    );
-    const account = await this.acpClient.getByClientAndProvider(
+  }
+  isSubscriptionRequired(preferredSubscriptionTier) {
+    const hasSubscriptionTiers = this.subscriptionTiers.length > 0;
+    return preferredSubscriptionTier != null || this.priceType === "subscription" /* SUBSCRIPTION */ && hasSubscriptionTiers;
+  }
+  validateSubscriptionTier(preferredSubscriptionTier) {
+    if (!preferredSubscriptionTier) return;
+    if (this.subscriptionTiers.length === 0) {
+      throw new acpError_default(
+        `Offering "${this.name}" does not support subscription tiers`
+      );
+    }
+    if (!this.subscriptionTiers.includes(preferredSubscriptionTier)) {
+      throw new acpError_default(
+        `Preferred subscription tier "${preferredSubscriptionTier}" is not offered. Available: ${this.subscriptionTiers.join(", ")}`
+      );
+    }
+  }
+  /**
+   * Resolve the account to use for the job.
+   *
+   * For non-subscription jobs: returns the existing account if found.
+   * For subscription jobs, priority:
+   *   1. Valid account matching preferred tier
+   *   2. Any valid (non-expired) account
+   *   3. Expired/unactivated account (expiryAt = 0) to reuse
+   *   4. null — createJob will create a new one
+   */
+  async resolveAccount(subscriptionRequired, preferredSubscriptionTier) {
+    const raw = await this.acpClient.getByClientAndProvider(
       this.acpContractClient.walletAddress,
       this.providerAddress,
-      this.acpContractClient
+      this.acpContractClient,
+      subscriptionRequired ? this.name : void 0
     );
+    if (!subscriptionRequired) {
+      if (!(raw instanceof AcpAccount)) return null;
+      const meta = raw.metadata;
+      if (meta && typeof meta === "object" && meta.name) return null;
+      return raw;
+    }
+    const subscriptionCheck = raw && typeof raw === "object" && "accounts" in raw ? raw : null;
+    if (!subscriptionCheck) return null;
+    const now = Math.floor(Date.now() / 1e3);
+    const allAccounts = subscriptionCheck.accounts ?? [];
+    const matchedAccount = this.findPreferredAccount(allAccounts, preferredSubscriptionTier, now) ?? allAccounts.find((a) => a.expiryAt != null && a.expiryAt > now) ?? allAccounts.find((a) => a.expiryAt == null || a.expiryAt === 0);
+    if (!matchedAccount) return null;
+    return new AcpAccount(
+      this.acpContractClient,
+      matchedAccount.id,
+      matchedAccount.clientAddress ?? this.acpContractClient.walletAddress,
+      matchedAccount.providerAddress ?? this.providerAddress,
+      matchedAccount.metadata,
+      matchedAccount.expiryAt
+    );
+  }
+  findPreferredAccount(accounts, preferredTier, now) {
+    if (!preferredTier) return void 0;
+    return accounts.find((a) => {
+      if (a.expiryAt == null || a.expiryAt <= now) return false;
+      const meta = typeof a.metadata === "string" ? (() => {
+        try {
+          return JSON.parse(a.metadata);
+        } catch {
+          return {};
+        }
+      })() : a.metadata ?? {};
+      return meta?.name === preferredTier;
+    });
+  }
+  async createJob(account, evaluatorAddress, expiredAt, fareAmount, subscriptionRequired, subscriptionTier) {
     const isV1 = [
       baseSepoliaAcpConfig.contractAddress,
       baseSepoliaAcpX402Config.contractAddress,
       baseAcpConfig.contractAddress,
       baseAcpX402Config.contractAddress
     ].includes(this.acpContractClient.config.contractAddress);
-    let createJobPayload;
     const chainId = this.acpContractClient.config.chain.id;
     const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
     const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
-    if (isV1 || !account) {
-      createJobPayload = this.acpContractClient.createJob(
-        this.providerAddress,
-        evaluatorAddress || this.acpContractClient.walletAddress,
-        expiredAt,
-        fareAmount.fare.contractAddress,
-        fareAmount.amount,
-        "",
-        isX402Job
-      );
-    } else {
-      createJobPayload = this.acpContractClient.createJobWithAccount(
-        account.id,
-        evaluatorAddress || zeroAddress2,
-        fareAmount.amount,
-        fareAmount.fare.contractAddress,
-        expiredAt,
-        isX402Job
-      );
-    }
-    const { userOpHash } = await this.acpContractClient.handleOperation([
-      createJobPayload
+    const budget = subscriptionRequired ? 0n : fareAmount.amount;
+    const subscriptionMetadata = subscriptionRequired ? JSON.stringify({ name: subscriptionTier }) : "";
+    const operation = isV1 || !account ? this.acpContractClient.createJob(
+      this.providerAddress,
+      evaluatorAddress || this.acpContractClient.walletAddress,
+      expiredAt,
+      fareAmount.fare.contractAddress,
+      budget,
+      subscriptionMetadata,
+      isX402Job
+    ) : this.acpContractClient.createJobWithAccount(
+      account.id,
+      evaluatorAddress || zeroAddress2,
+      budget,
+      fareAmount.fare.contractAddress,
+      expiredAt,
+      isX402Job
+    );
+    const { userOpHash, txnHash } = await this.acpContractClient.handleOperation([
+      operation
     ]);
-    const jobId = await this.acpContractClient.getJobId(
+    return this.acpContractClient.getJobId(
       userOpHash,
       this.acpContractClient.walletAddress,
       this.providerAddress
     );
+  }
+  async sendInitialMemo(jobId, fareAmount, subscriptionRequired, serviceRequirement) {
     const payloads = [];
-    const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
-      jobId,
-      fareAmount.amount,
-      fareAmount.fare.contractAddress
-    );
-    if (setBudgetWithPaymentTokenPayload) {
-      payloads.push(setBudgetWithPaymentTokenPayload);
+    if (!subscriptionRequired) {
+      const setBudgetPayload = this.acpContractClient.setBudgetWithPaymentToken(
+        jobId,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
+      );
+      if (setBudgetPayload) {
+        payloads.push(setBudgetPayload);
+      }
+    }
+    let content = JSON.stringify(serviceRequirement);
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        jobId,
+        content
+      );
+      content = memoContent.url;
     }
     payloads.push(
       this.acpContractClient.createMemo(
         jobId,
-        JSON.stringify(finalServiceRequirement),
-        0 /* MESSAGE */,
+        content,
+        this.isPrivate ? 4 /* OBJECT_URL */ : 0 /* MESSAGE */,
         true,
         1 /* NEGOTIATION */
       )
     );
     await this.acpContractClient.handleOperation(payloads);
-    return jobId;
   }
 };
 var acpJobOffering_default = AcpJobOffering;
@@ -4211,7 +4396,7 @@ var acpJobOffering_default = AcpJobOffering;
 // src/acpJob.ts
 import * as util from "util";
 var AcpJob = class {
-  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, _deliverable, netPayableAmount) {
+  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context, contractAddress, netPayableAmount) {
     this.acpClient = acpClient;
     this.id = id;
     this.clientAddress = clientAddress;
@@ -4223,10 +4408,10 @@ var AcpJob = class {
     this.phase = phase;
     this.context = context;
     this.contractAddress = contractAddress;
-    this._deliverable = _deliverable;
     this.netPayableAmount = netPayableAmount;
     this.priceType = "fixed" /* FIXED */;
     this.priceValue = 0;
+    this.isPrivate = false;
     const content = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */
     )?.content;
@@ -4249,6 +4434,9 @@ var AcpJob = class {
     if (contentObj.priceValue) {
       this.priceValue = contentObj.priceValue || this.price;
     }
+    if (contentObj.isPrivate) {
+      this.isPrivate = contentObj.isPrivate;
+    }
   }
   get acpContractClient() {
     return this.acpClient.contractClientByAddress(this.contractAddress);
@@ -4283,27 +4471,49 @@ var AcpJob = class {
   get latestMemo() {
     return this.memos[this.memos.length - 1];
   }
-  async getDeliverable() {
-    if (!this._deliverable) {
+  getDeliverable() {
+    const deliverableMemo = this.memos.find(
+      (m) => m.nextPhase === 4 /* COMPLETED */
+    );
+    if (!deliverableMemo) {
       return null;
     }
-    if (typeof this._deliverable !== "string") {
-      return this._deliverable;
-    }
-    const regex = /api\/memo-contents\/([0-9]+)$/;
-    const result = this._deliverable?.match(regex);
-    if (!result) {
-      return this._deliverable;
-    }
-    const deliverable = await this.acpClient.getMemoContent(this._deliverable);
-    return tryParseJson(deliverable) || deliverable;
+    return tryParseJson(deliverableMemo.content) || deliverableMemo.content;
   }
   async createRequirement(content) {
     const operations = [];
+    let finalContent = content;
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        content
+      );
+      finalContent = memoContent.url;
+    }
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        content,
+        finalContent,
+        this.isPrivate ? 4 /* OBJECT_URL */ : 0 /* MESSAGE */,
+        true,
+        2 /* TRANSACTION */
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
+  }
+  async acceptRequirement(memo, reason) {
+    const operations = [];
+    operations.push(
+      this.acpContractClient.signMemo(
+        memo.id,
+        true,
+        reason ?? "Requirement accepted"
+      )
+    );
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        reason ?? "Proceeding to delivery",
         0 /* MESSAGE */,
         true,
         2 /* TRANSACTION */
@@ -4311,7 +4521,38 @@ var AcpJob = class {
     );
     return await this.acpContractClient.handleOperation(operations);
   }
-  async createPayableRequirement(content, type, amount, recipient, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+  async createPayableRequirement(content, type, amount, recipient, expiredAt = new Date(Date.now() + 1e3 * 60 * 5), duration) {
+    if (type === 11 /* PAYABLE_REQUEST_SUBSCRIPTION */ && !duration) {
+      throw new acpError_default("Duration is required for subscription payment requests");
+    }
+    if (type === 11 /* PAYABLE_REQUEST_SUBSCRIPTION */) {
+      this.priceType = "subscription" /* SUBSCRIPTION */;
+      if (this.priceValue !== 0) {
+        throw new acpError_default(
+          `Subscription payment request zero budget, got: ${this.priceValue}`
+        );
+      }
+      let parsed;
+      try {
+        const result = JSON.parse(content);
+        if (typeof result !== "object" || result === null || Array.isArray(result)) {
+          throw new Error();
+        }
+        parsed = result;
+      } catch {
+        throw new acpError_default(
+          `Subscription memo content must be a JSON object string, got: ${content}`
+        );
+      }
+      const missing = ["name", "duration", "price"].filter(
+        (k) => !(k in parsed)
+      );
+      if (missing.length > 0) {
+        throw new acpError_default(
+          `Subscription memo content is missing required fields: ${missing.join(", ")}`
+        );
+      }
+    }
     const operations = [];
     if (type === 8 /* PAYABLE_TRANSFER_ESCROW */) {
       operations.push(
@@ -4323,11 +4564,34 @@ var AcpJob = class {
     }
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */;
-    if (amount.fare.chainId && amount.fare.chainId !== this.acpContractClient.config.chain.id) {
+    let finalContent = content;
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        content
+      );
+      finalContent = memoContent.url;
+    }
+    if (type === 11 /* PAYABLE_REQUEST_SUBSCRIPTION */) {
       operations.push(
-        this.acpContractClient.createCrossChainPayableMemo(
+        this.acpContractClient.createSubscriptionMemo(
           this.id,
           content,
+          amount.amount,
+          recipient,
+          isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+          isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+          duration,
+          2 /* TRANSACTION */,
+          expiredAt,
+          amount.fare.contractAddress
+        )
+      );
+    } else if (amount.fare.chainId && amount.fare.chainId !== this.acpContractClient.config.chain.id) {
+      operations.push(
+        this.acpContractClient.createCrossChainPayableMemo(
+          this.id,
+          finalContent,
           amount.fare.contractAddress,
           amount.amount,
           recipient,
@@ -4343,7 +4607,7 @@ var AcpJob = class {
       operations.push(
         this.acpContractClient.createPayableMemo(
           this.id,
-          content,
+          finalContent,
           amount.amount,
           recipient,
           isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
@@ -4374,14 +4638,15 @@ var AcpJob = class {
       memo.payableDetails.token,
       this.config
     ) : new FareAmount(0, this.baseFare);
-    const totalAmount = baseFareAmount.fare.contractAddress === transferAmount.fare.contractAddress ? baseFareAmount.add(transferAmount) : baseFareAmount;
+    const sameToken = baseFareAmount.fare.contractAddress.toLowerCase() === transferAmount.fare.contractAddress.toLowerCase();
+    const totalAmount = sameToken ? baseFareAmount.add(transferAmount) : baseFareAmount;
     operations.push(
       this.acpContractClient.approveAllowance(
         totalAmount.amount,
         this.baseFare.contractAddress
       )
     );
-    if (baseFareAmount.fare.contractAddress !== transferAmount.fare.contractAddress) {
+    if (!sameToken) {
       operations.push(
         this.acpContractClient.approveAllowance(
           transferAmount.amount,
@@ -4390,11 +4655,19 @@ var AcpJob = class {
       );
     }
     operations.push(this.acpContractClient.signMemo(memo.id, true, reason));
+    let finalContent = `Payment made. ${reason ?? ""}`.trim();
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        finalContent
+      );
+      finalContent = memoContent.url;
+    }
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        `Payment made. ${reason ?? ""}`.trim(),
-        0 /* MESSAGE */,
+        finalContent,
+        this.isPrivate ? 4 /* OBJECT_URL */ : 0 /* MESSAGE */,
         true,
         3 /* EVALUATION */
       )
@@ -4479,12 +4752,20 @@ var AcpJob = class {
       }
       return await latestMemo.sign(false, memoContent);
     }
+    let finalContent = memoContent;
+    if (this.isPrivate) {
+      const memoContent2 = await this.acpClient.createMemoContent(
+        this.id,
+        finalContent
+      );
+      finalContent = memoContent2.url;
+    }
     const operations = [];
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        memoContent,
-        0 /* MESSAGE */,
+        finalContent,
+        this.isPrivate ? 4 /* OBJECT_URL */ : 0 /* MESSAGE */,
         true,
         5 /* REJECTED */
       )
@@ -4501,10 +4782,18 @@ var AcpJob = class {
         amount.fare.contractAddress
       )
     );
+    let finalContent = memoContent;
+    if (this.isPrivate) {
+      const memoContent2 = await this.acpClient.createMemoContent(
+        this.id,
+        finalContent
+      );
+      finalContent = memoContent2.url;
+    }
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
-        memoContent,
+        finalContent,
         amount.amount,
         this.clientAddress,
         feeAmount.amount,
@@ -4575,19 +4864,70 @@ var AcpJob = class {
     );
     return await this.acpContractClient.handleOperation(operations);
   }
+  async paySubscription(reason) {
+    if (this.phase === 6 /* EXPIRED */) {
+      throw new acpError_default("Job has expired, cannot process subscription payment");
+    }
+    if (this.phase === 4 /* COMPLETED */) {
+      throw new acpError_default(
+        "Job is already completed, cannot process subscription payment"
+      );
+    }
+    const memo = this.memos.find(
+      (m) => m.type === 11 /* PAYABLE_REQUEST_SUBSCRIPTION */
+    );
+    if (!memo) {
+      throw new acpError_default("No subscription payment request memo found");
+    }
+    if (!memo.payableDetails) {
+      throw new acpError_default("Subscription memo has no payable details");
+    }
+    const operations = [];
+    operations.push(
+      this.acpContractClient.approveAllowance(
+        memo.payableDetails.amount,
+        memo.payableDetails.token
+      )
+    );
+    operations.push(
+      this.acpContractClient.signMemo(
+        memo.id,
+        true,
+        reason || "Subscription payment approved"
+      )
+    );
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        `Subscription payment made. ${reason ?? ""}`.trim(),
+        0 /* MESSAGE */,
+        true,
+        memo.nextPhase
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
+  }
   async evaluate(accept, reason) {
     if (this.latestMemo?.nextPhase !== 4 /* COMPLETED */) {
       throw new acpError_default("No evaluation memo found");
     }
     const memo = this.latestMemo;
-    await memo.sign(accept, reason);
+    return await memo.sign(accept, reason);
   }
   async createNotification(content) {
     const operations = [];
+    let finalContent = content;
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        content
+      );
+      finalContent = memoContent.url;
+    }
     operations.push(
       this.acpContractClient.createMemo(
         this.id,
-        content,
+        finalContent,
         9 /* NOTIFICATION */,
         true,
         4 /* COMPLETED */
@@ -4605,10 +4945,18 @@ var AcpJob = class {
     );
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    let finalContent = content;
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        content
+      );
+      finalContent = memoContent.url;
+    }
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
-        content,
+        finalContent,
         amount.amount,
         this.clientAddress,
         isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
@@ -4715,9 +5063,17 @@ var AcpJob = class {
     );
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    let finalContent = content;
+    if (this.isPrivate) {
+      const memoContent = await this.acpClient.createMemoContent(
+        this.id,
+        content
+      );
+      finalContent = memoContent.url;
+    }
     const createMemoOperation = this.acpContractClient.createCrossChainPayableMemo(
       this.id,
-      content,
+      finalContent,
       amount.fare.contractAddress,
       amount.amount,
       recipient,
@@ -4752,9 +5108,9 @@ var acpJob_default = AcpJob;
 
 // src/acpMemo.ts
 import util2 from "util";
-var AcpMemo = class {
-  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
-    this.contractClient = contractClient;
+var AcpMemo = class _AcpMemo {
+  constructor(acpClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
+    this.acpClient = acpClient;
     this.id = id;
     this.type = type;
     this.content = content;
@@ -4772,8 +5128,39 @@ var AcpMemo = class {
       this.payableDetails.feeAmount = BigInt(this.payableDetails.feeAmount);
     }
   }
+  static async build(acpClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
+    let memoContent = content;
+    const regex = /api\/memo-contents\/([0-9]+)$/;
+    const result = memoContent.match(regex);
+    if (result) {
+      memoContent = await acpClient.getMemoContent(content);
+    }
+    return new _AcpMemo(
+      acpClient,
+      id,
+      type,
+      memoContent,
+      nextPhase,
+      status,
+      senderAddress,
+      signedReason,
+      expiry,
+      payableDetails,
+      txHash,
+      signedTxHash,
+      state
+    );
+  }
+  async getContent() {
+    const regex = /api\/memo-contents\/([0-9]+)$/;
+    const result = this.content.match(regex);
+    if (!result) {
+      return this.content;
+    }
+    return this.acpClient.getMemoContent(this.content);
+  }
   async create(jobId, isSecured = true) {
-    return this.contractClient.createMemo(
+    return this.acpClient.acpContractClient.createMemo(
       jobId,
       this.content,
       this.type,
@@ -4782,44 +5169,30 @@ var AcpMemo = class {
     );
   }
   async sign(approved, reason) {
-    const payload = this.contractClient.signMemo(this.id, approved, reason);
-    return await this.contractClient.handleOperation([payload]);
-  }
-  [util2.inspect.custom]() {
-    return {
-      id: this.id,
-      senderAddress: this.senderAddress,
-      type: MemoType[this.type],
-      status: this.status,
-      content: this.content,
-      signedReason: this.signedReason,
-      txHash: this.txHash,
-      signedTxHash: this.signedTxHash,
-      nextPhase: AcpJobPhases[this.nextPhase],
-      expiry: this.expiry,
-      payableDetails: this.payableDetails
-    };
-  }
-};
-var acpMemo_default = AcpMemo;
-
-// src/acpAccount.ts
-var AcpAccount = class {
-  constructor(contractClient, id, clientAddress, providerAddress, metadata) {
-    this.contractClient = contractClient;
-    this.id = id;
-    this.clientAddress = clientAddress;
-    this.providerAddress = providerAddress;
-    this.metadata = metadata;
-  }
-  async updateMetadata(metadata) {
-    const hash = await this.contractClient.updateAccountMetadata(
+    const payload = this.acpClient.acpContractClient.signMemo(
       this.id,
-      JSON.stringify(metadata)
+      approved,
+      reason
     );
-    return hash;
+    return await this.acpClient.acpContractClient.handleOperation([payload]);
+  }
+  [util2.inspect.custom]() {
+    return {
+      id: this.id,
+      senderAddress: this.senderAddress,
+      type: MemoType[this.type],
+      status: this.status,
+      content: this.content,
+      signedReason: this.signedReason,
+      txHash: this.txHash,
+      signedTxHash: this.signedTxHash,
+      nextPhase: AcpJobPhases[this.nextPhase],
+      expiry: this.expiry,
+      payableDetails: this.payableDetails
+    };
   }
 };
+var acpMemo_default = AcpMemo;
 
 // src/acpClient.ts
 import axios, { AxiosError } from "axios";
@@ -4836,6 +5209,7 @@ var AcpAgent = class {
     this.twitterHandle = args.twitterHandle;
     this.metrics = args.metrics;
     this.resources = args.resources;
+    this.subscriptions = Object.freeze([...args.subscriptions ?? []]);
   }
 };
 var acpAgent_default = AcpAgent;
@@ -4946,6 +5320,7 @@ var AcpClient = class {
       });
       return response.data.data;
     } catch (err) {
+      console.log("err->>", err.response.data);
       throw new acpError_default("Failed to verify auth challenge", err);
     }
   }
@@ -5000,18 +5375,26 @@ var AcpClient = class {
     socket.on("onEvaluate" /* ON_EVALUATE */, async (data, callback) => {
       callback(true);
       if (this.onEvaluate) {
-        const job = this._hydrateJob(data);
+        const job = await this._hydrateJob(data);
         this.onEvaluate(job);
       }
     });
     socket.on("onNewTask" /* ON_NEW_TASK */, async (data, callback) => {
       callback(true);
       if (this.onNewTask) {
-        const job = this._hydrateJob(data);
-        this.onNewTask(
-          job,
-          job.memos.find((m) => m.id == data.memoToSign)
-        );
+        const job = await this._hydrateJob(data);
+        if (job.phase === 6 /* EXPIRED */) {
+          console.warn(`onNewTask skipped for job ${data.id}: job has expired`);
+          return;
+        }
+        try {
+          await this.onNewTask(
+            job,
+            job.memos.find((m) => m.id == data.memoToSign)
+          );
+        } catch (err) {
+          console.error(`onNewTask error for job ${data.id}:`, err);
+        }
       }
     });
     const cleanup = async () => {
@@ -5038,8 +5421,6 @@ var AcpClient = class {
           errCallback(err);
         } else if (err.response?.data.error?.message) {
           throw new acpError_default(err.response?.data.error.message);
-        } else {
-          throw new acpError_default(`Failed to fetch ${url}: ${err.message}`, err);
         }
       } else {
         throw new acpError_default(
@@ -5049,10 +5430,10 @@ var AcpClient = class {
       }
     }
   }
-  _hydrateMemo(memo, contractClient) {
+  async _hydrateMemo(memo) {
     try {
-      return new acpMemo_default(
-        contractClient,
+      return await acpMemo_default.build(
+        this,
         memo.id,
         memo.memoType,
         memo.content,
@@ -5060,7 +5441,7 @@ var AcpClient = class {
         memo.status,
         memo.senderAddress,
         memo.signedReason,
-        memo.expiry ? new Date(Number(memo.expiry) * 1e3) : void 0,
+        memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
         memo.payableDetails,
         memo.txHash,
         memo.signedTxHash,
@@ -5070,7 +5451,7 @@ var AcpClient = class {
       throw new acpError_default(`Failed to hydrate memo ${memo.id}`, err);
     }
   }
-  _hydrateJob(job) {
+  async _hydrateJob(job) {
     try {
       return new acpJob_default(
         this,
@@ -5080,31 +5461,27 @@ var AcpClient = class {
         job.evaluatorAddress,
         job.price,
         job.priceTokenAddress,
-        job.memos.map(
-          (memo) => this._hydrateMemo(
-            memo,
-            this.contractClientByAddress(job.contractAddress)
-          )
-        ),
+        await Promise.all(job.memos.map((memo) => this._hydrateMemo(memo))),
         job.phase,
         job.context,
         job.contractAddress,
-        job.deliverable,
         job.netPayableAmount
       );
     } catch (err) {
       throw new acpError_default(`Failed to hydrate job ${job.id}`, err);
     }
   }
-  _hydrateJobs(rawJobs, options) {
-    const jobs = rawJobs.map((job) => {
-      try {
-        return this._hydrateJob(job);
-      } catch (err) {
-        console.warn(`${options?.logPrefix ?? "Skipped"}`, err);
-        return null;
-      }
-    });
+  async _hydrateJobs(rawJobs, options) {
+    const jobs = await Promise.all(
+      rawJobs.map((job) => {
+        try {
+          return this._hydrateJob(job);
+        } catch (err) {
+          console.warn(`${options?.logPrefix ?? "Skipped"}`, err);
+          return null;
+        }
+      })
+    );
     return jobs.filter((job) => !!job);
   }
   _hydrateAgent(agent) {
@@ -5133,14 +5510,17 @@ var AcpClient = class {
           offering.requiredFunds,
           offering.slaMinutes,
           offering.requirement,
-          offering.deliverable
+          offering.deliverable,
+          offering.subscriptionTiers ?? [],
+          offering.isPrivate
         );
       }),
       contractAddress: agent.contractAddress,
       twitterHandle: agent.twitterHandle,
       walletAddress: agent.walletAddress,
       metrics: agent.metrics,
-      resources: agent.resources
+      resources: agent.resources,
+      subscriptions: agent.subscriptions ?? []
     });
   }
   async browseAgents(keyword, options = {}) {
@@ -5189,65 +5569,87 @@ var AcpClient = class {
       return this._hydrateAgent(agent);
     });
   }
-  async initiateJob(providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+  async initiateJob(providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24), offeringName, preferredSubscriptionTier) {
     if (providerAddress === this.walletAddress) {
       throw new acpError_default(
         "Provider address cannot be the same as the client address"
       );
     }
-    const account = await this.getByClientAndProvider(
-      this.walletAddress,
+    const subscriptionRequired = preferredSubscriptionTier != null;
+    const { account } = await this._resolveSubscriptionAccount(
       providerAddress,
-      this.acpContractClient
+      offeringName,
+      preferredSubscriptionTier
     );
+    const budget = subscriptionRequired ? 0n : fareAmount.amount;
+    const subscriptionMetadata = subscriptionRequired ? JSON.stringify({ name: preferredSubscriptionTier ?? "" }) : "";
     const isV1 = [
       baseSepoliaAcpConfig.contractAddress,
       baseSepoliaAcpX402Config.contractAddress,
       baseAcpConfig.contractAddress,
       baseAcpX402Config.contractAddress
     ].includes(this.acpContractClient.config.contractAddress);
-    const defaultEvaluatorAddress = isV1 && !evaluatorAddress ? this.walletAddress : zeroAddress3;
+    const resolvedEvaluator = evaluatorAddress || (isV1 ? this.walletAddress : zeroAddress3);
     const chainId = this.acpContractClient.config.chain.id;
-    const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
-    const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
-    const createJobPayload = isV1 || !account ? this.acpContractClient.createJob(
-      providerAddress,
-      evaluatorAddress || defaultEvaluatorAddress,
-      expiredAt,
-      fareAmount.fare.contractAddress,
-      fareAmount.amount,
-      "",
-      isX402Job
-    ) : this.acpContractClient.createJobWithAccount(
-      account.id,
-      evaluatorAddress || defaultEvaluatorAddress,
-      fareAmount.amount,
-      fareAmount.fare.contractAddress,
-      expiredAt,
-      isX402Job
-    );
-    const { userOpHash } = await this.acpContractClient.handleOperation([
-      createJobPayload
-    ]);
+    const isX402Job = this.acpContractClient.config.x402Config && USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
+    const createJobOperations = [];
+    if (isV1 || !account) {
+      createJobOperations.push(
+        this.acpContractClient.createJob(
+          providerAddress,
+          resolvedEvaluator,
+          expiredAt,
+          fareAmount.fare.contractAddress,
+          budget,
+          subscriptionMetadata,
+          isX402Job
+        )
+      );
+    } else {
+      createJobOperations.push(
+        this.acpContractClient.createJobWithAccount(
+          account.id,
+          resolvedEvaluator,
+          budget,
+          fareAmount.fare.contractAddress,
+          expiredAt,
+          isX402Job
+        )
+      );
+    }
+    const { userOpHash } = await this.acpContractClient.handleOperation(createJobOperations);
     const jobId = await this.acpContractClient.getJobId(
       userOpHash,
       this.walletAddress,
       providerAddress
     );
     const payloads = [];
-    const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
-      jobId,
-      fareAmount.amount,
-      fareAmount.fare.contractAddress
-    );
-    if (setBudgetWithPaymentTokenPayload) {
-      payloads.push(setBudgetWithPaymentTokenPayload);
+    if (!subscriptionRequired) {
+      const setBudgetPayload = this.acpContractClient.setBudgetWithPaymentToken(
+        jobId,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
+      );
+      if (setBudgetPayload) {
+        payloads.push(setBudgetPayload);
+      }
+    }
+    const memoPayload = subscriptionRequired && typeof serviceRequirement === "object" ? preparePayload({
+      ...serviceRequirement,
+      priceValue: 0,
+      priceType: "subscription" /* SUBSCRIPTION */
+    }) : preparePayload(serviceRequirement);
+    const isPrivate = typeof serviceRequirement === "object" && "isPrivate" in serviceRequirement && serviceRequirement.isPrivate;
+    let content = memoPayload;
+    if (isPrivate) {
+      const memoContent = await this.createMemoContent(jobId, memoPayload);
+      content = memoContent.url;
     }
     payloads.push(
       this.acpContractClient.createMemo(
         jobId,
-        preparePayload(serviceRequirement),
-        0 /* MESSAGE */,
+        isPrivate ? content : memoPayload,
+        isPrivate ? 4 /* OBJECT_URL */ : 0 /* MESSAGE */,
         true,
         1 /* NEGOTIATION */
       )
@@ -5305,10 +5707,7 @@ var AcpClient = class {
     if (!memo) {
       return null;
     }
-    return this._hydrateMemo(
-      memo,
-      this.contractClientByAddress(memo.contractAddress)
-    );
+    return this._hydrateMemo(memo);
   }
   async getAgent(walletAddress, options = {}) {
     const params = {
@@ -5336,32 +5735,195 @@ var AcpClient = class {
       account.id,
       account.clientAddress,
       account.providerAddress,
-      account.metadata
+      account.metadata,
+      account.expiryAt
     );
   }
-  async getByClientAndProvider(clientAddress, providerAddress, acpContractClient) {
-    const response = await this._fetch(
-      `/accounts/client/${clientAddress}/provider/${providerAddress}`,
-      "GET",
-      {},
-      {},
-      (err) => {
-        if (err.response?.status === 404) {
-          return;
-        }
-        throw new acpError_default("Failed to get account by client and provider", err);
+  /**
+   * Gets account or subscription data for a client–provider pair.
+   * When offeringName is provided, the backend may return subscription tiers and accounts
+   * (ISubscriptionCheckResponse). When not provided, returns a single AcpAccount or null.
+   */
+  async getByClientAndProvider(clientAddress, providerAddress, acpContractClient, offeringName) {
+    let endpoint = `/accounts/client/${clientAddress}/provider/${providerAddress}`;
+    if (offeringName) {
+      endpoint = `/accounts/sub/client/${clientAddress}/provider/${providerAddress}`;
+    }
+    const response = await this._fetch(endpoint, "GET", {}, {}, (err) => {
+      if (err.response?.status === 404) {
+        return;
       }
-    );
+      throw new acpError_default("Failed to get account by client and provider", err);
+    });
     if (!response) {
       return null;
     }
+    if (typeof response === "object" && "accounts" in response && Array.isArray(response.accounts)) {
+      const sub = response;
+      sub.accounts = sub.accounts.map((a) => ({
+        ...a,
+        expiryAt: a.expiryAt ?? a.expiry
+      }));
+      return sub;
+    }
+    const account = response;
+    const expiryAt = account.expiryAt ?? account.expiry;
     return new AcpAccount(
       acpContractClient || this.contractClients[0],
-      response.id,
-      response.clientAddress,
-      response.providerAddress,
-      response.metadata
+      account.id,
+      account.clientAddress,
+      account.providerAddress,
+      account.metadata,
+      expiryAt
+    );
+  }
+  /**
+   * Narrows a backend response to ISubscriptionCheckResponse if it has an accounts array.
+   */
+  _asSubscriptionCheck(raw) {
+    return raw && typeof raw === "object" && "accounts" in raw ? raw : null;
+  }
+  /**
+   * Resolve the account to use for the job.
+   *
+   * For subscription jobs, priority:
+   *   1. Valid account matching preferred tier
+   *   2. Any valid (non-expired) account
+   *   3. Unactivated account (expiryAt = 0) to reuse
+   *   4. null — createJob will create a new one
+   */
+  async _resolveSubscriptionAccount(providerAddress, offeringName, preferredSubscriptionTier) {
+    if (!offeringName) return { account: null };
+    const raw = await this.getByClientAndProvider(
+      this.walletAddress,
+      providerAddress,
+      this.acpContractClient,
+      offeringName
+    );
+    const subscriptionCheck = raw && typeof raw === "object" && "accounts" in raw ? raw : null;
+    if (!subscriptionCheck) return { account: null };
+    const now = Math.floor(Date.now() / 1e3);
+    const allAccounts = subscriptionCheck.accounts ?? [];
+    const matchedAccount = this._findPreferredAccount(allAccounts, preferredSubscriptionTier, now) ?? allAccounts.find((a) => a.expiryAt != null && a.expiryAt > now) ?? allAccounts.find((a) => a.expiryAt == null || a.expiryAt === 0);
+    if (!matchedAccount) return { account: null };
+    return {
+      account: new AcpAccount(
+        this.acpContractClient,
+        matchedAccount.id,
+        matchedAccount.clientAddress ?? this.walletAddress,
+        matchedAccount.providerAddress ?? providerAddress,
+        matchedAccount.metadata,
+        matchedAccount.expiryAt
+      )
+    };
+  }
+  _findPreferredAccount(accounts, preferredTier, now) {
+    if (!preferredTier) return void 0;
+    return accounts.find((a) => {
+      if (a.expiryAt == null || a.expiryAt <= now) return false;
+      const meta = typeof a.metadata === "string" ? (() => {
+        try {
+          return JSON.parse(a.metadata);
+        } catch {
+          return {};
+        }
+      })() : a.metadata ?? {};
+      return meta?.name === preferredTier;
+    });
+  }
+  /**
+   * Returns the first subscription account with expiryAt > now, or null.
+   */
+  _getValidSubscriptionAccountFromResponse(response, acpContractClient) {
+    const now = Math.floor(Date.now() / 1e3);
+    const valid = response.accounts?.find(
+      (a) => a.expiryAt != null && a.expiryAt > now
+    );
+    if (!valid) return null;
+    return new AcpAccount(
+      acpContractClient,
+      valid.id,
+      valid.clientAddress,
+      valid.providerAddress,
+      valid.metadata,
+      valid.expiryAt
+    );
+  }
+  /**
+   * Seller-facing: determines whether to create a subscription payment request memo.
+   * Call this when handling a new job (e.g. in REQUEST phase); then branch on
+   * needsSubscriptionPayment and use tier when true.
+   */
+  async getSubscriptionPaymentRequirement(clientAddress, providerAddress, offeringName) {
+    let raw;
+    try {
+      raw = await this.getByClientAndProvider(
+        clientAddress,
+        providerAddress,
+        void 0,
+        offeringName
+      );
+    } catch {
+      return {
+        needsSubscriptionPayment: false,
+        action: "no_subscription_required"
+      };
+    }
+    const response = this._asSubscriptionCheck(raw);
+    if (!response?.accounts?.length) {
+      return {
+        needsSubscriptionPayment: false,
+        action: "no_subscription_required"
+      };
+    }
+    const now = Math.floor(Date.now() / 1e3);
+    const hasValidSubscription = response.accounts.some(
+      (a) => a.expiryAt != null && a.expiryAt > now
     );
+    if (hasValidSubscription) {
+      return {
+        needsSubscriptionPayment: false,
+        action: "valid_subscription"
+      };
+    }
+    const firstAccount = response.accounts[0];
+    const tier = {
+      name: firstAccount.metadata?.name ?? "",
+      price: firstAccount.metadata?.price ?? 0,
+      duration: firstAccount.metadata?.duration ?? 0
+    };
+    return {
+      needsSubscriptionPayment: true,
+      tier
+    };
+  }
+  async getValidSubscriptionAccount(providerAddress, offeringName, clientAddress, acpContractClient) {
+    const raw = await this.getByClientAndProvider(
+      clientAddress,
+      providerAddress,
+      acpContractClient,
+      offeringName
+    );
+    const subscriptionCheck = this._asSubscriptionCheck(raw);
+    if (!subscriptionCheck) return null;
+    const contractClient = acpContractClient || this.contractClients[0];
+    const account = this._getValidSubscriptionAccountFromResponse(
+      subscriptionCheck,
+      contractClient
+    );
+    if (account) return account;
+    const legacy = subscriptionCheck;
+    if (legacy.subscriptionRequired && legacy.hasValidSubscription && legacy.account) {
+      return new AcpAccount(
+        contractClient,
+        legacy.account.id,
+        legacy.account.clientAddress,
+        legacy.account.providerAddress,
+        legacy.account.metadata,
+        legacy.account.expiryAt
+      );
+    }
+    return null;
   }
   async createMemoContent(jobId, content) {
     const response = await this._fetch(
@@ -5677,9 +6239,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     throw new acpError_default(`Failed to send user operation`, finalError);
   }
   async getJobId(createJobUserOpHash, clientAddress, providerAddress) {
-    const result = await this.sessionKeyClient.getUserOperationReceipt(
-      createJobUserOpHash
-    );
+    const result = await this.sessionKeyClient.getUserOperationReceipt(createJobUserOpHash);
     if (!result) {
       throw new acpError_default("Failed to get user operation receipt");
     }
@@ -6551,6 +7111,7 @@ var MEMO_MANAGER_ABI = [
   { inputs: [], name: "InvalidMemoState", type: "error" },
   { inputs: [], name: "InvalidMemoStateTransition", type: "error" },
   { inputs: [], name: "InvalidMemoType", type: "error" },
+  { inputs: [], name: "InvalidSubscriptionDuration", type: "error" },
   { inputs: [], name: "JobAlreadyCompleted", type: "error" },
   { inputs: [], name: "JobDoesNotExist", type: "error" },
   { inputs: [], name: "MemoAlreadyApproved", type: "error" },
@@ -6586,6 +7147,7 @@ var MEMO_MANAGER_ABI = [
   { inputs: [], name: "ZeroAddressToken", type: "error" },
   { inputs: [], name: "ZeroAssetManagerAddress", type: "error" },
   { inputs: [], name: "ZeroJobManagerAddress", type: "error" },
+  { inputs: [], name: "ZeroPaymentManagerAddress", type: "error" },
   {
     anonymous: false,
     inputs: [
@@ -6858,6 +7420,31 @@ var MEMO_MANAGER_ABI = [
     name: "RoleRevoked",
     type: "event"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "accountId",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "duration",
+        type: "uint256"
+      }
+    ],
+    name: "SubscriptionActivated",
+    type: "event"
+  },
   {
     anonymous: false,
     inputs: [
@@ -6925,17 +7512,6 @@ var MEMO_MANAGER_ABI = [
     stateMutability: "view",
     type: "function"
   },
-  {
-    inputs: [
-      { internalType: "uint256[]", name: "memoIds", type: "uint256[]" },
-      { internalType: "bool", name: "approved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "bulkApproveMemos",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
   {
     inputs: [
       { internalType: "uint256", name: "memoId", type: "uint256" },
@@ -7013,9 +7589,40 @@ var MEMO_MANAGER_ABI = [
     type: "function"
   },
   {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "emergencyApproveMemo",
-    outputs: [],
+    inputs: [
+      { internalType: "uint256", name: "jobId", type: "uint256" },
+      { internalType: "address", name: "sender", type: "address" },
+      { internalType: "string", name: "content", type: "string" },
+      {
+        components: [
+          { internalType: "address", name: "token", type: "address" },
+          { internalType: "uint256", name: "amount", type: "uint256" },
+          { internalType: "address", name: "recipient", type: "address" },
+          { internalType: "uint256", name: "feeAmount", type: "uint256" },
+          {
+            internalType: "enum ACPTypes.FeeType",
+            name: "feeType",
+            type: "uint8"
+          },
+          { internalType: "bool", name: "isExecuted", type: "bool" },
+          { internalType: "uint256", name: "expiredAt", type: "uint256" },
+          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
+          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
+        ],
+        internalType: "struct ACPTypes.PayableDetails",
+        name: "payableDetails_",
+        type: "tuple"
+      },
+      { internalType: "uint256", name: "duration", type: "uint256" },
+      { internalType: "uint256", name: "expiredAt", type: "uint256" },
+      {
+        internalType: "enum ACPTypes.JobPhase",
+        name: "nextPhase",
+        type: "uint8"
+      }
+    ],
+    name: "createSubscriptionMemo",
+    outputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
     stateMutability: "nonpayable",
     type: "function"
   },
@@ -7026,13 +7633,6 @@ var MEMO_MANAGER_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
-  {
-    inputs: [],
-    name: "getAssetManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [
       { internalType: "uint256", name: "jobId", type: "uint256" },
@@ -7229,17 +7829,6 @@ var MEMO_MANAGER_ABI = [
     stateMutability: "view",
     type: "function"
   },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemoApprovalStatus",
-    outputs: [
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "address", name: "approvedBy", type: "address" },
-      { internalType: "uint256", name: "approvedAt", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
     name: "getMemoWithPayableDetails",
@@ -7302,34 +7891,6 @@ var MEMO_MANAGER_ABI = [
     stateMutability: "view",
     type: "function"
   },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getPayableDetails",
-    outputs: [
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
     name: "getRoleAdmin",
@@ -7368,16 +7929,6 @@ var MEMO_MANAGER_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "isJobEvaluator",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [
       { internalType: "uint256", name: "memoId", type: "uint256" },
@@ -7549,23 +8100,16 @@ var MEMO_MANAGER_ABI = [
   },
   {
     inputs: [
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "requiredApprovals_", type: "uint256" }
+      { internalType: "address", name: "assetManager_", type: "address" }
     ],
-    name: "setApprovalRequirements",
+    name: "setAssetManager",
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
   },
   {
-    inputs: [
-      { internalType: "address", name: "assetManager_", type: "address" }
-    ],
-    name: "setAssetManager",
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "setPayableDetailsExecuted",
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
@@ -7861,6 +8405,37 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     }
     return Number(createdJobEvent.args.jobId);
   }
+  async getAccountIdFromUserOpHash(userOpHash) {
+    const result = await this.sessionKeyClient.getUserOperationReceipt(
+      userOpHash,
+      "pending"
+    );
+    if (!result || !result.logs?.length) {
+      return null;
+    }
+    const contractAddresses = [
+      this.contractAddress.toLowerCase(),
+      this.accountManagerAddress.toLowerCase()
+    ];
+    for (const log of result.logs) {
+      if (!contractAddresses.includes(log.address?.toLowerCase())) {
+        continue;
+      }
+      try {
+        const decoded = decodeEventLog2({
+          abi: this.abi,
+          data: log.data,
+          topics: log.topics
+        });
+        if (decoded.eventName === "AccountCreated") {
+          const args = decoded.args;
+          if (args?.accountId != null) return Number(args.accountId);
+        }
+      } catch {
+      }
+    }
+    return null;
+  }
   async updateJobX402Nonce(jobId, nonce) {
     return await this.acpX402.updateJobNonce(jobId, nonce);
   }
@@ -7914,6 +8489,7 @@ var acpContractClientV2_default = AcpContractClientV2;
 var index_default = acpClient_default;
 export {
   acpAbi_default as ACP_ABI,
+  AcpAccount,
   acpAgent_default as AcpAgent,
   AcpAgentSort,
   acpContractClient_default as AcpContractClient,
@@ -7932,6 +8508,7 @@ export {
   FareAmount,
   FareBigInt,
   MemoType,
+  PriceType,
   baseAcpConfig,
   baseAcpConfigV2,
   baseAcpX402Config,