u-foo 1.0.6 → 1.1.9

package/src/terminal/adapterRouter.js

@@ -0,0 +1,84 @@
+const {
+  createTerminalCapabilities,
+  assertTerminalAdapterContract,
+} = require("./adapterContract");
+const { createTerminalAdapter } = require("./adapters/terminalAdapter");
+const { createTmuxAdapter } = require("./adapters/tmuxAdapter");
+const { createInternalQueueAdapter } = require("./adapters/internalQueueAdapter");
+const { createInternalPtyAdapter } = require("./adapters/internalPtyAdapter");
+
+function createTerminalAdapterRouter(options = {}) {
+  const {
+    activateAgent = () => {},
+    activateTerminal = null,
+    activateTmux = null,
+    sendRaw = () => {},
+    sendResize = () => {},
+    requestSnapshot = () => false,
+  } = options;
+
+  function createAdapter({ capabilities, handlers = {} }) {
+    const adapter = {
+      capabilities,
+      connect: handlers.connect || (async () => false),
+      disconnect: handlers.disconnect || (async () => false),
+      send: handlers.send || (() => false),
+      sendRaw: handlers.sendRaw || (() => false),
+      resize: handlers.resize || (() => false),
+      snapshot: handlers.snapshot || (() => false),
+      subscribe: handlers.subscribe || (() => false),
+      activate: handlers.activate || (() => false),
+      getState: handlers.getState || (() => ({})),
+    };
+    assertTerminalAdapterContract(adapter);
+    return adapter;
+  }
+
+  function getAdapter(params = {}) {
+    const { launchMode = "", agentId = "" } = params;
+
+    if (launchMode === "terminal") {
+      return createTerminalAdapter({
+        agentId,
+        activateAgent: activateTerminal || activateAgent,
+        createAdapter,
+      });
+    }
+
+    if (launchMode === "tmux") {
+      return createTmuxAdapter({
+        agentId,
+        activateAgent: activateTmux || activateAgent,
+        createAdapter,
+      });
+    }
+
+    if (launchMode === "internal-pty") {
+      return createInternalPtyAdapter({
+        sendRaw,
+        sendResize,
+        requestSnapshot,
+        createAdapter,
+      });
+    }
+
+    if (launchMode === "internal") {
+      return createInternalQueueAdapter({
+        sendRaw,
+        sendResize,
+        requestSnapshot,
+        createAdapter,
+      });
+    }
+
+    return createAdapter({ capabilities: createTerminalCapabilities() });
+  }
+
+  return {
+    getAdapter,
+  };
+}
+
+module.exports = {
+  createTerminalAdapterRouter,
+};

package/src/terminal/adapters/externalAdapter.js

@@ -0,0 +1,14 @@
+const { createTerminalAdapter } = require("./terminalAdapter");
+const { createTmuxAdapter } = require("./tmuxAdapter");
+
+function createExternalAdapter(options = {}) {
+  const mode = options.mode || "terminal";
+  if (mode === "tmux") {
+    return createTmuxAdapter(options);
+  }
+  return createTerminalAdapter(options);
+}
+
+module.exports = {
+  createExternalAdapter,
+};

package/src/terminal/adapters/internalAdapter.js

@@ -0,0 +1,13 @@
+const { createInternalPtyAdapter } = require("./internalPtyAdapter");
+const { createInternalQueueAdapter } = require("./internalQueueAdapter");
+
+function createInternalAdapter(options = {}) {
+  if (options.usePty) {
+    return createInternalPtyAdapter(options);
+  }
+  return createInternalQueueAdapter(options);
+}
+
+module.exports = {
+  createInternalAdapter,
+};

package/src/terminal/adapters/internalPtyAdapter.js

@@ -0,0 +1,42 @@
+const { createTerminalCapabilities } = require("../adapterContract");
+
+function createInternalPtyAdapter(options = {}) {
+  const {
+    sendRaw = () => {},
+    sendResize = () => {},
+    requestSnapshot = () => false,
+    createAdapter = () => {},
+  } = options;
+
+  const capabilities = createTerminalCapabilities({
+    supportsInternalQueueLoop: true,
+    supportsSocketProtocol: true,
+    supportsSubscribeFull: true,
+    supportsSubscribeScreen: true,
+    supportsSnapshot: true,
+  });
+
+  return createAdapter({
+    capabilities,
+    handlers: {
+      send: (data) => {
+        sendRaw(data);
+        return true;
+      },
+      sendRaw: (data) => {
+        sendRaw(data);
+        return true;
+      },
+      resize: (cols, rows) => {
+        sendResize(cols, rows);
+        return true;
+      },
+      snapshot: () => Boolean(requestSnapshot("screen")),
+      subscribe: () => Boolean(requestSnapshot("full")),
+    },
+  });
+}
+
+module.exports = {
+  createInternalPtyAdapter,
+};

