test: advance the Rizin and build computer fixed waits instead of sleeping through them (#11026)

This commit is contained in:
morluto authored and GitHub committed 2026-11-15 18:33:52 +08:00
1 parent 5cfaac0834
commit f46cd6770c
5 files changed
+49 -17

No files matched your search

@@ -421,6 +421,11 @@ export class DesktopBuildComputers {
this.#shared = { settle, secrets: this.#secrets };
}
/** How often a computer's start, and a tool call waiting on one, reports progress. */
get progressMs(): number {
return this.startTiming.progressMs;
}
/** How results show the secrets typed on this server's computers. */
get redaction(): Pick<DesktopBuildSecrets, "redact" | "redactJson"> {
return this.#secrets;
+1 -1
View File
@@ -26,7 +26,7 @@ import { awaitHttpReply, type HttpReply } from "./HttpReply.js";
const READY_TIMEOUT_MS = 180_000;
const REQUEST_TIMEOUT_MS = 120_000;
/** How long a computer's first screenshot waits for the desktop to draw, and how often its start reports progress. */
/** How long a computer's first screenshot waits for the desktop to draw, and how often its start and the tool calls waiting on it report progress. */
export interface ComputerStartTiming {
readonly drawnWaitMs: number;
readonly progressMs: number;
+16 -12
View File
@@ -37,16 +37,15 @@ const admit = <Schema extends z.ZodType>(
);
};
const HEARTBEAT_MS = 5_000;
/**
* Report progress every few seconds while a long build step works, so a
* Report progress every `intervalMs` while a long build step works, so a
* client's request timeout can reset; the step reports on the same
* reporter, whose notifications keep one order.
*/
const withHeartbeat = async <Value>(
context: ServerContext,
phase: string,
intervalMs: number,
run: (progress: ProgressReporter) => Promise<Value>,
): Promise<Value> => {
const progress = mcpProgressReporter(context);
@@ -60,7 +59,7 @@ const withHeartbeat = async <Value>(
message: `working (${String(Math.round((Date.now() - startedAt) / 1000))} s)`,
})
.catch(() => undefined);
}, HEARTBEAT_MS);
}, intervalMs);
try {
return await run(progress);
} finally {
@@ -173,10 +172,15 @@ export const registerDesktopBuildTools = (
server: EvidenceMcpServer,
computers: Pick<
DesktopBuildComputers,
"start" | "act" | "close" | "steps" | "measure" | "redaction"
"start" | "act" | "close" | "steps" | "measure" | "redaction" | "progressMs"
>,
logger: Logger,
): void => {
const heartbeat = <Value>(
context: ServerContext,
phase: string,
run: (progress: ProgressReporter) => Promise<Value>,
) => withHeartbeat(context, phase, computers.progressMs, run);
const tool = <Name extends Parameters<typeof toolContract>[0]>(
name: Name,
) => ({
@@ -191,38 +195,38 @@ export const registerDesktopBuildTools = (
);
// An action can wait for the call before it on its computer, and a reset for the relaunched app, which can take minutes.
registerForwarded(tool("act_on_build_computer"), (input, context) =>
withHeartbeat(context, "act_on_build_computer", () =>
heartbeat(context, "act_on_build_computer", () =>
computers.act(input, context.mcpReq.signal),
),
);
registerForwarded(tool("start_build_capture"), (input, context) =>
withHeartbeat(context, "start_build_capture", () =>
heartbeat(context, "start_build_capture", () =>
steps.startCapture(input, context.mcpReq.signal),
),
);
registerPlain(tool("mark_build_checkpoint"), (input, context) =>
withHeartbeat(context, "mark_build_checkpoint", () =>
heartbeat(context, "mark_build_checkpoint", () =>
steps.markCheckpoint(input, context.mcpReq.signal),
),
);
registerPlain(tool("stop_build_capture"), (input, context) =>
withHeartbeat(context, "stop_build_capture", () =>
heartbeat(context, "stop_build_capture", () =>
steps.stopCapture(input, context.mcpReq.signal),
),
);
registerPlain(tool("export_build_environment"), (input, context) =>
withHeartbeat(context, "export_build_environment", () =>
heartbeat(context, "export_build_environment", () =>
steps.exportEnvironment(input, context.mcpReq.signal),
),
);
registerPlain(tool("check_build_task"), (input, context) =>
withHeartbeat(context, "check_build_task", (progress) =>
heartbeat(context, "check_build_task", (progress) =>
steps.checkTask(input, context.mcpReq.signal, progress),
),
);
// Solves run one at a time for minutes each, so progress keeps the client waiting.
registerPlain(tool("measure_build_task"), (input, context) =>
withHeartbeat(context, "measure_build_task", (progress) =>
heartbeat(context, "measure_build_task", (progress) =>
computers.measure(input, context.mcpReq.signal, progress),
),
);