@fyeeme/pi-review 2.0.0 → 2.1.0

package/src/tools/review_report.ts

@@ -7,7 +7,8 @@
  * no host finding-renderer, so this tool does double duty: it renders a tidy
  * Chinese Markdown report (table + details) back to the conversation AND writes
  * a machine-readable JSON (findings + level + outcome) to
- * `<cwd>/.pi/review/<id>.json` so CI / --fix / --comment can consume it.
+ * `<cwd>/<CONFIG_DIR_NAME>/review/<id>.json` so CI / --fix / --comment can
+ * consume it.
  *
  * `verdict` (CONFIRMED/PLAUSIBLE) and `outcome` (fixed/skipped/no_change_needed)
  * enums follow the CC ReportFindings shape — values verified against the CC
@@ -16,8 +17,9 @@
  * normalizes stray invalid values (drop the finding / coerce to skipped) rather
  * than failing the whole call.
  */
-import { defineTool, getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import { defineTool, getMarkdownTheme, CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
 import { Markdown } from "@earendil-works/pi-tui";
+import { StringEnum } from "@earendil-works/pi-ai";
 import { type Static, Type } from "typebox";
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -27,25 +29,32 @@ import * as path from "node:path";
 // verdict 两值与 outcome 三档在 2.1.223/226/227 三版本中一致。
 
 const VERDICT_VALUES = ["CONFIRMED", "PLAUSIBLE"] as const;
-const Verdict = Type.Union(VERDICT_VALUES.map((v) => Type.Literal(v)));
+const Verdict = StringEnum(VERDICT_VALUES);
 
-const OUTCOME_VALUES = ["fixed", "skipped", "no_change_needed"] as const;
 /** CC ReportFindings `outcome` 三档（2.1.227 二进制实证）。fixed-later 再上报时更新。 */
-const Outcome = Type.Union(OUTCOME_VALUES.map((v) => Type.Literal(v)));
+export const OUTCOME_VALUES = ["fixed", "skipped", "no_change_needed"] as const;
+const Outcome = StringEnum(OUTCOME_VALUES);
+
+/** --loop 的 blocking 阈值：P0/P1 触发修复→再评审一轮（P2/P3 只入报告）。 */
+const PRIORITY_VALUES = ["P0", "P1", "P2", "P3"] as const;
+const Priority = StringEnum(PRIORITY_VALUES, {
+	description:
+		"优先级 P0（阻断，立刻修）/ P1（高）/ P2（中）/ P3（低）。--loop 循环修复以 P0/P1 为 blocking 阈值；省略视为 P2。",
+});
 
 // 供 SKILL-schema 同步测试引用（防漂移：SKILL 流程契约不得与常量脱节）。
-export { OUTCOME_VALUES, VERDICT_VALUES };
+export { PRIORITY_VALUES, VERDICT_VALUES };
 
-const Level = Type.Union([
-	Type.Literal("low"),
-	Type.Literal("medium"),
-	Type.Literal("high"),
-	Type.Literal("xhigh"),
-	Type.Literal("max"),
+const Level = StringEnum([
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+	"max",
 	// simplify reuses this tool for structured apply-outcome reporting
 	// (harden-code-simplify). Not a review effort level — carries no verdict.
-	Type.Literal("simplify"),
-]);
+	"simplify",
+] as const);
 
 // --- schema -----------------------------------------------------------------
 
@@ -57,6 +66,7 @@ const FindingParams = Type.Object({
 			"产生该发现的角度 slug：correctness / reuse / simplification / efficiency / altitude / conventions（或更具体如 test-coverage）。",
 	}),
 	verdict: Type.Optional(Verdict),
+	priority: Type.Optional(Priority),
 	short_summary: Type.Optional(
 		Type.String({
 			description:
@@ -106,6 +116,7 @@ type LooseFinding = {
 	line?: number;
 	category: string;
 	verdict?: string;
+	priority?: string;
 	short_summary?: string;
 	summary: string;
 	failure_scenario: string;
@@ -124,7 +135,10 @@ function sanitizeFinding(f: LooseFinding): { f: LooseFinding; note?: string } |
 		note = `（outcome "${outcome}" 非法，已归一化为 skipped）`;
 		outcome = "skipped";
 	}
-	return { f: { ...f, outcome }, note };
+	// 非法 priority 静默丢弃（降至未标注），不影响该条 finding 存活。
+	const priority =
+		f.priority !== undefined && (PRIORITY_VALUES as readonly string[]).includes(f.priority) ? f.priority : undefined;
+	return { f: { ...f, outcome, priority }, note };
 }
 
 /**
@@ -153,6 +167,7 @@ interface FindingInput {
 	line?: number;
 	category: string;
 	verdict?: string;
+	priority?: string;
 	short_summary?: string;
 	summary: string;
 	failure_scenario: string;
@@ -200,13 +215,14 @@ function renderReport(p: ReportInput): string {
 	lines.push("|---|------|------|------|------|");
 	for (let i = 0; i < p.findings.length; i++) {
 		const f = p.findings[i]!;
-		lines.push(`| ${i + 1} | ${escapeCell(f.verdict ?? "")} | ${escapeCell(f.category)} | ${escapeCell(fmtLoc(f))} | ${escapeCell(f.short_summary ?? f.summary)} |`);
+		const verdictCell = [f.priority, f.verdict].filter(Boolean).join(" · ");
+		lines.push(`| ${i + 1} | ${escapeCell(verdictCell)} | ${escapeCell(f.category)} | ${escapeCell(fmtLoc(f))} | ${escapeCell(f.short_summary ?? f.summary)} |`);
 	}
 	lines.push("");
 	lines.push("**详情**");
 	lines.push("");
 	p.findings.forEach((f, i) => {
-		const v = f.verdict ? ` *(${f.verdict})*` : "";
+		const v = [f.priority, f.verdict].filter(Boolean).length > 0 ? ` *(${[f.priority, f.verdict].filter(Boolean).join(" · ")})*` : "";
 		const out = f.outcome ? `\n修复结果：\`${f.outcome}\`` : "";
 		const note = f.note ? `\n${f.note}` : "";
 		lines.push(`**${i + 1}. ${fmtLoc(f)} — ${f.category}**${v}`);
@@ -223,12 +239,12 @@ export const reviewReportTool = defineTool<typeof ReviewReportParams, ReviewRepo
 	name: "review_report",
 	label: "Report review findings",
 	description:
-		"Report code-review findings as a typed list — Pi's counterpart to CC's ReportFindings. Use this only when the active code-review instructions tell you to report findings with this tool. Call it once with the verified findings ranked most-severe first (empty array if nothing survived verification) and do not also print the findings as text — the tool renders a tidy Chinese Markdown report back to the conversation AND writes a machine-readable JSON to <cwd>/.pi/review/ for CI / --fix / --comment. When re-reporting after applying fixes, set `outcome` on each finding. 上报结构化 code-review 发现（CC ReportFindings 的 Pi 对等物）。",
+		"Report code-review findings as a typed list — Pi's counterpart to CC's ReportFindings. Use this only when the active code-review instructions tell you to report findings with this tool. Call it once with the verified findings ranked most-severe first (empty array if nothing survived verification) and do not also print the findings as text — the tool renders a tidy Chinese Markdown report back to the conversation AND writes a machine-readable JSON to the project's pi config dir (CONFIG_DIR_NAME, typically `.pi`) under review/ for CI / --fix / --comment. When re-reporting after applying fixes, set `outcome` on each finding. 上报结构化 code-review 发现（CC ReportFindings 的 Pi 对等物）。",
 	promptSnippet: "review_report — report structured code-review findings (renders Markdown + writes JSON for CI)",
 	promptGuidelines: [
 		"After verify + dedup, call `review_report` once with { level, findings } (most-severe first; empty array if none survived). Do not also hand-write the Markdown table — this tool renders it.",
 		"On re-report after --fix, set each finding's `outcome` (fixed / skipped / no_change_needed).",
-		"Use this tool only when the code-review skill instructs reporting findings; otherwise follow the active output format.",
+		"Use `review_report` only when the code-review skill instructs reporting findings; otherwise follow the active output format.",
 	],
 	parameters: ReviewReportParams,
 
@@ -267,7 +283,7 @@ export const reviewReportTool = defineTool<typeof ReviewReportParams, ReviewRepo
 		let writeError: string | null = null;
 		const now = new Date();
 		try {
-			const dir = path.join(ctx.cwd, ".pi", "review");
+			const dir = path.join(ctx.cwd, CONFIG_DIR_NAME, "review");
 			await fs.promises.mkdir(dir, { recursive: true });
 			const safeId = toolCallId.replace(/[^\w.-]+/g, "_");
 			const ts = now.toISOString().replace(/[:.]/g, "-");

package/src/commands/code-review.ts

@@ -1,100 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { bundledSkillPath } from "../skills.ts";
-
-/** Effort levels the /code-review command accepts (mirrors CC's effort enum). */
-export const REVIEW_LEVELS = ["low", "medium", "high", "xhigh", "max"] as const;
-export type ReviewLevel = (typeof REVIEW_LEVELS)[number];
-
-const DEFAULT_LEVEL: ReviewLevel = "low";
-
-/** Where the last explicitly-typed effort is persisted (CC 2.1.223 codeReviewLastEffort). */
-const STATE_FILE = path.join(os.homedir(), ".pi", ".pi-review-state.json");
-
-export type EffortSource = "explicit" | "last-used" | "default";
-
-/**
- * Parse a leading effort level out of raw args; the remainder (flags + target)
- * is returned verbatim. Pure — unit-testable. Mirrors CC's ecl()/Tjn(): the
- * first token is the level only if it matches the enum; otherwise the whole
- * string is the target/flags.
- */
-export function parseReviewArgs(args: string): { level: ReviewLevel | undefined; rest: string } {
-	const tokens = (args ?? "").trim().split(/\s+/).filter(Boolean);
-	if (tokens.length === 0) return { level: undefined, rest: "" };
-	const first = tokens[0]!.toLowerCase();
-	const isLevel = (REVIEW_LEVELS as readonly string[]).includes(first);
-	return {
-		level: isLevel ? (first as ReviewLevel) : undefined,
-		rest: isLevel ? tokens.slice(1).join(" ") : tokens.join(" "),
-	};
-}
-
-/**
- * Resolve the effective effort + where it came from. Pure — unit-testable.
- * Mirrors CC 2.1.223: explicit wins; otherwise reuse the last-typed level;
- * otherwise the default. (220 defaulted straight to low with no memory.)
- */
-export function resolveEffort(
-	explicit: ReviewLevel | undefined,
-	lastUsed: ReviewLevel | undefined,
-): { level: ReviewLevel; source: EffortSource } {
-	if (explicit) return { level: explicit, source: "explicit" };
-	if (lastUsed) return { level: lastUsed, source: "last-used" };
-	return { level: DEFAULT_LEVEL, source: "default" };
-}
-
-// Best-effort persistence — sticky-effort is a convenience, not a correctness
-// invariant; a read/write failure must not break the review.
-function readLastEffort(): ReviewLevel | undefined {
-	try {
-		const raw = JSON.parse(fs.readFileSync(STATE_FILE, "utf8")) as { codeReviewLastEffort?: unknown };
-		const v = raw.codeReviewLastEffort;
-		return typeof v === "string" && (REVIEW_LEVELS as readonly string[]).includes(v)
-			? (v as ReviewLevel)
-			: undefined;
-	} catch {
-		return undefined;
-	}
-}
-function writeLastEffort(level: ReviewLevel): void {
-	try {
-		fs.mkdirSync(path.dirname(STATE_FILE), { recursive: true });
-		fs.writeFileSync(STATE_FILE, JSON.stringify({ codeReviewLastEffort: level }));
-	} catch {
-		/* ignore — non-critical */
-	}
-}
-
-/**
- * Register the /code-review command — triggers the code-review skill.
- *
- * Handler decides the effective effort deterministically (CC 2.1.223): an
- * explicit level is persisted and used; with no level, the last-typed level is
- * reused; with no history, it falls back to low. The decision is announced in
- * the trigger message so it is observable — same pattern as /code-simplify.
- */
-export function registerCodeReview(pi: ExtensionAPI): void {
-	pi.registerCommand("code-review", {
-		description:
-			"Review the current diff using the code-review skill. Usage: /code-review [low|medium|high|xhigh|max] [--fix] [--comment] [--share] [<pr#>|<branch>|<path>]",
-		getArgumentCompletions(prefix) {
-			const tokens = ["low", "medium", "high", "xhigh", "max", "--fix", "--comment", "--share"];
-			return tokens.filter((t) => t.startsWith(prefix)).map((t) => ({ label: t, value: t }));
-		},
-		async handler(args) {
-			const { level: explicit, rest } = parseReviewArgs(args ?? "");
-			// Skip the read when we just wrote it — resolveEffort returns `explicit` unchanged.
-			const lastUsed = explicit ? undefined : readLastEffort();
-			if (explicit) writeLastEffort(explicit); // CC 2.1.223: remember the explicit level
-			const { level, source } = resolveEffort(explicit, lastUsed);
-			pi.sendUserMessage(
-				`Run a code review now. Effective effort: ${level} (${source})${rest ? `; extra args: ${rest}` : ""}.\n\n` +
-					`First load the review skill with the read tool: ${bundledSkillPath("code-review/SKILL.md")}. ` +
-					`Then follow it exactly — use the \`subagent\` tool for any fan-out / verify / gap-hunt the skill calls for.`,
-			);
-		},
-	});
-}

package/src/commands/code-simplify.ts

@@ -1,100 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { bundledSkillPath } from "../skills.ts";
-
-/** Context fraction at which we fall back to single-pass — a Pi-specific heuristic (see decideSimplifyMode). */
-const CONTEXT_NEAR_FULL_THRESHOLD = 0.8;
-
-export type SimplifyMode = "parallel" | "single-pass";
-
-/** Priority order for picking a verification command from package.json scripts. */
-const VERIFY_SCRIPT_PRIORITY = ["check", "test", "lint", "typecheck"] as const;
-
-/**
- * Pick the project verification command from a package.json `scripts` map, in
- * priority order (check → test → lint → typecheck). Pure — unit-testable.
- * Returns the runnable command (e.g. `npm run check`) or null when none exists.
- */
-export function detectVerifyCommand(scripts: Record<string, string> | null): string | null {
-	if (!scripts) return null;
-	for (const key of VERIFY_SCRIPT_PRIORITY) {
-		const v = scripts[key];
-		if (typeof v === "string" && v.trim() !== "") return `npm run ${key}`;
-	}
-	return null;
-}
-
-/** Read package.json scripts from `cwd`; returns null when absent/unparseable. */
-function readScriptsAt(cwd: string): Record<string, string> | null {
-	try {
-		const pkg = JSON.parse(fs.readFileSync(path.join(cwd, "package.json"), "utf8")) as {
-			scripts?: Record<string, string>;
-		};
-		return pkg.scripts ?? null;
-	} catch {
-		return null;
-	}
-}
-
-/**
- * Decide simplify mode deterministically from real context usage + tool availability.
- * Pure function — unit-testable.
- *
- * CC parity note: CC's /simplify guard (Dii, verified in the 2.1.227 binary) is
- * a SPAWN-DEPTH recursion limit, NOT a context check — `ok(ctx.agentContext) >= wV()`
- * where ok() returns the agent's depth (main=0) and wV() returns
- * CLAUDE_CODE_MAX_SUBAGENT_SPAWN_DEPTH (default 3). That is N/A on Pi: the
- * `subagent` tool spawns a fresh subprocess (depth 0), so depth never accumulates.
- * The context-fraction heuristic below is a Pi-specific substitute (don't fan out
- * when the parent's context is near-full), NOT a mirror of Dii. The other Dii clause
- * — the Agent tool must be in the allowlist — IS mirrored here as `hasSubagent`.
- */
-export function decideSimplifyMode(opts: {
-	tokens: number | null;
-	contextWindow: number;
-	hasSubagent: boolean;
-}): SimplifyMode {
-	const { tokens, contextWindow, hasSubagent } = opts;
-	// Conservative: if we can't measure context (tokens unknown / window 0) or the
-	// subagent tool isn't registered, don't risk fan-out — go single-pass.
-	if (tokens == null || contextWindow <= 0 || !hasSubagent) return "single-pass";
-	const nearFull = tokens / contextWindow >= CONTEXT_NEAR_FULL_THRESHOLD;
-	return nearFull ? "single-pass" : "parallel";
-}
-
-/**
- * Register the /code-simplify command. The handler decides parallel vs single-pass from
- * ctx.getContextUsage() (real token count) + subagent tool availability — this is the
- * deterministic Jvo guard that a pure-prompt skill cannot reproduce.
- */
-export function registerSimplify(pi: ExtensionAPI): void {
-	pi.registerCommand("code-simplify", {
-		description:
-			"Clean up the changed code (reuse/simplification/efficiency/altitude) using the simplify skill. Mode (parallel 4-agent vs single-pass) is decided by the handler from real context usage. Usage: /code-simplify [<target>]",
-		async handler(args, ctx) {
-			const usage = ctx.getContextUsage();
-			const hasSubagent = pi.getAllTools().some((t) => t.name === "subagent");
-			const mode = decideSimplifyMode({
-				tokens: usage?.tokens ?? null,
-				contextWindow: usage?.contextWindow ?? 0,
-				hasSubagent,
-			});
-			const pct = usage && usage.percent != null ? `${Math.round(usage.percent)}%` : "?";
-			const bodyLabel = mode === "parallel" ? "PARALLEL MODE" : "SINGLE-PASS MODE";
-			const verifyCmd = detectVerifyCommand(readScriptsAt(ctx.cwd));
-			const verifyLine = verifyCmd
-				? `Verification command: \`${verifyCmd}\` (detected from package.json scripts). After applying Phase 2 fixes, run it; on failure, follow the skill's auto-revert procedure — never leave the working tree verified-broken.`
-				: `No verification command detected in package.json (looked for check/test/lint/typecheck). Apply fixes and report outcomes, but state in the report that no verification was run (verification is opportunistic, never blocking).`;
-			pi.sendUserMessage(
-				`Clean up the changed code now. Target: ${args || "(whole diff)"}.\n\n` +
-					`Handler decided ${mode} mode (context ${pct} full, subagent ${hasSubagent ? "available" : "absent"}). ` +
-					`Load ${bundledSkillPath("simplify/SKILL.md")} via the read tool and follow the ${bodyLabel} body. ` +
-					(mode === "parallel"
-						? `Use the \`subagent\` tool (mode: parallel) for the 4-agent fan-out.`
-						: `Work the four angles inline — do not fake fan-out.`) +
-					`\n${verifyLine}`,
-			);
-		},
-	});
-}