Fix issue where some approval requests were not appearing

Author: achimala

apps/web/src/App.tsx

@@ -636,6 +636,14 @@ function isPlanModeOption(mode: {
   );
 }
 
+function buildModeSignature(
+  modeKey: string,
+  modelId: string,
+  effort: string,
+): string {
+  return `${modeKey}|${modelId}|${effort}`;
+}
+
 function getConversationStateUpdatedAt(
   state: NonNullable<ReadThreadResponse["thread"]> | null | undefined,
 ): number {
@@ -645,14 +653,6 @@ function getConversationStateUpdatedAt(
   return state.updatedAt;
 }
 
-function buildModeSignature(
-  modeKey: string,
-  modelId: string,
-  effort: string,
-): string {
-  return `${modeKey}|${modelId}|${effort}`;
-}
-
 function buildApprovalResponse(
   request: PendingApprovalRequest,
   action: "approve" | "deny",
@@ -1329,23 +1329,10 @@ export function App(): React.JSX.Element {
   const requestSourceState = useMemo(() => {
     const liveConversationState = liveState?.conversationState ?? null;
     const readConversationState = readThreadState?.thread ?? null;
-    if (!liveConversationState) {
-      return readConversationState;
-    }
-    if (!readConversationState) {
+    if (liveConversationState) {
       return liveConversationState;
     }
-
-    const liveUpdatedAt = getConversationStateUpdatedAt(liveConversationState);
-    const readUpdatedAt = getConversationStateUpdatedAt(readConversationState);
-    if (liveUpdatedAt > readUpdatedAt) {
-      return liveConversationState;
-    }
-    if (readUpdatedAt > liveUpdatedAt) {
-      return readConversationState;
-    }
-
-    return liveConversationState;
+    return readConversationState;
   }, [liveState?.conversationState, readThreadState?.thread]);
 
   const pendingRequests = useMemo(() => {

apps/web/test/app.test.tsx

@@ -774,6 +774,72 @@ describe("App", () => {
     expect(await screen.findByTitle("Waiting for user input")).toBeTruthy();
   });
 
+  it("prefers live-state requests when read thread is newer but has no pending requests", async () => {
+    const threadId = "thread-live-approval-preferred";
+    const approvalRequest: UnifiedThreadFixture["requests"][number] = {
+      id: "approval-live-priority-1",
+      method: "item/commandExecution/requestApproval",
+      params: {
+        threadId,
+        turnId: "turn-1",
+        itemId: "item-approval-live-priority-1",
+        reason: "Need approval from live state",
+      },
+    };
+
+    threadsFixture = {
+      ok: true,
+      data: [
+        {
+          id: threadId,
+          provider: "codex",
+          preview: "thread preview",
+          createdAt: 1700000000,
+          updatedAt: 1700000002,
+          cwd: "/tmp/project",
+          source: "codex",
+        },
+      ],
+      cursors: {
+        codex: null,
+        opencode: null,
+      },
+      errors: {
+        codex: null,
+        opencode: null,
+      },
+    };
+
+    readThreadResolver = (targetThreadId: string) => ({
+      ok: true,
+      thread: buildConversationStateFixture(targetThreadId, "gpt-old-codex", {
+        updatedAt: 1700000002,
+        customRequests: [],
+      }),
+    });
+
+    liveStateResolver = (targetThreadId: string, _provider: ProviderId) => ({
+      kind: "readLiveState",
+      threadId: targetThreadId,
+      ownerClientId: "client-1",
+      conversationState: buildConversationStateFixture(
+        targetThreadId,
+        "gpt-old-codex",
+        {
+          updatedAt: 1700000001,
+          customRequests: [approvalRequest],
+        },
+      ),
+      liveStateError: null,
+    });
+
+    render(<App />);
+
+    expect(await screen.findByText("Approval Needed")).toBeTruthy();
+    expect(await screen.findByText("Need approval from live state")).toBeTruthy();
+    expect(await screen.findByTitle("Waiting for approval")).toBeTruthy();
+  });
+
   it("keeps a direct thread route selected when it is readable but not in current thread list page", async () => {
     const threadId = "thread-direct-route";
     window.history.replaceState(null, "", `/threads/${threadId}`);