improvement: fdi tooth chart selection modes polished. bugs related to teeth selecyion fixed.

.cursor/rules/treatment-workspace.mdc

@@ -8,8 +8,8 @@ alwaysApply: false
 
 - **Browse mode** (`selectedPreviewId` set): preview only; banner + **Load into workspace**; form unchanged until load.
 - **Current draft** preview: heading “Current draft”; no load button while editing live.
-- **Entry wizard:** Teeth → Content → Lab via `WizardStepper` (not detail chips). Lab step only for lab-dependent (prosthesis) active detail; entering Lab auto-opens shipment draft. Add detail ungated. Appointment purpose does not gate type or Next.
+- **Entry wizard:** Teeth → Content → Lab via `WizardStepper` (not detail chips). Lab step only for lab-dependent (prosthesis) active detail; entering Lab auto-opens shipment draft. Add detail ungated. Appointment purpose does not gate type or Next. Detail-chip switches reset to Teeth unless `pendingEntryStepRef` requests Lab (shipments rail open).
-- **Tooth groups:** Shift+same-arch range = connected (linked dots); Ctrl/⌘+same-arch range = singles (one lab row each); click in connected span → collapse to that single only. `toothSelectionGroups.ts`; prune lab `toothProsthesis` on change.
+- **Tooth groups:** Shift+same-arch range = connected bridge (linked dots, one shipment row); overlapping Shift ranges merge by union. Plain click = add/remove singles; click in a bridge cuts that tooth out as a selected single (end → remainder stays connected; middle → two bridges). Never 1-tooth connected. `toothSelectionGroups.ts`; prune lab `toothProsthesis` on change. Cases/Tasks merge by prosthesis type after send.
 - **Lab dispatch UI:** due date end-aligned beside title (`sm:flex-row` + `justify-between`; stacks on mobile). Prosthesis type: stacked below `md`, 50/50 same-row from `md`. Content clinical field = **Notes** (not case comments).
 - **Lab comments:** shared `LabCaseCommentsPanel` (newest-first; sent=`justify-start`, received=`justify-end`; `viewerSide`) across Treatment / Cases / Tasks / share. Use logical `text-start`/`text-end`, not left/right.
 - **Detail chrome:** chips + Add at top; **Remove** = trash on chip (unsent, >1 detail; disabled when day-locked / no edit / uploading). No delete in Content step.

.cursor/skills/lab-cases/SKILL.md

@@ -12,8 +12,10 @@ description: Lab Cases tab — list, filters, detail panel, assignment, share QR
 ## List behavior
 
 - **Default sort:** `sentAt` desc (newest first).
+- **Page size:** `PAGE_SIZE = 10` in `CasesPage.tsx`.
 - **Auto-select:** On tab open / after filter reload, select first list item if none selected; keep selection when still in list; `?caseId=` URL wins.
 - **Right panel:** Always shows detail for selected case when list non-empty (loading state while fetching).
+- **Left rail layout:** section is `flex flex-col` + `lg:min-h-[420px]` / `h-full` with `lg:items-stretch` on the grid; case list wrapper is `flex-1 min-h-0 overflow-y-auto` (do **not** use a fixed `max-h-[55vh]` — that leaves empty space above pagination).
 
 ## Filters (`GET /cases`)
 

.cursor/skills/lab-tasks/SKILL.md

@@ -66,7 +66,7 @@ Components: `TaskCaseGroupHeader`, `TaskProsthesisGroupHeader`, `TaskRow`.
 ## APIs
 
 - `GET /tasks` — paginated flat task list (grouping is client-side when `sortBy=date`)
-- `PATCH /tasks/:taskId` — update status (only assignee or unassigned task)
+- `PATCH /tasks/:taskId` — update status (only assignee or unassigned task). Completing **`intraoral_scan`** also completes every other `intraoral_scan` task in the same case (case-scoped; catalog first step for all prosthesis types).
 - `GET /tasks/filter-options` — clinics + workflow steps (localized)
 - `GET /tasks/locate-page` — page number for a task in the sorted filtered list
 - `GET /cases/assignable-staff` — staff eligible for task assignment

.cursor/skills/treatment-workspace/SKILL.md

