Revert "fix(infra): rename dev pg container name"

This reverts commit c5354e3.

Author: lan17

docker-compose.dev.yml

@@ -15,7 +15,7 @@
 services:
   postgres:
     image: postgres:16-alpine
-    container_name: agent_control_postgres_dev
+    container_name: agent_control_postgres
     ports:
       - "${AGENT_CONTROL_DB_HOST_PORT:-5432}:5432"
     environment:

ui/src/core/page-components/agent-detail/modals/add-new-control/index.tsx

@@ -51,33 +51,6 @@ function getDefaultConfigForEvaluator(
   return DEFAULT_EVALUATOR_CONFIGS[evaluatorId] ?? {};
 }
 
-function buildJsonDraftControl(agentName: string) {
-  return {
-    id: 0,
-    name: `json-control-for-${sanitizeControlNamePart(agentName)}`,
-    control: {
-      description: '',
-      enabled: true,
-      execution: 'server' as const,
-      scope: {
-        step_types: ['llm'],
-        stages: ['post'] as ('post' | 'pre')[],
-      },
-      condition: {
-        selector: {
-          path: '*',
-        },
-        evaluator: {
-          name: 'regex',
-          config: getDefaultConfigForEvaluator('regex'),
-        },
-      },
-      action: { decision: 'deny' as const },
-      tags: [],
-    },
-  };
-}
-
 type AddNewControlModalProps = {
   opened: boolean;
   onClose: () => void;
@@ -117,12 +90,6 @@ export function AddNewControlModal({
     });
   };
 
-  const handleFromJsonClick = () => {
-    openModal(MODAL_NAMES.CONTROL_STORE, {
-      submodal: SUBMODAL_NAMES.CREATE,
-    });
-  };
-
   const handleEditModalClose = () => {
     closeSubmodal();
   };
@@ -143,34 +110,31 @@ export function AddNewControlModal({
   }, [evaluatorsData]);
 
   const draftControl = useMemo(() => {
-    if (selectedEvaluator) {
-      const name = `${sanitizeControlNamePart(selectedEvaluator.name)}-control-for-${sanitizeControlNamePart(agentName)}`;
-      return {
-        id: 0,
-        name,
-        control: {
-          description: selectedEvaluator.description,
-          enabled: true,
-          execution: 'server' as const,
-          scope: {
-            step_types: ['llm'],
-            stages: ['post'] as ('post' | 'pre')[],
+    if (!selectedEvaluator) return null;
+    const name = `${sanitizeControlNamePart(selectedEvaluator.name)}-control-for-${sanitizeControlNamePart(agentName)}`;
+    return {
+      id: 0,
+      name,
+      control: {
+        description: selectedEvaluator.description,
+        enabled: true,
+        execution: 'server' as const,
+        scope: {
+          step_types: ['llm'],
+          stages: ['post'] as ('post' | 'pre')[],
+        },
+        condition: {
+          selector: {
+            path: '*',
           },
-          condition: {
-            selector: {
-              path: '*',
-            },
-            evaluator: {
-              name: selectedEvaluator.id,
-              config: getDefaultConfigForEvaluator(selectedEvaluator.id),
-            },
+          evaluator: {
+            name: selectedEvaluator.id,
+            config: getDefaultConfigForEvaluator(selectedEvaluator.id),
           },
-          action: { decision: 'deny' as const },
         },
-      };
-    }
-
-    return buildJsonDraftControl(agentName);
+        action: { decision: 'deny' as const },
+      },
+    };
   }, [selectedEvaluator, agentName]);
 
   const columns: ColumnDef<EvaluatorInfo & { id: string }>[] = [
@@ -255,7 +219,7 @@ export function AddNewControlModal({
             </Button>
           </Group>
           <Text size="sm" c="dimmed">
-            Select an evaluator to create a new control or start from JSON
+            Select an evaluator to create a new control
           </Text>
         </Box>
         <Divider />
@@ -276,30 +240,20 @@ export function AddNewControlModal({
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
               />
-              <Group gap="md" wrap="nowrap">
-                <Button
-                  variant="outline"
+              <Text size="sm" c="dimmed">
+                Learn here on how to add new type of evaluator.{' '}
+                <Text
+                  component="a"
+                  href="https://github.com/agentcontrol/agent-control/blob/main/README.md"
+                  c="blue"
                   size="sm"
-                  data-testid="from-json-button"
-                  onClick={handleFromJsonClick}
+                  td="none"
+                  target="_blank"
+                  rel="noreferrer"
                 >
-                  From JSON
-                </Button>
-                <Text size="sm" c="dimmed">
-                  Learn here on how to add new type of evaluator.{' '}
-                  <Text
-                    component="a"
-                    href="https://github.com/agentcontrol/agent-control/blob/main/README.md"
-                    c="blue"
-                    size="sm"
-                    td="none"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    Docs ↗
-                  </Text>
+                  Docs ↗
                 </Text>
-              </Group>
+              </Text>
             </Group>
 
             {/* Table or Empty State */}
@@ -353,7 +307,6 @@ export function AddNewControlModal({
               control={draftControl}
               agentId={agentId}
               mode="create"
-              initialEditorMode={selectedEvaluator ? 'form' : 'json'}
               onClose={handleEditModalClose}
               onSuccess={handleEditModalSuccess}
             />

ui/src/core/page-components/agent-detail/modals/edit-control/control-condition.ts

@@ -2,6 +2,9 @@ import type { ControlDefinition } from '@/core/api/types';
 import type { AnyEvaluatorDefinition } from '@/core/evaluators';
 import { getEvaluator } from '@/core/evaluators';
 
+const COMPOSITE_CONDITION_EDITING_MESSAGE =
+  'This control uses a composite condition tree. This PR keeps the old single-condition UI, so saving will preserve the existing tree without editing it.';
+
 export type LeafConditionDetails = {
   selectorPath: string;
   evaluatorName: string;
@@ -13,6 +16,7 @@ export type ControlConditionState = {
   evaluatorId: string;
   evaluator: AnyEvaluatorDefinition | undefined;
   canEditLeafCondition: boolean;
+  conditionEditingMessage: string | null;
 };
 
 function getLeafConditionDetails(
@@ -42,6 +46,9 @@ export function getControlConditionState(
     evaluatorId,
     evaluator,
     canEditLeafCondition: Boolean(leafCondition),
+    conditionEditingMessage: leafCondition
+      ? null
+      : COMPOSITE_CONDITION_EDITING_MESSAGE,
   };
 }