@coderook/cli 0.2.0 → 0.3.0

package/dist/cli/src/api.js

@@ -4,6 +4,11 @@ exports.whoami = whoami;
 exports.projects = projects;
 exports.findProject = findProject;
 exports.health = health;
+exports.mergeTracks = mergeTracks;
+exports.mergeTrack = mergeTrack;
+exports.resolveMergeConflict = resolveMergeConflict;
+exports.applyMerge = applyMerge;
+exports.cancelMerge = cancelMerge;
 /** The small part of the API the command-line tool needs directly. */
 const config_js_1 = require("./config.js");
 async function call(route, options = {}) {
@@ -65,3 +70,22 @@ async function health() {
     });
     return (await response.json());
 }
+async function mergeTracks(repositoryId) {
+    const body = await call(`/v1/repositories/${repositoryId}/merge-tracks`);
+    return body.mergeTracks;
+}
+async function mergeTrack(id) {
+    return call(`/v1/merge-tracks/${id}`);
+}
+async function resolveMergeConflict(mergeTrackId, conflictId, resolution) {
+    await call(`/v1/merge-tracks/${mergeTrackId}/conflicts/${conflictId}`, {
+        method: "PUT",
+        body: { resolution },
+    });
+}
+async function applyMerge(mergeTrackId) {
+    return call(`/v1/merge-tracks/${mergeTrackId}/apply`, { method: "POST" });
+}
+async function cancelMerge(mergeTrackId) {
+    await call(`/v1/merge-tracks/${mergeTrackId}/cancel`, { method: "POST" });
+}

package/dist/cli/src/cli.js

