@@ -1,6 +1,6 @@
 # Design-Feedback Remediation Implementation Plan
 
-**Status:** Phases 1–5 complete (merged into `modern`); Phases 6–10 not started.
+**Status:** Phases 1–6 complete (merged into `modern`); Phases 7–10 not started.
 
 This plan turns six pieces of user design feedback plus a re-evaluated backlog into shippable work:
 it guarantees recording days stay date-ordered, restores guided DIO entry (a Type + Index control),
@@ -35,7 +35,7 @@ For agent invocation, **load only the slice you need**:
   - [phase-3-design-tokens-css-modules.md](phase-3-design-tokens-css-modules.md) — token scale (incl. z-index) + CSS-Modules scaffolding + fix hidden logo/shortcuts (F3). ✅ **Complete (merged)**. F3 grew into a single-row app-bar redesign (logo · nav · shortcuts) per user feedback.
   - [phase-4-remove-channel-maps-editor.md](phase-4-remove-channel-maps-editor.md) — delete the workspace channel-maps editor (F1), full reference sweep. ✅ **Complete (merged)**.
   - [phase-5-dayeditor-structural-prep.md](phase-5-dayeditor-structural-prep.md) — `DayEditorContext` (kill prop-drill) + shared `deviceOverrideMerge` module; behavior-preserving. ✅ **Complete (merged)**.
