Fixing dev timeline icons

.codegraph/.gitignore

@@ -0,0 +1,16 @@
+# CodeGraph data files
+# These are local to each machine and should not be committed
+
+# Database
+*.db
+*.db-wal
+*.db-shm
+
+# Cache
+cache/
+
+# Logs
+*.log
+
+# Hook markers
+.dirty

.env.example

@@ -14,6 +14,7 @@ PHOTO_DELIVERY_MODE=proxy
 FRONTEND_URL=http://localhost:3000
 BACKEND_URL=http://localhost:5000
 VITE_API_BASE_URL=http://localhost:5000/api
+MAPBOX_ACCESS_TOKEN=
 NODE_ENV=development
 TRUST_PROXY=
 ADMIN_EMAILS=corey@blaishome.online
@@ -29,9 +30,12 @@ STRIPE_PRICE_HOUSEHOLD_CONURE_YEARLY=
 STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK=
 STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY=
 STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY=
-STRIPE_PRICE_HOUSEHOLD_MACAW=
-STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY=
-STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY=
+STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY=
+STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY=
+STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY=
+STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW=
+STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY=
+STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY=
 STRIPE_CHECKOUT_SUCCESS_URL=http://localhost:3000/?billing=success
 STRIPE_CHECKOUT_CANCEL_URL=http://localhost:3000/?billing=cancelled
 STRIPE_PORTAL_RETURN_URL=http://localhost:3000/?billing=portal

.gitea/workflows/deploy.yml

@@ -0,0 +1,87 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - dev
+      - develop
+  workflow_dispatch:
+
+jobs:
+  deploy-dev:
+    if: ${{ github.event_name == 'push' }}
+    runs-on: ubuntu-latest
+    container:
+      volumes:
+        - /docker/FlockPal-dev:/docker/FlockPal-dev
+    steps:
+      - name: Update dev checkout
+        run: |
+          set -e
+          cd /docker/FlockPal-dev
+          git fetch --all --prune
+          git reset --hard "origin/${{ github.ref_name }}"
+          git clean -fd
+
+      - name: Validate backend
+        run: |
+          set -e
+          cd /docker/FlockPal-dev
+          docker run --rm -v "$PWD/backend:/src:ro" -w /tmp/app node:22-alpine sh -lc "cp -a /src/. /tmp/app && npm ci && npm run build && npm test"
+
+      - name: Validate frontend
+        run: |
+          set -e
+          cd /docker/FlockPal-dev
+          docker run --rm -v "$PWD/frontend:/src:ro" -w /tmp/app node:22-alpine sh -lc "cp -a /src/. /tmp/app && npm ci && npm run build"
+
+      - name: Validate dev compose config
+        run: |
+          set -e
+          cd /docker/FlockPal-dev
+          docker compose -f docker-compose.dev.yaml config --quiet
+
+      - name: Deploy dev
+        run: |
+          set -e
+          cd /docker/FlockPal-dev
+          docker compose -f docker-compose.dev.yaml up -d --build
+
+  deploy-prod:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+    container:
+      volumes:
+        - /docker/FlockPal:/docker/FlockPal
+    steps:
+      - name: Update prod checkout
+        run: |
+          set -e
+          cd /docker/FlockPal
+          git fetch --all --prune
+          git reset --hard "origin/${{ github.ref_name }}"
+          git clean -fd
+
+      - name: Validate backend
+        run: |
+          set -e
+          cd /docker/FlockPal
+          docker run --rm -v "$PWD/backend:/src:ro" -w /tmp/app node:22-alpine sh -lc "cp -a /src/. /tmp/app && npm ci && npm run build && npm test"
+
+      - name: Validate frontend
+        run: |
+          set -e
+          cd /docker/FlockPal
+          docker run --rm -v "$PWD/frontend:/src:ro" -w /tmp/app node:22-alpine sh -lc "cp -a /src/. /tmp/app && npm ci && npm run build"
+
+      - name: Validate prod compose config
+        run: |
+          set -e
+          cd /docker/FlockPal
+          docker compose -f docker-compose.prod.yml config --quiet
+
+      - name: Deploy prod
+        run: |
+          set -e
+          cd /docker/FlockPal
+          docker compose -f docker-compose.prod.yml up -d --build

README.md

@@ -86,6 +86,7 @@ curl -H "Authorization: Bearer <admin-token>" https://your-host/api/metrics
    - `FRONTEND_URL`
    - `BACKEND_URL`
    - `VITE_API_BASE_URL`
+   - `MAPBOX_ACCESS_TOKEN`
    - `REDIS_URL`
    - `IMAGE_STORAGE_PROVIDER`
    - `S3_ENDPOINT`
@@ -203,8 +204,10 @@ Set these when the Stripe Checkout, Customer Portal, and webhook flow is enabled
 - `STRIPE_PRICE_HOUSEHOLD_CONURE_YEARLY`
 - `STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY` or `STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK`
 - `STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY`
-- `STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY` or `STRIPE_PRICE_HOUSEHOLD_MACAW`
-- `STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY`
+- `STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY` or `STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY`
+- `STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY`
+- `STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY` or `STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW`
+- `STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY`
 - `STRIPE_CHECKOUT_SUCCESS_URL`
 - `STRIPE_CHECKOUT_CANCEL_URL`
 - `STRIPE_PORTAL_RETURN_URL`
@@ -221,7 +224,7 @@ Recommended defaults:
 - Enable the proration behavior you want in the Customer Portal configuration. FlockPal treats Stripe as the source of truth for upgrade timing and proration outcomes.
 - Point the Stripe webhook endpoint at `https://your-backend-host/api/billing/stripe/webhook`.
 - Subscribe the webhook endpoint to at least `checkout.session.completed`, `customer.subscription.created`, `customer.subscription.updated`, and `customer.subscription.deleted`.
-- Use one Stripe Price per plan and billing interval. FlockPal maps Stripe price IDs back to `household_basic`, `household_plus`, and `household_macaw`.
+- Use one Stripe Price per plan and billing interval. FlockPal maps Stripe price IDs back to `household_basic`, `household_plus`, `household_macaw`, and `household_hyacinth_macaw`.
 - After Stripe redirects back to the app, FlockPal now performs a direct billing sync against Stripe and then refreshes the active session. Webhooks are still required so asynchronous subscription changes stay in sync later.
 
 For local development with the Stripe CLI:

backend/package.json

@@ -23,7 +23,10 @@
     "helmet": "8.1.0",
     "morgan": "1.10.0",
     "nodemailer": "^8.0.5",
+    "pdfkit": "^0.18.0",
     "pg": "8.13.1",
+    "qrcode": "^1.5.4",
+    "sharp": "^0.34.5",
     "stripe": "^22.0.2",
     "zod": "3.24.1"
   },
@@ -32,7 +35,9 @@
     "@types/express": "4.17.21",
     "@types/morgan": "1.9.9",
     "@types/node": "22.10.2",
+    "@types/pdfkit": "^0.17.6",
     "@types/pg": "8.11.10",
+    "@types/qrcode": "^1.5.6",
     "tsx": "4.19.2",
     "typescript": "5.7.2"
   }

backend/src/db/schema.ts

@@ -249,6 +249,12 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
       motivators VARCHAR(1000),
       demotivators VARCHAR(1000),
       favorite_snack VARCHAR(160),
+      location_label VARCHAR(160),
+      location_details JSONB,
+      vet_clinic_name VARCHAR(160),
+      vet_clinic_address VARCHAR(500),
+      vet_account_number VARCHAR(120),
+      vet_doctor_name VARCHAR(160),
       gender VARCHAR(16) NOT NULL DEFAULT 'unknown',
       date_of_birth DATE,
       gotcha_day DATE,
@@ -273,6 +279,12 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
       ADD COLUMN IF NOT EXISTS motivators VARCHAR(1000),
       ADD COLUMN IF NOT EXISTS demotivators VARCHAR(1000),
       ADD COLUMN IF NOT EXISTS favorite_snack VARCHAR(160),
+      ADD COLUMN IF NOT EXISTS location_label VARCHAR(160),
+      ADD COLUMN IF NOT EXISTS location_details JSONB,
+      ADD COLUMN IF NOT EXISTS vet_clinic_name VARCHAR(160),
+      ADD COLUMN IF NOT EXISTS vet_clinic_address VARCHAR(500),
+      ADD COLUMN IF NOT EXISTS vet_account_number VARCHAR(120),
+      ADD COLUMN IF NOT EXISTS vet_doctor_name VARCHAR(160),
       ADD COLUMN IF NOT EXISTS gender VARCHAR(16) NOT NULL DEFAULT 'unknown',
       ADD COLUMN IF NOT EXISTS date_of_birth DATE,
       ADD COLUMN IF NOT EXISTS gotcha_day DATE,
@@ -318,8 +330,8 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
 
     DROP INDEX IF EXISTS idx_birds_workspace_tag_id;
 
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_birds_workspace_tag_id
-      ON birds (workspace_id, LOWER(tag_id))
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_birds_global_tag_id
+      ON birds (LOWER(BTRIM(tag_id)))
       WHERE tag_id IS NOT NULL
         AND BTRIM(tag_id) <> ''
         AND LOWER(BTRIM(tag_id)) NOT IN ('unknown', 'not recorded', 'n/a', 'na', 'none');
@@ -347,8 +359,8 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
       ON birds (public_profile_code)
       WHERE public_profile_code IS NOT NULL;
 
