@@ -249,7 +249,8 @@ export interface ThreadDetailScreenProps {
   /** Set while the next send compacts the thread first. */
   readonly compactBeforeSend?: {
     readonly tokens: number;
-    readonly keepFullHistory: () => void;
+    readonly keepFullHistory: boolean;
+    readonly toggleKeepFullHistory: () => void;
   } | null;
   readonly creationState:
     | {
@@ -1691,11 +1692,19 @@ function ThreadDetailBody(
                     {props.compactBeforeSend ? (
                       <View className="px-4 pb-3">
                         <Notice
-                          message={`Your next message compacts ${formatTokens(props.compactBeforeSend.tokens)} tokens of history first.`}
+                          message={
+                            props.compactBeforeSend.keepFullHistory
+                              ? `Your next message keeps all ${formatTokens(props.compactBeforeSend.tokens)} tokens of history.`
+                              : `Your next message compacts ${formatTokens(props.compactBeforeSend.tokens)} tokens of history first.`
+                          }
                           icon="arrow.down.right.and.arrow.up.left"
                           floating
-                          onDismiss={props.compactBeforeSend.keepFullHistory}
-                          dismissLabel="Keep the full history"
+                          onDismiss={props.compactBeforeSend.toggleKeepFullHistory}
+                          dismissLabel={
+                            props.compactBeforeSend.keepFullHistory
+                              ? "Compact first"
+                              : "Keep the full history"
+                          }
                         />
                       </View>
                     ) : null}
 
@@ -346,15 +346,23 @@ describe("mobile task permissions", () => {
       expect.not.objectContaining({ compactBeforeSend: true }),
     );
     state.draft = { ...state.draft, modelSelection: undefined };
-    composer.compactBeforeSend?.keepFullHistory();
+    composer.compactBeforeSend?.toggleKeepFullHistory();
     const kept = useThreadComposerState(NO_SIDE_CHATS);
-    expect(kept.compactBeforeSend).toBeNull();
-    await kept.onSendMessage();
+    expect(kept.compactBeforeSend?.keepFullHistory).toBe(true);
+    kept.compactBeforeSend?.toggleKeepFullHistory();
+    const compactAgain = useThreadComposerState(NO_SIDE_CHATS);
+    expect(compactAgain.compactBeforeSend?.keepFullHistory).toBe(false);
+    await compactAgain.onSendMessage();
+    expect(state.enqueue).toHaveBeenLastCalledWith(
+      expect.objectContaining({ compactBeforeSend: true }),
+    );
+    compactAgain.compactBeforeSend?.toggleKeepFullHistory();
+    await useThreadComposerState(NO_SIDE_CHATS).onSendMessage();
     expect(state.enqueue).toHaveBeenLastCalledWith(
       expect.not.objectContaining({ compactBeforeSend: true }),
     );
     // Keeping covers one send, as on web.
-    expect(useThreadComposerState(NO_SIDE_CHATS).compactBeforeSend?.tokens).toBe(248_000);
+    expect(useThreadComposerState(NO_SIDE_CHATS).compactBeforeSend?.keepFullHistory).toBe(false);
     state.freshPending = true;
     await composer.onSendMessage();
     expect(state.enqueue).toHaveBeenLastCalledWith(
 
@@ -892,11 +892,12 @@ export function useThreadComposerState(input: {
     providerSubagentStatus,
     isCompacting,
     compactBeforeSend:
-      compactTokens === null || selectedThreadKey === null || keepFullHistory
+      compactTokens === null || selectedThreadKey === null
         ? null
         : {
             tokens: compactTokens,
-            keepFullHistory: () => setKeepFullHistory(selectedThreadKey, true),
+            keepFullHistory,
+            toggleKeepFullHistory: () => setKeepFullHistory(selectedThreadKey, !keepFullHistory),
           },
     composerDraftKey,
     followUpBehavior,