u-foo 2.3.22 → 2.3.24

package/package.json

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

package/src/bus/inject.js

@@ -1,4 +1,4 @@
-const { spawn } = require("child_process");
+const { spawn, spawnSync } = require("child_process");
 const fs = require("fs");
 const net = require("net");
 const path = require("path");
@@ -12,12 +12,46 @@ const logInject = (message) => {
   }
 };
 
+function escapeAppleScriptString(value) {
+  return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
+function appleScriptStringLiteral(value) {
+  const lines = String(value ?? "").replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
+  if (lines.length === 0) return '""';
+  return lines.map((line) => `"${escapeAppleScriptString(line)}"`).join(" & linefeed & ");
+}
+
+function runAppleScript(lines = []) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn("osascript", lines.flatMap((line) => ["-e", line]));
+    let stderr = "";
+    let stdout = "";
+
+    proc.stdout.on("data", (data) => {
+      stdout += data.toString("utf8");
+    });
+    proc.stderr.on("data", (data) => {
+      stderr += data.toString("utf8");
+    });
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve(stdout.trim());
+      } else {
+        reject(new Error(stderr.trim() || "AppleScript failed"));
+      }
+    });
+    proc.on("error", reject);
+  });
+}
+
 /**
  * 命令注入器 - 将命令注入到终端
  *
  * 支持的方式：
  * 1. PTY socket（直接写入，无需macOS权限）
  * 2. tmux send-keys（无需权限）
+ * 3. Terminal.app/iTerm2 tty lookup（macOS terminal mode fallback）
  */
 class Injector {
   constructor(busDir, agentsFile) {
@@ -175,6 +209,128 @@ class Injector {
     textProc.on("error", reject);
   }
 
+  /**
+   * Use Terminal.app's tty metadata to locate the target tab and paste input.
+   */
+  async injectTerminal(tty, command) {
+    const ttyLiteral = appleScriptStringLiteral(tty);
+    const commandLiteral = appleScriptStringLiteral(command);
+    const lines = [
+      'tell application "Terminal"',
+      "  set targetWindow to missing value",
+      "  set targetTab to missing value",
+      "  repeat with w in windows",
+      "    repeat with t in tabs of w",
+      "      try",
+      `        if tty of t is ${ttyLiteral} then`,
+      "          set targetWindow to w",
+      "          set targetTab to t",
+      "          exit repeat",
+      "        end if",
+      "      end try",
+      "    end repeat",
+      "    if targetTab is not missing value then exit repeat",
+      "  end repeat",
+      "  if targetTab is missing value then",
+      `    error "No Terminal tab found with tty: " & ${ttyLiteral}`,
+      "  end if",
+      "  activate",
+      "  set selected tab of targetWindow to targetTab",
+      "  set index of targetWindow to 1",
+      "end tell",
+      "set oldClipboard to the clipboard",
+      "try",
+      `  set the clipboard to ${commandLiteral}`,
+      "  delay 0.1",
+      '  tell application "System Events"',
+      '    tell process "Terminal"',
+      "      key code 53",
+      "      delay 0.1",
+      '      keystroke "v" using command down',
+      "      delay 0.2",
+      "      keystroke return",
+      "    end tell",
+      "  end tell",
+      "on error errMsg number errNo",
+      "  set the clipboard to oldClipboard",
+      "  error errMsg number errNo",
+      "end try",
+      "delay 0.2",
+      "set the clipboard to oldClipboard",
+    ];
+
+    return runAppleScript(lines);
+  }
+
+  /**
+   * Check if iTerm2 is available before trying its direct write API.
+   */
+  isItermRunning() {
+    try {
+      const res = spawnSync("osascript", ["-e", 'application "iTerm2" is running'], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+      });
+      return res.status === 0 && String(res.stdout || "").trim() === "true";
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Use iTerm2's tty metadata to locate the target session and write input.
+   */
+  async injectIterm(tty, command) {
+    const ttyLiteral = appleScriptStringLiteral(tty);
+    const commandLiteral = appleScriptStringLiteral(command);
+    const lines = [
+      'tell application "iTerm2"',
+      "  activate",
+      "  repeat with w in windows",
+      "    repeat with t in tabs of w",
+      "      repeat with s in sessions of t",
+      "        try",
+      `          if tty of s is ${ttyLiteral} then`,
+      "            select s",
+      `            write text ${commandLiteral} to s`,
+      "            return",
+      "          end if",
+      "        end try",
+      "      end repeat",
+      "    end repeat",
+      "  end repeat",
+      `  error "No iTerm2 session found with tty: " & ${ttyLiteral}`,
+      "end tell",
+    ];
+
+    return runAppleScript(lines);
+  }
+
+  async injectMacTerminal(tty, command, meta = {}) {
+    if (process.platform !== "darwin") {
+      throw new Error("Terminal.app injection is only supported on macOS");
+    }
+
+    const terminalApp = String(meta.terminal_app || meta.terminalApp || "").trim().toLowerCase();
+    const shouldTryIterm = terminalApp === "iterm2" || (!terminalApp && this.isItermRunning());
+
+    if (shouldTryIterm) {
+      try {
+        logInject(`[inject] Using iTerm2 AppleScript for tty: ${tty}`);
+        await this.injectIterm(tty, command);
+        return;
+      } catch (err) {
+        if (terminalApp === "iterm2") {
+          throw err;
+        }
+        logInject(`[inject] iTerm2 failed: ${err.message}, trying Terminal.app`);
+      }
+    }
+
+    logInject(`[inject] Using Terminal.app AppleScript for tty: ${tty}`);
+    await this.injectTerminal(tty, command);
+  }
+
   /**
    * 获取订阅者的 inject socket 路径
    */
@@ -252,6 +408,7 @@ class Injector {
    * 优先级：
    * 1. PTY socket（直接写入，无需macOS权限）
    * 2. tmux send-keys（无需权限）
+   * 3. Terminal.app/iTerm2 tty lookup（terminal mode fallback）
    */
   async inject(subscriber, commandOverride = "") {
     if (String(subscriber || "").startsWith("ufoo-code:")) {
@@ -300,8 +457,10 @@ class Injector {
       }
     }
 
-    // 读取 tty（tmux 需要）
-    const tty = this.readTty(subscriber);
+    // 读取 tty（tmux/Terminal.app fallback 需要）
+    const recordedTty = this.readTty(subscriber);
+    const metaTty = isValidTty(meta.tty) ? meta.tty : "";
+    const tty = recordedTty || metaTty;
 
     // 2. 尝试 tmux（无需权限）
     // Launch mode may be temporarily missing/stale (e.g. rejoin from non-interactive context).
@@ -329,8 +488,17 @@ class Injector {
       }
     }
 
+    // 3. Plain Terminal.app/iTerm2 fallback: locate the window/tab by tty and paste input.
+    const allowMacTerminalFallback = (launchMode === "terminal" || (!launchMode && tty && isValidTty(tty)))
+      && tty
+      && isValidTty(tty);
+    if (allowMacTerminalFallback) {
+      await this.injectMacTerminal(tty, command, meta);
+      return;
+    }
+
     // 没有可用的注入方式
-    throw new Error(`No inject method available for ${subscriber}. PTY socket or tmux required.`);
+    throw new Error(`No inject method available for ${subscriber}. PTY socket, tmux, or Terminal.app injection required.`);
   }
 }
 

package/src/chat/agentViewController.js

@@ -61,6 +61,7 @@ function createAgentViewController(options = {}) {
   let busLogLines = [];
   let busStartupAgentId = "";
   let busStartupLineCount = 0;
+  let busAgentReplyActive = false;
   const originalRender = screen.render.bind(screen);
   let renderFrozen = false;
 
@@ -361,6 +362,7 @@ function createAgentViewController(options = {}) {
   function resetBusView(agentId) {
     busInputValue = "";
     busInputCursor = 0;
+    busAgentReplyActive = false;
     busStartupAgentId = agentId || "";
     const label = getAgentLabel(agentId);
     const startupLines = staticStartupLines(agentId, label, getCols());
@@ -390,6 +392,42 @@ function createAgentViewController(options = {}) {
     if (busLogLines.length > 1000) {
       busLogLines = busLogLines.slice(-1000);
     }
+    if (clean.endsWith("\n")) {
+      busAgentReplyActive = false;
+    }
+  }
+
+  function ensureBusLinePrefix(prefix = "") {
+    if (busLogLines.length === 0) {
+      busLogLines.push(prefix);
+      return;
+    }
+    if (busLogLines[busLogLines.length - 1] === "") {
+      busLogLines[busLogLines.length - 1] = prefix;
+      return;
+    }
+    busLogLines.push(prefix);
+  }
+
+  function appendBusAgentReply(text = "") {
+    const clean = stripAnsi(String(text || "")).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    if (!clean) return;
+    for (const char of clean) {
+      if (char === "\n") {
+        busLogLines.push("");
+        continue;
+      }
+      if (!busAgentReplyActive) {
+        ensureBusLinePrefix("• ");
+        busAgentReplyActive = true;
+      } else if (busLogLines.length === 0 || busLogLines[busLogLines.length - 1] === "") {
+        ensureBusLinePrefix("  ");
+      }
+      busLogLines[busLogLines.length - 1] += char;
+    }
+    if (busLogLines.length > 1000) {
+      busLogLines = busLogLines.slice(-1000);
+    }
   }
 
   function getBusInputViewport(width) {
@@ -533,6 +571,7 @@ function createAgentViewController(options = {}) {
     busLogLines = [];
     busStartupAgentId = "";
     busStartupLineCount = 0;
+    busAgentReplyActive = false;
 
     currentView = "main";
     viewingAgent = null;
@@ -661,6 +700,7 @@ function createAgentViewController(options = {}) {
       return;
     }
     appendBusLog(`> ${text}\n`);
+    busAgentReplyActive = false;
     busInputValue = "";
     busInputCursor = 0;
     sendBusMessage(viewingAgent, text);
@@ -767,7 +807,7 @@ function createAgentViewController(options = {}) {
       .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "")
       .replace(/\x1b\[(?:[?>=]?[0-9]*c|[?]?6n|5n)/g, "");
     if (agentViewUsesBus) {
-      appendBusLog(cleaned);
+      appendBusAgentReply(cleaned);
       renderBusView();
       return;
     }

package/src/code/tui.js

@@ -18,6 +18,77 @@ const STATUS_INDICATORS = {
 
 const ANSI_PATTERN = /\x1B\[[0-9;?]*[ -/]*[@-~]/g;
 
+function charDisplayWidth(char = "") {
+  if (!char) return 0;
+  const code = char.codePointAt(0) || 0;
+  if (code === 0) return 0;
+  if (code < 32 || (code >= 0x7f && code < 0xa0)) return 0;
+  if ((code >= 0x0300 && code <= 0x036f) ||
+    (code >= 0x1ab0 && code <= 0x1aff) ||
+    (code >= 0x1dc0 && code <= 0x1dff) ||
+    (code >= 0x20d0 && code <= 0x20ff) ||
+    (code >= 0xfe20 && code <= 0xfe2f)) {
+    return 0;
+  }
+  if ((code >= 0x1100 && code <= 0x115f) ||
+    code === 0x2329 ||
+    code === 0x232a ||
+    (code >= 0x2e80 && code <= 0xa4cf) ||
+    (code >= 0xac00 && code <= 0xd7a3) ||
+    (code >= 0xf900 && code <= 0xfaff) ||
+    (code >= 0xfe10 && code <= 0xfe19) ||
+    (code >= 0xfe30 && code <= 0xfe6f) ||
+    (code >= 0xff00 && code <= 0xff60) ||
+    (code >= 0xffe0 && code <= 0xffe6) ||
+    (code >= 0x1f300 && code <= 0x1faff)) {
+    return 2;
+  }
+  return 1;
+}
+
+function displayCellWidth(text = "") {
+  return Array.from(String(text || "").replace(ANSI_PATTERN, "")).reduce(
+    (sum, char) => sum + charDisplayWidth(char),
+    0
+  );
+}
+
+function safeRead(getter, fallback = undefined) {
+  try {
+    return getter();
+  } catch {
+    return fallback;
+  }
+}
+
+function resolveLogContentWidth({ logBox = null, screen = null, fallback = 80 } = {}) {
+  const coords = safeRead(() => logBox && typeof logBox._getCoords === "function" ? logBox._getCoords() : null, null);
+  if (coords && Number.isFinite(coords.xl) && Number.isFinite(coords.xi)) {
+    return Math.max(1, coords.xl - coords.xi);
+  }
+  const width = safeRead(() => logBox && logBox.width, null);
+  if (typeof width === "number") return Math.max(1, width);
+  const screenWidth = safeRead(() => screen && screen.width, null);
+  if (typeof screenWidth === "number") return Math.max(1, screenWidth);
+  const screenCols = safeRead(() => screen && screen.cols, null);
+  if (typeof screenCols === "number") return Math.max(1, screenCols);
+  return Math.max(1, fallback);
+}
+
+function formatHighlightedUserInput(text = "", {
+  width = 80,
+  escapeText = (value) => String(value || ""),
+} = {}) {
+  const plain = String(text || "").trim();
+  if (!plain) return "";
+  const targetWidth = Math.max(1, Math.floor(Number(width) || 80) - 1);
+  const prefix = " → ";
+  const suffix = " ";
+  const contentWidth = displayCellWidth(`${prefix}${plain}${suffix}`);
+  const pad = " ".repeat(Math.max(0, targetWidth - contentWidth));
+  return `{cyan-bg}{white-fg}${prefix}${escapeText(plain)}${suffix}${pad}{/white-fg}{/cyan-bg}`;
+}
+
 // Stream buffer for smooth output
 class StreamBuffer {
   constructor(writer, options = {}) {
@@ -1027,13 +1098,12 @@ function runUcodeTui({
 
     const logUserInput = (text = "") => {
       activeToolMerge = null;
-      const plain = String(text || "").trim();
-      if (!plain) return;
-      const content = ` → ${escapeBlessed(plain)} `;
-      const visibleLen = plain.length + 4; // " → " + text + " "
-      const boxWidth = logBox.width || 80;
-      const pad = boxWidth > visibleLen ? " ".repeat(boxWidth - visibleLen) : "";
-      logBox.log(`{cyan-bg}{white-fg}${content}${pad}{/white-fg}{/cyan-bg}`);
+      const line = formatHighlightedUserInput(text, {
+        width: resolveLogContentWidth({ logBox, screen, fallback: (stdout && stdout.columns) || 80 }),
+        escapeText: escapeBlessed,
+      });
+      if (!line) return;
+      logBox.log(line);
       logBox.log(""); // Add line break after user input
       screen.render();
     };
@@ -1911,6 +1981,9 @@ module.exports = {
   UCODE_BANNER_LINES,
   UCODE_VERSION,
   StreamBuffer,
+  displayCellWidth,
+  resolveLogContentWidth,
+  formatHighlightedUserInput,
   buildUcodeBannerLines,
   buildUcodeBannerBlessedLines,
   parseActiveAgentsFromBusStatus,