Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

fix(flutter): report cancellation during snapshot cleanup with completed observations (#4762)

Kaoru082263c530998ed1
diff --git a/src/cli/flutterCommands.ts b/src/cli/flutterCommands.ts
index 03c72d260..fd1f0e196 100644
--- a/src/cli/flutterCommands.ts
+++ b/src/cli/flutterCommands.ts
@@ -84,6 +84,8 @@ export const registerFlutterCommands = (
{ close: () => provider.close() },
"flutter",
spec.operation,
+ undefined,
+ signal,
),
),
),
diff --git a/tests/boundary/cli/flutterCli.test.ts b/tests/boundary/cli/flutterCli.test.ts
index e9e32c99d..4b424479d 100644
--- a/tests/boundary/cli/flutterCli.test.ts
+++ b/tests/boundary/cli/flutterCli.test.ts
@@ -1,5 +1,12 @@
-import { expect, it } from "vitest";
+import { rm } from "node:fs/promises";
+import { Cli } from "incur";
+import { expect, it, onTestFinished } from "vitest";
+import { registerFlutterCommands } from "../../../src/cli/flutterCommands.js";
+import { aotFixtureImage } from "../../../src/flutter/FlutterBuild.fixture.js";
+import { FlutterBuildProvider } from "../../../src/flutter/FlutterBuildProvider.js";
+import { silentLogger } from "../../../src/logger.js";
+import { createFlutterApk } from "../../fixtures/flutterApk.js";
import { serveCli } from "./cliServeHarness.js";
it.each(["identify-flutter-build", "inspect-dart-aot"])(
@@ -19,3 +26,85 @@ it("reports an unreadable target with an input refusal", async () => {
]);
expect(result.stdout).toContain("invalid_request");
});
+
+/** Serve one command whose first snapshot-root removal fails and is retried on close. */
+const serveWithCleanupRetry = async (
+ command: string,
+ apk: string,
+ interrupt: boolean,
+ retryFails = false,
+): Promise<Record<string, unknown>> => {
+ const inherited = new Set(process.listeners("SIGINT"));
+ const roots: string[] = [];
+ const provider = new FlutterBuildProvider({
+ removeRoot: async (root) => {
+ roots.push(root);
+ if (roots.length > 2) return rm(root, { recursive: true, force: true });
+ // Deliver SIGINT to the command's own listener during the retry.
+ if (roots.length === 2 && interrupt)
+ for (const listener of process.listeners("SIGINT"))
+ if (!inherited.has(listener)) listener("SIGINT");
+ if (roots.length === 1 || retryFails)
+ throw Object.assign(new Error("transient snapshot removal refusal"), {
+ code: "EACCES",
+ });
+ await rm(root, { recursive: true, force: true });
+ },
+ });
+ onTestFinished(() => provider.close());
+ const cli = Cli.create("flutter-cleanup-retry-test", { sync: false });
+ registerFlutterCommands(cli, silentLogger, provider);
+ let stdout = "";
+ await cli.serve([command, apk, "--format", "json"], {
+ stdout: (text) => {
+ stdout += text;
+ },
+ exit: () => {},
+ });
+ expect(roots).toEqual([roots[0], roots[0]]);
+ return JSON.parse(stdout) as Record<string, unknown>;
+};
+
+it.each([
+ ["identify-flutter-build", "identify_flutter_build"],
+ ["inspect-dart-aot", "inspect_dart_aot"],
+] as const)(
+ "%s reports SIGINT during the cleanup retry as cancellation with completed facts",
+ async (command, operation) => {
+ const apk = await createFlutterApk("cleanup-retry.apk", [
+ { path: "lib/arm64-v8a/libapp.so", bytes: aotFixtureImage() },
+ ]);
+ const exitCode = process.exitCode;
+ onTestFinished(() => {
+ process.exitCode = exitCode;
+ });
+ const control = await serveWithCleanupRetry(command, apk, false);
+ expect(control).toMatchObject({ operation, confidence: "observed" });
+ expect(process.exitCode).toBe(exitCode);
+ const interrupted = await serveWithCleanupRetry(command, apk, true);
+ expect(process.exitCode).toBe(130);
+ expect(interrupted).toMatchObject({
+ code: "cancelled",
+ details: {
+ operation,
+ partial_observation: {
+ operation,
+ subject: { local_path: apk },
+ confidence: "observed",
+ normalized_result: control.normalized_result,
+ },
+ },
+ });
+ const incomplete = await serveWithCleanupRetry(command, apk, true, true);
+ expect(incomplete).toMatchObject({
+ code: "cleanup_incomplete",
+ details: {
+ resources: [expect.stringContaining("rea-flutter-")],
+ partial_observation: {
+ operation,
+ normalized_result: control.normalized_result,
+ },
+ },
+ });
+ },
+);