thurview 0.19.0 → 0.21.0

package/README.md

@@ -74,6 +74,8 @@ Three kinds of document, and one companion that writes none:
 - **`thurview-fix`** - no browser and no reader. It reviews, fixes what it is
   sure of behind the repository's own tests and lint, and reports the rest -
   optionally as inline comments on the change request.
+- **`thurview-pr-review`** - reviews a change request on the forge and follows
+  it to merge: one summary edited in place, one resolvable thread per finding.
 
 <details>
 <summary><b>Other ways to install</b> - one skill at a time, pin to a release,
@@ -263,9 +265,7 @@ repository's Pages folder.
   claims a reader is there when none is: a question asked with no agent
   attached is queued, not lost, and reaches the agent the next time it checks.
 - **Revisions**: every publish is sealed; switch back to earlier ones.
-- **Theme**: the agent reads the project's design tokens and fonts and
-  publishes them with the review, so each review looks like the code it
-  explains. The default skin applies when the project has none.
+- **Theme**: light or dark, following the system until you pick one in the ⋯ menu.
 
 Everything runs locally against your checkout. The server listens on
 loopback and, when present, your Tailscale address, so a phone or another
@@ -373,8 +373,6 @@ The agent writes three files in `~/.thurview/reviews/<id>/`:
 - `map.yaml`: the software map at head, optionally at base. In an explainer it
   carries the breadth the prose has no room for, and a node's `files` globs are
   what let a file count as placed rather than not examined.
-- `theme.yaml`: the look, derived from the reviewed project's own design
-  system (tokens, fonts, shape, code palette). Empty means the default skin.
 
 `security` is a review's own dimension, shown to the reader under the interface
 delta rather than left to a section the agent might not write. It is

package/dist/cli.js

@@ -12,8 +12,6 @@ import * as g from "./git.js";
 import { SCHEMA, home, newId, now, readReview, writeReview, listReviews, reviewsFor, reviewDir, revisionDir, passFile, readThreads, readText, writeText, writeJson, readJson, serverStateFile, deleteReview, kindOf, } from "./store.js";
 import { compileDocument, compileMap, globToRegExp } from "./document/compile.js";
 import { computeCoverage, scopeGlob } from "./coverage.js";
-import { parseTheme, compileTheme } from "./theme.js";
-import { registerTheme } from "./highlight.js";
 import { replyThread, setThreadStatus, needsAgent } from "./threads.js";
 import { targetLabel, truncate } from "./thread-state.js";
 import { attach } from "./presence.js";
@@ -23,6 +21,9 @@ import { parseFlags, helpFor, str, bool } from "./flags.js";
 import { forgeFor, repoOf, summariseCi, } from "./forge/index.js";
 import { parseSubmission, longComments, buildPass } from "./forge/submission.js";
 import { recordForgeFacts, ciFacts } from "./queue.js";
+import { parsePass } from "./pr-review/format.js";
+import { CATEGORIES, CONFIDENCE } from "./pr-review/categories.js";
+import { readState, startReview, stopReview, sync, waitForEvent, STOP_LABEL, } from "./pr-review/follow.js";
 import { VERSION } from "./version.js";
 const execFileP = promisify(execFile);
 const HERE = dirname(fileURLToPath(import.meta.url));
@@ -277,18 +278,6 @@ const TEMPLATE_MAP = `# Software map: where this change landed in the system, an
 nodes: []
 edges: []
 `;
