muuuuse 1.3.0 → 1.3.1

package/README.md

@@ -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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muuuuse",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "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/runtime.js

@@ -31,7 +31,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 +78,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 +160,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 +177,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 +212,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 +235,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 +251,7 @@ class SeatProcess {
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
+      childToken: this.childToken,
       agentType: this.agentType,
       command: this.commandTokens,
       relayCount: this.relayCount,
@@ -307,6 +327,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 +336,7 @@ class SeatProcess {
     });
 
     this.childPid = this.child.pid;
+    this.processStartedAtMs = Date.now();
     this.writeMeta();
     this.writeStatus({
       partnerSeatId: this.partnerSeatId,
@@ -352,15 +374,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 +415,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;
     }