@dvmkit/sdk 0.14.1 → 0.15.0

package/dist/{chunk-TWKQFIOW.js → chunk-YMMCRQ2H.js}

@@ -1,13 +1,15 @@
 import {
   ContentHoldError,
-  applyContentHoldMutation
-} from "./chunk-AFV77S4C.js";
+  applyContentHoldMutation,
+  callerDeadline,
+  hasCallerDeadline
+} from "./chunk-KVKJ7R5V.js";
 import {
   withSdkInitLock
 } from "./chunk-COYKJRMM.js";
 import {
   diagnosticConsole
-} from "./chunk-Z4FOPROB.js";
+} from "./chunk-BAHZK334.js";
 
 // src/sdk/server/postgres-job-store.ts
 import { createHash } from "crypto";
@@ -261,6 +263,7 @@ var PostgresJobStore = class {
       -- with a fund-and-draw response. INSERT-only for replay stability.
       ALTER TABLE jobs ADD COLUMN IF NOT EXISTS funding_receipt JSONB;
       ALTER TABLE jobs ADD COLUMN IF NOT EXISTS funding_credit JSONB;
+      ALTER TABLE jobs ADD COLUMN IF NOT EXISTS upfront_payment JSONB;
       -- the outstanding mid-job ask, denominated in fiat micro at the
       -- instant it was emitted. The top-up's ledger leg funds and grows the
       -- draw in this figure, so it must not move with the BTC/USD rate between
@@ -490,6 +493,18 @@ var PostgresJobStore = class {
     }
     held.client.release();
   }
+  async saveStep(jobId, record) {
+    const result = await this.pool.query(
+      `UPDATE jobs SET step_cache = CASE
+         WHEN EXISTS (SELECT 1 FROM jsonb_array_elements(step_cache) AS step
+                      WHERE step->>'id' = $2::jsonb->>'id') THEN step_cache
+         ELSE step_cache || jsonb_build_array($2::jsonb) END
+       WHERE id = $1 AND status NOT IN ('completed', 'failed', 'cancelled')
+         AND redacted_at IS NULL`,
+      [jobId, JSON.stringify(record)]
+    );
+    if (result.rowCount !== 1) throw new Error("Step persistence requires a live job");
+  }
   async save(record) {
     const dvmId = record[JOB_DVM_ID];
     for (let attempt = 0; ; attempt++) {
@@ -536,8 +551,8 @@ var PostgresJobStore = class {
         last_activity_at, next_seq, requester_token_hash, requester_token,
         request_fingerprint, requester_pubkey, request_id, credit_id, draw_id,
         pending_payment_fiat_micro, pending_payment_fiat_currency, auth_request_path,
-        funding_receipt, funding_credit, dvm_id, terminal_at_ms, caller_wait_ms, awaiting_input_at_ms, ended_by, timing_known
-      ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32,$33,$34,$35,$36,$37,$38,$39,$40,$41,$42,$43,$44,$45,$46,$47,$48,$49,$51)
+        funding_receipt, funding_credit, dvm_id, terminal_at_ms, caller_wait_ms, awaiting_input_at_ms, ended_by, timing_known, upfront_payment
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32,$33,$34,$35,$36,$37,$38,$39,$40,$41,$42,$43,$44,$45,$46,$47,$48,$49,$51,$52)
       ON CONFLICT (id) DO UPDATE SET
         terminal_at_ms = COALESCE(jobs.terminal_at_ms, EXCLUDED.terminal_at_ms),
         ended_by = CASE WHEN jobs.status IN ('completed', 'failed', 'cancelled') THEN jobs.ended_by ELSE EXCLUDED.ended_by END,
@@ -588,7 +603,17 @@ var PostgresJobStore = class {
         pending_x402_nonce = EXCLUDED.pending_x402_nonce,
         pending_x402_amount_usdc_micro = EXCLUDED.pending_x402_amount_usdc_micro,
         required_msats = EXCLUDED.required_msats,
-        step_cache = EXCLUDED.step_cache,
+        -- A stale snapshot must not erase a step committed by saveStep.
+        -- First stored result wins for each id, matching cached replay.
+        step_cache = (
+          SELECT COALESCE(jsonb_agg(entry ORDER BY position), '[]'::jsonb)
+          FROM (
+            SELECT DISTINCT ON (entry->>'id') entry, position
+            FROM jsonb_array_elements(jobs.step_cache || EXCLUDED.step_cache)
+              WITH ORDINALITY AS steps(entry, position)
+            ORDER BY entry->>'id', position
+          ) AS merged_steps
+        ),
         state = EXCLUDED.state,
         last_activity_at = CASE WHEN jobs.status IN ('completed', 'failed', 'cancelled') THEN jobs.last_activity_at ELSE EXCLUDED.last_activity_at END
       -- terminal is terminal. On a multi-machine DVM a DELETE can
@@ -666,7 +691,8 @@ var PostgresJobStore = class {
         record.status === "awaiting-input" ? record.awaitingInputAtMs ?? now : null,
         isTerminalStatus(record.status) && record.status !== "completed" ? record.endedBy ?? "provider" : null,
         now,
-        record.timingKnown ?? true
+        record.timingKnown ?? true,
+        record.upfrontPayment ? JSON.stringify(record.upfrontPayment) : null
       ]
     );
     let rowCount;
@@ -705,6 +731,7 @@ var PostgresJobStore = class {
       return;
     }
     if (record.status === "completed" || record.status === "failed" || record.status === "cancelled") {
+      await this.pool.query("SELECT pg_notify('job_messages', $1)", [record.id]).catch(() => void 0);
       await this.deleteResolvedMessages(record.id).catch(() => void 0);
     }
   }
