@coderook/cli 0.31.12 → 0.32.0

package/dist/cli/src/cli.js

@@ -27,26 +27,28 @@ const help_js_1 = require("./help.js");
 const progress_js_1 = require("./progress.js");
 const publish_js_1 = require("./publish.js");
 const attach_command_js_1 = require("./attach_command.js");
+const pages_command_js_1 = require("./pages_command.js");
 const project_commands_js_1 = require("./project_commands.js");
 const track_commands_js_1 = require("./track_commands.js");
-const tracks_js_1 = require("../../desktop-app/src/main/tracks.js");
+const tracks_js_1 = require("../../cbx/src/core/tracks.js");
 const transfer_command_js_1 = require("./transfer_command.js");
 const mcp_js_1 = require("./mcp.js");
 const skill_command_js_1 = require("./skill_command.js");
 const licence_commands_js_1 = require("./licence_commands.js");
 const service_commands_js_1 = require("./service_commands.js");
-const worktree_js_1 = require("../../desktop-app/src/main/worktree.js");
-const rules_js_1 = require("../../desktop-app/src/main/rules.js");
-const upload_js_1 = require("../../desktop-app/src/main/upload.js");
-const download_js_1 = require("../../desktop-app/src/main/download.js");
-const safe_path_js_1 = require("../../desktop-app/src/shared/safe_path.js");
-const faults_js_1 = require("../../desktop-app/src/main/faults.js");
+const worktree_js_1 = require("../../cbx/src/core/worktree.js");
+const rules_js_1 = require("../../cbx/src/core/rules.js");
+const upload_js_1 = require("../../cbx/src/core/upload.js");
+const download_js_1 = require("../../cbx/src/core/download.js");
+const safe_path_js_1 = require("../../cbx/src/shared/safe_path.js");
+const faults_js_1 = require("../../cbx/src/core/faults.js");
 const version_commands_js_1 = require("./version_commands.js");
-const identify_js_1 = require("../../desktop-app/src/main/identify.js");
+const identify_js_1 = require("../../cbx/src/core/identify.js");
 const diff_command_js_1 = require("./diff_command.js");
-const profile_js_1 = require("../../desktop-app/src/main/profile.js");
-const detect_js_1 = require("../../desktop-app/src/main/detect.js");
-const cbx_js_1 = require("../../desktop-app/src/main/cbx.js");
+const local_commands_js_1 = require("./local_commands.js");
+const profile_js_1 = require("../../cbx/src/core/profile.js");
+const detect_js_1 = require("../../cbx/src/core/detect.js");
+const cbx_js_1 = require("../../cbx/src/core/cbx.js");
 const api_js_2 = require("./api.js");
 const import_command_js_1 = require("./import_command.js");
 const runner_js_1 = require("./runner.js");
