Skip to content

Sync Work model picker after Cursor auth #1078

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
arul28 merged 2 commits into from
Aug 11, 2026
+386 −34
Merged

Sync Work model picker after Cursor auth #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65694f2
Sync Work model picker from AI status cache after Cursor auth.
arul28 Aug 11, 2026
99eb649
Refresh OpenCode inventory on AI status invalidate settle.
arul28 Aug 11, 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
250 changes: 249 additions & 1 deletion apps/desktop/src/renderer/components/chat/AgentChatPane.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ import type {
import { createDynamicCursorCliModelDescriptor, getModelById } from "../../../shared/modelRegistry";
import { invalidateAgentChatSessionListCache } from "../../lib/agentChatSessionListCache";
import { invalidateAgentChatSlashCommandsCache } from "../../lib/agentChatSlashCommandsCache";
import { getAiStatusCached, invalidateAiDiscoveryCache } from "../../lib/aiDiscoveryCache";
import {
AI_STATUS_CACHE_UPDATED_EVENT,
getAiStatusCached,
invalidateAiDiscoveryCache,
type AiStatusCacheUpdatedEventDetail,
} from "../../lib/aiDiscoveryCache";
import { DRAFT_LAUNCH_JOB_STALE_AFTER_MS } from "../../lib/draftLaunchJobs";
import { invalidateProjectConfigCache } from "../../lib/projectConfigCache";
import { useAppStore } from "../../state/appStore";
Expand Down Expand Up @@ -1348,6 +1353,249 @@ describe("AgentChatPane remote startup", () => {
expect(window.ade.ai.getStatus).not.toHaveBeenCalled();
});

it("applies shared AI status cache updates so Cursor unlocks without remount or force refresh", async () => {
const projectRoot = "/tmp/project-under-test";
const unauthorizedStatus: AiSettingsStatus = {
mode: "subscription",
availableProviders: {
claude: {
binary: { present: false, source: "missing", path: null },
auth: { ready: false, mode: "none", detail: null },
},
codex: true,
cursor: false,
droid: false,
},
models: { claude: [], codex: [], cursor: [], droid: [] },
features: [],
detectedAuth: [
{ type: "cli-subscription", cli: "codex", authenticated: true },
],
availableModelIds: ["openai/gpt-5.4"],
} as AiSettingsStatus;
const authorizedStatus: AiSettingsStatus = {
...unauthorizedStatus,
availableProviders: {
...unauthorizedStatus.availableProviders,
cursor: true,
},
detectedAuth: [
{ type: "cli-subscription", cli: "codex", authenticated: true },
{ type: "api-key", provider: "cursor" },
],
availableModelIds: ["openai/gpt-5.4", "cursor/auto"],
} as AiSettingsStatus;

const session = buildSession("session-1", { status: "idle" });
installAdeMocks({ sessions: [session], aiStatus: unauthorizedStatus });
useAppStore.setState({
project: { rootPath: projectRoot } as any,
projectBinding: LOCAL_PROJECT_BINDING,
lanes: [{
id: session.laneId,
name: "Lane 1",
laneType: "worktree",
branchRef: "refs/heads/lane-1",
worktreePath: `${projectRoot}/lane-1`,
} as any],
selectedLaneId: session.laneId,
});
seedCursorRuntimeModelCatalog();

renderPane(session);

const trigger = await screen.findByRole("button", { name: /^Select model/ });
fireEvent.pointerDown(trigger, { button: 0 });
fireEvent.click(trigger);
fireEvent.click(await screen.findByRole("tab", { name: /^Cursor$/i }));
expect(await screen.findByText("Connect Cursor")).toBeTruthy();
fireEvent.keyDown(document, { key: "Escape" });

vi.mocked(window.ade.ai.getStatus).mockClear();
vi.mocked(window.ade.ai.getStatus).mockResolvedValue(authorizedStatus);

// Simulate Settings writing the shared cache, then broadcasting UPDATED.
await act(async () => {
await getAiStatusCached({ projectRoot, force: true });
});
const forceCallsAfterSharedRefresh = vi.mocked(window.ade.ai.getStatus).mock.calls.filter(
(call) => call[0]?.force === true,
).length;
expect(forceCallsAfterSharedRefresh).toBeGreaterThanOrEqual(1);

await act(async () => {
window.dispatchEvent(new CustomEvent<AiStatusCacheUpdatedEventDetail>(
AI_STATUS_CACHE_UPDATED_EVENT,
{ detail: { projectRoot } },
));
});

fireEvent.pointerDown(trigger, { button: 0 });
fireEvent.click(trigger);
fireEvent.click(await screen.findByRole("tab", { name: /^Cursor$/i }));

await waitFor(() => {
expect(screen.queryByText("Connect Cursor")).toBeNull();
});
expect(screen.queryByRole("button", { name: /Set up Cursor/i })).toBeNull();

const forceCallsAfterPickerOpen = vi.mocked(window.ade.ai.getStatus).mock.calls.filter(
(call) => call[0]?.force === true,
).length;
// Pane must not issue another force probe after the shared-cache writer.
expect(forceCallsAfterPickerOpen).toBe(forceCallsAfterSharedRefresh);
});

it("settles an AI status invalidate with a non-force refill, not a force probe", async () => {
vi.useFakeTimers({ shouldAdvanceTime: true });
try {
const projectRoot = "/tmp/project-under-test";
const unauthorizedStatus: AiSettingsStatus = {
mode: "subscription",
availableProviders: {
claude: {
binary: { present: false, source: "missing", path: null },
auth: { ready: false, mode: "none", detail: null },
},
codex: true,
cursor: false,
droid: false,
},
models: { claude: [], codex: [], cursor: [], droid: [] },
features: [],
detectedAuth: [
{ type: "cli-subscription", cli: "codex", authenticated: true },
],
availableModelIds: ["openai/gpt-5.4"],
} as AiSettingsStatus;
const authorizedStatus: AiSettingsStatus = {
...unauthorizedStatus,
availableProviders: {
...unauthorizedStatus.availableProviders,
cursor: true,
},
detectedAuth: [
{ type: "cli-subscription", cli: "codex", authenticated: true },
{ type: "api-key", provider: "cursor" },
],
availableModelIds: ["openai/gpt-5.4", "cursor/auto"],
} as AiSettingsStatus;

const session = buildSession("session-1", { status: "idle" });
installAdeMocks({ sessions: [session], aiStatus: unauthorizedStatus });
useAppStore.setState({
project: { rootPath: projectRoot } as any,
projectBinding: LOCAL_PROJECT_BINDING,
lanes: [{
id: session.laneId,
name: "Lane 1",
laneType: "worktree",
branchRef: "refs/heads/lane-1",
worktreePath: `${projectRoot}/lane-1`,
} as any],
selectedLaneId: session.laneId,
});
seedCursorRuntimeModelCatalog();

renderPane(session);
await screen.findByRole("button", { name: /^Select model/ });

vi.mocked(window.ade.ai.getStatus).mockClear();
vi.mocked(window.ade.ai.getStatus).mockResolvedValue(authorizedStatus);

await act(async () => {
invalidateAiDiscoveryCache(projectRoot);
await vi.advanceTimersByTimeAsync(300);
});

await waitFor(() => {
expect(vi.mocked(window.ade.ai.getStatus)).toHaveBeenCalled();
});
const forceCalls = vi.mocked(window.ade.ai.getStatus).mock.calls.filter(
(call) => call[0]?.force === true,
);
expect(forceCalls).toHaveLength(0);

const trigger = screen.getByRole("button", { name: /^Select model/ });
fireEvent.pointerDown(trigger, { button: 0 });
fireEvent.click(trigger);
fireEvent.click(await screen.findByRole("tab", { name: /^Cursor$/i }));
await waitFor(() => {
expect(screen.queryByText("Connect Cursor")).toBeNull();
});
} finally {
vi.useRealTimers();
}
});

it("settles an OpenCode AI status invalidate with refreshOpenCodeInventory", async () => {
vi.useFakeTimers({ shouldAdvanceTime: true });
try {
const projectRoot = "/tmp/project-under-test";
const openCodeStatus: AiSettingsStatus = {
mode: "subscription",
availableProviders: {
claude: {
binary: { present: false, source: "missing", path: null },
auth: { ready: false, mode: "none", detail: null },
},
codex: false,
cursor: false,
droid: false,
},
models: { claude: [], codex: [], cursor: [], droid: [] },
features: [],
detectedAuth: [],
availableModelIds: ["opencode/openai/gpt-5.4"],
opencodeBinaryInstalled: true,
} as AiSettingsStatus;

const session = buildSession("session-opencode-1", {
status: "idle",
provider: "opencode",
modelId: "opencode/openai/gpt-5.4",
});
installAdeMocks({ sessions: [session], aiStatus: openCodeStatus });
useAppStore.setState({
project: { rootPath: projectRoot } as any,
projectBinding: LOCAL_PROJECT_BINDING,
lanes: [{
id: session.laneId,
name: "Lane 1",
laneType: "worktree",
branchRef: "refs/heads/lane-1",
worktreePath: `${projectRoot}/lane-1`,
} as any],
selectedLaneId: session.laneId,
});

renderPane(session);
await screen.findByRole("button", { name: /^Select model/ });

vi.mocked(window.ade.ai.getStatus).mockClear();
vi.mocked(window.ade.ai.getStatus).mockResolvedValue(openCodeStatus);

await act(async () => {
invalidateAiDiscoveryCache(projectRoot);
await vi.advanceTimersByTimeAsync(300);
});

await waitFor(() => {
expect(vi.mocked(window.ade.ai.getStatus)).toHaveBeenCalledWith(
expect.objectContaining({
refreshOpenCodeInventory: true,
}),
);
});
const forceCalls = vi.mocked(window.ade.ai.getStatus).mock.calls.filter(
(call) => call[0]?.force === true,
);
expect(forceCalls).toHaveLength(0);
} finally {
vi.useRealTimers();
}
});

it("skips mount-time session delta fetches for remote chats", async () => {
const session = buildSession("session-1", { status: "idle" });
installAdeMocks({ sessions: [session] });
Expand Down
Loading
Loading