@coderook/cli 0.45.0 → 0.46.1

package/dist/cli/src/local_commands.js

@@ -36,15 +36,7 @@ const config_js_1 = require("./config.js");
 const project_choice_js_1 = require("./project_choice.js");
 const project_commands_js_1 = require("./project_commands.js");
 const publish_js_1 = require("./publish.js");
-const ESC = String.fromCharCode(27);
-const paint = (code) => (value) => `${ESC}[${code}m${value}${ESC}[0m`;
-const dim = paint("2");
-const bold = paint("1");
-const red = paint("31");
-const green = paint("32");
-const accent = paint("33");
-const short = (id) => id.slice(0, 10);
-const plural = (count, one, many = `${one}s`) => `${count.toLocaleString()} ${count === 1 ? one : many}`;
+const local_status_js_1 = require("./local_status.js");
 function text(parsed, ...names) {
     for (const name of names) {
         const value = parsed.flags.get(name);
@@ -77,23 +69,12 @@ function localFirst(local, otherwise, from = () => node_process_1.default.cwd())
         return repository ? local(parsed, repository) : otherwise(parsed);
     };
 }
-function printChanges(changes, limit = 50) {
-    const rows = [
-        ...changes.added.map((file) => [green("added   "), file]),
-        ...changes.modified.map((file) => [accent("changed "), file]),
-        ...changes.deleted.map((file) => [red("deleted "), file]),
-    ].sort((left, right) => (left[1] < right[1] ? -1 : left[1] > right[1] ? 1 : 0));
-    for (const [mark, file] of rows.slice(0, limit))
-        console.log(`  ${mark}${file}`);
-    if (rows.length > limit)
-        console.log(dim(`  … and ${rows.length - limit} more`));
-}
 function describeSave(one) {
     const when = new Date(one.created);
     const date = Number.isNaN(when.getTime())
         ? one.created
         : when.toLocaleString(undefined, { dateStyle: "medium", timeStyle: "short" });
-    return `${accent(short(one.id))}  ${one.message.split("\n")[0]}  ${dim(`${one.author} · ${date}`)}`;
+    return `${(0, local_status_js_1.accent)((0, local_status_js_1.short)(one.id))}  ${one.message.split("\n")[0]}  ${(0, local_status_js_1.dim)(`${one.author} · ${date}`)}`;
 }
 /** Refusals are printed as sentences, not stack traces. */
 async function reporting(work) {
@@ -102,29 +83,29 @@ async function reporting(work) {
     }
     catch (error) {
         if (error instanceof remote_js_1.RemoteAhead || error instanceof remote_js_1.RemoteDiffers || error instanceof remote_js_1.NoRemote) {
-            console.error(red(error.message));
+            console.error((0, local_status_js_1.red)(error.message));
             return 1;
         }
         const failure = (0, publish_js_1.classifyPublishFailure)(error);
         if (failure?.kind === "credentials") {
-            console.error(red(failure.message));
-            console.error(dim("Take the key out of that save, or push it deliberately with --allow-secrets."));
+            console.error((0, local_status_js_1.red)(failure.message));
+            console.error((0, local_status_js_1.dim)("Take the key out of that save, or push it deliberately with --allow-secrets."));
             return 1;
         }
         if (failure?.kind === "interrupted") {
-            console.error(red(`The connection failed part way: ${failure.message}`));
-            console.error(dim("Push again. Saves already on CodeRook are not sent twice."));
+            console.error((0, local_status_js_1.red)(`The connection failed part way: ${failure.message}`));
+            console.error((0, local_status_js_1.dim)("Push again. Saves already on CodeRook are not sent twice."));
             return 1;
         }
         if (error instanceof history_js_1.UnsavedChanges || error instanceof history_js_1.UnresolvedConflicts) {
-            console.error(red(error.message));
+            console.error((0, local_status_js_1.red)(error.message));
             for (const file of error.files.slice(0, 20))
                 console.error(`  ${file}`);
             if (error.files.length > 20)
-                console.error(dim(`  … and ${error.files.length - 20} more`));
+                console.error((0, local_status_js_1.dim)(`  … and ${error.files.length - 20} more`));
             return 1;
         }
-        console.error(red(error instanceof Error ? error.message : String(error)));
+        console.error((0, local_status_js_1.red)(error instanceof Error ? error.message : String(error)));
         return 1;
     }
 }
