Address PR #3960 review findings and CI failures

CI: add settledOverride/settledAt + new client settings to desktop and
mobile test fixtures and the mobile threadDetailToShell mapping.

Review fixes (cursor bugbot + macroscope):
- failed status now requires session.status === "error" instead of any
  lingering lastError on a stopped/ready session
- effectiveSettled: pending approvals or user input always win — blocked
  work can never collapse into the settled tail, even manually settled
- decider unsettle-on-activity guards check settledOverride === "settled"
  so activity no longer erases a user's explicit keep-active override
- repeat thread.settle re-emits with updatedAt = original settledAt, so
  double-settles no longer bump recency ordering
- sidebarAutoSettleAfterDays bounded 1..90 in schema and patch
- approval wait sort/label use shell.updatedAt (bumped by the approval
  activity in the projection pipeline) instead of latestUserMessageAt /
  turn start, with the approximation documented
- v2 rows: Enter/Space keyboard activation; double-click inline rename
  ported from v1 plus a context-menu Rename entry
- new-thread picker: cross-project creation no longer inherits the active
  thread's branch/worktree; preselection consults the active draft via
  resolveThreadActionProjectRef; stale project scope resets to All
- settle worktree prompt: vcs status checked before offering (and again
  at click time) — dirty or ahead worktrees are never offered

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

Author: t3dotgg

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -20,13 +20,15 @@ const clientSettings: ClientSettings = {
   diffIgnoreWhitespace: true,
   favorites: [],
   providerModelPreferences: {},
+  sidebarAutoSettleAfterDays: 3,
   sidebarProjectGroupingMode: "repository_path",
   sidebarProjectGroupingOverrides: {
     "environment-1:/tmp/project-a": "separate",
   },
   sidebarProjectSortOrder: "manual",
   sidebarThreadSortOrder: "created_at",
   sidebarThreadPreviewCount: 6,
+  sidebarV2Enabled: false,
   timestampFormat: "24-hour",
   wordWrap: true,
 };

apps/mobile/src/features/archive/archivedThreadList.test.ts

@@ -41,6 +41,8 @@ function makeThread(
     hasPendingUserInput: false,
     hasActionableProposedPlan: false,
     ...input,
+    settledOverride: input.settledOverride ?? null,
+    settledAt: input.settledAt ?? null,
   };
 }
 

apps/mobile/src/features/home/homeListItems.test.ts

@@ -47,6 +47,8 @@ function makeThread(id: string, projectId: ProjectId): EnvironmentThreadShell {
     createdAt: "2026-06-01T00:00:00.000Z",
     updatedAt: "2026-06-01T00:00:00.000Z",
     archivedAt: null,
+    settledOverride: null,
+    settledAt: null,
     session: null,
     latestUserMessageAt: null,
     hasPendingApprovals: false,

apps/mobile/src/features/home/homeThreadList.test.ts

@@ -41,6 +41,8 @@ function makeThread(
     hasPendingUserInput: false,
     hasActionableProposedPlan: false,
     ...input,
+    settledOverride: input.settledOverride ?? null,
+    settledAt: input.settledAt ?? null,
   };
 }
 

apps/mobile/src/lib/repositoryGroups.test.ts

@@ -38,6 +38,8 @@ function makeThread(
     hasPendingUserInput: false,
     hasActionableProposedPlan: false,
     ...input,
+    settledOverride: input.settledOverride ?? null,
+    settledAt: input.settledAt ?? null,
   };
 }
 

apps/mobile/src/lib/threadActivity.test.ts

@@ -50,6 +50,8 @@ function makeThread(
     checkpoints: [],
     session: null,
     ...input,
+    settledOverride: input.settledOverride ?? null,
+    settledAt: input.settledAt ?? null,
   };
 }
 

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

@@ -58,6 +58,8 @@ function threadDetailToShell(
     createdAt: thread.createdAt,
     updatedAt: thread.updatedAt,
     archivedAt: thread.archivedAt,
+    settledOverride: thread.settledOverride,
+    settledAt: thread.settledAt,
     session: thread.session,
     latestUserMessageAt: latestUserMessageAt(thread),
     hasPendingApprovals: false,

apps/server/src/orchestration/decider.settled.test.ts

@@ -98,6 +98,7 @@ it.layer(NodeServices.layer)("settled thread decider", (it) => {
       expect(reEmitEvents[0]?.type).toBe("thread.settled");
       if (reEmitEvents[0]?.type === "thread.settled") {
         expect(reEmitEvents[0].payload.settledAt).toBe(SETTLED_AT);
+        expect(reEmitEvents[0].payload.updatedAt).toBe(SETTLED_AT);
       }
     }),
   );
@@ -199,10 +200,55 @@ it.layer(NodeServices.layer)("settled thread decider", (it) => {
         readModel: makeReadModel("active"),
       });
       const sessionEvents = Array.isArray(sessionResult) ? sessionResult : [sessionResult];
