Skip to content

Commit 4933663

Browse files
committed
fix(mobile): prevent stale queued creation sends
1 parent dd7f915 commit 4933663

2 files changed

Lines changed: 46 additions & 4 deletions

File tree

‎apps/mobile/src/state/thread-outbox.test.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,8 @@ describe("thread outbox", () => {
446446
await manager.enqueue(message);
447447
const edited = { ...message, text: "edited" };
448448
await expect(manager.update(edited)).resolves.toBe(true);
449+
await expect(manager.confirmQueued(message)).resolves.toBe(false);
450+
await expect(manager.confirmQueued(edited)).resolves.toBe(true);
449451
expect(registry.get(manager.queuedMessagesByThreadKeyAtom)).toEqual({
450452
"environment-1:thread-1": [edited],
451453
});
@@ -458,6 +460,43 @@ describe("thread outbox", () => {
458460
registry.dispose();
459461
});
460462

463+
it("waits for a saved edit before confirming a captured payload", async () => {
464+
const registry = AtomRegistry.make();
465+
let writeCount = 0;
466+
let releaseEditWrite!: () => void;
467+
const editWrite = new Promise<void>((resolve) => {
468+
releaseEditWrite = resolve;
469+
});
470+
const manager = createThreadOutboxManager({
471+
registry,
472+
storage: {
473+
load: async () => [],
474+
write: async () => {
475+
writeCount += 1;
476+
if (writeCount === 2) {
477+
await editWrite;
478+
}
479+
},
480+
remove: async () => undefined,
481+
},
482+
});
483+
const message = queuedMessage({
484+
messageId: "message-1",
485+
createdAt: "2026-06-08T10:00:01.000Z",
486+
});
487+
const edited = { ...message, text: "edited" };
488+
489+
await manager.enqueue(message);
490+
const update = manager.update(edited);
491+
const staleConfirmation = manager.confirmQueued(message);
492+
releaseEditWrite();
493+
494+
await expect(update).resolves.toBe(true);
495+
await expect(staleConfirmation).resolves.toBe(false);
496+
await expect(manager.confirmQueued(edited)).resolves.toBe(true);
497+
registry.dispose();
498+
});
499+
461500
it("only removes a missing-thread message after shell synchronization is live", () => {
462501
expect(
463502
resolveThreadOutboxDeliveryAction({

‎apps/mobile/src/state/use-thread-outbox-drain.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,13 @@ export function useThreadOutboxDrain(): void {
275275
environmentId: queuedMessage.environmentId,
276276
input: { cwd: projectCwd },
277277
});
278-
// The edit-lock guard ran before this await; the user may have opened
279-
// the queued row meanwhile. Defer to the next drain pass (true skips
280-
// the failure/backoff path) rather than sending a payload being edited.
281-
if (appAtomRegistry.get(editingQueuedMessageIdsAtom)[queuedMessage.messageId]) {
278+
// The edit-lock and queued-payload guards ran before this await. Defer
279+
// if editing started or a saved edit replaced the captured payload.
280+
const messageStillCurrent = await confirmThreadOutboxMessageQueued(queuedMessage);
281+
if (
282+
!messageStillCurrent ||
283+
appAtomRegistry.get(editingQueuedMessageIdsAtom)[queuedMessage.messageId]
284+
) {
282285
return true;
283286
}
284287
const isGitRepo =

0 commit comments

Comments
 (0)