@staff0rd/assist 0.417.0 → 0.418.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.417.0",
+  version: "0.418.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -18241,7 +18241,7 @@ async function placePr(prNumber, title, body, options2) {
 // src/commands/prs/previewAndPlace.ts
 import { randomUUID as randomUUID4 } from "crypto";
 
-// src/commands/prs/requestPrDecision.ts
+// src/commands/prs/parseIncoming.ts
 function parseIncoming(line, requestId) {
   try {
     const msg = JSON.parse(line);
@@ -18251,12 +18251,18 @@ function parseIncoming(line, requestId) {
     if (msg.decision !== "approve" && msg.decision !== "reject") return null;
     return {
       kind: "decision",
-      decision: { decision: msg.decision, reason: msg.reason }
+      decision: {
+        decision: msg.decision,
+        reason: msg.reason,
+        comments: Array.isArray(msg.comments) ? msg.comments : void 0
+      }
     };
   } catch {
     return null;
   }
 }
+
+// src/commands/prs/requestPrDecision.ts
 function requestPrDecision(request) {
   return new Promise((resolve19, reject) => {
     connectToDaemon().then((socket) => {
@@ -18307,6 +18313,21 @@ async function previewAndPlace(args) {
     console.error(
       `PR preview rejected${decision.reason ? `: ${decision.reason}` : "."}`
     );
+    const comments3 = decision.comments ?? [];
+    if (comments3.length > 0) {
+      console.error(
+        `
+The reviewer left ${comments3.length} comment${comments3.length === 1 ? "" : "s"} on the preview. Address each one, then re-run this command:
+`
+      );
+      for (const [i, c] of comments3.entries()) {
+        const quoted = c.quote.split("\n").map((line) => `  > ${line}`).join("\n");
+        console.error(`${i + 1}. On:
+${quoted}
+   Comment: ${c.note}
+`);
+      }
+    }
     process.exit(1);
   }
   await placePr(args.prNumber, args.title, args.body, args.options);
@@ -25460,6 +25481,61 @@ function logSpawnedSession(session) {
   );
 }
 
+// src/commands/sessions/daemon/decidePrPreview.ts
+function decidePrPreview(sessions, waiters, notify2, d) {
+  const id = d.sessionId;
+  const requestId = d.requestId;
+  const session = sessions.get(id);
+  if (!session || session.pendingPrPreview?.requestId !== requestId) {
+    daemonLog(
+      `pr-decision for stale/unknown preview id=${id} requestId=${requestId} (ignoring)`
+    );
+    return;
+  }
+  const commentCount = Array.isArray(d.comments) ? d.comments.length : 0;
+  daemonLog(
+    `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision} comments=${commentCount}`
+  );
+  const waiter = waiters.get(id);
+  if (waiter)
+    sendTo(waiter, {
+      type: "pr-decision",
+      requestId,
+      decision: d.decision,
+      reason: d.reason,
+      comments: d.comments
+    });
+  waiters.delete(id);
+  session.pendingPrPreview = void 0;
+  notify2();
+}
+
+// src/commands/sessions/daemon/setPrPreview.ts
+function setPrPreview(sessions, waiters, notify2, client, d) {
+  const id = d.sessionId;
+  const session = sessions.get(id);
+  if (!session) {
+    daemonLog(`pr-preview for unknown session id=${id} (ignoring)`);
+    sendTo(client, {
+      type: "error",
+      message: `No live session ${id} for pr-preview`
+    });
+    return;
+  }
+  const prNumber = typeof d.prNumber === "number" ? d.prNumber : null;
+  session.pendingPrPreview = {
+    requestId: d.requestId,
+    title: d.title,
+    body: d.body,
+    prNumber
+  };
+  waiters.set(id, client);
+  daemonLog(
+    `pr-preview set: id=${id} requestId=${d.requestId} target=${prNumber === null ? "create" : `edit #${prNumber}`}`
+  );
+  notify2();
+}
+
 // src/commands/sessions/daemon/PrPreviewCoordinator.ts
 var PrPreviewCoordinator = class {
   constructor(sessions, notify2) {
@@ -25468,53 +25544,10 @@ var PrPreviewCoordinator = class {
   }
   waiters = /* @__PURE__ */ new Map();
   set(client, d) {
-    const id = d.sessionId;
-    const session = this.sessions.get(id);
-    if (!session) {
-      daemonLog(`pr-preview for unknown session id=${id} (ignoring)`);
-      sendTo(client, {
-        type: "error",
-        message: `No live session ${id} for pr-preview`
-      });
-      return;
-    }
-    const prNumber = typeof d.prNumber === "number" ? d.prNumber : null;
-    session.pendingPrPreview = {
-      requestId: d.requestId,
-      title: d.title,
-      body: d.body,
-      prNumber
-    };
-    this.waiters.set(id, client);
-    daemonLog(
-      `pr-preview set: id=${id} requestId=${d.requestId} target=${prNumber === null ? "create" : `edit #${prNumber}`}`
-    );
-    this.notify();
+    setPrPreview(this.sessions, this.waiters, this.notify, client, d);
   }
   decide(d) {
-    const id = d.sessionId;
-    const requestId = d.requestId;
-    const session = this.sessions.get(id);
-    if (!session || session.pendingPrPreview?.requestId !== requestId) {
-      daemonLog(
-        `pr-decision for stale/unknown preview id=${id} requestId=${requestId} (ignoring)`
-      );
-      return;
-    }
-    daemonLog(
-      `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision}`
-    );
-    const waiter = this.waiters.get(id);
-    if (waiter)
-      sendTo(waiter, {
-        type: "pr-decision",
-        requestId,
-        decision: d.decision,
-        reason: d.reason
-      });
-    this.waiters.delete(id);
-    session.pendingPrPreview = void 0;
-    this.notify();
+    decidePrPreview(this.sessions, this.waiters, this.notify, d);
   }
   clearWaiter(client) {
     for (const [id, waiter] of this.waiters) {

package/package.json

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