@dvmkit/sdk 0.5.0-rc.1 → 0.6.0-rc.1

package/dist/{chunk-EYTHFFFU.js → chunk-HHBDBMEO.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FYRR2UEZ.js";
 import {
   PostgresJobStore
-} from "./chunk-PB4FYZET.js";
+} from "./chunk-EQLA4FFY.js";
 import {
   parseStoreValue
 } from "./chunk-YG7G4DPZ.js";
@@ -25,24 +25,30 @@ import {
   humanizeZodIssues,
   signedRequestInput,
   zodIssuesOf
-} from "./chunk-Z4KLECAC.js";
+} from "./chunk-N5RZ5HVB.js";
 import {
-  JobCancelledError,
   MemoryJobStore,
   UNCAPPABLE_ASK_TOTAL,
-  abortJob,
   accumulateAskedTopUp,
   createInstrumentedFetch,
-  fromJobRecord,
   isJobRetentionStore,
   isReceiptIssuingStore,
-  isStreamableJobStore,
+  isStreamableJobStore
+} from "./chunk-IV6Q7NRW.js";
+import {
+  ContentHoldError,
+  JobCancelledError,
+  abortJob,
+  baselineContentExpiry,
+  contentMetadata,
+  fromJobRecord,
+  isContentHoldStore,
   isTerminal,
   isYieldMessage,
   localMessage,
   providerMessage,
   toJobRecord
-} from "./chunk-O5AT6S5T.js";
+} from "./chunk-AFV77S4C.js";
 import {
   ADMIN_AUTH_CLOCK_SKEW_SECONDS,
   ADMIN_AUTH_NONCE_TTL_SECONDS,
@@ -63,7 +69,7 @@ import {
   toLockPubkey,
   verifyCashuToken,
   verifyChallenge
-} from "./chunk-TUA7PYH7.js";
+} from "./chunk-OQA7IHI4.js";
 import {
   X402_BATCH_SETTLEMENT_SCHEME,
   X402_DEFAULT_FACILITATOR,
@@ -97,18 +103,20 @@ import {
   RAIL_REFUNDABLE,
   canonicalRequestPath,
   isZodSchema
-} from "./chunk-A4YFWZ7R.js";
+} from "./chunk-RCM3P2HE.js";
 import {
   canonicalize
 } from "./chunk-OFVV37XC.js";
 import {
-  StepCache,
   createConsoleLogger,
   loggers,
   pinDimension,
   withSpan,
   withTraceContext
-} from "./chunk-6DOGTAHA.js";
+} from "./chunk-QR2EF2NI.js";
+import {
+  StepCache
+} from "./chunk-BQJIFRAZ.js";
 import {
   FxRateUnavailableError,
   InvalidCurrencyError,
@@ -768,6 +776,15 @@ var MemoryConsumedCredentialStore = class {
     }
     return Promise.resolve(true);
   }
+  consume(realm, challengeId, ttlSeconds) {
+    const key = `${realm}:${challengeId}`;
+    const now = Date.now();
+    if ((this.data.get(key) ?? 0) > now) return Promise.resolve(false);
+    for (const [entry, expiry] of this.data) if (expiry <= now) this.data.delete(entry);
+    if (this.data.size >= this.maxEntries) return Promise.reject(new Error("Nonce store capacity exhausted"));
+    this.data.set(key, now + ttlSeconds * 1e3);
+    return Promise.resolve(true);
+  }
   mark(realm, challengeId, ttlSeconds) {
     const key = `${realm}:${challengeId}`;
     if (this.data.has(key)) this.data.delete(key);
@@ -8707,10 +8724,14 @@ async function verifyAdminAuth(opts) {
     nonceHex,
     unixSeconds: unixStr
   });
-  const matched = opts.acceptedPubkeys.some((pk) => verifyChallenge(pk, digest, sigHex));
+  const matched = opts.acceptedPubkeys.find((pk) => verifyChallenge(pk, digest, sigHex));
   if (!matched) return { ok: false, reason: "bad_signature" };
-  await opts.nonceStore.mark(NONCE_REALM, nonceHex, NONCE_TTL_SECONDS);
-  return { ok: true };
+  if (opts.nonceStore.consume) {
+    if (!await opts.nonceStore.consume(NONCE_REALM, nonceHex, NONCE_TTL_SECONDS)) return { ok: false, reason: "replay" };
+  } else {
+    await opts.nonceStore.mark(NONCE_REALM, nonceHex, NONCE_TTL_SECONDS);
+  }
+  return { ok: true, actor: matched };
 }
 function installAdminCashuRoutes(app, opts) {
   app.get("/admin/cashu/pending-batches", (c) => handlePendingBatches(c, opts));
@@ -8975,6 +8996,69 @@ async function handleRotateLockPubkey(c, opts) {
   });
 }
 
+// src/sdk/server/admin-content.ts
+function installAdminContentRoutes(app, opts) {
+  app.get("/admin/jobs/:jobId/content-holds", (c) => handle(c, opts));
+  app.post("/admin/jobs/:jobId/content-holds", (c) => handle(c, opts, "placed"));
+  app.post("/admin/jobs/:jobId/content-holds/:holdId/renew", (c) => handle(c, opts, "renewed"));
+  app.post("/admin/jobs/:jobId/content-holds/:holdId/clear", (c) => handle(c, opts, "cleared"));
+}
+async function handle(c, opts, action) {
+  const loaded = await loadAdminLockPubkeyState(c, opts);
+  if ("response" in loaded) return loaded.response;
+  const auth = await verifyAdminAuth({
+    authHeader: c.req.header("Authorization"),
+    method: c.req.method,
+    path: c.req.path,
+    dvmId: opts.dvmId,
+    acceptedPubkeys: [loaded.state.current, ...loaded.state.retired.map((item) => item.pubkey)],
+    nonceStore: opts.nonceStore,
+    now: opts.now
+  });
+  if (!auth.ok) return c.json({ error: "unauthorized", reason: auth.reason }, 401);
+  if (!isContentHoldStore(opts.store) || !opts.nonceStore.consume) {
+    return c.json({ error: "content_holds_unavailable", message: "This service requires a content-hold store and atomic admin nonce store." }, 503);
+  }
+  const jobId = c.req.param("jobId") ?? "";
+  const at = opts.now?.() ?? Date.now();
+  try {
+    if (action) {
+      let body;
+      try {
+        body = await c.req.json();
+      } catch {
+        return c.json({ error: "invalid_body", message: "Send a JSON object." }, 400);
+      }
+      if (!body || typeof body !== "object" || Array.isArray(body)) return c.json({ error: "invalid_body" }, 400);
+      const allowed = action === "placed" ? ["purpose", "reason", "review_due_at"] : action === "renewed" ? ["reason", "review_due_at"] : ["reason"];
+      if (Object.keys(body).some((key) => !allowed.includes(key))) return c.json({ error: "invalid_body", message: "Only purpose, reason and review_due_at are accepted as applicable; identity and times are server-derived." }, 400);
+      if (typeof body.reason !== "string" || body.reason.trim().length === 0 || body.reason.length > 1e3) return c.json({ error: "invalid_reason", message: "reason must contain 1..1000 characters." }, 400);
+      if (action !== "cleared" && (!Number.isSafeInteger(body.review_due_at) || body.review_due_at <= at)) return c.json({ error: "invalid_review_due_at", message: "review_due_at must be a future epoch millisecond integer." }, 400);
+      const base2 = { reason: body.reason.trim(), actor: auth.actor, at };
+      let mutation;
+      if (action === "placed") {
+        if (body.purpose !== "support" && body.purpose !== "dispute") return c.json({ error: "invalid_purpose" }, 400);
+        mutation = { ...base2, action, purpose: body.purpose, review_due_at: body.review_due_at };
+      } else if (action === "renewed") {
+        mutation = { ...base2, action, hold_id: c.req.param("holdId") ?? "", review_due_at: body.review_due_at };
+      } else mutation = { ...base2, action, hold_id: c.req.param("holdId") ?? "" };
+      await opts.store.mutateContentHold(jobId, mutation, opts.dvmId);
+    }
+    const snapshot = await opts.store.getContentSnapshot(jobId, opts.dvmId);
+    if (!snapshot) return c.json({ error: "job_not_found" }, 404);
+    return c.json({
+      job_id: jobId,
+      ...contentMetadata(snapshot.job, opts.retentionDays, snapshot.history.holds),
+      baseline_content_expires_at: baselineContentExpiry(snapshot.job, opts.retentionDays),
+      holds: snapshot.history.holds.map((hold) => ({ ...hold, review_overdue: hold.cleared_at === null && hold.review_due_at <= at })),
+      events: snapshot.history.events
+    }, action === "placed" ? 201 : 200);
+  } catch (error) {
+    if (error instanceof ContentHoldError) return c.json({ error: error.code }, error.code === "job_not_found" ? 404 : 409);
+    throw error;
+  }
+}
+
 // src/sdk/server/x402-exact-settlement.ts
 import { createHash as createHash4 } from "crypto";
 var X402ExactSettlementServer = class {
@@ -19944,6 +20028,13 @@ var DVMServer = class {
           ...payoutReporter ? { onMelted: payoutReporter.meltHook() } : {}
         });
       }
