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(mcp): simplify saved-coverage and tool-registration helpers (#1363)

mldangelo-oaia55b883ad768
diff --git a/plugins/codex-security/mcp-app/server.ts b/plugins/codex-security/mcp-app/server.ts
index 19f9c7a5e..540de0fce 100644
--- a/plugins/codex-security/mcp-app/server.ts
+++ b/plugins/codex-security/mcp-app/server.ts
@@ -55,7 +55,6 @@ const WORKBENCH_COMMANDS_WITHOUT_DATABASE = new Set([
]);
let fallbackWorkbenchStateDir: Promise<string> | undefined;
-let fallbackWorkbenchStateLogged = false;
let persistentWorkbenchStateSucceeded = false;
const workbenchStateSelectionLock = new AsyncLock();
@@ -2431,7 +2430,13 @@ async function executeWorkbenchWithStateSelection(
} catch (error) {
if (!isUnwritableSqliteOpenError(error)) throw error;
const fallbackStateDir = await pinFallbackWorkbenchStateDir();
- logWorkbenchStateFallback();
+ console.error(
+ JSON.stringify({
+ component: "codex_security_workbench",
+ event: "state_fallback_pinned",
+ reason: "persistent_sqlite_unwritable",
+ }),
+ );
return await executeWorkbench(
pythonCommand,
args,
@@ -2520,18 +2525,6 @@ async function pinFallbackWorkbenchStateDir(): Promise<string> {
return await fallbackWorkbenchStateDir;
}
-function logWorkbenchStateFallback(): void {
- if (fallbackWorkbenchStateLogged) return;
- fallbackWorkbenchStateLogged = true;
- console.error(
- JSON.stringify({
- component: "codex_security_workbench",
- event: "state_fallback_pinned",
- reason: "persistent_sqlite_unwritable",
- }),
- );
-}
-
function workbenchScriptPath(): string {
return join(PLUGIN_ROOT, "scripts", "workbench_db.py");
}
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 d0e661a41..7a5a13ffb 100644
--- a/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts
+++ b/plugins/codex-security/mcp-app/src/artifact-scan-draft.ts
@@ -536,8 +536,7 @@ async function preserveScanDraft(
!terminalOutcomeIds.has(surface.candidateId as string)),
),
},
- [result.coverage],
- false,
+ result.coverage,
ambiguousDeferredIds,
);
sources.unshift(progress);
@@ -701,8 +700,7 @@ async function preserveScanDraft(
);
result.coverage = preserveScanCoverage(
result.coverage,
- [previousCoverage],
- false,
+ previousCoverage,
ambiguousDeferredIds,
);
}
@@ -1658,10 +1656,9 @@ function coverageEntryIdentities(entry: JsonObject): string[] {
}
/** Reducers cannot resolve source review by omitting its coverage records. */
-export function preserveScanCoverage(
+function preserveScanCoverage(
coverage: JsonObject,
- sources: JsonObject[],
- preserveCompleteness = true,
+ previous: JsonObject,
ambiguousDeferredIds = new Set<string>(),
): JsonObject {
const result = structuredClone(coverage);
@@ -1673,21 +1670,19 @@ export function preserveScanCoverage(
] as const) {
const current = (result[field] as unknown[] | undefined) ?? [];
const values = [...current];
- for (const source of sources) {
- for (const value of (source[field] as unknown[] | undefined) ?? []) {
- const present =
- field === "deferred" ? deferredEntryPresent : coverageEntryPresent;
- if (
- !present(
- values,
- value,
- field === "deferred" || field === "surfaces"
- ? ambiguousDeferredIds
- : undefined,
- )
+ for (const value of (previous[field] as unknown[] | undefined) ?? []) {
+ const present =
+ field === "deferred" ? deferredEntryPresent : coverageEntryPresent;
+ if (
+ !present(
+ values,
+ value,
+ field === "deferred" || field === "surfaces"
+ ? ambiguousDeferredIds
+ : undefined,
)
- values.push(structuredClone(value));
- }
+ )
+ values.push(structuredClone(value));
}
if (
field !== "openQuestions" ||
@@ -1696,22 +1691,7 @@ export function preserveScanCoverage(
)
result[field] = values;
}
- if (
- coverageHasOutstandingWork(result) ||
- (preserveCompleteness &&
- sources.some(
- (source) =>
- source.completeness === "partial" &&
- !coverageHasOutstandingWork(source),
- ))
- )
- result.completeness = "partial";
- else if (
- preserveCompleteness &&
- sources.some((source) => source.completeness === "unknown")
- ) {
- result.completeness = "unknown";
- }
+ if (coverageHasOutstandingWork(result)) result.completeness = "partial";
return result;
}
diff --git a/plugins/codex-security/mcp-app/src/server/compact-artifact-tools.ts b/plugins/codex-security/mcp-app/src/server/compact-artifact-tools.ts
index 796aa9a3a..afa92607c 100644
--- a/plugins/codex-security/mcp-app/src/server/compact-artifact-tools.ts
+++ b/plugins/codex-security/mcp-app/src/server/compact-artifact-tools.ts
@@ -67,11 +67,20 @@ const modelOnlyMeta = {
ui: { visibility: ["model"] as const },
};
-/** Prepare diff inventories and read existing diff or Deep inventories. */
-export function registerReviewItemTools(
+function signalFromRequestContext(
+ requestContext: unknown,
+): AbortSignal | undefined {
+ if (typeof requestContext !== "object" || requestContext === null)
+ return undefined;
+ const signal = Reflect.get(requestContext, "signal");
+ return signal instanceof AbortSignal ? signal : undefined;
+}
+
+export function registerCompactArtifactTools(
server: McpServer,
options: CompactArtifactToolOptions,
): void {
+ /** Prepare diff inventories and read existing diff or Deep inventories. */
registerCompactTool(server, {
name: "prepare_codex_security_review_items",
title: "Prepare Codex Security Review Items",
@@ -98,13 +107,8 @@ export function registerReviewItemTools(
);
},
});
-}
-/** Record diff candidates and read existing diff or Deep candidates. */
-export function registerDiscoveryCandidateTools(
- server: McpServer,
- options: CompactArtifactToolOptions,
-): void {
+ /** Record diff candidates and read existing diff or Deep candidates. */
const writerSchema = workbenchDiscoveryCandidatesInputSchema;
const readerSchema = workbenchListCodexSecurityCandidatesInputSchema;
@@ -138,13 +142,8 @@ export function registerDiscoveryCandidateTools(
);
},
});
-}
-/** Record centralized validation results for a diff or Deep scan. */
-export function registerCandidateValidationTools(
- server: McpServer,
- options: CompactArtifactToolOptions,
-): void {
+ /** Record centralized validation results for a diff or Deep scan. */
registerCompactTool(server, {
name: "record_codex_security_candidate_validations",
title: "Record Codex Security Candidate Validations",
@@ -158,13 +157,8 @@ export function registerCandidateValidationTools(
);
},
});
-}
-/** Record centralized attack-path results for a diff or Deep scan. */
-export function registerCandidateAttackPathTools(
- server: McpServer,
- options: CompactArtifactToolOptions,
-): void {
+ /** Record centralized attack-path results for a diff or Deep scan. */
registerCompactTool(server, {
name: "record_candidate_attack_paths",
title: "Record Codex Security Candidate Attack Paths",
@@ -178,13 +172,8 @@ export function registerCandidateAttackPathTools(
);
},
});
-}
-/** Register draft construction and read-only completed scan retrieval. */
-export function registerScanDraftTools(
- server: McpServer,
- options: CompactArtifactToolOptions,
-): void {
+ /** Register draft construction and read-only completed scan retrieval. */
registerCompactTool(server, {
name: "record_codex_security_scan_draft",
title: "Record Codex Security Scan Draft",
@@ -216,26 +205,6 @@ export function registerScanDraftTools(
);
},
});
-}
-
-function signalFromRequestContext(
- requestContext: unknown,
-): AbortSignal | undefined {
- if (typeof requestContext !== "object" || requestContext === null)
- return undefined;
- const signal = Reflect.get(requestContext, "signal");
- return signal instanceof AbortSignal ? signal : undefined;
-}
-
-export function registerCompactArtifactTools(
- server: McpServer,
- options: CompactArtifactToolOptions,
-): void {
- registerReviewItemTools(server, options);
- registerDiscoveryCandidateTools(server, options);
- registerCandidateValidationTools(server, options);
- registerCandidateAttackPathTools(server, options);
- registerScanDraftTools(server, options);
registerCompactTool(server, {
name: "save_codex_security_artifact",
title: "Save Codex Security Artifact",