@openai/codex-security 0.8.1 → 0.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -2
- package/_bundled_plugin/mcp/native/THIRD_PARTY_NOTICES.txt +4 -4
- package/_bundled_plugin/mcp/native/darwin-arm64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/darwin-x64/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-arm64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-gnu/unix.node +0 -0
- package/_bundled_plugin/mcp/native/linux-x64-musl/unix.node +0 -0
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-002 +0 -0
- package/_bundled_plugin/scripts/workbench_coverage_receipts.py +0 -17
- package/_bundled_plugin/scripts/workbench_db.py +1 -3
- package/_bundled_plugin/scripts/workbench_saved_results.py +0 -66
- package/_bundled_plugin/scripts/workbench_target.py +0 -108
- package/_bundled_plugin/skills/publish-findings/SKILL.md +4 -0
- package/_bundled_plugin/skills/resolve-dependency-alert/SKILL.md +18 -0
- package/_bundled_plugin/skills/resolve-dependency-alert/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/threat-model-visualize/SKILL.md +83 -0
- package/_bundled_plugin/skills/threat-model-visualize/agents/openai.yaml +4 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/context-reference-overview.svg +366 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/context-reference-path.svg +558 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/control-effects.js +85 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/explorer.css +17 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/explorer.html +38 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/explorer.js +372 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/route-paths.js +71 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/source-roles.js +47 -0
- package/_bundled_plugin/skills/threat-model-visualize/assets/svg-layout.js +149 -0
- package/_bundled_plugin/skills/threat-model-visualize/references/context-explorer.md +21 -0
- package/_bundled_plugin/skills/threat-model-visualize/references/view-model.md +49 -0
- package/_bundled_plugin/skills/threat-model-visualize/scripts/build_explorer.py +563 -0
- package/dist/api.js +3 -3
- package/dist/api.js.map +1 -1
- package/dist/auth.js +1 -1
- package/dist/auth.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +27 -8
- package/dist/cli.js.map +1 -1
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +4 -4
- package/dist/contract.js.map +1 -1
- package/dist/custom-validation.js +2 -2
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +1 -1
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/records-protocol.d.ts.map +1 -1
- package/dist/deduplication/records-protocol.js +36 -22
- package/dist/deduplication/records-protocol.js.map +1 -1
- package/dist/deduplication/records.d.ts +3 -1
- package/dist/deduplication/records.d.ts.map +1 -1
- package/dist/deduplication/records.js +12 -8
- package/dist/deduplication/records.js.map +1 -1
- package/dist/endor-findings.d.ts.map +1 -1
- package/dist/endor-findings.js +46 -61
- package/dist/endor-findings.js.map +1 -1
- package/dist/external-findings-import.d.ts.map +1 -1
- package/dist/external-findings-import.js +8 -6
- package/dist/external-findings-import.js.map +1 -1
- package/dist/external-findings-local.d.ts +3 -1
- package/dist/external-findings-local.d.ts.map +1 -1
- package/dist/external-findings-local.js +117 -36
- package/dist/external-findings-local.js.map +1 -1
- package/dist/external-findings-publish.d.ts +3 -1
- package/dist/external-findings-publish.d.ts.map +1 -1
- package/dist/external-findings-publish.js +51 -27
- package/dist/external-findings-publish.js.map +1 -1
- package/dist/external-findings-read.d.ts +2 -0
- package/dist/external-findings-read.d.ts.map +1 -1
- package/dist/external-findings-read.js +9 -0
- package/dist/external-findings-read.js.map +1 -1
- package/dist/external-findings.d.ts +11 -0
- package/dist/external-findings.d.ts.map +1 -1
- package/dist/external-findings.js +13 -1
- package/dist/external-findings.js.map +1 -1
- package/dist/external-import-models.d.ts +1 -1
- package/dist/external-import-models.d.ts.map +1 -1
- package/dist/external-import-models.js.map +1 -1
- package/dist/host-protocol.d.ts +5 -0
- package/dist/host-protocol.d.ts.map +1 -1
- package/dist/host-protocol.js +27 -3
- package/dist/host-protocol.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/inspector-findings.d.ts +9 -0
- package/dist/inspector-findings.d.ts.map +1 -0
- package/dist/inspector-findings.js +517 -0
- package/dist/inspector-findings.js.map +1 -0
- package/dist/patch-tui.d.ts +1 -1
- package/dist/patch-tui.d.ts.map +1 -1
- package/dist/patch-tui.js +4 -1
- package/dist/patch-tui.js.map +1 -1
- package/dist/runtime.d.ts +3 -2
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +15 -5
- package/dist/runtime.js.map +1 -1
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +25 -15
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scanner-import.d.ts +6 -1
- package/dist/scanner-import.d.ts.map +1 -1
- package/dist/scanner-import.js +14 -5
- package/dist/scanner-import.js.map +1 -1
- package/dist/semgrep-findings.d.ts.map +1 -1
- package/dist/semgrep-findings.js +39 -49
- package/dist/semgrep-findings.js.map +1 -1
- package/dist/snyk-findings.d.ts.map +1 -1
- package/dist/snyk-findings.js +78 -88
- package/dist/snyk-findings.js.map +1 -1
- package/docs/cli.md +14 -8
- package/docs/dedupe-records.md +17 -4
- package/package.json +3 -3
- package/schemas/external-findings.schema.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deduplication-reviewer.js","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { requireFinding } from \"./finding-schema.js\";\nimport type { Finding } from \"../models.js\";\nimport type { CodexReviewRunner } from \"./codex-review.js\";\nimport {\n pairReviewPrompt,\n groupingReviewPrompt,\n screeningPrompt,\n} from \"./deduplication-prompts.js\";\nimport { scanModelConfiguration, type JsonObject } from \"../config.js\";\n\nconst rationale = z.string().refine((value) => value.trim().length > 0);\nconst sameSchema = z.object({\n decision: z.literal(\"SAME\"),\n rationale,\n canonicalFindingId: z.string(),\n mergedFinding: z.record(z.string(), z.unknown()),\n});\nconst distinctSchema = z.object({\n decision: z.literal(\"DISTINCT\"),\n rationale,\n canonicalFindingId: z.null().optional(),\n mergedFinding: z.null().optional(),\n});\nconst reviewSchema = z.discriminatedUnion(\"decision\", [\n sameSchema,\n distinctSchema,\n]);\nconst screeningDecisionSchema = z.discriminatedUnion(\"decision\", [\n sameSchema.pick({ decision: true, rationale: true }).strict(),\n distinctSchema.pick({ decision: true, rationale: true }).strict(),\n]);\n// The host assigns exact slot names; finding IDs stay out of model output.\nconst screeningSchema = z.strictObject({\n decisions: z.record(z.string(), screeningDecisionSchema),\n});\n\nexport type ScreeningResult = z.infer<typeof screeningSchema>;\nexport type DuplicateDecision = z.infer<typeof reviewSchema>;\nexport type GroupingDecision = z.infer<typeof screeningDecisionSchema>;\n\nexport interface DeduplicationReviewer {\n screen(findings: readonly Finding[]): Promise<ScreeningResult>;\n reviewPair(findings: readonly Finding[]): Promise<GroupingDecision>;\n}\n\nexport function pairKey(ids: readonly string[]): string {\n return JSON.stringify([...ids].sort());\n}\n\nexport function screeningPairSlot(index: number): string {\n return `pair-${index + 1}`;\n}\n\nexport function validateReview(\n value: unknown,\n findings: readonly Finding[],\n): DuplicateDecision {\n const result = reviewSchema.parse(value);\n if (result.decision !== \"SAME\") return result;\n const finding = requireFinding(result.mergedFinding);\n if (finding.findingId !== result.canonicalFindingId)\n throw new Error(\n \"Every SAME decision requires the canonical finding's identity.\",\n );\n if (\n !findings.some((finding) => finding.findingId === result.canonicalFindingId)\n ) {\n throw new Error(\n \"The canonical finding must belong to the assigned findings.\",\n );\n }\n return result;\n}\n\nexport function validateScreening(\n value: unknown,\n findings: readonly Finding[],\n): ScreeningResult {\n const result = screeningSchema.parse(value);\n const required = findings\n .slice(1)\n .map((_finding, index) => screeningPairSlot(index));\n const submitted = Object.keys(result.decisions);\n if (\n submitted.length !== required.length ||\n required.some((slot) => !Object.hasOwn(result.decisions, slot))\n ) {\n throw new Error(\"Submit exactly the assigned screening pair slots.\");\n }\n return result;\n}\n\nfunction screeningToolSchema(neighborCount: number): object {\n const slots = Object.fromEntries(\n Array.from({ length: neighborCount }, (_value, index) => [\n screeningPairSlot(index),\n screeningDecisionSchema,\n ]),\n );\n return z.toJSONSchema(z.strictObject({ decisions: z.strictObject(slots) }), {\n target: \"openapi-3.0\",\n override: ({ jsonSchema }) => {\n if (jsonSchema.type === \"object\") jsonSchema.required ??= [];\n },\n });\n}\n\nclass CodexReviewer {\n constructor(\n protected readonly runner: Pick<CodexReviewRunner, \"run\">,\n private readonly configuration: JsonObject = {},\n protected readonly sourceContext: (\n findings: readonly Finding[],\n ) => string = () => \"\",\n ) {}\n\n protected settings(model: string, effort: string) {\n const selected = scanModelConfiguration({\n model,\n model_reasoning_effort: effort,\n ...this.configuration,\n });\n return { model: selected.model, effort: selected.reasoningEffort };\n }\n async screen(findings: readonly Finding[]): Promise<ScreeningResult> {\n return await this.runner.run({\n stage: \"screening\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-luna\", \"xhigh\"),\n prompt: `${this.sourceContext(findings)}${screeningPrompt(findings)}`,\n schema: screeningToolSchema(findings.length - 1),\n validate: (value) => validateScreening(value, findings),\n });\n }\n}\n\n/** Rich review contract used by host-provided records consumers. */\nexport class CodexDeduplicationReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<DuplicateDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: pairReviewPrompt(findings),\n schema: {\n type: \"object\",\n ...z.toJSONSchema(reviewSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => validateReview(value, findings),\n });\n }\n}\n\n/** Saved-scan grouping stores original records and needs only a pair decision. */\nexport class CodexGroupingReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<GroupingDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: `${this.sourceContext(findings)}${groupingReviewPrompt(findings)}`,\n schema: {\n type: \"object\",\n ...z.toJSONSchema(screeningDecisionSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => screeningDecisionSchema.parse(value),\n });\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"deduplication-reviewer.js","sourceRoot":"","sources":["../../src/deduplication/deduplication-reviewer.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from \"zod\";\nimport { requireFinding } from \"./finding-schema.js\";\nimport type { Finding } from \"../models.js\";\nimport type { CodexReviewRunner } from \"./codex-review.js\";\nimport {\n pairReviewPrompt,\n groupingReviewPrompt,\n screeningPrompt,\n} from \"./deduplication-prompts.js\";\nimport { scanModelConfiguration, type JsonObject } from \"../config.js\";\n\nconst rationale = z.string().refine((value) => value.trim().length > 0);\nconst sameSchema = z.object({\n decision: z.literal(\"SAME\"),\n rationale,\n canonicalFindingId: z.string(),\n mergedFinding: z.record(z.string(), z.unknown()),\n});\nconst distinctSchema = z.object({\n decision: z.literal(\"DISTINCT\"),\n rationale,\n canonicalFindingId: z.null().optional(),\n mergedFinding: z.null().optional(),\n});\nconst reviewSchema = z.discriminatedUnion(\"decision\", [\n sameSchema,\n distinctSchema,\n]);\nconst screeningDecisionSchema = z.discriminatedUnion(\"decision\", [\n sameSchema.pick({ decision: true, rationale: true }).strict(),\n distinctSchema.pick({ decision: true, rationale: true }).strict(),\n]);\n// The host assigns exact slot names; finding IDs stay out of model output.\nconst screeningSchema = z.strictObject({\n decisions: z.record(z.string(), screeningDecisionSchema),\n});\n\nexport type ScreeningResult = z.infer<typeof screeningSchema>;\nexport type DuplicateDecision = z.infer<typeof reviewSchema>;\nexport type GroupingDecision = z.infer<typeof screeningDecisionSchema>;\n\nexport interface DeduplicationReviewer {\n screen(findings: readonly Finding[]): Promise<ScreeningResult>;\n reviewPair(findings: readonly Finding[]): Promise<GroupingDecision>;\n}\n\nexport function pairKey(ids: readonly string[]): string {\n return JSON.stringify([...ids].sort());\n}\n\nexport function screeningPairSlot(index: number): string {\n return `pair-${index + 1}`;\n}\n\nexport function validateReview(\n value: unknown,\n findings: readonly Finding[],\n): DuplicateDecision {\n const result = reviewSchema.parse(value);\n if (result.decision !== \"SAME\") return result;\n const finding = requireFinding(result.mergedFinding);\n if (finding.findingId !== result.canonicalFindingId)\n throw new Error(\n \"Every SAME decision requires the canonical finding's identity.\",\n );\n if (\n !findings.some((finding) => finding.findingId === result.canonicalFindingId)\n ) {\n throw new Error(\n \"The canonical finding must belong to the assigned findings.\",\n );\n }\n return result;\n}\n\nexport function validateScreening(\n value: unknown,\n findings: readonly Finding[],\n): ScreeningResult {\n const result = screeningSchema.parse(value);\n const required = findings\n .slice(1)\n .map((_finding, index) => screeningPairSlot(index));\n const submitted = Object.keys(result.decisions);\n if (\n submitted.length !== required.length ||\n required.some((slot) => !Object.hasOwn(result.decisions, slot))\n ) {\n throw new Error(\n `Submit exactly the assigned screening pair slots: ${required.join(\", \")}.`,\n );\n }\n return result;\n}\n\nfunction screeningToolSchema(neighborCount: number): object {\n const slots = Object.fromEntries(\n Array.from({ length: neighborCount }, (_value, index) => [\n screeningPairSlot(index),\n screeningDecisionSchema,\n ]),\n );\n return z.toJSONSchema(z.strictObject({ decisions: z.strictObject(slots) }), {\n target: \"openapi-3.0\",\n override: ({ jsonSchema }) => {\n if (jsonSchema.type === \"object\") jsonSchema.required ??= [];\n },\n });\n}\n\nclass CodexReviewer {\n constructor(\n protected readonly runner: Pick<CodexReviewRunner, \"run\">,\n private readonly configuration: JsonObject = {},\n protected readonly sourceContext: (\n findings: readonly Finding[],\n ) => string = () => \"\",\n ) {}\n\n protected settings(model: string, effort: string) {\n const selected = scanModelConfiguration({\n model,\n model_reasoning_effort: effort,\n ...this.configuration,\n });\n return { model: selected.model, effort: selected.reasoningEffort };\n }\n async screen(findings: readonly Finding[]): Promise<ScreeningResult> {\n return await this.runner.run({\n stage: \"screening\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-luna\", \"xhigh\"),\n prompt: `${this.sourceContext(findings)}${screeningPrompt(findings)}`,\n schema: screeningToolSchema(findings.length - 1),\n validate: (value) => validateScreening(value, findings),\n });\n }\n}\n\n/** Rich review contract used by host-provided records consumers. */\nexport class CodexDeduplicationReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<DuplicateDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: pairReviewPrompt(findings),\n schema: {\n type: \"object\",\n ...z.toJSONSchema(reviewSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => validateReview(value, findings),\n });\n }\n}\n\n/** Saved-scan grouping stores original records and needs only a pair decision. */\nexport class CodexGroupingReviewer\n extends CodexReviewer\n implements DeduplicationReviewer\n{\n async reviewPair(findings: readonly Finding[]): Promise<GroupingDecision> {\n return await this.runner.run({\n stage: \"pair-review\",\n findingIds: findings.map((finding) => finding.findingId),\n ...this.settings(\"gpt-5.6-sol\", \"high\"),\n prompt: `${this.sourceContext(findings)}${groupingReviewPrompt(findings)}`,\n schema: {\n type: \"object\",\n ...z.toJSONSchema(screeningDecisionSchema, { target: \"openapi-3.0\" }),\n },\n validate: (value) => screeningDecisionSchema.parse(value),\n });\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records-protocol.d.ts","sourceRoot":"","sources":["../../src/deduplication/records-protocol.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,
|
|
1
|
+
{"version":3,"file":"records-protocol.d.ts","sourceRoot":"","sources":["../../src/deduplication/records-protocol.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAA2B,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQ/E,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CA0DjB"}
|
|
@@ -1,35 +1,49 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { missingSubmissionPrompt } from "./deduplication-prompts.js";
|
|
4
|
-
import { runHostProtocol } from "../host-protocol.js";
|
|
5
|
-
import {
|
|
4
|
+
import { PendingReviewSubmission, runHostProtocol } from "../host-protocol.js";
|
|
5
|
+
import { runRecords } from "./records.js";
|
|
6
6
|
const missingSubmission = z.strictObject({
|
|
7
7
|
status: z.literal("missing_submission"),
|
|
8
8
|
});
|
|
9
|
+
const released = z.strictObject({ status: z.literal("released") });
|
|
9
10
|
export async function runRecordsProtocol(input, output, signal) {
|
|
10
11
|
return await runHostProtocol(input, output, {
|
|
11
12
|
label: "Deduplication",
|
|
12
13
|
requestMethod: "review.run",
|
|
13
|
-
run: (params, execute, signal) =>
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
14
|
+
run: (params, execute, signal) => runRecords(params, async (request, validateSubmission) => {
|
|
15
|
+
const first = await execute(request.requestId, {
|
|
16
|
+
...request,
|
|
17
|
+
supportsContinuation: true,
|
|
18
|
+
supportsSubmissionValidation: true,
|
|
19
|
+
});
|
|
20
|
+
let rejection;
|
|
21
|
+
if (first instanceof PendingReviewSubmission) {
|
|
22
|
+
try {
|
|
23
|
+
validateSubmission(first.submission);
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
rejection =
|
|
27
|
+
error instanceof Error
|
|
28
|
+
? error.message
|
|
29
|
+
: "Invalid submission.";
|
|
30
|
+
}
|
|
31
|
+
if (rejection === undefined) {
|
|
32
|
+
const receipt = await execute(randomUUID(), { requestId: request.requestId }, undefined, "review.release");
|
|
33
|
+
released.parse(receipt);
|
|
34
|
+
return first.submission;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else if (!missingSubmission.safeParse(first).success)
|
|
38
|
+
return first;
|
|
39
|
+
const result = await execute(randomUUID(), {
|
|
40
|
+
requestId: request.requestId,
|
|
41
|
+
prompt: missingSubmissionPrompt(rejection),
|
|
42
|
+
}, undefined, "review.continue");
|
|
43
|
+
if (missingSubmission.safeParse(result).success)
|
|
44
|
+
throw new Error("Review ended without a terminal submission after correction.");
|
|
45
|
+
return result;
|
|
46
|
+
}, signal),
|
|
33
47
|
}, signal);
|
|
34
48
|
}
|
|
35
49
|
//# sourceMappingURL=records-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records-protocol.js","sourceRoot":"","sources":["../../src/deduplication/records-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"records-protocol.js","sourceRoot":"","sources":["../../src/deduplication/records-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAgC,MAAM,cAAc,CAAC;AAExE,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC;IACvC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC;CACxC,CAAC,CAAC;AACH,MAAM,QAAQ,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAe,EACf,MAA6C,EAC7C,MAAoB;IAEpB,OAAO,MAAM,eAAe,CAC1B,KAAK,EACL,MAAM,EACN;QACE,KAAK,EAAE,eAAe;QACtB,aAAa,EAAE,YAAY;QAC3B,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAC/B,UAAU,CACR,MAAiC,EACjC,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC7C,GAAG,OAAO;gBACV,oBAAoB,EAAE,IAAI;gBAC1B,4BAA4B,EAAE,IAAI;aACnC,CAAC,CAAC;YACH,IAAI,SAA6B,CAAC;YAClC,IAAI,KAAK,YAAY,uBAAuB,EAAE,CAAC;gBAC7C,IAAI,CAAC;oBACH,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACvC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,SAAS;wBACP,KAAK,YAAY,KAAK;4BACpB,CAAC,CAAC,KAAK,CAAC,OAAO;4BACf,CAAC,CAAC,qBAAqB,CAAC;gBAC9B,CAAC;gBACD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5B,MAAM,OAAO,GAAG,MAAM,OAAO,CAC3B,UAAU,EAAE,EACZ,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,EAChC,SAAS,EACT,gBAAgB,CACjB,CAAC;oBACF,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACxB,OAAO,KAAK,CAAC,UAAU,CAAC;gBAC1B,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO;gBACpD,OAAO,KAAK,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,UAAU,EAAE,EACZ;gBACE,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,uBAAuB,CAAC,SAAS,CAAC;aAC3C,EACD,SAAS,EACT,iBAAiB,CAClB,CAAC;YACF,IAAI,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO;gBAC7C,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;YACJ,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,MAAM,CACP;KACJ,EACD,MAAM,CACP,CAAC;AACJ,CAAC","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport type { Readable } from \"node:stream\";\nimport { z } from \"zod\";\nimport { missingSubmissionPrompt } from \"./deduplication-prompts.js\";\nimport { PendingReviewSubmission, runHostProtocol } from \"../host-protocol.js\";\nimport { runRecords, type DeduplicateRecordsInput } from \"./records.js\";\n\nconst missingSubmission = z.strictObject({\n status: z.literal(\"missing_submission\"),\n});\nconst released = z.strictObject({ status: z.literal(\"released\") });\n\nexport async function runRecordsProtocol(\n input: Readable,\n output: Parameters<typeof runHostProtocol>[1],\n signal?: AbortSignal,\n): Promise<number> {\n return await runHostProtocol(\n input,\n output,\n {\n label: \"Deduplication\",\n requestMethod: \"review.run\",\n run: (params, execute, signal) =>\n runRecords(\n params as DeduplicateRecordsInput,\n async (request, validateSubmission) => {\n const first = await execute(request.requestId, {\n ...request,\n supportsContinuation: true,\n supportsSubmissionValidation: true,\n });\n let rejection: string | undefined;\n if (first instanceof PendingReviewSubmission) {\n try {\n validateSubmission(first.submission);\n } catch (error) {\n rejection =\n error instanceof Error\n ? error.message\n : \"Invalid submission.\";\n }\n if (rejection === undefined) {\n const receipt = await execute(\n randomUUID(),\n { requestId: request.requestId },\n undefined,\n \"review.release\",\n );\n released.parse(receipt);\n return first.submission;\n }\n } else if (!missingSubmission.safeParse(first).success)\n return first;\n const result = await execute(\n randomUUID(),\n {\n requestId: request.requestId,\n prompt: missingSubmissionPrompt(rejection),\n },\n undefined,\n \"review.continue\",\n );\n if (missingSubmission.safeParse(result).success)\n throw new Error(\n \"Review ended without a terminal submission after correction.\",\n );\n return result;\n },\n signal,\n ),\n },\n signal,\n );\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import type { DeduplicationReviewAttribution, DeduplicationReviewRunner } from "./review.js";
|
|
2
|
+
import type { DeduplicationReviewAttribution, DeduplicationReviewRequest, DeduplicationReviewRunner } from "./review.js";
|
|
3
3
|
export declare function recordsReviewAttribution(findingIds: readonly string[] | undefined, references: ReadonlyMap<string, string>, anchors: ReadonlyMap<string, readonly string[]>): DeduplicationReviewAttribution;
|
|
4
4
|
declare const deduplicateRecordsInputSchema: z.ZodObject<{
|
|
5
5
|
version: z.ZodLiteral<1>;
|
|
@@ -205,5 +205,7 @@ export interface DeduplicateRecordsResult {
|
|
|
205
205
|
}
|
|
206
206
|
/** Pure records workflow: no retrieval, local model execution, or persistence. */
|
|
207
207
|
export declare function deduplicateRecords(input: DeduplicateRecordsInput, options: DeduplicateRecordsOptions): Promise<DeduplicateRecordsResult>;
|
|
208
|
+
/** The records transport can check a pending submission before releasing its host. */
|
|
209
|
+
export declare function runRecords(input: DeduplicateRecordsInput, runReview: (request: DeduplicationReviewRequest, validate: (value: unknown) => void) => Promise<unknown>, signal?: AbortSignal): Promise<DeduplicateRecordsResult>;
|
|
208
210
|
export {};
|
|
209
211
|
//# sourceMappingURL=records.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB,OAAO,KAAK,EACV,8BAA8B,EAC9B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACzC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,GAC9C,8BAA8B,CAqBhC;AAQD,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBASjC,CAAC;AAEH,MAAM,WAAW,uBAAwB,SAAQ,CAAC,CAAC,KAAK,CACtD,OAAO,6BAA6B,CACrC;CAAG;AACJ,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,yBAAyB,CAAC;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AACD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;IACnC,MAAM,EAAE;QACN,2BAA2B,EAAE,MAAM,CAAC;QACpC,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,EAAE,CAAC;IACJ,UAAU,EAAE;QACV,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,eAAe,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;CACL;AAED,kFAAkF;AAClF,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC,CAqInC"}
|
|
1
|
+
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB,OAAO,KAAK,EACV,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACzC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,GAC9C,8BAA8B,CAqBhC;AAQD,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBASjC,CAAC;AAEH,MAAM,WAAW,uBAAwB,SAAQ,CAAC,CAAC,KAAK,CACtD,OAAO,6BAA6B,CACrC;CAAG;AACJ,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,yBAAyB,CAAC;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AACD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;IACnC,MAAM,EAAE;QACN,2BAA2B,EAAE,MAAM,CAAC;QACpC,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,EAAE,CAAC;IACJ,UAAU,EAAE;QACV,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,eAAe,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;CACL;AAED,kFAAkF;AAClF,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,wBAAwB,CAAC,CAMnC;AAED,sFAAsF;AACtF,wBAAsB,UAAU,CAC9B,KAAK,EAAE,uBAAuB,EAC9B,SAAS,EAAE,CACT,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,KAC/B,OAAO,CAAC,OAAO,CAAC,EACrB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,wBAAwB,CAAC,CAqInC"}
|
|
@@ -41,7 +41,11 @@ const deduplicateRecordsInputSchema = z.strictObject({
|
|
|
41
41
|
});
|
|
42
42
|
/** Pure records workflow: no retrieval, local model execution, or persistence. */
|
|
43
43
|
export async function deduplicateRecords(input, options) {
|
|
44
|
-
options.signal
|
|
44
|
+
return await runRecords(input, (request) => options.reviewRunner.run(request, { signal: options.signal }), options.signal);
|
|
45
|
+
}
|
|
46
|
+
/** The records transport can check a pending submission before releasing its host. */
|
|
47
|
+
export async function runRecords(input, runReview, signal) {
|
|
48
|
+
signal?.throwIfAborted();
|
|
45
49
|
// Snapshot before yielding: a host cannot mutate evidence during the review.
|
|
46
50
|
const data = deduplicateRecordsInputSchema.parse(structuredClone(input));
|
|
47
51
|
const references = new Map();
|
|
@@ -76,8 +80,8 @@ export async function deduplicateRecords(input, options) {
|
|
|
76
80
|
async run({ validate, findingIds, ...review }) {
|
|
77
81
|
try {
|
|
78
82
|
return await abortable(async () => {
|
|
79
|
-
|
|
80
|
-
return validate(await
|
|
83
|
+
signal?.throwIfAborted();
|
|
84
|
+
return validate(await runReview({
|
|
81
85
|
...review,
|
|
82
86
|
requestId: randomUUID(),
|
|
83
87
|
attribution: recordsReviewAttribution(findingIds, references, relationships),
|
|
@@ -91,8 +95,8 @@ export async function deduplicateRecords(input, options) {
|
|
|
91
95
|
: pairFindingFormatInstructions,
|
|
92
96
|
].join("\n\n"),
|
|
93
97
|
findingSchema: structuredClone(findingSchema()),
|
|
94
|
-
},
|
|
95
|
-
},
|
|
98
|
+
}, validate));
|
|
99
|
+
}, signal);
|
|
96
100
|
}
|
|
97
101
|
catch (error) {
|
|
98
102
|
// Records mode discards the batch after any failed review.
|
|
@@ -113,15 +117,15 @@ export async function deduplicateRecords(input, options) {
|
|
|
113
117
|
.map((id) => observations.get(id)),
|
|
114
118
|
};
|
|
115
119
|
},
|
|
116
|
-
}, reviewer,
|
|
120
|
+
}, reviewer, signal, 1);
|
|
117
121
|
let groups;
|
|
118
122
|
try {
|
|
119
123
|
const decisions = await algorithm.run(sourceFindingIds);
|
|
120
|
-
|
|
124
|
+
signal?.throwIfAborted();
|
|
121
125
|
groups = decisions.duplicateGroups;
|
|
122
126
|
}
|
|
123
127
|
catch (error) {
|
|
124
|
-
|
|
128
|
+
signal?.throwIfAborted();
|
|
125
129
|
result.status = "unresolved";
|
|
126
130
|
result.unresolved = [...relationships.keys()].map((id) => ({
|
|
127
131
|
observationId: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"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","sourcesContent":["import { hash, randomUUID } from \"node:crypto\";\nimport { z } from \"zod\";\nimport { DeduplicationReviewError } from \"../errors.js\";\nimport type { Finding } from \"../models.js\";\nimport { abortable } from \"../targets.js\";\nimport type { CodexReview } from \"./codex-review.js\";\nimport { FindingDeduplicator } from \"./deduplication.js\";\nimport { CodexDeduplicationReviewer } from \"./deduplication-reviewer.js\";\nimport { findingSchema, requireFinding } from \"./finding-schema.js\";\nimport {\n sourceReviewInstructions,\n screeningInstructions,\n pairReviewInstructions,\n screeningFindingFormatInstructions,\n pairFindingFormatInstructions,\n} from \"./deduplication-prompts.js\";\nimport type {\n DeduplicationReviewAttribution,\n DeduplicationReviewRunner,\n} from \"./review.js\";\n\nexport function recordsReviewAttribution(\n findingIds: readonly string[] | undefined,\n references: ReadonlyMap<string, string>,\n anchors: ReadonlyMap<string, readonly string[]>,\n): DeduplicationReviewAttribution {\n if (!findingIds?.length)\n throw new Error(\"Records review is missing its comparison participants.\");\n const participants = new Set(\n findingIds.map((findingId) => {\n const observationId = references.get(findingId);\n if (observationId === undefined)\n throw new Error(`Unknown records review finding ID: ${findingId}`);\n return observationId;\n }),\n );\n const beneficiaryObservationIds = [\n ...participants.intersection(anchors),\n ].sort();\n if (beneficiaryObservationIds.length === 0)\n throw new Error(\"Records review has no incoming observation participants.\");\n return {\n version: 1,\n beneficiaryObservationIds,\n contextObservationIds: [...participants.difference(anchors)].sort(),\n };\n}\n\nconst id = z.string().min(1);\nconst record = z.strictObject({\n id,\n finding: z.unknown().transform((value) => requireFinding(value)),\n});\n\nconst deduplicateRecordsInputSchema = z.strictObject({\n version: z.literal(1),\n observations: z.array(record),\n candidateRelationships: z.array(\n z.strictObject({\n observationId: id,\n candidateObservationIds: z.array(id),\n }),\n ),\n});\n\nexport interface DeduplicateRecordsInput extends z.infer<\n typeof deduplicateRecordsInputSchema\n> {}\nexport interface DeduplicateRecordsOptions {\n reviewRunner: DeduplicationReviewRunner;\n signal?: AbortSignal;\n}\nexport interface DeduplicateRecordsResult {\n version: 1;\n status: \"completed\" | \"unresolved\";\n groups: {\n representativeObservationId: string;\n observationIds: string[];\n }[];\n unresolved: {\n observationId: string;\n reason: \"review_failed\";\n message: string;\n }[];\n}\n\n/** Pure records workflow: no retrieval, local model execution, or persistence. */\nexport async function deduplicateRecords(\n input: DeduplicateRecordsInput,\n options: DeduplicateRecordsOptions,\n): Promise<DeduplicateRecordsResult> {\n options.signal?.throwIfAborted();\n // Snapshot before yielding: a host cannot mutate evidence during the review.\n const data = deduplicateRecordsInputSchema.parse(structuredClone(input));\n const references = new Map<string, string>();\n const observations = new Map<string, Finding>();\n for (const entry of data.observations) {\n if (observations.has(entry.id))\n throw new Error(`Duplicate observation ID: ${entry.id}`);\n // Original finding IDs can repeat across scans; host IDs identify observations.\n const findingId = `csf_${hash(\"sha256\", entry.id).slice(0, 24)}`;\n observations.set(entry.id, { ...entry.finding, findingId });\n references.set(findingId, entry.id);\n }\n const relationships = new Map<string, string[]>();\n for (const relation of data.candidateRelationships) {\n if (\n !observations.has(relation.observationId) ||\n relationships.has(relation.observationId)\n )\n throw new Error(\n \"Each candidate relationship must name a different supplied observation.\",\n );\n if (\n new Set(relation.candidateObservationIds).size !==\n relation.candidateObservationIds.length ||\n relation.candidateObservationIds.some(\n (id) => id === relation.observationId || !observations.has(id),\n )\n )\n throw new Error(\n \"Candidates must name distinct supplied observations other than the anchor.\",\n );\n relationships.set(relation.observationId, relation.candidateObservationIds);\n }\n const result: DeduplicateRecordsResult = {\n version: 1,\n status: \"completed\",\n groups: [],\n unresolved: [],\n };\n const sourceFindingIds = [...relationships.keys()].map(\n (id) => observations.get(id)!.findingId,\n );\n const reviewer = new CodexDeduplicationReviewer({\n async run<T>({\n validate,\n findingIds,\n ...review\n }: CodexReview<T>): Promise<T> {\n try {\n return await abortable(async () => {\n options.signal?.throwIfAborted();\n return validate(\n await options.reviewRunner.run(\n {\n ...review,\n requestId: randomUUID(),\n attribution: recordsReviewAttribution(\n findingIds,\n references,\n relationships,\n ),\n trustedInstructions: [\n sourceReviewInstructions,\n review.stage === \"screening\"\n ? screeningInstructions\n : pairReviewInstructions,\n review.stage === \"screening\"\n ? screeningFindingFormatInstructions\n : pairFindingFormatInstructions,\n ].join(\"\\n\\n\"),\n findingSchema: structuredClone(findingSchema()),\n },\n { signal: options.signal },\n ),\n );\n }, options.signal);\n } catch (error) {\n // Records mode discards the batch after any failed review.\n if (\n error instanceof DeduplicationReviewError &&\n error.metadata.category === \"refusal\"\n )\n throw new Error(error.message, { cause: error });\n throw error;\n }\n },\n });\n const algorithm = new FindingDeduplicator(\n {\n async potentialDuplicates(findingId) {\n const observationId = references.get(findingId)!;\n return {\n finding: observations.get(observationId)!,\n potentialDuplicates: relationships\n .get(observationId)!\n .map((id) => observations.get(id)!),\n };\n },\n },\n reviewer,\n options.signal,\n 1,\n );\n let groups: string[][];\n try {\n const decisions = await algorithm.run(sourceFindingIds);\n options.signal?.throwIfAborted();\n groups = decisions.duplicateGroups;\n } catch (error) {\n options.signal?.throwIfAborted();\n result.status = \"unresolved\";\n result.unresolved = [...relationships.keys()].map((id) => ({\n observationId: id,\n reason: \"review_failed\",\n message:\n error instanceof Error ? error.message : \"Review did not complete.\",\n }));\n return result;\n }\n const grouped = new Set(groups.flat());\n groups.push(\n ...sourceFindingIds.filter((id) => !grouped.has(id)).map((id) => [id]),\n );\n for (const group of groups) {\n const observationIds = group.map((id) => references.get(id)!);\n result.groups.push({\n representativeObservationId: observationIds[0]!,\n observationIds,\n });\n }\n return result;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/deduplication/records.ts"],"names":[],"mappings":"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","sourcesContent":["import { hash, randomUUID } from \"node:crypto\";\nimport { z } from \"zod\";\nimport { DeduplicationReviewError } from \"../errors.js\";\nimport type { Finding } from \"../models.js\";\nimport { abortable } from \"../targets.js\";\nimport type { CodexReview } from \"./codex-review.js\";\nimport { FindingDeduplicator } from \"./deduplication.js\";\nimport { CodexDeduplicationReviewer } from \"./deduplication-reviewer.js\";\nimport { findingSchema, requireFinding } from \"./finding-schema.js\";\nimport {\n sourceReviewInstructions,\n screeningInstructions,\n pairReviewInstructions,\n screeningFindingFormatInstructions,\n pairFindingFormatInstructions,\n} from \"./deduplication-prompts.js\";\nimport type {\n DeduplicationReviewAttribution,\n DeduplicationReviewRequest,\n DeduplicationReviewRunner,\n} from \"./review.js\";\n\nexport function recordsReviewAttribution(\n findingIds: readonly string[] | undefined,\n references: ReadonlyMap<string, string>,\n anchors: ReadonlyMap<string, readonly string[]>,\n): DeduplicationReviewAttribution {\n if (!findingIds?.length)\n throw new Error(\"Records review is missing its comparison participants.\");\n const participants = new Set(\n findingIds.map((findingId) => {\n const observationId = references.get(findingId);\n if (observationId === undefined)\n throw new Error(`Unknown records review finding ID: ${findingId}`);\n return observationId;\n }),\n );\n const beneficiaryObservationIds = [\n ...participants.intersection(anchors),\n ].sort();\n if (beneficiaryObservationIds.length === 0)\n throw new Error(\"Records review has no incoming observation participants.\");\n return {\n version: 1,\n beneficiaryObservationIds,\n contextObservationIds: [...participants.difference(anchors)].sort(),\n };\n}\n\nconst id = z.string().min(1);\nconst record = z.strictObject({\n id,\n finding: z.unknown().transform((value) => requireFinding(value)),\n});\n\nconst deduplicateRecordsInputSchema = z.strictObject({\n version: z.literal(1),\n observations: z.array(record),\n candidateRelationships: z.array(\n z.strictObject({\n observationId: id,\n candidateObservationIds: z.array(id),\n }),\n ),\n});\n\nexport interface DeduplicateRecordsInput extends z.infer<\n typeof deduplicateRecordsInputSchema\n> {}\nexport interface DeduplicateRecordsOptions {\n reviewRunner: DeduplicationReviewRunner;\n signal?: AbortSignal;\n}\nexport interface DeduplicateRecordsResult {\n version: 1;\n status: \"completed\" | \"unresolved\";\n groups: {\n representativeObservationId: string;\n observationIds: string[];\n }[];\n unresolved: {\n observationId: string;\n reason: \"review_failed\";\n message: string;\n }[];\n}\n\n/** Pure records workflow: no retrieval, local model execution, or persistence. */\nexport async function deduplicateRecords(\n input: DeduplicateRecordsInput,\n options: DeduplicateRecordsOptions,\n): Promise<DeduplicateRecordsResult> {\n return await runRecords(\n input,\n (request) => options.reviewRunner.run(request, { signal: options.signal }),\n options.signal,\n );\n}\n\n/** The records transport can check a pending submission before releasing its host. */\nexport async function runRecords(\n input: DeduplicateRecordsInput,\n runReview: (\n request: DeduplicationReviewRequest,\n validate: (value: unknown) => void,\n ) => Promise<unknown>,\n signal?: AbortSignal,\n): Promise<DeduplicateRecordsResult> {\n signal?.throwIfAborted();\n // Snapshot before yielding: a host cannot mutate evidence during the review.\n const data = deduplicateRecordsInputSchema.parse(structuredClone(input));\n const references = new Map<string, string>();\n const observations = new Map<string, Finding>();\n for (const entry of data.observations) {\n if (observations.has(entry.id))\n throw new Error(`Duplicate observation ID: ${entry.id}`);\n // Original finding IDs can repeat across scans; host IDs identify observations.\n const findingId = `csf_${hash(\"sha256\", entry.id).slice(0, 24)}`;\n observations.set(entry.id, { ...entry.finding, findingId });\n references.set(findingId, entry.id);\n }\n const relationships = new Map<string, string[]>();\n for (const relation of data.candidateRelationships) {\n if (\n !observations.has(relation.observationId) ||\n relationships.has(relation.observationId)\n )\n throw new Error(\n \"Each candidate relationship must name a different supplied observation.\",\n );\n if (\n new Set(relation.candidateObservationIds).size !==\n relation.candidateObservationIds.length ||\n relation.candidateObservationIds.some(\n (id) => id === relation.observationId || !observations.has(id),\n )\n )\n throw new Error(\n \"Candidates must name distinct supplied observations other than the anchor.\",\n );\n relationships.set(relation.observationId, relation.candidateObservationIds);\n }\n const result: DeduplicateRecordsResult = {\n version: 1,\n status: \"completed\",\n groups: [],\n unresolved: [],\n };\n const sourceFindingIds = [...relationships.keys()].map(\n (id) => observations.get(id)!.findingId,\n );\n const reviewer = new CodexDeduplicationReviewer({\n async run<T>({\n validate,\n findingIds,\n ...review\n }: CodexReview<T>): Promise<T> {\n try {\n return await abortable(async () => {\n signal?.throwIfAborted();\n return validate(\n await runReview(\n {\n ...review,\n requestId: randomUUID(),\n attribution: recordsReviewAttribution(\n findingIds,\n references,\n relationships,\n ),\n trustedInstructions: [\n sourceReviewInstructions,\n review.stage === \"screening\"\n ? screeningInstructions\n : pairReviewInstructions,\n review.stage === \"screening\"\n ? screeningFindingFormatInstructions\n : pairFindingFormatInstructions,\n ].join(\"\\n\\n\"),\n findingSchema: structuredClone(findingSchema()),\n },\n validate,\n ),\n );\n }, signal);\n } catch (error) {\n // Records mode discards the batch after any failed review.\n if (\n error instanceof DeduplicationReviewError &&\n error.metadata.category === \"refusal\"\n )\n throw new Error(error.message, { cause: error });\n throw error;\n }\n },\n });\n const algorithm = new FindingDeduplicator(\n {\n async potentialDuplicates(findingId) {\n const observationId = references.get(findingId)!;\n return {\n finding: observations.get(observationId)!,\n potentialDuplicates: relationships\n .get(observationId)!\n .map((id) => observations.get(id)!),\n };\n },\n },\n reviewer,\n signal,\n 1,\n );\n let groups: string[][];\n try {\n const decisions = await algorithm.run(sourceFindingIds);\n signal?.throwIfAborted();\n groups = decisions.duplicateGroups;\n } catch (error) {\n signal?.throwIfAborted();\n result.status = \"unresolved\";\n result.unresolved = [...relationships.keys()].map((id) => ({\n observationId: id,\n reason: \"review_failed\",\n message:\n error instanceof Error ? error.message : \"Review did not complete.\",\n }));\n return result;\n }\n const grouped = new Set(groups.flat());\n groups.push(\n ...sourceFindingIds.filter((id) => !grouped.has(id)).map((id) => [id]),\n );\n for (const group of groups) {\n const observationIds = group.map((id) => references.get(id)!);\n result.groups.push({\n representativeObservationId: observationIds[0]!,\n observationIds,\n });\n }\n return result;\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endor-findings.d.ts","sourceRoot":"","sources":["../src/endor-findings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"endor-findings.d.ts","sourceRoot":"","sources":["../src/endor-findings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAgC/D,kFAAkF;AAClF,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,MAAM,GAAE,oBAA8B,GACrC,gBAAgB,CA8IlB;AAED,yFAAyF;AACzF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,OAAO,EACd,MAAM,GAAE,oBAA8B,GACrC,gBAAgB,CAiKlB;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,oBAA8B,GACrC,OAAO,CAAC,gBAAgB,CAAC,CAE3B"}
|
package/dist/endor-findings.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { validateExternalEvidence } from "./external-import-contract.js";
|
|
2
2
|
import { isRecord } from "./record.js";
|
|
3
|
-
import { array, hasSarifExternalPropertyReferences, normalizeRecords, readScannerJson, record, relativePath, requiredText, sarifRunContextForResult, strings, text, } from "./scanner-import.js";
|
|
3
|
+
import { array, hasSarifExternalPropertyReferences, indexSarifRules, normalizeRecords, readScannerJson, record, relativePath, requiredText, sarifRunContextForResult, strings, text, } from "./scanner-import.js";
|
|
4
4
|
/** @internal Repository claims retained in the adapter's original SARIF context. */
|
|
5
5
|
export function endorRepositoryUrls(sourceData) {
|
|
6
6
|
if (!isRecord(sourceData))
|
|
@@ -29,7 +29,7 @@ export function normalizeEndorFindings(input, target = "cloud") {
|
|
|
29
29
|
: Array.isArray(input)
|
|
30
30
|
? input
|
|
31
31
|
: [input];
|
|
32
|
-
return normalizeRecords(values, (value
|
|
32
|
+
return normalizeRecords(values, (value) => {
|
|
33
33
|
const finding = record(value, "Endor finding");
|
|
34
34
|
const meta = record(finding["meta"], "Endor meta");
|
|
35
35
|
const spec = record(finding["spec"], "Endor spec");
|
|
@@ -86,31 +86,26 @@ export function normalizeEndorFindings(input, target = "cloud") {
|
|
|
86
86
|
: [];
|
|
87
87
|
const context = record(finding["context"] ?? {}, "Endor context");
|
|
88
88
|
const updated = text(meta["update_time"]);
|
|
89
|
-
return {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
]
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
packages,
|
|
110
|
-
locations,
|
|
111
|
-
source_data: structuredClone(finding),
|
|
112
|
-
}, target),
|
|
113
|
-
};
|
|
89
|
+
return validateExternalEvidence({
|
|
90
|
+
title: requiredText(meta["name"], "Endor finding title"),
|
|
91
|
+
description: [
|
|
92
|
+
text(spec["summary"]),
|
|
93
|
+
text(spec["explanation"]),
|
|
94
|
+
text(spec["remediation"]),
|
|
95
|
+
]
|
|
96
|
+
.filter(Boolean)
|
|
97
|
+
.join("\n\n") || text(meta["description"]),
|
|
98
|
+
severity,
|
|
99
|
+
branch: context["type"] === "CONTEXT_TYPE_REF" ? text(context["id"]) : null,
|
|
100
|
+
code_revision: text(record(spec["source_code_version"] ?? {}, "Endor source code version")["sha"]),
|
|
101
|
+
source_updated_at: updated === null ? null : Math.floor(Date.parse(updated) / 1000),
|
|
102
|
+
advisory_ids: [
|
|
103
|
+
...new Set([...(advisory ? [advisory] : []), ...aliases]),
|
|
104
|
+
],
|
|
105
|
+
packages,
|
|
106
|
+
locations,
|
|
107
|
+
source_data: structuredClone(finding),
|
|
108
|
+
}, target);
|
|
114
109
|
}, (value) => requiredText(record(value, "Endor finding")["uuid"], "Endor finding uuid"), target);
|
|
115
110
|
}
|
|
116
111
|
/** Endor's documented SARIF producer uses properties.finding-uuid, not its rule name. */
|
|
@@ -127,11 +122,7 @@ export function normalizeEndorSarif(input, target = "cloud") {
|
|
|
127
122
|
if (hasSarifExternalPropertyReferences(run["externalPropertyFileReferences"]))
|
|
128
123
|
throw new Error("Use a self-contained Endor SARIF report.");
|
|
129
124
|
const rules = array(driver["rules"] ?? [], "Endor rules").map((r) => record(r, "Endor rule"));
|
|
130
|
-
const rulesById =
|
|
131
|
-
for (const [index, rule] of rules.entries()) {
|
|
132
|
-
const id = rule["id"];
|
|
133
|
-
rulesById.set(id, rulesById.has(id) ? null : { rule, index });
|
|
134
|
-
}
|
|
125
|
+
const rulesById = indexSarifRules(rules);
|
|
135
126
|
const { runs: _runs, ...documentContext } = document;
|
|
136
127
|
const { results: _results, tool: _tool, ...runContext } = run;
|
|
137
128
|
const { rules: _rules, ...driverContext } = driver;
|
|
@@ -145,7 +136,7 @@ export function normalizeEndorSarif(input, target = "cloud") {
|
|
|
145
136
|
toolContext,
|
|
146
137
|
}));
|
|
147
138
|
});
|
|
148
|
-
return normalizeRecords(entries, ({ result: value, rulesById, ...context }
|
|
139
|
+
return normalizeRecords(entries, ({ result: value, rulesById, ...context }) => {
|
|
149
140
|
const result = record(value, "Endor result");
|
|
150
141
|
const properties = record(result["properties"], "Endor result properties");
|
|
151
142
|
requiredText(properties["project-uuid"], "Endor project-uuid");
|
|
@@ -202,34 +193,28 @@ export function normalizeEndorSarif(input, target = "cloud") {
|
|
|
202
193
|
},
|
|
203
194
|
];
|
|
204
195
|
});
|
|
205
|
-
return {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
runContext: sarifRunContextForResult(context.runContext, result, rule, context.documentContext, context.driverContext, context.toolContext),
|
|
228
|
-
rule,
|
|
229
|
-
result,
|
|
230
|
-
}),
|
|
231
|
-
}, target),
|
|
232
|
-
};
|
|
196
|
+
return validateExternalEvidence({
|
|
197
|
+
title: text(short["text"]) ?? text(rule["name"]) ?? ruleId,
|
|
198
|
+
url: text(properties["finding-url"]),
|
|
199
|
+
description: [
|
|
200
|
+
text(message["markdown"]) ?? text(message["text"]),
|
|
201
|
+
text(full["text"]),
|
|
202
|
+
text(help["markdown"]) ?? text(help["text"]),
|
|
203
|
+
]
|
|
204
|
+
.filter(Boolean)
|
|
205
|
+
.join("\n\n"),
|
|
206
|
+
// Diagnostic level and CVSS are not Endor's finding severity. Keep both as source evidence.
|
|
207
|
+
severity: "unknown",
|
|
208
|
+
locations: [
|
|
209
|
+
...new Map(locations.map((location) => [JSON.stringify(location), location])).values(),
|
|
210
|
+
],
|
|
211
|
+
source_data: structuredClone({
|
|
212
|
+
...context,
|
|
213
|
+
runContext: sarifRunContextForResult(context.runContext, result, rule, context.documentContext, context.driverContext, context.toolContext),
|
|
214
|
+
rule,
|
|
215
|
+
result,
|
|
216
|
+
}),
|
|
217
|
+
}, target);
|
|
233
218
|
}, ({ result }) => requiredText(record(record(result, "Endor result")["properties"], "Endor result properties")["finding-uuid"], "Endor finding-uuid"), target);
|
|
234
219
|
}
|
|
235
220
|
export async function readEndorFindings(path, target = "cloud") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endor-findings.js","sourceRoot":"","sources":["../src/endor-findings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalImportTarget } from \"./external-import-contract.js\";\nimport { validateExternalEvidence } from \"./external-import-contract.js\";\nimport type { ExternalFindings } from \"./external-findings.js\";\nimport { isRecord } from \"./record.js\";\nimport {\n array,\n hasSarifExternalPropertyReferences,\n normalizeRecords,\n readScannerJson,\n record,\n relativePath,\n requiredText,\n sarifRunContextForResult,\n strings,\n text,\n} from \"./scanner-import.js\";\n\n/** @internal Repository claims retained in the adapter's original SARIF context. */\nexport function endorRepositoryUrls(sourceData: unknown): string[] {\n if (!isRecord(sourceData)) return [];\n const run = sourceData[\"runContext\"];\n if (run == null) return [];\n return array(\n record(run, \"Endor run context\")[\"versionControlProvenance\"] ?? [],\n \"Endor version control provenance\",\n ).map((entry) =>\n requiredText(\n record(entry, \"Endor repository provenance\")[\"repositoryUri\"],\n \"Endor repository URI\",\n ),\n );\n}\n\n/** Saved Endor Finding objects, an array, or an unmasked ListFindingsResponse. */\nexport function normalizeEndorFindings(\n input: unknown,\n target: ExternalImportTarget = \"cloud\",\n): ExternalFindings {\n const root = Array.isArray(input) ? null : record(input, \"Endor report\");\n if (root?.[\"version\"] === \"2.1.0\" && root[\"runs\"] !== undefined)\n return normalizeEndorSarif(root, target);\n const list =\n root?.[\"list\"] === undefined ? null : record(root[\"list\"], \"Endor list\");\n if (list) {\n const response = record(list[\"response\"] ?? {}, \"Endor list response\");\n const token = response[\"next_page_token\"];\n if (\n text(response[\"next_page_id\"]) ||\n (token != null && token !== 0 && token !== \"0\" && token !== \"\")\n ) {\n throw new Error(\n \"The Endor list response has another page. Supply a complete export or an explicitly selected array.\",\n );\n }\n }\n const values = list\n ? array(list[\"objects\"] ?? [], \"Endor list.objects\")\n : Array.isArray(input)\n ? input\n : [input];\n return normalizeRecords(\n values,\n (value, id) => {\n const finding = record(value, \"Endor finding\");\n const meta = record(finding[\"meta\"], \"Endor meta\");\n const spec = record(finding[\"spec\"], \"Endor spec\");\n requiredText(spec[\"project_uuid\"], \"Endor project_uuid\");\n const name = text(spec[\"target_dependency_name\"]);\n const paths = [\n ...new Set(\n strings(spec[\"dependency_file_paths\"])\n .map(relativePath)\n .filter((p): p is string => p !== null),\n ),\n ];\n const metadata = record(\n spec[\"finding_metadata\"] ?? {},\n \"Endor finding_metadata\",\n );\n const codeLocations = [\"sast_data\", \"ai_sast_data\"].flatMap((field) => {\n const data = record(metadata[field] ?? {}, `Endor ${field}`);\n const location = record(\n data[\"location\"] ?? {},\n `Endor ${field} location`,\n );\n const path = relativePath(location[\"relative_path\"]);\n if (path === null) return [];\n const line = location[\"start_line\"];\n return [\n {\n path,\n line:\n typeof line === \"number\" && Number.isSafeInteger(line) && line > 0\n ? line\n : null,\n },\n ];\n });\n const locations = [\n ...paths\n .filter(\n (path) => !codeLocations.some((location) => location.path === path),\n )\n .map((path) => ({ path })),\n ...new Map(\n codeLocations.map((location) => [JSON.stringify(location), location]),\n ).values(),\n ];\n const vulnerability = record(\n metadata[\"vulnerability\"] ?? {},\n \"Endor vulnerability\",\n );\n const advisory = text(\n record(vulnerability[\"meta\"] ?? {}, \"Vulnerability meta\")[\"name\"],\n );\n const aliases = strings(\n record(vulnerability[\"spec\"] ?? {}, \"Vulnerability spec\")[\"aliases\"],\n );\n const level = text(spec[\"level\"])\n ?.replace(/^FINDING_LEVEL_/u, \"\")\n .toLowerCase();\n const severity =\n level && [\"critical\", \"high\", \"medium\", \"low\"].includes(level)\n ? level\n : \"unknown\";\n // A recommended version can refer to an introducing dependency; retain it in source_data.\n const packages = name\n ? (paths.length ? paths : [null]).map((path) => ({\n name,\n ecosystem:\n text(spec[\"ecosystem\"])\n ?.replace(/^ECOSYSTEM_/u, \"\")\n .toLowerCase() ?? null,\n installed_version: text(spec[\"target_dependency_version\"]),\n manifest_path: path,\n fixed_versions: [],\n }))\n : [];\n const context = record(finding[\"context\"] ?? {}, \"Endor context\");\n const updated = text(meta[\"update_time\"]);\n return {\n source_finding_id: id,\n evidence: validateExternalEvidence(\n {\n title: requiredText(meta[\"name\"], \"Endor finding title\"),\n description:\n [\n text(spec[\"summary\"]),\n text(spec[\"explanation\"]),\n text(spec[\"remediation\"]),\n ]\n .filter(Boolean)\n .join(\"\\n\\n\") || text(meta[\"description\"]),\n severity,\n branch:\n context[\"type\"] === \"CONTEXT_TYPE_REF\"\n ? text(context[\"id\"])\n : null,\n code_revision: text(\n record(\n spec[\"source_code_version\"] ?? {},\n \"Endor source code version\",\n )[\"sha\"],\n ),\n source_updated_at:\n updated === null ? null : Math.floor(Date.parse(updated) / 1000),\n advisory_ids: [\n ...new Set([...(advisory ? [advisory] : []), ...aliases]),\n ],\n packages,\n locations,\n source_data: structuredClone(finding),\n },\n target,\n ),\n };\n },\n (value) =>\n requiredText(\n record(value, \"Endor finding\")[\"uuid\"],\n \"Endor finding uuid\",\n ),\n target,\n );\n}\n\n/** Endor's documented SARIF producer uses properties.finding-uuid, not its rule name. */\nexport function normalizeEndorSarif(\n input: unknown,\n target: ExternalImportTarget = \"cloud\",\n): ExternalFindings {\n const document = record(input, \"Endor SARIF\");\n if (document[\"version\"] !== \"2.1.0\")\n throw new Error(\"Expected Endor SARIF 2.1.0.\");\n const entries = array(document[\"runs\"], \"SARIF runs\").flatMap((value) => {\n const run = record(value, \"SARIF run\");\n const tool = record(run[\"tool\"], \"SARIF tool\");\n const driver = record(tool[\"driver\"], \"SARIF driver\");\n if (driver[\"name\"] !== \"endorctl\")\n throw new Error(\"Expected the endorctl SARIF producer.\");\n if (\n hasSarifExternalPropertyReferences(run[\"externalPropertyFileReferences\"])\n )\n throw new Error(\"Use a self-contained Endor SARIF report.\");\n const rules = array(driver[\"rules\"] ?? [], \"Endor rules\").map((r) =>\n record(r, \"Endor rule\"),\n );\n const rulesById = new Map<\n unknown,\n { rule: Record<string, unknown>; index: number } | null\n >();\n for (const [index, rule] of rules.entries()) {\n const id = rule[\"id\"];\n rulesById.set(id, rulesById.has(id) ? null : { rule, index });\n }\n const { runs: _runs, ...documentContext } = document;\n const { results: _results, tool: _tool, ...runContext } = run;\n const { rules: _rules, ...driverContext } = driver;\n const { driver: _driver, ...toolContext } = tool;\n return array(run[\"results\"] ?? [], \"Endor results\").map((result) => ({\n result,\n rulesById,\n documentContext,\n runContext,\n driverContext,\n toolContext,\n }));\n });\n return normalizeRecords(\n entries,\n ({ result: value, rulesById, ...context }, id) => {\n const result = record(value, \"Endor result\");\n const properties = record(\n result[\"properties\"],\n \"Endor result properties\",\n );\n requiredText(properties[\"project-uuid\"], \"Endor project-uuid\");\n const ruleId = requiredText(result[\"ruleId\"], \"Endor ruleId\");\n const selectedRule = rulesById.get(ruleId);\n if (!selectedRule)\n throw new Error(\n \"Endor result must reference exactly one rule in its run.\",\n );\n const { rule, index: ruleIndex } = selectedRule;\n if (\n result[\"ruleIndex\"] !== undefined &&\n result[\"ruleIndex\"] !== ruleIndex\n )\n throw new Error(\"Endor ruleIndex and ruleId disagree.\");\n if (result[\"rule\"] !== undefined) {\n const reference = record(result[\"rule\"], \"Endor rule reference\");\n if (\n reference[\"toolComponent\"] !== undefined ||\n (reference[\"id\"] !== undefined && reference[\"id\"] !== ruleId) ||\n (reference[\"index\"] !== undefined &&\n reference[\"index\"] !== ruleIndex) ||\n (reference[\"guid\"] !== undefined &&\n reference[\"guid\"] !== rule[\"guid\"])\n )\n throw new Error(\"Inconsistent or external Endor rule reference.\");\n }\n const message = record(result[\"message\"], \"Endor message\");\n const short = record(\n rule[\"shortDescription\"] ?? {},\n \"Endor shortDescription\",\n );\n const full = record(\n rule[\"fullDescription\"] ?? {},\n \"Endor fullDescription\",\n );\n const help = record(rule[\"help\"] ?? {}, \"Endor help\");\n const hasCodeLocations = strings(properties[\"categories\"]).some(\n (category) => category === \"SAST\" || category === \"SECRETS\",\n );\n const locations = array(\n result[\"locations\"] ?? [],\n \"Endor locations\",\n ).flatMap((v) => {\n const physical = record(\n record(v, \"Endor location\")[\"physicalLocation\"] ?? {},\n \"Physical location\",\n );\n const artifact = record(\n physical[\"artifactLocation\"] ?? {},\n \"Artifact location\",\n );\n if (\n artifact[\"index\"] !== undefined ||\n artifact[\"uriBaseId\"] !== undefined\n )\n return [];\n const uri = text(artifact[\"uri\"]);\n if (uri === null || /^[A-Za-z][A-Za-z0-9+.-]*:/u.test(uri)) return [];\n let path: string | null;\n try {\n path = relativePath(decodeURIComponent(uri));\n } catch {\n return [];\n }\n if (path === null) return [];\n const line = hasCodeLocations\n ? record(physical[\"region\"] ?? {}, \"Endor region\")[\"startLine\"]\n : null;\n return [\n {\n path,\n line:\n typeof line === \"number\" && Number.isSafeInteger(line) && line > 0\n ? line\n : null,\n },\n ];\n });\n return {\n source_finding_id: id,\n evidence: validateExternalEvidence(\n {\n title: text(short[\"text\"]) ?? text(rule[\"name\"]) ?? ruleId,\n url: text(properties[\"finding-url\"]),\n description: [\n text(message[\"markdown\"]) ?? text(message[\"text\"]),\n text(full[\"text\"]),\n text(help[\"markdown\"]) ?? text(help[\"text\"]),\n ]\n .filter(Boolean)\n .join(\"\\n\\n\"),\n // Diagnostic level and CVSS are not Endor's finding severity. Keep both as source evidence.\n severity: \"unknown\",\n locations: [\n ...new Map(\n locations.map((location) => [\n JSON.stringify(location),\n location,\n ]),\n ).values(),\n ],\n source_data: structuredClone({\n ...context,\n runContext: sarifRunContextForResult(\n context.runContext,\n result,\n rule,\n context.documentContext,\n context.driverContext,\n context.toolContext,\n ),\n rule,\n result,\n }),\n },\n target,\n ),\n };\n },\n ({ result }) =>\n requiredText(\n record(\n record(result, \"Endor result\")[\"properties\"],\n \"Endor result properties\",\n )[\"finding-uuid\"],\n \"Endor finding-uuid\",\n ),\n target,\n );\n}\n\nexport async function readEndorFindings(\n path: string,\n target: ExternalImportTarget = \"cloud\",\n): Promise<ExternalFindings> {\n return normalizeEndorFindings(await readScannerJson(path), target);\n}\n"]}
|
|
1
|
+
{"version":3,"file":"endor-findings.js","sourceRoot":"","sources":["../src/endor-findings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalImportTarget } from \"./external-import-contract.js\";\nimport { validateExternalEvidence } from \"./external-import-contract.js\";\nimport type { ExternalFindings } from \"./external-findings.js\";\nimport { isRecord } from \"./record.js\";\nimport {\n array,\n hasSarifExternalPropertyReferences,\n indexSarifRules,\n normalizeRecords,\n readScannerJson,\n record,\n relativePath,\n requiredText,\n sarifRunContextForResult,\n strings,\n text,\n} from \"./scanner-import.js\";\n\n/** @internal Repository claims retained in the adapter's original SARIF context. */\nexport function endorRepositoryUrls(sourceData: unknown): string[] {\n if (!isRecord(sourceData)) return [];\n const run = sourceData[\"runContext\"];\n if (run == null) return [];\n return array(\n record(run, \"Endor run context\")[\"versionControlProvenance\"] ?? [],\n \"Endor version control provenance\",\n ).map((entry) =>\n requiredText(\n record(entry, \"Endor repository provenance\")[\"repositoryUri\"],\n \"Endor repository URI\",\n ),\n );\n}\n\n/** Saved Endor Finding objects, an array, or an unmasked ListFindingsResponse. */\nexport function normalizeEndorFindings(\n input: unknown,\n target: ExternalImportTarget = \"cloud\",\n): ExternalFindings {\n const root = Array.isArray(input) ? null : record(input, \"Endor report\");\n if (root?.[\"version\"] === \"2.1.0\" && root[\"runs\"] !== undefined)\n return normalizeEndorSarif(root, target);\n const list =\n root?.[\"list\"] === undefined ? null : record(root[\"list\"], \"Endor list\");\n if (list) {\n const response = record(list[\"response\"] ?? {}, \"Endor list response\");\n const token = response[\"next_page_token\"];\n if (\n text(response[\"next_page_id\"]) ||\n (token != null && token !== 0 && token !== \"0\" && token !== \"\")\n ) {\n throw new Error(\n \"The Endor list response has another page. Supply a complete export or an explicitly selected array.\",\n );\n }\n }\n const values = list\n ? array(list[\"objects\"] ?? [], \"Endor list.objects\")\n : Array.isArray(input)\n ? input\n : [input];\n return normalizeRecords(\n values,\n (value) => {\n const finding = record(value, \"Endor finding\");\n const meta = record(finding[\"meta\"], \"Endor meta\");\n const spec = record(finding[\"spec\"], \"Endor spec\");\n requiredText(spec[\"project_uuid\"], \"Endor project_uuid\");\n const name = text(spec[\"target_dependency_name\"]);\n const paths = [\n ...new Set(\n strings(spec[\"dependency_file_paths\"])\n .map(relativePath)\n .filter((p): p is string => p !== null),\n ),\n ];\n const metadata = record(\n spec[\"finding_metadata\"] ?? {},\n \"Endor finding_metadata\",\n );\n const codeLocations = [\"sast_data\", \"ai_sast_data\"].flatMap((field) => {\n const data = record(metadata[field] ?? {}, `Endor ${field}`);\n const location = record(\n data[\"location\"] ?? {},\n `Endor ${field} location`,\n );\n const path = relativePath(location[\"relative_path\"]);\n if (path === null) return [];\n const line = location[\"start_line\"];\n return [\n {\n path,\n line:\n typeof line === \"number\" && Number.isSafeInteger(line) && line > 0\n ? line\n : null,\n },\n ];\n });\n const locations = [\n ...paths\n .filter(\n (path) => !codeLocations.some((location) => location.path === path),\n )\n .map((path) => ({ path })),\n ...new Map(\n codeLocations.map((location) => [JSON.stringify(location), location]),\n ).values(),\n ];\n const vulnerability = record(\n metadata[\"vulnerability\"] ?? {},\n \"Endor vulnerability\",\n );\n const advisory = text(\n record(vulnerability[\"meta\"] ?? {}, \"Vulnerability meta\")[\"name\"],\n );\n const aliases = strings(\n record(vulnerability[\"spec\"] ?? {}, \"Vulnerability spec\")[\"aliases\"],\n );\n const level = text(spec[\"level\"])\n ?.replace(/^FINDING_LEVEL_/u, \"\")\n .toLowerCase();\n const severity =\n level && [\"critical\", \"high\", \"medium\", \"low\"].includes(level)\n ? level\n : \"unknown\";\n // A recommended version can refer to an introducing dependency; retain it in source_data.\n const packages = name\n ? (paths.length ? paths : [null]).map((path) => ({\n name,\n ecosystem:\n text(spec[\"ecosystem\"])\n ?.replace(/^ECOSYSTEM_/u, \"\")\n .toLowerCase() ?? null,\n installed_version: text(spec[\"target_dependency_version\"]),\n manifest_path: path,\n fixed_versions: [],\n }))\n : [];\n const context = record(finding[\"context\"] ?? {}, \"Endor context\");\n const updated = text(meta[\"update_time\"]);\n return validateExternalEvidence(\n {\n title: requiredText(meta[\"name\"], \"Endor finding title\"),\n description:\n [\n text(spec[\"summary\"]),\n text(spec[\"explanation\"]),\n text(spec[\"remediation\"]),\n ]\n .filter(Boolean)\n .join(\"\\n\\n\") || text(meta[\"description\"]),\n severity,\n branch:\n context[\"type\"] === \"CONTEXT_TYPE_REF\" ? text(context[\"id\"]) : null,\n code_revision: text(\n record(\n spec[\"source_code_version\"] ?? {},\n \"Endor source code version\",\n )[\"sha\"],\n ),\n source_updated_at:\n updated === null ? null : Math.floor(Date.parse(updated) / 1000),\n advisory_ids: [\n ...new Set([...(advisory ? [advisory] : []), ...aliases]),\n ],\n packages,\n locations,\n source_data: structuredClone(finding),\n },\n target,\n );\n },\n (value) =>\n requiredText(\n record(value, \"Endor finding\")[\"uuid\"],\n \"Endor finding uuid\",\n ),\n target,\n );\n}\n\n/** Endor's documented SARIF producer uses properties.finding-uuid, not its rule name. */\nexport function normalizeEndorSarif(\n input: unknown,\n target: ExternalImportTarget = \"cloud\",\n): ExternalFindings {\n const document = record(input, \"Endor SARIF\");\n if (document[\"version\"] !== \"2.1.0\")\n throw new Error(\"Expected Endor SARIF 2.1.0.\");\n const entries = array(document[\"runs\"], \"SARIF runs\").flatMap((value) => {\n const run = record(value, \"SARIF run\");\n const tool = record(run[\"tool\"], \"SARIF tool\");\n const driver = record(tool[\"driver\"], \"SARIF driver\");\n if (driver[\"name\"] !== \"endorctl\")\n throw new Error(\"Expected the endorctl SARIF producer.\");\n if (\n hasSarifExternalPropertyReferences(run[\"externalPropertyFileReferences\"])\n )\n throw new Error(\"Use a self-contained Endor SARIF report.\");\n const rules = array(driver[\"rules\"] ?? [], \"Endor rules\").map((r) =>\n record(r, \"Endor rule\"),\n );\n const rulesById = indexSarifRules(rules);\n const { runs: _runs, ...documentContext } = document;\n const { results: _results, tool: _tool, ...runContext } = run;\n const { rules: _rules, ...driverContext } = driver;\n const { driver: _driver, ...toolContext } = tool;\n return array(run[\"results\"] ?? [], \"Endor results\").map((result) => ({\n result,\n rulesById,\n documentContext,\n runContext,\n driverContext,\n toolContext,\n }));\n });\n return normalizeRecords(\n entries,\n ({ result: value, rulesById, ...context }) => {\n const result = record(value, \"Endor result\");\n const properties = record(\n result[\"properties\"],\n \"Endor result properties\",\n );\n requiredText(properties[\"project-uuid\"], \"Endor project-uuid\");\n const ruleId = requiredText(result[\"ruleId\"], \"Endor ruleId\");\n const selectedRule = rulesById.get(ruleId);\n if (!selectedRule)\n throw new Error(\n \"Endor result must reference exactly one rule in its run.\",\n );\n const { rule, index: ruleIndex } = selectedRule;\n if (\n result[\"ruleIndex\"] !== undefined &&\n result[\"ruleIndex\"] !== ruleIndex\n )\n throw new Error(\"Endor ruleIndex and ruleId disagree.\");\n if (result[\"rule\"] !== undefined) {\n const reference = record(result[\"rule\"], \"Endor rule reference\");\n if (\n reference[\"toolComponent\"] !== undefined ||\n (reference[\"id\"] !== undefined && reference[\"id\"] !== ruleId) ||\n (reference[\"index\"] !== undefined &&\n reference[\"index\"] !== ruleIndex) ||\n (reference[\"guid\"] !== undefined &&\n reference[\"guid\"] !== rule[\"guid\"])\n )\n throw new Error(\"Inconsistent or external Endor rule reference.\");\n }\n const message = record(result[\"message\"], \"Endor message\");\n const short = record(\n rule[\"shortDescription\"] ?? {},\n \"Endor shortDescription\",\n );\n const full = record(\n rule[\"fullDescription\"] ?? {},\n \"Endor fullDescription\",\n );\n const help = record(rule[\"help\"] ?? {}, \"Endor help\");\n const hasCodeLocations = strings(properties[\"categories\"]).some(\n (category) => category === \"SAST\" || category === \"SECRETS\",\n );\n const locations = array(\n result[\"locations\"] ?? [],\n \"Endor locations\",\n ).flatMap((v) => {\n const physical = record(\n record(v, \"Endor location\")[\"physicalLocation\"] ?? {},\n \"Physical location\",\n );\n const artifact = record(\n physical[\"artifactLocation\"] ?? {},\n \"Artifact location\",\n );\n if (\n artifact[\"index\"] !== undefined ||\n artifact[\"uriBaseId\"] !== undefined\n )\n return [];\n const uri = text(artifact[\"uri\"]);\n if (uri === null || /^[A-Za-z][A-Za-z0-9+.-]*:/u.test(uri)) return [];\n let path: string | null;\n try {\n path = relativePath(decodeURIComponent(uri));\n } catch {\n return [];\n }\n if (path === null) return [];\n const line = hasCodeLocations\n ? record(physical[\"region\"] ?? {}, \"Endor region\")[\"startLine\"]\n : null;\n return [\n {\n path,\n line:\n typeof line === \"number\" && Number.isSafeInteger(line) && line > 0\n ? line\n : null,\n },\n ];\n });\n return validateExternalEvidence(\n {\n title: text(short[\"text\"]) ?? text(rule[\"name\"]) ?? ruleId,\n url: text(properties[\"finding-url\"]),\n description: [\n text(message[\"markdown\"]) ?? text(message[\"text\"]),\n text(full[\"text\"]),\n text(help[\"markdown\"]) ?? text(help[\"text\"]),\n ]\n .filter(Boolean)\n .join(\"\\n\\n\"),\n // Diagnostic level and CVSS are not Endor's finding severity. Keep both as source evidence.\n severity: \"unknown\",\n locations: [\n ...new Map(\n locations.map((location) => [JSON.stringify(location), location]),\n ).values(),\n ],\n source_data: structuredClone({\n ...context,\n runContext: sarifRunContextForResult(\n context.runContext,\n result,\n rule,\n context.documentContext,\n context.driverContext,\n context.toolContext,\n ),\n rule,\n result,\n }),\n },\n target,\n );\n },\n ({ result }) =>\n requiredText(\n record(\n record(result, \"Endor result\")[\"properties\"],\n \"Endor result properties\",\n )[\"finding-uuid\"],\n \"Endor finding-uuid\",\n ),\n target,\n );\n}\n\nexport async function readEndorFindings(\n path: string,\n target: ExternalImportTarget = \"cloud\",\n): Promise<ExternalFindings> {\n return normalizeEndorFindings(await readScannerJson(path), target);\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-findings-import.d.ts","sourceRoot":"","sources":["../src/external-findings-import.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AASjF,OAAO,EAEL,KAAK,+BAA+B,EACrC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"external-findings-import.d.ts","sourceRoot":"","sources":["../src/external-findings-import.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AASjF,OAAO,EAEL,KAAK,+BAA+B,EACrC,MAAM,8BAA8B,CAAC;AAKtC,8EAA8E;AAC9E,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,0BAA0B,EACnC,YAAY,GAAE,+BAAoC,+EAgDnD"}
|