@xbghc/warden 0.16.1 → 0.16.2

package/dist/cli.js

@@ -4066,6 +4066,15 @@ async function listUntracked(cwd) {
   const r = await runGit(["ls-files", "--others", "--exclude-standard", "-z"], { cwd });
   return r.stdout.split("\0").filter(Boolean);
 }
+async function listUnmerged(cwd, file) {
+  const r = await runGit(["ls-files", "--unmerged", "-z", ...file ? ["--", literal(file)] : []], { cwd });
+  return [...new Set(r.stdout.split("\0").flatMap((e) => e.includes("	") ? [e.slice(e.indexOf("	") + 1)] : []))];
+}
+async function conflictDiff(ctx, file) {
+  const base = await hasHead(ctx.cwd) ? "HEAD" : EMPTY_TREE_SHA;
+  const f = parseUnifiedDiff(await runDiff(ctx, [...DIFF_BASE_ARGS, base, "--", literal(file)])).find((d) => d.path === file);
+  return f ? { ...f, conflicted: true } : void 0;
+}
 async function isUntracked(cwd, file) {
   const r = await runGit(["ls-files", "--others", "--exclude-standard", "-z", "--", literal(file)], { cwd });
   return r.stdout.split("\0").filter(Boolean).includes(file);
@@ -4099,6 +4108,15 @@ async function mapLimit(items, limit, fn) {
 async function listTargetDiffs(ctx) {
   const args = await diffArgs(ctx);
   const files = parseUnifiedDiff(await runDiff(ctx, [...args, "--"]));
+  if (ctx.target.kind === "working") {
+    for (const path13 of await listUnmerged(ctx.cwd)) {
+      const d = await conflictDiff(ctx, path13);
+      if (!d) continue;
+      const at = files.findIndex((f) => f.path === path13);
+      if (at >= 0) files[at] = d;
+      else files.push(d);
+    }
+  }
   if (includesUntracked(ctx.target)) {
     const untracked = await listUntracked(ctx.cwd);
     const extra = await mapLimit(untracked, 8, (f) => untrackedDiff(ctx.cwd, f).catch(() => void 0));
@@ -4117,6 +4135,7 @@ async function getFileDiff(ctx, filePath, hints = {}) {
   if (includesUntracked(ctx.target) && (hints.untracked || await isUntracked(ctx.cwd, filePath))) {
     return untrackedDiff(ctx.cwd, filePath);
   }
+  if (ctx.target.kind === "working" && (await listUnmerged(ctx.cwd, filePath)).includes(filePath)) return conflictDiff(ctx, filePath);
   const args = await diffArgs(ctx);
   const pathspec = [literal(filePath)];
   if (hints.oldPath && hints.oldPath !== filePath) pathspec.push(literal(hints.oldPath));
@@ -4263,6 +4282,12 @@ function matchesAt(lines, start, hashes) {
   }
   return true;
 }
+var DISTINCTIVE_CHARS = 24;
+function distinctive(lines, start, count) {
+  let chars = 0;
+  for (let i = start; i < start + count; i++) chars += lines[i].content.replace(/\s+/g, "").length;
+  return chars >= DISTINCTIVE_CHARS;
+}
 function contextScore(lines, start, count, anchor) {
   let score = 0;
   const before = anchor.contextBefore;
@@ -4291,7 +4316,10 @@ function locateAnchor(diff, side, anchor) {
     if (matchesAt(lines, i, anchor.lineHashes)) candidates.push(i);
   }
   if (candidates.length === 0) return void 0;
-  if (candidates.length === 1) return candidates[0];
+  if (candidates.length === 1) {
+    const c = candidates[0];
+    return contextScore(lines, c, n, anchor) > 0 || distinctive(lines, c, n) ? c : void 0;
+  }
   let best = [];
   let bestScore = -1;
   for (const c of candidates) {
@@ -4832,9 +4860,16 @@ async function commentsIn(state, worktreeRoot, mainRoot) {
   return out;
 }
 async function takeFeedback(store, opts) {
-  if (opts.peek) return (await commentsIn(await store.load(), opts.worktreeRoot, opts.mainRoot)).filter(awaitsAgent);
-  return store.update(async (s) => {
-    const ids = new Set((await commentsIn(s, opts.worktreeRoot, opts.mainRoot)).filter(awaitsAgent).map((c) => c.id));
+  const waiting = (await commentsIn(await store.load(), opts.worktreeRoot, opts.mainRoot)).filter(awaitsAgent);
+  if (opts.peek) return waiting;
+  return markHandedOver(
+    store,
+    waiting.map((c) => c.id)
+  );
+}
+async function markHandedOver(store, commentIds) {
+  return store.update((s) => {
+    const ids = new Set(commentIds);
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const taken = [];
     for (const t of Object.values(s.targets)) {
@@ -5465,6 +5500,7 @@ function createApp(opts) {
     if (body.skipDebug !== void 0 && typeof body.skipDebug !== "boolean") throw badRequest("skipDebug must be a boolean", "bad_selection");
     const diff = await fileDiffWithHints(ctx, body.path);
     if (!diff) throw badRequest(`file ${body.path} is not part of ${key}`, "no_diff");
+    if (diff.conflicted) throw new HttpError(409, `${body.path} is in conflict; resolve it and git add it in the terminal`, "conflicted");
     if (diff.contentHash !== body.contentHash)
       throw new HttpError(409, "the diff changed since it was loaded; refresh and pick the lines again", "diff_changed");
     if (body.skipDebug) await annotateDebug(ctx, [diff]);
@@ -5519,20 +5555,20 @@ function createApp(opts) {
     const body = await c.req.json();
     const scope = commentScopeKey(key);
     const state = await store.load();
-    const existing = state.targets[scope]?.comments.find((x) => x.id === id);
-    if (!existing) throw notFound("comment not found");
+    const existing2 = state.targets[scope]?.comments.find((x) => x.id === id);
+    if (!existing2) throw notFound("comment not found");
     let patch = {};
     if (typeof body.body === "string") {
       if (!body.body.trim()) throw badRequest("body must not be empty");
       patch.body = body.body;
     }
     if (body.startLine !== void 0 || body.side !== void 0) {
-      const side = body.side ?? existing.side;
-      const start = Number(body.startLine ?? existing.startLine);
-      const end = Number(body.endLine ?? body.startLine ?? existing.endLine);
+      const side = body.side ?? existing2.side;
+      const start = Number(body.startLine ?? existing2.startLine);
+      const end = Number(body.endLine ?? body.startLine ?? existing2.endLine);
       if (side !== "old" && side !== "new") throw badRequest("side must be old|new");
-      const diff = await fileDiffWithHints(ctx, existing.filePath);
-      if (!diff) throw badRequest(`file ${existing.filePath} is not part of ${key}`, "no_diff");
+      const diff = await fileDiffWithHints(ctx, existing2.filePath);
+      if (!diff) throw badRequest(`file ${existing2.filePath} is not part of ${key}`, "no_diff");
       const anchored = buildAnchor(diff, side, start, end);
       if (!anchored) throw badRequest("selection is not fully visible in the diff on that side", "bad_selection");
       patch = {
@@ -5542,7 +5578,7 @@ function createApp(opts) {
         endLine: anchored.endLine,
         codeSnippet: anchored.snippet,
         anchor: anchored.anchor,
-        status: existing.exportedAt ? "exported" : "active",
+        status: existing2.exportedAt ? "exported" : "active",
         // Re-attaching in a view moves the comment to it.
         targetKey: key
       };
@@ -5551,7 +5587,12 @@ function createApp(opts) {
       const t = ensureTarget(s, scope);
       const idx = t.comments.findIndex((x) => x.id === id);
       if (idx < 0) throw notFound("comment not found");
-      const next = { ...t.comments[idx], ...patch, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+      const prev = t.comments[idx];
+      const next = { ...prev, ...patch, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+      if (patch.body !== void 0 && patch.body !== prev.body && next.exportedAt) {
+        delete next.exportedAt;
+        if (next.status === "exported") next.status = "active";
+      }
       t.comments[idx] = next;
       return next;
     });
@@ -5678,30 +5719,34 @@ function createApp(opts) {
     const res = { comments: result };
     return c.json(res);
   });
-  api.post("/comments/export", async (c) => {
-    const body = await c.req.json();
-    if (!Array.isArray(body.commentIds)) throw badRequest("commentIds required");
-    const ids = body.commentIds.filter((x) => typeof x === "string");
-    let handed = [];
-    const res = await store.update((s) => {
+  const handOver = async (ids) => {
+    const handed = await store.update((s) => {
       const now = (/* @__PURE__ */ new Date()).toISOString();
-      const selected = [];
+      const out = [];
       for (const id of ids) {
         const found = findComment(s, id);
         if (!found) continue;
         const next = { ...found.comment, exportedAt: now, updatedAt: now };
         if (next.status === "active") next.status = "exported";
         s.targets[found.targetKey].comments[found.index] = next;
-        selected.push(next);
+        out.push(next);
       }
-      handed = selected;
-      return {
-        text: formatCommentsExport({ repoRoot: repo.root, comments: selected, replyCommand: opts.replyCommand }),
-        count: selected.length,
-        commentIds: selected.map((x) => x.id)
-      };
+      return out;
     });
     checkpointHandoff(handed);
+    return handed;
+  };
+  const existing = (state, ids) => ids.flatMap((id) => findComment(state, id)?.comment ?? []);
+  api.post("/comments/export", async (c) => {
+    const body = await c.req.json();
+    if (!Array.isArray(body.commentIds)) throw badRequest("commentIds required");
+    const ids = body.commentIds.filter((x) => typeof x === "string");
+    const comments = body.preview ? existing(await store.load(), ids) : await handOver(ids);
+    const res = {
+      text: formatCommentsExport({ repoRoot: repo.root, comments, replyCommand: opts.replyCommand }),
+      count: comments.length,
+      commentIds: comments.map((x) => x.id)
+    };
     return c.json(res);
   });
   const knownRoot = async (rootParam) => {
@@ -5776,26 +5821,17 @@ function createApp(opts) {
   });
   api.post("/todos/:id/export", async (c) => {
     const id = c.req.param("id");
-    const handed = [];
-    const res = await store.update((s) => {
-      const todo = s.todos.find((t) => t.id === id);
-      if (!todo) throw notFound("todo not found");
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      for (const cid of todo.commentIds ?? []) {
-        const found = findComment(s, cid);
-        if (!found) continue;
-        const next = { ...found.comment, exportedAt: now, updatedAt: now };
-        if (next.status === "active") next.status = "exported";
-        s.targets[found.targetKey].comments[found.index] = next;
-        handed.push(next);
-      }
-      return {
-        text: formatTodoExport({ todo, comments: handed, replyCommand: opts.replyCommand }),
-        count: handed.length,
-        commentIds: handed.map((x) => x.id)
-      };
-    });
-    checkpointHandoff(handed);
+    const body = await c.req.json().catch(() => ({})) ?? {};
+    const state = await store.load();
+    const todo = state.todos.find((t) => t.id === id);
+    if (!todo) throw notFound("todo not found");
+    const ids = todo.commentIds ?? [];
+    const comments = body.preview ? existing(state, ids) : await handOver(ids);
+    const res = {
+      text: formatTodoExport({ todo, comments, replyCommand: opts.replyCommand }),
+      count: comments.length,
+      commentIds: comments.map((x) => x.id)
+    };
     return c.json(res);
   });
   api.delete("/todos/:id", async (c) => {
@@ -6233,18 +6269,21 @@ async function feedback(args, replyCommand) {
   const unknown = args.find((a) => a !== "--peek");
   if (unknown) throw new Error(`unknown argument: ${unknown}`);
   const { store, root, commonRoot } = await openStore();
-  const peek = args.includes("--peek");
-  const comments = await takeFeedback(store, { worktreeRoot: root, mainRoot: commonRoot, peek });
+  const comments = await takeFeedback(store, { worktreeRoot: root, mainRoot: commonRoot, peek: true });
   if (comments.length === 0) {
     console.log("No review comments are waiting for you.");
     return;
   }
-  if (!peek) {
-    await takeCheckpoint(store, root, root === commonRoot ? void 0 : root, { handoff: true }).catch((e) => {
-      console.error(`warden feedback: no checkpoint taken: ${e instanceof Error ? e.message : e}`);
-    });
-  }
-  process.stdout.write(formatCommentsExport({ repoRoot: root, comments, replyCommand }));
+  const text = formatCommentsExport({ repoRoot: root, comments, replyCommand });
+  await new Promise((resolve, reject) => process.stdout.write(text, (e) => e ? reject(e) : resolve()));
+  if (args.includes("--peek")) return;
+  await markHandedOver(
+    store,
+    comments.map((c) => c.id)
+  );
+  await takeCheckpoint(store, root, root === commonRoot ? void 0 : root, { handoff: true }).catch((e) => {
+    console.error(`warden feedback: no checkpoint taken: ${e instanceof Error ? e.message : e}`);
+  });
 }
 async function reply(args) {
   const [id, ...words] = args;
@@ -6271,7 +6310,7 @@ async function runAgentCommand(argv, replyCommand) {
 }
 
 // bin/cli.ts
-var VERSION = true ? "0.16.1" : "dev";
+var VERSION = true ? "0.16.2" : "dev";
 function parseArgs(argv) {
   const args = { repoPath: process.cwd(), open: true, updateCheck: true, help: false, version: false };
   for (let i = 0; i < argv.length; i++) {