@@ -20,6 +20,7 @@ import {
2020 AuthTerminalReadScope ,
2121 DEFAULT_SERVER_SETTINGS ,
2222 EnvironmentId ,
23+ MessageId ,
2324 ThreadId ,
2425 type ProjectScript ,
2526} from "@t3tools/contracts" ;
@@ -54,6 +55,10 @@ import {
5455} from "../../state/use-remote-environment-registry" ;
5556import { useKnownTerminalSessions } from "../../state/use-terminal-session" ;
5657import { uuidv4 } from "../../lib/uuid" ;
58+ import {
59+ isAtomCommandInterrupted ,
60+ squashAtomCommandFailure ,
61+ } from "@t3tools/client-runtime/state/runtime" ;
5762import { readEnvironmentScope , useEnvironmentScope } from "../../state/session" ;
5863import { useSelectedThreadDetailState } from "../../state/use-thread-detail" ;
5964import { useThreadSelection } from "../../state/use-thread-selection" ;
@@ -101,6 +106,7 @@ import {
101106 threadRouteOpensDraft ,
102107} from "./thread-route-hydration" ;
103108import { ThreadHeader } from "./ThreadHeader" ;
109+ import { resumeThread } from "./resume-thread" ;
104110import {
105111 useAndroidWorkspaceBack ,
106112 useWorkspaceBackNavigation ,
@@ -379,7 +385,22 @@ function ThreadRouteContent(
379385 const gitActions = useSelectedThreadGitActions ( ) ;
380386 const requests = useSelectedThreadRequests ( ) ;
381387 const interruptThreadTurn = useAtomCommand ( threadEnvironment . interruptTurn , "thread interrupt" ) ;
382- const resumeThreadQueue = useAtomCommand ( threadEnvironment . resumeThreadQueue , "resume queue" ) ;
388+ const resumeThreadQueue = useAtomCommand ( threadEnvironment . resumeThreadQueue , {
389+ label : "resume queue" ,
390+ reportFailure : false ,
391+ } ) ;
392+ const continueThreadRun = useAtomCommand ( threadEnvironment . startTurn , {
393+ label : "continue thread" ,
394+ reportFailure : false ,
395+ } ) ;
396+ const setThreadRuntimeMode = useAtomCommand ( threadEnvironment . setRuntimeMode , {
397+ label : "set thread runtime mode" ,
398+ reportFailure : false ,
399+ } ) ;
400+ const setThreadInteractionMode = useAtomCommand ( threadEnvironment . setInteractionMode , {
401+ label : "set thread interaction mode" ,
402+ reportFailure : false ,
403+ } ) ;
383404 const loadEarlierHistory = useAtomCommand ( threadEnvironment . loadEarlierHistory , {
384405 label : "load earlier thread history" ,
385406 reportFailure : false ,
@@ -683,10 +704,27 @@ function ThreadRouteContent(
683704
684705 const handleResumeQueue = async ( ) => {
685706 if ( ! selectedThread ) return ;
686- await resumeThreadQueue ( {
687- environmentId : selectedThread . environmentId ,
688- input : { threadId : selectedThread . id } ,
707+ const result = await resumeThread ( {
708+ thread : selectedThread ,
709+ resumableRunId : composer . resumableRunId ,
710+ queueHeld : composer . queueHeld ,
711+ runtimeMode : composer . runtimeMode ?? selectedThread . runtimeMode ,
712+ interactionMode : composer . interactionMode ?? selectedThread . interactionMode ,
713+ modelSelection : composer . modelSelection ,
714+ messageId : MessageId . make ( uuidv4 ( ) ) ,
715+ createdAt : new Date ( ) . toISOString ( ) ,
716+ setRuntimeMode : setThreadRuntimeMode ,
717+ setInteractionMode : setThreadInteractionMode ,
718+ startTurn : continueThreadRun ,
719+ resumeQueue : resumeThreadQueue ,
689720 } ) ;
721+ if ( result . _tag === "Failure" && ! isAtomCommandInterrupted ( result ) ) {
722+ const error = squashAtomCommandFailure ( result ) ;
723+ Dialog . alert (
724+ "Could not resume thread" ,
725+ error instanceof Error ? error . message : "Try again." ,
726+ ) ;
727+ }
690728 } ;
691729
692730 const handleOpenTerminal = ( nextTerminalId ?: string | null ) => {
@@ -1071,7 +1109,9 @@ function ThreadRouteContent(
10711109 onRemoveDraftImage = { composer . onRemoveDraftImage }
10721110 serverConfig = { serverConfig }
10731111 onStopThread = { awaitingBootstrapTurn ? handleCancelWorktreeSetup : handleStopThread }
1074- onResumeQueue = { composer . queueHeld ? handleResumeQueue : null }
1112+ onResumeQueue = {
1113+ composer . queueHeld || composer . resumableRunId !== null ? handleResumeQueue : null
1114+ }
10751115 onSendMessage = { composer . onSendMessage }
10761116 onReconnectEnvironment = { handleReconnectEnvironment }
10771117 canSwitchThreadProvider = { composer . canSwitchThreadProvider }
0 commit comments