muuuuse 2.3.5 → 2.3.6

package/package.json

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

package/src/cli.js

@@ -1,4 +1,4 @@
-const { BRAND, getPartnerSeatId, normalizeSeatId, usage } = require("./util");
+const { BRAND, normalizeSeatId, usage } = require("./util");
 const { ArmedSeat, getStatusReport, stopAllSessions } = require("./runtime");
 
 async function main(argv = process.argv.slice(2)) {
@@ -56,10 +56,9 @@ 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, continueSeatId } = parseSeatOptions(command, argv.slice(1));
     const seat = new ArmedSeat({
       cwd: process.cwd(),
-      continueTargets,
       continueSeatId,
       flowMode,
       seatId,
@@ -84,9 +83,8 @@ function renderSeatStatus(seat) {
   if (seat.partnerLive) {
     bits.push("peer live");
   }
-  const renderedLinks = renderLinkTargets(seat);
-  if (renderedLinks) {
-    bits.push(`link ${renderedLinks}`);
+  if (seat.continueSeatId) {
+    bits.push(`continue ${seat.continueSeatId}`);
   }
   if (seat.trust) {
     bits.push(`trust ${seat.trust}`);
@@ -105,31 +103,11 @@ function renderSeatStatus(seat) {
   return output;
 }
 
-function renderLinkTargets(seat) {
-  const targets = [];
-  if (seat.partnerSeatId) {
-    targets.push({
-      targetSeatId: seat.partnerSeatId,
-      flowMode: seat.flowMode || "off",
-    });
-  }
-  for (const target of Array.isArray(seat.continueTargets) ? seat.continueTargets : []) {
-    targets.push(target);
-  }
-
-  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) {
+  for (let index = 0; index < args.length;) {
     const token = String(args[index] || "").trim().toLowerCase();
 
     if (token === "flow") {
@@ -143,23 +121,10 @@ function parseSeatOptions(command, args) {
     }
 
     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;
-    }
-
-    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;
+      const targetSeatId = normalizeSeatId(args[index + 1]);
+      if (targetSeatId) {
+        continueSeatId = targetSeatId;
+        index += 2;
         continue;
       }
       break;
@@ -168,97 +133,25 @@ function parseSeatOptions(command, args) {
     break;
   }
 
-  if (index === args.length) {
-    return { flowMode, continueSeatId, continueTargets };
+  if (args.length === 0 || (flowMode || continueSeatId !== null) && consumedAllArgs(args, flowMode, continueSeatId)) {
+    return { flowMode, continueSeatId };
   }
 
   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, \`flow on\` / \`flow off\`, optional \`continue <seat>\`, or both in sequence. 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 = [];
-  let flowMode = defaultFlowMode;
-  let consumed = 0;
-
-  while (consumed < args.length) {
-    const targetSeatId = normalizeSeatId(args[consumed]);
-    if (!targetSeatId) {
-      break;
-    }
-
-    const targetFlowMode = parseFlowModeToken(args[consumed + 1], args[consumed + 2]);
-    if (!targetFlowMode) {
-      break;
-    }
-
-    if (targetSeatId === partnerSeatId) {
-      flowMode = targetFlowMode;
-    } else {
-      upsertTarget(continueTargets, {
-        targetSeatId,
-        flowMode: targetFlowMode,
-      });
-    }
-
-    consumed += 3;
-  }
-
-  return { consumed, continueTargets, flowMode };
-}
-
-function parseFlowModeToken(flowToken, modeToken) {
-  const normalizedFlowToken = String(flowToken || "").trim().toLowerCase();
-  const normalizedModeToken = String(modeToken || "").trim().toLowerCase();
-  if (normalizedFlowToken === "flow" && (normalizedModeToken === "on" || normalizedModeToken === "off")) {
-    return normalizedModeToken;
+function consumedAllArgs(args, flowMode, continueSeatId) {
+  const expected = [];
+  if (flowMode !== "off" || args.includes("flow")) {
+    expected.push("flow", flowMode);
   }
-  return null;
-}
-
-function upsertTarget(targets, nextTarget) {
-  const existingIndex = targets.findIndex((entry) => entry.targetSeatId === nextTarget.targetSeatId);
-  if (existingIndex >= 0) {
-    targets[existingIndex] = nextTarget;
-    return;
+  if (continueSeatId !== null || args.includes("continue")) {
+    expected.push("continue", String(continueSeatId));
   }
-  targets.push(nextTarget);
+  return expected.length === args.length &&
+    expected.every((value, index) => String(args[index]).trim().toLowerCase() === String(value).trim().toLowerCase());
 }
 
 module.exports = {

package/src/runtime.js

@@ -91,26 +91,6 @@ function normalizeContinueSeatId(value) {
   return seatId || null;
 }
 
-function normalizeContinueTargets(targets, defaultFlowMode = "off") {
-  const normalized = [];
-  const seen = new Set();
-
-  for (const entry of Array.isArray(targets) ? targets : []) {
-    const targetSeatId = normalizeSeatId(entry?.targetSeatId ?? entry?.seatId ?? entry);
-    if (!targetSeatId || seen.has(targetSeatId)) {
-      continue;
-    }
-
-    seen.add(targetSeatId);
-    normalized.push({
-      targetSeatId,
-      flowMode: normalizeFlowMode(entry?.flowMode ?? entry?.flow ?? defaultFlowMode),
-    });
-  }
-
-  return normalized;
-}
-
 function resolveShell() {
   const shell = String(process.env.SHELL || "").trim();
   return shell || "/bin/bash";
@@ -491,7 +471,6 @@ function buildAnswerSignaturePayload(sessionName, challenge, entry) {
     seatId: entry.seatId,
     origin: entry.origin,
     phase: entry.phase || "final_answer",
-    flowMode: entry.flowMode || "off",
     createdAt: entry.createdAt,
     text: entry.text,
   });
@@ -511,7 +490,6 @@ function buildContinuationEntry(sourceSessionName, targetSeatId, entry) {
     chainId: entry.chainId,
     hop: entry.hop,
     sourceAnswerId: entry.id,
-    flowMode: entry.flowMode || null,
     publicKey: entry.publicKey || null,
     signature: entry.signature || null,
   };
@@ -621,7 +599,7 @@ async function sendTextAndEnter(child, text, shouldAbort = () => false) {
   }
 
   try {
-    child.write("\r");
+    child.write("\n");
   } catch {
     return false;
   }
@@ -635,15 +613,9 @@ class ArmedSeat {
     this.partnerSeatId = getPartnerSeatId(options.seatId);
     this.anchorSeatId = isAnchorSeat(options.seatId) ? options.seatId : this.partnerSeatId;
     this.flowMode = normalizeFlowMode(options.flowMode);
-    this.continueTargets = normalizeContinueTargets(
-      options.continueTargets || (
-        options.continueSeatId ? [{ targetSeatId: options.continueSeatId, flowMode: options.flowMode }] : []
-      ),
-      this.flowMode
-    );
-    this.continueSeatId = this.continueTargets[0]?.targetSeatId || normalizeContinueSeatId(options.continueSeatId);
+    this.continueSeatId = normalizeContinueSeatId(options.continueSeatId);
     this.cwd = normalizeWorkingPath(options.cwd);
-    if (this.continueTargets.some((target) => target.targetSeatId === this.seatId)) {
+    if (this.continueSeatId === this.seatId) {
       throw new Error(`\`muuuuse ${this.seatId}\` cannot continue to itself.`);
     }
     this.sessionName = resolveSessionName(this.cwd, this.seatId);
@@ -720,7 +692,6 @@ class ArmedSeat {
       sessionName: this.sessionName,
       flowMode: this.flowMode,
       continueSeatId: this.continueSeatId,
-      continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
@@ -737,7 +708,6 @@ class ArmedSeat {
       sessionName: this.sessionName,
       flowMode: this.flowMode,
       continueSeatId: this.continueSeatId,
-      continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
@@ -1083,23 +1053,18 @@ class ArmedSeat {
     return Number.isFinite(requestedAtMs) && requestedAtMs > this.startedAtMs;
   }
 
-  shouldCaptureCommentary() {
-    return this.flowMode === "on" || this.continueTargets.some((target) => target.flowMode === "on");
-  }
-
-  findContinuationTarget(targetSeatId) {
-    const normalizedTargetSeatId = normalizeSeatId(targetSeatId);
-    if (!normalizedTargetSeatId) {
+  findContinuationTarget() {
+    if (!this.continueSeatId) {
       return null;
     }
 
     const candidates = listSessionNames()
       .map((sessionName) => {
-        if (!getSeatDirIfExists(sessionName, normalizedTargetSeatId)) {
+        if (!getSeatDirIfExists(sessionName, this.continueSeatId)) {
           return null;
         }
 
-        const seat = buildSeatReport(sessionName, normalizedTargetSeatId);
+        const seat = buildSeatReport(sessionName, this.continueSeatId);
         if (!seat || !matchesWorkingPath(seat.cwd, this.cwd)) {
           return null;
         }
@@ -1140,8 +1105,7 @@ class ArmedSeat {
         return;
       }
 
-      const inboundFlowMode = normalizeFlowMode(entry.flowMode || this.flowMode);
-      if (!shouldAcceptInboundEntry(inboundFlowMode, entry)) {
+      if (!shouldAcceptInboundEntry(this.flowMode, entry)) {
         continue;
       }
 
@@ -1153,7 +1117,6 @@ class ArmedSeat {
         seatId: entry.seatId,
         origin: entry.origin || "unknown",
         phase: getRelayPhase(entry),
-        flowMode: inboundFlowMode,
         createdAt: entry.createdAt,
         text: payload,
       });
@@ -1209,8 +1172,7 @@ class ArmedSeat {
         return;
       }
 
-      const continueFlowMode = normalizeFlowMode(entry.flowMode || this.flowMode);
-      if (!shouldAcceptInboundEntry(continueFlowMode, entry)) {
+      if (!shouldAcceptInboundEntry(this.flowMode, entry)) {
         continue;
       }
 
@@ -1422,13 +1384,12 @@ class ArmedSeat {
     }
 
     const answers = [];
-    const captureCommentary = this.shouldCaptureCommentary();
     if (detectedAgent.type === "codex") {
       const result = readCodexAnswers(
         this.liveState.sessionFile,
         this.liveState.offset,
         this.liveState.captureSinceMs,
-        { flowMode: captureCommentary }
+        { flowMode: this.flowMode === "on" }
       );
       this.liveState.offset = result.nextOffset;
       answers.push(...result.answers);
@@ -1437,7 +1398,7 @@ class ArmedSeat {
         this.liveState.sessionFile,
         this.liveState.offset,
         this.liveState.captureSinceMs,
-        { flowMode: captureCommentary }
+        { flowMode: this.flowMode === "on" }
       );
       this.liveState.offset = result.nextOffset;
       answers.push(...result.answers);
@@ -1446,7 +1407,7 @@ class ArmedSeat {
         this.liveState.sessionFile,
         this.liveState.lastMessageId,
         this.liveState.captureSinceMs,
-        { flowMode: captureCommentary }
+        { flowMode: this.flowMode === "on" }
       );
       this.liveState.lastMessageId = result.lastMessageId;
       this.liveState.offset = result.fileSize;
@@ -1504,7 +1465,6 @@ class ArmedSeat {
       seatId: this.seatId,
       origin: entry.origin || "unknown",
       phase: entry.phase || "final_answer",
-      flowMode: this.flowMode,
       text: payload,
       createdAt: entry.createdAt || new Date().toISOString(),
       chainId: pendingInboundContext?.chainId || entry.chainId || entryId,
@@ -1524,24 +1484,19 @@ class ArmedSeat {
   }
 
   forwardContinuation(signedEntry) {
-    if (this.continueTargets.length === 0) {
+    if (!this.continueSeatId) {
       return;
     }
 
-    for (const targetEntry of this.continueTargets) {
-      const target = this.findContinuationTarget(targetEntry.targetSeatId);
-      if (!target) {
-        this.log(`[${this.seatId}] continue ${targetEntry.targetSeatId} unavailable`);
-        continue;
-      }
-
-      const continuationEntry = buildContinuationEntry(this.sessionName, target.seatId, {
-        ...signedEntry,
-        flowMode: targetEntry.flowMode,
-      });
-      appendJsonl(target.paths.continuePath, continuationEntry);
-      this.log(`[${this.seatId} => ${target.seatId} ${targetEntry.flowMode}] ${previewText(continuationEntry.text)}`);
+    const target = this.findContinuationTarget();
+    if (!target) {
+      this.log(`[${this.seatId}] continue ${this.continueSeatId} unavailable`);
+      return;
     }
+
+    const continuationEntry = buildContinuationEntry(this.sessionName, target.seatId, signedEntry);
+    appendJsonl(target.paths.continuePath, continuationEntry);
+    this.log(`[${this.seatId} => ${target.seatId}] ${previewText(continuationEntry.text)}`);
   }
 
   async tick() {
@@ -1590,10 +1545,8 @@ class ArmedSeat {
     this.log(`${BRAND} seat ${this.seatId} armed for ${this.sessionName}.`);
     this.log("Use this shell normally. Codex, Claude, and Gemini relay automatically from their local session logs.");
     this.log(`Seat ${this.seatId} relay mode is flow ${this.flowMode}.`);
-    if (this.continueTargets.length > 0) {
-      this.log(
-        `Seat ${this.seatId} continues to ${this.continueTargets.map((target) => `seat ${target.targetSeatId} (${target.flowMode})`).join(", ")}.`
-      );
+    if (this.continueSeatId) {
+      this.log(`Seat ${this.seatId} continues to seat ${this.continueSeatId}.`);
     }
     if (isAnchorSeat(this.seatId)) {
       this.log(`Seat ${this.seatId} generated the session key and is waiting for seat ${this.partnerSeatId} to sign it.`);
@@ -1694,18 +1647,9 @@ function buildSeatReport(sessionName, seatId) {
 
   return {
     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)
-          ? [{ targetSeatId: status?.continueSeatId || meta?.continueSeatId, flowMode: status?.flowMode || meta?.flowMode || "off" }]
-          : []
-      ),
-      status?.flowMode || meta?.flowMode || "off"
-    ),
     wrapperPid,
     childPid,
     wrapperLive,

package/src/util.js

@@ -285,15 +285,17 @@ function usage() {
     `${BRAND} arms regular terminals in isolated odd/even pairs and relays assistant output between each pair.`,
     "",
     "Usage:",
-    "  muuuuse",
     "  muuuuse 1",
-    "  muuuuse 1 link 2 flow on",
-    "  muuuuse 1 link 2 flow on 3 flow off",
+    "  muuuuse 1 flow on",
+    "  muuuuse 1 flow off",
+    "  muuuuse 1 flow on continue 3",
     "  muuuuse 2",
-    "  muuuuse 2 link 1 flow on",
+    "  muuuuse 2 flow on",
+    "  muuuuse 2 flow off",
+    "  muuuuse 2 flow on continue 3",
     "  muuuuse 3",
     "  muuuuse 4",
-    "  muuuuse 4 link 3 flow off 1 flow on",
+    "  muuuuse 4 flow on continue 1",
     "  muuuuse stop",
     "  muuuuse status",
     "",
@@ -302,9 +304,9 @@ function usage() {
     "  2. Run `muuuuse 2` in terminal two.",
     "  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. Optional: arm each seat with `flow on` or `flow off`.",
+    "  6. Optional: add `continue <seat>` to forward that seat's relayed output into another armed seat.",
+    "  7. Use those armed shells normally.",
     "  8. `flow off` sends final answers only. `flow on` keeps assistant commentary bouncing.",
     "  9. Run `muuuuse status` or `muuuuse stop` from any shell.",
     "",