@staff0rd/assist 0.325.0 → 0.326.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.325.0",
+  version: "0.326.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -6011,8 +6011,10 @@ function extractPath(rest) {
   const arrow = rest.indexOf(" -> ");
   return arrow === -1 ? rest : rest.slice(arrow + 4);
 }
+var UNMERGED_STATES = /* @__PURE__ */ new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
 function categorize(xy) {
   if (xy === "??") return "new";
+  if (UNMERGED_STATES.has(xy)) return "modified";
   const codes = xy.replace(/ /g, "");
   if (codes.includes("A")) return "new";
   if (codes.includes("D")) return "deleted";
@@ -9379,8 +9381,6 @@ function codeCommentConfirm(pin) {
 }
 
 // src/commands/codeComment/codeCommentSet.ts
-import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync23 } from "fs";
-import { randomBytes } from "crypto";
 import chalk93 from "chalk";
 
 // src/commands/codeComment/validateCommentText.ts
@@ -9408,10 +9408,27 @@ function validateCommentText(raw) {
   return { ok: true, text: text6 };
 }
 
-// src/commands/codeComment/codeCommentSet.ts
+// src/commands/codeComment/issuePin.ts
+import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync23 } from "fs";
+import { randomInt } from "crypto";
+function issuePin(file, lineNumber, text6) {
+  const pin = generatePin();
+  mkdirSync11(getRestrictedDir(), { recursive: true });
+  sweepRestrictedDir();
+  writeFileSync23(
+    getPinStatePath(pin),
+    JSON.stringify({ pin, file, line: lineNumber, text: text6 })
+  );
+  return showNotification({
+    title: "assist code-comment pin",
+    message: `Pin ${pin} \u2014 run: assist code-comment confirm ${pin}`
+  });
+}
 function generatePin() {
-  return randomBytes(4).toString("hex");
+  return randomInt(0, 1e3).toString().padStart(3, "0");
 }
+
+// src/commands/codeComment/codeCommentSet.ts
 function codeCommentSet(file, line, text6) {
   const lineNumber = Number.parseInt(line, 10);
   if (!Number.isInteger(lineNumber) || lineNumber < 1) {
@@ -9428,20 +9445,24 @@ function codeCommentSet(file, line, text6) {
   }
   console.error(
     chalk93.yellow.bold(
-      "Think hard. Comments are a last resort, not a habit.\nAlmost every comment you reach for is a sign the code should be clearer instead.\nBefore you confirm this pin, ask whether a better name, a smaller function, or a\ntest would make the comment redundant. If you are still sure this one line earns\nits keep, run the confirm step below."
+      "THIS IS YOUR LAST CHANCE TO RECONSIDER BEFORE INVOLVING A HUMAN.\nRequesting this pin pages a real person to approve a comment. DO NOT WASTE THEIR TIME.\nYou had BETTER BE RIGHT that this comment is genuinely necessary.\n\nComments are a last resort, not a habit. Almost every comment you reach for is a sign\nthe code should be clearer instead. Before a human is pulled in, ask whether a better\nname, a smaller function, or a test would make the comment redundant. ONLY if you are\ncertain this one line earns its keep should you proceed to the confirm step below."
     )
   );
-  const pin = generatePin();
-  mkdirSync11(getRestrictedDir(), { recursive: true });
-  sweepRestrictedDir();
-  writeFileSync23(
-    getPinStatePath(pin),
-    JSON.stringify({ pin, file, line: lineNumber, text: validation.text })
-  );
+  const delivered = issuePin(file, lineNumber, validation.text);
+  if (!delivered) {
+    console.error(
+      chalk93.red(
+        "Could not deliver the confirmation pin via notification.\nThe comment cannot be confirmed until the notification channel works."
+      )
+    );
+    process.exitCode = 1;
+    return;
+  }
   console.log(
-    `${chalk93.green(`Pin issued: ${pin}`)}
+    `A confirmation pin was sent to your desktop notifications.
 To insert "// ${validation.text}" at ${file}:${lineNumber}, run:
-${chalk93.cyan(`  assist code-comment confirm ${pin}`)}`
+${chalk93.cyan("  assist code-comment confirm <PIN>")}
+using the pin from that notification.`
   );
 }
 
@@ -19406,7 +19427,7 @@ function registerVoice(program2) {
 }
 
 // src/commands/roam/auth.ts
-import { randomBytes as randomBytes2 } from "crypto";
+import { randomBytes } from "crypto";
 import chalk178 from "chalk";
 
 // src/commands/roam/waitForCallback.ts
@@ -19536,7 +19557,7 @@ async function auth() {
   const existingRoam = config.roam ?? {};
   config.roam = { ...existingRoam, clientId, clientSecret };
   saveGlobalConfig(config);
-  const state = randomBytes2(16).toString("hex");
+  const state = randomBytes(16).toString("hex");
   console.log(
     chalk178.yellow("\nEnsure this Redirect URI is set in your Roam OAuth app:")
   );

package/package.json

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