diff --git a/README.md b/README.md
index d3c5eb1..9e9100d 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,20 @@ docker compose up -d    # picks up the changed .env
 — five agents in series building a classifier on a public dataset. It picks up
 exactly where this step leaves off.
 
+## Persona library
+
+Add a Persona node and choose a built-in preset or a saved persona in its
+inspector. Uploading a plain `.md` file saves a reusable library entry named
+from the filename and copies its text into the node or factor level. No
+frontmatter, description, or personality metadata is required. The original
+local file is unchanged.
+
+Use **Manage personas / Save current** in the node inspector or persona factor
+editor to save typed instructions, edit library entries, or delete them.
+Existing nodes and factor levels retain their copied text; choose an entry
+again to use its latest revision. Published experiments keep their frozen
+persona text even if the library entry is later edited or deleted.
+
 ## Measurements and Results
 
 The Design panel offers built-in runtime and supervised-ML metrics with their
diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts
index a6fdb7d..dc685bd 100644
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -33,6 +33,7 @@ import type { OkfBundle, OkfDocument } from '@/types/okf'
 import type { CellRunBatch, DatasetRowSchema, PromptPreview, Protocol, ProtocolGraph, ProtocolRevision, ProtocolRun, TestRun } from '@/types/protocols'
 import type { Run, RunStep } from '@/types/runs'
 import type { Skill, SkillListResponse, SkillUrlPreview } from '@/types/skills'
+import type { Persona } from '@/types/personas'
 import type { AttemptDetail, AttemptPage, CursorPage, ExecutionCell, ExecutionSlot, ExecutionSummary, ResultJob } from '@/types/executionResults'
 
 const ACCESS_TOKEN_KEY = 'asaree_access_token'
@@ -189,7 +190,7 @@ export interface ResultsScope {
   protocol_revision_id?: string
 }
 
