codecartographer-pi 0.25.0 → 0.26.0

package/dist/core/{broadside-verify.js → broadside/verify.js}

@@ -20,7 +20,12 @@
 // that only reads keeps the batch property that re-running is always safe.
 import { readdir, readFile, stat, writeFile } from "node:fs/promises";
 import { isAbsolute, join, relative, resolve } from "node:path";
-import { BROADSIDE_DIR, BROADSIDE_LENS_IDS, broadsideDirFor, defaultReasoningFor, isSlurpable, listRepoFiles, loadBroadsideState, loadSavedLensResults, parseLensJson, persistBroadsideRunMerging, } from "./broadside.js";
+import { BROADSIDE_DIR, BROADSIDE_LENS_IDS } from "./constants.js";
+import { defaultReasoningFor } from "./types.js";
+import { redactSecrets } from "../secrets.js";
+import { isSlurpable, listRepoFiles } from "./repo.js";
+import { broadsideDirFor, loadBroadsideConfig, loadBroadsideState, persistBroadsideRunMerging } from "./state.js";
+import { loadSavedLensResults, parseLensJson } from "./results.js";
 export const BROADSIDE_CHAT_URL = "https://openrouter.ai/api/v1/chat/completions";
 /** How many findings `verify` reads by default, most severe first. */
 export const BROADSIDE_VERIFY_DEFAULT_TOP = 10;
@@ -74,10 +79,29 @@ export function rankVerifiableFindings(stored) {
  * everything {@link isSlurpable} keeps out of a lens: credential stores, build
  * output, binaries. A path outside the repository, or one the listing does
  * not contain, is an error the model sees, not a read.
+ *
+ * Every line the reader hands back goes through the same secret-redaction
+ * pass `submit` runs over its slices (#358): the file list keeps credential
+ * *stores* out, but a key in an ordinary source file is exactly what a
+ * finding points a verifier at, and the tool result is the upload. `redact`
+ * mirrors config.yaml's `redact_secrets`. A pattern the model greps for can
+ * still tell it that a line matched; the line it sees is redacted.
  */
-export async function createRepoReader(cwd) {
+export async function createRepoReader(cwd, opts = {}) {
     const { files } = await listRepoFiles(cwd);
     const readable = new Set(files.filter(isSlurpable));
+    const redact = opts.redact ?? true;
+    const redactions = { values: 0, files: new Set() };
+    const clean = (rel, line) => {
+        if (!redact)
+            return line;
+        const redaction = redactSecrets(line);
+        if (redaction.count > 0) {
+            redactions.values += redaction.count;
+            redactions.files.add(rel);
+        }
+        return redaction.text;
+    };
     const confine = (path) => {
         const abs = resolve(cwd, path);
         const rel = relative(cwd, abs).split("\\").join("/");
@@ -86,6 +110,7 @@ export async function createRepoReader(cwd) {
         return rel;
     };
     return {
+        redactions,
         async readFile(path, startLine, endLine) {
             const rel = confine(path);
             if (!readable.has(rel))
@@ -96,7 +121,7 @@ export async function createRepoReader(cwd) {
             const end = Math.min(lines.length, requestedEnd, start + READ_FILE_MAX_LINES - 1);
             if (start > lines.length)
                 return `error: ${rel} has ${lines.length} lines`;
-            return lines.slice(start - 1, end).map((line, i) => `${start + i}: ${line}`).join("\n");
+            return lines.slice(start - 1, end).map((line, i) => `${start + i}: ${clean(rel, line)}`).join("\n");
         },
         async grep(pattern, pathPrefix) {
             let regex;
@@ -123,7 +148,7 @@ export async function createRepoReader(cwd) {
                 const lines = text.split("\n");
                 for (let i = 0; i < lines.length && matches.length < GREP_MAX_MATCHES; i++) {
                     if (regex.test(lines[i]))
-                        matches.push(`${rel}:${i + 1}: ${lines[i]}`);
+                        matches.push(`${rel}:${i + 1}: ${clean(rel, lines[i])}`);
                 }
                 if (matches.length >= GREP_MAX_MATCHES)
                     break;
@@ -341,7 +366,11 @@ export async function runBroadsideVerify(cwd, apiKey, opts = {}) {
     const model = opts.model ?? syncModelFor(run.model);
     const maxCost = opts.maxCost ?? 0;
     const fetcher = opts.fetcher ?? fetch;
-    const reader = await createRepoReader(cwd);
+    // The same switch submit honours: a repository that turned redaction off
+    // for its slices gets raw lines here too, and one that did not never
+    // uploads a key through a tool result (#358).
+    const config = await loadBroadsideConfig(broadsideDir);
+    const reader = await createRepoReader(cwd, { redact: config.redactSecrets });
     const selected = ranked.slice(0, top);
     const findings = [];
     let totalCost = 0;
@@ -376,6 +405,7 @@ export async function runBroadsideVerify(cwd, apiKey, opts = {}) {
         confirmed: findings.filter((f) => f.verdict === "confirmed").length,
         cost: totalCost,
         at: new Date().toISOString(),
+        redactedValues: reader.redactions.values,
     };
     const result = {
         runId: run.id,
@@ -386,6 +416,8 @@ export async function runBroadsideVerify(cwd, apiKey, opts = {}) {
         findings,
         totalCost,
         ...(stoppedByCost && { stoppedByCost: true }),
+        redactedValues: reader.redactions.values,
+        redactedFiles: [...reader.redactions.files].sort(),
     };
     await writeFile(join(runDir, "verified.json"), `${JSON.stringify({ ...entry, run_id: run.id, candidates: ranked.length, findings }, null, "\t")}\n`, "utf8");
     await writeFile(join(runDir, "verified.md"), renderVerifiedMarkdown(result), "utf8");
@@ -407,6 +439,9 @@ export function renderVerifiedMarkdown(result) {
         "is a lead worth a human's next look, not a validated claim.",
         "",
     ];
+    if (result.redactedValues > 0) {
+        lines.push(`${result.redactedValues} secret-like value(s) were redacted from tool output before upload (${result.redactedFiles.join(", ")}).`, "");
+    }
     for (const f of result.findings) {
         lines.push(`## ${VERDICT_MARK[f.verdict] ?? "?"} ${f.index}. [${f.severity}] ${f.title}`, "", `- **verdict**: ${f.verdict} (${f.confidence})`, `- **location**: ${f.location}`, `- **lens**: ${f.lensId} (${f.customId})`);
         if (f.evidence.length > 0)
@@ -428,6 +463,9 @@ export function verifyResultText(result) {
     for (const f of result.findings) {
         lines.push(`  ${VERDICT_MARK[f.verdict] ?? "?"} [${f.severity}] ${f.title} @ ${f.location} — ${f.verdict}`);
     }
+    if (result.redactedValues > 0) {
+        lines.push(`  ${result.redactedValues} secret-like value(s) redacted from tool output before upload (${result.redactedFiles.join(", ")}).`);
+    }
     lines.push(`Details in ${result.outputDir}/verified.md. A confirmed finding is a lead for a human's next look, not a validated claim.`);
     return lines.join("\n");
 }