@shiyuphan/follow-me 0.3.0 → 0.4.0

package/dist/src/host.js

@@ -3,10 +3,11 @@ import { randomUUID } from "node:crypto";
 import { closeSync, linkSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { parseEvent, parseEventBatch } from "./comments.js";
+import { parseCarried, parseEvent, parseEventBatch } from "./comments.js";
+import { carryComments } from "./evolve.js";
 import { isPlanVersion, serializePlanFile, validatePlan } from "./plan.js";
 import { HEALTH_APP, isSessionId, loadDraftComments, PortInUseError, RegistrationError, startServer, } from "./server.js";
-import { BranchMovedError, isAlive, openSessionAt, SessionFileError, SessionLockedError, } from "./session.js";
+import { BranchMovedError, diffOfPlan, isAlive, openSessionAt, SessionFileError, SessionLockedError, } from "./session.js";
 const RECORD = "server.json";
 const DEFAULT_IDLE_MS = 30_000;
 const START_TIMEOUT_MS = 10_000;
@@ -135,6 +136,11 @@ async function loadHosted(registration, held) {
                 comments: prior.comments,
                 responses: stored.file.responses,
             };
+        const priorPlan = session.plans().find((p) => p.version === previous?.version);
+        const before = priorPlan === undefined ? null : await diffOfPlan(session, priorPlan);
+        const carried = previous === null
+            ? []
+            : carryComments(previous.comments, before?.units ?? new Map(), session.diff.units);
         const command = "review";
         // A version swap runs inside the server that already owns this session's lock.
         const release = held ??
@@ -144,6 +150,7 @@ async function loadHosted(registration, held) {
             reviewsDir,
             release,
             previous,
+            carried,
             state: {
                 mode,
                 anchor: session.anchor,
@@ -275,9 +282,22 @@ export async function swapVersion(port, summary, version, hash) {
         throw new RegistrationError("the server answered with a malformed session");
     return swapped;
 }
+/** The previous version's comments as the open page places them on its plan. */
+export async function fetchCarried(port, summary) {
+    const state = await call(port, "GET", `${summary.url}api/state`);
+    const raw = isFields(state) ? state["carried"] : undefined;
+    if (!Array.isArray(raw))
+        throw new RegistrationError("the server sent no carried comments");
+    return raw.flatMap((item) => {
+        const carried = parseCarried(item);
+        if (typeof carried === "string")
+            throw new RegistrationError(`carried: ${carried}`);
+        return [carried];
+    });
+}
 /** One long poll of the session's event log: what happened after `since`, or nothing at timeout. */
 export async function pollEvents(port, summary, since, timeoutMs) {
-    const path = `${summary.url}api/events?since=${since}&timeout=${timeoutMs}&audience=agent`;
+    const path = `${summary.url}api/events?since=${since}&timeout=${timeoutMs}`;
     const batch = parseEventBatch(await call(port, "GET", path));
     if (typeof batch === "string")
         throw new RegistrationError(`the server sent bad events: ${batch}`);
@@ -288,7 +308,7 @@ export async function pollEvents(port, summary, since, timeoutMs) {
  * the server closes the stream, which it does after the `ended` event.
  */
 export async function followEvents(port, summary, since, onEvent) {
-    const res = await fetch(`${sessionUrl(port, summary)}api/events/stream?since=${since}&audience=agent`);
+    const res = await fetch(`${sessionUrl(port, summary)}api/events/stream?since=${since}`);
     if (!res.ok || res.body === null) {
         throw new RegistrationError(`GET api/events/stream failed with ${res.status}`);
     }

package/dist/src/prompt.js

@@ -1,3 +1,4 @@
+import { tipStartOf } from "./diff.js";
 /** Consecutive runs collapse: [0,1,2,3,7] becomes "0-3,7". */
 function formatRanges(changes) {
     const sorted = [...new Set(changes)].sort((a, b) => a - b);
@@ -269,6 +270,35 @@ const RULES = (checkCommand) => `- A unit is "h_…" (a text hunk), "f_…" (a w
 - Every commit needs a non-empty message and at least one unit.
 - Keep every file syntactically whole in every commit: a function with its closing brace, a block with both ends, an import before or with its first use. Commits need not build or pass tests, but each file a commit writes must parse.
 - Check your work with \`${checkCommand}\` and fix every issue it prints, syntax errors included.`;
+function renderUnit(unit) {
+    return unit.kind === "hunk" ? renderHunk(unit) : renderOtherUnit(unit);
+}
+/** The vanished and new units, and the reviewer's comments on hunks that vanished, quoted. */
+function renderChanges(changes, input, ctx) {
+    const { since, vanished, added } = changes;
+    const gone = new Set(vanished.map((v) => v.unit.id));
+    const review = input.mode === "split" ? input.review : null;
+    const orphans = (review?.comments ?? []).filter((c) => c.author !== "agent" && c.anchor.kind === "hunk" && gone.has(c.anchor.unit));
+    const parts = [
+        `## Changes since v${since}\n`,
+        `The branch moved after plan v${since}. ${input.draftPath} already holds that plan on the new tip: every unit whose hunk did not change keeps its commit, and any commit left with no unit was dropped. Put each new unit below into a commit, an existing one or a new one, and keep the rest as it is.`,
+    ];
+    if (vanished.length > 0) {
+        parts.push(`\nThese units of v${since} changed, so their ids are gone:`, ...vanished.map(({ unit, commits }) => {
+            const where = commits
+                .map((c) => `commit ${c.index + 1} ${JSON.stringify(c.message.split("\n")[0] ?? "")}`)
+                .join(", ");
+            return `- ${unit.id}  ${unit.path}, was in ${where}`;
+        }));
+    }
+    if (added.length > 0) {
+        parts.push("\nNew units, in no commit yet:\n", added.map(renderUnit).join("\n\n"));
+    }
+    if (orphans.length > 0) {
+        parts.push(`\nThe reviewer commented on hunks that changed. Write a response for each saying what you changed, and post the same with \`follow-me reply <id>\`:\n`, orphans.map((c) => renderComment(c, ctx)).join("\n"));
+    }
+    return parts.join("\n");
+}
 /** The planner prompt for a coding agent. Pure and deterministic for the same input. */
 export function renderPrompt(input) {
     const { diff, draftPath } = input;
@@ -282,13 +312,24 @@ export function renderPrompt(input) {
     if (input.mode === "walk") {
         const sections = [
             ...head,
+            ...(input.changes === undefined
+                ? []
+                : [renderChanges(input.changes, input, { commits: [], units: diff.units })]),
             `## Concerns\n\n${CONCERNS}`,
             `## Questions from the reviewer\n\n${QUESTIONS}\n\n${CONTEXT_RULE}`,
             units,
         ];
         return `${sections.join("\n\n")}\n`;
     }
-    const sections = [...head, units];
+    const ctx = {
+        commits: input.previousCommits ?? [],
+        units: diff.units,
+    };
+    const sections = [
+        ...head,
+        ...(input.changes === undefined ? [] : [renderChanges(input.changes, input, ctx)]),
+        units,
+    ];
     const { previousPlan, review } = input;
     if (previousPlan) {
         sections.push(`## Previous plan\n\nCommits are numbered from 1.\n\n${renderPreviousPlan(previousPlan)}`);
@@ -296,7 +337,6 @@ export function renderPrompt(input) {
     const theirs = review?.comments.filter((c) => c.author !== "agent") ?? [];
     const asked = theirs.filter((c) => c.kind === "question");
     const changes = theirs.filter((c) => c.kind !== "question");
-    const ctx = { commits: input.previousCommits ?? [], units: diff.units };
     const questions = [`## Questions from the reviewer\n`, QUESTIONS, `\n${CONTEXT_RULE}`];
     if (review && asked.length > 0) {
         questions.push(`\nThe reviewer asked ${asked.length === 1 ? "this question" : "these questions"} about plan v${review.planVersion}. Commits are numbered from 1. Write one response for each.\n`, asked.map((c) => renderComment(c, ctx)).join("\n"));
@@ -350,17 +390,6 @@ function excerpt(hunk, tipStart, owners, k) {
     }
     return lines;
 }
-/** Where the hunk starts in the tip: its base position shifted by earlier hunks of the file. */
-function tipStartOf(hunk, units) {
-    let shift = 0;
-    for (const u of units.values()) {
-        if (u.kind !== "hunk" || u.path !== hunk.path || u.oldStart >= hunk.oldStart)
-            continue;
-        for (const line of u.body)
-            shift += line.op === "+" ? 1 : line.op === "-" ? -1 : 0;
-    }
-    return hunk.oldStart + shift + 1;
-}
 /** A fence longer than any backtick run in the content, so quoted code cannot close it. */
 function fence(lines) {
     const longest = Math.max(0, ...lines.flatMap((l) => (l.match(/`+/g) ?? []).map((r) => r.length)));
@@ -927,7 +956,7 @@ function renderEvent(event, ctx) {
         case "version":
             return [`- plan v${event.version} is now open`];
         case "submitted":
-            return ["- the reviewer submitted the review; the held flags follow as new comments"];
+            return ["- the reviewer submitted the review"];
         case "ended":
             return [`- the reviewer ended the review; the report is next to ${event.review}`];
         default: {

package/dist/src/server.js

@@ -82,7 +82,13 @@ export async function loadDraft(reviewsDir, version) {
     }
     catch (error) {
         if (isRecord(error) && error["code"] === "ENOENT") {
-            return { comments: [], concerns: [], resolved: [], excluded: { comments: [], concerns: [] } };
+            return {
+                comments: [],
+                concerns: [],
+                resolved: [],
+                excluded: { comments: [], concerns: [] },
+                earlierReplies: [],
+            };
         }
         throw error;
     }
@@ -240,6 +246,7 @@ function viewOf(registration, loaded, draft) {
         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))),
@@ -251,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_";
@@ -260,38 +308,6 @@ function mintReplyId(taken) {
             return id;
     }
 }
-/**
- * What the agent may see of the log: a pending flag is held back with everything said about it,
- * and reaches the agent as an ordinary "comment" event when the reviewer submits.
- */
-function forAgent(log) {
-    const held = new Set();
-    const out = [];
-    for (const event of log) {
-        if (event.type === "comment" || event.type === "comment-updated") {
-            const { comment } = event;
-            if (comment.pending === true) {
-                held.add(comment.id);
-                continue;
-            }
-            if (held.delete(comment.id))
-                out.push({ ...event, type: "comment" });
-            else
-                out.push(event);
-        }
-        else if (event.type === "comment-deleted") {
-            if (!held.delete(event.id))
-                out.push(event);
-        }
-        else if (event.type === "reply") {
-            if (!held.has(event.commentId))
-                out.push(event);
-        }
-        else
-            out.push(event);
-    }
-    return out;
-}
 const DEFAULT_POLL_MS = 25_000;
 const MAX_POLL_MS = 60_000;
 const STREAM_PING_MS = 15_000;
@@ -314,9 +330,10 @@ function hostSession(id, registration, loaded, draft, load) {
         for (const listener of [...listeners])
             listener();
     };
-    const seen = (agent) => (agent ? forAgent(events) : events);
-    const waitForEvents = (since, timeoutMs, signal, agent) => new Promise((resolve) => {
-        const news = () => seen(agent).filter((e) => e.seq > since);
+    for (const event of replayOf(view))
+        emit(event);
+    const waitForEvents = (since, timeoutMs, signal) => new Promise((resolve) => {
+        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();
@@ -356,6 +373,7 @@ function hostSession(id, registration, loaded, draft, load) {
         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,
@@ -363,6 +381,7 @@ function hostSession(id, registration, loaded, draft, load) {
             ...(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 () => {
@@ -393,33 +412,22 @@ function hostSession(id, registration, loaded, draft, load) {
         }
         return parsed;
     };
-    /** Clears `pending` on every held flag at once and tells the agent what it missed. */
-    const release = () => {
-        const held = [...view.comments.values()].filter((c) => c.pending === true);
-        if (held.length === 0)
-            return 0;
-        emit({ type: "submitted" });
-        for (const comment of held) {
-            const { pending: _held, ...open } = comment;
-            view.comments.set(comment.id, open);
-            emit({ type: "comment", comment: open });
-        }
-        return held.length;
-    };
     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,
             planVersion: view.loaded.state.version,
             planHash: view.loaded.state.planHash,
             endedAt: new Date().toISOString(),
-            comments: [...view.comments.values()].filter((c) => c.pending !== true),
+            comments: [...view.comments.values()],
             ...(concerns.length === 0 ? {} : { concerns }),
             ...(resolved.length === 0 ? {} : { resolved }),
             ...(excluded === null ? {} : { excluded }),
+            ...(earlierReplies.length === 0 ? {} : { earlierReplies }),
         };
     };
     const report = (finished) => {
@@ -439,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,
@@ -464,17 +472,18 @@ function hostSession(id, registration, loaded, draft, load) {
             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,
-        follow: (since, send, stop, agent) => {
+        follow: (since, send, stop) => {
             if (since > events.length) {
                 throw new HttpError(409, `since ${since} is ahead of this session's log (${events.length})`);
             }
             let last = since;
             const flush = () => {
-                for (const event of seen(agent).filter((e) => e.seq > last)) {
+                for (const event of events.filter((e) => e.seq > last)) {
                     send(event);
                     last = event.seq;
                     if (event.type === "ended") {
@@ -488,11 +497,11 @@ function hostSession(id, registration, loaded, draft, load) {
             flush();
             return () => listeners.delete(flush);
         },
-        poll: (since, timeoutMs, signal, agent) => {
+        poll: (since, timeoutMs, signal) => {
             if (since > events.length) {
                 throw new HttpError(409, `since ${since} is ahead of this session's log (${events.length})`);
             }
-            return waitForEvents(since, timeoutMs, signal, agent);
+            return waitForEvents(since, timeoutMs, signal);
         },
         report: () => report(review()),
         reportItems: () => {
@@ -536,22 +545,33 @@ function hostSession(id, registration, loaded, draft, load) {
             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;
         },
@@ -599,12 +619,14 @@ function hostSession(id, registration, loaded, draft, load) {
             await saveDraft();
             return { comments: [...view.excludedComments], concerns: [...view.excludedConcerns] };
         },
-        /** Releases every held flag in one go; the reviewer pressed Submit. */
-        submit: async () => {
+        /**
+         * 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();
-            const released = release();
-            await saveDraft();
-            return { released };
+            emit({ type: "submitted" });
+            return { released: 0 };
         },
         resolve: async (raw) => {
             open();
@@ -642,13 +664,12 @@ function hostSession(id, registration, loaded, draft, load) {
             try {
                 await writes;
                 const next = await load({ ...view.registration, version, hash, lockToken: null }, view.loaded.release);
-                release();
                 if (hasWork())
                     await writeReview(review());
                 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;
@@ -658,7 +679,6 @@ function hostSession(id, registration, loaded, draft, load) {
         end: async () => {
             open();
             ending = true;
-            release();
             const finished = review();
             const file = await writeReview(finished);
             view.loaded.release();
@@ -832,7 +852,7 @@ export function startServer(opts) {
             });
             res.write(": follow-me\n\n");
             const ping = setInterval(() => res.write(": ping\n\n"), STREAM_PING_MS);
-            const unfollow = session.follow(since, (event) => res.write(`id: ${event.seq}\ndata: ${JSON.stringify(event)}\n\n`), () => res.end(), url.searchParams.get("audience") === "agent");
+            const unfollow = session.follow(since, (event) => res.write(`id: ${event.seq}\ndata: ${JSON.stringify(event)}\n\n`), () => res.end());
             res.on("close", () => {
                 clearInterval(ping);
                 unfollow();
@@ -844,8 +864,7 @@ export function startServer(opts) {
             res.on("close", () => abort.abort());
             const since = queryInt(url, "since", 0, Number.MAX_SAFE_INTEGER, 0);
             const timeout = queryInt(url, "timeout", 0, MAX_POLL_MS, DEFAULT_POLL_MS);
-            const agent = url.searchParams.get("audience") === "agent";
-            return sendJson(res, 200, await session.poll(since, timeout, abort.signal, agent));
+            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());
@@ -866,7 +885,7 @@ export function startServer(opts) {
             return sendJson(res, 200, session.summary());
         }
         if (method === "POST" && rest === "/api/submit") {
-            return sendJson(res, 200, await session.submit());
+            return sendJson(res, 200, session.submit());
         }
         if (method === "POST" && rest === "/api/excluded") {
             return sendJson(res, 200, await session.exclude(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 {
@@ -261,7 +262,16 @@ function makeSession(root, dir, anchor, diff) {
             .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,
@@ -410,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-DcmzRkVZ.js → abnfDiagram-WEYOIA3C-byISxePP.js}

@@ -1 +1 @@
-import{m as e,t}from"./mermaid-parser.core-Dcxlzc-S.js";import{n}from"./chunk-Y2CYZVJY-DsF7k-Jl.js";import{m as r}from"./src-FgijoBVs.js";import"./chunk-DSNLSHJZ-DiC78RqE.js";import{n as i,r as a,t as o}from"./chunk-2E7WHVMD-C6fAf4Vj.js";import{t as s}from"./chunk-JWPE2WC7-DVXcaiue.js";import"./mermaid.core-TeOHQJ00.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};
+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-T5QB0T1C.js → arc-CBzsAsP2.js}

@@ -1 +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-tWS_lXDS.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};
+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-DUIkQTeE.js → architecture-WOLXFQ4H-0OSkIwdB.js}

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