muuuuse 2.3.4 → 2.3.5

package/README.md

@@ -15,16 +15,13 @@ It does one job:
 The whole surface is:
 
 ```bash
-muuuuse
 muuuuse 1
 muuuuse 1 flow on
 muuuuse 1 flow off
 muuuuse 1 flow off continue 5
-muuuuse 1 flow on continue 3 5 6
 muuuuse 2
 muuuuse 2 flow off
 muuuuse 2 flow on continue 3
-muuuuse 2 flow on continue 3 5 6
 muuuuse 3
 muuuuse 3 flow on
 muuuuse 4
@@ -51,7 +48,7 @@ Now both shells are armed. `muuuuse 1` generates the session key, `muuuuse 2` si
 
 `flow on` means that seat relays commentary and final answers. `flow off` means that seat relays and accepts final answers only. Mixed calibration is allowed per seat.
 
-`continue <seat> [<seat> ...]` forwards that seat's relayed output into one or more additional armed seats without changing the signed odd/even pair law. This lets you build local loops like `1 -> 2 -> 3 -> 4 -> 1`, split chains like `2 -> 3` and `2 -> 5`, or wider local meshes while every adjacent pair still keeps its own session keypair.
+`continue <seat>` forwards that seat's relayed output into another armed seat without changing the signed odd/even pair law. This lets you build local loops like `1 -> 2 -> 3 -> 4 -> 1` while every adjacent pair still keeps its own session keypair.
 
 If you want Codex in one and Gemini in the other, start them inside the armed shells:
 
@@ -81,7 +78,7 @@ muuuuse stop
 
 - state lives under `~/.muuuuse`
 - only the signed armed pair can exchange relay events
-- `continue <seat> [<seat> ...]` is a separate local forwarding lane and can target any armed seat numbers
+- `continue <seat>` is a separate local forwarding lane and can target any armed seat number
 - supported relay detection is built for Codex, Claude, and Gemini
 
 ## Install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muuuuse",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "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, normalizeSeatId, usage } = require("./util");
+const { BRAND, getPartnerSeatId, normalizeSeatId, usage } = require("./util");
 const { ArmedSeat, getStatusReport, stopAllSessions } = require("./runtime");
 
 async function main(argv = process.argv.slice(2)) {
@@ -56,10 +56,10 @@ async function main(argv = process.argv.slice(2)) {
 
   const seatId = normalizeSeatId(command);
   if (seatId) {
-    const { flowMode, continueSeatId, continueSeatIds } = parseSeatOptions(command, argv.slice(1));
+    const { flowMode, continueSeatId, continueTargets } = parseSeatOptions(command, argv.slice(1));
     const seat = new ArmedSeat({
       cwd: process.cwd(),
-      continueSeatIds,
+      continueTargets,
       continueSeatId,
       flowMode,
       seatId,
@@ -84,11 +84,9 @@ function renderSeatStatus(seat) {
   if (seat.partnerLive) {
     bits.push("peer live");
   }
-  const continueSeatIds = Array.isArray(seat.continueSeatIds)
-    ? seat.continueSeatIds
-    : (seat.continueSeatId ? [seat.continueSeatId] : []);
-  if (continueSeatIds.length > 0) {
-    bits.push(`continue ${continueSeatIds.join(",")}`);
+  const renderedLinks = renderLinkTargets(seat);
+  if (renderedLinks) {
+    bits.push(`link ${renderedLinks}`);
   }
   if (seat.trust) {
     bits.push(`trust ${seat.trust}`);
@@ -107,16 +105,34 @@ 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";
-  const continueSeatIds = [];
-  let sawContinue = false;
+  let continueSeatId = null;
+  let continueTargets = [];
   let index = 0;
 
   while (index < args.length) {
     const token = String(args[index] || "").trim().toLowerCase();
 
-    if (token === "flow" && !sawContinue) {
+    if (token === "flow") {
       const flowToken = String(args[index + 1] || "").trim().toLowerCase();
       if (flowToken === "on" || flowToken === "off") {
         flowMode = flowToken;
@@ -127,22 +143,23 @@ function parseSeatOptions(command, args) {
     }
 
     if (token === "continue") {
-      sawContinue = true;
-      let consumedTargets = 0;
-      index += 1;
-
-      while (index < args.length) {
-        const targetSeatId = normalizeSeatId(args[index]);
-        if (!targetSeatId) {
-          break;
-        }
-
-        continueSeatIds.push(targetSeatId);
-        consumedTargets += 1;
-        index += 1;
+      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 (consumedTargets > 0) {
+    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;
@@ -152,18 +169,98 @@ function parseSeatOptions(command, args) {
   }
 
   if (index === args.length) {
-    return {
-      flowMode,
-      continueSeatId: continueSeatIds[0] || null,
-      continueSeatIds,
-    };
+    return { flowMode, continueSeatId, continueTargets };
   }
 
   throw new Error(
-    `\`muuuuse ${command}\` accepts no extra arguments, \`flow on\` / \`flow off\`, optional \`continue <seat> [<seat> ...]\`, or both in sequence. Run it directly in the terminal you want to arm.`
+    `\`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.`
   );
 }
 
