Merge branch 'main' into feat/discovery-update

Resolve conflicts by merging both feature sets:
- Keep assisted facilitation v2 features (discovery questions, classification)
- Keep JSONPath display customization features
- Merge database columns: discovery_questions_model_name + input/output_jsonpath
- Merge frontend hooks for both feature sets
- Update SPEC_COVERAGE_MAP with both RUBRIC_SPEC and TRACE_DISPLAY_SPEC updates

Co-Authored-By: Claude <noreply@anthropic.com>

Author: forrestmurray-db

.claude/settings.json

@@ -1,5 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/anthropics/claude-code/main/config-schema.json",
   "permissions": {
     "deny": [
       "Bash(rm -rf:*)",

client/package-lock.json

@@ -41,6 +41,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.0.0",
     "date-fns": "^4.1.0",
+    "jsonpath-plus": "^10.3.0",
     "lucide-react": "^0.525.0",
     "react": "^18.3.0",
     "react-day-picker": "^9.8.0",

client/package.json

@@ -16,6 +16,11 @@ export type Workshop = {
     annotation_started?: boolean;
     active_discovery_trace_ids?: Array<string>;
     active_annotation_trace_ids?: Array<string>;
+    discovery_randomize_traces?: boolean;
+    annotation_randomize_traces?: boolean;
+    judge_name?: string;
+    input_jsonpath?: (string | null);
+    output_jsonpath?: (string | null);
     created_at?: string;
 };
 

client/src/client/models/Workshop.ts

@@ -25,6 +25,7 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { useQueryClient } from '@tanstack/react-query';
 import { PhaseControlButton } from './PhaseControlButton';
+import { JsonPathSettings } from './JsonPathSettings';
 import { toast } from 'sonner';
 import { parseRubricQuestions } from '@/utils/rubricUtils';
 import { getBackendModelName, getFrontendModelName, getModelOptions } from '@/utils/modelMapping';
@@ -1366,6 +1367,9 @@ export const FacilitatorDashboard: React.FC<FacilitatorDashboardProps> = ({ onNa
             </div>
           </CardContent>
         </Card>
+
+        {/* JSONPath Settings - Only show in general dashboard view */}
+        {!focusPhase && <JsonPathSettings />}
       </div>
     </div>
   );

client/src/components/FacilitatorDashboard.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
-import { 
-  Users, 
-  FileText, 
-  Star, 
-  BarChart3, 
+import {
+  Users,
+  FileText,
+  Star,
+  BarChart3,
   Settings,
   Plus,
   Eye
@@ -15,6 +15,7 @@ import { useWorkshopContext } from '@/context/WorkshopContext';
 import { useAllTraces, useFacilitatorAnnotations } from '@/hooks/useWorkshopApi';
 import { UsersService } from '@/client';
 import { useQuery } from '@tanstack/react-query';
+import { JsonPathSettings } from './JsonPathSettings';
 
 interface GeneralDashboardProps {
   onNavigate?: (phase: string) => void;
@@ -165,6 +166,9 @@ export const GeneralDashboard: React.FC<GeneralDashboardProps> = ({ onNavigate }
           </Button>
         </CardContent>
       </Card>
+
+      {/* Trace Display Settings */}
+      <JsonPathSettings />
     </div>
   );
 };