@dvmkit/sdk 0.14.1 → 0.15.0

package/dist/{chunk-JFH34P3M.js → chunk-ZJRGORJ3.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-XRLKGCAW.js";
 import {
   x402EarnedCeiling
-} from "./chunk-ITRSITFP.js";
+} from "./chunk-2I6NXIPG.js";
 import {
   createX402FacilitatorAuthHeaders,
   createX402FacilitatorClient,
@@ -14,13 +14,13 @@ import {
   verifyWithFacilitator,
   withPaymentDiagnostics,
   withPaymentStage
-} from "./chunk-E7ZBCT5U.js";
+} from "./chunk-I2H2XYQV.js";
 import {
   MemoryCreditLedger
-} from "./chunk-TKJBUFYY.js";
+} from "./chunk-33J3NQDZ.js";
 import {
   PostgresJobStore
-} from "./chunk-TWKQFIOW.js";
+} from "./chunk-YMMCRQ2H.js";
 import {
   SIGNED_ENVELOPE_FIELDS,
   SignedRequestError,
@@ -28,7 +28,7 @@ import {
   humanizeZodIssues,
   signedRequestInput,
   zodIssuesOf
-} from "./chunk-HULU2UVM.js";
+} from "./chunk-ZO2ZAPG3.js";
 import {
   MemoryJobStore,
   UNCAPPABLE_ASK_TOTAL,
@@ -37,21 +37,26 @@ import {
   isJobRetentionStore,
   isReceiptIssuingStore,
   isStreamableJobStore
-} from "./chunk-KJZVTWMX.js";
+} from "./chunk-PKLNMMKF.js";
 import {
   ContentHoldError,
   JobCancelledError,
   abortJob,
   baselineContentExpiry,
+  callerDeadline,
   contentMetadata,
   fromJobRecord,
+  hasCallerDeadline,
+  holdJobHistory,
   isContentHoldStore,
   isTerminal,
   isYieldMessage,
   localMessage,
   providerMessage,
-  toJobRecord
-} from "./chunk-AFV77S4C.js";
+  releaseJobHistory,
+  toJobRecord,
+  visibleJobMessages
+} from "./chunk-KVKJ7R5V.js";
 import {
   ADMIN_AUTH_CLOCK_SKEW_SECONDS,
   ADMIN_AUTH_NONCE_TTL_SECONDS,
@@ -73,7 +78,7 @@ import {
   receiptPubkeyFromSecret,
   toLockPubkey,
   verifyChallenge
-} from "./chunk-5JSPTVIK.js";
+} from "./chunk-LZFZGY7L.js";
 import {
   X402_BATCH_SETTLEMENT_SCHEME,
   X402_DEFAULT_FACILITATOR,
@@ -100,7 +105,7 @@ import {
 } from "./chunk-SXL44PL5.js";
 import {
   createConsoleLogger
-} from "./chunk-7KQLPVV7.js";
+} from "./chunk-7NZRJPEP.js";
 import {
   StepCache
 } from "./chunk-BQJIFRAZ.js";
@@ -117,7 +122,7 @@ import {
   roundUsd,
   satsToFiat,
   validateCurrency
-} from "./chunk-LDKV4UHI.js";
+} from "./chunk-CVT5LTAK.js";
 import {
   CreditLedger,
   CreditLedgerError,
@@ -133,7 +138,7 @@ import {
   isNonChannelBitcoinRail,
   netOwedSats,
   x402SettlementPending
-} from "./chunk-A2YESDQM.js";
+} from "./chunk-LM6E4YHQ.js";
 import {
   parseStoreValue
 } from "./chunk-YG7G4DPZ.js";
