@jphutchins/code-review 0.1.0-alpha.11 → 0.1.0-alpha.12

package/dist/index.js

@@ -660,7 +660,7 @@ var decideGate = (state, nudges, maxNudges, draftPath, kind) => {
     reason: [
       `This review is not complete \u2014 ${whatsWrong(state, draftPath, kind)}`,
       `The only deliverable is a ${kind} document that validates against the ${kind} schema \u2014 run "code-review print-schema ${kind}" to see the exact shape.`,
-      `Write it to ${draftPath}, then run "code-review validate ${draftPath} --kind ${kind}" until it exits 0 before ending your turn.`
+      `Write it to ${draftPath}, then run "code-review validate ${draftPath} --kind ${kind} --explain" until it exits 0 before ending your turn (--explain prints the schema when the shape is wrong).`
     ].join("\n")
   };
 };
@@ -724,19 +724,26 @@ var stopHookSettings = (command) => ({
 
 // src/budget.ts
 var DEADLINE_ENV = "CODE_REVIEW_DEADLINE_EPOCH";
-var DEFAULT_RESERVE = { frac: 0.15, flatUsd: 0.02, flatMs: 12e4 };
+var DEFAULT_RESERVE = {
+  frac: 0.15,
+  growth: 0.25,
+  flatUsd: 0.02,
+  flatMs: 12e4
+};
 var SOFT_MULTIPLE = 2;
 var costAxis = (i) => i.spentUsd !== null && i.budgetUsd !== null && i.budgetUsd > 0 ? { used: i.spentUsd, limit: i.budgetUsd, flat: i.reserve.flatUsd } : null;
 var timeAxis = (i) => i.elapsedMs !== null && i.wallMs !== null && i.wallMs > 0 ? { used: i.elapsedMs, limit: i.wallMs, flat: i.reserve.flatMs } : null;
-var axisSeverity = (a, frac) => {
-  const hardReserve = Math.max(a.flat, frac * a.limit);
+var axisSeverity = (a, reserve) => {
+  const usedFrac = Math.min(1, Math.max(0, a.used / a.limit));
+  const effFrac = reserve.frac + reserve.growth * usedFrac;
+  const hardReserve = Math.max(a.flat, effFrac * a.limit);
   const remaining = a.limit - a.used;
   if (remaining <= hardReserve) return 2;
   if (remaining <= SOFT_MULTIPLE * hardReserve) return 1;
   return 0;
 };
 var decideBudget = (i) => {
-  const worst = [costAxis(i), timeAxis(i)].filter((a) => a !== null).reduce((max, a) => Math.max(max, axisSeverity(a, i.reserve.frac)), 0);
+  const worst = [costAxis(i), timeAxis(i)].filter((a) => a !== null).reduce((max, a) => Math.max(max, axisSeverity(a, i.reserve)), 0);
   return worst === 2 ? { kind: "hard" } : worst === 1 ? { kind: "soft" } : { kind: "ok" };
 };
 var pct = (n) => `${String(Math.round(n * 100))}%`;
@@ -744,7 +751,7 @@ var money = (n) => `$${n.toFixed(2)}`;
 var mins = (ms) => `${(ms / 6e4).toFixed(1)}m`;
 var spendClause = (i) => i.spentUsd === null ? null : i.budgetUsd !== null && i.budgetUsd > 0 ? `spent ${money(i.spentUsd)}/${money(i.budgetUsd)} (${pct(i.spentUsd / i.budgetUsd)})` : `spent ${money(i.spentUsd)}`;
 var timeClause = (i) => i.elapsedMs === null ? null : i.wallMs !== null && i.wallMs > 0 ? `${mins(i.elapsedMs)}/${mins(i.wallMs)} elapsed (${pct(i.elapsedMs / i.wallMs)})` : `${mins(i.elapsedMs)} elapsed`;
-var directive = (phase, draftPath) => phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now. Write your COMPLETE findings to ${draftPath} and run \`code-review validate ${draftPath}\` until it passes. Other tools are blocked until that draft is written.` : `Wind down investigation and write your COMPLETE findings to ${draftPath} now, then validate \u2014 you may run out of budget before you finish otherwise.`;
+var directive = (phase, draftPath) => phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now. Write your COMPLETE findings to ${draftPath} and run \`code-review validate ${draftPath} --explain\` until it passes (--explain prints the exact schema when the shape is wrong). Other tools are blocked until that draft is written.` : `Wind down investigation and write your COMPLETE findings to ${draftPath} now, then run \`code-review validate ${draftPath} --explain\` (it prints the exact schema if the shape is wrong) \u2014 you may run out of budget before you finish otherwise.`;
 var budgetMessage = (i, phase, draftPath) => {
   const status = [spendClause(i), timeClause(i)].filter((c) => c !== null).join(" \xB7 ");
   return `Budget check \u2014 ${status}. ${directive(phase, draftPath)}`;
@@ -838,6 +845,7 @@ var budgetHookCommand = (draftPath, opts) => [
   ...opts.wall ? ["--wall", shellQuote(opts.wall)] : [],
   ...opts.prices ? ["--prices", shellQuote(opts.prices)] : [],
   ...opts.reserveFrac ? ["--reserve-frac", shellQuote(opts.reserveFrac)] : [],
+  ...opts.reserveGrowth ? ["--reserve-growth", shellQuote(opts.reserveGrowth)] : [],
   ...opts.reserveUsd ? ["--reserve-usd", shellQuote(opts.reserveUsd)] : [],
   ...opts.reserveWall ? ["--reserve-wall", shellQuote(opts.reserveWall)] : []
 ].join(" ");
@@ -2171,7 +2179,11 @@ var budgetHookCmd = defineCommand({
     },
     "reserve-frac": {
       type: "string",
-      description: "Wind-down headroom as a fraction of each budget: converge once less than this remains (default: 0.15; the soft steer tier reserves 2\xD7 this)"
+      description: "Base wind-down headroom as a fraction of each budget: converge once less than this remains (default: 0.15; the soft steer tier reserves 2\xD7 this)"
+    },
+    "reserve-growth": {
+      type: "string",
+      description: "How much the reserve grows as a budget is spent \u2014 added at full usage, so convergence lands earlier the longer the run has gone (default: 0.25; 0 = flat reserve)"
     },
     "reserve-usd": {
       type: "string",
@@ -2204,6 +2216,7 @@ var budgetHookCmd = defineCommand({
         wallMs,
         reserve: {
           frac: parseFraction(args["reserve-frac"], DEFAULT_RESERVE.frac),
+          growth: parseFraction(args["reserve-growth"], DEFAULT_RESERVE.growth),
           flatUsd: parseBudgetUsd(args["reserve-usd"]) ?? DEFAULT_RESERVE.flatUsd,
           flatMs: args["reserve-wall"] ? parseWallMs(args["reserve-wall"]) ?? DEFAULT_RESERVE.flatMs : DEFAULT_RESERVE.flatMs
         },
@@ -2265,7 +2278,11 @@ var printSettingsCmd = defineCommand({
     },
     "reserve-frac": {
       type: "string",
-      description: "Wind-down headroom as a fraction of each budget (default: 0.15; soft tier is 2\xD7)"
+      description: "Base wind-down headroom as a fraction of each budget (default: 0.15; soft tier is 2\xD7)"
+    },
+    "reserve-growth": {
+      type: "string",
+      description: "How much the reserve grows as a budget is spent, converging earlier the longer the run has gone (default: 0.25; 0 = flat)"
     },
     "reserve-usd": {
       type: "string",
@@ -2293,6 +2310,7 @@ var printSettingsCmd = defineCommand({
         wall: args.wall,
         prices: args.prices,
         reserveFrac: args["reserve-frac"],
+        reserveGrowth: args["reserve-growth"],
         reserveUsd: args["reserve-usd"],
         reserveWall: args["reserve-wall"]
       }
@@ -2324,6 +2342,13 @@ var deadlineCmd = defineCommand({
   }
 });
 var derivedSchemaVersion = (kind, raw) => kind === "findings" ? declaredVersion(raw) : void 0;
+var printableSchema = (schemaPath) => {
+  const schema = JSON.parse(readFileSync(schemaPath, "utf-8"));
+  const enforcementSchema = Object.fromEntries(
+    Object.entries(schema).filter(([key2]) => key2 !== "$schema")
+  );
+  return JSON.stringify(enforcementSchema, null, 2);
+};
 var validateCmd = defineCommand({
   meta: {
     name: "validate",
@@ -2346,6 +2371,10 @@ var validateCmd = defineCommand({
     "schema-version": {
       type: "string",
       description: "Schema major.minor version to validate against (default: the document's declared schema_version for findings, or the kind's latest)"
+    },
+    explain: {
+      type: "boolean",
+      description: "On failure, also print the schema after the errors \u2014 its field descriptions are the authoritative spec, so the document can be fixed in one pass instead of by trial and error"
     }
   },
   run: async ({ args }) => {
@@ -2359,6 +2388,14 @@ var validateCmd = defineCommand({
       process.stderr.write("\u274C invalid\n");
       for (const e of errors) process.stderr.write(`  - ${e}
 `);
+      if (args.explain) {
+        process.stderr.write(
+          `
+The ${kind} document must conform to this schema (the field descriptions are the authoritative spec \u2014 match the property names exactly):
+${printableSchema(schemaPath)}
+`
+        );
+      }
       process.exit(1);
     }
   }
@@ -2571,11 +2608,7 @@ var printSchemaCmd = defineCommand({
   run: async ({ args }) => {
     const schemaKind = requireSchemaKind(args.name);
     const schemaPath = requireSchemaPath(schemaKind, args["schema-version"]);
-    const schema = JSON.parse(readFileSync(schemaPath, "utf-8"));
-    const enforcementSchema = Object.fromEntries(
-      Object.entries(schema).filter(([key2]) => key2 !== "$schema")
-    );
-    process.stdout.write(`${JSON.stringify(enforcementSchema, null, 2)}
+    process.stdout.write(`${printableSchema(schemaPath)}
 `);
   }
 });