Skip to content

Commit 71773b4

Browse files
fix(mobile): auto-settle rows disable when any Threads target is read-only
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent f68cabe commit 71773b4

3 files changed

Lines changed: 32 additions & 6 deletions

File tree

‎apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const { Children, mocks } = vi.hoisted(() => ({
1212
updateSettings: vi.fn(),
1313
alert: vi.fn(),
1414
targets: [] as ReturnType<typeof environment>[],
15+
readOnly: new Set<string>(),
1516
projectSelected: false,
1617
},
1718
}));
@@ -48,7 +49,12 @@ vi.mock("react-native-safe-area-context", () => ({ useSafeAreaInsets: () => ({ b
4849
vi.mock("@react-navigation/native", () => ({ useNavigation: () => ({}) }));
4950
vi.mock("../../state/session", () => ({
5051
readEnvironmentScope: () => true,
51-
useEnvironmentsWithScope: () => new Set(mocks.targets.map((target) => target.environmentId)),
52+
useEnvironmentsWithScope: () =>
53+
new Set(
54+
mocks.targets
55+
.map((target) => target.environmentId)
56+
.filter((environmentId) => !mocks.readOnly.has(environmentId)),
57+
),
5258
}));
5359
vi.mock("../../state/server", () => ({ serverEnvironment: { updateSettings: {} } }));
5460
vi.mock("../../state/use-atom-command", () => ({
@@ -157,6 +163,7 @@ beforeEach(() => {
157163
root = createRoot(container);
158164
mocks.targets = [environment("local", "Local")];
159165
mocks.projectSelected = false;
166+
mocks.readOnly = new Set();
160167
mocks.alert.mockReset();
161168
mocks.updateSettings.mockReset();
162169
mocks.updateSettings.mockResolvedValue(AsyncResult.success(undefined));
@@ -204,4 +211,18 @@ describe("SettingsServerControlsRouteScreen", () => {
204211
expect(mocks.updateSettings).toHaveBeenCalledOnce();
205212
await act(async () => pending.resolve(AsyncResult.success(undefined)));
206213
});
214+
215+
it("disables auto-settle when a selected environment cannot save settings", () => {
216+
const remote = environment("remote", "Remote");
217+
// Auto-settle rows skip a server without auto-settlement, but the page still saves to it.
218+
remote.serverConfig.environment.capabilities.threadAutoSettlement = false;
219+
mocks.targets = [environment("local", "Local"), remote];
220+
mocks.readOnly = new Set(["remote"]);
221+
act(() => root.render(<SettingsThreadsRouteScreen />));
222+
223+
const autoSettle = [...container.querySelectorAll<HTMLButtonElement>('[role="switch"]')].find(
224+
(button) => button.textContent === "Auto-settle merged threads",
225+
)!;
226+
expect(autoSettle.disabled).toBe(true);
227+
});
207228
});

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,19 @@ export function AutoSettleSettingsRows(props: {
5252
const writableEnvironments = useEnvironmentsWithScope(selectedTargets, AuthSettingsWriteScope);
5353
const projectSelected = selectedProjectKey !== null;
5454

55-
const syncEnvironments = selectedTargets.filter(supportsSharedSettingsSync);
55+
const projectMembers = projectSelected
56+
? (selectedProject?.members.map((member) => member.project) ?? [])
57+
: null;
5658
const displayTargets = resolveMobileSettingsTargets(
57-
syncEnvironments,
58-
projectSelected ? (selectedProject?.members.map((member) => member.project) ?? []) : null,
59+
selectedTargets.filter(supportsSharedSettingsSync),
60+
projectMembers,
5961
);
62+
// The page saves to all its targets, so any read-only one blocks the save.
6063
const canWriteSettings =
6164
displayTargets.length > 0 &&
62-
displayTargets.every((target) => writableEnvironments.has(target.environment.environmentId));
65+
resolveMobileSettingsTargets(selectedTargets, projectMembers).every((target) =>
66+
writableEnvironments.has(target.environment.environmentId),
67+
);
6368
const reference = displayTargets[0] ?? null;
6469
const referenceSettings = reference?.settings ?? null;
6570

‎docs/user/providers-antigravity.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ until a session, a refresh, or a sign-out reports something new.
134134

135135
To check access and reload models, use **Refresh provider status** in web or desktop
136136
provider settings, or **Refresh models** in mobile thread settings. If asked to
137-
sign in again, use provider settings on web or desktop, or **Provider accounts** on mobile.
137+
sign in again, use provider settings on web or desktop, or **Settings > Providers** on mobile.
138138

139139
If Google reports `SUBSCRIPTION_REQUIRED`, an account restriction, or a usage limit,
140140
follow the provider's message and any retry time. See [Google's account plans][plans]

0 commit comments

Comments
 (0)