apteva 0.4.20 → 0.4.29

package/src/web/components/dashboard/Dashboard.tsx

@@ -59,7 +59,7 @@ export function Dashboard({
 
       if (tasksRes.ok) {
         const data = await tasksRes.json();
-        setRecentTasks((data.tasks || []).slice(0, 5));
+        setRecentTasks(data.tasks || []);
       }
 
       if (activityRes.ok) {
@@ -75,10 +75,12 @@ export function Dashboard({
     fetchDashboardData();
   }, [fetchDashboardData, statusChangeCounter]);
 
-  // Filter tasks by project agents
+  // Filter tasks by project agents and sort by next execution (soonest first)
   const filteredTasks = useMemo(() => {
-    if (!currentProjectId) return recentTasks;
-    return recentTasks.filter(t => projectAgentIds.has(t.agentId));
+    let list = currentProjectId
+      ? recentTasks.filter(t => projectAgentIds.has(t.agentId))
+      : recentTasks;
+    return sortTasksByNextExecution(list);
   }, [recentTasks, currentProjectId, projectAgentIds]);
 
   // Calculate task stats from filtered tasks
@@ -179,9 +181,9 @@ export function Dashboard({
           )}
         </DashboardCard>
 
-        {/* Recent Tasks */}
+        {/* Tasks */}
         <DashboardCard
-          title="Recent Tasks"
+          title="Tasks"
           actionLabel="View All"
           onAction={() => onNavigate("tasks")}
         >
@@ -192,7 +194,7 @@ export function Dashboard({
             </div>
           ) : (
             <div className="divide-y divide-[#1a1a1a]">
-              {filteredTasks.map((task) => (
+              {filteredTasks.slice(0, 5).map((task) => (
                 <div
                   key={`${task.agentId}-${task.id}`}
                   className="px-4 py-3 flex items-center justify-between"
@@ -343,6 +345,36 @@ function TaskStatusBadge({ status }: { status: Task["status"] }) {
   );
 }
 
+// --- Task sorting helper ---
+
+function statusPriority(task: Task): number {
+  if (task.status === "running") return 0;
+  if (task.status === "pending") return 1;
+  if (task.status === "completed") return 2;
+  if (task.status === "failed") return 3;
+  return 4; // cancelled etc
+}
+
+function sortTasksByNextExecution(tasks: Task[]): Task[] {
+  return [...tasks].sort((a, b) => {
+    const aPri = statusPriority(a);
+    const bPri = statusPriority(b);
+    if (aPri !== bPri) return aPri - bPri;
+    // Within running/pending: soonest next execution first
+    if (aPri <= 1) {
+      const aTime = a.next_run || a.execute_at || null;
+      const bTime = b.next_run || b.execute_at || null;
+      const aTs = aTime ? new Date(aTime).getTime() : Infinity;
+      const bTs = bTime ? new Date(bTime).getTime() : Infinity;
+      return aTs - bTs;
+    }
+    // Within completed/failed: most recent first
+    const aDate = a.completed_at || a.executed_at || a.created_at;
+    const bDate = b.completed_at || b.executed_at || b.created_at;
+    return new Date(bDate).getTime() - new Date(aDate).getTime();
+  });
+}
+
 // --- Schedule formatting helpers (compact versions for dashboard) ---
 
 const DASH_DAY_NAMES = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];

package/src/web/components/layout/Header.tsx

@@ -22,10 +22,8 @@ interface HeaderProps {
 
 export function Header({ onMenuClick, agents = [] }: HeaderProps) {
   const { connected } = useTelemetryContext();
-  const { user, logout } = useAuth();
   const authHeaders = useAuthHeaders();
   const { projects, currentProjectId, currentProject, setCurrentProjectId, unassignedCount, projectsEnabled } = useProjects();
-  const [showUserMenu, setShowUserMenu] = useState(false);
   const [showProjectMenu, setShowProjectMenu] = useState(false);
   const [showNotifications, setShowNotifications] = useState(false);
   const [unseenCount, setUnseenCount] = useState(0);
@@ -124,11 +122,6 @@ export function Header({ onMenuClick, agents = [] }: HeaderProps) {
     }
   }, [showNotifications, unseenCount, accessToken, projectAgentIds]);
 
-  const handleLogout = async () => {
-    await logout();
-    setShowUserMenu(false);
-  };
-
   const handleProjectSelect = (projectId: string | null) => {
     setCurrentProjectId(projectId);
     setShowProjectMenu(false);
@@ -305,33 +298,6 @@ export function Header({ onMenuClick, agents = [] }: HeaderProps) {
             )}
           </div>
           <MetaAgentButton />
-          {user && (
-            <div className="relative">
-              <button
-                onClick={() => setShowUserMenu(!showUserMenu)}
-                className="flex items-center gap-2 px-2 md:px-3 py-2 rounded hover:bg-[#1a1a1a] transition"
-              >
-                <div className="w-8 h-8 rounded-full bg-[#f97316] flex items-center justify-center text-black font-medium text-sm">
-                  {user.username.charAt(0).toUpperCase()}
-                </div>
-                <span className="text-sm text-[#888] hidden sm:block">{user.username}</span>
-              </button>
-              {showUserMenu && (
-                <div className="absolute right-0 top-full mt-1 w-48 bg-[#111] border border-[#222] rounded-lg shadow-xl z-50">
-                  <div className="px-4 py-3 border-b border-[#222]">
-                    <p className="text-sm font-medium">{user.username}</p>
-                    <p className="text-xs text-[#f97316] mt-1">{user.role}</p>
-                  </div>
-                  <button
-                    onClick={handleLogout}
-                    className="w-full px-4 py-2 text-left text-sm text-red-400 hover:bg-[#1a1a1a] transition"
-                  >
-                    Sign out
-                  </button>
-                </div>
-              )}
-            </div>
-          )}
         </div>
       </div>
     </header>

package/src/web/components/layout/Sidebar.tsx

@@ -1,5 +1,6 @@
-import React from "react";
+import React, { useState } from "react";
 import { DashboardIcon, ActivityIcon, AgentsIcon, TasksIcon, ConnectionsIcon, McpIcon, SkillsIcon, TestsIcon, TelemetryIcon, ApiIcon, SettingsIcon, CloseIcon } from "../common/Icons";
+import { useAuth } from "../../context";
 import type { Route } from "../../types";
 
 interface SidebarProps {
@@ -12,11 +13,19 @@ interface SidebarProps {
 }
 
 export function Sidebar({ route, agentCount, taskCount, onNavigate, isOpen, onClose }: SidebarProps) {
+  const { user, logout } = useAuth();
+  const [showUserMenu, setShowUserMenu] = useState(false);
+
   const handleNavigate = (newRoute: Route) => {
     onNavigate(newRoute);
     onClose?.();
   };
 
+  const handleLogout = async () => {
+    await logout();
+    setShowUserMenu(false);
+  };
+
   return (
     <>
       {/* Mobile overlay backdrop */}
@@ -30,7 +39,7 @@ export function Sidebar({ route, agentCount, taskCount, onNavigate, isOpen, onCl
       {/* Sidebar - hidden on mobile unless open, always visible on md+ */}
       <aside
         className={`
-          fixed inset-y-0 left-0 z-50 w-64 bg-[#0a0a0a] border-r border-[#1a1a1a] p-4 transform transition-transform duration-200 ease-in-out
+          fixed inset-y-0 left-0 z-50 w-64 bg-[#0a0a0a] border-r border-[#1a1a1a] p-4 flex flex-col transform transition-transform duration-200 ease-in-out
           md:relative md:w-56 md:translate-x-0 md:z-auto
           ${isOpen ? "translate-x-0" : "-translate-x-full"}
         `}
@@ -49,7 +58,7 @@ export function Sidebar({ route, agentCount, taskCount, onNavigate, isOpen, onCl
           </button>
         </div>
 
-        <nav className="space-y-1">
+        <nav className="space-y-1 flex-1">
           <NavButton
             icon={<DashboardIcon />}
             label="Dashboard"
@@ -119,6 +128,37 @@ export function Sidebar({ route, agentCount, taskCount, onNavigate, isOpen, onCl
             onClick={() => handleNavigate("settings")}
           />
         </nav>
+
+        {/* User profile - pinned to bottom */}
+        {user && (
+          <div className="relative border-t border-[#1a1a1a] pt-3 mt-3">
+            <button
+              onClick={() => setShowUserMenu(!showUserMenu)}
+              className="w-full flex items-center gap-3 px-3 py-2 rounded hover:bg-[#111] transition"
+            >
+              <div className="w-8 h-8 rounded-full bg-[#f97316] flex items-center justify-center text-black font-medium text-sm flex-shrink-0">
+                {user.username.charAt(0).toUpperCase()}
+              </div>
+              <div className="flex-1 min-w-0 text-left">
+                <p className="text-sm font-medium truncate">{user.username}</p>
+                <p className="text-xs text-[#555]">{user.role}</p>
+              </div>
+            </button>
+            {showUserMenu && (
+              <>
+                <div className="fixed inset-0 z-40" onClick={() => setShowUserMenu(false)} />
+                <div className="absolute left-3 bottom-full mb-1 w-48 bg-[#111] border border-[#222] rounded-lg shadow-xl z-50">
+                  <button
+                    onClick={handleLogout}
+                    className="w-full px-4 py-2.5 text-left text-sm text-red-400 hover:bg-[#1a1a1a] transition rounded-lg"
+                  >
+                    Sign out
+                  </button>
+                </div>
+              </>
+            )}
+          </div>
+        )}
       </aside>
     </>
   );

package/src/web/components/mcp/McpPage.tsx

@@ -1366,6 +1366,7 @@ function AgentDojoContent({
       const serversUrl = projectId && projectId !== "unassigned"
         ? `/api/mcp/servers?project=${encodeURIComponent(projectId)}`
         : "/api/mcp/servers";
+      console.log(`[AgentDojo:fetchConfigs] projectId=${projectId} serversUrl=${serversUrl}`);
       const [configsRes, serversRes] = await Promise.all([
         authFetch(`/api/integrations/agentdojo/configs${projectParam}`),
         authFetch(serversUrl),
@@ -1373,18 +1374,24 @@ function AgentDojoContent({
       const configsData = await configsRes.json();
       const serversData = await serversRes.json();
 
+      console.log(`[AgentDojo:fetchConfigs] configs=${(configsData.configs || []).length} servers=${(serversData.servers || []).length}`);
       setConfigs(configsData.configs || []);
 
       // Track which configs are already added as local servers
+      const agentdojoServers = (serversData.servers || []).filter((s: any) => s.source === "agentdojo");
+      console.log(`[AgentDojo:fetchConfigs] agentdojo servers found: ${agentdojoServers.length}`);
+      for (const s of agentdojoServers) {
+        const match = s.url?.match(/\/mcp\/([^/?]+)/);
+        console.log(`[AgentDojo:fetchConfigs]   server: id=${s.id} name=${s.name} project_id=${s.project_id} url=${s.url?.substring(0, 80)} extracted=${match ? match[1] : s.name}`);
+      }
       const agentdojoServerIds = new Set(
-        (serversData.servers || [])
-          .filter((s: any) => s.source === "agentdojo")
-          .map((s: any) => {
+        agentdojoServers.map((s: any) => {
             // Extract config ID from URL or match by name
             const match = s.url?.match(/\/mcp\/([^/?]+)/);
             return match ? match[1] : s.name;
           })
       );
+      console.log(`[AgentDojo:fetchConfigs] addedServers set:`, [...agentdojoServerIds]);
       setAddedServers(agentdojoServerIds);
     } catch (e) {
       console.error("Failed to fetch AgentDojo configs:", e);
@@ -1396,15 +1403,19 @@ function AgentDojoContent({
     setAddingConfig(configId);
     try {
       const projectParam = projectId && projectId !== "unassigned" ? `?project_id=${projectId}` : "";
+      console.log(`[AgentDojo:addConfig] configId=${configId} projectParam=${projectParam}`);
       const res = await authFetch(`/api/integrations/agentdojo/configs/${configId}/add${projectParam}`, {
         method: "POST",
       });
+      const data = await res.json();
+      console.log(`[AgentDojo:addConfig] response status=${res.status} ok=${res.ok} message=${data.message} server.id=${data.server?.id} server.project_id=${data.server?.project_id}`);
       if (res.ok) {
         const config = configs.find(c => c.id === configId);
-        setAddedServers(prev => new Set([...prev, config?.slug || configId]));
+        const addKey = config?.slug || configId;
+        console.log(`[AgentDojo:addConfig] marking as added: key=${addKey} config.slug=${config?.slug} config.id=${config?.id} config.name=${config?.name}`);
+        setAddedServers(prev => new Set([...prev, addKey]));
         onServerAdded?.();
       } else {
-        const data = await res.json();
         await alert(data.error || "Failed to add config", { title: "Error", variant: "error" });
       }
     } catch (e) {