fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shivamhwp merged 5 commits into from
Aug 28, 2026
Merged

fix: make thread auto-settling opt-in #8321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29c714b
fix: make thread auto-settling opt-in
shivamhwp Aug 26, 2026
da62d15
fix(web): reset hidden auto-settle window
shivamhwp Aug 26, 2026
a476916
merge: update main into auto-settle policy
shivamhwp Aug 28, 2026
b879761
fix(mobile): update thread settling for current theme runtime
shivamhwp Aug 28, 2026
b8d0c0d
Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321
shivamhwp Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/desktop/src/settings/DesktopClientSettings.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
showSkillsInSlashMenu: false,
providerModelPreferences: {},
sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
sidebarProjectGroupingMode: "repository_path",
sidebarProjectGroupingOverrides: {
"environment-1:/tmp/project-a": "separate",
Expand Down
8 changes: 8 additions & 0 deletions apps/mobile/src/Stack.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
title: "Appearance",
},
}),
SettingsAutoSettle: createNativeStackScreen({
screen: SettingsAutoSettleRouteScreen,
linking: "thread-settling",
options: {
title: "Thread Settling",
},
}),
SettingsProjectGrouping: createNativeStackScreen({
screen: SettingsProjectGroupingRouteScreen,
linking: "project-grouping",
Expand Down
13 changes: 8 additions & 5 deletions apps/mobile/src/features/home/HomeScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
>(() => new Map());
const preferencesResult = useAtomValue(mobilePreferencesAtom);
const threadListV2Enabled = useThreadListV2Enabled();
const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
preferencesResult.value.autoSettleOnMerge !== false;
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
const openSwipeableRef = useRef<SwipeableMethods | null>(null);
const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
searchQuery: props.searchQuery,
matchedThreadKeys,
changeRequestByKey,
autoSettleOnMerge,
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
autoSettleMode: autoSettlePreferences.autoSettleMode,
settlementEnvironmentIds,
snoozeEnvironmentIds,
settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
});
}, [
changeRequestByKey,
autoSettleOnMerge,
autoSettlePreferences.autoSettleAfterDays,
autoSettlePreferences.autoSettleMode,
nowMinute,
snoozeWakeTick,
snoozedShelfExpanded,
Expand Down
173 changes: 173 additions & 0 deletions apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
readonly mode: SidebarAutoSettleMode;
readonly label: string;
readonly description: string;
}> = [
{
mode: "never",
label: "Never",
description: "Threads settle only when you choose Settle.",
},
{
mode: "change-request",
label: "When a pull request merges or closes",
description: "A missing or uncertain pull-request timestamp keeps the thread active.",
},
{
mode: "inactivity",
label: "After inactivity",
description: "Running, blocked, and open-pull-request threads stay active.",
},
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
if (mode === "change-request") return "PR merged or closed";
if (mode === "inactivity") return "After inactivity";
return "Never";
}

export function SettingsAutoSettleRouteScreen() {
const navigation = useNavigation();
const insets = useSafeAreaInsets();
const checkmarkColor = useUniwindTheme()["--color-icon"];
const preferencesResult = useAtomValue(mobilePreferencesAtom);
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
const resolved = resolveMobileAutoSettlePreferences(
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);

const setDays = (days: number) => {
if (!preferencesReady) return;
savePreferences({
autoSettleAfterDays: Math.min(
MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
),
});
};

return (
<View collapsable={false} className="flex-1 bg-sheet">
{Platform.OS === "android" ? (
<>
<NativeStackScreenOptions options={{ headerShown: false }} />
<AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
</>
) : null}
<ScrollView
contentInsetAdjustmentBehavior="automatic"
showsVerticalScrollIndicator={false}
className="flex-1"
contentContainerClassName="gap-4 px-5 pt-4"
contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
>
<SettingsSection title="Automatic settling">
{AUTO_SETTLE_OPTIONS.map((option, index) => (
<Pressable
key={option.mode}
accessibilityRole="radio"
accessibilityState={{
checked: resolved.autoSettleMode === option.mode,
disabled: !preferencesReady,
}}
disabled={!preferencesReady}
onPress={() => savePreferences({ autoSettleMode: option.mode })}
className={
index === 0
? "flex-row items-center gap-4 p-4"
: "flex-row items-center gap-4 border-t border-border-subtle p-4"
}
>
<View className="min-w-0 flex-1 gap-1">
<Text className="text-lg text-foreground">{option.label}</Text>
<Text className="text-sm leading-normal text-foreground-muted">
{option.description}
</Text>
</View>
{resolved.autoSettleMode === option.mode ? (
<SymbolView
name="checkmark"
size={18}
tintColor={checkmarkColor}
type="monochrome"
weight="semibold"
/>
) : null}
</Pressable>
))}
</SettingsSection>

{resolved.autoSettleMode === "inactivity" ? (
<SettingsSection title="Inactivity window">
<View className="flex-row items-center gap-4 p-4">
<View className="min-w-0 flex-1 gap-1">
<Text className="text-lg text-foreground">Days without activity</Text>
<Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
</View>
<Pressable
accessibilityLabel="Decrease inactivity days"
accessibilityRole="button"
disabled={
!preferencesReady ||
resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
}
onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
>
<SymbolView
name="minus"
size={16}
tintColor={checkmarkColor}
type="monochrome"
weight="semibold"
/>
</Pressable>
<Text className="w-8 text-center text-lg text-foreground">
{resolved.autoSettleAfterDays}
</Text>
<Pressable
accessibilityLabel="Increase inactivity days"
accessibilityRole="button"
disabled={
!preferencesReady ||
resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
}
onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
>
<SymbolView
name="plus"
size={16}
tintColor={checkmarkColor}
type="monochrome"
weight="semibold"
/>
</Pressable>
</View>
</SettingsSection>
) : null}
</ScrollView>
</View>
);
}
17 changes: 9 additions & 8 deletions apps/mobile/src/features/settings/SettingsRouteScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
const preferencesResult = useAtomValue(mobilePreferencesAtom);
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
preferencesResult.value.autoSettleOnMerge !== false;
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);

