u-foo 2.3.14 → 2.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/chat/agentViewController.js

@@ -32,6 +32,7 @@ function createAgentViewController(options = {}) {
     connectAgentInput = () => {},
     disconnectAgentInput = () => {},
     sendRaw = () => {},
+    sendBusMessage = () => {},
     sendResize = () => {},
     requestScreenSnapshot = () => {},
   } = options;
@@ -47,6 +48,9 @@ function createAgentViewController(options = {}) {
   let agentBarVisible = false;
   let detachedChildren = null;
   let agentInputSuppressUntil = 0;
+  let busInputValue = "";
+  let busInputCursor = 0;
+  let busLogLines = [];
   const originalRender = screen.render.bind(screen);
   let renderFrozen = false;
 
@@ -63,6 +67,139 @@ function createAgentViewController(options = {}) {
     return processStdout.columns || 80;
   }
 
+  function stripAnsi(text = "") {
+    return String(text || "").replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "")
+      .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
+  }
+
+  function clamp(value, min, max) {
+    const normalized = Number.isFinite(value) ? Math.floor(value) : min;
+    return Math.max(min, Math.min(max, normalized));
+  }
+
+  function fitText(text = "", width = 1) {
+    const normalizedWidth = Math.max(1, width);
+    const clean = stripAnsi(String(text || "")).replace(/\r/g, "");
+    if (clean.length <= normalizedWidth) {
+      return clean + " ".repeat(normalizedWidth - clean.length);
+    }
+    if (normalizedWidth <= 1) return clean.slice(0, normalizedWidth);
+    return clean.slice(0, normalizedWidth - 1) + "…";
+  }
+
+  function boxTop(title = "", width = 80) {
+    const inner = Math.max(1, width - 2);
+    const label = title ? ` ${title} ` : "";
+    const safe = stripAnsi(label).slice(0, inner);
+    return `┌${safe}${"─".repeat(Math.max(0, inner - safe.length))}┐`;
+  }
+
+  function boxBottom(width = 80) {
+    return `└${"─".repeat(Math.max(1, width - 2))}┘`;
+  }
+
+  function boxMiddle(text = "", width = 80) {
+    const inner = Math.max(1, width - 2);
+    return `│${fitText(text, inner)}│`;
+  }
+
+  function wrapTextLine(text = "", width = 80) {
+    const inner = Math.max(1, width);
+    const clean = stripAnsi(String(text || ""));
+    if (!clean) return [""];
+    const lines = [];
+    let rest = clean;
+    while (rest.length > inner) {
+      lines.push(rest.slice(0, inner));
+      rest = rest.slice(inner);
+    }
+    lines.push(rest);
+    return lines;
+  }
+
+  function getWrappedBusLogLines(width = 80) {
+    const inner = Math.max(1, width - 2);
+    const wrapped = [];
+    for (const line of busLogLines) {
+      wrapped.push(...wrapTextLine(line, inner));
+    }
+    return wrapped;
+  }
+
+  function writeAt(row, content = "") {
+    processStdout.write(`\x1b[${row};1H\x1b[2K${content}`);
+  }
+
+  function resetBusView(agentId) {
+    busInputValue = "";
+    busInputCursor = 0;
+    const label = getAgentLabel(agentId);
+    busLogLines = [
+      `ufoo internal · ${label}`,
+      "Enter 发送 · Esc 返回 · ↓ agent bar",
+      "",
+    ];
+  }
+
+  function appendBusLog(text = "") {
+    const clean = stripAnsi(String(text || "")).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    if (busLogLines.length === 0) busLogLines.push("");
+    for (const char of clean) {
+      if (char === "\n") {
+        busLogLines.push("");
+      } else {
+        busLogLines[busLogLines.length - 1] += char;
+      }
+    }
+    if (busLogLines.length > 1000) {
+      busLogLines = busLogLines.slice(-1000);
+    }
+  }
+
+  function getBusInputViewport(width) {
+    const inner = Math.max(1, width - 4);
+    const value = String(busInputValue || "").replace(/\n/g, "⏎");
+    let start = 0;
+    if (busInputCursor >= inner) {
+      start = busInputCursor - inner + 1;
+    }
+    return {
+      text: value.slice(start, start + inner),
+      cursorCol: Math.max(0, busInputCursor - start),
+    };
+  }
+
+  function renderBusView() {
+    if (currentView !== "agent" || !agentViewUsesBus) return;
+    const rows = getRows();
+    const cols = getCols();
+    const width = Math.max(20, cols);
+    const inputTop = Math.max(4, rows - 3);
+    const logTop = 1;
+    const logBottom = Math.max(logTop + 1, inputTop - 1);
+    const logContentTop = logTop + 1;
+    const logContentBottom = logBottom - 1;
+    const logContentHeight = Math.max(1, logContentBottom - logContentTop + 1);
+    const label = getAgentLabel(viewingAgent);
+
+    processStdout.write("\x1b[?25l");
+    writeAt(logTop, boxTop(`ufoo internal · ${label}`, width));
+    const visibleLines = getWrappedBusLogLines(width).slice(-logContentHeight);
+    for (let i = 0; i < logContentHeight; i += 1) {
+      writeAt(logContentTop + i, boxMiddle(visibleLines[i] || "", width));
+    }
+    writeAt(logBottom, boxBottom(width));
+
+    writeAt(inputTop, boxTop("message", width));
+    const viewport = getBusInputViewport(width);
+    writeAt(inputTop + 1, boxMiddle(`> ${viewport.text}`, width));
+    writeAt(inputTop + 2, boxBottom(width));
+
+    renderAgentDashboard();
+    const cursorCol = clamp(4 + viewport.cursorCol, 1, width);
+    processStdout.write(`\x1b[${inputTop + 1};${cursorCol}H\x1b[?25h`);
+  }
+
   function renderAgentDashboard() {
     if (!agentBarVisible && getFocusMode() !== "dashboard") return;
     const rows = getRows();
@@ -127,8 +264,8 @@ function createAgentViewController(options = {}) {
     agentInputSuppressUntil = now() + 300;
     agentViewUsesBus = Boolean(options.useBus);
     if (agentViewUsesBus) {
-      const label = getAgentLabel(agentId);
-      processStdout.write(`ufoo internal · ${label}\r\n\r\n> `);
+      resetBusView(agentId);
+      renderBusView();
     } else {
       const sockPath = getInjectSockPath(agentId);
       connectAgentOutput(sockPath);
@@ -153,6 +290,9 @@ function createAgentViewController(options = {}) {
     agentViewUsesBus = false;
     agentOutputSuppressed = false;
     agentBarVisible = false;
+    busInputValue = "";
+    busInputCursor = 0;
+    busLogLines = [];
 
     currentView = "main";
     viewingAgent = null;
@@ -199,6 +339,117 @@ function createAgentViewController(options = {}) {
     agentOutputSuppressed = true;
   }
 
+  function insertBusInput(text = "") {
+    const value = String(text || "");
+    if (!value) return;
+    busInputValue = busInputValue.slice(0, busInputCursor) + value + busInputValue.slice(busInputCursor);
+    busInputCursor += value.length;
+    renderBusView();
+  }
+
+  function deleteBusInputBeforeCursor() {
+    if (busInputCursor <= 0) return;
+    busInputValue = busInputValue.slice(0, busInputCursor - 1) + busInputValue.slice(busInputCursor);
+    busInputCursor -= 1;
+    renderBusView();
+  }
+
+  function clearBusInput() {
+    busInputValue = "";
+    busInputCursor = 0;
+    renderBusView();
+  }
+
+  function submitBusInput() {
+    const text = String(busInputValue || "").trim();
+    if (!text) {
+      renderBusView();
+      return;
+    }
+    appendBusLog(`> ${text}\n`);
+    busInputValue = "";
+    busInputCursor = 0;
+    sendBusMessage(viewingAgent, text);
+    renderBusView();
+  }
+
+  function handleBusAgentKey(ch, key = {}) {
+    if (currentView !== "agent" || !agentViewUsesBus) return false;
+    const keyName = key && key.name;
+
+    if (keyName === "down") return false;
+
+    if (keyName === "escape") {
+      exitAgentView();
+      return true;
+    }
+    if (keyName === "return" || keyName === "enter") {
+      if (key && (key.shift || key.meta)) {
+        insertBusInput("\n");
+      } else {
+        submitBusInput();
+      }
+      return true;
+    }
+    if (key && key.ctrl && keyName === "u") {
+      clearBusInput();
+      return true;
+    }
+    if (key && key.ctrl && keyName === "a") {
+      busInputCursor = 0;
+      renderBusView();
+      return true;
+    }
+    if (key && key.ctrl && keyName === "e") {
+      busInputCursor = busInputValue.length;
+      renderBusView();
+      return true;
+    }
+    if (keyName === "left") {
+      busInputCursor = Math.max(0, busInputCursor - 1);
+      renderBusView();
+      return true;
+    }
+    if (keyName === "right") {
+      busInputCursor = Math.min(busInputValue.length, busInputCursor + 1);
+      renderBusView();
+      return true;
+    }
+    if (keyName === "home") {
+      busInputCursor = 0;
+      renderBusView();
+      return true;
+    }
+    if (keyName === "end") {
+      busInputCursor = busInputValue.length;
+      renderBusView();
+      return true;
+    }
+    if (keyName === "backspace") {
+      deleteBusInputBeforeCursor();
+      return true;
+    }
+    if (keyName === "delete") {
+      if (busInputCursor < busInputValue.length) {
+        busInputValue = busInputValue.slice(0, busInputCursor) + busInputValue.slice(busInputCursor + 1);
+        renderBusView();
+      }
+      return true;
+    }
+    if (ch && ch.length > 1 && (!keyName || keyName.length !== 1)) {
+      insertBusInput(ch.replace(/\r\n/g, "\n").replace(/\r/g, "\n"));
+      return true;
+    }
+    const insertChar = (ch && ch.length === 1)
+      ? ch
+      : (keyName && keyName.length === 1 ? keyName : "");
+    if (insertChar && !/^[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]$/.test(insertChar)) {
+      insertBusInput(insertChar);
+      return true;
+    }
+    return true;
+  }
+
   function sendRawToAgent(data) {
     sendRaw(data);
   }
@@ -219,6 +470,11 @@ function createAgentViewController(options = {}) {
     const cleaned = text
       .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "")
       .replace(/\x1b\[(?:[?>=]?[0-9]*c|[?]?6n|5n)/g, "");
+    if (agentViewUsesBus) {
+      appendBusLog(cleaned);
+      renderBusView();
+      return;
+    }
     if (cleaned) processStdout.write(cleaned);
     if (agentBarVisible) {
       const rows = getRows();
@@ -244,7 +500,11 @@ function createAgentViewController(options = {}) {
     const cols = getCols();
     processStdout.write(`\x1b[1;${rows - 1}r`);
     sendResize(cols, Math.max(1, rows - 1));
-    renderAgentDashboard();
+    if (agentViewUsesBus) {
+      renderBusView();
+    } else {
+      renderAgentDashboard();
+    }
     return true;
   }
 
@@ -270,6 +530,9 @@ function createAgentViewController(options = {}) {
 
   function setAgentOutputSuppressed(value) {
     agentOutputSuppressed = Boolean(value);
+    if (!agentOutputSuppressed && agentViewUsesBus) {
+      renderBusView();
+    }
   }
 
   function isAgentBarVisible() {
@@ -295,6 +558,7 @@ function createAgentViewController(options = {}) {
     writeToAgentTerm,
     placeAgentCursor,
     handleResizeInAgentView,
+    handleBusAgentKey,
   };
 }
 

package/src/chat/index.js

@@ -1565,6 +1565,16 @@ async function runChat(projectRoot, options = {}) {
     sendRaw: (data) => {
       sendRawWithCapabilities(data);
     },
+    sendBusMessage: (target, message) => {
+      if (!target || !message) return;
+      send({
+        type: IPC_REQUEST_TYPES.BUS_SEND,
+        target,
+        message,
+        injection_mode: "immediate",
+        source: "chat-internal-agent-view",
+      });
+    },
     sendResize: (cols, rows) => {
       sendResizeWithCapabilities(cols, rows);
     },
@@ -2026,6 +2036,9 @@ async function runChat(projectRoot, options = {}) {
       if (key && key.ctrl && key.name === "c") {
         return; // handled by screen.key(["C-c"])
       }
+      if (agentViewController && agentViewController.handleBusAgentKey(ch, key)) {
+        return;
+      }
       // Down arrow: enter agents bar (same pattern as normal chat dashboard)
       if (key && key.name === "down") {
         enterAgentDashboardMode();