muuuuse 1.3.2 → 1.4.1

package/src/cli.js

@@ -1,18 +1,5 @@
-const {
-  BRAND,
-  commandExists,
-  parseFlags,
-  readCommandVersion,
-  usage,
-} = require("./util");
-const {
-  SeatProcess,
-  readAllSessionStatuses,
-  readSessionStatus,
-  resolveProgramTokens,
-  resolveSessionName,
-  stopSessions,
-} = require("./runtime");
+const { BRAND, usage } = require("./util");
+const { ArmedSeat, getStatusReport, stopAllSessions } = require("./runtime");
 
 async function main(argv = process.argv.slice(2)) {
   if (argv.length === 0 || argv.includes("--help") || argv.includes("-h")) {
@@ -20,154 +7,95 @@ async function main(argv = process.argv.slice(2)) {
     return;
   }
 
-  const command = argv[0];
-
-  if (command === "doctor") {
-    runDoctor();
-    return;
-  }
+  const command = String(argv[0] || "").trim().toLowerCase();
 
   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 (argv.length > 1) {
+      throw new Error("`muuuuse stop` takes no extra arguments.");
     }
 
-    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`);
+    const result = stopAllSessions();
+    if (result.sessions.length === 0) {
+      process.stdout.write(`${BRAND} no armed seats found.\n`);
+      return;
     }
 
+    process.stdout.write(`${BRAND} stop requested.\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`
-        );
+        process.stdout.write(`seat ${seat.seatId}: ${seat.state} · agent ${seat.agent || "idle"} · relays ${seat.relayCount}\n`);
       }
     }
     return;
   }
 
   if (command === "status") {
-    const { flags } = parseFlags(argv.slice(1));
-    if (flags.session) {
-      printSessionStatus(readSessionStatus(flags.session));
-      return;
+    if (argv.length > 1) {
+      throw new Error("`muuuuse status` takes no extra arguments.");
     }
 
-    const sessions = readAllSessionStatuses();
-    if (sessions.length === 0) {
-      process.stdout.write(`${BRAND} no tracked sessions.\n`);
+    const report = getStatusReport();
+    if (report.sessions.length === 0) {
+      process.stdout.write(`${BRAND} no armed seats found.\n`);
       return;
     }
 
-    for (const session of sessions) {
-      printSessionStatus(session);
+    process.stdout.write(`${BRAND} status\n`);
+    for (const session of report.sessions) {
+      process.stdout.write(`\n${session.sessionName}\n`);
+      if (session.stopRequestedAt) {
+        process.stdout.write(`stop requested: ${session.stopRequestedAt}\n`);
+      }
+      for (const seat of session.seats) {
+        process.stdout.write(renderSeatStatus(seat));
+      }
     }
     return;
   }
 
   if (command === "1" || command === "2") {
-    const { positionals, flags } = parseFlags(argv.slice(1));
-    const sessionName = resolveSessionName(flags.session, process.cwd());
-    const commandTokens = resolveProgramTokens(positionals, !flags.noPreset);
-    const seat = new SeatProcess({
-      commandTokens,
+    if (argv.length > 1) {
+      throw new Error(`\`muuuuse ${command}\` takes no extra arguments. Run it directly in the terminal you want to arm.`);
+    }
+
+    const seat = new ArmedSeat({
       cwd: process.cwd(),
-      maxRelays: flags.maxRelays,
       seatId: Number(command),
-      sessionName,
     });
     const code = await seat.run();
     process.exit(code);
   }
 
-  if (command === "3") {
-    const { positionals, flags } = parseFlags(argv.slice(1));
-    const action = String(positionals[0] || "status").toLowerCase();
-
-    if (action === "stop") {
-      const forwarded = ["stop", ...argv.slice(1).filter((token) => token !== "stop")];
-      await main(forwarded);
-      return;
-    }
-
-    if (action === "status") {
-      const forwarded = ["status", ...argv.slice(1).filter((token) => token !== "status")];
-      await main(forwarded);
-      return;
-    }
-
-    throw new Error(`Unknown seat 3 action '${action}'. Try \`muuuuse stop\` or \`muuuuse status\`.`);
-  }
-
   throw new Error(`Unknown command '${command}'.`);
 }
 
-function runDoctor() {
-  const checks = [
-    checkBinary("node", ["--version"], true),
-    checkBinary("npm", ["--version"], true),
-    checkBinary("codex", ["--version"], false),
-    checkBinary("claude", ["--version"], false),
-    checkBinary("gemini", ["--version"], false),
+function renderSeatStatus(seat) {
+  const bits = [
+    `seat ${seat.seatId}: ${seat.state}`,
+    `agent ${seat.agent || "idle"}`,
+    `relays ${seat.relayCount}`,
+    `wrapper ${seat.wrapperPid || "-"}`,
+    `child ${seat.childPid || "-"}`,
   ];
 
-  process.stdout.write(`${BRAND} doctor\n\n`);
-  for (const item of checks) {
-    process.stdout.write(`${item.ok ? "OK " : "MISS"} ${item.label}${item.detail ? `: ${item.detail}` : ""}\n`);
-  }
-
-  process.stdout.write("\nKnown presets\n");
-  process.stdout.write("- codex\n");
-  process.stdout.write("- claude\n");
-  process.stdout.write("- gemini\n");
-  process.stdout.write("\nAny other local program can be wrapped directly with `muuuuse 1 <program...>` or `muuuuse 2 <program...>`.\n");
-
-  const missingRequired = checks.some((item) => item.required && !item.ok);
-  if (missingRequired) {
-    process.exitCode = 1;
+  if (seat.partnerLive) {
+    bits.push("peer live");
   }
-}
-
-function checkBinary(command, versionArgs, required) {
-  if (!commandExists(command)) {
-    return { label: command, ok: false, detail: "not installed", required };
+  if (seat.lastAnswerAt) {
+    bits.push(`last answer ${seat.lastAnswerAt}`);
   }
-  const version = readCommandVersion(command, versionArgs) || "installed";
-  return { label: command, ok: true, detail: version, required };
-}
 
-function describeStopResult(signaled, forced) {
-  if (forced) {
-    return "killed";
-  }
-  if (signaled) {
-    return "signaled";
+  let output = `${bits.join(" · ")}\n`;
+  if (seat.cwd) {
+    output += `cwd: ${seat.cwd}\n`;
   }
-  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`);
+  if (seat.log) {
+    output += `log: ${seat.log}\n`;
   }
+  return output;
 }
 
 module.exports = {
   main,
-  runDoctor,
 };