u-foo 2.3.12 → 2.3.14

package/src/agent/ufooAgent.js

@@ -1,7 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const { runCliAgent } = require("./cliRunner");
-const { normalizeCliOutput } = require("./normalizeOutput");
 const { buildStatus } = require("../daemon/status");
 const { getUfooPaths } = require("../ufoo/paths");
 const { normalizeGateRouterResult } = require("../controller/gateRouter");
@@ -633,7 +631,6 @@ async function runUfooAgent({
   loopRuntime = null,
   controllerMode = null,
 }) {
-  const state = loadSessionState(projectRoot);
   const mode = String(routingMode || (routingContext && routingContext.mode) || "").trim().toLowerCase();
   const resolvedControllerMode = String(
     controllerMode
@@ -660,7 +657,6 @@ async function runUfooAgent({
   let res;
 
   const useDirectProvider = shouldUseDirectProvider(provider);
-  let usedDirectProvider = false;
 
   if (useDirectProvider) {
     res = await runNativeRouterCall({
@@ -671,47 +667,22 @@ async function runUfooAgent({
       model,
     });
     if (!res.ok) {
+      // eslint-disable-next-line no-console
+      console.error(`[ufoo-agent] native provider failed: ${res.error || "unknown error"}`);
       return { ok: false, error: res.error };
     } else {
-      usedDirectProvider = true;
       res = { ok: true, output: res.output, sessionId: "", provider: res.provider, model: res.model };
     }
   }
 
   if (!useDirectProvider) {
-    res = await runCliAgent({
-      provider,
-      model,
-      prompt: fullPrompt,
-      systemPrompt,
-      sessionId: state.data?.sessionId,
-      disableSession: provider === "claude-cli",
-      cwd: projectRoot,
-    });
-
-    if (!res.ok) {
-      const msg = (res.error || "").toLowerCase();
-      if (msg.includes("session id") || msg.includes("session-id") || msg.includes("already in use")) {
-        res = await runCliAgent({
-          provider,
-          model,
-          prompt: fullPrompt,
-          systemPrompt,
-          sessionId: undefined,
-          disableSession: provider === "claude-cli",
-          cwd: projectRoot,
-        });
-      }
-    }
-
-    if (!res.ok) {
-      return { ok: false, error: res.error };
-    }
+    const error = `unsupported ufoo-agent provider "${provider || ""}"; cliRunner fallback has been removed`;
+    // eslint-disable-next-line no-console
+    console.error(`[ufoo-agent] ${error}`);
+    return { ok: false, error };
   }
 
-  const rawText = usedDirectProvider
-    ? String(res.output || "").trim()
-    : normalizeCliOutput(res.output);
+  const rawText = String(res.output || "").trim();
   const text = stripMarkdownFence(rawText);
   let payload = null;
   try {

package/src/chat/daemonMessageRouter.js

@@ -442,7 +442,9 @@ function createDaemonMessageRouter(options = {}) {
   }
 
   function handleErrorMessage(msg) {
-    resolveStatusLine(`{gray-fg}✗{/gray-fg} Error: ${msg.error}`);
+    const error = String(msg.error || "unknown error");
+    resolveStatusLine(`{gray-fg}✗{/gray-fg} Error: ${error}`);
+    logMessage("error", `{white-fg}✗{/white-fg} ${escapeBlessed(error)}`);
     renderScreen();
     return false;
   }

package/src/chat/dashboardKeyController.js

@@ -1,4 +1,4 @@
-const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal"];
+const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal-pty", "internal"];
 
 function createDashboardKeyController(options = {}) {
   const {

package/src/chat/dashboardView.js

@@ -1,6 +1,6 @@
 const { clampAgentWindowWithSelection } = require("./agentDirectory");
 
-const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal"];
+const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal-pty", "internal"];
 
 function providerLabel(value) {
   if (value === "claude-cli") return "claude";

package/src/chat/index.js

@@ -65,7 +65,7 @@ const {
   pruneTransientAgentStates,
 } = require("./transientAgentState");
 
-const MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal"];
+const MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal-pty", "internal"];
 
 async function runChat(projectRoot, options = {}) {
   const globalMode = options && options.globalMode === true;

package/src/chat/inputListenerController.js

@@ -59,6 +59,82 @@ function createInputListenerController(options = {}) {
     }
   }
 
+  function clampCursorPos(pos = 0, value = "") {
+    const text = String(value || "");
+    const normalized = Number.isFinite(pos) ? Math.floor(pos) : 0;
+    return Math.max(0, Math.min(text.length, normalized));
+  }
+
+  function refreshAfterEdit(textarea) {
+    resizeInput();
+    ensureInputCursorVisible();
+    updateCursor(textarea);
+    updateDraftFromInput();
+
+    if (textarea && shouldShowCompletion(textarea.value)) {
+      completionController.show(textarea.value);
+    } else {
+      completionController.hide();
+    }
+
+    render(textarea);
+  }
+
+  function replaceInputRange(textarea, start, end, replacement = "") {
+    if (!textarea) return;
+    const value = String(textarea.value || "");
+    const safeStart = clampCursorPos(start, value);
+    const safeEnd = clampCursorPos(end, value);
+    const from = Math.min(safeStart, safeEnd);
+    const to = Math.max(safeStart, safeEnd);
+    const insert = String(replacement || "");
+    textarea.value = value.slice(0, from) + insert + value.slice(to);
+    setCursorPos(from + insert.length);
+    resetPreferredCol();
+    refreshAfterEdit(textarea);
+  }
+
+  function deleteWordBefore(textarea) {
+    const value = String((textarea && textarea.value) || "");
+    const cursorPos = clampCursorPos(getCursorPos(), value);
+    if (cursorPos <= 0) return;
+    const before = value.slice(0, cursorPos);
+    const match = before.match(/\s*\S+\s*$/);
+    const start = match ? cursorPos - match[0].length : Math.max(0, cursorPos - 1);
+    replaceInputRange(textarea, start, cursorPos, "");
+  }
+
+  function moveCursorByWord(textarea, direction = "forward") {
+    const value = String((textarea && textarea.value) || "");
+    const cursorPos = clampCursorPos(getCursorPos(), value);
+    if (direction === "backward") {
+      const before = value.slice(0, cursorPos);
+      const trimmedEnd = before.search(/\S\s*$/) >= 0 ? before.replace(/\s+$/, "") : before;
+      const match = trimmedEnd.match(/\S+$/);
+      return match ? trimmedEnd.length - match[0].length : 0;
+    }
+    const after = value.slice(cursorPos);
+    const match = after.match(/^\s*\S+/);
+    return match ? Math.min(value.length, cursorPos + match[0].length) : value.length;
+  }
+
+  function moveCursorToVisualBoundary(textarea, boundary = "start") {
+    const width = getWrapWidth();
+    const value = String((textarea && textarea.value) || "");
+    if (width <= 0) return boundary === "end" ? value.length : 0;
+    const cursorPos = clampCursorPos(getCursorPos(), value);
+    const { row } = getCursorRowCol(value, cursorPos, width);
+    const targetCol = boundary === "end" ? width : 0;
+    return getCursorPosForRowCol(value, row, targetCol, width);
+  }
+
+  function setCursorAndRender(textarea, nextPos) {
+    setCursorPos(clampCursorPos(nextPos, (textarea && textarea.value) || ""));
+    ensureInputCursorVisible();
+    updateCursor(textarea);
+    render(textarea);
+  }
+
   function handleKey(ch, key = {}, textarea) {
     const keyName = key && key.name;
 
@@ -136,8 +212,12 @@ function createInputListenerController(options = {}) {
     }
 
     if (keyName === "return" || keyName === "enter") {
-      if (key && key.shift) {
+      const value = String((textarea && textarea.value) || "");
+      const cursorPos = clampCursorPos(getCursorPos(), value);
+      if (key && (key.shift || key.meta)) {
         insertTextAtCursor("\n");
+      } else if (cursorPos > 0 && value[cursorPos - 1] === "\\") {
+        replaceInputRange(textarea, cursorPos - 1, cursorPos, "\n");
       } else {
         resetPreferredCol();
         if (textarea && typeof textarea._done === "function") {
@@ -147,6 +227,87 @@ function createInputListenerController(options = {}) {
       return;
     }
 
+    if (key && key.ctrl) {
+      if (keyName === "a") {
+        setCursorAndRender(textarea, moveCursorToVisualBoundary(textarea, "start"));
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "e") {
+        setCursorAndRender(textarea, moveCursorToVisualBoundary(textarea, "end"));
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "b") {
+        const cursorPos = getCursorPos();
+        if (cursorPos > 0) setCursorAndRender(textarea, cursorPos - 1);
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "f") {
+        const cursorPos = getCursorPos();
+        const value = String((textarea && textarea.value) || "");
+        if (cursorPos < value.length) setCursorAndRender(textarea, cursorPos + 1);
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "d") {
+        const cursorPos = getCursorPos();
+        const value = String((textarea && textarea.value) || "");
+        if (cursorPos < value.length) replaceInputRange(textarea, cursorPos, cursorPos + 1, "");
+        return;
+      }
+      if (keyName === "h") {
+        const cursorPos = getCursorPos();
+        if (cursorPos > 0) replaceInputRange(textarea, cursorPos - 1, cursorPos, "");
+        return;
+      }
+      if (keyName === "k") {
+        const cursorPos = getCursorPos();
+        const value = String((textarea && textarea.value) || "");
+        const target = moveCursorToVisualBoundary(textarea, "end");
+        if (target === cursorPos && value[cursorPos] === "\n") {
+          replaceInputRange(textarea, cursorPos, cursorPos + 1, "");
+        } else {
+          replaceInputRange(textarea, cursorPos, target, "");
+        }
+        return;
+      }
+      if (keyName === "u") {
+        const cursorPos = getCursorPos();
+        const value = String((textarea && textarea.value) || "");
+        const target = moveCursorToVisualBoundary(textarea, "start");
+        if (target === cursorPos && value[cursorPos - 1] === "\n") {
+          replaceInputRange(textarea, cursorPos - 1, cursorPos, "");
+        } else {
+          replaceInputRange(textarea, target, cursorPos, "");
+        }
+        return;
+      }
+      if (keyName === "w") {
+        deleteWordBefore(textarea);
+        return;
+      }
+    }
+
+    if (key && key.meta) {
+      if (keyName === "b") {
+        setCursorAndRender(textarea, moveCursorByWord(textarea, "backward"));
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "f") {
+        setCursorAndRender(textarea, moveCursorByWord(textarea, "forward"));
+        resetPreferredCol();
+        return;
+      }
+      if (keyName === "d") {
+        const cursorPos = getCursorPos();
+        replaceInputRange(textarea, cursorPos, moveCursorByWord(textarea, "forward"), "");
+        return;
+      }
+    }
+
     if (keyName === "left") {
       const cursorPos = getCursorPos();
       if (cursorPos > 0) setCursorPos(cursorPos - 1);
@@ -170,20 +331,14 @@ function createInputListenerController(options = {}) {
     }
 
     if (keyName === "home") {
-      setCursorPos(0);
+      setCursorAndRender(textarea, moveCursorToVisualBoundary(textarea, "start"));
       resetPreferredCol();
-      ensureInputCursorVisible();
-      updateCursor(textarea);
-      render(textarea);
       return;
     }
 
     if (keyName === "end") {
-      setCursorPos((textarea && textarea.value ? textarea.value.length : 0));
+      setCursorAndRender(textarea, moveCursorToVisualBoundary(textarea, "end"));
       resetPreferredCol();
-      ensureInputCursorVisible();
-      updateCursor(textarea);
-      render(textarea);
       return;
     }
 
@@ -192,17 +347,6 @@ function createInputListenerController(options = {}) {
         completionController.jumpToLast();
         return;
       }
-      if (historyUp()) {
-        completionController.hide();
-        return;
-      }
-    }
-
-    if (keyName === "down") {
-      if (historyDown()) {
-        completionController.hide();
-        return;
-      }
     }
 
     if (keyName === "up" || keyName === "down") {
@@ -220,11 +364,34 @@ function createInputListenerController(options = {}) {
 
       const cursorPos = getCursorPos();
       const value = (textarea && textarea.value) || "";
+      if (!value) {
+        if (keyName === "up") {
+          if (historyUp()) completionController.hide();
+          return;
+        }
+        if (historyDown()) {
+          completionController.hide();
+          return;
+        }
+        enterDashboardMode();
+        return;
+      }
       const { row, col } = getCursorRowCol(value, cursorPos, innerWidth);
       if (getPreferredCol() === null) setPreferredCol(col);
       const totalRows = countLines(value, innerWidth);
 
+      if (keyName === "up" && row <= 0) {
+        if (historyUp()) {
+          completionController.hide();
+        }
+        return;
+      }
+
       if (keyName === "down" && row >= totalRows - 1) {
+        if (historyDown()) {
+          completionController.hide();
+          return;
+        }
         enterDashboardMode();
         return;
       }
@@ -261,21 +428,11 @@ function createInputListenerController(options = {}) {
     if (keyName === "backspace") {
       const cursorPos = getCursorPos();
       if (cursorPos > 0 && textarea) {
-        textarea.value = textarea.value.slice(0, cursorPos - 1) + textarea.value.slice(cursorPos);
-        setCursorPos(cursorPos - 1);
-        resetPreferredCol();
-        resizeInput();
-        ensureInputCursorVisible();
-        updateCursor(textarea);
-        updateDraftFromInput();
-
-        if (shouldShowCompletion(textarea.value)) {
-          completionController.show(textarea.value);
+        if (key && (key.ctrl || key.meta)) {
+          deleteWordBefore(textarea);
         } else {
-          completionController.hide();
+          replaceInputRange(textarea, cursorPos - 1, cursorPos, "");
         }
-
-        render(textarea);
       }
       return;
     }
@@ -283,13 +440,11 @@ function createInputListenerController(options = {}) {
     if (keyName === "delete") {
       const cursorPos = getCursorPos();
       if (textarea && cursorPos < textarea.value.length) {
-        textarea.value = textarea.value.slice(0, cursorPos) + textarea.value.slice(cursorPos + 1);
-        resetPreferredCol();
-        resizeInput();
-        ensureInputCursorVisible();
-        updateCursor(textarea);
-        render(textarea);
-        updateDraftFromInput();
+        if (key && key.meta) {
+          replaceInputRange(textarea, cursorPos, moveCursorToVisualBoundary(textarea, "end"), "");
+        } else {
+          replaceInputRange(textarea, cursorPos, cursorPos + 1, "");
+        }
       }
       return;
     }
@@ -300,21 +455,8 @@ function createInputListenerController(options = {}) {
 
     if (insertChar && !/^[\x00-\x08\x0b-\x0c\x0e-\x1f\x7f]$/.test(insertChar) && textarea) {
       const cursorPos = getCursorPos();
-      textarea.value = textarea.value.slice(0, cursorPos) + insertChar + textarea.value.slice(cursorPos);
-      setCursorPos(cursorPos + 1);
       normalizeCommandPrefix();
-      resetPreferredCol();
-      resizeInput();
-      updateCursor(textarea);
-      updateDraftFromInput();
-
-      if (shouldShowCompletion(textarea.value)) {
-        completionController.show(textarea.value);
-      } else if (completionController.isActive()) {
-        completionController.hide();
-      }
-
-      render(textarea);
+      replaceInputRange(textarea, cursorPos, cursorPos, insertChar);
     }
   }
 

package/src/chat/layout.js

@@ -4,6 +4,8 @@ function createChatLayout(options = {}) {
     currentInputHeight = 4,
     dashboardHeight = 1,
     version = "unknown",
+    logBorder = false,
+    logScrollbar = false,
   } = options;
   const normalizedDashboardHeight = Number.isFinite(dashboardHeight) && dashboardHeight > 0
     ? Math.floor(dashboardHeight)
@@ -32,24 +34,38 @@ function createChatLayout(options = {}) {
     }
   }
 
-  // Log area (no border for cleaner look)
+  // Log area
   const logBox = blessed.log({
     parent: screen,
     top: 0,
     left: 0,
     width: "100%",
     height: `100%-${reservedBottomLines}`, // Will be adjusted dynamically
+    border: logBorder ? { type: "line" } : null,
     tags: true,
     scrollable: true,
     alwaysScroll: true,
     scrollback: 10000,
-    scrollbar: null,
+    scrollbar: logScrollbar
+      ? {
+        ch: " ",
+        track: { bg: "black" },
+        style: { bg: "gray" },
+      }
+      : null,
     keys: true,
     vi: true,
     // Mouse handled globally (toggleable) to keep copy working
     mouse: false,
     // Ensure proper wrapping and width calculation
     wrap: true,
+    padding: logBorder ? { left: 1, right: 1 } : undefined,
+    style: logBorder
+      ? {
+        border: { fg: "gray" },
+        scrollbar: { bg: "gray" },
+      }
+      : undefined,
   });
 
   // Status line just above input