fix(cursor): exclusive agent spawn lease for list-models vs ACP (#1529)

* fix(cursor): exclusive agent spawn lease for list-models vs ACP (#1520)

Add a proper-lockfile spawn lease beside agent-acp-active so model probes
and ACP transport acquire mutual exclusion atomically before spawning
agent children, closing the post-#1518 check-then-act overlap window.

Fixes #1520

Co-authored-by: Cursor <cursoragent@cursor.com>

* chore(web): fix markdown-a test HappyChatContext mock for typecheck

Adds showSessionSummaryInChat to chatContext() so CI typecheck passes on
the PR branch (pre-existing main breakage unrelated to #1520).

Co-authored-by: Cursor <cursoragent@cursor.com>

* Revert "chore(web): fix markdown-a test HappyChatContext mock for typecheck"

This reverts commit 4973f321a31fda772e8990ea6cda20517ca906aa.

* fix(cursor): scope spawn lease to agent spawn window only (#1520)

Hold agent-cli.spawn only around spawn('agent') in AcpStdioTransport, not
for the full ACP session. Restores N concurrent cursor sessions per host;
list-models probe lease unchanged.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(cursor): tighten spawn lease lifecycle for babysit (#1520)

Acquire spawn lease before ACP marker publish; unregister on spawn failure.
Hold list-models probe lease until child exit on timeout. Add missing
showSessionSummaryInChat to markdown-a test mock (unblocks CI typecheck).

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(cursor): re-check ACP marker after spawn lease acquire (#1520)

Close check-then-act window where ACP could publish its marker between
the inactive guard read and list-models spawn. Add regression test.

Co-authored-by: Cursor <cursoragent@cursor.com>

* test(cursor): fix ACP-after-acquire mock call order (#1520)

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(cursor): async spawn lease + force-kill probe timeout (#1520)

Add acquireAgentCliSpawnLease (setTimeout yields) for ACP create path;
AcpStdioTransport.create() async factory. Probe timeout uses
killProcessByChildProcess(force) while holding lease until child exit.

Addresses Bugbot Majors: session-lifetime mutex (fe07b708d), probe lease
release, post-acquire re-check (137baa779), sync loop starvation, timeout
escalation.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(acp): coalesce concurrent initialize() transport spawns (#1520)

Await shared bootstrapTransport promise so overlapping initialize calls
do not spawn duplicate ACP children while create() is in flight.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
HeavyGee
2026-08-12 18:42:43 +01:00
committed by GitHub
co-authored by Cursor
parent fea42212ea
commit df1a56e1db
16 changed files with 473 additions and 85 deletions
+30 -9
View File
@@ -404,20 +404,41 @@ describe('listCursorModels', () => {
});
});
test('skips CLI slug probe when ACP lock is active after ACP probe', async () => {
vi.mocked(isAgentAcpTransportActive)
.mockReturnValueOnce(false)
.mockReturnValueOnce(true);
test('skips CLI slug probe when spawn lease is held after guard reads inactive', async () => {
const { acquireAgentCliSpawnLeaseSync, _resetAgentCliSpawnLeaseForTests } = await import(
'@hapi/protocol/agentCliSpawnLease'
)
acquireAgentCliSpawnLeaseSync(testHapiHome)
vi.mocked(isAgentAcpTransportActive).mockReturnValueOnce(false)
acpProbeMock.runCursorAcpModelProbe.mockResolvedValue({
success: false,
error: 'no wires'
});
})
const result = await listCursorModels();
const result = await listCursorModels()
expect(spawnMock).not.toHaveBeenCalled();
expect(result).toEqual({ success: false, error: 'no wires' });
});
expect(spawnMock).not.toHaveBeenCalled()
expect(result.success).toBe(false)
expect(result.error).toContain('ACP transport is active')
_resetAgentCliSpawnLeaseForTests(testHapiHome)
})
test('does not spawn list-models when ACP marker appears after lease acquire', async () => {
vi.mocked(isAgentAcpTransportActive)
.mockReturnValueOnce(false)
.mockReturnValueOnce(false)
.mockReturnValueOnce(true)
acpProbeMock.runCursorAcpModelProbe.mockResolvedValue({
success: false,
error: 'no wires'
})
const result = await listCursorModels()
expect(spawnMock).not.toHaveBeenCalled()
expect(result.success).toBe(false)
expect(result.error).toContain('ACP transport is active')
})
test('prefers live ACP snapshot over cache while ACP transport is active', async () => {
vi.mocked(isAgentAcpTransportActive).mockReturnValue(true)
+48 -19
View File
@@ -1,6 +1,12 @@
import { spawn } from 'node:child_process';
import type { CursorModelsResponse, CursorModelSummary } from '@hapi/protocol/apiTypes';
import {
releaseAgentCliSpawnLeaseSync,
tryAcquireAgentCliSpawnLeaseSync
} from '@hapi/protocol/agentCliSpawnLease';
import { isAgentAcpTransportActive } from '@/agent/backends/acp/agentCliGuard';
import { resolveHapiHomeDir } from '@/configuration';
import { killProcessByChildProcess } from '@/utils/process';
import { getCursorAcpModelsSnapshot } from '@/cursor/utils/cursorAcpModelsBridge';
import { getErrorMessage } from './rpcResponses';
import {
@@ -202,9 +208,22 @@ export function parseCursorModelsOutput(output: string): {
}
async function runCursorModelProbe(): Promise<ListCursorModelsResponse> {
if (isAgentAcpTransportActive()) {
if (!tryAcquireAgentCliSpawnLeaseSync(resolveHapiHomeDir())) {
throw new Error('Cursor ACP transport is active');
}
if (isAgentAcpTransportActive()) {
releaseAgentCliSpawnLeaseSync();
throw new Error('Cursor ACP transport is active');
}
let leaseReleased = false;
const releaseLeaseOnce = (): void => {
if (leaseReleased) {
return;
}
leaseReleased = true;
releaseAgentCliSpawnLeaseSync();
};
return await new Promise((resolve, reject) => {
const child = spawn('agent', ['--list-models'], {
@@ -217,11 +236,21 @@ async function runCursorModelProbe(): Promise<ListCursorModelsResponse> {
let stderr = '';
let settled = false;
const timeout = setTimeout(() => {
if (settled) return;
let timeoutError: Error | null = null;
const finish = (handler: () => void): void => {
if (settled) {
return;
}
settled = true;
child.kill('SIGTERM');
reject(new Error('Cursor model discovery timed out'));
clearTimeout(timeout);
releaseLeaseOnce();
handler();
};
const timeout = setTimeout(() => {
timeoutError = new Error('Cursor model discovery timed out');
void killProcessByChildProcess(child, true);
}, PROBE_TIMEOUT_MS);
child.stdout?.on('data', (chunk) => {
@@ -231,23 +260,23 @@ async function runCursorModelProbe(): Promise<ListCursorModelsResponse> {
stderr += chunk.toString();
});
child.on('error', (error) => {
if (settled) return;
settled = true;
clearTimeout(timeout);
reject(error);
finish(() => reject(error));
});
child.on('exit', (code) => {
if (settled) return;
settled = true;
clearTimeout(timeout);
if (code !== 0) {
reject(new Error(stderr.trim() || `agent --list-models exited with code ${code}`));
return;
}
finish(() => {
if (timeoutError) {
reject(timeoutError);
return;
}
if (code !== 0) {
reject(new Error(stderr.trim() || `agent --list-models exited with code ${code}`));
return;
}
resolve({
success: true,
...parseCursorModelsOutput(stdout)
resolve({
success: true,
...parseCursorModelsOutput(stdout)
});
});
});
});
+1 -1
View File
@@ -152,7 +152,7 @@ async function runGrokModelsCliProbe(cwd: string): Promise<ListGrokModelsForCwdR
async function runGrokModelsProbe(cwd: string): Promise<ListGrokModelsForCwdResponse> {
// The primary ACP probe also uses shell mode on Windows through AcpStdioTransport.
assertSafeWindowsShellArg(cwd, 'cwd')
const transport = new AcpStdioTransport({
const transport = await AcpStdioTransport.create({
command: 'grok',
args: ['--cwd', cwd, 'agent', '--reasoning-effort', 'low', 'stdio'],
env: Object.fromEntries(
+12 -10
View File
@@ -2,17 +2,19 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
const sendRequestMock = vi.fn()
const closeMock = vi.fn().mockResolvedValue(undefined)
const transportConstructor = vi.fn()
const transportCreate = vi.fn()
vi.mock('@/agent/backends/acp/AcpStdioTransport', () => ({
AcpStdioTransport: class {
vi.mock('@/agent/backends/acp/AcpStdioTransport', () => {
class MockAcpStdioTransport {
sendRequest = sendRequestMock
close = closeMock
constructor(opts: { command: string; args?: string[] }) {
transportConstructor(opts)
static async create(opts: { command: string; args?: string[] }) {
transportCreate(opts)
return new MockAcpStdioTransport()
}
}
}))
return { AcpStdioTransport: MockAcpStdioTransport }
})
import { listOpencodeModelsForCwd, _resetOpencodeModelsCacheForTests } from './opencodeModels'
@@ -21,7 +23,7 @@ describe('listOpencodeModelsForCwd', () => {
_resetOpencodeModelsCacheForTests()
sendRequestMock.mockReset()
closeMock.mockClear()
transportConstructor.mockClear()
transportCreate.mockClear()
})
afterEach(() => {
@@ -50,7 +52,7 @@ describe('listOpencodeModelsForCwd', () => {
const result = await listOpencodeModelsForCwd('/home/user/project')
expect(transportConstructor).toHaveBeenCalledWith(
expect(transportCreate).toHaveBeenCalledWith(
expect.objectContaining({ command: 'opencode', args: ['acp'] })
)
expect(sendRequestMock).toHaveBeenNthCalledWith(
@@ -131,7 +133,7 @@ describe('listOpencodeModelsForCwd', () => {
await listOpencodeModelsForCwd('/cache/cwd')
await listOpencodeModelsForCwd('/cache/cwd')
expect(transportConstructor).toHaveBeenCalledTimes(1)
expect(transportCreate).toHaveBeenCalledTimes(1)
expect(sendRequestMock).toHaveBeenCalledTimes(2)
})
@@ -152,7 +154,7 @@ describe('listOpencodeModelsForCwd', () => {
const [r1, r2] = await Promise.all([inflight1, inflight2])
expect(transportConstructor).toHaveBeenCalledTimes(1)
expect(transportCreate).toHaveBeenCalledTimes(1)
expect(r1).toEqual(r2)
expect(r1.success).toBe(true)
})
+1 -1
View File
@@ -84,7 +84,7 @@ function extractModelsFromResponse(response: unknown): {
}
async function runOpencodeProbe(cwd: string): Promise<ListOpencodeModelsForCwdResponse> {
const transport = new AcpStdioTransport({
const transport = await AcpStdioTransport.create({
command: 'opencode',
args: ['acp']
});