Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(cli): finalize doctor cancellation after failure logging
morluto662fad90723b
diff --git a/src/cli/setupCommands.ts b/src/cli/setupCommands.tsindex 5fc924397..947937bfc 100644--- a/src/cli/setupCommands.ts+++ b/src/cli/setupCommands.ts@@ -121,8 +121,8 @@ const registerDoctorCommand = (.describe("Require the installed REA skill identity to be aligned"),}),run: ({ options }) =>- logCliCommand(logger, "doctor", () =>- withCommandCancellation(async (signal) => {+ withCommandCancellation((signal) =>+ logCliCommand(logger, "doctor", async () => {const [{ runDoctorOwned }, { createSystemDoctorHost }] =await Promise.all([import("../application/Doctor.js"),diff --git a/tests/boundary/cli/doctorCancellation.test.ts b/tests/boundary/cli/doctorCancellation.test.tsnew file mode 100644index 000000000..6b8c861da--- /dev/null+++ b/tests/boundary/cli/doctorCancellation.test.ts@@ -0,0 +1,154 @@+import { z } from "zod";+import { mkdir, readFile, writeFile } from "node:fs/promises";+import { join, resolve } from "node:path";+import { expect } from "vitest";+import { cliTest } from "../../support/cli/cliFixture.js";+import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";+import { writeJadxJarInventory } from "../../fixtures/android/jadxJar.js";+import { observeOwnedProcessGroups } from "../../../src/process/ProcessOwnershipObservation.js";+import {+ cleanupOwnedProcessGroup,+ type OwnedProcessGroup,+} from "../../../src/process/ProcessOwnership.js";++cliTest.skipIf(!["darwin", "linux"].includes(process.platform)).for([+ ["SIGINT", 130],+ ["SIGTERM", 143],+] as const)(+ "doctor preserves %s after logging and joined prerequisite cleanup",+ async ([signal, expected], { processes }) => {+ const root = await createTestTempDirectory("rea-doctor-cancel-");+ const jdk = join(root, "jdk");+ const jar = join(root, "engine.jar");+ const ready = join(root, "ready.json");+ await mkdir(join(jdk, "bin"), { recursive: true });+ await mkdir(join(root, "home"));+ await writeJadxJarInventory(jar);+ // No JVM/engine runs. Announce only the selected JADX module-listing probe;+ // informational Ghidra checks can call the same configured executable first.+ await writeFile(+ join(jdk, "bin", "java"),+ `#!${process.execPath}+if (!process.argv.slice(2).includes("--list-modules")) process.exit(7);+require("node:fs").writeFileSync(${JSON.stringify(ready)}, JSON.stringify({pid: process.pid, runId: process.env.REA_PROCESS_RUN_ID}));+process.on("SIGTERM", () => {});+setTimeout(() => process.exit(99), 20000);+`,+ { mode: 0o700 },+ );+ const child = processes.spawn(+ process.execPath,+ [resolve("scripts/rea.mjs"), "doctor", "--provider", "jadx", "--json"],+ {+ env: {+ PATH: process.env.PATH,+ HOME: join(root, "home"),+ JAVA_HOME: jdk,+ REA_JADX_MCP_JAR: jar,+ GHIDRA_INSTALL_DIR: join(root, "missing-ghidra"),+ REA_LOG_LEVEL: "silent",+ },+ },+ );+ let stdout = "",+ stderr = "";+ child.stdout.on("data", (chunk) => {+ stdout += String(chunk);+ });+ child.stderr.on("data", (chunk) => {+ stderr += String(chunk);+ });+ const closed = new Promise<{+ code: number | null;+ signal: NodeJS.Signals | null;+ }>((resolve, reject) => {+ child.once("error", reject);+ child.once("close", (code, signal) => resolve({ code, signal }));+ });+ let ownership: OwnedProcessGroup | undefined;+ try {+ await expect+ .poll(+ () =>+ readFile(ready, "utf8").then(+ () => true,+ () => false,+ ),+ { timeout: 10_000 },+ )+ .toBe(true);+ const observed = z+ .strictObject({+ pid: z.number().int().positive(),+ runId: z.string().uuid(),+ })+ .parse(JSON.parse(await readFile(ready, "utf8")));+ ownership = {+ leaderPid: observed.pid,+ processGroupId: observed.pid,+ runId: observed.runId,+ };+ child.kill(signal);+ await expect+ .poll(() => child.exitCode, { timeout: 10_000 })+ .not.toBeNull();+ const result = await closed;+ expect(JSON.parse(stdout)).toMatchObject({ code: "cancelled" });+ const groups = await observeOwnedProcessGroups(ownership.runId, [+ ownership.processGroupId,+ ]);+ expect(groups.get(ownership.processGroupId)).toEqual({ state: "empty" });+ expect(result, stderr).toEqual({ code: expected, signal: null });+ } finally {+ try {+ if (ownership !== undefined)+ expect((await cleanupOwnedProcessGroup(ownership)).cleaned).toBe(+ true,+ );+ } finally {+ await processes.shutdown();+ await closed;+ }+ }+ },+);++cliTest.skipIf(!["darwin", "linux"].includes(process.platform)).for([+ { listing: "java.base@21\njdk.compiler@21\n", exitCode: 0, available: true },+ { listing: "java.base@21\n", exitCode: 1, available: false },+])(+ "doctor retains ordinary exit $exitCode without an interrupt",+ async ({ listing, exitCode, available }, { cli }) => {+ const root = await createTestTempDirectory("rea-doctor-disposition-");+ const jdk = join(root, "jdk");+ const jar = join(root, "engine.jar");+ await mkdir(join(jdk, "bin"), { recursive: true });+ await mkdir(join(root, "home"));+ await writeJadxJarInventory(jar);+ await writeFile(+ join(jdk, "bin", "java"),+ `#!${process.execPath}+if (!process.argv.slice(2).includes("--list-modules")) process.exit(7);+process.stdout.write(${JSON.stringify(listing)});+`,+ { mode: 0o700 },+ );+ const result = await cli.run({+ arguments: ["doctor", "--provider", "jadx", "--json"],+ environment: {+ HOME: join(root, "home"),+ JAVA_HOME: jdk,+ REA_JADX_MCP_JAR: jar,+ GHIDRA_INSTALL_DIR: join(root, "missing-ghidra"),+ REA_LOG_LEVEL: "silent",+ },+ });+ expect(result.exitCode, result.stderr).toBe(exitCode);+ expect(result.json).toMatchObject({+ healthy: available,+ providerInspections: expect.arrayContaining([+ expect.objectContaining({ id: "jadx", available }),+ ]),+ });+ },+);