fix(web,mobile): queued messages get a simpler Send now row, no reordering (#25846)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: t3dotgg

apps/mobile/src/features/threads/ThreadQueueControl.tsx

@@ -243,7 +243,7 @@ export function FloatingWorkingControl(props: {
         <Pressable
           accessibilityRole="button"
           accessibilityLabel={`Open queue, ${props.queuedCount} messages`}
-          accessibilityHint="Opens queued messages for reordering, steering, or removal"
+          accessibilityHint="Opens queued messages to send now, edit, or remove"
           onPress={props.onOpenQueue}
           onLayout={(event) => setQueueWidth(settleWidth(event.nativeEvent.layout.width))}
           style={{ maxWidth: Math.min(overlayWidth, windowWidth) * 0.45 }}

apps/mobile/src/features/threads/floating-working-control.tsx

@@ -1,10 +1,7 @@
 import { formatAssistantCitationHref } from "@t3tools/shared/assistantCitations";
 import { describe, expect, it } from "vite-plus/test";
 
-import {
-  resolveThreadQueueRowControls,
-  resolveQueueDropBeforeRunId,
-} from "./threadQueueControlPresentation";
+import { resolveThreadQueueRowControls } from "./threadQueueControlPresentation";
 
 describe("threadQueueControlPresentation", () => {
   it.each([
@@ -19,9 +16,6 @@ describe("threadQueueControlPresentation", () => {
         isEditing,
         canPromoteToSteer: false,
         canSendNow: true,
-        canReorder: false,
-        index: 0,
-        queuedCount: 1,
         text: "Queued message",
       });
 
@@ -45,9 +39,6 @@ describe("threadQueueControlPresentation", () => {
       busy: false,
       canPromoteToSteer: true,
       canSendNow: false,
-      canReorder: true,
-      index: 0,
-      queuedCount: 1,
       text: `[Assistant quote](${href}) Can we add a backoff here?`,
     });
 
@@ -61,17 +52,13 @@ describe("threadQueueControlPresentation", () => {
       busy: false,
       canPromoteToSteer: true,
       canSendNow: false,
-      canReorder: true,
-      index: 1,
       isEditing: true,
-      queuedCount: 3,
       text: "Being edited",
     });
 
     expect(editing.isEditing).toBe(true);
     expect(editing.canEdit).toBe(false);
     expect(editing.canSend).toBe(false);
-    expect(editing.canMoveUp).toBe(true);
     expect(editing.canDismiss).toBe(true);
   });
 
@@ -80,35 +67,11 @@ describe("threadQueueControlPresentation", () => {
       busy: false,
       canPromoteToSteer: true,
       canSendNow: false,
-      canReorder: true,
-      index: 0,
       isGuestMessage: true,
-      queuedCount: 1,
       text: "Why?",
     });
 
     expect(guest.canEdit).toBe(false);
     expect(guest.canDismiss).toBe(true);
   });
 });
-
-describe("queue drag insertion", () => {
-  const rows = [
-    { id: "first" as never, y: 0, height: 80 },
-    { id: "second" as never, y: 80, height: 140 },
-    { id: "third" as never, y: 220, height: 80 },
-  ];
-
-  it("moves between variable-height rows and to either end", () => {
-    expect(resolveQueueDropBeforeRunId(rows, rows[0]!.id, 140)).toBe("third");
-    expect(resolveQueueDropBeforeRunId(rows, rows[0]!.id, 300)).toBeNull();
-    expect(resolveQueueDropBeforeRunId(rows, rows[2]!.id, -300)).toBe("first");
-  });
-
-  it("does not send a reorder for an unchanged or unmeasured drop", () => {
-    expect(resolveQueueDropBeforeRunId(rows, rows[1]!.id, 0)).toBeUndefined();
-    expect(resolveQueueDropBeforeRunId(rows, rows[2]!.id, 20)).toBeUndefined();
-    expect(resolveQueueDropBeforeRunId([{ id: rows[0]!.id }], rows[0]!.id, 10)).toBeUndefined();
-    expect(resolveQueueDropBeforeRunId(rows, "missing" as never, 100)).toBeUndefined();
-  });
-});

apps/mobile/src/features/threads/threadQueueControlPresentation.test.ts

@@ -6,8 +6,6 @@ export const REMOVE_QUEUED_MESSAGE_ACCESSIBILITY_LABEL = "Remove queued message"
 export interface ThreadQueueRowControls {
   readonly canDismiss: boolean;
   readonly canEdit: boolean;
-  readonly canMoveDown: boolean;
-  readonly canMoveUp: boolean;
   readonly canSend: boolean;
   readonly dismissAccessibilityLabel: string;
   readonly displayText: string;
@@ -18,14 +16,11 @@ export function resolveThreadQueueRowControls(input: {
   readonly busy: boolean;
   readonly canPromoteToSteer: boolean;
   readonly canSendNow: boolean;
-  readonly canReorder: boolean;
   /** Something else holds the composer, such as an open question. */
   readonly editBlocked?: boolean;
-  readonly index: number;
   readonly isEditing?: boolean;
   /** A guest's message keeps the guest's words; the owner can cancel it, not rewrite it. */
   readonly isGuestMessage?: boolean;
-  readonly queuedCount: number;
   readonly text: string;
 }): ThreadQueueRowControls {
   const mutationEnabled = !input.busy;
@@ -37,8 +32,6 @@ export function resolveThreadQueueRowControls(input: {
     // away whatever has been typed since.
     canEdit:
       mutationEnabled && !isEditing && input.isGuestMessage !== true && input.editBlocked !== true,
-    canMoveDown: mutationEnabled && input.canReorder && input.index < input.queuedCount - 1,
-    canMoveUp: mutationEnabled && input.canReorder && input.index > 0,
     canSend: mutationEnabled && (input.canPromoteToSteer || input.canSendNow) && !isEditing,
     dismissAccessibilityLabel: REMOVE_QUEUED_MESSAGE_ACCESSIBILITY_LABEL,
     // Editing and sending keep the original text so quoted citations stay linked.
@@ -66,27 +59,3 @@ export function buildCancelQueuedRunCommand(input: {
     },
   };
 }
-
-export function resolveQueueDragBeforeRunId(
-  rows: ReadonlyArray<{ id: RunId; y?: number; height?: number }>,
-  runId: RunId,
-  translationY: number,
-): RunId | null | undefined {
-  const sourceIndex = rows.findIndex((row) => row.id === runId);
-  const source = rows[sourceIndex];
-  if (!source || rows.some((row) => row.y === undefined || row.height === undefined)) return;
-  const center = source.y! + source.height! / 2 + translationY;
-  const remaining = rows.filter((row) => row.id !== runId);
-  return remaining.find((row) => center < row.y! + row.height! / 2)?.id ?? null;
-}
-
-export function resolveQueueDropBeforeRunId(
-  rows: ReadonlyArray<{ id: RunId; y?: number; height?: number }>,
-  runId: RunId,
-  translationY: number,
-): RunId | null | undefined {
-  const before = resolveQueueDragBeforeRunId(rows, runId, translationY);
-  if (before === undefined) return;
-  const sourceIndex = rows.findIndex((row) => row.id === runId);
-  return before === (rows[sourceIndex + 1]?.id ?? null) ? undefined : before;
-}

apps/mobile/src/features/threads/threadQueueControlPresentation.ts

@@ -71,7 +71,6 @@ it("previews assistant quotes as readable text and preserves the citation when e
   state.workflow = {
     activeRun: { id: "run:active" },
     canPromoteToSteer: true,
-    canReorder: true,
     queuedRuns: [
       {
         run: { id: "run:quote-only", userMessageId: "message:quote-only" },