u-foo 2.3.32 → 2.4.1

package/src/app/chat/multiWindow/virtualTerminal.js

@@ -0,0 +1,327 @@
+const DEFAULT_ATTR = { fg: 7, bg: 0, bold: false, dim: false, italic: false, underline: false, inverse: false, fgRgb: null, bgRgb: null };
+
+function isWide(ch) {
+  if (!ch) return false;
+  const code = ch.codePointAt(0);
+  if (code < 0x1100) return false;
+  return (
+    (code >= 0x1100 && code <= 0x115f) ||
+    (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) ||
+    (code >= 0xac00 && code <= 0xd7a3) ||
+    (code >= 0xf900 && code <= 0xfaff) ||
+    (code >= 0xfe10 && code <= 0xfe6f) ||
+    (code >= 0xff01 && code <= 0xff60) ||
+    (code >= 0xffe0 && code <= 0xffe6) ||
+    (code >= 0x20000 && code <= 0x2fffd) ||
+    (code >= 0x30000 && code <= 0x3fffd) ||
+    (code >= 0x1f300 && code <= 0x1f9ff)
+  );
+}
+
+function cellWidth(ch) {
+  return isWide(ch) ? 2 : 1;
+}
+
+function createCell(char = " ", attr = DEFAULT_ATTR, wideContinuation = false) {
+  return { char, attr: { ...attr }, wideContinuation };
+}
+
+function createVirtualTerminal(cols = 80, rows = 24) {
+  let buffer = [];
+  let cursorRow = 0;
+  let cursorCol = 0;
+  let savedCursor = { row: 0, col: 0 };
+  let currentAttr = { ...DEFAULT_ATTR };
+  let scrollTop = 0;
+  let scrollBottom = rows - 1;
+  let dirty = true;
+
+  function initBuffer() {
+    buffer = [];
+    for (let r = 0; r < rows; r++) {
+      buffer.push(createRow(cols));
+    }
+  }
+
+  function createRow(width) {
+    const row = [];
+    for (let c = 0; c < width; c++) {
+      row.push(createCell());
+    }
+    return row;
+  }
+
+  function clamp() {
+    if (cursorRow < 0) cursorRow = 0;
+    if (cursorRow >= rows) cursorRow = rows - 1;
+    if (cursorCol < 0) cursorCol = 0;
+    if (cursorCol >= cols) cursorCol = cols - 1;
+  }
+
+  function scrollUp(top = scrollTop, bottom = scrollBottom) {
+    buffer.splice(top, 1);
+    buffer.splice(bottom, 0, createRow(cols));
+    dirty = true;
+  }
+
+  function scrollDown(top = scrollTop, bottom = scrollBottom) {
+    buffer.splice(bottom, 1);
+    buffer.splice(top, 0, createRow(cols));
+    dirty = true;
+  }
+
+  function clearWideAt(row, col) {
+    const line = buffer[row];
+    if (!line || col < 0 || col >= cols) return;
+    if (line[col]?.wideContinuation && col > 0) {
+      line[col - 1] = createCell();
+      line[col] = createCell();
+    } else if (isWide(line[col]?.char) && col + 1 < cols && line[col + 1]?.wideContinuation) {
+      line[col] = createCell();
+      line[col + 1] = createCell();
+    }
+  }
+
+  function putChar(ch) {
+    const width = cellWidth(ch);
+    if (cursorCol >= cols || (width === 2 && cursorCol >= cols - 1)) {
+      cursorCol = 0;
+      cursorRow++;
+      if (cursorRow > scrollBottom) {
+        cursorRow = scrollBottom;
+        scrollUp();
+      }
+    }
+    if (buffer[cursorRow]) {
+      clearWideAt(cursorRow, cursorCol);
+      if (width === 2) clearWideAt(cursorRow, cursorCol + 1);
+      buffer[cursorRow][cursorCol] = createCell(ch, currentAttr);
+      if (width === 2 && cursorCol + 1 < cols) {
+        buffer[cursorRow][cursorCol + 1] = createCell("", currentAttr, true);
+      }
+    }
+    cursorCol += width;
+    dirty = true;
+  }
+
+  function eraseLine(mode, row) {
+    if (!buffer[row]) return;
+    if (mode === 0) {
+      for (let c = cursorCol; c < cols; c++) buffer[row][c] = createCell();
+    } else if (mode === 1) {
+      for (let c = 0; c <= cursorCol; c++) buffer[row][c] = createCell();
+    } else {
+      for (let c = 0; c < cols; c++) buffer[row][c] = createCell();
+    }
+    dirty = true;
+  }
+
+  function eraseDisplay(mode) {
+    if (mode === 0) {
+      eraseLine(0, cursorRow);
+      for (let r = cursorRow + 1; r < rows; r++) buffer[r] = createRow(cols);
+    } else if (mode === 1) {
+      for (let r = 0; r < cursorRow; r++) buffer[r] = createRow(cols);
+      eraseLine(1, cursorRow);
+    } else {
+      for (let r = 0; r < rows; r++) buffer[r] = createRow(cols);
+      cursorRow = 0;
+      cursorCol = 0;
+    }
+    dirty = true;
+  }
+
+  function applySGR(params) {
+    for (let i = 0; i < params.length; i++) {
+      const p = params[i];
+      if (p === 0) { Object.assign(currentAttr, DEFAULT_ATTR); }
+      else if (p === 1) { currentAttr.bold = true; }
+      else if (p === 2) { currentAttr.dim = true; }
+      else if (p === 3) { currentAttr.italic = true; }
+      else if (p === 4) { currentAttr.underline = true; }
+      else if (p === 7) { currentAttr.inverse = true; }
+      else if (p === 22) { currentAttr.bold = false; currentAttr.dim = false; }
+      else if (p === 23) { currentAttr.italic = false; }
+      else if (p === 24) { currentAttr.underline = false; }
+      else if (p === 27) { currentAttr.inverse = false; }
+      else if (p >= 30 && p <= 37) { currentAttr.fg = p - 30; currentAttr.fgRgb = null; }
+      else if (p === 38) {
+        if (params[i + 1] === 5) { currentAttr.fg = params[i + 2] || 0; currentAttr.fgRgb = null; i += 2; }
+        else if (params[i + 1] === 2) { currentAttr.fgRgb = [params[i + 2] || 0, params[i + 3] || 0, params[i + 4] || 0]; i += 4; }
+      }
+      else if (p === 39) { currentAttr.fg = 7; currentAttr.fgRgb = null; }
+      else if (p >= 40 && p <= 47) { currentAttr.bg = p - 40; currentAttr.bgRgb = null; }
+      else if (p === 48) {
+        if (params[i + 1] === 5) { currentAttr.bg = params[i + 2] || 0; currentAttr.bgRgb = null; i += 2; }
+        else if (params[i + 1] === 2) { currentAttr.bgRgb = [params[i + 2] || 0, params[i + 3] || 0, params[i + 4] || 0]; i += 4; }
+      }
+      else if (p === 49) { currentAttr.bg = 0; currentAttr.bgRgb = null; }
+      else if (p >= 90 && p <= 97) { currentAttr.fg = p - 90 + 8; currentAttr.fgRgb = null; }
+      else if (p >= 100 && p <= 107) { currentAttr.bg = p - 100 + 8; currentAttr.bgRgb = null; }
+    }
+    dirty = true;
+  }
+
+  function handleCSI(params, code) {
+    const p = params.length > 0 ? params : [0];
+    switch (code) {
+      case "A": cursorRow -= (p[0] || 1); break;
+      case "B": cursorRow += (p[0] || 1); break;
+      case "C": cursorCol += (p[0] || 1); break;
+      case "D": cursorCol -= (p[0] || 1); break;
+      case "E": cursorRow += (p[0] || 1); cursorCol = 0; break;
+      case "F": cursorRow -= (p[0] || 1); cursorCol = 0; break;
+      case "G": cursorCol = (p[0] || 1) - 1; break;
+      case "H": case "f":
+        cursorRow = (p[0] || 1) - 1;
+        cursorCol = (p.length > 1 ? (p[1] || 1) : 1) - 1;
+        break;
+      case "J": eraseDisplay(p[0] || 0); break;
+      case "K": eraseLine(p[0] || 0, cursorRow); break;
+      case "L": {
+        const n = p[0] || 1;
+        for (let i = 0; i < n; i++) scrollDown(cursorRow, scrollBottom);
+        break;
+      }
+      case "M": {
+        const n = p[0] || 1;
+        for (let i = 0; i < n; i++) scrollUp(cursorRow, scrollBottom);
+        break;
+      }
+      case "S": { const n = p[0] || 1; for (let i = 0; i < n; i++) scrollUp(); break; }
+      case "T": { const n = p[0] || 1; for (let i = 0; i < n; i++) scrollDown(); break; }
+      case "d": cursorRow = (p[0] || 1) - 1; break;
+      case "m": applySGR(p); break;
+      case "r":
+        scrollTop = (p[0] || 1) - 1;
+        scrollBottom = (p.length > 1 ? (p[1] || rows) : rows) - 1;
+        cursorRow = 0; cursorCol = 0;
+        break;
+      case "s": savedCursor = { row: cursorRow, col: cursorCol }; break;
+      case "u": cursorRow = savedCursor.row; cursorCol = savedCursor.col; break;
+    }
+    clamp();
+    dirty = true;
+  }
+  function write(data) {
+    const str = typeof data === "string" ? data : data.toString("utf8");
+    let i = 0;
+    while (i < str.length) {
+      const ch = str[i];
+      if (ch === "\x1b") {
+        if (str[i + 1] === "[") {
+          i += 2;
+          let paramStr = "";
+          while (i < str.length && str[i] >= "\x20" && str[i] <= "\x3f") {
+            paramStr += str[i++];
+          }
+          const code = str[i++] || "";
+          const params = paramStr ? paramStr.split(";").map(Number) : [];
+          handleCSI(params, code);
+        } else if (str[i + 1] === "7") {
+          savedCursor = { row: cursorRow, col: cursorCol };
+          i += 2;
+        } else if (str[i + 1] === "8") {
+          cursorRow = savedCursor.row;
+          cursorCol = savedCursor.col;
+          i += 2;
+        } else if (str[i + 1] === "M") {
+          scrollUp();
+          i += 2;
+        } else if (str[i + 1] === "D") {
+          cursorRow++;
+          if (cursorRow > scrollBottom) {
+            cursorRow = scrollBottom;
+            scrollUp();
+          }
+          i += 2;
+        } else if (str[i + 1] === "]" || str[i + 1] === "P" || str[i + 1] === "_") {
+          i += 2;
+          while (i < str.length) {
+            if (str[i] === "\x07") { i++; break; }
+            if (str[i] === "\x1b" && str[i + 1] === "\\") { i += 2; break; }
+            i++;
+          }
+        } else {
+          i += 2;
+        }
+      } else if (ch === "\r") {
+        cursorCol = 0;
+        i++;
+      } else if (ch === "\n") {
+        cursorRow++;
+        if (cursorRow > scrollBottom) {
+          cursorRow = scrollBottom;
+          scrollUp();
+        }
+        i++;
+      } else if (ch === "\b") {
+        if (cursorCol > 0) cursorCol--;
+        i++;
+      } else if (ch === "\t") {
+        cursorCol = Math.min(cols - 1, (Math.floor(cursorCol / 8) + 1) * 8);
+        i++;
+      } else if (ch.charCodeAt(0) < 32) {
+        i++;
+      } else {
+        const glyph = Array.from(str.slice(i))[0] || ch;
+        putChar(glyph);
+        i += glyph.length;
+      }
+    }
+  }
+
+  function getScreen() {
+    return { buffer, rows, cols, cursorRow, cursorCol };
+  }
+
+  function getLine(row) {
+    if (row < 0 || row >= rows) return "";
+    return buffer[row].map((c) => c.char).join("");
+  }
+
+  function getCursor() {
+    return { row: cursorRow, col: cursorCol };
+  }
+
+  function isDirty() {
+    return dirty;
+  }
+
+  function clearDirty() {
+    dirty = false;
+  }
+
+  function resize(newCols, newRows) {
+    const oldBuffer = buffer;
+    const oldRows = rows;
+    cols = newCols;
+    rows = newRows;
+    scrollTop = 0;
+    scrollBottom = rows - 1;
+    initBuffer();
+    const copyRows = Math.min(oldRows, rows);
+    for (let r = 0; r < copyRows; r++) {
+      const copyLen = Math.min(oldBuffer[r].length, cols);
+      for (let c = 0; c < copyLen; c++) {
+        buffer[r][c] = oldBuffer[r][c];
+      }
+    }
+    clamp();
+    dirty = true;
+  }
+
+  initBuffer();
+
+  return {
+    write,
+    getScreen,
+    getLine,
+    getCursor,
+    isDirty,
+    clearDirty,
+    resize,
+  };
+}
+
+module.exports = { createVirtualTerminal, DEFAULT_ATTR };

