Skip to content

Commit 0bbecfa

Browse files
authored
fix: make thread auto-settling opt-in (pingdotgg#8321)
1 parent cb49e5d commit 0bbecfa

25 files changed

Lines changed: 568 additions & 231 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
3939
showSkillsInSlashMenu: false,
4040
providerModelPreferences: {},
4141
sidebarAutoSettleAfterDays: 3,
42-
sidebarAutoSettleOnMerge: true,
42+
sidebarAutoSettleMode: "change-request",
4343
sidebarProjectGroupingMode: "repository_path",
4444
sidebarProjectGroupingOverrides: {
4545
"environment-1:/tmp/project-a": "separate",

‎apps/mobile/src/Stack.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import {
5151
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
5252
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
5353
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
54+
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
5455
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
5556
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
5657
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
177178
title: "Appearance",
178179
},
179180
}),
181+
SettingsAutoSettle: createNativeStackScreen({
182+
screen: SettingsAutoSettleRouteScreen,
183+
linking: "thread-settling",
184+
options: {
185+
title: "Thread Settling",
186+
},
187+
}),
180188
SettingsProjectGrouping: createNativeStackScreen({
181189
screen: SettingsProjectGroupingRouteScreen,
182190
linking: "project-grouping",

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
3030
import type { SavedRemoteConnection } from "../../lib/connection";
3131
import { scopedProjectKey } from "../../lib/scopedEntities";
3232
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
33+
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
3334
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
3435
import { useThreadSearch } from "../../state/queries";
3536
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
208209
>(() => new Map());
209210
const preferencesResult = useAtomValue(mobilePreferencesAtom);
210211
const threadListV2Enabled = useThreadListV2Enabled();
211-
const autoSettleOnMerge =
212-
!AsyncResult.isSuccess(preferencesResult) ||
213-
preferencesResult.value.autoSettleOnMerge !== false;
212+
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
213+
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
214+
);
214215
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
215216
const openSwipeableRef = useRef<SwipeableMethods | null>(null);
216217
const listRef = useRef<LegendListRef | null>(null);
@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
678679
searchQuery: props.searchQuery,
679680
matchedThreadKeys,
680681
changeRequestByKey,
681-
autoSettleOnMerge,
682+
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
683+
autoSettleMode: autoSettlePreferences.autoSettleMode,
682684
settlementEnvironmentIds,
683685
snoozeEnvironmentIds,
684686
settledLimit: settledVisibleCount,
@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
690692
});
691693
}, [
692694
changeRequestByKey,
693-
autoSettleOnMerge,
695+
autoSettlePreferences.autoSettleAfterDays,
696+
autoSettlePreferences.autoSettleMode,
694697
nowMinute,
695698
snoozeWakeTick,
696699
snoozedShelfExpanded,
Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
import { useAtomSet, useAtomValue } from "@effect/atom-react";
2+
import { useNavigation } from "@react-navigation/native";
3+
import {
4+
MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
5+
MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
6+
type SidebarAutoSettleMode,
7+
} from "@t3tools/contracts";
8+
import { AsyncResult } from "effect/unstable/reactivity";
9+
import { Platform, Pressable, ScrollView, View } from "react-native";
10+
import { useSafeAreaInsets } from "react-native-safe-area-context";
11+
12+
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
13+
import { AppText as Text } from "../../components/AppText";
14+
import { SymbolView } from "../../components/AppSymbol";
15+
import { useUniwindTheme } from "../../lib/useUniwindTheme";
16+
import { NativeStackScreenOptions } from "../../native/StackHeader";
17+
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
18+
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
19+
import { SettingsSection } from "./components/SettingsSection";
20+
21+
const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
22+
readonly mode: SidebarAutoSettleMode;
23+
readonly label: string;
24+
readonly description: string;
25+
}> = [
26+
{
27+
mode: "never",
28+
label: "Never",
29+
description: "Threads settle only when you choose Settle.",
30+
},
31+
{
32+
mode: "change-request",
33+
label: "When a pull request merges or closes",
34+
description: "A missing or uncertain pull-request timestamp keeps the thread active.",
35+
},
36+
{
37+
mode: "inactivity",
38+
label: "After inactivity",
39+
description: "Running, blocked, and open-pull-request threads stay active.",
40+
},
41+
];
42+
43+
export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
44+
if (mode === "change-request") return "PR merged or closed";
45+
if (mode === "inactivity") return "After inactivity";
46+
return "Never";
47+
}
48+
49+
export function SettingsAutoSettleRouteScreen() {
50+
const navigation = useNavigation();
51+
const insets = useSafeAreaInsets();
52+
const checkmarkColor = useUniwindTheme()["--color-icon"];
53+
const preferencesResult = useAtomValue(mobilePreferencesAtom);
54+
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
55+
const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
56+
const resolved = resolveMobileAutoSettlePreferences(
57+
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
58+
);
59+
60+
const setDays = (days: number) => {
61+
if (!preferencesReady) return;
62+
savePreferences({
63+
autoSettleAfterDays: Math.min(
64+
MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
65+
Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
66+
),
67+
});
68+
};
69+
70+
return (
71+
<View collapsable={false} className="flex-1 bg-sheet">
72+
{Platform.OS === "android" ? (
73+
<>
74+
<NativeStackScreenOptions options={{ headerShown: false }} />
75+
<AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
76+
</>
77+
) : null}
78+
<ScrollView
79+
contentInsetAdjustmentBehavior="automatic"
80+
showsVerticalScrollIndicator={false}
81+
className="flex-1"
82+
contentContainerClassName="gap-4 px-5 pt-4"
83+
contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
84+
>
85+
<SettingsSection title="Automatic settling">
86+
{AUTO_SETTLE_OPTIONS.map((option, index) => (
87+
<Pressable
88+
key={option.mode}
89+
accessibilityRole="radio"
90+
accessibilityState={{
91+
checked: resolved.autoSettleMode === option.mode,
92+
disabled: !preferencesReady,
93+
}}
94+
disabled={!preferencesReady}
95+
onPress={() => savePreferences({ autoSettleMode: option.mode })}
96+
className={
97+
index === 0
98+
? "flex-row items-center gap-4 p-4"
99+
: "flex-row items-center gap-4 border-t border-border-subtle p-4"
100+
}
101+
>
102+
<View className="min-w-0 flex-1 gap-1">
103+
<Text className="text-lg text-foreground">{option.label}</Text>
104+
<Text className="text-sm leading-normal text-foreground-muted">
105+
{option.description}
106+
</Text>
107+
</View>
108+
{resolved.autoSettleMode === option.mode ? (
109+
<SymbolView
110+
name="checkmark"
111+
size={18}
112+
tintColor={checkmarkColor}
113+
type="monochrome"
114+
weight="semibold"
115+
/>
116+
) : null}
117+
</Pressable>
118+
))}
119+
</SettingsSection>
120+
121+
{resolved.autoSettleMode === "inactivity" ? (
122+
<SettingsSection title="Inactivity window">
123+
<View className="flex-row items-center gap-4 p-4">
124+
<View className="min-w-0 flex-1 gap-1">
125+
<Text className="text-lg text-foreground">Days without activity</Text>
126+
<Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
127+
</View>
128+
<Pressable
129+
accessibilityLabel="Decrease inactivity days"
130+
accessibilityRole="button"
131+
disabled={
132+
!preferencesReady ||
133+
resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
134+
}
135+
onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
136+
className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
137+
>
138+
<SymbolView
139+
name="minus"
140+
size={16}
141+
tintColor={checkmarkColor}
142+
type="monochrome"
143+
weight="semibold"
144+
/>
145+
</Pressable>
146+
<Text className="w-8 text-center text-lg text-foreground">
147+
{resolved.autoSettleAfterDays}
148+
</Text>
149+
<Pressable
150+
accessibilityLabel="Increase inactivity days"
151+
accessibilityRole="button"
152+
disabled={
153+
!preferencesReady ||
154+
resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
155+
}
156+
onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
157+
className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
158+
>
159+
<SymbolView
160+
name="plus"
161+
size={16}
162+
tintColor={checkmarkColor}
163+
type="monochrome"
164+
weight="semibold"
165+
/>
166+
</Pressable>
167+
</View>
168+
</SettingsSection>
169+
) : null}
170+
</ScrollView>
171+
</View>
172+
);
173+
}