@@ -134,13 +115,13 @@ async function commandInit(parsed) {
         const folder = node_path_1.default.resolve(parsed.positional[0] ?? node_process_1.default.cwd());
         const inside = await localHistory(folder);
         if (inside && inside.root !== folder) {
-            console.error(red(`${folder} is already inside the history at ${inside.root}.`));
-            console.error(dim("One history per project. Run cbx commands from anywhere inside it."));
+            console.error((0, local_status_js_1.red)(`${folder} is already inside the history at ${inside.root}.`));
+            console.error((0, local_status_js_1.dim)("One history per project. Run cbx commands from anywhere inside it."));
             return 1;
         }
         const repository = await (0, history_js_1.init)(folder, text(parsed, "line") ?? undefined);
-        console.log(`Started a history in ${bold(repository.root)} on ${accent(await repository.currentLine())}.`);
-        console.log(dim("It lives in .cbx/ and never leaves this machine by itself. Run " +
+        console.log(`Started a history in ${(0, local_status_js_1.bold)(repository.root)} on ${(0, local_status_js_1.accent)(await repository.currentLine())}.`);
+        console.log((0, local_status_js_1.dim)("It lives in .cbx/ and never leaves this machine by itself. Run " +
             `cbx save -m "…" to record the folder as it is.`));
         return 0;
     });
@@ -152,7 +133,7 @@ async function commandSave(parsed) {
         const message = text(parsed, "m", "message") ?? "";
         const merging = await (0, merge_js_1.readMergeState)(repository);
         if (!message.trim() && !merging) {
-            console.error(red('A save needs a message: cbx save -m "what changed"'));
+            console.error((0, local_status_js_1.red)('A save needs a message: cbx save -m "what changed"'));
             return 1;
         }
         const interactive = node_process_1.default.stdout.isTTY;
@@ -167,7 +148,7 @@ async function commandSave(parsed) {
                     if (now - shown < 100 && done < total)
                         return;
                     shown = now;
-                    node_process_1.default.stdout.write(`\r${dim(`Reading ${done.toLocaleString()} of ${total.toLocaleString()} files`)}   `);
+                    node_process_1.default.stdout.write(`\r${(0, local_status_js_1.dim)(`Reading ${done.toLocaleString()} of ${total.toLocaleString()} files`)}   `);
                 }
                 : undefined,
         });
@@ -178,46 +159,17 @@ async function commandSave(parsed) {
             return 0;
         }
         const count = (0, history_js_1.changeCount)(result.changes);
-        console.log(`Saved ${accent(short(result.save.id))} on ${accent(result.save.line)}: ` +
+        console.log(`Saved ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(result.save.id))} on ${(0, local_status_js_1.accent)(result.save.line)}: ` +
             `${result.save.message.split("\n")[0]}`);
-        console.log(dim(`${plural(count, "file")} changed · ${plural(result.files, "file")}, ` +
+        console.log((0, local_status_js_1.dim)(`${(0, local_status_js_1.plural)(count, "file")} changed · ${(0, local_status_js_1.plural)(result.files, "file")}, ` +
             `${bytes(result.bytes)} in the save`));
-        printChanges(result.changes, 20);
+        (0, local_status_js_1.printChanges)(result.changes, 20);
         return 0;
     });
 }
 /* ---- status ---------------------------------------------------------- */
 async function localStatus(_parsed, repository) {
-    return reporting(async () => {
-        const now = await (0, history_js_1.status)(repository);
-        console.log(`${bold(node_path_1.default.basename(repository.root))} on ${accent(now.line)}` +
-            (now.head ? dim(`  last saved ${short(now.head.id)}: ${now.head.message.split("\n")[0]}`) : dim("  nothing saved yet")));
-        if (now.merging) {
-            const left = now.merging.unresolved.length;
-            console.log(`Merging ${accent(short(now.merging.theirs))}: ` +
-                (left ? red(`${plural(left, "file")} still ${left === 1 ? "has" : "have"} conflict markers`) : green("no conflict markers left")));
-            for (const conflict of now.merging.conflicts) {
-                const how = conflict.kind === "text"
-                    ? now.merging.unresolved.includes(conflict.path) ? "markers in it" : "edited"
-                    : conflict.kind === "binary"
-                        ? "both changed; this line's copy is in the folder"
-                        : conflict.kind === "deleted-here"
-                            ? "deleted here, changed there; their copy is in the folder"
-                            : "changed here, deleted there; this copy is in the folder";
-                console.log(`  ${red("conflict")} ${conflict.path}  ${dim(how)}`);
-            }
-            console.log(dim(`Finish with cbx save, take a side with cbx merge --mine or --theirs, or cbx merge --cancel.`));
-        }
-        const count = (0, history_js_1.changeCount)(now.changes);
-        if (!count) {
-            console.log("Nothing has changed since the last save.");
-            return 0;
-        }
-        console.log(`${plural(count, "file")} changed since the last save:`);
-        printChanges(now.changes);
-        console.log(dim(`cbx diff shows the lines; cbx save -m "…" records them.`));
-        return 0;
-    });
+    return reporting(() => (0, local_status_js_1.printLocalStatus)(repository));
 }
 /* ---- log ------------------------------------------------------------- */
 async function localLog(parsed, repository) {
@@ -228,7 +180,7 @@ async function localLog(parsed, repository) {
             limit: Number.isFinite(limit) && limit > 0 ? limit : 20,
         });
         if (!saves.length) {
-            console.log(`Nothing saved on ${accent(await repository.currentLine())} yet.`);
+            console.log(`Nothing saved on ${(0, local_status_js_1.accent)(await repository.currentLine())} yet.`);
             return 0;
         }
         for (const one of saves)
