Merge upstream/main into android-dev-pr-3514

Resolves conflicts from #3687 (thread list/navigation rework), #3670
(pending tasks), and #3679 (Vite Plus upgrade):

- ThreadNavigationDrawer.tsx: accept main's deletion; drawer navigation
  is replaced by native back-swipe and the reworked thread lists
- ThreadRouteScreen.tsx: keep Android in-flow header alongside main's
  deep-link Home escape for the iOS compact header
- HomeRouteScreen.tsx: keep AndroidHomeFabLayout wrapper, add main's
  pending-task props
- NewTaskDraftScreen.tsx: keep shared promptEditor/startButton, port
  main's iOS headline text style and queue-task button states
- thread-list-items.tsx: take main's header structure (chevron removed
  on all platforms); Android folder-state favicon already merged
- ThreadDetailScreen.tsx: union imports, drop unused gesture-handler
- pnpm-workspace.yaml/lockfile: keep expo-modules-jsi pin comment,
  regenerate lockfile via pnpm install

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

Author: shivamhwp

.vite-hooks/pre-commit

@@ -0,0 +1 @@
+vp staged

apps/mobile/package.json

@@ -99,7 +99,7 @@
     "react-native": "0.85.3",
     "react-native-gesture-handler": "~2.31.1",
     "react-native-image-viewing": "^0.2.2",
-    "react-native-keyboard-controller": "1.21.6",
+    "react-native-keyboard-controller": "1.21.13",
     "react-native-nitro-markdown": "^0.5.0",
     "react-native-nitro-modules": "0.35.9",
     "react-native-reanimated": "4.3.1",

apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx

@@ -507,7 +507,7 @@ function ArchivedThreadRow(props: {
               </Text>
               <Text
                 className="text-xs text-foreground-tertiary"
-                style={{ fontVariant: ["tabular-nums"] }}
+                style={{ fontVariant: ["tabular-nums"], minWidth: 30, textAlign: "right" }}
               >
                 {timestamp}
               </Text>

apps/mobile/src/features/home/HomeRouteScreen.tsx

@@ -5,6 +5,7 @@ import { useMemo, useState } from "react";
 
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useProjects, useThreadShells } from "../../state/entities";
+import { usePendingNewTasks } from "../../state/use-pending-new-tasks";
 import { useWorkspaceState } from "../../state/workspace";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
@@ -14,6 +15,7 @@ import { AndroidHomeFabLayout } from "./AndroidHomeFab";
 import { HomeScreen } from "./HomeScreen";
 import { HomeHeader } from "./HomeHeader";
 import { useHomeListOptions } from "./home-list-options";
+import { usePendingTaskListActions } from "./usePendingTaskListActions";
 import { useThreadListActions } from "./useThreadListActions";
 
 /* ─── Route screen ───────────────────────────────────────────────────── */
@@ -27,6 +29,8 @@ export function HomeRouteScreen() {
   const navigation = useNavigation();
   const [searchQuery, setSearchQuery] = useState("");
   const { archiveThread, confirmDeleteThread } = useThreadListActions();
+  const pendingTasks = usePendingNewTasks();
+  const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
   const environments = useMemo(
     () =>
       Arr.sort(
@@ -121,8 +125,21 @@ export function HomeRouteScreen() {
               threadId: thread.id,
             });
           }}
+          onSelectPendingTask={openPendingTask}
+          onDeletePendingTask={confirmDeletePendingTask}
+          onNewThreadInProject={(project) => {
+            navigation.navigate("NewTaskSheet", {
+              screen: "NewTaskDraft",
+              params: {
+                environmentId: String(project.environmentId),
+                projectId: String(project.id),
+                title: project.title,
+              },
+            });
+          }}
           onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
           onThreadSortOrderChange={setThreadSortOrder}
+          pendingTasks={pendingTasks}
           projectGroupingMode={listOptions.projectGroupingMode}
           projects={projects}
           projectSortOrder={listOptions.projectSortOrder}

apps/mobile/src/features/home/HomeScreen.tsx

@@ -22,7 +22,9 @@ import { EmptyState } from "../../components/EmptyState";
 import type { WorkspaceState } from "../../state/workspaceModel";
 import type { SavedRemoteConnection } from "../../lib/connection";
 import { scopedProjectKey } from "../../lib/scopedEntities";
+import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 import {
+  PendingTaskListRow,
   ThreadListGroupHeader,
   ThreadListRow,
   ThreadListShowMoreRow,
@@ -47,6 +49,7 @@ import { shouldShowWorkspaceConnectionStatus } from "./workspace-connection-stat
 interface HomeScreenProps {
   readonly projects: ReadonlyArray<EnvironmentProject>;
   readonly threads: ReadonlyArray<EnvironmentThreadShell>;
+  readonly pendingTasks: ReadonlyArray<PendingNewTask>;
   readonly catalogState: WorkspaceState;
   readonly savedConnectionsById: Readonly<Record<string, SavedRemoteConnection>>;
   readonly environments: ReadonlyArray<HomeListFilterMenuEnvironment>;
@@ -67,6 +70,9 @@ interface HomeScreenProps {
   readonly onSelectThread: (thread: EnvironmentThreadShell) => void;
   readonly onArchiveThread: (thread: EnvironmentThreadShell) => void;
   readonly onDeleteThread: (thread: EnvironmentThreadShell) => void;
+  readonly onSelectPendingTask: (pendingTask: PendingNewTask) => void;
+  readonly onDeletePendingTask: (pendingTask: PendingNewTask) => void;
+  readonly onNewThreadInProject: (project: EnvironmentProject) => void;
 }
 
 /* ─── Layout constants ───────────────────────────────────────────────── */
@@ -194,13 +200,15 @@ export function HomeScreen(props: HomeScreenProps) {
       buildHomeThreadGroups({
         projects: props.projects,
         threads: props.threads,
+        pendingTasks: props.pendingTasks,
         environmentId: props.selectedEnvironmentId,
         searchQuery: props.searchQuery,
         projectSortOrder: props.projectSortOrder,
         threadSortOrder: props.threadSortOrder,
         projectGroupingMode: props.projectGroupingMode,
       }),
     [
+      props.pendingTasks,
       props.projectGroupingMode,
       props.projects,
       props.projectSortOrder,
@@ -246,11 +254,31 @@ export function HomeScreen(props: HomeScreenProps) {
               isFirst={item.isFirst}
               groupKey={item.group.key}
               onGroupAction={updateGroupDisplay}
+              // Aggregated groups (same repo across machines) have no single
+              // target project, and `pending-project:` groups hold a placeholder
+              // built from queued-task metadata rather than a real project shell,
+              // so the quick new-thread button is single-real-project only.
+              newThreadTarget={item.group.newThreadTarget}
+              onNewThread={props.onNewThreadInProject}
               project={item.group.representative}
-              threadCount={item.group.threads.length}
+              threadCount={item.group.threads.length + item.group.pendingTasks.length}
               title={item.group.title}
             />
           );
+        case "pending-task":
+          return (
+            <PendingTaskListRow
+              variant="compact"
+              pendingTask={item.pendingTask}
+              environmentLabel={
+                props.savedConnectionsById[item.pendingTask.message.environmentId]
+                  ?.environmentLabel ?? null
+              }
+              isLast={item.isLast}
+              onSelectPendingTask={props.onSelectPendingTask}
+              onDeletePendingTask={props.onDeletePendingTask}
+            />
+          );
         case "thread": {
           const thread = item.thread;
           return (
@@ -290,7 +318,10 @@ export function HomeScreen(props: HomeScreenProps) {
       handleSwipeableWillOpen,
       projectCwdByKey,
       props.onArchiveThread,
+      props.onDeletePendingTask,
       props.onDeleteThread,
+      props.onNewThreadInProject,
+      props.onSelectPendingTask,
       props.onSelectThread,
       props.savedConnectionsById,
       updateGroupDisplay,
@@ -300,7 +331,8 @@ export function HomeScreen(props: HomeScreenProps) {
   const keyExtractor = useCallback((item: HomeListItem) => item.key, []);
 
   /* Empty states */
-  const hasAnyThreads = props.threads.some((thread) => thread.archivedAt === null);
+  const hasAnyThreads =
+    props.threads.some((thread) => thread.archivedAt === null) || props.pendingTasks.length > 0;
   const hasResults = projectGroups.length > 0;
   const selectedEnvironmentLabel =
     props.selectedEnvironmentId === null

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

@@ -57,14 +57,20 @@ function makeThread(id: string, projectId: ProjectId): EnvironmentThreadShell {
 
 function makeGroup(key: string, threadCount: number): HomeThreadGroup {
   const project = makeProject(key, key);
+  const threads = Array.from({ length: threadCount }, (_, index) =>
+    makeThread(`${key}-thread-${index}`, project.id),
+  );
   return {
     key,
     title: key,
     representative: project,
     projects: [project],
-    threads: Array.from({ length: threadCount }, (_, index) =>
-      makeThread(`${key}-thread-${index}`, project.id),
-    ),
+    pendingTasks: [],
+    threads,
+    // All threads inside the recency window, so the baseline stays at the
+    // initial page size and the pagination expectations below hold.
+    recentThreads: threads,
+    newThreadTarget: project,
   };
 }
 
@@ -152,6 +158,48 @@ describe("buildHomeListLayout", () => {
     expect(reset.visibleCount).toBe(HOME_INITIAL_VISIBLE_THREADS);
   });
 
+  it("offers show-less after expanding a stale group whose baseline is below the page size", () => {
+    // Stale project: 10 threads total but only 3 within the recency window.
+    const project = makeProject("stale", "stale");
+    const threads = Array.from({ length: 10 }, (_, index) =>
+      makeThread(`stale-thread-${index}`, project.id),
+    );
+    const group: HomeThreadGroup = {
+      key: "stale",
+      title: "stale",
+      representative: project,
+      projects: [project],
+      pendingTasks: [],
+      threads,
+      recentThreads: threads.slice(0, 3),
+      newThreadTarget: project,
+    };
+
+    const collapsedToRecent = buildHomeListLayout({
+      groups: [group],
+      displayStates: displayStates({}),
+    });
+    expect(collapsedToRecent.items.filter((item) => item.type === "thread")).toHaveLength(3);
+    expect(collapsedToRecent.items.at(-1)).toMatchObject({
+      type: "show-more",
+      hiddenCount: 7,
+      canShowLess: false,
+    });
+
+    const expanded = buildHomeListLayout({
+      groups: [group],
+      displayStates: displayStates({
+        stale: nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "show-more"),
+      }),
+    });
+    expect(expanded.items.filter((item) => item.type === "thread")).toHaveLength(10);
+    expect(expanded.items.at(-1)).toMatchObject({
+      type: "show-more",
+      hiddenCount: 0,
+      canShowLess: true,
+    });
+  });
+
   it("hides threads and the show-more row for collapsed groups", () => {
     const layout = buildHomeListLayout({
       groups: [makeGroup("alpha", 12), makeGroup("beta", 2)],

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

@@ -1,5 +1,6 @@
 import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
 
+import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 import type { HomeThreadGroup } from "./homeThreadList";
 
 /** Threads shown per project before the "Show more" affordance appears. */
@@ -33,6 +34,13 @@ export interface HomeThreadListItem {
   readonly isLast: boolean;
 }
 
+export interface HomePendingTaskListItem {
+  readonly type: "pending-task";
+  readonly key: string;
+  readonly pendingTask: PendingNewTask;
+  readonly isLast: boolean;
+}
+
 export interface HomeShowMoreListItem {
   readonly type: "show-more";
   readonly key: string;
@@ -43,7 +51,11 @@ export interface HomeShowMoreListItem {
   readonly canShowLess: boolean;
 }
 
-export type HomeListItem = HomeHeaderListItem | HomeThreadListItem | HomeShowMoreListItem;
+export type HomeListItem =
+  | HomeHeaderListItem
+  | HomePendingTaskListItem
+  | HomeThreadListItem
+  | HomeShowMoreListItem;
 
 export interface HomeListLayout {
   readonly items: ReadonlyArray<HomeListItem>;
@@ -82,6 +94,12 @@ export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem
         previous.collapsed === item.collapsed &&
         previous.isFirst === item.isFirst
       );
+    case "pending-task":
+      return (
+        previous.type === "pending-task" &&
+        previous.pendingTask === item.pendingTask &&
+        previous.isLast === item.isLast
+      );
     case "thread":
       return (
         previous.type === "thread" &&
@@ -127,12 +145,40 @@ export function buildHomeListLayout(input: {
     }
 
     const totalCount = group.threads.length;
+    // Default to the group's recent-activity window (last few days, or a small
+    // fallback for stale projects), capped at the initial page size. Until the
+    // user taps "Show more", older threads stay hidden to save vertical space;
+    // "Show less" resets visibleCount to the initial constant, which lands back
+    // here at the recency baseline.
+    const baselineCount = Math.min(
+      group.recentThreads.length,
+      HOME_INITIAL_VISIBLE_THREADS,
+      totalCount,
+    );
     const visibleCount = input.showAllThreads
       ? totalCount
-      : Math.min(Math.max(display.visibleCount, HOME_INITIAL_VISIBLE_THREADS), totalCount);
+      : Math.min(
+          display.visibleCount > HOME_INITIAL_VISIBLE_THREADS
+            ? display.visibleCount
+            : baselineCount,
+          totalCount,
+        );
     const visibleThreads = group.threads.slice(0, visibleCount);
     const hiddenCount = totalCount - visibleCount;
-    const hasShowMoreRow = !input.showAllThreads && totalCount > HOME_INITIAL_VISIBLE_THREADS;
+    const hasShowMoreRow = !input.showAllThreads && totalCount > baselineCount;
+
+    // Pending (unsent) tasks lead the group and are never paginated away.
+    for (const [pendingIndex, pendingTask] of group.pendingTasks.entries()) {
+      items.push({
+        type: "pending-task",
+        key: `pending-task:${pendingTask.message.messageId}`,
+        pendingTask,
+        isLast:
+          pendingIndex === group.pendingTasks.length - 1 &&
+          visibleThreads.length === 0 &&
+          !hasShowMoreRow,
+      });
+    }
 
     for (const [threadIndex, thread] of visibleThreads.entries()) {
       items.push({
@@ -149,7 +195,10 @@ export function buildHomeListLayout(input: {
         key: `show-more:${group.key}`,
         groupKey: group.key,
         hiddenCount,
-        canShowLess: visibleCount > HOME_INITIAL_VISIBLE_THREADS,
+        // Compare against the group's own baseline, not the global page size:
+        // stale projects start below HOME_INITIAL_VISIBLE_THREADS, and "Show
+        // less" must be offered as soon as anything beyond the baseline shows.
+        canShowLess: visibleCount > baselineCount,
       });
     }
   }