-  - [phase-6-tasks-epochs-redesign.md](phase-6-tasks-epochs-redesign.md) — Tasks & Epochs in-place clarity redesign (F4 quick wins) + a11y.
+  - [phase-6-tasks-epochs-redesign.md](phase-6-tasks-epochs-redesign.md) — Tasks & Epochs in-place clarity redesign (F4 quick wins) + a11y. ✅ **Complete (merged)**.
   - [phase-7-persistence-migration.md](phase-7-persistence-migration.md) — versioned persisted-blob forward migration (Post-v3 #6).
   - [phase-8-task-type-catalog.md](phase-8-task-type-catalog.md) — animal-level task-type catalog; days pick/order epochs (F4 full) + trodes_to_nwb integration check.
   - [phase-9-architecture-cleanup.md](phase-9-architecture-cleanup.md) — split `validation.js`; decompose `ValidationSummary`/`RecordingDaysTab`; continue TS; **re-arm the build gate**.
 
@@ -116,6 +116,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **Tasks & Epochs screen — clarity redesign (no data-model or export change).** The day editor's
+  most-complex screen now opens with a plain-language framing that defines a *task* (one activity
+  in one environment, with its cameras) and an *epoch* (a numbered time block of that task, each
+  belonging to exactly one task). Decorative emoji are gone, and the glyph status badges (✓/⚠/❌)
+  are replaced with token-colored **text labels** — the one badge that overloaded two problems is
+  split into distinct "Needs epochs" and "Missing camera" labels (an error like a reused epoch or a
+  missing required field reads as text, too). The optional, epoch-linked editors — associated
+  videos, associated files, and FsGUI protocols — are now collapsible sections (an empty one is
+  collapsed to reduce noise; a section that already holds data stays open so it is never hidden),
+  each showing an item count, preceded by a one-line note that they reference a task's epochs and
+  that editing or deleting a referenced task asks you to confirm before the link is cleared (so the
+  repair dialog is expected, not a surprise). Add-button labels and section heading levels are
+  normalized. `day.tasks` and the exported YAML are unchanged (golden baselines byte-identical), and
+  the redesigned step has zero automated-accessibility (axe) violations.
 - **Day Editor structural refactor (internal; no behavior or export change).** Extracted the day
   device-override merge — the override > snapshot resolution AND the matching "can this override
   be honored cleanly?" shape classification — into one pure module
 
@@ -212,6 +212,7 @@ test.describe('Mistake-prevention UX on high-risk edit surfaces', () => {
     await expect(page.getByRole('heading', { level: 2, name: 'Tasks & Epochs' })).toBeVisible();
 
     // --- Associated video files: camera + epoch are <select> controls (combobox role). ---
+    // The seeded day has video rows, so this optional section renders expanded (open-when-populated).
     const videos = page.getByRole('region', { name: 'Associated video files' });
     await expect(videos).toBeVisible();
     // The seeded day has video rows; the FIRST row's camera select is a controlled combobox.
 
@@ -238,6 +238,9 @@ test.describe('Optogenetics export gating and the two-layer opto model', () => {
     await page.getByRole('button', { name: /^Tasks & Epochs — / }).click();
     await expect(page.getByRole('heading', { level: 2, name: 'Tasks & Epochs' })).toBeVisible();
 
+    // The optional FsGUI section is collapsed by default (progressive disclosure) — expand it.
+    await page.locator('summary', { hasText: 'Optogenetics protocols' }).click();
+
     // The day-level opto protocol editor is present (the two-layer model's "what was actually run").
     const fsGui = page.getByRole('region', { name: 'Optogenetics run this day (FsGUI protocols)' });
     await expect(fsGui).toBeVisible();
 
@@ -181,7 +181,7 @@ export default function FsGuiSection({ fsGuiYamls, cameras, epochOptions, dioOpt
       ))}
 
       <button type="button" className="btn-secondary" onClick={addItem}>
-        Add FsGUI protocol
+        + Add FsGUI protocol
       </button>
     </section>
   );
 
@@ -297,10 +297,27 @@ export default function TasksEpochsStep(props) {
         .join(', ')
     : '';
 
+  // The repair prompt's title must name the kinds actually orphaned — a files-only edit must not
+  // claim "videos". (The body message already lists the affected entries by name generically.)
+  const repairHasVideos = (pendingRepair?.videos?.length ?? 0) > 0;
+  const repairHasFiles = (pendingRepair?.files?.length ?? 0) > 0;
+  const repairTitle =
+    repairHasVideos && repairHasFiles
+      ? 'Repair affected videos and files?'
+      : repairHasFiles
+        ? 'Repair affected files?'
+        : 'Repair affected videos?';
+
   return (
     <div className="day-editor-section tasks-epochs-step">
       <h2>Tasks &amp; Epochs</h2>
 
+      <p className="tasks-epochs-intro">
+        Record what the animal did this day. A <strong>task</strong> describes one activity in one
+        environment, with its cameras. An <strong>epoch</strong> is a numbered time block within
+        that task — each epoch belongs to exactly one task.
+      </p>
+
       <MalformedCollectionNotice
         day={day}
         fields={EPOCHS_STEP_COLLECTIONS}
@@ -314,7 +331,6 @@ export default function TasksEpochsStep(props) {
           aria-live="polite"
           aria-label="Cameras recommended"
         >
-          <span className="camera-info-icon" aria-hidden="true">📹</span>
           <div className="camera-info-text">
             This animal has no cameras configured. Cameras are shared animal-catalog entries that
             this day&apos;s tasks, videos, and opto/FsGUI protocols select from — set them up once
@@ -347,40 +363,70 @@ export default function TasksEpochsStep(props) {
         affectedFilesForDelete={affectedFilesForDelete}
       />
 
-      <AssociatedVideosEditor
-        videos={associatedVideos}
-        cameras={cameras}
-        tasks={tasks}
-        onChange={(next) => onFieldUpdate('associated_video_files', next)}
-      />
+      {/* Optional, epoch-linked extras. Each section is collapsed when EMPTY (progressive
+          disclosure: lead with the Tasks table, defer empty optional surfaces) but OPEN when it
+          already holds data, so a returning day's existing videos/files are never hidden. The
+          item count in the summary is the scent either way. */}
+      <div className="tasks-optional-sections">
+        {tasks.length > 0 && (
+          <p className="tasks-coupling-note">
+            Associated videos and files (and FsGUI protocols, when optogenetics is enabled) each
+            reference a task&apos;s epochs. Editing or deleting a task they use prompts you to
+            confirm before the link is cleared — that repair dialog is expected, not an error.
+          </p>
+        )}
 
-      <AssociatedFilesEditor
-        files={associatedFiles}
-        tasks={tasks}
-        onChange={(next) => onFieldUpdate('associated_files', next)}
-      />
+        <details className="tasks-optional-section" open={associatedVideos.length > 0}>
+          <summary>
+            Associated video files{associatedVideos.length > 0 ? ` (${associatedVideos.length})` : ''}
+          </summary>
+          <AssociatedVideosEditor
+            videos={associatedVideos}
+            cameras={cameras}
+            tasks={tasks}
+            onChange={(next) => onFieldUpdate('associated_video_files', next)}
+          />
+        </details>
 
-      {/* FsGUI optogenetics protocols are day-owned and only meaningful when the animal
-          has optogenetics enabled. They reference this day's epochs + the animal's
-          cameras as controlled choices. */}
-      {animal?.optogenetics != null && (
-        <FsGuiSection
-          fsGuiYamls={getDayFsGuiYamls(day)}
-          cameras={cameras}
-          epochOptions={[...validEpochSet(tasks)].sort((a, b) => a - b)}
-          // Behavioral events are day-owned and exported from the day (mergeDayMetadata reads
-          // day.behavioral_events), and the dangling_dio_output rule validates against those —
-          // so offer the day's behavioral events here.
-          dioOptions={[
-            ...new Set(
-              dayBehavioralEvents
-                .map((e) => e?.name)
-                .filter((n) => typeof n === 'string' && n !== '')
-            ),
-          ]}
-          onChange={(next) => onFieldUpdate('fs_gui_yamls', next)}
-        />
-      )}
+        <details className="tasks-optional-section" open={associatedFiles.length > 0}>
+          <summary>
+            Associated files{associatedFiles.length > 0 ? ` (${associatedFiles.length})` : ''}
+          </summary>
+          <AssociatedFilesEditor
+            files={associatedFiles}
+            tasks={tasks}
+            onChange={(next) => onFieldUpdate('associated_files', next)}
+          />
+        </details>
+
+        {/* FsGUI optogenetics protocols are day-owned and only meaningful when the animal
+            has optogenetics enabled. They reference this day's epochs + the animal's
+            cameras as controlled choices. */}
+        {animal?.optogenetics != null && (
+          <details className="tasks-optional-section" open={getDayFsGuiYamls(day).length > 0}>
+            <summary>
+              Optogenetics protocols (FsGUI)
+              {getDayFsGuiYamls(day).length > 0 ? ` (${getDayFsGuiYamls(day).length})` : ''}
+            </summary>
+            <FsGuiSection
+              fsGuiYamls={getDayFsGuiYamls(day)}
+              cameras={cameras}
+              epochOptions={[...validEpochSet(tasks)].sort((a, b) => a - b)}
+              // Behavioral events are day-owned and exported from the day (mergeDayMetadata reads
+              // day.behavioral_events), and the dangling_dio_output rule validates against those —
+              // so offer the day's behavioral events here.
+              dioOptions={[
+                ...new Set(
+                  dayBehavioralEvents
+                    .map((e) => e?.name)
+                    .filter((n) => typeof n === 'string' && n !== '')
+                ),
+              ]}
+              onChange={(next) => onFieldUpdate('fs_gui_yamls', next)}
+            />
+          </details>
+        )}
+      </div>
 
       <TaskModal
         isOpen={modalOpen}
@@ -396,7 +442,7 @@ export default function TasksEpochsStep(props) {
 
       <ConfirmDialog
         isOpen={pendingRepair != null}
-        title="Repair affected videos?"
+        title={repairTitle}
         message={
           pendingRepair
             ? `Saving this task removes a task epoch still referenced by: ${repairNames}. Confirm to save the task and clear the orphaned epoch reference(s) (their epoch will be unset) so no dangling reference is left. Cancel to discard this task change; the referenced file(s) stay unchanged.`
 
@@ -5,6 +5,47 @@
  */
 
 .tasks-epochs-step {
+  .tasks-epochs-intro {
+    max-width: 1200px;
+    margin: 0 auto var(--spacing-md, 1rem);
+    line-height: 1.5;
+    color: var(--color-grey-700, #424242);
+  }
+
+  // Optional, epoch-linked extras: a one-line coupling note + collapsible sections so the
+  // Tasks table leads and the rest is deferred (progressive disclosure).
+  .tasks-optional-sections {
+    max-width: 1200px;
+    margin: var(--spacing-lg, 1.5rem) auto 0;
+
+    .tasks-coupling-note {
+      margin: 0 0 var(--spacing-md, 1rem);
+      line-height: 1.5;
+      color: var(--color-grey-700, #424242);
+    }
+
+    .tasks-optional-section {
+      border: 1px solid var(--color-grey-300, #bdbdbd);
+      border-radius: var(--radius-sm, 4px);
+      margin-bottom: var(--spacing-md, 1rem);
+
+      > summary {
+        padding: var(--spacing-sm, 0.5rem) var(--spacing-md, 1rem);
+        cursor: pointer;
+        font-weight: 600;
+
+        &:focus-visible {
+          outline: 2px solid var(--color-primary);
+          outline-offset: 2px;
+        }
+      }
+
+      &[open] > summary {
+        border-bottom: 1px solid var(--color-grey-300, #bdbdbd);
+      }
+    }
+  }
+
   .camera-info-banner {
     display: flex;
     align-items: flex-start;
@@ -18,11 +59,6 @@
     border-radius: 4px;
     color: #0d3c61; // WCAG AA on the light blue background
 
-    .camera-info-icon {
-      font-size: 1.5rem;
-      flex: none;
-    }
-
     .camera-info-text {
       flex: 1 1 auto;
       line-height: 1.5;