@gorlitzer-labs/apiary 1.13.9 → 1.15.0

package/dist/cli/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   join
-} from "../chunk-7JXPJO3R.js";
+} from "../chunk-74XU7HHN.js";
 import {
   deliverInvite,
   sameApiaryServer
-} from "../chunk-MEWZT5KA.js";
+} from "../chunk-W4KWQKPP.js";
 import {
   checkForUpdate,
   printUpdateNotice
@@ -16,38 +16,40 @@ import {
   isAgentAlive,
   listAgentSessions,
   listRoomSessions,
-  resetTerminal,
   resolveBindAddress,
   saveAgentSession,
-  serve,
+  serve
+} from "../chunk-3UQBSELW.js";
+import "../chunk-PEB6HEFT.js";
+import {
+  TmuxBridge,
+  buildRuntimeMcpOptions,
+  composerStillHolds,
+  trackRoomEvent
+} from "../chunk-OEAHTZCA.js";
+import {
+  EventProcessor,
+  RUNTIME_TOOL_NAMES,
+  SseMultiplexer,
+  createRuntimeMcpServer,
+  parseEngagementMode,
+  shouldReportActivity
+} from "../chunk-Z4J6TRJY.js";
+import {
+  buildShareUrl,
+  resetTerminal,
   tmuxAttach,
   tmuxAvailable,
   tmuxCapturePane,
   tmuxCreateSession,
   tmuxInjectPaste,
-  tmuxInjectText,
   tmuxKillSession,
   tmuxPaneIsShell,
   tmuxSendCommand,
   tmuxSendEnter,
   tmuxSendKey,
   tmuxSessionExists
-} from "../chunk-BCQQJR5E.js";
-import "../chunk-PEB6HEFT.js";
-import {
-  buildRuntimeMcpOptions
-} from "../chunk-XLUTCAY6.js";
-import {
-  EventProcessor,
-  RUNTIME_TOOL_NAMES,
-  SseMultiplexer,
-  createRuntimeMcpServer,
-  parseEngagementMode,
-  shouldReportActivity
-} from "../chunk-WJD5EKO6.js";
-import {
-  buildShareUrl
-} from "../chunk-4A7MREYX.js";
+} from "../chunk-N2LPKMPO.js";
 import {
   randomName
 } from "../chunk-D7DXZQWT.js";
