u-foo 2.3.23 → 2.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.3.23",
+  "version": "2.3.25",
   "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/commandExecutor.js

@@ -78,6 +78,14 @@ function collectHostLaunchRequestContext(env = process.env) {
   return context;
 }
 
+function collectTerminalLaunchRequestContext(resolveTerminalApp = defaultResolveTerminalApp) {
+  const terminalApp = String(resolveTerminalApp() || "").trim().toLowerCase();
+  if (terminalApp === "terminal" || terminalApp === "iterm2") {
+    return { terminal_app: terminalApp };
+  }
+  return {};
+}
+
 async function withCapturedConsole(capture, fn) {
   const originalLog = console.log;
   const originalError = console.error;
@@ -551,11 +559,8 @@ function createCommandExecutor(options = {}) {
         prompt_profile: promptProfile,
         launch_scope: launchScope,
         ...collectHostLaunchRequestContext(),
+        ...collectTerminalLaunchRequestContext(resolveTerminalApp),
       };
-      const terminalApp = String(resolveTerminalApp() || "").trim().toLowerCase();
-      if (terminalApp === "terminal" || terminalApp === "iterm2") {
-        request.terminal_app = terminalApp;
-      }
       send(request);
       schedule(requestStatus, 1000);
     } catch (err) {
@@ -696,6 +701,7 @@ function createCommandExecutor(options = {}) {
         prompt_profile: profile,
         launch_scope: launchScope,
         ...collectHostLaunchRequestContext(),
+        ...collectTerminalLaunchRequestContext(resolveTerminalApp),
       });
       schedule(requestStatus, 1000);
     } catch (err) {
@@ -1106,6 +1112,7 @@ function createCommandExecutor(options = {}) {
         instance,
         dry_run: dryRun,
         ...collectHostLaunchRequestContext(),
+        ...collectTerminalLaunchRequestContext(resolveTerminalApp),
       });
       schedule(requestStatus, 1000);
       return;
@@ -1638,4 +1645,5 @@ function createCommandExecutor(options = {}) {
 module.exports = {
   createCommandExecutor,
   collectHostLaunchRequestContext,
+  collectTerminalLaunchRequestContext,
 };

package/src/daemon/groupOrchestrator.js

@@ -242,11 +242,13 @@ function buildLaunchHostContext(params = {}) {
   const hostDaemonSock = asTrimmedString(params.host_daemon_sock || params.hostDaemonSock);
   const hostName = asTrimmedString(params.host_name || params.hostName);
   const hostSessionId = asTrimmedString(params.host_session_id || params.hostSessionId);
+  const terminalApp = asTrimmedString(params.terminal_app || params.terminalApp);
   const context = {};
   if (hostInjectSock) context.host_inject_sock = hostInjectSock;
   if (hostDaemonSock) context.host_daemon_sock = hostDaemonSock;
   if (hostName) context.host_name = hostName;
   if (hostSessionId) context.host_session_id = hostSessionId;
+  if (terminalApp) context.terminal_app = terminalApp;
   if (params.host_capabilities && typeof params.host_capabilities === "object") {
     context.host_capabilities = { ...params.host_capabilities };
   } else if (params.hostCapabilities && typeof params.hostCapabilities === "object") {

package/src/daemon/index.js

@@ -1753,6 +1753,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
       const hostDaemonSock = req.host_daemon_sock || req.hostDaemonSock || "";
       const hostName = req.host_name || req.hostName || "";
       const hostSessionId = req.host_session_id || req.hostSessionId || "";
+      const terminalApp = req.terminal_app || req.terminalApp || "";
       const hostCapabilities =
         req.host_capabilities && typeof req.host_capabilities === "object"
           ? req.host_capabilities
@@ -1768,6 +1769,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           host_daemon_sock: hostDaemonSock,
           host_name: hostName,
           host_session_id: hostSessionId,
+          terminal_app: terminalApp,
           host_capabilities: hostCapabilities,
         });
         const ok = result && result.ok !== false;

package/src/daemon/ops.js

@@ -152,14 +152,25 @@ function resolveHostLaunchContext(options = {}) {
   };
 }
 
+function resolveNativeTerminalApp(options = {}) {
+  const explicit = normalizeTerminalAppPreference(options.terminalApp);
+  if (explicit) return explicit;
+
+  const termProgram = normalizeTerminalAppPreference(process.env.TERM_PROGRAM || "");
+  if (termProgram) return termProgram;
+  if (process.env.ITERM_SESSION_ID) return "iterm2";
+  return "";
+}
+
 function resolveConfiguredLaunchMode(configuredMode = "", options = {}) {
   const mode = normalizeOptionalString(configuredMode);
   if (mode === "internal" || mode === "internal-pty" || mode === "tmux" || mode === "terminal" || mode === "host") {
     return mode;
   }
-  const hostContext = resolveHostLaunchContext(options);
-  if (hostContext.hostDaemonSock) return "host";
   if (process.env.TMUX_PANE) return "tmux";
+  const hostContext = resolveHostLaunchContext(options);
+  const nativeTerminalApp = resolveNativeTerminalApp(options);
+  if (hostContext.hostDaemonSock && !nativeTerminalApp) return "host";
   return "terminal";
 }
 
@@ -1303,4 +1314,14 @@ async function closeAgent(projectRoot, agentId) {
   };
 }
 
-module.exports = { launchAgent, closeAgent, getRecoverableAgents, resumeAgents };
+module.exports = {
+  launchAgent,
+  closeAgent,
+  getRecoverableAgents,
+  resumeAgents,
+  __private: {
+    resolveConfiguredLaunchMode,
+    resolveHostLaunchContext,
+    resolveNativeTerminalApp,
+  },
+};