Keep queued messages visible across task switches

internal/agents/queue.go

@@ -63,7 +63,11 @@ func (m *Manager) Message(ctx context.Context, sessionID, actor, text, model str
 		sess.Model = model
 	}
 
-	err = m.store.AddTaskInput(ctx, store.TaskInput{TaskID: sess.TaskId, Actor: actor, Text: text, Images: images})
+	task, err := m.store.GetTask(ctx, sess.TaskId)
+	if err != nil {
+		return api.AgentSession{}, err
+	}
+	err = m.store.AddTaskInput(ctx, store.TaskInput{TaskID: sess.TaskId, Actor: actor, Text: text, Images: images}, task.ProjectId, sess.Id)
 	if err != nil {
 		return api.AgentSession{}, err
 	}

internal/store/taskinputs.go

@@ -16,15 +16,22 @@ type TaskInput struct {
 	CreatedAt time.Time
 }
 
-func (s *Store) AddTaskInput(ctx context.Context, in TaskInput) error {
+func (s *Store) AddTaskInput(ctx context.Context, in TaskInput, projectID, sessionID string) error {
 	images, err := json.Marshal(append([]string{}, in.Images...))
 	if err != nil {
 		return err
 	}
+	payload := map[string]any{"text": in.Text}
+	if len(in.Images) > 0 {
+		payload["images"] = in.Images
+	}
 	return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
 		_, err := tx.ExecContext(ctx, `INSERT INTO task_inputs (task_id, actor, text, images, created_at) VALUES (?, ?, ?, ?, ?)`,
 			in.TaskID, in.Actor, in.Text, string(images), now())
-		return err
+		if err != nil {
+			return err
+		}
+		return emit(sessionEvent("user.queued", projectID, in.TaskID, "", sessionID, in.Actor, payload))
 	})
 }
 

mac/Sources/Byre/Chat.swift

@@ -667,6 +667,9 @@ private struct PendingView: View {
                     }
                     .padding(.vertical, 4)
                 }
+                if !pending.imageIds.isEmpty {
+                    MessageImages(ids: pending.imageIds)
+                }
                 if !pending.md.isEmpty {
                     MarkdownView(blocks: pending.md)
                 }

mac/Sources/Byre/TranscriptBuilder.swift

@@ -131,6 +131,8 @@ struct PendingSend: Identifiable {
     let id: Int
     let text: String
     let images: [PendingImage]
+    let imageIds: [String]
+    let local: Bool
     let queued: Bool
     let md: [MDBlock]
 }
@@ -221,7 +223,7 @@ final class TranscriptBuilder {
 
     func showPending(_ text: String, _ images: [PendingImage]) -> () -> Void {
         pendingIds += 1
-        let entry = PendingSend(id: pendingIds, text: text, images: images, queued: running(), md: trimmed(text).isEmpty ? [] : parseMarkdown(text))
+        let entry = PendingSend(id: pendingIds, text: text, images: images, imageIds: [], local: true, queued: running(), md: trimmed(text).isEmpty ? [] : parseMarkdown(text))
         pending.append(entry)
         ctx.run = nil
         return { [weak self] in
@@ -229,8 +231,9 @@ final class TranscriptBuilder {
         }
     }
 
-    private func confirmPending(_ text: String) {
-        if let i = pending.firstIndex(where: { $0.text == text }) {
+    private func confirmPending(_ text: String, queued: Bool, local: Bool) {
+        let i = queued ? pending.firstIndex { !$0.local && $0.text == text } : nil
+        if let i = i ?? (local ? pending.firstIndex { $0.local && $0.text == text } : nil) {
             pending.remove(at: i)
         }
     }
@@ -402,8 +405,21 @@ final class TranscriptBuilder {
             if sink == nil && ((ev.kind == "agent.message" && parent.isEmpty) || ev.kind == "turn.ended" || ev.kind == "user.message") {
                 dropStream()
             }
-            if sink == nil && ev.kind == "user.message" && ev.actor != "byre" {
-                confirmPending(str(p, "text") ?? "")
+            if sink == nil && ev.kind == "user.message" {
+                confirmPending(str(p, "text") ?? "", queued: true, local: ev.actor != "byre")
+            }
+            if sink == nil && (ev.kind == "task.merged" || ev.kind == "task.discarded") {
+                pending.removeAll { !$0.local }
+            }
+            if ev.kind == "user.queued" {
+                if sink == nil {
+                    let text = str(p, "text") ?? ""
+                    confirmPending(text, queued: false, local: true)
+                    pendingIds += 1
+                    let images = (p["images"] as? [(any Sendable)?] ?? []).map { jsString($0) }
+                    pending.append(PendingSend(id: pendingIds, text: text, images: [], imageIds: images, local: false, queued: true, md: trimmed(text).isEmpty ? [] : parseMarkdown(text)))
+                }
+                continue
             }
             if ev.kind == "session.context" && sink != nil {
                 continue