@@ -153,7 +155,12 @@ function parse(argv, spec) {
           their options rely on it, and narrowing that here would trade one
           quiet misreading for another.
         */
-        const wants = takesValue.size ? takesValue.has(name) : true;
+        /*
+          A command that declares any options has declared them all, including
+          when none of them takes a value. Keying this on the value-taking ones
+          alone let `cbx switch -c spike` read "spike" as the value of `-c`.
+        */
+        const wants = spec?.options?.length ? takesValue.has(name) : true;
         if (wants && next !== undefined && !next.startsWith("-")) {
             flags.set(name, next);
             at += 1;
@@ -1960,12 +1967,14 @@ const SPECS = [
         summary: "what is here that is not saved yet",
         usage: "status [folder]",
         detail: "Compares the folder against the last version you sent and lists what\n" +
-            "changed. Says nothing about other people's work — use `merges` for that.",
-        run: commandStatus,
+            "changed. Says nothing about other people's work — use `merges` for that.\n\n" +
+            "In a folder with a history of its own (see `cbx init`), compares\n" +
+            "against the last local save instead.",
+        run: (0, local_commands_js_1.localFirst)(local_commands_js_1.localStatus, commandStatus, (parsed) => folderFor(parsed)),
     },
     {
         name: "submit",
-        aliases: ["publish", "push"],
+        aliases: ["publish"],
         group: "Working with a folder",
         summary: "send the changes as a new save",
         usage: 'submit [folder] -m "…"',
@@ -2016,7 +2025,9 @@ const SPECS = [
             "compares two saved versions — which the service answers from its own\n" +
             "stored trees, so an untouched corner of a large project costs nothing.\n\n" +
             "A version can be given as a number, as v12, or by the name it was\n" +
-            "released under.",
+            "released under.\n\n" +
+            "In a folder with a history of its own (see `cbx init`), the same\n" +
+            "positions name local saves: a line, a line~N, or the start of an id.",
         options: [
             { flags: "--name-only", description: "list the files and not their lines" },
             { flags: "--path <text>", description: "only paths containing this" },
@@ -2026,8 +2037,94 @@ const SPECS = [
             },
             { flags: "--project <name>", description: "which project" },
         ],
-        examples: ["cbx diff", "cbx diff 12", "cbx diff 11 12 --name-only"],
-        run: diff_command_js_1.commandDiff,
+        examples: ["cbx diff", "cbx diff 12", "cbx diff 11 12 --name-only", "cbx diff main~1 main"],
+        run: (0, local_commands_js_1.localFirst)(local_commands_js_1.localDiff, diff_command_js_1.commandDiff),
+    },
+    {
+        name: "init",
+        group: "History on this machine",
+        summary: "start a history in this folder, kept on this machine",
+        usage: "init [folder]",
+        detail: "Makes a .cbx/ folder holding the project's history, so you can save,\n" +
+            "compare and go back with no connection at all. Nothing in it is sent\n" +
+            "anywhere by itself.\n\n" +
+            "Once a folder has one, `status`, `diff`, `log` and `switch` answer from\n" +
+            "it. `submit` still sends the folder to CodeRook as it always has.",
+        options: [{ flags: "--line <name>", description: "what to call the first line (default main)" }],
+        examples: ["cbx init", "cbx init my-game --line dev"],
+        run: local_commands_js_1.commandInit,
+    },
+    {
+        name: "save",
+        group: "History on this machine",
+        summary: "record the folder as it is now, on this machine",
+        usage: 'save -m "…"',
+        detail: "Records every file the ignore rules let through, on the line the\n" +
+            "folder is on. Only files that changed are read again, and a large file\n" +
+            "is split so an edit stores the pieces around it rather than all of it.\n\n" +
+            "A save identical to the last one is not made.",
+        options: [
+            { flags: "-m, --message <text>", description: "what changed" },
+            { flags: "--author <name>", description: "who to record, instead of the configured name" },
+            { flags: "-f, --force", description: "finish a merge even though conflict markers remain" },
+        ],
+        examples: ['cbx save -m "Tune the jump height"'],
+        run: local_commands_js_1.commandSave,
+    },
+    {
+        name: "log",
+        group: "History on this machine",
+        summary: "the saves on this line, newest first",
+        usage: "log [from]",
+        detail: "In a folder with a history of its own, lists its saves along the line,\n" +
+            "newest first. Start somewhere else by naming a line or a save.\n\n" +
+            "Anywhere else, lists what has been saved to the project on CodeRook,\n" +
+            "as `cbx versions` does.",
+        options: [
+            { flags: "--limit <n>", description: "how many to show (default 20)" },
+            { flags: "--versions", description: "on CodeRook: only the ones that were named" },
+            { flags: "--commits", description: "on CodeRook: only the ones that were not" },
+            { flags: "--notes", description: "on CodeRook: print what each one says about itself" },
+        ],
+        examples: ["cbx log", "cbx log feature --limit 5"],
+        run: (0, local_commands_js_1.localFirst)(local_commands_js_1.localLog, project_commands_js_1.commandVersions),
+    },
+    {
+        name: "restore",
+        group: "History on this machine",
+        summary: "put files back the way a save had them",
+        usage: "restore [paths…] [--from <save>]",
+        detail: "With no paths, makes the whole folder match the save; with paths,\n" +
+            "only those files and folders. The default is the last save, which\n" +
+            "throws away what you changed since.\n\n" +
+            "Unsaved changes to a file it would overwrite stop it, and it lists\n" +
+            "them. Add --force to discard them. Files the history has never held\n" +
+            "are left alone either way, and your line does not move.",
+        options: [
+            { flags: "--from <save>", description: "a line, line~N, or the start of a save id" },
+            { flags: "-f, --force", description: "overwrite unsaved changes" },
+        ],
+        examples: ["cbx restore src/player.ts --force", "cbx restore --from main~3"],
+        run: local_commands_js_1.commandRestore,
+    },
+    {
+        name: "switch",
+        group: "History on this machine",
+        summary: "move this folder to another line of work",
+        usage: "switch [line]",
+        detail: "In a folder with a history of its own, rewrites only the files the two\n" +
+            "lines disagree about; unsaved edits elsewhere come along. Unsaved\n" +
+            "edits to a file it would change stop it. -c starts a new line from the\n" +
+            "current save without changing any files. With no line, lists them.\n\n" +
+            "Anywhere else, changes the CodeRook line this folder saves to, as\n" +
+            "`cbx track` does.",
+        options: [
+            { flags: "-c, --create", description: "start a new line here" },
+            { flags: "-f, --force", description: "discard unsaved changes that are in the way" },
+            { flags: "-n, --new", description: "on CodeRook: start this line from where the project is now" },
+        ],
+        examples: ["cbx switch", "cbx switch -c spike", "cbx switch main"],
+        run: (0, local_commands_js_1.localFirst)(local_commands_js_1.localSwitch, track_commands_js_1.commandTrack),
     },
     {
         name: "unlink",
@@ -2119,7 +2216,7 @@ const SPECS = [
           different lines, which is most of the point of having them.
         */
         name: "track",
-        aliases: ["switch", "checkout"],
+        aliases: ["checkout"],
         group: "Working with a folder",
         summary: "show or change the line this folder saves to",
         usage: "track [name]",
@@ -2153,7 +2250,6 @@ const SPECS = [
     },
     {
         name: "get",
-        aliases: ["pull"],
         group: "Working with a folder",
         summary: "bring this folder up to date",
         usage: "get [folder]",
@@ -2250,7 +2346,6 @@ const SPECS = [
     },
     {
         name: "versions",
-        aliases: ["log"],
         group: "Your projects",
         summary: "what has been saved to a project",
         usage: "versions [project]",
@@ -2323,6 +2418,39 @@ const SPECS = [
         ],
         run: project_commands_js_1.commandVisibility,
     },
+    {
+        name: "pages",
+        group: "Your projects",
+        summary: "serve a public project as a website",
+        usage: "pages [auto|on|off] [project]",
+        detail: "With no word, says whether the project's site is on, its address, which\n" +
+            "version it serves, from which folder, and anything stopping it.\n\n" +
+            "auto finds the build in the newest published version — a Unity WebGL\n" +
+            "build, a Godot web export, a Vite or React build, or plain HTML — and\n" +
+            "turns the site on with it. When nothing published looks like a site and\n" +
+            "you are in the project's folder, it looks here instead: a build left out\n" +
+            "by the ignore rules is named, with the .gitignore line that keeps it in.\n" +
+            "It never saves or publishes for you.\n\n" +
+            "on and auto ask first, because the site runs the project's code in\n" +
+            "anybody's browser under its name. Only published versions are served,\n" +
+            "the project must be public, and only its owner can change the site.\n" +
+            "off asks nothing.",
+        options: [
+            { flags: "--folder <path>", description: "on: where index.html is; . for the top" },
+            { flags: "--spa", description: "on: unknown paths serve index.html (--no-spa undoes)" },
+            { flags: "--isolate", description: "on: cross-origin isolation, for Godot 4 threads (--no-isolate)" },
+            { flags: "--version <n|id>", description: "on: serve this version rather than the newest published" },
+            { flags: "-y, --yes", description: "turn it on, or change .gitignore, without asking" },
+        ],
+        examples: [
+            "cbx pages",
+            "cbx pages auto",
+            "cbx pages on my-game --folder Build/WebGL --isolate",
+            "cbx pages on --version 12 --yes",
+            "cbx pages off",
+        ],
+        run: pages_command_js_1.commandPages,
+    },
     {
         name: "issues",
         group: "Your projects",
@@ -2766,7 +2894,15 @@ const SPECS = [
         group: "When somebody saved first",
         summary: "look at one, and decide",
         usage: "merge <ref>",
+        detail: "In a folder with a history of its own, merges a line or a save into\n" +
+            "this one. What only one side changed is taken; a text file both\n" +
+            "changed is merged line by line; only what is left is a conflict,\n" +
+            "marked in the file. Fix them and save, or take a side whole with\n" +
+            "--mine or --theirs, or call it off with --cancel.\n\n" +
+            "Anywhere else, decides a merge waiting on CodeRook.",
         options: [
+            { flags: "-m, --message <text>", description: "what the merge save says" },
+            { flags: "--abort", description: "the same as --cancel" },
             { flags: "--mine", description: "keep your side" },
             { flags: "--theirs", description: "keep theirs" },
             { flags: "--both", description: "keep both" },
@@ -2775,7 +2911,7 @@ const SPECS = [
             { flags: "--cancel", description: "call the merge off; your upload stays stored" },
             { flags: "--ask <usernames>", description: "ask people to review it, comma separated" },
         ],
-        run: commandMerge,
+        run: (0, local_commands_js_1.localFirst)(local_commands_js_1.localMerge, commandMerge),
     },
     {
         name: "bundle",
@@ -2888,6 +3024,46 @@ const SPECS = [
         run: () => commandDoctor(),
     },
 ];
+/*
+  `push` and `pull` mean the local history in a folder that has one, and
+  `submit` and `get` everywhere else, which is what they always meant. Built
+  from those two rows so every option they take still parses when the name
+  falls through to them.
+*/
+function localTwin(name, original, local, row, extra) {
+    const spec = SPECS.find((one) => one.name === original);
+    const taken = new Set(extra.map((one) => one.flags));
+    return {
+        name,
+        group: "History on this machine",
+        ...row,
+        options: [...extra, ...(spec.options ?? []).filter((one) => !taken.has(one.flags))],
+        run: (0, local_commands_js_1.localFirst)(local, spec.run),
+    };
+}
+SPECS.push(localTwin("push", "submit", local_commands_js_1.localPush, {
+    summary: "send this line's saves to CodeRook",
+    usage: "push",
+    detail: "In a folder with a history of its own, sends each save on this line that\n" +
+        "CodeRook does not have yet, oldest first, as a save of its own. Only\n" +
+        "what changed in each is sent. The first push creates the project,\n" +
+        "private, unless the folder is already linked to one.\n\n" +
+        "If CodeRook's line has saves this history does not, nothing is sent:\n" +
+        "run `cbx pull` first.\n\n" +
+        "Anywhere else, this is `cbx submit`.",
+    examples: ["cbx push", "cbx push --allow-secrets"],
+}, [{ flags: "-y, --yes", description: "go ahead past the checks that ask first" }]), localTwin("pull", "get", local_commands_js_1.localPull, {
+    summary: "bring CodeRook's saves on this line into this history",
+    usage: "pull [project]",
+    detail: "In a folder with a history of its own, fetches the saves CodeRook has on\n" +
+        "this line and this history does not, and moves the folder to the newest.\n" +
+        "Only files that differ are fetched and rewritten; an unsaved edit to\n" +
+        "one of them stops it. Name a project to pull from it the first time.\n\n" +
+        "If this history has saves CodeRook does not, CodeRook's are fetched\n" +
+        "but the folder stays put: merging a local history is not built yet.\n\n" +
+        "Anywhere else, this is `cbx get`.",
+    examples: ["cbx pull", "cbx pull my-project"],
+}, [{ flags: "-f, --force", description: "discard unsaved changes that are in the way" }]));
 const REGISTRY = (0, registry_js_1.buildRegistry)(SPECS);
 async function main(argv) {
     const [name, ...rest] = argv;

package/dist/cli/src/diff_command.js

@@ -27,8 +27,8 @@ const node_process_1 = __importDefault(require("node:process"));
 const api_js_1 = require("./api.js");
 const config_js_1 = require("./config.js");
 const project_commands_js_1 = require("./project_commands.js");
-const merge_diff_js_1 = require("../../desktop-app/src/shared/merge_diff.js");
-const worktree_js_1 = require("../../desktop-app/src/main/worktree.js");
+const merge_diff_js_1 = require("../../cbx/src/shared/merge_diff.js");
+const worktree_js_1 = require("../../cbx/src/core/worktree.js");
 /*
   Built rather than typed, so the escape character never sits literally in the
   source. The other command files spell theirs out; this reads the same on a

package/dist/cli/src/git_remote.js

@@ -109,15 +109,15 @@ exports.main = main;
  * where the original branched.
  */
 const node_child_process_1 = require("node:child_process");
-const safe_path_js_1 = require("../../desktop-app/src/shared/safe_path.js");
+const safe_path_js_1 = require("../../cbx/src/shared/safe_path.js");
 const promises_1 = require("node:fs/promises");
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = __importDefault(require("node:process"));
-const upload_js_1 = require("../../desktop-app/src/main/upload.js");
+const upload_js_1 = require("../../cbx/src/core/upload.js");
 const stored_zip_js_1 = require("./stored_zip.js");
-const tracks_js_1 = require("../../desktop-app/src/main/tracks.js");
-const identify_js_1 = require("../../desktop-app/src/main/identify.js");
+const tracks_js_1 = require("../../cbx/src/core/tracks.js");
+const identify_js_1 = require("../../cbx/src/core/identify.js");
 const config_js_1 = require("./config.js");
 const version_js_1 = require("./version.js");
 const publish_js_1 = require("./publish.js");
@@ -673,7 +673,7 @@ depth = null) {
             ? ` (${chosen.length - fresh.length} already here)`
             : "") +
         ".");
-    const { Downloader } = await Promise.resolve().then(() => __importStar(require("../../desktop-app/src/main/download.js")));
+    const { Downloader } = await Promise.resolve().then(() => __importStar(require("../../cbx/src/core/download.js")));
     const downloader = new Downloader(config_js_1.credentials);
     const scratch = await (0, promises_1.mkdtemp)(node_path_1.default.join(node_os_1.default.tmpdir(), "coderook-fetch-"));
     try {
@@ -1262,7 +1262,7 @@ async function doPush(requests, url) {
                             throw error;
                     }
                 }
-                const { Downloader } = await Promise.resolve().then(() => __importStar(require("../../desktop-app/src/main/download.js")));
+                const { Downloader } = await Promise.resolve().then(() => __importStar(require("../../cbx/src/core/download.js")));
                 const held = await new Downloader(config_js_1.credentials).files(repositoryId, baseVersionId);
                 manifest = Object.fromEntries(held.map((file) => [file.path, file.sha256]));
                 local = { ...manifest };

package/dist/cli/src/licence_commands.js

@@ -21,10 +21,10 @@ exports.commandLicence = commandLicence;
 exports.commandIgnoreTemplate = commandIgnoreTemplate;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
-const licences_js_1 = require("../../desktop-app/src/main/licences.js");
+const licences_js_1 = require("../../cbx/src/core/licences.js");
 Object.defineProperty(exports, "licenceNewProject", { enumerable: true, get: function () { return licences_js_1.licenceNewProject; } });
-const ignore_templates_js_1 = require("../../desktop-app/src/main/ignore_templates.js");
-const worktree_js_1 = require("../../desktop-app/src/main/worktree.js");
+const ignore_templates_js_1 = require("../../cbx/src/core/ignore_templates.js");
+const worktree_js_1 = require("../../cbx/src/core/worktree.js");
 const api_js_1 = require("./api.js");
 const dim = (value) => `${value}`;
 const bold = (value) => `${value}`;