fix: restore main's automatic thread settling after the revert

Round-13 rebase onto main (2 commits). Main reverted the auto-settle
opt-in (#8596 undoing #8321), so the branch drops the ported
autoSettleMode machinery and returns to sidebarAutoSettleOnMerge with
settling-by-default, keeping only the v2 shell-shape delta in
threadSettled. The unpin confirmation (#7313) merges into the v2
thread-actions hook, and the mobile list tests re-sync to main's
reverted semantics in v2 shapes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: juliusmarminge

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

@@ -470,6 +470,32 @@ describe("buildThreadListV2Items", () => {
     expect(layout.items[0]?.variant).toBe("card");
   });
 
+  it("settles a thread only when the cached pull request identity matches", () => {
+    const thread = makeThread({
+      id: ThreadId.make("linked-merged"),
+      title: "Linked merged pull request",
+      linkedPullRequest,
+    });
+    const layout = buildThreadListV2Items({
+      threads: [thread],
+      environmentId: null,
+      searchQuery: "",
+      changeRequestByKey: new Map([
+        [
+          `${environmentId}:${thread.id}`,
+          {
+            state: "merged" as const,
+            linkedPullRequestKey: '["project-1","pingdotgg/t3code",42]',
+          },
+        ],
+      ]),
+      now: NOW,
+    });
+
+    expect(layout.settledCount).toBe(1);
+    expect(layout.items[0]?.variant).toBe("slim");
+  });
+
   it("moves pinned threads to the settled shelf when their pull request merges", () => {
     const merged = makeThread({
       id: ThreadId.make("pinned-merged"),
@@ -480,10 +506,7 @@ describe("buildThreadListV2Items", () => {
       threads: [makeThread({ id: ThreadId.make("active"), title: "Active" }), merged],
       environmentId: null,
       searchQuery: "",
-      changeRequestByKey: new Map([
-        [`${environmentId}:${merged.id}`, { state: "merged", updatedAt: NOW }],
-      ]),
-      autoSettleMode: "change-request",
+      changeRequestByKey: new Map([[`${environmentId}:${merged.id}`, { state: "merged" }]]),
       now: NOW,
     });
 
@@ -512,7 +535,6 @@ describe("buildThreadListV2Items", () => {
       threads: [inactive],
       environmentId: null,
       searchQuery: "",
-      autoSettleMode: "inactivity",
       now: NOW,
     });
 
@@ -524,7 +546,7 @@ describe("buildThreadListV2Items", () => {
     expect(layout.settledCount).toBe(1);
   });
 
-  it("keeps pinned merged threads pinned when automatic settling is off", () => {
+  it("keeps pinned merged threads pinned when auto-settle on merge is off", () => {
     const merged = makeThread({
       id: ThreadId.make("pinned-merged"),
       title: "Pinned merged pull request",
@@ -534,10 +556,8 @@ describe("buildThreadListV2Items", () => {
       threads: [merged],
       environmentId: null,
       searchQuery: "",
-      changeRequestByKey: new Map([
-        [`${environmentId}:${merged.id}`, { state: "merged", updatedAt: NOW }],
-      ]),
-      autoSettleMode: "never",
+      changeRequestByKey: new Map([[`${environmentId}:${merged.id}`, { state: "merged" }]]),
+      autoSettleOnMerge: false,
       now: NOW,
     });
 
@@ -549,16 +569,16 @@ describe("buildThreadListV2Items", () => {
     expect(layout.settledCount).toBe(0);
   });
 
-  it("keeps a merged thread active when automatic settling is off", () => {
+  it("keeps a merged thread active when auto-settle on merge is off", () => {
     const merged = makeThread({ id: ThreadId.make("merged"), title: "Merged" });
     const layout = buildThreadListV2Items({
       threads: [merged],
       environmentId: null,
       searchQuery: "",
       changeRequestByKey: new Map([
-        [`${environmentId}:${merged.id}`, { state: "merged" as const, updatedAt: NOW }],
+        [`${environmentId}:${merged.id}`, { state: "merged" as const }],
       ]),
-      autoSettleMode: "never",
+      autoSettleOnMerge: false,
       now: NOW,
     });
 

apps/web/src/components/ChatView.tsx

@@ -1264,7 +1264,7 @@ function ChatViewContent(props: ChatViewProps) {
   } = props;
   const draftId = routeKind === "draft" ? props.draftId : null;
   const handleNewThread = useNewThreadHandler();
-  const { settleThread, pinThread, unpinThread } = useThreadActions();
+  const { settleThread, pinThread, confirmAndUnpinThread } = useThreadActions();
   const routeThreadRef = useMemo(
     () => scopeThreadRef(environmentId, threadId),
     [environmentId, threadId],
@@ -4484,7 +4484,7 @@ function ChatViewContent(props: ChatViewProps) {
   // The server-projected settled state keeps the banner and sidebar in sync.
   const activeThreadShell = useThreadShell(isServerThread ? activeThreadRef : null);
   const autoSettleAfterDays = useClientSettings((settings) => settings.sidebarAutoSettleAfterDays);
-  const autoSettleMode = useClientSettings((settings) => settings.sidebarAutoSettleMode);
+  const autoSettleOnMerge = useClientSettings((settings) => settings.sidebarAutoSettleOnMerge);
   const changeRequestSnapshotByKey = useAtomValue(threadChangeRequestSnapshotsAtom);
   // The thread's own change request, placed against the project it belongs to.
   const linkedThreadPullRequest = activeThread?.linkedPullRequest ?? null;
@@ -4556,8 +4556,10 @@ function ChatViewContent(props: ChatViewProps) {
   const activeThreadWokeVisible = useMemo(() => {
     if (activeThreadWokeAt === null) return false;
     if (
-      autoSettleMode === "change-request" &&
-      changeRequestAutoSettles(activeThreadChangeRequest, { thread: activeThreadShell })
+      changeRequestAutoSettles(activeThreadChangeRequest, {
+        autoSettleOnMerge,
+        thread: activeThreadShell,
+      })
     ) {
       return false;
     }
@@ -4583,21 +4585,21 @@ function ChatViewContent(props: ChatViewProps) {
     activeThreadChangeRequest,
     activeThreadShell,
     activeThreadWokeAt,
-    autoSettleMode,
+    autoSettleOnMerge,
   ]);
   const activeThreadSettled = useMemo(() => {
     if (activeThreadShell === null || !supportsSettlement) return false;
     return effectiveSettled(activeThreadShell, {
       now: `${nowMinute}:00.000Z`,
       autoSettleAfterDays,
-      autoSettleMode,
+      autoSettleOnMerge,
       changeRequest: activeThreadChangeRequest,
     });
   }, [
     activeThreadPr?.state,
     activeThreadShell,
     autoSettleAfterDays,
-    autoSettleMode,
+    autoSettleOnMerge,
     changeRequestSnapshotByKey,
     nowMinute,
     supportsSettlement,
@@ -5018,17 +5020,19 @@ function ChatViewContent(props: ChatViewProps) {
         event.stopPropagation();
         if (!isServerThread || !activeThreadRef || !supportsPinning) return;
         const pinned = activeThreadPinned;
-        void (pinned ? unpinThread(activeThreadRef) : pinThread(activeThreadRef)).then((result) => {
-          if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
-          const error = squashAtomCommandFailure(result);
-          toastManager.add(
-            stackedThreadToast({
-              type: "error",
-              title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
-              description: error instanceof Error ? error.message : "An error occurred.",
-            }),
-          );
-        });
+        void (pinned ? confirmAndUnpinThread(activeThreadRef) : pinThread(activeThreadRef)).then(
+          (result) => {
+            if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
+            const error = squashAtomCommandFailure(result);
+            toastManager.add(
+              stackedThreadToast({
+                type: "error",
+                title: pinned ? "Failed to unpin thread" : "Failed to pin thread",
+                description: error instanceof Error ? error.message : "An error occurred.",
+              }),
+            );
+          },
+        );
         return;
       }
 
@@ -5154,7 +5158,7 @@ function ChatViewContent(props: ChatViewProps) {
     settleThread,
     supportsPinning,
     supportsSettlement,
-    unpinThread,
+    confirmAndUnpinThread,
     toggleRightPanel,
     toggleThreadPanel,
     toggleTerminalVisibility,

apps/web/src/components/Sidebar.tsx

@@ -854,7 +854,10 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
   const isWoke =
     wokeAtDate !== null &&
     (lastVisitedDate === null || lastVisitedDate < wokeAtDate) &&
-    !(props.autoSettleMode === "change-request" && changeRequestAutoSettles(pr, { thread }));
+    !changeRequestAutoSettles(pr, {
+      autoSettleOnMerge: props.autoSettleOnMerge,
+      thread,
+    });
   // In-flight rows (working, or waiting on approval/input) fade as a whole:
   // there is nothing for the user to do yet, so prominence is reserved for
   // rows that need a human — done (unread), read-but-unsettled, failed, and
@@ -2174,7 +2177,7 @@ export default function Sidebar() {
         effectiveSettled(thread, {
           now,
           autoSettleAfterDays,
-          autoSettleMode,
+          autoSettleOnMerge,
           changeRequest,
         })
       ) {
@@ -2211,7 +2214,7 @@ export default function Sidebar() {
     };
   }, [
     autoSettleAfterDays,
-    autoSettleMode,
+    autoSettleOnMerge,
     changeRequestSnapshotByKey,
     nowMinute,
     scopedProjectKeys,

apps/web/src/hooks/useThreadActions.ts

@@ -145,6 +145,9 @@ export async function requestThreadUnpinConfirmation(input: {
         "This will move the thread out of your pinned section.",
       ].join("\n"),
     ),
+  );
+}
+
 /**
  * Marks a thread unread. Servers with visited tracking own the unread marker
  * (thread.mark-unread rewinds the server-side visited watermark, syncing the

packages/client-runtime/src/state/threadSettled.ts

@@ -1,5 +1,5 @@
 // @effect-diagnostics globalDate:off -- UI snooze presets use local calendar boundaries and Intl labels.
-import type { OrchestrationThreadShell, SidebarAutoSettleMode } from "@t3tools/contracts";
+import type { OrchestrationThreadShell } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 
 interface SettlementRunLike {