return (
<SettingsSection title="General">
<SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
<SettingsSwitchRow
<SettingsRow
icon="arrow.triangle.branch"
label="Auto-settle merged threads"
value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
label="Thread Settling"
value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
/>
<SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
</SettingsSection>
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/features/settings/components/settings-sheet-targets.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
| "SettingsEnvironments"
| "SettingsArchive"
| "SettingsAppearance"
| "SettingsAutoSettle"
| "SettingsProjectGrouping"
| "SettingsClientStorage"
| "SettingsUsage";
Expand Down
13 changes: 8 additions & 5 deletions apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
} = useThreadListActions();
const threadListV2Enabled = useThreadListV2Enabled();
const preferencesResult = useAtomValue(mobilePreferencesAtom);
const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
preferencesResult.value.autoSettleOnMerge !== false;
const autoSettlePreferences = resolveMobileAutoSettlePreferences(
AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
const pendingTasks = usePendingNewTasks();
const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
searchQuery: props.searchQuery,
matchedThreadKeys,
changeRequestByKey,
autoSettleOnMerge,
autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
autoSettleMode: autoSettlePreferences.autoSettleMode,
settlementEnvironmentIds,
snoozeEnvironmentIds,
settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
});
}, [
changeRequestByKey,
autoSettleOnMerge,
autoSettlePreferences.autoSettleAfterDays,
autoSettlePreferences.autoSettleMode,
nowMinute,
snoozeWakeTick,
snoozedShelfExpanded,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: make thread auto-settling opt-in#8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shivamhwp
merged 5 commits into

from

Aug 28, 2026
 Merged


fix: make thread auto-settling opt-in
#8321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
29c714b

fix: make thread auto-settling opt-in


shivamhwp Aug 26, 2026
da62d15

fix(web): reset hidden auto-settle window


shivamhwp Aug 26, 2026
a476916

merge: update main into auto-settle policy


shivamhwp Aug 28, 2026
b879761

fix(mobile): update thread settling for current theme runtime


shivamhwp Aug 28, 2026
b8d0c0d

Merge remote-tracking branch 'upstream/main' into codex/review-pr-8321


shivamhwp Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
apps/desktop/src/settings/DesktopClientSettings.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ const clientSettings: ClientSettings = {
 showSkillsInSlashMenu: false,
 providerModelPreferences: {},
 sidebarAutoSettleAfterDays: 3,
sidebarAutoSettleOnMerge: true,
sidebarAutoSettleMode: "change-request",
 sidebarProjectGroupingMode: "repository_path",
 sidebarProjectGroupingOverrides: {
 "environment-1:/tmp/project-a": "separate",
Expand Down

8 changes: 8 additions & 0 deletions
apps/mobile/src/Stack.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ import {
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
import { SettingsAutoSettleRouteScreen } from "./features/settings/SettingsAutoSettleRouteScreen";
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
Expand DownExpand Up@@ -177,6 +178,13 @@ const SettingsContentStack = createNativeStackNavigator({
 title: "Appearance",
 },
 }),
 SettingsAutoSettle: createNativeStackScreen({
 screen: SettingsAutoSettleRouteScreen,
 linking: "thread-settling",
 options: {
 title: "Thread Settling",
 },
 }),
 SettingsProjectGrouping: createNativeStackScreen({
 screen: SettingsProjectGroupingRouteScreen,
 linking: "project-grouping",
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
import type { SavedRemoteConnection } from "../../lib/connection";
import { scopedProjectKey } from "../../lib/scopedEntities";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { useThreadSearch } from "../../state/queries";
import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
Expand DownExpand Up@@ -208,9 +209,9 @@ export function HomeScreen(props: HomeScreenProps) {
 >(() => new Map());
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const threadListV2Enabled = useThreadListV2Enabled();
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const openSwipeableRef = useRef<SwipeableMethods | null>(null);
 const listRef = useRef<LegendListRef | null>(null);
Expand DownExpand Up@@ -678,7 +679,8 @@ export function HomeScreen(props: HomeScreenProps) {
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -690,7 +692,8 @@ export function HomeScreen(props: HomeScreenProps) {
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down

173 changes: 173 additions & 0 deletions
apps/mobile/src/features/settings/SettingsAutoSettleRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
import { useAtomSet, useAtomValue } from "@effect/atom-react";
import { useNavigation } from "@react-navigation/native";
import {
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 type SidebarAutoSettleMode,
} from "@t3tools/contracts";
import { AsyncResult } from "effect/unstable/reactivity";
import { Platform, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { AppText as Text } from "../../components/AppText";
import { SymbolView } from "../../components/AppSymbol";
import { useUniwindTheme } from "../../lib/useUniwindTheme";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
import { SettingsSection } from "./components/SettingsSection";

const AUTO_SETTLE_OPTIONS: ReadonlyArray<{
 readonly mode: SidebarAutoSettleMode;
 readonly label: string;
 readonly description: string;
}> = [
 {
 mode: "never",
 label: "Never",
 description: "Threads settle only when you choose Settle.",
 },
 {
 mode: "change-request",
 label: "When a pull request merges or closes",
 description: "A missing or uncertain pull-request timestamp keeps the thread active.",
 },
 {
 mode: "inactivity",
 label: "After inactivity",
 description: "Running, blocked, and open-pull-request threads stay active.",
 },
];

export function mobileAutoSettleModeLabel(mode: SidebarAutoSettleMode): string {
 if (mode === "change-request") return "PR merged or closed";
 if (mode === "inactivity") return "After inactivity";
 return "Never";
}

export function SettingsAutoSettleRouteScreen() {
 const navigation = useNavigation();
 const insets = useSafeAreaInsets();
 const checkmarkColor = useUniwindTheme()["--color-icon"];
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
 const resolved = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 const setDays = (days: number) => {
 if (!preferencesReady) return;
 savePreferences({
 autoSettleAfterDays: Math.min(
 MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS,
 Math.max(MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, days),
 ),
 });
 };

 return (
 <View collapsable={false} className="flex-1 bg-sheet">
 {Platform.OS === "android" ? (
 <>
 <NativeStackScreenOptions options={{ headerShown: false }} />
 <AndroidScreenHeader title="Thread Settling" onBack={() => navigation.goBack()} />
 </>
 ) : null}
 <ScrollView
 contentInsetAdjustmentBehavior="automatic"
 showsVerticalScrollIndicator={false}
 className="flex-1"
 contentContainerClassName="gap-4 px-5 pt-4"
 contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
 >
 <SettingsSection title="Automatic settling">
 {AUTO_SETTLE_OPTIONS.map((option, index) => (
 <Pressable
 key={option.mode}
 accessibilityRole="radio"
 accessibilityState={{
 checked: resolved.autoSettleMode === option.mode,
 disabled: !preferencesReady,
 }}
 disabled={!preferencesReady}
 onPress={() => savePreferences({ autoSettleMode: option.mode })}
 className={
 index === 0
 ? "flex-row items-center gap-4 p-4"
 : "flex-row items-center gap-4 border-t border-border-subtle p-4"
 }
 >
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">{option.label}</Text>
 <Text className="text-sm leading-normal text-foreground-muted">
 {option.description}
 </Text>
 </View>
 {resolved.autoSettleMode === option.mode ? (
 <SymbolView
 name="checkmark"
 size={18}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 ) : null}
 </Pressable>
 ))}
 </SettingsSection>

 {resolved.autoSettleMode === "inactivity" ? (
 <SettingsSection title="Inactivity window">
 <View className="flex-row items-center gap-4 p-4">
 <View className="min-w-0 flex-1 gap-1">
 <Text className="text-lg text-foreground">Days without activity</Text>
 <Text className="text-sm text-foreground-muted">Between 1 and 90 days</Text>
 </View>
 <Pressable
 accessibilityLabel="Decrease inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays <= MIN_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays - 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="minus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 <Text className="w-8 text-center text-lg text-foreground">
 {resolved.autoSettleAfterDays}
 </Text>
 <Pressable
 accessibilityLabel="Increase inactivity days"
 accessibilityRole="button"
 disabled={
 !preferencesReady ||
 resolved.autoSettleAfterDays >= MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS
 }
 onPress={() => setDays(resolved.autoSettleAfterDays + 1)}
 className="size-10 items-center justify-center rounded-full bg-fill-secondary disabled:opacity-40"
 >
 <SymbolView
 name="plus"
 size={16}
 tintColor={checkmarkColor}
 type="monochrome"
 weight="semibold"
 />
 </Pressable>
 </View>
 </SettingsSection>
 ) : null}
 </ScrollView>
 </View>
 );
}

17 changes: 9 additions & 8 deletions
apps/mobile/src/features/settings/SettingsRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import Constants from "expo-constants";
import * as Notifications from "expo-notifications";
import { useNavigation } from "@react-navigation/native";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { SymbolView } from "../../components/AppSymbol";
import * as Effect from "effect/Effect";
import { AsyncResult } from "effect/unstable/reactivity";
Expand DownExpand Up@@ -45,6 +46,7 @@ import { useSavedRemoteConnections } from "../../state/use-remote-environment-re
import { SettingsRow } from "./components/SettingsRow";
import { SettingsSection } from "./components/SettingsSection";
import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
import { mobileAutoSettleModeLabel } from "./SettingsAutoSettleRouteScreen";
import { resolveAgentAwarenessPlatformPresentation } from "./SettingsRouteScreen.logic";

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

function GeneralSettingsSection() {
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const savePreferences = useAtomSet(updateMobilePreferencesAtom);
 const autoSettleOnMerge =
 !AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
 );

 return (
 <SettingsSection title="General">
 <SettingsRow icon="folder" label="Project Grouping" target="SettingsProjectGrouping" />
 <SettingsSwitchRow
 <SettingsRow
 icon="arrow.triangle.branch"
 label="Auto-settle merged threads"
 value={autoSettleOnMerge}
onValueChange={(value) => savePreferences({ autoSettleOnMerge: value })}
 label="Thread Settling"
 value={mobileAutoSettleModeLabel(autoSettlePreferences.autoSettleMode)}
target="SettingsAutoSettle"
 />
 <SettingsRow icon="chart.bar.xaxis" label="Usage" target="SettingsUsage" />
 </SettingsSection>
Expand Down

1 change: 1 addition & 0 deletions
apps/mobile/src/features/settings/components/settings-sheet-targets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export type SettingsSheetTarget =
 | "SettingsEnvironments"
 | "SettingsArchive"
 | "SettingsAppearance"
 | "SettingsAutoSettle"
 | "SettingsProjectGrouping"
 | "SettingsClientStorage"
 | "SettingsUsage";
Expand Down

13 changes: 8 additions & 5 deletions
apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
import { SymbolView } from "../../components/AppSymbol";
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import { resolveMobileAutoSettlePreferences } from "../../persistence/mobile-preferences";
import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
import { useProjects, useThreadShells } from "../../state/entities";
import { mobilePreferencesAtom } from "../../state/preferences";
Expand DownExpand Up@@ -165,9 +166,9 @@ function ThreadNavigationSidebarPane(
 } = useThreadListActions();
 const threadListV2Enabled = useThreadListV2Enabled();
 const preferencesResult = useAtomValue(mobilePreferencesAtom);
 const autoSettleOnMerge =
!AsyncResult.isSuccess(preferencesResult) ||
 preferencesResult.value.autoSettleOnMerge !== false;
 const autoSettlePreferences = resolveMobileAutoSettlePreferences(
 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value : {},
);
 const pendingTasks = usePendingNewTasks();
 const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
 const environments = useMemo(
Expand DownExpand Up@@ -510,7 +511,8 @@ function ThreadNavigationSidebarPane(
 searchQuery: props.searchQuery,
 matchedThreadKeys,
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettleAfterDays: autoSettlePreferences.autoSettleAfterDays,
 autoSettleMode: autoSettlePreferences.autoSettleMode,
 settlementEnvironmentIds,
 snoozeEnvironmentIds,
 settledLimit: settledVisibleCount,
Expand All@@ -522,7 +524,8 @@ function ThreadNavigationSidebarPane(
 });
 }, [
 changeRequestByKey,
 autoSettleOnMerge,
 autoSettlePreferences.autoSettleAfterDays,
 autoSettlePreferences.autoSettleMode,
 nowMinute,
 snoozeWakeTick,
 snoozedShelfExpanded,
Expand Down
Loading
Loading