npm - @xbghc/warden - Versions diffs - 0.4.0 → 0.6.0 - Mend

@xbghc/warden 0.4.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md +36 -14
package/dist/cli.js +98 -39
package/dist/web/assets/index-Bi9N5cIP.js +197 -0
package/dist/web/assets/index-pyKaNQqX.css +1 -0
package/dist/web/index.html +2 -2
package/package.json +1 -1
package/dist/web/assets/index-D5XV3MyN.js +0 -192
package/dist/web/assets/index-D5aYUyvz.css +0 -1

package/README.md CHANGED Viewed

@@ -4,7 +4,8 @@ Local web UI for reviewing git diffs — built for reviewing changes that a codi
 with line comments you can copy back to the agent as a prompt.
 - Runs as a single local process per repository (`127.0.0.1` only, no auth, no database).
-- Diff sources: working tree, staged, working tree vs HEAD, any commit, any two refs, and git worktrees.
+- Diff sources: working tree, staged, working tree vs HEAD, a branch since it forked off its base (commits and
+  uncommitted work together), any commit, any two refs, and git worktrees.
 - Side-by-side **Unstaged** and **Staged** file lists, so staging a hunk in your editor is what marks it reviewed.
 - GitHub-style unified / side-by-side diff with syntax highlighting, collapsed file tree, lazy per-file loading, context expansion, virtual scrolling.
 - Line comments (single line or a dragged range), Markdown, edit / delete.
@@ -13,8 +14,10 @@ with line comments you can copy back to the agent as a prompt.
 - Comments follow the code: they move with a hunk that gets staged, re-attach after the agent edits the file, and are cleaned up once the change is committed.
 - Auto-refresh — warden watches the repository and reloads itself when you edit, stage, commit or switch branches.
 - Local issues (title, Markdown body, open/closed) that link comments.
-- Branch-scoped todos, exportable as a numbered checklist.
-- Commit history browser.
+- Branch-scoped todos, each copied to the clipboard on its own — one task at a time for the agent.
+- Commit history browser: grouped by day, branch / tag labels, search by message, sha, author or
+  path (each a `git log` on the server, not a filter over the rows already loaded), and a
+  first-parent view that folds merged branches into their merge commits.
 - Click a line number to jump to that line in a running nvim instance (WSL2 friendly).
 - Read-only with respect to git: only whitelisted read sub-commands are ever executed.
@@ -45,19 +48,38 @@ Several instances on the same repository can run at the same time.
 | Working tree, uncommitted (incl. untracked) | `working` | `git diff` + `git diff --no-index /dev/null <file>` |
 | Staged | `staged` | `git diff --cached` |
 | Working tree, everything vs HEAD | `all` | `git diff HEAD` (+ untracked) |
+| Branch, everything since it forked off a base (committed or not) | `base:<ref>` | `git diff $(git merge-base <ref> HEAD)` (+ untracked) |
 | One commit | `commit:<sha>` | `git diff <sha>^ <sha>` |
 | Two refs | `range:<base>..<head>` | `git diff <base>...<head>` |
 | Worktree, working tree | `worktree:<path>:working` | same, run inside the worktree |
 | Worktree, branch vs base | `worktree:<path>:range:<base>..<head>` | same, run inside the worktree |
+| Worktree, everything since base | `worktree:<path>:base:<ref>` | same, run inside the worktree |
 Refs accept anything git can resolve (`main`, `v1.2`, `HEAD~3`, a sha). `@` is `HEAD`.
 Worktrees are discovered with `git worktree list` and share the review state of the main repository.
+There is no target switcher in the UI: the sidebar's two blocks *are* the working tree, a commit is
+picked from the *Commits* panel, and the *Branch vs* and *Range* fields at the top of that panel open
+the other two. The sidebar names whatever is under review in its block header and puts a
+*返回工作区* link above it.
 `working`, `staged` and `all` are the three **local views** of one worktree. While any of them is
 selected the sidebar shows two blocks — Unstaged (`working`) and Staged (`staged`) — instead of a
 single tree, and clicking a file switches to the view it belongs to. A file that is only partly
 staged appears in both. Switching between the three keeps your comments, the draft you are typing
-and the current selection; only the diff is reloaded. Commit and range targets keep the single tree.
+and the current selection; only the diff is reloaded. `all` has no control of its own (a saved
+`lastTarget` can still restore it; *Branch vs* `@` shows the same diff). Commit, range and `base`
+targets keep the single tree.
+`base:<ref>` is for a branch a coding agent has been working on, committing as it goes: one tree with
+everything since the branch forked off `<ref>` — the commits plus whatever is still uncommitted or
+untracked. The diff runs against the merge base, so commits that landed on `<ref>` after the fork are
+not listed as reverted (which is what a plain `git diff <ref>` would do). The *Branch vs* field in the
+Commits panel suggests the base for you — the main worktree's branch when a sibling worktree is under
+review, otherwise `main` or `master` — and takes any ref. Unlike the three local views, `base` keeps its own
+pool of comments and a commit never deletes them: the round under review is not over when the agent
+commits, so a comment whose lines changed stays *orphaned*, snippet and all, until you have checked
+the fix and delete or re-attach it.
 ## Keyboard
@@ -120,6 +142,9 @@ them — the comment's current view first, then `working`, `staged`, `all`. So:
   **deleted** (and unlinked from any issue), because the code they were about is now history.
   Anything still visible in Unstaged or Staged survives, including as a context line.
+Commit, range and `base` targets each keep their own pool and only ever search themselves, and none of
+them deletes on a moved HEAD.
 Comment markers in the diff belong to one view; the rail's *全部* tab lists the whole pool and
 *此文件* lists every comment on the open file regardless of which view it currently sits in.
@@ -143,19 +168,16 @@ Notes attached to a branch rather than to a line of code, for the things you not
 that do not belong in a comment. They are not deleted when you commit. They sit in the right-hand
 rail next to the comments, under the *Todo* tab: type a title and press Enter to add one, expand a
 card to read or edit its Markdown body, filter by status, and switch between the current branch
-and all branches; *复制 Todo* copies the open ones
-(optionally including the done ones, marked ` (done)`) as:
+and all branches.
+Each card has its own *复制* button, and there is deliberately no "copy all": a todo is one task to
+hand to an agent, and the agent it goes to is already working in that branch. So the clipboard gets
+the title and the body — no branch, repo, count or numbering:
 ```markdown
-# TODO
-Branch: feature/x
-Repo: /home/user/project
-Count: 2
+补充 OrderList 的空状态
-## 1. 补充 OrderList 的空状态
 描述正文（Markdown）…
-## 2. useOrder 的依赖数组缺少 id
 ```
 ## nvim integration
@@ -201,7 +223,7 @@ move into the matching scope the first time the file is read.
 Single user, local only. The server binds to `127.0.0.1`, executes git only through
 `execFile('git', [...])` with an argument whitelist (`rev-parse`, `diff`, `show`, `log`, `worktree list`,
-`ls-files`, `status`), refuses option-looking refs and any write-capable flag, and never writes into the
+`ls-files`, `status`, `merge-base`), refuses option-looking refs and any write-capable flag, and never writes into the
 repository. Requests that would need anything else get HTTP 400.
 ## Development

package/dist/cli.js CHANGED Viewed

@@ -2897,6 +2897,11 @@ function parseSuffix(rest) {
     if (!isValidRef(sha)) throw new TargetKeyError(`invalid commit ref: ${sha}`);
     return { kind: "commit", sha };
   }
+  if (rest.startsWith("base:")) {
+    const ref = rest.slice("base:".length);
+    if (!isValidRef(ref)) throw new TargetKeyError(`invalid base ref: ${ref}`);
+    return { kind: "base", ref };
+  }
   if (rest.startsWith("range:")) {
     const spec = rest.slice("range:".length);
     const idx = spec.indexOf("..");
@@ -2912,7 +2917,7 @@ function parseTargetKey(key) {
   if (typeof key !== "string" || !key) throw new TargetKeyError("empty target key");
   if (key.startsWith("worktree:")) {
     const rest = key.slice("worktree:".length);
-    const m = /^(.+):(working|staged|all|commit:.+|range:.+)$/.exec(rest);
+    const m = /^(.+):(working|staged|all|commit:.+|range:.+|base:.+)$/.exec(rest);
     if (!m || !m[1] || !m[2]) throw new TargetKeyError(`invalid worktree target key: ${key}`);
     const worktree = m[1];
     if (!worktree.startsWith("/")) throw new TargetKeyError(`worktree path must be absolute: ${worktree}`);
@@ -2934,6 +2939,9 @@ function formatTargetKey(t) {
     case "range":
       suffix = `range:${t.base}..${t.head}`;
       break;
+    case "base":
+      suffix = `base:${t.ref}`;
+      break;
   }
   return t.worktree ? `worktree:${t.worktree}:${suffix}` : suffix;
 }
@@ -2980,9 +2988,44 @@ function notFound(message, code = "not_found") {
   return new HttpError(404, message, code);
 }
+// packages/server/src/commits.ts
+var SEP = "";
+var COMMIT_FORMAT = `%H${SEP}%h${SEP}%an${SEP}%ae${SEP}%aI${SEP}%P${SEP}%D${SEP}%s`;
+function parseDecorations(raw2) {
+  const refs = [];
+  let head = false;
+  for (const part of raw2.split(", ")) {
+    const p = part.trim();
+    if (!p || p === "grafted" || p === "replaced") continue;
+    if (p.endsWith("/HEAD")) continue;
+    if (p === "HEAD") head = true;
+    else if (p.startsWith("HEAD -> ")) {
+      head = true;
+      refs.unshift({ name: p.slice("HEAD -> ".length), kind: "branch" });
+    } else if (p.startsWith("tag: ")) refs.push({ name: p.slice("tag: ".length), kind: "tag" });
+    else refs.push({ name: p, kind: "branch" });
+  }
+  return { refs, head };
+}
+function parseCommitLog(stdout) {
+  return stdout.split("\n").filter(Boolean).map((line) => {
+    const [sha = "", shortSha = "", author = "", email = "", date = "", parents = "", decorations = "", ...rest] = line.split(SEP);
+    return {
+      sha,
+      shortSha,
+      author,
+      email,
+      date,
+      parents: parents.split(" ").filter(Boolean),
+      ...parseDecorations(decorations),
+      subject: rest.join(SEP)
+    };
+  });
+}
 // packages/server/src/git.ts
 import { execFile } from "child_process";
-var ALLOWED_SUBCOMMANDS = /* @__PURE__ */ new Set(["rev-parse", "diff", "show", "log", "worktree", "ls-files", "status"]);
+var ALLOWED_SUBCOMMANDS = /* @__PURE__ */ new Set(["rev-parse", "diff", "show", "log", "worktree", "ls-files", "status", "merge-base"]);
 var FORBIDDEN_OPTION_PREFIXES = ["--output", "--ext-diff", "--textconv", "-c", "--config-env", "--exec-path", "--git-dir", "--work-tree"];
 var DEFAULT_GIT_TIMEOUT_MS = 3e4;
 var EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
@@ -3077,6 +3120,14 @@ async function revParse(cwd, ref) {
     return void 0;
   }
 }
+async function mergeBase(cwd, a, b) {
+  try {
+    const r = await runGit(["merge-base", a, b], { cwd });
+    return r.stdout.trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
 // packages/server/src/repo.ts
 import path from "path";
@@ -3150,11 +3201,16 @@ async function currentBranch(cwd) {
   const sha = head.stdout.trim();
   return sha ? sha.slice(0, 7) : "HEAD";
 }
+async function detectDefaultBase(cwd) {
+  for (const ref of ["main", "master"]) if (await refExists(cwd, ref)) return ref;
+  return void 0;
+}
 async function getRepoInfo(ctx, defaultTarget) {
-  const [branch, headRes, worktrees] = await Promise.all([
+  const [branch, headRes, worktrees, defaultBase] = await Promise.all([
     currentBranch(ctx.root),
     runGit(["rev-parse", "HEAD"], { cwd: ctx.root }).catch(() => ({ stdout: "" })),
-    listWorktrees(ctx)
+    listWorktrees(ctx),
+    detectDefaultBase(ctx.root)
   ]);
   return {
     root: ctx.root,
@@ -3162,7 +3218,8 @@ async function getRepoInfo(ctx, defaultTarget) {
     branch,
     head: headRes.stdout.trim(),
     worktrees,
-    defaultTarget
+    defaultTarget,
+    ...defaultBase ? { defaultBase } : {}
   };
 }
@@ -3410,6 +3467,13 @@ function resolveTargetContext(repo, worktrees, key) {
 async function hasHead(cwd) {
   return refExists(cwd, "HEAD");
 }
+async function baseSha(ctx, ref) {
+  if (!await refExists(ctx.cwd, ref)) throw badRequest(`unknown ref: ${ref}`, "unknown_ref");
+  if (!await hasHead(ctx.cwd)) return EMPTY_TREE_SHA;
+  const sha = await mergeBase(ctx.cwd, ref, "HEAD");
+  if (!sha) throw badRequest(`${ref} and HEAD share no history`, "no_merge_base");
+  return sha;
+}
 async function diffArgs(ctx) {
   const t = ctx.target;
   switch (t.kind) {
@@ -3429,10 +3493,12 @@ async function diffArgs(ctx) {
       if (!await refExists(ctx.cwd, t.head)) throw badRequest(`unknown ref: ${t.head}`, "unknown_ref");
       return [...DIFF_BASE_ARGS, `${t.base}...${t.head}`];
     }
+    case "base":
+      return [...DIFF_BASE_ARGS, await baseSha(ctx, t.ref)];
   }
 }
 function includesUntracked(t) {
-  return t.kind === "working" || t.kind === "all";
+  return t.kind === "working" || t.kind === "all" || t.kind === "base";
 }
 async function listUntracked(cwd) {
   const r = await runGit(["ls-files", "--others", "--exclude-standard", "-z"], { cwd });
@@ -3512,6 +3578,8 @@ async function refForSide(ctx, side) {
       return await revParse(ctx.cwd, `${t.sha}^`) ?? EMPTY_TREE_SHA;
     case "range":
       return side === "new" ? t.head : t.base;
+    case "base":
+      return side === "new" ? void 0 : baseSha(ctx, t.ref);
   }
 }
 async function getFullFile(ctx, filePath, side) {
@@ -3892,16 +3960,6 @@ function formatIssueExport({ repoRoot, issue, comments }) {
   parts.push(...comments.map(formatCommentSection));
   return parts.join("\n\n") + "\n";
 }
-function formatTodosExport({ repoRoot, branch, todos }) {
-  const head = ["# TODO", `Branch: ${branch}`, `Repo: ${repoRoot}`, `Count: ${todos.length}`];
-  const sections = todos.map((t, i) => {
-    const title = `## ${i + 1}. ${t.title}${t.status === "done" ? " (done)" : ""}`;
-    const body = t.body.replace(/\r\n/g, "\n").trim();
-    return body ? `${title}
-${body}` : title;
-  });
-  return [head.join("\n"), ...sections].join("\n\n") + "\n";
-}
 // packages/server/src/nvim.ts
 import os2 from "os";
@@ -4653,15 +4711,6 @@ function createApp(opts) {
     });
     return c.json(todo, 201);
   });
-  api.post("/todos/export", async (c) => {
-    const body = await c.req.json();
-    const branch = typeof body.branch === "string" ? body.branch.trim() : "";
-    if (!branch) throw badRequest("branch is required");
-    const s = await store.load();
-    const todos = s.todos.filter((t) => t.branch === branch && (body.includeDone === true || t.status === "open"));
-    const res = { text: formatTodosExport({ repoRoot: repo.root, branch, todos }), count: todos.length };
-    return c.json(res);
-  });
   api.patch("/todos/:id", async (c) => {
     const id = c.req.param("id");
     const body = await c.req.json();
@@ -4689,23 +4738,29 @@ function createApp(opts) {
   api.get("/commits", async (c) => {
     const limitRaw = Number(c.req.query("limit") ?? 200);
     const limit = Math.min(Math.max(Number.isFinite(limitRaw) ? Math.floor(limitRaw) : 200, 1), 1e3);
-    const before = c.req.query("before") || void 0;
+    const offsetRaw = Number(c.req.query("offset") ?? 0);
+    const offset = Number.isFinite(offsetRaw) && offsetRaw > 0 ? Math.floor(offsetRaw) : 0;
     const filePath = c.req.query("path") || void 0;
     const ref = c.req.query("ref") || void 0;
     const rootParam = c.req.query("root") || void 0;
+    const q = (c.req.query("q") ?? "").trim();
+    const author = (c.req.query("author") ?? "").trim();
+    const firstParent = c.req.query("firstParent") === "1";
     let cwd = repo.root;
     if (rootParam) {
       const wt = (await worktrees()).find((w) => w.path === rootParam);
       if (!wt && rootParam !== repo.root) throw badRequest("unknown root", "unknown_worktree");
       cwd = rootParam;
     }
-    if (before && !isValidRef(before)) throw badRequest("invalid before ref");
     if (ref && !isValidRef(ref)) throw badRequest("invalid ref");
     if (filePath && (filePath.startsWith("/") || filePath.split("/").includes(".."))) throw badRequest("invalid path");
-    const SEP = "";
-    const args = ["log", `--max-count=${limit + 1}`, `--format=%H${SEP}%h${SEP}%an${SEP}%ae${SEP}%aI${SEP}%P${SEP}%s`];
-    if (before) args.push(before);
-    else if (ref) args.push(ref);
+    if (q.length > 200 || author.length > 200) throw badRequest("search text too long");
+    const args = ["log", `--max-count=${limit + 1}`, `--skip=${offset}`, `--format=${COMMIT_FORMAT}`];
+    if (firstParent) args.push("--first-parent");
+    if (q || author) args.push("--fixed-strings", "--regexp-ignore-case");
+    if (q) args.push(`--grep=${q}`);
+    if (author) args.push(`--author=${author}`);
+    if (ref) args.push(ref);
     if (filePath) args.push("--", filePath);
     let stdout = "";
     try {
@@ -4714,13 +4769,17 @@ function createApp(opts) {
       if (e instanceof HttpError && e.code === "git_failed") stdout = "";
       else throw e;
     }
-    let commits = stdout.split("\n").filter(Boolean).map((line) => {
-      const [sha = "", shortSha = "", author = "", email = "", date = "", parents = "", ...rest] = line.split(SEP);
-      return { sha, shortSha, author, email, date, parents: parents.split(" ").filter(Boolean), subject: rest.join(SEP) };
-    });
-    if (before) commits = commits.filter((x) => x.sha !== before && !x.sha.startsWith(before));
-    const hasMore = commits.length > limit;
-    const res = { commits: commits.slice(0, limit), hasMore };
+    const rows = parseCommitLog(stdout);
+    const hasMore = rows.length > limit;
+    let commits = rows.slice(0, limit);
+    if (q && offset === 0 && /^[0-9a-f]{4,40}$/i.test(q)) {
+      const sha = await revParse(cwd, `${q}^{commit}`);
+      if (sha && !commits.some((x) => x.sha === sha)) {
+        const hit = parseCommitLog((await runGit(["log", "--max-count=1", `--format=${COMMIT_FORMAT}`, sha], { cwd })).stdout)[0];
+        if (hit) commits = [hit, ...commits];
+      }
+    }
+    const res = { commits, hasMore };
     return c.json(res);
   });
   api.get("/events", async (c) => {
@@ -4900,7 +4959,7 @@ async function startServer(opts) {
 }
 // bin/cli.ts
-var VERSION = true ? "0.4.0" : "dev";
+var VERSION = true ? "0.6.0" : "dev";
 function parseArgs(argv) {
   const args = { repoPath: process.cwd(), open: true, help: false, version: false };
   for (let i = 0; i < argv.length; i++) {