fix: multiple API/UI/schema issues

- Cast JSON fields (context, data, metrics) to any in events batch create to satisfy Prisma JsonValue
- Use session relation when counting agent events in machine-activity stats
- Import/use PrismaProjectService.getByName in project hierarchy page (use server-side service)
- Show "Last Updated" (updatedAt) in project settings and update ProjectListQuerySchema.sortBy to use updatedAt

Author: tikazyq

apps/web/app/api/events/batch/route.ts

@@ -1,6 +1,6 @@
 /**
  * Batch Event Creation API Endpoint
- * 
+ *
  * POST /api/events/batch - Batch create agent events
  */
 
@@ -14,17 +14,14 @@ export const dynamic = 'force-dynamic';
 
 /**
  * POST /api/events/batch - Batch create events
- * 
+ *
  * Creates multiple agent events in a single transaction.
  * Maximum 1000 events per request for performance.
  */
 export async function POST(request: NextRequest) {
   try {
     // Validate request body
-    const validation = await ApiValidator.validateJsonBody(
-      request,
-      BatchEventsCreateSchema
-    );
+    const validation = await ApiValidator.validateJsonBody(request, BatchEventsCreateSchema);
 
     if (!validation.success) {
       return validation.response;
@@ -33,10 +30,7 @@ export async function POST(request: NextRequest) {
     const events = validation.data;
 
     if (events.length === 0) {
-      return NextResponse.json(
-        { error: 'At least one event is required' },
-        { status: 400 }
-      );
+      return NextResponse.json({ error: 'At least one event is required' }, { status: 400 });
     }
 
     // Get Prisma client
@@ -51,9 +45,9 @@ export async function POST(request: NextRequest) {
         agentVersion: event.agentVersion,
         sessionId: event.sessionId,
         projectId: event.projectId,
-        context: event.context,
-        data: event.data,
-        metrics: event.metrics,
+        context: event.context as any, // Cast to satisfy Prisma JsonValue type
+        data: event.data as any,
+        metrics: event.metrics as any,
         parentEventId: event.parentEventId,
         relatedEventIds: event.relatedEventIds,
         tags: event.tags,
@@ -67,7 +61,7 @@ export async function POST(request: NextRequest) {
         created: result.count,
         requested: events.length,
       },
-      { status: 201 }
+      { status: 201 },
     );
   } catch (error) {
     console.error('[POST /api/events/batch] Error:', error);
@@ -80,7 +74,7 @@ export async function POST(request: NextRequest) {
             error: 'Invalid reference: session or project not found',
             details: error.message,
           },
-          { status: 400 }
+          { status: 400 },
         );
       }
     }
@@ -89,7 +83,7 @@ export async function POST(request: NextRequest) {
       {
         error: error instanceof Error ? error.message : 'Failed to create events',
       },
-      { status: 500 }
+      { status: 500 },
     );
   }
 }

apps/web/app/api/stats/machine-activity/route.ts

@@ -1,6 +1,6 @@
 /**
  * Machine Activity Stats API
- * 
+ *
  * GET /api/stats/machine-activity
  * Returns aggregated activity statistics by machine
  */
