@dylanpiercey/work 0.0.187 → 0.0.189

package/lib/review/markdown.mjs

@@ -5,75 +5,148 @@
 const CONTEXT = 3;
 
 /**
- * @typedef {{ worktree: string, path: string, side: "additions"|"deletions",
+ * @typedef {{ worktree: string, path: string, side: "additions"|"deletions"|"file",
  *   line_start: number, line_end: number, text: string,
  *   head?: string|null, snippet?: string|null }} Comment
- * @typedef {{ worktree: string, head?: string, baseSha?: string, base?: string,
- *   branch?: string, pr?: { number: number, headRefName: string } | null }} Repo
+ * @typedef {{ id?: string, worktree: string, head?: string, baseSha?: string,
+ *   base?: string, branch?: string, headRef?: string,
+ *   pr?: { number: number, headRefName: string } | null }} Repo
  */
 
 /**
- * Per-repo base/head so the agent can see if it has moved on, plus the
- * comment's stored `snippet`: ±3 numbered lines of context around what the
- * reviewer actually saw, so it is still locatable after a small edit.
+ * Review comments as an agent reads them: dense, one shape per comment.
+ *
+ *   ## <n>. <repo>/<path>[:<line>[-<line>]][ [on <branch>]][ [removed from <base>]]
+ *   ```<lang>
+ *   > 10 | the commented rows, marked
+ *     11 | a row either side, for finding them again
+ *   ```
+ *   <what the reviewer wrote>
+ *
+ * The heading is `path:line`, the form editors and terminals open, the
+ * path always a real folder's; what it cannot say is a bracketed tag after
+ * it: the branch, when the comment was made on a lane or PR rather than
+ * the checkout, and a removed line's base, as it is no longer in the file
+ * to find. Nothing comes before the first item: that it is feedback to
+ * act on, the agent reads off the items.
  * @param {Comment[]} comments
  * @param {Repo[] | null | undefined} repos
  */
 export function commentMarkdown(comments, repos) {
-  const byRepo = new Map();
-  for (const c of comments) {
-    byRepo.set(c.worktree, [...(byRepo.get(c.worktree) || []), c]);
-  }
-  const chunks = ["Review feedback:"];
-  let n = 0;
-  for (const [worktree, list] of byRepo) {
-    const repo = (repos || []).find((r) => r.worktree === worktree);
-    chunks.push("");
-    chunks.push(repoHeader(worktree, repo, list));
-    for (const c of list) {
-      n++;
-      // Line 0 is a comment on the file itself — review offers it for a
-      // file it shows without a patch, so there are no rows to name or
-      // quote, only the path.
-      const where = c.line_end === 0 ? "whole file" : rowsOf(c);
-      chunks.push("");
-      chunks.push(`${n}. **${c.path}** (${where})`);
-      const snippet = c.snippet;
-      if (snippet != null) {
-        const fence = markdownFence(snippet);
-        chunks.push("");
-        chunks.push(indent(`${fence}diff\n${snippet}\n${fence}`));
+  const sorted = [...comments].sort(
+    (a, b) =>
+      folderOf(a.worktree).localeCompare(folderOf(b.worktree)) ||
+      a.path.localeCompare(b.path) ||
+      a.line_start - b.line_start,
+  );
+  return sorted
+    .map((c, i) => {
+      let head = `## ${i + 1}. ${placeOf(c)}`;
+      const branch = branchOf(c, repos);
+      if (branch) head += ` [on ${branch}]`;
+      if (c.side === "deletions") {
+        const base = (repos || []).find(
+          (r) => r.worktree === folderOf(c.worktree),
+        )?.base;
+        head += base ? ` [removed from ${base}]` : " [removed]";
+      }
+      const out = [head];
+      // Line 0 is the file itself (a binary, or one too large to draw):
+      // there are no rows to quote.
+      if (c.snippet != null && c.line_end > 0) {
+        const body = pointed(c.snippet);
+        const fence = markdownFence(body);
+        out.push(`${fence}${langOf(c.path)}\n${body}\n${fence}`);
       }
-      chunks.push("");
-      chunks.push(indent(c.text));
-    }
+      out.push(c.text);
+      return out.join("\n");
+    })
+    .join("\n\n");
+}
+
+/** The folder a comment's `worktree` names: a section id (`repo@topic`,
+ * `repo#12`) is a view of the folder, and older rows stored the id.
+ * @param {string} worktree */
+function folderOf(worktree) {
+  return worktree.split(/[@#]/)[0];
+}
+
+/** The branch a comment's lines are on when that is not the checkout's:
+ * the lane or PR section it was made in (by id for older rows, else by
+ * the head it stored), or a lane's topic when no section says more.
+ * @param {Comment} c
+ * @param {Repo[] | null | undefined} repos */
+function branchOf(c, repos) {
+  const folder = folderOf(c.worktree);
+  const list = repos || [];
+  // An older row names its section outright; a newer one by the head it
+  // was made at — the first section at that head, so a lane still level
+  // with the checkout reads as the checkout, which it is.
+  const section =
+    (c.worktree !== folder
+      ? list.find((r) => r.id === c.worktree)
+      : undefined) ??
+    (c.head
+      ? list.find((r) => r.worktree === folder && r.head === c.head)
+      : undefined);
+  if (section && section.id && section.id !== folder) {
+    const name = section.pr?.headRefName || section.headRef || section.branch;
+    const pr = section.pr ? ` #${section.pr.number}` : "";
+    if (name) return `${name}${pr}`;
   }
-  return chunks.join("\n");
+  const topic = c.worktree.includes("@") ? c.worktree.split("@")[1] : "";
+  return topic ? `topic ${topic}` : "";
 }
 
-/** Which rows a comment is against, as the reviewer saw them.
+/** `repo/path:10-12`, or the path alone for a comment on the whole file.
  * @param {Comment} c */
-function rowsOf(c) {
-  const side = c.side === "deletions" ? "Old" : "New";
+function placeOf(c) {
+  const path = `${folderOf(c.worktree)}/${c.path}`;
+  if (c.line_end <= 0) return path;
   return c.line_start === c.line_end
-    ? `${side} line ${c.line_start}`
-    : `${side} lines ${c.line_start}-${c.line_end}`;
+    ? `${path}:${c.line_start}`
+    : `${path}:${c.line_start}-${c.line_end}`;
 }
 
-/** @param {string} worktree @param {Repo | undefined} repo @param {Comment[]} list */
-function repoHeader(worktree, repo, list) {
-  if (repo?.head) {
-    const head = shortSha(repo.head);
-    const base = repo.baseSha ? shortSha(repo.baseSha) : "";
-    const branch = repo.pr?.headRefName || repo.branch || "HEAD";
-    const pr = repo.pr ? ` #${repo.pr.number}` : "";
-    return `${worktree}/${pr}: \`${branch}\` ${head}${repo.base ? ` vs \`${repo.base}\` ${base}` : ""}`;
-  }
-  // No live diff (the CLI): the comments know which commit they were on.
-  const heads = [...new Set(list.map((c) => c.head).filter(Boolean))];
-  return heads.length
-    ? `${worktree}/: ${heads.map((h) => shortSha(h)).join(", ")}`
-    : `${worktree}/`;
+/** Rows of context kept either side of the commented ones: enough to
+ * find them again if the file moved, no more. */
+const KEEP = 1;
+
+/** A stored snippet as the agent gets it: every kind's mark (`+`, `-`,
+ * `>`) on the commented rows turned into `>` (the heading says where the
+ * lines are, and a diff's signs would read as code to apply), the context
+ * cut to KEEP rows either side, the numbers only as wide as they need.
+ * @param {string} snippet */
+function pointed(snippet) {
+  const rows = snippet.split("\n").map((r) => {
+    const m = /^([ +\->])\s*(\d+) \| ?(.*)$/.exec(r);
+    return m ? { on: m[1] !== " ", n: m[2], code: m[3] } : null;
+  });
+  // A snippet in a shape this does not know is quoted as it was stored.
+  if (rows.some((r) => !r)) return snippet;
+  const parsed = /** @type {{ on: boolean, n: string, code: string }[]} */ (
+    rows
+  );
+  const first = parsed.findIndex((r) => r.on);
+  const last = parsed.findLastIndex((r) => r.on);
+  const kept =
+    first < 0
+      ? parsed
+      : parsed.slice(Math.max(0, first - KEEP), last + KEEP + 1);
+  const width = Math.max(...kept.map((r) => r.n.length));
+  return kept
+    .map((r) => `${r.on ? ">" : " "} ${r.n.padStart(width)} | ${r.code}`)
+    .join("\n");
+}
+
+/** The fence's language: the file's own extension, which both a model
+ * and a markdown renderer read as one — no table to keep up.
+ * @param {string} path */
+function langOf(path) {
+  const name = path.slice(path.lastIndexOf("/") + 1);
+  const dot = name.lastIndexOf(".");
+  const ext = dot > 0 ? name.slice(dot + 1).toLowerCase() : "";
+  return /^[a-z0-9]{1,10}$/.test(ext) ? ext : "";
 }
 
 /** @param {string} sha */
@@ -91,7 +164,9 @@ export function quoteRange(source, start, end, side) {
   const lines = source.split("\n");
   const from = Math.max(1, start - CONTEXT);
   const to = Math.min(lines.length, end + CONTEXT);
-  const mark = side === "deletions" ? "-" : "+";
+  // A file as it is has no added or removed rows: its commented rows are
+  // pointed at, not signed.
+  const mark = side === "deletions" ? "-" : side === "file" ? ">" : "+";
   const rows = [];
   for (let i = from; i <= to; i++) {
     const prefix = i >= start && i <= end ? mark : " ";
@@ -108,11 +183,3 @@ function markdownFence(body) {
   while ((m = re.exec(body))) ticks = Math.max(ticks, m[0].length + 1);
   return "`".repeat(ticks);
 }
-
-/** @param {string} text */
-function indent(text) {
-  return text
-    .split("\n")
-    .map((line) => (line ? `   ${line}` : line))
-    .join("\n");
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dylanpiercey/work",
-  "version": "0.0.187",
+  "version": "0.0.189",
   "type": "module",
   "description": "Web GUI for agentic dev workspaces",
   "license": "MIT",

package/dist/public/assets/_B2i_gth0.js

@@ -1 +0,0 @@
-import{$input_focusNonce as e}from"./_D1y1pFBD.js";export{e as _};

package/dist/public/assets/_B9DylPWC.js

@@ -1 +0,0 @@
-import{$input_findOpen as e}from"./_D1y1pFBD.js";export{e as _};

package/dist/public/assets/_BPQGzh-l.js

@@ -1 +0,0 @@
-import{$input_workspaceBranch as e}from"./_D1y1pFBD.js";export{e as _};

package/dist/public/assets/_C5tBE8K_.js

@@ -1 +0,0 @@
-import{$input_findTickChange as e}from"./_D1y1pFBD.js";export{e as _};

package/dist/public/assets/_C9-UCSyZ.js

@@ -1 +0,0 @@
-import{$input_rev as e}from"./_D1y1pFBD.js";export{e as _};

package/dist/public/assets/_CI73DKQy.js

@@ -1 +0,0 @@
-import{$input_findTick as e}from"./_D1y1pFBD.js";export{e as _};