u-foo 2.3.31 → 2.4.0

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

@@ -35,6 +35,7 @@ const COMMAND_TREE = {
       stop: { desc: "Stop cron task by id or all" },
     },
   },
+  "/clear": { desc: "Clear chat log on screen" },
   "/group": {
     desc: "Agent group orchestration",
     children: {
@@ -47,13 +48,15 @@ const COMMAND_TREE = {
     },
   },
   "/init": { desc: "Initialize modules" },
+  "/multi": { desc: "Toggle multi-window agent view" },
   "/open": { desc: "Open project path in global mode" },
   "/launch": {
     desc: "Launch new agent",
     children: {
-      claude: { desc: "Launch Claude agent" },
-      codex: { desc: "Launch Codex agent" },
-      ucode: { desc: "Launch ucode core agent" },
+      claude: { desc: "Launch Claude agent", order: 1 },
+      codex: { desc: "Launch Codex agent", order: 2 },
+      agy: { desc: "Launch Antigravity (agy) agent", order: 3 },
+      ucode: { desc: "Launch ucode core agent", order: 4 },
     },
   },
   "/project": {
@@ -136,7 +139,7 @@ const COMMAND_TREE = {
     },
   },
   "/status": { desc: "Status display" },
-  "/ufoo": { desc: "ufoo protocol (session marker)" },
+  "/ufoo": { desc: "ufoo protocol" },
 };
 
 const COMMAND_ORDER = ["/launch", "/group", "/bus", "/ctx"];
@@ -196,10 +199,120 @@ function parseCommand(text) {
   return { command, args };
 }
 
