nugit-cli 0.1.0 → 0.1.1

package/src/stack-view/loader.js

@@ -1,101 +1,27 @@
-import fs from "fs";
-import { decodeGithubFileContent } from "../api-client.js";
-import { githubGetContents } from "../github-rest.js";
-import {
-  findGitRoot,
-  parseRepoFullName,
-  readStackFile,
-  stackJsonPath,
-  validateStackDoc
-} from "../nugit-stack.js";
-
 /**
- * Load stack.json from GitHub Contents API.
- * @param {string} repoFull owner/repo
- * @param {string} ref branch or sha
+ * Stack loader — inference-only. All stacks are discovered from open PR chains.
+ * .nugit/stack.json is no longer read or written.
  */
-export async function fetchStackDocFromGithub(repoFull, ref) {
-  const { owner, repo } = parseRepoFullName(repoFull);
-  const item = await githubGetContents(owner, repo, ".nugit/stack.json", ref);
-  const text = decodeGithubFileContent(item);
-  if (!text) {
-    throw new Error("Could not decode .nugit/stack.json from GitHub");
-  }
-  const doc = JSON.parse(text);
-  validateStackDoc(doc);
-  return doc;
-}
+import { buildInferredViewerDoc } from "../services/stack-inference.js";
+import { parseRepoFullName } from "../nugit-stack.js";
 
-/**
- * If document is a propagated prefix, fetch full stack from layer.tip.head_branch.
- * @param {Record<string, unknown>} doc
- */
-export async function expandStackDocIfPrefix(doc) {
-  const layer = doc.layer;
-  if (!layer || typeof layer !== "object" || !layer.tip || typeof layer.tip !== "object") {
-    return doc;
-  }
-  const tip = /** @type {{ head_branch?: string }} */ (layer.tip);
-  const stackSize = layer.stack_size;
-  const prs = doc.prs;
-  if (
-    typeof stackSize !== "number" ||
-    !Array.isArray(prs) ||
-    prs.length >= stackSize ||
-    typeof tip.head_branch !== "string" ||
-    !tip.head_branch.trim()
-  ) {
-    return doc;
-  }
-  const { owner, repo } = parseRepoFullName(doc.repo_full_name);
-  const item = await githubGetContents(
-    owner,
-    repo,
-    ".nugit/stack.json",
-    tip.head_branch.trim()
-  );
-  const text = decodeGithubFileContent(item);
-  if (!text) {
-    return doc;
-  }
-  try {
-    const full = JSON.parse(text);
-    validateStackDoc(full);
-    return full;
-  } catch {
-    return doc;
-  }
-}
+export { isGithubNotFoundError } from "./remote-infer-doc.js";
 
 /**
- * @param {{ root?: string | null, repo?: string, ref?: string, file?: string }} opts
+ * Build a viewer-ready stack doc for the given repo via open-PR inference.
+ *
+ * @param {{
+ *   repo: string,
+ *   tuiChainPick?: (chains: number[][], pulls: unknown[]) => Promise<number>,
+ *   preselectedChainIndex?: number
+ * }} opts
  */
 export async function loadStackDocForView(opts) {
-  let doc = null;
-  const root = opts.root ?? findGitRoot();
-
-  if (opts.file) {
-    const raw = fs.readFileSync(opts.file, "utf8");
-    doc = JSON.parse(raw);
-    validateStackDoc(doc);
-  } else if (opts.repo && opts.ref) {
-    doc = await fetchStackDocFromGithub(opts.repo, opts.ref);
-  } else if (root) {
-    const p = stackJsonPath(root);
-    if (!fs.existsSync(p)) {
-      throw new Error(`No ${p}; run nugit init or pass --repo OWNER/REPO --ref BRANCH`);
-    }
-    doc = readStackFile(root);
-    if (!doc) {
-      throw new Error("Empty stack file");
-    }
-    validateStackDoc(doc);
-  } else {
-    throw new Error(
-      "Not in a git repo: pass --file path/to/stack.json or --repo owner/repo --ref branch"
-    );
-  }
-
-  doc = await expandStackDocIfPrefix(doc);
-  return { doc, root: root || null };
+  const { owner, repo } = parseRepoFullName(opts.repo);
+  const repoFull = `${owner}/${repo}`;
+  const { doc, viewerLogin, pulls } = await buildInferredViewerDoc(repoFull, {
+    preselectedChainIndex: opts.preselectedChainIndex,
+    tuiChainPick: opts.tuiChainPick
+  });
+  return { doc, viewerLogin, pulls };
 }

