u-foo 1.7.4 → 1.8.0

package/src/chat/dashboardKeyController.js

@@ -18,12 +18,14 @@ function createDashboardKeyController(options = {}) {
     exitDashboardMode = () => {},
     setLaunchMode = () => {},
     setAgentProvider = () => {},
-    setAssistantEngine = () => {},
     setAutoResume = () => {},
     clampAgentWindow = () => {},
     clampAgentWindowWithSelection = () => {},
     requestProjectSwitch = () => {},
     requestCloseProject = () => {},
+    requestCron = () => {},
+    setGlobalScope = () => {},
+    getGlobalScope = () => "",
     renderDashboard = () => {},
     renderAgentDashboard = () => {},
     renderScreen = () => {},
@@ -232,10 +234,9 @@ function createDashboardKeyController(options = {}) {
     }
 
     if (key.name === "down") {
-      state.dashboardView = "assistant";
-      const list = Array.isArray(state.assistantOptions) ? state.assistantOptions : [];
-      const nextIndex = list.findIndex((opt) => opt.value === state.assistantEngine);
-      state.selectedAssistantIndex = nextIndex >= 0 ? nextIndex : 0;
+      state.dashboardView = "cron";
+      const cronTasks = Array.isArray(state.cronTasks) ? state.cronTasks : [];
+      state.selectedCronIndex = cronTasks.length > 0 ? 0 : -1;
       renderDashboardAndScreen();
       return true;
     }
@@ -261,34 +262,23 @@ function createDashboardKeyController(options = {}) {
     return true;
   }
 
-  function handleAssistantKey(key) {
-    const options = Array.isArray(state.assistantOptions) ? state.assistantOptions : [];
-    if (options.length === 0) {
-      if (key.name === "up") {
-        state.dashboardView = "provider";
-        renderDashboardAndScreen();
-        return true;
-      }
-      if (key.name === "escape" || key.name === "enter" || key.name === "return") {
-        exitDashboardMode(false);
-        return true;
-      }
-      return true;
-    }
+  function handleCronKey(key) {
+    const cronTasks = Array.isArray(state.cronTasks) ? state.cronTasks : [];
+    const maxIndex = cronTasks.length - 1;
 
     if (key.name === "left") {
-      state.selectedAssistantIndex = state.selectedAssistantIndex <= 0
-        ? options.length - 1
-        : state.selectedAssistantIndex - 1;
-      renderDashboardAndScreen();
+      if (maxIndex >= 0 && state.selectedCronIndex > 0) {
+        state.selectedCronIndex -= 1;
+        renderDashboardAndScreen();
+      }
       return true;
     }
 
     if (key.name === "right") {
-      state.selectedAssistantIndex = state.selectedAssistantIndex >= options.length - 1
-        ? 0
-        : state.selectedAssistantIndex + 1;
-      renderDashboardAndScreen();
+      if (maxIndex >= 0 && state.selectedCronIndex < maxIndex) {
+        state.selectedCronIndex += 1;
+        renderDashboardAndScreen();
+      }
       return true;
     }
 
@@ -298,35 +288,15 @@ function createDashboardKeyController(options = {}) {
       return true;
     }
 
-    if (key.name === "down") {
-      state.dashboardView = "cron";
-      renderDashboardAndScreen();
-      return true;
-    }
-
-    if (key.name === "enter" || key.name === "return") {
-      const selected = options[state.selectedAssistantIndex];
-      if (selected) setAssistantEngine(selected.value);
-      exitDashboardMode(false);
-      return true;
-    }
-
-    if (key.name === "escape") {
-      exitDashboardMode(false);
-      return true;
-    }
-
-    return true;
-  }
-
-  function handleCronKey(key) {
-    if (key.name === "up") {
-      state.dashboardView = "assistant";
-      renderDashboardAndScreen();
-      return true;
-    }
-
     if (key.name === "x" && key.ctrl) {
+      if (maxIndex >= 0 && state.selectedCronIndex >= 0 && state.selectedCronIndex <= maxIndex) {
+        const task = cronTasks[state.selectedCronIndex];
+        const id = task && task.id ? String(task.id).trim() : "";
+        if (id) {
+          requestCron({ operation: "stop", id });
+          return true;
+        }
+      }
       exitDashboardMode(false);
       return true;
     }
@@ -415,7 +385,9 @@ function createDashboardKeyController(options = {}) {
         const next = current - 1;
         state.selectedProjectIndex = next;
         renderDashboardAndScreen();
-        requestProjectSwitch(next);
+        if (getGlobalScope() === "project") {
+          requestProjectSwitch(next);
+        }
       }
       return true;
     }
@@ -426,17 +398,35 @@ function createDashboardKeyController(options = {}) {
         const next = current + 1;
         state.selectedProjectIndex = next;
         renderDashboardAndScreen();
-        requestProjectSwitch(next);
+        if (getGlobalScope() === "project") {
+          requestProjectSwitch(next);
+        }
       }
       return true;
     }
 
-    if (key.name === "up" || key.name === "escape") {
+    if (key.name === "up") {
+      exitDashboardMode(false);
+      return true;
+    }
+
+    if (key.name === "escape") {
+      if (getGlobalScope() === "project") {
+        setGlobalScope("controller");
+      }
       exitDashboardMode(false);
       return true;
     }
 
     if (key.name === "enter" || key.name === "return") {
+      const current = Number.isFinite(state.selectedProjectIndex) ? state.selectedProjectIndex : 0;
+      if (current >= 0 && current < projects.length) {
+        const selectedRow = projects[current];
+        const selectedProjectRoot = String((selectedRow && selectedRow.project_root) || "");
+        if (selectedProjectRoot) {
+          setGlobalScope("project", selectedProjectRoot);
+        }
+      }
       exitDashboardMode(false);
       return true;
     }
@@ -552,7 +542,6 @@ function createDashboardKeyController(options = {}) {
 
     if (state.dashboardView === "mode") return handleModeKey(key);
     if (state.dashboardView === "provider") return handleProviderKey(key);
-    if (state.dashboardView === "assistant") return handleAssistantKey(key);
     if (state.dashboardView === "resume") return handleResumeKey(key);
     if (state.dashboardView === "cron") return handleCronKey(key);
 

package/src/chat/dashboardView.js

@@ -8,14 +8,6 @@ function providerLabel(value) {
   return "codex";
 }
 
-function assistantLabel(value) {
-  if (value === "codex") return "codex";
-  if (value === "claude") return "claude";
-  if (value === "ufoo") return "ucode";
-  if (value === "ucode") return "ucode";
-  return "auto";
-}
-
 function ensureAtPrefix(value) {
   const text = String(value || "").trim();
   if (!text) return text;
@@ -43,8 +35,8 @@ function buildSummaryLine(options = {}) {
     getAgentState = () => "",
     launchMode = "terminal",
     agentProvider = "codex-cli",
-    assistantEngine = "auto",
     cronTasks = [],
+    pendingReports = 0,
   } = options;
   const agents = activeAgents.length > 0
     ? activeAgents.slice(0, 3)
@@ -55,7 +47,7 @@ function buildSummaryLine(options = {}) {
   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}Reports:{/gray-fg} {cyan-fg}${Number.isFinite(pendingReports) ? pendingReports : 0}{/cyan-fg}`
     + `  {gray-fg}Cron:{/gray-fg} {cyan-fg}${Array.isArray(cronTasks) ? cronTasks.length : 0}{/cyan-fg}`;
 }
 
@@ -67,6 +59,8 @@ function buildProjectRailLine(options = {}) {
     maxProjectWindow = 5,
     activeProjectRoot = "",
     projectsFocused = false,
+    globalScope = "",
+    dashboardHint = "",
   } = options;
   const rows = Array.isArray(projects) ? projects : [];
   let windowStart = projectListWindowStart;
@@ -102,7 +96,7 @@ function buildProjectRailLine(options = {}) {
     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 isActiveProject = globalScope !== "controller" && Boolean(activeRoot && rowRoot === activeRoot);
     const isSelected = absoluteIndex === safeSelectedIndex;
     if (projectsFocused && isSelected) {
       return `{inverse}${name}{/inverse}`;
@@ -115,9 +109,10 @@ function buildProjectRailLine(options = {}) {
 
   const leftMore = start > 0 ? "{gray-fg}<{/gray-fg} " : "";
   const rightMore = end < rows.length ? " {gray-fg}>{/gray-fg}" : "";
+  const hintPart = dashboardHint ? `{|}{gray-fg}${dashboardHint}{/gray-fg}` : "";
   return {
     hasProjects: true,
-    line: ` {gray-fg}Projects:{/gray-fg} ${leftMore}${projectParts.join("  ")}${rightMore}`,
+    line: ` {gray-fg}Projects:{/gray-fg} ${leftMore}${projectParts.join("  ")}${rightMore}${hintPart}`,
     windowStart,
   };
 }
@@ -134,11 +129,11 @@ function buildDashboardDetailLine(options = {}) {
     getAgentState = () => "",
     selectedModeIndex = 0,
     selectedProviderIndex = 0,
-    selectedAssistantIndex = 0,
     selectedResumeIndex = 0,
+    selectedCronIndex = -1,
     cronTasks = [],
+    pendingReports = 0,
     providerOptions = [],
-    assistantOptions = [],
     resumeOptions = [],
     dashHints = {},
     modeOptions = DEFAULT_MODE_OPTIONS,
@@ -171,18 +166,6 @@ function buildDashboardDetailLine(options = {}) {
     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) {
@@ -198,9 +181,15 @@ function buildDashboardDetailLine(options = {}) {
   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}`;
+      ? items.map((item, index) => {
+        const label = item.label || item.summary || item.id || "";
+        if (!label) return "";
+        return index === selectedCronIndex
+          ? `{inverse}${label}{/inverse}`
+          : `{cyan-fg}${label}{/cyan-fg}`;
+      }).filter(Boolean).join(", ")
+      : "{cyan-fg}none{/cyan-fg}";
+    content += `{gray-fg}Cron:{/gray-fg} ${summary}`;
     content += `  {gray-fg}│ ${dashHints.cron || ""}{/gray-fg}`;
     return { content, windowStart };
   }
@@ -244,6 +233,7 @@ function buildDashboardDetailLine(options = {}) {
 function computeDashboardContent(options = {}) {
   const {
     globalMode = false,
+    globalScope = "controller",
     focusMode = "input",
     dashboardView = "agents",
     activeAgents = [],
@@ -259,14 +249,13 @@ function computeDashboardContent(options = {}) {
     getAgentState = () => "",
     launchMode = "terminal",
     agentProvider = "codex-cli",
-    assistantEngine = "auto",
     selectedModeIndex = 0,
     selectedProviderIndex = 0,
-    selectedAssistantIndex = 0,
     selectedResumeIndex = 0,
+    selectedCronIndex = -1,
     cronTasks = [],
+    pendingReports = 0,
     providerOptions = [],
-    assistantOptions = [],
     resumeOptions = [],
     dashHints = {},
     modeOptions = DEFAULT_MODE_OPTIONS,
@@ -274,6 +263,10 @@ function computeDashboardContent(options = {}) {
 
   if (globalMode) {
     const projectsFocused = focusMode === "dashboard" && dashboardView === "projects";
+    let dashboardHint = "";
+    if (projectsFocused) {
+      dashboardHint = globalScope === "controller" ? "Enter\u2192project" : "Esc\u2192global";
+    }
     const rail = buildProjectRailLine({
       projects,
       selectedProjectIndex,
@@ -281,6 +274,8 @@ function computeDashboardContent(options = {}) {
       maxProjectWindow,
       activeProjectRoot,
       projectsFocused,
+      globalScope,
+      dashboardHint,
     });
     if (!rail.hasProjects) {
       const line2 = ` {gray-fg}${dashHints.projectsEmpty || "Run ufoo chat/daemon in projects to populate registry"}{/gray-fg}`;
@@ -297,8 +292,8 @@ function computeDashboardContent(options = {}) {
         getAgentState,
         launchMode,
         agentProvider,
-        assistantEngine,
         cronTasks,
+        pendingReports,
       });
       return {
         content: `${rail.line}\n ${line2}`,
@@ -317,11 +312,10 @@ function computeDashboardContent(options = {}) {
       getAgentState,
       selectedModeIndex,
       selectedProviderIndex,
-      selectedAssistantIndex,
       selectedResumeIndex,
+      selectedCronIndex,
       cronTasks,
       providerOptions,
-      assistantOptions,
       resumeOptions,
       dashHints,
       modeOptions,
@@ -344,11 +338,10 @@ function computeDashboardContent(options = {}) {
       getAgentState,
       selectedModeIndex,
       selectedProviderIndex,
-      selectedAssistantIndex,
       selectedResumeIndex,
+      selectedCronIndex,
       cronTasks,
       providerOptions,
-      assistantOptions,
       resumeOptions,
       dashHints,
       modeOptions,
@@ -362,8 +355,8 @@ function computeDashboardContent(options = {}) {
     getAgentState,
     launchMode,
     agentProvider,
-    assistantEngine,
     cronTasks,
+    pendingReports,
   });
 
   return { content, windowStart: agentListWindowStart };
@@ -372,5 +365,4 @@ function computeDashboardContent(options = {}) {
 module.exports = {
   computeDashboardContent,
   providerLabel,
-  assistantLabel,
 };