fix(evidence): preserve view identity and cancellation outcomes

This commit is contained in:
morluto committed 2026-10-27 12:12:34 +08:00
1 parent 6de60993b8
commit 5f9f13d77b
5 files changed
+354 -38

No files matched your search

@@ -1,3 +1,5 @@
import { projectAnalysisErrorWithoutCapturedOutput } from "../../domain/analysisErrorProjection.js";
import { analysisErrorWithCleanupFailure } from "../../domain/analysisErrorCleanup.js";
import { parseAnalysisInput } from "../AnalysisInput.js";
import { isNativeObservationOperation } from "../../domain/native/nativeObservation.js";
import { dispatchQueuedInterrupts } from "../../process/queuedInterrupts.js";
@@ -99,27 +101,16 @@ const inspectFileView = async (
// the signal notifications they enqueue before accepting either result.
await dispatchQueuedInterrupts();
// A request cancelled during authentication reports cancellation, even when authentication failed.
if (options.signal?.aborted)
return err(
new AnalysisCancelledError(INSPECT_ANALYSIS_VIEW_OPERATION, {
cause: options.signal?.reason,
}),
);
if (!loaded.ok) return loaded;
const id = loaded.value.evidence_id;
const admitted = cancelledFileViewResult(loaded, options.signal);
if (!admitted.ok) return admitted;
const id = admitted.value.evidence_id;
const projected = inspectAnalysisViewValidated(
{ ...input, source: { kind: "retained-evidence", evidence_id: id } },
(evidenceId) => (evidenceId === id ? loaded.value : lookup?.(evidenceId)),
(evidenceId) => (evidenceId === id ? admitted.value : lookup?.(evidenceId)),
);
await dispatchQueuedInterrupts();
// A request cancelled during projection delivers and records nothing.
if (options.signal?.aborted)
return err(
new AnalysisCancelledError(INSPECT_ANALYSIS_VIEW_OPERATION, {
cause: options.signal?.reason,
}),
);
return projected;
if (!projected.ok) return projected;
return cancelledFileViewResult(projected, options.signal, projected.value);
};
/** Resolve the caller's exact retained parent from an authenticated portable bundle. */
@@ -147,26 +138,51 @@ const inspectBundleView = async (
);
// Authentication and projection are synchronous; dispatch queued interrupts before accepting either result.
await dispatchQueuedInterrupts();
// Preserve an already-produced bundle failure before considering a later abort.
if (!loaded.ok) return loaded;
if (signal?.aborted)
return err(
new AnalysisCancelledError("inspect_analysis_view", {
cause: signal.reason,
}),
);
const admitted = cancelledFileViewResult(loaded, signal);
if (!admitted.ok) return admitted;
const projected = inspectAnalysisViewValidated(
{ source: input.source, view: input.view },
(id) => loaded.value.records.find((record) => record.evidence_id === id),
(id) => admitted.value.records.find((record) => record.evidence_id === id),
);
await dispatchQueuedInterrupts();
if (projected.ok && signal?.aborted)
return err(
new AnalysisCancelledError("inspect_analysis_view", {
cause: signal.reason,
partialObservation: projected.value,
}),
);
return projected;
if (!projected.ok) return projected;
return cancelledFileViewResult(projected, signal, projected.value);
};
/** Retain completed work and pending cleanup when this stage accepts cancellation.
* File-source admission explicitly gives queued cancellation precedence over
* authentication errors; callers preserve other already-produced failures.
*/
const cancelledFileViewResult = <T>(
result: Result<T, AnalysisError>,
signal?: AbortSignal,
completedEvidence?: Evidence,
): Result<T, AnalysisError> => {
if (!signal?.aborted) return result;
const cancellation = new AnalysisCancelledError(
INSPECT_ANALYSIS_VIEW_OPERATION,
{
cause: signal.reason,
...(completedEvidence !== undefined
? { partialObservation: completedEvidence }
: {}),
},
);
if (!result.ok)
cancellation.retainSecondaryFailure(result.error, {
source_error: projectAnalysisErrorWithoutCapturedOutput(result.error),
});
return err(
!result.ok && result.error.cleanupIncomplete
? analysisErrorWithCleanupFailure(
cancellation,
result.error,
INSPECT_ANALYSIS_VIEW_OPERATION,
).bindCleanupDependencies([result.error])
: cancellation,
);
};
/** Project a parsed request whose selected source is inline or retained. */