+function parseCommandOptions(args = []) {
+  const options = {};
+  const positional = [];
+  for (const arg of args) {
+    const raw = String(arg || "").trim();
+    if (!raw) continue;
+    if (raw.includes("=")) {
+      const [key, value] = raw.split("=", 2);
+      options[String(key || "").trim().toLowerCase()] = String(value || "").trim();
+    } else {
+      positional.push(raw);
+    }
+  }
+  return { options, positional };
+}
+
+function normalizeAgentLabel(value = "") {
+  const raw = String(value || "").trim().toLowerCase();
+  if (raw === "claude" || raw === "uclaude") return "claude";
+  if (raw === "codex" || raw === "ucodex") return "codex";
+  if (raw === "agy" || raw === "antigravity" || raw === "uagy") return "agy";
+  if (raw === "ucode" || raw === "ufoo") return "ufoo";
+  return raw || "agent";
+}
+
+function describeCommandForChat(text) {
+  const parsed = parseCommand(String(text || "").trim());
+  if (!parsed) return "";
+  const command = String(parsed.command || "").trim().toLowerCase();
+  const args = parsed.args || [];
+  const sub = String(args[0] || "").trim().toLowerCase();
+  const { options, positional } = parseCommandOptions(args);
+
+  if (command === "launch") {
+    const agent = normalizeAgentLabel(args[0]);
+    const nickname = options.nickname || options.nick || options.name || "";
+    const profile = options.profile || options.prompt_profile || "";
+    const count = parseInt(options.count || "1", 10);
+    const scope = options.scope || options.launch_scope || positional.slice(1).find((item) =>
+      /^(window|new-window|separate|inplace|same|current|tab|pane)$/i.test(item)
+    ) || "";
+    const base = nickname
+      ? `Launching a ${agent} named ${nickname}`
+      : (Number.isFinite(count) && count > 1 ? `Launching ${count} ${agent} agents` : `Launching a ${agent} agent`);
+    return `${base}${profile ? ` with profile ${profile}` : ""}${/^(window|new-window|separate)$/i.test(scope) ? " in a new window" : ""}`;
+  }
+
+  if (command === "group") {
+    if (sub === "run") return `Launching group ${args[1] || "template"}`;
+    if (sub === "status") return `Checking group ${args[1] || "status"}`;
+    if (sub === "stop") return `Stopping group ${args[1] || "run"}`;
+    if (sub === "diagram") return `Showing group diagram${args[1] ? ` for ${args[1]}` : ""}`;
+    if (sub === "template" || sub === "templates") return "Browsing group templates";
+    return "Managing agent groups";
+  }
+
+  if (command === "bus") {
+    if (sub === "send") return `Sending a message to ${args[1] || "an agent"}`;
+    if (sub === "rename") return `Renaming ${args[1] || "an agent"}${args[2] ? ` to ${args[2]}` : ""}`;
+    if (sub === "activate") return `Activating ${args[1] || "an agent"}`;
+    if (sub === "list") return "Listing active agents";
+    if (sub === "status") return "Checking bus status";
+    return "Using the event bus";
+  }
+
+  if (command === "daemon") {
+    if (sub === "start") return "Starting the ufoo daemon";
+    if (sub === "stop") return "Stopping the ufoo daemon";
+    if (sub === "restart") return "Restarting the ufoo daemon";
+    if (sub === "status") return "Checking daemon status";
+    return "Managing the ufoo daemon";
+  }
+
+  if (command === "project") {
+    if (sub === "switch") return `Switching to project ${args[1] || ""}`.trim();
+    if (sub === "current") return "Showing current project";
+    if (sub === "list") return "Listing running projects";
+    return "Managing projects";
+  }
+
+  if (command === "solo") {
+    if (sub === "run") return `Launching solo role ${args[1] || "agent"}`;
+    if (sub === "list") return "Listing solo roles";
+    return "Managing solo agents";
+  }
+
+  if (command === "role") {
+    if (sub === "assign") return `Assigning role ${args[2] || ""}${args[1] ? ` to ${args[1]}` : ""}`.trim();
+    if (sub === "list") return "Listing roles";
+    return "Managing roles";
+  }
+
+  if (command === "cron") {
+    if (sub === "start") return "Creating a cron task";
+    if (sub === "stop") return `Stopping cron task ${args[1] || ""}`.trim();
+    if (sub === "list") return "Listing cron tasks";
+    return "Managing cron tasks";
+  }
+
+  if (command === "settings") return !sub || sub === "show" ? "Showing settings" : "Updating settings";
+  if (command === "ctx") return `Checking context${sub ? ` ${sub}` : ""}`;
+  if (command === "doctor") return "Running ufoo diagnostics";
+  if (command === "clear") return "Clearing the chat log";
+  if (command === "multi") return "Toggling multi-pane view";
+  if (command === "open") return `Opening project ${args[0] || ""}`.trim();
+  if (command === "resume") return args[0] === "list" ? "Listing recoverable agents" : `Resuming ${args[0] || "agents"}`;
+  if (command === "init") return "Initializing ufoo modules";
+
+  return `Running /${command}`;
+}
+
 function shouldEchoCommandInChat(text) {
   const parsed = parseCommand(String(text || "").trim());
   if (!parsed) return true;
-  if (parsed.command === "group" && parsed.args[0] === "run") return false;
   return true;
 }
 
@@ -222,6 +335,7 @@ module.exports = {
   sortCommands,
   buildCommandRegistry,
   parseCommand,
+  describeCommandForChat,
   shouldEchoCommandInChat,
   parseAtTarget,
 };

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