@@ -40,12 +40,13 @@ Right-column entry uses `WizardStepper` (`components/ui/shared/WizardStepper.tsx
 
 | Step | UI | Notes |
 |------|-----|--------|
-| **Teeth** | `FdiToothChart` | Shift+click connected range; Ctrl/⌘+click single range; linked dots |
+| **Teeth** | `FdiToothChart` | Shift+click connected bridge (union if overlap); click cuts tooth from bridge as selected single |
 | **Content** | `TreatmentDetailsEditor` fields only (`showChrome={false}`) | Type / **Notes** / attachments — **no delete button** |
 | **Lab** | `LabCasesDispatchPanel` | Shown in stepper **only** when active detail type is lab-dependent (`labDependentCodes`). Entering Lab **auto-ensures** a shipment draft (no “Add lab shipment” click). Add detail stays ungated. Due date beside title (RTL via logical end). Prosthesis dropdown same-row from `md`. |
 
 - Detail type may differ from appointment purpose (purpose only defaults new details).
 - Next/Back navigate visible steps; leaving prosthesis while on Lab returns to Content.
+- Switching `activeDetailId` resets the wizard to **Teeth**, unless `pendingEntryStepRef` is set to `lab` first (lab shipments rail / “Go to dispatch” / load-with-focus). That ref prevents the reset effect from overwriting Lab on the first click.
 
 
 
@@ -53,12 +54,11 @@ Right-column entry uses `WizardStepper` (`components/ui/shared/WizardStepper.tsx
 
 
 
-Helpers: `frontend/src/components/treatment/toothSelectionGroups.ts`. Persisted as `toothSelectionGroups` on the detail; lab tasks group by `selectionGroupId`.
+Helpers: `frontend/src/components/treatment/toothSelectionGroups.ts`. Persisted as `toothSelectionGroups` on the detail. Lab **dispatch** rows are 1:1 with selection groups; after send, Cases/Tasks **merge** teeth by prosthesis type (not by selection group).
 
-- **Plain click:** add/remove single; if tooth is in a **connected** group → drop the whole span and keep **only** that tooth as a single (no peel / no connected+single pair for the same span).
+- **Plain click:** add/remove single; if tooth is in a **connected** bridge → cut it out as a selected **single** (second click deselects). End of bridge → remainder stays connected (≥2) or demotes to single. Middle → left and right become separate groups. Never a 1-tooth connected (no lone dots).
-- **Shift+click:** inclusive same-arch range → one **connected** group (linked dots above/below). Shift wins if Ctrl also held.
+- **Shift+click:** inclusive same-arch range → one **connected** bridge; if the range overlaps existing bridges, **union** them into one bridge. Non-overlapping bridges stay separate.
-- **Ctrl/⌘+click:** same range, but each tooth as its own **single** (one lab-dispatch row per tooth).
+- Prevent browser selection artifacts (`select-none`, Shift `preventDefault` on mousedown).
-- Prevent browser selection artifacts (`select-none`, modifier `preventDefault` on mousedown).
 - On group change, prune/remap `labCase.toothProsthesis` via `pruneToothProsthesisForGroups`.
 - Connected UI label: `ConnectedSelectionBadge` (shared `Badge` + primary tint) in dispatch + lab case lists.
 - Lab case comments: shared `LabCaseCommentsPanel` — newest-first; **sent** = `justify-start` / `text-start`, **received** = `justify-end` / `text-end` (RTL-safe); require `viewerSide: 'LAB' | 'CLINIC'`. Used in Cases, Tasks, share focus, and Treatment (`DetailLabCaseCommentsSection`). Composer: `h-9` input + primary send / visibility buttons (white icons; Send mirrored in RTL).

AGENTS.md

@@ -45,23 +45,23 @@ frontend/src/
 **Treatment edit / details (quick ref):**
 - Day/mode gate: editable only for live draft on today/future (`canEditTreatmentForDay`). Past day / historical load → read-only form.
 - Sent-to-lab detail locks that line; **Add detail** still OK same day; **Remove detail** = trash icon on each detail chip (not in the wizard Content step) — only unsent and not the last line. Attachment upload blocked when sent (`TREATMENT_DETAIL_SENT`).
-- **Entry wizard:** `WizardStepper` — Teeth → Content → Lab; Lab step only when active detail type is lab-dependent (prosthesis); entering Lab auto-opens shipment draft (no Add-shipment CTA). Content notes field label is **Notes** (clinical). Detail chips ≠ wizard chrome.
+- **Entry wizard:** `WizardStepper` — Teeth → Content → Lab; Lab step only when active detail type is lab-dependent (prosthesis); entering Lab auto-opens shipment draft (no Add-shipment CTA). Content notes field label is **Notes** (clinical). Detail chips ≠ wizard chrome. Switching detail chips resets wizard to Teeth unless `pendingEntryStepRef` requests Lab (e.g. opening a case from the lab shipments rail).
-- **Tooth selection:** Shift+click same-arch range = connected group (linked dots); Ctrl/⌘+click same range = individual singles (one lab row each); plain click on a connected tooth collapses the whole span to that single tooth (no peel). Helpers: `toothSelectionGroups.ts`. Connected label: `ConnectedSelectionBadge` (shared `Badge` + primary tint).
+- **Tooth selection:** Shift+click same-arch range = connected bridge (one lab row); overlapping Shift bridges merge by union. Plain click add/remove singles; click in a bridge cuts that tooth out as a selected single (ends keep one bridge; middle splits into two). Never a 1-tooth connected (no lone dots). Helpers: `toothSelectionGroups.ts`. Connected label: `ConnectedSelectionBadge`. After send, Cases/Tasks merge teeth by prosthesis type.
 - **Lab dispatch layout:** due date beside title (`justify-between`, logical start/end for RTL); prosthesis type on same row as teeth from `md:` up (stacked on mobile).
 
 **Treatment lab rules (quick ref):**
 - Lab-dependent details (e.g. prosthesis) **without teeth** can save but **cannot ship** — show `LabShipmentBlockedNotice` + inline banner; toast on dispatch add.
 - Detail treatment type need **not** match appointment purpose — purpose only pre-fills new details.
 - **History filters** are client-side only (`treatmentHistoryFilters.ts`): “Not shipped to lab” + single date on already-fetched patient history; includes live current draft when filtering.
-- **Lab shipments rail**: unified list with scope toggle **This patient** vs **All updates** (unread across org for **this clinician's cases only**, includes patient name).
+- **Lab shipments rail**: unified list with scope toggle **This patient** vs **All updates** (unread across org for **this clinician's cases only**, includes patient name). Opening a case from the rail jumps to the entry wizard **Lab** step.
 - **Unread semantics**: Treatment tab badge = count of unread cases **for the user's own treatment plans** (per-case read cursor) and clears when a case is opened/marked read (not on tab visit).
 - **Lab shipment progress + comments**: shown in **Lab dispatch panel** for the active shipment; expanding activity / opening comments marks that case read. Shared UI: `LabCaseCommentsPanel` — newest first; sent = start / received = end (`text-start`/`justify-start`, RTL-safe); pass `viewerSide`.
 
 **Appointments (quick ref):** Do not delete (or change patient) when `hasTreatment`; codes `APPOINTMENT_HAS_TREATMENT` / `APPOINTMENT_PATIENT_LOCKED`. Past days: no new bookings; edit/delete OK without treatment; with treatment → toast. Appointment delete does not cascade-delete treatments. See `.cursor/rules/appointments.mdc`.
 
-**Lab Tasks tab:** Newest case first; steps ordered 1→N; case grouping when sorted by date; `stepCompleted` filter; prosthesis colors from catalog; task assignment in **Cases** (compact row: status + assignee + last update); on **Tasks**, all staff see every task but only assignee (or unassigned pool) can change status — others see “Assigned to {name}” instead of the status dropdown; **case due dates** set/edited in clinic Treatment lab dispatch, shown on lab Cases/Tasks with overdue filter + sort; **mobile:** larger task status controls, sticky case header when grouped; **tab badges:** `LabCaseActivity` + `GET /notifications/tab-counts` (lab Cases/Tasks split, clinic Treatment) — see `.cursor/skills/lab-tasks/SKILL.md` and `.cursor/skills/lab-notifications/SKILL.md`.
+**Lab Tasks tab:** Newest case first; steps ordered 1→N; case grouping when sorted by date; `stepCompleted` filter; prosthesis colors from catalog; task assignment in **Cases** (compact row: status + assignee + last update); on **Tasks**, all staff see every task but only assignee (or unassigned pool) can change status — others see “Assigned to {name}” instead of the status dropdown; **case due dates** set/edited in clinic Treatment lab dispatch, shown on lab Cases/Tasks with overdue filter + sort; completing **`intraoral_scan`** completes every scan task in that case (case-scoped; catalog first step for all prosthesis types); **mobile:** larger task status controls, sticky case header when grouped; **tab badges:** `LabCaseActivity` + `GET /notifications/tab-counts` (lab Cases/Tasks split, clinic Treatment) — see `.cursor/skills/lab-tasks/SKILL.md` and `.cursor/skills/lab-notifications/SKILL.md`.
 
-**Lab Cases tab:** Filter by **prosthesis type** (not treatment type); auto-select newest case on open; list cards use `LabCaseProsthesisGroupsList` (colored type + teeth, shared with Treatment rail). Deep link: `?caseId=`, `?clinicOrganizationId=`. **Share link:** QR + URL on sent cases (attachment left, QR right); opens `/lab-case/[token]` focus page. See `.cursor/skills/lab-cases/SKILL.md` and `.cursor/skills/lab-case-share-link/SKILL.md`.
+**Lab Cases tab:** Filter by **prosthesis type** (not treatment type); auto-select newest case on open; list **10 per page**; left rail list fills column height (`flex-1 overflow-y-auto`); list cards use `LabCaseProsthesisGroupsList` (colored type + teeth, shared with Treatment rail). Deep link: `?caseId=`, `?clinicOrganizationId=`. **Share link:** QR + URL on sent cases (attachment left, QR right); opens `/lab-case/[token]` focus page. See `.cursor/skills/lab-cases/SKILL.md` and `.cursor/skills/lab-case-share-link/SKILL.md`.
 
 **Lab case share link (quick ref):**
 - Token on first ship → `/{locale}/lab-case/{token}` after login.

backend/prisma/migrations/20260717123000_drop_stale_lab_case_task_unique/migration.sql

@@ -0,0 +1,15 @@
+-- The tooth_selection_groups migration tried to drop
+-- "lab_case_tasks_labCaseId_treatmentDetailId_prosthesisTypeCode_stepOrder_key",
+-- but PostgreSQL truncated/renamed that index to
+-- "lab_case_tasks_labCaseId_treatmentDetailId_prosthesisTypeCo_key"
+-- (see 20260710150528). The old unique index (without selectionGroupId)
+-- therefore remained and blocks multiple selection groups that share
+-- the same prosthesis type + stepOrder.
+
+DROP INDEX IF EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_prosthesisTypeCo_key";
+DROP INDEX IF EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_prosthesisTypeCode_stepOrder_key";
+DROP INDEX IF EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_prosthesisTypeCode_s";
+
+-- Ensure the correct unique index exists (idempotent for DBs that already have it).
+CREATE UNIQUE INDEX IF NOT EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_selectionGroupId_prosthesisTypeCode_stepOrder_key"
+  ON "lab_case_tasks"("labCaseId", "treatmentDetailId", "selectionGroupId", "prosthesisTypeCode", "stepOrder");

backend/prisma/migrations/20260717130000_drop_stale_lab_task_unique_by_def/migration.sql

@@ -0,0 +1,34 @@
+-- Defensive cleanup for stage/prod (and any DB where the stale unique index
+-- survived under a truncated/renamed Postgres identifier).
+--
+-- History:
+--   20260707130000 created unique (labCaseId, treatmentDetailId, prosthesisTypeCode, stepOrder)
+--     → PG truncates the index name to 63 chars (...prosthesisTypeCode_s)
+--   20260710150528 renamed that truncated name to ...prosthesisTypeCo_key
+--   20260716120000 dropped the *untruncated* name (no-op) and added the correct
+--     unique that includes selectionGroupId — leaving the stale unique in place
+--   20260717123000 drops known stale names; this migration also drops by definition
+--     so any leftover old unique is removed regardless of identifier length/rename.
+
+DO $$
+DECLARE
+  r RECORD;
+BEGIN
+  FOR r IN
+    SELECT indexname
+    FROM pg_indexes
+    WHERE schemaname = 'public'
+      AND tablename = 'lab_case_tasks'
+      AND indexdef ILIKE '%UNIQUE%'
+      AND indexdef ILIKE '%prosthesisTypeCode%'
+      AND indexdef ILIKE '%stepOrder%'
+      AND indexdef ILIKE '%treatmentDetailId%'
+      AND indexdef NOT ILIKE '%selectionGroupId%'
+  LOOP
+    EXECUTE format('DROP INDEX IF EXISTS %I', r.indexname);
+  END LOOP;
+END $$;
+
+-- Correct unique (includes selectionGroupId). Idempotent if already present.
+CREATE UNIQUE INDEX IF NOT EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_selectionGroupId_prosthesisTypeCode_stepOrder_key"
+  ON "lab_case_tasks"("labCaseId", "treatmentDetailId", "selectionGroupId", "prosthesisTypeCode", "stepOrder");

backend/prisma/migrations/20260717160000_lab_tasks_merge_by_prosthesis_unique/migration.sql

@@ -0,0 +1,40 @@
+-- Restore merge-by-prosthesis uniqueness for lab case tasks.
+-- Product rule: all teeth on a detail that share the same prosthesis type become
+-- one task set (Scan/Design/…). selectionGroupId remains on the table for UI
+-- but is not part of the unique key.
+--
+-- Drop the selectionGroupId-inclusive unique (by known names + by definition).
+
+DO $$
+DECLARE
+  r RECORD;
+BEGIN
+  FOR r IN
+    SELECT indexname
+    FROM pg_indexes
+    WHERE schemaname = 'public'
+      AND tablename = 'lab_case_tasks'
+      AND indexdef ILIKE '%UNIQUE%'
+      AND indexdef ILIKE '%selectionGroupId%'
+      AND indexdef ILIKE '%prosthesisTypeCode%'
+      AND indexdef ILIKE '%stepOrder%'
+  LOOP
+    EXECUTE format('DROP INDEX IF EXISTS %I', r.indexname);
+  END LOOP;
+END $$;
+
+DROP INDEX IF EXISTS "lab_case_tasks_labCaseId_treatmentDetailId_selectionGroupId_prosthesisTypeCode_stepOrder_key";
+
+-- Collapse rows that were split by selectionGroupId but share the merge key
+-- (status events cascade via FK). Kept row may need regen for full teeth[]; new sends are correct.
+DELETE FROM "lab_case_tasks" AS a
+  USING "lab_case_tasks" AS b
+WHERE a."id" > b."id"
+  AND a."labCaseId" = b."labCaseId"
+  AND a."treatmentDetailId" = b."treatmentDetailId"
+  AND a."prosthesisTypeCode" = b."prosthesisTypeCode"
+  AND a."stepOrder" = b."stepOrder";
+
+-- Short name stays under Postgres 63-char identifier limit.
+CREATE UNIQUE INDEX IF NOT EXISTS "lab_case_tasks_case_detail_prosthesis_step_key"
+  ON "lab_case_tasks"("labCaseId", "treatmentDetailId", "prosthesisTypeCode", "stepOrder");

backend/prisma/schema.prisma

@@ -379,7 +379,7 @@ model LabCaseTask {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  @@unique([labCaseId, treatmentDetailId, selectionGroupId, prosthesisTypeCode, stepOrder])
+  @@unique([labCaseId, treatmentDetailId, prosthesisTypeCode, stepOrder], map: "lab_case_tasks_case_detail_prosthesis_step_key")
   @@index([labCaseId, status])
   @@index([assigneeUserId])
   @@map("lab_case_tasks")

backend/src/modules/cases/lab-case-task.generator.spec.ts

@@ -172,7 +172,7 @@ describe('generateLabCaseTasks', () => {
     expect(stepCodes).toContain('printer_resin');
   });
 
-  it('keeps separate selection groups with the same prosthesis type as separate task sets', async () => {
+  it('merges teeth with the same prosthesis type across selection groups', async () => {
     const pfmSteps = stepsFromSeed('pfm_crown');
     const { tx, created } = buildMockTx({
       toothProsthesisRows: [
@@ -198,21 +198,13 @@ describe('generateLabCaseTasks', () => {
       prosthesisTypes: [{ code: 'pfm_crown', steps: pfmSteps }],
     });
 
-    const count = await generateLabCaseTasks(tx as never, 'lab-case-split', 'en');
+    const count = await generateLabCaseTasks(tx as never, 'lab-case-merge', 'en');
-    expect(count).toBe(pfmSteps.length * 2);
+    expect(count).toBe(pfmSteps.length);
-    const rows = created as Array<{
+    const rows = created as Array<{ teeth: string[]; prosthesisTypeCode: string }>;
-      teeth: string[];
+    expect(rows).toHaveLength(pfmSteps.length);
-      selectionGroupId: string;
+    expect(rows.every((r) => JSON.stringify(r.teeth) === JSON.stringify(['14', '15', '21']))).toBe(
-      prosthesisTypeCode: string;
-    }>;
-    const connected = rows.filter((r) => r.selectionGroupId === 'connected-1');
-    const single = rows.filter((r) => r.selectionGroupId === 'single-21');
-    expect(connected).toHaveLength(pfmSteps.length);
-    expect(single).toHaveLength(pfmSteps.length);
-    expect(connected.every((r) => JSON.stringify(r.teeth) === JSON.stringify(['14', '15']))).toBe(
       true,
     );
-    expect(single.every((r) => JSON.stringify(r.teeth) === JSON.stringify(['21']))).toBe(true);
   });
 
   it('skips generation when tasks already exist', async () => {

backend/src/modules/cases/lab-case-task.generator.ts

@@ -58,8 +58,9 @@ export async function generateLabCaseTasks(
 
   const stepLabels = await resolveStepLabels(tx, allStepCodes, locale);
 
-  // Group by selection group + prosthesis type so connected spans stay one task set,
+  // Merge all teeth that share the same prosthesis type on a detail into one
-  // and separate singles stay separate even with the same prosthesis type.
+  // task set (pre–selection-group behavior). selectionGroupId is stored for
+  // UI/history only — not part of the grouping key.
   const groups = new Map<
     string,
     {
@@ -72,10 +73,8 @@ export async function generateLabCaseTasks(
   >();
 
   for (const row of toothProsthesisRows) {
-    const selectionGroupId =
+    const key = `${row.treatmentDetailId}::${row.prosthesisTypeCode}`;
-      row.selectionGroupId?.trim() ||
+    const selectionGroupId = row.selectionGroupId?.trim() || '';
-      fallbackGroupIdForTooth(row.detail.toothSelectionGroups, row.tooth, row.prosthesisTypeCode);
-    const key = `${row.treatmentDetailId}::${selectionGroupId}::${row.prosthesisTypeCode}`;
     const group = groups.get(key) ?? {
       treatmentDetailId: row.treatmentDetailId,
       treatmentType: row.detail.treatmentType,
@@ -83,6 +82,10 @@ export async function generateLabCaseTasks(
       selectionGroupId,
       teeth: [],
     };
+    // Keep first non-empty selectionGroupId for persistence; grouping ignores it.
+    if (!group.selectionGroupId && selectionGroupId) {
+      group.selectionGroupId = selectionGroupId;
+    }
     group.teeth.push(row.tooth);
     groups.set(key, group);
   }
@@ -121,24 +124,6 @@ export async function generateLabCaseTasks(
   return taskRows.length;
 }
 
-function fallbackGroupIdForTooth(
-  toothSelectionGroups: unknown,
-  tooth: string,
-  prosthesisTypeCode: string,
-): string {
-  if (Array.isArray(toothSelectionGroups)) {
-    for (const row of toothSelectionGroups) {
-      if (!row || typeof row !== 'object') continue;
-      const rec = row as { groupId?: unknown; teeth?: unknown };
-      if (typeof rec.groupId !== 'string') continue;
-      if (Array.isArray(rec.teeth) && rec.teeth.includes(tooth)) {
-        return rec.groupId;
-      }
-    }
-  }
-  return `legacy-${prosthesisTypeCode}`;
-}
-
 function sortTeeth(teeth: string[]): string[] {
   return [...new Set(teeth)].sort((a, b) => {
     const na = Number(a);

backend/src/modules/tasks/tasks.service.ts

@@ -33,6 +33,9 @@ const taskListInclude = {
   },
 } satisfies Prisma.LabCaseTaskInclude;
 
+/** Completing this step completes every matching task in the same case (catalog: first step of all prosthesis types). */
+const CASE_SCOPED_SCAN_STEP_CODE = 'intraoral_scan';
+
 @Injectable()
 export class TasksService {
   constructor(
@@ -238,12 +241,13 @@ export class TasksService {
     }
 
     const updated = await this.prisma.$transaction(async (tx) => {
+      const now = new Date();
       const result = await tx.labCaseTask.update({
         where: { id: taskId },
         data: {
           status: dto.status,
           lastStatusChangedByUserId: actorUserId,
-          lastStatusChangedAt: new Date(),
+          lastStatusChangedAt: now,
         },
         include: taskListInclude,
       });
@@ -259,13 +263,58 @@ export class TasksService {
         });
       }
 
+      const cascadedScanTaskIds: string[] = [];
+      if (
+        dto.status === LabTaskStatus.COMPLETED &&
+        task.status !== LabTaskStatus.COMPLETED &&
+        task.workflowStepCode === CASE_SCOPED_SCAN_STEP_CODE
+      ) {
+        const siblingScans = await tx.labCaseTask.findMany({
+          where: {
+            labCaseId: task.labCaseId,
+            workflowStepCode: CASE_SCOPED_SCAN_STEP_CODE,
+            status: { not: LabTaskStatus.COMPLETED },
+            id: { not: taskId },
+          },
+          select: { id: true, status: true },
+        });
+
+        for (const sibling of siblingScans) {
+          await tx.labCaseTask.update({
+            where: { id: sibling.id },
+            data: {
+              status: LabTaskStatus.COMPLETED,
+              lastStatusChangedByUserId: actorUserId,
+              lastStatusChangedAt: now,
+            },
+          });
+          await tx.labCaseTaskStatusEvent.create({
+            data: {
+              taskId: sibling.id,
+              fromStatus: sibling.status,
+              toStatus: LabTaskStatus.COMPLETED,
+              changedByUserId: actorUserId,
+            },
+          });
+          cascadedScanTaskIds.push(sibling.id);
+        }
+      }
+
       if (dto.status === LabTaskStatus.COMPLETED && task.status !== LabTaskStatus.COMPLETED) {
         await this.labCaseActivity.record(
           {
             labCaseId: task.labCaseId,
             type: LabCaseActivityType.TASK_COMPLETED,
             actorUserId,
-            payload: { taskId },
+            payload: {
+              taskId,
+              ...(cascadedScanTaskIds.length > 0
+                ? {
+                    cascadedTaskIds: cascadedScanTaskIds,
+                    caseScopedStep: CASE_SCOPED_SCAN_STEP_CODE,
+                  }
+                : {}),
+            },
           },
           tx,
         );

frontend/messages/en.json

@@ -809,7 +809,7 @@
     "entryStepNext": "Next",
     "entryStepLabUnavailable": "Lab dispatch is available after you save a lab-dependent detail with teeth selected.",
     "toothChartTitleCompact": "Tooth chart",
-    "toothChartHint": "Tap teeth to select. Shift-click another tooth in the same arch for a connected span. Ctrl-click (⌘ on Mac) the same way to select each tooth separately.",
+    "toothChartHint": "Tap teeth to select or deselect. Shift-click another tooth in the same arch for a connected bridge. Click a bridge tooth to cut it out (still selected as a single); ends keep one bridge, middle splits into two.",
     "toothConnectedHint": "Connected selection",
     "toothConnectedSuffix": " (connected)",
     "connectedBadge": "Connected",

frontend/messages/fa.json

@@ -803,7 +803,7 @@
     "confirmSend": "تأیید ارسال",
     "toothChartTitle": "نمودار دندان‌ها FDI",
     "toothChartTitleCompact": "نمودار دندان",
-    "toothChartHint": "برای انتخاب روی دندان ضربه بزنید. Shift+کلیک روی دندان دیگر در همان قوس، یک بازه متصل می‌سازد. Ctrl+کلیک (⌘ در مک) به همان شکل هر دندان را جداگانه انتخاب می‌کند.",
+    "toothChartHint": "برای انتخاب یا لغو انتخاب روی دندان ضربه بزنید. Shift+کلیک روی دندان دیگر در همان قوس، یک پل متصل می‌سازد. کلیک روی دندان داخل پل آن را جدا می‌کند (همچنان انتخاب‌شده به‌صورت تک)؛ انتها یک پل می‌ماند، وسط به دو پل تقسیم می‌شود.",
     "toothConnectedHint": "انتخاب متصل",
     "toothConnectedSuffix": " (متصل)",
     "connectedBadge": "متصل",

frontend/messages/nl.json

@@ -802,7 +802,7 @@
     "confirmSend": "Bevestig verzending",
     "toothChartTitle": "FDI-tanddiagram",
     "toothChartTitleCompact": "Tanddiagram",
-    "toothChartHint": "Tik op tanden om te selecteren. Shift-klik op een andere tand in dezelfde boog voor een verbonden span. Ctrl-klik (⌘ op Mac) op dezelfde manier om elke tand apart te selecteren.",
+    "toothChartHint": "Tik op tanden om te selecteren of deselecteren. Shift-klik op een andere tand in dezelfde boog voor een verbonden brug. Klik op een brugtand om die eruit te snijden (blijft geselecteerd als single); uiteinden houden één brug, midden splitst in twee.",
     "toothConnectedHint": "Verbonden selectie",
     "toothConnectedSuffix": " (verbonden)",
     "connectedBadge": "Verbonden",

frontend/src/app/[locale]/(dashboard)/layout.tsx

@@ -76,6 +76,15 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
     );
   }
 
+  // Do not mount clinic-only pages for lab orgs (avoids PERMISSION_CLINIC_ONLY toasts during redirect).
+  if (!canAccessDashboardRoute(currentOrganization, pathname)) {
+    return (
+      <div className="h-screen flex items-center justify-center app-web-bg">
+        {t('loadingWorkspace')}
+      </div>
+    );
+  }
+
   return (
     <ToastProvider>
       <div className="app-dashboard-shell flex h-[100dvh] app-web-bg text-text-primary">

frontend/src/app/[locale]/(public)/page.tsx

@@ -11,10 +11,10 @@ export default function HomePage() {
   const t = useTranslations('landing');
   const tAuth = useTranslations('auth');
   const tCommon = useTranslations('common');
-  const { user } = useAuth();
+  const { user, isAuthReady } = useAuth();
 
   return (
-    <div className="min-h-[100dvh] app-web-bg text-text-primary">
+    <div className="min-h-[100dvh] flex flex-col app-web-bg text-text-primary">
       <header className="border-b border-border/70 bg-background-secondary/65 backdrop-blur-sm fixed top-0 w-full z-10">
         <div className="container mx-auto px-4 py-3 sm:py-4 flex flex-wrap items-center justify-between gap-x-4 gap-y-3">
           <Link href="/" className="text-xl sm:text-2xl font-semibold text-text-primary shrink-0">
@@ -23,7 +23,9 @@ export default function HomePage() {
 
           <div className="flex items-center gap-1.5 sm:gap-3 ml-auto shrink-0">
             <TopBarControls />
-            {user ? (
+            {!isAuthReady ? (
+              <span className="inline-block h-9 w-24 sm:w-28 rounded-[var(--radius-md)] bg-background-card/60 animate-pulse" aria-hidden />
+            ) : user ? (
               <Link href="/today">
                 <Button variant="primary" size="sm" className="sm:px-4 sm:py-2 sm:text-sm">
                   {tAuth('dashboard')}
@@ -48,7 +50,7 @@ export default function HomePage() {
         </div>
       </header>
 
-      <main className="container mx-auto px-4 pt-28 sm:pt-32 pb-16 sm:pb-20">
+      <main className="flex-1 container mx-auto px-4 pt-28 sm:pt-32 pb-16 sm:pb-20">
         <div className="max-w-4xl mx-auto text-center">
           <h1 className="text-3xl sm:text-4xl md:text-5xl lg:text-6xl font-semibold mb-4 sm:mb-6 leading-tight">
             {t('heroTitle')}
@@ -59,7 +61,7 @@ export default function HomePage() {
             {t('heroSubtitle')}
           </p>
 
-          {!user && (
+          {isAuthReady && !user && (
             <div className="flex flex-col sm:flex-row items-stretch sm:items-center justify-center gap-3">
               <Link href="/register" className="w-full sm:w-auto">
                 <Button size="lg" variant="primary" fullWidth className="sm:w-auto sm:px-8">
@@ -109,7 +111,7 @@ export default function HomePage() {
         </div>
       </main>
 
-      <footer className="border-t border-border/70 bg-background-secondary/80">
+      <footer className="mt-auto border-t border-border/70 bg-background-secondary/80">
         <div className="container mx-auto px-4 py-8 flex flex-col md:flex-row justify-between items-center text-sm text-text-secondary">
           <div>{t('footerCopyright')}</div>
 

frontend/src/components/treatment/toothSelectionGroups.ts

@@ -23,6 +23,28 @@ export function deriveTeethFromGroups(groups: ToothSelectionGroup[]): FdiToothId
   return [...set].sort() as FdiToothId[];
 }
 
+/** Never allow a 1-tooth connected group (no lone connected dots). */
+function normalizeGroupKind(kind: ToothSelectionKind, teeth: FdiToothId[]): ToothSelectionKind {
+  if (kind === 'connected' && teeth.length < 2) return 'single';
+  return kind;
+}
+
+function makeGroup(kind: ToothSelectionKind, teeth: FdiToothId[]): ToothSelectionGroup | null {
+  if (teeth.length === 0) return null;
+  return {
+    groupId: newGroupId(),
+    kind: normalizeGroupKind(kind, teeth),
+    teeth,
+  };
+}
+
+function sortInArchOrder(teeth: FdiToothId[]): FdiToothId[] {
+  if (teeth.length === 0) return [];
+  const arch = archOrder(teeth[0]);
+  if (!arch) return [...teeth];
+  return [...teeth].sort((a, b) => arch.indexOf(a) - arch.indexOf(b));
+}
+
 /** Legacy / empty groups: each selected tooth becomes its own single group. */
 export function groupsFromFlatTeeth(
   teeth: readonly FdiToothId[],
@@ -36,11 +58,10 @@ export function groupsFromFlatTeeth(
         teeth: g.teeth.filter((t) => flat.has(t)) as FdiToothId[],
       }))
       .filter((g) => g.teeth.length > 0)
-      .map((g) =>
+      .map((g) => ({
-        g.kind === 'connected' && g.teeth.length < 2
+        ...g,
-          ? { ...g, kind: 'single' as const }
+        kind: normalizeGroupKind(g.kind, g.teeth),
-          : g,
+      }));
-      );
     const covered = new Set(next.flatMap((g) => g.teeth));
     for (const tooth of teeth) {
       if (!covered.has(tooth)) {
@@ -94,8 +115,11 @@ export function teethBetweenInclusive(a: FdiToothId, b: FdiToothId): FdiToothId[
 /**
  * Plain click:
  * - unselected → add as single
- * - selected single → remove
+ * - selected single → remove (deselect)
- * - selected in connected → drop the whole connected span and keep only this tooth as a single
+ * - in connected bridge → cut from bridge, keep selected as single:
+ *   - end tooth → remainder stays one bridge (or demotes if 1 left)
+ *   - middle tooth → left and right become separate bridges/singles
+ * Never leaves a 1-tooth connected group (no lone dots).
  */
 export function toggleToothInGroups(
   groups: ToothSelectionGroup[],
@@ -110,15 +134,26 @@ export function toggleToothInGroups(
     return groups.filter((g) => g.groupId !== owning.groupId);
   }
 
-  // Collapse connected span: only the clicked tooth remains, as a separate single.
+  const ordered = sortInArchOrder(owning.teeth);
+  const idx = ordered.indexOf(tooth);
+  if (idx < 0) return groups;
+
+  const left = ordered.slice(0, idx);
+  const right = ordered.slice(idx + 1);
   const next = groups.filter((g) => g.groupId !== owning.groupId);
+
+  const leftGroup = makeGroup(left.length >= 2 ? 'connected' : 'single', left);
+  const rightGroup = makeGroup(right.length >= 2 ? 'connected' : 'single', right);
+  if (leftGroup) next.push(leftGroup);
+  if (rightGroup) next.push(rightGroup);
   next.push({ groupId: newGroupId(), kind: 'single', teeth: [tooth] });
   return next;
 }
 
 /**
  * Shift-click creates a connected span between anchor and target on the same arch.
- * Any existing groups that intersect the span are replaced by the new connected group.
+ * Overlapping existing bridges are merged (union) into one connected bridge.
+ * Non-overlapping bridges are left alone. Singles inside the union are absorbed.
  */
 export function applyShiftRange(
   groups: ToothSelectionGroup[],
@@ -129,58 +164,47 @@ export function applyShiftRange(
   const span = teethBetweenInclusive(anchor, target);
   if (!span || span.length < 2) return null;
 
-  const spanSet = new Set(span);
+  const union = new Set<FdiToothId>(span);
-  const next = groups
+  let changed = true;
-    .map((g) => ({
+  while (changed) {
-      ...g,
+    changed = false;
-      teeth: g.teeth.filter((t) => !spanSet.has(t)) as FdiToothId[],
+    for (const group of groups) {
-    }))
+      if (group.kind !== 'connected') continue;
-    .filter((g) => g.teeth.length > 0)
+      if (!group.teeth.some((t) => union.has(t))) continue;
-    .map((g) =>
+      for (const t of group.teeth) {
-      g.kind === 'connected' && g.teeth.length < 2
+        if (!union.has(t)) {
-        ? { ...g, kind: 'single' as const }
+          union.add(t);
-        : g,
+          changed = true;
-    );
+        }
-
+      }
-  next.push({ groupId: newGroupId(), kind: 'connected', teeth: span });
+    }
-  return next;
-}
-
-/**
- * Ctrl-click selects every tooth in the same-arch range as its own single group
- * (not connected). Lab dispatch gets one prosthesis row per tooth.
- */
-export function applyCtrlRange(
-  groups: ToothSelectionGroup[],
-  anchor: FdiToothId,
-  target: FdiToothId,
-): ToothSelectionGroup[] | null {
-  if (anchor === target) return null;
-  const span = teethBetweenInclusive(anchor, target);
-  if (!span || span.length < 2) return null;
-
-  const spanSet = new Set(span);
-  const next = groups
-    .map((g) => ({
-      ...g,
-      teeth: g.teeth.filter((t) => !spanSet.has(t)) as FdiToothId[],
-    }))
-    .filter((g) => g.teeth.length > 0)
-    .map((g) =>
-      g.kind === 'connected' && g.teeth.length < 2
-        ? { ...g, kind: 'single' as const }
-        : g,
-    );
-
-  for (const tooth of span) {
-    next.push({ groupId: newGroupId(), kind: 'single', teeth: [tooth] });
   }
+
+  const unionTeeth = sortInArchOrder([...union] as FdiToothId[]);
+  if (unionTeeth.length < 2) return null;
+
+  const next = groups
+    .map((g) => ({
+      ...g,
+      teeth: g.teeth.filter((t) => !union.has(t)) as FdiToothId[],
+    }))
+    .filter((g) => g.teeth.length > 0)
+    .map((g) => ({
+      ...g,
+      kind: normalizeGroupKind(g.kind, g.teeth),
+    }));
+
+  next.push({
+    groupId: newGroupId(),
+    kind: 'connected',
+    teeth: unionTeeth,
+  });
   return next;
 }
 
 /**
  * Drop prosthesis rows for teeth no longer selected on a detail, and refresh
- * selectionGroupId so connected→single collapses do not leave stale group ids.
+ * selectionGroupId so group changes do not leave stale group ids.
  */
 export function pruneToothProsthesisForGroups<
   T extends { detailClientId: string; tooth: string; selectionGroupId?: string },
@@ -213,7 +237,7 @@ export function normalizeToothSelectionGroups(value: unknown): ToothSelectionGro
     if (teeth.length === 0) continue;
     out.push({
       groupId,
-      kind: kind === 'connected' && teeth.length < 2 ? 'single' : kind,
+      kind: normalizeGroupKind(kind, teeth),
       teeth,
     });
   }

frontend/src/components/ui/lab/CasesPage.tsx

@@ -38,7 +38,7 @@ import type {
   PaginatedLabCases,
 } from '@/types/cases';
 
-const PAGE_SIZE = 20;
+const PAGE_SIZE = 10;
 
 export function CasesPage() {
   const t = useTranslations('cases');
@@ -308,9 +308,9 @@ export function CasesPage() {
         <p className="text-sm text-text-muted mt-1">{t('subtitle')}</p>
       </div>
 
-      <div className="grid gap-4 lg:grid-cols-[minmax(300px,380px)_1fr]">
+      <div className="grid gap-4 lg:grid-cols-[minmax(300px,380px)_1fr] lg:items-stretch">
         <section
-          className={`rounded-lg border border-border bg-surface p-3 sm:p-4 space-y-3 flex flex-col min-h-0 ${
+          className={`rounded-lg border border-border bg-surface p-3 sm:p-4 space-y-3 flex flex-col min-h-0 h-full lg:min-h-[420px] ${
             mobileDetailOpen && selectedCaseId ? 'hidden lg:flex' : 'flex'
           }`}
         >
@@ -394,13 +394,13 @@ export function CasesPage() {
             </Button>
           ) : null}
 
-          <div className="flex-1 min-h-0">
+          <div className="flex-1 min-h-0 overflow-y-auto">
             {loadingList ? (
               <p className="text-sm text-text-muted">{tCommon('loading')}</p>
             ) : cases.length === 0 ? (
               <p className="text-sm text-text-muted">{t('emptyList')}</p>
             ) : (
-              <ul className="space-y-2 max-h-[55vh] overflow-y-auto pr-1">
+              <ul className="space-y-2 pr-1">
                 {cases.map((item) => {
                   const isActive = item.id === selectedCaseId;
 
@@ -466,7 +466,7 @@ export function CasesPage() {
           </div>
 
           {pagination.totalPages > 1 ? (
-            <div className="flex items-center justify-between gap-2 pt-2 border-t border-border">
+            <div className="flex shrink-0 items-center justify-between gap-2 pt-2 border-t border-border">
               <Button
                 variant="outline"
                 size="sm"

frontend/src/components/ui/lab/LabCaseCommentsPanel.tsx

@@ -208,9 +208,9 @@ export function LabCaseCommentsPanel({
                 aria-pressed={visibleToClinic}
               >
                 {visibleToClinic ? (
-                  <Eye className="h-4 w-4 text-white stroke-current" />
+                  <Eye className="lucide-on-primary h-4 w-4" color="#fff" />
                 ) : (
-                  <EyeOff className="h-4 w-4 text-white stroke-current" />
+                  <EyeOff className="lucide-on-primary h-4 w-4" color="#fff" />
                 )}
               </button>
             ) : null}
@@ -222,7 +222,7 @@ export function LabCaseCommentsPanel({
               title={t('send')}
               aria-label={t('send')}
             >
-              <Send className="h-4 w-4 text-white stroke-current fill-none rtl:-scale-x-100" />
+              <Send className="lucide-on-primary h-4 w-4 rtl:-scale-x-100" color="#fff" />
             </button>
           </div>
         </div>

frontend/src/components/ui/treatment/FdiToothChart.tsx

@@ -23,7 +23,7 @@ interface FdiToothChartProps {
   selected: ReadonlySet<FdiToothId>;
   /** Teeth that belong to a connected selection span (dots above/below). */
   connectedTeeth?: ReadonlySet<FdiToothId>;
-  onToggle?: (fdi: FdiToothId, event: { shiftKey: boolean; ctrlKey: boolean }) => void;
+  onToggle?: (fdi: FdiToothId, event: { shiftKey: boolean }) => void;
   disabled?: boolean;
   /** Non-interactive display (Cases / connection history). */
   readOnly?: boolean;
@@ -144,7 +144,7 @@ export function FdiToothChart({
     return accent ? { color: accent } : undefined;
   };
 
-  /** Dots + thin links — only for Shift-connected spans (not plain / Ctrl singles). */
+  /** Dots + thin links — only for Shift-connected spans (not plain singles). */
   const ConnectedRail = ({ teeth, upper }: { teeth: FdiToothId[]; upper?: boolean }) => {
     const hasConnected = teeth.some((fdi) => connectedTeeth?.has(fdi));
     if (!hasConnected) return null;
@@ -221,15 +221,12 @@ export function FdiToothChart({
                     type="button"
                     disabled={isDisabled}
                     onMouseDown={(e) => {
-                      // Modifier+click otherwise triggers browser text-selection / sticky focus boxes.
+                      // Shift+click otherwise triggers browser text-selection / sticky focus boxes.
-                      if (e.shiftKey || e.ctrlKey || e.metaKey) e.preventDefault();
+                      if (e.shiftKey) e.preventDefault();
                     }}
                     onClick={(e) => {
                       e.preventDefault();
-                      onToggle?.(fdi, {
+                      onToggle?.(fdi, { shiftKey: e.shiftKey });
-                        shiftKey: e.shiftKey,
-                        ctrlKey: e.ctrlKey || e.metaKey,
-                      });
                     }}
                     style={{ transform: `translateY(${offsetY}px) rotate(${rotate}deg)` }}
                     className={`

frontend/src/components/ui/treatment/TreatmentWorkspace.tsx

@@ -41,7 +41,6 @@ import {
   isLabDependentDetailMissingTeeth,
 } from '@/components/treatment/treatmentDetailRules';
 import {
-  applyCtrlRange,
   applyShiftRange,
   connectedTeethSet,
   deriveTeethFromGroups,
@@ -267,6 +266,26 @@ function isDetailsDirty(
   return serializeDetails(details) !== savedSnapshot;
 }
 
+/** Apply server ids/attachments onto local rows without replacing newer local edits. */
+function mergeServerIdsIntoDetails(
+  local: TreatmentDetailDraft[],
+  fromServer: TreatmentDetailDraft[],
+): TreatmentDetailDraft[] {
+  const byClientId = new Map(fromServer.map((d) => [d.clientId, d]));
+  return local.map((d) => {
+    const s = byClientId.get(d.clientId);
+    if (!s) return d;
+    return {
+      ...d,
+      id: s.id ?? d.id,
+      labCaseId: s.labCaseId ?? d.labCaseId,
+      taskProgress: s.taskProgress ?? d.taskProgress,
+      attachmentMetas:
+        d.attachmentMetas.length > 0 ? d.attachmentMetas : s.attachmentMetas,
+    };
+  });
+}
+
 function detailsToPreviewTreatment(
   details: TreatmentDetailDraft[],
   meta: { title: string; patientId: string; treatmentAt: string; id?: string },
@@ -387,6 +406,8 @@ export function TreatmentWorkspace({
   const pendingAppointmentIdRef = useRef<string | null>(initialAppointmentId);
   const labPanelRef = useRef<HTMLDivElement>(null);
   const historyRequestRef = useRef(0);
+  /** When set, activeDetailId effect opens this wizard step instead of resetting to teeth. */
+  const pendingEntryStepRef = useRef<EntryStep | null>(null);
 
   useEffect(() => {
     pendingAppointmentIdRef.current = initialAppointmentId;
@@ -613,10 +634,13 @@ export function TreatmentWorkspace({
   const chartToothColors = showWholeTreatmentPlan ? wholePlanToothColors : undefined;
 
   // Reset whole-plan overview when switching details.
+  // Prefer pendingEntryStepRef (e.g. Lab shipments → Lab step) over defaulting to teeth.
   useEffect(() => {
     setShowWholeTreatmentPlan(false);
     rangeAnchorRef.current = null;
-    setEntryStep('teeth');
+    const pending = pendingEntryStepRef.current;
+    pendingEntryStepRef.current = null;
+    setEntryStep(pending ?? 'teeth');
   }, [activeDetailId]);
 
   // Leave Lab step if the active detail is no longer prosthesis / lab-dependent.
@@ -927,24 +951,40 @@ export function TreatmentWorkspace({
         ),
       });
       const mapped = response.data.details.map(mapDetailFromApi);
-      setDetails(mapped);
+      const sentSnapshot = serializeDetails(currentDetails);
-      setActiveDetailId((prev) => {
+      const localNow = detailsRef.current;
-        const stillExists = mapped.some((d) => d.clientId === prev);
+
-        return stillExists ? prev : mapped[0]?.clientId ?? prev;
+      // If the user changed details while this save was in flight (e.g. removed a
-      });
+      // detail), do not clobber local state with the stale response.
-      setSavedSnapshot(serializeDetails(mapped));
+      if (serializeDetails(localNow) === sentSnapshot) {
+        setDetails(mapped);
+        setActiveDetailId((prev) => {
+          const stillExists = mapped.some((d) => d.clientId === prev);
+          return stillExists ? prev : mapped[0]?.clientId ?? prev;
+        });
+        setSavedSnapshot(serializeDetails(mapped));
+      } else {
+        const merged = mergeServerIdsIntoDetails(localNow, mapped);
+        detailsRef.current = merged;
+        setDetails(merged);
+        setActiveDetailId((prev) => {
+          const stillExists = merged.some((d) => d.clientId === prev);
+          return stillExists ? prev : merged[0]?.clientId ?? prev;
+        });
+        // Keep dirty so the queued autosave persists the newer local state.
+      }
       return response.data;
     },
     [selectedAppointment, t],
   );
 
-  const refreshHistory = useCallback(async (patientId: string) => {
+  const refreshHistory = useCallback(async (patientId: string, options?: { silentLabCases?: boolean }) => {
     const requestId = ++historyRequestRef.current;
     try {
       const response = await treatmentsApi.listPatientHistory(patientId, 50);
       if (requestId !== historyRequestRef.current) return;
       setHistory(response.data);
-      void refreshPatientLabCases(patientId);
+      void refreshPatientLabCases(patientId, { silent: options?.silentLabCases ?? false });
     } catch (error: unknown) {
       if (requestId !== historyRequestRef.current) return;
       showError(getUserFacingError(error, tErrors, t('errorLoadHistory')));
@@ -1119,10 +1159,16 @@ export function TreatmentWorkspace({
 
       skipNextGetDraftRef.current = true;
       draftHydratingRef.current = true;
+      if (focusDetailClientId && options?.scrollToLabPanel !== false) {
+        pendingEntryStepRef.current = 'lab';
+      }
       hydrateFromTreatment(treatmentToLoad);
       draftHydratingRef.current = false;
 
       if (focusDetailClientId) {
+        if (options?.scrollToLabPanel !== false) {
+          pendingEntryStepRef.current = 'lab';
+        }
         setActiveDetailId(focusDetailClientId);
         const mappedLabCases = withoutEmptyLabCaseDrafts(
           (treatmentToLoad.labCases ?? []).map(mapLabCaseDraftFromApi),
@@ -1187,6 +1233,7 @@ export function TreatmentWorkspace({
     (item: LabDispatchAttentionItem) => {
       if (item.isCurrentDraft) {
         exitBrowse();
+        pendingEntryStepRef.current = 'lab';
         setActiveDetailId(item.detailClientId);
         const linked = labCaseDrafts.find(
           (lc) => !lc.sentAt && lc.detailClientId === item.detailClientId,
@@ -1268,12 +1315,21 @@ export function TreatmentWorkspace({
           workspaceMode === 'live' &&
           !isBrowsing
         ) {
+          pendingEntryStepRef.current = 'lab';
           setActiveDetailId(item.detailClientId);
+          const matchingDraft = labCaseDrafts.find((lc) => lc.id === item.labCaseId);
+          if (matchingDraft) {
+            setActiveLabCaseId(matchingDraft.clientId);
+          }
+          setEntryStep('lab');
+          requestAnimationFrame(() => {
+            scrollWithinMainScrollContainer(labPanelRef.current);
+          });
           return;
         }
 
         await loadTreatmentIntoWorkspace(treatment, item.detailClientId, {
-          scrollToLabPanel: false,
+          scrollToLabPanel: true,
         });
       })();
     },
@@ -1284,6 +1340,7 @@ export function TreatmentWorkspace({
       history,
       historyPanelItems,
       isBrowsing,
+      labCaseDrafts,
       loadTreatmentIntoWorkspace,
       selectedAppointment?.id,
       selectedAppointmentId,
@@ -1456,6 +1513,9 @@ export function TreatmentWorkspace({
           ? (nextDetails[Math.min(idx, nextDetails.length - 1)]?.clientId ??
             nextDetails[0]?.clientId)
           : activeDetailId;
+
+      // Sync ref before any persist triggered by lab-case cleanup (same tick).
+      detailsRef.current = nextDetails;
       setDetails(nextDetails);
       if (nextActive) setActiveDetailId(nextActive);
 
@@ -1554,6 +1614,9 @@ export function TreatmentWorkspace({
     const activeDetail = details.find((d) => d.clientId === activeDetailId);
     if (!activeDetail || !isDetailReadyForLabDispatch(activeDetail, labDependentCodes)) return;
     if (isLabDependentDetailMissingTeeth(activeDetail, labDependentCodes)) return;
+    // Already shipped (or locked) — do not create another draft (avoids post-send flicker).
+    if (isDetailLocked(activeDetail)) return;
+    if (labCaseDrafts.some((lc) => lc.detailClientId === activeDetailId && lc.sentAt)) return;
     const hasDraft = labCaseDrafts.some((lc) => lc.detailClientId === activeDetailId);
     if (hasDraft) return;
     void handleAddLabCase();
@@ -1563,6 +1626,7 @@ export function TreatmentWorkspace({
     details,
     entryStep,
     handleAddLabCase,
+    isDetailLocked,
     labCaseDrafts,
     labDependentCodes,
     selectedAppointment,
@@ -1608,12 +1672,17 @@ export function TreatmentWorkspace({
         const draftResponse = await treatmentsApi.getDraft(selectedAppointment.id);
         if (draftResponse.data?.details?.length) {
           const mapped = draftResponse.data.details.map(mapDetailFromApi);
+          detailsRef.current = mapped;
           setDetails(mapped);
+          setActiveDetailId((prev) => {
+            const stillExists = mapped.some((d) => d.clientId === prev);
+            return stillExists ? prev : mapped[0]?.clientId ?? prev;
+          });
           setSavedSnapshot(serializeDetails(mapped));
         } else {
           const sentDetailClientId = labCase.detailClientId;
-          setDetails((prev) =>
+          setDetails((prev) => {
-            prev.map((detail) => {
+            const next = prev.map((detail) => {
               if (detail.clientId !== sentDetailClientId) return detail;
               return {
                 ...detail,
@@ -1624,8 +1693,10 @@ export function TreatmentWorkspace({
                   ? [response.data.destinationOrganizationId]
                   : detail.sendToOrganizationIds,
               };
-            }),
+            });
-          );
+            detailsRef.current = next;
+            return next;
+          });
         }
 
         setLabCaseDrafts((prev) =>
@@ -1637,6 +1708,7 @@ export function TreatmentWorkspace({
                   sentAt: response.data.sentAt,
                   destinationOrganizationId: response.data.destinationOrganizationId,
                   sends: response.data.sends,
+                  taskProgress: response.data.taskProgress ?? lc.taskProgress,
                 }
               : lc,
           ),
@@ -1649,8 +1721,8 @@ export function TreatmentWorkspace({
         showSuccess(t('successCaseSent'));
         notifyTabBadgesChanged();
         if (selectedAppointment.patientId) {
-          void refreshPatientLabCases(selectedAppointment.patientId);
+          // Silent: avoid rail/history loading flicker while staying on Lab step.
-          void refreshHistory(selectedAppointment.patientId);
+          void refreshHistory(selectedAppointment.patientId, { silentLabCases: true });
         }
       } catch (error: unknown) {
         showError(getUserFacingError(error, tErrors, t('errorSendCase')));
@@ -1663,7 +1735,6 @@ export function TreatmentWorkspace({
       selectedAppointment,
       persistDraft,
       persistLabCases,
-      refreshPatientLabCases,
       refreshHistory,
       showSuccess,
       showError,
@@ -1959,17 +2030,14 @@ export function TreatmentWorkspace({
 
                 let nextGroups: ReturnType<typeof toggleToothInGroups> | null = null;
 
-                // Shift wins if both modifiers are held (connected span).
+                if (event.shiftKey) {
-                if (event.shiftKey || event.ctrlKey) {
                   const anchor = rangeAnchorRef.current;
-                  // Need a prior click as range start; modifier alone on one tooth does nothing.
+                  // Need a prior click as range start; shift alone on one tooth does nothing.
                   if (!anchor || anchor === fdi) {
                     rangeAnchorRef.current = fdi;
                     return;
                   }
-                  nextGroups = event.shiftKey
+                  nextGroups = applyShiftRange(currentGroups, anchor, fdi);
-                    ? applyShiftRange(currentGroups, anchor, fdi)
-                    : applyCtrlRange(currentGroups, anchor, fdi);
                   rangeAnchorRef.current = fdi;
                   if (!nextGroups) return;
                 } else {

frontend/src/styles/globals.css

@@ -354,6 +354,12 @@ select option {
   stroke: currentColor;
 }
 
+/* Opt out when an icon sits on a primary/filled control (Send, etc.) */
+.lucide.lucide-on-primary {
+  color: #fff;
+  stroke: currentColor;
+}
+
 @keyframes task-row-complete-exit {
   0% {
     opacity: 1;