@@ -252,30 +204,30 @@ async function localDiff(parsed, repository) {
             console.log(to ? "Those two saves hold the same files." : "Nothing has changed since the last save.");
             return 0;
         }
-        const mark = { added: green("+"), modified: accent("~"), deleted: red("-") };
+        const mark = { added: (0, local_status_js_1.green)("+"), modified: (0, local_status_js_1.accent)("~"), deleted: (0, local_status_js_1.red)("-") };
         for (const change of changes) {
-            console.log(`${mark[change.kind]} ${bold(change.path)}`);
+            console.log(`${mark[change.kind]} ${(0, local_status_js_1.bold)(change.path)}`);
             if (has(parsed, "name-only"))
                 continue;
             if (change.executableChanged)
-                console.log(dim("    execute permission changed"));
+                console.log((0, local_status_js_1.dim)("    execute permission changed"));
             if (change.summary) {
-                console.log(dim(`    ${change.summary}`));
+                console.log((0, local_status_js_1.dim)(`    ${change.summary}`));
                 continue;
             }
             for (const chunk of change.chunks ?? []) {
                 if (chunk.kind === "gap") {
-                    console.log(dim(`    ... ${chunk.skipped} unchanged`));
+                    console.log((0, local_status_js_1.dim)(`    ... ${chunk.skipped} unchanged`));
                     continue;
                 }
                 for (const line of chunk.lines) {
                     const at = String(line.candidateLine ?? line.targetLine ?? "").padStart(5);
                     if (line.side === "same")
-                        console.log(dim(`${at}   ${line.text}`));
+                        console.log((0, local_status_js_1.dim)(`${at}   ${line.text}`));
                     else if (line.side === "candidate")
-                        console.log(`${dim(at)} ${green("+")} ${green(line.text)}`);
+                        console.log(`${(0, local_status_js_1.dim)(at)} ${(0, local_status_js_1.green)("+")} ${(0, local_status_js_1.green)(line.text)}`);
                     else
-                        console.log(`${dim(at)} ${red("-")} ${red(line.text)}`);
+                        console.log(`${(0, local_status_js_1.dim)(at)} ${(0, local_status_js_1.red)("-")} ${(0, local_status_js_1.red)(line.text)}`);
                 }
             }
         }
@@ -294,18 +246,18 @@ async function commandRestore(parsed) {
         });
         const touched = result.written.length + result.removed.length;
         if (!touched) {
-            console.log(`Already matches ${accent(short(result.save.id))}; nothing to put back.`);
+            console.log(`Already matches ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(result.save.id))}; nothing to put back.`);
             return 0;
         }
-        console.log(`Put back ${plural(touched, "file")} from ${accent(short(result.save.id))}: ` +
+        console.log(`Put back ${(0, local_status_js_1.plural)(touched, "file")} from ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(result.save.id))}: ` +
             `${result.save.message.split("\n")[0]}`);
         for (const file of result.written.slice(0, 20))
-            console.log(`  ${green("restored")} ${file}`);
+            console.log(`  ${(0, local_status_js_1.green)("restored")} ${file}`);
         for (const file of result.removed.slice(0, 20))
-            console.log(`  ${red("removed ")} ${file}`);
+            console.log(`  ${(0, local_status_js_1.red)("removed ")} ${file}`);
         if (touched > 40)
-            console.log(dim(`  … and more`));
-        console.log(dim("Your line has not moved. Save to record the folder as it is now."));
+            console.log((0, local_status_js_1.dim)(`  … and more`));
+        console.log((0, local_status_js_1.dim)("Your line has not moved. Save to record the folder as it is now."));
         return 0;
     });
 }
