@roulabs/mx 2.0.0 → 2.1.1

package/README.md

@@ -30,7 +30,7 @@ mx repo add git@github.com:you/app.git   # clone a pristine repo into the runtim
 mx work new my-feature                   # create a work (prints its folder path)
 mx work -n my-feature worktree add app   # add a worktree on branch my-feature
 mx work -n my-feature port set app web   # allocate a free port (across all works)
-mx status                                # see repos, works, worktrees, ports
+mx info                                # see repos, works, worktrees, ports
 ```
 
 Inside a work folder or worktree you can drop `-n` — mx infers the work/repo from your cwd. Read commands accept `--porcelain` for stable JSON; errors are `{"error","code"}` with a non-zero exit.
@@ -40,7 +40,7 @@ Inside a work folder or worktree you can drop `-n` — mx infers the work/repo f
 | command | does |
 |---|---|
 | `mx init [path]` | scaffold/adopt a runtime (`repos/`, `works/`, `.mx-root`, `mx.json`, `CLAUDE.md`) |
-| `mx status [--all] [--porcelain]` | list repos, works, worktrees, ports |
+| `mx info [--all] [--porcelain]` | list repos, works, worktrees, ports |
 | `mx sync` | re-stamp the runtime's mx-owned files (`CLAUDE.md`, per-repo/per-work scaffolding) from the current CLI — same-major, non-destructive |
 | `mx update` | self-update the CLI within its major (`npm i -g`); flags a newer major if one exists |
 | `mx migrate` | upgrade an older-version runtime to the version this CLI supports (the only command allowed on a version-mismatched runtime) |

package/bin/mx.js

@@ -491,7 +491,12 @@ function repoFetch(root, name) {
   const rp = repoGitDir(root, name);
   if (!isGitRepo(rp)) throw new MxError(`no such repo: ${name}`, "NO_REPO");
   git(["-C", rp, "fetch", "--all", "--prune", "--tags"]);
+  const current = currentBranch(rp);
   gitQuiet(["-C", rp, "merge", "--ff-only", "@{u}"]);
+  const base = originDefaultBranch(rp);
+  if (base && base !== current) {
+    gitQuiet(["-C", rp, "fetch", ".", `refs/remotes/origin/${base}:refs/heads/${base}`]);
+  }
   return { name, branch: currentBranch(rp), remoteBranches: remoteBranchList(rp) };
 }
 function repoInfo(root, name) {
@@ -919,6 +924,7 @@ function statusRuntime(root, opts = {}) {
   const works = opts.onlyArchived ? all.filter((w) => w.isArchived === true) : opts.includeArchived ? all : all.filter((w) => w.isArchived !== true);
   return {
     runtime: root,
+    version: readRuntimeVersion(root),
     context: { entries: countContextEntries(root) },
     repos: listReposInfo(root),
     works,
@@ -1050,7 +1056,7 @@ var HELP = `mx \u2014 control panel for the mx runtime
 
 Global:
   mx init [path]                         scaffold/adopt a runtime (default ~/mx)
-  mx status [--all] [--porcelain]        show runtime, repos, works, ports (active only by default; --all to include archived; aliases: mx s, mx st)
+  mx info [--all] [--porcelain]          show runtime version, repos, works, ports (active only by default; --all to include archived; alias: mx i)
   mx sync                                re-stamp runtime files (CLAUDE.md, scaffolding) from current templates \u2014 same-major, non-breaking
   mx update                              self-update the mx CLI within its major (npm i -g); flags a newer major if one exists
   mx migrate                             upgrade an older-version runtime to the version this CLI supports (the only command allowed on a mismatched runtime)
@@ -1059,7 +1065,9 @@ Global:
 Repos (pristine clones):
   mx repo add <git-url> [--name <n>]     clone a repo into the runtime
   mx repo ls [--porcelain]
-  mx repo -n <name> fetch                git fetch (+ ff current branch)
+  mx repo -n <name> path                 print the repo container path (cd "$(mx repo -n <name> path)")
+  mx repo -n <name> fetch                git fetch (+ ff the checked-out and base branches)
+  mx repo fetch --all                    fetch every repo, one by one
   mx repo -n <name> info [--porcelain]
   mx repo health [--porcelain]           pure-local health summary for every pristine clone
   mx repo -n <name> health [--porcelain] detailed health for one pristine clone
