diff --git a/application/single_app/config.py b/application/single_app/config.py
index 02872ea66..98bde7c3c 100644
--- a/application/single_app/config.py
+++ b/application/single_app/config.py
@@ -101,7 +101,7 @@
 EXECUTOR_TYPE = 'thread'
 EXECUTOR_MAX_WORKERS = 30
 SESSION_TYPE = 'filesystem'
-VERSION = "0.261.270"
+VERSION = "0.261.271"
 IS_DEVELOPMENT = is_development_env_enabled()
 
 # Opt-out for deployments where App Service Easy Auth is active but the platform
diff --git a/application/v2_ui/src/components/ui/SectionCard.tsx b/application/v2_ui/src/components/ui/SectionCard.tsx
new file mode 100644
index 000000000..d0fea615f
--- /dev/null
+++ b/application/v2_ui/src/components/ui/SectionCard.tsx
@@ -0,0 +1,117 @@
+// SectionCard.tsx
+// The distinct card V2 Admin Settings draws every section in, for surfaces outside Admin.
+//
+// Admin's `SettingsSection` owns its card markup inline, alongside schema-driven fields this
+// component knows nothing about. The workflow editor needs the same object -- a header band
+// with the section's icon, a title large enough to find while scrolling, a line of facts, and
+// the Admin status chip -- around controls it lays out itself. The classes match Admin's card
+// (bar one narrow-width allowance, noted below), so a section here and a section there read as
+// the same thing, and so `.admin-field` rows inside resolve their container queries against
+// this card the way they do in Admin.
+//
+// The title takes focus (`tabIndex={-1}`) so an "On this page" jump can land a keyboard or
+// screen reader user on the card it scrolled to, as Admin's index does.
+
+import { clsx } from 'clsx';
+import type { LucideIcon } from 'lucide-react';
+import type { ReactNode } from 'react';
+import type { SectionStatus } from '../../lib/adminSections';
+import { presentSectionStatus } from '../admin/sectionStatusPresentation';
+
+export function SectionCard({
+    id,
+    title,
+    icon: Icon,
+    meta,
+    status = 'none',
+    actions,
+    ariaLabel,
+    headingLevel = 2,
+    className,
+    bodyClassName,
+    children,
+    ...data
+}: {
+    /** The card's DOM id. The title is `${id}-title`, which an index jump focuses. */
+    id: string;
+    title: ReactNode;
+    icon: LucideIcon;
+    /** One line of facts under the title. */
+    meta?: ReactNode;
+    status?: SectionStatus;
+    /** Controls drawn in the header band beside the status chip. */
+    actions?: ReactNode;
+    /**
+     * Names the region instead of its visible title, for a card whose established accessible
+     * name differs from the title it now shows.
+     */
+    ariaLabel?: string;
+    headingLevel?: 2 | 3;
+    className?: string;
+    bodyClassName?: string;
+    children?: ReactNode;
+    [dataAttribute: `data-${string}`]: string | undefined;
+}) {
+    const titleId = `${id}-title`;
+    const presentation = presentSectionStatus(status);
+    const Heading = headingLevel === 3 ? 'h3' : 'h2';
+
+    return (
+        <section
+            id={id}
+            aria-label={ariaLabel}
+            aria-labelledby={ariaLabel ? undefined : titleId}
+            className={clsx(
+                'glass glass-edge rounded-2xl',
+                'admin-settings-distinct scroll-mt-4 border-edge-strong',
+                className,
+            )}
+            {...data}
+        >
+            <div className="flex flex-wrap items-start justify-between gap-3 rounded-t-2xl border-b border-edge-strong bg-surface-2 p-4 sm:px-5">
+                {/* Admin's header, except that the title column asks for 15rem before the chip may
+                    sit beside it, so a narrow card wraps the chip rather than breaking the facts
+                    line mid-word. */}
+                <div className="flex min-w-0 flex-1 basis-60 flex-wrap items-start gap-3">
+                    <span
+                        aria-hidden="true"
+                        className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-edge-strong bg-surface-solid text-text-2"
+                    >
+                        <Icon size={20} />
+                    </span>
+                    <div className="min-w-0 flex-1 basis-40">
+                        <Heading
+                            id={titleId}
+                            tabIndex={-1}
+                            className="text-lg leading-snug font-semibold text-text-1"
+                        >
+                            {title}
+                        </Heading>
+                        {meta ? <p className="mt-1 text-xs text-text-3">{meta}</p> : null}
+                    </div>
+                </div>
+
+                {presentation || actions ? (
+                    <div className="flex max-w-full min-w-0 flex-wrap items-center gap-2">
+                        {presentation ? (
+                            // Free to shrink once it has wrapped onto its own line, so a long
+                            // status at a large text size wraps inside the card instead of past it.
+                            <span
+                                className={clsx(
+                                    'flex max-w-full min-w-0 items-center gap-1 rounded-full border px-2 py-0.5 text-xs',
+                                    presentation.className,
+                                )}
+                            >
+                                <presentation.Icon size={11} aria-hidden="true" className="shrink-0" />
+                                {presentation.label}
+                            </span>
+                        ) : null}
+                        {actions}
+                    </div>
+                ) : null}
+            </div>
+
+            <div className={clsx('admin-section-body p-4 sm:p-5', bodyClassName)}>{children}</div>
+        </section>
+    );
+}
diff --git a/application/v2_ui/src/components/workflows/WorkflowAlertEditor.tsx b/application/v2_ui/src/components/workflows/WorkflowAlertEditor.tsx
index b86932eb7..cdfb768b5 100644
--- a/application/v2_ui/src/components/workflows/WorkflowAlertEditor.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowAlertEditor.tsx
@@ -2,9 +2,18 @@
 // Native alert authoring for personal and group workflows: when to alert, and the rules that decide it.
 
 import { useId } from 'react';
-import { ArrowDown, ArrowUp, Plus, Trash2 } from 'lucide-react';
+import { ArrowDown, ArrowUp, BellRing, Plus, Trash2 } from 'lucide-react';
 import { GlassButton, Toggle } from '../ui/primitives';
+import { SectionCard } from '../ui/SectionCard';
 import { Pill } from '../workspace/primitives';
+import {
+    WorkflowCardHelp,
+    WorkflowField,
+    WorkflowFieldEmphasis,
+    WorkflowFieldList,
+    workflowFieldInputClass,
+    type WorkflowCardFrame,
+} from './WorkflowField';
 import {
     describeWorkflowAlertCondition,
     newWorkflowAlertRule,
@@ -167,15 +176,18 @@ function optionValue(value: unknown, allowed: readonly string[], fallback: strin
     return text && allowed.includes(text) ? text : fallback;
 }
 
-function Select({ label, value, options, onChange, disabled }: {
+function Select({ id, label, value, options, onChange, disabled, className }: {
+    id?: string;
     label: string;
     value: string;
     options: Option[];
     onChange: (value: string) => void;
     disabled?: boolean;
+    /** Replaces the rule-row field styling, for a select drawn in a card's field row. */
+    className?: string;
 }) {
     return (
-        <select className={fieldClass} aria-label={label} value={value} disabled={disabled}
+        <select id={id} className={className ?? fieldClass} aria-label={label} value={value} disabled={disabled}
             onChange={(event) => onChange(event.target.value)}>
             {withCurrent(options, value).map((option) => <option key={option.value} value={option.value}>{option.label}</option>)}
         </select>
@@ -508,10 +520,13 @@ function AlertRuleRow({
 export function WorkflowAlertEditor({
     workflow,
     scope,
+    card,
     onChange,
 }: {
     workflow: WorkflowDefinition;
     scope: WorkflowScope;
+    /** The Alerts card's place in the editor and how it reads at a glance. */
+    card: WorkflowCardFrame;
     onChange: (update: (workflow: WorkflowDefinition) => WorkflowDefinition) => void;
 }) {
     const titleId = useId();
@@ -548,80 +563,86 @@ export function WorkflowAlertEditor({
         return key;
     });
     const atLimit = rules.length >= WORKFLOW_ALERT_MAX_RULES;
+    const leadsSettings = mode === 'every_run' || mode === 'rules' || rules.length > 0 || usesModel;
 
     return (
-        <section aria-labelledby={titleId} className="space-y-4 rounded-2xl border border-edge p-4">
-            <div>
-                <h3 id={titleId} className="text-base font-semibold text-text-1">Alerts</h3>
-                <p className="mt-0.5 max-w-prose text-xs text-text-3">
-                    Alerts notify you when a run meets a condition you define. A run that matches nothing stays silent.
-                </p>
-            </div>
-            <div className="grid gap-3 sm:grid-cols-2">
-                <label className="min-w-0 text-sm text-text-2">
-                    When to alert
-                    <Select label="When to alert" value={mode} options={MODE_OPTIONS}
+        <SectionCard id={card.id} title="Alerts" icon={BellRing} status={card.status} meta={card.meta}
+            headingLevel={card.headingLevel}>
+            <WorkflowCardHelp>
+                Alerts notify you when a run meets a condition you define. A run that matches nothing stays silent.
+            </WorkflowCardHelp>
+            <WorkflowFieldList>
+                <WorkflowField label="When to alert" htmlFor={`${titleId}-mode`} width="standard">
+                    <Select id={`${titleId}-mode`} label="When to alert" value={mode} options={MODE_OPTIONS}
+                        className={workflowFieldInputClass}
                         onChange={(next) => edit((settings) => ({ ...settings, alert_mode: next }))} />
-                </label>
-                {mode === 'every_run' ? (
-                    <label className="min-w-0 text-sm text-text-2">
-                        Pop-up alert priority
-                        <Select label="Pop-up alert priority" value={priority} options={PRIORITY_OPTIONS}
-                            onChange={(next) => edit((settings) => ({ ...settings, alert_priority: next }))} />
-                    </label>
-                ) : null}
-            </div>
-            {mode === 'rules' || rules.length ? (
-                <div className="space-y-3">
-                    <div className="flex flex-wrap items-center justify-between gap-2">
-                        <h4 className="text-sm font-semibold text-text-1">Alert rules</h4>
-                        {mode === 'rules' ? (
-                            <GlassButton type="button" size="sm" disabled={atLimit}
-                                onClick={() => editRules((current) => [...current, newWorkflowAlertRule()])}>
-                                <Plus size={14} /> Add alert rule
-                            </GlassButton>
+                </WorkflowField>
+            </WorkflowFieldList>
+            {leadsSettings ? (
+                <WorkflowFieldEmphasis emphasis="dependent">
+                    <WorkflowFieldList>
+                        {mode === 'every_run' ? (
+                            <WorkflowField label="Pop-up alert priority" htmlFor={`${titleId}-priority`} width="standard">
+                                <Select id={`${titleId}-priority`} label="Pop-up alert priority" value={priority}
+                                    options={PRIORITY_OPTIONS} className={workflowFieldInputClass}
+                                    onChange={(next) => edit((settings) => ({ ...settings, alert_priority: next }))} />
+                            </WorkflowField>
                         ) : null}
-                    </div>
-                    {mode !== 'rules' ? (
-                        <p className="max-w-prose text-xs text-text-3">
-                            These saved rules send alerts only when you choose “Only when a condition is met”. They are kept, and still checked, when you save.
-                        </p>
-                    ) : null}
-                    {mode === 'rules' && !rules.length ? (
-                        <p className="text-sm text-text-3">No alert rules yet. Add a rule to choose what should notify you.</p>
-                    ) : null}
-                    {mode === 'rules' && atLimit ? (
-                        <p role="status" className="text-xs text-text-3">A workflow can have up to {WORKFLOW_ALERT_MAX_RULES} alert rules.</p>
-                    ) : null}
-                    {rules.length ? (
-                        <ol aria-label="Alert rules" className="list-none space-y-4">
-                            {rules.map((rule, index) => (
-                                <AlertRuleRow key={ruleKeys[index]}
-                                    rule={rule} position={index + 1} count={rules.length} tasks={tasks}
-                                    error={errors.get(index + 1)} workflowScope={workflowScope} soundsEnabled={soundsEnabled}
-                                    onChange={(next) => editRules((current) => current.map((item, itemIndex) => itemIndex === index ? next : item))}
-                                    onMove={(direction) => moveRule(index, direction)}
-                                    onRemove={() => editRules((current) => current.filter((_, itemIndex) => itemIndex !== index))} />
-                            ))}
-                        </ol>
-                    ) : null}
-                    {mode === 'rules' && rules.length ? (
-                        <p className="max-w-prose text-xs text-text-3">
-                            When several rules match the same run, the highest severity wins and every matched rule is listed in the alert.
-                            Info and low severities go to the notification bell only. Medium and above open the pop-up alert.
-                        </p>
-                    ) : null}
-                </div>
-            ) : null}
-            {usesModel ? (
-                <label className="block max-w-md text-sm text-text-2">
-                    If a model evaluated condition cannot be judged
-                    <Select label="If a model evaluated condition cannot be judged" value={onError} options={ON_ERROR_OPTIONS}
-                        onChange={(next) => edit((settings) => ({
-                            ...settings, alert_evaluation: { ...record(settings.alert_evaluation), on_error: next },
-                        }))} />
-                </label>
+                        {mode === 'rules' || rules.length ? (
+                            <div className="space-y-3 py-3">
+                                <div className="flex flex-wrap items-center justify-between gap-2">
+                                    <h4 className="text-sm font-semibold text-text-1">Alert rules</h4>
+                                    {mode === 'rules' ? (
+                                        <GlassButton type="button" size="sm" disabled={atLimit}
+                                            onClick={() => editRules((current) => [...current, newWorkflowAlertRule()])}>
+                                            <Plus size={14} /> Add alert rule
+                                        </GlassButton>
+                                    ) : null}
+                                </div>
+                                {mode !== 'rules' ? (
+                                    <p className="max-w-prose text-xs text-text-3">
+                                        These saved rules send alerts only when you choose “Only when a condition is met”. They are kept, and still checked, when you save.
+                                    </p>
+                                ) : null}
+                                {mode === 'rules' && !rules.length ? (
+                                    <p className="text-sm text-text-3">No alert rules yet. Add a rule to choose what should notify you.</p>
+                                ) : null}
+                                {mode === 'rules' && atLimit ? (
+                                    <p role="status" className="text-xs text-text-3">A workflow can have up to {WORKFLOW_ALERT_MAX_RULES} alert rules.</p>
+                                ) : null}
+                                {rules.length ? (
+                                    <ol aria-label="Alert rules" className="list-none space-y-4">
+                                        {rules.map((rule, index) => (
+                                            <AlertRuleRow key={ruleKeys[index]}
+                                                rule={rule} position={index + 1} count={rules.length} tasks={tasks}
+                                                error={errors.get(index + 1)} workflowScope={workflowScope} soundsEnabled={soundsEnabled}
+                                                onChange={(next) => editRules((current) => current.map((item, itemIndex) => itemIndex === index ? next : item))}
+                                                onMove={(direction) => moveRule(index, direction)}
+                                                onRemove={() => editRules((current) => current.filter((_, itemIndex) => itemIndex !== index))} />
+                                        ))}
+                                    </ol>
+                                ) : null}
+                                {mode === 'rules' && rules.length ? (
+                                    <p className="max-w-prose text-xs text-text-3">
+                                        When several rules match the same run, the highest severity wins and every matched rule is listed in the alert.
+                                        Info and low severities go to the notification bell only. Medium and above open the pop-up alert.
+                                    </p>
+                                ) : null}
+                            </div>
+                        ) : null}
+                        {usesModel ? (
+                            <WorkflowField label="If a model evaluated condition cannot be judged" htmlFor={`${titleId}-on-error`}
+                                width="standard">
+                                <Select id={`${titleId}-on-error`} label="If a model evaluated condition cannot be judged"
+                                    value={onError} options={ON_ERROR_OPTIONS} className={workflowFieldInputClass}
+                                    onChange={(next) => edit((settings) => ({
+                                        ...settings, alert_evaluation: { ...record(settings.alert_evaluation), on_error: next },
+                                    }))} />
+                            </WorkflowField>
+                        ) : null}
+                    </WorkflowFieldList>
+                </WorkflowFieldEmphasis>
             ) : null}
-        </section>
+        </SectionCard>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowAlertSummary.tsx b/application/v2_ui/src/components/workflows/WorkflowAlertSummary.tsx
index 9a674a045..02de10bee 100644
--- a/application/v2_ui/src/components/workflows/WorkflowAlertSummary.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowAlertSummary.tsx
@@ -1,53 +1,39 @@
 // WorkflowAlertSummary.tsx
 // Read-only summary of a workflow's stored alerts, for viewers who cannot manage the workflow.
 
-import { useId } from 'react';
+import { BellRing } from 'lucide-react';
 import {
     workflowAlertSummary,
-    type WorkflowAlertMode,
-    type WorkflowAlertPriority,
+    WORKFLOW_ALERT_MODE_LABELS,
+    WORKFLOW_ALERT_PRIORITY_LABELS,
 } from '../../lib/workflowAlerts';
 import type { WorkflowDefinition } from '../../lib/workflowEditor';
+import { SectionCard } from '../ui/SectionCard';
+import type { WorkflowCardFrame } from './WorkflowField';
 
-// The alert editor's own option labels, so both views describe a setting the same way.
-const MODE_LABELS: Record<WorkflowAlertMode, string> = {
-    off: 'Never notify me',
-    rules: 'Only when a condition is met',
-    every_run: 'On every run',
-};
-const PRIORITY_LABELS: Record<WorkflowAlertPriority, string> = {
-    none: 'No notification',
-    low: 'Low priority',
-    medium: 'Medium priority',
-    high: 'High priority',
-};
+/** One fact, label beside value on a wide card, the way Admin shows a readout. */
+function SummaryRow({ term, children }: { term: string; children: string }) {
+    return (
+        <div className="admin-field admin-field-inline py-3" data-field-width="wide">
+            <dt className="admin-field-heading text-sm font-semibold text-text-1">{term}</dt>
+            <dd className="admin-field-control text-sm text-text-2">{children}</dd>
+        </div>
+    );
+}
 
-export function WorkflowAlertSummary({ workflow }: { workflow: WorkflowDefinition }) {
-    const titleId = useId();
+export function WorkflowAlertSummary({ workflow, card }: { workflow: WorkflowDefinition; card: WorkflowCardFrame }) {
     const summary = workflowAlertSummary(workflow);
     return (
-        <section aria-labelledby={titleId} className="space-y-3 rounded-2xl border border-edge p-4">
-            <h3 id={titleId} className="text-base font-semibold text-text-1">Alerts</h3>
-            <dl className="grid gap-3 text-sm sm:grid-cols-3">
-                <div>
-                    <dt className="text-xs text-text-3">When to alert</dt>
-                    <dd className="text-text-1">{MODE_LABELS[summary.mode]}</dd>
-                </div>
-                <div>
-                    <dt className="text-xs text-text-3">Pop-up priority</dt>
-                    <dd className="text-text-1">{PRIORITY_LABELS[summary.priority]}</dd>
-                </div>
-                <div>
-                    <dt className="text-xs text-text-3">Alert rules</dt>
-                    <dd className="text-text-1">{summary.ruleCount === 1 ? '1 rule' : `${summary.ruleCount} rules`}</dd>
-                </div>
+        <SectionCard id={card.id} title="Alerts" icon={BellRing} status={card.status} meta={card.meta}
+            headingLevel={card.headingLevel}>
+            <dl className="divide-y divide-edge-strong">
+                <SummaryRow term="When to alert">{WORKFLOW_ALERT_MODE_LABELS[summary.mode]}</SummaryRow>
+                <SummaryRow term="Pop-up priority">{WORKFLOW_ALERT_PRIORITY_LABELS[summary.priority]}</SummaryRow>
+                <SummaryRow term="Alert rules">{summary.ruleCount === 1 ? '1 rule' : `${summary.ruleCount} rules`}</SummaryRow>
                 {summary.optionSummary.length ? (
-                    <div className="sm:col-span-3">
-                        <dt className="text-xs text-text-3">Pop-up options</dt>
-                        <dd className="text-text-1">{summary.optionSummary.join(' · ')}</dd>
-                    </div>
+                    <SummaryRow term="Pop-up options">{summary.optionSummary.join(' · ')}</SummaryRow>
                 ) : null}
             </dl>
-        </section>
+        </SectionCard>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowAskAiTab.tsx b/application/v2_ui/src/components/workflows/WorkflowAskAiTab.tsx
index f29e4e67d..394fb9037 100644
--- a/application/v2_ui/src/components/workflows/WorkflowAskAiTab.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowAskAiTab.tsx
@@ -43,18 +43,20 @@ export function WorkflowAssistElapsed({ startedAt, testId }: { startedAt: number
 }
 
 /** The footer button that opens the side panel on Ask AI. */
-export function WorkflowAskAiToggle({ id, open, controls, onToggle }: {
+export function WorkflowAskAiToggle({ id, open, controls, onToggle, labelAlwaysVisible = false }: {
     id: string;
     open: boolean;
     controls: string;
     onToggle: () => void;
+    /** Show the words at every width, where the toggles have a row of their own. */
+    labelAlwaysVisible?: boolean;
 }) {
     return (
         <GlassButton id={id} type="button" className="shrink-0" aria-label="Ask AI" aria-expanded={open}
             aria-controls={open ? controls : undefined} onClick={onToggle}>
             {/* Below sm an icon stands in for the label so Cancel and Save stay on one line. */}
-            <Sparkles size={16} aria-hidden="true" className="sm:hidden" />
-            <span className="hidden sm:inline">Ask AI</span>
+            {labelAlwaysVisible ? null : <Sparkles size={16} aria-hidden="true" className="sm:hidden" />}
+            <span className={labelAlwaysVisible ? undefined : 'hidden sm:inline'}>Ask AI</span>
         </GlassButton>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowChangeTracking.tsx b/application/v2_ui/src/components/workflows/WorkflowChangeTracking.tsx
index da7911536..22da649c9 100644
--- a/application/v2_ui/src/components/workflows/WorkflowChangeTracking.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowChangeTracking.tsx
@@ -633,11 +633,13 @@ export function WorkflowEditorSidePanel({ id, tabs, className, selected: selecte
 }
 
 /** The footer button that opens and closes the side panel, with the number of unsaved changes. */
-export function WorkflowChangesToggle({ id, open, controls, onToggle }: {
+export function WorkflowChangesToggle({ id, open, controls, onToggle, labelAlwaysVisible = false }: {
     id: string;
     open: boolean;
     controls: string;
     onToggle: () => void;
+    /** Show the word at every width, where the toggles have a row of their own. */
+    labelAlwaysVisible?: boolean;
 }) {
     const tracking = useWorkflowChanges();
     if (!tracking) return null;
@@ -646,8 +648,8 @@ export function WorkflowChangesToggle({ id, open, controls, onToggle }: {
         <GlassButton id={id} type="button" className="mr-auto shrink-0" aria-label={`Changes (${count} unsaved)`}
             aria-expanded={open} aria-controls={open ? controls : undefined} onClick={onToggle}>
             {/* Below sm an icon stands in for the label so Cancel and Save stay on one line. */}
-            <FileDiff size={16} aria-hidden="true" className="sm:hidden" />
-            <span className="hidden sm:inline">Changes</span>
+            {labelAlwaysVisible ? null : <FileDiff size={16} aria-hidden="true" className="sm:hidden" />}
+            <span className={labelAlwaysVisible ? undefined : 'hidden sm:inline'}>Changes</span>
             {count ? (
                 <span aria-hidden="true" className="rounded-full bg-surface-2 px-2 text-xs font-semibold text-text-1">{count}</span>
             ) : null}
diff --git a/application/v2_ui/src/components/workflows/WorkflowDocumentPicker.tsx b/application/v2_ui/src/components/workflows/WorkflowDocumentPicker.tsx
index f8ca8cfab..9833e17a1 100644
--- a/application/v2_ui/src/components/workflows/WorkflowDocumentPicker.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowDocumentPicker.tsx
@@ -71,6 +71,7 @@ export function WorkflowDocumentPicker({
     emptyDescription,
     hideAliasFields = false,
     retainRequestedGroupScope = false,
+    hideTitle = false,
 }: {
     scope: WorkflowScope;
     references: WorkflowReferenceInput[];
@@ -83,6 +84,8 @@ export function WorkflowDocumentPicker({
     emptyDescription?: string;
     hideAliasFields?: boolean;
     retainRequestedGroupScope?: boolean;
+    /** Leave the title to a surrounding card that already names the picker; the description stays. */
+    hideTitle?: boolean;
 }) {
     const userId = useBootstrapStore((state) => state.data?.user?.id ?? '');
     const groups = useBootstrapStore((state) => state.data?.scope?.groups ?? []);
@@ -175,8 +178,8 @@ export function WorkflowDocumentPicker({
     return (
         <div className="space-y-3">
             <div>
-                <p className="text-sm font-medium text-text-1">{title}</p>
-                <p className="text-xs text-text-3">
+                {hideTitle ? null : <p className="text-sm font-medium text-text-1">{title}</p>}
+                <p className={hideTitle ? 'max-w-[72ch] text-[0.8125rem] leading-relaxed text-text-3' : 'text-xs text-text-3'}>
                     {description ?? (
                         <>
                             These are shared evidence sources for the whole workflow. Each task can use
@@ -280,9 +283,9 @@ export function WorkflowDocumentPicker({
                                 return (
                                     <li
                                         key={`${source.key}:${documentId(document)}`}
-                                        className="flex items-center justify-between gap-2 rounded-xl border border-edge p-2"
+                                        className="flex flex-wrap items-center justify-between gap-2 rounded-xl border border-edge p-2"
                                     >
-                                        <div className="min-w-0">
+                                        <div className="min-w-0 flex-1 basis-40">
                                             <p className="truncate text-sm text-text-1">{title}</p>
                                             <p className="truncate text-xs text-text-3">
                                                 {document.file_name ? String(document.file_name) : documentId(document)}
diff --git a/application/v2_ui/src/components/workflows/WorkflowEditorDialog.tsx b/application/v2_ui/src/components/workflows/WorkflowEditorDialog.tsx
index 3a9edef1c..bd75914e7 100644
--- a/application/v2_ui/src/components/workflows/WorkflowEditorDialog.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowEditorDialog.tsx
@@ -1,14 +1,37 @@
 // WorkflowEditorDialog.tsx
-// Native V2 workflow create/edit dialog.
+// Native V2 workflow create/edit editor.
+//
+// One editor, two frames. In a workspace it is a routed page (`WorkflowEditorPage`) in the V2
+// Admin Settings wide frame: a header with the actions, the cards, and an On this page index of
+// the cards and their status. Chat's proposal card opens the same editor as a dialog, where the
+// conversation should stay underneath. The cards, change tracking, Ask AI, undo and redo, and
+// validation are identical in both; only the frame and how Close leaves differ.
 
-import { Fragment, useCallback, useEffect, useId, useMemo, useRef, useState, type Dispatch, type SetStateAction } from 'react';
-import { AlertTriangle, Plus, Redo2, Undo2 } from 'lucide-react';
+import {
+    Fragment, useCallback, useEffect, useId, useMemo, useRef, useState,
+    type Dispatch, type KeyboardEvent as ReactKeyboardEvent, type SetStateAction,
+} from 'react';
+import { AlertTriangle, ArrowLeft, GitBranch, Lock, Plus, Redo2, Undo2 } from 'lucide-react';
 import { ConfirmDialog } from '../ui/ConfirmDialog';
 import { Modal } from '../ui/Modal';
-import { GlassButton, Toggle } from '../ui/primitives';
+import { SectionCard } from '../ui/SectionCard';
+import { GlassButton } from '../ui/primitives';
 import { Pill } from '../workspace/primitives';
+import { SettingsIndex, type SettingsIndexEntry } from '../admin/SettingsIndex';
 import { WorkflowDocumentPicker } from './WorkflowDocumentPicker';
 import { WorkflowAgentPicker, WorkflowModelPicker, WorkflowTaskFields } from './WorkflowTaskFields';
+import {
+    WorkflowCardHelp,
+    WorkflowField,
+    WorkflowFieldEmphasis,
+    WorkflowFieldList,
+    WorkflowReadout,
+    WorkflowSwitch,
+    WorkflowSwitchGrid,
+    workflowFieldInputClass,
+    type WorkflowCardFrame,
+} from './WorkflowField';
+import { WORKFLOW_EDITOR_SECTION_ICONS } from './workflowEditorSectionIcons';
 import { WorkflowFieldDraftsProvider, workflowDraftOwners } from './WorkflowFieldDrafts';
 import { WorkflowHistoryBoundary, useWorkflowAuthoringHistory } from './WorkflowAuthoringHistory';
 import { WorkflowStructuredList } from './WorkflowStructuredList';
@@ -53,9 +76,9 @@ import {
     workflowForFlowPreview,
     workflowForSave,
     workflowMonitorFileSyncConfig,
+    workflowScheduleTimezones,
     workflowScopeKey,
     workflowValidationErrors,
-    workflowAgentKey,
     WORKFLOW_FILE_SYNC_SOURCE_UNAVAILABLE_CODE,
     type WorkflowDefinition,
     type WorkflowEditorOptions,
@@ -63,18 +86,17 @@ import {
     type WorkflowScope,
     type WorkflowTask,
 } from '../../lib/workflowEditor';
-
-const inputClass = 'w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 placeholder:text-text-3 focus:border-accent focus:outline-none';
-const textareaClass = `${inputClass} min-h-24`;
+import {
+    workflowEditorSections,
+    workflowRunnerSummary,
+    WORKFLOW_EDITOR_SECTION_LABELS,
+    type WorkflowEditorSectionId,
+} from '../../lib/workflowEditorSections';
 
 function fieldId(prefix: string, name: string): string {
     return `${prefix}-${name}`;
 }
 
-function fieldLabel(name: string, required = false) {
-    return `${name}${required ? ' *' : ''}`;
-}
-
 function setTaskAt(
     tasks: WorkflowTask[],
     taskId: string,
@@ -88,31 +110,38 @@ function sidePanelBesideEditor(): boolean {
     return typeof window.matchMedia !== 'function' || window.matchMedia('(min-width: 80rem)').matches;
 }
 
-/** Where Jump goes when a change has no element of its own on screen: the section it belongs to. */
-function changeSection(root: HTMLElement, key: string): HTMLElement | null {
+/** The card a workflow-level field is drawn in, for a jump that finds nothing closer. */
+const WORKFLOW_FIELD_CARDS: Readonly<Partial<Record<string, WorkflowEditorSectionId>>> = {
+    schedule: 'trigger',
+    is_enabled: 'trigger',
+    file_sync: 'file-sync',
+    error_handling: 'execution',
+    durable_execution: 'execution',
+    chat_capabilities_enabled: 'execution',
+    limits: 'limits',
+    alerts: 'alerts',
+};
+
+/**
+ * Where Jump goes when a change has no element of its own on screen: the card it belongs to.
+ * `cardFor` turns a card's id into its element id, which is unique to this editor.
+ */
+function changeSection(root: HTMLElement, key: string, cardFor: (id: WorkflowEditorSectionId) => string): HTMLElement | null {
     const info = parseWorkflowChangeKey(key);
     if (info.scope === 'workflow' && info.field === 'file_sync') {
         const fileSync = root.querySelector('[aria-label="File Sync sources"]')?.closest<HTMLElement>('section');
         if (fileSync) return fileSync;
     }
-    const label = info.scope === 'reference' || info.scope === 'order' && info.list === 'references' ? 'Workflow shared references'
-        : info.scope !== 'workflow' || info.field === 'definition_version' ? 'Workflow tasks' : 'Workflow basics';
-    return root.querySelector<HTMLElement>(`section[aria-label="${label}"]`);
+    const card: WorkflowEditorSectionId = info.scope === 'reference' || info.scope === 'order' && info.list === 'references' ? 'references'
+        : info.scope !== 'workflow' || info.field === 'definition_version' ? 'tasks'
+            : WORKFLOW_FIELD_CARDS[info.field] ?? 'basics';
+    return root.querySelector<HTMLElement>(`#${CSS.escape(cardFor(card))}`)
+        ?? root.querySelector<HTMLElement>(`#${CSS.escape(cardFor('basics'))}`);
 }
 
 /** Where Jump goes: a change from the Changes tab, or one Ask AI made. */
 type WorkflowJumpChange = Pick<WorkflowChange, 'key' | 'target'>;
 
-function workflowRunnerSummary(workflow: WorkflowDefinition, options: WorkflowEditorOptions): string {
-    if (workflow.runner_type === 'agent') {
-        const agent = options.agents.find((item) => workflowAgentKey(item) === workflowAgentKey(workflow.selected_agent));
-        return agent?.display_name || agent?.name || 'Agent not selected';
-    }
-    const model = options.models.find((item) =>
-        item.endpoint_id === workflow.model_endpoint_id && item.model_id === workflow.model_id);
-    return model?.label || 'App default model';
-}
-
 export function WorkflowEditorDialog({
     scope,
     workflow,
@@ -125,6 +154,8 @@ export function WorkflowEditorDialog({
     initialDraft = null,
     onSaveOverride,
     onReload,
+    presentation = 'dialog',
+    pageScopeLabel,
 }: {
     scope: WorkflowScope;
     workflow: WorkflowDefinition | null;
@@ -146,6 +177,14 @@ export function WorkflowEditorDialog({
      * changed after the editor opened; without it, the reader closes and reopens the editor.
      */
     onReload?: () => Promise<void>;
+    /**
+     * `page` is the routed editor in a workspace: Back and Cancel leave through `onClose`, and the
+     * router's leave guard, not this editor, asks about unsaved changes. `dialog` is the modal
+     * Chat opens for a proposal, which asks before discarding.
+     */
+    presentation?: 'dialog' | 'page';
+    /** The workspace the page names under its title, such as a group's name. */
+    pageScopeLabel?: string;
 }) {
     const [original] = useState<WorkflowDefinition | null>(() =>
         workflow ? structuredClone(workflow) : null,
@@ -176,6 +215,10 @@ export function WorkflowEditorDialog({
     const askAiToggleId = `${sidePanelBaseId}-ask-ai-toggle`;
     const askAiInputId = `${sidePanelBaseId}-ask-ai-input`;
     const sidePanelId = `${sidePanelBaseId}-side-panel`;
+    // Each card carries a DOM id the index jumps to; its title is `${id}-title`. The prefix keeps a
+    // second editor (Chat's proposal dialog over a page, say) from sharing ids with this one.
+    const cardIdPrefix = `workflow-editor-${sidePanelBaseId.replace(/[^A-Za-z0-9_-]/g, '')}`;
+    const cardId = (section: WorkflowEditorSectionId) => `${cardIdPrefix}-${section}`;
     const scopeKey = workflowScopeKey(scope);
     const fieldDrafts = useMemo(() => ({
         store: history.session.fields,
@@ -384,7 +427,7 @@ export function WorkflowEditorDialog({
                 setJump({ change, retry: false, sequence: ++focusSequence.current });
                 return;
             }
-            const target = exact ?? changeSection(root, change.key);
+            const target = exact ?? changeSection(root, change.key, cardId);
             if (!target) return;
             for (let details = target.closest('details'); details; details = details.parentElement?.closest('details') ?? null) {
                 details.open = true;
@@ -490,6 +533,12 @@ export function WorkflowEditorDialog({
             authoring.cancel();
             return;
         }
+        if (presentation === 'page') {
+            // Leaving the page is a navigation, which the workspace's leave guard owns; asking here
+            // as well would ask twice.
+            onClose();
+            return;
+        }
         const pendingChanges = !sameWorkflowDefinition(baseline, current.draft) ||
             history.session.fields.summary(workflowDraftOwners(current.draft)).pending;
         if (pendingChanges && !readOnly) {
@@ -591,423 +640,631 @@ export function WorkflowEditorDialog({
         openAskAi();
     };
 
-    return (
-        <WorkflowFieldDraftsProvider value={fieldDrafts.store}>
-            <WorkflowChangeTrackingScope session={history.session} enabled={!readOnly}>
-            <Modal
-                title={workflow ? 'Edit workflow' : 'Create workflow'}
-                description={`Scope: ${workflowScopeKey(scope)}. ${readOnly ? 'This workflow is read-only.' : 'Changes are saved only when you choose Save workflow.'}`}
-                onClose={close}
-                size={panelOpen ? '2xl' : 'xl'}
-                tall
-                bodyClassName="flex min-h-0"
-                footer={
-                    // A narrow screen can't fit the toggles, Cancel and Save on one line once Ask AI is
-                    // offered, so Cancel and Save move together to a second line instead of wrapping a label.
-                    <div className="flex min-w-0 flex-1 flex-wrap items-center justify-end gap-2">
-                        {askAiAvailable ? <WorkflowAskAiToggle id={askAiToggleId} open={panelOpen && panelTab === 'askai'}
-                            controls={sidePanelId}
-                            onToggle={() => (panelOpen && panelTab === 'askai' ? closeChanges(false) : openAskAi())} /> : null}
-                        {!readOnly ? <WorkflowChangesToggle id={changesToggleId} open={panelOpen && panelTab === 'changes'}
-                            controls={sidePanelId}
-                            onToggle={() => (panelOpen && panelTab === 'changes' ? closeChanges(false) : openChanges('tab'))} /> : null}
-                        <div className="flex shrink-0 items-center gap-2">
-                            <GlassButton type="button" onClick={close} disabled={saving}>
-                                {readOnly ? 'Close' : 'Cancel'}
-                            </GlassButton>
-                            {!readOnly ? (
-                                <GlassButton type="button" variant="primary" disabled={interactionDisabled || saving || Boolean(authoring.pending) || Boolean(history.pending) || draftLocked} onClick={() => void save()}>
-                                    {saving ? 'Saving…' : 'Save workflow'}
-                                </GlassButton>
-                            ) : null}
-                        </div>
+    const sections = useMemo(() => workflowEditorSections(draft, {
+        options,
+        scopeType: scope.type,
+        groupFileSyncEnabled: groupScope && fileSyncSources.status === 'ready' ? fileSyncSources.fileSyncEnabled : null,
+        structuredSurface: surface,
+        scheduleTimezones: workflowScheduleTimezones(options),
+    }).filter((section) => section.id !== 'limits' || !unsupported),
+    [draft, options, scope.type, groupScope, fileSyncSources.status, fileSyncSources.fileSyncEnabled, surface, unsupported]);
+    const sectionFor = (id: WorkflowEditorSectionId) => sections.find((section) => section.id === id);
+    const cardFrame = (id: WorkflowEditorSectionId): WorkflowCardFrame => ({
+        id: cardId(id),
+        status: sectionFor(id)?.status ?? 'none',
+        meta: sectionFor(id)?.meta,
+        headingLevel: 3,
+    });
+    const sectionIcon = (id: WorkflowEditorSectionId) => id === 'tasks' && draft.definition_version === 3
+        ? GitBranch : WORKFLOW_EDITOR_SECTION_ICONS[id];
+    const scrollRef = useRef<HTMLDivElement>(null);
+    const pageTitleRef = useRef<HTMLHeadingElement>(null);
+    const [pendingJump, setPendingJump] = useState<string | null>(null);
+    const page = presentation === 'page';
+    const showIndex = page && !accessLost && !panelOpen && sections.length > 1;
+
+    useEffect(() => {
+        // A routed editor names itself the way an index jump does, so a keyboard or screen reader
+        // user arriving here starts at the title rather than at the top of the document.
+        if (page) pageTitleRef.current?.focus({ preventScroll: true });
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- on arrival only
+    }, []);
+
+    useEffect(() => {
+        if (!pendingJump) return;
+        const target = document.getElementById(pendingJump);
+        if (target) {
+            const reduceMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)').matches;
+            target.scrollIntoView({ behavior: reduceMotion ? 'auto' : 'smooth', block: 'start' });
+            document.getElementById(`${pendingJump}-title`)?.focus({ preventScroll: true });
+        }
+        setPendingJump(null);
+    }, [pendingJump]);
+
+    const indexEntries: SettingsIndexEntry[] = sections.map((section) => ({
+        sectionId: cardId(section.id),
+        label: section.label,
+        groupId: 'workflow',
+        groupLabel: 'Workflow',
+        Icon: sectionIcon(section.id),
+        status: section.status,
+    }));
+
+    const lockUndoWhileDrafting = (event: ReactKeyboardEvent<HTMLDivElement>) => {
+        // Workflow undo and redo wait for Ask AI too.
+        const key = event.key.toLowerCase();
+        if (draftLocked && (event.ctrlKey || event.metaKey) && (key === 'z' || key === 'y')) event.preventDefault();
+    };
+
+    const sidePanelToggles = (
+        <>
+            {askAiAvailable ? <WorkflowAskAiToggle id={askAiToggleId} open={panelOpen && panelTab === 'askai'}
+                controls={sidePanelId} labelAlwaysVisible={page}
+                onToggle={() => (panelOpen && panelTab === 'askai' ? closeChanges(false) : openAskAi())} /> : null}
+            {!readOnly ? <WorkflowChangesToggle id={changesToggleId} open={panelOpen && panelTab === 'changes'}
+                controls={sidePanelId} labelAlwaysVisible={page}
+                onToggle={() => (panelOpen && panelTab === 'changes' ? closeChanges(false) : openChanges('tab'))} /> : null}
+        </>
+    );
+    const closeAndSave = (
+        <div className="flex shrink-0 items-center gap-2">
+            <GlassButton type="button" onClick={close} disabled={saving}>
+                {readOnly ? 'Close' : 'Cancel'}
+            </GlassButton>
+            {!readOnly ? (
+                <GlassButton type="button" variant="primary" disabled={interactionDisabled || saving || Boolean(authoring.pending) || Boolean(history.pending) || draftLocked} onClick={() => void save()}>
+                    {saving ? 'Saving…' : 'Save workflow'}
+                </GlassButton>
+            ) : null}
+        </div>
+    );
+
+    const notices = (
+        <>
+            {unsupported ? (
+                <div role="alert" className="flex gap-2 rounded-xl border border-warn/40 bg-warn/5 p-3 text-sm text-text-2">
+                    <AlertTriangle size={16} aria-hidden="true" className="mt-0.5 shrink-0 text-warn" />
+                    <p>
+                        This workflow uses definition version {draft.definition_version}. V2 can read
+                        it but cannot safely save it without downgrading fields from a newer editor.
+                        {unsupportedFlow ? ` ${unsupportedFlow}` : ''}
+                    </p>
+                </div>
+            ) : null}
+            {!options.can_manage ? (
+                <p role="status" className="flex items-start gap-2 rounded-xl border border-edge-strong bg-surface-2 p-3 text-sm text-text-2">
+                    <Lock size={15} aria-hidden="true" className="mt-0.5 shrink-0 text-text-3" />
+                    You have read-only access to workflows in this scope.
+                </p>
+            ) : null}
+            {options.can_manage && draft.active_run_id ? (
+                <p role="status" className="flex items-start gap-2 rounded-xl border border-edge-strong bg-surface-2 p-3 text-sm text-text-2">
+                    <Lock size={15} aria-hidden="true" className="mt-0.5 shrink-0 text-text-3" />
+                    This workflow has an active run. Cancel it or wait for it to finish before editing.
+                </p>
+            ) : null}
+            {error ? <p ref={errorRef} role="alert" tabIndex={-1} className="rounded-xl border border-danger/40 bg-danger/5 p-3 text-sm text-danger">{error}</p> : null}
+            {!error && allErrors.length ? (
+                <div role="status" className="flex gap-2 rounded-xl border border-warn/40 bg-warn/5 p-3 text-sm text-text-2">
+                    <AlertTriangle size={16} aria-hidden="true" className="mt-0.5 shrink-0 text-warn" />
+                    <div>
+                        <p className="font-medium text-text-1">Resolve these validation issues before saving:</p>
+                        <ul className="mt-1 list-disc pl-5">
+                            {allErrors.map((message) => <li key={message}>{message}</li>)}
+                        </ul>
                     </div>
-                }
-            >
-                <div className={`min-w-0 flex-1 overflow-y-auto px-4 py-3${panelOpen ? ' hidden xl:block' : ''}`}
-                    onKeyDownCapture={(event) => {
-                        // Workflow undo and redo wait for Ask AI too.
-                        const key = event.key.toLowerCase();
-                        if (draftLocked && (event.ctrlKey || event.metaKey) && (key === 'z' || key === 'y')) event.preventDefault();
-                    }}>
-                {assist.pending ? <WorkflowAssistLockBanner pending={assist.pending} onCancel={assist.cancel} /> : null}
-                <WorkflowHistoryBoundary session={history.session}>
-                <div className="space-y-5 p-1">
-                    {unsupported ? (
-                        <div role="alert" className="flex gap-2 rounded-xl bg-warn-soft p-3 text-sm text-warn">
-                            <AlertTriangle size={16} className="mt-0.5 shrink-0" />
-                            <p>
-                                This workflow uses definition version {draft.definition_version}. V2 can read
-                                it but cannot safely save it without downgrading fields from a newer editor.
-                                {unsupportedFlow ? ` ${unsupportedFlow}` : ''}
-                            </p>
-                        </div>
-                    ) : null}
-                    {!options.can_manage ? (
-                        <p role="status" className="rounded-xl bg-warn-soft p-3 text-sm text-warn">
-                            You have read-only access to workflows in this scope.
-                        </p>
-                    ) : null}
-                    {error ? <p ref={errorRef} role="alert" tabIndex={-1} className="rounded-xl bg-danger-soft p-3 text-sm text-danger">{error}</p> : null}
-                    {!error && allErrors.length ? (
-                        <div role="status" className="rounded-xl bg-warn-soft p-3 text-sm text-warn">
-                            <p className="font-medium">Resolve these validation issues before saving:</p>
-                            <ul className="mt-1 list-disc pl-5">
-                                {allErrors.map((message) => <li key={message}>{message}</li>)}
-                            </ul>
-                        </div>
-                    ) : null}
-                    {!accessLost && preserved.length ? (
-                        <div className="rounded-xl border border-edge p-3 text-sm text-text-2">
-                            <p className="font-medium text-text-1">Preserved settings</p>
-                            <p className="mt-1 text-xs text-text-3">
-                                V2 does not edit these legacy settings, but saves keep them intact:
-                                {' '}{preserved.join(', ')}.
-                            </p>
-                        </div>
-                    ) : null}
-                    {draft.definition_version === 3 && !readOnly ? <div className="space-y-2">
-                        <div className="flex flex-wrap gap-2" role="group" aria-label="Workflow edit history" data-workflow-history-controls>
-                            <GlassButton size="sm" disabled={Boolean(historyBlockedReason)} aria-disabled={!history.undoLabel}
-                                className="aria-disabled:cursor-not-allowed aria-disabled:opacity-50"
-                                aria-label="Undo workflow edit" title={historyBlockedReason || (history.undoLabel ? `Undo: ${history.undoLabel}` : 'No workflow edits to undo')}
-                                onClick={() => { if (history.undoLabel) history.session.request('undo'); }}><Undo2 size={14} /> Undo</GlassButton>
-                            <GlassButton size="sm" disabled={Boolean(historyBlockedReason)} aria-disabled={!history.redoLabel}
-                                className="aria-disabled:cursor-not-allowed aria-disabled:opacity-50"
-                                aria-label="Redo workflow edit" title={historyBlockedReason || (history.redoLabel ? `Redo: ${history.redoLabel}` : 'No workflow edits to redo')}
-                                onClick={() => { if (history.redoLabel) history.session.request('redo'); }}><Redo2 size={14} /> Redo</GlassButton>
-                            <span className="self-center text-xs text-text-3">
-                                {history.undoLabel ? `Undo: ${history.undoLabel}. ` : 'No earlier retained edits. '}
-                                Text fields keep native undo.
-                            </span>
-                        </div>
-                        {history.notice ? <p role="status" className="rounded-lg bg-warn-soft p-3 text-xs text-warn">{history.notice}</p> : null}
-                        <div className="flex flex-wrap gap-2" role="group" aria-label="Workflow authoring surface">
-                            <GlassButton size="sm" aria-pressed={surface === 'list'} disabled={saving || Boolean(authoring.pending) || Boolean(history.pending)}
-                                onClick={() => switchSurface('list')}>List authoring</GlassButton>
-                            <GlassButton size="sm" aria-pressed={surface === 'flow'} disabled={saving || Boolean(authoring.pending) || Boolean(history.pending)}
-                                onClick={() => switchSurface('flow')}>Flow authoring</GlassButton>
-                        </div>
-                        <p className="text-xs text-text-3">
-                            Both surfaces edit one unsaved draft. Buttons change execution order and bindings; dragging changes temporary layout only.
-                        </p>
-                    </div> : null}
-                    {!accessLost ? <div ref={authoringRef} className="min-w-0">
-                    <fieldset disabled={readOnly || saving || Boolean(history.pending) || Boolean(authoring.pending) || draftLocked}
-                        aria-busy={draftLocked || undefined} className="min-w-0 space-y-5">
-                        <section className="space-y-4 rounded-2xl border border-edge p-4" aria-label="Workflow basics">
-                            <div className="grid gap-3 md:grid-cols-2">
-                                <WorkflowChangedField changeKey="name">
-                                <label className="text-sm text-text-2">
-                                    {fieldLabel('Workflow name', true)}
-                                    <input
-                                        id={fieldId('workflow', 'name')}
-                                        className={`${inputClass} mt-1`}
-                                        aria-label="Workflow name"
-                                        value={draft.name}
-                                        required
-                                        onChange={(event) => setWorkflow((current) => ({ ...current, name: event.target.value }))}
-                                    />
-                                </label>
-                                </WorkflowChangedField>
-                                <WorkflowChangedField changeKey="runner_type">
-                                <label className="text-sm text-text-2">
-                                    Runner type
-                                    <select
-                                        className={`${inputClass} mt-1`}
-                                        aria-label="Runner type"
-                                        value={draft.runner_type}
-                                        onChange={(event) => setWorkflow((current) => ({
-                                            ...current,
-                                            runner_type: event.target.value as WorkflowDefinition['runner_type'],
-                                        }))}
-                                    >
-                                        <option value="model">Model</option>
-                                        <option value="agent">Agent</option>
-                                    </select>
-                                </label>
-                                </WorkflowChangedField>
-                            </div>
-                            <WorkflowChangedField changeKey="description">
-                            <label className="block text-sm text-text-2">
-                                Description
-                                <textarea
-                                    className={`${textareaClass} mt-1`}
-                                    aria-label="Description"
-                                    value={draft.description}
-                                    onChange={(event) => setWorkflow((current) => ({ ...current, description: event.target.value }))}
-                                />
-                            </label>
-                            </WorkflowChangedField>
-                            {draft.runner_type === 'agent' ? (
-                                <WorkflowChangedField changeKey="selected_agent">
-                                <WorkflowAgentPicker
-                                    value={draft.selected_agent}
-                                    options={options}
-                                    localOnly={localRunner}
-                                    onChange={(selectedAgent) => setWorkflow((current) => ({ ...current, selected_agent: selectedAgent }))}
-                                />
-                                </WorkflowChangedField>
-                            ) : (
-                                <WorkflowChangedField changeKey="model">
-                                <WorkflowModelPicker
-                                    endpointId={draft.model_endpoint_id}
-                                    modelId={draft.model_id}
-                                    options={options}
-                                    localOnly={localRunner}
-                                    onChange={(endpointId, modelId) => setWorkflow((current) => ({
-                                        ...current,
-                                        model_endpoint_id: endpointId,
-                                        model_id: modelId,
-                                    }))}
-                                />
-                                </WorkflowChangedField>
-                            )}
-                            <WorkflowChangedField changeKey="m365_run_as_user_id">
-                            <WorkflowMicrosoft365RunAs
-                                scope={scope}
-                                value={draft.m365_run_as_user_id ?? ''}
-                                disabled={readOnly || saving}
-                                canListAccounts={options.can_manage}
-                                onChange={(userId) => setWorkflow((current) => ({ ...current, m365_run_as_user_id: userId }))}
+                </div>
+            ) : null}
+            {!accessLost && preserved.length ? (
+                <div className="rounded-xl border border-edge-strong bg-surface-2 p-3 text-sm text-text-2">
+                    <p className="font-medium text-text-1">Preserved settings</p>
+                    <p className="mt-1 text-xs text-text-3">
+                        V2 does not edit these legacy settings, but saves keep them intact:
+                        {' '}{preserved.join(', ')}.
+                    </p>
+                </div>
+            ) : null}
+        </>
+    );
+
+    // Undo, redo and the List/Flow switch act on the whole draft, so they sit above the cards and
+    // outside the fieldset that disables the cards while a confirmation or save is pending.
+    const editorToolbar = draft.definition_version === 3 && !readOnly ? (
+        <div className="space-y-2">
+            <div className="flex flex-wrap items-center justify-between gap-x-4 gap-y-2">
+                <div className="flex flex-wrap items-center gap-2" role="group" aria-label="Workflow edit history" data-workflow-history-controls>
+                    <GlassButton size="sm" variant="subtle" disabled={Boolean(historyBlockedReason)} aria-disabled={!history.undoLabel}
+                        className="aria-disabled:cursor-not-allowed aria-disabled:opacity-50"
+                        aria-label="Undo workflow edit" title={historyBlockedReason || (history.undoLabel ? `Undo: ${history.undoLabel}` : 'No workflow edits to undo')}
+                        onClick={() => { if (history.undoLabel) history.session.request('undo'); }}><Undo2 size={14} /> Undo</GlassButton>
+                    <GlassButton size="sm" variant="subtle" disabled={Boolean(historyBlockedReason)} aria-disabled={!history.redoLabel}
+                        className="aria-disabled:cursor-not-allowed aria-disabled:opacity-50"
+                        aria-label="Redo workflow edit" title={historyBlockedReason || (history.redoLabel ? `Redo: ${history.redoLabel}` : 'No workflow edits to redo')}
+                        onClick={() => { if (history.redoLabel) history.session.request('redo'); }}><Redo2 size={14} /> Redo</GlassButton>
+                    <span className="text-xs text-text-3">
+                        {history.undoLabel ? `Undo: ${history.undoLabel}. ` : 'No earlier retained edits. '}
+                        Text fields keep native undo.
+                    </span>
+                </div>
+                <div className="flex flex-wrap gap-2" role="group" aria-label="Workflow authoring surface">
+                    <GlassButton size="sm" variant="subtle" aria-pressed={surface === 'list'}
+                        className="aria-pressed:bg-accent-soft aria-pressed:text-accent"
+                        disabled={saving || Boolean(authoring.pending) || Boolean(history.pending)}
+                        onClick={() => switchSurface('list')}>List authoring</GlassButton>
+                    <GlassButton size="sm" variant="subtle" aria-pressed={surface === 'flow'}
+                        className="aria-pressed:bg-accent-soft aria-pressed:text-accent"
+                        disabled={saving || Boolean(authoring.pending) || Boolean(history.pending)}
+                        onClick={() => switchSurface('flow')}>Flow authoring</GlassButton>
+                </div>
+            </div>
+            <p className="text-xs text-text-3">
+                Both surfaces edit one unsaved draft. Buttons change execution order and bindings; dragging changes temporary layout only.
+            </p>
+            {history.notice ? <p role="status" className="rounded-lg border border-warn/40 bg-warn/5 px-3 py-2 text-xs text-text-2">{history.notice}</p> : null}
+        </div>
+    ) : null;
+
+    const runnerFields = (
+        <>
+            <WorkflowChangedField changeKey="runner_type">
+                <WorkflowField label="Runner type" htmlFor={`${cardIdPrefix}-runner-type`} width="standard">
+                    <select
+                        id={`${cardIdPrefix}-runner-type`}
+                        className={workflowFieldInputClass}
+                        aria-label="Runner type"
+                        value={draft.runner_type}
+                        onChange={(event) => setWorkflow((current) => ({
+                            ...current,
+                            runner_type: event.target.value as WorkflowDefinition['runner_type'],
+                        }))}
+                    >
+                        <option value="model">Model</option>
+                        <option value="agent">Agent</option>
+                    </select>
+                </WorkflowField>
+            </WorkflowChangedField>
+            <WorkflowFieldEmphasis emphasis="dependent">
+                <WorkflowFieldList>
+                    {draft.runner_type === 'agent' ? (
+                        <WorkflowChangedField changeKey="selected_agent">
+                            <WorkflowAgentPicker
+                                variant="field"
+                                value={draft.selected_agent}
+                                options={options}
+                                localOnly={localRunner}
+                                onChange={(selectedAgent) => setWorkflow((current) => ({ ...current, selected_agent: selectedAgent }))}
                             />
-                            </WorkflowChangedField>
-                            <WorkflowScheduleFields
-                                triggerField={(
-                                    <label className="text-sm text-text-2">
-                                        Trigger
-                                        <select
-                                            className={`${inputClass} mt-1`}
-                                            aria-label="Trigger"
-                                            value={draft.trigger_type}
-                                            onChange={(event) => {
-                                                const trigger = event.target.value as WorkflowDefinition['trigger_type'];
-                                                setWorkflow((current) => trigger === 'file_sync' ? {
-                                                    ...current,
-                                                    trigger_type: trigger,
-                                                    file_sync: workflowMonitorFileSyncConfig(current.file_sync),
-                                                } : { ...current, trigger_type: trigger });
-                                            }}
-                                        >
-                                            <option value="manual">Manual</option>
-                                            <option value="interval">Schedule</option>
-                                            {fileSyncTriggerOffered ? <option value="file_sync">Monitor File Sync changes</option> : null}
-                                        </select>
-                                    </label>
-                                )}
-                                schedule={draft.schedule}
+                        </WorkflowChangedField>
+                    ) : (
+                        <WorkflowChangedField changeKey="model">
+                            <WorkflowModelPicker
+                                variant="field"
+                                endpointId={draft.model_endpoint_id}
+                                modelId={draft.model_id}
                                 options={options}
-                                scheduled={scheduled}
-                                onChange={(update) => setWorkflow((current) => ({ ...current, schedule: update(current.schedule) }))}
+                                localOnly={localRunner}
+                                onChange={(endpointId, modelId) => setWorkflow((current) => ({
+                                    ...current,
+                                    model_endpoint_id: endpointId,
+                                    model_id: modelId,
+                                }))}
                             />
-                            <WorkflowChangedField changeKey="error_handling">
-                            <div className="grid gap-3 md:grid-cols-2">
-                                <label className="text-sm text-text-2">
-                                    Error handling
-                                    <select
-                                        className={`${inputClass} mt-1`}
-                                        aria-label="Error handling"
-                                        value={draft.error_handling.strategy}
-                                        onChange={(event) => setWorkflow((current) => ({
-                                            ...current,
-                                            error_handling: {
-                                                ...current.error_handling,
-                                                strategy: event.target.value as WorkflowDefinition['error_handling']['strategy'],
-                                            },
-                                        }))}
-                                    >
-                                        <option value="halt">Halt on failure</option>
-                                        <option value="continue">Continue after failure</option>
-                                    </select>
-                                </label>
-                                <label className="text-sm text-text-2">
-                                    Retry count
-                                    <input
-                                        className={`${inputClass} mt-1`}
-                                        type="number"
-                                        min={0}
-                                        max={5}
-                                        aria-label="Retry count"
-                                        value={draft.error_handling.retry_count}
-                                        onChange={(event) => setWorkflow((current) => ({
-                                            ...current,
-                                            error_handling: {
-                                                ...current.error_handling,
-                                                retry_count: Math.min(5, Math.max(0, Math.trunc(Number(event.target.value) || 0))),
-                                            },
-                                        }))}
-                                    />
-                                </label>
-                            </div>
-                            </WorkflowChangedField>
-                            <div className="grid gap-2 md:grid-cols-2">
-                                <WorkflowChangedField changeKey="is_enabled">
-                                <Toggle
-                                    label="Workflow enabled"
-                                    checked={draft.is_enabled}
-                                    onChange={(checked) => setWorkflow((current) => ({ ...current, is_enabled: checked }))}
-                                    description="Disabled workflows can be edited but will not run automatically."
-                                />
-                                </WorkflowChangedField>
-                                <WorkflowChangedField changeKey="durable_execution">
-                                <Toggle
-                                    label="Durable execution"
-                                    checked={draft.durable_execution === true}
-                                    disabled={draft.definition_version === 3}
-                                    onChange={(checked) => setWorkflow((current) => ({ ...current, durable_execution: checked }))}
-                                    description={draft.definition_version === 3
-                                        ? 'Required for structured control flow. Saved decisions and exact execution checkpoints survive waits and restarts.'
-                                        : 'Save checkpoints so queued and interrupted runs can resume instead of depending on this browser tab.'}
-                                />
-                                </WorkflowChangedField>
-                                <WorkflowChangedField changeKey="chat_capabilities_enabled">
-                                <Toggle
-                                    label="Chat capabilities enabled"
-                                    checked={draft.chat_capabilities_enabled}
-                                    onChange={(checked) => setWorkflow((current) => ({ ...current, chat_capabilities_enabled: checked }))}
-                                    description="Allow tasks to use configured chat capabilities when the runner supports them."
-                                />
-                                </WorkflowChangedField>
-                            </div>
-                            <p className="rounded-xl bg-surface-sunken p-3 text-xs text-text-3">
-                                Effective runner: {workflowRunnerSummary(draft, options)}
-                            </p>
-                        </section>
-                        <WorkflowFileSyncFields
+                        </WorkflowChangedField>
+                    )}
+                    <WorkflowReadout label="Effective runner">{workflowRunnerSummary(draft, options)}</WorkflowReadout>
+                </WorkflowFieldList>
+            </WorkflowFieldEmphasis>
+        </>
+    );
+
+    const cards = (
+        <>
+            <SectionCard id={cardId('basics')} ariaLabel="Workflow basics" headingLevel={3}
+                title={WORKFLOW_EDITOR_SECTION_LABELS.basics} icon={sectionIcon('basics')}
+                status={sectionFor('basics')?.status} meta={sectionFor('basics')?.meta}>
+                <WorkflowFieldList>
+                    <WorkflowChangedField changeKey="name">
+                        <WorkflowField label="Workflow name" required htmlFor={fieldId('workflow', 'name')} width="wide">
+                            <input
+                                id={fieldId('workflow', 'name')}
+                                className={workflowFieldInputClass}
+                                aria-label="Workflow name"
+                                value={draft.name}
+                                required
+                                onChange={(event) => setWorkflow((current) => ({ ...current, name: event.target.value }))}
+                            />
+                        </WorkflowField>
+                    </WorkflowChangedField>
+                    <WorkflowChangedField changeKey="description">
+                        <WorkflowField label="Description" htmlFor={`${cardIdPrefix}-description`} width="full">
+                            <textarea
+                                id={`${cardIdPrefix}-description`}
+                                className={`${workflowFieldInputClass} min-h-24`}
+                                aria-label="Description"
+                                value={draft.description}
+                                onChange={(event) => setWorkflow((current) => ({ ...current, description: event.target.value }))}
+                            />
+                        </WorkflowField>
+                    </WorkflowChangedField>
+                    <div className="min-w-0">{runnerFields}</div>
+                    <WorkflowChangedField changeKey="m365_run_as_user_id">
+                        <WorkflowMicrosoft365RunAs
                             scope={scope}
-                            workflow={draft}
-                            sourceList={fileSyncSources}
+                            value={draft.m365_run_as_user_id ?? ''}
                             disabled={readOnly || saving}
-                            onChange={(update) => setWorkflow((current) => ({
-                                ...current,
-                                file_sync: update(workflowFileSyncConfig(current.file_sync)),
-                            }))}
+                            canListAccounts={options.can_manage}
+                            onChange={(userId) => setWorkflow((current) => ({ ...current, m365_run_as_user_id: userId }))}
                         />
-                        <section className="rounded-2xl border border-edge p-4" aria-label="Workflow shared references">
-                            <WorkflowDocumentPicker
-                                scope={scope}
-                                references={draft.reference_inputs}
-                                readOnly={readOnly || saving}
-                                onChange={(referenceInputs) => setWorkflow((current) => ({ ...current, reference_inputs: referenceInputs }))}
-                            />
-                            <WorkflowReferenceChanges className="mt-3" />
-                        </section>
-                        {draft.definition_version === 3 && !unsupported ? <WorkflowChangedField changeKey="limits">
-                            <WorkflowFlowLimitFields workflow={draft} onEdit={authoring.execute} />
-                        </WorkflowChangedField> : null}
-                        <section className="space-y-3 rounded-2xl border border-edge p-4" aria-label="Workflow tasks">
-                            <div className="flex flex-wrap items-center justify-between gap-2">
-                                <div>
-                                    <h3 className="text-base font-semibold text-text-1">{draft.definition_version === 3
-                                        ? surface === 'flow' ? 'Structured Flow' : 'Structured List' : 'Tasks'}</h3>
-                                    <p className="text-xs text-text-3">
-                                        Task IDs stay stable while you edit, so explicit input bindings do not change meaning.
-                                    </p>
-                                </div>
-                                {draft.definition_version !== 3 ? <div className="flex flex-wrap gap-2">
-                                {options.supported_definition_versions?.includes(3) && !unsupported ? (
-                                    <GlassButton type="button" size="sm" onClick={() => setConfirmStructured(true)}>
-                                        Enable structured control flow
-                                    </GlassButton>
-                                ) : null}
-                                <GlassButton
-                                    type="button"
-                                    size="sm"
-                                    variant="primary"
-                                    disabled={draft.tasks.length >= options.max_tasks}
-                                    onClick={() => setWorkflow((current) => ({
+                    </WorkflowChangedField>
+                </WorkflowFieldList>
+            </SectionCard>
+
+            <SectionCard id={cardId('trigger')} headingLevel={3}
+                title={WORKFLOW_EDITOR_SECTION_LABELS.trigger} icon={sectionIcon('trigger')}
+                status={sectionFor('trigger')?.status} meta={sectionFor('trigger')?.meta}>
+                <WorkflowFieldEmphasis emphasis="primary">
+                    <WorkflowChangedField changeKey="is_enabled">
+                        <WorkflowSwitch
+                            label="Workflow enabled"
+                            checked={draft.is_enabled}
+                            onChange={(checked) => setWorkflow((current) => ({ ...current, is_enabled: checked }))}
+                            description="Disabled workflows can be edited but will not run automatically."
+                        />
+                    </WorkflowChangedField>
+                </WorkflowFieldEmphasis>
+                <WorkflowScheduleFields
+                    triggerField={(
+                        <WorkflowField label="Trigger" htmlFor={`${cardIdPrefix}-trigger`} width="standard">
+                            <select
+                                id={`${cardIdPrefix}-trigger`}
+                                className={workflowFieldInputClass}
+                                aria-label="Trigger"
+                                value={draft.trigger_type}
+                                onChange={(event) => {
+                                    const trigger = event.target.value as WorkflowDefinition['trigger_type'];
+                                    setWorkflow((current) => trigger === 'file_sync' ? {
                                         ...current,
-                                        tasks: [...current.tasks, createWorkflowTask(current.tasks.length)],
-                                    }))}
-                                >
-                                    <Plus size={14} /> Add task
-                                </GlassButton>
-                                </div> : <Pill tone="accent">Definition v3</Pill>}
-                            </div>
-                            {draft.tasks.length >= options.max_tasks ? (
-                                <p role="status" className="text-xs text-warn">Maximum task count reached for this scope.</p>
-                            ) : null}
-                            {draft.definition_version === 3 ? (
-                                surface === 'flow' && !unsupported ? <>
-                                    {flowPreview.error ? <p role="alert" className="text-sm text-danger">{flowPreview.error}</p> : null}
-                                    <WorkflowFlowAuthoring workflow={draft} options={options} scope={scope}
-                                        previewDefinition={flowPreview.definition} selectedId={authoring.selectedId}
-                                        onSelect={(id) => {
-                                            if (id !== authoring.selectedId) history.session.closeGroup();
-                                            authoring.setSelectedId(id);
-                                        }} onEdit={authoring.execute} renderTask={renderStructuredTask}
-                                        positions={authoring.positions} setPositions={authoring.setPositions}
-                                        collapsed={authoring.collapsed} setCollapsed={authoring.setCollapsed}
-                                        focusRequest={authoring.focusRequest} disabled={readOnly || saving || Boolean(history.pending) || Boolean(authoring.pending) || draftLocked} onAccessLost={onAccessLost} />
-                                </> : <WorkflowStructuredList workflow={draft} options={options} scope={scope}
-                                    onEdit={authoring.execute} selectedId={authoring.selectedId}
-                                    onSelect={(id) => {
-                                        if (id !== authoring.selectedId) history.session.closeGroup();
-                                        authoring.setSelectedId(id);
-                                    }} renderTask={renderStructuredTask} />
-                            ) : <>
-                            <WorkflowChangeNotice changeKey={WORKFLOW_TASK_ORDER_KEY} />
-                            <WorkflowRemovedItemRows list="task" placement={{ at: 'start' }} />
-                            {draft.tasks.map((task, index) => (
-                                <Fragment key={task.id}>
-                                <WorkflowTaskFields
-                                    key={task.id}
-                                    scope={scope}
-                                    task={task}
-                                    index={index}
-                                    workflow={draft}
-                                    options={options}
-                                    onChange={(nextTask) => updateTask(task.id, () => nextTask)}
-                                    onMove={(direction) => moveTask(task.id, direction)}
-                                    onRemove={() => removeTask(task.id)}
-                                    durableExecution={draft.durable_execution === true}
-                                    onNeedsDurable={() => setWorkflow((current) => ({ ...current, durable_execution: true }))}
-                                    onAskAi={askAiAvailable ? () => askAiAboutTask(task.id) : undefined}
-                                    draftWithAi={askAiAvailable ? assist.draftWithAi(task.id) : undefined}
-                                />
-                                <WorkflowRemovedItemRows list="task" placement={{ at: 'after', id: task.id }} />
-                                </Fragment>
-                            ))}
-                            <WorkflowRemovedItemRows list="task"
-                                placement={{ at: 'end', siblings: draft.tasks.map((task) => task.id), root: true }} />
-                            </>}
-                        </section>
-                        {/* Rules watch tasks by ID, so alerts follow the tasks they can refer to. */}
-                        {options.can_manage && !readOnly ? (
-                            <WorkflowChangedField changeKey="alerts">
-                            <WorkflowAlertEditor workflow={draft} scope={scope}
-                                onChange={(update) => setWorkflow((current) => update(current))} />
-                            </WorkflowChangedField>
-                        ) : (
-                            <WorkflowAlertSummary workflow={draft} />
-                        )}
-                    </fieldset>
-                    </div> : null}
+                                        trigger_type: trigger,
+                                        file_sync: workflowMonitorFileSyncConfig(current.file_sync),
+                                    } : { ...current, trigger_type: trigger });
+                                }}
+                            >
+                                <option value="manual">Manual</option>
+                                <option value="interval">Schedule</option>
+                                {fileSyncTriggerOffered ? <option value="file_sync">Monitor File Sync changes</option> : null}
+                            </select>
+                        </WorkflowField>
+                    )}
+                    schedule={draft.schedule}
+                    options={options}
+                    scheduled={scheduled}
+                    onChange={(update) => setWorkflow((current) => ({ ...current, schedule: update(current.schedule) }))}
+                />
+            </SectionCard>
+
+            <WorkflowFileSyncFields
+                scope={scope}
+                workflow={draft}
+                sourceList={fileSyncSources}
+                disabled={readOnly || saving}
+                card={cardFrame('file-sync')}
+                onChange={(update) => setWorkflow((current) => ({
+                    ...current,
+                    file_sync: update(workflowFileSyncConfig(current.file_sync)),
+                }))}
+            />
+
+            <SectionCard id={cardId('execution')} headingLevel={3}
+                title={WORKFLOW_EDITOR_SECTION_LABELS.execution} icon={sectionIcon('execution')}
+                status={sectionFor('execution')?.status} meta={sectionFor('execution')?.meta}>
+                <WorkflowChangedField changeKey="error_handling">
+                    <WorkflowFieldList>
+                        <WorkflowField label="Error handling" htmlFor={`${cardIdPrefix}-error-handling`} width="standard">
+                            <select
+                                id={`${cardIdPrefix}-error-handling`}
+                                className={workflowFieldInputClass}
+                                aria-label="Error handling"
+                                value={draft.error_handling.strategy}
+                                onChange={(event) => setWorkflow((current) => ({
+                                    ...current,
+                                    error_handling: {
+                                        ...current.error_handling,
+                                        strategy: event.target.value as WorkflowDefinition['error_handling']['strategy'],
+                                    },
+                                }))}
+                            >
+                                <option value="halt">Halt on failure</option>
+                                <option value="continue">Continue after failure</option>
+                            </select>
+                        </WorkflowField>
+                        <WorkflowField label="Retry count" htmlFor={`${cardIdPrefix}-retry-count`} width="compact"
+                            help="From 0 to 5.">
+                            <input
+                                id={`${cardIdPrefix}-retry-count`}
+                                className={workflowFieldInputClass}
+                                type="number"
+                                min={0}
+                                max={5}
+                                aria-label="Retry count"
+                                value={draft.error_handling.retry_count}
+                                onChange={(event) => setWorkflow((current) => ({
+                                    ...current,
+                                    error_handling: {
+                                        ...current.error_handling,
+                                        retry_count: Math.min(5, Math.max(0, Math.trunc(Number(event.target.value) || 0))),
+                                    },
+                                }))}
+                            />
+                        </WorkflowField>
+                    </WorkflowFieldList>
+                </WorkflowChangedField>
+                <div className="border-t border-edge-strong pt-1">
+                    <WorkflowSwitchGrid>
+                        <WorkflowChangedField changeKey="durable_execution">
+                            <WorkflowSwitch
+                                label="Durable execution"
+                                checked={draft.durable_execution === true}
+                                disabled={draft.definition_version === 3}
+                                onChange={(checked) => setWorkflow((current) => ({ ...current, durable_execution: checked }))}
+                                description={draft.definition_version === 3
+                                    ? 'Required for structured control flow. Saved decisions and exact execution checkpoints survive waits and restarts.'
+                                    : 'Save checkpoints so queued and interrupted runs can resume instead of depending on this browser tab.'}
+                            />
+                        </WorkflowChangedField>
+                        <WorkflowChangedField changeKey="chat_capabilities_enabled">
+                            <WorkflowSwitch
+                                label="Chat capabilities enabled"
+                                checked={draft.chat_capabilities_enabled}
+                                onChange={(checked) => setWorkflow((current) => ({ ...current, chat_capabilities_enabled: checked }))}
+                                description="Allow tasks to use configured chat capabilities when the runner supports them."
+                            />
+                        </WorkflowChangedField>
+                    </WorkflowSwitchGrid>
                 </div>
-                </WorkflowHistoryBoundary>
+            </SectionCard>
+
+            <SectionCard id={cardId('references')} ariaLabel="Workflow shared references" headingLevel={3}
+                title={WORKFLOW_EDITOR_SECTION_LABELS.references} icon={sectionIcon('references')}
+                status={sectionFor('references')?.status} meta={sectionFor('references')?.meta}>
+                <WorkflowDocumentPicker
+                    scope={scope}
+                    references={draft.reference_inputs}
+                    readOnly={readOnly || saving}
+                    hideTitle
+                    onChange={(referenceInputs) => setWorkflow((current) => ({ ...current, reference_inputs: referenceInputs }))}
+                />
+                <WorkflowReferenceChanges className="mt-3" />
+            </SectionCard>
+
+            {draft.definition_version === 3 && !unsupported ? (
+                <SectionCard id={cardId('limits')} headingLevel={3}
+                    title={WORKFLOW_EDITOR_SECTION_LABELS.limits} icon={sectionIcon('limits')}
+                    status={sectionFor('limits')?.status} meta={sectionFor('limits')?.meta}>
+                    <WorkflowChangedField changeKey="limits">
+                        <WorkflowFlowLimitFields workflow={draft} onEdit={authoring.execute} />
+                    </WorkflowChangedField>
+                </SectionCard>
+            ) : null}
+
+            <SectionCard id={cardId('tasks')} ariaLabel="Workflow tasks" headingLevel={3}
+                // Converting to structured control flow swaps this card's whole body, title and
+                // icon while Limits appears above it. Chromium can leave a card updated that way
+                // with its contents unrendered, so a conversion mounts the card afresh instead.
+                key={draft.definition_version === 3 ? 'tasks-structured' : 'tasks-ordered'}
+                title={sectionFor('tasks')?.label ?? WORKFLOW_EDITOR_SECTION_LABELS.tasks} icon={sectionIcon('tasks')}
+                status={sectionFor('tasks')?.status} meta={sectionFor('tasks')?.meta}
+                bodyClassName="space-y-3">
+                <div className="flex flex-wrap items-start justify-between gap-3">
+                    <WorkflowCardHelp className="min-w-0 flex-1 basis-64">
+                        Task IDs stay stable while you edit, so explicit input bindings do not change meaning.
+                    </WorkflowCardHelp>
+                    {draft.definition_version !== 3 ? <div className="flex flex-wrap gap-2">
+                        {options.supported_definition_versions?.includes(3) && !unsupported ? (
+                            <GlassButton type="button" size="sm" variant="subtle" onClick={() => setConfirmStructured(true)}>
+                                Enable structured control flow
+                            </GlassButton>
+                        ) : null}
+                        <GlassButton
+                            type="button"
+                            size="sm"
+                            variant="primary"
+                            disabled={draft.tasks.length >= options.max_tasks}
+                            onClick={() => setWorkflow((current) => ({
+                                ...current,
+                                tasks: [...current.tasks, createWorkflowTask(current.tasks.length)],
+                            }))}
+                        >
+                            <Plus size={14} /> Add task
+                        </GlassButton>
+                    </div> : <Pill tone="accent">Definition v3</Pill>}
                 </div>
-                {panelOpen ? (
-                    <WorkflowEditorSidePanel id={sidePanelId} className="w-full xl:w-96 xl:shrink-0 xl:border-l xl:border-edge"
-                        selected={panelTab} onSelect={selectSideTab}
-                        tabs={[{
-                            id: 'changes', label: 'Changes',
-                            content: <WorkflowChangesTab confirming={confirmingSave}
-                                disabled={saving || Boolean(authoring.pending) || Boolean(history.pending) || draftLocked}
-                                onConfirmSave={() => void save(true)}
-                                onKeepReviewing={() => {
-                                    setConfirmingSave(false);
-                                    setPanelFocus({ target: 'list', sequence: ++focusSequence.current });
-                                }}
-                                onJump={jumpToChange} confirmHeadingRef={confirmHeadingRef} listHeadingRef={changesHeadingRef} />,
-                        }, ...(askAiAvailable ? [{
-                            id: 'askai', label: 'Ask AI', panelClassName: 'flex flex-col overflow-hidden',
-                            content: <WorkflowAskAiTab assist={assist} inputId={askAiInputId} onReload={original ? reloadSaved : undefined} />,
-                        }] : [])]} />
+                {draft.tasks.length >= options.max_tasks ? (
+                    <p role="status" className="text-xs text-warn">Maximum task count reached for this scope.</p>
                 ) : null}
-                {/* Outside the editor pane, which narrow screens hide while the side panel is open. */}
-                {!accessLost && authoring.announcement ? <p role="status" className="sr-only">{authoring.announcement}</p> : null}
-                {!accessLost && history.announcement ? <p role="status" className="sr-only">{history.announcement}</p> : null}
-            </Modal>
+                {draft.definition_version === 3 ? (
+                    surface === 'flow' && !unsupported ? <>
+                        {flowPreview.error ? <p role="alert" className="text-sm text-danger">{flowPreview.error}</p> : null}
+                        <WorkflowFlowAuthoring workflow={draft} options={options} scope={scope}
+                            previewDefinition={flowPreview.definition} selectedId={authoring.selectedId}
+                            onSelect={(id) => {
+                                if (id !== authoring.selectedId) history.session.closeGroup();
+                                authoring.setSelectedId(id);
+                            }} onEdit={authoring.execute} renderTask={renderStructuredTask}
+                            positions={authoring.positions} setPositions={authoring.setPositions}
+                            collapsed={authoring.collapsed} setCollapsed={authoring.setCollapsed}
+                            focusRequest={authoring.focusRequest} disabled={readOnly || saving || Boolean(history.pending) || Boolean(authoring.pending) || draftLocked} onAccessLost={onAccessLost} />
+                    </> : <WorkflowStructuredList workflow={draft} options={options} scope={scope}
+                        onEdit={authoring.execute} selectedId={authoring.selectedId}
+                        onSelect={(id) => {
+                            if (id !== authoring.selectedId) history.session.closeGroup();
+                            authoring.setSelectedId(id);
+                        }} renderTask={renderStructuredTask} />
+                ) : <div className="space-y-3">
+                    <WorkflowChangeNotice changeKey={WORKFLOW_TASK_ORDER_KEY} />
+                    <WorkflowRemovedItemRows list="task" placement={{ at: 'start' }} />
+                    {draft.tasks.map((task, index) => (
+                        <Fragment key={task.id}>
+                        <WorkflowTaskFields
+                            key={task.id}
+                            scope={scope}
+                            task={task}
+                            index={index}
+                            workflow={draft}
+                            options={options}
+                            onChange={(nextTask) => updateTask(task.id, () => nextTask)}
+                            onMove={(direction) => moveTask(task.id, direction)}
+                            onRemove={() => removeTask(task.id)}
+                            durableExecution={draft.durable_execution === true}
+                            onNeedsDurable={() => setWorkflow((current) => ({ ...current, durable_execution: true }))}
+                            onAskAi={askAiAvailable ? () => askAiAboutTask(task.id) : undefined}
+                            draftWithAi={askAiAvailable ? assist.draftWithAi(task.id) : undefined}
+                        />
+                        <WorkflowRemovedItemRows list="task" placement={{ at: 'after', id: task.id }} />
+                        </Fragment>
+                    ))}
+                    <WorkflowRemovedItemRows list="task"
+                        placement={{ at: 'end', siblings: draft.tasks.map((task) => task.id), root: true }} />
+                </div>}
+            </SectionCard>
+
+            {/* Rules watch tasks by ID, so alerts follow the tasks they can refer to. */}
+            {options.can_manage && !readOnly ? (
+                <WorkflowChangedField changeKey="alerts">
+                <WorkflowAlertEditor workflow={draft} scope={scope} card={cardFrame('alerts')}
+                    onChange={(update) => setWorkflow((current) => update(current))} />
+                </WorkflowChangedField>
+            ) : (
+                <WorkflowAlertSummary workflow={draft} card={cardFrame('alerts')} />
+            )}
+        </>
+    );
+
+    const editorContent = (
+        <>
+            {assist.pending ? <WorkflowAssistLockBanner pending={assist.pending} onCancel={assist.cancel} /> : null}
+            <WorkflowHistoryBoundary session={history.session}>
+            <div className="space-y-4">
+                {notices}
+                {editorToolbar}
+                {!accessLost ? <div ref={authoringRef} className="min-w-0">
+                <fieldset disabled={readOnly || saving || Boolean(history.pending) || Boolean(authoring.pending) || draftLocked}
+                    aria-busy={draftLocked || undefined} className="min-w-0 space-y-4">
+                    {cards}
+                </fieldset>
+                </div> : null}
+            </div>
+            </WorkflowHistoryBoundary>
+        </>
+    );
+
+    const sidePanel = panelOpen ? (
+        <WorkflowEditorSidePanel id={sidePanelId}
+            className={page
+                ? 'w-full bg-surface-1 xl:w-96 xl:shrink-0 xl:border-l xl:border-edge'
+                : 'w-full xl:w-96 xl:shrink-0 xl:border-l xl:border-edge'}
+            selected={panelTab} onSelect={selectSideTab}
+            tabs={[{
+                id: 'changes', label: 'Changes',
+                content: <WorkflowChangesTab confirming={confirmingSave}
+                    disabled={saving || Boolean(authoring.pending) || Boolean(history.pending) || draftLocked}
+                    onConfirmSave={() => void save(true)}
+                    onKeepReviewing={() => {
+                        setConfirmingSave(false);
+                        setPanelFocus({ target: 'list', sequence: ++focusSequence.current });
+                    }}
+                    onJump={jumpToChange} confirmHeadingRef={confirmHeadingRef} listHeadingRef={changesHeadingRef} />,
+            }, ...(askAiAvailable ? [{
+                id: 'askai', label: 'Ask AI', panelClassName: 'flex flex-col overflow-hidden',
+                content: <WorkflowAskAiTab assist={assist} inputId={askAiInputId} onReload={original ? reloadSaved : undefined} />,
+            }] : [])]} />
+    ) : null;
+
+    // Outside the editor pane, which narrow screens hide while the side panel is open.
+    const announcements = (
+        <>
+            {!accessLost && authoring.announcement ? <p role="status" className="sr-only">{authoring.announcement}</p> : null}
+            {!accessLost && history.announcement ? <p role="status" className="sr-only">{history.announcement}</p> : null}
+        </>
+    );
+
+    const scopeLabel = pageScopeLabel ?? (scope.type === 'group' ? 'Group workspace' : 'Personal workspace');
+    const pageTitle = draft.name.trim() || (workflow ? 'Workflow details' : 'New workflow');
+    const pageStatus = readOnly ? 'Read only'
+        : saving ? 'Saving your changes.'
+            : dirty ? 'Unsaved changes' : 'No unsaved changes';
+
+    const frame = page ? (
+        <section aria-label={workflow ? 'Edit workflow' : 'Create workflow'} data-workflow-editor-page
+            className="flex min-h-0 min-w-0 flex-1 flex-col">
+            <header className="shrink-0 border-b border-edge px-1 py-3 sm:px-4 lg:px-6">
+                <div className="mx-auto w-full max-w-[112rem] space-y-3">
+                    <GlassButton type="button" size="sm" onClick={close} disabled={saving}>
+                        <ArrowLeft size={15} aria-hidden="true" /> Back
+                    </GlassButton>
+                    <div className="flex flex-wrap items-start justify-between gap-x-4 gap-y-3">
+                        <div className="min-w-0 flex-1 basis-64">
+                            {/* Focused on arrival, so it names the page for assistive technology; not a control, so no ring. */}
+                            <h2 ref={pageTitleRef} tabIndex={-1}
+                                className="text-xl leading-snug font-semibold break-words text-text-1 outline-none">
+                                {pageTitle}
+                            </h2>
+                            <p className="mt-1 text-xs text-text-3">
+                                {workflow ? (readOnly ? 'View workflow' : 'Edit workflow') : 'Create workflow'} · {scopeLabel}
+                                {' · '}<span role="status">{pageStatus}</span>
+                            </p>
+                        </div>
+                        <div className="flex min-w-0 flex-wrap items-center justify-end gap-2">
+                            {sidePanelToggles}
+                            {closeAndSave}
+                        </div>
+                    </div>
+                </div>
+            </header>
+            <div className="flex min-h-0 flex-1">
+                <div ref={scrollRef} data-workflow-editor-scroll onKeyDownCapture={lockUndoWhileDrafting}
+                    className={`@container min-h-0 min-w-0 flex-1 overflow-y-auto px-1 py-4 sm:px-4 lg:px-6${panelOpen ? ' hidden xl:block' : ''}`}>
+                    <div className={`mx-auto grid w-full max-w-[112rem] items-start gap-6${showIndex ? ' @min-[76rem]:grid-cols-[minmax(0,1fr)_15rem]' : ''}`}>
+                        <div className="min-w-0 pb-8">{editorContent}</div>
+                        {showIndex ? (
+                            <SettingsIndex className="hidden @min-[76rem]:block" entries={indexEntries} grouped={false}
+                                scrollRoot={scrollRef} onJump={setPendingJump} />
+                        ) : null}
+                    </div>
+                </div>
+                {sidePanel}
+            </div>
+            {announcements}
+        </section>
+    ) : (
+        <Modal
+            title={workflow ? 'Edit workflow' : 'Create workflow'}
+            description={`Scope: ${workflowScopeKey(scope)}. ${readOnly ? 'This workflow is read-only.' : 'Changes are saved only when you choose Save workflow.'}`}
+            onClose={close}
+            size={panelOpen ? '2xl' : 'xl'}
+            tall
+            bodyClassName="flex min-h-0"
+            footer={
+                // A narrow screen can't fit the toggles, Cancel and Save on one line once Ask AI is
+                // offered, so Cancel and Save move together to a second line instead of wrapping a label.
+                <div className="flex min-w-0 flex-1 flex-wrap items-center justify-end gap-2">
+                    {sidePanelToggles}
+                    {closeAndSave}
+                </div>
+            }
+        >
+            <div ref={scrollRef} onKeyDownCapture={lockUndoWhileDrafting}
+                className={`min-w-0 flex-1 overflow-y-auto px-4 py-3${panelOpen ? ' hidden xl:block' : ''}`}>
+                <div className="p-1">{editorContent}</div>
+            </div>
+            {sidePanel}
+            {announcements}
+        </Modal>
+    );
+
+    return (
+        <WorkflowFieldDraftsProvider value={fieldDrafts.store}>
+            <WorkflowChangeTrackingScope session={history.session} enabled={!readOnly}>
+            {frame}
             {!accessLost && authoring.pending ? <ConfirmDialog
                 title={authoring.pending.command.type === 'remove' ? 'Remove this flow block?' : 'Move this flow block?'}
                 description={authoring.pending.message}
@@ -1045,6 +1302,9 @@ export function WorkflowEditorDialog({
                         try {
                             setWorkflow(convertToStructuredWorkflow(draft, `root-${createWorkflowTask(0).id}`));
                             setConfirmStructured(false);
+                            // The button that asked is gone with the ordered tasks, so focus moves
+                            // to the converted tasks rather than falling back to the page.
+                            setPendingJump(cardId('tasks'));
                         } catch (cause: unknown) {
                             setConfirmStructured(false);
                             setError(workflowErrorMessage(cause, 'This workflow cannot be converted safely. Choose explicit inputs first.'));
diff --git a/application/v2_ui/src/components/workflows/WorkflowField.tsx b/application/v2_ui/src/components/workflows/WorkflowField.tsx
new file mode 100644
index 000000000..7b68e8c58
--- /dev/null
+++ b/application/v2_ui/src/components/workflows/WorkflowField.tsx
@@ -0,0 +1,215 @@
+// WorkflowField.tsx
+// Field rows for the workflow editor, laid out the way V2 Admin Settings lays out a setting.
+//
+// Admin's `FieldShell` renders schema-declared fields; the workflow editor's fields are bespoke
+// controls with their own change tracking, drafts and validation. These shells give those
+// controls Admin's reading without routing them through Admin's schema: the label and its help
+// on the left and the control on the right once the card is wide enough, stacked below that
+// (the `.admin-field` rules in theme.css resolve against the card's container).
+//
+// Controls keep their own `aria-label`s. The visible label is associated with `htmlFor` for
+// pointer users and so it reads as the field's name; the `aria-label` stays the accessible name
+// the editor has always exposed, which assistive technology and the browser tests both rely on.
+
+import { clsx } from 'clsx';
+import type { ReactNode } from 'react';
+import type { SectionStatus } from '../../lib/adminSections';
+import { Toggle } from '../ui/primitives';
+
+/**
+ * What the editor hands each card it draws: where the card sits for the index, how it reads at
+ * a glance, and the heading level the surrounding page needs.
+ */
+export interface WorkflowCardFrame {
+    id: string;
+    status: SectionStatus;
+    meta?: string;
+    headingLevel?: 2 | 3;
+}
+
+/**
+ * How much of the control column a control may take on a wide card. The same scale as Admin's
+ * `FieldWidth`: numbers are compact, selects standard, text wide, and longer content full.
+ */
+export type WorkflowFieldWidth = 'compact' | 'standard' | 'wide' | 'full';
+
+/** The control classes shared by the editor's rows; a 40px control the heading lines up with. */
+export const workflowFieldInputClass = clsx(
+    'min-h-10 w-full rounded-lg border border-edge bg-surface-1 px-3 py-2',
+    'text-sm text-text-1 placeholder:text-text-3',
+    'focus:border-accent focus:outline-none',
+    'disabled:cursor-not-allowed disabled:opacity-60',
+);
+
+export function WorkflowField({
+    label,
+    htmlFor,
+    labelId,
+    required = false,
+    help,
+    helpId,
+    width = 'wide',
+    inline = false,
+    group = false,
+    trailing,
+    className,
+    children,
+}: {
+    label: ReactNode;
+    /** The control the visible label names. */
+    htmlFor?: string;
+    /** The heading's id, for a group of controls that names itself with `aria-labelledby`. */
+    labelId?: string;
+    required?: boolean;
+    help?: ReactNode;
+    /** Lets a control point `aria-describedby` at the help text. */
+    helpId?: string;
+    width?: WorkflowFieldWidth;
+    /** A short readout, such as a status, that stays beside its label when the card is narrow. */
+    inline?: boolean;
+    /**
+     * Render the control column as a labelled group, for several controls that share one name,
+     * such as the days of the week. Requires `labelId`.
+     */
+    group?: boolean;
+    trailing?: ReactNode;
+    className?: string;
+    children: ReactNode;
+}) {
+    const heading = htmlFor ? (
+        <label htmlFor={htmlFor} className="text-sm font-semibold text-text-1">
+            {label}
+            {required ? <span aria-hidden="true"> *</span> : null}
+        </label>
+    ) : (
+        <p id={labelId} className="text-sm font-semibold text-text-1">
+            {label}
+            {required ? <span aria-hidden="true"> *</span> : null}
+        </p>
+    );
+
+    return (
+        <div
+            className={clsx('admin-field py-3', inline && 'admin-field-inline', className)}
+            data-field-width={width}
+        >
+            <div className="admin-field-heading flex items-baseline justify-between gap-3">
+                {heading}
+                {trailing}
+            </div>
+            {help ? (
+                <div id={helpId} className="admin-field-help text-[0.8125rem] leading-relaxed text-text-3">
+                    {help}
+                </div>
+            ) : null}
+            {group ? (
+                <div role="group" aria-labelledby={labelId} className="admin-field-control min-w-0">
+                    {children}
+                </div>
+            ) : (
+                <div className="admin-field-control min-w-0">{children}</div>
+            )}
+        </div>
+    );
+}
+
+/**
+ * A value shown beside its label, such as the effective runner. Reads as a fact, not a control.
+ */
+export function WorkflowReadout({
+    label,
+    help,
+    children,
+}: {
+    label: ReactNode;
+    help?: ReactNode;
+    children: ReactNode;
+}) {
+    return (
+        <WorkflowField label={label} help={help} width="wide">
+            <p className="flex min-h-10 items-center rounded-lg border border-edge bg-surface-sunken px-3 py-2 text-sm text-text-2">
+                {children}
+            </p>
+        </WorkflowField>
+    );
+}
+
+/**
+ * The emphasis Admin derives from a section's switches, applied by hand.
+ *
+ * `primary` is the accent-backed row a card hangs off; `dependent` indents settings beside a
+ * neutral rail under the control that leads them. The `data-setting-emphasis` attribute is the
+ * hook theme.css uses to let a nested row's label column give up the indent, so its control
+ * lines up with the rows around it.
+ */
+export function WorkflowFieldEmphasis({
+    emphasis,
+    className,
+    children,
+}: {
+    emphasis: 'primary' | 'dependent';
+    className?: string;
+    children: ReactNode;
+}) {
+    return (
+        <div
+            data-setting-emphasis={emphasis}
+            className={clsx(
+                'min-w-0',
+                emphasis === 'primary' && 'mb-3 rounded-xl border border-accent/40 bg-accent-soft px-3 py-1',
+                emphasis === 'dependent' && 'ms-3 border-s-2 border-edge-strong ps-3',
+                className,
+            )}
+        >
+            {children}
+        </div>
+    );
+}
+
+/** A switch row in Admin's style: the switch, a semibold label, and its help beneath. */
+export function WorkflowSwitch({
+    label,
+    description,
+    checked,
+    disabled,
+    onChange,
+}: {
+    label: string;
+    description?: string;
+    checked: boolean;
+    disabled?: boolean;
+    onChange: (checked: boolean) => void;
+}) {
+    return (
+        <div className="admin-switch-row py-1">
+            <Toggle
+                label={label}
+                description={description}
+                checked={checked}
+                disabled={disabled}
+                onChange={onChange}
+                labelClassName="font-semibold"
+                descriptionClassName="max-w-[72ch] text-[0.8125rem]"
+            />
+        </div>
+    );
+}
+
+/** Independent switches, one per row until the card is wide enough to pair them. */
+export function WorkflowSwitchGrid({ children }: { children: ReactNode }) {
+    return <div className="admin-switch-grid">{children}</div>;
+}
+
+/** A stack of field rows divided like an Admin card's ungrouped fields. */
+export function WorkflowFieldList({ className, children }: { className?: string; children: ReactNode }) {
+    return <div className={clsx('divide-y divide-edge-strong', className)}>{children}</div>;
+}
+
+/** Explanatory text at the top of a card body, at Admin's group-help measure. */
+export function WorkflowCardHelp({ className, children }: { className?: string; children: ReactNode }) {
+    return (
+        <p className={clsx('max-w-[72ch] text-[0.8125rem] leading-relaxed text-text-3', className)}>
+            {children}
+        </p>
+    );
+}
diff --git a/application/v2_ui/src/components/workflows/WorkflowFileSyncFields.tsx b/application/v2_ui/src/components/workflows/WorkflowFileSyncFields.tsx
index 3bdbe6f75..be57bd2f6 100644
--- a/application/v2_ui/src/components/workflows/WorkflowFileSyncFields.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowFileSyncFields.tsx
@@ -2,8 +2,19 @@
 // Workflow File Sync authoring for both scopes: the Monitor File Sync changes trigger and File Sync before run.
 
 import { useEffect, useId, useState } from 'react';
-import { GlassButton, Toggle } from '../ui/primitives';
+import { FolderSync } from 'lucide-react';
+import { GlassButton } from '../ui/primitives';
+import { SectionCard } from '../ui/SectionCard';
 import { Pill } from '../workspace/primitives';
+import {
+    WorkflowCardHelp,
+    WorkflowField,
+    WorkflowFieldEmphasis,
+    WorkflowFieldList,
+    WorkflowSwitch,
+    workflowFieldInputClass,
+    type WorkflowCardFrame,
+} from './WorkflowField';
 import {
     fetchWorkflowFileSyncSources,
     workflowFileSyncConfig,
@@ -20,8 +31,6 @@ import {
     type WorkflowScope,
 } from '../../lib/workflowEditor';
 
-const selectClass = 'w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 focus:border-accent focus:outline-none';
-
 export interface WorkflowFileSyncSourceList {
     status: 'idle' | 'loading' | 'ready' | 'failed';
     /**
@@ -92,12 +101,15 @@ export function WorkflowFileSyncFields({
     workflow,
     sourceList,
     disabled,
+    card,
     onChange,
 }: {
     scope: WorkflowScope;
     workflow: WorkflowDefinition;
     sourceList: WorkflowFileSyncSourceList;
     disabled: boolean;
+    /** The File Sync card's place in the editor and how it reads at a glance. */
+    card: WorkflowCardFrame;
     /** Receives an updater so consecutive edits apply to the latest draft, not this render's copy. */
     onChange: (update: (config: WorkflowFileSyncConfig) => WorkflowFileSyncConfig) => void;
 }) {
@@ -143,134 +155,142 @@ export function WorkflowFileSyncFields({
     };
 
     return (
-        <section aria-labelledby={`${baseId}-title`} className="space-y-3 rounded-2xl border border-edge p-4">
-            <div>
-                <h3 id={`${baseId}-title`} className="text-base font-semibold text-text-1">File Sync</h3>
-                <p className="mt-0.5 text-xs text-text-3">
-                    {monitored
-                        ? 'Monitor workflows check the selected sources on the schedule above and run only when files changed.'
-                        : personal
-                            ? 'Optionally sync the selected sources before each run.'
-                            : 'Optionally sync the selected group sources before each run.'}
-                </p>
-            </div>
-            <Toggle
-                label="Run File Sync before each run"
-                checked={active}
-                disabled={disabled || monitored || groupFileSyncOff && !active}
-                onChange={(checked) => update({ enabled: checked })}
-                description={monitored ? 'Required by the Monitor File Sync changes trigger.' : undefined}
-            />
-            <fieldset disabled={disabled || !active} className="min-w-0 space-y-2">
-                <legend className="text-sm text-text-2">File Sync sources</legend>
-                {sourceList.status === 'loading' ? (
-                    <p role="status" className="text-xs text-text-3">
-                        {personal ? 'Loading your File Sync sources…' : "Loading this group's File Sync sources…"}
-                    </p>
-                ) : null}
-                {sourceList.status === 'failed' ? (
-                    <div role="alert" className="space-y-2 rounded-xl bg-warn-soft p-3 text-sm text-warn">
-                        <p>
-                            {personal ? 'Could not load your File Sync sources.' : "Could not load this group's File Sync sources."}
-                            {' Your selection is kept, but it cannot be checked.'}
+        <SectionCard id={card.id} title="File Sync" icon={FolderSync} status={card.status} meta={card.meta}
+            headingLevel={card.headingLevel}>
+            <WorkflowCardHelp className="mb-3">
+                {monitored
+                    ? 'Monitor workflows check the selected sources on the schedule above and run only when files changed.'
+                    : personal
+                        ? 'Optionally sync the selected sources before each run.'
+                        : 'Optionally sync the selected group sources before each run.'}
+            </WorkflowCardHelp>
+            <WorkflowFieldEmphasis emphasis="primary">
+                <WorkflowSwitch
+                    label="Run File Sync before each run"
+                    checked={active}
+                    disabled={disabled || monitored || groupFileSyncOff && !active}
+                    onChange={(checked) => update({ enabled: checked })}
+                    description={monitored ? 'Required by the Monitor File Sync changes trigger.' : undefined}
+                />
+            </WorkflowFieldEmphasis>
+            <WorkflowFieldEmphasis emphasis="dependent">
+                <WorkflowFieldList>
+                    <fieldset disabled={disabled || !active} className="admin-field min-w-0 py-3" data-field-width="full">
+                        <legend className="sr-only">File Sync sources</legend>
+                        <p aria-hidden="true" className="admin-field-heading text-sm font-semibold text-text-1">Sources</p>
+                        <p className="admin-field-help text-[0.8125rem] leading-relaxed text-text-3">
+                            Choose up to {WORKFLOW_FILE_SYNC_MAX_SOURCES} sources.
                         </p>
-                        <GlassButton type="button" size="sm" onClick={sourceList.retry}>Retry File Sync sources</GlassButton>
-                    </div>
-                ) : null}
-                {groupFileSyncOff ? (
-                    <p role="status" className="text-xs text-text-3">
-                        Group File Sync is not enabled, so this group&apos;s sources cannot be listed.
-                        {config.sources.length ? ' Your selection is kept, but it cannot be checked.' : ''}
-                    </p>
-                ) : null}
-                {personalFileSyncOff ? (
-                    <p role="status" className="text-xs text-text-3">
-                        File Sync is not enabled for your personal workspace, so your own sources cannot be listed.
-                    </p>
-                ) : null}
-                {ready && !groupFileSyncOff && !listed.length ? (
-                    <p role="status" className="text-xs text-text-3">
-                        {personal ? 'No File Sync sources are available to you.' : 'No File Sync sources are available to this group.'}
-                    </p>
-                ) : null}
-                <ul className="space-y-1" aria-label="File Sync sources">
-                    {listed.map((source) => {
-                        const key = workflowFileSyncSourceKey(source);
-                        const checked = selected.has(key);
-                        return (
-                            <li key={key}>
-                                <label className="flex items-center gap-2 text-sm text-text-1">
-                                    <input
-                                        type="checkbox"
-                                        className="accent-[var(--accent)]"
-                                        aria-label={`Use File Sync source ${source.label}`}
-                                        checked={checked}
-                                        disabled={!checked && atLimit}
-                                        onChange={(event) => toggleSource(source, event.target.checked)}
-                                    />
-                                    <span className="min-w-0 break-words">{source.label}</span>
-                                    {source.source_type ? <Pill>{source.source_type}</Pill> : null}
-                                    {!source.enabled ? <Pill tone="warn">Disabled</Pill> : null}
-                                </label>
-                            </li>
-                        );
-                    })}
-                    {[...unavailable.map((source) => ({ source, gone: true })), ...unverified.map((source) => ({ source, gone: false }))]
-                        .map(({ source, gone }) => (
-                            <li key={workflowFileSyncSourceKey(source)}>
-                                <label className="flex items-center gap-2 text-sm text-text-1">
-                                    <input
-                                        type="checkbox"
-                                        className="accent-[var(--accent)]"
-                                        aria-label={`Use File Sync source ${sourceName(source, personal)}`}
-                                        checked
-                                        onChange={(event) => toggleSource(source, event.target.checked)}
-                                    />
-                                    <span className="min-w-0 break-words">{sourceName(source, personal)}</span>
-                                    {gone ? <Pill tone="warn">No longer available</Pill> : null}
-                                </label>
-                            </li>
-                        ))}
-                </ul>
-                {atLimit ? (
-                    <p className="text-xs text-text-3">A workflow can use up to {WORKFLOW_FILE_SYNC_MAX_SOURCES} File Sync sources.</p>
-                ) : null}
-            </fieldset>
-            <div className="grid gap-3 md:grid-cols-2">
-                <label className="text-sm text-text-2">
-                    Wait for File Sync
-                    <select
-                        className={`${selectClass} mt-1`}
-                        aria-label="Wait for File Sync"
-                        value={monitored ? 'complete' : config.wait_mode}
-                        disabled={disabled || !active || monitored}
-                        onChange={(event) => update({ wait_mode: event.target.value as WorkflowFileSyncWaitMode })}
-                    >
-                        <option value="complete">Until sync completes</option>
-                        <option value="queued">Queue only</option>
-                    </select>
-                </label>
-                <label className="text-sm text-text-2">
-                    Continue the workflow
-                    <select
-                        className={`${selectClass} mt-1`}
-                        aria-label="Continue the workflow"
-                        value={monitored ? 'changed' : config.continue_mode}
-                        disabled={disabled || !active || monitored}
-                        onChange={(event) => update({ continue_mode: event.target.value as WorkflowFileSyncContinueMode })}
-                    >
-                        <option value="always">Always continue</option>
-                        <option value="changed">Only when files changed</option>
-                    </select>
-                </label>
-            </div>
-            <Toggle
-                label="Use changed files as Analyze targets"
-                checked={config.use_changed_documents}
-                disabled={disabled || !active}
-                onChange={(checked) => update({ use_changed_documents: checked })}
-                description="Analyze tasks without selected documents, and Merge files tasks set to merge the files File Sync changed, run on the files this sync changed."
-            />
-        </section>
+                        <div className="admin-field-control min-w-0 space-y-2">
+                            {sourceList.status === 'loading' ? (
+                                <p role="status" className="text-xs text-text-3">
+                                    {personal ? 'Loading your File Sync sources…' : "Loading this group's File Sync sources…"}
+                                </p>
+                            ) : null}
+                            {sourceList.status === 'failed' ? (
+                                <div role="alert" className="space-y-2 rounded-lg border border-warn/40 bg-warn/5 px-3 py-2 text-sm text-warn">
+                                    <p>
+                                        {personal ? 'Could not load your File Sync sources.' : "Could not load this group's File Sync sources."}
+                                        {' Your selection is kept, but it cannot be checked.'}
+                                    </p>
+                                    <GlassButton type="button" size="sm" onClick={sourceList.retry}>Retry File Sync sources</GlassButton>
+                                </div>
+                            ) : null}
+                            {groupFileSyncOff ? (
+                                <p role="status" className="text-xs text-text-3">
+                                    Group File Sync is not enabled, so this group&apos;s sources cannot be listed.
+                                    {config.sources.length ? ' Your selection is kept, but it cannot be checked.' : ''}
+                                </p>
+                            ) : null}
+                            {personalFileSyncOff ? (
+                                <p role="status" className="text-xs text-text-3">
+                                    File Sync is not enabled for your personal workspace, so your own sources cannot be listed.
+                                </p>
+                            ) : null}
+                            {ready && !groupFileSyncOff && !listed.length ? (
+                                <p role="status" className="text-xs text-text-3">
+                                    {personal ? 'No File Sync sources are available to you.' : 'No File Sync sources are available to this group.'}
+                                </p>
+                            ) : null}
+                            <ul className="space-y-1" aria-label="File Sync sources">
+                                {listed.map((source) => {
+                                    const key = workflowFileSyncSourceKey(source);
+                                    const checked = selected.has(key);
+                                    return (
+                                        <li key={key}>
+                                            <label className="flex min-h-8 items-center gap-2 text-sm text-text-1">
+                                                <input
+                                                    type="checkbox"
+                                                    className="accent-[var(--accent)]"
+                                                    aria-label={`Use File Sync source ${source.label}`}
+                                                    checked={checked}
+                                                    disabled={!checked && atLimit}
+                                                    onChange={(event) => toggleSource(source, event.target.checked)}
+                                                />
+                                                <span className="min-w-0 break-words">{source.label}</span>
+                                                {source.source_type ? <Pill>{source.source_type}</Pill> : null}
+                                                {!source.enabled ? <Pill tone="warn">Disabled</Pill> : null}
+                                            </label>
+                                        </li>
+                                    );
+                                })}
+                                {[...unavailable.map((source) => ({ source, gone: true })), ...unverified.map((source) => ({ source, gone: false }))]
+                                    .map(({ source, gone }) => (
+                                        <li key={workflowFileSyncSourceKey(source)}>
+                                            <label className="flex min-h-8 items-center gap-2 text-sm text-text-1">
+                                                <input
+                                                    type="checkbox"
+                                                    className="accent-[var(--accent)]"
+                                                    aria-label={`Use File Sync source ${sourceName(source, personal)}`}
+                                                    checked
+                                                    onChange={(event) => toggleSource(source, event.target.checked)}
+                                                />
+                                                <span className="min-w-0 break-words">{sourceName(source, personal)}</span>
+                                                {gone ? <Pill tone="warn">No longer available</Pill> : null}
+                                            </label>
+                                        </li>
+                                    ))}
+                            </ul>
+                            {atLimit ? (
+                                <p className="text-xs text-text-3">A workflow can use up to {WORKFLOW_FILE_SYNC_MAX_SOURCES} File Sync sources.</p>
+                            ) : null}
+                        </div>
+                    </fieldset>
+                    <WorkflowField label="Wait for File Sync" htmlFor={`${baseId}-wait`} width="standard">
+                        <select
+                            id={`${baseId}-wait`}
+                            className={workflowFieldInputClass}
+                            aria-label="Wait for File Sync"
+                            value={monitored ? 'complete' : config.wait_mode}
+                            disabled={disabled || !active || monitored}
+                            onChange={(event) => update({ wait_mode: event.target.value as WorkflowFileSyncWaitMode })}
+                        >
+                            <option value="complete">Until sync completes</option>
+                            <option value="queued">Queue only</option>
+                        </select>
+                    </WorkflowField>
+                    <WorkflowField label="Continue the workflow" htmlFor={`${baseId}-continue`} width="standard">
+                        <select
+                            id={`${baseId}-continue`}
+                            className={workflowFieldInputClass}
+                            aria-label="Continue the workflow"
+                            value={monitored ? 'changed' : config.continue_mode}
+                            disabled={disabled || !active || monitored}
+                            onChange={(event) => update({ continue_mode: event.target.value as WorkflowFileSyncContinueMode })}
+                        >
+                            <option value="always">Always continue</option>
+                            <option value="changed">Only when files changed</option>
+                        </select>
+                    </WorkflowField>
+                    <WorkflowSwitch
+                        label="Use changed files as Analyze targets"
+                        checked={config.use_changed_documents}
+                        disabled={disabled || !active}
+                        onChange={(checked) => update({ use_changed_documents: checked })}
+                        description="Analyze tasks without selected documents, and Merge files tasks set to merge the files File Sync changed, run on the files this sync changed."
+                    />
+                </WorkflowFieldList>
+            </WorkflowFieldEmphasis>
+        </SectionCard>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowFlowDialog.tsx b/application/v2_ui/src/components/workflows/WorkflowFlowDialog.tsx
deleted file mode 100644
index 23578fd4e..000000000
--- a/application/v2_ui/src/components/workflows/WorkflowFlowDialog.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-// WorkflowFlowDialog.tsx
-// Standalone reader access does not depend on edit permission or an inactive run.
-
-import { useEffect, useRef } from 'react';
-import type { WorkflowScope } from '../../lib/workflowEditor';
-import { Modal } from '../ui/Modal';
-import { WorkflowFlowView } from './WorkflowFlowView';
-
-export function WorkflowFlowDialog({ scope, workflowId, onClose }: {
-    scope: WorkflowScope;
-    workflowId: string;
-    onClose: () => void;
-}) {
-    const contentRef = useRef<HTMLDivElement>(null);
-    useEffect(() => {
-        const previous = document.activeElement;
-        const dialog = contentRef.current?.closest<HTMLElement>('[role="dialog"]');
-        contentRef.current?.focus();
-        const trap = (event: KeyboardEvent) => {
-            if (event.key !== 'Tab' || !dialog) return;
-            const focusable = Array.from(dialog.querySelectorAll<HTMLElement>(
-                'button, a[href], input, select, textarea, [tabindex]',
-            )).filter((element) => element.tabIndex >= 0 && !element.matches(':disabled') &&
-                !element.closest('[hidden], [inert]') && element.getClientRects().length > 0);
-            const first = focusable[0];
-            const last = focusable.at(-1);
-            if (!first || !last) return;
-            if (event.shiftKey && (document.activeElement === first || !dialog.contains(document.activeElement))) {
-                event.preventDefault();
-                last.focus();
-            } else if (!event.shiftKey && (document.activeElement === last || !dialog.contains(document.activeElement))) {
-                event.preventDefault();
-                first.focus();
-            }
-        };
-        document.addEventListener('keydown', trap);
-        return () => {
-            document.removeEventListener('keydown', trap);
-            if (previous instanceof HTMLElement && previous.isConnected) previous.focus();
-        };
-    }, []);
-
-    return <Modal title="Workflow Flow" description="Read the current saved structured definition without editing it."
-        size="xl" tall onClose={onClose}>
-        <div ref={contentRef} tabIndex={-1} className="min-w-0 focus:outline-none">
-            <WorkflowFlowView scope={scope} target={{ kind: 'saved', workflowId }} />
-        </div>
-    </Modal>;
-}
diff --git a/application/v2_ui/src/components/workflows/WorkflowMicrosoft365RunAs.tsx b/application/v2_ui/src/components/workflows/WorkflowMicrosoft365RunAs.tsx
index e602a20e6..2a0ffddbb 100644
--- a/application/v2_ui/src/components/workflows/WorkflowMicrosoft365RunAs.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowMicrosoft365RunAs.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useId, useState } from 'react';
 import { GlassButton } from '../ui/primitives';
+import { WorkflowField, workflowFieldInputClass } from './WorkflowField';
 import {
     fetchWorkflowM365RunAsUsers,
     workflowScopeKey,
@@ -70,34 +71,30 @@ export function WorkflowMicrosoft365RunAs({
     }, [scopeKey, scopeType, groupId, attempt, canListAccounts]);
 
     const help = (
-        <p id={helpId} className="text-xs text-text-3">
+        <>
             Microsoft 365 actions use this account for manual and scheduled runs. The selected person
             must connect Microsoft 365. Selecting an account does not grant consent: when someone else saves
             the workflow or changes an agent or action it uses, the selected person approves that revision
             before it runs as them. A revision they saved themselves needs no separate approval.
-        </p>
+        </>
     );
 
     if (!canListAccounts) {
         return (
-            <div className="space-y-2">
-                <label htmlFor={selectId} className="block text-sm text-text-2">
-                    Microsoft 365 Run as
-                </label>
+            <WorkflowField label="Microsoft 365 Run as" htmlFor={selectId} width="standard" help={help} helpId={helpId}>
                 <select
                     id={selectId}
-                    className="w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 focus:border-accent focus:outline-none"
+                    className={workflowFieldInputClass}
                     value={value}
                     disabled
                     aria-describedby={`${helpId} ${statusId}`}
                 >
                     <option value={value}>{value ? 'Account selected' : 'No Microsoft 365 account selected'}</option>
                 </select>
-                {help}
-                <p id={statusId} className="text-xs text-text-3">
+                <p id={statusId} className="mt-1.5 text-xs text-text-3">
                     Only workflow managers can see which account is selected or change it.
                 </p>
-            </div>
+            </WorkflowField>
         );
     }
 
@@ -122,13 +119,10 @@ export function WorkflowMicrosoft365RunAs({
                     : '';
 
     return (
-        <div className="space-y-2">
-            <label htmlFor={selectId} className="block text-sm text-text-2">
-                Microsoft 365 Run as
-            </label>
+        <WorkflowField label="Microsoft 365 Run as" htmlFor={selectId} width="standard" help={help} helpId={helpId}>
             <select
                 id={selectId}
-                className="w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 focus:border-accent focus:outline-none"
+                className={workflowFieldInputClass}
                 value={value}
                 disabled={disabled || loading}
                 aria-busy={loading}
@@ -139,23 +133,23 @@ export function WorkflowMicrosoft365RunAs({
                 {missingSelection ? <option value={value}>{missingLabel}</option> : null}
                 {users.map((user) => <option key={user.id} value={user.id}>{user.display_name}</option>)}
             </select>
-            {help}
             {statusMessage ? (
                 <p
                     id={statusId}
                     role={failed ? 'alert' : 'status'}
                     className={failed || missingSelection
-                        ? 'rounded-xl bg-warn-soft p-3 text-sm text-warn'
-                        : 'text-xs text-text-3'}
+                        ? 'mt-2 rounded-lg border border-warn/40 bg-warn/5 px-3 py-2 text-sm text-warn'
+                        : 'mt-1.5 text-xs text-text-3'}
                 >
                     {statusMessage}
                 </p>
             ) : null}
             {failed ? (
-                <GlassButton type="button" size="sm" disabled={disabled} onClick={() => setAttempt((current) => current + 1)}>
+                <GlassButton type="button" size="sm" className="mt-2" disabled={disabled}
+                    onClick={() => setAttempt((current) => current + 1)}>
                     Retry Microsoft 365 account list
                 </GlassButton>
             ) : null}
-        </div>
+        </WorkflowField>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowScheduleFields.tsx b/application/v2_ui/src/components/workflows/WorkflowScheduleFields.tsx
index 929fd1f45..9b6a14e0d 100644
--- a/application/v2_ui/src/components/workflows/WorkflowScheduleFields.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowScheduleFields.tsx
@@ -21,8 +21,12 @@ import {
     type WorkflowScheduleUnit,
 } from '../../lib/workflowEditor';
 import { WorkflowChangedField } from './WorkflowChangeTracking';
-
-const inputClass = 'w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 placeholder:text-text-3 focus:border-accent focus:outline-none';
+import {
+    WorkflowField,
+    WorkflowFieldEmphasis,
+    WorkflowFieldList,
+    workflowFieldInputClass,
+} from './WorkflowField';
 
 type Repeats = 'interval' | WorkflowScheduleFrequency;
 
@@ -71,7 +75,7 @@ export function WorkflowScheduleFields({
     scheduled,
     onChange,
 }: {
-    /** The trigger select, laid out beside Repeats. */
+    /** The Trigger row, drawn first; the schedule's rows nest beneath it. */
     triggerField: ReactNode;
     schedule: WorkflowSchedule;
     options: WorkflowEditorOptions;
@@ -135,79 +139,80 @@ export function WorkflowScheduleFields({
     ));
 
     return (
-        <WorkflowChangedField changeKey="schedule" className="space-y-3">
-            <div className="grid gap-3 md:grid-cols-3">
-                {triggerField}
-                {calendarOffered ? (
-                    <label className="text-sm text-text-2">
-                        Repeats
-                        <select
-                            className={`${inputClass} mt-1`}
-                            aria-label="Repeats"
-                            value={calendar ? calendar.frequency : 'interval'}
-                            disabled={!scheduled}
-                            onChange={(event) => changeRepeats(event.target.value as Repeats)}
-                        >
-                            {REPEAT_OPTIONS.map((option) => <option key={option.value} value={option.value}>{option.label}</option>)}
-                        </select>
-                    </label>
-                ) : null}
-            </div>
-            {interval ? (
-                <div className="grid gap-3 md:grid-cols-3">
-                    <label className="text-sm text-text-2">
-                        Interval value
-                        <input
-                            className={`${inputClass} mt-1`}
-                            type="number"
-                            min={1}
-                            aria-label="Interval value"
-                            value={interval.value}
-                            disabled={!scheduled}
-                            onChange={(event) => updateInterval({ value: Math.max(1, Math.trunc(Number(event.target.value) || 1)) })}
-                        />
-                    </label>
-                    <label className="text-sm text-text-2">
-                        Interval unit
-                        <select
-                            className={`${inputClass} mt-1`}
-                            aria-label="Interval unit"
-                            value={interval.unit}
-                            disabled={!scheduled}
-                            onChange={(event) => updateInterval({ unit: event.target.value as WorkflowScheduleUnit })}
-                        >
-                            <option value="seconds">Seconds</option>
-                            <option value="minutes">Minutes</option>
-                            <option value="hours">Hours</option>
-                        </select>
-                    </label>
-                </div>
-            ) : null}
-            {calendar?.frequency === 'weekly' ? (
-                <fieldset disabled={!scheduled} className="min-w-0">
-                    <legend className="text-sm text-text-2">Days of the week</legend>
-                    <div className="mt-1 flex flex-wrap gap-x-4 gap-y-1">
-                        {WORKFLOW_SCHEDULE_DAYS.map((day) => (
-                            <label key={day} className="flex items-center gap-2 text-sm text-text-1">
-                                <input
-                                    type="checkbox"
-                                    className="accent-[var(--accent)]"
-                                    checked={calendar.days_of_week.includes(day)}
-                                    onChange={(event) => toggleDay(day, event.target.checked)}
-                                />
-                                {dayName(day)}
-                            </label>
-                        ))}
-                    </div>
-                </fieldset>
-            ) : null}
-            {calendar ? (
-                <div className="grid gap-3 md:grid-cols-3">
-                    {calendar.frequency === 'monthly' ? (
-                        <label className="text-sm text-text-2">
-                            Day of the month
+        <WorkflowChangedField changeKey="schedule" className="min-w-0">
+            {triggerField}
+            {/* The schedule belongs to the trigger, so it sits beneath it. It stays visible, though
+                disabled, while the trigger is Manual, so a schedule is never silently lost. */}
+            <WorkflowFieldEmphasis emphasis="dependent">
+                <WorkflowFieldList>
+                    {calendarOffered ? (
+                        <WorkflowField label="Repeats" htmlFor={`${baseId}-repeats`} width="standard">
+                            <select
+                                id={`${baseId}-repeats`}
+                                className={workflowFieldInputClass}
+                                aria-label="Repeats"
+                                value={calendar ? calendar.frequency : 'interval'}
+                                disabled={!scheduled}
+                                onChange={(event) => changeRepeats(event.target.value as Repeats)}
+                            >
+                                {REPEAT_OPTIONS.map((option) => <option key={option.value} value={option.value}>{option.label}</option>)}
+                            </select>
+                        </WorkflowField>
+                    ) : null}
+                    {interval ? (
+                        <WorkflowField label="Interval value" htmlFor={`${baseId}-interval-value`} width="compact">
                             <input
-                                className={`${inputClass} mt-1`}
+                                id={`${baseId}-interval-value`}
+                                className={workflowFieldInputClass}
+                                type="number"
+                                min={1}
+                                aria-label="Interval value"
+                                value={interval.value}
+                                disabled={!scheduled}
+                                onChange={(event) => updateInterval({ value: Math.max(1, Math.trunc(Number(event.target.value) || 1)) })}
+                            />
+                        </WorkflowField>
+                    ) : null}
+                    {interval ? (
+                        <WorkflowField label="Interval unit" htmlFor={`${baseId}-interval-unit`} width="standard">
+                            <select
+                                id={`${baseId}-interval-unit`}
+                                className={workflowFieldInputClass}
+                                aria-label="Interval unit"
+                                value={interval.unit}
+                                disabled={!scheduled}
+                                onChange={(event) => updateInterval({ unit: event.target.value as WorkflowScheduleUnit })}
+                            >
+                                <option value="seconds">Seconds</option>
+                                <option value="minutes">Minutes</option>
+                                <option value="hours">Hours</option>
+                            </select>
+                        </WorkflowField>
+                    ) : null}
+                    {calendar?.frequency === 'weekly' ? (
+                        <WorkflowField label="Days of the week" labelId={`${baseId}-days`} group width="full">
+                            <div className="flex min-h-10 flex-wrap items-center gap-x-4 gap-y-2">
+                                {WORKFLOW_SCHEDULE_DAYS.map((day) => (
+                                    <label key={day} className="flex items-center gap-2 text-sm text-text-1">
+                                        <input
+                                            type="checkbox"
+                                            className="accent-[var(--accent)]"
+                                            checked={calendar.days_of_week.includes(day)}
+                                            disabled={!scheduled}
+                                            onChange={(event) => toggleDay(day, event.target.checked)}
+                                        />
+                                        {dayName(day)}
+                                    </label>
+                                ))}
+                            </div>
+                        </WorkflowField>
+                    ) : null}
+                    {calendar?.frequency === 'monthly' ? (
+                        <WorkflowField label="Day of the month" htmlFor={`${baseId}-month-day`} width="compact"
+                            help="Months without this day run on their last day." helpId={`${baseId}-month-help`}>
+                            <input
+                                id={`${baseId}-month-day`}
+                                className={workflowFieldInputClass}
                                 type="number"
                                 min={1}
                                 max={31}
@@ -219,65 +224,67 @@ export function WorkflowScheduleFields({
                                     day_of_month: Math.max(1, Math.trunc(Number(event.target.value) || 1)),
                                 })}
                             />
-                            <span id={`${baseId}-month-help`} className="mt-1 block text-xs text-text-3">
-                                Months without this day run on their last day.
-                            </span>
-                        </label>
+                        </WorkflowField>
+                    ) : null}
+                    {calendar ? (
+                        <WorkflowField label="Time" htmlFor={`${baseId}-time`} width="compact">
+                            <input
+                                id={`${baseId}-time`}
+                                className={workflowFieldInputClass}
+                                type="time"
+                                step={60}
+                                aria-label="Time"
+                                value={calendar.time_of_day}
+                                disabled={!scheduled}
+                                onChange={(event) => updateCalendar({ time_of_day: event.target.value })}
+                            />
+                        </WorkflowField>
+                    ) : null}
+                    {calendar ? (
+                        <WorkflowField label="Time zone" htmlFor={`${baseId}-zone`} width="standard"
+                            help="An IANA time zone, such as America/New_York.">
+                            <input
+                                id={`${baseId}-zone`}
+                                className={workflowFieldInputClass}
+                                type="text"
+                                list={`${baseId}-zones`}
+                                aria-label="Time zone"
+                                aria-describedby={zoneNote ? `${baseId}-zone-note` : undefined}
+                                autoComplete="off"
+                                spellCheck={false}
+                                value={calendar.timezone}
+                                disabled={!scheduled}
+                                onChange={(event) => {
+                                    setZoneNote(false);
+                                    updateCalendar({ timezone: event.target.value });
+                                }}
+                            />
+                            <datalist id={`${baseId}-zones`}>
+                                {(options.schedule?.timezones ?? []).map((zone) => <option key={zone} value={zone} />)}
+                            </datalist>
+                        </WorkflowField>
                     ) : null}
-                    <label className="text-sm text-text-2">
-                        Time
-                        <input
-                            className={`${inputClass} mt-1`}
-                            type="time"
-                            step={60}
-                            aria-label="Time"
-                            value={calendar.time_of_day}
-                            disabled={!scheduled}
-                            onChange={(event) => updateCalendar({ time_of_day: event.target.value })}
-                        />
-                    </label>
-                    <label className="text-sm text-text-2">
-                        Time zone
-                        <input
-                            className={`${inputClass} mt-1`}
-                            type="text"
-                            list={`${baseId}-zones`}
-                            aria-label="Time zone"
-                            aria-describedby={zoneNote ? `${baseId}-zone-note` : undefined}
-                            autoComplete="off"
-                            spellCheck={false}
-                            value={calendar.timezone}
-                            disabled={!scheduled}
-                            onChange={(event) => {
-                                setZoneNote(false);
-                                updateCalendar({ timezone: event.target.value });
-                            }}
-                        />
-                        <datalist id={`${baseId}-zones`}>
-                            {(options.schedule?.timezones ?? []).map((zone) => <option key={zone} value={zone} />)}
-                        </datalist>
-                    </label>
-                </div>
-            ) : null}
-            {calendar && zoneNote ? (
-                <p id={`${baseId}-zone-note`} role="status" className="rounded-lg bg-warn-soft p-2 text-xs text-warn">
-                    {zoneDefault.browser
-                        ? `Your browser's time zone, ${zoneDefault.browser}, isn't available, so this schedule starts in UTC.`
-                        : "Your browser didn't report a time zone, so this schedule starts in UTC."}
-                    {' '}Choose the time zone it should follow.
-                </p>
-            ) : null}
-            {!supported ? (
-                <p role="status" className="text-xs text-text-3">
-                    This workflow&apos;s schedule can&apos;t be shown or changed in this editor.
-                </p>
-            ) : null}
-            {label ? (
-                <p className="text-xs text-text-3">
-                    Schedule: {label}
-                    {calendar ? '. Runs follow local time in this zone, including daylight saving changes.' : null}
-                </p>
-            ) : null}
+                </WorkflowFieldList>
+                {calendar && zoneNote ? (
+                    <p id={`${baseId}-zone-note`} role="status" className="mb-2 rounded-lg border border-warn/40 bg-warn/5 px-3 py-2 text-xs text-warn">
+                        {zoneDefault.browser
+                            ? `Your browser's time zone, ${zoneDefault.browser}, isn't available, so this schedule starts in UTC.`
+                            : "Your browser didn't report a time zone, so this schedule starts in UTC."}
+                        {' '}Choose the time zone it should follow.
+                    </p>
+                ) : null}
+                {!supported ? (
+                    <p role="status" className="py-2 text-xs text-text-3">
+                        This workflow&apos;s schedule can&apos;t be shown or changed in this editor.
+                    </p>
+                ) : null}
+                {label ? (
+                    <p className="border-t border-edge-strong py-2.5 text-xs text-text-3">
+                        Schedule: {label}
+                        {calendar ? '. Runs follow local time in this zone, including daylight saving changes.' : null}
+                    </p>
+                ) : null}
+            </WorkflowFieldEmphasis>
         </WorkflowChangedField>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowStatusChip.tsx b/application/v2_ui/src/components/workflows/WorkflowStatusChip.tsx
new file mode 100644
index 000000000..2e629b1e8
--- /dev/null
+++ b/application/v2_ui/src/components/workflows/WorkflowStatusChip.tsx
@@ -0,0 +1,56 @@
+// WorkflowStatusChip.tsx
+// A workflow's run status as the Admin status chip draws a section's: an icon, words, and a tone.
+
+import { clsx } from 'clsx';
+import type { LucideIcon } from 'lucide-react';
+import { AlertTriangle, CircleCheck, CircleDashed, CircleSlash, CircleX, Clock, Loader2 } from 'lucide-react';
+import { workflowRunState, type WorkflowStatusTone } from '../../lib/workflowWorkbench';
+import type { WorkflowDefinition } from '../../lib/workflowEditor';
+
+const TONE_CLASS: Record<WorkflowStatusTone, string> = {
+    ok: 'text-ok border-ok/40 bg-ok/5',
+    warn: 'text-warn border-warn/40 bg-warn/5',
+    danger: 'text-danger border-danger/40 bg-danger/5',
+    neutral: 'text-text-3 border-edge-strong',
+};
+
+/** The icon that says what kind of state a status is, beside the words that name it. */
+function statusIcon(status: string, tone: WorkflowStatusTone): LucideIcon {
+    if (['running', 'started', 'in_progress'].includes(status)) return Loader2;
+    if (['queued', 'pending'].includes(status) || /^(awaiting|waiting)_/.test(status)) return Clock;
+    if (status === 'completed_partial') return AlertTriangle;
+    if (['cancelled', 'canceled'].includes(status)) return CircleSlash;
+    if (tone === 'danger') return CircleX;
+    if (tone === 'ok') return CircleCheck;
+    return CircleDashed;
+}
+
+export function WorkflowStatusChip({ workflow, compact = false }: {
+    workflow: WorkflowDefinition;
+    /** Icon only, with the words kept for assistive technology, for a narrow list row. */
+    compact?: boolean;
+}) {
+    const state = workflowRunState(workflow);
+    if (!state) return null;
+    const Icon = statusIcon(state.status, state.tone);
+    const spinning = Icon === Loader2;
+    if (compact) {
+        return (
+            <span className={clsx('inline-flex shrink-0', TONE_CLASS[state.tone].split(' ')[0])} title={state.label}>
+                <Icon size={14} aria-hidden="true" className={spinning ? 'animate-spin' : undefined} />
+                <span className="sr-only">{state.label}</span>
+            </span>
+        );
+    }
+    return (
+        <span
+            className={clsx(
+                'inline-flex max-w-full min-w-0 items-center gap-1 rounded-full border px-2 py-0.5 text-xs',
+                TONE_CLASS[state.tone],
+            )}
+        >
+            <Icon size={11} aria-hidden="true" className={clsx('shrink-0', spinning && 'animate-spin')} />
+            {state.label}
+        </span>
+    );
+}
diff --git a/application/v2_ui/src/components/workflows/WorkflowStructuredFields.tsx b/application/v2_ui/src/components/workflows/WorkflowStructuredFields.tsx
index bb46cb9c1..57f8a34e6 100644
--- a/application/v2_ui/src/components/workflows/WorkflowStructuredFields.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowStructuredFields.tsx
@@ -1,12 +1,13 @@
 // WorkflowStructuredFields.tsx
 
-import type { ReactNode } from 'react';
+import { useId, type ReactNode } from 'react';
 import { Plus, Trash2 } from 'lucide-react';
 import { GlassButton } from '../ui/primitives';
 import { WorkflowConditionEditor, WorkflowFlowInputs } from './WorkflowConditionEditor';
 import { WorkflowCollectFields, WorkflowForEachFields } from './WorkflowLoopFields';
 import { WorkflowRepeatFields, WorkflowRepeatExports } from './WorkflowRepeatFields';
 import { WorkflowChangedField } from './WorkflowChangeTracking';
+import { WorkflowField, WorkflowFieldList, workflowFieldInputClass } from './WorkflowField';
 import { workflowRegionKey } from '../../lib/workflowChangeTracking';
 import {
     analyzeWorkflowFlow, DEFAULT_FLOW_LIMITS, enclosingFlowLoopControls, flowProducers, FLOW_OUTPUT_KINDS,
@@ -205,21 +206,24 @@ export function WorkflowFlowLimitFields({ workflow, onEdit }: {
     workflow: WorkflowDefinition;
     onEdit: (command: WorkflowEditCommand) => void;
 }) {
+    const baseId = useId();
     const raw = isRecord(workflow.limits) ? workflow.limits : DEFAULT_FLOW_LIMITS;
     const limits = { max_executions: Number(raw.max_executions), deadline_seconds: Number(raw.deadline_seconds) };
-    return <fieldset className="grid min-w-0 gap-3 rounded-xl border border-edge p-3 sm:grid-cols-2">
-        <legend className="px-1 text-sm font-semibold text-text-1">Workflow run limits</legend>
-        <label className="text-xs text-text-2">
-            Maximum execution admissions
-            <input className={inputClass} type="number" min={1} max={DEFAULT_FLOW_LIMITS.max_executions}
-                aria-label="Maximum execution admissions" value={Number.isFinite(limits.max_executions) ? limits.max_executions : ''}
-                onChange={(event) => onEdit({ type: 'limits', value: { ...limits, max_executions: event.currentTarget.valueAsNumber } })} />
-        </label>
-        <label className="text-xs text-text-2">
-            Elapsed deadline (seconds, including waits)
-            <input className={inputClass} type="number" min={1} max={DEFAULT_FLOW_LIMITS.deadline_seconds}
-                aria-label="Workflow elapsed deadline" value={Number.isFinite(limits.deadline_seconds) ? limits.deadline_seconds : ''}
-                onChange={(event) => onEdit({ type: 'limits', value: { ...limits, deadline_seconds: event.currentTarget.valueAsNumber } })} />
-        </label>
+    return <fieldset className="min-w-0">
+        <legend className="sr-only">Workflow run limits</legend>
+        <WorkflowFieldList>
+            <WorkflowField label="Maximum execution admissions" htmlFor={`${baseId}-executions`} width="compact">
+                <input id={`${baseId}-executions`} className={workflowFieldInputClass} type="number" min={1}
+                    max={DEFAULT_FLOW_LIMITS.max_executions} aria-label="Maximum execution admissions"
+                    value={Number.isFinite(limits.max_executions) ? limits.max_executions : ''}
+                    onChange={(event) => onEdit({ type: 'limits', value: { ...limits, max_executions: event.currentTarget.valueAsNumber } })} />
+            </WorkflowField>
+            <WorkflowField label="Elapsed deadline (seconds, including waits)" htmlFor={`${baseId}-deadline`} width="compact">
+                <input id={`${baseId}-deadline`} className={workflowFieldInputClass} type="number" min={1}
+                    max={DEFAULT_FLOW_LIMITS.deadline_seconds} aria-label="Workflow elapsed deadline"
+                    value={Number.isFinite(limits.deadline_seconds) ? limits.deadline_seconds : ''}
+                    onChange={(event) => onEdit({ type: 'limits', value: { ...limits, deadline_seconds: event.currentTarget.valueAsNumber } })} />
+            </WorkflowField>
+        </WorkflowFieldList>
     </fieldset>;
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowTaskFields.tsx b/application/v2_ui/src/components/workflows/WorkflowTaskFields.tsx
index ceb9b0a6e..9ffbaa1c0 100644
--- a/application/v2_ui/src/components/workflows/WorkflowTaskFields.tsx
+++ b/application/v2_ui/src/components/workflows/WorkflowTaskFields.tsx
@@ -1,15 +1,17 @@
 // WorkflowTaskFields.tsx
 // Shared task fields and runner pickers for native workflow authoring.
 
-import { useState } from 'react';
-import { ArrowDown, ArrowUp, Sparkles, Trash2 } from 'lucide-react';
-import { GlassButton, GlassPanel, Toggle } from '../ui/primitives';
+import { useId, useState } from 'react';
+import { ArrowDown, ArrowUp, ChevronRight, Sparkles, Trash2 } from 'lucide-react';
+import { GlassButton, Toggle } from '../ui/primitives';
 import { Pill } from '../workspace/primitives';
 import { WorkflowDocumentPicker } from './WorkflowDocumentPicker';
 import { WorkflowConditionEditor, WorkflowDecisionFields, WorkflowFlowInputs } from './WorkflowConditionEditor';
 import { useWorkflowFieldDrafts, type WorkflowFieldDraftOwner } from './WorkflowFieldDrafts';
 import { WorkflowChangedField, WorkflowItemChangeBadge } from './WorkflowChangeTracking';
+import { WorkflowField, WorkflowFieldList, WorkflowSwitch, workflowFieldInputClass } from './WorkflowField';
 import { workflowTaskKey } from '../../lib/workflowChangeTracking';
+import { workflowTaskValidationErrors } from '../../lib/workflowEditorSections';
 import {
     defaultFlowPredicate,
     enclosingFlowLoopControls,
@@ -73,10 +75,6 @@ const inputClass = 'w-full rounded-lg border border-edge bg-surface-1 px-3 py-2
 const textareaClass = `${inputClass} min-h-24`;
 const outputOptions: WorkflowInputOutput[] = ['authoritative', 'text', 'records', 'json', 'documents'];
 
-function fieldLabel(name: string, required = false) {
-    return `${name}${required ? ' *' : ''}`;
-}
-
 function taskInputMode(task: WorkflowTask): 'auto' | 'none' | 'custom' {
     if (task.inputs == null) {
         return 'auto';
@@ -98,33 +96,11 @@ function runnerLabel(runner: WorkflowTaskRunner): string {
     return runner.type === 'agent' ? 'Specific agent' : 'Specific model';
 }
 
-function taskValidationErrors(
-    task: WorkflowTask,
-    index: number,
-    tasks: WorkflowTask[],
-    workflow: WorkflowDefinition,
-): string[] {
-    const errors: string[] = [];
-    const indexes = new Map(tasks.map((item, position) => [item.id, position]));
-    for (const input of task.inputs ?? []) {
-        if (workflow.definition_version === 3 || !isLegacyWorkflowBinding(input)) continue;
-        const producer = indexes.get(input.task_id);
-        if (producer === undefined) {
-            errors.push(`${input.name || 'Input'} points to a missing task.`);
-        } else if (producer >= index) {
-            errors.push(`${input.name || 'Input'} points to a later task.`);
-        }
-    }
-    for (const referenceId of task.reference_ids ?? []) {
-        if (!workflow.reference_inputs.some((reference) => reference.id === referenceId)) {
-            errors.push('This task references a removed shared document.');
-        }
-    }
-    if (task.instructions.length > WORKFLOW_TASK_INSTRUCTIONS_LIMIT) {
-        errors.push('Instructions exceed the workflow authoring limit.');
-    }
-    return errors;
-}
+/**
+ * How a runner picker draws itself. `stacked` is a label above its select, for the task's own
+ * runner fields; `field` is a workflow editor row, label beside control, for the Basics card.
+ */
+type RunnerPickerVariant = 'stacked' | 'field';
 
 export function WorkflowAgentPicker({
     value,
@@ -132,32 +108,42 @@ export function WorkflowAgentPicker({
     onChange,
     label = 'Agent',
     localOnly = false,
+    variant = 'stacked',
 }: {
     value?: WorkflowAgentReference;
     options: WorkflowEditorOptions;
     onChange: (value: WorkflowAgentReference | undefined) => void;
     label?: string;
     localOnly?: boolean;
+    variant?: RunnerPickerVariant;
 }) {
+    const id = useId();
     const selectedKey = workflowAgentKey(value);
+    const select = (
+        <select
+            id={variant === 'field' ? id : undefined}
+            className={variant === 'field' ? workflowFieldInputClass : `${inputClass} mt-1`}
+            aria-label={label}
+            value={selectedKey}
+            onChange={(event) => onChange(findWorkflowAgent(options, event.target.value))}
+        >
+            <option value="">Select an agent</option>
+            {options.agents.map((agent) => (
+                <option key={workflowAgentKey(agent)} value={workflowAgentKey(agent)} disabled={localOnly && agent.loop_eligible !== true}>
+                    {agent.display_name || agent.name}
+                    {agent.is_global ? ' · Provided' : agent.is_group ? ' · Group' : ''}
+                    {localOnly && agent.loop_eligible !== true ? ' · unavailable for locally metered work' : ''}
+                </option>
+            ))}
+        </select>
+    );
+    if (variant === 'field') {
+        return <WorkflowField label={label} htmlFor={id} width="standard">{select}</WorkflowField>;
+    }
     return (
         <label className="text-sm text-text-2">
             {label}
-            <select
-                className={`${inputClass} mt-1`}
-                aria-label={label}
-                value={selectedKey}
-                onChange={(event) => onChange(findWorkflowAgent(options, event.target.value))}
-            >
-                <option value="">Select an agent</option>
-                {options.agents.map((agent) => (
-                    <option key={workflowAgentKey(agent)} value={workflowAgentKey(agent)} disabled={localOnly && agent.loop_eligible !== true}>
-                        {agent.display_name || agent.name}
-                        {agent.is_global ? ' · Provided' : agent.is_group ? ' · Group' : ''}
-                        {localOnly && agent.loop_eligible !== true ? ' · unavailable for locally metered work' : ''}
-                    </option>
-                ))}
-            </select>
+            {select}
         </label>
     );
 }
@@ -169,6 +155,7 @@ export function WorkflowModelPicker({
     onChange,
     label = 'Model',
     localOnly = false,
+    variant = 'stacked',
 }: {
     endpointId?: string;
     modelId?: string;
@@ -176,39 +163,49 @@ export function WorkflowModelPicker({
     onChange: (endpointId: string, modelId: string) => void;
     label?: string;
     localOnly?: boolean;
+    variant?: RunnerPickerVariant;
 }) {
+    const id = useId();
     const selected = options.models.findIndex((model) =>
         model.endpoint_id === (endpointId ?? '') && model.model_id === (modelId ?? ''));
     const selectedKey = selected >= 0 ? String(selected) : '';
     const defaultLabel = options.default_model?.label || 'App default model';
     const defaultInvalid = options.default_model?.valid === false;
+    const select = (
+        <select
+            id={variant === 'field' ? id : undefined}
+            className={variant === 'field' ? workflowFieldInputClass : `${inputClass} mt-1`}
+            aria-label={label}
+            value={selectedKey}
+            onChange={(event) => {
+                const model = options.models[Number(event.target.value)];
+                onChange(model?.endpoint_id ?? '', model?.model_id ?? '');
+            }}
+        >
+            <option value="" disabled={localOnly && options.default_model?.loop_eligible === false}>
+                {defaultInvalid || localOnly && options.default_model?.loop_eligible === false ? `${defaultLabel} · unavailable` : defaultLabel}
+            </option>
+            {options.models.map((model, index) => (
+                <option key={`${index}:${model.endpoint_id}:${model.model_id}`} value={String(index)} disabled={localOnly && model.loop_eligible === false}>
+                    {model.label} · {model.provider}
+                    {localOnly && model.loop_eligible === false ? ' · unavailable for locally metered work' : ''}
+                </option>
+            ))}
+        </select>
+    );
+    const warning = defaultInvalid && !endpointId && !modelId ? (
+        <span className="mt-1 block text-xs text-warn">
+            The default model is not valid here. Choose an explicit authorized model before saving.
+        </span>
+    ) : null;
+    if (variant === 'field') {
+        return <WorkflowField label={label} htmlFor={id} width="standard">{select}{warning}</WorkflowField>;
+    }
     return (
         <label className="text-sm text-text-2">
             {label}
-            <select
-                className={`${inputClass} mt-1`}
-                aria-label={label}
-                value={selectedKey}
-                onChange={(event) => {
-                    const model = options.models[Number(event.target.value)];
-                    onChange(model?.endpoint_id ?? '', model?.model_id ?? '');
-                }}
-            >
-                <option value="" disabled={localOnly && options.default_model?.loop_eligible === false}>
-                    {defaultInvalid || localOnly && options.default_model?.loop_eligible === false ? `${defaultLabel} · unavailable` : defaultLabel}
-                </option>
-                {options.models.map((model, index) => (
-                    <option key={`${index}:${model.endpoint_id}:${model.model_id}`} value={String(index)} disabled={localOnly && model.loop_eligible === false}>
-                        {model.label} · {model.provider}
-                        {localOnly && model.loop_eligible === false ? ' · unavailable for locally metered work' : ''}
-                    </option>
-                ))}
-            </select>
-            {defaultInvalid && !endpointId && !modelId ? (
-                <span className="mt-1 block text-xs text-warn">
-                    The default model is not valid here. Choose an explicit authorized model before saving.
-                </span>
-            ) : null}
+            {select}
+            {warning}
         </label>
     );
 }
@@ -316,22 +313,24 @@ function OutputContractFields({
                 onChange={(checked) => onChange({ ...contract, allow_partial: checked })}
                 description="Partial remains visible as partial in run inspection; it is not treated as a fully complete answer."
             />
-            <details className="rounded-xl border border-edge p-3">
-                <summary className="cursor-pointer text-sm font-medium text-text-1">Optional JSON schema</summary>
-                <p className="mt-2 text-xs text-text-3">
-                    The schema describes the entire final value. Passing schema validation
-                    does not prove the workflow result is factually correct. V2 accepts a
-                    bounded Draft 2020-12 subset up to {WORKFLOW_SCHEMA_LIMIT / 1024} KiB;
-                    $ref, pattern, allOf and oneOf are intentionally not supported.
-                </p>
-                <textarea
-                    className={`${textareaClass} mt-2 font-mono text-xs`}
-                    aria-label="Optional JSON schema"
-                    value={schema.value}
-                    onChange={(event) => updateSchema(event.target.value)}
-                    onBlur={() => updateSchema(schema.value)}
-                />
-                {schema.error ? <p role="alert" className="mt-1 text-xs text-danger">{schema.error}</p> : null}
+            <details className="workflow-disclosure">
+                <summary><ChevronRight size={14} aria-hidden="true" className="workflow-disclosure-chevron" />Optional JSON schema</summary>
+                <div className="workflow-disclosure-body">
+                    <p className="text-xs text-text-3">
+                        The schema describes the entire final value. Passing schema validation
+                        does not prove the workflow result is factually correct. V2 accepts a
+                        bounded Draft 2020-12 subset up to {WORKFLOW_SCHEMA_LIMIT / 1024} KiB;
+                        $ref, pattern, allOf and oneOf are intentionally not supported.
+                    </p>
+                    <textarea
+                        className={`${textareaClass} mt-2 font-mono text-xs`}
+                        aria-label="Optional JSON schema"
+                        value={schema.value}
+                        onChange={(event) => updateSchema(event.target.value)}
+                        onBlur={() => updateSchema(schema.value)}
+                    />
+                    {schema.error ? <p role="alert" className="mt-1 text-xs text-danger">{schema.error}</p> : null}
+                </div>
             </details>
         </div>
     );
@@ -1010,9 +1009,9 @@ function MergeActionFields({
                     </ol>
                 </div>
             ) : null}
-            <details className="rounded-xl border border-edge p-3">
-                <summary className="cursor-pointer text-sm font-medium text-text-1">More merge options</summary>
-                <div className="mt-3 space-y-3">
+            <details className="workflow-disclosure">
+                <summary><ChevronRight size={14} aria-hidden="true" className="workflow-disclosure-chevron" />More merge options</summary>
+                <div className="workflow-disclosure-body space-y-3">
                     {kind === 'tabular' ? (
                         <>
                             <label className="text-sm text-text-2">
@@ -1530,11 +1529,18 @@ export function WorkflowTaskFields({
     draftWithAi?: WorkflowTaskDraftWithAi;
 }) {
     const previousTasks = workflow.tasks.slice(0, index);
-    const errors = taskValidationErrors(task, index, workflow.tasks, workflow);
+    const errors = workflowTaskValidationErrors(task, index, workflow.tasks, workflow);
     const drafts = useWorkflowFieldDrafts();
     const draftOwner: WorkflowFieldDraftOwner = ['task', task.id];
     const taskLabel = task.name || `Task ${index + 1}`;
     const classicControls = !structuredNode && onMove && onRemove ? { onMove, onRemove } : null;
+    // A structured block already frames its task, so the task draws its own frame only in the
+    // ordered list, where it is the item. A second border inside the block would only nest.
+    const framed = !structuredNode;
+    const fieldIds = useId();
+    const nameId = `${fieldIds}-name`;
+    const instructionsId = `${fieldIds}-instructions`;
+    const instructionsCountId = `${fieldIds}-instructions-count`;
     const defaultOutputContract = (kind: WorkflowOutputKind): WorkflowOutputContract => ({
         kind,
         require_complete_coverage: false,
@@ -1542,12 +1548,16 @@ export function WorkflowTaskFields({
     });
 
     return (
-        <div data-workflow-history-kind="task" data-workflow-history-owner={task.id} data-workflow-change-item={workflowTaskKey(task.id)}>
-        <GlassPanel elevation="flat" className="space-y-4 p-4">
-            <div className="flex flex-wrap items-start justify-between gap-3">
-                <div>
-                    <p className="text-sm font-semibold text-text-1">{taskLabel}</p>
-                    <p className="text-xs text-text-3">
+        <div data-workflow-history-kind="task" data-workflow-history-owner={task.id} data-workflow-change-item={workflowTaskKey(task.id)}
+            className={framed
+                ? '@container min-w-0 rounded-xl border border-edge-strong bg-surface-solid'
+                : '@container min-w-0'}>
+            <div className={framed
+                ? 'flex flex-wrap items-start justify-between gap-3 rounded-t-xl border-b border-edge-strong bg-surface-sunken px-3 py-2.5 sm:px-4'
+                : 'flex flex-wrap items-start justify-between gap-3'}>
+                <div className="min-w-0 flex-1 basis-48">
+                    <p className="text-sm font-semibold break-words text-text-1">{taskLabel}</p>
+                    <p className="mt-0.5 text-xs text-text-3">
                         {runnerLabel(task.runner)} · {taskInputMode(task) === 'auto' ? 'automatic input' : `${task.inputs?.length ?? 0} bound inputs`}
                     </p>
                     <WorkflowItemChangeBadge itemKey={workflowTaskKey(task.id)} unframed={['placement']} className="mt-2" />
@@ -1572,41 +1582,43 @@ export function WorkflowTaskFields({
                     </> : null}
                 </div> : null}
             </div>
+            <div className={framed ? 'space-y-3 px-3 pb-3 sm:px-4' : 'space-y-3'}>
             {errors.length ? (
-                <div role="alert" className="rounded-xl bg-danger-soft p-3 text-sm text-danger">
-                    {errors.map((error) => <p key={error}>{error}</p>)}
+                <div role="alert" className="mt-3 flex items-start gap-2 rounded-lg border border-danger/40 bg-danger/5 px-3 py-2 text-sm text-danger">
+                    <div>{errors.map((error) => <p key={error}>{error}</p>)}</div>
                 </div>
             ) : null}
-            <div className="grid gap-3 md:grid-cols-2">
+            <WorkflowFieldList>
                 <WorkflowChangedField changeKey={workflowTaskKey(task.id, 'name')}>
-                <label className="text-sm text-text-2">
-                    {fieldLabel('Task name', true)}
-                    <input
-                        className={`${inputClass} mt-1`}
-                        aria-label="Task name"
-                        value={task.name}
-                        required
-                        onChange={(event) => onChange({ ...task, name: event.target.value })}
-                    />
-                </label>
+                    <WorkflowField label="Task name" required htmlFor={nameId} width="wide">
+                        <input
+                            id={nameId}
+                            className={workflowFieldInputClass}
+                            aria-label="Task name"
+                            value={task.name}
+                            required
+                            onChange={(event) => onChange({ ...task, name: event.target.value })}
+                        />
+                    </WorkflowField>
                 </WorkflowChangedField>
-            </div>
-            <WorkflowChangedField changeKey={workflowTaskKey(task.id, 'instructions')}>
-            <label className="block text-sm text-text-2">
-                {fieldLabel('Instructions', true)}
-                <textarea
-                    className={`${textareaClass} mt-1`}
-                    maxLength={WORKFLOW_TASK_INSTRUCTIONS_LIMIT}
-                    aria-label="Instructions"
-                    value={task.instructions}
-                    required
-                    onChange={(event) => onChange({ ...task, instructions: event.target.value })}
-                />
-                <span className="mt-1 block text-xs text-text-3">
-                    {task.instructions.length.toLocaleString()} / {WORKFLOW_TASK_INSTRUCTIONS_LIMIT.toLocaleString()} characters
-                </span>
-            </label>
-            </WorkflowChangedField>
+                <WorkflowChangedField changeKey={workflowTaskKey(task.id, 'instructions')}>
+                    <WorkflowField label="Instructions" required htmlFor={instructionsId} width="full">
+                        <textarea
+                            id={instructionsId}
+                            className={`${workflowFieldInputClass} min-h-28`}
+                            maxLength={WORKFLOW_TASK_INSTRUCTIONS_LIMIT}
+                            aria-label="Instructions"
+                            aria-describedby={instructionsCountId}
+                            value={task.instructions}
+                            required
+                            onChange={(event) => onChange({ ...task, instructions: event.target.value })}
+                        />
+                        <span id={instructionsCountId} className="mt-1 block text-xs text-text-3">
+                            {task.instructions.length.toLocaleString()} / {WORKFLOW_TASK_INSTRUCTIONS_LIMIT.toLocaleString()} characters
+                        </span>
+                    </WorkflowField>
+                </WorkflowChangedField>
+            </WorkflowFieldList>
             {draftWithAi && (!task.instructions.trim() || draftWithAi.message) ? (
                 <div className="flex flex-wrap items-center gap-2">
                     {!task.instructions.trim() ? (
@@ -1622,7 +1634,7 @@ export function WorkflowTaskFields({
             ) : null}
             {structuredNode && onStructuredNodeChange ? (
                 <WorkflowChangedField changeKey={workflowTaskKey(task.id, 'run_when')} className="space-y-3">
-                    <Toggle label="Run when" checked={structuredNode.run_when !== undefined}
+                    <WorkflowSwitch label="Run when" checked={structuredNode.run_when !== undefined}
                         description="False intentionally skips this task before approval or execution. A skipped task produces no output."
                         onChange={(checked) => {
                             const next = { ...structuredNode };
@@ -1637,9 +1649,9 @@ export function WorkflowTaskFields({
                     ) : null}
                 </WorkflowChangedField>
             ) : null}
-            <details className="rounded-xl border border-edge p-3">
-                <summary className="cursor-pointer text-sm font-medium text-text-1">Runner, inputs, references and outputs</summary>
-                <div className="mt-4 space-y-5">
+            <details className="workflow-disclosure">
+                <summary><ChevronRight size={14} aria-hidden="true" className="workflow-disclosure-chevron" />Runner, inputs, references and outputs</summary>
+                <div className="workflow-disclosure-body space-y-5">
                     {structuredNode ? <WorkflowChangedField changeKey={workflowTaskKey(task.id, 'publication')}>
                         <TaskPublicationFields task={task} options={options}
                         durableExecution={durableExecution} onChange={(next) => {
@@ -1732,7 +1744,7 @@ export function WorkflowTaskFields({
                     </WorkflowChangedField>
                 </div>
             </details>
-        </GlassPanel>
+            </div>
         </div>
     );
 }
diff --git a/application/v2_ui/src/components/workflows/WorkflowWorkbenchDetail.tsx b/application/v2_ui/src/components/workflows/WorkflowWorkbenchDetail.tsx
new file mode 100644
index 000000000..25703f063
--- /dev/null
+++ b/application/v2_ui/src/components/workflows/WorkflowWorkbenchDetail.tsx
@@ -0,0 +1,236 @@
+// WorkflowWorkbenchDetail.tsx
+// The selected workflow in the Workflows workbench: what it is, what it can do now, and its runs.
+//
+// Drawn the way Admin's Model Catalog draws a selected profile: a header with the name, a few
+// chips and the actions, then tabs that each scroll inside the pane. Overview is a list of facts
+// in the Admin field layout; Runs is the run history, unchanged inside; Flow is the saved
+// structured definition, for workflows that have one.
+
+import { useId, useRef, type KeyboardEvent, type RefObject } from 'react';
+import { clsx } from 'clsx';
+import { Ban, Eye, GitBranch, Loader2, Pencil, Play, Trash2 } from 'lucide-react';
+import { GlassButton } from '../ui/primitives';
+import { ConfirmAction, Pill } from '../workspace/primitives';
+import { WorkflowFlowView } from './WorkflowFlowView';
+import { WorkflowRunHistory } from './WorkflowRunHistory';
+import { WorkflowStatusChip } from './WorkflowStatusChip';
+import { workflowScopeKey, type WorkflowDefinition, type WorkflowScope } from '../../lib/workflowEditor';
+import { workflowDetailMeta, workflowOverviewFacts } from '../../lib/workflowWorkbench';
+
+export type WorkflowDetailTab = 'overview' | 'runs' | 'flow';
+
+const TAB_LABELS: Record<WorkflowDetailTab, string> = {
+    overview: 'Overview',
+    runs: 'Runs',
+    flow: 'Flow',
+};
+
+/** The tabs a workflow offers: Flow belongs to structured (definition 3) workflows only. */
+export function workflowDetailTabs(workflow: WorkflowDefinition): WorkflowDetailTab[] {
+    return workflow.definition_version === 3 ? ['overview', 'runs', 'flow'] : ['overview', 'runs'];
+}
+
+export interface WorkflowDetailPermissions {
+    canRun: boolean;
+    canCancel: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+}
+
+export function WorkflowWorkbenchDetail({
+    scope,
+    workflow,
+    tab,
+    onTabChange,
+    headingRef,
+    permissions,
+    busy,
+    actionError,
+    historyRefreshToken,
+    linkedRun,
+    onRun,
+    onCancel,
+    onEdit,
+    onDelete,
+    onWorkflowRefresh,
+}: {
+    scope: WorkflowScope;
+    workflow: WorkflowDefinition;
+    tab: WorkflowDetailTab;
+    onTabChange: (tab: WorkflowDetailTab) => void;
+    headingRef: RefObject<HTMLHeadingElement>;
+    permissions: WorkflowDetailPermissions;
+    /** A run, cancel or delete request for this workflow is in flight. */
+    busy: boolean;
+    actionError: string | null;
+    historyRefreshToken: number;
+    /** A run a link named, expanded in Runs; `navigation` remounts the history for each new link. */
+    linkedRun: { runId: string; navigation: string } | null;
+    onRun: () => void;
+    onCancel: () => void;
+    onEdit: () => void;
+    onDelete: () => void;
+    onWorkflowRefresh: () => void;
+}) {
+    const baseId = useId();
+    const titleId = `${baseId}-title`;
+    const tabs = workflowDetailTabs(workflow);
+    const shown = tabs.includes(tab) ? tab : 'overview';
+    const tabRefs = useRef<Partial<Record<WorkflowDetailTab, HTMLButtonElement | null>>>({});
+    const workflowId = workflow.id ?? '';
+    const activeRun = Boolean(workflow.active_run_id);
+    const name = String(workflow.name ?? '');
+    const description = String(workflow.description ?? '');
+    const scopeKey = workflowScopeKey(scope);
+
+    const onTabKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
+        if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return;
+        event.preventDefault();
+        const index = tabs.indexOf(shown);
+        const next = event.key === 'Home' ? 0
+            : event.key === 'End' ? tabs.length - 1
+                : event.key === 'ArrowRight' ? (index + 1) % tabs.length
+                    : (index - 1 + tabs.length) % tabs.length;
+        onTabChange(tabs[next]);
+        tabRefs.current[tabs[next]]?.focus();
+    };
+
+    return (
+        <article aria-labelledby={titleId} data-workflow-detail={workflowId} className="flex min-h-full flex-col">
+            <header className="px-4 pt-4 pb-3 sm:px-5">
+                <div className="flex flex-wrap items-start justify-between gap-3">
+                    <div className="min-w-0 flex-1 basis-56">
+                        <h3 id={titleId} ref={headingRef} tabIndex={-1}
+                            className="text-xl leading-snug font-semibold break-words text-text-1">
+                            {name || 'Untitled workflow'}
+                        </h3>
+                        <p className="mt-1 text-xs text-text-3">{workflowDetailMeta(workflow)}</p>
+                        <div className="mt-2 flex flex-wrap items-center gap-1.5">
+                            <WorkflowStatusChip workflow={workflow} />
+                            {workflow.definition_version === 3 ? <Pill tone="accent">Structured</Pill> : null}
+                        </div>
+                    </div>
+                    <div className="flex flex-wrap items-center gap-2">
+                        {activeRun ? (permissions.canCancel ? (
+                            <GlassButton type="button" variant="subtle" size="sm" disabled={busy || !workflowId}
+                                aria-label={`Cancel ${workflow.name ?? 'workflow'}`} title="Cancel the active run"
+                                onClick={onCancel}>
+                                {busy ? <Loader2 size={14} aria-hidden="true" className="animate-spin" /> : <Ban size={14} aria-hidden="true" />}
+                                Cancel
+                            </GlassButton>
+                        ) : null) : permissions.canRun ? (
+                            <GlassButton type="button" variant="primary" size="sm" disabled={busy || !workflowId}
+                                aria-label={`Run ${workflow.name ?? 'workflow'}`} onClick={onRun}>
+                                {busy ? <Loader2 size={14} aria-hidden="true" className="animate-spin" /> : <Play size={14} aria-hidden="true" />}
+                                Run
+                            </GlassButton>
+                        ) : null}
+                        <GlassButton type="button" variant="subtle" size="sm" disabled={activeRun || !workflowId}
+                            aria-label={!permissions.canEdit ? `View ${workflow.name || 'workflow'}`
+                                : activeRun ? `${workflow.name || 'Workflow'} is running; cancel or wait before editing`
+                                    : `Edit ${workflow.name || 'workflow'}`}
+                            title={activeRun ? 'Cancel the run or wait for it to finish before editing' : undefined}
+                            onClick={onEdit}>
+                            {permissions.canEdit ? <Pencil size={14} aria-hidden="true" /> : <Eye size={14} aria-hidden="true" />}
+                            {permissions.canEdit ? 'Edit' : 'View'}
+                        </GlassButton>
+                        {permissions.canDelete ? (
+                            <ConfirmAction
+                                icon={<Trash2 size={15} />}
+                                label={`Delete ${workflow.name ?? 'workflow'}`}
+                                confirmLabel="Delete"
+                                busy={busy}
+                                disabled={!workflowId}
+                                onConfirm={onDelete}
+                            />
+                        ) : null}
+                    </div>
+                </div>
+                {description ? (
+                    <p className="mt-3 max-w-[80ch] text-sm leading-relaxed break-words text-text-2">{description}</p>
+                ) : null}
+                {actionError ? (
+                    <p role="alert" className="mt-3 rounded-lg border border-danger/40 bg-danger/5 px-3 py-2 text-sm text-danger">
+                        {actionError}
+                    </p>
+                ) : null}
+            </header>
+
+            <div role="tablist" aria-label="Workflow details" onKeyDown={onTabKeyDown}
+                className="sticky top-0 z-10 flex gap-1 overflow-x-auto border-y border-edge-strong bg-surface-solid px-4 sm:px-5">
+                {tabs.map((item) => {
+                    const selected = item === shown;
+                    return (
+                        <button
+                            key={item}
+                            ref={(element) => {
+                                tabRefs.current[item] = element;
+                            }}
+                            id={`${baseId}-tab-${item}`}
+                            type="button"
+                            role="tab"
+                            aria-selected={selected}
+                            aria-controls={`${baseId}-panel`}
+                            tabIndex={selected ? 0 : -1}
+                            onClick={() => onTabChange(item)}
+                            className={clsx(
+                                '-mb-px flex shrink-0 items-center gap-1.5 border-b-2 px-3 py-2.5 text-sm transition-colors',
+                                selected
+                                    ? 'border-accent font-semibold text-accent'
+                                    : 'border-transparent text-text-2 hover:text-text-1',
+                            )}
+                        >
+                            {item === 'flow' ? <GitBranch size={13} aria-hidden="true" /> : null}
+                            {TAB_LABELS[item]}
+                        </button>
+                    );
+                })}
+            </div>
+
+            <div
+                id={`${baseId}-panel`}
+                role="tabpanel"
+                aria-labelledby={`${baseId}-tab-${shown}`}
+                tabIndex={0}
+                className="flex-1 px-4 py-4 sm:px-5"
+            >
+                {shown === 'overview' ? (
+                    <dl className="divide-y divide-edge-strong" aria-label="Workflow overview">
+                        {workflowOverviewFacts(workflow).map((fact) => (
+                            <div key={fact.label} className="admin-field admin-field-inline py-2.5" data-field-width="wide">
+                                <dt className="admin-field-heading text-sm font-semibold text-text-1">{fact.label}</dt>
+                                <dd className="admin-field-control text-sm break-words text-text-2">{fact.value}</dd>
+                            </div>
+                        ))}
+                    </dl>
+                ) : null}
+                {shown === 'runs' && workflowId ? (
+                    <div className="-mx-3">
+                        <p className="px-3 pb-3 text-[0.8125rem] leading-relaxed text-text-3">
+                            The most recent runs. Expand one to read its task results.
+                        </p>
+                        <WorkflowRunHistory
+                            // Following a run link again remounts the history: a fresh read, with
+                            // the run expanded again even if it was collapsed since.
+                            key={`${scopeKey}:${workflowId}:${linkedRun?.navigation ?? ''}`}
+                            scope={scope}
+                            workflowId={workflowId}
+                            refreshToken={historyRefreshToken}
+                            initialRunId={linkedRun?.runId ?? null}
+                            onWorkflowRefresh={onWorkflowRefresh}
+                        />
+                    </div>
+                ) : null}
+                {shown === 'flow' && workflowId ? (
+                    <div className="space-y-3">
+                        <p className="text-[0.8125rem] leading-relaxed text-text-3">
+                            The current saved structured definition, read without editing it.
+                        </p>
+                        <WorkflowFlowView key={`${scopeKey}:${workflowId}`} scope={scope}
+                            target={{ kind: 'saved', workflowId }} />
+                    </div>
+                ) : null}
+            </div>
+        </article>
+    );
+}
diff --git a/application/v2_ui/src/components/workflows/workflowEditorSectionIcons.ts b/application/v2_ui/src/components/workflows/workflowEditorSectionIcons.ts
new file mode 100644
index 000000000..19db8b43e
--- /dev/null
+++ b/application/v2_ui/src/components/workflows/workflowEditorSectionIcons.ts
@@ -0,0 +1,21 @@
+// workflowEditorSectionIcons.ts
+// The icon each workflow editor card shows, shared by the card header and the On this page index.
+//
+// Kept beside the editor rather than in `workflowEditorSections.ts` so that module stays free of
+// components and can be executed in a plain Node test.
+
+import type { LucideIcon } from 'lucide-react';
+import { BellRing, CalendarClock, FolderSync, Gauge, Library, ListChecks, Settings2, Workflow } from 'lucide-react';
+import type { WorkflowEditorSectionId } from '../../lib/workflowEditorSections';
+
+export const WORKFLOW_EDITOR_SECTION_ICONS: Readonly<Record<WorkflowEditorSectionId, LucideIcon>> = {
+    basics: Workflow,
+    trigger: CalendarClock,
+    // The workspace navigation's File sources icon, so the two read as the same feature.
+    'file-sync': FolderSync,
+    execution: Settings2,
+    references: Library,
+    limits: Gauge,
+    tasks: ListChecks,
+    alerts: BellRing,
+};
diff --git a/application/v2_ui/src/lib/workflowAlerts.ts b/application/v2_ui/src/lib/workflowAlerts.ts
index d7ba10407..e4d9d4bb5 100644
--- a/application/v2_ui/src/lib/workflowAlerts.ts
+++ b/application/v2_ui/src/lib/workflowAlerts.ts
@@ -64,6 +64,21 @@ export type WorkflowAlertSize = typeof WORKFLOW_ALERT_SIZES[number];
 export type WorkflowAlertAudience = typeof WORKFLOW_ALERT_AUDIENCES[number];
 export type WorkflowAlertScope = 'personal' | 'group';
 
+// The classic editor's wording for each alert mode and pop-up priority, shared by the V2 alert
+// summary, the workflow editor's Alerts card, and the workflows workbench so all three describe a
+// setting the same way.
+export const WORKFLOW_ALERT_MODE_LABELS: Readonly<Record<WorkflowAlertMode, string>> = {
+    off: 'Never notify me',
+    rules: 'Only when a condition is met',
+    every_run: 'On every run',
+};
+export const WORKFLOW_ALERT_PRIORITY_LABELS: Readonly<Record<WorkflowAlertPriority, string>> = {
+    none: 'No notification',
+    low: 'Low priority',
+    medium: 'Medium priority',
+    high: 'High priority',
+};
+
 /** A stored rule. Fields the editor does not know are kept on the object and sent back. */
 export interface WorkflowAlertRule {
     id?: string;
diff --git a/application/v2_ui/src/lib/workflowEditorSections.ts b/application/v2_ui/src/lib/workflowEditorSections.ts
new file mode 100644
index 000000000..4954b1ae5
--- /dev/null
+++ b/application/v2_ui/src/lib/workflowEditorSections.ts
@@ -0,0 +1,273 @@
+// workflowEditorSections.ts
+// The workflow editor's cards: which ones a draft shows, and how each reads at a glance.
+//
+// Kept apart from the editor component for the reason Admin keeps `adminSections.ts` apart from
+// its card: whether a card reads as configured, off, or needing attention is easy to get subtly
+// wrong and invisible in a screenshot, so it is executed in a test rather than reviewed by eye.
+//
+// A card's status is guidance only. It never blocks a save -- the editor's validation still
+// decides that, and its messages stay listed above the cards -- and it only reports what the
+// draft and the editor options already say. The vocabulary is Admin's (`SectionStatus` and its
+// presentation), so "Needs configuration" means the same thing on both surfaces.
+
+import type { SectionStatus } from './adminSections';
+import {
+    workflowAlertConfig,
+    workflowAlertRuleErrors,
+    WORKFLOW_ALERT_MODE_LABELS,
+    type WorkflowAlertMode,
+    type WorkflowAlertScope,
+} from './workflowAlerts';
+import { DEFAULT_FLOW_LIMITS, isLegacyWorkflowBinding } from './workflowFlow';
+import { isRecord } from './workspaceAuthoring';
+import {
+    workflowAgentKey,
+    workflowFileSyncConfig,
+    workflowScheduleLabel,
+    WORKFLOW_TASK_INSTRUCTIONS_LIMIT,
+    type WorkflowDefinition,
+    type WorkflowEditorOptions,
+    type WorkflowTask,
+} from './workflowEditor';
+
+export type WorkflowEditorSectionId =
+    | 'basics'
+    | 'trigger'
+    | 'file-sync'
+    | 'execution'
+    | 'references'
+    | 'limits'
+    | 'tasks'
+    | 'alerts';
+
+export const WORKFLOW_EDITOR_SECTION_LABELS: Readonly<Record<WorkflowEditorSectionId, string>> = {
+    basics: 'Basics',
+    trigger: 'Trigger and schedule',
+    'file-sync': 'File Sync',
+    execution: 'Execution',
+    references: 'Shared references',
+    limits: 'Limits',
+    tasks: 'Tasks',
+    alerts: 'Alerts',
+};
+
+export interface WorkflowEditorSection {
+    id: WorkflowEditorSectionId;
+    label: string;
+    status: SectionStatus;
+    /** One line of facts for the card header. */
+    meta: string;
+}
+
+export interface WorkflowEditorSectionContext {
+    options: Pick<WorkflowEditorOptions, 'agents' | 'models' | 'default_model' | 'schedule'>;
+    /** The workspace the workflow belongs to; alert rules are checked against its rules. */
+    scopeType: WorkflowAlertScope;
+    /** The group File Sync gate once the group's source list has loaded; null when unknown. */
+    groupFileSyncEnabled?: boolean | null;
+    /** Which surface a structured draft is being edited on, for the task card's title. */
+    structuredSurface?: 'list' | 'flow';
+    /** The time zones the editor offers, for a calendar schedule's label. */
+    scheduleTimezones?: ReadonlySet<string> | null;
+}
+
+function plural(count: number, one: string, many: string): string {
+    return `${count} ${count === 1 ? one : many}`;
+}
+
+/**
+ * Problems one task shows on itself: inputs that point at a missing or later task, a reference to
+ * a removed shared document, and instructions over the authoring limit.
+ */
+export function workflowTaskValidationErrors(
+    task: WorkflowTask,
+    index: number,
+    tasks: WorkflowTask[],
+    workflow: WorkflowDefinition,
+): string[] {
+    const errors: string[] = [];
+    const indexes = new Map(tasks.map((item, position) => [item.id, position]));
+    for (const input of task.inputs ?? []) {
+        if (workflow.definition_version === 3 || !isLegacyWorkflowBinding(input)) continue;
+        const producer = indexes.get(input.task_id);
+        if (producer === undefined) {
+            errors.push(`${input.name || 'Input'} points to a missing task.`);
+        } else if (producer >= index) {
+            errors.push(`${input.name || 'Input'} points to a later task.`);
+        }
+    }
+    for (const referenceId of task.reference_ids ?? []) {
+        if (!workflow.reference_inputs.some((reference) => reference.id === referenceId)) {
+            errors.push('This task references a removed shared document.');
+        }
+    }
+    if (task.instructions.length > WORKFLOW_TASK_INSTRUCTIONS_LIMIT) {
+        errors.push('Instructions exceed the workflow authoring limit.');
+    }
+    return errors;
+}
+
+/** The runner a workflow's tasks inherit: the chosen agent, the chosen model, or the app default. */
+export function workflowRunnerSummary(
+    workflow: WorkflowDefinition,
+    options: Pick<WorkflowEditorOptions, 'agents' | 'models'>,
+): string {
+    if (workflow.runner_type === 'agent') {
+        const agent = options.agents.find((item) => workflowAgentKey(item) === workflowAgentKey(workflow.selected_agent));
+        return agent?.display_name || agent?.name || 'Agent not selected';
+    }
+    const model = options.models.find((item) =>
+        item.endpoint_id === workflow.model_endpoint_id && item.model_id === workflow.model_id);
+    return model?.label || 'App default model';
+}
+
+/** Whether File Sync runs for this draft: chosen before each run, or required by the Monitor trigger. */
+export function workflowFileSyncInUse(workflow: WorkflowDefinition): boolean {
+    return workflow.trigger_type === 'file_sync' || workflowFileSyncConfig(workflow.file_sync).enabled;
+}
+
+/** Whether, and how, a workflow syncs files: off, or its sources and when they sync. */
+export function workflowFileSyncSummary(workflow: WorkflowDefinition): string {
+    if (!workflowFileSyncInUse(workflow)) return 'Runs without syncing first';
+    const sources = plural(workflowFileSyncConfig(workflow.file_sync).sources.length, 'source', 'sources');
+    return `${sources}${workflow.trigger_type === 'file_sync' ? ' · checked for changes' : ' · synced before each run'}`;
+}
+
+/** How many tasks currently show at least one problem of their own. */
+export function workflowTasksNeedingAttention(workflow: WorkflowDefinition): number {
+    return workflow.tasks.filter((task, index) =>
+        workflowTaskValidationErrors(task, index, workflow.tasks, workflow).length > 0).length;
+}
+
+function basicsStatus(workflow: WorkflowDefinition, context: WorkflowEditorSectionContext): SectionStatus {
+    if (!workflow.name.trim()) return 'incomplete';
+    if (workflow.runner_type === 'agent') return workflow.selected_agent ? 'ready' : 'incomplete';
+    const explicitModel = Boolean(workflow.model_endpoint_id || workflow.model_id);
+    return !explicitModel && context.options.default_model?.valid === false ? 'incomplete' : 'ready';
+}
+
+function fileSyncStatus(workflow: WorkflowDefinition, context: WorkflowEditorSectionContext): SectionStatus {
+    if (!workflowFileSyncInUse(workflow)) return 'off';
+    if (context.groupFileSyncEnabled === false) return 'blocked';
+    return workflowFileSyncConfig(workflow.file_sync).sources.length ? 'ready' : 'incomplete';
+}
+
+function alertStatus(workflow: WorkflowDefinition, scopeType: WorkflowAlertScope): SectionStatus {
+    const config = workflowAlertConfig(workflow);
+    if (config.alert_mode === 'off') return 'off';
+    if (config.alert_mode !== 'rules') return 'ready';
+    if (!config.alert_rules.length) return 'incomplete';
+    const errors = workflowAlertRuleErrors(config.alert_rules, workflow.tasks.map((task) => task.id), scopeType);
+    return errors.length ? 'incomplete' : 'ready';
+}
+
+function limitsMeta(workflow: WorkflowDefinition): string {
+    const raw = isRecord(workflow.limits) ? workflow.limits : DEFAULT_FLOW_LIMITS;
+    const executions = Number(raw.max_executions);
+    const deadline = Number(raw.deadline_seconds);
+    if (!Number.isFinite(executions) || !Number.isFinite(deadline)) {
+        return 'Execution admissions and elapsed deadline for each run';
+    }
+    return `Up to ${plural(executions, 'execution admission', 'execution admissions')} · ${deadline.toLocaleString()} second deadline`;
+}
+
+/** When a workflow runs, in a few words: manual, its schedule, or the File Sync check. */
+export function workflowTriggerSummary(workflow: WorkflowDefinition, timezones: ReadonlySet<string> | null = null): string {
+    if (workflow.trigger_type === 'manual') return 'Manual · runs only when started';
+    const label = workflowScheduleLabel(workflow.trigger_type, workflow.schedule, timezones);
+    if (label) return label;
+    return workflow.trigger_type === 'file_sync' ? 'Monitor File Sync changes' : 'Schedule';
+}
+
+/** How a workflow handles failure and whether it runs durably. */
+export function workflowExecutionSummary(workflow: WorkflowDefinition): string {
+    const strategy = workflow.error_handling.strategy === 'continue' ? 'Continue after failure' : 'Halt on failure';
+    const retries = plural(workflow.error_handling.retry_count, 'retry', 'retries');
+    return `${strategy} · ${retries}${workflow.durable_execution === true ? ' · Durable execution' : ''}`;
+}
+
+/** When a workflow alerts, in the alert editor's own words, with its rule count. */
+export function workflowAlertsSummary(workflow: WorkflowDefinition): string {
+    const config = workflowAlertConfig(workflow);
+    const mode = WORKFLOW_ALERT_MODE_LABELS[config.alert_mode as WorkflowAlertMode] ?? config.alert_mode;
+    return config.alert_mode === 'rules' || config.alert_rules.length
+        ? `${mode} · ${plural(config.alert_rules.length, 'rule', 'rules')}`
+        : mode;
+}
+
+function tasksLabel(workflow: WorkflowDefinition, context: WorkflowEditorSectionContext): string {
+    if (workflow.definition_version !== 3) return WORKFLOW_EDITOR_SECTION_LABELS.tasks;
+    return context.structuredSurface === 'flow' ? 'Structured Flow' : 'Structured List';
+}
+
+/**
+ * The cards a draft shows, in reading order, each with its status and a line of facts.
+ *
+ * Limits belong to structured (definition 3) drafts only, as their fields do. Every other card is
+ * always present: File Sync and Alerts read Off rather than disappearing, so the index still says
+ * where to turn them on.
+ */
+export function workflowEditorSections(
+    workflow: WorkflowDefinition,
+    context: WorkflowEditorSectionContext,
+): WorkflowEditorSection[] {
+    const timezones = context.scheduleTimezones ?? null;
+    const references = workflow.reference_inputs.length;
+    const tasks = workflow.tasks.length;
+    const needingAttention = workflowTasksNeedingAttention(workflow);
+    const sections: WorkflowEditorSection[] = [
+        {
+            id: 'basics',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.basics,
+            status: basicsStatus(workflow, context),
+            meta: `Runner: ${workflowRunnerSummary(workflow, context.options)}`,
+        },
+        {
+            id: 'trigger',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.trigger,
+            status: workflow.is_enabled === false ? 'off' : 'ready',
+            meta: workflowTriggerSummary(workflow, timezones),
+        },
+        {
+            id: 'file-sync',
+            label: WORKFLOW_EDITOR_SECTION_LABELS['file-sync'],
+            status: fileSyncStatus(workflow, context),
+            meta: workflowFileSyncSummary(workflow),
+        },
+        {
+            id: 'execution',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.execution,
+            status: 'none',
+            meta: workflowExecutionSummary(workflow),
+        },
+        {
+            id: 'references',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.references,
+            status: 'none',
+            meta: references ? plural(references, 'shared document', 'shared documents') : 'No shared documents',
+        },
+    ];
+    if (workflow.definition_version === 3) {
+        sections.push({
+            id: 'limits',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.limits,
+            status: 'none',
+            meta: limitsMeta(workflow),
+        });
+    }
+    sections.push(
+        {
+            id: 'tasks',
+            label: tasksLabel(workflow, context),
+            status: !tasks || needingAttention ? 'incomplete' : 'ready',
+            meta: `${plural(tasks, 'task', 'tasks')}${needingAttention ? ` · ${needingAttention} ${needingAttention === 1 ? 'needs' : 'need'} attention` : ''}`,
+        },
+        {
+            id: 'alerts',
+            label: WORKFLOW_EDITOR_SECTION_LABELS.alerts,
+            status: alertStatus(workflow, context.scopeType),
+            meta: workflowAlertsSummary(workflow),
+        },
+    );
+    return sections;
+}
diff --git a/application/v2_ui/src/lib/workflowRunLink.ts b/application/v2_ui/src/lib/workflowRunLink.ts
index b380edbb4..5164b92d8 100644
--- a/application/v2_ui/src/lib/workflowRunLink.ts
+++ b/application/v2_ui/src/lib/workflowRunLink.ts
@@ -1,25 +1,45 @@
 // workflowRunLink.ts
-// The workflow, and optionally the run, that a workflows-section URL names.
+// The workflow, and optionally the run, that a workflows-section URL names, and the addresses of
+// the Workflows section and its editor.
 //
-// `?workflow_id=<id>` has always opened that workflow. Adding `&run_id=<id>` opens the
-// workflow's run history instead, with that run expanded. Document provenance links use the
-// run form; the server builds them (functions_document_provenance.workflow_origin_href). The
-// links to runs a chat plan started use it too, built by `workflowRunHref`, and so do the
-// notices and alerts that name a run (notificationLinks.ts v2WorkflowRunPath). This module is
-// the one place the client builds or reads them.
+// `?workflow_id=<id>` selects that workflow in the Workflows workbench and shows its Overview.
+// Adding `&run_id=<id>` opens the workflow's Runs tab instead, with that run expanded. Document
+// provenance links use the run form; the server builds them
+// (functions_document_provenance.workflow_origin_href). The links to runs a chat plan started use
+// it too, built by `workflowRunHref`, and so do the notices and alerts that name a run
+// (notificationLinks.ts v2WorkflowRunPath). This module is the one place the client builds or
+// reads them.
 //
 // The run link is this query form on the workspace's Workflows section. There is no separate
 // `/runs/:runId` route: the section opens the run inspector from the query in both personal
-// and group workspaces (WorkflowsSection.tsx).
+// and group workspaces (WorkflowsSection.tsx). The editor is a path of its own,
+// `/workflows/<id>` or `/workflows/new`, built by `workflowEditorHref`.
 
 import type { WorkflowScope } from './workflowEditor';
 import { groupWorkspacePath } from './groupWorkspaceNavigation';
 
 export const WORKFLOW_LINK_PARAM = 'workflow_id';
 export const WORKFLOW_RUN_LINK_PARAM = 'run_id';
+/** The editor path segment that creates a workflow rather than editing one. */
+export const NEW_WORKFLOW_RESOURCE = 'new';
 
 const PERSONAL_SCOPE: WorkflowScope = { type: 'personal' };
 
+function workflowsBasePath(scope: WorkflowScope): string {
+    return scope.type === 'group' ? groupWorkspacePath(scope.groupId, 'workflows') : '/workspace/workflows';
+}
+
+/** The Workflows section of a scope's workspace, with one workflow selected when one is named. */
+export function workflowListHref(scope: WorkflowScope = PERSONAL_SCOPE, workflowId: string | null = null): string {
+    const base = workflowsBasePath(scope);
+    return workflowId ? `${base}?${new URLSearchParams({ [WORKFLOW_LINK_PARAM]: workflowId })}` : base;
+}
+
+/** A workflow's editor page, or the page that creates one when no workflow is named. */
+export function workflowEditorHref(scope: WorkflowScope, workflowId: string | null): string {
+    return `${workflowsBasePath(scope)}/${encodeURIComponent(workflowId ?? NEW_WORKFLOW_RESOURCE)}`;
+}
+
 export interface WorkflowRunLink {
     workflowId: string;
     /** Null when the link names only the workflow. */
diff --git a/application/v2_ui/src/lib/workflowWorkbench.ts b/application/v2_ui/src/lib/workflowWorkbench.ts
new file mode 100644
index 000000000..609def59e
--- /dev/null
+++ b/application/v2_ui/src/lib/workflowWorkbench.ts
@@ -0,0 +1,261 @@
+// workflowWorkbench.ts
+// What the Workflows workbench says about each workflow, and which workflows its filters keep.
+//
+// The workbench lists every workflow in a workspace as a one-line row beside a detail pane, the
+// way Admin's Model Catalog lists profiles. These are the decisions it makes about each row --
+// how a status reads, whether a workflow needs attention, what the Overview lists -- kept apart
+// from the component so they run in a test. Everything here reads the workflow record the list
+// API returns; nothing is inferred beyond it.
+
+import { workflowFileSyncConfig, workflowScheduleLabel, type WorkflowDefinition } from './workflowEditor';
+import {
+    workflowAlertsSummary,
+    workflowExecutionSummary,
+    workflowFileSyncSummary,
+    workflowTriggerSummary,
+} from './workflowEditorSections';
+
+export type WorkflowStatusTone = 'ok' | 'warn' | 'danger' | 'neutral';
+
+/** Map a run or workflow status onto a tone. */
+export function workflowStatusTone(status: unknown): WorkflowStatusTone {
+    const value = String(status ?? '').toLowerCase();
+    if (['completed', 'succeeded', 'success', 'finished'].includes(value)) {
+        return 'ok';
+    }
+    if (['running', 'queued', 'pending', 'in_progress', 'started', 'completed_partial'].includes(value)) {
+        return 'warn';
+    }
+    if (['failed', 'error', 'cancelled', 'canceled'].includes(value)) {
+        return 'danger';
+    }
+    return 'neutral';
+}
+
+/** Readable names for the statuses whose stored spelling would not read as a sentence. */
+const STATUS_LABELS: Readonly<Record<string, string>> = {
+    completed: 'Completed',
+    succeeded: 'Completed',
+    success: 'Completed',
+    finished: 'Completed',
+    completed_partial: 'Completed with task errors',
+    running: 'Running',
+    started: 'Running',
+    in_progress: 'Running',
+    queued: 'Queued',
+    pending: 'Queued',
+    cancelling: 'Cancelling',
+    failed: 'Failed',
+    error: 'Failed',
+    cancelled: 'Cancelled',
+    canceled: 'Cancelled',
+};
+
+/** A stored status as words, such as `awaiting_approval` as "Awaiting approval". */
+export function workflowStatusLabel(status: unknown): string {
+    const value = String(status ?? '').trim();
+    if (!value) return '';
+    const known = STATUS_LABELS[value.toLowerCase()];
+    if (known) return known;
+    const words = value.replace(/[_-]+/g, ' ').trim().toLowerCase();
+    return words ? `${words[0].toUpperCase()}${words.slice(1)}` : '';
+}
+
+const IN_PROGRESS_STATUSES = ['running', 'queued', 'pending', 'in_progress', 'started', 'cancelling'];
+/** A run paused until a person acts on it: an approval, a sign-in, a decision. */
+const WAITING_STATUS = /^(awaiting|waiting)_/;
+
+function normalizedStatus(value: unknown): string {
+    return String(value ?? '').trim().toLowerCase();
+}
+
+/**
+ * How the latest finished run ended, or '' when nothing says. The server keeps a workflow's
+ * `status` for the run in progress -- running, or waiting on a person -- and sets it back to idle
+ * when the run ends, recording the outcome in `last_run_status`. An older record may still hold
+ * the outcome in `status` itself.
+ */
+export function workflowLastOutcome(workflow: WorkflowDefinition): string {
+    const last = normalizedStatus(workflow.last_run_status);
+    if (last) return last;
+    const status = normalizedStatus(workflow.status);
+    return status && status !== 'idle' && !IN_PROGRESS_STATUSES.includes(status) && !WAITING_STATUS.test(status)
+        ? status : '';
+}
+
+/**
+ * What a workflow's chip says: the run in progress when there is one, else how the last run
+ * ended. Null when the record says neither, rather than guessing that it has never run.
+ */
+export function workflowRunState(workflow: WorkflowDefinition): { label: string; tone: WorkflowStatusTone; status: string } | null {
+    const status = normalizedStatus(workflow.status);
+    if (WAITING_STATUS.test(status)) {
+        return { label: workflowStatusLabel(status), tone: 'warn', status };
+    }
+    if (workflow.active_run_id || IN_PROGRESS_STATUSES.includes(status)) {
+        // The stored status can still describe the previous run, so only an in-progress one names this run.
+        return IN_PROGRESS_STATUSES.includes(status)
+            ? { label: workflowStatusLabel(status), tone: 'warn', status }
+            : { label: 'Running', tone: 'warn', status: 'running' };
+    }
+    const outcome = workflowLastOutcome(workflow);
+    return outcome ? { label: workflowStatusLabel(outcome), tone: workflowStatusTone(outcome), status: outcome } : null;
+}
+
+export function workflowIsRunning(workflow: WorkflowDefinition): boolean {
+    const status = normalizedStatus(workflow.status);
+    return Boolean(workflow.active_run_id) || IN_PROGRESS_STATUSES.includes(status) || WAITING_STATUS.test(status);
+}
+
+/**
+ * A workflow waiting on a person, or whose last run failed, was cancelled or completed with task
+ * errors and that is not running again.
+ */
+export function workflowNeedsAttention(workflow: WorkflowDefinition): boolean {
+    if (WAITING_STATUS.test(normalizedStatus(workflow.status))) return true;
+    if (workflowIsRunning(workflow)) return false;
+    const outcome = workflowLastOutcome(workflow);
+    return outcome === 'completed_partial' || workflowStatusTone(outcome) === 'danger';
+}
+
+export type WorkflowStatusFilter = 'all' | 'running' | 'attention' | 'completed' | 'disabled';
+export type WorkflowTriggerFilter = 'all' | 'manual' | 'interval' | 'file_sync';
+
+export interface WorkflowWorkbenchFilters {
+    query: string;
+    status: WorkflowStatusFilter;
+    trigger: WorkflowTriggerFilter;
+}
+
+export const DEFAULT_WORKFLOW_WORKBENCH_FILTERS: WorkflowWorkbenchFilters = {
+    query: '',
+    status: 'all',
+    trigger: 'all',
+};
+
+export const WORKFLOW_STATUS_FILTER_LABELS: Readonly<Record<WorkflowStatusFilter, string>> = {
+    all: 'All statuses',
+    running: 'Running',
+    attention: 'Needs attention',
+    completed: 'Completed',
+    disabled: 'Disabled',
+};
+
+export const WORKFLOW_TRIGGER_LABELS: Readonly<Record<Exclude<WorkflowTriggerFilter, 'all'>, string>> = {
+    manual: 'Manual',
+    interval: 'Schedule',
+    file_sync: 'Monitor File Sync changes',
+};
+
+export const WORKFLOW_TRIGGER_FILTER_LABELS: Readonly<Record<WorkflowTriggerFilter, string>> = {
+    all: 'All triggers',
+    ...WORKFLOW_TRIGGER_LABELS,
+};
+
+/** How many filters other than the search narrow the list. */
+export function workflowFiltersApplied(filters: WorkflowWorkbenchFilters): number {
+    return Number(filters.status !== 'all') + Number(filters.trigger !== 'all');
+}
+
+/** The workflows a search and the filters keep, in the list's order. */
+export function filterWorkflows(items: readonly WorkflowDefinition[], filters: WorkflowWorkbenchFilters): WorkflowDefinition[] {
+    const needle = filters.query.trim().toLowerCase();
+    return items.filter((workflow) => {
+        if (needle && !`${workflow.name ?? ''} ${workflow.description ?? ''}`.toLowerCase().includes(needle)) {
+            return false;
+        }
+        if (filters.trigger !== 'all' && workflow.trigger_type !== filters.trigger) {
+            return false;
+        }
+        switch (filters.status) {
+            case 'running':
+                return workflowIsRunning(workflow);
+            case 'attention':
+                return workflowNeedsAttention(workflow);
+            case 'completed':
+                return !workflowIsRunning(workflow) && workflowStatusTone(workflowLastOutcome(workflow)) === 'ok';
+            case 'disabled':
+                return workflow.is_enabled === false;
+            default:
+                return true;
+        }
+    });
+}
+
+/**
+ * What a row says beside its name: how the workflow stands, then its trigger in a word or two and
+ * whether it is switched off. Whether something ran is what the list is opened for, so the status
+ * leads and survives when a narrow row cuts the line short. The detail says it all in full.
+ */
+export function workflowRowMeta(workflow: WorkflowDefinition): string {
+    const trigger = workflow.trigger_type === 'manual'
+        ? 'Manual'
+        : workflowScheduleLabel(workflow.trigger_type, workflow.schedule)
+            || WORKFLOW_TRIGGER_LABELS[workflow.trigger_type === 'file_sync' ? 'file_sync' : 'interval'];
+    return [workflowRunState(workflow)?.label, trigger, workflow.is_enabled === false ? 'Disabled' : '']
+        .filter(Boolean).join(' · ');
+}
+
+/** The detail's line under the title: when it runs, in full, and whether it is switched off. */
+export function workflowDetailMeta(workflow: WorkflowDefinition): string {
+    const trigger = workflowTriggerSummary(workflow);
+    return workflow.is_enabled === false ? `${trigger} · Disabled` : trigger;
+}
+
+function runnerFact(workflow: WorkflowDefinition): string {
+    if (workflow.runner_type === 'agent') {
+        const agent = workflow.selected_agent;
+        return `Agent · ${agent?.display_name || agent?.name || 'Not selected'}`;
+    }
+    return `Model · ${workflow.model_id || 'App default model'}`;
+}
+
+export interface WorkflowOverviewFact {
+    label: string;
+    value: string;
+}
+
+/** When the last finished run ended and how, in the reader's locale, as the run history shows it. */
+function lastRunFact(workflow: WorkflowDefinition): string {
+    const outcome = workflowLastOutcome(workflow);
+    const raw = String(workflow.last_run_at ?? '').trim();
+    const parsed = raw ? new Date(raw) : null;
+    const when = parsed && !Number.isNaN(parsed.valueOf()) ? parsed.toLocaleString() : '';
+    return [outcome ? workflowStatusLabel(outcome) : '', when].filter(Boolean).join(' · ') || 'Not run yet';
+}
+
+/**
+ * The facts the Overview tab lists: when it last ran, then its settings in the order the
+ * editor's cards present them.
+ */
+export function workflowOverviewFacts(workflow: WorkflowDefinition): WorkflowOverviewFact[] {
+    const references = workflow.reference_inputs.length;
+    const tasks = workflow.tasks.length;
+    const facts: WorkflowOverviewFact[] = [
+        { label: 'Last run', value: lastRunFact(workflow) },
+        { label: 'Runner', value: runnerFact(workflow) },
+    ];
+    if (workflow.m365_run_as_user_id) {
+        facts.push({ label: 'Microsoft 365 Run as', value: 'Account selected' });
+    }
+    facts.push(
+        { label: 'Workflow enabled', value: workflow.is_enabled === false ? 'Off' : 'On' },
+        { label: 'Trigger and schedule', value: workflowTriggerSummary(workflow) },
+        {
+            label: 'File Sync',
+            value: workflowFileSyncConfig(workflow.file_sync).enabled || workflow.trigger_type === 'file_sync'
+                ? workflowFileSyncSummary(workflow) : 'Off',
+        },
+        { label: 'Execution', value: workflowExecutionSummary(workflow) },
+        {
+            label: 'Shared references',
+            value: references ? `${references} ${references === 1 ? 'document' : 'documents'}` : 'None',
+        },
+        {
+            label: workflow.definition_version === 3 ? 'Structured tasks' : 'Tasks',
+            value: `${tasks} ${tasks === 1 ? 'task' : 'tasks'}`,
+        },
+        { label: 'Alerts', value: workflowAlertsSummary(workflow) },
+    );
+    return facts;
+}
diff --git a/application/v2_ui/src/pages/GroupWorkspacePage.tsx b/application/v2_ui/src/pages/GroupWorkspacePage.tsx
index dff3a77c2..435731c96 100644
--- a/application/v2_ui/src/pages/GroupWorkspacePage.tsx
+++ b/application/v2_ui/src/pages/GroupWorkspacePage.tsx
@@ -20,6 +20,7 @@ import { resolveWorkspaceSections } from '../lib/workspaceSections';
 import { useBootstrapStore } from '../stores/bootstrapStore';
 import { useGroupWorkspaceStore, WorkspaceRequestSuperseded } from '../stores/groupWorkspaceStore';
 import { WORKSPACE_SECTIONS_BY_ID } from './workspace/sections';
+import { WorkflowEditorPage } from './workspace/WorkflowEditorPage';
 import { WorkflowsSection } from './workspace/WorkflowsSection';
 import { GroupDocumentsSection } from './workspace/DocumentsSection';
 import { GroupTagsSection } from './workspace/TagsSection';
@@ -207,6 +208,9 @@ export function GroupWorkspacePage() {
     // action adapter, or stay dark when group actions are unavailable -- never falling back to a
     // personal action.
     const nativeAgents = Boolean(ready && section === 'agents' && selected?.enabled && context.sections.agents.enabled);
+    // Workflows lays out its own workbench and its editor page, and manages their scrolling, so it
+    // is full-bleed whenever the section is available, as the agent and action editors are.
+    const nativeWorkflows = Boolean(ready && section === 'workflows' && selected?.enabled);
     const groupAgentAdapter = useMemo(
         () => context?.sections.agents.enabled
             ? createGroupAgentWorkbench({ kind: 'group', id: context.scope.id, name: context.workspace.name }, context.agent_management, groupActionAdapter)
@@ -279,10 +283,9 @@ export function GroupWorkspacePage() {
     }, [viewerId]);
 
     // A stray resource segment on a section that has no resource route -- every native group section,
-    // including the Manage sections, except the actions and agents editors -- must never fall through
-    // to a classic handoff. Once the context is loaded, drop the segment so the section itself
-    // renders, turning a /workflows/<id> deep link into the ?workflow_id= query the workflows section
-    // already understands. Actions and agents keep their editor route while that section is
+    // including the Manage sections, except the actions, agents and workflows editors -- must never
+    // fall through to a classic handoff. Once the context is loaded, drop the segment so the section
+    // itself renders. Actions, agents and workflows keep their editor route while that section is
     // available; when it is off they have no editor, so their stray segment is dropped too and the
     // section (or its lock) shows instead.
     useEffect(() => {
@@ -290,10 +293,8 @@ export function GroupWorkspacePage() {
             || !(isGroupWorkspaceSection(section) || isGroupManageSection(section))) return;
         if (section === 'actions' && context.sections.actions.enabled) return;
         if (section === 'agents' && context.sections.agents.enabled) return;
-        const target = section === 'workflows'
-            ? `${groupWorkspacePath(groupId, 'workflows')}?workflow_id=${encodeURIComponent(resourceId)}`
-            : groupWorkspacePath(groupId, section);
-        navigate(target, { replace: true });
+        if (section === 'workflows' && context.sections.workflows.enabled) return;
+        navigate(groupWorkspacePath(groupId, section), { replace: true });
     }, [context, groupId, section, resourceId, navigate]);
 
     const selectGroup = async (id: string) => {
@@ -414,7 +415,7 @@ export function GroupWorkspacePage() {
 
     const error = notice || state.error;
     return (
-        <WorkspaceShell header={header} basePath={basePath} sections={ready ? resolved : []} fullBleed={nativeDocuments || nativePrompts || nativeActions || nativeAgents}>
+        <WorkspaceShell header={header} basePath={basePath} sections={ready ? resolved : []} fullBleed={nativeDocuments || nativePrompts || nativeActions || nativeAgents || nativeWorkflows}>
             {error ? <div role="alert" className="mb-4 space-y-2 rounded-xl border border-danger/30 bg-danger-soft p-3 text-sm text-danger">
                 <p>{error}</p>
                 {state.needsReconciliation ? <GlassButton size="sm" disabled={state.loading || state.activating} onClick={() => void recover()}>Refresh workspace selection</GlassButton>
@@ -444,7 +445,7 @@ export function GroupWorkspacePage() {
                         <Compass size={14} />Browse the group directory</GlassButton>} />
             ) : ready ? (
                 <div key={`${context.scope.id}:${section ?? 'overview'}`}
-                    className={nativeDocuments || nativePrompts || nativeActions || nativeAgents ? 'flex min-h-0 flex-1 flex-col' : 'space-y-4'}>
+                    className={nativeDocuments || nativePrompts || nativeActions || nativeAgents || nativeWorkflows ? 'flex min-h-0 flex-1 flex-col' : 'space-y-4'}>
                     {!section ? (
                         <>
                             <dl className="space-y-2 text-sm text-text-2">
@@ -475,10 +476,18 @@ export function GroupWorkspacePage() {
                                     onDirtyChange={reportDocumentDirty} onBusyChange={reportDocumentBusy} />
                                     : <EmptyState icon={<Lock size={28} />} title="Tags are not available" description="You do not have access to this group's documents." />
                             )
+                            : section === 'workflows' && resourceId ? <WorkflowEditorPage key={`${context.scope.id}:${resourceId}`}
+                                scope={{ type: 'group', groupId: context.scope.id }} resourceId={resourceId}
+                                allowManage={context.sections.workflows.can_manage} interactionDisabled={accessUnconfirmed}
+                                operations={context.workflow_management?.operations} scopeLabel={context.workspace.name}
+                                // The group page already guards every navigation and the switch to another
+                                // group, so the editor reports its draft here rather than guarding again.
+                                guardNavigation={false}
+                                onDirtyChange={reportDocumentDirty} onBusyChange={reportDocumentBusy} />
                             : section === 'workflows' && !resourceId ? <WorkflowsSection scope={{ type: 'group', groupId: context.scope.id }}
                                 allowManage={context.sections.workflows.can_manage} interactionDisabled={accessUnconfirmed}
                                 operations={context.workflow_management?.operations}
-                                onDirtyChange={setDirty} onBusyChange={setResourceBusy} />
+                                onDirtyChange={reportDocumentDirty} onBusyChange={reportDocumentBusy} />
                                 : section === 'actions' && resourceId && groupActionAdapter ? (
                                     <ActionEditorPage adapter={groupActionAdapter} />
                                 ) : section === 'actions' && !resourceId && groupActionAdapter ? (
diff --git a/application/v2_ui/src/pages/workspace/WorkflowEditorPage.tsx b/application/v2_ui/src/pages/workspace/WorkflowEditorPage.tsx
new file mode 100644
index 000000000..c93a8ded4
--- /dev/null
+++ b/application/v2_ui/src/pages/workspace/WorkflowEditorPage.tsx
@@ -0,0 +1,245 @@
+// WorkflowEditorPage.tsx
+// A workflow's editor as a page of its workspace: /workspace/workflows/<id>, or .../new to create
+// one, and the same paths under a group.
+//
+// The editor used to be a dialog over the workflows list. It is a page now for the reasons the
+// Agents and Actions editors are: a workflow is long enough to want the whole width, the Admin
+// wide frame and its On this page index need a page to live in, and an editor with its own
+// address can be linked to, reloaded and left with the browser's Back. The editor itself is
+// unchanged (`WorkflowEditorDialog` in its page presentation); this component finds the
+// workflow, gates it on the workspace's permission hints, and owns how the page is left.
+//
+// Leaving with unsaved changes asks first, as the Agents and Actions editors do. In a personal
+// workspace this page asks. In a group the group page already guards every navigation and the
+// switch to another group, so this page only reports its draft there; a second router blocker
+// would silently replace the group's.
+
+import { useCallback, useEffect, useRef, useState, type MutableRefObject, type ReactNode } from 'react';
+import { useBlocker, useNavigate } from 'react-router-dom';
+import { ArrowLeft, Lock, TriangleAlert, Workflow } from 'lucide-react';
+import { WorkflowEditorDialog } from '../../components/workflows/WorkflowEditorDialog';
+import { WorkspaceLeavePrompt } from '../../components/workspace/WorkspaceEditorFrame';
+import { EmptyState, GlassButton, Skeleton } from '../../components/ui/primitives';
+import {
+    fetchScopedWorkflows,
+    fetchWorkflowEditorOptions,
+    workflowErrorMessage,
+    workflowScopeKey,
+    type WorkflowDefinition,
+    type WorkflowEditorOptions,
+    type WorkflowScope,
+} from '../../lib/workflowEditor';
+import { NEW_WORKFLOW_RESOURCE, workflowListHref } from '../../lib/workflowRunLink';
+import { isRecord } from '../../lib/workspaceAuthoring';
+
+type EditorLoad =
+    | { status: 'loading' }
+    | { status: 'failed'; message: string }
+    | { status: 'missing' }
+    | { status: 'ready'; options: WorkflowEditorOptions; workflow: WorkflowDefinition | null };
+
+/** Asks before a navigation would discard the draft, as the Agents and Actions editors do. */
+function WorkflowLeaveGuard({ dirtyRef, busyRef, busy }: {
+    dirtyRef: MutableRefObject<boolean>;
+    busyRef: MutableRefObject<boolean>;
+    busy: boolean;
+}) {
+    const blocker = useBlocker(({ currentLocation, nextLocation }) => {
+        if (!dirtyRef.current && !busyRef.current) return false;
+        // A save returns to the workbench on its own; that navigation never asks.
+        if (isRecord(nextLocation.state) && nextLocation.state.workspaceEditorSaved === true) return false;
+        return currentLocation.pathname !== nextLocation.pathname || currentLocation.search !== nextLocation.search;
+    });
+    return blocker.state === 'blocked' ? (
+        <WorkspaceLeavePrompt saving={busy} onStay={() => blocker.reset()} onDiscard={() => blocker.proceed()} />
+    ) : null;
+}
+
+/** A state the page shows instead of the editor, with the way back. */
+function EditorPlaceholder({ scope, workflowId, children }: {
+    scope: WorkflowScope;
+    workflowId: string | null;
+    children: ReactNode;
+}) {
+    const navigate = useNavigate();
+    return (
+        <div className="flex min-h-0 min-w-0 flex-1 flex-col">
+            <div className="shrink-0 border-b border-edge px-1 py-3 sm:px-4 lg:px-6">
+                <GlassButton type="button" size="sm" onClick={() => navigate(workflowListHref(scope, workflowId))}>
+                    <ArrowLeft size={15} aria-hidden="true" /> Back
+                </GlassButton>
+            </div>
+            <div className="min-h-0 flex-1 overflow-y-auto px-1 py-4 sm:px-4 lg:p-6">{children}</div>
+        </div>
+    );
+}
+
+export function WorkflowEditorPage({
+    scope,
+    resourceId,
+    allowManage = true,
+    operations,
+    interactionDisabled = false,
+    guardNavigation = true,
+    scopeLabel,
+    onDirtyChange,
+    onBusyChange,
+}: {
+    scope: WorkflowScope;
+    /** The workflow id from the path, or `new`. */
+    resourceId: string;
+    allowManage?: boolean;
+    /** The group workflow hint's operations; without one, `allowManage` gates create and edit. */
+    operations?: readonly string[];
+    interactionDisabled?: boolean;
+    /** Ask before leaving with unsaved changes. Off where the surrounding page already guards. */
+    guardNavigation?: boolean;
+    /** The workspace named under the editor's title. */
+    scopeLabel?: string;
+    onDirtyChange?: (dirty: boolean) => void;
+    onBusyChange?: (busy: boolean) => void;
+}) {
+    const navigate = useNavigate();
+    const scopeKey = workflowScopeKey(scope);
+    const isNew = resourceId === NEW_WORKFLOW_RESOURCE;
+    const offered = Array.isArray(operations) ? new Set(operations) : null;
+    const canCreate = offered ? offered.has('create') : allowManage;
+    const canEdit = offered ? offered.has('edit') : allowManage;
+    const [load, setLoad] = useState<EditorLoad>({ status: 'loading' });
+    const [attempt, setAttempt] = useState(0);
+    // A reload after Ask AI changed the saved workflow opens a fresh editor on the saved version.
+    const [instance, setInstance] = useState(0);
+    const [busy, setBusy] = useState(false);
+    const dirtyRef = useRef(false);
+    const busyRef = useRef(false);
+
+    // Refs update at once rather than on the next render, so a save can leave immediately
+    // without its own navigation tripping the guard it just satisfied.
+    const reportDirty = useCallback((value: boolean) => {
+        dirtyRef.current = value;
+        onDirtyChange?.(value);
+    }, [onDirtyChange]);
+    const reportBusy = useCallback((value: boolean) => {
+        busyRef.current = value;
+        setBusy(value);
+        onBusyChange?.(value);
+    }, [onBusyChange]);
+
+    useEffect(() => {
+        const controller = new AbortController();
+        setLoad({ status: 'loading' });
+        void Promise.all([
+            fetchWorkflowEditorOptions(scope, controller.signal),
+            isNew ? Promise.resolve(null) : fetchScopedWorkflows(scope, controller.signal),
+        ]).then(([options, workflows]) => {
+            if (controller.signal.aborted) return;
+            if (isNew) {
+                setLoad({ status: 'ready', options, workflow: null });
+                return;
+            }
+            const workflow = workflows?.find((item) => item.id === resourceId) ?? null;
+            setLoad(workflow ? { status: 'ready', options, workflow } : { status: 'missing' });
+        }).catch((cause: unknown) => {
+            if (!controller.signal.aborted) {
+                setLoad({ status: 'failed', message: workflowErrorMessage(cause, 'Could not load workflow editor options.') });
+            }
+        });
+        return () => controller.abort();
+        // The scope key stands in for the scope object, which callers rebuild on every render.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [scopeKey, resourceId, isNew, attempt]);
+
+    const backTo = isNew ? null : resourceId;
+
+    // Ask AI offers this after the saved workflow changed while the editor was open. It discards
+    // the draft and opens the saved version; a failure leaves the editor as it was.
+    const reloadSaved = async () => {
+        const [workflows, options] = await Promise.all([
+            fetchScopedWorkflows(scope),
+            fetchWorkflowEditorOptions(scope),
+        ]);
+        const fresh = workflows.find((item) => item.id === resourceId);
+        reportDirty(false);
+        setLoad(fresh ? { status: 'ready', options, workflow: fresh } : { status: 'missing' });
+        setInstance((count) => count + 1);
+    };
+
+    if (load.status === 'loading') {
+        return (
+            <EditorPlaceholder scope={scope} workflowId={backTo}>
+                <div role="status" className="mx-auto w-full max-w-[112rem] space-y-4">
+                    <span className="sr-only">Loading the workflow editor</span>
+                    <Skeleton className="h-8 w-72" />
+                    <Skeleton className="h-48 w-full" />
+                    <Skeleton className="h-48 w-full" />
+                </div>
+            </EditorPlaceholder>
+        );
+    }
+    if (load.status === 'failed') {
+        return (
+            <EditorPlaceholder scope={scope} workflowId={backTo}>
+                {/* Announced as it appears, as the section's own load failure is. */}
+                <div role="alert">
+                    <EmptyState
+                        icon={<TriangleAlert size={28} />}
+                        title="The workflow editor could not load"
+                        description={load.message}
+                        action={<GlassButton type="button" size="sm" variant="subtle" onClick={() => setAttempt((count) => count + 1)}>
+                            Retry
+                        </GlassButton>}
+                    />
+                </div>
+            </EditorPlaceholder>
+        );
+    }
+    if (load.status === 'missing') {
+        return (
+            <EditorPlaceholder scope={scope} workflowId={null}>
+                <EmptyState
+                    icon={<Workflow size={28} />}
+                    title="Workflow not found"
+                    description="This workflow is no longer available in this workspace."
+                />
+            </EditorPlaceholder>
+        );
+    }
+    if (isNew && !canCreate) {
+        return (
+            <EditorPlaceholder scope={scope} workflowId={null}>
+                <EmptyState
+                    icon={<Lock size={28} />}
+                    title="You can't create a workflow here"
+                    description="You cannot create workflows with the current workspace access."
+                />
+            </EditorPlaceholder>
+        );
+    }
+
+    return (
+        <>
+            <WorkflowEditorDialog
+                key={`${scopeKey}:${resourceId}:${instance}`}
+                presentation="page"
+                pageScopeLabel={scopeLabel}
+                scope={scope}
+                workflow={load.workflow}
+                options={{ ...load.options, can_manage: load.options.can_manage && (isNew ? canCreate : canEdit) }}
+                interactionDisabled={interactionDisabled}
+                onBusyChange={reportBusy}
+                onDirtyChange={reportDirty}
+                onReload={isNew ? undefined : reloadSaved}
+                onClose={() => navigate(workflowListHref(scope, backTo))}
+                onSaved={(saved) => {
+                    reportBusy(false);
+                    reportDirty(false);
+                    navigate(workflowListHref(scope, saved.id ?? backTo), {
+                        replace: true,
+                        state: { workspaceEditorSaved: true },
+                    });
+                }}
+            />
+            {guardNavigation ? <WorkflowLeaveGuard dirtyRef={dirtyRef} busyRef={busyRef} busy={busy} /> : null}
+        </>
+    );
+}
diff --git a/application/v2_ui/src/pages/workspace/WorkflowsSection.tsx b/application/v2_ui/src/pages/workspace/WorkflowsSection.tsx
index e17d604a7..01ddf9097 100644
--- a/application/v2_ui/src/pages/workspace/WorkflowsSection.tsx
+++ b/application/v2_ui/src/pages/workspace/WorkflowsSection.tsx
@@ -1,57 +1,92 @@
 // WorkflowsSection.tsx
-// Personal and group workflows: list, author, run, cancel, inspect history and delete.
+// Personal and group workflows as a workbench: find a workflow, see where it stands, run it, read
+// its runs, and open its editor.
+//
 // A group section offers each control from the context's workflow hint, the routes' own rule: every
 // member may run and cancel, and only the management roles create, edit and delete.
+//
+// The list used to be a column of rows, each with a strip of icon buttons and its run history
+// expanding inside the row, so reading one run pushed every other workflow down the page. It is
+// Admin's Model Catalog shape now: one-line rows beside a detail pane whose tabs scroll on their
+// own -- Overview, Runs, and for a structured workflow its Flow. The editor is a page of its own
+// (WorkflowEditorPage), at the address Edit and Create workflow open.
+//
+// Links still arrive as `?workflow_id=` (select that workflow) and `&run_id=` (open its Runs tab
+// with that run expanded); see workflowRunLink.ts. Each navigation that names a workflow is acted
+// on once.
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useLocation } from 'react-router-dom';
-import { Ban, ChevronDown, ChevronRight, Edit3, GitBranch, Play, Plus, Trash2, Workflow } from 'lucide-react';
-import { WorkflowEditorDialog } from '../../components/workflows/WorkflowEditorDialog';
-import { WorkflowFlowDialog } from '../../components/workflows/WorkflowFlowDialog';
-import { WorkflowRunHistory } from '../../components/workflows/WorkflowRunHistory';
+import { useCallback, useEffect, useId, useMemo, useRef, useState, type KeyboardEvent } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { clsx } from 'clsx';
+import { AlertTriangle, CircleCheck, Plus, Workflow } from 'lucide-react';
+import { EmptyState, GlassButton, Skeleton } from '../../components/ui/primitives';
+import { SectionError, SectionIntro, SectionSearch } from '../../components/workspace/primitives';
+import { errorMessage, useSectionResource } from '../../components/workspace/useSectionResource';
+import { WorkflowStatusChip } from '../../components/workflows/WorkflowStatusChip';
 import {
-    ConfirmAction,
-    Pill,
-    ResourceRow,
-    RowAction,
-    SectionIntro,
-    SectionList,
-    SectionSearch,
-} from '../../components/workspace/primitives';
-import {
-    errorMessage,
-    useSectionResource,
-} from '../../components/workspace/useSectionResource';
+    WorkflowWorkbenchDetail,
+    type WorkflowDetailTab,
+} from '../../components/workflows/WorkflowWorkbenchDetail';
 import {
     cancelScopedWorkflow,
     DEFAULT_WORKFLOW_SCOPE,
     deleteScopedWorkflow,
     fetchScopedWorkflows,
-    fetchWorkflowEditorOptions,
     startScopedWorkflowRun,
-    workflowErrorMessage,
-    workflowScheduleLabel,
     workflowScopeKey,
     type WorkflowDefinition,
-    type WorkflowEditorOptions,
     type WorkflowRunStartResponse,
     type WorkflowScope,
 } from '../../lib/workflowEditor';
-import { readWorkflowRunLink } from '../../lib/workflowRunLink';
+import { readWorkflowRunLink, workflowEditorHref } from '../../lib/workflowRunLink';
+import {
+    DEFAULT_WORKFLOW_WORKBENCH_FILTERS,
+    filterWorkflows,
+    workflowFiltersApplied,
+    workflowNeedsAttention,
+    workflowRowMeta,
+    workflowStatusTone,
+    WORKFLOW_STATUS_FILTER_LABELS,
+    WORKFLOW_TRIGGER_FILTER_LABELS,
+    type WorkflowStatusFilter,
+    type WorkflowTriggerFilter,
+    type WorkflowWorkbenchFilters,
+} from '../../lib/workflowWorkbench';
+
+/** Map a run or workflow status onto a pill colour. The File sources sections read it from here. */
+export const statusTone = workflowStatusTone;
+
+const filterSelectClass = clsx(
+    'min-h-9 min-w-0 max-w-full rounded-lg border border-edge bg-surface-1 px-2.5 py-1.5 text-sm text-text-1',
+    'focus:border-accent focus:outline-none',
+);
+
+function FilterSelect<T extends string>({ label, value, options, onChange }: {
+    label: string;
+    value: T;
+    options: Readonly<Record<T, string>>;
+    onChange: (value: T) => void;
+}) {
+    // Labelled by reference rather than by wrapping, so the select's name is the label alone and
+    // not the label plus the option it shows.
+    const id = useId();
+    return (
+        <div className="flex max-w-full min-w-0 items-center gap-2">
+            <label htmlFor={id} className="text-xs font-medium text-text-2">{label}</label>
+            <select id={id} className={filterSelectClass} value={value} onChange={(event) => onChange(event.target.value as T)}>
+                {(Object.keys(options) as T[]).map((key) => <option key={key} value={key}>{options[key]}</option>)}
+            </select>
+        </div>
+    );
+}
 
-/** Map a run or workflow status onto a pill colour. */
-export function statusTone(status: unknown): 'ok' | 'warn' | 'danger' | 'neutral' {
-    const value = String(status ?? '').toLowerCase();
-    if (['completed', 'succeeded', 'success', 'finished'].includes(value)) {
-        return 'ok';
-    }
-    if (['running', 'queued', 'pending', 'in_progress', 'started', 'completed_partial'].includes(value)) {
-        return 'warn';
-    }
-    if (['failed', 'error', 'cancelled', 'canceled'].includes(value)) {
-        return 'danger';
-    }
-    return 'neutral';
+function CreateWorkflowButton({ onClick }: { onClick: () => void }) {
+    return (
+        <GlassButton type="button" variant="primary" size="sm" onClick={onClick}>
+            <Plus size={14} aria-hidden="true" />
+            Create workflow
+        </GlassButton>
+    );
 }
 
 export function WorkflowsSection({
@@ -78,26 +113,19 @@ export function WorkflowsSection({
     const canCancel = offered ? offered.has('cancel') : allowManage;
     const scopeKey = workflowScopeKey(scope);
     const location = useLocation();
+    const navigate = useNavigate();
+    const baseId = useId();
     const loadWorkflows = useCallback((signal?: AbortSignal) => fetchScopedWorkflows(scope, signal), [scopeKey]);
     const { items, loading, error, loadFailed, refresh, setItems, setError } =
         useSectionResource<WorkflowDefinition>(loadWorkflows, 'Failed to load workflows.');
 
-    const [query, setQuery] = useState('');
+    const [filters, setFilters] = useState<WorkflowWorkbenchFilters>(DEFAULT_WORKFLOW_WORKBENCH_FILTERS);
+    const [selectedId, setSelectedId] = useState<string | null>(null);
+    const [focusedRowId, setFocusedRowId] = useState<string | null>(null);
+    const [tab, setTab] = useState<WorkflowDetailTab>('overview');
     const [busyId, setBusyId] = useState<string | null>(null);
-    const [expandedId, setExpandedId] = useState<string | null>(null);
+    const [actionError, setActionError] = useState<{ workflowId: string; message: string } | null>(null);
     const [historyRefreshToken, setHistoryRefreshToken] = useState(0);
-    const [editing, setEditing] = useState<WorkflowDefinition | null | 'new'>(null);
-    // Reloading the workflow opens a fresh editor on the saved version.
-    const [editorInstance, setEditorInstance] = useState(0);
-    // Opening, closing or saving an editor supersedes a reload still loading, so it cannot
-    // reopen a closed editor or replace another workflow's.
-    const editorRequest = useRef(0);
-    const [viewingFlow, setViewingFlow] = useState<{ workflowId: string; scopeKey: string } | null>(null);
-    const [options, setOptions] = useState<WorkflowEditorOptions | null>(null);
-    const [optionsLoading, setOptionsLoading] = useState(false);
-    const [optionsError, setOptionsError] = useState('');
-    const [editorDirty, setEditorDirty] = useState(false);
-    const [editorSaving, setEditorSaving] = useState(false);
     const [linkedRun, setLinkedRun] = useState<{
         scopeKey: string;
         workflowId: string;
@@ -105,86 +133,39 @@ export function WorkflowsSection({
         /** The navigation that named the run; a new one remounts the history. */
         navigation: string;
     } | null>(null);
+    // A link that selected a workflow moves focus to its title once the detail has drawn it.
+    const [focusRequest, setFocusRequest] = useState(0);
+    // A row chosen while the detail sits below the list, as on a narrow screen, scrolls it into view.
+    const [revealRequest, setRevealRequest] = useState(0);
+    const detailHeadingRef = useRef<HTMLHeadingElement>(null);
     // The last navigation whose workflow link was acted on, and the last one that re-read the list
     // because the link named a workflow the list did not have yet.
     const handledNavigation = useRef<string | null>(null);
     const relistedNavigation = useRef<string | null>(null);
 
+    // The workbench never holds an unsaved draft, so it clears any flag an editor left behind.
     useEffect(() => {
-        onDirtyChange?.(editorDirty);
-        return () => onDirtyChange?.(false);
-    }, [editorDirty, onDirtyChange]);
+        onDirtyChange?.(false);
+    }, [onDirtyChange]);
 
     useEffect(() => {
-        onBusyChange?.(editorSaving || busyId !== null);
+        onBusyChange?.(busyId !== null);
         return () => onBusyChange?.(false);
-    }, [editorSaving, busyId, onBusyChange]);
+    }, [busyId, onBusyChange]);
 
-    const visible = useMemo(() => {
-        const needle = query.trim().toLowerCase();
-        if (!needle) {
-            return items;
-        }
-        return items.filter((workflow) =>
-            `${workflow.name ?? ''} ${workflow.description ?? ''}`
-                .toLowerCase()
-                .includes(needle),
-        );
-    }, [items, query]);
+    const visible = useMemo(() => filterWorkflows(items, filters), [items, filters]);
+    const attention = useMemo(() => items.filter(workflowNeedsAttention).length, [items]);
+    const filtersApplied = workflowFiltersApplied(filters) + Number(Boolean(filters.query.trim()));
+    const selected = visible.find((workflow) => workflow.id === selectedId) ?? null;
 
-    const openEditor = useCallback(async (workflow: WorkflowDefinition | 'new') => {
-        editorRequest.current += 1;
-        if (interactionDisabled || (workflow === 'new' && !canCreate)) {
-            setOptionsError('You cannot create workflows with the current workspace access.');
-            return;
-        }
-        if (workflow !== 'new' && workflow.active_run_id) {
-            setOptionsError('This workflow has an active run. Cancel it or wait for it to finish before editing.');
-            return;
-        }
-        setOptionsLoading(true);
-        setOptionsError('');
-        try {
-            setOptions(await fetchWorkflowEditorOptions(scope));
-            setEditing(workflow);
-        } catch (cause) {
-            setOptionsError(workflowErrorMessage(cause, 'Could not load workflow editor options.'));
-        } finally {
-            setOptionsLoading(false);
-        }
-    }, [scopeKey, interactionDisabled, canCreate]);
-
-    // Ask AI offers this after the saved workflow changed while the editor was open. It discards
-    // the draft and opens the saved version; a failure leaves the editor as it was.
-    const reloadEditing = async () => {
-        if (!editing || editing === 'new' || !editing.id) return;
-        const workflowId = editing.id;
-        const request = ++editorRequest.current;
-        const [workflows, freshOptions] = await Promise.all([
-            fetchScopedWorkflows(scope),
-            fetchWorkflowEditorOptions(scope),
-        ]);
-        if (request !== editorRequest.current) return;
-        setItems(workflows);
-        setOptions(freshOptions);
-        const fresh = workflows.find((item) => item.id === workflowId);
-        if (!fresh || fresh.active_run_id) {
-            setEditing(null);
-            setEditorDirty(false);
-            setOptionsError(fresh
-                ? 'This workflow has an active run. Cancel it or wait for it to finish before editing.'
-                : 'This workflow was deleted, so it could not be reloaded.');
-            return;
-        }
-        setEditorDirty(false);
-        setEditing(fresh);
-        setEditorInstance((count) => count + 1);
-    };
+    // The detail pane always has something to show while the list does: the first workflow until
+    // another is chosen, and the next one along when the selected workflow is filtered out or deleted.
+    useEffect(() => {
+        if (loading) return;
+        if (selectedId && visible.some((workflow) => workflow.id === selectedId)) return;
+        setSelectedId(visible.find((workflow) => workflow.id)?.id ?? null);
+    }, [loading, visible, selectedId]);
 
-    // Each navigation that names a workflow is acted on once: a document's provenance link, or a
-    // workflow alert's Open workflow while this list is already open. The router gives every
-    // navigation its own key, so following the same link again acts again, and nothing else that
-    // changes here (the list refreshing after a run, say) acts on a link already handled.
     useEffect(() => {
         const navigation = `${scopeKey}:${location.key}`;
         if (handledNavigation.current === navigation) {
@@ -195,7 +176,7 @@ export function WorkflowsSection({
             handledNavigation.current = navigation;
             return;
         }
-        if (loading || editing || optionsLoading) {
+        if (loading) {
             return;
         }
         const workflow = items.find((item) => item.id === link.workflowId);
@@ -209,55 +190,54 @@ export function WorkflowsSection({
         if (!workflow) {
             return;
         }
+        // A filter left on from earlier must not hide the workflow the link came for.
+        if (!filterWorkflows([workflow], filters).length) {
+            setFilters(DEFAULT_WORKFLOW_WORKBENCH_FILTERS);
+        }
+        setSelectedId(link.workflowId);
         if (link.runId) {
-            // A run link opens the run history, not the editor.
             setLinkedRun({ scopeKey, workflowId: link.workflowId, runId: link.runId, navigation });
-            setExpandedId(link.workflowId);
+            setTab('runs');
         } else {
-            void openEditor(workflow);
+            setTab('overview');
         }
-    }, [editing, items, loading, location.key, location.search, openEditor, optionsLoading, refresh, scopeKey]);
+        setFocusRequest((count) => count + 1);
+    }, [filters, items, loading, location.key, location.search, refresh, scopeKey]);
 
-    const runAction = async (
-        workflow: WorkflowDefinition,
-        action: (id: string) => Promise<unknown>,
-        failure: string,
-    ) => {
-        if (interactionDisabled || !canCancel) {
-            setError('You cannot change workflows with the current workspace access.');
-            return;
-        }
+    useEffect(() => {
+        if (!focusRequest) return;
+        const frame = requestAnimationFrame(() => detailHeadingRef.current?.focus());
+        return () => cancelAnimationFrame(frame);
+    }, [focusRequest]);
+
+    useEffect(() => {
+        if (!revealRequest) return;
+        const heading = detailHeadingRef.current;
+        if (!heading) return;
+        // Beside the list the detail is already in sight; stacked under it, it opened out of sight.
+        const rect = heading.getBoundingClientRect();
+        if (rect.top >= 0 && rect.bottom <= window.innerHeight) return;
+        const reduceMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)').matches;
+        heading.scrollIntoView({ block: 'start', behavior: reduceMotion ? 'auto' : 'smooth' });
+    }, [revealRequest]);
+
+    const setFilter = <K extends keyof WorkflowWorkbenchFilters>(key: K, value: WorkflowWorkbenchFilters[K]) =>
+        setFilters((current) => ({ ...current, [key]: value }));
+
+    const reportError = (workflowId: string, message: string) => setActionError({ workflowId, message });
+
+    const onRun = async (workflow: WorkflowDefinition) => {
         if (!workflow.id) {
             setError('This workflow has no stable identifier. Reload before trying again.');
             return;
         }
-        setBusyId(workflow.id);
-        setError(null);
-        try {
-            await action(workflow.id);
-            await refresh();
-        } catch (actionError) {
-            setExpandedId(workflow.id);
-            await refresh();
-            setError(errorMessage(actionError, failure));
-        } finally {
-            setHistoryRefreshToken((value) => value + 1);
-            setBusyId(null);
-        }
-    };
-
-    const onRun = async (workflow: WorkflowDefinition) => {
         if (interactionDisabled || !canRun) {
-            setError('You cannot run workflows with the current workspace access.');
-            return;
-        }
-        if (!workflow.id) {
-            setError('This workflow has no stable identifier. Reload before trying again.');
+            reportError(workflow.id, 'You cannot run workflows with the current workspace access.');
             return;
         }
         setBusyId(workflow.id);
-        setError(null);
-        setExpandedId(workflow.id);
+        setActionError(null);
+        setTab('runs');
         try {
             const response: WorkflowRunStartResponse = await startScopedWorkflowRun(scope, workflow.id);
             const nextWorkflow = response.workflow
@@ -271,10 +251,32 @@ export function WorkflowsSection({
                     : workflow;
             setItems(items.map((item) => item.id === workflow.id ? nextWorkflow : item));
             await refresh();
-        } catch (actionError) {
-            setExpandedId(workflow.id);
+        } catch (actionFailure) {
+            await refresh();
+            reportError(workflow.id, errorMessage(actionFailure, 'Could not start the workflow.'));
+        } finally {
+            setHistoryRefreshToken((value) => value + 1);
+            setBusyId(null);
+        }
+    };
+
+    const onCancel = async (workflow: WorkflowDefinition) => {
+        if (!workflow.id) {
+            setError('This workflow has no stable identifier. Reload before trying again.');
+            return;
+        }
+        if (interactionDisabled || !canCancel) {
+            reportError(workflow.id, 'You cannot change workflows with the current workspace access.');
+            return;
+        }
+        setBusyId(workflow.id);
+        setActionError(null);
+        try {
+            await cancelScopedWorkflow(scope, workflow.id);
+            await refresh();
+        } catch (actionFailure) {
             await refresh();
-            setError(errorMessage(actionError, 'Could not start the workflow.'));
+            reportError(workflow.id, errorMessage(actionFailure, 'Could not cancel the workflow.'));
         } finally {
             setHistoryRefreshToken((value) => value + 1);
             setBusyId(null);
@@ -283,7 +285,7 @@ export function WorkflowsSection({
 
     const onDelete = async (workflow: WorkflowDefinition) => {
         if (interactionDisabled || !canDelete) {
-            setError('You cannot delete workflows with the current workspace access.');
+            if (workflow.id) reportError(workflow.id, 'You cannot delete workflows with the current workspace access.');
             return;
         }
         const previous = items;
@@ -291,207 +293,240 @@ export function WorkflowsSection({
             return;
         }
         setBusyId(workflow.id);
+        setActionError(null);
         setItems(items.filter((item) => item.id !== workflow.id));
         try {
             await deleteScopedWorkflow(scope, workflow.id);
         } catch (deleteError) {
             setItems(previous);
+            setSelectedId(workflow.id);
             setError(errorMessage(deleteError, 'Could not delete the workflow.'));
         } finally {
             setBusyId(null);
         }
     };
 
+    const openEditor = (workflow: WorkflowDefinition | null) => {
+        if (workflow && !workflow.id) {
+            setError('This workflow has no stable identifier. Reload before trying again.');
+            return;
+        }
+        navigate(workflowEditorHref(scope, workflow?.id ?? null));
+    };
+
+    const onListKeyDown = (event: KeyboardEvent<HTMLUListElement>) => {
+        if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) {
+            return;
+        }
+        const buttons = Array.from(event.currentTarget.querySelectorAll<HTMLButtonElement>('[data-workflow-row]'));
+        if (!buttons.length) {
+            return;
+        }
+        event.preventDefault();
+        const index = buttons.indexOf(document.activeElement as HTMLButtonElement);
+        const next = event.key === 'Home' ? 0
+            : event.key === 'End' ? buttons.length - 1
+                : event.key === 'ArrowDown' ? Math.min(buttons.length - 1, index + 1)
+                    : Math.max(0, index - 1);
+        buttons[next]?.focus();
+    };
+
+    const tabStopId =
+        (focusedRowId && visible.some((workflow) => workflow.id === focusedRowId) && focusedRowId) ||
+        (selectedId && visible.some((workflow) => workflow.id === selectedId) && selectedId) ||
+        visible.find((workflow) => workflow.id)?.id;
+
+    const clearFilters = () => setFilters(DEFAULT_WORKFLOW_WORKBENCH_FILTERS);
+    const showWorkbench = !loadFailed && (loading || items.length > 0);
+
     return (
-        <fieldset disabled={interactionDisabled} className="min-w-0 space-y-4">
+        <fieldset disabled={interactionDisabled} className="@container flex min-h-0 min-w-0 flex-1 flex-col gap-3">
             <legend className="sr-only">Workspace workflows</legend>
-            <SectionIntro
-                title="Workflows"
-                description="Repeatable tasks that run on their own, using a model or one of your agents. A workflow can run on a schedule or whenever you start it."
-                actions={canCreate ?
-                    <GlassCreateButton
-                        busy={optionsLoading}
-                        onClick={() => void openEditor('new')}
-                    /> : undefined}
-            />
+            <div className="shrink-0 space-y-3">
+                <SectionIntro
+                    title="Workflows"
+                    description="Repeatable tasks that run on their own, using a model or one of your agents. A workflow can run on a schedule or whenever you start it."
+                    actions={canCreate ? <CreateWorkflowButton onClick={() => openEditor(null)} /> : undefined}
+                />
+                <p className="max-w-[72ch] text-xs leading-relaxed text-text-3">
+                    Native V2 authoring is available for manual, interval and Monitor File Sync changes workflows, and for their alerts. Publication settings from existing workflows are preserved unchanged.
+                    {scope.type === 'group' ? ' Workflow requests stay scoped to this group, even if your active workspace changes elsewhere.' : ''}
+                </p>
+                {location.state?.workspaceEditorSaved === true ? (
+                    <p role="status" className="inline-flex items-center gap-1.5 text-xs text-text-2">
+                        <CircleCheck size={13} aria-hidden="true" className="shrink-0 text-ok" />
+                        Workflow saved.
+                    </p>
+                ) : null}
+                {error ? (
+                    <SectionError
+                        message={error}
+                        action={loadFailed ? (
+                            <GlassButton size="sm" disabled={loading} onClick={() => void refresh()}>Retry workflows</GlassButton>
+                        ) : undefined}
+                    />
+                ) : null}
+                {showWorkbench ? (
+                    <div className="space-y-2">
+                        <div className="flex flex-wrap items-center gap-x-4 gap-y-2">
+                            <div className="min-w-[min(100%,16rem)] flex-1">
+                                <SectionSearch value={filters.query} onChange={(query) => setFilter('query', query)} placeholder="Search workflows" />
+                            </div>
+                            <FilterSelect<WorkflowStatusFilter> label="Status" value={filters.status}
+                                options={WORKFLOW_STATUS_FILTER_LABELS} onChange={(value) => setFilter('status', value)} />
+                            <FilterSelect<WorkflowTriggerFilter> label="Trigger" value={filters.trigger}
+                                options={WORKFLOW_TRIGGER_FILTER_LABELS} onChange={(value) => setFilter('trigger', value)} />
+                        </div>
+                        {!loading ? (
+                            <p className="flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-text-3">
+                                <span>
+                                    <span className="font-semibold text-text-1 tabular-nums">{visible.length}</span>
+                                    {' of '}
+                                    <span className="tabular-nums">{items.length}</span>
+                                    {items.length === 1 ? ' workflow' : ' workflows'}
+                                </span>
+                                {attention ? (
+                                    <span className="inline-flex items-center gap-1 text-text-2">
+                                        <AlertTriangle size={12} aria-hidden="true" className="text-warn" />
+                                        {attention} {attention === 1 ? 'needs' : 'need'} attention
+                                    </span>
+                                ) : null}
+                                {filtersApplied ? (
+                                    <button type="button" className="text-accent underline underline-offset-2" onClick={clearFilters}>
+                                        Clear filters ({filtersApplied})
+                                    </button>
+                                ) : null}
+                            </p>
+                        ) : null}
+                    </div>
+                ) : null}
+            </div>
 
-            <p className="text-xs text-text-3">
-                Native V2 authoring is available for manual, interval and Monitor File Sync changes workflows, and for their alerts. Publication settings from existing workflows are preserved unchanged.
-            </p>
-            {scope.type === 'group' ? (
-                <p className="text-xs text-text-3">Workflow requests stay scoped to this group, even if your active workspace changes elsewhere.</p>
+            {!loading && !loadFailed && items.length === 0 ? (
+                <EmptyState
+                    icon={<Workflow size={28} />}
+                    title="No workflows yet"
+                    description="A workflow repeats a task you would otherwise run by hand."
+                    action={canCreate ? <CreateWorkflowButton onClick={() => openEditor(null)} /> : undefined}
+                />
             ) : null}
-            {optionsError ? <p role="alert" className="text-sm text-danger">{optionsError}</p> : null}
 
-            <SectionSearch value={query} onChange={setQuery} placeholder="Search workflows" />
+            {showWorkbench ? (
+                <div className="min-h-0 flex-1 overflow-y-auto @3xl:overflow-hidden">
+                    <div className="grid min-w-0 overflow-hidden rounded-xl border border-edge-strong bg-surface-solid @3xl:h-full @3xl:grid-cols-[minmax(16rem,22rem)_minmax(0,1fr)]">
+                        <div className="max-h-[24rem] min-h-0 overflow-y-auto border-b border-edge-strong @3xl:max-h-none @3xl:border-r @3xl:border-b-0">
+                            <div className="sticky top-0 z-10 flex items-center justify-between gap-3 border-b border-edge-strong bg-surface-solid px-3 py-2 text-xs font-semibold text-text-2">
+                                <span>Workflow</span>
+                                <span>Status</span>
+                            </div>
+                            {loading && !items.length ? (
+                                <div role="status" className="space-y-2 p-3">
+                                    <span className="sr-only">Loading workflows</span>
+                                    {Array.from({ length: 4 }).map((_, index) => <Skeleton key={index} className="h-10 w-full" />)}
+                                </div>
+                            ) : visible.length ? (
+                                <ul aria-label="Workflows" onKeyDown={onListKeyDown}>
+                                    {visible.map((workflow, index) => {
+                                        const workflowId = workflow.id ?? '';
+                                        const isSelected = Boolean(workflowId) && workflowId === selectedId;
+                                        const metaId = `${baseId}-row-${index}`;
+                                        const name = String(workflow.name ?? '') || 'Untitled workflow';
+                                        return (
+                                            <li key={workflowId || `index-${index}`}>
+                                                <button
+                                                    type="button"
+                                                    data-workflow-row
+                                                    aria-pressed={isSelected}
+                                                    aria-label={name}
+                                                    aria-describedby={metaId}
+                                                    disabled={!workflowId}
+                                                    title={workflowId ? undefined : 'This workflow has no stable identifier. Reload before trying again.'}
+                                                    tabIndex={workflowId && workflowId === tabStopId ? 0 : -1}
+                                                    onFocus={() => setFocusedRowId(workflowId)}
+                                                    onClick={() => {
+                                                        setSelectedId(workflowId);
+                                                        setRevealRequest((count) => count + 1);
+                                                    }}
+                                                    className={clsx(
+                                                        'flex w-full items-center gap-2.5 border-b border-edge px-3 py-2.5 text-left transition-colors',
+                                                        'disabled:cursor-not-allowed disabled:opacity-60',
+                                                        isSelected
+                                                            ? 'bg-accent-soft ring-1 ring-accent/40 ring-inset'
+                                                            : 'hover:bg-surface-sunken',
+                                                    )}
+                                                >
+                                                    {/* Wraps under the name while the list is stacked; beside the
+                                                        detail a row is one line, and the facts give way first. */}
+                                                    <span className="flex min-w-0 flex-1 flex-wrap items-baseline gap-x-2 @3xl:flex-nowrap">
+                                                        <span className={clsx(
+                                                            'min-w-0 truncate text-sm font-semibold',
+                                                            isSelected ? 'text-accent' : 'text-text-1',
+                                                        )}>
+                                                            {name}
+                                                        </span>
+                                                        <span id={metaId} className="min-w-0 shrink-[4] truncate text-xs text-text-3">
+                                                            {workflowRowMeta(workflow)}
+                                                        </span>
+                                                    </span>
+                                                    <span aria-hidden="true" className="inline-flex shrink-0">
+                                                        <WorkflowStatusChip workflow={workflow} compact />
+                                                    </span>
+                                                </button>
+                                            </li>
+                                        );
+                                    })}
+                                </ul>
+                            ) : (
+                                <div className="space-y-2 px-3 py-6">
+                                    <p className="text-sm font-medium text-text-1">
+                                        {workflowFiltersApplied(filters) ? 'No workflows match these filters' : 'No workflows match your search'}
+                                    </p>
+                                    <p className="text-[0.8125rem] leading-relaxed text-text-3">
+                                        Try another name or description, or clear the filters.
+                                    </p>
+                                    <GlassButton type="button" size="sm" variant="subtle" onClick={clearFilters}>Clear filters</GlassButton>
+                                </div>
+                            )}
+                        </div>
 
-            <SectionList
-                items={visible}
-                loading={loading}
-                error={error}
-                loadFailed={loadFailed}
-                onRetry={() => void refresh()}
-                retryLabel="Retry workflows"
-                emptyIcon={<Workflow size={28} />}
-                emptyTitle={
-                    items.length === 0 ? 'No workflows yet' : 'No workflows match your search'
-                }
-                emptyDescription={
-                    items.length === 0
-                        ? 'A workflow repeats a task you would otherwise run by hand.'
-                        : undefined
-                }
-                emptyAction={canCreate ? <GlassCreateButton busy={optionsLoading} onClick={() => void openEditor('new')} /> : undefined}
-                getKey={(workflow, index) => String(workflow.id ?? index)}
-                renderItem={(workflow) => {
-                    const running = Boolean(workflow.active_run_id);
-                    const workflowId = workflow.id ?? '';
-                    const expanded = expandedId === workflowId;
-                    const linked = linkedRun?.scopeKey === scopeKey && linkedRun.workflowId === workflowId ? linkedRun : null;
-                    const description = String(workflow.description ?? '');
-                    const scheduleLabel = workflowScheduleLabel(workflow.trigger_type, workflow.schedule);
-                    return (
-                        <div>
-                            <ResourceRow
-                                icon={<Workflow size={17} />}
-                                title={String(workflow.name ?? 'Untitled workflow')}
-                                subtitle={scheduleLabel ? (
-                                    <>
-                                        {description ? <span className="block truncate">{description}</span> : null}
-                                        <span className="block truncate">Schedule: {scheduleLabel}</span>
-                                    </>
-                                ) : description}
-                                meta={
-                                    workflow.status ? (
-                                        <Pill tone={statusTone(workflow.status)}>
-                                            {String(workflow.status)}
-                                        </Pill>
-                                    ) : undefined
-                                }
-                                actions={
-                                    <>
-                                        {workflow.definition_version === 3 ? <RowAction
-                                            icon={<GitBranch size={15} />}
-                                            label={`View Flow for ${workflow.name || 'workflow'}`}
-                                            disabled={!workflowId}
-                                            onClick={() => setViewingFlow({ workflowId, scopeKey })}
-                                        /> : null}
-                                        <RowAction
-                                            icon={<Edit3 size={15} />}
-                                            label={!canEdit ? `View ${workflow.name || 'workflow'}` : running ? `${workflow.name || 'Workflow'} is running; cancel or wait before editing` : `Edit ${workflow.name || 'workflow'}`}
-                                            disabled={optionsLoading || running}
-                                            busy={optionsLoading && editing === workflow}
-                                            onClick={() => void openEditor(workflow)}
-                                        />
-                                        <RowAction
-                                            icon={
-                                                expanded ? (
-                                                    <ChevronDown size={15} />
-                                                ) : (
-                                                    <ChevronRight size={15} />
-                                                )
-                                            }
-                                            label={
-                                                expanded
-                                                    ? 'Hide run history'
-                                                    : 'Show run history'
-                                            }
-                                            onClick={() =>
-                                                setExpandedId(expanded ? null : workflowId)
-                                            }
-                                            disabled={!workflowId}
-                                        />
-                                        {running ? (canCancel ? (
-                                            <RowAction
-                                                icon={<Ban size={15} />}
-                                                label={`Cancel ${workflow.name ?? 'workflow'}`}
-                                                busy={busyId === workflow.id}
-                                                onClick={() =>
-                                                    void runAction(
-                                                        workflow,
-                                                        (id) => cancelScopedWorkflow(scope, id),
-                                                        'Could not cancel the workflow.',
-                                                    )
-                                                }
-                                            />
-                                        ) : null) : canRun ? (
-                                            <RowAction
-                                                icon={<Play size={15} />}
-                                                label={`Run ${workflow.name ?? 'workflow'}`}
-                                                busy={busyId === workflow.id}
-                                                onClick={() => void onRun(workflow)}
-                                            />
-                                        ) : null}
-                                        {canDelete ? <ConfirmAction
-                                            icon={<Trash2 size={15} />}
-                                            label={`Delete ${workflow.name ?? 'workflow'}`}
-                                            confirmLabel="Delete"
-                                            busy={busyId === workflow.id}
-                                            onConfirm={() => void onDelete(workflow)}
-                                        /> : null}
-                                    </>
-                                }
-                            />
-                            {expanded && workflowId ? (
-                                <WorkflowRunHistory
-                                    // Following a run link again remounts the history: a fresh read,
-                                    // with the run expanded again even if it was collapsed since.
-                                    key={`${scopeKey}:${workflowId}:${linked?.navigation ?? ''}`}
+                        <div className="@container min-h-0 min-w-0 @3xl:overflow-y-auto">
+                            {loading && !items.length ? (
+                                <div className="space-y-3 p-5" aria-hidden="true">
+                                    <Skeleton className="h-7 w-2/3" />
+                                    <Skeleton className="h-4 w-1/3" />
+                                    <Skeleton className="h-32 w-full" />
+                                </div>
+                            ) : selected ? (
+                                <WorkflowWorkbenchDetail
+                                    key={`${scopeKey}:${selected.id}`}
                                     scope={scope}
-                                    workflowId={workflowId}
-                                    refreshToken={historyRefreshToken}
-                                    initialRunId={linked?.runId ?? null}
+                                    workflow={selected}
+                                    tab={tab}
+                                    onTabChange={setTab}
+                                    headingRef={detailHeadingRef}
+                                    permissions={{ canRun, canCancel, canEdit, canDelete }}
+                                    busy={busyId === selected.id}
+                                    actionError={actionError && actionError.workflowId === selected.id ? actionError.message : null}
+                                    historyRefreshToken={historyRefreshToken}
+                                    linkedRun={linkedRun?.scopeKey === scopeKey && linkedRun.workflowId === selected.id ? linkedRun : null}
+                                    onRun={() => void onRun(selected)}
+                                    onCancel={() => void onCancel(selected)}
+                                    onEdit={() => openEditor(selected)}
+                                    onDelete={() => void onDelete(selected)}
                                     onWorkflowRefresh={() => void refresh()}
                                 />
-                            ) : null}
+                            ) : (
+                                <div className="flex h-full min-h-[12rem] flex-col items-center justify-center px-6 py-10 text-center">
+                                    <p className="text-sm font-medium text-text-1">No workflow selected</p>
+                                    <p className="mt-1 max-w-sm text-[0.8125rem] leading-relaxed text-text-3">
+                                        Select a workflow to see where it stands, run it, and read its runs.
+                                    </p>
+                                </div>
+                            )}
                         </div>
-                    );
-                }}
-            />
-            {viewingFlow?.scopeKey === scopeKey ? <WorkflowFlowDialog
-                key={`${scopeKey}:${viewingFlow.workflowId}`} scope={scope} workflowId={viewingFlow.workflowId}
-                onClose={() => setViewingFlow(null)} /> : null}
-            {editing && options ? (
-                <WorkflowEditorDialog
-                    key={`${scopeKey}:${editing === 'new' ? 'new' : editing.id}:${editorInstance}`}
-                    scope={scope}
-                    workflow={editing === 'new' ? null : editing}
-                    options={{ ...options, can_manage: options.can_manage && (editing === 'new' ? canCreate : canEdit) }}
-                    interactionDisabled={interactionDisabled}
-                    onBusyChange={setEditorSaving}
-                    onDirtyChange={setEditorDirty}
-                    onReload={editing === 'new' ? undefined : reloadEditing}
-                    onClose={() => {
-                        editorRequest.current += 1;
-                        setEditing(null);
-                        setEditorDirty(false);
-                    }}
-                    onSaved={(workflow) => {
-                        editorRequest.current += 1;
-                        const index = items.findIndex((item) => item.id === workflow.id);
-                        setItems(index < 0
-                            ? [workflow, ...items]
-                            : items.map((item, itemIndex) => itemIndex === index ? workflow : item));
-                        setEditing(null);
-                        setEditorDirty(false);
-                        void refresh();
-                    }}
-                />
+                    </div>
+                </div>
             ) : null}
         </fieldset>
     );
 }
-
-function GlassCreateButton({ busy, onClick }: { busy: boolean; onClick: () => void }) {
-    return (
-        <button
-            type="button"
-            onClick={onClick}
-            disabled={busy}
-            className="inline-flex h-8 items-center gap-1.5 rounded-xl bg-accent px-3 text-sm font-medium text-on-accent shadow-sm transition-colors hover:bg-accent-hover disabled:cursor-not-allowed disabled:opacity-50"
-        >
-            <Plus size={14} />
-            {busy ? 'Loading…' : 'Create workflow'}
-        </button>
-    );
-}
diff --git a/application/v2_ui/src/pages/workspace/WorkspacePage.tsx b/application/v2_ui/src/pages/workspace/WorkspacePage.tsx
index 1eb2b0c18..d7c050ee8 100644
--- a/application/v2_ui/src/pages/workspace/WorkspacePage.tsx
+++ b/application/v2_ui/src/pages/workspace/WorkspacePage.tsx
@@ -90,7 +90,7 @@ export function WorkspacePage() {
                 />
             );
         }
-        if (resourceId && !['agents', 'actions'].includes(activeEntry.section.id)) {
+        if (resourceId && !['agents', 'actions', 'workflows'].includes(activeEntry.section.id)) {
             return <EmptyState title="Editor not found" description="That editor does not exist in this workspace section." />;
         }
         return activeEntry.section.render(context);
diff --git a/application/v2_ui/src/pages/workspace/sections.tsx b/application/v2_ui/src/pages/workspace/sections.tsx
index 2854a7480..2c14f09f6 100644
--- a/application/v2_ui/src/pages/workspace/sections.tsx
+++ b/application/v2_ui/src/pages/workspace/sections.tsx
@@ -34,7 +34,9 @@ import { FileSourcesSection } from './FileSourcesSection';
 import { IdentitiesSection } from './IdentitiesSection';
 import { PromptsSection } from './PromptsSection';
 import { TagsSection } from './TagsSection';
+import { WorkflowEditorPage } from './WorkflowEditorPage';
 import { WorkflowsSection } from './WorkflowsSection';
+import { DEFAULT_WORKFLOW_SCOPE } from '../../lib/workflowEditor';
 
 export interface WorkspaceSectionContext {
     resourceId?: string;
@@ -127,7 +129,11 @@ export const WORKSPACE_SECTIONS: WorkspaceSectionDefinition[] = [
         group: 'automation',
         icon: Workflow,
         blurb: 'Repeatable tasks that run on a schedule or on demand.',
-        render: () => <WorkflowsSection />,
+        layout: 'full',
+        render: (context) => context.resourceId
+            ? <WorkflowEditorPage key={`${context.ownerId}:${context.resourceId}`} scope={DEFAULT_WORKFLOW_SCOPE}
+                resourceId={context.resourceId} />
+            : <WorkflowsSection />,
     },
     {
         id: 'identities',
diff --git a/application/v2_ui/src/styles/theme.css b/application/v2_ui/src/styles/theme.css
index 8f83c9b59..f42180512 100644
--- a/application/v2_ui/src/styles/theme.css
+++ b/application/v2_ui/src/styles/theme.css
@@ -340,6 +340,11 @@ html[data-font-size='xl'] {
 }
 
 @layer utilities {
+    /*
+     * The Admin Settings card and field rules below are shared with the V2 workflow editor
+     * (SectionCard.tsx and WorkflowField.tsx), so a workflow card reads as the same object as an
+     * Admin section. Change them here once rather than forking a copy for workflows.
+     */
     .admin-settings-distinct {
         container-type: inline-size;
         overflow-wrap: anywhere;
@@ -511,6 +516,61 @@ html[data-font-size='xl'] {
         }
     }
 
+    /*
+     * A native <details> drawn like an Admin field group: a bordered block with a chevron row
+     * that turns when it opens. It stays a real disclosure, so the browser keeps its keyboard
+     * behaviour and an invalid control inside still opens it. The chevron is scoped to its own
+     * summary, so a disclosure nested inside another turns only when it opens itself.
+     */
+    .workflow-disclosure {
+        border: 1px solid var(--edge-strong);
+        border-radius: 0.75rem;
+        background-color: var(--surface-solid);
+    }
+
+    .workflow-disclosure > summary {
+        display: flex;
+        min-height: 2.75rem;
+        cursor: pointer;
+        align-items: center;
+        gap: 0.5rem;
+        border-radius: 0.75rem;
+        padding: 0.5rem 0.75rem;
+        font-size: 0.875rem;
+        font-weight: 600;
+        color: var(--text-1);
+        list-style: none;
+    }
+
+    .workflow-disclosure > summary::-webkit-details-marker {
+        display: none;
+    }
+
+    .workflow-disclosure > summary:hover {
+        background-color: var(--surface-sunken);
+    }
+
+    .workflow-disclosure[open] > summary {
+        border-bottom: 1px solid var(--edge-strong);
+        border-end-start-radius: 0;
+        border-end-end-radius: 0;
+        background-color: var(--surface-sunken);
+    }
+
+    .workflow-disclosure > summary > .workflow-disclosure-chevron {
+        flex-shrink: 0;
+        color: var(--text-2);
+        transition: transform 150ms ease-out;
+    }
+
+    .workflow-disclosure[open] > summary > .workflow-disclosure-chevron {
+        transform: rotate(90deg);
+    }
+
+    .workflow-disclosure > .workflow-disclosure-body {
+        padding: 0.75rem;
+    }
+
     /*
      * Respect users who have asked for less motion or less transparency. The second is
      * important for readability: transparency is dropped for solid surfaces rather than
diff --git a/docs/explanation/features/V2_GROUP_WORKFLOWS.md b/docs/explanation/features/V2_GROUP_WORKFLOWS.md
index 21d2f519e..8c7733e69 100644
--- a/docs/explanation/features/V2_GROUP_WORKFLOWS.md
+++ b/docs/explanation/features/V2_GROUP_WORKFLOWS.md
@@ -18,6 +18,10 @@ Implemented in version: **0.261.141**, tracked in
 Personal workflows are unchanged. No new setting, route or container is added.
 From 0.261.207, the personal editor authors File Sync too; see
 [V2 Personal Workflow File Sync](V2_PERSONAL_WORKFLOW_FILE_SYNC.md).
+From 0.261.271, the group Workflows section is a workbench and the editor is a
+page at `/v2/groups/<group id>/workflows/<id>` rather than a dialog; File Sync
+is its own card there. See
+[V2 Workflows Workbench and Editor](V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md).
 
 ## What changed
 
@@ -181,6 +185,7 @@ show the same results before and after this change.
 ## Related
 
 - [V2 Group Workflow Analyze Changed Files Fix](../fixes/V2_GROUP_WORKFLOW_ANALYZE_CHANGED_FILES_FIX.md)
+- [V2 Workflows Workbench and Editor](V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md)
 - [Group Workflows](GROUP_WORKFLOWS.md)
 - [Workflow Alert Rules](WORKFLOW_ALERT_RULES.md)
 - [File Sync Source Workflow](FILE_SYNC_SOURCE_WORKFLOW.md)
diff --git a/docs/explanation/features/V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md b/docs/explanation/features/V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md
new file mode 100644
index 000000000..d55085da4
--- /dev/null
+++ b/docs/explanation/features/V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md
@@ -0,0 +1,165 @@
+# V2 Workflows Workbench and Editor
+
+## Overview
+
+The V2 Workflows section now uses the design language of V2 Admin Settings. Before this change,
+each workflow was a card in a long list that carried every action -- Run, Cancel, Edit, Delete,
+View Flow and Show run history -- and run history expanded inline under the card, so a workspace
+with a few workflows became a long scroll of buttons. The editor was a modal dialog with one long
+column of controls, where a label sat above its control and a setting that only mattered when
+another was on looked the same as everything else.
+
+Workflows now reads the way Admin Settings does:
+
+- **A workbench for the list**, drawn like Admin's Model Catalog. Each workflow is one line --
+  its name, how it stands in words (such as **Running**, **Awaiting approval** or **Failed**) with
+  a matching icon, and its trigger in a word or two -- beside a detail pane for the selected
+  workflow. The detail holds the workflow's actions and
+  three tabs: **Overview**, **Runs** and, for structured workflows, **Flow**.
+- **A page for the editor**, as Agents and Actions already have. It opens at its own address in
+  both personal and group workspaces, uses Admin's wide frame, and lays the workflow out in
+  distinct section cards with Admin's status chips, label-beside-control fields, paired switches,
+  nested dependent settings, and an **On this page** index.
+
+Nothing about what a workflow can do changed. The same fields are saved in the same shape, run
+inspection is unchanged inside the Runs tab, and the chat **Proposed workflow** card still opens
+the same editor in a dialog.
+
+## Implemented in version: **0.261.271**
+
+The application version is maintained in `application/single_app/config.py`.
+
+**Dependencies:** the React/TypeScript V2 UI, React Router (`useBlocker` for the leave prompt),
+local `lucide-react` icons, and the Admin Settings primitives (`SettingsIndex`, the section status
+vocabulary in `adminSections.ts` and `sectionStatusPresentation.ts`, and the `.admin-field` rules
+in `theme.css`). No new packages, settings, API routes, or browser asset sources are required.
+
+## Technical specifications
+
+### Architecture
+
+| File | Responsibility |
+| --- | --- |
+| `application/v2_ui/src/pages/workspace/WorkflowsSection.tsx` | The workbench: intro, search, Status and Trigger filters, the one-line list, selection, run links, and the Run, Cancel and Delete requests. |
+| `application/v2_ui/src/components/workflows/WorkflowWorkbenchDetail.tsx` | The selected workflow: header, actions, and the Overview, Runs and Flow tabs. |
+| `application/v2_ui/src/components/workflows/WorkflowStatusChip.tsx` | The status chip in Admin's chip style, with a compact icon-only form for list rows. |
+| `application/v2_ui/src/lib/workflowWorkbench.ts` | Status words and tones, attention, filters, row and detail lines, and the Overview facts. |
+| `application/v2_ui/src/pages/workspace/WorkflowEditorPage.tsx` | The routed editor page: loads the workflow and editor options, gates editing, and returns to the list after a save or close. |
+| `application/v2_ui/src/components/workflows/WorkflowEditorDialog.tsx` | The editor itself, drawn as a page (`presentation="page"`) or, for the chat proposal card, a dialog. |
+| `application/v2_ui/src/lib/workflowEditorSections.ts` | Which cards a draft shows, each card's status and line of facts, and the task checks they share. |
+| `application/v2_ui/src/components/ui/SectionCard.tsx` | Admin's section card for surfaces outside Admin: header band, icon, title, facts, status chip. |
+| `application/v2_ui/src/components/workflows/WorkflowField.tsx` | Field rows, read-only values, paired switches, and the primary and dependent emphasis, built on `.admin-field`. |
+| `application/v2_ui/src/lib/workflowRunLink.ts` | `workflowListHref`, `workflowEditorHref` and the existing run links. |
+
+`WorkflowFlowDialog.tsx` is removed: the Flow tab shows the saved definition with the same
+read-only `WorkflowFlowView`.
+
+### Addresses
+
+| Address | Shows |
+| --- | --- |
+| `/v2/workspace/workflows` | The workbench, with the first workflow selected. |
+| `/v2/workspace/workflows?workflow_id=<id>` | The workbench with that workflow selected on Overview. |
+| `/v2/workspace/workflows?workflow_id=<id>&run_id=<run>` | That workflow's Runs tab with the run expanded. Chat run cards, notices, alerts and document provenance links use this form, unchanged. |
+| `/v2/workspace/workflows/<id>` | The editor page for that workflow. |
+| `/v2/workspace/workflows/new` | The editor page for a new workflow. |
+
+A group workspace uses the same forms under `/v2/groups/<group id>/workflows`. Until this
+version, `?workflow_id=<id>` opened the editor dialog, and a group workflow resource segment was
+rewritten to that query; the segment is now the editor page itself. Every address is built by
+the reviewed same-origin builders in `workflowRunLink.ts`, which `scripts/check_xss_sinks.py`
+lists.
+
+### Card status
+
+Each editor card carries Admin's status vocabulary, decided in `workflowEditorSections.ts`:
+
+| Card | Status |
+| --- | --- |
+| Basics | **Needs configuration** without a name, with an agent runner and no agent, or with no explicit model when the app default model is not valid here; otherwise **Configured**. |
+| Trigger and schedule | **Off** when **Workflow enabled** is off; otherwise **Configured**. |
+| File Sync | **Off** when the workflow does not sync; **Prerequisite missing** when the group has File Sync turned off; **Needs configuration** with no sources; otherwise **Configured**. |
+| Execution, Shared references, Limits | Facts only, no chip. Limits appears for structured workflows only. |
+| Tasks | **Needs configuration** with no tasks or when any task shows its own problem. |
+| Alerts | **Off**, **Needs configuration** for conditional alerts with no rules or with a rule the alert checks refuse, otherwise **Configured**. |
+
+A status is guidance only. It never blocks a save: the editor's validation still decides that,
+and its messages are listed above the cards.
+
+### Workflow status
+
+The workbench reads a workflow's status the way the server records it. While a run is in
+progress, the workflow's `status` says so (`running`, `queued`, or a waiting state such as
+`awaiting_approval`). When the run ends, the server sets `status` back to `idle` and records the
+outcome in `last_run_status`, so a finished workflow shows how its last run ended, such as
+**Completed**, **Completed with task errors**, **Failed** or **Cancelled**. An older record that
+kept the outcome in `status` reads the same way.
+
+**Needs attention** lists workflows that wait on a person (an approval or a sign-in), and those
+whose last run failed, was cancelled or completed with task errors and that are not running
+again. The Overview's **Last run** names the outcome and when the run ended, in the reader's
+locale, or says **Not run yet**.
+
+### Leaving the editor
+
+Saving returns to the list with the saved workflow selected and a short **Workflow saved.** status,
+as Agents does. Closing a pristine editor returns
+at once. Leaving with unsaved changes -- **Cancel**, **Back**, another link, or the browser's back
+button -- asks the workspace leave prompt (**Keep editing** or **Discard changes**). In a group
+workspace, the group page owns that prompt, as it does for the group's other editors. Returning
+moves focus to the edited workflow's heading in the workbench.
+
+### Accessibility
+
+- List rows are toggle buttons (`aria-pressed`) in a list named **Workflows**, with arrow-key,
+  Home and End movement and one tab stop. A row's status and trigger are its description. On a
+  narrow screen, where the detail sits under the list, choosing a row scrolls the detail into
+  view and leaves focus on the row.
+- The Status and Trigger filters are labelled by reference, so each is named by its label alone.
+- The detail is an `article` named by the workflow; its tabs follow the ARIA tabs pattern with
+  arrow keys, Home and End.
+- The editor page is a region named **Edit workflow** or **Create workflow**. Its title takes
+  focus on arrival. **On this page** moves focus to the chosen card's title, without smooth
+  scrolling when reduced motion is requested. Converting to structured control flow moves focus to
+  the converted tasks card, since the button that asked is gone with the ordered tasks.
+- A failed editor load is announced as an alert, with **Retry**.
+- Each card is a region named by its title, so the existing names **Workflow basics**,
+  **Workflow shared references**, **Workflow tasks** and **Alerts** still identify them.
+
+## Usage
+
+Open **My workspace > Workflows** in V2, or a group's **Workflows**. Search, or filter by status
+(**Running**, **Needs attention**, **Completed**, **Disabled**) or trigger, then select a
+workflow. **Overview** summarises its settings, **Runs** lists its recent runs and their results,
+and **Flow** shows a structured workflow's saved definition. **Edit** opens the editor page;
+**Create workflow** opens it for a new workflow. See
+[Create a workflow](../../guides/create-a-workflow.md#create-or-edit-in-v2) and
+[Trigger a workflow](../../guides/trigger-a-workflow.md).
+
+## Testing and validation
+
+- `functional_tests/test_v2_workflows_workbench_logic.ts`, run by
+  `functional_tests/test_v2_workflows_admin_design_language.py`, executes every card status and
+  line of facts, the status words, the filters, and the Overview facts against the real modules.
+- `functional_tests/test_v2_workflows_admin_design_language.py` also pins the workbench, the
+  routed editor in both workspaces, the shared Admin primitives, the retired Flow dialog, and the
+  reviewed address builders.
+- `ui_tests/test_v2_workflows_workbench_and_editor_layout.py` drives the built SPA: one-line
+  rows, keyboard list and tabs, run links, card statuses and the index, label-beside-control and
+  stacked fields, the leave prompt, the return after a save, and no overflow at 390px and at
+  1920px with 200% text, in light and dark themes.
+- The existing workflow UI suites (`ui_tests/test_v2_workflow_*.py`,
+  `ui_tests/test_v2_group_workflow_file_sync.py`, `ui_tests/test_v2_group_workspace_shell.py`
+  and others) now reach workflows through the shared helpers in
+  `ui_tests/fixtures/workflow_workbench.py`.
+
+### Known limitations
+
+- The editor page loads the workflow from the scope's workflow list; there is no single-workflow
+  read, so a very large list is read in full to open one workflow.
+- The workbench keeps its selection in the page, not the address; reload returns to the first
+  workflow unless the address names one.
+
+Related: [V2 Admin Settings Layout and Hierarchy](V2_ADMIN_SETTINGS_LAYOUT_AND_HIERARCHY.md),
+[V2 Model Catalog Workbench](V2_MODEL_CATALOG_WORKBENCH.md),
+[V2 Group Workflows](V2_GROUP_WORKFLOWS.md).
diff --git a/docs/explanation/features/WORKFLOW_FLOW_INSPECTION.md b/docs/explanation/features/WORKFLOW_FLOW_INSPECTION.md
index 6c471c815..acf410167 100644
--- a/docs/explanation/features/WORKFLOW_FLOW_INSPECTION.md
+++ b/docs/explanation/features/WORKFLOW_FLOW_INSPECTION.md
@@ -120,7 +120,10 @@ or empty success.
 ## Use saved and draft Flow
 
 1. In personal or group Workflows, choose **View Flow for ...** on a saved
-   version-3 workflow. This does not require opening Edit and remains available
+   version-3 workflow. From 0.261.271, select the workflow and choose its
+   **Flow** tab instead; see
+   [V2 Workflows Workbench and Editor](V2_WORKFLOWS_WORKBENCH_AND_EDITOR.md).
+   This does not require opening Edit and remains available
    while a run is active, subject to current reader access.
 2. Select a node and choose its inspection section. Instructions, contracts,
    conditions, references, and source selections load only when requested.
diff --git a/docs/guides/create-a-workflow.md b/docs/guides/create-a-workflow.md
index e3ccf32c2..61767094d 100644
--- a/docs/guides/create-a-workflow.md
+++ b/docs/guides/create-a-workflow.md
@@ -33,6 +33,36 @@ or select a group under `/v2/groups`. Choose **Create workflow** or edit an
 existing workflow in the native V2 editor. Ordered drafts still use List;
 explicitly structured drafts also offer Flow authoring as described below.
 
+From **0.261.271**, Workflows lists each workflow on one line: its name, how it
+stands (for example **Running**, **Awaiting approval**, **Completed** or
+**Failed**), and its trigger. Select a workflow to see its **Overview**, which
+starts with when it last ran and how that run ended, its recent **Runs**, and,
+for a structured workflow, its saved **Flow**. **Run**, **Edit** and **Delete**
+sit beside its name. To find one in a long list, search, or narrow the list by
+**Status**, such as **Needs attention** for workflows waiting on you or whose
+last run failed, was cancelled or completed with task errors, or by **Trigger**.
+
+{% include media.html src="guides/create-a-workflow-workbench.png"
+                      alt="The V2 Workflows section with a list of workflows on the left, each showing its status and trigger, one selected, and its detail on the right showing Run, Edit and Delete beside its name and the Overview tab listing when it last ran, its runner, trigger, File Sync, execution, references, tasks and alerts."
+                      title="Choosing a workflow"
+                      capture="Open V2 My workspace > Workflows at a wide window size with four or five sample workflows, one of them failed, and select a manual workflow so its Overview shows. Use sample data." %}
+
+**Create workflow** and **Edit** open the editor as a page of its own. The
+workflow is laid out in sections: **Basics**, **Trigger and schedule**, **File
+Sync**, **Execution**, **Shared references**, **Tasks** and **Alerts**, with
+**Limits** for a structured workflow. Each section's header says what it is set
+to, and a chip points out a section that isn't ready, such as **Needs
+configuration** on Basics until the workflow has a name, or on File Sync until
+it has a source. On a wide screen, **On this page** jumps to a section and shows
+the same chips. The chips are a guide only; saving still checks the whole
+workflow.
+
+**Save workflow** returns to the list with the workflow selected. If you choose
+**Cancel** or **Back**, or follow another link, with unsaved changes, you're
+asked whether to keep editing or discard them. The editor page has the
+workflow's own address, such as `/v2/workspace/workflows/<workflow id>`, so you
+can bookmark it.
+
 Choose a runner and manual or interval trigger, then add tasks in execution
 order. Task details separate document-action evidence from shared reference
 documents and prior-task outputs. For a synthesis task, select a specific
@@ -559,8 +589,9 @@ are framed in blue and labeled **AI assist** instead. From **0.261.213**,
 
 ### Use the Changes panel
 
-Choose **Changes** in the editor footer. The button shows how many changes are
-unsaved, and the panel lists them in two parts:
+Choose **Changes** at the top of the editor page (in the footer when the editor
+opens from a chat proposal). The button shows how many changes are unsaved, and
+the panel lists them in two parts:
 
 - **Unsaved changes**: each change with its before and after values and who
   made it. **Jump** moves to the field, switching from Flow to List when the
@@ -606,7 +637,8 @@ workflow is personal, and you can edit it. Group workflows don't offer it.
 
 1. Open a personal workflow in the V2 editor, or choose **Edit** on a workflow
    proposal in chat.
-2. Choose **Ask AI** in the editor footer. To ask about one task, choose
+2. Choose **Ask AI** at the top of the editor page, or in the footer when the
+   editor opens from a chat proposal. To ask about one task, choose
    **Ask AI** on that task instead. The tab shows **About:** with the task's
    name until you clear it.
 3. Type what you want and send it, or choose a quick action such as **Explain
@@ -676,7 +708,8 @@ name first, so it has something to go on.
 ## Preview the structure without changing execution
 
 In **0.261.121**, choose **View Flow for ...** beside a saved structured
-workflow to see its branches, joins, routes, and single loop templates.
+workflow to see its branches, joins, routes, and single loop templates. From
+**0.261.271**, select the workflow and choose its **Flow** tab instead.
 This is independent of Edit, so an authorized reader can inspect a saved
 definition while it has an active run. This viewer remains read-only in
 **0.261.122**. The List/Flow authoring switch replaces only the old preview-only
@@ -832,7 +865,7 @@ for the controls introduced in **0.261.029**.
 
 ## Verify it worked
 
-The workflow appears in the Workflows table with **Name**, **Runner**, **Trigger**, **Last Run**, and **Actions** columns.
+The workflow appears in the Workflows table with **Name**, **Runner**, **Trigger**, **Last Run**, and **Actions** columns. In V2, it appears in the Workflows list, selected, and its **Overview** shows the runner, trigger and tasks you saved.
 
 ## How task results are passed
 
diff --git a/docs/guides/trigger-a-workflow.md b/docs/guides/trigger-a-workflow.md
index 97aa9883e..d352000d5 100644
--- a/docs/guides/trigger-a-workflow.md
+++ b/docs/guides/trigger-a-workflow.md
@@ -37,7 +37,7 @@ A workflow only helps when it runs at the right moment and leaves evidence you c
                       title="Trigger a workflow step 3"
                       capture="Capture the trigger a workflow task at this step in SimpleChat with realistic sample data and redact secrets." %}
 
-4. Use the workflow row **Actions** to start a manual run, or edit the workflow to adjust **Trigger**.
+4. Use the workflow row **Actions** to start a manual run, or edit the workflow to adjust **Trigger**. In V2, select the workflow and choose **Run** beside its name; its **Runs** tab opens on the new run.
 5. For scheduled operation, choose the **Schedule** trigger (**Interval Schedule** in the classic editor) and leave the workflow enabled. It can repeat at a fixed interval or, in the V2 editor, at a local time on a calendar schedule; see [Run on a calendar schedule]({{ '/guides/create-a-workflow/' | relative_url }}#run-on-a-calendar-schedule).
 6. After a run starts, open **Open workflow activity view** from the chat header when available.
 
@@ -105,8 +105,9 @@ approval or sign-in, its status shows **Needs you**, and for a sign-in the card
 ## Continue a durable run
 
 With durable execution enabled in **0.261.111**, **Run** queues background work
-rather than keeping a browser request open. Open its V2 run history to inspect
-progress and run memory. Closing the page does not cancel the run.
+rather than keeping a browser request open. Open its V2 run history, the
+workflow's **Runs** tab, to inspect progress and run memory. Closing the page
+does not cancel the run.
 
 **Waiting for approval** needs an authorized decision. **Waiting for output**
 keeps the original background result reference and resumes when its supported
diff --git a/functional_tests/test_v2_orchestration_workflow_run_links_xss_guardrail.py b/functional_tests/test_v2_orchestration_workflow_run_links_xss_guardrail.py
index 6cf6986c9..ee79e5dbe 100644
--- a/functional_tests/test_v2_orchestration_workflow_run_links_xss_guardrail.py
+++ b/functional_tests/test_v2_orchestration_workflow_run_links_xss_guardrail.py
@@ -2,9 +2,10 @@
 # test_v2_orchestration_workflow_run_links_xss_guardrail.py
 """
 Functional test for the V2 workflow run links passing the XSS sink guardrail.
-Version: 0.261.251
+Version: 0.261.271
 Implemented in: 0.261.212
 A group run's link built through the checked group path builder: 0.261.251
+The Workflows list and editor page builders, held to the same fixed paths: 0.261.271
 
 This test ensures that the Started workflows links under a chat answer pass
 scripts/check_xss_sinks.py the way CI runs it. The link component calls the
@@ -120,7 +121,27 @@ def test_builder_returns_only_the_fixed_workflows_path() -> None:
     # A group run opens that group's Workflows section, through the checked group path builder.
     assert "import { groupWorkspacePath } from './groupWorkspaceNavigation';" in builder_source
     assert "return `${groupWorkspacePath(scope.groupId, 'workflows')}?${params}`;" in builder_source
-    assert builder_source.count('return `') == 2
+    # The list and editor addresses share one fixed base: the personal or group Workflows section.
+    assert (
+        "return scope.type === 'group' ? groupWorkspacePath(scope.groupId, 'workflows') : '/workspace/workflows';"
+    ) in builder_source
+    # A selected workflow travels only as an encoded query value...
+    assert (
+        'return workflowId ? `${base}?${new URLSearchParams({ [WORKFLOW_LINK_PARAM]: workflowId })}` : base;'
+    ) in builder_source
+    # ...and a workflow's editor page only as one encoded path segment under that base.
+    assert (
+        'return `${workflowsBasePath(scope)}/${encodeURIComponent(workflowId ?? NEW_WORKFLOW_RESOURCE)}`;'
+    ) in builder_source
+    assert "export const NEW_WORKFLOW_RESOURCE = 'new';" in builder_source
+    assert builder_source.count('return `') == 3
+
+
+def test_list_and_editor_builders_are_reviewed_same_origin_builders() -> None:
+    """The Workflows list and editor page addresses are approved like the run link."""
+    module = load_xss_checker_module()
+    for builder in ('workflowListHref', 'workflowEditorHref'):
+        assert builder in module.TS_SAME_ORIGIN_URL_BUILDERS, builder
 
 
 if __name__ == '__main__':
diff --git a/functional_tests/test_v2_workflows_admin_design_language.py b/functional_tests/test_v2_workflows_admin_design_language.py
new file mode 100644
index 000000000..9625f04bb
--- /dev/null
+++ b/functional_tests/test_v2_workflows_admin_design_language.py
@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+# test_v2_workflows_admin_design_language.py
+"""
+Functional test for the V2 Workflows workbench and editor in the Admin Settings design language.
+Version: 0.261.271
+Implemented in: 0.261.271
+
+This test ensures that the V2 Workflows section keeps the shape it was redesigned into:
+
+* The list is a workbench, as Admin's Model Catalog is: one-line rows beside the selected
+  workflow's detail, with Overview, Runs and Flow tabs, rather than rows carrying every action.
+* The editor is a page of its own in both personal and group workspaces, as Agents and Actions
+  are, built from Admin's distinct section cards and its "On this page" index. The chat proposal
+  card keeps the same editor in a dialog.
+* The separate Flow dialog is gone; the Flow tab shows the saved definition.
+* The editor and list addresses are built by the reviewed same-origin URL builders.
+
+The behavioural half -- each card's status and facts, and the workbench's labels and filters --
+lives in ``test_v2_workflows_workbench_logic.ts``, which this file bundles with esbuild and runs
+under node, skipping when the front-end toolchain is absent.
+"""
+
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+sys.path.append(str(Path(__file__).resolve().parent))
+
+from test_support.versioning import assert_app_version_at_least
+
+
+REPO_ROOT = Path(__file__).resolve().parents[1]
+V2_DIR = REPO_ROOT / "application" / "v2_ui"
+SRC = V2_DIR / "src"
+WORKFLOWS_SECTION = SRC / "pages" / "workspace" / "WorkflowsSection.tsx"
+EDITOR_PAGE = SRC / "pages" / "workspace" / "WorkflowEditorPage.tsx"
+WORKSPACE_SECTIONS = SRC / "pages" / "workspace" / "sections.tsx"
+WORKSPACE_PAGE = SRC / "pages" / "workspace" / "WorkspacePage.tsx"
+GROUP_PAGE = SRC / "pages" / "GroupWorkspacePage.tsx"
+EDITOR = SRC / "components" / "workflows" / "WorkflowEditorDialog.tsx"
+DETAIL = SRC / "components" / "workflows" / "WorkflowWorkbenchDetail.tsx"
+FIELD = SRC / "components" / "workflows" / "WorkflowField.tsx"
+SECTION_CARD = SRC / "components" / "ui" / "SectionCard.tsx"
+FLOW_DIALOG = SRC / "components" / "workflows" / "WorkflowFlowDialog.tsx"
+RUN_LINK = SRC / "lib" / "workflowRunLink.ts"
+THEME = SRC / "styles" / "theme.css"
+XSS_GUARDRAIL = REPO_ROOT / "scripts" / "check_xss_sinks.py"
+LOGIC_CHECK_TS = Path(__file__).resolve().parent / "test_v2_workflows_workbench_logic.ts"
+
+CHANGED_COMPONENTS = (
+    WORKFLOWS_SECTION,
+    EDITOR_PAGE,
+    EDITOR,
+    DETAIL,
+    FIELD,
+    SECTION_CARD,
+    SRC / "components" / "workflows" / "WorkflowStatusChip.tsx",
+    SRC / "components" / "workflows" / "WorkflowTaskFields.tsx",
+    SRC / "components" / "workflows" / "WorkflowScheduleFields.tsx",
+    SRC / "components" / "workflows" / "WorkflowFileSyncFields.tsx",
+    SRC / "components" / "workflows" / "WorkflowAlertEditor.tsx",
+    SRC / "components" / "workflows" / "WorkflowAlertSummary.tsx",
+)
+
+
+def _read(path):
+    assert path.is_file(), f"Missing expected file: {path}"
+    return path.read_text(encoding="utf-8")
+
+
+def test_version_includes_the_redesign():
+    """The workbench and the routed editor arrived in 0.261.271."""
+    print("\nTesting the application version...")
+    assert_app_version_at_least("0.261.271")
+    print("  ok  version is at least 0.261.271")
+    return True
+
+
+def test_the_workflows_section_is_a_workbench():
+    """Rows select a workflow; its actions and its runs belong to the detail beside the list."""
+    print("\nTesting the Workflows workbench...")
+    section = _read(WORKFLOWS_SECTION)
+    detail = _read(DETAIL)
+
+    assert '<ul aria-label="Workflows"' in section, "The workflow list must stay a named list"
+    assert "aria-pressed={isSelected}" in section, "A row must say whether it is the selected workflow"
+    assert "<WorkflowWorkbenchDetail" in section, "The selected workflow must be drawn by the detail pane"
+    assert "WorkflowEditorDialog" not in section, "The list must not open the editor itself; the editor is a page"
+    assert "navigate(workflowEditorHref(" in section, "Create and Edit must navigate to the editor page"
+    assert "readWorkflowRunLink(location.search)" in section, "Run links must still select a workflow and its run"
+
+    assert 'role="tablist" aria-label="Workflow details"' in detail
+    for tab in ("overview: 'Overview'", "runs: 'Runs'", "flow: 'Flow'"):
+        assert tab in detail, f"The detail is missing the tab {tab}"
+    assert "<WorkflowRunHistory" in detail, "Runs must show the workflow's run history"
+    assert "target={{ kind: 'saved', workflowId }}" in detail, "Flow must show the saved definition read-only"
+    assert "definition_version === 3 ? ['overview', 'runs', 'flow']" in detail, (
+        "Only structured workflows offer the Flow tab"
+    )
+    print("  ok  list rows select; the detail carries actions, Runs and Flow")
+    return True
+
+
+def test_the_editor_is_a_page_in_both_workspaces():
+    """Personal and group workspaces route /workflows/<id|new> to the editor page."""
+    print("\nTesting the routed editor...")
+    sections = _read(WORKSPACE_SECTIONS)
+    workspace = _read(WORKSPACE_PAGE)
+    group = _read(GROUP_PAGE)
+    page = _read(EDITOR_PAGE)
+
+    workflows_entry = sections[sections.index("id: 'workflows'"):]
+    workflows_entry = workflows_entry[:workflows_entry.index("id: 'identities'")]
+    assert "layout: 'full'" in workflows_entry, "Workflows must use the full-width frame Agents and Actions use"
+    assert "context.resourceId" in workflows_entry and "<WorkflowEditorPage" in workflows_entry
+    assert re.search(r"\[\s*'agents',\s*'actions',\s*'workflows'\s*\]", workspace), (
+        "The personal workspace must accept a workflow resource segment"
+    )
+    assert "section === 'workflows' && resourceId ? <WorkflowEditorPage" in group, (
+        "The group workspace must route a workflow resource segment to the editor page"
+    )
+    assert "nativeWorkflows" in group, "The group Workflows section must be full-bleed like the other native sections"
+
+    assert 'presentation="page"' in page, "The routed page must draw the editor as a page, not a dialog"
+    assert "useBlocker(" in page, "Leaving the personal editor with unsaved changes must ask first"
+    assert "workspaceEditorSaved: true" in page, "A save must return to the list without asking to discard"
+    assert "workflowListHref(scope, saved.id ?? backTo)" in page, "A save must return with the saved workflow selected"
+    print("  ok  /workflows/<id|new> is the editor page in personal and group workspaces")
+    return True
+
+
+def test_the_editor_uses_admin_cards_and_index():
+    """The editor draws Admin's section card, field rows and On this page index."""
+    print("\nTesting the editor's Admin design language...")
+    editor = _read(EDITOR)
+    card = _read(SECTION_CARD)
+    field = _read(FIELD)
+    theme = _read(THEME)
+
+    assert "import { SectionCard }" in editor, "Editor cards must be the shared SectionCard"
+    assert "SettingsIndex" in editor, "The editor page must offer Admin's On this page index"
+    assert "workflowEditorSections(" in editor, "Card statuses must come from the tested section logic"
+    assert "presentation === 'page'" in editor or "presentation = 'dialog'" in editor, (
+        "The editor must still support the dialog presentation the chat proposal card uses"
+    )
+
+    assert "presentSectionStatus(" in card, "Cards must use Admin's status chip vocabulary"
+    assert "admin-section-body" in card, "Cards must use Admin's section body so field rows lay out the same"
+    assert "rounded-t-2xl border-b border-edge-strong bg-surface-2" in card, "Cards must keep Admin's header band"
+
+    assert "admin-field" in field and "admin-field-heading" in field and "admin-field-control" in field, (
+        "Workflow fields must use Admin's label-beside-control rows"
+    )
+    assert "admin-switch-row" in field, "Workflow switches must pair with their label as Admin's do"
+    assert re.search(r"@container \(min-width: 50rem\) \{\s*\.admin-field,", theme), (
+        "Admin's field layout must stay one shared rule in theme.css"
+    )
+    assert ".workflow-disclosure" in theme, "Task disclosures need their shared style"
+    print("  ok  SectionCard, Admin field rows, switches and the index are shared")
+    return True
+
+
+def test_the_flow_dialog_is_retired():
+    """The Flow tab replaced the separate Flow dialog; nothing may still import it."""
+    print("\nTesting the retired Flow dialog...")
+    assert not FLOW_DIALOG.exists(), "WorkflowFlowDialog.tsx should be removed"
+    for path in SRC.rglob("*.ts*"):
+        assert "WorkflowFlowDialog" not in path.read_text(encoding="utf-8"), f"{path} still references WorkflowFlowDialog"
+    print("  ok  no source references the Flow dialog")
+    return True
+
+
+def test_editor_addresses_use_reviewed_url_builders():
+    """The editor and list addresses are built in one place and reviewed as same-origin."""
+    print("\nTesting the workflow address builders...")
+    link = _read(RUN_LINK)
+    guardrail = _read(XSS_GUARDRAIL)
+    assert "export function workflowEditorHref(" in link
+    assert "export function workflowListHref(" in link
+    assert "encodeURIComponent(workflowId ?? NEW_WORKFLOW_RESOURCE)" in link, (
+        "A workflow id must be encoded into its editor path"
+    )
+    builders = guardrail[guardrail.index("TS_SAME_ORIGIN_URL_BUILDERS"):]
+    builders = builders[:builders.index("}")]
+    for name in ("workflowEditorHref", "workflowListHref", "workflowRunHref"):
+        assert re.search(rf"['\"]{name}['\"]", builders), f"{name} must be listed as a reviewed same-origin URL builder"
+    print("  ok  workflowEditorHref and workflowListHref are reviewed builders")
+    return True
+
+
+def test_changed_components_follow_the_frontend_rules():
+    """No inline display:none (Bootstrap d-none or conditional rendering instead) and no remote assets."""
+    print("\nTesting the frontend rules on the changed components...")
+    for path in CHANGED_COMPONENTS:
+        content = _read(path)
+        assert not re.search(r"display\s*:\s*['\"]?none", content), f"{path.name} sets display:none inline"
+        assert "https://" not in content or "cdn" not in content.lower(), f"{path.name} references a remote asset"
+        first_line = content.splitlines()[0]
+        assert first_line == f"// {path.name}", f"{path.name} must start with its filename comment"
+    print(f"  ok  {len(CHANGED_COMPONENTS)} components checked")
+    return True
+
+
+def test_the_typescript_logic_checks_pass():
+    """Execute the behavioural half, skipping when the front-end toolchain is absent."""
+    print("\nTesting workflow workbench and card logic (TypeScript)...")
+
+    if not (V2_DIR / "node_modules").exists():
+        print("  skip  application/v2_ui/node_modules is absent; run npm install to include")
+        return True
+
+    assert LOGIC_CHECK_TS.exists(), "The TypeScript logic checks are missing"
+
+    # functional_tests/ has no node_modules of its own, so the bundle is written where
+    # node can resolve bare imports from.
+    bundle = V2_DIR / "node_modules" / ".cache-workflows-workbench-check.mjs"
+    try:
+        subprocess.run(
+            [
+                "npx",
+                "esbuild",
+                str(LOGIC_CHECK_TS),
+                "--bundle",
+                "--platform=node",
+                "--format=esm",
+                "--packages=external",
+                # workflowEditor reaches the API client, which reads import.meta.env.
+                "--define:import.meta.env={}",
+                f"--outfile={bundle}",
+                "--log-level=error",
+            ],
+            cwd=str(V2_DIR),
+            check=True,
+            shell=(sys.platform == "win32"),
+        )
+        result = subprocess.run(
+            ["node", str(bundle)],
+            cwd=str(V2_DIR),
+            capture_output=True,
+            text=True,
+            shell=(sys.platform == "win32"),
+        )
+    finally:
+        if bundle.exists():
+            bundle.unlink()
+
+    if result.returncode != 0:
+        print(result.stdout)
+        print(result.stderr)
+        raise AssertionError("the TypeScript logic checks failed")
+
+    passed = result.stdout.count("  ok  ")
+    print(f"  ok  {passed} TypeScript logic checks passed")
+    return True
+
+
+if __name__ == "__main__":
+    tests = [
+        test_version_includes_the_redesign,
+        test_the_workflows_section_is_a_workbench,
+        test_the_editor_is_a_page_in_both_workspaces,
+        test_the_editor_uses_admin_cards_and_index,
+        test_the_flow_dialog_is_retired,
+        test_editor_addresses_use_reviewed_url_builders,
+        test_changed_components_follow_the_frontend_rules,
+        test_the_typescript_logic_checks_pass,
+    ]
+
+    results = []
+    for test in tests:
+        try:
+            results.append(bool(test()))
+        except Exception as exc:
+            print(f"FAILED {test.__name__}: {exc}")
+            import traceback
+
+            traceback.print_exc()
+            results.append(False)
+
+    print(f"\nResults: {sum(results)}/{len(results)} tests passed")
+    sys.exit(0 if all(results) else 1)
diff --git a/functional_tests/test_v2_workflows_workbench_logic.ts b/functional_tests/test_v2_workflows_workbench_logic.ts
new file mode 100644
index 000000000..f80d80d17
--- /dev/null
+++ b/functional_tests/test_v2_workflows_workbench_logic.ts
@@ -0,0 +1,343 @@
+// test_v2_workflows_workbench_logic.ts
+//
+// Runtime test for the decisions the V2 Workflows workbench and editor cards make.
+// Version: 0.261.271
+// Implemented in: 0.261.271
+//
+// The Workflows section now draws the way Admin Settings does: a workbench of one-line rows beside
+// a detail pane, and an editor of distinct cards that each carry Admin's status chip. Which status
+// a card shows, what a row says, and which workflows a filter keeps are judgements that a
+// screenshot can't check -- a card that reads Configured over a missing agent looks exactly like a
+// correct one. So they are executed here, against the real modules.
+//
+// Run by test_v2_workflows_admin_design_language.py, which bundles this with the esbuild Vite
+// already brings in and executes it under node, skipping when the front-end toolchain is absent.
+
+import assert from 'node:assert/strict';
+import { presentSectionStatus } from '../application/v2_ui/src/components/admin/sectionStatusPresentation';
+import { newWorkflowAlertRule } from '../application/v2_ui/src/lib/workflowAlerts';
+import {
+    createWorkflowTask,
+    newWorkflowDefinition,
+    WORKFLOW_TASK_INSTRUCTIONS_LIMIT,
+    type WorkflowDefinition,
+    type WorkflowEditorOptions,
+} from '../application/v2_ui/src/lib/workflowEditor';
+import {
+    workflowEditorSections,
+    type WorkflowEditorSectionContext,
+    type WorkflowEditorSectionId,
+} from '../application/v2_ui/src/lib/workflowEditorSections';
+import {
+    DEFAULT_WORKFLOW_WORKBENCH_FILTERS,
+    filterWorkflows,
+    workflowDetailMeta,
+    workflowFiltersApplied,
+    workflowLastOutcome,
+    workflowNeedsAttention,
+    workflowOverviewFacts,
+    workflowRowMeta,
+    workflowRunState,
+    workflowStatusLabel,
+    type WorkflowWorkbenchFilters,
+} from '../application/v2_ui/src/lib/workflowWorkbench';
+
+let passed = 0;
+
+function check(name: string, run: () => void): void {
+    run();
+    passed += 1;
+    console.log(`  ok  ${name}`);
+}
+
+const AGENT = { id: 'agent-1', name: 'reviewer', display_name: 'Workspace reviewer', is_global: false, is_group: false };
+
+const OPTIONS: WorkflowEditorSectionContext['options'] = {
+    agents: [AGENT],
+    models: [{ endpoint_id: 'endpoint-1', model_id: 'gpt', label: 'Workspace GPT', provider: 'aoai' }],
+    default_model: { label: 'App default', valid: true },
+} as Pick<WorkflowEditorOptions, 'agents' | 'models' | 'default_model' | 'schedule'>;
+
+function context(overrides: Partial<WorkflowEditorSectionContext> = {}): WorkflowEditorSectionContext {
+    return { options: OPTIONS, scopeType: 'personal', ...overrides };
+}
+
+function draft(overrides: Partial<WorkflowDefinition> = {}): WorkflowDefinition {
+    const base = newWorkflowDefinition({ type: 'personal' });
+    const task = { ...base.tasks[0], instructions: 'Review the documents.' };
+    return { ...base, name: 'Quarterly review', tasks: [task], ...overrides };
+}
+
+function section(workflow: WorkflowDefinition, id: WorkflowEditorSectionId, ctx = context()) {
+    const found = workflowEditorSections(workflow, ctx).find((item) => item.id === id);
+    assert.ok(found, `expected a ${id} card`);
+    return found;
+}
+
+console.log('Workflow editor cards');
+
+check('a list draft shows every card but Limits, in reading order', () => {
+    const ids = workflowEditorSections(draft(), context()).map((item) => item.id);
+    assert.deepEqual(ids, ['basics', 'trigger', 'file-sync', 'execution', 'references', 'tasks', 'alerts']);
+});
+
+check('a structured draft adds Limits before its tasks and names the task card by surface', () => {
+    const structured = draft({ definition_version: 3 });
+    const sections = workflowEditorSections(structured, context({ structuredSurface: 'flow' }));
+    assert.deepEqual(sections.map((item) => item.id),
+        ['basics', 'trigger', 'file-sync', 'execution', 'references', 'limits', 'tasks', 'alerts']);
+    assert.equal(sections.find((item) => item.id === 'tasks')?.label, 'Structured Flow');
+    assert.equal(section(structured, 'tasks', context({ structuredSurface: 'list' })).label, 'Structured List');
+    const limits = section(structured, 'limits');
+    assert.equal(limits.status, 'none');
+    assert.match(limits.meta, /^Up to \d[\d,]* execution admissions? · [\d,]+ second deadline$/);
+});
+
+check('Basics needs a name, and a runner that can actually run', () => {
+    assert.equal(section(draft({ name: '   ' }), 'basics').status, 'incomplete');
+    assert.equal(section(draft(), 'basics').status, 'ready');
+    assert.equal(section(draft(), 'basics').meta, 'Runner: App default model');
+
+    const brokenDefault = context({ options: { ...OPTIONS, default_model: { valid: false } } });
+    assert.equal(section(draft(), 'basics', brokenDefault).status, 'incomplete',
+        'an invalid app default with no explicit model must not read as configured');
+    const explicit = draft({ model_endpoint_id: 'endpoint-1', model_id: 'gpt' });
+    assert.equal(section(explicit, 'basics', brokenDefault).status, 'ready');
+    assert.equal(section(explicit, 'basics').meta, 'Runner: Workspace GPT');
+
+    assert.equal(section(draft({ runner_type: 'agent' }), 'basics').status, 'incomplete');
+    assert.equal(section(draft({ runner_type: 'agent' }), 'basics').meta, 'Runner: Agent not selected');
+    const withAgent = draft({ runner_type: 'agent', selected_agent: AGENT });
+    assert.equal(section(withAgent, 'basics').status, 'ready');
+    assert.equal(section(withAgent, 'basics').meta, 'Runner: Workspace reviewer');
+});
+
+check('Trigger reads Off when the workflow is switched off, and says when it runs', () => {
+    assert.equal(section(draft(), 'trigger').status, 'ready');
+    assert.equal(section(draft(), 'trigger').meta, 'Manual · runs only when started');
+    assert.equal(section(draft({ is_enabled: false }), 'trigger').status, 'off');
+    const scheduled = draft({ trigger_type: 'interval', schedule: { unit: 'minutes', value: 45 } });
+    assert.equal(section(scheduled, 'trigger').meta, 'Every 45 minutes');
+});
+
+check('File Sync is Off until used, then needs a source, and is blocked where the group turned it off', () => {
+    const off = section(draft(), 'file-sync');
+    assert.equal(off.status, 'off');
+    assert.equal(off.meta, 'Runs without syncing first');
+
+    const noSources = draft({ file_sync: { enabled: true, sources: [] } });
+    assert.equal(section(noSources, 'file-sync').status, 'incomplete');
+    assert.equal(section(noSources, 'file-sync').meta, '0 sources · synced before each run');
+
+    const source = { scope_type: 'personal', scope_id: 'user-1', source_id: 'source-1' };
+    const synced = draft({ file_sync: { enabled: true, sources: [source] } });
+    assert.equal(section(synced, 'file-sync').status, 'ready');
+    assert.equal(section(synced, 'file-sync').meta, '1 source · synced before each run');
+    assert.equal(section(synced, 'file-sync', context({ groupFileSyncEnabled: false })).status, 'blocked');
+    assert.equal(section(synced, 'file-sync', context({ groupFileSyncEnabled: null })).status, 'ready',
+        'an unknown group gate must not read as blocked');
+
+    // The Monitor trigger syncs whether or not File Sync was chosen separately.
+    const monitor = draft({ trigger_type: 'file_sync', file_sync: { sources: [source] } });
+    assert.equal(section(monitor, 'file-sync').status, 'ready');
+    assert.equal(section(monitor, 'file-sync').meta, '1 source · checked for changes');
+});
+
+check('Execution and Shared references carry facts but never a status chip', () => {
+    const halt = section(draft({ durable_execution: false }), 'execution');
+    assert.equal(halt.status, 'none');
+    assert.equal(halt.meta, 'Halt on failure · 0 retries');
+    // New workflows run durably by default, and the card says so.
+    assert.equal(section(draft(), 'execution').meta, 'Halt on failure · 0 retries · Durable execution');
+    const durable = draft({ durable_execution: true, error_handling: { strategy: 'continue', retry_count: 1 } });
+    assert.equal(section(durable, 'execution').meta, 'Continue after failure · 1 retry · Durable execution');
+
+    assert.equal(section(draft(), 'references').status, 'none');
+    assert.equal(section(draft(), 'references').meta, 'No shared documents');
+    const references = [
+        { id: 'r1', name: 'brief', document_id: 'doc-1', scope_type: 'personal' as const, scope_id: 'user-1' },
+        { id: 'r2', name: 'policy', document_id: 'doc-2', scope_type: 'public' as const, scope_id: 'public-1' },
+    ];
+    assert.equal(section(draft({ reference_inputs: references }), 'references').meta, '2 shared documents');
+});
+
+check('Tasks need at least one task, and count the tasks that show a problem', () => {
+    assert.equal(section(draft({ tasks: [] }), 'tasks').status, 'incomplete');
+    assert.equal(section(draft({ tasks: [] }), 'tasks').meta, '0 tasks');
+    assert.equal(section(draft(), 'tasks').status, 'ready');
+    assert.equal(section(draft(), 'tasks').meta, '1 task');
+
+    const tooLong = { ...createWorkflowTask(1), instructions: 'x'.repeat(WORKFLOW_TASK_INSTRUCTIONS_LIMIT + 1) };
+    const withProblem = draft({ tasks: [draft().tasks[0], tooLong] });
+    assert.equal(section(withProblem, 'tasks').status, 'incomplete');
+    assert.equal(section(withProblem, 'tasks').meta, '2 tasks · 1 needs attention');
+});
+
+check('Alerts read Off, ready, or incomplete exactly as the rule checks say', () => {
+    assert.equal(section(draft(), 'alerts').status, 'off');
+    assert.equal(section(draft(), 'alerts').meta, 'Never notify me');
+    assert.equal(section(draft({ alert_mode: 'every_run' }), 'alerts').status, 'ready');
+    assert.equal(section(draft({ alert_mode: 'every_run' }), 'alerts').meta, 'On every run');
+
+    const noRules = draft({ alert_mode: 'rules', alert_rules: [] });
+    assert.equal(section(noRules, 'alerts').status, 'incomplete');
+    assert.equal(section(noRules, 'alerts').meta, 'Only when a condition is met · 0 rules');
+    const oneRule = draft({ alert_mode: 'rules', alert_rules: [newWorkflowAlertRule()] });
+    assert.equal(section(oneRule, 'alerts').status, 'ready');
+    assert.equal(section(oneRule, 'alerts').meta, 'Only when a condition is met · 1 rule');
+
+    // Alerting the whole group is a group workflow's choice only.
+    const groupAudience = draft({ alert_mode: 'rules', alert_rules: [{ ...newWorkflowAlertRule(), audience: 'group' }] });
+    assert.equal(section(groupAudience, 'alerts').status, 'incomplete');
+    assert.equal(section(groupAudience, 'alerts', context({ scopeType: 'group' })).status, 'ready');
+});
+
+check('every status a card can show is one Admin draws a chip for, or none at all', () => {
+    const drafts = [
+        draft(), draft({ name: '' }), draft({ is_enabled: false }), draft({ definition_version: 3 }),
+        draft({ file_sync: { enabled: true, sources: [] } }), draft({ alert_mode: 'rules', alert_rules: [] }),
+    ];
+    const statuses = new Set(drafts.flatMap((item) =>
+        workflowEditorSections(item, context({ groupFileSyncEnabled: false })).map((card) => card.status)));
+    for (const status of statuses) {
+        const chip = presentSectionStatus(status);
+        if (status === 'none') {
+            assert.equal(chip, null, 'a card without a status draws no chip');
+        } else {
+            assert.ok(chip?.label, `Admin has no chip for ${status}`);
+        }
+    }
+    assert.equal(presentSectionStatus('incomplete')?.label, 'Needs configuration');
+    assert.equal(presentSectionStatus('blocked')?.label, 'Prerequisite missing');
+});
+
+console.log('Workflows workbench');
+
+function listed(overrides: Partial<WorkflowDefinition>): WorkflowDefinition {
+    return draft({ id: String(overrides.name ?? 'workflow').toLowerCase().replace(/\s+/g, '-'), ...overrides });
+}
+
+// The first five keep an outcome in `status`, as older records and the editor fixture do; the last
+// three have the server's own shape -- `status` for the run in progress, idle once it has ended,
+// and the outcome in `last_run_status`.
+const WORKFLOWS = [
+    listed({ name: 'Quarterly review', description: 'Runs the recurring review.', status: 'completed' }),
+    listed({ name: 'Nightly sync', trigger_type: 'interval', schedule: { unit: 'hours', value: 24 }, status: 'failed' }),
+    listed({ name: 'Live import', status: 'running', active_run_id: 'run-9' }),
+    listed({ name: 'Retired audit', is_enabled: false, status: 'cancelled' }),
+    listed({ name: 'Monitor drops', trigger_type: 'file_sync', schedule: { unit: 'minutes', value: 15 }, status: 'failed', active_run_id: 'run-2' }),
+    listed({ name: 'Approval gate', status: 'awaiting_approval', active_run_id: 'run-5', last_run_status: 'completed' }),
+    listed({ name: 'Weekly digest', status: 'idle', last_run_status: 'completed_partial' }),
+    listed({ name: 'Daily report', status: 'idle', last_run_status: 'completed' }),
+];
+
+function names(filters: Partial<WorkflowWorkbenchFilters>): string[] {
+    return filterWorkflows(WORKFLOWS, { ...DEFAULT_WORKFLOW_WORKBENCH_FILTERS, ...filters }).map((item) => item.name);
+}
+
+check('stored statuses read as words, and the readable ones stay as the server wrote them', () => {
+    assert.equal(workflowStatusLabel('completed_partial'), 'Completed with task errors');
+    assert.equal(workflowStatusLabel('awaiting_approval'), 'Awaiting approval');
+    assert.equal(workflowStatusLabel('CANCELED'), 'Cancelled');
+    assert.equal(workflowStatusLabel(''), '');
+    assert.equal(workflowStatusLabel(undefined), '');
+});
+
+check('an active run always reads as running, and no status is never guessed', () => {
+    assert.deepEqual(workflowRunState(listed({ name: 'A', status: 'completed', active_run_id: 'run-1' })),
+        { label: 'Running', tone: 'warn', status: 'running' });
+    assert.deepEqual(workflowRunState(listed({ name: 'B', status: 'queued', active_run_id: 'run-1' })),
+        { label: 'Queued', tone: 'warn', status: 'queued' });
+    assert.deepEqual(workflowRunState(listed({ name: 'B2', status: 'cancelling', active_run_id: 'run-1' })),
+        { label: 'Cancelling', tone: 'warn', status: 'cancelling' });
+    assert.equal(workflowRunState(listed({ name: 'C' })), null);
+    assert.equal(workflowRunState(listed({ name: 'C2', status: 'idle' })), null);
+    assert.equal(workflowRunState(listed({ name: 'D', status: 'failed' }))?.tone, 'danger');
+});
+
+check('a finished run reads from last_run_status once the server sets the workflow back to idle', () => {
+    const failed = listed({ name: 'E', status: 'idle', last_run_status: 'failed' });
+    assert.equal(workflowLastOutcome(failed), 'failed');
+    assert.deepEqual(workflowRunState(failed), { label: 'Failed', tone: 'danger', status: 'failed' });
+    assert.deepEqual(workflowRunState(listed({ name: 'F', status: 'idle', last_run_status: 'completed_partial' })),
+        { label: 'Completed with task errors', tone: 'warn', status: 'completed_partial' });
+    // The recorded outcome wins over an outcome an older record kept in status.
+    assert.equal(workflowLastOutcome(listed({ name: 'G', status: 'failed', last_run_status: 'completed' })), 'completed');
+    // A run in progress is never mistaken for an outcome.
+    assert.equal(workflowLastOutcome(listed({ name: 'H', status: 'running' })), '');
+    assert.equal(workflowLastOutcome(listed({ name: 'I', status: 'awaiting_sign_in' })), '');
+});
+
+check('a run waiting on a person says what it waits for, however the previous run ended', () => {
+    const waiting = listed({ name: 'J', status: 'awaiting_approval', active_run_id: 'run-3', last_run_status: 'failed' });
+    assert.deepEqual(workflowRunState(waiting), { label: 'Awaiting approval', tone: 'warn', status: 'awaiting_approval' });
+    assert.equal(workflowRunState(listed({ name: 'K', status: 'awaiting_sign_in' }))?.label, 'Awaiting sign in');
+});
+
+check('a workflow needs attention while it waits on a person, or until a run that went wrong runs again', () => {
+    assert.deepEqual(WORKFLOWS.filter(workflowNeedsAttention).map((item) => item.name),
+        ['Nightly sync', 'Retired audit', 'Approval gate', 'Weekly digest']);
+});
+
+check('search reads names and descriptions, and filters keep the list order', () => {
+    assert.deepEqual(names({ query: 'RECURRING' }), ['Quarterly review']);
+    assert.deepEqual(names({ query: '  sync ' }), ['Nightly sync']);
+    assert.deepEqual(names({ trigger: 'interval' }), ['Nightly sync']);
+    assert.deepEqual(names({ trigger: 'file_sync' }), ['Monitor drops']);
+    assert.deepEqual(names({ status: 'running' }), ['Live import', 'Monitor drops', 'Approval gate']);
+    assert.deepEqual(names({ status: 'attention' }), ['Nightly sync', 'Retired audit', 'Approval gate', 'Weekly digest']);
+    assert.deepEqual(names({ status: 'completed' }), ['Quarterly review', 'Daily report']);
+    assert.deepEqual(names({ status: 'disabled' }), ['Retired audit']);
+    assert.deepEqual(names({ status: 'attention', trigger: 'manual' }), ['Retired audit', 'Approval gate', 'Weekly digest']);
+    assert.deepEqual(names({ query: 'absent' }), []);
+});
+
+check('only Status and Trigger count as applied filters; search is its own control', () => {
+    assert.equal(workflowFiltersApplied(DEFAULT_WORKFLOW_WORKBENCH_FILTERS), 0);
+    assert.equal(workflowFiltersApplied({ query: 'x', status: 'all', trigger: 'all' }), 0);
+    assert.equal(workflowFiltersApplied({ query: '', status: 'running', trigger: 'manual' }), 2);
+});
+
+check('a row leads with how the workflow stands, then its trigger in a word or two; the detail says it in full', () => {
+    const [quarterly, nightly, , retired, monitor, approval, digest] = WORKFLOWS;
+    assert.equal(workflowRowMeta(quarterly), 'Completed · Manual');
+    assert.equal(workflowDetailMeta(quarterly), 'Manual · runs only when started');
+    assert.equal(workflowRowMeta(nightly), 'Failed · Every 24 hours');
+    assert.equal(workflowRowMeta(retired), 'Cancelled · Manual · Disabled');
+    assert.equal(workflowDetailMeta(retired), 'Manual · runs only when started · Disabled');
+    assert.equal(workflowRowMeta(monitor), 'Running · Monitor File Sync every 15 minutes');
+    assert.equal(workflowRowMeta(approval), 'Awaiting approval · Manual');
+    assert.equal(workflowRowMeta(digest), 'Completed with task errors · Manual');
+    assert.equal(workflowRowMeta(listed({ name: 'Fresh' })), 'Manual');
+});
+
+check('Overview says when it last ran, then lists the editor cards in order, with Run as only when chosen', () => {
+    const facts = workflowOverviewFacts(WORKFLOWS[0]);
+    assert.deepEqual(facts.map((fact) => fact.label), [
+        'Last run', 'Runner', 'Workflow enabled', 'Trigger and schedule', 'File Sync', 'Execution',
+        'Shared references', 'Tasks', 'Alerts',
+    ]);
+    assert.equal(facts[0].value, 'Completed');
+    assert.equal(workflowOverviewFacts(listed({ name: 'Fresh' }))[0].value, 'Not run yet');
+    const when = '2026-09-16T12:00:00Z';
+    const timed = workflowOverviewFacts(listed({ name: 'Timed', status: 'idle', last_run_status: 'failed', last_run_at: when }));
+    assert.equal(timed[0].value, `Failed · ${new Date(when).toLocaleString()}`);
+    assert.equal(workflowOverviewFacts(listed({ name: 'Odd', last_run_at: 'not a date' }))[0].value, 'Not run yet');
+    assert.deepEqual(facts.find((fact) => fact.label === 'Runner'), { label: 'Runner', value: 'Model · App default model' });
+    assert.equal(facts.find((fact) => fact.label === 'File Sync')?.value, 'Off');
+    assert.equal(facts.find((fact) => fact.label === 'Tasks')?.value, '1 task');
+
+    const agentFacts = workflowOverviewFacts(listed({
+        name: 'Agent run', runner_type: 'agent', selected_agent: AGENT, m365_run_as_user_id: 'user-2',
+        definition_version: 3, is_enabled: false,
+    }));
+    assert.equal(agentFacts.find((fact) => fact.label === 'Runner')?.value, 'Agent · Workspace reviewer');
+    assert.deepEqual(agentFacts[2], { label: 'Microsoft 365 Run as', value: 'Account selected' });
+    assert.equal(agentFacts.find((fact) => fact.label === 'Workflow enabled')?.value, 'Off');
+    assert.ok(agentFacts.some((fact) => fact.label === 'Structured tasks'));
+
+    const monitorFacts = workflowOverviewFacts(WORKFLOWS[4]);
+    assert.equal(monitorFacts.find((fact) => fact.label === 'File Sync')?.value, '0 sources · checked for changes');
+});
+
+console.log(`\n${passed} workflow workbench logic checks passed`);
diff --git a/scripts/check_xss_sinks.py b/scripts/check_xss_sinks.py
index 943ee71c8..b929d15ad 100644
--- a/scripts/check_xss_sinks.py
+++ b/scripts/check_xss_sinks.py
@@ -607,6 +607,8 @@ def collect_marked_parse_issues(
     'tabularWorkspaceDownloadUrl',
     # Prefixes the build-time Vite BASE_URL; callers pass VENDOR_PATHS constants.
     'vendorUrl',
+    'workflowEditorHref',
+    'workflowListHref',
     'workflowProposalLink',
     'workflowRunHref',
     'workspaceBasePath',
diff --git a/ui_tests/fixtures/workflow_workbench.py b/ui_tests/fixtures/workflow_workbench.py
new file mode 100644
index 000000000..ebdb8bee5
--- /dev/null
+++ b/ui_tests/fixtures/workflow_workbench.py
@@ -0,0 +1,124 @@
+# workflow_workbench.py
+"""
+Shared navigation for the V2 Workflows workbench and its routed editor.
+Version: 0.261.271
+Implemented in: 0.261.271
+
+The Workflows section is a workbench, drawn the way Admin's Model Catalog is. A list of workflows
+(`list "Workflows"`, one button per workflow, named by the workflow) sits beside the selected
+workflow's detail: an `article` named by the workflow, with its Run, Cancel, Edit (or View) and
+Delete actions and the tabs Overview, Runs and, for a structured (definition 3) workflow, Flow.
+The first visible workflow is selected when the section opens. `?workflow_id=<id>` selects a
+workflow and shows its Overview; adding `&run_id=<id>` shows its Runs tab with that run expanded.
+
+Editing is a page of its own, not a dialog: `/workspace/workflows/<id>` (or `/new`), and
+`/groups/<group>/workflows/<id>` in a group. It is a region named "Edit workflow" or
+"Create workflow". Saving returns to the list with the saved workflow selected. Leaving with
+unsaved changes asks the workspace leave prompt ("Discard unsaved changes?", with Keep editing and
+Discard changes), not the dialog editor's "Discard unsaved workflow changes?". The chat proposal
+card still opens the same editor as a dialog.
+"""
+
+from urllib.parse import quote
+
+from playwright.sync_api import Page, expect
+
+PERSONAL_WORKFLOWS_PATH = "/workspace/workflows"
+EDIT_WORKFLOW = "Edit workflow"
+CREATE_WORKFLOW = "Create workflow"
+LEAVE_PROMPT = "Discard unsaved changes?"
+
+
+def workflows_path(group_id=None):
+    """The Workflows section of the personal workspace, or of a group."""
+    return f"/groups/{quote(group_id, safe='')}/workflows" if group_id else PERSONAL_WORKFLOWS_PATH
+
+
+def workflow_editor_path(workflow_id=None, group_id=None):
+    """The editor page for a workflow, or the page that creates one when no workflow is named."""
+    return f"{workflows_path(group_id)}/{quote(workflow_id or 'new', safe='')}"
+
+
+def workflow_editor(page: Page, name=EDIT_WORKFLOW):
+    """The routed editor page: a region named "Edit workflow" or "Create workflow"."""
+    return page.get_by_role("region", name=name, exact=True)
+
+
+def workflow_list(page: Page):
+    return page.get_by_role("list", name="Workflows", exact=True)
+
+
+def workflow_row(page: Page, name):
+    """A workflow's row in the list: a button named by the workflow."""
+    return workflow_list(page).get_by_role("button", name=name, exact=True)
+
+
+def workflow_detail(page: Page, name):
+    """The detail of the selected workflow: an article named by the workflow."""
+    return page.get_by_role("article", name=name, exact=True)
+
+
+def select_workflow(page: Page, name):
+    """Select a workflow in the list and return its detail."""
+    row = workflow_row(page, name)
+    row.click()
+    expect(row).to_have_attribute("aria-pressed", "true")
+    detail = workflow_detail(page, name)
+    expect(detail).to_be_visible()
+    return detail
+
+
+def open_workflow_tab(page: Page, name, tab):
+    """Select a workflow, open one of its detail tabs and return the tab's panel."""
+    detail = select_workflow(page, name)
+    detail.get_by_role("tab", name=tab, exact=True).click()
+    panel = detail.get_by_role("tabpanel", name=tab, exact=True)
+    expect(panel).to_be_visible()
+    return panel
+
+
+def open_workflow_runs(page: Page, name):
+    """The workflow's Runs tab: its run history, which reads and polls only while shown."""
+    return open_workflow_tab(page, name, "Runs")
+
+
+def open_workflow_flow(page: Page, name):
+    """The structured workflow's Flow tab: the saved definition, read-only."""
+    return open_workflow_tab(page, name, "Flow")
+
+
+def leave_workflow_runs(page: Page, name):
+    """Return to Overview, which unmounts the run history and stops its polling."""
+    detail = workflow_detail(page, name)
+    detail.get_by_role("tab", name="Overview", exact=True).click()
+    expect(detail.get_by_role("tabpanel", name="Overview", exact=True)).to_be_visible()
+
+
+def edit_workflow(page: Page, name, *, action="Edit"):
+    """Select a workflow, choose Edit (or View) and return the editor page."""
+    detail = select_workflow(page, name)
+    detail.get_by_role("button", name=f"{action} {name}", exact=True).click()
+    editor = workflow_editor(page)
+    expect(editor).to_be_visible()
+    return editor
+
+
+def create_workflow(page: Page):
+    """Choose Create workflow and return the editor page."""
+    page.get_by_role("button", name=CREATE_WORKFLOW, exact=True).click()
+    editor = workflow_editor(page, CREATE_WORKFLOW)
+    expect(editor).to_be_visible()
+    return editor
+
+
+def leave_prompt(page: Page):
+    """The workspace prompt that asks before unsaved editor changes are left behind."""
+    return page.get_by_role("dialog", name=LEAVE_PROMPT, exact=True)
+
+
+def discard_and_leave(page: Page):
+    """Answer the leave prompt with Discard changes."""
+    prompt = leave_prompt(page)
+    expect(prompt).to_be_visible()
+    prompt.get_by_role("button", name="Discard changes", exact=True).click()
+    expect(prompt).to_have_count(0)
diff --git a/ui_tests/test_v2_document_provenance.py b/ui_tests/test_v2_document_provenance.py
index 8f5065bb1..a7321a39c 100644
--- a/ui_tests/test_v2_document_provenance.py
+++ b/ui_tests/test_v2_document_provenance.py
@@ -1,11 +1,12 @@
 # test_v2_document_provenance.py
 """
 Production-SPA coverage for where a V2 document came from.
-Version: 0.261.251
+Version: 0.261.271
 Implemented in: 0.261.194
 A workflow alert's Open workflow, followed while that workflows list is already open: 0.261.199
 One more list read, and no more, for a workflow the open list lacks: 0.261.199
 Open run in Open workflow's place, for an alert that names its run: 0.261.251
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 The real SPA runs against closed synthetic document, workflow and chat APIs, with no live data.
 A list row says only which kind of origin a document has (`origin_kind`). The details pane asks
@@ -50,6 +51,11 @@
     workflow_record,
 )
 from ui_tests.fixtures.workspace_authoring import ORIGIN, OWNER_ID, connect_options  # noqa: E402,F401
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    select_workflow,
+    workflow_detail,
+    workflow_row,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -316,7 +322,14 @@ def raise_workflow_alert(ui, scope, identifier, title):
         ui.page.evaluate("() => window.dispatchEvent(new FocusEvent('focus'))")
         ui.page.wait_for_timeout(500)
     notice = ui.page.locator("[data-workflow-alert-notice]")
-    expect(notice).to_contain_text(title)
+    deadline = time.monotonic() + 10
+    while True:
+        if notice.count() and title in (notice.text_content() or ""):
+            break
+        if time.monotonic() > deadline:
+            expect(notice).to_contain_text(title)
+        ui.page.evaluate("() => window.dispatchEvent(new FocusEvent('focus'))")
+        ui.page.wait_for_timeout(500)
     return notice
 
 
@@ -372,7 +385,9 @@ def test_workflow_origin_links_to_its_run_in_the_workflow_history(provenance_ui)
 
     link.click()
     expect(ui.page).to_have_url(f"{ORIGIN}/v2{WORKFLOW_HREF}")
-    history = ui.page.get_by_role("list", name="Workflow run history", exact=True)
+    runs = workflow_detail(ui.page, "Quarterly review workflow").get_by_role("tabpanel", name="Runs", exact=True)
+    expect(runs).to_be_visible()
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
     linked = history.locator('li[aria-current="true"]')
     expect(linked).to_have_count(1)
     expect(linked.get_by_role("button", name="Hide run task results", exact=True)).to_be_visible()
@@ -380,7 +395,7 @@ def test_workflow_origin_links_to_its_run_in_the_workflow_history(provenance_ui)
     expect(history.get_by_role("button", name="Hide run task results", exact=True)).to_have_count(1)
     expect(history.get_by_role("button", name="Show run task results", exact=True)).to_have_count(1)
     expect(ui.page.get_by_text("The linked run is not among the most recent runs shown here.")).to_have_count(0)
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
     assert [entry.path for entry in ui.requests if entry.path.endswith("/items")] == [
         f"/api/user/workflows/{WORKFLOW_ID}/runs/{LINKED_RUN_ID}/items",
     ]
@@ -389,20 +404,24 @@ def test_workflow_origin_links_to_its_run_in_the_workflow_history(provenance_ui)
 
 def test_a_run_link_outside_the_recent_runs_says_so_and_a_workflow_link_still_edits(provenance_ui):
     """A run older than the history shows is reported rather than silently replaced by another
-    run. A link that names only the workflow keeps opening the editor, as it always has."""
+    run. A link that names only the workflow selects it in the workbench."""
     ui = provenance_ui
     ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}&run_id=run-archived")
     expect(ui.page.get_by_role("status").filter(
         has_text="The linked run is not among the most recent runs shown here.",
     )).to_be_visible()
-    history = ui.page.get_by_role("list", name="Workflow run history", exact=True)
+    runs = workflow_detail(ui.page, "Quarterly review workflow").get_by_role("tabpanel", name="Runs", exact=True)
+    expect(runs).to_be_visible()
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
     expect(history.get_by_role("button", name="Show run task results", exact=True)).to_have_count(2)
     expect(history.locator("li[aria-current]")).to_have_count(0)
     expect(history.get_by_role("button", name="Hide run task results", exact=True)).to_have_count(0)
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
-
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
     ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+    detail = workflow_detail(ui.page, "Quarterly review workflow")
+    expect(detail).to_be_visible()
+    expect(detail.get_by_role("tabpanel", name="Overview", exact=True)).to_be_visible()
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
     assert not [entry for entry in ui.requests if entry.path.endswith("/items")]
 
 
@@ -423,9 +442,10 @@ def test_open_run_from_an_alert_while_the_list_is_open(alert_workflows_ui, scope
         ui.open("/workspace/workflows")
         items_path = f"/api/user/workflows/{workflow_id}/runs/{run_id}/items"
         list_api = "/api/user/workflows"
-    run_other = ui.page.get_by_role("button", name=f"Run {other}", exact=True)
+    detail = select_workflow(ui.page, other)
+    run_other = detail.get_by_role("button", name=f"Run {other}", exact=True)
     expect(run_other).to_be_visible()
-    history = ui.page.get_by_role("list", name="Workflow run history", exact=True)
+    history = workflow_detail(ui.page, other).get_by_role("list", name="Workflow run history", exact=True)
     linked = history.locator('li[aria-current="true"]')
     expect(history).to_have_count(0)
     target = f"{ORIGIN}/v2{list_path}?workflow_id={workflow_id}&run_id={run_id}"
@@ -435,10 +455,13 @@ def item_reads():
 
     open_run_from(ui, raise_workflow_alert(ui, scope, "alert-1", "Review found blocking items"))
     expect(ui.page).to_have_url(target)
+    runs = workflow_detail(ui.page, ALERT_CASES[scope][1]).get_by_role("tabpanel", name="Runs", exact=True)
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
+    linked = history.locator('li[aria-current="true"]')
     expect(linked).to_have_count(1)
     expect(linked.get_by_role("button", name="Hide run task results", exact=True)).to_be_visible()
     expect(linked).to_contain_text("Collect evidence")
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
     wait_until(ui, lambda: ui.read_calls == ["alert-1"], lambda: f"Opening marked {ui.read_calls} as read.")
     assert item_reads() == [items_path]
 
@@ -446,7 +469,9 @@ def item_reads():
     linked.get_by_role("button", name="Hide run task results", exact=True).click()
     expect(linked.get_by_role("button", name="Show run task results", exact=True)).to_be_visible()
     open_run_from(ui, raise_workflow_alert(ui, scope, "alert-2", "Review still has blocking items"))
-    expect(ui.page).to_have_url(target)
+    runs = workflow_detail(ui.page, ALERT_CASES[scope][1]).get_by_role("tabpanel", name="Runs", exact=True)
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
+    linked = history.locator('li[aria-current="true"]')
     expect(linked.get_by_role("button", name="Hide run task results", exact=True)).to_be_visible()
     wait_until(ui, lambda: ui.read_calls == ["alert-1", "alert-2"], lambda: f"Opening marked {ui.read_calls} as read.")
     assert item_reads() == [items_path, items_path]
@@ -454,15 +479,22 @@ def item_reads():
     # Running another workflow refreshes the list and expands that workflow's history instead.
     # The address still names the run, but it was already acted on, so it stays closed.
     list_reads = sum(1 for entry in ui.requests if (entry.method, entry.path) == ("GET", list_api))
+    detail = select_workflow(ui.page, other)
+    run_other = detail.get_by_role("button", name=f"Run {other}", exact=True)
     run_other.click()
-    expect(ui.page.get_by_role("button", name=f"Cancel {other}", exact=True)).to_be_visible()
+    expect(detail.get_by_role("button", name=f"Cancel {other}", exact=True)).to_be_visible()
     wait_until(
         ui,
         lambda: sum(1 for entry in ui.requests if (entry.method, entry.path) == ("GET", list_api)) > list_reads,
         lambda: "Running the workflow did not refresh the list.",
     )
     ui.page.wait_for_timeout(500)
-    expect(ui.page.get_by_role("button", name="Hide run history", exact=True)).to_have_count(1)
+    # Run shows the other workflow's Runs tab; its new run is listed, and nothing is expanded.
+    runs = workflow_detail(ui.page, other).get_by_role("tabpanel", name="Runs", exact=True)
+    expect(runs).to_be_visible()
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
+    expect(history).to_be_visible()
+    expect(history.get_by_role("button", name="Hide run task results", exact=True)).to_have_count(0)
     expect(history.locator("li[aria-current]")).to_have_count(0)
     expect(ui.page).to_have_url(target)
     assert item_reads().count(items_path) == 2
@@ -498,8 +530,9 @@ def open_list_without_the_alerted_workflow(ui, scope):
         ui.select_group(GROUP_ID)
     else:
         ui.open("/workspace/workflows")
-    expect(ui.page.get_by_role("button", name=f"Run {other}", exact=True)).to_be_visible()
-    expect(ui.page.get_by_role("button", name=f"Run {name}", exact=True)).to_have_count(0)
+    detail = select_workflow(ui.page, other)
+    expect(detail.get_by_role("button", name=f"Run {other}", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, name)).to_have_count(0)
     return workflows, record
 
 
@@ -528,18 +561,18 @@ def test_open_run_reads_the_list_again_for_a_workflow_created_since(alert_workfl
     workflow_id, name, run_id, _, list_path = ALERT_CASES[scope]
     workflows, record = open_list_without_the_alerted_workflow(ui, scope)
     workflows[workflow_id] = record
-    history = ui.page.get_by_role("list", name="Workflow run history", exact=True)
-    linked = history.locator('li[aria-current="true"]')
-
     notice = raise_workflow_alert(ui, scope, "alert-1", "Review found blocking items")
     list_reads = workflow_list_reads(ui, scope)
     open_run_from(ui, notice)
     expect(ui.page).to_have_url(f"{ORIGIN}/v2{list_path}?workflow_id={workflow_id}&run_id={run_id}")
+    runs = workflow_detail(ui.page, name).get_by_role("tabpanel", name="Runs", exact=True)
+    history = runs.get_by_role("list", name="Workflow run history", exact=True)
+    linked = history.locator('li[aria-current="true"]')
     expect(linked).to_have_count(1)
     expect(linked.get_by_role("button", name="Hide run task results", exact=True)).to_be_visible()
     expect(linked).to_contain_text("Collect evidence")
-    expect(ui.page.get_by_role("button", name=f"Run {name}", exact=True)).to_be_visible()
-    expect(ui.page.get_by_role("dialog")).to_have_count(0)
+    expect(workflow_detail(ui.page, name).get_by_role("button", name=f"Run {name}", exact=True)).to_be_visible()
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
     wait_until(ui, lambda: ui.read_calls == ["alert-1"], lambda: f"Opening marked {ui.read_calls} as read.")
     ui.page.wait_for_timeout(QUIET_MS)
     extra_reads = workflow_list_reads(ui, scope) - list_reads
@@ -563,14 +596,15 @@ def test_open_run_reads_the_list_only_once_more_for_a_workflow_it_lacks(alert_wo
     open_list_without_the_alerted_workflow(ui, scope)
     target = f"{ORIGIN}/v2{list_path}?workflow_id={workflow_id}&run_id={run_id}"
     section = ui.page.get_by_role("group", name="Workspace workflows", exact=True)
-    run_other = section.get_by_role("button", name=f"Run {other}", exact=True)
-    history = ui.page.get_by_role("list", name="Workflow run history", exact=True)
+    expect(section).to_be_visible()
+    detail = select_workflow(ui.page, other)
+    run_other = detail.get_by_role("button", name=f"Run {other}", exact=True)
 
     extra_reads = follow_open_run_to_a_missing_workflow(ui, scope, "alert-1", "Review found blocking items")
     expect(ui.page).to_have_url(target)
     assert extra_reads == 1, f"Open run read the list {extra_reads} more times, not once."
-    expect(ui.page.get_by_role("dialog")).to_have_count(0)
-    expect(history).to_have_count(0)
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(ui.page.get_by_role("list", name="Workflow run history", exact=True)).to_have_count(0)
     expect(section.get_by_role("alert")).to_have_count(0)
     wait_until(ui, lambda: ui.read_calls == ["alert-1"], lambda: f"Opening marked {ui.read_calls} as read.")
 
@@ -578,9 +612,10 @@ def test_open_run_reads_the_list_only_once_more_for_a_workflow_it_lacks(alert_wo
     search = section.get_by_role("searchbox", name="Search workflows", exact=True)
     search.fill("no such workflow")
     expect(section.get_by_text("No workflows match your search", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, other)).to_have_count(0)
     expect(run_other).to_have_count(0)
     search.fill("")
-    expect(run_other).to_be_enabled()
+    expect(workflow_row(ui.page, other)).to_be_enabled()
 
     # Following the same link again is a new navigation, with one read of its own.
     extra_reads = follow_open_run_to_a_missing_workflow(
@@ -588,8 +623,8 @@ def test_open_run_reads_the_list_only_once_more_for_a_workflow_it_lacks(alert_wo
     )
     expect(ui.page).to_have_url(target)
     assert extra_reads == 1, f"Following the link again read the list {extra_reads} more times, not once."
-    expect(ui.page.get_by_role("dialog")).to_have_count(0)
-    expect(history).to_have_count(0)
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(ui.page.get_by_role("list", name="Workflow run history", exact=True)).to_have_count(0)
     expect(section.get_by_role("alert")).to_have_count(0)
     expect(run_other).to_be_enabled()
     wait_until(
diff --git a/ui_tests/test_v2_group_classic_handoffs.py b/ui_tests/test_v2_group_classic_handoffs.py
index 28af408b0..09c2ad2de 100644
--- a/ui_tests/test_v2_group_classic_handoffs.py
+++ b/ui_tests/test_v2_group_classic_handoffs.py
@@ -1,13 +1,14 @@
 # test_v2_group_classic_handoffs.py
 """
 M8A classic handoff cleanup for the native V2 group workspace.
-Version: 0.261.166
+Version: 0.261.271
 Implemented in: 0.261.153
+A workflow's resource segment is its editor page, no longer a redirect to the workflow query: 0.261.271
 
 Every group workspace section is native now, so the V2 group pages must stop sending people to
 classic where classic offers nothing more. This suite pins that the "Classic" availability labels
 and the overview's Classic promise are gone, that a stray resource segment redirects to its own
-section (or the workflow query) instead of a classic panel, that the actions-off surface keeps only
+section (a workflow's segment opens its editor page) instead of a classic panel, that the actions-off surface keeps only
 the Call agent view, that Tags drops its classic button, and that Documents keeps a relabelled
 classic-tools link (classic still owns the legacy-document upgrade).
 """
@@ -105,10 +106,11 @@ def test_stray_resource_segments_never_reach_a_classic_panel(group_ui):
     expect(ui.page.get_by_role("heading", name="Tags", exact=True)).to_be_visible()
     expect(ui.page.get_by_text(REMOVED_PANEL_COPY, exact=True)).to_have_count(0)
 
-    # A resource segment on Workflows becomes the ?workflow_id= query the section already understands.
+    # A resource segment on Workflows is that workflow's editor page, so it stays where it is.
     ui.open("/groups/group-a/workflows/workflow-1")
-    expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-a/workflows?workflow_id=workflow-1")
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+    expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-a/workflows/workflow-1")
+    expect(ui.page.get_by_role("region", name="Edit workflow", exact=True)).to_be_visible()
+    expect(ui.page.get_by_role("dialog")).to_have_count(0)
     expect(ui.page.get_by_text(REMOVED_PANEL_COPY, exact=True)).to_have_count(0)
 
     # An unknown section keeps its own not-found state, and still never a classic panel.
diff --git a/ui_tests/test_v2_group_journeys.py b/ui_tests/test_v2_group_journeys.py
index 538d091c7..16b76a583 100644
--- a/ui_tests/test_v2_group_journeys.py
+++ b/ui_tests/test_v2_group_journeys.py
@@ -1,8 +1,9 @@
 # test_v2_group_journeys.py
 """M8 group workspace end-to-end journeys, on the real built SPA.
 
-Version: 0.261.165
+Version: 0.261.271
 Implemented in: 0.261.161
+The workflow editor is a routed page whose draft freezes the group switcher, as Settings does: 0.261.271
 
 These ride one composite group store (`group_journeys_ui`) that answers the
 directory, membership, prompt, document-collaboration and native-authoring routes
@@ -532,7 +533,9 @@ def _open_file_source_draft(ui):
 def _open_workflow_draft(ui):
     section(ui.page, "Workflows")
     ui.page.get_by_role("button", name="Create workflow", exact=True).click()
-    field = ui.page.get_by_role("dialog").get_by_label("Workflow name", exact=True)
+    # The editor is a page of its own; its draft is the group page's, so the group guards it.
+    expect(ui.page).to_have_url(re.compile(r"/v2/groups/group-a/workflows/new$"))
+    field = ui.page.get_by_role("region", name="Create workflow", exact=True).get_by_label("Workflow name", exact=True)
     field.fill("Draft workflow")
     return field, "Draft workflow"
 
@@ -556,7 +559,7 @@ def _open_settings_draft(ui):
     pytest.param("modal", _open_identity_draft, id="identities"),
     pytest.param("modal", _open_endpoint_draft, id="endpoints"),
     pytest.param("modal", _open_file_source_draft, id="file-sources"),
-    pytest.param("modal", _open_workflow_draft, id="workflows"),
+    pytest.param("switcher", _open_workflow_draft, id="workflows"),
     pytest.param("switcher", _open_settings_draft, id="settings"),
 ]
 
diff --git a/ui_tests/test_v2_group_workflow_file_sync.py b/ui_tests/test_v2_group_workflow_file_sync.py
index 6992026c2..08048eb09 100644
--- a/ui_tests/test_v2_group_workflow_file_sync.py
+++ b/ui_tests/test_v2_group_workflow_file_sync.py
@@ -1,8 +1,9 @@
 # test_v2_group_workflow_file_sync.py
 """
 UI tests for group workflow File Sync triggers, stored alerts and approvals in native V2.
-Version: 0.261.207
+Version: 0.261.271
 Implemented in: 0.261.141
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 These tests use the real V2 SPA bundle with the closed workflow fixture. The fixture answers the
 group File Sync source list with the real `_serialize_workflow_file_sync_source`, and validates
@@ -49,6 +50,13 @@
     workflow_record,
     workflow_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    open_workflow_runs,
+    workflow_editor,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -168,9 +176,7 @@ def test_manager_authors_a_monitor_trigger_and_posts_the_server_shape(workflow_u
     """A group manager picks the trigger and a source; the POST carries what the server accepts."""
     ui, page = workflow_ui, workflow_ui.page
     open_group_workflows(ui)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Create workflow", exact=True)
-    expect(dialog).to_be_visible()
+    dialog = create_workflow(page)
 
     expect(source_checkbox(page, "Finance share (Group)")).to_be_visible()
     assert source_requests(ui) and all(
@@ -221,7 +227,7 @@ def test_manager_authors_a_monitor_trigger_and_posts_the_server_shape(workflow_u
     saved_id = next(identifier for identifier in ui.group_workflows[GROUP_ID] if identifier.startswith("group-created"))
     assert ui.group_workflows[GROUP_ID][saved_id]["file_sync"]["sources"] == [STORED_FINANCE_SOURCE]
 
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     expect(labelled(page, "Trigger")).to_have_value("file_sync")
     expect(source_checkbox(page, "Finance share (Group)")).to_be_checked()
     expect(labelled(page, "Interval value")).to_have_value("30")
@@ -240,7 +246,7 @@ def test_editing_an_existing_file_sync_workflow_round_trips_every_modelled_famil
     assert loaded["tasks"][0]["document_action"]["type"] == "analyze"
     assert loaded["tasks"][0]["document_action"]["document_ids"] == []
     open_group_workflows(ui)
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     expect(labelled(page, "Trigger")).to_have_value("file_sync")
     expect(source_checkbox(page, "Finance share (Group)")).to_be_checked()
     preserved = page.get_by_text("V2 does not edit these legacy settings", exact=False)
@@ -260,7 +266,7 @@ def test_editing_an_existing_file_sync_workflow_round_trips_every_modelled_famil
 
     labelled(page, "Description").first.fill("Summarize and flag risky changes.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
 
     body = workflow_post(ui).body
     assert body["description"] == "Summarize and flag risky changes."
@@ -279,7 +285,7 @@ def test_editing_an_existing_file_sync_workflow_round_trips_every_modelled_famil
     assert ("group", GROUP_ID, "finance-share") in ui.file_sync_source_reads
     assert ui.group_workflows[GROUP_ID][MONITOR_ID]["file_sync"] == loaded["file_sync"]
 
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     changed_files = page.get_by_role("checkbox", name=re.compile(r"^Use changed files as Analyze targets"))
     changed_files.uncheck(force=True)
     # Without changed files as targets, the server would refuse an Analyze task with no documents.
@@ -296,7 +302,7 @@ def test_editing_an_existing_file_sync_workflow_round_trips_every_modelled_famil
 
     source_checkbox(page, "Archive share (Group)").check()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert workflow_post(ui).body["file_sync"] == {
         "enabled": True, "wait_mode": "complete", "continue_mode": "changed", "use_changed_documents": True,
         "sources": [
@@ -313,7 +319,7 @@ def test_file_sync_before_run_follows_the_server_rules_for_manual_triggers(workf
     """File Sync before run is optional for manual workflows, and queued plus changed is refused locally."""
     ui, page = workflow_ui, workflow_ui.page
     open_group_workflows(ui)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     fill_required_basics(page, "Sync first")
     expect(page.get_by_label("Wait for File Sync", exact=True)).to_be_disabled()
     before_run_toggle(page).check(force=True)
@@ -329,7 +335,7 @@ def test_file_sync_before_run_follows_the_server_rules_for_manual_triggers(workf
 
     page.get_by_label("Wait for File Sync", exact=True).select_option("complete")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     body = workflow_post(ui).body
     assert body["trigger_type"] == "manual"
     assert body["file_sync"] == {
@@ -337,10 +343,10 @@ def test_file_sync_before_run_follows_the_server_rules_for_manual_triggers(workf
         "sources": [{"scope_type": "group", "scope_id": GROUP_ID, "source_id": "finance-share"}],
     }
 
-    page.get_by_role("button", name="Edit Sync first", exact=True).click()
+    edit_workflow(page, "Sync first")
     before_run_toggle(page).uncheck(force=True)
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert workflow_post(ui).body["file_sync"] == {
         "enabled": False, "wait_mode": "complete", "continue_mode": "changed", "use_changed_documents": True,
         "sources": [],
@@ -357,7 +363,7 @@ def test_unavailable_saved_sources_must_be_removed_before_saving(workflow_ui):
     })
     ui.group_workflows[GROUP_ID][MONITOR_ID] = workflow
     open_group_workflows(ui)
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     stale = source_checkbox(page, "Deleted share")
     expect(stale).to_be_checked()
     expect(page.get_by_text("No longer available", exact=True)).to_be_visible()
@@ -371,7 +377,7 @@ def test_unavailable_saved_sources_must_be_removed_before_saving(workflow_ui):
     stale.click()
     expect(source_checkbox(page, "Deleted share")).to_have_count(0)
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert workflow_post(ui).body["file_sync"]["sources"] == [
         {"scope_type": "group", "scope_id": GROUP_ID, "source_id": "finance-share"},
     ]
@@ -382,7 +388,7 @@ def test_no_sources_hides_the_monitor_trigger_and_server_refusals_are_shown_as_r
     ui, page = workflow_ui, workflow_ui.page
     ui.group_file_sync_enabled[GROUP_ID] = False
     open_group_workflows(ui)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    editor = create_workflow(page)
     # 0.261.149: the list says File Sync is off, so the editor neither lists sources nor lets a draft use them.
     expect(page.get_by_text(
         "Group File Sync is not enabled, so this group's sources cannot be listed.", exact=True,
@@ -390,10 +396,11 @@ def test_no_sources_hides_the_monitor_trigger_and_server_refusals_are_shown_as_r
     expect(page.get_by_text("No File Sync sources are available to this group.", exact=True)).to_have_count(0)
     expect(before_run_toggle(page)).to_be_disabled()
     assert trigger_options(page) == ["Manual", "Schedule"]
-    page.get_by_role("dialog", name="Create workflow", exact=True).get_by_role("button", name="Cancel", exact=True).click()
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(editor).to_have_count(0)
 
     ui.group_file_sync_enabled[GROUP_ID] = True
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     fill_required_basics(page, "Refused monitor")
     labelled(page, "Trigger").select_option("file_sync")
     source_checkbox(page, "Finance share (Group)").check()
@@ -413,8 +420,7 @@ def test_members_see_a_read_only_summary_and_never_request_sources(workflow_ui):
     ui.group_workflows[GROUP_ID][MONITOR_ID] = monitored_workflow()
     open_group_workflows(ui)
     expect(page.get_by_role("button", name="Create workflow", exact=True)).to_have_count(0)
-    page.get_by_role("button", name="View Monitor finance drops", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    dialog = edit_workflow(page, "Monitor finance drops", action="View")
     expect(dialog.get_by_text("You have read-only access to workflows in this scope.", exact=True)).to_be_visible()
     expect(labelled(page, "Trigger")).to_have_value("file_sync")
     expect(labelled(page, "Trigger")).to_be_disabled()
@@ -444,26 +450,28 @@ def test_managers_edit_stored_alerts_natively_with_no_classic_link(workflow_ui):
     alerts = page.get_by_role("region", name="Alerts", exact=True)
     rules = page.get_by_role("list", name="Alert rules", exact=True).get_by_role("listitem")
 
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    dialog = edit_workflow(page, "Monitor finance drops")
     expect(alerts.get_by_label("When to alert", exact=True)).to_have_value("rules")
     expect(rules).to_have_count(2)
     expect(alerts.get_by_role("heading", name="Rule 1: Files changed", exact=True)).to_be_visible()
     expect(alerts.get_by_label("Alert rule 2 task", exact=True)).to_have_value("summarize")
     expect(alerts.get_by_label("If a model evaluated condition cannot be judged", exact=True)).to_have_count(0)
     dialog.get_by_role("button", name="Cancel", exact=True).click()
+    expect(dialog).to_have_count(0)
 
-    page.get_by_role("button", name="Edit Every run alerts", exact=True).click()
+    edit_workflow(page, "Every run alerts")
     expect(alerts.get_by_label("When to alert", exact=True)).to_have_value("every_run")
     expect(alerts.get_by_label("Pop-up alert priority", exact=True)).to_have_value("low")
     expect(rules).to_have_count(0)
     dialog.get_by_role("button", name="Cancel", exact=True).click()
+    expect(dialog).to_have_count(0)
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    creating = create_workflow(page)
     expect(alerts.get_by_label("When to alert", exact=True)).to_have_value("off")
-    page.get_by_role("dialog", name="Create workflow", exact=True).get_by_role("button", name="Cancel", exact=True).click()
+    creating.get_by_role("button", name="Cancel", exact=True).click()
+    expect(creating).to_have_count(0)
 
-    page.get_by_role("button", name="Edit Legacy alerts", exact=True).click()
+    edit_workflow(page, "Legacy alerts")
     # A priority-only record resolves on the server to the two legacy rules; the editor shows them.
     expect(alerts.get_by_label("When to alert", exact=True)).to_have_value("rules")
     expect(alerts.get_by_role("heading", name="Rule 1: Run failed", exact=True)).to_be_visible()
@@ -489,9 +497,8 @@ def test_group_durable_run_approval_decides_through_the_group_route(workflow_ui)
         },
     ), scope_type="group")
     open_group_workflows(ui)
-    row = page.get_by_role("listitem").filter(has_text="Group review workflow").first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
+    runs = open_workflow_runs(page, "Group review workflow")
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
     expect(page.get_by_text("Approval is required before the group task starts.", exact=True)).to_be_visible()
     page.get_by_role("button", name="Approve task", exact=True).click()
     expect(page.get_by_text("queued", exact=True).first).to_be_visible()
@@ -513,7 +520,7 @@ def test_file_sync_and_alert_sections_fit_desktop_and_mobile(workflow_ui, theme,
     ui.group_workflows[GROUP_ID][MONITOR_ID] = monitored_workflow()
     ui.open("/groups", theme=theme, width=width, height=height)
     ui.select_group(GROUP_ID)
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     file_sync = page.get_by_role("region", name="File Sync")
     alerts = page.get_by_role("region", name="Alerts")
     file_sync.scroll_into_view_if_needed()
@@ -521,7 +528,9 @@ def test_file_sync_and_alert_sections_fit_desktop_and_mobile(workflow_ui, theme,
     expect(page.get_by_label("Continue the workflow", exact=True)).to_be_visible()
     alerts.scroll_into_view_if_needed()
     expect(page.get_by_role("list", name="Alert rules", exact=True).get_by_role("listitem")).to_have_count(2)
-    clipped = page.evaluate("""() => [...document.querySelectorAll('[role="dialog"] *')]
+    # Visually hidden text, such as the File Sync sources legend, is clipped by design.
+    clipped = page.evaluate("""() => [...document.querySelectorAll('[data-workflow-editor-page] *')]
+        .filter((element) => !element.closest('.sr-only'))
         .filter((element) => element.scrollWidth > element.clientWidth + 1 && getComputedStyle(element).overflowX !== 'visible')
         .map((element) => element.tagName)""")
     assert clipped == [], clipped
@@ -546,7 +555,7 @@ def test_personal_workflows_keep_an_untouched_file_sync_unchanged(workflow_ui):
         exact=True,
     )).to_be_visible()
 
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+    edit_workflow(page, "Quarterly review workflow")
     expect(labelled(page, "Trigger")).to_have_value("file_sync")
     expect(source_checkbox(page, "Home share (Personal)")).to_be_checked()
     assert trigger_options(page) == ["Manual", "Schedule", "Monitor File Sync changes"]
@@ -556,7 +565,7 @@ def test_personal_workflows_keep_an_untouched_file_sync_unchanged(workflow_ui):
     expect(preserved).not_to_contain_text("file sync settings")
     labelled(page, "Description").first.fill("Personal edit keeps its File Sync.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     body = workflow_post(ui).body
     assert body["trigger_type"] == "file_sync"
     assert body["file_sync"] == PERSONAL_MONITOR_FILE_SYNC
@@ -591,8 +600,7 @@ def test_personal_analyze_tasks_may_rely_on_file_sync_changed_files(workflow_ui)
         }],
     )
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Edit Personal changed files", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    dialog = edit_workflow(page, "Personal changed files")
     expect(before_run_toggle(page)).to_be_checked()
     expect(source_checkbox(page, "Home share (Personal)")).to_be_checked()
     page.get_by_text("Runner, inputs, references and outputs", exact=True).first.click()
@@ -613,7 +621,7 @@ def test_personal_analyze_tasks_may_rely_on_file_sync_changed_files(workflow_ui)
     # Without changed files as targets the same draft needs evidence, as the server requires.
     ui.personal_workflows["personal-sync"]["file_sync"]["use_changed_documents"] = False
     page.reload()
-    page.get_by_role("button", name="Edit Personal changed files", exact=True).click()
+    edit_workflow(page, "Personal changed files")
     expect(page.get_by_role("status").filter(has_text="Analyze changes needs selected evidence for Analyze.")).to_be_visible()
 
 
@@ -626,7 +634,7 @@ def test_group_workflow_pages_trap_personal_reads(workflow_ui):
     assert not ui.unexpected_requests
 
     open_group_workflows(ui)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     expect(source_checkbox(page, "Finance share (Group)")).to_be_visible()
     assert not ui.unexpected_requests, ui.unexpected_requests
     assert page.evaluate(fetch_status, "/api/user/settings") == 200
diff --git a/ui_tests/test_v2_group_workspace_shell.py b/ui_tests/test_v2_group_workspace_shell.py
index 9a1ccaefe..49d35a1a5 100644
--- a/ui_tests/test_v2_group_workspace_shell.py
+++ b/ui_tests/test_v2_group_workspace_shell.py
@@ -1,11 +1,14 @@
 # test_v2_group_workspace_shell.py
 """
 Real-SPA group selection, navigation, scope, and draft safety.
-Version: 0.261.188
+Version: 0.261.271
 Implemented in: 0.261.127
 Group workflow member run/cancel, status gates, delete, and search coverage: 0.261.178
 The workflow editor takes focus and hands it back to Edit on close: 0.261.188
 A failed workflow read offers a retry and never the empty state: 0.261.188
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: a
+workflow's actions belong to its selected detail, the editor is a page that returns focus to the
+edited workflow's heading, and a legacy workflow target selects the workflow: 0.261.271
 """
 
 import copy
@@ -17,6 +20,13 @@
     connect_options, group_context, group_ui,  # noqa: F401
 )
 from ui_tests.fixtures.workspace_authoring import ORIGIN
+from ui_tests.fixtures.workflow_workbench import (
+    create_workflow,
+    select_workflow,
+    workflow_detail,
+    workflow_editor,
+    workflow_row,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -166,18 +176,21 @@ def test_group_action_delete_preserves_callers(group_ui):
 def test_native_workflows_and_read_only_roles(group_ui):
     ui = group_ui
     ui.open("/groups/group-a/workflows")
-    expect(ui.page.get_by_text("Review group files", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, "Review group files")).to_be_visible()
+    select_workflow(ui.page, "Review group files")
     ui.page.get_by_role("button", name="Run Review group files", exact=True).click()
     expect(ui.page.get_by_role("button", name="Cancel Review group files", exact=True)).to_be_visible()
     assert ui.writes[-1].query == {"group_id": ["group-a"]}
     ui.page.get_by_role("button", name="Cancel Review group files", exact=True).click()
     expect(ui.page.get_by_role("button", name="Run Review group files", exact=True)).to_be_visible()
-    ui.page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(ui.page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    editor = create_workflow(ui.page)
     ui.page.get_by_label("Workflow name", exact=True).fill("Unsaved group workflow")
     expect(ui.page.get_by_role("combobox", name="Group workspace")).to_be_disabled()
-    ui.page.get_by_role("button", name="Cancel", exact=True).click()
-    ui.page.get_by_role("button", name="Discard changes", exact=True).click()
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    ui.page.get_by_role("dialog", name="Discard unsaved changes?", exact=True).get_by_role(
+        "button", name="Discard changes", exact=True
+    ).click()
+    expect(editor).to_have_count(0)
     ui.page.get_by_role("combobox", name="Group workspace").select_option("group-b")
     expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-b/workflows")
     expect(ui.page.get_by_role("button", name="Create workflow", exact=True)).to_have_count(0)
@@ -188,6 +201,8 @@ def test_a_member_runs_and_cancels_a_group_workflow_but_cannot_manage_it(group_u
     ui = group_ui
     ui.open("/groups/group-b/workflows")
     expect(ui.page.get_by_role("button", name="Create workflow", exact=True)).to_have_count(0)
+    # A workflow's actions are drawn only in its selected detail, so select it first.
+    select_workflow(ui.page, "Review group files")
     expect(ui.page.get_by_role("button", name="Delete Review group files", exact=True)).to_have_count(0)
     expect(ui.page.get_by_role("button", name="Edit Review group files", exact=True)).to_have_count(0)
     expect(ui.page.get_by_role("button", name="View Review group files", exact=True)).to_be_visible()
@@ -216,7 +231,8 @@ def test_group_workflow_controls_are_read_only_when_owner_group_is_not_active(gr
     ui = group_ui
     ui.groups["group-a"] = group_context("group-a", "Research group", role="Owner", status=status)
     ui.open("/groups/group-a/workflows")
-    expect(ui.page.get_by_text("Review group files", exact=True)).to_be_visible()
+    # A workflow's actions are drawn only in its selected detail, so select it first.
+    select_workflow(ui.page, "Review group files")
     expect(ui.page.get_by_role("button", name="Run Review group files", exact=True)).to_have_count(0)
     expect(ui.page.get_by_role("button", name="Cancel Review group files", exact=True)).to_have_count(0)
     expect(ui.page.get_by_role("button", name="Create workflow", exact=True)).to_have_count(0)
@@ -228,6 +244,7 @@ def test_group_workflow_controls_are_read_only_when_owner_group_is_not_active(gr
 def test_a_manager_deletes_a_group_workflow(group_ui):
     ui = group_ui
     ui.open("/groups/group-a/workflows")
+    select_workflow(ui.page, "Review group files")
     ui.page.get_by_role("button", name="Delete Review group files", exact=True).click()
     ui.page.get_by_role("button", name="Delete", exact=True).click()
     delete_requests = [
@@ -260,35 +277,43 @@ def test_group_workflow_search_filters_by_name_and_description(group_ui):
 
     search = ui.page.get_by_role("searchbox", name="Search workflows", exact=True)
     search.fill("review group")
-    expect(ui.page.get_by_text("Review group files", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, "Review group files")).to_be_visible()
     expect(ui.page.get_by_text("Quarterly audit", exact=True)).to_have_count(0)
     search.fill("CALIBRATION")
     expect(ui.page.get_by_text("Review group files", exact=True)).to_have_count(0)
-    expect(ui.page.get_by_text("Quarterly audit", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, "Quarterly audit")).to_be_visible()
+    # The detail follows the filter: the only visible workflow is the one shown.
+    expect(workflow_detail(ui.page, "Quarterly audit")).to_be_visible()
     search.fill("not present")
     expect(ui.page.get_by_text("No workflows match your search", exact=True)).to_be_visible()
     search.fill("")
-    expect(ui.page.get_by_text("Review group files", exact=True)).to_be_visible()
-    expect(ui.page.get_by_text("Quarterly audit", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, "Review group files")).to_be_visible()
+    expect(workflow_row(ui.page, "Quarterly audit")).to_be_visible()
     assert len([entry for entry in ui.requests if entry.method == "GET" and entry.path == "/api/group/workflows"]) == 1
 
 
-def test_the_workflow_editor_hands_focus_back_to_edit(group_ui):
-    """Edit disables itself while the editor's options load, so focus falls to the page before the
-    dialog opens; the editor still takes focus, and closing it returns focus to Edit (M11, WCAG 2.4.3)."""
+def test_the_workflow_editor_takes_focus_and_returns_it_to_the_workflow(group_ui):
+    """Edit opens the editor page with focus on its title, and leaving it returns focus to the edited
+    workflow's heading in the workbench, where Edit is the next stop (M11, WCAG 2.4.3). Until
+    0.261.271 the editor was a dialog that handed focus back to Edit itself."""
     ui = group_ui
     ui.open("/groups/group-a/workflows")
-    edit = ui.page.get_by_role("button", name="Edit Review group files", exact=True)
+    detail = select_workflow(ui.page, "Review group files")
+    edit = detail.get_by_role("button", name="Edit Review group files", exact=True)
     edit.focus()
     ui.page.keyboard.press("Enter")
-    dialog = ui.page.get_by_role("dialog")
-    expect(dialog).to_be_visible()
-    ui.page.wait_for_function(
-        "() => Boolean(document.activeElement && document.activeElement.closest('[role=\"dialog\"]'))"
-    )
-    ui.page.keyboard.press("Escape")
-    expect(dialog).to_have_count(0)
-    expect(edit).to_be_focused()
+    editor = workflow_editor(ui.page)
+    expect(editor).to_be_visible()
+    expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-a/workflows/workflow-1")
+    expect(editor.get_by_role("heading", name="Review group files", level=2)).to_be_focused()
+    editor.get_by_role("button", name="Cancel", exact=True).focus()
+    ui.page.keyboard.press("Enter")
+    expect(editor).to_have_count(0)
+    expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-a/workflows?workflow_id=workflow-1")
+    heading = workflow_detail(ui.page, "Review group files").get_by_role("heading", name="Review group files", level=3)
+    expect(heading).to_be_focused()
+    ui.page.keyboard.press("Tab")
+    expect(ui.page.get_by_role("button", name="Run Review group files", exact=True)).to_be_focused()
 
 
 def test_a_failed_workflow_read_offers_a_retry_and_never_the_empty_state(group_ui):
@@ -304,7 +329,7 @@ def test_a_failed_workflow_read_offers_a_retry_and_never_the_empty_state(group_u
     # Only the header's Create workflow remains: the empty state's invitation is gone with it.
     expect(ui.page.get_by_role("button", name="Create workflow", exact=True)).to_have_count(1)
     alert.get_by_role("button", name="Retry workflows", exact=True).click()
-    expect(ui.page.get_by_text("Review group files", exact=True)).to_be_visible()
+    expect(workflow_row(ui.page, "Review group files")).to_be_visible()
     expect(alert).to_have_count(0)
 
 
@@ -409,15 +434,35 @@ def test_back_navigation_can_keep_or_discard_a_group_draft(group_ui):
 
 
 def test_legacy_workflow_target_survives_restore_but_not_a_group_switch(group_ui):
+    """A legacy `?workflow_id=` survives the restore that resolves the group and selects that
+    workflow in the workbench (until 0.261.271 it opened the editor dialog); a group switch drops it."""
     ui = group_ui
     ui.active_group = "group-a"
+    # Listed first, so selecting workflow-1 proves the target was honoured, not the default.
+    ui.workflows["group-a"].insert(0, {
+        "id": "workflow-2",
+        "name": "Quarterly audit",
+        "definition_version": 2,
+        "description": "Find calibration gaps across approved sources.",
+        "status": "idle",
+        "task_prompt": "Audit the selected files.",
+        "group_id": "group-a",
+        "durable_execution": True,
+        "runner_type": "model",
+        "trigger_type": "manual",
+    })
     ui.open("/groups?workflow_id=workflow-1")
     expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-a/workflows?workflow_id=workflow-1")
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
-    ui.page.get_by_role("button", name="Cancel", exact=True).click()
+    expect(workflow_row(ui.page, "Review group files")).to_have_attribute("aria-pressed", "true")
+    expect(workflow_row(ui.page, "Quarterly audit")).to_have_attribute("aria-pressed", "false")
+    detail = workflow_detail(ui.page, "Review group files")
+    expect(detail.get_by_role("heading", name="Review group files", level=3)).to_be_focused()
+    expect(detail.get_by_role("tab", name="Overview", exact=True)).to_have_attribute("aria-selected", "true")
+    expect(workflow_editor(ui.page)).to_have_count(0)
     expect(ui.page.get_by_role("dialog")).to_have_count(0)
     ui.page.get_by_role("combobox", name="Group workspace").select_option("group-b")
     expect(ui.page).to_have_url(f"{ORIGIN}/v2/groups/group-b/workflows")
+    expect(workflow_editor(ui.page)).to_have_count(0)
     expect(ui.page.get_by_role("dialog")).to_have_count(0)
 
 
diff --git a/ui_tests/test_v2_personal_workflow_file_sync.py b/ui_tests/test_v2_personal_workflow_file_sync.py
index 33c9c5756..b5cd1222f 100644
--- a/ui_tests/test_v2_personal_workflow_file_sync.py
+++ b/ui_tests/test_v2_personal_workflow_file_sync.py
@@ -1,7 +1,8 @@
 # test_v2_personal_workflow_file_sync.py
 """
 UI tests for personal workflow File Sync authoring in native V2.
-Version: 0.261.207
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.207
 
 These tests use the real V2 SPA bundle with the closed workflow fixture. The fixture answers the
@@ -61,6 +62,14 @@
 from ui_tests.test_v2_workflow_flow_authoring import authoring_ui  # noqa: E402,F401
 from test_v2_workflow_change_tracking import change_row, open_panel, unsaved_heading  # noqa: E402
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    workflow_editor,
+    workflow_editor_path,
+)
+
 
 pytestmark = pytest.mark.ui
 PERSONAL_SOURCE = {"scope_type": "personal", "scope_id": OWNER_ID, "source_id": "home-share"}
@@ -70,16 +79,16 @@
 
 
 def create_dialog(page):
-    return page.get_by_role("dialog", name="Create workflow", exact=True)
+    return workflow_editor(page, CREATE_WORKFLOW)
 
 
 def edit_dialog(page):
-    return page.get_by_role("dialog", name="Edit workflow", exact=True)
+    return workflow_editor(page)
 
 
 def open_personal_create(ui, **open_options):
     ui.open("/workspace/workflows", **open_options)
-    ui.page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(ui.page)
     expect(create_dialog(ui.page)).to_be_visible()
 
 
@@ -135,7 +144,7 @@ def test_owner_authors_a_personal_monitor_trigger_and_posts_the_server_shape(wor
     # The real personal rules authorized the source the editor sent.
     assert ("personal", OWNER_ID, "home-share") in ui.file_sync_source_reads
 
-    page.get_by_role("button", name="Edit Review new documents", exact=True).click()
+    edit_workflow(page, "Review new documents")
     expect(labelled(page, "Trigger")).to_have_value("file_sync")
     expect(source_checkbox(page, "Home share (Personal)")).to_be_checked()
     expect(labelled(page, "Interval value")).to_have_value("2")
@@ -171,7 +180,7 @@ def test_the_active_group_sources_are_offered_only_to_a_manager(workflow_ui):
     # A member of the active group gets only their own sources.
     ui.group_can_manage = False
     page.reload()
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     expect(source_checkbox(page, "Home share (Personal)")).to_be_visible()
     expect(source_checkbox(page, "Finance share (Group)")).to_have_count(0)
     personal_list_requests(ui)
@@ -187,7 +196,7 @@ def test_personal_file_sync_off_keeps_a_stored_source_without_calling_it_unavail
     assert trigger_options(page) == ["Manual", "Schedule"]
     create_dialog(page).get_by_role("button", name="Cancel", exact=True).click()
 
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+    edit_workflow(page, "Quarterly review workflow")
     expect(page.get_by_role("status").filter(has_text=PERSONAL_OFF)).to_be_visible()
     # The list can't check a personal source while File Sync is off, so the selection is kept as is.
     expect(source_checkbox(page, "Home share (Personal)")).to_be_checked()
@@ -240,7 +249,7 @@ def test_personal_sources_are_chosen_by_keyboard_in_both_themes(workflow_ui, the
     expect(finance).to_be_checked()
     expect(page.get_by_role("status").filter(has_text=SELECT_A_SOURCE)).to_have_count(0)
     page.get_by_role("region", name="File Sync").scroll_into_view_if_needed()
-    clipped = page.evaluate("""() => [...document.querySelectorAll('[role="dialog"] *')]
+    clipped = page.evaluate("""() => [...document.querySelectorAll('[role="region"][aria-label="Create workflow"] *')]
         .filter((element) => element.scrollWidth > element.clientWidth + 1 && getComputedStyle(element).overflowX !== 'visible')
         .map((element) => element.tagName)""")
     assert clipped == [], clipped
@@ -292,7 +301,7 @@ def test_editing_personal_sources_is_one_change_and_jump_lands_in_file_sync(work
         schedule={"unit": "hours", "value": 2},
         file_sync=copy.deepcopy(PERSONAL_MONITOR_FILE_SYNC),
     )
-    ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
+    ui.open(workflow_editor_path(WORKFLOW_ID))
     editor = edit_dialog(page)
     expect(editor).to_be_visible()
     home = source_checkbox(editor, "Home share (Personal)")
diff --git a/ui_tests/test_v2_workflow_alerts.py b/ui_tests/test_v2_workflow_alerts.py
index 3ffa0db4a..4cc0f21f1 100644
--- a/ui_tests/test_v2_workflow_alerts.py
+++ b/ui_tests/test_v2_workflow_alerts.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_alerts.py
 """
 UI tests for native V2 workflow alert editing, in personal and group workflows.
-Version: 0.261.144
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.144
 
 These tests use the real V2 SPA bundle with the closed workflow fixture. Both save routes run
@@ -43,6 +44,10 @@
     workflow_ui,  # noqa: F401
 )
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    edit_workflow,
+)
+
 
 pytestmark = pytest.mark.ui
 SCOPES = ("personal", "group")
@@ -72,10 +77,7 @@ def seed(ui, scope, identifier, **fields):
 
 
 def edit(ui, name):
-    ui.page.get_by_role("button", name=f"Edit {name}", exact=True).click()
-    dialog = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
-    expect(dialog).to_be_visible()
-    return dialog
+    return edit_workflow(ui.page, name)
 
 
 def alerts_region(page):
@@ -373,9 +375,9 @@ def test_readers_keep_the_summary(workflow_ui):
     ui.personal_workflows[UNSUPPORTED_WORKFLOW_ID]["alert_mode"] = "every_run"
     ui.personal_workflows[UNSUPPORTED_WORKFLOW_ID]["alert_priority"] = "low"
     open_workflows(ui, "personal")
-    page.get_by_role("button", name="Edit Future workflow", exact=True).click()
+    edit_workflow(page, "Future workflow")
     expect(page.get_by_role("alert").filter(has_text="definition version 4")).to_be_visible()
-    expect(region.get_by_text("On every run", exact=True)).to_be_visible()
+    expect(region.get_by_text("On every run", exact=True).first).to_be_visible()
     expect(region.get_by_text("Low priority", exact=True)).to_be_visible()
     expect(region.get_by_role("combobox")).to_have_count(0)
     assert not ui.workflow_writes
@@ -592,7 +594,7 @@ def test_the_alert_editor_fits_desktop_and_mobile(workflow_ui, theme, width, hei
     expect(rule_rows(page)).to_have_count(2)
     expect(field(region, "If a model evaluated condition cannot be judged")).to_be_visible()
     # Text controls scroll their own value by design; every other element must fit the dialog.
-    clipped = page.evaluate("""() => [...document.querySelectorAll('[role="dialog"] *')]
+    clipped = page.evaluate("""() => [...document.querySelectorAll('[role="region"][aria-label="Edit workflow"] *')]
         .filter((element) => !['INPUT', 'TEXTAREA'].includes(element.tagName))
         .filter((element) => element.scrollWidth > element.clientWidth + 1 && getComputedStyle(element).overflowX !== 'visible')
         .map((element) => element.tagName)""")
diff --git a/ui_tests/test_v2_workflow_ask_ai.py b/ui_tests/test_v2_workflow_ask_ai.py
index 5e5535756..2e102a51b 100644
--- a/ui_tests/test_v2_workflow_ask_ai.py
+++ b/ui_tests/test_v2_workflow_ask_ai.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_ask_ai.py
 """
 Offline real-bundle browser regressions for the workflow editor's Ask AI tab (Phase 3c).
-Version: 0.261.213
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.213
 Refs: microsoft/simplechat#1548
 
@@ -67,6 +68,14 @@
 from ui_tests.test_v2_workflow_flow_authoring import connect_options  # noqa: F401
 from functions_workflow_definitions import workflow_definition_revision  # noqa: E402
 from functions_workflow_flow import compile_workflow_flow  # noqa: E402
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    create_workflow,
+    edit_workflow,
+    workflow_editor,
+    workflow_editor_path,
+    leave_prompt,
+    discard_and_leave,
+)
 
 
 TIME_ZONE = "America/Chicago"
@@ -645,9 +654,7 @@ def test_a_new_draft_sends_no_base_and_no_id_and_saves_after_review(ask_ui):
         {"op": "set_task_instructions", "task": "task_1", "instructions": instructions},
     ))
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    editor = page.get_by_role("dialog", name="Create workflow", exact=True)
-    expect(editor).to_be_visible()
+    editor = create_workflow(page)
     editor.get_by_label("Model", exact=True).select_option(label="Workspace GPT · aoai")
     panel = open_ask_ai(editor)
 
@@ -981,7 +988,7 @@ def test_a_conflict_keeps_the_draft_and_offers_a_reload(ask_ui):
     group.get_by_role("button", name="Discard and reload", exact=True).click()
 
     # The editor opens again on the saved workflow as it is now.
-    editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    editor = workflow_editor(page)
     expect(editor.get_by_label("Workflow name", exact=True)).to_have_value("Quarterly review workflow")
     expect(side_panel(editor)).to_have_count(0)
     expect(editor.locator("[data-workflow-change-key]")).to_have_count(0)
@@ -1060,8 +1067,8 @@ def release_reload(ui):
 
 
 def discard_and_close(page, editor):
-    page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True).get_by_role(
-        "button", name="Discard changes", exact=True).click()
+    """Answer the workspace leave prompt with Discard changes; the editor page is gone after."""
+    discard_and_leave(page)
     expect(editor).to_have_count(0)
 
 
@@ -1077,7 +1084,8 @@ def test_a_closed_editor_stays_closed_when_its_reload_finishes(ask_ui):
     expect(editor.get_by_role("button", name="Save workflow", exact=True)).to_be_disabled()
     expect(panel.get_by_role("group", name="Quick actions", exact=True).get_by_role("button").first).to_be_disabled()
     expect(editor.get_by_role("button", name="Cancel", exact=True)).to_be_enabled()
-    page.keyboard.press("Escape")
+    # The editor is a page since 0.261.271, so it is left with Cancel rather than Escape.
+    editor.get_by_role("button", name="Cancel", exact=True).click()
     discard_and_close(page, editor)
 
     release_reload(ui)
@@ -1095,7 +1103,7 @@ def test_a_reload_never_replaces_another_workflows_editor(ask_ui):
     discard_and_close(page, editor)
 
     # Another workflow is opened and edited while the first one's reload is still loading.
-    page.get_by_role("button", name=f"Edit {other}", exact=True).click()
+    editor = edit_workflow(page, other)
     name = editor.get_by_label("Workflow name", exact=True)
     expect(name).to_have_value(other)
     typed = f"{other}, my draft"
@@ -1105,7 +1113,7 @@ def test_a_reload_never_replaces_another_workflows_editor(ask_ui):
     expect(editor).to_have_count(1)
     expect(name).to_have_value(typed)
     expect(name).to_be_enabled()
-    expect(page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)).to_have_count(0)
+    expect(leave_prompt(page)).to_have_count(0)
     assert not ui.workflow_writes
 
 
@@ -1324,15 +1332,15 @@ def test_ask_ai_is_offered_only_for_personal_workflows_the_editor_can_change(ask
         ui.open("/groups")
         ui.select_group(GROUP_ID)
         page.get_by_role("button", name="View Alpha read-only Flow", exact=True).click()
-        editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+        editor = workflow_editor(page)
     elif restriction == "unsupported":
         ui.personal_workflows[FLOW_WORKFLOW_ID]["flow"]["nodes"][0]["future_executor"] = {"unchanged": True}
-        ui.open(f"/workspace/workflows?workflow_id={FLOW_WORKFLOW_ID}")
-        editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+        ui.open(workflow_editor_path(FLOW_WORKFLOW_ID))
+        editor = workflow_editor(page)
     else:
         ui.personal_workflows[WORKFLOW_ID].update(trigger_type="interval", schedule=copy.deepcopy(UNSUPPORTED_SCHEDULE))
-        ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
-        editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+        ui.open(workflow_editor_path(WORKFLOW_ID))
+        editor = workflow_editor(page)
     expect(editor).to_be_visible()
 
     if restriction in ("setting_off", "group"):
@@ -1345,7 +1353,7 @@ def test_ask_ai_is_offered_only_for_personal_workflows_the_editor_can_change(ask
         expect(panel.get_by_role("tab")).to_have_count(1)
         expect(panel.locator("[data-workflow-ask-ai]")).to_have_count(0)
     else:
-        expect(editor).to_contain_text("This workflow is read-only.")
+        expect(editor.get_by_text("Read only", exact=True).first).to_be_visible()
         expect(editor.locator("aside")).to_have_count(0)
     expect(ask_toggle(editor)).to_have_count(0)
     expect(editor.locator("[data-workflow-ask-ai-task]")).to_have_count(0)
@@ -1481,9 +1489,7 @@ def test_draft_with_ai_fills_an_empty_task_as_an_undoable_ai_change(ask_ui):
     ui, page = ask_ui, ask_ui.page
     drafted = "Collect the quarter's signed evidence and list anything that is missing."
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    editor = page.get_by_role("dialog", name="Create workflow", exact=True)
-    expect(editor).to_be_visible()
+    editor = create_workflow(page)
     editor.get_by_label("Model", exact=True).select_option(label="Workspace GPT · aoai")
     button = editor.get_by_role("button", name="Draft with AI: instructions for Task 1", exact=True)
     task_id = button.get_attribute("data-workflow-draft-ai")
@@ -1583,8 +1589,7 @@ def test_quick_actions_send_visible_turns_and_cards_outlive_a_save(ask_ui):
     assert payload["description"] == described
 
     # The thread outlives the editor; its card now belongs to an earlier editing session.
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
-    editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    editor = edit_workflow(page, "Quarterly review workflow")
     expect(basics_description(editor)).to_have_value(described)
     panel = open_ask_ai(editor)
     found = card(panel, second["submission_id"])
diff --git a/ui_tests/test_v2_workflow_ask_ai_proposal.py b/ui_tests/test_v2_workflow_ask_ai_proposal.py
index 3d7995122..d391ac90d 100644
--- a/ui_tests/test_v2_workflow_ask_ai_proposal.py
+++ b/ui_tests/test_v2_workflow_ask_ai_proposal.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_ask_ai_proposal.py
 """
 Real-component browser test for Ask AI on a workflow proposal's draft (Phase 3c).
-Version: 0.261.213
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.213
 Refs: microsoft/simplechat#1548
 
diff --git a/ui_tests/test_v2_workflow_authoring_history.py b/ui_tests/test_v2_workflow_authoring_history.py
index 748234c14..f8a6ed734 100644
--- a/ui_tests/test_v2_workflow_authoring_history.py
+++ b/ui_tests/test_v2_workflow_authoring_history.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_authoring_history.py
 """
 Offline real-bundle cross-surface workflow Undo/Redo regressions.
-Version: 0.261.124
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.123
 
 Reuses the closed M5B authoring harness, local production assets, and actual
@@ -24,10 +25,37 @@
 from ui_tests.fixtures.workflow_editor import OWNER_ID
 from ui_tests.test_v2_workflow_flow_authoring import authoring_ui, connect_options  # noqa: F401
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    create_workflow,
+    edit_workflow,
+    workflow_editor,
+    workflow_editor_path,
+    leave_prompt,
+)
+
 
 pytestmark = pytest.mark.ui
 
 
+def open_authoring_editor(ui, workflow_id=authoring.FLOW_WORKFLOW_ID, *, group_id=None, **options):
+    if group_id:
+        ui.open(f"/groups/{group_id}/workflows", **options)
+        name = ui.group_workflows[group_id][workflow_id]["name"]
+        editor = edit_workflow(ui.page, name)
+    else:
+        ui.open(workflow_editor_path(workflow_id), **options)
+        editor = workflow_editor(ui.page)
+        expect(editor).to_be_visible()
+    switch = editor.get_by_role("group", name="Workflow authoring surface", exact=True)
+    expect(switch.get_by_role("button", name="List authoring", exact=True)).to_have_attribute("aria-pressed", "true")
+    expect(editor.get_by_role("group", name="Main region", exact=True)).to_be_visible()
+    assert not ui.preview_requests, "Opening the default List must not request a compiler preview."
+    return editor
+
+
+authoring.open_editor = open_authoring_editor
+
+
 def undo_button(editor):
     return editor.get_by_role("button", name="Undo workflow edit", exact=True)
 
@@ -132,8 +160,7 @@ def test_undo_to_opening_baseline_is_clean_and_reopening_starts_empty(authoring_
     expect(editor.get_by_label("Workflow name", exact=True)).to_have_value(original["name"])
     editor.get_by_role("button", name="Cancel", exact=True).click()
     expect(ui.page.get_by_role("dialog")).to_have_count(0)
-    ui.page.get_by_role("button", name=f"Edit {original['name']}", exact=True).click()
-    editor = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
+    editor = edit_workflow(ui.page, original["name"])
     expect(undo_button(editor)).to_be_disabled()
     expect(redo_button(editor)).to_be_disabled()
     assert not ui.workflow_writes
@@ -481,15 +508,14 @@ def test_pending_save_disables_history_and_save_success_resets_the_session(autho
         expect(undo_button(editor)).to_be_disabled()
         expect(redo_button(editor)).to_be_disabled()
         expect(undo_button(editor)).to_have_attribute("title", "Workflow history is unavailable while saving.")
-        editor.get_by_role("button", name="Close", exact=True).focus()
+        editor.get_by_role("button", name="Cancel", exact=True).focus()
         ui.page.keyboard.press("Control+z")
         expect(editor.get_by_label("Description", exact=True)).to_have_value("Saved description")
         assert len([entry for entry in ui.writes if entry.path in authoring.SAVE_PATHS]) == 1
     finally:
         ui.release_save_responses()
     expect(editor).to_have_count(0)
-    ui.page.get_by_role("button", name="Edit Authoring seed", exact=True).click()
-    editor = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
+    editor = edit_workflow(ui.page, "Authoring seed")
     expect(undo_button(editor)).to_be_disabled()
     expect(redo_button(editor)).to_be_disabled()
 
@@ -497,8 +523,7 @@ def test_pending_save_disables_history_and_save_success_resets_the_session(autho
 def test_explicit_conversion_starts_empty_history_but_keeps_unsaved_change_protection(authoring_ui):
     ui = authoring_ui
     ui.open("/workspace/workflows")
-    ui.page.get_by_role("button", name="Create workflow", exact=True).click()
-    editor = ui.page.get_by_role("dialog", name="Create workflow", exact=True)
+    editor = create_workflow(ui.page)
     editor.get_by_label("Workflow name", exact=True).fill("Before conversion")
     expect(undo_button(editor)).to_have_count(0)
     editor.get_by_role("button", name="Enable structured control flow", exact=True).click()
@@ -512,7 +537,7 @@ def test_explicit_conversion_starts_empty_history_but_keeps_unsaved_change_prote
     expect(undo_button(editor)).to_be_disabled()
     expect(editor.get_by_role("button", name="Enable structured control flow", exact=True)).to_have_count(0)
     editor.get_by_role("button", name="Cancel", exact=True).click()
-    confirmation = ui.page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)
+    confirmation = leave_prompt(ui.page)
     expect(confirmation).to_be_visible()
     confirmation.get_by_role("button", name="Discard changes", exact=True).click()
     assert not ui.workflow_writes
diff --git a/ui_tests/test_v2_workflow_calendar_schedules.py b/ui_tests/test_v2_workflow_calendar_schedules.py
index 696235242..b0fcfcf3a 100644
--- a/ui_tests/test_v2_workflow_calendar_schedules.py
+++ b/ui_tests/test_v2_workflow_calendar_schedules.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_calendar_schedules.py
 """
 UI tests for calendar schedules in the native V2 workflow editor, in both workflow scopes.
-Version: 0.261.202
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.193
 
 These tests use the real V2 SPA bundle with the closed workflow fixture, whose save routes validate
@@ -54,6 +55,14 @@
     workflow_post,
 )
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    select_workflow,
+    workflow_editor,
+)
+
 
 pytestmark = pytest.mark.ui
 MONDAYS_NEW_YORK = {
@@ -102,8 +111,7 @@ def open_scope(ui, scope):
 
 def start_workflow(page, name):
     """Open a new workflow with a valid runner and task, on the Interval trigger."""
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Workflow name").fill(name)
     labelled(page, "Model").select_option(label="Workspace GPT · aoai")
     labelled(page, "Instructions").first.fill("Summarize this week's updates.")
@@ -116,8 +124,12 @@ def preview(page, label):
 
 
 def listed(page, label):
-    """The workflow list's reading of a schedule."""
-    return page.get_by_text(f"Schedule: {label}", exact=True)
+    """The selected workflow's schedule, exactly as the workbench Overview reads it.
+
+    Until 0.261.271 the workflow list showed it as "Schedule: <label>"; the Overview's
+    Trigger and schedule fact now carries the same label.
+    """
+    return page.get_by_role("tabpanel", name="Overview", exact=True).get_by_text(label, exact=True)
 
 
 def day(page, name):
@@ -158,7 +170,7 @@ def test_mondays_at_eight_in_new_york_saves_lists_and_reopens(workflow_ui, scope
     expect(preview(page, "Mondays 08:00 America/New_York")).to_be_visible()
 
     save(page)
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     write = workflow_post(ui)
     assert write.path == ("/api/group/workflows" if scope == "group" else "/api/user/workflows")
     if scope == "group":
@@ -167,9 +179,7 @@ def test_mondays_at_eight_in_new_york_saves_lists_and_reopens(workflow_ui, scope
     assert write.body["schedule"] == MONDAYS_NEW_YORK
     expect(listed(page, "Mondays 08:00 America/New_York")).to_be_visible()
 
-    page.get_by_role("button", name="Edit Monday digest", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
-    expect(dialog).to_be_visible()
+    dialog = edit_workflow(page, "Monday digest")
     expect(labelled(page, "Trigger")).to_have_value("interval")
     expect(labelled(page, "Repeats")).to_have_value("weekly")
     expect_days(page, {"Monday"})
@@ -210,11 +220,10 @@ def test_a_stored_calendar_schedule_opens_as_saved_and_resaves_unchanged(workflo
         name, listing, cadence = "Quarterly review workflow", "Monthly on day 31 (or last day), 18:00 Asia/Tokyo", "monthly"
         reading, zone, at = listing, "Asia/Tokyo", "18:00"
     open_scope(ui, scope)
+    select_workflow(page, name)
     expect(listed(page, listing)).to_be_visible()
 
-    page.get_by_role("button", name=f"Edit {name}", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
-    expect(dialog).to_be_visible()
+    dialog = edit_workflow(page, name)
     expect(labelled(page, "Repeats")).to_have_value(cadence)
     expect(labelled(page, "Time")).to_have_value(at)
     expect(labelled(page, "Time zone")).to_have_value(zone)
@@ -261,7 +270,7 @@ def test_a_browser_zone_the_server_does_not_list_starts_in_utc_with_a_note(workf
     zone.fill("Europe/Paris")
     expect(status(page, SCHEDULE_TIMEZONE_ERROR)).to_have_count(0)
     save(page)
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     assert workflow_post(ui).body["schedule"] == {
         "kind": "calendar", "frequency": "daily", "days_of_week": [], "day_of_month": None,
         "time_of_day": "09:00", "timezone": "Europe/Paris",
@@ -295,7 +304,7 @@ def test_calendar_problems_are_named_before_saving_with_the_server_messages(work
     labelled(page, "Time zone").fill("America/New_York")
     expect(status(page, SCHEDULE_TIMEZONE_ERROR)).to_have_count(0)
     save(page)
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     assert workflow_post(ui).body["schedule"] == {
         **MONDAYS_NEW_YORK, "days_of_week": ["friday"], "time_of_day": "17:45",
     }
@@ -311,8 +320,8 @@ def test_the_minimum_leaves_a_saved_interval_alone_but_refuses_a_changed_one(wor
     open_scope(ui, "personal")
     expect(listed(page, "Every 30 minutes")).to_be_visible()
 
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    edit_workflow(page, "Quarterly review workflow")
+    dialog = workflow_editor(page)
     expect(labelled(page, "Interval value")).to_have_value("30")
     labelled(page, "Description").first.fill("Still every 30 minutes.")
     expect(status(page, HOURLY_MINIMUM)).to_have_count(0)
@@ -320,7 +329,7 @@ def test_the_minimum_leaves_a_saved_interval_alone_but_refuses_a_changed_one(wor
     expect(dialog).to_have_count(0)
     assert workflow_post(ui).body["schedule"] == {"unit": "minutes", "value": 30}
 
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+    edit_workflow(page, "Quarterly review workflow")
     labelled(page, "Interval value").fill("45")
     expect(status(page, HOURLY_MINIMUM)).to_be_visible()
     save(page)
@@ -352,7 +361,7 @@ def test_the_minimum_refuses_a_new_group_interval_but_not_a_calendar_schedule(wo
     expect(status(page, HOURLY_MINIMUM)).to_have_count(0)
     expect(preview(page, "Weekdays 09:00 America/New_York")).to_be_visible()
     save(page)
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     body = workflow_post(ui).body
     assert body["group_id"] == GROUP_ID
     assert body["schedule"] == {**WEEKDAYS_LONDON, "time_of_day": "09:00", "timezone": "America/New_York"}
@@ -375,9 +384,7 @@ def test_a_schedule_the_editor_does_not_support_opens_read_only_and_is_kept(work
         name = "Quarterly review workflow"
     open_scope(ui, scope)
 
-    page.get_by_role("button", name=f"Edit {name}", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
-    expect(dialog).to_be_visible()
+    dialog = edit_workflow(page, name)
     expect(dialog.get_by_role("alert").filter(has_text=UNSUPPORTED_REASON)).to_be_visible()
     expect(status(page, UNSUPPORTED_NOTE)).to_be_visible()
     # Neither kind's fields are shown, so nothing can stand in for the stored schedule.
diff --git a/ui_tests/test_v2_workflow_change_tracking.py b/ui_tests/test_v2_workflow_change_tracking.py
index 33d660652..3bf02775d 100644
--- a/ui_tests/test_v2_workflow_change_tracking.py
+++ b/ui_tests/test_v2_workflow_change_tracking.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_change_tracking.py
 """
 Offline real-bundle browser regressions for change tracking in the V2 workflow editor.
-Version: 0.261.203
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.203
 
 Covers the highlight on each unsaved change (its author badge, Previously value and Revert),
@@ -37,6 +38,12 @@
 from ui_tests.fixtures.workflow_flow import GROUP_ID, FLOW_WORKFLOW_ID, MALICIOUS_LABEL
 from ui_tests.test_v2_workflow_flow_authoring import authoring_ui, connect_options  # noqa: F401
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    create_workflow,
+    workflow_editor,
+    workflow_editor_path,
+)
+
 
 pytestmark = pytest.mark.ui
 
@@ -111,8 +118,8 @@
 
 
 def open_classic(ui, **options):
-    ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}", **options)
-    editor = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
+    ui.open(workflow_editor_path(WORKFLOW_ID), **options)
+    editor = workflow_editor(ui.page)
     expect(editor).to_be_visible()
     expect(editor.get_by_label("Workflow name", exact=True)).to_have_value(ui.personal_workflows[WORKFLOW_ID]["name"])
     return editor
@@ -205,12 +212,17 @@ def assert_readable(*elements):
 
 
 def assert_dialog_fits(ui, editor):
+    """The editor page fits, and its action labels (Changes, Cancel, Save workflow) stay on one line.
+
+    Until 0.261.271 the actions sat in the editor dialog's footer; on the page they sit in its header.
+    """
     ui.assert_no_overflow()
-    modal = editor.locator(".glass-modal")
-    footer = modal.locator(":scope > div").last
-    for part in (modal, footer):
-        assert part.evaluate("element => element.scrollWidth <= element.clientWidth + 1"), "The editor overflows."
-    assert footer.evaluate(SINGLE_LINE_BUTTONS), "A footer button label wraps."
+    assert editor.evaluate("element => element.scrollWidth <= element.clientWidth + 1"), "The editor overflows."
+    header = editor.locator(":scope > header")
+    expect(header).to_have_count(1)
+    expect(header.get_by_role("button", name="Save workflow", exact=True)).to_be_visible()
+    assert header.evaluate("element => element.scrollWidth <= element.clientWidth + 1"), "The editor header overflows."
+    assert header.evaluate(SINGLE_LINE_BUTTONS), "An editor action label wraps."
 
 
 @pytest.mark.parametrize("theme", ["light", "dark"])
@@ -568,13 +580,13 @@ def test_read_only_editors_show_no_change_tracking(authoring_ui, restriction):
         page.get_by_role("button", name="View Alpha read-only Flow", exact=True).click()
     elif restriction == "unsupported":
         ui.personal_workflows[FLOW_WORKFLOW_ID]["flow"]["nodes"][0]["future_executor"] = {"unchanged": True}
-        ui.open(f"/workspace/workflows?workflow_id={FLOW_WORKFLOW_ID}")
+        ui.open(workflow_editor_path(FLOW_WORKFLOW_ID))
     else:
         ui.personal_workflows[WORKFLOW_ID].update(
             trigger_type="interval", schedule=copy.deepcopy(UNSUPPORTED_SCHEDULE))
-        ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
-    editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
-    expect(editor).to_contain_text("This workflow is read-only.")
+        ui.open(workflow_editor_path(WORKFLOW_ID))
+    editor = workflow_editor(page)
+    expect(editor.get_by_text("Read only", exact=True).first).to_be_visible()
     if restriction == "schedule":
         expect(editor.get_by_role("status").filter(has_text=UNSUPPORTED_SCHEDULE_NOTE)).to_be_visible()
     expect(editor.get_by_role("button", name="Close", exact=True).last).to_be_visible()
@@ -625,8 +637,7 @@ def test_narrow_editor_shows_the_changes_panel_in_place_of_the_fields(authoring_
 def test_new_workflow_points_out_nothing_until_it_is_saved(authoring_ui):
     ui, page = authoring_ui, authoring_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    editor = page.get_by_role("dialog", name="Create workflow", exact=True)
+    editor = create_workflow(page)
     editor.get_by_label("Workflow name", exact=True).fill("Brand new workflow")
     expect(changes_toggle(editor)).to_have_accessible_name("Changes (0 unsaved)")
     expect(editor.locator("[data-workflow-change-key]")).to_have_count(0)
diff --git a/ui_tests/test_v2_workflow_control_flow.py b/ui_tests/test_v2_workflow_control_flow.py
index c7cab5f51..76a489f60 100644
--- a/ui_tests/test_v2_workflow_control_flow.py
+++ b/ui_tests/test_v2_workflow_control_flow.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_control_flow.py
 """
 UI regressions for structured If/else, Run when and forward routing.
-Version: 0.261.127
+Version: 0.261.271
 Implemented in: 0.261.116
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 The real local SPA uses the existing closed API fixture and production definition
 validation. No model, source service, publication or live workspace is invoked.
@@ -33,6 +34,13 @@
     flow_condition as condition,
     structured_workflow_record as structured_record,
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    workflow_editor,
+    workflow_editor_path,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -42,6 +50,10 @@ def task_block(page, name):
     return page.get_by_role("region", name=f"{name} block", exact=True)
 
 
+def flow_region(page, name):
+    return page.get_by_role("group", name=f"{name} region", exact=True)
+
+
 def add_task(page, region, region_name, name):
     region.get_by_role("button", name=f"Add task to {region_name}", exact=True).click()
     region.get_by_label("Task name", exact=True).last.fill(name)
@@ -70,12 +82,14 @@ def select_condition(block, label, field):
 def test_create_branches_skip_route_and_join_without_raw_json(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     page.get_by_label("Workflow name", exact=True).fill("Authored structured flow")
     page.get_by_label("Model", exact=True).select_option(label="Workspace GPT \u00b7 aoai")
     page.get_by_role("button", name="Enable structured control flow", exact=True).click()
     page.get_by_role("button", name="Convert draft", exact=True).click()
-    main = page.get_by_role("group", name="Main region", exact=True)
+    # Converting moves focus to the converted tasks, whose List surface is the default.
+    expect(page.get_by_role("heading", name="Structured List", exact=True)).to_be_focused()
+    main = flow_region(page, "Main")
     main.get_by_label("Task name", exact=True).fill("Evaluate")
     evaluate = task_block(page, "Evaluate")
     evaluate.get_by_label("Instructions", exact=True).fill("Return a JSON object with Boolean pass and add_note fields.")
@@ -88,8 +102,8 @@ def test_create_branches_skip_route_and_join_without_raw_json(workflow_ui):
     branch = page.get_by_role("region", name="If / else block", exact=True)
     add_input(branch, "If / else inputs", "Evaluate", "decision")
     select_condition(branch, "If / else condition", "/pass")
-    add_task(page, page.get_by_role("group", name="Then region", exact=True), "Then", "Accept")
-    add_task(page, page.get_by_role("group", name="Else region", exact=True), "Else", "Review")
+    add_task(page, flow_region(page, "Then"), "Then", "Accept")
+    add_task(page, flow_region(page, "Else"), "Else", "Review")
     branch.get_by_role("button", name="Add joined output", exact=True).click()
     branch.get_by_label("Join output 1 Then producer", exact=True).select_option(label="Accept")
     branch.get_by_label("Join output 1 Then output", exact=True).select_option("text")
@@ -123,7 +137,7 @@ def test_create_branches_skip_route_and_join_without_raw_json(workflow_ui):
     add_input(final_outputs, "Final outputs", "Finish", "report", output="text")
     ui.assert_no_overflow()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
 
     assert len(ui.workflow_writes) == 1
     body = ui.workflow_writes[0].body
@@ -145,7 +159,7 @@ def test_skip_dependency_is_rejected_and_stale_save_retains_flow(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     record = structured_record()
     ui.personal_workflows[STRUCTURED_ID] = record
-    ui.open(f"/workspace/workflows?workflow_id={STRUCTURED_ID}")
+    ui.open(workflow_editor_path(STRUCTURED_ID))
     finish = task_block(page, "Finish")
     open_details(finish)
     finish.get_by_label("Finish inputs input 2 required", exact=True).check()
@@ -159,7 +173,7 @@ def test_skip_dependency_is_rejected_and_stale_save_retains_flow(workflow_ui):
     expect(page.get_by_role("alert").filter(has_text="draft has been retained")).to_be_visible()
     expect(page.get_by_label("Workflow name", exact=True)).to_have_value("Retained structured draft")
     expect(page.get_by_label("Forward route target", exact=True)).to_have_value("node:finish")
-    expect(page.get_by_role("group", name="Then region", exact=True)).to_be_visible()
+    expect(flow_region(page, "Then")).to_be_visible()
     assert not ui.workflow_writes
     assert record["flow"]["nodes"][3]["run_when"] == condition("add_note")
 
@@ -178,7 +192,7 @@ def test_unknown_structured_semantics_are_read_only(workflow_ui, unsupported):
         record["tasks"][3]["runner"]["future_tool_policy"] = "new executor semantics"
     original = copy.deepcopy(record)
     ui.personal_workflows[STRUCTURED_ID] = record
-    ui.open(f"/workspace/workflows?workflow_id={STRUCTURED_ID}")
+    ui.open(workflow_editor_path(STRUCTURED_ID))
     expect(page.get_by_role("alert").filter(has_text="cannot safely save")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     assert not ui.workflow_writes
@@ -189,7 +203,7 @@ def test_structured_mobile_keyboard_edit_preserves_identity(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     record = structured_record()
     ui.personal_workflows[STRUCTURED_ID] = record
-    ui.open(f"/workspace/workflows?workflow_id={STRUCTURED_ID}", theme="dark", width=390, height=844)
+    ui.open(workflow_editor_path(STRUCTURED_ID), theme="dark", width=390, height=844)
     ui.assert_no_overflow()
     limit = page.get_by_label("Maximum execution admissions", exact=True)
     limit.focus()
@@ -198,7 +212,7 @@ def test_structured_mobile_keyboard_edit_preserves_identity(workflow_ui):
     save = page.get_by_role("button", name="Save workflow", exact=True)
     save.focus()
     save.press("Enter")
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["limits"]["max_executions"] == 4999
     assert ui.workflow_writes[-1].body["flow"] == record["flow"]
     assert [task["id"] for task in ui.workflow_writes[-1].body["tasks"]] == [task["id"] for task in record["tasks"]]
@@ -212,10 +226,10 @@ def test_group_structured_save_keeps_explicit_group_scope(workflow_ui):
     ui.open("/groups")
     ui.select_group(GROUP_ID)
     expect(page.get_by_role("heading", name="Workflows", exact=True)).to_be_visible()
-    page.get_by_role("button", name=re.compile("Edit Structured review")).click()
+    edit_workflow(page, "Structured review")
     page.get_by_label("Workflow name", exact=True).fill("Group structured review")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     write = ui.workflow_writes[-1]
     assert write.path == "/api/group/workflows"
     assert write.query["group_id"] == [GROUP_ID]
@@ -227,7 +241,7 @@ def test_group_structured_save_keeps_explicit_group_scope(workflow_ui):
 def test_conversion_never_silently_changes_continue_on_error_inputs(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.personal_workflows[WORKFLOW_ID]["error_handling"]["strategy"] = "continue"
-    ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
+    ui.open(workflow_editor_path(WORKFLOW_ID))
     page.get_by_role("button", name="Enable structured control flow", exact=True).click()
     page.get_by_role("button", name="Convert draft", exact=True).click()
     expect(page.get_by_role("alert").filter(has_text="explicit task inputs")).to_be_visible()
@@ -241,7 +255,7 @@ def test_structured_publication_uses_one_explicit_input_and_destination(workflow
     record = structured_record()
     record["tasks"][1]["document_action"] = {"type": "analyze", "document_ids": ["personal-brief"]}
     ui.personal_workflows[STRUCTURED_ID] = record
-    ui.open(f"/workspace/workflows?workflow_id={STRUCTURED_ID}")
+    ui.open(workflow_editor_path(STRUCTURED_ID))
     finish = task_block(page, "Finish")
     open_details(finish)
     finish.get_by_text("Publish an existing analysis artifact", exact=True).click()
@@ -252,7 +266,7 @@ def test_structured_publication_uses_one_explicit_input_and_destination(workflow
     assert not ui.workflow_writes
     finish.get_by_role("button", name="Finish inputs remove input 2", exact=True).click()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     task = ui.workflow_writes[-1].body["tasks"][-1]
     assert task["publication"] == {
         "artifact_format": "md", "workspace_scope": "group", "group_id": "explicit-destination",
diff --git a/ui_tests/test_v2_workflow_control_runtime.py b/ui_tests/test_v2_workflow_control_runtime.py
index 8eb5d7bc9..5ba10fc44 100644
--- a/ui_tests/test_v2_workflow_control_runtime.py
+++ b/ui_tests/test_v2_workflow_control_runtime.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_control_runtime.py
 """
 UI tests for V2 workflow control-runtime run inspection.
-Version: 0.261.127
+Version: 0.261.271
 Implemented in: 0.261.116
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 These tests use the real V2 SPA bundle with a closed API fixture. They cover
 definition v3 execution inspection, scoped runtime decisions, authoritative
@@ -34,16 +35,16 @@
     workflow_control_ui,  # noqa: F401
 )
 from ui_tests.fixtures.workflow_editor import WORKFLOW_ID  # noqa: E402
+from ui_tests.fixtures.workflow_workbench import open_workflow_runs  # noqa: E402
 
 
 pytestmark = pytest.mark.ui
 
 
 def expand_run_history(page, workflow_name):
-    row = page.get_by_role("listitem").filter(has_text=workflow_name).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    return row
+    runs = open_workflow_runs(page, workflow_name)
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    return runs
 
 
 def result_requests(ui):
diff --git a/ui_tests/test_v2_workflow_durable_runtime.py b/ui_tests/test_v2_workflow_durable_runtime.py
index ad6f48433..628690f50 100644
--- a/ui_tests/test_v2_workflow_durable_runtime.py
+++ b/ui_tests/test_v2_workflow_durable_runtime.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_durable_runtime.py
 """
 UI tests for native V2 durable workflow runtime controls.
-Version: 0.261.111
+Version: 0.261.271
 Implemented in: 0.261.111
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 These tests use the real V2 SPA bundle with a closed API fixture. They cover
 durable authoring defaults, pre-task approval payloads, queued run responses,
@@ -28,6 +29,14 @@
     connect_options,  # noqa: F401
     workflow_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    create_workflow,
+    edit_workflow,
+    leave_workflow_runs,
+    open_workflow_runs,
+    select_workflow,
+    workflow_editor,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -66,20 +75,20 @@ def runtime_decisions(ui):
 
 
 def expand_durable_history(page):
-    row = page.get_by_role("listitem").filter(has_text="Durable approval workflow").first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    expect(page.get_by_text("Run memory", exact=True)).to_be_visible()
-    page.get_by_text("Run memory", exact=True).click()
-    expect(page.get_by_text("Checkpoint units and attempts", exact=True)).to_be_visible()
+    runs = open_workflow_runs(page, "Durable approval workflow")
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    expect(runs.get_by_text("Run memory", exact=True)).to_be_visible()
+    runs.get_by_text("Run memory", exact=True).click()
+    expect(runs.get_by_text("Checkpoint units and attempts", exact=True)).to_be_visible()
+    return runs
 
 
 def test_durable_default_existing_preservation_and_task_approval_payload(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
+    expect(workflow_editor(page, "Create workflow")).to_be_visible()
     expect(durable_toggle(page)).to_be_checked()
     labelled(page, "Workflow name").fill("Durable default workflow")
     labelled(page, "Model").select_option(label="Workspace GPT · aoai")
@@ -90,7 +99,7 @@ def test_durable_default_existing_preservation_and_task_approval_payload(workflo
     assert body["durable_execution"] is True
     assert "approval" not in body["tasks"][0]
 
-    page.get_by_role("button", name=re.compile(r"Edit Quarterly review workflow")).click()
+    edit_workflow(page, "Quarterly review workflow")
     expect(durable_toggle(page)).not_to_be_checked()
     labelled(page, "Description").first.fill("Legacy workflow stays non-durable unless opted in.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
@@ -98,7 +107,7 @@ def test_durable_default_existing_preservation_and_task_approval_payload(workflo
     assert legacy_body["id"] == WORKFLOW_ID
     assert "durable_execution" not in legacy_body
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     durable_toggle(page).uncheck(force=True)
     open_task_details(page)
     approval_toggle(page).check(force=True)
@@ -121,7 +130,8 @@ def test_queued_run_response_expands_live_runtime_without_blocking(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name=re.compile(r"Run Durable approval workflow")).click()
+    detail = select_workflow(page, "Durable approval workflow")
+    detail.get_by_role("button", name="Run Durable approval workflow", exact=True).click()
     expect(page.get_by_text("queued", exact=True).first).to_be_visible()
     page.get_by_role("button", name="Show run task results", exact=True).first.click()
     expect(page.get_by_text("Version 1", exact=True)).to_be_visible()
@@ -342,7 +352,7 @@ def test_cancel_resume_controls_and_polling_cleanup(workflow_ui):
     key = ("user", DURABLE_WORKFLOW_ID, "polling-run")
     expect(page.get_by_text("Heartbeat polling reached a new approval gate.", exact=True)).to_be_visible(timeout=7000)
     assert 3 <= ui.runtime_get_count[key] <= 5
-    page.get_by_role("button", name="Hide run history", exact=True).click()
+    leave_workflow_runs(page, "Durable approval workflow")
     stopped_at = ui.runtime_get_count[key]
     page.wait_for_timeout(2600)
     assert ui.runtime_get_count[key] == stopped_at
diff --git a/ui_tests/test_v2_workflow_editor.py b/ui_tests/test_v2_workflow_editor.py
index 85eec39ed..b2e617871 100644
--- a/ui_tests/test_v2_workflow_editor.py
+++ b/ui_tests/test_v2_workflow_editor.py
@@ -1,10 +1,11 @@
 # test_v2_workflow_editor.py
 """
 UI tests for the native V2 LIST workflow editor.
-Version: 0.261.207
+Version: 0.261.271
 Implemented in: 0.261.108
 Personal workflow row delete coverage: 0.261.178
 Personal File Sync is authored, so it is no longer listed as preserved-only: 0.261.207
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 These tests use the real V2 SPA bundle with a closed API fixture. They cover
 create/edit, stable task input bindings, shared references, schema validation,
@@ -32,6 +33,16 @@
     connect_options,  # noqa: F401
     workflow_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    select_workflow,
+    workflow_detail,
+    workflow_editor,
+    workflow_editor_path,
+    workflow_row,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -61,8 +72,7 @@ def test_create_workflow_with_reorder_bindings_references_and_schema_validation(
     expect(page.get_by_role("heading", name="Workflows", exact=True)).to_be_visible()
     ui.assert_no_overflow()
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     expect(labelled(page, "Workflow name")).to_be_visible()
     expect(page.get_by_text("The default model is not valid here", exact=False)).to_be_visible()
     labelled(page, "Workflow name").fill("V2 evidence workflow")
@@ -119,7 +129,7 @@ def test_create_workflow_with_reorder_bindings_references_and_schema_validation(
     labelled(page, "Optional JSON schema").fill('{"type":"object","properties":{"answer":{"type":"string"}}}')
     expect(page.get_by_role("alert").filter(has_text="JSON schema must be valid JSON.")).to_have_count(0)
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
 
     write = workflow_post(ui)
     body = write.body
@@ -167,6 +177,7 @@ def test_edit_preserves_legacy_fields_and_run_inspection_surfaces_validation(wor
     ui.open("/workspace/workflows")
 
     ui.fail_next_workflow_run()
+    select_workflow(page, "Quarterly review workflow")
     page.get_by_role("button", name=re.compile(r"Run Quarterly review workflow")).click()
     expect(page.get_by_role("alert").filter(has_text="Workflow run completed with failed tasks.")).to_be_visible()
     expect(page.get_by_text("completed_partial", exact=True)).to_be_visible()
@@ -185,14 +196,16 @@ def test_edit_preserves_legacy_fields_and_run_inspection_surfaces_validation(wor
     expect(page.get_by_text("Second transport excerpt page", exact=False)).to_be_visible()
     expect(page.get_by_text("offset 2000", exact=False)).to_be_visible()
 
-    page.get_by_role("button", name=re.compile(r"Edit Quarterly review workflow")).click()
+    edit_workflow(page, "Quarterly review workflow")
     expect(page.get_by_text("Preserved settings", exact=True)).to_be_visible()
     # 0.261.207: V2 authors personal File Sync, so it is no longer listed as preserved-only. An
     # untouched legacy value is still sent back exactly as loaded (checked below).
     expect(page.get_by_text("file sync settings", exact=False)).to_have_count(0)
     labelled(page, "Description").first.fill("Edited without losing legacy settings.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
+    # Saving returns to the list with the saved workflow selected.
+    expect(workflow_row(page, "Quarterly review workflow")).to_have_attribute("aria-pressed", "true")
 
     body = workflow_post(ui).body
     assert body["id"] == WORKFLOW_ID
@@ -208,17 +221,17 @@ def test_unsupported_version_is_read_only_and_409_retains_draft(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name=re.compile(r"Edit Future workflow")).click()
+    editor = edit_workflow(page, "Future workflow")
     expect(page.get_by_role("alert").filter(has_text="definition version 4")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role(
-        "button", name="Close", exact=True
-    ).last.click()
+    editor.get_by_role("button", name="Close", exact=True).click()
+    expect(workflow_editor(page)).to_have_count(0)
     assert not ui.workflow_writes
 
+    select_workflow(page, "Active running workflow")
     expect(page.get_by_role("button", name=re.compile(r"Active running workflow is running"))).to_be_disabled()
 
-    page.get_by_role("button", name=re.compile(r"Edit Quarterly review workflow")).click()
+    edit_workflow(page, "Quarterly review workflow")
     labelled(page, "Workflow name").fill("Retained stale draft")
     ui.mutate_revision(WORKFLOW_ID)
     with page.expect_response(
@@ -233,7 +246,7 @@ def test_existing_agent_and_legacy_prompt_workflows_preserve_backend_shapes(work
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name=re.compile(r"Edit Agent review workflow")).click()
+    edit_workflow(page, "Agent review workflow")
     expect(labelled(page, "Agent")).to_have_value(
         '["00000000-0000-4000-8000-000000000001",false,false,""]'
     )
@@ -249,7 +262,7 @@ def test_existing_agent_and_legacy_prompt_workflows_preserve_backend_shapes(work
     assert body["tasks"][0]["runner"]["selected_agent"]["id"] == "00000000-0000-4000-8000-000000000003"
     assert "output_contract" not in body["tasks"][0]
 
-    page.get_by_role("button", name=re.compile(r"Edit Legacy prompt workflow")).click()
+    edit_workflow(page, "Legacy prompt workflow")
     expect(labelled(page, "Instructions").first).to_have_value("Use the legacy single prompt.")
     open_task_details(page, 0)
     expect(labelled(page, "Document action").first).to_have_value("analyze")
@@ -261,7 +274,7 @@ def test_existing_agent_and_legacy_prompt_workflows_preserve_backend_shapes(work
     assert legacy_body["tasks"][0]["document_action"] == {"type": "analyze", "document_ids": ["personal-brief"]}
     assert "output_contract" not in legacy_body["tasks"][0]
 
-    page.get_by_role("button", name=re.compile(r"Edit Legacy prompt workflow")).click()
+    edit_workflow(page, "Legacy prompt workflow")
     open_task_details(page, 0)
     labelled(page, "Document action").first.select_option("none")
     page.get_by_role("button", name="Save workflow", exact=True).click()
@@ -273,7 +286,8 @@ def test_existing_agent_and_legacy_prompt_workflows_preserve_backend_shapes(work
 def test_delete_personal_workflow_from_row_confirm(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
-    expect(page.get_by_text("Quarterly review workflow", exact=True)).to_be_visible()
+    expect(workflow_row(page, "Quarterly review workflow")).to_be_visible()
+    select_workflow(page, "Quarterly review workflow")
     page.get_by_role("button", name="Delete Quarterly review workflow", exact=True).click()
     page.get_by_role("button", name="Delete", exact=True).click()
     delete_requests = [
@@ -289,7 +303,7 @@ def test_delete_personal_workflow_from_row_confirm(workflow_ui):
 def test_document_action_comparison_posts_real_payload(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Comparison workflow")
     labelled(page, "Model").select_option(label="Workspace GPT · aoai")
     labelled(page, "Instructions").first.fill("Compare the selected source and target.")
@@ -312,23 +326,33 @@ def test_document_action_comparison_posts_real_payload(workflow_ui):
     assert action["right_document_ids"] == ["personal-second"]
 
 
-def test_initial_workflow_id_opens_once_and_close_stays_closed(workflow_ui):
+def test_initial_workflow_id_selects_and_editor_route_closes_to_it(workflow_ui):
+    """`?workflow_id=` selects a workflow in the workbench; the editor is a route of its own."""
     page = workflow_ui.page
-    workflow_ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role(
-        "button", name="Cancel", exact=True
-    ).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
-    page.get_by_role("button", name=re.compile(r"Show run history")).first.click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    workflow_ui.open("/workspace/workflows?workflow_id=agent-workflow")
+    expect(workflow_row(page, "Agent review workflow")).to_have_attribute("aria-pressed", "true")
+    detail = workflow_detail(page, "Agent review workflow")
+    expect(detail.get_by_role("tab", name="Overview", exact=True)).to_have_attribute("aria-selected", "true")
+    expect(workflow_editor(page)).to_have_count(0)
+
+    workflow_ui.open(workflow_editor_path(WORKFLOW_ID))
+    editor = workflow_editor(page)
+    expect(editor).to_be_visible()
+    expect(editor.get_by_role("heading", name="Quarterly review workflow", exact=True)).to_be_visible()
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(workflow_editor(page)).to_have_count(0)
+    expect(workflow_row(page, "Quarterly review workflow")).to_have_attribute("aria-pressed", "true")
+    workflow_detail(page, "Quarterly review workflow").get_by_role("tab", name="Runs", exact=True).click()
+    expect(workflow_editor(page)).to_have_count(0)
+    expect(page.get_by_role("dialog")).to_have_count(0)
 
 
 def test_pristine_create_cancels_without_invented_dirty_state(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    page.get_by_role("dialog", name="Create workflow", exact=True).get_by_role("button", name="Cancel", exact=True).click()
+    editor = create_workflow(page)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     expect(page.get_by_role("dialog")).to_have_count(0)
     assert not ui.workflow_writes
 
@@ -338,7 +362,7 @@ def test_group_workflows_carry_group_id_and_dirty_guard_blocks_switching(workflo
     ui.open("/groups")
     ui.select_group(GROUP_ID)
     expect(page.get_by_role("heading", name="Workflows", exact=True)).to_be_visible()
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Group workflow from V2")
     labelled(page, "Model").select_option(label="Workspace GPT · aoai")
     expect(page.get_by_label("Group workspace", exact=True)).to_be_disabled()
@@ -348,7 +372,7 @@ def test_group_workflows_carry_group_id_and_dirty_guard_blocks_switching(workflo
     page.get_by_role("listitem").filter(has_text="Group brief").get_by_role("button", name="Add").click()
     labelled(page, "Instructions").first.fill("Review only the selected group evidence.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
 
     group_requests = [
         request for request in ui.requests
diff --git a/ui_tests/test_v2_workflow_flow_authoring.py b/ui_tests/test_v2_workflow_flow_authoring.py
index fe1343085..03c20dd23 100644
--- a/ui_tests/test_v2_workflow_flow_authoring.py
+++ b/ui_tests/test_v2_workflow_flow_authoring.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_flow_authoring.py
 """
 Offline real-bundle browser regressions for M5B workflow Flow authoring.
-Version: 0.261.231
+Version: 0.261.271
 Implemented in: 0.261.122
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 Uses the existing fictional, closed API harness and real Python compiler.
 Only explicit scoped Save and data-only compiler previews may write requests.
@@ -39,6 +40,15 @@
 )
 from ui_tests.fixtures.workflow_loops import record_contract
 from ui_tests.fixtures.workflow_repeat_until import WorkflowRepeatFixture
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    discard_and_leave,
+    edit_workflow,
+    leave_prompt,
+    open_workflow_flow,
+    open_workflow_runs,
+    workflow_editor,
+    workflow_editor_path,
+)
 from functions_workflow_definitions import workflow_definition_revision
 from functions_workflow_flow import compile_workflow_flow
 
@@ -162,10 +172,10 @@ def open_editor(ui, workflow_id=FLOW_WORKFLOW_ID, *, group_id=None, **options):
         ui.open("/groups", **options)
         ui.select_group(group_id)
         name = ui.group_workflows[group_id][workflow_id]["name"]
-        ui.page.get_by_role("button", name=f"Edit {name}", exact=True).click()
+        editor = edit_workflow(ui.page, name)
     else:
-        ui.open(f"/workspace/workflows?workflow_id={workflow_id}", **options)
-    editor = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
+        ui.open(workflow_editor_path(workflow_id), **options)
+        editor = workflow_editor(ui.page)
     expect(editor).to_be_visible()
     switch = editor.get_by_role("group", name="Workflow authoring surface", exact=True)
     expect(switch.get_by_role("button", name="List authoring", exact=True)).to_have_attribute("aria-pressed", "true")
@@ -664,7 +674,7 @@ def test_escape_cancels_impact_confirmation_without_closing_or_changing_authorin
         page.keyboard.press("Escape")
         expect(confirmation).to_have_count(0)
         expect(editor).to_be_visible()
-        expect(page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)).to_have_count(0)
+        expect(leave_prompt(page)).to_have_count(0)
         expect(node_button(view, node_id)).to_have_attribute("aria-pressed", "true")
         expect(node_button(view, node_id)).to_be_focused()
         expect(editor.get_by_label("Description", exact=True)).to_have_value(description)
@@ -762,8 +772,8 @@ def test_unfinished_field_builder_alone_participates_in_unsaved_change_protectio
     fields.get_by_label("Decision field type", exact=True).select_option("enum")
     fields.get_by_label("Decision enum values", exact=True).fill("one\none\n")
     switch_surface(editor, "List")
-    editor.get_by_role("button", name="Close", exact=True).click()
-    confirmation = page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    confirmation = leave_prompt(page)
     expect(confirmation).to_be_visible()
     confirmation.get_by_role("button", name="Keep editing", exact=True).click()
     view = switch_surface(editor, "Flow")
@@ -794,16 +804,13 @@ def test_delayed_preview_cannot_cross_closed_editor_workflow_or_group_scope(auth
     expect(view.get_by_role("status").filter(has_text=re.compile(r"^Validating draft\."))).to_be_visible()
     expect(view.locator(".workflow-flow-control-edge")).to_have_count(0)
     assert len(ui.held_flow_responses) == 1
-    editor.get_by_role("button", name="Close", exact=True).click()
-    page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True).get_by_role(
-        "button", name="Discard changes", exact=True,
-    ).click()
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    discard_and_leave(page)
     if group:
         ui.select_group(SECOND_GROUP_ID)
-        page.get_by_role("button", name="Edit Beta read-only Flow", exact=True).click()
+        editor = edit_workflow(page, "Beta read-only Flow")
     else:
-        page.get_by_role("button", name="Edit Authoring seed", exact=True).click()
-    editor = page.get_by_role("dialog", name="Edit workflow", exact=True)
+        editor = edit_workflow(page, "Authoring seed")
     expect(editor.get_by_role("button", name="List authoring", exact=True)).to_have_attribute("aria-pressed", "true")
     if group:
         accounts = editor.get_by_label("Microsoft 365 Run as", exact=True)
@@ -877,13 +884,13 @@ def test_pending_save_disables_semantic_edits_and_cannot_issue_a_second_write(au
         expect(fields.get_by_label("Task name", exact=True)).to_be_disabled()
         for name in ("Add block in Flow", "Move selected block", "Remove selected block"):
             expect(view.get_by_role("button", name=name, exact=True)).to_be_disabled()
-        close = editor.get_by_role("button", name="Close", exact=True)
-        if close.is_enabled():
-            close.click()
-        expect(page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)).to_have_count(0)
+        cancel = editor.get_by_role("button", name="Cancel", exact=True)
+        if cancel.is_enabled():
+            cancel.click()
+        expect(leave_prompt(page)).to_have_count(0)
         expect(editor).to_be_visible()
         page.keyboard.press("Escape")
-        expect(page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)).to_have_count(0)
+        expect(leave_prompt(page)).to_have_count(0)
         expect(editor).to_be_visible()
         assert len([request for request in ui.writes if request.path in SAVE_PATHS]) == 1
     finally:
@@ -934,8 +941,8 @@ def test_layout_selection_collapse_and_surface_switches_never_dirty_or_save(auth
     switch_surface(editor, "List")
     view = switch_surface(editor, "Flow")
     expect(node_button(view, "finish")).to_have_attribute("aria-pressed", "true")
-    editor.get_by_role("button", name="Close", exact=True).click()
-    expect(page.get_by_role("dialog")).to_have_count(0)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(editor).to_have_count(0)
     assert not ui.workflow_writes
     assert ui.personal_workflows[FLOW_WORKFLOW_ID] == original
     assert page.evaluate("JSON.stringify({local: {...localStorage}, session: {...sessionStorage}})") == storage
@@ -1086,8 +1093,8 @@ def test_task_limit_rejects_add_atomically_without_dirtying_the_draft(authoring_
     assert ui.personal_workflows[AUTHORING_ID] == original
     placement.get_by_role("button", name="Cancel block placement", exact=True).click()
     expect(placement).to_have_count(0)
-    editor.get_by_role("button", name="Close", exact=True).click()
-    expect(page.get_by_role("dialog")).to_have_count(0)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(editor).to_have_count(0)
     assert not ui.workflow_writes
 
 
@@ -1098,9 +1105,8 @@ def test_read_only_access_boundaries_never_offer_flow_authoring(authoring_ui, re
         ui.group_can_manage = False
         ui.open("/groups")
         ui.select_group(GROUP_ID)
-        page.get_by_role("button", name="View Alpha read-only Flow", exact=True).click()
-        reader = page.get_by_role("dialog", name="Edit workflow", exact=True)
-        expect(reader).to_contain_text("This workflow is read-only.")
+        reader = edit_workflow(page, "Alpha read-only Flow", action="View")
+        expect(reader).to_contain_text("View workflow")
         expect(reader.get_by_label("Workflow name", exact=True)).to_be_disabled()
         for field in reader.get_by_label("Task name", exact=True).all():
             expect(field).to_be_disabled()
@@ -1110,17 +1116,17 @@ def test_read_only_access_boundaries_never_offer_flow_authoring(authoring_ui, re
         expect(reader.get_by_role("group", name="Workflow authoring surface", exact=True)).to_have_count(0)
         reader.get_by_role("button", name="Close", exact=True).last.click()
         expect(reader).to_have_count(0)
-        page.get_by_role("button", name="View Flow for Alpha read-only Flow", exact=True).click()
+        open_workflow_flow(page, "Alpha read-only Flow")
     elif restriction == "active_run":
         ui.personal_workflows[FLOW_WORKFLOW_ID].update(active_run_id=FLOW_RUN_ID, status="running")
         ui.open("/workspace/workflows")
         expect(page.get_by_role(
             "button", name=f"{FLOW_NAME} is running; cancel or wait before editing", exact=True,
         )).to_be_disabled()
-        page.get_by_role("button", name=f"View Flow for {FLOW_NAME}", exact=True).click()
+        open_workflow_flow(page, FLOW_NAME)
     else:
         ui.personal_workflows[FLOW_WORKFLOW_ID]["flow"]["nodes"][0]["future_executor"] = {"unchanged": True}
-        ui.open(f"/workspace/workflows?workflow_id={FLOW_WORKFLOW_ID}")
+        ui.open(workflow_editor_path(FLOW_WORKFLOW_ID))
         expect(page.get_by_role("alert").filter(has_text=re.compile("cannot safely save|unsupported", re.I)).first).to_be_visible()
         expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     expect(page.get_by_role("group", name="Workflow authoring surface", exact=True)).to_have_count(0)
@@ -1166,19 +1172,15 @@ def test_saved_and_frozen_run_flow_remain_inspection_only_after_authoring_save(a
     view = switch_surface(editor, "Flow")
     select_node(view, "evaluate").get_by_label("Task name", exact=True).fill("Saved authored evaluation")
     save(ui, editor)
-    page.get_by_role("button", name=f"View Flow for {FLOW_NAME}", exact=True).click()
-    saved = page.get_by_role("dialog", name="Workflow Flow", exact=True)
+    saved_panel = open_workflow_flow(page, FLOW_NAME)
+    saved = saved_panel.get_by_role("region", name="Workflow Flow", exact=True)
     expect(saved.get_by_role("heading", name="Read-only Flow", exact=True)).to_be_visible()
     expect(node_button(saved, "evaluate")).to_have_accessible_name("Select Saved authored evaluation (Task)")
     expect(saved.get_by_role("button", name="Add block in Flow", exact=True)).to_have_count(0)
     expect(saved.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
-    saved.get_by_role("button", name="Close", exact=True).click()
-    row = page.get_by_role("listitem").filter(has=page.get_by_role(
-        "button", name=f"View Flow for {FLOW_NAME}", exact=True,
-    )).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    row.get_by_role("button", name="Show Flow for this run", exact=True).click()
+    runs = open_workflow_runs(page, FLOW_NAME)
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    runs.get_by_role("button", name="Show Flow for this run", exact=True).click()
     run = page.get_by_role("region", name="Workflow Flow", exact=True)
     expect(run.get_by_text("Run's frozen definition", exact=True)).to_be_visible()
     expect(node_button(run, "evaluate")).to_have_accessible_name("Select Frozen evaluation (Task)")
diff --git a/ui_tests/test_v2_workflow_flow_canvas_stability.py b/ui_tests/test_v2_workflow_flow_canvas_stability.py
index e0e71cbda..e64500ab3 100644
--- a/ui_tests/test_v2_workflow_flow_canvas_stability.py
+++ b/ui_tests/test_v2_workflow_flow_canvas_stability.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_flow_canvas_stability.py
 """
 Offline real-bundle browser regressions for a stable workflow Flow canvas (#1573).
-Version: 0.261.205
+Version: 0.261.271
 Implemented in: 0.261.205
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 A re-render that doesn't change the diagram must not rebuild the React Flow nodes. New node
 objects reset React Flow's measured handle bounds, so every edge is removed from the page
@@ -39,6 +40,7 @@
 # The shared fixtures import pure application helpers after setting their paths.
 from ui_tests import test_v2_workflow_flow_authoring as authoring
 from ui_tests.fixtures.workflow_flow import FLOW_NAME, FLOW_RUN_ID, FLOW_WORKFLOW_ID, workflow_flow_ui  # noqa: F401
+from ui_tests.fixtures.workflow_workbench import open_workflow_runs  # noqa: E402
 from ui_tests.test_v2_workflow_flow_authoring import authoring_ui, connect_options  # noqa: F401
 
 
@@ -308,12 +310,9 @@ def test_runtime_polls_keep_read_only_flow_nodes_and_edges_mounted(workflow_flow
     ui.workflow_runs[FLOW_WORKFLOW_ID][0]["status"] = "running"
     ui.workflow_runtimes[key]["state"] = "running"
     ui.open("/workspace/workflows")
-    row = page.get_by_role("listitem").filter(has=page.get_by_role(
-        "button", name=f"View Flow for {FLOW_NAME}", exact=True,
-    )).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    row.get_by_role("button", name="Show Flow for this run", exact=True).click()
+    runs = open_workflow_runs(page, FLOW_NAME)
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    runs.get_by_role("button", name="Show Flow for this run", exact=True).click()
     view = page.get_by_role("region", name="Workflow Flow", exact=True)
     expect(view.get_by_text("Run's frozen definition", exact=True)).to_be_visible()
     expect(view.get_by_text("Loading bounded execution overlay...", exact=True)).to_have_count(0)
diff --git a/ui_tests/test_v2_workflow_flow_inspection.py b/ui_tests/test_v2_workflow_flow_inspection.py
index c771838a0..a47e7a3bf 100644
--- a/ui_tests/test_v2_workflow_flow_inspection.py
+++ b/ui_tests/test_v2_workflow_flow_inspection.py
@@ -1,10 +1,11 @@
 # test_v2_workflow_flow_inspection.py
 """
 Offline browser regressions for approved M5A read-only workflow Flow inspection.
-Version: 0.261.231
+Version: 0.261.271
 Implemented in: 0.261.121
 Group saved Flow opens through the group route only: 0.261.178
 An unavailable authored source is marked on its own row: 0.261.231
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 Uses the real local SPA, compiler-derived projections and closed fictional APIs.
 Run with PLAYWRIGHT_SERVICE_URL='' in this same pytest process. No live app,
@@ -41,6 +42,14 @@
     flow_binding,
     workflow_flow_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    edit_workflow,
+    open_workflow_flow,
+    open_workflow_runs,
+    select_workflow,
+    workflow_editor,
+    workflow_editor_path,
+)
 from functions_workflow_definitions import workflow_definition_revision
 from functions_workflow_identity import workflow_execution_id
 
@@ -71,17 +80,16 @@ def open_saved(ui, name=FLOW_NAME, *, group_id=None, **options):
     ui.open("/groups" if group_id else "/workspace/workflows", **options)
     if group_id:
         ui.select_group(group_id)
-    ui.page.get_by_role("button", name=f"View Flow for {name}", exact=True).click()
-    expect(ui.page.get_by_role("dialog", name="Workflow Flow", exact=True)).to_be_visible()
-    view = flow_region(ui.page)
+    panel = open_workflow_flow(ui.page, name)
+    view = panel.get_by_role("region", name="Workflow Flow", exact=True)
     expect(view.get_by_role("heading", name="Read-only Flow", exact=True)).to_be_visible()
     expect(view.get_by_role("button", name="Refresh Flow", exact=True)).to_be_enabled()
     return view
 
 
 def open_editor(ui, workflow_id=FLOW_WORKFLOW_ID, **options):
-    ui.open(f"/workspace/workflows?workflow_id={workflow_id}", **options)
-    editor = ui.page.get_by_role("dialog", name="Edit workflow", exact=True)
+    ui.open(workflow_editor_path(workflow_id), **options)
+    editor = workflow_editor(ui.page)
     expect(editor).to_be_visible()
     surface = editor.get_by_role("group", name="Workflow authoring surface", exact=True)
     expect(surface.get_by_role("button", name="List authoring", exact=True)).to_have_attribute("aria-pressed", "true")
@@ -112,19 +120,16 @@ def open_run_flow(ui, *, workflow_name=FLOW_NAME, workflow_id=FLOW_WORKFLOW_ID,
     ui.open("/groups" if group else "/workspace/workflows")
     if group:
         ui.select_group(GROUP_ID)
-    row = ui.page.get_by_role("listitem").filter(has=ui.page.get_by_role(
-        "button", name=f"View Flow for {workflow_name}", exact=True,
-    )).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    expect(row.get_by_role("list", name="Workflow node executions", exact=True)).to_be_visible()
+    runs = open_workflow_runs(ui.page, workflow_name)
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    expect(runs.get_by_role("list", name="Workflow node executions", exact=True)).to_be_visible()
     before = len([entry for entry in ui.requests if entry.path.endswith("/executions")])
-    row.get_by_role("button", name="Show Flow for this run", exact=True).click()
+    runs.get_by_role("button", name="Show Flow for this run", exact=True).click()
     view = flow_region(ui.page)
     expect(view.get_by_text("Run's frozen definition", exact=True)).to_be_visible()
     expect(view.get_by_role("button", name="Refresh Flow", exact=True)).to_be_enabled()
     expect(view.get_by_text("Loading bounded execution overlay...", exact=True)).to_have_count(0)
-    expect(row.get_by_role("list", name="Workflow node executions", exact=True)).to_have_count(0)
+    expect(runs.get_by_role("list", name="Workflow node executions", exact=True)).to_have_count(0)
     pages = [entry for entry in ui.requests if entry.path.endswith("/executions")][before:]
     assert len(pages) == 1 and pages[0].query == {
         "limit": ["50"], **({"group_id": [GROUP_ID]} if group else {}),
@@ -134,8 +139,8 @@ def open_run_flow(ui, *, workflow_name=FLOW_NAME, workflow_id=FLOW_WORKFLOW_ID,
 
 
 def close_saved(page):
-    page.get_by_role("dialog", name="Workflow Flow", exact=True).get_by_role("button", name="Close", exact=True).click()
-    expect(page.get_by_role("dialog", name="Workflow Flow", exact=True)).to_have_count(0)
+    page.get_by_role("tab", name="Overview", exact=True).click()
+    expect(flow_region(page)).to_have_count(0)
 
 
 def assert_no_eager_content(ui):
@@ -235,12 +240,13 @@ def test_v1_v2_have_no_implicit_flow_conversion_or_preview_request(workflow_flow
     original = copy.deepcopy({key: ui.personal_workflows[key] for key in (WORKFLOW_ID, ui.legacy_workflow["id"])})
     ui.open("/workspace/workflows")
     for name in ("Quarterly review workflow", "Legacy version one"):
-        expect(page.get_by_role("button", name=f"View Flow for {name}", exact=True)).to_have_count(0)
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+        detail = select_workflow(page, name)
+        expect(detail.get_by_role("tab", name="Flow", exact=True)).to_have_count(0)
+    editor = edit_workflow(page, "Quarterly review workflow")
     expect(page.get_by_role("button", name="Flow authoring", exact=True)).to_have_count(0)
     expect(page.get_by_role("button", name="Enable structured control flow", exact=True)).to_be_visible()
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role("button", name="Close", exact=True).click()
-    expect(page.get_by_role("dialog")).to_have_count(0)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(editor).to_have_count(0)
     assert not ui.topology_requests and not ui.preview_requests
     assert {key: ui.personal_workflows[key] for key in original} == original
 
@@ -409,8 +415,8 @@ def test_opening_and_layout_of_unchanged_preview_does_not_make_editor_dirty(work
         view.get_by_role("button", name=name, exact=True).click()
     editor.get_by_role("button", name="List authoring", exact=True).click()
     expect(editor.get_by_role("region", name="Workflow Flow authoring", exact=True)).to_have_count(0)
-    editor.get_by_role("button", name="Close", exact=True).click()
-    expect(page.get_by_role("dialog")).to_have_count(0)
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    expect(editor).to_have_count(0)
     assert ui.personal_workflows[FLOW_WORKFLOW_ID] == original
 
 
@@ -888,11 +894,11 @@ def test_read_only_group_source_switch_rejects_delayed_previous_group_projection
     ui.hold_next_flow(source_kind="saved", group_id=GROUP_ID)
     ui.open("/groups")
     ui.select_group(GROUP_ID)
-    page.get_by_role("button", name="View Flow for Alpha read-only Flow", exact=True).click()
+    open_workflow_flow(page, "Alpha read-only Flow")
     expect(flow_region(page).get_by_text("Loading authorized Flow definition...", exact=True)).to_be_visible()
     close_saved(page)
     ui.select_group(SECOND_GROUP_ID)
-    page.get_by_role("button", name="View Flow for Beta read-only Flow", exact=True).click()
+    open_workflow_flow(page, "Beta read-only Flow")
     view = flow_region(page)
     expect(node_button(view, "evaluate")).to_have_accessible_name("Select Beta-only evaluation (Task)")
     inspector = select_node(view, "evaluate")
@@ -1136,8 +1142,7 @@ def test_saved_mobile_structure_and_diagram_keep_focus_and_fit_the_page(workflow
     select_node(view, "evaluate")
     view.get_by_role("button", name="Fit Flow", exact=True).click()
     ui.assert_no_overflow()
-    dialog = page.get_by_role("dialog", name="Workflow Flow", exact=True)
-    assert dialog.evaluate("element => element.scrollWidth <= element.clientWidth + 1")
+    assert view.evaluate("element => element.scrollWidth <= element.clientWidth + 1")
     assert page.evaluate("matchMedia('(prefers-reduced-motion: reduce)').matches")
     assert not ui.preview_requests
     assert all(asset.startswith("/static/") for asset in ui.loaded_assets)
diff --git a/ui_tests/test_v2_workflow_loops.py b/ui_tests/test_v2_workflow_loops.py
index 8c45a42ef..beee36666 100644
--- a/ui_tests/test_v2_workflow_loops.py
+++ b/ui_tests/test_v2_workflow_loops.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_loops.py
 """
 Closed browser regressions for serial For each, exact Collect and explicit saved-record reporting.
-Version: 0.261.213
+Version: 0.261.271
 Implemented in: 0.261.117
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 Loads the real built local SPA and validates authoring payloads with production
 normalization. Source previews and immutable paged history are fake network
@@ -42,6 +43,14 @@
     workflow_loops_ui,  # noqa: F401
 )
 from ui_tests.fixtures.workflow_control_definitions import flow_binding, structured_workflow_record
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    open_workflow_runs,
+    workflow_editor,
+    workflow_editor_path,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -56,7 +65,7 @@ def details(block):
 
 
 def open_loop(ui, **kwargs):
-    ui.open(f"/workspace/workflows?workflow_id={LOOP_WORKFLOW_ID}", **kwargs)
+    ui.open(workflow_editor_path(LOOP_WORKFLOW_ID), **kwargs)
     return ui.page.get_by_role("region", name="For each block", exact=True).first
 
 
@@ -65,16 +74,15 @@ def expand_history(ui, *, group=False):
     ui.open("/groups" if group else "/workspace/workflows")
     if group:
         ui.select_group(GROUP_ID)
-    row = page.get_by_role("listitem").filter(has_text="Group source loop" if group else "Source loop review").first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    return row
+    runs = open_workflow_runs(page, "Group source loop" if group else "Source loop review")
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    return runs
 
 
 def test_author_selected_documents_current_analyze_exports_and_collect(workflow_loops_ui):
     ui, page = workflow_loops_ui, workflow_loops_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     page.get_by_label("Workflow name", exact=True).fill("Authored source review")
     page.get_by_label("Model", exact=True).select_option(label="Workspace GPT \u00b7 aoai")
     page.get_by_label("Task name", exact=True).fill("Analyze one source")
@@ -123,7 +131,7 @@ def test_author_selected_documents_current_analyze_exports_and_collect(workflow_
     final.get_by_label("Final outputs input 1 producer", exact=True).select_option(label="Collect findings")
     final.get_by_label("Final outputs input 1 output", exact=True).select_option("records")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     payload = ui.workflow_writes[-1].body
     loop_node, collect_node = payload["flow"]["nodes"]
     assert loop_node["kind"] == "for_each"
@@ -144,11 +152,11 @@ def test_author_selected_documents_current_analyze_exports_and_collect(workflow_
     assert collect_node["output_contract"]["kind"] == "records"
     assert collect_node["output_contract"]["schema"] == payload["tasks"][0]["output_contract"]["schema"]
     assert not any(request.path.endswith("/run") for request in ui.writes)
-    page.get_by_role("button", name="Edit Authored source review", exact=True).click()
+    edit_workflow(page, "Authored source review")
     expect(page.get_by_role("alert").filter(has_text="cannot safely save")).to_have_count(0)
     expect(page.get_by_label("For each maximum items", exact=True)).to_have_value("2")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"] == payload["flow"]
     assert ui.workflow_writes[-1].body["tasks"][0]["document_action"] == payload["tasks"][0]["document_action"]
 
@@ -167,7 +175,7 @@ def test_saved_collection_source_is_typed_complete_and_run_count_unknown(workflo
     details(task)
     expect(task.get_by_label("Document action", exact=True).locator('option[value="current_item"]')).to_have_count(0)
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     node = ui.workflow_writes[-1].body["flow"]["nodes"][1]
     assert node["iterable"] == {"kind": "input", "name": "saved_findings"}
     assert node["inputs"][0] == {
@@ -200,7 +208,7 @@ def test_query_all_matches_best_n_and_excess_lower_bound(workflow_loops_ui):
     loop.get_by_role("button", name="Preview loop selection", exact=True).click()
     expect(loop.get_by_text("Selected count: 2. Effective ceiling: 500. Within the limit.", exact=True)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     iterable = ui.workflow_writes[-1].body["flow"]["nodes"][0]["iterable"]
     assert iterable["selection"] == {"mode": "best_n", "count": 2}
     assert iterable["content"] == {"mode": "hybrid", "query": "retention policy"}
@@ -231,7 +239,7 @@ def test_http_422_preview_preserves_count_precision_and_clears_previous_items(wo
     if group:
         ui.open("/groups")
         ui.select_group(GROUP_ID)
-        page.get_by_role("button", name="Edit Group source loop", exact=True).click()
+        edit_workflow(page, "Group source loop")
         loop = page.get_by_role("region", name="For each block", exact=True)
     else:
         loop = open_loop(ui)
@@ -281,7 +289,7 @@ def test_hybrid_preview_discloses_candidate_reranking_and_backfill_limits(workfl
     if group:
         ui.open("/groups")
         ui.select_group(GROUP_ID)
-        page.get_by_role("button", name="Edit Group source loop", exact=True).click()
+        edit_workflow(page, "Group source loop")
         loop = page.get_by_role("region", name="For each block", exact=True)
     else:
         loop = open_loop(ui)
@@ -391,7 +399,7 @@ def test_nested_current_items_branch_controls_and_body_exports_round_trip(workfl
     expect(then.get_by_role("button", name="Add If/else to Then", exact=True)).to_be_disabled()
     page.get_by_label("Workflow name", exact=True).fill("Nested exact review")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"] == record["flow"]
     assert ui.workflow_writes[-1].body["tasks"][1]["inputs"] == record["tasks"][1]["inputs"]
 
@@ -461,7 +469,7 @@ def test_all_matches_query_save_preserves_metadata_keyword_semantics(workflow_lo
     loop.get_by_label("Query search", exact=True).fill("")
     loop.get_by_label("Query classification", exact=True).fill("Internal")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     iterable = ui.workflow_writes[-1].body["flow"]["nodes"][0]["iterable"]
     assert iterable["selection"] == {"mode": "all_matches"}
     assert iterable["content"] == {"mode": "keyword", "query": "retention policy"}
@@ -484,7 +492,7 @@ def test_saved_document_results_preserve_kind_through_export_and_collect(workflo
     page.get_by_label("Collect body output", exact=True).select_option("findings")
     expect(page.get_by_text("Preserved output kind: document results", exact=True)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     saved = ui.workflow_writes[-1].body["flow"]
     assert saved == record["flow"]
 
@@ -500,7 +508,7 @@ def test_collection_kind_is_not_coerced_by_a_wider_binding(workflow_loops_ui, ex
     open_loop(ui)
     expect(page.get_by_label("Collect body output", exact=True)).to_contain_text("findings (records)")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"] == record["flow"]
 
 
@@ -516,7 +524,7 @@ def test_current_item_any_binding_round_trips_as_json_data(workflow_loops_ui):
     expect(task.get_by_label("Analyze current source inputs input 1 kind", exact=True)).to_have_value("any")
     expect(page.get_by_role("alert").filter(has_text="cannot safely save")).to_have_count(0)
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["tasks"][0]["inputs"] == record["tasks"][0]["inputs"]
 
 
@@ -531,7 +539,7 @@ def test_optional_body_exports_require_explicit_partial_collect_policy(workflow_
     page.get_by_label("Collect require complete coverage", exact=True).uncheck()
     page.get_by_label("Final outputs input 1 allow partial", exact=True).check()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     nodes = ui.workflow_writes[-1].body["flow"]["nodes"]
     assert not nodes[0]["body"]["outputs"][0]["required"]
     assert nodes[1]["output_contract"]["allow_partial"]
@@ -567,19 +575,19 @@ def test_author_explicit_saved_record_report_without_json(workflow_loops_ui, col
     expect(report.get_by_text("reads all records", exact=False)).to_be_visible()
     expect(report.get_by_text("arbitrary transforms or quantitative tasks", exact=False)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     saved = ui.workflow_writes[-1].body
     assert saved["tasks"][1]["input_processing"] == "saved_record_report"
     assert "input_processing" not in saved["tasks"][0]
     assert saved["tasks"][1]["inputs"] == record["tasks"][1]["inputs"]
     assert saved["flow"] == record["flow"]
-    page.get_by_role("button", name="Edit Source loop review", exact=True).click()
+    edit_workflow(page, "Source loop review")
     report = task_block(page, "Explain saved findings")
     details(report)
     expect(report.get_by_label("Large saved inputs", exact=True)).to_have_value("saved_record_report")
     report.get_by_label("Large saved inputs", exact=True).select_option("full")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["tasks"][1]["input_processing"] == "full"
 
 
@@ -601,7 +609,7 @@ def test_add_saved_record_report_task_from_list_controls(workflow_loops_ui):
     final.get_by_label("Final outputs input 1 producer", exact=True).select_option(label="Report all saved findings")
     final.get_by_label("Final outputs input 1 output", exact=True).select_option("text")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     task = ui.workflow_writes[-1].body["tasks"][-1]
     assert task["input_processing"] == "saved_record_report"
     assert task["document_action"] == {"type": "none"}
@@ -627,7 +635,7 @@ def test_saved_record_report_accepts_a_join_of_collection_kinds(workflow_loops_u
     details(finish)
     expect(finish.get_by_label("Large saved inputs", exact=True)).to_have_value("saved_record_report")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["tasks"][-1]["input_processing"] == "saved_record_report"
 
 
@@ -642,7 +650,7 @@ def test_report_wording_never_opts_an_existing_task_into_batches(workflow_loops_
     report.get_by_label("Large saved inputs", exact=True).select_option("full")
     report.get_by_label("Instructions", exact=True).fill("Explain all saved findings with source-linked qualitative details.")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     task = ui.workflow_writes[-1].body["tasks"][1]
     if original_mode is None:
         assert "input_processing" not in task
@@ -706,7 +714,7 @@ def test_saved_record_report_rejects_incompatible_task_without_rewriting_it(work
     if incompatible == "missing_action":
         report.get_by_role("button", name="Use no document action", exact=True).click()
         page.get_by_role("button", name="Save workflow", exact=True).click()
-        expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+        expect(workflow_editor(page)).to_have_count(0)
         assert ui.workflow_writes[-1].body["tasks"][1]["document_action"] == {"type": "none"}
 
 
@@ -751,7 +759,7 @@ def test_report_mode_requires_explicit_v3_conversion(workflow_loops_ui):
     page.get_by_role("button", name="Enable structured control flow", exact=True).click()
     page.get_by_role("button", name="Convert draft", exact=True).click()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["definition_version"] == 3
     assert ui.workflow_writes[-1].body["tasks"][1]["input_processing"] == "saved_record_report"
 
@@ -773,7 +781,7 @@ def test_group_query_preview_and_save_keep_explicit_group_scope(workflow_loops_u
     ui, page = workflow_loops_ui, workflow_loops_ui.page
     ui.open("/groups")
     ui.select_group(GROUP_ID)
-    page.get_by_role("button", name="Edit Group source loop", exact=True).click()
+    edit_workflow(page, "Group source loop")
     loop = page.get_by_role("region", name="For each block", exact=True)
     loop.get_by_label("For each source", exact=True).select_option("workspace_query")
     expect(loop.get_by_role("group", name="Query workspaces", exact=True).get_by_role("checkbox")).to_have_count(1)
@@ -781,7 +789,7 @@ def test_group_query_preview_and_save_keep_explicit_group_scope(workflow_loops_u
     loop.get_by_role("button", name="Preview loop selection", exact=True).click()
     expect(loop.get_by_text("Selected count: 2. Effective ceiling: 500. Within the limit.", exact=True)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     write = ui.workflow_writes[-1]
     assert write.query["group_id"] == [GROUP_ID]
     assert write.body["group_id"] == GROUP_ID
@@ -802,7 +810,7 @@ def test_selected_shared_group_document_keeps_recipient_scope(workflow_loops_ui,
     if group_workflow:
         ui.open("/groups")
         ui.select_group(GROUP_ID)
-        page.get_by_role("button", name="Edit Group source loop", exact=True).click()
+        edit_workflow(page, "Group source loop")
         loop = page.get_by_role("region", name="For each block", exact=True)
     else:
         loop = open_loop(ui)
@@ -814,7 +822,7 @@ def test_selected_shared_group_document_keeps_recipient_scope(workflow_loops_ui,
     expected_count = 2 if group_workflow else 3
     expect(loop.get_by_text(f"Selected count: {expected_count}. Effective ceiling: 500. Within the limit.", exact=True)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     documents = ui.workflow_writes[-1].body["flow"]["nodes"][0]["iterable"]["documents"]
     selected = next(document for document in documents if document["document_id"] == "shared-brief")
     assert selected == {"document_id": "shared-brief", "scope_type": "group", "scope_id": GROUP_ID}
diff --git a/ui_tests/test_v2_workflow_m365_run_as.py b/ui_tests/test_v2_workflow_m365_run_as.py
index 98661aa82..b2780f2e9 100644
--- a/ui_tests/test_v2_workflow_m365_run_as.py
+++ b/ui_tests/test_v2_workflow_m365_run_as.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_m365_run_as.py
 """
 Closed-browser tests for native V2 Microsoft 365 Run as authoring.
-Version: 0.261.149
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.122
 
 Use the actual built SPA and existing scoped workflow fixtures. Cover explicit
@@ -40,6 +41,15 @@
     workflow_repeat_ui,  # noqa: F401
 )
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    workflow_editor,
+    workflow_editor_path,
+    leave_prompt,
+)
+
 
 pytestmark = pytest.mark.ui
 RUN_AS_PATH = "/api/workflows/m365-run-as-users"
@@ -56,15 +66,12 @@ def open_workflows(ui, *, group=False):
 
 
 def edit_personal(ui):
-    ui.page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+    edit_workflow(ui.page, "Quarterly review workflow")
 
 
 def save_workflow(ui, *, creating=False):
     ui.page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(ui.page.get_by_role(
-        "dialog", name="Create workflow" if creating else "Edit workflow", exact=True
-    )).to_have_count(0)
+    expect(workflow_editor(ui.page, CREATE_WORKFLOW if creating else "Edit workflow")).to_have_count(0)
     assert ui.workflow_writes, "Expected a successful workflow save."
     return ui.workflow_writes[-1]
 
@@ -73,7 +80,7 @@ def save_workflow(ui, *, creating=False):
 def test_account_loading_does_not_infer_consent_or_make_a_new_draft_dirty(workflow_ui, group):
     ui, page = workflow_ui, workflow_ui.page
     open_workflows(ui, group=group)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     select = account_select(page)
     expect(select).to_be_enabled()
     expect(select).to_have_value("")
@@ -82,7 +89,7 @@ def test_account_loading_does_not_infer_consent_or_make_a_new_draft_dirty(workfl
     assert requests
     expected = {"scope": ["group"], "group_id": [GROUP_ID]} if group else {"scope": ["personal"]}
     assert all(request.query == expected for request in requests)
-    page.get_by_role("dialog", name="Create workflow", exact=True).get_by_role(
+    workflow_editor(page, CREATE_WORKFLOW).get_by_role(
         "button", name="Cancel", exact=True
     ).click()
     expect(page.get_by_role("dialog")).to_have_count(0)
@@ -117,7 +124,7 @@ def test_personal_selection_and_explicit_clear_round_trip_without_losing_setting
 def test_group_selection_uses_its_scope_and_participates_in_the_dirty_guard(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     open_workflows(ui, group=True)
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     select = account_select(page)
     expect(select).to_be_enabled()
     select.select_option("group-reviewer")
@@ -135,7 +142,7 @@ def test_group_selection_uses_its_scope_and_participates_in_the_dirty_guard(work
     assert requests and all(
         request.query == {"scope": ["group"], "group_id": [GROUP_ID]} for request in requests
     )
-    page.get_by_role("button", name="Edit Group Run as review", exact=True).click()
+    edit_workflow(page, "Group Run as review")
     expect(select).to_be_enabled()
     expect(select).to_have_value("group-reviewer")
     select.select_option("")
@@ -159,7 +166,7 @@ def test_saved_selection_survives_loading_without_dirtying_the_editor(workflow_u
     expect(select).to_be_enabled()
     expect(select).to_have_value(OWNER_ID)
     expect(select.locator("option:checked")).to_have_text("Workspace editor")
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role(
+    workflow_editor(page).get_by_role(
         "button", name="Cancel", exact=True
     ).click()
     expect(page.get_by_role("dialog")).to_have_count(0)
@@ -199,7 +206,7 @@ def test_lookup_errors_preserve_the_choice_and_do_not_echo_server_details(workfl
     expect(page.get_by_text("internal-settings-diagnostic", exact=False)).to_have_count(0)
     expect(page.locator("img[data-run-as-error]")).to_have_count(0)
     expect(page.get_by_role("button", name="Retry Microsoft 365 account list", exact=True)).to_be_enabled()
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role(
+    workflow_editor(page).get_by_role(
         "button", name="Cancel", exact=True
     ).click()
     expect(page.get_by_role("dialog")).to_have_count(0)
@@ -245,10 +252,10 @@ def test_selection_only_edits_survive_stale_save_and_require_explicit_discard(wo
     )
     assert request.body["definition_revision"] == original_revision
     assert request.body["m365_run_as_user_id"] == OWNER_ID
-    page.get_by_role("dialog", name="Edit workflow", exact=True).get_by_role(
+    workflow_editor(page).get_by_role(
         "button", name="Cancel", exact=True
     ).click()
-    expect(page.get_by_role("dialog", name="Discard unsaved workflow changes?", exact=True)).to_be_visible()
+    expect(leave_prompt(page)).to_be_visible()
     page.get_by_role("button", name="Keep editing", exact=True).click()
     expect(account_select(page)).to_have_value(OWNER_ID)
     assert not ui.workflow_writes
@@ -260,7 +267,7 @@ def test_directory_labels_are_inert_and_read_only_definitions_cannot_change_acco
     ui.m365_run_as_users["personal"] = [{"id": OWNER_ID, "display_name": label}]
     ui.personal_workflows[UNSUPPORTED_WORKFLOW_ID]["m365_run_as_user_id"] = OWNER_ID
     open_workflows(ui)
-    page.get_by_role("button", name="Edit Future workflow", exact=True).click()
+    edit_workflow(page, "Future workflow")
     select = account_select(page)
     expect(select.locator("option:checked")).to_have_text(label)
     expect(select).to_have_value(OWNER_ID)
@@ -275,7 +282,7 @@ def test_directory_labels_are_inert_and_read_only_definitions_cannot_change_acco
 def test_account_edit_preserves_structured_flow_bindings_limits_and_revision(workflow_repeat_ui, workflow_id):
     ui, page = workflow_repeat_ui, workflow_repeat_ui.page
     original = copy.deepcopy(ui.personal_workflows[workflow_id])
-    ui.open(f"/workspace/workflows?workflow_id={workflow_id}")
+    ui.open(workflow_editor_path(workflow_id))
     expect(account_select(page)).to_be_enabled()
     account_select(page).select_option(OWNER_ID)
     body = save_workflow(ui).body
@@ -301,7 +308,7 @@ def test_a_members_read_only_editor_never_requests_accounts_and_shows_the_stored
     ui.group_workflows[GROUP_ID]["group-workflow"]["m365_run_as_user_id"] = stored
     open_workflows(ui, group=True)
     page.get_by_role("button", name="View Group review workflow", exact=True).click()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
+    dialog = workflow_editor(page)
     expect(dialog.get_by_text("You have read-only access to workflows in this scope.", exact=True)).to_be_visible()
     select = account_select(page)
     expect(select).to_be_disabled()
diff --git a/ui_tests/test_v2_workflow_m365_runtime.py b/ui_tests/test_v2_workflow_m365_runtime.py
index bc637aec9..7e2b40c77 100644
--- a/ui_tests/test_v2_workflow_m365_runtime.py
+++ b/ui_tests/test_v2_workflow_m365_runtime.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_m365_runtime.py
 """
 Closed-browser compatibility tests for Microsoft 365 workflow authorization waits.
-Version: 0.261.127
+Version: 0.261.271
 Implemented in: 0.261.122
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 The production SPA must retain nonterminal states, keep polling, lock active
 authoring, and permit cancellation without exposing generic approval or resume.
@@ -34,6 +35,7 @@
     FLOW_WORKFLOW_ID,
     workflow_flow_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import open_workflow_runs, workflow_detail  # noqa: E402
 
 
 pytestmark = pytest.mark.ui
@@ -63,13 +65,13 @@ def open_runtime(ui, name, *, group=False, structured=False):
     ui.open("/groups" if group else "/workspace/workflows")
     if group:
         ui.select_group(GROUP_ID)
-    row = ui.page.get_by_role("listitem").filter(has_text=name).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
+    runs = open_workflow_runs(ui.page, name)
+    detail = workflow_detail(ui.page, name)
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
     memory_label = "Runtime memory summary" if structured else "Run memory"
-    expect(row.get_by_text(memory_label, exact=True)).to_be_visible()
-    expect(row.get_by_text(AUTHORIZATION_REASON, exact=True)).to_be_visible()
-    return row
+    expect(runs.get_by_text(memory_label, exact=True)).to_be_visible()
+    expect(runs.get_by_text(AUTHORIZATION_REASON, exact=True)).to_be_visible()
+    return detail
 
 
 def assert_no_generic_continuation(page):
@@ -146,9 +148,10 @@ def test_flow_describes_m365_authorization_instead_of_a_repeat_limit(workflow_fl
         gate={**authorization_gate(), "unit_id": "evaluate", "node_id": "evaluate"},
     )
     ui.workflow_runs[FLOW_WORKFLOW_ID][0]["status"] = "awaiting_sign_in"
-    open_runtime(ui, FLOW_NAME, structured=True)
-    page.get_by_role("button", name="Show Flow for this run", exact=True).click()
-    view = page.get_by_role("region", name="Workflow Flow", exact=True)
+    runs = open_runtime(ui, FLOW_NAME, structured=True).get_by_role("tabpanel", name="Runs", exact=True)
+    # The run's own frozen Flow lives in its history; the Flow tab shows the saved definition.
+    runs.get_by_role("button", name="Show Flow for this run", exact=True).click()
+    view = runs.get_by_role("region", name="Workflow Flow", exact=True)
     expect(view.get_by_text("Run's frozen definition", exact=True)).to_be_visible()
     notice = view.get_by_text("Current run gate:", exact=False)
     expect(notice).to_contain_text("m365_authorization")
diff --git a/ui_tests/test_v2_workflow_merge_task.py b/ui_tests/test_v2_workflow_merge_task.py
index 294a08138..baf164e54 100644
--- a/ui_tests/test_v2_workflow_merge_task.py
+++ b/ui_tests/test_v2_workflow_merge_task.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_merge_task.py
 """
 UI test for the V2 workflow editor Merge files document action.
-Version: 0.261.244
+Version: 0.261.271
 Implemented in: 0.261.241; PDF merge authoring added in 0.261.242; Word in 0.261.243; PowerPoint in 0.261.244
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 This test ensures the workflow editor can author a merge task, keep the user's selected file
 order after reordering, and save the backend document_action shape, and that it doesn't offer
@@ -24,6 +25,7 @@
 
 from test_support.versioning import assert_app_version_at_least  # noqa: E402
 from ui_tests.fixtures.workflow_editor import workflow_ui  # noqa: F401, E402
+from ui_tests.fixtures.workflow_workbench import CREATE_WORKFLOW, create_workflow, workflow_editor  # noqa: E402
 
 
 pytestmark = pytest.mark.ui
@@ -51,8 +53,7 @@ def test_v2_workflow_merge_task_selected_files_reorder(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Merge files workflow")
     labelled(page, "Description").first.fill("Combines selected files in order.")
     labelled(page, "Runner type").select_option("agent")
@@ -73,7 +74,7 @@ def test_v2_workflow_merge_task_selected_files_reorder(workflow_ui):
     labelled(page, "Merge output file name").fill("monthly_combined")
 
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
 
     action = workflow_post(ui).body["tasks"][0]["document_action"]
     assert action == {
@@ -95,8 +96,7 @@ def test_v2_workflow_merge_task_is_not_offered_while_merge_is_off(workflow_ui):
     ui.editor_option_overrides = {"document_actions": {"merge": {"enabled": False, "workflow_max_documents": 100}}}
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Task name").fill("Merge monthly files")
     open_task_details(page, 0)
     action = labelled(page, "Document action")
@@ -110,8 +110,7 @@ def test_v2_workflow_merge_task_assembles_pdfs_without_bookmarks(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Board pack")
     labelled(page, "Description").first.fill("Joins the briefs into one PDF.")
     labelled(page, "Runner type").select_option("agent")
@@ -131,7 +130,7 @@ def test_v2_workflow_merge_task_assembles_pdfs_without_bookmarks(workflow_ui):
     page.get_by_role("checkbox", name=re.compile("^Add bookmarks")).uncheck(force=True)
 
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     action = workflow_post(ui).body["tasks"][0]["document_action"]
     assert (action["type"], action["merge_kind"], action["output_format"]) == ("merge", "pdf", "pdf")
     assert action["document_ids"] == ["personal-brief", "personal-second"]
@@ -143,8 +142,7 @@ def test_v2_workflow_merge_task_appends_word_documents_with_their_options(workfl
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Minutes book")
     labelled(page, "Description").first.fill("Appends the meeting minutes into one Word document.")
     labelled(page, "Runner type").select_option("agent")
@@ -169,7 +167,7 @@ def test_v2_workflow_merge_task_appends_word_documents_with_their_options(workfl
     page.get_by_role("checkbox", name=re.compile("^Add source headings")).check(force=True)
 
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     action = workflow_post(ui).body["tasks"][0]["document_action"]
     assert (action["type"], action["merge_kind"], action["output_format"]) == ("merge", "docx", "docx")
     assert action["document_ids"] == ["personal-second", "personal-brief"]
@@ -181,8 +179,7 @@ def test_v2_workflow_merge_task_appends_powerpoint_decks_with_their_options(work
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
 
-    page.get_by_role("button", name="Create workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_be_visible()
+    create_workflow(page)
     labelled(page, "Workflow name").fill("Quarterly reviews")
     labelled(page, "Description").first.fill("Appends the review decks into one deck.")
     labelled(page, "Runner type").select_option("agent")
@@ -203,7 +200,7 @@ def test_v2_workflow_merge_task_appends_powerpoint_decks_with_their_options(work
     page.get_by_role("checkbox", name=re.compile("^Create one section per deck")).uncheck(force=True)
 
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     action = workflow_post(ui).body["tasks"][0]["document_action"]
     assert (action["type"], action["merge_kind"], action["output_format"]) == ("merge", "pptx", "pptx")
     assert action["document_ids"] == ["personal-brief", "personal-second"]
diff --git a/ui_tests/test_v2_workflow_publication_completion.py b/ui_tests/test_v2_workflow_publication_completion.py
index 12390083e..b7f4979d5 100644
--- a/ui_tests/test_v2_workflow_publication_completion.py
+++ b/ui_tests/test_v2_workflow_publication_completion.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_publication_completion.py
 """
 UI coverage for publication completion authoring and exact run inspection.
-Version: 0.261.127
+Version: 0.261.271
 Implemented in: 0.261.118
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 The production SPA uses a closed API fixture with serialized public publication
 status. Tests never publish a document, invoke a model, or contact a live service.
@@ -30,6 +31,12 @@
     publication_status,
     publication_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    edit_workflow,
+    open_workflow_runs,
+    workflow_editor,
+    workflow_editor_path,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -49,10 +56,10 @@ def open_editor(ui, scope="user", **viewport):
     if scope == "group":
         ui.open("/groups", **viewport)
         ui.select_group(GROUP_ID)
-        ui.page.get_by_role("button", name=f"Edit {record['name']}", exact=True).click()
+        edit_workflow(ui.page, record["name"])
     else:
-        ui.open(f"/workspace/workflows?workflow_id={record['id']}", **viewport)
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+        ui.open(workflow_editor_path(record["id"]), **viewport)
+    expect(workflow_editor(ui.page)).to_be_visible()
     return publication_fields(ui.page)
 
 
@@ -68,7 +75,7 @@ def policy_field(block):
 
 def save_editor(ui):
     ui.page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(ui.page)).to_have_count(0)
     return ui.workflow_writes[-1]
 
 
@@ -79,9 +86,8 @@ def open_run(ui, scope="user", **viewport):
         ui.select_group(GROUP_ID)
     else:
         ui.open("/workspace/workflows", **viewport)
-    row = ui.page.get_by_role("listitem").filter(has_text=record["name"]).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
+    runs = open_workflow_runs(ui.page, record["name"])
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
     expect(ui.page.get_by_text("Workflow execution history", exact=True)).to_be_visible()
     _, workflow_id, run_id = publication_key(scope)
     return execution_id(workflow_id, run_id, "publish")
@@ -117,7 +123,7 @@ def test_authoring_reopens_policy_and_clears_only_incompatible_destination_ids(p
     }
     assert write.body["definition_version"] == 3 and write.body["durable_execution"] is True
     assert write.query.get("group_id") == ([GROUP_ID] if scope == "group" else None)
-    page.get_by_role("button", name=f"Edit {saved_workflow(ui, scope)['name']}", exact=True).click()
+    edit_workflow(page, saved_workflow(ui, scope)["name"])
     expect(policy_field(publication_fields(page))).to_have_value(policy)
     assert not runtime_writes(ui)
 
@@ -161,7 +167,7 @@ def test_explicitly_returning_to_existing_behavior_removes_the_policy(publicatio
     block = open_editor(ui)
     policy_field(block).select_option("")
     assert "completion_policy" not in save_editor(ui).body["tasks"][1]["publication"]
-    page.get_by_role("button", name="Edit Publication workflow", exact=True).click()
+    edit_workflow(page, "Publication workflow")
     expect(policy_field(publication_fields(page))).to_have_value("")
 
 
@@ -186,7 +192,7 @@ def test_unsupported_completion_semantics_preserve_payload_read_only(publication
     ui.publication_policies = capabilities
     record.pop("active_run_id", None)
     ui.workflow_runs[record["id"]] = []
-    ui.open(f"/workspace/workflows?workflow_id={record['id']}")
+    ui.open(workflow_editor_path(record["id"]))
     expect(page.get_by_role("alert").filter(has_text="completion polic")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     expect(page.get_by_label("Workflow name", exact=True)).to_be_disabled()
@@ -444,7 +450,7 @@ def test_mobile_keyboard_policy_selection_preserves_task_and_flow_identity(publi
     save = page.get_by_role("button", name="Save workflow", exact=True)
     save.focus()
     save.press("Enter")
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     payload = ui.workflow_writes[-1].body
     assert payload["tasks"][1]["publication"]["completion_policy"] == "approved"
     assert payload["flow"] == original["flow"]
diff --git a/ui_tests/test_v2_workflow_repeat_until.py b/ui_tests/test_v2_workflow_repeat_until.py
index b84f56c50..b87bcdfcc 100644
--- a/ui_tests/test_v2_workflow_repeat_until.py
+++ b/ui_tests/test_v2_workflow_repeat_until.py
@@ -1,9 +1,10 @@
 # test_v2_workflow_repeat_until.py
 """
 Local closed-browser regressions for typed Repeat until and manual continuation.
-Version: 0.261.231
+Version: 0.261.271
 Implemented in: 0.261.120
 source_snapshot_changed stopped being authoritative in: 0.261.231
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 Exercises the actual built V2 SPA, strict guards, scoped API requests and production
 definition normalization. Fixtures intercept every request; no live workflow runs.
@@ -35,6 +36,14 @@
     state_binding,
     workflow_repeat_ui,  # noqa: F401
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    CREATE_WORKFLOW,
+    create_workflow,
+    edit_workflow,
+    open_workflow_runs,
+    workflow_editor,
+    workflow_editor_path,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -56,16 +65,16 @@ def open_repeat(ui, *, group=False, **kwargs):
     if group:
         ui.open("/groups", **kwargs)
         ui.select_group(GROUP_ID)
-        ui.page.get_by_role("button", name="Edit Group Repeat review", exact=True).click()
+        edit_workflow(ui.page, "Group Repeat review")
     else:
-        ui.open(f"/workspace/workflows?workflow_id={REPEAT_WORKFLOW_ID}", **kwargs)
+        ui.open(workflow_editor_path(REPEAT_WORKFLOW_ID), **kwargs)
     return repeat_block(ui.page)
 
 
 def test_author_repeat_with_explicit_maximum_next_state_and_typed_condition(workflow_repeat_ui):
     ui, page = workflow_repeat_ui, workflow_repeat_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Create workflow", exact=True).click()
+    create_workflow(page)
     page.get_by_label("Workflow name", exact=True).fill("Authored Repeat review")
     page.get_by_label("Model", exact=True).select_option(label="Workspace GPT \u00b7 aoai")
     page.get_by_role("button", name="Enable structured control flow", exact=True).click()
@@ -117,7 +126,7 @@ def test_author_repeat_with_explicit_maximum_next_state_and_typed_condition(work
     repeat.get_by_label("Repeat export 1 output", exact=True).select_option("next_review")
     ui.assert_no_overflow()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Create workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page, CREATE_WORKFLOW)).to_have_count(0)
     payload = ui.workflow_writes[-1].body
     node = payload["flow"]["nodes"][1]
     assert node["kind"] == "repeat_until" and node["max_iterations"] == 2
@@ -133,10 +142,10 @@ def test_author_repeat_with_explicit_maximum_next_state_and_typed_condition(work
     }
     assert node["until"] == {"op": "eq", "left": {"input": "review", "path": "/ready"}, "right": {"literal": True}}
     assert node["exports"] == [{"name": "review", "output": "next_review"}]
-    page.get_by_role("button", name="Edit Authored Repeat review", exact=True).click()
+    edit_workflow(page, "Authored Repeat review")
     expect(page.get_by_label("Maximum rounds before manual continuation", exact=True)).to_have_value("2")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"] == payload["flow"]
     assert not any(request.path.endswith("/run") for request in ui.writes)
 
@@ -159,7 +168,7 @@ def test_personal_group_mobile_keyboard_roundtrip_preserves_all_typed_state(work
     save = page.get_by_role("button", name="Save workflow", exact=True)
     save.focus()
     save.press("Enter")
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     expected = copy.deepcopy(record["flow"])
     expected["nodes"][-1]["max_iterations"] = 3
     assert ui.workflow_writes[-1].body["flow"] == expected
@@ -178,7 +187,7 @@ def test_invalid_or_over_policy_maximum_is_not_clamped_or_saved(workflow_repeat_
     repeat.get_by_label("Maximum rounds before manual continuation", exact=True).fill(maximum)
     expect(repeat.get_by_role("alert")).to_contain_text("administrator ceiling" if maximum == "26" else "whole number from 1 to 1,000")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+    expect(workflow_editor(page)).to_be_visible()
     assert not ui.workflow_writes
     assert ui.personal_workflows[REPEAT_WORKFLOW_ID] == original
 
@@ -188,10 +197,9 @@ def open_repeat_run(ui, *, group=False, **kwargs):
     ui.open("/groups" if group else "/workspace/workflows", **kwargs)
     if group:
         ui.select_group(GROUP_ID)
-    row = page.get_by_role("listitem").filter(has_text="Group Repeat review" if group else "Repeat review").first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
-    return row
+    runs = open_workflow_runs(page, "Group Repeat review" if group else "Repeat review")
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
+    return runs
 
 
 def open_rounds(ui):
@@ -639,7 +647,7 @@ def test_current_repeat_collection_can_be_selected_for_saved_record_reporting(wo
     revise.get_by_label("Revise draft inputs input 3 state", exact=True).select_option(kind)
     revise.get_by_label("Large saved inputs", exact=True).select_option("saved_record_report")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     saved = ui.workflow_writes[-1].body["tasks"][2]
     assert saved["input_processing"] == "saved_record_report"
     assert saved["inputs"][2]["source"] == state_binding("unused", kind, kind)["source"]
@@ -678,7 +686,7 @@ def test_for_each_freezes_current_repeat_collection_with_typed_item_fields(workf
     expect(loop).to_contain_text("start of this Repeat round")
     expect(loop.get_by_label("If / else condition left field", exact=True)).to_have_value("/value/finding")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     saved_loop = ui.workflow_writes[-1].body["flow"]["nodes"][-1]["body"]["nodes"][0]
     assert saved_loop["inputs"] == [state_binding("rows", kind, kind)]
     assert saved_loop["body"]["nodes"][0]["condition"]["left"]["path"] == "/value/finding"
@@ -708,7 +716,7 @@ def test_nested_repeat_initial_state_is_explicitly_named_outer_state(workflow_re
     expect(nested.get_by_label("State 1 initial state", exact=True)).to_have_value("draft")
     nested.get_by_label("Maximum rounds before manual continuation", exact=True).fill("3")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     inner["max_iterations"] = 3
     assert ui.workflow_writes[-1].body["flow"] == record["flow"]
 
@@ -832,7 +840,7 @@ def test_repeat_state_contracts_cannot_coerce_or_silently_omit_atomic_next_slots
     open_repeat(ui)
     page.get_by_role("button", name="Save workflow", exact=True).click()
     expect(page.get_by_role("alert").filter(has_text="required, declared next body output" if invalid == "optional_next" else "exactly kind json")).to_be_visible()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+    expect(workflow_editor(page)).to_be_visible()
     assert not ui.workflow_writes
     assert ui.personal_workflows[REPEAT_WORKFLOW_ID] == original
 
@@ -844,7 +852,7 @@ def test_explicit_supported_batch_boundaries_save_exactly(workflow_repeat_ui, ma
     repeat = open_repeat(ui)
     repeat.get_by_label("Maximum rounds before manual continuation", exact=True).fill(str(maximum))
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"]["nodes"][-1]["max_iterations"] == maximum
 
 
@@ -857,7 +865,7 @@ def test_partial_current_state_pass_through_requires_explicit_opt_in(workflow_re
     repeat.get_by_label("Repeat body outputs input 3 allow partial", exact=True).check()
     expect(repeat.get_by_text("Partial coverage and limitations stay attached", exact=False)).to_be_visible()
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     node = ui.workflow_writes[-1].body["flow"]["nodes"][-1]
     assert node["state"][2]["output_contract"]["allow_partial"] is True
     assert node["body"]["outputs"][2]["source"] == {
@@ -885,7 +893,7 @@ def test_unsupported_repeat_definitions_stay_intact_and_read_only(workflow_repea
     else:
         record["tasks"][2]["inputs"][0]["source"]["iteration"] = 42
     original = copy.deepcopy(record)
-    ui.open(f"/workspace/workflows?workflow_id={REPEAT_WORKFLOW_ID}")
+    ui.open(workflow_editor_path(REPEAT_WORKFLOW_ID))
     expect(page.get_by_role("alert").filter(has_text="cannot safely save")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     assert ui.personal_workflows[REPEAT_WORKFLOW_ID] == original
@@ -902,7 +910,7 @@ def test_missing_repeat_capabilities_preserve_saved_definition_read_only(workflo
         ui.repeat_ceiling = None
     else:
         ui.repeat_hard_ceiling = None
-    ui.open(f"/workspace/workflows?workflow_id={REPEAT_WORKFLOW_ID}")
+    ui.open(workflow_editor_path(REPEAT_WORKFLOW_ID))
     expect(page.get_by_role("alert").filter(has_text="cannot safely save")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     expect(page.get_by_role("button", name="Add Repeat until to Main", exact=True)).to_have_count(0)
@@ -915,7 +923,7 @@ def test_invalid_advertised_repeat_hard_ceiling_never_enables_authoring(workflow
     ui, page = workflow_repeat_ui, workflow_repeat_ui.page
     original = copy.deepcopy(ui.personal_workflows[REPEAT_WORKFLOW_ID])
     ui.repeat_hard_ceiling = hard_ceiling
-    ui.open(f"/workspace/workflows?workflow_id={REPEAT_WORKFLOW_ID}")
+    ui.open(workflow_editor_path(REPEAT_WORKFLOW_ID))
     expect(page.get_by_role("alert").filter(has_text="invalid loop capabilities or limits")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     expect(page.get_by_role("button", name="Add Repeat until to Main", exact=True)).to_have_count(0)
@@ -940,7 +948,7 @@ def test_lowered_repeat_policy_preserves_schema_valid_authored_maximum(workflow_
     assert not ui.workflow_writes
     maximum.fill("25")
     page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(page)).to_have_count(0)
     assert ui.workflow_writes[-1].body["flow"]["nodes"][-1]["max_iterations"] == 25
 
 
diff --git a/ui_tests/test_v2_workflow_saved_output_publication.py b/ui_tests/test_v2_workflow_saved_output_publication.py
index b8f1752e1..594f1e46f 100644
--- a/ui_tests/test_v2_workflow_saved_output_publication.py
+++ b/ui_tests/test_v2_workflow_saved_output_publication.py
@@ -1,8 +1,9 @@
 # test_v2_workflow_saved_output_publication.py
 """
 Closed V2 List coverage for exact saved-record file publication.
-Version: 0.261.127
+Version: 0.261.271
 Implemented in: 0.261.119
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 
 The real production SPA saves through production definition validation. Fictional
 HTTP fixtures exercise scoped authoring, capability fallback, safe readback,
@@ -38,6 +39,12 @@
     saved_output_ui,  # noqa: F401
     use_saved_output,
 )
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    edit_workflow,
+    open_workflow_runs,
+    workflow_editor,
+    workflow_editor_path,
+)
 
 
 pytestmark = pytest.mark.ui
@@ -63,10 +70,10 @@ def open_editor(ui, scope="user", **viewport):
     if scope == "group":
         ui.open("/groups", **viewport)
         ui.select_group(GROUP_ID)
-        ui.page.get_by_role("button", name=f"Edit {record['name']}", exact=True).click()
+        edit_workflow(ui.page, record["name"])
     else:
-        ui.open(f"/workspace/workflows?workflow_id={record['id']}", **viewport)
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_be_visible()
+        ui.open(workflow_editor_path(record["id"]), **viewport)
+    expect(workflow_editor(ui.page)).to_be_visible()
     return publication_fields(ui.page)
 
 
@@ -88,12 +95,12 @@ def policy_field(block):
 
 def save_editor(ui):
     ui.page.get_by_role("button", name="Save workflow", exact=True).click()
-    expect(ui.page.get_by_role("dialog", name="Edit workflow", exact=True)).to_have_count(0)
+    expect(workflow_editor(ui.page)).to_have_count(0)
     return ui.workflow_writes[-1]
 
 
 def reopen_editor(ui, scope="user"):
-    ui.page.get_by_role("button", name=f"Edit {saved_workflow(ui, scope)['name']}", exact=True).click()
+    edit_workflow(ui.page, saved_workflow(ui, scope)["name"])
     return publication_fields(ui.page)
 
 
@@ -325,7 +332,7 @@ def test_saved_output_requires_v3_durable_without_down_conversion(saved_output_u
     publication_task(record)["publication"].pop("completion_policy")
     record.update(definition_version=version, durable_execution=durable)
     original = copy.deepcopy(record)
-    open_editor(ui) if version == 3 else ui.open(f"/workspace/workflows?workflow_id={record['id']}")
+    open_editor(ui) if version == 3 else ui.open(workflow_editor_path(record["id"]))
     expect(page.get_by_role("alert").filter(has_text="durable definition-v3")).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     assert record["tasks"] == original["tasks"]
@@ -464,8 +471,8 @@ def test_list_keyboard_source_join_and_completion_controls_fit_viewport(saved_ou
     policy.press("ArrowUp")
     expect(policy).to_have_value("approved")
     ui.assert_no_overflow()
-    dialog = page.get_by_role("dialog", name="Edit workflow", exact=True)
-    assert dialog.evaluate("element => element.scrollWidth <= element.clientWidth + 1")
+    editor = workflow_editor(page)
+    assert editor.evaluate("element => element.scrollWidth <= element.clientWidth + 1")
     for control in (source, producer, format_field(block), policy):
         control.scroll_into_view_if_needed()
         box = control.bounding_box()
@@ -473,7 +480,7 @@ def test_list_keyboard_source_join_and_completion_controls_fit_viewport(saved_ou
     save = page.get_by_role("button", name="Save workflow", exact=True)
     save.focus()
     save.press("Enter")
-    expect(dialog).to_have_count(0)
+    expect(editor).to_have_count(0)
     payload = ui.workflow_writes[-1].body
     assert payload["flow"] == original["flow"]
     assert [task["id"] for task in payload["tasks"]] == [task["id"] for task in original["tasks"]]
@@ -491,9 +498,9 @@ def test_list_keyboard_source_join_and_completion_controls_fit_viewport(saved_ou
 def test_malformed_publication_capabilities_fail_closed(saved_output_ui, capabilities):
     ui, page = saved_output_ui, saved_output_ui.page
     ui.option_overrides["publication_source_capabilities"] = capabilities
-    ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Edit Publication workflow", exact=True).click()
-    expect(page.get_by_role("alert").filter(has_text="invalid publication source capabilities")).to_be_visible()
+    ui.open(workflow_editor_path(saved_workflow(ui)["id"]))
+    expect(page.get_by_text("The workflow editor could not load", exact=True)).to_be_visible()
+    expect(page.get_by_text("invalid publication source capabilities", exact=False)).to_be_visible()
     expect(page.get_by_role("button", name="Save workflow", exact=True)).to_have_count(0)
     assert not ui.workflow_writes
 
@@ -522,9 +529,8 @@ def test_saved_export_keeps_exact_attempt_completion_and_unavailable_readback(sa
     ui.open("/groups" if scope == "group" else "/workspace/workflows", width=390, height=844)
     if scope == "group":
         ui.select_group(GROUP_ID)
-    row = page.get_by_role("listitem").filter(has_text=saved_workflow(ui, scope)["name"]).first
-    row.get_by_role("button", name="Show run history", exact=True).click()
-    row.get_by_role("button", name="Show run task results", exact=True).click()
+    runs = open_workflow_runs(page, saved_workflow(ui, scope)["name"])
+    runs.get_by_role("button", name="Show run task results", exact=True).click()
     page.get_by_role("button", name=f"Show execution attempts for {eid}", exact=True).click()
     details = page.get_by_role("region", name=f"Publication for execution {eid} attempt 2", exact=True)
     expect(details).to_contain_text(status["id"])
diff --git a/ui_tests/test_v2_workflow_settings_errors.py b/ui_tests/test_v2_workflow_settings_errors.py
index 52b8c8b11..1b6c7d6be 100644
--- a/ui_tests/test_v2_workflow_settings_errors.py
+++ b/ui_tests/test_v2_workflow_settings_errors.py
@@ -1,7 +1,8 @@
 # test_v2_workflow_settings_errors.py
 """
 UI tests for reviewed workflow settings errors, deleted File Sync sources and deleted workflows.
-Version: 0.261.207
+Version: 0.261.271
+The Workflows workbench and the routed editor page replace the list rows and the editor dialog: 0.261.271
 Implemented in: 0.261.149
 
 These tests use the real V2 SPA bundle with the closed workflow fixture. The fixture validates both
@@ -52,6 +53,11 @@
     workflow_post,
 )
 
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    edit_workflow,
+    workflow_editor,
+)
+
 
 pytestmark = pytest.mark.ui
 SOURCE_UNAVAILABLE = "A selected File Sync source is no longer available. Remove it and save again."
@@ -67,14 +73,14 @@ def save(page):
 
 
 def edit_dialog(page):
-    return page.get_by_role("dialog", name="Edit workflow", exact=True)
+    return workflow_editor(page)
 
 
 def test_a_group_source_deleted_after_opening_keeps_the_draft_and_marks_the_source(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.group_workflows[GROUP_ID][MONITOR_ID] = monitored_workflow()
     open_group_workflows(ui)
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     expect(source_checkbox(page, "Finance share (Group)")).to_be_checked()
     labelled(page, "Description").first.fill("Edited while the share was removed.")
     lists_before = len(source_requests(ui))
@@ -114,7 +120,7 @@ def test_a_personal_source_deleted_after_opening_keeps_the_draft_and_marks_the_s
     ui, page = workflow_ui, workflow_ui.page
     ui.personal_workflows[WORKFLOW_ID]["file_sync"] = copy.deepcopy(PERSONAL_MONITOR_FILE_SYNC)
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+    edit_workflow(page, "Quarterly review workflow")
     home = source_checkbox(page, "Home share (Personal)")
     expect(home).to_be_checked()
     labelled(page, "Description").first.fill("Edited after the personal share was removed.")
@@ -159,7 +165,7 @@ def test_saving_a_workflow_deleted_after_opening_keeps_the_draft_and_explains_wh
     else:
         workflows, name, workflow_id = ui.personal_workflows, "Quarterly review workflow", WORKFLOW_ID
         ui.open("/workspace/workflows")
-    page.get_by_role("button", name=f"Edit {name}", exact=True).click()
+    edit_workflow(page, name)
     labelled(page, "Description").first.fill("Edited after someone deleted the workflow.")
     del workflows[workflow_id]
 
@@ -181,7 +187,7 @@ def test_saving_a_workflow_deleted_after_opening_keeps_the_draft_and_explains_wh
 def test_personal_schedules_are_checked_before_saving_with_the_server_message(workflow_ui):
     ui, page = workflow_ui, workflow_ui.page
     ui.open("/workspace/workflows")
-    page.get_by_role("button", name="Edit Quarterly review workflow", exact=True).click()
+    edit_workflow(page, "Quarterly review workflow")
     labelled(page, "Trigger").select_option("interval")
     labelled(page, "Interval unit").select_option("minutes")
     labelled(page, "Interval value").fill("90")
@@ -209,7 +215,7 @@ def test_group_file_sync_turned_off_applies_the_servers_gate_without_marking_sou
     ui.group_workflows[GROUP_ID][MONITOR_ID] = record
     ui.group_file_sync_enabled[GROUP_ID] = False
     open_group_workflows(ui)
-    page.get_by_role("button", name="Edit Monitor finance drops", exact=True).click()
+    edit_workflow(page, "Monitor finance drops")
     expect(page.get_by_text(
         "Group File Sync is not enabled, so this group's sources cannot be listed. "
         "Your selection is kept, but it cannot be checked.", exact=True,
diff --git a/ui_tests/test_v2_workflows_workbench_and_editor_layout.py b/ui_tests/test_v2_workflows_workbench_and_editor_layout.py
new file mode 100644
index 000000000..865f87e06
--- /dev/null
+++ b/ui_tests/test_v2_workflows_workbench_and_editor_layout.py
@@ -0,0 +1,365 @@
+# test_v2_workflows_workbench_and_editor_layout.py
+"""
+UI tests for the V2 Workflows workbench and editor in the Admin Settings design language.
+Version: 0.261.271
+Implemented in: 0.261.271
+
+These tests drive the real V2 SPA bundle against the closed workflow API fixture. They check the
+layout the redesign promises, which the behavioural workflow suites don't: one-line rows beside a
+detail pane, keyboard movement through the list and the tabs, a run link that selects its workflow
+and opens the run, editor cards that carry Admin's status chips with an On this page index that
+moves focus, fields beside their labels that stack on a narrow screen, independent switches
+paired on a wide card, settings nested under the control that leads them, the leave prompt, the
+return to the saved workflow, and no horizontal overflow at 390px, 1440px and 1920px, in light and
+dark themes and at 200% text.
+"""
+
+import re
+import sys
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT))
+sys.path.insert(0, str(ROOT / "ui_tests"))
+sys.path.insert(0, str(ROOT / "ui_tests" / "fixtures"))
+
+from ui_tests.fixtures.workflow_editor import (  # noqa: E402
+    DURABLE_WORKFLOW_ID,
+    WORKFLOW_ID,
+    connect_options,  # noqa: F401
+    workflow_ui,  # noqa: F401
+)
+from ui_tests.fixtures.workflow_workbench import (  # noqa: E402
+    discard_and_leave,
+    edit_workflow,
+    leave_prompt,
+    select_workflow,
+    workflow_detail,
+    workflow_editor,
+    workflow_editor_path,
+    workflow_list,
+    workflow_row,
+)
+
+
+pytestmark = pytest.mark.ui
+
+QUARTERLY = "Quarterly review workflow"
+AGENT = "Agent review workflow"
+ROW_NAMES = (
+    QUARTERLY,
+    AGENT,
+    "Legacy prompt workflow",
+    "Active running workflow",
+    "Durable approval workflow",
+    "Future workflow",
+)
+
+
+def box(locator):
+    rectangle = locator.bounding_box()
+    assert rectangle, "Expected a rendered element."
+    return rectangle
+
+
+def card(page, name):
+    return workflow_editor(page).get_by_role("region", name=name, exact=True)
+
+
+def assert_editor_fits(page):
+    scroll = page.locator("[data-workflow-editor-scroll]")
+    overflow = scroll.evaluate("element => element.scrollWidth - element.clientWidth")
+    assert overflow <= 1, f"The editor overflows its scroll area by {overflow}px"
+
+
+def use_text_size(ui, size):
+    """Reload with the user's text size, as the account preference sets it."""
+    ui.preferences["fontSizePreference"] = size
+    ui.page.reload(wait_until="networkidle")
+    expect(ui.page.locator("html")).to_have_attribute("data-font-size", size)
+
+
+@pytest.mark.parametrize("theme", ["light", "dark"])
+def test_rows_read_as_one_line_beside_the_selected_workflow(workflow_ui, theme):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open("/workspace/workflows", theme=theme, width=1920, height=1080)
+
+    for name in ROW_NAMES:
+        row = workflow_row(page, name)
+        expect(row).to_be_visible()
+        assert box(row)["height"] < 56, f"{name} should read as a single line"
+    # A row names its trigger in a word; the detail says it in full.
+    quarterly = workflow_row(page, QUARTERLY)
+    expect(quarterly).to_contain_text("Manual")
+    expect(quarterly).not_to_contain_text("runs only when started")
+    # The status leads the row in words, not only as an icon.
+    expect(workflow_row(page, "Active running workflow")).to_contain_text("Running · Manual")
+
+    # The first workflow is selected, and its detail sits beside the list rather than below it.
+    expect(quarterly).to_have_attribute("aria-pressed", "true")
+    detail = workflow_detail(page, QUARTERLY)
+    expect(detail.locator("header").get_by_text("Manual · runs only when started", exact=True)).to_be_visible()
+    assert box(workflow_list(page))["x"] + box(workflow_list(page))["width"] <= box(detail)["x"] + 1
+    expect(detail.get_by_role("tab", name="Overview", exact=True)).to_have_attribute("aria-selected", "true")
+    overview = detail.get_by_role("tabpanel", name="Overview", exact=True)
+    for label in ("Runner", "Workflow enabled", "Trigger and schedule", "File Sync", "Execution",
+                  "Shared references", "Tasks", "Alerts"):
+        expect(overview.get_by_text(label, exact=True)).to_be_visible()
+    # Only a structured workflow offers Flow.
+    expect(detail.get_by_role("tab", name="Flow", exact=True)).to_have_count(0)
+
+    active = workflow_row(page, "Active running workflow")
+    expect(active).to_have_accessible_description(re.compile(r"^Running · Manual"))
+    ui.assert_no_overflow()
+
+
+def test_a_finished_run_reads_from_the_last_run_status_the_server_records(workflow_ui):
+    """The server sets a workflow back to idle when a run ends and records the outcome in
+    last_run_status, so that is what the row, the detail, Last run and Needs attention read."""
+    ui, page = workflow_ui, workflow_ui.page
+    ui.personal_workflows["agent-workflow"].update(
+        status="idle", last_run_status="failed", last_run_at="2026-09-16T12:00:00Z",
+    )
+    ui.personal_workflows[WORKFLOW_ID].update(status="idle", last_run_status="completed")
+    ui.open("/workspace/workflows", width=1440, height=900)
+
+    expect(workflow_row(page, AGENT)).to_contain_text("Failed · Manual")
+    expect(workflow_row(page, QUARTERLY)).to_contain_text("Completed · Manual")
+    expect(page.get_by_text("1 needs attention", exact=True)).to_be_visible()
+
+    detail = select_workflow(page, AGENT)
+    expect(detail.locator("header").get_by_text("Failed", exact=True)).to_be_visible()
+    last_run = detail.get_by_role("tabpanel", name="Overview", exact=True).get_by_text(re.compile(r"^Failed · "))
+    expect(last_run).to_be_visible()
+
+    page.get_by_label("Status", exact=True).select_option("attention")
+    expect(workflow_list(page).get_by_role("button")).to_have_count(1)
+    expect(workflow_row(page, AGENT)).to_be_visible()
+    page.get_by_label("Status", exact=True).select_option("completed")
+    expect(workflow_row(page, QUARTERLY)).to_be_visible()
+    expect(workflow_row(page, AGENT)).to_have_count(0)
+
+
+def test_choosing_a_workflow_on_a_narrow_screen_brings_its_detail_into_view(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    page.emulate_media(reduced_motion="reduce")
+    ui.open("/workspace/workflows", width=390, height=844)
+    row = workflow_row(page, "Future workflow")
+    row.scroll_into_view_if_needed()
+    row.click()
+    heading = workflow_detail(page, "Future workflow").get_by_role("heading", name="Future workflow", level=3)
+    expect(heading).to_be_in_viewport()
+    # Choosing moves the view, not focus: the list keeps the keyboard.
+    expect(row).to_be_focused()
+
+
+def test_the_list_and_the_tabs_follow_the_keyboard(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open("/workspace/workflows", width=1440, height=900)
+    rows = workflow_list(page).get_by_role("button")
+    expect(rows).to_have_count(len(ROW_NAMES))
+    # One tab stop for the whole list.
+    expect(workflow_list(page).locator("button[tabindex='0']")).to_have_count(1)
+
+    first = workflow_row(page, QUARTERLY)
+    first.focus()
+    page.keyboard.press("ArrowDown")
+    expect(workflow_row(page, AGENT)).to_be_focused()
+    # Moving focus doesn't change the selection; choosing does.
+    expect(first).to_have_attribute("aria-pressed", "true")
+    page.keyboard.press("End")
+    expect(workflow_row(page, ROW_NAMES[-1])).to_be_focused()
+    page.keyboard.press("Home")
+    expect(first).to_be_focused()
+    page.keyboard.press("ArrowDown")
+    page.keyboard.press("Enter")
+    expect(workflow_row(page, AGENT)).to_have_attribute("aria-pressed", "true")
+    expect(workflow_list(page).locator("button[tabindex='0']")).to_have_count(1)
+
+    detail = workflow_detail(page, AGENT)
+    overview = detail.get_by_role("tab", name="Overview", exact=True)
+    runs = detail.get_by_role("tab", name="Runs", exact=True)
+    overview.focus()
+    page.keyboard.press("ArrowRight")
+    expect(runs).to_be_focused()
+    expect(runs).to_have_attribute("aria-selected", "true")
+    expect(detail.get_by_role("tabpanel", name="Runs", exact=True)).to_contain_text("The most recent runs.")
+    page.keyboard.press("Home")
+    expect(overview).to_be_focused()
+    expect(overview).to_have_attribute("aria-selected", "true")
+    page.keyboard.press("End")
+    expect(runs).to_have_attribute("aria-selected", "true")
+    page.keyboard.press("ArrowRight")
+    expect(overview).to_have_attribute("aria-selected", "true")
+
+
+def test_a_run_link_selects_its_workflow_and_opens_the_run(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open(f"/workspace/workflows?workflow_id={DURABLE_WORKFLOW_ID}&run_id=durable-run-1")
+
+    name = "Durable approval workflow"
+    expect(workflow_row(page, name)).to_have_attribute("aria-pressed", "true")
+    detail = workflow_detail(page, name)
+    expect(detail.get_by_role("heading", name=name, level=3)).to_be_focused()
+    expect(detail.get_by_role("tab", name="Runs", exact=True)).to_have_attribute("aria-selected", "true")
+    runs = detail.get_by_role("tabpanel", name="Runs", exact=True)
+    # The linked run is expanded: its gate is on screen without asking for the task results.
+    expect(runs.get_by_text("Approval is required before Approval task starts.", exact=False).first).to_be_visible()
+
+    # A workflow link without a run shows the workflow's Overview.
+    ui.open(f"/workspace/workflows?workflow_id={WORKFLOW_ID}")
+    expect(workflow_row(page, QUARTERLY)).to_have_attribute("aria-pressed", "true")
+    expect(workflow_detail(page, QUARTERLY).get_by_role("tab", name="Overview", exact=True)).to_have_attribute(
+        "aria-selected", "true"
+    )
+    expect(workflow_editor(page)).to_have_count(0)
+
+
+def test_editor_cards_carry_admin_status_and_the_index_moves_focus(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    page.emulate_media(reduced_motion="reduce")
+    ui.open(workflow_editor_path(WORKFLOW_ID), width=1920, height=1080)
+    editor = workflow_editor(page)
+    expect(editor).to_be_visible()
+    expect(editor.get_by_role("heading", name=QUARTERLY, level=2)).to_be_focused()
+
+    for name in ("Workflow basics", "Trigger and schedule", "File Sync", "Execution",
+                 "Workflow shared references", "Workflow tasks", "Alerts"):
+        expect(card(page, name)).to_be_visible()
+    expect(card(page, "Limits")).to_have_count(0)
+    basics = card(page, "Workflow basics")
+    expect(basics.get_by_text("Configured", exact=True)).to_be_visible()
+    expect(card(page, "File Sync").get_by_text("Off", exact=True).first).to_be_visible()
+    expect(card(page, "Execution").get_by_text("Halt on failure · 1 retry", exact=True)).to_be_visible()
+
+    index = editor.get_by_role("navigation", name="On this page", exact=True)
+    expect(index).to_be_visible()
+    expect(index).to_contain_text("7 sections")
+    entries = index.get_by_role("link")
+    expect(entries).to_have_count(7)
+    expect(index.get_by_role("link", name=re.compile(r"^Basics\b"))).to_contain_text("Configured")
+
+    # A section that isn't ready says so on its card and in the index, as Admin's do.
+    page.get_by_label(re.compile(r"^Workflow name")).fill("")
+    expect(basics.get_by_text("Needs configuration", exact=True)).to_be_visible()
+    expect(index.get_by_role("link", name=re.compile(r"^Basics\b"))).to_contain_text("Needs configuration")
+    expect(index).to_contain_text("1 needs attention")
+    page.get_by_label(re.compile(r"^Workflow name")).fill(QUARTERLY)
+    expect(basics.get_by_text("Configured", exact=True)).to_be_visible()
+
+    index.get_by_role("link", name=re.compile(r"^Alerts\b")).click()
+    alerts_title = card(page, "Alerts").get_by_role("heading", name="Alerts", exact=True)
+    expect(alerts_title).to_be_focused()
+    expect(alerts_title).to_be_in_viewport()
+    expect(index.get_by_role("link", name=re.compile(r"^Alerts\b"))).to_have_attribute("aria-current", "location")
+
+
+def test_fields_sit_beside_their_labels_and_stack_when_narrow(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open(workflow_editor_path(WORKFLOW_ID), width=1920, height=1080)
+    basics = card(page, "Workflow basics")
+    label = basics.locator("label", has_text="Workflow name").first
+    field = page.get_by_label(re.compile(r"^Workflow name"))
+    label_box, field_box = box(label), box(field)
+    assert label_box["x"] + label_box["width"] <= field_box["x"], "A wide card puts the label beside its control"
+    assert abs(label_box["y"] - field_box["y"]) < field_box["height"], "A label and its control share a row"
+
+    # The runner's model belongs to Runner type, so it sits indented under it.
+    runner = page.get_by_label("Runner type", exact=True)
+    dependent = basics.locator("[data-setting-emphasis='dependent']").filter(has=page.get_by_label("Model", exact=True))
+    expect(dependent).to_have_count(1)
+    assert box(dependent)["x"] > box(basics.locator("label", has_text="Runner type").first)["x"]
+    assert box(dependent)["y"] > box(runner)["y"]
+
+    # Independent switches pair up on a wide card.
+    durable = page.get_by_role("checkbox", name=re.compile(r"^Durable execution"))
+    capabilities = page.get_by_role("checkbox", name=re.compile(r"^Chat capabilities enabled"))
+    durable_row = card(page, "Execution").locator(".admin-switch-row").filter(has=durable)
+    capabilities_row = card(page, "Execution").locator(".admin-switch-row").filter(has=capabilities)
+    assert abs(box(durable_row)["y"] - box(capabilities_row)["y"]) < 4, "Two switches share a row on a wide card"
+    assert box(durable_row)["x"] < box(capabilities_row)["x"]
+
+    # Reopened at phone width, so the shell collapses its rails as it does on a phone.
+    ui.open(workflow_editor_path(WORKFLOW_ID), width=390, height=844)
+    basics = card(page, "Workflow basics")
+    label = basics.locator("label", has_text="Workflow name").first
+    field = page.get_by_label(re.compile(r"^Workflow name"))
+    expect(field).to_be_visible()
+    label_box, field_box = box(label), box(field)
+    assert label_box["y"] + label_box["height"] <= field_box["y"] + 1, "A narrow card stacks the label above its control"
+    durable = page.get_by_role("checkbox", name=re.compile(r"^Durable execution"))
+    capabilities = page.get_by_role("checkbox", name=re.compile(r"^Chat capabilities enabled"))
+    durable_row = card(page, "Execution").locator(".admin-switch-row").filter(has=durable)
+    capabilities_row = card(page, "Execution").locator(".admin-switch-row").filter(has=capabilities)
+    assert abs(box(durable_row)["x"] - box(capabilities_row)["x"]) < 4, "Switches stack on a narrow card"
+    assert box(durable_row)["y"] < box(capabilities_row)["y"]
+    # The page header has room to name the Changes panel in words at every width.
+    changes = workflow_editor(page).get_by_role("button", name=re.compile(r"^Changes \("))
+    expect(changes.get_by_text("Changes", exact=True)).to_be_visible()
+    ui.assert_no_overflow()
+    assert_editor_fits(page)
+
+
+def test_leaving_with_unsaved_changes_asks_and_saving_returns_to_the_workflow(workflow_ui):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open("/workspace/workflows")
+    editor = edit_workflow(page, AGENT)
+    description = page.get_by_label(re.compile(r"^Description")).first
+    description.fill("An unsaved description.")
+
+    editor.get_by_role("button", name="Back", exact=True).click()
+    prompt = leave_prompt(page)
+    expect(prompt).to_be_visible()
+    prompt.get_by_role("button", name="Keep editing", exact=True).click()
+    expect(prompt).to_have_count(0)
+    expect(description).to_have_value("An unsaved description.")
+
+    editor.get_by_role("button", name="Cancel", exact=True).click()
+    discard_and_leave(page)
+    expect(workflow_editor(page)).to_have_count(0)
+    expect(workflow_row(page, AGENT)).to_have_attribute("aria-pressed", "true")
+    assert not ui.workflow_writes
+
+    editor = edit_workflow(page, AGENT)
+    page.get_by_label(re.compile(r"^Description")).first.fill("A saved description.")
+    editor.get_by_role("button", name="Save workflow", exact=True).click()
+    expect(workflow_editor(page)).to_have_count(0)
+    expect(leave_prompt(page)).to_have_count(0)
+    expect(page).to_have_url(re.compile(r"/v2/workspace/workflows\?workflow_id=agent-workflow$"))
+    expect(page.get_by_role("status").filter(has_text="Workflow saved.")).to_be_visible()
+    expect(workflow_row(page, AGENT)).to_have_attribute("aria-pressed", "true")
+    expect(workflow_detail(page, AGENT).get_by_role("heading", name=AGENT, level=3)).to_be_focused()
+    writes = [entry for entry in ui.workflow_writes if entry.method == "POST"]
+    assert len(writes) == 1
+    assert writes[0].body["description"] == "A saved description."
+
+
+@pytest.mark.parametrize("theme,width,height,text_size", [
+    ("light", 390, 844, "m"),
+    ("dark", 1440, 900, "m"),
+    ("light", 1920, 1080, "xl"),
+])
+def test_the_workbench_and_editor_never_overflow(workflow_ui, theme, width, height, text_size):
+    ui, page = workflow_ui, workflow_ui.page
+    ui.open("/workspace/workflows", theme=theme, width=width, height=height)
+    if text_size != "m":
+        use_text_size(ui, text_size)
+    expect(workflow_row(page, QUARTERLY)).to_be_visible()
+    ui.assert_no_overflow()
+    detail = workflow_detail(page, QUARTERLY)
+    detail.get_by_role("tab", name="Runs", exact=True).click()
+    expect(detail.get_by_role("tabpanel", name="Runs", exact=True)).to_be_visible()
+    ui.assert_no_overflow()
+
+    detail.get_by_role("button", name=f"Edit {QUARTERLY}", exact=True).click()
+    editor = workflow_editor(page)
+    expect(editor).to_be_visible()
+    ui.assert_no_overflow()
+    assert_editor_fits(page)
+    for name in ("Trigger and schedule", "Workflow tasks", "Alerts"):
+        card(page, name).scroll_into_view_if_needed()
+        ui.assert_no_overflow()
+        assert_editor_fits(page)