u-foo 1.4.0 → 1.5.0

package/src/chat/inputHistoryController.js

@@ -2,16 +2,18 @@ const fs = require("fs");
 
 function createInputHistoryController(options = {}) {
   const {
-    inputHistoryFile,
-    historyDir,
+    inputHistoryFile: inputHistoryFileOption,
+    historyDir: historyDirOption,
     setInputValue = () => {},
     getInputValue = () => "",
     fsMod = fs,
   } = options;
 
-  if (!inputHistoryFile || !historyDir) {
+  if (!inputHistoryFileOption || !historyDirOption) {
     throw new Error("createInputHistoryController requires inputHistoryFile and historyDir");
   }
+  let inputHistoryFile = inputHistoryFileOption;
+  let historyDir = historyDirOption;
 
   const inputHistory = [];
   let historyIndex = 0;
@@ -24,6 +26,9 @@ function createInputHistoryController(options = {}) {
   }
 
   function loadInputHistory(limit = 2000) {
+    inputHistory.length = 0;
+    historyIndex = 0;
+    historyDraft = "";
     try {
       const raw = fsMod.readFileSync(inputHistoryFile, "utf8");
       const lines = String(raw || "").trim().split(/\r?\n/).filter(Boolean);
@@ -85,6 +90,28 @@ function createInputHistoryController(options = {}) {
     setIndexToEnd();
   }
 
+  function setHistoryTarget(next = {}) {
+    if (!next.inputHistoryFile || !next.historyDir) {
+      throw new Error("setHistoryTarget requires inputHistoryFile and historyDir");
+    }
+    inputHistoryFile = next.inputHistoryFile;
+    historyDir = next.historyDir;
+  }
+
+  function restoreDraft(draft = "") {
+    const nextDraft = String(draft || "");
+    setInputValue(nextDraft);
+    historyIndex = inputHistory.length;
+    historyDraft = nextDraft;
+  }
+
+  function getDraftForPersistence() {
+    if (historyIndex === inputHistory.length) {
+      return String(getInputValue() || "");
+    }
+    return String(historyDraft || "");
+  }
+
   return {
     loadInputHistory,
     updateDraftFromInput,
@@ -92,6 +119,9 @@ function createInputHistoryController(options = {}) {
     historyDown,
     commitSubmittedText,
     setIndexToEnd,
+    setHistoryTarget,
+    restoreDraft,
+    getDraftForPersistence,
     getState: () => ({
       history: [...inputHistory],
       historyIndex,

package/src/chat/inputListenerController.js

@@ -204,23 +204,33 @@ function createInputListenerController(options = {}) {
 
     if (keyName === "up" || keyName === "down") {
       const innerWidth = getWrapWidth();
-      if (innerWidth > 0) {
-        const cursorPos = getCursorPos();
-        const value = (textarea && textarea.value) || "";
-        const { row, col } = getCursorRowCol(value, cursorPos, innerWidth);
-        if (getPreferredCol() === null) setPreferredCol(col);
-        const totalRows = countLines(value, innerWidth);
-
-        if (keyName === "down" && row >= totalRows - 1) {
+      if (innerWidth <= 0) {
+        if (keyName === "down") {
           enterDashboardMode();
           return;
         }
+        ensureInputCursorVisible();
+        updateCursor(textarea);
+        render(textarea);
+        return;
+      }
 
-        const targetRow = keyName === "up"
-          ? Math.max(0, row - 1)
-          : Math.min(totalRows - 1, row + 1);
-        setCursorPos(getCursorPosForRowCol(value, targetRow, getPreferredCol(), innerWidth));
+      const cursorPos = getCursorPos();
+      const value = (textarea && textarea.value) || "";
+      const { row, col } = getCursorRowCol(value, cursorPos, innerWidth);
+      if (getPreferredCol() === null) setPreferredCol(col);
+      const totalRows = countLines(value, innerWidth);
+
+      if (keyName === "down" && row >= totalRows - 1) {
+        enterDashboardMode();
+        return;
       }
+
+      const targetRow = keyName === "up"
+        ? Math.max(0, row - 1)
+        : Math.min(totalRows - 1, row + 1);
+      setCursorPos(getCursorPosForRowCol(value, targetRow, getPreferredCol(), innerWidth));
+
       ensureInputCursorVisible();
       updateCursor(textarea);
       render(textarea);

package/src/chat/layout.js

@@ -2,8 +2,13 @@ function createChatLayout(options = {}) {
   const {
     blessed,
     currentInputHeight = 4,
+    dashboardHeight = 1,
     version = "unknown",
   } = options;
+  const normalizedDashboardHeight = Number.isFinite(dashboardHeight) && dashboardHeight > 0
+    ? Math.floor(dashboardHeight)
+    : 1;
+  const reservedBottomLines = Math.max(2, currentInputHeight + 1);
 
   const screen = blessed.screen({
     smartCSR: true,
@@ -33,7 +38,7 @@ function createChatLayout(options = {}) {
     top: 0,
     left: 0,
     width: "100%",
-    height: "100%-5", // Will be adjusted dynamically
+    height: `100%-${reservedBottomLines}`, // Will be adjusted dynamically
     tags: true,
     scrollable: true,
     alwaysScroll: true,
@@ -97,7 +102,7 @@ function createChatLayout(options = {}) {
     bottom: 0,
     left: 0,
     width: "100%",
-    height: 1,
+    height: normalizedDashboardHeight,
     style: { fg: "gray" },
     tags: true,
   });
@@ -105,7 +110,7 @@ function createChatLayout(options = {}) {
   // Bottom border line for input area (above dashboard)
   const inputBottomLine = blessed.line({
     parent: screen,
-    bottom: 1,
+    bottom: normalizedDashboardHeight,
     left: 1,
     width: "100%-2",
     orientation: "horizontal",
@@ -115,10 +120,10 @@ function createChatLayout(options = {}) {
   // Prompt indicator
   const promptBox = blessed.box({
     parent: screen,
-    bottom: 2,
+    bottom: normalizedDashboardHeight + 1,
     left: 0,
     width: 2,
-    height: currentInputHeight - 3,
+    height: Math.max(1, currentInputHeight - normalizedDashboardHeight - 2),
     content: ">",
     style: { fg: "cyan" },
   });
@@ -126,10 +131,10 @@ function createChatLayout(options = {}) {
   // Input area without left/right border
   const input = blessed.textarea({
     parent: screen,
-    bottom: 2,
+    bottom: normalizedDashboardHeight + 1,
     left: 2,
     width: "100%-2",
-    height: currentInputHeight - 3,
+    height: Math.max(1, currentInputHeight - normalizedDashboardHeight - 2),
     inputOnFocus: true,
     keys: true,
   });

package/src/chat/streamTracker.js

@@ -136,11 +136,17 @@ function createStreamTracker(options = {}) {
     return true;
   }
 
+  function discardAll() {
+    streamStates.clear();
+    pendingDeliveries.clear();
+  }
+
   return {
     beginStream,
     appendStreamDelta,
     finalizeStream,
     hasStream,
+    discardAll,
     markPendingDelivery,
     getPendingState,
     consumePendingDelivery,

package/src/cli/onlineCoreCommands.js

@@ -201,6 +201,8 @@ function runOnlineInbox(nickname, opts = {}) {
   checkInbox(nickname, {
     clear: !!opts.clear,
     unread: !!opts.unread,
+    room: opts.room || "",
+    channel: opts.channel || "",
   });
 }
 
@@ -280,6 +282,8 @@ async function runOnlineCommand(subcmd, payload = {}, options = {}) {
         return runOnlineInbox(payload.nickname, {
           clear: opts.clear,
           unread: opts.unread,
+          room: opts.room || "",
+          channel: opts.channel || "",
         });
       default:
         throw createUnknownOnlineError(subcmd);
@@ -374,6 +378,8 @@ async function runOnlineCommand(subcmd, payload = {}, options = {}) {
       return runOnlineInbox(argv[1], {
         clear: hasFallbackFlag(argv, "--clear"),
         unread: hasFallbackFlag(argv, "--unread"),
+        room: getFallbackOpt(argv, "--room"),
+        channel: getFallbackOpt(argv, "--channel"),
       });
     }
     default:

package/src/cli.js

@@ -7,6 +7,9 @@ const { runBusCoreCommand } = require("./cli/busCoreCommands");
 const { runCtxCommand } = require("./cli/ctxCoreCommands");
 const { runOnlineCommand } = require("./cli/onlineCoreCommands");
 const { runGroupCoreCommand } = require("./cli/groupCoreCommands");
+const { listProjectRuntimes, getCurrentProjectRuntime } = require("./projects/registry");
+const { canonicalProjectRoot, buildProjectId } = require("./projects/projectId");
+const { getUfooPaths } = require("./ufoo/paths");
 
 function getPackageRoot() {
   return path.resolve(__dirname, "..");
@@ -161,6 +164,111 @@ function parseJsonObject(text, fallback = {}) {
   return parsed;
 }
 
+function formatProjectRuntimeLine(row, index = 0) {
+  const idx = String(index + 1).padStart(2, " ");
+  const name = String(row.project_name || "-");
+  const status = String(row.status || "-");
+  const seen = row.last_seen || "-";
+  const projectRoot = String(row.project_root || "-");
+  return `${idx}. ${name}  [${status}]  last_seen=${seen}  ${projectRoot}`;
+}
+
+function printProjectList(rows = [], write = (line) => console.log(line)) {
+  if (!Array.isArray(rows) || rows.length === 0) {
+    write("No projects found.");
+    return;
+  }
+  write("=== Projects ===");
+  rows.forEach((row, index) => {
+    write(formatProjectRuntimeLine(row, index));
+  });
+}
+
+function buildCurrentProjectFallback(projectRoot) {
+  let canonical = "";
+  let projectId = "";
+  try {
+    canonical = canonicalProjectRoot(projectRoot);
+  } catch {
+    canonical = path.resolve(projectRoot || process.cwd());
+  }
+  try {
+    projectId = buildProjectId(canonical);
+  } catch {
+    projectId = "";
+  }
+  const paths = getUfooPaths(canonical);
+  return {
+    version: 1,
+    project_id: projectId || null,
+    project_root: canonical,
+    project_name: path.basename(canonical) || canonical,
+    daemon_pid: null,
+    socket_path: paths.ufooSock,
+    status: "untracked",
+    last_seen: null,
+  };
+}
+
+function printCurrentProject(runtime, write = (line) => console.log(line)) {
+  const row = runtime || {};
+  write("=== Current Project ===");
+  write(`name: ${row.project_name || "-"}`);
+  write(`status: ${row.status || "-"}`);
+  write(`path: ${row.project_root || "-"}`);
+  write(`daemon_pid: ${row.daemon_pid || "-"}`);
+  write(`socket: ${row.socket_path || "-"}`);
+  write(`last_seen: ${row.last_seen || "-"}`);
+}
+
+function projectSwitchV1Error() {
+  const err = new Error("project switch is chat-only in v1");
+  err.code = "UFOO_PROJECT_SWITCH_CHAT_ONLY";
+  err.exitCode = 2;
+  return err;
+}
+
+function runProjectCommand({
+  subcommand = "list",
+  outputJson = false,
+  cwd = process.cwd(),
+  write = (line) => console.log(line),
+  writeError = (line) => console.error(line),
+} = {}) {
+  const sub = String(subcommand || "list").trim().toLowerCase();
+  try {
+    if (sub === "list") {
+      const rows = listProjectRuntimes({ validate: true, cleanupTmp: true });
+      if (outputJson) {
+        write(JSON.stringify(rows, null, 2));
+        return 0;
+      }
+      printProjectList(rows, write);
+      return 0;
+    }
+    if (sub === "current") {
+      const current = getCurrentProjectRuntime(cwd, { validate: true })
+        || buildCurrentProjectFallback(cwd);
+      if (outputJson) {
+        write(JSON.stringify(current, null, 2));
+        return 0;
+      }
+      printCurrentProject(current, write);
+      return 0;
+    }
+    if (sub === "switch") {
+      const err = projectSwitchV1Error();
+      writeError(err.message);
+      return err.exitCode || 2;
+    }
+    writeError("project requires list|current|switch subcommand");
+    return 1;
+  } catch (err) {
+    writeError(err.message || String(err));
+    return 1;
+  }
+}
+
 function normalizeReportPhase(action = "") {
   const value = String(action || "").trim().toLowerCase();
   if (value === "start") return "start";
@@ -244,9 +352,46 @@ async function runCli(argv) {
     program
       .command("chat")
       .description("Launch ufoo chat UI")
-      .action(() => {
+      .option("-g, --global", "Launch in global multi-project mode")
+      .action((opts) => {
         const repoRoot = getPackageRoot();
-        run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), "chat"]);
+        const args = ["chat"];
+        if (opts.global === true) args.push("-g");
+        run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), ...args]);
+      });
+    const project = program.command("project").description("Project runtime commands");
+    project
+      .command("list")
+      .description("List runtime projects discovered from global registry")
+      .option("--json", "Output as JSON")
+      .action((opts) => {
+        process.exitCode = runProjectCommand({
+          subcommand: "list",
+          outputJson: opts.json === true,
+          cwd: process.cwd(),
+        });
+      });
+    project
+      .command("current")
+      .description("Show current project runtime context")
+      .option("--json", "Output as JSON")
+      .action((opts) => {
+        process.exitCode = runProjectCommand({
+          subcommand: "current",
+          outputJson: opts.json === true,
+          cwd: process.cwd(),
+        });
+      });
+    project
+      .command("switch")
+      .description("Switch active project (chat-only in v1)")
+      .argument("<indexOrPath>", "Project index from list output or absolute path")
+      .action(() => {
+        process.exitCode = runProjectCommand({
+          subcommand: "switch",
+          outputJson: false,
+          cwd: process.cwd(),
+        });
       });
     program
       .command("launch")
@@ -1112,7 +1257,11 @@ async function runCli(argv) {
     console.log("  ufoo doctor");
     console.log("  ufoo status");
     console.log("  ufoo daemon --start|--stop|--status");
-    console.log("  ufoo chat");
+    console.log("  ufoo -g");
+    console.log("  ufoo chat [-g]");
+    console.log("  ufoo project list [--json]");
+    console.log("  ufoo project current [--json]");
+    console.log("  ufoo project switch <index|path>");
     console.log("  ufoo resume [nickname]");
     console.log("  ufoo recover [list [target] | run <target>] [--json]");
     console.log("  ufoo report <start|progress|done|error|list> [message] [--task <id>] [--agent <id>]");
@@ -1175,7 +1324,21 @@ async function runCli(argv) {
     return;
   }
   if (cmd === "chat") {
-    run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), "chat"]);
+    const chatArgs = ["chat"];
+    if (rest.includes("-g") || rest.includes("--global")) {
+      chatArgs.push("-g");
+    }
+    run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), ...chatArgs]);
+    return;
+  }
+  if (cmd === "project") {
+    const sub = String(rest[0] || "list").trim().toLowerCase();
+    const outputJson = rest.includes("--json");
+    process.exitCode = runProjectCommand({
+      subcommand: sub,
+      outputJson,
+      cwd: process.cwd(),
+    });
     return;
   }
   if (cmd === "resume") {

package/src/daemon/index.js

@@ -11,6 +11,7 @@ const { generateInstanceId, subscriberToSafeName } = require("../bus/utils");
 const { createDaemonIpcServer } = require("./ipcServer");
 const { IPC_REQUEST_TYPES, IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../shared/eventContract");
 const { getUfooPaths } = require("../ufoo/paths");
+const { upsertProjectRuntime, markProjectStopped } = require("../projects/registry");
 const { scheduleProviderSessionProbe, loadProviderSessionCache } = require("./providerSessions");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { createDaemonCronController } = require("./cronOps");
@@ -25,6 +26,7 @@ let providerSessions = null;
 let probeHandles = new Map();
 let daemonCronController = null;
 let daemonGroupOrchestrator = null;
+const PROJECT_RUNTIME_HEARTBEAT_MS = 10 * 1000;
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -323,7 +325,10 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
           continue;
         }
         // eslint-disable-next-line no-await-in-loop
-        const launchResult = await launchAgent(projectRoot, agent, count, nickname, processManager);
+        const launchResult = await launchAgent(projectRoot, agent, count, nickname, processManager, {
+          launchScope: op.launch_scope || "",
+          terminalApp: op.terminal_app || "",
+        });
         if (launchResult.mode === "internal" && launchResult.subscriberIds && launchResult.subscriberIds.length > 0) {
           const probeAgentType = agent === "codex"
             ? "codex"
@@ -359,6 +364,7 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
           agent,
           count,
           nickname: nickname || undefined,
+          launch_scope: launchResult.launchScope || undefined,
           subscriber_ids: Array.isArray(launchResult.subscriberIds) ? launchResult.subscriberIds.slice() : [],
         });
         if (nickname) {
@@ -669,6 +675,19 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
   const log = (msg) => {
     logFile.write(`[daemon] ${new Date().toISOString()} ${msg}\n`);
   };
+  const publishProjectRuntime = (status = "running") => {
+    try {
+      upsertProjectRuntime({
+        projectRoot,
+        daemonPid: process.pid,
+        socketPath: socketPath(projectRoot),
+        status,
+        lastSeen: new Date().toISOString(),
+      });
+    } catch (err) {
+      log(`project runtime update failed (${status}): ${err.message || err}`);
+    }
+  };
 
   // 创建进程管理器 - daemon 作为父进程监控所有 internal agents
   const processManager = new AgentProcessManager(projectRoot);
@@ -952,7 +971,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
     }
     if (req.type === IPC_REQUEST_TYPES.LAUNCH_AGENT) {
       log(`launch_agent received: agent=${req.agent} count=${req.count}`);
-      const { agent, count, nickname } = req;
+      const { agent, count, nickname, launch_scope, terminal_app } = req;
       const normalizedAgent = normalizeLaunchAgent(agent);
       if (!normalizedAgent) {
         socket.write(
@@ -971,6 +990,8 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         agent: normalizedAgent,
         count: finalCount,
         nickname: nickname || "",
+        launch_scope: launch_scope || "",
+        terminal_app: terminal_app || "",
       };
       try {
         const opsResults = await handleOps(projectRoot, [op], processManager);
@@ -1515,6 +1536,10 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
   };
 
   ipcServer.listen(socketPath(projectRoot));
+  publishProjectRuntime("running");
+  const runtimeHeartbeat = setInterval(() => {
+    publishProjectRuntime("running");
+  }, PROJECT_RUNTIME_HEARTBEAT_MS);
 
   log(`Started pid=${process.pid}`);
 
@@ -1619,8 +1644,17 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
     }, 1500);
   }
 
+  let cleanedUp = false;
   const cleanup = () => {
+    if (cleanedUp) return;
+    cleanedUp = true;
     log(`Shutting down daemon (managed agents: ${processManager.count()})`);
+    clearInterval(runtimeHeartbeat);
+    try {
+      markProjectStopped(projectRoot);
+    } catch {
+      // ignore cleanup errors
+    }
 
     if (daemonCronController) {
       daemonCronController.stopAll();
@@ -1706,6 +1740,12 @@ function stopDaemon(projectRoot) {
     // ignore
   }
 
+  try {
+    markProjectStopped(projectRoot);
+  } catch {
+    // ignore
+  }
+
   return killed;
 }