muuuuse 3.1.1 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muuuuse",
-  "version": "3.1.1",
+  "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,
     });
@@ -125,10 +124,9 @@ function renderLinkTargets(seat) {
 function parseSeatOptions(command, args) {
   const seatId = normalizeSeatId(command);
   let flowMode = "off";
-  let continueSeatId = null;
   let continueTargets = [];
   if (args.length === 0) {
-    return { flowMode, continueSeatId, continueTargets };
+    return { flowMode, continueTargets };
   }
 
   if (String(args[0] || "").trim().toLowerCase() === "link") {
@@ -136,7 +134,6 @@ function parseSeatOptions(command, args) {
     if (parsedLinks.consumed === args.length - 1 && parsedLinks.consumed > 0) {
       return {
         flowMode: parsedLinks.flowMode,
-        continueSeatId: parsedLinks.continueTargets[0]?.targetSeatId || null,
         continueTargets: parsedLinks.continueTargets,
       };
     }
@@ -153,13 +150,12 @@ function parseSeatOptions(command, args) {
     const continueToken = String(args[index] || "").trim().toLowerCase();
     const targetSeatId = normalizeSeatId(args[index + 1]);
     if (continueToken === "continue" && targetSeatId) {
-      continueSeatId = targetSeatId;
       continueTargets = [{ targetSeatId, flowMode }];
       index += 2;
     }
 
     if (index === args.length) {
-      return { flowMode, continueSeatId, continueTargets };
+      return { flowMode, continueTargets };
     }
   }
 

package/src/runtime.js

@@ -650,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.`);
@@ -728,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,
@@ -745,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,
@@ -1525,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) {
@@ -1538,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`);
@@ -1706,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)