package/src/terminal/adapters/internalQueueAdapter.js

@@ -0,0 +1,37 @@
+const { createTerminalCapabilities } = require("../adapterContract");
+
+function createInternalQueueAdapter(options = {}) {
+  const {
+    sendRaw = () => {},
+    createAdapter = () => {},
+  } = options;
+
+  const capabilities = createTerminalCapabilities({
+    supportsInternalQueueLoop: true,
+    supportsSocketProtocol: false,
+    supportsSubscribeFull: false,
+    supportsSubscribeScreen: false,
+    supportsSnapshot: false,
+  });
+
+  return createAdapter({
+    capabilities,
+    handlers: {
+      send: (data) => {
+        sendRaw(data);
+        return true;
+      },
+      sendRaw: (data) => {
+        sendRaw(data);
+        return true;
+      },
+      resize: () => false,
+      snapshot: () => false,
+      subscribe: () => false,
+    },
+  });
+}
+
+module.exports = {
+  createInternalQueueAdapter,
+};

package/src/terminal/adapters/terminalAdapter.js

@@ -0,0 +1,31 @@
+const { createTerminalCapabilities } = require("../adapterContract");
+
+function createTerminalAdapter(options = {}) {
+  const {
+    agentId = "",
+    activateAgent = () => {},
+    createAdapter = () => {},
+  } = options;
+
+  const capabilities = createTerminalCapabilities({
+    supportsActivate: true,
+    supportsReplay: true,
+    supportsWindowClose: true,
+    supportsNotifierInjector: true,
+    supportsSessionReuse: true,
+  });
+
+  return createAdapter({
+    capabilities,
+    handlers: {
+      activate: () => {
+        activateAgent(agentId);
+        return true;
+      },
+    },
+  });
+}
+
+module.exports = {
+  createTerminalAdapter,
+};

package/src/terminal/adapters/tmuxAdapter.js

@@ -0,0 +1,30 @@
+const { createTerminalCapabilities } = require("../adapterContract");
+
+function createTmuxAdapter(options = {}) {
+  const {
+    agentId = "",
+    activateAgent = () => {},
+    createAdapter = () => {},
+  } = options;
+
+  const capabilities = createTerminalCapabilities({
+    supportsActivate: true,
+    supportsReplay: false,
+    supportsNotifierInjector: true,
+    supportsSessionReuse: true,
+  });
+
+  return createAdapter({
+    capabilities,
+    handlers: {
+      activate: () => {
+        activateAgent(agentId);
+        return true;
+      },
+    },
+  });
+}
+
+module.exports = {
+  createTmuxAdapter,
+};

package/src/ufoo/agentsStore.js

@@ -2,12 +2,78 @@ const { getTimestamp, readJSON, writeJSON } = require("../bus/utils");
 
 const AGENTS_SCHEMA_VERSION = 1;
 
