fix(mobile): steer active turns by default (#6543)

Author: chrisdeeming

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined

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

@@ -105,7 +105,6 @@ export interface ThreadComposerProps {
 readonlyselectedThread: OrchestrationThreadShell;
 readonlyserverConfig: T3ServerConfig|null;
 readonlyqueueCount: number;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectCwd: string|null;
 readonlyeditorRef?: RefObject<ComposerEditorHandle|null>;
@@ -327,9 +326,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 props.selectedThread.session?.status==="starting";
 
 constsendLabel=
-props.connectionState!=="connected"||props.activeThreadBusy||props.queueCount>0
- ? "Queue"
- : "Send";
+props.connectionState!=="connected"||props.queueCount>0 ? "Queue" : "Send";
 constcurrentModelSelection=props.selectedThread.modelSelection;
 constcurrentRuntimeMode=props.selectedThread.runtimeMode;
 constconnectionStatus=composerConnectionStatus({

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

@@ -101,7 +101,6 @@ export interface ThreadDetailScreenProps {
 readonlythreadSyncStatus?: EnvironmentThreadStatus;
 /** Non-null when older turns exist beyond the loaded window. */
 readonlyloadEarlier?: {readonlyloading: boolean;readonlyonLoadEarlier: ()=>void}|null;
-readonlyactiveThreadBusy: boolean;
 readonlyenvironmentId: EnvironmentId;
 readonlyprojectWorkspaceRoot: string|null;
 readonlythreadCwd: string|null;
@@ -727,7 +726,6 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 selectedThread={props.selectedThread}
 serverConfig={props.serverConfig}
 queueCount={props.selectedThreadQueueCount}
-activeThreadBusy={props.activeThreadBusy}
 environmentId={props.environmentId}
 projectCwd={props.projectWorkspaceRoot}
 bottomInset={composerBottomInset}

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

@@ -785,7 +785,6 @@ function ThreadRouteContent(
 connectionStateLabel={routeConnectionState}
 threadSyncStatus={selectedThreadDetailState.status}
 loadEarlier={loadEarlierTurns}
-activeThreadBusy={composer.activeThreadBusy}
 environmentId={selectedThread.environmentId}
 projectWorkspaceRoot={selectedThreadProject?.workspaceRoot??null}
 threadCwd={selectedThreadCwd}

apps/mobile/src/state/thread-outbox-model.ts

@@ -169,7 +169,7 @@ export function resolveThreadOutboxDeliveryAction(input: {
 if(!input.threadExists){
 returninput.shellStatus==="live" ? "remove" : "wait";
 }
-returninput.environmentConnected&&!input.threadBusy? "send" : "wait";
+returninput.environmentConnected ? "send" : "wait";
 }
 
 /**

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

@@ -487,6 +487,27 @@ describe("thread outbox", () => {
 ).toBe("send");
 });
 
+it("sends existing-thread messages whenever connected so queued messages can steer",()=>{
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: true,
+threadBusy: true,
+}),
+).toBe("send");
+expect(
+resolveThreadOutboxDeliveryAction({
+isCreation: false,
+threadExists: true,
+shellStatus: "live",
+environmentConnected: false,
+threadBusy: true,
+}),
+).toBe("wait");
+});
+
 it("sends queued creations once connected and live, removing already-created ones",()=>{
 expect(
 resolveThreadOutboxDeliveryAction({

apps/mobile/src/state/use-thread-composer-state.ts

@@ -129,10 +129,6 @@ export function useThreadComposerState() {
 );
 },[selectedThreadDetail,selectedThreadSessionActivity,selectedThreadShell]);
 
-constactiveThreadBusy=
-!!selectedThread&&
-(selectedThread.session?.status==="running"||selectedThread.session?.status==="starting");
-
 constonSendMessage=useCallback(async()=>{
 if(!selectedThreadShell){
 returnnull;
@@ -308,7 +304,6 @@ export function useThreadComposerState() {
  modelSelection,
  runtimeMode,
  interactionMode,
- activeThreadBusy,
  onChangeDraftMessage,
  onPickDraftImages,
  onPasteIntoDraft,

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

@@ -37,7 +37,7 @@ import {
 typeQueuedThreadMessage,
 typeThreadOutboxCommandStage,
 }from"./thread-outbox-model";
-import{environmentThreadShells,threadEnvironment}from"./threads";
+import{threadEnvironment}from"./threads";
 import{useAtomCommand}from"./use-atom-command";
 import{
 editingQueuedMessageIdsAtom,
@@ -362,22 +362,12 @@ export function useThreadOutboxDrain(): void {
 returntrue;
 }
 // The guards evaluated before the confirmation await are stale by now:
-// the thread may have gone busy, or the user may have opened this
-// message in the editor. Re-read both and defer to the next drain pass
-// (returning true skips the failure/backoff path) rather than sending
-// a payload the user is editing or racing an active turn.
+// the user may have opened this message in the editor. Re-read that
+// guard and defer to the next drain pass (returning true skips the
+// failure/backoff path) rather than sending a payload being edited.
 if(appAtomRegistry.get(editingQueuedMessageIdsAtom)[nextQueuedMessage.messageId]){
 returntrue;
 }
-constfreshThread=findThread(
-appAtomRegistry.get(environmentThreadShells.threadShellsAtom),
-nextQueuedMessage,
-);
-constfreshThreadBusy=
-freshThread?.session?.status==="running"||freshThread?.session?.status==="starting";
-if(deliveryAction==="send"&&creation===undefined&&freshThreadBusy){
-returntrue;
-}
 returndeliveryAction==="remove"
  ? removeQueuedMessage("[thread-outbox] failed to remove message for a missing thread")
  : creation!==undefined