‎apps/mobile/src/features/settings/SettingsRouteScreen.tsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Constants from "expo-constants";
44
import * as Notifications from "expo-notifications";
55
import { useNavigation } from "@react-navigation/native";
66
import { NativeStackScreenOptions } from "../../native/StackHeader";
7+
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
78
import { SymbolView } from "../../components/AppSymbol";
89
import * as Effect from "effect/Effect";
910
import { AsyncResult } from "effect/unstable/reactivity";
@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
4546
import { SettingsRow } from "./components/SettingsRow";
4647
import { SettingsSection } from "./components/SettingsSection";
4748
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
49+
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
4850
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";
4951

5052
type NotificationStatus = "checking" | "enabled" | "disabled" | "unsupported";
@@ -528,19 +530,18 @@ function ConfiguredSettingsRouteScreen() {
528530

529531
function GeneralSettingsSection() {
530532
const preferencesResult = useAtomValue(mobilePreferencesAtom);
531-
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
532-
const autoSettleOnMerge =
533-
!AsyncResult.isSuccess(preferencesResult) ||
534-
preferencesResult.value.autoSettleOnMerge !== false;
533+
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
534+
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
535+
);
535536

536537
return (
537538
<SettingsSection title="General">
538539
<SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
539-
<SettingsSwitchRow
540+
<SettingsRow
540541
icon="arrow.triangle.branch"
541-
label="Auto-settle merged threads"
542-
value={autoSettleOnMerge}
543-
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
542+
label="Thread Settling"
543+
value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
544+
target="SettingsAutoSettle"
544545
/>
545546
<SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
546547
</SettingsSection>

‎apps/mobile/src/features/settings/components/settings-sheet-targets.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
22
| "SettingsEnvironments"
33
| "SettingsArchive"
44
| "SettingsAppearance"
5+
| "SettingsAutoSettle"
56
| "SettingsProjectGrouping"
67
| "SettingsClientStorage"
78
| "SettingsUsage";

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
2626
import { SymbolView } from "../../components/AppSymbol";
2727
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
2828
import { NativeStackScreenOptions } from "../../native/StackHeader";
29+
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
2930
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
3031
import { useProjects, useThreadShells } from "../../state/entities";
3132
import { mobilePreferencesAtom } from "../../state/preferences";
@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
165166
} = useThreadListActions();
166167
const threadListV2Enabled = useThreadListV2Enabled();
167168
const preferencesResult = useAtomValue(mobilePreferencesAtom);
168-
const autoSettleOnMerge =
169-
!AsyncResult.isSuccess(preferencesResult) ||
170-
preferencesResult.value.autoSettleOnMerge !== false;
169+
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
170+
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
171+
);
171172
const pendingTasks = usePendingNewTasks();
172173
const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
173174
const environments = useMemo(
@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
510511
searchQuery: props.searchQuery,
511512
matchedThreadKeys,
512513
changeRequestByKey,
513-
autoSettleOnMerge,
514+
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
515+
autoSettleMode: autoSettlePreferences.autoSettleMode,
514516
settlementEnvironmentIds,
515517
snoozeEnvironmentIds,
516518
settledLimit: settledVisibleCount,
@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
522524
});
523525
}, [
524526
changeRequestByKey,
525-
autoSettleOnMerge,
527+
autoSettlePreferences.autoSettleAfterDays,
528+
autoSettlePreferences.autoSettleMode,
526529
nowMinute,
527530
snoozeWakeTick,
528531
snoozedShelfExpanded,

0 commit comments

Comments
 (0)