@@ -1,4 +1,4 @@
-const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
+const { IPC_REQUEST_TYPES } = require("../../runtime/contracts/eventContract");
 
 function createDaemonConnection(options = {}) {
   const {

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

@@ -1,5 +1,5 @@
-const { IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../shared/eventContract");
-const { renderMarkdownLines } = require("../shared/markdownRenderer");
+const { IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../../runtime/contracts/eventContract");
+const { renderMarkdownLines } = require("../../ui/format/markdownRenderer");
 const { decodeEscapedNewlines } = require("./text");
 
 function createDaemonMessageRouter(options = {}) {
@@ -47,6 +47,45 @@ function createDaemonMessageRouter(options = {}) {
     return `{cyan-fg}${escapedLabel}{/cyan-fg} {gray-fg}·{/gray-fg} `;
   }
 
+  function launchTargetLabel(result = {}, renameResult = null) {
+    const nickname = (renameResult && renameResult.ok && renameResult.nickname)
+      || result.nickname
+      || "";
+    if (nickname) return nickname;
+    const ids = Array.isArray(result.subscriber_ids) ? result.subscriber_ids : [];
+    return ids[0] || result.agent_id || "";
+  }
+
+  function buildLifecycleSummary(payload = {}, msg = {}) {
+    const ops = Array.isArray(payload.ops) ? payload.ops : [];
+    const results = Array.isArray(msg.opsResults) ? msg.opsResults : [];
+    if (ops.length === 0) return "";
+    const launchOp = ops.find((op) => op && op.action === "launch");
+    if (launchOp) {
+      const launchResult = results.find((item) => item && item.action === "launch") || {};
+      const renameResult = results.find((item) => item && item.action === "rename" && item.ok);
+      if (launchResult.ok === false) {
+        return `Launch failed: ${launchResult.error || "unknown error"}`;
+      }
+      const agent = String(launchResult.agent || launchOp.agent || "agent").trim();
+      const count = Number(launchResult.count || launchOp.count || 1);
+      const ids = Array.isArray(launchResult.subscriber_ids) ? launchResult.subscriber_ids.filter(Boolean) : [];
+      const target = launchTargetLabel(launchResult, renameResult);
+      if (launchResult.skipped && target) return `Reused ${agent}:${target}`;
+      if (ids.length > 1) return `Launched ${ids.length} ${agent} agents: ${ids.join(", ")}`;
+      if (target) return `Launched ${agent}:${target}`;
+      if (count > 1) return `Launched ${count} ${agent} agents`;
+      return `Launched a ${agent} agent`;
+    }
+    const closeOp = ops.find((op) => op && op.action === "close");
+    if (closeOp) {
+      const closeResult = results.find((item) => item && item.action === "close") || {};
+      if (closeResult.ok === false) return `Close failed: ${closeResult.error || "unknown error"}`;
+      return `Closed ${closeResult.agent_id || closeOp.agent_id || closeOp.target || "agent"}`;
+    }
+    return "";
+  }
+
   function normalizeDisplayMessage(raw) {
     let displayMessage = raw || "";
     let streamPayload = null;
@@ -223,7 +262,10 @@ function createDaemonMessageRouter(options = {}) {
         /^Group started\b/i.test(replyText)
       );
       // Suppress lifecycle confirmations from chat history — status line plus structured payload is enough.
-      if (!isLifecycleStatusOnly && !isGroupStartedConfirmation) {
+      if (isLifecycleStatusOnly) {
+        const summary = buildLifecycleSummary(payload, msg);
+        if (summary) logMessage("reply", `${speakerPrefix("ufoo", "white")}${escapeBlessed(summary)}`);
+      } else if (!isGroupStartedConfirmation) {
         logMessage("reply", `${speakerPrefix("ufoo", "white")}${escapeBlessed(replyText)}`);
       }
     }
@@ -415,7 +457,15 @@ function createDaemonMessageRouter(options = {}) {
         const delta = typeof streamPayload.delta === "string"
           ? decodeEscapedNewlines(streamPayload.delta)
           : "";
-        if (delta) writeToAgentTerm(delta);
+        if (delta || streamPayload.done) {
+          writeToAgentTerm(delta, {
+            data,
+            publisher,
+            streamPayload,
+            done: Boolean(streamPayload.done),
+            reason: streamPayload.reason || "",
+          });
+        }
       } else if (displayMessage) {
         writeToAgentTerm(`${displayMessage}\r\n`);
       }

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

@@ -29,6 +29,7 @@ function createDaemonTransport(options = {}) {
 
   async function connectClientForTarget(override = {}) {
     const target = resolveTarget(override);
+    const autoStart = override.autoStart !== false;
     let client = await connectWithRetry(
       target.sockPath,
       primaryRetries,
@@ -39,7 +40,7 @@ function createDaemonTransport(options = {}) {
       // Retry once with a fresh daemon start and longer wait.
       // Check if a restart is already in progress via the explicit restart flow.
       const isExplicitRestartInProgress = restartLocks.get(target.projectRoot);
-      if (!isExplicitRestartInProgress && !isRunning(target.projectRoot)) {
+      if (autoStart && !isExplicitRestartInProgress && !isRunning(target.projectRoot)) {
         startDaemon(target.projectRoot);
         await new Promise((resolve) => setTimeout(resolve, restartDelayMs));
       }

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

@@ -1,9 +1,10 @@
 const { clampAgentWindowWithSelection } = require("./agentDirectory");
 
-const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal-pty", "internal"];
+const DEFAULT_MODE_OPTIONS = ["auto", "host", "terminal", "tmux", "internal"];
 
 function providerLabel(value) {
   if (value === "claude-cli") return "claude";
+  if (value === "agy-cli" || value === "agy" || value === "antigravity") return "agy";
   if (value === "ucode" || value === "ufoo" || value === "ufoo-code") return "ucode";
   return "codex";
 }
@@ -174,11 +175,9 @@ function buildDashboardDetailLine(options = {}) {
     getAgentState = () => "",
     selectedModeIndex = 0,
     selectedProviderIndex = 0,
-    selectedResumeIndex = 0,
     selectedCronIndex = -1,
     cronTasks = [],
     providerOptions = [],
-    resumeOptions = [],
     dashHints = {},
     modeOptions = DEFAULT_MODE_OPTIONS,
   } = options;
@@ -210,18 +209,6 @@ function buildDashboardDetailLine(options = {}) {
     return { content, windowStart };
   }
 
-  if (dashboardView === "resume") {
-    const resumeParts = resumeOptions.map((opt, i) => {
-      if (i === selectedResumeIndex) {
-        return `{inverse}${opt.label}{/inverse}`;
-      }
-      return `{cyan-fg}${opt.label}{/cyan-fg}`;
-    });
-    content += `{gray-fg}Resume:{/gray-fg} ${resumeParts.join("  ")}`;
-    content += `  {gray-fg}│ ${dashHints.resume || ""}{/gray-fg}`;
-    return { content, windowStart };
-  }
-
   if (dashboardView === "cron") {
     const items = Array.isArray(cronTasks) ? cronTasks : [];
     const summary = items.length > 0
@@ -295,13 +282,11 @@ function computeDashboardContent(options = {}) {
     agentProvider = "codex-cli",
     selectedModeIndex = 0,
     selectedProviderIndex = 0,
-    selectedResumeIndex = 0,
     selectedCronIndex = -1,
     cronTasks = [],
     loopSummary = null,
     pendingReports = 0,
     providerOptions = [],
-    resumeOptions = [],
     dashHints = {},
     modeOptions = DEFAULT_MODE_OPTIONS,
   } = options;
@@ -357,11 +342,9 @@ function computeDashboardContent(options = {}) {
       getAgentState,
       selectedModeIndex,
       selectedProviderIndex,
-      selectedResumeIndex,
       selectedCronIndex,
       cronTasks,
       providerOptions,
-      resumeOptions,
       dashHints,
       modeOptions,
     });
@@ -383,11 +366,9 @@ function computeDashboardContent(options = {}) {
       getAgentState,
       selectedModeIndex,
       selectedProviderIndex,
-      selectedResumeIndex,
       selectedCronIndex,
       cronTasks,
       providerOptions,
-      resumeOptions,
       dashHints,
       modeOptions,
     });

package/src/app/chat/index.js

@@ -0,0 +1,6 @@
+async function runChat(projectRoot, options = {}) {
+  const { runChatInk } = require("../../ui/ink/ChatApp");
+  return runChatInk(projectRoot, options);
+}
+
+module.exports = { runChat };

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

@@ -1,6 +1,7 @@
-const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
+const { IPC_REQUEST_TYPES } = require("../../runtime/contracts/eventContract");
 const { decodeEscapedNewlines } = require("./text");
-const { shouldEchoCommandInChat } = require("./commands");
+const { describeCommandForChat, shouldEchoCommandInChat } = require("./commands");
+const { parseShellCommand, runShellCommand: defaultRunShellCommand } = require("./shellCommand");
 
 function createInputSubmitHandler(options = {}) {
   const {
@@ -19,11 +20,11 @@ function createInputSubmitHandler(options = {}) {
     enterAgentView = () => {},
     getAgentAdapter = () => null,
     activateAgent = async () => {},
-    getInjectSockPath = () => "",
-    existsSync = () => false,
     commitInputHistory = () => {},
     focusInput = () => {},
     renderScreen = () => {},  // Add renderScreen callback
+    runShellCommand = defaultRunShellCommand,
+    getShellCwd = () => process.cwd(),
   } = options;
 
   if (!state || typeof state !== "object") {
@@ -39,17 +40,9 @@ function createInputSubmitHandler(options = {}) {
   async function tryActivateTargetAgent(agentId) {
     const adapter = getAgentAdapter(agentId);
     const capabilities = adapter && adapter.capabilities ? adapter.capabilities : null;
-    const sockPath = getInjectSockPath(agentId);
-    const supportsSocket = Boolean(capabilities && capabilities.supportsSocketProtocol);
     const supportsActivate = Boolean(capabilities && capabilities.supportsActivate);
     const supportsInternalQueue = Boolean(capabilities && capabilities.supportsInternalQueueLoop);
 
-    if (existsSync(sockPath) && supportsSocket) {
-      clearTargetAgent();
-      enterAgentView(agentId);
-      return true;
-    }
-
     if (supportsActivate) {
       clearTargetAgent();
       try {
@@ -90,6 +83,37 @@ function createInputSubmitHandler(options = {}) {
 
     commitInputHistory(text);
 
+    const shellCommand = parseShellCommand(text);
+    if (shellCommand) {
+      logMessage("user", `{gray-fg}!{/gray-fg} ${escapeBlessed(shellCommand)}`);
+      queueStatusLine(`Running: ${escapeBlessed(shellCommand)}`);
+      renderScreen();
+      try {
+        const result = await runShellCommand(shellCommand, { cwd: getShellCwd() });
+        const stdout = String(result && result.stdout ? result.stdout : "").trimEnd();
+        const stderr = String(result && result.stderr ? result.stderr : "").trimEnd();
+        if (stdout) {
+          stdout.split(/\r?\n/).forEach((line) => logMessage("system", escapeBlessed(line)));
+        }
+        if (stderr) {
+          stderr.split(/\r?\n/).forEach((line) => logMessage(result && result.ok ? "system" : "error", escapeBlessed(line)));
+        }
+        if (!stdout && !stderr) {
+          logMessage("system", "{gray-fg}(no output){/gray-fg}");
+        }
+        if (result && result.ok) {
+          queueStatusLine(`Done: ${escapeBlessed(shellCommand)}`);
+        } else {
+          const suffix = result && result.signal ? ` signal ${result.signal}` : ` exit ${result && result.code != null ? result.code : 1}`;
+          logMessage("error", `{white-fg}✗{/white-fg} Command failed:${escapeBlessed(suffix)}`);
+        }
+      } catch (err) {
+        logMessage("error", `{white-fg}✗{/white-fg} Command error: ${escapeBlessed(err && err.message ? err.message : err)}`);
+      }
+      focusInput();
+      return;
+    }
+
     if (state.targetAgent) {
       const label = getAgentLabel(state.targetAgent);
       logMessage(
@@ -145,7 +169,8 @@ function createInputSubmitHandler(options = {}) {
 
     if (text.startsWith("/")) {
       if (shouldEchoCommandInChat(text)) {
-        logMessage("user", userEcho(text));
+        const commandSummary = describeCommandForChat(text);
+        logMessage("user", userEcho(commandSummary || text));
         renderScreen();  // Render slash command immediately
       }
       try {

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

@@ -2,7 +2,7 @@
 
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 function stripAnsi(text = "") {
   return String(text || "").replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "")