@xbghc/warden 0.6.0 → 0.6.1

package/README.md

@@ -57,6 +57,10 @@ Several instances on the same repository can run at the same time.
 
 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.
+One whose directory is gone (git lists it as *prunable*) is not offered, and a remembered target
+inside a removed worktree falls back to the working tree on the next load. The comments and viewed
+flags kept under that worktree's key stay in the state file and come back if a worktree is created
+at the same path again.
 
 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
@@ -154,8 +158,8 @@ bound to a hash of the file's diff; when the diff changes the flag is dropped an
 
 ## Auto-refresh
 
-warden polls the worktree every 1.5 s while the page is open (`git status --porcelain`, HEAD, the
-branch name, plus mtime and size of the paths status reports — enough to notice a second edit to an
+warden polls the worktree every 1.5 s while the page is open (`git status --porcelain
+--untracked-files=all`, HEAD, the branch name, plus mtime and size of the paths status reports — enough to notice a second edit to an
 already-modified file) and pushes a change event over `GET /api/events` (SSE). The page then re-runs
 the normal refresh: re-anchor, reload both file lists, reload the open diff. Your draft comment,
 selection, current view and current file are left alone, and the diff is scrolled back to where you

package/dist/cli.js

@@ -3,7 +3,7 @@
 // bin/cli.ts
 import path8 from "path";
 import { spawn } from "child_process";
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { fileURLToPath } from "url";
 
 // packages/server/src/index.ts
@@ -3025,6 +3025,7 @@ function parseCommitLog(stdout) {
 
 // packages/server/src/git.ts
 import { execFile } from "child_process";
+import { existsSync } from "fs";
 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;
@@ -3087,6 +3088,10 @@ async function runGit(args, opts) {
             return;
           }
           if (err.code === "ENOENT") {
+            if (opts.cwd && !existsSync(opts.cwd)) {
+              reject(new GitError(`working directory no longer exists: ${opts.cwd}`, null, "", 400, "unknown_worktree"));
+              return;
+            }
             reject(new GitError("git executable not found in PATH", null, "", 500, "git_missing"));
             return;
           }
@@ -3159,7 +3164,7 @@ async function listWorktrees(ctx) {
   const out = [];
   let cur = null;
   const flush = () => {
-    if (cur && cur.path) {
+    if (cur && cur.path && !cur.prunable) {
       out.push({
         path: cur.path,
         head: cur.head ?? "",
@@ -3185,6 +3190,7 @@ async function listWorktrees(ctx) {
     else if (line.startsWith("branch ")) cur.branch = line.slice(7).replace(/^refs\/heads\//, "");
     else if (line === "detached") cur.detached = true;
     else if (line === "bare") cur.bare = true;
+    else if (line.startsWith("prunable")) cur.prunable = true;
   }
   flush();
   for (const wt of out) {
@@ -3387,11 +3393,11 @@ function parseUnifiedDiff(text) {
       continue;
     }
     if (line.startsWith("--- ")) {
-      c.fromMinus = stripPrefix(line.slice(4), "a/");
+      c.fromMinus = stripPrefix(line.slice(4).replace(/\t$/, ""), "a/");
       continue;
     }
     if (line.startsWith("+++ ")) {
-      c.fromPlus = stripPrefix(line.slice(4), "b/");
+      c.fromPlus = stripPrefix(line.slice(4).replace(/\t$/, ""), "b/");
       continue;
     }
     if (line.startsWith("new file mode ")) {
@@ -3464,6 +3470,10 @@ function resolveTargetContext(repo, worktrees, key) {
   }
   return { key, target, cwd };
 }
+function assertRepoPath(p) {
+  if (!p || p.startsWith("/") || p.split("/").includes("..")) throw badRequest(`invalid path: ${p}`, "invalid_path");
+}
+var literal = (p) => `:(literal)${p}`;
 async function hasHead(cwd) {
   return refExists(cwd, "HEAD");
 }
@@ -3491,6 +3501,7 @@ async function diffArgs(ctx) {
     case "range": {
       if (!await refExists(ctx.cwd, t.base)) throw badRequest(`unknown ref: ${t.base}`, "unknown_ref");
       if (!await refExists(ctx.cwd, t.head)) throw badRequest(`unknown ref: ${t.head}`, "unknown_ref");
+      if (!await mergeBase(ctx.cwd, t.base, t.head)) throw badRequest(`${t.base} and ${t.head} share no history`, "no_merge_base");
       return [...DIFF_BASE_ARGS, `${t.base}...${t.head}`];
     }
     case "base":
@@ -3505,7 +3516,7 @@ async function listUntracked(cwd) {
   return r.stdout.split("\0").filter(Boolean);
 }
 async function isUntracked(cwd, file) {
-  const r = await runGit(["ls-files", "--others", "--exclude-standard", "-z", "--", file], { cwd });
+  const r = await runGit(["ls-files", "--others", "--exclude-standard", "-z", "--", literal(file)], { cwd });
   return r.stdout.split("\0").filter(Boolean).includes(file);
 }
 async function untrackedDiff(cwd, file) {
@@ -3551,15 +3562,14 @@ function toSummary(f) {
   return rest;
 }
 async function getFileDiff(ctx, filePath, hints = {}) {
-  if (!filePath || filePath.startsWith("/") || filePath.split("/").includes("..")) {
-    throw badRequest(`invalid path: ${filePath}`, "invalid_path");
-  }
+  assertRepoPath(filePath);
+  if (hints.oldPath) assertRepoPath(hints.oldPath);
   if (includesUntracked(ctx.target) && (hints.untracked || await isUntracked(ctx.cwd, filePath))) {
     return untrackedDiff(ctx.cwd, filePath);
   }
   const args = await diffArgs(ctx);
-  const pathspec = [filePath];
-  if (hints.oldPath && hints.oldPath !== filePath) pathspec.push(hints.oldPath);
+  const pathspec = [literal(filePath)];
+  if (hints.oldPath && hints.oldPath !== filePath) pathspec.push(literal(hints.oldPath));
   const r = await runGit([...args, "--", ...pathspec], { cwd: ctx.cwd });
   const files = parseUnifiedDiff(r.stdout);
   return files.find((f) => f.path === filePath) ?? files[0];
@@ -3583,9 +3593,7 @@ async function refForSide(ctx, side) {
   }
 }
 async function getFullFile(ctx, filePath, side) {
-  if (!filePath || filePath.startsWith("/") || filePath.split("/").includes("..")) {
-    throw badRequest(`invalid path: ${filePath}`, "invalid_path");
-  }
+  assertRepoPath(filePath);
   const ref = await refForSide(ctx, side);
   if (ref === void 0) {
     try {
@@ -3751,6 +3759,8 @@ function ensureTarget(state, key) {
   }
   return t;
 }
+var usable = (v) => !!v && typeof v === "object" && typeof v.id === "string";
+var usableComment = (v) => usable(v) && typeof v.anchor === "object" && !!v.anchor;
 function normalise(raw2, repoRoot) {
   const base = defaultState(repoRoot);
   if (!raw2 || typeof raw2 !== "object") return base;
@@ -3761,7 +3771,7 @@ function normalise(raw2, repoRoot) {
     if (!v || typeof v !== "object") continue;
     targets[k] = {
       viewed: typeof v.viewed === "object" && v.viewed ? v.viewed : {},
-      comments: Array.isArray(v.comments) ? v.comments : [],
+      comments: Array.isArray(v.comments) ? v.comments.filter(usableComment) : [],
       ...typeof v.head === "string" ? { head: v.head } : {}
     };
   }
@@ -3770,8 +3780,8 @@ function normalise(raw2, repoRoot) {
     schemaVersion: 1,
     repoRoot: r.repoRoot ?? repoRoot,
     targets,
-    issues: Array.isArray(r.issues) ? r.issues : [],
-    todos: Array.isArray(r.todos) ? r.todos : [],
+    issues: Array.isArray(r.issues) ? r.issues.filter(usable) : [],
+    todos: Array.isArray(r.todos) ? r.todos.filter(usable) : [],
     prefs: {
       ...defaultPrefs(),
       ...r.prefs ?? {},
@@ -4166,7 +4176,9 @@ var RepoWatcher = class {
   }
   async snapshot() {
     const [statusRes, headRes, branch] = await Promise.all([
-      runGit(["status", "--porcelain", "-z"], { cwd: this.root }),
+      // Untracked files one by one: folded into their directory, an edit inside a directory the
+      // agent just created would leave the directory's own mtime and size untouched.
+      runGit(["status", "--porcelain", "-z", "--untracked-files=all"], { cwd: this.root }),
       runGit(["rev-parse", "HEAD"], { cwd: this.root }).catch(() => ({ stdout: "" })),
       // The same label getRepoInfo reports, so the branch identity the client filters todos by
       // never flips between `HEAD` and a short sha depending on which of the two spoke last.
@@ -4275,13 +4287,6 @@ function createApp(opts) {
       throw e;
     }
   };
-  const decodeKey = (raw2) => {
-    try {
-      return decodeURIComponent(raw2);
-    } catch {
-      throw badRequest("malformed target key", "invalid_target");
-    }
-  };
   const fileDiffWithHints = async (ctx, filePath, explicit) => {
     const cached = listings.get(ctx.key);
     const hint = cached && Date.now() - cached.at < LISTING_HINT_TTL_MS ? cached.files.find((f) => f.path === filePath) : void 0;
@@ -4308,8 +4313,13 @@ function createApp(opts) {
   api.get("/ping", (c) => c.text(opts.instanceToken ?? ""));
   api.get("/repo", async (c) => {
     const state = await store.load();
-    const info = await getRepoInfo(repo, state.prefs.lastTarget ?? "working");
+    const info = await getRepoInfo(repo, "working");
     worktreeCache = { at: Date.now(), list: info.worktrees };
+    const last = state.prefs.lastTarget;
+    const target = last ? tryParseTargetKey(last) : void 0;
+    const usable2 = !!target && (!target.worktree || info.worktrees.some((w) => w.path === target.worktree));
+    if (last && usable2) info.defaultTarget = last;
+    else if (last) await store.update((s) => void (s.prefs.lastTarget = "working"));
     return c.json(info);
   });
   api.get("/state", async (c) => c.json(await store.load()));
@@ -4327,7 +4337,7 @@ function createApp(opts) {
     return c.json(prefs);
   });
   api.get("/targets/:key/files", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const ctx = await targetCtx(key);
     const diffs = await listTargetDiffs(ctx);
     listings.set(key, { at: Date.now(), files: diffs });
@@ -4363,7 +4373,7 @@ function createApp(opts) {
     return c.json(res);
   });
   api.get("/targets/:key/file", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const filePath = c.req.query("path");
     if (!filePath) throw badRequest("missing path");
     const ctx = await targetCtx(key);
@@ -4374,7 +4384,7 @@ function createApp(opts) {
     return c.json(diff);
   });
   api.get("/targets/:key/file/full", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const filePath = c.req.query("path");
     if (!filePath) throw badRequest("missing path");
     const side = c.req.query("side") === "old" ? "old" : "new";
@@ -4384,7 +4394,7 @@ function createApp(opts) {
     return c.json(res);
   });
   api.put("/targets/:key/viewed", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     await targetCtx(key);
     const body = await c.req.json();
     if (!body.path) throw badRequest("missing path");
@@ -4398,12 +4408,12 @@ function createApp(opts) {
     return c.json({ viewed });
   });
   api.get("/targets/:key/comments", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const state = await store.load();
     return c.json({ comments: state.targets[commentScopeKey(key)]?.comments ?? [] });
   });
   api.post("/targets/:key/comments", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const ctx = await targetCtx(key);
     const body = await c.req.json();
     if (!body.filePath || typeof body.body !== "string" || !body.body.trim()) throw badRequest("filePath and body are required");
@@ -4436,7 +4446,7 @@ function createApp(opts) {
     return c.json(comment, 201);
   });
   api.patch("/targets/:key/comments/:id", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const id = c.req.param("id");
     const ctx = await targetCtx(key);
     const body = await c.req.json();
@@ -4481,7 +4491,7 @@ function createApp(opts) {
     return c.json(updated);
   });
   api.delete("/targets/:key/comments/:id", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const id = c.req.param("id");
     const removed = await store.update((s) => {
       const t = s.targets[commentScopeKey(key)];
@@ -4495,7 +4505,7 @@ function createApp(opts) {
     return c.json({ ok: true });
   });
   api.post("/targets/:key/comments/reanchor", async (c) => {
-    const key = decodeKey(c.req.param("key"));
+    const key = c.req.param("key");
     const ctx = await targetCtx(key);
     const scope = commentScopeKey(key);
     const local = isLocalTarget(ctx.target);
@@ -4959,7 +4969,7 @@ async function startServer(opts) {
 }
 
 // bin/cli.ts
-var VERSION = true ? "0.6.0" : "dev";
+var VERSION = true ? "0.6.1" : "dev";
 function parseArgs(argv) {
   const args = { repoPath: process.cwd(), open: true, help: false, version: false };
   for (let i = 0; i < argv.length; i++) {
@@ -5029,7 +5039,7 @@ function resolveWebDir() {
     // bin/cli.ts (tsx dev) -> dist/web
   ].filter((p) => !!p);
   for (const dir of candidates) {
-    if (existsSync(path8.join(dir, "index.html"))) return dir;
+    if (existsSync2(path8.join(dir, "index.html"))) return dir;
   }
   return void 0;
 }