muuuuse 1.3.0 → 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:
@@ -69,7 +69,7 @@ muuuuse 2 bash -lc 'while read line; do printf "right: %s\n\n" "$line"; done'
 
 Type into one seat and the other seat will receive the relayed block.
 
-For Codex, Claude, and Gemini, `🔌Muuuuse` prefers their structured session logs. For anything else, it falls back to the last stable output block after a turn goes idle.
+For Codex, Claude, and Gemini, `🔌Muuuuse` waits for their structured final-answer logs instead of relaying transient screen chatter. For anything else, it first looks for an explicit `(answer)` block and otherwise falls back to the last stable output block after a turn goes idle.
 
 ## Sessions
 
@@ -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.0",
+  "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/agents.js

@@ -76,6 +76,7 @@ const CLAUDE_ROOT = path.join(os.homedir(), ".claude", "projects");
 const GEMINI_ROOT = path.join(os.homedir(), ".gemini", "tmp");
 const CODEX_SNAPSHOT_ROOT = path.join(os.homedir(), ".codex", "shell_snapshots");
 const codexSnapshotPaneCache = new Map();
+const codexSnapshotExportsCache = new Map();
 
 function walkFiles(rootPath, predicate, results = []) {
   try {
@@ -157,6 +158,10 @@ function chooseCandidate(candidates, currentPath, processStartedAtMs) {
     return null;
   }
 
+  if (cwdMatches.length === 1) {
+    return cwdMatches[0].path;
+  }
+
   if (processStartedAtMs !== null) {
     const preciseMatches = cwdMatches
       .map((candidate) => ({
@@ -166,13 +171,12 @@ function chooseCandidate(candidates, currentPath, processStartedAtMs) {
       .filter((candidate) => Number.isFinite(candidate.diffMs) && candidate.diffMs <= SESSION_MATCH_WINDOW_MS)
       .sort((left, right) => left.diffMs - right.diffMs || right.mtimeMs - left.mtimeMs);
 
-    if (preciseMatches.length > 0) {
+    if (preciseMatches.length === 1) {
       return preciseMatches[0].path;
     }
   }
 
-  const fallback = cwdMatches.sort((left, right) => right.mtimeMs - left.mtimeMs)[0];
-  return fallback ? fallback.path : null;
+  return null;
 }
 
 function extractThreadId(filePath) {
@@ -202,6 +206,49 @@ function readCodexSnapshotPane(threadId) {
   }
 }
 
+function readCodexSnapshotExports(threadId) {
+  if (!threadId) {
+    return {};
+  }
+
+  if (codexSnapshotExportsCache.has(threadId)) {
+    return codexSnapshotExportsCache.get(threadId);
+  }
+
+  const snapshotPath = path.join(CODEX_SNAPSHOT_ROOT, `${threadId}.sh`);
+  try {
+    const contents = fs.readFileSync(snapshotPath, "utf8");
+    const exportsMap = {};
+    const pattern = /^declare -x ([A-Z0-9_]+)="((?:[^"\\]|\\.)*)"$/gm;
+
+    for (const match of contents.matchAll(pattern)) {
+      const [, key = "", rawValue = ""] = match;
+      exportsMap[key] = rawValue
+        .replace(/\\"/g, "\"")
+        .replace(/\\\\/g, "\\");
+    }
+
+    codexSnapshotExportsCache.set(threadId, exportsMap);
+    return exportsMap;
+  } catch (error) {
+    codexSnapshotExportsCache.set(threadId, {});
+    return {};
+  }
+}
+
+function snapshotEnvMatches(exportsMap, expectedEnv = null) {
+  if (!expectedEnv || typeof expectedEnv !== "object") {
+    return true;
+  }
+
+  return Object.entries(expectedEnv).every(([key, value]) => {
+    if (value === undefined || value === null) {
+      return true;
+    }
+    return exportsMap[key] === String(value);
+  });
+}
+
 function readCodexCandidate(filePath) {
   try {
     const [firstLine] = readFirstLines(filePath, 1);
@@ -216,6 +263,7 @@ function readCodexCandidate(filePath) {
     return {
       path: filePath,
       threadId: extractThreadId(filePath),
+      snapshotExports: readCodexSnapshotExports(extractThreadId(filePath)),
       snapshotPaneId: readCodexSnapshotPane(extractThreadId(filePath)),
       cwd: entry.payload.cwd,
       startedAtMs: Date.parse(entry.payload.timestamp),
@@ -226,12 +274,24 @@ function readCodexCandidate(filePath) {
   }
 }
 
-function selectCodexSessionFile(currentPath, processStartedAtMs, paneId = null) {
+function selectCodexSessionFile(currentPath, processStartedAtMs, options = {}) {
+  const paneId = options.paneId || null;
+  const snapshotEnv = options.snapshotEnv || null;
   const candidates = walkFiles(CODEX_ROOT, (filePath) => filePath.endsWith(".jsonl"))
     .map((filePath) => readCodexCandidate(filePath))
     .filter((candidate) => candidate !== null);
 
   let scopedCandidates = candidates;
+  if (snapshotEnv) {
+    const exactEnvMatches = scopedCandidates.filter((candidate) => snapshotEnvMatches(candidate.snapshotExports, snapshotEnv));
+    if (exactEnvMatches.length === 1) {
+      return exactEnvMatches[0].path;
+    }
+    if (exactEnvMatches.length > 1) {
+      scopedCandidates = exactEnvMatches;
+    }
+  }
+
   if (paneId) {
     const exactPaneMatches = scopedCandidates.filter((candidate) => candidate.snapshotPaneId === paneId);
     if (exactPaneMatches.length > 0) {
@@ -415,12 +475,16 @@ function selectGeminiSessionFile(currentPath, processStartedAtMs) {
       .filter((candidate) => Number.isFinite(candidate.diffMs) && candidate.diffMs <= SESSION_MATCH_WINDOW_MS)
       .sort((left, right) => left.diffMs - right.diffMs || right.lastUpdatedMs - left.lastUpdatedMs);
 
-    if (preciseMatches.length > 0) {
+    if (preciseMatches.length === 1) {
       return preciseMatches[0].path;
     }
   }
 
-  return candidates.sort((left, right) => right.lastUpdatedMs - left.lastUpdatedMs || right.mtimeMs - left.mtimeMs)[0].path;
+  if (candidates.length === 1) {
+    return candidates[0].path;
+  }
+
+  return null;
 }
 
 function readGeminiAnswers(filePath, lastMessageId = null) {
@@ -460,6 +524,7 @@ function readGeminiAnswers(filePath, lastMessageId = null) {
 
 module.exports = {
   PRESETS,
+  chooseCandidate,
   detectAgent,
   detectAgentTypeFromCommand,
   expandPresetCommand,

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,
@@ -31,7 +32,6 @@ const {
 } = require("./util");
 
 const GENERIC_IDLE_MS = 900;
-const GENERIC_FALLBACK_DELAY_MS = 4000;
 
 function resolveSessionName(sessionOverride, currentPath = process.cwd()) {
   return sessionOverride || getDefaultSessionName(currentPath);
@@ -79,9 +79,9 @@ function parseAnswerEntries(text) {
     .filter((entry) => entry && entry.type === "answer" && typeof entry.text === "string");
 }
 
-function resolveSessionFile(agentType, currentPath, processStartedAtMs) {
+function resolveSessionFile(agentType, currentPath, processStartedAtMs, options = {}) {
   if (agentType === "codex") {
-    return selectCodexSessionFile(currentPath, processStartedAtMs);
+    return selectCodexSessionFile(currentPath, processStartedAtMs, options);
   }
   if (agentType === "claude") {
     return selectClaudeSessionFile(currentPath, processStartedAtMs);
@@ -161,6 +161,11 @@ function extractGenericAnswer(rawText, lastInputText) {
     }
   }
 
+  const markerAnswer = extractMarkedAnswer(candidate);
+  if (markerAnswer) {
+    return markerAnswer;
+  }
+
   const blocks = candidate
     .split(/\n{2,}/)
     .map((block) => block.trim())
@@ -173,6 +178,18 @@ function extractGenericAnswer(rawText, lastInputText) {
   return sanitizeRelayText(blocks[blocks.length - 1]);
 }
 
+function extractMarkedAnswer(content) {
+  const lines = String(content || "").split("\n");
+  const answerIndex = lines.findIndex((line) => line.trim().startsWith("(answer)"));
+  if (answerIndex === -1) {
+    return null;
+  }
+
+  const answerLines = lines.slice(answerIndex);
+  answerLines[0] = answerLines[0].trim().replace(/^\(answer\)\s*/, "");
+  return sanitizeRelayText(answerLines.join("\n"));
+}
+
 class SeatProcess {
   constructor(options) {
     this.seatId = options.seatId;
@@ -196,6 +213,8 @@ class SeatProcess {
     this.stopped = false;
     this.stdinCleanup = null;
     this.resizeCleanup = null;
+    this.childToken = createId(16);
+    this.processStartedAtMs = null;
 
     this.sessionState = {
       file: null,
@@ -217,6 +236,7 @@ class SeatProcess {
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
+      childToken: this.childToken,
       agentType: this.agentType,
       command: this.commandTokens,
       commandLine: formatCommand(this.commandTokens),
@@ -232,6 +252,7 @@ class SeatProcess {
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
+      childToken: this.childToken,
       agentType: this.agentType,
       command: this.commandTokens,
       relayCount: this.relayCount,
@@ -245,6 +266,7 @@ class SeatProcess {
       this.stopped = true;
     };
     process.once("SIGINT", stop);
+    process.once("SIGHUP", stop);
     process.once("SIGTERM", stop);
   }
 
@@ -260,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);
       }
@@ -307,6 +336,7 @@ class SeatProcess {
       cwd: this.cwd,
       env: {
         ...process.env,
+        MUUUUSE_CHILD_TOKEN: this.childToken,
         MUUUUSE_SEAT: String(this.seatId),
         MUUUUSE_SESSION: this.sessionName,
       },
@@ -315,6 +345,7 @@ class SeatProcess {
     });
 
     this.childPid = this.child.pid;
+    this.processStartedAtMs = Date.now();
     this.writeMeta();
     this.writeStatus({
       partnerSeatId: this.partnerSeatId,
@@ -352,15 +383,7 @@ class SeatProcess {
   }
 
   shouldUseGenericCapture() {
-    if (!this.agentType) {
-      return true;
-    }
-
-    if (this.sessionState.file) {
-      return false;
-    }
-
-    return Date.now() - this.startedAtMs >= GENERIC_FALLBACK_DELAY_MS;
+    return !this.agentType;
   }
 
   pullPartnerEvents() {
@@ -401,7 +424,15 @@ class SeatProcess {
       return;
     }
 
-    const sessionFile = resolveSessionFile(this.agentType, this.cwd, this.startedAtMs);
+    const sessionFile = resolveSessionFile(this.agentType, this.cwd, this.processStartedAtMs, {
+      snapshotEnv: this.agentType === "codex"
+        ? {
+          MUUUUSE_CHILD_TOKEN: this.childToken,
+          MUUUUSE_SEAT: String(this.seatId),
+          MUUUUSE_SESSION: this.sessionName,
+        }
+        : null,
+    });
     if (!sessionFile) {
       return;
     }
@@ -506,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) {
@@ -598,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,
@@ -612,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");