gensokyo-dev
e18594b247
Bind typed service creation, observed availability and retryable cleanup in one composition owner. Reuse selected CLI/MCP factories and canonical contract groups without copying provider operation inventories. Closes #8429. Refs #740. Validated paired real application workflows, actual local Codex CLI Terra/high use, complete Evidence and Unknown checkpoint parity, compiler-backed import boundaries, SDK schemas and final real mixed routing. Automated review findings were fixed at their producing owners. Existing exact-base CodeQL alerts are documented on the PR under the owner-authorized unrelated-check exception; no global alerts or security rules were changed. Assisted-by: Suika (gensokyo-skills:suika-scatter-gather-planning)
95 lines
3.9 KiB
TypeScript
95 lines
3.9 KiB
TypeScript
import { afterEach, expect, it, vi } from "vitest";
|
|
import { BinarySession } from "../../../src/application/binary/BinarySession.js";
|
|
import { AnalysisProviderRegistry } from "../../../src/application/binary/AnalysisProviderRegistry.js";
|
|
import { SessionProviderRouter } from "../../../src/application/binary/SessionProviderRouter.js";
|
|
import { InvestigationRecords } from "../../../src/application/investigation/InvestigationRecords.js";
|
|
import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js";
|
|
import { EvidenceMcpServer } from "../../../src/server/EvidenceMcpServer.js";
|
|
import { createServer } from "../../../src/server/createServer.js";
|
|
import { createBrowserObservationProvider } from "../../../src/composition/browserObservation.js";
|
|
import { createEvmInterfaceService } from "../../../src/composition/evm.js";
|
|
|
|
afterEach(() => vi.restoreAllMocks());
|
|
|
|
it("preserves both shutdown failures and retries provider cleanup after onclose", async () => {
|
|
const transportFailure = new Error("transport cleanup failed");
|
|
const providerFailure = new Error("browser cleanup failed");
|
|
const transportClose = vi
|
|
.spyOn(EvidenceMcpServer.prototype, "close")
|
|
.mockImplementation(async function (this: EvidenceMcpServer) {
|
|
this.server.onclose?.();
|
|
throw transportFailure;
|
|
});
|
|
const browser = new CdpBrowserProvider();
|
|
const providerClose = vi
|
|
.spyOn(browser, "close")
|
|
.mockRejectedValueOnce(providerFailure)
|
|
.mockResolvedValue(undefined);
|
|
const session = new BinarySession(
|
|
SessionProviderRouter.selectable(new AnalysisProviderRegistry([]), []),
|
|
new InvestigationRecords(),
|
|
);
|
|
const server = createServer(
|
|
{ kind: "session", session },
|
|
{
|
|
browserObservation: browser,
|
|
},
|
|
);
|
|
const failure: unknown = await server
|
|
.close()
|
|
.catch((cause: unknown) => cause);
|
|
expect(failure).toBeInstanceOf(AggregateError);
|
|
const causes = (cause: unknown): unknown[] =>
|
|
cause instanceof AggregateError ? cause.errors.flatMap(causes) : [cause];
|
|
expect(causes(failure)).toEqual([transportFailure, providerFailure]);
|
|
expect(providerClose).toHaveBeenCalledTimes(1);
|
|
transportClose.mockResolvedValue(undefined);
|
|
await expect(server.close()).resolves.toBeUndefined();
|
|
expect(providerClose).toHaveBeenCalledTimes(2);
|
|
transportClose.mockRestore();
|
|
await session.close();
|
|
});
|
|
|
|
it("retries only the failed injected capability after its peer has closed", async () => {
|
|
// Compose the real typed owners without starting browser observation or EVM
|
|
// analysis. Only their close outcomes are controlled by this regression.
|
|
const browser = createBrowserObservationProvider();
|
|
const evm = createEvmInterfaceService({});
|
|
const failure = new Error("Controlled browser shutdown refusal");
|
|
const browserClose = vi
|
|
.spyOn(browser, "close")
|
|
.mockRejectedValueOnce(failure)
|
|
.mockResolvedValue(undefined);
|
|
const evmClose = vi.spyOn(evm, "close").mockResolvedValue(undefined);
|
|
const server = createServer(
|
|
{
|
|
kind: "fixed",
|
|
analysis: {
|
|
execute: async () => {
|
|
throw new Error("Cleanup must not execute analysis");
|
|
},
|
|
},
|
|
},
|
|
{ environment: {}, browserObservation: browser, evmInterface: evm },
|
|
);
|
|
try {
|
|
const first: unknown = await server
|
|
.close()
|
|
.catch((cause: unknown) => cause);
|
|
const causes = (cause: unknown): unknown[] =>
|
|
cause instanceof AggregateError ? cause.errors.flatMap(causes) : [cause];
|
|
expect(causes(first)).toEqual([failure]);
|
|
expect(browserClose).toHaveBeenCalledTimes(1);
|
|
expect(evmClose).toHaveBeenCalledTimes(1);
|
|
await server.close();
|
|
expect(browserClose).toHaveBeenCalledTimes(2);
|
|
expect(evmClose).toHaveBeenCalledTimes(1);
|
|
await server.close();
|
|
expect(browserClose).toHaveBeenCalledTimes(2);
|
|
expect(evmClose).toHaveBeenCalledTimes(1);
|
|
} finally {
|
|
browserClose.mockResolvedValue(undefined);
|
|
await server.close();
|
|
}
|
|
});
|