Skip to content

Commit 501961c

Browse files
committed
fix(clients): hide duplicate Cursor Keychain prompts
1 parent 393d595 commit 501961c

4 files changed

Lines changed: 64 additions & 8 deletions

File tree

‎apps/mobile/src/features/usage/UsageRouteScreen.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ScreenScrollView as ScrollView } from "../../components/ScreenScrollView";
22
import { EnvironmentId, USAGE_CONTRACT_VERSION } from "@t3tools/contracts";
33
import { type RouteProp, useIsFocused, useNavigation, useRoute } from "@react-navigation/native";
4+
import { cursorKeychainAccessEnvironments } from "@t3tools/client-runtime/state/usage";
45
import {
56
isCompatibleUsageContractVersion,
67
isModelCostUnknown,
@@ -101,9 +102,7 @@ export function UsageRouteScreen() {
101102
);
102103
const isFocused = useIsFocused();
103104
const limits = useRefreshLimits(selectedEnvironmentIds, isFocused && tab === "limits");
104-
const cursorAccessEnvironments = selectedEnvironments.filter(
105-
(environment) => environment.needsCursorKeychainAccess,
106-
);
105+
const cursorAccessEnvironments = cursorKeychainAccessEnvironments(selectedEnvironments);
107106
const refreshAfterCursorEnable = () => {
108107
void refresh();
109108
void limits.refreshAfterEnable();

‎apps/web/src/components/usage/UsagePage.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import {
1313
SlidersHorizontalIcon,
1414
} from "lucide-react";
1515
import { useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
16-
import { refreshUsageLimits } from "@t3tools/client-runtime/state/usage";
16+
import {
17+
cursorKeychainAccessEnvironments,
18+
refreshUsageLimits,
19+
} from "@t3tools/client-runtime/state/usage";
1720

1821
import {
1922
isCompatibleUsageContractVersion,
@@ -127,9 +130,7 @@ export function UsagePage() {
127130
selectedEnvironmentIds,
128131
);
129132
const presentations = useAtomValue(environmentPresentations.presentationsAtom);
130-
const cursorAccessEnvironments = selectedEnvironments.filter(
131-
(environment) => environment.needsCursorKeychainAccess,
132-
);
133+
const cursorAccessEnvironments = cursorKeychainAccessEnvironments(selectedEnvironments);
133134
const sourceMessages = [
134135
...new Set(
135136
selectedEnvironments.flatMap(

‎packages/client-runtime/src/state/usage.test.ts‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ import { afterEach, describe, expect, it, vi } from "vite-plus/test";
1313

1414
import type { EnvironmentPresentation } from "../connection/presentation.ts";
1515
import { EnvironmentRpcUnavailableError } from "../rpc/client.ts";
16-
import { needsCursorKeychainAccess, refreshUsage, refreshUsageLimits } from "./usage.ts";
16+
import {
17+
cursorKeychainAccessEnvironments,
18+
needsCursorKeychainAccess,
19+
refreshUsage,
20+
refreshUsageLimits,
21+
} from "./usage.ts";
1722

1823
const input = {
1924
sinceDay: UsageDay.make("2026-09-05"),
@@ -285,4 +290,34 @@ describe("needsCursorKeychainAccess", () => {
285290
expect(needsCursorKeychainAccess(cursorPrompt, null)).toBe(false);
286291
expect(needsCursorKeychainAccess(summary, [cursor("ready")])).toBe(false);
287292
});
293+
294+
it("stops offering access once any environment reads the Cursor account", () => {
295+
const off = { summary: cursorPrompt, needsCursorKeychainAccess: true };
296+
const account: UsageSummary = {
297+
...summary,
298+
sources: [
299+
{
300+
fingerprint: {
301+
hostId: "cursor.com",
302+
provider: "cursor",
303+
resolvedHomePath: "cursor-account:abc",
304+
volumeId: "abc",
305+
},
306+
status: "ok",
307+
scannedFiles: 1,
308+
skippedFiles: 0,
309+
malformedRecords: 0,
310+
distinctSessions: 1,
311+
message: null,
312+
},
313+
],
314+
};
315+
expect(cursorKeychainAccessEnvironments([off, off])).toEqual([off, off]);
316+
expect(
317+
cursorKeychainAccessEnvironments([
318+
off,
319+
{ summary: account, needsCursorKeychainAccess: false },
320+
]),
321+
).toEqual([]);
322+
});
288323
});

‎packages/client-runtime/src/state/usage.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,27 @@ export function needsCursorKeychainAccess(
2626
);
2727
}
2828

29+
/**
30+
* Environments to offer the Cursor Keychain prompt in the usage summary.
31+
*
32+
* Any environment reading a Cursor account already reports that account's
33+
* history from every machine, so the prompt only adds duplicates there. A
34+
* different account on another machine stays reachable from provider settings.
35+
*/
36+
export function cursorKeychainAccessEnvironments<
37+
E extends { readonly summary: UsageSummary | null; readonly needsCursorKeychainAccess: boolean },
38+
>(environments: readonly E[]): readonly E[] {
39+
const hasCursorAccount = environments.some((environment) =>
40+
environment.summary?.sources.some(
41+
(source) =>
42+
source.fingerprint.provider === "cursor" && source.fingerprint.hostId === "cursor.com",
43+
),
44+
);
45+
return hasCursorAccount
46+
? []
47+
: environments.filter((environment) => environment.needsCursorKeychainAccess);
48+
}
49+
2950
const limitsRefreshAfter = new Map<EnvironmentId, number>();
3051
const limitsRefreshes = new Map<EnvironmentId, Promise<unknown>>();
3152

0 commit comments

Comments
 (0)