* fix(cancellation): preserve caller abort reasons through late finalization Caller aborts that arrived during final provider, cleanup, or protocol handling were dropped or replaced by I/O, cleanup, or success results. Each affected path now samples the caller signal after its owner has settled and returns AnalysisCancelledError carrying the exact signal.reason, keeping any completed partial Evidence or cleanup state. - Web script export: keep the exact reason for an interrupted output write, and honor a cancellation fact recorded before a retried capture close succeeds. - Native value tracing and Hopper regex search: check the signal after the final provider reply or regex worker settles. - Apple asset catalog: stop assetutil with SIGTERM so cancellation settles only after the helper exits. - CDP observation: end an armed window on a fatal protocol failure. - ADB bugreport: prefer cancellation over the staging-removal output error when the caller aborted. - JavaScript recovery: check the signal after provider success. - export-web-scripts CLI: run under command cancellation and forward the signal into the export workflow. - Objdump and Rizin CLI: report cancellation after cleanup completes. - Binary session: keep cancellation primary when previous-client retirement fails after abort. Fixes morluto/rea#6042 Fixes morluto/rea#6043 Fixes morluto/rea#6048 Fixes morluto/rea#6049 Fixes morluto/rea#6057 Fixes morluto/rea#6060 Fixes morluto/rea#6078 Fixes morluto/rea#6080 Fixes morluto/rea#6108 Fixes morluto/rea#6111 Fixes morluto/rea#6115 * fix(cancellation): keep caller reasons through export rollback and commit - Rollback failure after a caller abort now returns AnalysisCancelledError with the exact signal.reason, attaching the rollback failure as cleanup and retaining any published result as partial observation. - A capture close retry that succeeds after abort returns cancellation instead of the stale cleanup diagnostic. - An abort that lands during the final output commit returns cancellation carrying the completed manifest as partial observation. - Apple assetutil stop test: abort and await the run in finally so a timed-out wait does not leave the child running, and skip on Windows where the JavaScript SIGTERM handler cannot run. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5 * fix(cancellation): bind export cancellations to cleanup and caller reasons - A rollback-failure cancellation is bound to the retained cleanup lease, so a later successful close clears cleanup_incomplete instead of reporting a residual directory that no longer exists. - mapExportFailure wraps the caller's own AnalysisCancelledError reason under export_web_scripts rather than returning it as the export's error. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: morluto <76467478+morluto@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5
128 lines
4.8 KiB
TypeScript
128 lines
4.8 KiB
TypeScript
import { isAbsolute, resolve } from "node:path";
|
|
|
|
import {
|
|
AnalysisCancelledError,
|
|
AnalysisInputError,
|
|
AnalysisOutputError,
|
|
} from "../../domain/analysisErrorCore.js";
|
|
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
|
import { createEvidence, type Evidence } from "../../domain/evidence.js";
|
|
import {
|
|
javascriptRecoveryInputSchema,
|
|
javascriptRecoveryResultSchema,
|
|
} from "../../domain/javascript/javascriptRecovery.js";
|
|
import { jsonObjectSchema, jsonValueSchema } from "../../domain/jsonValue.js";
|
|
import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js";
|
|
import { err, type Result } from "../../domain/result.js";
|
|
import type { ExecutionOptions } from "../AnalysisProvider.js";
|
|
import { completeProviderEvidence } from "../ProviderOperationExecution.js";
|
|
import type { JavaScriptRecoveryPort } from "./JavaScriptRecoveryPort.js";
|
|
|
|
const OPERATION = "recover_javascript_sources";
|
|
|
|
/** Shared CLI/MCP parsing and Evidence for derived JavaScript artifacts. */
|
|
export class JavaScriptRecoveryService {
|
|
constructor(readonly provider: JavaScriptRecoveryPort) {}
|
|
|
|
close(): Promise<void> {
|
|
return this.provider.close?.() ?? Promise.resolve();
|
|
}
|
|
|
|
/** Recover sources and bind the result to its original immutable input. */
|
|
async recover(
|
|
input: unknown,
|
|
options?: ExecutionOptions,
|
|
): Promise<Result<Evidence, AnalysisError>> {
|
|
if (options?.signal?.aborted === true)
|
|
return err(new AnalysisCancelledError(OPERATION));
|
|
const parsed = javascriptRecoveryInputSchema.safeParse(input);
|
|
if (!parsed.success)
|
|
return err(
|
|
analysisInputErrorFromIssues(OPERATION, parsed.error.issues, input, {
|
|
cause: parsed.error,
|
|
}),
|
|
);
|
|
const invalidPaths = (["path", "output_directory"] as const).filter(
|
|
(field) => !isAbsolute(parsed.data[field]),
|
|
);
|
|
const invalidAdditional = (parsed.data.additional_paths ?? []).filter(
|
|
(additional) => !isAbsolute(additional),
|
|
);
|
|
if (invalidPaths.length > 0 || invalidAdditional.length > 0)
|
|
return err(
|
|
new AnalysisInputError(OPERATION, undefined, [
|
|
...invalidPaths.map((field) => ({
|
|
path: [field],
|
|
reason: "invalid_format" as const,
|
|
message: `${field} must be an absolute filesystem path on this host.`,
|
|
})),
|
|
...invalidAdditional.map((additional) => ({
|
|
path: ["additional_paths"],
|
|
reason: "invalid_format" as const,
|
|
message: `additional_paths entries must be absolute filesystem paths on this host: ${additional}`,
|
|
})),
|
|
]),
|
|
);
|
|
const selectedInputs = new Set(
|
|
[parsed.data.path, ...(parsed.data.additional_paths ?? [])].map((path) =>
|
|
resolve(path),
|
|
),
|
|
);
|
|
if (selectedInputs.size !== 1 + (parsed.data.additional_paths ?? []).length)
|
|
return err(
|
|
new AnalysisInputError(OPERATION, undefined, [
|
|
{
|
|
path: ["additional_paths"],
|
|
reason: "invalid_format",
|
|
message: "additional_paths must not repeat path or each other.",
|
|
},
|
|
]),
|
|
);
|
|
const execution = await this.provider.recover(parsed.data, options);
|
|
if (!execution.ok) return execution;
|
|
const result = javascriptRecoveryResultSchema.safeParse(
|
|
execution.value.result,
|
|
);
|
|
if (!result.success || execution.value.subject == null)
|
|
return err(
|
|
new AnalysisOutputError(
|
|
OPERATION,
|
|
"Recovery did not return a valid result bound to the original source",
|
|
),
|
|
);
|
|
if (
|
|
result.data.source.path !== parsed.data.path ||
|
|
(result.data.additional_sources ?? []).length !==
|
|
(parsed.data.additional_paths ?? []).length ||
|
|
(parsed.data.additional_paths ?? []).some(
|
|
(path, index) => result.data.additional_sources?.[index]?.path !== path,
|
|
) ||
|
|
execution.value.subject.path !== result.data.source.path ||
|
|
execution.value.subject.sha256 !== result.data.source.sha256 ||
|
|
execution.value.provider.id !== result.data.engine.id ||
|
|
execution.value.provider.version !== result.data.engine.version
|
|
)
|
|
return err(
|
|
new AnalysisOutputError(
|
|
OPERATION,
|
|
"Recovery source or engine identity disagrees with its Evidence binding",
|
|
),
|
|
);
|
|
const evidence = createEvidence(
|
|
execution.value.subject,
|
|
execution.value.provider,
|
|
{
|
|
operation: OPERATION,
|
|
parameters: jsonObjectSchema.parse(parsed.data),
|
|
result: jsonValueSchema.parse(result.data),
|
|
rawResult: execution.value.rawResult,
|
|
locations: execution.value.locations,
|
|
limitations: execution.value.limitations,
|
|
confidence: "derived",
|
|
authority: "shipped-artifact",
|
|
},
|
|
);
|
|
return completeProviderEvidence(evidence, options?.signal);
|
|
}
|
|
}
|