@@ -316,10 +268,10 @@ async function localSwitch(parsed, repository) {
         if (!line) {
             const current = await repository.currentLine();
             for (const one of await repository.lines()) {
-                console.log(`${one.name === current ? accent("*") : " "} ${one.name}  ${dim(short(one.tip))}`);
+                console.log(`${one.name === current ? (0, local_status_js_1.accent)("*") : " "} ${one.name}  ${(0, local_status_js_1.dim)((0, local_status_js_1.short)(one.tip))}`);
             }
             if (!(await repository.lineExists(current))) {
-                console.log(`${accent("*")} ${current}  ${dim("nothing saved yet")}`);
+                console.log(`${(0, local_status_js_1.accent)("*")} ${current}  ${(0, local_status_js_1.dim)("nothing saved yet")}`);
             }
             return 0;
         }
@@ -328,14 +280,14 @@ async function localSwitch(parsed, repository) {
             force: has(parsed, "force", "f"),
         });
         if (result.created) {
-            console.log(`Started ${accent(result.line)}` +
-                (result.save ? ` from ${accent(short(result.save.id))}.` : ".") +
-                dim(" No files changed."));
+            console.log(`Started ${(0, local_status_js_1.accent)(result.line)}` +
+                (result.save ? ` from ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(result.save.id))}.` : ".") +
+                (0, local_status_js_1.dim)(" No files changed."));
             return 0;
         }
         const touched = result.written.length + result.removed.length;
-        console.log(`On ${accent(result.line)} now` +
-            (touched ? `, ${plural(touched, "file")} changed.` : ", and no files needed changing."));
+        console.log(`On ${(0, local_status_js_1.accent)(result.line)} now` +
+            (touched ? `, ${(0, local_status_js_1.plural)(touched, "file")} changed.` : ", and no files needed changing."));
         return 0;
     });
 }
@@ -397,25 +349,25 @@ async function localPush(parsed, repository) {
                 if (event.kind === "upload")
                     uploadDisplay.report(event.progress);
                 if (event.kind === "save" && interactive) {
-                    node_process_1.default.stdout.write(`\r${dim(`Sending ${event.index + 1} of ${event.total}: ${event.save.message.split("\n")[0].slice(0, 50)}`)}   `);
+                    node_process_1.default.stdout.write(`\r${(0, local_status_js_1.dim)(`Sending ${event.index + 1} of ${event.total}: ${event.save.message.split("\n")[0].slice(0, 50)}`)}   `);
                 }
                 if (event.kind === "pushed" || event.kind === "unchanged") {
                     uploadDisplay.done();
                     if (interactive)
                         node_process_1.default.stdout.write(`\r${" ".repeat(80)}\r`);
-                    console.log(`  ${accent(short(event.save.id))}  ` +
-                        (event.kind === "pushed" ? green(`v${event.sequence}`) : dim("already there")) +
+                    console.log(`  ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(event.save.id))}  ` +
+                        (event.kind === "pushed" ? (0, local_status_js_1.green)(`v${event.sequence}`) : (0, local_status_js_1.dim)("already there")) +
                         `  ${event.save.message.split("\n")[0]}`);
                 }
             },
         }).finally(() => uploadDisplay.done());
         if (!result.pushed.length) {
-            console.log(`Everything on ${accent(result.line)} is already on CodeRook.`);
+            console.log(`Everything on ${(0, local_status_js_1.accent)(result.line)} is already on CodeRook.`);
             return 0;
         }
         const last = result.pushed[result.pushed.length - 1];
-        console.log(`Pushed ${plural(result.pushed.length, "save")} to CodeRook on ${accent(result.line)}; ` +
-            `it is at ${accent(`v${last.sequence}`)} now.`);
+        console.log(`Pushed ${(0, local_status_js_1.plural)(result.pushed.length, "save")} to CodeRook on ${(0, local_status_js_1.accent)(result.line)}; ` +
+            `it is at ${(0, local_status_js_1.accent)(`v${last.sequence}`)} now.`);
         if (result.repositoryId && result.head) {
             await recordLink(repository, result.line, result.repositoryId, result.head, result.head.manifest);
         }
@@ -442,7 +394,7 @@ async function localPull(parsed, repository) {
                 if (!interactive)
                     return;
                 if (event.kind === "version") {
-                    node_process_1.default.stdout.write(`\r${dim(`Fetching v${event.version.sequence} (${event.index + 1} of ${event.total})`)}${" ".repeat(20)}`);
+                    node_process_1.default.stdout.write(`\r${(0, local_status_js_1.dim)(`Fetching v${event.version.sequence} (${event.index + 1} of ${event.total})`)}${" ".repeat(20)}`);
                 }
             },
         });
@@ -451,29 +403,29 @@ async function localPull(parsed, repository) {
         for (const save of result.imported)
             console.log(`  ${describeSave(save)}`);
         if (result.merged?.conflicts) {
-            console.log(`CodeRook's ${accent(result.line)} and this history had both moved on, and merging them left ` +
-                red(plural(result.merged.conflicts.length, "conflict")) + ":");
+            console.log(`CodeRook's ${(0, local_status_js_1.accent)(result.line)} and this history had both moved on, and merging them left ` +
+                (0, local_status_js_1.red)((0, local_status_js_1.plural)(result.merged.conflicts.length, "conflict")) + ":");
             for (const conflict of result.merged.conflicts)
-                console.log(`  ${red("conflict")} ${conflict.path}`);
-            console.log(dim("Fix them, then cbx save and cbx push. cbx status lists them; cbx merge --cancel calls it off."));
+                console.log(`  ${(0, local_status_js_1.red)("conflict")} ${conflict.path}`);
+            console.log((0, local_status_js_1.dim)("Fix them, then cbx save and cbx push. cbx status lists them; cbx merge --cancel calls it off."));
             return 1;
         }
         if (result.merged?.save) {
             const touched = result.written.length + result.removed.length;
-            console.log(`Merged ${plural(result.imported.length, "save")} from CodeRook's ${accent(result.line)} with this history's own` +
-                (touched ? `; ${plural(touched, "file")} changed.` : ".") +
+            console.log(`Merged ${(0, local_status_js_1.plural)(result.imported.length, "save")} from CodeRook's ${(0, local_status_js_1.accent)(result.line)} with this history's own` +
+                (touched ? `; ${(0, local_status_js_1.plural)(touched, "file")} changed.` : ".") +
                 ` Push to send the merge.`);
             return 0;
         }
         if (!result.moved) {
             console.log(result.imported.length
-                ? `Fetched ${plural(result.imported.length, "save")}.`
-                : `Already up to date with CodeRook's ${accent(result.line)}.`);
+                ? `Fetched ${(0, local_status_js_1.plural)(result.imported.length, "save")}.`
+                : `Already up to date with CodeRook's ${(0, local_status_js_1.accent)(result.line)}.`);
             return 0;
         }
         const touched = result.written.length + result.removed.length;
-        console.log(`Pulled ${plural(result.imported.length, "save")} on ${accent(result.line)}` +
-            (touched ? `; ${plural(touched, "file")} changed.` : "."));
+        console.log(`Pulled ${(0, local_status_js_1.plural)(result.imported.length, "save")} on ${(0, local_status_js_1.accent)(result.line)}` +
+            (touched ? `; ${(0, local_status_js_1.plural)(touched, "file")} changed.` : "."));
         const pulledFrom = (await (0, remote_js_1.readRemote)(repository)).repositoryId;
         const tip = await repository.head();
         if (pulledFrom && result.head && tip) {
@@ -489,7 +441,7 @@ async function localMerge(parsed, repository) {
     return reporting(async () => {
         if (has(parsed, "cancel", "abort")) {
             const put = await (0, history_js_1.cancelMerge)(repository);
-            console.log(`Merge called off; ${plural(put.length, "file")} put back as the last save had them.`);
+            console.log(`Merge called off; ${(0, local_status_js_1.plural)(put.length, "file")} put back as the last save had them.`);
             return 0;
         }
         const pathText = text(parsed, "path");
@@ -498,15 +450,15 @@ async function localMerge(parsed, repository) {
             if (!has(parsed, side))
                 continue;
             const settled = await (0, history_js_1.resolveConflicts)(repository, side, only);
-            console.log(`Took ${side === "mine" ? "this line's" : "the other"} side of ${plural(settled.length, "file")}:`);
+            console.log(`Took ${side === "mine" ? "this line's" : "the other"} side of ${(0, local_status_js_1.plural)(settled.length, "file")}:`);
             for (const file of settled)
                 console.log(`  ${file}`);
-            console.log(dim("Save when the rest are settled."));
+            console.log((0, local_status_js_1.dim)("Save when the rest are settled."));
             return 0;
         }
         const other = parsed.positional[0];
         if (!other) {
-            console.error(red("Merge what? Name a line or a save: cbx merge feature"));
+            console.error((0, local_status_js_1.red)("Merge what? Name a line or a save: cbx merge feature"));
             return 1;
         }
         const outcome = await (0, history_js_1.merge)(repository, other, { message: text(parsed, "m", "message") });
@@ -515,16 +467,16 @@ async function localMerge(parsed, repository) {
             console.log(`${other} is already part of this line.`);
         }
         else if (outcome.kind === "fast-forward") {
-            console.log(`Moved to ${accent(short(outcome.save.id))}; ${plural(touched, "file")} changed. Nothing needed merging.`);
+            console.log(`Moved to ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(outcome.save.id))}; ${(0, local_status_js_1.plural)(touched, "file")} changed. Nothing needed merging.`);
         }
         else if (outcome.kind === "merged") {
-            console.log(`Merged ${accent(other)} as ${accent(short(outcome.save.id))}; ${plural(touched, "file")} changed.`);
+            console.log(`Merged ${(0, local_status_js_1.accent)(other)} as ${(0, local_status_js_1.accent)((0, local_status_js_1.short)(outcome.save.id))}; ${(0, local_status_js_1.plural)(touched, "file")} changed.`);
         }
         else {
-            console.log(`Merged what could be merged; ${red(plural(outcome.state.conflicts.length, "conflict"))} left:`);
+            console.log(`Merged what could be merged; ${(0, local_status_js_1.red)((0, local_status_js_1.plural)(outcome.state.conflicts.length, "conflict"))} left:`);
             for (const conflict of outcome.state.conflicts)
-                console.log(`  ${red("conflict")} ${conflict.path}`);
-            console.log(dim("Fix them, then cbx save. Or take a side: cbx merge --theirs [--path file]. Or cbx merge --cancel."));
+                console.log(`  ${(0, local_status_js_1.red)("conflict")} ${conflict.path}`);
+            console.log((0, local_status_js_1.dim)("Fix them, then cbx save. Or take a side: cbx merge --theirs [--path file]. Or cbx merge --cancel."));
             return 1;
         }
         return 0;

package/dist/cli/src/local_status.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.plural = exports.short = exports.accent = exports.green = exports.red = exports.bold = exports.dim = void 0;
+exports.printChanges = printChanges;
+exports.printLocalStatus = printLocalStatus;
+/**
+ * What `cbx status` prints in a folder with a local history, kept apart from
+ * the rest of the local commands so it can run without loading them.
+ *
+ * Status is the command people run most, and in a local history it needs only
+ * the history itself: no sign-in, no network, none of the upload or project
+ * code. bin.ts answers it from here directly; the full command table uses the
+ * same function, so the two can never print differently.
+ */
+const node_path_1 = __importDefault(require("node:path"));
+const history_js_1 = require("../../cbx/src/local/history.js");
+const ESC = String.fromCharCode(27);
+const paint = (code) => (value) => `${ESC}[${code}m${value}${ESC}[0m`;
+exports.dim = paint("2");
+exports.bold = paint("1");
+exports.red = paint("31");
+exports.green = paint("32");
+exports.accent = paint("33");
+const short = (id) => id.slice(0, 10);
+exports.short = short;
+const plural = (count, one, many = `${one}s`) => `${count.toLocaleString()} ${count === 1 ? one : many}`;
+exports.plural = plural;
+function printChanges(changes, limit = 50) {
+    const rows = [
+        ...changes.added.map((file) => [(0, exports.green)("added   "), file]),
+        ...changes.modified.map((file) => [(0, exports.accent)("changed "), file]),
+        ...changes.deleted.map((file) => [(0, exports.red)("deleted "), file]),
+    ].sort((left, right) => (left[1] < right[1] ? -1 : left[1] > right[1] ? 1 : 0));
+    for (const [mark, file] of rows.slice(0, limit))
+        console.log(`  ${mark}${file}`);
+    if (rows.length > limit)
+        console.log((0, exports.dim)(`  … and ${rows.length - limit} more`));
+}
+/** The status of a local history, printed. */
+async function printLocalStatus(repository) {
+    const now = await (0, history_js_1.status)(repository);
+    console.log(`${(0, exports.bold)(node_path_1.default.basename(repository.root))} on ${(0, exports.accent)(now.line)}` +
+        (now.head ? (0, exports.dim)(`  last saved ${(0, exports.short)(now.head.id)}: ${now.head.message.split("\n")[0]}`) : (0, exports.dim)("  nothing saved yet")));
+    if (now.merging) {
+        const left = now.merging.unresolved.length;
+        console.log(`Merging ${(0, exports.accent)((0, exports.short)(now.merging.theirs))}: ` +
+            (left ? (0, exports.red)(`${(0, exports.plural)(left, "file")} still ${left === 1 ? "has" : "have"} conflict markers`) : (0, exports.green)("no conflict markers left")));
+        for (const conflict of now.merging.conflicts) {
+            const how = conflict.kind === "text"
+                ? now.merging.unresolved.includes(conflict.path) ? "markers in it" : "edited"
+                : conflict.kind === "binary"
+                    ? "both changed; this line's copy is in the folder"
+                    : conflict.kind === "deleted-here"
+                        ? "deleted here, changed there; their copy is in the folder"
+                        : "changed here, deleted there; this copy is in the folder";
+            console.log(`  ${(0, exports.red)("conflict")} ${conflict.path}  ${(0, exports.dim)(how)}`);
+        }
+        console.log((0, exports.dim)(`Finish with cbx save, take a side with cbx merge --mine or --theirs, or cbx merge --cancel.`));
+    }
+    const count = (0, history_js_1.changeCount)(now.changes);
+    if (!count) {
+        console.log("Nothing has changed since the last save.");
+        return 0;
+    }
+    console.log(`${(0, exports.plural)(count, "file")} changed since the last save:`);
+    printChanges(now.changes);
+    console.log((0, exports.dim)(`cbx diff shows the lines; cbx save -m "…" records them.`));
+    return 0;
+}

package/dist/cli/src/network.js

@@ -16,7 +16,6 @@ exports.pause = pause;
  * than 250 ms is abandoned too, so a perfectly healthy connection came back as
  * the two words "fetch failed". curl and browsers never showed it.
  */
-const node_dns_1 = __importDefault(require("node:dns"));
 const node_net_1 = __importDefault(require("node:net"));
 /** Called once, before any request. Explicit settings in NODE_OPTIONS win. */
 function tuneNetwork() {
@@ -30,12 +29,27 @@ function tuneNetwork() {
         }
     }
     if (!options.includes("dns-result-order")) {
-        try {
-            node_dns_1.default.setDefaultResultOrder("ipv4first");
-        }
-        catch {
-            /* Older Node: nothing to tune. */
-        }
+        /*
+          Applied just before the first request rather than at start. Loading
+          node:dns sets up its resolver, about twenty milliseconds, which commands
+          that never touch the network (a local status, a local save) were paying
+          on every run. Every request here goes through fetch.
+        */
+        const original = globalThis.fetch;
+        let tuned = false;
+        globalThis.fetch = ((...args) => {
+            if (!tuned) {
+                tuned = true;
+                try {
+                    // eslint-disable-next-line @typescript-eslint/no-require-imports
+                    require("node:dns").setDefaultResultOrder("ipv4first");
+                }
+                catch {
+                    /* Older Node: nothing to tune. */
+                }
+            }
+            return original(...args);
+        });
     }
 }
 /** Whether a failure happened before any answer came back. */

package/dist/cli/src/reminder_gate.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reminderStamp = exports.REMIND_EVERY_MS = void 0;
+exports.reminderDue = reminderDue;
+/**
+ * Whether the unread-messages reminder is due after a command.
+ *
+ * Kept apart from workspace_threads.ts, which needs the API client, so the
+ * quick status in bin.ts can ask without loading it: when the reminder is
+ * due, status goes the long way and the reminder is shown exactly as before.
+ */
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
+const config_js_1 = require("./config.js");
+exports.REMIND_EVERY_MS = 5 * 60_000;
+/** When the reminder last asked, at most every REMIND_EVERY_MS. */
+const reminderStamp = () => node_path_1.default.join((0, config_js_1.configDirectory)(), "discussions-checked");
+exports.reminderStamp = reminderStamp;
+/** Only at a terminal, never for these commands, and at most every five minutes. */
+async function reminderDue(command) {
+    if (!process.stdout.isTTY || process.env.CODEROOK_NO_REMINDERS)
+        return false;
+    if (["workspace", "sign-in", "sign-out", "help", "mcp"].includes(command))
+        return false;
+    try {
+        const last = Number((await (0, promises_1.readFile)((0, exports.reminderStamp)(), "utf8")).trim());
+        if (Date.now() - last < exports.REMIND_EVERY_MS)
+            return false;
+    }
+    catch {
+        /* Never checked on this machine. */
+    }
+    return true;
+}

package/dist/cli/src/update_command.js

@@ -132,7 +132,8 @@ async function commandUpdate(flags) {
     const kind = installKind(script, root.code === 0 ? root.out.trim() : null);
     const target = `${PACKAGE}@${newest}`;
     if (kind === "npx") {
-        console.log(`This copy runs through npx. Ask for the newest each time with ${accent(`npx ${PACKAGE}@latest`)}.`);
+        /* The package has three commands (cbx, coderook, git-remote-coderook), so npx must be told which: -p names the package. */
+        console.log(`This copy runs through npx. Ask for the newest each time with ${accent(`npx -p ${PACKAGE}@latest cbx`)}.`);
         return 0;
     }
     if (kind === "other") {

package/dist/cli/src/workspace_threads.js

@@ -31,6 +31,7 @@ const node_readline_1 = __importDefault(require("node:readline"));
 const api_js_1 = require("./api.js");
 const colour_js_1 = require("./colour.js");
 const config_js_1 = require("./config.js");
+const reminder_gate_js_1 = require("./reminder_gate.js");
 const workspace_watch_js_1 = require("./workspace_watch.js");
 exports.THREAD_OPERATIONS = new Set(["say", "thread", "mute", "unmute"]);
 /** The name this machine posts and reads as, if it gave one. */
@@ -70,7 +71,6 @@ async function commandWorkspaceThread(operation, root, workspaceId, parsed) {
     return 0;
 }
 /* ----------------------------------------------------------- the reminder */
-const REMIND_EVERY_MS = 5 * 60_000;
 /**
  * One line after a command when a workspace thread has unread messages. Only
  * at a terminal, at most every five minutes, never slower than 1.5 s, and
@@ -78,19 +78,9 @@ const REMIND_EVERY_MS = 5 * 60_000;
  * a script.
  */
 async function unreadReminder(command, parsed) {
-    if (!process.stdout.isTTY || process.env.CODEROOK_NO_REMINDERS)
+    if (!(await (0, reminder_gate_js_1.reminderDue)(command)))
         return;
-    if (["workspace", "sign-in", "sign-out", "help", "mcp"].includes(command))
-        return;
-    const stamp = node_path_1.default.join((0, config_js_1.configDirectory)(), "discussions-checked");
-    try {
-        const last = Number((await (0, promises_1.readFile)(stamp, "utf8")).trim());
-        if (Date.now() - last < REMIND_EVERY_MS)
-            return;
-    }
-    catch {
-        /* Never checked on this machine. */
-    }
+    const stamp = (0, reminder_gate_js_1.reminderStamp)();
     try {
         await (0, promises_1.mkdir)(node_path_1.default.dirname(stamp), { recursive: true });
         await (0, promises_1.writeFile)(stamp, String(Date.now()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderook/cli",
-  "version": "0.45.0",
+  "version": "0.46.1",
   "description": "The command line for CodeRook (coderook.com): version control and project hosting for projects of any size. Every save is a compressed snapshot, private or public, never used to train AI.",
   "license": "Apache-2.0",
   "homepage": "https://coderook.com",
@@ -23,12 +23,13 @@
     "node": ">=22.15.0"
   },
   "bin": {
-    "cbx": "dist/cli/src/cli.js",
-    "coderook": "dist/cli/src/cli.js",
+    "cbx": "dist/cli/src/bin.js",
+    "coderook": "dist/cli/src/bin.js",
     "git-remote-coderook": "dist/cli/src/git_remote_bin.js"
   },
   "files": [
-    ".claude-plugin",
+    ".claude-plugin",
+    "engine-bin",
     "dist",
     "skills",
     "NOTICE"