Merge upstream PR pingdotgg#16889: continue a usage-limited thread with the picked model

The explicit account from the limit banner still wins over the composer's
selection, and the pill uses the send button's current disabled condition.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: AdEx-Partners-DE

apps/server/src/orchestration-v2/runtimeLayer.test.ts

@@ -4800,6 +4800,10 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const events = yield* EventSink.EventSinkV2;
         const threadId = ThreadId.make(`manual-resume:${reason}`);
+        const switchedModelSelection = {
+          instanceId: alternateInstanceId,
+          model: "gpt-5.5",
+        } satisfies ModelSelection;
         const projectId = ProjectId.make(`manual-resume:project:${reason}`);
         const now = yield* DateTime.now;
         const createdAt = DateTime.formatIso(now);
@@ -4932,6 +4936,8 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
           manualContinuationOfRunId: source.id,
           text: "Continue where you left off.",
           attachments: [],
+          // A usage limit is often sidestepped by continuing on another provider.
+          ...(reason === "usage_limit" ? { modelSelection: switchedModelSelection } : {}),
           dispatchMode: { type: "start_immediately" as const },
           createdBy: "user" as const,
           creationSource: "web" as const,
@@ -4941,6 +4947,10 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
         assert.lengthOf(after.runs, 3);
         assert.equal(after.runs[1]?.status, "queued");
         assert.equal(after.runs[2]?.status, "starting");
