@shiyuphan/follow-me 0.2.0 → 0.4.0

package/dist/src/server.js

@@ -6,7 +6,7 @@ import { basename, isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { isReplyId, parseComment, parseDraft, parseNewDecision, parseNewReply, } from "./comments.js";
 import { isConcernId, isPlanVersion } from "./plan.js";
-import { renderReport } from "./prompt.js";
+import { renderReport, reportItems } from "./prompt.js";
 import { isLockToken } from "./session.js";
 /** The requested port is taken; host.ts decides whether that is our server or a stranger. */
 export class PortInUseError extends Error {
@@ -23,19 +23,16 @@ export class RegistrationError extends Error {
 }
 /** GET /api/health answers with this, so a CLI can tell our server from another program. */
 export const HEALTH_APP = "follow-me";
-const UI_DIR = new URL("../ui/", import.meta.url);
-/** Every module and the stylesheet in ui/ is served flat, so a new module needs no route. */
-const STATIC_FILE = /^\/([a-z][a-z-]*\.(?:js|css))$/;
+/** The page Vite builds from ui/ into ui/dist; `npm run build` makes it. */
+const UI_DIR = new URL("../ui/dist/", import.meta.url);
+/** Hashed bundles under /assets/ and the few flat files of ui/public at the root. */
+const STATIC_FILE = /^\/((?:assets\/)?[\w-]+(?:\.[\w-]+)*\.(js|css|woff2|svg))$/;
 const STATIC_TYPES = new Map([
     ["js", "text/javascript; charset=utf-8"],
     ["css", "text/css; charset=utf-8"],
+    ["woff2", "font/woff2"],
+    ["svg", "image/svg+xml"],
 ]);
-/** Mermaid's ESM entry imports its chunks by relative path, so they are served beside it. */
-const MERMAID_ENTRY = new URL(import.meta.resolve("mermaid/dist/mermaid.esm.min.mjs"));
-const MERMAID_CHUNK = /^\/vendor\/chunks\/mermaid\.esm\.min\/([\w-]+\.mjs)$/;
-/** Prism is a plain script per component, loaded one at a time by the page as languages need. */
-const PRISM_CORE = new URL(import.meta.resolve("prismjs/components/prism-core.min.js"));
-const PRISM_PATH = /^\/vendor\/prism\/([a-z][a-z-]*)\.js$/;
 const MAX_BODY_BYTES = 1_000_000;
 const BASE32 = "abcdefghijklmnopqrstuvwxyz234567";
 const COMMENT_ID = /^c_[a-z2-7]{6}$/;
@@ -85,7 +82,13 @@ export async function loadDraft(reviewsDir, version) {
     }
     catch (error) {
         if (isRecord(error) && error["code"] === "ENOENT") {
-            return { comments: [], concerns: [], resolved: [] };
+            return {
+                comments: [],
+                concerns: [],
+                resolved: [],
+                excluded: { comments: [], concerns: [] },
+                earlierReplies: [],
+            };
         }
         throw error;
     }
@@ -196,7 +199,7 @@ function indexPage(rows, now) {
     const body = items.length === 0
         ? `    <section class="empty">
       <h1>No sessions yet</h1>
-      <p>Run <code>follow-me review</code> to review a plan, or <code>follow-me walk</code> to read a branch someone else wrote. Each one opens here.</p>
+      <p>Ask your coding agent to review a branch with follow-me. Each review opens here.</p>
       <p><a href="https://github.com/phanshiyu/follow-me#readme">How follow-me works</a></p>
     </section>`
         : `    <h1>Sessions</h1>
@@ -221,44 +224,18 @@ ${body}
 </html>
 `;
 }
-/** The file behind a /vendor/ path, or null. Chunk names are checked, so no path escapes. */
-function vendorFile(path) {
-    const part = PRISM_PATH.exec(path)?.[1];
-    if (part !== undefined) {
-        return part === "core" ? PRISM_CORE : new URL(`prism-${part}.min.js`, PRISM_CORE);
-    }
-    if (path === "/vendor/mermaid.mjs")
-        return MERMAID_ENTRY;
-    const chunk = MERMAID_CHUNK.exec(path)?.[1];
-    return chunk === undefined ? null : new URL(`chunks/mermaid.esm.min/${chunk}`, MERMAID_ENTRY);
-}
-async function readUi(name) {
+async function readUi(dir, name) {
     try {
-        return await readFile(fileURLToPath(new URL(name, UI_DIR)));
+        return await readFile(fileURLToPath(new URL(name, dir)));
     }
     catch (error) {
         if (isRecord(error) && error["code"] === "ENOENT")
-            throw new HttpError(404, "not found");
+            return null;
         throw error;
     }
 }
-async function sendVendor(res, file) {
-    let bytes;
-    try {
-        bytes = await readFile(fileURLToPath(file));
-    }
-    catch (error) {
-        if (isRecord(error) && error["code"] === "ENOENT")
-            throw new HttpError(404, "not found");
-        throw error;
-    }
-    // The bundle only changes with the installed package, and it is several megabytes.
-    res.writeHead(200, {
-        "content-type": "text/javascript; charset=utf-8",
-        "cache-control": "max-age=86400",
-    });
-    res.end(bytes);
-}
+const NOT_BUILT = `<!doctype html><html lang="en"><head><meta charset="utf-8" /><meta name="color-scheme" content="light dark" /><title>follow-me</title></head><body style="font-family: system-ui; max-width: 40rem; margin: 4rem auto; padding: 0 1rem"><h1>The review page is not built</h1><p>This follow-me runs from a checkout without <code>ui/dist</code>. Run <code>npm run build</code> (or <code>npm run ui:build</code>) in the checkout, then reload.</p></body></html>
+`;
 function viewOf(registration, loaded, draft) {
     const { state, reviewsDir } = loaded;
     return {
@@ -267,7 +244,11 @@ function viewOf(registration, loaded, draft) {
         comments: new Map(state.comments.map((c) => [c.id, c])),
         decisions: new Map(draft.concerns.map((d) => [d.concern, d])),
         resolved: new Set(draft.resolved),
+        excludedComments: new Set(draft.excluded.comments),
+        excludedConcerns: new Set(draft.excluded.concerns),
+        earlierReplies: new Map(draft.earlierReplies.map((e) => [e.comment, e.replies])),
         unitIds: new Set(state.units.map((u) => u.id)),
+        hunkRows: new Map(state.units.flatMap((u) => u.kind === "hunk" ? [[u.id, u.body.length]] : [])),
         concernIds: new Set(state.commits.flatMap((c) => (c.concerns ?? []).map((k) => k.id))),
         draftFile: draftPath(reviewsDir, state.version),
         reviewFile: join(reviewsDir, `v${state.version}.json`),
@@ -277,6 +258,47 @@ function withReplies(comment, replies) {
     const { replies: _dropped, ...rest } = comment;
     return replies === undefined || replies.length === 0 ? rest : { ...rest, replies };
 }
+/** A comment of the previous version with the replies it got during this one. */
+function withEarlier(view, comment) {
+    const later = view.earlierReplies.get(comment.id) ?? [];
+    return later.length === 0
+        ? comment
+        : withReplies(comment, [...(comment.replies ?? []), ...later]);
+}
+function previousOf(view) {
+    const { previous } = view.loaded;
+    if (previous === null)
+        return null;
+    return { ...previous, comments: previous.comments.map((c) => withEarlier(view, c)) };
+}
+function carriedOf(view) {
+    return view.loaded.carried.map((c) => ({ ...c, comment: withEarlier(view, c.comment) }));
+}
+function earlierOf(view) {
+    return [...view.earlierReplies].map(([comment, replies]) => ({ comment, replies }));
+}
+/**
+ * What a restarted server's log begins with: each saved comment and each reply as the event that
+ * first carried it, oldest first, so a client that reads from 0 sees the whole conversation.
+ */
+function replayOf(view) {
+    const said = [];
+    for (const comment of view.comments.values()) {
+        said.push({
+            at: comment.createdAt,
+            event: { type: "comment", comment: withReplies(comment, undefined) },
+        });
+        for (const reply of comment.replies ?? []) {
+            said.push({ at: reply.createdAt, event: { type: "reply", commentId: comment.id, reply } });
+        }
+    }
+    for (const [commentId, replies] of view.earlierReplies) {
+        for (const reply of replies) {
+            said.push({ at: reply.createdAt, event: { type: "reply", commentId, reply } });
+        }
+    }
+    return said.sort((a, b) => a.at.localeCompare(b.at)).map((s) => s.event);
+}
 function mintReplyId(taken) {
     for (;;) {
         let id = "r_";
@@ -308,17 +330,26 @@ function hostSession(id, registration, loaded, draft, load) {
         for (const listener of [...listeners])
             listener();
     };
+    for (const event of replayOf(view))
+        emit(event);
     const waitForEvents = (since, timeoutMs, signal) => new Promise((resolve) => {
-        const answer = () => resolve({ seq: events.length, events: events.slice(since) });
-        if (events.length > since || timeoutMs === 0 || signal.aborted)
+        const news = () => events.filter((e) => e.seq > since);
+        const answer = () => resolve({ seq: events.length, events: news() });
+        if (news().length > 0 || timeoutMs === 0 || signal.aborted)
             return answer();
         const wake = () => {
+            if (news().length === 0 && !signal.aborted)
+                return;
             clearTimeout(timer);
             waiters.delete(wake);
             signal.removeEventListener("abort", wake);
             answer();
         };
-        const timer = setTimeout(wake, timeoutMs);
+        const timer = setTimeout(() => {
+            waiters.delete(wake);
+            signal.removeEventListener("abort", wake);
+            answer();
+        }, timeoutMs);
         waiters.add(wake);
         signal.addEventListener("abort", wake);
     });
@@ -330,6 +361,10 @@ function hostSession(id, registration, loaded, draft, load) {
         if (swapping)
             throw new HttpError(409, "the session is switching plan versions; try again");
     };
+    /** The exclusions as stored, or null when nothing is excluded. */
+    const excludedOf = () => view.excludedComments.size + view.excludedConcerns.size === 0
+        ? null
+        : { comments: [...view.excludedComments], concerns: [...view.excludedConcerns] };
     // Writes are chained so two rapid edits never race on the same file.
     let writes = Promise.resolve();
     const saveDraft = () => {
@@ -337,12 +372,16 @@ function hostSession(id, registration, loaded, draft, load) {
         const file = view.draftFile;
         const concerns = [...view.decisions.values()];
         const resolved = [...view.resolved];
+        const excluded = excludedOf();
+        const earlierReplies = earlierOf(view);
         const snapshot = JSON.stringify({
             schema: "follow-me/review-draft@1",
             planVersion: state.version,
             comments: [...view.comments.values()],
             ...(concerns.length === 0 ? {} : { concerns }),
             ...(resolved.length === 0 ? {} : { resolved }),
+            ...(excluded === null ? {} : { excluded }),
+            ...(earlierReplies.length === 0 ? {} : { earlierReplies }),
         }, null, 2);
         const dir = view.loaded.reviewsDir;
         writes = writes.then(async () => {
@@ -363,11 +402,21 @@ function hostSession(id, registration, loaded, draft, load) {
         if (anchor.kind === "hunk" && !view.unitIds.has(anchor.unit)) {
             throw new HttpError(400, "anchor names an unknown unit");
         }
+        if (anchor.kind === "hunk" && anchor.offsets !== undefined) {
+            const rows = view.hunkRows.get(anchor.unit);
+            if (rows === undefined)
+                throw new HttpError(400, "anchor.offsets names a unit without rows");
+            if (anchor.offsets.some((o) => o >= rows)) {
+                throw new HttpError(400, `anchor.offsets is out of range, the unit has ${rows} rows`);
+            }
+        }
         return parsed;
     };
     const review = () => {
         const concerns = [...view.decisions.values()];
         const resolved = [...view.resolved];
+        const excluded = excludedOf();
+        const earlierReplies = earlierOf(view);
         return {
             schema: "follow-me/review@1",
             mode: view.loaded.state.mode,
@@ -377,6 +426,8 @@ function hostSession(id, registration, loaded, draft, load) {
             comments: [...view.comments.values()],
             ...(concerns.length === 0 ? {} : { concerns }),
             ...(resolved.length === 0 ? {} : { resolved }),
+            ...(excluded === null ? {} : { excluded }),
+            ...(earlierReplies.length === 0 ? {} : { earlierReplies }),
         };
     };
     const report = (finished) => {
@@ -396,7 +447,7 @@ function hostSession(id, registration, loaded, draft, load) {
         await rm(view.draftFile, { force: true });
         return view.reviewFile;
     };
-    const hasWork = () => view.comments.size > 0 || view.decisions.size > 0;
+    const hasWork = () => view.comments.size > 0 || view.decisions.size > 0 || view.earlierReplies.size > 0;
     return {
         id,
         done,
@@ -412,14 +463,17 @@ function hostSession(id, registration, loaded, draft, load) {
             mode: view.loaded.state.mode,
             version: view.loaded.state.version,
             comments: view.comments.size,
+            openedAt: new Date(openedAt).toISOString(),
         }),
         snapshot: () => ({
             ...view.loaded.state,
             comments: [...view.comments.values()],
             concerns: [...view.decisions.values()],
             resolved: [...view.resolved],
+            excluded: { comments: [...view.excludedComments], concerns: [...view.excludedConcerns] },
             seq: events.length,
-            previous: view.loaded.previous,
+            previous: previousOf(view),
+            carried: carriedOf(view),
         }),
         /** Events after `since`, now and as they happen, until unfollowed or the review ends. */
         latest: () => events.length,
@@ -429,7 +483,7 @@ function hostSession(id, registration, loaded, draft, load) {
             }
             let last = since;
             const flush = () => {
-                for (const event of events.slice(last)) {
+                for (const event of events.filter((e) => e.seq > last)) {
                     send(event);
                     last = event.seq;
                     if (event.type === "ended") {
@@ -450,6 +504,14 @@ function hostSession(id, registration, loaded, draft, load) {
             return waitForEvents(since, timeoutMs, signal);
         },
         report: () => report(review()),
+        reportItems: () => {
+            const { state } = view.loaded;
+            const units = new Map(state.units.map((u) => [u.id, u]));
+            return reportItems(review(), state.commits, units, {
+                branch: state.anchor.branch,
+                responses: [],
+            });
+        },
         add: async (raw) => {
             open();
             if (!isRecord(raw))
@@ -479,25 +541,37 @@ function hostSession(id, registration, loaded, draft, load) {
             if (gone === undefined)
                 throw new HttpError(404, "no such comment");
             view.comments.delete(target);
+            view.excludedComments.delete(gone.id);
             emit({ type: "comment-deleted", id: gone.id });
             await saveDraft();
         },
+        /** Replies under a comment of this version, or of the previous one, as after a swap. */
         reply: async (target, raw) => {
             open();
             const comment = view.comments.get(target);
-            if (comment === undefined)
+            const earlier = view.loaded.previous?.comments.find((c) => c.id === target);
+            const owner = comment ?? earlier;
+            if (owner === undefined)
                 throw new HttpError(404, "no such comment");
             const parsed = parseNewReply(raw);
             if (typeof parsed === "string")
                 throw new HttpError(400, `malformed reply: ${parsed}`);
-            const taken = new Set([...view.comments.values()].flatMap((c) => c.replies ?? []).map((r) => r.id));
+            const taken = new Set([...view.comments.values(), ...(previousOf(view)?.comments ?? [])]
+                .flatMap((c) => c.replies ?? [])
+                .map((r) => r.id));
             const reply = {
                 id: mintReplyId(taken),
                 ...parsed,
                 createdAt: new Date().toISOString(),
             };
-            view.comments.set(comment.id, { ...comment, replies: [...(comment.replies ?? []), reply] });
-            emit({ type: "reply", commentId: comment.id, reply });
+            if (comment !== undefined) {
+                view.comments.set(comment.id, { ...comment, replies: [...(comment.replies ?? []), reply] });
+            }
+            else if (earlier !== undefined) {
+                const later = view.earlierReplies.get(earlier.id) ?? [];
+                view.earlierReplies.set(earlier.id, [...later, reply]);
+            }
+            emit({ type: "reply", commentId: owner.id, reply });
             await saveDraft();
             return reply.id;
         },
@@ -506,15 +580,54 @@ function hostSession(id, registration, loaded, draft, load) {
             if (!isConcernId(target) || !view.concernIds.has(target)) {
                 throw new HttpError(404, "no such concern in this plan");
             }
-            const decision = parseNewDecision(target, raw);
-            if (typeof decision === "string")
-                throw new HttpError(400, `malformed decision: ${decision}`);
+            const parsed = parseNewDecision(target, raw);
+            if (typeof parsed === "string")
+                throw new HttpError(400, `malformed decision: ${parsed}`);
+            const decision = { ...parsed, decidedAt: new Date().toISOString() };
             view.decisions.set(target, decision);
             const { concern: concernId, ...rest } = decision;
             emit({ type: "concern", concernId, ...rest });
             await saveDraft();
             return decision;
         },
+        /** Leaves a comment or an agent concern out of the hand-off, or puts it back. */
+        exclude: async (raw) => {
+            open();
+            const body = isRecord(raw) ? raw : {};
+            const { comment, concern, excluded } = body;
+            if (typeof excluded !== "boolean" || (comment === undefined) === (concern === undefined)) {
+                throw new HttpError(400, "expected { comment } or { concern }, and { excluded: boolean }");
+            }
+            if (comment !== undefined) {
+                if (!isCommentId(comment) || !view.comments.has(comment)) {
+                    throw new HttpError(404, "no such comment");
+                }
+                if (excluded)
+                    view.excludedComments.add(comment);
+                else
+                    view.excludedComments.delete(comment);
+            }
+            else {
+                if (!isConcernId(concern) || !view.concernIds.has(concern)) {
+                    throw new HttpError(404, "no such concern in this plan");
+                }
+                if (excluded)
+                    view.excludedConcerns.add(concern);
+                else
+                    view.excludedConcerns.delete(concern);
+            }
+            await saveDraft();
+            return { comments: [...view.excludedComments], concerns: [...view.excludedConcerns] };
+        },
+        /**
+         * The reviewer pressed Submit. Every comment already reached the agent, so this only tells it
+         * the reviewer is done; `released` stays for pages that still read it.
+         */
+        submit: () => {
+            open();
+            emit({ type: "submitted" });
+            return { released: 0 };
+        },
         resolve: async (raw) => {
             open();
             const body = isRecord(raw) ? raw : {};
@@ -556,7 +669,7 @@ function hostSession(id, registration, loaded, draft, load) {
                 else
                     await rm(view.draftFile, { force: true });
                 view = viewOf({ ...view.registration, version, hash }, next, await loadDraft(next.reviewsDir, version));
-                emit({ type: "version", version, hash });
+                emit({ type: "version", version, hash, carried: carriedOf(view) });
             }
             finally {
                 swapping = false;
@@ -588,6 +701,7 @@ function sameRegistration(a, b) {
  * itself once it has had no session for idleMs.
  */
 export function startServer(opts) {
+    const uiDir = opts.uiDir ?? UI_DIR;
     const registry = new Map();
     const pending = new Map();
     let boundPort = 0;
@@ -671,17 +785,21 @@ export function startServer(opts) {
         const method = req.method ?? "GET";
         const url = new URL(req.url ?? "/", "http://localhost");
         const path = url.pathname;
-        const asset = method === "GET" ? STATIC_FILE.exec(path)?.[1] : undefined;
-        if (asset !== undefined) {
-            const bytes = await readUi(asset);
-            const type = STATIC_TYPES.get(asset.slice(asset.lastIndexOf(".") + 1));
-            res.writeHead(200, { "content-type": type ?? "text/plain", "cache-control": "no-store" });
+        const asset = method === "GET" ? STATIC_FILE.exec(path) : null;
+        if (asset !== null) {
+            const [, name = "", ext = ""] = asset;
+            const bytes = await readUi(uiDir, name);
+            if (bytes === null)
+                throw new HttpError(404, "not found");
+            // Vite hashes every name under assets/, so those never change under the same URL.
+            const cache = name.startsWith("assets/") ? "max-age=31536000, immutable" : "no-store";
+            res.writeHead(200, {
+                "content-type": STATIC_TYPES.get(ext) ?? "text/plain",
+                "cache-control": cache,
+            });
             res.end(bytes);
             return;
         }
-        const vendor = method === "GET" ? vendorFile(path) : null;
-        if (vendor)
-            return sendVendor(res, vendor);
         if (method === "GET" && path === "/") {
             const rows = [...registry.values()].map((h) => ({
                 summary: h.summary(),
@@ -711,11 +829,12 @@ export function startServer(opts) {
             res.end();
             return;
         }
-        if (method === "GET" && rest === "/") {
+        if (method === "GET" && (rest === "/" || rest === "/report")) {
             if (!isSessionId(rawId) || !registry.has(rawId)) {
                 return sendHtml(res, 404, '<!doctype html><html lang="en"><head><meta charset="utf-8" /><meta name="color-scheme" content="light dark" /><title>follow-me</title><link rel="stylesheet" href="/style.css" /></head><body class="index"><header class="topbar"><strong>follow-me</strong></header><main class="index-main"><section class="empty"><h1>This session has ended</h1><p>It finished, or it never existed. <a href="/">All sessions</a></p></section></main></body></html>\n');
             }
-            return sendHtml(res, 200, await readFile(fileURLToPath(new URL("index.html", UI_DIR)), "utf8"));
+            const page = await readUi(uiDir, "index.html");
+            return page === null ? sendHtml(res, 503, NOT_BUILT) : sendHtml(res, 200, page.toString());
         }
         const session = hosted(rawId);
         if (method === "GET" && rest === "/api/state")
@@ -747,6 +866,9 @@ export function startServer(opts) {
             const timeout = queryInt(url, "timeout", 0, MAX_POLL_MS, DEFAULT_POLL_MS);
             return sendJson(res, 200, await session.poll(since, timeout, abort.signal));
         }
+        if (method === "GET" && rest === "/api/report" && url.searchParams.get("format") === "json") {
+            return sendJson(res, 200, session.reportItems());
+        }
         if (method === "GET" && rest === "/api/report") {
             res.writeHead(200, { "content-type": "text/markdown; charset=utf-8" });
             res.end(session.report());
@@ -762,6 +884,12 @@ export function startServer(opts) {
             await session.swap(version, hash);
             return sendJson(res, 200, session.summary());
         }
+        if (method === "POST" && rest === "/api/submit") {
+            return sendJson(res, 200, session.submit());
+        }
+        if (method === "POST" && rest === "/api/excluded") {
+            return sendJson(res, 200, await session.exclude(await readJson(req)));
+        }
         if (method === "POST" && rest === "/api/resolved") {
             return sendJson(res, 200, { resolved: await session.resolve(await readJson(req)) });
         }

package/dist/src/session.js

@@ -3,6 +3,7 @@ import { existsSync, linkSync, mkdirSync, readdirSync, readFileSync, renameSync,
 import { basename, dirname, join } from "node:path";
 import { parseDraft, parseReview } from "./comments.js";
 import { isSha } from "./diff.js";
+import { evolvePlan } from "./evolve.js";
 import { branchExists, currentBranch, defaultBaseRef, GitError, loadDiff, objectsDir, QUARANTINE_PREFIX, repoRoot, resolveCommit, } from "./git.js";
 import { isFields, isPlanVersion, parsePlanFile, planHash, serializePlanFile, } from "./plan.js";
 export class BranchMovedError extends Error {
@@ -202,8 +203,9 @@ function parseApplied(v) {
 function makeSession(root, dir, anchor, diff) {
     const plansDir = join(dir, "plans");
     const splitReviews = join(dir, "reviews");
-    const walkReviewsDir = join(splitReviews, "walk");
-    const reviewsDir = (mode) => mode === "walk" ? walkReviewsDir : splitReviews;
+    // Older builds wrote reviewer reviews to reviews/walk/; they stay readable, nothing new goes there.
+    const legacyWalkDir = join(splitReviews, "walk");
+    const reviewsDir = () => splitReviews;
     const draftPath = join(dir, "draft.json");
     const promptPath = join(dir, "prompt.md");
     const appliedPath = join(dir, "applied.json");
@@ -216,16 +218,16 @@ function makeSession(root, dir, anchor, diff) {
         }
         return { version, file, hash: planHash(file) };
     });
-    const reviewsIn = (mode) => versions(reviewsDir(mode)).map(({ version, path }) => {
+    const reviewsIn = (dir) => versions(dir).map(({ version, path }) => {
         const review = parseReview(readJson(path));
         if (typeof review === "string")
             throw new SessionFileError(`${path}: ${review}`);
         return { version, review };
     });
-    const reviews = () => reviewsIn("split");
-    const walkReviews = () => [...reviews().filter((r) => r.review.mode === "walk"), ...reviewsIn("walk")].sort((a, b) => a.version - b.version);
-    const draftVersions = (mode) => {
-        const dir = reviewsDir(mode);
+    const reviews = () => reviewsIn(splitReviews);
+    const walkReviews = () => [...reviews().filter((r) => r.review.mode === "walk"), ...reviewsIn(legacyWalkDir)].sort((a, b) => a.version - b.version);
+    const draftVersions = () => {
+        const dir = reviewsDir();
         if (!existsSync(dir))
             return [];
         return readdirSync(dir).flatMap((name) => {
@@ -234,11 +236,11 @@ function makeSession(root, dir, anchor, diff) {
         });
     };
     const draftReview = (mode, version) => {
-        const path = join(reviewsDir(mode), `v${version}.draft.json`);
+        const path = join(reviewsDir(), `v${version}.draft.json`);
         const draft = parseDraft(readJson(path));
         if (typeof draft === "string")
             throw new SessionFileError(`${path}: ${draft}`);
-        const { comments, concerns, resolved } = draft;
+        const { comments, concerns, resolved, excluded } = draft;
         return {
             schema: "follow-me/review@1",
             mode,
@@ -248,6 +250,7 @@ function makeSession(root, dir, anchor, diff) {
             comments,
             ...(concerns.length === 0 ? {} : { concerns }),
             ...(resolved.length === 0 ? {} : { resolved }),
+            ...(excluded.comments.length + excluded.concerns.length === 0 ? {} : { excluded }),
         };
     };
     const priorReview = (mode, before) => {
@@ -255,11 +258,20 @@ function makeSession(root, dir, anchor, diff) {
         const done = (mode === "walk" ? walkReviews() : reviews().filter((r) => r.review.mode === mode))
             .filter((r) => below(r.version))
             .at(-1);
-        const unfinished = draftVersions(mode)
+        const unfinished = draftVersions()
             .filter((v) => below(v) && v > (done?.version ?? 0))
             .sort((a, b) => a - b)
             .at(-1);
-        return unfinished === undefined ? (done?.review ?? null) : draftReview(mode, unfinished);
+        if (unfinished === undefined)
+            return done?.review ?? null;
+        // A draft answers comments from every earlier version, so the finished review's
+        // comments stay visible beside the newer autosave's.
+        const current = draftReview(mode, unfinished);
+        if (done === undefined)
+            return current;
+        const seen = new Set(current.comments.map((c) => c.id));
+        const earlier = done.review.comments.filter((c) => !seen.has(c.id));
+        return { ...current, comments: [...earlier, ...current.comments] };
     };
     return {
         root,
@@ -283,7 +295,7 @@ function makeSession(root, dir, anchor, diff) {
         writeDraft: (draft) => writeJson(draftPath, draft),
         writePrompt: (text) => writeText(promptPath, text),
         writeReview: (review) => {
-            const path = join(reviewsDir(review.mode), `v${review.planVersion}.json`);
+            const path = join(reviewsDir(), `v${review.planVersion}.json`);
             if (existsSync(path))
                 throw new SessionFileError(`${path} is already written`);
             writeJson(path, review);
@@ -408,6 +420,35 @@ export async function openSessionAt(dir) {
     }
     return openSession(dirname(top), { branch: anchor.branch });
 }
+/**
+ * The diff a stored plan was made on: the session's own when the plan is for this tip, else the
+ * plan's base and tip loaded again. Null when those commits are gone from the repo.
+ */
+export async function diffOfPlan(session, plan) {
+    const { base, tip } = plan.file;
+    if (base === session.anchor.base && tip === session.anchor.tip)
+        return session.diff;
+    try {
+        return await loadDiff(session.root, base, tip);
+    }
+    catch (error) {
+        if (error instanceof GitError)
+            return null;
+        throw error;
+    }
+}
+/**
+ * How the latest plan carries over to the branch as it is now, or null when that plan was made
+ * for this tip. The old diff is loaded from the plan's own base and tip, so this gives the same
+ * answer however many times it runs after the move.
+ */
+export async function sinceLastPlan(session) {
+    const latest = session.plans().at(-1);
+    if (latest === undefined || latest.file.tip === session.anchor.tip)
+        return null;
+    const oldDiff = await loadDiff(session.root, latest.file.base, latest.file.tip);
+    return { since: latest.version, ...evolvePlan(latest.file, oldDiff, session.diff) };
+}
 /** "<name>.<pid>.<random>.tmp" as written by writeJson, the lock and the review server. */
 function abandonedTemps(dir) {
     if (!existsSync(dir))

package/dist/ui/dist/assets/abnfDiagram-WEYOIA3C-byISxePP.js

@@ -0,0 +1 @@
+import{m as e,t}from"./mermaid-parser.core-CAyLSQpH.js";import{n}from"./chunk-Y2CYZVJY-DsF7k-Jl.js";import{m as r}from"./src-Dym5afQ5.js";import"./chunk-DSNLSHJZ-DASbe_gb.js";import{n as i,r as a,t as o}from"./chunk-2E7WHVMD-zZdNfMkj.js";import{t as s}from"./chunk-JWPE2WC7-DVXcaiue.js";import"./mermaid.core-vfVMjgx2.js";var c=e().RailroadAbnf.parser.LangiumParser,l=n(e=>{let t=e.alternatives.map(u);return t.length===1?t[0]:{type:`choice`,alternatives:t}},`transformAlternation`),u=n(e=>{let t=e.elements.map(f);return t.length===1?t[0]:{type:`sequence`,elements:t}},`transformConcatenation`),d=n(e=>{if(e.includes(`*`)){let[t,n]=e.split(`*`);return{min:t?parseInt(t,10):0,max:n?parseInt(n,10):1/0}}let t=parseInt(e,10);return{min:t,max:t}},`parseRepeat`),f=n(e=>{let t=p(e.primary);if(!e.repeat)return t;let{min:n,max:r}=d(e.repeat);return n===0&&r===1?{type:`optional`,element:t}:{type:`repetition`,element:t,min:n,max:r}},`transformElement`),p=n(e=>{switch(e.$type){case`AbnfStringLiteral`:return{type:`terminal`,value:e.value};case`AbnfNumVal`:return{type:`terminal`,value:e.value};case`AbnfRuleName`:return{type:`nonterminal`,name:e.name};case`AbnfGroup`:return l(e.element);case`AbnfOptionalGroup`:return{type:`optional`,element:l(e.element)};default:throw Error(`Unsupported ABNF primary node: ${e.$type}`)}},`transformPrimary`),m=n(e=>({name:e.name,definition:l(e.definition)}),`transformRule`),h=n(e=>{s(e,o),e.title&&o.setTitle(e.title),e.rules.map(e=>o.addRule(m(e)))},`populateDb`),g={parser:{parse:n(e=>{o.clear(),r.debug(`[ABNF Parser] Starting Langium parse`);let n=c.parse(e);if(n.lexerErrors.length>0||n.parserErrors.length>0)throw new t(n);let i=n.value;r.debug(`[ABNF Parser] Parsed rules:`,i.rules.length),h(i),r.debug(`[ABNF Parser] Parse complete`)},`parse`),parser:{yy:o}},db:o,renderer:a,styles:i};export{g as diagram};

package/dist/ui/dist/assets/arc-CBzsAsP2.js

@@ -0,0 +1 @@
+import{n as e,t}from"./path-fybaL0A-.js";import{a as n,c as r,d as i,f as a,i as o,l as s,m as c,n as l,o as u,p as d,r as f,u as p}from"./dist-NDVqCM7k.js";function m(e){return e.innerRadius}function h(e){return e.outerRadius}function g(e){return e.startAngle}function _(e){return e.endAngle}function v(e){return e&&e.padAngle}function y(e,t,n,r,i,a,o,s){var c=n-e,l=r-t,u=o-i,d=s-a,f=d*c-u*l;if(!(f*f<1e-12))return f=(u*(t-a)-d*(e-i))/f,[e+f*c,t+f*l]}function b(e,t,n,r,i,a,o){var c=e-n,l=t-r,u=(o?a:-a)/d(c*c+l*l),f=u*l,p=-u*c,m=e+f,h=t+p,g=n+f,_=r+p,v=(m+g)/2,y=(h+_)/2,b=g-m,x=_-h,S=b*b+x*x,C=i-a,w=m*_-g*h,T=(x<0?-1:1)*d(s(0,C*C*S-w*w)),E=(w*x-b*T)/S,D=(-w*b-x*T)/S,O=(w*x+b*T)/S,k=(-w*b+x*T)/S,A=E-v,j=D-y,M=O-v,N=k-y;return A*A+j*j>M*M+N*N&&(E=O,D=k),{cx:E,cy:D,x01:-f,y01:-p,x11:E*(i/C-1),y11:D*(i/C-1)}}function x(){var s=m,x=h,S=e(0),C=null,w=g,T=_,E=v,D=null,O=t(k);function k(){var e,t,m=+s.apply(this,arguments),h=+x.apply(this,arguments),g=w.apply(this,arguments)-r,_=T.apply(this,arguments)-r,v=l(_-g),k=_>g;if(D||=e=O(),h<m&&(t=h,h=m,m=t),!(h>1e-12))D.moveTo(0,0);else if(v>c-1e-12)D.moveTo(h*u(g),h*a(g)),D.arc(0,0,h,g,_,!k),m>1e-12&&(D.moveTo(m*u(_),m*a(_)),D.arc(0,0,m,_,g,k));else{var A=g,j=_,M=g,N=_,P=v,F=v,I=E.apply(this,arguments)/2,L=I>1e-12&&(C?+C.apply(this,arguments):d(m*m+h*h)),R=p(l(h-m)/2,+S.apply(this,arguments)),z=R,B=R,V,H;if(L>1e-12){var U=o(L/m*a(I)),W=o(L/h*a(I));(P-=U*2)>1e-12?(U*=k?1:-1,M+=U,N-=U):(P=0,M=N=(g+_)/2),(F-=W*2)>1e-12?(W*=k?1:-1,A+=W,j-=W):(F=0,A=j=(g+_)/2)}var G=h*u(A),K=h*a(A),q=m*u(N),J=m*a(N);if(R>1e-12){var Y=h*u(j),X=h*a(j),Z=m*u(M),Q=m*a(M),$;if(v<i){if($=y(G,K,Z,Q,Y,X,q,J)){var ee=G-$[0],te=K-$[1],ne=Y-$[0],re=X-$[1],ie=1/a(f((ee*ne+te*re)/(d(ee*ee+te*te)*d(ne*ne+re*re)))/2),ae=d($[0]*$[0]+$[1]*$[1]);z=p(R,(m-ae)/(ie-1)),B=p(R,(h-ae)/(ie+1))}else z=B=0}}F>1e-12?B>1e-12?(V=b(Z,Q,G,K,h,B,k),H=b(Y,X,q,J,h,B,k),D.moveTo(V.cx+V.x01,V.cy+V.y01),B<R?D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,B,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,h,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),!k),D.arc(H.cx,H.cy,B,n(H.y11,H.x11),n(H.y01,H.x01),!k))):(D.moveTo(G,K),D.arc(0,0,h,A,j,!k)):D.moveTo(G,K),!(m>1e-12)||!(P>1e-12)?D.lineTo(q,J):z>1e-12?(V=b(q,J,Y,X,m,-z,k),H=b(G,K,Z,Q,m,-z,k),D.lineTo(V.cx+V.x01,V.cy+V.y01),z<R?D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(H.y01,H.x01),!k):(D.arc(V.cx,V.cy,z,n(V.y01,V.x01),n(V.y11,V.x11),!k),D.arc(0,0,m,n(V.cy+V.y11,V.cx+V.x11),n(H.cy+H.y11,H.cx+H.x11),k),D.arc(H.cx,H.cy,z,n(H.y11,H.x11),n(H.y01,H.x01),!k))):D.arc(0,0,m,N,M,k)}if(D.closePath(),e)return D=null,e+``||null}return k.centroid=function(){var e=(+s.apply(this,arguments)+ +x.apply(this,arguments))/2,t=(+w.apply(this,arguments)+ +T.apply(this,arguments))/2-i/2;return[u(t)*e,a(t)*e]},k.innerRadius=function(t){return arguments.length?(s=typeof t==`function`?t:e(+t),k):s},k.outerRadius=function(t){return arguments.length?(x=typeof t==`function`?t:e(+t),k):x},k.cornerRadius=function(t){return arguments.length?(S=typeof t==`function`?t:e(+t),k):S},k.padRadius=function(t){return arguments.length?(C=t==null?null:typeof t==`function`?t:e(+t),k):C},k.startAngle=function(t){return arguments.length?(w=typeof t==`function`?t:e(+t),k):w},k.endAngle=function(t){return arguments.length?(T=typeof t==`function`?t:e(+t),k):T},k.padAngle=function(t){return arguments.length?(E=typeof t==`function`?t:e(+t),k):E},k.context=function(e){return arguments.length?(D=e??null,k):D},k}export{x as t};

package/dist/ui/dist/assets/architecture-WOLXFQ4H-0OSkIwdB.js

@@ -0,0 +1 @@
+import"./chunk-NGNAAXSQ-C2Wy9Xmz.js";export{M as createArchitectureServices}from"./mermaid-parser.core-CAyLSQpH.js";