u-foo 1.4.1 → 1.6.0

package/src/chat/dashboardKeyController.js

@@ -3,6 +3,7 @@ const DEFAULT_MODE_OPTIONS = ["terminal", "tmux", "internal"];
 function createDashboardKeyController(options = {}) {
   const {
     state,
+    globalMode = false,
     existsSync = () => false,
     getInjectSockPath = () => "",
     getAgentAdapter = () => null,
@@ -21,6 +22,8 @@ function createDashboardKeyController(options = {}) {
     setAutoResume = () => {},
     clampAgentWindow = () => {},
     clampAgentWindowWithSelection = () => {},
+    requestProjectSwitch = () => {},
+    requestCloseProject = () => {},
     renderDashboard = () => {},
     renderAgentDashboard = () => {},
     renderScreen = () => {},
@@ -374,6 +377,73 @@ function createDashboardKeyController(options = {}) {
     return true;
   }
 
+  function handleProjectsKey(key) {
+    const projects = Array.isArray(state.projects) ? state.projects : [];
+    if (projects.length === 0) {
+      if (key.name === "up" || key.name === "enter" || key.name === "return" || key.name === "escape") {
+        exitDashboardMode(false);
+      }
+      return true;
+    }
+
+    if (key.name === "x" && key.ctrl) {
+      const current = Number.isFinite(state.selectedProjectIndex) ? state.selectedProjectIndex : 0;
+      if (current >= 0 && current < projects.length) {
+        requestCloseProject(current);
+      }
+      return true;
+    }
+
+    if (key.name === "down") {
+      state.dashboardView = "agents";
+      if (!Array.isArray(state.activeAgents) || state.activeAgents.length === 0) {
+        state.selectedAgentIndex = -1;
+      } else if (!Number.isFinite(state.selectedAgentIndex) || state.selectedAgentIndex < 0) {
+        state.selectedAgentIndex = 0;
+      } else if (state.selectedAgentIndex >= state.activeAgents.length) {
+        state.selectedAgentIndex = state.activeAgents.length - 1;
+      }
+      clampAgentWindow();
+      syncTargetFromSelection();
+      renderDashboardAndScreen();
+      return true;
+    }
+
+    if (key.name === "left") {
+      const current = Number.isFinite(state.selectedProjectIndex) ? state.selectedProjectIndex : 0;
+      if (current > 0) {
+        const next = current - 1;
+        state.selectedProjectIndex = next;
+        renderDashboardAndScreen();
+        requestProjectSwitch(next);
+      }
+      return true;
+    }
+
+    if (key.name === "right") {
+      const current = Number.isFinite(state.selectedProjectIndex) ? state.selectedProjectIndex : 0;
+      if (current < projects.length - 1) {
+        const next = current + 1;
+        state.selectedProjectIndex = next;
+        renderDashboardAndScreen();
+        requestProjectSwitch(next);
+      }
+      return true;
+    }
+
+    if (key.name === "up" || key.name === "escape") {
+      exitDashboardMode(false);
+      return true;
+    }
+
+    if (key.name === "enter" || key.name === "return") {
+      exitDashboardMode(false);
+      return true;
+    }
+
+    return true;
+  }
+
   function handleAgentsKey(key) {
     if (key.name === "left") {
       if (state.activeAgents.length > 0 && state.selectedAgentIndex > 0) {
@@ -403,7 +473,18 @@ function createDashboardKeyController(options = {}) {
       return true;
     }
 
-    if (key.name === "up" || key.name === "escape") {
+    if (key.name === "up") {
+      clearTargetAgent();
+      if (globalMode) {
+        state.dashboardView = "projects";
+        renderDashboardAndScreen();
+        return true;
+      }
+      exitDashboardMode(false);
+      return true;
+    }
+
+    if (key.name === "escape") {
       clearTargetAgent();
       exitDashboardMode(false);
       return true;
@@ -461,6 +542,13 @@ function createDashboardKeyController(options = {}) {
       return handleAgentDashboardKey(key);
     }
 
+    if (globalMode && state.dashboardView === "projects") {
+      return handleProjectsKey(key);
+    }
+    if (!globalMode && state.dashboardView === "projects") {
+      return true;
+    }
+
     if (state.dashboardView === "mode") return handleModeKey(key);
     if (state.dashboardView === "provider") return handleProviderKey(key);
     if (state.dashboardView === "assistant") return handleAssistantKey(key);

package/src/chat/dashboardView.js

@@ -22,18 +22,116 @@ function ensureAtPrefix(value) {
   return text.startsWith("@") ? text : `@${text}`;
 }
 
-function computeDashboardContent(options = {}) {
+function activityMarker(state = "") {
+  const normalized = String(state || "").trim().toLowerCase();
+  if (normalized === "working") return "*";
+  if (normalized === "waiting_input") return "?";
+  if (normalized === "blocked") return "!";
+  return "";
+}
+
+function withActivityMarker(label = "", state = "") {
+  const marker = activityMarker(state);
+  if (!marker) return label;
+  return `${marker}${label}`;
+}
+
+function buildSummaryLine(options = {}) {
   const {
-    focusMode = "input",
+    activeAgents = [],
+    getAgentLabel = (id) => id,
+    getAgentState = () => "",
+    launchMode = "terminal",
+    agentProvider = "codex-cli",
+    assistantEngine = "auto",
+    cronTasks = [],
+  } = options;
+  const agents = activeAgents.length > 0
+    ? activeAgents.slice(0, 3)
+      .map((id) => withActivityMarker(ensureAtPrefix(getAgentLabel(id)), getAgentState(id)))
+      .join(", ")
+      + (activeAgents.length > 3 ? ` +${activeAgents.length - 3}` : "")
+    : "none";
+  return `{gray-fg}Agents:{/gray-fg} {cyan-fg}${agents}{/cyan-fg}`
+    + `  {gray-fg}Mode:{/gray-fg} {cyan-fg}${launchMode}{/cyan-fg}`
+    + `  {gray-fg}Agent:{/gray-fg} {cyan-fg}${providerLabel(agentProvider)}{/cyan-fg}`
+    + `  {gray-fg}Assistant:{/gray-fg} {cyan-fg}${assistantLabel(assistantEngine)}{/cyan-fg}`
+    + `  {gray-fg}Cron:{/gray-fg} {cyan-fg}${Array.isArray(cronTasks) ? cronTasks.length : 0}{/cyan-fg}`;
+}
+
+function buildProjectRailLine(options = {}) {
+  const {
+    projects = [],
+    selectedProjectIndex = -1,
+    projectListWindowStart = 0,
+    maxProjectWindow = 5,
+    activeProjectRoot = "",
+    projectsFocused = false,
+  } = options;
+  const rows = Array.isArray(projects) ? projects : [];
+  let windowStart = projectListWindowStart;
+  if (rows.length === 0) {
+    return {
+      hasProjects: false,
+      line: " {gray-fg}Projects:{/gray-fg} {cyan-fg}none{/cyan-fg}",
+      windowStart,
+    };
+  }
+
+  const activeRoot = String(activeProjectRoot || "");
+  const fallbackIndex = rows.findIndex((row) => String((row || {}).project_root || "") === activeRoot);
+  const normalizedSelectedIndex = Number.isFinite(selectedProjectIndex)
+    ? Math.trunc(selectedProjectIndex)
+    : -1;
+  const safeSelectedIndex = normalizedSelectedIndex >= 0 && normalizedSelectedIndex < rows.length
+    ? normalizedSelectedIndex
+    : (fallbackIndex >= 0 ? fallbackIndex : 0);
+
+  windowStart = clampAgentWindowWithSelection({
+    activeCount: rows.length,
+    maxWindow: Math.max(1, maxProjectWindow),
+    windowStart,
+    selectionIndex: safeSelectedIndex,
+  });
+
+  const maxItems = Math.max(1, Math.min(Math.max(1, maxProjectWindow), rows.length));
+  const start = windowStart;
+  const end = start + maxItems;
+  const visibleRows = rows.slice(start, end);
+  const projectParts = visibleRows.map((row, i) => {
+    const absoluteIndex = start + i;
+    const name = String((row && row.project_name) || (row && row.project_root) || "-");
+    const rowRoot = String((row && row.project_root) || "");
+    const isActiveProject = Boolean(activeRoot && rowRoot === activeRoot);
+    const isSelected = absoluteIndex === safeSelectedIndex;
+    if (projectsFocused && isSelected) {
+      return `{inverse}${name}{/inverse}`;
+    }
+    if (isActiveProject) {
+      return `{bold}{cyan-fg}${name}{/cyan-fg}{/bold}`;
+    }
+    return `{cyan-fg}${name}{/cyan-fg}`;
+  });
+
+  const leftMore = start > 0 ? "{gray-fg}<{/gray-fg} " : "";
+  const rightMore = end < rows.length ? " {gray-fg}>{/gray-fg}" : "";
+  return {
+    hasProjects: true,
+    line: ` {gray-fg}Projects:{/gray-fg} ${leftMore}${projectParts.join("  ")}${rightMore}`,
+    windowStart,
+  };
+}
+
+function buildDashboardDetailLine(options = {}) {
+  const {
+    globalMode = false,
     dashboardView = "agents",
     activeAgents = [],
     selectedAgentIndex = -1,
     agentListWindowStart = 0,
     maxAgentWindow = 4,
     getAgentLabel = (id) => id,
-    launchMode = "terminal",
-    agentProvider = "codex-cli",
-    assistantEngine = "auto",
+    getAgentState = () => "",
     selectedModeIndex = 0,
     selectedProviderIndex = 0,
     selectedAssistantIndex = 0,
@@ -49,105 +147,226 @@ function computeDashboardContent(options = {}) {
   let content = " ";
   let windowStart = agentListWindowStart;
 
-  if (focusMode === "dashboard") {
-    if (dashboardView === "mode") {
-      const modeParts = modeOptions.map((mode, i) => {
-        if (i === selectedModeIndex) {
-          return `{inverse}${mode}{/inverse}`;
-        }
-        return `{cyan-fg}${mode}{/cyan-fg}`;
-      });
-      content += `{gray-fg}Mode:{/gray-fg} ${modeParts.join("  ")}`;
-      content += `  {gray-fg}│ ${dashHints.mode || ""}{/gray-fg}`;
-      return { content, windowStart };
-    }
+  if (dashboardView === "mode") {
+    const modeParts = modeOptions.map((mode, i) => {
+      if (i === selectedModeIndex) {
+        return `{inverse}${mode}{/inverse}`;
+      }
+      return `{cyan-fg}${mode}{/cyan-fg}`;
+    });
+    content += `{gray-fg}Mode:{/gray-fg} ${modeParts.join("  ")}`;
+    content += `  {gray-fg}│ ${dashHints.mode || ""}{/gray-fg}`;
+    return { content, windowStart };
+  }
 
-    if (dashboardView === "provider") {
-      const providerParts = providerOptions.map((opt, i) => {
-        if (i === selectedProviderIndex) {
-          return `{inverse}${opt.label}{/inverse}`;
-        }
-        return `{cyan-fg}${opt.label}{/cyan-fg}`;
-      });
-      content += `{gray-fg}Agent:{/gray-fg} ${providerParts.join("  ")}`;
-      content += `  {gray-fg}│ ${dashHints.provider || ""}{/gray-fg}`;
-      return { content, windowStart };
-    }
+  if (dashboardView === "provider") {
+    const providerParts = providerOptions.map((opt, i) => {
+      if (i === selectedProviderIndex) {
+        return `{inverse}${opt.label}{/inverse}`;
+      }
+      return `{cyan-fg}${opt.label}{/cyan-fg}`;
+    });
+    content += `{gray-fg}Agent:{/gray-fg} ${providerParts.join("  ")}`;
+    content += `  {gray-fg}│ ${dashHints.provider || ""}{/gray-fg}`;
+    return { content, windowStart };
+  }
 
-    if (dashboardView === "assistant") {
-      const assistantParts = assistantOptions.map((opt, i) => {
-        if (i === selectedAssistantIndex) {
-          return `{inverse}${opt.label}{/inverse}`;
-        }
-        return `{cyan-fg}${opt.label}{/cyan-fg}`;
-      });
-      content += `{gray-fg}Assistant:{/gray-fg} ${assistantParts.join("  ")}`;
-      content += `  {gray-fg}│ ${dashHints.assistant || ""}{/gray-fg}`;
-      return { content, windowStart };
-    }
+  if (dashboardView === "assistant") {
+    const assistantParts = assistantOptions.map((opt, i) => {
+      if (i === selectedAssistantIndex) {
+        return `{inverse}${opt.label}{/inverse}`;
+      }
+      return `{cyan-fg}${opt.label}{/cyan-fg}`;
+    });
+    content += `{gray-fg}Assistant:{/gray-fg} ${assistantParts.join("  ")}`;
+    content += `  {gray-fg}│ ${dashHints.assistant || ""}{/gray-fg}`;
+    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 === "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
+      ? items.map((item) => item.summary || item.id || "").filter(Boolean).join(", ")
+      : "none";
+    content += `{gray-fg}Cron:{/gray-fg} {cyan-fg}${summary}{/cyan-fg}`;
+    content += `  {gray-fg}│ ${dashHints.cron || ""}{/gray-fg}`;
+    return { content, windowStart };
+  }
+
+  if (activeAgents.length > 0) {
+    windowStart = clampAgentWindowWithSelection({
+      activeCount: activeAgents.length,
+      maxWindow: maxAgentWindow,
+      windowStart,
+      selectionIndex: selectedAgentIndex,
+    });
+    const maxItems = Math.max(1, Math.min(maxAgentWindow, activeAgents.length));
+    const start = windowStart;
+    const end = start + maxItems;
+    const visibleAgents = activeAgents.slice(start, end);
+    const agentParts = visibleAgents.map((agent, i) => {
+      const absoluteIndex = start + i;
+      const label = withActivityMarker(
+        ensureAtPrefix(getAgentLabel(agent)),
+        getAgentState(agent)
+      );
+      if (absoluteIndex === selectedAgentIndex) {
+        return `{inverse}${label}{/inverse}`;
+      }
+      return `{cyan-fg}${label}{/cyan-fg}`;
+    });
+    const leftMore = start > 0 ? "{gray-fg}<{/gray-fg} " : "";
+    const rightMore = end < activeAgents.length ? " {gray-fg}>{/gray-fg}" : "";
+    content += `{gray-fg}Agents:{/gray-fg} ${leftMore}${agentParts.join("  ")}${rightMore}`;
+    const agentsHint = globalMode
+      ? (dashHints.agentsGlobal || dashHints.agents || "")
+      : (dashHints.agents || "");
+    content += `  {gray-fg}│ ${agentsHint}{/gray-fg}`;
+  } else {
+    content += "{gray-fg}Agents:{/gray-fg} {cyan-fg}none{/cyan-fg}";
+    content += `  {gray-fg}│ ${dashHints.agentsEmpty || ""}{/gray-fg}`;
+  }
+  return { content, windowStart };
+}
 
-    if (dashboardView === "cron") {
-      const items = Array.isArray(cronTasks) ? cronTasks : [];
-      const summary = items.length > 0
-        ? items.map((item) => item.summary || item.id || "").filter(Boolean).join(", ")
-        : "none";
-      content += `{gray-fg}Cron:{/gray-fg} {cyan-fg}${summary}{/cyan-fg}`;
-      content += `  {gray-fg}│ ${dashHints.cron || ""}{/gray-fg}`;
-      return { content, windowStart };
+function computeDashboardContent(options = {}) {
+  const {
+    globalMode = false,
+    focusMode = "input",
+    dashboardView = "agents",
+    activeAgents = [],
+    projects = [],
+    selectedProjectIndex = -1,
+    projectListWindowStart = 0,
+    maxProjectWindow = 5,
+    activeProjectRoot = "",
+    selectedAgentIndex = -1,
+    agentListWindowStart = 0,
+    maxAgentWindow = 4,
+    getAgentLabel = (id) => id,
+    getAgentState = () => "",
+    launchMode = "terminal",
+    agentProvider = "codex-cli",
+    assistantEngine = "auto",
+    selectedModeIndex = 0,
+    selectedProviderIndex = 0,
+    selectedAssistantIndex = 0,
+    selectedResumeIndex = 0,
+    cronTasks = [],
+    providerOptions = [],
+    assistantOptions = [],
+    resumeOptions = [],
+    dashHints = {},
+    modeOptions = DEFAULT_MODE_OPTIONS,
+  } = options;
+
+  if (globalMode) {
+    const projectsFocused = focusMode === "dashboard" && dashboardView === "projects";
+    const rail = buildProjectRailLine({
+      projects,
+      selectedProjectIndex,
+      projectListWindowStart,
+      maxProjectWindow,
+      activeProjectRoot,
+      projectsFocused,
+    });
+    if (!rail.hasProjects) {
+      const line2 = ` {gray-fg}${dashHints.projectsEmpty || "Run ufoo chat/daemon in projects to populate registry"}{/gray-fg}`;
+      return {
+        content: `${rail.line}\n${line2}`,
+        windowStart: rail.windowStart,
+      };
     }
 
-    if (activeAgents.length > 0) {
-      windowStart = clampAgentWindowWithSelection({
-        activeCount: activeAgents.length,
-        maxWindow: maxAgentWindow,
-        windowStart,
-        selectionIndex: selectedAgentIndex,
-      });
-      const maxItems = Math.max(1, Math.min(maxAgentWindow, activeAgents.length));
-      const start = windowStart;
-      const end = start + maxItems;
-      const visibleAgents = activeAgents.slice(start, end);
-      const agentParts = visibleAgents.map((agent, i) => {
-        const absoluteIndex = start + i;
-        const label = ensureAtPrefix(getAgentLabel(agent));
-        if (absoluteIndex === selectedAgentIndex) {
-          return `{inverse}${label}{/inverse}`;
-        }
-        return `{cyan-fg}${label}{/cyan-fg}`;
+    if (focusMode !== "dashboard" || projectsFocused) {
+      const line2 = buildSummaryLine({
+        activeAgents,
+        getAgentLabel,
+        getAgentState,
+        launchMode,
+        agentProvider,
+        assistantEngine,
+        cronTasks,
       });
-      const leftMore = start > 0 ? "{gray-fg}<{/gray-fg} " : "";
-      const rightMore = end < activeAgents.length ? " {gray-fg}>{/gray-fg}" : "";
-      content += `{gray-fg}Agents:{/gray-fg} ${leftMore}${agentParts.join("  ")}${rightMore}`;
-      content += `  {gray-fg}│ ${dashHints.agents || ""}{/gray-fg}`;
-    } else {
-      content += "{gray-fg}Agents:{/gray-fg} {cyan-fg}none{/cyan-fg}";
-      content += `  {gray-fg}│ ${dashHints.agentsEmpty || ""}{/gray-fg}`;
+      return {
+        content: `${rail.line}\n ${line2}`,
+        windowStart: rail.windowStart,
+      };
     }
-    return { content, windowStart };
+
+    const detail = buildDashboardDetailLine({
+      globalMode,
+      dashboardView,
+      activeAgents,
+      selectedAgentIndex,
+      agentListWindowStart,
+      maxAgentWindow,
+      getAgentLabel,
+      getAgentState,
+      selectedModeIndex,
+      selectedProviderIndex,
+      selectedAssistantIndex,
+      selectedResumeIndex,
+      cronTasks,
+      providerOptions,
+      assistantOptions,
+      resumeOptions,
+      dashHints,
+      modeOptions,
+    });
+    return {
+      content: `${rail.line}\n${detail.content}`,
+      windowStart: detail.windowStart,
+    };
   }
 
-  const agents = activeAgents.length > 0
-    ? activeAgents.slice(0, 3).map((id) => ensureAtPrefix(getAgentLabel(id))).join(", ") + (activeAgents.length > 3 ? ` +${activeAgents.length - 3}` : "")
-    : "none";
-  content += `{gray-fg}Agents:{/gray-fg} {cyan-fg}${agents}{/cyan-fg}`;
-  content += `  {gray-fg}Mode:{/gray-fg} {cyan-fg}${launchMode}{/cyan-fg}`;
-  content += `  {gray-fg}Agent:{/gray-fg} {cyan-fg}${providerLabel(agentProvider)}{/cyan-fg}`;
-  content += `  {gray-fg}Assistant:{/gray-fg} {cyan-fg}${assistantLabel(assistantEngine)}{/cyan-fg}`;
-  content += `  {gray-fg}Cron:{/gray-fg} {cyan-fg}${Array.isArray(cronTasks) ? cronTasks.length : 0}{/cyan-fg}`;
+  if (focusMode === "dashboard") {
+    return buildDashboardDetailLine({
+      globalMode,
+      dashboardView,
+      activeAgents,
+      selectedAgentIndex,
+      agentListWindowStart,
+      maxAgentWindow,
+      getAgentLabel,
+      getAgentState,
+      selectedModeIndex,
+      selectedProviderIndex,
+      selectedAssistantIndex,
+      selectedResumeIndex,
+      cronTasks,
+      providerOptions,
+      assistantOptions,
+      resumeOptions,
+      dashHints,
+      modeOptions,
+    });
+  }
 
-  return { content, windowStart };
+  let content = " ";
+  content += buildSummaryLine({
+    activeAgents,
+    getAgentLabel,
+    getAgentState,
+    launchMode,
+    agentProvider,
+    assistantEngine,
+    cronTasks,
+  });
+
+  return { content, windowStart: agentListWindowStart };
 }
 
 module.exports = {