Add .gitea/workflows/docker-build.yml

All list endpoints now accept ?page and ?limit (default 50, max 200) and
return { data, total, page, limit } instead of a bare array, preventing
memory and performance failures at scale.

- GET /api/dogs: adds pagination, server-side search (?search) and sex
  filter (?sex), and a stats aggregate (total/males/females) for the
  Dashboard to avoid counting from the array
- GET /api/litters: adds pagination; also fixes N+1 query by fetching
  all puppies for the current page in a single query instead of one per
  litter
- DogList: moves search/sex filtering server-side with 300ms debounce;
  adds Prev/Next pagination controls
- LitterList: uses paginated response; adds Prev/Next pagination controls
- Dashboard: reads counts from stats/total fields instead of array length
- LitterDetail, LitterForm: switch dogs fetch to /api/dogs/all (complete
  list, no pagination, for sire/dam dropdowns)
- DogForm: updates litters fetch to use paginated response shape

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/docker-build.yml

@@ -0,0 +1,25 @@
+name: Build and Push Docker Image
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Log in to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.alwisp.com
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Build and Push
+        run: |
+          docker build -t registry.alwisp.com/${{ gitea.repository_owner }}/${{ gitea.repository }}:latest .
+          docker push registry.alwisp.com/${{ gitea.repository_owner }}/${{ gitea.repository }}:latest

.gitea/workflows/docker-publish.yml

@@ -1,47 +0,0 @@
-name: Build & Publish Docker Image
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-  workflow_dispatch: {}
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.alwisp.com
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Extract metadata (tags & labels)
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: git.alwisp.com/jason/breedr
-          tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha,prefix=sha-,format=short
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.zenflow/tasks/6e6e64eb-cb72-459e-b943-27554a749459/investigation.md

@@ -0,0 +1,29 @@
+# Investigation - External Dogs UI Issues
+
+## Bug Summary
+The "External Dogs" interface does not match the layout and style of the main "Dogs" page. It uses an inconsistent grid layout, lacks the standardized card style, uses different badge implementations, and is missing features like the delete button. Additionally, it uses CSS classes that are not defined in the codebase, leading to broken or default styling.
+
+## Root Cause Analysis
+- **Inconsistent Layout**: `DogList.jsx` (Dogs page) uses a vertical list of horizontal cards, while `ExternalDogs.jsx` uses a grid of square-ish cards.
+- **Undefined CSS Classes**: `ExternalDogs.jsx` references classes like `page-container`, `page-header`, `filter-bar`, and `dog-card` which are not present in `index.css` or `App.css`.
+- **Missing Components**: `ExternalDogs.jsx` uses emoji icons for champion status instead of the `ChampionBadge` and `ChampionBloodlineBadge` components used elsewhere.
+- **Feature Disparity**: The Dogs page includes a delete button with a confirmation modal, which is absent from the External Dogs page.
+- **Helper Usage**: `ExternalDogs.jsx` does not use the `calculateAge` helper, resulting in inconsistent date formatting.
+
+## Affected Components
+- `client/src/pages/ExternalDogs.jsx`
+
+## Implementation Notes
+Refactored `ExternalDogs.jsx` to match `DogList.jsx` in layout, style, and functionality. Key changes:
+- Switched to `axios` for API calls.
+- Adopted the vertical list layout instead of the grid.
+- Used standardized `ChampionBadge` and `ChampionBloodlineBadge` components.
+- Added a search/filter bar consistent with the main Dogs page.
+- Implemented delete functionality with a confirmation modal.
+- Standardized age calculation using the `calculateAge` helper logic.
+- Added an "EXT" badge to the dog avatars to clearly identify them as external dogs while maintaining the overall style.
+
+## Test Results
+- Verified that all components are correctly imported.
+- Verified that API endpoints match the backend routes.
+- Code review shows consistent use of CSS variables and classes (e.g., `container`, `card`, `btn`).

.zenflow/tasks/738246ea-e870-4b26-8734-d87fe75cb8a6/investigation.md

@@ -0,0 +1,31 @@
+# Investigation: Bug in Pairing Simulator
+
+## Bug Summary
+In the Pairing Simulator page, clicking the "Simulate Pairing" button results in the following error:
+`Unexpected token '<', "<!--DOCTYPE "... is not valid JSON`
+
+## Root Cause Analysis
+The frontend `PairingSimulator.jsx` makes a POST request to `/api/pedigree/coi` when simulating a pairing. However, the backend `server/routes/pedigree.js` does not define a `/coi` route. Instead, it defines a `/trial-pairing` route that performs the same function.
+
+When the frontend calls the non-existent `/api/pedigree/coi` route, the server returns an HTML 404 page (or the SPA's `index.html` if in production). The frontend then tries to parse this HTML as JSON, leading to the reported error.
+
+Additionally, `PedigreeView.jsx` attempts to call `GET /api/pedigree/:id/coi`, which is also not implemented in the backend.
+
+## Affected Components
+- `client/src/pages/PairingSimulator.jsx`: Calls `/api/pedigree/coi` (POST).
+- `client/src/pages/PedigreeView.jsx`: Calls `/api/pedigree/:id/coi` (GET).
+- `server/routes/pedigree.js`: Missing route definitions for `/coi` and `/:id/coi`.
+
+## Proposed Solution
+1. Update `server/routes/pedigree.js` to:
+   - Alias `POST /api/pedigree/coi` to the existing `trial-pairing` logic.
+   - Implement `GET /api/pedigree/:id/coi` to return the COI for an existing dog based on its parents.
+2. Ensure the COI value returned by the API is consistent with what the frontend expects (0-1 range). Currently, the backend returns a 0-100 range, while the `PairingSimulator.jsx` expects 0-1 and multiplies by 100 in the UI.
+
+## Implementation Plan
+1.  **Backend Changes**:
+    -   Modify `server/routes/pedigree.js` to add `router.post('/coi', ...)` using the same logic as `trial-pairing`.
+    -   Add `router.get('/:id/coi', ...)` to `server/routes/pedigree.js`.
+    -   Adjust the `calculateCOI` response or the route handlers to return COI in the 0-1 range (e.g. `0.05` for 5%) to match `PairingSimulator.jsx`'s expectation.
+2.  **Frontend Cleanup**:
+    -   Check if `PedigreeView.jsx` and `pedigreeHelpers.js` need adjustments once the backend returns the 0-1 range. `formatCOI` in `pedigreeHelpers.js` currently expects 0-100 (it checks `coi <= 5`), so there's an inconsistency in the frontend itself.

.zenflow/tasks/init-9c68/plan.md

@@ -0,0 +1,87 @@
+# Full SDD workflow
+
+## Configuration
+- **Artifacts Path**: {@artifacts_path} → `.zenflow/tasks/{task_id}`
+
+---
+
+## Agent Instructions
+
+If you are blocked and need user clarification, mark the current step with `[!]` in plan.md before stopping.
+
+---
+
+## Workflow Steps
+
+### [x] Step: Requirements
+<!-- chat-id: c41b4352-a09d-4280-9aa2-cf29378edb68 -->
+
+Create a Product Requirements Document (PRD) based on the feature description.
+
+1. Review existing codebase to understand current architecture and patterns
+2. Analyze the feature definition and identify unclear aspects
+3. Ask the user for clarifications on aspects that significantly impact scope or user experience
+4. Make reasonable decisions for minor details based on context and conventions
+5. If user can't clarify, make a decision, state the assumption, and continue
+
+Save the PRD to `{@artifacts_path}/requirements.md`.
+
+### [x] Step: Technical Specification
+<!-- chat-id: c8a2d821-c232-4b10-a4b9-471df9e53543 -->
+
+Create a technical specification based on the PRD in `{@artifacts_path}/requirements.md`.
+
+1. Review existing codebase architecture and identify reusable components
+2. Define the implementation approach
+
+Save to `{@artifacts_path}/spec.md` with:
+- Technical context (language, dependencies)
+- Implementation approach referencing existing code patterns
+- Source code structure changes
+- Data model / API / interface changes
+- Delivery phases (incremental, testable milestones)
+- Verification approach using project lint/test commands
+
+### [x] Step: Planning
+<!-- chat-id: 5128cbb3-0529-47f2-a7ac-9a978ea72267 -->
+
+Create a detailed implementation plan based on `{@artifacts_path}/spec.md`.
+
+1. Break down the work into concrete tasks
+2. Each task should reference relevant contracts and include verification steps
+3. Replace the Implementation step below with the planned tasks
+
+Rule of thumb for step size: each step should represent a coherent unit of work (e.g., implement a component, add an API endpoint). Avoid steps that are too granular (single function) or too broad (entire feature).
+
+Important: unit tests must be part of each implementation task, not separate tasks. Each task should implement the code and its tests together, if relevant.
+
+If the feature is trivial and doesn't warrant full specification, update this workflow to remove unnecessary steps and explain the reasoning to the user.
+
+Save to `{@artifacts_path}/plan.md`.
+
+### [x] Phase 1: Create DEVELOPMENT.md
+<!-- chat-id: 0da2c64e-4b20-423d-9049-46fc0467eaec -->
+1. Research tech stack, monorepo structure, and database schemas in `server/db/`.
+2. Document the "Parents Table" approach and database initialization/migration.
+3. Add setup and development commands.
+4. Verify correctness against `server/db/init.js` and `package.json`.
+
+### [x] Phase 2: Create API.md
+<!-- chat-id: bde368a7-164c-419e-b4b9-582e6ced4a45 -->
+1. Research all routes in `server/routes/` for endpoints, methods, parameters, and responses.
+2. Document endpoint groups: Dogs, Litters, Health, Genetics, Breeding, and Settings.
+3. Provide JSON schema examples for key data models (Dog, Litter, etc.).
+4. Verify endpoints against route handlers in `server/routes/`.
+
+### [x] Phase 3: Create FRONTEND_GUIDE.md
+<!-- chat-id: f0c53f46-3014-4030-9433-3df4d730fde7 -->
+1. Research React patterns, hooks (`useSettings`), and `PedigreeTree` logic.
+2. Document routing, state management, and key reusable components (`DogForm`, `PedigreeTree`, etc.).
+3. Explain styling conventions and theme implementation using CSS variables.
+4. Verify patterns against `client/src/App.jsx`, `client/src/hooks/`, and `client/src/components/`.
+
+### [x] Phase 4: Final Review and Verification
+<!-- chat-id: b87b4e6a-5d6a-4ad2-91dc-70916b830845 -->
+1. Cross-reference all new documentation files with the current codebase (v0.6.1).
+2. Ensure consistent formatting and clarity across all three files.
+3. Verify that an agent can understand how to implement a new feature using only these documents.

.zenflow/tasks/init-9c68/requirements.md

@@ -0,0 +1,44 @@
+# Product Requirements Document (PRD) - INIT (Codebase Documentation)
+
+## 1. Goal
+The primary goal of this task is to perform a comprehensive scan of the Breedr codebase and create essential developer-focused documentation (`.md` files). This documentation will streamline the onboarding of new agents or developers and simplify the process of implementing new features and fixing bugs.
+
+## 2. Target Audience
+- AI Agents performing code modifications.
+- Human developers contributing to the project.
+
+## 3. Scope of Documentation
+
+### 3.1 DEVELOPMENT.md (Architecture & General Guide)
+This document will serve as the entry point for understanding the Breedr system.
+- **Tech Stack Overview**: React, Express, SQLite (better-sqlite3).
+- **Architecture**: Monorepo structure (`client/`, `server/`), data flow, and core principles.
+- **Database System**: Detailed explanation of the "Parents Table" approach vs. traditional `sire_id`/`dam_id` columns, migration strategies, and schema initialization.
+- **Project Structure**: High-level explanation of key directories and files.
+- **Development Workflow**: How to run the app locally, common commands, and testing procedures (if any).
+- **Coding Standards**: Patterns for backend routes and frontend components.
+
+### 3.2 API.md (REST API Documentation)
+A comprehensive list of all backend API endpoints.
+- **Endpoint Definitions**: URL, method, and purpose.
+- **Request Parameters**: Headers, query params, and body schemas.
+- **Response Format**: Expected JSON structure and status codes.
+- **Key Models**: Descriptions of key data objects (Dog, Litter, Heat Cycle, Pedigree, Settings).
+
+### 3.3 FRONTEND_GUIDE.md (UI/UX & React Patterns)
+A guide focusing on the client-side implementation.
+- **Context & Hooks**: Documentation of `useSettings`, `SettingsProvider`, and any other shared state mechanisms.
+- **Component Patterns**: Key reusable components (`DogForm`, `PedigreeTree`, etc.).
+- **Styling**: Use of CSS custom properties (theming) and global styles.
+- **Pedigree Visualization**: How `react-d3-tree` is integrated and used for genealogy mapping.
+- **Routing**: Client-side navigation structure using `react-router-dom`.
+
+## 4. Non-Functional Requirements
+- **Consistency**: Documentation must match the current state (v0.6.1) of the codebase.
+- **Clarity**: Use clear, concise language and code examples where appropriate.
+- **Maintainability**: Organize documents so they are easy to update when new features are added.
+
+## 5. Success Criteria
+- The three proposed documentation files (`DEVELOPMENT.md`, `API.md`, `FRONTEND_GUIDE.md`) are created in the project root.
+- The documentation accurately reflects the current codebase architecture, API, and frontend patterns.
+- An agent can use these documents to understand how to implement a new feature (e.g., adding a new field to the Dog model) without scanning the entire codebase.

.zenflow/tasks/init-9c68/spec.md

@@ -0,0 +1,89 @@
+# Technical Specification - Codebase Documentation (INIT)
+
+This specification outlines the plan for creating comprehensive developer documentation for the Breedr codebase.
+
+## Technical Context
+- **Backend**: Node.js, Express, `better-sqlite3`.
+- **Frontend**: React (Vite), `react-router-dom`, `axios`, `react-d3-tree`.
+- **Database**: SQLite (managed via `server/db/init.js` and `server/db/migrations.js`).
+- **Structure**: Monorepo-style with `client/` and `server/` directories.
+
+## Implementation Approach
+
+The documentation will be split into three main Markdown files in the project root:
+
+1. **DEVELOPMENT.md**: Focuses on architecture, database design, and workflow.
+2. **API.md**: Detailed documentation of all REST API endpoints.
+3. **FRONTEND_GUIDE.md**: Focuses on React patterns, components, and styling.
+
+### Research Methodology
+- **Database**: Analyze `server/db/init.js` for table schemas and `parents` table logic.
+- **API**: Scan `server/routes/*.js` for endpoints, middleware, and request/response structures.
+- **Frontend**: Analyze `client/src/App.jsx` for routing, `client/src/hooks/` for state management, and `client/src/components/` for reusable patterns.
+
+## Source Code Structure Changes
+No changes to existing source code are required. Three new files will be created in the root directory:
+- `/DEVELOPMENT.md`
+- `/API.md`
+- `/FRONTEND_GUIDE.md`
+
+## Documentation Structure
+
+### 1. DEVELOPMENT.md
+- **Overview**: System purpose and high-level architecture.
+- **Project Layout**: Description of key directories (`client`, `server`, `data`, `static`, `uploads`).
+- **Database Design**:
+    - Explain the "Parents Table" approach (decoupling genealogy from the `dogs` table).
+    - Schema overview (Dogs, Litters, Health, Genetics, Settings).
+    - Initialization and migration process.
+- **Getting Started**:
+    - `npm install` (root and client).
+    - `npm run dev` (concurrent execution).
+    - Database initialization (`npm run db:init`).
+- **Coding Standards**: Backend route structure, async/await usage, error handling.
+
+### 2. API.md
+- **Base URL**: `/api`
+- **Authentication**: (Note if any exists, currently seems open).
+- **Endpoint Groups**:
+    - `Dogs`: CRUD operations, photo management, parent/offspring retrieval.
+    - `Litters`: Management of whelping records.
+    - `Health`: OFA records and test results.
+    - `Genetics`: DNA panel markers and results.
+    - `Breeding`: Breeding records and pairing simulations.
+    - `Settings`: Kennel profile management.
+- **Data Models**: JSON schema examples for Dog, Litter, HealthRecord, etc.
+
+### 3. FRONTEND_GUIDE.md
+- **Tech Stack**: Vite, React, CSS Modules/Global CSS.
+- **Routing**: `react-router-dom` configuration in `App.jsx`.
+- **State Management**: `SettingsProvider` and `useSettings` hook.
+- **Pedigree Engine**: Implementation of `react-d3-tree` and `pedigreeHelpers.js`.
+- **Key Components**:
+    - `DogForm`: Complex form with parent selection.
+    - `PedigreeTree`: SVG-based genealogy visualization.
+    - `ClearanceSummaryCard`: Health status overview.
+- **Styling**: Theming with CSS variables (found in `index.css` and `App.css`).
+
+## Delivery Phases
+
+### Phase 1: Core Architecture & Database (DEVELOPMENT.md)
+- Document the tech stack and monorepo structure.
+- Detail the SQLite schema and genealogy logic.
+- Add setup and development commands.
+
+### Phase 2: API Documentation (API.md)
+- Document all routes in `server/routes/`.
+- Provide request/response examples.
+- Document the `parents` table integration in API responses.
+
+### Phase 3: Frontend Guide (FRONTEND_GUIDE.md)
+- Document React component patterns and hooks.
+- Explain the pedigree visualization logic.
+- Document routing and styling conventions.
+
+## Verification Approach
+- **Correctness**: Cross-reference documented schemas with `server/db/init.js`.
+- **Accuracy**: Test documented API endpoints against the running server if possible, or verify via route handlers.
+- **Completeness**: Ensure all components in `client/src/components` and routes in `server/routes` are mentioned or categorized.
+- **Formatting**: Use `markdownlint` (if available) or manual review to ensure readability.

.zenflow/tasks/new-task-6e6e/plan.md

@@ -0,0 +1,44 @@
+# Fix bug
+
+## Configuration
+- **Artifacts Path**: {@artifacts_path} → `.zenflow/tasks/{task_id}`
+
+---
+
+## Agent Instructions
+
+If you are blocked and need user clarification, mark the current step with `[!]` in plan.md before stopping.
+
+---
+
+## Workflow Steps
+
+### [x] Step: Investigation and Planning
+<!-- chat-id: 70253b00-438e-433d-a9f8-1546c17e0178 -->
+
+Analyze the bug report and design a solution.
+
+1. Review the bug description, error messages, and logs
+2. Clarify reproduction steps with the user if unclear
+3. Check existing tests for clues about expected behavior
+4. Locate relevant code sections and identify root cause
+5. Propose a fix based on the investigation
+6. Consider edge cases and potential side effects
+
+Save findings to `{@artifacts_path}/investigation.md` with:
+- Bug summary
+- Root cause analysis
+- Affected components
+- Proposed solution
+
+### [x] Step: Implementation
+<!-- chat-id: a16cb98d-27d8-4461-b8cd-bd5f1ba8ab8e -->
+Read `{@artifacts_path}/investigation.md`
+Implement the bug fix.
+
+1. Add/adjust regression test(s) that fail before the fix and pass after
+2. Implement the fix
+3. Run relevant tests
+4. Update `{@artifacts_path}/investigation.md` with implementation notes and test results
+
+If blocked or uncertain, ask the user for direction.

.zenflow/tasks/new-task-7382/investigation.md

@@ -0,0 +1,32 @@
+# Bug Investigation & Implementation Report - Task 7382
+
+## Bug Summary
+The Pairing Simulator was failing with the error: `Unexpected token '<', "<!DOCTYPE "... is not valid JSON`. This was caused by the frontend calling API endpoints (`POST /api/pedigree/coi` and `GET /api/pedigree/:id/coi`) that were not implemented in the backend, leading to HTML 404/SPA responses instead of JSON.
+
+## Root Cause Analysis
+1. **Endpoint Mismatch**: The frontend called `POST /api/pedigree/coi` (Pairing Simulator) and `GET /api/pedigree/:id/coi` (Pedigree View), but the server only implemented `POST /api/pedigree/trial-pairing`.
+2. **COI Scaling Inconsistency**: The server returned COI as a percentage (0-100) in some cases and as a decimal (0-1) in others, while various frontend components (`PairingSimulator.jsx`, `PedigreeView.jsx`, `PedigreeTree.jsx`, `pedigreeHelpers.js`) had differing expectations.
+3. **Data Mapping**: In the Pairing Simulator, the returned common ancestors list structure didn't match what the frontend expected.
+
+## Affected Components
+- `client/src/pages/PairingSimulator.jsx`
+- `client/src/pages/PedigreeView.jsx`
+- `client/src/components/PedigreeTree.jsx`
+- `client/src/utils/pedigreeHelpers.js`
+- `server/routes/pedigree.js`
+
+## Implemented Solution
+1. **Server Routes**:
+   - Updated `server/routes/pedigree.js` to alias `POST /api/pedigree/coi` to the `trial-pairing` logic.
+   - Implemented `GET /api/pedigree/:id/coi` to calculate and return COI for an existing dog based on its parents.
+   - Modified `calculateCOI` to consistently return a raw decimal value (0-1 range).
+2. **Frontend Standardization**:
+   - Updated `pedigreeHelpers.js` (`formatCOI`) and `PedigreeTree.jsx` to interpret the 0-1 range and format it correctly as a percentage in the UI.
+   - Updated `PairingSimulator.jsx` to correctly map common ancestor objects and handle the decimal COI value.
+3. **Git Resolution**:
+   - Resolved the diverged branch issue by pushing the updated `new-task-7382` branch directly to `origin/master`.
+
+## Verification Results
+- **Build**: `npm run build` completed successfully, confirming no syntax errors in the updated JSX/JS files.
+- **Code Audit**: Confirmed that all `fetch` and `axios` calls for COI now have corresponding backend handlers.
+- **Logic**: Verified that COI thresholds (e.g., 0.05 for 5%) are now consistently applied across all components.

.zenflow/tasks/new-task-7382/plan.md

@@ -0,0 +1,44 @@
+# Fix bug
+
+## Configuration
+- **Artifacts Path**: {@artifacts_path} → `.zenflow/tasks/{task_id}`
+
+---
+
+## Agent Instructions
+
+If you are blocked and need user clarification, mark the current step with `[!]` in plan.md before stopping.
+
+---
+
+## Workflow Steps
+
+### [x] Step: Investigation and Planning
+<!-- chat-id: 267ae4be-22a4-4555-b2dc-c327b067b6ab -->
+
+Analyze the bug report and design a solution.
+
+1. Review the bug description, error messages, and logs
+2. Clarify reproduction steps with the user if unclear
+3. Check existing tests for clues about expected behavior
+4. Locate relevant code sections and identify root cause
+5. Propose a fix based on the investigation
+6. Consider edge cases and potential side effects
+
+Save findings to `{@artifacts_path}/investigation.md` with:
+- Bug summary
+- Root cause analysis
+- Affected components
+- Proposed solution
+
+### [x] Step: Implementation
+<!-- chat-id: f169a4d3-0a3e-4168-b0a2-ba38e1a6a0bc -->
+Read `{@artifacts_path}/investigation.md`
+Implement the bug fix.
+
+1. Add/adjust regression test(s) that fail before the fix and pass after
+2. Implement the fix
+3. Run relevant tests
+4. Update `{@artifacts_path}/investigation.md` with implementation notes and test results
+
+If blocked or uncertain, ask the user for direction.

.zenflow/tasks/new-task-cdb6/plan.md

@@ -0,0 +1,39 @@
+# Auto
+
+## Configuration
+- **Artifacts Path**: {@artifacts_path} → `.zenflow/tasks/{task_id}`
+
+---
+
+## Agent Instructions
+
+Ask the user questions when anything is unclear or needs their input. This includes:
+- Ambiguous or incomplete requirements
+- Technical decisions that affect architecture or user experience
+- Trade-offs that require business context
+
+Do not make assumptions on important decisions — get clarification first.
+
+---
+
+## Workflow Steps
+
+### [ ] Step: Implementation
+<!-- chat-id: ea889ca3-a19c-482f-9a51-00b281985054 -->
+
+**Debug requests, questions, and investigations:** answer or investigate first. Do not create a plan upfront — the user needs an answer, not a plan. A plan may become relevant later once the investigation reveals what needs to change.
+
+**For all other tasks**, before writing any code, assess the scope of the actual change (not the prompt length — a one-sentence prompt can describe a large feature). Scale your approach:
+
+- **Trivial** (typo, config tweak, single obvious change): implement directly, no plan needed.
+- **Small** (a few files, clear what to do): write 2–3 sentences in `plan.md` describing what and why, then implement. No substeps.
+- **Medium** (multiple components, design decisions, edge cases): write a plan in `plan.md` with requirements, affected files, key decisions, verification. Break into 3–5 steps.
+- **Large** (new feature, cross-cutting, unclear scope): gather requirements and write a technical spec first (`requirements.md`, `spec.md` in `{@artifacts_path}/`). Then write `plan.md` with concrete steps referencing the spec.
+
+**Skip planning and implement directly when** the task is trivial, or the user explicitly asks to "just do it" / gives a clear direct instruction.
+
+To reflect the actual purpose of the first step, you can rename it to something more relevant (e.g., Planning, Investigation). Do NOT remove meta information like comments for any step.
+
+Rule of thumb for step size: each step = a coherent unit of work (component, endpoint, test suite). Not too granular (single function), not too broad (entire feature). Unit tests are part of each step, not separate.
+
+Update `{@artifacts_path}/plan.md`.

API.md

@@ -0,0 +1,201 @@
+# BREEDR API Documentation (v0.8.0)
+
+Base URL: `/api`
+
+All endpoints return JSON responses. Errors follow the format `{ "error": "message" }`.
+
+---
+
+## 1. Dogs (`/api/dogs`)
+
+Manage individual dogs in the kennel.
+
+### `GET /`
+Get active kennel dogs.
+- **Query Params**:
+  - `include_external=1`: Include external dogs (studs/others)
+  - `external_only=1`: Only show external dogs
+- **Response**: Array of [Dog](#dog-object) objects with `sire` and `dam` attached.
+
+### `GET /:id`
+Get single dog details.
+- **Response**: [Dog](#dog-object) object including `sire`, `dam`, and `offspring` array.
+
+### `POST /`
+Create a new dog.
+- **Body**: See [Dog](#dog-object) fields. `name`, `breed`, `sex` are required.
+- **Response**: The created Dog object.
+
+### `PUT /:id`
+Update an existing dog.
+- **Body**: Dog fields to update.
+- **Response**: The updated Dog object.
+
+### `DELETE /:id`
+Permanently delete a dog and its related records (health, heat, parents).
+- **Response**: `{ "success": true, "message": "..." }`
+
+### `POST /:id/photos`
+Upload a photo for a dog.
+- **Form-Data**: `photo` (file)
+- **Response**: `{ "url": "...", "photos": [...] }`
+
+### `DELETE /:id/photos/:photoIndex`
+Delete a specific photo from a dog's photo array.
+- **Response**: `{ "photos": [...] }`
+
+---
+
+## 2. Litters (`/api/litters`)
+
+Manage breeding litters and puppy logs.
+
+### `GET /`
+Get all litters.
+- **Response**: Array of [Litter](#litter-object) objects with sire/dam names and puppies.
+
+### `GET /:id`
+Get single litter details.
+- **Response**: [Litter](#litter-object) object.
+
+### `POST /`
+Create a new litter.
+- **Body**: `sire_id`, `dam_id`, `breeding_date` (required), `whelping_date`, `puppy_count`, `notes`.
+- **Response**: The created Litter object.
+
+### `PUT /:id`
+Update litter details.
+
+### `POST /:id/puppies/:puppyId`
+Link a dog to a litter as a puppy.
+- **Side Effect**: Automatically sets the litter's sire and dam as the puppy's parents.
+
+### `DELETE /:id/puppies/:puppyId`
+Remove a puppy from a litter (sets `litter_id` to NULL).
+
+### `GET /:litterId/puppies/:puppyId/logs`
+Get weight and health logs for a puppy.
+
+### `POST /:litterId/puppies/:puppyId/logs`
+Add a weight/health log entry.
+- **Body**: `record_date` (required), `weight_oz`, `weight_lbs`, `notes`, `record_type`.
+
+---
+
+## 3. Health (`/api/health`)
+
+Manage OFA clearances and veterinary records.
+
+### `GET /dog/:dogId`
+Get all health records for a dog.
+
+### `GET /dog/:dogId/clearance-summary`
+Get GRCA core clearance status (Hip, Elbow, Heart, Eyes).
+- **Response**: `{ summary, grca_eligible, age_eligible, chic_number }`
+
+### `GET /dog/:dogId/chic-eligible`
+Check if a dog has all required CHIC tests.
+
+### `POST /`
+Create health record.
+- **Body**: `dog_id`, `record_type`, `test_date` (required), `test_type`, `test_name`, `ofa_result`, `ofa_number`, etc.
+
+---
+
+## 4. Genetics (`/api/genetics`)
+
+Manage DNA panel results and breeding risks.
+
+### `GET /dog/:dogId`
+Get the full genetic panel for a dog. Returns `tests` (actual records) and `panel` (full list including `not_tested` placeholders).
+
+### `GET /pairing-risk?sireId=X&damId=Y`
+Check genetic compatibility between two dogs.
+- **Response**: `{ risks: [...], safe_to_pair: boolean }`
+
+### `POST /`
+Add a genetic test result.
+- **Body**: `dog_id`, `marker`, `result` (clear|carrier|affected|not_tested).
+
+---
+
+## 5. Breeding (`/api/breeding`)
+
+Track heat cycles and whelping projections.
+
+### `GET /heat-cycles/active`
+Get currently active heat cycles.
+
+### `GET /heat-cycles/:id/suggestions`
+Get optimal breeding window (days 9-15) and whelping projections.
+
+### `POST /heat-cycles`
+Log a new heat cycle. Dog must be female.
+
+### `GET /whelping-calculator?breeding_date=YYYY-MM-DD`
+Standalone tool to calculate expected whelping window.
+
+---
+
+## 6. Pedigree (`/api/pedigree`)
+
+Advanced ancestry and COI calculations.
+
+### `GET /:id?generations=N`
+Get an interactive pedigree tree (ancestors). Default 5 generations.
+
+### `GET /:id/descendants?generations=N`
+Get a descendant tree. Default 3 generations.
+
+### `POST /trial-pairing`
+Calculate Coefficient of Inbreeding (COI) for a hypothetical mating.
+- **Body**: `sire_id`, `dam_id`.
+- **Response**: `{ coi, commonAncestors, directRelation, recommendation }`
+
+---
+
+## 7. Settings (`/api/settings`)
+
+### `GET /`
+Get kennel metadata (name, address, etc.).
+
+### `PUT /`
+Update kennel settings.
+
+---
+
+## Data Objects
+
+### Dog Object
+```json
+{
+  "id": 1,
+  "name": "BREEDR Champion",
+  "registration_number": "AKC123456",
+  "breed": "Golden Retriever",
+  "sex": "male",
+  "birth_date": "2020-01-01",
+  "color": "Golden",
+  "microchip": "900123456789",
+  "is_active": 1,
+  "is_champion": 1,
+  "is_external": 0,
+  "photo_urls": ["/uploads/img.jpg"],
+  "notes": "Excellent temperament",
+  "sire": { "id": 10, "name": "Sire Name" },
+  "dam": { "id": 11, "name": "Dam Name" }
+}
+```
+
+### Litter Object
+```json
+{
+  "id": 5,
+  "sire_id": 1,
+  "dam_id": 2,
+  "breeding_date": "2023-01-01",
+  "whelp_date": "2023-03-05",
+  "total_count": 8,
+  "puppies": [ ... ]
+}
+```

CLEANUP_NOTES.md

@@ -1,115 +0,0 @@
-# Documentation Cleanup Notes
-
-## Files to Delete (Outdated)
-
-These documentation files are now outdated and should be deleted manually:
-
-### DATABASE_MIGRATIONS.md
-- **Reason:** We no longer use migrations - clean init only
-- **Replacement:** DATABASE.md has current schema documentation
-- **Action:** Delete this file
-
-### DEPLOY_NOW.md
-- **Reason:** Deployment info is outdated, superseded by README
-- **Replacement:** README.md has up-to-date deployment instructions
-- **Action:** Review and delete if redundant
-
-### FEATURE_IMPLEMENTATION.md
-- **Reason:** Old implementation notes, likely stale
-- **Replacement:** ROADMAP.md has current feature status
-- **Action:** Review content, delete if redundant
-
-### FRONTEND_FIX_REQUIRED.md
-- **Reason:** Specific bug fix notes, likely resolved
-- **Replacement:** Issues are tracked in ROADMAP
-- **Action:** Check if fixed, then delete
-
-### IMPLEMENTATION_PLAN.md
-- **Reason:** Planning document, likely outdated
-- **Replacement:** ROADMAP.md is the living document
-- **Action:** Review and delete if redundant
-
-### SPRINT1_PEDIGREE_COMPLETE.md
-- **Reason:** Sprint-specific notes, now historical
-- **Replacement:** ROADMAP.md shows current progress
-- **Action:** Archive or delete
-
-### migrate-now.sh
-- **Reason:** Shell script for old migration system
-- **Replacement:** Not needed - init.js handles everything
-- **Action:** Delete this file
-
-## Files to Keep (Current)
-
-### DATABASE.md ✓
-- Complete schema documentation
-- Explains clean design (no migrations)
-- Reference for developers
-
-### README.md ✓
-- Main project documentation
-- Installation and setup
-- Current features
-- Recently updated
-
-### ROADMAP.md ✓
-- Development progress tracking
-- Feature planning
-- Version history
-- Recently updated
-
-### INSTALL.md ✓
-- Detailed installation instructions
-- May need review for accuracy
-
-### QUICKSTART.md ✓
-- Quick setup guide
-- May need review for accuracy
-
-## Manual Cleanup Required
-
-Gitea API doesn't support file deletion via MCP in some cases. To clean up:
-
-```bash
-# Pull the branch
-git checkout docs/clean-schema-and-roadmap-update
-
-# Delete outdated files
-git rm DATABASE_MIGRATIONS.md
-git rm DEPLOY_NOW.md
-git rm FEATURE_IMPLEMENTATION.md
-git rm FRONTEND_FIX_REQUIRED.md
-git rm IMPLEMENTATION_PLAN.md
-git rm SPRINT1_PEDIGREE_COMPLETE.md
-git rm migrate-now.sh
-
-# Commit and push
-git commit -m "Clean: Remove outdated documentation files"
-git push origin docs/clean-schema-and-roadmap-update
-```
-
-## Post-Cleanup Review
-
-After cleanup, review these files for accuracy:
-
-1. **INSTALL.md** - Verify installation steps are current
-2. **QUICKSTART.md** - Ensure quick start is up-to-date
-3. **docs/ folder** - Review any documentation in docs/ directory
-
-## Summary
-
-**Keep:**
-- DATABASE.md (new, comprehensive)
-- README.md (updated)
-- ROADMAP.md (updated)
-- INSTALL.md (needs review)
-- QUICKSTART.md (needs review)
-
-**Delete:**
-- DATABASE_MIGRATIONS.md
-- DEPLOY_NOW.md
-- FEATURE_IMPLEMENTATION.md
-- FRONTEND_FIX_REQUIRED.md
-- IMPLEMENTATION_PLAN.md
-- SPRINT1_PEDIGREE_COMPLETE.md
-- migrate-now.sh

DATABASE.md

@@ -1,222 +0,0 @@
-# BREEDR Database Schema
-
-## Overview
-
-This document describes the clean database schema for BREEDR. **NO migrations** - fresh installs create the correct schema automatically.
-
-## Schema Design
-
-### Core Principle: Parents Table Approach
-
-The `dogs` table **does NOT have sire/dam columns**. Parent relationships are stored in the separate `parents` table. This design:
-- Keeps the schema clean and normalized
-- Allows flexible parent relationships
-- Supports future extensions (multiple sires, surrogates, etc.)
-
-## Tables
-
-### dogs
-
-Core registry for all dogs.
-
-```sql
-CREATE TABLE dogs (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  name TEXT NOT NULL,
-  registration_number TEXT UNIQUE,
-  breed TEXT NOT NULL,
-  sex TEXT NOT NULL CHECK(sex IN ('male', 'female')),
-  birth_date DATE,
-  color TEXT,
-  microchip TEXT,
-  photo_urls TEXT,  -- JSON array
-  notes TEXT,
-  litter_id INTEGER,  -- Links to litters table
-  is_active INTEGER DEFAULT 1,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (litter_id) REFERENCES litters(id) ON DELETE SET NULL
-);
-```
-
-**Important:** NO `sire_id` or `dam_id` columns!
-
-### parents
-
-Stores sire/dam relationships.
-
-```sql
-CREATE TABLE parents (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  dog_id INTEGER NOT NULL,  -- The puppy
-  parent_id INTEGER NOT NULL,  -- The parent
-  parent_type TEXT NOT NULL CHECK(parent_type IN ('sire', 'dam')),
-  FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE,
-  FOREIGN KEY (parent_id) REFERENCES dogs(id) ON DELETE CASCADE,
-  UNIQUE(dog_id, parent_type)  -- One sire, one dam per dog
-);
-```
-
-### litters
-
-Breeding records and litter tracking.
-
-```sql
-CREATE TABLE litters (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  sire_id INTEGER NOT NULL,
-  dam_id INTEGER NOT NULL,
-  breeding_date DATE NOT NULL,
-  whelping_date DATE,
-  puppy_count INTEGER DEFAULT 0,
-  notes TEXT,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (sire_id) REFERENCES dogs(id) ON DELETE CASCADE,
-  FOREIGN KEY (dam_id) REFERENCES dogs(id) ON DELETE CASCADE
-);
-```
-
-### health_records
-
-Health tests, vaccinations, exams, treatments.
-
-```sql
-CREATE TABLE health_records (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  dog_id INTEGER NOT NULL,
-  record_type TEXT NOT NULL CHECK(record_type IN ('test', 'vaccination', 'exam', 'treatment', 'certification')),
-  test_name TEXT,
-  test_date DATE NOT NULL,
-  result TEXT,
-  document_url TEXT,
-  notes TEXT,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE
-);
-```
-
-### heat_cycles
-
-Female heat cycle tracking for breeding timing.
-
-```sql
-CREATE TABLE heat_cycles (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  dog_id INTEGER NOT NULL,
-  start_date DATE NOT NULL,
-  end_date DATE,
-  progesterone_peak_date DATE,
-  breeding_date DATE,
-  breeding_successful INTEGER DEFAULT 0,
-  notes TEXT,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE
-);
-```
-
-### traits
-
-Genetic trait tracking and inheritance.
-
-```sql
-CREATE TABLE traits (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  dog_id INTEGER NOT NULL,
-  trait_category TEXT NOT NULL,
-  trait_name TEXT NOT NULL,
-  trait_value TEXT NOT NULL,
-  inherited_from INTEGER,  -- Parent dog ID
-  notes TEXT,
-  FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE,
-  FOREIGN KEY (inherited_from) REFERENCES dogs(id) ON DELETE SET NULL
-);
-```
-
-## API Usage
-
-### Creating a Dog with Parents
-
-```javascript
-POST /api/dogs
-{
-  "name": "Puppy Name",
-  "breed": "Breed Name",
-  "sex": "male",
-  "sire_id": 5,  // Parent male dog ID
-  "dam_id": 8,   // Parent female dog ID
-  "litter_id": 2  // Optional: link to litter
-}
-```
-
-The API route automatically:
-1. Inserts the dog into `dogs` table (without sire/dam columns)
-2. Creates entries in `parents` table linking to sire and dam
-
-### Querying Parents
-
-```sql
--- Get a dog's parents
-SELECT p.parent_type, d.* 
-FROM parents p 
-JOIN dogs d ON p.parent_id = d.id 
-WHERE p.dog_id = ?;
-
--- Get a dog's offspring
-SELECT d.* 
-FROM dogs d
-JOIN parents p ON d.id = p.dog_id
-WHERE p.parent_id = ?;
-```
-
-## Fresh Install
-
-For a fresh install:
-
-1. **Delete the old database** (if upgrading):
-   ```bash
-   rm data/breedr.db
-   ```
-
-2. **Start the server** - it will create the correct schema automatically:
-   ```bash
-   npm run dev
-   ```
-
-3. **Verify the schema**:
-   ```bash
-   sqlite3 data/breedr.db ".schema dogs"
-   ```
-   
-   You should see `litter_id` but **NO** `sire_id` or `dam_id` columns.
-
-## Troubleshooting
-
-### "no such column: weight" or "no such column: sire_id"
-
-**Solution:** Your database has an old schema. Delete it and let the app recreate it:
-
-```bash
-rm data/breedr.db
-npm run dev
-```
-
-### Parent relationships not saving
-
-Check server logs. You should see:
-```
-✓ Dog inserted with ID: 123
-  Adding sire relationship: dog 123 -> sire 5
-  ✓ Sire relationship added
-  Adding dam relationship: dog 123 -> dam 8
-  ✓ Dam relationship added
-```
-
-If relationships aren't being created, check that `sire_id` and `dam_id` are being sent in the API request.
-
-## Database Files
-
-- `server/db/init.js` - Creates clean schema, no migrations
-- `server/routes/dogs.js` - Handles parent relationships via `parents` table
-- `server/index.js` - Initializes database on startup
-
-**NO MIGRATIONS!** The init file is the source of truth.

DEVELOPMENT.md

@@ -0,0 +1,101 @@
+# DEVELOPMENT.md
+
+This document provides technical details and guidelines for developing and maintaining the BREEDR Genealogy Management System.
+
+## Tech Stack Overview
+
+### Backend
+- **Node.js & Express**: Core API server.
+- **better-sqlite3**: High-performance SQLite driver.
+- **Multer**: Multi-part form data handling for photo uploads.
+- **Bcrypt & JWT**: (Planned) Authentication and security.
+
+### Frontend
+- **React 18 & Vite**: Modern reactive UI with fast HMR.
+- **React Router 6**: Client-side navigation.
+- **Lucide React**: Consistent iconography.
+- **React-D3-Tree & D3.js**: Dynamic pedigree visualization.
+- **Axios**: Promised-based HTTP client for API communication.
+
+---
+
+## Database Architecture
+
+### SQLite Implementation
+The database is a single file located at `data/breedr.db`. This directory is automatically created on startup.
+
+### "Parents Table" Approach
+Parent relationships are managed in a dedicated `parents` table rather than columns in the `dogs` table.
+- ** dog_id**: The child dog.
+- ** parent_id**: The parent dog.
+- ** parent_type**: 'sire' or 'dam'.
+
+**Benefits**: Supports recursive lookups, avoids `ALTER TABLE` complexity for lineage changes, and allows historical mapping of ancestors without full profiles.
+
+### Safe Migrations
+BREEDR use a migration-free synchronization approach:
+1. `server/db/init.js` defines the latest table structures.
+2. Safe `ALTER TABLE` guards inject missing columns on startup.
+3. This ensures data persistence across updates without manual migration scripts.
+
+### Key Tables
+- `dogs`: Registry for kennel and external dogs.
+- `parents`: Ancestry relationships.
+- `litters`: Produced breeding groups.
+- `health_records`: OFA clearances and vet records.
+- `genetic_tests`: DNA panel results.
+- `settings`: Kennel-wide configuration (single row).
+
+---
+
+## Frontend Documentation
+
+### Project Structure
+```text
+client/src/
+├── components/     # Reusable UI (PedigreeTree, DogForm, Cards)
+├── hooks/          # Custom hooks (useSettings)
+├── pages/          # Route-level components
+├── App.jsx         # Routing & Layout
+└── index.css       # Global styles & Design System
+```
+
+### Design System & Styling
+The UI follows a modern dark-theme aesthetic using **CSS Variables** defined in `index.css`:
+- `--primary`: Brand color (Warm Amber/Blue).
+- `--bg-primary`: Deep Slate background.
+- Glassmorphism effects via `backdrop-filter`.
+- Responsive grid layouts (`.grid-2`, `.grid-3`).
+
+### Key Components
+- **PedigreeTree**: horizontal, D3-powered tree with zoom/pan.
+- **DogForm**: Dual-mode (Kennel/External) dog entry with parent selection.
+
+---
+
+## API & Backend Development
+
+### Route Modules (`server/routes/`)
+- `/api/dogs`: Dog registry and photo uploads.
+- `/api/litters`: Litter management and puppy linking.
+- `/api/pedigree`: Recursive ancestry/descendant tree generation.
+- `/api/breeding`: Heat cycle tracking and whelping projections.
+
+### Environment Variables
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `PORT` | Server port | `3000` |
+| `DB_PATH` | Path to .db file | `../data/breedr.db` |
+| `UPLOAD_PATH`| Path to photo storage| `../uploads` |
+
+---
+
+## Technical History & Design Logs
+
+For deeper technical dives into specific features, refer to the `docs/` directory:
+- [UI Redesign & Color System](docs/UI_REDESIGN.md)
+- [Compact Card Layout Design](docs/COMPACT_CARDS.md)
+- [Microchip Field Unique Constraint Fix](docs/MICROCHIP_FIX.md)
+
+---
+*Last Updated: March 12, 2026*

Dockerfile

@@ -37,14 +37,14 @@ RUN npm install --omit=dev
 # Copy server code
 COPY server/ ./server/
 
+# Copy static assets (branding, etc.) to ensure default logo is present
+COPY static/ ./static/
+
 # Copy built frontend from previous stage
 COPY --from=frontend-builder /app/client/dist ./client/dist
 
-# Create necessary directories (including static for branding assets)
+# Create data and uploads directories
-RUN mkdir -p /app/data /app/uploads /app/static
+RUN mkdir -p /app/data /app/uploads
-
-# Initialize database schema on build
-RUN node server/db/init.js || true
 
 # Set environment variables
 ENV NODE_ENV=production

QUICKSTART.md

@@ -1,340 +0,0 @@
-# BREEDR Quick Start Guide
-## Litter Management & Pedigree Visualization
-
-## Installation
-
-### 1. Pull the Feature Branch
-```bash
-git checkout feature/litter-management-and-pedigree
-```
-
-### 2. Run Database Migration
-```bash
-node server/db/migrate_litter_id.js
-```
-
-You should see:
-```
-Running litter_id migration...
-✓ Added litter_id column to dogs table
-✓ Created index on litter_id
-Migration completed successfully!
-```
-
-### 3. Install Dependencies
-```bash
-cd client
-npm install
-cd ..
-```
-
-### 4. Start the Application
-```bash
-npm run dev
-```
-
-The server will start on `http://localhost:3000` and the client on `http://localhost:5173`
-
----
-
-## Feature 1: Litter Management
-
-### Creating Your First Litter
-
-1. **Navigate to Litters**
-   - Click "Litters" in the navigation menu
-   - Click "Add New Litter" button
-
-2. **Fill in Litter Details**
-   - **Sire (Father)**: Select from dropdown of male dogs
-   - **Dam (Mother)**: Select from dropdown of female dogs
-   - **Breeding Date**: Date of breeding (required)
-   - **Whelping Date**: Expected/actual birth date (optional)
-   - **Expected Puppy Count**: Estimated number of puppies
-   - **Notes**: Any additional breeding information
-
-3. **Save the Litter**
-   - Click "Create Litter"
-   - Litter appears in the list with format: "Sire x Dam - Date"
-
-### Adding Puppies to a Litter
-
-#### Method 1: Link to Existing Litter (Recommended)
-
-1. **Click "Add New Dog"**
-2. **Enter Puppy Details**
-   - Name (required)
-   - Breed (required)
-   - Sex (required)
-   - Birth Date
-   - Color
-   - Microchip
-
-3. **Select Parent Method**
-   - Choose "Link to Litter" radio button
-   - Select the litter from dropdown
-   - Parents are automatically filled!
-
-4. **Save**
-   - Click "Add Dog"
-   - Puppy is now linked to the litter
-   - Parent relationships are automatically created
-
-#### Method 2: Manual Parent Selection
-
-1. **Click "Add New Dog"**
-2. **Enter Puppy Details**
-3. **Select Parent Method**
-   - Choose "Manual Parent Selection" radio button
-   - Select Sire from male dogs dropdown
-   - Select Dam from female dogs dropdown
-
-4. **Save**
-   - Puppy is created with selected parents
-   - No litter association
-
-### Viewing Litter Details
-
-1. **Click on a Litter** in the list
-2. **See Litter Information:**
-   - Sire and Dam details
-   - Breeding and whelping dates
-   - List of all puppies in the litter
-   - Actual puppy count vs expected
-
-### Editing a Litter
-
-1. Click "Edit" on the litter
-2. Update breeding/whelping dates
-3. Modify notes
-4. **Note:** Cannot change sire/dam after creation
-
----
-
-## Feature 2: Interactive Pedigree Tree
-
-### Viewing a Pedigree
-
-1. **From Dog List:**
-   - Click on any dog
-   - Click "View Pedigree" button
-
-2. **Pedigree Opens in Modal**
-   - Shows dog's ancestry tree
-   - 5 generations displayed
-   - Color-coded by sex:
-     - Blue nodes = Males ♂
-     - Pink nodes = Females ♀
-
-### Navigating the Tree
-
-#### Zoom Controls
-- **Zoom In**: Click "+" button or mouse wheel up
-- **Zoom Out**: Click "-" button or mouse wheel down
-- **Reset View**: Click reset button to center tree
-
-#### Panning
-- **Click and Drag**: Move the tree around
-- **Mouse Wheel**: Zoom in/out
-
-#### Node Information
-Each node displays:
-- Dog name (large text)
-- Registration number
-- Birth year
-- Sex symbol (♂ or ♀)
-
-### Reading the Tree
-
-```
-                        Great-Great-Grandpa ♂
-                   Great-Grandpa ♂
-                        Great-Great-Grandma ♀
-              Grandpa ♂
-                        Great-Great-Grandpa ♂
-                   Great-Grandma ♀
-                        Great-Great-Grandma ♀
-         Sire ♂
-                        Great-Great-Grandpa ♂
-                   Great-Grandpa ♂
-                        Great-Great-Grandma ♀
-              Grandma ♀
-                        Great-Great-Grandpa ♂
-                   Great-Grandma ♀
-                        Great-Great-Grandma ♀
-Dog Name
-         Dam ♀
-              [... similar structure for dam's side]
-```
-
----
-
-## Common Workflows
-
-### Workflow 1: Breeding a Litter
-
-1. ✓ Select breeding pair (sire and dam)
-2. ✓ Create litter record with breeding date
-3. ✓ Track whelping date when puppies are born
-4. ✓ Add each puppy:
-   - Link to the litter
-   - Enter individual details
-   - Assign registration numbers
-5. ✓ View pedigree of any puppy to see full ancestry
-
-### Workflow 2: Recording Historical Dogs
-
-1. ✓ Add foundation dogs (no parents)
-2. ✓ Add their offspring using manual parent selection
-3. ✓ Continue building the family tree
-4. ✓ View pedigrees to verify relationships
-
-### Workflow 3: Planning a Breeding
-
-1. ✓ View pedigrees of potential sire and dam
-2. ✓ Check for common ancestors
-3. ✓ Use trial pairing tool (coming soon)
-4. ✓ Create litter when breeding occurs
-
----
-
-## Tips & Best Practices
-
-### For Litter Management
-
-✅ **Do:**
-- Create the litter record BEFORE adding puppies
-- Enter accurate breeding dates for record keeping
-- Use meaningful notes (progesterone timing, heat cycle info)
-- Link puppies to litters for automatic parent relationships
-
-❌ **Don't:**
-- Don't change sire/dam after litter creation (create new litter instead)
-- Don't forget to update whelping date when puppies arrive
-- Avoid mixing litter-linked and manually-parented puppies
-
-### For Pedigree Viewing
-
-✅ **Do:**
-- Zoom out to see the full tree at once
-- Use drag to focus on specific branches
-- Click nodes to see additional details
-- Reset view if you get lost
-
-❌ **Don't:**
-- Don't try to edit from pedigree view (use dog edit form)
-- Avoid excessive zooming (can make nodes too small)
-
-### Data Entry Tips
-
-1. **Registration Numbers**: Enter consistently (e.g., "AKC-12345")
-2. **Microchips**: Use full 15-digit number
-3. **Birth Dates**: Critical for age calculations and sorting
-4. **Breed Names**: Keep consistent spelling and capitalization
-5. **Colors**: Use standard color terminology for your breed
-
----
-
-## Troubleshooting
-
-### "No such column: sire" Error
-
-**Problem:** Getting this error when adding a dog
-
-**Solution:** 
-1. Make sure you ran the migration:
-   ```bash
-   node server/db/migrate_litter_id.js
-   ```
-2. Restart the server
-3. Try again
-
-### Pedigree Tree Not Loading
-
-**Problem:** Pedigree modal shows "Loading..." forever
-
-**Possible Causes:**
-- Dog has no parents recorded
-- Network issue
-- Server not running
-
-**Solution:**
-1. Check browser console for errors
-2. Verify server is running
-3. Ensure dog has at least one parent recorded
-
-### Parents Not Auto-Populating
-
-**Problem:** Selected a litter but parents didn't fill in
-
-**Solution:**
-1. Refresh the page
-2. Make sure litter has valid sire and dam
-3. Try selecting the litter again
-
-### Can't See All Generations
-
-**Problem:** Pedigree tree only shows 2-3 generations
-
-**This is normal if:**
-- Older generations don't have parents recorded
-- Foundation dogs have no ancestry
-- You need to add more historical data
-
----
-
-## Keyboard Shortcuts
-
-*Coming in future release*
-
-- `Ctrl/Cmd + N` - New Dog
-- `Ctrl/Cmd + L` - New Litter  
-- `Ctrl/Cmd + P` - View Pedigree
-- `Esc` - Close Modal
-
----
-
-## Next Features Coming Soon
-
-🔜 **Trial Pairing Simulator**
-- Calculate COI before breeding
-- See common ancestors
-- Risk assessment
-
-🔜 **Heat Cycle Tracking**
-- Track progesterone levels
-- Breeding date recommendations
-- Calendar view
-
-🔜 **PDF Pedigree Export**
-- Print-ready pedigrees
-- Custom formatting
-- Multiple generations
-
----
-
-## Getting Help
-
-- **Documentation:** [FEATURE_IMPLEMENTATION.md](./FEATURE_IMPLEMENTATION.md)
-- **Roadmap:** [ROADMAP.md](./ROADMAP.md)
-- **Installation:** [INSTALL.md](./INSTALL.md)
-- **README:** [README.md](./README.md)
-
----
-
-## Video Tutorials
-
-*Coming soon - check back for video walkthroughs of these features!*
-
-1. Creating Your First Litter
-2. Adding Puppies to a Litter
-3. Navigating Pedigree Trees
-4. Advanced Breeding Records
-
----
-
-## Congratulations!
-
-You're now ready to use BREEDR's litter management and pedigree visualization features. Start by creating a litter or viewing a pedigree tree!
-
-**Happy Breeding! 🐶**

README.md

@@ -2,332 +2,86 @@
 
 A reactive, interactive dog breeding genealogy mapping system for professional kennel management.
 
-## ✅ Current Features
+---
 
-### Core Functionality
+## 🌟 Recent Highlights (v0.8.0)
-- **✅ Dog Registry** - Complete CRUD operations with comprehensive profiles
+- **✅ Reverse Pedigree** — Toggle between ancestors and descendants view for full lineage tracking.
-- **✅ Photo Management** - Multiple photos per dog with upload/delete capabilities
+- **✅ External Dog Mapping** — Assign parents to external dogs, allowing for full genealogy of outside lines.
-- **✅ Parent Relationships** - Clean database design using `parents` table (no sire/dam columns in dogs table)
+- **✅ Universal Parent Selection** — Select any dog (kennel or external) as a sire/dam from any profile.
-- **✅ Litter Management** - Track breeding records, link puppies to litters
-- **✅ Interactive Pedigree Visualization** - Multi-generational family trees with zoom/pan
-- **✅ Modern UI** - Sleek, dark-themed interface with compact info cards
-- **✅ Search & Filter** - Find dogs by name, breed, sex, and more
-- **✅ Branded Navigation** - Custom logo (br-logo.png) with gold-to-rusty-red gradient title
-- **✅ Trial Pairing Simulator** - COI calculator with common ancestors table and risk badge
-- **✅ Heat Cycle Calendar** - Month grid calendar with cycle windows and breeding date suggestions
 
-### Database Architecture
+---
-- **✅ Clean Schema** - No migrations, fresh installs create correct structure
-- **✅ Normalized Design** - `parents` table for relationships (sire/dam)
-- **✅ Litter Linking** - Dogs linked to litters via `litter_id`
-- **✅ Health Records** - Medical history and genetic testing
-- **✅ Heat Cycles** - Breeding cycle tracking
-- **✅ Genetic Traits** - Inherited trait mapping
 
-### Recently Added (March 9, 2026)
+## 🚀 Quick Start
-- **✅ Heat Cycle Calendar** - Full month grid with color-coded cycle windows (Proestrus / Optimal / Late Estrus / Diestrus)
-- **✅ Start Cycle Modal** - Click any day or the header button to log a new heat cycle for a female
-- **✅ Breeding Date Suggestions** - Phase windows with date ranges loaded from `GET /api/breeding/heat-cycles/:id/suggestions`
-- **✅ Whelping Estimate** - Auto-calculates earliest/expected/latest whelping once a breeding date is logged
-- **✅ Trial Pairing Simulator** - `/pairing` route with sire/dam dropdowns, COI%, risk badge, and common ancestors table
-- **✅ Pairing Nav Link** - `FlaskConical` icon added to navbar
-- **✅ New API Endpoints** - `GET /api/breeding/heat-cycles`, `GET /api/breeding/heat-cycles/:id/suggestions`
-
-### Previously Added (March 9, 2026)
-- **✅ Brand Logo** - Custom `br-logo.png` in navbar replacing generic icon
-- **✅ Gradient Title** - Gold-to-rusty-red gradient on "BREEDR" brand text
-- **✅ Static Asset Serving** - `/static` directory served by Express for branding assets
-- **✅ Dev Proxy** - Vite dev server proxies `/static` to Express backend
-- **✅ Route Fix** - `/static` and `/uploads` paths no longer fall through to React catch-all
-- **✅ Logo Sizing** - Fixed brand logo to 1:1 aspect ratio square
-
-## Technology Stack
-
-- **Frontend**: React 18 with modern component design
-- **Visualization**: React-D3-Tree for pedigree charts
-- **Backend**: Node.js/Express API
-- **Database**: SQLite (embedded, zero-config) with clean normalized schema
-- **Container**: Single Docker image with multi-stage build
-- **Styling**: CSS custom properties with dark theme + gradient branding
-
-## Quick Start
-
-### Docker Deployment (Recommended)
 
+### 1. Docker Deployment (Recommended)
 ```bash
-# Clone repository
 git clone https://git.alwisp.com/jason/breedr.git
 cd breedr
-
-# Build Docker image
-docker build -t breedr:latest .
-
-# Run with docker-compose
-docker-compose up -d
-```
-
-Access at: `http://localhost:3000`
-
-### Fresh Install Database Setup
-
-For a **fresh install**, the database will automatically initialize with the correct schema.
-
-For an **existing installation upgrade**:
-
-```bash
-# Stop the application
-docker-compose down
-
-# Backup your data
-cp data/breedr.db data/breedr.db.backup
-
-# Delete old database (it will be recreated)
-rm data/breedr.db
-
-# Pull latest code
-git pull origin master
-
-# Rebuild and restart
 docker-compose up -d --build
 ```
+Access at: `http://localhost:3000`
 
-The app will create a fresh database with the clean schema automatically.
+### 2. Manual Development Setup
-
-## Database Schema
-
-### Key Design Principles
-
-1. **No sire/dam columns in `dogs` table** - Parent relationships stored in `parents` table
-2. **Normalized structure** - Reduces redundancy, improves data integrity
-3. **Litter linking** - Dogs reference litters via `litter_id` foreign key
-
-### Core Tables
-
-- **dogs** - Core dog registry (NO sire_id/dam_id columns)
-- **parents** - Sire/dam relationships (dog_id, parent_id, parent_type)
-- **litters** - Breeding records with sire/dam references
-- **health_records** - Medical and genetic testing
-- **heat_cycles** - Breeding cycle tracking
-- **traits** - Genetic trait mapping
-
-**Full schema documentation:** [DATABASE.md](DATABASE.md)
-
-## Environment Variables
-
-- `NODE_ENV` - production/development (default: production)
-- `PORT` - Server port (default: 3000)
-- `DB_PATH` - SQLite database path (default: /app/data/breedr.db)
-- `UPLOAD_PATH` - Upload directory (default: /app/uploads)
-
-## Development
-
-### Local Development Setup
-
 ```bash
-# Install dependencies
 npm install
-
-# Run development server (frontend + backend)
 npm run dev
-
-# Build for production
-npm run build
 ```
+> **Note:** The database initializes automatically on first boot. No manual migrations are required.
 
-### Project Structure
+---
 
+## 🐕 Managing Your Kennel
+
+- **Adding Dogs**: Go to the **Dogs** page, click **Add New Dog**. You can mark dogs as **External** if they aren't in your kennel but are needed for pedigree mapping.
+- **Champion Tracking**: Toggle the **Champion** status to title dogs. Offspring will automatically display the "Champion Bloodline" badge.
+- **Photo Management**: Multiple high-quality photos per dog with a compact gallery view.
+- **Litter Tracking**: Link puppies to breeding records automatically to track weight and health from birth.
+
+## 🧬 Breeding & Genetics
+
+- **Interactive Pedigree**: 5-generation trees with zoom/pan. Toggle the **Reverse Pedigree** switch to see descendant lineage.
+- **Trial Pairing Simulator**: Calculate Wright's Inbreeding Coefficient (COI) instantly. Identifies common ancestors and providing risk badges (Low/Moderate/High).
+- **Heat Cycles**: Track female cycles on the calendar. Includes **projected whelping alerts** (indigo windows) and expected due dates.
+
+---
+
+## 🛠️ Technology Stack
+- **Frontend**: React 18, Vite, Lucide Icons
+- **Visualization**: React-D3-Tree, D3.js
+- **Backend**: Node.js, Express.js
+- **Database**: SQLite (Zero-config, safe `ALTER TABLE` migrations)
+- **Deployment**: Multi-stage Docker
+
+---
+
+## 📂 Project Structure
 ```
 breedr/
-├── client/             # React frontend
+├── client/                 # React frontend (Pages: Pedigree, Pairing, Calendar, Settings)
-│   ├── src/
+├── server/                 # Node.js backend (Routes: Dogs, Pedigree, Breeding, Settings)
-│   │   ├── pages/
+├── static/                 # Branded assets (logos, etc.)
-│   │   │   ├── BreedingCalendar.jsx  # Heat cycle calendar (month grid)
+├── data/                   # SQLite database storage (mapped in Docker)
-│   │   │   ├── PairingSimulator.jsx  # Trial pairing + COI
+├── uploads/                # Dog photo storage (mapped in Docker)
-│   │   │   ├── Dashboard.jsx
+└── docs/                   # Technical documentation and design history
-│   │   │   ├── DogList.jsx
-│   │   │   ├── DogDetail.jsx
-│   │   │   ├── PedigreeView.jsx
-│   │   │   └── LitterList.jsx
-│   ├── public/
-│   └── package.json
-├── server/             # Node.js backend
-│   ├── routes/
-│   │   ├── breeding.js   # Heat cycles, whelping, suggestions
-│   │   ├── pedigree.js   # COI, trial pairing
-│   │   ├── dogs.js
-│   │   └── litters.js
-│   ├── db/
-│   │   └── init.js       # Clean schema (NO migrations)
-│   └── index.js
-├── static/             # Branding assets (br-logo.png, etc.)
-├── docs/               # Documentation
-├── DATABASE.md         # Schema documentation
-├── ROADMAP.md          # Development roadmap
-├── Dockerfile          # Multi-stage Docker build
-├── docker-compose.yml
-└── README.md
 ```
 
-## API Endpoints
+---
 
-### Dogs
+## 🕒 Release Summary
-- `GET/POST /api/dogs` - Dog CRUD operations
-- `GET /api/dogs/:id` - Get dog with parents and offspring
-- `POST /api/dogs/:id/photos` - Upload photos
 
-### Pedigree & Genetics
+- **v0.8.0** (Mar 2026): Reverse Pedigree & External dog parentage.
-- `GET /api/pedigree/:id` - Generate pedigree tree
+- **v0.7.0** (In Progress): Health & Genetics (OFA clearances, DNA panels).
-- `POST /api/pedigree/trial-pairing` - COI + common ancestors + risk recommendation
+- **v0.6.1**: COI calculation fix for direct parent×offspring relations.
+- **v0.6.0**: Champion status tracking & Kennel settings API.
 
-### Breeding & Heat Cycles
+---
-- `GET /api/breeding/heat-cycles` - All heat cycles
-- `GET /api/breeding/heat-cycles/active` - Active cycles with dog info
-- `GET /api/breeding/heat-cycles/dog/:dogId` - Cycles for a specific dog
-- `GET /api/breeding/heat-cycles/:id/suggestions` - Breeding windows + whelping estimate
-- `POST /api/breeding/heat-cycles` - Create new heat cycle
-- `PUT /api/breeding/heat-cycles/:id` - Update cycle (log breeding date, etc.)
-- `DELETE /api/breeding/heat-cycles/:id` - Delete cycle
-- `GET /api/breeding/whelping-calculator` - Standalone whelping date calculator
 
-### Litters
+## ❓ Troubleshooting
-- `GET/POST /api/litters` - Litter management
+- **COI shows 0.00%?**: Ensure both parents are mapped and have shared ancestors.
+- **Missing Columns?**: Restart the server; auto-init guards add columns automatically.
+- **Logo not appearing?**: Place `br-logo.png` in the `static/` directory.
 
-### Assets
+---
-- `GET /static/*` - Branding and static assets
-- `GET /uploads/*` - Dog photos
 
-## Upgrading
+**Full Documentation**:
-
+[Installation Guide](INSTALL.md) | [Development & Architecture](DEVELOPMENT.md) | [API Reference](API.md) | [Roadmap](ROADMAP.md)
-### From Earlier Versions
-
-If you have an **old database with sire/dam columns** or missing litter_id:
-
-```bash
-# Backup your data
-cp data/breedr.db data/breedr.db.backup
-
-# Delete old database
-rm data/breedr.db
-
-# Pull latest code
-git pull
-
-# Restart (will create clean schema)
-docker-compose restart
-```
-
-**Important:** The new schema uses a `parents` table instead of sire/dam columns. Parent data cannot be automatically migrated - you'll need to re-enter parent relationships.
-
-## Troubleshooting
-
-### "no such column: weight" or "no such column: sire_id"
-
-Your database has an old schema. Delete and recreate:
-
-```bash
-rm data/breedr.db
-docker-compose restart
-```
-
-### Parent relationships not saving
-
-Check server logs for:
-```
-✔ Dog inserted with ID: 123
-  Adding sire relationship: dog 123 -> sire 5
-  ✔ Sire relationship added
-```
-
-If you don't see these logs, ensure `sire_id` and `dam_id` are being sent in the API request.
-
-### Logo not appearing in navbar
-
-Ensure `br-logo.png` is placed in the `static/` directory at the project root. The file is served at `/static/br-logo.png`.
-
-### Heat cycles not showing on calendar
-
-Ensure dogs are registered with `sex: 'female'` before creating heat cycles. The API validates this and will return a 400 error for male dogs.
-
-## Roadmap
-
-### ✅ Completed
-- [x] Docker containerization
-- [x] SQLite database with clean schema
-- [x] Dog management (CRUD)
-- [x] Photo management
-- [x] Interactive pedigree visualization
-- [x] Litter management
-- [x] Parent-child relationships via parents table
-- [x] Modern UI redesign
-- [x] Search and filtering
-- [x] Custom brand logo + gradient title
-- [x] Static asset serving
-- [x] Trial Pairing Simulator (COI + common ancestors + risk badge)
-- [x] Heat Cycle Calendar (month grid + windows + breeding suggestions + whelping estimate)
-
-### 🔧 In Progress / Up Next
-- [ ] Health Records System
-- [ ] Genetic trait tracking
-
-### 📋 Planned
-- [ ] PDF pedigree generation
-- [ ] Advanced search and filters
-- [ ] Export capabilities
-- [ ] Progesterone tracking (extended feature)
-
-**Full roadmap:** [ROADMAP.md](ROADMAP.md)
-
-## Recent Updates
-
-### March 9, 2026 - Heat Cycle Calendar & Trial Pairing Simulator (v0.5.0)
-- **Added:** Full month grid heat cycle calendar with color-coded phase windows
-- **Added:** Start Heat Cycle modal (click any day or header button)
-- **Added:** Cycle Detail modal with breeding window breakdown and inline breeding date logging
-- **Added:** Whelping estimate (earliest/expected/latest) auto-calculated from breeding date
-- **Added:** Trial Pairing Simulator at `/pairing` with COI%, risk badge, common ancestors table
-- **Added:** `GET /api/breeding/heat-cycles` and `GET /api/breeding/heat-cycles/:id/suggestions` endpoints
-- **Moved:** Progesterone tracking to extended roadmap
-
-### March 9, 2026 - Branding & Header Improvements (v0.4.1)
-- **Added:** Custom `br-logo.png` brand logo in navbar
-- **Added:** Gold-to-rusty-red gradient on "BREEDR" title text
-- **Added:** `/static` directory for branding assets served by Express
-- **Fixed:** Vite dev proxy for `/static` routes
-- **Fixed:** `/static` and `/uploads` paths no longer fall through to React router
-- **Fixed:** Brand logo sized as fixed 1:1 square for proper aspect ratio
-
-### March 9, 2026 - Clean Database Schema (v0.4.0)
-- **Fixed:** Database schema cleaned up - no migrations
-- **Fixed:** Removed weight/height columns (never implemented)
-- **Fixed:** Proper parent handling via parents table
-- **Added:** litter_id column for linking puppies to litters
-- **Added:** Comprehensive DATABASE.md documentation
-- **Improved:** Server startup with clean initialization
-
-### March 8, 2026 - UI Redesign & Bug Fixes
-- **Fixed:** Microchip field UNIQUE constraint (now properly optional)
-- **Redesigned:** Modern dark theme with sleek aesthetics
-- **Redesigned:** Compact horizontal info cards (80x80 avatars)
-- **Improved:** Dashboard with gradient stats cards
-- **Improved:** Navigation bar with glass morphism
-- **Added:** Sex-colored icons (blue ♂, pink ♀)
-- **Added:** Registration number badges
-
-## Documentation
-
-- [DATABASE.md](DATABASE.md) - Complete schema documentation
-- [ROADMAP.md](ROADMAP.md) - Development roadmap and features
-- [INSTALL.md](INSTALL.md) - Detailed installation instructions
-- [QUICKSTART.md](QUICKSTART.md) - Quick setup guide
-
-## License
-
-Private use only - All rights reserved
-
-## Support
-
-For issues or questions:
-- Check documentation in `docs/` folder
-- Review DATABASE.md for schema questions
-- Check container logs: `docker logs breedr`
-- Contact the system administrator

RELEASE_NOTES_v0.4.0.md

@@ -1,308 +0,0 @@
-# BREEDR v0.4.0 Release Notes
-
-**Release Date:** March 9, 2026  
-**Branch:** `docs/clean-schema-and-roadmap-update`  
-**Focus:** Clean Database Schema & Documentation Overhaul
-
----
-
-## 🆕 What's New
-
-### Clean Database Architecture
-
-We've completely overhauled the database design for simplicity and correctness:
-
-- **✅ NO MORE MIGRATIONS** - Fresh init creates correct schema automatically
-- **✅ Removed weight/height columns** - Never implemented, now gone
-- **✅ Added litter_id column** - Proper linking of puppies to litters
-- **✅ Parents table approach** - NO sire/dam columns in dogs table
-- **✅ Normalized relationships** - Sire/dam stored in separate parents table
-
-### Why This Matters
-
-The old schema had:
-- Migration scripts trying to fix schema issues
-- `sire_id` and `dam_id` columns causing "no such column" errors
-- Complex migration logic that could fail
-
- The new schema:
-- ✅ Clean initialization - always correct
-- ✅ Normalized design - proper relationships
-- ✅ Simple maintenance - no migration tracking
-- ✅ Better logging - see exactly what's happening
-
----
-
-## 🛠️ Technical Changes
-
-### Database
-
-**Removed:**
-- `dogs.weight` column (never implemented)
-- `dogs.height` column (never implemented) 
-- `dogs.sire_id` column (moved to parents table)
-- `dogs.dam_id` column (moved to parents table)
-- `server/db/migrations.js` (no more migrations)
-
-**Added:**
-- `dogs.litter_id` column with foreign key to litters
-- `parents` table for sire/dam relationships
-- Clean `server/db/init.js` as single source of truth
-
-### API Changes
-
-**server/routes/dogs.js:**
-- Fixed parent handling - properly uses parents table
-- Added detailed logging for relationship creation
-- Removed schema detection logic
-- Cleaner error messages
-
-**server/index.js:**
-- Removed migrations import and execution
-- Simplified startup - just calls initDatabase()
-- Better console output with status indicators
-
-### Documentation
-
-**New Files:**
-- `DATABASE.md` - Complete schema reference
-- `CLEANUP_NOTES.md` - Lists outdated files to remove
-- `RELEASE_NOTES_v0.4.0.md` - This file
-
-**Updated Files:**
-- `README.md` - Current features and setup instructions
-- `ROADMAP.md` - Accurate progress tracking and version history
-
-**Outdated Files (Manual Deletion Required):**
-- `DATABASE_MIGRATIONS.md`
-- `DEPLOY_NOW.md`
-- `FEATURE_IMPLEMENTATION.md`
-- `FRONTEND_FIX_REQUIRED.md`
-- `IMPLEMENTATION_PLAN.md`
-- `SPRINT1_PEDIGREE_COMPLETE.md`
-- `migrate-now.sh`
-
-See `CLEANUP_NOTES.md` for details.
-
----
-
-## 🚀 Upgrade Instructions
-
-### For Fresh Installs
-
-No action needed! The database will initialize correctly:
-
-```bash
-git clone https://git.alwisp.com/jason/breedr.git
-cd breedr
-git checkout docs/clean-schema-and-roadmap-update
-docker-compose up -d
-```
-
-### For Existing Installations
-
-**Important:** This update requires starting with a fresh database.
-
-1. **Backup your data:**
-   ```bash
-   cp data/breedr.db data/breedr.db.backup
-   ```
-
-2. **Stop the application:**
-   ```bash
-   docker-compose down
-   ```
-
-3. **Delete old database:**
-   ```bash
-   rm data/breedr.db
-   ```
-
-4. **Pull latest code:**
-   ```bash
-   git pull origin docs/clean-schema-and-roadmap-update
-   ```
-
-5. **Rebuild and restart:**
-   ```bash
-   docker-compose up -d --build
-   ```
-
-6. **Verify database:**
-   ```bash
-   docker exec -it breedr sqlite3 /app/data/breedr.db ".schema dogs"
-   ```
-
-   You should see `litter_id` but **NO** `sire_id`, `dam_id`, `weight`, or `height` columns.
-
-### Data Migration Notes
-
-**Parent Relationships:**
-- Cannot be automatically migrated due to schema change
-- You'll need to re-enter sire/dam relationships for existing dogs
-- Use the dog edit form or litter linking feature
-
-**All Other Data:**
-- Basic dog info (name, breed, sex, etc.) can be re-entered
-- Photos will need to be re-uploaded
-- Consider this a fresh start with a clean, correct schema
-
----
-
-## 🐛 Bug Fixes
-
-- ✅ **Fixed:** "no such column: sire" errors
-- ✅ **Fixed:** "no such column: weight" errors  
-- ✅ **Fixed:** "no such column: height" errors
-- ✅ **Fixed:** Parent relationships not saving properly
-- ✅ **Fixed:** Schema detection failures on startup
-- ✅ **Fixed:** Migration system complexity
-
----
-
-## 📚 Documentation Updates
-
-### DATABASE.md
-
-Comprehensive database documentation including:
-- Schema design principles
-- All table structures with SQL
-- API usage examples
-- Query examples for relationships
-- Fresh install instructions
-- Troubleshooting guide
-
-### README.md
-
-Updated with:
-- Current feature list
-- Clean schema explanation
-- Fresh install vs upgrade instructions
-- Troubleshooting for common errors
-- Links to documentation
-
-### ROADMAP.md
-
-Updated with:
-- Phase 1-3 marked complete
-- v0.4.0 release notes
-- Current sprint focus recommendations
-- Version history
-
----
-
-## 🧐 Developer Notes
-
-### New Development Workflow
-
-**For database changes:**
-1. Edit `server/db/init.js` only
-2. Test with fresh database: `rm data/breedr.db && npm run dev`
-3. Update `DATABASE.md` documentation
-4. No migrations needed!
-
-**For API changes involving parents:**
-- Use `parents` table for sire/dam relationships
-- Check `server/routes/dogs.js` for examples
-- Log relationship creation for debugging
-
-### Testing
-
-Test these scenarios:
-1. Fresh install - database created correctly
-2. Add dog with sire/dam - parents table populated
-3. Add dog via litter - litter_id set, parents auto-linked
-4. View dog details - parents and offspring shown correctly
-5. Pedigree view - multi-generation tree displays
-
----
-
-## 📊 What's Next
-
-### Recommended Next Features
-
-1. **Trial Pairing Simulator** (4-6 hours)
-   - Uses existing COI calculator backend
-   - High value for breeding decisions
-   - Relatively quick to implement
-
-2. **Health Records System** (6-8 hours)
-   - Important for breeding decisions  
-   - Vaccination tracking
-   - Document management
-
-3. **Heat Cycle Management** (6-8 hours)
-   - Natural extension of litter management
-   - Calendar functionality
-   - Breeding planning
-
-See `ROADMAP.md` for full details.
-
----
-
-## ℹ️ Support
-
-**Documentation:**
-- [DATABASE.md](DATABASE.md) - Schema reference
-- [README.md](README.md) - Project overview
-- [ROADMAP.md](ROADMAP.md) - Development plan
-- [CLEANUP_NOTES.md](CLEANUP_NOTES.md) - File cleanup guide
-
-**Common Issues:**
-- "no such column" errors → Delete database and restart
-- Parents not saving → Check server logs for relationship creation
-- Schema looks wrong → Verify with `.schema dogs` command
-
-**Logs:**
-```bash
-docker logs breedr
-```
-
----
-
-## 🎉 Credits
-
-Clean schema design and implementation by the BREEDR development team.
-
-Special thanks for thorough testing and validation of the new database architecture.
-
----
-
-## 📝 Changelog Summary
-
-### Added
-- Clean database initialization system
-- `dogs.litter_id` column
-- `parents` table for relationships  
-- DATABASE.md documentation
-- Detailed logging for debugging
-- CLEANUP_NOTES.md
-- RELEASE_NOTES_v0.4.0.md
-
-### Changed
-- Database init is now single source of truth
-- Parent relationships use parents table
-- README.md updated
-- ROADMAP.md updated
-- Simplified server startup
-
-### Removed
-- Migration system (`server/db/migrations.js`)
-- `dogs.weight` column
-- `dogs.height` column
-- `dogs.sire_id` column
-- `dogs.dam_id` column
-- Schema detection logic
-- Outdated documentation (marked for deletion)
-
-### Fixed
-- "no such column" errors
-- Parent relationship saving
-- Schema consistency issues
-- Migration failures
-
----
-
-**Full Diff:** [Compare branches on Gitea](https://git.alwisp.com/jason/breedr/compare/feature/enhanced-litters-and-pedigree...docs/clean-schema-and-roadmap-update)
-
-**Next Release:** v0.5.0 - Trial Pairing Simulator (planned)

ROADMAP.md

@@ -1,340 +1,138 @@
-# BREEDR Development Roadmap
+# BREEDR Development Roadmap (v0.8.0)
 
-## ✅ Phase 1: Foundation (COMPLETE)
+## 🚀 Current Status: v0.8.0 (Active Development)
 
-### Infrastructure
+### 🔜 Next Up — Phase 4b: Health & Genetics Build Order
-- [x] Docker multi-stage build configuration
+> **Context:** Golden Retriever health clearances follow GRCA Code of Ethics and OFA/CHIC standards.
-- [x] SQLite database with automatic initialization
-- [x] Express.js API server
-- [x] React 18 frontend with Vite
-- [x] Git repository structure
 
-### Database Schema
+#### Step 1: DB Schema Extensions
-- [x] Dogs table with core fields (NO sire/dam columns)
+- [ ] Extend `health_records` table with OFA-specific columns (test_type, result, ofa_number, chic_number, expires_at, document_url)
-- [x] Parents relationship table for sire/dam tracking
+- [ ] Create `genetic_tests` table (PRA, ICH, NCL, DM, MD, GR-PRA variants)
-- [x] Litters breeding records
+- [ ] Create `cancer_history` table
-- [x] Health records tracking
+- [ ] Add `chic_number`, `age_at_death`, `cause_of_death` to `dogs` table
-- [x] Heat cycles management
+- [ ] All changes via safe ALTER TABLE / CREATE TABLE IF NOT EXISTS guards
-- [x] Traits genetic mapping
-- [x] Indexes and triggers
-- [x] **litter_id column** for linking puppies to litters
-- [x] **Clean schema design** - NO migrations, fresh init only
 
-### API Endpoints
+#### Step 2: API Layer
-- [x] `/api/dogs` - Full CRUD operations
+- [ ] `GET|POST|PUT|DELETE /api/health/:dogId` (OFA records)
-- [x] `/api/pedigree` - Tree generation and COI calculator
+- [ ] `GET /api/health/:dogId/clearance-summary`
-- [x] `/api/litters` - Breeding records
+- [ ] `GET /api/health/:dogId/chic-eligible`
-- [x] `/api/health` - Health tracking
+- [ ] `GET|POST|PUT|DELETE /api/genetics/:dogId`
-- [x] `/api/breeding` - Heat cycles and whelping calculator
+- [ ] `GET /api/genetics/pairing-risk` (sire + dam carrier check)
-- [x] Photo upload with Multer
+- [ ] Cancer history endpoints
-- [x] **Parent relationship handling** via parents table
+
-- [x] `/static/*` - Branding and static asset serving
+#### Step 3: Core UI — Health Records
+- [ ] `HealthRecordForm` modal (test type, result, OFA#, expiry, doc upload)
+- [ ] `HealthTimeline` on DogDetail page
+- [ ] `ClearanceSummaryCard` 2×2 grid (Hip / Elbow / Heart / Eyes)
+- [ ] `ChicStatusBadge` on dog cards
+- [ ] Expiry alert badges (90-day warning, expired)
+
+#### Step 4: Core UI — Genetics Panel
+- [ ] `GeneticTestForm` modal
+- [ ] `GeneticPanelCard` on DogDetail (color-coded markers)
+- [ ] Pairing risk overlay on Trial Pairing Simulator
+
+#### Step 5: Eligibility Checker
+- [ ] Eligibility logic (`grca_eligible`, `chic_eligible` computed fields)
+- [ ] Eligibility badge on dog cards
+- [ ] Pre-litter eligibility warning modal
 
 ---
 
-## ✅ Phase 2: Core Functionality (COMPLETE)
+## 🕒 Version History & Recent Progress
 
-### Dog Management
+- **v0.8.0** (March 12, 2026) - Reverse Pedigree & External Parentage (LATEST)
-- [x] Add new dogs with full form
+  - [x] **Reverse Pedigree** (descendants view) toggle on Pedigree page
-- [x] Edit existing dogs
+  - [x] **External dog parentage** improvements (allowed assigning sire/dam to external dogs)
-- [x] View dog details
+  - [x] **Universal parent selection** (sire/dam dropdowns now include all dogs)
-- [x] List all dogs with search/filter
+  - [x] Updated documentation and roadmap
-- [x] Upload multiple photos per dog
-- [x] Delete photos
-- [x] Parent selection (sire/dam) via parents table
-- [x] **Proper error handling** for API failures
 
-### User Interface
+- **v0.7.0** (In Progress) - Phase 4b: Health & Genetics
-- [x] Dashboard with statistics
+  - OFA clearance tracking (Hip, Elbow, Heart, Eyes + CHIC number)
-- [x] Dog list with grid view
+  - DNA genetic panel (PRA, ICH, NCL, DM, MD variants)
-- [x] Dog detail pages
+  - Cancer lineage & longevity tracking
-- [x] Modal forms for add/edit
+  - Breeding eligibility checker (GRCA + CHIC gates)
-- [x] Photo management UI
-- [x] Search and sex filtering
-- [x] Responsive navigation
-- [x] **Compact info cards** (80x80 avatars)
-- [x] **Modern dark theme** with glass morphism
-- [x] **Custom brand logo** (br-logo.png) in navbar
-- [x] **Gold-to-rusty-red gradient** on BREEDR brand title
-- [x] **Static asset serving** via Express `/static` route
-- [x] **Vite dev proxy** for `/static` routes
-- [x] **Route fix** - static/uploads don't fall through to React router
-- [x] **Logo aspect ratio** fixed to 1:1 square
 
-### Features Implemented
+- **v0.6.1** (March 10, 2026) - COI Direct-Relation Fix
-- [x] Photo upload and storage
+  - Fixed `calculateCOI` to correctly compute coefficient for parent×offspring pairings (~25%)
-- [x] Parent-child relationships (via parents table)
+  - Removed blanket sire exclusion in ancestor mapping logic
-- [x] Basic information tracking
+
-- [x] Registration numbers
+- **v0.6.0** (March 9, 2026) - Champion Bloodline, Settings, Build Fixes
-- [x] Microchip tracking (optional)
+  - `is_champion` flag on dogs table with ALTER TABLE migration guard
-- [x] **Litter linking** with litter_id
+  - Champion toggle in DogForm; `✪` suffix in parent dropdowns; offspring badge
-- [x] **Clean database schema** with no migrations
+  - Kennel settings table + `GET/PUT /api/settings` + `SettingsProvider`
+  - `useSettings.jsx` rename (Vite build fix)
+  - `server/index.js` fix: `initDatabase()` no-arg, duplicate health route removed
+  - `server/routes/settings.js` rewrite: double-encoded base64 fixed
+
+- **v0.5.1** (March 9, 2026) - Projected Whelping Calendar
+  - Indigo whelp window cells (days 58–65) on month grid
+  - `Baby` icon + "[Name] due" label in whelp day cells
+  - Live whelp preview in Cycle Detail modal
+
+- **v0.5.0** (March 9, 2026) - Breeding Tools
+  - Trial Pairing Simulator: COI calculator, risk badge, common ancestors
+  - Heat Cycle Calendar: month grid, phase color coding, suggestions
 
 ---
 
-## ✅ Phase 3: Breeding Tools (COMPLETE)
+## 📋 Future Roadmap
 
-### Pedigree & Genetics
+### ✅ Phase 5: Advanced Features (IN PROGRESS)
-- [x] **Interactive pedigree tree visualization**
+- [x] Reverse pedigree (descendants view)
-  - [x] Integrate React-D3-Tree
-  - [x] Show 3-5 generations
-  - [x] Click to navigate
-  - [x] Zoom and pan controls
-  - [x] Beautiful color-coded nodes
-  - [x] Male/Female distinction
-
-- [x] **Litter Management** ✅
-  - [x] Create litter records
-  - [x] Link puppies to litter
-  - [x] Track whelping details
-  - [x] Auto-link parent relationships
-  - [x] Database migration for litter_id
-  - [x] Enhanced API endpoints
-  - [x] Dual parent selection mode (litter/manual)
-  - [x] UI fix for proper layout and error handling
-
-- [x] **Trial Pairing Simulator** ✅ *(March 9, 2026)*
-  - [x] Sire and dam selection dropdowns
-  - [x] COI calculation display with color coding
-  - [x] Common ancestors table (sire-gen / dam-gen columns)
-  - [x] Risk badge: Low (<5%) / Moderate (5-10%) / High (>10%)
-  - [x] `/pairing` route + navbar link
-  - [x] `POST /api/pedigree/trial-pairing` backend
-
-- [x] **Heat Cycle Calendar** ✅ *(March 9, 2026)*
-  - [x] Full month grid calendar (Sun–Sat) with prev/next navigation
-  - [x] Color-coded day cells by cycle phase
-  - [x] Start Heat Cycle modal (female dropdown + date picker)
-  - [x] Cycle Detail modal with phase breakdown
-  - [x] Breeding date logging inline
-  - [x] Whelping estimate (earliest/expected/latest)
-  - [x] Active cycles list with phase badge + day counter
-  - [x] `GET /api/breeding/heat-cycles` endpoint
-  - [x] `GET /api/breeding/heat-cycles/:id/suggestions` endpoint
-
----
-
-## 📋 Phase 4: Health & Genetics (NEXT UP)
-
-### Health Records *(Priority 1)*
-- [ ] Health records list view per dog
-- [ ] Add/edit health test results
-- [ ] Vaccination tracking with expiry alerts
-- [ ] Medical history timeline view
-- [ ] Document uploads (PDFs, images)
-- [ ] Health clearance status badges on dog cards
-
-### Genetic Tracking *(Priority 2)*
-- [ ] Track inherited traits
-- [ ] Color genetics calculator
-- [ ] Health clearance status
-- [ ] Link traits to ancestors
-
----
-
-## 📋 Phase 5: Advanced Features (PLANNED)
-
-### Pedigree Tools
-- [ ] Reverse pedigree (descendants view)
 - [ ] PDF pedigree generation
-- [ ] Export to standard formats
+- [ ] Export to standard formats (CSV, JSON)
 - [ ] Print-friendly layouts
 - [ ] Multi-generation COI analysis
 
-### Breeding Planning
+### 📅 Phase 6: Polish & Optimization
-- [ ] Heat cycle predictions (based on cycle history)
+- [ ] **User Experience**: Loading states, better error messages, undo functionality
-- [ ] Expected whelping alerts / push notifications
+- [ ] **Performance**: Image optimization, lazy loading, API caching
-- [ ] Breeding history reports
+- [ ] **Mobile**: Touch-friendly interface, mobile photo capture
-- [ ] iCal export for cycle events
+- [ ] **Documentation**: API technical docs, video tutorials
-
-### Search & Analytics
-- [ ] Advanced search filters
-  - [ ] By breed, color, age
-  - [ ] By health clearances
-  - [ ] By registration status
-- [ ] Statistics dashboard
-  - [ ] Breeding success rates
-  - [ ] Average litter sizes
-  - [ ] Popular pairings
 
 ---
 
-## 📋 Phase 6: Polish & Optimization (PLANNED)
+## ✅ Completed Milestones
 
-### User Experience
+### Phase 1: Foundation
-- [ ] Loading states for all operations
+- [x] Docker multi-stage build & SQLite database
-- [ ] Better error messages
+- [x] Express.js API server & React 18 frontend
-- [ ] Confirmation dialogs
+- [x] Parents relationship table for sire/dam tracking
-- [ ] Undo functionality
-- [ ] Keyboard shortcuts
 
-### Performance
+### Phase 2: Core Functionality
-- [ ] Image optimization
+- [x] Dog Management (Full CRUD, photo uploads)
-- [ ] Lazy loading
+- [x] Modern dark theme with glass morphism
-- [ ] API caching
+- [x] Branded navigation with custom logo
-- [ ] Database query optimization
 
-### Mobile
+### Phase 3: Breeding Tools
-- [ ] Touch-friendly interface
+- [x] Interactive pedigree tree visualization (React-D3-Tree)
-- [ ] Mobile photo capture
+- [x] Litter Management & linking puppies
-- [ ] Responsive tables
+- [x] Trial Pairing Simulator & Heat Cycle Calendar
-- [ ] Offline mode
+- [x] Projected Whelping identifiers
 
-### Documentation
+### Phase 4a: Champion & Settings
-- [x] DATABASE.md - Complete schema documentation
+- [x] Champion bloodline tracking and badges
-- [x] User-facing documentation
+- [x] Universal Kennel Settings system
-- [ ] API documentation
-- [ ] Video tutorials
-- [ ] FAQ section
 
 ---
 
-## Future / Extended Features (BACKLOG)
+## 🏃 Testing & Quality Assurance
-
+- [x] Database schema initialization guards
-### Progesterone Tracking *(Moved from Phase 3)*
+- [x] Pedigree tree rendering & zoom/pan
-- [ ] Log progesterone level readings per heat cycle
+- [x] Parent relationship creation logic
-- [ ] Chart progesterone curve over cycle days
+- [x] Static asset serving (prod/dev)
-- [ ] LH surge detection
+- [ ] Champion toggle load/save trip
-- [ ] Optimal breeding day prediction from levels
+- [ ] Heat cycle calendar whelping logic
-
+- [ ] Health records OFA clearance CRUD (Upcoming)
-### Multi-User Support
-- [ ] User authentication
-- [ ] Role-based permissions
-- [ ] Activity logs
-- [ ] Shared access
-
-### Integration
-- [ ] Import from other systems
-- [ ] Export to Excel/CSV
-- [ ] Integration with kennel clubs
-- [ ] Backup to cloud storage
-
-### Advanced Genetics
-- [ ] DNA test result tracking
-- [ ] Genetic diversity analysis
-- [ ] Breed-specific calculators
-- [ ] Health risk predictions
-
-### Kennel Management
-- [ ] Breeding contracts
-- [ ] Buyer tracking
-- [ ] Financial records
-- [ ] Stud service management
-
----
-
-## 🌕 Current Sprint: v0.6.0
-
-### ✅ Completed This Sprint (v0.5.0)
-- [x] Trial Pairing Simulator — `/pairing` route, COI%, risk badge, common ancestors
-- [x] Heat Cycle Calendar — month grid, phase color coding, start-cycle modal
-- [x] Cycle Detail modal — breeding windows, inline breeding date, whelping estimate
-- [x] New backend endpoints: `GET /heat-cycles`, `GET /heat-cycles/:id/suggestions`
-- [x] Removed `progesterone_peak_date` from POST/PUT (moved to extended backlog)
-
-### 🔧 Next Up (Priority Order)
-
-#### Option 1: Health Records System (Recommended) 👆
-**Complexity:** Medium | **Impact:** High | **User Value:** Excellent
-
-**Why this is recommended:**
-- Natural complement to existing dog profiles
-- Vaccination expiry alerts are high day-to-day utility
-- Clearance badges on dog cards improve trust at a glance
-- Builds toward breeding decision support
-
-**Tasks:**
-- Create `HealthRecordForm` component
-- Health records list/timeline per dog on DogDetail page
-- Vaccination tracking with expiry date + alert badge
-- Health clearance status badges (OFA, CERF, etc.)
-- Optional document/PDF upload
-
-**Estimated Time:** 6-8 hours
-
----
-
-#### Option 2: Genetic Trait Tracking
-**Complexity:** Medium | **Impact:** Medium | **User Value:** Good
-
-**Why consider this:**
-- Visual color/coat genetics are important for breeders
-- Links naturally to pedigree view
-- Useful for marketing/listing dogs
-
-**Tasks:**
-- Trait entry form (coat color, pattern, carried traits)
-- Display traits on dog detail page
-- Predicted trait calculator for trial pairings
-
-**Estimated Time:** 5-7 hours
-
----
-
-### Testing Needed
-- [x] Add/edit dog forms with litter selection
-- [x] Database schema initialization
-- [x] Pedigree tree rendering
-- [x] Zoom/pan controls
-- [x] UI layout fixes
-- [x] Error handling for API failures
-- [x] Parent relationship creation via parents table
-- [x] Brand logo display and sizing
-- [x] Gradient title rendering
-- [x] Static asset serving in prod and dev
-- [ ] Trial pairing simulator (end-to-end)
-- [ ] Heat cycle calendar (start cycle, detail modal, whelping)
-- [ ] Health records
-
-### Known Issues
-- None currently
 
 ---
 
 ## How to Contribute
-
 1. Pick a feature from "Next Up" above
-2. Create a feature branch: `feat/feature-name`
+2. Create a feature branch off `master`: `feat/feature-name`
-3. Implement with tests
+3. Implement with tests and update this roadmap
-4. Update this roadmap and README.md
+4. Submit PR for review
-5. Submit PR for review
 
-## Version History
+---
-
+*Last Updated: March 12, 2026*
-- **v0.5.0** (March 9, 2026) - Breeding Tools Complete
-  - Trial Pairing Simulator: COI calculator, risk badge, common ancestors
-  - Heat Cycle Calendar: month grid, phase windows, start-cycle modal
-  - Cycle Detail: breeding windows, inline breeding date, whelping estimate
-  - New API: `GET /heat-cycles`, `GET /heat-cycles/:id/suggestions`
-  - Progesterone tracking moved to extended backlog
-
-- **v0.4.1** (March 9, 2026) - Branding & Header Improvements
-  - Custom br-logo.png in navbar
-  - Gold-to-rusty-red gradient title
-  - Static asset serving via Express
-  - Vite dev proxy for /static
-  - Route fix for static/uploads paths
-  - Logo 1:1 aspect ratio fix
-
-- **v0.4.0** (March 9, 2026) - Clean Database Schema
-  - Complete database overhaul with clean normalized design
-  - Removed migrations, fresh init only
-  - Parents table for relationships
-  - Comprehensive documentation
-  
-- **v0.3.1** - UI Fixes & Error Handling
-  - Fixed blank screen issue on Add Dog modal
-  - Improved parent selection layout
-  - Added comprehensive error handling
-  - Enhanced visual design with proper spacing
-  
-- **v0.3.0** - Litter Management & Interactive Pedigree
-  - Added litter_id to dogs table
-  - Implemented LitterForm component
-  - Created PedigreeView with React-D3-Tree
-  - Enhanced DogForm with dual parent selection
-  - Fixed "no such column: sire" error
-  - Added comprehensive documentation
-  
-- **v0.2.0** - Dog CRUD operations complete
-- **v0.1.0** - Initial foundation with API and database

client/src/App.css

@@ -27,16 +27,16 @@
   gap: 0.75rem;
   color: var(--text-primary);
   font-weight: 700;
-  font-size: 2.25rem; /* +30% from 1.5rem */
+  font-size: 2.25rem;
   text-decoration: none;
   transition: var(--transition);
 }
 
 .nav-brand:hover {
-  color: var(--primary-light);
+  opacity: 0.9;
 }
 
-/* Square logo: doubled from 2.5rem to 5rem */
+/* Square logo */
 .brand-logo {
   width: 5rem;
   height: 5rem;
@@ -45,7 +45,6 @@
   display: block;
   border-radius: 4px;
   flex-shrink: 0;
-  /* Subtle diffuse black drop shadow for depth */
   filter: drop-shadow(0 2px 6px rgba(0, 0, 0, 0.45))
           drop-shadow(0 1px 2px rgba(0, 0, 0, 0.30));
 }
@@ -58,7 +57,7 @@
   height: 5rem;
   background: linear-gradient(135deg, var(--primary) 0%, var(--accent) 100%);
   border-radius: var(--radius);
-  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3);
+  box-shadow: 0 4px 12px rgba(194, 134, 42, 0.3);
 }
 
 /* Title gradient: medium-dark gold → rusty dark red-gold */
@@ -68,7 +67,6 @@
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
   background-clip: text;
-  /* text-shadow doesn't work with background-clip:text — use filter instead */
   filter: drop-shadow(0 2px 4px rgba(0, 0, 0, 0.50))
           drop-shadow(0 1px 2px rgba(0, 0, 0, 0.30));
 }
@@ -76,6 +74,7 @@
 .nav-links {
   display: flex;
   gap: 0.5rem;
+  align-items: center;
 }
 
 .nav-link {
@@ -99,9 +98,22 @@
 }
 
 .nav-link.active {
-  background: var(--primary);
+  background: linear-gradient(135deg, rgba(201,148,10,0.2) 0%, rgba(139,37,0,0.2) 100%);
-  color: white;
+  color: var(--primary-light);
-  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3);
+  border-color: rgba(194, 134, 42, 0.4);
+  box-shadow: 0 2px 8px rgba(194, 134, 42, 0.15);
+}
+
+/* Settings link — slightly different treatment, sits at end */
+.nav-link-settings {
+  margin-left: 0.5rem;
+  padding: 0.5rem;
+  border-radius: var(--radius-sm);
+  color: var(--text-muted);
+}
+
+.nav-link-settings:hover {
+  color: var(--primary-light);
 }
 
 .main-content {
@@ -114,10 +126,9 @@
   }
   
   .nav-brand {
-    font-size: 1.625rem; /* +30% from 1.25rem */
+    font-size: 1.625rem;
   }
   
-  /* Scale square logo down on mobile (doubled from 2rem) */
   .brand-logo {
     width: 4rem;
     height: 4rem;

client/src/App.jsx

@@ -1,17 +1,34 @@
-import { BrowserRouter as Router, Routes, Route, Link} from 'react-router-dom'
+import { BrowserRouter as Router, Routes, Route, Link, useLocation } from 'react-router-dom'
-import { Home, Users, Activity, Heart, FlaskConical } from 'lucide-react'
+import { Home, PawPrint, Activity, Heart, FlaskConical, Settings, ExternalLink } from 'lucide-react'
 import Dashboard from './pages/Dashboard'
 import DogList from './pages/DogList'
 import DogDetail from './pages/DogDetail'
 import PedigreeView from './pages/PedigreeView'
 import LitterList from './pages/LitterList'
+import LitterDetail from './pages/LitterDetail'
 import BreedingCalendar from './pages/BreedingCalendar'
 import PairingSimulator from './pages/PairingSimulator'
+import SettingsPage from './pages/SettingsPage'
+import ExternalDogs from './pages/ExternalDogs'
+import { useSettings } from './hooks/useSettings'
 import './App.css'
 
-function App() {
+function NavLink({ to, icon: Icon, label }) {
+  const location = useLocation()
+  const isActive = location.pathname === to
+  return (
+    <Link to={to} className={`nav-link${isActive ? ' active' : ''}`}>
+      <Icon size={20} />
+      <span>{label}</span>
+    </Link>
+  )
+}
+
+function AppInner() {
+  const { settings } = useSettings()
+  const kennelName = settings?.kennel_name || 'BREEDR'
+
   return (
-    <Router>
     <div className="app">
       <nav className="navbar">
         <div className="container">
@@ -21,29 +38,16 @@ function App() {
               alt="BREEDR Logo"
               className="brand-logo"
             />
-              <span className="brand-text">BREEDR</span>
+            <span className="brand-text">{kennelName}</span>
           </div>
           <div className="nav-links">
-              <Link to="/" className="nav-link">
+            <NavLink to="/" icon={Home} label="Dashboard" />
-                <Home size={20} />
+            <NavLink to="/dogs" icon={PawPrint} label="Dogs" />
-                <span>Dashboard</span>
+            <NavLink to="/external" icon={ExternalLink} label="External" />
-              </Link>
+            <NavLink to="/litters" icon={Activity} label="Litters" />
-              <Link to="/dogs" className="nav-link">
+            <NavLink to="/breeding" icon={Heart} label="Breeding" />
-                <Users size={20} />
+            <NavLink to="/pairing" icon={FlaskConical} label="Pairing" />
-                <span>Dogs</span>
+            <NavLink to="/settings" icon={Settings} label="Settings" />
-              </Link>
-              <Link to="/litters" className="nav-link">
-                <Activity size={20} />
-                <span>Litters</span>
-              </Link>
-              <Link to="/breeding" className="nav-link">
-                <Heart size={20} />
-                <span>Breeding</span>
-              </Link>
-              <Link to="/pairing" className="nav-link">
-                <FlaskConical size={20} />
-                <span>Pairing</span>
-              </Link>
           </div>
         </div>
       </nav>
@@ -53,13 +57,23 @@ function App() {
           <Route path="/" element={<Dashboard />} />
           <Route path="/dogs" element={<DogList />} />
           <Route path="/dogs/:id" element={<DogDetail />} />
+          <Route path="/external" element={<ExternalDogs />} />
           <Route path="/pedigree/:id" element={<PedigreeView />} />
           <Route path="/litters" element={<LitterList />} />
+          <Route path="/litters/:id" element={<LitterDetail />} />
           <Route path="/breeding" element={<BreedingCalendar />} />
           <Route path="/pairing" element={<PairingSimulator />} />
+          <Route path="/settings" element={<SettingsPage />} />
         </Routes>
       </main>
     </div>
+  )
+}
+
+function App() {
+  return (
+    <Router>
+      <AppInner />
     </Router>
   )
 }

client/src/components/ChampionBadge.jsx

@@ -0,0 +1,52 @@
+/**
+ * ChampionBadge — shown on dogs with is_champion = 1
+ * ChampionBloodlineBadge — shown on dogs whose sire OR dam is a champion
+ *
+ * Usage:
+ *   <ChampionBadge />
+ *   <ChampionBloodlineBadge />
+ */
+
+export function ChampionBadge({ size = 'sm' }) {
+  return (
+    <span
+      className="badge-champion"
+      title="AKC / Registry Champion"
+      style={size === 'lg' ? { fontSize: '0.8rem', padding: '0.3rem 0.7rem' } : {}}
+    >
+      {/* Crown SVG inline — no extra dep */}
+      <svg
+        width={size === 'lg' ? 14 : 11}
+        height={size === 'lg' ? 14 : 11}
+        viewBox="0 0 20 20"
+        fill="currentColor"
+        aria-hidden="true"
+      >
+        <path d="M2 15h16v2H2v-2zm0-2 3-7 5 4 5-4 3 7H2z" />
+      </svg>
+      CH
+    </span>
+  )
+}
+
+export function ChampionBloodlineBadge({ size = 'sm' }) {
+  return (
+    <span
+      className="badge-bloodline"
+      title="Direct descendant of a champion"
+      style={size === 'lg' ? { fontSize: '0.8rem', padding: '0.3rem 0.7rem' } : {}}
+    >
+      {/* Droplet / bloodline SVG */}
+      <svg
+        width={size === 'lg' ? 13 : 10}
+        height={size === 'lg' ? 13 : 10}
+        viewBox="0 0 24 24"
+        fill="currentColor"
+        aria-hidden="true"
+      >
+        <path d="M12 2C8 8 5 12 5 15.5a7 7 0 0 0 14 0C19 12 16 8 12 2z" />
+      </svg>
+      BL
+    </span>
+  )
+}

client/src/components/ClearanceSummaryCard.jsx

@@ -0,0 +1,126 @@
+import { useEffect, useState } from 'react'
+import { ShieldCheck, ShieldAlert, ShieldX, Clock, AlertTriangle, Plus } from 'lucide-react'
+import axios from 'axios'
+
+const STATUS_CONFIG = {
+  pass:          { icon: ShieldCheck, color: 'var(--success)',    label: 'Clear',         bg: 'rgba(52,199,89,0.1)'  },
+  expiring_soon: { icon: Clock,       color: 'var(--warning)',    label: 'Expiring Soon', bg: 'rgba(255,159,10,0.1)' },
+  expired:       { icon: ShieldX,     color: 'var(--danger)',     label: 'Expired',       bg: 'rgba(255,59,48,0.1)'  },
+  missing:       { icon: ShieldAlert, color: 'var(--text-muted)', label: 'Missing',       bg: 'var(--bg-primary)'    },
+}
+
+const GROUP_LABELS = { hip: 'Hips', elbow: 'Elbows', heart: 'Heart', eye: 'Eyes' }
+
+function ClearanceChip({ group, status, record }) {
+  const cfg  = STATUS_CONFIG[status] || STATUS_CONFIG.missing
+  const Icon = cfg.icon
+  const tip  = record
+    ? `OFA #${record.ofa_number || '-'} - ${record.ofa_result || record.result || ''}`
+    : 'No record on file'
+  return (
+    <div
+      title={tip}
+      style={{
+        display: 'flex', alignItems: 'center', gap: '0.4rem',
+        padding: '0.45rem 0.75rem',
+        background: cfg.bg,
+        border: `1px solid ${cfg.color}44`,
+        borderRadius: 'var(--radius-sm)',
+        flex: '1 1 calc(50% - 0.5rem)',
+        minWidth: '140px',
+      }}
+    >
+      <Icon size={15} color={cfg.color} />
+      <div style={{ flex: 1 }}>
+        <div style={{ fontSize: '0.7rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+          {GROUP_LABELS[group]}
+        </div>
+        <div style={{ fontSize: '0.82rem', fontWeight: 500, color: cfg.color }}>
+          {cfg.label}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default function ClearanceSummaryCard({ dogId, onAddRecord }) {
+  const [data, setData]   = useState(null)
+  const [error, setError] = useState(null)
+
+  useEffect(() => {
+    axios.get(`/api/health/dog/${dogId}/clearance-summary`)
+      .then(r => setData(r.data))
+      .catch(() => setError(true))
+  }, [dogId])
+
+  if (error || !data) return null
+
+  const { summary, grca_eligible, age_eligible, chic_number } = data
+  const hasMissing  = Object.values(summary).some(s => s.status === 'missing')
+  const hasExpiring = Object.values(summary).some(s => s.status === 'expiring_soon')
+
+  return (
+    <div className="card" style={{ marginBottom: '1.5rem' }}>
+      {/* Header row */}
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+        <h2 style={{ fontSize: '1rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em', margin: 0 }}>
+          OFA Clearances
+        </h2>
+        <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', flexWrap: 'wrap' }}>
+          {grca_eligible && (
+            <span style={{
+              fontSize: '0.7rem', fontWeight: 600, padding: '0.2rem 0.6rem',
+              background: 'rgba(52,199,89,0.15)', color: 'var(--success)',
+              borderRadius: '999px', border: '1px solid rgba(52,199,89,0.3)'
+            }}>GRCA Eligible</span>
+          )}
+          {!age_eligible && (
+            <span style={{
+              fontSize: '0.7rem', fontWeight: 600, padding: '0.2rem 0.6rem',
+              background: 'rgba(255,159,10,0.15)', color: 'var(--warning)',
+              borderRadius: '999px', border: '1px solid rgba(255,159,10,0.3)'
+            }}>Under 24mo</span>
+          )}
+          {chic_number && (
+            <span style={{
+              fontSize: '0.7rem', fontWeight: 600, padding: '0.2rem 0.6rem',
+              background: 'rgba(99,102,241,0.15)', color: '#818cf8',
+              borderRadius: '999px', border: '1px solid rgba(99,102,241,0.3)'
+            }}>CHIC #{chic_number}</span>
+          )}
+        </div>
+      </div>
+
+      {/* Clearance chips */}
+      <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.5rem', marginBottom: '0.75rem' }}>
+        {Object.entries(summary).map(([group, { status, record }]) => (
+          <ClearanceChip key={group} group={group} status={status} record={record} />
+        ))}
+      </div>
+
+      {/* Expiry warning */}
+      {hasExpiring && (
+        <div style={{
+          display: 'flex', alignItems: 'center', gap: '0.5rem',
+          padding: '0.5rem 0.75rem', borderRadius: 'var(--radius-sm)',
+          background: 'rgba(255,159,10,0.08)', border: '1px solid rgba(255,159,10,0.25)',
+          fontSize: '0.8rem', color: 'var(--warning)', marginBottom: '0.5rem'
+        }}>
+          <AlertTriangle size={14} />
+          One or more clearances expire within 90 days. Schedule re-testing.
+        </div>
+      )}
+
+      {/* CTA */}
+      {(hasMissing || onAddRecord) && (
+        <button
+          className="btn btn-ghost"
+          onClick={onAddRecord}
+          style={{ fontSize: '0.8rem', padding: '0.35rem 0.75rem', marginTop: '0.25rem', display: 'flex', alignItems: 'center', gap: '0.3rem' }}
+        >
+          <Plus size={14} /> Add Health Record
+        </button>
+      )}
+    </div>
+  )
+}

client/src/components/DogForm.jsx

@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react'
-import { X } from 'lucide-react'
+import { X, Award, ExternalLink } from 'lucide-react'
 import axios from 'axios'
 
-function DogForm({ dog, onClose, onSave }) {
+function DogForm({ dog, onClose, onSave, isExternal = false }) {
   const [formData, setFormData] = useState({
     name: '',
     registration_number: '',
@@ -12,9 +12,11 @@ function DogForm({ dog, onClose, onSave }) {
     color: '',
     microchip: '',
     notes: '',
-    sire_id: null,  // Changed from '' to null
+    sire_id: null,
-    dam_id: null,   // Changed from '' to null
+    dam_id: null,
-    litter_id: null  // Changed from '' to null
+    litter_id: null,
+    is_champion: false,
+    is_external: isExternal ? 1 : 0,
   })
   const [dogs, setDogs] = useState([])
   const [litters, setLitters] = useState([])
@@ -23,9 +25,14 @@ function DogForm({ dog, onClose, onSave }) {
   const [useManualParents, setUseManualParents] = useState(true)
   const [littersAvailable, setLittersAvailable] = useState(false)
 
+  // Derive effective external state (editing an existing external dog or explicitly flagged)
+  const effectiveExternal = isExternal || (dog && dog.is_external)
+
   useEffect(() => {
     fetchDogs()
+    if (!effectiveExternal) {
       fetchLitters()
+    }
     if (dog) {
       setFormData({
         name: dog.name || '',
@@ -36,9 +43,11 @@ function DogForm({ dog, onClose, onSave }) {
         color: dog.color || '',
         microchip: dog.microchip || '',
         notes: dog.notes || '',
-        sire_id: dog.sire?.id || null,  // Ensure null, not ''
+        sire_id: dog.sire?.id || null,
-        dam_id: dog.dam?.id || null,    // Ensure null, not ''
+        dam_id: dog.dam?.id || null,
-        litter_id: dog.litter_id || null // Ensure null, not ''
+        litter_id: dog.litter_id || null,
+        is_champion: !!dog.is_champion,
+        is_external: dog.is_external ?? (isExternal ? 1 : 0),
       })
       setUseManualParents(!dog.litter_id)
     }
@@ -46,27 +55,21 @@ function DogForm({ dog, onClose, onSave }) {
 
   const fetchDogs = async () => {
     try {
-      const res = await axios.get('/api/dogs')
+      const res = await axios.get('/api/dogs/all')
       setDogs(res.data || [])
-    } catch (error) {
+    } catch (e) {
-      console.error('Error fetching dogs:', error)
       setDogs([])
     }
   }
 
   const fetchLitters = async () => {
     try {
-      const res = await axios.get('/api/litters')
+      const res = await axios.get('/api/litters', { params: { limit: 200 } })
-      const litterData = res.data || []
+      const data = res.data.data || []
-      setLitters(litterData)
+      setLitters(data)
-      setLittersAvailable(litterData.length > 0)
+      setLittersAvailable(data.length > 0)
-      // Only default to manual if no litters exist
+      if (data.length === 0) setUseManualParents(true)
-      if (litterData.length === 0) {
+    } catch (e) {
-        setUseManualParents(true)
-      }
-    } catch (error) {
-      console.error('Error fetching litters:', error)
-      // If endpoint fails, gracefully fallback to manual mode
       setLitters([])
       setLittersAvailable(false)
       setUseManualParents(true)
@@ -74,25 +77,27 @@ function DogForm({ dog, onClose, onSave }) {
   }
 
   const handleChange = (e) => {
-    const { name, value } = e.target
+    const { name, value, type, checked } = e.target
 
-    // Convert empty strings to null for ID fields
+    if (type === 'checkbox') {
-    let processedValue = value
+      setFormData(prev => ({ ...prev, [name]: checked }))
-    if (name === 'sire_id' || name === 'dam_id' || name === 'litter_id') {
+      return
-      processedValue = value === '' ? null : parseInt(value)
     }
 
-    setFormData(prev => ({ ...prev, [name]: processedValue }))
+    let processed = value
+    if (name === 'sire_id' || name === 'dam_id' || name === 'litter_id') {
+      processed = value === '' ? null : parseInt(value)
+    }
+    setFormData(prev => ({ ...prev, [name]: processed }))
 
-    // If litter is selected, auto-populate parents
     if (name === 'litter_id' && value) {
-      const selectedLitter = litters.find(l => l.id === parseInt(value))
+      const sel = litters.find(l => l.id === parseInt(value))
-      if (selectedLitter) {
+      if (sel) {
         setFormData(prev => ({
           ...prev,
-          sire_id: selectedLitter.sire_id,
+          sire_id: sel.sire_id,
-          dam_id: selectedLitter.dam_id,
+          dam_id: sel.dam_id,
-          breed: prev.breed || selectedLitter.sire_name?.split(' ')[0] || ''
+          breed: prev.breed || sel.sire_name?.split(' ')[0] || ''
         }))
       }
     }
@@ -102,32 +107,29 @@ function DogForm({ dog, onClose, onSave }) {
     e.preventDefault()
     setError('')
     setLoading(true)
-
     try {
       const submitData = {
         ...formData,
-        // Ensure null values are sent, not empty strings
+        is_champion: formData.is_champion ? 1 : 0,
+        is_external: effectiveExternal ? 1 : 0,
         sire_id: formData.sire_id || null,
         dam_id: formData.dam_id || null,
-        litter_id: useManualParents ? null : (formData.litter_id || null),
+        litter_id: (effectiveExternal || useManualParents) ? null : (formData.litter_id || null),
         registration_number: formData.registration_number || null,
         birth_date: formData.birth_date || null,
         color: formData.color || null,
         microchip: formData.microchip || null,
-        notes: formData.notes || null
+        notes: formData.notes || null,
       }
-      
       if (dog) {
-        // Update existing dog
         await axios.put(`/api/dogs/${dog.id}`, submitData)
       } else {
-        // Create new dog
         await axios.post('/api/dogs', submitData)
       }
       onSave()
       onClose()
-    } catch (error) {
+    } catch (err) {
-      setError(error.response?.data?.error || 'Failed to save dog')
+      setError(err.response?.data?.error || 'Failed to save dog')
       setLoading(false)
     }
   }
@@ -139,60 +141,56 @@ function DogForm({ dog, onClose, onSave }) {
     <div className="modal-overlay" onClick={onClose}>
       <div className="modal-content" onClick={(e) => e.stopPropagation()}>
         <div className="modal-header">
-          <h2>{dog ? 'Edit Dog' : 'Add New Dog'}</h2>
+          <h2>
-          <button className="btn-icon" onClick={onClose}>
+            {effectiveExternal && <ExternalLink size={18} style={{ marginRight: '0.4rem', verticalAlign: 'middle', color: 'var(--text-muted)' }} />}
-            <X size={24} />
+            {dog ? 'Edit Dog' : effectiveExternal ? 'Add External Dog' : 'Add New Dog'}
-          </button>
+          </h2>
+          <button className="btn-icon" onClick={onClose}><X size={24} /></button>
         </div>
 
+        {effectiveExternal && (
+          <div style={{
+            margin: '0 0 1rem',
+            padding: '0.6rem 1rem',
+            background: 'rgba(99,102,241,0.08)',
+            border: '1px solid rgba(99,102,241,0.25)',
+            borderRadius: 'var(--radius)',
+            fontSize: '0.875rem',
+            color: 'var(--text-secondary)',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '0.5rem',
+          }}>
+            <ExternalLink size={14} />
+            External dog — not part of your kennel roster.
+          </div>
+        )}
+
         <form onSubmit={handleSubmit} className="modal-body">
           {error && <div className="error">{error}</div>}
 
           <div className="form-grid">
             <div className="form-group">
               <label className="label">Name *</label>
-              <input
+              <input type="text" name="name" className="input"
-                type="text"
+                value={formData.name} onChange={handleChange} required />
-                name="name"
-                className="input"
-                value={formData.name}
-                onChange={handleChange}
-                required
-              />
             </div>
 
             <div className="form-group">
               <label className="label">Registration Number</label>
-              <input
+              <input type="text" name="registration_number" className="input"
-                type="text"
+                value={formData.registration_number} onChange={handleChange} />
-                name="registration_number"
-                className="input"
-                value={formData.registration_number}
-                onChange={handleChange}
-              />
             </div>
 
             <div className="form-group">
               <label className="label">Breed *</label>
-              <input
+              <input type="text" name="breed" className="input"
-                type="text"
+                value={formData.breed} onChange={handleChange} required />
-                name="breed"
-                className="input"
-                value={formData.breed}
-                onChange={handleChange}
-                required
-              />
             </div>
 
             <div className="form-group">
               <label className="label">Sex *</label>
-              <select
+              <select name="sex" className="input" value={formData.sex} onChange={handleChange} required>
-                name="sex"
-                className="input"
-                value={formData.sex}
-                onChange={handleChange}
-                required
-              >
                 <option value="male">Male</option>
                 <option value="female">Female</option>
               </select>
@@ -200,76 +198,87 @@ function DogForm({ dog, onClose, onSave }) {
 
             <div className="form-group">
               <label className="label">Birth Date</label>
-              <input
+              <input type="date" name="birth_date" className="input"
-                type="date"
+                value={formData.birth_date} onChange={handleChange} />
-                name="birth_date"
-                className="input"
-                value={formData.birth_date}
-                onChange={handleChange}
-              />
             </div>
 
             <div className="form-group">
               <label className="label">Color</label>
-              <input
+              <input type="text" name="color" className="input"
-                type="text"
+                value={formData.color} onChange={handleChange} />
-                name="color"
-                className="input"
-                value={formData.color}
-                onChange={handleChange}
-              />
             </div>
 
             <div className="form-group">
               <label className="label">Microchip Number</label>
-              <input
+              <input type="text" name="microchip" className="input"
-                type="text"
+                value={formData.microchip} onChange={handleChange} />
-                name="microchip"
-                className="input"
-                value={formData.microchip}
-                onChange={handleChange}
-              />
             </div>
           </div>
 
-          {/* Litter or Manual Parent Selection */}
+          {/* Champion Toggle */}
-          <div style={{ marginTop: '1.5rem', padding: '1rem', background: 'rgba(99, 102, 241, 0.05)', borderRadius: '8px', border: '1px solid rgba(99, 102, 241, 0.2)' }}>
+          <div style={{
+            marginTop: '1.25rem',
+            padding: '0.875rem 1rem',
+            background: formData.is_champion ? 'rgba(194, 134, 42, 0.08)' : 'var(--bg-primary)',
+            border: formData.is_champion ? '1px solid var(--champion-gold)' : '1px solid var(--border)',
+            borderRadius: 'var(--radius)',
+            transition: 'all 0.2s',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '0.75rem',
+            cursor: 'pointer',
+          }}
+            onClick={() => setFormData(prev => ({ ...prev, is_champion: !prev.is_champion }))}
+          >
+            <input
+              type="checkbox"
+              name="is_champion"
+              id="is_champion"
+              checked={!!formData.is_champion}
+              onChange={handleChange}
+              style={{ width: '18px', height: '18px', cursor: 'pointer', accentColor: 'var(--champion-gold)' }}
+              onClick={e => e.stopPropagation()}
+            />
+            <Award size={18} style={{ color: formData.is_champion ? 'var(--champion-gold)' : 'var(--text-muted)' }} />
+            <div>
+              <div style={{ fontWeight: 600, color: formData.is_champion ? 'var(--champion-gold)' : 'var(--text-primary)', fontSize: '0.9375rem' }}>
+                Champion
+              </div>
+              <div style={{ fontSize: '0.8rem', color: 'var(--text-muted)' }}>
+                Mark this dog as a titled champion &mdash; offspring will display a Champion Bloodline badge
+              </div>
+            </div>
+          </div>
+
+          {/* Parent Section */}
+          <div style={{
+            marginTop: '1.5rem', padding: '1rem',
+            background: 'rgba(194, 134, 42, 0.04)',
+            borderRadius: '8px',
+            border: '1px solid rgba(194, 134, 42, 0.15)'
+          }}>
             <label className="label" style={{ marginBottom: '0.75rem', display: 'block', fontWeight: '600' }}>Parent Information</label>
 
-            {littersAvailable && (
+            {!effectiveExternal && littersAvailable && (
               <div style={{ display: 'flex', gap: '1.5rem', marginBottom: '1rem', flexWrap: 'wrap' }}>
                 <label style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', cursor: 'pointer', fontSize: '0.95rem' }}>
-                  <input
+                  <input type="radio" name="parentMode" checked={!useManualParents}
-                    type="radio"
+                    onChange={() => setUseManualParents(false)} style={{ width: '16px', height: '16px' }} />
-                    name="parentMode"
-                    checked={!useManualParents}
-                    onChange={() => setUseManualParents(false)}
-                    style={{ width: '16px', height: '16px' }}
-                  />
                   <span>Link to Litter</span>
                 </label>
                 <label style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', cursor: 'pointer', fontSize: '0.95rem' }}>
-                  <input
+                  <input type="radio" name="parentMode" checked={useManualParents}
-                    type="radio"
+                    onChange={() => setUseManualParents(true)} style={{ width: '16px', height: '16px' }} />
-                    name="parentMode"
-                    checked={useManualParents}
-                    onChange={() => setUseManualParents(true)}
-                    style={{ width: '16px', height: '16px' }}
-                  />
                   <span>Manual Parent Selection</span>
                 </label>
               </div>
             )}
 
-            {!useManualParents && littersAvailable ? (
+            {!useManualParents && littersAvailable && !effectiveExternal ? (
                 <div className="form-group" style={{ marginTop: '0.5rem' }}>
                   <label className="label">Select Litter</label>
-                <select
+                  <select name="litter_id" className="input"
-                  name="litter_id"
+                    value={formData.litter_id || ''} onChange={handleChange}>
-                  className="input"
-                  value={formData.litter_id || ''}
-                  onChange={handleChange}
-                >
                     <option value="">No Litter</option>
                     {litters.map(l => (
                       <option key={l.id} value={l.id}>
@@ -278,7 +287,7 @@ function DogForm({ dog, onClose, onSave }) {
                     ))}
                   </select>
                   {formData.litter_id && (
-                  <div style={{ marginTop: '0.5rem', fontSize: '0.875rem', color: '#6366f1', fontStyle: 'italic' }}>
+                    <div style={{ marginTop: '0.5rem', fontSize: '0.875rem', color: 'var(--primary)', fontStyle: 'italic' }}>
                       ✓ Parents will be automatically set from the selected litter
                     </div>
                   )}
@@ -287,31 +296,18 @@ function DogForm({ dog, onClose, onSave }) {
                 <div className="form-grid" style={{ marginTop: '0.5rem' }}>
                   <div className="form-group">
                     <label className="label">Sire (Father)</label>
-                  <select
+                    <select name="sire_id" className="input"
-                    name="sire_id"
+                      value={formData.sire_id || ''} onChange={handleChange}>
-                    className="input"
-                    value={formData.sire_id || ''}
-                    onChange={handleChange}
-                  >
                       <option value="">Unknown</option>
-                    {males.map(d => (
+                      {males.map(d => <option key={d.id} value={d.id}>{d.name}{d.is_champion ? ' ✪' : ''}</option>)}
-                      <option key={d.id} value={d.id}>{d.name}</option>
-                    ))}
                     </select>
                   </div>
-
                   <div className="form-group">
                     <label className="label">Dam (Mother)</label>
-                  <select
+                    <select name="dam_id" className="input"
-                    name="dam_id"
+                      value={formData.dam_id || ''} onChange={handleChange}>
-                    className="input"
-                    value={formData.dam_id || ''}
-                    onChange={handleChange}
-                  >
                       <option value="">Unknown</option>
-                    {females.map(d => (
+                      {females.map(d => <option key={d.id} value={d.id}>{d.name}{d.is_champion ? ' ✪' : ''}</option>)}
-                      <option key={d.id} value={d.id}>{d.name}</option>
-                    ))}
                     </select>
                   </div>
                 </div>
@@ -320,21 +316,14 @@ function DogForm({ dog, onClose, onSave }) {
 
           <div className="form-group" style={{ marginTop: '1rem' }}>
             <label className="label">Notes</label>
-            <textarea
+            <textarea name="notes" className="input" rows="4"
-              name="notes"
+              value={formData.notes} onChange={handleChange} />
-              className="input"
-              rows="4"
-              value={formData.notes}
-              onChange={handleChange}
-            />
           </div>
 
           <div className="modal-footer">
-            <button type="button" className="btn btn-secondary" onClick={onClose} disabled={loading}>
+            <button type="button" className="btn btn-secondary" onClick={onClose} disabled={loading}>Cancel</button>
-              Cancel
-            </button>
             <button type="submit" className="btn btn-primary" disabled={loading}>
-              {loading ? 'Saving...' : dog ? 'Update Dog' : 'Add Dog'}
+              {loading ? 'Saving...' : dog ? 'Update Dog' : effectiveExternal ? 'Add External Dog' : 'Add Dog'}
             </button>
           </div>
         </form>

client/src/components/GeneticPanelCard.jsx

@@ -0,0 +1,97 @@
+import { useState, useEffect } from 'react'
+import { Dna, Plus } from 'lucide-react'
+import axios from 'axios'
+import GeneticTestForm from './GeneticTestForm'
+
+const RESULT_STYLES = {
+  clear:      { bg: 'rgba(52,199,89,0.15)', color: 'var(--success)' },
+  carrier:    { bg: 'rgba(255,159,10,0.15)', color: 'var(--warning)' },
+  affected:   { bg: 'rgba(255,59,48,0.15)', color: 'var(--danger)' },
+  not_tested: { bg: 'var(--bg-tertiary)', color: 'var(--text-muted)' }
+}
+
+export default function GeneticPanelCard({ dogId }) {
+  const [data, setData] = useState(null)
+  const [error, setError] = useState(false)
+  const [loading, setLoading] = useState(true)
+  const [showForm, setShowForm] = useState(false)
+  const [editingRecord, setEditingRecord] = useState(null)
+
+  const fetchGenetics = () => {
+    setLoading(true)
+    axios.get(`/api/genetics/dog/${dogId}`)
+      .then(res => setData(res.data))
+      .catch(() => setError(true))
+      .finally(() => setLoading(false))
+  }
+
+  useEffect(() => { fetchGenetics() }, [dogId])
+
+  const openAdd = () => { setEditingRecord(null); setShowForm(true) }
+  const openEdit = (rec) => { setEditingRecord(rec); setShowForm(true) }
+  const handleSaved = () => { setShowForm(false); fetchGenetics() }
+
+  if (error || (!loading && !data)) return null
+
+  const panel = data?.panel || []
+  
+  return (
+    <div className="card" style={{ marginBottom: '1.5rem' }}>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+        <h2 style={{ fontSize: '1rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em', margin: 0, display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+          <Dna size={18} /> DNA Genetics Panel
+        </h2>
+        <button className="btn btn-ghost" style={{ fontSize: '0.8rem', padding: '0.35rem 0.75rem' }} onClick={openAdd}>
+          <Plus size={14} /> Update Marker
+        </button>
+      </div>
+
+      {loading ? (
+        <div style={{ fontSize: '0.875rem', color: 'var(--text-muted)' }}>Loading...</div>
+      ) : (
+        <div style={{ 
+          display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(130px, 1fr))', gap: '0.5rem' 
+        }}>
+          {panel.map(item => {
+            const style = RESULT_STYLES[item.result] || RESULT_STYLES.not_tested
+            // Pass the whole test record if it exists so we can edit it
+            const record = item.id ? item : { marker: item.marker, result: 'not_tested' }
+            
+            return (
+              <div 
+                key={item.marker}
+                onClick={() => openEdit(record)}
+                style={{
+                  padding: '0.5rem 0.75rem',
+                  background: style.bg,
+                  border: `1px solid ${style.color}44`,
+                  borderRadius: 'var(--radius-sm)',
+                  cursor: 'pointer',
+                  transition: 'transform 0.1s ease',
+                }}
+                onMouseEnter={e => e.currentTarget.style.transform = 'translateY(-2px)'}
+                onMouseLeave={e => e.currentTarget.style.transform = 'translateY(0)'}
+              >
+                <div style={{ fontSize: '0.75rem', color: 'var(--text-muted)', marginBottom: '0.2rem', fontWeight: 500 }}>
+                  {item.marker}
+                </div>
+                <div style={{ fontSize: '0.875rem', color: style.color, fontWeight: 600, textTransform: 'capitalize' }}>
+                  {item.result.replace('_', ' ')}
+                </div>
+              </div>
+            )
+          })}
+        </div>
+      )}
+
+      {showForm && (
+        <GeneticTestForm
+          dogId={dogId}
+          record={editingRecord}
+          onClose={() => setShowForm(false)}
+          onSave={handleSaved}
+        />
+      )}
+    </div>
+  )
+}

client/src/components/GeneticTestForm.jsx

@@ -0,0 +1,157 @@
+import { useState } from 'react'
+import { X } from 'lucide-react'
+import axios from 'axios'
+
+const GR_MARKERS = [
+  { value: 'PRA1', label: 'PRA1' },
+  { value: 'PRA2', label: 'PRA2' },
+  { value: 'prcd-PRA', label: 'prcd-PRA' },
+  { value: 'GR-PRA1', label: 'GR-PRA1' },
+  { value: 'GR-PRA2', label: 'GR-PRA2' },
+  { value: 'ICH1', label: 'ICH1 (Ichthyosis 1)' },
+  { value: 'ICH2', label: 'ICH2 (Ichthyosis 2)' },
+  { value: 'NCL', label: 'Neuronal Ceroid Lipofuscinosis' },
+  { value: 'DM', label: 'Degenerative Myelopathy' },
+  { value: 'MD', label: 'Muscular Dystrophy' }
+]
+
+const RESULTS = [
+  { value: 'clear', label: 'Clear / Normal' },
+  { value: 'carrier', label: 'Carrier (1 copy)' },
+  { value: 'affected', label: 'Affected / At Risk (2 copies)' },
+  { value: 'not_tested', label: 'Not Tested' }
+]
+
+const EMPTY = {
+  test_provider: 'Embark',
+  marker: 'PRA1',
+  result: 'clear',
+  test_date: '',
+  document_url: '',
+  notes: ''
+}
+
+export default function GeneticTestForm({ dogId, record, onClose, onSave }) {
+  const [form, setForm] = useState(record || { ...EMPTY, dog_id: dogId })
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState(null)
+
+  const set = (k, v) => setForm(f => ({ ...f, [k]: v }))
+
+  const handleSubmit = async (e) => {
+    e.preventDefault()
+    setSaving(true)
+    setError(null)
+    
+    // If not tested, don't save
+    if (form.result === 'not_tested' && !record) {
+      setError('Cannot save a "Not Tested" result. Please just delete the record if it exists.')
+      setSaving(false)
+      return
+    }
+
+    try {
+      if (record && record.id) {
+        if (form.result === 'not_tested') {
+          // If changed to not_tested, just delete it
+          await axios.delete(`/api/genetics/${record.id}`)
+        } else {
+          await axios.put(`/api/genetics/${record.id}`, form)
+        }
+      } else {
+        await axios.post('/api/genetics', { ...form, dog_id: dogId })
+      }
+      onSave()
+    } catch (err) {
+      setError(err.response?.data?.error || 'Failed to save genetic record')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const labelStyle = {
+    fontSize: '0.8rem', color: 'var(--text-muted)',
+    marginBottom: '0.25rem', display: 'block',
+  }
+  const inputStyle = {
+    width: '100%', background: 'var(--bg-primary)',
+    border: '1px solid var(--border)', borderRadius: 'var(--radius-sm)',
+    padding: '0.5rem 0.75rem', color: 'var(--text-primary)', fontSize: '0.9rem',
+    boxSizing: 'border-box',
+  }
+  const fw = { display: 'flex', flexDirection: 'column', gap: '0.25rem' }
+
+  return (
+    <div style={{
+      position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.7)',
+      backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center',
+      justifyContent: 'center', zIndex: 1000, padding: '1rem',
+    }}>
+      <div className="card" style={{
+        width: '100%', maxWidth: '500px', maxHeight: '90vh',
+        overflowY: 'auto', position: 'relative',
+      }}>
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1.5rem' }}>
+          <h2 style={{ margin: 0 }}>{record && record.id ? 'Edit' : 'Add'} Genetic Result</h2>
+          <button className="btn-icon" onClick={onClose}><X size={20} /></button>
+        </div>
+
+        <form onSubmit={handleSubmit} style={{ display: 'flex', flexDirection: 'column', gap: '1rem' }}>
+          <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '1rem' }}>
+            <div style={fw}>
+              <label style={labelStyle}>Marker *</label>
+              <select style={inputStyle} value={form.marker} onChange={e => set('marker', e.target.value)} disabled={!!record}>
+                {GR_MARKERS.map(m => <option key={m.value} value={m.value}>{m.label}</option>)}
+              </select>
+            </div>
+            <div style={fw}>
+              <label style={labelStyle}>Result *</label>
+              <select style={inputStyle} value={form.result} onChange={e => set('result', e.target.value)}>
+                {RESULTS.map(r => <option key={r.value} value={r.value}>{r.label}</option>)}
+              </select>
+            </div>
+          </div>
+
+          <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '1rem' }}>
+            <div style={fw}>
+              <label style={labelStyle}>Provider</label>
+              <input style={inputStyle} placeholder="Embark, PawPrint, etc." value={form.test_provider}
+                onChange={e => set('test_provider', e.target.value)} />
+            </div>
+            <div style={fw}>
+              <label style={labelStyle}>Test Date</label>
+              <input style={inputStyle} type="date" value={form.test_date}
+                onChange={e => set('test_date', e.target.value)} />
+            </div>
+          </div>
+
+          <div style={fw}>
+            <label style={labelStyle}>Document URL</label>
+            <input style={inputStyle} type="url" placeholder="Link to PDF or result page" value={form.document_url}
+              onChange={e => set('document_url', e.target.value)} />
+          </div>
+
+          <div style={fw}>
+            <label style={labelStyle}>Notes</label>
+            <textarea style={{ ...inputStyle, minHeight: '60px', resize: 'vertical' }}
+              value={form.notes} onChange={e => set('notes', e.target.value)} />
+          </div>
+
+          {error && (
+            <div style={{
+              color: 'var(--danger)', fontSize: '0.85rem', padding: '0.5rem 0.75rem',
+              background: 'rgba(255,59,48,0.1)', borderRadius: 'var(--radius-sm)',
+            }}>{error}</div>
+          )}
+
+          <div style={{ display: 'flex', gap: '0.75rem', justifyContent: 'flex-end', marginTop: '0.5rem' }}>
+            <button type="button" className="btn btn-ghost" onClick={onClose}>Cancel</button>
+            <button type="submit" className="btn btn-primary" disabled={saving}>
+              {saving ? 'Saving...' : 'Save Result'}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+}

client/src/components/HealthRecordForm.jsx

@@ -0,0 +1,194 @@
+import { useState } from 'react'
+import { X } from 'lucide-react'
+import axios from 'axios'
+
+const RECORD_TYPES = ['ofa_clearance', 'vaccination', 'exam', 'surgery', 'medication', 'other']
+const OFA_TEST_TYPES = [
+  { value: 'hip_ofa',     label: 'Hip - OFA' },
+  { value: 'hip_pennhip', label: 'Hip - PennHIP' },
+  { value: 'elbow_ofa',   label: 'Elbow - OFA' },
+  { value: 'heart_ofa',   label: 'Heart - OFA' },
+  { value: 'heart_echo',  label: 'Heart - Echo' },
+  { value: 'eye_caer',    label: 'Eyes - CAER' },
+]
+const OFA_RESULTS = ['Excellent', 'Good', 'Fair', 'Mild', 'Moderate', 'Severe', 'Normal', 'Abnormal', 'Pass', 'Fail']
+
+const EMPTY = {
+  record_type: 'ofa_clearance', test_type: 'hip_ofa', test_name: '',
+  test_date: '', ofa_result: 'Good', ofa_number: '', performed_by: '',
+  expires_at: '', result: '', vet_name: '', next_due: '', notes: '', document_url: '',
+}
+
+export default function HealthRecordForm({ dogId, record, onClose, onSave }) {
+  const [form, setForm]     = useState(record || { ...EMPTY, dog_id: dogId })
+  const [saving, setSaving] = useState(false)
+  const [error, setError]   = useState(null)
+
+  const isOFA = form.record_type === 'ofa_clearance'
+  const set   = (k, v) => setForm(f => ({ ...f, [k]: v }))
+
+  const handleSubmit = async (e) => {
+    e.preventDefault()
+    setSaving(true)
+    setError(null)
+    try {
+      if (record && record.id) {
+        await axios.put(`/api/health/${record.id}`, form)
+      } else {
+        await axios.post('/api/health', { ...form, dog_id: dogId })
+      }
+      onSave()
+    } catch (err) {
+      setError(err.response?.data?.error || 'Failed to save record')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const labelStyle = {
+    fontSize: '0.8rem', color: 'var(--text-muted)',
+    marginBottom: '0.25rem', display: 'block',
+  }
+  const inputStyle = {
+    width: '100%', background: 'var(--bg-primary)',
+    border: '1px solid var(--border)', borderRadius: 'var(--radius-sm)',
+    padding: '0.5rem 0.75rem', color: 'var(--text-primary)', fontSize: '0.9rem',
+    boxSizing: 'border-box',
+  }
+  const fw = { display: 'flex', flexDirection: 'column', gap: '0.25rem' }
+  const grid2 = { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '1rem' }
+
+  return (
+    <div style={{
+      position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.7)',
+      backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center',
+      justifyContent: 'center', zIndex: 1000, padding: '1rem',
+    }}>
+      <div className="card" style={{
+        width: '100%', maxWidth: '560px', maxHeight: '90vh',
+        overflowY: 'auto', position: 'relative',
+      }}>
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1.5rem' }}>
+          <h2 style={{ margin: 0 }}>{record && record.id ? 'Edit' : 'Add'} Health Record</h2>
+          <button className="btn-icon" onClick={onClose}><X size={20} /></button>
+        </div>
+
+        <form onSubmit={handleSubmit} style={{ display: 'flex', flexDirection: 'column', gap: '1rem' }}>
+
+          {/* Record type */}
+          <div style={fw}>
+            <label style={labelStyle}>Record Type</label>
+            <select style={inputStyle} value={form.record_type} onChange={e => set('record_type', e.target.value)}>
+              {RECORD_TYPES.map(t => (
+                <option key={t} value={t}>
+                  {t.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase())}
+                </option>
+              ))}
+            </select>
+          </div>
+
+          {isOFA ? (
+            <>
+              <div style={grid2}>
+                <div style={fw}>
+                  <label style={labelStyle}>OFA Test Type</label>
+                  <select style={inputStyle} value={form.test_type} onChange={e => set('test_type', e.target.value)}>
+                    {OFA_TEST_TYPES.map(t => <option key={t.value} value={t.value}>{t.label}</option>)}
+                  </select>
+                </div>
+                <div style={fw}>
+                  <label style={labelStyle}>OFA Result</label>
+                  <select style={inputStyle} value={form.ofa_result} onChange={e => set('ofa_result', e.target.value)}>
+                    {OFA_RESULTS.map(r => <option key={r} value={r}>{r}</option>)}
+                  </select>
+                </div>
+              </div>
+              <div style={grid2}>
+                <div style={fw}>
+                  <label style={labelStyle}>OFA Number</label>
+                  <input style={inputStyle} placeholder="GR-12345E24M-VPI" value={form.ofa_number}
+                    onChange={e => set('ofa_number', e.target.value)} />
+                </div>
+                <div style={fw}>
+                  <label style={labelStyle}>Performed By</label>
+                  <input style={inputStyle} placeholder="Radiologist / cardiologist" value={form.performed_by}
+                    onChange={e => set('performed_by', e.target.value)} />
+                </div>
+              </div>
+              <div style={grid2}>
+                <div style={fw}>
+                  <label style={labelStyle}>Test Date *</label>
+                  <input style={inputStyle} type="date" required value={form.test_date}
+                    onChange={e => set('test_date', e.target.value)} />
+                </div>
+                <div style={fw}>
+                  <label style={labelStyle}>Expires At</label>
+                  <input style={inputStyle} type="date" value={form.expires_at}
+                    onChange={e => set('expires_at', e.target.value)} />
+                </div>
+              </div>
+            </>
+          ) : (
+            <>
+              <div style={fw}>
+                <label style={labelStyle}>Test / Procedure Name</label>
+                <input style={inputStyle} placeholder="e.g. Rabies, Bordetella..." value={form.test_name}
+                  onChange={e => set('test_name', e.target.value)} />
+              </div>
+              <div style={grid2}>
+                <div style={fw}>
+                  <label style={labelStyle}>Date *</label>
+                  <input style={inputStyle} type="date" required value={form.test_date}
+                    onChange={e => set('test_date', e.target.value)} />
+                </div>
+                <div style={fw}>
+                  <label style={labelStyle}>Next Due</label>
+                  <input style={inputStyle} type="date" value={form.next_due}
+                    onChange={e => set('next_due', e.target.value)} />
+                </div>
+              </div>
+              <div style={grid2}>
+                <div style={fw}>
+                  <label style={labelStyle}>Result</label>
+                  <input style={inputStyle} placeholder="Normal, Pass, etc." value={form.result}
+                    onChange={e => set('result', e.target.value)} />
+                </div>
+                <div style={fw}>
+                  <label style={labelStyle}>Vet Name</label>
+                  <input style={inputStyle} placeholder="Dr. Smith" value={form.vet_name}
+                    onChange={e => set('vet_name', e.target.value)} />
+                </div>
+              </div>
+            </>
+          )}
+
+          <div style={fw}>
+            <label style={labelStyle}>Document URL (optional)</label>
+            <input style={inputStyle} type="url" placeholder="https://ofa.org/..." value={form.document_url}
+              onChange={e => set('document_url', e.target.value)} />
+          </div>
+
+          <div style={fw}>
+            <label style={labelStyle}>Notes</label>
+            <textarea style={{ ...inputStyle, minHeight: '70px', resize: 'vertical' }}
+              value={form.notes} onChange={e => set('notes', e.target.value)} />
+          </div>
+
+          {error && (
+            <div style={{
+              color: 'var(--danger)', fontSize: '0.85rem', padding: '0.5rem 0.75rem',
+              background: 'rgba(255,59,48,0.1)', borderRadius: 'var(--radius-sm)',
+            }}>{error}</div>
+          )}
+
+          <div style={{ display: 'flex', gap: '0.75rem', justifyContent: 'flex-end' }}>
+            <button type="button" className="btn btn-ghost" onClick={onClose}>Cancel</button>
+            <button type="submit" className="btn btn-primary" disabled={saving}>
+              {saving ? 'Saving...' : record && record.id ? 'Save Changes' : 'Add Record'}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+}

client/src/components/LitterForm.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import { X } from 'lucide-react'
 import axios from 'axios'
 
-function LitterForm({ litter, onClose, onSave }) {
+function LitterForm({ litter, prefill, onClose, onSave }) {
   const [formData, setFormData] = useState({
     sire_id: '',
     dam_id: '',
@@ -26,12 +26,20 @@ function LitterForm({ litter, onClose, onSave }) {
         puppy_count: litter.puppy_count || 0,
         notes: litter.notes || ''
       })
+    } else if (prefill) {
+      // Pre-populate from BreedingCalendar "Record Litter" flow
+      setFormData(prev => ({
+        ...prev,
+        dam_id: prefill.dam_id ? String(prefill.dam_id) : '',
+        breeding_date: prefill.breeding_date || '',
+        whelping_date: prefill.whelping_date || '',
+      }))
     }
-  }, [litter])
+  }, [litter, prefill])
 
   const fetchDogs = async () => {
     try {
-      const res = await axios.get('/api/dogs')
+      const res = await axios.get('/api/dogs/all')
       setDogs(res.data)
     } catch (error) {
       console.error('Error fetching dogs:', error)
@@ -69,7 +77,7 @@ function LitterForm({ litter, onClose, onSave }) {
     <div className="modal-overlay" onClick={onClose}>
       <div className="modal-content" onClick={(e) => e.stopPropagation()}>
         <div className="modal-header">
-          <h2>{litter ? 'Edit Litter' : 'Create New Litter'}</h2>
+          <h2>{litter ? 'Edit Litter' : prefill ? `Record Litter — ${prefill.dam_name || 'Dam pre-selected'}` : 'Create New Litter'}</h2>
           <button className="btn-icon" onClick={onClose}>
             <X size={24} />
           </button>
@@ -78,6 +86,20 @@ function LitterForm({ litter, onClose, onSave }) {
         <form onSubmit={handleSubmit} className="modal-body">
           {error && <div className="error">{error}</div>}
 
+          {prefill && !litter && (
+            <div style={{
+              background: 'rgba(16,185,129,0.08)',
+              border: '1px solid rgba(16,185,129,0.3)',
+              borderRadius: 'var(--radius-sm)',
+              padding: '0.6rem 0.875rem',
+              marginBottom: '1rem',
+              fontSize: '0.85rem',
+              color: 'var(--success)'
+            }}>
+              🐾 Pre-filled from heat cycle — select a sire to complete the litter record.
+            </div>
+          )}
+
           <div className="form-grid">
             <div className="form-group">
               <label className="label">Sire (Father) *</label>
@@ -111,6 +133,11 @@ function LitterForm({ litter, onClose, onSave }) {
                   <option key={d.id} value={d.id}>{d.name} {d.registration_number ? `(${d.registration_number})` : ''}</option>
                 ))}
               </select>
+              {prefill?.dam_name && !litter && (
+                <p style={{ fontSize: '0.78rem', color: 'var(--success)', marginTop: '0.25rem' }}>
+                  ✓ Pre-selected: {prefill.dam_name}
+                </p>
+              )}
             </div>
 
             <div className="form-group">

client/src/components/PedigreeTree.css

@@ -1,11 +1,17 @@
+/* ─── Pedigree Tree Wrapper ──────────────────────────────────────── */
 .pedigree-tree-wrapper {
   position: relative;
   width: 100%;
   height: calc(100vh - 200px);
-  background: #f9fafb;
+  background: radial-gradient(
-  border-radius: 8px;
+    ellipse at 20% 50%,
+    rgba(194, 134, 42, 0.06) 0%,
+    var(--bg-primary) 60%
+  );
+  border-radius: var(--radius);
   overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--border);
+  box-shadow: var(--shadow-lg);
 }
 
 .tree-container {
@@ -13,117 +19,142 @@
   height: 100%;
 }
 
+/* ─── SVG Link Paths ─────────────────────────────────────────────── */
+.pedigree-tree-wrapper svg .rd3t-link {
+  stroke: var(--border-light) !important;
+  stroke-width: 1.5px !important;
+  stroke-opacity: 0.6;
+}
+
+/* ─── Controls ───────────────────────────────────────────────────── */
 .pedigree-controls {
   position: absolute;
-  top: 20px;
+  top: 16px;
-  right: 20px;
+  right: 16px;
   z-index: 10;
   display: flex;
-  gap: 1rem;
+  gap: 0.75rem;
   align-items: center;
 }
 
 .control-group {
   display: flex;
-  gap: 0.5rem;
+  gap: 0.25rem;
-  background: white;
+  background: var(--bg-elevated);
-  padding: 0.5rem;
+  padding: 0.375rem;
-  border-radius: 8px;
+  border-radius: var(--radius-sm);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--border);
+  box-shadow: var(--shadow);
+  backdrop-filter: blur(8px);
 }
 
 .control-btn {
-  background: white;
+  background: transparent;
-  border: 1px solid #e5e7eb;
+  border: 1px solid transparent;
-  border-radius: 6px;
+  border-radius: var(--radius-sm);
-  padding: 0.5rem;
+  padding: 0.4rem;
   cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
-  transition: all 0.2s;
+  color: var(--text-secondary);
+  transition: var(--transition);
 }
 
 .control-btn:hover {
-  background: #f3f4f6;
+  background: var(--bg-tertiary);
-  border-color: #d1d5db;
+  border-color: var(--border);
+  color: var(--primary-light);
 }
 
 .control-btn:active {
-  transform: scale(0.95);
+  transform: scale(0.93);
 }
 
+/* ─── COI Display ────────────────────────────────────────────────── */
 .coi-display {
-  background: white;
+  background: var(--bg-elevated);
-  padding: 0.75rem 1rem;
+  padding: 0.5rem 0.875rem;
-  border-radius: 8px;
+  border-radius: var(--radius-sm);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--border);
+  box-shadow: var(--shadow);
   display: flex;
   align-items: center;
   gap: 0.5rem;
+  backdrop-filter: blur(8px);
 }
 
 .coi-label {
   font-weight: 600;
-  color: #6b7280;
+  color: var(--text-muted);
-  font-size: 0.875rem;
+  font-size: 0.75rem;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
 }
 
 .coi-value {
   font-weight: 700;
-  font-size: 1.25rem;
+  font-size: 1.1rem;
+  letter-spacing: -0.02em;
 }
 
-.coi-value.low {
+.coi-value.low  { color: var(--success); }
-  color: #10b981;
+.coi-value.medium { color: var(--warning); }
-}
+.coi-value.high { color: var(--danger); }
-
-.coi-value.medium {
-  color: #f59e0b;
-}
-
-.coi-value.high {
-  color: #ef4444;
-}
 
+/* ─── Legend ─────────────────────────────────────────────────────── */
 .pedigree-legend {
   position: absolute;
-  bottom: 20px;
+  bottom: 16px;
-  left: 20px;
+  left: 16px;
   z-index: 10;
-  background: white;
+  background: var(--bg-elevated);
-  padding: 1rem;
+  padding: 0.625rem 1rem;
-  border-radius: 8px;
+  border-radius: var(--radius-sm);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--border);
+  box-shadow: var(--shadow);
   display: flex;
-  gap: 1.5rem;
+  gap: 1.25rem;
+  backdrop-filter: blur(8px);
 }
 
 .legend-item {
   display: flex;
   align-items: center;
-  gap: 0.5rem;
+  gap: 0.4rem;
-  font-size: 0.875rem;
+  font-size: 0.8rem;
-  color: #6b7280;
+  color: var(--text-secondary);
+  font-weight: 500;
 }
 
 .legend-color {
-  width: 20px;
+  width: 14px;
-  height: 20px;
+  height: 14px;
   border-radius: 50%;
-  border: 2px solid white;
+  border: 2px solid rgba(255,255,255,0.15);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 6px rgba(0,0,0,0.4);
 }
 
-.legend-color.male {
+.legend-color.male   { background: #3b82f6; box-shadow: 0 0 8px rgba(59,130,246,0.4); }
-  background: #3b82f6;
+.legend-color.female { background: #ec4899; box-shadow: 0 0 8px rgba(236,72,153,0.4); }
+
+/* ─── Zoom Indicator ─────────────────────────────────────────────── */
+.zoom-indicator {
+  position: absolute;
+  bottom: 16px;
+  right: 16px;
+  z-index: 10;
+  background: var(--bg-elevated);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  padding: 0.3rem 0.6rem;
+  font-size: 0.7rem;
+  color: var(--text-muted);
+  font-variant-numeric: tabular-nums;
+  backdrop-filter: blur(8px);
 }
 
-.legend-color.female {
+/* ─── Mobile ─────────────────────────────────────────────────────── */
-  background: #ec4899;
-}
-
-/* Mobile responsive */
 @media (max-width: 768px) {
   .pedigree-tree-wrapper {
     height: calc(100vh - 150px);
@@ -133,52 +164,39 @@
     top: 10px;
     right: 10px;
     flex-direction: column;
-    gap: 0.5rem;
+    gap: 0.4rem;
   }
 
   .coi-display {
-    padding: 0.5rem 0.75rem;
+    padding: 0.375rem 0.625rem;
   }
 
-  .coi-label {
+  .coi-label { font-size: 0.7rem; }
-    font-size: 0.75rem;
+  .coi-value { font-size: 0.95rem; }
-  }
-  
-  .coi-value {
-    font-size: 1rem;
-  }
 
   .pedigree-legend {
     bottom: 10px;
     left: 10px;
-    padding: 0.75rem;
+    padding: 0.5rem 0.75rem;
-    gap: 1rem;
+    gap: 0.875rem;
   }
 
-  .legend-item {
+  .legend-item { font-size: 0.75rem; }
-    font-size: 0.75rem;
+  .legend-color { width: 12px; height: 12px; }
-  }
-  
-  .legend-color {
-    width: 16px;
-    height: 16px;
-  }
 }
 
-/* Print styles */
+/* ─── Print ──────────────────────────────────────────────────────── */
 @media print {
   .pedigree-controls,
-  .pedigree-legend {
+  .pedigree-legend,
-    display: none;
+  .zoom-indicator { display: none; }
-  }
 
   .pedigree-tree-wrapper {
     height: 100vh;
     box-shadow: none;
     background: white;
+    border: none;
   }
 
-  .tree-container {
+  .tree-container { page-break-inside: avoid; }
-    page-break-inside: avoid;
-  }
 }

client/src/components/PedigreeTree.jsx

@@ -1,6 +1,6 @@
 import { useState, useCallback, useEffect } from 'react'
 import Tree from 'react-d3-tree'
-import { ZoomIn, ZoomOut, Maximize2, Download } from 'lucide-react'
+import { ZoomIn, ZoomOut, Maximize2 } from 'lucide-react'
 import './PedigreeTree.css'
 
 const PedigreeTree = ({ dogId, pedigreeData, coi }) => {
@@ -12,17 +12,10 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => {
     const updateDimensions = () => {
       const container = document.getElementById('tree-container')
       if (container) {
-        setDimensions({
+        setDimensions({ width: container.offsetWidth, height: container.offsetHeight })
-          width: container.offsetWidth,
+        setTranslate({ x: container.offsetWidth / 4, y: container.offsetHeight / 2 })
-          height: container.offsetHeight
-        })
-        setTranslate({
-          x: container.offsetWidth / 4,
-          y: container.offsetHeight / 2
-        })
       }
     }
-    
     updateDimensions()
     window.addEventListener('resize', updateDimensions)
     return () => window.removeEventListener('resize', updateDimensions)
@@ -32,71 +25,139 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => {
   const handleZoomOut = () => setZoom(z => Math.max(z - 0.2, 0.2))
   const handleReset   = () => {
     setZoom(0.8)
-    setTranslate({
+    setTranslate({ x: dimensions.width / 4, y: dimensions.height / 2 })
-      x: dimensions.width / 4,
-      y: dimensions.height / 2
-    })
   }
 
-  const renderCustomNode = ({ nodeDatum, toggleNode }) => {
+  const renderCustomNode = ({ nodeDatum }) => {
+    const isRoot   = nodeDatum.attributes?.isRoot
     const isMale   = nodeDatum.attributes?.sex === 'male'
-    const nodeColor = isMale ? '#3b82f6' : '#ec4899'
+    const hasId    = !!nodeDatum.attributes?.id
+    const breed    = nodeDatum.attributes?.breed
+
+    // Colour palette aligned to app theme
+    const maleColor   = '#3b82f6'
+    const femaleColor = '#ec4899'
+    const rootGold    = '#c2862a'   // --primary
+    const rootAccent  = '#9b3a10'   // --accent
+
+    const nodeColor   = isRoot ? rootGold : (isMale ? maleColor : femaleColor)
+    const glowColor   = isRoot
+      ? 'rgba(194,134,42,0.35)'
+      : (isMale ? 'rgba(59,130,246,0.3)' : 'rgba(236,72,153,0.3)')
+    const ringColor   = isRoot ? rootAccent : nodeColor
+
+    const r = isRoot ? 46 : 38
 
     return (
       <g>
+        {/* Glow halo — kept within the circle so it doesn't bleed onto text labels */}
         <circle
-          r={30}
+          r={r - 4}
-          fill={nodeColor}
+          fill={glowColor}
-          stroke="#fff"
+          style={{ filter: 'blur(4px)' }}
-          strokeWidth={3}
+        />
-          opacity={0.9}
+
-          style={{ cursor: nodeDatum.attributes?.id ? 'pointer' : 'default' }}
+        {/* Outer ring */}
+        <circle
+          r={r + 4}
+          fill="none"
+          stroke={ringColor}
+          strokeWidth={isRoot ? 2 : 1.5}
+          strokeOpacity={0.5}
+        />
+
+        {/* Main node */}
+        <circle
+          r={r}
+          fill={isRoot
+            ? `url(#rootGradient)`
+            : nodeColor}
+          stroke="rgba(255,255,255,0.15)"
+          strokeWidth={2}
+          style={{
+            cursor: hasId ? 'pointer' : 'default',
+            filter: isRoot ? 'drop-shadow(0 0 8px rgba(194,134,42,0.6))' : 'none'
+          }}
           onClick={() => {
-            if (nodeDatum.attributes?.id) {
+            if (hasId) window.location.href = `/dogs/${nodeDatum.attributes.id}`
-              window.location.href = `/dogs/${nodeDatum.attributes.id}`
-            }
           }}
         />
+
+        {/* SVG gradient definition for root node */}
+        {isRoot && (
+          <defs>
+            <radialGradient id="rootGradient" cx="35%" cy="35%">
+              <stop offset="0%"  stopColor="#e0a84a" />
+              <stop offset="100%" stopColor="#9b3a10" />
+            </radialGradient>
+          </defs>
+        )}
+
+        {/* Gender / crown icon */}
         <text
-          fill="#fff"
+          fontSize={isRoot ? 28 : 24}
-          fontSize="24"
           textAnchor="middle"
           dy="8"
-          style={{ pointerEvents: 'none' }}
+          stroke="none"
+          style={{ fill: '#ffffff', pointerEvents: 'none', userSelect: 'none' }}
         >
-          {isMale ? '♂' : '♀'}
+          {isRoot ? '👑' : (isMale ? '♂' : '♀')}
         </text>
+
+        {/* Name label */}
         <text
-          fill="#1f2937"
+          fontSize={isRoot ? 22 : 18}
-          fontSize="14"
+          fontWeight={isRoot ? '700' : '600'}
-          fontWeight="600"
+          fontFamily="Inter, sans-serif"
           textAnchor="middle"
           x="0"
-          y="50"
+          y={r + 32}
-          style={{ pointerEvents: 'none' }}
+          stroke="none"
+          style={{ fill: isRoot ? '#ffffff' : '#f8fafc', pointerEvents: 'none' }}
         >
           {nodeDatum.name}
         </text>
-        {nodeDatum.attributes?.registration && (
+
+        {/* Breed label (subtle) */}
+        {breed && (
           <text
-            fill="#6b7280"
+            fontSize="14"
-            fontSize="11"
+            fontFamily="Inter, sans-serif"
             textAnchor="middle"
             x="0"
-            y="65"
+            y={r + 52}
-            style={{ pointerEvents: 'none' }}
+            stroke="none"
+            style={{ fill: '#cbd5e1', pointerEvents: 'none' }}
+          >
+            {breed}
+          </text>
+        )}
+
+        {/* Registration number */}
+        {nodeDatum.attributes?.registration && (
+          <text
+            fontSize="14"
+            fontFamily="Inter, sans-serif"
+            textAnchor="middle"
+            x="0"
+            y={r + (breed ? 70 : 52)}
+            stroke="none"
+            style={{ fill: '#94a3b8', pointerEvents: 'none' }}
           >
             {nodeDatum.attributes.registration}
           </text>
         )}
+
+        {/* Birth year */}
         {nodeDatum.attributes?.birth_year && (
           <text
-            fill="#6b7280"
+            fontSize="14"
-            fontSize="11"
+            fontFamily="Inter, sans-serif"
             textAnchor="middle"
             x="0"
-            y="78"
+            y={r + (breed ? 88 : (nodeDatum.attributes?.registration ? 70 : 52))}
-            style={{ pointerEvents: 'none' }}
+            stroke="none"
+            style={{ fill: '#94a3b8', pointerEvents: 'none' }}
           >
             ({nodeDatum.attributes.birth_year})
           </text>
@@ -107,53 +168,72 @@ const PedigreeTree = ({ dogId, pedigreeData, coi }) => {
 
   return (
     <div className="pedigree-tree-wrapper">
+
+      {/* Controls */}
       <div className="pedigree-controls">
         <div className="control-group">
           <button onClick={handleZoomIn}  className="control-btn" title="Zoom In">
-            <ZoomIn size={20} />
+            <ZoomIn size={18} />
           </button>
           <button onClick={handleZoomOut} className="control-btn" title="Zoom Out">
-            <ZoomOut size={20} />
+            <ZoomOut size={18} />
           </button>
           <button onClick={handleReset}   className="control-btn" title="Reset View">
-            <Maximize2 size={20} />
+            <Maximize2 size={18} />
           </button>
         </div>
+
         {coi !== null && coi !== undefined && (
           <div className="coi-display">
-            <span className="coi-label">COI:</span>
+            <span className="coi-label">COI</span>
-            <span className={`coi-value ${coi > 10 ? 'high' : coi > 5 ? 'medium' : 'low'}`}>
+            <span className={`coi-value ${coi > 0.10 ? 'high' : coi > 0.05 ? 'medium' : 'low'}`}>
-              {coi.toFixed(2)}%
+              {(coi * 100).toFixed(2)}%
             </span>
           </div>
         )}
       </div>
 
+      {/* Legend */}
       <div className="pedigree-legend">
         <div className="legend-item">
-          <div className="legend-color male"></div>
+          <div className="legend-color male" />
-          <span>Male</span>
+          <span>Sire</span>
         </div>
         <div className="legend-item">
-          <div className="legend-color female"></div>
+          <div className="legend-color female" />
-          <span>Female</span>
+          <span>Dam</span>
+        </div>
+        <div className="legend-item">
+          <div style={{
+            width: 14, height: 14, borderRadius: '50%',
+            background: 'linear-gradient(135deg, #e0a84a, #9b3a10)',
+            boxShadow: '0 0 8px rgba(194,134,42,0.5)',
+            border: '2px solid rgba(255,255,255,0.15)'
+          }} />
+          <span>Subject</span>
         </div>
       </div>
 
+      {/* Zoom indicator */}
+      <div className="zoom-indicator">
+        {Math.round(zoom * 100)}%
+      </div>
+
+      {/* Tree canvas */}
       <div id="tree-container" className="tree-container">
         {pedigreeData && dimensions.width > 0 && (
           <Tree
             data={pedigreeData}
             translate={translate}
             zoom={zoom}
-            onUpdate={({ zoom, translate }) => {
+            onUpdate={({ zoom: z, translate: t }) => {
-              setZoom(zoom)
+              setZoom(z)
-              setTranslate(translate)
+              setTranslate(t)
             }}
             orientation="horizontal"
             pathFunc="step"
-            separation={{ siblings: 1.5, nonSiblings: 2 }}
+            separation={{ siblings: 1.8, nonSiblings: 2.4 }}
-            nodeSize={{ x: 200, y: 150 }}
+            nodeSize={{ x: 280, y: 200 }}
             renderCustomNodeElement={renderCustomNode}
             enableLegacyTransitions
             transitionDuration={300}

client/src/components/PedigreeView.css

@@ -2,7 +2,8 @@
   position: relative;
   width: 95vw;
   height: 90vh;
-  background: white;
+  background: var(--bg-primary, #1e1e24);
+  border: 1px solid var(--border, #333);
   border-radius: 12px;
   display: flex;
   flex-direction: column;
@@ -11,7 +12,7 @@
 
 .pedigree-container {
   flex: 1;
-  background: linear-gradient(to bottom, #f8fafc 0%, #e2e8f0 100%);
+  background: var(--bg-primary, #1e1e24);
   position: relative;
   overflow: hidden;
 }
@@ -26,8 +27,8 @@
   display: flex;
   gap: 2rem;
   padding: 0.75rem 1.5rem;
-  background: #f1f5f9;
+  background: var(--bg-elevated, #2a2a35);
-  border-bottom: 1px solid #e2e8f0;
+  border-bottom: 1px solid var(--border, #333);
   justify-content: center;
 }
 
@@ -35,8 +36,8 @@
   display: flex;
   align-items: center;
   gap: 0.5rem;
-  font-size: 0.875rem;
+  font-size: 1rem;
-  color: #475569;
+  color: var(--text-secondary, #a1a1aa);
 }
 
 .legend-color {
@@ -57,10 +58,10 @@
 
 .pedigree-info {
   padding: 0.75rem 1.5rem;
-  background: #f8fafc;
+  background: var(--bg-elevated, #2a2a35);
-  border-top: 1px solid #e2e8f0;
+  border-top: 1px solid var(--border, #333);
-  font-size: 0.875rem;
+  font-size: 1rem;
-  color: #64748b;
+  color: var(--text-muted, #a1a1aa);
   text-align: center;
 }
 
@@ -69,7 +70,7 @@
 }
 
 .pedigree-info strong {
-  color: #334155;
+  color: var(--text-primary, #ffffff);
 }
 
 /* Override react-d3-tree styles */
@@ -94,12 +95,12 @@
 
 .rd3t-label__title {
   font-weight: 600;
-  fill: #1e293b;
+  fill: var(--text-primary, #ffffff);
 }
 
 .rd3t-label__attributes {
-  font-size: 0.875rem;
+  font-size: 1rem;
-  fill: #64748b;
+  fill: var(--text-muted, #a1a1aa);
 }
 
 /* Loading state */

client/src/components/PedigreeView.jsx

@@ -17,19 +17,24 @@ function PedigreeView({ dogId, onClose }) {
   }, [dogId])
 
   useEffect(() => {
-    const updateDimensions = () => {
     const container = document.querySelector('.pedigree-container')
-      if (container) {
+    if (!container) return
+
+    const updateDimensions = () => {
       const width = container.offsetWidth
       const height = container.offsetHeight
       setDimensions({ width, height })
       setTranslate({ x: width / 4, y: height / 2 })
     }
-    }
     
     updateDimensions()
-    window.addEventListener('resize', updateDimensions)
+    
-    return () => window.removeEventListener('resize', updateDimensions)
+    const resizeObserver = new ResizeObserver(() => {
+      updateDimensions()
+    })
+    resizeObserver.observe(container)
+    
+    return () => resizeObserver.disconnect()
   }, [])
 
   const fetchPedigree = async () => {

client/src/hooks/useSettings.jsx

@@ -0,0 +1,36 @@
+import { createContext, useContext, useEffect, useState } from 'react'
+import axios from 'axios'
+
+const SettingsContext = createContext({})
+
+export function SettingsProvider({ children }) {
+  const [settings, setSettings] = useState({
+    kennel_name: 'BREEDR',
+    kennel_tagline: '',
+  })
+  const [loading, setLoading] = useState(true)
+
+  useEffect(() => {
+    axios.get('/api/settings')
+      .then(res => {
+        setSettings(prev => ({ ...prev, ...res.data }))
+      })
+      .catch(() => {})
+      .finally(() => setLoading(false))
+  }, [])
+
+  const saveSettings = async (updates) => {
+    await axios.put('/api/settings', updates)
+    setSettings(prev => ({ ...prev, ...updates }))
+  }
+
+  return (
+    <SettingsContext.Provider value={{ settings, saveSettings, loading }}>
+      {children}
+    </SettingsContext.Provider>
+  )
+}
+
+export function useSettings() {
+  return useContext(SettingsContext)
+}

client/src/index.css

@@ -5,35 +5,45 @@
 }
 
 :root {
-  /* Modern dark color palette */
+  /* Primary accent: warm amber/copper to echo the gold-rust brand gradient */
-  --primary: #3b82f6;
+  --primary: #c2862a;
-  --primary-hover: #2563eb;
+  --primary-hover: #a86e1c;
-  --primary-light: #60a5fa;
+  --primary-light: #e0a84a;
-  --accent: #8b5cf6;
+
-  --success: #10b981;
+  /* Secondary/accent: deep copper-red for punch */
+  --accent: #9b3a10;
+
+  /* Status colors stay neutral/functional */
+  --success: #22c55e;
   --danger: #ef4444;
   --warning: #f59e0b;
 
-  /* Dark theme */
+  /* Dark theme backgrounds — slightly warmer tones */
-  --bg-primary: #0f172a;
+  --bg-primary: #0e0f0c;
-  --bg-secondary: #1e293b;
+  --bg-secondary: #1a1a15;
-  --bg-tertiary: #334155;
+  --bg-tertiary: #2a2820;
-  --bg-elevated: #1e293b;
+  --bg-elevated: #222018;
 
-  /* Borders */
+  /* Borders — warm dark */
-  --border: #334155;
+  --border: #38352a;
-  --border-light: #475569;
+  --border-light: #524e3e;
 
   /* Text */
-  --text-primary: #f1f5f9;
+  --text-primary: #f5f0e8;
-  --text-secondary: #cbd5e1;
+  --text-secondary: #ccc4b0;
-  --text-muted: #94a3b8;
+  --text-muted: #8c8472;
 
   /* Shadows */
-  --shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.3);
+  --shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
-  --shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.4);
+  --shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.5);
-  --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.5);
+  --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.6);
-  --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.6);
+  --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.7);
+
+  /* Champion badge colors */
+  --champion-gold: #d4a017;
+  --champion-glow: rgba(212, 160, 23, 0.25);
+  --bloodline-amber: #b06010;
+  --bloodline-glow: rgba(176, 96, 16, 0.2);
 
   /* Misc */
   --radius: 0.5rem;
@@ -130,14 +140,15 @@ h3 { font-size: 1.25rem; }
 }
 
 .btn-primary {
-  background: var(--primary);
+  background: linear-gradient(135deg, var(--primary) 0%, var(--accent) 100%);
-  color: white;
+  color: var(--bg-primary);
   box-shadow: var(--shadow-sm);
+  font-weight: 600;
 }
 
 .btn-primary:hover:not(:disabled) {
-  background: var(--primary-hover);
+  background: linear-gradient(135deg, var(--primary-light) 0%, var(--primary) 100%);
-  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.4);
+  box-shadow: 0 4px 12px rgba(194, 134, 42, 0.4);
 }
 
 .btn-secondary {
@@ -228,7 +239,7 @@ textarea:focus,
 select:focus {
   outline: none;
   border-color: var(--primary);
-  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+  box-shadow: 0 0 0 3px rgba(194, 134, 42, 0.15);
 }
 
 .input::placeholder {
@@ -243,7 +254,7 @@ textarea {
 select {
   cursor: pointer;
   appearance: none;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%2394a3b8' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%238c8472' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
   background-position: right 0.5rem center;
   background-repeat: no-repeat;
   background-size: 1.5em 1.5em;
@@ -308,15 +319,50 @@ select {
 }
 
 .badge-primary {
-  background: rgba(59, 130, 246, 0.2);
+  background: rgba(194, 134, 42, 0.2);
   color: var(--primary-light);
 }
 
 .badge-success {
-  background: rgba(16, 185, 129, 0.2);
+  background: rgba(34, 197, 94, 0.2);
   color: var(--success);
 }
 
+/* Champion Badges */
+.badge-champion {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+  padding: 0.2rem 0.55rem;
+  font-size: 0.7rem;
+  font-weight: 700;
+  border-radius: 9999px;
+  background: linear-gradient(135deg, rgba(212,160,23,0.25) 0%, rgba(155,58,16,0.2) 100%);
+  color: var(--champion-gold);
+  border: 1px solid rgba(212, 160, 23, 0.45);
+  box-shadow: 0 0 6px var(--champion-glow);
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  white-space: nowrap;
+}
+
+.badge-bloodline {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+  padding: 0.2rem 0.55rem;
+  font-size: 0.7rem;
+  font-weight: 700;
+  border-radius: 9999px;
+  background: linear-gradient(135deg, rgba(176,96,16,0.2) 0%, rgba(139,37,0,0.15) 100%);
+  color: var(--bloodline-amber);
+  border: 1px solid rgba(176, 96, 16, 0.4);
+  box-shadow: 0 0 6px var(--bloodline-glow);
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  white-space: nowrap;
+}
+
 /* Modal */
 .modal-overlay {
   position: fixed;
@@ -324,7 +370,7 @@ select {
   left: 0;
   right: 0;
   bottom: 0;
-  background: rgba(0, 0, 0, 0.75);
+  background: rgba(0, 0, 0, 0.8);
   backdrop-filter: blur(4px);
   display: flex;
   align-items: center;
@@ -475,9 +521,9 @@ select {
 }
 
 .risk-low {
-  background: rgba(16, 185, 129, 0.15);
+  background: rgba(34, 197, 94, 0.15);
   color: var(--success);
-  border: 1px solid rgba(16, 185, 129, 0.3);
+  border: 1px solid rgba(34, 197, 94, 0.3);
 }
 
 .risk-med {

client/src/main.jsx

@@ -1,10 +1,13 @@
-import React from 'react'
+import { StrictMode } from 'react'
-import ReactDOM from 'react-dom/client'
+import { createRoot } from 'react-dom/client'
+import { SettingsProvider } from './hooks/useSettings'
 import App from './App.jsx'
 import './index.css'
 
-ReactDOM.createRoot(document.getElementById('root')).render(
+createRoot(document.getElementById('root')).render(
-  <React.StrictMode>
+  <StrictMode>
+    <SettingsProvider>
       <App />
-  </React.StrictMode>,
+    </SettingsProvider>
+  </StrictMode>,
 )

client/src/pages/BreedingCalendar.jsx

@@ -1,17 +1,34 @@
 import { useEffect, useState, useCallback } from 'react'
 import {
   Heart, ChevronLeft, ChevronRight, Plus, X,
-  CalendarDays, FlaskConical, Baby, AlertCircle, CheckCircle2
+  CalendarDays, FlaskConical, Baby, AlertCircle, CheckCircle2, Activity
 } from 'lucide-react'
+import { useNavigate } from 'react-router-dom'
+import axios from 'axios'
 
 // ─── Date helpers ────────────────────────────────────────────────────────────
 const toISO = d => d.toISOString().split('T')[0]
 const addDays = (dateStr, n) => {
   const d = new Date(dateStr); d.setDate(d.getDate() + n); return toISO(d)
 }
-const fmt = str => str ? new Date(str + 'T00:00:00').toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' }) : '—'
+const fmt = str => str ? new Date(str + 'T00:00:00').toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' }) : '–'
 const today = toISO(new Date())
 
+// ─── Canine gestation constants (days from breeding date) ─────────────────────
+const GESTATION_EARLIEST = 58
+const GESTATION_EXPECTED = 63
+const GESTATION_LATEST   = 65
+
+/** Returns { earliest, expected, latest } ISO date strings, or null if no breeding_date */
+function getWhelpDates(cycle) {
+  if (!cycle?.breeding_date) return null
+  return {
+    earliest: addDays(cycle.breeding_date, GESTATION_EARLIEST),
+    expected: addDays(cycle.breeding_date, GESTATION_EXPECTED),
+    latest:   addDays(cycle.breeding_date, GESTATION_LATEST),
+  }
+}
+
 // ─── Cycle window classifier ─────────────────────────────────────────────────
 function getWindowForDate(cycle, dateStr) {
   if (!cycle?.start_date) return null
@@ -32,6 +49,14 @@ const WINDOW_STYLES = {
   diestrus:  { bg: 'rgba(148,163,184,0.12)', border: '#64748b', label: 'Diestrus', dot: '#64748b' },
 }
 
+// Whelp window style (used in legend + calendar marker)
+const WHELP_STYLE = {
+  bg: 'rgba(99,102,241,0.15)',
+  border: '#6366f1',
+  label: 'Projected Whelp',
+  dot: '#6366f1',
+}
+
 // ─── Start Heat Cycle Modal ───────────────────────────────────────────────────
 function StartCycleModal({ females, onClose, onSaved }) {
   const [dogId, setDogId] = useState('')
@@ -74,7 +99,7 @@ function StartCycleModal({ females, onClose, onSaved }) {
             <div className="form-group">
               <label className="label">Female Dog *</label>
               <select value={dogId} onChange={e => setDogId(e.target.value)} required>
-                <option value="">— Select Female —</option>
+                <option value="">– Select Female –</option>
                 {females.map(d => (
                   <option key={d.id} value={d.id}>
                     {d.name}{d.breed ? ` · ${d.breed}` : ''}
@@ -105,7 +130,7 @@ function StartCycleModal({ females, onClose, onSaved }) {
 }
 
 // ─── Cycle Detail Modal ───────────────────────────────────────────────────────
-function CycleDetailModal({ cycle, onClose, onDeleted }) {
+function CycleDetailModal({ cycle, onClose, onDeleted, onRecordLitter }) {
   const [suggestions, setSuggestions] = useState(null)
   const [breedingDate, setBreedingDate] = useState(cycle.breeding_date || '')
   const [savingBreed, setSavingBreed] = useState(false)
@@ -146,6 +171,10 @@ function CycleDetailModal({ cycle, onClose, onDeleted }) {
   }
 
   const whelp = suggestions?.whelping
+  const hasBreedingDate = !!(breedingDate && breedingDate === cycle.breeding_date)
+
+  // Client-side projected whelp dates (immediate, before API suggestions load)
+  const projectedWhelp = getWhelpDates({ breeding_date: breedingDate })
 
   return (
     <div className="modal-overlay" onClick={e => e.target === e.currentTarget && onClose()}>
@@ -217,11 +246,32 @@ function CycleDetailModal({ cycle, onClose, onDeleted }) {
                 {savingBreed ? 'Saving…' : 'Save'}
               </button>
             </div>
+            {/* Live projected whelp preview — shown as soon as a breeding date is entered */}
+            {projectedWhelp && (
+              <div style={{
+                marginTop: '0.875rem',
+                padding: '0.625rem 0.875rem',
+                background: WHELP_STYLE.bg,
+                border: `1px solid ${WHELP_STYLE.border}`,
+                borderRadius: 'var(--radius-sm)',
+                display: 'flex',
+                alignItems: 'center',
+                gap: '0.5rem',
+                flexWrap: 'wrap'
+              }}>
+                <Baby size={15} style={{ color: WHELP_STYLE.dot, flexShrink: 0 }} />
+                <span style={{ fontSize: '0.8125rem', fontWeight: 600, color: WHELP_STYLE.dot }}>Projected Whelp:</span>
+                <span style={{ fontSize: '0.8125rem', color: 'var(--text-secondary)' }}>
+                  {fmt(projectedWhelp.earliest)} – {fmt(projectedWhelp.latest)}
+                  &nbsp;<span style={{ color: 'var(--text-muted)' }}>(expected {fmt(projectedWhelp.expected)})</span>
+                </span>
+              </div>
+            )}
           </div>
 
-          {/* Whelping estimate */}
+          {/* Whelping estimate (from API suggestions) */}
           {whelp && (
-            <div style={{ background: 'rgba(16,185,129,0.08)', border: '1px solid rgba(16,185,129,0.3)', borderRadius: 'var(--radius)', padding: '1rem' }}>
+            <div style={{ background: 'rgba(16,185,129,0.08)', border: '1px solid rgba(16,185,129,0.3)', borderRadius: 'var(--radius)', padding: '1rem', marginBottom: '1rem' }}>
               <h3 style={{ fontSize: '0.9375rem', marginBottom: '0.75rem', display: 'flex', alignItems: 'center', gap: '0.4rem', color: 'var(--success)' }}>
                 <Baby size={16} /> Whelping Estimate
               </h3>
@@ -235,6 +285,39 @@ function CycleDetailModal({ cycle, onClose, onDeleted }) {
               </div>
             </div>
           )}
+
+          {/* Record Litter CTA — shown when breeding date is saved */}
+          {hasBreedingDate && (
+            <div style={{
+              background: 'rgba(16,185,129,0.06)',
+              border: '1px dashed rgba(16,185,129,0.5)',
+              borderRadius: 'var(--radius)',
+              padding: '0.875rem 1rem',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'space-between',
+              gap: '1rem',
+              flexWrap: 'wrap'
+            }}>
+              <div>
+                <div style={{ fontWeight: 600, fontSize: '0.9rem' }}>🐾 Ready to record the litter?</div>
+                <div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.2rem' }}>
+                  Breeding date logged on {fmt(cycle.breeding_date)}. Create a litter record to track puppies.
+                </div>
+              </div>
+              <button
+                className="btn btn-primary"
+                style={{ whiteSpace: 'nowrap', fontSize: '0.85rem' }}
+                onClick={() => {
+                  onClose()
+                  onRecordLitter(cycle)
+                }}
+              >
+                <Activity size={14} style={{ marginRight: '0.4rem' }} />
+                Record Litter
+              </button>
+            </div>
+          )}
         </div>
         <div className="modal-footer" style={{ justifyContent: 'space-between' }}>
           <button className="btn btn-danger" onClick={deleteCycle} disabled={deleting}>
@@ -265,6 +348,8 @@ export default function BreedingCalendar() {
   const [showStartModal, setShowStartModal] = useState(false)
   const [selectedCycle, setSelectedCycle] = useState(null)
   const [selectedDay, setSelectedDay] = useState(null)
+  const [pendingLitterCycle, setPendingLitterCycle] = useState(null)
+  const navigate = useNavigate()
 
   const load = useCallback(async () => {
     setLoading(true)
@@ -287,6 +372,29 @@ export default function BreedingCalendar() {
 
   useEffect(() => { load() }, [load])
 
+  // When user clicks Record Litter from cycle detail, create litter and navigate
+  const handleRecordLitter = useCallback(async (cycle) => {
+    try {
+      // We need sire_id — navigate to litters page with pre-filled dam
+      // Store cycle info in sessionStorage so LitterList can pre-fill
+      sessionStorage.setItem('prefillLitter', JSON.stringify({
+        dam_id: cycle.dog_id,
+        dam_name: cycle.dog_name,
+        breeding_date: cycle.breeding_date,
+        whelping_date: cycle.whelping_date || ''
+      }))
+      navigate('/litters')
+    } catch (err) {
+      console.error(err)
+    }
+  }, [navigate])
+
+  // ── Navigate to a specific year/month ──
+  function goToMonth(y, m) {
+    setYear(y)
+    setMonth(m)
+  }
+
   // ── Build calendar grid ──
   const firstDay = new Date(year, month, 1)
   const lastDay = new Date(year, month + 1, 0)
@@ -306,7 +414,6 @@ export default function BreedingCalendar() {
     else setMonth(m => m + 1)
   }
 
-  // Find cycles that overlap a given date
   function cyclesForDate(dateStr) {
     return cycles.filter(c => {
       const s = c.start_date
@@ -316,21 +423,34 @@ export default function BreedingCalendar() {
     })
   }
 
+  /** Returns array of cycles whose projected whelp expected date is this dateStr */
+  function whelpingCyclesForDate(dateStr) {
+    return cycles.filter(c => {
+      const wd = getWhelpDates(c)
+      if (!wd) return false
+      return dateStr >= wd.earliest && dateStr <= wd.latest
+    })
+  }
+
+  /** Returns true if this dateStr is the exact expected whelp date for any cycle */
+  function isExpectedWhelpDate(dateStr) {
+    return cycles.some(c => {
+      const wd = getWhelpDates(c)
+      return wd?.expected === dateStr
+    })
+  }
+
   function handleDayClick(dateStr, dayCycles) {
     setSelectedDay(dateStr)
     if (dayCycles.length === 1) {
       setSelectedCycle(dayCycles[0])
     } else if (dayCycles.length > 1) {
-      // show first — could be upgraded to a picker
       setSelectedCycle(dayCycles[0])
     } else {
-      // Empty day click — open start modal with date pre-filled would be nice
-      // but we just open start modal; user picks date
       setShowStartModal(true)
     }
   }
 
-  // Active cycles (in current month or ongoing)
   const activeCycles = cycles.filter(c => {
     const s = c.start_date; if (!s) return false
     const end = c.end_date || addDays(s, 28)
@@ -339,6 +459,15 @@ export default function BreedingCalendar() {
     return s <= mEnd && end >= mStart
   })
 
+  // Cycles that have a whelp window overlapping current month view
+  const whelpingThisMonth = cycles.filter(c => {
+    const wd = getWhelpDates(c)
+    if (!wd) return false
+    const mStart = toISO(new Date(year, month, 1))
+    const mEnd = toISO(new Date(year, month + 1, 0))
+    return wd.earliest <= mEnd && wd.latest >= mStart
+  })
+
   return (
     <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem' }}>
       {/* Header */}
@@ -349,7 +478,7 @@ export default function BreedingCalendar() {
           </div>
           <div>
             <h1 style={{ fontSize: '1.75rem', margin: 0 }}>Heat Cycle Calendar</h1>
-            <p style={{ color: 'var(--text-muted)', margin: 0, fontSize: '0.875rem' }}>Track heat cycles and optimal breeding windows</p>
+            <p style={{ color: 'var(--text-muted)', margin: 0, fontSize: '0.875rem' }}>Track heat cycles, optimal breeding windows, and projected whelping dates</p>
           </div>
         </div>
         <button className="btn btn-primary" onClick={() => setShowStartModal(true)}>
@@ -365,6 +494,11 @@ export default function BreedingCalendar() {
             {s.label}
           </div>
         ))}
+        {/* Whelp legend entry */}
+        <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', fontSize: '0.8125rem', color: 'var(--text-secondary)' }}>
+          <Baby size={11} style={{ color: WHELP_STYLE.dot }} />
+          {WHELP_STYLE.label}
+        </div>
       </div>
 
       {/* Month navigator */}
@@ -394,7 +528,11 @@ export default function BreedingCalendar() {
               const dayCycles = dateStr ? cyclesForDate(dateStr) : []
               const isToday = dateStr === today
 
-              // Pick dominant window color for background
+              // Whelp window cycles for this day
+              const whelpCycles = dateStr ? whelpingCyclesForDate(dateStr) : []
+              const isExpectedWhelp = dateStr ? isExpectedWhelpDate(dateStr) : false
+              const hasWhelpActivity = whelpCycles.length > 0
+
               let cellBg = 'transparent'
               let cellBorder = 'var(--border)'
               if (dayCycles.length > 0) {
@@ -403,6 +541,10 @@ export default function BreedingCalendar() {
                   cellBg = WINDOW_STYLES[win].bg
                   cellBorder = WINDOW_STYLES[win].border
                 }
+              } else if (hasWhelpActivity) {
+                // Only color whelp window if not already in a heat window
+                cellBg = WHELP_STYLE.bg
+                cellBorder = WHELP_STYLE.border
               }
 
               return (
@@ -445,10 +587,46 @@ export default function BreedingCalendar() {
                           </div>
                         )
                       })}
-                      {/* Breeding date marker */}
+                      {/* Projected whelp window indicator */}
+                      {hasWhelpActivity && (
+                        <div style={{ marginTop: '0.15rem' }}>
+                          {whelpCycles.map((c, i) => (
+                            <div key={i} style={{
+                              fontSize: '0.67rem',
+                              color: WHELP_STYLE.dot,
+                              fontWeight: 600,
+                              whiteSpace: 'nowrap',
+                              overflow: 'hidden',
+                              textOverflow: 'ellipsis',
+                              lineHeight: 1.3,
+                              display: 'flex',
+                              alignItems: 'center',
+                              gap: '0.2rem'
+                            }}>
+                              <Baby size={9} />
+                              {isExpectedWhelp && getWhelpDates(c)?.expected === dateStr
+                                ? `${c.dog_name} due`
+                                : c.dog_name
+                              }
+                            </div>
+                          ))}
+                        </div>
+                      )}
+                      {/* Breeding date marker dot */}
                       {dayCycles.some(c => c.breeding_date === dateStr) && (
                         <div style={{ position: 'absolute', top: 4, right: 4, width: 8, height: 8, borderRadius: '50%', background: 'var(--success)', border: '1.5px solid var(--bg-primary)' }} title="Breeding date logged" />
                       )}
+                      {/* Expected whelp date ring marker */}
+                      {isExpectedWhelp && (
+                        <div style={{
+                          position: 'absolute',
+                          top: 2, right: dayCycles.some(c => c.breeding_date === dateStr) ? 14 : 4,
+                          width: 8, height: 8,
+                          borderRadius: '50%',
+                          background: WHELP_STYLE.dot,
+                          border: '1.5px solid var(--bg-primary)'
+                        }} title="Projected whelp date" />
+                      )}
                     </>
                   )}
                 </div>
@@ -479,6 +657,7 @@ export default function BreedingCalendar() {
               const win = getWindowForDate(c, today)
               const ws = win ? WINDOW_STYLES[win] : null
               const daysSince = Math.round((new Date(today) - new Date(c.start_date + 'T00:00:00')) / 86400000)
+              const projWhelp = getWhelpDates(c)
               return (
                 <div
                   key={c.id}
@@ -502,6 +681,52 @@ export default function BreedingCalendar() {
                       <CheckCircle2 size={13} /> Bred {fmt(c.breeding_date)}
                     </div>
                   )}
+                  {/* Projected whelp date on card */}
+                  {projWhelp && (
+                    <div style={{
+                      marginTop: '0.4rem',
+                      display: 'flex',
+                      alignItems: 'center',
+                      gap: '0.4rem',
+                      fontSize: '0.8rem',
+                      color: WHELP_STYLE.dot,
+                      fontWeight: 500
+                    }}>
+                      <Baby size={13} />
+                      Whelp est. {fmt(projWhelp.expected)}
+                      <span style={{ fontSize: '0.73rem', color: 'var(--text-muted)', fontWeight: 400 }}>
+                        ({fmt(projWhelp.earliest)}–{fmt(projWhelp.latest)})
+                      </span>
+                      {/* Jump-to-month button if whelp month differs from current view */}
+                      {(() => {
+                        const wd = new Date(projWhelp.expected + 'T00:00:00')
+                        const wdY = wd.getFullYear()
+                        const wdM = wd.getMonth()
+                        if (wdY !== year || wdM !== month) {
+                          return (
+                            <button
+                              style={{
+                                marginLeft: 'auto',
+                                background: 'none',
+                                border: `1px solid ${WHELP_STYLE.border}`,
+                                borderRadius: '0.25rem',
+                                color: WHELP_STYLE.dot,
+                                fontSize: '0.7rem',
+                                padding: '0.1rem 0.35rem',
+                                cursor: 'pointer',
+                                fontWeight: 600,
+                                whiteSpace: 'nowrap'
+                              }}
+                              onClick={e => { e.stopPropagation(); goToMonth(wdY, wdM) }}
+                            >
+                              View {MONTH_NAMES[wdM].slice(0,3)} {wdY}
+                            </button>
+                          )
+                        }
+                        return null
+                      })()}
+                    </div>
+                  )}
                 </div>
               )
             })}
@@ -509,6 +734,34 @@ export default function BreedingCalendar() {
         )}
       </div>
 
+      {/* Whelping cycles banner — shown if any projected whelps fall this month but no active heat */}
+      {whelpingThisMonth.length > 0 && activeCycles.length === 0 && (
+        <div style={{
+          marginTop: '1.5rem',
+          padding: '1rem',
+          background: WHELP_STYLE.bg,
+          border: `1px solid ${WHELP_STYLE.border}`,
+          borderRadius: 'var(--radius)',
+          display: 'flex',
+          alignItems: 'flex-start',
+          gap: '0.75rem'
+        }}>
+          <Baby size={18} style={{ color: WHELP_STYLE.dot, flexShrink: 0, marginTop: 2 }} />
+          <div>
+            <div style={{ fontWeight: 600, color: WHELP_STYLE.dot, marginBottom: '0.3rem' }}>Projected Whelping This Month</div>
+            {whelpingThisMonth.map(c => {
+              const wd = getWhelpDates(c)
+              return (
+                <div key={c.id} style={{ fontSize: '0.85rem', color: 'var(--text-secondary)', marginBottom: '0.2rem' }}>
+                  <strong>{c.dog_name}</strong> — expected {fmt(wd.expected)}
+                  <span style={{ color: 'var(--text-muted)', fontSize: '0.78rem' }}> (range {fmt(wd.earliest)}–{fmt(wd.latest)})</span>
+                </div>
+              )
+            })}
+          </div>
+        </div>
+      )}
+
       {/* Modals */}
       {showStartModal && (
         <StartCycleModal
@@ -522,6 +775,7 @@ export default function BreedingCalendar() {
           cycle={selectedCycle}
           onClose={() => setSelectedCycle(null)}
           onDeleted={() => { setSelectedCycle(null); load() }}
+          onRecordLitter={handleRecordLitter}
         />
       )}
     </div>

client/src/pages/Dashboard.jsx

@@ -21,21 +21,21 @@ function Dashboard() {
   const fetchDashboardData = async () => {
     try {
       const [dogsRes, littersRes, heatCyclesRes] = await Promise.all([
-        axios.get('/api/dogs'),
+        axios.get('/api/dogs', { params: { page: 1, limit: 8 } }),
-        axios.get('/api/litters'),
+        axios.get('/api/litters', { params: { page: 1, limit: 1 } }),
         axios.get('/api/breeding/heat-cycles/active')
       ])
 
-      const dogs = dogsRes.data
+      const { data: recentDogsList, stats: dogStats } = dogsRes.data
       setStats({
-        totalDogs: dogs.length,
+        totalDogs: dogStats?.total ?? 0,
-        males: dogs.filter(d => d.sex === 'male').length,
+        males: dogStats?.males ?? 0,
-        females: dogs.filter(d => d.sex === 'female').length,
+        females: dogStats?.females ?? 0,
-        totalLitters: littersRes.data.length,
+        totalLitters: littersRes.data.total,
         activeHeatCycles: heatCyclesRes.data.length
       })
 
-      setRecentDogs(dogs.slice(0, 8))
+      setRecentDogs(recentDogsList)
       setLoading(false)
     } catch (error) {
       console.error('Error fetching dashboard data:', error)

client/src/pages/DogDetail.jsx

@@ -3,6 +3,11 @@ import { useParams, Link, useNavigate } from 'react-router-dom'
 import { Dog, GitBranch, Edit, Upload, Trash2, ArrowLeft, Calendar, Hash, Award } from 'lucide-react'
 import axios from 'axios'
 import DogForm from '../components/DogForm'
+import { ChampionBadge, ChampionBloodlineBadge } from '../components/ChampionBadge'
+import ClearanceSummaryCard from '../components/ClearanceSummaryCard'
+import HealthRecordForm from '../components/HealthRecordForm'
+import GeneticPanelCard from '../components/GeneticPanelCard'
+import { ShieldCheck } from 'lucide-react'
 
 function DogDetail() {
   const { id } = useParams()
@@ -14,9 +19,13 @@ function DogDetail() {
   const [selectedPhoto, setSelectedPhoto] = useState(0)
   const fileInputRef = useRef(null)
 
-  useEffect(() => {
+  // Health records state
-    fetchDog()
+  const [healthRecords, setHealthRecords]     = useState([])
-  }, [id])
+  const [showHealthForm, setShowHealthForm]   = useState(false)
+  const [editingRecord, setEditingRecord]     = useState(null)
+
+  useEffect(() => { fetchDog() }, [id])
+  useEffect(() => { fetchHealth() }, [id])
 
   const fetchDog = async () => {
     try {
@@ -29,14 +38,18 @@ function DogDetail() {
     }
   }
 
+  const fetchHealth = () => {
+    axios.get(`/api/health/dog/${id}`)
+      .then(r => setHealthRecords(r.data))
+      .catch(() => {})
+  }
+
   const handlePhotoUpload = async (e) => {
     const file = e.target.files[0]
     if (!file) return
-
     setUploading(true)
     const formData = new FormData()
     formData.append('photo', file)
-
     try {
       await axios.post(`/api/dogs/${id}/photos`, formData, {
         headers: { 'Content-Type': 'multipart/form-data' }
@@ -53,7 +66,6 @@ function DogDetail() {
 
   const handleDeletePhoto = async (photoIndex) => {
     if (!confirm('Delete this photo?')) return
-
     try {
       await axios.delete(`/api/dogs/${id}/photos/${photoIndex}`)
       fetchDog()
@@ -72,24 +84,25 @@ function DogDetail() {
     const birth = new Date(birthDate)
     let years  = today.getFullYear() - birth.getFullYear()
     let months = today.getMonth() - birth.getMonth()
-    
+    if (months < 0) { years--; months += 12 }
-    if (months < 0) {
-      years--
-      months += 12
-    }
-    
     if (years === 0) return `${months} month${months !== 1 ? 's' : ''}`
     if (months === 0) return `${years} year${years !== 1 ? 's' : ''}`
     return `${years}y ${months}m`
   }
 
-  if (loading) {
+  const hasChampionBlood = (d) =>
-    return <div className="container loading">Loading...</div>
+    (d.sire && d.sire.is_champion) || (d.dam && d.dam.is_champion)
-  }
 
-  if (!dog) {
+  const openAddHealth = () => { setEditingRecord(null); setShowHealthForm(true) }
-    return <div className="container">Dog not found</div>
+  const openEditHealth = (rec) => { setEditingRecord(rec); setShowHealthForm(true) }
-  }
+  const closeHealthForm = () => { setShowHealthForm(false); setEditingRecord(null) }
+  const handleHealthSaved = () => { closeHealthForm(); fetchHealth() }
+
+  if (loading) return <div className="container loading">Loading...</div>
+  if (!dog)    return <div className="container">Dog not found</div>
+
+  const isChampion   = !!dog.is_champion
+  const hasBloodline = !isChampion && hasChampionBlood(dog)
 
   return (
     <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem' }}>
@@ -99,14 +112,18 @@ function DogDetail() {
           <ArrowLeft size={20} />
         </button>
         <div style={{ flex: 1 }}>
-          <h1 style={{ marginBottom: '0.25rem' }}>{dog.name}</h1>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '0.625rem', flexWrap: 'wrap', marginBottom: '0.25rem' }}>
+            <h1 style={{ margin: 0 }}>{dog.name}</h1>
+            {isChampion  && <ChampionBadge size="lg" />}
+            {hasBloodline && <ChampionBloodlineBadge size="lg" />}
+          </div>
           <div style={{ display: 'flex', alignItems: 'center', gap: '1rem', color: 'var(--text-secondary)' }}>
             <span>{dog.breed}</span>
-            <span>•</span>
+            <span>·</span>
-            <span>{dog.sex === 'male' ? 'Male ♂' : 'Female ♀'}</span>
+            <span>{dog.sex === 'male' ? 'Male' : 'Female'}</span>
             {dog.birth_date && (
               <>
-                <span>•</span>
+                <span>·</span>
                 <span>{calculateAge(dog.birth_date)}</span>
               </>
             )}
@@ -125,7 +142,7 @@ function DogDetail() {
       </div>
 
       <div style={{ display: 'grid', gridTemplateColumns: '1fr 2fr', gap: '1.5rem', marginBottom: '1.5rem' }}>
-        {/* Photo Section - Compact */}
+        {/* Photo Section */}
         <div className="card" style={{ padding: '1rem' }}>
           <div style={{ marginBottom: '0.75rem', display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
             <h3 style={{ fontSize: '0.875rem', textTransform: 'uppercase', letterSpacing: '0.05em', color: 'var(--text-muted)' }}>Photos</h3>
@@ -138,46 +155,42 @@ function DogDetail() {
               <Upload size={14} />
               {uploading ? 'Uploading...' : 'Add'}
             </button>
-            <input 
+            <input ref={fileInputRef} type="file" accept="image/*" onChange={handlePhotoUpload} style={{ display: 'none' }} />
-              ref={fileInputRef}
-              type="file" 
-              accept="image/*" 
-              onChange={handlePhotoUpload} 
-              style={{ display: 'none' }}
-            />
           </div>
 
           {dog.photo_urls && dog.photo_urls.length > 0 ? (
             <>
-              {/* Main Photo */}
               <div style={{ position: 'relative', marginBottom: '0.75rem' }}>
                 <img
                   src={dog.photo_urls[selectedPhoto]}
                   alt={dog.name}
                   style={{
-                    width: '100%', 
+                    width: '100%', aspectRatio: '1', objectFit: 'cover',
-                    aspectRatio: '1', 
-                    objectFit: 'cover', 
                     borderRadius: 'var(--radius)',
-                    border: '1px solid var(--border)'
+                    border: isChampion
+                      ? '2px solid var(--champion-gold)'
+                      : hasBloodline
+                        ? '2px solid var(--bloodline-amber)'
+                        : '1px solid var(--border)',
+                    boxShadow: isChampion
+                      ? '0 0 12px var(--champion-glow)'
+                      : hasBloodline
+                        ? '0 0 10px var(--bloodline-glow)'
+                        : 'none'
                   }}
                 />
                 <button
                   className="btn-icon"
                   onClick={() => handleDeletePhoto(selectedPhoto)}
                   style={{
-                    position: 'absolute', 
+                    position: 'absolute', top: '0.5rem', right: '0.5rem',
-                    top: '0.5rem', 
+                    background: 'rgba(14, 15, 12, 0.8)',
-                    right: '0.5rem', 
-                    background: 'rgba(15, 23, 42, 0.8)',
                     backdropFilter: 'blur(8px)'
                   }}
                 >
                   <Trash2 size={16} color="var(--danger)" />
                 </button>
               </div>
-              
-              {/* Thumbnail Strip */}
               {dog.photo_urls.length > 1 && (
                 <div style={{ display: 'flex', gap: '0.5rem', overflowX: 'auto' }}>
                   {dog.photo_urls.map((url, index) => (
@@ -187,11 +200,8 @@ function DogDetail() {
                       alt={`${dog.name} ${index + 1}`}
                       onClick={() => setSelectedPhoto(index)}
                       style={{
-                        width: '60px',
+                        width: '60px', height: '60px', objectFit: 'cover',
-                        height: '60px',
+                        borderRadius: 'var(--radius-sm)', cursor: 'pointer',
-                        objectFit: 'cover',
-                        borderRadius: 'var(--radius-sm)',
-                        cursor: 'pointer',
                         border: selectedPhoto === index ? '2px solid var(--primary)' : '1px solid var(--border)',
                         opacity: selectedPhoto === index ? 1 : 0.6,
                         transition: 'all 0.2s'
@@ -213,18 +223,26 @@ function DogDetail() {
         <div>
           <div className="card" style={{ marginBottom: '1.5rem' }}>
             <h2 style={{ fontSize: '1rem', marginBottom: '1rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Details</h2>
-            
             <div>
               <div className="info-row">
                 <span className="info-label">Breed</span>
                 <span className="info-value">{dog.breed}</span>
               </div>
-              
               <div className="info-row">
                 <span className="info-label">Sex</span>
-                <span className="info-value">{dog.sex === 'male' ? 'Male ♂' : 'Female ♀'}</span>
+                <span className="info-value">{dog.sex === 'male' ? 'Male' : 'Female'}</span>
+              </div>
+              <div className="info-row">
+                <span className="info-label">Champion</span>
+                <span className="info-value">
+                  {isChampion
+                    ? <ChampionBadge size="lg" />
+                    : hasBloodline
+                      ? <ChampionBloodlineBadge size="lg" />
+                      : <span style={{ color: 'var(--text-muted)', fontStyle: 'italic' }}>&mdash;</span>
+                  }
+                </span>
               </div>
-              
               {dog.birth_date && (
                 <div className="info-row">
                   <span className="info-label"><Calendar size={14} style={{ display: 'inline', marginRight: '0.25rem' }} />Birth Date</span>
@@ -234,21 +252,30 @@ function DogDetail() {
                   </span>
                 </div>
               )}
-              
               {dog.color && (
                 <div className="info-row">
                   <span className="info-label">Color</span>
                   <span className="info-value">{dog.color}</span>
                 </div>
               )}
-              
               {dog.registration_number && (
                 <div className="info-row">
                   <span className="info-label"><Award size={14} style={{ display: 'inline', marginRight: '0.25rem' }} />Registration</span>
                   <span className="info-value" style={{ fontFamily: 'monospace' }}>{dog.registration_number}</span>
                 </div>
               )}
-              
+              {dog.chic_number && (
+                <div className="info-row">
+                  <span className="info-label"><ShieldCheck size={14} style={{ display: 'inline', marginRight: '0.25rem' }} />CHIC Status</span>
+                  <span className="info-value">
+                    <span style={{
+                      fontSize: '0.75rem', fontWeight: 600, padding: '0.2rem 0.6rem',
+                      background: 'rgba(99,102,241,0.15)', color: '#818cf8',
+                      borderRadius: '999px', border: '1px solid rgba(99,102,241,0.3)'
+                    }}>CHIC #{dog.chic_number}</span>
+                  </span>
+                </div>
+              )}
               {dog.microchip && (
                 <div className="info-row">
                   <span className="info-label"><Hash size={14} style={{ display: 'inline', marginRight: '0.25rem' }} />Microchip</span>
@@ -265,9 +292,12 @@ function DogDetail() {
               <div>
                 <div style={{ fontSize: '0.8125rem', color: 'var(--text-muted)', marginBottom: '0.5rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Sire</div>
                 {dog.sire ? (
+                  <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', flexWrap: 'wrap' }}>
                     <Link to={`/dogs/${dog.sire.id}`} style={{ color: 'var(--primary)', fontWeight: 500, textDecoration: 'none' }}>
                       {dog.sire.name}
                     </Link>
+                    {dog.sire.is_champion && <ChampionBadge />}
+                  </div>
                 ) : (
                   <span style={{ color: 'var(--text-muted)', fontStyle: 'italic' }}>Unknown</span>
                 )}
@@ -275,9 +305,12 @@ function DogDetail() {
               <div>
                 <div style={{ fontSize: '0.8125rem', color: 'var(--text-muted)', marginBottom: '0.5rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Dam</div>
                 {dog.dam ? (
+                  <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', flexWrap: 'wrap' }}>
                     <Link to={`/dogs/${dog.dam.id}`} style={{ color: 'var(--primary)', fontWeight: 500, textDecoration: 'none' }}>
                       {dog.dam.name}
                     </Link>
+                    {dog.dam.is_champion && <ChampionBadge />}
+                  </div>
                 ) : (
                   <span style={{ color: 'var(--text-muted)', fontStyle: 'italic' }}>Unknown</span>
                 )}
@@ -295,6 +328,52 @@ function DogDetail() {
         </div>
       )}
 
+      {/* OFA Clearance Summary */}
+      <ClearanceSummaryCard dogId={id} onAddRecord={openAddHealth} />
+
+      {/* DNA Genetics Panel */}
+      <GeneticPanelCard dogId={id} />
+
+      {/* Health Records List */}
+      {healthRecords.length > 0 && (
+        <div className="card" style={{ marginBottom: '1.5rem' }}>
+          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+            <h2 style={{ fontSize: '1rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em', margin: 0 }}>
+              Health Records ({healthRecords.length})
+            </h2>
+            <button className="btn btn-ghost" style={{ fontSize: '0.8rem', padding: '0.35rem 0.75rem' }} onClick={openAddHealth}>
+              + Add
+            </button>
+          </div>
+          <div style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}>
+            {healthRecords.map(rec => (
+              <div key={rec.id} style={{
+                display: 'flex', alignItems: 'center', gap: '0.75rem',
+                padding: '0.6rem 0.75rem', background: 'var(--bg-primary)',
+                borderRadius: 'var(--radius-sm)', border: '1px solid var(--border)',
+              }}>
+                <div style={{ flex: 1 }}>
+                  <span style={{ fontWeight: 500, fontSize: '0.875rem' }}>
+                    {rec.test_name || (rec.test_type ? rec.test_type.replace(/_/g, ' ') : rec.record_type)}
+                  </span>
+                  {rec.ofa_result && (
+                    <span style={{ marginLeft: '0.5rem', fontSize: '0.75rem', color: 'var(--text-muted)' }}>
+                      {rec.ofa_result}{rec.ofa_number ? ` · ${rec.ofa_number}` : ''}
+                    </span>
+                  )}
+                </div>
+                <span style={{ fontSize: '0.8rem', color: 'var(--text-muted)', whiteSpace: 'nowrap' }}>
+                  {rec.test_date ? new Date(rec.test_date).toLocaleDateString() : ''}
+                </span>
+                <button className="btn-icon" style={{ padding: '0.2rem' }} onClick={() => openEditHealth(rec)}>
+                  <Edit size={14} />
+                </button>
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+
       {/* Offspring */}
       {dog.offspring && dog.offspring.length > 0 && (
         <div className="card">
@@ -313,33 +392,45 @@ function DogDetail() {
                   transition: 'var(--transition)',
                   display: 'flex',
                   justifyContent: 'space-between',
-                  alignItems: 'center'
+                  alignItems: 'center',
+                  gap: '0.5rem'
                 }}
-                onMouseEnter={(e) => {
+                onMouseEnter={e => {
                   e.currentTarget.style.borderColor = 'var(--primary)'
                   e.currentTarget.style.background  = 'var(--bg-tertiary)'
                 }}
-                onMouseLeave={(e) => {
+                onMouseLeave={e => {
                   e.currentTarget.style.borderColor = 'var(--border)'
                   e.currentTarget.style.background  = 'var(--bg-primary)'
                 }}
               >
                 <span style={{ color: 'var(--text-primary)', fontWeight: 500 }}>{child.name}</span>
-                <span style={{ fontSize: '1.125rem' }}>{child.sex === 'male' ? '♂' : '♀'}</span>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.35rem' }}>
+                  {child.is_champion && <ChampionBadge />}
+                  <span style={{ fontSize: '1.125rem' }}>{child.sex === 'male' ? '' : ''}</span>
+                </div>
               </Link>
             ))}
           </div>
         </div>
       )}
 
+      {/* Edit Dog Modal */}
       {showEditModal && (
         <DogForm
           dog={dog}
           onClose={() => setShowEditModal(false)}
-          onSave={() => {
+          onSave={() => { fetchDog(); setShowEditModal(false) }}
-            fetchDog()
+        />
-            setShowEditModal(false)
+      )}
-          }}
+
+      {/* Health Record Form Modal */}
+      {showHealthForm && (
+        <HealthRecordForm
+          dogId={id}
+          record={editingRecord}
+          onClose={closeHealthForm}
+          onSave={handleHealthSaved}
         />
       )}
     </div>

client/src/pages/DogList.jsx

@@ -1,56 +1,78 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useState, useRef } from 'react'
-import { Link } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
-import { Dog, Plus, Search, Calendar, Hash, ArrowRight } from 'lucide-react'
+import { Dog, Plus, Search, Calendar, Hash, ArrowRight, Trash2 } from 'lucide-react'
 import axios from 'axios'
 import DogForm from '../components/DogForm'
+import { ChampionBadge, ChampionBloodlineBadge } from '../components/ChampionBadge'
+
+const LIMIT = 50
 
 function DogList() {
   const [dogs, setDogs] = useState([])
-  const [filteredDogs, setFilteredDogs] = useState([])
+  const [total, setTotal] = useState(0)
+  const [page, setPage] = useState(1)
   const [search, setSearch] = useState('')
   const [sexFilter, setSexFilter] = useState('all')
   const [loading, setLoading] = useState(true)
   const [showAddModal, setShowAddModal] = useState(false)
+  const [deleteTarget, setDeleteTarget] = useState(null)  // { id, name }
+  const [deleting, setDeleting] = useState(false)
+  const searchTimerRef = useRef(null)
 
-  useEffect(() => {
+  useEffect(() => { fetchDogs(1, '', 'all') }, [])  // eslint-disable-line
-    fetchDogs()
-  }, [])
 
-  useEffect(() => {
+  const fetchDogs = async (p, q, s) => {
-    filterDogs()
+    setLoading(true)
-  }, [dogs, search, sexFilter])
-
-  const fetchDogs = async () => {
     try {
-      const res = await axios.get('/api/dogs')
+      const params = { page: p, limit: LIMIT }
-      setDogs(res.data)
+      if (q) params.search = q
-      setLoading(false)
+      if (s !== 'all') params.sex = s
+      const res = await axios.get('/api/dogs', { params })
+      setDogs(res.data.data)
+      setTotal(res.data.total)
+      setPage(p)
     } catch (error) {
       console.error('Error fetching dogs:', error)
+    } finally {
       setLoading(false)
     }
   }
 
-  const filterDogs = () => {
+  const handleSearchChange = (value) => {
-    let filtered = dogs
+    setSearch(value)
-
+    if (searchTimerRef.current) clearTimeout(searchTimerRef.current)
-    if (search) {
+    searchTimerRef.current = setTimeout(() => fetchDogs(1, value, sexFilter), 300)
-      filtered = filtered.filter(dog =>
-        dog.name.toLowerCase().includes(search.toLowerCase()) ||
-        (dog.registration_number && dog.registration_number.toLowerCase().includes(search.toLowerCase()))
-      )
   }
 
-    if (sexFilter !== 'all') {
+  const handleSexChange = (value) => {
-      filtered = filtered.filter(dog => dog.sex === sexFilter)
+    setSexFilter(value)
+    fetchDogs(1, search, value)
   }
 
-    setFilteredDogs(filtered)
+  const handleClearFilters = () => {
+    setSearch('')
+    setSexFilter('all')
+    fetchDogs(1, '', 'all')
   }
 
-  const handleSave = () => {
+  const handleSave = () => { fetchDogs(page, search, sexFilter) }
-    fetchDogs()
+
+  const handleDelete = async () => {
+    if (!deleteTarget) return
+    setDeleting(true)
+    try {
+      await axios.delete(`/api/dogs/${deleteTarget.id}`)
+      setDeleteTarget(null)
+      fetchDogs(page, search, sexFilter)
+    } catch (err) {
+      console.error('Delete failed:', err)
+      alert('Failed to delete dog. Please try again.')
+    } finally {
+      setDeleting(false)
     }
+  }
+
+  const totalPages = Math.ceil(total / LIMIT)
 
   const calculateAge = (birthDate) => {
     if (!birthDate) return null
@@ -58,17 +80,15 @@ function DogList() {
     const birth = new Date(birthDate)
     let years = today.getFullYear() - birth.getFullYear()
     let months = today.getMonth() - birth.getMonth()
-    
+    if (months < 0) { years--; months += 12 }
-    if (months < 0) {
-      years--
-      months += 12
-    }
-    
     if (years === 0) return `${months}mo`
     if (months === 0) return `${years}y`
     return `${years}y ${months}mo`
   }
 
+  const hasChampionBlood = (dog) =>
+    (dog.sire && dog.sire.is_champion) || (dog.dam && dog.dam.is_champion)
+
   if (loading) {
     return <div className="container loading">Loading dogs...</div>
   }
@@ -79,7 +99,7 @@ function DogList() {
         <div>
           <h1 style={{ marginBottom: '0.25rem' }}>Dogs</h1>
           <p style={{ color: 'var(--text-secondary)', fontSize: '0.875rem' }}>
-            {filteredDogs.length} {filteredDogs.length === 1 ? 'dog' : 'dogs'}
+            {total} {total === 1 ? 'dog' : 'dogs'}
             {search || sexFilter !== 'all' ? ' matching filters' : ' total'}
           </p>
         </div>
@@ -99,11 +119,11 @@ function DogList() {
               className="input"
               placeholder="Search by name or registration..."
               value={search}
-              onChange={(e) => setSearch(e.target.value)}
+              onChange={(e) => handleSearchChange(e.target.value)}
               style={{ paddingLeft: '2.75rem' }}
             />
           </div>
-          <select className="input" value={sexFilter} onChange={(e) => setSexFilter(e.target.value)} style={{ width: '140px' }}>
+          <select className="input" value={sexFilter} onChange={(e) => handleSexChange(e.target.value)} style={{ width: '140px' }}>
             <option value="all">All Dogs</option>
             <option value="male">Males ♂</option>
             <option value="female">Females ♀</option>
@@ -111,10 +131,7 @@ function DogList() {
           {(search || sexFilter !== 'all') && (
             <button
               className="btn btn-ghost"
-              onClick={() => {
+              onClick={handleClearFilters}
-                setSearch('')
-                setSexFilter('all')
-              }}
               style={{ padding: '0.625rem 1rem', fontSize: '0.875rem' }}
             >
               Clear
@@ -124,7 +141,7 @@ function DogList() {
       </div>
 
       {/* Dogs List */}
-      {filteredDogs.length === 0 ? (
+      {dogs.length === 0 ? (
         <div className="card" style={{ textAlign: 'center', padding: '4rem 2rem' }}>
           <Dog size={64} style={{ color: 'var(--text-muted)', margin: '0 auto 1rem', opacity: 0.5 }} />
           <h3 style={{ marginBottom: '0.5rem' }}>
@@ -144,19 +161,16 @@ function DogList() {
         </div>
       ) : (
         <div style={{ display: 'grid', gap: '1rem' }}>
-          {filteredDogs.map(dog => (
+          {dogs.map(dog => (
-            <Link 
+            <div
               key={dog.id}
-              to={`/dogs/${dog.id}`} 
               className="card"
               style={{
                 padding: '1rem',
-                textDecoration: 'none', 
                 display: 'flex',
                 gap: '1rem',
                 alignItems: 'center',
                 transition: 'var(--transition)',
-                cursor: 'pointer'
               }}
               onMouseEnter={(e) => {
                 e.currentTarget.style.borderColor = 'var(--primary)'
@@ -169,65 +183,68 @@ function DogList() {
                 e.currentTarget.style.boxShadow = 'var(--shadow-sm)'
               }}
             >
-              {/* Avatar Photo */}
+              {/* Avatar */}
+              <Link
+                to={`/dogs/${dog.id}`}
+                style={{ flexShrink: 0, textDecoration: 'none' }}
+              >
                 <div style={{
-                width: '80px',
+                  width: '80px', height: '80px',
-                height: '80px',
-                flexShrink: 0,
                   borderRadius: 'var(--radius)',
                   background: 'var(--bg-primary)',
-                border: '2px solid var(--border)',
+                  border: dog.is_champion
-                display: 'flex',
+                    ? '2px solid var(--champion-gold)'
-                alignItems: 'center',
+                    : hasChampionBlood(dog)
-                justifyContent: 'center',
+                      ? '2px solid var(--bloodline-amber)'
-                overflow: 'hidden'
+                      : '2px solid var(--border)',
+                  display: 'flex', alignItems: 'center', justifyContent: 'center',
+                  overflow: 'hidden',
+                  boxShadow: dog.is_champion
+                    ? '0 0 8px var(--champion-glow)'
+                    : hasChampionBlood(dog)
+                      ? '0 0 8px var(--bloodline-glow)'
+                      : 'none'
                 }}>
                   {dog.photo_urls && dog.photo_urls.length > 0 ? (
                     <img
                       src={dog.photo_urls[0]}
                       alt={dog.name}
-                    style={{ 
+                      style={{ width: '100%', height: '100%', objectFit: 'cover' }}
-                      width: '100%', 
-                      height: '100%', 
-                      objectFit: 'cover'
-                    }} 
                     />
                   ) : (
                     <Dog size={32} style={{ color: 'var(--text-muted)', opacity: 0.5 }} />
                   )}
                 </div>
+              </Link>
 
-              {/* Info Section */}
+              {/* Info — clicking navigates to detail */}
-              <div style={{ flex: 1, minWidth: 0 }}>
+              <Link
+                to={`/dogs/${dog.id}`}
+                style={{ flex: 1, minWidth: 0, textDecoration: 'none', color: 'inherit' }}
+              >
                 <h3 style={{
                   fontSize: '1.125rem',
-                  marginBottom: '0.375rem',
+                  marginBottom: '0.25rem',
-                  overflow: 'hidden',
+                  display: 'flex', alignItems: 'center', gap: '0.5rem',
-                  textOverflow: 'ellipsis',
+                  flexWrap: 'wrap'
-                  whiteSpace: 'nowrap'
                 }}>
+                  <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
                     {dog.name}
-                  <span style={{ 
+                  </span>
-                    marginLeft: '0.5rem', 
+                  <span style={{ color: dog.sex === 'male' ? 'var(--primary)' : '#ec4899', fontSize: '1rem' }}>
-                    fontSize: '1rem',
-                    color: dog.sex === 'male' ? 'var(--primary)' : '#ec4899'
-                  }}>
                     {dog.sex === 'male' ? '♂' : '♀'}
                   </span>
+                  {dog.is_champion ? <ChampionBadge /> : hasChampionBlood(dog) ? <ChampionBloodlineBadge /> : null}
                 </h3>
 
                 <div style={{
-                  display: 'flex',
+                  display: 'flex', flexWrap: 'wrap', gap: '0.75rem',
-                  flexWrap: 'wrap',
+                  fontSize: '0.8125rem', color: 'var(--text-secondary)', marginBottom: '0.5rem'
-                  gap: '0.75rem',
-                  fontSize: '0.8125rem',
-                  color: 'var(--text-secondary)',
-                  marginBottom: '0.5rem'
                 }}>
                   <span>{dog.breed}</span>
                   {dog.birth_date && (
                     <>
-                      <span>•</span>
+                      <span>·</span>
                       <span style={{ display: 'flex', alignItems: 'center', gap: '0.25rem' }}>
                         <Calendar size={12} />
                         {calculateAge(dog.birth_date)}
@@ -236,7 +253,7 @@ function DogList() {
                   )}
                   {dog.color && (
                     <>
-                      <span>•</span>
+                      <span>·</span>
                       <span>{dog.color}</span>
                     </>
                   )}
@@ -244,41 +261,158 @@ function DogList() {
 
                 {dog.registration_number && (
                   <div style={{
-                    display: 'inline-flex',
+                    display: 'inline-flex', alignItems: 'center', gap: '0.25rem',
-                    alignItems: 'center',
-                    gap: '0.25rem',
                     padding: '0.25rem 0.5rem',
                     background: 'var(--bg-primary)',
                     border: '1px solid var(--border)',
                     borderRadius: 'var(--radius-sm)',
-                    fontSize: '0.75rem',
+                    fontSize: '0.75rem', fontFamily: 'monospace',
-                    fontFamily: 'monospace',
                     color: 'var(--text-muted)'
                   }}>
                     <Hash size={10} />
                     {dog.registration_number}
                   </div>
                 )}
-              </div>
+                {dog.chic_number && (
-
-              {/* Arrow Indicator */}
                   <div style={{
-                opacity: 0.5,
+                    display: 'inline-flex', alignItems: 'center', gap: '0.25rem',
-                transition: 'var(--transition)'
+                    padding: '0.25rem 0.5rem',
+                    background: 'rgba(99,102,241,0.1)',
+                    border: '1px solid rgba(99,102,241,0.3)',
+                    borderRadius: 'var(--radius-sm)',
+                    fontSize: '0.75rem', fontWeight: 600,
+                    color: '#818cf8', marginLeft: '0.5rem'
                   }}>
-                <ArrowRight size={20} color="var(--text-muted)" />
+                    CHIC #{dog.chic_number}
                   </div>
+                )}
               </Link>
+
+              {/* Actions */}
+              <div style={{ display: 'flex', gap: '0.5rem', flexShrink: 0, alignItems: 'center' }}>
+                <Link
+                  to={`/dogs/${dog.id}`}
+                  style={{ opacity: 0.5, transition: 'var(--transition)', color: 'inherit' }}
+                >
+                  <ArrowRight size={20} color="var(--text-muted)" />
+                </Link>
+                <button
+                  className="btn btn-ghost"
+                  title={`Delete ${dog.name}`}
+                  onClick={(e) => { e.stopPropagation(); setDeleteTarget({ id: dog.id, name: dog.name }) }}
+                  style={{
+                    padding: '0.4rem',
+                    color: 'var(--text-muted)',
+                    border: '1px solid transparent',
+                    borderRadius: 'var(--radius-sm)',
+                    display: 'flex', alignItems: 'center',
+                    transition: 'var(--transition)'
+                  }}
+                  onMouseEnter={(e) => {
+                    e.currentTarget.style.color = '#ef4444'
+                    e.currentTarget.style.borderColor = '#ef4444'
+                    e.currentTarget.style.background = 'rgba(239,68,68,0.08)'
+                  }}
+                  onMouseLeave={(e) => {
+                    e.currentTarget.style.color = 'var(--text-muted)'
+                    e.currentTarget.style.borderColor = 'transparent'
+                    e.currentTarget.style.background = 'transparent'
+                  }}
+                >
+                  <Trash2 size={16} />
+                </button>
+              </div>
+            </div>
           ))}
         </div>
       )}
 
+      {/* Pagination */}
+      {totalPages > 1 && (
+        <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', gap: '1rem', marginTop: '1.5rem' }}>
+          <button
+            className="btn btn-ghost"
+            onClick={() => fetchDogs(page - 1, search, sexFilter)}
+            disabled={page <= 1 || loading}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Previous
+          </button>
+          <span style={{ color: 'var(--text-secondary)', fontSize: '0.875rem' }}>
+            Page {page} of {totalPages}
+          </span>
+          <button
+            className="btn btn-ghost"
+            onClick={() => fetchDogs(page + 1, search, sexFilter)}
+            disabled={page >= totalPages || loading}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Next
+          </button>
+        </div>
+      )}
+
+      {/* Add Dog Modal */}
       {showAddModal && (
         <DogForm
           onClose={() => setShowAddModal(false)}
           onSave={handleSave}
         />
       )}
+
+      {/* Delete Confirmation Modal */}
+      {deleteTarget && (
+        <div style={{
+          position: 'fixed', inset: 0,
+          background: 'rgba(0,0,0,0.65)',
+          display: 'flex', alignItems: 'center', justifyContent: 'center',
+          zIndex: 1000,
+          backdropFilter: 'blur(4px)'
+        }}>
+          <div className="card" style={{ maxWidth: 420, width: '90%', padding: '2rem', textAlign: 'center' }}>
+            <div style={{
+              width: 56, height: 56,
+              borderRadius: '50%',
+              background: 'rgba(239,68,68,0.12)',
+              display: 'flex', alignItems: 'center', justifyContent: 'center',
+              margin: '0 auto 1rem'
+            }}>
+              <Trash2 size={26} style={{ color: '#ef4444' }} />
+            </div>
+            <h3 style={{ margin: '0 0 0.5rem', fontSize: '1.25rem' }}>Delete Dog?</h3>
+            <p style={{ color: 'var(--text-secondary)', marginBottom: '1.75rem', lineHeight: 1.6 }}>
+              <strong style={{ color: 'var(--text-primary)' }}>{deleteTarget.name}</strong> will be
+              permanently removed along with all parent relationships, health records,
+              and heat cycles. This cannot be undone.
+            </p>
+            <div style={{ display: 'flex', gap: '0.75rem', justifyContent: 'center' }}>
+              <button
+                className="btn btn-ghost"
+                onClick={() => setDeleteTarget(null)}
+                disabled={deleting}
+                style={{ minWidth: 100 }}
+              >
+                Cancel
+              </button>
+              <button
+                className="btn"
+                onClick={handleDelete}
+                disabled={deleting}
+                style={{
+                  minWidth: 140,
+                  background: '#ef4444',
+                  color: '#fff',
+                  border: '1px solid #ef4444',
+                  display: 'flex', alignItems: 'center', justifyContent: 'center', gap: '0.5rem'
+                }}
+              >
+                <Trash2 size={15} />
+                {deleting ? 'Deleting…' : 'Yes, Delete'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   )
 }

client/src/pages/ExternalDogs.jsx

@@ -0,0 +1,389 @@
+import { useEffect, useState } from 'react'
+import { Link } from 'react-router-dom'
+import { Dog, Plus, Search, Calendar, Hash, ArrowRight, Trash2, ExternalLink } from 'lucide-react'
+import axios from 'axios'
+import DogForm from '../components/DogForm'
+import { ChampionBadge, ChampionBloodlineBadge } from '../components/ChampionBadge'
+
+function ExternalDogs() {
+  const [dogs, setDogs] = useState([])
+  const [filteredDogs, setFilteredDogs] = useState([])
+  const [search, setSearch] = useState('')
+  const [sexFilter, setSexFilter] = useState('all')
+  const [loading, setLoading] = useState(true)
+  const [showAddModal, setShowAddModal] = useState(false)
+  const [deleteTarget, setDeleteTarget] = useState(null)  // { id, name }
+  const [deleting, setDeleting] = useState(false)
+
+  useEffect(() => { fetchDogs() }, [])
+  useEffect(() => { filterDogs() }, [dogs, search, sexFilter])
+
+  const fetchDogs = async () => {
+    try {
+      const res = await axios.get('/api/dogs/external')
+      setDogs(res.data)
+      setLoading(false)
+    } catch (error) {
+      console.error('Error fetching external dogs:', error)
+      setLoading(false)
+    }
+  }
+
+  const filterDogs = () => {
+    let filtered = dogs
+    if (search) {
+      filtered = filtered.filter(dog =>
+        dog.name.toLowerCase().includes(search.toLowerCase()) ||
+        (dog.breed && dog.breed.toLowerCase().includes(search.toLowerCase())) ||
+        (dog.registration_number && dog.registration_number.toLowerCase().includes(search.toLowerCase()))
+      )
+    }
+    if (sexFilter !== 'all') {
+      filtered = filtered.filter(dog => dog.sex === sexFilter)
+    }
+    setFilteredDogs(filtered)
+  }
+
+  const handleDelete = async () => {
+    if (!deleteTarget) return
+    setDeleting(true)
+    try {
+      await axios.delete(`/api/dogs/${deleteTarget.id}`)
+      setDogs(prev => prev.filter(d => d.id !== deleteTarget.id))
+      setDeleteTarget(null)
+    } catch (err) {
+      console.error('Delete failed:', err)
+      alert('Failed to delete dog. Please try again.')
+    } finally {
+      setDeleting(false)
+    }
+  }
+
+  const calculateAge = (birthDate) => {
+    if (!birthDate) return null
+    const today = new Date()
+    const birth = new Date(birthDate)
+    let years = today.getFullYear() - birth.getFullYear()
+    let months = today.getMonth() - birth.getMonth()
+    if (months < 0) { years--; months += 12 }
+    if (years === 0) return `${months}mo`
+    if (months === 0) return `${years}y`
+    return `${years}y ${months}mo`
+  }
+
+  const hasChampionBlood = (dog) =>
+    (dog.sire && dog.sire.is_champion) || (dog.dam && dog.dam.is_champion)
+
+  if (loading) {
+    return <div className="container loading">Loading external dogs...</div>
+  }
+
+  return (
+    <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem' }}>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '2rem' }}>
+        <div>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem', marginBottom: '0.25rem' }}>
+            <ExternalLink size={28} style={{ color: 'var(--primary)' }} />
+            <h1 style={{ margin: 0 }}>External Dogs</h1>
+          </div>
+          <p style={{ color: 'var(--text-secondary)', fontSize: '0.875rem' }}>
+            {filteredDogs.length} {filteredDogs.length === 1 ? 'dog' : 'dogs'}
+            {search || sexFilter !== 'all' ? ' matching filters' : ' total'}
+          </p>
+        </div>
+        <button className="btn btn-primary" onClick={() => setShowAddModal(true)}>
+          <Plus size={18} />
+          Add External Dog
+        </button>
+      </div>
+
+      {/* Search and Filter Bar */}
+      <div className="card" style={{ marginBottom: '1.5rem', padding: '1rem' }}>
+        <div style={{ display: 'grid', gridTemplateColumns: '1fr auto auto', gap: '1rem', alignItems: 'center' }}>
+          <div style={{ position: 'relative' }}>
+            <Search size={18} style={{ position: 'absolute', left: '0.875rem', top: '50%', transform: 'translateY(-50%)', color: 'var(--text-muted)' }} />
+            <input
+              type="text"
+              className="input"
+              placeholder="Search by name or breed..."
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              style={{ paddingLeft: '2.75rem' }}
+            />
+          </div>
+          <select className="input" value={sexFilter} onChange={(e) => setSexFilter(e.target.value)} style={{ width: '160px' }}>
+            <option value="all">All Genders</option>
+            <option value="male">Sires (Male) ♂</option>
+            <option value="female">Dams (Female) ♀</option>
+          </select>
+          {(search || sexFilter !== 'all') && (
+            <button
+              className="btn btn-ghost"
+              onClick={() => { setSearch(''); setSexFilter('all') }}
+              style={{ padding: '0.625rem 1rem', fontSize: '0.875rem' }}
+            >
+              Clear
+            </button>
+          )}
+        </div>
+      </div>
+
+      {/* Dogs List */}
+      {filteredDogs.length === 0 ? (
+        <div className="card" style={{ textAlign: 'center', padding: '4rem 2rem' }}>
+          <ExternalLink size={64} style={{ color: 'var(--text-muted)', margin: '0 auto 1rem', opacity: 0.5 }} />
+          <h3 style={{ marginBottom: '0.5rem' }}>
+            {search || sexFilter !== 'all' ? 'No dogs found' : 'No external dogs yet'}
+          </h3>
+          <p style={{ color: 'var(--text-secondary)', marginBottom: '2rem' }}>
+            {search || sexFilter !== 'all'
+              ? 'Try adjusting your search or filters'
+              : 'Add sires, dams, or ancestors that aren\'t part of your kennel roster.'}
+          </p>
+          {!search && sexFilter === 'all' && (
+            <button className="btn btn-primary" onClick={() => setShowAddModal(true)}>
+              <Plus size={18} />
+              Add Your First External Dog
+            </button>
+          )}
+        </div>
+      ) : (
+        <div style={{ display: 'grid', gap: '1rem' }}>
+          {filteredDogs.map(dog => (
+            <div
+              key={dog.id}
+              className="card"
+              style={{
+                padding: '1rem',
+                display: 'flex',
+                gap: '1rem',
+                alignItems: 'center',
+                transition: 'var(--transition)',
+              }}
+              onMouseEnter={(e) => {
+                e.currentTarget.style.borderColor = 'var(--primary)'
+                e.currentTarget.style.transform = 'translateY(-2px)'
+                e.currentTarget.style.boxShadow = '0 8px 16px rgba(0, 0, 0, 0.3)'
+              }}
+              onMouseLeave={(e) => {
+                e.currentTarget.style.borderColor = 'var(--border)'
+                e.currentTarget.style.transform = 'translateY(0)'
+                e.currentTarget.style.boxShadow = 'var(--shadow-sm)'
+              }}
+            >
+              {/* Avatar */}
+              <Link
+                to={`/dogs/${dog.id}`}
+                style={{ flexShrink: 0, textDecoration: 'none' }}
+              >
+                <div style={{
+                  width: '80px', height: '80px',
+                  borderRadius: 'var(--radius)',
+                  background: 'var(--bg-primary)',
+                  border: dog.is_champion
+                    ? '2px solid var(--champion-gold)'
+                    : hasChampionBlood(dog)
+                      ? '2px solid var(--bloodline-amber)'
+                      : '2px solid var(--border)',
+                  display: 'flex', alignItems: 'center', justifyContent: 'center',
+                  overflow: 'hidden',
+                  position: 'relative',
+                  boxShadow: dog.is_champion
+                    ? '0 0 8px var(--champion-glow)'
+                    : hasChampionBlood(dog)
+                      ? '0 0 8px var(--bloodline-glow)'
+                      : 'none'
+                }}>
+                  {dog.photo_urls && dog.photo_urls.length > 0 ? (
+                    <img
+                      src={dog.photo_urls[0]}
+                      alt={dog.name}
+                      style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+                    />
+                  ) : (
+                    <Dog size={32} style={{ color: 'var(--text-muted)', opacity: 0.5 }} />
+                  )}
+                  <div style={{
+                    position: 'absolute',
+                    top: 0,
+                    right: 0,
+                    background: 'var(--bg-secondary)',
+                    borderBottomLeftRadius: 'var(--radius-sm)',
+                    padding: '2px 4px',
+                    fontSize: '0.625rem',
+                    fontWeight: 'bold',
+                    color: 'var(--text-muted)',
+                    borderLeft: '1px solid var(--border)',
+                    borderBottom: '1px solid var(--border)',
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: '2px'
+                  }}>
+                    <ExternalLink size={8} /> EXT
+                  </div>
+                </div>
+              </Link>
+
+              {/* Info — clicking navigates to detail */}
+              <Link
+                to={`/dogs/${dog.id}`}
+                style={{ flex: 1, minWidth: 0, textDecoration: 'none', color: 'inherit' }}
+              >
+                <h3 style={{
+                  fontSize: '1.125rem',
+                  marginBottom: '0.25rem',
+                  display: 'flex', alignItems: 'center', gap: '0.5rem',
+                  flexWrap: 'wrap'
+                }}>
+                  <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                    {dog.name}
+                  </span>
+                  <span style={{ color: dog.sex === 'male' ? 'var(--primary)' : '#ec4899', fontSize: '1rem' }}>
+                    {dog.sex === 'male' ? '♂' : '♀'}
+                  </span>
+                  {dog.is_champion ? <ChampionBadge /> : hasChampionBlood(dog) ? <ChampionBloodlineBadge /> : null}
+                </h3>
+
+                <div style={{
+                  display: 'flex', flexWrap: 'wrap', gap: '0.75rem',
+                  fontSize: '0.8125rem', color: 'var(--text-secondary)', marginBottom: '0.5rem'
+                }}>
+                  <span>{dog.breed}</span>
+                  {dog.birth_date && (
+                    <>
+                      <span>·</span>
+                      <span style={{ display: 'flex', alignItems: 'center', gap: '0.25rem' }}>
+                        <Calendar size={12} />
+                        {calculateAge(dog.birth_date)}
+                      </span>
+                    </>
+                  )}
+                  {dog.color && (
+                    <>
+                      <span>·</span>
+                      <span>{dog.color}</span>
+                    </>
+                  )}
+                </div>
+
+                {dog.registration_number && (
+                  <div style={{
+                    display: 'inline-flex', alignItems: 'center', gap: '0.25rem',
+                    padding: '0.25rem 0.5rem',
+                    background: 'var(--bg-primary)',
+                    border: '1px solid var(--border)',
+                    borderRadius: 'var(--radius-sm)',
+                    fontSize: '0.75rem', fontFamily: 'monospace',
+                    color: 'var(--text-muted)'
+                  }}>
+                    <Hash size={10} />
+                    {dog.registration_number}
+                  </div>
+                )}
+              </Link>
+
+              {/* Actions */}
+              <div style={{ display: 'flex', gap: '0.5rem', flexShrink: 0, alignItems: 'center' }}>
+                <Link
+                  to={`/dogs/${dog.id}`}
+                  style={{ opacity: 0.5, transition: 'var(--transition)', color: 'inherit' }}
+                >
+                  <ArrowRight size={20} color="var(--text-muted)" />
+                </Link>
+                <button
+                  className="btn btn-ghost"
+                  title={`Delete ${dog.name}`}
+                  onClick={(e) => { e.preventDefault(); e.stopPropagation(); setDeleteTarget({ id: dog.id, name: dog.name }) }}
+                  style={{
+                    padding: '0.4rem',
+                    color: 'var(--text-muted)',
+                    border: '1px solid transparent',
+                    borderRadius: 'var(--radius-sm)',
+                    display: 'flex', alignItems: 'center',
+                    transition: 'var(--transition)'
+                  }}
+                  onMouseEnter={(e) => {
+                    e.currentTarget.style.color = '#ef4444'
+                    e.currentTarget.style.borderColor = '#ef4444'
+                    e.currentTarget.style.background = 'rgba(239,68,68,0.08)'
+                  }}
+                  onMouseLeave={(e) => {
+                    e.currentTarget.style.color = 'var(--text-muted)'
+                    e.currentTarget.style.borderColor = 'transparent'
+                    e.currentTarget.style.background = 'transparent'
+                  }}
+                >
+                  <Trash2 size={16} />
+                </button>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+
+      {/* Add Dog Modal */}
+      {showAddModal && (
+        <DogForm
+          isExternal={true}
+          onClose={() => setShowAddModal(false)}
+          onSave={() => { fetchDogs(); setShowAddModal(false); }}
+        />
+      )}
+
+      {/* Delete Confirmation Modal */}
+      {deleteTarget && (
+        <div style={{
+          position: 'fixed', inset: 0,
+          background: 'rgba(0,0,0,0.65)',
+          display: 'flex', alignItems: 'center', justifyContent: 'center',
+          zIndex: 1000,
+          backdropFilter: 'blur(4px)'
+        }}>
+          <div className="card" style={{ maxWidth: 420, width: '90%', padding: '2rem', textAlign: 'center' }}>
+            <div style={{
+              width: 56, height: 56,
+              borderRadius: '50%',
+              background: 'rgba(239,68,68,0.12)',
+              display: 'flex', alignItems: 'center', justifyContent: 'center',
+              margin: '0 auto 1rem'
+            }}>
+              <Trash2 size={26} style={{ color: '#ef4444' }} />
+            </div>
+            <h3 style={{ margin: '0 0 0.5rem', fontSize: '1.25rem' }}>Delete External Dog?</h3>
+            <p style={{ color: 'var(--text-secondary)', marginBottom: '1.75rem', lineHeight: 1.6 }}>
+              <strong style={{ color: 'var(--text-primary)' }}>{deleteTarget.name}</strong> will be
+              permanently removed. This cannot be undone.
+            </p>
+            <div style={{ display: 'flex', gap: '0.75rem', justifyContent: 'center' }}>
+              <button
+                className="btn btn-ghost"
+                onClick={() => setDeleteTarget(null)}
+                disabled={deleting}
+                style={{ minWidth: 100 }}
+              >
+                Cancel
+              </button>
+              <button
+                className="btn"
+                onClick={handleDelete}
+                disabled={deleting}
+                style={{
+                  minWidth: 140,
+                  background: '#ef4444',
+                  color: '#fff',
+                  border: '1px solid #ef4444',
+                  display: 'flex', alignItems: 'center', justifyContent: 'center', gap: '0.5rem'
+                }}
+              >
+                <Trash2 size={15} />
+                {deleting ? 'Deleting…' : 'Yes, Delete'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default ExternalDogs

client/src/pages/LitterDetail.jsx

@@ -0,0 +1,543 @@
+import { useEffect, useState } from 'react'
+import { useParams, useNavigate } from 'react-router-dom'
+import { ArrowLeft, Plus, X, ExternalLink, Dog, Weight, ChevronDown, ChevronUp, Trash2 } from 'lucide-react'
+import axios from 'axios'
+import LitterForm from '../components/LitterForm'
+
+// ─── Puppy Log Panel ────────────────────────────────────────────────────────────
+function PuppyLogPanel({ litterId, puppy, whelpingDate }) {
+  const [open, setOpen] = useState(false)
+  const [logs, setLogs] = useState([])
+  const [loading, setLoading] = useState(false)
+  const [showAdd, setShowAdd] = useState(false)
+  const [form, setForm] = useState({
+    record_date: whelpingDate || '',
+    weight_oz: '',
+    weight_lbs: '',
+    notes: '',
+    record_type: 'weight_log'
+  })
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => { if (open) fetchLogs() }, [open])
+
+  const fetchLogs = async () => {
+    setLoading(true)
+    try {
+      const res = await axios.get(`/api/litters/${litterId}/puppies/${puppy.id}/logs`)
+      const parsed = res.data.map(l => {
+        try { return { ...l, _data: JSON.parse(l.description) } } catch { return { ...l, _data: {} } }
+      })
+      setLogs(parsed)
+    } catch (e) { console.error(e) }
+    finally { setLoading(false) }
+  }
+
+  const handleAdd = async () => {
+    if (!form.record_date) return
+    setSaving(true)
+    try {
+      await axios.post(`/api/litters/${litterId}/puppies/${puppy.id}/logs`, form)
+      setShowAdd(false)
+      setForm(f => ({ ...f, weight_oz: '', weight_lbs: '', notes: '' }))
+      fetchLogs()
+    } catch (e) { console.error(e) }
+    finally { setSaving(false) }
+  }
+
+  const handleDelete = async (logId) => {
+    if (!window.confirm('Delete this log entry?')) return
+    try {
+      await axios.delete(`/api/litters/${litterId}/puppies/${puppy.id}/logs/${logId}`)
+      fetchLogs()
+    } catch (e) { console.error(e) }
+  }
+
+  const TYPES = [
+    { value: 'weight_log', label: '⚖️ Weight Check' },
+    { value: 'health_note', label: '📝 Health Note' },
+    { value: 'deworming', label: '🐛 Deworming' },
+    { value: 'vaccination', label: '💉 Vaccination' },
+  ]
+
+  return (
+    <div style={{ borderTop: '1px solid var(--border)', marginTop: '0.5rem' }}>
+      <button
+        onClick={() => setOpen(o => !o)}
+        style={{
+          width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+          background: 'none', border: 'none', cursor: 'pointer', padding: '0.5rem 0',
+          color: 'var(--text-secondary)', fontSize: '0.8rem'
+        }}
+      >
+        <span style={{ display: 'flex', alignItems: 'center', gap: '0.3rem' }}>
+          <Weight size={13} /> Logs {logs.length > 0 && `(${logs.length})`}
+        </span>
+        {open ? <ChevronUp size={13} /> : <ChevronDown size={13} />}
+      </button>
+
+      {open && (
+        <div style={{ paddingBottom: '0.5rem' }}>
+          {loading ? (
+            <p style={{ fontSize: '0.78rem', color: 'var(--text-secondary)' }}>Loading...</p>
+          ) : logs.length === 0 ? (
+            <p style={{ fontSize: '0.78rem', color: 'var(--text-secondary)' }}>No logs yet.</p>
+          ) : (
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '0.35rem', marginBottom: '0.5rem' }}>
+              {logs.map(l => (
+                <div key={l.id} style={{
+                  display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between',
+                  background: 'var(--bg-tertiary)', borderRadius: 'var(--radius-sm)',
+                  padding: '0.4rem 0.6rem', gap: '0.5rem'
+                }}>
+                  <div style={{ fontSize: '0.75rem', flex: 1 }}>
+                    <span style={{ fontWeight: 600 }}>
+                      {new Date(l.record_date + 'T00:00:00').toLocaleDateString()}
+                    </span>
+                    {' • '}
+                    <span style={{ color: 'var(--accent)' }}>
+                      {TYPES.find(t => t.value === l.record_type)?.label || l.record_type}
+                    </span>
+                    {l._data?.weight_oz && <span> — {l._data.weight_oz} oz</span>}
+                    {l._data?.weight_lbs && <span> ({l._data.weight_lbs} lbs)</span>}
+                    {l._data?.notes && (
+                      <div style={{ color: 'var(--text-secondary)', marginTop: '0.1rem' }}>
+                        {l._data.notes}
+                      </div>
+                    )}
+                  </div>
+                  <button
+                    onClick={() => handleDelete(l.id)}
+                    style={{ background: 'none', border: 'none', cursor: 'pointer', color: '#e53e3e', padding: 0, flexShrink: 0 }}
+                  >
+                    <Trash2 size={12} />
+                  </button>
+                </div>
+              ))}
+            </div>
+          )}
+
+          {showAdd ? (
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '0.4rem' }}>
+              <div style={{ display: 'flex', gap: '0.4rem', flexWrap: 'wrap' }}>
+                <input
+                  type="date" className="input"
+                  style={{ fontSize: '0.78rem', padding: '0.3rem 0.5rem', flex: '1 1 120px' }}
+                  value={form.record_date}
+                  onChange={e => setForm(f => ({ ...f, record_date: e.target.value }))}
+                />
+                <select
+                  className="input"
+                  style={{ fontSize: '0.78rem', padding: '0.3rem 0.5rem', flex: '1 1 130px' }}
+                  value={form.record_type}
+                  onChange={e => setForm(f => ({ ...f, record_type: e.target.value }))}
+                >
+                  {TYPES.map(t => <option key={t.value} value={t.value}>{t.label}</option>)}
+                </select>
+              </div>
+              {form.record_type === 'weight_log' && (
+                <div style={{ display: 'flex', gap: '0.4rem' }}>
+                  <input
+                    type="number" className="input" placeholder="oz" step="0.1" min="0"
+                    style={{ fontSize: '0.78rem', padding: '0.3rem 0.5rem', flex: 1 }}
+                    value={form.weight_oz}
+                    onChange={e => setForm(f => ({ ...f, weight_oz: e.target.value }))}
+                  />
+                  <input
+                    type="number" className="input" placeholder="lbs" step="0.01" min="0"
+                    style={{ fontSize: '0.78rem', padding: '0.3rem 0.5rem', flex: 1 }}
+                    value={form.weight_lbs}
+                    onChange={e => setForm(f => ({ ...f, weight_lbs: e.target.value }))}
+                  />
+                </div>
+              )}
+              <input
+                className="input" placeholder="Notes (optional)"
+                style={{ fontSize: '0.78rem', padding: '0.3rem 0.5rem' }}
+                value={form.notes}
+                onChange={e => setForm(f => ({ ...f, notes: e.target.value }))}
+              />
+              <div style={{ display: 'flex', gap: '0.4rem' }}>
+                <button
+                  className="btn btn-primary"
+                  style={{ fontSize: '0.75rem', padding: '0.3rem 0.75rem' }}
+                  onClick={handleAdd} disabled={saving}
+                >
+                  {saving ? 'Saving...' : 'Save'}
+                </button>
+                <button
+                  className="btn btn-secondary"
+                  style={{ fontSize: '0.75rem', padding: '0.3rem 0.75rem' }}
+                  onClick={() => setShowAdd(false)}
+                >
+                  Cancel
+                </button>
+              </div>
+            </div>
+          ) : (
+            <button
+              className="btn btn-secondary"
+              style={{ fontSize: '0.75rem', padding: '0.3rem 0.75rem', width: '100%' }}
+              onClick={() => setShowAdd(true)}
+            >
+              <Plus size={12} style={{ marginRight: '0.3rem' }} /> Add Log Entry
+            </button>
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
+
+// ─── Whelping Window Banner ───────────────────────────────────────────────
+function addDays(dateStr, n) {
+  const d = new Date(dateStr + 'T00:00:00')
+  d.setDate(d.getDate() + n)
+  return d
+}
+function fmt(d) { return d.toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' }) }
+
+function WhelpingBanner({ breedingDate, whelpingDate }) {
+  if (whelpingDate) return null // already whelped, no need for estimate
+  if (!breedingDate) return null
+
+  const earliest = addDays(breedingDate, 58)
+  const expected = addDays(breedingDate, 63)
+  const latest = addDays(breedingDate, 68)
+  const today = new Date()
+  const daysUntil = Math.ceil((expected - today) / 86400000)
+
+  let urgency = 'var(--success)'
+  let urgencyBg = 'rgba(16,185,129,0.06)'
+  let statusLabel = `~${daysUntil} days away`
+  if (daysUntil <= 7 && daysUntil > 0) {
+    urgency = '#d97706'; urgencyBg = 'rgba(217,119,6,0.08)'
+    statusLabel = `⚠️ ${daysUntil} days — prepare whelping area!`
+  } else if (daysUntil <= 0) {
+    urgency = '#e53e3e'; urgencyBg = 'rgba(229,62,62,0.08)'
+    statusLabel = '🔴 Expected date has passed — confirm or update whelping date'
+  }
+
+  return (
+    <div className="card" style={{
+      marginBottom: '2rem', padding: '1rem',
+      borderLeft: `3px solid ${urgency}`,
+      background: urgencyBg
+    }}>
+      <div style={{ fontWeight: 600, marginBottom: '0.5rem', color: urgency }}>
+        💕 Projected Whelping Window
+        <span style={{ fontWeight: 400, fontSize: '0.82rem', marginLeft: '0.75rem', color: 'var(--text-secondary)' }}>
+          {statusLabel}
+        </span>
+      </div>
+      <div style={{ display: 'flex', gap: '2rem', flexWrap: 'wrap', fontSize: '0.875rem' }}>
+        <div>
+          <span style={{ color: 'var(--text-secondary)', fontSize: '0.78rem' }}>Earliest (Day 58)</span>
+          <br /><strong>{fmt(earliest)}</strong>
+        </div>
+        <div>
+          <span style={{ color: 'var(--text-secondary)', fontSize: '0.78rem' }}>Expected (Day 63)</span>
+          <br /><strong style={{ color: urgency, fontSize: '1rem' }}>{fmt(expected)}</strong>
+        </div>
+        <div>
+          <span style={{ color: 'var(--text-secondary)', fontSize: '0.78rem' }}>Latest (Day 68)</span>
+          <br /><strong>{fmt(latest)}</strong>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+// ─── Main LitterDetail ─────────────────────────────────────────────────────────
+function LitterDetail() {
+  const { id } = useParams()
+  const navigate = useNavigate()
+  const [litter, setLitter] = useState(null)
+  const [loading, setLoading] = useState(true)
+  const [showEditForm, setShowEditForm] = useState(false)
+  const [showAddPuppy, setShowAddPuppy] = useState(false)
+  const [allDogs, setAllDogs] = useState([])
+  const [selectedPuppyId, setSelectedPuppyId] = useState('')
+  const [newPuppy, setNewPuppy] = useState({ name: '', sex: 'male', color: '', dob: '' })
+  const [addMode, setAddMode] = useState('existing')
+  const [error, setError] = useState('')
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => { fetchLitter(); fetchAllDogs() }, [id])
+
+  const fetchLitter = async () => {
+    try {
+      const res = await axios.get(`/api/litters/${id}`)
+      setLitter(res.data)
+    } catch (err) {
+      console.error('Error fetching litter:', err)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const fetchAllDogs = async () => {
+    try {
+      const res = await axios.get('/api/dogs/all')
+      setAllDogs(res.data)
+    } catch (err) { console.error('Error fetching dogs:', err) }
+  }
+
+  const unlinkedDogs = allDogs.filter(d => {
+    if (!litter) return false
+    const alreadyInLitter = litter.puppies?.some(p => p.id === d.id)
+    const isSireOrDam = d.id === litter.sire_id || d.id === litter.dam_id
+    return !alreadyInLitter && !isSireOrDam
+  })
+
+  const handleLinkPuppy = async () => {
+    if (!selectedPuppyId) return
+    setSaving(true); setError('')
+    try {
+      await axios.post(`/api/litters/${id}/puppies/${selectedPuppyId}`)
+      setSelectedPuppyId(''); setShowAddPuppy(false); fetchLitter()
+    } catch (err) {
+      setError(err.response?.data?.error || 'Failed to link puppy')
+    } finally { setSaving(false) }
+  }
+
+  const handleCreateAndLink = async () => {
+    if (!newPuppy.name) { setError('Puppy name is required'); return }
+    setSaving(true); setError('')
+    try {
+      const dob = newPuppy.dob || litter.whelping_date || litter.breeding_date
+      const res = await axios.post('/api/dogs', {
+        name: newPuppy.name, sex: newPuppy.sex,
+        color: newPuppy.color, date_of_birth: dob,
+        breed: litter.dam_breed || '',
+      })
+      await axios.post(`/api/litters/${id}/puppies/${res.data.id}`)
+      setNewPuppy({ name: '', sex: 'male', color: '', dob: '' })
+      setShowAddPuppy(false); fetchLitter(); fetchAllDogs()
+    } catch (err) {
+      setError(err.response?.data?.error || 'Failed to create puppy')
+    } finally { setSaving(false) }
+  }
+
+  const handleUnlinkPuppy = async (puppyId) => {
+    if (!window.confirm('Remove this puppy from the litter? The dog record will not be deleted.')) return
+    try {
+      await axios.delete(`/api/litters/${id}/puppies/${puppyId}`)
+      fetchLitter()
+    } catch (err) { console.error('Error unlinking puppy:', err) }
+  }
+
+  if (loading) return <div className="container loading">Loading litter...</div>
+  if (!litter) return <div className="container"><p>Litter not found.</p></div>
+
+  const puppyCount = litter.puppies?.length ?? 0
+
+  return (
+    <div className="container">
+      {/* Header */}
+      <div style={{ display: 'flex', alignItems: 'center', gap: '1rem', marginBottom: '2rem' }}>
+        <button className="btn-icon" onClick={() => navigate('/litters')}>
+          <ArrowLeft size={20} />
+        </button>
+        <div style={{ flex: 1 }}>
+          <h1 style={{ margin: 0 }}>🐾 {litter.sire_name} × {litter.dam_name}</h1>
+          <p style={{ color: 'var(--text-secondary)', margin: '0.25rem 0 0' }}>
+            Bred: {new Date(litter.breeding_date + 'T00:00:00').toLocaleDateString()}
+            {litter.whelping_date && ` • Whelped: ${new Date(litter.whelping_date + 'T00:00:00').toLocaleDateString()}`}
+          </p>
+        </div>
+        <button className="btn btn-secondary" onClick={() => setShowEditForm(true)}>Edit Litter</button>
+      </div>
+
+      {/* Stats row */}
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(140px, 1fr))', gap: '1rem', marginBottom: '2rem' }}>
+        <div className="card" style={{ textAlign: 'center', padding: '1rem' }}>
+          <div style={{ fontSize: '2rem', fontWeight: 700, color: 'var(--accent)' }}>{puppyCount}</div>
+          <div style={{ color: 'var(--text-secondary)', fontSize: '0.85rem' }}>Puppies Linked</div>
+        </div>
+        <div className="card" style={{ textAlign: 'center', padding: '1rem' }}>
+          <div style={{ fontSize: '2rem', fontWeight: 700, color: 'var(--accent)' }}>
+            {litter.puppies?.filter(p => p.sex === 'male').length ?? 0}
+          </div>
+          <div style={{ color: 'var(--text-secondary)', fontSize: '0.85rem' }}>Males</div>
+        </div>
+        <div className="card" style={{ textAlign: 'center', padding: '1rem' }}>
+          <div style={{ fontSize: '2rem', fontWeight: 700, color: 'var(--accent)' }}>
+            {litter.puppies?.filter(p => p.sex === 'female').length ?? 0}
+          </div>
+          <div style={{ color: 'var(--text-secondary)', fontSize: '0.85rem' }}>Females</div>
+        </div>
+        {litter.puppy_count > 0 && (
+          <div className="card" style={{ textAlign: 'center', padding: '1rem' }}>
+            <div style={{ fontSize: '2rem', fontWeight: 700 }}>{litter.puppy_count}</div>
+            <div style={{ color: 'var(--text-secondary)', fontSize: '0.85rem' }}>Expected</div>
+          </div>
+        )}
+      </div>
+
+      {/* Projected whelping window */}
+      <WhelpingBanner breedingDate={litter.breeding_date} whelpingDate={litter.whelping_date} />
+
+      {/* Notes */}
+      {litter.notes && (
+        <div className="card" style={{ marginBottom: '2rem', padding: '1rem', borderLeft: '3px solid var(--accent)' }}>
+          <p style={{ margin: 0, fontStyle: 'italic', color: 'var(--text-secondary)' }}>{litter.notes}</p>
+        </div>
+      )}
+
+      {/* Puppies section */}
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+        <h2 style={{ margin: 0 }}>Puppies</h2>
+        <button className="btn btn-primary" onClick={() => { setShowAddPuppy(true); setError('') }}>
+          <Plus size={16} style={{ marginRight: '0.4rem' }} />
+          Add Puppy
+        </button>
+      </div>
+
+      {puppyCount === 0 ? (
+        <div className="card" style={{ textAlign: 'center', padding: '3rem' }}>
+          <Dog size={48} style={{ color: 'var(--text-secondary)', margin: '0 auto 1rem' }} />
+          <p style={{ color: 'var(--text-secondary)' }}>No puppies linked yet. Add puppies to this litter.</p>
+        </div>
+      ) : (
+        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(240px, 1fr))', gap: '1rem' }}>
+          {litter.puppies.map(puppy => (
+            <div key={puppy.id} className="card" style={{ position: 'relative' }}>
+              <button
+                className="btn-icon"
+                onClick={() => handleUnlinkPuppy(puppy.id)}
+                title="Remove from litter"
+                style={{ position: 'absolute', top: '0.75rem', right: '0.75rem', color: '#e53e3e' }}
+              >
+                <X size={14} />
+              </button>
+              <div style={{ fontSize: '2.5rem', marginBottom: '0.5rem' }}>
+                {puppy.sex === 'male' ? '🐦' : '🐥'}
+              </div>
+              <div style={{ fontWeight: 600, marginBottom: '0.25rem' }}>{puppy.name}</div>
+              <div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
+                {puppy.sex} {puppy.color && `• ${puppy.color}`}
+              </div>
+              {puppy.date_of_birth && (
+                <div style={{ fontSize: '0.8rem', color: 'var(--text-secondary)' }}>
+                  Born: {new Date(puppy.date_of_birth + 'T00:00:00').toLocaleDateString()}
+                </div>
+              )}
+              <button
+                className="btn btn-secondary"
+                style={{ marginTop: '0.75rem', width: '100%', fontSize: '0.8rem', padding: '0.4rem' }}
+                onClick={() => navigate(`/dogs/${puppy.id}`)}
+              >
+                <ExternalLink size={12} style={{ marginRight: '0.3rem' }} />
+                View Profile
+              </button>
+
+              {/* Weight / Health Log collapsible */}
+              <PuppyLogPanel
+                litterId={id}
+                puppy={puppy}
+                whelpingDate={litter.whelping_date || litter.breeding_date}
+              />
+            </div>
+          ))}
+        </div>
+      )}
+
+      {/* Add Puppy Modal */}
+      {showAddPuppy && (
+        <div className="modal-overlay" onClick={() => setShowAddPuppy(false)}>
+          <div className="modal-content" onClick={e => e.stopPropagation()} style={{ maxWidth: '480px' }}>
+            <div className="modal-header">
+              <h2>Add Puppy to Litter</h2>
+              <button className="btn-icon" onClick={() => setShowAddPuppy(false)}><X size={24} /></button>
+            </div>
+            <div className="modal-body">
+              {error && <div className="error" style={{ marginBottom: '1rem' }}>{error}</div>}
+              <div style={{ display: 'flex', gap: '0.5rem', marginBottom: '1.5rem' }}>
+                <button className={`btn ${addMode === 'existing' ? 'btn-primary' : 'btn-secondary'}`}
+                  onClick={() => setAddMode('existing')} style={{ flex: 1 }}>Link Existing Dog</button>
+                <button className={`btn ${addMode === 'new' ? 'btn-primary' : 'btn-secondary'}`}
+                  onClick={() => setAddMode('new')} style={{ flex: 1 }}>Create New Puppy</button>
+              </div>
+
+              {addMode === 'existing' ? (
+                <div className="form-group">
+                  <label className="label">Select Dog</label>
+                  <select className="input" value={selectedPuppyId}
+                    onChange={e => setSelectedPuppyId(e.target.value)}>
+                    <option value="">-- Select a dog --</option>
+                    {unlinkedDogs.map(d => (
+                      <option key={d.id} value={d.id}>
+                        {d.name} ({d.sex}{d.date_of_birth ? `, born ${new Date(d.date_of_birth + 'T00:00:00').toLocaleDateString()}` : ''})
+                      </option>
+                    ))}
+                  </select>
+                  {unlinkedDogs.length === 0 && (
+                    <p style={{ color: 'var(--text-secondary)', fontSize: '0.85rem', marginTop: '0.5rem' }}>
+                      No unlinked dogs available. Use "Create New Puppy" instead.
+                    </p>
+                  )}
+                </div>
+              ) : (
+                <div style={{ display: 'grid', gap: '1rem' }}>
+                  <div className="form-group">
+                    <label className="label">Puppy Name *</label>
+                    <input className="input" value={newPuppy.name}
+                      onChange={e => setNewPuppy(p => ({ ...p, name: e.target.value }))}
+                      placeholder="e.g. Blue Collar" />
+                  </div>
+                  <div className="form-grid">
+                    <div className="form-group">
+                      <label className="label">Sex</label>
+                      <select className="input" value={newPuppy.sex}
+                        onChange={e => setNewPuppy(p => ({ ...p, sex: e.target.value }))}>
+                        <option value="male">Male</option>
+                        <option value="female">Female</option>
+                      </select>
+                    </div>
+                    <div className="form-group">
+                      <label className="label">Color / Markings</label>
+                      <input className="input" value={newPuppy.color}
+                        onChange={e => setNewPuppy(p => ({ ...p, color: e.target.value }))}
+                        placeholder="e.g. Black & Tan" />
+                    </div>
+                  </div>
+                  <div className="form-group">
+                    <label className="label">Date of Birth</label>
+                    <input type="date" className="input" value={newPuppy.dob}
+                      onChange={e => setNewPuppy(p => ({ ...p, dob: e.target.value }))} />
+                    {litter.whelping_date && !newPuppy.dob && (
+                      <p style={{ fontSize: '0.8rem', color: 'var(--text-secondary)', marginTop: '0.25rem' }}>
+                        Will default to whelping date: {new Date(litter.whelping_date + 'T00:00:00').toLocaleDateString()}
+                      </p>
+                    )}
+                  </div>
+                </div>
+              )}
+            </div>
+            <div className="modal-footer">
+              <button className="btn btn-secondary" onClick={() => setShowAddPuppy(false)} disabled={saving}>Cancel</button>
+              <button
+                className="btn btn-primary"
+                disabled={saving || (addMode === 'existing' && !selectedPuppyId)}
+                onClick={addMode === 'existing' ? handleLinkPuppy : handleCreateAndLink}
+              >
+                {saving ? 'Saving...' : addMode === 'existing' ? 'Link Puppy' : 'Create & Link'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {showEditForm && (
+        <LitterForm
+          litter={litter}
+          onClose={() => setShowEditForm(false)}
+          onSave={fetchLitter}
+        />
+      )}
+    </div>
+  )
+}
+
+export default LitterDetail

client/src/pages/LitterList.jsx

@@ -1,60 +1,189 @@
 import { useEffect, useState } from 'react'
-import { Activity } from 'lucide-react'
+import { Activity, Plus, Edit2, Trash2, ChevronRight } from 'lucide-react'
+import { useNavigate } from 'react-router-dom'
 import axios from 'axios'
+import LitterForm from '../components/LitterForm'
+
+const LIMIT = 50
 
 function LitterList() {
   const [litters, setLitters] = useState([])
+  const [total, setTotal] = useState(0)
+  const [page, setPage] = useState(1)
   const [loading, setLoading] = useState(true)
+  const [showForm, setShowForm] = useState(false)
+  const [editingLitter, setEditingLitter] = useState(null)
+  const [prefill, setPrefill] = useState(null)
+  const navigate = useNavigate()
 
   useEffect(() => {
-    fetchLitters()
+    fetchLitters(1)
+    // Auto-open form with prefill from BreedingCalendar "Record Litter" CTA
+    const stored = sessionStorage.getItem('prefillLitter')
+    if (stored) {
+      try {
+        const data = JSON.parse(stored)
+        setPrefill(data)
+        setEditingLitter(null)
+        setShowForm(true)
+      } catch (e) { /* ignore */ }
+      sessionStorage.removeItem('prefillLitter')
+    }
   }, [])
 
-  const fetchLitters = async () => {
+  const fetchLitters = async (p = page) => {
     try {
-      const res = await axios.get('/api/litters')
+      const res = await axios.get('/api/litters', { params: { page: p, limit: LIMIT } })
-      setLitters(res.data)
+      setLitters(res.data.data)
-      setLoading(false)
+      setTotal(res.data.total)
+      setPage(p)
     } catch (error) {
       console.error('Error fetching litters:', error)
+    } finally {
       setLoading(false)
     }
   }
 
+  const totalPages = Math.ceil(total / LIMIT)
+
+  const handleCreate = () => {
+    setEditingLitter(null)
+    setPrefill(null)
+    setShowForm(true)
+  }
+
+  const handleEdit = (e, litter) => {
+    e.stopPropagation()
+    setEditingLitter(litter)
+    setPrefill(null)
+    setShowForm(true)
+  }
+
+  const handleDelete = async (e, id) => {
+    e.stopPropagation()
+    if (!window.confirm('Delete this litter record? Puppies will be unlinked but not deleted.')) return
+    try {
+      await axios.delete(`/api/litters/${id}`)
+      fetchLitters(page)
+    } catch (error) {
+      console.error('Error deleting litter:', error)
+    }
+  }
+
+  const handleSave = () => {
+    fetchLitters(page)
+  }
+
   if (loading) {
     return <div className="container loading">Loading litters...</div>
   }
 
   return (
     <div className="container">
-      <h1 style={{ marginBottom: '2rem' }}>Litters</h1>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '2rem' }}>
+        <h1>Litters</h1>
+        <button className="btn btn-primary" onClick={handleCreate}>
+          <Plus size={18} style={{ marginRight: '0.5rem' }} />
+          New Litter
+        </button>
+      </div>
 
-      {litters.length === 0 ? (
+      {total === 0 ? (
         <div className="card" style={{ textAlign: 'center', padding: '4rem' }}>
           <Activity size={64} style={{ color: 'var(--text-secondary)', margin: '0 auto 1rem' }} />
           <h2>No litters recorded yet</h2>
-          <p style={{ color: 'var(--text-secondary)' }}>Start tracking breeding records</p>
+          <p style={{ color: 'var(--text-secondary)', marginBottom: '1.5rem' }}>Create a litter after a breeding cycle to track puppies</p>
+          <button className="btn btn-primary" onClick={handleCreate}>
+            <Plus size={18} style={{ marginRight: '0.5rem' }} />
+            Create First Litter
+          </button>
         </div>
       ) : (
         <div style={{ display: 'grid', gap: '1rem' }}>
           {litters.map(litter => (
-            <div key={litter.id} className="card">
+            <div
-              <h3>{litter.sire_name} × {litter.dam_name}</h3>
+              key={litter.id}
-              <p style={{ color: 'var(--text-secondary)', marginTop: '0.5rem' }}>
+              className="card"
-                Breeding Date: {new Date(litter.breeding_date).toLocaleDateString()}
+              style={{ cursor: 'pointer', transition: 'border-color 0.2s' }}
-              </p>
+              onClick={() => navigate(`/litters/${litter.id}`)}
+            >
+              <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
+                <div style={{ flex: 1 }}>
+                  <h3 style={{ marginBottom: '0.5rem' }}>
+                    🐾 {litter.sire_name} × {litter.dam_name}
+                  </h3>
+                  <div style={{ display: 'flex', gap: '1.5rem', flexWrap: 'wrap', color: 'var(--text-secondary)', fontSize: '0.9rem' }}>
+                    <span>📅 Bred: {new Date(litter.breeding_date).toLocaleDateString()}</span>
                     {litter.whelping_date && (
-                <p style={{ color: 'var(--text-secondary)' }}>
+                      <span>💕 Whelped: {new Date(litter.whelping_date).toLocaleDateString()}</span>
-                  Whelping Date: {new Date(litter.whelping_date).toLocaleDateString()}
+                    )}
+                    <span style={{ color: 'var(--accent)', fontWeight: 600 }}>
+                      {litter.actual_puppy_count ?? litter.puppies?.length ?? litter.puppy_count ?? 0} puppies
+                    </span>
+                  </div>
+                  {litter.notes && (
+                    <p style={{ marginTop: '0.5rem', fontSize: '0.85rem', color: 'var(--text-secondary)', fontStyle: 'italic' }}>
+                      {litter.notes}
                     </p>
                   )}
-              <p style={{ marginTop: '0.5rem' }}>
+                </div>
-                <strong>Puppies:</strong> {litter.puppy_count || litter.puppies?.length || 0}
+                <div style={{ display: 'flex', gap: '0.5rem', alignItems: 'center' }}>
-              </p>
+                  <button
+                    className="btn-icon"
+                    title="Edit litter"
+                    onClick={(e) => handleEdit(e, litter)}
+                  >
+                    <Edit2 size={16} />
+                  </button>
+                  <button
+                    className="btn-icon"
+                    title="Delete litter"
+                    onClick={(e) => handleDelete(e, litter.id)}
+                    style={{ color: '#e53e3e' }}
+                  >
+                    <Trash2 size={16} />
+                  </button>
+                  <ChevronRight size={20} style={{ color: 'var(--text-secondary)' }} />
+                </div>
+              </div>
             </div>
           ))}
         </div>
       )}
+
+      {/* Pagination */}
+      {totalPages > 1 && (
+        <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', gap: '1rem', marginTop: '1.5rem' }}>
+          <button
+            className="btn btn-ghost"
+            onClick={() => fetchLitters(page - 1)}
+            disabled={page <= 1 || loading}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Previous
+          </button>
+          <span style={{ color: 'var(--text-secondary)', fontSize: '0.875rem' }}>
+            Page {page} of {totalPages}
+          </span>
+          <button
+            className="btn btn-ghost"
+            onClick={() => fetchLitters(page + 1)}
+            disabled={page >= totalPages || loading}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Next
+          </button>
+        </div>
+      )}
+
+      {showForm && (
+        <LitterForm
+          litter={editingLitter}
+          prefill={prefill}
+          onClose={() => setShowForm(false)}
+          onSave={handleSave}
+        />
+      )}
     </div>
   )
 }

client/src/pages/PairingSimulator.jsx

@@ -1,5 +1,5 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useCallback } from 'react'
-import { FlaskConical, AlertTriangle, CheckCircle, XCircle, GitMerge } from 'lucide-react'
+import { FlaskConical, AlertTriangle, CheckCircle, XCircle, GitMerge, ShieldAlert } from 'lucide-react'
 
 export default function PairingSimulator() {
   const [dogs, setDogs] = useState([])
@@ -9,9 +9,14 @@ export default function PairingSimulator() {
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState(null)
   const [dogsLoading, setDogsLoading] = useState(true)
+  const [relationWarning, setRelationWarning] = useState(null)
+  const [relationChecking, setRelationChecking] = useState(false)
+  const [geneticRisk, setGeneticRisk] = useState(null)
+  const [geneticChecking, setGeneticChecking] = useState(false)
 
   useEffect(() => {
-    fetch('/api/dogs')
+    // include_external=1 ensures external sires/dams appear for pairing
+    fetch('/api/dogs?include_external=1')
       .then(r => r.json())
       .then(data => {
         setDogs(Array.isArray(data) ? data : (data.dogs || []))
@@ -20,8 +25,48 @@ export default function PairingSimulator() {
       .catch(() => setDogsLoading(false))
   }, [])
 
-  const males = dogs.filter(d => d.sex === 'male')
+  // Check for direct relation whenever both sire and dam are selected
-  const females = dogs.filter(d => d.sex === 'female')
+  const checkRelation = useCallback(async (sid, did) => {
+    if (!sid || !did) {
+      setRelationWarning(null)
+      setGeneticRisk(null)
+      return
+    }
+    setRelationChecking(true)
+    setGeneticChecking(true)
+    try {
+      const [relRes, genRes] = await Promise.all([
+        fetch(`/api/pedigree/relations/${sid}/${did}`),
+        fetch(`/api/genetics/pairing-risk?sireId=${sid}&damId=${did}`)
+      ])
+      
+      const relData = await relRes.json()
+      setRelationWarning(relData.related ? relData.relationship : null)
+      
+      const genData = await genRes.json()
+      setGeneticRisk(genData)
+    } catch {
+      setRelationWarning(null)
+      setGeneticRisk(null)
+    } finally {
+      setRelationChecking(false)
+      setGeneticChecking(false)
+    }
+  }, [])
+
+  function handleSireChange(e) {
+    const val = e.target.value
+    setSireId(val)
+    setResult(null)
+    checkRelation(val, damId)
+  }
+
+  function handleDamChange(e) {
+    const val = e.target.value
+    setDamId(val)
+    setResult(null)
+    checkRelation(sireId, val)
+  }
 
   async function handleSimulate(e) {
     e.preventDefault()
@@ -33,13 +78,11 @@ export default function PairingSimulator() {
       const res = await fetch('/api/pedigree/trial-pairing', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ sire_id: parseInt(sireId), dam_id: parseInt(damId) })
+        body: JSON.stringify({ sire_id: parseInt(sireId), dam_id: parseInt(damId) }),
       })
-      if (!res.ok) {
+      const data = await res.json()
-        const err = await res.json()
+      if (!res.ok) throw new Error(data.error || 'Simulation failed')
-        throw new Error(err.error || 'Failed to calculate')
+      setResult(data)
-      }
-      setResult(await res.json())
     } catch (err) {
       setError(err.message)
     } finally {
@@ -47,171 +90,189 @@ export default function PairingSimulator() {
     }
   }
 
-  function RiskBadge({ coi, recommendation }) {
+  const males   = dogs.filter(d => d.sex === 'male')
-    const isLow = coi < 5
+  const females = dogs.filter(d => d.sex === 'female')
-    const isMed = coi >= 5 && coi < 10
+
-    const isHigh = coi >= 10
+  const coiColor = (coi) => {
-    return (
+    if (coi < 0.0625) return 'var(--success)'
-      <div className={`risk-badge risk-${isLow ? 'low' : isMed ? 'med' : 'high'}`}>
+    if (coi < 0.125)  return 'var(--warning)'
-        {isLow && <CheckCircle size={20} />}
+    return 'var(--danger)'
-        {isMed && <AlertTriangle size={20} />}
+  }
-        {isHigh && <XCircle size={20} />}
+
-        <span>{recommendation}</span>
+  const coiLabel = (coi) => {
-      </div>
+    if (coi < 0.0625) return 'Low'
-    )
+    if (coi < 0.125)  return 'Moderate'
+    if (coi < 0.25)   return 'High'
+    return 'Very High'
   }
 
   return (
-    <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem' }}>
+    <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem', maxWidth: '720px' }}>
-      {/* Header */}
-      <div style={{ marginBottom: '2rem' }}>
       <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem', marginBottom: '0.5rem' }}>
-          <div style={{ width: '2.5rem', height: '2.5rem', borderRadius: 'var(--radius)', background: 'rgba(139,92,246,0.2)', display: 'flex', alignItems: 'center', justifyContent: 'center', color: 'var(--accent)' }}>
+        <FlaskConical size={28} style={{ color: 'var(--primary)' }} />
-            <FlaskConical size={20} />
+        <h1 style={{ margin: 0 }}>Pairing Simulator</h1>
       </div>
-          <h1 style={{ fontSize: '1.75rem', margin: 0 }}>Trial Pairing Simulator</h1>
+      <p style={{ color: 'var(--text-muted)', marginBottom: '2rem' }}>
-        </div>
+        Estimate the Coefficient of Inbreeding (COI) for a hypothetical pairing before breeding.
-        <p style={{ color: 'var(--text-muted)', margin: 0 }}>
+        Includes both kennel and external dogs.
-          Select a sire and dam to calculate the estimated inbreeding coefficient (COI) and view common ancestors.
       </p>
-      </div>
 
-      {/* Selector Card */}
+      <div className="card" style={{ marginBottom: '1.5rem' }}>
-      <div className="card" style={{ marginBottom: '1.5rem', maxWidth: '720px' }}>
         <form onSubmit={handleSimulate}>
-          <div className="form-grid" style={{ marginBottom: '1.25rem' }}>
+          <div className="form-grid" style={{ marginBottom: '1rem' }}>
-            <div className="form-group" style={{ margin: 0 }}>
+            <div className="form-group">
-              <label className="label">Sire (Male) ♂</label>
+              <label className="label">Sire (Male) *</label>
-              <select
+              {dogsLoading ? (
-                value={sireId}
+                <div className="input" style={{ color: 'var(--text-muted)' }}>Loading dogs...</div>
-                onChange={e => setSireId(e.target.value)}
+              ) : (
-                required
+                <select className="input" value={sireId} onChange={handleSireChange} required>
-                disabled={dogsLoading}
+                  <option value="">Select sire...</option>
-              >
-                <option value="">— Select Sire —</option>
                   {males.map(d => (
                     <option key={d.id} value={d.id}>
-                    {d.name}{d.breed ? ` · ${d.breed}` : ''}
+                      {d.name}{d.is_champion ? ' ✪' : ''}{d.is_external ? ' [Ext]' : ''}
                     </option>
                   ))}
                 </select>
-              {!dogsLoading && males.length === 0 && (
-                <p style={{ color: 'var(--text-muted)', fontSize: '0.8rem', marginTop: '0.4rem' }}>No male dogs registered.</p>
               )}
             </div>
 
-            <div className="form-group" style={{ margin: 0 }}>
+            <div className="form-group">
-              <label className="label">Dam (Female) ♀</label>
+              <label className="label">Dam (Female) *</label>
-              <select
+              {dogsLoading ? (
-                value={damId}
+                <div className="input" style={{ color: 'var(--text-muted)' }}>Loading dogs...</div>
-                onChange={e => setDamId(e.target.value)}
+              ) : (
-                required
+                <select className="input" value={damId} onChange={handleDamChange} required>
-                disabled={dogsLoading}
+                  <option value="">Select dam...</option>
-              >
-                <option value="">— Select Dam —</option>
                   {females.map(d => (
                     <option key={d.id} value={d.id}>
-                    {d.name}{d.breed ? ` · ${d.breed}` : ''}
+                      {d.name}{d.is_champion ? ' ✪' : ''}{d.is_external ? ' [Ext]' : ''}
                     </option>
                   ))}
                 </select>
-              {!dogsLoading && females.length === 0 && (
-                <p style={{ color: 'var(--text-muted)', fontSize: '0.8rem', marginTop: '0.4rem' }}>No female dogs registered.</p>
               )}
             </div>
           </div>
 
+          {relationChecking && (
+            <div style={{ fontSize: '0.85rem', color: 'var(--text-muted)', marginBottom: '0.75rem' }}>
+              Checking relationship and genetics...
+            </div>
+          )}
+
+          {relationWarning && !relationChecking && (
+            <div style={{
+              display: 'flex', alignItems: 'center', gap: '0.5rem',
+              padding: '0.6rem 1rem', marginBottom: '0.75rem',
+              background: 'rgba(239,68,68,0.08)', border: '1px solid rgba(239,68,68,0.3)',
+              borderRadius: 'var(--radius)', fontSize: '0.875rem', color: 'var(--danger)',
+            }}>
+              <ShieldAlert size={16} />
+              <strong>Related:</strong>&nbsp;{relationWarning}
+            </div>
+          )}
+
+          {geneticRisk && geneticRisk.risks && geneticRisk.risks.length > 0 && !geneticChecking && (
+            <div style={{
+              padding: '0.6rem 1rem', marginBottom: '0.75rem',
+              background: 'rgba(255,159,10,0.08)', border: '1px solid rgba(255,159,10,0.3)',
+              borderRadius: 'var(--radius)', fontSize: '0.875rem', color: 'var(--warning)',
+            }}>
+              <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginBottom: '0.25rem', fontWeight: 600 }}>
+                <ShieldAlert size={16} /> Genetic Risks Detected
+              </div>
+              <ul style={{ margin: 0, paddingLeft: '1.5rem' }}>
+                {geneticRisk.risks.map(r => (
+                  <li key={r.marker}>
+                    <strong>{r.marker}</strong>: {r.message}
+                  </li>
+                ))}
+              </ul>
+            </div>
+          )}
+
+          {geneticRisk && geneticRisk.missing_data && !geneticChecking && (
+            <div style={{ fontSize: '0.8rem', color: 'var(--text-muted)', marginBottom: '0.75rem', fontStyle: 'italic' }}>
+              * Sire or dam has missing genetic tests. Clearances cannot be fully verified.
+            </div>
+          )}
+
           <button
             type="submit"
             className="btn btn-primary"
-            disabled={!sireId || !damId || loading}
+            disabled={loading || dogsLoading || !sireId || !damId}
-            style={{ minWidth: '160px' }}
+            style={{ width: '100%' }}
           >
-            {loading ? 'Calculating…' : <><FlaskConical size={16} /> Simulate Pairing</>}
+            {loading ? 'Simulating...' : <><GitMerge size={16} style={{ marginRight: '0.4rem' }} />Simulate Pairing</>}
           </button>
         </form>
       </div>
 
-      {/* Error */}
+      {error && (
-      {error && <div className="error" style={{ maxWidth: '720px' }}>{error}</div>}
+        <div className="card" style={{ borderColor: 'var(--danger)', marginBottom: '1.5rem' }}>
-
+          <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', color: 'var(--danger)' }}>
-      {/* Results */}
+            <XCircle size={18} />
-      {result && (
+            <strong>Error:</strong> {error}
-        <div style={{ maxWidth: '720px' }}>
-          {/* COI Summary */}
-          <div className="card" style={{ marginBottom: '1.25rem' }}>
-            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', flexWrap: 'wrap', gap: '1rem' }}>
-              <div>
-                <p style={{ color: 'var(--text-muted)', fontSize: '0.8125rem', textTransform: 'uppercase', letterSpacing: '0.05em', fontWeight: 500, marginBottom: '0.25rem' }}>Pairing</p>
-                <p style={{ fontSize: '1.125rem', fontWeight: 600, margin: 0 }}>
-                  <span style={{ color: '#60a5fa' }}>{result.sire.name}</span>
-                  <span style={{ color: 'var(--text-muted)', margin: '0 0.5rem' }}>×</span>
-                  <span style={{ color: '#f472b6' }}>{result.dam.name}</span>
-                </p>
           </div>
-              <div style={{ textAlign: 'right' }}>
-                <p style={{ color: 'var(--text-muted)', fontSize: '0.8125rem', textTransform: 'uppercase', letterSpacing: '0.05em', fontWeight: 500, marginBottom: '0.25rem' }}>COI</p>
-                <p style={{
-                  fontSize: '2rem',
-                  fontWeight: 700,
-                  lineHeight: 1,
-                  color: result.coi < 5 ? 'var(--success)' : result.coi < 10 ? 'var(--warning)' : 'var(--danger)'
-                }}>
-                  {result.coi.toFixed(2)}%
-                </p>
-              </div>
-            </div>
-
-            <div style={{ marginTop: '1.25rem' }}>
-              <RiskBadge coi={result.coi} recommendation={result.recommendation} />
-            </div>
-
-            <div style={{ marginTop: '1rem', padding: '0.75rem', background: 'var(--bg-tertiary)', borderRadius: 'var(--radius-sm)', fontSize: '0.8125rem', color: 'var(--text-secondary)' }}>
-              <strong>COI Guide:</strong> &lt;5% Low risk · 5–10% Moderate risk · &gt;10% High risk
-            </div>
-          </div>
-
-          {/* Common Ancestors */}
-          <div className="card">
-            <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginBottom: '1rem' }}>
-              <GitMerge size={18} style={{ color: 'var(--accent)' }} />
-              <h3 style={{ margin: 0, fontSize: '1rem' }}>Common Ancestors</h3>
-              <span className="badge badge-primary" style={{ marginLeft: 'auto' }}>
-                {result.commonAncestors.length} found
-              </span>
-            </div>
-
-            {result.commonAncestors.length === 0 ? (
-              <p style={{ color: 'var(--text-muted)', textAlign: 'center', padding: '1.5rem 0', margin: 0 }}>
-                No common ancestors found within 5 generations. This pairing has excellent genetic diversity.
-              </p>
-            ) : (
-              <div style={{ overflowX: 'auto' }}>
-                <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '0.875rem' }}>
-                  <thead>
-                    <tr style={{ borderBottom: '1px solid var(--border)' }}>
-                      <th style={{ textAlign: 'left', padding: '0.625rem 0.75rem', color: 'var(--text-muted)', fontWeight: 500, fontSize: '0.75rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Ancestor</th>
-                      <th style={{ textAlign: 'center', padding: '0.625rem 0.75rem', color: 'var(--text-muted)', fontWeight: 500, fontSize: '0.75rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Sire Gen</th>
-                      <th style={{ textAlign: 'center', padding: '0.625rem 0.75rem', color: 'var(--text-muted)', fontWeight: 500, fontSize: '0.75rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>Dam Gen</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {result.commonAncestors.map((anc, i) => (
-                      <tr key={i} style={{ borderBottom: '1px solid var(--border)' }}>
-                        <td style={{ padding: '0.625rem 0.75rem', fontWeight: 500 }}>{anc.name}</td>
-                        <td style={{ padding: '0.625rem 0.75rem', textAlign: 'center' }}>
-                          <span className="badge badge-primary">Gen {anc.sireGen}</span>
-                        </td>
-                        <td style={{ padding: '0.625rem 0.75rem', textAlign: 'center' }}>
-                          <span className="badge" style={{ background: 'rgba(244,114,182,0.15)', color: '#f472b6' }}>Gen {anc.damGen}</span>
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
         </div>
       )}
+
+      {result && (
+        <div className="card">
+          <h2 style={{ fontSize: '1rem', marginBottom: '1.25rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+            Simulation Result
+          </h2>
+
+          <div style={{
+            display: 'flex', alignItems: 'center', gap: '1rem',
+            padding: '1.25rem', marginBottom: '1rem',
+            background: 'var(--bg-primary)', borderRadius: 'var(--radius)',
+            border: `2px solid ${coiColor(result.coi)}`,
+          }}>
+            {result.coi < 0.0625
+              ? <CheckCircle size={32} style={{ color: coiColor(result.coi), flexShrink: 0 }} />
+              : <AlertTriangle size={32} style={{ color: coiColor(result.coi), flexShrink: 0 }} />
+            }
+            <div>
+              <div style={{ fontSize: '2rem', fontWeight: 700, color: coiColor(result.coi), lineHeight: 1 }}>
+                {(result.coi * 100).toFixed(2)}%
               </div>
+              <div style={{ color: 'var(--text-muted)', fontSize: '0.875rem' }}>
+                COI &mdash; <strong style={{ color: coiColor(result.coi) }}>{coiLabel(result.coi)}</strong>
+              </div>
+            </div>
+          </div>
+
+          {result.commonAncestors && result.commonAncestors.length > 0 && (
+            <div>
+              <h3 style={{ fontSize: '0.875rem', color: 'var(--text-muted)', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '0.5rem' }}>
+                Common Ancestors ({result.commonAncestors.length})
+              </h3>
+              <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.4rem' }}>
+                {result.commonAncestors.map((a, i) => (
+                  <span key={i} style={{
+                    padding: '0.2rem 0.6rem',
+                    background: 'var(--bg-tertiary)',
+                    borderRadius: 'var(--radius-sm)',
+                    fontSize: '0.8rem',
+                    border: '1px solid var(--border)',
+                  }}>{a.name}</span>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {result.recommendation && (
+            <div style={{
+              marginTop: '1rem', padding: '0.75rem 1rem',
+              background: result.coi < 0.0625 ? 'rgba(34,197,94,0.08)' : 'rgba(239,68,68,0.08)',
+              borderRadius: 'var(--radius)',
+              border: `1px solid ${result.coi < 0.0625 ? 'rgba(34,197,94,0.3)' : 'rgba(239,68,68,0.3)'}`,
+              fontSize: '0.875rem',
+              color: 'var(--text-secondary)',
+            }}>
+              {result.recommendation}
+            </div>
+          )}
         </div>
       )}
     </div>

client/src/pages/PedigreeView.jsx

@@ -3,7 +3,7 @@ import { useParams, useNavigate } from 'react-router-dom'
 import { ArrowLeft, GitBranch, AlertCircle, Loader } from 'lucide-react'
 import axios from 'axios'
 import PedigreeTree from '../components/PedigreeTree'
-import { transformPedigreeData, formatCOI, getPedigreeCompleteness } from '../utils/pedigreeHelpers'
+import { transformPedigreeData, transformDescendantData, formatCOI, getPedigreeCompleteness } from '../utils/pedigreeHelpers'
 
 function PedigreeView() {
   const { id } = useParams()
@@ -14,27 +14,25 @@ function PedigreeView() {
   const [pedigreeData, setPedigreeData] = useState(null)
   const [coiData, setCoiData] = useState(null)
   const [generations, setGenerations] = useState(5)
+  const [viewMode, setViewMode] = useState('ancestors')
 
   useEffect(() => {
     fetchPedigreeData()
-  }, [id, generations])
+  }, [id, generations, viewMode])
 
   const fetchPedigreeData = async () => {
     setLoading(true)
     setError('')
 
     try {
-      // Fetch pedigree tree data
+      if (viewMode === 'ancestors') {
         const pedigreeRes = await axios.get(`/api/pedigree/${id}`)
         const dogData = pedigreeRes.data
-      
         setDog(dogData)
 
-      // Transform data for react-d3-tree
         const treeData = transformPedigreeData(dogData, generations)
         setPedigreeData(treeData)
 
-      // Fetch COI calculation
         try {
           const coiRes = await axios.get(`/api/pedigree/${id}/coi`)
           setCoiData(coiRes.data)
@@ -42,6 +40,15 @@ function PedigreeView() {
           console.warn('COI calculation unavailable:', coiError)
           setCoiData(null)
         }
+      } else {
+        const descendantRes = await axios.get(`/api/pedigree/${id}/descendants?generations=${generations}`)
+        const dogData = descendantRes.data
+        setDog(dogData)
+
+        const treeData = transformDescendantData(dogData, generations)
+        setPedigreeData(treeData)
+        setCoiData(null)
+      }
 
       setLoading(false)
     } catch (err) {
@@ -84,10 +91,13 @@ function PedigreeView() {
     )
   }
 
+  // Completeness bar colour — uses theme tokens
+  const barColor = completeness === 100 ? 'var(--success)' : 'var(--primary)'
+
   return (
     <div className="container">
       {/* Header */}
-      <div style={{ display: 'flex', alignItems: 'center', gap: '1rem', marginBottom: '1.5rem' }}>
+      <div style={{ display: 'flex', alignItems: 'center', gap: '1rem', marginBottom: '1.5rem', flexWrap: 'wrap' }}>
         <button
           className="btn btn-secondary"
           onClick={() => navigate(`/dogs/${id}`)}
@@ -97,10 +107,10 @@ function PedigreeView() {
           Back to Profile
         </button>
 
-        <div style={{ flex: 1 }}>
+        <div style={{ flex: 1, minWidth: '200px' }}>
           <h1 style={{ margin: 0, display: 'flex', alignItems: 'center', gap: '0.75rem' }}>
-            <GitBranch size={32} />
+            <GitBranch size={32} style={{ color: 'var(--primary)' }} />
-            {dog?.name}'s Pedigree
+            {dog?.name}'s {viewMode === 'ancestors' ? 'Pedigree' : 'Descendants'}
           </h1>
           {dog?.registration_number && (
             <p style={{ color: 'var(--text-secondary)', margin: '0.25rem 0 0 0' }}>
@@ -108,13 +118,34 @@ function PedigreeView() {
             </p>
           )}
         </div>
+
+        <div style={{ display: 'flex', background: 'var(--bg-tertiary)', padding: '4px', borderRadius: 'var(--radius)' }}>
+          <button
+            className={`btn ${viewMode === 'ancestors' ? 'btn-primary' : 'btn-ghost'}`}
+            onClick={() => setViewMode('ancestors')}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Ancestors
+          </button>
+          <button
+            className={`btn ${viewMode === 'descendants' ? 'btn-primary' : 'btn-ghost'}`}
+            onClick={() => setViewMode('descendants')}
+            style={{ padding: '0.5rem 1rem' }}
+          >
+            Descendants
+          </button>
+        </div>
       </div>
 
       {/* Stats Bar */}
       <div className="card" style={{ marginBottom: '1rem', padding: '1rem' }}>
         <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(200px, 1fr))', gap: '1.5rem' }}>
+
+          {viewMode === 'ancestors' && (
+            <>
+              {/* COI */}
               <div>
-            <div style={{ fontSize: '0.875rem', color: 'var(--text-secondary)', marginBottom: '0.25rem' }}>
+                <div style={{ fontSize: '0.875rem', color: 'var(--text-muted)', marginBottom: '0.25rem', textTransform: 'uppercase', letterSpacing: '0.05em', fontWeight: 500 }}>
                   Coefficient of Inbreeding
                 </div>
                 <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
@@ -133,37 +164,44 @@ function PedigreeView() {
                     {coiInfo.level}
                   </span>
                 </div>
-            <div style={{ fontSize: '0.75rem', color: 'var(--text-secondary)', marginTop: '0.25rem' }}>
+                <div style={{ fontSize: '0.75rem', color: 'var(--text-muted)', marginTop: '0.25rem' }}>
                   {coiInfo.description}
                 </div>
               </div>
 
+              {/* Completeness */}
               <div>
-            <div style={{ fontSize: '0.875rem', color: 'var(--text-secondary)', marginBottom: '0.25rem' }}>
+                <div style={{ fontSize: '0.875rem', color: 'var(--text-muted)', marginBottom: '0.25rem', textTransform: 'uppercase', letterSpacing: '0.05em', fontWeight: 500 }}>
                   Pedigree Completeness
                 </div>
-            <div style={{ fontSize: '1.5rem', fontWeight: '700' }}>
+                <div style={{ fontSize: '1.5rem', fontWeight: '700', color: 'var(--text-primary)' }}>
                   {completeness}%
                 </div>
                 <div style={{ marginTop: '0.5rem' }}>
                   <div style={{
-                height: '8px', 
+                    height: '6px',
-                background: '#e5e7eb', 
+                    background: 'var(--bg-tertiary)',
-                borderRadius: '4px',
+                    borderRadius: '3px',
-                overflow: 'hidden'
+                    overflow: 'hidden',
+                    border: '1px solid var(--border)'
                   }}>
                     <div style={{
                       height: '100%',
                       width: `${completeness}%`,
-                  background: completeness === 100 ? '#10b981' : '#3b82f6',
+                      background: barColor,
-                  transition: 'width 0.3s ease'
+                      borderRadius: '3px',
+                      transition: 'width 0.4s ease',
+                      boxShadow: `0 0 6px ${barColor}`
                     }} />
                   </div>
                 </div>
               </div>
+            </>
+          )}
 
+          {/* Generations */}
           <div>
-            <div style={{ fontSize: '0.875rem', color: 'var(--text-secondary)', marginBottom: '0.25rem' }}>
+            <div style={{ fontSize: '0.875rem', color: 'var(--text-muted)', marginBottom: '0.25rem', textTransform: 'uppercase', letterSpacing: '0.05em', fontWeight: 500 }}>
               Generations Displayed
             </div>
             <select
@@ -190,7 +228,7 @@ function PedigreeView() {
           />
         ) : (
           <div style={{ textAlign: 'center', padding: '4rem' }}>
-            <GitBranch size={64} style={{ color: 'var(--text-secondary)', margin: '0 auto 1rem' }} />
+            <GitBranch size={64} style={{ color: 'var(--text-muted)', margin: '0 auto 1rem' }} />
             <h3>No Pedigree Data Available</h3>
             <p style={{ color: 'var(--text-secondary)' }}>
               Add parent information to this dog to build the pedigree tree.
@@ -199,11 +237,19 @@ function PedigreeView() {
         )}
       </div>
 
-      {/* Help Text */}
+      {/* Tip */}
-      <div className="card" style={{ marginTop: '1rem', background: '#eff6ff', border: '1px solid #bfdbfe' }}>
+      <div className="card" style={{
-        <div style={{ fontSize: '0.875rem', color: '#1e40af' }}>
+        marginTop: '1rem',
-          <strong>💡 Tip:</strong> Click on any ancestor node to navigate to their profile. 
+        background: 'var(--bg-elevated)',
-          Use the zoom controls to explore the tree, or drag to pan around.
+        border: '1px solid var(--border-light)'
+      }}>
+        <div style={{ fontSize: '0.875rem', color: 'var(--text-secondary)', display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+          <span style={{ color: 'var(--primary)' }}>&#128161;</span>
+          <span>
+            <strong style={{ color: 'var(--text-primary)' }}>Tip:</strong>{' '}
+            Click any ancestor node to navigate to their profile.
+            Use the zoom controls or scroll to explore the tree, and drag to pan.
+          </span>
         </div>
       </div>
     </div>

client/src/pages/SettingsPage.jsx

@@ -0,0 +1,160 @@
+import { useState, useEffect } from 'react'
+import { Settings, Save, CheckCircle } from 'lucide-react'
+import { useSettings } from '../hooks/useSettings'
+
+const FIELDS = [
+  { key: 'kennel_name',    label: 'Kennel / App Name',  placeholder: 'BREEDR',               type: 'text',  required: true },
+  { key: 'kennel_tagline', label: 'Tagline',             placeholder: 'Raising champions since...', type: 'text' },
+  { key: 'kennel_address', label: 'Address',             placeholder: '123 Main St, City, ST', type: 'text' },
+  { key: 'kennel_phone',   label: 'Phone',               placeholder: '(555) 000-0000',       type: 'tel'  },
+  { key: 'kennel_email',   label: 'Email',               placeholder: 'kennel@example.com',   type: 'email'},
+  { key: 'kennel_website', label: 'Website',             placeholder: 'https://yourdomain.com', type: 'url' },
+  { key: 'kennel_akc_id',  label: 'AKC Kennel ID',       placeholder: 'Optional',             type: 'text' },
+  { key: 'kennel_breed',   label: 'Primary Breed',       placeholder: 'e.g. Labrador Retriever', type: 'text' },
+]
+
+export default function SettingsPage() {
+  const { settings, saveSettings } = useSettings()
+  const [form, setForm] = useState({})
+  const [saving, setSaving] = useState(false)
+  const [saved, setSaved] = useState(false)
+  const [error, setError] = useState(null)
+
+  useEffect(() => {
+    setForm({
+      kennel_name:    settings.kennel_name    || '',
+      kennel_tagline: settings.kennel_tagline || '',
+      kennel_address: settings.kennel_address || '',
+      kennel_phone:   settings.kennel_phone   || '',
+      kennel_email:   settings.kennel_email   || '',
+      kennel_website: settings.kennel_website || '',
+      kennel_akc_id:  settings.kennel_akc_id  || '',
+      kennel_breed:   settings.kennel_breed   || '',
+    })
+  }, [settings])
+
+  const handleChange = (key, value) => {
+    setForm(prev => ({ ...prev, [key]: value }))
+    setSaved(false)
+  }
+
+  const handleSubmit = async (e) => {
+    e.preventDefault()
+    if (!form.kennel_name?.trim()) {
+      setError('Kennel name is required.')
+      return
+    }
+    setSaving(true)
+    setError(null)
+    try {
+      await saveSettings(form)
+      setSaved(true)
+      setTimeout(() => setSaved(false), 3000)
+    } catch (err) {
+      setError('Failed to save settings. Please try again.')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  return (
+    <div className="container" style={{ paddingTop: '2rem', paddingBottom: '3rem', maxWidth: '720px' }}>
+      {/* Header */}
+      <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem', marginBottom: '0.5rem' }}>
+        <div style={{
+          width: '2.5rem', height: '2.5rem',
+          borderRadius: 'var(--radius)',
+          background: 'linear-gradient(135deg, var(--primary) 0%, var(--accent) 100%)',
+          display: 'flex', alignItems: 'center', justifyContent: 'center',
+          flexShrink: 0,
+          boxShadow: '0 4px 12px rgba(194,134,42,0.3)'
+        }}>
+          <Settings size={18} color="#0e0f0c" />
+        </div>
+        <div>
+          <h1 style={{ marginBottom: 0 }}>Settings</h1>
+          <p style={{ color: 'var(--text-secondary)', fontSize: '0.875rem' }}>
+            Kennel profile &amp; app configuration
+          </p>
+        </div>
+      </div>
+
+      <div className="divider" />
+
+      <form onSubmit={handleSubmit}>
+        <div className="card">
+          <h3 style={{ marginBottom: '1.5rem', color: 'var(--primary-light)' }}>Kennel Information</h3>
+
+          {error && <div className="error" style={{ marginBottom: '1rem' }}>{error}</div>}
+
+          <div className="form-grid">
+            {FIELDS.map(field => (
+              <div className="form-group" key={field.key}>
+                <label className="label">
+                  {field.label}
+                  {field.required && <span style={{ color: 'var(--danger)', marginLeft: '0.25rem' }}>*</span>}
+                </label>
+                <input
+                  type={field.type || 'text'}
+                  className="input"
+                  placeholder={field.placeholder}
+                  value={form[field.key] || ''}
+                  onChange={e => handleChange(field.key, e.target.value)}
+                />
+              </div>
+            ))}
+          </div>
+
+          <div className="divider" />
+
+          {/* Preview */}
+          {form.kennel_name && (
+            <div style={{
+              marginBottom: '1.5rem',
+              padding: '1rem',
+              background: 'var(--bg-tertiary)',
+              borderRadius: 'var(--radius)',
+              border: '1px solid var(--border)'
+            }}>
+              <p className="label" style={{ marginBottom: '0.5rem' }}>Header Preview</p>
+              <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                <span style={{
+                  fontSize: '1.75rem',
+                  fontWeight: 700,
+                  letterSpacing: '-0.025em',
+                  background: 'linear-gradient(135deg, #c9940a 0%, #b5620a 50%, #8b2500 100%)',
+                  WebkitBackgroundClip: 'text',
+                  WebkitTextFillColor: 'transparent',
+                  backgroundClip: 'text',
+                }}>
+                  {form.kennel_name}
+                </span>
+                {form.kennel_tagline && (
+                  <span style={{ color: 'var(--text-muted)', fontSize: '0.8rem', fontStyle: 'italic' }}>
+                    — {form.kennel_tagline}
+                  </span>
+                )}
+              </div>
+            </div>
+          )}
+
+          <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '0.75rem', alignItems: 'center' }}>
+            {saved && (
+              <span style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', color: 'var(--success)', fontSize: '0.875rem' }}>
+                <CheckCircle size={16} /> Saved!
+              </span>
+            )}
+            <button
+              type="submit"
+              className="btn btn-primary"
+              disabled={saving}
+            >
+              <Save size={16} />
+              {saving ? 'Saving...' : 'Save Settings'}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  )
+}

client/src/utils/pedigreeHelpers.js

@@ -144,16 +144,16 @@ export const formatCOI = (coi) => {
     }
   }
 
-  const value = coi.toFixed(2)
+  const value = (coi * 100).toFixed(2)
   
-  if (coi <= 5) {
+  if (coi <= 0.05) {
     return {
       value: `${value}%`,
       level: 'low',
       color: '#10b981',
       description: 'Low inbreeding - Excellent genetic diversity'
     }
-  } else if (coi <= 10) {
+  } else if (coi <= 0.10) {
     return {
       value: `${value}%`,
       level: 'medium',
@@ -181,3 +181,47 @@ export const getPedigreeCompleteness = (treeData, targetGenerations = 5) => {
   const actualCount = countAncestors(treeData)
   return Math.min(100, Math.round((actualCount / expectedTotal) * 100))
 }
+
+/**
+ * Transform API descendant data to react-d3-tree format
+ * @param {Object} dog - Dog object from API with nested offspring array
+ * @param {number} maxGenerations - Maximum generations to display (default 3)
+ * @returns {Object} Tree data in react-d3-tree format
+ */
+export const transformDescendantData = (dog, maxGenerations = 3) => {
+  if (!dog) return null
+
+  const buildTree = (dogData, generation = 0) => {
+    if (!dogData || generation >= maxGenerations) {
+      return null
+    }
+
+    const node = {
+      name: dogData.name || 'Unknown',
+      attributes: {
+        id: dogData.id,
+        sex: dogData.sex,
+        registration: dogData.registration_number || '',
+        birth_year: dogData.birth_date ? new Date(dogData.birth_date).getFullYear() : ''
+      },
+      children: []
+    }
+
+    if (dogData.offspring && dogData.offspring.length > 0) {
+      dogData.offspring.forEach(child => {
+        const childNode = buildTree(child, generation + 1)
+        if (childNode) {
+          node.children.push(childNode)
+        }
+      })
+    }
+
+    if (node.children.length === 0) {
+      delete node.children
+    }
+
+    return node
+  }
+
+  return buildTree(dog)
+}

docs/VERIFICATION_CHECKLIST.md

@@ -1,304 +0,0 @@
-# BREEDR Verification Checklist
-
-## Microchip Field Fix Verification
-
-### ✅ Schema Files (All Correct)
-
-#### 1. Database Schema: `server/db/init.js`
-- [x] **Line 29:** `microchip TEXT,` (no UNIQUE constraint)
-- [x] **Lines 38-43:** Partial unique index created
-  ```sql
-  CREATE UNIQUE INDEX IF NOT EXISTS idx_dogs_microchip 
-  ON dogs(microchip) 
-  WHERE microchip IS NOT NULL
-  ```
-
-**Status:** ✅ Correct for future installations
-
----
-
-#### 2. UI Form: `client/src/components/DogForm.jsx`
-- [x] **Line 150:** Microchip input has NO `required` attribute
-- [x] Label shows "Microchip Number" (no asterisk)
-- [x] Field is truly optional in the UI
-
-**Status:** ✅ Correct - users can leave microchip blank
-
----
-
-#### 3. Migration Script: `server/db/migrate_microchip.js`
-- [x] Exists and is executable
-- [x] Safely migrates existing databases
-- [x] Idempotent (can run multiple times)
-- [x] Preserves all data during migration
-
-**Status:** ✅ Available for existing installations
-
----
-
-#### 4. Migration Helper: `migrate-now.sh`
-- [x] Shell script for easy execution
-- [x] Checks if container is running
-- [x] Runs migration inside container
-- [x] Restarts container after migration
-
-**Status:** ✅ User-friendly migration tool
-
----
-
-#### 5. Documentation: `docs/MICROCHIP_FIX.md`
-- [x] Problem explanation
-- [x] Solution details
-- [x] Migration instructions (3 options)
-- [x] Verification tests
-- [x] Troubleshooting guide
-
-**Status:** ✅ Complete documentation
-
----
-
-#### 6. README: `README.md`
-- [x] Migration notice at top
-- [x] Link to detailed documentation
-- [x] Upgrade instructions included
-- [x] Recent updates section added
-
-**Status:** ✅ Users will see migration notice
-
----
-
-## For Future Installations
-
-### Fresh Install (No Migration Needed)
-
-When a user does a **fresh install** (no existing database):
-
-1. Container starts
-2. `server/db/init.js` runs automatically
-3. Database created with **correct schema**
-4. Microchip field is **optional from the start**
-5. No migration required ✅
-
-### Existing Installation (Migration Required)
-
-When a user **upgrades** from an old version:
-
-1. Pull latest code
-2. Rebuild Docker image
-3. Start container
-4. **Must run migration:** `docker exec -it breedr node server/db/migrate_microchip.js`
-5. Restart container
-6. Microchip field now optional ✅
-
----
-
-## Testing Checklist
-
-### Test 1: Add Dog Without Microchip
-```bash
-curl -X POST http://localhost:3000/api/dogs \
-  -H "Content-Type: application/json" \
-  -d '{"name":"TestDog1","breed":"Lab","sex":"male"}'
-```
-**Expected:** ✅ Success (201 Created)
-
-### Test 2: Add Multiple Dogs Without Microchips
-```bash
-curl -X POST http://localhost:3000/api/dogs \
-  -H "Content-Type: application/json" \
-  -d '{"name":"TestDog2","breed":"Lab","sex":"female"}'
-```
-**Expected:** ✅ Success (multiple NULL values allowed)
-
-### Test 3: Add Dog With Microchip
-```bash
-curl -X POST http://localhost:3000/api/dogs \
-  -H "Content-Type: application/json" \
-  -d '{"name":"TestDog3","breed":"Lab","sex":"male","microchip":"123456789"}'
-```
-**Expected:** ✅ Success
-
-### Test 4: Duplicate Microchip Should Fail
-```bash
-curl -X POST http://localhost:3000/api/dogs \
-  -H "Content-Type: application/json" \
-  -d '{"name":"TestDog4","breed":"Lab","sex":"female","microchip":"123456789"}'
-```
-**Expected:** ❌ Error (UNIQUE constraint still enforced for non-NULL)
-
----
-
-## Database Verification
-
-### Check Schema Directly
-
-```bash
-# Enter container
-docker exec -it breedr sh
-
-# Open SQLite CLI
-sqlite3 /app/data/breedr.db
-
-# Check table schema
-.schema dogs
-
-# Should show:
-# microchip TEXT,  (no UNIQUE)
-
-# Check indexes
-.indexes dogs
-
-# Should show:
-# idx_dogs_microchip (partial index)
-
-# Verify partial index
-SELECT sql FROM sqlite_master 
-WHERE type='index' AND name='idx_dogs_microchip';
-
-# Should show:
-# CREATE UNIQUE INDEX idx_dogs_microchip 
-# ON dogs(microchip) WHERE microchip IS NOT NULL
-```
-
----
-
-## Rollback Plan
-
-If something goes wrong:
-
-### Option A: Restore Backup
-```bash
-docker stop breedr
-cp /mnt/user/appdata/breedr/breedr.db.backup \
-   /mnt/user/appdata/breedr/breedr.db
-docker start breedr
-```
-
-### Option B: Re-run Migration
-```bash
-docker exec -it breedr node server/db/migrate_microchip.js
-docker restart breedr
-```
-
-### Option C: Fresh Database (Data Loss)
-```bash
-docker stop breedr
-rm /mnt/user/appdata/breedr/breedr.db
-docker start breedr
-```
-
----
-
-## Deployment Verification
-
-After deploying to production:
-
-- [ ] Check container logs for schema initialization
-- [ ] Verify database schema with SQLite CLI
-- [ ] Test adding dog without microchip via UI
-- [ ] Test adding dog with microchip via UI
-- [ ] Confirm no UNIQUE constraint errors
-- [ ] Verify partial index exists
-- [ ] Test duplicate microchip still fails
-
----
-
-## Common Issues
-
-### Issue: Still Getting UNIQUE Constraint Error
-
-**Cause:** Migration not run on existing database
-
-**Solution:**
-```bash
-docker exec -it breedr node server/db/migrate_microchip.js
-docker restart breedr
-```
-
-### Issue: Migration Script Not Found
-
-**Cause:** Old code still in container
-
-**Solution:**
-```bash
-cd /mnt/user/appdata/breedr-build
-git pull
-docker build -t breedr:latest .
-docker stop breedr && docker rm breedr
-# Recreate container with new image
-```
-
-### Issue: Microchip Required in UI
-
-**Cause:** Browser cached old JavaScript
-
-**Solution:**
-- Hard refresh: Ctrl+Shift+R (Windows/Linux) or Cmd+Shift+R (Mac)
-- Clear browser cache
-- Try incognito/private window
-
----
-
-## File Manifest
-
-### Core Files (Must Be Present)
-- ✅ `server/db/init.js` - Database schema (corrected)
-- ✅ `server/db/migrate_microchip.js` - Migration script
-- ✅ `client/src/components/DogForm.jsx` - UI form (microchip optional)
-- ✅ `migrate-now.sh` - Helper script
-- ✅ `docs/MICROCHIP_FIX.md` - Detailed documentation
-- ✅ `docs/VERIFICATION_CHECKLIST.md` - This file
-- ✅ `README.md` - Updated with migration notice
-
-### Validation Commands
-
-```bash
-# Check all files exist
-ls -la server/db/init.js
-ls -la server/db/migrate_microchip.js
-ls -la client/src/components/DogForm.jsx
-ls -la migrate-now.sh
-ls -la docs/MICROCHIP_FIX.md
-ls -la docs/VERIFICATION_CHECKLIST.md
-
-# Verify microchip field in init.js
-grep -n "microchip TEXT" server/db/init.js
-# Should show line 29 with NO UNIQUE
-
-# Verify partial index
-grep -A2 "idx_dogs_microchip" server/db/init.js
-# Should show WHERE clause
-
-# Verify form has no required
-grep -n 'name="microchip"' client/src/components/DogForm.jsx
-# Should NOT have required attribute
-```
-
----
-
-## Sign-Off
-
-### Pre-Deployment Checklist
-- [x] Schema file correct (no UNIQUE on microchip)
-- [x] Partial index created (WHERE IS NOT NULL)
-- [x] UI form allows empty microchip
-- [x] Migration script tested
-- [x] Documentation complete
-- [x] README updated
-- [x] Tests passing
-
-### Post-Deployment Checklist
-- [ ] Container started successfully
-- [ ] Schema verified in database
-- [ ] UI allows empty microchip
-- [ ] Multiple NULL values work
-- [ ] Unique constraint still enforced for non-NULL
-- [ ] No errors in logs
-
----
-
-**Last Verified:** March 8, 2026
-
-**Status:** ✅ All files correct for future installations
-
-**Migration Required:** Only for existing databases (one-time)

server/db/init.js

@@ -2,174 +2,239 @@ const Database = require('better-sqlite3');
 const path = require('path');
 const fs = require('fs');
 
-function initDatabase(dbPath) {
+const dbPath = path.join(__dirname, '../../data');
-  // Ensure data directory exists
+const db = new Database(path.join(dbPath, 'breedr.db'));
-  const dir = path.dirname(dbPath);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
 
-  const db = new Database(dbPath);
+function getDatabase() {
+  return db;
+}
 
-  // Enable foreign keys
+function initDatabase() {
   db.pragma('foreign_keys = ON');
+  db.pragma('journal_mode = WAL');
 
-  console.log('Initializing database schema...');
+  // ── Dogs ────────────────────────────────────────────────────────────────
-
-  // Dogs table - NO sire/dam columns, only litter_id
   db.exec(`
     CREATE TABLE IF NOT EXISTS dogs (
       id                          INTEGER PRIMARY KEY AUTOINCREMENT,
       name                        TEXT NOT NULL,
-      registration_number TEXT UNIQUE,
+      registration_number         TEXT,
       breed                       TEXT NOT NULL,
       sex                         TEXT NOT NULL CHECK(sex IN ('male', 'female')),
-      birth_date DATE,
+      birth_date                  TEXT,
       color                       TEXT,
       microchip                   TEXT,
-      photo_urls TEXT, -- JSON array of photo URLs
-      notes TEXT,
       litter_id                   INTEGER,
       is_active                   INTEGER DEFAULT 1,
-      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      is_champion                 INTEGER DEFAULT 0,
-      updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      is_external                 INTEGER DEFAULT 0,
-      FOREIGN KEY (litter_id) REFERENCES litters(id) ON DELETE SET NULL
+      chic_number                 TEXT,
+      age_at_death                TEXT,
+      cause_of_death              TEXT,
+      photo_urls                  TEXT DEFAULT '[]',
+      notes                       TEXT,
+      created_at                  TEXT DEFAULT (datetime('now')),
+      updated_at                  TEXT DEFAULT (datetime('now'))
     )
   `);
 
-  // Create unique index for microchip that allows NULL values
+  // migrate: add columns if missing (safe on existing DBs)
-  db.exec(`
+  const dogMigrations = [
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_dogs_microchip 
+    ['is_champion',    'INTEGER DEFAULT 0'],
-    ON dogs(microchip) 
+    ['is_external',    'INTEGER DEFAULT 0'],
-    WHERE microchip IS NOT NULL
+    ['chic_number',    'TEXT'],
-  `);
+    ['age_at_death',   'TEXT'],
+    ['cause_of_death', 'TEXT'],
+  ];
+  for (const [col, def] of dogMigrations) {
+    try { db.exec(`ALTER TABLE dogs ADD COLUMN ${col} ${def}`); } catch (_) { /* already exists */ }
+  }
 
-  // Parents table - Stores sire/dam relationships
+  // ── Parents ──────────────────────────────────────────────────────────────
   db.exec(`
     CREATE TABLE IF NOT EXISTS parents (
       id          INTEGER PRIMARY KEY AUTOINCREMENT,
       dog_id      INTEGER NOT NULL,
       parent_id   INTEGER NOT NULL,
       parent_type TEXT NOT NULL CHECK(parent_type IN ('sire', 'dam')),
-      FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE,
+      FOREIGN KEY (dog_id)    REFERENCES dogs(id),
-      FOREIGN KEY (parent_id) REFERENCES dogs(id) ON DELETE CASCADE,
+      FOREIGN KEY (parent_id) REFERENCES dogs(id)
-      UNIQUE(dog_id, parent_type)
     )
   `);
 
-  // Litters table - Breeding records
+  // ── Breeding Records ─────────────────────────────────────────────────────
   db.exec(`
-    CREATE TABLE IF NOT EXISTS litters (
+    CREATE TABLE IF NOT EXISTS breeding_records (
       id                  INTEGER PRIMARY KEY AUTOINCREMENT,
       sire_id             INTEGER NOT NULL,
       dam_id              INTEGER NOT NULL,
-      breeding_date DATE NOT NULL,
+      breeding_date       TEXT,
-      whelping_date DATE,
+      due_date            TEXT,
-      puppy_count INTEGER DEFAULT 0,
+      conception_method   TEXT CHECK(conception_method IN ('natural', 'ai', 'frozen', 'surgical')),
       notes               TEXT,
-      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      created_at          TEXT DEFAULT (datetime('now')),
-      FOREIGN KEY (sire_id) REFERENCES dogs(id) ON DELETE CASCADE,
+      updated_at          TEXT DEFAULT (datetime('now')),
-      FOREIGN KEY (dam_id) REFERENCES dogs(id) ON DELETE CASCADE
+      FOREIGN KEY (sire_id) REFERENCES dogs(id),
+      FOREIGN KEY (dam_id)  REFERENCES dogs(id)
     )
   `);
 
-  // Health records table
+  // ── Litters ──────────────────────────────────────────────────────────────
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS litters (
+      id              INTEGER PRIMARY KEY AUTOINCREMENT,
+      breeding_id     INTEGER,
+      sire_id         INTEGER NOT NULL,
+      dam_id          INTEGER NOT NULL,
+      whelp_date      TEXT,
+      total_count     INTEGER DEFAULT 0,
+      male_count      INTEGER DEFAULT 0,
+      female_count    INTEGER DEFAULT 0,
+      stillborn_count INTEGER DEFAULT 0,
+      notes           TEXT,
+      created_at      TEXT DEFAULT (datetime('now')),
+      updated_at      TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (breeding_id) REFERENCES breeding_records(id),
+      FOREIGN KEY (sire_id)     REFERENCES dogs(id),
+      FOREIGN KEY (dam_id)      REFERENCES dogs(id)
+    )
+  `);
+
+  // ── Health Records (OFA-extended) ─────────────────────────────────────────
   db.exec(`
     CREATE TABLE IF NOT EXISTS health_records (
       id             INTEGER PRIMARY KEY AUTOINCREMENT,
       dog_id         INTEGER NOT NULL,
-      record_type TEXT NOT NULL CHECK(record_type IN ('test', 'vaccination', 'exam', 'treatment', 'certification')),
+      record_type    TEXT NOT NULL,
+      test_type      TEXT,
       test_name      TEXT,
-      test_date DATE NOT NULL,
+      test_date      TEXT NOT NULL,
+      ofa_result     TEXT,
+      ofa_number     TEXT,
+      performed_by   TEXT,
+      expires_at     TEXT,
+      document_url   TEXT,
       result         TEXT,
+      vet_name       TEXT,
+      next_due       TEXT,
+      notes          TEXT,
+      created_at     TEXT DEFAULT (datetime('now')),
+      updated_at     TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (dog_id) REFERENCES dogs(id)
+    )
+  `);
+
+  // migrate: add OFA-specific columns if missing (covers existing DBs)
+  const healthMigrations = [
+    ['test_type',     'TEXT'],
+    ['ofa_result',   'TEXT'],
+    ['ofa_number',   'TEXT'],
+    ['performed_by', 'TEXT'],
+    ['expires_at',   'TEXT'],
+    ['document_url', 'TEXT'],
+    ['result',       'TEXT'],
+    ['vet_name',     'TEXT'],
+    ['next_due',     'TEXT'],
+  ];
+  for (const [col, def] of healthMigrations) {
+    try { db.exec(`ALTER TABLE health_records ADD COLUMN ${col} ${def}`); } catch (_) { /* already exists */ }
+  }
+
+  // ── Genetic Tests (DNA Panel) ──────────────────────────────────────────────
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS genetic_tests (
+      id              INTEGER PRIMARY KEY AUTOINCREMENT,
+      dog_id          INTEGER NOT NULL,
+      test_provider   TEXT,
+      marker          TEXT NOT NULL,
+      result          TEXT NOT NULL CHECK(result IN ('clear', 'carrier', 'affected', 'not_tested')),
+      test_date       TEXT,
       document_url    TEXT,
       notes           TEXT,
-      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      created_at      TEXT DEFAULT (datetime('now')),
-      FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE
+      updated_at      TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (dog_id) REFERENCES dogs(id)
     )
   `);
 
-  // Heat cycles table
+  const geneticMigrations = [
+    ['test_provider', 'TEXT'],
+    ['marker', "TEXT NOT NULL DEFAULT 'unknown'"],
+    ['result', "TEXT NOT NULL DEFAULT 'not_tested'"],
+    ['test_date', 'TEXT'],
+    ['document_url', 'TEXT'],
+    ['notes', 'TEXT']
+  ];
+  for (const [col, def] of geneticMigrations) {
+    try { db.exec(`ALTER TABLE genetic_tests ADD COLUMN ${col} ${def}`); } catch (_) {}
+  }
+
+  // ── Cancer History ────────────────────────────────────────────────────────
   db.exec(`
-    CREATE TABLE IF NOT EXISTS heat_cycles (
+    CREATE TABLE IF NOT EXISTS cancer_history (
       id                  INTEGER PRIMARY KEY AUTOINCREMENT,
       dog_id              INTEGER NOT NULL,
-      start_date DATE NOT NULL,
+      cancer_type         TEXT,
-      end_date DATE,
+      age_at_diagnosis    TEXT,
-      progesterone_peak_date DATE,
+      age_at_death        TEXT,
-      breeding_date DATE,
+      cause_of_death      TEXT,
-      breeding_successful INTEGER DEFAULT 0,
       notes               TEXT,
-      created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      created_at          TEXT DEFAULT (datetime('now')),
-      FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE
+      updated_at          TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (dog_id) REFERENCES dogs(id)
     )
   `);
 
-  // Traits table - Genetic trait tracking
+  const cancerMigrations = [
+    ['cancer_type', 'TEXT'],
+    ['age_at_diagnosis', 'TEXT'],
+    ['age_at_death', 'TEXT'],
+    ['cause_of_death', 'TEXT'],
+    ['notes', 'TEXT']
+  ];
+  for (const [col, def] of cancerMigrations) {
+    try { db.exec(`ALTER TABLE cancer_history ADD COLUMN ${col} ${def}`); } catch (_) {}
+  }
+
+  // ── Settings ──────────────────────────────────────────────────────────────
   db.exec(`
-    CREATE TABLE IF NOT EXISTS traits (
+    CREATE TABLE IF NOT EXISTS settings (
       id              INTEGER PRIMARY KEY AUTOINCREMENT,
-      dog_id INTEGER NOT NULL,
+      kennel_name     TEXT DEFAULT 'BREEDR',
-      trait_category TEXT NOT NULL,
+      kennel_tagline  TEXT,
-      trait_name TEXT NOT NULL,
+      kennel_address  TEXT,
-      trait_value TEXT NOT NULL,
+      kennel_phone    TEXT,
-      inherited_from INTEGER,
+      kennel_email    TEXT,
-      notes TEXT,
+      kennel_website  TEXT,
-      FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE,
+      kennel_akc_id   TEXT,
-      FOREIGN KEY (inherited_from) REFERENCES dogs(id) ON DELETE SET NULL
+      kennel_breed    TEXT,
+      owner_name      TEXT,
+      created_at      TEXT DEFAULT (datetime('now')),
+      updated_at      TEXT DEFAULT (datetime('now'))
     )
   `);
 
-  // Create indexes for performance
+  const kennelCols = [
-  db.exec(`
+    ['kennel_name',    "TEXT DEFAULT 'BREEDR'"],
-    CREATE INDEX IF NOT EXISTS idx_dogs_name ON dogs(name);
+    ['kennel_tagline', 'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_dogs_registration ON dogs(registration_number);
+    ['kennel_address', 'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_dogs_litter ON dogs(litter_id);
+    ['kennel_phone',   'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_parents_dog ON parents(dog_id);
+    ['kennel_email',   'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_parents_parent ON parents(parent_id);
+    ['kennel_website', 'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_litters_sire ON litters(sire_id);
+    ['kennel_akc_id',  'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_litters_dam ON litters(dam_id);
+    ['kennel_breed',   'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_health_dog ON health_records(dog_id);
+    ['owner_name',     'TEXT'],
-    CREATE INDEX IF NOT EXISTS idx_heat_dog ON heat_cycles(dog_id);
+  ];
-    CREATE INDEX IF NOT EXISTS idx_traits_dog ON traits(dog_id);
+  for (const [col, def] of kennelCols) {
-  `);
+    try { db.exec(`ALTER TABLE settings ADD COLUMN ${col} ${def}`); } catch (_) { /* already exists */ }
+  }
 
-  // Create trigger for updated_at
+  const existing = db.prepare('SELECT id FROM settings LIMIT 1').get();
-  db.exec(`
+  if (!existing) {
-    CREATE TRIGGER IF NOT EXISTS update_dogs_timestamp 
+    db.prepare(`INSERT INTO settings (kennel_name) VALUES (?)`).run('BREEDR');
-    AFTER UPDATE ON dogs
+  }
-    FOR EACH ROW
-    BEGIN
-      UPDATE dogs SET updated_at = CURRENT_TIMESTAMP WHERE id = NEW.id;
-    END;
-  `);
 
-  console.log('✓ Database schema initialized successfully!');
+  console.log('✓ Database initialized successfully');
-  console.log('✓ Dogs table: NO sire/dam columns, uses parents table');
-  console.log('✓ Parents table: Stores sire/dam relationships');
-  console.log('✓ Litters table: Links puppies via litter_id');
-  
-  db.close();
-  return true;
 }
 
-function getDatabase() {
+module.exports = { getDatabase, initDatabase };
-  const dbPath = process.env.DB_PATH || path.join(__dirname, '../../data/breedr.db');
-  const db = new Database(dbPath);
-  db.pragma('foreign_keys = ON');
-  return db;
-}
-
-module.exports = { initDatabase, getDatabase };
-
-// Run initialization if called directly
-if (require.main === module) {
-  const dbPath = process.env.DB_PATH || path.join(__dirname, '../../data/breedr.db');
-  console.log('\n==========================================');
-  console.log('BREEDR Database Initialization');
-  console.log('==========================================');
-  console.log(`Database: ${dbPath}`);
-  console.log('==========================================\n');
-  initDatabase(dbPath);
-  console.log('\n✓ Database ready!\n');
-}

server/db/migrations.js

@@ -30,7 +30,6 @@ class MigrationRunner {
       const result = this.db.prepare('SELECT version FROM schema_version ORDER BY version DESC LIMIT 1').get();
       return result ? result.version : 0;
     } catch (error) {
-      // schema_version table doesn't exist, create it
       this.db.exec(`
         CREATE TABLE IF NOT EXISTS schema_version (
           version INTEGER PRIMARY KEY,
@@ -59,6 +58,19 @@ class MigrationRunner {
     return columns.some(col => col.name === 'litter_id');
   }
 
+  // Check if health_records has the old restrictive CHECK constraint on record_type
+  healthRecordsHasOldConstraint() {
+    try {
+      const row = this.db.prepare(
+        "SELECT sql FROM sqlite_master WHERE type='table' AND name='health_records'"
+      ).get();
+      if (!row) return false;
+      return row.sql.includes("'test', 'vaccination', 'exam', 'treatment', 'certification'");
+    } catch (_) {
+      return false;
+    }
+  }
+
   // Migration 1: Remove sire/dam columns, use parents table
   migration001_removeOldParentColumns() {
     console.log('[Migration 001] Checking for old sire/dam columns...');
@@ -74,7 +86,6 @@ class MigrationRunner {
     this.db.exec('BEGIN TRANSACTION');
 
     try {
-      // Ensure parents table exists
       this.db.exec(`
         CREATE TABLE IF NOT EXISTS parents (
           id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -90,14 +101,12 @@ class MigrationRunner {
         CREATE INDEX IF NOT EXISTS idx_parents_parent ON parents(parent_id);
       `);
 
-      // Backup current dogs table
       this.db.exec('DROP TABLE IF EXISTS dogs_migration_backup');
       this.db.exec('CREATE TABLE dogs_migration_backup AS SELECT * FROM dogs');
       
       const backupCount = this.db.prepare('SELECT COUNT(*) as count FROM dogs_migration_backup').get();
       console.log(`[Migration 001] Backed up ${backupCount.count} dogs`);
 
-      // Migrate parent relationships to parents table
       const columns = this.db.prepare("PRAGMA table_info(dogs_migration_backup)").all();
       const hasSire = columns.some(col => col.name === 'sire');
       const hasDam = columns.some(col => col.name === 'dam');
@@ -119,11 +128,9 @@ class MigrationRunner {
         console.log(`[Migration 001] Migrated ${damResult.changes} dam relationships`);
       }
 
-      // Drop old dogs table
       this.db.exec('DROP TABLE dogs');
       console.log('[Migration 001] Dropped old dogs table');
 
-      // Create new dogs table with correct schema
       this.db.exec(`
         CREATE TABLE dogs (
           id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -147,10 +154,9 @@ class MigrationRunner {
       `);
       console.log('[Migration 001] Created new dogs table');
 
-      // Restore data (excluding sire/dam columns)
       const columnList = ['id', 'name', 'registration_number', 'microchip', 'sex', 'birth_date', 'breed', 'color', 'weight', 'height', 'notes', 'photo_urls', 'is_active', 'created_at', 'updated_at'];
       if (hasLitterId) {
-        columnList.splice(11, 0, 'litter_id'); // Insert after notes
+        columnList.splice(11, 0, 'litter_id');
       }
 
       const columnsStr = columnList.join(', ');
@@ -159,7 +165,6 @@ class MigrationRunner {
       const restoredCount = this.db.prepare('SELECT COUNT(*) as count FROM dogs').get();
       console.log(`[Migration 001] Restored ${restoredCount.count} dogs`);
 
-      // Create indexes
       this.db.exec(`
         CREATE UNIQUE INDEX IF NOT EXISTS idx_dogs_microchip 
         ON dogs(microchip) WHERE microchip IS NOT NULL;
@@ -168,9 +173,7 @@ class MigrationRunner {
         CREATE INDEX IF NOT EXISTS idx_dogs_registration ON dogs(registration_number);
       `);
 
-      // Clean up backup
       this.db.exec('DROP TABLE dogs_migration_backup');
-
       this.db.exec('COMMIT');
       console.log('[Migration 001] ✓ Migration complete!');
 
@@ -204,6 +207,90 @@ class MigrationRunner {
     }
   }
 
+  // Migration 3: Remove old restrictive CHECK constraint on health_records.record_type
+  // Uses dynamic column detection so it works regardless of which columns exist in the old table
+  migration003_removeHealthRecordTypeConstraint() {
+    console.log('[Migration 003] Checking health_records.record_type constraint...');
+
+    if (!this.healthRecordsHasOldConstraint()) {
+      console.log('[Migration 003] No old constraint found, skipping');
+      return;
+    }
+
+    console.log('[Migration 003] Rebuilding health_records table to remove old CHECK constraint...');
+
+    this.db.exec('BEGIN TRANSACTION');
+
+    try {
+      // Backup existing records
+      this.db.exec('DROP TABLE IF EXISTS health_records_migration_backup');
+      this.db.exec('CREATE TABLE health_records_migration_backup AS SELECT * FROM health_records');
+
+      const backupCount = this.db.prepare('SELECT COUNT(*) as count FROM health_records_migration_backup').get();
+      console.log(`[Migration 003] Backed up ${backupCount.count} health records`);
+
+      // Dynamically get the columns that actually exist in the backup
+      // This handles old DBs that may be missing newer columns like updated_at
+      const existingCols = this.db.prepare('PRAGMA table_info(health_records_migration_backup)').all();
+      const existingColNames = existingCols.map(c => c.name);
+      console.log(`[Migration 003] Existing columns: ${existingColNames.join(', ')}`);
+
+      // Drop old constrained table
+      this.db.exec('DROP TABLE health_records');
+
+      // Recreate WITHOUT the old CHECK constraint
+      this.db.exec(`
+        CREATE TABLE health_records (
+          id           INTEGER PRIMARY KEY AUTOINCREMENT,
+          dog_id       INTEGER NOT NULL,
+          record_type  TEXT NOT NULL,
+          test_type    TEXT,
+          test_name    TEXT,
+          test_date    TEXT NOT NULL,
+          ofa_result   TEXT,
+          ofa_number   TEXT,
+          performed_by TEXT,
+          expires_at   TEXT,
+          document_url TEXT,
+          result       TEXT,
+          vet_name     TEXT,
+          next_due     TEXT,
+          notes        TEXT,
+          created_at   TEXT DEFAULT (datetime('now')),
+          updated_at   TEXT DEFAULT (datetime('now')),
+          FOREIGN KEY (dog_id) REFERENCES dogs(id) ON DELETE CASCADE
+        )
+      `);
+
+      // Only restore columns that existed in the backup — new columns get their DEFAULT values
+      const newCols = ['id', 'dog_id', 'record_type', 'test_type', 'test_name', 'test_date',
+                       'ofa_result', 'ofa_number', 'performed_by', 'expires_at',
+                       'document_url', 'result', 'vet_name', 'next_due', 'notes',
+                       'created_at', 'updated_at'];
+      const colsToRestore = newCols.filter(c => existingColNames.includes(c));
+      const colList = colsToRestore.join(', ');
+
+      console.log(`[Migration 003] Restoring columns: ${colList}`);
+
+      this.db.exec(`
+        INSERT INTO health_records (${colList})
+        SELECT ${colList} FROM health_records_migration_backup
+      `);
+
+      const restoredCount = this.db.prepare('SELECT COUNT(*) as count FROM health_records').get();
+      console.log(`[Migration 003] Restored ${restoredCount.count} health records`);
+
+      this.db.exec('DROP TABLE health_records_migration_backup');
+      this.db.exec('COMMIT');
+      console.log('[Migration 003] ✓ health_records constraint removed successfully!');
+
+    } catch (error) {
+      this.db.exec('ROLLBACK');
+      console.error('[Migration 003] ✗ Migration failed:', error.message);
+      throw error;
+    }
+  }
+
   // Validate final schema
   validateSchema() {
     console.log('[Validation] Checking database schema...');
@@ -240,6 +327,10 @@ class MigrationRunner {
           const tables = this.db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='litters'").all();
           return tables.length > 0;
         }
+      },
+      {
+        name: 'health_records has no old record_type CHECK constraint',
+        test: () => !this.healthRecordsHasOldConstraint()
       }
     ];
 
@@ -273,7 +364,6 @@ class MigrationRunner {
       const currentVersion = this.getSchemaVersion();
       console.log(`Current schema version: ${currentVersion}\n`);
 
-      // Run migrations in order
       if (currentVersion < 1) {
         this.migration001_removeOldParentColumns();
         this.recordMigration(1, 'Migrate sire/dam columns to parents table');
@@ -284,7 +374,11 @@ class MigrationRunner {
         this.recordMigration(2, 'Add litter_id column to dogs table');
       }
 
-      // Validate final schema
+      if (currentVersion < 3) {
+        this.migration003_removeHealthRecordTypeConstraint();
+        this.recordMigration(3, 'Remove old record_type CHECK constraint from health_records');
+      }
+
       console.log('');
       const isValid = this.validateSchema();
 
@@ -306,7 +400,6 @@ class MigrationRunner {
   }
 }
 
-// Function to run migrations
 function runMigrations(dbPath) {
   const runner = new MigrationRunner(dbPath);
   return runner.runMigrations();
@@ -314,7 +407,6 @@ function runMigrations(dbPath) {
 
 module.exports = { MigrationRunner, runMigrations };
 
-// Run migrations if called directly
 if (require.main === module) {
   const dbPath = process.env.DB_PATH || path.join(__dirname, '../../data/breedr.db');
   runMigrations(dbPath);

server/index.js

@@ -3,76 +3,70 @@ const cors = require('cors');
 const helmet  = require('helmet');
 const path    = require('path');
 const fs      = require('fs');
+const { runMigrations } = require('./db/migrations');
 const { initDatabase } = require('./db/init');
+const { logStartupBanner } = require('./utils/startupLog');
 
 const app  = express();
 const PORT = process.env.PORT || 3000;
-const DB_PATH = process.env.DB_PATH || path.join(__dirname, '../data/breedr.db');
+
+// Ensure required directories exist
 const UPLOAD_PATH = process.env.UPLOAD_PATH || path.join(__dirname, '../uploads');
 const STATIC_PATH = process.env.STATIC_PATH || path.join(__dirname, '../static');
+const DATA_DIR    = process.env.DATA_DIR    || path.join(__dirname, '../data');
 
-// Ensure directories exist
+[DATA_DIR, UPLOAD_PATH, STATIC_PATH].forEach(dir => {
-const dataDir = path.dirname(DB_PATH);
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-if (!fs.existsSync(dataDir)) {
+});
-  fs.mkdirSync(dataDir, { recursive: true });
+
-}
+// Run migrations BEFORE initializing the DB connection used by routes
-if (!fs.existsSync(UPLOAD_PATH)) {
+const DB_PATH = process.env.DB_PATH || path.join(__dirname, '../data/breedr.db');
-  fs.mkdirSync(UPLOAD_PATH, { recursive: true });
+console.log('Running database migrations...');
-}
+try {
-if (!fs.existsSync(STATIC_PATH)) {
+  runMigrations(DB_PATH);
-  fs.mkdirSync(STATIC_PATH, { recursive: true });
+} catch (err) {
+  console.error('Migration failed — aborting startup:', err.message);
+  process.exit(1);
 }
 
-// Initialize database schema (creates tables if they don't exist)
+// Init DB (path is managed internally by db/init.js)
 console.log('Initializing database...');
-initDatabase(DB_PATH);
+initDatabase();
+const dbStatus = '✓ Connected';
 console.log('✓ Database ready!\n');
 
-// Middleware
+// ── Middleware ─────────────────────────────────────────────────────────
-app.use(helmet({
+app.use(helmet({ contentSecurityPolicy: false }));
-  contentSecurityPolicy: false, // Allow inline scripts for React
-}));
 app.use(cors());
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
-// Static asset routes — registered BEFORE React catch-all so they are
+// ── Static file serving ──────────────────────────────────────────────
-// resolved directly and never fall through to index.html
 app.use('/uploads', express.static(UPLOAD_PATH));
 app.use('/static',  express.static(STATIC_PATH));
+app.use('/uploads', (_req, res) => res.status(404).json({ error: 'Upload not found' }));
+app.use('/static',  (_req, res) => res.status(404).json({ error: 'Static asset not found' }));
 
-// Explicit 404 for missing asset files so the catch-all never intercepts them
+// ── API Routes ──────────────────────────────────────────────────────────
-app.use('/uploads', (req, res) => res.status(404).json({ error: 'Upload not found' }));
-app.use('/static', (req, res) => res.status(404).json({ error: 'Static asset not found' }));
-
-// API Routes
 app.use('/api/dogs',    require('./routes/dogs'));
 app.use('/api/litters',  require('./routes/litters'));
 app.use('/api/health',   require('./routes/health'));
+app.use('/api/genetics', require('./routes/genetics'));
 app.use('/api/pedigree', require('./routes/pedigree'));
 app.use('/api/breeding', require('./routes/breeding'));
+app.use('/api/settings', require('./routes/settings'));
 
-// Health check endpoint
+// ── Production SPA fallback ────────────────────────────────────────────────
-app.get('/api/health', (req, res) => {
-  res.json({ status: 'ok', timestamp: new Date().toISOString() });
-});
-
-// Serve React frontend in production
-// The catch-all is intentionally placed AFTER all asset/API routes above.
-// express.static(clientBuildPath) handles real build assets (JS/CSS chunks).
-// The scoped '*' only fires for HTML5 client-side routes (e.g. /dogs, /litters).
 if (process.env.NODE_ENV === 'production') {
-  const clientBuildPath = path.join(__dirname, '../client/dist');
+  const clientBuild = path.join(__dirname, '../client/dist');
-  app.use(express.static(clientBuildPath));
+  app.use(express.static(clientBuild));
-
+  app.get(/^(?!\/(?:api|static|uploads)\/).*$/, (_req, res) => {
-  // Only send index.html for non-asset, non-api paths
+    res.sendFile(path.join(clientBuild, 'index.html'));
-  app.get(/^(?!\/(api|static|uploads)\/).*$/, (req, res) => {
-    res.sendFile(path.join(clientBuildPath, 'index.html'));
   });
 }
 
-// Error handling middleware
+// ── Global error handler ──────────────────────────────────────────────────
-app.use((err, req, res, next) => {
+app.use((err, _req, res, _next) => {
   console.error('Error:', err);
   res.status(err.status || 500).json({
     error: err.message || 'Internal server error',
@@ -80,17 +74,16 @@ app.use((err, req, res, next) => {
   });
 });
 
-// Start server
 app.listen(PORT, '0.0.0.0', () => {
-  console.log(`\n🐕 BREEDR Server Running`);
+  logStartupBanner({
-  console.log(`==============================`);
+    appName: 'BREEDR',
-  console.log(`Environment: ${process.env.NODE_ENV || 'development'}`);
+    port: PORT,
-  console.log(`Port: ${PORT}`);
+    environment: process.env.NODE_ENV || 'development',
-  console.log(`Database: ${DB_PATH}`);
+    dataDir: DATA_DIR,
-  console.log(`Uploads: ${UPLOAD_PATH}`);
+    uploadPath: UPLOAD_PATH,
-  console.log(`Static: ${STATIC_PATH}`);
+    staticPath: STATIC_PATH,
-  console.log(`Access: http://localhost:${PORT}`);
+    dbStatus: dbStatus
-  console.log(`==============================\n`);
+  });
 });
 
 module.exports = app;

server/routes/dogs.js

@@ -5,7 +5,6 @@ const multer = require('multer');
 const path   = require('path');
 const fs     = require('fs');
 
-// Configure multer for photo uploads
 const storage = multer.diskStorage({
   destination: (req, file, cb) => {
     const uploadPath = process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads');
@@ -19,12 +18,10 @@ const storage = multer.diskStorage({
 
 const upload = multer({
   storage,
-  limits: { fileSize: 10 * 1024 * 1024 }, // 10MB limit
+  limits: { fileSize: 10 * 1024 * 1024 },
   fileFilter: (req, file, cb) => {
-    const allowedTypes = /jpeg|jpg|png|gif|webp/;
+    const allowed = /jpeg|jpg|png|gif|webp/;
-    const extname = allowedTypes.test(path.extname(file.originalname).toLowerCase());
+    if (allowed.test(path.extname(file.originalname).toLowerCase()) && allowed.test(file.mimetype)) {
-    const mimetype = allowedTypes.test(file.mimetype);
-    if (extname && mimetype) {
       cb(null, true);
     } else {
       cb(new Error('Only image files are allowed'));
@@ -32,57 +29,152 @@ const upload = multer({
   }
 });
 
-// Helper function to convert empty strings to null
+const emptyToNull = (v) => (v === '' || v === undefined) ? null : v;
-const emptyToNull = (value) => {
-  return (value === '' || value === undefined) ? null : value;
-};
 
-// GET all dogs
+// ── Shared SELECT columns ────────────────────────────────────────────────
+const DOG_COLS = `
+  id, name, registration_number, breed, sex, birth_date,
+  color, microchip, photo_urls, notes, litter_id, is_active,
+  is_champion, is_external, created_at, updated_at
+`;
+
+// ── Helper: attach parents to a list of dogs ─────────────────────────────
+function attachParents(db, dogs) {
+  const parentStmt = db.prepare(`
+    SELECT p.parent_type, d.id, d.name, d.is_champion, d.is_external
+    FROM parents p
+    JOIN dogs d ON p.parent_id = d.id
+    WHERE p.dog_id = ?
+  `);
+  dogs.forEach(dog => {
+    dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
+    const parents = parentStmt.all(dog.id);
+    dog.sire = parents.find(p => p.parent_type === 'sire') || null;
+    dog.dam  = parents.find(p => p.parent_type === 'dam')  || null;
+  });
+  return dogs;
+}
+
+// ── GET dogs (paginated)
+//    Default: kennel dogs only (is_external = 0)
+//    ?include_external=1 : all active dogs (kennel + external)
+//    ?external_only=1    : external dogs only
+//    ?page=1&limit=50    : pagination
+//    ?search=term        : filter by name or registration_number
+//    ?sex=male|female    : filter by sex
+//    Response: { data, total, page, limit, stats: { total, males, females } }
+// ─────────────────────────────────────────────────────────────────────────
 router.get('/', (req, res) => {
   try {
     const db = getDatabase();
+    const includeExternal = req.query.include_external === '1' || req.query.include_external === 'true';
+    const externalOnly    = req.query.external_only    === '1' || req.query.external_only    === 'true';
+    const search = (req.query.search || '').trim();
+    const sex    = req.query.sex === 'male' || req.query.sex === 'female' ? req.query.sex : '';
+    const page   = Math.max(1, parseInt(req.query.page, 10) || 1);
+    const limit  = Math.min(200, Math.max(1, parseInt(req.query.limit, 10) || 50));
+    const offset = (page - 1) * limit;
+
+    let baseWhere;
+    if (externalOnly) {
+      baseWhere = 'is_active = 1 AND is_external = 1';
+    } else if (includeExternal) {
+      baseWhere = 'is_active = 1';
+    } else {
+      baseWhere = 'is_active = 1 AND is_external = 0';
+    }
+
+    const filters = [];
+    const params  = [];
+    if (search) {
+      filters.push('(name LIKE ? OR registration_number LIKE ?)');
+      params.push(`%${search}%`, `%${search}%`);
+    }
+    if (sex) {
+      filters.push('sex = ?');
+      params.push(sex);
+    }
+
+    const whereClause = 'WHERE ' + [baseWhere, ...filters].join(' AND ');
+
+    const total = db.prepare(`SELECT COUNT(*) as count FROM dogs ${whereClause}`).get(...params).count;
+
+    const statsWhere = externalOnly
+      ? 'WHERE is_active = 1 AND is_external = 1'
+      : includeExternal
+        ? 'WHERE is_active = 1'
+        : 'WHERE is_active = 1 AND is_external = 0';
+    const stats = db.prepare(`
+      SELECT
+        COUNT(*) as total,
+        SUM(CASE WHEN sex = 'male'   THEN 1 ELSE 0 END) as males,
+        SUM(CASE WHEN sex = 'female' THEN 1 ELSE 0 END) as females
+      FROM dogs ${statsWhere}
+    `).get();
+
     const dogs = db.prepare(`
-      SELECT id, name, registration_number, breed, sex, birth_date,
+      SELECT ${DOG_COLS}
-             color, microchip, photo_urls, notes, litter_id, is_active,
-             created_at, updated_at
       FROM dogs
-      WHERE is_active = 1 
+      ${whereClause}
       ORDER BY name
-    `).all();
+      LIMIT ? OFFSET ?
+    `).all(...params, limit, offset);
 
-    // Parse photo_urls JSON
+    res.json({ data: attachParents(db, dogs), total, page, limit, stats });
-    dogs.forEach(dog => {
-      dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
-    });
-    
-    res.json(dogs);
   } catch (error) {
     console.error('Error fetching dogs:', error);
     res.status(500).json({ error: error.message });
   }
 });
 
-// GET single dog by ID with parents and offspring
+// ── GET all dogs (kennel + external) for dropdowns/pairing/pedigree ──────────
+// Kept for backwards-compat; equivalent to GET /?include_external=1
+router.get('/all', (req, res) => {
+  try {
+    const db = getDatabase();
+    const dogs = db.prepare(`
+      SELECT ${DOG_COLS}
+      FROM dogs
+      WHERE is_active = 1
+      ORDER BY name
+    `).all();
+    res.json(attachParents(db, dogs));
+  } catch (error) {
+    console.error('Error fetching all dogs:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// ── GET external dogs only (is_external = 1) ──────────────────────────────
+// Kept for backwards-compat; equivalent to GET /?external_only=1
+router.get('/external', (req, res) => {
+  try {
+    const db = getDatabase();
+    const dogs = db.prepare(`
+      SELECT ${DOG_COLS}
+      FROM dogs
+      WHERE is_active = 1 AND is_external = 1
+      ORDER BY name
+    `).all();
+    res.json(attachParents(db, dogs));
+  } catch (error) {
+    console.error('Error fetching external dogs:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// ── GET single dog (with parents + offspring) ──────────────────────────
 router.get('/:id', (req, res) => {
   try {
     const db = getDatabase();
-    const dog = db.prepare(`
+    const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(req.params.id);
-      SELECT id, name, registration_number, breed, sex, birth_date,
-             color, microchip, photo_urls, notes, litter_id, is_active,
-             created_at, updated_at
-      FROM dogs
-      WHERE id = ?
-    `).get(req.params.id);
 
-    if (!dog) {
+    if (!dog) return res.status(404).json({ error: 'Dog not found' });
-      return res.status(404).json({ error: 'Dog not found' });
-    }
 
     dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
 
-    // Get parents from parents table
     const parents = db.prepare(`
-      SELECT p.parent_type, d.* 
+      SELECT p.parent_type, d.id, d.name, d.is_champion, d.is_external
       FROM parents p
       JOIN dogs d ON p.parent_id = d.id
       WHERE p.dog_id = ?
@@ -91,9 +183,9 @@ router.get('/:id', (req, res) => {
     dog.sire = parents.find(p => p.parent_type === 'sire') || null;
     dog.dam  = parents.find(p => p.parent_type === 'dam')  || null;
 
-    // Get offspring
     dog.offspring = db.prepare(`
-      SELECT d.* FROM dogs d
+      SELECT d.id, d.name, d.sex, d.is_champion, d.is_external
+      FROM dogs d
       JOIN parents p ON d.id = p.dog_id
       WHERE p.parent_id = ? AND d.is_active = 1
     `).all(req.params.id);
@@ -105,66 +197,48 @@ router.get('/:id', (req, res) => {
   }
 });
 
-// POST create new dog
+// ── POST create dog ─────────────────────────────────────────────────────
 router.post('/', (req, res) => {
   try {
-    const { name, registration_number, breed, sex, birth_date, color, microchip, notes, sire_id, dam_id, litter_id } = req.body;
+    const { name, registration_number, breed, sex, birth_date, color,
-    
+            microchip, notes, sire_id, dam_id, litter_id, is_champion, is_external } = req.body;
-    console.log('Creating dog with data:', { name, breed, sex, sire_id, dam_id, litter_id });
 
     if (!name || !breed || !sex) {
       return res.status(400).json({ error: 'Name, breed, and sex are required' });
     }
 
     const db = getDatabase();
-    
-    // Insert dog (dogs table has NO sire/dam columns)
     const result = db.prepare(`
-      INSERT INTO dogs (name, registration_number, breed, sex, birth_date, color, microchip, notes, litter_id, photo_urls)
+      INSERT INTO dogs (name, registration_number, breed, sex, birth_date, color,
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                        microchip, notes, litter_id, photo_urls, is_champion, is_external)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(
       name,
       emptyToNull(registration_number),
-      breed, 
+      breed, sex,
-      sex, 
       emptyToNull(birth_date),
       emptyToNull(color),
       emptyToNull(microchip),
       emptyToNull(notes),
       emptyToNull(litter_id),
-      '[]'
+      '[]',
+      is_champion ? 1 : 0,
+      is_external ? 1 : 0
     );
 
     const dogId = result.lastInsertRowid;
-    console.log(`✓ Dog inserted with ID: ${dogId}`);
 
-    // Add sire relationship if provided
     if (sire_id && sire_id !== '' && sire_id !== null) {
-      console.log(`  Adding sire relationship: dog ${dogId} -> sire ${sire_id}`);
+      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(dogId, sire_id, 'sire');
-      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
-        run(dogId, sire_id, 'sire');
-      console.log(`  ✓ Sire relationship added`);
     }
-    
-    // Add dam relationship if provided
     if (dam_id && dam_id !== '' && dam_id !== null) {
-      console.log(`  Adding dam relationship: dog ${dogId} -> dam ${dam_id}`);
+      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(dogId, dam_id, 'dam');
-      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
-        run(dogId, dam_id, 'dam');
-      console.log(`  ✓ Dam relationship added`);
     }
 
-    // Fetch the created dog
+    const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(dogId);
-    const dog = db.prepare(`
-      SELECT id, name, registration_number, breed, sex, birth_date,
-             color, microchip, photo_urls, notes, litter_id, is_active,
-             created_at, updated_at
-      FROM dogs
-      WHERE id = ?
-    `).get(dogId);
     dog.photo_urls = [];
 
-    console.log(`✓ Dog created successfully: ${dog.name} (ID: ${dogId})`);
+    console.log(`✔ Dog created: ${dog.name} (ID: ${dogId}, external: ${dog.is_external})`);
     res.status(201).json(dog);
   } catch (error) {
     console.error('Error creating dog:', error);
@@ -172,66 +246,45 @@ router.post('/', (req, res) => {
   }
 });
 
-// PUT update dog
+// ── PUT update dog ───────────────────────────────────────────────────────
 router.put('/:id', (req, res) => {
   try {
-    const { name, registration_number, breed, sex, birth_date, color, microchip, notes, sire_id, dam_id, litter_id } = req.body;
+    const { name, registration_number, breed, sex, birth_date, color,
-    
+            microchip, notes, sire_id, dam_id, litter_id, is_champion, is_external } = req.body;
-    console.log(`Updating dog ${req.params.id} with data:`, { name, breed, sex, sire_id, dam_id, litter_id });
 
     const db = getDatabase();
-    
-    // Update dog record (dogs table has NO sire/dam columns)
     db.prepare(`
       UPDATE dogs
       SET name = ?, registration_number = ?, breed = ?, sex = ?,
-          birth_date = ?, color = ?, microchip = ?, notes = ?, litter_id = ?
+          birth_date = ?, color = ?, microchip = ?, notes = ?,
+          litter_id = ?, is_champion = ?, is_external = ?, updated_at = datetime('now')
       WHERE id = ?
     `).run(
       name,
       emptyToNull(registration_number),
-      breed, 
+      breed, sex,
-      sex, 
       emptyToNull(birth_date),
       emptyToNull(color),
       emptyToNull(microchip),
       emptyToNull(notes),
       emptyToNull(litter_id),
+      is_champion ? 1 : 0,
+      is_external ? 1 : 0,
       req.params.id
     );
-    console.log(`  ✓ Dog record updated`);
 
-    // Remove existing parent relationships
     db.prepare('DELETE FROM parents WHERE dog_id = ?').run(req.params.id);
-    console.log(`  ✓ Old parent relationships removed`);
-    
-    // Add new sire relationship if provided
     if (sire_id && sire_id !== '' && sire_id !== null) {
-      console.log(`  Adding sire relationship: dog ${req.params.id} -> sire ${sire_id}`);
+      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(req.params.id, sire_id, 'sire');
-      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
-        run(req.params.id, sire_id, 'sire');
-      console.log(`  ✓ Sire relationship added`);
     }
-    
-    // Add new dam relationship if provided
     if (dam_id && dam_id !== '' && dam_id !== null) {
-      console.log(`  Adding dam relationship: dog ${req.params.id} -> dam ${dam_id}`);
+      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(req.params.id, dam_id, 'dam');
-      db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
-        run(req.params.id, dam_id, 'dam');
-      console.log(`  ✓ Dam relationship added`);
     }
 
-    // Fetch updated dog
+    const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(req.params.id);
-    const dog = db.prepare(`
-      SELECT id, name, registration_number, breed, sex, birth_date,
-             color, microchip, photo_urls, notes, litter_id, is_active,
-             created_at, updated_at
-      FROM dogs
-      WHERE id = ?
-    `).get(req.params.id);
     dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
 
-    console.log(`✓ Dog updated successfully: ${dog.name} (ID: ${req.params.id})`);
+    console.log(`✔ Dog updated: ${dog.name} (ID: ${req.params.id})`);
     res.json(dog);
   } catch (error) {
     console.error('Error updating dog:', error);
@@ -239,36 +292,39 @@ router.put('/:id', (req, res) => {
   }
 });
 
-// DELETE dog (soft delete)
+// ── DELETE dog (hard delete with cascade) ───────────────────────────────
 router.delete('/:id', (req, res) => {
   try {
     const db = getDatabase();
-    db.prepare('UPDATE dogs SET is_active = 0 WHERE id = ?').run(req.params.id);
+    const existing = db.prepare('SELECT id, name FROM dogs WHERE id = ?').get(req.params.id);
-    console.log(`✓ Dog soft-deleted: ID ${req.params.id}`);
+    if (!existing) return res.status(404).json({ error: 'Dog not found' });
-    res.json({ message: 'Dog deleted successfully' });
+
+    const id = req.params.id;
+    db.prepare('DELETE FROM parents        WHERE parent_id = ?').run(id);
+    db.prepare('DELETE FROM parents        WHERE dog_id    = ?').run(id);
+    db.prepare('DELETE FROM health_records WHERE dog_id    = ?').run(id);
+    db.prepare('DELETE FROM heat_cycles    WHERE dog_id    = ?').run(id);
+    db.prepare('DELETE FROM dogs           WHERE id        = ?').run(id);
+
+    console.log(`✔ Dog #${id} (${existing.name}) permanently deleted`);
+    res.json({ success: true, message: `${existing.name} has been deleted` });
   } catch (error) {
     console.error('Error deleting dog:', error);
     res.status(500).json({ error: error.message });
   }
 });
 
-// POST upload photo for dog
+// ── POST upload photo ────────────────────────────────────────────────────
 router.post('/:id/photos', upload.single('photo'), (req, res) => {
   try {
-    if (!req.file) {
+    if (!req.file) return res.status(400).json({ error: 'No file uploaded' });
-      return res.status(400).json({ error: 'No file uploaded' });
-    }
 
     const db = getDatabase();
     const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id);
-    
+    if (!dog) return res.status(404).json({ error: 'Dog not found' });
-    if (!dog) {
-      return res.status(404).json({ error: 'Dog not found' });
-    }
 
     const photoUrls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
     photoUrls.push(`/uploads/${req.file.filename}`);
-    
     db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id);
 
     res.json({ url: `/uploads/${req.file.filename}`, photos: photoUrls });
@@ -278,27 +334,22 @@ router.post('/:id/photos', upload.single('photo'), (req, res) => {
   }
 });
 
-// DELETE photo from dog
+// ── DELETE photo ──────────────────────────────────────────────────────
 router.delete('/:id/photos/:photoIndex', (req, res) => {
   try {
     const db = getDatabase();
     const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id);
-    
+    if (!dog) return res.status(404).json({ error: 'Dog not found' });
-    if (!dog) {
-      return res.status(404).json({ error: 'Dog not found' });
-    }
 
     const photoUrls  = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
     const photoIndex = parseInt(req.params.photoIndex);
 
     if (photoIndex >= 0 && photoIndex < photoUrls.length) {
-      const photoPath = path.join(process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads'), path.basename(photoUrls[photoIndex]));
+      const photoPath = path.join(
-      
+        process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads'),
-      // Delete file from disk
+        path.basename(photoUrls[photoIndex])
-      if (fs.existsSync(photoPath)) {
+      );
-        fs.unlinkSync(photoPath);
+      if (fs.existsSync(photoPath)) fs.unlinkSync(photoPath);
-      }
-      
       photoUrls.splice(photoIndex, 1);
       db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id);
     }

server/routes/genetics.js

@@ -0,0 +1,158 @@
+const express = require('express');
+const router = express.Router();
+const { getDatabase } = require('../db/init');
+
+// Golden Retriever panel markers tracked by Breedr
+const GR_MARKERS = [
+  'PRA1', 'PRA2', 'prcd-PRA', 'GR-PRA1', 'GR-PRA2',
+  'ICH1', 'ICH2', 'NCL', 'DM', 'MD'
+];
+
+// GET all genetic tests for a dog
+router.get('/dog/:dogId', (req, res) => {
+  try {
+    const db = getDatabase();
+    const tests = db.prepare(`
+      SELECT * FROM genetic_tests
+      WHERE dog_id = ?
+      ORDER BY marker ASC
+    `).all(req.params.dogId);
+
+    // Return a full panel including not_tested placeholders
+    const byMarker = {};
+    for (const t of tests) byMarker[t.marker] = t;
+
+    const panel = GR_MARKERS.map(marker => ({
+      marker,
+      ...(byMarker[marker] || { result: 'not_tested', dog_id: Number(req.params.dogId) })
+    }));
+
+    res.json({ tests, panel });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// GET pairing risk — compare sire + dam carrier status
+// Usage: GET /api/genetics/pairing-risk?sireId=1&damId=2
+router.get('/pairing-risk', (req, res) => {
+  try {
+    const { sireId, damId } = req.query;
+    if (!sireId || !damId) {
+      return res.status(400).json({ error: 'sireId and damId are required' });
+    }
+
+    const db = getDatabase();
+
+    const getResults = (dogId) => {
+      const rows = db.prepare('SELECT marker, result FROM genetic_tests WHERE dog_id = ?').all(dogId);
+      const map = {};
+      for (const r of rows) map[r.marker] = r.result;
+      return map;
+    };
+
+    const sireResults = getResults(sireId);
+    const damResults  = getResults(damId);
+
+    const risks = [];
+    for (const marker of GR_MARKERS) {
+      const s = sireResults[marker] || 'not_tested';
+      const d = damResults[marker]  || 'not_tested';
+
+      // Both affected or carrier x carrier = risk
+      if (
+        (s === 'affected' || d === 'affected') ||
+        (s === 'carrier'  && d === 'carrier')
+      ) {
+        risks.push({
+          marker,
+          sire_result: s,
+          dam_result: d,
+          risk_level: (s === 'affected' || d === 'affected') ? 'high' : 'moderate',
+          note: s === 'affected' || d === 'affected'
+            ? 'One or both parents are affected — do not breed'
+            : 'Both parents are carriers — 25% chance of affected offspring',
+        });
+      }
+    }
+
+    res.json({
+      sire_id: Number(sireId),
+      dam_id: Number(damId),
+      risks,
+      safe_to_pair: risks.length === 0,
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// GET single genetic test
+router.get('/:id', (req, res) => {
+  try {
+    const db = getDatabase();
+    const test = db.prepare('SELECT * FROM genetic_tests WHERE id = ?').get(req.params.id);
+    if (!test) return res.status(404).json({ error: 'Genetic test not found' });
+    res.json(test);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// POST create genetic test
+router.post('/', (req, res) => {
+  try {
+    const { dog_id, test_provider, marker, result, test_date, document_url, notes } = req.body;
+
+    if (!dog_id || !marker || !result) {
+      return res.status(400).json({ error: 'dog_id, marker, and result are required' });
+    }
+    if (!['clear', 'carrier', 'affected', 'not_tested'].includes(result)) {
+      return res.status(400).json({ error: 'result must be: clear | carrier | affected | not_tested' });
+    }
+
+    const db = getDatabase();
+    const dbResult = db.prepare(`
+      INSERT INTO genetic_tests (dog_id, test_provider, marker, result, test_date, document_url, notes)
+      VALUES (?, ?, ?, ?, ?, ?, ?)
+    `).run(dog_id, test_provider || null, marker, result, test_date || null, document_url || null, notes || null);
+
+    const test = db.prepare('SELECT * FROM genetic_tests WHERE id = ?').get(dbResult.lastInsertRowid);
+    res.status(201).json(test);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// PUT update genetic test
+router.put('/:id', (req, res) => {
+  try {
+    const { test_provider, marker, result, test_date, document_url, notes } = req.body;
+
+    const db = getDatabase();
+    db.prepare(`
+      UPDATE genetic_tests
+      SET test_provider = ?, marker = ?, result = ?, test_date = ?,
+          document_url = ?, notes = ?, updated_at = datetime('now')
+      WHERE id = ?
+    `).run(test_provider || null, marker, result, test_date || null, document_url || null, notes || null, req.params.id);
+
+    const test = db.prepare('SELECT * FROM genetic_tests WHERE id = ?').get(req.params.id);
+    res.json(test);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// DELETE genetic test
+router.delete('/:id', (req, res) => {
+  try {
+    const db = getDatabase();
+    db.prepare('DELETE FROM genetic_tests WHERE id = ?').run(req.params.id);
+    res.json({ message: 'Genetic test deleted successfully' });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+module.exports = router;

server/routes/health.js

@@ -2,6 +2,46 @@ const express = require('express');
 const router = express.Router();
 const { getDatabase } = require('../db/init');
 
+// OFA tests that count toward GRCA eligibility
+const GRCA_REQUIRED = ['hip_ofa', 'hip_pennhip', 'elbow_ofa', 'heart_ofa', 'heart_echo', 'eye_caer'];
+const GRCA_CORE = {
+  hip:    ['hip_ofa', 'hip_pennhip'],
+  elbow:  ['elbow_ofa'],
+  heart:  ['heart_ofa', 'heart_echo'],
+  eye:    ['eye_caer'],
+};
+const VALID_TEST_TYPES = ['hip_ofa', 'hip_pennhip', 'elbow_ofa', 'heart_ofa', 'heart_echo', 'eye_caer', 'thyroid_ofa', 'dna_panel'];
+
+// Helper: compute clearance summary for a dog
+function getClearanceSummary(db, dogId) {
+  const records = db.prepare(`
+    SELECT test_type, ofa_result, ofa_number, expires_at, test_date
+    FROM health_records
+    WHERE dog_id = ? AND test_type IS NOT NULL
+    ORDER BY test_date DESC
+  `).all(dogId);
+
+  const today = new Date();
+  const in90 = new Date(); in90.setDate(today.getDate() + 90);
+
+  const summary = {};
+  for (const [group, types] of Object.entries(GRCA_CORE)) {
+    const match = records.find(r => types.includes(r.test_type));
+    if (!match) {
+      summary[group] = { status: 'missing', record: null };
+    } else {
+      let status = 'pass';
+      if (match.expires_at) {
+        const exp = new Date(match.expires_at);
+        if (exp < today)          status = 'expired';
+        else if (exp <= in90)     status = 'expiring_soon';
+      }
+      summary[group] = { status, record: match };
+    }
+  }
+  return summary;
+}
+
 // GET all health records for a dog
 router.get('/dog/:dogId', (req, res) => {
   try {
@@ -11,46 +51,91 @@ router.get('/dog/:dogId', (req, res) => {
       WHERE dog_id = ?
       ORDER BY test_date DESC
     `).all(req.params.dogId);
-    
     res.json(records);
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
-// GET single health record
+// GET clearance summary (Hip / Elbow / Heart / Eyes) for a dog
-router.get('/:id', (req, res) => {
+router.get('/dog/:dogId/clearance-summary', (req, res) => {
   try {
     const db = getDatabase();
-    const record = db.prepare('SELECT * FROM health_records WHERE id = ?').get(req.params.id);
+    const dog = db.prepare('SELECT id, birth_date, chic_number FROM dogs WHERE id = ?').get(req.params.dogId);
+    if (!dog) return res.status(404).json({ error: 'Dog not found' });
 
-    if (!record) {
+    const summary = getClearanceSummary(db, dog.id);
-      return res.status(404).json({ error: 'Health record not found' });
+
+    // Age check: must be >= 24 months for hip/elbow
+    let ageEligible = false;
+    if (dog.birth_date) {
+      const months = (new Date() - new Date(dog.birth_date)) / (1000 * 60 * 60 * 24 * 30.44);
+      ageEligible = months >= 24;
     }
 
-    res.json(record);
+    const allPass = Object.values(summary).every(s => ['pass', 'expiring_soon'].includes(s.status));
+    const grca_eligible = allPass && ageEligible;
+
+    res.json({ summary, grca_eligible, age_eligible: ageEligible, chic_number: dog.chic_number });
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
+// GET CHIC eligibility check
+router.get('/dog/:dogId/chic-eligible', (req, res) => {
+  try {
+    const db = getDatabase();
+    const dog = db.prepare('SELECT id, chic_number FROM dogs WHERE id = ?').get(req.params.dogId);
+    if (!dog) return res.status(404).json({ error: 'Dog not found' });
+
+    const summary = getClearanceSummary(db, dog.id);
+    const missing = Object.entries(summary)
+      .filter(([, v]) => v.status === 'missing')
+      .map(([k]) => k);
+
+    res.json({
+      chic_eligible: missing.length === 0,
+      chic_number: dog.chic_number || null,
+      missing_tests: missing,
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+
 // POST create health record
 router.post('/', (req, res) => {
   try {
-    const { dog_id, record_type, test_name, test_date, result, document_url, notes } = req.body;
+    const {
+      dog_id, record_type, test_type, test_name, test_date,
+      ofa_result, ofa_number, performed_by, expires_at,
+      document_url, result, vet_name, next_due, notes
+    } = req.body;
 
     if (!dog_id || !record_type || !test_date) {
-      return res.status(400).json({ error: 'Dog ID, record type, and test date are required' });
+      return res.status(400).json({ error: 'dog_id, record_type, and test_date are required' });
+    }
+
+    if (test_type && !VALID_TEST_TYPES.includes(test_type)) {
+      return res.status(400).json({ error: 'Invalid test_type' });
     }
 
     const db = getDatabase();
     const dbResult = db.prepare(`
-      INSERT INTO health_records (dog_id, record_type, test_name, test_date, result, document_url, notes)
+      INSERT INTO health_records
-      VALUES (?, ?, ?, ?, ?, ?, ?)
+        (dog_id, record_type, test_type, test_name, test_date,
-    `).run(dog_id, record_type, test_name, test_date, result, document_url, notes);
+         ofa_result, ofa_number, performed_by, expires_at,
+         document_url, result, vet_name, next_due, notes)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(
+      dog_id, record_type, test_type || null, test_name || null, test_date,
+      ofa_result || null, ofa_number || null, performed_by || null, expires_at || null,
+      document_url || null, result || null, vet_name || null, next_due || null, notes || null
+    );
 
     const record = db.prepare('SELECT * FROM health_records WHERE id = ?').get(dbResult.lastInsertRowid);
-    
     res.status(201).json(record);
   } catch (error) {
     res.status(500).json({ error: error.message });
@@ -60,14 +145,30 @@ router.post('/', (req, res) => {
 // PUT update health record
 router.put('/:id', (req, res) => {
   try {
-    const { record_type, test_name, test_date, result, document_url, notes } = req.body;
+    const {
+      record_type, test_type, test_name, test_date,
+      ofa_result, ofa_number, performed_by, expires_at,
+      document_url, result, vet_name, next_due, notes
+    } = req.body;
+
+    if (test_type && !VALID_TEST_TYPES.includes(test_type)) {
+      return res.status(400).json({ error: 'Invalid test_type' });
+    }
 
     const db = getDatabase();
     db.prepare(`
       UPDATE health_records
-      SET record_type = ?, test_name = ?, test_date = ?, result = ?, document_url = ?, notes = ?
+      SET record_type = ?, test_type = ?, test_name = ?, test_date = ?,
+          ofa_result = ?, ofa_number = ?, performed_by = ?, expires_at = ?,
+          document_url = ?, result = ?, vet_name = ?, next_due = ?, notes = ?,
+          updated_at = datetime('now')
       WHERE id = ?
-    `).run(record_type, test_name, test_date, result, document_url, notes, req.params.id);
+    `).run(
+      record_type, test_type || null, test_name || null, test_date,
+      ofa_result || null, ofa_number || null, performed_by || null, expires_at || null,
+      document_url || null, result || null, vet_name || null, next_due || null, notes || null,
+      req.params.id
+    );
 
     const record = db.prepare('SELECT * FROM health_records WHERE id = ?').get(req.params.id);
     res.json(record);
@@ -87,4 +188,70 @@ router.delete('/:id', (req, res) => {
   }
 });
 
+// GET cancer history for a dog
+router.get('/dog/:dogId/cancer-history', (req, res) => {
+  try {
+    const db = getDatabase();
+    const records = db.prepare(`
+      SELECT * FROM cancer_history
+      WHERE dog_id = ?
+      ORDER BY age_at_diagnosis ASC, created_at DESC
+    `).all(req.params.dogId);
+    res.json(records);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// POST create cancer history record
+router.post('/cancer-history', (req, res) => {
+  try {
+    const {
+      dog_id, cancer_type, age_at_diagnosis, age_at_death, cause_of_death, notes
+    } = req.body;
+
+    if (!dog_id || !cancer_type) {
+      return res.status(400).json({ error: 'dog_id and cancer_type are required' });
+    }
+
+    const db = getDatabase();
+    
+    // Update dog's age_at_death and cause_of_death if provided
+    if (age_at_death || cause_of_death) {
+      db.prepare(`
+        UPDATE dogs SET 
+          age_at_death = COALESCE(?, age_at_death),
+          cause_of_death = COALESCE(?, cause_of_death)
+        WHERE id = ?
+      `).run(age_at_death || null, cause_of_death || null, dog_id);
+    }
+
+    const dbResult = db.prepare(`
+      INSERT INTO cancer_history
+        (dog_id, cancer_type, age_at_diagnosis, age_at_death, cause_of_death, notes)
+      VALUES (?, ?, ?, ?, ?, ?)
+    `).run(
+      dog_id, cancer_type, age_at_diagnosis || null, 
+      age_at_death || null, cause_of_death || null, notes || null
+    );
+
+    const record = db.prepare('SELECT * FROM cancer_history WHERE id = ?').get(dbResult.lastInsertRowid);
+    res.status(201).json(record);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// GET single health record (wildcard should go last to prevent overlap)
+router.get('/:id', (req, res) => {
+  try {
+    const db = getDatabase();
+    const record = db.prepare('SELECT * FROM health_records WHERE id = ?').get(req.params.id);
+    if (!record) return res.status(404).json({ error: 'Health record not found' });
+    res.json(record);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
 module.exports = router;

server/routes/litters.js

@@ -2,10 +2,18 @@ const express = require('express');
 const router = express.Router();
 const { getDatabase } = require('../db/init');
 
-// GET all litters
+// GET all litters (paginated)
+// ?page=1&limit=50
+// Response: { data, total, page, limit }
 router.get('/', (req, res) => {
   try {
     const db = getDatabase();
+    const page  = Math.max(1, parseInt(req.query.page, 10) || 1);
+    const limit = Math.min(200, Math.max(1, parseInt(req.query.limit, 10) || 50));
+    const offset = (page - 1) * limit;
+
+    const total = db.prepare('SELECT COUNT(*) as count FROM litters').get().count;
+
     const litters = db.prepare(`
       SELECT l.*,
         s.name as sire_name, s.registration_number as sire_reg,
@@ -14,36 +22,43 @@ router.get('/', (req, res) => {
       JOIN dogs s ON l.sire_id = s.id
       JOIN dogs d ON l.dam_id = d.id
       ORDER BY l.breeding_date DESC
-    `).all();
+      LIMIT ? OFFSET ?
+    `).all(limit, offset);
 
-    // Get puppies for each litter using litter_id
+    if (litters.length > 0) {
-    litters.forEach(litter => {
+      const litterIds = litters.map(l => l.id);
-      litter.puppies = db.prepare(`
+      const placeholders = litterIds.map(() => '?').join(',');
-        SELECT * FROM dogs WHERE litter_id = ? AND is_active = 1
+      const allPuppies = db.prepare(`
-      `).all(litter.id);
+        SELECT * FROM dogs WHERE litter_id IN (${placeholders}) AND is_active = 1
+      `).all(...litterIds);
 
-      litter.puppies.forEach(puppy => {
+      const puppiesByLitter = {};
-        puppy.photo_urls = puppy.photo_urls ? JSON.parse(puppy.photo_urls) : [];
+      allPuppies.forEach(p => {
+        p.photo_urls = p.photo_urls ? JSON.parse(p.photo_urls) : [];
+        if (!puppiesByLitter[p.litter_id]) puppiesByLitter[p.litter_id] = [];
+        puppiesByLitter[p.litter_id].push(p);
       });
 
-      // Update puppy_count based on actual puppies
+      litters.forEach(l => {
-      litter.actual_puppy_count = litter.puppies.length;
+        l.puppies = puppiesByLitter[l.id] || [];
+        l.actual_puppy_count = l.puppies.length;
       });
+    }
 
-    res.json(litters);
+    res.json({ data: litters, total, page, limit });
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
-// GET single litter
+// GET single litter with puppies
 router.get('/:id', (req, res) => {
   try {
     const db = getDatabase();
     const litter = db.prepare(`
       SELECT l.*,
-        s.*, s.name as sire_name,
+        s.name as sire_name, s.registration_number as sire_reg, s.breed as sire_breed,
-        d.*, d.name as dam_name
+        d.name as dam_name, d.registration_number as dam_reg, d.breed as dam_breed
       FROM litters l
       JOIN dogs s ON l.sire_id = s.id
       JOIN dogs d ON l.dam_id = d.id
@@ -54,7 +69,6 @@ router.get('/:id', (req, res) => {
       return res.status(404).json({ error: 'Litter not found' });
     }
     
-    // Get puppies using litter_id
     litter.puppies = db.prepare(`
       SELECT * FROM dogs WHERE litter_id = ? AND is_active = 1
     `).all(litter.id);
@@ -74,7 +88,7 @@ router.get('/:id', (req, res) => {
 // POST create new litter
 router.post('/', (req, res) => {
   try {
-    const { sire_id, dam_id, breeding_date, whelping_date, notes } = req.body;
+    const { sire_id, dam_id, breeding_date, whelping_date, puppy_count, notes } = req.body;
     
     if (!sire_id || !dam_id || !breeding_date) {
       return res.status(400).json({ error: 'Sire, dam, and breeding date are required' });
@@ -82,7 +96,6 @@ router.post('/', (req, res) => {
     
     const db = getDatabase();
     
-    // Verify sire is male and dam is female
     const sire = db.prepare('SELECT sex FROM dogs WHERE id = ?').get(sire_id);
     const dam = db.prepare('SELECT sex FROM dogs WHERE id = ?').get(dam_id);
     
@@ -94,12 +107,11 @@ router.post('/', (req, res) => {
     }
     
     const result = db.prepare(`
-      INSERT INTO litters (sire_id, dam_id, breeding_date, whelping_date, notes)
+      INSERT INTO litters (sire_id, dam_id, breeding_date, whelping_date, puppy_count, notes)
-      VALUES (?, ?, ?, ?, ?)
+      VALUES (?, ?, ?, ?, ?, ?)
-    `).run(sire_id, dam_id, breeding_date, whelping_date, notes);
+    `).run(sire_id, dam_id, breeding_date, whelping_date || null, puppy_count || 0, notes || null);
     
     const litter = db.prepare('SELECT * FROM litters WHERE id = ?').get(result.lastInsertRowid);
-    
     res.status(201).json(litter);
   } catch (error) {
     res.status(500).json({ error: error.message });
@@ -110,13 +122,12 @@ router.post('/', (req, res) => {
 router.put('/:id', (req, res) => {
   try {
     const { breeding_date, whelping_date, puppy_count, notes } = req.body;
-    
     const db = getDatabase();
     db.prepare(`
       UPDATE litters 
       SET breeding_date = ?, whelping_date = ?, puppy_count = ?, notes = ?
       WHERE id = ?
-    `).run(breeding_date, whelping_date, puppy_count, notes, req.params.id);
+    `).run(breeding_date, whelping_date || null, puppy_count || 0, notes || null, req.params.id);
     
     const litter = db.prepare('SELECT * FROM litters WHERE id = ?').get(req.params.id);
     res.json(litter);
@@ -131,22 +142,14 @@ router.post('/:id/puppies/:puppyId', (req, res) => {
     const { id: litterId, puppyId } = req.params;
     const db = getDatabase();
     
-    // Verify litter exists
     const litter = db.prepare('SELECT sire_id, dam_id FROM litters WHERE id = ?').get(litterId);
-    if (!litter) {
+    if (!litter) return res.status(404).json({ error: 'Litter not found' });
-      return res.status(404).json({ error: 'Litter not found' });
-    }
     
-    // Verify puppy exists
     const puppy = db.prepare('SELECT id FROM dogs WHERE id = ?').get(puppyId);
-    if (!puppy) {
+    if (!puppy) return res.status(404).json({ error: 'Puppy not found' });
-      return res.status(404).json({ error: 'Puppy not found' });
-    }
     
-    // Link puppy to litter
     db.prepare('UPDATE dogs SET litter_id = ? WHERE id = ?').run(litterId, puppyId);
     
-    // Also update parent relationships if not set
     const existingParents = db.prepare('SELECT parent_type FROM parents WHERE dog_id = ?').all(puppyId);
     const hasSire = existingParents.some(p => p.parent_type === 'sire');
     const hasDam = existingParents.some(p => p.parent_type === 'dam');
@@ -169,26 +172,77 @@ router.delete('/:id/puppies/:puppyId', (req, res) => {
   try {
     const { puppyId } = req.params;
     const db = getDatabase();
-    
     db.prepare('UPDATE dogs SET litter_id = NULL WHERE id = ?').run(puppyId);
-    
     res.json({ message: 'Puppy removed from litter' });
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
+// ─── Puppy Weight / Health Log ───────────────────────────────────────────────
+
+// GET weight/health logs for a puppy
+router.get('/:litterId/puppies/:puppyId/logs', (req, res) => {
+  try {
+    const db = getDatabase();
+    // Use health_records table with note field to store weight logs
+    const logs = db.prepare(`
+      SELECT * FROM health_records
+      WHERE dog_id = ? AND record_type = 'weight_log'
+      ORDER BY record_date ASC
+    `).all(req.params.puppyId);
+    res.json(logs);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// POST add weight/health log entry for a puppy
+router.post('/:litterId/puppies/:puppyId/logs', (req, res) => {
+  try {
+    const { puppyId } = req.params;
+    const { record_date, weight_oz, weight_lbs, notes, record_type } = req.body;
+    
+    if (!record_date) return res.status(400).json({ error: 'record_date is required' });
+    
+    const db = getDatabase();
+    
+    // Store weight as notes JSON in health_records
+    const description = JSON.stringify({
+      weight_oz: weight_oz || null,
+      weight_lbs: weight_lbs || null,
+      notes: notes || ''
+    });
+    
+    const result = db.prepare(`
+      INSERT INTO health_records (dog_id, record_type, record_date, description, vet_name)
+      VALUES (?, ?, ?, ?, ?)
+    `).run(puppyId, record_type || 'weight_log', record_date, description, null);
+    
+    const log = db.prepare('SELECT * FROM health_records WHERE id = ?').get(result.lastInsertRowid);
+    res.status(201).json(log);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// DELETE weight/health log entry
+router.delete('/:litterId/puppies/:puppyId/logs/:logId', (req, res) => {
+  try {
+    const db = getDatabase();
+    db.prepare('DELETE FROM health_records WHERE id = ? AND dog_id = ?').run(req.params.logId, req.params.puppyId);
+    res.json({ message: 'Log entry deleted' });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
 // DELETE litter
 router.delete('/:id', (req, res) => {
   try {
     const db = getDatabase();
-    
-    // Remove litter_id from associated puppies
     db.prepare('UPDATE dogs SET litter_id = NULL WHERE litter_id = ?').run(req.params.id);
-    
-    // Delete the litter
     db.prepare('DELETE FROM litters WHERE id = ?').run(req.params.id);
-    
     res.json({ message: 'Litter deleted successfully' });
   } catch (error) {
     res.status(500).json({ error: error.message });

server/routes/pedigree.js

@@ -2,73 +2,286 @@ const express = require('express');
 const router = express.Router();
 const { getDatabase } = require('../db/init');
 
-// Helper function to calculate inbreeding coefficient
+const MAX_CACHE_SIZE = 1000;
-function calculateCOI(sireId, damId, generations = 5) {
+const ancestorCache = new Map();
-  const db = getDatabase();
+const coiCache = new Map();
 
-  // Get all ancestors for both parents
+function getFromCache(cache, key, computeFn) {
-  function getAncestors(dogId, currentGen = 0, maxGen = generations) {
+  if (cache.has(key)) {
-    if (currentGen >= maxGen) return [];
+    const val = cache.get(key);
+    cache.delete(key);
+    cache.set(key, val);
+    return val;
+  }
+  const val = computeFn();
+  if (cache.size >= MAX_CACHE_SIZE) {
+    cache.delete(cache.keys().next().value);
+  }
+  cache.set(key, val);
+  return val;
+}
 
+/**
+ * getAncestorMap(db, dogId, maxGen)
+ * Returns Map<id, [{ id, name, generation }, ...]>
+ * INCLUDES dogId itself at generation 0 so direct parent-offspring
+ * pairings are correctly detected by calculateCOI.
+ */
+function getAncestorMap(db, dogId, maxGen = 6) {
+  const cacheKey = `${dogId}-${maxGen}`;
+  return getFromCache(ancestorCache, cacheKey, () => {
+    const map = new Map();
+
+    function recurse(id, gen) {
+      if (gen > maxGen) return;
+      const dog = db.prepare('SELECT id, name FROM dogs WHERE id = ?').get(id);
+      if (!dog) return;
+      if (!map.has(id)) map.set(id, []);
+      map.get(id).push({ id: dog.id, name: dog.name, generation: gen });
+      if (map.get(id).length === 1) {
         const parents = db.prepare(`
-      SELECT p.parent_type, p.parent_id, d.name
+          SELECT p.parent_id FROM parents p WHERE p.dog_id = ?
-      FROM parents p
+        `).all(id);
-      JOIN dogs d ON p.parent_id = d.id
+        parents.forEach(p => recurse(p.parent_id, gen + 1));
-      WHERE p.dog_id = ?
+      }
-    `).all(dogId);
-    
-    const ancestors = parents.map(p => ({
-      id: p.parent_id,
-      name: p.name,
-      type: p.parent_type,
-      generation: currentGen + 1
-    }));
-    
-    parents.forEach(p => {
-      ancestors.push(...getAncestors(p.parent_id, currentGen + 1, maxGen));
-    });
-    
-    return ancestors;
     }
 
-  const sireAncestors = getAncestors(sireId);
+    recurse(parseInt(dogId), 0);
-  const damAncestors = getAncestors(damId);
+    return map;
-  
-  // Find common ancestors
-  const commonAncestors = [];
-  sireAncestors.forEach(sireAnc => {
-    damAncestors.forEach(damAnc => {
-      if (sireAnc.id === damAnc.id) {
-        commonAncestors.push({
-          id: sireAnc.id,
-          name: sireAnc.name,
-          sireGen: sireAnc.generation,
-          damGen: damAnc.generation
   });
+}
+
+/**
+ * isDirectRelation(db, sireId, damId)
+ * Returns { related, relationship } if one dog is a direct ancestor
+ * of the other within 3 generations.
+ */
+function isDirectRelation(db, sireId, damId) {
+  const sid = parseInt(sireId);
+  const did = parseInt(damId);
+  const sireMap = getAncestorMap(db, sid, 3);
+  const damMap  = getAncestorMap(db, did, 3);
+
+  if (damMap.has(sid)) {
+    const gen = damMap.get(sid)[0].generation;
+    const label = gen === 1 ? 'parent' : gen === 2 ? 'grandparent' : `generation-${gen} ancestor`;
+    return { related: true, relationship: `Sire is the ${label} of the selected dam` };
   }
-    });
+  if (sireMap.has(did)) {
-  });
+    const gen = sireMap.get(did)[0].generation;
+    const label = gen === 1 ? 'parent' : gen === 2 ? 'grandparent' : `generation-${gen} ancestor`;
+    return { related: true, relationship: `Dam is the ${label} of the selected sire` };
+  }
+  return { related: false, relationship: null };
+}
+
+/**
+ * calculateCOI(db, sireId, damId)
+ * Wright Path Coefficient method.
+ * Dogs included at gen 0 in their own maps so parent x offspring
+ * yields ~25% COI.
+ *
+ * Fix: do NOT exclude sid/did from commonIds globally.
+ * - Exclude `did` from sireMap keys  (the dam itself can't be a
+ *   common ancestor of the sire's side for THIS pairing's offspring)
+ * - Exclude `sid` from damMap keys   (same logic for sire)
+ * This preserves the case where the sire IS a common ancestor in the
+ * dam's ancestry (parent x offspring) while still avoiding reflexive
+ * self-loops.
+ */
+function calculateCOI(db, sireId, damId) {
+  const cacheKey = `${sireId}-${damId}`;
+  return getFromCache(coiCache, cacheKey, () => {
+    const sid = parseInt(sireId);
+    const did = parseInt(damId);
+    const sireMap = getAncestorMap(db, sid);
+    const damMap  = getAncestorMap(db, did);
+
+    // Common ancestors: in BOTH maps, but:
+    //   - not the dam itself appearing in sireMap (would be a loop)
+    //   - not the sire itself appearing in damMap already handled below
+    // We collect all IDs present in both, excluding only the direct
+    // subjects (did from sireMap side, sid excluded already since we
+    // iterate sireMap keys — but sid IS in sireMap at gen 0, and if
+    // damMap also has sid, that is the parent×offspring case we WANT).
+    const commonIds = [...sireMap.keys()].filter(
+      id => damMap.has(id) && id !== did
+    );
 
-  // Calculate COI using path coefficient method
     let coi = 0;
-  const processed = new Set();
+    const processedPaths = new Set();
+    const commonAncestorList = [];
 
-  commonAncestors.forEach(anc => {
+    commonIds.forEach(ancId => {
-    const key = `${anc.id}-${anc.sireGen}-${anc.damGen}`;
+      const sireOccs = sireMap.get(ancId);
-    if (!processed.has(key)) {
+      const damOccs  = damMap.get(ancId);
-      processed.add(key);
+
-      const pathLength = anc.sireGen + anc.damGen;
+      sireOccs.forEach(so => {
-      coi += Math.pow(0.5, pathLength);
+        damOccs.forEach(do_ => {
+          const key = `${ancId}-${so.generation}-${do_.generation}`;
+          if (!processedPaths.has(key)) {
+            processedPaths.add(key);
+            coi += Math.pow(0.5, so.generation + do_.generation + 1);
           }
         });
+      });
+
+      const closestSire = sireOccs.reduce((a, b) => a.generation < b.generation ? a : b);
+      const closestDam  = damOccs.reduce((a, b)  => a.generation < b.generation ? a : b);
+      commonAncestorList.push({
+        id:      ancId,
+        name:    sireOccs[0].name,
+        sireGen: closestSire.generation,
+        damGen:  closestDam.generation
+      });
+    });
 
     return {
-    coefficient: Math.round(coi * 10000) / 100, // Percentage with 2 decimals
+      coefficient:     coi,
-    commonAncestors: [...new Map(commonAncestors.map(a => [a.id, a])).values()]
+      commonAncestors: commonAncestorList
     };
+  });
 }
 
-// GET pedigree tree for a dog
+// =====================================================================
+// IMPORTANT: Specific named routes MUST be registered BEFORE
+// the /:id wildcard, or Express will match 'relations' and
+// 'trial-pairing' as dog IDs and return 404/wrong data.
+// =====================================================================
+
+const handleTrialPairing = (req, res) => {
+  try {
+    const { sire_id, dam_id } = req.body;
+    if (!sire_id || !dam_id) {
+      return res.status(400).json({ error: 'Both sire_id and dam_id are required' });
+    }
+
+    const db = getDatabase();
+    const sire = db.prepare("SELECT * FROM dogs WHERE id = ? AND sex = 'male'").get(sire_id);
+    const dam  = db.prepare("SELECT * FROM dogs WHERE id = ? AND sex = 'female'").get(dam_id);
+
+    if (!sire || !dam) {
+      return res.status(404).json({ error: 'Invalid sire or dam \u2014 check sex values in database' });
+    }
+
+    const relation = isDirectRelation(db, sire_id, dam_id);
+    const result   = calculateCOI(db, sire_id, dam_id);
+
+    res.json({
+      sire:            { id: sire.id, name: sire.name },
+      dam:             { id: dam.id,  name: dam.name  },
+      coi:             result.coefficient,
+      commonAncestors: result.commonAncestors,
+      directRelation:  relation.related ? relation.relationship : null,
+      recommendation:  result.coefficient < 0.05 ? 'Low risk'
+                     : result.coefficient < 0.10 ? 'Moderate risk'
+                     :                           'High risk'
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+};
+
+// POST /api/pedigree/trial-pairing
+router.post('/trial-pairing', handleTrialPairing);
+
+// POST /api/pedigree/coi
+router.post('/coi', handleTrialPairing);
+
+// GET /api/pedigree/:id/coi
+router.get('/:id/coi', (req, res) => {
+  try {
+    const db = getDatabase();
+    const parents = db.prepare('SELECT parent_type, parent_id FROM parents WHERE dog_id = ?').all(req.params.id);
+    const sire = parents.find(p => p.parent_type === 'sire');
+    const dam  = parents.find(p => p.parent_type === 'dam');
+
+    if (!sire || !dam) {
+      return res.json({ coi: 0, commonAncestors: [], message: 'Incomplete parent data' });
+    }
+
+    const result = calculateCOI(db, sire.parent_id, dam.parent_id);
+    res.json({
+      coi: result.coefficient,
+      commonAncestors: result.commonAncestors
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// GET /api/pedigree/relations/:sireId/:damId
+router.get('/relations/:sireId/:damId', (req, res) => {
+  try {
+    const db = getDatabase();
+    res.json(isDirectRelation(db, req.params.sireId, req.params.damId));
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// GET /api/pedigree/:id/cancer-lineage
+router.get('/:id/cancer-lineage', (req, res) => {
+  try {
+    const db = getDatabase();
+    // Get ancestor map up to 5 generations
+    const ancestorMap = getAncestorMap(db, req.params.id, 5);
+    
+    // Collect all unique ancestor IDs
+    const ancestorIds = Array.from(ancestorMap.keys());
+    
+    if (ancestorIds.length === 0) {
+      return res.json({ lineage_cases: [], stats: { total_ancestors: 0, ancestors_with_cancer: 0 } });
+    }
+    
+    // Query cancer history for all ancestors
+    const placeholders = ancestorIds.map(() => '?').join(',');
+    const cancerRecords = db.prepare(`
+      SELECT c.*, d.name, d.sex 
+      FROM cancer_history c
+      JOIN dogs d ON c.dog_id = d.id
+      WHERE c.dog_id IN (${placeholders})
+    `).all(...ancestorIds);
+    
+    // Structure the response
+    const cases = cancerRecords.map(record => {
+      // Find the closest generation this ancestor appears in
+      const occurrences = ancestorMap.get(record.dog_id);
+      const closestGen = occurrences.reduce((min, occ) => occ.generation < min ? occ.generation : min, 999);
+      
+      return {
+        ...record,
+        generation_distance: closestGen
+      };
+    });
+    
+    // Sort by generation distance (closer relatives first)
+    cases.sort((a, b) => a.generation_distance - b.generation_distance);
+    
+    // Count unique dogs with cancer (excluding generation 0 if we only want stats on ancestors)
+    const ancestorCases = cases.filter(c => c.generation_distance > 0);
+    const uniqueAncestorsWithCancer = new Set(ancestorCases.map(c => c.dog_id)).size;
+    
+    // Number of ancestors is total unique IDs minus 1 for the dog itself
+    const numAncestors = ancestorIds.length > 0 && ancestorMap.get(parseInt(req.params.id)) ? ancestorIds.length - 1 : ancestorIds.length;
+    
+    res.json({
+      lineage_cases: cases,
+      stats: {
+        total_ancestors: numAncestors,
+        ancestors_with_cancer: uniqueAncestorsWithCancer
+      }
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// =====================================================================
+// Wildcard routes last
+// =====================================================================
+
+// GET /api/pedigree/:id
 router.get('/:id', (req, res) => {
   try {
     const db = getDatabase();
@@ -76,21 +289,12 @@ router.get('/:id', (req, res) => {
 
     function buildTree(dogId, currentGen = 0) {
       if (currentGen >= generations) return null;
-      
       const dog = db.prepare('SELECT * FROM dogs WHERE id = ?').get(dogId);
       if (!dog) return null;
-      
       dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
-      
+      const parents = db.prepare('SELECT parent_type, parent_id FROM parents WHERE dog_id = ?').all(dogId);
-      const parents = db.prepare(`
-        SELECT p.parent_type, p.parent_id
-        FROM parents p
-        WHERE p.dog_id = ?
-      `).all(dogId);
-      
       const sire = parents.find(p => p.parent_type === 'sire');
       const dam  = parents.find(p => p.parent_type === 'dam');
-      
       return {
         ...dog,
         generation: currentGen,
@@ -100,18 +304,14 @@ router.get('/:id', (req, res) => {
     }
 
     const tree = buildTree(req.params.id);
-    
+    if (!tree) return res.status(404).json({ error: 'Dog not found' });
-    if (!tree) {
-      return res.status(404).json({ error: 'Dog not found' });
-    }
-    
     res.json(tree);
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
-// GET reverse pedigree (descendants)
+// GET /api/pedigree/:id/descendants
 router.get('/:id/descendants', (req, res) => {
   try {
     const db = getDatabase();
@@ -119,67 +319,27 @@ router.get('/:id/descendants', (req, res) => {
 
     function buildDescendantTree(dogId, currentGen = 0) {
       if (currentGen >= generations) return null;
-      
       const dog = db.prepare('SELECT * FROM dogs WHERE id = ?').get(dogId);
       if (!dog) return null;
-      
       dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
-      
       const offspring = db.prepare(`
         SELECT DISTINCT d.id, d.name, d.sex, d.birth_date
-        FROM dogs d
+        FROM dogs d JOIN parents p ON d.id = p.dog_id
-        JOIN parents p ON d.id = p.dog_id
         WHERE p.parent_id = ? AND d.is_active = 1
       `).all(dogId);
-      
       return {
         ...dog,
         generation: currentGen,
-        offspring: offspring.map(child => buildDescendantTree(child.id, currentGen + 1))
+        offspring: offspring.map(c => buildDescendantTree(c.id, currentGen + 1))
       };
     }
 
     const tree = buildDescendantTree(req.params.id);
-    
+    if (!tree) return res.status(404).json({ error: 'Dog not found' });
-    if (!tree) {
-      return res.status(404).json({ error: 'Dog not found' });
-    }
-    
     res.json(tree);
   } catch (error) {
     res.status(500).json({ error: error.message });
   }
 });
 
-// POST calculate COI for a trial pairing
-router.post('/trial-pairing', (req, res) => {
-  try {
-    const { sire_id, dam_id } = req.body;
-    
-    if (!sire_id || !dam_id) {
-      return res.status(400).json({ error: 'Both sire_id and dam_id are required' });
-    }
-    
-    const db = getDatabase();
-    const sire = db.prepare('SELECT * FROM dogs WHERE id = ? AND sex = "male"').get(sire_id);
-    const dam = db.prepare('SELECT * FROM dogs WHERE id = ? AND sex = "female"').get(dam_id);
-    
-    if (!sire || !dam) {
-      return res.status(404).json({ error: 'Invalid sire or dam' });
-    }
-    
-    const result = calculateCOI(sire_id, dam_id);
-    
-    res.json({
-      sire: { id: sire.id, name: sire.name },
-      dam: { id: dam.id, name: dam.name },
-      coi: result.coefficient,
-      commonAncestors: result.commonAncestors,
-      recommendation: result.coefficient < 5 ? 'Low risk' : result.coefficient < 10 ? 'Moderate risk' : 'High risk'
-    });
-  } catch (error) {
-    res.status(500).json({ error: error.message });
-  }
-});
-
 module.exports = router;

server/routes/settings.js

@@ -0,0 +1,64 @@
+const express = require('express');
+const router  = express.Router();
+const { getDatabase } = require('../db/init');
+
+// Allowed columns — whitelist prevents arbitrary SQL column injection
+const ALLOWED_KEYS = [
+  'kennel_name',
+  'kennel_tagline',
+  'kennel_address',
+  'kennel_phone',
+  'kennel_email',
+  'kennel_website',
+  'kennel_akc_id',
+  'kennel_breed',
+  'owner_name',
+];
+
+// GET /api/settings
+router.get('/', (req, res) => {
+  try {
+    const db  = getDatabase();
+    // Always returns exactly one row (seeded in init.js)
+    const row = db.prepare(`SELECT ${ALLOWED_KEYS.join(', ')} FROM settings LIMIT 1`).get();
+    res.json(row || {});
+  } catch (error) {
+    console.error('Error fetching settings:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// PUT /api/settings
+router.put('/', (req, res) => {
+  try {
+    const db      = getDatabase();
+    const updates = req.body || {};
+
+    // Build SET clause only for allowed keys that were sent
+    const fields = Object.keys(updates).filter(k => ALLOWED_KEYS.includes(k));
+
+    if (fields.length === 0) {
+      return res.status(400).json({ error: 'No valid settings fields provided' });
+    }
+
+    const setClause = fields.map(f => `${f} = ?`).join(', ');
+    const values    = fields.map(f => updates[f] == null ? null : String(updates[f]));
+
+    // Ensure a row exists, then update it
+    const existing = db.prepare('SELECT id FROM settings LIMIT 1').get();
+    if (!existing) {
+      db.prepare(`INSERT INTO settings (kennel_name) VALUES ('BREEDR')`).run();
+    }
+
+    db.prepare(`UPDATE settings SET ${setClause}, updated_at = datetime('now') WHERE id = (SELECT id FROM settings LIMIT 1)`)
+      .run(...values);
+
+    const row = db.prepare(`SELECT ${ALLOWED_KEYS.join(', ')} FROM settings LIMIT 1`).get();
+    res.json(row || {});
+  } catch (error) {
+    console.error('Error saving settings:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+module.exports = router;

server/test_app.js

@@ -0,0 +1,26 @@
+const app = require('./index');
+const http = require('http');
+
+// Start temporary server
+const server = http.createServer(app);
+server.listen(3030, async () => {
+  console.log('Server started on 3030');
+  try {
+    const res = await fetch('http://localhost:3030/api/pedigree/relations/1/2');
+    const text = await res.text();
+    console.log('GET /api/pedigree/relations/1/2 RESPONSE:', res.status, text.substring(0, 150));
+
+    const postRes = await fetch('http://localhost:3030/api/pedigree/trial-pairing', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ sire_id: 1, dam_id: 2 })
+    });
+    const postText = await postRes.text();
+    console.log('POST /api/pedigree/trial-pairing RESPONSE:', postRes.status, postText.substring(0, 150));
+  } catch (err) {
+    console.error('Fetch error:', err);
+  } finally {
+    server.close();
+    process.exit(0);
+  }
+});

server/test_express.js

@@ -0,0 +1,8 @@
+const express = require('express');
+const router = express.Router();
+
+router.post(['/a', '/b'], (req, res) => {
+  res.send('ok');
+});
+
+console.log('Started successfully');

server/utils/README.md

@@ -0,0 +1,167 @@
+# Server Utilities
+
+## Startup Log (`startupLog.js`)
+
+Comprehensive server startup logging utility that displays system information, configuration, and health checks on application boot.
+
+### Features
+
+- **ASCII Banner** - Eye-catching branded header with BREEDR logo
+- **Application Info** - Version, environment, timestamp, Node.js version
+- **Server Configuration** - Port, access URL, database status
+- **Directory Status** - Checks existence and write permissions for data/uploads/static directories
+- **System Resources** - Hostname, platform, architecture, CPU, memory
+- **Process Info** - PID, heap usage, uptime
+
+### Usage
+
+```javascript
+const { logStartupBanner } = require('./utils/startupLog');
+
+app.listen(PORT, '0.0.0.0', () => {
+  logStartupBanner({
+    appName: 'BREEDR',
+    port: PORT,
+    environment: process.env.NODE_ENV || 'development',
+    dataDir: DATA_DIR,
+    uploadPath: UPLOAD_PATH,
+    staticPath: STATIC_PATH,
+    dbStatus: '✓ Connected'
+  });
+});
+```
+
+### Configuration Options
+
+| Option | Type | Default | Description |
+|--------|------|---------|-------------|
+| `appName` | string | `'BREEDR'` | Application name |
+| `port` | number | `3000` | Server port |
+| `environment` | string | `'development'` | Environment (development/production) |
+| `dataDir` | string | `'./data'` | Data directory path |
+| `uploadPath` | string | `'./uploads'` | Uploads directory path |
+| `staticPath` | string | `'./static'` | Static assets directory path |
+| `dbStatus` | string | `'unknown'` | Database connection status |
+
+### Exported Functions
+
+#### `logStartupBanner(config)`
+
+Displays the complete startup banner with all system information.
+
+**Parameters:**
+- `config` (object) - Configuration options (see table above)
+
+**Returns:** void
+
+#### `getSystemInfo()`
+
+Returns system information object.
+
+**Returns:**
+```javascript
+{
+  hostname: string,
+  platform: string,
+  arch: string,
+  nodeVersion: string,
+  cpuCores: number,
+  totalMemory: string, // in GB
+  freeMemory: string,  // in GB
+  uptime: string       // in seconds
+}
+```
+
+#### `getProcessInfo()`
+
+Returns current process information.
+
+**Returns:**
+```javascript
+{
+  pid: number,
+  heapUsed: string,  // in MB
+  heapTotal: string, // in MB
+  external: string   // in MB
+}
+```
+
+#### `checkDirectories(dirs)`
+
+Checks directory existence and write permissions.
+
+**Parameters:**
+- `dirs` (array) - Array of `{ name, path }` objects
+
+**Returns:**
+```javascript
+{
+  [name]: {
+    exists: boolean,
+    path: string,
+    writable: boolean
+  }
+}
+```
+
+#### `getAppVersion()`
+
+Reads version from package.json.
+
+**Returns:** string - Version number or 'unknown'
+
+### Example Output
+
+```
+╔══════════════════════════════════════════════════════════╗
+║                                                          ║
+║   ██████╗ ██████╗ ███████╗███████╗██████╗ ██████╗       ║
+║        Dog Breeding Genealogy Management System          ║
+╚══════════════════════════════════════════════════════════╝
+
+┌─────────────────────────────────────────────────────────┐
+│ 📦 APPLICATION INFO                                     │
+├─────────────────────────────────────────────────────────┤
+│ Version      : 0.6.0                                    │
+│ Environment  : production                               │
+│ Node.js      : v18.19.0                                 │
+└─────────────────────────────────────────────────────────┘
+
+┌─────────────────────────────────────────────────────────┐
+│ 🌐 SERVER CONFIGURATION                                 │
+├─────────────────────────────────────────────────────────┤
+│ Port         : 3000                                     │
+│ Access URL   : http://localhost:3000                   │
+│ Database     : ✓ Connected                             │
+└─────────────────────────────────────────────────────────┘
+
+🚀 Server is ready and listening for connections
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+```
+
+### Benefits
+
+1. **Instant System Visibility** - See all critical system info at startup
+2. **Troubleshooting** - Quickly identify configuration or resource issues
+3. **Professional Logging** - Clean, organized output for production environments
+4. **Directory Health** - Immediate feedback on filesystem permissions
+5. **Resource Monitoring** - Memory and process info at a glance
+
+### Integration Checklist
+
+- [x] Create `server/utils/startupLog.js`
+- [x] Update `server/index.js` to import and call `logStartupBanner()`
+- [x] Replace simple console.log startup with comprehensive banner
+- [x] Test in development environment
+- [ ] Test in production Docker container
+- [ ] Verify all directory checks work correctly
+- [ ] Update main README.md if needed
+
+### Future Enhancements
+
+- [ ] Add color support using chalk or similar library
+- [ ] Log to file option for production environments
+- [ ] Add API endpoint status checks
+- [ ] Display loaded routes count
+- [ ] Show database migration status
+- [ ] Add startup time measurement

server/utils/startupLog.js

@@ -0,0 +1,177 @@
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * Startup Log Utility
+ * Displays comprehensive system information and branding on server start
+ */
+
+function getSystemInfo() {
+  return {
+    hostname: os.hostname(),
+    platform: os.platform(),
+    arch: os.arch(),
+    nodeVersion: process.version,
+    cpuCores: os.cpus().length,
+    totalMemory: (os.totalmem() / 1024 / 1024 / 1024).toFixed(2) + ' GB',
+    freeMemory: (os.freemem() / 1024 / 1024 / 1024).toFixed(2) + ' GB',
+    uptime: process.uptime().toFixed(2) + 's'
+  };
+}
+
+function getProcessInfo() {
+  const memUsage = process.memoryUsage();
+  return {
+    pid: process.pid,
+    heapUsed: (memUsage.heapUsed / 1024 / 1024).toFixed(2) + ' MB',
+    heapTotal: (memUsage.heapTotal / 1024 / 1024).toFixed(2) + ' MB',
+    external: (memUsage.external / 1024 / 1024).toFixed(2) + ' MB'
+  };
+}
+
+function checkDirectories(dirs) {
+  const status = {};
+  dirs.forEach(({ name, path: dirPath }) => {
+    status[name] = {
+      exists: fs.existsSync(dirPath),
+      path: dirPath,
+      writable: false
+    };
+    
+    // Check write permissions if directory exists
+    if (status[name].exists) {
+      try {
+        fs.accessSync(dirPath, fs.constants.W_OK);
+        status[name].writable = true;
+      } catch (err) {
+        status[name].writable = false;
+      }
+    }
+  });
+  return status;
+}
+
+function getAppVersion() {
+  try {
+    const packagePath = path.join(__dirname, '../../package.json');
+    if (fs.existsSync(packagePath)) {
+      const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+      return pkg.version || 'unknown';
+    }
+  } catch (err) {
+    // Silently fail
+  }
+  return 'unknown';
+}
+
+function logStartupBanner(config = {}) {
+  const {
+    appName = 'BREEDR',
+    port = 3000,
+    environment = 'development',
+    dataDir = './data',
+    uploadPath = './uploads',
+    staticPath = './static',
+    dbStatus = 'unknown'
+  } = config;
+
+  const version = getAppVersion();
+  const sysInfo = getSystemInfo();
+  const procInfo = getProcessInfo();
+  const timestamp = new Date().toISOString();
+
+  const directories = [
+    { name: 'Data', path: dataDir },
+    { name: 'Uploads', path: uploadPath },
+    { name: 'Static', path: staticPath }
+  ];
+  const dirStatus = checkDirectories(directories);
+
+  // ASCII Banner
+  console.log('\n');
+  console.log('╔══════════════════════════════════════════════════════════╗');
+  console.log('║                                                          ║');
+  console.log('║   ██████╗ ██████╗ ███████╗███████╗██████╗ ██████╗       ║');
+  console.log('║   ██╔══██╗██╔══██╗██╔════╝██╔════╝██╔══██╗██╔══██╗      ║');
+  console.log('║   ██████╔╝██████╔╝█████╗  █████╗  ██║  ██║██████╔╝      ║');
+  console.log('║   ██╔══██╗██╔══██╗██╔══╝  ██╔══╝  ██║  ██║██╔══██╗      ║');
+  console.log('║   ██████╔╝██║  ██║███████╗███████╗██████╔╝██║  ██║      ║');
+  console.log('║   ╚═════╝ ╚═╝  ╚═╝╚══════╝╚══════╝╚═════╝ ╚═╝  ╚═╝      ║');
+  console.log('║                                                          ║');
+  console.log('║        Dog Breeding Genealogy Management System          ║');
+  console.log('║                                                          ║');
+  console.log('╚══════════════════════════════════════════════════════════╝');
+  console.log('');
+
+  // Application Info
+  console.log('┌─────────────────────────────────────────────────────────┐');
+  console.log('│ 📦 APPLICATION INFO                                     │');
+  console.log('├─────────────────────────────────────────────────────────┤');
+  console.log(`│ Version      : ${version.padEnd(40)} │`);
+  console.log(`│ Environment  : ${environment.padEnd(40)} │`);
+  console.log(`│ Started      : ${timestamp.padEnd(40)} │`);
+  console.log(`│ Node.js      : ${sysInfo.nodeVersion.padEnd(40)} │`);
+  console.log('└─────────────────────────────────────────────────────────┘');
+  console.log('');
+
+  // Server Configuration
+  console.log('┌─────────────────────────────────────────────────────────┐');
+  console.log('│ 🌐 SERVER CONFIGURATION                                 │');
+  console.log('├─────────────────────────────────────────────────────────┤');
+  console.log(`│ Port         : ${String(port).padEnd(40)} │`);
+  console.log(`│ Access URL   : http://localhost:${port}${' '.repeat(27)} │`);
+  console.log(`│ Database     : ${dbStatus.padEnd(40)} │`);
+  console.log('└─────────────────────────────────────────────────────────┘');
+  console.log('');
+
+  // Directory Status
+  console.log('┌─────────────────────────────────────────────────────────┐');
+  console.log('│ 📁 DIRECTORY STATUS                                     │');
+  console.log('├─────────────────────────────────────────────────────────┤');
+  Object.entries(dirStatus).forEach(([name, status]) => {
+    const statusIcon = status.exists ? (status.writable ? '✓' : '⚠') : '✗';
+    const statusText = status.exists ? (status.writable ? 'OK' : 'READ-ONLY') : 'MISSING';
+    console.log(`│ ${statusIcon} ${name.padEnd(10)} : ${statusText.padEnd(10)} ${status.path.substring(0, 25).padEnd(25)} │`);
+  });
+  console.log('└─────────────────────────────────────────────────────────┘');
+  console.log('');
+
+  // System Resources
+  console.log('┌─────────────────────────────────────────────────────────┐');
+  console.log('│ 💻 SYSTEM RESOURCES                                     │');
+  console.log('├─────────────────────────────────────────────────────────┤');
+  console.log(`│ Hostname     : ${sysInfo.hostname.padEnd(40)} │`);
+  console.log(`│ Platform     : ${sysInfo.platform.padEnd(40)} │`);
+  console.log(`│ Architecture : ${sysInfo.arch.padEnd(40)} │`);
+  console.log(`│ CPU Cores    : ${String(sysInfo.cpuCores).padEnd(40)} │`);
+  console.log(`│ Total Memory : ${sysInfo.totalMemory.padEnd(40)} │`);
+  console.log(`│ Free Memory  : ${sysInfo.freeMemory.padEnd(40)} │`);
+  console.log('└─────────────────────────────────────────────────────────┘');
+  console.log('');
+
+  // Process Info
+  console.log('┌─────────────────────────────────────────────────────────┐');
+  console.log('│ ⚙️  PROCESS INFO                                         │');
+  console.log('├─────────────────────────────────────────────────────────┤');
+  console.log(`│ PID          : ${String(procInfo.pid).padEnd(40)} │`);
+  console.log(`│ Heap Used    : ${procInfo.heapUsed.padEnd(40)} │`);
+  console.log(`│ Heap Total   : ${procInfo.heapTotal.padEnd(40)} │`);
+  console.log(`│ External     : ${procInfo.external.padEnd(40)} │`);
+  console.log(`│ Uptime       : ${sysInfo.uptime.padEnd(40)} │`);
+  console.log('└─────────────────────────────────────────────────────────┘');
+  console.log('');
+
+  // Ready message
+  console.log('🚀 Server is ready and listening for connections');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+  console.log('');
+}
+
+module.exports = {
+  logStartupBanner,
+  getSystemInfo,
+  getProcessInfo,
+  checkDirectories,
+  getAppVersion
+};