@mutmutco/cli 2.45.0 → 2.46.1

package/dist/main.cjs

@@ -12830,6 +12830,33 @@ function stageGlobalStatePath(cwd = process.cwd(), gitCommonDir = ".git") {
 function normPath2(path2) {
   return path2.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
 }
+function parseWorktreeListPaths(stdout) {
+  const paths = [];
+  for (const line of stdout.split(/\r?\n/)) {
+    if (line.startsWith("worktree ")) paths.push(line.slice("worktree ".length).trim());
+  }
+  return paths;
+}
+function collectReservedStagePorts(worktreePaths, readStateFile = readState) {
+  const ports = /* @__PURE__ */ new Set();
+  for (const wt of worktreePaths) {
+    const state = readStateFile(stageStatePath(wt));
+    if (state?.port != null && Number.isInteger(state.port) && state.port > 0) ports.add(state.port);
+  }
+  return ports;
+}
+async function listRepoWorktreePaths(cwd) {
+  const stdout = await gitText(cwd, ["worktree", "list", "--porcelain"]);
+  const paths = stdout ? parseWorktreeListPaths(stdout) : [];
+  return paths.length ? paths : [cwd];
+}
+function parseStagePortFlag(raw) {
+  const port = Number(raw);
+  if (!Number.isInteger(port) || port < 1024 || port > 65535) {
+    throw new Error("stage port must be an integer 1024..65535");
+  }
+  return port;
+}
 function pathUnder(childPath, parentPath) {
   const child = normPath2(childPath);
   const parent = normPath2(parentPath);
@@ -12976,7 +13003,7 @@ async function ensureStagePortAvailable(port, cwd, deps) {
     );
   }
 }
