Skip to content

refactor(plugin): migrate rank shard helpers to TypeScript #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kmbroai wants to merge 7 commits into from
Open

refactor(plugin): migrate rank shard helpers to TypeScript #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69bfaa2
refactor(plugin): migrate rank shard helpers to TypeScript
kmbroai Sep 9, 2026
314a566
test: remove unused shard directory preload
kmbroai Sep 10, 2026
114386a
Merge branch 'review-cleanup-840' into review-cleanup-841
kmbroai Sep 10, 2026
2428d3a
Merge branch 'review-cleanup-840' into review-cleanup-841
kmbroai Sep 10, 2026
cadfb8c
refactor: validate canonical shard names directly
kmbroai Sep 10, 2026
8b0f697
test: keep Windows shard rejection proof aligned
kmbroai Sep 10, 2026
bc172b4
Merge branch 'review-cleanup-840' into review-cleanup-841
kmbroai Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion plugins/codex-security/mcp-app/helpers-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { windowsBinding } from "./src/native";
import { normalizeCandidatesCommand } from "./src/helpers/normalize-candidates";
import { validatePatchRiskAssessmentCommand } from "./src/helpers/validate-patch-risk-assessment";
import { deepReviewInputCommand } from "./src/helpers/deep-review-input";
import { rankShardsCommand } from "./src/helpers/rank-shards";

