feat(cursor): migrate remote sessions to ACP with model/variant pickers (#799)

* feat(cli,web,hub): migrate Cursor remote sessions to ACP with model/effort pickers Move stream-json remote launcher to legacy path and add ACP launcher with set_config_option model/mode sync, optimistic keepalive on config changes, and shared catalog caching. Web gets dual base/effort Cursor pickers for session and new-session flows; hide composer status bar when Cursor sends no usage_update. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,web,shared): Cursor model picker — ACP wires + CLI sku variants Enrich the web/mobile picker with agent --list-models SKUs grouped under ACP wire bases, fix session-open base highlight, and keep catalog discovery safe while the ACP transport holds the CLI lock. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cursor-acp): apply ACP default model when web resets to Default Web sends model: null for Default; push session/set_config_option with the ACP default[] wire so Cursor backend matches hub state. Regression tests for setModel(null) and applyModelConfig(null). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(acp): clear stale agent-acp lock when owning process is gone Check lock pid with signal 0; remove orphaned lock dirs after SIGKILL or crash so listCursorModels can run cold probes again. Regression tests for guard and catalog discovery. Co-authored-by: Cursor <cursoragent@cursor.com> * test(cursor): use live pid for ACP lock handler tests Stale-lock cleanup clears dead pids; handler tests must simulate an active lock with the current process pid to avoid cold probes/timeouts. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(acp): scope agent CLI lock guard to Cursor agent command only Gemini/OpenCode/Kimi ACP sessions must not register agent-acp-active; that blocked listCursorModels while unrelated backends were running. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,web): reject Cursor model changes for local sessions Hub returns 409 when controlledByUser is set, matching Codex. Web hides model and variant pickers for local Cursor sessions so users do not hit a dead RPC path. Document pre-push-review in AGENTS.md. Verified: bun typecheck; bun run test (919 cli + 243 hub + 768 web + 46 shared). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(web): send stable ids for Cursor ask_question replies Parse and submit question.id and option.id so ACP receives keys like { approach: ['a'] } instead of index/label. Verified: bun typecheck && bun run test. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-05 06:24:37 +00:00 · 2026-06-06 19:51:35 +08:00
parent f4c3513abd
commit 3a8693f380
110 changed files with 7945 additions and 496 deletions
@@ -1,5 +1,52 @@
-import { describe, expect, test } from 'vitest'
-import { parseCursorModelsOutput } from './cursorModels'
+import { afterEach, describe, expect, test, vi } from 'vitest'
+import { setCursorAcpModelsSnapshot } from '@/cursor/utils/cursorAcpModelsBridge'
+
+const { spawnMock } = vi.hoisted(() => ({
+    spawnMock: vi.fn()
+}));
+
+vi.mock('node:child_process', async (importOriginal) => {
+    const actual = await importOriginal<typeof import('node:child_process')>();
+    return { ...actual, spawn: spawnMock };
+});
+
+vi.mock('@/agent/backends/acp/agentCliGuard', () => ({
+    isAgentAcpTransportActive: vi.fn(() => false),
+    _resetAgentCliGuardForTests: vi.fn()
+}));
+
+const acpProbeMock = vi.hoisted(() => ({
+    runCursorAcpModelProbe: vi.fn()
+}));
+
+vi.mock('./cursorAcpModelProbe', () => ({
+    runCursorAcpModelProbe: acpProbeMock.runCursorAcpModelProbe,
+    cursorProbeResponseHasWireCatalog: (response: { success?: boolean; availableModels?: Array<{ modelId: string }> }) =>
+        response.success === true
+        && (response.availableModels ?? []).some((model) => model.modelId.includes('['))
+}));
+
+import { isAgentAcpTransportActive } from '@/agent/backends/acp/agentCliGuard';
+import {
+    readSharedCursorModelsCache,
+    writeSharedCursorModelsCache,
+    _resetSharedCursorModelsCacheForTests
+} from './cursorModelsSharedCache';
+import {
+    _resetCursorModelsCacheForTests,
+    listCursorModels,
+    parseCursorModelsOutput,
+    seedCursorModelsCache
+} from './cursorModels';
+
+afterEach(() => {
+    _resetCursorModelsCacheForTests()
+    _resetSharedCursorModelsCacheForTests()
+    setCursorAcpModelsSnapshot(null)
+    vi.mocked(isAgentAcpTransportActive).mockReturnValue(false)
+    spawnMock.mockReset()
+    acpProbeMock.runCursorAcpModelProbe.mockReset()
+})

 describe('parseCursorModelsOutput', () => {
    test('parses Cursor agent model list output', () => {
@@ -35,3 +82,154 @@ composer-2.5 - Composer 2.5
        expect(result.currentModelId).toBe('composer-2.5-fast')
    })
 })