-export interface RowSelection { row_index?: number | null; sub_agent_selections?: Record<string, string>; script_selections?: Record<string, string>; tool_selections?: Record<string, string>; skill_selections?: Record<string, string>; dataset_selections?: Record<string, string>; knowledge_selections?: Record<string, string> }
+export interface RowSelection { row_index?: number | null; sub_agent_selections?: Record<string, string>; script_selections?: Record<string, string>; tool_selections?: Record<string, string>; skill_selections?: Record<string, string>; persona_selections?: Record<string, string>; dataset_selections?: Record<string, string>; knowledge_selections?: Record<string, string> }
 
 function scopeQuery(scope?: ResultsScope): string {
   const params = new URLSearchParams()
@@ -497,6 +498,20 @@ export const mcpServersApi = {
   remove: (id: string) => request<void>(`/mcp-servers/${id}`, { method: 'DELETE' }),
 }
 
+export const personasApi = {
+  list: () => request<Persona[]>('/personas'),
+  create: (data: { prompt: string; name?: string; description?: string | null; traits?: Record<string, unknown> }) =>
+    request<Persona>('/personas', { method: 'POST', body: data }),
+  upload: (file: File) => {
+    const form = new FormData()
+    form.set('file', file)
+    return request<Persona>('/personas/upload', { method: 'POST', body: form })
+  },
+  update: (id: string, data: { expected_revision: number; name?: string; prompt?: string; description?: string | null; traits?: Record<string, unknown> }) =>
+    request<Persona>(`/personas/${id}`, { method: 'PATCH', body: data }),
+  remove: (id: string) => request<void>(`/personas/${id}`, { method: 'DELETE' }),
+}
+
 export const skillsApi = {
   // The caller's own skills plus any global system skill -- GET /skills
   // returns {items,total}, unwrapped here so callers get a plain array like
diff --git a/frontend/src/components/protocol/AddNodePanel.tsx b/frontend/src/components/protocol/AddNodePanel.tsx
index 3cc71ee..3fb3ef4 100644
--- a/frontend/src/components/protocol/AddNodePanel.tsx
+++ b/frontend/src/components/protocol/AddNodePanel.tsx
@@ -1,7 +1,11 @@
+import { PERSONA_BROWSE } from './personaCatalog'
 import { useState } from 'react'
 import { ArrowRight, Atom, BookMarked, Bot, Braces, BrainCircuit, Cloud, Code2, Cog, Database, FileText, HardDrive, Repeat2, Route, ScrollText, ShieldCheck, Server, Sparkles, User, X } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { DATASET_BROWSE } from './datasetCatalog'
 import { MCP_SERVER_BROWSE } from './mcpServerCatalog'
 import { OKF_BUNDLE_BROWSE, OKF_DOCUMENT_BROWSE } from './okfCatalog'
@@ -17,6 +21,16 @@ const NODE_CATEGORIES = [
 
 type NodeCategory = (typeof NODE_CATEGORIES)[number]['id']
 
+// Library entries create nodes of these kinds; all model providers share a hue.
+const CATALOG_ACCENT_KINDS: Record<string, string> = {
+  [PERSONA_BROWSE]: 'persona',
+  [DATASET_BROWSE]: 'dataset',
+  [MCP_SERVER_BROWSE]: 'mcp_tool',
+  [SKILL_BROWSE]: 'skill',
+  [OKF_BUNDLE_BROWSE]: 'okf_bundle',
+  [OKF_DOCUMENT_BROWSE]: 'okf_document',
+}
+
 // Every entry here earns its place: GET /api/mcp-servers already backs the
 // tool picker, GET /datasets already backs the dataset picker,
 // services.protocol_execution._run_gated_worker already implements the
@@ -108,10 +122,10 @@ const NODE_CATALOG = [
     icon: BrainCircuit,
   },
   {
-    type: 'persona',
+    type: PERSONA_BROWSE,
     category: 'knowledge',
-    label: 'Persona',
-    description: 'OCEAN personality traits for experimental manipulation of agent behavior',
+    label: 'Personas',
+    description: 'Browse persona instructions for an Agent',
     icon: User,
   },
   // Not a node type either -- picking this opens the dataset browser
@@ -207,7 +221,7 @@ export function AddNodePanel({
   })
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex items-center justify-between">
         <p className="text-sm font-semibold">{title}</p>
         <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={onClose}>
@@ -215,7 +229,7 @@ export function AddNodePanel({
         </Button>
       </div>
       <Input autoFocus placeholder="Search node types…" value={query} onChange={(e) => setQuery(e.target.value)} />
-      <div className="min-h-0 flex-1 overflow-y-auto pr-1">
+      <div className="min-h-0 flex-1 overflow-y-auto p-1">
         {filtered.length === 0 && <p className="py-4 text-center text-sm text-muted-foreground">No matching node types.</p>}
         <div className="flex flex-col gap-4">
           {groups.map((group) => (
@@ -225,23 +239,28 @@ export function AddNodePanel({
               </h3>
               <div className="flex flex-col gap-1.5">
                 {group.items.map((item) => (
-                  <button
+                  <Card
                     key={item.type}
-                    type="button"
-                    disabled={!allowedTypes && item.type === 'sub_agent'}
-                    onClick={() => onAdd(item.type)}
-                    className="flex cursor-pointer items-center gap-2.5 rounded-lg border bg-background px-3 py-2.5 text-left text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted disabled:cursor-not-allowed disabled:opacity-55 disabled:hover:bg-background"
+                    style={cardAccent(nodeAccent(CATALOG_ACCENT_KINDS[item.type] ?? (item.type.startsWith('model_') ? 'model' : item.type)))}
+                    className="gap-0 p-0"
                   >
-                    <item.icon className="size-4 shrink-0 text-primary" />
-                    <div className="min-w-0">
-                      <p className="font-medium">{item.label}</p>
-                      <p className="truncate text-xs text-muted-foreground">
-                        {!allowedTypes && item.type === 'sub_agent'
-                          ? "Add from an Agent's Sub-Agents connector"
-                          : item.description}
-                      </p>
-                    </div>
-                  </button>
+                    <button
+                      type="button"
+                      disabled={!allowedTypes && item.type === 'sub_agent'}
+                      onClick={() => onAdd(item.type)}
+                      className="flex w-full cursor-pointer items-center gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors hover:bg-muted disabled:cursor-not-allowed disabled:opacity-55 disabled:hover:bg-background"
+                    >
+                      <item.icon className="size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
+                      <div className="min-w-0">
+                        <p className="font-medium">{item.label}</p>
+                        <p className="truncate text-xs text-muted-foreground">
+                          {!allowedTypes && item.type === 'sub_agent'
+                            ? "Add from an Agent's Sub-Agents connector"
+                            : item.description}
+                        </p>
+                      </div>
+                    </button>
+                  </Card>
                 ))}
               </div>
             </section>
diff --git a/frontend/src/components/protocol/DatasetBrowserPanel.tsx b/frontend/src/components/protocol/DatasetBrowserPanel.tsx
index 030ba63..b5322d9 100644
--- a/frontend/src/components/protocol/DatasetBrowserPanel.tsx
+++ b/frontend/src/components/protocol/DatasetBrowserPanel.tsx
@@ -1,3 +1,6 @@
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { useState } from 'react'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { ArrowLeft, Database, Plus, Trash2, X } from 'lucide-react'
@@ -64,7 +67,7 @@ export function DatasetBrowserPanel({
   )
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex shrink-0 items-center justify-between">
         <div className="flex min-w-0 items-center gap-1.5">
           <Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}>
@@ -100,9 +103,10 @@ export function DatasetBrowserPanel({
           {filtered.map((dataset) => (
             // Same metrics as SkillBrowserPanel's rows (px-3 py-2.5, text-sm,
             // three single-line rows) so every browser reads as one list style.
-            <div
+            <Card
               key={dataset.id}
-              className="rounded-lg border bg-background px-3 py-2.5 text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted"
+              style={cardAccent(nodeAccent('dataset'))}
+              className="gap-0 px-3 py-2.5 transition-colors hover:bg-muted"
             >
               {confirmingDeleteId === dataset.id ? (
                 <div className="space-y-2">
@@ -134,7 +138,7 @@ export function DatasetBrowserPanel({
                     onClick={() => onPick(dataset)}
                     className="flex min-w-0 flex-1 cursor-pointer items-start gap-2.5 text-left"
                   >
-                    <Database className="mt-0.5 size-4 shrink-0 text-primary" />
+                    <Database className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
                     <div className="min-w-0 flex-1">
                       <p className="truncate font-mono font-medium">{dataset.name}</p>
                       {/* One line, same as the other browsers' rows -- the
@@ -172,7 +176,7 @@ export function DatasetBrowserPanel({
                   </div>
                 </div>
               )}
-            </div>
+            </Card>
           ))}
         </div>
       )}
diff --git a/frontend/src/components/protocol/DesignTab.tsx b/frontend/src/components/protocol/DesignTab.tsx
index b7d56d6..3d3ccfc 100644
--- a/frontend/src/components/protocol/DesignTab.tsx
+++ b/frontend/src/components/protocol/DesignTab.tsx
@@ -1,3 +1,4 @@
+import { personaFactorIssues } from '@/lib/personaFactors'
 import { subAgentFactorIssues } from '@/lib/subAgentFactors'
 import { sharedGroupIssues } from '@/lib/sharedFactors'
 import { knowledgeFactorIssues, isKnowledgeFactor } from '@/lib/knowledgeFactors'
@@ -527,6 +528,7 @@ export function DesignTab({
   const toolLibrary = useQuery({ queryKey: ['mcp-servers'], queryFn: () => mcpServersApi.list(), enabled: factors.some((factor) => factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle') })
   const scriptIssues = scriptFactorIssues(draftGraph, factors)
   const toolIssues = toolFactorIssues(draftGraph, factors, toolLibrary.data ? new Set(toolLibrary.data.map((server) => server.id)) : undefined)
+  const personaIssues = personaFactorIssues(draftGraph, factors)
   const skillIssues = skillFactorIssues(draftGraph, factors, skillLibrary.data ? new Set(skillLibrary.data.map((skill) => skill.id)) : undefined)
   const impact = impactQuery.data
 
@@ -896,14 +898,14 @@ export function DesignTab({
             Unbound factor{unboundFactors.length === 1 ? '' : 's'}: {unboundFactors.join(', ')}. Rebind on the canvas or remove from this design.
           </p>
         )}
-        {[...patternIssues, ...scriptIssues, ...toolIssues, ...subAgentIssues, ...skillIssues, ...datasetIssues, ...knowledgeIssues].map((issue) => <p key={issue} className="text-xs text-destructive">{issue}</p>)}
+        {[...patternIssues, ...scriptIssues, ...toolIssues, ...subAgentIssues, ...skillIssues, ...personaIssues, ...datasetIssues, ...knowledgeIssues].map((issue) => <p key={issue} className="text-xs text-destructive">{issue}</p>)}
         <Button
           size="sm"
           disabled={
             generateMutation.isPending ||
             isAutosavingMetadata ||
             !canGenerate ||
-            patternIssues.length > 0 || scriptIssues.length > 0 || toolIssues.length > 0 || (factors.some((factor) => factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle') && !toolLibrary.isSuccess) || unboundFactors.length > 0 || subAgentIssues.length > 0 || knowledgeIssues.length > 0 || (factors.some(isKnowledgeFactor) && !knowledgeLibrary.isSuccess) || skillIssues.length > 0 || datasetIssues.length > 0 || (factors.some((factor) => factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle') && !datasetLibrary.isSuccess) || (factors.some((factor) => (factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle')) && !skillLibrary.isSuccess)
+            patternIssues.length > 0 || scriptIssues.length > 0 || toolIssues.length > 0 || (factors.some((factor) => factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle') && !toolLibrary.isSuccess) || unboundFactors.length > 0 || subAgentIssues.length > 0 || knowledgeIssues.length > 0 || (factors.some(isKnowledgeFactor) && !knowledgeLibrary.isSuccess) || personaIssues.length > 0 || skillIssues.length > 0 || datasetIssues.length > 0 || (factors.some((factor) => factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle') && !datasetLibrary.isSuccess) || (factors.some((factor) => (factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle')) && !skillLibrary.isSuccess)
           }
           onClick={() => generateMutation.mutate()}
         >
diff --git a/frontend/src/components/protocol/FactorEditorDialog.test.tsx b/frontend/src/components/protocol/FactorEditorDialog.test.tsx
index dc9bd37..13c93fc 100644
--- a/frontend/src/components/protocol/FactorEditorDialog.test.tsx
+++ b/frontend/src/components/protocol/FactorEditorDialog.test.tsx
@@ -3,10 +3,49 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { expect, it, vi } from 'vitest'
 import type { DesignFactor } from '@/types/experiments'
 import { FactorEditorDialog } from './FactorEditorDialog'
+import { personasApi } from '@/api/client'
 
 const factorA: DesignFactor = { name: 'Model parameter', level_type: 'number', levels: [2048, 1024], level_labels: ['high', 'low'] }
 const factorB: DesignFactor = { ...factorA, levels: [1024, 2048], level_labels: ['low', 'high'] }
 
+it.each([null, '01-analyst'])('uploads to the intended persona level when both levels share persona_id %s', async (personaId) => {
+  vi.spyOn(personasApi, 'list').mockResolvedValue([])
+  vi.spyOn(personasApi, 'upload').mockResolvedValue({
+    id: 'saved-persona', name: 'methodical', prompt: 'You are methodical.', source_filename: 'methodical.md',
+    description: null, traits: {}, revision: 1, prompt_sha256: 'hash', created_at: '', updated_at: '',
+  })
+  const save = vi.fn().mockResolvedValue(undefined)
+  const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  render(
+    <QueryClientProvider client={client}>
+      <FactorEditorDialog open onOpenChange={vi.fn()} onSave={save} factor={{
+        name: 'Persona', level_type: 'persona_text', levels: [
+          { mode: 'text', persona_text: 'First treatment', persona_id: personaId },
+          { mode: 'text', persona_text: 'Second treatment', persona_id: personaId },
+        ],
+      }} />
+    </QueryClientProvider>,
+  )
+  const inputs = screen.getAllByLabelText<HTMLInputElement>('Upload persona (.md)')
+  const firstClick = vi.spyOn(inputs[0], 'click')
+  const secondClick = vi.spyOn(inputs[1], 'click')
+  fireEvent.click(screen.getAllByRole('button', { name: 'Choose .md file' })[1])
+  expect(secondClick).toHaveBeenCalledOnce()
+  expect(firstClick).not.toHaveBeenCalled()
+
+  const file = new File(['You are methodical.'], 'methodical.md', { type: 'text/markdown' })
+  fireEvent.change(inputs[1], { target: { files: [file] } })
+  await waitFor(() => expect(screen.getByRole('button', { name: 'methodical.md' })).toBeInTheDocument())
+  fireEvent.click(screen.getByRole('button', { name: 'Close' }))
+  await waitFor(() => expect(save).toHaveBeenCalledWith(expect.objectContaining({
+    levels: [
+      expect.objectContaining({ persona_text: 'First treatment' }),
+      expect.objectContaining({ persona_text: 'You are methodical.', persona_file: 'methodical.md', mode: 'file' }),
+    ],
+  }), undefined))
+  expect(personasApi.upload).toHaveBeenCalledWith(file, expect.anything())
+})
+
 it.each(['tool_selection', 'dataset_selection', 'skill_selection', 'knowledge_selection', 'script_selection', 'sub_agent_selection'] as const)(
   'refreshes untouched %s editors and preserves level-label pairs', async (level_type) => {
     const save = vi.fn().mockResolvedValue(undefined)
diff --git a/frontend/src/components/protocol/FactorEditorDialog.tsx b/frontend/src/components/protocol/FactorEditorDialog.tsx
index dce7e09..5cd81b0 100644
--- a/frontend/src/components/protocol/FactorEditorDialog.tsx
+++ b/frontend/src/components/protocol/FactorEditorDialog.tsx
@@ -1,9 +1,10 @@
+import { PersonaFactorEditor } from './PersonaFactorEditor'
 import type { ModelCapabilities } from '@/types/llmSettings'
 import { modelCapabilities } from '@/lib/modelCapabilities'
 import { SubAgentFactorEditor } from './SubAgentFactorEditor'
 import type { ProtocolGraph } from '@/types/protocols'
-import { useEffect, useMemo, useState, type SetStateAction } from 'react'
-import { useQuery } from '@tanstack/react-query'
+import { useEffect, useId, useMemo, useState, type SetStateAction } from 'react'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { Plus, Split, X } from 'lucide-react'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
@@ -39,9 +40,12 @@ import { PythonCodeEditor } from './PythonCodeEditor'
 import { useDialogAutosave } from './useDialogAutosave'
 import { useDialogDraft } from './useDialogDraft'
 import type { DesignFactor } from '@/types/experiments'
-import { Library, Upload } from 'lucide-react'
+import { Upload } from 'lucide-react'
 import { DatasetFactorEditor } from './DatasetFactorEditor'
-import { PERSONA_LIBRARY } from './personaLibrary'
+import { PersonaLibraryPicker } from './PersonaLibraryPicker'
+import { configForSavedPersona } from './usePersonaLibrary'
+import { personasApi } from '@/api/client'
+import type { PersonaNodeConfig } from '@/types/protocols'
 import { KnowledgeFactorEditor } from './KnowledgeFactorEditor'
 import { ScriptFactorEditor } from './ScriptFactorEditor'
 import { ToolFactorEditor } from './ToolFactorEditor'
@@ -422,189 +426,33 @@ function DatasetConfigLevelRow({
 }
 
 function PersonaLevelRow({ value, onChange }: { value: StructuredLevel; onChange: (next: StructuredLevel) => void }) {
-  const [selectedPersonas, setSelectedPersonas] = useState<string[]>(() => {
-    const ids = value.persona_ids as string[] | undefined
-    if (ids && Array.isArray(ids) && ids.length > 0) return ids
-    const id = value.persona_id as string | null
-    return id ? [id] : ['']
+  const uploadId = useId()
+  const client = useQueryClient()
+  const upload = useMutation({
+    mutationFn: personasApi.upload,
+    onSuccess: () => client.invalidateQueries({ queryKey: ['personas'] }),
   })
-
-  // Sync state when value changes (e.g., when loading an existing factor for editing)
-  useEffect(() => {
-    const ids = value.persona_ids as string[] | undefined
-    if (ids && Array.isArray(ids) && ids.length > 0) {
-      setSelectedPersonas(ids)
-    } else {
-      const id = value.persona_id as string | null
-      setSelectedPersonas(id ? [id] : [''])
-    }
-  }, [value.persona_ids, value.persona_id])
-
-  function patch(patch: StructuredLevel) {
-    onChange({ ...value, ...patch })
-  }
-
-  function updatePersona(index: number, newId: string | null) {
-    const newSelected = [...selectedPersonas]
-    newSelected[index] = newId || ''
-    const filtered = newSelected.filter(id => id !== '')
-    setSelectedPersonas(filtered.length > 0 ? filtered : [''])
-
-    const combinedText = filtered
-      .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.prompt ?? '')
-      .filter(Boolean)
-      .join('\n\n')
-
-    const allLabels = filtered
-      .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.label)
-      .filter(Boolean)
-      .join(' + ')
-
-    patch({
-      persona_text: combinedText,
-      persona_id: filtered[0] || null,
-      persona_ids: filtered,
-      persona_label: allLabels || null,
-      mode: 'library',
-      persona_file: null
-    })
-  }
-
-  function addPersona() {
-    if (selectedPersonas.length < 5) {
-      setSelectedPersonas([...selectedPersonas, ''])
-    }
-  }
-
-  function removePersona(index: number) {
-    const newSelected = selectedPersonas.filter((_, i) => i !== index)
-    setSelectedPersonas(newSelected.length > 0 ? newSelected : [''])
-
-    const combinedText = newSelected
-      .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.prompt ?? '')
-      .filter(Boolean)
-      .join('\n\n')
-
-    const allLabels = newSelected
-      .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.label)
-      .filter(Boolean)
-      .join(' + ')
-
-    patch({
-      persona_text: combinedText,
-      persona_id: newSelected[0] || null,
-      persona_ids: newSelected,
-      persona_label: allLabels || null,
-      mode: newSelected.length > 0 ? 'library' : 'custom',
-      persona_file: null
-    })
-  }
-
-  async function handleFileUpload(e: React.ChangeEvent<HTMLInputElement>) {
-    const file = e.target.files?.[0]
-    if (!file) return
-    const text = await file.text()
-    patch({
-      persona_text: text,
-      persona_file: file.name,
-      mode: 'file',
-      persona_id: null,
-      persona_ids: [],
-      persona_label: null
-    })
-    setSelectedPersonas([''])
-  }
-
   return (
     <div className="space-y-2 rounded-lg border p-2">
-      <div className="space-y-1.5">
-        <Label className="text-xs">Choose from library</Label>
-        <div className="space-y-1.5">
-          {selectedPersonas.map((personaId, index) => (
-            <div key={index} className="flex gap-1.5">
-              <Select
-                value={personaId || '__none__'}
-                onValueChange={(newId) => {
-                  if (newId === '__none__') return
-                  updatePersona(index, newId)
-                }}
-              >
-                <SelectTrigger className="h-8 flex-1">
-                  <SelectValue>
-                    {() => PERSONA_LIBRARY.find(p => p.id === personaId)?.label ?? 'Select a persona...'}
-                  </SelectValue>
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="__none__" disabled>
-                    Select a persona...
-                  </SelectItem>
-                  {PERSONA_LIBRARY.map(p => (
-                    <SelectItem key={p.id} value={p.id}>
-                      <div className="flex items-center gap-2">
-                        <Library className="size-4" />
-                        {p.label}
-                      </div>
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              {selectedPersonas.length > 1 && (
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  type="button"
-                  className="h-8 w-8 p-0"
-                  onClick={() => removePersona(index)}
-                >
-                  <X className="size-3.5" />
-                </Button>
-              )}
-            </div>
-          ))}
-        </div>
-        {selectedPersonas.length < 5 && (
-          <Button
-            variant="outline"
-            size="sm"
-            type="button"
-            className="h-7 w-full text-xs"
-            onClick={addPersona}
-          >
-            <Plus className="size-3 mr-1" />
-            Add another (max 5)
-          </Button>
-        )}
-      </div>
+      <PersonaLibraryPicker value={value as unknown as PersonaNodeConfig} onChange={next => onChange({ ...value, ...next })} />
       <div className="space-y-1">
-        <Label className="text-xs">Upload .md file</Label>
-        <div className="flex gap-2">
-          <Button
-            variant="outline"
-            size="sm"
-            type="button"
-            className="h-8 w-full text-xs"
-            onClick={() => document.getElementById(`persona-upload-${String(value.persona_id || 'custom')}`)?.click()}
-          >
-            <Upload className="size-3 mr-1.5" />
-            {(value.persona_file as string) || 'Choose .md file'}
-          </Button>
-          <input
-            id={`persona-upload-${String(value.persona_id || 'custom')}`}
-            type="file"
-            accept=".md"
-            className="hidden"
-            onChange={handleFileUpload}
-          />
-        </div>
+        <Label htmlFor={uploadId} className="text-xs">Upload persona (.md)</Label>
+        <Button variant="outline" size="sm" type="button" disabled={upload.isPending} className="h-8 w-full text-xs" onClick={() => document.getElementById(uploadId)?.click()}>
+          <Upload className="mr-1.5 size-3" />{upload.isPending ? 'Saving persona…' : (value.persona_file as string) || 'Choose .md file'}
+        </Button>
+        <input id={uploadId} type="file" accept=".md" className="hidden" onChange={event => {
+          const file = event.target.files?.[0]
+          if (file) upload.mutate(file, { onSuccess: persona => onChange({ ...value, ...configForSavedPersona(persona), mode: 'file' }) })
+          event.target.value = ''
+        }} />
+        <p className="text-xs text-muted-foreground">Upload plain Markdown; no frontmatter is required. The persona is saved to your library and its text is copied into this level.</p>
+        {upload.error && <p role="alert" className="text-xs text-destructive">{upload.error.message}</p>}
       </div>
       <div className="space-y-1">
-        <Label className="text-xs">Persona text</Label>
-        <Textarea
-          value={(value.persona_text as string) ?? ''}
-          onChange={(e) => patch({ persona_text: e.target.value, mode: 'custom', persona_id: null, persona_label: null, persona_file: null })}
-          placeholder="You are extremely organized, very responsible..."
-          className="h-20 font-mono text-xs"
-        />
+        <Label htmlFor={`${uploadId}-text`} className="text-xs">Persona text</Label>
+        <Textarea id={`${uploadId}-text`} value={(value.persona_text as string) ?? ''} onChange={event => onChange({
+          ...value, persona_text: event.target.value, mode: 'text', persona_id: null, persona_ids: [], persona_sources: [], persona_label: null, persona_file: null,
+        })} placeholder="Describe the agent's personality and behavior…" className="h-20 font-mono text-xs" />
       </div>
     </div>
   )
@@ -710,6 +558,7 @@ export function FactorEditorDialog(props: Parameters<typeof StandardFactorEditor
   if (props.factor.level_type === 'sub_agent_selection' || props.factor.level_type === 'sub_agent_toggle') return <SubAgentFactorEditor {...props} />
   if (props.factor.level_type === 'knowledge_selection' || props.factor.level_type === 'knowledge_toggle') return <KnowledgeFactorEditor {...props} />
   if (props.factor.level_type === 'dataset_selection' || props.factor.level_type === 'dataset_toggle') return <DatasetFactorEditor {...props} />
+  if (props.factor.level_type === 'persona_selection' || props.factor.level_type === 'persona_toggle') return <PersonaFactorEditor {...props} />
   if ((props.factor.level_type === 'skill_selection' || props.factor.level_type === 'skill_toggle')) return <SkillFactorEditor {...props} />
   if (props.factor.level_type === 'tool_selection' || props.factor.level_type === 'tool_toggle') return <ToolFactorEditor {...props} />
   if (props.factor.level_type === 'script_selection' || props.factor.level_type === 'script_toggle') return <ScriptFactorEditor {...props} />
diff --git a/frontend/src/components/protocol/McpServerBrowserPanel.tsx b/frontend/src/components/protocol/McpServerBrowserPanel.tsx
index e53aee5..c6d4913 100644
--- a/frontend/src/components/protocol/McpServerBrowserPanel.tsx
+++ b/frontend/src/components/protocol/McpServerBrowserPanel.tsx
@@ -2,6 +2,9 @@ import { useState } from 'react'
 import { useQuery } from '@tanstack/react-query'
 import { ArrowLeft, Plug, X } from 'lucide-react'
 import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { Input } from '@/components/ui/input'
 import { Skeleton } from '@/components/ui/skeleton'
 import { mcpServersApi } from '@/api/client'
@@ -55,7 +58,7 @@ export function McpServerBrowserPanel({
   )
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex shrink-0 items-center justify-between">
         <div className="flex min-w-0 items-center gap-1.5">
           <Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}>
@@ -72,19 +75,21 @@ export function McpServerBrowserPanel({
       {/* Outside the loading/error/empty branches below on purpose: connecting
           a server is exactly what you want to do when the list failed to load
           or has nothing in it. */}
-      <button
-        type="button"
-        onClick={() => setConnectOpen(true)}
-        className="flex shrink-0 cursor-pointer items-start gap-2.5 rounded-lg border border-primary/40 bg-primary/5 px-3 py-2.5 text-left text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/30 transition-colors hover:bg-primary/10"
-      >
-        <Plug className="mt-0.5 size-4 shrink-0 text-primary" />
-        <div className="min-w-0 flex-1">
-          <p className="font-medium">MCP Client Tool</p>
-          <p className="text-xs text-muted-foreground">
-            Connect your own server -- a local stdio command, or a remote streamable HTTP endpoint
-          </p>
-        </div>
-      </button>
+      <Card style={cardAccent(nodeAccent('mcp_client_tool'))} className="shrink-0 gap-0 p-0">
+        <button
+          type="button"
+          onClick={() => setConnectOpen(true)}
+          className="flex w-full cursor-pointer items-start gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors hover:bg-muted"
+        >
+          <Plug className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
+          <div className="min-w-0 flex-1">
+            <p className="font-medium">MCP Client Tool</p>
+            <p className="text-xs text-muted-foreground">
+              Connect your own server -- a local stdio command, or a remote streamable HTTP endpoint
+            </p>
+          </div>
+        </button>
+      </Card>
 
       <ConnectMcpServerDialog
         open={connectOpen}
@@ -112,26 +117,27 @@ export function McpServerBrowserPanel({
             const preset = presetForServer(server)
             const toolCount = server.capabilities?.tools?.length ?? 0
             return (
-              <button
-                key={server.id}
-                type="button"
-                onClick={() => onPick(server)}
-                className="flex cursor-pointer items-start gap-2.5 rounded-lg border bg-background px-3 py-2.5 text-left text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted"
-              >
-                <preset.icon className="mt-0.5 size-4 shrink-0 text-primary" />
-                <div className="min-w-0 flex-1">
-                  <p className="font-medium">{preset.label}</p>
-                  <p className="truncate text-xs text-muted-foreground" title={descriptionForServer(server)}>
-                    {descriptionForServer(server)}
-                  </p>
-                  {/* The registered id and tool count, monospaced -- the
-                      precise, technical identity behind the friendly label,
-                      so it's unambiguous which process is being wired in. */}
-                  <p className="truncate font-mono text-[11px] text-muted-foreground/70">
-                    {server.name} · {toolCount} {toolCount === 1 ? 'tool' : 'tools'}
-                  </p>
-                </div>
-              </button>
+              <Card key={server.id} style={cardAccent(nodeAccent('mcp_tool'))} className="gap-0 p-0">
+                <button
+                  type="button"
+                  onClick={() => onPick(server)}
+                  className="flex w-full min-w-0 cursor-pointer items-start gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors hover:bg-muted"
+                >
+                  <preset.icon className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
+                  <div className="min-w-0 flex-1">
+                    <p className="truncate font-medium" title={preset.label}>{preset.label}</p>
+                    <p className="truncate text-xs text-muted-foreground" title={descriptionForServer(server)}>
+                      {descriptionForServer(server)}
+                    </p>
+                    {/* The registered id and tool count, monospaced -- the
+                        precise, technical identity behind the friendly label,
+                        so it's unambiguous which process is being wired in. */}
+                    <p className="truncate font-mono text-[11px] text-muted-foreground/70">
+                      {server.name} · {toolCount} {toolCount === 1 ? 'tool' : 'tools'}
+                    </p>
+                  </div>
+                </button>
+              </Card>
             )
           })}
         </div>
diff --git a/frontend/src/components/protocol/NodeSelectionDrawer.test.tsx b/frontend/src/components/protocol/NodeSelectionDrawer.test.tsx
new file mode 100644
index 0000000..74638ad
--- /dev/null
+++ b/frontend/src/components/protocol/NodeSelectionDrawer.test.tsx
@@ -0,0 +1,79 @@
+import { act, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { NodeSelectionDrawer } from './NodeSelectionDrawer'
+
+const storageKey = 'asaree:node-selection-drawer-width'
+let availableWidth = 1440
+let measure = () => {}
+
+beforeEach(() => {
+  availableWidth = 1440
+  window.localStorage.removeItem(storageKey)
+  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => new DOMRect(0, 0, availableWidth, 800))
+  vi.stubGlobal('ResizeObserver', class {
+    constructor(callback: () => void) { measure = callback }
+    observe() {}
+    disconnect() {}
+  })
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  window.localStorage.removeItem(storageKey)
+})
+
+function setup() {
+  return render(<div><NodeSelectionDrawer><div>Node browser</div></NodeSelectionDrawer></div>)
+}
+
+it('resizes with the keyboard, remembers the width, and resets on double-click', () => {
+  const first = setup()
+  const handle = screen.getByRole('separator', { name: 'Resize the node selection drawer' })
+  fireEvent.keyDown(handle, { key: 'ArrowLeft' })
+  expect(handle).toHaveAttribute('aria-valuenow', '344')
+  expect(window.localStorage.getItem(storageKey)).toBe('344')
+  first.unmount()
+  setup()
+  const restored = screen.getByRole('separator')
+  expect(restored).toHaveAttribute('aria-valuenow', '344')
+  fireEvent.doubleClick(restored)
+  expect(restored).toHaveAttribute('aria-valuenow', '320')
+  expect(window.localStorage.getItem(storageKey)).toBe('320')
+  fireEvent.keyDown(restored, { key: 'ArrowRight' })
+  expect(restored).toHaveAttribute('aria-valuenow', '320')
+})
+
+it('limits width against the actual canvas container as the Design panel changes size', () => {
+  window.localStorage.setItem(storageKey, '900')
+  availableWidth = 1000
+  setup()
+  const handle = screen.getByRole('separator')
+  expect(handle).toHaveAttribute('aria-valuenow', '580')
+  expect(handle).toHaveAttribute('aria-valuemax', '580')
+  availableWidth = 1600
+  act(() => measure())
+  expect(handle).toHaveAttribute('aria-valuenow', '900')
+  availableWidth = 800
+  act(() => measure())
+  fireEvent.keyDown(handle, { key: 'ArrowLeft' })
+  expect(handle).toHaveAttribute('aria-valuenow', '380')
+})
+
+it('drags the left edge outward, persists its final position, and restores document styles', () => {
+  const result = setup()
+  const handle = screen.getByRole('separator')
+  const capture = vi.fn()
+  Object.defineProperty(handle, 'setPointerCapture', { value: capture })
+  fireEvent.pointerDown(handle, { pointerId: 1, button: 0, clientX: 800 })
+  expect(capture).toHaveBeenCalledWith(1)
+  expect(document.body.style.cursor).toBe('col-resize')
+  fireEvent.pointerMove(handle, { pointerId: 1, clientX: 650 })
+  expect(handle).toHaveAttribute('aria-valuenow', '470')
+  fireEvent.pointerUp(handle, { pointerId: 1 })
+  expect(window.localStorage.getItem(storageKey)).toBe('470')
+  expect(document.body.style.cursor).not.toBe('col-resize')
+  fireEvent.pointerDown(handle, { pointerId: 2, button: 0, clientX: 650 })
+  result.unmount()
+  expect(document.body.style.cursor).not.toBe('col-resize')
+  expect(document.body.style.userSelect).not.toBe('none')
+})
diff --git a/frontend/src/components/protocol/NodeSelectionDrawer.tsx b/frontend/src/components/protocol/NodeSelectionDrawer.tsx
new file mode 100644
index 0000000..9794e5d
--- /dev/null
+++ b/frontend/src/components/protocol/NodeSelectionDrawer.tsx
@@ -0,0 +1,110 @@
+import { useEffect, useRef, useState, type PointerEvent, type ReactNode } from 'react'
+import { cn } from '@/lib/utils'
+
+const DEFAULT_WIDTH = 320
+const MIN_WIDTH = 320
+const MAX_WIDTH = 1100
+const MIN_CANVAS_WIDTH = 420
+const STORAGE_KEY = 'asaree:node-selection-drawer-width'
+
+function storedWidth() {
+  const raw = window.localStorage.getItem(STORAGE_KEY)
+  const parsed = raw === null ? NaN : Number(raw)
+  return Number.isFinite(parsed) ? Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, parsed)) : DEFAULT_WIDTH
+}
+
+// Own the width above the catalog/browser drill-down so navigating between
+// node types keeps the same layout. Measure the actual canvas container:
+// the independently resizable experiment panel already occupies viewport space.
+export function NodeSelectionDrawer({ children }: { children: ReactNode }) {
+  const container = useRef<HTMLDivElement>(null)
+  const [preferredWidth, setPreferredWidth] = useState(storedWidth)
+  const [availableWidth, setAvailableWidth] = useState(window.innerWidth)
+  const [dragging, setDragging] = useState(false)
+  const drag = useRef<{ x: number; width: number; latest: number } | null>(null)
+  const maxWidth = Math.max(MIN_WIDTH, Math.min(MAX_WIDTH, availableWidth - MIN_CANVAS_WIDTH))
+  const width = Math.round(Math.min(maxWidth, Math.max(MIN_WIDTH, preferredWidth)))
+
+  useEffect(() => {
+    const parent = container.current?.parentElement
+    if (!parent) return
+    const measure = () => setAvailableWidth(parent.getBoundingClientRect().width)
+    measure()
+    const observer = new ResizeObserver(measure)
+    observer.observe(parent)
+    return () => observer.disconnect()
+  }, [])
+
+  useEffect(() => {
+    if (!dragging) return
+    const previousCursor = document.body.style.cursor
+    const previousSelect = document.body.style.userSelect
+    document.body.style.cursor = 'col-resize'
+    document.body.style.userSelect = 'none'
+    return () => {
+      document.body.style.cursor = previousCursor
+      document.body.style.userSelect = previousSelect
+    }
+  }, [dragging])
+
+  function changeWidth(next: number, persist = false) {
+    const clamped = Math.round(Math.min(maxWidth, Math.max(MIN_WIDTH, next)))
+    setPreferredWidth(clamped)
+    if (persist) window.localStorage.setItem(STORAGE_KEY, String(clamped))
+    return clamped
+  }
+
+  function beginDrag(event: PointerEvent<HTMLDivElement>) {
+    if (event.button !== 0) return
+    event.preventDefault()
+    event.currentTarget.setPointerCapture(event.pointerId)
+    drag.current = { x: event.clientX, width, latest: width }
+    setDragging(true)
+  }
+
+  function moveDrag(event: PointerEvent<HTMLDivElement>) {
+    if (!drag.current) return
+    // The drawer is on the right: moving its left edge left makes it wider.
+    drag.current.latest = changeWidth(drag.current.width + drag.current.x - event.clientX)
+  }
+
+  function endDrag() {
+    if (!drag.current) return
+    window.localStorage.setItem(STORAGE_KEY, String(drag.current.latest))
+    drag.current = null
+    setDragging(false)
+  }
+
+  return <div ref={container} className="relative flex min-h-0 min-w-0 shrink-0" style={{ width }}>
+    {children}
+    <div
+      role="separator"
+      aria-orientation="vertical"
+      aria-label="Resize the node selection drawer"
+      aria-valuenow={width}
+      aria-valuemin={MIN_WIDTH}
+      aria-valuemax={maxWidth}
+      tabIndex={0}
+      onPointerDown={beginDrag}
+      onPointerMove={moveDrag}
+      onPointerUp={endDrag}
+      onPointerCancel={endDrag}
+      onLostPointerCapture={endDrag}
+      onDoubleClick={() => changeWidth(DEFAULT_WIDTH, true)}
+      onKeyDown={event => {
+        if (event.key === 'ArrowLeft') changeWidth(width + 24, true)
+        else if (event.key === 'ArrowRight') changeWidth(width - 24, true)
+        else return
+        event.preventDefault()
+      }}
+      title="Drag to resize — double-click to reset"
+      className="group/resize absolute top-0 -left-1.5 z-20 flex h-full w-3 cursor-col-resize touch-none items-center justify-center focus:outline-none"
+    >
+      <div className={cn(
+        'h-full w-px rounded-full transition-[width,background-color,box-shadow] duration-150',
+        dragging ? 'w-0.5 bg-primary shadow-[0_0_8px_var(--primary)]'
+          : 'bg-border group-hover/resize:w-0.5 group-hover/resize:bg-primary group-hover/resize:shadow-[0_0_8px_var(--primary)] group-focus-visible/resize:w-0.5 group-focus-visible/resize:bg-primary group-focus-visible/resize:shadow-[0_0_8px_var(--primary)]',
+      )} />
+    </div>
+  </div>
+}
diff --git a/frontend/src/components/protocol/OkfBundleBrowserPanel.tsx b/frontend/src/components/protocol/OkfBundleBrowserPanel.tsx
index d3c6a4f..db89837 100644
--- a/frontend/src/components/protocol/OkfBundleBrowserPanel.tsx
+++ b/frontend/src/components/protocol/OkfBundleBrowserPanel.tsx
@@ -1,3 +1,6 @@
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { useState } from 'react'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { ArrowLeft, BookMarked, FolderUp, Trash2, X } from 'lucide-react'
@@ -48,7 +51,7 @@ export function OkfBundleBrowserPanel({
   const bundles = bundlesQuery.data ?? []
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex shrink-0 items-center justify-between">
         <div className="flex min-w-0 items-center gap-1.5">
           <Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}>
@@ -88,9 +91,10 @@ export function OkfBundleBrowserPanel({
             return (
               // Same metrics as SkillBrowserPanel's rows (px-3 py-2.5, text-sm,
               // three single-line rows) so every browser reads as one list style.
-              <div
+              <Card
                 key={bundle.id}
-                className="rounded-lg border bg-background px-3 py-2.5 text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted"
+                style={cardAccent(nodeAccent('okf_bundle'))}
+                className="gap-0 px-3 py-2.5 transition-colors hover:bg-muted"
               >
                 {confirmingDeleteId === bundle.id ? (
                   <div className="space-y-2">
@@ -129,7 +133,7 @@ export function OkfBundleBrowserPanel({
                       onClick={() => onPick(bundle)}
                       className="flex min-w-0 flex-1 cursor-pointer items-start gap-2.5 text-left"
                     >
-                      <BookMarked className="mt-0.5 size-4 shrink-0 text-primary" />
+                      <BookMarked className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
                       <div className="min-w-0 flex-1">
                         <p className="truncate font-mono font-medium">{folder}</p>
                         {/* The full server-side path, truncated from the LEFT
@@ -169,7 +173,7 @@ export function OkfBundleBrowserPanel({
                     </div>
                   </div>
                 )}
-              </div>
+              </Card>
             )
           })}
         </div>
diff --git a/frontend/src/components/protocol/OkfDocumentBrowserPanel.tsx b/frontend/src/components/protocol/OkfDocumentBrowserPanel.tsx
index 17b321b..59ec1ce 100644
--- a/frontend/src/components/protocol/OkfDocumentBrowserPanel.tsx
+++ b/frontend/src/components/protocol/OkfDocumentBrowserPanel.tsx
@@ -1,3 +1,6 @@
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { useState } from 'react'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { ArrowLeft, FileText, Plus, Trash2, X } from 'lucide-react'
@@ -42,7 +45,7 @@ export function OkfDocumentBrowserPanel({
   const documents = documentsQuery.data ?? []
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex shrink-0 items-center justify-between">
         <div className="flex min-w-0 items-center gap-1.5">
           <Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}>
@@ -84,9 +87,10 @@ export function OkfDocumentBrowserPanel({
             const label = document.title ?? filename ?? document.name
             const broken = document.status !== 'connected'
             return (
-              <div
+              <Card
                 key={document.id}
-                className="rounded-lg border bg-background px-3 py-2.5 text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted"
+                style={cardAccent(nodeAccent('okf_document'))}
+                className="gap-0 px-3 py-2.5 transition-colors hover:bg-muted"
               >
                 {confirmingDeleteId === document.id ? (
                   <div className="space-y-2">
@@ -115,7 +119,7 @@ export function OkfDocumentBrowserPanel({
                       onClick={() => onPick(document)}
                       className="flex min-w-0 flex-1 cursor-pointer items-start gap-2.5 text-left"
                     >
-                      <FileText className="mt-0.5 size-4 shrink-0 text-primary" />
+                      <FileText className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
                       <div className="min-w-0 flex-1">
                         <p className="truncate font-medium">{label}</p>
                         <p className="truncate text-xs text-muted-foreground">
@@ -143,7 +147,7 @@ export function OkfDocumentBrowserPanel({
                     </div>
                   </div>
                 )}
-              </div>
+              </Card>
             )
           })}
         </div>
diff --git a/frontend/src/components/protocol/PersonaBrowserPanel.test.tsx b/frontend/src/components/protocol/PersonaBrowserPanel.test.tsx
new file mode 100644
index 0000000..6592a58
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaBrowserPanel.test.tsx
@@ -0,0 +1,53 @@
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { expect, it, vi } from 'vitest'
+import { personasApi } from '@/api/client'
+import type { Persona } from '@/types/personas'
+import { PersonaBrowserPanel } from './PersonaBrowserPanel'
+
+const saved: Persona = {
+  id: 'saved', name: 'Careful analyst', description: 'Check the evidence', prompt: 'Think carefully',
+  source_filename: 'careful.md', revision: 2, prompt_sha256: 'hash', traits: {}, created_at: '', updated_at: '',
+}
+
+function setup() {
+  const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  const pick = vi.fn()
+  render(<QueryClientProvider client={client}><PersonaBrowserPanel onPick={pick} onBack={vi.fn()} onClose={vi.fn()} /></QueryClientProvider>)
+  return pick
+}
+
+it('picks a single saved persona snapshot with its provenance', async () => {
+  vi.spyOn(personasApi, 'list').mockResolvedValue([saved])
+  const pick = setup()
+  fireEvent.click(await screen.findByRole('button', { name: /Careful analyst/ }))
+  expect(pick).toHaveBeenCalledWith(expect.objectContaining({
+    persona_ids: ['saved'], persona_text: 'Think carefully',
+    persona_sources: [{ id: 'saved', revision: 2, prompt_sha256: 'hash' }],
+  }))
+})
+
+it('uploads to the library without placing a node until the user selects it', async () => {
+  vi.spyOn(personasApi, 'list').mockResolvedValue([])
+  const upload = vi.spyOn(personasApi, 'upload').mockImplementation(async () => {
+    vi.mocked(personasApi.list).mockResolvedValue([saved])
+    return saved
+  })
+  const pick = setup()
+  const file = new File(['Think carefully'], 'careful.md', { type: 'text/markdown' })
+  fireEvent.change(screen.getByLabelText('Upload persona (.md)'), { target: { files: [file] } })
+  await screen.findByRole('button', { name: /Careful analyst/ })
+  expect(upload).toHaveBeenCalledWith(file, expect.anything())
+  expect(pick).not.toHaveBeenCalled()
+  fireEvent.click(screen.getByRole('button', { name: /Careful analyst/ }))
+  expect(pick).toHaveBeenCalledTimes(1)
+})
+
+it('keeps built-ins and upload available if the saved library fails', async () => {
+  vi.spyOn(personasApi, 'list').mockRejectedValue(new Error('Offline'))
+  const pick = setup()
+  await waitFor(() => expect(screen.getByRole('alert')).toHaveTextContent('Could not load saved personas'))
+  expect(screen.getByRole('button', { name: 'Upload persona (.md)' })).toBeEnabled()
+  fireEvent.click(screen.getByRole('button', { name: /Baseline/ }))
+  expect(pick).toHaveBeenCalledWith(expect.objectContaining({ persona_text: '', persona_ids: ['00-baseline'] }))
+})
diff --git a/frontend/src/components/protocol/PersonaBrowserPanel.tsx b/frontend/src/components/protocol/PersonaBrowserPanel.tsx
new file mode 100644
index 0000000..0869315
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaBrowserPanel.tsx
@@ -0,0 +1,63 @@
+import { useId, useState } from 'react'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { ArrowLeft, Plus, Upload, User, X } from 'lucide-react'
+import { personasApi } from '@/api/client'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { Input } from '@/components/ui/input'
+import { Badge } from '@/components/ui/badge'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
+import type { PersonaNodeConfig } from '@/types/protocols'
+import { PersonaLibraryDialog } from './PersonaLibraryDialog'
+import { configForSavedPersona, usePersonaLibrary } from './usePersonaLibrary'
+
+export function PersonaBrowserPanel({ onPick, onBack, onClose }: {
+  onPick: (config: PersonaNodeConfig) => void
+  onBack: () => void
+  onClose: () => void
+}) {
+  const [search, setSearch] = useState('')
+  const [managing, setManaging] = useState(false)
+  const uploadId = useId()
+  const client = useQueryClient()
+  const { query, choices, selectionConfig } = usePersonaLibrary()
+  const upload = useMutation({
+    mutationFn: personasApi.upload,
+    onSuccess: () => client.invalidateQueries({ queryKey: ['personas'] }),
+  })
+  const term = search.trim().toLowerCase()
+  const filtered = choices.filter(choice => `${choice.label} ${query.data?.find(persona => persona.id === choice.id)?.description ?? ''}`.toLowerCase().includes(term))
+  return <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex shrink-0 items-center justify-between">
+      <div className="flex min-w-0 items-center gap-1.5"><Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}><ArrowLeft className="size-4" /></Button><p className="truncate text-sm font-semibold">Personas</p></div>
+      <Button variant="ghost" size="icon-sm" aria-label="Close" onClick={onClose}><X className="size-4" /></Button>
+    </div>
+    <Input autoFocus placeholder="Search personas…" value={search} onChange={event => setSearch(event.target.value)} />
+    <Button variant="outline" size="sm" onClick={() => setManaging(true)}><Plus className="size-3.5" />Create / manage personas</Button>
+    <Button variant="outline" size="sm" disabled={upload.isPending} onClick={() => document.getElementById(uploadId)?.click()}><Upload className="size-3.5" />{upload.isPending ? 'Saving persona…' : 'Upload persona (.md)'}</Button>
+    <input id={uploadId} aria-label="Upload persona (.md)" type="file" accept=".md" className="hidden" onChange={event => {
+      const file = event.target.files?.[0]
+      if (file) upload.mutate(file)
+      event.target.value = ''
+    }} />
+    {upload.error && <p role="alert" className="text-xs text-destructive">{upload.error.message}</p>}
+    {upload.isSuccess && <p role="status" className="text-xs text-muted-foreground">Saved to the library. Select a persona below to add its node.</p>}
+    {query.isLoading && <p className="text-xs text-muted-foreground">Loading saved personas…</p>}
+    {query.isError && <p role="alert" className="text-xs text-destructive">Could not load saved personas. Built-in personas are still available.</p>}
+    <div className="min-h-0 flex-1 space-y-1.5 overflow-y-auto p-1">
+      {filtered.map(choice => {
+        const saved = query.data?.find(persona => persona.id === choice.id)
+        return <Card key={choice.id} style={cardAccent(nodeAccent('persona'))} className="gap-0 p-0">
+          <button type="button" onClick={() => onPick(saved ? configForSavedPersona(saved) : selectionConfig([choice.id]))} className="flex w-full cursor-pointer items-start gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors hover:bg-muted">
+            <User className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
+            <div className="min-w-0 flex-1"><p className="truncate font-medium">{choice.label}</p><p className="truncate text-xs text-muted-foreground" title={saved?.description ?? undefined}>{saved?.description || (choice.prompt ? 'Personality instructions' : 'Unmodified system prompt')}</p><p className="truncate font-mono text-[11px] text-muted-foreground">{choice.prompt.length.toLocaleString()} chars{saved ? ` · revision ${saved.revision}` : ''}</p></div>
+            {!saved && <Badge variant="outline">Built-in</Badge>}
+          </button>
+        </Card>
+      })}
+      {!filtered.length && <p className="py-4 text-center text-sm text-muted-foreground">No matching personas.</p>}
+    </div>
+    {managing && <PersonaLibraryDialog open onOpenChange={setManaging} onPick={persona => onPick(configForSavedPersona(persona))} />}
+  </div>
+}
diff --git a/frontend/src/components/protocol/PersonaFactorDialog.test.tsx b/frontend/src/components/protocol/PersonaFactorDialog.test.tsx
new file mode 100644
index 0000000..1dc0267
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaFactorDialog.test.tsx
@@ -0,0 +1,115 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { expect, it, vi } from 'vitest'
+import type { ProtocolGraph } from '@/types/protocols'
+import { PersonaFactorDialog } from './PersonaFactorDialog'
+
+const graph = {
+  nodes: [
+    { id: 'agent', type: 'agent', data: { label: 'Writer' } },
+    { id: 'persona', type: 'persona', data: { label: 'Summarize', config: { persona_id: 'a' }, factor_bindings: { 'config.enabled': 'Persona enabled' } } },
+  ],
+  edges: [{ source: 'persona', target: 'agent', targetHandle: 'persona' }],
+} as unknown as ProtocolGraph
+
+it('keeps the dialog open after removal and permits choosing another factor type', async () => {
+  const remove = vi.fn().mockResolvedValue(undefined)
+  const close = vi.fn()
+  const { rerender } = render(<PersonaFactorDialog personaNodeId="persona" graph={graph} factors={[{ name: 'Persona enabled', level_type: 'boolean', levels: [false, true] }]} onClose={close} onSave={vi.fn()} onRemove={remove} />)
+  fireEvent.click(screen.getByRole('button', { name: 'Remove factor' }))
+  await waitFor(() => expect(remove).toHaveBeenCalledWith('Persona enabled'))
+  await waitFor(() => expect(screen.getByRole('button', { name: 'Cancel' })).toBeEnabled())
+  expect(close).not.toHaveBeenCalled()
+  const updated = { ...graph, nodes: graph.nodes.map((node) => ({ ...node, data: { ...node.data, factor_bindings: {} } })) }
+  rerender(<PersonaFactorDialog personaNodeId="persona" graph={updated} factors={[]} onClose={close} onSave={vi.fn()} onRemove={remove} />)
+  expect(screen.queryByRole('button', { name: 'Remove factor' })).not.toBeInTheDocument()
+  fireEvent.click(screen.getByRole('button', { name: 'Persona levels' }))
+  expect(screen.getByLabelText('Factor name')).toBeEnabled()
+  expect(screen.queryByRole('status')).not.toBeInTheDocument()
+})
+
+it.each(['Persona levels', 'All personas on/off'])('explains why %s conflicts with individual bindings without offering replacement', (mode) => {
+  const save = vi.fn().mockResolvedValue(undefined)
+  render(<PersonaFactorDialog personaNodeId="persona" graph={graph} factors={[{ name: 'Persona enabled', level_type: 'boolean', levels: [false, true] }]} onClose={vi.fn()} onSave={save} onRemove={vi.fn()} />)
+  const option = screen.getByRole('button', { name: mode })
+  expect(option).toHaveClass('bg-secondary', 'text-secondary-foreground', 'border-dashed')
+  expect(option).not.toHaveClass('opacity-50', 'text-muted-foreground')
+  fireEvent.click(option)
+  expect(option).toHaveClass('bg-primary', 'text-primary-foreground')
+  expect(option).toHaveAttribute('aria-pressed', 'true')
+  expect(screen.getByRole('button', { name: 'Save factor' })).toBeDisabled()
+  expect(screen.getByRole('status')).toHaveTextContent('Persona enabled')
+  expect(screen.getByRole('status')).toHaveTextContent('remove those bindings in each Persona’s factor dialog first')
+  expect(screen.queryByLabelText('Factor name')).not.toBeInTheDocument()
+  expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
+  fireEvent.click(screen.getByRole('button', { name: 'Save factor' }))
+  expect(save).not.toHaveBeenCalled()
+  fireEvent.click(screen.getByRole('button', { name: 'This persona on/off' }))
+  expect(screen.getByLabelText('Factor name')).toHaveValue('Persona enabled')
+  expect(screen.getByRole('button', { name: 'Remove factor' })).toBeEnabled()
+})
+
+it('only offers individual factors for disconnected personas', () => {
+  render(<PersonaFactorDialog personaNodeId="persona" graph={{ ...graph, edges: [] }} factors={[]} onClose={vi.fn()} onSave={vi.fn()} onRemove={vi.fn()} />)
+  expect(screen.getByRole('button', { name: 'This persona on/off' })).toHaveAttribute('aria-pressed', 'true')
+  fireEvent.click(screen.getByRole('button', { name: 'Persona levels' }))
+  expect(screen.getByRole('status')).toHaveTextContent('Connect this Persona to an Agent first')
+  expect(screen.queryByLabelText('Factor name')).not.toBeInTheDocument()
+  expect(screen.getByRole('button', { name: 'Save factor' })).toBeDisabled()
+})
+
+it.each(['This persona on/off', 'Persona levels'])('blocks %s when an Agent already has an all-personas factor', (mode) => {
+  const grouped = {
+    ...graph,
+    nodes: [
+      { ...graph.nodes[0], data: { label: 'Writer', factor_bindings: { persona_selection: 'Group' } } },
+      { ...graph.nodes[1], data: { label: 'Summarize', config: { persona_id: 'a' } } },
+    ],
+  } as ProtocolGraph
+  render(<PersonaFactorDialog personaNodeId="persona" graph={grouped} factors={[{ name: 'Group', level_type: 'persona_toggle', levels: [['a'], []], level_labels: ['All enabled', 'All disabled'] }]} onClose={vi.fn()} onSave={vi.fn()} onRemove={vi.fn()} />)
+  fireEvent.click(screen.getByRole('button', { name: mode }))
+  expect(screen.getByRole('status')).toHaveTextContent('Group')
+  expect(screen.getByRole('status')).toHaveTextContent('remove it first')
+  expect(screen.queryByLabelText('Factor name')).not.toBeInTheDocument()
+  expect(screen.getByRole('button', { name: 'Save factor' })).toBeDisabled()
+})
+
+it('saves edits to an existing individual factor without removing other declarations', async () => {
+  const save = vi.fn().mockResolvedValue(undefined)
+  render(<PersonaFactorDialog personaNodeId="persona" graph={graph} factors={[{ name: 'Persona enabled', level_type: 'boolean', levels: [false, true] }]} onClose={vi.fn()} onSave={save} onRemove={vi.fn()} />)
+  fireEvent.change(screen.getByLabelText('Factor name'), { target: { value: 'Renamed' } })
+  fireEvent.click(screen.getByRole('button', { name: 'Save factor' }))
+  await waitFor(() => expect(save).toHaveBeenCalledWith({ name: 'Renamed', level_type: 'boolean', levels: [false, true], level_labels: ['Disabled', 'Enabled'] }, 'persona', 'Persona enabled'))
+})
+
+it('opens the existing group factor when a shared persona has multiple connected agents', () => {
+  const sharedGraph = {
+    ...graph,
+    nodes: [
+      { ...graph.nodes[0], data: { label: 'First agent' } },
+      { id: 'second', type: 'agent', position: { x: 0, y: 0 }, data: { label: 'Second agent', persona_selection: ['a'], persona_factor_mode: 'persona_toggle', factor_bindings: { persona_selection: 'Group' } } },
+      { ...graph.nodes[1], data: { label: 'Summarize', config: { persona_id: 'a' } } },
+    ],
+    edges: [...graph.edges, { id: 'second-edge', source: 'persona', target: 'second', targetHandle: 'persona' }],
+  } as ProtocolGraph
+  render(<PersonaFactorDialog personaNodeId="persona" graph={sharedGraph} factors={[{ name: 'Group', level_type: 'persona_toggle', levels: [['a'], []], level_labels: ['All enabled', 'All disabled'] }]} onClose={vi.fn()} onSave={vi.fn()} onRemove={vi.fn()} />)
+  expect(screen.queryByRole('combobox')).not.toBeInTheDocument()
+  expect(screen.getByText('Applies to: First agent, Second agent')).toBeInTheDocument()
+  expect(screen.getByRole('button', { name: 'All personas on/off' })).toHaveAttribute('aria-pressed', 'true')
+  expect(screen.getByLabelText('Factor name')).toHaveValue('Group')
+})
+
+it('blocks an incomplete shared group while keeping its factor removable', async () => {
+  const remove = vi.fn().mockResolvedValue(undefined)
+  const sharedGraph = {
+    nodes: [
+      ...['one', 'two'].map((id) => ({ id, type: 'agent', data: { label: id, persona_selection: ['a'], persona_factor_mode: 'persona_selection', factor_bindings: { persona_selection: 'Shared' } } })),
+      ...['a', 'b'].map((id) => ({ id, type: 'persona', data: { label: id, config: { persona_id: id } } })),
+    ],
+    edges: [{ source: 'a', target: 'one', targetHandle: 'persona' }, { source: 'a', target: 'two', targetHandle: 'persona' }, { source: 'b', target: 'one', targetHandle: 'persona' }],
+  } as unknown as ProtocolGraph
+  render(<PersonaFactorDialog personaNodeId="b" graph={sharedGraph} factors={[{ name: 'Shared', level_type: 'persona_selection', levels: [['a'], ['b']] }]} onClose={vi.fn()} onSave={vi.fn()} onRemove={remove} />)
+  expect(screen.getByRole('status')).toHaveTextContent('exactly the same Agents')
+  expect(screen.getByRole('button', { name: 'Save factor' })).toBeDisabled()
+  fireEvent.click(screen.getByRole('button', { name: 'Remove factor' }))
+  await waitFor(() => expect(remove).toHaveBeenCalledWith('Shared'))
+})
diff --git a/frontend/src/components/protocol/PersonaFactorDialog.tsx b/frontend/src/components/protocol/PersonaFactorDialog.tsx
new file mode 100644
index 0000000..bb759e2
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaFactorDialog.tsx
@@ -0,0 +1,115 @@
+import { factorScopeLabel, factorRecipients } from '@/lib/sharedFactors'
+import { useState } from 'react'
+import { ArrowDown, ArrowUp, Split } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { personaId, connectedPersonas, reconcilePersonaFactor, personaFactorConflict, personaFactorModes as modes, PERSONA_FACTOR_PATH, type PersonaFactorMode as Mode } from '@/lib/personaFactors'
+import type { DesignFactor } from '@/types/experiments'
+import type { ProtocolGraph } from '@/types/protocols'
+import { computeFactorName } from './factorLevels'
+
+export function PersonaFactorDialog({ personaNodeId, graph, factors, initialMode, onClose, onSave, onRemove }: {
+  personaNodeId: string
+  graph: ProtocolGraph
+  factors: DesignFactor[]
+  initialMode?: Mode
+  onClose: () => void
+  onSave: (factor: DesignFactor, ownerId: string, previousName?: string) => Promise<void>
+  onRemove: (name: string) => Promise<void>
+}) {
+  const persona = graph.nodes.find((node) => node.id === personaNodeId)!
+  const agents = factorRecipients(graph, personaNodeId, 'persona')
+  const agentId = agents.find((agent) => agent.data.factor_bindings?.[PERSONA_FACTOR_PATH])?.id ?? agents[0]?.id ?? ''
+  const existingFor = (ownerId: string, path: string) => factors.find((factor) => factor.name === graph.nodes.find((node) => node.id === ownerId)?.data.factor_bindings?.[path])
+  const initialFactor = existingFor(agentId, PERSONA_FACTOR_PATH) ?? existingFor(personaNodeId, 'config.enabled')
+  const initial = initialFactor && initialFactor.level_type !== 'boolean' && initialFactor.level_type ? reconcilePersonaFactor(initialFactor, graph, agentId) : initialFactor
+  const [mode, setMode] = useState<Mode>(initialMode ?? (initial?.level_type as Mode) ?? 'boolean')
+  function seed(nextMode: Mode, nextAgentId: string): DesignFactor {
+    const ownerId = nextMode === 'boolean' ? personaNodeId : nextAgentId
+    const existing = existingFor(ownerId, nextMode === 'boolean' ? 'config.enabled' : PERSONA_FACTOR_PATH)
+    if (existing?.level_type === nextMode || (nextMode === 'boolean' && existing && !existing.level_type)) return {
+      ...existing,
+      level_type: nextMode,
+      level_labels: existing.level_labels ?? existing.levels.map((level) => level ? 'Enabled' : 'Disabled'),
+    }
+    const owner = graph.nodes.find((node) => node.id === ownerId)
+    const factor: DesignFactor = {
+      name: existing?.name ?? computeFactorName(String(owner?.data.label || 'Persona'), nextMode === 'boolean' ? 'Enabled' : 'Personas', factors.map((factor) => factor.name)),
+      level_type: nextMode,
+      levels: nextMode === 'boolean' ? [false, true] : [],
+      level_labels: nextMode === 'boolean' ? ['Disabled', 'Enabled'] : undefined,
+    }
+    return nextMode === 'boolean' ? factor : reconcilePersonaFactor(factor, graph, ownerId)
+  }
+  const [draft, setDraft] = useState<DesignFactor>(() => {
+    const factor = initialMode ? seed(mode, agentId) : initial ?? seed(mode, agentId)
+    return { ...factor, level_type: factor.level_type ?? 'boolean', level_labels: factor.level_labels ?? factor.levels.map((level) => level ? 'Enabled' : 'Disabled') }
+  })
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState('')
+  const ownerId = mode === 'boolean' ? personaNodeId : agentId
+  const current = existingFor(ownerId, mode === 'boolean' ? 'config.enabled' : PERSONA_FACTOR_PATH)
+  const affected = mode === 'boolean' ? [persona] : connectedPersonas(graph, agentId)
+  const unavailable = (value: Mode) => value !== 'boolean' && !agentId
+    ? `${modes[value]} is unavailable because this Persona is not connected to an Agent. Connect this Persona to an Agent first.`
+    : personaFactorConflict(graph, factors, personaNodeId, value, agentId)
+  const blockedReason = unavailable(mode)
+  const labels = draft.level_labels ?? []
+  function change(nextMode: Mode, nextAgentId = agentId) {
+    setMode(nextMode)
+    setDraft(seed(nextMode, nextAgentId))
+    setError('')
+  }
+  function move(index: number, offset: number) {
+    const levels = [...draft.levels]
+    const nextLabels = [...labels]
+    ;[levels[index], levels[index + offset]] = [levels[index + offset], levels[index]]
+    ;[nextLabels[index], nextLabels[index + offset]] = [nextLabels[index + offset], nextLabels[index]]
+    setDraft({ ...draft, levels, level_labels: nextLabels })
+  }
+  async function commit(remove = false) {
+    if (!remove && blockedReason) return
+    setSaving(true)
+    setError('')
+    try {
+      if (remove && current) await onRemove(current.name)
+      else {
+        await onSave({ ...draft, name: draft.name.trim(), level_labels: labels.map((label) => label.trim()) }, ownerId, current?.name)
+        onClose()
+      }
+    } catch (error) {
+      setError(error instanceof Error ? error.message : 'Could not save the persona factor.')
+    } finally { setSaving(false) }
+  }
+  const valid = draft.name.trim() && ownerId && labels.length === draft.levels.length && labels.every((label) => label.trim()) && new Set(labels.map((label) => label.trim())).size === labels.length
+  return <Dialog open onOpenChange={(open) => !open && !saving && onClose()}>
+    <DialogContent className="sm:max-w-xl">
+      <DialogHeader>
+        <DialogTitle className="flex items-center gap-2"><Split className="size-5 text-chart-2" />Persona factor</DialogTitle>
+        <DialogDescription>Choose how personas vary across experimental cells.</DialogDescription>
+      </DialogHeader>
+      <div className="space-y-4">
+        {agents.length > 0 && <p className="text-xs text-muted-foreground">Applies to: {factorScopeLabel(graph, personaNodeId, 'persona')}</p>}
+        <div className="space-y-2"><Label>Factor type</Label><div className="flex flex-wrap gap-2">{(Object.keys(modes) as Mode[]).map((value) => <Button key={value} size="sm" variant={mode === value ? 'default' : unavailable(value) ? 'secondary' : 'outline'} aria-pressed={mode === value} className={unavailable(value) ? 'border-dashed border-border' : undefined} title={unavailable(value)} disabled={saving} onClick={() => change(value)}>{modes[value]}</Button>)}</div></div>
+        {blockedReason ? <p role="status" className="rounded-md border p-3 text-sm text-muted-foreground">{blockedReason}</p> : <>
+        <p className="text-xs text-muted-foreground">{mode === 'boolean' ? 'Enable or disable this Persona node.' : mode === 'persona_selection' ? 'Each cell receives exactly one connected persona.' : 'Each cell enables every connected persona, including deactivated personas, or disables them all.'}</p>
+        <div className="space-y-2"><Label htmlFor="persona-factor-name">Factor name</Label><Input id="persona-factor-name" value={draft.name} disabled={saving} onChange={(event) => setDraft({ ...draft, name: event.target.value })} /></div>
+        {mode !== 'boolean' && affected.length < (mode === 'persona_toggle' ? 1 : 2) && <p className="text-xs text-destructive">Connect at least {mode === 'persona_toggle' ? 'one persona' : 'two different personas'} before generating cells.</p>}
+        <div className="max-h-72 space-y-2 overflow-y-auto">{draft.levels.map((level, index) => <div key={index} className="flex items-center gap-2 rounded-md border p-2">
+          <div className="min-w-0 flex-1 space-y-1">
+            <p className="font-mono text-xs">{mode === 'boolean' ? (level ? 'Enabled' : 'Disabled') : mode === 'persona_toggle' ? ((level as string[]).length ? 'All enabled' : 'All disabled') : String(affected.find((node) => personaId(node) === (level as string[])[0])?.data.label ?? 'Unavailable persona')}{index === 0 && mode !== 'boolean' ? ' · default test selection' : ''}</p>
+            <Input aria-label={`Level ${index + 1} label`} value={labels[index] ?? ''} disabled={saving} onChange={(event) => setDraft({ ...draft, level_labels: labels.map((label, i) => i === index ? event.target.value : label) })} />
+          </div>
+          {mode !== 'boolean' && <><Button variant="ghost" size="icon-sm" aria-label="Move level up" disabled={saving || index === 0} onClick={() => move(index, -1)}><ArrowUp className="size-3.5" /></Button><Button variant="ghost" size="icon-sm" aria-label="Move level down" disabled={saving || index === draft.levels.length - 1} onClick={() => move(index, 1)}><ArrowDown className="size-3.5" /></Button></>}
+        </div>)}</div>
+        <p className="text-xs text-muted-foreground">Shared factors require matching Persona connections. Changes require design review and regeneration.</p>
+        </>}
+        {current && <Button variant="destructive" size="sm" disabled={saving} onClick={() => void commit(true)}>Remove factor</Button>}
+        {error && <p role="alert" className="text-sm text-destructive">{error}</p>}
+      </div>
+      <DialogFooter><Button variant="outline" disabled={saving} onClick={onClose}>Cancel</Button><Button disabled={saving || !valid || !!blockedReason} onClick={() => void commit()}>{saving ? 'Saving…' : 'Save factor'}</Button></DialogFooter>
+    </DialogContent>
+  </Dialog>
+}
diff --git a/frontend/src/components/protocol/PersonaFactorEditor.tsx b/frontend/src/components/protocol/PersonaFactorEditor.tsx
new file mode 100644
index 0000000..4b2080f
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaFactorEditor.tsx
@@ -0,0 +1,74 @@
+import type { ProtocolGraph } from '@/types/protocols'
+import { useState } from 'react'
+import { useDialogDraft } from './useDialogDraft'
+import { ArrowDown, ArrowUp } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import type { DesignFactor } from '@/types/experiments'
+
+export function PersonaFactorEditor({ factor, open, onOpenChange, onSave, onRemove, graph }: {
+  graph?: ProtocolGraph
+  factor: DesignFactor
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onSave: (factor: DesignFactor) => void | Promise<unknown>
+  onRemove?: () => Promise<unknown>
+}) {
+  const { draft, setDraft } = useDialogDraft(factor, { open, sessionKey: factor.name })
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState('')
+  const labels = draft.level_labels ?? []
+  function move(index: number, offset: number) {
+    const levels = [...draft.levels]
+    const nextLabels = [...labels]
+    ;[levels[index], levels[index + offset]] = [levels[index + offset], levels[index]]
+    ;[nextLabels[index], nextLabels[index + offset]] = [nextLabels[index + offset], nextLabels[index]]
+    setDraft({ ...draft, levels, level_labels: nextLabels })
+  }
+  async function commit(remove = false) {
+    setSaving(true)
+    setError('')
+    try {
+      if (remove) await onRemove?.()
+      else await onSave({ ...draft, name: draft.name.trim(), level_labels: labels.map((label) => label.trim()) })
+      onOpenChange(false)
+    } catch (error) {
+      setError(error instanceof Error ? error.message : 'Could not save the persona factor.')
+    } finally { setSaving(false) }
+  }
+  const valid = draft.name.trim() && labels.length === draft.levels.length && labels.every((label) => label.trim()) && new Set(labels.map((label) => label.trim())).size === labels.length
+  return <Dialog open={open} onOpenChange={(open) => !saving && onOpenChange(open)}>
+    <DialogContent className="sm:max-w-xl">
+      <DialogHeader>
+        <DialogTitle>{factor.level_type === 'persona_toggle' ? 'All personas on/off' : 'Persona levels'}</DialogTitle>
+        <DialogDescription>{factor.level_type === 'persona_toggle' ? 'Each cell receives all connected personas or none.' : 'Each cell receives exactly one connected persona.'} Add or disconnect Persona nodes on the canvas to change the levels.</DialogDescription>
+      </DialogHeader>
+      <div className="space-y-3">
+        <Label htmlFor="persona-factor-name">Factor name</Label>
+        <Input id="persona-factor-name" value={draft.name} disabled={saving} onChange={(event) => setDraft({ ...draft, name: event.target.value })} />
+        {draft.levels.length < 2 && <p className="text-xs text-destructive">Incomplete: connect at least two different personas before generating cells.</p>}
+        <div className="max-h-96 space-y-2 overflow-y-auto">
+          {draft.levels.map((level, index) => {
+            const id = (level as string[])[0]
+            const persona = graph?.nodes.find((node) => node.id === id && node.type === 'persona')
+            return <div key={index} className="flex items-center gap-2 rounded-md border p-2">
+              <div className="min-w-0 flex-1 space-y-1">
+                <p className="font-mono text-xs">{factor.level_type === 'persona_toggle' ? ((level as string[]).length ? 'All enabled' : 'All disabled') : persona?.data.label ?? labels[index] ?? 'Unavailable persona'}{index === 0 ? ' · default test selection' : ''}</p>
+                {factor.level_type !== 'persona_toggle' && graph && !persona && <p className="text-xs text-destructive">Unavailable: disconnect or restore this persona.</p>}
+                <Input aria-label={`Level ${index + 1} label`} value={labels[index] ?? ''} disabled={saving} onChange={(event) => setDraft({ ...draft, level_labels: labels.map((label, i) => i === index ? event.target.value : label) })} />
+              </div>
+              <Button variant="ghost" size="icon-sm" aria-label="Move level up" disabled={saving || index === 0} onClick={() => move(index, -1)}><ArrowUp className="size-3.5" /></Button>
+              <Button variant="ghost" size="icon-sm" aria-label="Move level down" disabled={saving || index === draft.levels.length - 1} onClick={() => move(index, 1)}><ArrowDown className="size-3.5" /></Button>
+            </div>
+          })}
+        </div>
+        <p className="text-xs text-muted-foreground">Individual persona switches are controlled by this connector. Changes require design review and regeneration.</p>
+        {onRemove && <div className="space-y-1"><Button variant="destructive" size="sm" disabled={saving} onClick={() => void commit(true)}>Remove factor</Button><p className="text-xs text-muted-foreground">Removing this factor enables all connected personas and restores their individual controls.</p></div>}
+        {error && <p role="alert" className="text-sm text-destructive">{error}</p>}
+      </div>
+      <DialogFooter><Button variant="outline" disabled={saving} onClick={() => onOpenChange(false)}>Cancel</Button><Button disabled={saving || !valid} onClick={() => void commit()}>{saving ? 'Saving…' : 'Save factor'}</Button></DialogFooter>
+    </DialogContent>
+  </Dialog>
+}
diff --git a/frontend/src/components/protocol/PersonaLibraryDialog.tsx b/frontend/src/components/protocol/PersonaLibraryDialog.tsx
new file mode 100644
index 0000000..afeb48e
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaLibraryDialog.tsx
@@ -0,0 +1,98 @@
+import { useState } from 'react'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { personasApi } from '@/api/client'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Textarea } from '@/components/ui/textarea'
+import { cardAccent } from '@/lib/utils'
+import type { Persona } from '@/types/personas'
+
+export function PersonaLibraryDialog({ open, onOpenChange, initialPrompt = '', onPick }: {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  initialPrompt?: string
+  onPick: (persona: Persona) => void
+}) {
+  const client = useQueryClient()
+  const query = useQuery({ queryKey: ['personas'], queryFn: personasApi.list, enabled: open })
+  const [editing, setEditing] = useState<Persona | null>(null)
+  const [name, setName] = useState('')
+  const [description, setDescription] = useState('')
+  const [prompt, setPrompt] = useState(initialPrompt)
+  const [confirmDelete, setConfirmDelete] = useState<string | null>(null)
+  const [search, setSearch] = useState('')
+  const save = useMutation({
+    mutationFn: () => editing
+      ? personasApi.update(editing.id, { expected_revision: editing.revision, name, description: description || null, prompt })
+      : personasApi.create({ name: name || undefined, description: description || null, prompt }),
+    onSuccess: (persona) => {
+      client.setQueryData<Persona[]>(['personas'], previous => [
+        ...(previous ?? []).filter(entry => entry.id !== persona.id), persona,
+      ])
+      client.invalidateQueries({ queryKey: ['personas'] })
+      setEditing(persona)
+      setName(persona.name)
+    },
+  })
+  const remove = useMutation({
+    mutationFn: personasApi.remove,
+    onSuccess: (_data, id) => {
+      client.setQueryData<Persona[]>(['personas'], previous => (previous ?? []).filter(entry => entry.id !== id))
+      client.invalidateQueries({ queryKey: ['personas'] })
+      setConfirmDelete(null)
+      if (editing?.id === id) reset()
+    },
+  })
+  function reset() {
+    setEditing(null)
+    setName('')
+    setDescription('')
+    setPrompt(initialPrompt)
+    save.reset()
+  }
+  const error = save.error ?? remove.error
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="max-h-[85dvh] overflow-y-auto sm:max-w-2xl">
+        <DialogHeader><DialogTitle>Persona library</DialogTitle></DialogHeader>
+        <p className="text-sm text-muted-foreground">Save reusable personality instructions. Existing nodes and published experiments keep their text when a library entry is edited or deleted. Select a saved entry again to use its latest text.</p>
+        <Input aria-label="Search saved personas" placeholder="Search personas…" value={search} onChange={event => setSearch(event.target.value)} />
+        {query.isLoading ? <p>Loading personas…</p> : query.isError ? <p className="text-destructive">Could not load saved personas.</p> : (
+          <div className="grid gap-2 sm:grid-cols-2">
+            {(query.data ?? []).filter(persona => `${persona.name} ${persona.description ?? ''}`.toLowerCase().includes(search.toLowerCase())).map(persona => (
+              <Card key={persona.id} style={cardAccent('var(--node-12)')} className="gap-2 p-3">
+                <p className="truncate font-medium">{persona.name}</p>
+                {persona.description && <p className="text-xs text-muted-foreground">{persona.description}</p>}
+                <p className="font-mono text-xs text-muted-foreground">Revision {persona.revision}{persona.source_filename ? ` · ${persona.source_filename}` : ''}</p>
+                <div className="flex flex-wrap gap-2">
+                  <Button size="sm" onClick={() => { onPick(persona); onOpenChange(false) }}>Use {persona.name}</Button>
+                  <Button size="sm" variant="outline" onClick={() => {
+                    setEditing(persona); setName(persona.name); setDescription(persona.description ?? ''); setPrompt(persona.prompt); save.reset()
+                  }}>Edit</Button>
+                  <Button size="sm" variant="destructive" disabled={remove.isPending} onClick={() => {
+                    if (confirmDelete === persona.id) remove.mutate(persona.id)
+                    else setConfirmDelete(persona.id)
+                  }}>{confirmDelete === persona.id ? 'Confirm delete' : 'Delete'}</Button>
+                  {confirmDelete === persona.id && <Button size="sm" variant="ghost" onClick={() => setConfirmDelete(null)}>Cancel</Button>}
+                </div>
+              </Card>
+            ))}
+            {query.data?.length === 0 && <p className="text-sm text-muted-foreground">No saved personas yet.</p>}
+          </div>
+        )}
+        <div className="space-y-3 border-t pt-3">
+          <div className="flex items-center justify-between"><p className="font-medium">{editing ? 'Edit saved persona' : 'New persona'}</p><Button size="sm" variant="ghost" onClick={reset}>New persona</Button></div>
+          <div className="space-y-1"><Label htmlFor="saved-persona-name">Name (optional)</Label><Input id="saved-persona-name" maxLength={255} value={name} onChange={event => setName(event.target.value)} placeholder="Suggested from the text if omitted" /></div>
+          <div className="space-y-1"><Label htmlFor="saved-persona-description">Description (optional)</Label><Input id="saved-persona-description" value={description} onChange={event => setDescription(event.target.value)} /></div>
+          <div className="space-y-1"><Label htmlFor="saved-persona-prompt">Instructions</Label><Textarea id="saved-persona-prompt" className="min-h-32 font-mono text-xs" value={prompt} onChange={event => setPrompt(event.target.value)} /></div>
+          <Button disabled={save.isPending} onClick={() => save.mutate()}>{save.isPending ? 'Saving…' : editing ? 'Save library changes' : 'Save to library'}</Button>
+          {save.isSuccess && <p className="text-sm text-muted-foreground">Saved. Choose “Use {save.data.name}” to apply it.</p>}
+          {error && <p role="alert" className="text-sm text-destructive">{error.message}</p>}
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/frontend/src/components/protocol/PersonaLibraryPicker.test.tsx b/frontend/src/components/protocol/PersonaLibraryPicker.test.tsx
new file mode 100644
index 0000000..f27c585
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaLibraryPicker.test.tsx
@@ -0,0 +1,75 @@
+import { useState } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { expect, it, vi } from 'vitest'
+import { personasApi } from '@/api/client'
+import type { Persona } from '@/types/personas'
+import type { PersonaNodeConfig } from '@/types/protocols'
+import { PersonaLibraryPicker } from './PersonaLibraryPicker'
+import { configForSavedPersona } from './usePersonaLibrary'
+
+const saved: Persona = {
+  id: 'saved-persona', name: 'Careful analyst', description: null, prompt: 'Original instructions',
+  source_filename: 'careful.md', traits: {}, revision: 1, prompt_sha256: 'original-hash', created_at: '', updated_at: '',
+}
+
+function renderPicker(config: PersonaNodeConfig) {
+  const client = new QueryClient({ defaultOptions: { queries: { retry: false, staleTime: Infinity } } })
+  client.setQueryData(['personas'], [saved])
+  function Harness() {
+    const [value, setValue] = useState(config)
+    return <><PersonaLibraryPicker value={value} onChange={setValue} /><output aria-label="Persona snapshot">{JSON.stringify(value)}</output></>
+  }
+  render(<QueryClientProvider client={client}><Harness /></QueryClientProvider>)
+  return client
+}
+
+it('retains snapshotted text and provenance when a library entry changes or is deleted', async () => {
+  const client = renderPicker(configForSavedPersona(saved))
+  client.setQueryData(['personas'], [{ ...saved, prompt: 'New instructions', revision: 2, prompt_sha256: 'new-hash' }])
+  await waitFor(() => expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent('original-hash'))
+  expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent('Original instructions')
+  client.setQueryData(['personas'], [])
+  await screen.findByText(/A saved entry is unavailable/)
+  expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent('Original instructions')
+})
+
+it('copies a saved persona into the node without a live library dependency', async () => {
+  renderPicker({ mode: 'text', persona_text: 'Custom instructions' })
+  fireEvent.click(screen.getByRole('button', { name: 'Manage personas / Save current' }))
+  fireEvent.click(await screen.findByRole('button', { name: 'Use Careful analyst' }))
+  const snapshot = JSON.parse(screen.getByLabelText('Persona snapshot').textContent!)
+  expect(snapshot.persona_text).toBe(saved.prompt)
+  expect(snapshot.persona_sources).toEqual([{ id: saved.id, revision: 1, prompt_sha256: 'original-hash' }])
+})
+
+it('saves plain text with optional metadata and edits the reusable entry separately from the snapshot', async () => {
+  vi.spyOn(personasApi, 'create').mockResolvedValue({ ...saved, prompt: 'Custom instructions' })
+  vi.spyOn(personasApi, 'list').mockResolvedValue([saved])
+  renderPicker({ mode: 'text', persona_text: 'Custom instructions' })
+  fireEvent.click(screen.getByRole('button', { name: 'Manage personas / Save current' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Save to library' }))
+  await waitFor(() => expect(personasApi.create).toHaveBeenCalledWith({ prompt: 'Custom instructions', name: undefined, description: null }))
+  expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent('Custom instructions')
+  expect(JSON.parse(screen.getByLabelText('Persona snapshot').textContent!).persona_id).toBeUndefined()
+})
+
+it('edits and deletes a library record without changing a node already using it', async () => {
+  const changed = { ...saved, prompt: 'Revised library instructions', revision: 2 }
+  vi.spyOn(personasApi, 'update').mockResolvedValue(changed)
+  vi.spyOn(personasApi, 'remove').mockResolvedValue(undefined)
+  vi.spyOn(personasApi, 'list').mockResolvedValue([changed])
+  renderPicker(configForSavedPersona(saved))
+  fireEvent.click(screen.getByRole('button', { name: 'Manage personas / Save current' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Edit' }))
+  fireEvent.change(screen.getByLabelText('Instructions'), { target: { value: changed.prompt } })
+  fireEvent.click(screen.getByRole('button', { name: 'Save library changes' }))
+  await waitFor(() => expect(personasApi.update).toHaveBeenCalledWith(saved.id, {
+    expected_revision: 1, name: saved.name, description: null, prompt: changed.prompt,
+  }))
+  expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent(saved.prompt)
+  fireEvent.click(screen.getByRole('button', { name: 'Delete' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Confirm delete' }))
+  await waitFor(() => expect(personasApi.remove).toHaveBeenCalledWith(saved.id, expect.anything()))
+  expect(screen.getByLabelText('Persona snapshot')).toHaveTextContent(saved.prompt)
+})
diff --git a/frontend/src/components/protocol/PersonaLibraryPicker.tsx b/frontend/src/components/protocol/PersonaLibraryPicker.tsx
new file mode 100644
index 0000000..1a72b95
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaLibraryPicker.tsx
@@ -0,0 +1,52 @@
+import { useState } from 'react'
+import { Plus, X } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Label } from '@/components/ui/label'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import type { PersonaNodeConfig } from '@/types/protocols'
+import { PersonaLibraryDialog } from './PersonaLibraryDialog'
+import { configForSavedPersona, usePersonaLibrary } from './usePersonaLibrary'
+
+export function PersonaLibraryPicker({ value, onChange }: {
+  value: PersonaNodeConfig
+  onChange: (config: PersonaNodeConfig) => void
+}) {
+  const { query, choices, selectionConfig } = usePersonaLibrary()
+  const [adding, setAdding] = useState(false)
+  const [managing, setManaging] = useState(false)
+  const selected = value.persona_ids?.length ? value.persona_ids : value.persona_id ? [value.persona_id] : []
+  const ids = [...selected, ...(adding || selected.length === 0 ? [''] : [])]
+  const unavailable = selected.some(id => !choices.some(choice => choice.id === id))
+  return (
+    <div className="space-y-2">
+      <Label>Choose from library</Label>
+      {ids.map((id, index) => (
+        <div key={index} className="flex gap-2">
+          <Select value={id || null} disabled={unavailable || query.isLoading} onValueChange={nextId => {
+            if (!nextId) return
+            const next = [...selected]
+            next[index] = nextId
+            onChange({ ...value, ...selectionConfig(next) })
+            setAdding(false)
+          }}>
+            <SelectTrigger className="min-w-0 flex-1"><SelectValue placeholder="Select a persona…">{() => choices.find(choice => choice.id === id)?.label ?? value.persona_label ?? 'Select a persona…'}</SelectValue></SelectTrigger>
+            <SelectContent>
+              {choices.map(choice => <SelectItem key={choice.id} value={choice.id}>{choice.label}</SelectItem>)}
+            </SelectContent>
+          </Select>
+          {ids.length > 1 && <Button type="button" variant="ghost" size="icon-sm" aria-label={`Remove persona ${index + 1}`} onClick={() => {
+            if (index === selected.length) setAdding(false)
+            else onChange({ ...value, ...selectionConfig(selected.filter((_, i) => i !== index)) })
+          }}><X className="size-3" /></Button>}
+        </div>
+      ))}
+      {unavailable && !query.isLoading && <p className="text-xs text-muted-foreground">A saved entry is unavailable. The stored persona text is preserved. Use the library manager to choose a replacement.</p>}
+      {query.isError && <p className="text-xs text-destructive">Could not load saved personas. Existing persona text is preserved.</p>}
+      <div className="flex flex-wrap gap-2">
+        {selected.length > 0 && selected.length < 5 && !adding && !unavailable && <Button type="button" variant="outline" size="sm" onClick={() => setAdding(true)}><Plus className="size-3" />Add another (max 5)</Button>}
+        <Button type="button" variant="outline" size="sm" onClick={() => setManaging(true)}>Manage personas / Save current</Button>
+      </div>
+      {managing && <PersonaLibraryDialog open onOpenChange={setManaging} initialPrompt={value.persona_text ?? ''} onPick={persona => onChange({ ...value, ...configForSavedPersona(persona) })} />}
+    </div>
+  )
+}
diff --git a/frontend/src/components/protocol/PersonaNodeInspector.tsx b/frontend/src/components/protocol/PersonaNodeInspector.tsx
index d1c404b..d4370d3 100644
--- a/frontend/src/components/protocol/PersonaNodeInspector.tsx
+++ b/frontend/src/components/protocol/PersonaNodeInspector.tsx
@@ -1,296 +1,43 @@
-import { useState } from 'react'
+import { Power, Split, User } from 'lucide-react'
 import { nodeAccent } from '@/lib/nodeAccent'
-import { User, Upload, Library, Plus, X } from 'lucide-react'
 import { Label } from '@/components/ui/label'
-import { Textarea } from '@/components/ui/textarea'
+import { Switch } from '@/components/ui/switch'
 import { Button } from '@/components/ui/button'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { EditableNodeTitle } from './EditableNodeTitle'
-import { FactorBindableField } from './FactorBindableField'
 import { NodeInspectorDialog } from './NodeInspectorDialog'
-import { PERSONA_LIBRARY } from './personaLibrary'
 import type { ProtocolNode, PersonaNodeData } from '@/types/protocols'
 
 const ACCENT = nodeAccent('persona')
 
-
-export function PersonaNodeInspector({
-  node,
-  experimentId,
-  factorNodeLabel,
-  onChange,
-  onDelete,
-  onClose,
-}: {
+export function PersonaNodeInspector({ node, onChange, onDelete, onClose, connectorFactorName }: {
   node: (ProtocolNode & { data: PersonaNodeData }) | null
-  experimentId: string | null
-  factorNodeLabel: string
   onChange: (nodeId: string, data: PersonaNodeData) => void
   onDelete: (nodeId: string) => void
   onClose: () => void
+  connectorFactorName?: string
 }) {
-  // Track multiple selected personas for combination (can include empty strings for unfilled slots)
-  const [selectedPersonas, setSelectedPersonas] = useState<string[]>(() => {
-    if (!node) return []
-    const config = node.data.config
-    // Initialize from persona_ids array if present, otherwise fall back to single persona_id
-    if (config.persona_ids && Array.isArray(config.persona_ids) && config.persona_ids.length > 0) {
-      return config.persona_ids as string[]
-    }
-    return config.persona_id ? [config.persona_id] : []
-  })
-
   if (!node) return null
-  const nodeId = node.id
   const data = node.data
   const config = data.config
   const bindings = data.factor_bindings ?? {}
-
-  function patchConfig(patch: Partial<PersonaNodeData['config']>) {
-    onChange(nodeId, { ...data, config: { ...config, ...patch } })
+  function unbind(path: string) {
+    const next = { ...bindings }; delete next[path]
+    onChange(node!.id, { ...data, factor_bindings: next })
   }
-
-  function bindFactor(fieldPath: string, factorName: string) {
-    onChange(nodeId, { ...data, factor_bindings: { ...bindings, [fieldPath]: factorName } })
-  }
-
-  function unbindFactor(fieldPath: string) {
-    const next = { ...bindings }
-    delete next[fieldPath]
-    onChange(nodeId, { ...data, factor_bindings: next })
-  }
-
-  async function handleFileUpload(e: React.ChangeEvent<HTMLInputElement>) {
-    const file = e.target.files?.[0]
-    if (!file) return
-    const text = await file.text()
-    patchConfig({
-      persona_text: text,
-      persona_file: file.name,
-      mode: 'file'
-    })
-  }
-
-  return (
-    <NodeInspectorDialog
-      open={true}
-      onOpenChange={onClose}
-      accent={ACCENT}
-      title={
-        <>
-          <User className="size-5" style={{ color: ACCENT }} />
-          <EditableNodeTitle label={data.label} placeholder="Persona" onCommit={(label) => onChange(nodeId, { ...data, label })} />
-        </>
-      }
-      onDelete={() => onDelete(nodeId)}
-      onClose={onClose}
-    >
-      <div className="space-y-6">
-
-        {/* Choose from library - multi-select to combine personas */}
-        <div className="space-y-2">
-          <div className="flex items-center justify-between">
-            <Label>Choose from library</Label>
-            {selectedPersonas.length > 0 && selectedPersonas.length < 5 && (
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={() => setSelectedPersonas([...selectedPersonas, ''])}
-                className="h-7 text-xs"
-              >
-                <Plus className="size-3 mr-1" />
-                Add another
-              </Button>
-            )}
-          </div>
-
-          {selectedPersonas.length === 0 ? (
-            <Select
-              value=""
-              onValueChange={(personaId) => {
-                const persona = PERSONA_LIBRARY.find(p => p.id === personaId)
-                if (persona && personaId) {
-                  setSelectedPersonas([personaId])
-                  patchConfig({
-                    persona_text: persona.prompt || '',
-                    persona_id: persona.id || null,
-                    persona_label: persona.label || null,
-                    mode: 'library'
-                  })
-                }
-              }}
-            >
-              <SelectTrigger>
-                <SelectValue placeholder="Select a validated persona..." />
-              </SelectTrigger>
-              <SelectContent>
-                {PERSONA_LIBRARY.map(p => (
-                  <SelectItem key={p.id} value={p.id}>
-                    <div className="flex items-center gap-2">
-                      <Library className="size-4" />
-                      {p.label}
-                    </div>
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          ) : (
-            <div className="space-y-2">
-              {selectedPersonas.map((personaId, index) => (
-                <div key={index} className="flex items-center gap-2">
-                  <Select
-                    value={personaId || ''}
-                    onValueChange={(newId) => {
-                      const newSelected = [...selectedPersonas]
-                      newSelected[index] = newId || ''
-                      const filtered = newSelected.filter(id => id)
-                      setSelectedPersonas(newSelected)
-
-                      // Combine all selected persona texts
-                      const combinedText = filtered
-                        .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.prompt ?? '')
-                        .filter(text => text)
-                        .join('\n\n')
-
-                      const labels = filtered
-                        .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.label)
-                        .filter(Boolean)
-                        .join(' + ')
-
-                      patchConfig({
-                        persona_text: combinedText,
-                        persona_id: filtered[0] || null,
-                        persona_ids: filtered, // Store all IDs for multi-select restoration
-                        persona_label: labels || null,
-                        mode: 'library'
-                      })
-                    }}
-                  >
-                    <SelectTrigger className="flex-1">
-                      <SelectValue placeholder={`Select persona ${index + 1}...`} />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {PERSONA_LIBRARY.map(p => (
-                        <SelectItem key={p.id} value={p.id}>
-                          <div className="flex items-center gap-2">
-                            <Library className="size-4" />
-                            {p.label}
-                          </div>
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                  <Button
-                    variant="ghost"
-                    size="icon-sm"
-                    onClick={() => {
-                      const newSelected = selectedPersonas.filter((_, i) => i !== index)
-                      setSelectedPersonas(newSelected)
-
-                      if (newSelected.length === 0) {
-                        patchConfig({
-                          persona_text: '',
-                          persona_id: null,
-                          persona_ids: [],
-                          persona_label: null,
-                          mode: 'text'
-                        })
-                      } else {
-                        // Recombine remaining personas
-                        const filtered = newSelected.filter(id => id)
-                        const combinedText = filtered
-                          .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.prompt ?? '')
-                          .filter(text => text)
-                          .join('\n\n')
-
-                        const labels = filtered
-                          .map(id => PERSONA_LIBRARY.find(p => p.id === id)?.label)
-                          .filter(Boolean)
-                          .join(' + ')
-
-                        patchConfig({
-                          persona_text: combinedText,
-                          persona_id: filtered[0] || null,
-                          persona_ids: filtered, // Store all IDs for multi-select restoration
-                          persona_label: labels || null,
-                          mode: 'library'
-                        })
-                      }
-                    }}
-                  >
-                    <X className="size-3" />
-                  </Button>
-                </div>
-              ))}
-              {selectedPersonas.length > 1 && (
-                <p className="text-xs text-muted-foreground">
-                  Combining {selectedPersonas.filter(id => id).length} personas
-                </p>
-              )}
-            </div>
-          )}
-        </div>
-
-        {/* File upload for skill.md */}
-        <div className="space-y-2">
-          <Label>Upload skill.md file</Label>
-          <div className="flex gap-2">
-            <Button
-              variant="outline"
-              size="sm"
-              className="w-full"
-              onClick={() => document.getElementById('persona-file-upload')?.click()}
-            >
-              <Upload className="size-4 mr-2" />
-              {config.persona_file || 'Choose .md file'}
-            </Button>
-            <input
-              id="persona-file-upload"
-              type="file"
-              accept=".md"
-              className="hidden"
-              onChange={handleFileUpload}
-            />
-          </div>
-        </div>
-
-        {/* Persona text with factor binding - toolbar creation like AgentNodeInspector */}
-        <FactorBindableField
-          experimentId={experimentId}
-          nodeId={node.id}
-          fieldPath="config"
-          creationInToolbar
-          defaultLabel="Persona"
-          nodeLabel={factorNodeLabel}
-          levelType="persona_text"
-          currentValue={config}
-          boundFactorName={bindings.config}
-          onBind={(name) => bindFactor('config', name)}
-          onUnbind={() => unbindFactor('config')}
-        >
-          {(trigger) => trigger}
-        </FactorBindableField>
-
-        {/* Persona text editor - all functionality preserved */}
-        <div className="space-y-2">
-          <Label htmlFor="persona-text">Persona text</Label>
-          <Textarea
-            id="persona-text"
-            value={config.persona_text || ''}
-            onChange={(e) => patchConfig({ persona_text: e.target.value })}
-            placeholder="You are extremely organized, very responsible, and very hardworking..."
-            className="min-h-32 font-mono text-sm"
-          />
-        </div>
-
-        {/* Help text */}
-        <div className="rounded-md bg-muted/50 p-3 text-xs text-muted-foreground space-y-1">
-          <p className="font-medium">How personas work:</p>
-          <p>Persona text is <strong>added to the beginning of the agent's system prompt</strong> at runtime.</p>
-          <p className="font-medium mt-2">Library personas:</p>
-          <p>Pre-defined personality configurations based on <strong>OCEAN personality dimensions</strong> (Openness, Conscientiousness, Extraversion, Agreeableness, Neuroticism). Includes combined profiles (Analyst, Explorer, Critic) and individual trait isolations (High/Low O, C, E, A, N). Use "Add another" to combine up to 5 personas.</p>
-        </div>
+  return <NodeInspectorDialog open onOpenChange={open => !open && onClose()} accent={ACCENT}
+    title={<><User className="size-5" style={{ color: ACCENT }} /><EditableNodeTitle label={data.label} placeholder="Persona" onCommit={label => onChange(node.id, { ...data, label })} /></>}
+    onDelete={() => onDelete(node.id)} onClose={onClose}>
+    <div className="space-y-4">
+      <p className="rounded-lg border px-3 py-2 text-xs text-muted-foreground"><span className="font-medium text-chart-2">Make factor</span> is in the node toolbar. Hover over the Persona node and click <Split className="inline size-3 text-chart-2" aria-label="Make factor" />. Use <Power className="inline size-3" aria-label="Power" /> to activate or deactivate it.</p>
+      <div className="space-y-2 rounded-lg border px-3 py-2">
+        <div className="flex items-center justify-between"><Label htmlFor="persona-enabled">Enabled</Label><Switch id="persona-enabled" checked={!!connectorFactorName || (config.enabled ?? true)} disabled={!!connectorFactorName || !!bindings.config} onCheckedChange={enabled => onChange(node.id, { ...data, config: { ...config, enabled } })} /></div>
+        <p className="text-xs text-muted-foreground">{connectorFactorName ? `Availability is controlled by connector factor ${connectorFactorName}. Remove it to restore individual controls.` : 'Off: the wired agent does not receive these persona instructions.'}</p>
+        {bindings['config.enabled'] && <p className="text-xs text-chart-2">Factor: {bindings['config.enabled']}</p>}
+        {bindings.config && <div className="space-y-2"><p className="text-xs text-muted-foreground">Legacy persona factor: {bindings.config}. Remove this binding before using the new factor modes. Its declaration remains in Design until removed or rebound.</p><Button variant="outline" size="sm" onClick={() => unbind('config')}>Remove legacy binding</Button></div>}
+        {connectorFactorName && Object.entries(bindings).filter(([path]) => path !== 'config').map(([path, name]) => <div key={path} className="space-y-1"><p className="text-xs text-destructive">Individual factor {name} conflicts with this connector.</p><Button variant="outline" size="sm" onClick={() => unbind(path)}>Remove individual binding</Button></div>)}
       </div>
-    </NodeInspectorDialog>
-  )
+      <div className="space-y-2"><Label>Persona</Label><p className="text-sm font-medium">{config.persona_label || data.label}</p>{config.persona_description && <p className="text-xs text-muted-foreground">{config.persona_description}</p>}{config.persona_file && <p className="font-mono text-xs text-muted-foreground">{config.persona_file}</p>}<pre className="max-h-[calc(100vh-24rem)] min-h-32 overflow-auto rounded-md border bg-muted/30 p-2 font-mono text-xs whitespace-pre-wrap">{config.persona_text || '(empty — unmodified system prompt)'}</pre></div>
+      <p className="text-xs text-muted-foreground">Instructions are prepended to the agent’s system prompt. Edit or upload personas in the Personas drawer, then add a new node to use them. Existing nodes and published experiments keep their saved text.</p>
+    </div>
+  </NodeInspectorDialog>
 }
diff --git a/frontend/src/components/protocol/PersonaTestSelectors.tsx b/frontend/src/components/protocol/PersonaTestSelectors.tsx
new file mode 100644
index 0000000..3d935c6
--- /dev/null
+++ b/frontend/src/components/protocol/PersonaTestSelectors.tsx
@@ -0,0 +1,26 @@
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { connectedPersonas, personaId, PERSONA_FACTOR_PATH } from '@/lib/personaFactors'
+import type { usePersonaTestSelection } from './usePersonaTestSelection'
+
+export function PersonaTestSelectors({ selection }: { selection: ReturnType<typeof usePersonaTestSelection> }) {
+  return <div className="space-y-2">{selection.owners.map((node) => {
+    const options = connectedPersonas(selection.graph!, node.id)
+    if (node.data.persona_factor_mode === 'persona_toggle') return <div key={node.id} className="space-y-1">
+      <p className="text-xs">{node.data.factor_bindings?.[PERSONA_FACTOR_PATH] || node.data.label}: personas for this test</p>
+      <Select value={selection.selections[node.id]} onValueChange={(value) => value && selection.setChoice(node.id, value)}>
+        <SelectTrigger className="w-full"><SelectValue>{selection.selections[node.id] === 'all' ? 'All enabled' : 'All disabled'}</SelectValue></SelectTrigger>
+        <SelectContent><SelectItem value="all">All enabled</SelectItem><SelectItem value="none">All disabled</SelectItem></SelectContent>
+      </Select>
+    </div>
+    return <div key={node.id} className="space-y-1">
+      <p className="text-xs">{node.data.factor_bindings?.[PERSONA_FACTOR_PATH] || node.data.label}: persona for this test</p>
+      <Select value={selection.selections[node.id]} onValueChange={(id) => id && selection.setChoice(node.id, id)}>
+        <SelectTrigger className="w-full"><SelectValue>{() => {
+          const selected = options.find((option) => personaId(option) === selection.selections[node.id])
+          return String(selected?.data.label ?? 'Choose a persona…')
+        }}</SelectValue></SelectTrigger>
+        <SelectContent>{options.map((option) => <SelectItem key={option.id} value={option.id}>{String(option.data.label)}</SelectItem>)}</SelectContent>
+      </Select>
+    </div>
+  })}{selection.error && <p role="alert" className="text-xs text-destructive">{selection.error}</p>}</div>
+}
diff --git a/frontend/src/components/protocol/ProtocolCanvas.test.tsx b/frontend/src/components/protocol/ProtocolCanvas.test.tsx
index d6b7eed..ac3ad9e 100644
--- a/frontend/src/components/protocol/ProtocolCanvas.test.tsx
+++ b/frontend/src/components/protocol/ProtocolCanvas.test.tsx
@@ -4,7 +4,7 @@ import { fireEvent, render, screen, waitFor, within } from '@testing-library/rea
 import userEvent from '@testing-library/user-event'
 import { MemoryRouter } from 'react-router-dom'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { datasetsApi, experimentsApi, mcpServersApi, protocolsApi, skillsApi } from '@/api/client'
+import { datasetsApi, experimentsApi, mcpServersApi, personasApi, protocolsApi, skillsApi } from '@/api/client'
 import { protocolGraphQueryKey } from '@/lib/protocolGraph'
 import type { Experiment } from '@/types/experiments'
 import {
@@ -13,11 +13,14 @@ import {
   defaultCriticGateNodeData,
   defaultDatasetNodeData,
   defaultMemoryNodeData,
+  defaultMcpToolNodeData,
   defaultOutputParserNodeData,
+  defaultPersonaNodeData,
   defaultReasonActPatternNodeData,
   defaultScriptNodeData,
   type AgentNodeData,
   type ProtocolGraph,
+  type ProtocolNode,
   type ProtocolRun,
   type TestRun,
 } from '@/types/protocols'
@@ -145,6 +148,31 @@ describe('ProtocolCanvas connector adds', () => {
     }))
   })
 
+  it('adds a chosen persona through the filtered drawer and keeps its inspector read-only', async () => {
+    vi.spyOn(personasApi, 'list').mockResolvedValue([])
+    const { client } = renderCanvas({
+      nodes: [{ id: 'agent', type: 'agent', position: { x: 100, y: 200 }, data: defaultAgentNodeData('Writer') }],
+      edges: [],
+    })
+    const agent = document.querySelector<HTMLElement>('[data-testid="rf__node-agent"]')!
+    fireEvent.click(agent.querySelector<HTMLButtonElement>('button[aria-label="Add Persona"]')!)
+    expect(screen.getByPlaceholderText('Search node types…')).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: /^Skills/ })).not.toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: /^Personas/ }))
+    expect(screen.getByPlaceholderText('Search personas…')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: /^Analyst/ }))
+    await waitFor(() => {
+      const graph = client.getQueryData<ProtocolGraph>(protocolGraphQueryKey('protocol-1'))!
+      const persona = graph.nodes.find(node => node.type === 'persona')!
+      expect(persona.data.config).toMatchObject({ persona_ids: ['01-analyst'], enabled: true })
+      expect(graph.edges).toEqual([expect.objectContaining({ source: persona.id, target: 'agent', targetHandle: 'persona' })])
+    })
+    const inspector = await screen.findByRole('dialog')
+    expect(within(inspector).getByRole('switch', { name: 'Enabled' })).toBeInTheDocument()
+    expect(within(inspector).queryByRole('textbox', { name: 'Persona text' })).not.toBeInTheDocument()
+    expect(within(inspector).queryByRole('button', { name: /Upload|Choose.*file|Manage personas/ })).not.toBeInTheDocument()
+  })
+
   it('shows the bypass marker on the canvas Agent badge', async () => {
     const run = protocolRun({
       status: 'completed',
@@ -250,6 +278,42 @@ describe('ProtocolCanvas connector adds', () => {
     })
   })
 
+  it.each(['persona_selection', 'persona_toggle'] as const)('creates a %s persona factor from a shared node and binds every connected Agent', async (mode) => {
+    const experiment = {
+      id: 'experiment-1', name: 'Experiment', description: null, hypothesis: null, design_type: 'factorial', task_brief: null,
+      design_spec: { factors: [], metrics: [] }, measurement_plan: null, dataset_ids: [], dataset_id: null,
+      locked_at: null, locked_protocol_revision_id: null, locked_design_spec: null, locked_measurement_plan: null,
+      created_at: '', updated_at: '', archived_at: null,
+    }
+    vi.spyOn(experimentsApi, 'get').mockResolvedValue(experiment)
+    const save = vi.spyOn(experimentsApi, 'update').mockResolvedValue(experiment)
+
+    const graph: ProtocolGraph = {
+      nodes: [
+        { id: 'agent', type: 'agent', position: { x: 100, y: 200 }, data: defaultAgentNodeData('Writer') },
+        { id: 'other', type: 'agent', position: { x: 300, y: 200 }, data: defaultAgentNodeData('Other') },
+        ...['a', 'b'].map((id) => ({ id, type: 'persona', position: { x: 100, y: 0 }, data: { label: `Persona ${id}`, config: { mode: 'library' as const, persona_id: id, persona_text: `Instructions ${id}`, persona_label: `Persona ${id}` } } })),
+      ],
+      edges: ['a', 'b'].flatMap((id) => ['agent', 'other'].map((target) => ({ id: `${id}-${target}`, source: id, target, targetHandle: 'persona' }))),
+    }
+    const { client } = renderCanvas(graph, 'experiment-1')
+    const makeFactor = document.querySelector<HTMLButtonElement>('[data-testid="rf__node-a"] button[aria-label="Make experimental factor"]')
+    expect(makeFactor).not.toBeNull()
+    fireEvent.click(makeFactor!)
+    await screen.findByRole('dialog')
+    fireEvent.click(screen.getByRole('button', { name: mode === 'persona_toggle' ? 'All personas on/off' : 'Persona levels' }))
+    fireEvent.click(screen.getByRole('button', { name: 'Save factor' }))
+    await waitFor(() => expect(save).toHaveBeenCalledWith('experiment-1', expect.objectContaining({ design_spec: expect.objectContaining({ factors: [{ name: 'Writer:Personas', level_type: mode, levels: mode === 'persona_toggle' ? [['a', 'b'], []] : [['a'], ['b']], level_labels: mode === 'persona_toggle' ? ['All enabled', 'All disabled'] : ['Persona a', 'Persona b'] }] }) })))
+    await waitFor(() => {
+      const persisted = client.getQueryData<ProtocolGraph>(protocolGraphQueryKey('protocol-1'))
+      expect(persisted?.nodes.find((node) => node.id === 'agent')?.data.factor_bindings).toEqual({ persona_selection: 'Writer:Personas' })
+      expect(persisted?.nodes.find((node) => node.id === 'agent')?.data.persona_factor_mode).toBe(mode)
+      expect(persisted?.nodes.find((node) => node.id === 'other')?.data.factor_bindings).toEqual({ persona_selection: 'Writer:Personas' })
+      expect(persisted?.nodes.find((node) => node.id === 'other')?.data.persona_factor_mode).toBe(mode)
+      expect(persisted?.nodes.filter((node) => node.type === 'persona')).toHaveLength(2)
+    })
+  })
+
   it.each(['tool_selection', 'tool_toggle'] as const)('creates a %s tool factor from the node hover menu and preserves connected nodes', async (mode) => {
     const experiment = {
       id: 'experiment-1', name: 'Experiment', description: null, hypothesis: null, design_type: 'factorial', task_brief: null,
@@ -815,6 +879,66 @@ describe('ProtocolCanvas connector adds', () => {
     })
   })
 
+  const onOffNodes: { kind: string; type: string; data: ProtocolNode['data'] }[] = [
+    { kind: 'skill', type: 'skill', data: { label: 'Subject', config: { skill_id: 'saved-skill', skill_name: 'Subject' } } },
+    { kind: 'persona', type: 'persona', data: defaultPersonaNodeData('Subject') },
+    { kind: 'tool', type: 'mcp_tool', data: defaultMcpToolNodeData('Subject') },
+    { kind: 'script', type: 'script', data: defaultScriptNodeData('Subject') },
+    { kind: 'dataset', type: 'dataset', data: defaultDatasetNodeData('Subject') },
+    { kind: 'knowledge', type: 'okf_bundle', data: { label: 'Subject', config: {
+      bundle_id: 'bundle', server_name: 'knowledge', bundle_path: '/bundle', bundle_label: 'Subject', tool_names: ['read_concept'],
+    } } },
+    { kind: 'sub-agent', type: 'sub_agent', data: defaultAgentNodeData('Subject') },
+  ]
+
+  it.each(onOffNodes.flatMap((node) => [true, false, undefined].map((enabled) => ({ ...node, enabled }))))(
+    'preserves $kind state ($enabled) when creating and editing an individual on/off factor',
+    async ({ kind, type, data, enabled }) => {
+      const user = userEvent.setup()
+      const experiment: Experiment = {
+        id: 'experiment-1', name: 'Experiment', description: null, hypothesis: null, design_type: 'factorial', task_brief: null,
+        design_spec: { factors: [], metrics: [] }, measurement_plan: null, dataset_ids: [], dataset_id: null,
+        locked_at: null, locked_protocol_revision_id: null, locked_design_spec: null, locked_measurement_plan: null,
+        created_at: '', updated_at: '', archived_at: null,
+      }
+      vi.spyOn(experimentsApi, 'get').mockImplementation(async () => experiment)
+      vi.spyOn(experimentsApi, 'update').mockImplementation(async (_id, patch) => {
+        Object.assign(experiment, patch)
+        return experiment
+      })
+      const fieldPath = kind === 'sub-agent' ? 'active' : 'config.enabled'
+      const nodeData = structuredClone(data)
+      if (kind === 'sub-agent') Object.assign(nodeData, { active: enabled })
+      else Object.assign(nodeData.config, { enabled })
+      const { client } = renderCanvas({
+        nodes: [{ id: 'subject', type, position: { x: 100, y: 100 }, data: nodeData }],
+        edges: [],
+      }, 'experiment-1')
+      await screen.findByText('Subject')
+      const assertState = async (name: string) => {
+        await waitFor(() => {
+          const node = client.getQueryData<ProtocolGraph>(protocolGraphQueryKey('protocol-1'))?.nodes[0]
+          expect(node?.data.factor_bindings).toEqual({ [fieldPath]: name })
+          if (kind === 'sub-agent') expect(node?.data.active).toBe(enabled ?? true)
+          else expect(node?.data.config).toMatchObject({ enabled: enabled ?? true })
+        })
+      }
+      fireEvent.click(screen.getByTitle('Make experimental factor'))
+      await user.click(await screen.findByRole('button', { name: `This ${kind} on/off` }))
+      await user.click(screen.getByRole('button', { name: 'Save factor' }))
+      await assertState('Subject:Enabled')
+
+      await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+      fireEvent.click(screen.getByTitle('Make experimental factor'))
+      fireEvent.change(await screen.findByLabelText('Factor name'), { target: { value: 'Renamed enabled' } })
+      await user.click(screen.getByRole('button', { name: 'Save factor' }))
+      await assertState('Renamed enabled')
+      expect(experiment.design_spec?.factors).toEqual([expect.objectContaining({
+        name: 'Renamed enabled', levels: [false, true], level_type: 'boolean',
+      })])
+    },
+  )
+
   it('keeps the Test Run label when a production replicate is running', async () => {
     const run = protocolRun()
     vi.mocked(protocolsApi.listRunHeads).mockResolvedValue([run])
diff --git a/frontend/src/components/protocol/ProtocolCanvas.tsx b/frontend/src/components/protocol/ProtocolCanvas.tsx
index f3b53ce..b83f026 100644
--- a/frontend/src/components/protocol/ProtocolCanvas.tsx
+++ b/frontend/src/components/protocol/ProtocolCanvas.tsx
@@ -1,3 +1,11 @@
+import { NodeSelectionDrawer } from './NodeSelectionDrawer'
+import type { PersonaNodeConfig } from '@/types/protocols'
+import { PersonaBrowserPanel } from './PersonaBrowserPanel'
+import { PERSONA_BROWSE, nodeDataForPersona } from './personaCatalog'
+import { PersonaFactorDialog } from './PersonaFactorDialog'
+import { reconcilePersonaFactor, personaFactorConflict, personaFactorOwner, PERSONA_FACTOR_PATH } from '@/lib/personaFactors'
+import { usePersonaTestSelection } from './usePersonaTestSelection'
+import { PersonaTestSelectors } from './PersonaTestSelectors'
 import { graphWithSharedFactor } from '@/lib/sharedFactors'
 import { reconcileSubAgentFactor, subAgentFactorConflict, subAgentFactorOwner, SUB_AGENT_FACTOR_PATH } from '@/lib/subAgentFactors'
 import { SubAgentFactorDialog } from './SubAgentFactorDialog'
@@ -109,7 +117,6 @@ import type { Skill } from '@/types/skills'
 import { AddNodePanel } from './AddNodePanel'
 import { AgentNodeInspector } from './AgentNodeInspector'
 import { agentTracedLabel, factorBoundField, factorCreationFields, revealsHiddenMcpServers, toolFactorServerId, type UnboundField } from './bindableFields'
-import { computeFactorName, seedStructuredLevels } from './factorLevels'
 import { CanvasControls } from './CanvasControls'
 import { CriticGateNodeInspector } from './CriticGateNodeInspector'
 import { ToolStepNodeInspector } from './ToolStepNodeInspector'
@@ -284,7 +291,7 @@ const CONNECTOR_PANEL_INFO: Record<ConnectorSlot, { allowedTypes: string[]; titl
   model: { allowedTypes: MODEL_NODE_TYPES, title: 'Add Model' },
   tool: { allowedTypes: [MCP_SERVER_BROWSE, 'script'], title: 'Add Tool' },
   memory: { allowedTypes: ['memory'], title: 'Add Memory' },
-  persona: { allowedTypes: ['persona'], title: 'Add Persona' },
+  persona: { allowedTypes: [PERSONA_BROWSE], title: 'Add Persona' },
   output_parser: { allowedTypes: ['output_parser'], title: 'Add Output Parser' },
   architectural_pattern: { allowedTypes: PATTERN_NODE_TYPES, title: 'Add Architectural Pattern' },
   skill: { allowedTypes: [SKILL_BROWSE], title: 'Add Skill' },
@@ -444,10 +451,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
         const toolIds = new Set(edges.filter((edge) => edge.targetHandle === 'tool' && (nds.find((node) => node.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.[TOOL_FACTOR_PATH] === factorName).map((edge) => edge.source).filter((id) => MCP_TOOL_NODE_TYPES.includes(nds.find((node) => node.id === id)?.type ?? '')))
         const scriptIds = new Set(edges.filter((edge) => edge.targetHandle === 'tool' && (nds.find((node) => node.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.[SCRIPT_FACTOR_PATH] === factorName).map((edge) => edge.source).filter((id) => nds.find((node) => node.id === id)?.type === 'script'))
         const skillIds = new Set(edges.filter((edge) => edge.targetHandle === 'skill' && (nds.find((node) => node.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.[SKILL_FACTOR_PATH] === factorName).map((edge) => edge.source))
+        const personaIds = new Set(edges.filter((edge) => edge.targetHandle === 'persona' && (nds.find((node) => node.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.[PERSONA_FACTOR_PATH] === factorName).map((edge) => edge.source))
         const datasetIds = new Set(edges.filter((edge) => ['dataset', 'resource', 'tool'].includes(edge.targetHandle ?? '') && (nds.find((node) => node.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.[DATASET_FACTOR_PATH] === factorName).map((edge) => edge.source).filter((id) => nds.find((node) => node.id === id)?.type === 'dataset'))
         return nds.map((n) => {
           if (subAgentIds.has(n.id)) return { ...n, data: { ...n.data, active: true } }
-          if (scriptIds.has(n.id) || toolIds.has(n.id) || skillIds.has(n.id) || datasetIds.has(n.id) || knowledgeIds.has(n.id)) return { ...n, data: { ...n.data, config: { ...(n.data.config as object), enabled: true } } }
+          if (scriptIds.has(n.id) || toolIds.has(n.id) || skillIds.has(n.id) || personaIds.has(n.id) || datasetIds.has(n.id) || knowledgeIds.has(n.id)) return { ...n, data: { ...n.data, config: { ...(n.data.config as object), enabled: true } } }
           const bindings = n.data.factor_bindings as Record<string, string> | undefined
           if (!bindings || !Object.values(bindings).includes(factorName)) return n
           const next = Object.fromEntries(Object.entries(bindings).filter(([, name]) => name !== factorName))
@@ -472,6 +480,10 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
             delete data.skill_selection
             delete data.skill_factor_mode
           }
+          if (bindings[PERSONA_FACTOR_PATH] === factorName) {
+            delete data.persona_selection
+            delete data.persona_factor_mode
+          }
           if (bindings[DATASET_FACTOR_PATH] === factorName) {
             delete data.dataset_selection
             delete data.dataset_factor_mode
@@ -523,6 +535,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
         else if (field.connectorFactor.kind === 'tool') setToolFactorNodeId(field.connectorFactor.nodeId)
         else if (field.connectorFactor.kind === 'script') setScriptFactorNodeId(field.connectorFactor.nodeId)
         else if (field.connectorFactor.kind === 'skill') setSkillFactorNodeId(field.connectorFactor.nodeId)
+        else if (field.connectorFactor.kind === 'persona') setPersonaFactorNodeId(field.connectorFactor.nodeId)
         else if (field.connectorFactor.kind === 'dataset') setDatasetFactorNodeId(field.connectorFactor.nodeId)
         else if (field.connectorFactor.kind === 'model') { setModelFactorLevelIndex(undefined); setModelFactorFieldPath(field.fieldPath); setModelFactorNodeId(field.connectorFactor.nodeId) }
         else if (field.connectorFactor.kind === 'pattern') { setPatternFactorFieldPath(field.fieldPath); setPatternFactorNodeId(field.connectorFactor.nodeId) }
@@ -566,6 +579,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
   // meaningful while addPanelOpen.
   const [serverBrowserOpen, setServerBrowserOpen] = useState(false)
   const [skillBrowserOpen, setSkillBrowserOpen] = useState(false)
+  const [personaBrowserOpen, setPersonaBrowserOpen] = useState(false)
   const [bundleBrowserOpen, setBundleBrowserOpen] = useState(false)
   const [documentBrowserOpen, setDocumentBrowserOpen] = useState(false)
   const [datasetBrowserOpen, setDatasetBrowserOpen] = useState(false)
@@ -688,11 +702,12 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
       if (draftScripts.error) throw new Error(draftScripts.error)
       if (draftTools.error) throw new Error(draftTools.error)
       if (draftSkills.error) throw new Error(draftSkills.error)
+      if (draftPersonas.error) throw new Error(draftPersonas.error)
       if (draftKnowledge.error) throw new Error(draftKnowledge.error)
       if (draftDatasets.error) throw new Error(draftDatasets.error)
       await protocolsApi.update(protocolId, { graph: toPersistedGraph(nodes, edges) })
       const published = await protocolsApi.publish(protocolId)
-      return { published, scope, rowIndex, skillOptions: { ...draftSubAgents.options, ...draftScripts.options, ...draftTools.options, ...draftSkills.options, ...draftKnowledge.options, ...draftDatasets.options } }
+      return { published, scope, rowIndex, skillOptions: { ...draftSubAgents.options, ...draftScripts.options, ...draftTools.options, ...draftSkills.options, ...draftPersonas.options, ...draftKnowledge.options, ...draftDatasets.options } }
     },
     onSuccess: async ({ published, scope, rowIndex, skillOptions }) => {
       queryClient.invalidateQueries({ queryKey: ['protocols', protocolId, 'revisions'] })
@@ -726,9 +741,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
   const publishedSubAgents = useSubAgentTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
   const draftSubAgents = useSubAgentTestSelection(pendingRunConfirm ? toPersistedGraph(nodes, edges) : undefined, pendingNodeId)
   const publishedSkills = useSkillTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
+  const publishedPersonas = usePersonaTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
   const publishedTools = useToolTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
   const publishedScripts = useScriptTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
   const draftSkills = useSkillTestSelection(pendingRunConfirm ? toPersistedGraph(nodes, edges) : undefined, pendingNodeId)
+  const draftPersonas = usePersonaTestSelection(pendingRunConfirm ? toPersistedGraph(nodes, edges) : undefined, pendingNodeId)
   const draftTools = useToolTestSelection(pendingRunConfirm ? toPersistedGraph(nodes, edges) : undefined, pendingNodeId)
   const draftScripts = useScriptTestSelection(pendingRunConfirm ? toPersistedGraph(nodes, edges) : undefined, pendingNodeId)
   const publishedKnowledge = useKnowledgeTestSelection(pendingRunConfirm ? publishedGraphQuery.data?.graph : undefined, pendingNodeId)
@@ -746,9 +763,10 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
       if (publishedScripts.error) throw new Error(publishedScripts.error)
       if (publishedTools.error) throw new Error(publishedTools.error)
       if (publishedSkills.error) throw new Error(publishedSkills.error)
+      if (publishedPersonas.error) throw new Error(publishedPersonas.error)
       if (publishedKnowledge.error) throw new Error(publishedKnowledge.error)
       if (publishedDatasets.error) throw new Error(publishedDatasets.error)
-      return protocolsApi.testRun(protocolId, publishedRow.binding || publishedSubAgents.owners.length || publishedScripts.owners.length || publishedTools.owners.length || publishedSkills.owners.length || publishedKnowledge.owners.length || publishedDatasets.owners.length ? { ...(publishedRow.binding ? { row_index: rowIndex } : {}), ...publishedSubAgents.options, ...publishedScripts.options, ...publishedTools.options, ...publishedSkills.options, ...publishedKnowledge.options, ...publishedDatasets.options } : undefined)
+      return protocolsApi.testRun(protocolId, publishedRow.binding || publishedSubAgents.owners.length || publishedScripts.owners.length || publishedTools.owners.length || publishedSkills.owners.length || publishedPersonas.owners.length || publishedKnowledge.owners.length || publishedDatasets.owners.length ? { ...(publishedRow.binding ? { row_index: rowIndex } : {}), ...publishedSubAgents.options, ...publishedScripts.options, ...publishedTools.options, ...publishedSkills.options, ...publishedPersonas.options, ...publishedKnowledge.options, ...publishedDatasets.options } : undefined)
     },
     onSuccess: (run) => {
       setRunId(run.id)
@@ -772,9 +790,10 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
       if (publishedScripts.error) throw new Error(publishedScripts.error)
       if (publishedTools.error) throw new Error(publishedTools.error)
       if (publishedSkills.error) throw new Error(publishedSkills.error)
+      if (publishedPersonas.error) throw new Error(publishedPersonas.error)
       if (publishedKnowledge.error) throw new Error(publishedKnowledge.error)
       if (publishedDatasets.error) throw new Error(publishedDatasets.error)
-      return protocolsApi.runNode(protocolId, nodeId, binding || publishedSubAgents.owners.length || publishedScripts.owners.length || publishedTools.owners.length || publishedSkills.owners.length || publishedKnowledge.owners.length || publishedDatasets.owners.length ? { ...(binding ? { row_index: rowIndex } : {}), ...publishedSubAgents.options, ...publishedScripts.options, ...publishedTools.options, ...publishedSkills.options, ...publishedKnowledge.options, ...publishedDatasets.options } : undefined)
+      return protocolsApi.runNode(protocolId, nodeId, binding || publishedSubAgents.owners.length || publishedScripts.owners.length || publishedTools.owners.length || publishedSkills.owners.length || publishedPersonas.owners.length || publishedKnowledge.owners.length || publishedDatasets.owners.length ? { ...(binding ? { row_index: rowIndex } : {}), ...publishedSubAgents.options, ...publishedScripts.options, ...publishedTools.options, ...publishedSkills.options, ...publishedPersonas.options, ...publishedKnowledge.options, ...publishedDatasets.options } : undefined)
     },
     onSuccess: (run) => {
       setRunId(run.id)
@@ -1244,7 +1263,9 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           toolFactorControlled: MCP_TOOL_NODE_TYPES.includes(n.type ?? '') && !!toolFactorOwner(toPersistedGraph(nodes, edges), n.id),
           scriptFactorControlled: n.type === 'script' && !!scriptFactorOwner(toPersistedGraph(nodes, edges), n.id),
           skillFactorLevelCount: factors.find((factor) => factor.name === (n.data.factor_bindings as Record<string, string> | undefined)?.[SKILL_FACTOR_PATH])?.levels.length,
+          personaFactorLevelCount: factors.find((factor) => factor.name === (n.data.factor_bindings as Record<string, string> | undefined)?.[PERSONA_FACTOR_PATH])?.levels.length,
           skillFactorControlled: n.type === 'skill' && !!skillFactorOwner(toPersistedGraph(nodes, edges), n.id),
+          personaFactorControlled: n.type === 'persona' && !!personaFactorOwner(toPersistedGraph(nodes, edges), n.id),
           datasetFactorLevelCount: factors.find((factor) => factor.name === (n.data.factor_bindings as Record<string, string> | undefined)?.[DATASET_FACTOR_PATH])?.levels.length,
           datasetFactorControlled: n.type === 'dataset' && !!datasetFactorOwner(toPersistedGraph(nodes, edges), n.id),
           isSubAgent: n.type === 'sub_agent',
@@ -1369,6 +1390,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
   function resetAddPanelBrowsers() {
     setServerBrowserOpen(false)
     setSkillBrowserOpen(false)
+    setPersonaBrowserOpen(false)
     setBundleBrowserOpen(false)
     setDocumentBrowserOpen(false)
     setDatasetBrowserOpen(false)
@@ -1521,6 +1543,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
   const requestPersonaFactor = useCallback((nodeId: string) => {
     if (!experimentId || experimentLocked) return
     setSelectedNodeId(null)
+    setConnectorFactorChoice(undefined)
     setPersonaFactorNodeId(nodeId)
   }, [experimentId, experimentLocked])
   const metricsByNode = useMemo(() => {
@@ -1738,6 +1761,10 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
       return
     }
     // Ditto for skills -- see SKILL_BROWSE in skillCatalog.ts.
+    if (nodeType === PERSONA_BROWSE) {
+      setPersonaBrowserOpen(true)
+      return
+    }
     if (nodeType === SKILL_BROWSE) {
       setSkillBrowserOpen(true)
       return
@@ -1975,6 +2002,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
 
   // Same shape as addServerNode: the node is created with the skill already
   // bound, and everything after this is the ordinary addNode path.
+  function addPersonaNode(config: PersonaNodeConfig) {
+    setPersonaBrowserOpen(false)
+    addNode('persona', nodeDataForPersona(config))
+  }
+
   function addSkillNode(skill: Skill) {
     setSkillBrowserOpen(false)
     addNode('skill', nodeDataForSkill(skill))
@@ -2099,6 +2131,14 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
       return { ...node, data: { ...node.data, skill_selection: factor.levels[0] ?? [] } }
     }))
   }, [factors, experimentLocked, setNodes])
+  useEffect(() => {
+    if (experimentLocked) return
+    setNodes((current) => current.map((node) => {
+      const factor = factors.find((factor) => (factor.level_type === 'persona_selection' || factor.level_type === 'persona_toggle') && (node.data.factor_bindings as Record<string, string> | undefined)?.[PERSONA_FACTOR_PATH] === factor.name)
+      if (!factor || JSON.stringify(node.data.persona_selection) === JSON.stringify(factor.levels[0] ?? [])) return node
+      return { ...node, data: { ...node.data, persona_selection: factor.levels[0] ?? [] } }
+    }))
+  }, [factors, experimentLocked, setNodes])
   useEffect(() => {
     if (experimentLocked) return
     setNodes((current) => current.map((node) => {
@@ -2257,8 +2297,8 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
 
   return (
     <ProtocolCanvasActionsProvider value={canvasActions}>
-      <div className="flex h-full w-full">
-        <div ref={paneRef} className="relative flex-1">
+      <div className="flex h-full min-w-0 w-full">
+        <div ref={paneRef} className="relative min-w-0 flex-1">
           <ReactFlow
             nodes={nodesWithRunStatus}
             edges={renderedEdges}
@@ -2385,7 +2425,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
                 setRunErrorDismissed(false)
                 setPendingRunConfirm({ type: 'graph' })
               }}
-              title="Test this protocol; choose a skill level for each connector factor"
+              title="Test this protocol; choose a level for each connector factor"
             >
               <Play className="size-4" />
               {testRunIsRunning ? 'Test Run running…' : 'Test Run'}
@@ -2431,55 +2471,61 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
             </div>
           )}
         </div>
-        {addPanelOpen && serverBrowserOpen ? (
-          <McpServerBrowserPanel
-            onPick={addServerNode}
-            onConnect={addClientToolNode}
-            onBack={() => setServerBrowserOpen(false)}
-            onClose={closeAddPanel}
-            revealHiddenServers={revealsHiddenMcpServers(nodes)}
-          />
-        ) : addPanelOpen && skillBrowserOpen ? (
-          <SkillBrowserPanel onPick={addSkillNode} onBack={() => setSkillBrowserOpen(false)} onClose={closeAddPanel} />
-        ) : addPanelOpen && bundleBrowserOpen ? (
-          <OkfBundleBrowserPanel
-            onPick={addBundleNode}
-            onBack={() => setBundleBrowserOpen(false)}
-            onClose={closeAddPanel}
-          />
-        ) : addPanelOpen && documentBrowserOpen ? (
-          <OkfDocumentBrowserPanel
-            onPick={addDocumentNode}
-            onBack={() => setDocumentBrowserOpen(false)}
-            onClose={closeAddPanel}
-          />
-        ) : addPanelOpen && datasetBrowserOpen ? (
-          <DatasetBrowserPanel
-            onPick={addDatasetNode}
-            onBack={() => setDatasetBrowserOpen(false)}
-            onClose={closeAddPanel}
-          />
-        ) : addPanelOpen ? (
-          <AddNodePanel
-            onAdd={addNode}
-            onClose={closeAddPanel}
-            allowedTypes={
-              pendingConnectorAdd
-                ? CONNECTOR_PANEL_INFO[pendingConnectorAdd.slot].allowedTypes
-                : pendingMainEdgeAdd || pendingEdgeInsert
-                  ? MAIN_FLOW_NODE_TYPES
-                  : undefined
-            }
-            title={
-              pendingConnectorAdd
-                ? CONNECTOR_PANEL_INFO[pendingConnectorAdd.slot].title
-                : pendingMainEdgeAdd
-                  ? 'Connect a step'
-                  : pendingEdgeInsert
-                    ? 'Insert a step'
-                    : undefined
-            }
-          />
+        {addPanelOpen ? (
+          <NodeSelectionDrawer>
+            {serverBrowserOpen ? (
+              <McpServerBrowserPanel
+                onPick={addServerNode}
+                onConnect={addClientToolNode}
+                onBack={() => setServerBrowserOpen(false)}
+                onClose={closeAddPanel}
+                revealHiddenServers={revealsHiddenMcpServers(nodes)}
+              />
+            ) : personaBrowserOpen ? (
+              <PersonaBrowserPanel onPick={addPersonaNode} onBack={() => setPersonaBrowserOpen(false)} onClose={closeAddPanel} />
+            ) : skillBrowserOpen ? (
+              <SkillBrowserPanel onPick={addSkillNode} onBack={() => setSkillBrowserOpen(false)} onClose={closeAddPanel} />
+            ) : bundleBrowserOpen ? (
+              <OkfBundleBrowserPanel
+                onPick={addBundleNode}
+                onBack={() => setBundleBrowserOpen(false)}
+                onClose={closeAddPanel}
+              />
+            ) : documentBrowserOpen ? (
+              <OkfDocumentBrowserPanel
+                onPick={addDocumentNode}
+                onBack={() => setDocumentBrowserOpen(false)}
+                onClose={closeAddPanel}
+              />
+            ) : datasetBrowserOpen ? (
+              <DatasetBrowserPanel
+                onPick={addDatasetNode}
+                onBack={() => setDatasetBrowserOpen(false)}
+                onClose={closeAddPanel}
+              />
+            ) : (
+              <AddNodePanel
+                onAdd={addNode}
+                onClose={closeAddPanel}
+                allowedTypes={
+                  pendingConnectorAdd
+                    ? CONNECTOR_PANEL_INFO[pendingConnectorAdd.slot].allowedTypes
+                    : pendingMainEdgeAdd || pendingEdgeInsert
+                      ? MAIN_FLOW_NODE_TYPES
+                      : undefined
+                }
+                title={
+                  pendingConnectorAdd
+                    ? CONNECTOR_PANEL_INFO[pendingConnectorAdd.slot].title
+                    : pendingMainEdgeAdd
+                      ? 'Connect a step'
+                      : pendingEdgeInsert
+                        ? 'Insert a step'
+                        : undefined
+                }
+              />
+            )}
+          </NodeSelectionDrawer>
         ) : MCP_TOOL_NODE_TYPES.includes(selectedNode?.type ?? '') ? (
           <McpToolNodeInspector
             node={{ id: selectedNode!.id, type: selectedNode!.type!, position: selectedNode!.position, data: selectedNode!.data as McpToolNodeData }}
@@ -2547,11 +2593,10 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
         ) : selectedNode?.type === 'persona' ? (
           <PersonaNodeInspector
             node={{ id: selectedNode.id, type: 'persona', position: selectedNode.position, data: selectedNode.data as PersonaNodeData }}
-            experimentId={experimentId}
-            factorNodeLabel={factorNodeLabel}
             onChange={updateNodeData}
             onDelete={requestDeleteNode}
             onClose={() => setSelectedNodeId(null)}
+            connectorFactorName={personaFactorOwner(toPersistedGraph(nodes, edges), selectedNode.id)}
           />
         ) : selectedNode?.type === 'skill' ? (
           <SkillNodeInspector
@@ -2669,15 +2714,17 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           }
           onPublishAndRun={() => publishAndRunMutation.mutate({ scope: pendingRunConfirm, rowIndex: draftRow.rowIndex })}
           confirmLabel={pendingRunConfirm.type === 'graph' ? 'Test Run' : undefined}
-          confirmDisabled={!!publishedSourceError || !!publishedSubAgents.error || !!publishedScripts.error || !!publishedTools.error || !!publishedSkills.error || !!publishedKnowledge.error || !!publishedDatasets.error || (pendingHasRow && !!publishedRow.error)}
-          publishDisabled={!!draftRow.error || !!draftSubAgents.error || !!draftScripts.error || !!draftTools.error || !!draftSkills.error || !!draftKnowledge.error || !!draftDatasets.error}
+          confirmDisabled={!!publishedSourceError || !!publishedSubAgents.error || !!publishedScripts.error || !!publishedTools.error || !!publishedSkills.error || !!publishedPersonas.error || !!publishedKnowledge.error || !!publishedDatasets.error || (pendingHasRow && !!publishedRow.error)}
+          publishDisabled={!!draftRow.error || !!draftSubAgents.error || !!draftScripts.error || !!draftTools.error || !!draftSkills.error || !!draftPersonas.error || !!draftKnowledge.error || !!draftDatasets.error}
           additionalContent={<div className="space-y-3">
             {publishedSubAgents.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published Sub-Agents · run published v{publishedRevision}</p><SubAgentTestSelectors selection={publishedSubAgents} /></div>}
             {showDraftInputs && draftSubAgents.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Draft Sub-Agents · publish and run</p><SubAgentTestSelectors selection={draftSubAgents} /></div>}
             {publishedSkills.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published skills · run published v{publishedRevision}</p><SkillTestSelectors selection={publishedSkills} /></div>}
+            {publishedPersonas.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published personas · run published v{publishedRevision}</p><PersonaTestSelectors selection={publishedPersonas} /></div>}
             {publishedTools.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published tools · run published v{publishedRevision}</p><ToolTestSelectors selection={publishedTools} /></div>}
             {publishedScripts.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published scripts · run published v{publishedRevision}</p><ScriptTestSelectors selection={publishedScripts} /></div>}
             {showDraftInputs && draftSkills.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Draft skills · publish and run</p><SkillTestSelectors selection={draftSkills} /></div>}
+            {showDraftInputs && draftPersonas.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Draft personas · publish and run</p><PersonaTestSelectors selection={draftPersonas} /></div>}
             {showDraftInputs && draftTools.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Draft tools · publish and run</p><ToolTestSelectors selection={draftTools} /></div>}
             {showDraftInputs && draftScripts.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Draft scripts · publish and run</p><ScriptTestSelectors selection={draftScripts} /></div>}
             {publishedKnowledge.owners.length > 0 && <div className="space-y-2"><p className="text-xs">Published knowledge · run published v{publishedRevision}</p><KnowledgeTestSelectors selection={publishedKnowledge} /></div>}
@@ -2708,6 +2755,7 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
             else if (field.connectorFactor.kind === 'tool') setToolFactorNodeId(field.connectorFactor.nodeId)
             else if (field.connectorFactor.kind === 'script') setScriptFactorNodeId(field.connectorFactor.nodeId)
             else if (field.connectorFactor.kind === 'skill') setSkillFactorNodeId(field.connectorFactor.nodeId)
+            else if (field.connectorFactor.kind === 'persona') setPersonaFactorNodeId(field.connectorFactor.nodeId)
             else if (field.connectorFactor.kind === 'dataset') setDatasetFactorNodeId(field.connectorFactor.nodeId)
             else if (field.connectorFactor.kind === 'model') { setModelFactorLevelIndex(undefined); setModelFactorFieldPath(field.fieldPath); setModelFactorNodeId(field.connectorFactor.nodeId) }
             else if (field.connectorFactor.kind === 'pattern') { setPatternFactorFieldPath(field.fieldPath); setPatternFactorNodeId(field.connectorFactor.nodeId) }
@@ -2839,11 +2887,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => next.level_type === 'boolean' ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            active: next.levels[0],
+            active: node.data.active ?? true,
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), active: next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, subAgentFactorNodeId, 'sub_agent', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -2878,11 +2926,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => next.level_type === 'boolean' ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            config: { ...(node.data.config as object), enabled: next.levels[0] },
+            config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true },
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), 'config.enabled': next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, skillFactorNodeId, 'skill', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -2917,11 +2965,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => isIndividualToolMode(next.level_type as ToolFactorMode) ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            ...(next.level_type === 'boolean' ? { config: { ...(node.data.config as object), enabled: next.levels[0] } } : next.level_type === 'tool_names' ? { config: { ...(node.data.config as object), tool_names: next.levels[0] ?? [] } } : { tool_selection: next.levels[0] ?? [], tool_factor_mode: next.level_type }),
+            ...(next.level_type === 'boolean' ? { config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true } } : next.level_type === 'tool_names' ? { config: { ...(node.data.config as object), tool_names: next.levels[0] ?? [] } } : { tool_selection: next.levels[0] ?? [], tool_factor_mode: next.level_type }),
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), [toolFactorPath(next.level_type as ToolFactorMode)]: next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, toolFactorNodeId, 'tool', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -2957,11 +3005,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => isIndividualScriptMode(next.level_type as ScriptFactorMode) ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            ...(next.level_type === 'boolean' ? { config: { ...(node.data.config as object), enabled: next.levels[0] } } : { script_selection: next.levels[0] ?? [], script_factor_mode: next.level_type }),
+            ...(next.level_type === 'boolean' ? { config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true } } : { script_selection: next.levels[0] ?? [], script_factor_mode: next.level_type }),
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), [scriptFactorPath(next.level_type as ScriptFactorMode)]: next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, scriptFactorNodeId, 'script', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -2997,11 +3045,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => next.level_type === 'boolean' ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            config: { ...(node.data.config as object), enabled: next.levels[0] },
+            config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true },
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), 'config.enabled': next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, knowledgeFactorNodeId, 'knowledge', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -3036,11 +3084,11 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
           if (previousName) {
             renameFactorBindings(previousName, next.name)
-            setFactorBaseline(next.name, next.levels[0])
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
           }
           setNodes((current) => next.level_type === 'boolean' ? current.map((node) => node.id === ownerId ? { ...node, data: {
             ...node.data,
-            config: { ...(node.data.config as object), enabled: next.levels[0] },
+            config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true },
             factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), 'config.enabled': next.name },
           } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, datasetFactorNodeId, 'dataset', next).nodes as unknown as Node[])
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
@@ -3059,56 +3107,45 @@ export const ProtocolCanvas = forwardRef<ProtocolCanvasHandle, {
           queryClient.invalidateQueries({ queryKey: ['experiments', experimentId, 'design-impact'] })
         }}
       />}
-      {personaFactorNodeId && (() => {
-        const personaNode = nodes.find((n) => n.id === personaFactorNodeId)
-        if (!personaNode) return null
-        const boundFactorName = (personaNode.data.factor_bindings as Record<string, string> | undefined)?.config
-        const existingFactor = factors.find((f) => f.name === boundFactorName)
-        return (
-          <FactorEditorDialog
-            key={personaFactorNodeId}
-            graph={toPersistedGraph(nodes, edges)}
-            open
-            onOpenChange={(open) => {
-              if (!open) setPersonaFactorNodeId(null)
-            }}
-            factor={
-              existingFactor || {
-                name: computeFactorName(agentTracedLabel(personaNode, edges, nodes), 'Persona', factors.map((f) => f.name)),
-                levels: seedStructuredLevels(personaNode.data.config, 'persona_text'),
-                level_type: 'persona_text',
-              }
-            }
-            boundField={{ nodeId: personaFactorNodeId, fieldPath: 'config' }}
-            canvasAgentCount={nodes.filter((node) => node.type === 'agent' || node.type === 'sub_agent').length}
-            onSave={async (factor) => {
-              const fresh = await experimentsApi.get(experimentId!)
-              if (
-                (fresh.design_spec?.factors ?? []).some(
-                  (existing) => existing.name === factor.name && existing.name !== boundFactorName,
-                )
-              )
-                throw new Error('A factor with this name already exists.')
-              await experimentsApi.update(experimentId!, {
-                design_spec: {
-                  ...fresh.design_spec,
-                  factors: [
-                    ...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== boundFactorName),
-                    factor,
-                  ],
-                },
-              })
-              bindFactorOnNode(personaFactorNodeId, 'config', factor.name)
-              // Mirror level 1 into the node so reconcileFactorBaselines sees
-              // canvas == baseline and doesn't rewrite the level back.
-              setNodes((current) => graphWithFactorBaseline({ nodes: current as unknown as ProtocolNode[], edges: [] }, factor.name, factor.levels[0]).nodes as unknown as Node[])
-              queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
-              queryClient.invalidateQueries({ queryKey: ['experiments', experimentId, 'design-impact'] })
-            }}
-            revealHiddenServers={revealsHiddenMcpServers(nodes)}
-          />
-        )
-      })()}
+      {personaFactorNodeId && <PersonaFactorDialog
+        key={personaFactorNodeId}
+        personaNodeId={personaFactorNodeId}
+        initialMode={connectorFactorChoice?.mode as 'boolean' | 'persona_selection' | 'persona_toggle' | undefined}
+        graph={toPersistedGraph(nodes, edges)}
+        factors={factors}
+        onClose={() => setPersonaFactorNodeId(null)}
+        onSave={async (factor, ownerId, previousName) => {
+          const fresh = await experimentsApi.get(experimentId!)
+          const graph = toPersistedGraph(nodes, edges)
+          const conflict = personaFactorConflict(graph, fresh.design_spec?.factors ?? [], personaFactorNodeId, factor.level_type as 'boolean' | 'persona_selection' | 'persona_toggle', ownerId)
+          if (conflict) throw new Error(conflict)
+          if ((fresh.design_spec?.factors ?? []).some((existing) => existing.name === factor.name && existing.name !== previousName)) throw new Error('A factor with this name already exists.')
+          const next = factor.level_type === 'boolean' ? factor : reconcilePersonaFactor(factor, toPersistedGraph(nodes, edges), ownerId)
+          await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: [...(fresh.design_spec?.factors ?? []).filter((existing) => existing.name !== previousName), next] } })
+          if (previousName) {
+            renameFactorBindings(previousName, next.name)
+            if (next.level_type !== 'boolean') setFactorBaseline(next.name, next.levels[0])
+          }
+          setNodes((current) => next.level_type === 'boolean' ? current.map((node) => node.id === ownerId ? { ...node, data: {
+            ...node.data,
+            config: { ...(node.data.config as object), enabled: (node.data.config as { enabled?: boolean })?.enabled ?? true },
+            factor_bindings: { ...(node.data.factor_bindings as Record<string, string> | undefined), 'config.enabled': next.name },
+          } } : node) : graphWithSharedFactor({ nodes: current as unknown as ProtocolNode[], edges }, personaFactorNodeId, 'persona', next).nodes as unknown as Node[])
+          queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
+          queryClient.invalidateQueries({ queryKey: ['experiments', experimentId, 'design-impact'] })
+        }}
+        onRemove={async (name) => {
+          const fresh = await experimentsApi.get(experimentId!)
+          const graph = toPersistedGraph(nodes, edges)
+          const individual = graph.nodes.find((node) => node.id === personaFactorNodeId)?.data.factor_bindings?.['config.enabled'] === name
+          const shared = individual && graph.nodes.some((node) => node.id !== personaFactorNodeId && Object.values(node.data.factor_bindings ?? {}).includes(name))
+          if (!shared) await experimentsApi.update(experimentId!, { design_spec: { ...fresh.design_spec, factors: (fresh.design_spec?.factors ?? []).filter((factor) => factor.name !== name) } })
+          if (individual) setNodes((current) => current.map((node) => node.id === personaFactorNodeId ? { ...node, data: { ...node.data, factor_bindings: Object.fromEntries(Object.entries(node.data.factor_bindings as Record<string, string>).filter(([path]) => path !== 'config.enabled')) } } : node))
+          else removeFactorBindings(name)
+          queryClient.invalidateQueries({ queryKey: ['experiments', experimentId] })
+          queryClient.invalidateQueries({ queryKey: ['experiments', experimentId, 'design-impact'] })
+        }}
+      />}
       {editingFactor && (
         <FactorEditorDialog
           graph={toPersistedGraph(nodes, edges)}
diff --git a/frontend/src/components/protocol/SkillBrowserPanel.tsx b/frontend/src/components/protocol/SkillBrowserPanel.tsx
index e4d54c9..3d920ba 100644
--- a/frontend/src/components/protocol/SkillBrowserPanel.tsx
+++ b/frontend/src/components/protocol/SkillBrowserPanel.tsx
@@ -1,3 +1,6 @@
+import { Card } from '@/components/ui/card'
+import { nodeAccent } from '@/lib/nodeAccent'
+import { cardAccent } from '@/lib/utils'
 import { useState } from 'react'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { ArrowLeft, Plus, ScrollText, Trash2, X } from 'lucide-react'
@@ -56,7 +59,7 @@ export function SkillBrowserPanel({
   )
 
   return (
-    <div className="flex min-h-0 w-80 shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
+    <div className="flex min-h-0 min-w-0 w-full shrink-0 flex-col gap-3 overflow-hidden border-l p-4">
       <div className="flex shrink-0 items-center justify-between">
         <div className="flex min-w-0 items-center gap-1.5">
           <Button variant="ghost" size="icon-sm" aria-label="Back" onClick={onBack}>
@@ -91,14 +94,10 @@ export function SkillBrowserPanel({
       ) : (
         <div className="min-h-0 flex-1 space-y-1.5 overflow-y-auto p-1">
           {filtered.map((skill) => (
-            // Same metrics as McpServerBrowserPanel's rows (px-3 py-2.5,
-            // text-sm, three single-line rows) so the two browsers read as one
-            // list style. The card is a div rather than that panel's single
-            // <button> only because it also holds the delete control -- a
-            // button can't nest a button -- hence hover: here instead.
-            <div
+            <Card
               key={skill.id}
-              className="rounded-lg border bg-background px-3 py-2.5 text-sm shadow-[0_0_16px_-6px_var(--primary)] ring-1 ring-primary/20 transition-colors hover:bg-muted"
+              style={cardAccent(nodeAccent('skill'))}
+              className="gap-0 px-3 py-2.5 transition-colors hover:bg-muted"
             >
               {confirmingDeleteId === skill.id ? (
                 <div className="space-y-2">
@@ -127,7 +126,7 @@ export function SkillBrowserPanel({
                     onClick={() => onPick(skill)}
                     className="flex min-w-0 flex-1 cursor-pointer items-start gap-2.5 text-left"
                   >
-                    <ScrollText className="mt-0.5 size-4 shrink-0 text-primary" />
+                    <ScrollText className="mt-0.5 size-4 shrink-0 text-[color:var(--card-accent,var(--primary))]" />
                     <div className="min-w-0 flex-1">
                       <p className="truncate font-mono font-medium">{skill.name}</p>
                       {/* Truncated to one line, same as McpServerBrowserPanel's
@@ -166,7 +165,7 @@ export function SkillBrowserPanel({
                   )}
                 </div>
               )}
-            </div>
+            </Card>
           ))}
         </div>
       )}
diff --git a/frontend/src/components/protocol/bindableFields.ts b/frontend/src/components/protocol/bindableFields.ts
index 78cd73f..2445151 100644
--- a/frontend/src/components/protocol/bindableFields.ts
+++ b/frontend/src/components/protocol/bindableFields.ts
@@ -284,10 +284,9 @@ export function bindableFieldsForNode(node: Node): BindableFieldSpec[] {
       // listed by factorCreationFields and edited in the dedicated dialog.
       return [{ fieldPath: 'config.enabled', label: 'Enabled', levelType: 'boolean' }]
     case 'persona':
-      // Whole config, not config.persona_text: persona levels are config-shaped
-      // objects, and the baseline invariant (reconcileFactorBaselines) plus
-      // apply_factor_bindings both need the bound field to have the same shape.
-      return [{ fieldPath: 'config', label: 'Persona', levelType: 'persona_text' }]
+      // Retain discoverability of existing whole-config factors in Design.
+      // New factors use the three dedicated connector choices below.
+      return [{ fieldPath: 'config.enabled', label: 'This persona on/off', levelType: 'boolean' }, { fieldPath: 'config', label: 'Persona text (existing factors)', levelType: 'persona_text' }]
     case 'script':
       // Keep config discoverable for editing existing variant bindings.
       // New factors compare separate Script nodes through Script levels.
@@ -299,7 +298,7 @@ export function bindableFieldsForNode(node: Node): BindableFieldSpec[] {
 
 export interface UnboundField {
   pickerGroup?: { id: string; label: string; category: string; componentId: string; componentLabel: string }
-  connectorFactor?: { kind: 'agent' | 'script' | 'tool' | 'skill' | 'sub_agent' | 'dataset' | 'knowledge' | 'model' | 'pattern'; nodeId: string; mode: LevelType; agentId?: string }
+  connectorFactor?: { kind: 'agent' | 'script' | 'tool' | 'persona' | 'skill' | 'sub_agent' | 'dataset' | 'knowledge' | 'model' | 'pattern'; nodeId: string; mode: LevelType; agentId?: string }
   nodeId: string
   nodeLabel: string
   fieldPath: string
@@ -444,6 +443,7 @@ export function unboundBindableFields(nodes: Node[], edges: Edge[]): UnboundFiel
   const result: UnboundField[] = []
   for (const node of nodes) {
     if (['okf_bundle', 'okf_document'].includes(node.type ?? '') && edges.some((edge) => edge.source === node.id && edge.targetHandle === 'knowledge' && (nodes.find((target) => target.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.knowledge_selection)) continue
+    if (node.type === 'persona' && edges.some((edge) => edge.source === node.id && edge.targetHandle === 'persona' && (nodes.find((target) => target.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.persona_selection)) continue
     if (node.type === 'skill' && edges.some((edge) => edge.source === node.id && edge.targetHandle === 'skill' && (nodes.find((target) => target.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.skill_selection)) continue
     if (node.type === 'dataset' && edges.some((edge) => edge.source === node.id && edge.targetHandle === 'dataset' && (nodes.find((target) => target.id === edge.target)?.data.factor_bindings as Record<string, string> | undefined)?.dataset_selection)) continue
     const bindings = (node.data as { factor_bindings?: Record<string, string> })?.factor_bindings ?? {}
@@ -480,7 +480,7 @@ export function unboundBindableFields(nodes: Node[], edges: Edge[]): UnboundFiel
 export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField[] {
   const fields = unboundBindableFields(nodes, edges).filter((field) => {
     const kind = nodes.find((node) => node.id === field.nodeId)?.type
-    return !['script', 'mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool'].includes(kind ?? '') && kind !== 'skill' && kind !== 'dataset' && kind !== 'okf_bundle' && kind !== 'okf_document'
+    return !['script', 'mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool'].includes(kind ?? '') && kind !== 'persona' && kind !== 'skill' && kind !== 'dataset' && kind !== 'okf_bundle' && kind !== 'okf_document'
       && !(kind === 'sub_agent' && field.fieldPath === 'active')
       && !isPatternNode(kind) && field.fieldPath !== PATTERN_FACTOR_PATH
   })
@@ -517,9 +517,9 @@ export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField
     }
   }
   for (const node of nodes) {
-    if (!['script', 'mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool', 'skill', 'dataset', 'okf_bundle', 'okf_document'].includes(node.type ?? '')) continue
-    const kind = (node.type === 'okf_bundle' || node.type === 'okf_document' ? 'knowledge' : ['mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool'].includes(node.type ?? '') ? 'tool' : node.type) as 'script' | 'tool' | 'skill' | 'dataset' | 'knowledge'
-    const handles = (kind === 'tool' || kind === 'script') ? ['tool'] : kind === 'skill' ? ['skill'] : kind === 'knowledge' ? ['knowledge'] : ['dataset', 'resource', 'tool']
+    if (!['script', 'mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool', 'persona', 'skill', 'dataset', 'okf_bundle', 'okf_document'].includes(node.type ?? '')) continue
+    const kind = (node.type === 'okf_bundle' || node.type === 'okf_document' ? 'knowledge' : ['mcp_tool', 'mcp_scikit_learn', 'mcp_client_tool'].includes(node.type ?? '') ? 'tool' : node.type) as 'script' | 'tool' | 'persona' | 'skill' | 'dataset' | 'knowledge'
+    const handles = (kind === 'tool' || kind === 'script') ? ['tool'] : kind === 'persona' ? ['persona'] : kind === 'skill' ? ['skill'] : kind === 'knowledge' ? ['knowledge'] : ['dataset', 'resource', 'tool']
     const owners = nodes.filter((owner) => ['agent', 'sub_agent'].includes(owner.type ?? '') && edges.some((edge) => edge.source === node.id && edge.target === owner.id && handles.includes(edge.targetHandle ?? '')))
     if (!(node.data.factor_bindings as Record<string, string> | undefined)?.['config.enabled']) fields.push({
       nodeId: node.id, nodeLabel: agentTracedLabel(node, edges, nodes), fieldPath: 'config.enabled',
@@ -535,7 +535,7 @@ export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField
         const levelType = `${kind}_${mode}` as LevelType
         fields.push({
           nodeId: owner.id, nodeLabel: String(owner.data.label || 'Agent'), fieldPath: `${kind}_selection`,
-          fieldLabel: mode === 'selection' ? `${kind === 'script' ? 'Script' : kind === 'tool' ? 'Tool' : kind === 'skill' ? 'Skill' : kind === 'knowledge' ? 'Knowledge' : 'Dataset'} levels` : `All ${kind === 'script' ? 'scripts' : kind === 'tool' ? 'tools' : kind === 'knowledge' ? 'knowledge' : `${kind}s`} on/off`,
+          fieldLabel: mode === 'selection' ? `${kind === 'script' ? 'Script' : kind === 'tool' ? 'Tool' : kind === 'persona' ? 'Persona' : kind === 'skill' ? 'Skill' : kind === 'knowledge' ? 'Knowledge' : 'Dataset'} levels` : `All ${kind === 'script' ? 'scripts' : kind === 'tool' ? 'tools' : kind === 'knowledge' ? 'knowledge' : `${kind}s`} on/off`,
           levelType, currentValue: undefined,
           connectorFactor: { kind, nodeId: node.id, mode: levelType, agentId: owner.id },
         })
@@ -554,7 +554,7 @@ export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField
   const sharedChoices = new Set<string>()
   return fields.filter((field) => {
     const choice = field.connectorFactor
-    if (!choice || !['skill', 'dataset', 'knowledge', 'script', 'tool', 'sub_agent', 'pattern'].includes(choice.kind) || choice.mode === 'boolean' || choice.mode === 'tool_names' || choice.mode === 'script_config' || (choice.kind === 'pattern' && field.fieldPath !== PATTERN_FACTOR_PATH)) return true
+    if (!choice || !['persona', 'skill', 'dataset', 'knowledge', 'script', 'tool', 'sub_agent', 'pattern'].includes(choice.kind) || choice.mode === 'boolean' || choice.mode === 'tool_names' || choice.mode === 'script_config' || (choice.kind === 'pattern' && field.fieldPath !== PATTERN_FACTOR_PATH)) return true
     const group = sharedFactorGroup(graph, choice.nodeId, choice.kind as SharedFactorKind)
     const key = `${choice.kind}:${choice.mode}:${field.fieldPath}:${group.recipients.map((node) => node.id).sort().join(',')}`
     if (sharedChoices.has(key)) return false
@@ -567,6 +567,7 @@ export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField
     const targets = nodes.filter((candidate) => agentKinds.includes(candidate.type ?? '') && edges.some((edge) => edge.source === node.id && edge.target === candidate.id))
     const owner = field.connectorFactor?.kind === 'sub_agent' && field.connectorFactor.mode === 'boolean' ? targets.length === 1 ? targets[0] : undefined : agentKinds.includes(node.type ?? '') ? node : targets.length === 1 ? targets[0] : undefined
     const category = field.connectorFactor?.kind === 'script' ? 'Scripts' : field.connectorFactor?.kind === 'tool' ? 'Tools' : field.connectorFactor?.kind === 'sub_agent' ? 'Sub-Agents'
+      : field.connectorFactor?.kind === 'persona' ? 'Personas'
       : field.connectorFactor?.kind === 'skill' ? 'Skills'
       : field.connectorFactor?.kind === 'dataset' ? 'Datasets'
       : field.connectorFactor?.kind === 'knowledge' ? 'Knowledge'
@@ -578,7 +579,7 @@ export function factorCreationFields(nodes: Node[], edges: Edge[]): UnboundField
       : kind.startsWith('pattern_') ? 'Pattern'
       : ({ skill: 'Skills', dataset: 'Datasets', mcp_tool: 'Tools', mcp_scikit_learn: 'Tools', mcp_client_tool: 'Tools', script: 'Tools', okf_bundle: 'Knowledge', okf_document: 'Knowledge', memory: 'Memory', output_parser: 'Output parser', critic_gate: 'Critic gate' } as Record<string, string>)[kind] ?? String(node.data.label || kind)
     const connectorChoice = field.connectorFactor && field.connectorFactor.kind !== 'agent' && field.connectorFactor.kind !== 'model' && field.connectorFactor.kind !== 'pattern' && field.connectorFactor.mode !== 'boolean' && field.connectorFactor.mode !== 'tool_names' && field.connectorFactor.mode !== 'script_config'
-    const sharedScope = field.connectorFactor && ['skill', 'dataset', 'knowledge', 'script', 'tool', 'sub_agent', 'pattern'].includes(field.connectorFactor.kind)
+    const sharedScope = field.connectorFactor && ['persona', 'skill', 'dataset', 'knowledge', 'script', 'tool', 'sub_agent', 'pattern'].includes(field.connectorFactor.kind)
       ? factorScopeLabel(graph, field.connectorFactor.nodeId, field.connectorFactor.kind as SharedFactorKind) : undefined
     const sharedRecipients = sharedScope && field.connectorFactor
       ? sharedFactorGroup(graph, field.connectorFactor.nodeId, field.connectorFactor.kind as SharedFactorKind).recipients.map((node) => node.id).sort() : []
diff --git a/frontend/src/components/protocol/connectionValidation.test.ts b/frontend/src/components/protocol/connectionValidation.test.ts
index d87f718..335e5ed 100644
--- a/frontend/src/components/protocol/connectionValidation.test.ts
+++ b/frontend/src/components/protocol/connectionValidation.test.ts
@@ -1,10 +1,26 @@
 import type { Connection, Edge, Node } from '@xyflow/react'
 import { describe, expect, it } from 'vitest'
 import { isProtocolConnectionValid } from './connectionValidation'
+import { isMainEdge } from '@/lib/coordinationStrategy'
 
 const target: Node = { id: 'agent', type: 'agent', position: { x: 0, y: 0 }, data: {} }
 
 describe('isProtocolConnectionValid', () => {
+  it('treats a persona as configuration rather than an upstream pipeline input', () => {
+    expect(isMainEdge({ targetHandle: 'persona' })).toBe(false)
+    expect(isMainEdge({ targetHandle: null })).toBe(true)
+  })
+
+  it('allows a sequential handoff into an Agent that already has a persona', () => {
+    const upstream: Node = { ...target, id: 'upstream' }
+    const persona: Node = { ...target, id: 'persona', type: 'persona' }
+    const connection: Connection = { source: upstream.id, target: target.id, sourceHandle: null, targetHandle: null }
+    const personaEdge: Edge = { id: 'persona-edge', source: persona.id, target: target.id, targetHandle: 'persona' }
+    const nodes = [upstream, target, persona]
+    expect(isProtocolConnectionValid(connection, nodes, [personaEdge], true)).toBe(true)
+    expect(isProtocolConnectionValid(connection, nodes, [personaEdge, { ...connection, id: 'handoff' }], true)).toBe(false)
+  })
+
   it('allows the same Sub-Agent to connect to multiple parent Agents', () => {
     const child: Node = { id: 'child', type: 'sub_agent', position: { x: 0, y: 0 }, data: {} }
     const other = { ...target, id: 'other' }
@@ -53,6 +69,7 @@ describe('isProtocolConnectionValid', () => {
     ['tool', 'mcp_tool'],
     ['dataset', 'dataset'],
     ['skill', 'skill'],
+    ['persona', 'persona'],
     ['knowledge', 'okf_bundle'],
   ])('continues to accept multiple %s connections', (slot, sourceType) => {
     const firstSource: Node = { id: 'first', type: sourceType, position: { x: 0, y: 0 }, data: {} }
diff --git a/frontend/src/components/protocol/factorLevels.ts b/frontend/src/components/protocol/factorLevels.ts
index c4ee2f2..f616505 100644
--- a/frontend/src/components/protocol/factorLevels.ts
+++ b/frontend/src/components/protocol/factorLevels.ts
@@ -27,6 +27,8 @@ export type LevelType =
   | 'tool_toggle'
   | 'skill_selection'
   | 'skill_toggle'
+  | 'persona_selection'
+  | 'persona_toggle'
   | 'sub_agent_selection'
   | 'sub_agent_toggle'
   | 'dataset_selection'
@@ -52,6 +54,8 @@ export const LEVEL_TYPE_LABELS: Record<LevelType, string> = {
   tool_toggle: 'All agent tools on/off',
   skill_selection: 'Skills as levels',
   skill_toggle: 'All skills on/off',
+  persona_selection: 'Persona levels',
+  persona_toggle: 'All personas on/off',
   sub_agent_selection: 'Sub-Agent levels',
   sub_agent_toggle: 'All agent sub-agents on/off',
   dataset_selection: 'Dataset levels',
@@ -80,6 +84,8 @@ export function isStructuredLevelType(type: LevelType): boolean {
     type === 'tool_toggle' ||
     type === 'skill_selection' ||
     type === 'skill_toggle' ||
+    type === 'persona_selection' ||
+    type === 'persona_toggle' ||
     type === 'sub_agent_selection' ||
     type === 'sub_agent_toggle' ||
     type === 'dataset_selection' ||
diff --git a/frontend/src/components/protocol/layout.ts b/frontend/src/components/protocol/layout.ts
index 5640a09..ae1db0c 100644
--- a/frontend/src/components/protocol/layout.ts
+++ b/frontend/src/components/protocol/layout.ts
@@ -27,7 +27,7 @@ const CONNECTOR_X: {
     knowledge: 0.9,
     model: 0.08,
     sub_agents: 0.32,
-    persona: 0.45,
+    persona: 0.4,
     memory: 0.58,
     tool: 0.8,
     // Added after the other seven, and placed after Tool rather than among
@@ -60,8 +60,8 @@ export const SUB_AGENT_CHILD_OFFSET_Y = 320
 /** The `left` style for each of a host card's connectors, as a percentage
  * string — for the `<Handle>`, its caption and its "+" stub, which must all
  * sit at the same x. */
-export function connectorLefts(host: 'agent' | 'critic_gate' | 'tool_step'): Record<ConnectorSlot, string> {
-  const table = CONNECTOR_X[host]
+export function connectorLefts(host: 'agent' | 'sub_agent' | 'critic_gate' | 'tool_step'): Record<ConnectorSlot, string> {
+  const table = CONNECTOR_X[host === 'sub_agent' ? 'agent' : host]
   const slots = Object.keys(CONNECTOR_X.agent) as ConnectorSlot[]
   return Object.fromEntries(slots.map((slot) => [slot, `${(table[slot] ?? 0.5) * 100}%`])) as Record<ConnectorSlot, string>
 }
diff --git a/frontend/src/components/protocol/nodes/AgentNode.tsx b/frontend/src/components/protocol/nodes/AgentNode.tsx
index 1e9deeb..5995d1e 100644
--- a/frontend/src/components/protocol/nodes/AgentNode.tsx
+++ b/frontend/src/components/protocol/nodes/AgentNode.tsx
@@ -27,6 +27,7 @@ import { NodeSummaryLine } from './NodeSummaryLine'
 // layout.ts) -- otherwise a node can land under a connector that isn't the one
 // that asked for it.
 const CONNECTOR_LEFT = connectorLefts('agent')
+const SUB_AGENT_PARENT_LEFT = '55%'
 
 export function AgentNode({
   id,
@@ -62,6 +63,7 @@ export function AgentNode({
   }
 }) {
   const isSubAgent = data.isSubAgent === true
+  const personaLeft = CONNECTOR_LEFT.persona
   const accent = nodeAccent(isSubAgent ? 'sub_agent' : 'agent')
   const badge = nodeRunBadge(data.runStatus, data.runTruncated, data.runBypassed)
   // Peers are offered to the model as function schemas -- that is the only
@@ -123,12 +125,14 @@ export function AgentNode({
   return (
     <div
       style={cardAccent(accent)}
-      className={`group relative flex min-h-20 w-72 flex-col justify-center rounded-md border bg-card px-2.5 py-3.5 shadow-[0_0_12px_-6px_var(--card-accent)] ring-1 ring-[color:var(--card-accent)]/40 ${
+      className={`group relative flex min-h-20 w-72 flex-col rounded-md border bg-card shadow-[0_0_12px_-6px_var(--card-accent)] ring-1 ring-[color:var(--card-accent)]/40 ${
         selected ? 'ring-2 ring-[color:var(--card-accent)]' : ''
       } ${isActive ? '' : 'opacity-50'}`}
     >
+      <div className="group/agent-body flex flex-1 flex-col justify-center px-2.5 py-3.5">
       <NodeHoverToolbar
         nodeId={id}
+        hoverClassName="pointer-events-none group-hover/agent-body:pointer-events-auto group-hover/agent-body:opacity-100"
         isActive={isActive}
         onToggleActive={controlled ? undefined : () => updateNodeData(id, { active: !isActive })}
         onMakeFactor={experimentLocked ? undefined : isSubAgent ? requestSubAgentFactor && (() => requestSubAgentFactor(id)) : requestAgentFactor && (() => requestAgentFactor(id))}
@@ -150,6 +154,25 @@ export function AgentNode({
           Architectural Pattern connector's own label/stub live OUTSIDE the
           card on the left of this edge, so neither competes for this corner. */}
       {factorCount > 0 && <NodeFactorBadge count={factorCount} className="-top-3 -right-3" />}
+      <div className="flex items-center gap-1.5">
+        <Bot className="size-3.5 shrink-0 text-[color:var(--card-accent)]" />
+        <span className="truncate text-xs font-medium" title={data.label}>
+          {data.label || (isSubAgent ? 'Sub-Agent' : 'Agent')}
+        </span>
+        {data.leadRole && (
+          <Badge
+            variant="outline"
+            title={data.leadRole === 'supervisor'
+              ? 'This agent briefs the workers wired to it and writes the final answer, which is the recorded result'
+              : 'The conversation starts here -- this agent gets the task and its answer is the recorded result'}
+            className="h-4 shrink-0 border-[color:var(--card-accent)]/60 px-1.5 text-[10px] text-[color:var(--card-accent)]"
+          >
+            {data.leadRole === 'supervisor' ? 'Supervisor' : 'Lead'}
+          </Badge>
+        )}
+      </div>
+      <NodeSummaryLine text={summary || null} warning={warnings.length > 0 ? warnings : null} />
+      </div>
       {/* Main flow is left-to-right -- the bottom sub-connectors stay on the
           bottom edge regardless, since a config source hangs below a node no
           matter which way the main flow runs.
@@ -179,44 +202,13 @@ export function AgentNode({
             type="source"
             id="sub_agents"
             position={Position.Top}
-            style={{ left: '50%' }}
+            style={{ left: SUB_AGENT_PARENT_LEFT }}
             title="Parent Agent"
             className="!size-2 !border-2 !bg-background !border-[color:var(--card-accent)]"
           />
-          <ConnectorHandleLabel left="50%" side="top">Parent</ConnectorHandleLabel>
+          <ConnectorHandleLabel left={SUB_AGENT_PARENT_LEFT} side="top">Parent</ConnectorHandleLabel>
         </>
       )}
-      <div className="flex items-center gap-1.5">
-        <Bot className="size-3.5 shrink-0 text-[color:var(--card-accent)]" />
-        {/* Renaming happens in the Inspector's own title now (click it,
-            same as the experiment name) -- not here anymore. */}
-        <span className="truncate text-xs font-medium" title={data.label}>
-          {data.label || (isSubAgent ? 'Sub-Agent' : 'Agent')}
-        </span>
-        {/* Inline on the title row rather than hung off a corner: all three
-            corners are spoken for (run status and the factor badge share the
-            top-right, the Pattern/Skill captions sit above the top-left), and
-            "this is the agent that leads" reads as part of the node's identity
-            anyway. `outline` so it states a role without competing with the
-            run-status badge, which is the thing that actually changes. */}
-        {data.leadRole && (
-          <Badge
-            variant="outline"
-            title={
-              data.leadRole === 'supervisor'
-                ? 'This agent briefs the workers wired to it and writes the final answer, which is the recorded result'
-                : 'The conversation starts here -- this agent gets the task and its answer is the recorded result'
-            }
-            className="h-4 shrink-0 border-[color:var(--card-accent)]/60 px-1.5 text-[10px] text-[color:var(--card-accent)]"
-          >
-            {data.leadRole === 'supervisor' ? 'Supervisor' : 'Lead'}
-          </Badge>
-        )}
-      </div>
-      <NodeSummaryLine
-        text={summary || null}
-        warning={warnings.length > 0 ? warnings : null}
-      />
       {/* FOUR connectors live on the TOP edge -- Pattern, Skill, Dataset,
           Knowledge, in that reading order -- all of them "what this agent IS
           configured with" rather than a runtime capability, which is what
@@ -296,12 +288,12 @@ export function AgentNode({
         type="target"
         id="persona"
         position={Position.Top}
-        style={{ left: CONNECTOR_LEFT.persona }}
+        style={{ left: personaLeft }}
         title="Persona -- OCEAN personality traits for experimental manipulation"
         className="!size-2 !border-2 !bg-background !border-[color:var(--card-accent)]"
       />
-      <ConnectorHandleLabel left={CONNECTOR_LEFT.persona} side="top">Persona</ConnectorHandleLabel>
-      <ConnectorAddStub nodeId={id} slot="persona" left={CONNECTOR_LEFT.persona} side="top" />
+      <ConnectorHandleLabel left={personaLeft} side="top">Persona</ConnectorHandleLabel>
+      <ConnectorAddStub nodeId={id} slot="persona" left={personaLeft} side="top" alwaysVisible factorName={data.factor_bindings?.persona_selection} factorLevelCount={data.personaFactorLevelCount as number | undefined} factorOnOff={data.persona_factor_mode === 'persona_toggle'} />
       {/* Dataset -- the data an agent works ON, as opposed to the Tool
           connector's "capabilities it works WITH". UNCAPPED, like
           Skill/Knowledge/Tool: a cell's workspace holds one dataset per named
diff --git a/frontend/src/components/protocol/nodes/ConnectorAddStub.tsx b/frontend/src/components/protocol/nodes/ConnectorAddStub.tsx
index fa713ca..4c5ea5c 100644
--- a/frontend/src/components/protocol/nodes/ConnectorAddStub.tsx
+++ b/frontend/src/components/protocol/nodes/ConnectorAddStub.tsx
@@ -36,7 +36,7 @@ export function ConnectorAddStub({
 }) {
   const connections = useNodeConnections({ id: nodeId, handleType: 'target', handleId: slot })
   const { requestConnectorAdd } = useProtocolCanvasActions()
-  const factorLabel = slot === 'skill' ? 'Skills' : slot === 'dataset' ? 'Datasets' : slot === 'tool' ? 'Tools' : CONNECTOR_SLOT_LABELS[slot]
+  const factorLabel = slot === 'persona' ? 'Personas' : slot === 'skill' ? 'Skills' : slot === 'dataset' ? 'Datasets' : slot === 'tool' ? 'Tools' : CONNECTOR_SLOT_LABELS[slot]
 
   if (connections.length > 0 && !alwaysVisible) return null
 
@@ -51,6 +51,13 @@ export function ConnectorAddStub({
     </span>
   )
   const verticalLine = <div className="h-3 w-px bg-[color:var(--card-accent)]/50" />
+  // The button has 6px of padding beyond its visible endpoint. A further
+  // 3px gap puts the label 9px away, half the previous visible 18px gap.
+  const factorLabelPosition = side === 'top'
+    ? 'bottom-full mb-0.75 left-1/2 -translate-x-1/2'
+    : side === 'right'
+      ? 'left-full ml-0.75 top-1/2 -translate-y-1/2'
+      : 'top-full mt-0.75 left-1/2 -translate-x-1/2'
 
   // The whole stub (line + circle) is one <button>, not just the innermost
   // circle -- that circle alone is a ~14px target, easy to miss and land on
@@ -69,7 +76,7 @@ export function ConnectorAddStub({
       className={side === 'right' ? 'group/stub absolute top-1/2 -right-11 -translate-y-1/2' : side === 'top' ? 'group/stub absolute -top-11 -translate-x-1/2' : 'group/stub absolute -bottom-11 -translate-x-1/2'}
       style={side !== 'right' ? { left } : undefined}
     >
-      {factorName && <span className="pointer-events-none absolute bottom-[calc(100%+1.5rem)] left-1/2 -translate-x-1/2 whitespace-nowrap rounded border border-chart-2 bg-card px-1 font-mono text-[9px] text-chart-2" title={factorName}>{factorLabel} · {factorOnOff ? 'on/off' : `${factorLevelCount ?? 0} levels`}</span>}
+      {factorName && <span className={`pointer-events-none absolute ${factorLabelPosition} whitespace-nowrap rounded border border-chart-2 bg-card px-1 font-mono text-[9px] text-chart-2`} title={factorName}>{factorLabel} · {factorOnOff ? 'on/off' : `${factorLevelCount ?? 0} levels`}</span>}
     <button
       type="button"
       onClick={handleClick}
diff --git a/frontend/src/components/protocol/nodes/NodeHoverToolbar.tsx b/frontend/src/components/protocol/nodes/NodeHoverToolbar.tsx
index 76060ea..6f99e2c 100644
--- a/frontend/src/components/protocol/nodes/NodeHoverToolbar.tsx
+++ b/frontend/src/components/protocol/nodes/NodeHoverToolbar.tsx
@@ -50,8 +50,10 @@ export function NodeHoverToolbar({
   runAlone,
   swap,
   onMakeFactor,
+  hoverClassName = 'group-hover:opacity-100',
 }: {
   nodeId: string
+  hoverClassName?: string
   // Absent for pure config-source nodes (llm/memory/pattern) -- "deactivate"
   // has no meaning for something that isn't ever "run" in the first place,
   // so those node types only get Delete, not the power icon.
@@ -88,7 +90,7 @@ export function NodeHoverToolbar({
   const { deleteElements } = useReactFlow()
 
   return (
-    <div className="absolute bottom-full left-1/2 z-10 mb-1 flex -translate-x-1/2 items-center gap-0.5 rounded-md border bg-card px-1 py-0.5 opacity-0 shadow-[0_0_10px_-4px_var(--primary)] ring-1 ring-primary/20 transition-opacity group-hover:opacity-100">
+    <div className={`absolute bottom-full left-1/2 z-10 mb-1 flex -translate-x-1/2 items-center gap-0.5 rounded-md border bg-card p-0.5 opacity-0 shadow-[0_0_10px_-4px_var(--primary)] ring-1 ring-primary/20 transition-opacity ${hoverClassName}`}>
       {runAlone && (
         // A disabled Button gets `pointer-events-none`, which would also
         // swallow its own `title` tooltip -- wrapping it in a span that
@@ -97,7 +99,7 @@ export function NodeHoverToolbar({
         // ProtocolCanvasPage.tsx).
         <span title={runAlone.canRun ? undefined : "Has upstream input -- can't run alone yet"}>
           <ToolbarIconButton
-            label="Run this node's configuration; choose a skill level in the run dialog"
+            label="Run this node's configuration; choose connector factor levels in the run dialog"
             disabled={!runAlone.canRun}
             onClick={() => runAlone.canRun && runAlone.onRun()}
           >
diff --git a/frontend/src/components/protocol/nodes/PersonaNode.tsx b/frontend/src/components/protocol/nodes/PersonaNode.tsx
index b3a74cb..7c49792 100644
--- a/frontend/src/components/protocol/nodes/PersonaNode.tsx
+++ b/frontend/src/components/protocol/nodes/PersonaNode.tsx
@@ -1,34 +1,19 @@
 import { nodeAccent } from '@/lib/nodeAccent'
-import { type NodeProps } from '@xyflow/react'
+import { useReactFlow, type NodeProps } from '@xyflow/react'
 import { User } from 'lucide-react'
 import type { PersonaNodeData } from '@/types/protocols'
 import { boundFactorCount } from '../bindableFields'
 import { CircleNode } from './CircleNode'
 import { useProtocolCanvasActions } from '../ProtocolCanvasContext'
 
-// Configures an agent's personality traits (OCEAN framework) for experimental
-// manipulation. Three modes: Library (validated personas), Text (direct input),
-// or File (.md upload). Persona text prepends to the agent's system_prompt.
-// Real runtime effect via _resolve_persona_configs in protocol_execution.py.
-// Wires into Agent's persona connector (handleId="persona"), matching
-// CONNECTOR_PANEL_INFO.persona in ProtocolCanvas.tsx and _NODE_TYPE_TO_HANDLE
-// in protocol_execution.py. Connects via top handle like Dataset/Skill.
+// A persona node stores one instruction snapshot selected from the drawer.
 const ACCENT = nodeAccent('persona')
 
 export function PersonaNode({ id, data, selected }: NodeProps & { data: PersonaNodeData }) {
+  const { updateNodeData } = useReactFlow()
   const { requestPersonaFactor, experimentLocked } = useProtocolCanvasActions()
-
-  // Determine warning based on mode
-  let warning: string | undefined
-  const mode = data.config?.mode || 'library'
-
-  if (mode === 'library' && !data.config?.persona_id) {
-    warning = 'No persona selected'
-  } else if (mode === 'text' && !data.config?.persona_text) {
-    warning = 'No persona text provided'
-  } else if (mode === 'file' && !data.config?.persona_file) {
-    warning = 'No persona file uploaded'
-  }
+  const controlled = !!data.personaFactorControlled
+  const enabled = controlled || (data.config?.enabled ?? true)
 
   return (
     <CircleNode
@@ -40,9 +25,12 @@ export function PersonaNode({ id, data, selected }: NodeProps & { data: PersonaN
       placeholder="Persona"
       handleId="persona"
       handlePosition="bottom"
-      warning={warning}
-      factorCount={boundFactorCount(data)}
+      warning={data.config?.persona_id || data.config?.persona_text ? undefined : 'No persona selected'}
+      factorCount={controlled ? 1 : boundFactorCount(data)}
       onMakeFactor={!experimentLocked && requestPersonaFactor ? () => requestPersonaFactor(id) : undefined}
+      dimmed={!enabled}
+      isActive={enabled}
+      onToggleActive={controlled || data.factor_bindings?.config ? undefined : () => updateNodeData(id, { config: { ...data.config, enabled: !enabled } })}
     />
   )
 }
diff --git a/frontend/src/components/protocol/personaCatalog.ts b/frontend/src/components/protocol/personaCatalog.ts
new file mode 100644
index 0000000..d78d15e
--- /dev/null
+++ b/frontend/src/components/protocol/personaCatalog.ts
@@ -0,0 +1,7 @@
+import type { PersonaNodeConfig, PersonaNodeData } from '@/types/protocols'
+
+export const PERSONA_BROWSE = 'personas_browse'
+
+export function nodeDataForPersona(config: PersonaNodeConfig): PersonaNodeData {
+  return { label: config.persona_label || 'Persona', config: { ...config, enabled: true } }
+}
diff --git a/frontend/src/components/protocol/usePersonaLibrary.ts b/frontend/src/components/protocol/usePersonaLibrary.ts
new file mode 100644
index 0000000..f8bfee4
--- /dev/null
+++ b/frontend/src/components/protocol/usePersonaLibrary.ts
@@ -0,0 +1,39 @@
+import { useQuery } from '@tanstack/react-query'
+import { personasApi } from '@/api/client'
+import type { Persona } from '@/types/personas'
+import type { PersonaNodeConfig } from '@/types/protocols'
+import { PERSONA_LIBRARY } from './personaLibrary'
+
+export function configForSavedPersona(persona: Persona): PersonaNodeConfig {
+  return {
+    mode: 'library', persona_id: persona.id, persona_ids: [persona.id],
+    persona_label: persona.name, persona_description: persona.description,
+    persona_text: persona.prompt, persona_file: persona.source_filename,
+    persona_sources: [{ id: persona.id, revision: persona.revision, prompt_sha256: persona.prompt_sha256 }],
+  }
+}
+
+export function usePersonaLibrary() {
+  const query = useQuery({ queryKey: ['personas'], queryFn: personasApi.list })
+  const choices = [
+    ...PERSONA_LIBRARY,
+    ...(query.data ?? []).map(persona => ({ id: persona.id, label: persona.name, prompt: persona.prompt })),
+  ]
+  function selectionConfig(ids: string[]): PersonaNodeConfig {
+    const selected = ids.flatMap(id => {
+      const choice = choices.find(entry => entry.id === id)
+      return choice ? [choice] : []
+    })
+    return {
+      mode: 'library', persona_id: selected[0]?.id ?? null, persona_ids: selected.map(entry => entry.id),
+      persona_text: selected.map(entry => entry.prompt).filter(Boolean).join('\n\n'),
+      persona_label: selected.map(entry => entry.label).join(' + ') || null,
+      persona_file: null, persona_description: null,
+      persona_sources: ids.flatMap(id => {
+        const saved = query.data?.find(entry => entry.id === id)
+        return saved ? [{ id, revision: saved.revision, prompt_sha256: saved.prompt_sha256 }] : []
+      }),
+    }
+  }
+  return { query, choices, selectionConfig }
+}
diff --git a/frontend/src/components/protocol/usePersonaTestSelection.test.tsx b/frontend/src/components/protocol/usePersonaTestSelection.test.tsx
new file mode 100644
index 0000000..1f05d60
--- /dev/null
+++ b/frontend/src/components/protocol/usePersonaTestSelection.test.tsx
@@ -0,0 +1,23 @@
+import { act, renderHook } from '@testing-library/react'
+import { expect, it } from 'vitest'
+import type { ProtocolGraph } from '@/types/protocols'
+import { usePersonaTestSelection } from './usePersonaTestSelection'
+
+it('makes one preview choice per shared factor and resets when run scope changes', () => {
+  const graph = {
+    nodes: [
+      ...['one', 'two'].map(id => ({ id, type: 'agent', data: { persona_selection: ['a'], factor_bindings: { persona_selection: 'Personas' } } })),
+      ...['a', 'b'].map(id => ({ id, type: 'persona', data: { config: { persona_text: id, enabled: false } } })),
+    ],
+    edges: ['one', 'two'].flatMap(target => ['a', 'b'].map(source => ({ source, target, targetHandle: 'persona' }))),
+  } as unknown as ProtocolGraph
+  const original = JSON.stringify(graph)
+  const { result, rerender } = renderHook(({ nodeId }) => usePersonaTestSelection(graph, nodeId), { initialProps: { nodeId: undefined as string | undefined } })
+  expect(result.current.selections).toEqual({ one: 'a' })
+  expect(result.current.error).toBeNull()
+  act(() => result.current.setChoice('one', 'b'))
+  expect(result.current.options).toEqual({ persona_selections: { one: 'b' } })
+  rerender({ nodeId: 'two' })
+  expect(result.current.selections).toEqual({ two: 'a' })
+  expect(JSON.stringify(graph)).toBe(original)
+})
diff --git a/frontend/src/components/protocol/usePersonaTestSelection.ts b/frontend/src/components/protocol/usePersonaTestSelection.ts
new file mode 100644
index 0000000..94c100d
--- /dev/null
+++ b/frontend/src/components/protocol/usePersonaTestSelection.ts
@@ -0,0 +1,24 @@
+import { sharedFactorOwners, sharedGroupIssues } from '@/lib/sharedFactors'
+import { useEffect, useState } from 'react'
+import { connectedPersonas, personaId, PERSONA_FACTOR_PATH } from '@/lib/personaFactors'
+import type { ProtocolGraph } from '@/types/protocols'
+
+export function usePersonaTestSelection(graph: ProtocolGraph | undefined, nodeId?: string) {
+  const [choices, setChoices] = useState<Record<string, string>>({})
+  const owners = sharedFactorOwners(graph, PERSONA_FACTOR_PATH, nodeId)
+  const signature = JSON.stringify(owners.map((node) => [node.id, node.data.persona_factor_mode, node.data.persona_selection, connectedPersonas(graph!, node.id).map(personaId)]))
+  useEffect(() => { setChoices({}) }, [signature, nodeId])
+  const selections = Object.fromEntries(owners.map((node) => {
+    if (node.data.persona_factor_mode === 'persona_toggle') return [node.id, choices[node.id] ?? ((node.data.persona_selection as string[] | undefined)?.length ? 'all' : 'none')]
+    const ids = connectedPersonas(graph!, node.id).map(personaId)
+    const baseline = (node.data.persona_selection as string[] | undefined)?.[0]
+    return [node.id, choices[node.id] ?? (baseline && ids.includes(baseline) ? baseline : ids[0] ?? '')]
+  }))
+  const selectionError = owners.some((node) => {
+    const ids = node.data.persona_factor_mode === 'persona_toggle' ? selections[node.id] === 'all' ? connectedPersonas(graph!, node.id).map(personaId) : [] : [selections[node.id]]
+    return ids.some((id) => !connectedPersonas(graph!, node.id).some((persona) => persona.id === id))
+  }) ? 'Select a connected Persona for each shared group.' : null
+  const factors = owners.map((node) => ({ name: node.data.factor_bindings![PERSONA_FACTOR_PATH], level_type: (node.data.persona_factor_mode ?? 'persona_selection') as 'persona_selection' | 'persona_toggle', levels: [] }))
+  const error = sharedGroupIssues(graph, factors, 'persona')[0] ?? selectionError
+  return { graph, owners, selections, options: owners.length ? { persona_selections: selections } : {}, error, setChoice: (agentId: string, id: string) => setChoices((previous) => ({ ...previous, [agentId]: id })) }
+}
diff --git a/frontend/src/lib/coordinationStrategy.ts b/frontend/src/lib/coordinationStrategy.ts
index b20f467..1bc588b 100644
--- a/frontend/src/lib/coordinationStrategy.ts
+++ b/frontend/src/lib/coordinationStrategy.ts
@@ -14,6 +14,7 @@ export const CONNECTOR_HANDLES = new Set([
   'memory',
   'architectural_pattern',
   'skill',
+  'persona',
   'dataset',
   'resource',
   'knowledge',
diff --git a/frontend/src/lib/factorBindings.ts b/frontend/src/lib/factorBindings.ts
index 5256b05..c54099a 100644
--- a/frontend/src/lib/factorBindings.ts
+++ b/frontend/src/lib/factorBindings.ts
@@ -1,3 +1,4 @@
+import { reconcilePersonaFactor, PERSONA_FACTOR_PATH } from './personaFactors'
 import { reconcileSubAgentFactor, SUB_AGENT_FACTOR_PATH } from './subAgentFactors'
 import { reconcileKnowledgeFactor, KNOWLEDGE_FACTOR_PATH } from './knowledgeFactors'
 import { reconcileDatasetFactor, DATASET_FACTOR_PATH } from './datasetFactors'
@@ -65,7 +66,7 @@ function withPathValue(root: Record<string, unknown>, dottedPath: string, nextVa
  * as an extra level would turn each pause mid-edit into a new treatment.
  */
 export function factorWithCanvasBaseline(factor: DesignFactor, currentValue: unknown): DesignFactor {
-  if ((factor.level_type === 'sub_agent_selection' || factor.level_type === 'sub_agent_toggle' || factor.level_type === 'script_selection' || factor.level_type === 'script_toggle' || factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle' || factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle' || factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle' || factor.level_type === 'knowledge_selection' || factor.level_type === 'knowledge_toggle')) return factor
+  if ((factor.level_type === 'sub_agent_selection' || factor.level_type === 'sub_agent_toggle' || factor.level_type === 'script_selection' || factor.level_type === 'script_toggle' || factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle' || factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle' || factor.level_type === 'persona_selection' || factor.level_type === 'persona_toggle' || factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle' || factor.level_type === 'knowledge_selection' || factor.level_type === 'knowledge_toggle')) return factor
   if (isBooleanFactor(factor) || valuesEqual(factor.levels[0], currentValue)) return factor
 
   const currentIndex = factor.levels.findIndex((level) => valuesEqual(level, currentValue))
@@ -115,6 +116,10 @@ export function reconcileFactorBaselines(designSpec: DesignSpec | null | undefin
       const owner = graph.nodes.find((node) => node.data.factor_bindings?.[SKILL_FACTOR_PATH] === factor.name)
       return owner ? reconcileSkillFactor(factor, graph, owner.id) : factor
     }
+    if ((factor.level_type === 'persona_selection' || factor.level_type === 'persona_toggle') && graph) {
+      const owner = graph.nodes.find((node) => node.data.factor_bindings?.[PERSONA_FACTOR_PATH] === factor.name)
+      return owner ? reconcilePersonaFactor(factor, graph, owner.id) : factor
+    }
     if ((factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle') && graph) {
       const owner = graph.nodes.find((node) => node.data.factor_bindings?.[DATASET_FACTOR_PATH] === factor.name)
       return owner ? reconcileDatasetFactor(factor, graph, owner.id) : factor
@@ -174,7 +179,7 @@ export function factorBindingDiscrepancies(
         ? 'factor is no longer declared'
         : value === MISSING
           ? 'field no longer exists on the canvas'
-          : (factor.level_type === 'sub_agent_selection' || factor.level_type === 'sub_agent_toggle' || factor.level_type === 'script_selection' || factor.level_type === 'script_toggle' || factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle' || factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle' || factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle' || factor.level_type === 'knowledge_selection' || factor.level_type === 'knowledge_toggle') || isBooleanFactor(factor) || valuesEqual(value, factor.levels[0])
+          : (factor.level_type === 'sub_agent_selection' || factor.level_type === 'sub_agent_toggle' || factor.level_type === 'script_selection' || factor.level_type === 'script_toggle' || factor.level_type === 'tool_selection' || factor.level_type === 'tool_toggle' || factor.level_type === 'skill_selection' || factor.level_type === 'skill_toggle' || factor.level_type === 'persona_selection' || factor.level_type === 'persona_toggle' || factor.level_type === 'dataset_selection' || factor.level_type === 'dataset_toggle' || factor.level_type === 'knowledge_selection' || factor.level_type === 'knowledge_toggle') || isBooleanFactor(factor) || valuesEqual(value, factor.levels[0])
             ? null
             : 'published value does not match the first (canvas baseline) level'
       if (reason) discrepancies.push({ nodeId: node.id, nodeLabel, fieldPath, factorName, reason })
diff --git a/frontend/src/lib/personaFactors.test.ts b/frontend/src/lib/personaFactors.test.ts
new file mode 100644
index 0000000..8459d6b
--- /dev/null
+++ b/frontend/src/lib/personaFactors.test.ts
@@ -0,0 +1,34 @@
+import { expect, it } from 'vitest'
+import type { DesignFactor } from '@/types/experiments'
+import type { ProtocolGraph } from '@/types/protocols'
+import { factorCreationFields } from '@/components/protocol/bindableFields'
+import { reconcileFactorBaselines } from './factorBindings'
+import { personaFactorIssues, reconcilePersonaFactor } from './personaFactors'
+
+const graph = {
+  nodes: [
+    { id: 'agent', type: 'agent', data: { label: 'Agent', persona_selection: ['a'], factor_bindings: { persona_selection: 'Personas' } } },
+    ...['a', 'b', 'c'].map(id => ({ id, type: 'persona', data: { label: `Persona ${id}`, config: { persona_id: 'deleted-library-id', persona_text: id } } })),
+  ],
+  edges: ['a', 'b', 'c'].map(id => ({ source: id, target: 'agent', targetHandle: 'persona' })),
+} as unknown as ProtocolGraph
+const factor: DesignFactor = { name: 'Personas', level_type: 'persona_selection', levels: [['b'], ['a']], level_labels: ['Custom B', 'Custom A'] }
+
+it('reconciles connected snapshots while preserving level order and labels', () => {
+  expect(reconcilePersonaFactor(factor, graph, 'agent')).toEqual({ ...factor, levels: [['b'], ['a'], ['c']], level_labels: ['Custom B', 'Custom A', 'Persona c'] })
+  const changed = { ...graph, edges: graph.edges.filter(edge => edge.source !== 'b') }
+  expect(reconcileFactorBaselines({ factors: [factor] }, changed)[0]).toEqual({ ...factor, levels: [['a'], ['c']], level_labels: ['Custom A', 'Persona c'] })
+  expect(personaFactorIssues(graph, [factor])).toEqual([])
+})
+
+it('preserves an all-disabled baseline and updates the all-enabled level after wiring changes', () => {
+  const toggle: DesignFactor = { name: 'Personas', level_type: 'persona_toggle', levels: [[], ['a', 'b']], level_labels: ['Without', 'With'] }
+  expect(reconcilePersonaFactor(toggle, graph, 'agent')).toEqual({ ...toggle, levels: [[], ['a', 'b', 'c']] })
+  expect(personaFactorIssues({ ...graph, edges: [] }, [toggle])[0]).toContain('restore the factor group')
+})
+
+it('offers the same three factor modes from Design as the node toolbar', () => {
+  const fields = factorCreationFields(graph.nodes, graph.edges).filter(field => field.connectorFactor?.kind === 'persona')
+  expect(new Set(fields.map(field => field.fieldLabel))).toEqual(new Set(['This persona on/off', 'Persona levels', 'All personas on/off']))
+  expect(fields.filter(field => field.levelType === 'persona_selection')).toHaveLength(1)
+})
diff --git a/frontend/src/lib/personaFactors.ts b/frontend/src/lib/personaFactors.ts
new file mode 100644
index 0000000..754bcd6
--- /dev/null
+++ b/frontend/src/lib/personaFactors.ts
@@ -0,0 +1,105 @@
+import { sharedFactorGroup, sharedGroupConflict, sharedGroupIssues } from './sharedFactors'
+import type { DesignFactor } from '@/types/experiments'
+import type { ProtocolGraph, ProtocolNode } from '@/types/protocols'
+
+export const PERSONA_FACTOR_PATH = 'persona_selection'
+
+export const personaFactorModes = {
+  boolean: 'This persona on/off',
+  persona_selection: 'Persona levels',
+  persona_toggle: 'All personas on/off',
+}
+export type PersonaFactorMode = keyof typeof personaFactorModes
+
+export function personaFactorConflict(graph: ProtocolGraph, factors: DesignFactor[], personaNodeId: string, mode: PersonaFactorMode, agentId: string): string | undefined {
+  if (graph.nodes.find((node) => node.id === personaNodeId)?.data.factor_bindings?.config) return 'Remove the legacy whole-persona binding in the inspector before creating a persona factor.'
+  if (mode !== 'boolean') {
+    const groupConflict = sharedGroupConflict(graph, personaNodeId, 'persona')
+    if (groupConflict) return groupConflict
+  }
+  const owner = graph.nodes.find((node) => node.id === (mode === 'boolean' ? personaNodeId : agentId))
+  const currentName = owner?.data.factor_bindings?.[mode === 'boolean' ? 'config.enabled' : PERSONA_FACTOR_PATH]
+  const current = factors.find((factor) => factor.name === currentName)
+  if (current && (current.level_type ?? 'boolean') !== mode) {
+    return `${personaFactorModes[mode]} is unavailable because this shared group already uses the factor ${current.name} (${personaFactorModes[(current.level_type ?? 'boolean') as PersonaFactorMode]}). Keep the current factor type, or select its factor type and remove it first.`
+  }
+  const conflicts = [...new Set(mode === 'boolean'
+    ? graph.edges.filter((edge) => edge.source === personaNodeId && edge.targetHandle === 'persona')
+      .flatMap((edge) => {
+        const name = graph.nodes.find((node) => node.id === edge.target)?.data.factor_bindings?.[PERSONA_FACTOR_PATH]
+        return name ? [name] : []
+      })
+    : connectedPersonas(graph, agentId).flatMap((node) => Object.values(node.data.factor_bindings ?? {})))]
+  if (!conflicts.length) return undefined
+  return mode === 'boolean'
+    ? `${personaFactorModes[mode]} is unavailable because a connected Agent already controls this Persona with the factor ${conflicts.join(', ')}. Use the existing shared factor, or select its factor type and remove it first.`
+    : `${personaFactorModes[mode]} is unavailable because connected Personas already have factor bindings: ${conflicts.join(', ')}. Shared persona factors cannot be combined with individual Persona factor bindings. Use This persona on/off, or remove those bindings in each Persona’s factor dialog first.`
+}
+
+export function isPersonaFactor(factor: DesignFactor): boolean {
+  return factor.level_type === 'persona_selection' || factor.level_type === 'persona_toggle'
+}
+
+export function connectedPersonas(graph: ProtocolGraph, agentId: string): ProtocolNode[] {
+  return graph.edges.filter((edge) => edge.target === agentId && edge.targetHandle === 'persona')
+    .flatMap((edge) => {
+      const node = graph.nodes.find((node) => node.id === edge.source && node.type === 'persona')
+      return node ? [node] : []
+    })
+}
+
+export function personaId(node: ProtocolNode): string {
+  // Levels address immutable node snapshots, so library edits/deletions cannot change a run.
+  return node.id
+}
+
+export function reconcilePersonaFactor(factor: DesignFactor, graph: ProtocolGraph, agentId: string): DesignFactor {
+  if (sharedGroupIssues(graph, [factor], 'persona').length) return factor
+  const source = connectedPersonas(graph, agentId)[0]
+  if (source && sharedFactorGroup(graph, source.id, 'persona').error) return factor
+  const personas = connectedPersonas(graph, agentId)
+  const ids = [...new Set(personas.map(personaId))]
+  if (factor.level_type === 'persona_toggle') {
+    const noneFirst = factor.levels.length === 2 && Array.isArray(factor.levels[0]) && factor.levels[0].length === 0
+    return {
+      ...factor,
+      levels: noneFirst ? [[], ids] : [ids, []],
+      level_labels: factor.level_labels?.length === 2 ? factor.level_labels : noneFirst ? ['All disabled', 'All enabled'] : ['All enabled', 'All disabled'],
+    }
+  }
+  const oldIds = factor.levels.map((level) => Array.isArray(level) ? String(level[0] ?? '') : '')
+  const ordered = [...new Set([...oldIds.filter((id) => ids.includes(id)), ...ids.filter((id) => !oldIds.includes(id))])]
+  return {
+    ...factor,
+    levels: ordered.map((id) => [id]),
+    level_labels: ordered.map((id) => {
+      const index = oldIds.indexOf(id)
+      if (index >= 0 && factor.level_labels?.[index]) return factor.level_labels[index]
+      const node = personas.find((node) => personaId(node) === id)
+      const label = String(node?.data.label || 'Unavailable persona')
+      return label || 'Unavailable persona'
+    }),
+  }
+}
+
+export function personaFactorOwner(graph: ProtocolGraph | undefined, personaNodeId: string): string | undefined {
+  return graph?.edges.filter((edge) => edge.source === personaNodeId && edge.targetHandle === 'persona')
+    .map((edge) => graph.nodes.find((node) => node.id === edge.target)?.data.factor_bindings?.[PERSONA_FACTOR_PATH])
+    .find(Boolean)
+}
+
+export function personaFactorIssues(graph: ProtocolGraph | undefined, factors: DesignFactor[]): string[] {
+  const groupIssues = sharedGroupIssues(graph, factors, 'persona')
+  if (groupIssues.length) return groupIssues
+  return factors.filter(isPersonaFactor).flatMap((factor) => {
+    const owner = graph?.nodes.find((node) => node.data.factor_bindings?.[PERSONA_FACTOR_PATH] === factor.name)
+    if (!owner || !graph) return [`${factor.name}: rebind or remove this persona factor.`]
+    const personas = connectedPersonas(graph, owner.id)
+    const ids = [...new Set(personas.map(personaId))]
+    const conflicts = personas.some((node) => Object.keys(node.data.factor_bindings ?? {}).length > 0)
+    if (conflicts) return [`${factor.name}: remove individual persona factor bindings first.`]
+    if (ids.length < (factor.level_type === 'persona_toggle' ? 1 : 2)) return [`${factor.name}: ${factor.level_type === 'persona_toggle' ? 'connect at least one persona' : 'connect at least two different personas'}.`]
+    if (ids.some((id) => !id)) return [`${factor.name}: disconnect or restore unavailable personas.`]
+    return []
+  })
+}
diff --git a/frontend/src/lib/sharedFactors.ts b/frontend/src/lib/sharedFactors.ts
index 128f073..5e12eb6 100644
--- a/frontend/src/lib/sharedFactors.ts
+++ b/frontend/src/lib/sharedFactors.ts
@@ -1,9 +1,10 @@
 import type { DesignFactor } from '@/types/experiments'
 import type { ProtocolGraph, ProtocolNode } from '@/types/protocols'
 
-export type SharedFactorKind = 'skill' | 'dataset' | 'knowledge' | 'script' | 'tool' | 'sub_agent' | 'pattern'
+export type SharedFactorKind = 'persona' | 'skill' | 'dataset' | 'knowledge' | 'script' | 'tool' | 'sub_agent' | 'pattern'
 
 const specs = {
+  persona: { types: ['persona'], handles: ['persona'], path: 'persona_selection' },
   skill: { types: ['skill'], handles: ['skill'], path: 'skill_selection' },
   dataset: { types: ['dataset'], handles: ['dataset', 'resource', 'tool'], path: 'dataset_selection' },
   knowledge: { types: ['okf_bundle', 'okf_document'], handles: ['knowledge'], path: 'knowledge_selection' },
diff --git a/frontend/src/types/experiments.ts b/frontend/src/types/experiments.ts
index ca2c899..aa343be 100644
--- a/frontend/src/types/experiments.ts
+++ b/frontend/src/types/experiments.ts
@@ -28,6 +28,8 @@ export interface DesignFactor {
     | 'tool_toggle'
     | 'skill_selection'
     | 'skill_toggle'
+  | 'persona_selection'
+  | 'persona_toggle'
     | 'sub_agent_selection'
     | 'sub_agent_toggle'
   | 'dataset_selection'
diff --git a/frontend/src/types/personas.ts b/frontend/src/types/personas.ts
new file mode 100644
index 0000000..a6873ad
--- /dev/null
+++ b/frontend/src/types/personas.ts
@@ -0,0 +1,18 @@
+export interface Persona {
+  id: string
+  name: string
+  description: string | null
+  prompt: string
+  source_filename: string | null
+  traits: Record<string, unknown>
+  revision: number
+  prompt_sha256: string
+  created_at: string
+  updated_at: string
+}
+
+export interface PersonaSource {
+  id: string
+  revision: number
+  prompt_sha256: string
+}
diff --git a/frontend/src/types/protocols.ts b/frontend/src/types/protocols.ts
index 3703392..d229dc3 100644
--- a/frontend/src/types/protocols.ts
+++ b/frontend/src/types/protocols.ts
@@ -1,4 +1,5 @@
 import type { ModelCapabilities } from './llmSettings'
+import type { PersonaSource } from './personas'
 import type { EvaluationArtifact, MetricObservation } from './experiments'
 
 export interface Protocol {
@@ -374,6 +375,8 @@ export interface AgentNodeData {
   script_factor_mode?: 'script_selection' | 'script_toggle'
   tool_selection?: string[]
   tool_factor_mode?: 'tool_selection' | 'tool_toggle'
+  persona_selection?: string[]
+  persona_factor_mode?: 'persona_selection' | 'persona_toggle'
   skill_selection?: string[]
   skill_factor_mode?: 'skill_selection' | 'skill_toggle'
   label: string
@@ -940,9 +943,11 @@ export interface PersonaNodeConfig {
   persona_id?: string | null
   // Library mode, multi-select: every chosen persona (persona_id is the first)
   persona_ids?: string[] | null
+  // Provenance only: runs always use the snapshotted persona_text below.
+  persona_sources?: PersonaSource[]
   // Text mode: direct persona prompt text
   persona_text?: string | null
-  // File mode: path to uploaded .md file with persona definition
+  // Original upload filename for display; the prompt is stored inline.
   persona_file?: string | null
   // Display metadata from library (cached to avoid fetch on render)
   persona_label?: string | null
diff --git a/src/asaree/api/personas.py b/src/asaree/api/personas.py
new file mode 100644
index 0000000..200361c
--- /dev/null
+++ b/src/asaree/api/personas.py
@@ -0,0 +1,113 @@
+"""Reusable personas, imported as plain text without required frontmatter."""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Annotated, Any
+
+from fastapi import APIRouter, File, Form, HTTPException, UploadFile
+from pydantic import BaseModel, ConfigDict, Field, computed_field, model_validator
+
+from asaree.deps import CurrentUser, DbSession
+from asaree.services import personas
+
+router = APIRouter(prefix="/personas", tags=["personas"])
+
+
+class PersonaCreate(BaseModel):
+    prompt: str = Field(max_length=personas.MAX_PROMPT_BYTES)
+    name: str | None = Field(default=None, max_length=255)
+    description: str | None = None
+    traits: dict[str, Any] = Field(default_factory=dict)
+
+
+class PersonaUpdate(BaseModel):
+    expected_revision: int = Field(ge=1)
+    name: str | None = Field(default=None, max_length=255)
+    prompt: str | None = Field(default=None, max_length=personas.MAX_PROMPT_BYTES)
+    description: str | None = None
+    traits: dict[str, Any] | None = None
+
+    @model_validator(mode="after")
+    def non_nullable_fields(self) -> PersonaUpdate:
+        for key in ("prompt", "traits"):
+            if key in self.model_fields_set and getattr(self, key) is None:
+                raise ValueError(f"{key} cannot be null")
+        return self
+
+
+class PersonaResponse(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: uuid.UUID
+    name: str
+    description: str | None
+    prompt: str
+    source_filename: str | None
+    traits: dict[str, Any]
+    revision: int
+    created_at: datetime
+    updated_at: datetime
+
+    @computed_field
+    @property
+    def prompt_sha256(self) -> str:
+        return personas.prompt_sha256(self.prompt)
+
+
+@router.get("", response_model=list[PersonaResponse])
+async def list_personas(db: DbSession, user: CurrentUser) -> Any:
+    return await personas.list_personas(db, owner_id=user.id)
+
+
+@router.post("", response_model=PersonaResponse, status_code=201)
+async def create_persona(body: PersonaCreate, db: DbSession, user: CurrentUser) -> Any:
+    try:
+        return await personas.create_persona(db, owner_id=user.id, **body.model_dump())
+    except ValueError as exc:
+        raise HTTPException(status_code=422, detail=str(exc)) from exc
+
+
+@router.post("/upload", response_model=PersonaResponse, status_code=201)
+async def upload_persona(
+    db: DbSession, user: CurrentUser, file: Annotated[UploadFile, File()],
+    name: Annotated[str | None, Form(max_length=255)] = None,
+) -> Any:
+    try:
+        filename, prompt = personas.decode_persona_upload(
+            file.filename, await file.read(personas.MAX_PROMPT_BYTES + 1)
+        )
+        return await personas.create_persona(db, owner_id=user.id, prompt=prompt, name=name, source_filename=filename)
+    except ValueError as exc:
+        raise HTTPException(status_code=422, detail=str(exc)) from exc
+
+
+@router.get("/{persona_id}", response_model=PersonaResponse)
+async def get_persona(persona_id: uuid.UUID, db: DbSession, user: CurrentUser) -> Any:
+    persona = await personas.get_persona(db, persona_id, owner_id=user.id)
+    if persona is None:
+        raise HTTPException(status_code=404, detail="No such persona")
+    return persona
+
+
+@router.patch("/{persona_id}", response_model=PersonaResponse)
+async def update_persona(persona_id: uuid.UUID, body: PersonaUpdate, db: DbSession, user: CurrentUser) -> Any:
+    try:
+        persona = await personas.update_persona(
+            db, persona_id, owner_id=user.id, expected_revision=body.expected_revision,
+            fields=body.model_dump(exclude_unset=True, exclude={"expected_revision"}),
+        )
+    except personas.PersonaRevisionConflictError as exc:
+        raise HTTPException(status_code=409, detail=str(exc)) from exc
+    except ValueError as exc:
+        raise HTTPException(status_code=422, detail=str(exc)) from exc
+    if persona is None:
+        raise HTTPException(status_code=404, detail="No such persona")
+    return persona
+
+
+@router.delete("/{persona_id}", status_code=204)
+async def delete_persona(persona_id: uuid.UUID, db: DbSession, user: CurrentUser) -> None:
+    if not await personas.delete_persona(db, persona_id, owner_id=user.id):
+        raise HTTPException(status_code=404, detail="No such persona")
diff --git a/src/asaree/api/protocols.py b/src/asaree/api/protocols.py
index dc35aab..2c500e5 100644
--- a/src/asaree/api/protocols.py
+++ b/src/asaree/api/protocols.py
@@ -34,6 +34,7 @@
 from asaree.services.experiments import get_experiment
 from asaree.services.factor_bindings import validate_factor_bindings
 from asaree.services.knowledge_factors import test_knowledge_factor_values
+from asaree.services.persona_factors import test_persona_factor_values
 from asaree.services.protocol_execution import (
     ProtocolValidationError,
     is_conversation_strategy,
@@ -287,6 +288,7 @@ class TestRunRequest(BaseModel):
     script_selections: dict[str, str] | None = None
     tool_selections: dict[str, str] | None = None
     skill_selections: dict[str, str] | None = None
+    persona_selections: dict[str, str] | None = None
     dataset_selections: dict[str, str] | None = None
 
 
@@ -299,6 +301,7 @@ class NodePlayRequest(BaseModel):
     script_selections: dict[str, str] | None = None
     tool_selections: dict[str, str] | None = None
     skill_selections: dict[str, str] | None = None
+    persona_selections: dict[str, str] | None = None
     dataset_selections: dict[str, str] | None = None
 
 
@@ -311,6 +314,7 @@ async def _node_test_factor_values(
             **await test_script_factor_values(graph, body.script_selections if body else None, node_id),
             **await test_tool_factor_values(graph, body.tool_selections if body else None, owner_id, node_id),
             **await test_skill_factor_values(graph, body.skill_selections if body else None, owner_id, node_id),
+            **await test_persona_factor_values(graph, body.persona_selections if body else None, owner_id, node_id),
             **await test_knowledge_factor_values(graph, body.knowledge_selections if body else None, owner_id, node_id),
             **await test_dataset_factor_values(graph, body.dataset_selections if body else None, owner_id, db, node_id),
         }
@@ -708,6 +712,7 @@ async def create_test_run_endpoint(
                 **await test_script_factor_values(revision.graph, body.script_selections if body else None),
                 **await test_tool_factor_values(revision.graph, body.tool_selections if body else None, user.id),
                 **await test_skill_factor_values(revision.graph, body.skill_selections if body else None, user.id),
+                **await test_persona_factor_values(revision.graph, body.persona_selections if body else None, user.id),
                 **await test_knowledge_factor_values(
                     revision.graph, body.knowledge_selections if body else None, user.id
                 ),
diff --git a/src/asaree/app.py b/src/asaree/app.py
index 216f2ea..81451b0 100644
--- a/src/asaree/app.py
+++ b/src/asaree/app.py
@@ -25,6 +25,7 @@
 from asaree.api.llm_settings import router as llm_settings_router
 from asaree.api.mcp_servers import router as mcp_servers_router
 from asaree.api.okf import router as okf_router
+from asaree.api.personas import router as personas_router
 from asaree.api.protocol_run_heads import router as protocol_run_heads_router
 from asaree.api.protocols import router as protocols_router
 from asaree.api.result_evidence import router as result_evidence_router
@@ -136,6 +137,7 @@ async def version() -> dict[str, str]:
     app.include_router(datasets_router, prefix="/api")
     app.include_router(mcp_servers_router, prefix="/api")
     app.include_router(skills_router, prefix="/api")
+    app.include_router(personas_router, prefix="/api")
     app.include_router(okf_router, prefix="/api")
     app.include_router(llm_settings_router, prefix="/api")
     app.include_router(agents_router, prefix="/api")
diff --git a/src/asaree/migrations/env.py b/src/asaree/migrations/env.py
index 755a255..3f6ac95 100644
--- a/src/asaree/migrations/env.py
+++ b/src/asaree/migrations/env.py
@@ -28,6 +28,7 @@
 import asaree.models.factorial_replicate_result  # noqa: F401
 import asaree.models.factorial_row_result  # noqa: F401
 import asaree.models.password_reset_token  # noqa: F401
+import asaree.models.persona  # noqa: F401
 import asaree.models.protocol  # noqa: F401
 import asaree.models.protocol_revision  # noqa: F401
 import asaree.models.protocol_run  # noqa: F401
diff --git a/src/asaree/migrations/versions/8293a4b5c6d7_persona_library.py b/src/asaree/migrations/versions/8293a4b5c6d7_persona_library.py
new file mode 100644
index 0000000..72d2174
--- /dev/null
+++ b/src/asaree/migrations/versions/8293a4b5c6d7_persona_library.py
@@ -0,0 +1,33 @@
+"""Store reusable owner-scoped persona templates."""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+revision = "8293a4b5c6d7"
+down_revision = "718293a4b5c6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "personas",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column("owner_id", postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column("name", sa.String(255), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("prompt", sa.Text(), nullable=False),
+        sa.Column("source_filename", sa.String(255), nullable=True),
+        sa.Column("traits", postgresql.JSONB(), nullable=False),
+        sa.Column("revision", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.ForeignKeyConstraint(["owner_id"], ["users.id"], ondelete="RESTRICT"),
+        if_not_exists=True,
+    )
+    op.create_index("ix_personas_owner_id", "personas", ["owner_id"], if_not_exists=True)
+
+
+def downgrade() -> None:
+    op.drop_table("personas", if_exists=True)
diff --git a/src/asaree/models/persona.py b/src/asaree/models/persona.py
new file mode 100644
index 0000000..1d1d8be
--- /dev/null
+++ b/src/asaree/models/persona.py
@@ -0,0 +1,30 @@
+"""Reusable persona templates; protocol graphs hold independent text snapshots."""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from sqlalchemy import ForeignKey, Integer, String, Text
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import Mapped, mapped_column
+
+from asaree.models.base import Base, TimestampMixin, generate_uuid
+
+
+class Persona(Base, TimestampMixin):
+    __tablename__ = "personas"
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=generate_uuid)
+    owner_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("users.id", ondelete="RESTRICT"), nullable=False, index=True
+    )
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    description: Mapped[str | None] = mapped_column(Text, nullable=True)
+    prompt: Mapped[str] = mapped_column(Text, nullable=False)
+    source_filename: Mapped[str | None] = mapped_column(String(255), nullable=True)
+    traits: Mapped[dict[str, Any]] = mapped_column(JSONB, nullable=False, default=dict)
+    revision: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
+
+
+__all__ = ["Persona"]
diff --git a/src/asaree/services/design_generation.py b/src/asaree/services/design_generation.py
index 0254113..8730c7e 100644
--- a/src/asaree/services/design_generation.py
+++ b/src/asaree/services/design_generation.py
@@ -37,6 +37,7 @@
 from asaree.services.design_revisions import get_current_revision, supersede_and_create
 from asaree.services.factorial_cells import list_replicates, materialize_replicates
 from asaree.services.knowledge_factors import validate_knowledge_factors
+from asaree.services.persona_factors import validate_persona_factors
 from asaree.services.script_factors import validate_script_factors, validate_tool_step_script_factors
 from asaree.services.skill_factors import validate_skill_factors
 from asaree.services.sub_agent_factors import validate_sub_agent_factor_structure
@@ -294,6 +295,7 @@ async def get_design_impact(
                 "script_selection",
                 "tool_selection",
                 "skill_selection",
+                "persona_selection",
                 "dataset_selection",
                 "knowledge_selection",
             }
@@ -306,6 +308,7 @@ async def get_design_impact(
                 "script_toggle",
                 "tool_toggle",
                 "skill_toggle",
+                "persona_toggle",
                 "dataset_toggle",
                 "knowledge_toggle",
             }
@@ -458,6 +461,8 @@ async def generate_design_cells(
             "tool_toggle",
             "skill_selection",
             "skill_toggle",
+            "persona_selection",
+            "persona_toggle",
             "dataset_selection",
             "dataset_toggle",
             "knowledge_selection",
@@ -471,6 +476,9 @@ async def generate_design_cells(
             validate_script_factors({"factors": factors}, protocol.graph if protocol else {})
             await validate_tool_factors({"factors": factors}, protocol.graph if protocol else {}, experiment.owner_id)
             await validate_skill_factors({"factors": factors}, protocol.graph if protocol else {}, experiment.owner_id)
+            await validate_persona_factors(
+                {"factors": factors}, protocol.graph if protocol else {}, experiment.owner_id
+            )
             await validate_knowledge_factors(
                 {"factors": factors}, protocol.graph if protocol else {}, experiment.owner_id
             )
diff --git a/src/asaree/services/factor_bindings.py b/src/asaree/services/factor_bindings.py
index 0848a7d..17e4c11 100644
--- a/src/asaree/services/factor_bindings.py
+++ b/src/asaree/services/factor_bindings.py
@@ -6,6 +6,7 @@
 
 from asaree.services.dataset_factors import validate_dataset_factor_structure
 from asaree.services.knowledge_factors import validate_knowledge_factor_structure
+from asaree.services.persona_factors import validate_persona_factor_structure
 from asaree.services.script_factors import validate_script_factor_structure, validate_tool_step_script_factors
 from asaree.services.shared_factors import validate_shared_factor_groups
 from asaree.services.skill_factors import validate_skill_factor_structure
@@ -43,6 +44,7 @@ def validate_factor_bindings(
     validate_tool_step_script_factors(design_spec, graph)
     validate_tool_factor_structure(design_spec, graph, complete=complete_skills)
     validate_skill_factor_structure(design_spec, graph, complete=complete_skills)
+    validate_persona_factor_structure(design_spec, graph, complete=complete_skills)
     validate_knowledge_factor_structure(design_spec, graph, complete=complete_skills)
     validate_dataset_factor_structure(design_spec, graph, complete=complete_skills)
     missing = unbound_factor_names(design_spec, graph)
@@ -83,7 +85,7 @@ def validate_factor_bindings(
                 level_type not in {
                     "boolean", "sub_agent_selection", "sub_agent_toggle",
                     "script_selection", "script_toggle", "tool_selection", "tool_toggle",
-                    "skill_selection", "skill_toggle",
+                    "skill_selection", "skill_toggle", "persona_selection", "persona_toggle",
                     "dataset_selection", "dataset_toggle",
                     "knowledge_selection", "knowledge_toggle",
                 }
diff --git a/src/asaree/services/persona_factors.py b/src/asaree/services/persona_factors.py
new file mode 100644
index 0000000..a2d791c
--- /dev/null
+++ b/src/asaree/services/persona_factors.py
@@ -0,0 +1,114 @@
+"""Connector-owned choices of persona node snapshots, independent of live library records."""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from asaree.services.shared_factors import shared_test_selections, validate_shared_factor_groups
+
+PERSONA_SELECTION = "persona_selection"
+PERSONA_TOGGLE = "persona_toggle"
+PERSONA_FACTOR_TYPES = {PERSONA_SELECTION, PERSONA_TOGGLE}
+
+
+def connected_persona_nodes(graph: dict[str, Any], agent_id: str) -> list[dict[str, Any]]:
+    nodes = {node["id"]: node for node in graph.get("nodes") or []}
+    return [
+        nodes[edge["source"]]
+        for edge in graph.get("edges") or []
+        if edge.get("target") == agent_id
+        and edge.get("targetHandle") == "persona"
+        and edge.get("source") in nodes
+        and nodes[edge["source"]].get("type") == "persona"
+    ]
+
+
+def validate_persona_factor_structure(
+    design_spec: dict[str, Any] | None, graph: dict[str, Any], *, complete: bool = True
+) -> None:
+    validate_shared_factor_groups(graph, "persona")
+    factors = {factor.get("name"): factor for factor in (design_spec or {}).get("factors") or []}
+    bound = {
+        (node.get("data") or {}).get("factor_bindings", {}).get(PERSONA_SELECTION) for node in graph.get("nodes") or []
+    }
+    for name, factor in factors.items():
+        if factor.get("level_type") in PERSONA_FACTOR_TYPES and name not in bound:
+            raise ValueError(f"Rebind or remove persona factor {name!r}.")
+    for node in graph.get("nodes") or []:
+        data = node.get("data") or {}
+        name = (data.get("factor_bindings") or {}).get(PERSONA_SELECTION)
+        if not name:
+            continue
+        factor = factors.get(name)
+        if node.get("type") not in {"agent", "sub_agent"}:
+            raise ValueError("Only an Agent persona connector can own a persona factor.")
+        if not factor or factor.get("level_type") not in PERSONA_FACTOR_TYPES:
+            raise ValueError(f"Persona connector factor {name!r} must declare a persona factor type.")
+        toggle = factor.get("level_type") == PERSONA_TOGGLE
+        if data.get("persona_factor_mode", PERSONA_SELECTION) != factor.get("level_type"):
+            raise ValueError(f"Persona factor {name!r}: canvas mode does not match the declared factor.")
+        personas = connected_persona_nodes(graph, node["id"])
+        ids = {persona["id"] for persona in personas}
+        if complete and (None in ids or "" in ids):
+            raise ValueError(f"Persona factor {name!r}: disconnect or restore unavailable personas.")
+        if complete and len(ids) < (1 if toggle else 2):
+            minimum = "one persona" if toggle else "two different personas"
+            raise ValueError(f"Persona factor {name!r}: connect at least {minimum}.")
+        if any((persona.get("data") or {}).get("factor_bindings") for persona in personas):
+            raise ValueError(f"Persona factor {name!r}: remove individual persona factor bindings first.")
+        levels = factor.get("levels") or []
+        if toggle:
+            if (
+                len(levels) != 2
+                or any(not isinstance(level, list) for level in levels)
+                or sorted(len(level) for level in levels) != [0, len(ids)]
+                or any(level and (set(level) != ids or len(level) != len(ids)) for level in levels)
+            ):
+                raise ValueError(f"Persona factor {name!r}: levels must enable every connected persona or none.")
+            continue
+        if any(not isinstance(level, list) or len(level) != 1 or level[0] not in ids for level in levels):
+            raise ValueError(f"Persona factor {name!r}: each level must name one connected persona.")
+        if len(levels) != len(ids) or {level[0] for level in levels} != ids:
+            raise ValueError(f"Persona factor {name!r}: levels must include every connected persona exactly once.")
+
+
+async def validate_persona_factors(
+    design_spec: dict[str, Any] | None, graph: dict[str, Any], owner_id: uuid.UUID
+) -> None:
+    validate_persona_factor_structure(design_spec, graph)
+
+
+async def test_persona_factor_values(
+    graph: dict[str, Any], selections: dict[str, str] | None, owner_id: uuid.UUID, node_id: str | None = None
+) -> dict[str, Any]:
+    """Validate preview choices against the publication and retain run provenance."""
+    selections = shared_test_selections(graph, selections, "persona", node_id)
+    owners = {
+        node["id"]: node
+        for node in graph.get("nodes") or []
+        if (node.get("data") or {}).get("factor_bindings", {}).get(PERSONA_SELECTION)
+        and (node_id is None or node["id"] == node_id)
+    }
+    if set(selections) - owners.keys():
+        raise ValueError("Persona selection must belong to a persona factor in this run.")
+    values: dict[str, Any] = {}
+    for agent_id, node in owners.items():
+        data = node.get("data") or {}
+        personas = connected_persona_nodes(graph, agent_id)
+        connected = [persona["id"] for persona in personas]
+        if any((persona.get("data") or {}).get("factor_bindings") for persona in personas):
+            raise ValueError("Remove individual persona factor bindings before testing this connector factor.")
+        baseline = data.get(PERSONA_SELECTION) or []
+        if data.get("persona_factor_mode") == PERSONA_TOGGLE:
+            selected = selections.get(agent_id, "all" if baseline else "none")
+            if selected not in {"all", "none"}:
+                raise ValueError("Select all enabled or all disabled for the test run.")
+            chosen = list(dict.fromkeys(connected)) if selected == "all" else []
+            values[data["factor_bindings"][PERSONA_SELECTION]] = chosen
+            continue
+        selected = selections.get(agent_id, baseline[0] if baseline else None)
+        if not selected or selected not in connected:
+            raise ValueError("Select an available connected persona for the test run.")
+        values[data["factor_bindings"][PERSONA_SELECTION]] = [selected]
+    return values
diff --git a/src/asaree/services/personas.py b/src/asaree/services/personas.py
new file mode 100644
index 0000000..424a252
--- /dev/null
+++ b/src/asaree/services/personas.py
@@ -0,0 +1,105 @@
+"""Owner-scoped persona templates. Execution never resolves these live records."""
+
+from __future__ import annotations
+
+import hashlib
+import uuid
+from collections.abc import Sequence
+from pathlib import PurePosixPath
+from typing import Any
+
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from asaree.models.persona import Persona
+
+MAX_PROMPT_BYTES = 1_000_000
+
+
+class PersonaRevisionConflictError(ValueError):
+    """A concurrent library edit must not be overwritten silently."""
+
+
+def prompt_sha256(prompt: str) -> str:
+    return hashlib.sha256(prompt.encode("utf-8")).hexdigest()
+
+
+def persona_name(name: str | None, source_filename: str | None, prompt: str) -> str:
+    if name and name.strip():
+        return name.strip()[:255]
+    if source_filename:
+        return PurePosixPath(source_filename).stem.replace("_", " ").replace("-", " ").strip()[:255] or "Persona"
+    suggestion = next((line.strip().lstrip("# ") for line in prompt.splitlines() if line.strip()), "")
+    return (suggestion or "Persona")[:80]
+
+
+def decode_persona_upload(filename: str | None, raw: bytes) -> tuple[str, str]:
+    filename = PurePosixPath((filename or "persona.md").replace("\\", "/")).name
+    if not filename.lower().endswith(".md"):
+        raise ValueError("Choose a Markdown (.md) file.")
+    if len(raw) > MAX_PROMPT_BYTES:
+        raise ValueError("Persona files must be no larger than 1 MB.")
+    try:
+        text = raw.decode("utf-8")
+    except UnicodeDecodeError as exc:
+        raise ValueError("Persona files must contain UTF-8 text.") from exc
+    return filename[:255], text
+
+
+async def list_personas(db: AsyncSession, *, owner_id: uuid.UUID) -> Sequence[Persona]:
+    statement = select(Persona).where(Persona.owner_id == owner_id).order_by(Persona.name, Persona.id)
+    return (await db.scalars(statement)).all()
+
+
+async def get_persona(db: AsyncSession, persona_id: uuid.UUID, *, owner_id: uuid.UUID) -> Persona | None:
+    return await db.scalar(select(Persona).where(Persona.id == persona_id, Persona.owner_id == owner_id))
+
+
+async def create_persona(
+    db: AsyncSession, *, owner_id: uuid.UUID, prompt: str, name: str | None = None,
+    description: str | None = None, source_filename: str | None = None, traits: dict[str, Any] | None = None,
+) -> Persona:
+    if len(prompt.encode("utf-8")) > MAX_PROMPT_BYTES:
+        raise ValueError("Persona text must be no larger than 1 MB.")
+    persona = Persona(
+        owner_id=owner_id, name=persona_name(name, source_filename, prompt), prompt=prompt,
+        description=description, source_filename=source_filename, traits=traits or {}, revision=1,
+    )
+    db.add(persona)
+    await db.flush()
+    await db.refresh(persona)
+    return persona
+
+
+async def update_persona(
+    db: AsyncSession, persona_id: uuid.UUID, *, owner_id: uuid.UUID, expected_revision: int, fields: dict[str, Any],
+) -> Persona | None:
+    persona = await db.scalar(
+        select(Persona).where(Persona.id == persona_id, Persona.owner_id == owner_id)
+        .with_for_update().execution_options(populate_existing=True)
+    )
+    if persona is None:
+        return None
+    if persona.revision != expected_revision:
+        raise PersonaRevisionConflictError("This persona changed. Reload it before saving again.")
+    prompt = fields.get("prompt", persona.prompt)
+    if len(prompt.encode("utf-8")) > MAX_PROMPT_BYTES:
+        raise ValueError("Persona text must be no larger than 1 MB.")
+    for key in ("prompt", "description", "traits"):
+        if key in fields:
+            setattr(persona, key, fields[key])
+    if "name" in fields:
+        persona.name = persona_name(fields["name"], persona.source_filename, prompt)
+    persona.revision += 1
+    await db.flush()
+    await db.refresh(persona)
+    return persona
+
+
+async def delete_persona(db: AsyncSession, persona_id: uuid.UUID, *, owner_id: uuid.UUID) -> bool:
+    persona = await get_persona(db, persona_id, owner_id=owner_id)
+    if persona is None:
+        return False
+    await db.delete(persona)
+    await db.flush()
+    return True
diff --git a/src/asaree/services/protocol_execution.py b/src/asaree/services/protocol_execution.py
index f60a0d4..11412c5 100644
--- a/src/asaree/services/protocol_execution.py
+++ b/src/asaree/services/protocol_execution.py
@@ -87,6 +87,7 @@
 from asaree.services.factorial_row_results import claim_row_attempt, ensure_row_result, get_row_result
 from asaree.services.knowledge_factors import knowledge_id, validate_knowledge_factors
 from asaree.services.model_config import build_model_config
+from asaree.services.persona_factors import validate_persona_factors
 from asaree.services.protocol_revisions import get_revision
 from asaree.services.protocol_runs import (
     RERUN_ON_REQUEST_STATUSES,
@@ -2118,15 +2119,23 @@ def _resolve_persona_configs(graph: dict[str, Any], node_id: str) -> list[str]:
     prefix -- the persona text becomes part of the agent's instructions. Multiple
     personas are concatenated with double newlines between them.
 
-    A node with ``enabled: False`` or no ``persona_text`` is skipped."""
+    A connector factor overrides individual enabled switches. Without one,
+    a node with ``enabled: False`` is skipped. Empty prompts contribute no prefix."""
     nodes, _downstream, _upstream = _adjacency(graph)
     persona_texts: list[str] = []
+    agent_data = (nodes.get(node_id) or {}).get("data") or {}
+    selection = (
+        agent_data.get("persona_selection")
+        if (agent_data.get("factor_bindings") or {}).get("persona_selection") else None
+    )
     for edge in _edges_with_handle(graph, node_id, "persona", direction="incoming"):
         source = nodes.get(edge["source"])
         if source is None or source.get("type") != "persona":
             continue
         persona_config = (source.get("data") or {}).get("config") or {}
-        if not persona_config.get("enabled", True):
+        if selection is not None and source["id"] not in selection:
+            continue
+        if selection is None and not persona_config.get("enabled", True):
             continue
         persona_text = persona_config.get("persona_text")
         if persona_text and str(persona_text).strip():
@@ -4916,6 +4925,7 @@ async def plan_cell_runs(
         try:
             validate_factor_bindings(design_spec, graph)
             await validate_skill_factors(design_spec, graph, owner_id)
+            await validate_persona_factors(design_spec, graph, owner_id)
             await validate_knowledge_factors(design_spec, graph, owner_id)
             await validate_dataset_factors(design_spec, graph, owner_id, db)
         except ValueError as exc:
@@ -5318,6 +5328,7 @@ async def plan_single_replicate_run(
     try:
         validate_factor_bindings(design_spec, graph)
         await validate_skill_factors(design_spec, graph, owner_id)
+        await validate_persona_factors(design_spec, graph, owner_id)
         await validate_knowledge_factors(design_spec, graph, owner_id)
         await validate_dataset_factors(design_spec, graph, owner_id, db)
     except ValueError as exc:
diff --git a/src/asaree/services/protocol_revisions.py b/src/asaree/services/protocol_revisions.py
index cb378ec..5b5dae1 100644
--- a/src/asaree/services/protocol_revisions.py
+++ b/src/asaree/services/protocol_revisions.py
@@ -151,12 +151,13 @@ async def publish_protocol(
         from asaree.services.design_generation import get_design_impact
         incomplete_skills = any(
             (factor.get("level_type") in {
-                "sub_agent_selection", "script_selection", "tool_selection", "skill_selection",
+                "sub_agent_selection", "script_selection", "tool_selection", "skill_selection", "persona_selection",
                 "dataset_selection", "knowledge_selection"
             }
              and len(factor.get("levels") or []) < 2)
             or (factor.get("level_type") in {
-                "sub_agent_toggle", "script_toggle", "tool_toggle", "skill_toggle", "dataset_toggle", "knowledge_toggle"
+                "sub_agent_toggle", "script_toggle", "tool_toggle", "skill_toggle", "persona_toggle",
+                "dataset_toggle", "knowledge_toggle"
             }
             and not any(factor.get("levels") or []))
             for factor in (experiment.design_spec or {}).get("factors") or []
diff --git a/src/asaree/services/shared_factors.py b/src/asaree/services/shared_factors.py
index 79962bf..e4d3773 100644
--- a/src/asaree/services/shared_factors.py
+++ b/src/asaree/services/shared_factors.py
@@ -5,6 +5,7 @@
 from typing import Any
 
 GROUP_SPECS = {
+    "persona": ({"persona"}, {"persona"}, "persona_selection"),
     "skill": ({"skill"}, {"skill"}, "skill_selection"),
     "dataset": ({"dataset"}, {"dataset", "resource", "tool"}, "dataset_selection"),
     "knowledge": ({"okf_bundle", "okf_document"}, {"knowledge"}, "knowledge_selection"),
diff --git a/tests/test_persona_factors.py b/tests/test_persona_factors.py
new file mode 100644
index 0000000..354e231
--- /dev/null
+++ b/tests/test_persona_factors.py
@@ -0,0 +1,171 @@
+"""Persona factors choose immutable node snapshots and share one level across recipients."""
+
+from __future__ import annotations
+
+import copy
+import uuid
+from unittest.mock import AsyncMock
+
+import pytest
+
+from asaree.services.design_generation import get_design_impact
+from asaree.services.factor_bindings import validate_factor_bindings
+from asaree.services.persona_factors import test_persona_factor_values as preview_values
+from asaree.services.protocol_execution import _resolve_persona_configs, apply_factor_bindings
+
+
+def persona_graph():
+    ids = ["persona-0", "persona-1"]
+    graph = {
+        "nodes": [
+            {"id": "agent", "type": "agent", "data": {
+                "factor_bindings": {"persona_selection": "Personas"}, "persona_selection": [ids[0]],
+            }},
+            *[{"id": id, "type": "persona", "data": {
+                "config": {"persona_id": "deleted-library-record", "persona_text": id, "enabled": False},
+            }} for id in ids],
+        ],
+        "edges": [{"source": id, "target": "agent", "targetHandle": "persona"} for id in ids],
+    }
+    spec = {"factors": [{"name": "Personas", "level_type": "persona_selection", "levels": [[id] for id in ids]}]}
+    return graph, spec, ids
+
+
+def test_cell_selection_overrides_individual_switches_without_mutating_graph():
+    graph, spec, ids = persona_graph()
+    original = copy.deepcopy(graph)
+    validate_factor_bindings(spec, graph)
+    assert _resolve_persona_configs(graph, "agent") == [ids[0]]
+    patched = apply_factor_bindings(graph, {"Personas": [ids[1]]})
+    assert _resolve_persona_configs(patched, "agent") == [ids[1]]
+    assert graph == original
+
+
+def test_baseline_persona_is_a_valid_level_with_an_unmodified_prompt():
+    graph, spec, ids = persona_graph()
+    graph["nodes"][1]["data"]["config"]["persona_text"] = ""
+    validate_factor_bindings(spec, graph)
+    assert _resolve_persona_configs(graph, "agent") == []
+    assert _resolve_persona_configs(apply_factor_bindings(graph, {"Personas": [ids[1]]}), "agent") == [ids[1]]
+
+
+@pytest.mark.asyncio
+async def test_incomplete_one_persona_design_can_be_published_and_previewed_but_not_generated():
+    graph, spec, ids = persona_graph()
+    graph["edges"].pop()
+    spec["factors"][0]["levels"] = [[ids[0]]]
+    validate_factor_bindings(spec, graph, complete_skills=False)
+    assert await preview_values(graph, None, uuid.uuid4(), "agent") == {"Personas": [ids[0]]}
+    with pytest.raises(ValueError, match="two different personas"):
+        validate_factor_bindings(spec, graph)
+
+
+@pytest.mark.parametrize("enabled", [False, True])
+def test_individual_on_off_excludes_or_includes_only_the_bound_persona(enabled):
+    graph, _, ids = persona_graph()
+    graph["nodes"][0]["data"] = {}
+    graph["nodes"][1]["data"]["factor_bindings"] = {"config.enabled": "Enabled"}
+    graph["nodes"][2]["data"]["config"]["enabled"] = True
+    patched = apply_factor_bindings(graph, {"Enabled": enabled})
+    assert _resolve_persona_configs(patched, "agent") == (ids if enabled else [ids[1]])
+
+
+@pytest.mark.parametrize("none_first", [False, True])
+def test_all_or_none_runs_override_disabled_personas_and_preserve_graph(none_first):
+    graph, spec, ids = persona_graph()
+    graph["nodes"][0]["data"]["persona_factor_mode"] = "persona_toggle"
+    spec["factors"][0].update(level_type="persona_toggle", levels=[[], ids] if none_first else [ids, []])
+    graph["nodes"][0]["data"]["persona_selection"] = spec["factors"][0]["levels"][0]
+    original = copy.deepcopy(graph)
+    validate_factor_bindings(spec, graph)
+    assert _resolve_persona_configs(apply_factor_bindings(graph, {"Personas": ids}), "agent") == ids
+    assert _resolve_persona_configs(apply_factor_bindings(graph, {"Personas": []}), "agent") == []
+    assert graph == original
+
+
+def test_all_or_none_accepts_one_persona_and_applies_to_all_connected_agents():
+    graph, spec, ids = persona_graph()
+    graph["edges"].pop()
+    graph["nodes"][0]["data"].update(persona_factor_mode="persona_toggle", persona_selection=[ids[0]])
+    graph["nodes"].append({"id": "other-agent", "type": "agent", "data": copy.deepcopy(graph["nodes"][0]["data"])})
+    graph["edges"].append({"source": "persona-0", "target": "other-agent", "targetHandle": "persona"})
+    spec["factors"][0].update(level_type="persona_toggle", levels=[[ids[0]], []])
+    validate_factor_bindings(spec, graph)
+    patched = apply_factor_bindings(graph, {"Personas": [ids[0]]})
+    assert _resolve_persona_configs(patched, "agent") == [ids[0]]
+    assert _resolve_persona_configs(patched, "other-agent") == [ids[0]]
+    disabled = apply_factor_bindings(graph, {"Personas": []})
+    assert _resolve_persona_configs(disabled, "agent") == _resolve_persona_configs(disabled, "other-agent") == []
+
+
+@pytest.mark.parametrize("levels", ["partial", "duplicate", "all-only", "foreign"])
+def test_all_or_none_rejects_invalid_levels(levels):
+    graph, spec, ids = persona_graph()
+    graph["nodes"][0]["data"]["persona_factor_mode"] = "persona_toggle"
+    spec["factors"][0].update(
+        level_type="persona_toggle",
+        levels={
+            "partial": [[ids[0]], []],
+            "duplicate": [ids + [ids[0]], []],
+            "all-only": [ids, ids],
+            "foreign": [[ids[0], str(uuid.uuid4())], []],
+        }[levels],
+    )
+    with pytest.raises(ValueError, match="every connected persona or none"):
+        validate_factor_bindings(spec, graph)
+
+
+@pytest.mark.asyncio
+async def test_all_or_none_preview_default_and_explicit_choice():
+    graph, _, ids = persona_graph()
+    owner = uuid.uuid4()
+    graph["nodes"][0]["data"].update(persona_factor_mode="persona_toggle", persona_selection=ids)
+    assert await preview_values(graph, None, owner) == {"Personas": ids}
+    assert await preview_values(graph, {"agent": "none"}, owner) == {"Personas": []}
+    graph["nodes"][0]["data"]["persona_selection"] = []
+    assert await preview_values(graph, None, owner) == {"Personas": []}
+    with pytest.raises(ValueError, match="all enabled"):
+        await preview_values(graph, {"agent": ids[0]}, owner)
+
+
+@pytest.mark.asyncio
+async def test_shared_preview_choice_is_not_overwritten_by_another_agents_default():
+    graph, _, ids = persona_graph()
+    owner = uuid.uuid4()
+    graph["nodes"].append({"id": "other", "type": "agent", "data": copy.deepcopy(graph["nodes"][0]["data"])})
+    graph["edges"].extend([
+        {"source": f"persona-{index}", "target": "other", "targetHandle": "persona"} for index in range(2)
+    ])
+    assert await preview_values(graph, {"agent": ids[1]}, owner) == {"Personas": [ids[1]]}
+    assert await preview_values(graph, {"other": ids[1]}, owner) == {"Personas": [ids[1]]}
+    with pytest.raises(ValueError, match="different levels"):
+        await preview_values(graph, {"agent": ids[0], "other": ids[1]}, owner)
+
+
+@pytest.mark.parametrize("change", ["one", "missing-level", "duplicate", "conflict"])
+def test_incomplete_or_conflicting_factor_blocks_cells(change):
+    graph, spec, ids = persona_graph()
+    if change == "one":
+        graph["edges"].pop()
+        spec["factors"][0]["levels"] = [[ids[0]]]
+    elif change == "missing-level":
+        spec["factors"][0]["levels"].pop()
+    elif change == "duplicate":
+        spec["factors"][0]["levels"] = [[ids[0]], [ids[0]]]
+    else:
+        graph["nodes"][1]["data"]["factor_bindings"] = {"config.enabled": "On"}
+    with pytest.raises(ValueError):
+        validate_factor_bindings(spec, graph)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("level_type,levels", [("persona_selection", []), ("persona_toggle", [[], []])])
+async def test_empty_persona_factor_has_readable_design_impact_instead_of_error(monkeypatch, level_type, levels):
+    monkeypatch.setattr("asaree.services.design_generation.get_current_revision", AsyncMock(return_value=None))
+    impact = await get_design_impact(
+        AsyncMock(),
+        experiment_id=uuid.uuid4(),
+        design_spec={"factors": [{"name": "Personas", "level_type": level_type, "levels": levels}]},
+    )
+    assert impact.proposed_cell_count == 0
+    assert impact.proposed_replicate_count == 0
diff --git a/tests/test_persona_uploads.py b/tests/test_persona_uploads.py
new file mode 100644
index 0000000..bfd55b8
--- /dev/null
+++ b/tests/test_persona_uploads.py
@@ -0,0 +1,33 @@
+"""Plain Markdown personas need no frontmatter or separate metadata form."""
+
+import pytest
+
+from asaree.services.personas import MAX_PROMPT_BYTES, decode_persona_upload, persona_name, prompt_sha256
+
+
+def test_plain_markdown_upload_keeps_exact_text_and_suggests_filename_name() -> None:
+    prompt = "You are methodical.\n\nCheck your assumptions.\n"
+    filename, text = decode_persona_upload(r"C:\personas\careful_analyst.md", prompt.encode())
+    assert filename == "careful_analyst.md"
+    assert text == prompt
+    assert persona_name(None, filename, text) == "careful analyst"
+    assert persona_name("My persona", filename, text) == "My persona"
+
+
+def test_direct_text_can_be_named_automatically_and_empty_baseline_is_valid() -> None:
+    assert persona_name(None, None, "\n# Careful analyst\nInstructions") == "Careful analyst"
+    assert persona_name(None, None, "") == "Persona"
+    assert persona_name(None, None, "#") == "Persona"
+    assert decode_persona_upload("baseline.md", b"") == ("baseline.md", "")
+    assert prompt_sha256("same text") == prompt_sha256("same text")
+    assert prompt_sha256("same text") != prompt_sha256("changed text")
+
+
+@pytest.mark.parametrize("filename, raw, message", [
+    ("persona.txt", b"text", "Markdown"),
+    ("persona.md", b"\xff", "UTF-8"),
+    ("persona.md", b"x" * (MAX_PROMPT_BYTES + 1), "1 MB"),
+])
+def test_invalid_upload_rejected(filename: str, raw: bytes, message: str) -> None:
+    with pytest.raises(ValueError, match=message):
+        decode_persona_upload(filename, raw)
diff --git a/tests/test_personas.py b/tests/test_personas.py
new file mode 100644
index 0000000..e5e97df
--- /dev/null
+++ b/tests/test_personas.py
@@ -0,0 +1,153 @@
+"""Persona ownership, edits, and published snapshots against real Postgres."""
+
+from __future__ import annotations
+
+import copy
+import uuid
+from collections.abc import AsyncIterator
+
+import pytest
+import pytest_asyncio
+from fastapi import FastAPI
+from httpx import ASGITransport, AsyncClient
+from sqlalchemy import delete
+
+from asaree.api.personas import router
+from asaree.deps import get_current_user
+from asaree.models.database import dispose_engine, get_session
+from asaree.models.persona import Persona
+from asaree.models.user import User
+from asaree.services.personas import (
+    PersonaRevisionConflictError,
+    create_persona,
+    delete_persona,
+    get_persona,
+    list_personas,
+    update_persona,
+)
+from asaree.services.protocol_revisions import get_revision, publish_protocol
+from asaree.services.protocols import create_protocol, delete_protocol, get_protocol
+
+
+@pytest_asyncio.fixture(autouse=True)
+async def fresh_engine() -> AsyncIterator[None]:
+    yield
+    await dispose_engine()
+
+
+@pytest_asyncio.fixture
+async def owner_id() -> AsyncIterator[uuid.UUID]:
+    async with get_session() as db:
+        user = User(
+            email=f"persona-{uuid.uuid4().hex}@example.com", hashed_password="unused", display_name="Persona test"
+        )
+        db.add(user)
+        await db.flush()
+        uid = user.id
+    yield uid
+    async with get_session() as db:
+        await db.execute(delete(Persona).where(Persona.owner_id == uid))
+        user = await db.get(User, uid)
+        if user is not None:
+            await db.delete(user)
+
+
+async def test_owner_scoped_crud_and_revision_conflicts(owner_id: uuid.UUID) -> None:
+    other = uuid.uuid4()
+    async with get_session() as db:
+        persona = await create_persona(db, owner_id=owner_id, prompt="You are careful.", source_filename="analyst.md")
+        pid = persona.id
+        assert persona.name == "analyst"
+        assert persona.revision == 1
+        assert await list_personas(db, owner_id=other) == []
+        assert await get_persona(db, pid, owner_id=other) is None
+        assert await update_persona(db, pid, owner_id=other, expected_revision=1, fields={"prompt": "wrong"}) is None
+        assert not await delete_persona(db, pid, owner_id=other)
+        updated = await update_persona(db, pid, owner_id=owner_id, expected_revision=1, fields={
+            "prompt": "You are curious.", "description": "Explorer", "traits": {"openness": "high"},
+        })
+        assert updated is not None
+        assert updated.prompt == "You are curious."
+        assert updated.revision == 2
+        assert updated.traits == {"openness": "high"}
+    async with get_session() as db:
+        with pytest.raises(PersonaRevisionConflictError):
+            await update_persona(db, pid, owner_id=owner_id, expected_revision=1, fields={"prompt": "stale"})
+    async with get_session() as db:
+        assert await delete_persona(db, pid, owner_id=owner_id)
+        assert not await delete_persona(db, pid, owner_id=owner_id)
+
+
+async def test_edit_and_delete_preserve_draft_and_published_persona_text(owner_id: uuid.UUID) -> None:
+    async with get_session() as db:
+        persona = await create_persona(db, owner_id=owner_id, prompt="Original instructions")
+        pid = persona.id
+        graph = {"nodes": [{"id": "p", "type": "persona", "data": {"config": {
+            "mode": "library", "persona_id": str(pid), "persona_text": persona.prompt,
+        }}}], "edges": []}
+        original = copy.deepcopy(graph)
+        protocol = await create_protocol(db, owner_id=owner_id, name="Persona snapshot", graph=graph)
+        protocol_id = protocol.id
+        revision = await publish_protocol(db, protocol, owner_id=owner_id)
+        revision_id = revision.id
+        await update_persona(db, pid, owner_id=owner_id, expected_revision=1, fields={"prompt": "Updated instructions"})
+        await delete_persona(db, pid, owner_id=owner_id)
+    try:
+        async with get_session() as db:
+            draft = await get_protocol(db, protocol_id)
+            published = await get_revision(db, revision_id)
+            assert draft is not None and draft.graph == original
+            assert published is not None and published.graph == original
+            assert await get_persona(db, pid, owner_id=owner_id) is None
+    finally:
+        async with get_session() as db:
+            await delete_protocol(db, protocol_id)
+
+
+async def test_persona_api_upload_edit_ownership_and_delete(owner_id: uuid.UUID) -> None:
+    app = FastAPI()
+    app.include_router(router)
+    current = owner_id
+
+    async def user() -> User:
+        return User(id=current)
+
+    app.dependency_overrides[get_current_user] = user
+    async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as client:
+        response = await client.post("/personas/upload", files={"file": ("careful_analyst.md", b"Be careful.")})
+        assert response.status_code == 201
+        persona = response.json()
+        assert persona["name"] == "careful analyst"
+        assert persona["prompt"] == "Be careful."
+        assert persona["description"] is None
+        assert persona["traits"] == {}
+        assert len(persona["prompt_sha256"]) == 64
+        path = f"/personas/{persona['id']}"
+        current = uuid.uuid4()
+        assert (await client.get("/personas")).json() == []
+        assert (await client.get(path)).status_code == 404
+        assert (await client.patch(path, json={"expected_revision": 1, "prompt": "wrong"})).status_code == 404
+        assert (await client.delete(path)).status_code == 404
+        current = owner_id
+        updated = await client.patch(path, json={"expected_revision": 1, "prompt": "New text"})
+        assert updated.status_code == 200
+        assert updated.json()["revision"] == 2
+        assert updated.json()["prompt_sha256"] != persona["prompt_sha256"]
+        assert (await client.patch(path, json={"expected_revision": 1, "prompt": "stale"})).status_code == 409
+        assert (await client.patch(path, json={"expected_revision": 2, "prompt": None})).status_code == 422
+        assert (await client.delete(path)).status_code == 204
+        assert (await client.get(path)).status_code == 404
+
+
+async def test_persona_api_rejects_bad_uploads_and_requires_authentication() -> None:
+    app = FastAPI()
+    app.include_router(router)
+    async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as client:
+        assert (await client.get("/personas")).status_code == 401
+
+        async def user() -> User:
+            return User(id=uuid.uuid4())
+
+        app.dependency_overrides[get_current_user] = user
+        assert (await client.post("/personas/upload", files={"file": ("persona.txt", b"text")})).status_code == 422
+        assert (await client.post("/personas/upload", files={"file": ("persona.md", b"\xff")})).status_code == 422