let commandLine = process.argv.slice(2);
if (process.platform === "win32") {
Expand Down Expand Up @@ -41,9 +42,15 @@ if (command === "resolve-security-md") {
command === "select-deep-review-input"
) {
process.exitCode = deepReviewInputCommand(command, args, posixHome);
} else if (
command === "make-rank-shards" ||
command === "validate-rank-shard" ||
command === "merge-rank-outputs"
) {
process.exitCode = rankShardsCommand(command, args, posixHome);
} else {
console.error(
"Usage: launch_codex_security_mcp[.cmd] --helper <resolve-security-md | normalize-candidates | validate-patch-risk-assessment | copy-deep-review-input | select-deep-review-input> [options]",
"Usage: launch_codex_security_mcp[.cmd] --helper <resolve-security-md | normalize-candidates | validate-patch-risk-assessment | copy-deep-review-input | select-deep-review-input | make-rank-shards | validate-rank-shard | merge-rank-outputs> [options]",
);
process.exitCode = 2;
}
240 changes: 22 additions & 218 deletions plugins/codex-security/mcp-app/src/helpers/deep-review-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,219 +1,15 @@
import { decodeUtf8 } from "./utf8";
import { dirname } from "node:path";
import { mkdir, readFile, writeFile } from "./helper-files";
import { encodePosixPath } from "./posix-path";
import { JsonSyntaxError, object, parseJson, pythonRepr } from "./python-json";
import { expandHome, parsedPath } from "./resolve-security-md";
import {
ArgumentError,
argumentsFor,
compare,
loadRankRows,
print,
requireUniquePaths,
worklistPath,
writeRankRows,
} from "./rank-worklists";

type Command = "copy-deep-review-input" | "select-deep-review-input";
interface RankRow {
path: string;
area: string;
score?: bigint;
include?: boolean;
}
const trim = (value: string) =>
value.replace(
/^[\p{White_Space}\u001c-\u001f]+|[\p{White_Space}\u001c-\u001f]+$/gu,
"",
);

function compare(left: string, right: string): number {
const a = Array.from(left, (character) => character.codePointAt(0)!);
const b = Array.from(right, (character) => character.codePointAt(0)!);
for (let index = 0; index < Math.min(a.length, b.length); index++) {
if (a[index] !== b[index]) return a[index]! - b[index]!;
}
return a.length - b.length;
}

function loadRows(path: string, selection: boolean): RankRow[] {
const label = selection ? "Rank output" : "Rank input";
const contents = decodeUtf8(readFile(path));
const lines = contents === "" ? [] : contents.split(/\r\n|[\r\n]/u);
if (lines.at(-1) === "") lines.pop();
const fields = selection
? ["path", "area", "score", "include", "reason"]
: ["path", "area", "preview"];
const rows = lines.map((line, index) => {
const fail = (message: string): never => {
throw new Error(`${path}:${index + 1}: ${message}`);
};
if (trim(line) === "") fail("blank JSONL rows are not allowed");
let row: unknown;
try {
row = parseJson(line);
} catch (error) {
if (error instanceof JsonSyntaxError)
fail(
`invalid JSON: ${error.message.replace(/: line \d+ column \d+ \(char \d+\)$/u, "")}`,
);
throw error;
}
if (!object(row)) return fail("expected a JSON object");
const missing = fields
.filter((field) => !Object.hasOwn(row, field))
.sort(compare);
const unexpected = Object.keys(row)
.filter((field) => !fields.includes(field))
.sort(compare);
const details: string[] = [];
if (missing.length) details.push(`missing fields ${pythonRepr(missing)}`);
if (unexpected.length)
details.push(`unexpected fields ${pythonRepr(unexpected)}`);
if (details.length) fail(details.join("; "));
for (const field of selection
? ["path", "area"]
: ["path", "area", "preview"]) {
if (
typeof row[field] !== "string" ||
(field === "path" && trim(row[field]) === "")
)
fail(
`${field} must be ${field === "path" ? "a non-empty string" : "a string"}`,
);
}
if (selection) {
if (typeof row.score !== "bigint")
fail("score must be an integer from 1 through 10");
if ((row.score as bigint) < 1n || (row.score as bigint) > 10n)
fail("score must be from 1 through 10");
if (typeof row.include !== "boolean") fail("include must be a boolean");
if (typeof row.reason !== "string" || trim(row.reason) === "")
fail("reason must be a non-empty string");
}
return row as unknown as RankRow;
});
const seen = new Set<string>(),
duplicates = new Set<string>();
for (const row of rows) {
if (seen.has(row.path)) duplicates.add(row.path);
seen.add(row.path);
}
if (duplicates.size)
throw new Error(
`${label} contains duplicate paths: ${pythonRepr([...duplicates].sort(compare))}`,
);
return rows;
}

function writeRows(output: string, rows: RankRow[]): void {
mkdir(dirname(output));
function* contents(): Iterable<Buffer> {
for (const row of rows) {
const json = JSON.stringify({ path: row.path, area: row.area }).replace(
/[\u007f-\uffff]/g,
(character) =>
`\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`,
);
yield Buffer.from(json + (process.platform === "win32" ? "\r\n" : "\n"));
}
}
writeFile(output, contents());
}

class ArgumentError extends Error {}
function integer(value: string): bigint {
const text = value.replace(/^\p{White_Space}+|\p{White_Space}+$/gu, "");
if (!/^[+-]?\p{Decimal_Number}+(?:_\p{Decimal_Number}+)*$/u.test(text))
throw new ArgumentError(
`argument --top-percent: invalid int value: ${pythonRepr(value)}`,
);
return BigInt(
Array.from(text.replaceAll("_", ""), (character) => {
if (!/\p{Decimal_Number}/u.test(character)) return character;
const point = character.codePointAt(0)!;
let start = point;
while (/\p{Decimal_Number}/u.test(String.fromCodePoint(start - 1)))
start--;
return String((point - start) % 10);
}).join(""),
);
}

function argumentsFor(
args: string[],
selection: boolean,
): Record<string, string | bigint | true> {
const input = selection ? "rank-output" : "rank-input";
const names = [input, "out", "help", ...(selection ? ["top-percent"] : [])];
const values: Record<string, string | bigint | true> = {};
const extra: string[] = [];
const looksOptional = (arg: string) =>
arg.startsWith("-") &&
arg !== "-" &&
!arg.includes(" ") &&
!/^-(?:\p{Decimal_Number}+|\p{Decimal_Number}*\.\p{Decimal_Number}+)\n?$/u.test(
arg,
);
for (let index = 0; index < args.length; index++) {
const arg = args[index]!;
if (arg === "--") {
extra.push(...args.slice(index));
break;
}
const equals = arg.indexOf("=");
const option = equals === -1 ? arg : arg.slice(0, equals);
const matches = option.startsWith("--")
? names.filter((name) => `--${name}`.startsWith(option))
: [];
const name =
names.find((name) => option === `--${name}`) ??
(arg.startsWith("-h")
? "help"
: matches.length === 1
? matches[0]
: undefined);
if (matches.length > 1 && !name)
throw new ArgumentError(
`ambiguous option: ${arg} could match ${matches.map((name) => `--${name}`).join(", ")}`,
);
if (!name) {
extra.push(arg);
continue;
}
if (name === "help") {
if (equals !== -1)
throw new ArgumentError(
`argument -h/--help: ignored explicit argument ${pythonRepr(arg.slice(equals + 1))}`,
);
return { help: true };
}
let value: string;
if (equals !== -1) value = arg.slice(equals + 1);
else {
if (index + 1 === args.length || looksOptional(args[index + 1]!))
throw new ArgumentError(`argument --${name}: expected one argument`);
value = args[++index]!;
}
values[name] = name === "top-percent" ? integer(value) : value;
}
const missing = [input, "out"].filter((name) => values[name] === undefined);
if (missing.length)
throw new ArgumentError(
`the following arguments are required: ${missing.map((name) => `--${name}`).join(", ")}`,
);
if (extra.length)
throw new ArgumentError(`unrecognized arguments: ${extra.join(" ")}`);
return values;
}

function print(message: string, stderr = false): void {
let text = message + "\n";
if (stderr)
text = text.replace(
/[\ud800-\udfff]/gu,
(character) =>
`\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`,
);
(stderr ? process.stderr : process.stdout).write(
process.platform === "win32"
? text.replaceAll("\n", "\r\n")
: stderr
? text
: encodePosixPath(text),
);
}

export function deepReviewInputCommand(
command: Command,
Expand All @@ -224,16 +20,21 @@ export function deepReviewInputCommand(
const input = selection ? "rank-output" : "rank-input";
const usage = `usage: launch_codex_security_mcp[.cmd] --helper ${command} [-h] --${input} PATH --out PATH${selection ? " [--top-percent INT]" : ""}`;
try {
const values = argumentsFor(args, selection);
const values = argumentsFor(
args,
[input, "out"],
selection ? ["top-percent"] : [],
);
if (values.help) {
print(
`${usage}\n\nCreate deep_review_input.jsonl from ${selection ? "worker-produced rank_output.jsonl" : "rank_input.jsonl"}.\n\noptions:\n -h, --help show this help message and exit\n --${input} PATH ${selection ? "Worker ranking output" : "Deterministic rank input"} JSONL.\n --out PATH Output deep_review_input.jsonl path.${selection ? "\n --top-percent INT Percent of included files to keep for deep review. Defaults to 100." : ""}`,
);
return 0;
}
const path = (name: string) =>
parsedPath(expandHome(parsedPath(values[name] as string), posixHome));
const rows = loadRows(path(input), selection);
worklistPath(values[name] as string, posixHome);
const rows = loadRankRows(path(input), selection);
requireUniquePaths(rows, selection ? "Rank output" : "Rank input");
let selected = rows,
total = rows.length;
if (selection) {
Expand All @@ -257,7 +58,10 @@ export function deepReviewInputCommand(
selected = base.slice(0, keep);
}
const output = path("out");
writeRows(output, selected);
writeRankRows(
output,
selected.map(({ path, area }) => ({ path, area })),
);
const message = selection
? `Selected ${selected.length} of ${total} rows into ${output}`
: `Copied ${selected.length} rows into ${output}`;
Expand Down
Loading
Loading