feat: restore OOTB workflow reverse-matching on edit with Radix Select guard

Re-introduce resolveWorkflowState to match stored workflow fields against
OOTB workflows when editing a scheduled session. Uses a workflowResolved
state guard to keep the Skeleton visible until resolution completes,
ensuring Radix Select never sees a post-mount value change.

Adds e2e tests for OOTB workflow edit (verifies name shown), no-workflow
edit (verifies "General chat"), and updates the custom workflow edit test
to use non-OOTB fields.

Author: tiwillia

components/frontend/src/app/projects/[name]/scheduled-sessions/_components/scheduled-session-form.tsx

@@ -101,6 +101,29 @@ function resolveSchedulePreset(schedule: string): { preset: string; customCron:
   return { preset: "custom", customCron: schedule };
 }
 
+function resolveWorkflowState(
+  activeWorkflow: WorkflowSelection | undefined,
+  ootbWorkflows: { id: string; gitUrl: string; branch: string; path?: string }[]
+): { selectedWorkflow: string; customGitUrl: string; customBranch: string; customPath: string } {
+  if (!activeWorkflow) {
+    return { selectedWorkflow: "none", customGitUrl: "", customBranch: "main", customPath: "" };
+  }
+  const match = ootbWorkflows.find(
+    (w) => w.gitUrl === activeWorkflow.gitUrl
+      && w.branch === activeWorkflow.branch
+      && (w.path ?? "") === (activeWorkflow.path ?? "")
+  );
+  if (match) {
+    return { selectedWorkflow: match.id, customGitUrl: "", customBranch: "main", customPath: "" };
+  }
+  return {
+    selectedWorkflow: "custom",
+    customGitUrl: activeWorkflow.gitUrl,
+    customBranch: activeWorkflow.branch || "main",
+    customPath: activeWorkflow.path ?? "",
+  };
+}
+
 export function ScheduledSessionForm({ projectName, mode, initialData }: ScheduledSessionFormProps) {
   const router = useRouter();
   const isEdit = mode === "edit";
@@ -122,6 +145,9 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
   const [customGitUrl, setCustomGitUrl] = useState(initialWorkflow.customGitUrl);
   const [customBranch, setCustomBranch] = useState(initialWorkflow.customBranch);
   const [customPath, setCustomPath] = useState(initialWorkflow.customPath);
+  const [workflowResolved, setWorkflowResolved] = useState(
+    !isEdit || !initialData?.sessionTemplate.activeWorkflow
+  );
   const [repos, setRepos] = useState<SessionRepo[]>(
     isEdit && initialData?.sessionTemplate.repos ? [...initialData.sessionTemplate.repos] : []
   );
@@ -184,8 +210,24 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
     }
   }, [modelsData?.defaultModel, form, isEdit, initialData]);
 
-  // Workflow state is initialized from initialData in useState above.
-  // No useEffect needed — avoids timing issues with Radix Select.
+  // Resolve workflow state once OOTB workflows finish loading. The Skeleton
+  // guard on the Select (workflowsLoading || !workflowResolved) ensures Radix
+  // never sees a value change after mount — the Select only mounts after this
+  // effect has set the final selectedWorkflow value.
+  useEffect(() => {
+    if (workflowResolved) return;
+    if (workflowsLoading) return;
+
+    const resolved = resolveWorkflowState(
+      initialData!.sessionTemplate.activeWorkflow,
+      ootbWorkflows
+    );
+    setSelectedWorkflow(resolved.selectedWorkflow);
+    setCustomGitUrl(resolved.customGitUrl);
+    setCustomBranch(resolved.customBranch);
+    setCustomPath(resolved.customPath);
+    setWorkflowResolved(true);
+  }, [workflowResolved, workflowsLoading, ootbWorkflows, initialData]);
 
   const effectiveCron = schedulePreset === "custom" ? (customCron ?? "") : schedulePreset;
   const nextRuns = useMemo(() => getNextRuns(effectiveCron, 3), [effectiveCron]);
@@ -444,7 +486,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
 
               <div className="space-y-2">
                 <FormLabel>Workflow</FormLabel>
