Mohamed Boudra
5731f016c2
Steer is the better default for Enter while an agent is running, but flipping DEFAULT_CLIENT_SETTINGS alone would only reach new installs. Client defaults are materialized into storage — the first load writes the whole default blob and every save re-stamps it — so every existing install already has "interrupt" on disk, and a stored "interrupt" cannot be told apart from one the user actually chose. A one-time migration flips them all; picking "interrupt" afterwards sticks. The applied-migration marker sits in its own storage key rather than in the settings blob: StoredAppSettingsSchema is strict and readValidatedJson clears the value when parsing fails, so an unknown field there would wipe every setting for anyone who downgrades. migrateAppSettings owns both of its writes so the settings blob always lands before the marker. A failed marker write leaves the migration to re-run harmlessly; a failed settings write must leave the marker unwritten, or the migration is lost and the user keeps "interrupt" for good.
91 lines
2.7 KiB
TypeScript
91 lines
2.7 KiB
TypeScript
import type { Page, WebSocketRoute } from "@playwright/test";
|
|
import { daemonWsRoutePattern } from "./daemon-port";
|
|
|
|
type WebSocketMessage = string | Buffer;
|
|
|
|
interface SendAgentMessageRequest {
|
|
type: "send_agent_message_request";
|
|
requestId: string;
|
|
agentId: string;
|
|
/** Absent when the client sends into an idle agent. */
|
|
activeTurnBehavior?: string;
|
|
}
|
|
|
|
function readSendRequest(message: WebSocketMessage): SendAgentMessageRequest | null {
|
|
if (typeof message !== "string") return null;
|
|
try {
|
|
const envelope = JSON.parse(message) as {
|
|
type?: unknown;
|
|
message?: Record<string, unknown>;
|
|
};
|
|
const request = envelope.type === "session" ? envelope.message : null;
|
|
if (
|
|
request?.type !== "send_agent_message_request" ||
|
|
typeof request.requestId !== "string" ||
|
|
typeof request.agentId !== "string"
|
|
) {
|
|
return null;
|
|
}
|
|
return {
|
|
type: "send_agent_message_request",
|
|
requestId: request.requestId,
|
|
agentId: request.agentId,
|
|
activeTurnBehavior:
|
|
typeof request.activeTurnBehavior === "string" ? request.activeTurnBehavior : undefined,
|
|
};
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
export async function gateNextAgentMessage(page: Page) {
|
|
let serverSocket: WebSocketRoute | null = null;
|
|
let browserSocket: WebSocketRoute | null = null;
|
|
const heldMessages: Array<WebSocketMessage | null> = [];
|
|
const requests: SendAgentMessageRequest[] = [];
|
|
const requestWaiters = new Set<() => void>();
|
|
|
|
await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
|
|
browserSocket = ws;
|
|
const server = ws.connectToServer();
|
|
serverSocket = server;
|
|
|
|
ws.onMessage((message) => {
|
|
const request = readSendRequest(message);
|
|
if (request) {
|
|
heldMessages.push(message);
|
|
requests.push(request);
|
|
for (const resolve of requestWaiters) resolve();
|
|
requestWaiters.clear();
|
|
return;
|
|
}
|
|
server.send(message);
|
|
});
|
|
|
|
server.onMessage((message) => ws.send(message));
|
|
});
|
|
|
|
const waitForRequest = async (count = 1): Promise<SendAgentMessageRequest> => {
|
|
while (requests.length < count) {
|
|
await new Promise<void>((resolve) => requestWaiters.add(resolve));
|
|
}
|
|
return requests[count - 1];
|
|
};
|
|
|
|
return {
|
|
waitForRequest,
|
|
accept(index = 0) {
|
|
const heldMessage = heldMessages[index];
|
|
if (!serverSocket || !heldMessage) {
|
|
throw new Error("No held send-agent-message request to accept");
|
|
}
|
|
serverSocket.send(heldMessage);
|
|
heldMessages[index] = null;
|
|
},
|
|
async disconnect(): Promise<void> {
|
|
if (!browserSocket) throw new Error("No browser daemon socket to disconnect");
|
|
await browserSocket.close({ code: 1008, reason: "Dropped by submission test." });
|
|
},
|
|
};
|
|
}
|