mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 11:43:20 +00:00
refactor(browser): build browser cancellations with a required reason (#10581)
* refactor(errors): require a reason for every analysis cancellation Add cancelledBy, the one constructor for AnalysisCancelledError. Its reason argument is required: an aborted signal, an earlier cancellation, a reason carried from an inner failure, or an OwnerCancellation when REA closed the work's owner itself. Closed adb, apktool, firmware, sqlite, gdb, web-bundle analyzer and binary-session record owners now report OwnerCancellation.ownerClosed instead of an absent reason. Firmware's predecessor wait returns its cancellation as a Result, removing an unreachable reason-less fallback. An architecture guard rejects new direct constructions, with a counted per-file baseline that can only shrink. * refactor(errors): share one aborted-signal predicate with cancelledBy * refactor(process): return a departing caller's reason from a shared startup wait * refactor(browser): build browser cancellations with a required reason Migrate every AnalysisCancelledError construction under src/browser, src/javascript, src/electron, src/inspector and src/captures to cancelledBy and lower the guard baseline from 671 to 572. Service-worker setup aborts with OwnerCancellation.ownerClosed on close. * refactor(providers): build decompiler-provider cancellations with a required reason (#10587) Migrate every AnalysisCancelledError construction under src/ghidra, src/ida, src/cutter, src/jeb and src/kuna to cancelledBy and lower the guard baseline from 671 to 572. Closed Kuna target commands report OwnerCancellation.ownerClosed instead of an absent reason, and Kuna and JEB close abort their lifetimes with that typed reason. * fix(errors): read the reason of any signal-shaped cancellation source * test(ci): cover the counted-baseline comparison behind the architecture guard * refactor(electron): drop an unused error import from the fuse failure mapper
This commit is contained in:
1 parent
a761efda70
commit
b3cdbb92ee
41 files changed
+298
-425
No files matched your search
@@ -40,6 +40,7 @@ import {
|
||||
AnalysisTimeoutError,
|
||||
AnalysisOutputError,
|
||||
AnalysisResourceConstraintError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
|
||||
import { ProviderCleanupError } from "../../domain/providerCleanupError.js";
|
||||
@@ -332,8 +333,7 @@ export class JavaScriptAnalysisWorker {
|
||||
JavaScriptSourceAnalysisFailure
|
||||
>;
|
||||
try {
|
||||
if (signal?.aborted === true)
|
||||
throw new AnalysisCancelledError(OPERATION, { cause: signal.reason });
|
||||
if (signal?.aborted === true) throw cancelledBy(OPERATION, signal);
|
||||
if (!file.text.included || file.kind !== "javascript")
|
||||
throw new TypeError(
|
||||
"JavaScript analysis worker requires included JavaScript text",
|
||||
@@ -566,8 +566,7 @@ export class JavaScriptAnalysisWorker {
|
||||
if (deadline?.interruption === "cancelled")
|
||||
analysisErrorWithCancellation(
|
||||
error,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: deadline.signal.reason,
|
||||
cancelledBy(OPERATION, deadline.signal, {
|
||||
capturedOutput: this.#captured(),
|
||||
}),
|
||||
);
|
||||
@@ -616,8 +615,7 @@ export class JavaScriptAnalysisWorker {
|
||||
const primary = signal?.aborted
|
||||
? analysisErrorWithCancellation(
|
||||
previous,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: signal.reason,
|
||||
cancelledBy(OPERATION, signal, {
|
||||
capturedOutput: this.#captured(),
|
||||
}),
|
||||
)
|
||||
@@ -635,10 +633,7 @@ export class JavaScriptAnalysisWorker {
|
||||
if (signal?.aborted === true) {
|
||||
const error = analysisErrorWithCancellation(
|
||||
result.ok ? undefined : result.error.error,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: signal.reason,
|
||||
capturedOutput: this.#captured(),
|
||||
}),
|
||||
cancelledBy(OPERATION, signal, { capturedOutput: this.#captured() }),
|
||||
);
|
||||
if (result.ok) this.#lastFailure = error;
|
||||
result = err({ error, javascript, module, projection });
|
||||
@@ -1221,8 +1216,7 @@ export class JavaScriptAnalysisWorker {
|
||||
remediationAction:
|
||||
"Reuse accessible partial_observation Evidence to avoid recomputation; reading it is not a prerequisite for a corrected retry. Increase analysis_timeout_ms through MCP, or use rea analyze-javascript-application <input_path> --analysis-timeout-ms <milliseconds> on the CLI. Alternatively, reduce semantic limits or select exact inventoried source_paths (CLI: --source-path on that command). Omit source_paths to analyze all sources; an empty array is invalid. detail: summary reduces response size, not analysis work. Allow execution, cleanup and delivery headroom in the MCP client tool deadline; increasing that client deadline alone does not change this server budget. Resolve any reported incomplete cleanup before retrying.",
|
||||
})
|
||||
: new AnalysisCancelledError(OPERATION, {
|
||||
cause: deadline.signal.reason,
|
||||
: cancelledBy(OPERATION, deadline.signal, {
|
||||
capturedOutput: this.#captured(),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -28,6 +28,8 @@ import {
|
||||
AnalysisOutputError,
|
||||
AnalysisResourceConstraintError,
|
||||
AnalysisTimeoutError,
|
||||
cancelledBy,
|
||||
carriedReason,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import {
|
||||
NonRegularFileReadError,
|
||||
@@ -109,19 +111,23 @@ const scanRecoveryFile = async (
|
||||
} catch (cause: unknown) {
|
||||
if (cause instanceof ArtifactFileCleanupFailure) throw cause;
|
||||
if (cause instanceof ArtifactFileCancelled)
|
||||
throw new AnalysisCancelledError(OPERATION, {
|
||||
cause: cause.fileCancellation.reason,
|
||||
partialObservation: fileSnapshotPartialObservationSchema.parse(
|
||||
Object.assign({}, cause.fileCancellation.outcome.value, {
|
||||
kind: "file-snapshot-hash",
|
||||
path,
|
||||
}),
|
||||
),
|
||||
});
|
||||
throw cancelledBy(
|
||||
OPERATION,
|
||||
carriedReason(cause.fileCancellation.reason),
|
||||
{
|
||||
partialObservation: fileSnapshotPartialObservationSchema.parse(
|
||||
Object.assign({}, cause.fileCancellation.outcome.value, {
|
||||
kind: "file-snapshot-hash",
|
||||
path,
|
||||
}),
|
||||
),
|
||||
},
|
||||
);
|
||||
if (cause instanceof ArtifactReaderFailure && cause.reason === "cancelled")
|
||||
throw new AnalysisCancelledError(OPERATION, {
|
||||
cause: artifactFileCancellationCause(cause),
|
||||
});
|
||||
throw cancelledBy(
|
||||
OPERATION,
|
||||
carriedReason(artifactFileCancellationCause(cause)),
|
||||
);
|
||||
if (
|
||||
cause instanceof Error &&
|
||||
"code" in cause &&
|
||||
@@ -482,8 +488,7 @@ export const recoveryFailureMessage = (cause: unknown): string =>
|
||||
|
||||
/** Cancellation remains distinct from malformed source or provider output. */
|
||||
export const checkRecoveryCancellation = (signal?: AbortSignal): void => {
|
||||
if (signal?.aborted === true)
|
||||
throw new AnalysisCancelledError(OPERATION, { cause: signal.reason });
|
||||
if (signal?.aborted === true) throw cancelledBy(OPERATION, signal);
|
||||
};
|
||||
|
||||
/** Keep both tool invocations within one operation's execution budget. */
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisOutputError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js";
|
||||
import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js";
|
||||
@@ -200,9 +201,7 @@ export const runWakaruCommand = async (context: WakaruCommandContext) => {
|
||||
context.signal?.aborted === true
|
||||
? analysisErrorWithCancellation(
|
||||
physical,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: context.signal.reason,
|
||||
}),
|
||||
cancelledBy(OPERATION, context.signal),
|
||||
)
|
||||
: physical;
|
||||
}
|
||||
@@ -269,9 +268,7 @@ export const runWakaruCommand = async (context: WakaruCommandContext) => {
|
||||
const stopped = await supervisor.stop();
|
||||
const snapshot = supervisor.snapshot();
|
||||
if (context.signal?.aborted === true) {
|
||||
const cancelled = new AnalysisCancelledError(OPERATION, {
|
||||
cause: context.signal.reason,
|
||||
});
|
||||
const cancelled = cancelledBy(OPERATION, context.signal);
|
||||
if (failure === undefined || failure instanceof AnalysisError)
|
||||
failure = analysisErrorWithCancellation(failure, cancelled);
|
||||
}
|
||||
|
||||
@@ -14,9 +14,10 @@ import { SafeOutputTreeCreationFailure } from "../../artifacts/SafeOutputTreeCre
|
||||
import { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisOutputError,
|
||||
cancelledBy,
|
||||
carriedReason,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js";
|
||||
import { artifactFileCancellationCause } from "../../artifacts/ArtifactFileOperation.js";
|
||||
@@ -167,15 +168,18 @@ export class WakaruProvider implements JavaScriptRecoveryPort {
|
||||
primary instanceof ArtifactReaderFailure &&
|
||||
primary.reason === "cancelled" &&
|
||||
primary.cleanup === undefined
|
||||
? new AnalysisCancelledError(OPERATION, {
|
||||
cause: artifactFileCancellationCause(primary),
|
||||
...(primary.partialObservation === undefined
|
||||
? {}
|
||||
: { partialObservation: primary.partialObservation }),
|
||||
...(reportFailure === undefined
|
||||
? {}
|
||||
: { capturedOutput: reportFailure.capturedOutput }),
|
||||
})
|
||||
? cancelledBy(
|
||||
OPERATION,
|
||||
carriedReason(artifactFileCancellationCause(primary)),
|
||||
{
|
||||
...(primary.partialObservation === undefined
|
||||
? {}
|
||||
: { partialObservation: primary.partialObservation }),
|
||||
...(reportFailure === undefined
|
||||
? {}
|
||||
: { capturedOutput: reportFailure.capturedOutput }),
|
||||
},
|
||||
)
|
||||
: primary;
|
||||
const residuals: string[] = [];
|
||||
const cleanupFailures: { resource: string; reason: string }[] = [];
|
||||
@@ -269,7 +273,7 @@ export class WakaruProvider implements JavaScriptRecoveryPort {
|
||||
});
|
||||
failure = analysisErrorWithCancellation(
|
||||
analysisFailure,
|
||||
new AnalysisCancelledError(OPERATION, { cause: signal.reason }),
|
||||
cancelledBy(OPERATION, signal),
|
||||
);
|
||||
}
|
||||
if (residuals.length > 0) {
|
||||
|
||||
@@ -13,10 +13,11 @@ import { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js";
|
||||
import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisOutputError,
|
||||
AnalysisResourceConstraintError,
|
||||
AnalysisTimeoutError,
|
||||
cancelledBy,
|
||||
carriedReason,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
|
||||
import { ProviderCleanupError } from "../../domain/providerCleanupError.js";
|
||||
@@ -148,7 +149,7 @@ export const runSourceMapCommand = async (
|
||||
const primary = signal?.aborted
|
||||
? analysisErrorWithCancellation(
|
||||
knownPhysical ? physical : undefined,
|
||||
new AnalysisCancelledError(OPERATION, { cause: signal.reason }),
|
||||
cancelledBy(OPERATION, signal),
|
||||
)
|
||||
: physical;
|
||||
if (preparation?.cleanupFailure === undefined) return err(primary);
|
||||
@@ -194,8 +195,7 @@ export const runSourceMapCommand = async (
|
||||
? err(
|
||||
analysisErrorWithCancellation(
|
||||
result.ok ? undefined : result.error,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: options.signal.reason,
|
||||
cancelledBy(OPERATION, options.signal, {
|
||||
partialObservation: observation,
|
||||
}),
|
||||
),
|
||||
@@ -394,9 +394,7 @@ class OwnedCodec implements SourceMapCleanupOwner {
|
||||
if (outcome?.kind === "physical")
|
||||
throw this.#physicalFailure(outcome.observation);
|
||||
if (outcome?.kind === "cancelled")
|
||||
throw new AnalysisCancelledError(OPERATION, {
|
||||
cause: outcome.callerReason,
|
||||
});
|
||||
throw cancelledBy(OPERATION, carriedReason(outcome.callerReason));
|
||||
if (outcome?.kind === "timeout")
|
||||
throw new AnalysisTimeoutError(
|
||||
OPERATION,
|
||||
@@ -411,9 +409,7 @@ class OwnedCodec implements SourceMapCleanupOwner {
|
||||
if (outcome?.kind === "physical")
|
||||
return this.#physicalFailure(outcome.observation);
|
||||
if (outcome?.kind === "cancelled")
|
||||
return new AnalysisCancelledError(OPERATION, {
|
||||
cause: outcome.callerReason,
|
||||
});
|
||||
return cancelledBy(OPERATION, carriedReason(outcome.callerReason));
|
||||
if (outcome?.kind === "timeout")
|
||||
return new AnalysisTimeoutError(
|
||||
OPERATION,
|
||||
|
||||
@@ -8,9 +8,9 @@ import type { WebSourceMapPort } from "../../application/WebSourceLocationPorts.
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import { analysisErrorWithCancellation } from "../../domain/analysisErrorCancellation.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisInputError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { ArtifactOperationError } from "../../domain/artifactOperationError.js";
|
||||
import { err, type Result } from "../../domain/result.js";
|
||||
@@ -79,16 +79,12 @@ export class SourceMapDecoder implements WebSourceMapPort {
|
||||
options?.signal?.aborted
|
||||
? analysisErrorWithCancellation(
|
||||
cleanupFailure,
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
cancelledBy(OPERATION, options.signal),
|
||||
)
|
||||
: cleanupFailure,
|
||||
);
|
||||
if (options?.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, { cause: options.signal.reason }),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
const request = sourceMapCodecInputSchema.safeParse({
|
||||
text: input.text,
|
||||
url: input.url,
|
||||
@@ -125,9 +121,7 @@ export class SourceMapDecoder implements WebSourceMapPort {
|
||||
encodedBytes += bytes;
|
||||
}
|
||||
if (options?.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, { cause: options.signal.reason }),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
const serialized = encoded.join("");
|
||||
const retainedCleanup: SourceMapCleanupRetention = {};
|
||||
const response = await runSourceMapCommand(
|
||||
|
||||
Reference in new issue
Block a user