+function toSafeString(value) {
+  return typeof value === "string" ? value : "";
+}
+
+function normalizeAgentEntry(id, meta = {}) {
+  let normalizedId = String(id || "");
+  const doublePrefix = normalizedId.match(/^([^:]+):\1:(.+)$/);
+  if (doublePrefix) {
+    normalizedId = `${doublePrefix[1]}:${doublePrefix[2]}`;
+  }
+  const underscorePrefix = normalizedId.match(/^([^:]+):\1_(.+)$/);
+  if (underscorePrefix) {
+    normalizedId = `${underscorePrefix[1]}:${underscorePrefix[2]}`;
+  }
+
+  const normalizedMeta = meta && typeof meta === "object" ? { ...meta } : {};
+  if (normalizedMeta.nickname && typeof normalizedMeta.nickname === "object") {
+    const leakedOptions = normalizedMeta.nickname;
+    normalizedMeta.nickname = "";
+    if (!normalizedMeta.launch_mode) {
+      normalizedMeta.launch_mode = toSafeString(leakedOptions.launchMode);
+    }
+    if (!normalizedMeta.tmux_pane) {
+      normalizedMeta.tmux_pane = toSafeString(leakedOptions.tmuxPane);
+    }
+    if (!normalizedMeta.tty) {
+      normalizedMeta.tty = toSafeString(leakedOptions.tty);
+    }
+    if (
+      (!Number.isFinite(Number(normalizedMeta.pid)) || Number(normalizedMeta.pid) <= 0)
+      && Number.isFinite(leakedOptions.parentPid)
+      && leakedOptions.parentPid > 0
+    ) {
+      normalizedMeta.pid = leakedOptions.parentPid;
+    }
+  }
+
+  return { id: normalizedId, meta: normalizedMeta };
+}
+
+function normalizeAgentsMap(agents = {}) {
+  const out = {};
+  for (const [rawId, rawMeta] of Object.entries(agents || {})) {
+    const { id, meta } = normalizeAgentEntry(rawId, rawMeta);
+    if (!id) continue;
+    if (!out[id]) {
+      out[id] = meta;
+      continue;
+    }
+    const current = out[id] || {};
+    const incoming = meta || {};
+    const currentActive = current.status === "active";
+    const incomingActive = incoming.status === "active";
+    if (incomingActive && !currentActive) {
+      out[id] = incoming;
+      continue;
+    }
+    const currentSeen = String(current.last_seen || current.joined_at || "");
+    const incomingSeen = String(incoming.last_seen || incoming.joined_at || "");
+    if (incomingSeen > currentSeen) {
+      out[id] = incoming;
+    }
+  }
+  return out;
+}
+
 function normalizeAgentsData(data) {
   const base = data && typeof data === "object" ? { ...data } : {};
   const { subscribers: _legacy, ...rest } = base;
-  const agents = base.agents && typeof base.agents === "object"
-    ? base.agents
-    : {};
+  const agents = normalizeAgentsMap(
+    base.agents && typeof base.agents === "object" ? base.agents : {}
+  );
   const createdAt = typeof base.created_at === "string" && base.created_at
     ? base.created_at
     : getTimestamp();

package/src/utils/banner.js

@@ -13,12 +13,15 @@ function showBanner(options) {
     "▀▀▀ ▀   ▀▀▀ ▀▀▀",
   ];
 
+  // Normalize agent type display name
+  const displayAgentType = agentType === "ufoo-code" ? "ucode" : agentType;
+
   // 准备右侧信息行
   const infoLines = [];
   if (nickname) {
     infoLines.push(`${chalk.dim("Nickname:")} ${chalk.cyan.bold(nickname)}`);
   }
-  infoLines.push(`${chalk.dim("Agent:")} ${chalk.green.bold(agentType)}${chalk.dim(":")}${chalk.yellow(sessionId)}`);
+  infoLines.push(`${chalk.dim("Agent:")} ${chalk.green.bold(displayAgentType)}${chalk.dim(":")}${chalk.yellow(sessionId)}`);
   if (daemonStatus) {
     const statusColor = daemonStatus === "running" ? chalk.green : chalk.blue;
     infoLines.push(`${chalk.dim("Daemon:")} ${statusColor(daemonStatus)}`);
@@ -57,7 +60,7 @@ function showUfooBanner(options = {}) {
   const infoLines = [
     `${chalk.cyan.bold(`v${version}`)} ${chalk.gray("Multi-Agent Workspace Protocol")}`,
     "",
-    chalk.dim("uclaude") + chalk.gray(" · ") + chalk.dim("ucodex") + chalk.gray(" · ") + chalk.dim("ufoo init") + chalk.gray(" · ") + chalk.dim("ufoo ctx") + chalk.gray(" · ") + chalk.dim("ufoo bus"),
+    chalk.dim("uclaude") + chalk.gray(" · ") + chalk.dim("ucodex") + chalk.gray(" · ") + chalk.dim("ucode") + chalk.gray(" · ") + chalk.dim("ufoo init") + chalk.gray(" · ") + chalk.dim("ufoo ctx") + chalk.gray(" · ") + chalk.dim("ufoo bus"),
   ];
 
   // 输出：Logo 和信息并排显示

package/scripts/.archived/bash-to-js-migration/README.md

@@ -1,46 +0,0 @@
-# 已迁移到 JavaScript 的脚本
-
-这些 bash 脚本已经完全迁移到 JavaScript 模块。
-
-## 迁移对照表
-
-| Bash 脚本 | JavaScript 模块 | 状态 |
-|----------|----------------|------|
-| `bus.sh` | `src/bus/index.js` + 7个子模块 | ✅ 完全替换 |
-| `bus-daemon.sh` | `src/bus/daemon.js` | ✅ 完全替换 |
-| `bus-inject.sh` | `src/bus/inject.js` | ✅ 完全替换 |
-| `status.sh` | `src/status/index.js` | ✅ 完全替换 |
-| `skills.sh` | `src/skills/index.js` | ✅ 完全替换 |
-| `init.sh` | `src/init/index.js` | ✅ 完全替换 |
-
-## 迁移完成日期
-
-2026-02-04
-
-## 使用方式
-
-所有命令接口保持不变，直接使用即可：
-
-```bash
-ufoo bus status
-ufoo status  
-ufoo skills list
-ufoo init
-```
-
-## 保留原因
-
-这些脚本被归档保留用于：
-1. 历史参考
-2. 性能对比
-3. 回退备份（如有必要）
-
-## 性能对比
-
-| 指标 | Bash | JavaScript | 差异 |
-|------|------|------------|------|
-| 消息延迟 | 45ms | 51ms | +13% |
-| 并发安全 | ✅ | ✅ | 相同 |
-| 功能完整 | 100% | 100% | 相同 |
-
-性能差异在可接受范围内（<15%），换取更好的可维护性和跨平台支持。

package/scripts/.archived/bash-to-js-migration/banner.sh

@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-# banner.sh - TUI startup banner for ufoo agents
-
-# Colors
-RST='\033[0m'
-BLD='\033[1m'
-DIM='\033[2m'
-CYN='\033[0;36m'
-GRN='\033[0;32m'
-MAG='\033[0;35m'
-WHT='\033[1;37m'
-YLW='\033[0;33m'
-
-show_banner() {
-  local agent_type="${1:-claude}"
-  local session_id="${2:-unknown}"
-  local subscriber="${3:-}"
-  local daemon_status="${4:-}"
-
-  local ACOL
-  if [[ "$agent_type" == "codex" ]]; then
-    ACOL="$GRN"
-  else
-    ACOL="$MAG"
-  fi
-
-  # Width matches Codex CLI (inner content = 52)
-  local INNER=52
-  local W=$INNER
-
-  # Helper: print line with exact padding
-  line() {
-    local prefix="$1"
-    local value="$2"
-    local color="$3"
-    local prefix_len=${#prefix}
-    local value_len=${#value}
-    local pad_len=$((INNER - prefix_len - value_len))
-    printf "${DIM}│${RST}${prefix}${color}${value}${RST}"
-    printf "%${pad_len}s" ""
-    printf "${DIM}│${RST}\n"
-  }
-
-  echo ""
-  printf "${DIM}╭"; printf '─%.0s' $(seq 1 $W); printf "╮${RST}\n"
-
-  # Title line with icon (compute padding from plain text lengths)
-  local icon_plain="<○>"
-  local title="UFOO · Multi-Agent Protocol"
-  local title_pad=$((INNER - 1 - ${#icon_plain} - 1 - ${#title}))
-  printf "${DIM}│${RST} ${WHT}${icon_plain}${RST} ${CYN}${BLD}UFOO${RST}${DIM} · Multi-Agent Protocol${RST}"
-  printf "%${title_pad}s" ""
-  printf "${DIM}│${RST}\n"
-
-  printf "${DIM}├"; printf '─%.0s' $(seq 1 $W); printf "┤${RST}\n"
-
-  # Agent
-  if [[ -n "$subscriber" ]]; then
-    local sub="$subscriber"
-    [[ ${#sub} -gt 36 ]] && sub="${sub:0:33}..."
-    line "  Agent   " "$sub" "${ACOL}${BLD}"
-  fi
-
-  # Daemon
-  if [[ -n "$daemon_status" ]]; then
-    line "  Daemon  " "$daemon_status" "${GRN}"
-  fi
-
-  # Online agents (daemon handles cleanup of dead agents)
-  if [[ -f ".ufoo/bus/bus.json" ]]; then
-    local online
-    online=$(jq -r '.subscribers | to_entries[] | select(.value.status == "active") | .key' .ufoo/bus/bus.json 2>/dev/null | grep -v "^${subscriber}$" 2>/dev/null | head -5 || true)
-    if [[ -n "$online" ]]; then
-      printf "${DIM}├"; printf '─%.0s' $(seq 1 $W); printf "┤${RST}\n"
-      line "  Online  " "" ""
-      while IFS= read -r agent; do
-        [[ -z "$agent" ]] && continue
-        local a="$agent"
-        [[ ${#a} -gt 44 ]] && a="${a:0:41}..."
-        line "    · " "$a" "${YLW}"
-      done <<< "$online"
-    fi
-  fi
-
-  printf "${DIM}╰"; printf '─%.0s' $(seq 1 $W); printf "╯${RST}\n"
-  echo ""
-}
-
-export -f show_banner 2>/dev/null || true

package/scripts/.archived/bash-to-js-migration/bus-alert.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-exec bash "$repo_root/modules/bus/scripts/bus-alert.sh" "$@"
-

package/scripts/.archived/bash-to-js-migration/bus-autotrigger.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-exec bash "$repo_root/modules/bus/scripts/bus-autotrigger.sh" "$@"
-