-      expect(sessionEvents.map((event) => event.type)).toEqual([
-        "thread.unsettled",
-        "thread.session-set",
+      expect(sessionEvents.map((event) => event.type)).toEqual(["thread.session-set"]);
+    }),
+  );
+
+  it.effect("preserves an explicit active override during activity", () =>
+    Effect.gen(function* () {
+      const turnResult = yield* decideOrchestrationCommand({
+        command: {
+          type: "thread.turn.start",
+          commandId: CommandId.make("cmd-active-turn-start"),
+          threadId: ThreadId.make("thread-1"),
+          message: {
+            messageId: MessageId.make("message-active"),
+            role: "user",
+            text: "Continue",
+            attachments: [],
+          },
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          createdAt: NOW,
+        },
+        readModel: makeReadModel("active"),
+      });
+      const turnEvents = Array.isArray(turnResult) ? turnResult : [turnResult];
+      expect(turnEvents.map((event) => event.type)).toEqual([
+        "thread.message-sent",
+        "thread.turn-start-requested",
       ]);
+
+      const activityResult = yield* decideOrchestrationCommand({
+        command: {
+          type: "thread.activity.append",
+          commandId: CommandId.make("cmd-active-approval"),
+          threadId: ThreadId.make("thread-1"),
+          activity: {
+            id: EventId.make("activity-active"),
+            tone: "approval",
+            kind: "approval.requested",
+            summary: "Command approval requested",
+            payload: null,
+            turnId: null,
+            createdAt: NOW,
+          },
+          createdAt: NOW,
+        },
+        readModel: makeReadModel("active"),
+      });
+      const activityEvents = Array.isArray(activityResult) ? activityResult : [activityResult];
+      expect(activityEvents.map((event) => event.type)).toEqual(["thread.activity-appended"]);
     }),
   );
 

apps/server/src/orchestration/decider.ts

@@ -337,7 +337,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
         payload: {
           threadId: command.threadId,
           settledAt,
-          updatedAt: occurredAt,
+          updatedAt: settledAt,
         },
       };
     }
@@ -519,7 +519,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
           createdAt: command.createdAt,
         },
       };
-      if (targetThread.settledOverride === null) {
+      if (targetThread.settledOverride !== "settled") {
         return [userMessageEvent, turnStartRequestedEvent];
       }
       const unsettledEvent: Omit<OrchestrationEvent, "sequence"> = {
@@ -681,7 +681,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       // must not fight a user's explicit settle.
       const isSessionActivity =
         command.session.status === "starting" || command.session.status === "running";
-      if (thread.settledOverride === null || !isSessionActivity) {
+      if (thread.settledOverride !== "settled" || !isSessionActivity) {
         return sessionSetEvent;
       }
       const unsettledEvent: Omit<OrchestrationEvent, "sequence"> = {
@@ -857,7 +857,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       const wakesSettledThread =
         command.activity.kind === "approval.requested" ||
         command.activity.kind === "user-input.requested";
-      if (thread.settledOverride === null || !wakesSettledThread) {
+      if (thread.settledOverride !== "settled" || !wakesSettledThread) {
         return activityAppendedEvent;
       }
       const unsettledEvent: Omit<OrchestrationEvent, "sequence"> = {

apps/web/src/components/Sidebar.logic.test.ts

@@ -592,17 +592,23 @@ describe("resolveSidebarV2Status", () => {
     ).toBe("working");
   });
 
-  it("reports failed only for stopped sessions with an error", () => {
+  it("reports failed only while the session status is error", () => {
     expect(
       resolveSidebarV2Status({
         hasPendingApprovals: false,
-        session: { ...session, status: "stopped" as const, lastError: "boom" },
+        session: { ...session, status: "error" as const, lastError: "boom" },
       }),
     ).toBe("failed");
     expect(
       resolveSidebarV2Status({
         hasPendingApprovals: false,
-        session: { ...session, status: "stopped" as const },
+        session: { ...session, status: "stopped" as const, lastError: "persisted" },
+      }),
+    ).toBe("ready");
+    expect(
+      resolveSidebarV2Status({
+        hasPendingApprovals: false,
+        session: { ...session, status: "ready" as const, lastError: "persisted" },
       }),
     ).toBe("ready");
   });
@@ -617,12 +623,13 @@ describe("sortThreadsForSidebarV2", () => {
     id: string;
     hasPendingApprovals?: boolean;
     latestUserMessageAt: string;
+    updatedAt?: string;
   }) => ({
     id: input.id,
     hasPendingApprovals: input.hasPendingApprovals ?? false,
     session: null,
     createdAt: "2026-03-09T10:00:00.000Z",
-    updatedAt: input.latestUserMessageAt,
+    updatedAt: input.updatedAt ?? input.latestUserMessageAt,
     latestUserMessageAt: input.latestUserMessageAt,
   });
 
@@ -632,12 +639,14 @@ describe("sortThreadsForSidebarV2", () => {
       sortable({
         id: "approval-new",
         hasPendingApprovals: true,
-        latestUserMessageAt: "2026-03-09T11:00:00.000Z",
+        latestUserMessageAt: "2026-03-09T08:00:00.000Z",
+        updatedAt: "2026-03-09T11:00:00.000Z",
       }),
       sortable({
         id: "approval-old",
         hasPendingApprovals: true,
-        latestUserMessageAt: "2026-03-09T09:00:00.000Z",
+        latestUserMessageAt: "2026-03-09T11:30:00.000Z",
+        updatedAt: "2026-03-09T09:00:00.000Z",
       }),
       sortable({ id: "stale", latestUserMessageAt: "2026-03-09T08:00:00.000Z" }),
     ]);