-                {workflowsLoading ? (
+                {(workflowsLoading || !workflowResolved) ? (
                   <Skeleton className="h-10 w-full" />
                 ) : (
                   <Select
@@ -469,7 +511,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
                     </SelectContent>
                   </Select>
                 )}
-                {selectedWorkflow === "custom" && (
+                {selectedWorkflow === "custom" && workflowResolved && (
                   <div className="grid grid-cols-1 sm:grid-cols-3 gap-3 pt-1">
                     <div className="sm:col-span-2 space-y-1">
                       <FormLabel className="text-xs">Git Repository URL *</FormLabel>

e2e/cypress/e2e/scheduled-sessions.cy.ts

@@ -310,6 +310,7 @@ describe('Scheduled Sessions', () => {
 
     it('should edit the custom workflow on an existing scheduled session', () => {
       // Create a scheduled session with a custom workflow via API
+      // Use fields that do NOT match any OOTB workflow so it stays as "Custom workflow..."
       cy.request({
         method: 'POST',
         url: `/api/projects/${workspaceSlug}/scheduled-sessions`,
@@ -323,9 +324,9 @@ describe('Scheduled Sessions', () => {
             llmSettings: { model: 'claude-sonnet-4-20250514', temperature: 0.7, maxTokens: 4000 },
             timeout: 300,
             activeWorkflow: {
-              gitUrl: 'https://github.com/ambient-code/workflows.git',
+              gitUrl: 'https://github.com/my-org/my-custom-workflows.git',
               branch: 'main',
-              path: 'workflows/bugfix',
+              path: 'workflows/custom-one',
             },
           },
         },
@@ -336,22 +337,21 @@ describe('Scheduled Sessions', () => {
         // Navigate to edit page
         cy.visit(`/projects/${workspaceSlug}/scheduled-sessions/${scheduleName}/edit`)
 
-        // Wait for form to load — workflow fields should be pre-populated
+        // Wait for form to load — should show "Custom workflow..." (no OOTB match)
         cy.get('[data-testid="workflow-select"]', { timeout: 10000 })
           .should('contain.text', 'Custom workflow...')
 
         // Verify pre-populated custom workflow fields
         cy.get('[data-testid="workflow-git-url"]')
-          .should('have.value', 'https://github.com/ambient-code/workflows.git')
+          .should('have.value', 'https://github.com/my-org/my-custom-workflows.git')
         cy.get('[data-testid="workflow-branch"]')
           .should('have.value', 'main')
         cy.get('[data-testid="workflow-path"]')
-          .should('have.value', 'workflows/bugfix')
+          .should('have.value', 'workflows/custom-one')
 
         // Update the workflow fields
-        cy.get('[data-testid="workflow-git-url"]').clear().type('https://github.com/ambient-code/workflows.git')
         cy.get('[data-testid="workflow-branch"]').clear().type('develop')
-        cy.get('[data-testid="workflow-path"]').clear().type('workflows/triage')
+        cy.get('[data-testid="workflow-path"]').clear().type('workflows/custom-two')
 
         // Submit
         cy.get('[data-testid="scheduled-session-submit"]').click()
@@ -367,12 +367,64 @@ describe('Scheduled Sessions', () => {
         }).then((getResp) => {
           expect(getResp.status).to.eq(200)
           const workflow = getResp.body.sessionTemplate.activeWorkflow
-          expect(workflow.gitUrl).to.eq('https://github.com/ambient-code/workflows.git')
+          expect(workflow.gitUrl).to.eq('https://github.com/my-org/my-custom-workflows.git')
           expect(workflow.branch).to.eq('develop')
-          expect(workflow.path).to.eq('workflows/triage')
+          expect(workflow.path).to.eq('workflows/custom-two')
         })
       })
     })
+
+    it('should show OOTB workflow name when editing a session created with an OOTB workflow', () => {
+      // Create a session with fields that match the "bugfix" OOTB workflow
+      cy.request({
+        method: 'POST',
+        url: `/api/projects/${workspaceSlug}/scheduled-sessions`,
+        headers: apiHeaders(),
+        body: {
+          displayName: 'OOTB Workflow Edit Test',
+          schedule: '0 * * * *',
+          sessionTemplate: {
+            initialPrompt: 'run bugfix workflow',
+            runnerType: 'claude-code',
+            llmSettings: { model: 'claude-sonnet-4-20250514', temperature: 0.7, maxTokens: 4000 },
+            timeout: 300,
+            activeWorkflow: {
+              gitUrl: 'https://github.com/ambient-code/workflows.git',
+              branch: 'main',
+              path: 'workflows/bugfix',
+            },
+          },
+        },
+      }).then((resp) => {
+        expect(resp.status).to.be.oneOf([200, 201])
+        const scheduleName = resp.body.name
+
+        // Navigate to edit page
+        cy.visit(`/projects/${workspaceSlug}/scheduled-sessions/${scheduleName}/edit`)
+
+        // The workflow select should show the OOTB workflow name, not "Custom workflow..."
+        cy.get('[data-testid="workflow-select"]', { timeout: 10000 })
+          .should('contain.text', 'Fix a bug')
+
+        // Custom workflow fields should NOT be visible (OOTB selected, not custom)
+        cy.get('[data-testid="workflow-git-url"]').should('not.exist')
+      })
+    })
+
+    it('should show General chat when editing a session with no workflow', () => {
+      // Create a session without any workflow
+      createScheduledSessionViaApi('0 * * * *', 'No Workflow Edit Test').then((scheduleName) => {
+        // Navigate to edit page
+        cy.visit(`/projects/${workspaceSlug}/scheduled-sessions/${scheduleName}/edit`)
+
+        // The workflow select should show "General chat"
+        cy.get('[data-testid="workflow-select"]', { timeout: 10000 })
+          .should('contain.text', 'General chat')
+
+        // Custom workflow fields should NOT be visible
+        cy.get('[data-testid="workflow-git-url"]').should('not.exist')
+      })
+    })
   })
 
   // ─── Schedule Deletion ────────────────────────────────────────