muuuuse 2.3.5 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muuuuse",
-  "version": "2.3.5",
+  "version": "4.0.0",
   "description": "🔌Muuuuse arms regular terminals in isolated pairs and can continue relay output into any other armed seat.",
   "type": "commonjs",
   "bin": {

package/src/agents.js

@@ -555,8 +555,7 @@ function selectClaudeSessionFile(currentPath, processStartedAtMs, options = {})
   return selectSessionCandidatePath(candidates, currentPath, processStartedAtMs);
 }
 
-function extractClaudeAssistantText(content, options = {}) {
-  const flowMode = options.flowMode === true;
+function extractClaudeAssistantText(content) {
   if (!Array.isArray(content)) {
     return "";
   }
@@ -569,7 +568,23 @@ function extractClaudeAssistantText(content, options = {}) {
       if (item.type === "text" && typeof item.text === "string") {
         return [item.text.trim()];
       }
-      if (flowMode && item.type === "thinking" && typeof item.thinking === "string") {
+      return [];
+    })
+    .filter((text) => text.length > 0)
+    .join("\n");
+}
+
+function extractClaudeThinkingText(content) {
+  if (!Array.isArray(content)) {
+    return "";
+  }
+
+  return content
+    .flatMap((item) => {
+      if (!item || typeof item !== "object") {
+        return [];
+      }
+      if (item.type === "thinking" && typeof item.thinking === "string") {
         return [item.thinking.trim()];
       }
       return [];
@@ -586,28 +601,46 @@ function parseClaudeAssistantLine(line, options = {}) {
       return null;
     }
 
-    if (!flowMode && entry.message?.stop_reason !== "end_turn") {
+    const isFinal = entry.message?.stop_reason === "end_turn";
+    if (!flowMode && !isFinal) {
       return null;
     }
 
-    const text = sanitizeRelayText(extractClaudeAssistantText(entry.message.content, options));
-    if (!text) {
-      return null;
+    const id = entry.uuid || entry.message.id || hashText(line);
+    const timestamp = entry.timestamp || new Date().toISOString();
+    const results = [];
+
+    if (flowMode) {
+      const thinking = sanitizeRelayText(extractClaudeThinkingText(entry.message.content));
+      if (thinking) {
+        results.push({
+          id: `${id}-thinking`,
+          text: thinking,
+          phase: "commentary",
+          timestamp,
+        });
+      }
     }
 
-    return {
-      id: entry.uuid || entry.message.id || hashText(line),
-      text,
-      phase: flowMode && entry.message?.stop_reason !== "end_turn" ? "commentary" : "final_answer",
-      timestamp: entry.timestamp || new Date().toISOString(),
-    };
+    const text = sanitizeRelayText(extractClaudeAssistantText(entry.message.content));
+    if (text) {
+      results.push({
+        id,
+        text,
+        phase: isFinal ? "final_answer" : "commentary",
+        timestamp,
+      });
+    }
+
+    return results.length > 0 ? results : null;
   } catch {
     return null;
   }
 }
 
 function parseClaudeFinalLine(line) {
-  return parseClaudeAssistantLine(line, { flowMode: false });
+  const results = parseClaudeAssistantLine(line, { flowMode: false });
+  return Array.isArray(results) ? results[0] || null : results;
 }
 
 function readClaudeAnswers(filePath, offset, sinceMs = null, options = {}) {
@@ -616,8 +649,10 @@ function readClaudeAnswers(filePath, offset, sinceMs = null, options = {}) {
     .split("\n")
     .map((line) => line.trim())
     .filter((line) => line.length > 0)
-    .map((line) => parseClaudeAssistantLine(line, options))
-    .filter((entry) => entry !== null)
+    .flatMap((line) => {
+      const result = parseClaudeAssistantLine(line, options);
+      return Array.isArray(result) ? result : result ? [result] : [];
+    })
     .filter((entry) => isAnswerNewEnough(entry, sinceMs));
 
   return { nextOffset, answers };

package/src/cli.js

@@ -56,11 +56,10 @@ async function main(argv = process.argv.slice(2)) {
 
   const seatId = normalizeSeatId(command);
   if (seatId) {
-    const { flowMode, continueSeatId, continueTargets } = parseSeatOptions(command, argv.slice(1));
+    const { flowMode, continueTargets } = parseSeatOptions(command, argv.slice(1));
     const seat = new ArmedSeat({
       cwd: process.cwd(),
       continueTargets,
-      continueSeatId,
       flowMode,
       seatId,
     });
@@ -116,101 +115,55 @@ function renderLinkTargets(seat) {
   for (const target of Array.isArray(seat.continueTargets) ? seat.continueTargets : []) {
     targets.push(target);
   }
-
-  return targets
-    .map((target) => `${target.targetSeatId}:${target.flowMode}`)
-    .join(", ");
+  if (targets.length === 0) {
+    return "";
+  }
+  return targets.map((target) => `${target.targetSeatId}:${target.flowMode}`).join(", ");
 }
 
 function parseSeatOptions(command, args) {
   const seatId = normalizeSeatId(command);
   let flowMode = "off";
-  let continueSeatId = null;
   let continueTargets = [];
-  let index = 0;
-
-  while (index < args.length) {
-    const token = String(args[index] || "").trim().toLowerCase();
+  if (args.length === 0) {
+    return { flowMode, continueTargets };
+  }
 
-    if (token === "flow") {
-      const flowToken = String(args[index + 1] || "").trim().toLowerCase();
-      if (flowToken === "on" || flowToken === "off") {
-        flowMode = flowToken;
-        index += 2;
-        continue;
-      }
-      break;
+  if (String(args[0] || "").trim().toLowerCase() === "link") {
+    const parsedLinks = parseLinkTargets(args.slice(1), seatId, flowMode);
+    if (parsedLinks.consumed === args.length - 1 && parsedLinks.consumed > 0) {
+      return {
+        flowMode: parsedLinks.flowMode,
+        continueTargets: parsedLinks.continueTargets,
+      };
     }
-
-    if (token === "continue") {
-      const parsedTargets = parseContinueTargets(args.slice(index + 1), flowMode);
-      if (parsedTargets.targets.length > 0) {
-        continueTargets = mergeTargets(continueTargets, parsedTargets.targets);
-        continueSeatId = continueTargets[0].targetSeatId;
-        index += 1 + parsedTargets.consumed;
-        continue;
-      }
-      break;
+  } else {
+    let index = 0;
+
+    const flowToken = String(args[index] || "").trim().toLowerCase();
+    const flowModeToken = String(args[index + 1] || "").trim().toLowerCase();
+    if (flowToken === "flow" && (flowModeToken === "on" || flowModeToken === "off")) {
+      flowMode = flowModeToken;
+      index += 2;
     }
 
-    if (token === "link") {
-      const parsedLinks = parseLinkTargets(args.slice(index + 1), seatId, flowMode);
-      if (parsedLinks.consumed > 0) {
-        flowMode = parsedLinks.flowMode;
-        continueTargets = mergeTargets(continueTargets, parsedLinks.continueTargets);
-        continueSeatId = continueTargets[0]?.targetSeatId || null;
-        index += 1 + parsedLinks.consumed;
-        continue;
-      }
-      break;
+    const continueToken = String(args[index] || "").trim().toLowerCase();
+    const targetSeatId = normalizeSeatId(args[index + 1]);
+    if (continueToken === "continue" && targetSeatId) {
+      continueTargets = [{ targetSeatId, flowMode }];
+      index += 2;
     }
 
-    break;
-  }
-
-  if (index === args.length) {
-    return { flowMode, continueSeatId, continueTargets };
+    if (index === args.length) {
+      return { flowMode, continueTargets };
+    }
   }
 
   throw new Error(
-    `\`muuuuse ${command}\` accepts no extra arguments, \`flow on\` / \`flow off\`, optional \`continue <seat>\`, or \`link <seat> flow on [<seat> flow off ...]\`. Run it directly in the terminal you want to arm.`
+    `\`muuuuse ${command}\` accepts no extra arguments or \`link <seat> flow on [<seat> flow off ...]\`. Run it directly in the terminal you want to arm.`
   );
 }
 
-function mergeTargets(existingTargets, nextTargets) {
-  const merged = [];
-  for (const target of Array.isArray(existingTargets) ? existingTargets : []) {
-    upsertTarget(merged, target);
-  }
-  for (const target of Array.isArray(nextTargets) ? nextTargets : []) {
-    upsertTarget(merged, target);
-  }
-
-  return merged;
-}
-
-function parseContinueTargets(args, defaultFlowMode) {
-  const targets = [];
-  let consumed = 0;
-
-  while (consumed < args.length) {
-    const targetSeatId = normalizeSeatId(args[consumed]);
-    if (!targetSeatId) {
-      break;
-    }
-
-    const nextFlowMode = parseFlowModeToken(args[consumed + 1], args[consumed + 2]);
-    const target = {
-      targetSeatId,
-      flowMode: nextFlowMode || defaultFlowMode,
-    };
-    upsertTarget(targets, target);
-    consumed += nextFlowMode ? 3 : 1;
-  }
-
-  return { consumed, targets };
-}
-
 function parseLinkTargets(args, seatId, defaultFlowMode) {
   const partnerSeatId = seatId ? getPartnerSeatId(seatId) : null;
   const continueTargets = [];
@@ -263,4 +216,5 @@ function upsertTarget(targets, nextTarget) {
 
 module.exports = {
   main,
+  parseSeatOptions,
 };

package/src/runtime.js

@@ -42,6 +42,7 @@ const {
 
 const TYPE_CHUNK_DELAY_MS = 18;
 const TYPE_CHUNK_SIZE = 24;
+const TYPE_SUBMIT_DELAY_MS = 60;
 const MIRROR_SUPPRESSION_WINDOW_MS = 30 * 1000;
 const PENDING_RELAY_CONTEXT_TTL_MS = 2 * 60 * 1000;
 const EMITTED_ANSWER_TTL_MS = 5 * 60 * 1000;
@@ -620,6 +621,14 @@ async function sendTextAndEnter(child, text, shouldAbort = () => false) {
     return false;
   }
 
+  // Some TUIs treat fast, chunked relay typing as paste input and suppress an
+  // immediate Enter. A short settle delay keeps submit behavior reliable.
+  await sleep(TYPE_SUBMIT_DELAY_MS);
+
+  if (shouldAbort() || !child) {
+    return false;
+  }
+
   try {
     child.write("\r");
   } catch {
@@ -641,7 +650,6 @@ class ArmedSeat {
       ),
       this.flowMode
     );
-    this.continueSeatId = this.continueTargets[0]?.targetSeatId || normalizeContinueSeatId(options.continueSeatId);
     this.cwd = normalizeWorkingPath(options.cwd);
     if (this.continueTargets.some((target) => target.targetSeatId === this.seatId)) {
       throw new Error(`\`muuuuse ${this.seatId}\` cannot continue to itself.`);
@@ -719,7 +727,6 @@ class ArmedSeat {
       partnerSeatId: this.partnerSeatId,
       sessionName: this.sessionName,
       flowMode: this.flowMode,
-      continueSeatId: this.continueSeatId,
       continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
@@ -736,7 +743,6 @@ class ArmedSeat {
       partnerSeatId: this.partnerSeatId,
       sessionName: this.sessionName,
       flowMode: this.flowMode,
-      continueSeatId: this.continueSeatId,
       continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
@@ -1516,11 +1522,16 @@ class ArmedSeat {
       buildAnswerSignaturePayload(this.sessionName, this.trustState.challenge, signedEntry),
       this.identity.privateKey
     );
-    appendJsonl(this.paths.eventsPath, signedEntry);
+
+    // Only write to partner events if local flow mode accepts this phase.
+    // Commentary is gated here; continue targets filter independently.
+    if (shouldAcceptInboundEntry(this.flowMode, signedEntry)) {
+      appendJsonl(this.paths.eventsPath, signedEntry);
+      this.log(`[${this.seatId}] ${previewText(payload)}`);
+    }
+
     this.forwardContinuation(signedEntry);
     this.rememberEmittedAnswer(answerKey);
-
-    this.log(`[${this.seatId}] ${previewText(payload)}`);
   }
 
   forwardContinuation(signedEntry) {
@@ -1529,6 +1540,10 @@ class ArmedSeat {
     }
 
     for (const targetEntry of this.continueTargets) {
+      if (!shouldAcceptInboundEntry(targetEntry.flowMode, signedEntry)) {
+        continue;
+      }
+
       const target = this.findContinuationTarget(targetEntry.targetSeatId);
       if (!target) {
         this.log(`[${this.seatId}] continue ${targetEntry.targetSeatId} unavailable`);
@@ -1697,7 +1712,6 @@ function buildSeatReport(sessionName, seatId) {
     partnerSeatId: status?.partnerSeatId || meta?.partnerSeatId || getPartnerSeatId(seatId),
     state: wrapperLive ? status?.state || "running" : "orphaned_child",
     flowMode: status?.flowMode || meta?.flowMode || "off",
-    continueSeatId: status?.continueSeatId || meta?.continueSeatId || null,
     continueTargets: normalizeContinueTargets(
       status?.continueTargets || meta?.continueTargets || (
         (status?.continueSeatId || meta?.continueSeatId)

package/src/util.js

@@ -287,10 +287,10 @@ function usage() {
     "Usage:",
     "  muuuuse",
     "  muuuuse 1",
+    "  muuuuse 1 link 2 flow off",
     "  muuuuse 1 link 2 flow on",
     "  muuuuse 1 link 2 flow on 3 flow off",
     "  muuuuse 2",
-    "  muuuuse 2 link 1 flow on",
     "  muuuuse 3",
     "  muuuuse 4",
     "  muuuuse 4 link 3 flow off 1 flow on",
@@ -298,13 +298,13 @@ function usage() {
     "  muuuuse status",
     "",
     "Flow:",
-    "  1. Run `muuuuse 1` in terminal one.",
-    "  2. Run `muuuuse 2` in terminal two.",
+    "  1. Run `muuuuse 1` in terminal one, then `muuuuse 2` in terminal two.",
+    "  2. Bare seats default to final-only pair relay.",
     "  3. The odd seat generates the session key and the matching even seat signs it automatically.",
     "  4. Additional pairs work the same way: `3/4`, `5/6`, `7/8`...",
-    "  5. Use `link <seat> flow on [<seat> flow off ...]` to set each outbound path.",
-    "  6. Linking the odd/even partner sets the normal pair flow. Extra linked seats become continuations.",
-    "  7. Legacy `flow on` / `flow off` and `continue` still parse, but `link` is the main command shape.",
+    "  5. Use `link <seat> flow on [<seat> flow off ...]` to set each outbound route.",
+    "  6. Include the odd/even partner in `link` to set normal pair flow.",
+    "  7. Any extra linked seats receive routed copies with their own flow mode.",
     "  8. `flow off` sends final answers only. `flow on` keeps assistant commentary bouncing.",
     "  9. Run `muuuuse status` or `muuuuse stop` from any shell.",
     "",