-    CREATE TABLE IF NOT EXISTS pending_bird_transfers (
-      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+	    CREATE TABLE IF NOT EXISTS pending_bird_transfers (
+	      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
       bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
       source_workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
       destination_owner_email VARCHAR(255) NOT NULL,
@@ -368,11 +380,97 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
       ON pending_bird_transfers (LOWER(destination_owner_email), created_at DESC)
       WHERE completed_at IS NULL;
 
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_pending_bird_transfers_open_bird
-      ON pending_bird_transfers (bird_id)
-      WHERE completed_at IS NULL;
+	    CREATE UNIQUE INDEX IF NOT EXISTS idx_pending_bird_transfers_open_bird
+	      ON pending_bird_transfers (bird_id)
+	      WHERE completed_at IS NULL;
 
-    CREATE TABLE IF NOT EXISTS weight_records (
+    CREATE TABLE IF NOT EXISTS bird_transfer_codes (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      code VARCHAR(32) NOT NULL UNIQUE,
+      bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
+      source_workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+      requested_by_user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      completed_at TIMESTAMPTZ,
+      completed_workspace_id INTEGER REFERENCES workspaces(id) ON DELETE SET NULL,
+      revoked_at TIMESTAMPTZ,
+      created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_bird_transfer_codes_open_bird
+      ON bird_transfer_codes (bird_id, created_at DESC)
+      WHERE completed_at IS NULL
+        AND revoked_at IS NULL;
+
+    CREATE INDEX IF NOT EXISTS idx_bird_transfer_codes_code_open
+      ON bird_transfer_codes (code)
+      WHERE completed_at IS NULL
+        AND revoked_at IS NULL;
+
+    CREATE TABLE IF NOT EXISTS bird_timeline_events (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
+      event_type VARCHAR(40) NOT NULL,
+      from_workspace_id INTEGER REFERENCES workspaces(id) ON DELETE SET NULL,
+      to_workspace_id INTEGER REFERENCES workspaces(id) ON DELETE SET NULL,
+      from_workspace_name VARCHAR(160),
+      to_workspace_name VARCHAR(160),
+      from_owner_email VARCHAR(255),
+      to_owner_email VARCHAR(255),
+      location_label VARCHAR(160),
+      location_details JSONB,
+      note TEXT,
+      event_date DATE NOT NULL DEFAULT CURRENT_DATE,
+      created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+      created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+    ALTER TABLE bird_timeline_events
+      ADD COLUMN IF NOT EXISTS note TEXT,
+      ADD COLUMN IF NOT EXISTS location_details JSONB,
+      ADD COLUMN IF NOT EXISTS event_date DATE NOT NULL DEFAULT CURRENT_DATE;
+
+    CREATE INDEX IF NOT EXISTS idx_bird_timeline_events_bird_created
+      ON bird_timeline_events (bird_id, event_date DESC, created_at DESC);
+
+	    CREATE TABLE IF NOT EXISTS flock_notes (
+	      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+	      workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+	      bird_id UUID REFERENCES birds(id) ON DELETE SET NULL,
+	      title VARCHAR(160) NOT NULL,
+	      body TEXT NOT NULL,
+	      created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+	      created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	      updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+	    );
+
+	    CREATE INDEX IF NOT EXISTS idx_flock_notes_workspace_updated
+	      ON flock_notes (workspace_id, updated_at DESC);
+
+	    CREATE INDEX IF NOT EXISTS idx_flock_notes_bird_updated
+	      ON flock_notes (bird_id, updated_at DESC)
+	      WHERE bird_id IS NOT NULL;
+
+	    CREATE TABLE IF NOT EXISTS audit_log_entries (
+	      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+	      workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+	      user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+	      actor_name VARCHAR(160),
+	      actor_email VARCHAR(255),
+	      action VARCHAR(80) NOT NULL,
+	      entity_type VARCHAR(80) NOT NULL,
+	      entity_id VARCHAR(120),
+	      entity_name VARCHAR(255),
+	      details JSONB NOT NULL DEFAULT '{}'::jsonb,
+	      created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+	    );
+
+	    CREATE INDEX IF NOT EXISTS idx_audit_log_entries_workspace_created
+	      ON audit_log_entries (workspace_id, created_at DESC);
+
+	    CREATE INDEX IF NOT EXISTS idx_audit_log_entries_entity
+	      ON audit_log_entries (workspace_id, entity_type, entity_id, created_at DESC);
+
+	    CREATE TABLE IF NOT EXISTS weight_records (
       id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
       bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
       weight_grams NUMERIC(8, 2) NOT NULL CHECK (weight_grams > 0),
@@ -403,6 +501,7 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
       start_date DATE NOT NULL,
       end_date DATE,
       notes VARCHAR(1000),
+      reminders_enabled BOOLEAN NOT NULL DEFAULT FALSE,
       created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
       CHECK (end_date IS NULL OR end_date >= start_date)
     );
@@ -410,6 +509,9 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
     ALTER TABLE medications
       ADD COLUMN IF NOT EXISTS dose_schedule JSONB NOT NULL DEFAULT '[{"key":"dose-1","label":"Dose","time":""}]'::jsonb;
 
+    ALTER TABLE medications
+      ADD COLUMN IF NOT EXISTS reminders_enabled BOOLEAN NOT NULL DEFAULT FALSE;
+
     CREATE TABLE IF NOT EXISTS bird_milestone_reminder_deliveries (
       id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
       bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
@@ -443,6 +545,17 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
     ALTER TABLE medication_administrations
       ADD COLUMN IF NOT EXISTS administration_slot VARCHAR(80) NOT NULL DEFAULT 'dose-1';
 
+    CREATE TABLE IF NOT EXISTS medication_reminder_deliveries (
+      id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+      medication_id UUID NOT NULL REFERENCES medications(id) ON DELETE CASCADE,
+      bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
+      workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+      scheduled_on DATE NOT NULL,
+      administration_slot VARCHAR(80) NOT NULL,
+      delivered_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      UNIQUE (medication_id, scheduled_on, administration_slot)
+    );
+
     ALTER TABLE medication_administrations
       DROP CONSTRAINT IF EXISTS medication_administrations_medication_id_administered_on_key;
 
@@ -461,6 +574,9 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
     CREATE INDEX IF NOT EXISTS idx_bird_milestone_reminder_deliveries_workspace
       ON bird_milestone_reminder_deliveries (workspace_id, delivered_on DESC);
 
+    CREATE INDEX IF NOT EXISTS idx_medication_reminder_deliveries_workspace
+      ON medication_reminder_deliveries (workspace_id, scheduled_on DESC);
+
     CREATE INDEX IF NOT EXISTS idx_medication_administrations_bird_administered_on
       ON medication_administrations (bird_id, administered_on DESC);
 

backend/src/queues/adoptionReportQueue.ts

@@ -0,0 +1,42 @@
+import { Queue, QueueEvents, type Job } from 'bullmq';
+
+import { redisConnection } from './redisConnection.js';
+
+export type AdoptionReportJobData = {
+  birdId: string;
+  workspaceId: number;
+  transferCode: string;
+  printFriendly: boolean;
+};
+
+export type AdoptionReportJobResult = {
+  pdfBase64: string;
+};
+
+export const adoptionReportQueueName = 'adoption-reports';
+
+export const adoptionReportQueue = new Queue<AdoptionReportJobData, AdoptionReportJobResult>(adoptionReportQueueName, {
+  connection: redisConnection,
+  defaultJobOptions: {
+    attempts: 2,
+    backoff: {
+      type: 'exponential',
+      delay: 10_000,
+    },
+    removeOnComplete: 50,
+    removeOnFail: 500,
+  },
+});
+
+export const adoptionReportQueueEvents = new QueueEvents(adoptionReportQueueName, {
+  connection: redisConnection,
+});
+
+export const enqueueAdoptionReportJob = (
+  data: AdoptionReportJobData,
+): Promise<Job<AdoptionReportJobData, AdoptionReportJobResult>> => adoptionReportQueue.add('render-adoption-report', data);
+
+export const closeAdoptionReportQueue = async () => {
+  await adoptionReportQueue.close();
+  await adoptionReportQueueEvents.close();
+};

backend/src/queues/medicationReminderQueue.ts

@@ -0,0 +1,55 @@
+import { Queue, type Job } from 'bullmq';
+
+import { redisConnection } from './redisConnection.js';
+
+export type MedicationReminderJobData = {
+  runDate: string;
+  currentTime: string;
+  requestedBy: 'scheduler';
+};
+
+export type MedicationReminderJobResult = {
+  runDate: string;
+  currentTime: string;
+  checked: number;
+  sent: number;
+  skipped: number;
+  failed: number;
+};
+
+export const medicationReminderQueueName = 'medication-reminders';
+
+export const medicationReminderQueue = new Queue<MedicationReminderJobData, MedicationReminderJobResult>(medicationReminderQueueName, {
+  connection: redisConnection,
+  defaultJobOptions: {
+    attempts: 3,
+    backoff: {
+      type: 'exponential',
+      delay: 60_000,
+    },
+    removeOnComplete: 100,
+    removeOnFail: 1_000,
+  },
+});
+
+export const enqueueMedicationReminderJob = (
+  runDate: string,
+  currentTime: string,
+): Promise<Job<MedicationReminderJobData, MedicationReminderJobResult>> =>
+  medicationReminderQueue.add(
+    'run-medication-reminders',
+    {
+      runDate,
+      currentTime,
+      requestedBy: 'scheduler',
+    },
+    {
+      jobId: `medication-reminders-${runDate}-${currentTime.slice(0, 2)}`,
+    },
+  );
+
+export const closeMedicationReminderQueue = async () => {
+  await medicationReminderQueue.close();
+};
+
+export const getMedicationReminderQueueCounts = () => medicationReminderQueue.getJobCounts('waiting', 'active', 'delayed', 'completed', 'failed');

backend/src/reports/adoptionReport.ts

@@ -0,0 +1,422 @@
+import fs from 'fs';
+import PDFDocument from 'pdfkit';
+import QRCode from 'qrcode';
+
+import type { BirdRow, FlockNoteRow, VetVisitRow, WeightRow } from '../types.js';
+
+type AdoptionReportInput = {
+  bird: BirdRow;
+  weights: WeightRow[];
+  vetVisits: VetVisitRow[];
+  notes: FlockNoteRow[];
+  transferCode: string;
+  birdPhotoBuffer?: Buffer | null;
+  assets: {
+    logoPath: string;
+    wordmarkPath: string;
+    defaultBirdPhotoPath: string;
+  };
+  printFriendly?: boolean;
+};
+
+const page = { width: 612, height: 792, margin: 42 };
+
+const colors = {
+  ink: '#1f2a2a',
+  muted: '#5d5f59',
+  red: '#cb3a35',
+  green: '#238a5a',
+  blue: '#2769b3',
+  border: '#cfe0d5',
+  panel: '#fbf7ee',
+  paper: '#fffdf9',
+};
+
+const formatDate = (value: string | null) => {
+  if (!value) {
+    return 'Not recorded';
+  }
+  return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' }).format(
+    new Date(`${value.slice(0, 10)}T00:00:00Z`),
+  );
+};
+
+const formatDateTime = (value: string | null) => {
+  if (!value) {
+    return 'Not recorded';
+  }
+  return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', year: 'numeric' }).format(new Date(value));
+};
+
+const formatShortDate = (value: string | null) => {
+  if (!value) {
+    return 'No data yet';
+  }
+  return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', timeZone: 'UTC' }).format(new Date(`${value.slice(0, 10)}T00:00:00Z`));
+};
+
+const formatWeight = (value: string | number | null) => {
+  const numericValue = value === null ? null : Number(value);
+  return numericValue && Number.isFinite(numericValue) ? `${numericValue.toFixed(1)} g` : 'Pending';
+};
+
+const genderLabel = (value: string) => {
+  if (value === 'female_dna') {
+    return 'Female (DNA confirmed)';
+  }
+  if (value === 'male_dna') {
+    return 'Male (DNA confirmed)';
+  }
+  if (value === 'female') {
+    return 'Female (assumed)';
+  }
+  if (value === 'male') {
+    return 'Male (assumed)';
+  }
+  return 'Unknown';
+};
+
+const parseList = (value: string | null) =>
+  (value ?? '')
+    .split(/\r?\n|,/)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+
+const dataUrlToBuffer = (value: string | null) => {
+  if (!value) {
+    return null;
+  }
+  const match = value.match(/^data:image\/(?:png|jpeg|jpg);base64,(.+)$/);
+  return match ? Buffer.from(match[1], 'base64') : null;
+};
+
+const collectPdf = (doc: PDFKit.PDFDocument) =>
+  new Promise<Buffer>((resolve, reject) => {
+    const chunks: Buffer[] = [];
+    doc.on('data', (chunk: Buffer) => chunks.push(chunk));
+    doc.on('end', () => resolve(Buffer.concat(chunks)));
+    doc.on('error', reject);
+  });
+
+const fitText = (doc: PDFKit.PDFDocument, text: string, x: number, y: number, width: number, options: PDFKit.Mixins.TextOptions = {}) => {
+  doc.text(text, x, y, { width, lineGap: 1.5, ...options });
+  return doc.y;
+};
+
+const drawFact = (doc: PDFKit.PDFDocument, label: string, value: string, x: number, y: number, width: number) => {
+  doc.roundedRect(x, y, width, 43, 6).fillAndStroke(colors.panel, colors.border);
+  doc.fillColor(colors.muted).fontSize(7).font('Helvetica-Bold').text(label.toUpperCase(), x + 8, y + 8, { width: width - 16 });
+  doc.fillColor(colors.ink).fontSize(10).font('Helvetica-Bold').text(value, x + 8, y + 21, { width: width - 16, ellipsis: true });
+};
+
+const drawTextCard = (doc: PDFKit.PDFDocument, label: string, value: string, x: number, y: number, width: number, height = 58) => {
+  doc.roundedRect(x, y, width, height, 6).fillAndStroke(colors.panel, colors.border);
+  doc.fillColor(colors.blue).fontSize(8).font('Helvetica-Bold').text(label.toUpperCase(), x + 8, y + 8, { width: width - 16 });
+  doc.fillColor(colors.ink).fontSize(9.2).font('Helvetica').text(value, x + 8, y + 23, {
+    width: width - 16,
+    height: height - 31,
+    ellipsis: true,
+    lineGap: 1.2,
+  });
+};
+
+const drawSectionTitle = (doc: PDFKit.PDFDocument, title: string, y: number) => {
+  doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(14).text(title, page.margin, y);
+  doc.moveTo(page.margin, y + 19).lineTo(page.width - page.margin, y + 19).strokeColor(colors.border).lineWidth(1).stroke();
+  return y + 27;
+};
+
+const drawSimpleWeightChart = (doc: PDFKit.PDFDocument, weights: WeightRow[], birdColor: string, x: number, y: number, width: number, height: number) => {
+  const plottedWeights = weights
+    .slice()
+    .sort((left, right) => left.recorded_on.localeCompare(right.recorded_on))
+    .map((entry) => ({ ...entry, numericWeight: Number(entry.weight_grams) }))
+    .filter((entry) => Number.isFinite(entry.numericWeight));
+
+  doc.roundedRect(x, y, width, height, 8).fillAndStroke('#fffdf9', colors.border);
+
+  if (!plottedWeights.length) {
+    doc.fillColor(colors.muted).fontSize(10).text('Add more weight records to show a trend graph.', x + 14, y + height / 2 - 6, {
+      width: width - 28,
+      align: 'center',
+    });
+    return;
+  }
+
+  const latestDate = new Date(`${plottedWeights[plottedWeights.length - 1].recorded_on.slice(0, 10)}T00:00:00Z`);
+  const startDate = new Date(latestDate);
+  startDate.setUTCDate(startDate.getUTCDate() - 29);
+  const visibleWeights = plottedWeights.filter((entry) => {
+    const recordedOn = new Date(`${entry.recorded_on.slice(0, 10)}T00:00:00Z`);
+    return recordedOn >= startDate && recordedOn <= latestDate;
+  });
+  const rawMinWeight = Math.min(...visibleWeights.map((entry) => entry.numericWeight));
+  const rawMaxWeight = Math.max(...visibleWeights.map((entry) => entry.numericWeight));
+  const rangePadding = Math.max((rawMaxWeight - rawMinWeight) * 0.12, 2);
+  const minWeight = Math.max(0, rawMinWeight - rangePadding);
+  const maxWeight = rawMaxWeight + rangePadding;
+  const weightRange = Math.max(1, maxWeight - minWeight);
+  const padding = { top: 16, right: 18, bottom: 32, left: 48 };
+  const plotWidth = width - padding.left - padding.right;
+  const plotHeight = height - padding.top - padding.bottom;
+  const startMs = startDate.getTime();
+  const endMs = latestDate.getTime();
+  const dateRange = Math.max(endMs - startMs, 24 * 60 * 60 * 1000);
+  const chartColor = /^#[0-9a-fA-F]{6}$/.test(birdColor) ? birdColor : colors.green;
+  const midWeight = minWeight + (maxWeight - minWeight) / 2;
+  const midDate = new Date((startMs + endMs) / 2);
+  const yTicks = [
+    { label: `${maxWeight.toFixed(0)} g`, y: y + padding.top },
+    { label: `${midWeight.toFixed(0)} g`, y: y + padding.top + plotHeight / 2 },
+    { label: `${minWeight.toFixed(0)} g`, y: y + padding.top + plotHeight },
+  ];
+  const xTicks = [
+    { label: formatShortDate(startDate.toISOString().slice(0, 10)), x: x + padding.left },
+    { label: formatShortDate(midDate.toISOString().slice(0, 10)), x: x + padding.left + plotWidth / 2 },
+    { label: formatShortDate(latestDate.toISOString().slice(0, 10)), x: x + padding.left + plotWidth },
+  ];
+
+  const points = visibleWeights.map((entry) => {
+    const recordedOn = new Date(`${entry.recorded_on.slice(0, 10)}T00:00:00Z`);
+    return {
+      ...entry,
+      x: x + padding.left + ((recordedOn.getTime() - startMs) / dateRange) * plotWidth,
+      y: y + padding.top + (1 - (entry.numericWeight - minWeight) / weightRange) * plotHeight,
+    };
+  });
+
+  doc.font('Helvetica').fontSize(7).fillColor(colors.muted);
+  yTicks.forEach((tick) => {
+    doc.text(tick.label, x + 4, tick.y - 3, { width: padding.left - 12, align: 'right' });
+    doc
+      .save()
+      .dash(4, { space: 6 })
+      .strokeColor('#d8e5ef')
+      .lineWidth(0.8)
+      .moveTo(x + padding.left, tick.y)
+      .lineTo(x + width - padding.right, tick.y)
+      .stroke()
+      .restore();
+  });
+  doc.strokeColor('#c7cdca').lineWidth(1).moveTo(x + padding.left, y + padding.top + plotHeight).lineTo(x + width - padding.right, y + padding.top + plotHeight).stroke();
+  xTicks.forEach((tick) => {
+    doc.fillColor(colors.muted).fontSize(7).text(tick.label, tick.x - 28, y + height - 18, { width: 56, align: 'center' });
+  });
+
+  points.forEach((entry, index) => {
+    if (index === 0) {
+      doc.moveTo(entry.x, entry.y);
+    } else {
+      doc.lineTo(entry.x, entry.y);
+    }
+  });
+  if (points.length > 1) {
+    doc.lineCap('round').strokeColor(chartColor).lineWidth(2.4).stroke();
+  }
+
+  points.forEach((entry) => {
+    doc.circle(entry.x, entry.y, 3.5).fillAndStroke(chartColor, '#fffdf9');
+  });
+
+  const latestPoint = points[points.length - 1];
+  const calloutOnLeft = latestPoint.x > x + width - padding.right - 84;
+  const calloutX = calloutOnLeft ? latestPoint.x - 82 : latestPoint.x + 8;
+  const calloutY = latestPoint.y < y + padding.top + 18 ? latestPoint.y + 8 : latestPoint.y - 22;
+  doc.roundedRect(calloutX, calloutY, 74, 18, 5).fillAndStroke('#fffdf9', '#d9dedb');
+  doc.fillColor(colors.ink).font('Helvetica-Bold').fontSize(7.5).text(`Latest ${formatWeight(latestPoint.numericWeight)}`, calloutX + 5, calloutY + 5, {
+    width: 64,
+    align: 'center',
+  });
+};
+
+const drawTable = (doc: PDFKit.PDFDocument, headers: string[], rows: string[][], x: number, y: number, widths: number[], rowHeight = 28) => {
+  doc.font('Helvetica-Bold').fontSize(8).fillColor(colors.muted);
+  headers.forEach((header, index) => {
+    doc.text(header.toUpperCase(), x + widths.slice(0, index).reduce((sum, value) => sum + value, 0), y, { width: widths[index] - 8 });
+  });
+  y += 15;
+  doc.moveTo(x, y - 4).lineTo(x + widths.reduce((sum, value) => sum + value, 0), y - 4).strokeColor(colors.border).stroke();
+
+  doc.font('Helvetica').fontSize(8.5).fillColor(colors.ink);
+  rows.forEach((row) => {
+    if (y + rowHeight > page.height - page.margin) {
+      doc.addPage();
+      y = page.margin;
+    }
+    row.forEach((value, index) => {
+      doc.text(value, x + widths.slice(0, index).reduce((sum, columnWidth) => sum + columnWidth, 0), y, {
+        width: widths[index] - 8,
+        height: rowHeight - 6,
+        ellipsis: true,
+      });
+    });
+    y += rowHeight;
+    doc.moveTo(x, y - 4).lineTo(x + widths.reduce((sum, value) => sum + value, 0), y - 4).strokeColor(colors.border).stroke();
+  });
+
+  return y + 6;
+};
+
+export const renderAdoptionReportPdf = async ({
+  bird,
+  weights,
+  vetVisits,
+  notes,
+  transferCode,
+  birdPhotoBuffer = null,
+  assets,
+  printFriendly = false,
+}: AdoptionReportInput) => {
+  const doc = new PDFDocument({
+    size: 'LETTER',
+    margin: page.margin,
+    info: { Title: `FlockPal Adoption Report - ${bird.name}`, Author: 'FlockPal', Subject: `Adoption report for ${bird.name}` },
+  });
+  const output = collectPdf(doc);
+
+  if (!printFriendly) {
+    doc.rect(0, 0, page.width, page.height).fill(colors.paper);
+  }
+
+  const logoPath = fs.existsSync(assets.logoPath) ? assets.logoPath : null;
+  const wordmarkPath = fs.existsSync(assets.wordmarkPath) ? assets.wordmarkPath : logoPath;
+  const defaultPhotoPath = fs.existsSync(assets.defaultBirdPhotoPath) ? assets.defaultBirdPhotoPath : null;
+  const photoBuffer = birdPhotoBuffer ?? dataUrlToBuffer(bird.photo_data_url);
+  const contentWidth = page.width - page.margin * 2;
+  const headerY = page.margin;
+  const headerHeight = 136;
+
+  doc.roundedRect(page.margin, headerY, contentWidth, headerHeight, 12).fillAndStroke(printFriendly ? '#ffffff' : '#f8f4e8', colors.border);
+  if (logoPath) {
+    doc.image(logoPath, page.margin + 10, headerY + 18, { fit: [92, 84], align: 'center', valign: 'center' });
+  }
+
+  const photoX = page.margin + 235;
+  const photoY = headerY + 13;
+  if (photoBuffer) {
+    doc.image(photoBuffer, photoX, photoY, { fit: [58, 58], align: 'center', valign: 'center' });
+  } else if (defaultPhotoPath) {
+    doc.image(defaultPhotoPath, photoX, photoY, { fit: [58, 58], align: 'center', valign: 'center' });
+  }
+  doc.roundedRect(photoX, photoY, 58, 58, 10).strokeColor('#ffffff').lineWidth(2).stroke();
+  doc.fillColor(colors.red).font('Helvetica-Bold').fontSize(22).text(bird.name, page.margin + 140, headerY + 75, { width: 250, align: 'center' });
+  doc.fillColor(colors.muted).font('Helvetica').fontSize(9).text('Adoption Report', page.margin + 140, headerY + 98, { width: 250, align: 'center' });
+
+  const qrDataUrl = await QRCode.toDataURL(transferCode, { margin: 1, width: 96, errorCorrectionLevel: 'H' });
+  const qrBuffer = dataUrlToBuffer(qrDataUrl);
+  const qrX = page.width - page.margin - 132;
+  const qrWidth = 124;
+  doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(8).text('JOIN', qrX, headerY + 7, { width: qrWidth, align: 'center' });
+  if (wordmarkPath) {
+    doc.image(wordmarkPath, qrX + 7, headerY + 18, { fit: [110, 34], align: 'center', valign: 'center' });
+  }
+  doc.fillColor(colors.red).font('Helvetica-Bold').fontSize(7.5).text('Keep my story growing', qrX, headerY + 51, {
+    width: qrWidth,
+    align: 'center',
+  });
+  if (qrBuffer) {
+    doc.image(qrBuffer, qrX + 37, headerY + 62, { width: 50 });
+  }
+  doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(6.8).text('Scan to continue tracking in FlockPal', qrX, headerY + 114, {
+    width: qrWidth,
+    align: 'center',
+  });
+  doc.fillColor(colors.ink).font('Helvetica').fontSize(6.5).text(transferCode, qrX, headerY + 126, { width: qrWidth, align: 'center' });
+
+  let y = headerY + headerHeight + 16;
+  const factGap = 8;
+  const factWidth = (contentWidth - factGap) / 2;
+  const facts = [
+    ['Species', bird.species],
+    ['Band/tag ID', bird.tag_id || 'Not recorded'],
+    ['Sex', genderLabel(bird.gender)],
+    ['Hatch day', formatDate(bird.date_of_birth)],
+    ['Favorite snack', bird.favorite_snack || 'Not recorded'],
+    ['Latest weight', bird.latest_weight_grams ? `${formatWeight(bird.latest_weight_grams)}${bird.latest_recorded_on ? ` on ${formatDate(bird.latest_recorded_on)}` : ''}` : 'Pending'],
+  ];
+  facts.forEach(([label, value], index) => {
+    drawFact(doc, label, value, page.margin + (index % 2) * (factWidth + factGap), y + Math.floor(index / 2) * 50, factWidth);
+  });
+  y += Math.ceil(facts.length / 2) * 50 + 8;
+
+  const motivators = parseList(bird.motivators);
+  const demotivators = parseList(bird.demotivators);
+  drawTextCard(doc, 'Motivators', motivators.length ? motivators.join(', ') : 'Not recorded', page.margin, y, factWidth);
+  drawTextCard(
+    doc,
+    'Demotivators',
+    demotivators.length ? demotivators.join(', ') : 'Not recorded',
+    page.margin + factWidth + factGap,
+    y,
+    factWidth,
+  );
+  y += 72;
+
+  if (y > 610) {
+    doc.addPage();
+    y = page.margin;
+  }
+  y = drawSectionTitle(doc, 'Veterinary Clinic Info', y);
+  const vetFacts = [
+    ['Clinic name', bird.vet_clinic_name || 'Not recorded'],
+    ['Clinic address', bird.vet_clinic_address || 'Not recorded'],
+    ['Account #', bird.vet_account_number || 'Not recorded'],
+    ['Dr. name', bird.vet_doctor_name || 'Not recorded'],
+  ];
+  vetFacts.forEach(([label, value], index) => {
+    drawFact(doc, label, value, page.margin + (index % 2) * (factWidth + factGap), y + Math.floor(index / 2) * 50, factWidth);
+  });
+  y += Math.ceil(vetFacts.length / 2) * 50 + 8;
+
+  y = drawSectionTitle(doc, 'Vet Visit History', y);
+  y = drawTable(
+    doc,
+    ['Date', 'Clinic', 'Reason', 'Notes'],
+    vetVisits.length ? vetVisits.map((visit) => [formatDate(visit.visited_on), visit.clinic_name, visit.reason, visit.notes || '']) : [['No vet visits recorded.', '', '', '']],
+    page.margin,
+    y,
+    [70, 115, 120, contentWidth - 305],
+    28,
+  );
+
+  if (y > 575) {
+    doc.addPage();
+    y = page.margin;
+  }
+  y = drawSectionTitle(doc, 'Weight Graph', y);
+  drawSimpleWeightChart(doc, weights, bird.chart_color, page.margin, y, contentWidth, 120);
+  y += 140;
+
+  y = drawSectionTitle(doc, 'Weight History', y);
+  y = drawTable(
+    doc,
+    ['Date', 'Weight', 'Notes'],
+    weights.length ? weights.map((entry) => [formatDate(entry.recorded_on), formatWeight(entry.weight_grams), entry.notes || '']) : [['No weights recorded.', '', '']],
+    page.margin,
+    y,
+    [95, 70, contentWidth - 165],
+    24,
+  );
+
+  if (notes.length) {
+    if (y > 635) {
+      doc.addPage();
+      y = page.margin;
+    }
+    y = drawSectionTitle(doc, 'Notes', y);
+    notes.slice(0, 8).forEach((note) => {
+      if (y > page.height - page.margin - 48) {
+        doc.addPage();
+        y = page.margin;
+      }
+      doc.fillColor(colors.muted).font('Helvetica-Bold').fontSize(8).text(formatDateTime(note.updated_at), page.margin, y);
+      y = fitText(doc, note.body, page.margin, y + 12, contentWidth, { height: 44, ellipsis: true });
+      y += 8;
+      doc.moveTo(page.margin, y).lineTo(page.width - page.margin, y).strokeColor(colors.border).stroke();
+      y += 8;
+    });
+  }
+
+  doc.end();
+  return output;
+};

backend/src/reports/adoptionReportJob.ts

@@ -0,0 +1,99 @@
+import path from 'path';
+import sharp from 'sharp';
+
+import { listFlockNotes } from '../repositories/auditRepository.js';
+import { getBirdById, listVetVisitsForBird, listWeightsForBird } from '../repositories/birdRepository.js';
+import { getS3ImageStorageConfig } from '../storage/imageStorageConfig.js';
+import { getSignedS3ObjectUrl } from '../storage/s3Client.js';
+import type { BirdRow } from '../types.js';
+import { renderAdoptionReportPdf } from './adoptionReport.js';
+
+const adoptionReportWeightHistoryDays = 14;
+
+const parseDataImage = (value: string | null) => {
+  if (!value) {
+    return null;
+  }
+
+  const match = value.match(/^data:image\/(?:png|jpeg|jpg|webp|gif);base64,(.+)$/);
+  return match ? Buffer.from(match[1], 'base64') : null;
+};
+
+const normalizeReportPhotoBuffer = async (imageBuffer: Buffer | null) => {
+  if (!imageBuffer) {
+    return null;
+  }
+
+  try {
+    return await sharp(imageBuffer).rotate().png().toBuffer();
+  } catch (error) {
+    console.warn('Unable to normalize bird photo for adoption report:', error);
+    return null;
+  }
+};
+
+const loadBirdReportPhotoBuffer = async (bird: BirdRow) => {
+  if (!bird.photo_object_key) {
+    return normalizeReportPhotoBuffer(parseDataImage(bird.photo_data_url));
+  }
+
+  const s3Config = getS3ImageStorageConfig();
+
+  if (!s3Config) {
+    return null;
+  }
+
+  const signedUrl = getSignedS3ObjectUrl({
+    config: s3Config,
+    objectKey: bird.photo_object_key,
+    expiresInSeconds: 5 * 60,
+  });
+  const imageResponse = await fetch(signedUrl);
+
+  if (!imageResponse.ok) {
+    return null;
+  }
+
+  return normalizeReportPhotoBuffer(Buffer.from(await imageResponse.arrayBuffer()));
+};
+
+export const renderAdoptionReportForBird = async ({
+  birdId,
+  workspaceId,
+  transferCode,
+  printFriendly,
+}: {
+  birdId: string;
+  workspaceId: number;
+  transferCode: string;
+  printFriendly: boolean;
+}) => {
+  const bird = await getBirdById(birdId, workspaceId);
+
+  if (!bird) {
+    throw new Error('Bird not found.');
+  }
+
+  const [weights, vetVisits, notes, birdPhotoBuffer] = await Promise.all([
+    listWeightsForBird(bird.id, workspaceId, adoptionReportWeightHistoryDays),
+    listVetVisitsForBird(bird.id, workspaceId),
+    listFlockNotes(workspaceId),
+    loadBirdReportPhotoBuffer(bird),
+  ]);
+  const birdNotes = notes.filter((note) => note.bird_id === bird.id);
+
+  return renderAdoptionReportPdf({
+    bird,
+    weights,
+    vetVisits,
+    notes: birdNotes,
+    transferCode,
+    birdPhotoBuffer,
+    printFriendly,
+    assets: {
+      logoPath: path.join(process.cwd(), 'assets', 'flockpal-logo.png'),
+      wordmarkPath: path.join(process.cwd(), 'assets', 'flockpal-text.png'),
+      defaultBirdPhotoPath: path.join(process.cwd(), 'assets', 'yoda-default.png'),
+    },
+  });
+};

backend/src/repositories/auditRepository.ts

@@ -0,0 +1,133 @@
+import { db } from '../db/client.js';
+import type { AuditLogEntryRow, AuthContext, FlockNoteRow } from '../types.js';
+
+type AuditLogInput = {
+  workspaceId: number;
+  auth?: AuthContext;
+  action: string;
+  entityType: string;
+  entityId?: string | null;
+  entityName?: string | null;
+  details?: Record<string, unknown>;
+};
+
+export const createAuditLogEntry = async ({
+  workspaceId,
+  auth,
+  action,
+  entityType,
+  entityId = null,
+  entityName = null,
+  details = {},
+}: AuditLogInput) => {
+  const result = await db.query<AuditLogEntryRow>(
+    `INSERT INTO audit_log_entries (workspace_id, user_id, actor_name, actor_email, action, entity_type, entity_id, entity_name, details)
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+     RETURNING id, workspace_id, user_id, actor_name, actor_email, action, entity_type, entity_id, entity_name, details, created_at`,
+    [
+      workspaceId,
+      auth?.user.id ?? null,
+      auth?.user.name ?? null,
+      auth?.user.email ?? null,
+      action,
+      entityType,
+      entityId,
+      entityName,
+      JSON.stringify(details),
+    ],
+  );
+
+  return result.rows[0] ?? null;
+};
+
+export const listAuditLogEntries = async (workspaceId: number, limit = 100) => {
+  const result = await db.query<AuditLogEntryRow>(
+    `SELECT id, workspace_id, user_id, actor_name, actor_email, action, entity_type, entity_id, entity_name, details, created_at
+     FROM audit_log_entries
+     WHERE workspace_id = $1
+     ORDER BY created_at DESC
+     LIMIT $2`,
+    [workspaceId, limit],
+  );
+
+  return result.rows;
+};
+
+export const listFlockNotes = async (workspaceId: number) => {
+  const result = await db.query<FlockNoteRow>(
+    `SELECT flock_notes.id,
+            flock_notes.workspace_id,
+            flock_notes.bird_id,
+            birds.name AS bird_name,
+            flock_notes.title,
+            flock_notes.body,
+            flock_notes.created_by_user_id,
+            users.name AS created_by_name,
+            flock_notes.created_at,
+            flock_notes.updated_at
+     FROM flock_notes
+     LEFT JOIN birds ON birds.id = flock_notes.bird_id
+     LEFT JOIN users ON users.id = flock_notes.created_by_user_id
+     WHERE flock_notes.workspace_id = $1
+     ORDER BY flock_notes.updated_at DESC`,
+    [workspaceId],
+  );
+
+  return result.rows;
+};
+
+export const createFlockNote = async ({
+  workspaceId,
+  birdId,
+  body,
+  createdByUserId,
+}: {
+  workspaceId: number;
+  birdId: string | null;
+  body: string;
+  createdByUserId: string | null;
+}) => {
+  const title = body.split(/\s+/).join(' ').slice(0, 160) || 'Note';
+  const result = await db.query<FlockNoteRow>(
+    `WITH inserted_note AS (
+       INSERT INTO flock_notes (workspace_id, bird_id, title, body, created_by_user_id)
+       SELECT $1, $2, $3, $4, $5
+       WHERE $2::uuid IS NULL
+          OR EXISTS (
+            SELECT 1
+            FROM birds
+            WHERE birds.id = $2
+              AND birds.workspace_id = $1
+          )
+       RETURNING id, workspace_id, bird_id, title, body, created_by_user_id, created_at, updated_at
+     )
+     SELECT inserted_note.id,
+            inserted_note.workspace_id,
+            inserted_note.bird_id,
+            birds.name AS bird_name,
+            inserted_note.title,
+            inserted_note.body,
+            inserted_note.created_by_user_id,
+            users.name AS created_by_name,
+            inserted_note.created_at,
+            inserted_note.updated_at
+     FROM inserted_note
+     LEFT JOIN birds ON birds.id = inserted_note.bird_id
+     LEFT JOIN users ON users.id = inserted_note.created_by_user_id`,
+    [workspaceId, birdId, title, body, createdByUserId],
+  );
+
+  return result.rows[0] ?? null;
+};
+
+export const deleteFlockNote = async (noteId: string, workspaceId: number) => {
+  const result = await db.query<{ id: string; title: string }>(
+    `DELETE FROM flock_notes
+     WHERE id = $1
+       AND workspace_id = $2
+     RETURNING id, title`,
+    [noteId, workspaceId],
+  );
+
+  return result.rows[0] ?? null;
+};

backend/src/repositories/birdRepository.test.ts

@@ -188,6 +188,46 @@ test('completePendingBirdTransfersForOwner moves pending birds and marks complet
       ],
     },
     { rowCount: 1, rows: [] },
+    {
+      rowCount: 1,
+      rows: [
+        {
+          workspace_id: 10,
+          workspace_name: 'Original Flock',
+          owner_email: 'sender@example.com',
+        },
+      ],
+    },
+    {
+      rowCount: 1,
+      rows: [
+        {
+          workspace_id: 22,
+          workspace_name: 'Receiving Flock',
+          owner_email: 'receiver@example.com',
+        },
+      ],
+    },
+    {
+      rowCount: 1,
+      rows: [
+        {
+          id: 'timeline-1',
+          bird_id: 'bird-1',
+          event_type: 'transferred',
+          from_workspace_id: 10,
+          to_workspace_id: 22,
+          from_workspace_name: 'Original Flock',
+          to_workspace_name: 'Receiving Flock',
+          from_owner_email: 'sender@example.com',
+          to_owner_email: 'receiver@example.com',
+          location_label: 'Receiving Flock',
+          location_details: null,
+          created_by_user_id: 'user-1',
+          created_at: '2026-04-15T00:00:00.000Z',
+        },
+      ],
+    },
   );
 
   const result = await completePendingBirdTransfersForOwner('receiver@example.com', 22);
@@ -197,4 +237,19 @@ test('completePendingBirdTransfersForOwner moves pending birds and marks complet
   assert.deepEqual(calls[1].params, ['bird-1', 10, 22]);
   assert.deepEqual(calls[2].params, ['transfer-1', 22]);
   assert.match(calls[2].text, /completed_at = CURRENT_TIMESTAMP/);
+  assert.deepEqual(calls[5].params, [
+    'bird-1',
+    'transferred',
+    10,
+    22,
+    'Original Flock',
+    'Receiving Flock',
+    'sender@example.com',
+    'receiver@example.com',
+    null,
+    null,
+    null,
+    'user-1',
+    null,
+  ]);
 });

backend/src/repositories/birdRepository.ts

@@ -5,9 +5,14 @@ import type {
   BirdMilestoneReminderDeliveryRow,
   BirdMilestoneReminderType,
   BirdRow,
+  BirdTimelineEventRow,
+  BirdTimelineEventType,
+  BirdTransferCodeRow,
   LostBirdMatchRow,
   MedicationAdministrationRow,
   MedicationDoseScheduleItem,
+  MedicationReminderCandidateRow,
+  MedicationReminderDeliveryRow,
   MedicationRow,
   PendingBirdTransferRow,
   VetVisitRow,
@@ -23,6 +28,12 @@ const birdSelectFields = `
   birds.motivators,
   birds.demotivators,
   birds.favorite_snack,
+  birds.location_label,
+  birds.location_details,
+  birds.vet_clinic_name,
+  birds.vet_clinic_address,
+  birds.vet_account_number,
+  birds.vet_doctor_name,
   birds.gender,
   birds.date_of_birth::text,
   birds.gotcha_day::text,
@@ -44,6 +55,34 @@ const birdSelectFields = `
   latest.recorded_on::text AS latest_recorded_on
 `;
 
+type WorkspaceTimelineSnapshot = {
+  workspace_id: number;
+  workspace_name: string;
+  owner_email: string | null;
+};
+
+const getWorkspaceTimelineSnapshot = async (workspaceId: number) => {
+  const result = await db.query<WorkspaceTimelineSnapshot>(
+    `SELECT
+       workspaces.id AS workspace_id,
+       workspaces.name AS workspace_name,
+       COALESCE(workspaces.billing_email, owner_member.invite_email, owner_member.email) AS owner_email
+     FROM workspaces
+     LEFT JOIN LATERAL (
+       SELECT invite_email, email
+       FROM workspace_members
+       WHERE workspace_members.workspace_id = workspaces.id
+         AND workspace_members.role = 'owner'
+       ORDER BY accepted_at DESC NULLS LAST, created_at ASC
+       LIMIT 1
+     ) owner_member ON TRUE
+     WHERE workspaces.id = $1`,
+    [workspaceId],
+  );
+
+  return result.rows[0] ?? null;
+};
+
 export const getBirdById = async (birdId: string, workspaceId: number) => {
   const result = await db.query<BirdRow>(
     `SELECT
@@ -127,6 +166,102 @@ export const listMemorializedBirds = async (workspaceId: number) => {
   return result.rows;
 };
 
+export const createBirdTimelineEvent = async ({
+  birdId,
+  eventType,
+  fromWorkspaceId,
+  toWorkspaceId,
+  locationLabel,
+  locationDetails,
+  note,
+  eventDate,
+  createdByUserId,
+}: {
+  birdId: string;
+  eventType: BirdTimelineEventType;
+  fromWorkspaceId?: number | null;
+  toWorkspaceId?: number | null;
+  locationLabel?: string | null;
+  locationDetails?: Record<string, unknown> | null;
+  note?: string | null;
+  eventDate?: string | null;
+  createdByUserId?: string | null;
+}) => {
+  const [fromWorkspace, toWorkspace] = await Promise.all([
+    fromWorkspaceId ? getWorkspaceTimelineSnapshot(fromWorkspaceId) : Promise.resolve(null),
+    toWorkspaceId ? getWorkspaceTimelineSnapshot(toWorkspaceId) : Promise.resolve(null),
+  ]);
+
+  const result = await db.query<BirdTimelineEventRow>(
+    `INSERT INTO bird_timeline_events (
+       bird_id,
+       event_type,
+       from_workspace_id,
+       to_workspace_id,
+       from_workspace_name,
+       to_workspace_name,
+       from_owner_email,
+       to_owner_email,
+       location_label,
+       note,
+       event_date,
+       created_by_user_id,
+       location_details
+     )
+     VALUES (
+       $1,
+       $2,
+       $3,
+       $4,
+       $5::varchar(160),
+       $6::varchar(160),
+       $7::varchar(320),
+       $8::varchar(320),
+       COALESCE($9::varchar(160), $6::varchar(160), $5::varchar(160)),
+       $10,
+       COALESCE($11::date, CURRENT_DATE),
+       $12,
+       $13
+     )
+     RETURNING id, bird_id, event_type, from_workspace_id, to_workspace_id, from_workspace_name, to_workspace_name, from_owner_email, to_owner_email, location_label, location_details, note, event_date::text, created_by_user_id, created_at`,
+    [
+      birdId,
+      eventType,
+      fromWorkspaceId ?? null,
+      toWorkspaceId ?? null,
+      fromWorkspace?.workspace_name ?? null,
+      toWorkspace?.workspace_name ?? null,
+      fromWorkspace?.owner_email ?? null,
+      toWorkspace?.owner_email ?? null,
+      locationLabel ?? null,
+      note ?? null,
+      eventDate ?? null,
+      createdByUserId ?? null,
+      locationDetails ?? null,
+    ],
+  );
+
+  return result.rows[0] ?? null;
+};
+
+export const listBirdTimelineEvents = async (birdId: string, workspaceId: number) => {
+  const result = await db.query<BirdTimelineEventRow>(
+    `SELECT id, bird_id, event_type, from_workspace_id, to_workspace_id, from_workspace_name, to_workspace_name, from_owner_email, to_owner_email, location_label, location_details, note, event_date::text, created_by_user_id, created_at
+     FROM bird_timeline_events
+     WHERE bird_id = $1
+       AND EXISTS (
+         SELECT 1
+         FROM birds
+         WHERE birds.id = bird_timeline_events.bird_id
+           AND birds.workspace_id = $2
+       )
+     ORDER BY event_date DESC, created_at DESC`,
+    [birdId, workspaceId],
+  );
+
+  return result.rows;
+};
+
 export const findBirdsByBandId = async (tagId: string) => {
   const result = await db.query<LostBirdMatchRow>(
     `SELECT
@@ -278,6 +413,79 @@ export const createBirdMilestoneReminderDelivery = async ({
   return result.rows[0] ?? null;
 };
 
+export const listDueMedicationReminders = async (runDate: string, currentTime: string) => {
+  const result = await db.query<MedicationReminderCandidateRow>(
+    `SELECT
+       ${birdSelectFields},
+       workspaces.name AS workspace_name,
+       medications.id AS medication_id,
+       medications.name AS medication_name,
+       medications.dosage,
+       medications.frequency,
+       medications.dose_schedule,
+       medications.route,
+       medications.start_date::text AS medication_start_date,
+       medications.end_date::text AS medication_end_date,
+       medications.notes AS medication_notes,
+       $1::date::text AS scheduled_on,
+       dose.key AS administration_slot,
+       dose.label AS administration_label,
+       dose.time AS administration_time
+     FROM medications
+     INNER JOIN birds ON birds.id = medications.bird_id
+     INNER JOIN workspaces ON workspaces.id = birds.workspace_id
+     CROSS JOIN LATERAL jsonb_to_recordset(medications.dose_schedule) AS dose(key text, label text, time text)
+     LEFT JOIN LATERAL (
+       SELECT weight_grams, recorded_on
+       FROM weight_records
+       WHERE weight_records.bird_id = birds.id
+       ORDER BY recorded_on DESC
+       LIMIT 1
+     ) latest ON TRUE
+     WHERE medications.reminders_enabled = TRUE
+       AND birds.memorialized_at IS NULL
+       AND medications.start_date <= $1::date
+       AND (medications.end_date IS NULL OR medications.end_date >= $1::date)
+       AND COALESCE(NULLIF(BTRIM(dose.time), ''), '') <> ''
+       AND dose.time <= $2
+       AND NOT EXISTS (
+         SELECT 1
+         FROM medication_reminder_deliveries deliveries
+         WHERE deliveries.medication_id = medications.id
+           AND deliveries.scheduled_on = $1::date
+           AND deliveries.administration_slot = dose.key
+       )
+     ORDER BY workspaces.name ASC, birds.name ASC, dose.time ASC, medications.name ASC`,
+    [runDate, currentTime],
+  );
+
+  return result.rows;
+};
+
+export const createMedicationReminderDelivery = async ({
+  medicationId,
+  birdId,
+  workspaceId,
+  scheduledOn,
+  administrationSlot,
+}: {
+  medicationId: string;
+  birdId: string;
+  workspaceId: number;
+  scheduledOn: string;
+  administrationSlot: string;
+}) => {
+  const result = await db.query<MedicationReminderDeliveryRow>(
+    `INSERT INTO medication_reminder_deliveries (medication_id, bird_id, workspace_id, scheduled_on, administration_slot)
+     VALUES ($1, $2, $3, $4, $5)
+     ON CONFLICT (medication_id, scheduled_on, administration_slot) DO NOTHING
+     RETURNING id, medication_id, bird_id, workspace_id, scheduled_on::text, administration_slot, delivered_at`,
+    [medicationId, birdId, workspaceId, scheduledOn, administrationSlot],
+  );
+
+  return result.rows[0] ?? null;
+};
+
 export const createBird = async ({
   birdId,
   workspaceId,
@@ -287,6 +495,12 @@ export const createBird = async ({
   motivators,
   demotivators,
   favoriteSnack,
+  locationLabel = null,
+  locationDetails = null,
+  vetClinicName = null,
+  vetClinicAddress = null,
+  vetAccountNumber = null,
+  vetDoctorName = null,
   gender,
   dateOfBirth,
   gotchaDay,
@@ -308,6 +522,12 @@ export const createBird = async ({
   motivators: string | null;
   demotivators: string | null;
   favoriteSnack: string | null;
+  locationLabel?: string | null;
+  locationDetails?: Record<string, unknown> | null;
+  vetClinicName?: string | null;
+  vetClinicAddress?: string | null;
+  vetAccountNumber?: string | null;
+  vetDoctorName?: string | null;
   gender: BirdGender;
   dateOfBirth: string | null;
   gotchaDay: string | null;
@@ -322,9 +542,9 @@ export const createBird = async ({
   publicProfileEnabled?: boolean;
 }) => {
   const result = await db.query<BirdRow>(
-    `INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
-     VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
-     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
+    `INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
+     VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
+     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
     [
       birdId ?? null,
       workspaceId,
@@ -334,6 +554,12 @@ export const createBird = async ({
       motivators,
       demotivators,
       favoriteSnack,
+      locationLabel,
+      locationDetails,
+      vetClinicName,
+      vetClinicAddress,
+      vetAccountNumber,
+      vetDoctorName,
       gender,
       dateOfBirth,
       gotchaDay,
@@ -361,6 +587,12 @@ export const updateBird = async ({
   motivators,
   demotivators,
   favoriteSnack,
+  locationLabel,
+  locationDetails,
+  vetClinicName,
+  vetClinicAddress,
+  vetAccountNumber,
+  vetDoctorName,
   gender,
   dateOfBirth,
   gotchaDay,
@@ -382,6 +614,12 @@ export const updateBird = async ({
   motivators: string | null;
   demotivators: string | null;
   favoriteSnack: string | null;
+  locationLabel: string | null;
+  locationDetails?: Record<string, unknown> | null;
+  vetClinicName: string | null;
+  vetClinicAddress: string | null;
+  vetAccountNumber: string | null;
+  vetDoctorName: string | null;
   gender: BirdGender;
   dateOfBirth: string | null;
   gotchaDay: string | null;
@@ -403,22 +641,28 @@ export const updateBird = async ({
          motivators = $5,
          demotivators = $6,
          favorite_snack = $7,
-         gender = $8,
-         date_of_birth = $9,
-         gotcha_day = $10,
-         chart_color = $11,
-         photo_data_url = $12,
-         photo_object_key = $13,
-         photo_content_type = $14,
-         photo_updated_at = $15,
-         notify_on_dob = $16,
-         notify_on_gotcha_day = $17,
-         public_profile_code = $18,
-         public_profile_enabled = $19
+         location_label = $8,
+         vet_clinic_name = $9,
+         vet_clinic_address = $10,
+         vet_account_number = $11,
+         vet_doctor_name = $12,
+         gender = $13,
+         date_of_birth = $14,
+         gotcha_day = $15,
+         chart_color = $16,
+         photo_data_url = $17,
+         photo_object_key = $18,
+         photo_content_type = $19,
+         photo_updated_at = $20,
+         notify_on_dob = $21,
+         notify_on_gotcha_day = $22,
+         public_profile_code = $23,
+         public_profile_enabled = $24,
+         location_details = $25
      WHERE id = $1
-       AND workspace_id = $20
+       AND workspace_id = $26
        AND memorialized_at IS NULL
-     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
+     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
        (
          SELECT weight_grams::text
          FROM weight_records
@@ -441,6 +685,11 @@ export const updateBird = async ({
       motivators,
       demotivators,
       favoriteSnack,
+      locationLabel,
+      vetClinicName,
+      vetClinicAddress,
+      vetAccountNumber,
+      vetDoctorName,
       gender,
       dateOfBirth,
       gotchaDay,
@@ -453,6 +702,7 @@ export const updateBird = async ({
       notifyOnGotchaDay,
       publicProfileCode,
       publicProfileEnabled,
+      locationDetails ?? null,
       workspaceId,
     ],
   );
@@ -482,7 +732,7 @@ export const memorializeBird = async ({
      WHERE id = $1
        AND workspace_id = $2
        AND memorialized_at IS NULL
-     RETURNING id, workspace_id, name, tag_id, species, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
+     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
        (
          SELECT weight_grams::text
          FROM weight_records
@@ -518,7 +768,7 @@ export const updateMemorialReminderPreference = async ({
      WHERE id = $1
        AND workspace_id = $2
        AND memorialized_at IS NOT NULL
-     RETURNING id, workspace_id, name, tag_id, species, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
+     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
        (
          SELECT weight_grams::text
          FROM weight_records
@@ -558,7 +808,7 @@ export const transferBirdToWorkspace = async (birdId: string, sourceWorkspaceId:
      WHERE id = $1
        AND workspace_id = $2
        AND memorialized_at IS NULL
-     RETURNING id, workspace_id, name, tag_id, species, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
+     RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
        (
          SELECT weight_grams::text
          FROM weight_records
@@ -654,12 +904,23 @@ export const completePendingBirdTransfersForOwner = async (ownerEmail: string, t
       }
 
       await markPendingBirdTransferCompleted(transfer.id, targetWorkspaceId);
+      try {
+        await createBirdTimelineEvent({
+          birdId: bird.id,
+          eventType: 'transferred',
+          fromWorkspaceId: transfer.source_workspace_id,
+          toWorkspaceId: targetWorkspaceId,
+          createdByUserId: transfer.requested_by_user_id,
+        });
+      } catch (timelineError) {
+        console.error('Unable to write bird timeline event', timelineError);
+      }
       completed += 1;
     } catch (error) {
       failed += 1;
       const message =
         typeof error === 'object' && error && 'code' in error && error.code === '23505'
-          ? 'The receiving flock already has a bird using the same band/tag ID.'
+          ? 'That band/tag ID is already in use in FlockPal.'
           : error instanceof Error
             ? error.message
             : 'Unable to complete pending bird transfer.';
@@ -670,6 +931,93 @@ export const completePendingBirdTransfersForOwner = async (ownerEmail: string, t
   return { completed, failed };
 };
 
+export const createBirdTransferCode = async ({
+  code,
+  birdId,
+  sourceWorkspaceId,
+  requestedByUserId,
+}: {
+  code: string;
+  birdId: string;
+  sourceWorkspaceId: number;
+  requestedByUserId: string;
+}) => {
+  await db.query(
+    `UPDATE bird_transfer_codes
+     SET revoked_at = CURRENT_TIMESTAMP
+     WHERE bird_id = $1
+       AND source_workspace_id = $2
+       AND completed_at IS NULL
+       AND revoked_at IS NULL`,
+    [birdId, sourceWorkspaceId],
+  );
+
+  const result = await db.query<BirdTransferCodeRow>(
+    `INSERT INTO bird_transfer_codes (code, bird_id, source_workspace_id, requested_by_user_id)
+     VALUES ($1, $2, $3, $4)
+     RETURNING id, code, bird_id, source_workspace_id, requested_by_user_id, completed_at::text, completed_workspace_id, revoked_at::text, created_at`,
+    [code, birdId, sourceWorkspaceId, requestedByUserId],
+  );
+
+  return result.rows[0] ?? null;
+};
+
+export const getOpenBirdTransferCode = async (code: string) => {
+  const result = await db.query<
+    BirdRow & {
+      transfer_code_id: string;
+      code: string;
+      source_workspace_id: number;
+      requested_by_user_id: string;
+      completed_at: string | null;
+      completed_workspace_id: number | null;
+      revoked_at: string | null;
+      transfer_code_created_at: string;
+      workspace_name: string;
+    }
+  >(
+    `SELECT
+       bird_transfer_codes.id AS transfer_code_id,
+       bird_transfer_codes.code,
+       bird_transfer_codes.source_workspace_id,
+       bird_transfer_codes.requested_by_user_id,
+       bird_transfer_codes.completed_at::text,
+       bird_transfer_codes.completed_workspace_id,
+       bird_transfer_codes.revoked_at::text,
+       bird_transfer_codes.created_at AS transfer_code_created_at,
+       workspaces.name AS workspace_name,
+       ${birdSelectFields}
+     FROM bird_transfer_codes
+     INNER JOIN birds ON birds.id = bird_transfer_codes.bird_id
+     INNER JOIN workspaces ON workspaces.id = bird_transfer_codes.source_workspace_id
+     LEFT JOIN LATERAL (
+       SELECT weight_grams, recorded_on
+       FROM weight_records
+       WHERE weight_records.bird_id = birds.id
+       ORDER BY recorded_on DESC
+       LIMIT 1
+     ) latest ON TRUE
+     WHERE bird_transfer_codes.code = $1
+       AND bird_transfer_codes.completed_at IS NULL
+       AND bird_transfer_codes.revoked_at IS NULL
+       AND birds.workspace_id = bird_transfer_codes.source_workspace_id
+       AND birds.memorialized_at IS NULL`,
+    [code],
+  );
+
+  return result.rows[0] ?? null;
+};
+
+export const markBirdTransferCodeCompleted = async (codeId: string, completedWorkspaceId: number) => {
+  await db.query(
+    `UPDATE bird_transfer_codes
+     SET completed_at = CURRENT_TIMESTAMP,
+         completed_workspace_id = $2
+     WHERE id = $1`,
+    [codeId, completedWorkspaceId],
+  );
+};
+
 export const listWeightsForBird = async (birdId: string, workspaceId: number, days: number) => {
   const result = await db.query<WeightRow>(
     `SELECT id, bird_id, weight_grams, recorded_on::text, notes
@@ -700,6 +1048,34 @@ export const createWeightForBird = async (birdId: string, weightGrams: number, r
   return result.rows[0] ?? null;
 };
 
+export const updateWeightForBird = async (
+  weightId: string,
+  birdId: string,
+  weightGrams: number,
+  recordedOn: string,
+  notes: string | null,
+) => {
+  const result = await db.query<WeightRow>(
+    `UPDATE weight_records
+     SET weight_grams = $3,
+         recorded_on = $4,
+         notes = $5
+     WHERE id = $1
+       AND bird_id = $2
+       AND id IN (
+         SELECT recent.id
+         FROM weight_records recent
+         WHERE recent.bird_id = $2
+         ORDER BY recent.recorded_on DESC, recent.created_at DESC
+         LIMIT 3
+       )
+     RETURNING id, bird_id, weight_grams, recorded_on::text, notes`,
+    [weightId, birdId, weightGrams, recordedOn, notes],
+  );
+
+  return result.rows[0] ?? null;
+};
+
 export const listVetVisitsForBird = async (birdId: string, workspaceId: number) => {
   const result = await db.query<VetVisitRow>(
     `SELECT id, bird_id, visited_on::text, clinic_name, reason, notes
@@ -766,7 +1142,7 @@ export const deleteVetVisitForBird = async (visitId: string, birdId: string) =>
 
 export const listMedicationsForBird = async (birdId: string, workspaceId: number) => {
   const result = await db.query<MedicationRow>(
-    `SELECT id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes
+    `SELECT id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled
      FROM medications
      WHERE bird_id = $1
        AND EXISTS (
@@ -792,12 +1168,13 @@ export const createMedicationForBird = async (
   startDate: string,
   endDate: string | null,
   notes: string | null,
+  remindersEnabled: boolean,
 ) => {
   const result = await db.query<MedicationRow>(
-    `INSERT INTO medications (bird_id, name, dosage, frequency, dose_schedule, route, start_date, end_date, notes)
-     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
-     RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes`,
-    [birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes],
+    `INSERT INTO medications (bird_id, name, dosage, frequency, dose_schedule, route, start_date, end_date, notes, reminders_enabled)
+     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+     RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled`,
+    [birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes, remindersEnabled],
   );
 
   return result.rows[0] ?? null;
@@ -814,6 +1191,7 @@ export const updateMedicationForBird = async (
   startDate: string,
   endDate: string | null,
   notes: string | null,
+  remindersEnabled: boolean,
 ) => {
   const result = await db.query<MedicationRow>(
     `UPDATE medications
@@ -824,11 +1202,12 @@ export const updateMedicationForBird = async (
          route = $7,
          start_date = $8,
          end_date = $9,
-         notes = $10
+         notes = $10,
+         reminders_enabled = $11
      WHERE id = $1
        AND bird_id = $2
-     RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes`,
-    [medicationId, birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes],
+     RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled`,
+    [medicationId, birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes, remindersEnabled],
   );
 
   return result.rows[0] ?? null;

backend/src/repositories/workspaceRepository.test.ts

@@ -3,6 +3,7 @@ import test from 'node:test';
 
 import {
   createWorkspace,
+  deleteWorkspaceMember,
   deleteWorkspaceIfEmpty,
   ensureDefaultWorkspaceForUser,
   ensurePersonalWorkspaceForUser,
@@ -10,6 +11,7 @@ import {
   getPlatformAdminSummary,
   listOwnedWorkspacesByOwnerEmail,
   updateWorkspace,
+  updateWorkspaceMemberRole,
 } from './workspaceRepository.js';
 import { mockDb } from '../test/mockDb.js';
 import type { UserRow } from '../types.js';
@@ -259,6 +261,263 @@ test('listOwnedWorkspacesByOwnerEmail resolves accepted owner flocks by email',
   assert.match(calls[0].text, /workspaces\.id <> \$2/);
 });
 
+test('updateWorkspaceMemberRole changes a non-owner member role', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [
+      {
+        id: 'member-1',
+        workspace_id: 42,
+        user_id: 'user-2',
+        invite_email: 'helper@example.com',
+        name: 'Helper',
+        role: 'viewer',
+        accepted_at: '2026-04-14T00:00:00.000Z',
+        created_at: '2026-04-14T00:00:00.000Z',
+      },
+    ],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'member-1',
+    workspaceId: 42,
+    role: 'viewer',
+    requesterMemberId: 'owner-member',
+    requesterIsBillingOwner: false,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member?.role, 'viewer');
+  assert.deepEqual(calls[0].params, ['member-1', 42, 'viewer', false, 'owner-member', 'billing@example.com', 'owner']);
+  assert.match(calls[0].text, /UPDATE workspace_members/);
+  assert.match(calls[0].text, /role <> 'owner'/);
+});
+
+test('updateWorkspaceMemberRole returns null when no non-owner member matches', async () => {
+  mockDb({
+    rowCount: 0,
+    rows: [],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'owner-member',
+    workspaceId: 42,
+    role: 'viewer',
+    requesterMemberId: 'owner-member',
+    requesterIsBillingOwner: false,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member, null);
+});
+
+test('updateWorkspaceMemberRole lets the billing owner change another owner role', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [
+      {
+        id: 'other-owner',
+        workspace_id: 42,
+        user_id: 'user-2',
+        invite_email: 'other@example.com',
+        name: 'Other Owner',
+        role: 'assistant',
+        accepted_at: '2026-04-14T00:00:00.000Z',
+        created_at: '2026-04-14T00:00:00.000Z',
+      },
+    ],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'other-owner',
+    workspaceId: 42,
+    role: 'assistant',
+    requesterMemberId: 'billing-owner',
+    requesterIsBillingOwner: true,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member?.role, 'assistant');
+  assert.deepEqual(calls[0].params, ['other-owner', 42, 'assistant', true, 'billing-owner', 'billing@example.com', 'owner']);
+  assert.match(calls[0].text, /id <> \$5/);
+});
+
+test('updateWorkspaceMemberRole does not let the billing owner change their own owner role', async () => {
+  mockDb({
+    rowCount: 0,
+    rows: [],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'billing-owner',
+    workspaceId: 42,
+    role: 'assistant',
+    requesterMemberId: 'billing-owner',
+    requesterIsBillingOwner: true,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member, null);
+});
+
+test('updateWorkspaceMemberRole lets a non-billing owner change another non-billing owner role', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [
+      {
+        id: 'other-owner',
+        workspace_id: 42,
+        user_id: 'user-2',
+        invite_email: 'other@example.com',
+        name: 'Other Owner',
+        role: 'assistant',
+        accepted_at: '2026-04-14T00:00:00.000Z',
+        created_at: '2026-04-14T00:00:00.000Z',
+      },
+    ],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'other-owner',
+    workspaceId: 42,
+    role: 'assistant',
+    requesterMemberId: 'non-billing-owner',
+    requesterIsBillingOwner: false,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member?.role, 'assistant');
+  assert.deepEqual(calls[0].params, ['other-owner', 42, 'assistant', false, 'non-billing-owner', 'billing@example.com', 'owner']);
+  assert.match(calls[0].text, /LOWER\(BTRIM\(COALESCE\(invite_email, email\)\)\) <> LOWER\(BTRIM\(\$6\)\)/);
+});
+
+test('updateWorkspaceMemberRole does not let a non-billing owner change the billing owner role', async () => {
+  mockDb({
+    rowCount: 0,
+    rows: [],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'billing-owner',
+    workspaceId: 42,
+    role: 'assistant',
+    requesterMemberId: 'non-billing-owner',
+    requesterIsBillingOwner: false,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member, null);
+});
+
+test('updateWorkspaceMemberRole lets the billing owner promote a non-owner to owner', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [
+      {
+        id: 'member-1',
+        workspace_id: 42,
+        user_id: 'user-2',
+        invite_email: 'helper@example.com',
+        name: 'Helper',
+        role: 'owner',
+        accepted_at: '2026-04-14T00:00:00.000Z',
+        created_at: '2026-04-14T00:00:00.000Z',
+      },
+    ],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'member-1',
+    workspaceId: 42,
+    role: 'owner',
+    requesterMemberId: 'billing-owner',
+    requesterIsBillingOwner: true,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member?.role, 'owner');
+  assert.deepEqual(calls[0].params, ['member-1', 42, 'owner', true, 'billing-owner', 'billing@example.com', 'owner']);
+  assert.match(calls[0].text, /\$3 <> 'owner'/);
+});
+
+test('updateWorkspaceMemberRole does not let a non-billing owner promote a member to owner', async () => {
+  mockDb({
+    rowCount: 0,
+    rows: [],
+  });
+
+  const member = await updateWorkspaceMemberRole({
+    memberId: 'member-1',
+    workspaceId: 42,
+    role: 'owner',
+    requesterMemberId: 'non-billing-owner',
+    requesterIsBillingOwner: false,
+    requesterRole: 'owner',
+    billingEmail: 'billing@example.com',
+  });
+
+  assert.equal(member, null);
+});
+
+test('deleteWorkspaceMember removes non-owner members without billing owner access', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [{ id: 'member-1' }],
+  });
+
+  const deleted = await deleteWorkspaceMember({
+    memberId: 'member-1',
+    workspaceId: 42,
+    requesterMemberId: 'owner-member',
+    requesterIsBillingOwner: false,
+  });
+
+  assert.equal(deleted, true);
+  assert.deepEqual(calls[0].params, ['member-1', 42, false, 'owner-member']);
+  assert.match(calls[0].text, /role <> 'owner'/);
+});
+
+test('deleteWorkspaceMember lets the billing owner remove another owner', async () => {
+  const { calls } = mockDb({
+    rowCount: 1,
+    rows: [{ id: 'other-owner' }],
+  });
+
+  const deleted = await deleteWorkspaceMember({
+    memberId: 'other-owner',
+    workspaceId: 42,
+    requesterMemberId: 'billing-owner',
+    requesterIsBillingOwner: true,
+  });
+
+  assert.equal(deleted, true);
+  assert.deepEqual(calls[0].params, ['other-owner', 42, true, 'billing-owner']);
+  assert.match(calls[0].text, /id <> \$4/);
+});
+
+test('deleteWorkspaceMember does not let the billing owner remove their own owner membership', async () => {
+  mockDb({
+    rowCount: 0,
+    rows: [],
+  });
+
+  const deleted = await deleteWorkspaceMember({
+    memberId: 'billing-owner',
+    workspaceId: 42,
+    requesterMemberId: 'billing-owner',
+    requesterIsBillingOwner: true,
+  });
+
+  assert.equal(deleted, false);
+});
+
 test('getPlatformAdminSummary counts memorialized birds separately', async () => {
   const { calls } = mockDb({
     rowCount: 1,

backend/src/repositories/workspaceRepository.ts

@@ -364,19 +364,81 @@ export const upsertWorkspaceMember = async ({
   return result.rows[0] ?? null;
 };
 
-export const deleteWorkspaceMember = async (memberId: string, workspaceId: number) => {
+export const deleteWorkspaceMember = async ({
+  memberId,
+  workspaceId,
+  requesterMemberId,
+  requesterIsBillingOwner,
+}: {
+  memberId: string;
+  workspaceId: number;
+  requesterMemberId: string;
+  requesterIsBillingOwner: boolean;
+}) => {
   const result = await db.query<{ id: string }>(
     `DELETE FROM workspace_members
      WHERE id = $1
        AND workspace_id = $2
-       AND role <> 'owner'
+       AND (
+         role <> 'owner'
+         OR (
+           $3 = TRUE
+           AND id <> $4
+         )
+       )
      RETURNING id`,
-    [memberId, workspaceId],
+    [memberId, workspaceId, requesterIsBillingOwner, requesterMemberId],
   );
 
   return Boolean(result.rowCount);
 };
 
+export const updateWorkspaceMemberRole = async ({
+  memberId,
+  workspaceId,
+  role,
+  requesterMemberId,
+  requesterIsBillingOwner,
+  requesterRole,
+  billingEmail,
+}: {
+  memberId: string;
+  workspaceId: number;
+  role: WorkspaceMemberRow['role'];
+  requesterMemberId: string;
+  requesterIsBillingOwner: boolean;
+  requesterRole: WorkspaceMemberRow['role'];
+  billingEmail: string;
+}) => {
+  const result = await db.query<WorkspaceMemberRow>(
+    `UPDATE workspace_members
+     SET role = $3
+     WHERE id = $1
+       AND workspace_id = $2
+       AND (
+         $3 <> 'owner'
+         OR $4 = TRUE
+       )
+       AND (
+         role <> 'owner'
+         OR (
+           id <> $5
+           AND (
+             $4 = TRUE
+             OR (
+               $7 = 'owner'
+               AND LOWER(BTRIM(COALESCE(invite_email, email))) <> LOWER(BTRIM($6))
+             )
+           )
+         )
+       )
+     RETURNING id, workspace_id, user_id, COALESCE(invite_email, email) AS invite_email, name, role, accepted_at::text, created_at`,
+    [memberId, workspaceId, role, requesterIsBillingOwner, requesterMemberId, billingEmail, requesterRole],
+  );
+
+  return result.rows[0] ?? null;
+};
+
 export const listRescueWorkspacesForAdmin = async () => {
   const result = await db.query<
     WorkspaceRow & {

backend/src/types.ts

@@ -1,12 +1,12 @@
 export type WorkspaceType = 'standard' | 'rescue';
 export type WorkspaceRole = 'owner' | 'assistant' | 'caregiver' | 'viewer';
-export type BillingPlan = 'rescue_free' | 'household_basic' | 'household_plus' | 'household_macaw';
+export type BillingPlan = 'rescue_free' | 'household_basic' | 'household_plus' | 'household_macaw' | 'household_hyacinth_macaw';
 export type BillingInterval = 'monthly' | 'yearly';
 export type SubscriptionStatus = 'active' | 'trialing' | 'past_due' | 'canceled' | 'unpaid' | 'none';
 export type RescueVerificationStatus = 'not_required' | 'pending' | 'approved' | 'rejected';
 export type ProviderKey = 'google' | 'microsoft' | 'apple';
 export type IntegrationTokenScope = 'read_only' | 'read_write';
-export type BirdGender = 'unknown' | 'male' | 'female';
+export type BirdGender = 'unknown' | 'male' | 'female' | 'male_dna' | 'female_dna';
 
 export type UserRow = {
   id: string;
@@ -130,6 +130,12 @@ export type BirdRow = {
   motivators: string | null;
   demotivators: string | null;
   favorite_snack: string | null;
+  location_label: string | null;
+  location_details: Record<string, unknown> | null;
+  vet_clinic_name: string | null;
+  vet_clinic_address: string | null;
+  vet_account_number: string | null;
+  vet_doctor_name: string | null;
   gender: BirdGender;
   date_of_birth: string | null;
   gotcha_day: string | null;
@@ -187,6 +193,38 @@ export type PendingBirdTransferRow = {
   created_at: string;
 };
 
+export type BirdTransferCodeRow = {
+  id: string;
+  code: string;
+  bird_id: string;
+  source_workspace_id: number;
+  requested_by_user_id: string;
+  completed_at: string | null;
+  completed_workspace_id: number | null;
+  revoked_at: string | null;
+  created_at: string;
+};
+
+export type BirdTimelineEventType = 'profile_created' | 'transferred' | 'location_updated' | 'owner_changed' | 'manual_note';
+
+export type BirdTimelineEventRow = {
+  id: string;
+  bird_id: string;
+  event_type: BirdTimelineEventType;
+  from_workspace_id: number | null;
+  to_workspace_id: number | null;
+  from_workspace_name: string | null;
+  to_workspace_name: string | null;
+  from_owner_email: string | null;
+  to_owner_email: string | null;
+  location_label: string | null;
+  location_details: Record<string, unknown> | null;
+  note: string | null;
+  event_date: string;
+  created_by_user_id: string | null;
+  created_at: string;
+};
+
 export type WeightRow = {
   id: string;
   bird_id: string;
@@ -215,6 +253,7 @@ export type MedicationRow = {
   start_date: string;
   end_date: string | null;
   notes: string | null;
+  reminders_enabled: boolean;
 };
 
 export type MedicationDoseScheduleItem = {
@@ -223,6 +262,33 @@ export type MedicationDoseScheduleItem = {
   time: string;
 };
 
+export type MedicationReminderCandidateRow = BirdRow & {
+  workspace_name: string;
+  medication_id: string;
+  medication_name: string;
+  dosage: string;
+  frequency: string;
+  dose_schedule: MedicationDoseScheduleItem[];
+  route: string | null;
+  medication_start_date: string;
+  medication_end_date: string | null;
+  medication_notes: string | null;
+  scheduled_on: string;
+  administration_slot: string;
+  administration_label: string;
+  administration_time: string;
+};
+
+export type MedicationReminderDeliveryRow = {
+  id: string;
+  medication_id: string;
+  bird_id: string;
+  workspace_id: number;
+  scheduled_on: string;
+  administration_slot: string;
+  delivered_at: string;
+};
+
 export type MedicationAdministrationRow = {
   id: string;
   medication_id: string;
@@ -235,6 +301,33 @@ export type MedicationAdministrationRow = {
   created_at: string;
 };
 
+export type FlockNoteRow = {
+  id: string;
+  workspace_id: number;
+  bird_id: string | null;
+  bird_name: string | null;
+  title: string;
+  body: string;
+  created_by_user_id: string | null;
+  created_by_name: string | null;
+  created_at: string;
+  updated_at: string;
+};
+
+export type AuditLogEntryRow = {
+  id: string;
+  workspace_id: number;
+  user_id: string | null;
+  actor_name: string | null;
+  actor_email: string | null;
+  action: string;
+  entity_type: string;
+  entity_id: string | null;
+  entity_name: string | null;
+  details: Record<string, unknown>;
+  created_at: string;
+};
+
 export type AuthContext = {
   user: UserRow;
   session: AuthSessionRow;

backend/src/worker.ts

@@ -2,16 +2,36 @@ import { Worker } from 'bullmq';
 
 import { ensureSchema } from './db/schema.js';
 import { db } from './db/client.js';
-import { runBirdMilestoneReminders, startBirdMilestoneReminderScheduler } from './app.js';
+import {
+  runBirdMilestoneReminders,
+  runMedicationReminders,
+  startBirdMilestoneReminderScheduler,
+  startMedicationReminderScheduler,
+} from './app.js';
+import {
+  adoptionReportQueueName,
+  closeAdoptionReportQueue,
+  type AdoptionReportJobData,
+  type AdoptionReportJobResult,
+} from './queues/adoptionReportQueue.js';
 import {
   birdMilestoneReminderQueueName,
   closeBirdMilestoneReminderQueue,
   type BirdMilestoneReminderJobData,
   type BirdMilestoneReminderJobResult,
 } from './queues/birdMilestoneReminderQueue.js';
+import {
+  closeMedicationReminderQueue,
+  medicationReminderQueueName,
+  type MedicationReminderJobData,
+  type MedicationReminderJobResult,
+} from './queues/medicationReminderQueue.js';
 import { redisConnection } from './queues/redisConnection.js';
+import { renderAdoptionReportForBird } from './reports/adoptionReportJob.js';
 
 let birdMilestoneWorker: Worker<BirdMilestoneReminderJobData, BirdMilestoneReminderJobResult> | null = null;
+let medicationReminderWorker: Worker<MedicationReminderJobData, MedicationReminderJobResult> | null = null;
+let adoptionReportWorker: Worker<AdoptionReportJobData, AdoptionReportJobResult> | null = null;
 
 const startWorker = async () => {
   await ensureSchema();
@@ -35,14 +55,57 @@ const startWorker = async () => {
     console.error(`Bird milestone reminder job failed: id=${job?.id ?? 'unknown'}`, error);
   });
 
+  medicationReminderWorker = new Worker<MedicationReminderJobData, MedicationReminderJobResult>(
+    medicationReminderQueueName,
+    async (job) => {
+      const result = await runMedicationReminders(job.data.runDate, job.data.currentTime);
+      console.log(
+        `Medication reminder job completed for ${result.runDate} ${result.currentTime}: checked=${result.checked}, sent=${result.sent}, skipped=${result.skipped}, failed=${result.failed}`,
+      );
+      return result;
+    },
+    {
+      connection: redisConnection,
+      concurrency: 1,
+    },
+  );
+
+  medicationReminderWorker.on('failed', (job, error) => {
+    console.error(`Medication reminder job failed: id=${job?.id ?? 'unknown'}`, error);
+  });
+
+  adoptionReportWorker = new Worker<AdoptionReportJobData, AdoptionReportJobResult>(
+    adoptionReportQueueName,
+    async (job) => {
+      const pdf = await renderAdoptionReportForBird(job.data);
+      console.log(`Adoption report job completed: id=${job.id ?? 'unknown'}, birdId=${job.data.birdId}, bytes=${pdf.length}`);
+      return {
+        pdfBase64: pdf.toString('base64'),
+      };
+    },
+    {
+      connection: redisConnection,
+      concurrency: 1,
+    },
+  );
+
+  adoptionReportWorker.on('failed', (job, error) => {
+    console.error(`Adoption report job failed: id=${job?.id ?? 'unknown'}, birdId=${job?.data.birdId ?? 'unknown'}`, error);
+  });
+
   startBirdMilestoneReminderScheduler();
+  startMedicationReminderScheduler();
   console.log('FlockPal worker started.');
 };
 
 const shutdown = async (signal: string) => {
   console.log(`FlockPal worker received ${signal}; shutting down.`);
   await birdMilestoneWorker?.close();
+  await medicationReminderWorker?.close();
+  await adoptionReportWorker?.close();
   await closeBirdMilestoneReminderQueue();
+  await closeMedicationReminderQueue();
+  await closeAdoptionReportQueue();
   await db.close();
   process.exit(0);
 };

docker-compose.prod.yml

@@ -43,6 +43,7 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-flockpal}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD for production}
       REDIS_URL: ${REDIS_URL:-redis://redis:6379}
+      ADOPTION_REPORT_RENDER_TIMEOUT_MS: ${ADOPTION_REPORT_RENDER_TIMEOUT_MS:-45000}
       IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
       S3_ENDPOINT: ${S3_ENDPOINT:-}
       S3_REGION: ${S3_REGION:-}
@@ -54,10 +55,12 @@ services:
       PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
       FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
       BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
+      MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
       ADMIN_EMAILS: ${ADMIN_EMAILS:-}
       RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
       RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
       MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
+      MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
       MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
       GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
       GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
@@ -73,9 +76,12 @@ services:
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK:-}
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY:-}
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW: ${STRIPE_PRICE_HOUSEHOLD_MACAW:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY:-}
       STRIPE_CHECKOUT_SUCCESS_URL: ${STRIPE_CHECKOUT_SUCCESS_URL:-${FRONTEND_URL}/?billing=success}
       STRIPE_CHECKOUT_CANCEL_URL: ${STRIPE_CHECKOUT_CANCEL_URL:-${FRONTEND_URL}/?billing=cancelled}
       STRIPE_PORTAL_RETURN_URL: ${STRIPE_PORTAL_RETURN_URL:-${FRONTEND_URL}/?billing=portal}
@@ -131,10 +137,12 @@ services:
       PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
       FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
       BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
+      MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
       ADMIN_EMAILS: ${ADMIN_EMAILS:-}
       RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
       RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
       MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
+      MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
       MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
       SMTP_HOST: ${SMTP_HOST:-}
       SMTP_PORT: ${SMTP_PORT:-587}

docker-compose.yml

@@ -41,6 +41,7 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-flockpal}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-flockpal_dev_password}
       REDIS_URL: ${REDIS_URL:-redis://redis:6379}
+      ADOPTION_REPORT_RENDER_TIMEOUT_MS: ${ADOPTION_REPORT_RENDER_TIMEOUT_MS:-45000}
       IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
       S3_ENDPOINT: ${S3_ENDPOINT:-}
       S3_REGION: ${S3_REGION:-}
@@ -52,10 +53,12 @@ services:
       PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
       FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
       BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
+      MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
       ADMIN_EMAILS: ${ADMIN_EMAILS:-}
       RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
       RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
       MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
+      MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
       MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
       GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
       GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
@@ -71,9 +74,12 @@ services:
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK:-}
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_MONTHLY:-}
       STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_INDIANRINGNECK_YEARLY:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW: ${STRIPE_PRICE_HOUSEHOLD_MACAW:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_MACAW_MONTHLY:-}
-      STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_MACAW_YEARLY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_MONTHLY:-}
+      STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_AFRICAN_GREY_YEARLY:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_MONTHLY:-}
+      STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY: ${STRIPE_PRICE_HOUSEHOLD_HYACINTH_MACAW_YEARLY:-}
       STRIPE_CHECKOUT_SUCCESS_URL: ${STRIPE_CHECKOUT_SUCCESS_URL:-http://localhost:3000/?billing=success}
       STRIPE_CHECKOUT_CANCEL_URL: ${STRIPE_CHECKOUT_CANCEL_URL:-http://localhost:3000/?billing=cancelled}
       STRIPE_PORTAL_RETURN_URL: ${STRIPE_PORTAL_RETURN_URL:-http://localhost:3000/?billing=portal}
@@ -124,10 +130,12 @@ services:
       PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
       FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
       BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
+      MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
       ADMIN_EMAILS: ${ADMIN_EMAILS:-}
       RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
       RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
       MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
+      MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
       MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
       SMTP_HOST: ${SMTP_HOST:-}
       SMTP_PORT: ${SMTP_PORT:-587}
@@ -154,7 +162,7 @@ services:
       dockerfile: Dockerfile.dev
     container_name: flockpal-frontend
     environment:
-      VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:5000/api}
+      VITE_API_BASE_URL: ${VITE_API_BASE_URL:-/api}
     depends_on:
       - backend
     ports:

docs/API_REFERENCE.md

@@ -208,7 +208,11 @@ Role requirements are called out per endpoint below. If the signed-in member lac
   "name": "Kiwi",
   "tagId": "FP-001",
   "species": "Cockatiel",
-  "gender": "female",
+  "vetClinicName": "Avian Care Center",
+  "vetClinicAddress": "123 Feather Lane, Raleigh, NC",
+  "vetAccountNumber": "FP-1001",
+  "vetDoctorName": "Dr. Rivera",
+  "gender": "female_dna",
   "dateOfBirth": "2023-05-10",
   "gotchaDay": "2023-08-21",
   "chartColor": "#cb3a35",
@@ -295,7 +299,7 @@ Role requirements are called out per endpoint below. If the signed-in member lac
 - Dates use `YYYY-MM-DD`
 - `workspaceType` is `standard` or `rescue`
 - member `role` is `owner`, `assistant`, `caregiver`, or `viewer`
-- bird `gender` is `unknown`, `male`, or `female`
+- bird `gender` is `unknown`, `male`, `female`, `male_dna`, or `female_dna`; `male` and `female` indicate assumed sex
 - bird `chartColor` must be a `#RRGGBB` hex color
 - `photoDataUrl` must be a base64 `data:image/...` URL
 - `weightGrams` must be a positive number up to `10000`
@@ -653,7 +657,7 @@ Request body:
 Notes:
 
 - `workspaceType` must be `standard` or `rescue`
-- `billingPlan` may be `household_basic`, `household_plus`, or `household_macaw`
+- `billingPlan` may be `household_basic`, `household_plus`, `household_macaw`, or `household_hyacinth_macaw`
 - rescue workspaces are forced to `rescue_free`
 
 Response `201`:
@@ -793,7 +797,11 @@ Request body:
   "name": "Kiwi",
   "tagId": "FP-001",
   "species": "Cockatiel",
-  "gender": "female",
+  "vetClinicName": "Avian Care Center",
+  "vetClinicAddress": "123 Feather Lane, Raleigh, NC",
+  "vetAccountNumber": "FP-1001",
+  "vetDoctorName": "Dr. Rivera",
+  "gender": "female_dna",
   "dateOfBirth": "2023-05-10",
   "gotchaDay": "2023-08-21",
   "chartColor": "#cb3a35",
@@ -805,7 +813,7 @@ Request body:
 
 Notes:
 
-- `dateOfBirth`, `gotchaDay`, and `photoDataUrl` may be omitted or sent as empty strings
+- `dateOfBirth`, `gotchaDay`, `photoDataUrl`, and veterinary info fields may be omitted or sent as empty strings
 - `chartColor` defaults to `#cb3a35`
 
 Response `201`:
@@ -889,6 +897,40 @@ Possible errors:
 - `409` if that owner email owns more than one receiving flock
 - `409` if the destination flock already has a bird using the same `tagId`
 
+#### `POST /api/birds/:birdId/transfer-code`
+
+Requires a browser session, write access, and role `owner` or `assistant`. Creates a unique transfer code for a bird. Creating a new open code for the same bird revokes earlier unused codes for that bird.
+
+Response `201`:
+
+```json
+{
+  "transferCode": {
+    "code": "secure-code",
+    "bird": {}
+  }
+}
+```
+
+#### `POST /api/bird-transfer-codes/:code/accept`
+
+Requires a browser session, write access, and role `owner` or `assistant`. Accepts a transfer code into the signed-in user's active flock.
+
+Response `200`:
+
+```json
+{
+  "bird": {},
+  "sourceWorkspaceName": "Previous Flock",
+  "workspace": {}
+}
+```
+
+Possible errors:
+
+- `404` if the code does not exist, was revoked, was already used, or the bird is no longer available
+- `409` if the bird is already in the active flock or the active flock already has the same `tagId`
+
 #### `DELETE /api/birds/:birdId`
 
 Requires auth with write access and role `owner`, `assistant`, or `caregiver`. Deletes a bird.

frontend/index.html

@@ -8,6 +8,10 @@
       type="image/svg+xml"
       href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='featherFill' x1='0%25' y1='0%25' x2='100%25' y2='100%25'%3E%3Cstop offset='0%25' stop-color='%23cb3a35'/%3E%3Cstop offset='30%25' stop-color='%23f0b63f'/%3E%3Cstop offset='58%25' stop-color='%23238a5a'/%3E%3Cstop offset='100%25' stop-color='%232769b3'/%3E%3C/linearGradient%3E%3C/defs%3E%3Cpath d='M50.8 10.4C37.9 10.3 27 18.5 22.7 31.1c-3.1 9.1-2.1 18.5-8.6 24.8c-1.5 1.5-0.2 4 1.9 3.6c8.4-1.5 14.6-6.7 18.6-13.7c1 0.5 2.2 0.8 3.4 0.8c3.5 0 6.5-2.3 7.5-5.4c1.9-0.4 3.7-1.3 5.1-2.7c2-2 3-4.6 3.1-7.2c3.3-5.8 4.9-12.9 1.4-20.2c-0.7-1.3-2-0.7-4.3-0.7Z' fill='url(%23featherFill)'/%3E%3Cpath d='M18 56c8.5-3.4 14.2-9.8 18.1-17.8M26.9 48.9c6.9-7.2 13.5-14.8 20.3-22.1M31.8 41.2c6.4-1.3 12.1-4.6 16.5-9.4M36.8 33.8c4.9-0.9 9.2-3.4 12.6-7.1' fill='none' stroke='%23fff8ef' stroke-linecap='round' stroke-width='2.6'/%3E%3Cpath d='M18 56c8.5-3.4 14.2-9.8 18.1-17.8' fill='none' stroke='%2363562d' stroke-linecap='round' stroke-width='2.2'/%3E%3C/svg%3E"
     />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&icon_names=move,move_location"
+    />
     <title>FlockPal</title>
   </head>
   <body>

frontend/src/index.css

@@ -616,14 +616,6 @@ textarea {
   break-inside: avoid;
 }
 
-.settings-card-bird-profiles {
-  order: 1;
-}
-
-.settings-card-bird-profiles[hidden] {
-  display: none;
-}
-
 .settings-card-collaborators {
   order: 2;
 }
@@ -713,6 +705,11 @@ textarea {
   gap: 1.5rem;
 }
 
+.bird-detail-panel {
+  margin-right: 3rem;
+  position: relative;
+}
+
 .flock-detail-column {
   display: grid;
   gap: 1.5rem;
@@ -995,10 +992,19 @@ textarea {
   display: inline;
 }
 
+.bird-card-title .bird-card-gender-cluster {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.28rem;
+  line-height: 1;
+}
+
 .gender-inline {
-  font-size: 1.2rem;
+  font-size: 1.45rem;
   font-weight: 700;
   line-height: 1;
+  display: inline-flex;
+  align-items: center;
 }
 
 .gender-inline.male {
@@ -1013,6 +1019,99 @@ textarea {
   color: var(--muted);
 }
 
+.gender-source-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 1.45rem;
+  height: 1.45rem;
+  flex: 0 0 1.45rem;
+  border-radius: 999px;
+  font-size: 0.8rem;
+  font-weight: 800;
+  line-height: 1;
+  vertical-align: middle;
+}
+
+.gender-source-icon svg {
+  width: 1.28rem;
+  height: 1.28rem;
+  fill: none;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+
+.gender-source-icon.dna {
+  width: 1.9rem;
+  height: 1.9rem;
+  flex-basis: 1.9rem;
+  background: rgba(91, 74, 161, 0.1);
+  color: #5b4aa1;
+}
+
+.gender-source-icon.dna svg {
+  width: 1.72rem;
+  height: 1.72rem;
+}
+
+.gender-source-icon .dna-ring {
+  fill: none;
+  stroke: currentColor;
+  stroke-width: 1.15;
+}
+
+.gender-source-icon .dna-strand {
+  stroke: currentColor;
+  stroke-width: 1.35;
+}
+
+.gender-source-icon .dna-rung {
+  stroke: currentColor;
+  stroke-width: 1.05;
+  opacity: 0.82;
+}
+
+.gender-source-icon .dna-dot {
+  fill: currentColor;
+}
+
+.gender-source-icon.assumed {
+  width: 1.9rem;
+  height: 1.9rem;
+  flex-basis: 1.9rem;
+  background: rgba(93, 95, 89, 0.12);
+  color: var(--muted);
+}
+
+.gender-source-icon.assumed svg {
+  width: 1.72rem;
+  height: 1.72rem;
+}
+
+.gender-source-icon .assumed-eye {
+  stroke: currentColor;
+  stroke-width: 1.7;
+}
+
+.gender-source-icon .assumed-pupil {
+  fill: currentColor;
+}
+
+.bird-card-title .gender-source-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 1.05rem;
+  height: 1.05rem;
+  flex-basis: 1.05rem;
+}
+
+.bird-card-title .gender-source-icon svg {
+  display: block;
+  width: 0.92rem;
+  height: 0.92rem;
+}
+
 .bird-avatar,
 .profile-photo {
   width: 56px;
@@ -1196,6 +1295,186 @@ textarea {
   gap: 0.25rem;
 }
 
+.note-card,
+.audit-log-card {
+  align-items: start;
+}
+
+.note-card div,
+.audit-log-card div {
+  display: flex;
+  gap: 0.75rem;
+  justify-content: space-between;
+  align-items: start;
+}
+
+.note-card span,
+.audit-log-card span,
+.audit-log-card small {
+  color: var(--muted);
+}
+
+.note-card p {
+  margin: 0.35rem 0 0;
+  white-space: pre-wrap;
+}
+
+.note-card .button-row {
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bird-timeline-card {
+  grid-template-columns: 18px minmax(0, 1fr);
+  gap: 0.75rem;
+  border: 1px solid rgba(39, 105, 179, 0.12);
+  border-radius: 8px;
+  background: rgba(255, 255, 255, 0.76);
+}
+
+.bird-timeline-graph-card {
+  padding: 0.85rem;
+  border: 1px solid rgba(39, 105, 179, 0.12);
+  border-radius: 8px;
+  background: rgba(255, 255, 255, 0.72);
+}
+
+.bird-timeline-graph {
+  display: block;
+  width: 100%;
+  height: auto;
+  min-height: 200px;
+}
+
+.bird-timeline-graph-axis {
+  stroke: rgba(31, 42, 42, 0.18);
+  stroke-width: 1.2;
+}
+
+.bird-timeline-graph-year-line {
+  stroke: rgba(39, 105, 179, 0.16);
+  stroke-width: 1;
+  stroke-dasharray: 4 6;
+}
+
+.bird-timeline-graph-year {
+  fill: var(--muted);
+  font-size: 11px;
+}
+
+.bird-timeline-graph-connector {
+  stroke: rgba(39, 105, 179, 0.18);
+  stroke-width: 2;
+  stroke-dasharray: 4 5;
+}
+
+.bird-timeline-graph-dot {
+  fill: #fffdf9;
+  stroke: var(--accent-green);
+  stroke-width: 4;
+}
+
+.bird-timeline-graph-dot.owner_changed {
+  stroke: var(--accent-blue);
+}
+
+.bird-timeline-graph-dot.transferred {
+  stroke: var(--accent-red);
+}
+
+.bird-timeline-graph-label,
+.bird-timeline-graph-meta {
+  font-size: 11px;
+  fill: var(--ink);
+}
+
+.bird-timeline-graph-label {
+  font-weight: 700;
+}
+
+.bird-timeline-graph-meta {
+  fill: var(--muted);
+}
+
+.bird-timeline-graph-event-icon {
+  overflow: visible;
+}
+
+.bird-timeline-graph-event-icon .material-symbols-outlined {
+  align-items: center;
+  color: #1f1f1f;
+  direction: ltr;
+  display: inline-flex;
+  font-family: "Material Symbols Outlined";
+  font-size: 22px;
+  font-style: normal;
+  font-weight: 400;
+  font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 24;
+  font-feature-settings: "liga";
+  -webkit-font-feature-settings: "liga";
+  height: 24px;
+  justify-content: center;
+  letter-spacing: 0;
+  line-height: 1;
+  text-transform: none;
+  white-space: nowrap;
+  width: 24px;
+}
+
+.bird-timeline-graph-hatch-dot {
+  fill: #fffdf9;
+  stroke: #1f1f1f;
+  stroke-width: 2;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+
+.bird-timeline-form {
+  padding: 0.85rem;
+  border: 1px solid rgba(35, 138, 90, 0.14);
+  border-radius: 8px;
+  background: rgba(240, 248, 244, 0.54);
+}
+
+.bird-timeline-marker {
+  width: 12px;
+  height: 12px;
+  margin-top: 0.25rem;
+  border-radius: 999px;
+  background: var(--accent-green);
+  box-shadow: 0 0 0 4px rgba(35, 138, 90, 0.12);
+}
+
+.bird-timeline-content {
+  display: grid;
+  gap: 0.3rem;
+  min-width: 0;
+}
+
+.bird-timeline-content > div {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 0.75rem;
+}
+
+.bird-timeline-content strong,
+.bird-timeline-content span,
+.bird-timeline-content small,
+.bird-timeline-content p {
+  overflow-wrap: anywhere;
+}
+
+.bird-timeline-content span,
+.bird-timeline-content small {
+  color: var(--muted);
+}
+
+.bird-timeline-content p {
+  margin: 0;
+  color: var(--ink);
+}
+
 .legend-grid,
 .detail-grid,
 .summary-grid {
@@ -1207,17 +1486,22 @@ textarea {
   grid-template-columns: auto 1fr;
   gap: 1rem;
   align-items: center;
-  padding: 1rem;
+  padding: 1rem 6.4rem 1rem 1rem;
   border-radius: 24px;
   background: linear-gradient(180deg, rgba(255, 252, 247, 0.92), rgba(240, 248, 244, 0.84));
   border: 1px solid rgba(39, 105, 179, 0.1);
   position: relative;
 }
 
-.qr-profile-button {
+.profile-actions {
   position: absolute;
   top: 0.85rem;
   right: 0.85rem;
+  display: flex;
+  gap: 0.45rem;
+}
+
+.profile-icon-button {
   display: grid;
   place-items: center;
   width: 42px;
@@ -1228,20 +1512,98 @@ textarea {
   box-shadow: 0 10px 20px rgba(86, 63, 34, 0.12);
 }
 
-.qr-profile-button:hover {
+.profile-icon-button:hover {
   transform: translateY(-1px);
   border-color: rgba(35, 138, 90, 0.34);
 }
 
-.qr-profile-button svg {
+.profile-icon-button svg {
   width: 24px;
   height: 24px;
+  fill: none;
+  stroke: var(--accent-blue);
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  stroke-width: 2;
+}
+
+.qr-profile-button svg {
   fill: var(--accent-blue);
+  stroke: none;
+}
+
+.bird-detail-tabs {
+  position: absolute;
+  top: 5rem;
+  right: -3rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.45rem;
+}
+
+.bird-detail-tab {
+  display: grid;
+  place-items: center;
+  width: 48px;
+  height: 44px;
+  border: 1px solid rgba(39, 105, 179, 0.14);
+  border-left: 0;
+  border-radius: 0 14px 14px 0;
+  background: rgba(255, 254, 250, 0.92);
+  color: var(--muted);
+  transition: border-color 0.2s ease, box-shadow 0.2s ease, color 0.2s ease, transform 0.2s ease;
+}
+
+.bird-detail-tab svg {
+  width: 20px;
+  height: 20px;
+  fill: none;
+  stroke: currentColor;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  stroke-width: 2;
+}
+
+.bird-detail-tab .weight-tab-icon {
+  width: 24px;
+  height: 24px;
+  fill: currentColor;
+  stroke: none;
+}
+
+.bird-detail-tab .info-tab-icon,
+.bird-detail-tab .note-tab-icon,
+.bird-detail-tab .report-tab-icon,
+.bird-detail-tab .timeline-tab-icon,
+.bird-detail-tab .audit-tab-icon,
+.bird-detail-tab .vet-tab-icon {
+  width: 24px;
+  height: 24px;
+  fill: currentColor;
+  stroke: none;
+}
+
+.bird-detail-tab:hover {
+  border-color: rgba(35, 138, 90, 0.28);
+  color: var(--ink);
+  transform: translateY(-1px);
+}
+
+.bird-detail-tab.active {
+  border-color: rgba(35, 138, 90, 0.42);
+  background: rgba(240, 248, 244, 0.95);
+  color: var(--accent-green);
+  box-shadow: 10px 10px 20px rgba(39, 105, 179, 0.1);
+}
+
+.bird-detail-tab-panel {
+  display: grid;
+  gap: 1rem;
 }
 
 .profile-copy {
   display: grid;
-  gap: 0.3rem;
+  gap: 0.18rem;
 }
 
 .profile-copy h3 {
@@ -1249,6 +1611,10 @@ textarea {
   font-size: 1.6rem;
 }
 
+.profile-copy p {
+  margin: 0;
+}
+
 .profile-title {
   display: inline-flex;
   align-items: center;
@@ -1259,14 +1625,26 @@ textarea {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  min-width: 1.9rem;
+  width: 1.9rem;
   height: 1.9rem;
+  flex: 0 0 1.9rem;
   border-radius: 999px;
-  font-size: 1.2rem;
+  font-size: 1.45rem;
   font-weight: 700;
   line-height: 1;
 }
 
+.gender-symbol-mark {
+  display: block;
+  line-height: 0.82;
+  transform: scale(1.16);
+  transform-origin: center;
+}
+
+.profile-title .gender-symbol-mark {
+  transform: scale(1.28);
+}
+
 .gender-symbol.male {
   background: rgba(39, 105, 179, 0.12);
   color: var(--accent-blue);
@@ -1289,7 +1667,7 @@ textarea {
 
 .segmented-control {
   display: grid;
-  grid-template-columns: repeat(3, minmax(0, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(8.5rem, 1fr));
   gap: 0.55rem;
 }
 
@@ -1685,6 +2063,50 @@ label {
   font-size: 0.95rem;
 }
 
+.verified-location-field {
+  display: grid;
+  gap: 0.75rem;
+}
+
+.verified-location-label {
+  display: grid;
+  gap: 0.35rem;
+  font-weight: 600;
+}
+
+.verified-location-search-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto auto;
+  gap: 0.65rem;
+  align-items: end;
+}
+
+.verified-location-result small {
+  color: var(--muted);
+}
+
+.verified-location-results {
+  display: grid;
+  gap: 0.45rem;
+}
+
+.verified-location-result {
+  display: grid;
+  gap: 0.15rem;
+  width: 100%;
+  padding: 0.8rem 0.9rem;
+  text-align: left;
+  color: var(--ink);
+  border: 1px solid rgba(53, 129, 98, 0.2);
+  border-radius: 8px;
+  background: rgba(255, 255, 255, 0.55);
+}
+
+.verified-location-result:hover {
+  border-color: rgba(39, 105, 179, 0.28);
+  background: rgba(255, 255, 255, 0.78);
+}
+
 .toggle-card input[type="checkbox"] {
   width: 20px;
   height: 20px;
@@ -1708,6 +2130,44 @@ label {
   accent-color: var(--accent-green);
 }
 
+.checkbox-row {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  width: min(100%, 420px);
+  margin: 0.35rem 0 0;
+  padding: 0.85rem 1rem;
+  border: 1px solid rgba(53, 129, 98, 0.24);
+  border-radius: 16px;
+  background: rgba(255, 255, 255, 0.62);
+  box-shadow: 0 12px 24px rgba(86, 63, 34, 0.1);
+}
+
+.checkbox-row input[type="checkbox"] {
+  width: 20px;
+  height: 20px;
+  flex: 0 0 auto;
+  margin: 0.1rem 0 0;
+  padding: 0;
+  accent-color: var(--accent-green);
+}
+
+.checkbox-row span {
+  display: grid;
+  gap: 0.15rem;
+  line-height: 1.3;
+}
+
+.checkbox-row strong {
+  color: var(--ink);
+  font-size: 0.98rem;
+}
+
+.checkbox-row small {
+  color: var(--muted);
+  font-size: 0.86rem;
+}
+
 .primary-button {
   border: 0;
   border-radius: 18px;
@@ -1981,7 +2441,8 @@ label {
   .inline-form,
   .profile-hero,
   .photo-editor,
-  .settings-nested-grid {
+  .settings-nested-grid,
+  .verified-location-search-row {
     grid-template-columns: 1fr;
   }
 
@@ -2008,6 +2469,29 @@ label {
     justify-content: start;
   }
 
+  .bird-detail-panel {
+    margin-right: 0;
+  }
+
+  .profile-hero {
+    padding: 1rem;
+  }
+
+  .bird-detail-tabs {
+    position: static;
+    grid-column: 1 / -1;
+    display: grid;
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+    transform: none;
+  }
+
+  .bird-detail-tab {
+    width: auto;
+    min-width: 0;
+    border-left: 1px solid rgba(39, 105, 179, 0.14);
+    border-radius: 14px;
+  }
+
   .side-rail {
     position: static;
     grid-template-columns: auto minmax(0, 1fr);
@@ -2035,17 +2519,25 @@ label {
   }
 
   .page-tabs {
-    grid-template-columns: repeat(auto-fit, minmax(64px, 1fr));
+    grid-auto-flow: column;
+    grid-auto-columns: minmax(5.5rem, max-content);
+    grid-template-columns: none;
     gap: 0.4rem;
+    min-width: 0;
+    overflow-x: auto;
+    padding-bottom: 0.1rem;
+    scrollbar-width: thin;
   }
 
   .page-tab {
     min-height: 42px;
+    min-width: 5.5rem;
     padding: 0.55rem 0.65rem;
     border-radius: 14px;
     text-align: center;
     font-size: 0.92rem;
     font-weight: 700;
+    white-space: nowrap;
   }
 
   .side-nav .secondary-button {

frontend/vite.config.ts

@@ -5,5 +5,11 @@ export default defineConfig({
   plugins: [react()],
   server: {
     port: 3000,
+    proxy: {
+      '/api': {
+        target: 'http://backend:5000',
+        changeOrigin: true,
+      },
+    },
   },
 });