deepline 0.1.301 → 0.1.302

package/dist/bundling-sources/shared_libs/play-runtime/runtime-api.ts

@@ -59,6 +59,7 @@ import {
   workReceiptFailureKindFromCode,
   type WorkReceiptFailureKind,
 } from './work-receipts';
+import type { ToolExecutionFailureV1 } from '../tool-execution-error';
 import {
   sanitizePostgresJsonValue,
   stringifyPostgresJson,
@@ -216,6 +217,7 @@ async function forceFailRuntimeWorkReceiptForRuntimeTestFault(
              SET status = $2::smallint,
                  output = NULL,
                  error = $3,
+                 error_payload = NULL,
                  failure_kind = $5::smallint,
                  lease_id = NULL,
                  lease_owner_run_id = NULL,
@@ -230,6 +232,7 @@ async function forceFailRuntimeWorkReceiptForRuntimeTestFault(
                     status,
                     output,
                     error,
+                    error_payload,
                     failure_kind,
                     run_id,
                     lease_id,
@@ -238,7 +241,7 @@ async function forceFailRuntimeWorkReceiptForRuntimeTestFault(
                     lease_expires_at,
                     updated_at
         )
-        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at
+        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at
           FROM failed
       `,
         [
@@ -299,9 +302,11 @@ const RUNTIME_WORK_RECEIPT_LEASE_COLUMNS = [
   'lease_expires_at',
 ] as const;
 const RUNTIME_WORK_RECEIPT_FAILURE_KIND_COLUMN = 'failure_kind';
+const RUNTIME_WORK_RECEIPT_ERROR_PAYLOAD_COLUMN = 'error_payload';
 const RUNTIME_WORK_RECEIPT_SELF_HEAL_COLUMNS = [
   ...RUNTIME_WORK_RECEIPT_LEASE_COLUMNS,
   RUNTIME_WORK_RECEIPT_FAILURE_KIND_COLUMN,
+  RUNTIME_WORK_RECEIPT_ERROR_PAYLOAD_COLUMN,
 ] as const;
 const RUNTIME_SHEET_ATTEMPT_COLUMNS = [
   '_attempt_id',
@@ -2168,6 +2173,10 @@ function mapRuntimeWorkReceiptRow(raw: Record<string, unknown>): WorkReceipt {
     status: receiptStatusFromCode(raw.status),
     output: raw.output == null ? null : raw.output,
     error: raw.error == null ? null : String(raw.error),
+    errorPayload:
+      raw.error_payload != null && typeof raw.error_payload === 'object'
+        ? (raw.error_payload as WorkReceipt['errorPayload'])
+        : null,
     failureKind: workReceiptFailureKindFromCode(raw.failure_kind),
     runId: raw.run_id == null ? null : String(raw.run_id),
     leaseId: raw.lease_id == null ? null : String(raw.lease_id),
@@ -2260,6 +2269,7 @@ async function ensureRuntimeWorkReceiptTable(
       status smallint NOT NULL DEFAULT 0,
       output jsonb,
       error text,
+      error_payload jsonb,
       failure_kind smallint NOT NULL DEFAULT 0,
       run_id text,
       lease_id text,
@@ -2295,7 +2305,9 @@ async function ensureRuntimeWorkReceiptTable(
                     ? 'integer'
                     : column === RUNTIME_WORK_RECEIPT_FAILURE_KIND_COLUMN
                       ? 'smallint NOT NULL DEFAULT 0'
-                      : 'text';
+                      : column === RUNTIME_WORK_RECEIPT_ERROR_PAYLOAD_COLUMN
+                        ? 'jsonb'
+                        : 'text';
               return `ADD COLUMN IF NOT EXISTS ${column} ${type}`;
             })
             .join(',\n          ')}
@@ -4064,6 +4076,7 @@ async function readRuntimeWorkReceipt(
             status,
             output,
             error,
+            error_payload,
             failure_kind,
             run_id,
             lease_id,
@@ -4123,6 +4136,7 @@ export async function getRuntimeWorkReceipts(
              receipts.status,
              receipts.output,
              receipts.error,
+             receipts.error_payload,
              receipts.failure_kind,
              receipts.run_id,
              receipts.lease_id,
@@ -4222,7 +4236,6 @@ export async function claimRuntimeWorkReceipt(
           ON CONFLICT (k) DO UPDATE
           SET status = $4::smallint,
               output = NULL,
-              failure_kind = 0,
               run_id = $3,
               lease_id = $6,
               lease_owner_run_id = CASE WHEN $6::text IS NULL THEN NULL ELSE $3 END,
@@ -4232,6 +4245,8 @@ export async function claimRuntimeWorkReceipt(
                 ELSE now() + ($7::double precision * interval '1 millisecond')
               END,
               error = NULL,
+              error_payload = NULL,
+              failure_kind = 0,
               updated_at = now()
           WHERE ${workReceiptClaimConflictPredicateSql({
             receiptTable: workReceiptTable(session),
@@ -4246,6 +4261,7 @@ export async function claimRuntimeWorkReceipt(
                     status,
                     output,
                     error,
+                    error_payload,
                     failure_kind,
                     run_id,
                     lease_id,
@@ -4258,6 +4274,7 @@ export async function claimRuntimeWorkReceipt(
                status,
                output,
                error,
+               error_payload,
                failure_kind,
                run_id,
                lease_id,
@@ -4458,11 +4475,10 @@ export async function claimRuntimeWorkReceipts(
                END,
                now()
           FROM input_keys
-        ON CONFLICT (k) DO UPDATE
-        SET status = $5::smallint,
-            output = NULL,
-            failure_kind = 0,
-            run_id = $4::text,
+          ON CONFLICT (k) DO UPDATE
+          SET status = $5::smallint,
+              output = NULL,
+              run_id = $4::text,
             lease_id = EXCLUDED.lease_id,
             lease_owner_run_id = CASE
               WHEN EXCLUDED.lease_id IS NULL THEN NULL
@@ -4474,6 +4490,8 @@ export async function claimRuntimeWorkReceipts(
             END,
             lease_expires_at = EXCLUDED.lease_expires_at,
             error = NULL,
+            error_payload = NULL,
+            failure_kind = 0,
             updated_at = now()
         WHERE ${workReceiptClaimConflictPredicateSql({
           receiptTable: workReceiptTable(session),
@@ -4488,6 +4506,7 @@ export async function claimRuntimeWorkReceipts(
                   status,
                   output,
                   error,
+                  error_payload,
                   failure_kind,
                   run_id,
                   lease_id,
@@ -4501,6 +4520,7 @@ export async function claimRuntimeWorkReceipts(
                receipts.status,
                receipts.output,
                receipts.error,
+               receipts.error_payload,
                receipts.failure_kind,
                receipts.run_id,
                receipts.lease_id,
@@ -4525,6 +4545,7 @@ export async function claimRuntimeWorkReceipts(
                claimed.status,
                claimed.output,
                claimed.error,
+               claimed.error_payload,
                claimed.failure_kind,
                claimed.run_id,
                claimed.lease_id,
@@ -4541,6 +4562,7 @@ export async function claimRuntimeWorkReceipts(
                status,
                output,
                error,
+               error_payload,
                failure_kind,
                run_id,
                lease_id,
@@ -4556,6 +4578,7 @@ export async function claimRuntimeWorkReceipts(
              status,
              output,
              error,
+             error_payload,
              failure_kind,
              run_id,
              lease_id,
@@ -4629,6 +4652,9 @@ export async function markRuntimeWorkReceiptRunning(
         WITH running AS (
           UPDATE ${workReceiptTable(session)}
              SET status = $2::smallint,
+                 error = NULL,
+                 error_payload = NULL,
+                 failure_kind = 0,
                  lease_expires_at = CASE
                    WHEN lease_id IS NULL THEN NULL
                    ELSE now() + ($6::double precision * interval '1 millisecond')
@@ -4645,6 +4671,7 @@ export async function markRuntimeWorkReceiptRunning(
                     status,
                     output,
                     error,
+                    error_payload,
                     failure_kind,
                     run_id,
                     lease_id,
@@ -4653,7 +4680,7 @@ export async function markRuntimeWorkReceiptRunning(
                     lease_expires_at,
                     updated_at
         )
-        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at
+        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at
           FROM running
       `,
         [
@@ -4716,6 +4743,9 @@ export async function markRuntimeWorkReceiptsRunning(
       running AS (
         UPDATE ${workReceiptTable(session)} AS target
            SET status = $5::smallint,
+               error = NULL,
+               error_payload = NULL,
+               failure_kind = 0,
                lease_expires_at = CASE
                  WHEN target.lease_id IS NULL THEN NULL
                  ELSE now() + ($6::double precision * interval '1 millisecond')
@@ -4733,6 +4763,7 @@ export async function markRuntimeWorkReceiptsRunning(
                   target.status,
                   target.output,
                   target.error,
+                  target.error_payload,
                   target.failure_kind,
                   target.run_id,
                   target.lease_id,
@@ -4747,6 +4778,7 @@ export async function markRuntimeWorkReceiptsRunning(
                running.status,
                running.output,
                running.error,
+               running.error_payload,
                running.failure_kind,
                running.run_id,
                running.lease_id,
@@ -4762,6 +4794,7 @@ export async function markRuntimeWorkReceiptsRunning(
              returned.status,
              returned.output,
              returned.error,
+             returned.error_payload,
              returned.failure_kind,
              returned.run_id,
              returned.lease_id,
@@ -4836,6 +4869,9 @@ export async function markRuntimeWorkReceiptsQueued(
       queued AS (
         UPDATE ${workReceiptTable(session)} AS target
            SET status = $5::smallint,
+               error = NULL,
+               error_payload = NULL,
+               failure_kind = 0,
                lease_expires_at = CASE
                  WHEN target.lease_id IS NULL THEN NULL
                  ELSE now() + ($6::double precision * interval '1 millisecond')
@@ -4853,6 +4889,7 @@ export async function markRuntimeWorkReceiptsQueued(
                   target.status,
                   target.output,
                   target.error,
+                  target.error_payload,
                   target.failure_kind,
                   target.run_id,
                   target.lease_id,
@@ -4867,6 +4904,7 @@ export async function markRuntimeWorkReceiptsQueued(
                queued.status,
                queued.output,
                queued.error,
+               queued.error_payload,
                queued.failure_kind,
                queued.run_id,
                queued.lease_id,
@@ -4882,6 +4920,7 @@ export async function markRuntimeWorkReceiptsQueued(
              returned.status,
              returned.output,
              returned.error,
+             returned.error_payload,
              returned.failure_kind,
              returned.run_id,
              returned.lease_id,
@@ -4960,6 +4999,11 @@ export async function completeRuntimeWorkReceipt(
     })
   ) {
     const error = runtimeTestFaultError('receipt_complete_write_fail');
+    // Tool receipts are immutable completed facts. A failed publication is an
+    // execution failure, never a cached failed receipt.
+    if (input.leaseId === COMPLETED_RECEIPT_CACHE_INSERT_LEASE_ID) {
+      throw error;
+    }
     const failed = await failRuntimeWorkReceipt(context, {
       playName: input.playName,
       runId: input.runId,
@@ -4999,13 +5043,28 @@ export async function completeRuntimeWorkReceipt(
           Record<string, unknown>
         >(
           `
-          INSERT INTO ${workReceiptTable(session)} (
-            k, status, output, error, failure_kind, run_id, updated_at
+          INSERT INTO ${workReceiptTable(session)} AS receipt (
+            k, status, output, error, error_payload, failure_kind, run_id, updated_at
           ) VALUES (
-            decode($1, 'hex'), $2::smallint, $3::jsonb, NULL, 0, $4, now()
+            decode($1, 'hex'), $2::smallint, $3::jsonb, NULL, NULL, 0, $4, now()
           )
-          ON CONFLICT (k) DO NOTHING
-          RETURNING convert_from(k, 'UTF8') AS k, status, output, error,
+          ON CONFLICT (k) DO UPDATE
+          SET status = EXCLUDED.status,
+              output = EXCLUDED.output,
+              error = NULL,
+              error_payload = NULL,
+              failure_kind = 0,
+              run_id = EXCLUDED.run_id,
+              lease_id = NULL,
+              lease_owner_run_id = NULL,
+              lease_owner_attempt = NULL,
+              lease_expires_at = NULL,
+              updated_at = now()
+          WHERE receipt.status NOT IN (
+            ${RECEIPT_STATUS_COMPLETED}::smallint,
+            ${RECEIPT_STATUS_SKIPPED}::smallint
+          )
+          RETURNING convert_from(k, 'UTF8') AS k, status, output, error, error_payload,
                     failure_kind, run_id, lease_id, lease_owner_run_id,
                     lease_owner_attempt, lease_expires_at, updated_at
           `,
@@ -5020,7 +5079,7 @@ export async function completeRuntimeWorkReceipt(
         const { rows: winnerRows } = await client.query<
           Record<string, unknown>
         >(
-          `SELECT convert_from(k, 'UTF8') AS k, status, output, error,
+          `SELECT convert_from(k, 'UTF8') AS k, status, output, error, error_payload,
                   failure_kind, run_id, lease_id, lease_owner_run_id,
                   lease_owner_attempt, lease_expires_at, updated_at
              FROM ${workReceiptTable(session)}
@@ -5039,6 +5098,7 @@ export async function completeRuntimeWorkReceipt(
           SET status = $2::smallint,
               output = $3::jsonb,
               error = NULL,
+              error_payload = NULL,
               failure_kind = 0,
               run_id = $4,
               lease_id = NULL,
@@ -5057,6 +5117,7 @@ export async function completeRuntimeWorkReceipt(
 	                    status,
 	                    CASE WHEN $7::boolean THEN output ELSE NULL::jsonb END AS output,
 	                    error,
+	                    error_payload,
 	                    failure_kind,
 	                    run_id,
 	                    lease_id,
@@ -5070,6 +5131,7 @@ export async function completeRuntimeWorkReceipt(
 	                 status,
 	                 CASE WHEN $7::boolean THEN output ELSE NULL::jsonb END AS output,
 	                 error,
+	                 error_payload,
 	                 failure_kind,
 	                 run_id,
 	                 lease_id,
@@ -5086,9 +5148,9 @@ export async function completeRuntimeWorkReceipt(
                  ownerRunIdSql: '$4',
                })}
 	        )
-	        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM completed
+	        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM completed
 	        UNION ALL
-	        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
+	        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
       `,
         [
           workReceiptKeyHex(input.key),
@@ -5128,7 +5190,16 @@ export async function completeRuntimeWorkReceipts(
       name: 'receipt_complete_write_fail',
     })
   ) {
-    const [skippedReceipt, ...siblingReceipts] = receipts;
+    const faultedIndex = receipts.findIndex(
+      (receipt) => receipt.leaseId !== COMPLETED_RECEIPT_CACHE_INSERT_LEASE_ID,
+    );
+    if (faultedIndex < 0) {
+      throw runtimeTestFaultError('receipt_complete_write_fail');
+    }
+    const faultedReceipt = receipts[faultedIndex];
+    const siblingReceipts = receipts.filter(
+      (_receipt, index) => index !== faultedIndex,
+    );
     let siblingError: unknown = null;
     if (siblingReceipts.length > 0) {
       try {
@@ -5142,24 +5213,24 @@ export async function completeRuntimeWorkReceipts(
       }
     }
     const error = runtimeTestFaultError('receipt_complete_write_fail');
-    if (skippedReceipt) {
+    if (faultedReceipt) {
       const failed = await failRuntimeWorkReceipt(context, {
         playName: input.playName,
-        runId: skippedReceipt.runId,
-        key: skippedReceipt.key,
-        leaseId: skippedReceipt.leaseId,
+        runId: faultedReceipt.runId,
+        key: faultedReceipt.key,
+        leaseId: faultedReceipt.leaseId,
         error: error.message,
         failureKind: 'repairable',
-        runAttempt: skippedReceipt.runAttempt,
+        runAttempt: faultedReceipt.runAttempt,
       });
       if (!failed) {
         await forceFailRuntimeWorkReceiptForRuntimeTestFault(context, {
           playName: input.playName,
-          runId: skippedReceipt.runId,
-          key: skippedReceipt.key,
+          runId: faultedReceipt.runId,
+          key: faultedReceipt.key,
           error: error.message,
           failureKind: 'repairable',
-          runAttempt: skippedReceipt.runAttempt,
+          runAttempt: faultedReceipt.runAttempt,
         });
       }
     }
@@ -5238,6 +5309,7 @@ export async function completeRuntimeWorkReceipts(
            SET status = $6::smallint,
 		               output = inputs.output,
 	               error = NULL,
+	               error_payload = NULL,
 	               failure_kind = 0,
 	               run_id = inputs.run_id,
 	               lease_id = NULL,
@@ -5257,6 +5329,7 @@ export async function completeRuntimeWorkReceipts(
                   target.status,
 	                  CASE WHEN $7::boolean THEN target.output ELSE NULL::jsonb END AS output,
 	                  target.error,
+	                  target.error_payload,
 	                  target.failure_kind,
 	                  target.run_id,
                   target.lease_id,
@@ -5271,6 +5344,7 @@ export async function completeRuntimeWorkReceipts(
                target.status,
                CASE WHEN $7::boolean THEN target.output ELSE NULL::jsonb END AS output,
                target.error,
+               target.error_payload,
                target.failure_kind,
                target.run_id,
                target.lease_id,
@@ -5290,15 +5364,16 @@ export async function completeRuntimeWorkReceipts(
            })}
       ),
       resolved AS (
-        SELECT ord, k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM completed
+        SELECT ord, k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM completed
         UNION ALL
-        SELECT ord, k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
+        SELECT ord, k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
       ),
       returned AS (
         SELECT resolved.k,
                resolved.status,
 	               resolved.output,
 	               resolved.error,
+	               resolved.error_payload,
 	               resolved.failure_kind,
 	               resolved.run_id,
                resolved.lease_id,
@@ -5314,6 +5389,7 @@ export async function completeRuntimeWorkReceipts(
              returned.status,
 	             returned.output,
 	             returned.error,
+	             returned.error_payload,
 	             returned.failure_kind,
 		             returned.run_id,
              returned.lease_id,
@@ -5356,6 +5432,7 @@ export async function failRuntimeWorkReceipt(
     runAttempt?: number | null;
     leaseId?: string | null;
     error: string;
+    errorPayload?: ToolExecutionFailureV1 | null;
     failureKind?: WorkReceiptFailureKind | null;
   },
 ): Promise<WorkReceipt | null> {
@@ -5376,6 +5453,7 @@ export async function failRuntimeWorkReceipt(
 	          SET status = $2::smallint,
 	              output = NULL,
 	              error = $3,
+	              error_payload = $8::jsonb,
 	              failure_kind = $6::smallint,
               run_id = $4,
               lease_id = NULL,
@@ -5394,6 +5472,7 @@ export async function failRuntimeWorkReceipt(
 	                    status,
 	                    output,
 	                    error,
+	                    error_payload,
 	                    failure_kind,
 	                    run_id,
 	                    lease_id,
@@ -5407,6 +5486,7 @@ export async function failRuntimeWorkReceipt(
 	                 status,
 	                 output,
 	                 error,
+	                 error_payload,
 	                 failure_kind,
 	                 run_id,
 	                 lease_id,
@@ -5423,9 +5503,9 @@ export async function failRuntimeWorkReceipt(
                  ownerRunIdSql: '$4',
                })}
 	        )
-	        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM failed
+	        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM failed
 	        UNION ALL
-	        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
+	        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
       `,
         [
           workReceiptKeyHex(input.key),
@@ -5435,6 +5515,7 @@ export async function failRuntimeWorkReceipt(
           leaseId,
           workReceiptFailureKindCode(input.failureKind),
           runAttempt,
+          input.errorPayload ? JSON.stringify(input.errorPayload) : null,
         ],
       );
       return rows[0] ? mapRuntimeWorkReceiptRow(rows[0]) : null;
@@ -5469,6 +5550,7 @@ export async function releaseRuntimeWorkReceipt(
              SET status = $2::smallint,
                  output = NULL,
                  error = NULL,
+                 error_payload = NULL,
                  failure_kind = 0,
                  run_id = $3,
                  lease_id = NULL,
@@ -5487,6 +5569,7 @@ export async function releaseRuntimeWorkReceipt(
                     status,
                     output,
                     error,
+                    error_payload,
                     failure_kind,
                     run_id,
                     lease_id,
@@ -5495,7 +5578,7 @@ export async function releaseRuntimeWorkReceipt(
                     lease_expires_at,
                     updated_at
         )
-        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM released
+        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM released
       `,
         [
           workReceiptKeyHex(input.key),
@@ -5518,6 +5601,7 @@ export async function failRuntimeWorkReceipts(
       runId: string;
       key: string;
       error: string;
+      errorPayload?: ToolExecutionFailureV1 | null;
       failureKind?: WorkReceiptFailureKind | null;
       leaseId?: string | null;
       runAttempt?: number | null;
@@ -5542,6 +5626,7 @@ export async function failRuntimeWorkReceipts(
 	               lease_values.lease_id,
 	               attempt_values.run_attempt,
 	               error_values.error,
+	               payload_values.error_payload::jsonb,
 	               failure_kind_values.failure_kind,
 	               key_values.ord
           FROM unnest($1::text[]) WITH ORDINALITY AS key_values(key_hex, ord)
@@ -5555,12 +5640,15 @@ export async function failRuntimeWorkReceipts(
 	            ON error_values.ord = key_values.ord
 	          JOIN unnest($6::smallint[]) WITH ORDINALITY AS failure_kind_values(failure_kind, ord)
 	            ON failure_kind_values.ord = key_values.ord
+	          JOIN unnest($7::text[]) WITH ORDINALITY AS payload_values(error_payload, ord)
+	            ON payload_values.ord = key_values.ord
       ),
       failed AS (
         UPDATE ${workReceiptTable(session)} AS target
-	           SET status = $7::smallint,
+	           SET status = $8::smallint,
 	               output = NULL,
 	               error = inputs.error,
+	               error_payload = inputs.error_payload,
 	               failure_kind = inputs.failure_kind,
 	               run_id = inputs.run_id,
                lease_id = NULL,
@@ -5580,6 +5668,7 @@ export async function failRuntimeWorkReceipts(
                   target.status,
 	                  target.output,
 	                  target.error,
+	                  target.error_payload,
 	                  target.failure_kind,
 	                  target.run_id,
                   target.lease_id,
@@ -5594,6 +5683,7 @@ export async function failRuntimeWorkReceipts(
                target.status,
                target.output,
                target.error,
+               target.error_payload,
                target.failure_kind,
                target.run_id,
                target.lease_id,
@@ -5608,20 +5698,21 @@ export async function failRuntimeWorkReceipts(
          WHERE NOT EXISTS (SELECT 1 FROM failed WHERE failed.ord = inputs.ord)
            AND ${workReceiptTerminalReplayPredicateSql({
              receiptTable: 'target',
-             terminalStatusSql: '$7',
+             terminalStatusSql: '$8',
              ownerRunIdSql: 'inputs.run_id',
            })}
       ),
       resolved AS (
-        SELECT ord, k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM failed
+        SELECT ord, k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM failed
         UNION ALL
-        SELECT ord, k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
+        SELECT ord, k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM replay
       ),
       returned AS (
         SELECT resolved.k,
                resolved.status,
 	               resolved.output,
 	               resolved.error,
+	               resolved.error_payload,
 	               resolved.failure_kind,
 	               resolved.run_id,
                resolved.lease_id,
@@ -5637,6 +5728,7 @@ export async function failRuntimeWorkReceipts(
              returned.status,
 	             returned.output,
 	             returned.error,
+	             returned.error_payload,
 	             returned.failure_kind,
 		             returned.run_id,
              returned.lease_id,
@@ -5658,6 +5750,9 @@ export async function failRuntimeWorkReceipts(
           receipts.map((receipt) =>
             workReceiptFailureKindCode(receipt.failureKind),
           ),
+          receipts.map((receipt) =>
+            receipt.errorPayload ? JSON.stringify(receipt.errorPayload) : null,
+          ),
           RECEIPT_STATUS_FAILED,
         ],
       );
@@ -5718,6 +5813,7 @@ export async function heartbeatRuntimeWorkReceipts(
                   target.status,
                   target.output,
                   target.error,
+                  target.error_payload,
                   target.failure_kind,
                   target.run_id,
                   target.lease_id,
@@ -5732,6 +5828,7 @@ export async function heartbeatRuntimeWorkReceipts(
                renewed.status,
                renewed.output,
                renewed.error,
+               renewed.error_payload,
                renewed.failure_kind,
                renewed.run_id,
                renewed.lease_id,
@@ -5747,6 +5844,7 @@ export async function heartbeatRuntimeWorkReceipts(
              returned.status,
              returned.output,
              returned.error,
+             returned.error_payload,
              returned.failure_kind,
              returned.run_id,
              returned.lease_id,
@@ -5800,6 +5898,7 @@ export async function skipRuntimeWorkReceipt(
 	          SET status = $2::smallint,
 	              output = $3::jsonb,
 	              error = NULL,
+	              error_payload = NULL,
 	              failure_kind = 0,
               run_id = $4,
               lease_id = NULL,
@@ -5818,6 +5917,7 @@ export async function skipRuntimeWorkReceipt(
 	                    status,
 	                    output,
 	                    error,
+	                    error_payload,
 	                    failure_kind,
 	                    run_id,
 	                    lease_id,
@@ -5826,7 +5926,7 @@ export async function skipRuntimeWorkReceipt(
 	                    lease_expires_at,
 	                    updated_at
 	        )
-	        SELECT k, status, output, error, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM skipped
+	        SELECT k, status, output, error, error_payload, failure_kind, run_id, lease_id, lease_owner_run_id, lease_owner_attempt, lease_expires_at, updated_at FROM skipped
       `,
         [
           workReceiptKeyHex(input.key),