-async function resolveStagePort(config, guard) {
+async function resolveStagePort(config, guard, reservedPorts = /* @__PURE__ */ new Set()) {
   if (!config.portRange) return void 0;
   let dockerBusy = /* @__PURE__ */ new Set();
   if (guard) {
@@ -12990,11 +13017,25 @@ async function resolveStagePort(config, guard) {
   const [s, e] = config.portRange;
   const free = /* @__PURE__ */ new Set();
   for (let p = s; p <= e; p++) {
-    if (dockerBusy.has(p)) continue;
+    if (dockerBusy.has(p) || reservedPorts.has(p)) continue;
     if (await isPortFree(p)) free.add(p);
   }
   return pickStagePort(config.portRange, (p) => free.has(p));
 }
+async function reservedPortsForWorktree(cwd) {
+  const self = normPath2(cwd);
+  const siblings = (await listRepoWorktreePaths(cwd)).filter((p) => normPath2(p) !== self);
+  return collectReservedStagePorts(siblings);
+}
+async function assertStagePortAvailable(port, cwd, guard, reserved) {
+  if (reserved.has(port)) {
+    throw new Error(`stage port ${port} is reserved by another worktree's active stage \u2014 pick a different port or stop that stage`);
+  }
+  if (!await isPortFree(port)) {
+    throw new Error(`stage port ${port} is already in use on loopback`);
+  }
+  if (guard) await ensureStagePortAvailable(port, cwd, guard);
+}
 function substituteStagePort(s, stagePort) {
   return s != null && stagePort != null ? s.replace(/\$\{?STAGE_PORT\}?/g, String(stagePort)) : s;
 }
@@ -13051,8 +13092,7 @@ async function resolveStageIdentity(cwd) {
 async function resolveGlobalStatePath(cwd, explicit) {
   if (explicit === false) return void 0;
   if (typeof explicit === "string") return explicit;
-  const commonDir = await gitText(cwd, ["rev-parse", "--git-common-dir"]);
-  return commonDir ? stageGlobalStatePath(cwd, commonDir) : void 0;
+  return void 0;
 }
 function readState(path2) {
   if (!(0, import_node_fs19.existsSync)(path2)) return null;
@@ -13120,11 +13160,12 @@ async function waitForHealth(url, timeoutMs, anyStatus = false) {
 }
 async function stopStage(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
+  const scopedCwd = opts.requiredIdentityCwd ?? cwd;
   const statePath = opts.statePath ?? stageStatePath(cwd);
   const globalStatePath = await resolveGlobalStatePath(cwd, opts.globalStatePath);
   const localState = readState(statePath);
   const globalState = globalStatePath && globalStatePath !== statePath ? readState(globalStatePath) : null;
-  const state = stageStateMatchesRequiredCwd(globalState, opts.requiredIdentityCwd) ? globalState : stageStateMatchesRequiredCwd(localState, opts.requiredIdentityCwd) ? localState : null;
+  const state = stageStateMatchesRequiredCwd(localState, scopedCwd) ? localState : stageStateMatchesRequiredCwd(globalState, scopedCwd) ? globalState : null;
   if (!state) {
     return { ok: true, action: "stop", statePath, message: "no previous stage state found" };
   }
@@ -13146,7 +13187,13 @@ async function startStage(config = {}, opts = {}) {
   const statePath = opts.statePath ?? stageStatePath(cwd);
   const globalStatePath = await resolveGlobalStatePath(cwd, opts.globalStatePath);
   const portGuard = resolveStagePortGuard(opts);
-  const stagePort = opts.stagePort ?? await resolveStagePort(config, portGuard);
+  const reserved = await reservedPortsForWorktree(cwd);
+  let stagePort = opts.stagePort;
+  if (stagePort != null) {
+    await assertStagePortAvailable(stagePort, cwd, portGuard, reserved);
+  } else {
+    stagePort = await resolveStagePort(config, portGuard, reserved);
+  }
   const sub = (s) => substituteStagePort(s, stagePort);
   if (!opts.envPrepared) await ensureStageRuntimeEnv(config, opts, cwd);
   if (stagePort != null && portGuard) await ensureStagePortAvailable(stagePort, cwd, portGuard);
@@ -13204,8 +13251,14 @@ async function runStage(config = {}, opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const timeoutMs = opts.timeoutMs ?? 6e4;
   const portGuard = resolveStagePortGuard(opts);
-  await stopStage({ ...opts, cwd });
-  const stagePort = opts.stagePort ?? await resolveStagePort(config, portGuard);
+  await stopStage({ ...opts, cwd, requiredIdentityCwd: opts.requiredIdentityCwd ?? cwd });
+  const reserved = await reservedPortsForWorktree(cwd);
+  let stagePort = opts.stagePort;
+  if (stagePort != null) {
+    await assertStagePortAvailable(stagePort, cwd, portGuard, reserved);
+  } else {
+    stagePort = await resolveStagePort(config, portGuard, reserved);
+  }
   const sub = (s) => substituteStagePort(s, stagePort);
   await ensureStageRuntimeEnv(config, opts, cwd);
   const extraEnv = stageExtraEnv(config, stagePort);
@@ -19917,6 +19970,22 @@ function rawValues(flag) {
   }
   return out;
 }
+function stagePortFromArgv() {
+  const raw = rawValue("--port", "");
+  if (!raw) return void 0;
+  return parseStagePortFlag(raw);
+}
+function stageScopedRunOpts(o) {
+  const cwd = process.cwd();
+  const stagePort = stagePortFromArgv();
+  return {
+    timeoutMs: Number(o.timeoutMs || 6e4),
+    allowStaleEnv: o.allowStaleEnv,
+    cwd,
+    requiredIdentityCwd: cwd,
+    ...stagePort != null ? { stagePort } : {}
+  };
+}
 function printLine(value) {
   (0, import_node_fs22.writeSync)(1, `${value}
 `);
@@ -20046,7 +20115,7 @@ async function runStageLiveCommand(o) {
     return failGraceful(`stage --live: ${e.message}`);
   }
 }
-var stage = program2.command("stage").description("plan or run the repo local stage environment; --live = personal IP-gated cloud dev stage").option("--json", "machine-readable output").option("--apply", "run the full local stage: stop previous, build, start, health-check").option("--live", "personal cloud dev stage: deploy the current branch to the dev runtime, served only to your public IP").option("--down", "with --live: stop the dev runtime and clear the IP allowlist").option("--timeout-ms <ms>", "bounded build/health timeout", "60000").action(async (o) => {
+var stage = program2.command("stage").description("plan or run the repo local stage environment; --live = personal IP-gated cloud dev stage").option("--json", "machine-readable output").option("--apply", "run the full local stage: stop previous in this worktree, build, start, health-check").option("--port <port>", "loopback port for this worktree stage (1024..65535; default picks a free port in the registry range)").option("--live", "personal cloud dev stage: deploy the current branch to the dev runtime, served only to your public IP").option("--down", "with --live: stop the dev runtime and clear the IP allowlist").option("--timeout-ms <ms>", "bounded build/health timeout", "60000").action(async (o) => {
   if (o.down && !o.live) return fail("stage: --down applies to --live only (local teardown is `mmi-cli stage stop --apply`)");
   if (o.live) return runStageLiveCommand(o);
   const res = await resolveStage();
@@ -20055,7 +20124,7 @@ var stage = program2.command("stage").description("plan or run the repo local st
     const cfg = res.config ?? res.derived.config;
     const hold = stageKeepAlive();
     try {
-      const result = await runStage(cfg, { timeoutMs: Number(o.timeoutMs || 6e4) });
+      const result = await runStage(cfg, stageScopedRunOpts({ timeoutMs: o.timeoutMs }));
       const reportUrl = reportedStageUrl(res, result);
       const url = reportUrl ? ` \u2014 ${reportUrl}` : "";
       return printLine(o.json ? JSON.stringify({ ...result, source: res.source, url: reportUrl }) : `mmi-cli stage: ${result.message}${url}`);
@@ -20078,13 +20147,13 @@ stage.command("stop").description("stop the previous local stage process recorde
     return printLine(o.json ? JSON.stringify({ command: "stage stop", steps }, null, 2) : renderSteps("mmi-cli stage stop: dry-run plan", steps));
   }
   try {
-    const result = await stopStage();
+    const result = await stopStage({ cwd: process.cwd(), requiredIdentityCwd: process.cwd() });
     printLine(o.json ? JSON.stringify(result) : `mmi-cli stage stop: ${result.message}`);
   } catch (e) {
     fail(`stage stop: ${e.message}`);
   }
 });
-stage.command("start").description("start the configured local stage process and optionally wait for health").option("--json", "machine-readable output").option("--apply", "start the configured stage.up process").option("--timeout-ms <ms>", "bounded health timeout", "60000").option("--allow-stale-env", "start despite a stale ensureEnv target file").action(async () => {
+stage.command("start").description("start the configured local stage process and optionally wait for health").option("--json", "machine-readable output").option("--apply", "start the configured stage.up process").option("--port <port>", "loopback port for this worktree stage (1024..65535)").option("--timeout-ms <ms>", "bounded health timeout", "60000").option("--allow-stale-env", "start despite a stale ensureEnv target file").action(async () => {
   const o = { json: rawFlag("--json"), apply: rawFlag("--apply"), timeoutMs: rawValue("--timeout-ms", "60000"), allowStaleEnv: rawFlag("--allow-stale-env") };
   const res = await resolveStage();
   if (!o.apply) {
@@ -20102,8 +20171,7 @@ stage.command("start").description("start the configured local stage process and
     let printed = false;
     try {
       const result = await startStage(cfg, {
-        timeoutMs: Number(o.timeoutMs || 6e4),
-        allowStaleEnv: o.allowStaleEnv,
+        ...stageScopedRunOpts({ timeoutMs: o.timeoutMs, allowStaleEnv: o.allowStaleEnv }),
         vaultEnvMerge,
         onReady: (ready) => {
           printed = true;
@@ -20120,7 +20188,7 @@ stage.command("start").description("start the configured local stage process and
     return failGraceful(`stage start: ${e.message}`);
   }
 });
-stage.command("run").description("force-stop previous stage, build, start, and health-check").option("--json", "machine-readable output").option("--apply", "run the configured stage sequence").option("--timeout-ms <ms>", "bounded build/health timeout", "60000").option("--allow-stale-env", "run despite a stale ensureEnv target file").action(async () => {
+stage.command("run").description("force-stop previous stage, build, start, and health-check").option("--json", "machine-readable output").option("--apply", "run the configured stage sequence").option("--port <port>", "loopback port for this worktree stage (1024..65535)").option("--timeout-ms <ms>", "bounded build/health timeout", "60000").option("--allow-stale-env", "run despite a stale ensureEnv target file").action(async () => {
   const o = { json: rawFlag("--json"), apply: rawFlag("--apply"), timeoutMs: rawValue("--timeout-ms", "60000"), allowStaleEnv: rawFlag("--allow-stale-env") };
   const res = await resolveStage();
   if (!o.apply) {
@@ -20138,8 +20206,7 @@ stage.command("run").description("force-stop previous stage, build, start, and h
     let printed = false;
     try {
       const result = await runStage(cfg, {
-        timeoutMs: Number(o.timeoutMs || 6e4),
-        allowStaleEnv: o.allowStaleEnv,
+        ...stageScopedRunOpts({ timeoutMs: o.timeoutMs, allowStaleEnv: o.allowStaleEnv }),
         vaultEnvMerge,
         onReady: (ready) => {
           const reportUrl = reportedStageUrl(res, ready);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.45.0",
+  "version": "2.46.1",
   "description": "MMI Future CLI — delivers the org rules (whole-file), plus saga and KB access. The cross-IDE engine the plugin's SessionStart hook drives.",
   "type": "module",
   "license": "UNLICENSED",