-const TEMPLATE_THEME = `# Look of this review, derived from the reviewed project's own design system.
-# Leave this file empty (or delete it) for the default skin. See the thurview skill
-# reference (references/theme.md) for every key. Example:
-#
-# name: acme-web
-# source: tailwind.config.ts, src/styles/tokens.css
-# mode: light
-# colors: { bg: "#ffffff", bg2: "#f6f7f9", fg: "#111827", fg2: "#4b5563", muted: "#9ca3af", line: "#e5e7eb", accent: "#2563eb", link: "#2563eb", ok: "#16a34a", warn: "#d97706", del: "#dc2626" }
-# fonts: { display: "Inter, sans-serif", body: "Inter, sans-serif", mono: "'JetBrains Mono', monospace", stylesheets: ["https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap"] }
-# shape: { radius: 8px, bevel: false, glow: false, scanlines: false, headingTransform: none }
-# code: { keyword: "#7c3aed", string: "#15803d", function: "#b45309", variable: "#0369a1", comment: "#9ca3af" }
-`;
 const TEMPLATE_EXPLAIN_MD = (title) => `# ${title}
 
 **Summary**
@@ -465,7 +454,6 @@ async function pinOneCommit(p, k) {
     await writeText(join(reviewDir(id), "review.md"), k.templates.md(review.title));
     await writeText(join(reviewDir(id), "data.yaml"), k.templates.data);
     await writeText(join(reviewDir(id), "map.yaml"), k.templates.map);
-    await writeText(join(reviewDir(id), "theme.yaml"), TEMPLATE_THEME);
     await writeReview(review);
     return { review, reused: false, scope, commit, worktree, inScope };
 }
@@ -543,7 +531,7 @@ const SPECS = {
         examples: ["thurview info", "thurview info --all --fields pins,inSync"],
     },
     publish: {
-        description: "Validate review.md, data.yaml, map.yaml and theme.yaml against the pins and seal a revision",
+        description: "Validate review.md, data.yaml and map.yaml against the pins and seal a revision",
         flags: {
             review: {
                 kind: "string",
@@ -664,6 +652,33 @@ const SPECS = {
             'thurview forge reply <threadId> --body "<answer>" --resolve --at <sha>',
         ],
     },
+    "pr-review": {
+        description: "Follow a pull or merge request until it merges: one summary edited in place, one resolvable thread per finding",
+        args: "status|sync --file <pass.json>|wait|stop|start",
+        flags: {
+            change: { kind: "string", help: "change request number or URL" },
+            review: { kind: "string", help: "review id prefix; its binding names the change request" },
+            forge: {
+                kind: "string",
+                help: "github or gitlab, when the host is not one of the two known ones",
+            },
+            repo: { kind: "string", help: "host/path, when `origin` is not the repository to post to" },
+            file: { kind: "string", help: "sync: the JSON pass to post" },
+            "dry-run": { kind: "boolean", help: "sync: validate and render, post nothing" },
+            interval: { kind: "string", help: "wait: seconds between polls", default: "120" },
+            timeout: {
+                kind: "string",
+                help: "wait: seconds before answering `none`, so one call fits a tool limit",
+                default: "540",
+            },
+        },
+        examples: [
+            "thurview pr-review status --change 123",
+            "thurview pr-review sync --change 123 --file pass.json --dry-run",
+            "thurview pr-review wait --change 123",
+            "thurview pr-review stop --change 123",
+        ],
+    },
     delete: {
         description: "Delete a review and everything stored for it (the code is untouched)",
         flags: { review: { kind: "string", help: "review id prefix (required)" } },
@@ -845,7 +860,6 @@ const commands = {
                 await writeText(join(reviewDir(id), "review.md"), TEMPLATE_MD(review.title));
                 await writeText(join(reviewDir(id), "data.yaml"), TEMPLATE_DATA);
                 await writeText(join(reviewDir(id), "map.yaml"), TEMPLATE_MAP);
-                await writeText(join(reviewDir(id), "theme.yaml"), TEMPLATE_THEME);
                 await writeReview(review);
             }
         }
@@ -871,7 +885,6 @@ const commands = {
                 document: join(dir, "review.md"),
                 data: join(dir, "data.yaml"),
                 map: join(dir, "map.yaml"),
-                theme: join(dir, "theme.yaml"),
             },
             change: stat,
             guidance: await guidanceFiles(worktree),
@@ -907,7 +920,6 @@ const commands = {
                 document: join(dir, "review.md"),
                 data: join(dir, "data.yaml"),
                 map: join(dir, "map.yaml"),
-                theme: join(dir, "theme.yaml"),
             },
             scale: { filesInScope: pinned.inScope.length },
             guidance: await guidanceFiles(worktree),
@@ -941,7 +953,6 @@ const commands = {
                 document: join(dir, "review.md"),
                 data: join(dir, "data.yaml"),
                 map: join(dir, "map.yaml"),
-                theme: join(dir, "theme.yaml"),
             },
             scale: { filesInScope: pinned.inScope.length },
             guidance: await guidanceFiles(worktree),
@@ -1007,22 +1018,13 @@ const commands = {
             }
         }
         const diags = [];
-        let theme = null;
-        if (themeYaml) {
-            const t = parseTheme(themeYaml);
-            diags.push(...t.diagnostics);
-            if (t.theme) {
-                theme = compileTheme(t.theme, (p) => `/api/reviews/${review.id}/blob?path=${encodeURIComponent(p)}`);
-                for (const f of t.theme.fonts.files)
-                    if (!(await g.fileExists(review.worktree, review.pins.head, f.path)))
-                        diags.push({
-                            level: "error",
-                            file: "theme.yaml",
-                            message: `fonts.files: ${f.path} does not exist at the pinned head commit`,
-                        });
-            }
-        }
-        const themeName = theme ? await registerTheme(theme.shiki) : undefined;
+        // an older scaffold wrote a comments-only template; only a theme someone wrote is worth a warning
+        if (themeYaml?.replace(/^\s*#.*$/gm, "").trim())
+            diags.push({
+                level: "warning",
+                file: "theme.yaml",
+                message: "ignored: a review no longer restyles thurview's own light and dark theme; delete the file",
+            });
         const kind = kindOf(review);
         const doc = await compileDocument({
             cwd: review.worktree,
@@ -1030,7 +1032,6 @@ const commands = {
             reviewMd,
             dataYaml: dataYaml ?? "",
             kind,
-            ...(themeName ? { themeName } : {}),
         });
         diags.push(...doc.diagnostics);
         let map = null;
@@ -1127,9 +1128,6 @@ const commands = {
         await writeJson(join(rdir, "map.json"), map);
         await writeJson(join(rdir, "changes.json"), changes);
         await writeJson(join(rdir, "coverage.json"), coverage);
-        if (themeYaml !== null)
-            await cp(join(dir, "theme.yaml"), join(rdir, "theme.yaml"));
-        await writeJson(join(rdir, "theme.json"), theme);
         await writeJson(join(rdir, "meta.json"), {
             revision: n,
             at: now(),
@@ -1137,7 +1135,6 @@ const commands = {
             pins: review.pins,
             kind,
             hasMap: !!map,
-            theme: theme?.name ?? "default",
         });
         review.title = doc.document.title;
         review.revision = n;
@@ -1168,7 +1165,6 @@ const commands = {
                             interfaces: doc.document.interfaces?.verdict ?? "(unavailable)",
                             security: doc.document.security?.verdict ?? "(unavailable)",
                         }),
-                theme: theme?.name ?? "default",
                 url: url ?? "(server not running)",
             },
         };
@@ -1910,6 +1906,117 @@ const commands = {
             help: ["Run `thurview setup hooks` or `thurview setup skill` to install what is missing"],
         };
     },
+    async "pr-review"(args) {
+        const sub = args[0];
+        const subs = ["status", "sync", "wait", "stop", "start"];
+        if (!sub || !subs.includes(sub))
+            throw new AxiError(`unknown pr-review command${sub ? ` ${sub}` : ""}`, "VALIDATION_ERROR", subs.map((x) => `thurview pr-review ${x} --change <ref>`));
+        const s = spec("pr-review").flags;
+        const p = parseFlags(`pr-review ${sub}`, args.slice(1), s);
+        const ctx = await forgeContext(p);
+        const where = `${ctx.repo.path}#${ctx.cr.number}`;
+        const again = `thurview pr-review wait --change ${ctx.cr.number}`;
+        if (sub === "status") {
+            const st = await readState(ctx);
+            const open = st.findings.filter((f) => f.open);
+            return {
+                change: {
+                    url: ctx.cr.url,
+                    state: ctx.cr.state,
+                    author: ctx.cr.author,
+                    head: ctx.cr.head,
+                    base: ctx.cr.base,
+                    baseBranch: ctx.cr.baseBranch,
+                },
+                review: st.summary
+                    ? {
+                        state: st.summary.marker.state,
+                        reviewedHead: st.summary.marker.head,
+                        pushedSince: st.summary.marker.head !== ctx.cr.head,
+                    }
+                    : "none yet (the first pass reviews the whole change)",
+                ...(st.stop ? { stopRequested: st.stop } : {}),
+                open: open.length
+                    ? open.map((f) => ({
+                        id: f.id,
+                        category: f.category,
+                        severity: f.severity,
+                        at: f.path ? `${f.path}:${f.line ?? ""}` : "",
+                        title: f.title,
+                    }))
+                    : "0 (no open finding)",
+                categories: Object.fromEntries(Object.entries(CATEGORIES).map(([k, v]) => [k, v.definition])),
+                confidence: CONFIDENCE,
+                help: [
+                    st.summary && st.summary.marker.head !== ctx.cr.head
+                        ? `Review only \`git diff ${st.summary.marker.head.slice(0, 12)} ${ctx.cr.head.slice(0, 12)}\`, then decide each open finding: still valid, or fixed`
+                        : `Review \`git diff ${ctx.cr.base.slice(0, 12)} ${ctx.cr.head.slice(0, 12)}\``,
+                    `Write the pass file and run \`thurview pr-review sync --change ${ctx.cr.number} --file <pass.json> --dry-run\``,
+                ],
+            };
+        }
+        if (sub === "sync") {
+            const file = str(p, "file");
+            if (!file)
+                throw new AxiError("--file is required", "VALIDATION_ERROR", [
+                    "thurview pr-review sync --change <ref> --file <pass.json>",
+                ]);
+            const text = await readText(resolve(process.cwd(), file));
+            if (text === null)
+                throw new AxiError(`${file} not found`, "NOT_FOUND", []);
+            const dry = bool(p, "dry-run");
+            const r = await sync(ctx, parsePass(text, file), { dryRun: dry });
+            return {
+                pass: {
+                    change: where,
+                    head: r.head,
+                    summary: r.summary,
+                    open: r.open,
+                    blocking: r.blocking,
+                },
+                posted: r.posted.length ? r.posted : "0 (no new finding)",
+                resolved: r.resolved.length ? r.resolved : "0 (no finding fixed)",
+                duplicates: r.duplicates.length
+                    ? r.duplicates
+                    : "0 (no finding already open was found again)",
+                ...(dry ? { body: r.body } : {}),
+                help: dry
+                    ? ["Nothing was posted; re-run without --dry-run to post it"]
+                    : [
+                        `Run \`${again}\` to block until the next push, merge or stop`,
+                        "Never approve, merge or push to the change request; the verdict is the summary",
+                    ],
+            };
+        }
+        if (sub === "wait") {
+            const interval = Number(str(p, "interval"));
+            const timeout = Number(str(p, "timeout"));
+            if (!(interval > 0) || !(timeout > 0))
+                throw new AxiError("--interval and --timeout take seconds", "VALIDATION_ERROR", []);
+            const ev = await waitForEvent(ctx.forge, ctx.repo, ctx.cr.number, { interval, timeout });
+            const help = ev.event === "push"
+                ? [
+                    ev.since
+                        ? `Review only \`git diff ${ev.since.slice(0, 12)} ${ev.head.slice(0, 12)}\`, then sync`
+                        : "Nothing posted yet: review the whole change, then sync",
+                ]
+                : ev.event === "none"
+                    ? [`Nothing new; run \`${again}\` again`]
+                    : ["The follow loop ends here; the summary says why"];
+            return { event: { ...ev, change: where }, help };
+        }
+        if (sub === "stop") {
+            await stopReview(ctx);
+            return {
+                stopped: where,
+                help: [
+                    `Resume with \`thurview pr-review start --change ${ctx.cr.number}\`; a reader stops with the ${STOP_LABEL} label or a /thurview stop comment`,
+                ],
+            };
+        }
+        await startReview(ctx);
+        return { started: where, help: [`Run \`${again}\``] };
+    },
     async skill(args) {
         parseFlags("skill", args, {});
         const skills = {};