Skip to content

Fix: create macOS delivery row before awaiting LLM copy #8127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noanflaherty merged 1 commit into from
Feb 24, 2026
Merged

Fix: create macOS delivery row before awaiting LLM copy #8127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions assistant/src/calls/guardian-dispatch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ export async function dispatchGuardianQuestion(params: GuardianDispatchParams):
// Create delivery rows and dispatch
for (const dest of destinations) {
if (dest.channel === 'macos') {
const guardianCopy = await guardianCopyPromise;

// Create a dedicated server-side conversation for the mac guardian thread
// Create conversation and delivery row synchronously so they exist
// before awaiting LLM copy — prevents a race where an external channel
// reply resolves the request before the macOS delivery is created.
const macConvKey = `asst:${assistantId}:guardian:request:${request.id}`;
const { conversationId: macConversationId } = getOrCreateConversation(macConvKey);

Expand All @@ -127,6 +127,9 @@ export async function dispatchGuardianQuestion(params: GuardianDispatchParams):
destinationConversationId: macConversationId,
});

// Now await LLM-generated copy for the message content and thread title
const guardianCopy = await guardianCopyPromise;

// Add the guardian question as the initial message in the thread
addMessage(
macConversationId,
Expand Down