@@ -61,349 +63,6 @@ import { writeFileSync as writeFileSync2, mkdtempSync, mkdirSync, rmSync, chmodS
 import { join as join4 } from "path";
 import { tmpdir, homedir as homedir3 } from "os";
 
-// src/cli/composer.ts
-var PROMPT_MARKER = /^\s*[›❯>]\s?/;
-function composerBlock(lines) {
-  const tail = lines.slice(-25);
-  let start = -1;
-  for (let i = tail.length - 1; i >= 0; i--) {
-    if (PROMPT_MARKER.test(tail[i])) {
-      start = i;
-      break;
-    }
-  }
-  if (start === -1) return "";
-  return tail.slice(start).join(" ");
-}
-function submissionProbe(text) {
-  return text.replace(/\s+/g, " ").trim().slice(0, 40);
-}
-function composerStillHolds(lines, text) {
-  const probe = submissionProbe(text);
-  if (probe.length < 8) return false;
-  const composer = composerBlock(lines).replace(/\s+/g, " ");
-  return composer.includes(probe);
-}
-
-// src/cli/claude/tmux-bridge.ts
-var SPINNER_CHARS = "\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F";
-var BUSY_PATTERNS = [
-  // "← 1 agent" / "← 3 agents"
-  /←\s*\d+\s+agents?\b/
-];
-var DIALOG_PATTERNS = [
-  "Enter to select",
-  "to navigate",
-  "Esc to cancel",
-  "Ready to code?",
-  "Review your answers",
-  "ctrl+g to edit in"
-];
-var PERMISSION_PATTERNS = [
-  "(Y)",
-  "Allow ",
-  "Deny ",
-  "approve",
-  "Yes / No",
-  // Current Claude Code wording, captured from a live prompt. Without these a
-  // permission dialog reads as idle and the bridge pastes a room event into
-  // it, answering on the agent's behalf.
-  "Do you want to proceed?",
-  "don't ask again",
-  // The folder-trust modal, which no flag skips.
-  "Yes, I trust this folder"
-];
-var BLOCKING_PATTERNS = [
-  "Do you want to proceed?",
-  "don't ask again",
-  "Yes, I trust this folder",
-  "Ready to code?",
-  "Enter to select",
-  /❯\s*1\.\s*Yes/,
-  /\(y\s*\/\s*n\)/i,
-  // The arrow glyphs claude renders beside it. Bare "to navigate" is prose.
-  /[↑↓⬆⬇]\s*(?:[↑↓⬆⬇]\s*)?to navigate/
-];
-function matchesAny(text, patterns) {
-  const haystack = text.toLowerCase();
-  for (const pattern of patterns) {
-    if (typeof pattern === "string") {
-      if (haystack.includes(pattern.toLowerCase())) return true;
-    } else if (pattern.test(text)) {
-      return true;
-    }
-  }
-  return false;
-}
-function defaultUndeliveredWarning(text) {
-  const preview = text.replace(/\s+/g, " ").slice(0, 80);
-  process.stderr.write(`apiary: message NOT delivered to the agent \u2014 still in its composer: ${preview}
-`);
-}
-var TmuxBridge = class _TmuxBridge {
-  session;
-  queue = [];
-  pollTimer = null;
-  pollIntervalMs;
-  keystrokeDelayMs;
-  onUndelivered;
-  stopped = false;
-  blockedCount = 0;
-  static BLOCKED_THRESHOLD = 150;
-  // ~30s at 200ms poll — force inject if stuck
-  constructor(session, opts) {
-    this.session = session;
-    this.pollIntervalMs = opts?.pollIntervalMs ?? 200;
-    this.keystrokeDelayMs = opts?.keystrokeDelayMs ?? 50;
-    this.onUndelivered = opts?.onUndelivered ?? defaultUndeliveredWarning;
-  }
-  /**
-   * Delivery callback — drop-in replacement for the raw tmuxDeliver lambda.
-   * Pass `bridge.deliver.bind(bridge)` to EventProcessor.run().
-   */
-  async deliver(parts, opts) {
-    const text = contentPartsToString(parts);
-    if (!text.trim()) return;
-    this.inject(text, opts?.dedupe === true);
-  }
-  /**
-   * Detect the current TUI state by reading the screen.
-   * Exported for testing — the heuristic logic is in detectStateFromLines().
-   */
-  detectState() {
-    if (tmuxPaneIsShell(this.session)) return "absent";
-    const lines = this.captureScreen();
-    return detectStateFromLines(lines);
-  }
-  /**
-   * State to REPORT to the room, as opposed to the state used to decide
-   * whether it is safe to type. Same screen, stricter about claiming a human
-   * is needed — see detectReportedStateFromLines.
-   */
-  detectReportedState() {
-    if (tmuxPaneIsShell(this.session)) return "absent";
-    return detectReportedStateFromLines(this.captureScreen());
-  }
-  /**
-   * Extract claude's live status label from the pane (the "Sautéed for 12s",
-   * "Compacting conversation… 23%" lines under the prompt). Returns null when
-   * the agent is idle / no status visible.
-   *
-   * The room TUI calls this through the agent runtime's poll loop to surface
-   * "is the agent actually working or stuck?" without making the user attach
-   * to each tmux pane.
-   */
-  getActivityLabel() {
-    return extractActivityLabel(this.captureScreen());
-  }
-  /**
-   * Try to inject text, choosing strategy based on TUI state.
-   * If the state is unsafe, queues the text and starts polling.
-   *
-   * Text is flattened to a single line before injection to avoid triggering
-   * Claude Code's paste detection. When multi-line text arrives via
-   * `send-keys -l`, Claude Code detects it as a paste and collapses it into
-   * "[Pasted text #1 +N lines]" which may not reliably submit with Enter.
-   */
-  inject(text, dedupe) {
-    const flat = text.replace(/\n/g, " ");
-    const state = this.detectState();
-    switch (state) {
-      case "idle":
-        this.injectIdle(flat);
-        break;
-      case "typing":
-        this.injectWhileTyping(flat);
-        break;
-      default:
-        this.enqueue(flat, dedupe);
-        break;
-    }
-  }
-  /** Capture the screen via tmux capture-pane. */
-  captureScreen() {
-    return tmuxCapturePane(this.session);
-  }
-  /**
-   * Inject into an idle prompt: type text + Enter, then check it went.
-   *
-   * This used to fire a second Enter unconditionally as a "safety net" against
-   * Claude Code's paste detection swallowing the first. That is a guess in both
-   * directions: it cannot tell whether the first Enter worked, and it cannot
-   * tell whether the second one did either. Reading the composer back answers
-   * the question instead, and only sends the second Enter when it is needed.
-   */
-  injectIdle(text) {
-    tmuxInjectText(this.session, text);
-    tmuxSendEnter(this.session);
-    this.confirmSubmitted(text);
-  }
-  /**
-   * Check the message left the composer, and press Enter once more if it did not.
-   *
-   * A submitted message moves into the transcript; one still in the composer was
-   * never sent. If it is still there after the retry, the room is told rather
-   * than left to read the agent's silence as a choice.
-   */
-  confirmSubmitted(text) {
-    this.sleep(80);
-    if (!composerStillHolds(this.captureScreen(), text)) return;
-    tmuxSendEnter(this.session);
-    this.sleep(120);
-    if (!composerStillHolds(this.captureScreen(), text)) return;
-    this.onUndelivered(text);
-  }
-  /**
-   * Inject while the user is typing:
-   * 1. Ctrl+U — cut line to kill ring
-   * 2. Inject our text + Enter
-   * 3. Ctrl+Y — paste the user's text back
-   */
-  injectWhileTyping(text) {
-    tmuxSendKey(this.session, "C-u");
-    this.sleep(this.keystrokeDelayMs);
-    tmuxInjectText(this.session, text);
-    tmuxSendEnter(this.session);
-    this.confirmSubmitted(text);
-    this.sleep(this.keystrokeDelayMs);
-    tmuxSendKey(this.session, "C-y");
-  }
-  /** Add to queue and start polling if not already. */
-  enqueue(text, dedupe) {
-    if (dedupe && this.queue.includes(text)) return;
-    this.queue.push(text);
-    this.startPolling();
-  }
-  /** Start the polling timer to drain queued events. */
-  startPolling() {
-    if (this.pollTimer || this.stopped) return;
-    this.pollTimer = setInterval(() => this.drainQueue(), this.pollIntervalMs);
-  }
-  /** Stop the polling timer. */
-  stopPolling() {
-    if (this.pollTimer) {
-      clearInterval(this.pollTimer);
-      this.pollTimer = null;
-    }
-  }
-  /**
-   * Try to drain one queued event if the state is safe.
-   *
-   * Drains one event at a time rather than batching all into one multi-line
-   * string — multi-line text triggers Claude Code's paste detection which
-   * collapses it into "[Pasted text #1 +N lines]".
-   *
-   * After injecting one event, the poll continues. The next cycle re-checks
-   * state: if Claude is busy (streaming), remaining events wait. If idle,
-   * the next event is injected. Events are already flattened in inject().
-   */
-  drainQueue() {
-    if (this.queue.length === 0) {
-      this.stopPolling();
-      this.blockedCount = 0;
-      return;
-    }
-    const state = this.detectState();
-    if (state === "idle" || state === "typing") {
-      this.blockedCount = 0;
-      const text = this.queue.shift();
-      if (state === "idle") {
-        this.injectIdle(text);
-      } else {
-        this.injectWhileTyping(text);
-      }
-      if (this.queue.length === 0) {
-        this.stopPolling();
-      }
-    } else {
-      this.blockedCount++;
-      if (this.blockedCount >= _TmuxBridge.BLOCKED_THRESHOLD) {
-        this.blockedCount = 0;
-        const text = this.queue.shift();
-        this.injectIdle(text);
-        if (this.queue.length === 0) this.stopPolling();
-      }
-    }
-  }
-  /** Cleanup. */
-  stop() {
-    this.stopped = true;
-    this.stopPolling();
-    this.queue.length = 0;
-  }
-  /** Synchronous sleep — only used for tiny keystroke delays. */
-  sleep(ms) {
-    if (ms <= 0) return;
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
-  }
-};
-var ACTIVITY_LIVE = /([A-Za-zÀ-ÿ]+…\s*\([^)\n]*\))/;
-var ACTIVITY_COOK = /([A-Za-zÀ-ÿ]+ed\s+for\s+\d+s)/;
-var ACTIVITY_PROG = /((?:Compacting|Thinking|Loading|Connecting)[^()]*?(?:\s+\d+%)?)(?=\s*[(\n]|\s*$)/;
-function extractActivityLabel(lines) {
-  if (lines.length === 0) return null;
-  let best = null;
-  for (const line of lines.slice(-25)) {
-    const m = line.match(ACTIVITY_PROG) ?? line.match(ACTIVITY_COOK) ?? line.match(ACTIVITY_LIVE);
-    if (m) best = m[1].trim();
-  }
-  return best;
-}
-function detectStateFromLines(lines, opts) {
-  if (lines.length === 0) return "unknown";
-  const tail = lines.slice(-30);
-  const tailText = tail.join("\n");
-  if (opts?.ignorePrompts !== true) {
-    for (const pattern of DIALOG_PATTERNS) {
-      if (tailText.includes(pattern)) return "dialog";
-    }
-    for (const pattern of PERMISSION_PATTERNS) {
-      if (tailText.includes(pattern)) return "permission";
-    }
-  }
-  const lastFew = tail.slice(-5).join("");
-  for (const ch of SPINNER_CHARS) {
-    if (lastFew.includes(ch)) return "streaming";
-  }
-  for (const pattern of BUSY_PATTERNS) {
-    if (pattern.test(tailText)) return "streaming";
-  }
-  const promptChar = /^[❯›](\s|$)/;
-  const footerChar = /^[❯›]{2}\s/;
-  const separatorLine = /^[─━─\-]{10,}/;
-  for (let i = tail.length - 1; i >= 0; i--) {
-    const line = tail[i].trimStart();
-    if (footerChar.test(line)) {
-      for (let j = i - 1; j >= 0; j--) {
-        const above = tail[j].trimStart();
-        if (promptChar.test(above)) {
-          const content = above.replace(/^[❯›]\s*/, "").trim();
-          return content.length === 0 ? "idle" : "typing";
-        }
-      }
-      break;
-    }
-  }
-  for (let i = tail.length - 1; i >= 0; i--) {
-    const line = tail[i].trimStart();
-    if (promptChar.test(line)) {
-      const above = i > 0 ? tail[i - 1].trimStart() : "";
-      const below = i < tail.length - 1 ? tail[i + 1].trimStart() : "";
-      if (separatorLine.test(above) || separatorLine.test(below)) {
-        const content = line.replace(/^[❯›]\s*/, "").trim();
-        return content.length === 0 ? "idle" : "typing";
-      }
-    }
-  }
-  return "unknown";
-}
-function detectReportedStateFromLines(lines) {
-  const loose = detectStateFromLines(lines);
-  if (loose !== "dialog" && loose !== "permission") return loose;
-  if (matchesAny(lines.slice(-30).join("\n"), BLOCKING_PATTERNS)) return loose;
-  return detectStateFromLines(lines, { ignorePrompts: true });
-}
-
 // src/cli/runtime-setup.ts
 async function setupAgentRuntime(options) {
   const agentName = options.name ?? randomName();
@@ -433,13 +92,7 @@ async function setupAgentRuntime(options) {
           if (!result.done) {
             const { roomId, event } = result.value;
             const jr = joinResults.find((j) => j.roomId === roomId);
-            if (jr) {
-              if (event.type === "ParticipantJoined") {
-                jr.dataSource.addParticipant(event.participant);
-              } else if (event.type === "ParticipantLeft") {
-                jr.dataSource.removeParticipant(event.participant_id);
-              }
-            }
+            if (jr) trackRoomEvent(jr, event);
           }
           return result;
         }
@@ -1343,7 +996,7 @@ function queueCodexMessage(threadId, text, run = defaultRunner) {
 }
 
 // src/cli/codex/tmux-bridge.ts
-var SPINNER_CHARS2 = "\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F";
+var SPINNER_CHARS = "\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F";
 var APPROVAL_PATTERNS = [
   "Would you like to",
   "needs your approval",
@@ -1390,7 +1043,7 @@ function codexMentionPopupIsOpen(lines) {
   const tail = lines.slice(-20).join("\n");
   return MENTION_POPUP_PATTERNS.some((p) => p.test(tail));
 }
-function defaultUndeliveredWarning2(text) {
+function defaultUndeliveredWarning(text) {
   const preview = text.replace(/\s+/g, " ").slice(0, 80);
   process.stderr.write(`apiary: message NOT delivered to the agent \u2014 still in its composer: ${preview}
 `);
@@ -1412,7 +1065,7 @@ var CodexTmuxBridge = class {
     this.pasteDelayMs = opts?.pasteDelayMs ?? 150;
     this.keystrokeDelayMs = opts?.keystrokeDelayMs ?? 50;
     this.resolveThreadId = opts?.resolveThreadId;
-    this.onUndelivered = opts?.onUndelivered ?? defaultUndeliveredWarning2;
+    this.onUndelivered = opts?.onUndelivered ?? defaultUndeliveredWarning;
   }
   /**
    * The Codex session id, resolved once and remembered.
@@ -1620,7 +1273,7 @@ var CodexTmuxBridge = class {
     Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
   }
 };
-function matchesAny2(text, patterns) {
+function matchesAny(text, patterns) {
   const haystack = text.toLowerCase();
   for (const pattern of patterns) {
     if (typeof pattern === "string") {
@@ -1635,13 +1288,13 @@ function detectCodexStateFromLines(lines) {
   if (lines.length === 0) return "unknown";
   const tail = lines.slice(-20);
   const tailText = tail.join("\n");
-  if (matchesAny2(tailText, BLOCKED_PATTERNS)) return "blocked";
-  if (matchesAny2(tailText, APPROVAL_PATTERNS)) return "approval";
+  if (matchesAny(tailText, BLOCKED_PATTERNS)) return "blocked";
+  if (matchesAny(tailText, APPROVAL_PATTERNS)) return "approval";
   for (const pattern of STREAMING_PATTERNS) {
     if (pattern.test(tailText)) return "streaming";
   }
   const lastFew = tail.slice(-5).join("");
-  for (const ch of SPINNER_CHARS2) {
+  for (const ch of SPINNER_CHARS) {
     if (lastFew.includes(ch)) return "streaming";
   }
   const nonEmpty = tail.filter((l) => l.trim().length > 0);
@@ -2155,7 +1808,7 @@ async function main() {
     const all = rest.includes("--all");
     const positional = rest.find((a) => !a.startsWith("--"));
     const name = getFlag("name", rest) ?? positional;
-    const { roomStop } = await import("../room-ID4DQDPT.js");
+    const { roomStop } = await import("../room-S6ULVAEH.js");
     if (all) {
       for (const r of listRoomSessions()) {
         try {
@@ -2229,7 +1882,7 @@ async function main() {
     if (sub === "create") {
       const portStr = getFlag("port", roomArgs);
       const port = portStr ? parseInt(portStr, 10) : void 0;
-      const { roomCreate } = await import("../room-ID4DQDPT.js");
+      const { roomCreate } = await import("../room-S6ULVAEH.js");
       await roomCreate({
         room: getFlag("room", roomArgs) ?? roomArgs.find((a) => !a.startsWith("--")),
         port,
@@ -2246,12 +1899,12 @@ async function main() {
         console.error("Usage: apiary room resume <name>");
         process.exit(1);
       }
-      const { roomResume } = await import("../room-ID4DQDPT.js");
+      const { roomResume } = await import("../room-S6ULVAEH.js");
       await roomResume(name);
       return;
     }
     if (sub === "list" || sub === "ls") {
-      const { roomList } = await import("../room-ID4DQDPT.js");
+      const { roomList } = await import("../room-S6ULVAEH.js");
       roomList();
       return;
     }
@@ -2261,7 +1914,7 @@ async function main() {
         console.error("Usage: apiary room stop <name>");
         process.exit(1);
       }
-      const { roomStop } = await import("../room-ID4DQDPT.js");
+      const { roomStop } = await import("../room-S6ULVAEH.js");
       await roomStop(name);
       return;
     }
@@ -2276,7 +1929,7 @@ async function main() {
         console.error(`Invalid port: ${portStr}`);
         process.exit(1);
       }
-      const { spawnDaemonServer, isDaemonResult } = await import("../room-ID4DQDPT.js");
+      const { spawnDaemonServer, isDaemonResult } = await import("../room-S6ULVAEH.js");
       const daemonRes = await spawnDaemonServer({
         room: roomName,
         port,
@@ -2318,11 +1971,11 @@ async function main() {
     const name = getFlag("name", restArgs) ?? positionalName;
     const pendingUrls = [...joinUrls];
     if (name) {
-      const { consumeInvite } = await import("../invites-GRROUSCE.js");
+      const { consumeInvite } = await import("../invites-SJ4ZVKVX.js");
       const inviteUrl = consumeInvite(name);
       if (inviteUrl) pendingUrls.push(inviteUrl);
     }
-    const { runMcpServer } = await import("../run-C22WQZVK.js");
+    const { runMcpServer } = await import("../run-5PSUQJF4.js");
     await runMcpServer({
       joinUrls: pendingUrls.length > 0 ? pendingUrls : void 0,
       name,