@@ -151,7 +156,7 @@ import {
 } from "./chunk-5UC7TOQC.js";
 import {
   withPostgresRecoveryContext
-} from "./chunk-EP7OVWI5.js";
+} from "./chunk-FOXGN4KQ.js";
 import {
   DvmError,
   x402NetworkByCaip2
@@ -169,17 +174,17 @@ import {
   installHostedTempoCloseGuard,
   isTempoInsufficientFundsError,
   resolveTempoNetwork
-} from "./chunk-JLT2YIBS.js";
+} from "./chunk-GB2N4NG5.js";
 import {
   loggers,
   pinDimension,
   withSpan,
   withTraceContext
-} from "./chunk-HNXMWHLU.js";
+} from "./chunk-R7FH7SHX.js";
 import {
   createDiagnosticCapabilityAuthority,
   diagnosticConsole
-} from "./chunk-Z4FOPROB.js";
+} from "./chunk-BAHZK334.js";
 
 // src/sdk/server/lock-pubkey-store.ts
 async function initLockPubkeyTable(db) {
@@ -3181,6 +3186,26 @@ function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 
+// src/sdk/server/upfront-payment.ts
+function upfrontPaymentFromDraw(draw) {
+  const value = draw.railValue;
+  const rail = value.rail;
+  return {
+    amount_msats: value.drawMsats,
+    ...value.creditCurrency !== null && {
+      amount_micro: draw.amountMicro,
+      currency: value.creditCurrency
+    },
+    ...rail === "cashu" || rail === "x402" || rail === "tempo" || rail === "lightning" ? { rail } : {},
+    ...value.drawNative !== null && value.nativeAsset !== null && {
+      native_amount: value.drawNative,
+      native_asset: value.nativeAsset
+    },
+    credit_id: draw.creditId,
+    draw_id: draw.drawId
+  };
+}
+
 // src/sdk/server/payment-diagnostics.ts
 import { Errors } from "mppx";
 function paymentFailureFields(error) {
@@ -3560,7 +3585,18 @@ async function issueUpfrontChallenges(mpp, requiredMsats, resourcePath, btcUsdRa
   );
 }
 async function verifyUpfrontPayment(opts) {
-  return withPaymentDiagnostics(() => verifyUpfrontPaymentInScope(opts));
+  const result = await withPaymentDiagnostics(() => verifyUpfrontPaymentInScope(opts));
+  if (!result.error && !result.replayedDraw && !result.upfrontPayment && !opts.fundOnly) {
+    result.upfrontPayment = {
+      amount_msats: result.paidMsats,
+      ...result.paymentRail && { rail: result.paymentRail },
+      ...result.nativeAmount !== void 0 && result.nativeAsset !== void 0 && {
+        native_amount: result.nativeAmount,
+        native_asset: result.nativeAsset
+      }
+    };
+  }
+  return result;
 }
 async function verifyUpfrontPaymentInScope(opts) {
   const {
@@ -3892,7 +3928,7 @@ async function verifyUpfrontPaymentInScope(opts) {
           x402Requirements
         });
       }
-      const { verifyX402Payment } = await import("./x402-RUJ4LUKF.js");
+      const { verifyX402Payment } = await import("./x402-AY6P5KV4.js");
       const receipt = await withPaymentStage("verifier_broadcast", () => verifyX402Payment(
         x402Payment,
         x402Config,
@@ -4328,7 +4364,8 @@ async function verifyUpfrontPaymentInScope(opts) {
         creditId: draw.creditId,
         drawId: draw.drawId,
         drawAmountMicro: draw.amountMicro,
-        creditCurrency: ledgerCtx.priceFiat.currency
+        creditCurrency: ledgerCtx.priceFiat.currency,
+        upfrontPayment: upfrontPaymentFromDraw(draw)
       };
     } catch (err) {
       if (err instanceof CreditLedgerError) return creditLedgerErrorResult(err, x402Requirements);
@@ -4916,7 +4953,7 @@ async function verifyIncomingPaymentInScope(body, opts, snapshot) {
           snapshot
         });
       }
-      const { verifyX402Payment } = await import("./x402-RUJ4LUKF.js");
+      const { verifyX402Payment } = await import("./x402-AY6P5KV4.js");
       const receipt = await withPaymentStage("verifier_broadcast", () => verifyX402Payment(
         body.content.x402_payment,
         opts.x402Config,
@@ -5155,7 +5192,9 @@ async function verifyIncomingPaymentInScope(body, opts, snapshot) {
       };
     }
   }
-  return {};
+  return { error: { status: 402, body: paymentErrorBody("payment_invalid", {
+    message: "Payment method is not configured"
+  }) } };
 }
 function midJobFundedMsats(snapshot, railMsats) {
   const pending = snapshot.pendingPaymentMsats ?? 0;
@@ -5365,7 +5404,7 @@ async function processIncomingPaymentInScope(job, body, opts) {
     try {
       const requiredMsats = job.pendingPaymentMsats ?? 0;
       const requiredUsdcMicro = job.pendingX402AmountUsdcMicro !== void 0 ? BigInt(job.pendingX402AmountUsdcMicro) : BigInt(msatsToUsdc(requiredMsats, rate));
-      const { verifyX402Payment } = await import("./x402-RUJ4LUKF.js");
+      const { verifyX402Payment } = await import("./x402-AY6P5KV4.js");
       const receipt = await withPaymentStage("verifier_broadcast", () => verifyX402Payment(
         body.content.x402_payment,
         opts.x402Config,
@@ -5964,7 +6003,8 @@ function withDrawBasis(info, ctx, committed) {
   const withDraw = {
     ...base2,
     drawId,
-    drawAmountMicro: draw.amountMicro
+    drawAmountMicro: draw.amountMicro,
+    ...!ctx.midJob && !ctx.fundOnly && { upfrontPayment: upfrontPaymentFromDraw(draw) }
   };
   if (!ctx.drawBasis) return withDraw;
   const { drawMsats, drawNative } = committed.added ?? draw.railValue;
@@ -12514,6 +12554,12 @@ function buildContext(job, opts) {
       log.error("Terminal handling failed", { error: String(err) });
     });
   };
+  let replayPrompts;
+  const captureReplayPrompts = () => {
+    if (replayPrompts === void 0 && job.replayHighSeq !== null) {
+      replayPrompts = job.messages.filter((m) => m.from === "provider" && m.type === "prompt" && m.seq <= job.replayHighSeq);
+    }
+  };
   let creditedToHandlerMsats = 0;
   let creditedToHandlerMicro = 0;
   let poolBasis = false;
@@ -12521,6 +12567,7 @@ function buildContext(job, opts) {
   let declaredCostCurrency;
   let declaredCostRevision = 0;
   let costPoisoned = false;
+  const stepWrites = /* @__PURE__ */ new Map();
   const stepCostOwner = {};
   const declareCost = (declared) => {
     if (terminated("cost")) return;
@@ -12576,29 +12623,41 @@ function buildContext(job, opts) {
     },
     sendMessage: (type, content) => {
       if (terminated("sendMessage")) return;
+      if (type === "payment-request" && typeof content.amount_msats === "number") job.pendingPaymentMsats = content.amount_msats;
       providerMessage(job, type, content);
+      if ((type === "prompt" || type === "payment-request") && opts.onYield) {
+        void opts.onYield().catch((err) => {
+          log.error("Failed to persist event-driven wait", { error: String(err) });
+        });
+      }
     },
     prompt: (id, text, promptOpts) => {
       if (terminated("prompt")) {
         return Promise.reject(new JobCancelledError(`Job already ${job.status}`));
       }
       job.status = "awaiting-input";
-      providerMessage(job, "prompt", {
-        id,
-        text,
-        ...promptOpts?.options && { options: promptOpts.options },
-        ...promptOpts?.schema && { schema: promptOpts.schema }
-      });
-      if (job.replayHighSeq !== null) {
+      captureReplayPrompts();
+      const originalIndex = replayPrompts?.findIndex((m) => m.type === "prompt" && m.content.id === id) ?? -1;
+      const original = originalIndex < 0 ? void 0 : replayPrompts.splice(originalIndex, 1)[0];
+      if (original) {
+        if (job.replayProviderSkip > 0) job.replayProviderSkip--;
         const response = job.messages.find(
-          (m) => m.type === "response" && m.from === "requester" && m.content.prompt_id === id
+          (m) => m.type === "response" && m.from === "requester" && m.content.prompt_id === id && m.seq > original.seq
         );
         if (response) {
-          job.status = "processing";
+          job.status = job.pendingPrompts.size > 0 || job.pendingPayment ? "awaiting-input" : "processing";
+          opts.onCallerResume?.();
           return Promise.resolve(response.content);
         }
+      } else {
         job.replayHighSeq = null;
         job.replayProviderSkip = 0;
+        providerMessage(job, "prompt", {
+          id,
+          text,
+          ...promptOpts?.options && { options: promptOpts.options },
+          ...promptOpts?.schema && { schema: promptOpts.schema }
+        });
       }
       const p = new Promise((resolve, reject) => {
         job.pendingPrompts.set(id, { resolve, reject });
@@ -12611,6 +12670,7 @@ function buildContext(job, opts) {
       return p;
     },
     requestPayment: async (amount, reason, payOpts) => {
+      captureReplayPrompts();
       if (terminated("requestPayment")) {
         throw new JobCancelledError(`Job already ${job.status}`);
       }
@@ -12719,135 +12779,153 @@ function buildContext(job, opts) {
             poolRemainingMicro: pool.amountMicro - creditedToHandlerMicro
           } : { poolRemaining: job.paidMsats - creditedToHandlerMsats }
         });
+        if (job.replayHighSeq !== null) {
+          job.status = job.pendingPrompts.size > 0 ? "awaiting-input" : "processing";
+          opts.onCallerResume?.();
+        }
         advanceReplayPaymentIndex(job);
         return { amount_msats: amountMsats };
       }
-      const pendingFiat = await pinAsk();
+      const replayedPaymentRequest = job.replayHighSeq !== null && job.replayPaymentIndex >= job.messages.filter((m) => m.from === "requester" && m.type === "payment").length ? job.messages.findLast((m) => m.from === "provider" && m.type === "payment-request" && m.seq <= job.replayHighSeq && m.seq > (job.messages.findLast((message) => message.from === "requester" && message.type === "payment")?.seq ?? -1)) : void 0;
+      const originalAsk = replayedPaymentRequest?.type === "payment-request" ? replayedPaymentRequest.content : void 0;
+      if (originalAsk) amountMsats = originalAsk.amount_msats;
+      const pendingFiat = originalAsk ? originalAsk.credit ? { amountMicro: originalAsk.credit.amount_micro, currency: originalAsk.credit.currency } : void 0 : await pinAsk();
       job.pendingPaymentMsats = amountMsats;
       job.pendingPaymentFiatMicro = pendingFiat?.amountMicro;
       job.pendingPaymentFiatCurrency = pendingFiat?.currency;
-      const paymentRequestContent = {
-        amount_msats: amountMsats,
-        reason,
-        ...pendingFiat && { credit: { amount_micro: pendingFiat.amountMicro, currency: pendingFiat.currency } },
-        ...fiatAmount && { fiat_amount: fiatAmount },
-        ...payOpts?.mints && { mints: payOpts.mints },
-        ...payOpts?.minLocktimeSeconds && { min_locktime_seconds: payOpts.minLocktimeSeconds },
-        ...!payOpts?.mints && opts.mints && { mints: opts.mints }
-      };
-      let paymentRate;
-      let x402Nonce;
-      let x402AmountUsdcMicro;
-      const hasExplicitX402 = Boolean(payOpts?.x402);
-      if ((opts.pricingCurrency ?? "usd") === "usd") {
-        if (payOpts?.x402) {
-          paymentRequestContent.x402 = payOpts.x402;
-        } else if (opts.paymentMethods?.includes("x402") && opts.x402 && (opts.x402FacilitatorHealth?.support().available ?? true)) {
-          paymentRequestContent.x402 = {
-            pay_to: opts.x402.payTo,
-            network: opts.x402.network,
-            asset: opts.x402.asset ?? "USDC",
-            ...opts.x402.facilitator && { facilitator: opts.x402.facilitator }
-          };
-        }
-      }
-      if (paymentRequestContent.x402) {
-        paymentRate = (await resolveServerBtcUsdRate(opts.fxFetcher)).rate;
-        x402Nonce = `0x${randomBytes3(32).toString("hex")}`;
-        x402AmountUsdcMicro = msatsToUsdc(amountMsats, paymentRate).toString();
-        const x402Request = paymentRequestContent.x402;
-        const challengeConfig = {
-          payTo: x402Request.pay_to,
-          network: x402Request.network,
-          ...x402Request.asset ? { asset: x402Request.asset } : {},
-          ...x402Request.facilitator ? { facilitator: x402Request.facilitator } : {}
+      let paymentRequestContent;
+      if (originalAsk) {
+        paymentRequestContent = { ...originalAsk };
+        job.pendingX402Nonce = originalAsk.x402?.nonce;
+        job.pendingX402AmountUsdcMicro = originalAsk.x402?.required_usdc_micro;
+        job.pendingMppChallengeIds = originalAsk.tempo?.challenges.map((challenge) => challenge.id);
+      } else {
+        paymentRequestContent = {
+          amount_msats: amountMsats,
+          reason,
+          ...pendingFiat && { credit: { amount_micro: pendingFiat.amountMicro, currency: pendingFiat.currency } },
+          ...fiatAmount && { fiat_amount: fiatAmount },
+          ...payOpts?.mints && { mints: payOpts.mints },
+          ...payOpts?.minLocktimeSeconds && { min_locktime_seconds: payOpts.minLocktimeSeconds },
+          ...!payOpts?.mints && opts.mints && { mints: opts.mints }
         };
-        Object.assign(x402Request, {
-          nonce: x402Nonce,
-          required_usdc_micro: x402AmountUsdcMicro,
-          ...hasExplicitX402 || (opts.x402FacilitatorHealth?.support().exact.v2 ?? true) ? {
-            payment_required: buildPaymentRequiredV2({
-              x402Config: challengeConfig,
-              requiredUsdcMicro: BigInt(x402AmountUsdcMicro),
-              resource: `/v1/job/${job.id}/messages`,
-              description: reason
-            })
-          } : {}
-        });
-      }
-      job.pendingX402Nonce = x402Nonce;
-      job.pendingX402AmountUsdcMicro = x402AmountUsdcMicro;
-      let mppChallengeIds;
-      if (payOpts?.mpp) {
-        const challenges = payOpts.mpp.challenges.filter((c) => c.intent !== "session");
-        if (challenges.length > 0) {
-          paymentRequestContent.tempo = { challenges };
-          mppChallengeIds = challenges.map((c) => c.id);
+        let paymentRate;
+        let x402Nonce;
+        let x402AmountUsdcMicro;
+        const hasExplicitX402 = Boolean(payOpts?.x402);
+        if ((opts.pricingCurrency ?? "usd") === "usd") {
+          if (payOpts?.x402) {
+            paymentRequestContent.x402 = payOpts.x402;
+          } else if (opts.paymentMethods?.includes("x402") && opts.x402 && (opts.x402FacilitatorHealth?.support().available ?? true)) {
+            paymentRequestContent.x402 = {
+              pay_to: opts.x402.payTo,
+              network: opts.x402.network,
+              asset: opts.x402.asset ?? "USDC",
+              ...opts.x402.facilitator && { facilitator: opts.x402.facilitator }
+            };
+          }
         }
-      } else if (opts.paymentMethods?.includes("tempo") && opts.mpp) {
-        const rate = paymentRate ?? (await resolveServerBtcUsdRate(opts.fxFetcher)).rate;
-        const challenges = [];
-        for (const m of opts.mpp.methods) {
-          const meta = m;
-          if (meta.intent === "session") continue;
-          const amount2 = pendingFiat?.currency === "usd" ? fiatMicroToMethodAmount(pendingFiat.amountMicro, meta.name) : msatsToMethodAmount(amountMsats, meta.name, rate);
-          const ch = await opts.mpp.issueChallenge(meta.name, meta.intent, {
-            amount: amount2,
-            description: reason
+        if (paymentRequestContent.x402) {
+          paymentRate = (await resolveServerBtcUsdRate(opts.fxFetcher)).rate;
+          x402Nonce = `0x${randomBytes3(32).toString("hex")}`;
+          x402AmountUsdcMicro = msatsToUsdc(amountMsats, paymentRate).toString();
+          const x402Request = paymentRequestContent.x402;
+          const challengeConfig = {
+            payTo: x402Request.pay_to,
+            network: x402Request.network,
+            ...x402Request.asset ? { asset: x402Request.asset } : {},
+            ...x402Request.facilitator ? { facilitator: x402Request.facilitator } : {}
+          };
+          Object.assign(x402Request, {
+            nonce: x402Nonce,
+            required_usdc_micro: x402AmountUsdcMicro,
+            ...hasExplicitX402 || (opts.x402FacilitatorHealth?.support().exact.v2 ?? true) ? {
+              payment_required: buildPaymentRequiredV2({
+                x402Config: challengeConfig,
+                requiredUsdcMicro: BigInt(x402AmountUsdcMicro),
+                resource: `/v1/job/${job.id}/messages`,
+                description: reason
+              })
+            } : {}
           });
-          challenges.push(ch);
         }
-        if (challenges.length > 0) {
-          paymentRequestContent.tempo = { challenges };
-          mppChallengeIds = challenges.map((c) => c.id);
+        job.pendingX402Nonce = x402Nonce;
+        job.pendingX402AmountUsdcMicro = x402AmountUsdcMicro;
+        let mppChallengeIds;
+        if (payOpts?.mpp) {
+          const challenges = payOpts.mpp.challenges.filter((c) => c.intent !== "session");
+          if (challenges.length > 0) {
+            paymentRequestContent.tempo = { challenges };
+            mppChallengeIds = challenges.map((c) => c.id);
+          }
+        } else if (opts.paymentMethods?.includes("tempo") && opts.mpp) {
+          const rate = paymentRate ?? (await resolveServerBtcUsdRate(opts.fxFetcher)).rate;
+          const challenges = [];
+          for (const m of opts.mpp.methods) {
+            const meta = m;
+            if (meta.intent === "session") continue;
+            const amount2 = pendingFiat?.currency === "usd" ? fiatMicroToMethodAmount(pendingFiat.amountMicro, meta.name) : msatsToMethodAmount(amountMsats, meta.name, rate);
+            const ch = await opts.mpp.issueChallenge(meta.name, meta.intent, {
+              amount: amount2,
+              description: reason
+            });
+            challenges.push(ch);
+          }
+          if (challenges.length > 0) {
+            paymentRequestContent.tempo = { challenges };
+            mppChallengeIds = challenges.map((c) => c.id);
+          }
         }
+        job.pendingMppChallengeIds = mppChallengeIds;
       }
-      job.pendingMppChallengeIds = mppChallengeIds;
       if (job.replayHighSeq !== null) {
-        const payments = job.messages.filter((m) => m.type === "payment" && m.from === "requester");
+        const payments = job.messages.filter((m) => m.type === "payment" && m.from === "requester" && m.seq <= job.replayHighSeq);
         if (job.replayPaymentIndex < payments.length) {
           const payment = payments[job.replayPaymentIndex];
           job.replayPaymentIndex++;
           const balance = payment.content.credit;
           const accepted = balance ? await opts.acceptedBalancePayment?.(payment.seq, pendingFiat?.amountMicro, pendingFiat?.currency) : job.reactivationPaymentApplied === true;
           if (!accepted) throw new Error("[internal_error] payment replay reached without credit");
-          if (balance) {
-            job.pendingPaymentMsats = void 0;
-            job.pendingPaymentFiatMicro = void 0;
-            job.pendingPaymentFiatCurrency = void 0;
-            job.pendingMppChallengeIds = void 0;
-            job.pendingX402Nonce = void 0;
-            job.pendingX402AmountUsdcMicro = void 0;
-          }
-          job.status = "processing";
+          job.pendingPaymentMsats = void 0;
+          job.pendingPaymentFiatMicro = void 0;
+          job.pendingPaymentFiatCurrency = void 0;
+          job.pendingMppChallengeIds = void 0;
+          job.pendingX402Nonce = void 0;
+          job.pendingX402AmountUsdcMicro = void 0;
+          job.status = job.pendingPrompts.size > 0 ? "awaiting-input" : "processing";
+          opts.onCallerResume?.();
           creditedToHandlerMsats += amountMsats;
           creditedToHandlerMicro += pendingFiat?.amountMicro ?? 0;
           return payment.content;
         }
-        job.replayHighSeq = null;
-        job.replayProviderSkip = 0;
+        if (!originalAsk) {
+          job.replayHighSeq = null;
+          job.replayProviderSkip = 0;
+        }
       }
-      const askedTotal = accumulateAskedTopUp(
-        {
-          micro: job.askedTopUpMicro,
-          currency: job.askedTopUpCurrency,
-          reason: job.topUpCapUnenforcedReason
-        },
-        { micro: pendingFiat?.amountMicro, currency: pendingFiat?.currency }
-      );
-      job.askedTopUpMicro = askedTotal.micro;
-      job.askedTopUpCurrency = askedTotal.currency;
-      if (askedTotal.reason && !job.topUpCapUnenforcedReason) {
-        job.topUpCapUnenforcedReason = askedTotal.reason;
-        loggers.isolate.warn("dvm.topup_cap_unenforceable", {
-          job_id: job.id,
-          reason: askedTotal.reason,
-          ask_currency: askCurrency,
-          ask_msats: amountMsats
-        });
+      if (!originalAsk) {
+        const askedTotal = accumulateAskedTopUp(
+          {
+            micro: job.askedTopUpMicro,
+            currency: job.askedTopUpCurrency,
+            reason: job.topUpCapUnenforcedReason
+          },
+          { micro: pendingFiat?.amountMicro, currency: pendingFiat?.currency }
+        );
+        job.askedTopUpMicro = askedTotal.micro;
+        job.askedTopUpCurrency = askedTotal.currency;
+        if (askedTotal.reason && !job.topUpCapUnenforcedReason) {
+          job.topUpCapUnenforcedReason = askedTotal.reason;
+          loggers.isolate.warn("dvm.topup_cap_unenforceable", {
+            job_id: job.id,
+            reason: askedTotal.reason,
+            ask_currency: askCurrency,
+            ask_msats: amountMsats
+          });
+        }
       }
       job.status = "awaiting-input";
-      providerMessage(job, "payment-request", paymentRequestContent);
+      if (!originalAsk) providerMessage(job, "payment-request", paymentRequestContent);
       const paidMsatsAtYield = job.paidMsats;
       const p = new Promise((resolve, reject) => {
         let resolved = false;
@@ -12865,6 +12943,9 @@ function buildContext(job, opts) {
             if (resolved) return;
             job.pendingPayment = null;
           }
+          job.replayHighSeq = null;
+          job.replayProviderSkip = 0;
+          opts.onCallerResume?.();
           resolved = true;
           cleanup();
           creditedToHandlerMsats += amountMsats;
@@ -12970,6 +13051,7 @@ function buildContext(job, opts) {
     cost: declareCost,
     step: async (id, fn) => {
       if (job.stepCache.has(id)) {
+        await stepWrites.get(id);
         const record = job.stepCache.getRecord(id);
         for (const declared of record.costs ?? []) declareCost(declared);
         return record.value;
@@ -12982,6 +13064,15 @@ function buildContext(job, opts) {
         fn
       );
       job.stepCache.set(id, result, costs);
+      if (opts.onStep) {
+        const persistence = opts.onStep(job.stepCache.getRecord(id));
+        stepWrites.set(id, persistence);
+        try {
+          await persistence;
+        } finally {
+          stepWrites.delete(id);
+        }
+      }
       return result;
     },
     state: job.state,
@@ -13008,7 +13099,7 @@ function warnPinLost(jobId, currency, amountMsats, reason, detail) {
 }
 function advanceReplayPaymentIndex(job) {
   if (job.replayHighSeq === null) return;
-  const payments = job.messages.filter((m) => m.type === "payment" && m.from === "requester");
+  const payments = job.messages.filter((m) => m.type === "payment" && m.from === "requester" && m.seq <= job.replayHighSeq);
   if (job.replayPaymentIndex < payments.length) {
     job.replayPaymentIndex++;
   }
@@ -13421,6 +13512,7 @@ var JobManager = class {
   // Bind live resolvers and recovery scaffolds to the store-allocated ask identity.
   paymentAskSeqs = /* @__PURE__ */ new WeakMap();
   reactivationAskSeqs = /* @__PURE__ */ new WeakMap();
+  pendingPaymentMessages = /* @__PURE__ */ new WeakMap();
   // Every local input resume holds this queue through its durable wait update.
   // A prompt response and a payment NOTIFY must not mistake each other for a
   // different machine's successful claim.
@@ -13746,6 +13838,7 @@ var JobManager = class {
       status: "processing",
       messages: [],
       seq: 0,
+      upfrontPayment: payment.upfrontPayment ? structuredClone(payment.upfrontPayment) : void 0,
       paidMsats: payment.paidMsats,
       paymentMint: payment.paymentMint,
       paymentRail: payment.paymentRail,
@@ -13929,8 +14022,10 @@ var JobManager = class {
         job.pendingPrompts.delete(rc.prompt_id);
         job.status = job.pendingPrompts.size > 0 || job.pendingPayment ? "awaiting-input" : "processing";
         if (job.status === "awaiting-input") await this.persistJob(job);
+        this.startIdleTimer(job);
         pending.resolve(rc);
       } else if (cap?.onResponse && ctx) {
+        this.startIdleTimer(job);
         await cap.onResponse(ctx, rc);
       }
     } else if (type === "payment") {
@@ -13950,6 +14045,7 @@ var JobManager = class {
           await pp.resolve(pc);
         });
       } else if (cap?.onPayment && ctx) {
+        this.startIdleTimer(job);
         await cap.onPayment(ctx, pc);
       }
     } else if (type === "approval" && cap?.onApproval && ctx) {
@@ -13994,7 +14090,7 @@ var JobManager = class {
     if (await this.adoptDurableTerminal(job)) return;
     const record = toJobRecord(job);
     if (isTerminal(job.status) && isStreamableJobStore(this.jobStore)) {
-      const durable = await this.jobStore.getMessages(job.id, 0);
+      const durable = await this.jobStore.getMessages(job.id, 0, { includeHeld: true });
       if (durable.length >= record.messages.length) {
         record.messages = durable;
         const highSeq = durable.length ? durable[durable.length - 1].seq : record.seq;
@@ -14298,9 +14394,10 @@ var JobManager = class {
       job.messageAppenderTail = next;
     };
   }
-  startIdleTimer(job) {
+  startIdleTimer(job, deadline = callerDeadline(job, this.descriptor.idleTimeout * 1e3)) {
     this.clearIdleTimer(job.id);
-    const timeoutMs = this.descriptor.idleTimeout * 1e3;
+    if (deadline === void 0) return;
+    const timeoutMs = Math.min(2147483647, Math.max(0, deadline - Date.now()));
     const timer = setTimeout(() => {
       void this.cancelJobIdle(job).catch(() => void 0);
     }, timeoutMs);
@@ -14316,7 +14413,7 @@ var JobManager = class {
   /** Cancel a job due to idle timeout. Exposed for the reactivation path's idle-expiry guard. */
   async cancelJobIdle(job) {
     if (isTerminal(job.status)) return;
-    const current = await this.jobStore.get(job.id).catch(() => void 0);
+    const current = await this.jobStore.get(job.id);
     if (current && isTerminal(current.status)) {
       const reason = `Job reached terminal status "${current.status}" elsewhere`;
       for (const [, p] of job.pendingPrompts) p.reject(new Error(reason));
@@ -14328,11 +14425,32 @@ var JobManager = class {
       this.scheduleCleanup(job);
       return;
     }
+    const waiting = current ?? job;
+    if (current && isStreamableJobStore(this.jobStore)) {
+      const messages = await this.jobStore.getMessages(job.id, 0);
+      if (messages.length) waiting.messages = messages;
+    }
+    const deadline = callerDeadline(waiting, this.descriptor.idleTimeout * 1e3);
+    if (deadline === void 0) {
+      this.clearIdleTimer(job.id);
+      return;
+    }
+    if (Date.now() < deadline) {
+      this.startIdleTimer(job, deadline);
+      return;
+    }
+    if (current && isStreamableJobStore(this.jobStore)) {
+      const claimed = await this.jobStore.cancelStaleJob(job.id, current.lastActivityAt, "Job timed out (idle)", "cancelled");
+      if (claimed) await this.finalizeStoredTerminal(job.id);
+      await this.adoptDurableTerminal(job);
+      if (!claimed && !isTerminal(job.status)) this.startIdleTimer(job, Date.now() + 1);
+      return;
+    }
     for (const [, p] of job.pendingPrompts) p.reject(new Error("Job timed out (idle)"));
     if (job.pendingPayment) job.pendingPayment.reject(new Error("Job timed out (idle)"));
     job.pendingPrompts.clear();
     job.pendingPayment = null;
-    job.endedBy = (current?.status ?? job.status) === "awaiting-input" ? "caller" : "provider";
+    job.endedBy = "caller";
     job.status = "cancelled";
     abortJob(job, "Job timed out (idle)");
     providerMessage(job, "cancel", { reason: "Job timed out (idle)" });
@@ -14345,8 +14463,11 @@ var JobManager = class {
    * • `awaiting-input` past `staleJobTimeoutMs` → `cancelled`
    * (`stale_no_terminal_status`) — the caller never paid / responded.
    * • `processing`/`working` past `processingWatchdogMs` → `failed`
-   * (`worker_died_mid_job`) — the worker died mid-job. The heartbeat keeps
-   * live workers fresh, so a stale row here means a dead process.
+   * (`worker_died_mid_job`) — the worker died mid-job. Before claiming a
+   * processing row, skip and heartbeat it if this manager still holds a live
+   * `processing`/`working` job. After a process pause, the sweep may run before
+   * the heartbeat timer; stale activity alone does not prove a local worker
+   * died. Superseded handlers leave `_activeJobs` and receive no protection.
    *
    * Fires on a timer (wired in the constructor) and also callable on demand
    * (tests, ops). The CAS in `cancelStaleJob` makes this safe to run
@@ -14354,6 +14475,8 @@ var JobManager = class {
    * JobManager owns so multi-mount hosts don't steal stuck rows from sibling
    * descriptors — the local activeJobs teardown only makes sense on the
    * JobManager that actually hosted the zombie handler.
+   * Local liveness prevents this manager's claim; the activity CAS continues
+   * to protect against other machines claiming a row refreshed after find.
    *
    * **Both cutoffs float off the wall clock.** Each is one
    * `Date.now()` sample compared against `last_activity_at`, stamped from a
@@ -14418,10 +14541,25 @@ var JobManager = class {
       );
       let swept = 0;
       for (const record of stale) {
-        const awaiting = record.status === "awaiting-input";
+        const messages = await this.jobStore.getMessages(record.id, 0);
+        const history = messages.length ? messages : record.messages;
+        const deadline = callerDeadline({ ...record, messages: history });
+        if (deadline !== void 0 && now < deadline) continue;
+        const orphanedInput = record.status === "awaiting-input" && deadline === void 0 && hasCallerDeadline(history);
+        const awaiting = deadline !== void 0 || record.status === "awaiting-input" && !orphanedInput;
         const terminalStatus = awaiting ? "cancelled" : "failed";
         const reason = awaiting ? "stale_no_terminal_status" : "worker_died_mid_job";
-        const expectedActivityBefore = awaiting ? awaitingThreshold : processingThreshold;
+        const expectedActivityBefore = awaiting && record.status === "awaiting-input" ? awaitingThreshold : processingThreshold;
+        if (expectedActivityBefore < 0 || record.lastActivityAt > expectedActivityBefore) continue;
+        const local = this._activeJobs.get(record.id);
+        if ((record.status === "processing" || record.status === "working") && local && (local.status === "processing" || local.status === "working")) {
+          await this.jobStore.heartbeatActiveJobs([record.id], Date.now());
+          diagnosticConsole.warn({
+            level: "stale_job_local_live_skipped",
+            ageMs: monoNow - record.lastActivityAt
+          });
+          continue;
+        }
         const claimed = await this.jobStore.cancelStaleJob(
           record.id,
           expectedActivityBefore,
@@ -15041,8 +15179,9 @@ var JobManager = class {
     }
   }
   /**
-   * Record an inbound client message durably via Tx B and append
-   * it to the in-memory `job.messages` array. Returns the DB-allocated seq
+   * Record an inbound client message durably via Tx B. Payments stay outside
+   * visible history until processPayment accepts them; other messages append
+   * to `job.messages` immediately. Returns the DB-allocated seq
    * (`null` when the store isn't streamable — non-Postgres test fallback).
    *
    * Status starts as `pending-verification`; a follow-up Tx C call
@@ -15061,13 +15200,24 @@ var JobManager = class {
       });
     }
     job.seq++;
-    job.messages.push({
+    const message = {
       seq: job.seq,
       from: "requester",
       timestamp,
       type: msgType,
       content: msgContent
-    });
+    };
+    if (msgType === "payment") {
+      let pending = this.pendingPaymentMessages.get(job);
+      if (!pending) {
+        pending = /* @__PURE__ */ new Map();
+        this.pendingPaymentMessages.set(job, pending);
+      }
+      pending.set(txSeq ?? msgContent, message);
+      holdJobHistory(job, message.seq);
+    } else {
+      job.messages.push(message);
+    }
     job.lastActivityAt = Date.now();
     return txSeq;
   }
@@ -15176,6 +15326,22 @@ var JobManager = class {
    * 500. See `creditInbound`.
    */
   async processPayment(job, body, inboundSeq, extra) {
+    const pending = this.pendingPaymentMessages.get(job);
+    const key = inboundSeq ?? body.content;
+    const message = pending?.get(key);
+    let accepted;
+    try {
+      const outcome = await this.processPaymentAndCredit(job, body, inboundSeq, extra);
+      if (!outcome.error && message && pending?.get(key) === message) {
+        accepted = message;
+      }
+      return outcome;
+    } finally {
+      pending?.delete(key);
+      if (message) releaseJobHistory(job, message.seq, accepted);
+    }
+  }
+  async processPaymentAndCredit(job, body, inboundSeq, extra) {
     if (body.type !== "payment") return {};
     const devAuto = this.opts.devMode === true && body.content.dev_auto === true && !hasPaymentProof(body.content);
     if (devAuto || devModeSkipsPaymentVerification(this.opts)) {
@@ -15260,7 +15426,7 @@ var JobManager = class {
       };
     }
     const info = verifyResult.verified;
-    if (!info) return {};
+    if (!info) return { error: { status: 402, body: { error: "payment_invalid", message: "Payment was not accepted" } } };
     const drawFundingReceipt = await this.drawFundingReceiptFor(info.drawFunding, info.funding?.currency);
     let unappliedCredit;
     const fullyUnapplied = info.unappliedMicro !== void 0 && info.funding !== void 0 && info.unappliedMicro >= info.funding.amountMicro;
@@ -15634,6 +15800,7 @@ var JobManager = class {
    */
   buildContextOpts(job) {
     const jobStore = this.jobStore;
+    job.idleTimeoutMs = this.descriptor.idleTimeout * 1e3;
     return {
       mints: this.opts.mints,
       store: this.opts.store,
@@ -15644,7 +15811,25 @@ var JobManager = class {
       mpp: this.opts.mpp,
       fxFetcher: this.opts.fxFetcher,
       onTerminal: () => this.handleJobTerminal(job),
-      onYield: () => this.persistJob(job),
+      onYield: () => {
+        this.startIdleTimer(job);
+        return this.persistJob(job);
+      },
+      onCallerResume: () => this.startIdleTimer(job),
+      onStep: jobStore.saveStep ? async (record) => {
+        for (let attempt = 0; ; attempt++) {
+          try {
+            await jobStore.saveStep(job.id, record);
+            return;
+          } catch {
+            if (attempt >= 2) {
+              diagnosticConsole.warn({ event: "step_persist_failed" });
+              return;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 50 * (attempt + 1)));
+          }
+        }
+      } : void 0,
       onPaymentResume: () => retryJobSnapshot(() => this.persistJob(job)),
       subscribeNotifications: isStreamableJobStore(jobStore) ? (cb) => jobStore.subscribeNotifications(job.id, cb) : void 0,
       acceptedBalancePayment: this.opts.db && jobStore instanceof PostgresJobStore ? async (seq, amountMicro, currency) => {
@@ -20829,7 +21014,7 @@ async function createDVMServer(descriptor, opts) {
       }
     }
     if (!opts.onJobCompleted && platformToken && platformUrl && dvmId && opts.db) {
-      const { RevenueReporter } = await import("./revenue-reporter-HD4GMXGD.js");
+      const { RevenueReporter } = await import("./revenue-reporter-RIEHBKRA.js");
       const reporter = new RevenueReporter(
         opts.db,
         platformUrl,
@@ -20839,7 +21024,7 @@ async function createDVMServer(descriptor, opts) {
       revenueReporter = reporter;
       await reporter.init();
       reporter.startRetryLoop();
-      const { MemoryX402BatchStore, PayoutReporter } = await import("./payout-reporter-NXWQVKXW.js");
+      const { MemoryX402BatchStore, PayoutReporter } = await import("./payout-reporter-DDQ7FGRC.js");
       payoutReporter = new PayoutReporter({
         dvmId,
         db: opts.db,
@@ -23150,7 +23335,6 @@ var DVMServer = class {
         );
       }
       const sdkCtx = jm.buildAndAttachContext(job, parsedInput);
-      jm.startIdleTimer(job);
       jm.runHandler(job, sdkCtx);
       await new Promise((resolve) => {
         setTimeout(resolve, 0);
@@ -23494,14 +23678,21 @@ var DVMServer = class {
     const job = this.jobManager.activeJobs.get(id);
     const after = Number(c.req.query("after") ?? "0");
     const accept = c.req.header("Accept") ?? "";
-    if (!job) {
-      const store = this.jobManager.store;
+    const store = this.jobManager.store;
+    if (job && !isJobOwner(c, job)) return c.json({ error: "Job not found" }, 404);
+    if (!job || isStreamableJobStore(store)) {
+      if (job) await job.messageAppenderTail;
       const record = await store.get(id);
       if (!record) return c.json({ error: "Job not found" }, 404);
       if (!isJobOwner(c, record)) return c.json({ error: "Job not found" }, 404);
-      const filtered = record.messages.filter((m) => m.seq > after);
+      const terminal = isTerminal(record.status) || job !== void 0 && isTerminal(job.status);
+      let filtered = record.messages.filter((m) => m.seq > after);
+      if (isStreamableJobStore(store)) {
+        const durable = await store.getMessages(id, after, { includeHeld: terminal });
+        if (durable.length > 0 || !terminal) filtered = durable;
+      }
       if (accept.includes("text/event-stream")) {
-        if (isStreamableJobStore(store) && !isTerminal(record.status)) {
+        if (isStreamableJobStore(store) && !terminal) {
           return streamSSE(c, async (stream) => {
             let unsubFn;
             await new Promise((resolve) => {
@@ -23564,10 +23755,6 @@ var DVMServer = class {
           }
         });
       }
-      if (isStreamableJobStore(store) && !isTerminal(record.status)) {
-        const msgs = await store.getMessages(id, after);
-        if (msgs.length > 0) return c.json(await this.messageFields(record, msgs));
-      }
       return c.json(await this.messageFields(record, filtered));
     }
     if (!isJobOwner(c, job)) return c.json({ error: "Job not found" }, 404);
@@ -23575,7 +23762,7 @@ var DVMServer = class {
       const fields = await this.contentFields(job);
       return streamSSE(c, async (stream) => {
         if (fields.content_available === false) return;
-        const existing = job.messages.filter((m) => m.seq > after);
+        const existing = visibleJobMessages(job).filter((m) => m.seq > after);
         let yielded = false;
         for (const msg of existing) {
           await stream.writeSSE({ data: JSON.stringify(msg), event: "message" });
@@ -23603,7 +23790,7 @@ var DVMServer = class {
         });
       });
     }
-    return c.json(await this.messageFields(job, job.messages.filter((m) => m.seq > after)));
+    return c.json(await this.messageFields(job, visibleJobMessages(job).filter((m) => m.seq > after)));
   }
   jobNotActiveResponse(c) {
     return c.json(
@@ -23697,7 +23884,6 @@ var DVMServer = class {
       } else {
         await jm.markInboundVerified(activeJob.id, inboundSeq2);
       }
-      jm.startIdleTimer(activeJob);
       try {
         await jm.dispatchMessage(activeJob, body2.type, body2.content);
         await this.persistMessageSnapshot(jm, activeJob, body2.type);
@@ -23794,11 +23980,13 @@ var DVMServer = class {
       ...unappliedCredit && { credit: unappliedCredit },
       ...drawFundingReceipt && { draw_funding_receipt: drawFundingReceipt }
     };
-    const elapsed = Date.now() - record.lastActivityAt;
-    if (elapsed >= this.descriptor.idleTimeout * 1e3) {
+    const deadline = callerDeadline(record, this.descriptor.idleTimeout * 1e3);
+    if (deadline !== void 0 && Date.now() >= deadline) {
       await jm.cancelJobIdle(job);
-      const lastMsg2 = job.messages[job.messages.length - 1];
-      return c.json({ seq: lastMsg2.seq, ...creditBlock }, 201);
+      if (isTerminal(job.status)) {
+        const lastMsg2 = job.messages[job.messages.length - 1];
+        return c.json({ seq: lastMsg2.seq, ...creditBlock }, 201);
+      }
     }
     jm.startIdleTimer(job);
     try {
@@ -23978,6 +24166,7 @@ function recordedDrawPayment(draw, opts) {
     ...rail === "cashu" ? { cashuFlow: "p2pk_accumulator" } : {},
     creditId: draw.creditId,
     drawId: draw.drawId,
+    upfrontPayment: upfrontPaymentFromDraw(draw),
     drawAmountMicro: draw.amountMicro,
     ...draw.railValue.creditCurrency ? { creditCurrency: draw.railValue.creditCurrency } : {}
   };
@@ -24063,6 +24252,7 @@ function removeUnavailableContent(fields) {
 }
 function terminalResponseFields(job) {
   const fields = {};
+  if (job.upfrontPayment !== void 0) fields.upfront_payment = job.upfrontPayment;
   if (job.status === "completed") {
     if (job.summary !== void 0) fields.summary = job.summary;
     const artifactCount = job.messages.filter((m) => m.type === "artifact").length;