Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions packages/acp-bridge/src/bridge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ describe('createAcpSessionBridge', () => {
{ clientId: first.clientId },
),
).resolves.toMatchObject({ stopReason: 'end_turn' });
await expect(
expect(() =>
bridge.sendPrompt(
second.sessionId,
{
Expand All @@ -603,7 +603,8 @@ describe('createAcpSessionBridge', () => {
undefined,
{ clientId: second.clientId },
),
).rejects.toBeInstanceOf(InvalidClientIdError);
).toThrow(InvalidClientIdError);
expect(bridge.activePromptCount).toBe(0);

await bridge.shutdown();
});
Expand Down Expand Up @@ -5338,7 +5339,7 @@ describe('createAcpSessionBridge', () => {

it('rejects unregistered client ids on session-scoped requests', async () => {
const { bridge, session } = await setup();
await expect(
expect(() =>
bridge.sendPrompt(
session.sessionId,
{
Expand All @@ -5348,7 +5349,8 @@ describe('createAcpSessionBridge', () => {
undefined,
{ clientId: 'client-not-issued' },
),
).rejects.toBeInstanceOf(InvalidClientIdError);
).toThrow(InvalidClientIdError);
expect(bridge.activePromptCount).toBe(0);
await expect(
bridge.cancelSession(session.sessionId, undefined, {
clientId: 'client-not-issued',
Expand Down
10 changes: 4 additions & 6 deletions packages/acp-bridge/src/bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2813,12 +2813,10 @@ export function createAcpSessionBridge(opts: BridgeOptions): AcpSessionBridge {
const queuedAt = Date.now();
const entry = byId.get(sessionId);
if (!entry) return Promise.reject(new SessionNotFoundError(sessionId));
let originatorClientId: string | undefined;
try {
originatorClientId = resolveTrustedClientId(entry, context?.clientId);
} catch (err) {
return Promise.reject(err);
}
const originatorClientId = resolveTrustedClientId(
entry,
context?.clientId,
);
// Pre-aborted: skip the queue entirely. Without this the prompt
// chains onto promptQueue, waits its turn, and the FIFO worker
// checks `signal.aborted` only AFTER reaching the head — wasted
Expand Down
8 changes: 4 additions & 4 deletions packages/acp-bridge/src/bridgeTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ export interface AcpSessionBridge {
* session FIFO-serialize through a per-session queue.
*
* Admission contract: implementations must not be `async`. Admission
* failures such as `PromptQueueFullError` and pre-aborted signals throw
* synchronously so HTTP routes can reject before returning 202. Deferred
* failures such as `SessionNotFoundError` may be returned as rejected
* promises.
* failures such as `InvalidClientIdError`, `PromptQueueFullError`, and
* pre-aborted signals throw synchronously so HTTP routes can reject before
* returning 202. Deferred failures such as `SessionNotFoundError` may be
* returned as rejected promises.
*/
sendPrompt(
sessionId: string,
Expand Down
31 changes: 31 additions & 0 deletions packages/cli/src/serve/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@ function fakeBridge(opts: FakeBridgeOpts = {}): FakeBridge {
resumeCalls.push(req);
return result;
},
// Keep non-async so prompt admission failures can throw synchronously.
sendPrompt(sessionId, req, signal, context) {
promptCalls.push({
sessionId,
Expand Down Expand Up @@ -5321,6 +5322,36 @@ describe('createServeApp', () => {
expect(res.body.promptId).toBeDefined();
});

it('400 without promptId when bridge rejects invalid client admission synchronously', async () => {
const bridge = fakeBridge({
promptImpl: () => {
throw new InvalidClientIdError('session-A', 'client-stale');
},
});
const daemonLog = fakeDaemonLog();
const app = createServeApp(baseOpts, undefined, { bridge, daemonLog });
const res = await request(app)
.post('/session/session-A/prompt')
.set('Host', `127.0.0.1:${baseOpts.port}`)
.set('X-Qwen-Client-Id', 'client-stale')
.send({ prompt: [{ type: 'text', text: 'hi' }] });

expect(res.status).toBe(400);
expect(res.body).toMatchObject({
code: 'invalid_client_id',
sessionId: 'session-A',
clientId: 'client-stale',
});
expect(res.body.promptId).toBeUndefined();
expect(daemonLog.warn).toHaveBeenCalledWith(
'prompt admission rejected: invalid client id',
expect.objectContaining({
sessionId: 'session-A',
clientId: 'client-stale',
}),
);
});

it('503 without promptId when bridge rejects prompt admission synchronously', async () => {
const bridge = fakeBridge({
promptImpl: () => {
Expand Down
7 changes: 7 additions & 0 deletions packages/cli/src/serve/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3436,6 +3436,13 @@ export function createServeApp(
pendingCount: err.pendingCount,
});
}
if (daemonLog && err instanceof InvalidClientIdError) {
daemonLog.warn('prompt admission rejected: invalid client id', {
sessionId,
promptId,
...(clientId !== undefined ? { clientId } : {}),
});
}
sendBridgeError(res, err, {
route: 'POST /session/:id/prompt',
sessionId,
Expand Down
99 changes: 99 additions & 0 deletions packages/sdk-typescript/test/unit/DaemonClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,105 @@ describe('DaemonClient', () => {
});
});

it('maps invalid client id responses on non-blocking prompts', async () => {
const { fetch, calls } = recordingFetch((req) => {
if (req.url.endsWith('/session/s-1/prompt')) {
return jsonResponse(400, {
code: 'invalid_client_id',
error: 'unknown client',
sessionId: 's-1',
clientId: 'client-stale',
});
}
return jsonResponse(500, { error: `unexpected ${req.url}` });
});
const client = new DaemonClient({
baseUrl: 'http://daemon',
fetch,
});

const result = await client
.promptNonBlocking(
's-1',
{
prompt: [{ type: 'text', text: 'hi' }],
},
undefined,
'client-stale',
)
.catch((err: unknown) => err);

expect(result).toBeInstanceOf(DaemonHttpError);
expect(result).toMatchObject({
status: 400,
body: {
code: 'invalid_client_id',
sessionId: 's-1',
clientId: 'client-stale',
},
});
expect(calls[0]?.headers['x-qwen-client-id']).toBe('client-stale');
});

it('releases the local prompt slot after invalid client id responses on blocking prompts', async () => {
let promptRequests = 0;
const { fetch, calls } = recordingFetch((req) => {
if (req.url.endsWith('/session/s-1/prompt')) {
promptRequests += 1;
if (promptRequests === 1) {
return jsonResponse(400, {
code: 'invalid_client_id',
error: 'unknown client',
sessionId: 's-1',
clientId: 'client-stale',
});
}
return jsonResponse(202, {
promptId: `p-${promptRequests}`,
lastEventId: 0,
});
}
if (req.url.endsWith('/session/s-1/events')) {
return sseResponse(
`id: 1\nevent: turn_complete\ndata: {"id":1,"v":1,"type":"turn_complete","data":{"promptId":"p-${promptRequests}","stopReason":"end_turn"}}\n\n`,
);
}
return jsonResponse(500, { error: `unexpected ${req.url}` });
});
const client = new DaemonClient({
baseUrl: 'http://daemon',
fetch,
maxPendingPromptsPerSession: 1,
});

const result = await client
.prompt(
's-1',
{
prompt: [{ type: 'text', text: 'hi' }],
},
undefined,
'client-stale',
)
.catch((err: unknown) => err);

expect(result).toBeInstanceOf(DaemonHttpError);
expect(result).toMatchObject({
status: 400,
body: {
code: 'invalid_client_id',
sessionId: 's-1',
clientId: 'client-stale',
},
});
await expect(
client.prompt('s-1', {
prompt: [{ type: 'text', text: 'after stale client' }],
}),
).resolves.toEqual({ stopReason: 'end_turn' });
expect(calls.filter((c) => c.url.endsWith('/prompt'))).toHaveLength(2);
});

it('does not reserve a local prompt slot for a pre-aborted signal', async () => {
const { fetch, calls } = recordingFetch((req) => {
if (req.url.endsWith('/session/s-1/prompt')) {
Expand Down
Loading