Skip to content

Commit 3815438

Browse files
authored
fix: restore automatic thread settling defaults (pingdotgg#8596)
1 parent 22c311d commit 3815438

25 files changed

Lines changed: 231 additions & 568 deletions

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

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

‎apps/mobile/src/Stack.tsx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ 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";
5554
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
5655
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
5756
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
@@ -178,13 +177,6 @@ const SettingsContentStack = createNativeStackNavigator({
178177
title: "Appearance",
179178
},
180179
}),
181-
SettingsAutoSettle: createNativeStackScreen({
182-
screen: SettingsAutoSettleRouteScreen,
183-
linking: "thread-settling",
184-
options: {
185-
title: "Thread Settling",
186-
},
187-
}),
188180
SettingsProjectGrouping: createNativeStackScreen({
189181
screen: SettingsProjectGroupingRouteScreen,
190182
linking: "project-grouping",

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ 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";
3433
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
3534
import { useThreadSearch } from "../../state/queries";
3635
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
@@ -209,9 +208,9 @@ export function HomeScreen(props: HomeScreenProps) {
209208
>(() => new Map());
210209
const preferencesResult = useAtomValue(mobilePreferencesAtom);
211210
const threadListV2Enabled = useThreadListV2Enabled();
212-
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
213-
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
214-
);
211+
const autoSettleOnMerge =
212+
!AsyncResult.isSuccess(preferencesResult) ||
213+
preferencesResult.value.autoSettleOnMerge !== false;
215214
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
216215
const openSwipeableRef = useRef<SwipeableMethods | null>(null);
217216
const listRef = useRef<LegendListRef | null>(null);
@@ -679,8 +678,7 @@ export function HomeScreen(props: HomeScreenProps) {
679678
searchQuery: props.searchQuery,
680679
matchedThreadKeys,
681680
changeRequestByKey,
682-
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
683-
autoSettleMode: autoSettlePreferences.autoSettleMode,
681+
autoSettleOnMerge,
684682
settlementEnvironmentIds,
685683
snoozeEnvironmentIds,
686684
settledLimit: settledVisibleCount,
@@ -692,8 +690,7 @@ export function HomeScreen(props: HomeScreenProps) {
692690
});
693691
}, [
694692
changeRequestByKey,
695-
autoSettlePreferences.autoSettleAfterDays,
696-
autoSettlePreferences.autoSettleMode,
693+
autoSettleOnMerge,
697694
nowMinute,
698695
snoozeWakeTick,
699696
snoozedShelfExpanded,

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

Lines changed: 0 additions & 173 deletions
This file was deleted.

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ 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";
87
import { SymbolView } from "../../components/AppSymbol";
98
import * as Effect from "effect/Effect";
109
import { AsyncResult } from "effect/unstable/reactivity";
@@ -46,7 +45,6 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
4645
import { SettingsRow } from "./components/SettingsRow";
4746
import { SettingsSection } from "./components/SettingsSection";
4847
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
49-
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
5048
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";
5149

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

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

537536
return (
538537
<SettingsSection title="General">
539538
<SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
540-
<SettingsRow
539+
<SettingsSwitchRow
541540
icon="arrow.triangle.branch"
542-
label="Thread Settling"
543-
value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
544-
target="SettingsAutoSettle"
541+
label="Auto-settle merged threads"
542+
value={autoSettleOnMerge}
543+
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
545544
/>
546545
<SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
547546
</SettingsSection>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ export type SettingsSheetTarget =
22
| "SettingsEnvironments"
33
| "SettingsArchive"
44
| "SettingsAppearance"
5-
| "SettingsAutoSettle"
65
| "SettingsProjectGrouping"
76
| "SettingsClientStorage"
87
| "SettingsUsage";

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ 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";
3029
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
3130
import { useProjects, useThreadShells } from "../../state/entities";
3231
import { mobilePreferencesAtom } from "../../state/preferences";
@@ -166,9 +165,9 @@ function ThreadNavigationSidebarPane(
166165
} = useThreadListActions();
167166
const threadListV2Enabled = useThreadListV2Enabled();
168167
const preferencesResult = useAtomValue(mobilePreferencesAtom);
169-
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
170-
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
171-
);
168+
const autoSettleOnMerge =
169+
!AsyncResult.isSuccess(preferencesResult) ||
170+
preferencesResult.value.autoSettleOnMerge !== false;
172171
const pendingTasks = usePendingNewTasks();
173172
const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
174173
const environments = useMemo(
@@ -511,8 +510,7 @@ function ThreadNavigationSidebarPane(
511510
searchQuery: props.searchQuery,
512511
matchedThreadKeys,
513512
changeRequestByKey,
514-
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
515-
autoSettleMode: autoSettlePreferences.autoSettleMode,
513+
autoSettleOnMerge,
516514
settlementEnvironmentIds,
517515
snoozeEnvironmentIds,
518516
settledLimit: settledVisibleCount,
@@ -524,8 +522,7 @@ function ThreadNavigationSidebarPane(
524522
});
525523
}, [
526524
changeRequestByKey,
527-
autoSettlePreferences.autoSettleAfterDays,
528-
autoSettlePreferences.autoSettleMode,
525+
autoSettleOnMerge,
529526
nowMinute,
530527
snoozeWakeTick,
531528
snoozedShelfExpanded,

0 commit comments

Comments
 (0)