@mutmutco/cli 4.4.6 → 4.4.7

package/dist/main.cjs

@@ -1112,6 +1112,7 @@ var init_cli_shared = __esm({
 // src/board-write.ts
 var board_write_exports = {};
 __export(board_write_exports, {
+  addIssueToProjectViaHub: () => addIssueToProjectViaHub,
   writeHubBoardField: () => writeHubBoardField
 });
 async function writeHubBoardField(request) {
@@ -1125,6 +1126,18 @@ async function writeHubBoardField(request) {
   const body = await res.json().catch(() => null);
   if (!res.ok || body?.updated !== true) throw new Error(`board field write HTTP ${res.status}: ${body?.error ?? "unconfirmed result"}`);
 }
+async function addIssueToProjectViaHub(cfg, contentNodeId) {
+  const config = await loadConfig();
+  const res = await fetch(`${config.sagaApiUrl?.replace(/\/$/, "")}/board/attach`, {
+    method: "POST",
+    headers: await hubHeaders({ "content-type": "application/json" }),
+    body: JSON.stringify({ projectId: cfg.projectId, contentNodeId }),
+    signal: AbortSignal.timeout(25e3)
+  });
+  const body = await res.json().catch(() => null);
+  if (!res.ok || !body?.itemId) throw new Error(`board attach HTTP ${res.status}: ${body?.error ?? "unconfirmed result"}`);
+  return body.itemId;
+}
 var init_board_write = __esm({
   "src/board-write.ts"() {
     "use strict";
@@ -11148,11 +11161,24 @@ mutation($projectId: ID!, $itemId: ID!) {
 async function updateItemSingleSelect(client, projectId, itemId, fieldId, optionId) {
   try {
     await client.graphql(UPDATE_ITEM_FIELD_MUTATION, { projectId, itemId, fieldId, optionId });
+    return { credential: "user" };
   } catch (error) {
     const errors = error.graphqlErrors;
-    if (!errors?.length || !errors.every((entry) => entry.type === "INSUFFICIENT_SCOPES")) throw error;
-    const { writeHubBoardField: writeHubBoardField2 } = await Promise.resolve().then(() => (init_board_write(), board_write_exports));
-    await writeHubBoardField2({ projectId, itemId, fieldId, optionId });
+    if (errors?.length && errors.every((entry) => entry.type === "INSUFFICIENT_SCOPES")) {
+      const { writeHubBoardField: writeHubBoardField2 } = await Promise.resolve().then(() => (init_board_write(), board_write_exports));
+      await writeHubBoardField2({ projectId, itemId, fieldId, optionId });
+      return { credential: "app_installation" };
+    }
+    if (isGitHubRateLimitError(error)) {
+      const { writeHubBoardField: writeHubBoardField2 } = await Promise.resolve().then(() => (init_board_write(), board_write_exports));
+      try {
+        await writeHubBoardField2({ projectId, itemId, fieldId, optionId });
+        return { credential: "app_installation" };
+      } catch {
+        throw error;
+      }
+    }
+    throw error;
   }
 }
 function parseIssueSelector(selector, defaultRepo, expectedRepo) {
@@ -12395,8 +12421,9 @@ async function moveBoardItem(options, deps = {}) {
     throw boardNotFoundError(`${selector.repo}#${selector.number}`, { owner: cfg.projectOwner, number: cfg.projectNumber });
   }
   const optionId = cfg.statusOptions[options.status];
+  let credential = "user";
   try {
-    await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, optionId);
+    ({ credential } = await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, optionId));
   } catch (e) {
     if (options.status === "Done" && isArchivedItemRefusal(ghError(e))) {
       return {
@@ -12418,7 +12445,9 @@ async function moveBoardItem(options, deps = {}) {
     viewer: lookup.viewer,
     repo: currentRepo,
     status: options.status,
-    partial: false
+    partial: false,
+    credential
+    // #6834: which credential served the write — the user token or the Hub App leg.
   };
 }
 async function resolveClaimWritable(collected, client, snapshot, unscanned) {
@@ -12584,8 +12613,9 @@ async function claimOneBoardItem(ctx, selector, options) {
     throw new Error(`claim failed before board status changed: ${ghError(e)}`);
   }
   await postClaimMarkerComment(client, item, ctx.session);
+  let credential = "user";
   try {
-    await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, cfg.statusOptions["In Progress"]);
+    ({ credential } = await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, cfg.statusOptions["In Progress"]));
   } catch (e) {
     const warning = `partial claim: ${item.ref} was assigned to @${assignedLogin}, but Status was not moved to In Progress (${ghError(e)})`;
     if (!options.allowPartial) throw new Error(warning);
@@ -12602,6 +12632,7 @@ async function claimOneBoardItem(ctx, selector, options) {
     repo: report.repo,
     status: "In Progress",
     partial: false,
+    credential,
     ...claimedReceipt()
   };
 }
@@ -12635,7 +12666,7 @@ async function claimBoardIssues(options, deps = {}) {
       const ref = `${selector.repo}#${selector.number}`;
       try {
         const result = await claimOneBoardItem(ctx, selector, { ...options, bulk: true });
-        results[index] = { ref: result.item.ref, claimed: true, item: result.item, status: result.status, partial: result.partial, warning: result.warning, outcome: result.outcome, holder: result.holder, previousHolder: result.previousHolder, resumeEvidence: result.resumeEvidence, reclaimedFrom: result.reclaimedFrom, alreadyClaimed: result.alreadyClaimed, renewed: result.renewed, checked: result.checked };
+        results[index] = { ref: result.item.ref, claimed: true, item: result.item, status: result.status, partial: result.partial, warning: result.warning, outcome: result.outcome, holder: result.holder, previousHolder: result.previousHolder, resumeEvidence: result.resumeEvidence, reclaimedFrom: result.reclaimedFrom, alreadyClaimed: result.alreadyClaimed, renewed: result.renewed, checked: result.checked, credential: result.credential };
       } catch (e) {
         results[index] = { ref, claimed: false, reason: e.message };
       }
@@ -12695,13 +12726,14 @@ async function moveBoardIssues(options, deps = {}) {
       const idx = next++;
       const { item, ref, index: resultIdx } = resolvedList[idx];
       try {
-        await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, statusOptionId);
+        const { credential } = await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, statusOptionId);
         results[resultIdx] = {
           ref,
           moved: true,
           item: { ...item, status: options.status, statusOptionId },
           status: options.status,
-          partial: false
+          partial: false,
+          credential
         };
       } catch (e) {
         const warning = `partial move: ${ref} status was not changed to ${options.status} (${ghError(e)})`;
@@ -12768,8 +12800,9 @@ async function unclaimBoardIssue(options, deps = {}) {
     return { item, viewer, repo: currentRepo, status: item.status, partial: true, warning };
   }
   const optionId = cfg.statusOptions[toStatus];
+  let unclaimCredential = "user";
   try {
-    await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, optionId);
+    ({ credential: unclaimCredential } = await updateItemSingleSelect(client, cfg.projectId, item.itemId, cfg.statusFieldId, optionId));
   } catch (e) {
     const warning = `partial unclaim: ${item.ref} status was not changed to ${toStatus} (${ghError(e)})`;
     if (!options.allowPartial) throw new Error(warning);
@@ -12780,7 +12813,8 @@ async function unclaimBoardIssue(options, deps = {}) {
     viewer,
     repo: currentRepo,
     status: toStatus,
-    partial: false
+    partial: false,
+    credential: unclaimCredential
   };
 }
 async function setBoardItemPriority(client, cfg, itemId, priority) {
@@ -15904,10 +15938,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.4.6",
-    tag: "v4.4.6",
-    commit: "640e312fac88",
-    npm: "@mutmutco/cli@4.4.6"
+    version: "4.4.7",
+    tag: "v4.4.7",
+    commit: "f0781ed0cbda",
+    npm: "@mutmutco/cli@4.4.7"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -15924,14 +15958,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.4.6"
+          v3Target: "v4.4.7"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.4.6 and redeploy the Hub Lambda from tag v4.4.6 (640e312fac88); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.4.6 (@mutmutco/cli@4.4.6, tag commit 640e312fac88 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.4.7 and redeploy the Hub Lambda from tag v4.4.7 (f0781ed0cbda); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.4.7 (@mutmutco/cli@4.4.7, tag commit f0781ed0cbda \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -37729,6 +37763,10 @@ function spawnDetachedSelf(args, deps, opts = {}) {
 var import_node_path39 = require("node:path");
 
 // src/attach-to-project.ts
+async function attachViaHubApp(cfg, contentNodeId) {
+  const { addIssueToProjectViaHub: addIssueToProjectViaHub2 } = await Promise.resolve().then(() => (init_board_write(), board_write_exports));
+  return addIssueToProjectViaHub2(cfg, contentNodeId);
+}
 function boardAttachRateLimitedReceipt(resetEpochSeconds) {
   return {
     onBoard: false,
@@ -40771,7 +40809,7 @@ async function attachToProject(issueNumber, repo, priority) {
         }
       }
     }
-    return { projectItemId, onBoard: true };
+    return { projectItemId, onBoard: true, credential: "user" };
   } catch (e) {
     const err = e;
     const detail = (err.stderr || err.message || String(e)).trim();
@@ -40783,11 +40821,33 @@ async function attachToProject(issueNumber, repo, priority) {
           { repo: targetRepo2, number: issueNumber },
           priority
         );
-        return { projectItemId, onBoard: true };
+        return { projectItemId, onBoard: true, credential: "user" };
       }
       return { onBoard: true };
     }
     if (isRateLimitText(detail)) {
+      if (targetRepo2) {
+        try {
+          const boardCfg = await loadConfigForRepo(targetRepo2);
+          const viewArgs2 = ["issue", "view", String(issueNumber), "--json", "id", "--jq", ".id"];
+          if (targetRepo2) viewArgs2.push("--repo", targetRepo2);
+          const contentId2 = (await execFileP("gh", viewArgs2, { timeout: 1e4 })).stdout.trim();
+          if (contentId2 && boardCfg.projectId) {
+            const projectItemId = await attachViaHubApp(boardCfg, contentId2);
+            if (priority) {
+              try {
+                await setBoardItemPriority(defaultGitHubClient(), boardCfg, projectItemId, priority);
+              } catch (e2) {
+                const err2 = e2;
+                process.stderr.write(`warning: issue #${issueNumber} board Priority not set: ${(err2.stderr || err2.message || String(e2)).trim()}
+`);
+              }
+            }
+            return { projectItemId, onBoard: true, credential: "app_installation" };
+          }
+        } catch {
+        }
+      }
       process.stderr.write(`warning: issue #${issueNumber} created but board attach rate-limited: ${detail}
 `);
       let resetEpochSeconds;
@@ -41002,7 +41062,7 @@ function registerCollaborationCommands(program3) {
       return;
     }
     const attached = await attachToProject(created.number, targetRepo2, priority);
-    const { projectItemId, onBoard } = attached;
+    const { projectItemId, onBoard, credential: attachCredential } = attached;
     let parent;
     let parentLinkError;
     if (o.parent !== void 0) {
@@ -41022,6 +41082,7 @@ function registerCollaborationCommands(program3) {
       priority,
       projectItemId,
       onBoard,
+      ...attachCredential ? { credential: attachCredential } : {},
       // #5489: partial receipt when the GitHub issue landed but Project v2 attach hit GraphQL quota.
       ...attached.boardAttach ? {
         boardAttach: attached.boardAttach,
@@ -41657,10 +41718,21 @@ ${list}`);
     return cwdRepo?.toLowerCase() === repo.split("/").slice(-2).join("/").toLowerCase();
   }
   async function prLandUpdateBranch(prNumber, repo, explicitRepo) {
-    const viewed = JSON.parse((await execFileP("gh", ["pr", "view", prNumber, "--repo", repo, "--json", "headRefName,baseRefName"], { timeout: GC_GH_TIMEOUT_MS4 })).stdout);
-    const localCheckedOut = await prHeadCheckedOutHere(viewed.headRefName, repo, explicitRepo);
-    console.warn(`pr land: PR #${prNumber} is BEHIND ${viewed.baseRefName} \u2014 updating ${viewed.headRefName} from the base (${localCheckedOut ? "local merge commit + push" : "GitHub update-branch"}) and re-waiting the checks once (#6263).`);
-    return updatePrHeadForMerge({ prNumber, repo, head: viewed.headRefName, base: viewed.baseRefName, localCheckedOut });
+    let head = "";
+    let base = "";
+    const rested = await fetchRestPrSnapshot(prNumber, repo).catch(() => void 0);
+    if (rested && rested.headRef && rested.baseRef) {
+      console.warn("pr land: PR head/base read via REST (App-capable poll identity) instead of gh GraphQL (#6834).");
+      head = rested.headRef;
+      base = rested.baseRef;
+    } else {
+      const viewed = JSON.parse((await execFileP("gh", ["pr", "view", prNumber, "--repo", repo, "--json", "headRefName,baseRefName"], { timeout: GC_GH_TIMEOUT_MS4 })).stdout);
+      head = viewed.headRefName;
+      base = viewed.baseRefName;
+    }
+    const localCheckedOut = await prHeadCheckedOutHere(head, repo, explicitRepo);
+    console.warn(`pr land: PR #${prNumber} is BEHIND ${base} \u2014 updating ${head} from the base (${localCheckedOut ? "local merge commit + push" : "GitHub update-branch"}) and re-waiting the checks once (#6263).`);
+    return updatePrHeadForMerge({ prNumber, repo, head, base, localCheckedOut });
   }
   class PrHeadBehindBaseError extends Error {
   }
@@ -41701,9 +41773,22 @@ ${list}`);
     if (landClosingGuardVerdict.message) console.warn(landClosingGuardVerdict.message);
     const result = await runPrLand(number, { repo: o.repo, requireTrain: o.requireTrain !== false }, {
       resolveRepo: async (prNumber, repoOpt) => {
-        const args = repoOpt ? ["--repo", repoOpt] : repoArgs;
-        const viewed = (await execFileP("gh", ["pr", "view", prNumber, ...args, "--json", "headRepository,baseRefName", "--jq", '.headRepository.nameWithOwner + " " + .baseRefName'], { timeout: GC_GH_TIMEOUT_MS4 })).stdout.trim();
-        const [repoFromGh, base] = viewed.split(/\s+/);
+        const knownRepo = repoOpt ?? await resolveRepo(o.repo).catch(() => void 0) ?? o.repo;
+        let repoFromGh = "";
+        let base = "";
+        if (knownRepo) {
+          const rested = await fetchRestPrSnapshot(prNumber, knownRepo).catch(() => void 0);
+          if (rested) {
+            console.warn("pr land: PR repo/base read via REST (App-capable poll identity) instead of gh GraphQL (#6834).");
+            repoFromGh = knownRepo;
+            base = rested.baseRef;
+          }
+        }
+        if (!repoFromGh || !base) {
+          const args = repoOpt ? ["--repo", repoOpt] : repoArgs;
+          const viewed = (await execFileP("gh", ["pr", "view", prNumber, ...args, "--json", "headRepository,baseRefName", "--jq", '.headRepository.nameWithOwner + " " + .baseRefName'], { timeout: GC_GH_TIMEOUT_MS4 })).stdout.trim();
+          [repoFromGh, base] = viewed.split(/\s+/);
+        }
         const repo = repoOpt ?? repoFromGh;
         if (!repo) throw new Error("pr land: could not resolve PR repo");
         let track;
@@ -41829,8 +41914,9 @@ ${list}`);
         console.error(line);
       }
     }
-    if (o.json) printLine(JSON.stringify(result));
-    else printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""}`);
+    const credential = await pollToken().catch(() => void 0) ? "app_installation" : "user";
+    if (o.json) printLine(JSON.stringify({ ...result, credential }));
+    else printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""} (credential: ${credential})`);
     if (result.status === "failed") process.exitCode = 1;
   });
   jsonParity(pr.command("merge <number>").description("merge a PR (squash by default); archives gitignored tmp/** before worktree teardown; on no-ci repos run pr ci-policy / checks-wait first (#1432, #5679)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo); from a foreign checkout the remote probe/delete address this repo and local cleanup runs only in the verified sibling checkout ../<repo>, else localBranch reports skipped-foreign-cwd and the receipt carries foreignCwd: true (#6148)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").addOption(new Option("--disable-auto", "disable a queued auto-merge without merging").conflicts(["auto", "wait", "squash", "merge", "rebase", "preserveWorktree", "gc", "squashBodyFile", "force"])).option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m) \u2014 run as a background/monitor task or under a shell timeout above that budget; a short foreground timeout (e.g. 120s) kills it after checks pass and leaves the PR open (#6027)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888); also the merge settings-proof bypass when delete_branch_on_merge cannot be proven (#6210)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--squash-body-file <path>", "squash commit body (overrides GitHub COMMIT_MESSAGES); use when a pushed commit mentions close/fix/resolve + #N that must not close (#5723)").option("--force", "acknowledge and merge past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict")).action(async (number, o) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",