@staff0rd/assist 0.562.1 → 0.564.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.562.1",
+  version: "0.564.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -13790,9 +13790,126 @@ function registerCloneCommand(cmd) {
 
 // src/commands/backlog/comment/index.ts
 import chalk71 from "chalk";
+
+// src/commands/backlog/comment/reviewProposedComment.ts
+import { randomUUID as randomUUID2 } from "crypto";
+
+// src/commands/sessions/shared/reportPreviewRejection.ts
+function reportPreviewRejection(subject, decision) {
+  console.error(
+    `${subject} 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);
+}
+
+// src/commands/sessions/shared/toPreviewDecision.ts
+function toPreviewDecision(msg) {
+  if (msg.decision !== "approve" && msg.decision !== "reject") return null;
+  return {
+    decision: msg.decision,
+    reason: msg.reason,
+    comments: Array.isArray(msg.comments) ? msg.comments : void 0,
+    screenshots: Array.isArray(msg.screenshots) ? msg.screenshots : void 0,
+    reviewAfter: msg.reviewAfter === true,
+    announceAfter: msg.announceAfter === true,
+    draft: typeof msg.draft === "boolean" ? msg.draft : void 0
+  };
+}
+
+// src/commands/sessions/shared/parsePreviewDecision.ts
+function parsePreviewDecision(line, requestId) {
+  try {
+    const msg = JSON.parse(line);
+    if (msg.type === "error" && (msg.message ?? "").includes("pr-preview"))
+      return { kind: "error", message: msg.message ?? "pr-preview failed" };
+    if (msg.type !== "pr-decision" || msg.requestId !== requestId) return null;
+    const decision = toPreviewDecision(msg);
+    return decision ? { kind: "decision", decision } : null;
+  } catch {
+    return null;
+  }
+}
+
+// src/commands/sessions/shared/requestPreviewDecision.ts
+function requestPreviewDecision(request) {
+  return new Promise((resolve24, reject) => {
+    connectToDaemon().then((socket) => {
+      let settled = false;
+      const finish = (error, decision) => {
+        if (settled) return;
+        settled = true;
+        socket.destroy();
+        if (error) reject(error);
+        else resolve24(decision);
+      };
+      readSocketLines(socket, (line) => {
+        const incoming = parsePreviewDecision(line, request.requestId);
+        if (!incoming) return;
+        if (incoming.kind === "error") finish(new Error(incoming.message));
+        else finish(void 0, incoming.decision);
+      });
+      socket.on("error", (error) => finish(error));
+      socket.on(
+        "close",
+        () => finish(new Error("daemon closed before a decision was made"))
+      );
+      socket.write(`${JSON.stringify({ type: "pr-preview", ...request })}
+`);
+    }, reject);
+  });
+}
+
+// src/commands/sessions/shared/awaitPreviewApproval.ts
+async function awaitPreviewApproval(subject, request) {
+  console.log("Awaiting your approval in the assist web UI preview pane\u2026");
+  let decision;
+  try {
+    decision = await requestPreviewDecision(request);
+  } catch (error) {
+    console.error(
+      `Error: ${error instanceof Error ? error.message : String(error)}`
+    );
+    process.exit(1);
+  }
+  if (decision.decision === "reject") reportPreviewRejection(subject, decision);
+  return decision;
+}
+
+// src/commands/backlog/comment/reviewProposedComment.ts
+async function reviewProposedComment(item, text18) {
+  const sessionId = process.env.ASSIST_SESSION_ID;
+  if (process.env.ASSIST_SESSION !== "1" || !sessionId) return;
+  await awaitPreviewApproval("Backlog comment preview", {
+    sessionId,
+    requestId: randomUUID2(),
+    title: `Comment on ${formatItemId(item.id)}: ${item.name}`,
+    body: text18,
+    prNumber: null,
+    kind: "backlog-item",
+    itemType: item.type
+  });
+}
+
+// src/commands/backlog/comment/index.ts
 async function comment(id, text18) {
   const found = await findOneItem(id);
   if (!found) process.exit(1);
+  await reviewProposedComment(found.item, text18);
   await appendComment(found.orm, found.item.id, text18);
   console.log(
     chalk71.green(`Comment added to item ${formatItemId(found.item.id)}.`)
@@ -14302,103 +14419,7 @@ async function resolveInsertPosition(orm, itemId2, position) {
 }
 
 // src/commands/backlog/addPhase/reviewProposedPhase.ts
-import { randomUUID as randomUUID2 } from "crypto";
-
-// src/commands/sessions/shared/reportPreviewRejection.ts
-function reportPreviewRejection(subject, decision) {
-  console.error(
-    `${subject} 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);
-}
-
-// src/commands/sessions/shared/toPreviewDecision.ts
-function toPreviewDecision(msg) {
-  if (msg.decision !== "approve" && msg.decision !== "reject") return null;
-  return {
-    decision: msg.decision,
-    reason: msg.reason,
-    comments: Array.isArray(msg.comments) ? msg.comments : void 0,
-    screenshots: Array.isArray(msg.screenshots) ? msg.screenshots : void 0,
-    reviewAfter: msg.reviewAfter === true,
-    announceAfter: msg.announceAfter === true,
-    draft: typeof msg.draft === "boolean" ? msg.draft : void 0
-  };
-}
-
-// src/commands/sessions/shared/parsePreviewDecision.ts
-function parsePreviewDecision(line, requestId) {
-  try {
-    const msg = JSON.parse(line);
-    if (msg.type === "error" && (msg.message ?? "").includes("pr-preview"))
-      return { kind: "error", message: msg.message ?? "pr-preview failed" };
-    if (msg.type !== "pr-decision" || msg.requestId !== requestId) return null;
-    const decision = toPreviewDecision(msg);
-    return decision ? { kind: "decision", decision } : null;
-  } catch {
-    return null;
-  }
-}
-
-// src/commands/sessions/shared/requestPreviewDecision.ts
-function requestPreviewDecision(request) {
-  return new Promise((resolve24, reject) => {
-    connectToDaemon().then((socket) => {
-      let settled = false;
-      const finish = (error, decision) => {
-        if (settled) return;
-        settled = true;
-        socket.destroy();
-        if (error) reject(error);
-        else resolve24(decision);
-      };
-      readSocketLines(socket, (line) => {
-        const incoming = parsePreviewDecision(line, request.requestId);
-        if (!incoming) return;
-        if (incoming.kind === "error") finish(new Error(incoming.message));
-        else finish(void 0, incoming.decision);
-      });
-      socket.on("error", (error) => finish(error));
-      socket.on(
-        "close",
-        () => finish(new Error("daemon closed before a decision was made"))
-      );
-      socket.write(`${JSON.stringify({ type: "pr-preview", ...request })}
-`);
-    }, reject);
-  });
-}
-
-// src/commands/sessions/shared/awaitPreviewApproval.ts
-async function awaitPreviewApproval(subject, request) {
-  console.log("Awaiting your approval in the assist web UI preview pane\u2026");
-  let decision;
-  try {
-    decision = await requestPreviewDecision(request);
-  } catch (error) {
-    console.error(
-      `Error: ${error instanceof Error ? error.message : String(error)}`
-    );
-    process.exit(1);
-  }
-  if (decision.decision === "reject") reportPreviewRejection(subject, decision);
-  return decision;
-}
+import { randomUUID as randomUUID3 } from "crypto";
 
 // src/commands/backlog/renderPhaseSection.ts
 function renderPhaseSection(phase, idx) {
@@ -14422,7 +14443,7 @@ async function reviewProposedPhase(item, phaseIdx, phase) {
     return;
   await awaitPreviewApproval("Backlog phase preview", {
     sessionId,
-    requestId: randomUUID2(),
+    requestId: randomUUID3(),
     title: `Add a phase to ${formatItemId(item.id)}: ${item.name}`,
     body: renderPhaseSection(phase, phaseIdx),
     prNumber: null,
@@ -14564,7 +14585,7 @@ function readProposedItem(source) {
 }
 
 // src/commands/backlog/propose/reviewProposal.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID4 } from "crypto";
 import chalk82 from "chalk";
 
 // src/commands/backlog/propose/renderProposedItem.ts
@@ -14587,7 +14608,7 @@ async function reviewProposal(item, sessionId, confirmed) {
   if (sessionId) {
     await awaitPreviewApproval("Backlog item preview", {
       sessionId,
-      requestId: randomUUID3(),
+      requestId: randomUUID4(),
       title: item.name,
       body,
       prNumber: null,
@@ -14884,7 +14905,7 @@ import chalk91 from "chalk";
 import enquirer7 from "enquirer";
 
 // src/commands/backlog/launchMode.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 
 // src/commands/backlog/handleLaunchSignal.ts
 import chalk90 from "chalk";
@@ -14989,7 +15010,7 @@ async function launchMode(slashCommand, options2) {
   const resumeSessionId = options2?.resumeSessionId;
   if (!resumeSessionId) pullIfConfigured();
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
-  const claudeSessionId = resumeSessionId ?? randomUUID4();
+  const claudeSessionId = resumeSessionId ?? randomUUID5();
   const harness = options2?.harness ?? "claude";
   reportLaunchActivity(slashCommand, claudeSessionId, harness, options2);
   const prompt = resumeSessionId ? resumeNudge() : buildSlashCommand(slashCommand, options2?.description);
@@ -16005,7 +16026,7 @@ async function replacePlan(orm, itemId2, phases, currentPhase) {
 }
 
 // src/commands/backlog/updatePlan/reviewPlanUpdate.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 import chalk116 from "chalk";
 
 // src/commands/backlog/updatePlan/isCompleted.ts
@@ -16162,7 +16183,7 @@ async function reviewPlanUpdate(item, phases) {
   if (process.env.ASSIST_SESSION === "1" && sessionId) {
     await awaitPreviewApproval("Plan update preview", {
       sessionId,
-      requestId: randomUUID5(),
+      requestId: randomUUID6(),
       title: `Update the plan for ${formatItemId(item.id)}: ${item.name}`,
       body,
       prNumber: null,
@@ -20925,7 +20946,7 @@ function registerRefineLaunch(program2, resumeFlag) {
 }
 
 // src/commands/reviewPrComments.ts
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 
 // src/commands/review/checkoutPr.ts
 import { execFileSync as execFileSync7 } from "child_process";
@@ -21557,7 +21578,7 @@ async function reviewPrComments(number, options2 = {}) {
   const resumeSessionId = options2.resumeSessionId;
   validateAnnounce(number, announce);
   if (number && !resumeSessionId) await checkoutPr(number);
-  const claudeSessionId = resumeSessionId ?? randomUUID6();
+  const claudeSessionId = resumeSessionId ?? randomUUID7();
   emitActivity({
     kind: "command",
     name: "review-pr-comments",
@@ -21575,14 +21596,14 @@ async function reviewPrComments(number, options2 = {}) {
 }
 
 // src/commands/fixConflict.ts
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 function buildPrompt3(rebase) {
   return rebase ? "/fix-conflict --rebase" : "/fix-conflict";
 }
 async function fixConflict(number, options2 = {}) {
   const { resumeSessionId } = options2;
   if (number && !resumeSessionId) await checkoutPr(number);
-  const claudeSessionId = resumeSessionId ?? randomUUID7();
+  const claudeSessionId = resumeSessionId ?? randomUUID8();
   emitActivity({
     kind: "command",
     name: "fix-conflict",
@@ -22718,7 +22739,7 @@ function comment2(path80, line, body, startLine) {
 }
 
 // src/commands/prs/edit.ts
-import { randomUUID as randomUUID8 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 
 // src/commands/prs/appendScreenshots.ts
 function appendScreenshots(body, screenshots) {
@@ -22932,7 +22953,7 @@ async function edit(options2) {
   if (process.env.ASSIST_SESSION === "1" && sessionId) {
     const decision = await awaitPreviewApproval("PR preview", {
       sessionId,
-      requestId: randomUUID8(),
+      requestId: randomUUID9(),
       title: options2.title ?? title,
       body: newBody,
       prNumber: number
@@ -23643,7 +23664,7 @@ async function placePr(prNumber, title, body, options2) {
 }
 
 // src/commands/prs/previewAndPlace.ts
-import { randomUUID as randomUUID9 } from "crypto";
+import { randomUUID as randomUUID10 } from "crypto";
 
 // src/commands/sessions/shared/requestSession.ts
 function parseIncoming(line, type) {
@@ -23778,7 +23799,7 @@ function warn(reason4) {
 async function previewAndPlace(args) {
   const decision = await awaitPreviewApproval("PR preview", {
     sessionId: args.sessionId,
-    requestId: randomUUID9(),
+    requestId: randomUUID10(),
     title: args.title,
     body: args.body,
     prNumber: args.prNumber,
@@ -26248,10 +26269,10 @@ function registerRefactor(program2) {
 }
 
 // src/commands/review/checkoutOnlySession.ts
-import { randomUUID as randomUUID10 } from "crypto";
+import { randomUUID as randomUUID11 } from "crypto";
 async function checkoutOnlySession(number) {
   await checkoutPr(number);
-  const claudeSessionId = randomUUID10();
+  const claudeSessionId = randomUUID11();
   emitActivity({ kind: "command", name: "review", claudeSessionId });
   const { done: done2 } = spawnClaude("", {
     permissionMode: "acceptEdits",
@@ -31613,7 +31634,7 @@ var ClientHub = class extends Set {
 };
 
 // src/commands/sessions/daemon/createSession.ts
-import { randomUUID as randomUUID11 } from "crypto";
+import { randomUUID as randomUUID12 } from "crypto";
 
 // src/commands/sessions/daemon/sessionBase.ts
 function sessionBase(id, status3) {
@@ -31809,7 +31830,7 @@ function spawnRun(opts) {
 function createSession(id, prompt, cwd, design, harness, holdPty) {
   if (harness && harness !== "claude")
     return createHarnessSession(id, harness, prompt, cwd, holdPty);
-  const claudeSessionId = randomUUID11();
+  const claudeSessionId = randomUUID12();
   return {
     ...sessionBase(id, prompt ? "running" : "waiting"),
     name: `Session ${id}`,
@@ -33842,7 +33863,7 @@ function codexRespawnPlan(session) {
 }
 
 // src/commands/sessions/daemon/interactiveRespawnPlan.ts
-import { randomUUID as randomUUID12 } from "crypto";
+import { randomUUID as randomUUID13 } from "crypto";
 function interactiveRespawnPlan(session, resumes) {
   const { claudeSessionId, cwd, initialPrompt } = session;
   if (!resumes) return null;
@@ -33860,7 +33881,7 @@ function interactiveRespawnPlan(session, resumes) {
   return null;
 }
 function freshClaudePlan(session, prompt, cwd) {
-  const claudeSessionId = randomUUID12();
+  const claudeSessionId = randomUUID13();
   return {
     spawn: () => {
       session.claudeSessionId = claudeSessionId;
@@ -34738,10 +34759,10 @@ function startReusedRunPty(session, assistArgs, itemId2, hold, clients, onStatus
 }
 
 // src/commands/sessions/daemon/createWatcherSession.ts
-import { randomUUID as randomUUID13 } from "crypto";
+import { randomUUID as randomUUID14 } from "crypto";
 var WATCH_PROMPT = "/watch";
 function createWatcherSession(id, cwd) {
-  const claudeSessionId = randomUUID13();
+  const claudeSessionId = randomUUID14();
   return {
     ...sessionBase(id, "running"),
     name: `Session ${id}`,
@@ -35248,10 +35269,28 @@ function stripOutboundSessionId(data) {
   return stripped;
 }
 
+// src/commands/sessions/daemon/logWindowsForward.ts
+function logWindowsForward(delivered, type, sessionId) {
+  if (!delivered)
+    daemonLog(
+      `windows proxy: DROPPED ${type} for ${sessionId} (windows connection not writable)`
+    );
+  else if (type !== "input")
+    daemonLog(`windows proxy: forwarded ${type} for ${sessionId}`);
+}
+
+// src/commands/sessions/daemon/forwardWindowsIo.ts
+function forwardWindowsIo(conn, data) {
+  const sessionId = stripWindowsSessionId(data.sessionId);
+  const delivered = conn.trySend({ ...data, sessionId });
+  logWindowsForward(delivered, data.type, data.sessionId);
+}
+
 // src/commands/sessions/daemon/WindowsProxyState.ts
 var MAX_SCROLLBACK2 = 256 * 1024;
 var DEFAULT_CREATE_TIMEOUT_MS = 5e3;
-function createState(broadcast2, onSessionsChanged, onVersionMismatch, createTimeoutMs = DEFAULT_CREATE_TIMEOUT_MS) {
+function createState(broadcast2, onSessionsChanged, onVersionMismatch, onVersionOk = () => {
+}, createTimeoutMs = DEFAULT_CREATE_TIMEOUT_MS) {
   return {
     windowsSessions: [],
     scrollback: /* @__PURE__ */ new Map(),
@@ -35259,7 +35298,8 @@ function createState(broadcast2, onSessionsChanged, onVersionMismatch, createTim
     createTimeoutMs,
     broadcast: broadcast2,
     onSessionsChanged,
-    onVersionMismatch
+    onVersionMismatch,
+    onVersionOk
   };
 }
 function resetState(state) {
@@ -35337,7 +35377,11 @@ function windowsVersionCheck() {
 
 // src/commands/sessions/daemon/handleHello.ts
 function handleHello(state, msg) {
-  if (!isHello(msg) || helloCompatible(msg)) return;
+  if (!isHello(msg)) return;
+  if (helloCompatible(msg)) {
+    state.onVersionOk();
+    return;
+  }
   const mode = windowsVersionCheck();
   const mismatch = `windows daemon ${helloMismatchKind(msg)} mismatch`;
   const detail = `protocol ${msg.protocol ?? "legacy"} version ${msg.version} (wsl protocol ${PROTOCOL_VERSION} version ${ASSIST_VERSION})`;
@@ -35473,16 +35517,6 @@ function isWindowsIo(data) {
   return typeof data.sessionId === "string" && isWindowsSessionId(data.sessionId);
 }
 
-// src/commands/sessions/daemon/logWindowsForward.ts
-function logWindowsForward(delivered, type, sessionId) {
-  if (!delivered)
-    daemonLog(
-      `windows proxy: DROPPED ${type} for ${sessionId} (windows connection not writable)`
-    );
-  else if (type !== "input")
-    daemonLog(`windows proxy: forwarded ${type} for ${sessionId}`);
-}
-
 // src/commands/sessions/daemon/WindowsConnection.ts
 import { createInterface as createInterface9 } from "readline";
 
@@ -35609,6 +35643,7 @@ function notifyHealing(state) {
 
 // src/commands/sessions/daemon/WindowsVersionHealer.ts
 var UNRECOVERABLE_MESSAGE = "Windows host is on an incompatible version that auto-update could not resolve; not reconnecting. Update the Windows host manually, then restart.";
+var HEALED_MESSAGE = "Windows host is up to date \u2014 you can reselect the repo now.";
 var WindowsVersionHealer = class {
   constructor(conn, state, heal) {
     this.conn = conn;
@@ -35618,6 +35653,7 @@ var WindowsVersionHealer = class {
   healAttempted = false;
   healing = false;
   unrecoverable = false;
+  awaitingConfirmation = false;
   get blocked() {
     return this.unrecoverable;
   }
@@ -35629,14 +35665,24 @@ var WindowsVersionHealer = class {
     if (this.healAttempted) return this.giveUp(version2);
     this.healing = true;
     this.healAttempted = true;
+    this.awaitingConfirmation = true;
     try {
       await autoHealWindowsDaemon(this.conn, this.state, this.heal, version2);
     } finally {
       this.healing = false;
     }
   }
+  onCompatible() {
+    if (!this.awaitingConfirmation) return;
+    this.awaitingConfirmation = false;
+    daemonLog(
+      "windows proxy: post-heal handshake compatible; windows host is in step"
+    );
+    this.state.broadcast({ type: "notice", message: HEALED_MESSAGE });
+  }
   giveUp(version2) {
     this.unrecoverable = true;
+    this.awaitingConfirmation = false;
     daemonLog(
       `windows proxy: version mismatch ${version2} persists after heal; not reconnecting until the WSL daemon restarts`
     );
@@ -35657,6 +35703,7 @@ var WindowsProxy = class {
       (msg) => broadcast(clients, msg),
       onSessionsChanged,
       (version2) => void this.healer.onMismatch(version2),
+      () => this.healer.onCompatible(),
       createTimeoutMs
     );
     this.conn = new WindowsConnection({
@@ -35681,7 +35728,10 @@ var WindowsProxy = class {
   route(client, data) {
     if (!this.enabled) return false;
     if (isWindowsCreate(data)) return this.routeCreate(client, data);
-    if (isWindowsIo(data)) return this.routeIo(data);
+    if (isWindowsIo(data)) {
+      forwardWindowsIo(this.conn, data);
+      return true;
+    }
     return false;
   }
   routeCreate(client, data) {
@@ -35693,12 +35743,6 @@ var WindowsProxy = class {
     } else void forwardWindowsCreate(this.conn, this.state, client, data);
     return true;
   }
-  routeIo(data) {
-    const sessionId = stripWindowsSessionId(data.sessionId);
-    const delivered = this.conn.trySend({ ...data, sessionId });
-    logWindowsForward(delivered, data.type, data.sessionId);
-    return true;
-  }
   dispose() {
     this.conn.dispose();
   }

package/package.json

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