@staff0rd/assist 0.606.0 → 0.607.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.606.0",
+  version: "0.607.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -21693,6 +21693,12 @@ function registerCommentIssue(issueCommand) {
   );
 }
 
+// src/commands/github/issue/collectLabels.ts
+function collectLabels(value, previous) {
+  const added = value.split(",").map((label2) => label2.trim()).filter((label2) => label2.length > 0);
+  return [...previous, ...added];
+}
+
 // src/commands/github/issue/addIssueToProject.ts
 var MUTATION3 = `mutation($projectId: ID!, $contentId: ID!) {
 	addProjectV2ItemById(input: { projectId: $projectId, contentId: $contentId }) {
@@ -21706,6 +21712,16 @@ function addIssueToProject(projectId, contentId) {
   return id;
 }
 
+// src/commands/github/issue/addSubIssue.ts
+var MUTATION4 = `mutation($issueId: ID!, $subIssueId: ID!) {
+	addSubIssue(input: { issueId: $issueId, subIssueId: $subIssueId }) {
+		subIssue { id }
+	}
+}`;
+function addSubIssue(parentId, childId) {
+  runGhGraphqlJson(MUTATION4, { issueId: parentId, subIssueId: childId });
+}
+
 // src/commands/github/issue/fetchIssueNodeId.ts
 var QUERY4 = `query($owner: String!, $repo: String!, $number: Int!) {
 	repository(owner: $owner, name: $repo) {
@@ -21741,7 +21757,7 @@ function parseCreatedIssueUrl(output) {
 }
 
 // src/commands/github/issue/setProjectItemStatus.ts
-var MUTATION4 = `mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) {
+var MUTATION5 = `mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) {
 	updateProjectV2ItemFieldValue(input: {
 		projectId: $projectId
 		itemId: $itemId
@@ -21752,7 +21768,7 @@ var MUTATION4 = `mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionI
 	}
 }`;
 function setProjectItemStatus(input) {
-  runGhGraphqlJson(MUTATION4, input);
+  runGhGraphqlJson(MUTATION5, input);
 }
 
 // src/commands/github/issue/applyCreatedIssueMetadata.ts
@@ -21760,11 +21776,15 @@ function applyCreatedIssueMetadata(createOutput, metadata2) {
   let step2 = "identifying the created issue";
   try {
     const issueId = fetchIssueNodeId(parseCreatedIssueUrl(createOutput));
-    const { issueType, project } = metadata2;
+    const { issueType, parent, project } = metadata2;
     if (issueType) {
       step2 = `setting its issue type to ${issueType.name}`;
       updateIssueType(issueId, issueType.id);
     }
+    if (parent) {
+      step2 = `adding it as a sub-issue of ${parent.owner}/${parent.repo}#${parent.number}`;
+      addSubIssue(parent.id, issueId);
+    }
     if (project) {
       step2 = `adding it to project ${project.number} (${project.title})`;
       const itemId2 = addIssueToProject(project.id, issueId);
@@ -21787,18 +21807,83 @@ function applyCreatedIssueMetadata(createOutput, metadata2) {
   }
 }
 
-// src/commands/github/issue/buildIssuePreviewBody.ts
-function buildIssuePreviewBody(metadata2, body) {
-  if (!metadata2) return body;
-  const lines2 = [`**Repository:** ${metadata2.repo}`];
-  if (metadata2.type) lines2.push(`**Type:** ${metadata2.type}`);
-  if (metadata2.project) lines2.push(`**Project:** ${metadata2.project}`);
-  if (metadata2.status) lines2.push(`**Status:** ${metadata2.status}`);
-  return `${lines2.join("\n")}
+// src/commands/github/issue/issuePreviewMetadata.ts
+function issuePreviewMetadata(resolved) {
+  if (!resolved) return [];
+  const { target, issueType, parent, project, labels } = resolved;
+  const items2 = [
+    { label: "Repository", value: `${target.owner}/${target.repo}` }
+  ];
+  if (issueType) items2.push({ label: "Type", value: issueType.name });
+  if (parent)
+    items2.push({
+      label: "Parent",
+      value: `${parent.owner}/${parent.repo}#${parent.number}`
+    });
+  if (project)
+    items2.push({
+      label: "Project",
+      value: `${project.number} (${project.title})`
+    });
+  if (project?.status)
+    items2.push({ label: "Status", value: project.status.optionName });
+  if (labels?.length) items2.push({ label: "Labels", value: labels.join(", ") });
+  return items2;
+}
 
----
+// src/commands/github/issue/hasCreateIssueMetadataOptions.ts
+function hasCreateIssueMetadataOptions(options2) {
+  if (options2.status && !options2.project) {
+    throw new Error(
+      "--status is a field on a project board, so it needs --project <number>"
+    );
+  }
+  return Boolean(
+    options2.type || options2.parent || options2.project || options2.label?.length
+  );
+}
 
-${body}`;
+// src/commands/github/issue/resolveIssueLabels.ts
+var QUERY5 = `query($owner: String!, $repo: String!, $after: String) {
+	repository(owner: $owner, name: $repo) {
+		labels(first: 100, after: $after) {
+			nodes { name }
+			pageInfo { hasNextPage endCursor }
+		}
+	}
+}`;
+function readRepoLabels(target) {
+  const names = [];
+  let after;
+  do {
+    const page = JSON.parse(
+      runGhGraphqlJson(QUERY5, { ...target, after })
+    ).data?.repository?.labels;
+    if (!page) {
+      throw new Error(
+        `No labels could be read for ${target.owner}/${target.repo}`
+      );
+    }
+    for (const node of page.nodes ?? []) if (node?.name) names.push(node.name);
+    after = page.pageInfo?.hasNextPage ? page.pageInfo.endCursor ?? void 0 : void 0;
+  } while (after);
+  return names;
+}
+function matchLabel(names, wanted) {
+  const normalised = normaliseTypeName(wanted);
+  return names.find((name) => name === wanted) ?? names.find((name) => name.toLowerCase() === wanted.toLowerCase()) ?? names.find((name) => normaliseTypeName(name) === normalised);
+}
+function resolveIssueLabels(target, wanted) {
+  const names = readRepoLabels(target);
+  return wanted.map((label2) => {
+    const match = matchLabel(names, label2);
+    if (!match) {
+      throw new Error(
+        `${target.owner}/${target.repo} has no ${label2} label. It has ${names.join(", ")}`
+      );
+    }
+    return match;
+  });
 }
 
 // src/commands/prs/shared.ts
@@ -21893,6 +21978,15 @@ function resolveIssueRepoTarget(repo) {
   return parseRepoSlug(repo);
 }
 
+// src/commands/github/issue/resolveCreateIssueParent.ts
+function resolveCreateIssueParent(target, parent) {
+  const reference = resolveFixStructureTarget(
+    parent,
+    `${target.owner}/${target.repo}`
+  );
+  return { ...reference, id: fetchIssueNodeId(reference) };
+}
+
 // src/commands/github/issue/readGhTokenScopes.ts
 import { spawnSync as spawnSync6 } from "child_process";
 var SCOPES_LINE = /Token scopes:\s*(.*)/;
@@ -22006,23 +22100,21 @@ function resolveCreateIssueProject(owner, projectNumber, statusName) {
 
 // src/commands/github/issue/resolveCreateIssueMetadata.ts
 function resolveCreateIssueMetadata(options2) {
-  if (!options2.type && !options2.project && !options2.status) return void 0;
-  if (options2.status && !options2.project) {
-    throw new Error(
-      "--status is a field on a project board, so it needs --project <number>"
-    );
-  }
+  if (!hasCreateIssueMetadataOptions(options2)) return void 0;
+  const labels = options2.label ?? [];
   const target = resolveIssueRepoTarget(options2.repo);
   return {
     target,
     issueType: options2.type ? resolveIssueType(resolveOrgIssueTypes(target.owner), options2.type) : void 0,
-    project: options2.project ? resolveCreateIssueProject(target.owner, options2.project, options2.status) : void 0
+    parent: options2.parent ? resolveCreateIssueParent(target, options2.parent) : void 0,
+    project: options2.project ? resolveCreateIssueProject(target.owner, options2.project, options2.status) : void 0,
+    labels: labels.length ? resolveIssueLabels(target, labels) : void 0
   };
 }
 
 // src/commands/github/issue/reviewProposedIssue.ts
 import { randomUUID as randomUUID8 } from "crypto";
-async function reviewProposedIssue(title, body) {
+async function reviewProposedIssue(title, body, metadata2 = []) {
   const sessionId = process.env.ASSIST_SESSION_ID;
   if (process.env.ASSIST_SESSION !== "1" || !sessionId) return;
   await awaitPreviewApproval("GitHub issue preview", {
@@ -22031,15 +22123,17 @@ async function reviewProposedIssue(title, body) {
     title,
     body,
     prNumber: null,
-    kind: "github-issue"
+    kind: "github-issue",
+    metadata: metadata2.length ? metadata2 : void 0
   });
 }
 
 // src/commands/github/issue/runGhIssueCreate.ts
 import { execFileSync as execFileSync7 } from "child_process";
-function runGhIssueCreate(title, body, repo) {
+function runGhIssueCreate(title, body, repo, labels) {
   const args = ["issue", "create", "--title", title, "--body", body];
   if (repo) args.push("--repo", repo);
+  for (const label2 of labels ?? []) args.push("--label", label2);
   try {
     return execFileSync7("gh", args, {
       encoding: "utf8",
@@ -22051,7 +22145,7 @@ function runGhIssueCreate(title, body, repo) {
 }
 
 // src/commands/github/issue/createIssue.ts
-var USAGE2 = "Usage: assist github issue create --title <title> --body <body> [-R <owner>/<repo>] [--type <name>] [--project <number>] [--status <name>]";
+var USAGE2 = "Usage: assist github issue create --title <title> --body <body> [-R <owner>/<repo>] [--type <name>] [--parent <issue>] [--project <number>] [--status <name>] [--label <name>]";
 function preflight(options2) {
   try {
     return resolveCreateIssueMetadata(options2);
@@ -22060,15 +22154,6 @@ function preflight(options2) {
     process.exit(1);
   }
 }
-function previewMetadata(resolved) {
-  if (!resolved) return void 0;
-  return {
-    repo: `${resolved.target.owner}/${resolved.target.repo}`,
-    type: resolved.issueType?.name,
-    project: resolved.project && `${resolved.project.number} (${resolved.project.title})`,
-    status: resolved.project?.status?.optionName
-  };
-}
 async function createIssue(options2) {
   if (!options2.title || !options2.body) {
     console.error(USAGE2);
@@ -22081,11 +22166,8 @@ async function createIssue(options2) {
     body
   );
   const resolved = preflight(options2);
-  await reviewProposedIssue(
-    title,
-    buildIssuePreviewBody(previewMetadata(resolved), body)
-  );
-  const output = runGhIssueCreate(title, body, options2.repo);
+  await reviewProposedIssue(title, body, issuePreviewMetadata(resolved));
+  const output = runGhIssueCreate(title, body, options2.repo, resolved?.labels);
   console.log(output.trim());
   if (resolved) applyCreatedIssueMetadata(output, resolved);
 }
@@ -22098,15 +22180,23 @@ function registerCreateIssue(issueCommand) {
   ).option(
     "--type <name>",
     "Native issue type to set on the new issue (e.g. Epic)"
+  ).option(
+    "--parent <issue>",
+    "Parent issue to file the new issue under, as owner/repo#number, a github.com issue URL, or a bare number"
   ).option(
     "--project <number>",
     "Number of the repo owner's GitHub Project to add the new issue to"
   ).option(
     "--status <name>",
     "Status option to set on the project item (requires --project)"
+  ).option(
+    "--label <name>",
+    "Label to apply (repeat the flag, or pass a comma-separated list)",
+    collectLabels,
+    []
   ).addHelpText(
     "after",
-    "\nThere is no What/Why/How template: an issue reports a problem, and the target repo's own issue template is unknowable from here. Write the body as the repo's maintainers would expect.\nIn an assist web session the title and body are previewed for approve/reject first (with inline comments); nothing is created until it is approved.\n--type, --project and --status are all resolved before the preview, so an unknown name, a missing project scope or --status without --project creates nothing.\nThe project scope is needed for --project: gh auth refresh -h github.com -s project"
+    "\nThere is no What/Why/How template: an issue reports a problem, and the target repo's own issue template is unknowable from here. Write the body as the repo's maintainers would expect.\nIn an assist web session the title and body are previewed for approve/reject first (with inline comments); nothing is created until it is approved.\n--type, --parent, --project, --status and --label are all resolved before the preview, so an unknown name, an unreadable parent, a missing project scope or --status without --project creates nothing.\nA bare --parent number is read against --repo, or the current repo; a parent in another repository is allowed.\nThe project scope is needed for --project: gh auth refresh -h github.com -s project"
   ).action(createIssue);
 }
 
@@ -29024,15 +29114,15 @@ function runReviewSubmission(mutation, body) {
 }
 
 // src/commands/review/submitBodyOnlyReview.ts
-var MUTATION5 = `mutation($prId: ID!, $body: String) { addPullRequestReview(input: { pullRequestId: $prId, event: COMMENT, body: $body }) { pullRequestReview { id } } }`;
+var MUTATION6 = `mutation($prId: ID!, $body: String) { addPullRequestReview(input: { pullRequestId: $prId, event: COMMENT, body: $body }) { pullRequestReview { id } } }`;
 function submitBodyOnlyReview(body) {
-  runReviewSubmission(MUTATION5, body);
+  runReviewSubmission(MUTATION6, body);
 }
 
 // src/commands/review/submitPendingReview.ts
-var MUTATION6 = `mutation($prId: ID!, $body: String) { submitPullRequestReview(input: { pullRequestId: $prId, event: COMMENT, body: $body }) { pullRequestReview { id } } }`;
+var MUTATION7 = `mutation($prId: ID!, $body: String) { submitPullRequestReview(input: { pullRequestId: $prId, event: COMMENT, body: $body }) { pullRequestReview { id } } }`;
 function submitPendingReview(body) {
-  runReviewSubmission(MUTATION6, body);
+  runReviewSubmission(MUTATION7, body);
 }
 
 // src/commands/review/postAndMaybeSubmit.ts
@@ -35056,6 +35146,16 @@ function isPreviewKind(value) {
   return PREVIEW_KINDS.includes(value);
 }
 
+// src/commands/sessions/daemon/parsePreviewMetadata.ts
+function parsePreviewMetadata(value) {
+  if (!Array.isArray(value)) return void 0;
+  const items2 = value.flatMap((entry) => {
+    const { label: label2, value: text18 } = entry ?? {};
+    return typeof label2 === "string" && typeof text18 === "string" ? [{ label: label2, value: text18 }] : [];
+  });
+  return items2.length > 0 ? items2 : void 0;
+}
+
 // src/commands/sessions/daemon/previewTargetLabel.ts
 function previewTargetLabel(kind, itemType, prNumber, draft) {
   if (kind === "backlog-comment") return "backlog comment";
@@ -35092,7 +35192,8 @@ function setPrPreview(sessions, waiters, notify2, client, d) {
     prNumber,
     kind,
     itemType: kind === "backlog-item" ? itemType : void 0,
-    draft: kind === "pr" && prNumber === null ? draft : void 0
+    draft: kind === "pr" && prNumber === null ? draft : void 0,
+    metadata: parsePreviewMetadata(d.metadata)
   };
   waiters.set(id, client);
   const target = previewTargetLabel(kind, itemType, prNumber, draft);

package/package.json

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