@@ -17,24 +17,28 @@ export async function GET(req: NextRequest) {
   try {
     const searchParams = Object.fromEntries(req.nextUrl.searchParams);
     const query = QuerySchema.parse(searchParams);
-    
+
     const prisma = new PrismaClient();
-    
+
     try {
       // Aggregate activity by machine
       const machines = await prisma.machine.findMany({
-        where: query.projectId ? {
-          workspaces: {
-            some: {
-              projectId: query.projectId,
-            },
-          },
-        } : undefined,
+        where: query.projectId
+          ? {
+              workspaces: {
+                some: {
+                  projectId: query.projectId,
+                },
+              },
+            }
+          : undefined,
         include: {
           workspaces: {
-            where: query.projectId ? {
-              projectId: query.projectId,
-            } : undefined,
+            where: query.projectId
+              ? {
+                  projectId: query.projectId,
+                }
+              : undefined,
             include: {
               chatSessions: {
                 select: {
@@ -45,37 +49,37 @@ export async function GET(req: NextRequest) {
           },
         },
       });
-      
+
       // Get event counts for each machine
       const machineActivity = await Promise.all(
         machines.map(async (machine) => {
-          const workspaceIds = machine.workspaces.map(w => w.id);
-          
+          const workspaceIds = machine.workspaces.map((w) => w.id);
+
           const eventCount = await prisma.agentEvent.count({
             where: {
-              chatSession: {
+              session: {
                 workspaceId: {
                   in: workspaceIds,
                 },
               },
             },
           });
-          
+
           const sessionCount = machine.workspaces.reduce(
             (sum, w) => sum + w.chatSessions.length,
-            0
+            0,
           );
-          
+
           return {
             hostname: machine.hostname,
             machineType: machine.machineType,
             sessionCount,
             eventCount,
             workspaceCount: machine.workspaces.length,
           };
-        })
+        }),
       );
-      
+
       return NextResponse.json({
         success: true,
         data: machineActivity,
@@ -88,7 +92,7 @@ export async function GET(req: NextRequest) {
     }
   } catch (error) {
     console.error('[API] Machine activity error:', error);
-    
+
     if (error instanceof z.ZodError) {
       return NextResponse.json(
         {
@@ -102,10 +106,10 @@ export async function GET(req: NextRequest) {
             timestamp: new Date().toISOString(),
           },
         },
-        { status: 422 }
+        { status: 422 },
       );
     }
-    
+
     return NextResponse.json(
       {
         success: false,
@@ -117,7 +121,7 @@ export async function GET(req: NextRequest) {
           timestamp: new Date().toISOString(),
         },
       },
-      { status: 500 }
+      { status: 500 },
     );
   }
 }

apps/web/app/projects/[name]/hierarchy/page.tsx

@@ -1,6 +1,6 @@
 /**
  * Project Hierarchy Page
- * 
+ *
  * Displays the complete project hierarchy with machines, workspaces, and sessions
  */
 
@@ -10,26 +10,23 @@ import { ChevronLeft } from 'lucide-react';
 import { HierarchyTree } from '@/components/agent-observability/hierarchy';
 import { Card } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
-import { ProjectService } from '@codervisor/devlog-core';
-import { HierarchyService } from '@codervisor/devlog-core';
+import { PrismaProjectService, HierarchyService } from '@codervisor/devlog-core/server';
 
 interface ProjectHierarchyPageProps {
   params: { name: string };
 }
 
-export default async function ProjectHierarchyPage({
-  params,
-}: ProjectHierarchyPageProps) {
+export default async function ProjectHierarchyPage({ params }: ProjectHierarchyPageProps) {
   // Initialize services
-  const projectService = ProjectService.getInstance();
+  const projectService = PrismaProjectService.getInstance();
   const hierarchyService = HierarchyService.getInstance();
-  
+
   await projectService.initialize();
   await hierarchyService.initialize();
 
-  // Fetch project by full name
-  const project = await projectService.getProjectByFullName(params.name);
-  
+  // Fetch project by name
+  const project = await projectService.getByName(params.name);
+
   if (!project) {
     notFound();
   }
@@ -55,13 +52,13 @@ export default async function ProjectHierarchyPage({
         {hierarchy.project.description && (
           <p className="text-muted-foreground mt-2">{hierarchy.project.description}</p>
         )}
-        
+
         {/* Project metadata */}
         <div className="flex gap-4 mt-4 text-sm text-muted-foreground">
           {hierarchy.project.repoUrl && (
-            <a 
-              href={hierarchy.project.repoUrl} 
-              target="_blank" 
+            <a
+              href={hierarchy.project.repoUrl}
+              target="_blank"
               rel="noopener noreferrer"
               className="hover:text-foreground transition-colors"
             >
@@ -80,9 +77,7 @@ export default async function ProjectHierarchyPage({
       {/* Hierarchy Tree */}
       {hierarchy.machines.length === 0 ? (
         <Card className="p-8 text-center">
-          <p className="text-muted-foreground">
-            No machines or workspaces detected yet.
-          </p>
+          <p className="text-muted-foreground">No machines or workspaces detected yet.</p>
           <p className="text-sm text-muted-foreground mt-2">
             Install the devlog collector to start tracking activity for this project.
           </p>

apps/web/app/projects/[name]/settings/project-settings-page.tsx

@@ -79,37 +79,40 @@ export function ProjectSettingsPage() {
     fetchCurrentProject();
   }, [currentProjectName]);
 
-  const handleUpdateProject = useCallback(async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (!formData.name.trim()) {
-      toast.error('Project name is required');
-      return;
-    }
-
-    if (!project) {
-      toast.error('Project not found');
-      return;
-    }
-
-    try {
-      setIsUpdating(true);
-
-      const updates: Partial<Project> = {
-        name: formData.name.trim(),
-        description: formData.description?.trim() || undefined,
-      };
-
-      await updateProject(project.name, updates);
-      toast.success('Project updated successfully');
-      setHasChanges(false);
-    } catch (error) {
-      console.error('Error updating project:', error);
-      toast.error('Failed to update project');
-    } finally {
-      setIsUpdating(false);
-    }
-  }, [formData, project, updateProject]);
+  const handleUpdateProject = useCallback(
+    async (e: React.FormEvent) => {
+      e.preventDefault();
+
+      if (!formData.name.trim()) {
+        toast.error('Project name is required');
+        return;
+      }
+
+      if (!project) {
+        toast.error('Project not found');
+        return;
+      }
+
+      try {
+        setIsUpdating(true);
+
+        const updates: Partial<Project> = {
+          name: formData.name.trim(),
+          description: formData.description?.trim() || undefined,
+        };
+
+        await updateProject(project.name, updates);
+        toast.success('Project updated successfully');
+        setHasChanges(false);
+      } catch (error) {
+        console.error('Error updating project:', error);
+        toast.error('Failed to update project');
+      } finally {
+        setIsUpdating(false);
+      }
+    },
+    [formData, project, updateProject],
+  );
 
   const handleDeleteProject = useCallback(async () => {
     if (!project) {
@@ -143,7 +146,7 @@ export function ProjectSettingsPage() {
   }, [project]);
 
   const handleFormChange = useCallback((field: keyof ProjectFormData, value: string) => {
-    setFormData(prev => ({ ...prev, [field]: value }));
+    setFormData((prev) => ({ ...prev, [field]: value }));
     setHasChanges(true);
   }, []);
 
@@ -320,8 +323,8 @@ export function ProjectSettingsPage() {
                 <p className="text-sm">{new Date(project.createdAt).toLocaleDateString()}</p>
               </div>
               <div>
-                <Label className="text-sm text-muted-foreground">Last Accessed</Label>
-                <p className="text-sm">{new Date(project.lastAccessedAt).toLocaleDateString()}</p>
+                <Label className="text-sm text-muted-foreground">Last Updated</Label>
+                <p className="text-sm">{new Date(project.updatedAt).toLocaleDateString()}</p>
               </div>
             </div>
           </CardContent>

apps/web/schemas/project.ts

@@ -17,7 +17,7 @@ export const ProjectIdParamSchema = z
   })
   .refine(
     (data) => isValidProjectIdentifier(data.id).valid,
-    'Project name must follow GitHub naming conventions'
+    'Project name must follow GitHub naming conventions',
   );
 
 /**
@@ -27,7 +27,10 @@ export const CreateProjectBodySchema = z.object({
   name: z
     .string()
     .min(1, 'Project name is required')
-    .refine(validateProjectDisplayName, 'The repository name can only contain ASCII letters, digits, and the characters -, ., and _.'),
+    .refine(
+      validateProjectDisplayName,
+      'The repository name can only contain ASCII letters, digits, and the characters -, ., and _.',
+    ),
   description: z.string().optional(),
   repositoryUrl: z.string().optional(),
   settings: z
@@ -53,6 +56,6 @@ export const ProjectListQuerySchema = z.object({
   limit: z.string().regex(/^\d+$/).transform(Number).optional(),
   offset: z.string().regex(/^\d+$/).transform(Number).optional(),
   search: z.string().optional(),
-  sortBy: z.enum(['name', 'createdAt', 'lastAccessedAt']).optional(),
+  sortBy: z.enum(['name', 'createdAt', 'updatedAt']).optional(),
   sortOrder: z.enum(['asc', 'desc']).optional(),
 });