package/src/stack-view/loading-ink.js

@@ -1,44 +1,2 @@
-import React, { useEffect, useState } from "react";
-import { Box, Text, render } from "ink";
-import { clearInkScreen } from "./terminal-fullscreen.js";
-
-const FRAMES = ["\u280b", "\u2819", "\u2839", "\u2838", "\u283c", "\u2834", "\u2826", "\u2827", "\u2807", "\u280f"];
-
-/**
- * Full-screen loading line with a small terminal spinner (Ink has no Spinner export in v6).
- *
- * @param {string} message
- * @param {() => Promise<void>} work
- */
-export async function withStackLoadInkScreen(message, work) {
-  clearInkScreen();
-  const LoadingLine = () => {
-    const [i, setI] = useState(0);
-    useEffect(() => {
-      const t = setInterval(() => setI((n) => (n + 1) % FRAMES.length), 80);
-      return () => clearInterval(t);
-    }, []);
-    return React.createElement(
-      Box,
-      { flexDirection: "row", padding: 1 },
-      React.createElement(Text, { color: "cyan" }, FRAMES[i]),
-      React.createElement(Text, null, ` ${message}`)
-    );
-  };
-  const inst = render(React.createElement(LoadingLine));
-  try {
-    await new Promise((r) => setImmediate(r));
-    await work();
-  } finally {
-    try {
-      inst.unmount();
-    } catch {
-      /* ignore */
-    }
-    try {
-      inst.clear();
-    } catch {
-      /* ignore */
-    }
-  }
-}
+// Re-exported from cli/src/utilities/loading.js — import from there for new code.
+export { withLoadingScreen as withStackLoadInkScreen } from "../utilities/loading.js";

package/src/stack-view/merge-alternate-pick-stacks.js

@@ -1,9 +1,31 @@
 import { githubListAllOpenPulls } from "../github-rest.js";
 import { inferPrChainsFromOpenPulls } from "../stack-infer-from-prs.js";
-import { stackTipPrNumber } from "../stack-discover.js";
 import { inferChainsToPickStacks } from "./infer-chains-to-pick-stacks.js";
 import { matchesPickerViewingStack } from "./stack-pick-sort.js";
 
+/**
+ * Stack tip PR # from layer.tip, else top entry by position in doc.prs.
+ * @param {Record<string, unknown>} doc
+ * @returns {number | null}
+ */
+export function stackTipPrNumber(doc) {
+  const layer = doc.layer;
+  if (layer && typeof layer === "object") {
+    const tip = /** @type {{ tip?: { pr_number?: number } }} */ (layer).tip;
+    if (tip && typeof tip === "object" && typeof tip.pr_number === "number" && tip.pr_number >= 1) {
+      return tip.pr_number;
+    }
+  }
+  const prs = Array.isArray(doc.prs) ? doc.prs : [];
+  if (!prs.length) return null;
+  const sorted = [...prs].sort(
+    (a, b) => (/** @type {{ position?: number }} */ (a).position ?? 0) - (/** @type {{ position?: number }} */ (b).position ?? 0)
+  );
+  const top = sorted[sorted.length - 1];
+  const n = top && typeof top === "object" ? /** @type {{ pr_number?: number }} */ (top).pr_number : undefined;
+  return typeof n === "number" && n >= 1 ? n : null;
+}
+
 /**
  * PR numbers from GitHub open-pull payloads (see {@link githubListAllOpenPulls}).
  *

package/src/stack-view/remote-infer-doc.js

@@ -1,13 +1,22 @@
-import chalk from "chalk";
-import { authMe } from "../api-client.js";
+/**
+ * Inference helpers for the stack viewer — builds viewer docs from open PR chains.
+ */
 import { githubListAllOpenPulls } from "../github-rest.js";
 import { parseRepoFullName, createInferredStackDoc } from "../nugit-stack.js";
 import { inferPrChainsFromOpenPulls } from "../stack-infer-from-prs.js";
-import { questionLine } from "./prompt-line.js";
+import { authMe } from "../api-client.js";
 import { RepoPickerBackError } from "./repo-picker-back.js";
 
 /**
- * Open PR groups inferrable as a stack (for TUI pickers).
+ * @param {unknown} e
+ */
+export function isGithubNotFoundError(e) {
+  const s = String(/** @type {{ message?: string }} */ (e)?.message || e);
+  return /not found/i.test(s) || /\b404\b/.test(s);
+}
+
+/**
+ * Open PR groups inferrable as a stack.
  * @param {string} repoFull
  * @returns {Promise<number[][]>}
  */