@@ -1070,6 +1078,7 @@ Works (features):
   mx work ls [--all|--archived] [--porcelain]           default: active only; --all includes archived; --archived shows archived only
   mx work -n <name> info [--porcelain]
   mx work -n <name> path                                print the work folder path (cd "$(mx work -n <name> path)")
+  mx work -n <name> open  (or -o)                       open the work's fullscreen Terminal + editor layout (macOS)
   mx work -n <name> describe <text>
   mx work -n <name> worktree add <repo> [--branch <b>] [--base <ref>] [--no-hydrate]   runs the repo's hydrate.sh after add unless --no-hydrate
   mx work -n <name> worktree ls [--porcelain]
@@ -1200,7 +1209,7 @@ function runGlobal(positionals, flags) {
       }, res);
       return;
     }
-    case "status": {
+    case "info": {
       const root = requireRuntime({ runtime: flags.runtime });
       const data = statusRuntime(root, { includeArchived: flags.all });
       emit(() => renderStatus(data), data);
@@ -1264,7 +1273,7 @@ function renderSelfUpdate(info) {
 }
 function renderStatus(data) {
   console.log();
-  console.log(`  ${bold("mx")} ${dim("\xB7")} ${data.runtime}`);
+  console.log(`  ${bold("mx")} ${dim(`v${data.version}`)} ${dim("\xB7")} ${data.runtime}`);
   console.log();
   console.log(`  ${bold("context")}  ${dim(`(${data.context.entries})`)}`);
   console.log();
@@ -1272,21 +1281,19 @@ function renderStatus(data) {
   if (data.repos.length === 0) {
     console.log(`    ${dim("none yet \u2014 `mx repo add <git-url>`")}`);
   } else {
-    const nameW = Math.max(...data.repos.map((r) => r.name.length));
-    const branchW = Math.max(...data.repos.map((r) => r.branch.length));
-    for (const r of data.repos) {
-      const name = r.name.padEnd(nameW);
-      const branch = dim(r.branch.padEnd(branchW));
-      const remote = dim(r.remote ?? "(no remote)");
-      console.log(`    \u2022 ${name}  ${branch}  ${remote}`);
+    for (let i = 0; i < data.repos.length; i++) {
+      if (i > 0) console.log();
+      const r = data.repos[i];
+      console.log(`    \u2022 ${bold(r.name)}`);
+      console.log(`        ${dim(tildify(r.path))}`);
+      console.log(`        ${dim(`${r.branch}  ${r.remote ?? "(no remote)"}`)}`);
     }
   }
   console.log();
   const visibleArchived = data.works.filter((w) => w.isArchived === true);
   const visibleActive = data.works.filter((w) => w.isArchived !== true);
   const hiddenArchived = data.archivedWorksCount - visibleArchived.length;
-  const worksCount = data.archivedWorksCount > 0 ? dim(`(${visibleActive.length} active, ${data.archivedWorksCount} archived${hiddenArchived > 0 ? ` \u2014 pass --all to show` : ""})`) : dim(`(${data.works.length})`);
-  console.log(`  ${bold("works")}  ${worksCount}`);
+  console.log(`  ${bold("works")}`);
   if (data.works.length === 0) {
     const empty = hiddenArchived > 0 ? `${hiddenArchived} archived hidden \u2014 pass --all to show` : "none yet \u2014 `mx work new <name>`";
     console.log(`    ${dim(empty)}`);
@@ -1305,6 +1312,7 @@ function renderStatus(data) {
     const chip = w.isArchived === true ? `  ${dim(`[archived ${(w.archived_at ?? "").slice(0, 10)}]`)}` : "";
     const styledName = w.isArchived === true ? dim(w.name) : bold(w.name);
     console.log(`    \u2022 ${styledName}${chip}`);
+    console.log(`        ${dim(tildify(w.path))}`);
     if (wts.length === 0) {
       console.log(`        ${dim("(no worktrees)")}`);
       continue;
@@ -1344,22 +1352,53 @@ function dispatchRepo(positionals, flags) {
           console.log(dim("no repos yet \u2014 `mx repo add <git-url>`"));
           return;
         }
-        const nameW = Math.max(...repos.map((r) => r.name.length));
-        const branchW = Math.max(...repos.map((r) => r.branch.length));
-        for (const r of repos) {
-          const name = r.name.padEnd(nameW);
-          const branch = dim(r.branch.padEnd(branchW));
-          const remote = dim(r.remote ?? "(no remote)");
-          console.log(`\u2022 ${name}  ${branch}  ${remote}`);
+        for (let i = 0; i < repos.length; i++) {
+          if (i > 0) console.log();
+          const r = repos[i];
+          console.log(`\u2022 ${bold(r.name)}`);
           console.log(`  ${dim(tildify(r.path))}`);
+          console.log(`  ${dim(`${r.branch}  ${r.remote ?? "(no remote)"}`)}`);
         }
       }, repos);
       return;
     }
+    case "path": {
+      const name = need(
+        flags.name || ctxRepo,
+        "which repo? pass -n <name> or run inside a repo (mx repo -n <name> path)"
+      );
+      const res = repoInfo(root, name);
+      emit(() => console.log(res.path), { name: res.name, path: res.path });
+      return;
+    }
     case "fetch": {
+      if (flags.all) {
+        const names = listReposInfo(root).map((r) => r.name);
+        if (names.length === 0) {
+          emit(() => console.log(dim("no repos yet \u2014 `mx repo add <git-url>`")), []);
+          return;
+        }
+        const out = [];
+        const lines = [];
+        for (const n of names) {
+          try {
+            const r = repoFetch(root, n);
+            out.push(r);
+            lines.push(
+              `${check()} ${bold(r.name)} ${dim(`\u2014 ${r.remoteBranches.length} branch(es) on origin, now on ${r.branch}`)}`
+            );
+          } catch (e) {
+            const msg = e instanceof MxError ? e.message : String(e);
+            out.push({ name: n, error: msg });
+            lines.push(`${warn()} ${bold(n)} ${dim(`\u2014 ${msg}`)}`);
+          }
+        }
+        emit(() => lines.forEach((l) => console.log(l)), out);
+        return;
+      }
       const name = need(
         flags.name || ctxRepo,
-        "which repo? pass -n <name> or run inside a repo (mx repo -n <name> fetch)"
+        "which repo? pass -n <name>, run inside a repo, or use --all (mx repo -n <name> fetch)"
       );
       const res = repoFetch(root, name);
       emit(
@@ -1610,7 +1649,8 @@ function need2(v, msg) {
   return v;
 }
 function dispatchWork(positionals, flags) {
-  const action = positionals[1];
+  let action = positionals[1];
+  if (!action && flags.open) action = "open";
   if (action === "new") {
     const root2 = requireRuntime({ runtime: flags.runtime });
     const name2 = need2(positionals[2], "usage: mx work new <name> [--description <text>] [-o|--open]");
@@ -1700,6 +1740,22 @@ function dispatchWork(positionals, flags) {
       emit(() => console.log(res.path), res);
       return;
     }
+    case "open": {
+      const res = workPath(root, name);
+      try {
+        openWorkLayout(res.path, workspaceFile(root, name));
+      } catch (e) {
+        const msg = e instanceof MxError ? e.message : String(e);
+        process.stderr.write(`${warn()} ${dim(`could not open layout: ${msg}`)}
+`);
+        return;
+      }
+      emit(
+        () => console.log(`${check()} opened ${bold(name)} ${dim("(Terminal + editor)")}`),
+        { work: name, opened: true }
+      );
+      return;
+    }
     case "describe": {
       const text = need2(positionals[2], "usage: mx work -n <name> describe <text>");
       const work = workDescribe(root, name, text);
@@ -1943,7 +1999,7 @@ var VERSION = (() => {
 function main() {
   const { positionals, flags } = parseArgs(process.argv.slice(2));
   setPorcelain(flags.porcelain);
-  if (positionals[0] === "s" || positionals[0] === "st") positionals[0] = "status";
+  if (positionals[0] === "i") positionals[0] = "info";
   try {
     if (flags.version || positionals[0] === "version") {
       emit(() => console.log(`mx ${VERSION}`), { version: VERSION });
@@ -1955,7 +2011,7 @@ function main() {
     }
     switch (positionals[0]) {
       case "init":
-      case "status":
+      case "info":
       case "sync":
       case "update":
       case "migrate":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roulabs/mx",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "mx — run several features in parallel across shared repos using git worktrees",
   "type": "module",
   "bin": {