package/src/{chat → app/chat}/transport.js

@@ -2,7 +2,7 @@ const net = require("net");
 const path = require("path");
 const fs = require("fs");
 const { spawn, spawnSync } = require("child_process");
-const { resolveNodeExecutable } = require("../utils/nodeExecutable");
+const { resolveNodeExecutable } = require("../../runtime/process/nodeExecutable");
 
 function connectSocket(sockPath, options = {}) {
   const timeoutMs = Number.isFinite(options.timeoutMs) && options.timeoutMs > 0

package/src/{cli → app/cli}/ctxCoreCommands.js

@@ -15,9 +15,9 @@ async function runCtxCommand(subcmd = "doctor", subargs = [], options = {}) {
     updateDecisionIndexPaths = true,
   } = options;
 
-  const DecisionsManager = require("../context/decisions");
-  const ContextDoctor = require("../context/doctor");
-  const SyncManager = require("../context/sync");
+  const DecisionsManager = require("../../coordination/context/decisions");
+  const ContextDoctor = require("../../coordination/context/doctor");
+  const SyncManager = require("../../coordination/context/sync");
 
   switch (subcmd) {
     case "doctor": {

package/src/{doctor/index.js → app/cli/features/doctor.js}

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const ContextDoctor = require("../context/doctor");
+const ContextDoctor = require("../../../coordination/context/doctor");
 
 class RepoDoctor {
   constructor(repoRoot) {

package/src/{init/index.js → app/cli/features/init.js}

@@ -27,7 +27,6 @@ class UfooInit {
     console.log();
 
     if (!controllerMode) {
-      // 确保 AGENTS.md 和 CLAUDE.md 存在
       this.ensureAgentsFiles(project);
     }
 
@@ -35,7 +34,6 @@ class UfooInit {
     this.initCore(project, { controllerMode });
 
     if (!controllerMode) {
-      // 初始化 AGENTS.md 模板
       this.injectAgentsTemplate(project);
     }
 
@@ -67,7 +65,6 @@ class UfooInit {
     const agentsFile = path.join(project, "AGENTS.md");
     const claudeFile = path.join(project, "CLAUDE.md");
 
-    // 创建 AGENTS.md（如果不存在）
     if (!fs.existsSync(agentsFile)) {
       const content = `# Project Instructions
 
@@ -77,7 +74,6 @@ class UfooInit {
       fs.writeFileSync(agentsFile, content, "utf8");
     }
 
-    // 仅在不存在时创建 CLAUDE.md；存在时保留用户文件类型（普通文件或 symlink）
     const claudeStat = this.safeLstat(claudeFile);
     if (!claudeStat) {
       fs.writeFileSync(claudeFile, "AGENTS.md\n", "utf8");
@@ -116,8 +112,16 @@ class UfooInit {
     console.log("[core] Done");
   }
 
+  safeLstat(filePath) {
+    try {
+      return fs.lstatSync(filePath);
+    } catch {
+      return null;
+    }
+  }
+
   /**
-   * 注入 ufoo 模板到 AGENTS.md
+   * 注入 ufoo 模板到 AGENTS.md / CLAUDE.md
    */
   injectAgentsTemplate(project) {
     if (!fs.existsSync(this.agentsTemplate)) {
@@ -142,14 +146,6 @@ class UfooInit {
     console.log("[template] Done");
   }
 
-  safeLstat(filePath) {
-    try {
-      return fs.lstatSync(filePath);
-    } catch {
-      return null;
-    }
-  }
-
   resolveTemplateTargets(project) {
     const agentsFile = path.resolve(path.join(project, "AGENTS.md"));
     const claudeFile = path.resolve(path.join(project, "CLAUDE.md"));
@@ -167,9 +163,7 @@ class UfooInit {
         const rawTarget = fs.readlinkSync(claudeFile);
         const sourceFile = path.resolve(path.dirname(claudeFile), rawTarget);
         const projectRoot = path.resolve(project);
-        const inProject =
-          sourceFile === projectRoot ||
-          sourceFile.startsWith(`${projectRoot}${path.sep}`);
+        const inProject = sourceFile === projectRoot || sourceFile.startsWith(`${projectRoot}${path.sep}`);
         if (inProject) {
           targets.add(sourceFile);
         } else {
@@ -181,7 +175,6 @@ class UfooInit {
       return Array.from(targets);
     }
 
-    // CLAUDE.md 为独立文件时，双文件都注入模板
     targets.add(claudeFile);
     return Array.from(targets);
   }
@@ -194,26 +187,17 @@ class UfooInit {
     const block = `${marker}\n${template}\n${marker}`;
 
     if (content.includes(marker)) {
-      // Replace existing marker block in-place
       const startIdx = content.indexOf(marker);
       const endIdx = content.indexOf(marker, startIdx + marker.length);
       if (endIdx !== -1) {
-        content =
-          content.slice(0, startIdx) +
-          block +
-          content.slice(endIdx + marker.length);
+        content = content.slice(0, startIdx) + block + content.slice(endIdx + marker.length);
       } else {
-        content =
-          content.slice(0, startIdx) + block + content.slice(startIdx + marker.length);
+        content = content.slice(0, startIdx) + block + content.slice(startIdx + marker.length);
       }
     } else {
-      // Insert after first heading line for visibility (not buried at end)
       const headingEnd = this.findFirstHeadingEnd(content);
       if (headingEnd !== -1) {
-        content =
-          content.slice(0, headingEnd) +
-          `\n${block}\n\n` +
-          content.slice(headingEnd);
+        content = content.slice(0, headingEnd) + `\n${block}\n\n` + content.slice(headingEnd);
       } else {
         content = `${block}\n\n${content}`;
       }
@@ -222,9 +206,7 @@ class UfooInit {
   }
 
   findFirstHeadingEnd(content) {
-    // ATX heading: # ... (allow leading indentation and EOF without trailing newline)
     const atxHeading = content.match(/^(?:[ \t]{0,3})#{1,6}[ \t]*[^\n]*(?:\n|$)/m);
-    // Setext heading: text line + underline (=== or ---)
     const setextHeading = content.match(/^[^\n]+\n(?:=+|-+)[ \t]*(?:\n|$)/m);
 
     let bestMatch = null;
@@ -270,7 +252,7 @@ class UfooInit {
   async initBus(project) {
     console.log("[bus] Initializing bus module...");
 
-    const EventBus = require("../bus");
+    const EventBus = require("../../../coordination/bus");
     const bus = new EventBus(project);
 
     try {

package/src/{cli → app/cli}/groupCoreCommands.js

@@ -5,8 +5,8 @@ const {
   loadTemplateRegistry,
   resolveTemplateReference,
   createTemplateFromBuiltin,
-} = require("../group/templates");
-const { validateTemplateTarget } = require("../group/templateValidation");
+} = require("../../orchestration/groups/templates");
+const { validateTemplateTarget } = require("../../orchestration/groups/templateValidation");
 
 function parseTemplateNewArgs(args = []) {
   const alias = String(args[0] || "").trim();

package/src/app/cli/index.js

@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = {
+  ...require("./run"),
+  ...require("./busCoreCommands"),
+  ...require("./ctxCoreCommands"),
+  ...require("./groupCoreCommands"),
+  ...require("./onlineCoreCommands"),
+};

package/src/{cli → app/cli}/onlineCoreCommands.js

@@ -24,7 +24,7 @@ function buildAuthHeaders(onlineAuthHeaders, opts) {
 }
 
 async function runOnlineServer(opts = {}) {
-  const OnlineServer = require("../online/server");
+  const OnlineServer = require("../../online/server");
   const host = opts.host || "127.0.0.1";
   const port = Number.isFinite(opts.port) ? opts.port : parseInt(opts.port || "8787", 10);
   const idleTimeoutMs = Number.isFinite(opts.idleTimeoutMs)
@@ -62,7 +62,7 @@ async function runOnlineToken(subscriber, opts = {}) {
   if (!subscriber) {
     throw new Error("online token requires <subscriber>");
   }
-  const { generateToken, setToken, defaultTokensPath } = require("../online/tokens");
+  const { generateToken, setToken, defaultTokensPath } = require("../../online/tokens");
   const filePath = opts.file || defaultTokensPath();
   const token = generateToken();
   const entry = setToken(filePath, subscriber, token, opts.server || "https://online.ufoo.dev", {
@@ -159,7 +159,7 @@ async function runOnlineConnect(opts = {}) {
   if (!opts.nickname) {
     throw new Error("online connect requires --nickname");
   }
-  const OnlineConnect = require("../online/bridge");
+  const OnlineConnect = require("../../online/bridge");
   const conn = new OnlineConnect({
     projectRoot: opts.projectRoot || process.cwd(),
     nickname: opts.nickname,
@@ -182,7 +182,7 @@ async function runOnlineConnect(opts = {}) {
 }
 
 function runOnlineSend(opts = {}) {
-  const { send } = require("../online/runner");
+  const { send } = require("../../online/runner");
   if (!opts.nickname || !opts.text) {
     throw new Error("online send requires --nickname and --text");
   }
@@ -194,7 +194,7 @@ function runOnlineSend(opts = {}) {
 }
 
 function runOnlineInbox(nickname, opts = {}) {
-  const { checkInbox } = require("../online/runner");
+  const { checkInbox } = require("../../online/runner");
   if (!nickname || nickname.startsWith("--")) {
     throw new Error("online inbox requires <nickname>");
   }