mirror of
https://github.com/morluto/rea.git
synced 2026-11-13 18:22:42 +00:00
* fix(firmware): keep producer reports writable under small staging budgets extract_firmware passed max_output_bytes straight to prlimit --fsize. RLIMIT_FSIZE applies to every regular file the producer writes, including the mandatory report.json and unblob.log outside the staging tree, so a staging budget smaller than the report truncated it and failed the extraction even when every staged file fit. Derive the per-file ceiling as the larger of the staging budget and the 8 MiB report budget; polling and the final inventory still enforce the aggregate staging budget. Fixes #3888 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(firmware): keep files stopped at the size ceiling over budget The per-file RLIMIT_FSIZE ceiling equalled the largest size its readers accept, and both the staging inventory and the report reader accept a file of exactly their budget. A write the kernel stopped at the ceiling therefore left a truncated file that passed as complete. Raise the ceiling by one byte so such a file exceeds its budget and is rejected. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(firmware): report the effective file-size ceiling on limit failures The exit path re-derived the staging budget for SIGXFSZ and process-limit recovery, so a small-budget run killed at the 8 MiB + 1 ceiling reported file_size_bytes 64 and said the cap was max_output_bytes. Pass the ceiling runFirmwareCommand installs and describe how it is derived. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(firmware): reject staged files cut off at the per-file limit RLIMIT_FSIZE stops a write at the limit without extending the file, and the staging inventory admits a file of exactly max_output_bytes. With a budget of 8 MiB or more the producer limit equalled the budget, so a staged file the kernel cut short published as a complete extraction; an inherited ceiling below the budget did the same. Derive the per-run limit once in firmwareFileSizeLimit as one byte above the largest budget, still capped by the inherited ceiling, so a file stopped at the limit exceeds its budget. When the inherited ceiling removes that byte, both staging inventories refuse a regular file that reaches the installed limit with a nonretryable file-size constraint naming the inherited limit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(firmware): derive limit adjustability from the per-run limit The one byte of headroom makes the per-run file limit equal an inherited ceiling of exactly max_output_bytes + 1, but adjustability still compared that ceiling with the raw budget. A SIGXFSZ then advised raising max_output_bytes, which the same ceiling clamps back to the same limit. Decide adjustability in firmwareFileSizeAdjustable from firmwareFileSizeLimit itself: recommend a larger budget only when it raises that limit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(firmware): compare file-size recovery with its owners The SIGXFSZ adjustability cases and the inherited-ceiling workflow matched fragments of remediation prose, so a harmless rewrite would fail them. Compare the emitted guidance with firmwareSignalLimitError for the expected branch, check that the two branches stay distinct, and compare the inventory refusal with firmwareFileSizeLimitReached. The selected limit, resource and retryability stay asserted as structured facts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: gensokyo-dev <342580529+gensokyo-dev@users.noreply.github.com>
234 lines
9.8 KiB
TypeScript
234 lines
9.8 KiB
TypeScript
import type { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js";
|
|
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
|
|
import {
|
|
ArtifactFileCleanupFailure,
|
|
artifactFileCompletion,
|
|
artifactFileCancellationCause,
|
|
bindArtifactFileCleanup,
|
|
} from "../artifacts/ArtifactFileOperation.js";
|
|
import {
|
|
AnalysisError,
|
|
type AnalysisCapturedOutput,
|
|
type AnalysisErrorOptions,
|
|
} from "../domain/analysisErrorBase.js";
|
|
import {
|
|
AnalysisCancelledError,
|
|
AnalysisOutputError,
|
|
AnalysisResourceConstraintError,
|
|
AnalysisTimeoutError,
|
|
} from "../domain/analysisErrorCore.js";
|
|
import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
|
|
import { ProviderAdapterError } from "../domain/providerAdapterError.js";
|
|
import { ProviderCleanupError } from "../domain/providerCleanupError.js";
|
|
import type { FirmwareDeadline } from "./FirmwareDeadline.js";
|
|
import { firmwareDeadlineElapsed } from "./FirmwareDeadline.js";
|
|
import { z } from "zod";
|
|
import { MAX_FIRMWARE_TIMEOUT_MS } from "../domain/firmware/firmwareAnalysis.js";
|
|
import { FIRMWARE_LIMITS } from "./FirmwareRelease.js";
|
|
|
|
/** Fixed firmware allowance. analysis_timeout_ms does not raise it. */
|
|
export const firmwareLimitRecovery = (allowance: string): string =>
|
|
`${allowance}. This release has no runtime override. analysis_timeout_ms (--analysis-timeout-ms in the CLI) does not raise it. Repeating the unchanged request fails the same way.`;
|
|
|
|
/** Classify a prlimit signal that is not the analysis wall clock. */
|
|
export const firmwareSignalLimitError = (
|
|
operation: string,
|
|
signal: NodeJS.Signals | null | undefined,
|
|
fileSizeBytes: number,
|
|
fileSizeAdjustable: boolean,
|
|
capturedOutput?: AnalysisCapturedOutput,
|
|
): AnalysisResourceConstraintError | undefined => {
|
|
const recovery = (
|
|
remediationAction: string,
|
|
): AnalysisResourceConstraintError =>
|
|
new AnalysisResourceConstraintError(
|
|
operation,
|
|
signal === "SIGXCPU" ? "cpu" : "file-size",
|
|
signal === "SIGXCPU"
|
|
? `Firmware analysis reached its ${String(FIRMWARE_LIMITS.cpuSeconds)}-second CPU allowance (cpuSeconds).`
|
|
: `Firmware analysis reached its ${String(fileSizeBytes)}-byte file-size allowance.`,
|
|
signal === "SIGXCPU"
|
|
? { cpu_seconds: FIRMWARE_LIMITS.cpuSeconds }
|
|
: { file_size_bytes: fileSizeBytes },
|
|
{
|
|
retryable: false,
|
|
remediationAction,
|
|
...(capturedOutput === undefined ? {} : { capturedOutput }),
|
|
},
|
|
);
|
|
if (signal === "SIGXCPU")
|
|
return recovery(
|
|
firmwareLimitRecovery(
|
|
`cpuSeconds is ${String(FIRMWARE_LIMITS.cpuSeconds)}`,
|
|
),
|
|
);
|
|
if (signal !== "SIGXFSZ") return undefined;
|
|
return recovery(
|
|
fileSizeAdjustable
|
|
? `The file-size cap for this extraction is ${String(fileSizeBytes)} bytes, one byte above max_output_bytes. analysis_timeout_ms does not raise it. Increase max_output_bytes when it is below its schema maximum and the larger staging budget is still required. Repeating the unchanged request fails the same way.`
|
|
: firmwareLimitRecovery(
|
|
`The firmware file-size allowance is ${String(fileSizeBytes)} bytes`,
|
|
),
|
|
);
|
|
};
|
|
|
|
/** Address-space and CPU ceilings that a wall-clock change cannot raise. */
|
|
export const firmwareProcessLimitRecovery = (
|
|
fileSizeBytes: number,
|
|
fileSizeAdjustable: boolean,
|
|
): string =>
|
|
`cpuSeconds is ${String(FIRMWARE_LIMITS.cpuSeconds)}. The address-space allowance is ${String(FIRMWARE_LIMITS.addressSpaceBytes)} bytes. This release has no runtime override for those per-process allowances, and analysis_timeout_ms does not raise them. ${
|
|
fileSizeAdjustable
|
|
? `The file-size cap for this call is ${String(fileSizeBytes)} bytes, one byte above max_output_bytes. analysis_timeout_ms does not raise it.`
|
|
: `The file-size allowance is ${String(fileSizeBytes)} bytes. This release has no runtime override for that allowance, and analysis_timeout_ms does not raise it.`
|
|
}`;
|
|
|
|
type FirmwarePublicationProgress = {
|
|
readonly output_directory: string;
|
|
readonly verified_files: number;
|
|
readonly total_files: number;
|
|
};
|
|
|
|
interface FirmwareFailureContext {
|
|
readonly engine: string;
|
|
readonly operation: string;
|
|
readonly deadline?: FirmwareDeadline | undefined;
|
|
readonly treeCleanupLease?: AnalysisCleanupLease | undefined;
|
|
readonly publication?: FirmwarePublicationProgress | undefined;
|
|
}
|
|
|
|
const timeoutFailure = (
|
|
operation: string,
|
|
reason: unknown,
|
|
deadline: FirmwareDeadline,
|
|
options: Pick<AnalysisErrorOptions, "partialObservation"> & {
|
|
readonly publication?: FirmwarePublicationProgress | undefined;
|
|
} = {},
|
|
): AnalysisTimeoutError =>
|
|
new AnalysisTimeoutError(operation, deadline.timeoutMs, {
|
|
cause: reason,
|
|
partialObservation: options.partialObservation,
|
|
diagnostics: {
|
|
phase: deadline.phase,
|
|
...(options.publication === undefined
|
|
? {}
|
|
: { publication: options.publication }),
|
|
},
|
|
...(deadline.phase === "publication"
|
|
? {
|
|
userMessage: `Firmware publication exceeded its ${deadline.timeoutMs}ms budget. Extraction already completed.`,
|
|
remediationAction:
|
|
"Read any retained publication receipt first. For a retry, choose an absent local output directory or increase publication_timeout_ms (--publication-timeout-ms in the CLI).",
|
|
}
|
|
: {
|
|
userMessage: `Firmware analysis exceeded its ${deadline.timeoutMs}ms wall-clock budget${operation === "extract_firmware" ? " before publication" : " during inspection or its final workspace cleanup"}.`,
|
|
remediationAction: `Retry the same operation and preserve the selected input and analysis question. ${deadline.timeoutMs < MAX_FIRMWARE_TIMEOUT_MS ? `Increase analysis_timeout_ms (--analysis-timeout-ms in the CLI), an integer from 1 to ${MAX_FIRMWARE_TIMEOUT_MS} (default 120000).` : `analysis_timeout_ms (--analysis-timeout-ms in the CLI) is already at the maximum ${MAX_FIRMWARE_TIMEOUT_MS}; do not increase it further.`} Set the client tool-call timeout above the analysis budget plus publication and cleanup headroom. publication_timeout_ms only controls the later publication phase and cannot repair this analysis timeout. Fixed per-process CPU, memory and byte limits are unchanged. If cleanup is incomplete, resolve the reported owned resources before retrying; no server restart is needed after confirmed cleanup.`,
|
|
}),
|
|
});
|
|
|
|
/** Translate the producing file owner's outcome without guessing from a later signal. */
|
|
export const firmwareFailure = (
|
|
cause: unknown,
|
|
context: FirmwareFailureContext,
|
|
): AnalysisError => {
|
|
const { engine, operation, deadline, treeCleanupLease, publication } =
|
|
context;
|
|
if (
|
|
cause instanceof AnalysisCancelledError &&
|
|
deadline?.signal.aborted &&
|
|
cause.cause === deadline.signal.reason
|
|
)
|
|
return timeoutFailure(operation, cause.cause, deadline, {
|
|
partialObservation: cause.partialObservation,
|
|
publication,
|
|
});
|
|
if (cause instanceof AnalysisError) return cause;
|
|
if (cause instanceof ArtifactReaderFailure && cause.cleanup !== undefined) {
|
|
const cleanup = new ProviderCleanupError(
|
|
engine,
|
|
cause.cleanup.resources,
|
|
{ reason: cause.cleanup.reason },
|
|
{ operation, cause },
|
|
);
|
|
bindArtifactFileCleanup(cause, cleanup);
|
|
if (cause.cleanupLeases === undefined)
|
|
treeCleanupLease?.bindCleanupError(cleanup);
|
|
if (cause instanceof ArtifactFileCleanupFailure) {
|
|
const outcome = cause.fileCleanupFailure.outcome;
|
|
const cancellation = artifactFileCompletion(cause)?.cancellation;
|
|
const primary =
|
|
outcome.kind === "failed"
|
|
? firmwareFailure(outcome.cause, context)
|
|
: cancellation !== undefined
|
|
? firmwareCancellation(
|
|
operation,
|
|
cancellation.reason,
|
|
deadline,
|
|
publication,
|
|
)
|
|
: undefined;
|
|
if (primary !== undefined)
|
|
return analysisErrorWithCleanupFailure(
|
|
primary,
|
|
cleanup,
|
|
operation,
|
|
).bindCleanupDependencies([primary, cleanup]);
|
|
}
|
|
if (cause.reason === "cancelled")
|
|
return analysisErrorWithCleanupFailure(
|
|
firmwareCancellation(
|
|
operation,
|
|
artifactFileCancellationCause(cause),
|
|
deadline,
|
|
publication,
|
|
),
|
|
cleanup,
|
|
operation,
|
|
).bindCleanupDependencies([cleanup]);
|
|
return cleanup;
|
|
}
|
|
if (cause instanceof ArtifactReaderFailure && cause.reason === "cancelled")
|
|
return firmwareCancellation(
|
|
operation,
|
|
artifactFileCancellationCause(cause),
|
|
deadline,
|
|
publication,
|
|
);
|
|
if (cause instanceof z.ZodError)
|
|
return new AnalysisOutputError(
|
|
operation,
|
|
"Tool report violated the pinned producer protocol",
|
|
{ cause },
|
|
);
|
|
return new ProviderAdapterError(engine, operation, {
|
|
cause,
|
|
diagnostics: {
|
|
reason: cause instanceof Error ? cause.message : String(cause),
|
|
},
|
|
});
|
|
};
|
|
|
|
/** Classify the interruption actually observed, before composing cleanup failures. */
|
|
export const firmwareCancellation = (
|
|
operation: string,
|
|
reason: unknown,
|
|
deadline?: FirmwareDeadline,
|
|
publication?: FirmwarePublicationProgress,
|
|
): AnalysisError =>
|
|
deadline?.signal.aborted && reason === deadline.signal.reason
|
|
? timeoutFailure(operation, reason, deadline, { publication })
|
|
: new AnalysisCancelledError(operation, { cause: reason });
|
|
|
|
/** Preserve observed cancellation identity; otherwise enforce the monotonic budget. */
|
|
export const firmwarePhaseInterruption = (
|
|
operation: string,
|
|
signal: AbortSignal,
|
|
deadline: FirmwareDeadline,
|
|
publication?: FirmwarePublicationProgress,
|
|
): AnalysisError | undefined =>
|
|
signal.aborted
|
|
? firmwareCancellation(operation, signal.reason, deadline, publication)
|
|
: firmwareDeadlineElapsed(deadline)
|
|
? timeoutFailure(operation, undefined, deadline, { publication })
|
|
: undefined;
|