+        const expectedModelSelection =
+          reason === "usage_limit" ? switchedModelSelection : modelSelection;
+        assert.deepEqual(after.runs[2]?.modelSelection, expectedModelSelection);
+        assert.deepEqual(after.thread.modelSelection, expectedModelSelection);
         assert.equal(
           (yield* orchestrator.dispatch(resume("second")).pipe(Effect.exit))._tag,
           "Failure",

apps/web/src/components/ChatView.tsx

@@ -2153,16 +2153,17 @@ export default function ChatView(props: ChatViewProps) {
     isServerThread &&
     serverProjection?.runs.some((run) => run.status === "queued" && run.queueHeld === true) ===
       true;
-  const resumableRunId = useMemo(() => {
+  const resumableRun = useMemo(() => {
     if (!isServerThread || serverProjection === null) return null;
     const run = latestExecutedRun(serverProjection.runs);
-    if (run?.status === "interrupted") return run.id;
+    if (run?.status === "interrupted") return run;
     return run?.status === "failed" &&
       serverRuntime?.lastErrorClass === "usage_limit" &&
       latestRootProviderFailure(run, serverProjection.turnItems)?.class === "usage_limit"
-      ? run.id
+      ? run
       : null;
   }, [isServerThread, serverProjection, serverRuntime?.lastErrorClass]);
+  const resumableRunId = resumableRun?.id ?? null;
   const parentSubagentThreadId =
     activeThread?.lineage.relationshipToParent === "subagent"
       ? activeThread.lineage.parentThreadId
@@ -8731,8 +8732,8 @@ export default function ChatView(props: ChatViewProps) {
     void sendStandaloneCommand("/compact", "Failed to compact context.");
   };
 
-  // `modelSelection` moves the thread to another account while it continues.
-  const resumeThread = async (modelSelection?: ModelSelection) => {
+  // `switchTo` moves the thread to another account while it continues.
+  const resumeThread = async (switchTo?: ModelSelection) => {
     if (
       !activeThread ||
       (resumableRunId === null && !hasHeldQueuedRuns) ||
@@ -8766,6 +8767,9 @@ export default function ChatView(props: ChatViewProps) {
           interactionMode,
         });
         if (settingsResult._tag === "Failure") return settingsResult;
+        // A model picked after the run stopped (say, to get past a usage limit) carries the turn.
+        const modelSelection =
+          switchTo ?? composerRef.current?.getSendContext().selectedModelSelection;
         const turnResult = await startThreadTurn({
           environmentId,
           input: {
@@ -11699,6 +11703,7 @@ export default function ChatView(props: ChatViewProps) {
                               isConnecting={isConnecting}
                               isSendBusy={isSendBusy || isSavingQueuedEdit || isResuming}
                               canResume={resumableRunId !== null || hasHeldQueuedRuns}
+                              resumeRunModelSelection={resumableRun?.modelSelection ?? null}
                               isRevertingCheckpoint={isRevertingCheckpoint}
                               sendDisabledReason={
                                 !canOperateThread

apps/web/src/components/chat/ChatComposer.tsx

@@ -1379,6 +1379,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
   isEnvironmentUnavailable: boolean;
   hasSendableContent: boolean;
   canResume: boolean;
+  resumeModelName: string | null;
   preserveComposerFocusOnPointerDown?: boolean;
   isEditingQueuedMessage: boolean;
   onSubmitMessage: React.MouseEventHandler<HTMLButtonElement>;
@@ -1423,6 +1424,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
         isPreparingWorktree={props.isPreparingWorktree}
         hasSendableContent={props.hasSendableContent}
         canResume={props.canResume}
+        resumeModelName={props.resumeModelName}
         preserveComposerFocusOnPointerDown={props.preserveComposerFocusOnPointerDown ?? false}
         isEditingQueuedMessage={props.isEditingQueuedMessage}
         onSubmitMessage={props.onSubmitMessage}
@@ -1549,6 +1551,8 @@ export interface ChatComposerProps {
   isConnecting: boolean;
   isSendBusy: boolean;
   canResume: boolean;
+  /** The model the resumable run used; resuming with a different composer model continues with it. */
+  resumeRunModelSelection: ModelSelection | null;
   isRevertingCheckpoint?: boolean;
   sendDisabledReason: string | null;
   isPreparingWorktree: boolean;
@@ -1733,6 +1737,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     isConnecting,
     isSendBusy,
     canResume,
+    resumeRunModelSelection,
     isRevertingCheckpoint = false,
     sendDisabledReason: externalSendDisabledReason,
     isPreparingWorktree,
@@ -3035,6 +3040,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   );
   const showResumeAction =
     canResume && !composerDraftHasUserContent(composerDraft) && !isEditingQueuedMessage;
+  const resumeModelName =
+    showResumeAction &&
+    resumeRunModelSelection !== null &&
+    (resumeRunModelSelection.instanceId !== selectedModelSelection.instanceId ||
+      resumeRunModelSelection.model !== selectedModelSelection.model)
+      ? resolveContextWindowModelDisplayName(selectedModelSelection, modelOptionsByInstance)
+      : null;
   const collapsedComposerPrimaryActionDisabled =
     phase === "running" ||
     isSendBusy ||
@@ -3044,11 +3056,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     projectSelectionRequired ||
     environmentUnavailable !== null ||
     (!composerSendState.hasSendableContent && !showResumeAction);
-  const collapsedComposerPrimaryActionLabel = showResumeAction
-    ? "Resume thread"
-    : props.resumeCompactionTokens !== null && !props.keepFullHistory
-      ? "Open composer to compact and send"
-      : "Send message";
+  const collapsedComposerPrimaryActionLabel = resumeModelName
+    ? `Continue with ${resumeModelName}`
+    : showResumeAction
+      ? "Resume thread"
+      : props.resumeCompactionTokens !== null && !props.keepFullHistory
+        ? "Open composer to compact and send"
+        : "Send message";
   const showMobilePendingAnswerActions =
     isMobileViewport && !isComposerCollapsedMobile && pendingPrimaryAction !== null;
 
@@ -7690,6 +7704,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                     isPreparingWorktree={isPreparingWorktree}
                     hasSendableContent={composerSendState.hasSendableContent}
                     canResume={showResumeAction}
+                    resumeModelName={resumeModelName}
                     preserveComposerFocusOnPointerDown={isMobileViewport || isComposerResting}
                     isEditingQueuedMessage={isEditingQueuedMessage}
                     onSubmitMessage={handleSubmitMessage}

apps/web/src/components/chat/ComposerPrimaryActions.tsx

@@ -44,6 +44,8 @@ interface ComposerPrimaryActionsProps {
   isPreparingWorktree: boolean;
   hasSendableContent: boolean;
   canResume?: boolean;
+  /** Set when the composer's model differs from the run being resumed: resume continues with it. */
+  resumeModelName?: string | null;
   preserveComposerFocusOnPointerDown?: boolean;
   isEditingQueuedMessage?: boolean;
   onSubmitMessage?: MouseEventHandler<HTMLButtonElement>;
@@ -102,6 +104,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
   isPreparingWorktree,
   hasSendableContent,
   canResume = false,
+  resumeModelName = null,
   preserveComposerFocusOnPointerDown = false,
   isEditingQueuedMessage = false,
   onSubmitMessage,
@@ -276,6 +279,34 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
       : null;
   const compactsBeforeSend = compactTokens !== null && !keepFullHistory;
 
+  if (showResume && resumeModelName) {
+    const continueLabel = `Continue with ${resumeModelName}`;
+    return (
+      <Tooltip key="continue">
+        <TooltipTrigger
+          render={
+            <button
+              type="button"
+              className={cn(messageActionPillClassName, "h-9 sm:h-8", compact ? "px-3" : "px-4")}
+              {...pointerFocusProps}
+              onClick={onResume}
+              disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
+              aria-label={continueLabel}
+            />
+          }
+        >
+          {isConnecting || isSendBusy ? (
+            <Spinner size="sm" aria-hidden="true" />
+          ) : (
+            <PlayIcon className="size-3.5 fill-current" aria-hidden="true" />
+          )}
+          {compact ? "Continue" : continueLabel}
+        </TooltipTrigger>
+        <TooltipPopup>{sendDisabledReason ?? continueLabel}</TooltipPopup>
+      </Tooltip>
+    );
+  }
+
   const submitLabel = showResume
     ? "Resume thread"
     : isEditingQueuedMessage