@staff0rd/assist 0.543.1 → 0.545.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.543.1",
+  version: "0.545.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -16834,8 +16834,8 @@ function codeCommentConfirm(pin) {
   }
   const marker = isHashCommentFile(state.file) ? "#" : "//";
   const indentSource = lines2[index3] ?? "";
-  const indent2 = indentSource.match(/^\s*/)?.[0] ?? "";
-  lines2.splice(index3, 0, `${indent2}${marker} ${state.text}`);
+  const indent3 = indentSource.match(/^\s*/)?.[0] ?? "";
+  lines2.splice(index3, 0, `${indent3}${marker} ${state.text}`);
   writeFileSync24(state.file, lines2.join("\n"));
   unlinkSync8(getPinStatePath(pin));
   console.log(
@@ -19864,52 +19864,52 @@ function renderInline(node) {
   if (node.marks?.some((m) => m.type === "code")) return `\`${text17}\``;
   return text17;
 }
-function renderChildren(node, indent2) {
-  return renderNodes(node.content ?? [], indent2);
+function renderChildren(node, indent3) {
+  return renderNodes(node.content ?? [], indent3);
 }
-function renderOrderedList(node, indent2) {
+function renderOrderedList(node, indent3) {
   let counter = 0;
   return (node.content ?? []).map((item) => {
     counter++;
-    return renderListItem(item, indent2, `${counter}.`);
+    return renderListItem(item, indent3, `${counter}.`);
   }).join("\n");
 }
-function renderBulletList(node, indent2) {
-  return (node.content ?? []).map((item) => renderListItem(item, indent2, "-")).join("\n");
+function renderBulletList(node, indent3) {
+  return (node.content ?? []).map((item) => renderListItem(item, indent3, "-")).join("\n");
 }
-function renderHeading(node, indent2) {
+function renderHeading(node, indent3) {
   const level = node.attrs?.level ?? 1;
-  return `${"#".repeat(level)} ${renderChildren(node, indent2)}`;
+  return `${"#".repeat(level)} ${renderChildren(node, indent3)}`;
 }
 var renderers = {
   text: (node) => renderInline(node),
   paragraph: renderChildren,
   orderedList: renderOrderedList,
   bulletList: renderBulletList,
-  listItem: (node, indent2) => renderListItem(node, indent2, "-"),
+  listItem: (node, indent3) => renderListItem(node, indent3, "-"),
   heading: renderHeading,
   doc: renderChildren
 };
-function renderNode(node, indent2) {
+function renderNode(node, indent3) {
   const renderer = renderers[node.type];
-  if (renderer) return renderer(node, indent2);
-  return node.content ? renderChildren(node, indent2) : "";
+  if (renderer) return renderer(node, indent3);
+  return node.content ? renderChildren(node, indent3) : "";
 }
-function renderNodes(nodes, indent2) {
-  return nodes.map((node) => renderNode(node, indent2)).join("");
+function renderNodes(nodes, indent3) {
+  return nodes.map((node) => renderNode(node, indent3)).join("");
 }
 function isListNode(node) {
   return node.type === "orderedList" || node.type === "bulletList";
 }
-function renderListChild(child, indent2, pad, marker, isFirst) {
-  if (isListNode(child)) return renderNodes([child], indent2 + 1);
-  if (child.type !== "paragraph") return renderNode(child, indent2);
-  const text17 = renderChildren(child, indent2);
+function renderListChild(child, indent3, pad, marker, isFirst) {
+  if (isListNode(child)) return renderNodes([child], indent3 + 1);
+  if (child.type !== "paragraph") return renderNode(child, indent3);
+  const text17 = renderChildren(child, indent3);
   return isFirst ? `${pad}${marker} ${text17}` : `${pad}  ${text17}`;
 }
-function renderListItem(node, indent2, marker) {
-  const pad = "  ".repeat(indent2);
-  return (node.content ?? []).map((child, i) => renderListChild(child, indent2, pad, marker, i === 0)).join("\n");
+function renderListItem(node, indent3, marker) {
+  const pad = "  ".repeat(indent3);
+  return (node.content ?? []).map((child, i) => renderListChild(child, indent3, pad, marker, i === 0)).join("\n");
 }
 function adfToText(doc) {
   return renderNodes([doc], 0);
@@ -22281,45 +22281,148 @@ function updateCommentsCache(org, repo, prNumber, comments3) {
   }
 }
 
-// src/commands/prs/listComments/printComments.ts
+// src/commands/prs/listComments/commentStyle.ts
 import chalk170 from "chalk";
-function formatForHuman(comment3) {
-  if (comment3.type === "review") {
-    const stateColor = comment3.state === "APPROVED" ? chalk170.green : comment3.state === "CHANGES_REQUESTED" ? chalk170.red : chalk170.yellow;
-    return [
-      `${chalk170.cyan("Review")} by ${chalk170.bold(comment3.user)} ${stateColor(`[${comment3.state}]`)}`,
-      comment3.body,
-      ""
-    ].join("\n");
+var plain = (text17) => text17;
+function colouredState(state) {
+  const label2 = `[${state}]`;
+  if (state === "APPROVED") return chalk170.green(label2);
+  if (state === "CHANGES_REQUESTED") return chalk170.red(label2);
+  return chalk170.yellow(label2);
+}
+function commentStyle() {
+  if (isClaudeCode()) {
+    return {
+      cyan: plain,
+      bold: plain,
+      dim: plain,
+      state: (state) => `[${state}]`,
+      diffHunk: false
+    };
+  }
+  return {
+    cyan: chalk170.cyan,
+    bold: chalk170.bold,
+    dim: chalk170.dim,
+    state: colouredState,
+    diffHunk: true
+  };
+}
+
+// src/commands/prs/listComments/groupThreads.ts
+function threadLocation(comment3) {
+  return comment3.line ? `${comment3.path}:${comment3.line}` : comment3.path;
+}
+function groupThreads(comments3) {
+  const threads = /* @__PURE__ */ new Map();
+  for (const comment3 of comments3) {
+    const id = comment3.threadId || `comment-${comment3.id}`;
+    const existing = threads.get(id);
+    if (existing) {
+      existing.comments.push(comment3);
+      continue;
+    }
+    threads.set(id, { id, resolved: comment3.resolved, comments: [comment3] });
   }
-  const location = comment3.line ? `:${comment3.line}` : "";
+  return [...threads.values()];
+}
+
+// src/commands/prs/listComments/renderResolvedIndex.ts
+var summaryLimit = 100;
+function firstLine(body) {
+  const line = body.trim().split("\n")[0] ?? "";
+  return line.length > summaryLimit ? `${line.slice(0, summaryLimit - 1)}\u2026` : line;
+}
+function renderResolvedIndex(threads, style) {
+  const lines2 = [style.cyan(`Resolved threads (${threads.length})`)];
+  for (const thread of threads) {
+    const first = thread.comments[0];
+    if (!first) continue;
+    const count8 = thread.comments.length > 1 ? ` (${thread.comments.length} comments)` : "";
+    lines2.push(
+      `  ${style.bold(threadLocation(first))} ${first.user}: ${firstLine(first.body)}${count8}`
+    );
+  }
+  lines2.push("");
+  return lines2.join("\n");
+}
+
+// src/commands/prs/listComments/renderThreadBlock.ts
+function indent(text17) {
+  return text17.split("\n").map((line) => line ? `  ${line}` : line).join("\n");
+}
+function renderThreadBlock(thread, style) {
+  const first = thread.comments[0];
+  if (!first) return "";
+  const lines2 = [
+    `${style.cyan("Thread")} on ${style.bold(threadLocation(first))}`
+  ];
+  if (style.diffHunk) {
+    lines2.push(
+      indent(style.dim(first.diff_hunk.split("\n").slice(-3).join("\n")))
+    );
+  }
+  for (const comment3 of thread.comments) {
+    lines2.push(
+      indent(
+        [
+          `${style.bold(comment3.user)} ${style.dim(comment3.html_url)}`,
+          comment3.body,
+          ""
+        ].join("\n")
+      )
+    );
+  }
+  return lines2.join("\n");
+}
+
+// src/commands/prs/listComments/renderReview.ts
+function renderReview(comment3, style) {
   return [
-    `${chalk170.cyan("Line comment")} by ${chalk170.bold(comment3.user)} on ${chalk170.dim(`${comment3.path}${location}`)}`,
-    chalk170.dim(comment3.diff_hunk.split("\n").slice(-3).join("\n")),
+    `${style.cyan("Review")} by ${style.bold(comment3.user)} ${style.state(comment3.state)}`,
     comment3.body,
     ""
   ].join("\n");
 }
-function summarise(comments3) {
-  const lineCount = comments3.filter((c) => c.type === "line").length;
-  const reviewCount = comments3.filter((c) => c.type === "review").length;
-  const parts = [];
-  if (lineCount > 0) parts.push(`${lineCount} line`);
-  if (reviewCount > 0) parts.push(`${reviewCount} review`);
-  return `Found ${parts.join(" and ")} comment${comments3.length === 1 ? "" : "s"}.`;
+
+// src/commands/prs/listComments/summarise.ts
+function summarise(reviewCount, unresolved, resolved) {
+  const threadCounts = `${unresolved.length} unresolved and ${resolved.length} resolved threads.`;
+  if (reviewCount === 0) return `Found ${threadCounts}`;
+  const reviews = `${reviewCount} review comment${reviewCount === 1 ? "" : "s"}`;
+  return `Found ${reviews}, ${threadCounts}`;
 }
+
+// src/commands/prs/listComments/printComments.ts
 function printComments2(result) {
   const { comments: comments3, cachePath } = result;
   if (comments3.length === 0) {
     console.log("No comments found.");
     return;
   }
-  if (!isClaudeCode()) {
-    for (const comment3 of comments3) {
-      console.log(formatForHuman(comment3));
+  const style = commentStyle();
+  const reviews = comments3.filter(
+    (c) => c.type === "review"
+  );
+  const threads = groupThreads(
+    comments3.filter((c) => c.type === "line")
+  );
+  const unresolved = threads.filter((t) => !t.resolved);
+  const resolved = threads.filter((t) => t.resolved);
+  for (const review2 of reviews) {
+    console.log(renderReview(review2, style));
+  }
+  if (unresolved.length > 0) {
+    console.log(`${style.cyan(`Unresolved threads (${unresolved.length})`)}
+`);
+    for (const thread of unresolved) {
+      console.log(renderThreadBlock(thread, style));
     }
   }
-  console.log(summarise(comments3));
+  if (resolved.length > 0) {
+    console.log(renderResolvedIndex(resolved, style));
+  }
+  console.log(summarise(reviews.length, unresolved, resolved));
   if (cachePath) {
     console.log(`Saved to ${cachePath}`);
   }
@@ -26185,7 +26288,7 @@ function skippedCodexResult(outputPath) {
 // src/commands/review/formatReviewerFailure.ts
 var FAST_FAIL_MS = 1e3;
 var STDOUT_TAIL_LINES = 20;
-function indent(text17) {
+function indent2(text17) {
   return text17.split(/\r?\n/).map((line) => `  ${line}`);
 }
 function tailLines(text17, maxLines) {
@@ -26204,12 +26307,12 @@ function fastFailHint(command) {
 }
 function outputDetail(input) {
   const stderr = input.stderr.trim();
-  if (stderr) return ["stderr:", ...indent(stderr)];
+  if (stderr) return ["stderr:", ...indent2(stderr)];
   const stdout = (input.stdout ?? "").trim();
   if (stdout) {
     return [
       `stdout (no stderr was captured \u2014 showing last ${STDOUT_TAIL_LINES} lines):`,
-      ...indent(tailLines(stdout, STDOUT_TAIL_LINES))
+      ...indent2(tailLines(stdout, STDOUT_TAIL_LINES))
     ];
   }
   return [
@@ -26318,9 +26421,9 @@ import { writeFileSync as writeFileSync37 } from "fs";
 // src/commands/review/finaliseReviewerSpinner.ts
 var SUMMARY_MAX_LEN = 80;
 function summariseStderr(stderr) {
-  const firstLine = stderr.split(/\r?\n/).find((l) => l.trim().length > 0);
-  if (!firstLine) return "";
-  const trimmed = firstLine.trim();
+  const firstLine2 = stderr.split(/\r?\n/).find((l) => l.trim().length > 0);
+  if (!firstLine2) return "";
+  const trimmed = firstLine2.trim();
   return trimmed.length > SUMMARY_MAX_LEN ? `${trimmed.slice(0, SUMMARY_MAX_LEN - 1)}\u2026` : trimmed;
 }
 function finaliseReviewerSpinner(spinner, name, exitCode, elapsedMs, stderr = "") {
@@ -34318,8 +34421,6 @@ function joinableStream(sessions, targetId) {
   if (target.commandType === "run")
     return { reason: "a server run has no agent stream" };
   if (target.closing === true) return { reason: "the session is closing" };
-  if (target.status !== "running" && target.status !== "waiting")
-    return { reason: `the session is ${target.status}` };
   if (!target.cwd) return { reason: "the session has no working directory" };
   return { session: target };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.543.1",
+	"version": "0.545.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {