@staff0rd/assist 0.574.1 → 0.575.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.574.1",
+  version: "0.575.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4946,14 +4946,14 @@ function findRuleViolations(data, rule) {
   }
   return violations;
 }
-function findForbiddenStrings(rules2, readJson) {
-  return rules2.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
+function findForbiddenStrings(rules3, readJson) {
+  return rules3.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
 }
 
 // src/commands/verify/forbiddenStrings/index.ts
 function forbiddenStrings() {
-  const rules2 = loadConfig().forbiddenStrings ?? [];
-  if (rules2.length === 0) {
+  const rules3 = loadConfig().forbiddenStrings ?? [];
+  if (rules3.length === 0) {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
@@ -4974,7 +4974,7 @@ function forbiddenStrings() {
     cache5.set(file, parsed);
     return parsed;
   };
-  const violations = findForbiddenStrings(rules2, readJson);
+  const violations = findForbiddenStrings(rules3, readJson);
   if (violations.length === 0) {
     console.log("No forbidden strings found.");
     process.exit(0);
@@ -13979,6 +13979,7 @@ function toPreviewDecision(msg) {
     reason: msg.reason,
     comments: Array.isArray(msg.comments) ? msg.comments : void 0,
     screenshots: Array.isArray(msg.screenshots) ? msg.screenshots : void 0,
+    body: typeof msg.body === "string" ? msg.body : void 0,
     reviewAfter: msg.reviewAfter === true,
     announceAfter: msg.announceAfter === true,
     draft: typeof msg.draft === "boolean" ? msg.draft : void 0
@@ -14029,7 +14030,7 @@ function requestPreviewDecision(request) {
 }
 
 // src/commands/sessions/shared/awaitPreviewApproval.ts
-async function awaitPreviewApproval(subject, request) {
+async function awaitPreviewApproval(subject, request, saveEditedBody) {
   console.log("Awaiting your approval in the assist web UI preview pane\u2026");
   let decision;
   try {
@@ -14040,6 +14041,7 @@ async function awaitPreviewApproval(subject, request) {
     );
     process.exit(1);
   }
+  if (decision.body !== void 0) saveEditedBody?.(decision.body);
   if (decision.decision === "reject") reportPreviewRejection(subject, decision);
   return decision;
 }
@@ -20840,19 +20842,36 @@ function pushIssueBody(number, repo, bodyPath) {
   }
 }
 
+// src/commands/github/issue/pushUnchangedIssue.ts
+function pushUnchangedIssue(number, repo, target, fetchedAt, bodyPath) {
+  if (fetchIssue2(number, repo).updatedAt !== fetchedAt) {
+    console.error(
+      `${target} was updated on GitHub after it was fetched. Nothing was pushed; the markdown is at ${bodyPath}`
+    );
+    process.exit(1);
+  }
+  pushIssueBody(number, repo, bodyPath);
+  console.log(`Issue body updated on ${target}`);
+}
+
 // src/commands/github/issue/reviewProposedIssueEdit.ts
 import { randomUUID as randomUUID9 } from "crypto";
-async function reviewProposedIssueEdit(title, body) {
+async function reviewProposedIssueEdit(title, body, saveEditedBody) {
   const sessionId = process.env.ASSIST_SESSION_ID;
-  if (process.env.ASSIST_SESSION !== "1" || !sessionId) return;
-  await awaitPreviewApproval("GitHub issue edit preview", {
-    sessionId,
-    requestId: randomUUID9(),
-    title,
-    body,
-    prNumber: null,
-    kind: "github-issue-edit"
-  });
+  if (process.env.ASSIST_SESSION !== "1" || !sessionId) return body;
+  const decision = await awaitPreviewApproval(
+    "GitHub issue edit preview",
+    {
+      sessionId,
+      requestId: randomUUID9(),
+      title,
+      body,
+      prNumber: null,
+      kind: "github-issue-edit"
+    },
+    saveEditedBody
+  );
+  return decision.body ?? body;
 }
 
 // src/commands/github/issue/viewIssue.ts
@@ -20919,22 +20938,19 @@ async function editIssue(numberArg, options2) {
     issue.title,
     issue.body
   );
-  const bodyPath = writeIssueWorkingFile(
-    slug,
-    number,
-    target,
-    issue.updatedAt,
-    issue.body
+  const save = (markdown) => writeIssueWorkingFile(slug, number, target, issue.updatedAt, markdown);
+  const bodyPath = save(issue.body);
+  const edited = await reviewProposedIssueEdit(
+    `Edit ${target}: ${issue.title}`,
+    issue.body,
+    save
   );
-  await reviewProposedIssueEdit(`Edit ${target}: ${issue.title}`, issue.body);
-  if (fetchIssue2(number, options2.repo).updatedAt !== issue.updatedAt) {
-    console.error(
-      `${target} was updated on GitHub after it was fetched. Nothing was pushed; the markdown is at ${bodyPath}`
-    );
-    process.exit(1);
-  }
-  pushIssueBody(number, options2.repo, bodyPath);
-  console.log(`Issue body updated on ${target}`);
+  validateProposedContent(
+    { subject: "Issue", context: "GitHub issues" },
+    issue.title,
+    edited
+  );
+  pushUnchangedIssue(number, options2.repo, target, issue.updatedAt, bodyPath);
 }
 
 // src/commands/prs/readBodyArgument.ts
@@ -30436,7 +30452,8 @@ function renderWatchReport({
   version: version2,
   commits: commits2,
   newShas,
-  restarts
+  restarts,
+  syncs
 }) {
   const isNew = new Set(newShas);
   const lines2 = [`**Version** ${version2}`, ""];
@@ -30455,6 +30472,10 @@ function renderWatchReport({
   lines2.push(
     ...restarts.length === 0 ? ["- none needed"] : restarts.map((restart) => `- ${restart}`)
   );
+  lines2.push("", "**Sync**", "");
+  lines2.push(
+    ...syncs.length === 0 ? ["- not needed"] : syncs.map((sync2) => `- ${sync2}`)
+  );
   return lines2.join("\n");
 }
 
@@ -30475,17 +30496,52 @@ function restartAdvice(paths) {
   return rules.filter((rule) => paths.some(rule.matches)).map((rule) => rule.advice);
 }
 
+// src/commands/watch/syncAdvice.ts
+var rules2 = [
+  {
+    matches: (path80) => path80.startsWith("claude/commands/"),
+    reason: "claude/commands changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("claude/skills/"),
+    reason: "claude/skills changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/settings.json",
+    reason: "claude/settings.json changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/CLAUDE.md",
+    reason: "claude/CLAUDE.md changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/design-system-prompt.md",
+    reason: "claude/design-system-prompt.md changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("codex/"),
+    reason: "codex sources changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("pi/"),
+    reason: "pi sources changed"
+  }
+];
+function syncAdvice(paths) {
+  return rules2.filter((rule) => paths.some(rule.matches)).map((rule) => rule.reason);
+}
+
 // src/commands/watch/buildWatchReport.ts
 var lines = (output) => output.split("\n").filter((line) => line.length > 0);
 function buildWatchReport(from, cwd) {
   const range = from ? `${from}..HEAD` : void 0;
+  const changed = range ? lines(runGit3(["diff", "--name-only", range], cwd)) : [];
   return renderWatchReport({
     version: readBuiltVersion(cwd),
     commits: readRecentCommits(10, cwd),
     newShas: range ? lines(runGit3(["rev-list", range], cwd)) : [],
-    restarts: restartAdvice(
-      range ? lines(runGit3(["diff", "--name-only", range], cwd)) : []
-    )
+    restarts: restartAdvice(changed),
+    syncs: syncAdvice(changed)
   });
 }
 
@@ -30971,10 +31027,10 @@ function registerWatch(program2) {
     (options2) => watchWait(options2)
   );
   watchCommand.command("report").description(
-    "Print the built version, the last 10 commits as a markdown table, and the restarts the new commits make necessary"
+    "Print the built version, the last 10 commits as a markdown table, the restarts the new commits make necessary, and whether ~/.claude needs a sync"
   ).option(
     "--from <sha>",
-    "Mark commits reachable from HEAD but not <sha> as new, and derive restart advice from the files they changed"
+    "Mark commits reachable from HEAD but not <sha> as new, and derive the restart and sync advice from the files they changed"
   ).action((options2) => watchReport(options2));
 }
 
@@ -32885,6 +32941,7 @@ function decidePrPreview(sessions, waiters, notify2, d) {
       reason: d.reason,
       comments: d.comments,
       screenshots: d.screenshots,
+      body: d.body,
       reviewAfter: d.reviewAfter,
       announceAfter: d.announceAfter,
       draft: d.draft

package/package.json

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