@agirails/sdk 3.4.1 → 4.0.0-beta.0

package/dist/negotiation/BuyerOrchestrator.d.ts

@@ -15,14 +15,12 @@
  *
  * Accepts ACTPClient for on-chain operations. Caller manages lifecycle.
  */
-import type { Signer } from 'ethers';
+import { type Signer } from 'ethers';
 import { DiscoverParams } from '../api/agirailsApp';
 import { BuyerPolicy } from './PolicyEngine';
 import { IACTPRuntime } from '../runtime/IACTPRuntime';
-import { QuoteMessage } from '../builders/QuoteBuilder';
-import { CounterAcceptMessage } from '../builders/CounterAcceptBuilder';
-import { QuoteChannelClient } from '../transport/QuoteChannel';
 import { NonceManager } from '../utils/NonceManager';
+import { NegotiationChannel } from './NegotiationChannel';
 export interface NegotiationResult {
     success: boolean;
     commerce_session_id: string;
@@ -84,10 +82,15 @@ export type ProgressEvent = {
     reason: string;
 };
 /**
- * AIP-2.1 extras — all optional so existing constructor call sites
- * keep working unchanged. Wire them in when the caller wants real
- * negotiation (counter-offers). Without them the orchestrator still
- * runs the fixed-price flow.
+ * AIP-2.1 negotiation context — wires the orchestrator into the
+ * NegotiationChannel transport. All fields optional: without them the
+ * orchestrator runs the legacy fixed-price flow only (no counters).
+ *
+ * To enable multi-round negotiation, supply ALL of:
+ *   - signer (signs CounterOfferMessages)
+ *   - kernelAddress (EIP-712 domain)
+ *   - chainId
+ *   - negotiationChannel (transport — RelayChannel default, MockChannel for tests)
  */
 export interface BuyerNegotiationContext {
     /** Buyer's EOA signer — signs CounterOfferMessages. */
@@ -98,8 +101,13 @@ export interface BuyerNegotiationContext {
     chainId?: number;
     /** Nonce manager for counter messages. Defaults to an in-memory one. */
     nonceManager?: NonceManager;
-    /** Off-chain transport used to POST counter-offers. */
-    channel?: QuoteChannelClient;
+    /**
+     * Transport for receiving quotes / acceptances + sending counters.
+     * Required for any negotiation feature; without it the orchestrator
+     * is fixed-price only. Use RelayChannel in production, MockChannel
+     * in tests.
+     */
+    negotiationChannel?: NegotiationChannel;
 }
 export declare class BuyerOrchestrator {
     private policy;
@@ -110,77 +118,81 @@ export declare class BuyerOrchestrator {
     private requesterAddress;
     private negotiation;
     private counterBuilder?;
-    /** Quotes pushed in by the caller's quote-channel handler, keyed by txId. */
-    private receivedQuotes;
-    /** Provider-acceptance-of-counter signal, keyed by txId. */
-    private counterAccepted;
-    /** Resolvers waiting on counter acceptance — woken by setCounterAccepted. */
-    private counterWaiters;
     /**
-     * Counters this orchestrator sent (one per round, last write wins),
-     * keyed by txId. Stored so `setCounterAccepted` can cryptographically
-     * bind a provider's acceptance message to the exact counter we sent
-     * (acceptedAmount === counter.counterAmount, inReplyTo === counterHash).
+     * Per-txId inbound message queue. Channel callbacks push here; the
+     * orchestrator's negotiation loop drains via `_waitForNextMessage`.
+     * Bounded implicitly by `_cleanupTxState` at terminal outcomes.
+     */
+    private inboundQueues;
+    /**
+     * Per-txId resolver for the orchestrator's "wait for next message"
+     * await. When a message arrives and a resolver is set, the message
+     * is delivered immediately instead of queued.
+     */
+    private inboundResolvers;
+    /**
+     * Active subscriptions opened by `negotiate()`. Closed at end of
+     * each negotiation. Multiple concurrent calls are supported.
      */
-    private sentCounters;
+    private activeSubscriptions;
     constructor(policy: BuyerPolicy, runtime: IACTPRuntime, requesterAddress: string, actpDir?: string, negotiation?: BuyerNegotiationContext);
     /**
-     * Push a verified QuoteMessage into the orchestrator. Callers wire
-     * this from their QuoteChannel handler so the negotiation loop can
-     * pick it up on the next poll tick.
+     * Channel delivered a verified message for `txId`. If a round is
+     * awaiting the next message, hand it directly; otherwise queue.
      *
-     * Caller is responsible for validating the signature before pushing
-     * (the QuoteChannel handler already does this); the orchestrator
-     * layers on top by cross-referencing against on-chain hash (with
-     * legacy fallback, §3.6).
+     * NOTE: the channel has already verified EIP-712 signature + chainId
+     * before invoking us. This handler is concerned only with routing.
      */
-    setReceivedQuote(txId: string, quote: QuoteMessage, opts?: {
-        providerEndpoint?: string;
-        providerAddress?: string;
-        actualEscrow?: string;
-    }): void;
+    private _onChannelMessage;
     /**
-     * Signal that the provider has accepted our counter-offer off-chain.
-     * Callers wire this from their quote-channel handler when an
-     * `agirails.counteraccept.v1` notification arrives.
+     * Await the next inbound message matching one of `acceptedTypes`.
+     * Returns null on timeout (caller decides how to handle: cancel,
+     * accept-if-affordable, etc).
      *
-     * Verifies the acceptance is cryptographically bound to the counter
-     * THIS orchestrator sent for THIS txId:
-     *   1. EIP-712 signature recovers to provider DID
-     *   2. `acceptMessage.txId === txId`
-     *   3. `acceptMessage.inReplyTo === keccak(stored counter)`
-     *   4. `acceptMessage.acceptedAmount === storedCounter.counterAmount`
-     *
-     * Throws on any mismatch. Without these checks a malicious peer could
-     * pose as the provider and trick the buyer into committing at any
-     * price, since the previous (string-only) API trusted the caller.
-     *
-     * Wakes any negotiation round waiting on counter acceptance for this txId.
+     * Drains the queue first so messages buffered while we were busy
+     * processing the previous round are picked up immediately.
      */
-    setCounterAccepted(txId: string, acceptMessage: CounterAcceptMessage): Promise<void>;
+    private _waitForNextMessage;
     /**
      * Execute the full negotiation flow.
      */
     negotiate(config?: OrchestratorConfig): Promise<NegotiationResult>;
     private _negotiate;
     /**
-     * Run a negotiation decision for a single incoming provider quote.
-     * Called ONLY when the caller has pushed in a signed QuoteMessage via
-     * setReceivedQuote and the tx has reached QUOTED on-chain.
+     * Run the multi-round AIP-2.1 negotiation flow for one provider/txId.
+     *
+     * Channel-driven: this method never reads `setReceivedQuote` state;
+     * all inbound messages flow through the orchestrator's NegotiationChannel
+     * subscription (opened in `_negotiate` after createTransaction).
+     *
+     * Inner loop walks up to `policy.negotiation.rounds_per_provider`
+     * counter exchanges:
      *
-     * Returns `{ done: true, success: bool, reason }` when a terminal
-     * decision is reached (accept landed COMMITTED, or candidate rejected).
-     * Returns `{ done: false }` when the caller should fall through to the
-     * existing fixed-price flow (verification failed, missing negotiation
-     * context, etc).
+     *   await first quote (channel)
+     *   for round in 0..rounds_per_provider:
+     *     evaluate(currentQuote, roundsUsedSoFar = round)
+     *     accept  → on-chain acceptQuote+linkEscrow, return success
+     *     reject  → on-chain CANCELLED, return failure
+     *     counter → channel.post(counter), await NEXT message:
+     *               counteraccept → bind to last counter, on-chain accept+link, return success
+     *               new quote     → currentQuote = new quote, loop
+     *               timeout       → on-chain CANCELLED, return failure
+     *
+     * Returns `{done: false}` when the channel has no quote but the tx
+     * reached QUOTED via raw transitionState (legacy flow caller wants
+     * to fall through to fixed-price). Returns `{done: true, success?,
+     * reason?}` for any terminal outcome.
      */
     private _runNegotiationRound;
-    /** Resolve when setCounterAccepted(txId, …) is called, or on timeout. */
-    private _waitForCounterAcceptance;
+    /**
+     * Shared accept+linkEscrow with atomic rollback. Used by both the
+     * "accept the quote" and "accept the counter" terminal branches.
+     */
+    private _commitAtAmount;
     /**
      * Free per-tx negotiation state at terminal outcomes (accept commits,
-     * reject CANCELLED, timeout). Long-running daemon-style runners would
-     * otherwise leak both maps unbounded as txIds accumulate.
+     * reject CANCELLED, timeout). Closes the channel subscription too so
+     * long-running daemon callers don't leak inbound-message resolvers.
      *
      * Idempotent — safe to call from multiple cleanup sites.
      */

package/dist/negotiation/BuyerOrchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BuyerOrchestrator.d.ts","sourceRoot":"","sources":["../../src/negotiation/BuyerOrchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuyerOrchestrator.d.ts","sourceRoot":"","sources":["../../src/negotiation/BuyerOrchestrator.ts"],"names":[],"mappings":"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"}