@devries-cameron20 / t3code-1 / commits / 9b1ea43cc4
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(relay): queued APNs jobs skip delivery when the activity recheck fails (#38971)

Julius Marminge committed Nov 19, 2026 at 00:09 UTC 9b1ea43cc4b4378a5ad3cdbeaf1e570166080766
2 files changed +39 -15
infra/relay/src/agentActivity/ApnsDeliveries.test.ts
+33 -11
@@ -156,6 +156,7 @@ function layerFor(input: {
156 readonly config?: RelayConfiguration.RelayConfiguration["Service"];
157 readonly activityStates?: ReadonlyArray<RelayAgentActivityState>;
158 readonly currentActivityStates?: ReadonlyArray<RelayAgentActivityState>;
159 + readonly activityRecheckFails?: boolean;
160 readonly execute?: (
161 request: HttpClientRequest.HttpClientRequest,
162 ) => Effect.Effect<HttpClientResponse.HttpClientResponse>;
@@ -175,13 +176,20 @@ function layerFor(input: {
176 input.activityStates !== undefined
177 ? Effect.succeed([...input.activityStates])
178 : Effect.succeed([state]),
178 - getForUserThread: ({ environmentId, threadId }) =>
179 - Effect.succeed(
180 - (input.currentActivityStates ?? input.activityStates ?? [state]).find(
181 - (current) =>
182 - current.environmentId === environmentId && current.threadId === threadId,
183 - ) ?? null,
184 - ),
179 + getForUserThread: ({ userId, environmentId, threadId }) =>
180 + input.activityRecheckFails
181 + ? Effect.fail(
182 + new AgentActivityRows.AgentActivityRowListPersistenceError({
183 + userId,
184 + cause: new Error("database unavailable"),
185 + }),
186 + )
187 + : Effect.succeed(
188 + (input.currentActivityStates ?? input.activityStates ?? [state]).find(
189 + (current) =>
190 + current.environmentId === environmentId && current.threadId === threadId,
191 + ) ?? null,
192 + ),
193 } satisfies AgentActivityRows.AgentActivityRows["Service"]),
194 Layer.succeed(ApnsDeliveryQueue.ApnsDeliveryQueueSender, {
195 send: (body) =>
@@ -688,8 +696,13 @@ describe("ApnsDeliveries", () => {
696 },
697 );
698
691 - it.effect("processes signed push notification jobs through APNs and records attempts", () => {
699 + it.effect.each([
700 + { name: "records the APNs attempt", activityRecheckFails: false },
701 + { name: "skips the job when the activity recheck fails", activityRecheckFails: true },
702 + ])("processes signed push notification jobs: $name", ({ activityRecheckFails }) => {
703 const attempts: Array<DeliveryAttempts.DeliveryAttemptInput> = [];
704 + let apnsRequests = 0;
705 + const waiting = { ...state, phase: "waiting_for_input" as const };
706 const payload = makeApnsDeliveryJobPayload({
707 kind: "push_notification",
708 userId: target.user_id,
@@ -702,6 +715,8 @@ describe("ApnsDeliveries", () => {
715 environmentId: "env",
716 threadId: "thread",
717 deepLink: "/",
718 + phase: waiting.phase,
719 + updatedAt: waiting.updatedAt,
720 },
721 createdAt: "1970-01-01T00:00:00.000Z",
722 expiresAt: "1970-01-01T00:10:00.000Z",
@@ -712,7 +727,10 @@ describe("ApnsDeliveries", () => {
727 payload,
728 });
729 const execute = (request: HttpClientRequest.HttpClientRequest) =>
715 - Effect.succeed(HttpClientResponse.fromWeb(request, new Response("", { status: 200 })));
730 + Effect.sync(() => {
731 + apnsRequests += 1;
732 + return HttpClientResponse.fromWeb(request, new Response("", { status: 200 }));
733 + });
734
735 return Effect.gen(function* () {
736 const deliveries = yield* ApnsDeliveries.ApnsDeliveries;
@@ -720,7 +738,7 @@ describe("ApnsDeliveries", () => {
738
739 expect(result.kind).toBe("push_notification");
740 expect(result.ok).toBe(true);
723 - expect(result.apnsStatus).toBe(200);
741 + expect(apnsRequests).toBe(activityRecheckFails ? 0 : 1);
742 expect(attempts).toMatchObject([
743 {
744 kind: "push_notification",
@@ -729,7 +747,9 @@ describe("ApnsDeliveries", () => {
747 environmentId: "env",
748 threadId: "thread",
749 deviceId: target.device_id,
732 - apnsStatus: 200,
750 + ...(activityRecheckFails
751 + ? { apnsReason: "Stale agent activity state skipped." }
752 + : { apnsStatus: 200 }),
753 },
754 ]);
755 }).pipe(
@@ -743,6 +763,8 @@ describe("ApnsDeliveries", () => {
763 },
764 ],
765 config: signingConfig,
766 + currentActivityStates: [waiting],
767 + activityRecheckFails,
768 execute,
769 }),
770 ),
infra/relay/src/agentActivity/ApnsDeliveries.ts
+6 -4
@@ -554,12 +554,14 @@ const make = Effect.gen(function* () {
554 current.phase === input.phase &&
555 current.updatedAt === input.updatedAt,
556 ),
557 + // Fail closed: this recheck is what stops a transferred environment's
558 + // content from reaching the previous owner's devices.
559 Effect.catchCause((cause) =>
558 - Effect.logWarning("agent-activity state recheck failed; allowing queued delivery", {
560 + Effect.logWarning("agent-activity state recheck failed; skipping queued delivery", {
561 cause,
562 environmentId: input.environmentId,
563 threadId: input.threadId,
562 - }).pipe(Effect.as(true)),
564 + }).pipe(Effect.as(false)),
565 ),
566 );
567 });
@@ -586,10 +588,10 @@ const make = Effect.gen(function* () {
588 });
589 }),
590 Effect.catchCause((cause) =>
589 - Effect.logWarning("agent-activity aggregate recheck failed; allowing queued delivery", {
591 + Effect.logWarning("agent-activity aggregate recheck failed; skipping queued delivery", {
592 cause,
593 userId: input.userId,
592 - }).pipe(Effect.as(true)),
594 + }).pipe(Effect.as(false)),
595 ),
596 );
597 });