@navbook/cli 0.3.0 → 0.5.0

package/dist/commands/pr.js

@@ -6,12 +6,13 @@
  * parts of the shared verbs that must reach across branches, because a PR's
  * files live on the branch it proposes to merge (spec 03 §3.5).
  */
-import { applyComment, bindReviewRevision, commitReport, continuePrMerge, countOpenPrsOnOtherRefs, currentAuthor, entityJson, executePrMerge, findPrToWrite, listEntities, listPrsAcrossRefs, materializePrIfAbsent, newCommentFile, newPrFile, openPr, parseListQuery, parsePerson, planPrMerge, preparePrOpen, readReviewers, readReviewPolicy, requestReview, reviewSummary, sameEmail, stringField, toNdjson, updatePr, validateComment, validatePr, } from "@navbook/core";
+import { applyComment, bindReviewRevision, commitReport, continuePrMerge, countOpenPrsOnOtherRefs, currentAuthor, entityJson, executePrMerge, isMergeMethod, listEntities, listPrsAcrossRefs, MERGE_METHODS, materializePrIfAbsent, newCommentFile, newPrFile, openPr, parseListQuery, parsePerson, planPrMerge, preparePrOpen, readReviewers, readReviewPolicy, requestReview, reviewSummary, sameEmail, stringField, toNdjson, updatePr, validateComment, validatePr, } from "@navbook/core";
 import { fail } from "../errors.js";
 import { askYesNo, isInteractive } from "../prompt.js";
 import { composeFile } from "./compose.js";
 import { cmdClose, reportList, } from "./entity.js";
-import { describeShortfall, mergeAction, warnPolicyProblems } from "./policy.js";
+import { describeShortfall, mergeAction, warnMergePolicyProblems, warnPolicyProblems, } from "./policy.js";
+import { withPrWriteSite } from "./pr-elsewhere.js";
 export function cmdPrOpen(ctx, opts) {
     const draft = preparePrOpen(ctx, { target: opts.target, title: opts.title });
     const composed = composeFile(ctx, {
@@ -31,9 +32,9 @@ export function cmdPrOpen(ctx, opts) {
             labels: opts.label,
             assignee: opts.assignee,
             milestone: opts.milestone,
-            features: opts.feature,
+            ...(opts.ext ? { ext: opts.ext } : {}),
         }),
-        validate: validatePr,
+        validate: (parsed) => validatePr(parsed, ctx.ext),
     });
     const { id, dirPath, run } = openPr(ctx, { content: composed.content, fallbackTitle: draft.title }, { commit: opts.commit });
     ctx.stdout.write(`Created ${ctx.navDir}/${dirPath}/  (#${id})\n`);
@@ -41,72 +42,83 @@ export function cmdPrOpen(ctx, opts) {
     if (opts.commit)
         ctx.stdout.write(`${commitReport(run)}\n`);
 }
