muuuuse 1.3.1 → 1.3.2

package/README.md

@@ -15,12 +15,12 @@ The main flow is:
 ```bash
 muuuuse 1 <program...>
 muuuuse 2 <program...>
-muuuuse 3 stop
+muuuuse stop
 ```
 
 Seat `1` and seat `2` each launch and own a real local program under a PTY wrapper. Once both seats are alive in the same lane, they automatically bounce final blocks between each other by typing the partner answer plus `Enter` into the wrapped program.
 
-`muuuuse 3 stop` is the cleanup command for that lane.
+`muuuuse stop` is the real cleanup command. With no flags it force-stops every tracked lane. Use `--session <name>` if you only want one explicit lane.
 
 ## Install
 
@@ -45,7 +45,7 @@ muuuuse 2 gemini
 Terminal 3:
 
 ```bash
-muuuuse 3 stop
+muuuuse stop
 ```
 
 Known presets expand to recommended flags automatically:
@@ -80,13 +80,13 @@ If you want an explicit lane name, use:
 ```bash
 muuuuse 1 --session demo codex
 muuuuse 2 --session demo gemini
-muuuuse 3 --session demo stop
+muuuuse stop --session demo
 ```
 
 You can also inspect the lane:
 
 ```bash
-muuuuse 3 status
+muuuuse status
 ```
 
 ## Doctor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muuuuse",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "🔌Muuuuse wraps two local programs and bounces final blocks between them from the terminal you launched.",
   "type": "commonjs",
   "bin": {

package/src/cli.js

@@ -7,10 +7,11 @@ const {
 } = require("./util");
 const {
   SeatProcess,
+  readAllSessionStatuses,
   readSessionStatus,
   resolveProgramTokens,
   resolveSessionName,
-  stopSession,
+  stopSessions,
 } = require("./runtime");
 
 async function main(argv = process.argv.slice(2)) {
@@ -26,6 +27,51 @@ async function main(argv = process.argv.slice(2)) {
     return;
   }
 
+  if (command === "stop") {
+    const { flags } = parseFlags(argv.slice(1));
+    const result = await stopSessions(flags.session || null);
+    if (result.sessions.length === 0) {
+      process.stdout.write(`${BRAND} no live sessions found.\n`);
+      return;
+    }
+
+    if (flags.session) {
+      process.stdout.write(`${BRAND} stop requested for session ${flags.session}.\n`);
+    } else {
+      process.stdout.write(`${BRAND} stop requested for all sessions.\n`);
+    }
+
+    for (const session of result.sessions) {
+      process.stdout.write(`${session.sessionName}\n`);
+      for (const seat of session.seats) {
+        process.stdout.write(
+          `seat ${seat.seatId}: wrapper ${describeStopResult(seat.wrapperStopped, seat.wrapperForced)}`
+          + `, child ${describeStopResult(seat.childStopped, seat.childForced)}\n`
+        );
+      }
+    }
+    return;
+  }
+
+  if (command === "status") {
+    const { flags } = parseFlags(argv.slice(1));
+    if (flags.session) {
+      printSessionStatus(readSessionStatus(flags.session));
+      return;
+    }
+
+    const sessions = readAllSessionStatuses();
+    if (sessions.length === 0) {
+      process.stdout.write(`${BRAND} no tracked sessions.\n`);
+      return;
+    }
+
+    for (const session of sessions) {
+      printSessionStatus(session);
+    }
+    return;
+  }
+
   if (command === "1" || command === "2") {
     const { positionals, flags } = parseFlags(argv.slice(1));
     const sessionName = resolveSessionName(flags.session, process.cwd());
@@ -43,38 +89,21 @@ async function main(argv = process.argv.slice(2)) {
 
   if (command === "3") {
     const { positionals, flags } = parseFlags(argv.slice(1));
-    const sessionName = resolveSessionName(flags.session, process.cwd());
     const action = String(positionals[0] || "status").toLowerCase();
 
     if (action === "stop") {
-      const result = stopSession(sessionName);
-      process.stdout.write(`${BRAND} stop requested for session ${result.sessionName}.\n`);
-      for (const seat of result.seats) {
-        process.stdout.write(
-          `seat ${seat.seatId}: wrapper ${seat.wrapperStopped ? "signaled" : "idle"}`
-          + `, child ${seat.childStopped ? "signaled" : "idle"}\n`
-        );
-      }
+      const forwarded = ["stop", ...argv.slice(1).filter((token) => token !== "stop")];
+      await main(forwarded);
       return;
     }
 
     if (action === "status") {
-      const status = readSessionStatus(sessionName);
-      process.stdout.write(`${BRAND} session ${status.sessionName}\n`);
-      for (const seat of status.seats) {
-        if (!seat.status) {
-          process.stdout.write(`seat ${seat.seatId}: idle\n`);
-          continue;
-        }
-
-        const state = seat.status.state || "unknown";
-        const program = Array.isArray(seat.status.command) ? seat.status.command.join(" ") : "";
-        process.stdout.write(`seat ${seat.seatId}: ${state}${program ? ` (${program})` : ""}\n`);
-      }
+      const forwarded = ["status", ...argv.slice(1).filter((token) => token !== "status")];
+      await main(forwarded);
       return;
     }
 
-    throw new Error(`Unknown seat 3 action '${action}'. Try \`muuuuse 3 stop\` or \`muuuuse 3 status\`.`);
+    throw new Error(`Unknown seat 3 action '${action}'. Try \`muuuuse stop\` or \`muuuuse status\`.`);
   }
 
   throw new Error(`Unknown command '${command}'.`);
@@ -114,6 +143,30 @@ function checkBinary(command, versionArgs, required) {
   return { label: command, ok: true, detail: version, required };
 }
 
+function describeStopResult(signaled, forced) {
+  if (forced) {
+    return "killed";
+  }
+  if (signaled) {
+    return "signaled";
+  }
+  return "idle";
+}
+
+function printSessionStatus(status) {
+  process.stdout.write(`${BRAND} session ${status.sessionName}\n`);
+  for (const seat of status.seats) {
+    if (!seat.status) {
+      process.stdout.write(`seat ${seat.seatId}: idle\n`);
+      continue;
+    }
+
+    const state = seat.status.state || "unknown";
+    const program = Array.isArray(seat.status.command) ? seat.status.command.join(" ") : "";
+    process.stdout.write(`seat ${seat.seatId}: ${state}${program ? ` (${program})` : ""}\n`);
+  }
+}
+
 module.exports = {
   main,
   runDoctor,

package/src/runtime.js

@@ -20,6 +20,7 @@ const {
   getDefaultSessionName,
   getFileSize,
   getSeatPaths,
+  getStateRoot,
   hashText,
   isPidAlive,
   readAppendedText,
@@ -265,6 +266,7 @@ class SeatProcess {
       this.stopped = true;
     };
     process.once("SIGINT", stop);
+    process.once("SIGHUP", stop);
     process.once("SIGTERM", stop);
   }
 
@@ -280,15 +282,22 @@ class SeatProcess {
         this.genericTracker.noteTurnStart("");
       }
     };
+    const handleEnd = () => {
+      this.stopped = true;
+    };
 
     if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
       process.stdin.setRawMode(true);
     }
     process.stdin.resume();
     process.stdin.on("data", handleData);
+    process.stdin.on("close", handleEnd);
+    process.stdin.on("end", handleEnd);
 
     this.stdinCleanup = () => {
       process.stdin.off("data", handleData);
+      process.stdin.off("close", handleEnd);
+      process.stdin.off("end", handleEnd);
       if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
         process.stdin.setRawMode(false);
       }
@@ -528,7 +537,7 @@ class SeatProcess {
 
     this.log(`${BRAND} seat ${this.seatId} started in session ${this.sessionName}.`);
     this.log(`Command: ${formatCommand(this.commandTokens)}`);
-    this.log(`Stop both seats from another terminal with: muuuuse 3 stop`);
+    this.log(`Stop everything from another terminal with: muuuuse stop`);
 
     try {
       while (!this.stopped) {
@@ -620,6 +629,56 @@ function stopSession(sessionName) {
   };
 }
 
+function listSessionNames() {
+  const sessionsRoot = path.join(getStateRoot(), "sessions");
+  try {
+    return fs.readdirSync(sessionsRoot, { withFileTypes: true })
+      .filter((entry) => entry.isDirectory())
+      .map((entry) => entry.name)
+      .sort();
+  } catch (error) {
+    return [];
+  }
+}
+
+async function stopSessions(sessionName = null) {
+  const sessionNames = sessionName ? [sessionName] : listSessionNames();
+  const sessionResults = sessionNames.map((name) => stopSession(name));
+
+  await sleep(200);
+
+  for (const sessionResult of sessionResults) {
+    for (const seat of sessionResult.seats) {
+      if (seat.wrapperPid && isPidAlive(seat.wrapperPid)) {
+        try {
+          process.kill(seat.wrapperPid, "SIGKILL");
+          seat.wrapperForced = true;
+        } catch (error) {
+          seat.wrapperForced = false;
+        }
+      } else {
+        seat.wrapperForced = false;
+      }
+
+      if (seat.childPid && isPidAlive(seat.childPid)) {
+        try {
+          process.kill(seat.childPid, "SIGKILL");
+          seat.childForced = true;
+        } catch (error) {
+          seat.childForced = false;
+        }
+      } else {
+        seat.childForced = false;
+      }
+    }
+  }
+
+  return {
+    sessionName,
+    sessions: sessionResults,
+  };
+}
+
 function readSessionStatus(sessionName) {
   return {
     sessionName,
@@ -634,11 +693,17 @@ function readSessionStatus(sessionName) {
   };
 }
 
+function readAllSessionStatuses() {
+  return listSessionNames().map((sessionName) => readSessionStatus(sessionName));
+}
+
 module.exports = {
   SeatProcess,
   formatCommand,
+  readAllSessionStatuses,
   readSessionStatus,
   resolveProgramTokens,
   resolveSessionName,
   stopSession,
+  stopSessions,
 };

package/src/util.js

@@ -261,19 +261,19 @@ function usage() {
     "Usage:",
     "  muuuuse 1 <program...>",
     "  muuuuse 2 <program...>",
-    "  muuuuse 3 stop",
-    "  muuuuse 3 status",
+    "  muuuuse stop",
+    "  muuuuse status",
     "  muuuuse doctor",
     "",
     "Examples:",
     "  muuuuse 1 codex",
     "  muuuuse 2 gemini",
-    "  muuuuse 3 stop",
+    "  muuuuse stop",
     "  muuuuse 1 bash -lc 'while read line; do printf \"script one: %s\\n\\n\" \"$line\"; done'",
     "",
     "Notes:",
     "  - Seats auto-pair by current working directory by default.",
-    "  - Use `--session <name>` on seats and seat 3 if you want an explicit shared lane.",
+    "  - Use `--session <name>` on seats and stop/status if you want an explicit shared lane.",
     "  - Known presets (`codex`, `claude`, `gemini`) expand to recommended launch flags.",
     "  - Any other program runs as-is inside the current terminal under a PTY wrapper.",
   ].join("\n");