Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests and build

Browse Source
This commit is contained in:
Connor Peet
2026-03-17 20:34:42 -07:00
parent 2a03980067
commit 2cd7a84eef
4 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/agentHost/test/node/agentService.test.ts
View File

@@ -51,7 +51,7 @@ suite('AgentService (node dispatcher)', () => {
// Start a turn so there's an active turn to map events to
service.dispatchAction(
{ type: 'session/turnStarted', session, turnId: 'turn-1', userMessage: { text: 'hello' } },
{ type: 'session/turnStarted', session: session.toString(), turnId: 'turn-1', userMessage: { text: 'hello' } },
'test-client', 1,
);

40
src/vs/platform/agentHost/test/node/protocolWebSocket.integrationTest.ts
View File

@@ -8,11 +8,14 @@ import { ChildProcess, fork } from 'child_process';
import { fileURLToPath } from 'url';
import { WebSocket } from 'ws';
import { URI } from '../../../../base/common/uri.js';
import { ISubscribeResult } from '../../common/state/protocol/commands.js';
import type { IActionEnvelope, IDeltaAction, ISessionAddedNotification, ISessionRemovedNotification, IUsageAction } from '../../common/state/sessionActions.js';
import { PROTOCOL_VERSION } from '../../common/state/sessionCapabilities.js';
import {
isJsonRpcNotification,
isJsonRpcResponse,
JSON_RPC_PARSE_ERROR,
type IAhpNotification,
type IFetchTurnsResult,
type IInitializeResult,
type IJsonRpcErrorResponse,
@@ -20,11 +23,8 @@ import {
type IListSessionsResult,
type INotificationBroadcastParams,
type IProtocolMessage,
type IAhpNotification,
type IReconnectResult,
type IStateSnapshot,
type IReconnectResult
} from '../../common/state/sessionProtocol.js';
import type { IActionEnvelope, IDeltaAction, ISessionAddedNotification, ISessionRemovedNotification, IUsageAction } from '../../common/state/sessionActions.js';
import type { ISessionState } from '../../common/state/sessionState.js';
// ---- JSON-RPC test client ---------------------------------------------------
@@ -223,8 +223,8 @@ async function startServer(): Promise<{ process: ChildProcess; port: number }> {
let sessionCounter = 0;
function nextSessionUri(): URI {
return URI.from({ scheme: 'mock', path: `/test-session-${++sessionCounter}` });
function nextSessionUri(): string {
return URI.from({ scheme: 'mock', path: `/test-session-${++sessionCounter}` }).toString();
}
function isActionNotification(n: IAhpNotification, actionType: string): boolean {
@@ -250,7 +250,7 @@ async function createAndSubscribeSession(c: TestProtocolClient, clientId: string
);
const realSessionUri = ((notif.params as INotificationBroadcastParams).notification as ISessionAddedNotification).summary.resource;
await c.call<IStateSnapshot>('subscribe', { resource: realSessionUri });
await c.call<ISubscribeResult>('subscribe', { resource: realSessionUri });
c.clearReceived();
return realSessionUri;
@@ -301,7 +301,7 @@ suite('Protocol WebSocket E2E', function () {
const result = await client.call<IInitializeResult>('initialize', {
protocolVersion: PROTOCOL_VERSION,
clientId: 'test-handshake',
initialSubscriptions: [URI.from({ scheme: 'agenthost', path: '/root' })],
initialSubscriptions: [URI.from({ scheme: 'agenthost', path: '/root' }).toString()],
});
assert.strictEqual(result.protocolVersion, PROTOCOL_VERSION);
@@ -462,8 +462,8 @@ suite('Protocol WebSocket E2E', function () {
await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
const snapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const state = snapshot.state as ISessionState;
const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const state = snapshot.snapshot.state as ISessionState;
assert.ok(state.turns.length >= 1);
const turn = state.turns[state.turns.length - 1];
assert.ok(turn.usage);
@@ -476,16 +476,16 @@ suite('Protocol WebSocket E2E', function () {
const sessionUri = await createAndSubscribeSession(client, 'test-modifiedAt');
const initialSnapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const initialModifiedAt = (initialSnapshot.state as ISessionState).summary.modifiedAt;
const initialSnapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const initialModifiedAt = (initialSnapshot.snapshot.state as ISessionState).summary.modifiedAt;
await new Promise(resolve => setTimeout(resolve, 50));
dispatchTurnStarted(client, sessionUri, 'turn-mod', 'hello', 1);
await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
const updatedSnapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const updatedModifiedAt = (updatedSnapshot.state as ISessionState).summary.modifiedAt;
const updatedSnapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const updatedModifiedAt = (updatedSnapshot.snapshot.state as ISessionState).summary.modifiedAt;
assert.ok(updatedModifiedAt >= initialModifiedAt);
});
@@ -556,8 +556,8 @@ suite('Protocol WebSocket E2E', function () {
await client.waitForNotification(n => isActionNotification(n, 'session/turnCancelled'));
const snapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const state = snapshot.state as ISessionState;
const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const state = snapshot.snapshot.state as ISessionState;
assert.ok(state.turns.length >= 1);
assert.strictEqual(state.turns[state.turns.length - 1].state, 'cancelled');
});
@@ -574,8 +574,8 @@ suite('Protocol WebSocket E2E', function () {
await new Promise(resolve => setTimeout(resolve, 200));
await client.waitForNotification(n => isActionNotification(n, 'session/turnComplete'));
const snapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const state = snapshot.state as ISessionState;
const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const state = snapshot.snapshot.state as ISessionState;
assert.ok(state.turns.length >= 2, `expected >= 2 turns but got ${state.turns.length}`);
assert.strictEqual(state.turns[0].id, 'turn-m1');
assert.strictEqual(state.turns[1].id, 'turn-m2');
@@ -645,8 +645,8 @@ suite('Protocol WebSocket E2E', function () {
assert.strictEqual((action as { model: string }).model, 'new-mock-model');
}
const snapshot = await client.call<IStateSnapshot>('subscribe', { resource: sessionUri });
const state = snapshot.state as ISessionState;
const snapshot = await client.call<ISubscribeResult>('subscribe', { resource: sessionUri });
const state = snapshot.snapshot.state as ISessionState;
assert.strictEqual(state.summary.model, 'new-mock-model');
});

8
src/vs/platform/agentHost/test/node/sessionStateManager.test.ts
View File

@@ -16,9 +16,9 @@ suite('SessionStateManager', () => {
let disposables: DisposableStore;
let manager: SessionStateManager;
const sessionUri = URI.from({ scheme: 'copilot', path: '/test-session' });
const sessionUri = URI.from({ scheme: 'copilot', path: '/test-session' }).toString();
function makeSessionSummary(resource?: URI): ISessionSummary {
function makeSessionSummary(resource?: string): ISessionSummary {
return {
resource: resource ?? sessionUri,
provider: 'copilot',
@@ -49,7 +49,7 @@ suite('SessionStateManager', () => {
});
test('getSnapshot returns undefined for unknown session', () => {
const unknown = URI.from({ scheme: 'copilot', path: '/unknown' });
const unknown = URI.from({ scheme: 'copilot', path: '/unknown' }).toString();
const snapshot = manager.getSnapshot(unknown);
assert.strictEqual(snapshot, undefined);
});
@@ -213,7 +213,7 @@ suite('SessionStateManager', () => {
});
test('activeSessions reflects concurrent turn count across sessions', () => {
const session2Uri = URI.from({ scheme: 'copilot', path: '/test-session-2' });
const session2Uri = URI.from({ scheme: 'copilot', path: '/test-session-2' }).toString();
manager.createSession(makeSessionSummary(sessionUri));
manager.createSession(makeSessionSummary(session2Uri));
manager.dispatchServerAction({ type: 'session/ready', session: sessionUri });