fix: address PR review feedback for queued messages

- Export `enqueue` from `createChatRunService`
- Provide empty metadata block to runs created via legacy `/api/chat` to populate `conversationId`
- Mark `nextRun.status = 'starting'` before invoking async preflight in `maybeStartNext` to prevent a race condition
- Update `ChatComposer.tsx` to not short-circuit submit when streaming
- Add `chat.queue` to `Dict` and all locales for the Queue button text

Author: Moe1211

apps/daemon/src/runs.ts

@@ -79,23 +79,26 @@ export function createChatRunService({
       .sort((a, b) => a.createdAt - b.createdAt);
 
     // Check if any run is currently active for this conversation.
-    const activeRun = conversationRuns.find((r) => !TERMINAL_RUN_STATUSES.has(r.status) && r.status !== 'queued');
+    const activeRun = conversationRuns.find((r) => (!TERMINAL_RUN_STATUSES.has(r.status) && r.status !== 'queued') || r._isStarting);
     if (activeRun) return;
 
     // Find the oldest queued run.
-    const nextRun = conversationRuns.find((r) => r.status === 'queued');
+    const nextRun = conversationRuns.find((r) => r.status === 'queued' && !r._isStarting);
     if (nextRun) {
       const starter = starters.get(nextRun.id);
       if (starter) {
         // Remove from starters map once we're about to run it
         starters.delete(nextRun.id);
+        // Mark as starting to prevent race condition while async preflight runs
+        nextRun._isStarting = true;
         start(nextRun, starter);
       }
     }
   };
 
   const finish = (run, status, code = null, signal = null) => {
     if (TERMINAL_RUN_STATUSES.has(run.status)) return;
+    run._isStarting = false;
     run.status = status;
     run.exitCode = code;
     run.signal = signal;
@@ -117,12 +120,15 @@ export function createChatRunService({
   const start = (run, starter) => {
     void starter(run).catch((err) => {
       fail(run, 'AGENT_EXECUTION_FAILED', err instanceof Error ? err.message : String(err));
+    }).finally(() => {
+      run._isStarting = false;
     });
     return run;
   };
 
   const enqueue = (run, starter) => {
     if (run.status !== 'queued') return run; // Only enqueue fresh runs
+    if (!run.conversationId) return start(run, starter);
     starters.set(run.id, starter);
     maybeStartNext(run.conversationId);
     return run;
@@ -172,6 +178,7 @@ export function createChatRunService({
   return {
     create,
     start,
+    enqueue,
     get,
     list,
     stream,

apps/daemon/src/server.ts

@@ -3942,7 +3942,7 @@ export async function startServer({ port = 7456, host = process.env.OD_BIND_HOST
   });
 
   app.post('/api/chat', (req, res) => {
-    const run = design.runs.create();
+    const run = design.runs.create(req.body || {});
     design.runs.stream(run, req, res);
     design.runs.enqueue(run, () => startChatRun(req.body || {}, run));
   });

apps/web/src/components/ChatComposer.tsx

@@ -488,12 +488,11 @@ export const ChatComposer = forwardRef<ChatComposerHandle, Props>(
       // adopts it from "Recently hatched" in pet settings afterwards.
       const hatched = expandHatchCommand(prompt);
       if (hatched) {
-        if (streaming) return;
         onSend(hatched, staged, commentAttachments);
         reset();
         return;
       }
-      if ((!prompt && commentAttachments.length === 0) || streaming) return;
+      if (!prompt && commentAttachments.length === 0) return;
       onSend(prompt, staged, commentAttachments);
       reset();
     }
@@ -809,7 +808,7 @@ export const ChatComposer = forwardRef<ChatComposerHandle, Props>(
               disabled={!draft.trim() && commentAttachments.length === 0}
             >
               <Icon name="send" size={13} />
-              <span>{streaming ? 'Queue' : t('chat.send')}</span>
+              <span>{streaming ? t('chat.queue') : t('chat.send')}</span>
             </button>
           </div>
         </div>

apps/web/src/components/ProjectView.tsx

@@ -192,6 +192,8 @@ export function ProjectView({
     prompt: string;
     attachments: ChatAttachment[];
     commentAttachments: ChatCommentAttachment[];
+    projectId: string;
+    conversationId: string;
   } | null>(null);
   const abortRef = useRef<AbortController | null>(null);
   const cancelRef = useRef<AbortController | null>(null);
@@ -854,6 +856,16 @@ export function ProjectView({
       if (!activeConversationId) return;
       if (streaming) return;
       if (!prompt.trim() && attachments.length === 0 && commentAttachments.length === 0) return;
+      if (streaming) {
+        setQueuedMessage({
+          prompt,
+          attachments,
+          commentAttachments,
+          projectId: project.id,
+          conversationId: activeConversationId,
+        });
+        return;
+      }
       setError(null);
       const startedAt = Date.now();
       const userMsg: ChatMessage = {
@@ -1207,14 +1219,22 @@ export function ProjectView({
   // Dispatch queued messages after the current run finishes.
   useEffect(() => {
     if (!streaming && queuedMessage) {
+      if (
+        queuedMessage.projectId !== project.id ||
+        queuedMessage.conversationId !== activeConversationId
+      ) {
+        // Clear if the user switched contexts before the stream finished
+        setQueuedMessage(null);
+        return;
+      }
       const { prompt, attachments, commentAttachments } = queuedMessage;
       setQueuedMessage(null);
       // Wait a tick so state has settled (streaming=false) before dispatching
       setTimeout(() => {
         void handleSend(prompt, attachments, commentAttachments);
       }, 0);
     }
-  }, [streaming, queuedMessage, handleSend]);
+  }, [streaming, queuedMessage, project.id, activeConversationId, handleSend]);
 
   const persistArtifact = useCallback(
     async (art: Artifact) => {
@@ -1527,7 +1547,6 @@ export function ProjectView({
           onRequestOpenFile={requestOpenFile}
           initialDraft={initialDraft}
           onSubmitForm={(text) => {
-            if (streaming) return;
             void handleSend(text, [], []);
           }}
           onContinueRemainingTasks={handleContinueRemainingTasks}

apps/web/src/i18n/locales/ar.ts

@@ -451,6 +451,7 @@ export const ar: Dict = {
   'chat.linkedFolderAlready': 'هذا المجلد مرتبط بالفعل',
   'chat.linkedFolderPickError': 'تعذر فتح منتقي المجلدات',
   'chat.send': 'إرسال',
+  'chat.queue': 'Queue',
   'chat.stop': 'إيقاف',
   'chat.removeAria': 'إزالة {name}',
   'chat.example1Title': 'عرض تقديمي تحريري',

apps/web/src/i18n/locales/de.ts

@@ -405,6 +405,7 @@ export const de: Dict = {
   'chat.linkedFolderAlready': 'Dieser Ordner ist bereits verknüpft',
   'chat.linkedFolderPickError': 'Ordnerauswahl konnte nicht geöffnet werden',
   'chat.send': 'Senden',
+  'chat.queue': 'Queue',
   'chat.stop': 'Stoppen',
   'chat.removeAria': '{name} entfernen',
   'chat.example1Title': 'Editorial Pitch Deck',

apps/web/src/i18n/locales/en.ts

@@ -462,6 +462,7 @@ export const en: Dict = {
   'chat.linkedFolderAlready': 'This folder is already linked',
   'chat.linkedFolderPickError': 'Could not open folder picker',
   'chat.send': 'Send',
+  'chat.queue': 'Queue',
   'chat.stop': 'Stop',
   'chat.removeAria': 'Remove {name}',
   'chat.example1Title': 'Editorial pitch deck',

apps/web/src/i18n/locales/es-ES.ts

@@ -406,6 +406,7 @@ export const esES: Dict = {
   'chat.linkedFolderAlready': 'Esta carpeta ya está vinculada',
   'chat.linkedFolderPickError': 'No se pudo abrir el selector de carpetas',
   'chat.send': 'Enviar',
+  'chat.queue': 'Queue',
   'chat.stop': 'Detener',
   'chat.removeAria': 'Quitar {name}',
   'chat.example1Title': 'Pitch deck editorial',

apps/web/src/i18n/locales/fa.ts

@@ -462,6 +462,7 @@ export const fa: Dict = {
   'chat.linkedFolderAlready': 'این پوشه قبلاً لینک شده است',
   'chat.linkedFolderPickError': 'انتخابگر پوشه باز نشد',
   'chat.send': 'ارسال',
+  'chat.queue': 'Queue',
   'chat.stop': 'توقف',
   'chat.removeAria': 'حذف {name}',
   'chat.example1Title': 'ارائه سردبیری',

apps/web/src/i18n/locales/fr.ts

@@ -451,6 +451,7 @@ export const fr: Dict = {
   'chat.linkedFolderAlready': 'Ce dossier est déjà lié',
   'chat.linkedFolderPickError': 'Impossible d\'ouvrir le sélecteur de dossier',
   'chat.send': 'Envoyer',
+  'chat.queue': 'Queue',
   'chat.stop': 'Arrêter',
   'chat.removeAria': 'Retirer {name}',
   'chat.example1Title': 'Pitch deck éditorial',