@staff0rd/assist 0.578.0 → 0.580.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.578.0",
+  version: "0.580.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3883,7 +3883,7 @@ function collectHashComments(content, options2) {
 function collectComments(sourceFile) {
   const seen = /* @__PURE__ */ new Set();
   const comments3 = [];
-  const collect6 = (node) => {
+  const collect7 = (node) => {
     for (const range of [
       ...node.getLeadingCommentRanges(),
       ...node.getTrailingCommentRanges()
@@ -3894,8 +3894,8 @@ function collectComments(sourceFile) {
       comments3.push({ pos, text: range.getText() });
     }
   };
-  collect6(sourceFile);
-  sourceFile.forEachDescendant(collect6);
+  collect7(sourceFile);
+  sourceFile.forEachDescendant(collect7);
   return comments3;
 }
 
@@ -13973,6 +13973,12 @@ ${quoted}
 }
 
 // src/commands/sessions/shared/toPreviewDecision.ts
+function toSelection(value) {
+  const selection = value;
+  if (typeof selection?.topLeft !== "string" || typeof selection.bottomRight !== "string")
+    return void 0;
+  return { topLeft: selection.topLeft, bottomRight: selection.bottomRight };
+}
 function toPreviewDecision(msg) {
   if (msg.decision !== "approve" && msg.decision !== "reject") return null;
   return {
@@ -13983,7 +13989,8 @@ function toPreviewDecision(msg) {
     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
+    draft: typeof msg.draft === "boolean" ? msg.draft : void 0,
+    selection: toSelection(msg.selection)
   };
 }
 
@@ -21035,6 +21042,38 @@ function applyAndVerifySubtree(target, plan2, context) {
   writeLineNow(chalk163.green("Subtree normalised"));
 }
 
+// src/commands/github/issue/fixStructure/assertChainTypesExist.ts
+function assertChainTypesExist(chain2, issueTypes) {
+  const missing = chain2.filter(
+    (level) => !issueTypes.some(
+      (type) => normaliseTypeName(type.name) === normaliseTypeName(level)
+    )
+  );
+  if (missing.length === 0) return;
+  throw new Error(
+    `The organisation has no ${missing.join(", ")} issue type${missing.length === 1 ? "" : "s"}. It has ${issueTypes.map((type) => type.name).join(", ")}`
+  );
+}
+
+// src/commands/github/issue/fixStructure/parseTypeChain.ts
+function parseTypeChain(value) {
+  const chain2 = value.split(/[,>]/).map((name) => name.trim()).filter((name) => name.length > 0);
+  if (chain2.length < 2) {
+    throw new Error(
+      `--type-chain needs at least two levels, like Epic,Story,Subtask, not "${value}"`
+    );
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const level of chain2) {
+    const key = normaliseTypeName(level);
+    if (seen.has(key)) {
+      throw new Error(`--type-chain repeats ${level}; each level must differ`);
+    }
+    seen.add(key);
+  }
+  return chain2;
+}
+
 // src/commands/github/issue/fixStructure/printFixStructurePlan.ts
 import chalk164 from "chalk";
 function annotate(entry) {
@@ -21168,9 +21207,11 @@ var defaultTypeChain = ["Epic", "Story", "Subtask"];
 
 // src/commands/github/issue/fixStructure/fixStructure.ts
 function fixStructure(target, options2) {
-  const chain2 = defaultTypeChain;
   try {
+    const chain2 = options2.typeChain ? parseTypeChain(options2.typeChain) : defaultTypeChain;
     const resolved = resolveFixStructureTarget(target, options2.repo);
+    const issueTypes = resolveOrgIssueTypes(resolved.owner);
+    assertChainTypesExist(chain2, issueTypes);
     const root = fetchRootIssue(resolved);
     const { index: index3, asserted } = resolveRootLevelIndex(
       chain2,
@@ -21181,8 +21222,8 @@ function fixStructure(target, options2) {
       chain: chain2,
       rootLevelIndex: index3,
       rootAsserted: asserted,
-      issueTypes: resolveOrgIssueTypes(resolved.owner),
-      stripLabels: []
+      issueTypes,
+      stripLabels: options2.stripLabel ?? []
     };
     const plan2 = planSubtree(root, context);
     printFixStructurePlan(plan2, chain2, options2.apply === true);
@@ -21197,18 +21238,31 @@ function fixStructure(target, options2) {
 // src/commands/github/issue/fixStructure/registerFixStructure.ts
 var chain = defaultTypeChain.join(" > ");
 var levels = defaultTypeChain.map((name) => name.toLowerCase()).join("|");
+function collect4(value, previous) {
+  return previous.concat([value]);
+}
 function registerFixStructure(issueCommand) {
   issueCommand.command("fix-structure <target>").description("Normalise the issue types across one issue subtree").option(
     "-R, --repo <owner/repo>",
     "Repository a bare issue number belongs to"
   ).option(
     "--level <level>",
-    `The target's own position in the ${chain} chain, when it cannot be inferred from its type`
+    "The target's own position in the type chain, when it cannot be inferred from its type"
+  ).option(
+    "--type-chain <names>",
+    `Comma-separated issue type chain, parent level first (default: ${defaultTypeChain.join(",")})`
+  ).option(
+    "--strip-label <label>",
+    "Legacy marker label to remove from every issue in the subtree that carries it (repeatable)",
+    collect4,
+    []
   ).option("--apply", "Write the planned changes instead of reporting them").addHelpText(
     "after",
     `
-Walks the subtree reachable from <target> via sub-issues and reports the type each issue should carry: every level below the target is typed to the next level down the ${chain} chain. Nothing outside the subtree is ever read or written.
-The target's own level is inferred from its issue type, so aiming at a story types its children as subtasks. When the target's type is not in the chain the level cannot be inferred, and --level ${levels} asserts it instead \u2014 which also plans the target's own type.
+Walks the subtree reachable from <target> via sub-issues and reports the type each issue should carry: every level below the target is typed to the next level down the chain. Nothing outside the subtree is ever read or written.
+The chain defaults to ${chain} and --type-chain replaces it, so a backlog on other type names is normalised the same way; every level named must already exist as an issue type on the organisation, or the run fails listing the ones that do.
+The target's own level is inferred from its issue type, so aiming at a story types its children as subtasks. When the target's type is not in the chain the level cannot be inferred, and --level ${levels} (or whichever levels --type-chain names) asserts it instead \u2014 which also plans the target's own type.
+No label is touched unless --strip-label names it; each one is repeatable, matched case-insensitively, and removed by the label id found on that issue, since label ids differ per repository.
 The target is owner/repo#number, a github.com issue URL, or a bare number with --repo.
 Without --apply nothing is written. With --apply each write is announced before it is issued, and the subtree is re-walked afterwards so any residual drift fails the run.
 Anything nested below the leaf level fails the run before a single write, naming the offender and its parent.`
@@ -22939,6 +22993,45 @@ function parseAnchorId(value) {
   return link3 ? decodeURIComponent(link3[1]).trim() : trimmed;
 }
 
+// src/commands/miro/pickAnchors.ts
+import { randomUUID as randomUUID12 } from "crypto";
+
+// src/commands/miro/isBox.ts
+var boxTypes = /* @__PURE__ */ new Set(["shape", "sticky_note"]);
+function isBox(item) {
+  return boxTypes.has(item.type) && item.text.length > 0;
+}
+
+// src/commands/miro/encodeMiroBoardPreview.ts
+function encodeMiroBoardPreview(items2) {
+  const preview = { boxes: items2.filter(isBox) };
+  return JSON.stringify(preview);
+}
+
+// src/commands/miro/pickAnchors.ts
+var skipAdvice = "Re-run with --top-left <id|link> --bottom-right <id|link> to skip the picker.";
+async function pickAnchors(sessionId, items2) {
+  const decision = await awaitPreviewApproval(
+    "Miro anchor selection",
+    {
+      sessionId,
+      requestId: randomUUID12(),
+      title: "Pick the top-left then the bottom-right box",
+      body: encodeMiroBoardPreview(items2),
+      prNumber: null,
+      kind: "miro-board"
+    },
+    { rejectionAdvice: `Nothing was extracted. ${skipAdvice}` }
+  );
+  const selection = decision.selection;
+  if (!selection)
+    throw new MiroExtractError(`The picker returned no boxes. ${skipAdvice}`);
+  console.log(
+    `Anchors: --top-left ${selection.topLeft} --bottom-right ${selection.bottomRight}`
+  );
+  return [selection.topLeft, selection.bottomRight];
+}
+
 // src/commands/miro/readMiroItems.ts
 import { readFileSync as readFileSync40 } from "fs";
 function tryParse(text18) {
@@ -22980,7 +23073,6 @@ function readMiroItems(file) {
 }
 
 // src/commands/miro/selectBoxes.ts
-var boxTypes = /* @__PURE__ */ new Set(["shape", "sticky_note"]);
 function findAnchor(items2, id) {
   const anchor = items2.find((item) => item.id === id);
   if (!anchor)
@@ -22989,9 +23081,6 @@ function findAnchor(items2, id) {
     );
   return anchor;
 }
-function isBox(item) {
-  return boxTypes.has(item.type) && item.text.length > 0;
-}
 function centreInside(rect, item) {
   const x = (item.left + item.right) / 2;
   const y = (item.top + item.bottom) / 2;
@@ -23017,16 +23106,24 @@ function requireItems(file) {
     );
   return file;
 }
-function requireAnchors(options2) {
-  if (!options2.topLeft || !options2.bottomRight)
+function anchorSource(options2) {
+  if (options2.topLeft && options2.bottomRight)
+    return {
+      pick: false,
+      topLeft: parseAnchorId(options2.topLeft),
+      bottomRight: parseAnchorId(options2.bottomRight)
+    };
+  const sessionId = process.env.ASSIST_SESSION_ID;
+  if (process.env.ASSIST_SESSION !== "1" || !sessionId)
     throw new MiroExtractError(
-      "Both --top-left <id|link> and --bottom-right <id|link> are required."
+      "Both --top-left <id|link> and --bottom-right <id|link> are required: there is no assist session to host the picker pane."
     );
-  return [parseAnchorId(options2.topLeft), parseAnchorId(options2.bottomRight)];
+  return { pick: true, sessionId };
 }
-function runExtract(options2) {
-  const [topLeft, bottomRight] = requireAnchors(options2);
+async function runExtract(options2) {
+  const source = anchorSource(options2);
   const items2 = normaliseItems(readMiroItems(requireItems(options2.items)));
+  const [topLeft, bottomRight] = source.pick ? await pickAnchors(source.sessionId, items2) : [source.topLeft, source.bottomRight];
   const boxes = selectBoxes(items2, topLeft, bottomRight);
   process.stdout.write(stringify(boxes.map((box) => box.text)));
 }
@@ -23036,7 +23133,7 @@ function registerMiro(program2) {
   const miroCommand = program2.command("miro").description("Miro board utilities");
   miroCommand.command("extract").description("Print the text of every box inside a rectangle on a board").option("--items <file>", "File of raw board_list_items response pages").option(
     "--top-left <id>",
-    "Widget id or ?moveToWidget=<id> link of the top-left box"
+    "Widget id or ?moveToWidget=<id> link of the top-left box (omit both anchors to pick them in the assist web UI)"
   ).option(
     "--bottom-right <id>",
     "Widget id or ?moveToWidget=<id> link of the bottom-right box"
@@ -23868,13 +23965,13 @@ function postReviewComment(vars) {
 }
 
 // src/commands/prs/reviewProposedPrComment.ts
-import { randomUUID as randomUUID12 } from "crypto";
+import { randomUUID as randomUUID13 } from "crypto";
 async function reviewProposedPrComment(title, body, prNumber) {
   const sessionId = process.env.ASSIST_SESSION_ID;
   if (process.env.ASSIST_SESSION !== "1" || !sessionId) return;
   await awaitPreviewApproval("PR comment preview", {
     sessionId,
-    requestId: randomUUID12(),
+    requestId: randomUUID13(),
     title,
     body,
     prNumber,
@@ -24000,7 +24097,7 @@ async function comment2(path80, line, body, startLine) {
 }
 
 // src/commands/prs/edit.ts
-import { randomUUID as randomUUID13 } from "crypto";
+import { randomUUID as randomUUID14 } from "crypto";
 
 // src/commands/prs/appendScreenshots.ts
 function appendScreenshots(body, screenshots) {
@@ -24197,7 +24294,7 @@ async function edit(options2) {
   if (process.env.ASSIST_SESSION === "1" && sessionId) {
     const decision = await awaitPreviewApproval("PR preview", {
       sessionId,
-      requestId: randomUUID13(),
+      requestId: randomUUID14(),
       title: options2.title ?? title,
       body: newBody,
       prNumber: number
@@ -24908,7 +25005,7 @@ async function placePr(prNumber, title, body, options2) {
 }
 
 // src/commands/prs/previewAndPlace.ts
-import { randomUUID as randomUUID14 } from "crypto";
+import { randomUUID as randomUUID15 } from "crypto";
 
 // src/commands/sessions/shared/requestSession.ts
 function parseIncoming(line, type) {
@@ -25043,7 +25140,7 @@ function warn(reason4) {
 async function previewAndPlace(args) {
   const decision = await awaitPreviewApproval("PR preview", {
     sessionId: args.sessionId,
-    requestId: randomUUID14(),
+    requestId: randomUUID15(),
     title: args.title,
     body: args.body,
     prNumber: args.prNumber,
@@ -25259,7 +25356,7 @@ ${prConcisenessGuidance}
 }
 
 // src/commands/registerPrsEdit.ts
-function collect4(value, previous) {
+function collect5(value, previous) {
   return previous.concat([value]);
 }
 function registerPrsEdit(prsCommand) {
@@ -25268,7 +25365,7 @@ function registerPrsEdit(prsCommand) {
   ).option("-t, --title <title>", "New title for the pull request").option("--what <what>", "Replace the ## What section").option("--why <why>", "Replace the ## Why section").option("--how <how>", "Replace the ## How section").option(
     "--resolves <key>",
     "Jira issue key resolved by this PR, appended to ## Why (repeatable)",
-    collect4,
+    collect5,
     []
   ).addHelpText("after", () => editHelpText()).action(edit);
 }
@@ -25368,7 +25465,7 @@ ${confirm}
 }
 
 // src/commands/registerPrsRaise.ts
-function collect5(value, previous) {
+function collect6(value, previous) {
   return previous.concat([value]);
 }
 function registerPrsRaise(prsCommand) {
@@ -25377,7 +25474,7 @@ function registerPrsRaise(prsCommand) {
   ).option("-t, --title <title>", "Title for the pull request").option("--what <what>", "What the change does (## What section)").option("--why <why>", "Why the change is needed (## Why section)").option("--how <how>", "How the change works (optional ## How section)").option(
     "--resolves <key>",
     "Jira issue key resolved by this PR, appended to ## Why (repeatable)",
-    collect5,
+    collect6,
     []
   ).option(
     "--force",
@@ -25385,15 +25482,15 @@ function registerPrsRaise(prsCommand) {
   ).option("-B, --base <branch>", "Branch into which the pull request merges").option("-H, --head <branch>", "Branch that contains the commits").option("-d, --draft", "Mark the pull request as a draft").option(
     "--no-draft",
     "Create a ready-for-review pull request, overriding prs.draft"
-  ).option("-w, --web", "Open the browser to create the pull request").option("-l, --label <label>", "Add a label (repeatable)", collect5, []).option(
+  ).option("-w, --web", "Open the browser to create the pull request").option("-l, --label <label>", "Add a label (repeatable)", collect6, []).option(
     "-a, --assignee <login>",
     "Assign a person by login (repeatable)",
-    collect5,
+    collect6,
     []
   ).option(
     "-r, --reviewer <handle>",
     "Request a review (repeatable)",
-    collect5,
+    collect6,
     []
   ).option("-m, --milestone <name>", "Add the pull request to a milestone").addHelpText("after", () => raiseHelpText()).action(raise);
   configHelp(raiseCommand, prsRaiseConfigHelp);
@@ -27515,10 +27612,10 @@ function registerRefactor(program2) {
 }
 
 // src/commands/review/checkoutOnlySession.ts
-import { randomUUID as randomUUID15 } from "crypto";
+import { randomUUID as randomUUID16 } from "crypto";
 async function checkoutOnlySession(number) {
   await checkoutPr(number);
-  const claudeSessionId = randomUUID15();
+  const claudeSessionId = randomUUID16();
   emitActivity({ kind: "command", name: "review", claudeSessionId });
   const { done: done2 } = spawnClaude("", {
     permissionMode: "acceptEdits",
@@ -32959,7 +33056,7 @@ var ClientHub = class extends Set {
 };
 
 // src/commands/sessions/daemon/createSession.ts
-import { randomUUID as randomUUID16 } from "crypto";
+import { randomUUID as randomUUID17 } from "crypto";
 
 // src/commands/sessions/daemon/sessionBase.ts
 function sessionBase(id, status3) {
@@ -33155,7 +33252,7 @@ function spawnRun(opts) {
 function createSession(id, { prompt, cwd, design, auto, harness, holdPty } = {}) {
   if (harness && harness !== "claude")
     return createHarnessSession(id, harness, prompt, cwd, holdPty);
-  const claudeSessionId = randomUUID16();
+  const claudeSessionId = randomUUID17();
   return {
     ...sessionBase(id, prompt ? "running" : "waiting"),
     name: `Session ${id}`,
@@ -33754,7 +33851,8 @@ var PREVIEW_KINDS = [
   "pr-comment",
   "github-issue",
   "github-issue-comment",
-  "github-issue-edit"
+  "github-issue-edit",
+  "miro-board"
 ];
 function isPreviewKind(value) {
   return PREVIEW_KINDS.includes(value);
@@ -33767,6 +33865,7 @@ function previewTargetLabel(kind, itemType, prNumber, draft) {
   if (kind === "github-issue-comment") return "github issue comment";
   if (kind === "github-issue-edit") return "github issue edit";
   if (kind === "github-issue") return "github issue";
+  if (kind === "miro-board") return "miro anchors";
   if (kind === "backlog-item") return `backlog ${itemType}`;
   if (prNumber !== null) return `edit #${prNumber}`;
   return draft ? "create draft" : "create";
@@ -35226,7 +35325,7 @@ function codexRespawnPlan(session) {
 }
 
 // src/commands/sessions/daemon/interactiveRespawnPlan.ts
-import { randomUUID as randomUUID17 } from "crypto";
+import { randomUUID as randomUUID18 } from "crypto";
 function interactiveRespawnPlan(session, resumes) {
   const { claudeSessionId, cwd, initialPrompt, design, auto } = session;
   if (!resumes) return null;
@@ -35246,7 +35345,7 @@ function interactiveRespawnPlan(session, resumes) {
   return null;
 }
 function freshClaudePlan(session, prompt, cwd) {
-  const claudeSessionId = randomUUID17();
+  const claudeSessionId = randomUUID18();
   return {
     spawn: () => {
       session.claudeSessionId = claudeSessionId;
@@ -36131,10 +36230,10 @@ function startReusedRunPty(session, assistArgs, itemId2, hold, clients, onStatus
 }
 
 // src/commands/sessions/daemon/createWatcherSession.ts
-import { randomUUID as randomUUID18 } from "crypto";
+import { randomUUID as randomUUID19 } from "crypto";
 var WATCH_PROMPT = "/watch";
 function createWatcherSession(id, cwd) {
-  const claudeSessionId = randomUUID18();
+  const claudeSessionId = randomUUID19();
   return {
     ...sessionBase(id, "running"),
     name: `Session ${id}`,

package/package.json

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