@@ -1173,7 +1200,11 @@ var PostgresJobStore = class {
   }
   async markInboundFailed(jobId, seq, _reason) {
     await this.pool.query(
-      "UPDATE job_messages SET status='failed-verify' WHERE job_id = $1 AND seq = $2 AND status = 'pending-verification'",
+      `WITH failed AS (
+         UPDATE job_messages SET status='failed-verify'
+         WHERE job_id = $1 AND seq = $2 AND status = 'pending-verification'
+         RETURNING job_id
+       ) SELECT pg_notify('job_messages', job_id) FROM failed`,
       [jobId, seq]
     );
   }
@@ -1292,10 +1323,24 @@ var PostgresJobStore = class {
       if (subSet.size === 0) this.notifySubscribers.delete(jobId);
     });
   }
-  async getMessages(jobId, afterSeq) {
+  async getMessages(jobId, afterSeq, options) {
     const { rows } = await this.pool.query(
-      "SELECT data FROM job_messages WHERE job_id = $1 AND seq > $2 AND status = 'verified' ORDER BY seq",
-      [jobId, afterSeq]
+      `WITH terminal AS (
+         SELECT messages FROM jobs WHERE id = $1 AND status IN ('completed', 'failed', 'cancelled')
+       ), history AS (
+         SELECT seq, data, 0 AS origin FROM job_messages
+         WHERE job_id = $1 AND seq > $2 AND status = 'verified'
+           AND ($3::boolean OR EXISTS (SELECT 1 FROM terminal)
+             OR EXISTS (SELECT 1 FROM job_messages WHERE job_id = $1 AND status = 'verified'
+               AND data->>'from' = 'provider' AND data->>'type' IN ('complete', 'cancel'))
+             OR seq < COALESCE((SELECT MIN(seq) FROM job_messages
+               WHERE job_id = $1 AND status = 'pending-verification' AND data->>'type' = 'payment'), 9223372036854775807))
+         UNION ALL
+         SELECT (message->>'seq')::bigint, message, 1 AS origin
+         FROM terminal CROSS JOIN LATERAL jsonb_array_elements(terminal.messages) AS snapshot(message)
+         WHERE (message->>'seq')::bigint > $2
+       ) SELECT DISTINCT ON (seq) data FROM history ORDER BY seq, origin`,
+      [jobId, afterSeq, options?.includeHeld ?? false]
     );
     return rows.map((r) => typeof r.data === "string" ? JSON.parse(r.data) : r.data);
   }
@@ -1373,7 +1418,7 @@ var PostgresJobStore = class {
     try {
       await client.query("BEGIN");
       const { rows } = await client.query(
-        `SELECT next_seq FROM jobs
+        `SELECT * FROM jobs
          WHERE id = $1
            AND status IN ('processing', 'working', 'awaiting-input')
            ${staleOnly ? "AND last_activity_at <= $2" : ""}
@@ -1384,6 +1429,22 @@ var PostgresJobStore = class {
         await client.query("ROLLBACK");
         return false;
       }
+      let terminalMessages;
+      if (staleOnly) {
+        const record = rowToRecord(rows[0]);
+        const { rows: messages } = await client.query(
+          "SELECT data FROM job_messages WHERE job_id=$1 AND status='verified' ORDER BY seq",
+          [jobId]
+        );
+        const history = messages.length ? messages.map((row) => row.data) : record.messages;
+        terminalMessages = history;
+        const deadline = callerDeadline({ ...record, messages: history });
+        const awaiting = deadline !== void 0 || record.status === "awaiting-input" && !hasCallerDeadline(history);
+        if (terminalStatus === "cancelled" !== awaiting || deadline !== void 0 && Date.now() < deadline) {
+          await client.query("ROLLBACK");
+          return false;
+        }
+      }
       const nextSeq = rows[0].next_seq;
       const now = Date.now();
       const cancelMsg = {
@@ -1406,12 +1467,20 @@ var PostgresJobStore = class {
            awaiting_input_at_ms = NULL,
            status = $6,
            summary = COALESCE(summary, $2),
-           messages = COALESCE(messages, '[]'::jsonb) || $3::jsonb,
+           messages = ${staleOnly ? "$3::jsonb" : "COALESCE(messages, '[]'::jsonb) || $3::jsonb"},
            seq = $4,
            next_seq = $4 + 1,
            last_activity_at = $5
          WHERE id = $1`,
-        [jobId, reason, JSON.stringify([cancelMsg]), nextSeq, now, terminalStatus, endedBy]
+        [
+          jobId,
+          reason,
+          JSON.stringify([...terminalMessages ?? [], cancelMsg]),
+          nextSeq,
+          now,
+          terminalStatus,
+          staleOnly ? terminalStatus === "cancelled" ? "caller" : "provider" : endedBy
+        ]
       );
       await client.query("SELECT pg_notify('job_messages', $1)", [jobId]);
       await client.query("COMMIT");
@@ -1499,6 +1568,7 @@ function rowToRecord(row) {
     summary: row.summary,
     messages: row.messages,
     seq: row.seq,
+    upfrontPayment: row.upfront_payment ?? void 0,
     paidMsats: Number(row.paid_msats),
     paymentMint: row.payment_mint,
     paymentRail: row.payment_rail ?? void 0,