@@ -18,73 +27,47 @@ export async function listOpenPrChainGroups(repoFull) {
 }
 
 /**
- * @param {unknown} e
- */
-export function isGithubNotFoundError(e) {
-  const s = String(/** @type {{ message?: string }} */ (e)?.message || e);
-  return /not found/i.test(s) || /\b404\b/.test(s);
-}
-
-/**
- * When `.nugit/stack.json` is missing on the remote ref, build a viewer doc from open PRs (same-repo inference).
+ * Build a viewer doc from open PRs (same-repo chain inference).
+ *
  * @param {string} repoFull
- * @param {{ interactivePick?: boolean, preselectedChainIndex?: number, tuiChainPick?: (chains: number[][], pulls: unknown[]) => Promise<number> }} [opts]
+ * @param {{
+ *   interactivePick?: boolean,
+ *   preselectedChainIndex?: number,
+ *   tuiChainPick?: (chains: number[][], pulls: unknown[]) => Promise<number>
+ * }} [opts]
  */
 export async function inferStackDocForRemoteView(repoFull, opts = {}) {
-  const interactive = opts.interactivePick !== false && process.stdin.isTTY;
-  const me = await authMe();
-  const login = me && typeof me.login === "string" ? me.login : "viewer";
   const { owner, repo } = parseRepoFullName(repoFull);
   const pulls = await githubListAllOpenPulls(owner, repo);
   const chains = inferPrChainsFromOpenPulls(pulls, repoFull);
 
   if (chains.length === 0) {
     throw new Error(
-      `No .nugit/stack.json on that ref, and no inferrable same-repo open PR stack in ${repoFull}. ` +
-        `Try a branch that contains .nugit/stack.json (often the stack tip), or use \`nugit review\`.`
+      `No open PR stacks found in ${repoFull}. ` +
+        "Open some PRs in a stacked chain and try again, or use \`nugit review\` to browse all repos."
     );
   }
 
+  const me = await authMe();
+  const login = me && typeof me.login === "string" ? me.login : "viewer";
+
   /** @type {number[]} */
   let chosen;
   if (chains.length === 1) {
     chosen = chains[0];
   } else if (typeof opts.preselectedChainIndex === "number" && Number.isInteger(opts.preselectedChainIndex)) {
     const i = opts.preselectedChainIndex;
-    if (i < 0 || i >= chains.length) {
-      throw new Error("Invalid preselectedChainIndex for inferred stack.");
-    }
+    if (i < 0 || i >= chains.length) throw new Error("Invalid preselectedChainIndex for inferred stack.");
     chosen = chains[i];
   } else if (typeof opts.tuiChainPick === "function") {
     const idx = await opts.tuiChainPick(chains, pulls);
-    if (idx === -2) {
-      throw new RepoPickerBackError();
-    }
-    if (idx === -1) {
-      throw new Error("Stack group selection cancelled.");
-    }
+    if (idx === -2) throw new RepoPickerBackError();
+    if (idx === -1) throw new Error("Stack group selection cancelled.");
     if (typeof idx === "number" && idx >= 0 && idx < chains.length) {
       chosen = chains[idx];
     } else {
       throw new Error("Invalid stack group selection.");
     }
-  } else if (interactive) {
-    console.error(chalk.bold.cyan(`No stack.json on default ref — inferred ${chains.length} open PR group(s):`));
-    for (let i = 0; i < chains.length; i++) {
-      const c = chains[i];
-      const label = c.length > 1 ? `stack ${c.join(" → ")}` : `PR #${c[0]}`;
-      console.error(`  ${chalk.yellow("[" + (i + 1) + "]")} ${label}`);
-    }
-    const ans = String(await questionLine(chalk.green("Select group (empty = use largest stack): "))).trim();
-    if (ans) {
-      const n = Number.parseInt(ans, 10);
-      if (!Number.isInteger(n) || n < 1 || n > chains.length) {
-        throw new Error("Invalid selection.");
-      }
-      chosen = chains[n - 1];
-    } else {
-      chosen = chains.reduce((a, b) => (b.length > a.length ? b : a));
-    }
   } else {
     chosen = chains.reduce((a, b) => (b.length > a.length ? b : a));
   }