+      installAdminContentRoutes(this.app, {
+        dvmId,
+        store: this.jobManager.store,
+        retentionDays: this.descriptor.jobRetentionDays,
+        getLockPubkeyState: () => this.loadActiveLockPubkeyState(db, dvmId),
+        nonceStore: this.adminCashuNonceStore
+      });
       installAdminCreditRoutes(this.app, {
         db,
         dvmId,
@@ -20250,12 +20341,12 @@ var DVMServer = class {
   ownerDisplayBlock() {
     const owner = this.opts.owner;
     const env = this.opts.env;
-    const handle = owner?.handle ?? env.DVMKIT_OWNER_HANDLE;
-    if (!handle) return null;
+    const handle2 = owner?.handle ?? env.DVMKIT_OWNER_HANDLE;
+    if (!handle2) return null;
     const type = owner?.type ?? env.DVMKIT_OWNER_TYPE ?? "builder";
     const displayName = owner?.displayName ?? env.DVMKIT_OWNER_DISPLAY_NAME ?? null;
     const avatarUrl = owner?.avatarUrl ?? env.DVMKIT_OWNER_AVATAR_URL ?? null;
-    return { handle, display_name: displayName, avatar_url: avatarUrl, type };
+    return { handle: handle2, display_name: displayName, avatar_url: avatarUrl, type };
   }
   defaultPaymentMethods() {
     const methods = [];
@@ -21140,7 +21231,7 @@ var DVMServer = class {
     if (prior?.requestId !== requestId || prior.requesterPubkey !== authPubkey || prior.requestFingerprint !== fingerprint || prior.requesterId !== c.get("requesterId")) {
       return requestResultNotFound(c, requestId);
     }
-    return buildRequestResultResponse(c, requestId, prior);
+    return buildRequestResultResponse(c, requestId, prior, await this.contentFields(prior));
   }
   async handleCreateJob(c, resumeOnly = false) {
     if (!resumeOnly) this.maybeSweepTempoSessions();
@@ -21270,7 +21361,7 @@ var DVMServer = class {
       const prior = priorId ? await this.jobManager.store.get(priorId) : void 0;
       if (prior && prior.requestFingerprint === fingerprint && prior.requesterId === c.get("requesterId") && (!this.descriptor.auth || prior.requesterPubkey === authPubkey)) {
         await this.jobManager.ensureReceipt(prior);
-        return buildSubmitResponse(c, prior, prior.requesterToken);
+        return await this.submitResponse(c, prior, prior.requesterToken);
       }
     }
     if (!resumeOnly && this.opts.hostingControlInstance && creditEnvelope && authPubkey) {
@@ -21312,7 +21403,7 @@ var DVMServer = class {
       if (publicRequestId && authPubkey && recoveryStore) {
         const prior = await recoveryStore.findJobByRequestId(publicRequestId, authPubkey);
         if (prior) {
-          return resumeOnly ? buildSubmitResponse(c, prior, prior.requesterToken) : requestIdExists(c, publicRequestId);
+          return resumeOnly ? await this.submitResponse(c, prior, prior.requesterToken) : requestIdExists(c, publicRequestId);
         }
       }
       let jobId = publicRequestClaimResult?.jobId ?? this.jobManager.allocateJobId();
@@ -21528,7 +21619,7 @@ var DVMServer = class {
             exactAdmission.intentId
           );
           await this.jobManager.ensureReceipt(prior);
-          return buildSubmitResponse(c, prior, prior.requesterToken);
+          return await this.submitResponse(c, prior, prior.requesterToken);
         }
       }
       if (this.descriptor.auth && authEnvelope) {
@@ -21589,7 +21680,7 @@ var DVMServer = class {
           await jm.finalizeStoredTerminal(jobId);
         }
         const terminal = await store.get(jobId);
-        if (terminal) return buildSubmitResponse(c, terminal, jobToken);
+        if (terminal) return await this.submitResponse(c, terminal, jobToken);
       }
       if (exactAdmission) {
         await this.x402ExactSettlement?.completeAdmission(
@@ -21604,7 +21695,7 @@ var DVMServer = class {
         setTimeout(resolve, 0);
       });
       await awaitTerminalWork(job);
-      let response = buildSubmitResponse(c, job, jobToken);
+      let response = await this.submitResponse(c, job, jobToken);
       if (payment.x402SettleResponseHeader) {
         response = new Response(response.body, response);
         response.headers.set("PAYMENT-RESPONSE", payment.x402SettleResponseHeader);
@@ -21692,7 +21783,7 @@ var DVMServer = class {
       return void 0;
     }
     await this.jobManager.ensureReceipt(prior);
-    return buildSubmitResponse(c, prior, prior.requesterToken);
+    return await this.submitResponse(c, prior, prior.requesterToken);
   }
   /**
    * Resolve the recorded draw's job under the same fingerprint/pubkey/requester
@@ -21737,7 +21828,7 @@ var DVMServer = class {
       return void 0;
     }
     await this.jobManager.ensureReceipt(prior);
-    return buildSubmitResponse(c, prior, prior.requesterToken);
+    return await this.submitResponse(c, prior, prior.requesterToken);
   }
   /**
    * Resume the gap between a durable x402/Tempo marker+draw commit and the
@@ -21886,6 +21977,23 @@ var DVMServer = class {
       };
     }
   }
+  async submitResponse(c, job, jobToken) {
+    const snapshot = { ...job, messages: [...job.messages] };
+    return buildSubmitResponse(c, snapshot, jobToken, await this.contentFields(snapshot));
+  }
+  async contentFields(job) {
+    const store = this.jobManager.store;
+    const responseStatus = job.status;
+    if (isContentHoldStore(store)) {
+      const snapshot = await store.getContentSnapshot(job.id);
+      if (snapshot) return { ...contentMetadata({ ...snapshot.job, status: responseStatus }, this.descriptor.jobRetentionDays, snapshot.history.holds) };
+    }
+    return isContentHoldStore(store) ? { ...contentMetadata(job, this.descriptor.jobRetentionDays) } : {};
+  }
+  async messageFields(job, messages) {
+    const fields = await this.contentFields(job);
+    return { messages: fields.content_available === false ? [] : messages, ...fields };
+  }
   async handleGetJob(c) {
     if (!jobCredential.presents(c.req)) return c.json(jobCredential.body(), 401);
     const id = c.req.param("id") ?? "";
@@ -21894,7 +22002,8 @@ var DVMServer = class {
       if (!isJobOwner(c, job)) return c.json({ error: "Job not found" }, 404);
       await this.jobManager.ensureReceipt(job);
       const res2 = { job_id: job.id, status: job.status };
-      Object.assign(res2, terminalResponseFields(job));
+      Object.assign(res2, terminalResponseFields(job), await this.contentFields(job));
+      removeUnavailableContent(res2);
       return c.json(res2);
     }
     const record = await this.jobManager.store.get(id);
@@ -21902,7 +22011,8 @@ var DVMServer = class {
     if (!isJobOwner(c, record)) return c.json({ error: "Job not found" }, 404);
     await this.jobManager.ensureReceipt(record);
     const res = { job_id: record.id, status: record.status };
-    Object.assign(res, terminalResponseFields(record));
+    Object.assign(res, terminalResponseFields(record), await this.contentFields(record));
+    removeUnavailableContent(res);
     return c.json(res);
   }
   async handleGetMessages(c) {
@@ -21973,7 +22083,9 @@ var DVMServer = class {
             });
           });
         }
+        const fields = await this.contentFields(record);
         return streamSSE(c, async (stream) => {
+          if (fields.content_available === false) return;
           for (const msg of filtered) {
             await stream.writeSSE({ data: JSON.stringify(msg), event: "message" });
           }
@@ -21981,13 +22093,15 @@ var DVMServer = class {
       }
       if (isStreamableJobStore(store) && !isTerminal(record.status)) {
         const msgs = await store.getMessages(id, after);
-        if (msgs.length > 0) return c.json({ messages: msgs });
+        if (msgs.length > 0) return c.json(await this.messageFields(record, msgs));
       }
-      return c.json({ messages: filtered });
+      return c.json(await this.messageFields(record, filtered));
     }
     if (!isJobOwner(c, job)) return c.json({ error: "Job not found" }, 404);
     if (accept.includes("text/event-stream")) {
+      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);
         let yielded = false;
         for (const msg of existing) {
@@ -22016,7 +22130,7 @@ var DVMServer = class {
         });
       });
     }
-    return c.json({ messages: job.messages.filter((m) => m.seq > after) });
+    return c.json(await this.messageFields(job, job.messages.filter((m) => m.seq > after)));
   }
   jobNotActiveResponse(c) {
     return c.json(
@@ -22260,12 +22374,13 @@ function timingSafeEqualHex(a, b) {
   for (let i = 0; i < a.length; i++) diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
   return diff === 0;
 }
-function buildSubmitResponse(c, job, jobToken) {
+function buildSubmitResponse(c, job, jobToken, contentFields) {
   const res = { job_id: job.id };
   if (jobToken) res.job_token = jobToken;
   if (job.status === "awaiting-input") res.status = "awaiting-input";
   else if (job.status === "completed") res.status = "completed";
-  Object.assign(res, terminalResponseFields(job));
+  Object.assign(res, terminalResponseFields(job), contentFields);
+  removeUnavailableContent(res);
   return c.json(res, job.status === "completed" ? 200 : 202);
 }
 function requestRecoveryStore(store) {
@@ -22321,7 +22436,7 @@ function requestNotAccepted(c, requestId) {
     409
   );
 }
-function buildRequestResultResponse(c, requestId, job) {
+function buildRequestResultResponse(c, requestId, job, contentFields) {
   const status = job.status === "working" ? "processing" : job.status;
   const res = {
     request_id: requestId,
@@ -22330,7 +22445,8 @@ function buildRequestResultResponse(c, requestId, job) {
   };
   if (job.requesterToken) res.job_token = job.requesterToken;
   if (job.paymentTransactionHash) res.transaction_hash = job.paymentTransactionHash;
-  Object.assign(res, terminalResponseFields(job));
+  Object.assign(res, terminalResponseFields(job), contentFields);
+  removeUnavailableContent(res);
   return c.json(res, isTerminal(job.status) ? 200 : 202);
 }
 function requestResultNotFound(c, requestId) {
@@ -22358,6 +22474,14 @@ async function awaitTerminalWork(job) {
   ]);
   clearTimeout(timer);
 }
+function removeUnavailableContent(fields) {
+  if (fields.content_available === false) {
+    delete fields.summary;
+    fields.has_artifacts = false;
+    delete fields.artifact_count;
+    delete fields.payload_in;
+  }
+}
 function terminalResponseFields(job) {
   const fields = {};
   if (job.status === "completed") {
@@ -22750,6 +22874,7 @@ export {
   handleCreditRequest,
   installAdminCashuRoutes,
   createAdminCashuNonceStore,
+  installAdminContentRoutes,
   X402ExactSettlementServer,
   X402ExactSettlementEvidenceMissingError,
   HostedSettlementReportObligations,