Commit e85144a58ce53d30d4d8595788896b37f5b966b8 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-06-20 12:08:37-07:00
committer	GitHub <noreply@github.com> 2026-06-20 12:08:37-07:00
log	e85144a58ce53d30d4d8595788896b37f5b966b8
tree	b4bc2eecbb87ab8f80af042790b994d703286ccd
parent	defd9dfe20f8c333b8eab2769e3205dfb560395c
signature	Signed by PGP key B5690EEEBB952194

[codex] Structure relay delivery attempt errors (#3312)

Co-authored-by: codex <codex@users.noreply.github.com>

2 files changed, 181 insertions(+), 43 deletions(-)

infra
- relay
  - src
    agentActivity
    DeliveryAttempts.test.ts
    DeliveryAttempts.ts

infra/relay/src/agentActivity/DeliveryAttempts.test.ts+91

...	@@ -320,4 +320,95 @@ describe("DeliveryAttempts", () => {	...	@@ -320,4 +320,95 @@ describe("DeliveryAttempts", () => {
320	),	320	),
321	);	321	);
322	});	322	});
		323
		324	it.effect("preserves operation context and causes for persistence failures", () => {
		325	const cause = new Error("database unavailable");
		326	const fakeDb = {
		327	insert: () => ({
		328	values: (values: Record<string, unknown>) =>
		329	values.kind === "record"
		330	? Effect.fail(cause)
		331	: {
		332	onConflictDoNothing: () => ({
		333	returning: () => Effect.fail(cause),
		334	}),
		335	},
		336	}),
		337	update: () => ({
		338	set: () => ({
		339	where: () => Effect.fail(cause),
		340	}),
		341	}),
		342	} as unknown as RelayDb.RelayDb["Service"];
		343
		344	return Effect.gen(function* () {
		345	const attempts = yield* DeliveryAttempts.DeliveryAttempts;
		346	const recordError = yield* Effect.flip(
		347	attempts.record({
		348	userId: "user-1",
		349	environmentId: "env-1",
		350	threadId: "thread-1",
		351	deviceId: "device-1",
		352	kind: "record",
		353	sourceJobId: "job-1",
		354	token: "apns-token",
		355	}),
		356	);
		357	const claimError = yield* Effect.flip(
		358	attempts.claimSourceJob({
		359	userId: "user-2",
		360	environmentId: "env-2",
		361	threadId: "thread-2",
		362	deviceId: "device-2",
		363	kind: "claim",
		364	sourceJobId: "job-2",
		365	token: "apns-token",
		366	}),
		367	);
		368	const completionError = yield* Effect.flip(
		369	attempts.completeSourceJob({ sourceJobId: "job-3", apnsStatus: 500 }),
		370	);
		371
		372	expect(recordError).toMatchObject({
		373	operation: "record",
		374	sourceJobId: "job-1",
		375	userId: "user-1",
		376	environmentId: "env-1",
		377	threadId: "thread-1",
		378	deviceId: "device-1",
		379	kind: "record",
		380	cause,
		381	message: "Failed to persist APNs delivery attempt during record.",
		382	});
		383	expect(claimError).toMatchObject({
		384	operation: "claim-source-job",
		385	sourceJobId: "job-2",
		386	userId: "user-2",
		387	environmentId: "env-2",
		388	threadId: "thread-2",
		389	deviceId: "device-2",
		390	kind: "claim",
		391	cause,
		392	message: "Failed to persist APNs delivery attempt during claim-source-job.",
		393	});
		394	expect(completionError).toMatchObject({
		395	operation: "complete-source-job",
		396	sourceJobId: "job-3",
		397	userId: null,
		398	environmentId: null,
		399	threadId: null,
		400	deviceId: null,
		401	kind: null,
		402	cause,
		403	message: "Failed to persist APNs delivery attempt during complete-source-job.",
		404	});
		405	}).pipe(
		406	Effect.provide(
		407	DeliveryAttempts.layer.pipe(
		408	Layer.provide(NodeCryptoLayer.layer),
		409	Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)),
		410	),
		411	),
		412	);
		413	});
323	});	414	});