+
+describe('listCursorModels', () => {
+    test('does not spawn agent --list-models while ACP transport is active', async () => {
+        vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+        writeSharedCursorModelsCache({
+            success: true,
+            availableModels: [{ modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }],
+            currentModelId: 'composer-2.5[fast=true]'
+        })
+
+        const result = await listCursorModels()
+
+        expect(result).toEqual({
+            success: true,
+            availableModels: [{ modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }],
+            currentModelId: 'composer-2.5[fast=true]'
+        })
+        expect(spawnMock).not.toHaveBeenCalled()
+    })
+
+    test('returns empty list while ACP is active but no snapshot is seeded yet', async () => {
+        vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+
+        const result = await listCursorModels()
+
+        expect(result).toEqual({
+            success: true,
+            availableModels: [],
+            currentModelId: null
+        })
+        expect(spawnMock).not.toHaveBeenCalled()
+    })
+
+    test('prefers shared on-disk cache over stale in-memory cache while ACP lock is active', async () => {
+        vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+        seedCursorModelsCache({
+            success: true,
+            availableModels: [{ modelId: 'stale-cli-sku' }],
+            currentModelId: 'stale-cli-sku'
+        })
+        writeSharedCursorModelsCache({
+            success: true,
+            availableModels: [{ modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }],
+            currentModelId: 'composer-2.5[fast=true]'
+        })
+
+        const result = await listCursorModels()
+
+        expect(result.availableModels).toEqual([
+            { modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }
+        ])
+        expect(spawnMock).not.toHaveBeenCalled()
+    })
+
+    test('reads shared on-disk cache while ACP lock is active in another process', async () => {
+        vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+        writeSharedCursorModelsCache({
+            success: true,
+            availableModels: [{ modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }],
+            currentModelId: 'composer-2.5[fast=true]'
+        })
+
+        const result = await listCursorModels()
+
+        expect(result.availableModels).toEqual([
+            { modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }
+        ])
+        expect(spawnMock).not.toHaveBeenCalled()
+        expect(readSharedCursorModelsCache()?.currentModelId).toBe('composer-2.5[fast=true]')
+    })
+
+    test('prefers ACP wire probe over CLI slug probe when cache is empty', async () => {
+        acpProbeMock.runCursorAcpModelProbe.mockResolvedValue({
+            success: true,
+            availableModels: [{ modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }],
+            currentModelId: 'composer-2.5[fast=true]'
+        });
+        spawnMock.mockImplementation(() => ({
+            stdout: {
+                on: vi.fn((event: string, handler: (chunk: Buffer) => void) => {
+                    if (event === 'data') {
+                        handler(Buffer.from('composer-2.5-fast - Composer 2.5 Fast\n'));
+                    }
+                })
+            },
+            stderr: { on: vi.fn() },
+            on: vi.fn((event: string, handler: (code: number) => void) => {
+                if (event === 'exit') {
+                    setTimeout(() => handler(0), 0);
+                }
+            }),
+            kill: vi.fn()
+        }));
+
+        const result = await listCursorModels();
+
+        expect(acpProbeMock.runCursorAcpModelProbe).toHaveBeenCalled();
+        expect(result.availableModels).toEqual([
+            { modelId: 'composer-2.5[fast=true]', name: 'composer-2.5' }
+        ]);
+        expect(result.cliModelSkus?.some((row) => row.modelId === 'composer-2.5-fast')).toBe(true);
+    });
+
+    test('does not cache CLI slug probe when ACP probe returns no wires', async () => {
+        acpProbeMock.runCursorAcpModelProbe.mockResolvedValue({
+            success: false,
+            error: 'no acp'
+        });
+        spawnMock.mockImplementation(() => ({
+            stdout: {
+                on: vi.fn((event: string, handler: (chunk: Buffer) => void) => {
+                    if (event === 'data') {
+                        handler(Buffer.from('composer-2.5 - Composer 2.5 (current)\n'));
+                    }
+                })
+            },
+            stderr: { on: vi.fn() },
+            on: vi.fn((event: string, handler: (code: number) => void) => {
+                if (event === 'exit') {
+                    setTimeout(() => handler(0), 0);
+                }
+            }),
+            kill: vi.fn()
+        }));
+
+        const result = await listCursorModels();
+
+        expect(result).toEqual({
+            success: true,
+            availableModels: [],
+            currentModelId: null
+        });
+    });
+
+    test('prefers live ACP snapshot over cache while ACP transport is active', async () => {
+        vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+        seedCursorModelsCache({
+            success: true,
+            availableModels: [{ modelId: 'stale' }],
+            currentModelId: 'stale'
+        })
+        setCursorAcpModelsSnapshot({
+            availableModels: [{ modelId: 'composer-2.5-fast', name: 'Composer 2.5 Fast' }],
+            currentModelId: 'composer-2.5-fast'
+        })
+
+        const result = await listCursorModels()
+
+        expect(result.currentModelId).toBe('composer-2.5-fast')
+    })
+})