@@ -18,11 +18,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("node:readline/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = __importDefault(require("node:process"));
+const api_js_1 = require("./api.js");
 const worktree_js_1 = require("../../desktop-app/src/main/worktree.js");
 const upload_js_1 = require("../../desktop-app/src/main/upload.js");
 const download_js_1 = require("../../desktop-app/src/main/download.js");
 const cbx_js_1 = require("../../desktop-app/src/main/cbx.js");
-const api_js_1 = require("./api.js");
+const api_js_2 = require("./api.js");
 const config_js_1 = require("./config.js");
 /*
   Read from the package rather than written twice. A hardcoded copy had
@@ -122,8 +123,8 @@ async function reconcile(folder, options = {}) {
     const link = await (0, config_js_1.readLink)(folder);
     const reference = link?.slug ?? node_path_1.default.basename(folder);
     const project = link
-        ? (await (0, api_js_1.projects)()).find((candidate) => candidate.id === link.repositoryId)
-        : await (0, api_js_1.findProject)(reference);
+        ? (await (0, api_js_2.projects)()).find((candidate) => candidate.id === link.repositoryId)
+        : await (0, api_js_2.findProject)(reference);
     if (!project?.versionCount) {
         // Nothing saved on the account, so everything here is outstanding.
         return { link: link ?? null, baseline: null, behind: null };
@@ -184,7 +185,7 @@ async function commandSignIn(parsed) {
     }
     await (0, config_js_1.storeToken)(token);
     try {
-        const account = await (0, api_js_1.whoami)();
+        const account = await (0, api_js_2.whoami)();
         console.log(`Signed in as ${bold(account.displayName)} ${dim(`<${account.email}>`)} · ${account.plan}`);
         console.log(dim(`Token stored in ${(0, config_js_1.configDirectory)()}`));
         return 0;
@@ -201,12 +202,12 @@ async function commandSignOut() {
     return 0;
 }
 async function commandWhoami() {
-    const account = await (0, api_js_1.whoami)();
+    const account = await (0, api_js_2.whoami)();
     console.log(`${bold(account.displayName)} <${account.email}> · ${account.plan}`);
     return 0;
 }
 async function commandProjects() {
-    const all = await (0, api_js_1.projects)();
+    const all = await (0, api_js_2.projects)();
     if (!all.length) {
         console.log("No projects on this account yet.");
         return 0;
@@ -320,6 +321,23 @@ async function commandSubmit(parsed) {
         throw error;
     }
     done(line);
+    if (result.mergeTrack) {
+        /*
+          The upload is complete and kept, but the project has not changed —
+          calling this "saved" would be false, and the base is deliberately left
+          alone so the folder still knows what it was working from.
+        */
+        console.log(`\nSomebody else saved first, and ${result.mergeTrack.conflicts.length === 1
+            ? "one file overlaps"
+            : `${result.mergeTrack.conflicts.length} files overlap`}.`);
+        console.log(`Your work is complete and kept as ${accent(result.mergeTrack.reference)}:`);
+        for (const conflict of result.mergeTrack.conflicts.slice(0, 20)) {
+            console.log(`  ${red(conflict.path)}  ${dim(conflict.kind)}`);
+        }
+        console.log(`\nRun ${accent(`coderook merge ${result.mergeTrack.reference}`)} to decide,` +
+            ` or ${accent("coderook merges")} to see everything waiting.`);
+        return 0;
+    }
     await (0, config_js_1.writeLink)(folder, {
         repositoryId: result.repositoryId,
         slug: link?.slug ?? node_path_1.default.basename(folder),
@@ -349,7 +367,7 @@ async function commandClone(parsed) {
         console.error(red("Which project? Try: coderook clone <project>"));
         return 1;
     }
-    const project = await (0, api_js_1.findProject)(reference);
+    const project = await (0, api_js_2.findProject)(reference);
     if (!project) {
         console.error(red(`No project named ${reference} on this account.`));
         return 1;
@@ -454,7 +472,7 @@ async function commandInspect(parsed) {
     return 0;
 }
 async function commandDoctor() {
-    const service = await (0, api_js_1.health)().catch(() => null);
+    const service = await (0, api_js_2.health)().catch(() => null);
     console.log(`CodeRook CLI ${VERSION} · Node ${node_process_1.default.versions.node} · ${node_process_1.default.platform}`);
     console.log(`Config: ${(0, config_js_1.configDirectory)()}`);
     console.log(service
@@ -467,7 +485,7 @@ async function commandDoctor() {
         return 0;
     }
     try {
-        const account = await (0, api_js_1.whoami)();
+        const account = await (0, api_js_2.whoami)();
         console.log(`Account: ${account.email} · ${account.plan}`);
     }
     catch (error) {
@@ -489,6 +507,10 @@ ${bold("Working with a folder")}
   coderook clone <project> [dir]   Fetch a project into a new folder
   coderook rules [folder]          Show the ignore rules  (--init to start one)
 
+${bold("When somebody saved first")}
+  coderook merges                  Uploads of yours waiting on a decision
+  coderook merge <ref>             Look at one  (--mine --theirs --both --drop)
+
 ${bold("Bundles")}
   coderook bundle [folder] [out]   Pack the project as a .cbx
   coderook unbundle <file> [dir]   Extract a .cbx
@@ -506,6 +528,127 @@ ${bold("Options")}
 
 ${dim("The environment variable CODEROOK_TOKEN is used when set, so automated")}
 ${dim("runs need nothing on disk. CODEROOK_API_URL points at another service.")}`;
+/**
+ * Everything waiting on a decision, for one folder's project.
+ *
+ * A diverted upload is easy to forget about — it is not an error and the
+ * project looks untouched — so this is the way to find out that work of
+ * yours is sitting somewhere, still complete, waiting.
+ */
+async function commandMerges(parsed) {
+    const folder = folderFor(parsed);
+    const link = await (0, config_js_1.readLink)(folder);
+    if (!link) {
+        console.error(red("This folder is not linked to a project on your account."));
+        return 1;
+    }
+    const waiting = (await (0, api_js_1.mergeTracks)(link.repositoryId)).filter((merge) => merge.state === "open");
+    if (!waiting.length) {
+        console.log("Nothing is waiting to be merged.");
+        return 0;
+    }
+    for (const merge of waiting) {
+        const counts = merge.conflicts;
+        console.log(`${accent(merge.reference)}  ${counts ? `${counts.unresolved} of ${counts.total} still to decide` : ""}  ${dim(new Date(merge.createdAt).toLocaleString())}`);
+    }
+    console.log(dim(`
+Run coderook merge <reference> to look at one.`));
+    return 0;
+}
+/** Find a merge by the reference a person would type, such as M-2. */
+async function findMerge(folder, reference) {
+    const link = await (0, config_js_1.readLink)(folder);
+    if (!link)
+        throw new Error("This folder is not linked to a project on your account.");
+    const all = await (0, api_js_1.mergeTracks)(link.repositoryId);
+    const found = all.find((merge) => merge.reference.toLowerCase() === reference.toLowerCase());
+    if (!found)
+        throw new Error(`No merge called ${reference} on this project.`);
+    return found;
+}
+/**
+ * Look at one merge, and optionally finish it.
+ *
+ * Deciding happens here rather than in a command of its own because the
+ * decision only means anything next to the thing it is about.
+ */
+async function commandMerge(parsed) {
+    const reference = parsed.positional[0];
+    if (!reference) {
+        console.error(red("Which merge? Try: coderook merge M-1"));
+        return 1;
+    }
+    const folder = folderFor({ ...parsed, positional: parsed.positional.slice(1) });
+    const summary = await findMerge(folder, reference);
+    const detail = await (0, api_js_1.mergeTrack)(summary.id);
+    if (hasFlag(parsed, "cancel")) {
+        await (0, api_js_1.cancelMerge)(summary.id);
+        console.log(`${summary.reference} cancelled. Your upload is still stored and nothing published was touched.`);
+        return 0;
+    }
+    const outstanding = detail.conflicts.filter((conflict) => !conflict.resolvedAt);
+    const decision = hasFlag(parsed, "mine")
+        ? "take_candidate"
+        : hasFlag(parsed, "theirs")
+            ? "take_target"
+            : hasFlag(parsed, "drop")
+                ? "delete"
+                : hasFlag(parsed, "both", "keep-both")
+                    ? "keep_both"
+                    : null;
+    if (decision) {
+        const only = flagText(parsed, "path");
+        const chosen = only
+            ? outstanding.filter((conflict) => conflict.path === only)
+            : outstanding;
+        if (!chosen.length) {
+            console.error(red(only ? `${only} has no outstanding decision.` : "Nothing left to decide."));
+            return 1;
+        }
+        for (const conflict of chosen) {
+            await (0, api_js_1.resolveMergeConflict)(summary.id, conflict.id, decision);
+            console.log(`  ${conflict.path} → ${decision === "take_candidate"
+                ? "yours"
+                : decision === "take_target"
+                    ? "theirs"
+                    : decision === "keep_both"
+                        ? `both, yours saved beside it`
+                        : "removed"}`);
+        }
+    }
+    const now = await (0, api_js_1.mergeTrack)(summary.id);
+    console.log(`
+${accent(now.mergeTrack.reference)} · ${now.provisional.fileCount} files · ` +
+        (now.provisional.ready
+            ? "ready to apply"
+            : `${now.provisional.unresolvedPaths.length} still to decide`));
+    for (const conflict of now.conflicts) {
+        console.log(`  ${conflict.resolvedAt ? accent("decided") : red("waiting")}  ${conflict.path}` +
+            `  ${dim(conflict.kind)}${conflict.resolution ? dim(` (${conflict.resolution})`) : ""}`);
+    }
+    if (hasFlag(parsed, "apply")) {
+        if (!now.provisional.ready) {
+            console.error(red("\nStill undecided files; nothing was applied."));
+            return 1;
+        }
+        const applied = await (0, api_js_1.applyMerge)(summary.id);
+        console.log(`
+Applied as ${accent(`v${applied.version.sequence}`)}.`);
+        console.log(dim("Run coderook get to bring it down to this folder."));
+        return 0;
+    }
+    if (!decision) {
+        console.log(dim(`
+--mine keeps yours, --theirs keeps what was already saved,` +
+            ` --drop removes the file.
+Add --path <file> for one file, then --apply when ready.`));
+    }
+    else if (now.provisional.ready) {
+        console.log(dim(`
+Run coderook merge ${now.mergeTrack.reference} --apply to publish it.`));
+    }
+    return 0;
+}
 const COMMANDS = {
     "sign-in": commandSignIn,
     login: commandSignIn,
@@ -522,6 +665,8 @@ const COMMANDS = {
     bundle: commandBundle,
     unbundle: commandUnbundle,
     inspect: commandInspect,
+    merges: commandMerges,
+    merge: commandMerge,
     doctor: () => commandDoctor(),
 };
 async function main(argv) {

package/dist/desktop-app/src/main/upload.js

@@ -326,6 +326,7 @@ class Uploader {
             repositoryId,
             versionId: completed.version.id,
             sequence: completed.version.sequence,
+            ...(completed.mergeTrack ? { mergeTrack: completed.mergeTrack } : {}),
             sourceBytes,
             storedBytes,
             sentBytes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderook/cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CodeRook from the command line, on any operating system",
   "license": "SEE LICENSE IN LICENSE.txt",
   "homepage": "https://coderook.com",