Conflicting changes from parent repository

archon-ui-main/package.json

@@ -8,7 +8,7 @@
     "build": "npx vite build",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "preview": "npx vite preview",
-    "test": "vitest",
+    "test": "vitest run --coverage",
     "test:ui": "vitest --ui",
     "test:coverage": "npm run test:coverage:run && npm run test:coverage:summary",
     "test:coverage:run": "vitest run --coverage --reporter=dot --reporter=json",
@@ -36,6 +36,7 @@
     "react-router-dom": "^6.26.2",
     "socket.io-client": "^4.8.1",
     "tailwind-merge": "latest",
+    "uuid": "^11.1.0",
     "zod": "^3.25.46"
   },
   "devDependencies": {
@@ -45,6 +46,7 @@
     "@types/node": "^20.19.0",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.1",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",
     "@vitejs/plugin-react": "^4.2.1",

archon-ui-main/src/components/ui/TestResultDashboard.tsx

@@ -72,7 +72,9 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
     );
   }
 
-  if (!results) {
+  const summary = results?.summary;
+
+  if (!summary) {
     return (
       <div className="bg-white dark:bg-gray-800 rounded-lg p-6 border border-gray-200 dark:border-gray-700 shadow-sm">
         <div className="flex flex-col items-center justify-center py-8 text-center">
@@ -88,11 +90,18 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
     );
   }
 
-  const { summary } = results;
-  const successRate = summary.total > 0 ? (summary.passed / summary.total) * 100 : 0;
+  const safeSummary = {
+    total: summary.total || 0,
+    passed: summary.passed || 0,
+    failed: summary.failed || 0,
+    skipped: summary.skipped || 0,
+    duration: summary.duration || 0,
+  };
+
+  const successRate = safeSummary.total > 0 ? (safeSummary.passed / safeSummary.total) * 100 : 0;
 
   const getHealthStatus = () => {
-    if (summary.failed === 0 && summary.passed > 0) return { text: 'All Tests Passing', color: 'text-green-600 dark:text-green-400', bg: 'bg-green-50 dark:bg-green-900/20' };
+    if (safeSummary.failed === 0 && safeSummary.passed > 0) return { text: 'All Tests Passing', color: 'text-green-600 dark:text-green-400', bg: 'bg-green-50 dark:bg-green-900/20' };
     if (successRate >= 80) return { text: 'Mostly Passing', color: 'text-yellow-600 dark:text-yellow-400', bg: 'bg-yellow-50 dark:bg-yellow-900/20' };
     return { text: 'Tests Failing', color: 'text-red-600 dark:text-red-400', bg: 'bg-red-50 dark:bg-red-900/20' };
   };
@@ -127,7 +136,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
           className="text-center p-4 bg-gray-50 dark:bg-gray-700/50 rounded-lg"
         >
           <div className="text-2xl font-bold text-gray-800 dark:text-white mb-1">
-            {summary.total}
+            {safeSummary.total}
           </div>
           <div className="text-sm text-gray-600 dark:text-gray-400">Total Tests</div>
         </motion.div>
@@ -140,7 +149,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
         >
           <div className="text-2xl font-bold text-green-600 dark:text-green-400 mb-1 flex items-center justify-center gap-1">
             <CheckCircle className="w-5 h-5" />
-            {summary.passed}
+            {safeSummary.passed}
           </div>
           <div className="text-sm text-gray-600 dark:text-gray-400">Passed</div>
         </motion.div>
@@ -153,7 +162,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
         >
           <div className="text-2xl font-bold text-red-600 dark:text-red-400 mb-1 flex items-center justify-center gap-1">
             <XCircle className="w-5 h-5" />
-            {summary.failed}
+            {safeSummary.failed}
           </div>
           <div className="text-sm text-gray-600 dark:text-gray-400">Failed</div>
         </motion.div>
@@ -166,7 +175,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
         >
           <div className="text-2xl font-bold text-yellow-600 dark:text-yellow-400 mb-1 flex items-center justify-center gap-1">
             <Clock className="w-5 h-5" />
-            {summary.skipped}
+            {safeSummary.skipped}
           </div>
           <div className="text-sm text-gray-600 dark:text-gray-400">Skipped</div>
         </motion.div>
@@ -195,7 +204,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
       <div className="flex items-center justify-between text-sm text-gray-600 dark:text-gray-400">
         <div className="flex items-center gap-2">
           <Zap className="w-4 h-4" />
-          <span>Duration: {(summary.duration / 1000).toFixed(2)}s</span>
+          <span>Duration: {(safeSummary.duration / 1000).toFixed(2)}s</span>
         </div>
         {results.timestamp && (
           <div className="flex items-center gap-2">
@@ -206,7 +215,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
       </div>
 
       {/* Failed Tests Alert */}
-      {summary.failed > 0 && (
+      {safeSummary.failed > 0 && (
         <motion.div
           initial={{ opacity: 0, height: 0 }}
           animate={{ opacity: 1, height: 'auto' }}
@@ -215,7 +224,7 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
           <div className="flex items-center gap-2 text-red-700 dark:text-red-400">
             <AlertTriangle className="w-4 h-4" />
             <span className="text-sm font-medium">
-              {summary.failed} test{summary.failed > 1 ? 's' : ''} failing - review errors below
+              {safeSummary.failed} test{safeSummary.failed > 1 ? 's' : ''} failing - review errors below
             </span>
           </div>
         </motion.div>
@@ -225,7 +234,10 @@ const TestSummaryCard: React.FC<TestSummaryCardProps> = ({ results, isLoading })
 };
 
 const FailedTestsList: React.FC<{ results: TestResults }> = ({ results }) => {
-  const failedSuites = results.suites.filter(suite => suite.failed > 0);
+  if (!results || !Array.isArray(results.suites) || !results.summary) {
+    return null;
+  }
+  const failedSuites = results.suites.filter(suite => suite && typeof suite.failed === 'number' && suite.failed > 0);
 
   if (failedSuites.length === 0) {
     return null;
@@ -240,7 +252,7 @@ const FailedTestsList: React.FC<{ results: TestResults }> = ({ results }) => {
       <div className="flex items-center gap-3 mb-4">
         <XCircle className="w-5 h-5 text-red-500" />
         <h3 className="text-lg font-semibold text-gray-800 dark:text-white">
-          Failed Tests ({results.summary.failed})
+          Failed Tests ({results?.summary?.failed || 0})
         </h3>
       </div>
 
@@ -381,9 +393,9 @@ export const TestResultDashboard: React.FC<TestResultDashboardProps> = ({
       )}
 
       {/* Main content */}
-      <div className={`grid gap-6 ${compact ? 'grid-cols-1' : 'grid-cols-1 xl:grid-cols-2'}`}>
+      <div className={`grid gap-6 ${compact ? 'grid-cols-1' : 'grid-cols-1'}`}>
         {/* Test Summary */}
-        <div>
+        <div className="flex-1">
           <TestSummaryCard results={results} isLoading={loading && !results} />
         </div>
 
@@ -400,7 +412,7 @@ export const TestResultDashboard: React.FC<TestResultDashboardProps> = ({
       </div>
 
       {/* Failed Tests */}
-      {results && results.summary.failed > 0 && (
+      {results?.summary?.failed > 0 && results?.suites && (
         <FailedTestsList results={results} />
       )}
     </div>

archon-ui-main/src/config/api.ts

@@ -7,27 +7,28 @@
 
 // Get the API URL from environment or construct it
 export function getApiUrl(): string {
-  // Check if VITE_API_URL is provided (set by docker-compose)
+  // 1. Priority: VITE_API_URL from environment (e.g., Docker)
   if (import.meta.env.VITE_API_URL) {
-    return import.meta.env.VITE_API_URL;
+    return import.meta.env.VITE_API_URL
   }
 
-  // For relative URLs in production (goes through proxy)
+  // 2. Production mode: Use relative path
   if (import.meta.env.PROD) {
-    return '';
+    return ''
   }
 
-  // For development, construct from window location
-  const protocol = window.location.protocol;
-  const host = window.location.hostname;
-  // Use configured port or default to 8181
-  const port = import.meta.env.VITE_ARCHON_SERVER_PORT || '8181';
-
-  if (!import.meta.env.VITE_ARCHON_SERVER_PORT) {
-    console.info('[Archon] Using default ARCHON_SERVER_PORT: 8181');
-  }
-
-  return `${protocol}//${host}:${port}`;
+  // 3. Development mode: Construct URL from port
+  const port = import.meta.env.ARCHON_SERVER_PORT
+  if (!port) {
+    throw new Error(
+      'ARCHON_SERVER_PORT environment variable is required. ' +
+        'Please set it in your .env file. ' +
+        'Default value: 8181',
+    )
+
+  const protocol = window.location.protocol
+  const hostname = window.location.hostname
+  return `${protocol}//${hostname}:${port}`
 }
 
 // Get the base path for API endpoints

archon-ui-main/src/services/mcpClientService.ts

@@ -89,13 +89,11 @@ const MCPToolSchema = z.object({
 export type MCPTool = z.infer<typeof MCPToolSchema>;
 export type MCPParameter = z.infer<typeof MCPParameterSchema>;
 
-import { getApiUrl } from '../config/api';
-
 /**
  * MCP Client Service - Universal MCP client that connects to any MCP servers
  * This service communicates with the standalone Python MCP client service
  */
-class MCPClientService {
+export class MCPClientService {
   private baseUrl = getApiUrl();
 
   // ========================================

archon-ui-main/src/services/testService.ts

@@ -40,6 +40,7 @@ export interface TestStatus {
 }
 
 import { getApiUrl, getWebSocketUrl } from '../config/api';
+import { v4 as uuidv4 } from 'uuid';
 
 // Use unified API configuration
 const API_BASE_URL = getApiUrl();
@@ -159,7 +160,7 @@ class TestService {
     onError?: (error: Error) => void,
     onComplete?: () => void
   ): Promise<string> {
-    const execution_id = crypto.randomUUID();
+    const execution_id = uuidv4();
 
     try {
       // Send initial status
@@ -247,44 +248,47 @@ class TestService {
    * Get coverage data for Test Results Modal from new API endpoints with fallback
    */
   async getCoverageData(): Promise<any> {
-    try {
-      // Try new API endpoint first
-      const response = await callAPI<any>('/api/coverage/combined-summary');
-      return response;
-    } catch (apiError) {
-      // Fallback to static files for backward compatibility
-      try {
-        const response = await fetch('/test-results/coverage/coverage-summary.json');
-        if (!response.ok) {
-          throw new Error('Coverage data not available');
-        }
-        return await response.json();
-      } catch (staticError) {
-        throw new Error(`Failed to load coverage data: ${apiError instanceof Error ? apiError.message : 'API and static files unavailable'}`);
-      }
+    const response = await fetch('/test-results/coverage/coverage-summary.json');
+    if (!response.ok) {
+      throw new Error('Coverage data not available');
     }
+    return await response.json();
   }
 
   /**
    * Get test results for Test Results Modal from new API endpoints with fallback
    */
   async getTestResults(): Promise<any> {
-    try {
-      // Try new API endpoint first
-      const response = await callAPI<any>('/api/tests/latest-results');
-      return response;
-    } catch (apiError) {
-      // Fallback to static files for backward compatibility
-      try {
-        const response = await fetch('/test-results/test-results.json');
-        if (!response.ok) {
-          throw new Error('Test results not available');
-        }
-        return await response.json();
-      } catch (staticError) {
-        throw new Error(`Failed to load test results: ${apiError instanceof Error ? apiError.message : 'API and static files unavailable'}`);
-      }
+    const response = await fetch('/test-results/test-results.json');
+    if (!response.ok) {
+      throw new Error('Test results not available');
     }
+    const data = await response.json();
+
+    // Transform the data to match the expected TestResults interface
+    const transformedData = {
+      summary: {
+        total: data.numTotalTests || 0,
+        passed: data.numPassedTests || 0,
+        failed: data.numFailedTests || 0,
+        skipped: data.numPendingTests || 0,
+        duration: data.testResults.reduce((acc: number, suite: any) => acc + (suite.endTime - suite.startTime), 0),
+      },
+      suites: data.testResults.map((suite: any) => ({
+        name: suite.name,
+        tests: suite.assertionResults.length,
+        passed: suite.assertionResults.filter((r: any) => r.status === 'passed').length,
+        failed: suite.assertionResults.filter((r: any) => r.status === 'failed').length,
+        skipped: suite.assertionResults.filter((r: any) => r.status === 'pending' || r.status === 'todo').length,
+        duration: suite.endTime - suite.startTime,
+        failedTests: suite.assertionResults
+          .filter((r: any) => r.status === 'failed')
+          .map((r: any) => ({ name: r.title, error: r.failureMessages.join('\\n') }))
+      })),
+      timestamp: new Date(data.startTime).toISOString()
+    };
+
+    return transformedData;
   }
 
   /**

archon-ui-main/src/utils/onboarding.ts

@@ -41,10 +41,11 @@ export function isLmConfigured(
   // Helper function to check if a credential has a valid value
   const hasValidCredential = (cred: NormalizedCredential | undefined): boolean => {
     if (!cred) return false;
-    return !!(
-      (cred.value && cred.value !== 'null' && cred.value !== null && cred.value.trim() !== '') || 
-      (cred.is_encrypted && cred.encrypted_value && cred.encrypted_value !== 'null' && cred.encrypted_value !== null)
-    );
+    // If is_encrypted is true, we consider it valid even without a value,
+    // as the value is stored on the server.
+    if (cred.is_encrypted) return true;
+
+    return !!(cred.value && cred.value !== 'null' && cred.value !== null && cred.value.trim() !== '');
   };
 
   // Find API keys