-/* ------------------------------------------------------------------- update */
 export function cmdPrUpdate(ctx, prefix, opts) {
-    const { entity, head, revisionCount, run } = updatePr(ctx, prefix, { commit: opts.commit });
-    ctx.stdout.write(`Recorded revision ${revisionCount} of #${entity.id}  head ${head.slice(0, 12)}\n`);
-    if (opts.commit)
-        ctx.stdout.write(`${commitReport(run)}\n`);
+    // The revision pinned is the HEAD of wherever this runs, so moving the write
+    // to a worktree on the source branch is what pins the right one — this
+    // checkout's HEAD was never the head under review.
+    withPrWriteSite(ctx, prefix, opts, (at) => {
+        const { entity, head, revisionCount, run } = updatePr(at, prefix, { commit: opts.commit });
+        ctx.stdout.write(`Recorded revision ${revisionCount} of #${entity.id}  head ${head.slice(0, 12)}\n`);
+        if (opts.commit)
+            ctx.stdout.write(`${commitReport(run)}\n`);
+    });
 }
 export function cmdPrRequest(ctx, prefix, people, opts) {
-    const { entity, changed, unchanged, run } = requestReview(ctx, prefix, people, {
-        commit: opts.commit,
-        remove: opts.remove,
+    withPrWriteSite(ctx, prefix, opts, (at) => {
+        const { entity, changed, unchanged, run } = requestReview(at, prefix, people, {
+            commit: opts.commit,
+            remove: opts.remove,
+        });
+        const verb = opts.remove ? "No longer reviewing" : "Asked to review";
+        ctx.stdout.write(`${verb} #${entity.id}: ${changed.join(", ")}\n`);
+        // Naming who was already there matters most when only some of a list moved:
+        // the count alone would leave the caller counting names themselves.
+        for (const person of unchanged) {
+            ctx.stdout.write(`${ctx.colors.dim(opts.remove ? "not listed:" : "already listed:")} ${person}\n`);
+        }
+        if (opts.commit)
+            ctx.stdout.write(`${commitReport(run)}\n`);
     });
-    const verb = opts.remove ? "No longer reviewing" : "Asked to review";
-    ctx.stdout.write(`${verb} #${entity.id}: ${changed.join(", ")}\n`);
-    // Naming who was already there matters most when only some of a list moved:
-    // the count alone would leave the caller counting names themselves.
-    for (const person of unchanged) {
-        ctx.stdout.write(`${ctx.colors.dim(opts.remove ? "not listed:" : "already listed:")} ${person}\n`);
-    }
-    if (opts.commit)
-        ctx.stdout.write(`${commitReport(run)}\n`);
 }
 export function cmdPrReview(ctx, prefix, opts) {
-    const entity = findPrToWrite(ctx, prefix);
+    // Checked before anything is resolved, so a mistyped flag never costs a
+    // temporary checkout.
     const chosen = [opts.approve, opts.requestChanges, opts.comment].filter(Boolean).length;
     if (chosen > 1) {
         fail("choose one of --approve, --request-changes or --comment, not several");
     }
-    const revision = bindReviewRevision(entity, opts.revision);
     if (opts.line && !opts.file)
         fail("--line needs --file");
-    // This verb files reviews, so with no flag the verdict is the one that judges
-    // nothing (spec 04 §4.3). The exception is an inline anchor: a note about one
-    // line is discussion, and recording it as a review would say its author had
-    // read the whole revision. `nav pr comment` remains the unbound comment.
-    const verdict = opts.approve
-        ? "approve"
-        : opts.requestChanges
-            ? "request-changes"
-            : opts.file === undefined || opts.comment
-                ? "comment"
-                : undefined;
-    const isReview = verdict !== undefined || opts.file !== undefined;
-    const base = {
-        author: currentAuthor(ctx),
-        body: "",
-        ...(verdict ? { verdict } : {}),
-        ...(isReview ? { revision } : {}),
-        ...(opts.file ? { file: opts.file } : {}),
-        ...(opts.line ? { line: opts.line } : {}),
-    };
-    const composed = composeFile(ctx, {
-        message: opts.message,
-        bufferName: "NAVBOOK_REVIEW.md",
-        noun: verdict ? "review" : "comment",
-        render: (body) => newCommentFile({ ...base, body }),
-        validate: (parsed) => validateComment(parsed, { onPr: true }),
+    withPrWriteSite(ctx, prefix, opts, (at, entity) => {
+        const revision = bindReviewRevision(entity, opts.revision);
+        // This verb files reviews, so with no flag the verdict is the one that judges
+        // nothing (spec 04 §4.3). The exception is an inline anchor: a note about one
+        // line is discussion, and recording it as a review would say its author had
+        // read the whole revision. `nav pr comment` remains the unbound comment.
+        const verdict = opts.approve
+            ? "approve"
+            : opts.requestChanges
+                ? "request-changes"
+                : opts.file === undefined || opts.comment
+                    ? "comment"
+                    : undefined;
+        const isReview = verdict !== undefined || opts.file !== undefined;
+        const base = {
+            author: currentAuthor(at),
+            body: "",
+            ...(verdict ? { verdict } : {}),
+            ...(isReview ? { revision } : {}),
+            ...(opts.file ? { file: opts.file } : {}),
+            ...(opts.line ? { line: opts.line } : {}),
+        };
+        const composed = composeFile(ctx, {
+            message: opts.message,
+            bufferName: "NAVBOOK_REVIEW.md",
+            noun: verdict ? "review" : "comment",
+            render: (body) => newCommentFile({ ...base, body }),
+            validate: (parsed) => validateComment(parsed, { onPr: true }),
+        });
+        const { id, path, run } = applyComment(at, entity, { content: composed.content, review: isReview }, { commit: opts.commit });
+        const label = verdict ? `Reviewed (${verdict})` : "Commented on";
+        ctx.stdout.write(`${label} #${entity.id}  ${at.navDir}/${path}  (#${id})\n`);
+        if (isReview)
+            ctx.stdout.write(`Bound to revision ${revision.slice(0, 12)}\n`);
+        if (opts.commit)
+            ctx.stdout.write(`${commitReport(run)}\n`);
+        // The policy that decides whether a verdict counts is the one in the tree
+        // the review was written into.
+        warnIfOwnVerdict(at, entity, verdict);
     });
-    const { id, path, run } = applyComment(ctx, entity, { content: composed.content, review: isReview }, { commit: opts.commit });
-    const label = verdict ? `Reviewed (${verdict})` : "Commented on";
-    ctx.stdout.write(`${label} #${entity.id}  ${ctx.navDir}/${path}  (#${id})\n`);
-    if (isReview)
-        ctx.stdout.write(`Bound to revision ${revision.slice(0, 12)}\n`);
-    if (opts.commit)
-        ctx.stdout.write(`${commitReport(run)}\n`);
-    warnIfOwnVerdict(ctx, entity, verdict);
 }
 /**
  * Warn an author that their own verdict will not be counted.
@@ -161,10 +173,13 @@ export function cmdPrList(ctx, terms, opts) {
             when: (entities) => entities.some((entity) => summaryOf(entity).reviewers.length > 0),
         },
     ];
+    // The listing's own columns first, then whatever plugins contributed: the
+    // caller's are added to these, never replaced by them.
+    const columns = [...extraColumns, ...(opts.extraColumns ?? [])];
     const query = parseListQuery(ctx, terms, "pr");
     if (!opts.allRefs) {
         const here = listEntities(ctx, "pr", query);
-        reportList(ctx, "pr", here, { ...opts, extraColumns });
+        reportList(ctx, "pr", here, { ...opts, extraColumns: columns });
         if (here.length === 0)
             hintOtherRefs(ctx, opts);
         return;
@@ -173,7 +188,10 @@ export function cmdPrList(ctx, terms, opts) {
     if (opts.json) {
         if (matched.length === 0)
             return;
-        ctx.stdout.write(`${toNdjson(matched.map((entry) => entityJson(ctx.navDir, entry.entity, { refs: entry.refs.map((ref) => ref.short) })))}\n`);
+        ctx.stdout.write(`${toNdjson(matched.map((entry) => entityJson(ctx.navDir, entry.entity, {
+            ...(opts.jsonExtra?.(entry.entity) ?? {}),
+            refs: entry.refs.map((ref) => ref.short),
+        })))}\n`);
         return;
     }
     if (matched.length === 0) {
@@ -183,7 +201,7 @@ export function cmdPrList(ctx, terms, opts) {
     reportList(ctx, "pr", listEntities(ctx, "pr", query, { entities: matched.map((e) => e.entity) }), {
         ...opts,
         extraColumns: [
-            ...extraColumns,
+            ...columns,
             {
                 header: "refs",
                 value: (entity) => (matched.find((entry) => entry.entity.id === entity.id)?.refs ?? [])
@@ -208,7 +226,15 @@ export function cmdPrList(ctx, terms, opts) {
 function hintOtherRefs(ctx, opts) {
     if (opts.json)
         return;
-    const count = countOpenPrsOnOtherRefs(ctx);
+    let count;
+    try {
+        count = countOpenPrsOnOtherRefs(ctx);
+    }
+    catch {
+        // The listing this follows has already been printed and is right; a branch
+        // git cannot read is `--all-refs`'s to report, not a reason to fail this.
+        return;
+    }
     if (count === 0)
         return;
     ctx.stderr.write(`${ctx.colors.dim(`${count} open pull ${count === 1 ? "request" : "requests"} on other branches; ` +
@@ -230,11 +256,26 @@ export function cmdPrMerge(ctx, prefix, opts) {
     }
     if (!prefix)
         fail("nav pr merge needs the ID of the pull request to merge");
-    const plan = planPrMerge(ctx, prefix, { noFf: opts.noFf, syncSource });
+    const plan = planPrMerge(ctx, prefix, { method: readMethod(opts.method), syncSource });
     warnPolicyProblems(ctx, plan.review.reading);
+    warnMergePolicyProblems(ctx, plan.mergePolicy);
     confirmAgainstPolicy(ctx, plan.entity.id, plan.review, opts.yes === true);
     reportMerge(ctx, executePrMerge(ctx, plan));
 }
+/**
+ * Read `--method`, or nothing when it was not given.
+ *
+ * Checked here rather than left to the plan, so a mistyped name costs nothing:
+ * the merge has not read a ref or touched the index yet, and the answer is the
+ * list of what it could have been.
+ */
+function readMethod(value) {
+    if (value === undefined)
+        return undefined;
+    if (isMergeMethod(value))
+        return value;
+    fail(`'${value}' is not a merge method; expected one of ${MERGE_METHODS.join(", ")}`);
+}
 /** What the pull request is short of, but only where a policy was declared. */
 function declaredShortfall(review) {
     return review.reading.declared ? describeShortfall(review.summary) : null;
@@ -265,28 +306,51 @@ function confirmAgainstPolicy(ctx, id, review, assumeYes) {
 }
 function reportMerge(ctx, result) {
     ctx.stdout.write(`Merged #${result.entity.id}  ${ctx.navDir}/${result.dirPath}/\n`);
-    if (result.mergeSha)
-        ctx.stdout.write(`Merge commit ${result.mergeSha.slice(0, 12)}\n`);
-    reportSourceSync(ctx, result.source, stringField(result.entity, "target"));
+    if (result.mergeSha) {
+        const what = result.method === "squash" ? "Squash commit" : "Merge commit";
+        ctx.stdout.write(`${what} ${result.mergeSha.slice(0, 12)}\n`);
+    }
+    reportSourceSync(ctx, result.source, result.method, stringField(result.entity, "target"));
 }
 /**
  * Say what became of the source branch. A move is one line; a branch that
  * could not be moved is a warning, because somebody now has to do by hand what
  * forgetting leaves wrong rather than stale; the rest costs nothing.
+ *
+ * The method is needed as well as the outcome, because a branch the target
+ * cannot reach means opposite things either side of a replay: after an
+ * ordinary merge it is a branch somebody still has to merge, and after a
+ * rebase it is the original of commits that are already on the target under
+ * new SHAs. Telling the second to "merge main into it" would undo the linear
+ * history they asked for.
  */
-function reportSourceSync(ctx, source, target) {
+function reportSourceSync(ctx, source, method, target) {
     const warn = (text) => {
         ctx.stderr.write(`${ctx.colors.yellow("warning:")} ${text}\n`);
     };
+    const replayed = method === "rebase" || method === "rebase-no-ff";
     switch (source.outcome) {
         case "fast-forwarded":
             ctx.stdout.write(`Fast-forwarded ${source.ref} to ${target}\n`);
             return;
+        case "rebased":
+            ctx.stdout.write(`Rebased ${source.ref} onto ${target}\n`);
+            return;
+        case "squashed":
+            // Not a warning: this is the method doing what it says. What it is worth
+            // saying is that the branch is not contained in the target, because that
+            // is what somebody about to delete it would want to have known.
+            ctx.stdout.write(`${source.ref} was squashed; its own commits are not on ${target}, so it cannot be fast-forwarded\n`);
+            return;
         case "diverged":
-            warn(`${source.ref} was not moved: it has commits ${target} does not; merge ${target} into it`);
+            warn(replayed
+                ? `${source.ref} was not moved: its commits were replayed onto ${target} under new SHAs; reset it with 'git reset --hard ${target}' there, or delete it`
+                : `${source.ref} was not moved: it has commits ${target} does not; merge ${target} into it`);
             return;
         case "checked-out":
-            warn(`${source.ref} was not moved: it is checked out at ${source.worktree}; run 'git merge --ff-only ${target}' there`);
+            warn(replayed
+                ? `${source.ref} was not moved: it is checked out at ${source.worktree}; its commits were replayed onto ${target}, so reset it with 'git reset --hard ${target}' there`
+                : `${source.ref} was not moved: it is checked out at ${source.worktree}; run 'git merge --ff-only ${target}' there`);
             return;
         default:
             return;

package/dist/commands/pr.js.map

@@ -1 +1 @@
-{"version":3,"file":"pr.js","sourceRoot":"","sources":["../../src/commands/pr.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,aAAa,EAEb,UAAU,EACV,cAAc,EACd,aAAa,EACb,YAAY,EACZ,iBAAiB,EAGjB,qBAAqB,EAErB,cAAc,EACd,SAAS,EACT,MAAM,EACN,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EAEb,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,aAAa,EAEb,SAAS,EACT,WAAW,EACX,QAAQ,EACR,QAAQ,EAER,eAAe,EACf,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAEL,QAAQ,EAIR,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAgBjF,MAAM,UAAU,SAAS,CAAC,GAAQ,EAAE,IAAmB;IACrD,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,SAAS,CAAC;YACR,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC;YAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC3B,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,MAAM,EAAE,IAAI,CAAC,KAAK;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,OAAO;SACvB,CAAC;QACJ,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IAEH,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CACjC,GAAG,EACH,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,KAAK,EAAE,EACzD,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CACxB,CAAC;IAEF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,IAAI,OAAO,QAAQ,EAAE,KAAK,CAAC,CAAC;IAClE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,MAAM,UAAU,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAClG,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,gFAAgF;AAEhF,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,MAAc,EAAE,IAAiB;IACrE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5F,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,qBAAqB,aAAa,QAAQ,MAAM,CAAC,EAAE,UAAU,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CACnF,CAAC;IACF,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC;AAQD,MAAM,UAAU,YAAY,CAC1B,GAAQ,EACR,MAAc,EACd,MAAgB,EAChB,IAAoB;IAEpB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE;QAC7E,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,iBAAiB,CAAC;IACrE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnE,4EAA4E;IAC5E,oEAAoE;IACpE,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,MAAM,IAAI,CACjF,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC;AAcD,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,MAAc,EAAE,IAAmB;IACvE,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IACxF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,sEAAsE,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3D,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAEzD,8EAA8E;IAC9E,8EAA8E;IAC9E,4EAA4E;IAC5E,yEAAyE;IACzE,MAAM,OAAO,GAAwB,IAAI,CAAC,OAAO;QAC/C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,CAAC,cAAc;YACnB,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO;gBACvC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,SAAS,CAAC;IAClB,MAAM,QAAQ,GAAG,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IAElE,MAAM,IAAI,GAAoB;QAC5B,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC;QAC1B,IAAI,EAAE,EAAE;QACR,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1C,CAAC;IAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,UAAU,EAAE,mBAAmB;QAC/B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACpC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QACnD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,YAAY,CACpC,GAAG,EACH,MAAM,EACN,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAC/C,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CACxB,CAAC;IAEF,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,aAAa,OAAO,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;IACjE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,MAAM,IAAI,IAAI,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9E,IAAI,QAAQ;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5D,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,gBAAgB,CAAC,GAAQ,EAAE,MAAoB,EAAE,OAA4B;IACpF,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,MAAM,CAAC,UAAU;QAAE,OAAO;IAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC;IACpD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC;QAAE,OAAO;IACzD,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,EAAE,6BAA6B;QACzE,QAAQ,OAAO,qCAAqC,CACvD,CAAC;AACJ,CAAC;AAQD,MAAM,UAAU,SAAS,CAAC,GAAQ,EAAE,KAAe,EAAE,IAAmB;IACtE,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAEjC,6EAA6E;IAC7E,2EAA2E;IAC3E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyB,CAAC;IACnD,MAAM,SAAS,GAAG,CAAC,MAAoB,EAAiB,EAAE;QACxD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACtD,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,YAAY,GAAkB;QAClC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;QACpF,2EAA2E;QAC3E,2EAA2E;QAC3E,8BAA8B;QAC9B;YACE,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACrD,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAClF,QAAQ,EAAE,IAAI;SACf;QACD;YACE,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ;YAC7C,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;SACtF;KACF,CAAC;IACF,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAE/C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5C,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACjC,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,QAAQ,CACT,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CACnF,CACF,IAAI,CACN,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC/E,OAAO;IACT,CAAC;IAED,UAAU,CACR,GAAG,EACH,IAAI,EACJ,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAC1E;QACE,GAAG,IAAI;QACP,YAAY,EAAE;YACZ,GAAG,YAAY;YACf;gBACE,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,CAAC,MAAoB,EAAE,EAAE,CAC9B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;qBACjE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;qBACvB,IAAI,CAAC,GAAG,CAAC;aACf;SACF;KACF,CACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,aAAa,CAAC,GAAQ,EAAE,IAAmB;IAClD,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO;IACtB,MAAM,KAAK,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO;IACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CACf,GAAG,KAAK,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,sBAAsB;QAC9E,oCAAoC,CACvC,IAAI,CACN,CAAC;AACJ,CAAC;AAaD,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,MAA0B,EAAE,IAAkB;IACjF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC;IAC7C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,wEAAwE;QACxE,2DAA2D;QAC3D,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,SAAS,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,oBAAoB,SAAS,IAAI,CACvF,CAAC;QACJ,CAAC;QACD,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACzB,OAAO;IACT,CAAC;IACD,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,wDAAwD,CAAC,CAAC;IAE5E,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACvE,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7C,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IAC1E,WAAW,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,+EAA+E;AAC/E,SAAS,iBAAiB,CAAC,MAAmB;IAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5E,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAAC,GAAQ,EAAE,EAAU,EAAE,MAAmB,EAAE,SAAkB;IACzF,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO;IAC/B,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,SAAS,IAAI,CAAC,CAAC;IAE9C,QAAQ,WAAW,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/E,KAAK,SAAS;YACZ,OAAO;QACT,KAAK,kBAAkB;YACrB,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,EAAE,iCAAiC,CACjF,CAAC;YACF,OAAO;QACT,KAAK,KAAK;YACR,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC;gBAAE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,GAAQ,EAAE,MAAmB;IAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC;IACpF,IAAI,MAAM,CAAC,QAAQ;QAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IACxF,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,GAAQ,EAAE,MAAkB,EAAE,MAAc;IACpE,MAAM,IAAI,GAAG,CAAC,IAAY,EAAQ,EAAE;QAClC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,gBAAgB;YACnB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,MAAM,CAAC,GAAG,OAAO,MAAM,IAAI,CAAC,CAAC;YAChE,OAAO;QACT,KAAK,UAAU;YACb,IAAI,CACF,GAAG,MAAM,CAAC,GAAG,kCAAkC,MAAM,oBAAoB,MAAM,UAAU,CAC1F,CAAC;YACF,OAAO;QACT,KAAK,aAAa;YAChB,IAAI,CACF,GAAG,MAAM,CAAC,GAAG,wCAAwC,MAAM,CAAC,QAAQ,8BAA8B,MAAM,SAAS,CAClH,CAAC;YACF,OAAO;QACT;YACE,OAAO;IACX,CAAC;AACH,CAAC;AAED,iFAAiF;AAEjF;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,MAAc,EAAE,IAAkB;IACrE,MAAM,YAAY,GAAG,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,YAAY,EAAE,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,KAAK,CACd,YAAY,YAAY,CAAC,EAAE,0BAA0B,YAAY,CAAC,GAAG,0BAA0B,CAChG,CAAC;IACJ,CAAC;IACD,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"pr.js","sourceRoot":"","sources":["../../src/commands/pr.ts"],"names":[],"mappings":"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"}

package/dist/context.d.ts

@@ -0,0 +1,42 @@
+/**
+ * The CLI's context: a workspace context plus the terminal it reports to.
+ *
+ * Everything that is not presentation — repository paths, the clock, ID
+ * minting, identity — lives in `workspace/ctx.ts` and is shared with any other
+ * front end. This module adds only what a terminal program needs on top.
+ */
+import { type CoreExtensions, type WsCtx } from "@navbook/core";
+import { type Colors } from "./render/colors.ts";
+export interface Ctx extends WsCtx {
+    colors: Colors;
+    stdout: NodeJS.WriteStream;
+    stderr: NodeJS.WriteStream;
+}
+export interface MakeContextOptions {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+    stdout?: NodeJS.WriteStream;
+    stderr?: NodeJS.WriteStream;
+    /** Skip repository discovery, for commands that work outside a repository. */
+    requireRepo?: boolean;
+    /** The Navbook directory, when the caller already knows it; see `makeWsCtx`. */
+    navDir?: string;
+    /**
+     * What the loaded plugins registered (spec 02 §2.12).
+     *
+     * Supplied only for a command whose declaration says it needs the format
+     * extensions, because loading them means importing plugin code and that is
+     * what the budget of spec 05 §5.2 cannot afford on every invocation.
+     */
+    ext?: CoreExtensions;
+}
+/**
+ * How the program asks for its context: built on first use, and memoised.
+ *
+ * `requireRepo: false` is for a command that works outside a repository; the
+ * default refuses to build one there, which is the error most commands want.
+ */
+export type GetCtx = (opts?: {
+    requireRepo?: boolean;
+}) => Ctx;
+export declare function makeContext(opts?: MakeContextOptions): Ctx;

package/dist/context.js

@@ -15,6 +15,8 @@ export function makeContext(opts = {}) {
         cwd: opts.cwd,
         env,
         ...(opts.requireRepo !== undefined ? { requireRepo: opts.requireRepo } : {}),
+        ...(opts.navDir !== undefined ? { navDir: opts.navDir } : {}),
+        ...(opts.ext !== undefined ? { ext: opts.ext } : {}),
     });
     return { ...ws, colors: makeColors(stdout, env), stdout, stderr };
 }

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAc,MAAM,eAAe,CAAC;AACtD,OAAO,EAAe,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAiB7D,MAAM,UAAU,WAAW,CAAC,OAA2B,EAAE;IACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAE7C,MAAM,EAAE,GAAG,SAAS,CAAC;QACnB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG;QACH,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7E,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACpE,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAuB,SAAS,EAAc,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAe,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAmC7D,MAAM,UAAU,WAAW,CAAC,OAA2B,EAAE;IACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAE7C,MAAM,EAAE,GAAG,SAAS,CAAC;QACnB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG;QACH,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACpE,CAAC"}

package/dist/editor.d.ts

@@ -0,0 +1,23 @@
+/**
+ * `$EDITOR` integration for the `--edit` flows.
+ *
+ * The editor is always opened on the real Navbook file, exactly as spec 04 §4.3
+ * describes, so nothing has to be parsed back out of a scratch buffer.
+ */
+import type { Ctx } from "./context.ts";
+/** Single-quote a path for a POSIX shell, escaping any embedded quotes. */
+export declare function shellQuote(value: string): string;
+/** The editor command to use, or null when none can be determined. */
+export declare function editorCommand(env: NodeJS.ProcessEnv): string | null;
+/** Open `absolutePath` in the user's editor, failing if it exits non-zero. */
+export declare function openInEditor(ctx: Ctx, absolutePath: string): void;
+/**
+ * Edit a Navbook file before it exists.
+ *
+ * The buffer is a real `.md` file (so editors highlight it) held next to
+ * `COMMIT_EDITMSG` in the git directory, and it is prefilled with the exact
+ * frontmatter the file will carry — the author can adjust the title, labels and
+ * body in one pass. Nothing is created in `.navbook/` until the text is valid,
+ * so an abort leaves no partial entity behind.
+ */
+export declare function editBuffer(ctx: Ctx, name: string, initial: string): string;

package/dist/editor.js

@@ -41,6 +41,10 @@ export function openInEditor(ctx, absolutePath) {
     });
     if (result.error)
         fail(`could not start editor '${editor}': ${result.error.message}`);
+    // Ctrl-C reaches the editor too, and a killed process has a signal, not a
+    // status: "status null" would say nothing about what happened.
+    if (result.signal)
+        fail(`editor '${editor}' was interrupted (${result.signal}); nothing was written`);
     if ((result.status ?? 1) !== 0)
         fail(`editor '${editor}' exited with status ${result.status}`);
 }

package/dist/editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,2EAA2E;AAC3E,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,aAAa,CAAC,GAAsB;IAClD,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,YAAoB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC,sBAAsB,EAAE;YAC3B,0EAA0E;SAC3E,CAAC,CAAC;IACL,CAAC;IACD,yEAAyE;IACzE,yEAAyE;IACzE,uEAAuE;IACvE,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,EAAE;QAChE,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,GAAG,CAAC,QAAQ;QACjB,GAAG,EAAE,GAAG,CAAC,GAAG;KACb,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,CAAC,2BAA2B,MAAM,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACtF,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC;QAAE,IAAI,CAAC,WAAW,MAAM,wBAAwB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACjG,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,IAAY,EAAE,OAAe;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9C,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,CAAC;AACH,CAAC"}
+{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,2EAA2E;AAC3E,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,aAAa,CAAC,GAAsB;IAClD,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,YAAoB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC,sBAAsB,EAAE;YAC3B,0EAA0E;SAC3E,CAAC,CAAC;IACL,CAAC;IACD,yEAAyE;IACzE,yEAAyE;IACzE,uEAAuE;IACvE,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,EAAE;QAChE,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,GAAG,CAAC,QAAQ;QACjB,GAAG,EAAE,GAAG,CAAC,GAAG;KACb,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK;QAAE,IAAI,CAAC,2BAA2B,MAAM,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACtF,0EAA0E;IAC1E,+DAA+D;IAC/D,IAAI,MAAM,CAAC,MAAM;QACf,IAAI,CAAC,WAAW,MAAM,sBAAsB,MAAM,CAAC,MAAM,wBAAwB,CAAC,CAAC;IACrF,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC;QAAE,IAAI,CAAC,WAAW,MAAM,wBAAwB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACjG,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,IAAY,EAAE,OAAe;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9C,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,IAAI,CAAC;QACH,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,CAAC;AACH,CAAC"}

package/dist/errors.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Exit codes — spec 04 §4.2: 0 success, 1 operational error, 2 format violation.
+ */
+export type ExitCode = 0 | 1 | 2;
+export declare class NavError extends Error {
+    readonly exitCode: ExitCode;
+    /** Extra lines printed under the message, e.g. candidate IDs. */
+    readonly details: string[];
+    constructor(message: string, opts?: {
+        exitCode?: ExitCode;
+        details?: string[];
+    });
+}
+/** An operational error: not found, ambiguous, malformed input (exit 1). */
+export declare function fail(message: string, details?: string[]): never;
+/** A format violation detected by `doctor` (exit 2). */
+export declare function failFormat(message: string, details?: string[]): never;

package/dist/install/completions.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Shell completions.
+ *
+ * The scripts stay deliberately thin: anything that needs to know about the
+ * repository calls back into `nav __complete`, so completion behavior lives in
+ * one implementation rather than three shell dialects.
+ */
+export declare const SHELLS: readonly ["bash", "zsh", "fish"];
+export type Shell = (typeof SHELLS)[number];
+export declare function isShell(value: string): value is Shell;
+/** Guess the user's shell from `$SHELL`, defaulting to bash. */
+export declare function detectShell(env: NodeJS.ProcessEnv): Shell;
+/** Where a shell looks for per-user completion scripts. */
+export declare function completionPath(shell: Shell, env: NodeJS.ProcessEnv): string;
+/** Extra advice printed after installing, where a shell needs configuration. */
+export declare function completionNote(shell: Shell, path: string): string | null;
+export declare function completionScript(shell: Shell): string;
+export declare function installCompletions(shell: Shell, env: NodeJS.ProcessEnv): string;
+export declare function uninstallCompletions(shell: Shell, env: NodeJS.ProcessEnv): string | null;

package/dist/install/hook.d.ts

@@ -0,0 +1,32 @@
+/**
+ * The `pre-commit` hook — spec 04 §4.5.
+ *
+ * The hook is a thin shell script that calls the binary, so `--no-verify` and
+ * manual hook removal behave exactly as users expect. It is written as a marked
+ * block appended to any existing hook, and `nav uninstall --hooks` removes
+ * precisely that block and nothing else.
+ */
+export declare const MARKER_BEGIN = "# >>> navbook >>>";
+export declare const MARKER_END = "# <<< navbook <<<";
+export declare const HOOK_NAME = "pre-commit";
+export declare function hookPath(repoRoot: string): string;
+export declare function isInstalled(repoRoot: string): boolean;
+/**
+ * Whether the hook has the block, and whether it is this `nav`'s.
+ *
+ * `outdated` is a block an older `nav` wrote: the markers are there but what
+ * is between them is not what this one would write — the block before the
+ * `set -e` fix, say. Seeing only the marker would leave every existing
+ * install with the old block for good.
+ */
+export declare function hookState(repoRoot: string): "absent" | "current" | "outdated";
+/**
+ * Write the marked block: appended, creating the hook file if there is none,
+ * or put in place of an older block, leaving everything around it alone.
+ */
+export declare function installHook(repoRoot: string): void;
+/**
+ * Remove exactly the marked block. A hook that contained nothing else is
+ * deleted; a hook the user also wrote by hand keeps everything they wrote.
+ */
+export declare function uninstallHook(repoRoot: string): void;

package/dist/install/hook.js

@@ -17,9 +17,15 @@ const BODY = `${MARKER_BEGIN}
 # Validate staged Navbook files. Only a format violation (exit 2) blocks the
 # commit; warnings never do, and a clone without nav installed is unaffected.
 # Commit with --no-verify, or delete this block, to skip the check.
+#
+# The status is captured rather than tested on the next line: this block is
+# appended to whatever hook was already here, and under 'set -e' a bare
+# 'nav doctor --staged' would end the hook on exit 1 (an operational error,
+# not a format violation) before the test below ever ran.
 if command -v nav >/dev/null 2>&1; then
-  nav doctor --staged
-  if [ $? -eq 2 ]; then
+  navbook_status=0
+  nav doctor --staged || navbook_status=$?
+  if [ "$navbook_status" -eq 2 ]; then
     exit 1
   fi
 fi
@@ -31,13 +37,51 @@ export function isInstalled(repoRoot) {
     const path = hookPath(repoRoot);
     return existsSync(path) && readFileSync(path, "utf8").includes(MARKER_BEGIN);
 }
-/** Append the marked block, creating the hook file if there is none. */
+/**
+ * Whether the hook has the block, and whether it is this `nav`'s.
+ *
+ * `outdated` is a block an older `nav` wrote: the markers are there but what
+ * is between them is not what this one would write — the block before the
+ * `set -e` fix, say. Seeing only the marker would leave every existing
+ * install with the old block for good.
+ */
+export function hookState(repoRoot) {
+    const path = hookPath(repoRoot);
+    if (!existsSync(path))
+        return "absent";
+    const block = findBlock(readFileSync(path, "utf8"));
+    if (block === null)
+        return "absent";
+    return block.text === BODY ? "current" : "outdated";
+}
+/** The marked block's text and where it sits, or null when there is none. */
+function findBlock(content) {
+    const start = content.indexOf(MARKER_BEGIN);
+    if (start === -1)
+        return null;
+    const close = content.indexOf(MARKER_END, start);
+    // An opening marker with no closing one is a block somebody cut short by
+    // hand; it runs to the end of the file, which is what uninstall assumes too.
+    const end = close === -1 ? content.length : close + MARKER_END.length;
+    return { start, end, text: content.slice(start, end) };
+}
+/**
+ * Write the marked block: appended, creating the hook file if there is none,
+ * or put in place of an older block, leaving everything around it alone.
+ */
 export function installHook(repoRoot) {
     const path = hookPath(repoRoot);
     mkdirSync(dirname(path), { recursive: true });
     const existing = existsSync(path) ? readFileSync(path, "utf8") : "";
-    if (existing.includes(MARKER_BEGIN))
+    const block = findBlock(existing);
+    if (block !== null) {
+        if (block.text === BODY)
+            return;
+        const replaced = `${existing.slice(0, block.start)}${BODY}${existing.slice(block.end)}`;
+        writeFileSync(path, replaced.endsWith("\n") ? replaced : `${replaced}\n`, "utf8");
+        chmodSync(path, statSync(path).mode | 0o111);
         return;
+    }
     const content = existing.trim() === ""
         ? `${SHEBANG}\n${BODY}\n`
         : `${existing.replace(/\n*$/, "\n")}\n${BODY}\n`;