@coderook/cli 0.31.4 → 0.31.5

package/.claude-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "coderook",
   "displayName": "CodeRook",
   "description": "Save, browse and restore whole-snapshot versions of a project on CodeRook, from Claude Code.",
-  "version": "0.31.4",
+  "version": "0.31.5",
   "author": {
     "name": "ACCA Gaming Productions",
     "url": "https://coderook.com"

package/dist/cli/src/api.js

@@ -10,6 +10,8 @@ exports.projects = projects;
 exports.findPublicProject = findPublicProject;
 exports.findProject = findProject;
 exports.health = health;
+exports.openProposal = openProposal;
+exports.proposals = proposals;
 exports.mergeTracks = mergeTracks;
 exports.mergeTrack = mergeTrack;
 exports.resolveMergeConflict = resolveMergeConflict;
@@ -265,6 +267,17 @@ async function health() {
     });
     return (await response.json());
 }
+/** Offer a line of work to another, usually main. */
+async function openProposal(repositoryId, input) {
+    return call(`/v1/repositories/${repositoryId}/proposals`, {
+        method: "POST",
+        body: input,
+    });
+}
+async function proposals(repositoryId, all = false) {
+    const body = await call(`/v1/repositories/${repositoryId}/proposals${all ? "?state=all" : ""}`);
+    return body.proposals;
+}
 async function mergeTracks(repositoryId) {
     const body = await call(`/v1/repositories/${repositoryId}/merge-tracks`);
     return body.mergeTracks;

package/dist/cli/src/cli.js

@@ -1026,6 +1026,17 @@ The connection failed: ${text}`));
         observedHeadVersionId: result.versionId,
         local: result.local,
         manifest: result.manifest,
+        /*
+          The line this folder is on survives a save onto it.
+    
+          The same fault `get` had and lost: this record is built fresh, and
+          without naming `track` every save onto a line moved the folder back to
+          main — so the second save on a line went to main, and `cbx propose`
+          found the folder "on main" straight after `cbx track spike --new` and a
+          save. A one-off `--track` does not move it either: that flag means
+          "just this once", so the folder keeps the line it had.
+        */
+        ...(link?.track ? { track: link.track } : {}),
     });
     /*
       What this save hashed, kept for the next one.
@@ -1547,6 +1558,69 @@ async function commandDoctor() {
  * project looks untouched — so this is the way to find out that work of
  * yours is sitting somewhere, still complete, waiting.
  */
+/**
+ * Offer this folder's line of work to another line, usually main.
+ *
+ * The folder's line is the one proposed, because it is the one being worked
+ * on; proposing main is refused rather than guessed at, since the answer to
+ * "propose what?" is then a line nobody named.
+ */
+async function commandPropose(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 from = flagText(parsed, "from") ?? (await (0, track_commands_js_1.trackFor)(folder));
+    const into = flagText(parsed, "into") ?? "main";
+    if (from === into) {
+        console.error(red(`This folder is on ${from}. Start a line with cbx track <name> --new, save onto it, then propose it.`));
+        return 1;
+    }
+    const title = flagText(parsed, "message", "m", "title");
+    if (!title) {
+        console.error(red('Give it a title: cbx propose -m "What this changes"'));
+        return 1;
+    }
+    const opened = await (0, api_js_1.openProposal)(link.repositoryId, {
+        from,
+        into,
+        title,
+        ...(flagText(parsed, "body") ? { body: flagText(parsed, "body") } : {}),
+    });
+    const reference = opened.mergeTrack.reference;
+    console.log(`${accent(reference)}  ${from} → ${into}  ${title}`);
+    if (opened.conflicts.settled) {
+        console.log(dim(`  ${opened.conflicts.settled} file(s) both sides changed were combined line by line.`));
+    }
+    console.log(opened.conflicts.unresolved
+        ? `  ${opened.conflicts.unresolved} file(s) need a decision. Run cbx merge ${reference} to look.`
+        : dim(`  Nothing to decide. Run cbx merge ${reference} --apply when it has been reviewed.`));
+    return 0;
+}
+async function commandProposals(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 listed = await (0, api_js_1.proposals)(link.repositoryId, hasFlag(parsed, "all"));
+    if (!listed.length) {
+        console.log(hasFlag(parsed, "all") ? "No proposals yet." : "No open proposals.");
+        return 0;
+    }
+    for (const proposal of listed) {
+        const counts = proposal.conflicts;
+        const waiting = counts && counts.unresolved ? red(`${counts.unresolved} to decide`) : "";
+        console.log(`${accent(proposal.reference)}  ${proposal.proposal?.from ?? "?"} → ${proposal.proposal?.into ?? "?"}  ` +
+            `${proposal.proposal?.title ?? ""}  ${waiting}` +
+            (proposal.state === "open" ? "" : dim(`  ${proposal.state}`)));
+    }
+    console.log(dim("\nRun cbx merge <reference> to look at one."));
+    return 0;
+}
 async function commandMerges(parsed) {
     const folder = folderFor(parsed);
     const link = await (0, config_js_1.readLink)(folder);
@@ -1629,6 +1703,18 @@ async function commandMerge(parsed) {
         }
     }
     const now = await (0, api_js_1.mergeTrack)(summary.id);
+    if (now.proposal) {
+        console.log(`\n${accent(now.mergeTrack.reference)}  ${now.proposal.from} → ${now.proposal.into}` +
+            (now.changeRequest ? `  ${now.changeRequest.title}` : ""));
+        const approvals = now.changeRequest?.approvals;
+        if (approvals && approvals.required) {
+            console.log(`  ${approvals.satisfied ? accent("approved") : red("waiting for review")}` +
+                dim(` · ${approvals.approvals} of ${approvals.required} approvals`));
+        }
+        for (const blocked of now.provisional.blockedByChecks ?? []) {
+            console.log(`  ${red("check")}  ${blocked}`);
+        }
+    }
     console.log(`
 ${accent(now.mergeTrack.reference)} · ${now.provisional.fileCount} files · ` +
         (now.provisional.ready
@@ -1646,10 +1732,14 @@ ${accent(now.mergeTrack.reference)} · ${now.provisional.fileCount} files · ` +
         const applied = await (0, api_js_1.applyMerge)(summary.id);
         console.log(`
 Applied as ${accent(`v${applied.version.sequence}`)}.`);
+        if (applied.closedIssues?.length) {
+            console.log(`Closed ${applied.closedIssues.map((number) => `#${number}`).join(", ")}.`);
+        }
         console.log(dim("Run cbx get to bring it down to this folder."));
         return 0;
     }
-    if (!decision) {
+    const stillOpen = now.conflicts.some((conflict) => !conflict.resolvedAt);
+    if (!decision && stillOpen) {
         console.log(dim(`
 --mine keeps yours, --theirs keeps what was already saved,` +
             ` --drop removes the file.
@@ -2197,7 +2287,7 @@ const SPECS = [
         detail: "A signed POST to an address of yours when something happens here.\n" +
             "The signing secret is generated by the service and shown once, when\n" +
             "the hook is added — no route hands it back afterwards.\n\n" +
-            "Events: version.published, merge.opened, merge.applied,\n" +
+            "Events: version.published, merge.opened, merge.applied, merge.cancelled,\n" +
             "check.reported, change_request.opened, change_request.reviewed.\n" +
             "Naming none of them sends all of them.",
         options: [
@@ -2552,6 +2642,31 @@ const SPECS = [
         options: [{ flags: "--revoke <id>", description: "stop one working now" }],
         run: service_commands_js_1.commandTokens,
     },
+    {
+        name: "propose",
+        group: "Working with a folder",
+        summary: "offer this folder's line to main",
+        usage: 'propose -m "title" [--into main] [--body text] [folder]',
+        options: [
+            { flags: "-m, --message <text>", description: "the proposal's title" },
+            { flags: "--into <line>", description: "the line to propose into (default main)" },
+            { flags: "--from <line>", description: "propose this line instead of the folder's" },
+            { flags: "--body <text>", description: "a longer description" },
+        ],
+        detail: "Opens a proposal from the line this folder is on into main (or --into).\n" +
+            "Files both sides changed are combined line by line where they can be;\n" +
+            "the rest wait for a decision in cbx merge. \"Fixes #12\" in the title or\n" +
+            "body closes issue 12 when the proposal lands.",
+        run: commandPropose,
+    },
+    {
+        name: "proposals",
+        group: "Working with a folder",
+        summary: "open proposals on this project",
+        usage: "proposals [--all] [folder]",
+        options: [{ flags: "--all", description: "include merged and cancelled ones" }],
+        run: commandProposals,
+    },
     {
         name: "merges",
         group: "When somebody saved first",

package/package.json

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