feat: add L2 features - demo activities, notification filters, conflict resolution, conditional triggers

- Add DEMO_ACTIVITIES data to AppHeader and pass to ActivityFeed
- Add notification preference filter toggles in ActivityFeed sheet
- Wire useConflictResolution into ObjectView reconnection flow
- Add structured conditional trigger fields to AutomationBuilder

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Copilot

apps/console/src/components/ActivityFeed.tsx

@@ -10,13 +10,14 @@
 import { useState } from 'react';
 import {
   Button,
+  Badge,
   Sheet,
   SheetContent,
   SheetHeader,
   SheetTitle,
   SheetTrigger,
 } from '@object-ui/components';
-import { Bell, Plus, Pencil, Trash2, MessageSquare } from 'lucide-react';
+import { Bell, Plus, Pencil, Trash2, MessageSquare, Filter } from 'lucide-react';
 
 export interface ActivityItem {
   id: string;
@@ -59,6 +60,19 @@ function formatRelativeTime(iso: string): string {
 
 export function ActivityFeed({ activities = [], className }: ActivityFeedProps) {
   const [open, setOpen] = useState(false);
+  const [showFilters, setShowFilters] = useState(false);
+  const [notificationPreferences, setNotificationPreferences] = useState<Record<ActivityItem['type'], boolean>>({
+    create: true,
+    update: true,
+    delete: true,
+    comment: true,
+  });
+
+  const togglePreference = (type: ActivityItem['type']) => {
+    setNotificationPreferences(prev => ({ ...prev, [type]: !prev[type] }));
+  };
+
+  const filteredActivities = activities.filter(a => notificationPreferences[a.type]);
 
   return (
     <Sheet open={open} onOpenChange={setOpen}>
@@ -80,17 +94,48 @@ export function ActivityFeed({ activities = [], className }: ActivityFeedProps)
 
       <SheetContent side="right" className="w-80 sm:w-96">
         <SheetHeader>
-          <SheetTitle>Recent Activity</SheetTitle>
+          <SheetTitle className="flex items-center justify-between">
+            Recent Activity
+            <Button
+              variant={showFilters ? 'secondary' : 'ghost'}
+              size="sm"
+              className="h-7 px-2"
+              onClick={() => setShowFilters(!showFilters)}
+            >
+              <Filter className="h-3.5 w-3.5 mr-1" />
+              Filter
+            </Button>
+          </SheetTitle>
         </SheetHeader>
 
-        {activities.length === 0 ? (
+        {showFilters && (
+          <div className="flex flex-wrap gap-1.5 mt-3 px-1">
+            {(Object.keys(typeConfig) as ActivityItem['type'][]).map(type => {
+              const { icon: Icon, color } = typeConfig[type];
+              const active = notificationPreferences[type];
+              return (
+                <Badge
+                  key={type}
+                  variant={active ? 'default' : 'outline'}
+                  className="cursor-pointer select-none gap-1 capitalize"
+                  onClick={() => togglePreference(type)}
+                >
+                  <Icon className={`h-3 w-3 ${active ? '' : color}`} />
+                  {type}
+                </Badge>
+              );
+            })}
+          </div>
+        )}
+
+        {filteredActivities.length === 0 ? (
           <div className="flex flex-col items-center justify-center gap-2 py-16 text-muted-foreground">
             <Bell className="h-8 w-8 opacity-40" />
             <p className="text-sm">No recent activity</p>
           </div>
         ) : (
           <ul className="mt-4 space-y-1 overflow-y-auto max-h-[calc(100vh-8rem)]">
-            {activities.map((item) => {
+            {filteredActivities.map((item) => {
               const { icon: Icon, color } = typeConfig[item.type];
               return (
                 <li

apps/console/src/components/AppHeader.tsx

@@ -31,7 +31,7 @@ import { PresenceAvatars, type PresenceUser } from '@object-ui/collaboration';
 import { ModeToggle } from './mode-toggle';
 import { LocaleSwitcher } from './LocaleSwitcher';
 import { ConnectionStatus } from './ConnectionStatus';
-import { ActivityFeed } from './ActivityFeed';
+import { ActivityFeed, type ActivityItem } from './ActivityFeed';
 import type { ConnectionState } from '../dataSource';
 
 /** Convert a slug like "crm_dashboard" or "audit-log" to "Crm Dashboard" / "Audit Log" */
@@ -48,6 +48,15 @@ const MOCK_PRESENCE_USERS: PresenceUser[] = [
   { userId: 'u3', userName: 'Carol Li', color: '#e74c3c', status: 'active', lastActivity: new Date().toISOString() },
 ];
 
+// Demo activity items for local/mock mode
+const DEMO_ACTIVITIES: ActivityItem[] = [
+  { id: 'a1', type: 'create', objectName: 'Contact', recordId: 'c-101', user: 'Alice Chen', description: 'Created new contact "Acme Corp"', timestamp: new Date(Date.now() - 2 * 60 * 1000).toISOString() },
+  { id: 'a2', type: 'update', objectName: 'Deal', recordId: 'd-42', user: 'Bob Smith', description: 'Updated deal stage to "Negotiation"', timestamp: new Date(Date.now() - 15 * 60 * 1000).toISOString() },
+  { id: 'a3', type: 'comment', objectName: 'Task', recordId: 't-88', user: 'Carol Li', description: 'Commented on task "Q4 Review"', timestamp: new Date(Date.now() - 45 * 60 * 1000).toISOString() },
+  { id: 'a4', type: 'delete', objectName: 'Lead', recordId: 'l-7', user: 'Alice Chen', description: 'Deleted duplicate lead "Test Lead"', timestamp: new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString() },
+  { id: 'a5', type: 'update', objectName: 'Contact', recordId: 'c-55', user: 'Bob Smith', description: 'Updated email for "Jane Doe"', timestamp: new Date(Date.now() - 5 * 60 * 60 * 1000).toISOString() },
+];
+
 export function AppHeader({ appName, objects, connectionState, presenceUsers }: { appName: string, objects: any[], connectionState?: ConnectionState, presenceUsers?: PresenceUser[] }) {
     const location = useLocation();
     const params = useParams();
@@ -218,7 +227,7 @@ export function AppHeader({ appName, objects, connectionState, presenceUsers }:
 
                 {/* Activity Feed */}
                 <div className="hidden sm:flex shrink-0 relative">
-                  <ActivityFeed />
+                  <ActivityFeed activities={DEMO_ACTIVITIES} />
                 </div>
 
                 {/* Help */}

apps/console/src/components/ObjectView.tsx

@@ -26,7 +26,7 @@ import { MetadataToggle, MetadataPanel, useMetadataInspector } from './MetadataI
 import { useObjectActions } from '../hooks/useObjectActions';
 import { useObjectTranslation } from '@object-ui/i18n';
 import { usePermissions } from '@object-ui/permissions';
-import { useRealtimeSubscription } from '@object-ui/collaboration';
+import { useRealtimeSubscription, useConflictResolution } from '@object-ui/collaboration';
 
 /** Map view types to Lucide icons (Airtable-style) */
 const VIEW_TYPE_ICONS: Record<string, ComponentType<{ className?: string }>> = {
@@ -122,11 +122,19 @@ export function ObjectView({ dataSource, objects, onEdit, onRowClick }: any) {
         channel: `object:${objectDef.name}`,
     });
 
+    // Conflict resolution: detect and queue conflicts on reconnection
+    const conflictUserId = objectDef.name ? `user-${objectDef.name}` : 'current-user';
+    const { hasConflicts, resolveAllConflicts } = useConflictResolution(conflictUserId);
+
     useEffect(() => {
         if (realtimeMessage) {
+            // On reconnection data change, auto-resolve with server-wins strategy
+            if (hasConflicts) {
+                resolveAllConflicts('remote');
+            }
             setRefreshKey(k => k + 1);
         }
-    }, [realtimeMessage]);
+    }, [realtimeMessage, hasConflicts, resolveAllConflicts]);
 
     // Drawer Logic
     const drawerRecordId = searchParams.get('recordId');

packages/plugin-workflow/src/AutomationBuilder.tsx

@@ -20,6 +20,9 @@ export interface TriggerConfig {
   fieldName?: string;
   schedule?: string;
   condition?: string;
+  conditionField?: string;
+  conditionOperator?: 'equals' | 'not_equals' | 'contains' | 'greater_than' | 'less_than';
+  conditionValue?: string;
 }
 
 export interface ActionConfig {
@@ -62,6 +65,14 @@ const ACTION_ICONS: Record<ActionConfig['type'], React.ReactNode> = {
   webhook: <Globe className="h-4 w-4" />, notification: <Bell className="h-4 w-4" />,
 };
 
+const CONDITION_OPERATORS: Record<NonNullable<TriggerConfig['conditionOperator']>, string> = {
+  equals: 'Equals',
+  not_equals: 'Not Equals',
+  contains: 'Contains',
+  greater_than: 'Greater Than',
+  less_than: 'Less Than',
+};
+
 const defaultAutomation = (): AutomationDefinition => ({
   id: `auto-${Date.now()}`, name: '', description: '', enabled: true,
   trigger: { type: 'record_created' }, actions: [], createdAt: new Date().toISOString(),
@@ -190,6 +201,41 @@ export const AutomationBuilder: React.FC<AutomationBuilderProps> = ({
             <Label className="text-xs">Condition (optional)</Label>
             <Input value={automation.trigger.condition ?? ''} onChange={(e: React.ChangeEvent<HTMLInputElement>) => updateTrigger({ condition: e.target.value })} placeholder='e.g. ${data.status === "active"}' />
           </div>
+          <Separator />
+          <div className="space-y-3">
+            <Label className="text-xs font-medium">Conditional Trigger (optional)</Label>
+            <p className="text-xs text-muted-foreground">Run only when a field matches a specific value.</p>
+            <div className="grid grid-cols-3 gap-2">
+              <div className="space-y-1">
+                <Label className="text-xs">Field</Label>
+                {selectedObjectFields ? (
+                  <Select value={automation.trigger.conditionField ?? ''} onValueChange={(v) => updateTrigger({ conditionField: v })}>
+                    <SelectTrigger><SelectValue placeholder="Field" /></SelectTrigger>
+                    <SelectContent>
+                      {Object.keys(selectedObjectFields).map(f => <SelectItem key={f} value={f}>{f}</SelectItem>)}
+                    </SelectContent>
+                  </Select>
+                ) : (
+                  <Input value={automation.trigger.conditionField ?? ''} onChange={(e: React.ChangeEvent<HTMLInputElement>) => updateTrigger({ conditionField: e.target.value })} placeholder="e.g. status" />
+                )}
+              </div>
+              <div className="space-y-1">
+                <Label className="text-xs">Operator</Label>
+                <Select value={automation.trigger.conditionOperator ?? 'equals'} onValueChange={(v) => updateTrigger({ conditionOperator: v as TriggerConfig['conditionOperator'] })}>
+                  <SelectTrigger><SelectValue placeholder="Operator" /></SelectTrigger>
+                  <SelectContent>
+                    {(Object.keys(CONDITION_OPERATORS) as NonNullable<TriggerConfig['conditionOperator']>[]).map(op => (
+                      <SelectItem key={op} value={op}>{CONDITION_OPERATORS[op]}</SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+              <div className="space-y-1">
+                <Label className="text-xs">Value</Label>
+                <Input value={automation.trigger.conditionValue ?? ''} onChange={(e: React.ChangeEvent<HTMLInputElement>) => updateTrigger({ conditionValue: e.target.value })} placeholder="e.g. urgent" />
+              </div>
+            </div>
+          </div>
         </CardContent>
       </Card>