Skip to content

Commit da4ce6f

Browse files
authored
Merge branch 'main' into fix/desktop-link-menu-focus
2 parents 354fb35 + 9a47c7b commit da4ce6f

49 files changed

Lines changed: 5308 additions & 913 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function HomeRouteScreen() {
4949
unsnoozeThread,
5050
pinThread,
5151
unpinThread,
52-
movePinnedThread,
52+
moveThread,
5353
regenerateThreadTitle,
5454
unsettleThread,
5555
} = useThreadListActions();
@@ -199,7 +199,7 @@ export function HomeRouteScreen() {
199199
onUnsettleThread={unsettleThread}
200200
onPinThread={pinThread}
201201
onUnpinThread={unpinThread}
202-
onMovePinnedThread={movePinnedThread}
202+
onMoveThread={moveThread}
203203
onRegenerateThreadTitle={regenerateThreadTitle}
204204
onEnvironmentChange={setSelectedEnvironmentId}
205205
onProjectChange={setSelectedProjectKey}

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

Lines changed: 66 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { createThreadMovePlanner } from "../threads/threadOrder";
12
import {
23
LegendList,
34
type LegendListRef,
@@ -11,7 +12,6 @@ import {
1112
threadSearchMatchKey,
1213
type EnvironmentThreadSearchMatch,
1314
} from "@t3tools/client-runtime/state/thread-search";
14-
import { sortPinnedThreadsByOrderKey } from "@t3tools/client-runtime/state/thread-sort";
1515
import {
1616
type EnvironmentId,
1717
resolveEnvironmentMachineKind,
@@ -35,6 +35,7 @@ import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
3535
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
3636
import { useThreadSearch } from "../../state/queries";
3737
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
38+
import { usePendingThreadOrder } from "../../state/thread-order";
3839
import { environmentServerConfigsAtom } from "../../state/server";
3940
import type { PendingNewTask } from "../../state/use-pending-new-tasks";
4041
import {
@@ -51,6 +52,7 @@ import {
5152
} from "../threads/thread-list-v2-items";
5253
import {
5354
buildThreadListV2Items,
55+
getThreadListV2OrderedSection,
5456
buildThreadListV2ListItems,
5557
THREAD_LIST_V2_SETTLED_INITIAL_COUNT,
5658
THREAD_LIST_V2_SETTLED_PAGE_COUNT,
@@ -114,7 +116,7 @@ interface HomeScreenProps {
114116
readonly onUnsettleThread: (thread: EnvironmentThreadShell) => void;
115117
readonly onPinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
116118
readonly onUnpinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
117-
readonly onMovePinnedThread: (
119+
readonly onMoveThread: (
118120
thread: EnvironmentThreadShell,
119121
direction: "up" | "down",
120122
) => Promise<boolean>;
@@ -512,11 +514,11 @@ export function HomeScreen(props: HomeScreenProps) {
512514
},
513515
[props.onPinThread],
514516
);
515-
const handleMovePinnedThread = useCallback(
517+
const handleMoveThread = useCallback(
516518
(thread: EnvironmentThreadShell, direction: "up" | "down") => {
517-
void props.onMovePinnedThread(thread, direction);
519+
void props.onMoveThread(thread, direction);
518520
},
519-
[props.onMovePinnedThread],
521+
[props.onMoveThread],
520522
);
521523
const handleUnpinThread = useCallback(
522524
(thread: EnvironmentThreadShell) => {
@@ -608,6 +610,15 @@ export function HomeScreen(props: HomeScreenProps) {
608610
}
609611
return supported;
610612
}, [serverConfigs]);
613+
const activeReorderEnvironmentIds = useMemo(() => {
614+
const supported = new Set<EnvironmentId>();
615+
for (const [environmentId, config] of serverConfigs) {
616+
if (config.environment.capabilities.threadActiveReorder === true) {
617+
supported.add(environmentId);
618+
}
619+
}
620+
return supported;
621+
}, [serverConfigs]);
611622
const titleRegenerationEnvironmentIds = useMemo(() => {
612623
const supported = new Set<EnvironmentId>();
613624
for (const [environmentId, config] of serverConfigs) {
@@ -627,20 +638,40 @@ export function HomeScreen(props: HomeScreenProps) {
627638
),
628639
[serverConfigs],
629640
);
630-
// Canonical arranged pinned order (reorder-capable threads only) for the
631-
// Move up/down position flags. Computed from all shells, not the rendered
632-
// list, so search/scope filtering never disables or misdirects a move.
633-
const arrangedPinnedKeys = useMemo(() => {
634-
const pinned = sortPinnedThreadsByOrderKey(
635-
props.threads.filter(
636-
(thread) =>
637-
thread.pinnedAt != null &&
638-
thread.archivedAt === null &&
639-
pinReorderEnvironmentIds.has(thread.environmentId),
640-
),
641-
);
642-
return pinned.map((thread) => `${thread.environmentId}:${thread.id}`);
643-
}, [pinReorderEnvironmentIds, props.threads]);
641+
const pendingOrder = usePendingThreadOrder(nowMinute, snoozeWakeTick);
642+
const threadMovePlanners = useMemo(() => {
643+
const sectionPlanner = (section: "pinned" | "active") =>
644+
createThreadMovePlanner({
645+
allThreads: props.threads,
646+
section,
647+
reorderableEnvironmentIds: new Set(
648+
[...serverConfigs].flatMap(([id, config]) =>
649+
(section === "pinned"
650+
? config.environment.capabilities.threadPinReorder
651+
: config.environment.capabilities.threadActiveReorder) === true
652+
? [id]
653+
: [],
654+
),
655+
),
656+
ordered: getThreadListV2OrderedSection({
657+
threads: props.threads,
658+
section,
659+
pendingOrder,
660+
now: new Date().toISOString(),
661+
settlementEnvironmentIds,
662+
snoozeEnvironmentIds,
663+
}),
664+
});
665+
return { pinned: sectionPlanner("pinned"), active: sectionPlanner("active") };
666+
}, [
667+
serverConfigs,
668+
props.threads,
669+
pendingOrder,
670+
settlementEnvironmentIds,
671+
snoozeEnvironmentIds,
672+
nowMinute,
673+
snoozeWakeTick,
674+
]);
644675
const threadListV2Layout = useMemo(() => {
645676
if (!threadListV2Enabled)
646677
return {
@@ -655,6 +686,7 @@ export function HomeScreen(props: HomeScreenProps) {
655686
// Settled threads are live shells; archived threads keep their original
656687
// "hidden from lists" meaning.
657688
return buildThreadListV2Items({
689+
pendingOrder,
658690
threads: props.threads.filter((thread) => thread.archivedAt === null),
659691
environmentId: props.selectedEnvironmentId,
660692
projectRefs: v2ScopedProjectGroup === null ? null : v2ScopedProjectGroup.projectRefs,
@@ -669,6 +701,7 @@ export function HomeScreen(props: HomeScreenProps) {
669701
selectedThreadKey: null,
670702
});
671703
}, [
704+
pendingOrder,
672705
nowMinute,
673706
snoozeWakeTick,
674707
snoozedShelfExpanded,
@@ -784,6 +817,8 @@ export function HomeScreen(props: HomeScreenProps) {
784817
);
785818
}
786819
const thread = item.item.thread;
820+
const movePlanner = item.item.pinned ? threadMovePlanners.pinned : threadMovePlanners.active;
821+
const movedId = `${thread.environmentId}:${thread.id}`;
787822
return (
788823
<ThreadListV2Row
789824
thread={thread}
@@ -830,27 +865,30 @@ export function HomeScreen(props: HomeScreenProps) {
830865
onSettleThread={handleSettleThread}
831866
snoozeSupported={snoozeEnvironmentIds.has(thread.environmentId)}
832867
pinningSupported={pinningEnvironmentIds.has(thread.environmentId)}
833-
pinReorderSupported={pinReorderEnvironmentIds.has(thread.environmentId)}
834-
canMovePinnedUp={arrangedPinnedKeys.indexOf(`${thread.environmentId}:${thread.id}`) > 0}
835-
canMovePinnedDown={(() => {
836-
const index = arrangedPinnedKeys.indexOf(`${thread.environmentId}:${thread.id}`);
837-
return index !== -1 && index < arrangedPinnedKeys.length - 1;
838-
})()}
868+
reorderSupported={
869+
item.item.pinned
870+
? pinReorderEnvironmentIds.has(thread.environmentId)
871+
: activeReorderEnvironmentIds.has(thread.environmentId)
872+
}
873+
canMoveUp={pendingOrder === null && movePlanner(movedId, "up") !== null}
874+
canMoveDown={pendingOrder === null && movePlanner(movedId, "down") !== null}
839875
onSnoozeThread={handleSnoozeThread}
840876
onUnsnoozeThread={handleUnsnoozeThread}
841877
onUnsettleThread={handleUnsettleThread}
842878
onPinThread={handlePinThread}
843879
onUnpinThread={handleUnpinThread}
844-
onMovePinnedThread={handleMovePinnedThread}
880+
onMoveThread={handleMoveThread}
845881
onSwipeableClose={handleSwipeableClose}
846882
onSwipeableWillOpen={handleSwipeableWillOpen}
847883
/>
848884
);
849885
},
850886
[
851887
handleDeleteThread,
852-
arrangedPinnedKeys,
853-
handleMovePinnedThread,
888+
activeReorderEnvironmentIds,
889+
threadMovePlanners,
890+
pendingOrder,
891+
handleMoveThread,
854892
handlePinThread,
855893
handleRegenerateThreadTitle,
856894
handleSettleThread,

‎apps/mobile/src/features/home/useThreadListActions.ts‎

Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import { Alert } from "react-native";
88
import { showConfirmDialog } from "../../components/ConfirmDialogHost";
99
import { scopedThreadKey } from "../../lib/scopedEntities";
1010
import { refreshArchivedThreadsForEnvironment } from "../archive/useArchivedThreadSnapshots";
11-
import {
12-
pinOrderKeyBetween,
13-
planPinnedMove,
14-
sortPinnedThreadsByOrderKey,
15-
} from "@t3tools/client-runtime/state/thread-sort";
11+
import { pinOrderKeyBetween } from "@t3tools/client-runtime/state/thread-sort";
1612
import { appAtomRegistry } from "../../state/atom-registry";
1713
import { environmentServerConfigsAtom } from "../../state/server";
1814
import { environmentThreadShells, threadEnvironment } from "../../state/threads";
1915
import { useAtomCommand } from "../../state/use-atom-command";
16+
import { beginPendingThreadOrder, getPendingThreadOrder } from "../../state/thread-order";
17+
import { createPendingThreadOrder, createThreadMovePlanner } from "../threads/threadOrder";
18+
import { getThreadListV2OrderedSection } from "../threads/threadListV2";
2019

2120
/** Version skew: never send settle/unsettle to a server that predates them
2221
(capability defaults false on decode for older servers). */
@@ -222,7 +221,7 @@ export function useThreadListActions(): {
222221
readonly unsettleThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
223222
readonly pinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
224223
readonly unpinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
225-
readonly movePinnedThread: (
224+
readonly moveThread: (
226225
thread: EnvironmentThreadShell,
227226
direction: "up" | "down",
228227
) => Promise<boolean>;
@@ -451,60 +450,75 @@ export function useThreadListActions(): {
451450
[updateThreadMetadata],
452451
);
453452

454-
// Move up / Move down for the pinned block. Computed against the CANONICAL
455-
// keyed pinned order (not the rendered list), so the move is valid even
456-
// while search or a project scope filters rows: the same fractional-key
457-
// scheme web dragging uses, one write to one thread per move (plus a
458-
// one-time section materialization when legacy keyless pins are involved).
453+
// Plan against the complete section so filtering does not change a move.
459454
const reorderPinnedMutation = useAtomCommand(threadEnvironment.reorderPin, {
460455
reportFailure: false,
461456
});
462-
// One move at a time: a second tap before the first write's event lands
463-
// would plan from the same stale snapshot and silently collapse two moves
464-
// into one — same double-dispatch guard as snoozeThread.
465-
const movePinnedInFlightRef = useRef(false);
466-
const movePinnedThread = useCallback(
457+
const reorderActiveMutation = useAtomCommand(threadEnvironment.reorderActive, {
458+
reportFailure: false,
459+
});
460+
const moveThread = useCallback(
467461
async (thread: EnvironmentThreadShell, direction: "up" | "down") => {
468-
if (movePinnedInFlightRef.current) return false;
469-
if (!environmentSupportsPinReorder(thread.environmentId)) {
462+
if (getPendingThreadOrder() !== null) return false;
463+
const section = thread.pinnedAt != null ? "pinned" : "active";
464+
const configs = appAtomRegistry.get(environmentServerConfigsAtom);
465+
const supportsReorder = (environmentId: EnvironmentThreadShell["environmentId"]) => {
466+
const capabilities = configs.get(environmentId)?.environment.capabilities;
467+
return section === "pinned"
468+
? capabilities?.threadPinReorder === true
469+
: capabilities?.threadActiveReorder === true;
470+
};
471+
if (!supportsReorder(thread.environmentId)) {
470472
Alert.alert(
471473
"Could not move thread",
472-
"This environment's server does not support pinned reordering yet. Update the server to reorder pins.",
474+
"This environment's server does not support reordering these threads. Update the server to arrange them.",
473475
);
474476
return false;
475477
}
476478
const shells = appAtomRegistry.get(environmentThreadShells.threadShellsAtom);
477-
const pinned = sortPinnedThreadsByOrderKey(
478-
shells.filter(
479-
(shell) =>
480-
shell.pinnedAt != null &&
481-
shell.archivedAt === null &&
482-
environmentSupportsPinReorder(shell.environmentId),
479+
const ordered = getThreadListV2OrderedSection({
480+
threads: shells,
481+
section,
482+
now: new Date().toISOString(),
483+
settlementEnvironmentIds: new Set(
484+
[...configs].flatMap(([id, config]) =>
485+
config.environment.capabilities.threadSettlement === true ? [id] : [],
486+
),
483487
),
484-
);
485-
const orderedIds = pinned.map((shell) => scopedThreadKey(shell.environmentId, shell.id));
486-
const assignments = planPinnedMove({
487-
orderedIds,
488-
keysById: new Map(
489-
pinned.map((shell) => [
490-
scopedThreadKey(shell.environmentId, shell.id),
491-
shell.pinOrderKey ?? null,
492-
]),
488+
snoozeEnvironmentIds: new Set(
489+
[...configs].flatMap(([id, config]) =>
490+
config.environment.capabilities.threadSnooze === true ? [id] : [],
491+
),
493492
),
494-
movedId: scopedThreadKey(thread.environmentId, thread.id),
495-
direction,
496493
});
497-
if (assignments === null || assignments.length === 0) return false;
494+
const assignments = createThreadMovePlanner({
495+
allThreads: shells,
496+
ordered,
497+
section,
498+
reorderableEnvironmentIds: new Set([...configs.keys()].filter(supportsReorder)),
499+
})(scopedThreadKey(thread.environmentId, thread.id), direction);
500+
if (assignments === null) return false;
498501
const shellByKey = new Map(
499-
pinned.map((shell) => [scopedThreadKey(shell.environmentId, shell.id), shell]),
502+
ordered.map((shell) => [scopedThreadKey(shell.environmentId, shell.id), shell]),
500503
);
501504
selectionHaptic();
502-
movePinnedInFlightRef.current = true;
505+
const pending = beginPendingThreadOrder(
506+
createPendingThreadOrder({
507+
section,
508+
ordered,
509+
movedId: scopedThreadKey(thread.environmentId, thread.id),
510+
direction,
511+
assignments,
512+
}),
513+
);
514+
let succeeded = false;
515+
const reorder = section === "pinned" ? reorderPinnedMutation : reorderActiveMutation;
503516
try {
504517
for (const assignment of assignments) {
518+
if (!pending.isPending()) return false;
505519
const target = shellByKey.get(assignment.id);
506520
if (target === undefined) continue;
507-
const result = await reorderPinnedMutation({
521+
const result = await reorder({
508522
environmentId: target.environmentId,
509523
input: { threadId: target.id, orderKey: assignment.orderKey },
510524
});
@@ -514,20 +528,20 @@ export function useThreadListActions(): {
514528
"Could not move thread",
515529
error instanceof Error && error.message.trim().length > 0
516530
? error.message
517-
: "The pinned thread could not be moved.",
531+
: "The thread could not be moved.",
518532
);
519-
// No rollback: keys already written are valid orderings on their
520-
// own (each write is a complete, consistent placement), so a
521-
// partial materialization leaves the list sensible, not corrupt.
533+
// Keep confirmed keys when a later environment rejects its write.
522534
return false;
523535
}
524536
}
537+
succeeded = true;
538+
pending.complete();
525539
return true;
526540
} finally {
527-
movePinnedInFlightRef.current = false;
541+
if (!succeeded) pending.cancel();
528542
}
529543
},
530-
[reorderPinnedMutation],
544+
[reorderActiveMutation, reorderPinnedMutation],
531545
);
532546

533547
const confirmDeleteThread = useConfirmDeleteThread(executeAction);
@@ -541,7 +555,7 @@ export function useThreadListActions(): {
541555
unsettleThread,
542556
pinThread,
543557
unpinThread,
544-
movePinnedThread,
558+
moveThread,
545559
regenerateThreadTitle,
546560
};
547561
}

0 commit comments

Comments
 (0)