paseo-req-kit 1.14.0-beta.3 → 1.14.0-beta.4

package/engine/src/codeowners.ts

@@ -0,0 +1,87 @@
+// CODEOWNERS (1.14): who should review a change, from the repository's own CODEOWNERS file
+// (GitLab and GitHub format: "pattern @user @group email", the last matching line wins; GitLab
+// "[Section]" headers and "^[Optional]" are accepted). Used as the default reviewers on the code
+// review page, which the person can change before submitting.
+import fs from "node:fs";
+import path from "node:path";
+
+export const CODEOWNERS_FILES = ["CODEOWNERS", ".gitlab/CODEOWNERS", ".github/CODEOWNERS", "docs/CODEOWNERS"];
+
+export interface OwnerRule {
+  pattern: string;
+  owners: string[];
+  /** The GitLab section the line is in, or null. */
+  section: string | null;
+}
+
+export function readCodeowners(repo: string): { file: string; rules: OwnerRule[] } | null {
+  for (const rel of CODEOWNERS_FILES) {
+    const file = path.join(repo, rel);
+    try {
+      return { file: rel, rules: parseCodeowners(fs.readFileSync(file, "utf8")) };
+    } catch {
+      // Not this one.
+    }
+  }
+  return null;
+}
+
+export function parseCodeowners(text: string): OwnerRule[] {
+  const rules: OwnerRule[] = [];
+  let section: string | null = null;
+  let sectionOwners: string[] = [];
+  for (const raw of text.split(/\r?\n/)) {
+    const line = raw.replace(/(^|\s)#.*$/, "").trim();
+    if (!line) continue;
+    // GitLab: "[Section]", "^[Optional section]", "[Section][2] @default-owner".
+    const sec = /^\^?\[([^\]]+)\](?:\[\d+\])?\s*(.*)$/.exec(line);
+    if (sec) {
+      section = sec[1].trim();
+      sectionOwners = sec[2].split(/\s+/).filter(Boolean);
+      continue;
+    }
+    const parts = line.split(/\s+/);
+    const pattern = parts[0].replace(/\\ /g, " ");
+    const owners = parts.slice(1);
+    rules.push({ pattern, owners: owners.length ? owners : sectionOwners, section });
+  }
+  return rules;
+}
+
+/** gitignore-like matching of a CODEOWNERS pattern against a "/"-separated path. */
+export function matchesPattern(pattern: string, file: string): boolean {
+  let p = pattern;
+  const anchored = p.startsWith("/") || p.slice(0, -1).includes("/");
+  p = p.replace(/^\//, "");
+  const dirOnly = p.endsWith("/");
+  if (dirOnly) p = p.slice(0, -1);
+  let re = "";
+  for (let i = 0; i < p.length; i++) {
+    const c = p[i];
+    if (c === "*" && p[i + 1] === "*") {
+      // "**/" any directories, "/**" everything below.
+      re += p[i + 2] === "/" ? "(?:.*/)?" : ".*";
+      i += p[i + 2] === "/" ? 2 : 1;
+    } else if (c === "*") re += "[^/]*";
+    else if (c === "?") re += "[^/]";
+    else re += c.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+  }
+  const prefix = anchored ? "^" : "^(?:.*/)?";
+  // A directory pattern (or a name that is a directory) covers everything below it.
+  const rx = new RegExp(`${prefix}${re}${dirOnly ? "/.*" : "(?:/.*)?"}$`);
+  return rx.test(file);
+}
+
+/** The owners of each file (last matching rule per section), and all of them together. */
+export function ownersFor(rules: OwnerRule[], files: string[]): { byFile: Record<string, string[]>; all: string[] } {
+  const byFile: Record<string, string[]> = {};
+  const all = new Set<string>();
+  for (const file of files) {
+    const winners = new Map<string | null, string[]>();
+    for (const r of rules) if (matchesPattern(r.pattern, file)) winners.set(r.section, r.owners);
+    const owners = [...new Set([...winners.values()].flat())];
+    byFile[file] = owners;
+    for (const o of owners) all.add(o);
+  }
+  return { byFile, all: [...all] };
+}

package/engine/src/main.ts

@@ -1,6 +1,7 @@
 // The long-running pipeline process. Normally started by launch.ts, detached
 // from the chat agent's shell; can also be run in the foreground for debugging.
 
+import { pendingHumanReview, writeHumanReview } from "./code-review.js";
 import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
@@ -191,11 +192,20 @@ async function main(): Promise<number> {
       approval:
         args.approve && mode.previous.status === "waiting_for_approval"
           ? { attempt: mode.previous.attempt, status: "approved", at: now }
-          : startOver
-            ? null
-            : (mode.previous.approval ?? null),
+          : // 1.14: code review comments do not change what the requester confirmed: no second confirmation.
+            args.reviewFix && mode.previous.approval?.status === "approved"
+            ? { ...mode.previous.approval, attempt: mode.previous.attempt + 1 }
+            : startOver
+              ? null
+              : (mode.previous.approval ?? null),
       gate: mode.kind === "restart" ? null : (mode.previous.gate ?? null),
     };
+    // 1.14: the person's code review comments are this attempt's to handle.
+    if (args.reviewFix && mode.kind === "resume-from-design") {
+      const featureAbs = path.join(repo, featureDir);
+      const pending = pendingHumanReview(featureAbs);
+      if (pending) writeHumanReview(featureAbs, { ...pending, consumedAttempt: mode.previous.attempt + 1 });
+    }
     if (checked.entersVerify) {
       // A develop-only run that ends with its development report gets a full report after verification.
       delete state.results.report;

package/engine/src/preflight.ts

@@ -1,3 +1,4 @@
+import { pendingHumanReview } from "./code-review.js";
 import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
@@ -14,7 +15,7 @@ import {
 } from "./config.js";
 import { gitInfo } from "./git.js";
 import { samePath } from "./paths.js";
-import { currentLockHolder, type PipelineState, readState, statePath } from "./state.js";
+import { currentLockHolder, isAlive, type PipelineState, readState, statePath } from "./state.js";
 
 export interface LaunchArgs {
   repo: string;
@@ -33,6 +34,8 @@ export interface LaunchArgs {
   cardFields?: boolean;
   /** 1.14 --track: register a requirement being aligned, before the pipeline runs (shown in the plugin). */
   track?: boolean;
+  /** 1.14 --review-fix: a person's code review asked for changes; a new attempt handles them. */
+  reviewFix?: boolean;
   /** --spec-review: independent review of the draft spec, before confirmation. */
   specReview: boolean;
   /** --worktree: create a Paseo worktree workspace for this requirement and develop there. */
@@ -254,6 +257,12 @@ export function preflight(
         ? "这个需求的流水线已经完成。如需重新完整运行，请加 --restart。"
         : `这个需求已有运行记录（状态：${previous.status}）。从中断处继续请加 --resume，从头开始请加 --restart。`;
     throw new PreflightError(hint);
+  } else if (args.reviewFix) {
+    // 1.14: the person's code review (plugin) asked for changes; the spec itself did not change.
+    if (previous.status === "running" && isAlive(previous.pid)) throw new PreflightError("流水线正在运行，等它结束后再处理人工评审意见。");
+    const pending = pendingHumanReview(path.join(repo, featureDir));
+    if (!pending) throw new PreflightError("没有待处理的人工代码评审意见（在插件的代码审查页上提交\"退回修改\"后才有）。");
+    mode = { kind: "resume-from-design", previous, reason: `人工代码评审提出了 ${pending.items.length} 条修改意见（见 code-review.md 的"人工评审"一节和 changes.md），需求说明不变，从方案设计开始只处理这些意见` };
   } else if (args.approve && previous.status !== "waiting_for_approval") {
     throw new PreflightError(`这个需求没有等待确认的方案（状态：${previous.status}），不需要 --approve。继续开发请用 --resume。`);
   } else if (previous.status === "waiting_for_approval" && currentSpecHash(specPath) !== previous.specHash) {

package/engine/src/review-assets/code.css

@@ -0,0 +1,93 @@
+:root {
+  --bg: #f6f7f9; --surface: #ffffff; --surface-2: #f1f3f6; --text: #1c2430; --muted: #5d6b7c; --border: #dfe3e9;
+  --accent: #2457d6; --accent-text: #ffffff; --ok: #15803d; --ok-soft: #e7f6ec; --danger: #b91c1c; --danger-soft: #fdecec; --warn: #b45309; --warn-soft: #fdf3e2;
+  --add: #e6f6ea; --del: #fdecec; --flash: #fff4c2;
+  color-scheme: light;
+}
+@media (prefers-color-scheme: dark) {
+  :root {
+    --bg: #12161c; --surface: #1a2029; --surface-2: #222a35; --text: #e6eaf0; --muted: #9aa7b8; --border: #2e3846;
+    --accent: #6f9bff; --accent-text: #0d1420; --ok: #4ade80; --ok-soft: #173322; --danger: #f87171; --danger-soft: #3a1c1c; --warn: #fbbf24; --warn-soft: #3a2c12;
+    --add: #15301f; --del: #3a1c1c; --flash: #4a3f12;
+    color-scheme: dark;
+  }
+}
+* { box-sizing: border-box; }
+[hidden] { display: none !important; }
+body { margin: 0; background: var(--bg); color: var(--text); font: 15px/1.6 system-ui, -apple-system, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif; padding-bottom: 110px; }
+.top { padding: 20px 24px 8px; }
+.eyebrow { font-size: 13px; color: var(--muted); }
+h1 { margin: 2px 0 4px; font-size: 22px; }
+h2 { font-size: 15px; margin: 0 0 6px; }
+.muted { color: var(--muted); }
+.small { font-size: 13px; }
+.pad { padding: 8px 12px; }
+.banner { margin: 8px 24px; padding: 10px 14px; border-radius: 10px; background: var(--surface-2); border: 1px solid var(--border); }
+.banner.ok { background: var(--ok-soft); border-color: var(--ok); }
+.banner.warn { background: var(--warn-soft); border-color: var(--warn); }
+.layout { display: grid; grid-template-columns: 260px minmax(0, 1fr); gap: 16px; padding: 0 24px; }
+.files { position: sticky; top: 8px; align-self: start; max-height: calc(100vh - 140px); overflow: auto; background: var(--surface); border: 1px solid var(--border); border-radius: 12px; padding: 10px; font-size: 13px; }
+.nav-title { font-weight: 600; margin-bottom: 6px; }
+.files a { display: flex; justify-content: space-between; gap: 6px; padding: 4px 6px; border-radius: 6px; color: var(--text); text-decoration: none; word-break: break-all; }
+.files a:hover { background: var(--surface-2); }
+.files a.doc { color: var(--muted); }
+main { min-width: 0; }
+.intro { margin: 8px 0 12px; }
+.card { background: var(--surface); border: 1px solid var(--border); border-radius: 12px; padding: 14px 16px; margin: 0 0 12px; }
+.badge { font-size: 12px; padding: 1px 8px; border-radius: 999px; background: var(--surface-2); color: var(--muted); white-space: nowrap; }
+.badge.danger { background: var(--danger-soft); color: var(--danger); }
+.badge.warn { background: var(--warn-soft); color: var(--warn); }
+.badge.ok { background: var(--ok-soft); color: var(--ok); }
+.file { background: var(--surface); border: 1px solid var(--border); border-radius: 12px; margin-bottom: 12px; overflow: hidden; }
+.file-head { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; padding: 8px 12px; background: var(--surface-2); cursor: pointer; border-bottom: 1px solid var(--border); }
+.file.folded .file-body { display: none; }
+.file.folded .file-head { border-bottom: 0; }
+.path { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 13px; font-weight: 600; word-break: break-all; }
+.plus { color: var(--ok); font-size: 13px; }
+.minus { color: var(--danger); font-size: 13px; }
+.file-body { overflow-x: auto; }
+table.diff { border-collapse: collapse; width: 100%; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 12.5px; line-height: 1.5; }
+.diff td { padding: 0 8px; vertical-align: top; }
+.diff .num { width: 1%; min-width: 44px; text-align: right; color: var(--muted); user-select: none; }
+.diff .code { white-space: pre; }
+.diff .hunk td { color: var(--muted); background: var(--surface-2); padding: 2px 8px; }
+.diff .line { cursor: pointer; }
+.diff .line:hover td { outline: 1px solid var(--border); }
+.diff .add td { background: var(--add); }
+.diff .del td { background: var(--del); }
+.diff .flash td, .flash { background: var(--flash) !important; }
+.finding { border: 1px solid var(--border); border-left: 4px solid var(--border); border-radius: 8px; padding: 8px 10px; margin: 6px 0; background: var(--surface); font-family: system-ui, -apple-system, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif; font-size: 14px; white-space: normal; }
+.finding.danger { border-left-color: var(--danger); }
+.finding.warn { border-left-color: var(--warn); }
+.finding.decided-ok { opacity: 0.6; }
+.finding-row td, .comment-row td { padding: 4px 12px 8px; }
+.finding-head { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; }
+.finding-text { margin: 4px 0; }
+.where { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 12px; color: var(--accent); }
+.marks { display: flex; gap: 8px; margin-top: 6px; }
+.comment { border: 1px solid var(--accent); border-radius: 8px; padding: 8px 10px; background: var(--surface); font-family: system-ui, -apple-system, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif; display: flex; flex-direction: column; gap: 6px; align-items: flex-start; }
+textarea, input { font: inherit; color: inherit; background: var(--surface); border: 1px solid var(--border); border-radius: 8px; padding: 6px 8px; width: 100%; }
+.note-input { margin-top: 6px; }
+.btn { font: inherit; border: 1px solid var(--border); background: var(--surface); color: var(--text); border-radius: 8px; padding: 6px 14px; cursor: pointer; }
+.btn.small { padding: 2px 10px; font-size: 13px; }
+.btn.on-fix { background: var(--danger-soft); border-color: var(--danger); color: var(--danger); }
+.btn.on-ok { background: var(--ok-soft); border-color: var(--ok); color: var(--ok); }
+.btn.primary { background: var(--accent); border-color: var(--accent); color: var(--accent-text); }
+.btn.danger { border-color: var(--danger); color: var(--danger); }
+.btn:disabled { opacity: 0.5; cursor: default; }
+.bar { position: fixed; left: 0; right: 0; bottom: 0; display: flex; flex-wrap: wrap; gap: 10px 16px; align-items: center; padding: 10px 24px; background: var(--surface); border-top: 1px solid var(--border); }
+.bar .summary { flex: 1 1 240px; font-size: 13px; }
+.field { display: flex; align-items: center; gap: 6px; font-size: 13px; white-space: nowrap; }
+.field input { width: 200px; }
+.actions { display: flex; gap: 8px; }
+.toast { position: fixed; left: 50%; bottom: 90px; transform: translateX(-50%); max-width: min(640px, 92vw); background: var(--text); color: var(--bg); padding: 10px 14px; border-radius: 10px; box-shadow: 0 6px 24px rgba(0,0,0,.2); white-space: pre-line; }
+@media (max-width: 860px) {
+  .layout { grid-template-columns: minmax(0, 1fr); padding: 0 12px; }
+  .files { position: static; max-height: 220px; }
+  .top { padding: 16px 12px 6px; }
+  .banner { margin: 8px 12px; }
+  .bar { padding: 10px 12px; }
+  .field { flex: 1 1 100%; }
+  .field input { width: 100%; }
+  body { padding-bottom: 220px; }
+}

package/engine/src/review-assets/code.html

@@ -0,0 +1,43 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>代码审查</title>
+<link rel="stylesheet" href="code.css">
+</head>
+<body>
+<header class="top">
+  <div>
+    <div class="eyebrow" id="project"></div>
+    <h1 id="title">代码审查</h1>
+    <div class="muted" id="sub"></div>
+  </div>
+</header>
+<section id="status" class="banner" hidden></section>
+<div class="layout">
+  <nav class="files" id="files" aria-label="改动的文件"></nav>
+  <main>
+    <section id="summary" class="card" hidden></section>
+    <section id="ai" class="card" hidden></section>
+    <p class="muted intro">点代码行写意见（只对这一行）；AI 的意见可以标<b>要改</b>或<b>不用改</b>。看完在下面选择<b>退回修改</b>（流水线会按意见改，改完再评审、再验证）或<b>评审通过</b>。进度会自动保存。</p>
+    <div id="diffs"></div>
+    <section class="card">
+      <h2>总体意见（可不填）</h2>
+      <textarea id="note" rows="3" placeholder="例如：整体可以，但导出接口要加权限校验"></textarea>
+    </section>
+  </main>
+</div>
+<footer class="bar">
+  <div class="summary" id="count"></div>
+  <label class="field">审核人 <input id="reviewers" placeholder="@用户名，用逗号分开"></label>
+  <label class="field">评审人 <input id="reviewer" placeholder="你的名字" maxlength="60"></label>
+  <div class="actions">
+    <button id="changes" class="btn danger" disabled>退回修改</button>
+    <button id="approve" class="btn primary" disabled>评审通过</button>
+  </div>
+</footer>
+<div id="toast" class="toast" hidden></div>
+<script src="code.js"></script>
+</body>
+</html>