infra/relay/src/agentActivity/DeliveryAttempts.ts+90-43

 @@ -12,10 +12,19 @@ import { relayDeliveryAttempts } from "../persistence/schema.ts";
 export class DeliveryAttemptRecordPersistenceError extends Schema.TaggedErrorClass<DeliveryAttemptRecordPersistenceError>()(
   "DeliveryAttemptRecordPersistenceError",
-  { cause: Schema.Defect() },
+  {
+    operation: Schema.Literals(["record", "claim-source-job", "complete-source-job"]),
+    sourceJobId: Schema.NullOr(Schema.String),
+    userId: Schema.NullOr(Schema.String),
+    environmentId: Schema.NullOr(Schema.String),
+    threadId: Schema.NullOr(Schema.String),
+    deviceId: Schema.NullOr(Schema.String),
+    kind: Schema.NullOr(Schema.String),
+    cause: Schema.Defect(),
+  },
 ) {
   override get message(): string {
-    return "Failed to persist APNs delivery attempt";
+    return `Failed to persist APNs delivery attempt during ${this.operation}.`;
   }
 }
 @@ -99,30 +108,43 @@ export const make = Effect.gen(function* () {
   };
   return DeliveryAttempts.of({
-    record: Effect.fn("relay.delivery_attempts.record")(
+    record: Effect.fn("relay.delivery_attempts.record")(function* (input) {
-      function* (input) {
+      yield* Effect.annotateCurrentSpan({
-        yield* Effect.annotateCurrentSpan({
+        "relay.delivery.kind": input.kind,
-          "relay.delivery.kind": input.kind,
+        ...(input.sourceJobId ? { "relay.delivery.job_id": input.sourceJobId } : {}),
-          ...(input.sourceJobId ? { "relay.delivery.job_id": input.sourceJobId } : {}),
+        ...(input.deviceId ? { "relay.mobile.device_id": input.deviceId } : {}),
-          ...(input.deviceId ? { "relay.mobile.device_id": input.deviceId } : {}),
+        ...(input.environmentId ? { "relay.environment_id": input.environmentId } : {}),
-          ...(input.environmentId ? { "relay.environment_id": input.environmentId } : {}),
+        ...(input.threadId ? { "relay.thread_id": input.threadId } : {}),
-          ...(input.threadId ? { "relay.thread_id": input.threadId } : {}),
+      });
-        });
+      yield* Effect.gen(function* () {
         const id = yield* crypto.randomUUIDv4;
         const createdAt = DateTime.formatIso(yield* DateTime.now);
         yield* db.insert(relayDeliveryAttempts).values(insertValues(input, id, createdAt));
-      },
+      }).pipe(
-      Effect.mapError((cause) => new DeliveryAttemptRecordPersistenceError({ cause })),
+        Effect.mapError(
-    ),
+          (cause) =>
-    claimSourceJob: Effect.fn("relay.delivery_attempts.claim_source_job")(
+            new DeliveryAttemptRecordPersistenceError({
-      function* (input) {
+              operation: "record",
-        yield* Effect.annotateCurrentSpan({
+              sourceJobId: input.sourceJobId ?? null,
-          "relay.delivery.kind": input.kind,
+              userId: input.userId,
-          "relay.delivery.job_id": input.sourceJobId,
+              environmentId: input.environmentId,
-          ...(input.deviceId ? { "relay.mobile.device_id": input.deviceId } : {}),
+              threadId: input.threadId,
-          ...(input.environmentId ? { "relay.environment_id": input.environmentId } : {}),
+              deviceId: input.deviceId,
-          ...(input.threadId ? { "relay.thread_id": input.threadId } : {}),
+              kind: input.kind,
-        });
+              cause,
+            }),
+        ),
+      );
+    }),
+    claimSourceJob: Effect.fn("relay.delivery_attempts.claim_source_job")(function* (input) {
+      yield* Effect.annotateCurrentSpan({
+        "relay.delivery.kind": input.kind,
+        "relay.delivery.job_id": input.sourceJobId,
+        ...(input.deviceId ? { "relay.mobile.device_id": input.deviceId } : {}),
+        ...(input.environmentId ? { "relay.environment_id": input.environmentId } : {}),
+        ...(input.threadId ? { "relay.thread_id": input.threadId } : {}),
+      });
+      return yield* Effect.gen(function* () {
         const id = yield* crypto.randomUUIDv4;
         const now = yield* DateTime.now;
         const createdAt = DateTime.formatIso(now);
 @@ -179,26 +201,51 @@ export const make = Effect.gen(function* () {
           )
           .returning({ id: relayDeliveryAttempts.id });
         return reclaimed.length > 0 ? "claimed" : "in_flight";
-      },
+      }).pipe(
-      Effect.mapError((cause) => new DeliveryAttemptRecordPersistenceError({ cause })),
+        Effect.mapError(
-    ),
+          (cause) =>
-    completeSourceJob: Effect.fn("relay.delivery_attempts.complete_source_job")(
+            new DeliveryAttemptRecordPersistenceError({
-      function* (input) {
+              operation: "claim-source-job",
-        yield* Effect.annotateCurrentSpan({ "relay.delivery.job_id": input.sourceJobId });
+              sourceJobId: input.sourceJobId,
-        const completedAt = DateTime.formatIso(yield* DateTime.now);
+              userId: input.userId,
-        yield* db
+              environmentId: input.environmentId,
-          .update(relayDeliveryAttempts)
+              threadId: input.threadId,
-          .set({
+              deviceId: input.deviceId,
-            createdAt: completedAt,
+              kind: input.kind,
-            apnsStatus: input.apnsStatus ?? null,
+              cause,
-            apnsReason: input.apnsReason ?? null,
+            }),
-            apnsId: input.apnsId ?? null,
+        ),
-            transportError: input.transportError ?? null,
+      );
-          })
+    }),
-          .where(eq(relayDeliveryAttempts.sourceJobId, input.sourceJobId));
+    completeSourceJob: Effect.fn("relay.delivery_attempts.complete_source_job")(function* (input) {
-      },
+      yield* Effect.annotateCurrentSpan({ "relay.delivery.job_id": input.sourceJobId });
-      Effect.mapError((cause) => new DeliveryAttemptRecordPersistenceError({ cause })),
+      const completedAt = DateTime.formatIso(yield* DateTime.now);
-    ),
+      yield* db
+        .update(relayDeliveryAttempts)
+        .set({
+          createdAt: completedAt,
+          apnsStatus: input.apnsStatus ?? null,
+          apnsReason: input.apnsReason ?? null,
+          apnsId: input.apnsId ?? null,
+          transportError: input.transportError ?? null,
+        })
+        .where(eq(relayDeliveryAttempts.sourceJobId, input.sourceJobId))
+        .pipe(
+          Effect.mapError(
+            (cause) =>
+              new DeliveryAttemptRecordPersistenceError({
+                operation: "complete-source-job",
+                sourceJobId: input.sourceJobId,
+                userId: null,
+                environmentId: null,
+                threadId: null,
+                deviceId: null,
+                kind: null,
+                cause,
+              }),
+          ),
+        );
+    }),
   });
 });