+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;
+  }
+  return null;
+}
+
+function upsertTarget(targets, nextTarget) {
+  const existingIndex = targets.findIndex((entry) => entry.targetSeatId === nextTarget.targetSeatId);
+  if (existingIndex >= 0) {
+    targets[existingIndex] = nextTarget;
+    return;
+  }
+  targets.push(nextTarget);
+}
+
 module.exports = {
   main,
 };

package/src/runtime.js

@@ -91,34 +91,24 @@ function normalizeContinueSeatId(value) {
   return seatId || null;
 }
 
-function normalizeContinueSeatIds(value) {
-  const values = Array.isArray(value) ? value : [value];
+function normalizeContinueTargets(targets, defaultFlowMode = "off") {
+  const normalized = [];
   const seen = new Set();
-  const seatIds = [];
 
-  for (const entry of values) {
-    const seatId = normalizeContinueSeatId(entry);
-    if (!seatId || seen.has(seatId)) {
+  for (const entry of Array.isArray(targets) ? targets : []) {
+    const targetSeatId = normalizeSeatId(entry?.targetSeatId ?? entry?.seatId ?? entry);
+    if (!targetSeatId || seen.has(targetSeatId)) {
       continue;
     }
 
-    seen.add(seatId);
-    seatIds.push(seatId);
-  }
-
-  return seatIds;
-}
-
-function resolveContinueSeatConfig(continueSeatIds, continueSeatId) {
-  if (Array.isArray(continueSeatIds) && continueSeatIds.length > 0) {
-    return continueSeatIds;
-  }
-
-  if (continueSeatIds !== undefined && continueSeatIds !== null && !Array.isArray(continueSeatIds)) {
-    return continueSeatIds;
+    seen.add(targetSeatId);
+    normalized.push({
+      targetSeatId,
+      flowMode: normalizeFlowMode(entry?.flowMode ?? entry?.flow ?? defaultFlowMode),
+    });
   }
 
-  return continueSeatId;
+  return normalized;
 }
 
 function resolveShell() {
@@ -501,6 +491,7 @@ 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,
   });
@@ -520,6 +511,7 @@ 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,
   };
@@ -643,12 +635,15 @@ class ArmedSeat {
     this.partnerSeatId = getPartnerSeatId(options.seatId);
     this.anchorSeatId = isAnchorSeat(options.seatId) ? options.seatId : this.partnerSeatId;
     this.flowMode = normalizeFlowMode(options.flowMode);
-    this.continueSeatIds = normalizeContinueSeatIds(
-      resolveContinueSeatConfig(options.continueSeatIds, options.continueSeatId)
+    this.continueTargets = normalizeContinueTargets(
+      options.continueTargets || (
+        options.continueSeatId ? [{ targetSeatId: options.continueSeatId, flowMode: options.flowMode }] : []
+      ),
+      this.flowMode
     );
-    this.continueSeatId = this.continueSeatIds[0] || null;
+    this.continueSeatId = this.continueTargets[0]?.targetSeatId || normalizeContinueSeatId(options.continueSeatId);
     this.cwd = normalizeWorkingPath(options.cwd);
-    if (this.continueSeatIds.includes(this.seatId)) {
+    if (this.continueTargets.some((target) => target.targetSeatId === this.seatId)) {
       throw new Error(`\`muuuuse ${this.seatId}\` cannot continue to itself.`);
     }
     this.sessionName = resolveSessionName(this.cwd, this.seatId);
@@ -724,8 +719,8 @@ class ArmedSeat {
       partnerSeatId: this.partnerSeatId,
       sessionName: this.sessionName,
       flowMode: this.flowMode,
-      continueSeatIds: this.continueSeatIds,
       continueSeatId: this.continueSeatId,
+      continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
@@ -741,8 +736,8 @@ class ArmedSeat {
       partnerSeatId: this.partnerSeatId,
       sessionName: this.sessionName,
       flowMode: this.flowMode,
-      continueSeatIds: this.continueSeatIds,
       continueSeatId: this.continueSeatId,
+      continueTargets: this.continueTargets,
       cwd: this.cwd,
       pid: process.pid,
       childPid: this.childPid,
@@ -1088,8 +1083,12 @@ 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 = normalizeContinueSeatId(targetSeatId);
+    const normalizedTargetSeatId = normalizeSeatId(targetSeatId);
     if (!normalizedTargetSeatId) {
       return null;
     }
@@ -1141,7 +1140,8 @@ class ArmedSeat {
         return;
       }
 
-      if (!shouldAcceptInboundEntry(this.flowMode, entry)) {
+      const inboundFlowMode = normalizeFlowMode(entry.flowMode || this.flowMode);
+      if (!shouldAcceptInboundEntry(inboundFlowMode, entry)) {
         continue;
       }
 
@@ -1153,6 +1153,7 @@ class ArmedSeat {
         seatId: entry.seatId,
         origin: entry.origin || "unknown",
         phase: getRelayPhase(entry),
+        flowMode: inboundFlowMode,
         createdAt: entry.createdAt,
         text: payload,
       });
@@ -1208,7 +1209,8 @@ class ArmedSeat {
         return;
       }
 
-      if (!shouldAcceptInboundEntry(this.flowMode, entry)) {
+      const continueFlowMode = normalizeFlowMode(entry.flowMode || this.flowMode);
+      if (!shouldAcceptInboundEntry(continueFlowMode, entry)) {
         continue;
       }
 
@@ -1420,12 +1422,13 @@ 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: this.flowMode === "on" }
+        { flowMode: captureCommentary }
       );
       this.liveState.offset = result.nextOffset;
       answers.push(...result.answers);
@@ -1434,7 +1437,7 @@ class ArmedSeat {
         this.liveState.sessionFile,
         this.liveState.offset,
         this.liveState.captureSinceMs,
-        { flowMode: this.flowMode === "on" }
+        { flowMode: captureCommentary }
       );
       this.liveState.offset = result.nextOffset;
       answers.push(...result.answers);
@@ -1443,7 +1446,7 @@ class ArmedSeat {
         this.liveState.sessionFile,
         this.liveState.lastMessageId,
         this.liveState.captureSinceMs,
-        { flowMode: this.flowMode === "on" }
+        { flowMode: captureCommentary }
       );
       this.liveState.lastMessageId = result.lastMessageId;
       this.liveState.offset = result.fileSize;
@@ -1501,6 +1504,7 @@ 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,
@@ -1520,20 +1524,23 @@ class ArmedSeat {
   }
 
   forwardContinuation(signedEntry) {
-    if (this.continueSeatIds.length === 0) {
+    if (this.continueTargets.length === 0) {
       return;
     }
 
-    for (const continueSeatId of this.continueSeatIds) {
-      const target = this.findContinuationTarget(continueSeatId);
+    for (const targetEntry of this.continueTargets) {
+      const target = this.findContinuationTarget(targetEntry.targetSeatId);
       if (!target) {
-        this.log(`[${this.seatId}] continue ${continueSeatId} unavailable`);
+        this.log(`[${this.seatId}] continue ${targetEntry.targetSeatId} unavailable`);
         continue;
       }
 
-      const continuationEntry = buildContinuationEntry(this.sessionName, target.seatId, signedEntry);
+      const continuationEntry = buildContinuationEntry(this.sessionName, target.seatId, {
+        ...signedEntry,
+        flowMode: targetEntry.flowMode,
+      });
       appendJsonl(target.paths.continuePath, continuationEntry);
-      this.log(`[${this.seatId} => ${target.seatId}] ${previewText(continuationEntry.text)}`);
+      this.log(`[${this.seatId} => ${target.seatId} ${targetEntry.flowMode}] ${previewText(continuationEntry.text)}`);
     }
   }
 
@@ -1583,9 +1590,10 @@ 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.continueSeatIds.length > 0) {
-      const targetLabel = this.continueSeatIds.length === 1 ? "seat" : "seats";
-      this.log(`Seat ${this.seatId} continues to ${targetLabel} ${this.continueSeatIds.join(", ")}.`);
+    if (this.continueTargets.length > 0) {
+      this.log(
+        `Seat ${this.seatId} continues to ${this.continueTargets.map((target) => `seat ${target.targetSeatId} (${target.flowMode})`).join(", ")}.`
+      );
     }
     if (isAnchorSeat(this.seatId)) {
       this.log(`Seat ${this.seatId} generated the session key and is waiting for seat ${this.partnerSeatId} to sign it.`);
@@ -1684,19 +1692,20 @@ function buildSeatReport(sessionName, seatId) {
     return null;
   }
 
-  const continueSeatIds = normalizeContinueSeatIds(
-    resolveContinueSeatConfig(
-      status?.continueSeatIds ?? meta?.continueSeatIds,
-      status?.continueSeatId ?? meta?.continueSeatId
-    )
-  );
-
   return {
     seatId,
+    partnerSeatId: status?.partnerSeatId || meta?.partnerSeatId || getPartnerSeatId(seatId),
     state: wrapperLive ? status?.state || "running" : "orphaned_child",
     flowMode: status?.flowMode || meta?.flowMode || "off",
-    continueSeatId: continueSeatIds[0] || null,
-    continueSeatIds,
+    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

@@ -284,36 +284,27 @@ function usage() {
   return [
     `${BRAND} arms regular terminals in isolated odd/even pairs and relays assistant output between each pair.`,
     "",
-    "Command List:",
+    "Usage:",
     "  muuuuse",
-    "    Show this command list.",
-    "",
-    "  muuuuse <seat>",
-    "    Arm a seat and keep its normal odd/even partner relay behavior.",
-    "",
-    "  muuuuse <seat> flow on",
-    "    Relay commentary and final answers into that armed shell.",
-    "",
-    "  muuuuse <seat> flow off",
-    "    Relay final answers only into that armed shell.",
-    "",
-    "  muuuuse <seat> flow on continue <seat> [<seat> ...]",
-    "    Fan that seat's relayed output into one or more additional armed seats.",
-    "",
-    "  muuuuse status",
-    "    Show all armed seats, flow mode, pair trust, and continuation targets.",
-    "",
+    "  muuuuse 1",
+    "  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",
     "  muuuuse stop",
-    "    Stop every armed seat in the current cwd.",
+    "  muuuuse status",
     "",
     "Flow:",
     "  1. Run `muuuuse 1` in terminal one.",
     "  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. Optional: arm each seat with `flow on` or `flow off`.",
-    "  6. Optional: add `continue <seat> [<seat> ...]` to forward that seat's relayed output into more armed seats.",
-    "  7. Use those armed shells normally.",
+    "  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.",
     "  8. `flow off` sends final answers only. `flow on` keeps assistant commentary bouncing.",
     "  9. Run `muuuuse status` or `muuuuse stop` from any shell.",
     "",