dsh-pentester 2.2.0 → 2.4.0

package/lib/index.js

@@ -1050,7 +1050,7 @@ function readJsonFile(file) {
 		return;
 	}
 }
-function readJsonArray(file) {
+function readJsonArray$1(file) {
 	const parsed = readJsonFile(file);
 	if (Array.isArray(parsed)) return parsed.filter((entry) => entry !== null && typeof entry === "object");
 	return [];
@@ -1066,7 +1066,7 @@ async function promoteAssets(ctx, stage, delegationDirs, delegationIds) {
 	const assetMap = /* @__PURE__ */ new Map();
 	for (let index = 0; index < delegationDirs.length; index += 1) {
 		const delegationId = delegationIds[index] ?? `D-${String(index + 1).padStart(3, "0")}`;
-		const entries = readJsonArray(join(delegationDirs[index], "assets.json"));
+		const entries = readJsonArray$1(join(delegationDirs[index], "artifacts", "assets.json"));
 		for (const entry of entries) {
 			const key = assetKey(entry);
 			if (key === "") continue;
@@ -1082,7 +1082,7 @@ async function promoteAssets(ctx, stage, delegationDirs, delegationIds) {
 	const serviceMap = /* @__PURE__ */ new Map();
 	for (let index = 0; index < delegationDirs.length; index += 1) {
 		const delegationId = delegationIds[index] ?? `D-${String(index + 1).padStart(3, "0")}`;
-		const entries = readJsonArray(join(delegationDirs[index], "services.json"));
+		const entries = readJsonArray$1(join(delegationDirs[index], "artifacts", "services.json"));
 		for (const entry of entries) {
 			const key = serviceKey(entry);
 			if (key === "") continue;
@@ -1115,46 +1115,92 @@ async function promoteAssets(ctx, stage, delegationDirs, delegationIds) {
 */
 /**
 * Aggregate findings from every delegation directory in the completed stage,
-* index them in `findings/findings.json`, and write each delegation's detail
-* as `findings/<delegationId>-findings.md`.
+* index them in `findings/findings.json`, and write each finding's detail
+* as `findings/<findingId>-findings.md` with a provenance header.
 *
-* If a delegation produces `artifacts/findings.md`, its content is copied
-* into the canonical detail file with a provenance header.
+* Worker contract:
+*   artifacts/findings.json  — structured array of finding entries
+*   artifacts/findings.md    — human-readable detail (used as fallback if
+*                              no structured entries exist)
 */
 async function promoteFindings(ctx, stage, delegationDirs, delegationIds) {
 	const root = ctx.targetRoot;
 	const findingsDir = join(root, "findings");
 	await mkdir(findingsDir, { recursive: true });
 	const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-	const entries = [];
 	const existingIndex = loadExistingIndex(findingsDir);
+	const entries = [];
+	const touchedDelegationIds = /* @__PURE__ */ new Set();
 	for (let index = 0; index < delegationDirs.length; index += 1) {
 		const delegationId = delegationIds[index] ?? `D-${String(index + 1).padStart(3, "0")}`;
 		const delegationDir = delegationDirs[index];
-		const sourceFile = join(delegationDir, "findings.md");
-		if (!existsSync(sourceFile)) continue;
-		const content = readFileSync(sourceFile, "utf8").trim();
-		if (content === "") continue;
-		const detailFile = `${delegationId}-findings.md`;
-		const detailPath = join(findingsDir, detailFile);
-		await writeFile(detailPath, `# ${delegationId} Findings\n\n**Source Stage**: ${stage}\n**Updated**: ${updatedAt}\n\n---\n\n${content}\n`, "utf8");
-		const existing = existingIndex.get(delegationId);
-		if (existing !== void 0) existingIndex.set(delegationId, {
-			...existing,
-			updatedAt,
-			sourceStage: stage
-		});
-		else entries.push({
-			sourceDelegationId: delegationId,
-			sourceStage: stage,
-			detailFile,
-			updatedAt
-		});
+		touchedDelegationIds.add(delegationId);
+		const structuredFile = join(delegationDir, "artifacts", "findings.json");
+		const detailFile = join(delegationDir, "artifacts", "findings.md");
+		const structured = readJsonArray(structuredFile);
+		if (structured.length > 0) for (const entry of structured) {
+			const findingId = typeof entry.id === "string" && entry.id.length > 0 ? entry.id : `${delegationId}-${crypto.randomUUID().slice(0, 8)}`;
+			const title = typeof entry.title === "string" && entry.title.length > 0 ? entry.title : findingId;
+			const severity = typeof entry.severity === "string" ? entry.severity : "info";
+			const affectedAsset = typeof entry.affectedAsset === "string" && entry.affectedAsset.length > 0 ? entry.affectedAsset : void 0;
+			const confidence = typeof entry.confidence === "string" && entry.confidence.length > 0 ? entry.confidence : void 0;
+			const detailFileName = `${findingId}-findings.md`;
+			const detailPath = join(findingsDir, detailFileName);
+			let body = "";
+			if (existsSync(detailFile)) body = readFileSync(detailFile, "utf8").trim();
+			if (body === "") {
+				body = `# ${title}\n\n**Severity**: ${severity}\n\n${affectedAsset !== void 0 ? `**Affected Asset**: ${affectedAsset}\n\n` : ""}`;
+				if (typeof entry.description === "string" && entry.description.length > 0) body += `${entry.description}\n`;
+			}
+			await writeFile(detailPath, `# ${title}\n\n**Source Stage**: ${stage}\n**Source Delegation**: ${delegationId}\n**Updated**: ${updatedAt}\n\n---\n\n${body}\n`, "utf8");
+			entries.push({
+				id: findingId,
+				title,
+				severity,
+				...affectedAsset !== void 0 ? { affectedAsset } : {},
+				...confidence !== void 0 ? { confidence } : {},
+				sourceDelegationId: delegationId,
+				sourceStage: stage,
+				detailFile: detailFileName,
+				updatedAt
+			});
+		}
+		else if (existsSync(detailFile)) {
+			const content = readFileSync(detailFile, "utf8").trim();
+			if (content !== "") {
+				const detailFileName = `${delegationId}-findings.md`;
+				const detailPath = join(findingsDir, detailFileName);
+				await writeFile(detailPath, `# ${delegationId} Findings\n\n**Source Stage**: ${stage}\n**Updated**: ${updatedAt}\n\n---\n\n${content}\n`, "utf8");
+				entries.push({
+					id: delegationId,
+					title: `${delegationId} Findings`,
+					severity: "info",
+					sourceDelegationId: delegationId,
+					sourceStage: stage,
+					detailFile: detailFileName,
+					updatedAt
+				});
+			}
+		}
 	}
-	for (const [id, entry] of existingIndex) if (!delegationIds.includes(id)) entries.push(entry);
-	entries.sort((a, b) => a.sourceDelegationId.localeCompare(b.sourceDelegationId));
+	for (const [id, entry] of existingIndex) if (!touchedDelegationIds.has(entry.sourceDelegationId)) entries.push(entry);
+	entries.sort((a, b) => {
+		const cmp = a.sourceDelegationId.localeCompare(b.sourceDelegationId);
+		if (cmp !== 0) return cmp;
+		return a.id.localeCompare(b.id);
+	});
 	if (entries.length > 0) await writeFile(join(findingsDir, "findings.json"), `${JSON.stringify(entries, null, 2)}\n`, "utf8");
 }
+function readJsonArray(file) {
+	if (!existsSync(file)) return [];
+	try {
+		const parsed = JSON.parse(readFileSync(file, "utf8"));
+		if (Array.isArray(parsed)) return parsed.filter((entry) => entry !== null && typeof entry === "object");
+		return [];
+	} catch {
+		return [];
+	}
+}
 function loadExistingIndex(findingsDir) {
 	const file = join(findingsDir, "findings.json");
 	if (!existsSync(file)) return /* @__PURE__ */ new Map();
@@ -1162,9 +1208,10 @@ function loadExistingIndex(findingsDir) {
 		const parsed = JSON.parse(readFileSync(file, "utf8"));
 		if (!Array.isArray(parsed)) return /* @__PURE__ */ new Map();
 		const map = /* @__PURE__ */ new Map();
-		for (const entry of parsed) if (entry !== null && typeof entry === "object" && typeof entry.sourceDelegationId === "string") {
-			const id = entry.sourceDelegationId;
-			map.set(id, entry);
+		for (const entry of parsed) if (entry !== null && typeof entry === "object") {
+			const e = entry;
+			const id = typeof e.id === "string" ? e.id : "";
+			if (id !== "") map.set(id, e);
 		}
 		return map;
 	} catch {
@@ -3474,17 +3521,29 @@ async function parseFindingsIndex(ctx) {
 		const raw = await readFile(indexFile, "utf8");
 		const entries = JSON.parse(raw);
 		if (!Array.isArray(entries)) return [];
+		const validSeverities = /* @__PURE__ */ new Set([
+			"critical",
+			"high",
+			"medium",
+			"low",
+			"info"
+		]);
 		return entries.filter((e) => e !== null && typeof e === "object").map((e) => {
 			const detailFile = typeof e.detailFile === "string" ? e.detailFile : "";
-			const id = detailFile.replace(/-findings\.md$/, "");
+			const fallbackId = detailFile.replace(/-findings\.md$/, "");
+			const id = typeof e.id === "string" && e.id.length > 0 ? e.id : fallbackId;
+			const rawSeverity = typeof e.severity === "string" ? e.severity : "";
+			const severity = validSeverities.has(rawSeverity) ? rawSeverity : "info";
 			return {
 				id,
-				title: id,
-				severity: typeof e.severity === "string" ? e.severity : "info",
+				title: typeof e.title === "string" && e.title.length > 0 ? e.title : id,
+				severity,
 				sourceStage: typeof e.sourceStage === "string" ? e.sourceStage : "",
 				sourceDelegationId: typeof e.sourceDelegationId === "string" ? e.sourceDelegationId : "",
 				detailFile,
-				updatedAt: typeof e.updatedAt === "string" ? e.updatedAt : ""
+				updatedAt: typeof e.updatedAt === "string" ? e.updatedAt : "",
+				...typeof e.affectedAsset === "string" && e.affectedAsset.length > 0 ? { affectedAsset: e.affectedAsset } : {},
+				...typeof e.confidence === "string" && e.confidence.length > 0 ? { confidence: e.confidence } : {}
 			};
 		});
 	} catch {
@@ -4074,9 +4133,9 @@ async function resolveBinding(deps, sessionId) {
 * Generated by scripts/build-id.mjs before each build.
 * Both host (tsdown) and client (esbuild) import this module.
 *
-* Format: version+shortSha (e.g. "1.1.0+391bfd6")
+* Format: version+shortSha
 */
-const BUILD_ID = "2.2.0+478786d";
+const BUILD_ID = "2.4.0+3a85fc6";
 //#endregion
 //#region src/ui-view/invocations.ts
 /**