u-foo 2.3.21 → 2.3.23

package/package.json

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

package/src/agent/upstreamTransport.js

@@ -1,7 +1,12 @@
 "use strict";
 
 const { randomUUID } = require("crypto");
-const { loadConfig } = require("../config");
+const {
+  loadConfig,
+  defaultAgentModelForProvider,
+  defaultRouterModelForProvider,
+  sameModelProvider,
+} = require("../config");
 const {
   resolveRuntimeConfig,
   resolveCompletionUrl,
@@ -30,6 +35,16 @@ const CODEX_DEFAULT_BASE_URL = "https://chatgpt.com/backend-api/codex";
 const CODEX_DEFAULT_USER_AGENT = "codex-tui/0.118.0 (Mac OS 26.3.1; arm64) iTerm.app/3.6.9 (codex-tui; 0.118.0)";
 const CODEX_DEFAULT_ORIGINATOR = "codex-tui";
 
+function resolveConfiguredModelForProvider(config = {}, provider = "") {
+  if (config.routerProvider && sameModelProvider(config.routerProvider, provider)) {
+    return config.routerModel;
+  }
+  if (config.agentProvider && sameModelProvider(config.agentProvider, provider)) {
+    return config.agentModel;
+  }
+  return "";
+}
+
 function buildOpenAiChatRequest({
   model = "",
   systemPrompt = "",
@@ -217,7 +232,11 @@ async function resolveUpstreamRuntime({
     const baseUrl = useCodexResponses
       ? String(env.UFOO_CODEX_BASE_URL || "").trim() || CODEX_DEFAULT_BASE_URL
       : String(env.OPENAI_BASE_URL || "").trim() || "https://api.openai.com/v1";
-    const resolvedModel = String(model || config.routerModel || config.agentModel || "").trim();
+    const resolvedModel = String(
+      model
+        || resolveConfiguredModelForProvider(config, "codex")
+        || defaultRouterModelForProvider("codex")
+    ).trim();
     return {
       provider: "codex",
       transport: useCodexResponses ? "codex-responses" : "openai-chat",
@@ -237,7 +256,11 @@ async function resolveUpstreamRuntime({
       env,
     });
     const baseUrl = String(env.ANTHROPIC_BASE_URL || "").trim() || "https://api.anthropic.com/v1";
-    const resolvedModel = String(model || config.routerModel || config.agentModel || "").trim();
+    const resolvedModel = String(
+      model
+        || resolveConfiguredModelForProvider(config, "claude")
+        || defaultRouterModelForProvider("claude")
+    ).trim();
     return {
       provider: "claude",
       transport: "anthropic-messages",
@@ -252,7 +275,7 @@ async function resolveUpstreamRuntime({
   const runtime = resolveRuntimeConfig({
     workspaceRoot: projectRoot,
     provider: normalizedProvider === "ucode" ? "" : normalizedProvider,
-    model,
+    model: model || resolveConfiguredModelForProvider(config, normalizedProvider) || defaultAgentModelForProvider(config.agentProvider),
   });
   const auth = runtime.apiKey ? { apiKey: String(runtime.apiKey || "").trim() } : { headers: {} };
   return {

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/chat/commandExecutor.js

@@ -9,6 +9,9 @@ const {
   loadGlobalUcodeConfig,
   saveGlobalUcodeConfig,
   normalizeControllerMode,
+  SETTINGS_MODEL_DEFAULTS,
+  defaultAgentModelForProvider,
+  defaultRouterModelForProvider,
 } = require("../config");
 const { resolveTransport } = require("../code/nativeRunner");
 const { resolveDisplayNickname } = require("../daemon/nicknameScope");
@@ -43,17 +46,6 @@ function defaultResolveTerminalApp() {
   return "";
 }
 
-const SETTINGS_MODEL_DEFAULTS = Object.freeze({
-  agent: Object.freeze({
-    codex: "gpt-5.5",
-    claude: "opus-4.7",
-  }),
-  router: Object.freeze({
-    codex: "gpt-5.4-mini",
-    claude: "sonnet-4.7",
-  }),
-});
-
 function normalizeSettingsProvider(value = "", fallback = "codex-cli") {
   const text = String(value || "").trim().toLowerCase();
   if (text === "claude" || text === "claude-cli" || text === "claude-code" || text === "anthropic") {
@@ -69,13 +61,8 @@ function agentProviderKey(value = "") {
   return normalizeSettingsProvider(value) === "claude-cli" ? "claude" : "codex";
 }
 
-function defaultAgentModelForProvider(value = "") {
-  return SETTINGS_MODEL_DEFAULTS.agent[agentProviderKey(value)] || SETTINGS_MODEL_DEFAULTS.agent.codex;
-}
-
 function defaultGateModelForProvider(value = "") {
-  const key = agentProviderKey(value);
-  return SETTINGS_MODEL_DEFAULTS.router[key] || SETTINGS_MODEL_DEFAULTS.router.codex;
+  return defaultRouterModelForProvider(value);
 }
 
 function collectHostLaunchRequestContext(env = process.env) {

package/src/chat/commands.js

@@ -113,7 +113,7 @@ const COMMAND_TREE = {
           loop: { desc: "Set router mode to loop", order: 5 },
           legacy: { desc: "Set router mode to legacy", order: 6 },
           shadow: { desc: "Set router mode to shadow", order: 7 },
-          codex: { desc: "Use Codex gate model (gpt-5.4-mini)", order: 8 },
+          codex: { desc: "Use Codex gate model (gpt-5.3-codex-spark)", order: 8 },
           claude: { desc: "Use Claude gate model (sonnet-4.7)", order: 9 },
         },
       },

package/src/code/agent.js

@@ -17,7 +17,7 @@ const {
   stripLeakedEscapeTags,
 } = require("./tui");
 const { stripBlessedTags } = require("../chat/text");
-const { loadConfig } = require("../config");
+const { loadConfig, defaultAgentModelForProvider, sameModelProvider } = require("../config");
 const {
   resolveSessionId,
   normalizeSessionId,
@@ -109,12 +109,14 @@ function resolveUcodeProviderModel({
       || ""
   ).trim();
   const resolvedProvider = resolvePlannerProvider(explicitProvider || fallbackProviderFromAgent);
+  const configuredModel = sameModelProvider(config.ucodeProvider || config.agentProvider, resolvedProvider)
+    ? (config.ucodeModel || config.agentModel)
+    : "";
   const resolvedModel = String(
     model
       || process.env.UFOO_UCODE_MODEL
-      || config.ucodeModel
-      || config.agentModel
-      || ""
+      || configuredModel
+      || defaultAgentModelForProvider(resolvedProvider)
   ).trim();
   return {
     provider: resolvedProvider,

package/src/code/nativeRunner.js

@@ -1,5 +1,5 @@
 const { randomUUID } = require("crypto");
-const { loadConfig } = require("../config");
+const { loadConfig, defaultAgentModelForProvider, sameModelProvider } = require("../config");
 const { runToolCall } = require("./dispatch");
 const { getReadToolDescription } = require("./prompts/toolDescriptions/read");
 const { getWriteToolDescription } = require("./prompts/toolDescriptions/write");
@@ -219,13 +219,15 @@ function resolveRuntimeConfig({ workspaceRoot = process.cwd(), provider = "", mo
       || configuredProvider
       || "openai"
   ) || "openai";
+  const configuredModel = sameModelProvider(config.ucodeProvider || config.agentProvider, selectedProvider)
+    ? (config.ucodeModel || config.agentModel)
+    : "";
 
   const selectedModel = String(
     model
       || process.env.UFOO_UCODE_MODEL
-      || config.ucodeModel
-      || config.agentModel
-      || ""
+      || configuredModel
+      || defaultAgentModelForProvider(selectedProvider)
   ).trim();
 
   const defaultBaseUrl = selectedProvider === "anthropic"

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 = {}) {
@@ -627,8 +698,8 @@ function runUcodeTui({
       blessed,
       currentInputHeight: 4,
       version: UCODE_VERSION,
-      logBorder: true,
-      logScrollbar: true,
+      logBorder: false,
+      logScrollbar: false,
     });
 
     if (completionPanel && typeof completionPanel.hide === "function") {
@@ -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) - 2; // subtract border/padding
-      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,

package/src/config.js

@@ -4,6 +4,17 @@ const path = require("path");
 
 const UCODE_FIELDS = ["ucodeProvider", "ucodeModel", "ucodeBaseUrl", "ucodeApiKey", "ucodeAgentDir"];
 
+const SETTINGS_MODEL_DEFAULTS = Object.freeze({
+  agent: Object.freeze({
+    codex: "gpt-5.5",
+    claude: "opus-4.7",
+  }),
+  router: Object.freeze({
+    codex: "gpt-5.3-codex-spark",
+    claude: "sonnet-4.7",
+  }),
+});
+
 const DEFAULT_CONFIG = {
   launchMode: "auto",
   agentProvider: "codex-cli",
@@ -15,6 +26,8 @@ const DEFAULT_CONFIG = {
   claudeOauthTokenPath: "",
   claudeOauthRefreshWindowSec: 300,
   agentModel: "",
+  routerProvider: "",
+  routerModel: "",
   autoResume: false,
 };
 
@@ -41,6 +54,33 @@ function normalizeAgentProvider(value) {
   return "codex-cli";
 }
 
+function providerKey(value = "") {
+  const text = String(value || "").trim().toLowerCase();
+  if (text === "claude" || text === "claude-cli" || text === "claude-code" || text === "anthropic") return "claude";
+  return "codex";
+}
+
+function sameModelProvider(left = "", right = "") {
+  return providerKey(left) === providerKey(right);
+}
+
+function defaultAgentModelForProvider(value = "") {
+  return SETTINGS_MODEL_DEFAULTS.agent[providerKey(value)] || SETTINGS_MODEL_DEFAULTS.agent.codex;
+}
+
+function defaultRouterProviderForAgentProvider(value = "") {
+  return providerKey(value) === "claude" ? "claude" : "codex";
+}
+
+function defaultRouterModelForProvider(value = "") {
+  return SETTINGS_MODEL_DEFAULTS.router[providerKey(value)] || SETTINGS_MODEL_DEFAULTS.router.codex;
+}
+
+function normalizeModel(value, fallback = "") {
+  const text = typeof value === "string" ? value.trim() : "";
+  return text || fallback;
+}
+
 function normalizeControllerMode(value) {
   const raw = String(value || "").trim().toLowerCase();
   if (raw === "shadow") return "shadow";
@@ -100,11 +140,19 @@ function loadJsonSafe(filePath) {
 function loadConfig(projectRoot) {
   try {
     const raw = loadJsonSafe(configPath(projectRoot));
+    const agentProvider = normalizeAgentProvider(raw.agentProvider);
+    const routerProvider = normalizeModel(
+      raw.routerProvider,
+      defaultRouterProviderForAgentProvider(agentProvider)
+    );
     return {
       ...DEFAULT_CONFIG,
       ...raw,
       launchMode: normalizeLaunchMode(raw.launchMode),
-      agentProvider: normalizeAgentProvider(raw.agentProvider),
+      agentProvider,
+      agentModel: normalizeModel(raw.agentModel, defaultAgentModelForProvider(agentProvider)),
+      routerProvider,
+      routerModel: normalizeModel(raw.routerModel, defaultRouterModelForProvider(routerProvider)),
       controllerMode: Object.prototype.hasOwnProperty.call(raw, "controllerMode")
         ? normalizeControllerMode(raw.controllerMode)
         : DEFAULT_CONFIG.controllerMode,
@@ -121,7 +169,15 @@ function loadConfig(projectRoot) {
       ...loadGlobalUcodeConfig(),
     };
   } catch {
-    return { ...DEFAULT_CONFIG, ...DEFAULT_UCODE_CONFIG };
+    const agentProvider = DEFAULT_CONFIG.agentProvider;
+    const routerProvider = defaultRouterProviderForAgentProvider(agentProvider);
+    return {
+      ...DEFAULT_CONFIG,
+      agentModel: defaultAgentModelForProvider(agentProvider),
+      routerProvider,
+      routerModel: defaultRouterModelForProvider(routerProvider),
+      ...DEFAULT_UCODE_CONFIG,
+    };
   }
 }
 
@@ -152,6 +208,9 @@ function saveConfig(projectRoot, config) {
   }
   merged.launchMode = normalizeLaunchMode(merged.launchMode);
   merged.agentProvider = normalizeAgentProvider(merged.agentProvider);
+  merged.agentModel = typeof merged.agentModel === "string" ? merged.agentModel.trim() : "";
+  merged.routerProvider = typeof merged.routerProvider === "string" ? merged.routerProvider.trim() : "";
+  merged.routerModel = typeof merged.routerModel === "string" ? merged.routerModel.trim() : "";
   merged.controllerMode = normalizeControllerMode(merged.controllerMode);
   merged.codexInternalThreadMode = normalizeCodexInternalThreadMode(merged.codexInternalThreadMode);
   merged.codexAuthPath = normalizeCodexAuthPath(merged.codexAuthPath);
@@ -190,12 +249,17 @@ function saveGlobalUcodeConfig(updates = {}) {
 }
 
 module.exports = {
+  SETTINGS_MODEL_DEFAULTS,
   loadConfig,
   saveConfig,
   loadGlobalUcodeConfig,
   saveGlobalUcodeConfig,
   normalizeLaunchMode,
   normalizeAgentProvider,
+  sameModelProvider,
+  defaultAgentModelForProvider,
+  defaultRouterProviderForAgentProvider,
+  defaultRouterModelForProvider,
   normalizeControllerMode,
   normalizeCodexInternalThreadMode,
   normalizeCodexAuthPath,

package/src/controller/gateRouter.js

@@ -1,6 +1,11 @@
 "use strict";
 
-const { loadConfig } = require("../config");
+const {
+  loadConfig,
+  defaultRouterProviderForAgentProvider,
+  defaultRouterModelForProvider,
+  sameModelProvider,
+} = require("../config");
 
 const DEFAULT_EXECUTION_PATH = "main";
 const DEFAULT_CONFIDENCE_THRESHOLD = 0.6;
@@ -122,18 +127,22 @@ function resolveGateRouterConfig({
   loadConfigImpl = loadConfig,
 } = {}) {
   const config = loadConfigImpl(projectRoot || process.cwd());
+  const requestProvider = requestMeta.router_provider || env.UFOO_AGENT_ROUTER_PROVIDER;
+  const provider = String(
+    requestProvider
+      || config.routerProvider
+      || defaultRouterProviderForAgentProvider(config.agentProvider)
+  ).trim();
+  const configuredRouterModel = !requestProvider || sameModelProvider(config.routerProvider, provider)
+    ? config.routerModel
+    : "";
   return {
-    provider: String(
-      requestMeta.router_provider
-        || env.UFOO_AGENT_ROUTER_PROVIDER
-        || config.routerProvider
-        || "ucode"
-    ).trim(),
+    provider,
     model: String(
       requestMeta.router_model
         || env.UFOO_AGENT_ROUTER_MODEL
-        || config.routerModel
-        || ""
+        || configuredRouterModel
+        || defaultRouterModelForProvider(provider)
     ).trim(),
     timeoutMs: toPositiveNumber(
       requestMeta.router_timeout_ms

package/src/daemon/run.js

@@ -1,14 +1,17 @@
 const path = require("path");
 const { startDaemon, stopDaemon, isRunning } = require("./index");
-const { loadConfig } = require("../config");
+const { loadConfig, defaultAgentModelForProvider } = require("../config");
 
 function runDaemonCli(argv) {
   const cmd = argv[1] || "start";
   const projectRoot = process.cwd();
   const config = loadConfig(projectRoot);
-  const provider = process.env.UFOO_AGENT_PROVIDER || config.agentProvider || "codex-cli";
+  const envProvider = process.env.UFOO_AGENT_PROVIDER;
+  const provider = envProvider || config.agentProvider || "codex-cli";
   const model =
-    process.env.UFOO_AGENT_MODEL || config.agentModel || (provider === "claude-cli" ? "opus" : "");
+    process.env.UFOO_AGENT_MODEL
+    || (envProvider && envProvider !== config.agentProvider ? "" : config.agentModel)
+    || defaultAgentModelForProvider(provider);
   const resumeMode = process.env.UFOO_FORCE_RESUME === "1" ? "force" : "auto";
   const launchMode = config.launchMode || "terminal";