Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

refactor: simplify validated artifact reconciliation (#1454)

mldangelo-oai7f7f30729629
diff --git a/plugins/codex-security/mcp-app/src/artifact-deep-reducer.ts b/plugins/codex-security/mcp-app/src/artifact-deep-reducer.ts
index 368d89c6f..f0efd8b29 100644
--- a/plugins/codex-security/mcp-app/src/artifact-deep-reducer.ts
+++ b/plugins/codex-security/mcp-app/src/artifact-deep-reducer.ts
@@ -81,13 +81,10 @@ export async function getCodexSecurityDeepReducerInputs(
throw new Error(
"An assigned Standard worker wrote only a checkpoint, not a complete result.",
);
- result.findings = result.findings.map((finding, index) => ({
- ...finding,
- provenance: {
- ...(finding.provenance as Record<string, unknown>),
- sourceFindingIds: [`${worker.id}:${index}`],
- },
- }));
+ for (const [index, finding] of result.findings.entries()) {
+ const provenance = finding.provenance as Record<string, unknown>;
+ provenance.sourceFindingIds = [`${worker.id}:${index}`];
+ }
const { coverage: _coverage, ...reduction } = result;
return { workerId: worker.id, result: reduction };
}),
diff --git a/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts b/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts
index 411019b8f..56ac7e563 100644
--- a/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts
+++ b/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts
@@ -2375,27 +2375,11 @@ function normalizeDeferred(rows: JsonObject[]): JsonObject[] {
function coverageMode(context: ArtifactContext, contract: JsonObject): string {
if (context.mode === "diff") {
- const diff = requireObject(
- contract.diffTarget,
- "scan draft: authoritative diff target",
- );
- const modes: Record<string, string> = {
- commit: "commit",
- range: "branch_diff",
- working_tree: "working_tree",
- };
- const mode = modes[String(diff.kind)];
- if (!mode)
- throw new Error(
- "scan draft: the authoritative diff coverage mode is invalid.",
- );
- return mode;
+ const kind = (contract.diffTarget as JsonObject).kind as string;
+ return kind === "range" ? "branch_diff" : kind;
}
- const trustedScope = requireObject(
- contract.scope,
- "scan draft: authoritative scope",
- );
+ const trustedScope = contract.scope as JsonObject;
const includes = trustedScope.requiredIncludePaths;
const scoped = Array.isArray(includes)
? includes.length !== 1 || includes[0] !== "."
@@ -2498,10 +2482,7 @@ function validateFindingSemantics(findings: JsonObject[]): void {
if (references === undefined) continue;
if (
!Array.isArray(references) ||
- references.some(
- (reference) =>
- typeof reference !== "string" || !evidenceIds.has(reference),
- )
+ references.some((reference) => !evidenceIds.has(reference))
) {
throw new Error(
`scan draft: findings[${findingIndex}].${sectionName}.${referencesName} ` +
diff --git a/plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts b/plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
index 7888b34cd..224974618 100644
--- a/plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
+++ b/plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
@@ -189,38 +189,26 @@ export function reconcileDeepReduction(
...discoveries.map((discovery) => discovery.result[field]),
previous?.[field],
].filter((value): value is Record<string, unknown> => value !== undefined);
- const distinctValues = sourceValues.filter(
- (value, index) =>
- sourceValues.findIndex((candidate) =>
- isDeepStrictEqual(candidate, value),
- ) === index,
- );
- if (distinctValues.length > 1) {
+ if (
+ sourceValues.some((value) => !isDeepStrictEqual(sourceValues[0], value))
+ ) {
throw new Error(
`Deep reduction has ambiguous ${label}; provide the reconciled ${field} explicitly.`,
);
}
- if (distinctValues[0] !== undefined) {
- result[field] = structuredClone(distinctValues[0]);
+ if (sourceValues[0] !== undefined) {
+ result[field] = structuredClone(sourceValues[0]);
}
}
return result;
}
function findingSourceIds(finding: Record<string, unknown>): string[] {
- const provenance = finding.provenance as Record<string, unknown>;
- const ids = provenance.sourceFindingIds;
- if (Array.isArray(ids))
- return ids.filter((id): id is string => typeof id === "string");
- const sources = provenance.sourceFindings;
- if (!Array.isArray(sources)) return [];
- return sources.flatMap((source) =>
- typeof source === "object" &&
- source !== null &&
- typeof (source as { id?: unknown }).id === "string"
- ? [(source as { id: string }).id]
- : [],
- );
+ const { sourceFindingIds, sourceFindings } = finding.provenance as {
+ sourceFindingIds?: string[];
+ sourceFindings?: { id: string }[];
+ };
+ return sourceFindingIds ?? sourceFindings?.map((source) => source.id) ?? [];
}
function retainSourceFindings(
diff --git a/sdk/typescript/src/import-scan.ts b/sdk/typescript/src/import-scan.ts
index c246375f4..0fda27655 100644
--- a/sdk/typescript/src/import-scan.ts
+++ b/sdk/typescript/src/import-scan.ts
@@ -307,8 +307,7 @@ export async function importScan(
contract.findings.findings.length !== findings.length ||
contract.findings.findings.some(
(finding) => !expectedIds.delete(finding.findingId),
- ) ||
- expectedIds.size !== 0
+ )
) {
throw new CodexSecurityError(
"Import finalization did not preserve every input finding; the scan was not completed.",