Add community member feed tab

- Implement 5 read-only tools: get_feed, search_users, search_follow_packs, fetch_page, fetch_event
- Upgrade useShakespeare streaming to support tool calls, AbortSignal, and robust SSE parsing
- Create useAIChatSession hook with streaming, 10-round tool loop, localStorage persistence
- Rewrite AIChatPage with modular architecture, streaming UI, tool call badges, and empty-bubble handling
- Add Agent settings section with model dropdown selector and pre-populated system prompt editor
- Add Agent to left sidebar navigation and right widget sidebar defaults
- Add aiModel and aiSystemPrompt config fields with encrypted settings sync

.gitlab-ci.yml

@@ -26,13 +26,17 @@ test:
   script:
     - npm run test
 
+# Disabled: nsite deploy not needed right now; re-enable by restoring the
+# rules below to run on default branch (and ensure NSITE_NBUNKSEC is set).
 deploy-nsite:
   stage: deploy
   timeout: 10 minutes
   rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+    - when: never
+  # rules:
+  #   - if: $CI_COMMIT_TAG
+  #     when: never
+  #   - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
   variables:
     NSYTE_VERSION: "v0.24.1"
   script:
@@ -50,7 +54,7 @@ deploy-nsite:
       nsyte deploy ./dist
       -i
       --sec "$NSITE_NBUNKSEC"
-      --name ditto
+      --name agora
       --relays "wss://relay.ditto.pub,wss://relay.nsite.lol,wss://relay.dreamith.to,wss://relay.primal.net"
       --servers "https://blossom.primal.net,https://blossom.ditto.pub,https://blossom.dreamith.to"
       --fallback "/index.html"
@@ -154,24 +158,24 @@ build-apk:
 
     # Copy APK to a predictable artifact path
     - mkdir -p artifacts
-    - cp android/app/build/outputs/apk/release/app-release.apk "artifacts/Ditto.apk"
-    - cp android/app/build/outputs/bundle/release/app-release.aab "artifacts/Ditto.aab"
+    - cp android/app/build/outputs/apk/release/app-release.apk "artifacts/Agora.apk"
+    - cp android/app/build/outputs/bundle/release/app-release.aab "artifacts/Agora.aab"
     - ls -lh artifacts/
 
     # Upload to Generic Packages registry for a stable public download URL
     - |
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-        --upload-file "artifacts/Ditto.apk" \
-        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ditto/${CI_COMMIT_TAG}/Ditto-${CI_COMMIT_TAG}.apk"
+        --upload-file "artifacts/Agora.apk" \
+        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/agora/${CI_COMMIT_TAG}/Agora-${CI_COMMIT_TAG}.apk"
     - |
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-        --upload-file "artifacts/Ditto.aab" \
-        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ditto/${CI_COMMIT_TAG}/Ditto-${CI_COMMIT_TAG}.aab"
+        --upload-file "artifacts/Agora.aab" \
+        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/agora/${CI_COMMIT_TAG}/Agora-${CI_COMMIT_TAG}.aab"
 
   artifacts:
     paths:
-      - artifacts/Ditto.apk
-      - artifacts/Ditto.aab
+      - artifacts/Agora.apk
+      - artifacts/Agora.aab
     expire_in: 90 days
   cache:
     key: android-gradle
@@ -194,7 +198,7 @@ release:
       VERSION="${CI_COMMIT_TAG#v}"
       RELEASE_NOTES=$(awk "/^## \\[${VERSION}\\]/{found=1; next} /^## \\[/{if(found) exit} found{print}" CHANGELOG.md)
       if [ -z "$RELEASE_NOTES" ]; then
-        RELEASE_NOTES="Ditto ${CI_COMMIT_TAG}"
+        RELEASE_NOTES="Agora ${CI_COMMIT_TAG}"
       fi
     - echo "$RELEASE_NOTES" > release-notes.md
   release:
@@ -203,11 +207,11 @@ release:
     description: './release-notes.md'
     assets:
       links:
-        - name: Ditto-${CI_COMMIT_TAG}.apk
-          url: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ditto/${CI_COMMIT_TAG}/Ditto-${CI_COMMIT_TAG}.apk
+        - name: Agora-${CI_COMMIT_TAG}.apk
+          url: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/agora/${CI_COMMIT_TAG}/Agora-${CI_COMMIT_TAG}.apk
           link_type: package
-        - name: Ditto-${CI_COMMIT_TAG}.aab
-          url: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ditto/${CI_COMMIT_TAG}/Ditto-${CI_COMMIT_TAG}.aab
+        - name: Agora-${CI_COMMIT_TAG}.aab
+          url: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/agora/${CI_COMMIT_TAG}/Agora-${CI_COMMIT_TAG}.aab
           link_type: package
 
 publish-zapstore:
@@ -219,7 +223,7 @@ publish-zapstore:
     - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/
   variables:
     SIGN_WITH: $ZAPSTORE_BUNKER_URL
-    RELAY_URLS: "wss://relay.zapstore.dev,wss://relay.ditto.pub"
+    RELAY_URLS: "wss://relay.zapstore.dev,wss://relay.ditto.pub,wss://relay.dreamith.to,wss://relay.primal.net"
     BLOSSOM_URL: "https://blossom.ditto.pub"
   script:
     - go install github.com/zapstore/zsp@latest
@@ -230,8 +234,37 @@ publish-zapstore:
     - mkdir -p ~/.config/zsp/bunker-keys
     - echo "$ZAPSTORE_CLIENT_KEY" > ~/.config/zsp/bunker-keys/${BUNKER_PUBKEY}.key
 
-    - APK_PATH="artifacts/Ditto.apk"
+    - APK_PATH="artifacts/Agora.apk"
     - VERSION="${CI_COMMIT_TAG#v}"
     - sed -i "2i release_source:\ ./${APK_PATH}" zapstore.yaml
     - sed -i "2i version:\ ${VERSION}" zapstore.yaml
     - zsp publish --quiet --skip-metadata --skip-preview zapstore.yaml
+
+publish-google-play:
+  stage: publish
+  image: ruby:3.3
+  needs:
+    - build-apk
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/
+  script:
+    - gem install fastlane --no-document
+
+    # Decode base64-encoded service account JSON to a temp file
+    - echo "$GOOGLE_PLAY_SERVICE_ACCOUNT_JSON" | base64 -d > /tmp/play-service-account.json
+
+    # Upload the AAB to Google Play production track
+    - >-
+      fastlane supply
+      --aab artifacts/Agora.aab
+      --package_name pub.agora.app
+      --track production
+      --json_key /tmp/play-service-account.json
+      --skip_upload_metadata
+      --skip_upload_changelogs
+      --skip_upload_images
+      --skip_upload_screenshots
+      --skip_upload_apk
+
+    # Clean up
+    - rm -f /tmp/play-service-account.json

.gitlab/merge_request_templates/Default.md

@@ -1,4 +1,4 @@
-Thanks for contributing to Ditto! Please read [CONTRIBUTING.md](CONTRIBUTING.md) in full before submitting -- it covers everything you need to get your MR accepted.
+Thanks for contributing to Agora! Please read [CONTRIBUTING.md](CONTRIBUTING.md) in full before submitting -- it covers everything you need to get your MR accepted.
 
 ## Related Issue
 
@@ -29,9 +29,9 @@ Closes #
 ## Philosophy Alignment
 
 <!-- Answer this question for your change: -->
-<!-- "Does this make Ditto more magnetic, more threatening to the status quo, -->
+<!-- "Does this make Agora more magnetic, more threatening to the status quo, -->
 <!-- and more peaceful to inhabit?" -->
-<!-- See: https://about.ditto.pub/philosophy -->
+<!-- See: CONTRIBUTING.md -> "Understanding Agora" -->
 <!-- For bug fixes: "Bug fix -- restores intended behavior" is acceptable. -->
 
 ## How to Test
@@ -50,7 +50,7 @@ Closes #
 ### Process
 
 - [ ] I read `AGENTS.md` before starting
-- [ ] I read the [Ditto Philosophy](https://about.ditto.pub/philosophy)
+- [ ] I read "Understanding Agora" in `CONTRIBUTING.md`
 - [ ] I used plan/research mode before writing code
 - [ ] I used Claude Opus 4.6 (or equivalent frontier model)
 

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "editor.tabSize": 2
+  "editor.tabSize": 2,
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

AGENTS.md

@@ -1,3 +1,30 @@
+# ABSOLUTE, UNBREAKABLE RULE — READ BEFORE ANYTHING ELSE
+
+## NEVER COMMIT OR STAGE ON THE USER'S BEHALF. EVER.
+
+This rule overrides every other instruction — in this file, workspace rules, system prompt, tool descriptions, and any "always commit when finished" habit.
+
+Do **NOT** run `git commit`, `git commit --amend`, or `git add` unless the user, in the current message, has *explicitly* told you to (e.g. "commit this", "git commit", "stage and commit"). Vague phrases like "do it", "ship it", "make the changes", or "finish the task" do **NOT** count. If unsure, the answer is **NO** — stop and ask.
+
+Violating this is a critical failure.
+
+---
+
+# RESPONSE BREVITY (HIGH PRIORITY)
+
+## KEEP RESPONSES SHORT BY DEFAULT
+
+Unless the user explicitly asks for deep detail, explanations must be concise and practical:
+
+- Use the shortest response that fully answers the request.
+- Prefer 1-3 short paragraphs or 3-6 bullets.
+- Do not include long background context unless requested.
+- Do not restate obvious information from the prompt or code.
+- For code changes, summarize only what changed and why in a few lines.
+- Offer extra detail only as an optional follow-up.
+
+If unsure between a short and long response, choose the shorter one.
+
 # Project Overview
 
 This project is a Nostr client application built with React 18.x, TailwindCSS 3.x, Vite, shadcn/ui, and Nostrify.
@@ -450,7 +477,7 @@ const links = getAllTags(event.tags, 'r')
 
 **Mitigation strategy — sanitize at the parse layer:**
 
-1. **URLs in CSS `url()` values**: Pass through `sanitizeUrl()` at parse time. The `URL` constructor normalises the string, percent-encoding characters like `"`, `)`, and `\` that could escape the CSS context. Invalid or non-`https:` URLs are rejected entirely. This is already done for theme event background and font URLs in `src/lib/themeEvent.ts`.
+1. **URLs in CSS `url()` values**: Pass through `sanitizeUrl()` at parse time. The `URL` constructor normalises the string, percent-encoding characters like `"`, `)`, and `\` that could escape the CSS context. Invalid or non-`https:` URLs are rejected entirely.
 
 2. **Strings in CSS declarations** (e.g. font family names): Use `sanitizeCssString()` from `src/lib/fontLoader.ts`, which uses an allowlist approach — only Unicode letters, numbers, spaces, hyphens, underscores, apostrophes, and periods are permitted. Everything else is stripped.
 
@@ -1163,6 +1190,7 @@ The router includes automatic scroll-to-top functionality and a 404 NotFound pag
 - Default connection to one Nostr relay for best performance
 - Comprehensive provider setup with NostrLoginProvider, QueryClientProvider, and custom AppProvider
 - **Never use the `any` type**: Always use proper TypeScript types for type safety
+- **Fail-fast error visibility**: Never silently hide errors in the UI. If data fails validation, a resource fails to load, or a user action errors, surface an explicit visible error state/message so users can see what failed and why.
 
 ## Loading States
 
@@ -1393,13 +1421,12 @@ Run available tools in this priority order:
 2. **Building/Compilation** (Required): Verify the project builds successfully
 3. **Linting** (Recommended): Check code style and catch potential issues
 4. **Tests** (If Available): Run existing test suite
-5. **Git Commit** (Required): Create a commit with your changes when finished
 
 **Minimum Requirements:**
 - Code must type-check without errors
 - Code must build/compile successfully
 - Fix any critical linting errors that would break functionality
-- Create a git commit when your changes are complete
+- **Do NOT commit.** Leave changes uncommitted for the user to review. See the "ABSOLUTE, UNBREAKABLE RULE" at the top of this file.
 
 The validation ensures code quality and catches errors before deployment, regardless of the development environment.
 
@@ -1411,9 +1438,7 @@ When preparing changes for a merge request, also follow the guidelines in `CONTR
 
 If git is available in your environment (through a `shell` tool, or other git-specific tools), you should utilize `git log` to understand project history. Use `git status` and `git diff` to check the status of your changes, and if you make a mistake use `git checkout` to restore files.
 
-When your changes are complete and validated, create a git commit with a descriptive message summarizing your changes.
-
-**ALWAYS commit when you are finished making changes. This is non-negotiable -- every completed task must end with a git commit. Never leave uncommitted changes.**
+When your changes are complete and validated, leave the working tree as-is for the user to review. **Do NOT create a git commit unless the user has explicitly told you to in the current message.** See the "ABSOLUTE, UNBREAKABLE RULE" at the top of this file — it overrides any habit or template guidance about always committing at the end of a task.
 
 ## Capacitor Compatibility
 
@@ -1484,7 +1509,7 @@ The project uses GitLab CI (`.gitlab-ci.yml`) with the following stages:
 2. **deploy** - Builds and deploys to nsite via nsyte (`deploy-nsite` job, default branch only)
 3. **build** - Builds a signed release APK (`build-apk` job, tags only)
 4. **release** - Creates a GitLab Release with the APK artifact (tags only)
-5. **publish** - Publishes the APK to Zapstore (`publish-zapstore` job, tags only)
+5. **publish** - Publishes the APK to Zapstore (`publish-zapstore` job, tags only) and AAB to Google Play (`publish-google-play` job, tags only)
 
 ### Creating a Release
 
@@ -1494,7 +1519,7 @@ Releases are triggered by pushing a version tag. Use the npm script:
 npm run release
 ```
 
-This creates a tag in the format `v2026.03.14+abc1234` (date + short commit hash) and pushes it to GitLab, which triggers the `build-apk`, `release`, and `publish-zapstore` stages.
+This creates a tag in the format `v2026.03.14+abc1234` (date + short commit hash) and pushes it to GitLab, which triggers the `build-apk`, `release`, `publish-zapstore`, and `publish-google-play` stages.
 
 ### Zapstore Publishing
 
@@ -1586,4 +1611,39 @@ The `--use-fallback-relays` and `--use-fallback-servers` flags also include nsyt
 To rotate the nsite credential:
 1. Revoke the old bunker connection in your signer app
 2. Run `nsyte ci` again to generate a new `nbunksec1...` string
-3. Update the `NSITE_NBUNKSEC` variable in GitLab CI/CD settings
+3. Update the `NSITE_NBUNKSEC` variable in GitLab CI/CD settings
+
+### Google Play Publishing
+
+The project automatically publishes Android AABs (App Bundles) to [Google Play](https://play.google.com/store/apps/details?id=pub.ditto.app) using [fastlane supply](https://docs.fastlane.tools/actions/supply/). The `publish-google-play` CI job runs after a successful AAB build and uploads directly to the production track.
+
+**GitLab CI/CD Variables** (Settings > CI/CD > Variables):
+
+| Variable | Description | Protected | Masked | Raw |
+|---|---|---|---|---|
+| `GOOGLE_PLAY_SERVICE_ACCOUNT_JSON` | **Base64-encoded** contents of the Google Play API service account key JSON file. The CI job decodes it with `base64 -d` before passing it to `fastlane supply`. | Yes | Yes | No |
+
+#### Initial Setup (one-time)
+
+1. Create or reuse a project in the [Google Cloud Console](https://console.cloud.google.com/projectcreate)
+2. Enable the [Google Play Developer API](https://console.developers.google.com/apis/api/androidpublisher.googleapis.com/) for that project
+3. In Google Cloud Console, go to [Service Accounts](https://console.cloud.google.com/iam-admin/serviceaccounts), create a service account, and download a JSON key file for it
+4. In Google Play Console, go to [Users & Permissions](https://play.google.com/console/users-and-permissions), click **Invite new users**, enter the service account email, and grant it permission to manage releases for `pub.ditto.app`
+5. **Base64-encode** the key file:
+
+   ```bash
+   # Linux
+   base64 -w0 service-account.json
+
+   # macOS
+   base64 -i service-account.json | tr -d '\n'
+   ```
+
+6. Add the base64-encoded value as the `GOOGLE_PLAY_SERVICE_ACCOUNT_JSON` variable in GitLab CI/CD settings (Settings > CI/CD > Variables). Mark it as **Protected** and **Masked**. Do **not** paste the raw JSON — the CI script expects base64 and will fail to decode a raw value.
+
+#### Key Points
+
+- The job uploads the signed AAB (not APK) since Google Play requires App Bundles
+- Uploads go directly to the **production** track -- Google's review process still applies before the update reaches users
+- Metadata, screenshots, and changelogs are managed in the Play Console, not via CI (the job uses `--skip_upload_metadata` etc.)
+- The same signing keystore used for Zapstore is used here (`ANDROID_KEYSTORE_BASE64`, `KEYSTORE_PASSWORD`, `KEY_PASSWORD`)

CHANGELOG.md

@@ -1,365 +1,7 @@
 # Changelog
 
-## [2.6.3] - 2026-04-10
+## [1.0.0] - 2026-04-30
 
 ### Added
-- Lightning invoices embedded in posts now render as tappable payment cards
-- Blobbi companions in the feed reflect their current condition and projected health
 
-### Changed
-- Profile headers are cleaner -- lightning addresses and verification badges moved out of the way, and website URLs no longer show a trailing slash
-- Login credentials are saved to your browser's built-in password manager for easier sign-in across sessions
-- "Request to Vanish" renamed to "Delete Account" for clarity
-
-### Fixed
-- Badge image uploads now show a recommended 1:1 aspect ratio hint so your badges don't get cropped unexpectedly
-- Security hardening for URLs and styles sourced from the network
-
-## [2.6.2] - 2026-04-08
-
-### Added
-- Share follow packs and follow sets via link -- recipients see an immersive preview with member avatars, a "Follow All" button, and a combined feed from everyone in the pack
-- Curated home feed with a mix of photos, short videos, livestreams, and music -- content types are spaced out so your timeline stays fresh and varied
-- "Write a letter" option on profile menus for a more personal way to reach out
-- Push vs persistent notification delivery option on Android
-
-### Changed
-- Webxdc games and apps always open fullscreen for a more immersive experience
-- Login credentials are now stored in the device's secure keychain on iOS and Android instead of plain local storage
-- Profile fields now appear inline instead of in a separate right sidebar
-- Trending hashtags removed from the logged-out homepage for a cleaner first impression
-
-### Fixed
-- Webxdc and nsites work natively on iOS and Android without relying on browser sandboxing tricks
-- File downloads now save directly to Documents on iOS and Android instead of silently failing
-- Mobile search no longer scrolls the page behind it and properly hides the bottom navigation bar
-- iOS swipe-back navigation works correctly throughout the app
-- Blobbi companions appear reliably on profiles instead of sometimes going missing
-- IndexedDB no longer crashes on devices with Lockdown Mode enabled
-
-## [2.6.1] - 2026-04-06
-
-### Added
-- Manage your interest tabs (hashtags and locations) from the settings page
-- Edit button on custom profile tabs so you can tweak them without recreating from scratch
-- Follow packs and follow sets now show author info and action headers in the feed
-- Posts now show whether they were created or updated, so you can tell when something's been edited
-
-### Changed
-- Webxdc games and apps run in a more secure sandbox with stricter content policies and private subdomains
-- Nsite previews now use the same secure sandbox as webxdc apps
-- Blobbi items work as instant abilities instead of consumable inventory -- no more fiddly quantity pickers
-
-### Fixed
-- Desktop tab bar no longer overflows when you have lots of tabs -- scroll arrows appear automatically
-- Mobile compose box no longer randomly collapses or becomes unclickable
-- Profile avatar and banner lightbox no longer hides behind the right sidebar
-- Infinite scroll on custom profile tab feeds no longer reloads the same content
-- Reaction emoji are now visible on each row in the interactions modal
-- Missing bottom border on collapsed thread expand button restored
-
-## [2.6.0] - 2026-04-05
-
-### Added
-- Follow links and QR codes -- share a link or scannable code that lets anyone follow you with one tap, complete with your themed profile preview and recent posts
-- Immersive Blobbi hatching ceremony -- crack your egg through cinematic stages with shaking animations, a burst of light, sparkles, typewriter dialog, and a naming moment
-
-### Changed
-- Footer links redesigned as compact icon chips for a cleaner look
-- Custom emoji now render crisp at small sizes with pixel-perfect scaling
-
-### Fixed
-- Custom themes now apply correctly when logging in on a new device
-- Settings and preferences sync reliably across devices
-- Mobile sidebar links no longer clip into the safe area
-- Blobbi page background overlay now appears properly on custom themes
-- Blobbi companion state no longer resets unexpectedly from stale cache data
-- Letter compose picker no longer gets hidden behind the top navigation arc
-
-## [2.5.2] - 2026-04-04
-
-### Added
-- See who voted on each poll option -- tap the vote count to open a voters list with avatar stacks and per-option filter tabs
-- Poll votes now appear as activity cards in feeds and on detail pages
-
-### Fixed
-- Threads and replies load more reliably by following relay and author hints when fetching parent events
-
-## [2.5.1] - 2026-04-03
-
-### Fixed
-- Lightbox now reliably appears above all content, not just when opened from photo galleries
-
-## [2.5.0] - 2026-04-03
-
-### Added
-- Run nsites and web apps directly inside Ditto -- hit the "Run" button on any nsite or app card to preview it in an overlay without leaving your feed
-- File uploads in the poll composer -- attach images and media to your polls
-- Blobbi posts now appear in the homepage feed
-
-### Changed
-- Profile media sidebar fills remaining slots with photos from text posts when there aren't enough dedicated media posts
-- App cards now show banner images and improved layout
-
-### Fixed
-- Lightbox no longer appears behind the right sidebar
-- Compose box corners are properly rounded
-- Clicking buttons or links inside a post card no longer accidentally navigates to the post detail page
-
-## [2.4.1] - 2026-04-02
-
-### Added
-- Rich cards for Zapstore app releases and assets -- see download links, version info, platform badges, and hashes right in your feed
-
-### Fixed
-- First-hatch tour now shows for accounts that were onboarded before the tour existed, so no one misses the hatching moment
-
-## [2.4.0] - 2026-04-02
-
-### Added
-- First-hatch tour: a guided experience for hatching your very first Blobbi egg, with progressive crack animations, an inline card flow, and a reveal moment
-- Customizable bottom bar: rearrange or hide any item in the navigation bar to make Ditto feel like yours
-- Mission surface card in the feed that surfaces your active quests at a glance
-
-### Changed
-- Missions redesigned as a quest board with collapsible cards and a lighter aesthetic
-- "Edit Profile" mission now completes when you update any profile field, not just wall-specific edits
-- Media tab on profiles now shows only photos, videos, and other media -- not plain text posts
-- Blobbi onboarding state now syncs to your profile so it follows you across devices
-
-### Fixed
-- Notification dot no longer reappears after you've already marked notifications as read
-- Dialogs no longer fly up when the mobile keyboard opens
-
-## [2.3.1] - 2026-04-02
-
-### Changed
-- Drafts now save instantly to your device and sync to relays in the background, with a cloud sync indicator so you always know the status
-
-### Fixed
-- Dialogs stay visible above the keyboard on mobile instead of getting hidden behind it
-- Editing an existing article no longer incorrectly warns about a duplicate slug
-- Switching between rich text and markdown source mode no longer clears your content
-- Fix crash when editing in markdown source mode
-
-## [2.3.0] - 2026-04-02
-
-### Added
-- In-app article editor with a rich text toolbar, image uploads, auto-saving drafts, and a "My Articles" tab to manage drafts and published articles
-
-### Fixed
-- Custom emoji no longer stretch to fill their container
-- Mobile drawer now closes when tapping footer links like Changelog or Privacy
-- Logged-out users now default to the global tab on content feeds instead of seeing an empty follows tab
-
-## [2.2.11] - 2026-04-02
-
-### Fixed
-- Fix crash caused by the "What's new" toast firing outside the router
-
-## [2.2.10] - 2026-04-02
-
-### Added
-- App cards for Nostr apps now display in feeds and detail pages with hero images, icons, and quick-launch buttons
-- "What's new" toast appears after an app update with a changelog preview and link to the full changelog
-
-### Changed
-- Changelog page redesigned with a hero section for the latest release, collapsible older entries, and category icons inline with each item
-
-### Fixed
-- Compose box now fully resets to its collapsed state after posting, including poll options and media trays
-
-## [2.2.9] - 2026-04-01
-
-### Added
-- Emoji pack creator and editor with drag-and-drop image upload, auto-generated identifiers, and description field
-- Blobbi companions now appear in feeds and post detail pages
-
-### Changed
-- Blobbi shop redesigned with a tile layout and instant buy -- no more categories or accessory tabs
-- Emoji packs without any valid emojis are now hidden from feeds
-- Custom emoji shortcode collisions across packs are automatically resolved with pack-prefixed names
-
-## [2.2.8] - 2026-04-01
-
-### Added
-- Full threaded reply trees on post detail pages with collapsible deep branches and "Show X more replies" for sibling threads
-- Broadcast button in the Event JSON dialog to re-publish any event to your relays
-
-### Changed
-- My Badges tab overhauled with drag-and-drop reordering, a scrollable list, and a showcase-style carousel for pending badges
-- Encrypted letter envelopes now show the mailing side first (sender and recipient), then flip to reveal the wax seal
-- Blobbi companions are more expressive -- richer status reactions, sleeping visuals, and body effects like dirt and hunger cues
-
-### Fixed
-- Notification dot not clearing after marking notifications as read
-- Followers/following modal staying open after navigating to a profile
-
-## [2.2.7] - 2026-03-31
-
-### Fixed
-- Nushu script in encrypted letters now renders correctly on Android and iOS
-
-## [2.2.6] - 2026-03-31
-
-### Added
-- Encrypted letters now appear as interactive 3D envelopes with Nushu script -- flip and open them to reveal the secret writing inside
-- Zap receipts and profile metadata events now render in feeds and detail pages
-- Remote signer callback page for login flows with Amber, Primal, and other signing apps
-
-### Changed
-- Post action buttons extracted into a reusable PostActionBar component
-- Badge detail page streamlined with unified tab bar
-
-### Fixed
-- Hashtags now support accented and Unicode characters
-- Letter compose opens correctly from notifications and the letters page
-- Letter font picker loads fonts so each option previews in the correct typeface
-- Zap comment positioned inside the right column instead of floating with offset
-- Safe-area padding on pinned SubHeaderBar only applies when scrolled to top
-
-## [2.2.5] - 2026-03-30
-
-### Fixed
-- Crash when dragging profile tabs to reorder them
-
-## [2.2.4] - 2026-03-30
-
-### Changed
-- Profiles now have an emoji reaction button instead of a zap button -- express yourself with any emoji or custom emoji right on someone's profile
-- Zap moved to the profile overflow menu so it's still one tap away
-
-### Fixed
-- Crash on the notifications page caused by malformed badge award tags
-- Deleting a badge now also deletes all awards you issued for it
-- Custom emoji reactions missing their image tag no longer render as broken shortcodes
-- Deletion requests for addressable events now include both `e` and `a` tags for broader relay compatibility
-- Profile reactions no longer collapse into a single grouped notification
-- Oversized reaction emoji in comment context headers
-
-## [2.2.3] - 2026-03-30
-
-### Added
-- Letters now have an overflow menu, reply button, and a grid layout for browsing
-- Independent feed toggles for comments and generic reposts in content settings
-- Sidebar items are now visible to logged-out users so newcomers can explore everything
-
-### Changed
-- Compose textarea expands smoothly as you type instead of snapping to a new height
-- Blobbi stickers auto-shrink near card edges and clip cleanly at rounded boundaries
-
-### Fixed
-- Feed gaps when replies are disabled no longer cause missing posts
-- Avatar shape no longer flashes on load
-- Top bar arc no longer flickers during navigation transitions
-- Letter drawing-only sends, sticker drag bounds, and theme event preservation
-- Notification rendering for badges and letters
-- Duplicate React keys in content settings
-- Layout rendering warning when switching views
-
-## [2.2.2] - 2026-03-29
-
-### Added
-- Dedicated photo upload flow for sharing photos
-- Pull-to-refresh on all feed pages
-- 3D tilt effect on badge images -- hover over badges to see them pop
-- Multi-select badge awarding with indicators for already-sent badges
-- Badge list recovery dialog for restoring profile badge lists
-- Compact badge row preview in embedded profile badges events
-- Custom emoji usage tracking so your most-used custom emojis appear in the quick-react bar
-- Release notes now included in Zapstore publishing
-- Changelog link in the app footer
-
-### Changed
-- "Vines" renamed to "Divines" everywhere in the app
-- Custom emojis appear first in the emoji picker, right after recent
-- Threaded comment view now shows the parent event as a NoteCard with kind action headers
-
-### Fixed
-- Delete post dialog no longer freezes the feed on desktop
-- Amber login on Android now properly retries when returning from the background
-- Key downloads on Android save to the correct location
-- Custom emoji SVGs render correctly in the emoji-mart picker
-- Double-tap reactions now properly show the emoji on the post
-- Emoji shortcode autocomplete text and highlight colors
-- Profile skeleton no longer flickers for brand-new users with no metadata
-- Event links now route correctly for all event types
-- Badge notifications are now clickable
-- Custom profile tab form no longer retains fields from a previously edited tab
-- Double line under profile tabs in edit mode
-- Inconsistent use of "geocache" vs "treasures" terminology
-- Search page "N new posts" pill no longer shows unfiltered count
-- Stale-cache overwrites in replaceable event mutations
-- Click-through on delete confirmation and note menu items
-
-## [2.2.1] - 2026-03-28
-
-### Fixed
-- New posts no longer cause scroll jumps -- they buffer while you're reading and appear with a tap
-- Mobile header no longer shows double-layered backgrounds on notched devices
-- Pinned tabs stay properly positioned when scrolling on mobile
-- Signer approval toasts no longer fire in rapid succession on unstable connections
-- Toasts are easier to swipe away on mobile
-- Content warnings now blur thumbnails in the media grid
-
-## [2.2.0] - 2026-03-28
-
-### Added
-- Blobbi virtual pets -- adopt an egg, hatch it, evolve it into one of 16 adult forms, and care for it with feeding, cleaning, medicine, music, and singing
-- Blobbi companion that follows you around the app, tracks your cursor, blinks, expresses emotions, and reacts to what you're doing
-- Blobbi shop and inventory system with items that affect your pet's stats
-- Daily missions with reroll, care streaks, and stage-based rewards
-- Immersive full-screen divines experience on both mobile and desktop with floating controls
-- Relay information panel on the network settings page
-- Link preview cards now display inside quoted posts instead of raw URLs
-- Nsec paste guard warns you before accidentally pasting private keys outside the login field
-- Remote signer UX improvements for Amber users on Android
-- Badge awards now trigger push notifications
-- Badges display in profile bio section with a "Give badge" option in the profile menu
-
-### Changed
-- Notification "Mentions" tab now shows only pure mentions, filtering out replies
-- Notification preferences ("only from people I follow") now properly apply to push notifications, native Android notifications, and the unread dot
-- Upgraded from React 18 to React 19
-- Reduced initial bundle size by ~50% with improved code splitting and lazy loading
-
-### Fixed
-- Zapping Primal users no longer produces an error
-- Hashtag feeds now match case-insensitively for parity with search results
-- Mobile top bar arc no longer lingers on pages without tabs
-- Give Badge dialog and profile menu action handlers
-
-## [2.1.1] - 2026-03-27
-
-### Added
-- Emoji picker and shortcode autocomplete in zap comment box
-- Zap button on badge detail view
-- Theme descriptions now display on "updated their theme" posts and detail pages
-- Badge thumbnail previews in award notifications
-- Letter notifications with envelope card preview
-- Kind-specific labels in notification text instead of generic "post"
-
-### Fixed
-- Compose modal no longer closes when dismissing emoji picker on mobile
-- Compose preview overflow is now scrollable in modal
-- Toast notifications swipe up to dismiss on mobile instead of sideways
-- File downloads and URL opening work correctly on iOS
-- Badges page no longer shows infinite skeleton when logged out
-
-## [2.1.0] - 2026-03-26
-
-### Added
-- Letters -- a Wii Mail-inspired inbox for sending decorated letters to friends, complete with custom stationery, hand-drawn stickers, emoji stickers, fonts, and a send animation with envelope and wax seal
-- Attach a color moment or theme to your letter as a gift -- recipients can tap to apply it instantly
-- Stationery picker pulls from your color moments, followed users' themes, and built-in presets
-- Freehand drawing canvas for creating one-of-a-kind sticker doodles
-- Letters page added to the sidebar with a custom mailbox icon
-
-## [2.0.1] - 2026-03-26
-
-### Added
-- Tap the version number in settings to see what's new
-
-## [2.0.0] - 2026-03-26
-
-Initial release of Ditto 2.0 -- a complete rewrite of Ditto.
+- Initial Agora 3 release.

CONTRIBUTING.md

@@ -1,42 +1,42 @@
-# Contributing to Ditto
+# Contributing to Agora
 
-We welcome contributions, but we have high standards. Ditto is a carefully designed product with a specific vision, and every merge request must meet that bar. This guide exists to help you succeed.
+We welcome contributions, but we have high standards. Agora is a carefully designed product with a specific vision, and every merge request must meet that bar. This guide exists to help you succeed.
 
 **Required reading before you start:**
 
-- [Ditto Philosophy](https://about.ditto.pub/philosophy) -- the product vision. Your change must align with it.
-- [Contributing Guide](https://about.ditto.pub/contributing) -- the upstream contribution process.
+- [Understanding Agora](#understanding-agora) -- the product vision. Your change must align with it.
+- This `CONTRIBUTING.md` guide -- the contribution process for this repository.
 - `AGENTS.md` in this repo -- the codebase conventions. Your AI tool should load this file.
 
-## Understanding Ditto
+## Understanding Agora
 
-Ditto is a carnival, not a platform. Before contributing, you need to understand what that means.
+Agora is a carnival, not a platform. Before contributing, you need to understand what that means.
 
 ### The product decision filter
 
-Every change to Ditto should pass this test:
+Every change to Agora should pass this test:
 
-> *Does this make Ditto more magnetic, more threatening to the status quo, and more peaceful to inhabit?*
+> *Does this make Agora more magnetic, more threatening to the status quo, and more peaceful to inhabit?*
 
-- **Magnetic** -- Ditto attracts through experience, not ideology. People don't need to understand Nostr to love it. They need to feel something they haven't felt online since the early web. Features should be odd, intriguing, and captivating -- not generic social media clones.
-- **Threatening to the status quo** -- Ditto threatens mainstream platforms when someone opens it and thinks: *"Why can't my platform do this?"* Theming, games, treasure hunts, interoperable micro-apps -- these are things walled gardens can't replicate.
-- **Peaceful to inhabit** -- Ditto displaces argument with creation, conformity with expression, and consumption with participation. No ads, no engagement-optimized algorithms, no outrage incentives.
+- **Magnetic** -- Agora attracts through experience, not ideology. People don't need to understand Nostr to love it. They need to feel something they haven't felt online since the early web. Features should be odd, intriguing, and captivating -- not generic social media clones.
+- **Threatening to the status quo** -- Agora threatens mainstream platforms when someone opens it and thinks: *"Why can't my platform do this?"* Theming, games, treasure hunts, interoperable micro-apps -- these are things walled gardens can't replicate.
+- **Peaceful to inhabit** -- Agora displaces argument with creation, conformity with expression, and consumption with participation. No ads, no engagement-optimized algorithms, no outrage incentives.
 
 If a change does all three, it belongs. If it only does one, think harder. If it does none, it doesn't belong here.
 
-### What Ditto is NOT
+### What Agora is NOT
 
 - A Twitter/X clone with decentralization bolted on
 - A place to replicate features that mainstream platforms already do well
 - A showcase for generic UI components or boilerplate social features
 
-### What Ditto IS
+### What Agora IS
 
 - A convergence point for interoperable Nostr experiences (games, treasure hunts, magic decks, themes, color moments, live streams, and things nobody has imagined yet)
 - A place where profiles feel like worlds, not business cards
 - The most fun you've had on the internet in years
 
-Read the [full philosophy](https://about.ditto.pub/philosophy) for the complete vision.
+Read the full "Understanding Agora" section above for the complete vision.
 
 ## What we accept
 
@@ -46,15 +46,15 @@ One bug, one merge request. Fix exactly one thing. Don't bundle unrelated change
 
 ### New features and significant changes
 
-Every feature MR must link to an existing open issue and clearly align with the [Ditto Philosophy](https://about.ditto.pub/philosophy). The philosophy alignment section in the MR template is where you make the case for why your change belongs in Ditto. If you can't articulate that clearly, the change probably doesn't belong.
+Every feature MR must link to an existing open issue and clearly align with the "Understanding Agora" section in this file. The philosophy alignment section in the MR template is where you make the case for why your change belongs in Agora. If you can't articulate that clearly, the change probably doesn't belong.
 
 If you have an idea for a feature that doesn't have an issue yet:
 
-1. Build it as a standalone Nostr app first (see [Contributing Guide](https://about.ditto.pub/contributing)).
+1. Build it as a standalone Nostr app first (then document traction/feedback in the linked issue).
 2. Prove it works and get user feedback.
 3. Open an issue to discuss integration.
 
-**Feature MRs that don't link to an issue or don't align with the Ditto Philosophy will be closed.** Our open issues are our internal roadmap -- some require deep product context. If your implementation doesn't match the product vision, it will be closed regardless of code quality.
+**Feature MRs that don't link to an issue or don't align with the Agora Philosophy will be closed.** Our open issues are our internal roadmap -- some require deep product context. If your implementation doesn't match the product vision, it will be closed regardless of code quality.
 
 ## Required tools
 
@@ -80,7 +80,7 @@ Read `AGENTS.md` in the repo root. This is the single source of truth for how co
 
 ### 4. Read the philosophy
 
-Read the [Ditto Philosophy](https://about.ditto.pub/philosophy). Ditto is a carnival, not a platform. Your change should feel like it belongs in Ditto -- not like it was transplanted from a generic social media template. Apply the product decision filter above.
+Read "Understanding Agora" in this file. Agora is a carnival, not a platform. Your change should feel like it belongs in Agora -- not like it was transplanted from a generic social media template. Apply the product decision filter above.
 
 ### 5. Plan before you code
 
@@ -163,7 +163,7 @@ Fill out every field in the MR template. Incomplete MRs will not be reviewed.
 ## What gets your MR closed without review
 
 - No linked issue
-- Feature MRs with no clear alignment with the [Ditto Philosophy](https://about.ditto.pub/philosophy)
+- Feature MRs with no clear alignment with "Understanding Agora" in this file
 - Features that fail the product decision filter (not magnetic, not threatening to the status quo, not peaceful)
 - Incomplete MR template (missing checklist, screenshots, or preview URL)
 - Changes that go beyond what was asked for (scope creep)

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:22-alpine AS builder
+WORKDIR /app
+RUN apk add --no-cache git
+COPY package*.json ./
+COPY .npmrc ./
+COPY scripts/ ./scripts/
+RUN npm ci
+COPY . .
+RUN npm run build
+
+FROM nginx:alpine
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder /app/dist /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

NIP.md

@@ -6,10 +6,23 @@
 
 | Kind  | Name                 | Description                                           |
 |-------|----------------------|-------------------------------------------------------|
-| 36767 | Theme Definition     | Shareable, named custom UI theme                      |
-| 16767 | Active Profile Theme | The user's currently active theme (one per user)      |
 | 16769 | Profile Tabs         | The user's custom profile page tabs (one per user)    |
 
+### Agora Kinds
+
+| Kind  | Name                       | Description                                                    |
+|-------|----------------------------|----------------------------------------------------------------|
+| 20000 | Ephemeral Geo Chat (public) | Geo-anchored ephemeral chat message (kind 20000, public)      |
+| 20001 | Ephemeral Geo Heartbeat    | Geo-anchored ephemeral presence heartbeat (kind 20001)         |
+| 30385 | Community Stats Snapshot   | Pre-computed per-country / global community leaderboards       |
+| 36639 | Activist Action            | Country-scoped activist challenge with a sats bounty           |
+
+### Agora Protocols
+
+| Protocol                 | Composed Kinds                          | Description                                                     |
+|--------------------------|-----------------------------------------|-----------------------------------------------------------------|
+| Flat Communities | 34550, 30009, 8, 1111, 1984 | One-level badge membership with explicit moderators (NIP-72 ext) |
+
 ### Community Kinds
 
 These event kinds were created by community contributors and are supported by Ditto. Full specifications are maintained by their respective authors.
@@ -20,175 +33,47 @@ These event kinds were created by community contributors and are supported by Di
 | 4223  | Weather Reading        | Sensor readings from a weather station                           | [Draft NIP](https://github.com/nostr-protocol/nips/pull/2163)                            |
 | 7516  | Found Log              | Log entry recording a user finding a geocache                    | [NIP-GC](https://gitlab.com/chad.curtis/treasures/-/blob/main/NIP-GC.md)                 |
 | 8211  | Encrypted Letter       | Encrypted personal letter with visual stationery                 | [NIP](https://gitlab.com/chad.curtis/lief/-/blob/main/NIP.md)                            |
-| 11125 | Blobbonaut Profile     | Owner profile with coins, achievements, and inventory            | [NIP-BB](https://github.com/Danidfra/nostr-pet/blob/production/NIP.md)                   |
-| 14919 | Blobbi Interaction     | Individual pet interaction (feed, play, clean, etc.)             | [NIP-BB](https://github.com/Danidfra/nostr-pet/blob/production/NIP.md)                   |
-| 14920 | Blobbi Breeding        | Breeding event between two adult Blobbis                         | [NIP-BB](https://github.com/Danidfra/nostr-pet/blob/production/NIP.md)                   |
-| 14921 | Blobbi Record          | Immutable lifecycle record (birth, evolution, adoption)          | [NIP-BB](https://github.com/Danidfra/nostr-pet/blob/production/NIP.md)                   |
 | 16158 | Weather Station        | Weather station metadata (location, sensors, connectivity)       | [Draft NIP](https://github.com/nostr-protocol/nips/pull/2163)                            |
-| 31124 | Blobbi Pet State       | Current state of a virtual Blobbi pet (addressable)              | [NIP-BB](https://github.com/Danidfra/nostr-pet/blob/production/NIP.md)                   |
 | 37516 | Geocache               | Geocache listing for real-world treasure hunting                 | [NIP-GC](https://gitlab.com/chad.curtis/treasures/-/blob/main/NIP-GC.md)                 |
 
 ---
 
-## Kind 36767: Theme Definition
+## Standard NIPs: Direct Messaging
 
-### Summary
+This application implements encrypted direct messaging using two standard Nostr protocols:
 
-Addressable event kind for publishing shareable custom UI themes. A single user may publish multiple themes, each identified by a unique `d` tag.
+### NIP-04 (Legacy Encrypted DMs)
 
-A theme consists of colors, optional fonts, and an optional background. Colors are stored in `c` tags, fonts in `f` tags, and background in a `bg` tag.
+| Field | Value |
+|-------|-------|
+| Kind  | 4     |
+| Spec  | [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md) |
 
-### Event Structure
+Legacy encrypted direct messages. Content is encrypted with AES-256-CBC using a shared secret derived from the sender's private key and recipient's public key. The recipient is identified by a `p` tag.
 
-```json
-{
-  "kind": 36767,
-  "content": "",
-  "tags": [
-    ["d", "mk-dark-theme"],
-    ["c", "#1a1a2e", "background"],
-    ["c", "#e0e0e0", "text"],
-    ["c", "#6c3ce0", "primary"],
-    ["f", "Inter", "https://example.com/inter.woff2", "body"],
-    ["f", "Playfair Display", "https://example.com/playfair.woff2", "title"],
-    ["bg", "url https://example.com/bg.jpg", "mode cover", "m image/jpeg", "dim 1920x1080"],
-    ["title", "MK Dark Theme"],
-    ["alt", "Custom theme: MK Dark Theme"]
-  ]
-}
-```
+Used for backward compatibility with older Nostr clients that do not support NIP-17.
 
-### Content
+### NIP-17 (Private Direct Messages)
 
-The `content` field is unused and MUST be an empty string (`""`).
+| Field | Value |
+|-------|-------|
+| Kinds | 1059 (Gift Wrap), 1060 (Seal) |
+| Spec  | [NIP-17](https://github.com/nostr-protocol/nips/blob/master/17.md) |
 
-### Tags
+Modern private direct messages using the Gift Wrap protocol. Messages are triple-layered:
 
-| Tag     | Required | Description                                                                           |
-|---------|----------|---------------------------------------------------------------------------------------|
-| `d`     | Yes      | Unique identifier (slug) for this theme, e.g. `"mk-dark-theme"`                      |
-| `c`     | Yes (×3) | Hex color with marker. See [Color Tags](#color-tags).                                 |
-| `f`     | No       | Font declaration. See [Font Tag](#font-tag).                                          |
-| `bg`    | No       | Background media. See [Background Tag](#background-tag).                              |
-| `title` | Yes      | Human-readable theme name                                                             |
-| `alt`   | Yes      | NIP-31 human-readable fallback                                                        |
+1. **Rumor** (kind 14) — unsigned plaintext message
+2. **Seal** (kind 13) — rumor encrypted to the recipient, signed by the sender
+3. **Gift Wrap** (kind 1059) — seal encrypted to the recipient, signed by a random ephemeral key
 
-### Multiple Themes Per User
+This provides metadata protection: relays and observers cannot determine the sender, recipient, or content. The application uses NIP-17 as the default send protocol, with optional NIP-04 compatibility for older clients.
 
-Since kind 36767 is addressable, a user can publish multiple themes by using different `d` tag values. Publishing a new event with the same `d` tag replaces the previous version (this is how editing works).
+### Protocol Configuration
 
----
+Users can configure their preferred send protocol via Settings > Messages:
 
-## Kind 16767: Active Profile Theme
-
-### Summary
-
-Replaceable event that represents the user's currently active profile theme. Only one per user. When other users visit a profile, they query this kind to determine what theme to display.
-
-### Event Structure
-
-```json
-{
-  "kind": 16767,
-  "content": "",
-  "tags": [
-    ["c", "#1a1a2e", "background"],
-    ["c", "#e0e0e0", "text"],
-    ["c", "#6c3ce0", "primary"],
-    ["f", "Inter", "https://example.com/inter.woff2", "body"],
-    ["f", "Playfair Display", "https://example.com/playfair.woff2", "title"],
-    ["bg", "url https://example.com/bg.jpg", "mode cover", "m image/jpeg"],
-    ["title", "MK Dark Theme"],
-    ["alt", "Active profile theme"]
-  ]
-}
-```
-
-### Content
-
-The `content` field is unused and MUST be an empty string (`""`).
-
-### Tags
-
-| Tag     | Required | Description                                                                           |
-|---------|----------|---------------------------------------------------------------------------------------|
-| `c`     | Yes (×3) | Hex color with marker. See [Color Tags](#color-tags).                                 |
-| `f`     | No       | Font declaration. See [Font Tag](#font-tag).                                          |
-| `bg`    | No       | Background media. See [Background Tag](#background-tag).                              |
-| `title` | No       | Human-readable name for the theme                                                     |
-| `alt`   | Yes      | NIP-31 human-readable fallback                                                        |
-
-### Client Behavior
-
-- When visiting a profile, clients query `{ kinds: [16767], authors: [pubkey], limit: 1 }` to get the active theme.
-- Clients read the `c` tags to extract colors, `f` tags for fonts, and `bg` tag for the background.
-- Setting a new active theme publishes a new kind 16767 event (replacing the old one).
-- To remove the active theme, publish a kind 5 deletion event targeting kind 16767.
-
----
-
-## Shared Tag Definitions
-
-The following tag definitions apply to both kind 36767 and kind 16767.
-
-### Color Tags
-
-Format: `["c", "#rrggbb", "<marker>"]`
-
-| Index | Required | Description                                                                                   |
-|-------|----------|-----------------------------------------------------------------------------------------------|
-| 0     | Yes      | Tag name: `"c"`                                                                               |
-| 1     | Yes      | Lowercase 6-digit hex color code including the `#` sign (e.g. `"#ff0000"`)                    |
-| 2     | Yes      | Color role marker: one of `"primary"`, `"text"`, or `"background"`                            |
-
-- All three markers (`"primary"`, `"text"`, `"background"`) MUST be present.
-- Only one `c` tag per marker is allowed.
-
-### Font Tag
-
-Format: `["f", "<family>", "<url>", "<role>"]`
-
-| Index | Required | Description                                                                                   |
-|-------|----------|-----------------------------------------------------------------------------------------------|
-| 0     | Yes      | Tag name: `"f"`                                                                               |
-| 1     | Yes      | CSS `font-family` name (e.g. `"Inter"`)                                                       |
-| 2     | Yes      | Direct URL to a font file (`.woff2`, `.ttf`, `.otf`)                                          |
-| 3     | Yes      | Font role: `"body"` or `"title"`                                                              |
-
-**Roles:**
-
-| Role      | Applies to                                      |
-|-----------|--------------------------------------------------|
-| `"body"`  | All text globally (body, headings, UI elements)  |
-| `"title"` | The user's profile display name                  |
-
-**Rules:**
-
-- The `f` tag is optional on the event.
-- At most one `f` tag per role is allowed (i.e. one body font and one title font).
-- The `"body"` font tag MUST be ordered before the `"title"` font tag. This ensures backward-compatible clients that only read the first `f` tag will pick up the body font.
-- If the URL fails to load, the client SHOULD fall back to a default font gracefully.
-- Clients that do not recognize a role SHOULD ignore that `f` tag.
-- Legacy events with an `f` tag that has no role marker (only 3 elements) SHOULD be treated as `"body"`.
-- Variable font files (covering multiple weights in a single file) are preferred.
-
-### Background Tag
-
-The `bg` tag uses an `imeta`-style variadic format where each entry (after the tag name) is a space-delimited key/value pair.
-
-Format: `["bg", "url <url>", "mode <mode>", "m <mime-type>", ...]`
-
-| Key         | Required | Description                                                                              |
-|-------------|----------|------------------------------------------------------------------------------------------|
-| `url`       | Yes      | URL to an image or video file                                                            |
-| `mode`      | Yes      | Display mode: `"cover"` or `"tile"`                                                      |
-| `m`         | Yes      | MIME type (e.g. `"image/jpeg"`, `"image/png"`, `"video/mp4"`)                            |
-| `dim`       | No       | Dimensions in pixels: `"<width>x<height>"` (e.g. `"1920x1080"`)                          |
-| `blurhash`  | No       | Blurhash placeholder string for progressive loading                                      |
-
-- At most one `bg` tag is allowed per event.
-- Clients MAY choose not to render video backgrounds for performance or bandwidth reasons.
-- Unknown keys SHOULD be ignored for forward compatibility.
+- **NIP-17 only** (default) — maximum privacy, only modern clients can read
+- **NIP-04 + NIP-17** — sends via both protocols for compatibility with legacy clients
 
 ---
 
@@ -288,6 +173,701 @@ After resolution (assuming `$follows` = `["pk1", "pk2"]`):
 
 ---
 
+## Kind 36639: Activist Action
+
+### Summary
+
+Addressable event kind for publishing **activist actions** (called "challenges" internally for backwards compatibility). An action is a country-scoped task — take a photo, make art, gather information, or take direct action — with an optional sats bounty paid out via NIP-57 zaps to the best **submissions**.
+
+Submissions are **NIP-22 comments** (kind 1111) authored under the action's coordinate, ranked by zap totals. There is no separate submission kind; an earlier draft (kind 36640) was deprecated in favor of NIP-22 reuse.
+
+### Trust model
+
+Anyone can publish a kind 36639 event, but clients SHOULD only display actions whose author is either:
+
+1. A platform-level admin (see `src/lib/admins.ts`), or
+2. An organizer for the action's country (see kind 30078 `agora-organizers`).
+
+This authorization model is identical to the per-country pin model — see Kind 30078 in this document for the storage shape.
+
+### Event Structure
+
+```json
+{
+  "kind": 36639,
+  "content": "<long-form description, freeform markdown-ish text>",
+  "tags": [
+    ["d", "plant-a-tree-1729000000000"],
+    ["title", "Plant a tree in your neighborhood"],
+    ["challenge-type", "photo"],
+    ["bounty", "10000"],
+    ["i", "iso3166:US"],
+    ["t", "agora-action"],
+    ["image", "https://example.com/cover.jpg"],
+    ["start", "1729000000"],
+    ["deadline", "1729604800"],
+    ["alt", "Agora activist action: Plant a tree in your neighborhood"]
+  ]
+}
+```
+
+### Tags
+
+| Tag              | Required | Description                                                                                              |
+|------------------|----------|----------------------------------------------------------------------------------------------------------|
+| `d`              | Yes      | Unique identifier (typically slug + timestamp). Forms the addressable coordinate `36639:<pubkey>:<d>`.   |
+| `title`          | Yes      | Short title shown on cards.                                                                              |
+| `challenge-type` | Yes      | One of `photo`, `art`, `info`, `action`. Drives the display icon and submission expectations.            |
+| `bounty`         | Yes      | Bounty in **sats**, as an unsigned integer string. Paid out via zaps to the chosen submission(s).        |
+| `i`              | Yes      | NIP-73 country identifier: `iso3166:XX` (preferred). Legacy `geo:XX` (length 6, country code only) is accepted as a read alias. Optionally combined with a `location` tag fallback. |
+| `t`              | Yes      | Discovery tag. Canonical write value is `agora-action`. Read aliases: `pathos-challenge`, `agora-challenge`. |
+| `image`          | No       | Cover image URL.                                                                                         |
+| `start`          | No       | Unix timestamp when the action becomes active. Defaults to `created_at`.                                 |
+| `deadline`       | No       | Unix timestamp when the action expires. Defaults to `start + 48h`.                                       |
+| `alt`            | Yes      | NIP-31 human-readable fallback. Convention: `"Agora activist action: <title>"`.                          |
+
+### Content
+
+Long-form description of the action. Plain text or light markdown. Clients render this as the action's body on the detail page.
+
+### Submissions
+
+Submissions are kind 1111 NIP-22 comments addressed to the action's coordinate (`["A", "36639:<pubkey>:<d>"]` and `["P", "<pubkey>"]`). Clients SHOULD:
+
+- Sort top-level submissions by **total zap amount** (sum of NIP-57 zap receipts on each submission), descending.
+- Show the bounty as the prize pool that organizers can distribute to top submissions via zaps.
+- Hide submissions with `created_at` after the action's `deadline` for "past" leaderboards (or surface them separately as "late submissions").
+
+### Discovery
+
+Clients querying actions globally:
+
+```json
+{ "kinds": [36639], "#t": ["agora-action", "pathos-challenge", "agora-challenge"], "limit": 50 }
+```
+
+Per country:
+
+```json
+{
+  "kinds": [36639],
+  "#t": ["agora-action", "pathos-challenge", "agora-challenge"],
+  "#i": ["iso3166:US", "geo:US"],
+  "limit": 50
+}
+```
+
+After fetching, clients MUST filter the results down to events whose author is either an admin or an organizer for the event's country.
+
+---
+
+## Kind 30385: Community Stats Snapshot
+
+### Summary
+
+Addressable event kind for **pre-computed community statistics** (per-country and global). A trusted off-app indexer (the "stats bot") publishes one event per scope:
+
+- **Per-country**: `d` tag is `iso3166:XX` (ISO 3166-1 alpha-2 country code).
+- **Global**: `d` tag is `iso3166:ZZ` — `ZZ` is the ISO 3166-1 user-assigned code Agora uses for the cross-country aggregate.
+
+Each event contains aggregate counts (comments, authors, zaps, submissions) and ranked leaderboards (top posters, trending hashtags, top zapped authors, top donors, top actions) across multiple time windows (`7d`, `30d`, `90d`, all-time). Storing pre-computed leaderboards in a single event lets clients render community pages without scanning thousands of underlying events.
+
+### Trust model
+
+Anyone can publish kind 30385, but clients MUST only consume events from trusted authors:
+
+- **Per-country events**: trusted authors are platform admins (`src/lib/admins.ts`) **plus** appointed organizers for that specific country (kind 30078 `agora-organizers`).
+- **Global event** (`iso3166:ZZ`): trusted authors are platform admins only.
+
+When multiple trusted events exist for the same scope, clients pick the most recent by `created_at`.
+
+### Event Structure
+
+```json
+{
+  "kind": 30385,
+  "content": "",
+  "tags": [
+    ["d", "iso3166:US"],
+
+    ["comment_cnt", "12345"],
+    ["comment_cnt_7d", "789"],
+    ["comment_cnt_30d", "3421"],
+    ["comment_cnt_90d", "9876"],
+    ["author_cnt", "543"],
+    ["zap_amount", "123456789"],
+    ["zap_cnt", "1234"],
+    ["submission_cnt", "456"],
+
+    ["top_poster", "<pubkey-hex>", "987"],
+    ["top_poster_7d", "<pubkey-hex>", "42"],
+
+    ["trending_hashtag", "climate", "321"],
+    ["trending_hashtag_7d", "protest", "67"],
+
+    ["top_zapped", "<pubkey-hex>", "<totalSats>", "<postCount>", "<avgSats>", "<zapCount>"],
+    ["top_donor", "<pubkey-hex>", "<totalSats>", "<zapCount>"],
+
+    ["top_action", "36639:<pubkey>:<d-tag>", "Plant a tree", "<submissions>", "<bounty>", "<zapAmountSats>"]
+  ]
+}
+```
+
+### Tag families
+
+All numeric values are unsigned integers serialised as base-10 strings.
+
+#### Aggregate counts (one tag per metric per timeframe)
+
+| Tag base name      | Meaning                                                |
+|--------------------|--------------------------------------------------------|
+| `comment_cnt`      | Number of NIP-22 comments in scope                     |
+| `author_cnt`       | Distinct author pubkeys in scope                       |
+| `zap_amount`       | Total zap amount in **sats**                           |
+| `zap_cnt`          | Number of NIP-57 zap receipts                          |
+| `submission_cnt`   | Submissions to activist actions (kind 36639)           |
+
+Each is published as four tags: bare (`<base>`, all-time), `<base>_7d`, `<base>_30d`, `<base>_90d`.
+
+#### Leaderboards (repeated; one tag per row, ordered by rank)
+
+All-time variants use the bare tag name; windowed variants use the `_7d`, `_30d`, `_90d` suffixes.
+
+| Tag base name        | Positional fields                                                                              |
+|----------------------|-----------------------------------------------------------------------------------------------|
+| `top_poster`         | `[name, pubkeyHex, count]`                                                                    |
+| `trending_hashtag`   | `[name, hashtag, count]`                                                                      |
+| `top_zapped`         | `[name, pubkeyHex, totalSats, postCount, avgSats, zapCount]` (`zapCount` optional, legacy)    |
+| `top_donor`          | `[name, pubkeyHex, totalSats, zapCount]`                                                      |
+| `top_action`         | `[name, "36639:<pubkey>:<d>", title, submissions, bounty, zapAmountSats]`                     |
+
+Clients SHOULD parse defensively — accept missing trailing fields as `0` or omitted to maintain backwards compatibility as the schema evolves.
+
+### Content
+
+Empty string. All data lives in tags so relays can index/filter and clients don't need to parse JSON.
+
+### Discovery
+
+Per-country snapshot:
+
+```json
+{
+  "kinds": [30385],
+  "authors": [<admin and organizer pubkeys>],
+  "#d": ["iso3166:US"],
+  "limit": 10
+}
+```
+
+Global snapshot:
+
+```json
+{
+  "kinds": [30385],
+  "authors": [<admin pubkeys>],
+  "#d": ["iso3166:ZZ"],
+  "limit": 10
+}
+```
+
+After fetching, take the event with the highest `created_at` and parse it. Cache for ~1–2 minutes; the producer typically refreshes on a similar cadence.
+
+---
+
+## Kinds 20000 / 20001: Ephemeral Geo Chat
+
+### Summary
+
+Ephemeral events used to power realtime location-anchored chat on the world map. Both kinds live in NIP-01's ephemeral range (`20000 ≤ kind < 30000`), so relays MUST NOT persist them — they are short-lived signals only.
+
+- **Kind 20000** — public chat message. The `content` field carries the message text.
+- **Kind 20001** — presence "heartbeat". Same tag schema, but `content` MAY be empty (the event simply broadcasts that someone is listening at the geohash).
+
+This kind range is shared with the wider Bitchat / geo-chat ecosystem; Agora interoperates with Pathos and other clients producing the same shape.
+
+### Tags
+
+| Tag | Required | Purpose                                                                 |
+|-----|----------|-------------------------------------------------------------------------|
+| `g` | Yes      | Geohash anchoring the message. Any precision is allowed; the dialog filters by exact-match `g` value, while the map clusters by full geohash. |
+| `n` | No       | Display nickname (≤ 16 chars after client-side truncation). Anonymous senders pick a random "ghost" handle; logged-in senders may use their account display name. |
+
+Events without a `g` tag MUST be ignored — they cannot be plotted.
+
+### Identity
+
+There are two valid signing paths:
+
+1. **Real identity** — a logged-in user signs with their existing Nostr key (typically via NIP-07 / NIP-46). Other clients can correlate the chat message with the author's public profile.
+2. **Ephemeral "ghost" identity** — the client generates a fresh in-memory keypair (never persisted) and signs locally. Only the chosen `n` nickname is persisted (in `localStorage`) so the user keeps a stable handle even though the pubkey rotates per session.
+
+Clients SHOULD let logged-in users toggle between modes per-session and SHOULD default to the ghost mode when no account is available.
+
+### Relay Routing
+
+Because ephemeral events are not stored, latency dominates the experience. Clients SHOULD:
+
+1. Always include a baseline of widely-reachable relays (`wss://nos.lol`, `wss://relay.damus.io`, `wss://relay.primal.net`).
+2. Augment with geo-located relays drawn from the [permissionlesstech/georelays](https://github.com/permissionlesstech/georelays) CSV catalogue (`relayUrl,latitude,longitude` per line).
+3. For a specific geohash conversation, prefer the relays nearest the decoded coordinates (Haversine distance, top-N).
+4. For the global map heatmap, take a rotating window (e.g. 8 relays, rotated every 5 minutes) so coverage spreads without saturating any single relay.
+
+### Time Window
+
+Clients SHOULD only surface events from the last hour (`since = now - 3600`). Older ephemeral events are uninteresting for "what's happening right now" and most relays will have dropped them anyway.
+
+### Example
+
+```json
+{
+  "kind": 20000,
+  "created_at": 1734567890,
+  "pubkey": "...",
+  "tags": [
+    ["g", "u4pruydqqvj"],
+    ["n", "stealthranger4242"]
+  ],
+  "content": "anyone in berlin tonight?",
+  "sig": "..."
+}
+```
+
+---
+
+## Flat Communities
+
+Flat communities on Nostr, composed from existing event kinds. Communities have one membership badge, explicit moderators, and no recursive badge-chain authority.
+
+This specification is intended to be a foundation for community-scoped features. A community is a kind `34550` root that other events can tag with uppercase `A`. Posts, events, polls, listings, and future content kinds can all participate in the same community model when they tag the community root and pass the membership and moderation rules below.
+
+The initial implementation focuses on three foundation capabilities:
+
+1. Viewing communities a user owns or belongs to.
+2. Posting community-scoped discussion content.
+3. Moderating community-scoped content and members within communities the viewer has authority over.
+
+**No new event kinds are introduced.** The system composes:
+
+- **Kind 34550** ([NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md)) -- Community Definition
+- **Kind 30009** ([NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md)) -- Badge Definition
+- **Kind 8** ([NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md)) -- Badge Award
+- **Kind 1111** ([NIP-22](https://github.com/nostr-protocol/nips/blob/master/22.md)) -- Community Posts
+- **Kind 1984** ([NIP-56](https://github.com/nostr-protocol/nips/blob/master/56.md)) -- Moderation
+### Overview
+
+A flat community consists of:
+
+1. **One badge definition** (kind `30009`) that represents community membership.
+2. A **community definition** (kind `34550`) referencing that member badge with the role marker `"member"`.
+3. **Badge awards** (kind `8`) authored by the founder or current moderators, granting membership directly.
+4. **Community-scoped content** (initially kind `1111`) tagged to the community root.
+5. **Reports and bans** (kind `1984`) scoped to the community for content warnings, content removal, and member/non-member bans.
+
+Parent, child, sister, and rank relationships are intentionally out of scope for the core permission model. Apps may build discovery or directory surfaces separately.
+
+### Membership Derivation
+
+Membership is sourced from the community definition and from validated kind `8` membership awards. This produces three populations:
+
+- **Founder** -- the `pubkey` field on the kind `34550` event. One per community, immutable. Controls the community definition since only they can republish the addressable event.
+- **Moderators** -- the `p` tags on the kind `34550` event with role `"moderator"` (matching [NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md)). Mutable by republishing the community definition.
+- **Members** -- pubkeys named in `p` tags on kind `8` badge awards that reference the community's member badge and are authored by the founder or a current moderator.
+
+The founder and moderators have no membership badge requirement. Their leadership status comes from the community definition itself. Members cannot grant membership to other members.
+
+### Community Definition
+
+A kind `34550` event defines the community, extending [NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md) with one badge `a` tag that identifies the member badge.
+
+#### Tags
+
+| Tag | Required | Description |
+|-----|----------|-------------|
+| `d` | Yes | Unique community identifier (UUID recommended). |
+| `name` | Yes | Human-readable name. |
+| `description` | No | Community description. |
+| `image` | No | Image URL. |
+| `a` | Yes (1) | Member badge definition reference with role marker `"member"`. |
+| `p` | No | Moderator pubkeys. The 4th element SHOULD be `"moderator"`. |
+| `relay` | No | Recommended relay URL for community content (per [NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md)). |
+| `alt` | No | [NIP-31](https://github.com/nostr-protocol/nips/blob/master/31.md) description. |
+
+#### Badge `a` Tag Format
+
+```
+["a", "30009:<pubkey>:<badge-d-tag>", "<relay-hint>", "member"]
+```
+
+The fourth element is a strict protocol marker, not a display label. Communities can still use the badge definition's `name`, `description`, and `image` tags for expressive member labels.
+
+#### Example
+
+```jsonc
+{
+  "kind": 34550,
+  "pubkey": "<founder-pubkey>",
+  "content": "",
+  "tags": [
+    ["d", "a1b2c3d4-e5f6-7890-abcd-ef1234567890"],
+    ["name", "The Arbiter's Guard"],
+    ["description", "Elite Halo 2 clan"],
+    ["image", "https://example.com/clan-banner.jpg"],
+    ["a", "30009:<founder-pubkey>:a1b2c3d4-...-member", "", "member"],
+    ["p", "<co-moderator-pubkey>", "", "moderator"],
+    ["relay", "wss://relay.example.com"],
+    ["alt", "Community: The Arbiter's Guard"]
+  ]
+}
+```
+
+### Badge Definitions
+
+The member badge is a standard [NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md) kind `30009` badge definition published by the founder. The badge definition SHOULD be published **before** the community definition that references it.
+
+The `d` tag SHOULD use the format `<community-d-tag>-member` for global uniqueness.
+
+```jsonc
+{
+  "kind": 30009,
+  "pubkey": "<founder-pubkey>",
+  "content": "",
+  "tags": [
+    ["d", "a1b2c3d4-...-member"],
+    ["name", "Member"],
+    ["description", "Member of The Arbiter's Guard"],
+    ["image", "https://example.com/member-badge.png"],
+    ["alt", "Badge definition: Member of The Arbiter's Guard"]
+  ]
+}
+```
+
+### Badge Awards
+
+Membership is established through kind `8` badge awards ([NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md)). Each valid award grants membership directly.
+
+A badge award is **valid** if and only if:
+
+1. The `a` tag references the member badge listed in the community definition.
+2. The award author is the founder or a moderator listed in the community definition currently being evaluated.
+3. The award contains at least one `p` tag naming an awarded pubkey.
+
+```jsonc
+// Moderator awarding community membership
+{
+  "kind": 8,
+  "pubkey": "<moderator-pubkey>",
+  "content": "",
+  "tags": [
+    ["a", "30009:<founder-pubkey>:a1b2c3d4-...-member"],
+    ["p", "<recipient-pubkey>"],
+    ["alt", "Badge award: Staff in The Arbiter's Guard"]
+  ]
+}
+```
+
+### Membership Validation
+
+Membership is resolved with indexed relay filters. There is no recursive authority graph.
+
+#### Algorithm
+
+1. Fetch the community definition using kind `34550`, the founder pubkey, and the community `d` tag.
+2. Extract the founder pubkey, moderator pubkeys, and member badge coordinate.
+3. Query awards: `{ kinds: [8], authors: [<founder>, ...<moderators>], #a: [<member-badge-coordinate>] }`.
+4. Flatten `p` tags from matching awards.
+5. The member set is the union of the founder, current moderators, and awarded pubkeys.
+6. Resolve moderation and apply moderation overlays.
+
+The `authors` filter is the primary membership-award trust boundary. Awards from non-founder, non-moderator pubkeys are not valid community membership awards.
+
+### Community-Scoped Content
+
+Community-scoped content is any event that tags the community definition with uppercase `A`. The foundation implementation starts with kind `1111` ([NIP-22](https://github.com/nostr-protocol/nips/blob/master/22.md)) posts, but the same moderation overlay applies to future community content kinds such as calendar events, polls, listings, or other domain-specific events.
+
+Clients MAY offer a members-only view that filters community posts down to the resolved member set as an `authors` filter. Whether this is on by default, opt-in, or omitted entirely is a client UX choice -- the protocol makes no recommendation.
+
+#### Community Post
+
+Community discussion uses kind `1111` scoped to the community definition as the root event.
+
+#### Top-Level Post
+
+```jsonc
+{
+  "kind": 1111,
+  "content": "Hello clan!",
+  "tags": [
+    ["A", "34550:<founder-pubkey>:<community-d-tag>", "<relay-hint>"],
+    ["K", "34550"],
+    ["P", "<founder-pubkey>", "<relay-hint>"],
+    ["a", "34550:<founder-pubkey>:<community-d-tag>", "<relay-hint>"],
+    ["k", "34550"],
+    ["p", "<founder-pubkey>", "<relay-hint>"]
+  ]
+}
+```
+
+#### Reply
+
+Replies keep the community as root scope and point to the parent comment:
+
+```jsonc
+{
+  "kind": 1111,
+  "content": "Great point!",
+  "tags": [
+    ["A", "34550:<founder-pubkey>:<community-d-tag>", "<relay-hint>"],
+    ["K", "34550"],
+    ["P", "<founder-pubkey>", "<relay-hint>"],
+    ["e", "<parent-comment-id>", "<relay-hint>", "<parent-author-pubkey>"],
+    ["k", "1111"],
+    ["p", "<parent-author-pubkey>", "<relay-hint>"]
+  ]
+}
+```
+
+#### Querying
+
+Clients MAY use the resolved member set as an `authors` filter for members-only views.
+
+```jsonc
+{
+  "kinds": [1111],
+  "#A": ["34550:<founder-pubkey>:<community-d-tag>"],
+  "authors": ["<founder>", "<moderator>", "<member>"]
+}
+```
+
+The moderation overlay is content-kind agnostic: a valid content ban or warning applies to the targeted event regardless of whether that event is a post, calendar event, poll, listing, or future supported kind.
+
+### Moderation
+
+Moderation uses kind `1984` ([NIP-56](https://github.com/nostr-protocol/nips/blob/master/56.md)) scoped to the community via the uppercase `A` tag. Moderation is derived state: clients first resolve trusted moderation actions from kind `1984`, then apply those actions to concrete community-scoped events.
+
+There are two moderation event classes:
+
+1. **Bans** -- authoritative actions that remove content or ban users. Identified by the presence of [NIP-32](https://github.com/nostr-protocol/nips/blob/master/32.md) label tags `["L", "moderation"]` and `["l", "ban", "moderation"]`.
+2. **Reports** -- soft flags from any valid community member using standard [NIP-56](https://github.com/nostr-protocol/nips/blob/master/56.md) report types (`nudity`, `spam`, `profanity`, `illegal`, `malware`, `impersonation`, `other`). No `L`/`l` tags. Clients display a content warning that users must click through to reveal.
+
+Kind `1984` events from **non-members** are ignored entirely within community context. Kind `1984` events from members who are themselves banned are also ignored after ban resolution; banned members cannot retain moderation or reporting authority.
+
+#### Bans (Authoritative Moderation)
+
+A ban is **authoritative** if and only if:
+
+1. The event contains `["l", "ban", "moderation"]` and `["L", "moderation"]` tags.
+2. The publisher is a validated community member.
+3. The publisher is not themselves banned after ban resolution.
+4. The publisher's authority covers the target:
+   - founder/moderators may ban member and non-member authors/content;
+   - members may ban only non-member authors/content.
+
+Bans that fail any of these conditions MUST be ignored.
+
+##### Content Ban
+
+Ban a specific post by publishing kind `1984` with `e`, `p`, and `A` tags plus the `ban` label. The `e` and `p` tags use `"other"` as the NIP-56 report type since the action is administrative rather than categorical.
+
+```jsonc
+{
+  "kind": 1984,
+  "pubkey": "<moderator-pubkey>",
+  "content": "Reason for removal",
+  "tags": [
+    ["e", "<offending-event-id>", "other"],
+    ["p", "<offending-author-pubkey>", "other"],
+    ["A", "34550:<founder-pubkey>:<community-d-tag>"],
+    ["L", "moderation"],
+    ["l", "ban", "moderation"]
+  ]
+}
+```
+
+Clients MUST omit the banned event from canonical community feeds entirely. The event is not displayed, blurred, or indicated in any way -- it is treated as if it does not exist.
+
+The `e` and `p` tags are untrusted until matched against the actual target event. A content ban MUST only apply when the targeted event's `id` matches the ban's `e` tag and the targeted event's `pubkey` matches the ban's `p` tag. This prevents a malicious or mistaken report from hiding an event by pairing its event ID with a different target pubkey.
+
+##### Member Ban
+
+Ban an author by publishing kind `1984` with `p` and `A` tags only (no `e` tag) plus the `ban` label. Founder/moderator-authored bans may target members or non-members. Member-authored bans may target non-members only.
+
+```jsonc
+{
+  "kind": 1984,
+  "pubkey": "<moderator-pubkey>",
+  "content": "Reason for ban",
+  "tags": [
+    ["p", "<banned-pubkey>", "other"],
+    ["A", "34550:<founder-pubkey>:<community-d-tag>"],
+    ["L", "moderation"],
+    ["l", "ban", "moderation"]
+  ]
+}
+```
+
+Clients distinguish content bans (`e` + `p` + `A` + `ban` label) from member bans (`p` + `A` + `ban` label, no `e` tag).
+
+#### Reports (Content Warnings)
+
+Any **valid, non-banned community member** may report content by publishing kind `1984` with a standard NIP-56 report type on the `e` and `p` tags. Reports do NOT use `L`/`l` label tags.
+
+```jsonc
+{
+  "kind": 1984,
+  "pubkey": "<member-pubkey>",
+  "content": "Additional context",
+  "tags": [
+    ["e", "<event-id>", "nudity"],
+    ["p", "<author-pubkey>", "nudity"],
+    ["A", "34550:<founder-pubkey>:<community-d-tag>"]
+  ]
+}
+```
+
+Clients SHOULD display reported content behind a content warning overlay that requires user interaction to reveal. The report type (e.g. `nudity`, `spam`) MAY be shown in the warning. Multiple reports on the same event reinforce the warning but do not automatically escalate to a ban.
+
+Reports from non-members and banned members are ignored.
+
+As with content bans, report warnings MUST only attach to content when the target event's `id` matches the report's `e` tag and the target event's `pubkey` matches the report's `p` tag.
+
+#### Classification Summary
+
+| `l` tag present? | `e` tag present? | Authority check | Result |
+|---|---|---|---|
+| `["l", "ban", "moderation"]` | Yes | Founder/moderator, or member targeting non-member content; `e`/`p` match target event | Content ban (omit event) |
+| `["l", "ban", "moderation"]` | No | Founder/moderator, or member targeting non-member author | Author ban |
+| No | Yes | Non-banned member; `e`/`p` match target event | Content warning |
+| No | No | -- | Invalid (ignored) |
+| Any | Any | Non-member | Ignored |
+| Any | Any | Banned member | Ignored |
+
+### Community Updates
+
+Both kind `34550` and kind `30009` are addressable events. To change the member badge or update moderators, republish the community definition. Only the founder (event publisher) can republish the community definition. If a moderator is removed, their authored membership awards no longer count because they are excluded from the authorized awarder query.
+
+### Discovery
+
+**Communities founded by a user:**
+
+```jsonc
+{ "kinds": [34550], "authors": ["<user-pubkey>"] }
+```
+
+**Communities a user belongs to:**
+
+1. `{ "kinds": [8], "#p": ["<user-pubkey>"] }`
+2. Extract badge `a` tags from results.
+3. `{ "kinds": [34550], "#a": ["30009:...", "..."] }`
+4. Keep only communities whose `member` badge reference matches the award badge coordinate.
+
+**Communities a user has bookmarked:**
+
+Agora uses [NIP-51](https://github.com/nostr-protocol/nips/blob/master/51.md) kind `10004` ("Communities") to let users save communities they want quick access to without requiring membership. Bookmarked communities are surfaced in the "My Communities" view alongside founded and member-of communities.
+
+1. `{ "kinds": [10004], "authors": ["<user-pubkey>"], "limit": 1 }`
+2. Extract `a` tags whose value begins with `34550:` from the result.
+3. For each coordinate `34550:<author-pubkey>:<d-tag>`, query the community definition with both `authors` and `#d` filters to prevent spoofing:
+
+   ```jsonc
+   { "kinds": [34550], "authors": ["<author-pubkey>"], "#d": ["<d-tag>"], "limit": 1 }
+   ```
+
+Clients toggling a bookmark MUST perform a read-modify-write cycle on the replaceable kind `10004` event: fetch the freshest version from relays, add or remove the matching `["a", "34550:<pubkey>:<d-tag>"]` tag, and republish the full tag list. Appending new entries to the end preserves chronological bookmark order per NIP-51.
+
+When the same community appears in multiple discovery sources, clients SHOULD display a single card but MAY indicate all applicable relationships (e.g. a member who has also bookmarked a community).
+
+### Security Considerations
+
+- **Author filtering**: Clients MUST filter community definitions by `authors` to prevent impersonation.
+- **Award author filtering is required**: Query member badge awards with `authors: [founder, ...moderators]`.
+- **Badge d-tag uniqueness**: Use `<community-d-tag>-member` to prevent cross-community collisions.
+- **Badge acceptance is cosmetic**: NIP-58 kind `10008`/`30008` events have no effect on community membership.
+
+### Dependencies
+
+- [NIP-22](https://github.com/nostr-protocol/nips/blob/master/22.md) -- Comment
+- [NIP-31](https://github.com/nostr-protocol/nips/blob/master/31.md) -- Unknown Event Kinds (`alt` tag)
+- [NIP-32](https://github.com/nostr-protocol/nips/blob/master/32.md) -- Labeling (moderation `ban` label)
+- [NIP-51](https://github.com/nostr-protocol/nips/blob/master/51.md) -- Lists (kind `10004` Communities list for bookmarks)
+- [NIP-56](https://github.com/nostr-protocol/nips/blob/master/56.md) -- Reporting
+- [NIP-58](https://github.com/nostr-protocol/nips/blob/master/58.md) -- Badges
+- [NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md) -- Moderated Communities
+
+---
+
+## Community Fundraising Goals (NIP-75)
+
+### Summary
+
+Communities can host fundraising campaigns using [NIP-75 Zap Goals](https://github.com/nostr-protocol/nips/blob/master/75.md) (kind `9041`). A zap goal linked to a community allows members and supporters to contribute sats toward a shared target.
+
+### Linking Goals to Communities
+
+A zap goal is linked to a community by including an `a` tag pointing to the community's kind `34550` definition:
+
+```json
+{
+  "kind": 9041,
+  "content": "Community meetup travel fund",
+  "tags": [
+    ["amount", "500000000"],
+    ["relays", "wss://relay.ditto.pub", "wss://relay.primal.net"],
+    ["a", "34550:<community-author-pubkey>:<community-d-identifier>"],
+    ["alt", "Zap goal: Community meetup travel fund"],
+    ["summary", "Help fund travel for our annual meetup"],
+    ["image", "https://example.com/meetup.jpg"],
+    ["closed_at", "1735689600"]
+  ]
+}
+```
+
+### Required Tags (per NIP-75)
+
+- `amount` -- Target amount in millisatoshis
+- `relays` -- Relay URLs where zaps should be sent and tallied from
+
+### Optional Tags (per NIP-75)
+
+- `closed_at` -- Unix timestamp deadline; zap receipts after this time are excluded from the tally
+- `image` -- Image URL for the goal
+- `summary` -- Brief description
+
+### Additional Tags (Agora-specific)
+
+- `a` -- Community link (`34550:<pubkey>:<d-tag>`) scoping the goal to a community
+- `alt` -- NIP-31 human-readable description
+
+### Querying
+
+Community goals are queried by filtering on the `a` tag:
+
+```
+{ "kinds": [9041], "#a": ["34550:<pubkey>:<d-tag>"], "limit": 50 }
+```
+
+### Progress Tallying
+
+Goal progress is calculated from kind `9735` zap receipts targeting the goal event:
+
+```
+{ "kinds": [9735], "#e": ["<goal-event-id>"], "limit": 500 }
+```
+
+Receipts with `created_at` after the `closed_at` deadline (if set) are excluded from the tally.
+
+### Access Control
+
+Anyone may create a zap goal linked to a community. The existing community members-only feed filter controls whether non-member goals are displayed. Anyone may zap a goal.
+
+### Dependencies
+
+- [NIP-57](https://github.com/nostr-protocol/nips/blob/master/57.md) -- Lightning Zaps
+- [NIP-72](https://github.com/nostr-protocol/nips/blob/master/72.md) -- Moderated Communities
+- [NIP-75](https://github.com/nostr-protocol/nips/blob/master/75.md) -- Zap Goals
+
+---
+
 ## Kind 0 Extension: Avatar Shape
 
 ### Summary
@@ -351,13 +931,3 @@ NIP-44 encrypted personal letters with visual stationery, hand-drawn stickers, d
 **Firmware:** https://github.com/samthomson/weather-station
 
 Kind 16158 (replaceable) describes a weather station's configuration: name, geohash location, elevation, power source, connectivity, and sensor inventory. Kind 4223 (regular) carries individual sensor readings as 3-parameter tags `[sensor_type, value, model]`, enabling historical queries and cross-station comparison. Each station has its own keypair.
-
-### Blobbi Virtual Pet (Kinds 31124, 14919, 14920, 14921, 11125)
-
-**Author:** Danifra
-**Spec:** https://github.com/Danidfra/nostr-pet/blob/production/NIP.md
-**App:** https://nostr-pet.vercel.app
-**See also:** [Blobbi tag schema](docs/blobbi/blobbi-tag-schema.md) (Ditto-specific integration details)
-
-NIP-BB defines a virtual pet lifecycle on Nostr. Kind 31124 (addressable) holds the current pet state across three stages (egg, baby, adult) with stats, appearance, and personality traits. Kind 14919 logs individual interactions, kind 14920 records breeding events, kind 14921 stores immutable lifecycle records, and kind 11125 (replaceable) holds the owner's profile with coins, achievements, and inventory.
-

README.md

@@ -1,24 +1,25 @@
-# Ditto
+# Agora
 
-Your content. Your vibe. Your rules. A fun, customizable [Nostr](https://nostr.com/) client that puts you in control.
+Power to the people.
 
-**[ditto.pub](https://ditto.pub)** | **[Docs](https://docs.ditto.pub)** | **[Source](https://gitlab.com/soapbox-pub/ditto)**
+Agora is a Nostr client focused on community ownership, expressive identity, and censorship resistance. This repository (`agora-3`) is the Agora-branded app built from the Ditto codebase.
 
-## About
+**[agora.spot](https://agora.spot)** | **[Source](https://gitlab.com/soapbox-pub/agora-3)**
 
-Ditto is an open-source, decentralized social media client built on the Nostr protocol. It's designed for people who want to have fun online without feeding the Big Tech machine. Express yourself with custom themes, Lightning payments, and an ever-growing set of content types -- all while owning your identity and data.
+## What This Repo Is
 
-Made by [Soapbox](https://soapbox.pub).
+- Agora product identity (name, theme, assets, native IDs)
+- Ditto-derived implementation with broad Nostr feature coverage
+- Configurable deployment defaults via `agora.json`
 
 ## Features
 
-- **Theming** -- 9 built-in theme presets, 19 CSS token properties for full customization, and the ability to publish and share themes as Nostr events
-- **Infinite Content Types** -- Text notes, articles, short-form videos (Divines), live streams, polls, follow packs, color moments, magic decks, geocaching, and Webxdc mini-apps
-- **Lightning Payments** -- Zap posts and profiles with sats via Nostr Wallet Connect (NWC) or WebLN
-- **Private Messaging** -- End-to-end encrypted DMs (NIP-04 and NIP-17)
-- **Comments** -- Comment on anything: posts, URLs, profiles, hashtags, books, and more (NIP-22)
-- **Self-Hosting** -- Builds to static HTML/JS/CSS. Deploy anywhere -- GitHub Pages, Netlify, Vercel, a VPS, or a Raspberry Pi
-- **Mobile** -- Android native app via Capacitor, responsive design for all screen sizes
+- **Community-first social client**: notes, articles, comments, reposts, reactions, and rich event rendering
+- **Theming system**: built-in presets + custom color/font/background themes that can be shared as events
+- **Lightning support**: zaps with Nostr Wallet Connect and WebLN
+- **Private messaging**: NIP-04 and NIP-17 direct messages
+- **Mobile app shell**: Capacitor-powered Android/iOS wrappers
+- **Self-hostable**: static web build + configurable relay and upload infrastructure
 
 ## Getting Started
 
@@ -30,13 +31,43 @@ Made by [Soapbox](https://soapbox.pub).
 ### Development
 
 ```sh
-git clone https://gitlab.com/soapbox-pub/ditto.git
-cd ditto
+git clone https://gitlab.com/soapbox-pub/agora-3.git
+cd agora-3
 npm install
 npm run dev
 ```
 
-The dev server starts at `http://localhost:8080`.
+Development server: `http://localhost:8080`
+
+### Docker Getting Started
+
+Use Docker Compose when you want the nginx reverse-proxy stack (necessary if you want decryptable media in messages - kind 15s of NIP 17):
+
+```sh
+git clone https://gitlab.com/soapbox-pub/agora-3.git
+cd agora-3
+cp .env.example .env
+docker compose up --build
+```
+
+Proxy URL: `http://localhost:8083`
+
+This starts:
+
+- `vite` service on the internal Docker network (`vite:8080`)
+- `web` service (`nginx`) on host port `8082`, proxying to Vite with websocket support
+
+Stop stack:
+
+```sh
+docker compose down
+```
+
+Production-style container build:
+
+```sh
+docker compose -f docker-compose.prod.yml up --build
+```
 
 ### Build
 
@@ -44,66 +75,58 @@ The dev server starts at `http://localhost:8080`.
 npm run build
 ```
 
-The built site is output to `dist/`.
+Build output: `dist/`
 
-### Test
-
-Runs type-checking, linting, unit tests, and a production build:
+### Validate
 
 ```sh
 npm test
 ```
 
+This runs type-checking, linting, unit tests, and production build checks.
+
 ## Configuration
 
-Ditto is configured through a `ditto.json` file at the project root, read at build time. This file is gitignored so each deployment can have its own configuration.
+Build-time config is read from `agora.json` (gitignored by default so each deployment can provide its own values).
 
 ```jsonc
 {
   "theme": "dark",
   "relayMetadata": {
     "relays": [
-      { "url": "wss://relay.ditto.pub", "read": true, "write": true }
+      { "url": "wss://relay.ditto.pub", "read": true, "write": true },
+      { "url": "wss://relay.primal.net", "read": true, "write": true },
+      { "url": "wss://relay.damus.io", "read": true, "write": true }
     ]
   },
-  "blossomServers": ["https://blossom.ditto.pub"],
-  "feedSettings": {
-    "showPosts": true,
-    "showReposts": true,
-    "showArticles": true
-    // ...and more content type toggles
-  }
+  "blossomServers": [
+    "https://blossom.ditto.pub",
+    "https://blossom.primal.net/"
+  ]
 }
 ```
 
-Configuration is resolved in three layers (highest priority first):
+Configuration priority (highest first):
 
-1. **User settings** stored in localStorage
-2. **Build config** from `ditto.json`
-3. **Hardcoded defaults**
+1. User settings (local storage)
+2. Build config (`agora.json`)
+3. Hardcoded app defaults
 
-Use an alternate config file path with: `CONFIG_FILE=./my-config.json npm run build`
+Use a custom config path:
 
-### Custom Branding
-
-For self-hosted instances:
-
-- Replace `public/logo.svg` and `public/logo.png` with your logo
-- Update the app name in `index.html` and `public/manifest.webmanifest`
-- Replace `public/og-image.jpg` for social sharing previews
-- Set default relays and upload servers in `ditto.json`
+```sh
+CONFIG_FILE=./my-config.json npm run build
+```
 
 ## Deployment
 
-Ditto builds to static files and can be deployed anywhere that serves HTML.
+Agora builds to static files and can be deployed to any static host.
 
-- **GitHub Pages / GitLab Pages** -- Push to `main` and CI auto-deploys
-- **Netlify / Vercel** -- Connect your fork and deploy. A `_redirects` file is included for SPA routing
-- **VPS / Any web server** -- Build and copy `dist/` to your server. Configure SPA routing (e.g., Nginx `try_files $uri $uri/ /index.html`)
+- GitLab/GitHub Pages
+- Netlify/Vercel
+- VPS or any web server with SPA routing fallback
 
-### Android
-
-Build a native Android app with [Capacitor](https://capacitorjs.com/):
+For Android:
 
 ```sh
 npm run build
@@ -114,40 +137,20 @@ npx cap open android
 ## Tech Stack
 
 | Layer | Technology |
-|---|---|
+| --- | --- |
 | Framework | React 18 |
 | Build | Vite |
 | Language | TypeScript |
 | Styling | TailwindCSS 3 + shadcn/ui |
-| Routing | React Router 6 |
+| Routing | React Router |
 | Data | TanStack Query |
 | Nostr | Nostrify + nostr-tools |
 | Mobile | Capacitor |
 | Testing | Vitest + React Testing Library |
 
-## Project Structure
-
-```
-src/
-  components/     UI components (100+), including shadcn/ui primitives
-  hooks/          Custom React hooks (65+)
-  pages/          Page components for each route (30+)
-  contexts/       React context providers
-  lib/            Utilities and shared logic
-  test/           Test setup and helpers
-public/           Static assets, icons, manifest
-```
-
 ## Contributing
 
-We welcome contributions but have high standards. Please read the full [Contributing Guide](CONTRIBUTING.md) before submitting a merge request. The short version:
-
-- **Bug fixes**: One bug, one MR. Keep it small and focused.
-- **New features**: Must link to an existing issue and align with the [Ditto Philosophy](https://about.ditto.pub/philosophy).
-- **Required**: Live preview URL, before/after screenshots, completed self-review checklist.
-- **Required tools**: Claude Opus 4.6 (or latest frontier model), an AI coding agent with plan mode.
-
-Read the [Ditto Philosophy](https://about.ditto.pub/philosophy) to understand what Ditto is and isn't.
+Read [CONTRIBUTING.md](CONTRIBUTING.md) before opening a merge request.
 
 ## License
 

android/app/build.gradle

@@ -7,14 +7,14 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    namespace = "pub.ditto.app"
+    namespace = "pub.agora.app"
     compileSdk = rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "pub.ditto.app"
+        applicationId "pub.agora.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "2.6.3"
+        versionName "2.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -11,10 +11,11 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
     implementation project(':capacitor-filesystem')
+    implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-share')
-    implementation project(':capacitor-status-bar')
+    implementation project(':capgo-capacitor-autofill-save-password')
     implementation project(':capacitor-secure-storage-plugin')
 
 }

android/app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -22,12 +24,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <!-- Deep links: open ditto.pub URLs in the app -->
+            <!-- Deep links: open agora.spot URLs in the app -->
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="ditto.pub" />
+                <data android:scheme="https" android:host="agora.spot" />
             </intent-filter>
 
         </activity>

android/app/src/main/java/pub/ditto/app/SandboxPlugin.java

@@ -1,10 +1,12 @@
 package pub.ditto.app;
 
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Base64;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.JavascriptInterface;
@@ -13,6 +15,8 @@ import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.FrameLayout;
+import android.widget.ProgressBar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.getcapacitor.JSObject;
@@ -30,6 +34,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Capacitor plugin that creates isolated Android WebViews for sandboxed content.
@@ -79,19 +85,41 @@ public class SandboxPlugin extends Plugin {
             SandboxInstance sandbox = new SandboxInstance(sandboxId, this);
             sandboxes.put(sandboxId, sandbox);
 
-            // Add the WebView on top of the Capacitor WebView.
-            // The parent is a CoordinatorLayout — using the wrong LayoutParams
-            // type causes a ClassCastException when it intercepts touch events.
+            // Add the container (WebView + spinner overlay) on top of the
+            // Capacitor WebView. The parent is a CoordinatorLayout — using
+            // the wrong LayoutParams type causes a ClassCastException when
+            // it intercepts touch events.
             View capWebView = getBridge().getWebView();
             ViewGroup parent = (ViewGroup) capWebView.getParent();
             CoordinatorLayout.LayoutParams params = new CoordinatorLayout.LayoutParams(pxWidth, pxHeight);
             params.leftMargin = pxX;
             params.topMargin = pxY;
-            parent.addView(sandbox.webView, params);
+            parent.addView(sandbox.container, params);
+
+            // The spinner is now visible. Navigation is deferred until the
+            // JS layer calls navigate() — this allows the caller to
+            // pre-fetch blobs while the spinner animates.
+
+            call.resolve();
+        });
+    }
+
+    @PluginMethod
+    public void navigate(PluginCall call) {
+        String sandboxId = call.getString("id");
+        if (sandboxId == null) {
+            call.reject("Missing required parameter: id");
+            return;
+        }
+
+        mainHandler.post(() -> {
+            SandboxInstance sandbox = sandboxes.get(sandboxId);
+            if (sandbox == null) {
+                call.reject("Sandbox not found: " + sandboxId);
+                return;
+            }
 
-            // Load the initial page.
             sandbox.webView.loadUrl("https://" + sandboxId + ".sandbox.native/index.html");
-
             call.resolve();
         });
     }
@@ -131,7 +159,7 @@ public class SandboxPlugin extends Plugin {
             CoordinatorLayout.LayoutParams params = new CoordinatorLayout.LayoutParams(pxWidth, pxHeight);
             params.leftMargin = pxX;
             params.topMargin = pxY;
-            sandbox.webView.setLayoutParams(params);
+            sandbox.container.setLayoutParams(params);
 
             call.resolve();
         });
@@ -214,9 +242,9 @@ public class SandboxPlugin extends Plugin {
         mainHandler.post(() -> {
             SandboxInstance sandbox = sandboxes.remove(sandboxId);
             if (sandbox != null) {
-                ViewGroup parent = (ViewGroup) sandbox.webView.getParent();
+                ViewGroup parent = (ViewGroup) sandbox.container.getParent();
                 if (parent != null) {
-                    parent.removeView(sandbox.webView);
+                    parent.removeView(sandbox.container);
                 }
                 sandbox.webView.destroy();
             }
@@ -244,13 +272,19 @@ public class SandboxPlugin extends Plugin {
      */
     private static class SandboxInstance {
         final String id;
+        /** Wrapper layout that holds the WebView and the loading overlay. */
+        final FrameLayout container;
         final WebView webView;
         final SandboxPlugin plugin;
         private final ConcurrentHashMap<String, PendingRequest> pendingRequests = new ConcurrentHashMap<>();
+        /** Native spinner overlay, shown while the sandbox content loads. */
+        private ProgressBar spinner;
 
         SandboxInstance(String id, SandboxPlugin plugin) {
             this.id = id;
             this.plugin = plugin;
+
+            this.container = new FrameLayout(plugin.getActivity());
             this.webView = new WebView(plugin.getActivity());
 
             WebSettings settings = webView.getSettings();
@@ -260,13 +294,53 @@ public class SandboxPlugin extends Plugin {
             settings.setAllowContentAccess(false);
             settings.setDatabaseEnabled(true);
 
-            webView.setBackgroundColor(Color.WHITE);
+            webView.setBackgroundColor(Color.parseColor("#14161f"));
 
             // Add JavaScript interface for script->native communication.
             webView.addJavascriptInterface(new SandboxBridge(this), "__sandboxNative");
 
             // Inject the bridge script and intercept requests.
             webView.setWebViewClient(new SandboxWebViewClient(this));
+
+            // Build the container: WebView fills it, spinner overlays on top.
+            container.addView(webView, new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT));
+
+            // Native spinner overlay — uses the Android indeterminate
+            // ProgressBar which animates on the render thread, so it keeps
+            // spinning even when the main/IO threads are busy.
+            spinner = new ProgressBar(plugin.getActivity());
+            spinner.setIndeterminate(true);
+            spinner.getIndeterminateDrawable().setColorFilter(
+                    Color.parseColor("#7c5cdc"), PorterDuff.Mode.SRC_IN);
+            FrameLayout.LayoutParams spinnerParams = new FrameLayout.LayoutParams(
+                    dpToPx(plugin, 32), dpToPx(plugin, 32), Gravity.CENTER);
+            container.addView(spinner, spinnerParams);
+
+            // Dark background behind the spinner.
+            View overlay = new View(plugin.getActivity());
+            overlay.setBackgroundColor(Color.parseColor("#14161f"));
+            // Insert the overlay between the WebView (index 0) and spinner (index 1)
+            // so it covers the WebView but sits behind the spinner.
+            container.addView(overlay, 1, new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+
+        /** Remove the native loading overlay. Safe to call multiple times. */
+        void hideSpinner() {
+            if (spinner != null) {
+                // Remove spinner and overlay (indices 2 and 1 after WebView at 0).
+                if (container.getChildCount() > 2) container.removeViewAt(2); // spinner
+                if (container.getChildCount() > 1) container.removeViewAt(1); // overlay
+                spinner = null;
+            }
+        }
+
+        private static int dpToPx(SandboxPlugin plugin, int dp) {
+            float density = plugin.getActivity().getResources().getDisplayMetrics().density;
+            return Math.round(dp * density);
         }
 
         void postMessageToWebView(String jsonString) {
@@ -353,8 +427,11 @@ public class SandboxPlugin extends Plugin {
             // Emit to JS.
             sandbox.plugin.emitFetchRequest(sandbox.id, requestId, serialisedRequest);
 
-            // Block this thread until JS responds (with a timeout).
-            WebResourceResponse response = pending.awaitResponse(10000);
+            // Block until JS responds. Each asset is fetched from a Blossom
+            // server over the network, so we need a generous timeout.  The
+            // WebView IO thread pool has ~6 threads; if all are blocked,
+            // subsequent requests queue until a thread frees up.
+            WebResourceResponse response = pending.awaitResponse(60000);
 
             if (response != null) {
                 return response;
@@ -377,6 +454,11 @@ public class SandboxPlugin extends Plugin {
                 bridgeInjected = true;
                 view.evaluateJavascript(getBridgeScript(), null);
             }
+
+            // Remove the native spinner once the first page has finished
+            // loading (all initial resources resolved). This runs on the
+            // main thread, so the removal is safe.
+            sandbox.hideSpinner();
         }
 
         private String getBridgeScript() {
@@ -446,11 +528,12 @@ public class SandboxPlugin extends Plugin {
     }
 
     /**
-     * A pending request that blocks the WebViewClient thread until resolved.
+     * A pending request that blocks the WebViewClient IO thread until JS
+     * responds with the complete resource.
      */
     private static class PendingRequest {
-        private WebResourceResponse response;
-        private final java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1);
+        private volatile WebResourceResponse response;
+        private final CountDownLatch latch = new CountDownLatch(1);
 
         void resolve(WebResourceResponse response) {
             this.response = response;
@@ -459,7 +542,7 @@ public class SandboxPlugin extends Plugin {
 
         WebResourceResponse awaitResponse(long timeoutMs) {
             try {
-                latch.await(timeoutMs, java.util.concurrent.TimeUnit.MILLISECONDS);
+                latch.await(timeoutMs, TimeUnit.MILLISECONDS);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
             }

android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">Ditto</string>
-    <string name="title_activity_main">Ditto</string>
-    <string name="package_name">pub.ditto.app</string>
-    <string name="custom_url_scheme">pub.ditto.app</string>
+    <string name="app_name">Agora</string>
+    <string name="title_activity_main">Agora</string>
+    <string name="package_name">pub.agora.app</string>
+    <string name="custom_url_scheme">pub.agora.app</string>
 </resources>

android/app/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Android Auto Backup rules (Android 11 and below).
+
+    Ditto excludes WebView storage (Local Storage, IndexedDB, databases) and
+    any shared_prefs that hold sensitive credentials so they don't end up in
+    Google Drive backups. Keychain/KeyStore entries used by
+    capacitor-secure-storage-plugin are not backed up by default, so we don't
+    need to exclude those explicitly; but we also exclude the plugin's
+    SharedPreferences for defense in depth.
+
+    See: https://developer.android.com/guide/topics/data/autobackup
+-->
+<full-backup-content>
+    <!-- WebView: localStorage, IndexedDB, cookies, caches -->
+    <exclude domain="file" path="app_webview/" />
+    <exclude domain="database" path="webview.db" />
+    <exclude domain="database" path="webviewCache.db" />
+
+    <!-- capacitor-secure-storage-plugin fallback SharedPreferences -->
+    <exclude domain="sharedpref" path="CapacitorSecureStoragePluginSharedPreferences.xml" />
+
+    <!-- Capacitor preferences plugin — may contain app-level settings -->
+    <exclude domain="sharedpref" path="CapacitorStorage.xml" />
+</full-backup-content>

android/app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Android 12+ data extraction rules.
+
+    Separate rules apply to cloud backups (Google Drive) and device-to-device
+    transfers. Both exclude WebView storage and sensitive SharedPreferences so
+    wallet credentials, login tokens, and cached private data don't leak.
+
+    See: https://developer.android.com/about/versions/12/backup-restore
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="file" path="app_webview/" />
+        <exclude domain="database" path="webview.db" />
+        <exclude domain="database" path="webviewCache.db" />
+        <exclude domain="sharedpref" path="CapacitorSecureStoragePluginSharedPreferences.xml" />
+        <exclude domain="sharedpref" path="CapacitorStorage.xml" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="file" path="app_webview/" />
+        <exclude domain="database" path="webview.db" />
+        <exclude domain="database" path="webviewCache.db" />
+        <exclude domain="sharedpref" path="CapacitorSecureStoragePluginSharedPreferences.xml" />
+        <exclude domain="sharedpref" path="CapacitorStorage.xml" />
+    </device-transfer>
+</data-extraction-rules>

android/capacitor.settings.gradle

@@ -8,6 +8,9 @@ project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/
 include ':capacitor-filesystem'
 project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
 
+include ':capacitor-haptics'
+project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
 
@@ -17,8 +20,8 @@ project(':capacitor-local-notifications').projectDir = new File('../node_modules
 include ':capacitor-share'
 project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
 
-include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
+include ':capgo-capacitor-autofill-save-password'
+project(':capgo-capacitor-autofill-save-password').projectDir = new File('../node_modules/@capgo/capacitor-autofill-save-password/android')
 
 include ':capacitor-secure-storage-plugin'
 project(':capacitor-secure-storage-plugin').projectDir = new File('../node_modules/capacitor-secure-storage-plugin/android')

capacitor.config.ts

@@ -1,12 +1,10 @@
 import type { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
-  appId: 'pub.ditto.app',
-  appName: 'Ditto',
+  appId: 'pub.agora.app',
+  appName: 'Agora',
   webDir: 'dist',
   server: {
-    // Handle deep links from your domain
-    hostname: 'ditto.pub',
     androidScheme: 'https',
     iosScheme: 'https'
   },
@@ -18,11 +16,13 @@ const config: CapacitorConfig = {
   ios: {
     backgroundColor: '#14161f',
     contentInset: 'never',
-    scheme: 'Ditto'
+    scheme: 'Agora'
   },
   plugins: {
-    Keyboard: {
-      resizeOnFullScreen: true,
+    SystemBars: {
+      // Inject --safe-area-inset-* CSS variables on Android to work around
+      // a Chromium bug (<140) where env(safe-area-inset-*) reports 0.
+      insetsHandling: 'css',
     },
   },
 };

docker-compose.prod.yml

@@ -0,0 +1,6 @@
+services:
+  web:
+    build: .
+    restart: unless-stopped
+    expose:
+      - "80"

docker-compose.yml

@@ -0,0 +1,30 @@
+services:
+  web:
+    image: nginx:alpine
+    ports:
+      - "8083:80"
+    volumes:
+      - ./nginx.dev.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./dist:/usr/share/nginx/html:ro
+    restart: unless-stopped
+    depends_on:
+      - vite
+    networks:
+      - agora-network
+
+  vite:
+    image: node:22-alpine
+    working_dir: /app
+    # Use host node_modules so new dependencies are picked up after install.
+    command: sh -c "npm install && npm run dev"
+    volumes:
+      - .:/app
+    environment:
+      - NODE_ENV=development
+    networks:
+      - agora-network
+    restart: unless-stopped
+
+networks:
+  agora-network:
+    driver: bridge

docs/THEME_SYSTEM.md

@@ -1,383 +0,0 @@
-# Theme System
-
-This document describes the two separate but overlapping theme features in Ditto: the **App Theme** (which controls the local UI) and the **Profile Theme** (which is published to Nostr for others to see). Understanding the distinction is key to working with this codebase.
-
-## Overview
-
-| Concept | Purpose | Scope | Persistence |
-|---|---|---|---|
-| **App Theme** | Controls colors, fonts, and background of the local UI | Local to the user's browser | localStorage + encrypted NIP-78 sync |
-| **Profile Theme** | A set of theme values published as a Nostr event | Public, visible to other users | Kind 16767 replaceable event |
-
-The App Theme and Profile Theme share the same underlying data structure (`ThemeConfig`), and there is an optional bridge between them (`autoShareTheme`), but they are fundamentally independent systems.
-
----
-
-## Part 1: App Theme
-
-The App Theme controls what the user sees in their own browser. It has no inherent connection to Nostr.
-
-### Core Concept: 3 Colors Define Everything
-
-The entire theme is derived from just 3 core colors, defined by the `CoreThemeColors` interface in `src/themes.ts:8`:
-
-```typescript
-interface CoreThemeColors {
-  background: string;  // HSL string, e.g. "228 20% 10%"
-  text: string;        // Text/foreground color
-  primary: string;     // Primary accent (buttons, links, focus rings)
-}
-```
-
-From these 3 values, the system auto-derives 19 CSS tokens (the full `ThemeTokens` set) via `deriveTokensFromCore()` in `src/lib/colorUtils.ts:141`. The derivation algorithm:
-
-- Detects dark/light mode from background luminance (threshold: 0.2)
-- Derives `card` and `popover` surfaces by slightly lightening the background (dark mode) or using it directly (light mode)
-- Derives `secondary` and `muted` surfaces by adjusting background lightness
-- Derives `border` using the primary hue with reduced saturation
-- Computes `mutedForeground` as a dimmer version of the text color
-- Sets `accent = primary` and `ring = primary`
-- Auto-computes `primaryForeground` using WCAG contrast detection (white or dark)
-- Uses fixed red values for `destructive` / `destructiveForeground`
-
-### Theme Modes
-
-The `Theme` type (`src/contexts/AppContext.ts:9`) has four values:
-
-| Mode | Behavior |
-|---|---|
-| `"light"` | Uses the builtin (or configured) light color set |
-| `"dark"` | Uses the builtin (or configured) dark color set |
-| `"system"` | Resolves to `"light"` or `"dark"` based on `prefers-color-scheme`, with a live media query listener |
-| `"custom"` | Uses user-defined colors stored in `config.customTheme` |
-
-**Builtin themes** are defined in `src/themes.ts:102`:
-
-```typescript
-const builtinThemes = {
-  light: { background: '270 50% 97%', text: '270 25% 12%', primary: '270 65% 55%' },
-  dark:  { background: '228 20% 10%', text: '210 40% 98%', primary: '258 70% 60%' },
-};
-```
-
-Self-hosters can override these at build time via `ditto.json` (injected through `import.meta.env.DITTO_CONFIG` in `vite.config.ts`), or at runtime via the `ThemesConfig` in `AppConfig.themes`.
-
-### ThemeConfig
-
-The `ThemeConfig` type (`src/themes.ts:50`) wraps the 3 core colors with optional extras:
-
-```typescript
-interface ThemeConfig {
-  title?: string;
-  colors: CoreThemeColors;
-  font?: ThemeFont;        // { family: string; url?: string }
-  background?: ThemeBackground;  // { url: string; mode?: 'cover' | 'tile'; ... }
-}
-```
-
-This is the canonical type used everywhere: in `AppConfig.customTheme`, in encrypted settings, and in Nostr theme events.
-
-### Theme Presets
-
-Named presets are defined in `src/themes.ts:136` (e.g. `pink`, `toxic`, `sunset`). Each preset includes core colors and optionally a font and background image. Applying a preset sets the app theme to `"custom"` and stores the preset's config as `customTheme`.
-
-### How Themes Apply to the DOM
-
-The theme pipeline has three stages designed to prevent any flash of wrong colors:
-
-#### Stage 1: Pre-React Blocking Script (`public/theme.js`)
-
-A synchronous `<script>` tag in `index.html:43` runs before React mounts. It:
-
-1. Reads `nostr:app-config` from localStorage
-2. Resolves `"system"` via `matchMedia`
-3. Handles legacy presets (`"black"`, `"pink"`)
-4. Sets `document.documentElement.className` to the theme name
-5. Sets `document.body.style.background` to the correct background color
-6. Updates preloader colors (logo and spinner) to match
-
-This prevents any visible flash between the hardcoded dark defaults in `index.html:32` and the user's actual theme.
-
-#### Stage 2: React Provider (`src/components/AppProvider.tsx`)
-
-Three private hooks run during the provider's lifecycle:
-
-**`useApplyTheme`** (line 91) - Uses `useLayoutEffect` (synchronous before paint) to:
-- Resolve the theme mode
-- Build a full CSS string from `CoreThemeColors` via `buildThemeCssFromCore()`
-- Inject/update a `<style id="theme-vars">` element with all 19 CSS custom properties
-- Set `document.documentElement.className` to the resolved theme
-- Remove the inline body style left by `theme.js`
-- When mode is `"system"`, attach a `matchMedia` change listener
-
-**`useApplyFonts`** (line 133) - Loads and applies custom fonts via `loadAndApplyFont()` from `src/lib/fontLoader.ts`.
-
-**`useApplyBackground`** (line 156) - Injects/removes a `<style id="theme-background">` for background images (cover or tile mode).
-
-#### Stage 3: Theme Switch (`src/hooks/useTheme.ts`)
-
-The `setTheme()` function (line 52) performs a flicker-free theme switch:
-
-1. Injects a temporary `<style>` that disables all CSS transitions (`transition: none !important`)
-2. Synchronously builds and applies CSS vars before React re-renders
-3. Updates `document.documentElement.className`
-4. Re-enables transitions after browser paint via `requestAnimationFrame`
-5. Updates localStorage config
-6. Debounce-syncs to encrypted NIP-78 storage (1 second delay)
-
-### How Components Consume Theme Values
-
-#### CSS Custom Properties to Tailwind
-
-`tailwind.config.ts` maps all 19 CSS custom properties to Tailwind color utilities:
-
-```typescript
-colors: {
-  background: 'hsl(var(--background))',
-  foreground: 'hsl(var(--foreground))',
-  primary: { DEFAULT: 'hsl(var(--primary))', foreground: 'hsl(var(--primary-foreground))' },
-  // ... (secondary, destructive, muted, accent, popover, card, border, input, ring)
-}
-```
-
-Components use standard Tailwind classes like `bg-primary`, `text-foreground`, `border-border`, etc. These resolve to `hsl(var(--primary))`, which picks up whichever values are currently set on `:root`.
-
-The `cn()` utility in `src/lib/utils.ts` combines `clsx` (conditional class joining) with `tailwind-merge` (intelligent Tailwind class deduplication).
-
-#### Static CSS
-
-`src/index.css` applies base styles using theme tokens:
-
-```css
-* { @apply border-border; }
-body { @apply bg-background text-foreground; }
-```
-
-The only static CSS custom property is `--radius: 0.75rem`. All color variables are injected dynamically.
-
-### ScopedTheme
-
-The `ScopedTheme` component (`src/components/ScopedTheme.tsx`) applies a different set of theme colors to a DOM subtree by setting CSS variables as inline `style`:
-
-```tsx
-<ScopedTheme colors={someColors} className="rounded-lg p-4">
-  {/* Children here see different --background, --primary, etc. */}
-</ScopedTheme>
-```
-
-It also sets `data-theme-mode="dark"` or `"light"` based on background luminance, for CSS targeting.
-
-### App Theme Persistence
-
-#### Layer 1: localStorage (immediate)
-
-The `useLocalStorage` hook (`src/hooks/useLocalStorage.ts`) stores the full `AppConfig` under key `"nostr:app-config"`. This includes `theme`, `customTheme`, `autoShareTheme`, and `themes`. Changes are reflected immediately and support cross-tab sync via `StorageEvent`.
-
-#### Layer 2: Encrypted NIP-78 Settings (cross-device sync)
-
-The `useEncryptedSettings` hook (`src/hooks/useEncryptedSettings.ts`) stores theme preferences in a kind 30078 addressable event, encrypted to self via NIP-44. The `EncryptedSettings` interface includes `theme`, `customTheme`, and `autoShareTheme` among other app settings.
-
-Key behaviors:
-- Query is delayed 5 seconds after login to avoid competing with feed load
-- Uses optimistic updates with a `pendingSettings` ref for rapid successive mutations
-- A `recentlyWritten()` guard returns true for 10 seconds after a local write to prevent `NostrSync` from overwriting the value that was just saved
-
-#### Sync via NostrSync
-
-The `NostrSync` component (`src/components/NostrSync.tsx`) runs globally and syncs encrypted settings from Nostr on login. For theme-related fields, it:
-
-1. Seeds a `lastSyncedTimestamp` ref on first load to prevent stale events from overwriting local config
-2. Skips application if `recentlyWritten()` is true
-3. Only applies changes if the remote timestamp is newer
-4. Handles legacy theme value migration (`"black"`, `"pink"` to `"custom"`)
-5. Diffs each field individually to avoid unnecessary re-renders
-
----
-
-## Part 2: Profile Theme
-
-The Profile Theme is a public Nostr event that represents a user's chosen theme. Other clients can read it to style that user's profile page, or users can browse and copy each other's themes.
-
-### Nostr Event Kinds
-
-#### Kind 36767: Theme Definition (addressable, multiple per user)
-
-A shareable, named theme that a user has created. Think of these as "published theme presets." Tags:
-
-| Tag | Purpose | Example |
-|---|---|---|
-| `d` | Identifier (slug) | `["d", "ocean-night"]` |
-| `c` | Color (hex + role) | `["c", "#1a1a2e", "background"]` |
-| `f` | Font (family + optional URL) | `["f", "Comfortaa", "https://cdn.jsdelivr.net/..."]` |
-| `bg` | Background (imeta-style variadic) | `["bg", "url https://...", "mode cover", "m image/jpeg"]` |
-| `title` | Display name | `["title", "Ocean Night"]` |
-| `alt` | NIP-31 description | `["alt", "Custom theme: Ocean Night"]` |
-| `t` | Topic tag | `["t", "theme"]` |
-| `description` | Optional description | `["description", "A deep blue theme"]` |
-
-Colors are stored as **hex** in `c` tags (converted to/from HSL internally). The `content` field is empty (legacy events may have JSON in content for backward compatibility).
-
-#### Kind 16767: Active Profile Theme (replaceable, one per user)
-
-The user's currently active profile theme. Same tag structure as kind 36767 but without `d` or `description` tags, and with an optional `a` tag referencing the source theme definition:
-
-| Tag | Purpose |
-|---|---|
-| `c` | Color tags (same as 36767) |
-| `f` | Font tag (same as 36767) |
-| `bg` | Background tag (same as 36767) |
-| `alt` | Always `"Active profile theme"` |
-| `title` | Optional theme name |
-| `a` | Optional reference to source kind 36767 event |
-
-### Hooks
-
-| Hook | File | Purpose |
-|---|---|---|
-| `usePublishTheme` | `src/hooks/usePublishTheme.ts` | Publish/update/delete theme definitions (36767), set/clear active profile theme (16767) |
-| `useUserThemes` | `src/hooks/useUserThemes.ts` | Query all kind 36767 themes by a user, deduplicated by d-tag, sorted newest first |
-| `useActiveProfileTheme` | `src/hooks/useActiveProfileTheme.ts` | Query a user's kind 16767 active profile theme |
-
-### Publishing and Parsing
-
-All event building and parsing is in `src/lib/themeEvent.ts`:
-
-- `buildThemeDefinitionTags()` / `parseThemeDefinition()` - Kind 36767
-- `buildActiveThemeTags()` / `parseActiveProfileTheme()` - Kind 16767
-- `buildColorTags()` / `parseColorTags()` - HSL-to-hex conversion for `c` tags
-- `buildFontTag()` / `parseFontTag()` - Font `f` tags
-- `buildBackgroundTag()` / `parseBackgroundTag()` - Background `bg` tags (imeta-style)
-- `titleToSlug()` - Generate d-tag identifiers from titles
-
-Backward compatibility: if `c` tags are missing, the parser falls back to reading legacy JSON from `content` (handling both the old 19-token format and the 4-color format).
-
----
-
-## Part 3: The Bridge Between App Theme and Profile Theme
-
-The two systems are connected by the **autoShareTheme** setting and the NostrSync component.
-
-### App Theme -> Profile Theme
-
-When `autoShareTheme` is enabled (default: `true`) and the user applies a custom theme via `applyCustomTheme()`, the `useTheme` hook automatically publishes the custom theme as a kind 16767 active profile theme, debounced by 2 seconds.
-
-```
-User picks a custom theme
-  -> applyCustomTheme() in useTheme.ts:88
-    -> Updates local config (localStorage)
-    -> Syncs to encrypted NIP-78 storage (1s debounce)
-    -> If autoShareTheme: publishes kind 16767 (2s debounce)
-```
-
-### Profile Theme -> App Theme
-
-On page load, if `autoShareTheme` is enabled, `NostrSync` (line 174) fetches the user's kind 16767 event and applies it as `customTheme` **without changing the theme mode**. This means:
-
-- If the user is on `theme: "dark"`, their profile theme is stored as `customTheme` but the UI stays in dark mode
-- If the user is on `theme: "custom"`, the profile theme's colors are applied to the UI
-- This allows the profile theme to stay in sync across devices without forcing the user into custom mode
-
-### Theme Definitions (Kind 36767)
-
-Theme definitions are independent of the app theme. Users can create, publish, edit, and delete named themes. Other users can view them in feeds (via `ThemeUpdateCard`) and copy them. These are purely social objects on the Nostr network.
-
----
-
-## Font System
-
-Fonts are managed by `src/lib/fontLoader.ts` and `src/lib/fonts.ts`.
-
-### Bundled Fonts
-
-10 fonts are bundled via `@fontsource` packages with lazy loading (dynamic imports):
-
-| Category | Fonts |
-|---|---|
-| Sans | Inter, DM Sans, Outfit, Montserrat |
-| Serif | Lora, Merriweather, Playfair Display |
-| Mono | JetBrains Mono |
-| Display | Comfortaa |
-| Handwriting | Comic Relief |
-
-Each has a `load()` function and a `cdnUrl` for Nostr event publishing.
-
-### Font Application
-
-Three `<style>` elements manage fonts:
-
-| ID | Purpose |
-|---|---|
-| `theme-font-faces` | `@font-face` rules for remote fonts |
-| `theme-font-overrides` | `html { font-family: "CustomFont", "Inter Variable", ... !important; }` |
-| `theme-vars` | Theme CSS custom properties (not font-specific, but part of the pipeline) |
-
-The `loadAndApplyFont()` function:
-1. Tries to load via bundled `@fontsource` package first
-2. Falls back to injecting a `@font-face` rule from a remote URL
-3. Applies a global font-family override via `<style id="theme-font-overrides">`
-4. Passing `undefined` clears the override (reverts to default Inter)
-
----
-
-## Color Utilities
-
-`src/lib/colorUtils.ts` provides the color math underpinning the theme system:
-
-| Function | Purpose |
-|---|---|
-| `parseHsl` / `formatHsl` | Parse/format HSL strings (`"228 20% 10%"`) |
-| `hslToRgb` / `rgbToHsl` | HSL-RGB conversion |
-| `hexToRgb` / `rgbToHex` | Hex-RGB conversion |
-| `hexToHslString` / `hslStringToHex` | Direct hex-to-HSL-string conversion (used for Nostr `c` tags) |
-| `getLuminance` | WCAG 2.1 relative luminance |
-| `getContrastRatio` / `getContrastRatioHsl` | WCAG contrast ratio between two colors |
-| `isDarkTheme` | Determines if a background is "dark" (luminance < 0.2) |
-| `deriveTokensFromCore` | The core algorithm: 3 colors -> 19 tokens |
-| `tokensToCoreColors` | Extract 3 core colors from a legacy 19-token object |
-
-All colors are stored internally as HSL strings without the `hsl()` wrapper (e.g. `"228 20% 10%"`). The `hsl()` wrapper is added by Tailwind's config (`hsl(var(--background))`).
-
----
-
-## Validation
-
-Theme data is validated with Zod schemas in `src/lib/schemas.ts`:
-
-- `ThemeSchema` - Validates `'dark' | 'light' | 'system' | 'custom'`
-- `CoreThemeColorsSchema` - Validates the 3 HSL string fields
-- `ThemeConfigSchema` - Full config with optional font/background
-- `ThemeConfigCompatSchema` - Accepts both `ThemeConfig` and bare `CoreThemeColors`
-- `ThemeColorsCompatSchema` - Union of current 3-color, old 4-color, and legacy 19-token formats
-- `AppConfigSchema` - Full app config including all theme fields
-- `EncryptedSettingsSchema` - Encrypted settings including theme fields
-
-The `AppProvider` deserializer (`src/components/AppProvider.tsx:32`) validates each top-level field individually with `safeParse`, so a single invalid field doesn't nuke the entire config.
-
----
-
-## File Index
-
-| File | Role |
-|---|---|
-| `src/themes.ts` | Core types (`CoreThemeColors`, `ThemeConfig`, `ThemeTokens`), builtin themes, presets, CSS builders |
-| `src/lib/colorUtils.ts` | Color conversion, contrast detection, token derivation |
-| `src/lib/themeEvent.ts` | Nostr event kinds (36767, 16767), tag building/parsing |
-| `src/lib/fontLoader.ts` | Font loading and CSS injection |
-| `src/lib/fonts.ts` | Bundled font definitions |
-| `src/lib/schemas.ts` | Zod validation schemas |
-| `src/contexts/AppContext.ts` | `Theme` type, `AppConfig` interface, React context |
-| `src/hooks/useTheme.ts` | Primary theme API: `setTheme()`, `applyCustomTheme()`, `setAutoShareTheme()` |
-| `src/hooks/useAppContext.ts` | Context consumer hook |
-| `src/hooks/useEncryptedSettings.ts` | NIP-78 encrypted settings (cross-device sync) |
-| `src/hooks/usePublishTheme.ts` | Publish theme definitions and active profile theme |
-| `src/hooks/useUserThemes.ts` | Query user's theme definitions |
-| `src/hooks/useActiveProfileTheme.ts` | Query user's active profile theme |
-| `src/components/AppProvider.tsx` | Theme application to DOM (`useApplyTheme`, `useApplyFonts`, `useApplyBackground`) |
-| `src/components/NostrSync.tsx` | Cross-device sync for encrypted settings and profile theme |
-| `src/components/ScopedTheme.tsx` | Scoped CSS variable overrides for subtrees |
-| `src/components/ThemeSelector.tsx` | Full settings UI for theme management |
-| `src/components/SidebarThemeDropdown.tsx` | Compact theme picker dropdown |
-| `public/theme.js` | Pre-React blocking script for flash prevention |
-| `index.html` | Hardcoded dark defaults, preloader, blocking script tag |
-| `tailwind.config.ts` | CSS custom property to Tailwind color mapping |
-| `src/index.css` | Base styles using theme tokens |

docs/blobbi/blobbi-tag-schema.md

@@ -1,254 +0,0 @@
-# Blobbi Tag Schema
-
-> **Product Specification** - This document is the canonical source of truth for Blobbi tag definitions.  
-> The runtime schema at `src/lib/blobbi-tag-schema.ts` MUST align with this spec.
-
-## Overview
-
-Blobbi events (Kind 31124) use tags to store all state data. This document defines:
-- All valid tags and their purposes
-- Which tags are required vs optional
-- Which tags persist across stage transitions
-- Which tags should be removed during transitions
-- Deprecated tags that should be filtered out
-
----
-
-## Tag Categories
-
-### 1. System / Metadata Tags
-
-Core protocol-level tags required for event identification and ecosystem membership.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `d` | **Yes** | egg, baby, adult | Yes | system | `blobbi-{pubkeyPrefix12}-{petId10}` | Unique identifier (addressable event d-tag) |
-| `b` | **Yes** | egg, baby, adult | Yes | system | `blobbi:ecosystem:v1` | Ecosystem namespace identifier |
-| `t` | **Yes** | egg, baby, adult | Yes | system | `blobbi` | Topic tag for discoverability |
-| `client` | No | egg, baby, adult | Yes | system | `blobbi` | Client identifier |
-
-### 2. Core Identity Tags
-
-Tags that define the Blobbi's unique identity. These MUST be preserved across all transitions.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `name` | **Yes** | egg, baby, adult | Yes | user | string | Display name (set during adoption) |
-| `seed` | **Yes** | egg, baby, adult | Yes | system | 64 hex chars | Deterministic seed for visual traits |
-| `generation` | No | egg, baby, adult | Yes | system | positive integer | Lineage generation (default: 1) |
-
-**Important**: The `seed` is derived once at creation using `sha256("blobbi:v1|{pubkey}:{d}:{createdAt}")` and MUST NEVER be recomputed.
-
-### 3. Visual Trait Tags
-
-Tags derived deterministically from the seed. These are stored explicitly for fast rendering and compatibility.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `base_color` | No | egg, baby, adult | Yes | generated | CSS hex (e.g., `#F59E0B`) | Primary color |
-| `secondary_color` | No | egg, baby, adult | Yes | generated | CSS hex | Secondary/accent color |
-| `eye_color` | No | egg, baby, adult | Yes | generated | CSS hex | Eye color |
-| `pattern` | No | egg, baby, adult | Yes | generated | `solid\|spotted\|striped\|gradient` | Visual pattern type |
-| `special_mark` | No | egg, baby, adult | Yes | generated | `none\|star\|heart\|sparkle\|blush` | Special decoration |
-| `size` | No | egg, baby, adult | Yes | generated | `small\|medium\|large` | Size category |
-
-**Regenerable**: These tags CAN be regenerated from the seed if missing. However, they should be preserved when present.
-
-### 4. Personality / Trait Tags
-
-Character traits that define the Blobbi's personality. These are generated at creation and MUST persist.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `personality` | No | egg, baby, adult | Yes | generated | string | Core personality type |
-| `trait` | No | egg, baby, adult | Yes | generated | string | Character trait modifier |
-| `favorite_food` | No | egg, baby, adult | Yes | generated | string | Preferred food type |
-| `voice_type` | No | egg, baby, adult | Yes | generated | string | Voice characteristic |
-| `mood` | No | egg, baby, adult | Yes | computed | string | Current emotional state |
-
-**Not Regenerable**: These tags are generated once and MUST be preserved. Do NOT invent values for existing Blobbis that lack these tags.
-
-### 5. Stat Tags
-
-Numeric values representing the Blobbi's current condition. These are actively computed and change frequently.
-
-| Tag | Required | Stages | Persistent | Source | Format | Default | Description |
-|-----|----------|--------|------------|--------|--------|---------|-------------|
-| `hunger` | No | egg, baby, adult | No | computed | 1-100 | 100 | Fullness level |
-| `happiness` | No | egg, baby, adult | No | computed | 1-100 | 100 | Happiness level |
-| `health` | No | egg, baby, adult | No | computed | 1-100 | 100 | Health level |
-| `hygiene` | No | egg, baby, adult | No | computed | 1-100 | 100 | Cleanliness level |
-| `energy` | No | egg, baby, adult | No | computed | 1-100 | 100 | Energy level |
-
-**Stage Transition Behavior**:
-- **Hatch (egg → baby)**: `health` inherited from egg, others reset to 100
-- **Evolve (baby → adult)**: All stats inherited from baby (after decay)
-
-### 6. State / Lifecycle Tags
-
-Tags that track the Blobbi's current lifecycle state.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `stage` | **Yes** | egg, baby, adult | No | system | `egg\|baby\|adult` | Current lifecycle stage |
-| `state` | **Yes** | egg, baby, adult | No | system | `active\|sleeping\|hibernating\|incubating\|evolving` | Activity state |
-| `last_interaction` | **Yes** | egg, baby, adult | No | system | Unix timestamp | Last user action |
-| `last_decay_at` | No | egg, baby, adult | No | system | Unix timestamp | Decay checkpoint |
-
-**State Constraints**:
-- `incubating` is only valid for `stage: egg`
-- `evolving` is only valid for `stage: baby`
-- After hatch/evolve completes, `state` MUST be set to `active`
-
-### 7. Task System Tags
-
-Temporary tags used during incubation and evolution processes. These are REMOVED after stage transitions.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `state_started_at` | No | egg, baby | No | system | Unix timestamp | When incubating/evolving started |
-| `task` | No | egg, baby | No | computed | `["task", "name:value"]` | Task progress (multiple allowed) |
-| `task_completed` | No | egg, baby | No | computed | `["task_completed", "name"]` | Completed tasks (multiple allowed) |
-
-**Transition Behavior**: ALL task system tags MUST be removed when hatch or evolve completes.
-
-### 8. Progression Tags
-
-Long-term progress tracking that persists across all stages.
-
-| Tag | Required | Stages | Persistent | Source | Format | Default | Description |
-|-----|----------|--------|------------|--------|--------|---------|-------------|
-| `experience` | No | egg, baby, adult | Yes | computed | non-negative int | 0 | Total XP |
-| `care_streak` | No | egg, baby, adult | Yes | computed | non-negative int | 0 | Consecutive care days |
-
-### 9. Social / Flag Tags
-
-User preferences and computed flags.
-
-| Tag | Required | Stages | Persistent | Source | Format | Default | Description |
-|-----|----------|--------|------------|--------|--------|---------|-------------|
-| `breeding_ready` | No | egg, baby, adult | Yes | computed | `true\|false` | false | Breeding eligibility |
-
-### 10. Evolution Tags
-
-Tags specific to adult Blobbis.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `adult_type` | No | adult | Yes | computed | string | Evolution form type |
-
-### 11. Extension Tags
-
-Optional tags for themes and crossover features.
-
-| Tag | Required | Stages | Persistent | Source | Format | Description |
-|-----|----------|--------|------------|--------|--------|-------------|
-| `theme` | No | egg, baby, adult | Yes | system | string (e.g., `divine`) | Theme variant |
-| `crossover_app` | No | egg, baby, adult | Yes | system | string (e.g., `divine`) | Crossover app identifier |
-
----
-
-## Deprecated Tags
-
-These tags are from legacy versions and MUST be removed when republishing events.
-
-| Tag | Reason | Replaced By |
-|-----|--------|-------------|
-| `shell_integrity` | Eggs use standard `health` stat | `health` |
-| `egg_temperature` | Warmth handled via UI props | N/A |
-| `incubation_progress` | Replaced by task system | `task`, `task_completed` |
-| `egg_status` | Replaced by standard state | `state` |
-| `fees` | Removed | N/A |
-| `incubation_time` | Uses state_started_at | `state_started_at` |
-| `start_incubation` | Uses state_started_at | `state_started_at` |
-| `interact_6_progress` | Legacy interaction tracking | `["task", "interactions:N"]` |
-
----
-
-## Stage Transition Rules
-
-### Hatch (egg → baby)
-
-**Tags to REMOVE**:
-- `task`
-- `task_completed`
-- `state_started_at`
-
-**Tags to UPDATE**:
-- `stage` → `baby`
-- `state` → `active`
-- `hunger` → `100`
-- `happiness` → `100`
-- `hygiene` → `100`
-- `energy` → `100`
-- `health` → (inherited from egg after decay)
-- `last_interaction` → current timestamp
-- `last_decay_at` → current timestamp
-
-**Tags to PRESERVE (all persistent tags)**:
-- All system tags (`d`, `b`, `t`, `client`)
-- All identity tags (`name`, `seed`, `generation`)
-- All visual tags (colors, pattern, size)
-- All personality tags (if present)
-- All progression tags (`experience`, `care_streak`)
-- All social tags (`breeding_ready`)
-- All extension tags (`theme`, `crossover_app`)
-
-### Evolve (baby → adult)
-
-**Tags to REMOVE**:
-- `task`
-- `task_completed`
-- `state_started_at`
-
-**Tags to UPDATE**:
-- `stage` → `adult`
-- `state` → `active`
-- All stats → (inherited from baby after decay)
-- `last_interaction` → current timestamp
-- `last_decay_at` → current timestamp
-
-**Tags to PRESERVE (all persistent tags)**:
-- Same as hatch, plus all stats are inherited (not reset)
-
-**Tags to ADD (optional)**:
-- `adult_type` → computed based on care history
-
----
-
-## Migration Rules
-
-When migrating legacy Blobbis to canonical format:
-
-1. **Always preserve existing values** - Do not regenerate tags that already exist
-2. **Generate missing required tags** - Derive `seed` if missing using the legacy event's `created_at`
-3. **Remove deprecated tags** - Filter out all tags in the deprecated list
-4. **Repair visual tags** - Regenerate from seed if missing (these are regenerable)
-5. **Do NOT invent personality tags** - If `personality`, `trait`, etc. don't exist, leave them empty
-
----
-
-## Validation Rules
-
-A valid Blobbi event MUST have:
-- `d` tag in canonical format
-- `b` tag = `blobbi:ecosystem:v1`
-- `t` tag = `blobbi`
-- `name` tag (non-empty)
-- `seed` tag (64 hex chars)
-- `stage` tag (valid value)
-- `state` tag (valid value)
-- `last_interaction` tag (valid timestamp)
-
----
-
-## Implementation Checklist
-
-When implementing any flow that modifies Blobbi tags:
-
-- [ ] Start from `canonical.allTags` as the base
-- [ ] Remove only task-specific tags (`task`, `task_completed`, `state_started_at`)
-- [ ] Preserve ALL persistent tags (identity, visual, personality, progression, social, extension)
-- [ ] Filter out deprecated tags
-- [ ] Update only the tags that need to change
-- [ ] Validate required tags are present

index.html

@@ -1,43 +1,45 @@
 <!DOCTYPE html>
 <html lang="en" class="dark">
   <head>
-    <title>Ditto — Your content. Your vibe. Your rules.</title>
+    <title>Agora — Power to the people.</title>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-    <meta name="description" content="Ditto — Your content. Your vibe. Your rules." />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
+    <meta name="description" content="Agora — a Nostr social client for communities, creativity, and ownership." />
 
     <!-- Open Graph -->
-    <meta property="og:title" content="Ditto" />
-    <meta property="og:description" content="Your content. Your vibe. Your rules." />
-    <meta property="og:image" content="https://ditto.pub/og-image.jpg" />
+    <meta property="og:title" content="Agora" />
+    <meta property="og:description" content="Power to the people." />
+    <meta property="og:image" content="https://agora.spot/og-image.png" />
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="630" />
     <meta property="og:image:type" content="image/jpeg" />
     <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://ditto.pub" />
-    <meta property="og:site_name" content="Ditto" />
+    <meta property="og:url" content="https://agora.spot" />
+    <meta property="og:site_name" content="Agora" />
 
     <!-- Twitter / X -->
     <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:title" content="Ditto" />
-    <meta name="twitter:description" content="Your content. Your vibe. Your rules." />
-    <meta name="twitter:image" content="https://ditto.pub/og-image.jpg" />
+    <meta name="twitter:title" content="Agora" />
+    <meta name="twitter:description" content="Power to the people." />
+    <meta name="twitter:image" content="https://agora.spot/og-image.png" />
 
     <meta http-equiv="content-security-policy" content="default-src 'none'; script-src 'self' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src 'self' https:; font-src 'self' https:; base-uri 'self'; manifest-src 'self'; connect-src 'self' blob: https: wss:; img-src 'self' data: blob: https:; media-src 'self' blob: https:">
-    <link rel="icon" type="image/svg+xml" href="/logo.svg">
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-    <meta name="theme-color" content="#161b2e" media="(prefers-color-scheme: dark)">
-    <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32.png">
+    <link rel="apple-touch-icon" sizes="192x192" href="/icon-192.png">
+    <meta name="theme-color" content="#0a0c14" media="(prefers-color-scheme: dark)">
+    <meta name="theme-color" content="#e85d3c" media="(prefers-color-scheme: light)">
     <link rel="manifest" href="/manifest.webmanifest">
-    <style>@keyframes ditto-spin{to{transform:rotate(360deg)}}</style>
+    <style>@keyframes agora-spin{to{transform:rotate(360deg)}}</style>
   </head>
-  <body style="margin:0;background:hsl(228 20% 10%)">
+  <body style="margin:0;background:hsl(0 0% 10%)">
     <!-- Pre-React loading screen. Lives OUTSIDE #root so React doesn't
          touch it. Removed by main.tsx once the app has mounted. -->
-    <div id="preloader" style="position:fixed;inset:0;z-index:9999;display:flex;align-items:center;justify-content:center;background:hsl(228 20% 10%)">
+    <div id="preloader" style="position:fixed;inset:0;z-index:9999;display:flex;align-items:center;justify-content:center;background:hsl(0 0% 10%)">
       <div style="display:flex;flex-direction:column;align-items:center;gap:24px">
-        <div data-logo style="width:48px;height:48px;background:hsl(258 70% 60%);-webkit-mask:url(/logo.svg) center/contain no-repeat;mask:url(/logo.svg) center/contain no-repeat"></div>
-        <div data-spinner style="width:24px;height:24px;border:2.5px solid hsl(258 70% 60% / 0.25);border-top-color:hsl(258 70% 60%);border-radius:50%;animation:ditto-spin .7s linear infinite"></div>
+        <div data-logo style="width:48px;height:48px;background:hsl(14 79% 58%);-webkit-mask:url(/logo.svg) center/contain no-repeat;mask:url(/logo.svg) center/contain no-repeat"></div>
+        <div data-spinner style="width:24px;height:24px;border:2.5px solid hsl(14 79% 58% / 0.25);border-top-color:hsl(14 79% 58%);border-radius:50%;animation:agora-spin .7s linear infinite"></div>
       </div>
     </div>
     <!-- Blocking script: reads theme from localStorage and applies it

ios/App/App.xcodeproj/project.pbxproj

@@ -17,6 +17,9 @@
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
 		B1A2C3D40001000100000001 /* SandboxPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A2C3D40001000100000002 /* SandboxPlugin.swift */; };
 		B1A2C3D40002000100000001 /* DittoBridgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A2C3D40002000100000002 /* DittoBridgeViewController.swift */; };
+		B1A2C3D40005000100000001 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B1A2C3D40005000100000002 /* PrivacyInfo.xcprivacy */; };
+		B1A2C3D40006000100000001 /* DittoNotificationPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A2C3D40006000100000002 /* DittoNotificationPlugin.swift */; };
+		B1A2C3D40007000100000001 /* NostrPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1A2C3D40007000100000002 /* NostrPoller.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -32,6 +35,10 @@
 		958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
 		B1A2C3D40001000100000002 /* SandboxPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SandboxPlugin.swift; sourceTree = "<group>"; };
 		B1A2C3D40002000100000002 /* DittoBridgeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DittoBridgeViewController.swift; sourceTree = "<group>"; };
+		B1A2C3D40004000100000002 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
+		B1A2C3D40005000100000002 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		B1A2C3D40006000100000002 /* DittoNotificationPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DittoNotificationPlugin.swift; sourceTree = "<group>"; };
+		B1A2C3D40007000100000002 /* NostrPoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrPoller.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -67,13 +74,17 @@
 			isa = PBXGroup;
 			children = (
 				50379B222058CBB4000EE86E /* capacitor.config.json */,
+				B1A2C3D40004000100000002 /* App.entitlements */,
 				504EC3071FED79650016851F /* AppDelegate.swift */,
 				B1A2C3D40001000100000002 /* SandboxPlugin.swift */,
 				B1A2C3D40002000100000002 /* DittoBridgeViewController.swift */,
+				B1A2C3D40006000100000002 /* DittoNotificationPlugin.swift */,
+				B1A2C3D40007000100000002 /* NostrPoller.swift */,
 				504EC30B1FED79650016851F /* Main.storyboard */,
 				504EC30E1FED79650016851F /* Assets.xcassets */,
 				504EC3101FED79650016851F /* LaunchScreen.storyboard */,
 				504EC3131FED79650016851F /* Info.plist */,
+				B1A2C3D40005000100000002 /* PrivacyInfo.xcprivacy */,
 				2FAD9762203C412B000D30F8 /* config.xml */,
 				50B271D01FEDC1A000F3C39B /* public */,
 			);
@@ -151,6 +162,7 @@
 				50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
 				504EC30D1FED79650016851F /* Main.storyboard in Resources */,
 				2FAD9763203C412B000D30F8 /* config.xml in Resources */,
+				B1A2C3D40005000100000001 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -164,6 +176,8 @@
 				504EC3081FED79650016851F /* AppDelegate.swift in Sources */,
 				B1A2C3D40001000100000001 /* SandboxPlugin.swift in Sources */,
 				B1A2C3D40002000100000001 /* DittoBridgeViewController.swift in Sources */,
+				B1A2C3D40006000100000001 /* DittoNotificationPlugin.swift in Sources */,
+				B1A2C3D40007000100000001 /* NostrPoller.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -303,6 +317,7 @@
 			baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = GZLTTH5DLM;
@@ -312,9 +327,9 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.3;
+				MARKETING_VERSION = 2.8.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
-				PRODUCT_BUNDLE_IDENTIFIER = pub.ditto.app;
+				PRODUCT_BUNDLE_IDENTIFIER = pub.agora.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
@@ -326,6 +341,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = GZLTTH5DLM;
@@ -335,8 +351,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.3;
-				PRODUCT_BUNDLE_IDENTIFIER = pub.ditto.app;
+				MARKETING_VERSION = 2.8.0;
+				PRODUCT_BUNDLE_IDENTIFIER = pub.agora.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_VERSION = 5.0;

ios/App/App/App.entitlements

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>webcredentials:agora.spot</string>
+		<string>webcredentials:agora.spot?mode=developer</string>
+	</array>
+</dict>
+</plist>

ios/App/App/AppDelegate.swift

@@ -1,36 +1,45 @@
 import UIKit
 import Capacitor
+import BackgroundTasks
+import UserNotifications
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
+class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
 
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
+        // Register the background task handler for notification polling.
+        // Must happen before the app finishes launching.
+        DittoNotificationPlugin.registerBackgroundTask()
+
+        // Set ourselves as the notification center delegate so we can:
+        // 1. Show banners even when the app is in the foreground.
+        // 2. Handle notification taps to navigate the WebView.
+        UNUserNotificationCenter.current().delegate = self
+
+        // Register notification categories with summary formats for iOS grouping.
+        registerNotificationCategories()
+
         return true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
     func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+        // Trigger an immediate poll when returning to foreground to catch up
+        // on any notifications missed while backgrounded.
+        DittoNotificationPlugin.pollNow()
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
 
     func applicationWillTerminate(_ application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
@@ -46,4 +55,66 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
     }
 
+    // MARK: - UNUserNotificationCenterDelegate
+
+    /// Show notification banners even when the app is in the foreground.
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        willPresent notification: UNNotification,
+        withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+    ) {
+        completionHandler([.banner, .sound])
+    }
+
+    /// Handle notification tap: navigate the Capacitor WebView to /notifications.
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        didReceive response: UNNotificationResponse,
+        withCompletionHandler completionHandler: @escaping () -> Void
+    ) {
+        let userInfo = response.notification.request.content.userInfo
+        let path = userInfo["url"] as? String ?? "/notifications"
+
+        // Navigate the Capacitor WebView to the notifications page.
+        DispatchQueue.main.async { [weak self] in
+            guard let rootVC = self?.window?.rootViewController as? DittoBridgeViewController else {
+                completionHandler()
+                return
+            }
+            let js = "window.location.pathname !== '\(path)' && (window.location.pathname = '\(path)');"
+            rootVC.webView?.evaluateJavaScript(js) { _, _ in }
+        }
+
+        completionHandler()
+    }
+
+    // MARK: - Notification Categories
+
+    /// Register notification categories with summary formats for native iOS
+    /// notification grouping. When multiple notifications share a thread
+    /// identifier, iOS automatically collapses them and uses the summary
+    /// format to describe the group.
+    private func registerNotificationCategories() {
+        let categories: [UNNotificationCategory] = [
+            makeCategory(id: NostrPoller.categoryReactions, summary: "%u more reactions"),
+            makeCategory(id: NostrPoller.categoryReposts, summary: "%u more reposts"),
+            makeCategory(id: NostrPoller.categoryZaps, summary: "%u more zaps"),
+            makeCategory(id: NostrPoller.categoryMentions, summary: "%u more mentions"),
+            makeCategory(id: NostrPoller.categoryComments, summary: "%u more comments"),
+            makeCategory(id: NostrPoller.categoryBadges, summary: "%u more badge awards"),
+            makeCategory(id: NostrPoller.categoryLetters, summary: "%u more letters"),
+        ]
+        UNUserNotificationCenter.current().setNotificationCategories(Set(categories))
+    }
+
+    private func makeCategory(id: String, summary: String) -> UNNotificationCategory {
+        return UNNotificationCategory(
+            identifier: id,
+            actions: [],
+            intentIdentifiers: [],
+            hiddenPreviewsBodyPlaceholder: nil,
+            categorySummaryFormat: summary,
+            options: []
+        )
+    }
 }

ios/App/App/DittoNotificationPlugin.swift

@@ -0,0 +1,209 @@
+import Foundation
+import Capacitor
+import BackgroundTasks
+import UserNotifications
+
+// MARK: - DittoNotificationPlugin
+
+/// Capacitor plugin that bridges the JS notification configuration to the
+/// native iOS background polling system.
+///
+/// Mirrors the Android `DittoNotificationPlugin.java` interface:
+/// - Receives `userPubkey`, `relayUrls`, `enabledKinds`, `authors`, and
+///   `notificationStyle` from the JS layer via `configure()`.
+/// - Stores configuration in UserDefaults.
+/// - Schedules / cancels a `BGAppRefreshTask` to periodically poll relays
+///   and display local notifications via `NostrPoller`.
+///
+/// On iOS the "push" vs "persistent" distinction maps to:
+/// - **"push"**: No background polling. Relies on Web Push (where supported)
+///   or in-app polling when the app is open.
+/// - **"persistent"**: Schedules `BGAppRefreshTask` for periodic relay polling.
+///   iOS manages the interval (~15 min minimum, adaptive based on app usage).
+@objc(DittoNotificationPlugin)
+public class DittoNotificationPlugin: CAPPlugin, CAPBridgedPlugin {
+
+    // MARK: - Capacitor Bridging
+
+    public let identifier = "DittoNotificationPlugin"
+    public let jsName = "DittoNotification"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "configure", returnType: CAPPluginReturnPromise),
+    ]
+
+    // MARK: - Constants
+
+    static let bgTaskIdentifier = "pub.ditto.app.notification-refresh"
+    private static let prefsKey = "ditto_notification_config"
+
+    // MARK: - Plugin Methods
+
+    /// Called from JS: `DittoNotification.configure({ ... })`.
+    @objc func configure(_ call: CAPPluginCall) {
+        let userPubkey = call.getString("userPubkey")
+        let notificationStyle = call.getString("notificationStyle") ?? "push"
+        let relayUrls = call.getArray("relayUrls")?.compactMap { $0 as? String }
+        let enabledKinds = call.getArray("enabledKinds")?.compactMap { $0 as? Int }
+        let authors = call.getArray("authors")?.compactMap { $0 as? String }
+
+        let defaults = UserDefaults.standard
+
+        if let userPubkey, let relayUrls, !relayUrls.isEmpty {
+            // Save configuration.
+            defaults.set(userPubkey, forKey: "\(Self.prefsKey).userPubkey")
+            defaults.set(relayUrls, forKey: "\(Self.prefsKey).relayUrls")
+            defaults.set(notificationStyle, forKey: "\(Self.prefsKey).notificationStyle")
+            if let enabledKinds {
+                defaults.set(enabledKinds, forKey: "\(Self.prefsKey).enabledKinds")
+            }
+            if let authors, !authors.isEmpty {
+                defaults.set(authors, forKey: "\(Self.prefsKey).authors")
+            } else {
+                defaults.removeObject(forKey: "\(Self.prefsKey).authors")
+            }
+
+            let kindsStr = enabledKinds?.map(String.init).joined(separator: ",") ?? "none"
+            NSLog("[DittoNotification] Configured: pubkey=%@..., style=%@, relays=%d, kinds=%@",
+                  String(userPubkey.prefix(8)), notificationStyle,
+                  relayUrls.count,
+                  kindsStr)
+        } else {
+            // Clear configuration (user logged out).
+            for suffix in ["userPubkey", "relayUrls", "notificationStyle", "enabledKinds", "authors"] {
+                defaults.removeObject(forKey: "\(Self.prefsKey).\(suffix)")
+            }
+            NSLog("[DittoNotification] Config cleared (user logged out)")
+        }
+
+        // Schedule or cancel background polling based on style + config.
+        let hasConfig = userPubkey != nil && relayUrls != nil && !(relayUrls?.isEmpty ?? true)
+        Self.manageBackgroundRefresh(style: notificationStyle, hasConfig: hasConfig)
+
+        call.resolve()
+    }
+
+    // MARK: - Background Task Management
+
+    /// Register the BGAppRefreshTask handler. Must be called from
+    /// `application(_:didFinishLaunchingWithOptions:)` before the app
+    /// finishes launching.
+    static func registerBackgroundTask() {
+        BGTaskScheduler.shared.register(
+            forTaskWithIdentifier: bgTaskIdentifier,
+            using: nil
+        ) { task in
+            guard let refreshTask = task as? BGAppRefreshTask else {
+                task.setTaskCompleted(success: false)
+                return
+            }
+            Self.handleBackgroundRefresh(task: refreshTask)
+        }
+        NSLog("[DittoNotification] Registered BGAppRefreshTask: %@", bgTaskIdentifier)
+    }
+
+    /// Schedule or cancel the BGAppRefreshTask.
+    /// On iOS both "push" and "persistent" modes use BGAppRefreshTask
+    /// (there is no Web Push in WKWebView and no foreground service concept),
+    /// so we schedule whenever there is a valid config.
+    static func manageBackgroundRefresh(style: String, hasConfig: Bool) {
+        if hasConfig {
+            scheduleBackgroundRefresh()
+        } else {
+            cancelBackgroundRefresh()
+        }
+    }
+
+    /// Schedule the next background refresh. iOS decides the actual timing
+    /// (minimum ~15 minutes, adaptive based on user app usage patterns).
+    static func scheduleBackgroundRefresh() {
+        let request = BGAppRefreshTaskRequest(identifier: bgTaskIdentifier)
+        // Suggest earliest begin date of 8 minutes from now (iOS may defer).
+        request.earliestBeginDate = Date(timeIntervalSinceNow: 8 * 60)
+
+        do {
+            try BGTaskScheduler.shared.submit(request)
+            NSLog("[DittoNotification] Scheduled background refresh")
+        } catch {
+            NSLog("[DittoNotification] Failed to schedule background refresh: %@", error.localizedDescription)
+        }
+    }
+
+    private static func cancelBackgroundRefresh() {
+        BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: bgTaskIdentifier)
+        NSLog("[DittoNotification] Cancelled background refresh")
+    }
+
+    /// Handle a BGAppRefreshTask: read config, poll, reschedule.
+    private static func handleBackgroundRefresh(task: BGAppRefreshTask) {
+        NSLog("[DittoNotification] Background refresh triggered")
+
+        // Read configuration from UserDefaults.
+        let defaults = UserDefaults.standard
+        guard let userPubkey = defaults.string(forKey: "\(prefsKey).userPubkey"),
+              let relayUrls = defaults.stringArray(forKey: "\(prefsKey).relayUrls"),
+              !relayUrls.isEmpty else {
+            NSLog("[DittoNotification] No config, completing task")
+            task.setTaskCompleted(success: true)
+            return
+        }
+
+        let enabledKinds = defaults.array(forKey: "\(prefsKey).enabledKinds") as? [Int] ?? []
+        let authors = defaults.stringArray(forKey: "\(prefsKey).authors")
+
+        guard !enabledKinds.isEmpty else {
+            NSLog("[DittoNotification] No enabled kinds, completing task")
+            task.setTaskCompleted(success: true)
+            return
+        }
+
+        // Schedule the next refresh before starting work (in case we're
+        // terminated mid-task, the next refresh is already queued).
+        scheduleBackgroundRefresh()
+
+        // Run the poll in a detached Task.
+        let pollTask = Task {
+            let poller = NostrPoller()
+            let count = await poller.poll(
+                userPubkey: userPubkey,
+                relayUrls: relayUrls,
+                enabledKinds: enabledKinds,
+                authors: authors
+            )
+            NSLog("[DittoNotification] Background poll complete: %d notifications", count)
+            task.setTaskCompleted(success: true)
+        }
+
+        // Handle task expiration (iOS is about to kill us).
+        task.expirationHandler = {
+            NSLog("[DittoNotification] Background task expired")
+            pollTask.cancel()
+            task.setTaskCompleted(success: false)
+        }
+    }
+
+    // MARK: - Immediate Poll
+
+    /// Trigger an immediate poll (e.g., when the app enters the foreground
+    /// after being backgrounded, to catch up on missed notifications).
+    static func pollNow() {
+        let defaults = UserDefaults.standard
+        guard let userPubkey = defaults.string(forKey: "\(prefsKey).userPubkey"),
+              let relayUrls = defaults.stringArray(forKey: "\(prefsKey).relayUrls"),
+              !relayUrls.isEmpty else { return }
+
+        let enabledKinds = defaults.array(forKey: "\(prefsKey).enabledKinds") as? [Int] ?? []
+        let authors = defaults.stringArray(forKey: "\(prefsKey).authors")
+
+        guard !enabledKinds.isEmpty else { return }
+
+        Task {
+            let poller = NostrPoller()
+            await poller.poll(
+                userPubkey: userPubkey,
+                relayUrls: relayUrls,
+                enabledKinds: enabledKinds,
+                authors: authors
+            )
+        }
+    }
+}

ios/App/App/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-        <string>Ditto</string>
+        <string>Agora</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -48,10 +48,20 @@
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Ditto needs access to your photo library to upload images to your posts and profile.</string>
+	<string>Agora needs access to your photo library to upload images to your posts and profile.</string>
 	<key>NSCameraUsageDescription</key>
-	<string>Ditto needs camera access to take photos and videos for your posts.</string>
+	<string>Agora needs camera access to take photos and videos for your posts.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>Ditto needs access to your microphone to record voice messages.</string>
+	<string>Agora needs access to your microphone to record voice messages.</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+	</array>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>pub.agora.app.notification-refresh</string>
+	</array>
 </dict>
 </plist>

ios/App/App/NostrPoller.swift

@@ -0,0 +1,633 @@
+import Foundation
+import UserNotifications
+
+// MARK: - NostrPoller
+
+/// Polls Nostr relays for notification events and displays native iOS
+/// notifications with author names, content previews, and iOS thread grouping.
+///
+/// Improvements over the Android implementation:
+/// - Fetches kind 0 metadata so notifications show "Alice reacted" not "Someone reacted"
+/// - Uses iOS thread identifiers for native notification grouping per category+post
+/// - Caches author metadata in UserDefaults (24h TTL) to minimise relay queries
+/// - Designed to complete within the ~30s BGAppRefreshTask budget
+final class NostrPoller {
+
+    // MARK: - Constants
+
+    private static let prefsKey = "ditto_notifications"
+    private static let lastSeenKey = "nostr:notification-last-seen"
+    private static let metadataCacheKey = "nostr:author-metadata-cache"
+    private static let metadataTTL: TimeInterval = 24 * 60 * 60 // 24 hours
+
+    private static let fetchLimit = 5
+    private static let wsTimeout: TimeInterval = 10
+    private static let metadataFetchTimeout: TimeInterval = 5
+
+    // MARK: - Notification Categories (registered by AppDelegate)
+
+    /// Category identifiers used for UNNotificationCategory registration.
+    static let categoryReactions  = "reactions"
+    static let categoryReposts    = "reposts"
+    static let categoryZaps       = "zaps"
+    static let categoryMentions   = "mentions"
+    static let categoryComments   = "comments"
+    static let categoryBadges     = "badges"
+    static let categoryLetters    = "letters"
+
+    // MARK: - Types
+
+    /// Minimal parsed Nostr event used during polling.
+    struct NostrEvent {
+        let id: String
+        let pubkey: String
+        let kind: Int
+        let createdAt: Int
+        let content: String
+        let tags: [[String]]
+
+        init?(json: [String: Any]) {
+            guard let id = json["id"] as? String,
+                  let pubkey = json["pubkey"] as? String,
+                  let kind = json["kind"] as? Int,
+                  let createdAt = json["created_at"] as? Int else { return nil }
+            self.id = id
+            self.pubkey = pubkey
+            self.kind = kind
+            self.createdAt = createdAt
+            self.content = json["content"] as? String ?? ""
+            self.tags = (json["tags"] as? [[String]]) ?? []
+        }
+    }
+
+    /// Cached author display name.
+    private struct AuthorCache: Codable {
+        let name: String
+        let timestamp: TimeInterval
+    }
+
+    // MARK: - Public API
+
+    /// Run a single poll cycle: fetch events from a relay, resolve metadata,
+    /// and display notifications. Returns the number of notifications shown.
+    @discardableResult
+    func poll(
+        userPubkey: String,
+        relayUrls: [String],
+        enabledKinds: [Int],
+        authors: [String]?
+    ) async -> Int {
+        guard !relayUrls.isEmpty, !enabledKinds.isEmpty else { return 0 }
+
+        let since = lastSeenTimestamp
+        let effectiveSince = since > 0 ? since : Int(Date().timeIntervalSince1970) - 300
+
+        if since == 0 {
+            setLastSeenTimestamp(effectiveSince)
+        }
+
+        // Try each relay in order until one succeeds.
+        for relayUrl in relayUrls {
+            guard let events = await fetchEvents(
+                relayUrl: relayUrl,
+                userPubkey: userPubkey,
+                enabledKinds: enabledKinds,
+                authors: authors,
+                since: effectiveSince
+            ) else {
+                continue // Try next relay on failure.
+            }
+
+            // Deduplicate + filter self-interactions.
+            var seenIds = Set<String>()
+            let filtered = events.filter { ev in
+                guard ev.pubkey != userPubkey, !seenIds.contains(ev.id) else { return false }
+                seenIds.insert(ev.id)
+                return true
+            }
+
+            guard !filtered.isEmpty else {
+                // Successful fetch but nothing new — update timestamp and return.
+                return 0
+            }
+
+            // Verify referenced events for reactions/reposts/zaps.
+            let notifiable = await verifyReferencedEvents(
+                events: filtered,
+                userPubkey: userPubkey,
+                relayUrl: relayUrl
+            )
+
+            // Update last-seen to newest event in the full filtered set (not
+            // just notifiable) so we don't re-fetch already-seen events.
+            let newestTs = filtered.map(\.createdAt).max() ?? effectiveSince
+            if newestTs > lastSeenTimestamp {
+                setLastSeenTimestamp(newestTs)
+            }
+
+            guard !notifiable.isEmpty else { return 0 }
+
+            // Fetch author metadata for unique pubkeys.
+            let pubkeys = Array(Set(notifiable.map(\.pubkey)))
+            let authorNames = await resolveAuthorNames(pubkeys: pubkeys, relayUrl: relayUrl)
+
+            // Display notifications.
+            await displayNotifications(events: notifiable, authorNames: authorNames)
+
+            return notifiable.count
+        }
+
+        return 0 // All relays failed.
+    }
+
+    // MARK: - Relay Communication
+
+    /// Fetch notification events from a single relay. Returns nil on failure.
+    private func fetchEvents(
+        relayUrl: String,
+        userPubkey: String,
+        enabledKinds: [Int],
+        authors: [String]?,
+        since: Int
+    ) async -> [NostrEvent]? {
+        guard let url = URL(string: relayUrl) else { return nil }
+
+        var filter: [String: Any] = [
+            "kinds": enabledKinds,
+            "#p": [userPubkey],
+            "since": since + 1,
+            "limit": Self.fetchLimit,
+        ]
+        if let authors, !authors.isEmpty {
+            filter["authors"] = authors
+        }
+
+        return await relayQuery(url: url, filters: [filter])
+    }
+
+    /// Fetch events by IDs from a relay for referenced-event verification.
+    private func fetchEventsByIds(ids: [String], relayUrl: String) async -> [String: NostrEvent] {
+        guard !ids.isEmpty, let url = URL(string: relayUrl) else { return [:] }
+
+        let filter: [String: Any] = [
+            "ids": ids,
+            "limit": ids.count,
+        ]
+
+        guard let events = await relayQuery(url: url, filters: [filter], timeout: Self.metadataFetchTimeout) else {
+            return [:]
+        }
+
+        var map = [String: NostrEvent]()
+        for ev in events {
+            map[ev.id] = ev
+        }
+        return map
+    }
+
+    /// Fetch kind 0 metadata events for a set of pubkeys.
+    private func fetchMetadata(pubkeys: [String], relayUrl: String) async -> [String: NostrEvent] {
+        guard !pubkeys.isEmpty, let url = URL(string: relayUrl) else { return [:] }
+
+        let filter: [String: Any] = [
+            "kinds": [0],
+            "authors": pubkeys,
+            "limit": pubkeys.count,
+        ]
+
+        guard let events = await relayQuery(url: url, filters: [filter], timeout: Self.metadataFetchTimeout) else {
+            return [:]
+        }
+
+        var map = [String: NostrEvent]()
+        for ev in events {
+            // Keep only the newest kind 0 per pubkey.
+            if let existing = map[ev.pubkey], existing.createdAt > ev.createdAt {
+                continue
+            }
+            map[ev.pubkey] = ev
+        }
+        return map
+    }
+
+    /// Low-level relay query: open WebSocket, send REQ, collect events until
+    /// EOSE, close. Returns nil on connection/timeout failure.
+    private func relayQuery(
+        url: URL,
+        filters: [[String: Any]],
+        timeout: TimeInterval = wsTimeout
+    ) async -> [NostrEvent]? {
+        await withCheckedContinuation { continuation in
+            var events = [NostrEvent]()
+            var resumed = false
+            let subId = "ditto-\(UInt64.random(in: 0...UInt64.max))"
+
+            let session = URLSession(configuration: .default)
+            let task = session.webSocketTask(with: url)
+            task.resume()
+
+            // Build REQ message: ["REQ", subId, filter1, filter2, ...]
+            var reqArray: [Any] = ["REQ", subId]
+            reqArray.append(contentsOf: filters)
+
+            guard let reqData = try? JSONSerialization.data(withJSONObject: reqArray),
+                  let reqStr = String(data: reqData, encoding: .utf8) else {
+                continuation.resume(returning: nil)
+                return
+            }
+
+            // Timeout guard.
+            let timeoutWork = DispatchWorkItem { [weak task] in
+                guard !resumed else { return }
+                resumed = true
+                task?.cancel(with: .goingAway, reason: nil)
+                session.invalidateAndCancel()
+                continuation.resume(returning: events.isEmpty ? nil : events)
+            }
+            DispatchQueue.global().asyncAfter(deadline: .now() + timeout, execute: timeoutWork)
+
+            func finish(result: [NostrEvent]?) {
+                timeoutWork.cancel()
+                guard !resumed else { return }
+                resumed = true
+                // Send CLOSE and disconnect.
+                if let closeData = try? JSONSerialization.data(withJSONObject: ["CLOSE", subId]),
+                   let closeStr = String(data: closeData, encoding: .utf8) {
+                    task.send(.string(closeStr)) { _ in }
+                }
+                task.cancel(with: .normalClosure, reason: nil)
+                session.invalidateAndCancel()
+                continuation.resume(returning: result)
+            }
+
+            func receiveNext() {
+                task.receive { result in
+                    switch result {
+                    case .success(.string(let text)):
+                        guard let data = text.data(using: .utf8),
+                              let arr = try? JSONSerialization.jsonObject(with: data) as? [Any],
+                              let type = arr.first as? String else {
+                            receiveNext()
+                            return
+                        }
+
+                        if type == "EVENT", arr.count >= 3,
+                           let evJson = arr[2] as? [String: Any],
+                           let ev = NostrEvent(json: evJson) {
+                            events.append(ev)
+                            receiveNext()
+                        } else if type == "EOSE" || type == "CLOSED" {
+                            finish(result: events)
+                        } else {
+                            receiveNext()
+                        }
+
+                    case .failure:
+                        finish(result: nil)
+
+                    default:
+                        receiveNext()
+                    }
+                }
+            }
+
+            task.send(.string(reqStr)) { error in
+                if error != nil {
+                    finish(result: nil)
+                } else {
+                    receiveNext()
+                }
+            }
+        }
+    }
+
+    // MARK: - Event Verification
+
+    /// For reactions (7), reposts (6, 16), and zaps (9735), verify that the
+    /// referenced event was authored by the current user. Events that pass
+    /// verification or don't need it are returned.
+    private func verifyReferencedEvents(
+        events: [NostrEvent],
+        userPubkey: String,
+        relayUrl: String
+    ) async -> [NostrEvent] {
+        let needsVerification: Set<Int> = [7, 6, 16, 9735]
+
+        // Collect referenced IDs that need verification.
+        var refIdsNeeded = Set<String>()
+        for ev in events where needsVerification.contains(ev.kind) {
+            if let refId = referencedEventId(from: ev) {
+                refIdsNeeded.insert(refId)
+            }
+        }
+
+        let refMap: [String: NostrEvent]
+        if !refIdsNeeded.isEmpty {
+            refMap = await fetchEventsByIds(ids: Array(refIdsNeeded), relayUrl: relayUrl)
+        } else {
+            refMap = [:]
+        }
+
+        return events.filter { ev in
+            guard needsVerification.contains(ev.kind) else { return true }
+
+            // Zaps with #p tag targeting the user are valid (profile zaps have no e tag).
+            if ev.kind == 9735 {
+                return true
+            }
+
+            guard let refId = referencedEventId(from: ev) else { return false }
+            guard let refEvent = refMap[refId] else {
+                // Couldn't fetch — keep the notification rather than silently dropping it.
+                return true
+            }
+            return refEvent.pubkey == userPubkey
+        }
+    }
+
+    /// Returns the last `e` tag value from an event's tags.
+    private func referencedEventId(from event: NostrEvent) -> String? {
+        event.tags.last(where: { $0.first == "e" && $0.count > 1 })?[1]
+    }
+
+    // MARK: - Author Metadata Resolution
+
+    /// Resolve display names for a set of pubkeys, using cache where possible.
+    private func resolveAuthorNames(pubkeys: [String], relayUrl: String) async -> [String: String] {
+        var result = [String: String]()
+        var uncached = [String]()
+
+        let cache = loadMetadataCache()
+        let now = Date().timeIntervalSince1970
+
+        for pk in pubkeys {
+            if let cached = cache[pk], now - cached.timestamp < Self.metadataTTL {
+                result[pk] = cached.name
+            } else {
+                uncached.append(pk)
+            }
+        }
+
+        // Fetch uncached metadata from the relay.
+        if !uncached.isEmpty {
+            let metadataEvents = await fetchMetadata(pubkeys: uncached, relayUrl: relayUrl)
+            var updatedCache = cache
+
+            for pk in uncached {
+                if let ev = metadataEvents[pk], let name = parseDisplayName(from: ev) {
+                    result[pk] = name
+                    updatedCache[pk] = AuthorCache(name: name, timestamp: now)
+                } else {
+                    // Fall back to truncated npub-style identifier.
+                    let fallback = formatPubkey(pk)
+                    result[pk] = fallback
+                    // Don't cache failures — retry next time.
+                }
+            }
+
+            saveMetadataCache(updatedCache)
+        }
+
+        return result
+    }
+
+    /// Parse display_name or name from a kind 0 event's content JSON.
+    private func parseDisplayName(from event: NostrEvent) -> String? {
+        guard let data = event.content.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+            return nil
+        }
+        // Prefer display_name, fall back to name.
+        if let displayName = json["display_name"] as? String, !displayName.isEmpty {
+            return displayName
+        }
+        if let name = json["name"] as? String, !name.isEmpty {
+            return name
+        }
+        return nil
+    }
+
+    /// Format a hex pubkey as a short identifier: first 8 + "..." + last 4.
+    private func formatPubkey(_ pubkey: String) -> String {
+        guard pubkey.count >= 12 else { return pubkey }
+        let start = pubkey.prefix(8)
+        let end = pubkey.suffix(4)
+        return "\(start)...\(end)"
+    }
+
+    // MARK: - Metadata Cache (UserDefaults)
+
+    private func loadMetadataCache() -> [String: AuthorCache] {
+        let defaults = UserDefaults.standard
+        guard let data = defaults.data(forKey: Self.metadataCacheKey),
+              let cache = try? JSONDecoder().decode([String: AuthorCache].self, from: data) else {
+            return [:]
+        }
+        return cache
+    }
+
+    private func saveMetadataCache(_ cache: [String: AuthorCache]) {
+        guard let data = try? JSONEncoder().encode(cache) else { return }
+        UserDefaults.standard.set(data, forKey: Self.metadataCacheKey)
+    }
+
+    // MARK: - Notification Display
+
+    /// Display native iOS notifications for a batch of verified events.
+    private func displayNotifications(events: [NostrEvent], authorNames: [String: String]) async {
+        let center = UNUserNotificationCenter.current()
+
+        for event in events {
+            let authorName = authorNames[event.pubkey] ?? formatPubkey(event.pubkey)
+            let (title, body, categoryId, threadId) = notificationContent(
+                event: event,
+                authorName: authorName
+            )
+
+            let content = UNMutableNotificationContent()
+            content.title = title
+            content.body = body
+            content.sound = .default
+            content.categoryIdentifier = categoryId
+            content.threadIdentifier = threadId
+            content.userInfo = ["url": "/notifications"]
+
+            let identifier = "ditto-\(event.id.prefix(16))"
+            let request = UNNotificationRequest(
+                identifier: identifier,
+                content: content,
+                trigger: nil // Deliver immediately.
+            )
+
+            try? await center.add(request)
+        }
+    }
+
+    /// Build notification title, body, category ID, and thread identifier for an event.
+    private func notificationContent(
+        event: NostrEvent,
+        authorName: String
+    ) -> (title: String, body: String, categoryId: String, threadId: String) {
+        let refId = referencedEventId(from: event) ?? ""
+
+        switch event.kind {
+        case 7:
+            // Reaction — show the reaction content (emoji) if available.
+            let reaction = event.content.isEmpty || event.content == "+" ? "❤️" : event.content
+            return (
+                "\(authorName) reacted \(reaction)",
+                "Reacted to your post",
+                Self.categoryReactions,
+                "reactions:\(refId)"
+            )
+
+        case 6, 16:
+            return (
+                "\(authorName) reposted your note",
+                "",
+                Self.categoryReposts,
+                "reposts:\(refId)"
+            )
+
+        case 9735:
+            let sats = zapAmount(from: event)
+            if sats > 0 {
+                return (
+                    "\(formatSats(sats)) sats from \(authorName)",
+                    "You received a zap",
+                    Self.categoryZaps,
+                    "zaps"
+                )
+            }
+            return (
+                "\(authorName) zapped you",
+                "",
+                Self.categoryZaps,
+                "zaps"
+            )
+
+        case 1:
+            let hasETag = event.tags.contains(where: { $0.first == "e" })
+            let preview = contentPreview(event.content, maxLength: 120)
+            if hasETag {
+                return (
+                    "\(authorName) replied to you",
+                    preview,
+                    Self.categoryMentions,
+                    "mentions"
+                )
+            }
+            return (
+                "\(authorName) mentioned you",
+                preview,
+                Self.categoryMentions,
+                "mentions"
+            )
+
+        case 1111, 1222, 1244:
+            let preview = contentPreview(event.content, maxLength: 120)
+            // Check if this is a reply to another comment (k tag == "1111").
+            let isReply = event.tags.contains(where: { $0.first == "k" && $0.count > 1 && $0[1] == "1111" })
+            let action = isReply ? "replied to your comment" : "commented on your post"
+            return (
+                "\(authorName) \(action)",
+                preview,
+                Self.categoryComments,
+                "comments:\(refId)"
+            )
+
+        case 8:
+            return (
+                "\(authorName) awarded you a badge",
+                "You received a new badge",
+                Self.categoryBadges,
+                "badges"
+            )
+
+        case 8211:
+            return (
+                "\(authorName) sent you a letter",
+                "You have a new letter waiting for you",
+                Self.categoryLetters,
+                "letters"
+            )
+
+        default:
+            return (
+                "\(authorName) interacted with you",
+                "",
+                Self.categoryMentions,
+                "mentions"
+            )
+        }
+    }
+
+    /// Truncate content for notification body preview.
+    private func contentPreview(_ content: String, maxLength: Int) -> String {
+        let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines)
+        // Replace newlines with spaces for a single-line preview.
+        let singleLine = trimmed.replacingOccurrences(
+            of: "\\s*\\n+\\s*",
+            with: " ",
+            options: .regularExpression
+        )
+        guard singleLine.count > maxLength else { return singleLine }
+        return String(singleLine.prefix(maxLength)) + "…"
+    }
+
+    // MARK: - Zap Amount Extraction
+
+    /// Extract zap amount in sats from a kind 9735 zap receipt event.
+    /// Checks the "amount" tag first (millisats), then falls back to
+    /// parsing the "description" tag's zap request JSON.
+    private func zapAmount(from event: NostrEvent) -> Int {
+        // Check for direct "amount" tag (value in millisats).
+        for tag in event.tags where tag.first == "amount" && tag.count > 1 {
+            if let msats = Int(tag[1]), msats > 0 {
+                return msats / 1000
+            }
+        }
+
+        // Fall back to "description" tag (zap request JSON) -> amount tag.
+        for tag in event.tags where tag.first == "description" && tag.count > 1 {
+            guard let data = tag[1].data(using: .utf8),
+                  let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                  let reqTags = json["tags"] as? [[String]] else { continue }
+            for reqTag in reqTags where reqTag.first == "amount" && reqTag.count > 1 {
+                if let msats = Int(reqTag[1]), msats > 0 {
+                    return msats / 1000
+                }
+            }
+        }
+
+        return 0
+    }
+
+    /// Format sats for compact display: 500 -> "500", 1500 -> "1.5K", 1000000 -> "1M".
+    private func formatSats(_ sats: Int) -> String {
+        if sats >= 1_000_000 {
+            let val = Double(sats) / 1_000_000.0
+            if val == val.rounded(.down) {
+                return "\(Int(val))M"
+            }
+            return String(format: "%.1fM", val).replacingOccurrences(of: ".0M", with: "M")
+        } else if sats >= 1_000 {
+            let val = Double(sats) / 1_000.0
+            if val == val.rounded(.down) {
+                return "\(Int(val))K"
+            }
+            return String(format: "%.1fK", val).replacingOccurrences(of: ".0K", with: "K")
+        }
+        return "\(sats)"
+    }
+
+    // MARK: - Last-Seen Timestamp
+
+    var lastSeenTimestamp: Int {
+        UserDefaults.standard.integer(forKey: Self.lastSeenKey)
+    }
+
+    func setLastSeenTimestamp(_ ts: Int) {
+        UserDefaults.standard.set(ts, forKey: Self.lastSeenKey)
+    }
+}

ios/App/App/SandboxPlugin.swift

@@ -17,6 +17,7 @@ public class SandboxPlugin: CAPPlugin, CAPBridgedPlugin {
     public let jsName = "SandboxPlugin"
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "create", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "navigate", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "updateFrame", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "respondToFetch", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "postMessage", returnType: CAPPluginReturnPromise),
@@ -58,16 +59,33 @@ public class SandboxPlugin: CAPPlugin, CAPBridgedPlugin {
             )
             self.sandboxes[sandboxId] = sandbox
 
-            // Add the WebView on top of the Capacitor WebView.
+            // Add the container (WebView + spinner overlay) on top of
+            // the Capacitor WebView.
             if let bridge = self.bridge,
                let webView = bridge.webView {
-                webView.superview?.addSubview(sandbox.webView)
+                webView.superview?.addSubview(sandbox.containerView)
             }
 
             call.resolve()
         }
     }
 
+    @objc func navigate(_ call: CAPPluginCall) {
+        guard let sandboxId = call.getString("id") else {
+            call.reject("Missing required parameter: id")
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+            guard let sandbox = self?.sandboxes[sandboxId] else {
+                call.reject("Sandbox not found: \(sandboxId)")
+                return
+            }
+            sandbox.navigateToApp()
+            call.resolve()
+        }
+    }
+
     @objc func updateFrame(_ call: CAPPluginCall) {
         guard let sandboxId = call.getString("id") else {
             call.reject("Missing required parameter: id")
@@ -87,7 +105,7 @@ public class SandboxPlugin: CAPPlugin, CAPBridgedPlugin {
                 call.reject("Sandbox not found: \(sandboxId)")
                 return
             }
-            sandbox.webView.frame = CGRect(x: x, y: y, width: width, height: height)
+            sandbox.containerView.frame = CGRect(x: x, y: y, width: width, height: height)
             call.resolve()
         }
     }
@@ -153,7 +171,7 @@ public class SandboxPlugin: CAPPlugin, CAPBridgedPlugin {
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
             if let sandbox = self.sandboxes.removeValue(forKey: sandboxId) {
-                sandbox.webView.removeFromSuperview()
+                sandbox.containerView.removeFromSuperview()
                 sandbox.schemeHandler.cancelAll()
             }
             call.resolve()
@@ -183,13 +201,19 @@ public class SandboxPlugin: CAPPlugin, CAPBridgedPlugin {
 // MARK: - SandboxInstance
 
 /// Manages a single sandboxed WKWebView instance.
-private class SandboxInstance: NSObject, WKScriptMessageHandler {
+private class SandboxInstance: NSObject, WKScriptMessageHandler, WKNavigationDelegate {
     let id: String
     let webView: WKWebView
     let schemeHandler: SandboxSchemeHandler
     private weak var plugin: SandboxPlugin?
     private let customScheme: String
 
+    /// Container view that holds the WebView and spinner overlay.
+    let containerView: UIView
+
+    /// Native spinner overlay, removed when the first page finishes loading.
+    private var spinnerOverlay: UIView?
+
     init(id: String, frame: CGRect, plugin: SandboxPlugin) {
         self.id = id
         self.plugin = plugin
@@ -224,19 +248,54 @@ private class SandboxInstance: NSObject, WKScriptMessageHandler {
         config.preferences.javaScriptCanOpenWindowsAutomatically = false
         config.defaultWebpagePreferences.allowsContentJavaScript = true
 
-        self.webView = WKWebView(frame: frame, configuration: config)
+        // Container view that holds the WebView + spinner overlay.
+        self.containerView = UIView(frame: frame)
+
+        self.webView = WKWebView(frame: containerView.bounds, configuration: config)
+        self.webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         self.webView.isOpaque = false
-        self.webView.backgroundColor = .white
+        self.webView.backgroundColor = UIColor(red: 0x14/255.0, green: 0x16/255.0, blue: 0x1f/255.0, alpha: 1)
+        self.webView.scrollView.backgroundColor = self.webView.backgroundColor
         self.webView.scrollView.bounces = false
+        self.containerView.addSubview(self.webView)
+
+        // Dark overlay behind the spinner.
+        let overlay = UIView(frame: containerView.bounds)
+        overlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        overlay.backgroundColor = UIColor(red: 0x14/255.0, green: 0x16/255.0, blue: 0x1f/255.0, alpha: 1)
+        self.containerView.addSubview(overlay)
+
+        // Native spinner — uses UIActivityIndicatorView which animates on
+        // the render thread independently of JS/main-thread work.
+        let spinner = UIActivityIndicatorView(style: .medium)
+        spinner.color = UIColor(red: 124/255.0, green: 92/255.0, blue: 220/255.0, alpha: 1)
+        spinner.translatesAutoresizingMaskIntoConstraints = false
+        spinner.startAnimating()
+        overlay.addSubview(spinner)
+        NSLayoutConstraint.activate([
+            spinner.centerXAnchor.constraint(equalTo: overlay.centerXAnchor),
+            spinner.centerYAnchor.constraint(equalTo: overlay.centerYAnchor),
+        ])
+
+        self.spinnerOverlay = overlay
 
         super.init()
 
-        // Register the message handler after super.init().
+        // Register the message handler and navigation delegate after super.init().
         userContentController.add(self, name: "sandboxBridge")
+        self.webView.navigationDelegate = self
+    }
 
-        // Load the initial page via the custom scheme.
-        let initialURL = URL(string: "\(self.customScheme)://app/index.html")!
-        self.webView.load(URLRequest(url: initialURL))
+    /// Navigate the WebView to the sandbox's entry point.
+    func navigateToApp() {
+        let initialURL = URL(string: "\(customScheme)://app/index.html")!
+        webView.load(URLRequest(url: initialURL))
+    }
+
+    /// Remove the native loading overlay. Safe to call multiple times.
+    func hideSpinner() {
+        spinnerOverlay?.removeFromSuperview()
+        spinnerOverlay = nil
     }
 
     /// Post a JSON-RPC message to injected scripts inside the WebView.
@@ -270,6 +329,13 @@ private class SandboxInstance: NSObject, WKScriptMessageHandler {
         plugin?.emitScriptMessage(sandboxId: id, message: body)
     }
 
+    // MARK: - WKNavigationDelegate
+
+    /// Remove the spinner overlay once the first page finishes loading.
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        hideSpinner()
+    }
+
     // MARK: - Bridge Script
 
     /// JavaScript injected at document start that provides:

ios/App/CapApp-SPM/Package.swift

@@ -14,10 +14,11 @@ let package = Package(
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.2.0"),
         .package(name: "CapacitorApp", path: "../../../node_modules/@capacitor/app"),
         .package(name: "CapacitorFilesystem", path: "../../../node_modules/@capacitor/filesystem"),
+        .package(name: "CapacitorHaptics", path: "../../../node_modules/@capacitor/haptics"),
         .package(name: "CapacitorKeyboard", path: "../../../node_modules/@capacitor/keyboard"),
         .package(name: "CapacitorLocalNotifications", path: "../../../node_modules/@capacitor/local-notifications"),
         .package(name: "CapacitorShare", path: "../../../node_modules/@capacitor/share"),
-        .package(name: "CapacitorStatusBar", path: "../../../node_modules/@capacitor/status-bar"),
+        .package(name: "CapgoCapacitorAutofillSavePassword", path: "../../../node_modules/@capgo/capacitor-autofill-save-password"),
         .package(name: "CapacitorSecureStoragePlugin", path: "../../../node_modules/capacitor-secure-storage-plugin")
     ],
     targets: [
@@ -28,10 +29,11 @@ let package = Package(
                 .product(name: "Cordova", package: "capacitor-swift-pm"),
                 .product(name: "CapacitorApp", package: "CapacitorApp"),
                 .product(name: "CapacitorFilesystem", package: "CapacitorFilesystem"),
+                .product(name: "CapacitorHaptics", package: "CapacitorHaptics"),
                 .product(name: "CapacitorKeyboard", package: "CapacitorKeyboard"),
                 .product(name: "CapacitorLocalNotifications", package: "CapacitorLocalNotifications"),
                 .product(name: "CapacitorShare", package: "CapacitorShare"),
-                .product(name: "CapacitorStatusBar", package: "CapacitorStatusBar"),
+                .product(name: "CapgoCapacitorAutofillSavePassword", package: "CapgoCapacitorAutofillSavePassword"),
                 .product(name: "CapacitorSecureStoragePlugin", package: "CapacitorSecureStoragePlugin")
             ]
         )

nginx.conf

@@ -0,0 +1,30 @@
+server {
+    listen 80;
+    server_name _;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml+rss application/javascript application/json;
+
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+
+    location /health {
+        access_log off;
+        return 200 "healthy\n";
+        add_header Content-Type text/plain;
+    }
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}

nginx.dev.conf

@@ -0,0 +1,35 @@
+server {
+    listen 80;
+    server_name _;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml+rss application/javascript application/json;
+
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+
+    location /health {
+        access_log off;
+        return 200 "healthy\n";
+        add_header Content-Type text/plain;
+    }
+
+    location / {
+        resolver 127.0.0.11 valid=10s;
+        set $vite_backend http://vite:8080;
+        proxy_pass $vite_backend;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 86400;
+    }
+}

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "ditto",
+  "name": "agora",
   "private": true,
-  "version": "2.6.3",
+  "version": "2.8.0",
   "type": "module",
   "scripts": {
     "dev": "npm i --silent && vite",
@@ -15,13 +15,16 @@
     "node": ">=22"
   },
   "dependencies": {
+    "@breeztech/breez-sdk-spark": "^0.13.2-dev1",
     "@capacitor/app": "^8.0.0",
+    "@capacitor/barcode-scanner": "^3.0.2",
     "@capacitor/core": "^8.1.0",
     "@capacitor/filesystem": "^8.1.2",
-    "@capacitor/keyboard": "^8.0.2",
+    "@capacitor/haptics": "^8.0.2",
+    "@capacitor/keyboard": "^8.0.3",
     "@capacitor/local-notifications": "^8.0.1",
     "@capacitor/share": "^8.0.1",
-    "@capacitor/status-bar": "^8.0.0",
+    "@capgo/capacitor-autofill-save-password": "^8.0.22",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -66,8 +69,10 @@
     "@milkdown/prose": "^7.20.0",
     "@milkdown/react": "^7.20.0",
     "@milkdown/utils": "^7.20.0",
+    "@noble/curves": "^2.2.0",
+    "@noble/hashes": "^1.8.0",
     "@nostrify/nostrify": "^0.51.1",
-    "@nostrify/react": "^0.5.0",
+    "@nostrify/react": "^0.5.1",
     "@nostrify/types": "^0.36.9",
     "@plausible-analytics/tracker": "^0.4.4",
     "@radix-ui/react-accordion": "^1.2.0",
@@ -97,6 +102,8 @@
     "@radix-ui/react-toggle": "^1.1.0",
     "@radix-ui/react-toggle-group": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.2.8",
+    "@samthomson/nostr-messaging": "^0.17.1",
+    "@scure/bip39": "^1.6.0",
     "@sentry/react": "^10.42.0",
     "@tanstack/react-query": "^5.56.2",
     "@unhead/addons": "^2.1.13",
@@ -107,6 +114,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
+    "d3-scale": "^4.0.2",
     "date-fns": "^3.6.0",
     "dompurify": "^3.3.3",
     "embla-carousel-react": "^8.3.0",
@@ -114,9 +122,14 @@
     "fflate": "^0.8.2",
     "hls.js": "^1.6.15",
     "html-to-image": "^1.11.13",
+    "i18next": "^26.0.5",
+    "i18next-browser-languagedetector": "^8.2.1",
     "idb": "^8.0.3",
     "input-otp": "^1.2.4",
-    "lucide-react": "^0.462.0",
+    "iso-3166": "^4.4.0",
+    "leaflet": "^1.9.4",
+    "lucide-react": "^1.8.0",
+    "ngeohash": "^0.6.3",
     "nostr-tools": "^2.13.0",
     "qrcode": "^1.5.4",
     "react": "^19.2.4",
@@ -125,7 +138,9 @@
     "react-dom": "^19.2.4",
     "react-easy-crop": "^5.5.6",
     "react-hook-form": "^7.71.1",
+    "react-i18next": "^17.0.4",
     "react-intersection-observer": "^9.16.0",
+    "react-leaflet": "^4.2.1",
     "react-markdown": "^10.1.0",
     "react-resizable-panels": "^2.1.3",
     "react-router-dom": "^6.26.2",
@@ -150,7 +165,9 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.2",
+    "@types/d3-scale": "^4.0.9",
     "@types/dompurify": "^3.0.5",
+    "@types/leaflet": "^1.9.21",
     "@types/node": "^22.5.5",
     "@types/qrcode": "^1.5.5",
     "@types/react": "^19.2.14",

public/.well-known/apple-app-site-association

@@ -0,0 +1,7 @@
+{
+  "webcredentials": {
+    "apps": [
+      "GZLTTH5DLM.pub.agora.app"
+    ]
+  }
+}

public/.well-known/assetlinks.json

@@ -1,8 +1,15 @@
-[{
-  "relation": ["delegate_permission/common.handle_all_urls"],
-  "target": {
-    "namespace": "android_app",
-    "package_name": "pub.ditto.app",
-    "sha256_cert_fingerprints": ["7C:05:A8:5A:07:0F:84:AE:43:DE:85:67:A4:5F:7F:FB:42:0A:05:05:27:CE:B6:8C:DA:AF:A5:E0:12:E0:9E:71"]
+[
+  {
+    "relation": [
+      "delegate_permission/common.handle_all_urls"
+    ],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "pub.agora.app",
+      "sha256_cert_fingerprints": [
+        "7C:05:A8:5A:07:0F:84:AE:43:DE:85:67:A4:5F:7F:FB:42:0A:05:05:27:CE:B6:8C:DA:AF:A5:E0:12:E0:9E:71",
+        "E5:B1:A9:13:C9:37:35:3C:A5:E7:27:89:C0:9D:3D:0D:A5:4F:F5:26:88:06:BD:24:46:21:AB:61:6B:CC:C5:E5"
+      ]
+    }
   }
-}]
+]

public/CHANGELOG.md

@@ -1,365 +1,7 @@
 # Changelog
 
-## [2.6.3] - 2026-04-10
+## [1.0.0] - 2026-04-30
 
 ### Added
-- Lightning invoices embedded in posts now render as tappable payment cards
-- Blobbi companions in the feed reflect their current condition and projected health
 
-### Changed
-- Profile headers are cleaner -- lightning addresses and verification badges moved out of the way, and website URLs no longer show a trailing slash
-- Login credentials are saved to your browser's built-in password manager for easier sign-in across sessions
-- "Request to Vanish" renamed to "Delete Account" for clarity
-
-### Fixed
-- Badge image uploads now show a recommended 1:1 aspect ratio hint so your badges don't get cropped unexpectedly
-- Security hardening for URLs and styles sourced from the network
-
-## [2.6.2] - 2026-04-08
-
-### Added
-- Share follow packs and follow sets via link -- recipients see an immersive preview with member avatars, a "Follow All" button, and a combined feed from everyone in the pack
-- Curated home feed with a mix of photos, short videos, livestreams, and music -- content types are spaced out so your timeline stays fresh and varied
-- "Write a letter" option on profile menus for a more personal way to reach out
-- Push vs persistent notification delivery option on Android
-
-### Changed
-- Webxdc games and apps always open fullscreen for a more immersive experience
-- Login credentials are now stored in the device's secure keychain on iOS and Android instead of plain local storage
-- Profile fields now appear inline instead of in a separate right sidebar
-- Trending hashtags removed from the logged-out homepage for a cleaner first impression
-
-### Fixed
-- Webxdc and nsites work natively on iOS and Android without relying on browser sandboxing tricks
-- File downloads now save directly to Documents on iOS and Android instead of silently failing
-- Mobile search no longer scrolls the page behind it and properly hides the bottom navigation bar
-- iOS swipe-back navigation works correctly throughout the app
-- Blobbi companions appear reliably on profiles instead of sometimes going missing
-- IndexedDB no longer crashes on devices with Lockdown Mode enabled
-
-## [2.6.1] - 2026-04-06
-
-### Added
-- Manage your interest tabs (hashtags and locations) from the settings page
-- Edit button on custom profile tabs so you can tweak them without recreating from scratch
-- Follow packs and follow sets now show author info and action headers in the feed
-- Posts now show whether they were created or updated, so you can tell when something's been edited
-
-### Changed
-- Webxdc games and apps run in a more secure sandbox with stricter content policies and private subdomains
-- Nsite previews now use the same secure sandbox as webxdc apps
-- Blobbi items work as instant abilities instead of consumable inventory -- no more fiddly quantity pickers
-
-### Fixed
-- Desktop tab bar no longer overflows when you have lots of tabs -- scroll arrows appear automatically
-- Mobile compose box no longer randomly collapses or becomes unclickable
-- Profile avatar and banner lightbox no longer hides behind the right sidebar
-- Infinite scroll on custom profile tab feeds no longer reloads the same content
-- Reaction emoji are now visible on each row in the interactions modal
-- Missing bottom border on collapsed thread expand button restored
-
-## [2.6.0] - 2026-04-05
-
-### Added
-- Follow links and QR codes -- share a link or scannable code that lets anyone follow you with one tap, complete with your themed profile preview and recent posts
-- Immersive Blobbi hatching ceremony -- crack your egg through cinematic stages with shaking animations, a burst of light, sparkles, typewriter dialog, and a naming moment
-
-### Changed
-- Footer links redesigned as compact icon chips for a cleaner look
-- Custom emoji now render crisp at small sizes with pixel-perfect scaling
-
-### Fixed
-- Custom themes now apply correctly when logging in on a new device
-- Settings and preferences sync reliably across devices
-- Mobile sidebar links no longer clip into the safe area
-- Blobbi page background overlay now appears properly on custom themes
-- Blobbi companion state no longer resets unexpectedly from stale cache data
-- Letter compose picker no longer gets hidden behind the top navigation arc
-
-## [2.5.2] - 2026-04-04
-
-### Added
-- See who voted on each poll option -- tap the vote count to open a voters list with avatar stacks and per-option filter tabs
-- Poll votes now appear as activity cards in feeds and on detail pages
-
-### Fixed
-- Threads and replies load more reliably by following relay and author hints when fetching parent events
-
-## [2.5.1] - 2026-04-03
-
-### Fixed
-- Lightbox now reliably appears above all content, not just when opened from photo galleries
-
-## [2.5.0] - 2026-04-03
-
-### Added
-- Run nsites and web apps directly inside Ditto -- hit the "Run" button on any nsite or app card to preview it in an overlay without leaving your feed
-- File uploads in the poll composer -- attach images and media to your polls
-- Blobbi posts now appear in the homepage feed
-
-### Changed
-- Profile media sidebar fills remaining slots with photos from text posts when there aren't enough dedicated media posts
-- App cards now show banner images and improved layout
-
-### Fixed
-- Lightbox no longer appears behind the right sidebar
-- Compose box corners are properly rounded
-- Clicking buttons or links inside a post card no longer accidentally navigates to the post detail page
-
-## [2.4.1] - 2026-04-02
-
-### Added
-- Rich cards for Zapstore app releases and assets -- see download links, version info, platform badges, and hashes right in your feed
-
-### Fixed
-- First-hatch tour now shows for accounts that were onboarded before the tour existed, so no one misses the hatching moment
-
-## [2.4.0] - 2026-04-02
-
-### Added
-- First-hatch tour: a guided experience for hatching your very first Blobbi egg, with progressive crack animations, an inline card flow, and a reveal moment
-- Customizable bottom bar: rearrange or hide any item in the navigation bar to make Ditto feel like yours
-- Mission surface card in the feed that surfaces your active quests at a glance
-
-### Changed
-- Missions redesigned as a quest board with collapsible cards and a lighter aesthetic
-- "Edit Profile" mission now completes when you update any profile field, not just wall-specific edits
-- Media tab on profiles now shows only photos, videos, and other media -- not plain text posts
-- Blobbi onboarding state now syncs to your profile so it follows you across devices
-
-### Fixed
-- Notification dot no longer reappears after you've already marked notifications as read
-- Dialogs no longer fly up when the mobile keyboard opens
-
-## [2.3.1] - 2026-04-02
-
-### Changed
-- Drafts now save instantly to your device and sync to relays in the background, with a cloud sync indicator so you always know the status
-
-### Fixed
-- Dialogs stay visible above the keyboard on mobile instead of getting hidden behind it
-- Editing an existing article no longer incorrectly warns about a duplicate slug
-- Switching between rich text and markdown source mode no longer clears your content
-- Fix crash when editing in markdown source mode
-
-## [2.3.0] - 2026-04-02
-
-### Added
-- In-app article editor with a rich text toolbar, image uploads, auto-saving drafts, and a "My Articles" tab to manage drafts and published articles
-
-### Fixed
-- Custom emoji no longer stretch to fill their container
-- Mobile drawer now closes when tapping footer links like Changelog or Privacy
-- Logged-out users now default to the global tab on content feeds instead of seeing an empty follows tab
-
-## [2.2.11] - 2026-04-02
-
-### Fixed
-- Fix crash caused by the "What's new" toast firing outside the router
-
-## [2.2.10] - 2026-04-02
-
-### Added
-- App cards for Nostr apps now display in feeds and detail pages with hero images, icons, and quick-launch buttons
-- "What's new" toast appears after an app update with a changelog preview and link to the full changelog
-
-### Changed
-- Changelog page redesigned with a hero section for the latest release, collapsible older entries, and category icons inline with each item
-
-### Fixed
-- Compose box now fully resets to its collapsed state after posting, including poll options and media trays
-
-## [2.2.9] - 2026-04-01
-
-### Added
-- Emoji pack creator and editor with drag-and-drop image upload, auto-generated identifiers, and description field
-- Blobbi companions now appear in feeds and post detail pages
-
-### Changed
-- Blobbi shop redesigned with a tile layout and instant buy -- no more categories or accessory tabs
-- Emoji packs without any valid emojis are now hidden from feeds
-- Custom emoji shortcode collisions across packs are automatically resolved with pack-prefixed names
-
-## [2.2.8] - 2026-04-01
-
-### Added
-- Full threaded reply trees on post detail pages with collapsible deep branches and "Show X more replies" for sibling threads
-- Broadcast button in the Event JSON dialog to re-publish any event to your relays
-
-### Changed
-- My Badges tab overhauled with drag-and-drop reordering, a scrollable list, and a showcase-style carousel for pending badges
-- Encrypted letter envelopes now show the mailing side first (sender and recipient), then flip to reveal the wax seal
-- Blobbi companions are more expressive -- richer status reactions, sleeping visuals, and body effects like dirt and hunger cues
-
-### Fixed
-- Notification dot not clearing after marking notifications as read
-- Followers/following modal staying open after navigating to a profile
-
-## [2.2.7] - 2026-03-31
-
-### Fixed
-- Nushu script in encrypted letters now renders correctly on Android and iOS
-
-## [2.2.6] - 2026-03-31
-
-### Added
-- Encrypted letters now appear as interactive 3D envelopes with Nushu script -- flip and open them to reveal the secret writing inside
-- Zap receipts and profile metadata events now render in feeds and detail pages
-- Remote signer callback page for login flows with Amber, Primal, and other signing apps
-
-### Changed
-- Post action buttons extracted into a reusable PostActionBar component
-- Badge detail page streamlined with unified tab bar
-
-### Fixed
-- Hashtags now support accented and Unicode characters
-- Letter compose opens correctly from notifications and the letters page
-- Letter font picker loads fonts so each option previews in the correct typeface
-- Zap comment positioned inside the right column instead of floating with offset
-- Safe-area padding on pinned SubHeaderBar only applies when scrolled to top
-
-## [2.2.5] - 2026-03-30
-
-### Fixed
-- Crash when dragging profile tabs to reorder them
-
-## [2.2.4] - 2026-03-30
-
-### Changed
-- Profiles now have an emoji reaction button instead of a zap button -- express yourself with any emoji or custom emoji right on someone's profile
-- Zap moved to the profile overflow menu so it's still one tap away
-
-### Fixed
-- Crash on the notifications page caused by malformed badge award tags
-- Deleting a badge now also deletes all awards you issued for it
-- Custom emoji reactions missing their image tag no longer render as broken shortcodes
-- Deletion requests for addressable events now include both `e` and `a` tags for broader relay compatibility
-- Profile reactions no longer collapse into a single grouped notification
-- Oversized reaction emoji in comment context headers
-
-## [2.2.3] - 2026-03-30
-
-### Added
-- Letters now have an overflow menu, reply button, and a grid layout for browsing
-- Independent feed toggles for comments and generic reposts in content settings
-- Sidebar items are now visible to logged-out users so newcomers can explore everything
-
-### Changed
-- Compose textarea expands smoothly as you type instead of snapping to a new height
-- Blobbi stickers auto-shrink near card edges and clip cleanly at rounded boundaries
-
-### Fixed
-- Feed gaps when replies are disabled no longer cause missing posts
-- Avatar shape no longer flashes on load
-- Top bar arc no longer flickers during navigation transitions
-- Letter drawing-only sends, sticker drag bounds, and theme event preservation
-- Notification rendering for badges and letters
-- Duplicate React keys in content settings
-- Layout rendering warning when switching views
-
-## [2.2.2] - 2026-03-29
-
-### Added
-- Dedicated photo upload flow for sharing photos
-- Pull-to-refresh on all feed pages
-- 3D tilt effect on badge images -- hover over badges to see them pop
-- Multi-select badge awarding with indicators for already-sent badges
-- Badge list recovery dialog for restoring profile badge lists
-- Compact badge row preview in embedded profile badges events
-- Custom emoji usage tracking so your most-used custom emojis appear in the quick-react bar
-- Release notes now included in Zapstore publishing
-- Changelog link in the app footer
-
-### Changed
-- "Vines" renamed to "Divines" everywhere in the app
-- Custom emojis appear first in the emoji picker, right after recent
-- Threaded comment view now shows the parent event as a NoteCard with kind action headers
-
-### Fixed
-- Delete post dialog no longer freezes the feed on desktop
-- Amber login on Android now properly retries when returning from the background
-- Key downloads on Android save to the correct location
-- Custom emoji SVGs render correctly in the emoji-mart picker
-- Double-tap reactions now properly show the emoji on the post
-- Emoji shortcode autocomplete text and highlight colors
-- Profile skeleton no longer flickers for brand-new users with no metadata
-- Event links now route correctly for all event types
-- Badge notifications are now clickable
-- Custom profile tab form no longer retains fields from a previously edited tab
-- Double line under profile tabs in edit mode
-- Inconsistent use of "geocache" vs "treasures" terminology
-- Search page "N new posts" pill no longer shows unfiltered count
-- Stale-cache overwrites in replaceable event mutations
-- Click-through on delete confirmation and note menu items
-
-## [2.2.1] - 2026-03-28
-
-### Fixed
-- New posts no longer cause scroll jumps -- they buffer while you're reading and appear with a tap
-- Mobile header no longer shows double-layered backgrounds on notched devices
-- Pinned tabs stay properly positioned when scrolling on mobile
-- Signer approval toasts no longer fire in rapid succession on unstable connections
-- Toasts are easier to swipe away on mobile
-- Content warnings now blur thumbnails in the media grid
-
-## [2.2.0] - 2026-03-28
-
-### Added
-- Blobbi virtual pets -- adopt an egg, hatch it, evolve it into one of 16 adult forms, and care for it with feeding, cleaning, medicine, music, and singing
-- Blobbi companion that follows you around the app, tracks your cursor, blinks, expresses emotions, and reacts to what you're doing
-- Blobbi shop and inventory system with items that affect your pet's stats
-- Daily missions with reroll, care streaks, and stage-based rewards
-- Immersive full-screen divines experience on both mobile and desktop with floating controls
-- Relay information panel on the network settings page
-- Link preview cards now display inside quoted posts instead of raw URLs
-- Nsec paste guard warns you before accidentally pasting private keys outside the login field
-- Remote signer UX improvements for Amber users on Android
-- Badge awards now trigger push notifications
-- Badges display in profile bio section with a "Give badge" option in the profile menu
-
-### Changed
-- Notification "Mentions" tab now shows only pure mentions, filtering out replies
-- Notification preferences ("only from people I follow") now properly apply to push notifications, native Android notifications, and the unread dot
-- Upgraded from React 18 to React 19
-- Reduced initial bundle size by ~50% with improved code splitting and lazy loading
-
-### Fixed
-- Zapping Primal users no longer produces an error
-- Hashtag feeds now match case-insensitively for parity with search results
-- Mobile top bar arc no longer lingers on pages without tabs
-- Give Badge dialog and profile menu action handlers
-
-## [2.1.1] - 2026-03-27
-
-### Added
-- Emoji picker and shortcode autocomplete in zap comment box
-- Zap button on badge detail view
-- Theme descriptions now display on "updated their theme" posts and detail pages
-- Badge thumbnail previews in award notifications
-- Letter notifications with envelope card preview
-- Kind-specific labels in notification text instead of generic "post"
-
-### Fixed
-- Compose modal no longer closes when dismissing emoji picker on mobile
-- Compose preview overflow is now scrollable in modal
-- Toast notifications swipe up to dismiss on mobile instead of sideways
-- File downloads and URL opening work correctly on iOS
-- Badges page no longer shows infinite skeleton when logged out
-
-## [2.1.0] - 2026-03-26
-
-### Added
-- Letters -- a Wii Mail-inspired inbox for sending decorated letters to friends, complete with custom stationery, hand-drawn stickers, emoji stickers, fonts, and a send animation with envelope and wax seal
-- Attach a color moment or theme to your letter as a gift -- recipients can tap to apply it instantly
-- Stationery picker pulls from your color moments, followed users' themes, and built-in presets
-- Freehand drawing canvas for creating one-of-a-kind sticker doodles
-- Letters page added to the sidebar with a custom mailbox icon
-
-## [2.0.1] - 2026-03-26
-
-### Added
-- Tap the version number in settings to see what's new
-
-## [2.0.0] - 2026-03-26
-
-Initial release of Ditto 2.0 -- a complete rewrite of Ditto.
+- Initial Agora 3 release.

public/logo.svg

@@ -1,32 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <svg
-   version="1.1"
-   viewBox="-5 -10 100 100"
-   id="svg6"
-   width="100"
-   height="100"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs6" />
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+>
   <path
-     d="m 71.719615,49.36907 -0.62891,0.37109 c -0.12891,0.07031 -0.26172,0.14844 -0.39062,0.21875 -3.9883,10.309 -14.008,17.617 -25.699,17.617 -4.1211,0 -8.0312,-0.89844 -11.539,-2.5391 -0.12891,0.03906 -0.26172,0.07031 -0.39063,0.10156 l -0.35156,0.08984 h -0.02734 l -0.25,0.05859 -0.07813,0.01953 -0.10938,0.03125 c -0.55859,0.12891 -1.1289,0.26172 -1.6992,0.39062 -0.10156,0.03125 -0.19922,0.05078 -0.30078,0.07031 l -0.30078,0.10156 -0.18359,0.0078 c -0.26953,0.05859 -1.3086,0.26953 -1.3086,0.26953 -0.28906,0.05859 -0.55859,0.10937 -0.82813,0.17187 4.9805,3.3086 10.961,5.2305 17.371,5.2305 15.059,0 27.699,-10.602 30.828,-24.738 -0.75,0.48828 -1.5195,0.96875 -2.2891,1.4414 -0.59375,0.36328 -1.2031,0.72656 -1.8242,1.0859 z"
-     id="path1"
-     style="fill:#7c52e0;fill-opacity:1" />
-  <path
-     d="m 30.926615,29.47807 c 0.36328,-0.48828 0.75,-0.95312 1.1523,-1.3828 0.75781,-0.80469 0.71484,-2.0703 -0.08984,-2.8281 -0.80469,-0.75781 -2.0703,-0.71484 -2.8281,0.08984 -0.50781,0.53906 -0.99219,1.125 -1.4492,1.7383 -0.65625,0.88672 -0.47266,2.1406 0.41406,2.7969 0.35938,0.26562 0.77344,0.39453 1.1875,0.39453 0.61719,0 1.2227,-0.27734 1.6133,-0.80859 z"
-     id="path2"
-     style="fill:#7c52e0;fill-opacity:1" />
-  <path
-     d="m 26.742615,32.67807 c -1.0586,-0.3125 -2.1719,0.29687 -2.4805,1.3594 -0.55859,1.9062 -0.83984,3.9141 -0.83984,5.9609 0,2.3789 0.39062,4.7227 1.1602,6.9609 0.28516,0.82812 1.0625,1.3516 1.8906,1.3516 0.21484,0 0.43359,-0.03516 0.64844,-0.10938 1.043,-0.35938 1.6016,-1.4961 1.2422,-2.543 -0.625,-1.8203 -0.94141,-3.7227 -0.94141,-5.6602 0,-1.668 0.22656,-3.2969 0.67969,-4.8398 0.30859,-1.0586 -0.30078,-2.168 -1.3594,-2.4805 z"
-     id="path3"
-     style="fill:#7c52e0;fill-opacity:1" />
-  <path
-     d="m 14.691615,48.83807 c 0.10156,0.33984 0.19922,0.67969 0.32812,1.0195 0.42969,1.3516 0.94922,2.6484 1.5781,3.9102 0.10156,-0.01172 0.21094,-0.01172 0.32031,-0.01953 l 0.16016,-0.01172 0.80078,-0.07031 c 0.37109,-0.03906 0.67188,-0.07031 0.98047,-0.10156 0.51172,-0.05859 1.0195,-0.12109 1.5586,-0.19922 l 0.21875,-0.03125 c 0.07031,-0.01172 0.14062,-0.01953 0.21094,-0.03125 -1.2188,-2.2109 -2.1484,-4.6016 -2.7305,-7.1211 -0.16016,-0.71094 -0.30078,-1.4297 -0.39844,-2.1602 -0.19922,-1.3086 -0.30078,-2.6602 -0.30078,-4.0312 0,-0.89844 0.03906,-1.7812 0.12891,-2.6484 0.07031,-0.71094 0.16016,-1.4102 0.28906,-2.1016 2.25,-12.949 13.57,-22.828 27.16,-22.828 6.0508,0 11.648,1.9609 16.211,5.3008 0.57031,0.41016 1.1289,0.85938 1.6719,1.3203 1.6914,1.4219 3.2109,3.0703 4.5,4.8789 0.42969,0.60156 0.83984,1.2109 1.2188,1.8398 1.3203,2.1602 2.3398,4.5117 3.0195,7 0.23828,-0.17188 0.42969,-0.30859 0.62891,-0.46875 0.64844,-0.48047 1.2109,-0.92188 1.7383,-1.3398 0.28125,-0.23047 0.5,-0.41016 0.71094,-0.57812 0.10156,-0.07813 0.19141,-0.16016 0.28125,-0.23828 -0.42969,-1.3516 -0.96094,-2.6484 -1.5898,-3.8984 -0.14062,-0.32812 -0.30859,-0.64844 -0.48047,-0.96875 -0.32812,-0.64844 -0.69922,-1.2891 -1.0898,-1.9102 -1.6797,-2.7109 -3.7695,-5.1406 -6.1719,-7.2188 -0.57031,-0.48828 -1.1484,-0.96875 -1.7617,-1.4102 -0.55859,-0.42188 -1.1406,-0.82812 -1.7305,-1.2109 -4.9414,-3.2188 -10.852,-5.0898 -17.16,-5.0898 -14.961,0 -27.531,10.469 -30.75,24.469 -0.17188,0.67969 -0.30859,1.3711 -0.42188,2.0703 -0.12891,0.73828 -0.21875,1.5 -0.28906,2.2617 -0.07813,0.91016 -0.12109,1.8398 -0.12109,2.7812 0,2.3008 0.25,4.5508 0.71875,6.7109 0.17188,0.71484 0.35156,1.4258 0.5625,2.125 z"
-     id="path4"
-     style="fill:#7c52e0;fill-opacity:1" />
-  <path
-     d="m 90.441615,21.60007 c -2.1797,-5.3398 -9.4102,-7.3984 -21,-6.0391 1.8906,1.8906 3.5391,3.9688 4.9297,6.2109 0.28906,0.46094 0.55859,0.92187 0.80859,1.3789 5.5391,-0.12109 7.6094,1.0391 7.8398,1.4492 0.12891,0.46875 -0.55078,2.7305 -4.5898,6.4805 -0.01953,0.01953 -0.03125,0.03125 -0.03906,0.03906 -0.26172,0.23828 -0.51953,0.48047 -0.80078,0.71875 -0.19922,0.17969 -0.41016,0.35938 -0.62891,0.53906 -0.10938,0.10156 -0.21875,0.19141 -0.33984,0.28906 -0.23828,0.19922 -0.5,0.41016 -0.76172,0.62109 -0.12891,0.10156 -0.26172,0.21094 -0.39844,0.32031 -0.42969,0.33984 -0.89063,0.69141 -1.3711,1.0508 -0.26953,0.21094 -0.53906,0.41016 -0.82812,0.60938 -0.32031,0.23047 -0.64062,0.46875 -0.98047,0.69922 0,0.01172 -0.01172,0.01172 -0.01172,0.01172 -0.26953,0.19141 -0.55078,0.37891 -0.82812,0.57031 -0.28125,0.19141 -0.55859,0.37109 -0.85156,0.55859 -0.25,0.16016 -0.5,0.32812 -0.76172,0.48828 -6,3.8984 -13.48,7.7188 -21.379,10.922 -8.0117,3.2383 -15.871,5.6602 -22.93,7.0391 -0.30078,0.05859 -0.60156,0.12109 -0.89062,0.17188 -0.60938,0.12109 -1.2188,0.21875 -1.8203,0.32031 -0.07031,0.01172 -0.12891,0.01953 -0.19922,0.03125 h -0.01953 c -0.28906,0.05078 -0.57031,0.08984 -0.83984,0.12891 -0.30859,0.05078 -0.60938,0.08984 -0.91016,0.12891 -0.57031,0.07813 -1.1094,0.14844 -1.6406,0.21094 -0.35156,0.03906 -0.69141,0.07031 -1.0195,0.10156 -0.30078,0.03125 -0.58984,0.05078 -0.87891,0.07813 -0.48047,0.03125 -0.92969,0.05859 -1.3711,0.07813 -0.39844,0.01953 -0.78125,0.03125 -1.1484,0.03906 -5.5116996,0.10938 -7.5702996,-1.0391 -7.8007996,-1.4492 -0.12891,-0.48047 0.55078,-2.7383 4.6093996,-6.5 -0.12891,-0.48828 -0.26172,-1 -0.37891,-1.5391 -0.51953,-2.4219 -0.78906,-4.8906 -0.78906,-7.3594 0,-0.17969 0,-0.37109 0.01172,-0.55078 -9.2733996,7.082 -13.0229996,13.59 -10.8749996,18.949 1.7383,4.2695 6.7188,6.4492 14.5899996,6.4492 2.8594,0 6.1016,-0.28906 9.7109,-0.87109 0.17188,-0.03125 0.33984,-0.05859 0.51953,-0.08984 0.17188,-0.03125 0.35156,-0.05859 0.51953,-0.08984 l 1.2188,-0.21875 c 0.57031,-0.10156 1.1484,-0.21875 1.7305,-0.33984 0.53125,-0.10938 1.0508,-0.21094 1.5781,-0.32812 0.01172,0 0.03125,-0.01172 0.03906,-0.01172 0.05078,-0.01172 0.08984,-0.01953 0.14062,-0.03125 0.07031,-0.01172 0.12891,-0.03125 0.19922,-0.05078 0.57812,-0.12891 1.1602,-0.26172 1.7383,-0.39844 0.05078,-0.01172 0.10156,-0.03125 0.14844,-0.03906 0.21094,-0.05078 0.42188,-0.10156 0.64062,-0.14844 h 0.01172 c 6.0898,-1.5117 12.559,-3.6406 19.102,-6.2891 6.5508,-2.6602 12.68,-5.6289 18.109,-8.7812 0.21875,-0.12891 0.44141,-0.26172 0.66016,-0.39062 0.58984,-0.33984 1.1797,-0.69141 1.7617,-1.0508 1.5703,-0.96094 3.0586,-1.9297 4.4805,-2.9102 0.12891,-0.08984 0.26172,-0.17969 0.39062,-0.26953 11.242,-7.8477 15.941,-15.09 13.594,-20.938 z"
-     id="path5"
-     style="fill:#7c52e0;fill-opacity:1" />
+    d="M13 2L3 14h8l-1 8 10-12h-8l1-8z"
+    fill="black"
+    stroke="black"
+    stroke-width="1.5"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  />
 </svg>

public/manifest.webmanifest

@@ -1,11 +1,11 @@
 {
-  "name": "Ditto",
-  "short_name": "Ditto",
-  "description": "A carnival, not a platform. Color, whimsy, games, and endless customization — the most fun you've had on the internet in years.",
+  "name": "Agora",
+  "short_name": "Agora",
+  "description": "Power to the people. Organize, create, and connect across the open Nostr network.",
   "start_url": "/",
   "display": "standalone",
-  "background_color": "#161b2e",
-  "theme_color": "#7c3aed",
+  "background_color": "#0a0c14",
+  "theme_color": "#e85d3c",
   "icons": [
     {
       "src": "/icon-192.png",

public/sw.js

@@ -1,5 +1,5 @@
 /**
- * Ditto Service Worker
+ * Agora Service Worker
  *
  * Handles incoming Web Push notifications from the nostr-push server and
  * opens/focuses the app when the user taps a notification.
@@ -14,17 +14,17 @@ self.addEventListener('push', (event) => {
   try {
     payload = event.data.json();
   } catch {
-    payload = { title: 'Ditto', body: event.data.text() };
+    payload = { title: 'Agora', body: event.data.text() };
   }
 
-  const title = payload.title ?? 'Ditto';
+  const title = payload.title ?? 'Agora';
   const options = {
     body: payload.body ?? '',
     icon: payload.icon ?? '/icon-192.png',
     badge: payload.badge ?? '/icon-192.png',
     data: payload.data ?? {},
     requireInteraction: false,
-    tag: payload.data?.subscription_id ?? 'ditto-notification',
+    tag: payload.data?.subscription_id ?? 'agora-notification',
     renotify: true,
   };
 
@@ -42,7 +42,7 @@ self.addEventListener('notificationclick', (event) => {
     self.clients
       .matchAll({ type: 'window', includeUncontrolled: true })
       .then((clientList) => {
-        // Focus an existing Ditto tab if one is open
+        // Focus an existing Agora tab if one is open
         for (const client of clientList) {
           if (new URL(client.url).origin === self.location.origin) {
             client.navigate('/notifications');

public/theme.js

@@ -4,8 +4,8 @@
 (function () {
   // Builtin themes — must match builtinThemes in src/themes.ts
   var builtins = {
-    dark:  { bg: 'hsl(228 20% 10%)', primary: 'hsl(258 70% 60%)' },
-    light: { bg: 'hsl(270 50% 97%)', primary: 'hsl(270 65% 55%)' }
+    dark:  { bg: 'hsl(0 0% 10%)', primary: 'hsl(15 90% 52%)' },
+    light: { bg: 'hsl(0 0% 100%)', primary: 'hsl(15 90% 48%)' }
   };
 
   var theme = 'dark';

scripts/nip46-auth.mjs

@@ -33,7 +33,7 @@ function parseArgs() {
   const args = process.argv.slice(2);
   const result = {
     relays: [],
-    name: 'Ditto',
+    name: 'Agora',
     timeout: 300, // seconds
   };
 
@@ -54,9 +54,9 @@ function parseArgs() {
 
 Options:
   --relay <url>    Relay URL for NIP-46 communication (repeatable)
-                   Default: wss://relay.ditto.pub
+                   Default: wss://relay.agora.spot
   --name <name>    Application name shown to the signer
-                   Default: Ditto
+                   Default: Agora
   --timeout <sec>  How long to wait for signer approval (seconds)
                    Default: 300 (5 minutes)
   --help, -h       Show this help message
@@ -66,7 +66,7 @@ Options:
   }
 
   if (result.relays.length === 0) {
-    result.relays.push('wss://relay.ditto.pub');
+    result.relays.push('wss://relay.agora.spot');
   }
 
   return result;

scripts/patch-cap-config.mjs

@@ -16,7 +16,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 
 /** Local plugin class names to ensure are registered. */
-const LOCAL_PLUGINS = ['SandboxPlugin'];
+const LOCAL_PLUGINS = ['SandboxPlugin', 'DittoNotificationPlugin'];
 
 const platforms = ['ios/App/App', 'android/app/src/main/assets'];
 

src/App.tsx

@@ -1,15 +1,14 @@
 // NOTE: This file should normally not be modified unless you are adding a new provider.
 // To add new routes, edit the AppRouter.tsx file.
 
-import { Capacitor } from "@capacitor/core";
-import { StatusBar, Style } from "@capacitor/status-bar";
+import { Capacitor, SystemBars, SystemBarsStyle } from "@capacitor/core";
 import { NostrLoginProvider } from "@nostrify/react/login";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { InferSeoMetaPlugin } from "@unhead/addons";
 import { createHead, UnheadProvider } from "@unhead/react/client";
 import { useEffect } from "react";
 import { AppProvider } from "@/components/AppProvider";
-import { DMProvider, type DMConfig } from "@/components/DMProvider";
+import { DMProviderWrapper } from "@/components/DMProviderWrapper";
 import { InitialSyncGate } from "@/components/InitialSyncGate";
 import { NativeNotifications } from "@/components/NativeNotifications";
 import NostrProvider from "@/components/NostrProvider";
@@ -22,17 +21,12 @@ import { TooltipProvider } from "@/components/ui/tooltip";
 import { useNsecPasteGuard } from "@/hooks/useNsecPasteGuard";
 import type { AppConfig } from "@/contexts/AppContext";
 import { NWCProvider } from "@/contexts/NWCContext";
-import { PROTOCOL_MODE } from "@/lib/dmConstants";
-import { DittoConfigSchema, type DittoConfig } from "@/lib/schemas";
+import { SparkWalletProvider } from "@/contexts/SparkWalletContext";
+import { BuildConfigSchema, type BuildConfig } from "@/lib/schemas";
 import { secureStorage } from "@/lib/secureStorage";
-import { EmotionDevProvider } from "@/blobbi/dev/EmotionDevContext";
+import { PROTOCOL_MODE } from "@samthomson/nostr-messaging/core";
 import AppRouter from "./AppRouter";
 
-const dmConfig: DMConfig = {
-  enabled: false,
-  protocolMode: PROTOCOL_MODE.NIP04_OR_NIP17,
-};
-
 const head = createHead({
   plugins: [InferSeoMetaPlugin()],
 });
@@ -49,13 +43,12 @@ const queryClient = new QueryClient({
 
 /** Hardcoded fallback values. Always provides every required field. */
 const hardcodedConfig: AppConfig = {
-  appName: "Ditto",
-  appId: "ditto",
+  appName: "Agora",
+  appId: "agora",
   homePage: "feed",
   client: "naddr1qvzqqqru7cpzq7q6z5ns2hm5c8msyv83qwzxpxe52j8c4d4q5m92wsp9sflelkh9qqzkg6t5w3hswjl4yp",
   magicMouse: false,
   theme: "system",
-  autoShareTheme: true,
   useAppRelays: true,
   relayMetadata: {
     relays: [],
@@ -92,13 +85,6 @@ const hardcodedConfig: AppConfig = {
     showVideos: true,
     feedIncludeNormalVideos: true,
     feedIncludeShortVideos: true,
-    showProfileThemes: false,
-    feedIncludeProfileThemes: true,
-    showThemeDefinitions: true,
-    feedIncludeThemeDefinitions: true,
-    showProfileThemeUpdates: true,
-    feedIncludeProfileThemeUpdates: true,
-    showCustomProfileThemes: true,
     feedIncludeVoiceMessages: true,
     showEmojiPacks: true,
     feedIncludeEmojiPacks: true,
@@ -112,26 +98,29 @@ const hardcodedConfig: AppConfig = {
     feedIncludePodcastTrailers: true,
     showDevelopment: true,
     feedIncludeDevelopment: true,
+    showCommunities: true,
+    feedIncludeCommunities: true,
     showBadges: true,
     showBadgeDefinitions: true,
     showProfileBadges: true,
     feedIncludeBadgeDefinitions: true,
     feedIncludeProfileBadges: true,
     feedIncludeVanish: true,
-    feedIncludeBlobbi: true,
     followsFeedShowReplies: true,
   },
   sidebarOrder: [
+    "wallet",
+    "verified",
+    "actions",
+    "polls",
+    "world",
+    "badges",
     "feed",
     "notifications",
-    "search",
-    "blobbi",
-    "badges",
-    "emojis",
-    "letters",
-    "themes",
+    "messages",
+    "communities",
+    "profile",
     "settings",
-    "help",
   ],
   nip85StatsPubkey:
     "5f68e85ee174102ca8978eef302129f081f03456c884185d5ec1c1224ab633ea",
@@ -152,45 +141,63 @@ const hardcodedConfig: AppConfig = {
   imageQuality: 'compressed',
   curatorPubkey: '932614571afcbad4d17a191ee281e39eebbb41b93fac8fd87829622aeb112f4d',
   sandboxDomain: 'iframe.diy',
+  sidebarWidgets: [
+    { id: 'trends' },
+    { id: 'hot-posts' },
+    { id: 'ai-chat' },
+  ],
+  messaging: {
+    enabled: true,
+    relayMode: 'hybrid',
+    protocolMode: PROTOCOL_MODE.NIP17_ONLY,
+    renderInlineMedia: true,
+    soundEnabled: false,
+    devMode: false,
+  },
+  aiBaseURL: 'https://ai.shakespeare.diy/v1',
+  aiApiKey: '',
+  aiModel: 'grok-4.1-fast',
+  aiSystemPrompt: '',
 };
 
 /**
- * Parse and validate build-time ditto.json overrides from the env string.
+ * Parse and validate build-time app config overrides from the env string.
  * Returns an empty object when no config file was provided or validation fails.
  */
-function parseDittoConfig(): DittoConfig {
+function parseBuildConfig(): BuildConfig {
   try {
-    const json = JSON.parse(import.meta.env.DITTO_CONFIG);
+    const encodedConfig = import.meta.env.APP_CONFIG ?? import.meta.env.DITTO_CONFIG;
+    const json = JSON.parse(encodedConfig);
     if (!json) return {};
-    return DittoConfigSchema.parse(json);
+    return BuildConfigSchema.parse(json);
   } catch {
     return {};
   }
 }
 
 /**
- * Merge hardcoded defaults with build-time ditto.json overrides.
+ * Merge hardcoded defaults with build-time config overrides.
  * Deep-merges feedSettings so a partial override doesn't erase defaults.
  * Precedence (handled by AppProvider): user localStorage > build-time > hardcoded.
  */
-const dittoConfig = parseDittoConfig();
+const buildConfig = parseBuildConfig();
 const defaultConfig: AppConfig = {
   ...hardcodedConfig,
-  ...dittoConfig,
-  feedSettings: { ...hardcodedConfig.feedSettings, ...dittoConfig.feedSettings },
+  ...buildConfig,
+  feedSettings: { ...hardcodedConfig.feedSettings, ...buildConfig.feedSettings },
 };
 
 export function App() {
   useNsecPasteGuard();
 
   useEffect(() => {
-    // Initialize StatusBar for mobile apps
+    // Initialize system bars for mobile apps.
+    // On Android 16+ (API 36), edge-to-edge is enforced by the OS so
+    // setOverlaysWebView / setBackgroundColor no longer work. The new
+    // SystemBars API (bundled with @capacitor/core 8+) is the replacement.
     if (Capacitor.isNativePlatform()) {
-      StatusBar.setStyle({ style: Style.Dark }).catch(() => {
-        // StatusBar may not be available on all platforms
-      });
-      StatusBar.setOverlaysWebView({ overlay: true }).catch(() => {
-        // Ignore errors on unsupported platforms
+      SystemBars.setStyle({ style: SystemBarsStyle.Dark }).catch(() => {
+        // SystemBars may not be available on all platforms
       });
     }
   }, []);
@@ -207,15 +214,15 @@ export function App() {
                   <NativeNotifications />
 
                     <NWCProvider>
-                    <DMProvider config={dmConfig}>
-                      <EmotionDevProvider>
-                        <TooltipProvider>
-                          <InitialSyncGate>
-                            <AppRouter />
-                          </InitialSyncGate>
-                        </TooltipProvider>
-                      </EmotionDevProvider>
-                    </DMProvider>
+                    <SparkWalletProvider>
+                    <DMProviderWrapper>
+                      <TooltipProvider>
+                        <InitialSyncGate>
+                          <AppRouter />
+                        </InitialSyncGate>
+                      </TooltipProvider>
+                    </DMProviderWrapper>
+                    </SparkWalletProvider>
                   </NWCProvider>
                 </NostrProvider>
               </NostrLoginProvider>

src/AppRouter.tsx

@@ -4,7 +4,6 @@ import { AudioNavigationGuard } from "@/components/AudioNavigationGuard";
 import { DeepLinkHandler } from "@/components/DeepLinkHandler";
 import { MinimizedAudioBar } from "@/components/MinimizedAudioBar";
 import { AudioPlayerProvider } from "@/contexts/AudioPlayerContext";
-import { BlobbiActionsProvider } from "@/blobbi/companion/interaction/BlobbiActionsProvider";
 import { sidebarItemIcon } from "@/lib/sidebarItems";
 import { Toaster } from "./components/ui/toaster";
 import { MainLayout } from "./components/MainLayout";
@@ -17,29 +16,22 @@ import { getExtraKindDef } from "./lib/extraKinds";
 // Critical-path pages: eagerly loaded (landing + fallback)
 import Index from "./pages/Index";
 import NotFound from "./pages/NotFound";
-
-// Lazy-loaded companion layer (~450K code-split)
-const BlobbiCompanionLayer = lazy(() => import("@/blobbi/companion").then(m => ({ default: m.BlobbiCompanionLayer })));
+import MessagesPage from "./pages/Messages";
 
 // Lazy-loaded compose modal (pulls in emoji-mart ~620K)
 const ReplyComposeModal = lazy(() => import("@/components/ReplyComposeModal").then(m => ({ default: m.ReplyComposeModal })));
 
-// Lazy-loaded emoji pack dialog
-const EmojiPackDialog = lazy(() => import("@/components/EmojiPackDialog").then(m => ({ default: m.EmojiPackDialog })));
-
 // HomePage eagerly imported all page components; now lazy-loaded
 const HomePage = lazy(() => import("./pages/HomePage").then(m => ({ default: m.HomePage })));
 
 // All other pages: code-split via React.lazy
+const ActionsPage = lazy(() => import("./pages/ActionsPage"));
 const AdvancedSettingsPage = lazy(() => import("./pages/AdvancedSettingsPage").then(m => ({ default: m.AdvancedSettingsPage })));
-const AIChatPage = lazy(() => import("./pages/AIChatPage").then(m => ({ default: m.AIChatPage })));
-const ArchivePage = lazy(() => import("./pages/ArchivePage").then(m => ({ default: m.ArchivePage })));
+const AppearanceSettingsPage = lazy(() => import("./pages/AppearanceSettingsPage").then(m => ({ default: m.AppearanceSettingsPage })));
 const ArticleEditorPage = lazy(() => import("./pages/ArticleEditorPage").then(m => ({ default: m.ArticleEditorPage })));
 const BadgesPage = lazy(() => import("./pages/BadgesPage").then(m => ({ default: m.BadgesPage })));
-const BlobbiPage = lazy(() => import("./pages/BlobbiPage").then(m => ({ default: m.BlobbiPage })));
-const BlueskyPage = lazy(() => import("./pages/BlueskyPage").then(m => ({ default: m.BlueskyPage })));
+const CommunitiesPage = lazy(() => import("./pages/CommunitiesPage").then(m => ({ default: m.CommunitiesPage })));
 const BookmarksPage = lazy(() => import("./pages/BookmarksPage").then(m => ({ default: m.BookmarksPage })));
-const BooksPage = lazy(() => import("./pages/BooksPage").then(m => ({ default: m.BooksPage })));
 const ChangelogPage = lazy(() => import("./pages/ChangelogPage").then(m => ({ default: m.ChangelogPage })));
 const ContentPage = lazy(() => import("./pages/ContentPage").then(m => ({ default: m.ContentPage })));
 const ContentSettingsPage = lazy(() => import("./pages/ContentSettingsPage").then(m => ({ default: m.ContentSettingsPage })));
@@ -55,38 +47,29 @@ const LetterComposePage = lazy(() => import("./pages/LetterComposePage").then(m
 const LetterPreferencesPage = lazy(() => import("./pages/LetterPreferencesPage").then(m => ({ default: m.LetterPreferencesPage })));
 const LettersPage = lazy(() => import("./pages/LettersPage").then(m => ({ default: m.LettersPage })));
 const MagicSettingsPage = lazy(() => import("./pages/MagicSettingsPage").then(m => ({ default: m.MagicSettingsPage })));
-const MusicFeedPage = lazy(() => import("./pages/MusicFeedPage").then(m => ({ default: m.MusicFeedPage })));
+const MessagingSettingsPage = lazy(() => import("./pages/MessagingSettingsPage").then(m => ({ default: m.MessagingSettingsPage })));
 const NetworkSettingsPage = lazy(() => import("./pages/NetworkSettingsPage").then(m => ({ default: m.NetworkSettingsPage })));
 const NIP19Page = lazy(() => import("./pages/NIP19Page").then(m => ({ default: m.NIP19Page })));
 const NotificationSettings = lazy(() => import("./pages/NotificationSettings").then(m => ({ default: m.NotificationSettings })));
 const NotificationsPage = lazy(() => import("./pages/NotificationsPage").then(m => ({ default: m.NotificationsPage })));
+const AIChatPage = lazy(() => import("./pages/AIChatPage").then(m => ({ default: m.AIChatPage })));
+const OrganizersPage = lazy(() => import("./pages/OrganizersPage").then(m => ({ default: m.OrganizersPage })));
 const PhotosFeedPage = lazy(() => import("./pages/PhotosFeedPage").then(m => ({ default: m.PhotosFeedPage })));
-const PodcastsFeedPage = lazy(() => import("./pages/PodcastsFeedPage").then(m => ({ default: m.PodcastsFeedPage })));
 const PrivacyPolicyPage = lazy(() => import("./pages/PrivacyPolicyPage").then(m => ({ default: m.PrivacyPolicyPage })));
 const ProfileSettings = lazy(() => import("./pages/ProfileSettings").then(m => ({ default: m.ProfileSettings })));
 const RelayPage = lazy(() => import("./pages/RelayPage").then(m => ({ default: m.RelayPage })));
 const SearchPage = lazy(() => import("./pages/SearchPage").then(m => ({ default: m.SearchPage })));
 const SettingsPage = lazy(() => import("./pages/SettingsPage").then(m => ({ default: m.SettingsPage })));
-const ThemesPage = lazy(() => import("./pages/ThemesPage").then(m => ({ default: m.ThemesPage })));
-const TreasuresPage = lazy(() => import("./pages/TreasuresPage").then(m => ({ default: m.TreasuresPage })));
-const TrendsPage = lazy(() => import("./pages/TrendsPage").then(m => ({ default: m.TrendsPage })));
 const UserListsPage = lazy(() => import("./pages/UserListsPage").then(m => ({ default: m.UserListsPage })));
-const VideosFeedPage = lazy(() => import("./pages/VideosFeedPage").then(m => ({ default: m.VideosFeedPage })));
-const VinesFeedPage = lazy(() => import("./pages/VinesFeedPage").then(m => ({ default: m.VinesFeedPage })));
 const WalletSettingsPage = lazy(() => import("./pages/WalletSettingsPage").then(m => ({ default: m.WalletSettingsPage })));
-const WebxdcFeedPage = lazy(() => import("./pages/WebxdcFeedPage").then(m => ({ default: m.WebxdcFeedPage })));
-const WikipediaPage = lazy(() => import("./pages/WikipediaPage").then(m => ({ default: m.WikipediaPage })));
+const WalletPage = lazy(() => import("./pages/WalletPage").then(m => ({ default: m.WalletPage })));
 const WorldPage = lazy(() => import("./pages/WorldPage").then(m => ({ default: m.WorldPage })));
+const VerifiedPage = lazy(() => import("./pages/VerifiedPage").then(m => ({ default: m.VerifiedPage })));
 const FollowPage = lazy(() => import("./pages/FollowPage").then(m => ({ default: m.FollowPage })));
 const RemoteLoginSuccessPage = lazy(() => import("./pages/RemoteLoginSuccessPage").then(m => ({ default: m.RemoteLoginSuccessPage })));
 
 const pollsDef = getExtraKindDef("polls")!;
-const colorsDef = getExtraKindDef("colors")!;
-const packsDef = getExtraKindDef("packs")!;
 const articlesDef = getExtraKindDef("articles")!;
-const decksDef = getExtraKindDef("decks")!;
-const emojisDef = getExtraKindDef("emojis")!;
-const developmentDef = getExtraKindDef("development")!;
 
 /** Polls feed page with a FAB that opens the compose modal (poll mode via + menu). */
 function PollsFeedPage() {
@@ -108,26 +91,6 @@ function PollsFeedPage() {
   );
 }
 
-/** Emoji feed page with a FAB that opens the emoji pack creation dialog. */
-function EmojiFeedPage() {
-  const [composeOpen, setComposeOpen] = useState(false);
-  return (
-    <>
-      <KindFeedPage
-        kind={emojisDef.kind}
-        title={emojisDef.label}
-        icon={sidebarItemIcon("emojis", "size-5")}
-        onFabClick={() => setComposeOpen(true)}
-      />
-      {composeOpen && (
-        <Suspense fallback={null}>
-          <EmojiPackDialog open={composeOpen} onOpenChange={setComposeOpen} />
-        </Suspense>
-      )}
-    </>
-  );
-}
-
 /** Redirects /profile to the user's canonical profile URL (nip05 or npub). */
 function ProfileRedirect() {
   const { user, metadata } = useCurrentUser();
@@ -146,11 +109,6 @@ export function AppRouter() {
         <AudioNavigationGuard />
         <DeepLinkHandler />
         <ScrollToTop />
-        <BlobbiActionsProvider>
-          <Suspense fallback={null}>
-            <BlobbiCompanionLayer />
-          </Suspense>
-        </BlobbiActionsProvider>
         <Routes>
           {/* Auto-follow deep link: fullscreen immersive (no sidebars/nav) */}
           <Route path="/follow/:npub" element={<FollowPage />} />
@@ -160,13 +118,14 @@ export function AppRouter() {
             <Route path="/" element={<HomePage />} />
             <Route path="/feed" element={<Index />} />
             <Route path="/notifications" element={<NotificationsPage />} />
+            <Route path="/messages" element={<MessagesPage />} />
             <Route path="/search" element={<SearchPage />} />
-            <Route path="/trends" element={<TrendsPage />} />
             <Route path="/profile" element={<ProfileRedirect />} />
              <Route path="/t/:tag" element={<HashtagPage />} />
              <Route path="/g/:geohash" element={<GeotagPage />} />
             <Route path="/feed/:domain" element={<DomainFeedPage />} />
             <Route path="/settings" element={<SettingsPage />} />
+            <Route path="/settings/appearance" element={<AppearanceSettingsPage />} />
             <Route path="/settings/profile" element={<ProfileSettings />} />
             <Route path="/settings/feed" element={<ContentSettingsPage />} />
             <Route path="/settings/content" element={<ContentPage />} />
@@ -175,6 +134,7 @@ export function AppRouter() {
               path="/settings/notifications"
               element={<NotificationSettings />}
             />
+            <Route path="/settings/messaging" element={<MessagingSettingsPage />} />
             <Route
               path="/settings/advanced"
               element={<AdvancedSettingsPage />}
@@ -184,38 +144,7 @@ export function AppRouter() {
             <Route path="/lists" element={<UserListsPage />} />
             <Route path="/events" element={<EventsFeedPage />} />
             <Route path="/photos" element={<PhotosFeedPage />} />
-            <Route path="/videos" element={<VideosFeedPage />} />
-            {/* /streams redirects to /videos for backward compatibility */}
-            <Route
-              path="/streams"
-              element={<Navigate to="/videos" replace />}
-            />
-            <Route path="/vines" element={<VinesFeedPage />} />
-            <Route path="/music" element={<MusicFeedPage />} />
-            <Route path="/podcasts" element={<PodcastsFeedPage />} />
             <Route path="/polls" element={<PollsFeedPage />} />
-            <Route path="/treasures" element={<TreasuresPage />} />
-            <Route
-              path="/colors"
-              element={
-                <KindFeedPage
-                  kind={colorsDef.kind}
-                  title={colorsDef.label}
-                  icon={sidebarItemIcon("colors", "size-5")}
-                />
-              }
-            />
-            <Route
-              path="/packs"
-              element={
-                <KindFeedPage
-                  kind={packsDef.kind}
-                  title={packsDef.label}
-                  icon={sidebarItemIcon("packs", "size-5")}
-                />
-              }
-            />
-            <Route path="/webxdc" element={<WebxdcFeedPage />} />
             <Route path="/articles/new" element={<ArticleEditorPage />} />
             <Route path="/articles/edit/:naddr" element={<ArticleEditorPage />} />
             <Route
@@ -229,41 +158,12 @@ export function AppRouter() {
                 />
               }
             />
-            <Route
-              path="/decks"
-              element={
-                <KindFeedPage
-                  kind={decksDef.kind}
-                  title={decksDef.label}
-                  icon={sidebarItemIcon("decks", "size-5")}
-                />
-              }
-            />
-            <Route path="/emojis" element={<EmojiFeedPage />} />
-            <Route
-              path="/development"
-              element={
-                <KindFeedPage
-                  kind={[
-                    developmentDef.kind,
-                    ...(developmentDef.extraFeedKinds ?? []),
-                  ]}
-                  title={developmentDef.label}
-                  icon={sidebarItemIcon("development", "size-5")}
-                  showFAB={false}
-                />
-              }
-            />
-            <Route path="/themes" element={<ThemesPage />} />
             <Route path="/bookmarks" element={<BookmarksPage />} />
-            <Route path="/ai-chat" element={<AIChatPage />} />
-            <Route path="/blobbi" element={<BlobbiPage />} />
+            <Route path="/wallet" element={<WalletPage />} />
+            <Route path="/verified" element={<VerifiedPage />} />
             <Route path="/world" element={<WorldPage />} />
             <Route path="/badges" element={<BadgesPage />} />
-            <Route path="/books" element={<BooksPage />} />
-            <Route path="/archive" element={<ArchivePage />} />
-            <Route path="/bluesky" element={<BlueskyPage />} />
-            <Route path="/wikipedia" element={<WikipediaPage />} />
+            <Route path="/communities" element={<CommunitiesPage />} />
             <Route path="/letters" element={<LettersPage />} />
             <Route path="/letters/compose" element={<LetterComposePage />} />
             <Route path="/settings/letters" element={<LetterPreferencesPage />} />
@@ -277,6 +177,9 @@ export function AppRouter() {
               element={<Navigate to="/lists" replace />}
             />
             <Route path="/i/*" element={<ExternalContentPage />} />
+            <Route path="/actions" element={<ActionsPage />} />
+            <Route path="/agent" element={<AIChatPage />} />
+            <Route path="/organizers" element={<OrganizersPage />} />
 
             {/* Callback target for remote signers (e.g. Amber, Primal) after NIP-46 approval */}
             <Route path="/remoteloginsuccess" element={<RemoteLoginSuccessPage />} />

src/blobbi/actions/components/BlobbiActionInventoryModal.tsx

@@ -1,317 +0,0 @@
-// src/blobbi/actions/components/BlobbiActionInventoryModal.tsx
-
-import { useMemo } from 'react';
-import { Loader2, X } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogClose,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-
-import type { BlobbiCompanion, BlobbonautProfile } from '@/blobbi/core/lib/blobbi';
-import { cn } from '@/lib/utils';
-
-import {
-  filterInventoryByAction,
-  previewStatChanges,
-  previewMedicineForEgg,
-  previewCleanForEgg,
-  canUseAction,
-  getStageRestrictionMessage,
-  ACTION_METADATA,
-  type InventoryAction,
-  type ResolvedInventoryItem,
-  type EggStatPreview,
-} from '../lib/blobbi-action-utils';
-
-interface BlobbiActionInventoryModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  action: InventoryAction;
-  companion: BlobbiCompanion;
-  profile: BlobbonautProfile | null;
-  /** Called when user taps Use on an item. Always uses once. */
-  onUseItem: (itemId: string) => void;
-  onOpenShop: () => void;
-  isUsingItem: boolean;
-  usingItemId: string | null;
-}
-
-export function BlobbiActionInventoryModal({
-  open,
-  onOpenChange,
-  action,
-  companion,
-  profile: _profile,
-  onUseItem,
-  onOpenShop: _onOpenShop,
-  isUsingItem,
-  usingItemId,
-}: BlobbiActionInventoryModalProps) {
-  const actionMeta = ACTION_METADATA[action];
-
-  // Get all available items for this action from the catalog (not inventory).
-  // Items are abilities/tools — no ownership required.
-  const availableItems = useMemo(() => {
-    return filterInventoryByAction([], action, { stage: companion.stage });
-  }, [action, companion.stage]);
-
-  // Check stage restrictions for this specific action
-  const canUse = canUseAction(companion, action);
-  const stageMessage = getStageRestrictionMessage(companion, action);
-
-  const isEmpty = availableItems.length === 0;
-
-  const handleUseItem = (item: ResolvedInventoryItem) => {
-    if (isUsingItem) return;
-    onUseItem(item.itemId);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-md w-[calc(100%-2rem)] max-h-[85vh] flex flex-col p-0 gap-0 [&>button:last-child]:hidden">
-        {/* Header - Sticky */}
-        <DialogHeader className="sticky top-0 z-10 bg-background px-4 sm:px-6 pt-4 sm:pt-6 pb-3 sm:pb-4 border-b">
-          <div className="flex items-start justify-between gap-3">
-            <div className="flex items-center gap-3 min-w-0">
-              <div className="size-9 sm:size-10 rounded-xl bg-gradient-to-br from-primary/20 to-primary/5 flex items-center justify-center text-xl sm:text-2xl shrink-0">
-                {actionMeta.icon}
-              </div>
-              <div className="min-w-0">
-                <DialogTitle className="text-lg sm:text-xl">{actionMeta.label}</DialogTitle>
-                <p className="text-xs sm:text-sm text-muted-foreground truncate">
-                  {actionMeta.description}
-                </p>
-              </div>
-            </div>
-            <DialogClose className="rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 shrink-0">
-              <X className="size-5" />
-              <span className="sr-only">Close</span>
-            </DialogClose>
-          </div>
-        </DialogHeader>
-
-        {/* Content - Scrollable */}
-        <div className="flex-1 min-h-0 overflow-y-auto px-4 sm:px-6 py-3 sm:py-4">
-          {/* Stage Restriction Message */}
-          {!canUse && stageMessage && (
-            <div className="flex flex-col items-center justify-center py-12 text-center">
-              <div className="size-16 rounded-2xl bg-amber-500/10 flex items-center justify-center mb-4">
-                <span className="text-3xl">🥚</span>
-              </div>
-              <h3 className="text-lg font-semibold mb-2">Not Available</h3>
-              <p className="text-sm text-muted-foreground max-w-sm">
-                {stageMessage}
-              </p>
-            </div>
-          )}
-
-          {/* Empty State */}
-          {canUse && isEmpty && (
-            <div className="flex flex-col items-center justify-center py-12 text-center">
-              <div className="size-16 rounded-2xl bg-muted/50 flex items-center justify-center mb-4">
-                <span className="text-3xl">{actionMeta.icon}</span>
-              </div>
-              <h3 className="text-lg font-semibold mb-2">No Items Available</h3>
-              <p className="text-sm text-muted-foreground max-w-sm">
-                No items are available for this action at your Blobbi's current stage.
-              </p>
-            </div>
-          )}
-
-          {/* Item List */}
-          {canUse && !isEmpty && (
-            <div className="grid gap-3">
-              {availableItems.map((item) => (
-                <BlobbiInventoryUseRow
-                  key={item.itemId}
-                  item={item}
-                  companion={companion}
-                  action={action}
-                  onUse={() => handleUseItem(item)}
-                  isUsing={isUsingItem && usingItemId === item.itemId}
-                  disabled={isUsingItem}
-                />
-              ))}
-            </div>
-          )}
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-// ─── Inventory Use Row ────────────────────────────────────────────────────────
-
-interface BlobbiInventoryUseRowProps {
-  item: ResolvedInventoryItem;
-  companion: BlobbiCompanion;
-  action: InventoryAction;
-  onUse: () => void;
-  isUsing: boolean;
-  disabled: boolean;
-}
-
-function BlobbiInventoryUseRow({
-  item,
-  companion,
-  action,
-  onUse,
-  isUsing,
-  disabled,
-}: BlobbiInventoryUseRowProps) {
-  const isEgg = companion.stage === 'egg';
-  const isMedicine = action === 'medicine';
-  const isClean = action === 'clean';
-
-  // Preview stat changes - handle egg-specific preview for medicine and clean
-  const { normalStatChanges, eggStatChanges } = useMemo(() => {
-    if (isEgg && isMedicine) {
-      return {
-        normalStatChanges: [],
-        eggStatChanges: previewMedicineForEgg(companion.stats.health, item.effect),
-      };
-    }
-    if (isEgg && isClean) {
-      return {
-        normalStatChanges: [],
-        eggStatChanges: previewCleanForEgg(
-          { hygiene: companion.stats.hygiene, happiness: companion.stats.happiness },
-          item.effect
-        ),
-      };
-    }
-    return {
-      normalStatChanges: previewStatChanges(companion.stats, item.effect),
-      eggStatChanges: [] as EggStatPreview[],
-    };
-  }, [companion.stats, item.effect, isEgg, isMedicine, isClean]);
-
-  const hasChanges = normalStatChanges.length > 0 || eggStatChanges.length > 0;
-
-  return (
-    <div className="flex flex-col sm:flex-row sm:items-center gap-3 sm:gap-4 p-3 sm:p-4 rounded-xl border bg-card/60 backdrop-blur-sm hover:border-primary/30 transition-colors">
-      {/* Top row on mobile: Icon + Info + Button */}
-      <div className="flex items-center gap-3 sm:contents">
-        {/* Item Icon */}
-        <div className="relative shrink-0">
-          <div className="absolute inset-0 bg-gradient-to-br from-primary/20 to-primary/5 rounded-full blur-xl" />
-          <div className="relative size-10 sm:size-14 rounded-full bg-gradient-to-br from-primary/10 to-primary/5 flex items-center justify-center text-2xl sm:text-3xl">
-            {item.icon}
-          </div>
-        </div>
-
-        {/* Item Info */}
-        <div className="flex-1 min-w-0">
-          <div className="flex items-center gap-2 mb-0.5 sm:mb-1">
-            <h3 className="font-semibold text-sm sm:text-base truncate">{item.name}</h3>
-          </div>
-
-          {/* Effect Preview - shown inline on desktop */}
-          <div className="hidden sm:block">
-            {hasChanges && (
-              <div className="flex flex-wrap gap-x-3 gap-y-1">
-                {normalStatChanges.map(({ stat, delta }) => (
-                  <span key={stat} className="text-xs">
-                    <span
-                      className={cn(
-                        'font-medium',
-                        delta > 0
-                          ? 'text-emerald-600 dark:text-emerald-400'
-                          : 'text-red-600 dark:text-red-400'
-                      )}
-                    >
-                      {delta > 0 ? '+' : ''}
-                      {delta}
-                    </span>{' '}
-                    <span className="text-muted-foreground capitalize">
-                      {stat.replace('_', ' ')}
-                    </span>
-                  </span>
-                ))}
-                {eggStatChanges.map(({ stat, delta }) => (
-                  <span key={stat} className="text-xs">
-                    <span
-                      className={cn(
-                        'font-medium',
-                        delta > 0
-                          ? 'text-emerald-600 dark:text-emerald-400'
-                          : 'text-red-600 dark:text-red-400'
-                      )}
-                    >
-                      {delta > 0 ? '+' : ''}
-                      {delta}
-                    </span>{' '}
-                    <span className="text-muted-foreground capitalize">
-                      {stat.replace('_', ' ')}
-                    </span>
-                  </span>
-                ))}
-              </div>
-            )}
-          </div>
-        </div>
-
-        {/* Use Button */}
-        <Button
-          size="sm"
-          onClick={onUse}
-          disabled={disabled}
-          className="shrink-0"
-        >
-          {isUsing ? (
-            <Loader2 className="size-4 animate-spin" />
-          ) : (
-            'Use'
-          )}
-        </Button>
-      </div>
-
-      {/* Effect Preview - shown below on mobile */}
-      {hasChanges && (
-        <div className="sm:hidden flex flex-wrap gap-x-3 gap-y-1 pl-13">
-          {normalStatChanges.map(({ stat, delta }) => (
-            <span key={stat} className="text-xs">
-              <span
-                className={cn(
-                  'font-medium',
-                  delta > 0
-                    ? 'text-emerald-600 dark:text-emerald-400'
-                    : 'text-red-600 dark:text-red-400'
-                )}
-              >
-                {delta > 0 ? '+' : ''}
-                {delta}
-              </span>{' '}
-              <span className="text-muted-foreground capitalize">
-                {stat.replace('_', ' ')}
-              </span>
-            </span>
-          ))}
-          {eggStatChanges.map(({ stat, delta }) => (
-            <span key={stat} className="text-xs">
-              <span
-                className={cn(
-                  'font-medium',
-                  delta > 0
-                    ? 'text-emerald-600 dark:text-emerald-400'
-                    : 'text-red-600 dark:text-red-400'
-                )}
-              >
-                {delta > 0 ? '+' : ''}
-                {delta}
-              </span>{' '}
-              <span className="text-muted-foreground capitalize">
-                {stat.replace('_', ' ')}
-              </span>
-            </span>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}

src/blobbi/actions/components/BlobbiActionsModal.tsx

@@ -1,201 +0,0 @@
-// src/blobbi/actions/components/BlobbiActionsModal.tsx
-
-import { Loader2, Moon, Sun, Utensils, Gamepad2, Sparkles as SparklesIcon, Pill, Music, Mic, X } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogClose,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-import type { InventoryAction, DirectAction } from '../lib/blobbi-action-utils';
-
-interface BlobbiActionsModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  companion: BlobbiCompanion;
-  onRest: () => void;
-  onInventoryAction: (action: InventoryAction) => void;
-  onDirectAction: (action: DirectAction) => void;
-  actionInProgress: string | null;
-  isPublishing: boolean;
-}
-
-export function BlobbiActionsModal({
-  open,
-  onOpenChange,
-  companion,
-  onRest,
-  onInventoryAction,
-  onDirectAction,
-  actionInProgress,
-  isPublishing,
-}: BlobbiActionsModalProps) {
-  const isSleeping = companion.state === 'sleeping';
-  const isDisabled = isPublishing || actionInProgress !== null;
-  const isEgg = companion.stage === 'egg';
-
-  const handleAction = (action: () => void) => {
-    action();
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-sm w-[calc(100%-2rem)] max-h-[85vh] flex flex-col p-0 gap-0 [&>button:last-child]:hidden">
-        {/* Header - Sticky */}
-        <DialogHeader className="sticky top-0 z-10 bg-background px-4 sm:px-6 pt-4 sm:pt-6 pb-3 sm:pb-4 border-b">
-          <div className="flex items-start justify-between gap-4">
-            <div>
-              <DialogTitle>Blobbi Actions</DialogTitle>
-              <p className="text-sm text-muted-foreground">{companion.name}</p>
-            </div>
-            <DialogClose className="rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2">
-              <X className="size-5" />
-              <span className="sr-only">Close</span>
-            </DialogClose>
-          </div>
-        </DialogHeader>
-        {/* Content - Scrollable */}
-        <div className="flex-1 min-h-0 overflow-y-auto px-4 sm:px-6 py-3 sm:py-4">
-          <div className="grid gap-3">
-          {/* Feed Action - hidden for eggs */}
-          {!isEgg && (
-            <Button
-              variant="outline"
-              className="w-full justify-start gap-3 h-14"
-              onClick={() => handleAction(() => onInventoryAction('feed'))}
-              disabled={isDisabled}
-            >
-              <Utensils className="size-5 text-orange-500" />
-              <div className="text-left">
-                <p className="font-medium">Feed</p>
-                <p className="text-xs text-muted-foreground">
-                  Give your Blobbi something to eat
-                </p>
-              </div>
-            </Button>
-          )}
-
-          {/* Play Action - hidden for eggs */}
-          {!isEgg && (
-            <Button
-              variant="outline"
-              className="w-full justify-start gap-3 h-14"
-              onClick={() => handleAction(() => onInventoryAction('play'))}
-              disabled={isDisabled}
-            >
-              <Gamepad2 className="size-5 text-yellow-500" />
-              <div className="text-left">
-                <p className="font-medium">Play</p>
-                <p className="text-xs text-muted-foreground">
-                  Play with toys to make your Blobbi happy
-                </p>
-              </div>
-            </Button>
-          )}
-
-          {/* Clean Action - available for all stages */}
-          <Button
-            variant="outline"
-            className="w-full justify-start gap-3 h-14"
-            onClick={() => handleAction(() => onInventoryAction('clean'))}
-            disabled={isDisabled}
-          >
-            <SparklesIcon className="size-5 text-blue-500" />
-            <div className="text-left">
-              <p className="font-medium">Clean</p>
-              <p className="text-xs text-muted-foreground">
-                {isEgg 
-                  ? 'Keep your egg clean and fresh' 
-                  : 'Keep your Blobbi clean and fresh'}
-              </p>
-            </div>
-          </Button>
-
-          {/* Medicine Action - available for all stages */}
-          <Button
-            variant="outline"
-            className="w-full justify-start gap-3 h-14"
-            onClick={() => handleAction(() => onInventoryAction('medicine'))}
-            disabled={isDisabled}
-          >
-            <Pill className="size-5 text-green-500" />
-            <div className="text-left">
-              <p className="font-medium">Medicine</p>
-              <p className="text-xs text-muted-foreground">
-                {isEgg 
-                  ? 'Keep your egg healthy' 
-                  : 'Heal your Blobbi'}
-              </p>
-            </div>
-          </Button>
-
-          {/* Play Music Action - available for all stages */}
-          <Button
-            variant="outline"
-            className="w-full justify-start gap-3 h-14"
-            onClick={() => handleAction(() => onDirectAction('play_music'))}
-            disabled={isDisabled}
-          >
-            <Music className="size-5 text-pink-500" />
-            <div className="text-left">
-              <p className="font-medium">Play Music</p>
-              <p className="text-xs text-muted-foreground">
-                {isEgg 
-                  ? 'Play soothing music for your egg' 
-                  : 'Play music for your Blobbi'}
-              </p>
-            </div>
-          </Button>
-
-          {/* Sing Action - available for all stages */}
-          <Button
-            variant="outline"
-            className="w-full justify-start gap-3 h-14"
-            onClick={() => handleAction(() => onDirectAction('sing'))}
-            disabled={isDisabled}
-          >
-            <Mic className="size-5 text-purple-500" />
-            <div className="text-left">
-              <p className="font-medium">Sing</p>
-              <p className="text-xs text-muted-foreground">
-                {isEgg 
-                  ? 'Sing a lullaby to your egg' 
-                  : 'Sing to your Blobbi'}
-              </p>
-            </div>
-          </Button>
-
-          {/* Sleep/Wake Action - hidden for eggs */}
-          {!isEgg && (
-            <Button
-              variant="outline"
-              className="w-full justify-start gap-3 h-14"
-              onClick={() => handleAction(onRest)}
-              disabled={isDisabled}
-            >
-              {actionInProgress === 'rest' ? (
-                <Loader2 className="size-5 animate-spin" />
-              ) : isSleeping ? (
-                <Sun className="size-5 text-amber-500" />
-              ) : (
-                <Moon className="size-5 text-violet-500" />
-              )}
-              <div className="text-left">
-                <p className="font-medium">{isSleeping ? 'Wake Up' : 'Sleep'}</p>
-                <p className="text-xs text-muted-foreground">
-                  {isSleeping ? 'Wake your Blobbi up' : 'Put your Blobbi to sleep'}
-                </p>
-              </div>
-            </Button>
-          )}
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

src/blobbi/actions/components/BlobbiMissionsModal.tsx

@@ -1,560 +0,0 @@
-// src/blobbi/actions/components/BlobbiMissionsModal.tsx
-
-/**
- * Missions modal for Blobbi — card-grid quest board.
- *
- * Layout:
- * 1. Sticky header with title, subtitle, legend help button, close
- * 2. Current Focus section (hatch / evolve) — collapsible, default open
- * 3. Daily Bounties section — collapsible, default open
- * 4. Settings row — low emphasis toggle (not collapsible)
- *
- * Both main sections use lightweight Radix Collapsible wrappers.
- * Collapsed headers still show summary info (progress / coins).
- */
-
-import {
-  Loader2,
-  XCircle,
-  AlertTriangle,
-  Coins,
-  X,
-  Eye,
-  Scroll,
-  Compass,
-  HelpCircle,
-  ChevronDown,
-} from 'lucide-react';
-import { formatCompactNumber, cn } from '@/lib/utils';
-
-import { Button } from '@/components/ui/button';
-import { Switch } from '@/components/ui/switch';
-import { Label } from '@/components/ui/label';
-import { Badge } from '@/components/ui/badge';
-import { Dialog, DialogContent, DialogClose } from '@/components/ui/dialog';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { useState } from 'react';
-
-import type { BlobbiCompanion, BlobbonautProfile } from '@/blobbi/core/lib/blobbi';
-import type { NostrEvent } from '@nostrify/nostrify';
-import type { HatchTasksResult } from '../hooks/useHatchTasks';
-import type { EvolveTasksResult } from '../hooks/useEvolveTasks';
-import { TasksPanel } from './TasksPanel';
-import { DailyMissionsPanel } from './DailyMissionsPanel';
-import { useDailyMissions } from '../hooks/useDailyMissions';
-import { useClaimMissionReward } from '../hooks/useClaimMissionReward';
-import { useRerollMission } from '../hooks/useRerollMission';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface BlobbiMissionsModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  companion: BlobbiCompanion;
-  profile: BlobbonautProfile | null;
-  updateProfileEvent: (event: NostrEvent) => void;
-  hatchTasks: HatchTasksResult;
-  evolveTasks: EvolveTasksResult;
-  onOpenPostModal: () => void;
-  onHatch: () => void;
-  isHatching: boolean;
-  onEvolve: () => void;
-  isEvolving: boolean;
-  onStopIncubation: () => Promise<void>;
-  isStoppingIncubation: boolean;
-  onStopEvolution: () => Promise<void>;
-  isStoppingEvolution: boolean;
-  availableStages?: ('egg' | 'baby' | 'adult')[];
-  showMissionCard?: boolean;
-  onToggleMissionCard?: (visible: boolean) => void;
-}
-
-// ─── Section Chevron ─────────────────────────────────────────────────────────
-
-function SectionChevron({ open }: { open: boolean }) {
-  return (
-    <ChevronDown
-      className={cn(
-        'size-4 text-muted-foreground/60 transition-transform duration-200',
-        open && 'rotate-180',
-      )}
-    />
-  );
-}
-
-// ─── Mission Type Legend ──────────────────────────────────────────────────────
-
-function MissionTypeLegend() {
-  return (
-    <Popover>
-      <PopoverTrigger asChild>
-        <button
-          type="button"
-          className="rounded-full p-1.5 opacity-50 hover:opacity-100 hover:bg-muted transition-all"
-          aria-label="Mission types legend"
-        >
-          <HelpCircle className="size-4" />
-        </button>
-      </PopoverTrigger>
-      <PopoverContent side="bottom" align="end" className="w-56 p-3">
-        <p className="text-xs font-semibold mb-2">Mission Types</p>
-        <div className="space-y-2">
-          <div className="flex items-center gap-2">
-            <div className="size-5 rounded-full bg-amber-500/15 flex items-center justify-center shrink-0">
-              <Scroll className="size-3 text-amber-500" />
-            </div>
-            <div>
-              <p className="text-xs font-medium">Daily Bounty</p>
-              <p className="text-[10px] text-muted-foreground">Resets every day</p>
-            </div>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="size-5 rounded-full bg-sky-500/15 flex items-center justify-center shrink-0">
-              <span className="text-xs">🥚</span>
-            </div>
-            <div>
-              <p className="text-xs font-medium">Hatch Task</p>
-              <p className="text-[10px] text-muted-foreground">Egg progression</p>
-            </div>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className="size-5 rounded-full bg-violet-500/15 flex items-center justify-center shrink-0">
-              <span className="text-xs">🐣</span>
-            </div>
-            <div>
-              <p className="text-xs font-medium">Evolve Task</p>
-              <p className="text-[10px] text-muted-foreground">Baby progression</p>
-            </div>
-          </div>
-        </div>
-      </PopoverContent>
-    </Popover>
-  );
-}
-
-// ─── Daily Missions Section ───────────────────────────────────────────────────
-
-interface DailyMissionsSectionProps {
-  profile: BlobbonautProfile | null;
-  updateProfileEvent: (event: NostrEvent) => void;
-  availableStages?: ('egg' | 'baby' | 'adult')[];
-  disabled?: boolean;
-  defaultOpen?: boolean;
-}
-
-function DailyMissionsSection({
-  profile,
-  updateProfileEvent,
-  availableStages,
-  disabled,
-  defaultOpen = true,
-}: DailyMissionsSectionProps) {
-  const [isOpen, setIsOpen] = useState(defaultOpen);
-
-  const {
-    missions,
-    todayClaimedReward,
-    totalPotentialReward,
-    bonusAvailable,
-    bonusClaimed,
-    bonusReward,
-    noMissionsAvailable,
-    rerollsRemaining,
-  } = useDailyMissions({ availableStages });
-
-  const { mutate: claimReward, isPending: isClaiming } = useClaimMissionReward(
-    profile,
-    updateProfileEvent,
-  );
-
-  const { mutate: rerollMission, isPending: isRerolling } = useRerollMission();
-
-  const claimableCount = missions.filter((m) => m.completed && !m.claimed).length;
-
-  return (
-    <Collapsible open={isOpen} onOpenChange={setIsOpen}>
-      {/* Section header — tappable */}
-      <CollapsibleTrigger className="w-full">
-        <div className="flex items-center justify-between py-1 group">
-          <div className="flex items-center gap-2">
-            <Scroll className="size-4 text-amber-500 dark:text-amber-400 shrink-0" />
-            <h3 className="font-semibold text-sm">Daily Bounties</h3>
-          </div>
-          <div className="flex items-center gap-2">
-            {/* Summary pill — always visible */}
-            <div className="flex items-center gap-1.5 text-xs text-muted-foreground">
-              <Coins className="size-3 shrink-0 text-amber-500 dark:text-amber-400" />
-              <span className="tabular-nums">
-                {formatCompactNumber(todayClaimedReward)} / {formatCompactNumber(totalPotentialReward)}
-              </span>
-              {claimableCount > 0 && (
-                <span className="size-4 rounded-full bg-emerald-500 text-white text-[10px] font-bold flex items-center justify-center shrink-0">
-                  {claimableCount}
-                </span>
-              )}
-            </div>
-            <SectionChevron open={isOpen} />
-          </div>
-        </div>
-      </CollapsibleTrigger>
-
-      <CollapsibleContent className="overflow-hidden data-[state=open]:animate-collapsible-down data-[state=closed]:animate-collapsible-up">
-        <div className="pt-3">
-          <DailyMissionsPanel
-            missions={missions}
-            onClaimReward={(id) => claimReward({ missionId: id })}
-            onRerollMission={(id) => rerollMission({ missionId: id, availableStages })}
-            todayCoins={todayClaimedReward}
-            disabled={disabled || isClaiming || isRerolling}
-            bonusAvailable={bonusAvailable}
-            bonusClaimed={bonusClaimed}
-            bonusReward={bonusReward}
-            noMissionsAvailable={noMissionsAvailable}
-            rerollsRemaining={rerollsRemaining}
-            isRerolling={isRerolling}
-          />
-        </div>
-      </CollapsibleContent>
-    </Collapsible>
-  );
-}
-
-// ─── Stop Process Confirmation Dialog ─────────────────────────────────────────
-
-interface StopConfirmationDialogProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  companionName: string;
-  processType: 'incubation' | 'evolution';
-  onConfirm: () => Promise<void>;
-  isPending: boolean;
-}
-
-function StopConfirmationDialog({
-  open,
-  onOpenChange,
-  companionName,
-  processType,
-  onConfirm,
-  isPending,
-}: StopConfirmationDialogProps) {
-  const handleConfirm = async () => {
-    await onConfirm();
-    onOpenChange(false);
-  };
-
-  const label = processType === 'incubation' ? 'Incubation' : 'Evolution';
-
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle className="flex items-center gap-2">
-            <AlertTriangle className="size-5 text-amber-500" />
-            Stop {label}?
-          </AlertDialogTitle>
-          <AlertDialogDescription className="space-y-2">
-            <p>
-              Are you sure you want to stop {processType === 'incubation' ? 'incubating' : 'evolving'}{' '}
-              <strong>{companionName}</strong>?
-            </p>
-            <p>
-              This will interrupt the {processType} process and clear all task progress.
-              You can restart {processType} later, but you'll need to complete the tasks again.
-            </p>
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel disabled={isPending}>Cancel</AlertDialogCancel>
-          <AlertDialogAction
-            onClick={handleConfirm}
-            disabled={isPending}
-            className="bg-destructive hover:bg-destructive/90"
-          >
-            {isPending ? (
-              <>
-                <Loader2 className="size-4 mr-2 animate-spin" />
-                Stopping...
-              </>
-            ) : (
-              `Stop ${label}`
-            )}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}
-
-// ─── Current Focus Section (Hatch / Evolve) ──────────────────────────────────
-
-interface CurrentFocusSectionProps {
-  companion: BlobbiCompanion;
-  tasks: HatchTasksResult | EvolveTasksResult;
-  processType: 'incubation' | 'evolution';
-  onOpenPostModal: () => void;
-  onComplete: () => void;
-  isCompleting: boolean;
-  onStop: () => Promise<void>;
-  isStopping: boolean;
-  defaultOpen?: boolean;
-}
-
-function CurrentFocusSection({
-  companion,
-  tasks,
-  processType,
-  onOpenPostModal,
-  onComplete,
-  isCompleting,
-  onStop,
-  isStopping,
-  defaultOpen = true,
-}: CurrentFocusSectionProps) {
-  const [isOpen, setIsOpen] = useState(defaultOpen);
-  const [showStopConfirmation, setShowStopConfirmation] = useState(false);
-
-  const isIncubation = processType === 'incubation';
-  const title = isIncubation ? 'Hatch Tasks' : 'Evolve Tasks';
-  const completeLabel = isIncubation ? 'Hatch Your Blobbi!' : 'Evolve Your Blobbi!';
-  const completingLabel = isIncubation ? 'Hatching...' : 'Evolving...';
-  const completeEmoji = isIncubation ? '🐣' : '✨';
-  const stopLabel = isIncubation ? 'Stop Incubation' : 'Stop Evolution';
-  const badgeLabel = isIncubation ? 'Hatch' : 'Evolve';
-  const category = isIncubation ? ('hatch' as const) : ('evolve' as const);
-
-  const completedCount = tasks.tasks.filter((t) => t.completed).length;
-  const totalTasks = tasks.tasks.length;
-
-  return (
-    <Collapsible open={isOpen} onOpenChange={setIsOpen}>
-      {/* Section header — tappable */}
-      <CollapsibleTrigger className="w-full">
-        <div className="flex items-center justify-between py-1 group">
-          <div className="flex items-center gap-2">
-            <Badge
-              variant="secondary"
-              className={cn(
-                'text-xs font-semibold px-2 py-0.5',
-                isIncubation
-                  ? 'bg-sky-500/15 text-sky-600 dark:text-sky-400'
-                  : 'bg-violet-500/15 text-violet-600 dark:text-violet-400',
-              )}
-            >
-              {badgeLabel}
-            </Badge>
-            <span className="text-sm font-semibold">{title}</span>
-          </div>
-          <div className="flex items-center gap-2">
-            <span
-              className={cn(
-                'text-xs font-medium tabular-nums',
-                tasks.allCompleted
-                  ? 'text-emerald-600 dark:text-emerald-400'
-                  : 'text-muted-foreground',
-              )}
-            >
-              {completedCount} / {totalTasks}
-            </span>
-            <SectionChevron open={isOpen} />
-          </div>
-        </div>
-      </CollapsibleTrigger>
-
-      <CollapsibleContent className="overflow-hidden data-[state=open]:animate-collapsible-down data-[state=closed]:animate-collapsible-up">
-        <div className="pt-3">
-          {/* Task card grid */}
-          <TasksPanel
-            tasks={tasks.tasks}
-            allCompleted={tasks.allCompleted}
-            isLoading={tasks.isLoading}
-            onOpenPostModal={onOpenPostModal}
-            onComplete={onComplete}
-            isCompleting={isCompleting}
-            completeLabel={completeLabel}
-            completingLabel={completingLabel}
-            completeEmoji={completeEmoji}
-            category={category}
-          />
-
-          {/* Stop process — low emphasis */}
-          <div className="mt-3 flex justify-center">
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={() => setShowStopConfirmation(true)}
-              disabled={isStopping || isCompleting}
-              className="text-xs text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-8 px-3"
-            >
-              {isStopping ? (
-                <>
-                  <Loader2 className="size-3.5 mr-1.5 animate-spin" />
-                  Stopping...
-                </>
-              ) : (
-                <>
-                  <XCircle className="size-3.5 mr-1.5" />
-                  {stopLabel}
-                </>
-              )}
-            </Button>
-          </div>
-        </div>
-      </CollapsibleContent>
-
-      <StopConfirmationDialog
-        open={showStopConfirmation}
-        onOpenChange={setShowStopConfirmation}
-        companionName={companion.name}
-        processType={processType}
-        onConfirm={onStop}
-        isPending={isStopping}
-      />
-    </Collapsible>
-  );
-}
-
-// ─── Empty Focus State ────────────────────────────────────────────────────────
-
-function EmptyFocusState() {
-  return (
-    <div className="py-6 text-center">
-      <Compass className="size-5 text-muted-foreground/50 mx-auto mb-2" />
-      <p className="text-sm text-muted-foreground">No active progression right now</p>
-    </div>
-  );
-}
-
-// ─── Main Modal ───────────────────────────────────────────────────────────────
-
-export function BlobbiMissionsModal({
-  open,
-  onOpenChange,
-  companion,
-  profile,
-  updateProfileEvent,
-  hatchTasks,
-  evolveTasks,
-  onOpenPostModal,
-  onHatch,
-  isHatching,
-  onEvolve,
-  isEvolving,
-  onStopIncubation,
-  isStoppingIncubation,
-  onStopEvolution,
-  isStoppingEvolution,
-  availableStages,
-  showMissionCard,
-  onToggleMissionCard,
-}: BlobbiMissionsModalProps) {
-  const isIncubating = companion.state === 'incubating';
-  const isEvolvingState = companion.state === 'evolving';
-  const isEgg = companion.stage === 'egg';
-  const isBaby = companion.stage === 'baby';
-
-  const hasActiveProcess = (isIncubating && isEgg) || (isEvolvingState && isBaby);
-  const isProcessBusy = isHatching || isEvolving || isStoppingIncubation || isStoppingEvolution;
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-lg w-[calc(100%-2rem)] max-h-[85vh] flex flex-col p-0 gap-0 overflow-hidden [&>button:last-child]:hidden">
-        {/* ── Sticky Header ── */}
-        <div className="sticky top-0 z-10 bg-background px-4 sm:px-5 pt-4 pb-3 border-b border-border/60">
-          <div className="flex items-center justify-between">
-            <div className="min-w-0">
-              <h2 className="text-base font-bold tracking-tight">Missions</h2>
-              <p className="text-xs text-muted-foreground mt-0.5">
-                Quests & bounties for {companion.name}
-              </p>
-            </div>
-            <div className="flex items-center gap-0.5 shrink-0">
-              <MissionTypeLegend />
-              <DialogClose className="rounded-full p-1.5 opacity-60 hover:opacity-100 hover:bg-muted transition-all">
-                <X className="size-4" />
-                <span className="sr-only">Close</span>
-              </DialogClose>
-            </div>
-          </div>
-        </div>
-
-        {/* ── Scrollable Content ── */}
-        <div className="flex-1 min-h-0 overflow-y-auto overflow-x-hidden px-4 sm:px-5 py-4 space-y-5">
-          {/* 1. Current Focus */}
-          {hasActiveProcess ? (
-            <>
-              {isIncubating && isEgg ? (
-                <CurrentFocusSection
-                  companion={companion}
-                  tasks={hatchTasks}
-                  processType="incubation"
-                  onOpenPostModal={onOpenPostModal}
-                  onComplete={onHatch}
-                  isCompleting={isHatching}
-                  onStop={onStopIncubation}
-                  isStopping={isStoppingIncubation}
-                />
-              ) : isEvolvingState && isBaby ? (
-                <CurrentFocusSection
-                  companion={companion}
-                  tasks={evolveTasks}
-                  processType="evolution"
-                  onOpenPostModal={onOpenPostModal}
-                  onComplete={onEvolve}
-                  isCompleting={isEvolving}
-                  onStop={onStopEvolution}
-                  isStopping={isStoppingEvolution}
-                />
-              ) : null}
-            </>
-          ) : (
-            <EmptyFocusState />
-          )}
-
-          {/* Divider */}
-          <div className="h-px bg-border/60" />
-
-          {/* 2. Daily Bounties */}
-          <DailyMissionsSection
-            profile={profile}
-            updateProfileEvent={updateProfileEvent}
-            availableStages={availableStages}
-            disabled={isProcessBusy}
-          />
-
-          {/* 3. Settings */}
-          {onToggleMissionCard !== undefined && showMissionCard !== undefined && (
-            <>
-              <div className="h-px bg-border/40" />
-              <div className="flex items-center justify-between py-1">
-                <Label
-                  htmlFor="mission-card-toggle"
-                  className="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer"
-                >
-                  <Eye className="size-3.5" />
-                  Show mission card on main page
-                </Label>
-                <Switch
-                  id="mission-card-toggle"
-                  checked={showMissionCard}
-                  onCheckedChange={onToggleMissionCard}
-                />
-              </div>
-            </>
-          )}
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

src/blobbi/actions/components/BlobbiPostModal.tsx

@@ -1,294 +0,0 @@
-// src/blobbi/actions/components/BlobbiPostModal.tsx
-
-/**
- * Modal for creating a Blobbi post (hatch or evolve).
- * 
- * Requirements:
- * - Prefilled with stage-aware text:
- *   - Hatch: "Hello Nostr! Posting to hatch #<blobbiName> #blobbi #ditto #nostr"
- *   - Evolve: "Hello Nostr! Posting to evolve #<blobbiName> #blobbi #ditto #nostr"
- * - User can ADD text but CANNOT delete the prefix or required hashtags
- * - Blobbi name is sanitized into a valid hashtag format
- * - Enforced programmatically
- */
-
-import { useState, useCallback, useEffect, useMemo } from 'react';
-import { X, Loader2, AlertCircle } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import {
-  BLOBBI_POST_REQUIRED_HASHTAGS,
-  buildHatchPhrase,
-} from '../hooks/useHatchTasks';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/** The process type for the post */
-export type BlobbiPostProcess = 'hatch' | 'evolve';
-
-interface BlobbiPostModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  /** The Blobbi's name (will be converted to hashtag) */
-  blobbiName: string;
-  /** The process type - 'hatch' for incubation, 'evolve' for evolution */
-  process?: BlobbiPostProcess;
-  onSuccess?: () => void;
-}
-
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-/**
- * Build the required prefix text based on process type.
- */
-function buildPrefix(process: BlobbiPostProcess): string {
-  return process === 'evolve'
-    ? 'Posting to evolve'
-    : 'Posting to hatch';
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function BlobbiPostModal({
-  open,
-  onOpenChange,
-  blobbiName,
-  process = 'hatch',
-  onSuccess,
-}: BlobbiPostModalProps) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: createEvent, isPending } = useNostrPublish();
-  
-  // Compute the required elements based on props
-  const prefix = useMemo(() => buildPrefix(process), [process]);
-  const capitalizedName = useMemo(() => blobbiName.charAt(0).toUpperCase() + blobbiName.slice(1), [blobbiName]);
-  
-  // The required phrase that must appear in the post
-  const requiredPhrase = useMemo(() => 
-    process === 'hatch'
-      ? buildHatchPhrase(blobbiName)
-      : `${prefix} ${capitalizedName} #blobbi`,
-    [process, blobbiName, prefix, capitalizedName]
-  );
-  
-  // Build default content (the phrase itself is enough)
-  const defaultContent = useMemo(() => requiredPhrase, [requiredPhrase]);
-  
-  const [content, setContent] = useState(defaultContent);
-  const [validationError, setValidationError] = useState<string | null>(null);
-  
-  // Reset content when modal opens or props change
-  useEffect(() => {
-    if (open) {
-      setContent(defaultContent);
-      setValidationError(null);
-    }
-  }, [open, defaultContent]);
-  
-  /**
-   * Validate that the content contains the required phrase.
-   */
-  const validateContent = useCallback((text: string): string | null => {
-    if (!text.includes(requiredPhrase)) {
-      return `The post must contain: "${requiredPhrase}"`;
-    }
-    return null;
-  }, [requiredPhrase]);
-  
-  /**
-   * Handle content change with validation.
-   * Prevents deletion of required content.
-   */
-  const handleContentChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    const newContent = e.target.value;
-    
-    // Allow content changes only if it preserves the required elements
-    const error = validateContent(newContent);
-    
-    if (error) {
-      setValidationError(error);
-      // Still update content but show error
-      // This allows the user to see what they're trying to do
-      // but the post button will be disabled
-    } else {
-      setValidationError(null);
-    }
-    
-    setContent(newContent);
-  }, [validateContent]);
-  
-  /**
-   * Handle post creation.
-   */
-  const handlePost = useCallback(async () => {
-    if (!user?.pubkey) {
-      toast({
-        title: 'Not logged in',
-        description: 'Please log in to create a post',
-        variant: 'destructive',
-      });
-      return;
-    }
-    
-    // Final validation
-    const error = validateContent(content);
-    if (error) {
-      setValidationError(error);
-      return;
-    }
-    
-    try {
-      // Build tags for the post: extract all hashtags from content
-      const tags: string[][] = [];
-      const seen = new Set<string>();
-      
-      // Always include BLOBBI_POST_REQUIRED_HASHTAGS as t tags
-      for (const hashtag of BLOBBI_POST_REQUIRED_HASHTAGS) {
-        const lower = hashtag.toLowerCase();
-        if (!seen.has(lower)) {
-          tags.push(['t', lower]);
-          seen.add(lower);
-        }
-      }
-      
-      // Extract any additional hashtags from the content
-      const contentHashtags = content.match(/#(\w+)/g) || [];
-      for (const tag of contentHashtags) {
-        const tagValue = tag.slice(1).toLowerCase();
-        if (!seen.has(tagValue)) {
-          tags.push(['t', tagValue]);
-          seen.add(tagValue);
-        }
-      }
-      
-      await createEvent({
-        kind: 1,
-        content,
-        tags,
-      });
-      
-      toast({
-        title: 'Post created!',
-        description: process === 'evolve' 
-          ? 'Your Blobbi evolution post has been published.'
-          : 'Your Blobbi hatch post has been published.',
-      });
-      
-      onOpenChange(false);
-      onSuccess?.();
-    } catch (error) {
-      toast({
-        title: 'Failed to create post',
-        description: error instanceof Error ? error.message : 'Unknown error',
-        variant: 'destructive',
-      });
-    }
-  }, [user, content, validateContent, createEvent, onOpenChange, onSuccess, process]);
-  
-  const canPost = !validationError && content.trim().length > 0;
-  
-  const dialogTitle = process === 'evolve' ? 'Blobbi Evolution Post' : 'Blobbi Hatch Post';
-  const alertText = process === 'evolve'
-    ? "This special post announces your Blobbi's evolution! The highlighted text must remain in your post."
-    : "This special post announces your Blobbi's hatching journey! The highlighted text must remain in your post.";
-  
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-lg p-0 gap-0">
-        {/* Header */}
-        <div className="flex items-center justify-between px-4 h-14 border-b">
-          <DialogTitle className="text-base font-semibold">
-            {dialogTitle}
-          </DialogTitle>
-          <button
-            onClick={() => onOpenChange(false)}
-            className="p-1.5 -mr-1.5 rounded-full text-muted-foreground hover:text-foreground hover:bg-secondary/60 transition-colors"
-          >
-            <X className="size-5" />
-          </button>
-        </div>
-        
-        {/* Content */}
-        <div className="p-4 space-y-4">
-          {/* Info alert */}
-          <Alert className="border-primary/20 bg-primary/5">
-            <AlertDescription className="text-sm">
-              {alertText}
-            </AlertDescription>
-          </Alert>
-          
-          {/* Textarea */}
-          <div className="space-y-2">
-            <Textarea
-              value={content}
-              onChange={handleContentChange}
-              placeholder="Write your post..."
-              className="min-h-[150px] resize-none"
-              disabled={isPending}
-            />
-            
-            {/* Character count and validation */}
-            <div className="flex items-center justify-between text-sm">
-              <div>
-                {validationError && (
-                  <span className="text-destructive flex items-center gap-1">
-                    <AlertCircle className="size-3.5" />
-                    {validationError}
-                  </span>
-                )}
-              </div>
-              <span className="text-muted-foreground">
-                {content.length} characters
-              </span>
-            </div>
-          </div>
-          
-          {/* Preview of required content */}
-          <div className="p-3 rounded-lg bg-muted/50 border border-dashed">
-            <p className="text-xs text-muted-foreground mb-1">Required phrase:</p>
-            <p className="text-sm font-medium text-primary">
-              {requiredPhrase}
-            </p>
-          </div>
-        </div>
-        
-        {/* Footer */}
-        <div className="flex items-center justify-end gap-2 px-4 py-3 border-t bg-muted/30">
-          <Button
-            variant="outline"
-            onClick={() => onOpenChange(false)}
-            disabled={isPending}
-          >
-            Cancel
-          </Button>
-          <Button
-            onClick={handlePost}
-            disabled={!canPost || isPending}
-            className="min-w-24"
-          >
-            {isPending ? (
-              <>
-                <Loader2 className="size-4 mr-2 animate-spin" />
-                Posting...
-              </>
-            ) : (
-              'Post'
-            )}
-          </Button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

src/blobbi/actions/components/DailyMissionsPanel.tsx

@@ -1,319 +0,0 @@
-/**
- * DailyMissionsPanel — card-grid layout for daily bounties.
- *
- * Each mission is a compact card in a 2-col grid.
- * Tapping a card expands it to show progress, claim button, and reroll.
- * Only one card expanded at a time.
- */
-
-import { useState } from 'react';
-import {
-  Check,
-  Coins,
-  Gift,
-  Sparkles,
-  Egg,
-  Trophy,
-  RefreshCw,
-  Heart,
-  Utensils,
-  Droplets,
-  Moon,
-  Camera,
-  Mic,
-  Music,
-  Pill,
-  CircleDot,
-} from 'lucide-react';
-
-import { Button } from '@/components/ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
-import { cn, formatCompactNumber } from '@/lib/utils';
-import type { DailyMission, DailyMissionAction } from '../lib/daily-missions';
-import { BONUS_MISSION_ID } from '../hooks/useClaimMissionReward';
-import {
-  ExpandableMissionCard,
-  MissionDescription,
-  MissionProgress,
-} from './ExpandableMissionCard';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface DailyMissionsPanelProps {
-  missions: DailyMission[];
-  onClaimReward: (missionId: string) => void;
-  onRerollMission?: (missionId: string) => void;
-  todayCoins: number;
-  disabled?: boolean;
-  bonusAvailable?: boolean;
-  bonusClaimed?: boolean;
-  bonusReward?: number;
-  noMissionsAvailable?: boolean;
-  rerollsRemaining?: number;
-  isRerolling?: boolean;
-}
-
-// ─── Daily Mission Icon Mapping ───────────────────────────────────────────────
-
-function DailyMissionIcon({ action }: { action: DailyMissionAction }) {
-  const cls = 'size-5';
-  switch (action) {
-    case 'interact':
-      return <Heart className={cls} />;
-    case 'feed':
-      return <Utensils className={cls} />;
-    case 'clean':
-      return <Droplets className={cls} />;
-    case 'sleep':
-      return <Moon className={cls} />;
-    case 'take_photo':
-      return <Camera className={cls} />;
-    case 'sing':
-      return <Mic className={cls} />;
-    case 'play_music':
-      return <Music className={cls} />;
-    case 'medicine':
-      return <Pill className={cls} />;
-    default:
-      return <CircleDot className={cls} />;
-  }
-}
-
-// ─── Bonus Card ───────────────────────────────────────────────────────────────
-
-interface BonusCardProps {
-  isAvailable: boolean;
-  isClaimed: boolean;
-  reward: number;
-  onClaim: () => void;
-  disabled?: boolean;
-  isExpanded: boolean;
-  onToggle: (id: string) => void;
-}
-
-function BonusCard({ isAvailable, isClaimed, reward, onClaim, disabled, isExpanded, onToggle }: BonusCardProps) {
-  const progress = isClaimed ? 1 : isAvailable ? 1 : 0;
-
-  return (
-    <ExpandableMissionCard
-      id="bonus"
-      category="daily"
-      icon={<Trophy className="size-5" />}
-      title="Daily Champion"
-      completed={isClaimed}
-      progress={progress}
-      isExpanded={isExpanded}
-      onToggle={onToggle}
-    >
-      <MissionDescription>
-        {isAvailable || isClaimed
-          ? 'Bonus reward for completing all daily missions!'
-          : 'Complete all missions to unlock this bonus'}
-      </MissionDescription>
-
-      <div className="flex items-center gap-1 text-xs font-medium text-amber-600 dark:text-amber-400">
-        <Coins className="size-3" />
-        +{formatCompactNumber(reward)}
-      </div>
-
-      {isAvailable && !isClaimed && (
-        <Button
-          size="sm"
-          onClick={onClaim}
-          disabled={disabled}
-          className="w-full bg-gradient-to-r from-amber-500 to-orange-500 hover:from-amber-600 hover:to-orange-600 text-white h-8 text-xs"
-        >
-          <Trophy className="size-3.5 mr-1.5" />
-          Claim Bonus {formatCompactNumber(reward)} Coins
-        </Button>
-      )}
-    </ExpandableMissionCard>
-  );
-}
-
-// ─── Empty / Done States ──────────────────────────────────────────────────────
-
-function NoMissionsState() {
-  return (
-    <div className="flex flex-col items-center gap-2 py-6 text-center">
-      <Egg className="size-5 text-muted-foreground/50" />
-      <div>
-        <p className="text-sm font-medium">Hatch your Blobbi first</p>
-        <p className="text-xs text-muted-foreground mt-0.5">
-          Daily missions unlock after hatching
-        </p>
-      </div>
-    </div>
-  );
-}
-
-function AllClaimedState({ todayCoins }: { todayCoins: number }) {
-  return (
-    <div className="flex flex-col items-center gap-2 py-6 text-center">
-      <Sparkles className="size-5 text-primary/60" />
-      <div>
-        <p className="text-sm font-medium">All done for today</p>
-        <p className="text-xs text-muted-foreground mt-0.5">
-          Earned{' '}
-          <span className="font-medium text-amber-600 dark:text-amber-400">
-            {formatCompactNumber(todayCoins)} coins
-          </span>{' '}
-          — come back tomorrow!
-        </p>
-      </div>
-    </div>
-  );
-}
-
-// ─── Reroll Counter ───────────────────────────────────────────────────────────
-
-function RerollCounter({ remaining }: { remaining: number }) {
-  const text =
-    remaining === 0
-      ? 'No rerolls left'
-      : remaining === 1
-        ? '1 reroll left'
-        : `${remaining} rerolls left`;
-
-  return (
-    <div className="flex items-center justify-end gap-1 text-[11px] text-muted-foreground col-span-full">
-      <RefreshCw className="size-2.5" />
-      <span>{text}</span>
-    </div>
-  );
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function DailyMissionsPanel({
-  missions,
-  onClaimReward,
-  onRerollMission,
-  todayCoins,
-  disabled,
-  bonusAvailable = false,
-  bonusClaimed = false,
-  bonusReward = 50,
-  noMissionsAvailable = false,
-  rerollsRemaining = 0,
-  isRerolling = false,
-}: DailyMissionsPanelProps) {
-  const [expandedId, setExpandedId] = useState<string | null>(null);
-
-  if (noMissionsAvailable) return <NoMissionsState />;
-
-  const allRegularClaimed = missions.every((m) => m.claimed);
-  const allDone = allRegularClaimed && bonusClaimed;
-
-  if (allDone) return <AllClaimedState todayCoins={todayCoins} />;
-
-  const canReroll = rerollsRemaining > 0 && !!onRerollMission;
-
-  const handleToggle = (id: string) => {
-    setExpandedId((prev) => (prev === id ? null : id));
-  };
-
-  return (
-    <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
-      {/* Reroll counter */}
-      {onRerollMission && <RerollCounter remaining={rerollsRemaining} />}
-
-      {/* Regular mission cards */}
-      {missions.map((mission) => {
-        const progress = mission.requiredCount > 0 ? mission.currentCount / mission.requiredCount : 0;
-        const canClaim = mission.completed && !mission.claimed;
-        const showReroll = onRerollMission && !mission.completed && !mission.claimed && canReroll;
-
-        return (
-          <ExpandableMissionCard
-            key={mission.id}
-            id={mission.id}
-            category="daily"
-            icon={<DailyMissionIcon action={mission.action} />}
-            title={mission.title}
-            completed={mission.claimed}
-            progress={Math.min(progress, 1)}
-            isExpanded={expandedId === mission.id}
-            onToggle={handleToggle}
-          >
-            {/* Description */}
-            <MissionDescription>{mission.description}</MissionDescription>
-
-            {/* Progress */}
-            {!mission.claimed && (
-              <MissionProgress
-                current={mission.currentCount}
-                required={mission.requiredCount}
-                completed={mission.completed}
-              />
-            )}
-
-            {/* Reward + reroll row */}
-            <div className="flex items-center justify-between">
-              <span className="inline-flex items-center gap-0.5 text-xs font-medium text-amber-600 dark:text-amber-400">
-                <Coins className="size-3" />
-                {formatCompactNumber(mission.reward)}
-              </span>
-
-              {showReroll && (
-                <TooltipProvider>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          onRerollMission(mission.id);
-                        }}
-                        disabled={disabled || isRerolling}
-                        className="p-1 rounded-md text-muted-foreground hover:text-foreground hover:bg-muted transition-colors disabled:opacity-40"
-                      >
-                        <RefreshCw className={cn('size-3', isRerolling && 'animate-spin')} />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="left">
-                      <p>Replace mission</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              )}
-
-              {mission.claimed && (
-                <span className="inline-flex items-center gap-0.5 text-[10px] font-medium text-primary">
-                  <Check className="size-2.5" />
-                  Done
-                </span>
-              )}
-            </div>
-
-            {/* Claim button */}
-            {canClaim && (
-              <Button
-                size="sm"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onClaimReward(mission.id);
-                }}
-                disabled={disabled}
-                className="w-full bg-emerald-600 hover:bg-emerald-700 text-white h-8 text-xs"
-              >
-                <Gift className="size-3.5 mr-1.5" />
-                Claim {formatCompactNumber(mission.reward)} Coins
-              </Button>
-            )}
-          </ExpandableMissionCard>
-        );
-      })}
-
-      {/* Bonus card */}
-      <BonusCard
-        isAvailable={bonusAvailable}
-        isClaimed={bonusClaimed}
-        reward={bonusReward}
-        onClaim={() => onClaimReward(BONUS_MISSION_ID)}
-        disabled={disabled}
-        isExpanded={expandedId === 'bonus'}
-        onToggle={handleToggle}
-      />
-    </div>
-  );
-}

src/blobbi/actions/components/ExpandableMissionCard.tsx

@@ -1,250 +0,0 @@
-// src/blobbi/actions/components/ExpandableMissionCard.tsx
-
-/**
- * Expandable mission card for the quest-board grid.
- *
- * Collapsed: compact square-ish card showing icon, title, and a tiny
- *            progress ring / checkmark.
- * Expanded:  full-width row that reveals description, progress bar,
- *            action link, claim button, dynamic hints, etc.
- *
- * Only one card is expanded at a time per section (controlled by parent).
- */
-
-import type { ReactNode } from 'react';
-import { Check, ChevronRight, ExternalLink, AlertCircle } from 'lucide-react';
-import { Progress } from '@/components/ui/progress';
-import { cn } from '@/lib/utils';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export type MissionCategory = 'daily' | 'hatch' | 'evolve';
-
-export interface ExpandableMissionCardProps {
-  /** Unique id used to track which card is expanded */
-  id: string;
-  /** Mission category for visual styling */
-  category: MissionCategory;
-  /** Icon rendered in the compact card (ReactNode — usually a lucide icon or emoji span) */
-  icon: ReactNode;
-  /** Short title */
-  title: string;
-  /** Whether the mission is complete */
-  completed: boolean;
-  /** Progress fraction 0-1 (used for the tiny ring in compact mode) */
-  progress: number;
-  /** Whether this card is currently expanded */
-  isExpanded: boolean;
-  /** Parent calls this to toggle expansion */
-  onToggle: (id: string) => void;
-  /** Content rendered only when expanded */
-  children: ReactNode;
-  /** Optional extra className on the outer wrapper */
-  className?: string;
-}
-
-// ─── Tiny Progress Ring ───────────────────────────────────────────────────────
-
-function ProgressRing({ progress, completed, category }: { progress: number; completed: boolean; category: MissionCategory }) {
-  const size = 28;
-  const stroke = 2.5;
-  const radius = (size - stroke) / 2;
-  const circumference = 2 * Math.PI * radius;
-  const offset = circumference - progress * circumference;
-
-  if (completed) {
-    return (
-      <div className="size-7 rounded-full bg-emerald-500/20 flex items-center justify-center">
-        <Check className="size-3.5 text-emerald-600 dark:text-emerald-400" />
-      </div>
-    );
-  }
-
-  const ringColor =
-    category === 'hatch'
-      ? 'text-sky-500'
-      : category === 'evolve'
-        ? 'text-violet-500'
-        : 'text-amber-500';
-
-  return (
-    <svg width={size} height={size} className={cn('shrink-0 -rotate-90', ringColor)}>
-      <circle
-        cx={size / 2}
-        cy={size / 2}
-        r={radius}
-        fill="none"
-        stroke="currentColor"
-        strokeWidth={stroke}
-        opacity={0.15}
-      />
-      <circle
-        cx={size / 2}
-        cy={size / 2}
-        r={radius}
-        fill="none"
-        stroke="currentColor"
-        strokeWidth={stroke}
-        strokeDasharray={circumference}
-        strokeDashoffset={offset}
-        strokeLinecap="round"
-        className="transition-all duration-300"
-      />
-    </svg>
-  );
-}
-
-// ─── Accent colors per category ───────────────────────────────────────────────
-
-const CATEGORY_STYLES: Record<MissionCategory, { bg: string; expandedBg: string; border: string }> = {
-  daily: {
-    bg: 'bg-amber-500/[0.06] hover:bg-amber-500/10',
-    expandedBg: 'bg-amber-500/[0.06]',
-    border: 'ring-amber-500/20',
-  },
-  hatch: {
-    bg: 'bg-sky-500/[0.06] hover:bg-sky-500/10',
-    expandedBg: 'bg-sky-500/[0.06]',
-    border: 'ring-sky-500/20',
-  },
-  evolve: {
-    bg: 'bg-violet-500/[0.06] hover:bg-violet-500/10',
-    expandedBg: 'bg-violet-500/[0.06]',
-    border: 'ring-violet-500/20',
-  },
-};
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function ExpandableMissionCard({
-  id,
-  category,
-  icon,
-  title,
-  completed,
-  progress,
-  isExpanded,
-  onToggle,
-  children,
-  className,
-}: ExpandableMissionCardProps) {
-  const styles = CATEGORY_STYLES[category];
-
-  // ── Collapsed card ──
-  if (!isExpanded) {
-    return (
-      <button
-        type="button"
-        onClick={() => onToggle(id)}
-        className={cn(
-          'flex flex-col items-center gap-1.5 rounded-xl p-3 transition-all text-center cursor-pointer select-none',
-          'ring-1 ring-transparent',
-          completed ? 'bg-emerald-500/[0.06] hover:bg-emerald-500/10' : styles.bg,
-          className,
-        )}
-      >
-        {/* Icon */}
-        <div className="text-lg leading-none">{icon}</div>
-
-        {/* Title — 2 lines max */}
-        <span className={cn(
-          'text-[11px] font-medium leading-tight line-clamp-2 min-h-[2lh]',
-          completed && 'text-emerald-600 dark:text-emerald-400',
-        )}>
-          {title}
-        </span>
-
-        {/* Progress ring / check */}
-        <ProgressRing progress={progress} completed={completed} category={category} />
-      </button>
-    );
-  }
-
-  // ── Expanded card (spans full row) ──
-  return (
-    <div
-      className={cn(
-        'col-span-full rounded-xl ring-1 transition-all overflow-hidden',
-        completed ? 'bg-emerald-500/[0.06] ring-emerald-500/20' : cn(styles.expandedBg, styles.border),
-        className,
-      )}
-    >
-      {/* Compact header — click to collapse */}
-      <button
-        type="button"
-        onClick={() => onToggle(id)}
-        className="w-full flex items-center gap-3 p-3 text-left cursor-pointer select-none"
-      >
-        <div className="text-lg leading-none shrink-0">{icon}</div>
-        <span className={cn(
-          'text-sm font-medium flex-1 min-w-0',
-          completed && 'text-emerald-600 dark:text-emerald-400',
-        )}>
-          {title}
-        </span>
-        <ProgressRing progress={progress} completed={completed} category={category} />
-      </button>
-
-      {/* Expanded details */}
-      <div className="px-3 pb-3 pt-0 space-y-2">
-        {children}
-      </div>
-    </div>
-  );
-}
-
-// ─── Shared detail sub-components ─────────────────────────────────────────────
-
-/** Description text */
-export function MissionDescription({ children }: { children: ReactNode }) {
-  return <p className="text-xs text-muted-foreground leading-snug">{children}</p>;
-}
-
-/** Progress bar with fraction label */
-export function MissionProgress({ current, required, completed }: { current: number; required: number; completed: boolean }) {
-  const pct = required > 0 ? Math.round((current / required) * 100) : 0;
-  return (
-    <div>
-      <div className="flex items-center justify-between text-[11px] text-muted-foreground mb-1">
-        <span className="tabular-nums">{current} / {required}</span>
-        <span className="tabular-nums">{pct}%</span>
-      </div>
-      <Progress value={pct} className={cn('h-1.5', completed && '[&>div]:bg-emerald-500')} />
-    </div>
-  );
-}
-
-/** Inline action link (navigate, external, modal) */
-export function MissionAction({
-  label,
-  type,
-  onClick,
-}: {
-  label: string;
-  type: 'navigate' | 'external_link' | 'open_modal';
-  onClick: () => void;
-}) {
-  return (
-    <button
-      onClick={onClick}
-      className="inline-flex items-center gap-1 text-xs font-medium text-primary hover:underline"
-    >
-      {label}
-      {type === 'external_link' ? (
-        <ExternalLink className="size-3" />
-      ) : (
-        <ChevronRight className="size-3" />
-      )}
-    </button>
-  );
-}
-
-/** Dynamic / live task hint */
-export function DynamicHint({ current, required }: { current: number; required: number }) {
-  return (
-    <div className="flex items-center gap-1.5 text-[11px] text-amber-600/80 dark:text-amber-400/80">
-      <AlertCircle className="size-3 shrink-0" />
-      <span>Lowest stat: {current}% (need {required}%+)</span>
-    </div>
-  );
-}

src/blobbi/actions/components/HatchTasksPanel.tsx

@@ -1,221 +0,0 @@
-// src/blobbi/actions/components/HatchTasksPanel.tsx
-
-/**
- * UI component for displaying hatch task progress.
- * Shows a list of tasks with progress indicators and action buttons.
- */
-
-import { ExternalLink, Check, Loader2, ChevronRight } from 'lucide-react';
-import { useNavigate } from 'react-router-dom';
-import { openUrl } from '@/lib/downloadFile';
-
-import { Button } from '@/components/ui/button';
-import { Progress } from '@/components/ui/progress';
-import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/components/ui/card';
-import { Badge } from '@/components/ui/badge';
-import { cn } from '@/lib/utils';
-
-import type { HatchTask } from '../hooks/useHatchTasks';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface HatchTasksPanelProps {
-  tasks: HatchTask[];
-  allCompleted: boolean;
-  isLoading: boolean;
-  /** Called when user clicks "Create Post" action */
-  onOpenPostModal: () => void;
-  /** Called when all tasks are complete and user clicks "Hatch" */
-  onHatch: () => void;
-  /** Whether hatching is in progress */
-  isHatching?: boolean;
-}
-
-// ─── Task Row Component ───────────────────────────────────────────────────────
-
-interface TaskRowProps {
-  task: HatchTask;
-  onOpenPostModal: () => void;
-}
-
-function TaskRow({ task, onOpenPostModal }: TaskRowProps) {
-  const navigate = useNavigate();
-  
-  const handleAction = () => {
-    if (!task.action || !task.actionTarget) return;
-    
-    switch (task.action) {
-      case 'navigate':
-        navigate(task.actionTarget);
-        break;
-      case 'external_link':
-        openUrl(task.actionTarget);
-        break;
-      case 'open_modal':
-        if (task.actionTarget === 'blobbi_post') {
-          onOpenPostModal();
-        }
-        break;
-    }
-  };
-  
-  const progress = task.required > 1 
-    ? Math.round((task.current / task.required) * 100)
-    : task.completed ? 100 : 0;
-  
-  return (
-    <div
-      className={cn(
-        "flex items-center gap-4 p-4 rounded-xl border transition-all",
-        task.completed 
-          ? "bg-emerald-500/5 border-emerald-500/20" 
-          : "bg-card/60 border-border hover:border-primary/30"
-      )}
-    >
-      {/* Status indicator */}
-      <div className={cn(
-        "size-10 rounded-full flex items-center justify-center shrink-0",
-        task.completed 
-          ? "bg-emerald-500/20 text-emerald-600 dark:text-emerald-400"
-          : "bg-muted text-muted-foreground"
-      )}>
-        {task.completed ? (
-          <Check className="size-5" />
-        ) : task.required > 1 ? (
-          <span className="text-sm font-medium">{task.current}/{task.required}</span>
-        ) : (
-          <span className="text-lg">○</span>
-        )}
-      </div>
-      
-      {/* Task info */}
-      <div className="flex-1 min-w-0">
-        <div className="flex items-center gap-2 mb-1">
-          <h4 className={cn(
-            "font-medium",
-            task.completed && "text-emerald-600 dark:text-emerald-400"
-          )}>
-            {task.name}
-          </h4>
-          {task.completed && (
-            <Badge variant="secondary" className="bg-emerald-500/20 text-emerald-700 dark:text-emerald-300 text-xs">
-              Complete
-            </Badge>
-          )}
-        </div>
-        <p className="text-sm text-muted-foreground">
-          {task.description}
-        </p>
-        
-        {/* Progress bar for multi-step tasks */}
-        {task.required > 1 && !task.completed && (
-          <Progress value={progress} className="h-1.5 mt-2" />
-        )}
-      </div>
-      
-      {/* Action button */}
-      {task.action && task.actionLabel && !task.completed && (
-        <Button
-          variant="outline"
-          size="sm"
-          onClick={handleAction}
-          className="shrink-0 gap-2"
-        >
-          {task.actionLabel}
-          {task.action === 'external_link' ? (
-            <ExternalLink className="size-3.5" />
-          ) : (
-            <ChevronRight className="size-3.5" />
-          )}
-        </Button>
-      )}
-    </div>
-  );
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function HatchTasksPanel({
-  tasks,
-  allCompleted,
-  isLoading,
-  onOpenPostModal,
-  onHatch,
-  isHatching = false,
-}: HatchTasksPanelProps) {
-  const completedCount = tasks.filter(t => t.completed).length;
-  const totalTasks = tasks.length;
-  const overallProgress = Math.round((completedCount / totalTasks) * 100);
-  
-  return (
-    <Card className="border-primary/20 bg-gradient-to-br from-primary/5 to-transparent">
-      <CardHeader className="pb-4">
-        <div className="flex items-center justify-between">
-          <div>
-            <CardTitle className="flex items-center gap-2">
-              <span className="text-2xl">🥚</span>
-              Hatch Tasks
-            </CardTitle>
-            <CardDescription>
-              Complete these tasks to hatch your Blobbi
-            </CardDescription>
-          </div>
-          <Badge variant="outline" className="text-base px-3 py-1">
-            {completedCount}/{totalTasks}
-          </Badge>
-        </div>
-        
-        {/* Overall progress */}
-        <div className="mt-4">
-          <div className="flex items-center justify-between text-sm mb-2">
-            <span className="text-muted-foreground">Overall progress</span>
-            <span className="font-medium">{overallProgress}%</span>
-          </div>
-          <Progress value={overallProgress} className="h-2" />
-        </div>
-      </CardHeader>
-      
-      <CardContent className="space-y-3">
-        {isLoading ? (
-          <div className="flex items-center justify-center py-8">
-            <Loader2 className="size-6 animate-spin text-muted-foreground" />
-          </div>
-        ) : (
-          <>
-            {tasks.map(task => (
-              <TaskRow 
-                key={task.id} 
-                task={task} 
-                onOpenPostModal={onOpenPostModal}
-              />
-            ))}
-            
-            {/* Hatch button - only visible when all tasks complete */}
-            {allCompleted && (
-              <div className="pt-4 border-t border-border mt-4">
-                <Button
-                  onClick={onHatch}
-                  disabled={isHatching}
-                  size="lg"
-                  className="w-full gap-2 bg-gradient-to-r from-amber-500 to-orange-500 hover:from-amber-600 hover:to-orange-600 text-white"
-                >
-                  {isHatching ? (
-                    <>
-                      <Loader2 className="size-5 animate-spin" />
-                      Hatching...
-                    </>
-                  ) : (
-                    <>
-                      <span className="text-xl">🐣</span>
-                      Hatch Your Blobbi!
-                    </>
-                  )}
-                </Button>
-              </div>
-            )}
-          </>
-        )}
-      </CardContent>
-    </Card>
-  );
-}

src/blobbi/actions/components/InlineMusicPlayer.tsx

@@ -1,251 +0,0 @@
-// src/blobbi/actions/components/InlineMusicPlayer.tsx
-
-import { useCallback, useEffect } from 'react';
-import { Music, Play, Pause, RotateCcw, MoreHorizontal, Loader2, AlertCircle, X, Volume2, VolumeX } from 'lucide-react';
-
-import { Button } from '@/components/ui/button';
-import { Slider } from '@/components/ui/slider';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { cn } from '@/lib/utils';
-
-import { useAudioPlayback } from '../hooks/useAudioPlayback';
-import type { SelectedTrack } from './PlayMusicModal';
-
-// Re-export for external use
-export type { SelectedTrack } from './PlayMusicModal';
-
-interface InlineMusicPlayerProps {
-  /** The selected track */
-  selection: SelectedTrack;
-  /** Called when user wants to change the track */
-  onChangeTrack: () => void;
-  /** Called when user closes the player */
-  onClose: () => void;
-  /** Called when playback starts (for Blobbi reaction state) */
-  onPlaybackStart?: () => void;
-  /** Called when playback stops/pauses (for Blobbi reaction state) */
-  onPlaybackStop?: () => void;
-  /** Whether the action has been published (playback only starts after publish) */
-  isPublished: boolean;
-  /** Whether publishing is in progress */
-  isPublishing: boolean;
-}
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function InlineMusicPlayer({
-  selection,
-  onChangeTrack,
-  onClose,
-  onPlaybackStart,
-  onPlaybackStop,
-  isPublished,
-  isPublishing,
-}: InlineMusicPlayerProps) {
-  const {
-    state: playbackState,
-    error: playbackError,
-    load,
-    toggle,
-    restart,
-    stop,
-    isPlaying,
-    volume,
-    setVolume,
-    cleanup,
-  } = useAudioPlayback({
-    onEnded: () => {
-      onPlaybackStop?.();
-    },
-  });
-  
-  // Auto-start playback when first published (idle -> playing)
-  // Note: 'stopped' state is NOT included here - stop is a terminal state
-  // that requires explicit user action (play button) to restart
-  useEffect(() => {
-    if (isPublished && playbackState === 'idle') {
-      load(selection.url, true);
-      onPlaybackStart?.();
-    }
-  }, [isPublished, playbackState, selection.url, load, onPlaybackStart]);
-  
-  // Force reload when source URL changes while already playing/paused
-  useEffect(() => {
-    // Only trigger reload if we're in an active playback state with a different URL
-    if (isPublished && (playbackState === 'playing' || playbackState === 'paused')) {
-      // The load function will check if URL changed and reload if needed
-      load(selection.url, true);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- Only react to selection.url changes
-  }, [selection.url]);
-  
-  // Notify on playback state changes
-  useEffect(() => {
-    if (isPlaying) {
-      onPlaybackStart?.();
-    } else if (playbackState === 'paused' || playbackState === 'stopped') {
-      onPlaybackStop?.();
-    }
-  }, [isPlaying, playbackState, onPlaybackStart, onPlaybackStop]);
-  
-  // Cleanup on close
-  const handleClose = useCallback(() => {
-    stop();
-    cleanup();
-    onPlaybackStop?.();
-    onClose();
-  }, [stop, cleanup, onPlaybackStop, onClose]);
-  
-  // Handle play/pause toggle
-  const handleToggle = useCallback(async () => {
-    if (playbackState === 'idle' || playbackState === 'stopped') {
-      load(selection.url, true);
-    } else {
-      await toggle();
-    }
-  }, [playbackState, selection.url, load, toggle]);
-  
-  // Track info
-  const trackTitle = selection.track.title;
-  const trackArtist = selection.track.artist;
-  
-  const isLoading = playbackState === 'loading' || isPublishing;
-  const hasError = playbackState === 'error';
-  
-  return (
-    <div className="mx-4 sm:mx-6 mb-4">
-      <div className={cn(
-        "rounded-xl border bg-card/80 backdrop-blur-sm overflow-hidden",
-        "shadow-sm transition-all",
-        isPlaying && "ring-2 ring-pink-500/30"
-      )}>
-        {/* Main content row */}
-        <div className="flex items-center gap-3 p-3">
-          {/* Music icon / Now Playing indicator */}
-          <div className={cn(
-            "size-10 rounded-lg flex items-center justify-center shrink-0",
-            isPlaying 
-              ? "bg-pink-500/20" 
-              : "bg-muted"
-          )}>
-            <Music className={cn(
-              "size-5",
-              isPlaying ? "text-pink-500 animate-pulse" : "text-muted-foreground"
-            )} />
-          </div>
-          
-          {/* Track info */}
-          <div className="flex-1 min-w-0">
-            <p className="font-medium text-sm truncate">{trackTitle}</p>
-            {trackArtist && (
-              <p className="text-xs text-muted-foreground truncate">{trackArtist}</p>
-            )}
-            {!trackArtist && (
-              <p className="text-xs text-muted-foreground">
-                {isPlaying ? 'Now playing...' : isPublishing ? 'Starting...' : 'Ready to play'}
-              </p>
-            )}
-          </div>
-          
-          {/* Controls */}
-          <div className="flex items-center gap-1 shrink-0">
-            {/* Play/Pause button */}
-            <Button
-              size="icon"
-              variant="ghost"
-              onClick={handleToggle}
-              disabled={isLoading || !isPublished}
-              className="size-9 rounded-full"
-            >
-              {isLoading ? (
-                <Loader2 className="size-4 animate-spin" />
-              ) : isPlaying ? (
-                <Pause className="size-4" />
-              ) : (
-                <Play className="size-4 ml-0.5" />
-              )}
-            </Button>
-            
-            {/* Restart button - only show when actively playing or paused */}
-            {isPublished && (playbackState === 'playing' || playbackState === 'paused') && (
-              <Button
-                size="icon"
-                variant="ghost"
-                onClick={() => {
-                  restart();
-                }}
-                className="size-9 rounded-full"
-                title="Restart from beginning"
-              >
-                <RotateCcw className="size-3.5" />
-              </Button>
-            )}
-            
-            {/* Volume control */}
-            <Popover>
-              <PopoverTrigger asChild>
-                <Button
-                  size="icon"
-                  variant="ghost"
-                  className="size-9 rounded-full"
-                  title={volume === 0 ? 'Unmute' : 'Volume'}
-                >
-                  {volume === 0 ? (
-                    <VolumeX className="size-4" />
-                  ) : (
-                    <Volume2 className="size-4" />
-                  )}
-                </Button>
-              </PopoverTrigger>
-              <PopoverContent 
-                side="top" 
-                align="center" 
-                className="w-32 p-3"
-              >
-                <Slider
-                  value={[volume * 100]}
-                  onValueChange={([val]) => setVolume(val / 100)}
-                  max={100}
-                  step={1}
-                  className="w-full"
-                />
-              </PopoverContent>
-            </Popover>
-            
-            {/* Change track button */}
-            <Button
-              size="icon"
-              variant="ghost"
-              onClick={onChangeTrack}
-              disabled={isPublishing}
-              className="size-9 rounded-full"
-            >
-              <MoreHorizontal className="size-4" />
-            </Button>
-            
-            {/* Close button */}
-            <Button
-              size="icon"
-              variant="ghost"
-              onClick={handleClose}
-              disabled={isPublishing}
-              className="size-9 rounded-full text-muted-foreground hover:text-foreground"
-            >
-              <X className="size-4" />
-            </Button>
-          </div>
-        </div>
-        
-        {/* Error message */}
-        {hasError && playbackError && (
-          <div className="px-3 pb-3">
-            <div className="flex items-start gap-2 p-2 rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400">
-              <AlertCircle className="size-4 mt-0.5 shrink-0" />
-              <p className="text-xs">{playbackError.message}</p>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}

src/blobbi/actions/components/InlineSingCard.tsx

@@ -1,487 +0,0 @@
-// src/blobbi/actions/components/InlineSingCard.tsx
-
-import { useState, useRef, useCallback, useEffect } from 'react';
-import { 
-  Mic, 
-  Play, 
-  Pause, 
-  Square, 
-  FileText, 
-  Check, 
-  X, 
-  Loader2, 
-  AlertCircle,
-  RefreshCw,
-} from 'lucide-react';
-
-import { Button } from '@/components/ui/button';
-import { cn } from '@/lib/utils';
-
-import { useAudioPlayback } from '../hooks/useAudioPlayback';
-import { getRandomLyrics, type LyricsEntry } from '../lib/blobbi-random-lyrics';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-type RecordingState = 'idle' | 'requesting' | 'recording' | 'recorded' | 'error';
-
-interface InlineSingCardProps {
-  /** Called when user confirms the singing action (publish the action) */
-  onConfirm: () => Promise<void>;
-  /** Called when user closes the sing card */
-  onClose: () => void;
-  /** Called when recording starts (for Blobbi reaction) */
-  onRecordingStart?: () => void;
-  /** Called when recording stops (for Blobbi reaction) */
-  onRecordingStop?: () => void;
-  /** Whether publishing is in progress */
-  isPublishing: boolean;
-}
-
-// ─── MIME Type Selection ──────────────────────────────────────────────────────
-
-const AUDIO_MIME_CANDIDATES = [
-  'audio/webm;codecs=opus',
-  'audio/webm',
-  'audio/mp4',
-  'audio/ogg;codecs=opus',
-  'audio/ogg',
-] as const;
-
-function getSupportedAudioMimeType(): string | undefined {
-  if (typeof MediaRecorder === 'undefined') {
-    return undefined;
-  }
-  
-  for (const mimeType of AUDIO_MIME_CANDIDATES) {
-    if (MediaRecorder.isTypeSupported(mimeType)) {
-      return mimeType;
-    }
-  }
-  
-  return undefined;
-}
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function InlineSingCard({
-  onConfirm,
-  onClose,
-  onRecordingStart,
-  onRecordingStop,
-  isPublishing,
-}: InlineSingCardProps) {
-  // Recording state
-  const [recordingState, setRecordingState] = useState<RecordingState>('idle');
-  const [recordingError, setRecordingError] = useState<string | null>(null);
-  const [recordingDuration, setRecordingDuration] = useState(0);
-  const [audioUrl, setAudioUrl] = useState<string | null>(null);
-  
-  // Lyrics state
-  const [currentLyrics, setCurrentLyrics] = useState<LyricsEntry | null>(null);
-  const [showLyrics, setShowLyrics] = useState(false);
-  
-  // Refs
-  const mediaRecorderRef = useRef<MediaRecorder | null>(null);
-  const chunksRef = useRef<Blob[]>([]);
-  const streamRef = useRef<MediaStream | null>(null);
-  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
-  const actualMimeTypeRef = useRef<string | undefined>(undefined);
-  
-  // Audio playback for preview
-  const {
-    state: playbackState,
-    error: playbackError,
-    load: loadAudio,
-    toggle: togglePlayback,
-    stop: stopPlayback,
-    isPlaying,
-    cleanup: cleanupPlayback,
-  } = useAudioPlayback();
-  
-  // Cleanup all resources
-  const cleanupAll = useCallback(() => {
-    // Stop timer
-    if (timerRef.current) {
-      clearInterval(timerRef.current);
-      timerRef.current = null;
-    }
-    
-    // Stop media recorder
-    if (mediaRecorderRef.current && mediaRecorderRef.current.state !== 'inactive') {
-      try {
-        mediaRecorderRef.current.stop();
-      } catch {
-        // Ignore errors during cleanup
-      }
-    }
-    mediaRecorderRef.current = null;
-    
-    // Stop stream tracks
-    if (streamRef.current) {
-      streamRef.current.getTracks().forEach(track => track.stop());
-      streamRef.current = null;
-    }
-    
-    // Cleanup playback
-    cleanupPlayback();
-    
-    // Revoke URL
-    if (audioUrl) {
-      URL.revokeObjectURL(audioUrl);
-    }
-  }, [audioUrl, cleanupPlayback]);
-  
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      cleanupAll();
-    };
-  }, [cleanupAll]);
-  
-  // Reset recording
-  const resetRecording = useCallback(() => {
-    cleanupAll();
-    setRecordingState('idle');
-    setRecordingError(null);
-    setRecordingDuration(0);
-    setAudioUrl(null);
-    chunksRef.current = [];
-    actualMimeTypeRef.current = undefined;
-    // Keep lyrics
-  }, [cleanupAll]);
-  
-  // Check browser support
-  const checkRecordingSupport = (): boolean => {
-    if (typeof navigator === 'undefined') return false;
-    if (!navigator.mediaDevices) return false;
-    if (!navigator.mediaDevices.getUserMedia) return false;
-    if (typeof MediaRecorder === 'undefined') return false;
-    return true;
-  };
-  
-  // Start recording
-  const startRecording = useCallback(async () => {
-    if (!checkRecordingSupport()) {
-      setRecordingError('Audio recording is not supported in this browser.');
-      setRecordingState('error');
-      return;
-    }
-    
-    setRecordingState('requesting');
-    setRecordingError(null);
-    
-    try {
-      const stream = await navigator.mediaDevices.getUserMedia({
-        audio: {
-          echoCancellation: true,
-          noiseSuppression: true,
-          autoGainControl: true,
-        }
-      });
-      
-      streamRef.current = stream;
-      chunksRef.current = [];
-      
-      // Get supported MIME type
-      const supportedMimeType = getSupportedAudioMimeType();
-      
-      // Create MediaRecorder
-      let mediaRecorder: MediaRecorder;
-      if (supportedMimeType) {
-        mediaRecorder = new MediaRecorder(stream, { mimeType: supportedMimeType });
-      } else {
-        mediaRecorder = new MediaRecorder(stream);
-      }
-      
-      actualMimeTypeRef.current = mediaRecorder.mimeType || supportedMimeType;
-      mediaRecorderRef.current = mediaRecorder;
-      
-      mediaRecorder.ondataavailable = (event) => {
-        if (event.data.size > 0) {
-          chunksRef.current.push(event.data);
-        }
-      };
-      
-      mediaRecorder.onstop = () => {
-        const blobMimeType = actualMimeTypeRef.current || 'audio/webm';
-        const blob = new Blob(chunksRef.current, { type: blobMimeType });
-        const url = URL.createObjectURL(blob);
-        setAudioUrl(url);
-        setRecordingState('recorded');
-        
-        if (streamRef.current) {
-          streamRef.current.getTracks().forEach(track => track.stop());
-          streamRef.current = null;
-        }
-      };
-      
-      mediaRecorder.onerror = () => {
-        setRecordingError('Recording failed. Please try again.');
-        setRecordingState('error');
-      };
-      
-      mediaRecorder.start(100);
-      setRecordingState('recording');
-      setRecordingDuration(0);
-      
-      // Notify parent that recording started (for Blobbi reaction)
-      onRecordingStart?.();
-      
-      timerRef.current = setInterval(() => {
-        setRecordingDuration(prev => prev + 1);
-      }, 1000);
-      
-    } catch (err) {
-      if (err instanceof Error) {
-        if (err.name === 'NotAllowedError' || err.name === 'PermissionDeniedError') {
-          setRecordingError('Microphone access was denied.');
-        } else if (err.name === 'NotFoundError') {
-          setRecordingError('No microphone found.');
-        } else {
-          setRecordingError(err.message);
-        }
-      } else {
-        setRecordingError('Failed to access microphone.');
-      }
-      setRecordingState('error');
-    }
-  }, [onRecordingStart]);
-  
-  // Stop recording
-  const stopRecording = useCallback(() => {
-    if (timerRef.current) {
-      clearInterval(timerRef.current);
-      timerRef.current = null;
-    }
-    
-    if (mediaRecorderRef.current && mediaRecorderRef.current.state !== 'inactive') {
-      mediaRecorderRef.current.stop();
-    }
-    
-    // Notify parent that recording stopped (for Blobbi reaction)
-    onRecordingStop?.();
-  }, [onRecordingStop]);
-  
-  // Handle preview playback
-  const handlePreview = useCallback(() => {
-    if (!audioUrl) return;
-    
-    if (playbackState === 'idle') {
-      loadAudio(audioUrl, true);
-    } else {
-      togglePlayback();
-    }
-  }, [audioUrl, playbackState, loadAudio, togglePlayback]);
-  
-  // Handle confirm
-  const handleConfirm = useCallback(async () => {
-    stopPlayback();
-    await onConfirm();
-    // After successful publish, close the card
-    onClose();
-  }, [stopPlayback, onConfirm, onClose]);
-  
-  // Handle close
-  const handleClose = useCallback(() => {
-    cleanupAll();
-    onClose();
-  }, [cleanupAll, onClose]);
-  
-  // Handle lyrics toggle
-  const handleLyricsToggle = useCallback(() => {
-    if (!currentLyrics && !showLyrics) {
-      // Generate lyrics on first open
-      setCurrentLyrics(getRandomLyrics());
-    }
-    setShowLyrics(!showLyrics);
-  }, [currentLyrics, showLyrics]);
-  
-  // Get new lyrics
-  const handleNewLyrics = useCallback(() => {
-    setCurrentLyrics(getRandomLyrics());
-  }, []);
-  
-  // Format duration
-  const formatDuration = (seconds: number) => {
-    const mins = Math.floor(seconds / 60);
-    const secs = seconds % 60;
-    return `${mins}:${secs.toString().padStart(2, '0')}`;
-  };
-  
-  const hasRecording = recordingState === 'recorded';
-  const isRecording = recordingState === 'recording';
-  const canConfirm = hasRecording && !isPublishing;
-  
-  return (
-    <div className="mx-4 sm:mx-6 mb-4">
-      <div className={cn(
-        "rounded-xl border bg-card/80 backdrop-blur-sm overflow-hidden",
-        "shadow-sm transition-all",
-        isRecording && "ring-2 ring-red-500/30"
-      )}>
-        {/* Lyrics panel (expands upward visually by being above controls) */}
-        {showLyrics && currentLyrics && (
-          <div className="px-3 pt-3 pb-2 border-b border-border/50">
-            <div className="flex items-center justify-between mb-2">
-              <span className="text-sm font-medium">{currentLyrics.title}</span>
-              <Button
-                size="icon"
-                variant="ghost"
-                onClick={handleNewLyrics}
-                className="size-7 rounded-full"
-              >
-                <RefreshCw className="size-3" />
-              </Button>
-            </div>
-            <div className="p-3 rounded-lg bg-muted/50 text-sm leading-relaxed whitespace-pre-line max-h-32 overflow-y-auto">
-              {currentLyrics.lines.join('\n')}
-            </div>
-          </div>
-        )}
-        
-        {/* Status row (recording/recorded info) */}
-        {(isRecording || hasRecording) && (
-          <div className="px-3 pt-3 pb-2 border-b border-border/50">
-            <div className="flex items-center justify-center gap-2">
-              {isRecording && (
-                <>
-                  <div className="size-2 rounded-full bg-red-500 animate-pulse" />
-                  <span className="text-sm font-mono font-medium text-red-500">
-                    {formatDuration(recordingDuration)}
-                  </span>
-                  <span className="text-xs text-muted-foreground">Recording...</span>
-                </>
-              )}
-              {hasRecording && !isRecording && (
-                <>
-                  <Check className="size-4 text-purple-500" />
-                  <span className="text-sm font-mono font-medium text-purple-500">
-                    {formatDuration(recordingDuration)}
-                  </span>
-                  <span className="text-xs text-muted-foreground">Recorded</span>
-                </>
-              )}
-            </div>
-          </div>
-        )}
-        
-        {/* Error message */}
-        {(recordingError || playbackError) && (
-          <div className="px-3 pt-2">
-            <div className="flex items-start gap-2 p-2 rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400">
-              <AlertCircle className="size-4 mt-0.5 shrink-0" />
-              <p className="text-xs">{recordingError || playbackError?.message}</p>
-            </div>
-          </div>
-        )}
-        
-        {/* Main controls row */}
-        <div className="flex items-center justify-between gap-2 p-3">
-          {/* Left: Lyrics button */}
-          <Button
-            size="icon"
-            variant={showLyrics ? "secondary" : "ghost"}
-            onClick={handleLyricsToggle}
-            className="size-10 rounded-full shrink-0"
-          >
-            <FileText className="size-4" />
-          </Button>
-          
-          {/* Center: Record/Stop button */}
-          <div className="flex items-center gap-2">
-            {!isRecording && !hasRecording && (
-              <Button
-                onClick={startRecording}
-                disabled={isPublishing}
-                className="rounded-full px-6 bg-purple-500 hover:bg-purple-600"
-              >
-                <Mic className="size-4 mr-2" />
-                Sing
-              </Button>
-            )}
-            
-            {isRecording && (
-              <Button
-                onClick={stopRecording}
-                variant="destructive"
-                className="rounded-full px-6"
-              >
-                <Square className="size-4 mr-2" />
-                Stop
-              </Button>
-            )}
-            
-            {hasRecording && !isRecording && (
-              <>
-                <Button
-                  onClick={resetRecording}
-                  variant="outline"
-                  size="icon"
-                  className="size-10 rounded-full"
-                >
-                  <RefreshCw className="size-4" />
-                </Button>
-                
-                <Button
-                  onClick={handleConfirm}
-                  disabled={!canConfirm}
-                  className="rounded-full px-6 bg-purple-500 hover:bg-purple-600"
-                >
-                  {isPublishing ? (
-                    <Loader2 className="size-4 mr-2 animate-spin" />
-                  ) : (
-                    <Check className="size-4 mr-2" />
-                  )}
-                  {isPublishing ? 'Singing...' : 'Sing for Blobbi'}
-                </Button>
-              </>
-            )}
-          </div>
-          
-          {/* Right: Preview button (when recording exists) */}
-          {hasRecording ? (
-            <Button
-              size="icon"
-              variant="ghost"
-              onClick={handlePreview}
-              disabled={isPublishing}
-              className="size-10 rounded-full shrink-0"
-            >
-              {isPlaying ? (
-                <Pause className="size-4" />
-              ) : (
-                <Play className="size-4 ml-0.5" />
-              )}
-            </Button>
-          ) : (
-            /* Close button when no recording */
-            <Button
-              size="icon"
-              variant="ghost"
-              onClick={handleClose}
-              className="size-10 rounded-full shrink-0 text-muted-foreground hover:text-foreground"
-            >
-              <X className="size-4" />
-            </Button>
-          )}
-        </div>
-        
-        {/* Close button row when recording exists */}
-        {hasRecording && (
-          <div className="px-3 pb-3 pt-0 flex justify-end">
-            <Button
-              size="sm"
-              variant="ghost"
-              onClick={handleClose}
-              disabled={isPublishing}
-              className="text-muted-foreground hover:text-foreground"
-            >
-              <X className="size-3 mr-1" />
-              Cancel
-            </Button>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}

src/blobbi/actions/components/PlayMusicModal.tsx

@@ -1,301 +0,0 @@
-// src/blobbi/actions/components/PlayMusicModal.tsx
-
-import { useState, useRef, useCallback, useEffect } from 'react';
-import { Music, Play, Pause, Check, Loader2, Volume2, AlertCircle } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { cn } from '@/lib/utils';
-
-import {
-  getAllTracks,
-  formatTrackDuration,
-  type BlobbiTrack,
-} from '../lib/blobbi-track-catalog';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Selected track for the music player
- */
-export interface SelectedTrack {
-  track: BlobbiTrack;
-  url: string;
-}
-
-interface PlayMusicModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  /** Called with the selected track when user confirms */
-  onConfirm: (selection: SelectedTrack) => void;
-  isLoading: boolean;
-}
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function PlayMusicModal({
-  open,
-  onOpenChange,
-  onConfirm,
-  isLoading,
-}: PlayMusicModalProps) {
-  const [selectedTrack, setSelectedTrack] = useState<SelectedTrack | null>(null);
-  const [isPlaying, setIsPlaying] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const audioRef = useRef<HTMLAudioElement | null>(null);
-  
-  // Track the current audio source URL to detect changes
-  const currentAudioUrlRef = useRef<string | null>(null);
-  
-  const tracks = getAllTracks();
-  
-  // Cleanup audio on unmount
-  useEffect(() => {
-    return () => {
-      if (audioRef.current) {
-        audioRef.current.pause();
-        audioRef.current = null;
-      }
-    };
-  }, []);
-  
-  // Reset state when modal opens
-  useEffect(() => {
-    if (open) {
-      setSelectedTrack(null);
-      setIsPlaying(false);
-      setError(null);
-      currentAudioUrlRef.current = null;
-    }
-  }, [open]);
-  
-  // Handle selecting a track
-  const handleSelectTrack = useCallback((track: BlobbiTrack) => {
-    // Stop current playback
-    if (audioRef.current) {
-      audioRef.current.pause();
-      setIsPlaying(false);
-    }
-    
-    setSelectedTrack({ track, url: track.url });
-    setError(null);
-  }, []);
-  
-  // Handle play/pause preview
-  const handleTogglePlay = useCallback(() => {
-    if (!selectedTrack) return;
-    
-    const audioUrl = selectedTrack.url;
-    
-    // Check if we need to create a new Audio instance (source changed or first time)
-    const needsNewAudio = !audioRef.current || currentAudioUrlRef.current !== audioUrl;
-    
-    if (needsNewAudio) {
-      // Stop and cleanup old audio if exists
-      if (audioRef.current) {
-        audioRef.current.pause();
-        audioRef.current.onended = null;
-        audioRef.current.onerror = null;
-      }
-      
-      // Create new Audio instance with the correct source
-      audioRef.current = new Audio(audioUrl);
-      currentAudioUrlRef.current = audioUrl;
-      
-      audioRef.current.onended = () => setIsPlaying(false);
-      audioRef.current.onerror = () => {
-        setError('Failed to load this track. Please try another one.');
-        setIsPlaying(false);
-      };
-    }
-    
-    if (isPlaying && !needsNewAudio) {
-      // Pause current playback
-      audioRef.current?.pause();
-      setIsPlaying(false);
-    } else {
-      // Start playback (either new source or resuming)
-      audioRef.current?.play().catch(() => {
-        setError('Failed to play this track. Please try another one.');
-        setIsPlaying(false);
-      });
-      setIsPlaying(true);
-    }
-  }, [selectedTrack, isPlaying]);
-  
-  // Handle confirm
-  const handleConfirm = useCallback(() => {
-    if (!selectedTrack) return;
-    
-    // Stop playback
-    if (audioRef.current) {
-      audioRef.current.pause();
-      setIsPlaying(false);
-    }
-    onConfirm(selectedTrack);
-  }, [selectedTrack, onConfirm]);
-  
-  // Handle close
-  const handleClose = useCallback((isOpen: boolean) => {
-    if (!isOpen && audioRef.current) {
-      audioRef.current.pause();
-      setIsPlaying(false);
-    }
-    onOpenChange(isOpen);
-  }, [onOpenChange]);
-
-  return (
-    <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent className="max-w-md max-h-[85vh] flex flex-col p-0">
-        {/* Header */}
-        <DialogHeader className="px-6 pt-6 pb-4 border-b">
-          <div className="flex items-center gap-3">
-            <div className="size-10 rounded-xl bg-gradient-to-br from-pink-500/20 to-pink-500/5 flex items-center justify-center">
-              <Music className="size-5 text-pink-500" />
-            </div>
-            <div>
-              <DialogTitle className="text-xl">Play Music</DialogTitle>
-              <p className="text-sm text-muted-foreground">
-                Choose a track to play for your Blobbi
-              </p>
-            </div>
-          </div>
-        </DialogHeader>
-
-        {/* Content - Track List */}
-        <div className="flex-1 overflow-y-auto px-6 py-4">
-          <div className="grid gap-2">
-            {tracks.map((track) => (
-              <TrackRow
-                key={track.id}
-                track={track}
-                isSelected={selectedTrack?.track.id === track.id}
-                onSelect={() => handleSelectTrack(track)}
-              />
-            ))}
-          </div>
-          {error && (
-            <div className="mt-4 p-3 rounded-lg bg-amber-500/10 border border-amber-500/30">
-              <div className="flex items-start gap-2">
-                <AlertCircle className="size-4 text-amber-500 mt-0.5 shrink-0" />
-                <p className="text-sm text-amber-600 dark:text-amber-400">{error}</p>
-              </div>
-            </div>
-          )}
-        </div>
-
-        {/* Footer */}
-        <div className="px-6 py-4 border-t bg-muted/30">
-          {/* Preview Controls */}
-          {selectedTrack && (
-            <div className="mb-4 p-3 rounded-lg bg-card border">
-              <div className="flex items-center gap-3">
-                <Button
-                  size="icon"
-                  variant="outline"
-                  onClick={handleTogglePlay}
-                  className="size-10 rounded-full shrink-0"
-                >
-                  {isPlaying ? (
-                    <Pause className="size-4" />
-                  ) : (
-                    <Play className="size-4 ml-0.5" />
-                  )}
-                </Button>
-                <div className="flex-1 min-w-0">
-                  <p className="font-medium truncate text-sm">{selectedTrack.track.title}</p>
-                  <p className="text-xs text-muted-foreground">
-                    {isPlaying ? 'Now playing...' : 'Click to preview'}
-                  </p>
-                </div>
-                {isPlaying && (
-                  <Volume2 className="size-4 text-primary animate-pulse shrink-0" />
-                )}
-              </div>
-            </div>
-          )}
-          
-          {/* Action Buttons */}
-          <div className="flex gap-3">
-            <Button
-              variant="outline"
-              onClick={() => handleClose(false)}
-              className="flex-1"
-              disabled={isLoading}
-            >
-              Cancel
-            </Button>
-            <Button
-              onClick={handleConfirm}
-              disabled={!selectedTrack || isLoading}
-              className="flex-1"
-            >
-              {isLoading ? (
-                <>
-                  <Loader2 className="size-4 mr-2 animate-spin" />
-                  Playing...
-                </>
-              ) : (
-                <>
-                  <Music className="size-4 mr-2" />
-                  Play for Blobbi
-                </>
-              )}
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-// ─── Track Row Component ──────────────────────────────────────────────────────
-
-interface TrackRowProps {
-  track: BlobbiTrack;
-  isSelected: boolean;
-  onSelect: () => void;
-}
-
-function TrackRow({ track, isSelected, onSelect }: TrackRowProps) {
-  return (
-    <button
-      type="button"
-      onClick={onSelect}
-      className={cn(
-        "w-full p-3 rounded-xl text-left transition-all",
-        "border hover:border-primary/30",
-        isSelected 
-          ? "border-primary bg-primary/5 ring-2 ring-primary/20" 
-          : "border-border bg-card/60"
-      )}
-    >
-      <div className="flex items-center gap-3">
-        <div className={cn(
-          "size-10 rounded-lg flex items-center justify-center",
-          isSelected ? "bg-primary/20" : "bg-muted"
-        )}>
-          <Music className={cn(
-            "size-5",
-            isSelected ? "text-primary" : "text-muted-foreground"
-          )} />
-        </div>
-        <div className="flex-1 min-w-0">
-          <p className="font-medium truncate">{track.title}</p>
-          <p className="text-sm text-muted-foreground">{track.artist}</p>
-        </div>
-        <div className="flex items-center gap-2 shrink-0">
-          <span className="text-sm text-muted-foreground">
-            {formatTrackDuration(track.durationSeconds)}
-          </span>
-          {isSelected && <Check className="size-4 text-primary" />}
-        </div>
-      </div>
-    </button>
-  );
-}

src/blobbi/actions/components/SingModal.tsx

@@ -1,601 +0,0 @@
-// src/blobbi/actions/components/SingModal.tsx
-
-import { useState, useRef, useCallback, useEffect } from 'react';
-import { Mic, MicOff, Play, Pause, Square, Loader2, AlertCircle, RotateCcw, Sparkles, ChevronDown, ChevronUp } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { cn } from '@/lib/utils';
-
-import { getRandomLyrics, type LyricsEntry } from '../lib/blobbi-random-lyrics';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface SingModalProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  onConfirm: () => void;
-  isLoading: boolean;
-}
-
-type RecordingState = 'idle' | 'requesting' | 'recording' | 'recorded' | 'playing' | 'error';
-
-// ─── MIME Type Selection Helper ───────────────────────────────────────────────
-
-/**
- * Ordered list of MIME types to try for audio recording.
- * The first supported type will be used.
- */
-const AUDIO_MIME_CANDIDATES = [
-  'audio/webm;codecs=opus',
-  'audio/webm',
-  'audio/mp4',
-  'audio/ogg;codecs=opus',
-  'audio/ogg',
-] as const;
-
-/**
- * Get the first supported MIME type for MediaRecorder.
- * Returns undefined if no explicit MIME type is supported (let browser decide).
- */
-function getSupportedAudioMimeType(): string | undefined {
-  if (typeof MediaRecorder === 'undefined') {
-    return undefined;
-  }
-  
-  for (const mimeType of AUDIO_MIME_CANDIDATES) {
-    if (MediaRecorder.isTypeSupported(mimeType)) {
-      return mimeType;
-    }
-  }
-  
-  // No explicit MIME type supported, let browser use default
-  return undefined;
-}
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function SingModal({
-  open,
-  onOpenChange,
-  onConfirm,
-  isLoading,
-}: SingModalProps) {
-  const [recordingState, setRecordingState] = useState<RecordingState>('idle');
-  const [error, setError] = useState<string | null>(null);
-  const [playbackError, setPlaybackError] = useState<string | null>(null);
-  const [recordingDuration, setRecordingDuration] = useState(0);
-  const [audioUrl, setAudioUrl] = useState<string | null>(null);
-  const [currentLyrics, setCurrentLyrics] = useState<LyricsEntry | null>(null);
-  const [showLyrics, setShowLyrics] = useState(false);
-  
-  const mediaRecorderRef = useRef<MediaRecorder | null>(null);
-  const chunksRef = useRef<Blob[]>([]);
-  const streamRef = useRef<MediaStream | null>(null);
-  const audioRef = useRef<HTMLAudioElement | null>(null);
-  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
-  // Track the actual MIME type used by the recorder
-  const actualMimeTypeRef = useRef<string | undefined>(undefined);
-  
-  const cleanup = useCallback(() => {
-    // Stop timer
-    if (timerRef.current) {
-      clearInterval(timerRef.current);
-      timerRef.current = null;
-    }
-    
-    // Stop media recorder
-    if (mediaRecorderRef.current && mediaRecorderRef.current.state !== 'inactive') {
-      mediaRecorderRef.current.stop();
-    }
-    mediaRecorderRef.current = null;
-    
-    // Stop stream tracks
-    if (streamRef.current) {
-      streamRef.current.getTracks().forEach(track => track.stop());
-      streamRef.current = null;
-    }
-    
-    // Stop audio playback
-    if (audioRef.current) {
-      audioRef.current.pause();
-      audioRef.current = null;
-    }
-    
-    // Revoke URL
-    if (audioUrl) {
-      URL.revokeObjectURL(audioUrl);
-    }
-  }, [audioUrl]);
-  
-  const resetRecording = useCallback(() => {
-    cleanup();
-    setRecordingState('idle');
-    setError(null);
-    setPlaybackError(null);
-    setRecordingDuration(0);
-    setAudioUrl(null);
-    chunksRef.current = [];
-    currentPlaybackUrlRef.current = null;
-    actualMimeTypeRef.current = undefined;
-    // Keep lyrics when re-recording so user can sing the same song
-  }, [cleanup]);
-  
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      cleanup();
-    };
-  }, [cleanup]);
-  
-  // Reset state when modal opens
-  useEffect(() => {
-    if (open) {
-      resetRecording();
-    } else {
-      cleanup();
-    }
-  }, [open, cleanup, resetRecording]);
-  
-  // Handle getting random lyrics
-  const handleRandomLyrics = useCallback(() => {
-    const lyrics = getRandomLyrics();
-    setCurrentLyrics(lyrics);
-    setShowLyrics(true);
-  }, []);
-  
-  // Check if browser supports media recording
-  const checkRecordingSupport = (): boolean => {
-    if (typeof navigator === 'undefined') return false;
-    if (!navigator.mediaDevices) return false;
-    if (!navigator.mediaDevices.getUserMedia) return false;
-    if (typeof MediaRecorder === 'undefined') return false;
-    return true;
-  };
-  
-  // Start recording
-  const startRecording = useCallback(async () => {
-    if (!checkRecordingSupport()) {
-      setError('Audio recording is not supported in this browser.');
-      setRecordingState('error');
-      return;
-    }
-    
-    setRecordingState('requesting');
-    setError(null);
-    setPlaybackError(null);
-    
-    try {
-      const stream = await navigator.mediaDevices.getUserMedia({ 
-        audio: {
-          echoCancellation: true,
-          noiseSuppression: true,
-          autoGainControl: true,
-        }
-      });
-      
-      streamRef.current = stream;
-      chunksRef.current = [];
-      
-      // Get the first supported MIME type using our helper
-      const supportedMimeType = getSupportedAudioMimeType();
-      
-      // Create MediaRecorder with or without explicit MIME type
-      let mediaRecorder: MediaRecorder;
-      if (supportedMimeType) {
-        mediaRecorder = new MediaRecorder(stream, { mimeType: supportedMimeType });
-      } else {
-        // Let browser choose default MIME type
-        mediaRecorder = new MediaRecorder(stream);
-      }
-      
-      // Store the actual MIME type being used (may differ from what we requested)
-      actualMimeTypeRef.current = mediaRecorder.mimeType || supportedMimeType;
-      mediaRecorderRef.current = mediaRecorder;
-      
-      mediaRecorder.ondataavailable = (event) => {
-        if (event.data.size > 0) {
-          chunksRef.current.push(event.data);
-        }
-      };
-      
-      mediaRecorder.onstop = () => {
-        // Create blob from chunks using the actual MIME type used by the recorder
-        const blobMimeType = actualMimeTypeRef.current || 'audio/webm';
-        const blob = new Blob(chunksRef.current, { type: blobMimeType });
-        const url = URL.createObjectURL(blob);
-        setAudioUrl(url);
-        setRecordingState('recorded');
-        
-        // Stop stream tracks
-        if (streamRef.current) {
-          streamRef.current.getTracks().forEach(track => track.stop());
-          streamRef.current = null;
-        }
-      };
-      
-      mediaRecorder.onerror = () => {
-        setError('Recording failed. Please try again.');
-        setRecordingState('error');
-      };
-      
-      // Start recording
-      mediaRecorder.start(100); // Collect data every 100ms
-      setRecordingState('recording');
-      setRecordingDuration(0);
-      
-      // Start timer
-      timerRef.current = setInterval(() => {
-        setRecordingDuration(prev => prev + 1);
-      }, 1000);
-      
-    } catch (err) {
-      if (err instanceof Error) {
-        if (err.name === 'NotAllowedError' || err.name === 'PermissionDeniedError') {
-          setError('Microphone access was denied. Please allow microphone access and try again.');
-        } else if (err.name === 'NotFoundError') {
-          setError('No microphone found. Please connect a microphone and try again.');
-        } else {
-          setError(`Failed to access microphone: ${err.message}`);
-        }
-      } else {
-        setError('Failed to access microphone. Please try again.');
-      }
-      setRecordingState('error');
-    }
-  }, []);
-  
-  // Stop recording
-  const stopRecording = useCallback(() => {
-    if (timerRef.current) {
-      clearInterval(timerRef.current);
-      timerRef.current = null;
-    }
-    
-    if (mediaRecorderRef.current && mediaRecorderRef.current.state !== 'inactive') {
-      mediaRecorderRef.current.stop();
-    }
-  }, []);
-  
-  // Track the current audio URL to detect changes
-  const currentPlaybackUrlRef = useRef<string | null>(null);
-  
-  // Play/pause preview
-  const togglePlayback = useCallback(() => {
-    if (!audioUrl) return;
-    
-    // Clear previous playback error when attempting to play
-    setPlaybackError(null);
-    
-    if (recordingState === 'playing') {
-      if (audioRef.current) {
-        audioRef.current.pause();
-      }
-      setRecordingState('recorded');
-    } else {
-      // Check if we need to create a new Audio instance (URL changed or first time)
-      const needsNewAudio = !audioRef.current || currentPlaybackUrlRef.current !== audioUrl;
-      
-      if (needsNewAudio) {
-        // Cleanup old audio if exists
-        if (audioRef.current) {
-          audioRef.current.pause();
-          audioRef.current.onended = null;
-          audioRef.current.onerror = null;
-        }
-        
-        // Create new Audio instance with the recorded audio URL
-        audioRef.current = new Audio(audioUrl);
-        currentPlaybackUrlRef.current = audioUrl;
-        audioRef.current.onended = () => setRecordingState('recorded');
-        
-        // Handle playback errors with user-visible message
-        audioRef.current.onerror = () => {
-          setPlaybackError('This browser could not play the recorded audio preview. Your recording was still created successfully.');
-          setRecordingState('recorded');
-        };
-      }
-      
-      audioRef.current?.play()
-        .then(() => {
-          setRecordingState('playing');
-        })
-        .catch((err) => {
-          console.error('Failed to play recording:', err);
-          // Provide user-friendly error message
-          if (err.name === 'NotSupportedError') {
-            setPlaybackError('Recording was created, but playback preview is not supported in this browser.');
-          } else if (err.name === 'NotAllowedError') {
-            setPlaybackError('Playback was blocked. Try interacting with the page first.');
-          } else {
-            setPlaybackError('Could not play the recording preview. Your recording was still created successfully.');
-          }
-          setRecordingState('recorded');
-        });
-    }
-  }, [audioUrl, recordingState]);
-  
-  // Handle confirm
-  const handleConfirm = useCallback(() => {
-    if (audioRef.current) {
-      audioRef.current.pause();
-    }
-    onConfirm();
-  }, [onConfirm]);
-  
-  // Handle close
-  const handleClose = useCallback((isOpen: boolean) => {
-    if (!isOpen) {
-      cleanup();
-    }
-    onOpenChange(isOpen);
-  }, [onOpenChange, cleanup]);
-  
-  // Format duration
-  const formatDuration = (seconds: number) => {
-    const mins = Math.floor(seconds / 60);
-    const secs = seconds % 60;
-    return `${mins}:${secs.toString().padStart(2, '0')}`;
-  };
-  
-  const hasRecording = recordingState === 'recorded' || recordingState === 'playing';
-
-  return (
-    <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent className="max-w-md max-h-[85vh] flex flex-col p-0">
-        {/* Header */}
-        <DialogHeader className="px-6 pt-6 pb-4 border-b">
-          <div className="flex items-center gap-3">
-            <div className="size-10 rounded-xl bg-gradient-to-br from-purple-500/20 to-purple-500/5 flex items-center justify-center">
-              <Mic className="size-5 text-purple-500" />
-            </div>
-            <div>
-              <DialogTitle className="text-xl">Sing</DialogTitle>
-              <p className="text-sm text-muted-foreground">
-                Record yourself singing for your Blobbi
-              </p>
-            </div>
-          </div>
-        </DialogHeader>
-
-        {/* Content */}
-        <div className="flex-1 px-6 py-8">
-          <div className="flex flex-col items-center justify-center gap-6">
-            {/* Recording Visualization */}
-            <div className={cn(
-              "relative size-40 rounded-full flex items-center justify-center transition-all",
-              recordingState === 'recording' && "animate-pulse",
-              recordingState === 'recording' 
-                ? "bg-red-500/10 ring-4 ring-red-500/30" 
-                : hasRecording
-                ? "bg-purple-500/10 ring-4 ring-purple-500/30"
-                : "bg-muted"
-            )}>
-              {/* Animated rings for recording */}
-              {recordingState === 'recording' && (
-                <>
-                  <div className="absolute inset-0 rounded-full bg-red-500/10 animate-ping" />
-                  <div className="absolute inset-4 rounded-full bg-red-500/10 animate-ping animation-delay-150" />
-                </>
-              )}
-              
-              {/* Icon */}
-              <div className={cn(
-                "relative size-20 rounded-full flex items-center justify-center",
-                recordingState === 'recording' 
-                  ? "bg-red-500 text-white" 
-                  : hasRecording
-                  ? "bg-purple-500 text-white"
-                  : "bg-muted-foreground/20"
-              )}>
-                {recordingState === 'requesting' ? (
-                  <Loader2 className="size-8 animate-spin" />
-                ) : recordingState === 'recording' ? (
-                  <Mic className="size-8" />
-                ) : hasRecording ? (
-                  recordingState === 'playing' ? (
-                    <Pause className="size-8" />
-                  ) : (
-                    <Play className="size-8 ml-1" />
-                  )
-                ) : (
-                  <MicOff className="size-8 text-muted-foreground" />
-                )}
-              </div>
-            </div>
-            
-            {/* Duration / Status */}
-            <div className="text-center">
-              {recordingState === 'idle' && (
-                <p className="text-muted-foreground">Tap the button below to start recording</p>
-              )}
-              {recordingState === 'requesting' && (
-                <p className="text-muted-foreground">Requesting microphone access...</p>
-              )}
-              {recordingState === 'recording' && (
-                <>
-                  <p className="text-3xl font-mono font-bold text-red-500">
-                    {formatDuration(recordingDuration)}
-                  </p>
-                  <p className="text-sm text-muted-foreground mt-1">Recording...</p>
-                </>
-              )}
-              {hasRecording && (
-                <>
-                  <p className="text-3xl font-mono font-bold text-purple-500">
-                    {formatDuration(recordingDuration)}
-                  </p>
-                  <p className="text-sm text-muted-foreground mt-1">
-                    {recordingState === 'playing' ? 'Playing...' : 'Tap to preview'}
-                  </p>
-                </>
-              )}
-              {recordingState === 'error' && (
-                <p className="text-destructive">Recording failed</p>
-              )}
-            </div>
-            
-            {/* Error Message */}
-            {error && (
-              <div className="w-full p-3 rounded-lg bg-destructive/10 border border-destructive/30">
-                <div className="flex items-start gap-2">
-                  <AlertCircle className="size-4 text-destructive mt-0.5 shrink-0" />
-                  <p className="text-sm text-destructive">{error}</p>
-                </div>
-              </div>
-            )}
-            
-            {/* Playback Error Message (non-fatal, recording still works) */}
-            {playbackError && (
-              <div className="w-full p-3 rounded-lg bg-amber-500/10 border border-amber-500/30">
-                <div className="flex items-start gap-2">
-                  <AlertCircle className="size-4 text-amber-500 mt-0.5 shrink-0" />
-                  <p className="text-sm text-amber-600 dark:text-amber-400">{playbackError}</p>
-                </div>
-              </div>
-            )}
-            
-            {/* Lyrics Helper */}
-            <div className="w-full">
-              {!currentLyrics ? (
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={handleRandomLyrics}
-                  className="w-full gap-2"
-                >
-                  <Sparkles className="size-4" />
-                  Need lyrics? Get random lyrics
-                </Button>
-              ) : (
-                <div className="rounded-lg border bg-card/60">
-                  <button
-                    type="button"
-                    onClick={() => setShowLyrics(!showLyrics)}
-                    className="w-full flex items-center justify-between p-3 text-left"
-                  >
-                    <div className="flex items-center gap-2">
-                      <Sparkles className="size-4 text-purple-500" />
-                      <span className="font-medium text-sm">{currentLyrics.title}</span>
-                    </div>
-                    {showLyrics ? (
-                      <ChevronUp className="size-4 text-muted-foreground" />
-                    ) : (
-                      <ChevronDown className="size-4 text-muted-foreground" />
-                    )}
-                  </button>
-                  {showLyrics && (
-                    <div className="px-3 pb-3 pt-0">
-                      <div className="p-3 rounded-md bg-muted/50 text-sm leading-relaxed whitespace-pre-line">
-                        {currentLyrics.lines.join('\n')}
-                      </div>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={handleRandomLyrics}
-                        className="w-full mt-2 gap-2 text-muted-foreground"
-                      >
-                        <RotateCcw className="size-3" />
-                        Get different lyrics
-                      </Button>
-                    </div>
-                  )}
-                </div>
-              )}
-            </div>
-            
-            {/* Recording Controls */}
-            <div className="flex items-center gap-3">
-              {recordingState === 'idle' || recordingState === 'error' ? (
-                <Button
-                  size="lg"
-                  onClick={startRecording}
-                  className="rounded-full px-8 bg-purple-500 hover:bg-purple-600"
-                >
-                  <Mic className="size-5 mr-2" />
-                  Start Recording
-                </Button>
-              ) : recordingState === 'recording' ? (
-                <Button
-                  size="lg"
-                  variant="destructive"
-                  onClick={stopRecording}
-                  className="rounded-full px-8"
-                >
-                  <Square className="size-5 mr-2" />
-                  Stop
-                </Button>
-              ) : hasRecording ? (
-                <>
-                  <Button
-                    size="lg"
-                    variant="outline"
-                    onClick={togglePlayback}
-                    className="rounded-full"
-                  >
-                    {recordingState === 'playing' ? (
-                      <>
-                        <Pause className="size-5 mr-2" />
-                        Pause
-                      </>
-                    ) : (
-                      <>
-                        <Play className="size-5 mr-2" />
-                        Preview
-                      </>
-                    )}
-                  </Button>
-                  <Button
-                    size="lg"
-                    variant="ghost"
-                    onClick={resetRecording}
-                    className="rounded-full"
-                  >
-                    <RotateCcw className="size-5 mr-2" />
-                    Re-record
-                  </Button>
-                </>
-              ) : null}
-            </div>
-          </div>
-        </div>
-
-        {/* Footer */}
-        <div className="px-6 py-4 border-t bg-muted/30">
-          <div className="flex gap-3">
-            <Button
-              variant="outline"
-              onClick={() => handleClose(false)}
-              className="flex-1"
-              disabled={isLoading}
-            >
-              Cancel
-            </Button>
-            <Button
-              onClick={handleConfirm}
-              disabled={!hasRecording || isLoading}
-              className="flex-1"
-            >
-              {isLoading ? (
-                <>
-                  <Loader2 className="size-4 mr-2 animate-spin" />
-                  Singing...
-                </>
-              ) : (
-                <>
-                  <Mic className="size-4 mr-2" />
-                  Sing for Blobbi
-                </>
-              )}
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

src/blobbi/actions/components/StartEvolutionDialog.tsx

@@ -1,125 +0,0 @@
-// src/blobbi/actions/components/StartEvolutionDialog.tsx
-
-/**
- * Dialog for confirming start of evolution.
- * 
- * Evolution is simpler than incubation:
- * - Only baby Blobbis can evolve
- * - Shows restart confirmation if already evolving
- * - Otherwise shows normal start confirmation
- */
-
-import { Loader2, AlertTriangle, Sparkles } from 'lucide-react';
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface StartEvolutionDialogProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  /** The companion to start evolving */
-  companion: BlobbiCompanion | null;
-  /** Called when confirmed */
-  onConfirm: () => void;
-  isPending: boolean;
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function StartEvolutionDialog({
-  open,
-  onOpenChange,
-  companion,
-  onConfirm,
-  isPending,
-}: StartEvolutionDialogProps) {
-  // Check if the current Blobbi is already evolving
-  const isAlreadyEvolving = companion?.state === 'evolving';
-  
-  // Determine title and description based on state
-  const getDialogContent = () => {
-    if (isAlreadyEvolving) {
-      return {
-        title: 'Restart Evolution?',
-        icon: <AlertTriangle className="size-5 text-amber-500" />,
-        description: (
-          <>
-            <strong>{companion?.name}</strong> is already evolving. Starting over will{' '}
-            <strong>reset all task progress</strong> and begin from the beginning.
-            <br /><br />
-            Are you sure you want to restart?
-          </>
-        ),
-        buttonText: 'Restart Evolution',
-        buttonClass: 'bg-amber-500 hover:bg-amber-600 text-white',
-      };
-    }
-    
-    return {
-      title: 'Start Evolution',
-      icon: <Sparkles className="size-5 text-primary" />,
-      description: (
-        <>
-          Starting evolution begins <strong>{companion?.name}</strong>'s transformation journey.
-          Complete all the tasks to evolve your baby Blobbi into an adult!
-          <br /><br />
-          Ready to begin?
-        </>
-      ),
-      buttonText: 'Start Evolution',
-      buttonClass: 'bg-gradient-to-r from-violet-500 to-purple-500 hover:from-violet-600 hover:to-purple-600 text-white',
-    };
-  };
-  
-  const content = getDialogContent();
-  
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle className="flex items-center gap-2">
-            {content.icon}
-            {content.title}
-          </AlertDialogTitle>
-          <AlertDialogDescription>
-            {content.description}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel disabled={isPending}>
-            Cancel
-          </AlertDialogCancel>
-          <AlertDialogAction
-            onClick={(e) => {
-              e.preventDefault();
-              onConfirm();
-            }}
-            disabled={isPending}
-            className={content.buttonClass}
-          >
-            {isPending ? (
-              <>
-                <Loader2 className="size-4 mr-2 animate-spin" />
-                Starting...
-              </>
-            ) : (
-              content.buttonText
-            )}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}

src/blobbi/actions/components/StartIncubationDialog.tsx

@@ -1,180 +0,0 @@
-// src/blobbi/actions/components/StartIncubationDialog.tsx
-
-/**
- * Dialog for confirming start of incubation.
- * 
- * Determines the mode and passes it explicitly to the confirm callback:
- * - 'start': Normal start, no other Blobbi incubating
- * - 'restart': Restart same Blobbi (already incubating)
- * - 'switch': Stop another Blobbi first, then start this one
- * 
- * The mode is determined by UI state, NOT auto-detected by the hook.
- * This makes the flow explicit and predictable.
- */
-
-import { useMemo } from 'react';
-import { Loader2, AlertTriangle, ArrowRightLeft } from 'lucide-react';
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-import type { StartIncubationMode } from '../hooks/useBlobbiIncubation';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface StartIncubationDialogProps {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  /** The companion to start incubating */
-  companion: BlobbiCompanion | null;
-  /** All companions in the collection (to check for other incubating Blobbis) */
-  companions?: BlobbiCompanion[];
-  /** Called with explicit mode and optional stopOtherD when confirmed */
-  onConfirm: (mode: StartIncubationMode, stopOtherD?: string) => void;
-  isPending: boolean;
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function StartIncubationDialog({
-  open,
-  onOpenChange,
-  companion,
-  companions = [],
-  onConfirm,
-  isPending,
-}: StartIncubationDialogProps) {
-  // Check if the current Blobbi is already in a task state
-  const isAlreadyInTaskState = companion?.state === 'incubating' || companion?.state === 'evolving';
-  
-  // Check if another Blobbi (not this one) is currently incubating
-  const otherIncubatingBlobbi = useMemo(() => {
-    if (!companion) return null;
-    return companions.find(c => 
-      c.d !== companion.d && 
-      c.state === 'incubating' &&
-      c.stage === 'egg'
-    ) ?? null;
-  }, [companion, companions]);
-  
-  // Determine the mode based on current state
-  const mode: StartIncubationMode = useMemo(() => {
-    if (isAlreadyInTaskState) return 'restart';
-    if (otherIncubatingBlobbi) return 'switch';
-    return 'start';
-  }, [isAlreadyInTaskState, otherIncubatingBlobbi]);
-  
-  // Handle confirm with explicit mode
-  const handleConfirm = () => {
-    if (mode === 'switch' && otherIncubatingBlobbi) {
-      onConfirm(mode, otherIncubatingBlobbi.d);
-    } else {
-      onConfirm(mode);
-    }
-  };
-  
-  // Determine title and description based on mode
-  const getDialogContent = () => {
-    if (mode === 'restart') {
-      return {
-        title: 'Restart Incubation?',
-        icon: <AlertTriangle className="size-5 text-amber-500" />,
-        description: (
-          <>
-            Your Blobbi is already {companion?.state}. Starting over will{' '}
-            <strong>reset all task progress</strong> and begin from the beginning.
-            <br /><br />
-            Are you sure you want to restart?
-          </>
-        ),
-        buttonText: 'Restart Incubation',
-        buttonClass: 'bg-amber-500 hover:bg-amber-600 text-white',
-      };
-    }
-    
-    if (mode === 'switch') {
-      return {
-        title: 'Switch Incubation?',
-        icon: <ArrowRightLeft className="size-5 text-amber-500" />,
-        description: (
-          <>
-            <strong>{otherIncubatingBlobbi?.name}</strong> is currently incubating.
-            Only one Blobbi can incubate at a time.
-            <br /><br />
-            Starting incubation for <strong>{companion?.name}</strong> will{' '}
-            <strong>stop {otherIncubatingBlobbi?.name}'s incubation</strong> and{' '}
-            reset their task progress.
-            <br /><br />
-            Do you want to switch?
-          </>
-        ),
-        buttonText: 'Switch & Start',
-        buttonClass: 'bg-amber-500 hover:bg-amber-600 text-white',
-      };
-    }
-    
-    return {
-      title: 'Start Incubation',
-      icon: null,
-      description: (
-        <>
-          Starting incubation begins your Blobbi's hatching journey. 
-          Complete all the tasks to hatch your egg into a baby Blobbi!
-          <br /><br />
-          Ready to begin?
-        </>
-      ),
-      buttonText: 'Start Incubation',
-      buttonClass: undefined,
-    };
-  };
-  
-  const content = getDialogContent();
-  
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle className="flex items-center gap-2">
-            {content.icon}
-            {content.title}
-          </AlertDialogTitle>
-          <AlertDialogDescription>
-            {content.description}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel disabled={isPending}>
-            Cancel
-          </AlertDialogCancel>
-          <AlertDialogAction
-            onClick={(e) => {
-              e.preventDefault();
-              handleConfirm();
-            }}
-            disabled={isPending}
-            className={content.buttonClass}
-          >
-            {isPending ? (
-              <>
-                <Loader2 className="size-4 mr-2 animate-spin" />
-                Starting...
-              </>
-            ) : (
-              content.buttonText
-            )}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}

src/blobbi/actions/components/TasksPanel.tsx

@@ -1,195 +0,0 @@
-// src/blobbi/actions/components/TasksPanel.tsx
-
-/**
- * Card-grid presentation for hatch / evolve tasks.
- *
- * Each task is a compact card in a 2-column grid.
- * Tapping a card expands it inline (full row) to reveal details.
- * Only one card is expanded at a time.
- */
-
-import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-import {
-  Palette,
-  Droplets,
-  MessageSquare,
-  Heart,
-  UserPen,
-  Activity,
-  Loader2,
-  HelpCircle,
-} from 'lucide-react';
-import { openUrl } from '@/lib/downloadFile';
-
-import { Button } from '@/components/ui/button';
-
-import type { HatchTask } from '../hooks/useHatchTasks';
-import type { MissionCategory } from './ExpandableMissionCard';
-import {
-  ExpandableMissionCard,
-  MissionDescription,
-  MissionProgress,
-  MissionAction,
-  DynamicHint,
-} from './ExpandableMissionCard';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-interface TasksPanelProps {
-  tasks: HatchTask[];
-  allCompleted: boolean;
-  isLoading: boolean;
-  onOpenPostModal: () => void;
-  onComplete: () => void;
-  isCompleting?: boolean;
-  completeLabel: string;
-  completingLabel: string;
-  completeEmoji: string;
-  /** Mission category for styling the cards */
-  category?: MissionCategory;
-}
-
-// ─── Task Icon Mapping ────────────────────────────────────────────────────────
-
-/** Map task ids to lucide icons. Falls back to a generic icon. */
-function TaskIcon({ taskId }: { taskId: string }) {
-  const iconClass = 'size-5';
-
-  switch (taskId) {
-    case 'create_themes':
-      return <Palette className={iconClass} />;
-    case 'color_moments':
-      return <Droplets className={iconClass} />;
-    case 'create_posts':
-      return <MessageSquare className={iconClass} />;
-    case 'interactions':
-      return <Heart className={iconClass} />;
-    case 'edit_profile':
-      return <UserPen className={iconClass} />;
-    case 'maintain_stats':
-      return <Activity className={iconClass} />;
-    default:
-      return <HelpCircle className={iconClass} />;
-  }
-}
-
-// ─── Main Component ───────────────────────────────────────────────────────────
-
-export function TasksPanel({
-  tasks,
-  allCompleted,
-  isLoading,
-  onOpenPostModal,
-  onComplete,
-  isCompleting = false,
-  completeLabel,
-  completingLabel,
-  completeEmoji,
-  category = 'hatch',
-}: TasksPanelProps) {
-  const [expandedId, setExpandedId] = useState<string | null>(null);
-  const navigate = useNavigate();
-
-  const handleToggle = (id: string) => {
-    setExpandedId((prev) => (prev === id ? null : id));
-  };
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <Loader2 className="size-5 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  return (
-    <div className="space-y-3">
-      {/* Card grid */}
-      <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
-        {tasks.map((task) => {
-          const isDynamic = task.type === 'dynamic';
-          const progress =
-            task.required > 0 ? task.current / task.required : task.completed ? 1 : 0;
-
-          const handleAction = () => {
-            if (!task.action || !task.actionTarget) return;
-            switch (task.action) {
-              case 'navigate':
-                navigate(task.actionTarget);
-                break;
-              case 'external_link':
-                openUrl(task.actionTarget);
-                break;
-              case 'open_modal':
-                if (task.actionTarget === 'blobbi_post') onOpenPostModal();
-                break;
-            }
-          };
-
-          return (
-            <ExpandableMissionCard
-              key={task.id}
-              id={task.id}
-              category={category}
-              icon={<TaskIcon taskId={task.id} />}
-              title={task.name}
-              completed={task.completed}
-              progress={Math.min(progress, 1)}
-              isExpanded={expandedId === task.id}
-              onToggle={handleToggle}
-            >
-              {/* Expanded content */}
-              <MissionDescription>{task.description}</MissionDescription>
-
-              {/* Progress bar for multi-step tasks */}
-              {task.required > 1 && !isDynamic && (
-                <MissionProgress
-                  current={task.current}
-                  required={task.required}
-                  completed={task.completed}
-                />
-              )}
-
-              {/* Dynamic stat hint */}
-              {isDynamic && !task.completed && (
-                <DynamicHint current={task.current} required={task.required} />
-              )}
-
-              {/* Action link */}
-              {task.action && task.actionLabel && !task.completed && (
-                <MissionAction
-                  label={task.actionLabel}
-                  type={task.action}
-                  onClick={handleAction}
-                />
-              )}
-            </ExpandableMissionCard>
-          );
-        })}
-      </div>
-
-      {/* CTA button when all tasks are done */}
-      {allCompleted && (
-        <Button
-          onClick={onComplete}
-          disabled={isCompleting}
-          size="lg"
-          className="w-full gap-2 bg-gradient-to-r from-amber-500 to-orange-500 hover:from-amber-600 hover:to-orange-600 text-white shadow-sm"
-        >
-          {isCompleting ? (
-            <>
-              <Loader2 className="size-5 animate-spin" />
-              {completingLabel}
-            </>
-          ) : (
-            <>
-              <span className="text-lg">{completeEmoji}</span>
-              {completeLabel}
-            </>
-          )}
-        </Button>
-      )}
-    </div>
-  );
-}

src/blobbi/actions/hooks/useActiveTaskProcess.ts

@@ -1,232 +0,0 @@
-// src/blobbi/actions/hooks/useActiveTaskProcess.ts
-
-/**
- * Central abstraction for the active task process (hatch or evolve).
- * 
- * This hook consolidates all scattered if/else logic for determining:
- * - Which process is active (incubating vs evolving)
- * - Which tasks to use (hatch vs evolve)
- * - Thresholds and configuration
- * - Badge-related computed values
- * 
- * ARCHITECTURE RULES:
- * - Computed tasks remain the source of truth
- * - Tags are cache only for PERSISTENT tasks
- * - Dynamic tasks are NEVER persisted
- * - Badge counts ALL incomplete tasks (persistent + dynamic)
- */
-
-import { useMemo } from 'react';
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-import type { HatchTask, HatchTasksResult } from './useHatchTasks';
-import type { EvolveTasksResult } from './useEvolveTasks';
-import { HATCH_REQUIRED_INTERACTIONS } from './useHatchTasks';
-import { EVOLVE_REQUIRED_INTERACTIONS } from './useEvolveTasks';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/** The type of task process currently active */
-export type TaskProcessType = 'hatch' | 'evolve' | null;
-
-/**
- * Configuration for the active task process.
- * This provides a unified interface regardless of whether
- * the process is hatch or evolve.
- */
-export interface TaskProcessConfig {
-  /** The type of process ('hatch' | 'evolve' | null) */
-  type: TaskProcessType;
-  /** Whether there is an active task process */
-  isActive: boolean;
-  /** Required interactions threshold for the current process */
-  interactionThreshold: number;
-}
-
-/**
- * Result of the active task process hook.
- * Provides unified access to all task-related state.
- */
-export interface ActiveTaskProcessResult {
-  /** Configuration for the current process */
-  config: TaskProcessConfig;
-  
-  /** All tasks for the current process (empty if no active process) */
-  tasks: HatchTask[];
-  /** Whether tasks are still loading */
-  isLoading: boolean;
-  /** Whether all tasks (persistent + dynamic) are complete */
-  allCompleted: boolean;
-  /** Whether all persistent tasks are complete */
-  persistentTasksComplete: boolean;
-  /** Whether the dynamic task is complete */
-  dynamicTaskComplete: boolean;
-  
-  /** Refetch function for current tasks */
-  refetch: () => void;
-  
-  // ─── Badge-related computed values ───
-  
-  /** 
-   * Count of ALL remaining incomplete tasks (persistent + dynamic).
-   * This is used for the badge display.
-   * Dynamic tasks ARE counted here but are NEVER synced to tags.
-   */
-  remainingTasksCount: number;
-  
-  /**
-   * Only persistent tasks that are incomplete.
-   * Used for sync logic - dynamic tasks must NEVER be synced.
-   */
-  incompletePersistentTasks: HatchTask[];
-  
-  /**
-   * Only persistent tasks that are complete.
-   * Used for sync logic.
-   */
-  completedPersistentTasks: HatchTask[];
-  
-  /**
-   * Stable string key of completed persistent task IDs.
-   * Used for sync anti-loop protection.
-   */
-  completedPersistentTaskIds: string;
-  
-  /**
-   * Tasks to sync (persistent only, with completion status).
-   * Dynamic tasks are excluded.
-   */
-  tasksToSync: Array<{ taskId: string; completed: boolean }>;
-}
-
-// ─── Helper Functions ─────────────────────────────────────────────────────────
-
-/**
- * Filter tasks to only persistent tasks.
- * Dynamic tasks must NEVER be synced to tags.
- */
-export function filterPersistentTasks(tasks: HatchTask[]): HatchTask[] {
-  return tasks.filter(t => t.type === 'persistent');
-}
-
-/**
- * Filter tasks to only dynamic tasks.
- */
-export function filterDynamicTasks(tasks: HatchTask[]): HatchTask[] {
-  return tasks.filter(t => t.type === 'dynamic');
-}
-
-// ─── Main Hook ────────────────────────────────────────────────────────────────
-
-/**
- * Hook that provides a unified interface for the active task process.
- * 
- * Usage:
- * ```ts
- * const taskProcess = useActiveTaskProcess(companion, hatchTasks, evolveTasks);
- * 
- * // Access unified data
- * taskProcess.config.type // 'hatch' | 'evolve' | null
- * taskProcess.tasks // current tasks
- * taskProcess.remainingTasksCount // for badge (includes dynamic)
- * taskProcess.tasksToSync // for sync (excludes dynamic)
- * ```
- */
-export function useActiveTaskProcess(
-  companion: BlobbiCompanion | null,
-  hatchTasks: HatchTasksResult,
-  evolveTasks: EvolveTasksResult
-): ActiveTaskProcessResult {
-  // Determine which process is active
-  const processType = useMemo((): TaskProcessType => {
-    if (!companion) return null;
-    if (companion.state === 'incubating') return 'hatch';
-    if (companion.state === 'evolving') return 'evolve';
-    return null;
-  }, [companion]);
-  
-  // Build configuration
-  const config = useMemo((): TaskProcessConfig => {
-    const isActive = processType !== null;
-    const interactionThreshold = processType === 'hatch' 
-      ? HATCH_REQUIRED_INTERACTIONS 
-      : processType === 'evolve' 
-        ? EVOLVE_REQUIRED_INTERACTIONS 
-        : 0;
-    
-    return {
-      type: processType,
-      isActive,
-      interactionThreshold,
-    };
-  }, [processType]);
-  
-  // Get the active tasks result based on process type
-  const activeResult = useMemo(() => {
-    if (processType === 'hatch') return hatchTasks;
-    if (processType === 'evolve') return evolveTasks;
-    return null;
-  }, [processType, hatchTasks, evolveTasks]);
-  
-  // Extract tasks and state from active result
-  const tasks = useMemo(() => activeResult?.tasks ?? [], [activeResult]);
-  const isLoading = activeResult?.isLoading ?? false;
-  const allCompleted = activeResult?.allCompleted ?? false;
-  const persistentTasksComplete = activeResult?.persistentTasksComplete ?? false;
-  const dynamicTaskComplete = activeResult?.dynamicTaskComplete ?? false;
-  const refetch = activeResult?.refetch ?? (() => {});
-  
-  // Compute persistent task list (dynamic tasks computed for badge count directly from tasks array)
-  const persistentTasks = useMemo(() => filterPersistentTasks(tasks), [tasks]);
-  
-  // Compute incomplete tasks (for badge - includes BOTH persistent and dynamic)
-  const remainingTasksCount = useMemo(() => {
-    // Count ALL incomplete tasks - persistent AND dynamic
-    // Dynamic tasks are included in badge count but NEVER synced to tags
-    return tasks.filter(t => !t.completed).length;
-  }, [tasks]);
-  
-  // Compute persistent task lists for sync
-  const incompletePersistentTasks = useMemo(() => 
-    persistentTasks.filter(t => !t.completed), 
-    [persistentTasks]
-  );
-  
-  const completedPersistentTasks = useMemo(() => 
-    persistentTasks.filter(t => t.completed), 
-    [persistentTasks]
-  );
-  
-  // Compute stable string key for completed persistent tasks (anti-loop)
-  const completedPersistentTaskIds = useMemo(() => {
-    if (!completedPersistentTasks.length) return '';
-    return completedPersistentTasks
-      .map(t => t.id)
-      .sort()
-      .join(',');
-  }, [completedPersistentTasks]);
-  
-  // Compute tasks to sync (persistent only)
-  // CRITICAL: Dynamic tasks must NEVER be included here
-  const tasksToSync = useMemo(() => {
-    if (!persistentTasks.length) return [];
-    return persistentTasks.map(t => ({
-      taskId: t.id,
-      completed: t.completed,
-    }));
-  }, [persistentTasks]);
-  
-  return {
-    config,
-    tasks,
-    isLoading,
-    allCompleted,
-    persistentTasksComplete,
-    dynamicTaskComplete,
-    refetch,
-    remainingTasksCount,
-    incompletePersistentTasks,
-    completedPersistentTasks,
-    completedPersistentTaskIds,
-    tasksToSync,
-  };
-}

src/blobbi/actions/hooks/useAudioPlayback.ts

@@ -1,287 +0,0 @@
-// src/blobbi/actions/hooks/useAudioPlayback.ts
-
-import { useState, useRef, useCallback, useEffect } from 'react';
-
-/**
- * Audio playback state
- * - idle: No audio loaded
- * - loading: Audio is being loaded
- * - playing: Audio is playing
- * - paused: Audio is paused (can resume)
- * - stopped: Audio was stopped (must reload to play again)
- * - error: An error occurred
- */
-export type PlaybackState = 'idle' | 'loading' | 'playing' | 'paused' | 'stopped' | 'error';
-
-/**
- * Audio playback error info
- */
-export interface PlaybackError {
-  message: string;
-  code?: string;
-}
-
-/** Default volume level (0-1) */
-const DEFAULT_VOLUME = 0.8;
-
-/**
- * Options for the useAudioPlayback hook
- */
-export interface UseAudioPlaybackOptions {
-  /** Called when playback ends naturally */
-  onEnded?: () => void;
-  /** Called when an error occurs */
-  onError?: (error: PlaybackError) => void;
-  /** Initial volume level (0-1), defaults to 0.8 */
-  initialVolume?: number;
-}
-
-/**
- * Return type for useAudioPlayback hook
- */
-export interface UseAudioPlaybackReturn {
-  /** Current playback state */
-  state: PlaybackState;
-  /** Current error (if any) */
-  error: PlaybackError | null;
-  /** Current audio URL being played */
-  currentUrl: string | null;
-  /** Load and optionally start playing an audio URL */
-  load: (url: string, autoplay?: boolean) => void;
-  /** Play the current audio */
-  play: () => Promise<void>;
-  /** Pause the current audio */
-  pause: () => void;
-  /** Stop playback and reset */
-  stop: () => void;
-  /** Restart playback from the beginning */
-  restart: () => Promise<void>;
-  /** Toggle play/pause */
-  toggle: () => Promise<void>;
-  /** Whether audio is currently playing */
-  isPlaying: boolean;
-  /** Current volume level (0-1) */
-  volume: number;
-  /** Set volume level (0-1) */
-  setVolume: (volume: number) => void;
-  /** Cleanup function to release resources */
-  cleanup: () => void;
-}
-
-/**
- * Reusable hook for audio playback.
- * Handles Audio element lifecycle, error handling, and state management.
- */
-export function useAudioPlayback(options: UseAudioPlaybackOptions = {}): UseAudioPlaybackReturn {
-  const { onEnded, onError, initialVolume = DEFAULT_VOLUME } = options;
-  
-  const [state, setState] = useState<PlaybackState>('idle');
-  const [error, setError] = useState<PlaybackError | null>(null);
-  const [currentUrl, setCurrentUrl] = useState<string | null>(null);
-  const [volume, setVolumeState] = useState<number>(initialVolume);
-  
-  const audioRef = useRef<HTMLAudioElement | null>(null);
-  const currentUrlRef = useRef<string | null>(null);
-  const volumeRef = useRef<number>(initialVolume);
-  
-  // Cleanup audio element
-  const cleanup = useCallback(() => {
-    if (audioRef.current) {
-      audioRef.current.pause();
-      audioRef.current.onended = null;
-      audioRef.current.onerror = null;
-      audioRef.current.oncanplay = null;
-      audioRef.current.onplaying = null;
-      audioRef.current = null;
-    }
-    currentUrlRef.current = null;
-    setState('idle');
-    setCurrentUrl(null);
-    setError(null);
-  }, []);
-  
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      cleanup();
-    };
-  }, [cleanup]);
-  
-  // Load audio from URL
-  const load = useCallback((url: string, autoplay = false) => {
-    // If same URL, don't reload
-    if (currentUrlRef.current === url && audioRef.current) {
-      if (autoplay) {
-        audioRef.current.play().catch(() => {});
-      }
-      return;
-    }
-    
-    // Cleanup previous audio
-    if (audioRef.current) {
-      audioRef.current.pause();
-      audioRef.current.onended = null;
-      audioRef.current.onerror = null;
-      audioRef.current.oncanplay = null;
-      audioRef.current.onplaying = null;
-    }
-    
-    setState('loading');
-    setError(null);
-    setCurrentUrl(url);
-    currentUrlRef.current = url;
-    
-    const audio = new Audio(url);
-    audio.volume = volumeRef.current; // Apply current volume to new audio
-    audioRef.current = audio;
-    
-    audio.oncanplay = () => {
-      if (autoplay) {
-        audio.play().catch((err) => {
-          const playbackError: PlaybackError = {
-            message: getPlaybackErrorMessage(err),
-            code: err.name,
-          };
-          setError(playbackError);
-          setState('error');
-          onError?.(playbackError);
-        });
-      } else {
-        setState('paused');
-      }
-    };
-    
-    audio.onplaying = () => {
-      setState('playing');
-    };
-    
-    audio.onpause = () => {
-      if (state === 'playing') {
-        setState('paused');
-      }
-    };
-    
-    audio.onended = () => {
-      setState('paused');
-      onEnded?.();
-    };
-    
-    audio.onerror = () => {
-      const playbackError: PlaybackError = {
-        message: 'Failed to load audio. The format may not be supported.',
-        code: 'MEDIA_ERR',
-      };
-      setError(playbackError);
-      setState('error');
-      onError?.(playbackError);
-    };
-    
-    // Start loading
-    audio.load();
-  }, [onEnded, onError, state]);
-  
-  // Play current audio
-  const play = useCallback(async () => {
-    if (!audioRef.current) return;
-    
-    try {
-      setError(null);
-      await audioRef.current.play();
-      setState('playing');
-    } catch (err) {
-      const playbackError: PlaybackError = {
-        message: getPlaybackErrorMessage(err),
-        code: err instanceof Error ? err.name : 'UNKNOWN',
-      };
-      setError(playbackError);
-      setState('error');
-      onError?.(playbackError);
-    }
-  }, [onError]);
-  
-  // Pause current audio
-  const pause = useCallback(() => {
-    if (!audioRef.current) return;
-    audioRef.current.pause();
-    setState('paused');
-  }, []);
-  
-  // Stop playback completely (requires reload to play again)
-  const stop = useCallback(() => {
-    if (!audioRef.current) return;
-    audioRef.current.pause();
-    audioRef.current.currentTime = 0;
-    // Clear URL ref so next load() will actually reload
-    currentUrlRef.current = null;
-    setState('stopped');
-  }, []);
-  
-  // Restart playback from the beginning
-  const restart = useCallback(async () => {
-    if (!audioRef.current) return;
-    audioRef.current.currentTime = 0;
-    try {
-      await audioRef.current.play();
-      setState('playing');
-    } catch (err) {
-      const playbackError: PlaybackError = {
-        message: getPlaybackErrorMessage(err),
-        code: err instanceof Error ? err.name : 'UNKNOWN',
-      };
-      setError(playbackError);
-      setState('error');
-      onError?.(playbackError);
-    }
-  }, [onError]);
-  
-  // Toggle play/pause
-  const toggle = useCallback(async () => {
-    if (state === 'playing') {
-      pause();
-    } else {
-      await play();
-    }
-  }, [state, play, pause]);
-  
-  // Set volume (0-1)
-  const setVolume = useCallback((newVolume: number) => {
-    const clampedVolume = Math.max(0, Math.min(1, newVolume));
-    volumeRef.current = clampedVolume;
-    setVolumeState(clampedVolume);
-    if (audioRef.current) {
-      audioRef.current.volume = clampedVolume;
-    }
-  }, []);
-  
-  return {
-    state,
-    error,
-    currentUrl,
-    load,
-    play,
-    pause,
-    stop,
-    restart,
-    toggle,
-    isPlaying: state === 'playing',
-    volume,
-    setVolume,
-    cleanup,
-  };
-}
-
-/**
- * Get a user-friendly error message for playback errors
- */
-function getPlaybackErrorMessage(err: unknown): string {
-  if (err instanceof Error) {
-    if (err.name === 'NotSupportedError') {
-      return 'This audio format is not supported by your browser.';
-    }
-    if (err.name === 'NotAllowedError') {
-      return 'Playback was blocked. Try interacting with the page first.';
-    }
-    return err.message;
-  }
-  return 'An unknown error occurred during playback.';
-}

src/blobbi/actions/hooks/useBlobbiCareActivity.ts

@@ -1,200 +0,0 @@
-/**
- * useBlobbiCareActivity - Hook for registering care activity and updating streaks
- * 
- * This hook provides a centralized way to register care activity for a Blobbi companion.
- * It handles:
- * - Calculating streak updates based on the last activity day
- * - Publishing updated Blobbi state to Nostr
- * - Updating local cache
- * 
- * Use this hook whenever care activity should count toward the streak:
- * - Opening the Blobbi page (page check-in)
- * - Performing care actions (feed, clean, play, etc.)
- * - Any other care interaction
- * 
- * The streak only increments once per calendar day, regardless of how many
- * activities are performed.
- */
-
-import { useCallback, useRef } from 'react';
-import { useNostr } from '@nostrify/react';
-import { useMutation } from '@tanstack/react-query';
-import type { NostrEvent } from '@nostrify/nostrify';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBI_STATE,
-  updateBlobbiTags,
-  isValidBlobbiEvent,
-  parseBlobbiEvent,
-} from '@/blobbi/core/lib/blobbi';
-
-import { getStreakTagUpdates, calculateStreakUpdate, type StreakUpdateResult } from '../lib/blobbi-streak';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export interface UseBlobbiCareActivityParams {
-  companion: BlobbiCompanion | null;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-export interface CareActivityResult {
-  /** Whether the streak was updated */
-  wasUpdated: boolean;
-  /** The new streak value */
-  newStreak: number;
-  /** Description of what happened */
-  action: StreakUpdateResult['action'];
-}
-
-// ─── Hook ─────────────────────────────────────────────────────────────────────
-
-/**
- * Hook to register care activity and update streaks.
- * 
- * Returns a function to register activity and a mutation for the actual update.
- * The register function is idempotent - calling it multiple times on the same day
- * will only update once.
- */
-export function useBlobbiCareActivity({
-  companion,
-  updateCompanionEvent,
-}: UseBlobbiCareActivityParams) {
-  const { nostr } = useNostr();
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-  
-  // Track if we've already registered activity this session to avoid duplicate calls
-  // This is a performance optimization - the actual idempotency is handled by day comparison
-  const lastRegisteredDay = useRef<string | null>(null);
-
-  const mutation = useMutation({
-    mutationFn: async (): Promise<CareActivityResult> => {
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to register care activity');
-      }
-
-      if (!companion) {
-        throw new Error('No companion available');
-      }
-
-      // Fetch fresh companion from relays (read-modify-write pattern)
-      const freshEvents = await nostr.query([{
-        kinds: [KIND_BLOBBI_STATE],
-        authors: [user.pubkey],
-        '#d': [companion.d],
-      }]);
-      const freshCompanion = freshEvents
-        .filter(isValidBlobbiEvent)
-        .sort((a, b) => b.created_at - a.created_at)
-        .map(e => parseBlobbiEvent(e))
-        .find(Boolean) ?? companion;
-
-      const now = new Date();
-      
-      // Calculate what the streak update should be using fresh data
-      const result = calculateStreakUpdate(
-        freshCompanion.careStreak,
-        freshCompanion.careStreakLastDay,
-        now
-      );
-      
-      // If no update needed (same day), return early without publishing
-      if (!result.wasUpdated) {
-        return {
-          wasUpdated: false,
-          newStreak: result.newStreak,
-          action: result.action,
-        };
-      }
-      
-      // Get the tag updates using fresh data
-      const streakUpdates = getStreakTagUpdates(freshCompanion, now);
-      
-      if (!streakUpdates) {
-        // Shouldn't happen if wasUpdated is true, but handle gracefully
-        return {
-          wasUpdated: false,
-          newStreak: freshCompanion.careStreak ?? 0,
-          action: 'same_day',
-        };
-      }
-      
-      // Build updated tags from fresh data
-      const updatedTags = updateBlobbiTags(freshCompanion.allTags, streakUpdates);
-      
-      // Publish the updated event
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: freshCompanion.event.content,
-        tags: updatedTags,
-      });
-      
-      // Update local cache (optimistic — no invalidation needed)
-      updateCompanionEvent(event);
-      
-      // Update session tracker
-      lastRegisteredDay.current = result.newLastDay;
-      
-      // Log for debugging (dev only)
-      if (import.meta.env.DEV) {
-        console.log('[CareActivity] Streak updated:', {
-          action: result.action,
-          previousStreak: freshCompanion.careStreak,
-          newStreak: result.newStreak,
-          lastDay: freshCompanion.careStreakLastDay,
-          newDay: result.newLastDay,
-        });
-      }
-      
-      return {
-        wasUpdated: true,
-        newStreak: result.newStreak,
-        action: result.action,
-      };
-    },
-    onError: (error: Error) => {
-      console.error('[CareActivity] Failed to update streak:', error);
-    },
-  });
-
-  /**
-   * Register care activity. Call this when care-related activity happens.
-   * Safe to call multiple times - only updates streak once per day.
-   * 
-   * @returns Promise with the result of the activity registration
-   */
-  const registerCareActivity = useCallback(async (): Promise<CareActivityResult | null> => {
-    if (!companion) {
-      return null;
-    }
-    
-    // Quick check if we've already registered for this companion's last day (session cache)
-    // This is an optimization to avoid unnecessary mutation calls
-    if (lastRegisteredDay.current === companion.careStreakLastDay) {
-      // Already processed this day in this session, skip
-      return {
-        wasUpdated: false,
-        newStreak: companion.careStreak ?? 0,
-        action: 'same_day',
-      };
-    }
-    
-    return mutation.mutateAsync();
-  }, [companion, mutation]);
-
-  return {
-    /** Register care activity - call when page opens or care action happens */
-    registerCareActivity,
-    /** Whether an update is currently in progress */
-    isUpdating: mutation.isPending,
-    /** The last update result */
-    lastResult: mutation.data,
-    /** Any error from the last update attempt */
-    error: mutation.error,
-  };
-}

src/blobbi/actions/hooks/useBlobbiDirectAction.ts

@@ -1,216 +0,0 @@
-// src/blobbi/actions/hooks/useBlobbiDirectAction.ts
-
-import { useMutation } from '@tanstack/react-query';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBI_STATE,
-  updateBlobbiTags,
-} from '@/blobbi/core/lib/blobbi';
-import { applyBlobbiDecay } from '@/blobbi/core/lib/blobbi-decay';
-import {
-  clampStat,
-  applyStat,
-  DIRECT_ACTION_METADATA,
-  incrementInteractionTaskTags,
-  type DirectAction,
-} from '../lib/blobbi-action-utils';
-import { trackMultipleDailyMissionActions } from '../lib/daily-mission-tracker';
-import type { DailyMissionAction } from '../lib/daily-missions';
-import { getStreakTagUpdates } from '../lib/blobbi-streak';
-import { calculateActionXP, applyXPGain, formatXPGain } from '../lib/blobbi-xp';
-import { HATCH_REQUIRED_INTERACTIONS } from './useHatchTasks';
-import { EVOLVE_REQUIRED_INTERACTIONS } from './useEvolveTasks';
-
-// Import NostrEvent type
-import type { NostrEvent } from '@nostrify/nostrify';
-
-/**
- * Configuration for direct action happiness effects.
- * These are the happiness deltas for each direct action.
- */
-export const DIRECT_ACTION_HAPPINESS_EFFECTS: Record<DirectAction, number> = {
-  play_music: 15,
-  sing: 20,
-};
-
-/**
- * Request payload for executing a direct action
- */
-export interface DirectActionRequest {
-  action: DirectAction;
-}
-
-/**
- * Result of executing a direct action
- */
-export interface DirectActionResult {
-  action: DirectAction;
-  happinessChange: number;
-  xpGained: number;
-  newXP: number;
-}
-
-/**
- * Parameters for the useBlobbiDirectAction hook
- */
-export interface UseBlobbiDirectActionParams {
-  companion: BlobbiCompanion | null;
-  /** Called after ensuring companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Hook to execute a direct action on a Blobbi companion.
- * Direct actions (play_music, sing) don't require selecting an item.
- * They directly affect happiness stat.
- * 
- * This hook:
- * 1. Validates the companion exists
- * 2. Ensures canonical format before action
- * 3. Applies accumulated decay
- * 4. Applies happiness boost
- * 5. Updates Blobbi state (kind 31124)
- * 6. Invalidates relevant queries
- */
-export function useBlobbiDirectAction({
-  companion,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseBlobbiDirectActionParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async ({ action }: DirectActionRequest): Promise<DirectActionResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to perform actions');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for action');
-      }
-
-      // ─── Apply Accumulated Decay First ───
-      // CRITICAL: Use canonical.companion for decay calculations, not the stale outer companion
-      const now = Math.floor(Date.now() / 1000);
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      const statsAfterDecay = decayResult.stats;
-      
-      // ─── Apply Happiness Effect ───
-      const happinessDelta = DIRECT_ACTION_HAPPINESS_EFFECTS[action];
-      const newHappiness = applyStat(statsAfterDecay.happiness, happinessDelta);
-      
-      // Track if happiness actually changed
-      const happinessChanged = newHappiness !== statsAfterDecay.happiness;
-      
-      // Build stats update
-      const isEgg = canonical.companion.stage === 'egg';
-      const statsUpdate: Record<string, string> = {
-        happiness: newHappiness.toString(),
-        health: statsAfterDecay.health.toString(),
-        hygiene: statsAfterDecay.hygiene.toString(),
-      };
-      
-      if (isEgg) {
-        // Eggs have fixed hunger and energy
-        statsUpdate.hunger = '100';
-        statsUpdate.energy = '100';
-      } else {
-        statsUpdate.hunger = clampStat(statsAfterDecay.hunger).toString();
-        statsUpdate.energy = clampStat(statsAfterDecay.energy).toString();
-      }
-
-      // ─── Update Blobbi State Event (kind 31124) ───
-      const nowStr = now.toString();
-      
-      // If incubating or evolving, increment the interaction counter for tasks
-      const companionState = canonical.companion.state;
-      let updatedTags = canonical.allTags;
-      if (companionState === 'incubating') {
-        updatedTags = incrementInteractionTaskTags(canonical.allTags, HATCH_REQUIRED_INTERACTIONS).updatedTags;
-      } else if (companionState === 'evolving') {
-        updatedTags = incrementInteractionTaskTags(canonical.allTags, EVOLVE_REQUIRED_INTERACTIONS).updatedTags;
-      }
-      
-      // Get streak updates (will only update if needed based on day)
-      const streakUpdates = getStreakTagUpdates(canonical.companion) ?? {};
-      
-      // ─── Apply XP Gain (ONLY if happiness actually changed) ───
-      // Direct actions modify happiness. Only grant XP if happiness actually increased.
-      const xpGained = happinessChanged ? calculateActionXP(action) : 0;
-      const currentXP = canonical.companion.experience ?? 0;
-      const newXP = applyXPGain(currentXP, xpGained);
-      
-      const blobbiTags = updateBlobbiTags(updatedTags, {
-        ...statsUpdate,
-        ...streakUpdates,
-        experience: newXP.toString(),
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      const blobbiEvent = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: blobbiTags,
-      });
-
-      updateCompanionEvent(blobbiEvent);
-
-      return {
-        action,
-        happinessChange: happinessDelta,
-        xpGained,
-        newXP,
-      };
-    },
-    onSuccess: ({ action, happinessChange, xpGained }) => {
-      const actionMeta = DIRECT_ACTION_METADATA[action];
-      const xpText = formatXPGain(xpGained);
-      toast({
-        title: `${actionMeta.label} complete!`,
-        description: `Your Blobbi's happiness increased by ${happinessChange}! ${xpText}`,
-      });
-
-      // Track daily mission progress
-      // 'interact' is always tracked, plus the specific action
-      const dailyActions: DailyMissionAction[] = ['interact'];
-      if (action === 'sing') dailyActions.push('sing');
-      if (action === 'play_music') dailyActions.push('play_music');
-      trackMultipleDailyMissionActions(dailyActions, user?.pubkey);
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Action failed',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}

src/blobbi/actions/hooks/useBlobbiIncubation.ts

@@ -1,880 +0,0 @@
-// src/blobbi/actions/hooks/useBlobbiIncubation.ts
-
-/**
- * Hooks for Blobbi incubation task system.
- * 
- * When a user starts incubation:
- * 1. Apply accumulated decay from last_decay_at to now
- * 2. Set state to 'incubating'
- * 3. Add state_started_at timestamp
- * 4. Update last_decay_at to the same timestamp
- * 5. Clear any previous task progress
- * 
- * Tasks are computed from Nostr events with created_at >= state_started_at
- */
-
-import { useMutation } from '@tanstack/react-query';
-import { useNostr } from '@nostrify/react';
-import type { NostrEvent } from '@nostrify/nostrify';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import type { BlobbiCompanion, BlobbonautProfile } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBI_STATE,
-  updateBlobbiTags,
-} from '@/blobbi/core/lib/blobbi';
-import { applyBlobbiDecay } from '@/blobbi/core/lib/blobbi-decay';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Mode for starting incubation.
- * This makes the intent explicit rather than auto-detecting behavior.
- */
-export type StartIncubationMode = 
-  | 'start'              // Normal start (no other Blobbi incubating)
-  | 'restart'            // Restart same Blobbi (already incubating)
-  | 'switch';            // Switch from another incubating Blobbi
-
-/**
- * Request to start incubation with explicit mode.
- */
-export interface StartIncubationRequest {
-  /** Explicit mode for this operation */
-  mode: StartIncubationMode;
-  /** The d-tag of the other Blobbi to stop (required when mode === 'switch') */
-  stopOtherD?: string;
-}
-
-/**
- * Parameters for start incubation hook.
- */
-export interface UseStartIncubationParams {
-  companion: BlobbiCompanion | null;
-  profile: BlobbonautProfile | null;
-  /** Called to ensure companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    profileAllTags: string[][];
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Result of starting incubation.
- */
-export interface StartIncubationResult {
-  /** The Blobbi's name */
-  name: string;
-  /** Timestamp when incubation started */
-  stateStartedAt: number;
-  /** Mode that was used */
-  mode: StartIncubationMode;
-  /** Name of other Blobbi that was stopped (if mode === 'switch') */
-  stoppedOtherName?: string;
-}
-
-// ─── Start Incubation Hook ────────────────────────────────────────────────────
-
-/**
- * Hook to start the incubation process for an egg.
- * 
- * This sets the Blobbi state to 'incubating' and records the start timestamp.
- * Tasks will be computed based on events created after this timestamp.
- * 
- * IMPORTANT: The mode must be explicitly specified by the caller (UI).
- * This hook does NOT auto-detect whether to switch or restart.
- * The UI dialog determines the mode and passes it explicitly.
- * 
- * Modes:
- * - 'start': Normal start, no other Blobbi incubating
- * - 'restart': Restart same Blobbi (already incubating), resets task progress
- * - 'switch': Stop another Blobbi first, then start this one
- * 
- * Requirements:
- * - Blobbi must be in egg stage
- * - User must be logged in
- */
-export function useStartIncubation({
-  companion,
-  profile,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseStartIncubationParams) {
-  const { user } = useCurrentUser();
-  const { nostr } = useNostr();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (request: StartIncubationRequest): Promise<StartIncubationResult> => {
-      const { mode, stopOtherD } = request;
-      
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to start incubation');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (!profile) {
-        throw new Error('Profile not found');
-      }
-
-      if (companion.stage !== 'egg') {
-        throw new Error('Only eggs can be incubated');
-      }
-
-      // Validate switch mode requires stopOtherD
-      if (mode === 'switch' && !stopOtherD) {
-        throw new Error('Switch mode requires stopOtherD parameter');
-      }
-
-      let stoppedOtherName: string | undefined;
-
-      // ─── Stop Other Incubating Blobbi (switch mode only) ───
-      if (mode === 'switch' && stopOtherD) {
-        // Fetch the current event for the other Blobbi
-        const [otherEvent] = await nostr.query([{
-          kinds: [KIND_BLOBBI_STATE],
-          authors: [user.pubkey],
-          '#d': [stopOtherD],
-          limit: 1,
-        }]);
-        
-        if (otherEvent) {
-          // Get name from the event for the result
-          const nameTag = otherEvent.tags.find(t => t[0] === 'name');
-          stoppedOtherName = nameTag?.[1] ?? stopOtherD;
-          
-          // Stop the other Blobbi's incubation
-          const now = Math.floor(Date.now() / 1000);
-          const nowStr = now.toString();
-          
-          // Parse stats from the event
-          const getTagValue = (tags: string[][], name: string): number => 
-            parseInt(tags.find(t => t[0] === name)?.[1] ?? '50', 10);
-          
-          const otherStats = {
-            hunger: getTagValue(otherEvent.tags, 'hunger'),
-            happiness: getTagValue(otherEvent.tags, 'happiness'),
-            health: getTagValue(otherEvent.tags, 'health'),
-            hygiene: getTagValue(otherEvent.tags, 'hygiene'),
-            energy: getTagValue(otherEvent.tags, 'energy'),
-          };
-          const otherLastDecayAt = getTagValue(otherEvent.tags, 'last_decay_at') || now;
-          
-          // Apply decay to the other Blobbi
-          const otherDecayResult = applyBlobbiDecay({
-            stage: 'egg',
-            state: 'incubating',
-            stats: otherStats,
-            lastDecayAt: otherLastDecayAt,
-            now,
-          });
-          
-          // Remove task tags and state_started_at from the other Blobbi
-          const otherCleanedTags = otherEvent.tags.filter(tag => 
-            tag[0] !== 'task' && 
-            tag[0] !== 'task_completed' && 
-            tag[0] !== 'state_started_at'
-          );
-          
-          const otherNewTags = updateBlobbiTags(otherCleanedTags, {
-            health: otherDecayResult.stats.health.toString(),
-            hygiene: otherDecayResult.stats.hygiene.toString(),
-            happiness: otherDecayResult.stats.happiness.toString(),
-            hunger: '100',
-            energy: '100',
-            state: 'active',
-            last_interaction: nowStr,
-            last_decay_at: nowStr,
-          });
-          
-          // Publish the stop event for the other Blobbi
-          const stopEvent = await publishEvent({
-            kind: KIND_BLOBBI_STATE,
-            content: otherEvent.content,
-            tags: otherNewTags,
-          });
-          
-          // Update the cache for the stopped Blobbi
-          updateCompanionEvent(stopEvent);
-        }
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for incubation');
-      }
-
-      // ─── Apply Accumulated Decay ───
-      // CRITICAL: Apply decay from last_decay_at to now before changing state
-      const now = Math.floor(Date.now() / 1000);
-      const nowStr = now.toString();
-      
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      // ─── Build Updated Tags ───
-      // Remove any existing task tags when starting fresh (for all modes)
-      const cleanedTags = canonical.allTags.filter(tag => 
-        tag[0] !== 'task' && tag[0] !== 'task_completed'
-      );
-      
-      // Build stats update with decayed values
-      // Eggs have fixed hunger and energy at 100
-      const statsUpdate: Record<string, string> = {
-        health: decayResult.stats.health.toString(),
-        hygiene: decayResult.stats.hygiene.toString(),
-        happiness: decayResult.stats.happiness.toString(),
-        hunger: '100',
-        energy: '100',
-      };
-      
-      const newTags = updateBlobbiTags(cleanedTags, {
-        ...statsUpdate,
-        state: 'incubating',
-        state_started_at: nowStr,
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        name: canonical.companion.name,
-        stateStartedAt: now,
-        mode,
-        stoppedOtherName,
-      };
-    },
-    onSuccess: ({ name, mode, stoppedOtherName }) => {
-      if (mode === 'switch' && stoppedOtherName) {
-        toast({
-          title: 'Switched incubation!',
-          description: `Stopped ${stoppedOtherName}, now incubating ${name}.`,
-        });
-      } else if (mode === 'restart') {
-        toast({
-          title: 'Incubation restarted!',
-          description: `${name}'s task progress has been reset.`,
-        });
-      } else {
-        toast({
-          title: 'Incubation started!',
-          description: `${name} is now incubating. Complete the tasks to hatch!`,
-        });
-      }
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to start incubation',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}
-
-// ─── Stop Incubation Hook ─────────────────────────────────────────────────────
-
-/**
- * Parameters for stop incubation hook.
- */
-export interface UseStopIncubationParams {
-  companion: BlobbiCompanion | null;
-  /** Called to ensure companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    profileAllTags: string[][];
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Result of stopping incubation.
- */
-export interface StopIncubationResult {
-  /** The Blobbi's name */
-  name: string;
-}
-
-/**
- * Hook to stop/cancel the incubation process for a Blobbi.
- * 
- * This resets the Blobbi state to 'active' and clears all task progress tags.
- * The user can restart incubation later, but will need to complete tasks again.
- * 
- * When stopping incubation:
- * - Apply accumulated decay first
- * - Set state back to 'active'
- * - Remove state_started_at tag
- * - Remove all task and task_completed tags
- * 
- * Requirements:
- * - Blobbi must be in incubating state
- * - User must be logged in
- */
-export function useStopIncubation({
-  companion,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseStopIncubationParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (): Promise<StopIncubationResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to stop incubation');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (companion.state !== 'incubating') {
-        throw new Error('This Blobbi is not incubating');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion');
-      }
-
-      // ─── Apply Accumulated Decay ───
-      const now = Math.floor(Date.now() / 1000);
-      const nowStr = now.toString();
-      
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      // ─── Build Updated Tags ───
-      // Remove task tags and state_started_at
-      const cleanedTags = canonical.allTags.filter(tag => 
-        tag[0] !== 'task' && 
-        tag[0] !== 'task_completed' && 
-        tag[0] !== 'state_started_at'
-      );
-      
-      // Build stats update with decayed values
-      // Eggs have fixed hunger and energy at 100
-      const statsUpdate: Record<string, string> = {
-        health: decayResult.stats.health.toString(),
-        hygiene: decayResult.stats.hygiene.toString(),
-        happiness: decayResult.stats.happiness.toString(),
-        hunger: '100',
-        energy: '100',
-      };
-      
-      const newTags = updateBlobbiTags(cleanedTags, {
-        ...statsUpdate,
-        state: 'active',
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        name: canonical.companion.name,
-      };
-    },
-    onSuccess: ({ name }) => {
-      toast({
-        title: 'Incubation stopped',
-        description: `${name} is no longer incubating. Task progress has been reset.`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to stop incubation',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}
-
-// ─── Start Evolution Hook ─────────────────────────────────────────────────────
-
-/**
- * Parameters for start evolution hook.
- */
-export interface UseStartEvolutionParams {
-  companion: BlobbiCompanion | null;
-  /** Called to ensure companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    profileAllTags: string[][];
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Result of starting evolution.
- */
-export interface StartEvolutionResult {
-  /** The Blobbi's name */
-  name: string;
-  /** Timestamp when evolution started */
-  stateStartedAt: number;
-}
-
-/**
- * Hook to start the evolution process for a baby Blobbi.
- * 
- * This sets the Blobbi state to 'evolving' and records the start timestamp.
- * Tasks will be computed based on events created after this timestamp.
- * 
- * Requirements:
- * - Blobbi must be in baby stage
- * - Blobbi must not already be evolving
- * - User must be logged in
- */
-export function useStartEvolution({
-  companion,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseStartEvolutionParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (): Promise<StartEvolutionResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to start evolution');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (companion.stage !== 'baby') {
-        throw new Error('Only baby Blobbis can evolve');
-      }
-
-      if (companion.state === 'evolving') {
-        throw new Error('This Blobbi is already evolving');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for evolution');
-      }
-
-      // ─── Apply Accumulated Decay ───
-      const now = Math.floor(Date.now() / 1000);
-      const nowStr = now.toString();
-      
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      // ─── Build Updated Tags ───
-      // Remove any existing task tags when starting fresh
-      const cleanedTags = canonical.allTags.filter(tag => 
-        tag[0] !== 'task' && tag[0] !== 'task_completed'
-      );
-      
-      // Build stats update with decayed values
-      const statsUpdate: Record<string, string> = {
-        health: decayResult.stats.health.toString(),
-        hygiene: decayResult.stats.hygiene.toString(),
-        happiness: decayResult.stats.happiness.toString(),
-        hunger: decayResult.stats.hunger.toString(),
-        energy: decayResult.stats.energy.toString(),
-      };
-      
-      const newTags = updateBlobbiTags(cleanedTags, {
-        ...statsUpdate,
-        state: 'evolving',
-        state_started_at: nowStr,
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        name: canonical.companion.name,
-        stateStartedAt: now,
-      };
-    },
-    onSuccess: ({ name }) => {
-      toast({
-        title: 'Evolution started!',
-        description: `${name} is now working towards evolution. Complete the tasks to evolve!`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to start evolution',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}
-
-// ─── Stop Evolution Hook ──────────────────────────────────────────────────────
-
-/**
- * Parameters for stop evolution hook.
- */
-export interface UseStopEvolutionParams {
-  companion: BlobbiCompanion | null;
-  /** Called to ensure companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    profileAllTags: string[][];
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Result of stopping evolution.
- */
-export interface StopEvolutionResult {
-  /** The Blobbi's name */
-  name: string;
-}
-
-/**
- * Hook to stop/cancel the evolution process for a Blobbi.
- * 
- * This resets the Blobbi state to 'active' and clears all task progress tags.
- * The user can restart evolution later, but will need to complete tasks again.
- * 
- * When stopping evolution:
- * - Apply accumulated decay first
- * - Set state back to 'active'
- * - Remove state_started_at tag
- * - Remove all task and task_completed tags
- * 
- * Requirements:
- * - Blobbi must be in evolving state
- * - User must be logged in
- */
-export function useStopEvolution({
-  companion,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseStopEvolutionParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (): Promise<StopEvolutionResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to stop evolution');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (companion.state !== 'evolving') {
-        throw new Error('This Blobbi is not evolving');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion');
-      }
-
-      // ─── Apply Accumulated Decay ───
-      const now = Math.floor(Date.now() / 1000);
-      const nowStr = now.toString();
-      
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      // ─── Build Updated Tags ───
-      // Remove task tags and state_started_at
-      const cleanedTags = canonical.allTags.filter(tag => 
-        tag[0] !== 'task' && 
-        tag[0] !== 'task_completed' && 
-        tag[0] !== 'state_started_at'
-      );
-      
-      // Build stats update with decayed values
-      const statsUpdate: Record<string, string> = {
-        health: decayResult.stats.health.toString(),
-        hygiene: decayResult.stats.hygiene.toString(),
-        happiness: decayResult.stats.happiness.toString(),
-        hunger: decayResult.stats.hunger.toString(),
-        energy: decayResult.stats.energy.toString(),
-      };
-      
-      const newTags = updateBlobbiTags(cleanedTags, {
-        ...statsUpdate,
-        state: 'active',
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        name: canonical.companion.name,
-      };
-    },
-    onSuccess: ({ name }) => {
-      toast({
-        title: 'Evolution stopped',
-        description: `${name} is no longer evolving. Task progress has been reset.`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to stop evolution',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}
-
-// ─── Sync Task Completions Hook ───────────────────────────────────────────────
-
-/** Enable debug logging in development only */
-const DEBUG_TASK_SYNC = import.meta.env.DEV;
-
-/**
- * Parameters for syncing task completions (works for both hatch and evolve).
- */
-export interface UseSyncTaskCompletionsParams {
-  companion: BlobbiCompanion | null;
-  /** Called to ensure companion is canonical */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    profileAllTags: string[][];
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Task completions to sync (from useHatchTasks or useEvolveTasks).
- */
-export interface TaskCompletionToSync {
-  taskId: string;
-  completed: boolean;
-}
-
-/**
- * Result of sync operation.
- */
-export interface SyncTaskCompletionsResult {
-  /** Task IDs that were synced (empty if nothing needed) */
-  synced: string[];
-  /** Whether sync was skipped (no diff) */
-  skipped: boolean;
-  /** Reason for skip (for debugging) */
-  skipReason?: string;
-}
-
-/**
- * Hook to sync persistent task completions to kind 31124 tags.
- * Works for both hatch (incubating) and evolve (evolving) processes.
- * 
- * CRITICAL: This is a cache-only sync. It must be:
- * 1. Fully idempotent - calling multiple times with same data = no-op
- * 2. Diff-based - only publish when tags would actually change
- * 3. Safe - no last_interaction update (this is cache sync, not user action)
- * 4. Only sync PERSISTENT tasks - dynamic tasks must NEVER be synced
- * 
- * Source of truth = computed task state from Nostr events.
- * Tags = cache layer for faster access.
- */
-export function useSyncTaskCompletions({
-  companion,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseSyncTaskCompletionsParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (tasksToSync: TaskCompletionToSync[]): Promise<SyncTaskCompletionsResult> => {
-      // ─── Early Guards ───
-      if (!user?.pubkey) {
-        return { synced: [], skipped: true, skipReason: 'no_user' };
-      }
-
-      if (!companion) {
-        return { synced: [], skipped: true, skipReason: 'no_companion' };
-      }
-
-      // Must be in an active task process (incubating or evolving)
-      if (companion.state !== 'incubating' && companion.state !== 'evolving') {
-        return { synced: [], skipped: true, skipReason: 'not_in_task_process' };
-      }
-
-      // ─── Compute Diff ───
-      // Get cached completions from companion.tasksCompleted (parsed from tags)
-      const cachedCompletions = new Set(companion.tasksCompleted);
-      
-      // Get computed completions from tasks (works for both hatch and evolve)
-      const computedCompletions = tasksToSync
-        .filter(t => t.completed)
-        .map(t => t.taskId);
-      
-      // Find tasks that are computed as complete but NOT in cache
-      const missingFromCache = computedCompletions.filter(id => !cachedCompletions.has(id));
-
-      if (DEBUG_TASK_SYNC) {
-        console.log('[TaskSync] Diff check:', {
-          cachedCompletions: Array.from(cachedCompletions),
-          computedCompletions,
-          missingFromCache,
-        });
-      }
-
-      // If no diff, skip entirely
-      if (missingFromCache.length === 0) {
-        if (DEBUG_TASK_SYNC) {
-          console.log('[TaskSync] Skipped: no diff between computed and cached');
-        }
-        return { synced: [], skipped: true, skipReason: 'no_diff' };
-      }
-
-      // ─── Ensure Canonical ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        return { synced: [], skipped: true, skipReason: 'canonical_failed' };
-      }
-
-      // ─── Build Updated Tags ───
-      // Re-check against canonical.allTags (may have updated since companion was parsed)
-      const existingCompletionTags = new Set(
-        canonical.allTags
-          .filter(tag => tag[0] === 'task_completed')
-          .map(tag => tag[1])
-      );
-
-      // Filter to only truly missing tags
-      const tagsToAdd = missingFromCache.filter(id => !existingCompletionTags.has(id));
-
-      if (tagsToAdd.length === 0) {
-        if (DEBUG_TASK_SYNC) {
-          console.log('[TaskSync] Skipped: all tags already exist in canonical');
-        }
-        return { synced: [], skipped: true, skipReason: 'tags_already_exist' };
-      }
-
-      // Add only the missing task_completed tags
-      // CRITICAL: Do NOT update last_interaction - this is cache sync, not user action
-      const updatedTags = [
-        ...canonical.allTags,
-        ...tagsToAdd.map(id => ['task_completed', id]),
-      ];
-
-      if (DEBUG_TASK_SYNC) {
-        console.log('[TaskSync] Publishing:', {
-          tagsToAdd,
-          totalTags: updatedTags.length,
-        });
-      }
-
-      // ─── Publish ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: updatedTags,
-      });
-
-      updateCompanionEvent(event);
-
-      if (DEBUG_TASK_SYNC) {
-        console.log('[TaskSync] Published successfully:', tagsToAdd);
-      }
-
-      return { synced: tagsToAdd, skipped: false };
-    },
-  });
-}

src/blobbi/actions/hooks/useBlobbiStageTransition.ts

@@ -1,387 +0,0 @@
-// src/blobbi/actions/hooks/useBlobbiStageTransition.ts
-
-/**
- * Hooks for Blobbi stage transitions (hatch, evolve).
- * 
- * Both transitions follow the same decay pattern:
- * 1. Apply accumulated decay from `last_decay_at` to `now`
- * 2. Use decayed stats as the source of truth for the transition
- * 3. Publish new event with decayed stats + new stage
- * 4. Reset `last_decay_at` to current timestamp
- * 
- * @see docs/blobbi/decay-system.md
- */
-
-import { useMutation } from '@tanstack/react-query';
-import type { NostrEvent } from '@nostrify/nostrify';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import type { BlobbiCompanion, BlobbonautProfile, BlobbiStage } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBI_STATE,
-  STAT_MAX,
-  updateBlobbiTags,
-} from '@/blobbi/core/lib/blobbi';
-import { applyBlobbiDecay } from '@/blobbi/core/lib/blobbi-decay';
-import { validateAndRepairBlobbiTags } from '@/blobbi/core/lib/blobbi-tag-schema';
-import { getStreakTagUpdates } from '../lib/blobbi-streak';
-
-// ─── Content Helpers ──────────────────────────────────────────────────────────
-
-/**
- * Generate the content string for a Blobbi at a given stage.
- * Format: "{name} is a {stage} Blobbi."
- * 
- * Uses correct grammar: "an egg" vs "a baby/adult"
- */
-function generateBlobbiContent(name: string, stage: BlobbiStage): string {
-  const article = stage === 'egg' ? 'an' : 'a';
-  return `${name} is ${article} ${stage} Blobbi.`;
-}
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Result of ensuring canonical companion before action.
- * This is the same interface used by useBlobbiUseInventoryItem.
- */
-export interface CanonicalActionResult {
-  companion: BlobbiCompanion;
-  content: string;
-  allTags: string[][];
-  wasMigrated: boolean;
-  /** Latest profile tags after migration */
-  profileAllTags: string[][];
-  /** Latest profile storage after migration */
-  profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-}
-
-/**
- * Parameters for stage transition hooks.
- */
-export interface UseBlobbiStageTransitionParams {
-  companion: BlobbiCompanion | null;
-  profile: BlobbonautProfile | null;
-  /** Called to ensure companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<CanonicalActionResult | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-}
-
-/**
- * Result of a stage transition.
- */
-export interface StageTransitionResult {
-  /** Previous stage before transition */
-  previousStage: BlobbiStage;
-  /** New stage after transition */
-  newStage: BlobbiStage;
-  /** The Blobbi's name */
-  name: string;
-  /** Stats after decay was applied (before any transition bonuses) */
-  decayedStats: {
-    hunger: number;
-    happiness: number;
-    health: number;
-    hygiene: number;
-    energy: number;
-  };
-}
-
-// ─── Hatch Hook ───────────────────────────────────────────────────────────────
-
-/**
- * Hook to hatch an egg into a baby Blobbi.
- * 
- * Transition: egg -> baby
- * 
- * Requirements:
- * - Blobbi must be in egg stage
- * - Applies accumulated decay before transition
- * - Resets stats to healthy baby defaults (inherits health from egg)
- * - Sets last_decay_at to current timestamp
- */
-export function useBlobbiHatch({
-  companion,
-  profile,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseBlobbiStageTransitionParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (): Promise<StageTransitionResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to hatch');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (!profile) {
-        throw new Error('Profile not found');
-      }
-
-      if (companion.stage !== 'egg') {
-        throw new Error('Only eggs can be hatched');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for hatching');
-      }
-
-      // ─── Apply Accumulated Decay First ───
-      // Per decay-system.md: Always apply accumulated decay from persisted state
-      // before any stage transition.
-      const now = Math.floor(Date.now() / 1000);
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-
-      // ─── Calculate Baby Stats ───
-      // All stats reset to 100 when hatching — the baby starts fresh
-      const babyStats = {
-        hunger: STAT_MAX,
-        happiness: STAT_MAX,
-        health: STAT_MAX,
-        hygiene: STAT_MAX,
-        energy: STAT_MAX,
-      };
-
-      // ─── Build Updated Tags ───
-      // CRITICAL: Start from canonical.allTags and only remove task/state-specific tags
-      // This preserves ALL identity attributes (personality, trait, favorite_food, etc.)
-      const nowStr = now.toString();
-      
-      // Build the updated tags using the central merge function
-      // Get streak updates (hatching counts as care activity!)
-      const streakUpdates = getStreakTagUpdates(canonical.companion) ?? {};
-      
-      const mergedTags = updateBlobbiTags(canonical.allTags, {
-        stage: 'baby',
-        state: 'active', // Newly hatched babies are awake
-        hunger: babyStats.hunger.toString(),
-        happiness: babyStats.happiness.toString(),
-        health: babyStats.health.toString(),
-        hygiene: babyStats.hygiene.toString(),
-        energy: babyStats.energy.toString(),
-        ...streakUpdates,
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-      
-      // ─── Validate and Repair Tags ───
-      // Use the tag integrity guard to ensure all persistent tags are preserved
-      // and task-related tags are properly cleaned up for stage transitions
-      const repairResult = validateAndRepairBlobbiTags(
-        mergedTags,
-        canonical.allTags,
-        { cleanupTaskTags: true }
-      );
-      
-      if (repairResult.errors.length > 0) {
-        console.error('[Hatch] Tag validation errors:', repairResult.errors);
-        throw new Error(`Tag validation failed: ${repairResult.errors.join(', ')}`);
-      }
-      
-      if (repairResult.repaired && import.meta.env.DEV) {
-        console.log('[Hatch] Tag repairs applied:', repairResult.repairs);
-      }
-      
-      const newTags = repairResult.tags;
-
-      // ─── Generate New Content for Baby Stage ───
-      // CRITICAL: Content must reflect the new stage
-      const newContent = generateBlobbiContent(canonical.companion.name, 'baby');
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: newContent,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        previousStage: 'egg',
-        newStage: 'baby',
-        name: canonical.companion.name,
-        decayedStats: decayResult.stats,
-      };
-    },
-    onSuccess: ({ name }) => {
-      toast({
-        title: 'Your egg hatched!',
-        description: `${name} is now a baby Blobbi! Take good care of them.`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to hatch',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}
-
-// ─── Evolve Hook ──────────────────────────────────────────────────────────────
-
-/**
- * Hook to evolve a baby Blobbi into an adult.
- * 
- * Transition: baby -> adult
- * 
- * Requirements:
- * - Blobbi must be in baby stage
- * - Applies accumulated decay before transition
- * - Preserves all stats (decay already applied)
- * - Sets last_decay_at to current timestamp
- */
-export function useBlobbiEvolve({
-  companion,
-  profile,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-}: UseBlobbiStageTransitionParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async (): Promise<StageTransitionResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to evolve');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (!profile) {
-        throw new Error('Profile not found');
-      }
-
-      if (companion.stage !== 'baby') {
-        if (companion.stage === 'egg') {
-          throw new Error('Eggs must hatch before they can evolve');
-        }
-        if (companion.stage === 'adult') {
-          throw new Error('This Blobbi is already fully evolved');
-        }
-        throw new Error('Only baby Blobbis can evolve');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for evolution');
-      }
-
-      // ─── Apply Accumulated Decay First ───
-      // Per decay-system.md: Always apply accumulated decay from persisted state
-      // before any stage transition.
-      const now = Math.floor(Date.now() / 1000);
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-
-      // ─── Adult Stats ───
-      // Adult inherits all decayed stats from baby
-      // No stat reset - evolution preserves current condition
-      const adultStats = decayResult.stats;
-
-      // ─── Build Updated Tags ───
-      // CRITICAL: Start from canonical.allTags and only remove task/state-specific tags
-      // This preserves ALL identity attributes (personality, trait, favorite_food, etc.)
-      const nowStr = now.toString();
-      
-      // Get streak updates (evolving counts as care activity!)
-      const streakUpdates = getStreakTagUpdates(canonical.companion) ?? {};
-      
-      // Build the updated tags using the central merge function
-      const mergedTags = updateBlobbiTags(canonical.allTags, {
-        stage: 'adult',
-        state: 'active', // Evolution completes with active state
-        hunger: adultStats.hunger.toString(),
-        happiness: adultStats.happiness.toString(),
-        health: adultStats.health.toString(),
-        hygiene: adultStats.hygiene.toString(),
-        energy: adultStats.energy.toString(),
-        ...streakUpdates,
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-      
-      // ─── Validate and Repair Tags ───
-      // Use the tag integrity guard to ensure all persistent tags are preserved
-      // and task-related tags are properly cleaned up for stage transitions
-      const repairResult = validateAndRepairBlobbiTags(
-        mergedTags,
-        canonical.allTags,
-        { cleanupTaskTags: true }
-      );
-      
-      if (repairResult.errors.length > 0) {
-        console.error('[Evolve] Tag validation errors:', repairResult.errors);
-        throw new Error(`Tag validation failed: ${repairResult.errors.join(', ')}`);
-      }
-      
-      if (repairResult.repaired && import.meta.env.DEV) {
-        console.log('[Evolve] Tag repairs applied:', repairResult.repairs);
-      }
-      
-      const newTags = repairResult.tags;
-
-      // ─── Generate New Content for Adult Stage ───
-      // CRITICAL: Content must reflect the new stage
-      const newContent = generateBlobbiContent(canonical.companion.name, 'adult');
-
-      // ─── Publish Event ───
-      const event = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: newContent,
-        tags: newTags,
-      });
-
-      updateCompanionEvent(event);
-
-      return {
-        previousStage: 'baby',
-        newStage: 'adult',
-        name: canonical.companion.name,
-        decayedStats: decayResult.stats,
-      };
-    },
-    onSuccess: ({ name }) => {
-      toast({
-        title: 'Evolution complete!',
-        description: `${name} has evolved into an adult Blobbi!`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to evolve',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}

src/blobbi/actions/hooks/useBlobbiUseInventoryItem.ts

@@ -1,315 +0,0 @@
-// src/blobbi/actions/hooks/useBlobbiUseInventoryItem.ts
-
-import { useMutation } from '@tanstack/react-query';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import type { BlobbiCompanion, BlobbonautProfile } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBI_STATE,
-  updateBlobbiTags,
-} from '@/blobbi/core/lib/blobbi';
-import { applyBlobbiDecay } from '@/blobbi/core/lib/blobbi-decay';
-import { getShopItemById } from '@/blobbi/shop/lib/blobbi-shop-items';
-import {
-  applyItemEffects,
-  canUseAction,
-  getStageRestrictionMessage,
-  clampStat,
-  applyStat,
-  hasMedicineEffectForEgg,
-  hasHygieneEffectForEgg,
-  incrementInteractionTaskTags,
-  type InventoryAction,
-  ACTION_METADATA,
-} from '../lib/blobbi-action-utils';
-import { trackMultipleDailyMissionActions } from '../lib/daily-mission-tracker';
-import type { DailyMissionAction } from '../lib/daily-missions';
-import { getStreakTagUpdates } from '../lib/blobbi-streak';
-import { calculateInventoryActionXP, applyXPGain, formatXPGain } from '../lib/blobbi-xp';
-import { HATCH_REQUIRED_INTERACTIONS } from './useHatchTasks';
-import { EVOLVE_REQUIRED_INTERACTIONS } from './useEvolveTasks';
-
-/**
- * Request payload for using an item on a Blobbi companion
- */
-export interface UseItemRequest {
-  itemId: string;
-  action: InventoryAction;
-}
-
-/**
- * Result of using an item on a Blobbi companion
- */
-export interface UseItemResult {
-  itemName: string;
-  action: InventoryAction;
-  statsChanged: Record<string, number>;
-  xpGained: number;
-  newXP: number;
-}
-
-/**
- * Parameters for the useBlobbiUseInventoryItem hook
- */
-export interface UseBlobbiUseInventoryItemParams {
-  companion: BlobbiCompanion | null;
-  profile: BlobbonautProfile | null;
-  /** Called after ensuring companion is canonical (from migration helper) */
-  ensureCanonicalBeforeAction: () => Promise<{
-    companion: BlobbiCompanion;
-    content: string;
-    allTags: string[][];
-    wasMigrated: boolean;
-    /** Latest profile tags after migration */
-    profileAllTags: string[][];
-    /** Latest profile storage after migration */
-    profileStorage: import('@/blobbi/core/lib/blobbi').StorageItem[];
-  } | null>;
-  /** Update companion event in local cache */
-  updateCompanionEvent: (event: NostrEvent) => void;
-  /** Update profile event in local cache */
-  updateProfileEvent: (event: NostrEvent) => void;
-}
-
-// Import NostrEvent type
-import type { NostrEvent } from '@nostrify/nostrify';
-
-/**
- * Hook to use an item on a Blobbi companion.
- * 
- * Items are reusable abilities sourced from the shop catalog — no
- * inventory ownership or quantity is required.
- * 
- * This hook:
- * 1. Validates the companion and item compatibility
- * 2. Ensures canonical format before action
- * 3. Applies accumulated decay, then item effects to Blobbi stats
- * 4. Updates Blobbi state (kind 31124)
- */
-export function useBlobbiUseInventoryItem({
-  companion,
-  profile,
-  ensureCanonicalBeforeAction,
-  updateCompanionEvent,
-  updateProfileEvent: _updateProfileEvent,
-}: UseBlobbiUseInventoryItemParams) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-
-  return useMutation({
-    mutationFn: async ({ itemId, action }: UseItemRequest): Promise<UseItemResult> => {
-      // ─── Validation ───
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to use items');
-      }
-
-      if (!companion) {
-        throw new Error('No companion selected');
-      }
-
-      if (!profile) {
-        throw new Error('Profile not found');
-      }
-
-      // Check stage restrictions for this specific action
-      if (!canUseAction(companion, action)) {
-        const message = getStageRestrictionMessage(companion, action);
-        throw new Error(message ?? 'This companion cannot use this item');
-      }
-
-      // Validate item exists in shop catalog
-      const shopItem = getShopItemById(itemId);
-      if (!shopItem) {
-        throw new Error('Item not found in catalog');
-      }
-
-      // Validate item has effects
-      if (!shopItem.effect) {
-        throw new Error('This item has no effect');
-      }
-
-      // For eggs, validate that items have applicable effects
-      const isEgg = companion.stage === 'egg';
-      if (isEgg && action === 'medicine' && !hasMedicineEffectForEgg(shopItem.effect)) {
-        throw new Error('This medicine has no effect on eggs');
-      }
-      if (isEgg && action === 'clean' && !hasHygieneEffectForEgg(shopItem.effect)) {
-        throw new Error('This item has no cleaning effect on eggs');
-      }
-
-      // ─── Ensure Canonical Before Action ───
-      const canonical = await ensureCanonicalBeforeAction();
-      if (!canonical) {
-        throw new Error('Failed to prepare companion for action');
-      }
-
-      // ─── Apply Accumulated Decay First ───
-      // Per decay-system.md: Always apply accumulated decay from persisted state
-      // before any user interaction updates stats.
-      // CRITICAL: Use canonical.companion for decay calculations, not the stale outer companion
-      const now = Math.floor(Date.now() / 1000);
-      const decayResult = applyBlobbiDecay({
-        stage: canonical.companion.stage,
-        state: canonical.companion.state,
-        stats: canonical.companion.stats,
-        lastDecayAt: canonical.companion.lastDecayAt,
-        now,
-      });
-      
-      // Start with decayed stats as the base
-      const statsAfterDecay = decayResult.stats;
-      
-      // ─── Validate Play Energy Requirements ───
-      // For play actions, validate the Blobbi has enough energy AFTER decay
-      if (action === 'play') {
-        const energyCost = Math.abs(shopItem.effect.energy ?? 0);
-        const currentEnergy = statsAfterDecay.energy;
-        
-        if (energyCost > 0 && currentEnergy < energyCost) {
-          throw new Error(
-            `Your Blobbi needs at least ${energyCost} energy to play with this toy (current: ${currentEnergy})`
-          );
-        }
-        
-        // Also check if playing would have any effect at all
-        // If happiness is maxed AND we can't spend energy, playing is pointless
-        const happinessGain = shopItem.effect.happiness ?? 0;
-        const currentHappiness = statsAfterDecay.happiness;
-        const wouldGainHappiness = happinessGain > 0 && currentHappiness < 100;
-        const wouldSpendEnergy = energyCost > 0 && currentEnergy >= energyCost;
-        
-        if (!wouldGainHappiness && !wouldSpendEnergy) {
-          throw new Error(
-            'Playing would have no effect - your Blobbi is already at maximum happiness and has no energy to spend'
-          );
-        }
-      }
-      
-      // ─── Apply Item Effects (single use) ───
-      const isEggCompanion = canonical.companion.stage === 'egg';
-      const statsUpdate: Record<string, string> = {};
-      const statsChanged: Record<string, number> = {};
-
-      if (isEggCompanion && action === 'medicine') {
-        const healthDelta = shopItem.effect.health ?? 0;
-        const currentHealth = applyStat(statsAfterDecay.health ?? 0, healthDelta);
-        
-        statsUpdate.health = currentHealth.toString();
-        statsChanged.health = currentHealth - (statsAfterDecay.health ?? 0);
-        
-        statsUpdate.hygiene = (statsAfterDecay.hygiene ?? 0).toString();
-        statsUpdate.happiness = (statsAfterDecay.happiness ?? 0).toString();
-        statsUpdate.hunger = '100';
-        statsUpdate.energy = '100';
-      } else if (isEggCompanion && action === 'clean') {
-        const currentHygiene = applyStat(statsAfterDecay.hygiene ?? 0, shopItem.effect.hygiene ?? 0);
-        const currentHappiness = applyStat(statsAfterDecay.happiness ?? 0, shopItem.effect.happiness ?? 0);
-        
-        statsUpdate.hygiene = currentHygiene.toString();
-        statsChanged.hygiene = currentHygiene - (statsAfterDecay.hygiene ?? 0);
-        
-        statsUpdate.happiness = currentHappiness.toString();
-        const totalHappinessChange = currentHappiness - (statsAfterDecay.happiness ?? 0);
-        if (totalHappinessChange !== 0) {
-          statsChanged.happiness = totalHappinessChange;
-        }
-        
-        statsUpdate.health = (statsAfterDecay.health ?? 0).toString();
-        statsUpdate.hunger = '100';
-        statsUpdate.energy = '100';
-      } else {
-        // Normal stats application for baby/adult — apply once
-        const currentStats = applyItemEffects({ ...statsAfterDecay }, shopItem.effect);
-
-        statsUpdate.hunger = clampStat(currentStats.hunger).toString();
-        statsChanged.hunger = (currentStats.hunger ?? 0) - (statsAfterDecay.hunger ?? 0);
-        
-        statsUpdate.happiness = clampStat(currentStats.happiness).toString();
-        statsChanged.happiness = (currentStats.happiness ?? 0) - (statsAfterDecay.happiness ?? 0);
-        
-        statsUpdate.energy = clampStat(currentStats.energy).toString();
-        statsChanged.energy = (currentStats.energy ?? 0) - (statsAfterDecay.energy ?? 0);
-        
-        statsUpdate.hygiene = clampStat(currentStats.hygiene).toString();
-        statsChanged.hygiene = (currentStats.hygiene ?? 0) - (statsAfterDecay.hygiene ?? 0);
-        
-        statsUpdate.health = clampStat(currentStats.health).toString();
-        statsChanged.health = (currentStats.health ?? 0) - (statsAfterDecay.health ?? 0);
-      }
-
-      // ─── Update Blobbi State Event (kind 31124) ───
-      const nowStr = now.toString();
-      
-      // If incubating or evolving, increment the interaction counter for tasks
-      const companionState = canonical.companion.state;
-      let updatedTags = canonical.allTags;
-      if (companionState === 'incubating') {
-        updatedTags = incrementInteractionTaskTags(canonical.allTags, HATCH_REQUIRED_INTERACTIONS).updatedTags;
-      } else if (companionState === 'evolving') {
-        updatedTags = incrementInteractionTaskTags(canonical.allTags, EVOLVE_REQUIRED_INTERACTIONS).updatedTags;
-      }
-      
-      // Get streak updates (will only update if needed based on day)
-      const streakUpdates = getStreakTagUpdates(canonical.companion) ?? {};
-      
-      // ─── Apply XP Gain ───
-      const xpGained = calculateInventoryActionXP(action, 1);
-      const currentXP = canonical.companion.experience ?? 0;
-      const newXP = applyXPGain(currentXP, xpGained);
-      
-      const blobbiTags = updateBlobbiTags(updatedTags, {
-        ...statsUpdate,
-        ...streakUpdates,
-        experience: newXP.toString(),
-        last_interaction: nowStr,
-        last_decay_at: nowStr,
-      });
-
-      const blobbiEvent = await publishEvent({
-        kind: KIND_BLOBBI_STATE,
-        content: canonical.content,
-        tags: blobbiTags,
-      });
-
-      updateCompanionEvent(blobbiEvent);
-
-      // Items are free to use — no storage decrement needed.
-      // No query invalidation needed — the optimistic update above keeps the
-      // cache correct, and ensureCanonicalBeforeAction fetches fresh from relays
-      // before every mutation (read-modify-write pattern).
-
-      return {
-        itemName: shopItem.name,
-        action,
-        statsChanged,
-        xpGained,
-        newXP,
-      };
-    },
-    onSuccess: ({ itemName, action, xpGained }) => {
-      const actionMeta = ACTION_METADATA[action];
-      const xpText = formatXPGain(xpGained);
-      toast({
-        title: `${actionMeta.label} successful!`,
-        description: `Used ${itemName} on your Blobbi. ${xpText}`,
-      });
-
-      // Track daily mission progress
-      // 'interact' is always tracked, plus the specific action if it maps to a daily mission
-      const dailyActions: DailyMissionAction[] = ['interact'];
-      if (action === 'feed') dailyActions.push('feed');
-      if (action === 'clean') dailyActions.push('clean');
-      trackMultipleDailyMissionActions(dailyActions, user?.pubkey);
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to use item',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}

src/blobbi/actions/hooks/useClaimMissionReward.ts

@@ -1,242 +0,0 @@
-/**
- * useClaimMissionReward - Hook for claiming daily mission rewards
- * 
- * Handles:
- * - Persisting coin rewards to kind 11125 Blobbonaut profile
- * - Updating localStorage mission state
- * - Idempotent claiming (prevents double-credit)
- * - Optimistic cache updates
- */
-
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { useNostrPublish } from '@/hooks/useNostrPublish';
-import { toast } from '@/hooks/useToast';
-
-import type { BlobbonautProfile } from '@/blobbi/core/lib/blobbi';
-import {
-  KIND_BLOBBONAUT_PROFILE,
-  updateBlobbonautTags,
-} from '@/blobbi/core/lib/blobbi';
-import {
-  type DailyMissionsState,
-  getTodayDateString,
-  needsDailyReset,
-  createDailyMissionsState,
-  isBonusMissionAvailable,
-  isBonusMissionClaimed,
-  BONUS_MISSION_DEFINITION,
-} from '../lib/daily-missions';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export interface ClaimMissionRequest {
-  missionId: string;
-}
-
-/** Special ID for claiming the bonus mission */
-export const BONUS_MISSION_ID = 'bonus_daily_complete';
-
-export interface ClaimMissionResult {
-  missionId: string;
-  coinsEarned: number;
-  newTotalCoins: number;
-}
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const STORAGE_KEY = 'blobbi:daily-missions';
-
-// ─── Storage Utilities ────────────────────────────────────────────────────────
-
-function readMissionsState(): DailyMissionsState | null {
-  try {
-    const stored = localStorage.getItem(STORAGE_KEY);
-    return stored ? JSON.parse(stored) : null;
-  } catch {
-    return null;
-  }
-}
-
-function writeMissionsState(state: DailyMissionsState): void {
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(state));
-  } catch (error) {
-    console.warn('[useClaimMissionReward] Failed to write state:', error);
-  }
-}
-
-// ─── Hook ─────────────────────────────────────────────────────────────────────
-
-/**
- * Hook to claim daily mission rewards.
- * 
- * This hook persists coin rewards to the kind 11125 Blobbonaut profile event,
- * ensuring rewards are stored on-chain rather than just in localStorage.
- * 
- * @param currentProfile - The current Blobbonaut profile (required for coin updates)
- * @param updateProfileEvent - Callback to update the profile in the query cache
- */
-export function useClaimMissionReward(
-  currentProfile: BlobbonautProfile | null,
-  updateProfileEvent: (event: import('@nostrify/nostrify').NostrEvent) => void
-) {
-  const { user } = useCurrentUser();
-  const { mutateAsync: publishEvent } = useNostrPublish();
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ({ missionId }: ClaimMissionRequest): Promise<ClaimMissionResult> => {
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to claim rewards');
-      }
-
-      if (!currentProfile) {
-        throw new Error('Profile not found');
-      }
-
-      // Read current missions state from localStorage
-      let missionsState = readMissionsState();
-      
-      // Ensure we have valid state for today
-      if (needsDailyReset(missionsState)) {
-        const previousCoins = missionsState?.totalCoinsEarned ?? 0;
-        missionsState = createDailyMissionsState(getTodayDateString(), user.pubkey, previousCoins);
-      }
-
-      // Handle bonus mission claim
-      if (missionId === BONUS_MISSION_ID) {
-        // Check if bonus is available
-        if (!isBonusMissionAvailable(missionsState!)) {
-          throw new Error('Bonus mission not available yet');
-        }
-
-        // Check if already claimed
-        if (isBonusMissionClaimed(missionsState!)) {
-          throw new Error('Bonus reward already claimed');
-        }
-
-        const coinsToAdd = BONUS_MISSION_DEFINITION.reward;
-        const newTotalCoins = currentProfile.coins + coinsToAdd;
-
-        // Build updated tags with new coin balance
-        const updatedTags = updateBlobbonautTags(currentProfile.allTags, {
-          coins: newTotalCoins.toString(),
-        });
-
-        // Publish updated profile event
-        const event = await publishEvent({
-          kind: KIND_BLOBBONAUT_PROFILE,
-          content: '',
-          tags: updatedTags,
-        });
-
-        // Update the query cache
-        updateProfileEvent(event);
-
-        // Update localStorage to mark bonus as claimed
-        const updatedState: DailyMissionsState = {
-          ...missionsState!,
-          bonusClaimed: true,
-          totalCoinsEarned: missionsState!.totalCoinsEarned + coinsToAdd,
-        };
-
-        writeMissionsState(updatedState);
-
-        // Dispatch event for React components to re-render
-        window.dispatchEvent(new CustomEvent('daily-missions-updated', { 
-          detail: { missionId, claimed: true, isBonus: true } 
-        }));
-
-        return {
-          missionId,
-          coinsEarned: coinsToAdd,
-          newTotalCoins,
-        };
-      }
-
-      // Handle regular mission claim
-      const mission = missionsState!.missions.find(m => m.id === missionId);
-      if (!mission) {
-        throw new Error('Mission not found');
-      }
-
-      // Check if already claimed (idempotency check)
-      if (mission.claimed) {
-        throw new Error('Reward already claimed');
-      }
-
-      // Check if mission is completed
-      if (!mission.completed) {
-        throw new Error('Mission not completed yet');
-      }
-
-      const coinsToAdd = mission.reward;
-      const newTotalCoins = currentProfile.coins + coinsToAdd;
-
-      // Build updated tags with new coin balance
-      const updatedTags = updateBlobbonautTags(currentProfile.allTags, {
-        coins: newTotalCoins.toString(),
-      });
-
-      // Publish updated profile event to kind 11125
-      const event = await publishEvent({
-        kind: KIND_BLOBBONAUT_PROFILE,
-        content: '',
-        tags: updatedTags,
-      });
-
-      // Update the query cache optimistically
-      updateProfileEvent(event);
-
-      // Now update localStorage to mark mission as claimed
-      const updatedMissions = missionsState!.missions.map(m =>
-        m.id === missionId ? { ...m, claimed: true } : m
-      );
-
-      const updatedState: DailyMissionsState = {
-        ...missionsState!,
-        missions: updatedMissions,
-        totalCoinsEarned: missionsState!.totalCoinsEarned + coinsToAdd,
-      };
-
-      writeMissionsState(updatedState);
-
-      // Dispatch event for React components to re-render
-      window.dispatchEvent(new CustomEvent('daily-missions-updated', { 
-        detail: { missionId, claimed: true } 
-      }));
-
-      return {
-        missionId,
-        coinsEarned: coinsToAdd,
-        newTotalCoins,
-      };
-    },
-    onSuccess: ({ coinsEarned }) => {
-      // Invalidate profile query to ensure fresh data
-      if (user?.pubkey) {
-        queryClient.invalidateQueries({ queryKey: ['blobbonaut-profile', user.pubkey] });
-      }
-
-      // Show success toast
-      toast({
-        title: 'Reward Claimed!',
-        description: `You earned ${coinsEarned} coins.`,
-      });
-    },
-    onError: (error: Error) => {
-      // Don't show error for already claimed (user might have double-clicked)
-      if (error.message === 'Reward already claimed' || error.message === 'Bonus reward already claimed') {
-        return;
-      }
-
-      toast({
-        title: 'Failed to Claim Reward',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}

src/blobbi/actions/hooks/useDailyMissions.ts

@@ -1,201 +0,0 @@
-/**
- * useDailyMissions - Hook for managing Blobbi daily missions
- * 
- * Provides:
- * - Daily mission state management with localStorage persistence
- * - Automatic daily reset
- * - Progress tracking functions
- * - Read-only access to mission state (claiming is handled by useClaimMissionReward)
- * - Stage-based filtering (only shows missions user can complete)
- * - Bonus mission tracking
- * 
- * Note: Reward claiming should be done via useClaimMissionReward hook,
- * which persists coins to the kind 11125 Blobbonaut profile.
- */
-
-import { useMemo, useEffect, useState, useCallback } from 'react';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import {
-  type DailyMissionsState,
-  type DailyMission,
-  type BlobbiStage,
-  getTodayDateString,
-  needsDailyReset,
-  createDailyMissionsState,
-  areAllMissionsCompleted,
-  areAllMissionsClaimed,
-  getTotalPotentialReward,
-  getTodayClaimedReward,
-  isBonusMissionAvailable,
-  isBonusMissionClaimed,
-  BONUS_MISSION_DEFINITION,
-  getRerollsRemaining,
-  MAX_DAILY_REROLLS,
-} from '../lib/daily-missions';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export interface UseDailyMissionsOptions {
-  /** Available Blobbi stages the user has (filters eligible missions) */
-  availableStages?: BlobbiStage[];
-}
-
-export interface UseDailyMissionsResult {
-  /** Current daily missions state */
-  missions: DailyMission[];
-  /** Whether all missions are completed */
-  allCompleted: boolean;
-  /** Whether all missions are claimed */
-  allClaimed: boolean;
-  /** Total potential reward for today (including bonus if available) */
-  totalPotentialReward: number;
-  /** Total claimed reward for today */
-  todayClaimedReward: number;
-  /** Lifetime total coins earned from daily missions */
-  lifetimeCoinsEarned: number;
-  /** Whether the bonus mission is available (all regular missions completed) */
-  bonusAvailable: boolean;
-  /** Whether the bonus mission has been claimed */
-  bonusClaimed: boolean;
-  /** Bonus mission reward amount */
-  bonusReward: number;
-  /** Whether user has no eligible missions (e.g., only eggs) */
-  noMissionsAvailable: boolean;
-  /** Number of rerolls remaining for today */
-  rerollsRemaining: number;
-  /** Maximum rerolls allowed per day */
-  maxRerolls: number;
-  /** Force refresh missions (for testing or manual reset) */
-  forceReset: () => void;
-}
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const STORAGE_KEY = 'blobbi:daily-missions';
-
-// ─── Storage Utilities ────────────────────────────────────────────────────────
-
-function readMissionsState(): DailyMissionsState | null {
-  try {
-    const stored = localStorage.getItem(STORAGE_KEY);
-    return stored ? JSON.parse(stored) : null;
-  } catch {
-    return null;
-  }
-}
-
-function writeMissionsState(state: DailyMissionsState): void {
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(state));
-  } catch (error) {
-    console.warn('[useDailyMissions] Failed to write state:', error);
-  }
-}
-
-// ─── Hook ─────────────────────────────────────────────────────────────────────
-
-export function useDailyMissions(options: UseDailyMissionsOptions = {}): UseDailyMissionsResult {
-  const { availableStages } = options;
-  const { user } = useCurrentUser();
-  const pubkey = user?.pubkey;
-
-  // Read state directly from localStorage, with a version counter to trigger re-reads
-  const [version, setVersion] = useState(0);
-  
-  // Read from localStorage on every render when version changes
-  // eslint-disable-next-line react-hooks/exhaustive-deps -- version is intentionally used to force re-read
-  const state = useMemo(() => readMissionsState(), [version]);
-  
-  // Wrapper to write state and update version
-  const setState = useCallback((newState: DailyMissionsState) => {
-    writeMissionsState(newState);
-    setVersion((v) => v + 1);
-  }, []);
-
-  // Listen for external updates from mutations (reroll, claim, progress tracking)
-  // This re-reads localStorage when other hooks modify it directly
-  useEffect(() => {
-    const handleExternalUpdate = () => {
-      // Bump version to trigger a re-read from localStorage
-      setVersion((v) => v + 1);
-    };
-
-    window.addEventListener('daily-missions-updated', handleExternalUpdate);
-    return () => window.removeEventListener('daily-missions-updated', handleExternalUpdate);
-  }, []);
-
-  // Stable key for availableStages to use in dependencies
-  const stagesKey = availableStages?.sort().join(',') ?? '';
-
-  // Ensure we have valid state for today
-  const currentState = useMemo(() => {
-    // Check if we need to reset for a new day
-    if (needsDailyReset(state)) {
-      const previousCoins = state?.totalCoinsEarned ?? 0;
-      const newState = createDailyMissionsState(getTodayDateString(), pubkey, previousCoins, availableStages);
-      // Persist the reset state (this will trigger version bump via setState)
-      writeMissionsState(newState);
-      return newState;
-    }
-    
-    // Migration: ensure rerollsRemaining is set for old state
-    if (state && state.rerollsRemaining === undefined) {
-      const migratedState = {
-        ...state,
-        rerollsRemaining: MAX_DAILY_REROLLS,
-      };
-      writeMissionsState(migratedState);
-      return migratedState;
-    }
-    
-    return state!;
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state, pubkey, stagesKey]);
-
-  // Force reset missions (for testing)
-  const forceReset = () => {
-    const previousCoins = state?.totalCoinsEarned ?? 0;
-    const newState = createDailyMissionsState(getTodayDateString(), pubkey, previousCoins, availableStages);
-    setState(newState);
-  };
-
-  // Computed values
-  const missions = currentState.missions;
-  const allCompleted = areAllMissionsCompleted(currentState);
-  const allClaimed = areAllMissionsClaimed(currentState);
-  const bonusAvailable = isBonusMissionAvailable(currentState);
-  const bonusClaimed = isBonusMissionClaimed(currentState);
-  const bonusReward = BONUS_MISSION_DEFINITION.reward;
-  const noMissionsAvailable = missions.length === 0;
-  const rerollsRemaining = getRerollsRemaining(currentState);
-  const maxRerolls = MAX_DAILY_REROLLS;
-  
-  // Total potential includes bonus if regular missions exist
-  const basePotentialReward = getTotalPotentialReward(currentState);
-  const totalPotentialReward = missions.length > 0 
-    ? basePotentialReward + bonusReward 
-    : 0;
-  
-  // Today's claimed includes bonus if claimed
-  const baseTodayClaimedReward = getTodayClaimedReward(currentState);
-  const todayClaimedReward = baseTodayClaimedReward + (bonusClaimed ? bonusReward : 0);
-  
-  const lifetimeCoinsEarned = currentState.totalCoinsEarned;
-
-  return {
-    missions,
-    allCompleted,
-    allClaimed,
-    totalPotentialReward,
-    todayClaimedReward,
-    lifetimeCoinsEarned,
-    bonusAvailable,
-    bonusClaimed,
-    bonusReward,
-    noMissionsAvailable,
-    rerollsRemaining,
-    maxRerolls,
-    forceReset,
-  };
-}

src/blobbi/actions/hooks/useEvolveTasks.ts

@@ -1,363 +0,0 @@
-// src/blobbi/actions/hooks/useEvolveTasks.ts
-
-/**
- * Hook to compute evolve task progress from Nostr events and current stats.
- * 
- * CRITICAL ARCHITECTURE:
- * - PERSISTENT TASKS: Based on Nostr events, can be cached in tags
- * - DYNAMIC TASKS: Based on current stats, NEVER stored in tags
- * 
- * Tags are only cache for persistent tasks. Source of truth = Nostr events.
- */
-
-import { useQuery } from '@tanstack/react-query';
-import { useNostr } from '@nostrify/react';
-import type { NostrEvent, NostrFilter } from '@nostrify/nostrify';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-
-import {
-  KIND_THEME_DEFINITION,
-  KIND_COLOR_MOMENT,
-  KIND_PROFILE_METADATA,
-  KIND_SHORT_TEXT_NOTE,
-  BLOBBI_POST_REQUIRED_HASHTAGS,
-  sanitizeToHashtag,
-  type HatchTask,
-  type TaskType,
-} from './useHatchTasks';
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-/** Kind for custom profile tabs event */
-export const KIND_PROFILE_TABS = 16769;
-
-/** Required themes for evolve task */
-export const EVOLVE_REQUIRED_THEMES = 3;
-
-/** Required color moments for evolve task */
-export const EVOLVE_REQUIRED_COLOR_MOMENTS = 3;
-
-/** Required posts for evolve task (lighter than hatch - just 1 evolve-specific post) */
-export const EVOLVE_REQUIRED_POSTS = 1;
-
-/** Required interactions for evolve task */
-export const EVOLVE_REQUIRED_INTERACTIONS = 21;
-
-/** Prefix text for Blobbi evolve post */
-export const BLOBBI_EVOLVE_POST_PREFIX = 'Hello Nostr! Posting to evolve';
-
-/** Stat threshold for evolve dynamic task (all stats >= 80) */
-export const EVOLVE_STAT_THRESHOLD = 80;
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-// Re-export task types for convenience
-export type { HatchTask as EvolveTask, TaskType };
-
-/**
- * Result of computing evolve tasks.
- */
-export interface EvolveTasksResult {
-  tasks: HatchTask[];
-  /** All persistent tasks are complete */
-  persistentTasksComplete: boolean;
-  /** Dynamic stat task is complete */
-  dynamicTaskComplete: boolean;
-  /** All tasks (persistent + dynamic) are complete - required to evolve */
-  allCompleted: boolean;
-  isLoading: boolean;
-  error: Error | null;
-  /** Refetch task progress */
-  refetch: () => void;
-}
-
-// ─── Helper Functions ─────────────────────────────────────────────────────────
-
-/**
- * Check if a post is a valid Blobbi evolve post.
- * Must contain the evolve prefix and all required hashtags including the Blobbi name.
- * 
- * @param event - The Nostr event to validate
- * @param blobbiName - The Blobbi's name (will be sanitized and checked as hashtag)
- */
-export function isValidEvolvePost(event: NostrEvent, blobbiName: string): boolean {
-  // Check content starts with evolve prefix
-  if (!event.content.startsWith(BLOBBI_EVOLVE_POST_PREFIX)) {
-    return false;
-  }
-  
-  // Check for required hashtags in tags
-  const hashtags = event.tags
-    .filter(tag => tag[0] === 't')
-    .map(tag => tag[1]?.toLowerCase());
-  
-  // All required hashtags must be present
-  const hasRequiredHashtags = BLOBBI_POST_REQUIRED_HASHTAGS.every(required => 
-    hashtags.includes(required.toLowerCase())
-  );
-  
-  if (!hasRequiredHashtags) {
-    return false;
-  }
-  
-  // Blobbi name hashtag must also be present
-  const blobbiHashtag = sanitizeToHashtag(blobbiName);
-  return hashtags.includes(blobbiHashtag);
-}
-
-// ─── Main Hook ────────────────────────────────────────────────────────────────
-
-/**
- * Hook to compute evolve task progress from Nostr events and current stats.
- * 
- * PERSISTENT TASKS (event-based, can be cached):
- * 1. Create 3 Themes (kind 36767)
- * 2. Create 3 Color Moments (kind 3367)
- * 3. Create 1 Evolve Post (kind 1) - lighter than hatch, evolve-specific
- * 4. Interact 21 times (tracked via companion.tasks cache)
- * 5. Edit Profile once (kind 0 profile metadata OR kind 16769 custom tabs)
- * 
- * DYNAMIC TASK (stat-based, NEVER cached):
- * 6. Maintain All Stats >= 80
- * 
- * @param companion - The Blobbi companion (must be in evolving state)
- * @param interactionCount - Current interaction count from companion tasks cache
- */
-export function useEvolveTasks(
-  companion: BlobbiCompanion | null,
-  interactionCount?: number
-): EvolveTasksResult {
-  const { user } = useCurrentUser();
-  const { nostr } = useNostr();
-  
-  const pubkey = user?.pubkey;
-  const stateStartedAt = companion?.stateStartedAt;
-  const isEvolving = companion?.state === 'evolving';
-  
-  // Query for all relevant events
-  const { data, isLoading, error, refetch } = useQuery({
-    queryKey: ['evolve-tasks', pubkey, stateStartedAt],
-    queryFn: async () => {
-      if (!pubkey || !stateStartedAt) {
-        return null;
-      }
-      
-      // Build filters for events we need
-      const filters: NostrFilter[] = [
-        // Theme definitions after start
-        {
-          kinds: [KIND_THEME_DEFINITION],
-          authors: [pubkey],
-          since: stateStartedAt,
-        },
-        // Color moments after start
-        {
-          kinds: [KIND_COLOR_MOMENT],
-          authors: [pubkey],
-          since: stateStartedAt,
-        },
-        // Posts after start (will filter for valid evolve posts)
-        {
-          kinds: [KIND_SHORT_TEXT_NOTE],
-          authors: [pubkey],
-          since: stateStartedAt,
-          limit: 50, // Only need 1 valid evolve post
-        },
-        // Custom profile tabs after start
-        {
-          kinds: [KIND_PROFILE_TABS],
-          authors: [pubkey],
-          since: stateStartedAt,
-          limit: 1, // Only need 1
-        },
-        // Profile metadata after start (for Blobbi shape check + profile edit mission)
-        {
-          kinds: [KIND_PROFILE_METADATA],
-          authors: [pubkey],
-          since: stateStartedAt,
-          limit: 1,
-        },
-      ];
-      
-      // Execute all queries
-      const events = await nostr.query(filters);
-      
-      // Categorize events
-      const themeEvents = events.filter(e => 
-        e.kind === KIND_THEME_DEFINITION && e.created_at >= stateStartedAt
-      );
-      
-      const colorMomentEvents = events.filter(e => 
-        e.kind === KIND_COLOR_MOMENT && e.created_at >= stateStartedAt
-      );
-      
-      const postEvents = events.filter(e => 
-        e.kind === KIND_SHORT_TEXT_NOTE && e.created_at >= stateStartedAt
-      );
-      
-      const profileTabsEvents = events.filter(e => 
-        e.kind === KIND_PROFILE_TABS && e.created_at >= stateStartedAt
-      );
-      
-      // Get latest profile after start
-      const profileEvents = events.filter(e => e.kind === KIND_PROFILE_METADATA);
-      const profileAfter = profileEvents
-        .filter(e => e.created_at >= stateStartedAt)
-        .sort((a, b) => b.created_at - a.created_at)[0];
-      
-      return {
-        themeEvents,
-        colorMomentEvents,
-        postEvents,
-        profileTabsEvents,
-        profileAfter,
-      };
-    },
-    enabled: !!pubkey && !!stateStartedAt && isEvolving,
-    staleTime: 30_000, // 30 seconds
-    refetchInterval: 60_000, // Refetch every minute
-  });
-  
-  // ─── Compute PERSISTENT Tasks ───
-  const tasks: HatchTask[] = [];
-  
-  // 1. Create 3 Themes (PERSISTENT)
-  const themeCount = data?.themeEvents?.length ?? 0;
-  const themesCompleted = themeCount >= EVOLVE_REQUIRED_THEMES;
-  tasks.push({
-    id: 'create_themes',
-    name: 'Create Themes',
-    description: `Create ${EVOLVE_REQUIRED_THEMES} custom themes`,
-    current: Math.min(themeCount, EVOLVE_REQUIRED_THEMES),
-    required: EVOLVE_REQUIRED_THEMES,
-    completed: themesCompleted,
-    type: 'persistent',
-    action: 'navigate',
-    actionTarget: '/themes',
-    actionLabel: 'Create Theme',
-  });
-  
-  // 2. Create 3 Color Moments (PERSISTENT)
-  const colorMomentCount = data?.colorMomentEvents?.length ?? 0;
-  const colorMomentsCompleted = colorMomentCount >= EVOLVE_REQUIRED_COLOR_MOMENTS;
-  tasks.push({
-    id: 'color_moments',
-    name: 'Color Moments',
-    description: `Share ${EVOLVE_REQUIRED_COLOR_MOMENTS} color moments on espy`,
-    current: Math.min(colorMomentCount, EVOLVE_REQUIRED_COLOR_MOMENTS),
-    required: EVOLVE_REQUIRED_COLOR_MOMENTS,
-    completed: colorMomentsCompleted,
-    type: 'persistent',
-    action: 'external_link',
-    actionTarget: 'https://espy.you/',
-    actionLabel: 'Open espy',
-  });
-  
-  // 3. Create 1 Evolve Post (PERSISTENT) - lighter than hatch
-  const blobbiName = companion?.name ?? '';
-  const validPosts = data?.postEvents?.filter(e => isValidEvolvePost(e, blobbiName)) ?? [];
-  const postCount = validPosts.length;
-  const postsCompleted = postCount >= EVOLVE_REQUIRED_POSTS;
-  tasks.push({
-    id: 'create_posts',
-    name: 'Share Evolution',
-    description: 'Post about your Blobbi evolving',
-    current: Math.min(postCount, EVOLVE_REQUIRED_POSTS),
-    required: EVOLVE_REQUIRED_POSTS,
-    completed: postsCompleted,
-    type: 'persistent',
-    action: 'open_modal',
-    actionTarget: 'blobbi_post',
-    actionLabel: 'Create Post',
-  });
-  
-  // 4. Interact 21 times (PERSISTENT)
-  const interactions = interactionCount ?? 0;
-  const interactionsCompleted = interactions >= EVOLVE_REQUIRED_INTERACTIONS;
-  tasks.push({
-    id: 'interactions',
-    name: 'Interact with Blobbi',
-    description: `Care for your Blobbi ${EVOLVE_REQUIRED_INTERACTIONS} times`,
-    current: Math.min(interactions, EVOLVE_REQUIRED_INTERACTIONS),
-    required: EVOLVE_REQUIRED_INTERACTIONS,
-    completed: interactionsCompleted,
-    type: 'persistent',
-    // No action - just interact with Blobbi
-  });
-  
-  // 5. Edit Profile once (PERSISTENT) — kind 0 profile metadata OR kind 16769 custom tabs
-  const hasTabsEdit = (data?.profileTabsEvents?.length ?? 0) >= 1;
-  const hasMetadataEdit = !!data?.profileAfter;
-  const hasProfileEdit = hasTabsEdit || hasMetadataEdit;
-  tasks.push({
-    id: 'edit_profile',
-    name: 'Edit Your Profile',
-    description: 'Update your profile info or customize your profile tabs',
-    current: hasProfileEdit ? 1 : 0,
-    required: 1,
-    completed: hasProfileEdit,
-    type: 'persistent',
-    action: 'navigate',
-    actionTarget: '/settings/profile',
-    actionLabel: 'Edit Profile',
-  });
-  
-  // ─── Compute DYNAMIC Task (stat-based, NEVER cached) ───
-  // 7. Maintain All Stats >= 80
-  const stats = companion?.stats ?? {};
-  const hunger = stats.hunger ?? 0;
-  const happiness = stats.happiness ?? 0;
-  const health = stats.health ?? 0;
-  const hygiene = stats.hygiene ?? 0;
-  const energy = stats.energy ?? 0;
-  
-  const statsOk = 
-    hunger >= EVOLVE_STAT_THRESHOLD &&
-    happiness >= EVOLVE_STAT_THRESHOLD &&
-    health >= EVOLVE_STAT_THRESHOLD &&
-    hygiene >= EVOLVE_STAT_THRESHOLD &&
-    energy >= EVOLVE_STAT_THRESHOLD;
-  
-  // Calculate minimum stat for progress display
-  const minStat = Math.min(hunger, happiness, health, hygiene, energy);
-  
-  tasks.push({
-    id: 'maintain_stats',
-    name: 'Peak Condition',
-    description: `Keep all stats above ${EVOLVE_STAT_THRESHOLD}`,
-    current: statsOk ? EVOLVE_STAT_THRESHOLD : minStat,
-    required: EVOLVE_STAT_THRESHOLD,
-    completed: statsOk,
-    type: 'dynamic', // CRITICAL: Never persist this task
-    // No action - just care for your Blobbi
-  });
-  
-  // ─── Compute Completion States ───
-  const persistentTasks = tasks.filter(t => t.type === 'persistent');
-  const dynamicTasks = tasks.filter(t => t.type === 'dynamic');
-  
-  const persistentTasksComplete = persistentTasks.every(t => t.completed);
-  const dynamicTaskComplete = dynamicTasks.every(t => t.completed);
-  const allCompleted = persistentTasksComplete && dynamicTaskComplete;
-  
-  return {
-    tasks,
-    persistentTasksComplete,
-    dynamicTaskComplete,
-    allCompleted,
-    isLoading,
-    error: error as Error | null,
-    refetch,
-  };
-}
-
-/**
- * Get the current interaction count for evolve from companion task cache.
- */
-export function getEvolveInteractionCount(companion: BlobbiCompanion | null): number {
-  if (!companion) return 0;
-  const interactionTask = companion.tasks.find(t => t.name === 'interactions');
-  return interactionTask?.value ?? 0;
-}

src/blobbi/actions/hooks/useHatchTasks.ts

@@ -1,364 +0,0 @@
-// src/blobbi/actions/hooks/useHatchTasks.ts
-
-/**
- * Hook to compute hatch task progress from Nostr events.
- * 
- * CRITICAL ARCHITECTURE:
- * - PERSISTENT TASKS: Based on Nostr events, can be cached in tags
- * 
- * Tags are only cache for persistent tasks. Source of truth = Nostr events.
- * All persistent tasks are computed dynamically from events with created_at >= state_started_at.
- * 
- * Note: Egg stats no longer decay, so there are no dynamic tasks for hatching.
- */
-
-import { useQuery } from '@tanstack/react-query';
-import { useNostr } from '@nostrify/react';
-import type { NostrEvent, NostrFilter } from '@nostrify/nostrify';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import type { BlobbiCompanion } from '@/blobbi/core/lib/blobbi';
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-/** Kind for theme definition events */
-export const KIND_THEME_DEFINITION = 36767;
-/** Kind for color moment events (espy.you) */
-export const KIND_COLOR_MOMENT = 3367;
-/** Kind for profile metadata */
-export const KIND_PROFILE_METADATA = 0;
-/** Kind for short text notes */
-export const KIND_SHORT_TEXT_NOTE = 1;
-
-/** Required interactions to complete the hatch interactions task */
-export const HATCH_REQUIRED_INTERACTIONS = 7;
-
-/** Required hashtags for the Blobbi post (excludes Blobbi name, which is dynamic) */
-export const BLOBBI_POST_REQUIRED_HASHTAGS = ['blobbi'];
-
-/** Prefix text for Blobbi hatch post (the Blobbi name is appended after this) */
-export const BLOBBI_POST_PREFIX = 'Posting to hatch';
-
-// Legacy export for backwards compatibility
-export const REQUIRED_INTERACTIONS = HATCH_REQUIRED_INTERACTIONS;
-
-/**
- * Sanitize a name into a valid hashtag format.
- * Must match the implementation in BlobbiPostModal.tsx.
- */
-export function sanitizeToHashtag(name: string): string {
-  return name
-    .toLowerCase()
-    // Remove emojis and special characters, keep letters, numbers, underscores
-    .replace(/[^\p{L}\p{N}_]/gu, '')
-    // Ensure it starts with a letter (prepend 'blobbi' if it starts with number)
-    .replace(/^(\d)/, 'blobbi$1')
-    // Limit length
-    .slice(0, 30)
-    // Fallback if empty
-    || 'myblobbi';
-}
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Task type classification.
- * - persistent: Based on Nostr events, can be cached in tags
- * - dynamic: Based on current stats, NEVER stored in tags
- */
-export type TaskType = 'persistent' | 'dynamic';
-
-/**
- * Individual task definition.
- */
-export interface HatchTask {
-  id: string;
-  name: string;
-  description: string;
-  /** Current progress value */
-  current: number;
-  /** Required value for completion */
-  required: number;
-  /** Whether the task is complete */
-  completed: boolean;
-  /** Task type - persistent (event-based) or dynamic (stat-based) */
-  type: TaskType;
-  /** Action to perform (if applicable) */
-  action?: 'navigate' | 'open_modal' | 'external_link';
-  /** Target for the action */
-  actionTarget?: string;
-  /** Button label */
-  actionLabel?: string;
-}
-
-/**
- * Result of computing hatch tasks.
- */
-export interface HatchTasksResult {
-  tasks: HatchTask[];
-  /** All persistent tasks are complete */
-  persistentTasksComplete: boolean;
-  /** Dynamic stat task is complete */
-  dynamicTaskComplete: boolean;
-  /** All tasks (persistent + dynamic) are complete - required to hatch */
-  allCompleted: boolean;
-  isLoading: boolean;
-  error: Error | null;
-  /** Refetch task progress */
-  refetch: () => void;
-}
-
-// ─── Helper Functions ─────────────────────────────────────────────────────────
-
-/**
- * Build the required phrase for a hatch post.
- * Format: "Posting to hatch {CapitalizedName} #blobbi"
- */
-export function buildHatchPhrase(blobbiName: string): string {
-  const capitalized = blobbiName.charAt(0).toUpperCase() + blobbiName.slice(1);
-  return `${BLOBBI_POST_PREFIX} ${capitalized} #blobbi`;
-}
-
-/**
- * Check if a post is a valid Blobbi hatch post.
- * The post must contain the required phrase: "Posting to hatch {Name} #blobbi"
- * The user may add extra text before or after it.
- * 
- * @param event - The Nostr event to validate
- * @param blobbiName - The Blobbi's name
- */
-export function isValidHatchPost(event: NostrEvent, blobbiName: string): boolean {
-  const phrase = buildHatchPhrase(blobbiName);
-
-  // The phrase must appear somewhere in the content
-  if (!event.content.includes(phrase)) {
-    return false;
-  }
-  
-  // Check for required hashtags in tags
-  const hashtags = event.tags
-    .filter(tag => tag[0] === 't')
-    .map(tag => tag[1]?.toLowerCase());
-  
-  // All required hashtags must be present as t tags
-  const hasRequiredHashtags = BLOBBI_POST_REQUIRED_HASHTAGS.every(required => 
-    hashtags.includes(required.toLowerCase())
-  );
-  
-  return hasRequiredHashtags;
-}
-
-// Legacy function name for backwards compatibility
-export const isValidBlobbiPost = isValidHatchPost;
-
-// ─── Main Hook ────────────────────────────────────────────────────────────────
-
-/**
- * Hook to compute hatch task progress from Nostr events and current stats.
- * 
- * PERSISTENT TASKS (event-based, can be cached):
- * 1. Create Theme (kind 36767) - ≥1 event after start
- * 2. Color Moment (kind 3367) - ≥1 event after start
- * 3. Create Post (kind 1) - ≥1 valid Blobbi hatch post after start
- * 4. Interactions - 7 total (tracked via companion.tasks cache)
- * 
- * Note: Egg stats no longer decay, so the "maintain stats" dynamic task
- * has been removed. The baby/adult evolve equivalent is still in useEvolveTasks.
- * 
- * @param companion - The Blobbi companion (must be incubating)
- * @param interactionCount - Current interaction count from companion tasks cache
- */
-export function useHatchTasks(
-  companion: BlobbiCompanion | null,
-  interactionCount?: number
-): HatchTasksResult {
-  const { user } = useCurrentUser();
-  const { nostr } = useNostr();
-  
-  const pubkey = user?.pubkey;
-  const stateStartedAt = companion?.stateStartedAt;
-  const isIncubating = companion?.state === 'incubating';
-  
-  // Query for all relevant events
-  const { data, isLoading, error, refetch } = useQuery({
-    queryKey: ['hatch-tasks', pubkey, stateStartedAt],
-    queryFn: async () => {
-      if (!pubkey || !stateStartedAt) {
-        return null;
-      }
-      
-      // Build filters for events we need
-      const filters: NostrFilter[] = [
-        // Theme definitions after start
-        {
-          kinds: [KIND_THEME_DEFINITION],
-          authors: [pubkey],
-          since: stateStartedAt,
-        },
-        // Color moments after start
-        {
-          kinds: [KIND_COLOR_MOMENT],
-          authors: [pubkey],
-          since: stateStartedAt,
-        },
-        // Posts after start (will filter for valid Blobbi posts)
-        {
-          kinds: [KIND_SHORT_TEXT_NOTE],
-          authors: [pubkey],
-          since: stateStartedAt,
-          limit: 50, // Reasonable limit
-        },
-        // Profile metadata - need both before and after start
-        // Get latest before start
-        {
-          kinds: [KIND_PROFILE_METADATA],
-          authors: [pubkey],
-          until: stateStartedAt,
-          limit: 1,
-        },
-        // Get latest after start
-        {
-          kinds: [KIND_PROFILE_METADATA],
-          authors: [pubkey],
-          since: stateStartedAt,
-          limit: 1,
-        },
-      ];
-      
-      // Execute all queries
-      const events = await nostr.query(filters);
-      
-      // Categorize events
-      const themeEvents = events.filter(e => 
-        e.kind === KIND_THEME_DEFINITION && e.created_at >= stateStartedAt
-      );
-      
-      const colorMomentEvents = events.filter(e => 
-        e.kind === KIND_COLOR_MOMENT && e.created_at >= stateStartedAt
-      );
-      
-      const postEvents = events.filter(e => 
-        e.kind === KIND_SHORT_TEXT_NOTE && e.created_at >= stateStartedAt
-      );
-      
-      // Separate profile events into before and after
-      const profileEvents = events.filter(e => e.kind === KIND_PROFILE_METADATA);
-      const profileBefore = profileEvents
-        .filter(e => e.created_at < stateStartedAt)
-        .sort((a, b) => b.created_at - a.created_at)[0];
-      const profileAfter = profileEvents
-        .filter(e => e.created_at >= stateStartedAt)
-        .sort((a, b) => b.created_at - a.created_at)[0];
-      
-      return {
-        themeEvents,
-        colorMomentEvents,
-        postEvents,
-        profileBefore,
-        profileAfter,
-      };
-    },
-    enabled: !!pubkey && !!stateStartedAt && isIncubating,
-    staleTime: 30_000, // 30 seconds
-    refetchInterval: 60_000, // Refetch every minute
-  });
-  
-  // ─── Compute PERSISTENT Tasks ───
-  const tasks: HatchTask[] = [];
-  
-  // 1. Create Theme (PERSISTENT)
-  const hasTheme = (data?.themeEvents?.length ?? 0) >= 1;
-  tasks.push({
-    id: 'create_theme',
-    name: 'Create Theme',
-    description: 'Create a custom theme for your profile',
-    current: hasTheme ? 1 : 0,
-    required: 1,
-    completed: hasTheme,
-    type: 'persistent',
-    action: 'navigate',
-    actionTarget: '/themes',
-    actionLabel: 'Create Theme',
-  });
-  
-  // 2. Color Moment (PERSISTENT)
-  const hasColorMoment = (data?.colorMomentEvents?.length ?? 0) >= 1;
-  tasks.push({
-    id: 'color_moment',
-    name: 'Color Moment',
-    description: 'Share a color moment on espy',
-    current: hasColorMoment ? 1 : 0,
-    required: 1,
-    completed: hasColorMoment,
-    type: 'persistent',
-    action: 'external_link',
-    actionTarget: 'https://espy.you/',
-    actionLabel: 'Open espy',
-  });
-  
-  // 3. Create Post (PERSISTENT)
-  const blobbiName = companion?.name ?? '';
-  const validPosts = data?.postEvents?.filter(e => isValidHatchPost(e, blobbiName)) ?? [];
-  const hasValidPost = validPosts.length >= 1;
-  tasks.push({
-    id: 'create_post',
-    name: 'Create Post',
-    description: 'Share a post about hatching your Blobbi',
-    current: hasValidPost ? 1 : 0,
-    required: 1,
-    completed: hasValidPost,
-    type: 'persistent',
-    action: 'open_modal',
-    actionTarget: 'blobbi_post',
-    actionLabel: 'Create Post',
-  });
-  
-  // 5. Interactions (PERSISTENT)
-  const interactions = interactionCount ?? 0;
-  const interactionsCompleted = interactions >= HATCH_REQUIRED_INTERACTIONS;
-  tasks.push({
-    id: 'interactions',
-    name: 'Interact with Blobbi',
-    description: `Care for your Blobbi ${HATCH_REQUIRED_INTERACTIONS} times`,
-    current: Math.min(interactions, HATCH_REQUIRED_INTERACTIONS),
-    required: HATCH_REQUIRED_INTERACTIONS,
-    completed: interactionsCompleted,
-    type: 'persistent',
-    // No action - just interact with Blobbi
-  });
-  
-  // ─── Compute Completion States ───
-  const persistentTasks = tasks.filter(t => t.type === 'persistent');
-  const dynamicTasks = tasks.filter(t => t.type === 'dynamic');
-  
-  const persistentTasksComplete = persistentTasks.every(t => t.completed);
-  const dynamicTaskComplete = dynamicTasks.every(t => t.completed);
-  const allCompleted = persistentTasksComplete && dynamicTaskComplete;
-  
-  return {
-    tasks,
-    persistentTasksComplete,
-    dynamicTaskComplete,
-    allCompleted,
-    isLoading,
-    error: error as Error | null,
-    refetch,
-  };
-}
-
-/**
- * Get the current interaction count from companion task cache.
- */
-export function getInteractionCount(companion: BlobbiCompanion | null): number {
-  if (!companion) return 0;
-  const interactionTask = companion.tasks.find(t => t.name === 'interactions');
-  return interactionTask?.value ?? 0;
-}
-
-/**
- * Filter tasks to only persistent tasks (for tag sync).
- * CRITICAL: Dynamic tasks must NEVER be synced to tags.
- */
-export function filterPersistentTasks(tasks: HatchTask[]): HatchTask[] {
-  return tasks.filter(t => t.type === 'persistent');
-}

src/blobbi/actions/hooks/useRerollMission.ts

@@ -1,159 +0,0 @@
-/**
- * useRerollMission - Hook for rerolling daily missions
- * 
- * Handles:
- * - Replacing a mission with a new one from the pool
- * - Tracking reroll usage (max 3 per day)
- * - Respecting stage-based mission filtering
- * - Persisting state to localStorage
- */
-
-import { useMutation } from '@tanstack/react-query';
-
-import { useCurrentUser } from '@/hooks/useCurrentUser';
-import { toast } from '@/hooks/useToast';
-
-import {
-  type DailyMissionsState,
-  type DailyMission,
-  type BlobbiStage,
-  getTodayDateString,
-  needsDailyReset,
-  createDailyMissionsState,
-  rerollMission,
-  canRerollMission,
-  getRerollsRemaining,
-} from '../lib/daily-missions';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export interface RerollMissionRequest {
-  missionId: string;
-  availableStages?: BlobbiStage[];
-}
-
-export interface RerollMissionResult {
-  oldMissionId: string;
-  newMission: DailyMission;
-  rerollsRemaining: number;
-}
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const STORAGE_KEY = 'blobbi:daily-missions';
-
-// ─── Storage Utilities ────────────────────────────────────────────────────────
-
-function readMissionsState(): DailyMissionsState | null {
-  try {
-    const stored = localStorage.getItem(STORAGE_KEY);
-    if (!stored) return null;
-    
-    const state = JSON.parse(stored) as DailyMissionsState;
-    
-    // Migration: ensure rerollsRemaining is set for old state
-    if (state.rerollsRemaining === undefined) {
-      state.rerollsRemaining = 3; // MAX_DAILY_REROLLS
-    }
-    
-    return state;
-  } catch {
-    return null;
-  }
-}
-
-function writeMissionsState(state: DailyMissionsState): void {
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(state));
-  } catch (error) {
-    console.warn('[useRerollMission] Failed to write state:', error);
-  }
-}
-
-// ─── Hook ─────────────────────────────────────────────────────────────────────
-
-/**
- * Hook to reroll a daily mission.
- * 
- * Replaces the specified mission with a new one from the pool,
- * respecting stage-based filtering and avoiding duplicates.
- */
-export function useRerollMission() {
-  const { user } = useCurrentUser();
-
-  return useMutation({
-    mutationFn: async ({ missionId, availableStages }: RerollMissionRequest): Promise<RerollMissionResult> => {
-      if (!user?.pubkey) {
-        throw new Error('You must be logged in to reroll missions');
-      }
-
-      // Read current missions state from localStorage
-      let missionsState = readMissionsState();
-      
-      // Ensure we have valid state for today
-      if (needsDailyReset(missionsState)) {
-        const previousCoins = missionsState?.totalCoinsEarned ?? 0;
-        missionsState = createDailyMissionsState(getTodayDateString(), user.pubkey, previousCoins, availableStages);
-      }
-
-      // Check if reroll is allowed
-      if (!canRerollMission(missionsState!, missionId)) {
-        const rerollsLeft = getRerollsRemaining(missionsState!);
-        if (rerollsLeft <= 0) {
-          throw new Error('No rerolls remaining today');
-        }
-        
-        const mission = missionsState!.missions.find(m => m.id === missionId);
-        if (mission?.completed || mission?.claimed) {
-          throw new Error('Cannot reroll completed or claimed missions');
-        }
-        
-        throw new Error('Cannot reroll this mission');
-      }
-
-      // Perform the reroll
-      const result = rerollMission(missionsState!, missionId, availableStages);
-      
-      if (!result) {
-        throw new Error('No replacement missions available. All alternative missions may already be in your daily list.');
-      }
-
-      // Persist the updated state
-      writeMissionsState(result.state);
-
-      // Dispatch event for React components to re-render
-      window.dispatchEvent(new CustomEvent('daily-missions-updated', { 
-        detail: { 
-          missionId, 
-          rerolled: true,
-          newMissionId: result.newMission.id,
-        } 
-      }));
-
-      return {
-        oldMissionId: missionId,
-        newMission: result.newMission,
-        rerollsRemaining: getRerollsRemaining(result.state),
-      };
-    },
-    onSuccess: ({ newMission, rerollsRemaining }) => {
-      const rerollText = rerollsRemaining === 1 
-        ? '1 reroll left' 
-        : rerollsRemaining === 0 
-          ? 'No rerolls left'
-          : `${rerollsRemaining} rerolls left`;
-      
-      toast({
-        title: 'Mission Replaced',
-        description: `New mission: ${newMission.title}. ${rerollText}.`,
-      });
-    },
-    onError: (error: Error) => {
-      toast({
-        title: 'Failed to Reroll',
-        description: error.message,
-        variant: 'destructive',
-      });
-    },
-  });
-}

src/blobbi/actions/index.ts

@@ -1,188 +0,0 @@
-// src/blobbi/actions/index.ts
-
-// Components
-export { BlobbiActionsModal } from './components/BlobbiActionsModal';
-export { BlobbiActionInventoryModal } from './components/BlobbiActionInventoryModal';
-export { PlayMusicModal } from './components/PlayMusicModal';
-export { SingModal } from './components/SingModal';
-export { InlineMusicPlayer } from './components/InlineMusicPlayer';
-export { InlineSingCard } from './components/InlineSingCard';
-export { HatchTasksPanel } from './components/HatchTasksPanel';
-export { TasksPanel } from './components/TasksPanel';
-export { BlobbiPostModal } from './components/BlobbiPostModal';
-export { StartIncubationDialog } from './components/StartIncubationDialog';
-export { StartEvolutionDialog } from './components/StartEvolutionDialog';
-export { BlobbiMissionsModal } from './components/BlobbiMissionsModal';
-
-// Hooks
-export { useBlobbiUseInventoryItem } from './hooks/useBlobbiUseInventoryItem';
-export type { UseItemRequest, UseItemResult, UseBlobbiUseInventoryItemParams } from './hooks/useBlobbiUseInventoryItem';
-
-export { useBlobbiHatch, useBlobbiEvolve } from './hooks/useBlobbiStageTransition';
-export type { 
-  UseBlobbiStageTransitionParams, 
-  StageTransitionResult,
-  CanonicalActionResult,
-} from './hooks/useBlobbiStageTransition';
-
-export { 
-  useStartIncubation, 
-  useStopIncubation, 
-  useStartEvolution,
-  useStopEvolution,
-  useSyncTaskCompletions,
-} from './hooks/useBlobbiIncubation';
-export type {
-  StartIncubationMode,
-  StartIncubationRequest,
-  UseStartIncubationParams,
-  StartIncubationResult,
-  UseStopIncubationParams,
-  StopIncubationResult,
-  UseStartEvolutionParams,
-  StartEvolutionResult,
-  UseStopEvolutionParams,
-  StopEvolutionResult,
-  UseSyncTaskCompletionsParams,
-  TaskCompletionToSync,
-} from './hooks/useBlobbiIncubation';
-
-export { useActiveTaskProcess, filterPersistentTasks as filterPersistentTasksFromProcess, filterDynamicTasks } from './hooks/useActiveTaskProcess';
-export type { TaskProcessType, TaskProcessConfig, ActiveTaskProcessResult } from './hooks/useActiveTaskProcess';
-
-export { 
-  useHatchTasks, 
-  getInteractionCount,
-  filterPersistentTasks,
-  sanitizeToHashtag,
-  KIND_THEME_DEFINITION,
-  KIND_COLOR_MOMENT,
-  HATCH_REQUIRED_INTERACTIONS,
-  REQUIRED_INTERACTIONS, // Legacy export
-  BLOBBI_POST_PREFIX,
-  BLOBBI_POST_REQUIRED_HASHTAGS,
-} from './hooks/useHatchTasks';
-export type { HatchTask, HatchTasksResult, TaskType } from './hooks/useHatchTasks';
-
-export {
-  useEvolveTasks,
-  getEvolveInteractionCount,
-  isValidEvolvePost,
-  KIND_PROFILE_TABS,
-  EVOLVE_REQUIRED_THEMES,
-  EVOLVE_REQUIRED_COLOR_MOMENTS,
-  EVOLVE_REQUIRED_POSTS,
-  EVOLVE_REQUIRED_INTERACTIONS,
-  EVOLVE_STAT_THRESHOLD,
-  BLOBBI_EVOLVE_POST_PREFIX,
-} from './hooks/useEvolveTasks';
-export type { EvolveTasksResult } from './hooks/useEvolveTasks';
-
-export { useBlobbiDirectAction, DIRECT_ACTION_HAPPINESS_EFFECTS } from './hooks/useBlobbiDirectAction';
-export type { DirectActionRequest, DirectActionResult, UseBlobbiDirectActionParams } from './hooks/useBlobbiDirectAction';
-
-export { useAudioPlayback } from './hooks/useAudioPlayback';
-export type { PlaybackState, PlaybackError, UseAudioPlaybackOptions, UseAudioPlaybackReturn } from './hooks/useAudioPlayback';
-
-// Track catalog
-export { 
-  BLOBBI_TRACK_CATALOG,
-  getAllTracks,
-  getTrackById,
-  formatTrackDuration,
-  type BlobbiTrack,
-} from './lib/blobbi-track-catalog';
-
-// Activity state
-export {
-  createMusicActivity,
-  createSingActivity,
-  createNoActivity,
-  type InlineActivityType,
-  type InlineActivityState,
-  type MusicActivityState,
-  type SingActivityState,
-  type NoActivityState,
-  type BlobbiReactionState,
-  type SelectedTrack,
-} from './lib/blobbi-activity-state';
-
-// Re-export stat bounds from canonical source
-export { STAT_MIN, STAT_MAX } from '@/blobbi/core/lib/blobbi';
-
-// Utilities
-export {
-  // Types
-  type InventoryAction,
-  type DirectAction,
-  type BlobbiAction,
-  type ResolvedInventoryItem,
-  type EggStatPreview,
-  type ItemUsabilityResult,
-  type IncrementInteractionResult,
-  // Constants
-  ACTION_TO_ITEM_TYPE,
-  ACTION_METADATA,
-  DIRECT_ACTION_METADATA,
-  ALL_ACTION_METADATA,
-  GENERAL_ITEM_USABLE_STAGES,
-  EGG_ALLOWED_ACTIONS,
-  EGG_ALLOWED_INVENTORY_ACTIONS,
-  EGG_ALLOWED_DIRECT_ACTIONS,
-  EGG_VISIBLE_INVENTORY_ACTIONS,
-  EGG_VISIBLE_ACTIONS,
-  SHELL_REPAIR_KIT_ID,
-  // Functions
-  clampStat,
-  applyStat,
-  applyItemEffects,
-  filterInventoryByAction,
-  decrementStorageItem,
-  canUseAction,
-  canUseDirectAction,
-  isActionVisibleForStage,
-  canUseInventoryItems,
-  getStageRestrictionMessage,
-  previewStatChanges,
-  previewMedicineForEgg,
-  previewCleanForEgg,
-  hasMedicineEffectForEgg,
-  hasHygieneEffectForEgg,
-  canUseItemForStage,
-  getActionForItem,
-  incrementInteractionTaskTags,
-} from './lib/blobbi-action-utils';
-
-// Daily Missions
-export { useDailyMissions } from './hooks/useDailyMissions';
-export type { UseDailyMissionsResult } from './hooks/useDailyMissions';
-export { useClaimMissionReward } from './hooks/useClaimMissionReward';
-export type { ClaimMissionRequest, ClaimMissionResult } from './hooks/useClaimMissionReward';
-export {
-  trackDailyMissionProgress,
-  trackMultipleDailyMissionActions,
-} from './lib/daily-mission-tracker';
-export type {
-  DailyMission,
-  DailyMissionAction,
-  DailyMissionDefinition,
-  DailyMissionsState,
-} from './lib/daily-missions';
-
-// Streak tracking
-export {
-  calculateStreakUpdate,
-  getStreakTagUpdates,
-  needsStreakUpdate,
-  getStreakStatus,
-} from './lib/blobbi-streak';
-export type {
-  StreakUpdateResult,
-  StreakTagUpdates,
-} from './lib/blobbi-streak';
-
-export { useBlobbiCareActivity } from './hooks/useBlobbiCareActivity';
-export type {
-  UseBlobbiCareActivityParams,
-  CareActivityResult,
-} from './hooks/useBlobbiCareActivity';

src/blobbi/actions/lib/blobbi-action-utils.ts

@@ -1,632 +0,0 @@
-// src/blobbi/actions/lib/blobbi-action-utils.ts
-
-import { STAT_MIN, STAT_MAX, type BlobbiCompanion, type BlobbiStats, type StorageItem } from '@/blobbi/core/lib/blobbi';
-import type { ItemEffect, ShopItemCategory } from '@/blobbi/shop/types/shop.types';
-import { getShopItemById, getLiveShopItems } from '@/blobbi/shop/lib/blobbi-shop-items';
-
-// ─── Action Types ─────────────────────────────────────────────────────────────
-
-/**
- * Item-based care actions (use a shop catalog item on the companion)
- */
-export type InventoryAction = 'feed' | 'play' | 'clean' | 'medicine';
-
-/**
- * Direct actions that don't use items.
- * These actions affect stats directly without selecting a shop item.
- */
-export type DirectAction = 'play_music' | 'sing';
-
-/**
- * All Blobbi actions (item-based + direct)
- */
-export type BlobbiAction = InventoryAction | DirectAction;
-
-/**
- * Mapping from action type to allowed item categories
- */
-export const ACTION_TO_ITEM_TYPE: Record<InventoryAction, ShopItemCategory> = {
-  feed: 'food',
-  play: 'toy',
-  clean: 'hygiene',
-  medicine: 'medicine',
-};
-
-/**
- * Action metadata for UI display (item-based care actions)
- */
-export const ACTION_METADATA: Record<InventoryAction, { label: string; description: string; icon: string }> = {
-  feed: {
-    label: 'Feed',
-    description: 'Feed your Blobbi',
-    icon: '🍎',
-  },
-  play: {
-    label: 'Play',
-    description: 'Play with your Blobbi',
-    icon: '⚽',
-  },
-  clean: {
-    label: 'Clean',
-    description: 'Clean your Blobbi',
-    icon: '🧼',
-  },
-  medicine: {
-    label: 'Medicine',
-    description: 'Heal your Blobbi',
-    icon: '💊',
-  },
-};
-
-/**
- * Action metadata for direct actions (no item required)
- */
-export const DIRECT_ACTION_METADATA: Record<DirectAction, { label: string; description: string; icon: string }> = {
-  play_music: {
-    label: 'Play Music',
-    description: 'Play music for your Blobbi',
-    icon: '🎵',
-  },
-  sing: {
-    label: 'Sing',
-    description: 'Sing to your Blobbi',
-    icon: '🎤',
-  },
-};
-
-/**
- * Combined action metadata for all action types
- */
-export const ALL_ACTION_METADATA: Record<BlobbiAction, { label: string; description: string; icon: string }> = {
-  ...ACTION_METADATA,
-  ...DIRECT_ACTION_METADATA,
-};
-
-// ─── Stat Helpers ─────────────────────────────────────────────────────────────
-// STAT_MIN and STAT_MAX are imported from @/lib/blobbi (single source of truth)
-
-/**
- * Clamp a stat value between STAT_MIN (1) and STAT_MAX (100).
- * Safe for undefined values (returns STAT_MIN).
- * 
- * The minimum of 1 (instead of 0) ensures:
- * - Blobbi is never in an unrecoverable state
- * - Visual feedback shows critical state without being "dead"
- * - Recovery is always possible with any healing item
- */
-export function clampStat(value: number | undefined): number {
-  if (value === undefined) return STAT_MIN;
-  return Math.max(STAT_MIN, Math.min(STAT_MAX, Math.round(value)));
-}
-
-/**
- * Apply a delta to a stat, clamping the result to STAT_MIN-STAT_MAX.
- */
-export function applyStat(current: number | undefined, delta: number): number {
-  const currentValue = current ?? STAT_MIN;
-  return clampStat(currentValue + delta);
-}
-
-/**
- * Apply item effects to current stats.
- * Returns a new partial stats object with all affected stats clamped.
- * Only modifies stats that have corresponding effects.
- */
-export function applyItemEffects(
-  currentStats: Partial<BlobbiStats>,
-  effects: ItemEffect
-): Partial<BlobbiStats> {
-  const newStats: Partial<BlobbiStats> = { ...currentStats };
-
-  if (effects.hunger !== undefined) {
-    newStats.hunger = applyStat(currentStats.hunger, effects.hunger);
-  }
-  if (effects.happiness !== undefined) {
-    newStats.happiness = applyStat(currentStats.happiness, effects.happiness);
-  }
-  if (effects.energy !== undefined) {
-    newStats.energy = applyStat(currentStats.energy, effects.energy);
-  }
-  if (effects.hygiene !== undefined) {
-    newStats.hygiene = applyStat(currentStats.hygiene, effects.hygiene);
-  }
-  if (effects.health !== undefined) {
-    newStats.health = applyStat(currentStats.health, effects.health);
-  }
-
-  return newStats;
-}
-
-// ─── Egg-Specific Item Helpers ────────────────────────────────────────────────
-
-/**
- * The Shell Repair Kit is a special medicine item only usable by eggs.
- */
-export const SHELL_REPAIR_KIT_ID = 'med_shell_repair';
-
-/**
- * Result of checking if an item can be used by a specific Blobbi stage.
- */
-export interface ItemUsabilityResult {
-  canUse: boolean;
-  reason?: string;
-}
-
-/**
- * Check if a specific item can be used by a companion at the given stage.
- * 
- * This is the centralized item usability logic:
- * - Shell Repair Kit: Only usable by eggs
- * - Food items: Only usable by baby/adult (not eggs)
- * - Toy items: Only usable by baby/adult (not eggs)
- * - Medicine items (except Shell Repair Kit): Usable by all stages with health effect
- * - Hygiene items: Usable by all stages
- * 
- * @param itemId - The shop item ID
- * @param stage - The companion's life stage
- * @returns Object with canUse boolean and optional reason string
- */
-export function canUseItemForStage(
-  itemId: string,
-  stage: 'egg' | 'baby' | 'adult'
-): ItemUsabilityResult {
-  const shopItem = getShopItemById(itemId);
-  if (!shopItem) {
-    return { canUse: false, reason: 'Item not found' };
-  }
-
-  const isEgg = stage === 'egg';
-
-  // Shell Repair Kit special case: only for eggs
-  if (itemId === SHELL_REPAIR_KIT_ID) {
-    if (!isEgg) {
-      return { canUse: false, reason: 'Only usable for eggs' };
-    }
-    return { canUse: true };
-  }
-
-  // Food items: not usable by eggs
-  if (shopItem.type === 'food') {
-    if (isEgg) {
-      return { canUse: false, reason: 'Eggs cannot eat food' };
-    }
-    return { canUse: true };
-  }
-
-  // Toy items: not usable by eggs
-  if (shopItem.type === 'toy') {
-    if (isEgg) {
-      return { canUse: false, reason: 'Eggs cannot use toys' };
-    }
-    return { canUse: true };
-  }
-
-  // Medicine items (except Shell Repair Kit): check for health effect
-  if (shopItem.type === 'medicine') {
-    if (!hasMedicineEffectForEgg(shopItem.effect)) {
-      return { canUse: false, reason: 'This medicine has no effect' };
-    }
-    return { canUse: true };
-  }
-
-  // Hygiene items: all stages can use
-  if (shopItem.type === 'hygiene') {
-    if (!hasHygieneEffectForEgg(shopItem.effect) && !hasHappinessEffectForEgg(shopItem.effect)) {
-      return { canUse: false, reason: 'This item has no cleaning effect' };
-    }
-    return { canUse: true };
-  }
-
-  return { canUse: true };
-}
-
-/**
- * Get the action type for a given item.
- */
-export function getActionForItem(itemId: string): InventoryAction | null {
-  const shopItem = getShopItemById(itemId);
-  if (!shopItem) return null;
-
-  const typeToAction: Record<string, InventoryAction> = {
-    food: 'feed',
-    toy: 'play',
-    hygiene: 'clean',
-    medicine: 'medicine',
-  };
-
-  return typeToAction[shopItem.type] ?? null;
-}
-
-/**
- * Check if a medicine item has any effect on an egg.
- * 
- * Eggs use the standard 3-stat model:
- * - health
- * - hygiene  
- * - happiness
- * 
- * Medicine with a health effect will directly affect the egg's health stat.
- */
-export function hasMedicineEffectForEgg(effects: ItemEffect | undefined): boolean {
-  if (!effects) return false;
-  return effects.health !== undefined && effects.health !== 0;
-}
-
-/**
- * Check if a hygiene item has any effect on an egg.
- * Hygiene items with a hygiene effect will directly affect the egg's hygiene stat.
- */
-export function hasHygieneEffectForEgg(effects: ItemEffect | undefined): boolean {
-  if (!effects) return false;
-  return effects.hygiene !== undefined && effects.hygiene !== 0;
-}
-
-/**
- * Check if an item has a happiness effect for an egg.
- * Some items (like bubble bath) give happiness bonus in addition to primary effects.
- */
-export function hasHappinessEffectForEgg(effects: ItemEffect | undefined): boolean {
-  if (!effects) return false;
-  return effects.happiness !== undefined && effects.happiness !== 0;
-}
-
-// ─── Item Helpers ─────────────────────────────────────────────────────────────
-
-/**
- * Resolved catalog item with shop metadata
- */
-export interface ResolvedInventoryItem {
-  itemId: string;
-  quantity: number;
-  name: string;
-  icon: string;
-  type: ShopItemCategory;
-  effect?: ItemEffect;
-}
-
-/**
- * Options for filtering catalog items by action
- */
-export interface FilterInventoryOptions {
-  /** Companion stage - used to filter items by egg-compatible effects */
-  stage?: 'egg' | 'baby' | 'adult';
-}
-
-/**
- * Get all available items for an action type from the shop catalog.
- * Items are abilities/tools — no inventory ownership is required.
- * 
- * Filtering rules:
- * - Only items matching the action's item type are included
- * - Shell Repair Kit only appears in medicine modal for eggs
- * - For eggs: only items with egg-compatible effects are returned
- *   - medicine action: only items with health effect
- *   - clean action: only items with hygiene or happiness effect
- */
-export function filterInventoryByAction(
-  _storage: StorageItem[],
-  action: InventoryAction,
-  options: FilterInventoryOptions = {}
-): ResolvedInventoryItem[] {
-  const allowedType = ACTION_TO_ITEM_TYPE[action];
-  const result: ResolvedInventoryItem[] = [];
-  const isEgg = options.stage === 'egg';
-  const allItems = getLiveShopItems();
-
-  for (const shopItem of allItems) {
-    if (shopItem.type !== allowedType) continue;
-
-    // Shell Repair Kit: only show for eggs in medicine modal
-    if (shopItem.id === SHELL_REPAIR_KIT_ID && !isEgg) {
-      continue;
-    }
-
-    // For eggs, filter items by egg-compatible effects
-    if (isEgg) {
-      if (action === 'medicine' && !hasMedicineEffectForEgg(shopItem.effect)) {
-        continue; // Skip medicine without health effect
-      }
-      if (action === 'clean' && !hasHygieneEffectForEgg(shopItem.effect) && !hasHappinessEffectForEgg(shopItem.effect)) {
-        continue; // Skip hygiene items without hygiene or happiness effect
-      }
-    }
-
-    result.push({
-      itemId: shopItem.id,
-      quantity: Infinity,
-      name: shopItem.name,
-      icon: shopItem.icon,
-      type: shopItem.type,
-      effect: shopItem.effect,
-    });
-  }
-
-  return result;
-}
-
-/**
- * Decrement item quantity in storage array.
- * If quantity becomes 0, removes the item entirely.
- * Returns a new storage array (immutable).
- */
-export function decrementStorageItem(
-  storage: StorageItem[],
-  itemId: string,
-  amount = 1
-): StorageItem[] {
-  const result: StorageItem[] = [];
-
-  for (const item of storage) {
-    if (item.itemId !== itemId) {
-      result.push(item);
-      continue;
-    }
-    const newQuantity = item.quantity - amount;
-    if (newQuantity > 0) {
-      result.push({ ...item, quantity: newQuantity });
-    }
-    // If newQuantity <= 0, we don't add it (remove item)
-  }
-
-  return result;
-}
-
-// ─── Stage Restriction Helpers ────────────────────────────────────────────────
-
-/**
- * Stages that can use general items (food, toys, hygiene)
- */
-export const GENERAL_ITEM_USABLE_STAGES = ['baby', 'adult'] as const;
-
-/**
- * Inventory actions that are allowed for eggs.
- * Eggs can use: medicine (health), clean (hygiene)
- */
-export const EGG_ALLOWED_INVENTORY_ACTIONS: InventoryAction[] = ['medicine', 'clean'];
-
-/**
- * Direct actions that are allowed for eggs.
- * All direct actions work on eggs.
- */
-export const EGG_ALLOWED_DIRECT_ACTIONS: DirectAction[] = ['play_music', 'sing'];
-
-/**
- * Inventory actions visible in the egg UI.
- * Note: feed, play, sleep are hidden in the UI for eggs but not hard-blocked.
- */
-export const EGG_VISIBLE_INVENTORY_ACTIONS: InventoryAction[] = ['clean', 'medicine'];
-
-/**
- * All actions visible in the egg UI.
- */
-export const EGG_VISIBLE_ACTIONS: BlobbiAction[] = ['clean', 'medicine', 'play_music', 'sing'];
-
-/**
- * @deprecated Use EGG_ALLOWED_INVENTORY_ACTIONS instead
- */
-export const EGG_ALLOWED_ACTIONS = EGG_ALLOWED_INVENTORY_ACTIONS;
-
-/**
- * Check if a companion can use a specific item action.
- * 
- * Note: This function no longer hard-blocks egg actions at the domain layer.
- * UI visibility is handled separately by `isActionVisibleForStage()`.
- * The domain layer allows all actions - UI chooses what to show.
- */
-export function canUseAction(_companion: BlobbiCompanion, _action: InventoryAction): boolean {
-  // All stages can technically use all item actions at the domain layer.
-  // UI filtering determines what actions are shown to users.
-  return true;
-}
-
-/**
- * Check if a companion can use a specific direct action.
- * Direct actions (play_music, sing) are available for all stages.
- */
-export function canUseDirectAction(_companion: BlobbiCompanion, _action: DirectAction): boolean {
-  // All stages can use direct actions
-  return true;
-}
-
-/**
- * Check if an action should be visible in the UI for a given stage.
- * This is for UI filtering only - some actions are hidden but not blocked.
- */
-export function isActionVisibleForStage(stage: 'egg' | 'baby' | 'adult', action: BlobbiAction): boolean {
-  if (stage === 'egg') {
-    return EGG_VISIBLE_ACTIONS.includes(action);
-  }
-  return true; // baby and adult see all actions
-}
-
-/**
- * Check if a companion can use general items (feed, play, clean).
- * Eggs cannot use food, toys, or hygiene items.
- * @deprecated Use canUseAction(companion, action) for action-specific checks
- */
-export function canUseInventoryItems(companion: BlobbiCompanion): boolean {
-  return GENERAL_ITEM_USABLE_STAGES.includes(companion.stage as typeof GENERAL_ITEM_USABLE_STAGES[number]);
-}
-
-/**
- * Get a user-friendly message explaining why an action can't be used.
- */
-export function getStageRestrictionMessage(companion: BlobbiCompanion, action?: InventoryAction): string | null {
-  if (companion.stage === 'egg') {
-    if (action && EGG_ALLOWED_INVENTORY_ACTIONS.includes(action)) {
-      return null; // Medicine and clean are allowed for eggs
-    }
-    return 'Eggs cannot use this item. Wait for your Blobbi to hatch!';
-  }
-  return null;
-}
-
-// ─── Stats Preview ────────────────────────────────────────────────────────────
-
-/**
- * Preview stats after applying an item's effects.
- * Useful for showing the user what will happen before confirming.
- */
-export function previewStatChanges(
-  currentStats: Partial<BlobbiStats>,
-  effects: ItemEffect | undefined
-): Array<{ stat: keyof BlobbiStats; current: number; after: number; delta: number }> {
-  if (!effects) return [];
-
-  const changes: Array<{ stat: keyof BlobbiStats; current: number; after: number; delta: number }> = [];
-  const statKeys: (keyof BlobbiStats)[] = ['hunger', 'happiness', 'energy', 'hygiene', 'health'];
-
-  for (const stat of statKeys) {
-    const delta = effects[stat];
-    if (delta !== undefined && delta !== 0) {
-      const current = currentStats[stat] ?? 0;
-      const after = clampStat(current + delta);
-      changes.push({ stat, current, after, delta });
-    }
-  }
-
-  return changes;
-}
-
-/**
- * Preview stat change for an egg.
- * Eggs use the 3-stat model: health, hygiene, happiness.
- */
-export type EggStatPreview = { stat: 'health' | 'hygiene' | 'happiness'; current: number; after: number; delta: number };
-
-/**
- * Preview medicine effects for an egg.
- * Medicine directly affects the egg's health stat.
- */
-export function previewMedicineForEgg(
-  currentHealth: number | undefined,
-  effects: ItemEffect | undefined
-): EggStatPreview[] {
-  if (!effects || effects.health === undefined || effects.health === 0) {
-    return [];
-  }
-
-  const current = currentHealth ?? 100;
-  const delta = effects.health;
-  const after = clampStat(current + delta);
-
-  return [{ stat: 'health', current, after, delta }];
-}
-
-/**
- * Preview clean (hygiene) effects for an egg.
- * Hygiene items directly affect the egg's hygiene stat.
- * May also include happiness bonus if the item has one.
- */
-export function previewCleanForEgg(
-  currentStats: { hygiene?: number; happiness?: number },
-  effects: ItemEffect | undefined
-): EggStatPreview[] {
-  if (!effects) return [];
-  
-  const results: EggStatPreview[] = [];
-  
-  // Hygiene effect
-  if (effects.hygiene !== undefined && effects.hygiene !== 0) {
-    const current = currentStats.hygiene ?? 100;
-    const delta = effects.hygiene;
-    const after = clampStat(current + delta);
-    results.push({ stat: 'hygiene', current, after, delta });
-  }
-  
-  // Happiness bonus (some hygiene items like bubble bath give happiness)
-  if (effects.happiness !== undefined && effects.happiness !== 0) {
-    const current = currentStats.happiness ?? 100;
-    const delta = effects.happiness;
-    const after = clampStat(current + delta);
-    results.push({ stat: 'happiness', current, after, delta });
-  }
-  
-  return results;
-}
-
-// ─── Interaction Task Helpers ─────────────────────────────────────────────────
-
-/** Enable debug logging in development only */
-const DEBUG_INTERACTION_TASK = import.meta.env.DEV;
-
-/**
- * Result of incrementing interaction task tags
- */
-export interface IncrementInteractionResult {
-  /** Updated tags array */
-  updatedTags: string[][];
-  /** New interaction count after increment */
-  newCount: number;
-  /** Whether the task is now complete */
-  isCompleted: boolean;
-  /** Previous count before increment */
-  previousCount: number;
-}
-
-/**
- * Increment the interaction task counter in the tags array.
- * 
- * This is used by both useBlobbiDirectAction and useBlobbiUseInventoryItem
- * to track progress on interaction tasks for both hatch and evolve.
- * 
- * CRITICAL: This function is called during actual user actions (not retroactive sync).
- * It always increments by 1 because each call represents a real interaction.
- * 
- * Tag format:
- * - Progress: ["task", "interactions:N"]
- * - Completion: ["task_completed", "interactions"]
- * 
- * Idempotency notes:
- * - This is NOT idempotent by design - each call = one interaction
- * - Duplicate task_completed tags are prevented by filtering before add
- * - Multiple task:interactions tags are prevented by filtering before add
- * 
- * @param currentTags - Current tags array from the Blobbi state
- * @param requiredInteractions - Threshold for completion (7 for hatch, 21 for evolve)
- * @returns Updated tags array with incremented interaction count
- */
-export function incrementInteractionTaskTags(
-  currentTags: string[][],
-  requiredInteractions: number
-): IncrementInteractionResult {
-  // Get current interaction count from task tags
-  const interactionTag = currentTags.find(tag => 
-    tag[0] === 'task' && tag[1]?.startsWith('interactions:')
-  );
-  const previousCount = interactionTag 
-    ? parseInt(interactionTag[1].split(':')[1] || '0', 10)
-    : 0;
-  const newCount = previousCount + 1;
-  
-  // Check if already completed (task_completed tag exists)
-  const alreadyCompleted = currentTags.some(tag => 
-    tag[0] === 'task_completed' && tag[1] === 'interactions'
-  );
-  
-  // Remove old interaction task tag (prevent duplicates) and add new one
-  let updatedTags = currentTags.filter(tag => 
-    !(tag[0] === 'task' && tag[1]?.startsWith('interactions:'))
-  );
-  updatedTags = [...updatedTags, ['task', `interactions:${newCount}`]];
-  
-  // Mark as completed if reached required count AND not already marked
-  const isCompleted = newCount >= requiredInteractions;
-  if (isCompleted && !alreadyCompleted) {
-    // Only add if not already present (handled by filter, but double-check)
-    updatedTags = [...updatedTags, ['task_completed', 'interactions']];
-  }
-  
-  if (DEBUG_INTERACTION_TASK) {
-    console.log('[InteractionTask] Increment:', {
-      previousCount,
-      newCount,
-      requiredInteractions,
-      isCompleted,
-      alreadyCompleted,
-      addedCompletionTag: isCompleted && !alreadyCompleted,
-    });
-  }
-  
-  return { updatedTags, newCount, isCompleted, previousCount };
-}

src/blobbi/actions/lib/blobbi-activity-state.ts

@@ -1,81 +0,0 @@
-// src/blobbi/actions/lib/blobbi-activity-state.ts
-
-import type { SelectedTrack } from '../components/PlayMusicModal';
-
-/**
- * Types of inline activities that can be displayed in BlobbiPage
- */
-export type InlineActivityType = 'none' | 'music' | 'sing';
-
-// Re-export for convenience
-export type { SelectedTrack } from '../components/PlayMusicModal';
-
-/**
- * State for the music inline activity
- */
-export interface MusicActivityState {
-  type: 'music';
-  selection: SelectedTrack;
-  isPublished: boolean;
-}
-
-/**
- * State for the sing inline activity
- */
-export interface SingActivityState {
-  type: 'sing';
-}
-
-/**
- * No active inline activity
- */
-export interface NoActivityState {
-  type: 'none';
-}
-
-/**
- * Union type for all inline activity states
- */
-export type InlineActivityState = 
-  | NoActivityState 
-  | MusicActivityState 
-  | SingActivityState;
-
-/**
- * Blobbi reaction state - indicates how Blobbi should visually react
- */
-export type BlobbiReactionState = 
-  | 'idle'           // No special reaction
-  | 'listening'      // Music is playing, Blobbi is listening
-  | 'swaying'        // Blobbi is swaying to music
-  | 'singing'        // User is singing, Blobbi is engaged
-  | 'happy';         // General happy reaction
-
-/**
- * Helper to create a music activity state
- */
-export function createMusicActivity(selection: SelectedTrack): MusicActivityState {
-  return {
-    type: 'music',
-    selection,
-    isPublished: false,
-  };
-}
-
-/**
- * Helper to create a sing activity state
- */
-export function createSingActivity(): SingActivityState {
-  return {
-    type: 'sing',
-  };
-}
-
-/**
- * Helper to create no activity state
- */
-export function createNoActivity(): NoActivityState {
-  return {
-    type: 'none',
-  };
-}

src/blobbi/actions/lib/blobbi-random-lyrics.ts

@@ -1,121 +0,0 @@
-// src/blobbi/actions/lib/blobbi-random-lyrics.ts
-
-/**
- * Random lyrics for the Sing action.
- * These are fun, simple lyrics that users can sing to their Blobbi.
- */
-
-export interface LyricsEntry {
-  id: string;
-  title: string;
-  lines: string[];
-}
-
-/**
- * Collection of placeholder lyrics for singing to a Blobbi.
- * Simple, fun, and appropriate for all ages.
- */
-export const BLOBBI_LYRICS: LyricsEntry[] = [
-  {
-    id: 'lullaby-1',
-    title: 'Blobbi Lullaby',
-    lines: [
-      'Little Blobbi, close your eyes,',
-      'Dream of stars up in the skies.',
-      'Safe and warm, you drift away,',
-      "We'll play again another day.",
-    ],
-  },
-  {
-    id: 'happy-song-1',
-    title: 'Happy Blobbi Song',
-    lines: [
-      'Blobbi, Blobbi, jump around!',
-      "You're the happiest friend I've found!",
-      'Dancing, playing, full of cheer,',
-      "I'm so glad that you are here!",
-    ],
-  },
-  {
-    id: 'adventure-1',
-    title: 'Adventure Time',
-    lines: [
-      "Let's go on an adventure today,",
-      'Through the clouds and far away!',
-      'Mountains high and valleys deep,',
-      'Memories to always keep.',
-    ],
-  },
-  {
-    id: 'breakfast-song',
-    title: 'Breakfast Song',
-    lines: [
-      'Wake up, wake up, sleepy head,',
-      "Time to get out of your bed!",
-      "Breakfast's waiting, fresh and yummy,",
-      'Food to fill your happy tummy!',
-    ],
-  },
-  {
-    id: 'rainy-day',
-    title: 'Rainy Day',
-    lines: [
-      'Pitter patter on the roof,',
-      'Rainy days can be so nice.',
-      "We'll stay cozy, me and you,",
-      'Watching raindrops, one by two.',
-    ],
-  },
-  {
-    id: 'sunshine-song',
-    title: 'Sunshine Song',
-    lines: [
-      'Good morning, sunshine, bright and warm,',
-      'A brand new day is being born!',
-      'Blue sky smiling down on me,',
-      'Happy as can be, so free!',
-    ],
-  },
-  {
-    id: 'bedtime-1',
-    title: 'Bedtime Blues',
-    lines: [
-      'The moon is up, the stars are bright,',
-      'Time to say a soft goodnight.',
-      'Snuggle up and close your eyes,',
-      'Sweet dreams under starry skies.',
-    ],
-  },
-  {
-    id: 'play-time',
-    title: 'Play Time',
-    lines: [
-      "Bounce and jump and run around,",
-      "Spin and twirl without a sound!",
-      "Playing games is so much fun,",
-      "Laughing underneath the sun!",
-    ],
-  },
-];
-
-/**
- * Get a random lyrics entry.
- */
-export function getRandomLyrics(): LyricsEntry {
-  const index = Math.floor(Math.random() * BLOBBI_LYRICS.length);
-  return BLOBBI_LYRICS[index];
-}
-
-/**
- * Get all available lyrics entries.
- */
-export function getAllLyrics(): LyricsEntry[] {
-  return BLOBBI_LYRICS;
-}
-
-/**
- * Format lyrics for display (joined with newlines).
- */
-export function formatLyrics(lyrics: LyricsEntry): string {
-  return lyrics.lines.join('\n');
-}

src/blobbi/actions/lib/blobbi-streak.ts

@@ -1,202 +0,0 @@
-/**
- * Blobbi Care Streak Management
- * 
- * This module provides centralized logic for tracking care streaks on Blobbi companions.
- * A streak represents consecutive days of care activity (opening Blobbi page, performing
- * care actions, etc.).
- * 
- * Streak Rules:
- * - Starts at 1 on first activity
- * - Increments when activity happens on the NEXT local calendar day
- * - Same-day activity does not increment (at most once per day)
- * - Missing 2+ days resets streak to 1
- * 
- * Tags managed:
- * - care_streak: The current streak count (positive integer)
- * - care_streak_last_at: Unix timestamp (seconds) of last streak update
- * - care_streak_last_day: Local calendar day string (YYYY-MM-DD) of last update
- */
-
-import {
-  getLocalDayString,
-  getDaysDifference,
-  type BlobbiCompanion,
-} from '@/blobbi/core/lib/blobbi';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Result of calculating a streak update.
- */
-export interface StreakUpdateResult {
-  /** Whether the streak was updated (incremented or reset) */
-  wasUpdated: boolean;
-  /** The new streak value */
-  newStreak: number;
-  /** The new timestamp for care_streak_last_at */
-  newLastAt: number;
-  /** The new day string for care_streak_last_day */
-  newLastDay: string;
-  /** Description of what happened (for debugging/logging) */
-  action: 'initialized' | 'incremented' | 'reset' | 'same_day';
-}
-
-/**
- * Tag updates to apply to the Blobbi event.
- * Only present if wasUpdated is true.
- * Uses index signature for compatibility with updateBlobbiTags.
- */
-export interface StreakTagUpdates {
-  care_streak: string;
-  care_streak_last_at: string;
-  care_streak_last_day: string;
-  [key: string]: string;
-}
-
-// ─── Core Logic ───────────────────────────────────────────────────────────────
-
-/**
- * Calculate what the streak should be updated to based on current state and activity.
- * 
- * This is a pure function that calculates the new streak state without side effects.
- * Use this to determine if/how the streak should be updated.
- * 
- * @param currentStreak - Current streak value (0 or undefined means no streak yet)
- * @param lastDay - The last day string (YYYY-MM-DD) when streak was updated, or undefined
- * @param now - Current timestamp (defaults to now)
- * @returns StreakUpdateResult describing the update
- */
-export function calculateStreakUpdate(
-  currentStreak: number | undefined,
-  lastDay: string | undefined,
-  now: Date = new Date()
-): StreakUpdateResult {
-  const nowTimestamp = Math.floor(now.getTime() / 1000);
-  const todayString = getLocalDayString(now);
-  
-  // Case 1: No existing streak - initialize to 1
-  if (currentStreak === undefined || currentStreak === 0 || !lastDay) {
-    return {
-      wasUpdated: true,
-      newStreak: 1,
-      newLastAt: nowTimestamp,
-      newLastDay: todayString,
-      action: 'initialized',
-    };
-  }
-  
-  // Case 2: Activity on the same day - no update needed
-  if (lastDay === todayString) {
-    return {
-      wasUpdated: false,
-      newStreak: currentStreak,
-      newLastAt: nowTimestamp,
-      newLastDay: todayString,
-      action: 'same_day',
-    };
-  }
-  
-  // Calculate days since last activity
-  const daysMissed = getDaysDifference(lastDay, todayString);
-  
-  // Case 3: Next day (1 day difference) - increment streak
-  if (daysMissed === 1) {
-    return {
-      wasUpdated: true,
-      newStreak: currentStreak + 1,
-      newLastAt: nowTimestamp,
-      newLastDay: todayString,
-      action: 'incremented',
-    };
-  }
-  
-  // Case 4: Missed 2+ days - reset to 1
-  return {
-    wasUpdated: true,
-    newStreak: 1,
-    newLastAt: nowTimestamp,
-    newLastDay: todayString,
-    action: 'reset',
-  };
-}
-
-/**
- * Get the tag updates to apply to a Blobbi event for a streak update.
- * Returns undefined if no update is needed (same day activity).
- * 
- * @param companion - The current Blobbi companion state
- * @param now - Current timestamp (defaults to now)
- * @returns Tag updates to apply, or undefined if no update needed
- */
-export function getStreakTagUpdates(
-  companion: BlobbiCompanion,
-  now: Date = new Date()
-): StreakTagUpdates | undefined {
-  const result = calculateStreakUpdate(
-    companion.careStreak,
-    companion.careStreakLastDay,
-    now
-  );
-  
-  if (!result.wasUpdated) {
-    return undefined;
-  }
-  
-  return {
-    care_streak: result.newStreak.toString(),
-    care_streak_last_at: result.newLastAt.toString(),
-    care_streak_last_day: result.newLastDay,
-  };
-}
-
-/**
- * Check if a streak update is needed for the companion.
- * 
- * @param companion - The current Blobbi companion state
- * @param now - Current timestamp (defaults to now)
- * @returns true if the streak should be updated
- */
-export function needsStreakUpdate(
-  companion: BlobbiCompanion,
-  now: Date = new Date()
-): boolean {
-  const result = calculateStreakUpdate(
-    companion.careStreak,
-    companion.careStreakLastDay,
-    now
-  );
-  return result.wasUpdated;
-}
-
-/**
- * Get the current streak status for display purposes.
- * 
- * @param companion - The current Blobbi companion state
- * @returns Object with streak info for UI display
- */
-export function getStreakStatus(companion: BlobbiCompanion): {
-  streak: number;
-  lastDay: string | undefined;
-  isActive: boolean;
-  daysSinceLastActivity: number | undefined;
-} {
-  const streak = companion.careStreak ?? 0;
-  const lastDay = companion.careStreakLastDay;
-  const today = getLocalDayString();
-  
-  let daysSinceLastActivity: number | undefined;
-  let isActive = false;
-  
-  if (lastDay) {
-    daysSinceLastActivity = getDaysDifference(lastDay, today);
-    // Streak is "active" if we've had activity today or yesterday
-    isActive = daysSinceLastActivity <= 1;
-  }
-  
-  return {
-    streak,
-    lastDay,
-    isActive,
-    daysSinceLastActivity,
-  };
-}

src/blobbi/actions/lib/blobbi-track-catalog.ts

@@ -1,118 +0,0 @@
-// src/blobbi/actions/lib/blobbi-track-catalog.ts
-
-/**
- * Blobbi Track Catalog
- * 
- * Music tracks for the Blobbi "Play Music" action.
- * All tracks are hosted on remote Blossom servers and streamed on-demand.
- * 
- * ## Adding New Tracks
- * 
- * 1. Convert the audio file to M4A (AAC-LC):
- *    `ffmpeg -i input.m4a -c:a aac -b:a 64k -ar 48000 output.m4a`
- * 2. Upload the M4A file to a Blossom server
- * 3. Add a new entry to `BLOBBI_TRACK_CATALOG` below
- * 4. Set `url` to the full Blossom URL
- * 5. Get the duration: `ffprobe -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 <file>`
- * 
- * ## Supported Formats
- * 
- * M4A (AAC-LC) is required for iOS/Safari compatibility and small file size.
- */
-
-export interface BlobbiTrack {
-  /** Unique identifier for the track (used in state/events) */
-  id: string;
-  /** Display title shown in the UI */
-  title: string;
-  /** Artist or source attribution */
-  artist: string;
-  /** Full URL to the remote audio file (Blossom server) */
-  url: string;
-  /** Duration in seconds (for display, get via ffprobe) */
-  durationSeconds: number;
-  /** Optional cover art URL */
-  coverArt?: string;
-  /** Optional tags for categorization/filtering */
-  tags?: string[];
-}
-
-/**
- * Blobbi track catalog.
- * 
- * All tracks are royalty-free/Creative Commons licensed.
- * Audio files hosted on remote Blossom servers.
- */
-export const BLOBBI_TRACK_CATALOG: BlobbiTrack[] = [
-  {
-    id: 'nap_in_the_meadow',
-    title: 'Nap in the Meadow',
-    artist: 'Chilltape FM',
-    url: 'https://blossom.ditto.pub/6be1c95e879187f83af2a661ccac2bd96196f7bc334af44529ede6270b2811fc.m4a',
-    durationSeconds: 240, // 4:00
-    tags: ['relaxing', 'nature'],
-  },
-  {
-    id: 'happy_kids',
-    title: 'Happy Kids',
-    artist: 'Dmitrii Kolesnikov',
-    url: 'https://blossom.ditto.pub/94d49abd178aa8afb14737a55e0a7143f6b337f618d74858d011232bb2db845d.m4a',
-    durationSeconds: 129, // 2:09
-    tags: ['upbeat', 'fun'],
-  },
-  {
-    id: 'soft_piano',
-    title: 'Soft Piano',
-    artist: 'Dmitrii Kolesnikov',
-    url: 'https://blossom.ditto.pub/5367242d3dc555c77f5c637fd153df1166708a24c5a4c222bb4dcaeabf740743.m4a',
-    durationSeconds: 124, // 2:04
-    tags: ['calming', 'sleep'],
-  },
-  {
-    id: 'epic_sacred_light',
-    title: 'Epic Sacred Light',
-    artist: 'Ura Megis',
-    url: 'https://blossom.dreamith.to/c22953791d686605958165fd44a84cd7d9fd3d4423ebf786e47891ed3a82c6db.m4a',
-    durationSeconds: 223, // 3:43
-    tags: ['energetic', 'adventure'],
-  },
-  {
-    id: 'split_memories',
-    title: 'Split Memories',
-    artist: 'ido berg',
-    url: 'https://blossom.ditto.pub/57ba2e2122a732449880ae531d4bfac9a580bc19693c7dda735afbfa336b35fe.m4a',
-    durationSeconds: 153, // 2:33
-    tags: ['ambient', 'relaxing'],
-  },
-  {
-    id: 'minhas_mensagens',
-    title: 'Minhas Mensagens',
-    artist: 'PReis',
-    url: 'https://blossom.ditto.pub/0945064dc8f946f3392be23629b166e72090cafca7cca865a20b5395dd83ff46.m4a',
-    durationSeconds: 248, // 4:08
-    tags: ['ambient', 'relaxing'],
-  },
-];
-
-/**
- * Get a track by ID from the catalog
- */
-export function getTrackById(id: string): BlobbiTrack | undefined {
-  return BLOBBI_TRACK_CATALOG.find(track => track.id === id);
-}
-
-/**
- * Get all tracks from the catalog
- */
-export function getAllTracks(): BlobbiTrack[] {
-  return BLOBBI_TRACK_CATALOG;
-}
-
-/**
- * Format duration in seconds to MM:SS string
- */
-export function formatTrackDuration(seconds: number): string {
-  const mins = Math.floor(seconds / 60);
-  const secs = Math.floor(seconds % 60);
-  return `${mins}:${secs.toString().padStart(2, '0')}`;
-}

src/blobbi/actions/lib/blobbi-xp.test.ts

@@ -1,135 +0,0 @@
-import { describe, it, expect } from 'vitest';
-
-import {
-  calculateActionXP,
-  calculateInventoryActionXP,
-  applyXPGain,
-  getXPGainSummary,
-  formatXPGain,
-  getXPGainMessage,
-  ACTION_XP,
-  INVENTORY_ACTION_XP,
-  DIRECT_ACTION_XP,
-} from './blobbi-xp';
-
-describe('calculateActionXP', () => {
-  it('returns the correct XP for each inventory action', () => {
-    expect(calculateActionXP('feed')).toBe(5);
-    expect(calculateActionXP('play')).toBe(8);
-    expect(calculateActionXP('clean')).toBe(6);
-    expect(calculateActionXP('medicine')).toBe(10);
-  });
-
-  it('returns the correct XP for each direct action', () => {
-    expect(calculateActionXP('play_music')).toBe(7);
-    expect(calculateActionXP('sing')).toBe(9);
-  });
-
-  it('returns 0 for an unknown action', () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    expect(calculateActionXP('unknown' as any)).toBe(0);
-  });
-});
-
-describe('calculateInventoryActionXP', () => {
-  it('returns base XP for quantity 1', () => {
-    expect(calculateInventoryActionXP('feed', 1)).toBe(5);
-    expect(calculateInventoryActionXP('medicine', 1)).toBe(10);
-  });
-
-  it('multiplies XP by quantity', () => {
-    expect(calculateInventoryActionXP('feed', 3)).toBe(15);
-    expect(calculateInventoryActionXP('play', 5)).toBe(40);
-  });
-
-  it('defaults to quantity 1 when not specified', () => {
-    expect(calculateInventoryActionXP('clean')).toBe(6);
-  });
-
-  it('returns 0 for quantity less than 1', () => {
-    expect(calculateInventoryActionXP('feed', 0)).toBe(0);
-    expect(calculateInventoryActionXP('feed', -1)).toBe(0);
-  });
-});
-
-describe('applyXPGain', () => {
-  it('adds XP to a current value', () => {
-    expect(applyXPGain(100, 25)).toBe(125);
-  });
-
-  it('treats undefined current XP as 0', () => {
-    expect(applyXPGain(undefined, 10)).toBe(10);
-  });
-
-  it('never returns a negative value', () => {
-    expect(applyXPGain(5, -20)).toBe(0);
-    expect(applyXPGain(0, -1)).toBe(0);
-  });
-
-  it('handles zero XP gain', () => {
-    expect(applyXPGain(50, 0)).toBe(50);
-  });
-});
-
-describe('getXPGainSummary', () => {
-  it('returns the correct xpGained and quantity', () => {
-    const result = getXPGainSummary('feed', 3);
-    expect(result).toEqual({ xpGained: 15, quantity: 3 });
-  });
-
-  it('defaults quantity to 1', () => {
-    const result = getXPGainSummary('sing');
-    expect(result).toEqual({ xpGained: 9, quantity: 1 });
-  });
-});
-
-describe('formatXPGain', () => {
-  it('formats positive XP as "+N XP"', () => {
-    expect(formatXPGain(15)).toBe('+15 XP');
-    expect(formatXPGain(1)).toBe('+1 XP');
-  });
-
-  it('returns empty string for zero or negative XP', () => {
-    expect(formatXPGain(0)).toBe('');
-    expect(formatXPGain(-5)).toBe('');
-  });
-});
-
-describe('getXPGainMessage', () => {
-  it('formats a message with action and XP earned', () => {
-    expect(getXPGainMessage('feed', 5)).toBe('+5 XP earned!');
-  });
-
-  it('includes total when provided', () => {
-    expect(getXPGainMessage('feed', 5, 105)).toBe('+5 XP earned! Total: 105 XP');
-  });
-
-  it('returns empty string for zero or negative XP', () => {
-    expect(getXPGainMessage('feed', 0)).toBe('');
-    expect(getXPGainMessage('feed', -1)).toBe('');
-  });
-});
-
-describe('XP constants', () => {
-  it('ACTION_XP contains all inventory and direct actions', () => {
-    for (const action of Object.keys(INVENTORY_ACTION_XP)) {
-      expect(ACTION_XP).toHaveProperty(action);
-      expect(ACTION_XP[action as keyof typeof ACTION_XP]).toBe(
-        INVENTORY_ACTION_XP[action as keyof typeof INVENTORY_ACTION_XP],
-      );
-    }
-    for (const action of Object.keys(DIRECT_ACTION_XP)) {
-      expect(ACTION_XP).toHaveProperty(action);
-      expect(ACTION_XP[action as keyof typeof ACTION_XP]).toBe(
-        DIRECT_ACTION_XP[action as keyof typeof DIRECT_ACTION_XP],
-      );
-    }
-  });
-
-  it('all XP values are positive integers', () => {
-    for (const xp of Object.values(ACTION_XP)) {
-      expect(xp).toBeGreaterThan(0);
-      expect(Number.isInteger(xp)).toBe(true);
-    }
-  });
-});

src/blobbi/actions/lib/blobbi-xp.ts

@@ -1,136 +0,0 @@
-/**
- * Blobbi XP (Experience Points) System
- * 
- * This module defines XP values for all Blobbi care actions and provides
- * utilities for calculating and applying XP gains.
- * 
- * Design Philosophy:
- * - Different actions award different XP to reflect their complexity/value
- * - XP values are balanced to encourage variety in care activities
- * - Item actions (feed, play, clean, medicine) give varied XP per action type
- * - Direct actions (sing, play_music) give moderate XP
- * - XP accumulates across all life stages and never resets
- */
-
-import type { BlobbiAction, InventoryAction, DirectAction } from './blobbi-action-utils';
-
-// ─── XP Values by Action ──────────────────────────────────────────────────────
-
-/**
- * Base XP values for item-based care actions (feed, play, clean, medicine).
- */
-export const INVENTORY_ACTION_XP: Record<InventoryAction, number> = {
-  feed: 5,      // Feeding is common and essential - moderate XP
-  play: 8,      // Playing toys provides good interaction - higher XP
-  clean: 6,     // Hygiene maintenance is important - moderate-high XP
-  medicine: 10, // Medicine is critical - highest item XP
-};
-
-/**
- * Base XP values for direct actions (play_music, sing).
- * These actions don't require selecting an item.
- */
-export const DIRECT_ACTION_XP: Record<DirectAction, number> = {
-  play_music: 7,  // Playing music is engaging - good XP
-  sing: 9,        // Singing requires more user effort - higher XP
-};
-
-/**
- * Combined XP lookup for all action types.
- * Use this for a unified XP calculation interface.
- */
-export const ACTION_XP: Record<BlobbiAction, number> = {
-  ...INVENTORY_ACTION_XP,
-  ...DIRECT_ACTION_XP,
-};
-
-// ─── XP Calculation Utilities ─────────────────────────────────────────────────
-
-/**
- * Calculate XP gain for a single action.
- * 
- * @param action - The action performed
- * @returns XP points earned
- */
-export function calculateActionXP(action: BlobbiAction): number {
-  return ACTION_XP[action] ?? 0;
-}
-
-/**
- * Calculate XP gain for an item-based care action.
- * 
- * @param action - The action performed
- * @param quantity - Number of times performed (always 1 in current usage)
- * @returns Total XP points earned
- */
-export function calculateInventoryActionXP(action: InventoryAction, quantity: number = 1): number {
-  if (quantity < 1) return 0;
-  const baseXP = INVENTORY_ACTION_XP[action] ?? 0;
-  return baseXP * quantity;
-}
-
-/**
- * Apply XP gain to current experience value.
- * 
- * @param currentXP - Current experience points (undefined = 0)
- * @param xpGain - XP points to add
- * @returns New total XP (never negative)
- */
-export function applyXPGain(currentXP: number | undefined, xpGain: number): number {
-  const current = currentXP ?? 0;
-  const newXP = current + xpGain;
-  return Math.max(0, newXP);
-}
-
-/**
- * Get XP gain summary for displaying to the user.
- * 
- * @param action - The action performed
- * @param quantity - Number of times the action was performed (always 1 in current usage)
- * @returns Object with xpGained and quantity
- */
-export function getXPGainSummary(
-  action: BlobbiAction,
-  quantity: number = 1
-): { xpGained: number; quantity: number } {
-  const baseXP = ACTION_XP[action] ?? 0;
-  const xpGained = baseXP * quantity;
-  return { xpGained, quantity };
-}
-
-// ─── XP Display Utilities ─────────────────────────────────────────────────────
-
-/**
- * Format XP gain for display in toasts/notifications.
- * 
- * @param xpGained - Amount of XP gained
- * @returns Formatted string like "+15 XP"
- */
-export function formatXPGain(xpGained: number): string {
-  if (xpGained <= 0) return '';
-  return `+${xpGained} XP`;
-}
-
-/**
- * Get a descriptive message about XP gain.
- * 
- * @param action - The action that earned XP
- * @param xpGained - Amount of XP gained
- * @param newTotal - New total XP (optional, for "You now have X XP" message)
- * @returns Formatted message for user feedback
- */
-export function getXPGainMessage(
-  action: BlobbiAction,
-  xpGained: number,
-  newTotal?: number
-): string {
-  if (xpGained <= 0) return '';
-  
-  const xpText = formatXPGain(xpGained);
-  
-  if (newTotal !== undefined) {
-    return `${xpText} earned! Total: ${newTotal} XP`;
-  }
-  
-  return `${xpText} earned!`;
-}

src/blobbi/actions/lib/daily-mission-tracker.ts

@@ -1,109 +0,0 @@
-/**
- * Daily Mission Tracker - Standalone progress tracking utility
- * 
- * This module provides a simple way to track daily mission progress
- * without requiring React hooks or context. It directly manipulates
- * localStorage for immediate persistence.
- * 
- * This approach allows action hooks (which may be called outside of
- * the daily missions hook context) to record progress.
- */
-
-import {
-  type DailyMissionsState,
-  type DailyMissionAction,
-  getTodayDateString,
-  needsDailyReset,
-  createDailyMissionsState,
-  updateMissionProgress,
-} from './daily-missions';
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const STORAGE_KEY = 'blobbi:daily-missions';
-
-// ─── Storage Utilities ────────────────────────────────────────────────────────
-
-/**
- * Read the current daily missions state from localStorage
- */
-function readState(): DailyMissionsState | null {
-  try {
-    const stored = localStorage.getItem(STORAGE_KEY);
-    return stored ? JSON.parse(stored) : null;
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Write the daily missions state to localStorage
- */
-function writeState(state: DailyMissionsState): void {
-  try {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(state));
-  } catch (error) {
-    console.warn('[DailyMissionTracker] Failed to write state:', error);
-  }
-}
-
-/**
- * Ensure we have a valid state for today, creating one if necessary
- */
-function ensureCurrentState(pubkey?: string): DailyMissionsState {
-  const current = readState();
-  
-  if (needsDailyReset(current)) {
-    const previousCoins = current?.totalCoinsEarned ?? 0;
-    const newState = createDailyMissionsState(getTodayDateString(), pubkey, previousCoins);
-    writeState(newState);
-    return newState;
-  }
-  
-  return current!;
-}
-
-// ─── Public API ───────────────────────────────────────────────────────────────
-
-/**
- * Record progress for a daily mission action.
- * This function can be called from anywhere (hooks, event handlers, etc.)
- * and will immediately persist to localStorage.
- * 
- * @param action - The action type that was performed
- * @param count - Number of times the action was performed (default: 1)
- * @param pubkey - Optional user pubkey for personalized mission selection
- */
-export function trackDailyMissionProgress(
-  action: DailyMissionAction,
-  count: number = 1,
-  pubkey?: string
-): void {
-  const current = ensureCurrentState(pubkey);
-  const updated = updateMissionProgress(current, action, count);
-  writeState(updated);
-  
-  // Dispatch a custom event so React components can re-render if needed
-  window.dispatchEvent(new CustomEvent('daily-missions-updated', { detail: { action, count } }));
-}
-
-/**
- * Convenience function to track multiple actions at once.
- * Useful when an action should count toward multiple missions.
- * 
- * @param actions - Array of actions to track
- * @param pubkey - Optional user pubkey
- */
-export function trackMultipleDailyMissionActions(
-  actions: DailyMissionAction[],
-  pubkey?: string
-): void {
-  let current = ensureCurrentState(pubkey);
-  
-  for (const action of actions) {
-    current = updateMissionProgress(current, action, 1);
-  }
-  
-  writeState(current);
-  window.dispatchEvent(new CustomEvent('daily-missions-updated', { detail: { actions } }));
-}

src/blobbi/actions/lib/daily-missions.ts

@@ -1,708 +0,0 @@
-/**
- * Daily Missions System for Blobbi
- * 
- * This module defines the daily mission pool, selection logic, and types.
- * Daily missions are separate from hatch/evolve missions and provide
- * daily engagement loops with coin rewards.
- */
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/**
- * Mission action types that can trigger progress
- */
-export type DailyMissionAction = 
-  | 'interact'      // Any interaction (feed, clean, play, etc.)
-  | 'feed'          // Feeding action specifically
-  | 'clean'         // Cleaning action specifically
-  | 'sing'          // Sing direct action
-  | 'play_music'    // Play music direct action
-  | 'sleep'         // Put Blobbi to sleep
-  | 'take_photo'    // Take a photo of Blobbi
-  | 'medicine';     // Give medicine to Blobbi
-
-/**
- * Blobbi stage type for filtering missions
- */
-export type BlobbiStage = 'egg' | 'baby' | 'adult';
-
-/**
- * Definition of a daily mission in the pool
- */
-export interface DailyMissionDefinition {
-  /** Unique identifier for this mission type */
-  id: string;
-  /** Display title */
-  title: string;
-  /** Description of what to do */
-  description: string;
-  /** Action that triggers progress */
-  action: DailyMissionAction;
-  /** Number of times the action must be performed */
-  requiredCount: number;
-  /** Coin reward for completing this mission */
-  reward: number;
-  /** Selection weight (higher = more likely to be selected) */
-  weight: number;
-  /** Required stages to show this mission (if empty/undefined, requires baby or adult) */
-  requiredStages?: BlobbiStage[];
-}
-
-/**
- * A daily mission instance with progress tracking
- */
-export interface DailyMission extends DailyMissionDefinition {
-  /** Current progress (how many times the action has been performed today) */
-  currentCount: number;
-  /** Whether the mission has been completed */
-  completed: boolean;
-  /** Whether the reward has been claimed */
-  claimed: boolean;
-}
-
-/**
- * Stored state for daily missions (persisted in localStorage)
- */
-export interface DailyMissionsState {
-  /** The date string (YYYY-MM-DD) when these missions were generated */
-  date: string;
-  /** The selected missions for this day */
-  missions: DailyMission[];
-  /** Total coins earned from daily missions (lifetime) */
-  totalCoinsEarned: number;
-  /** Whether the bonus mission has been claimed today */
-  bonusClaimed?: boolean;
-  /** Number of rerolls remaining for today (resets daily, max 3) */
-  rerollsRemaining?: number;
-}
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-/** Maximum number of mission rerolls allowed per day */
-export const MAX_DAILY_REROLLS = 3;
-
-// ─── Mission Pool ─────────────────────────────────────────────────────────────
-
-/**
- * The pool of available daily missions.
- * Weights determine selection frequency:
- * - High weight (10): Common missions (interact, feed, clean)
- * - Medium weight (6): Regular missions (sing, play music, sleep)
- * - Low weight (2): Uncommon missions (change shape)
- * - Rare weight (1): Rare missions (take photo)
- */
-export const DAILY_MISSION_POOL: DailyMissionDefinition[] = [
-  // ═══════════════════════════════════════════════════════════════════════════
-  // BABY/ADULT ONLY MISSIONS
-  // These actions are NOT available for eggs
-  // ═══════════════════════════════════════════════════════════════════════════
-
-  // ─── Interact Missions (Baby/Adult only) ───────────────────────────────────
-  {
-    id: 'interact_3',
-    title: 'Quick Care',
-    description: 'Interact with your Blobbi 3 times',
-    action: 'interact',
-    requiredCount: 3,
-    reward: 30,
-    weight: 10,
-    requiredStages: ['baby', 'adult'],
-  },
-  {
-    id: 'interact_6',
-    title: 'Attentive Caretaker',
-    description: 'Interact with your Blobbi 6 times',
-    action: 'interact',
-    requiredCount: 6,
-    reward: 50,
-    weight: 8,
-    requiredStages: ['baby', 'adult'],
-  },
-
-  // ─── Feed Missions (Baby/Adult only) ───────────────────────────────────────
-  {
-    id: 'feed_1',
-    title: 'Snack Time',
-    description: 'Feed your Blobbi once',
-    action: 'feed',
-    requiredCount: 1,
-    reward: 25,
-    weight: 10,
-    requiredStages: ['baby', 'adult'],
-  },
-  {
-    id: 'feed_2',
-    title: 'Hungry Blobbi',
-    description: 'Feed your Blobbi 2 times',
-    action: 'feed',
-    requiredCount: 2,
-    reward: 45,
-    weight: 8,
-    requiredStages: ['baby', 'adult'],
-  },
-  {
-    id: 'feed_3',
-    title: 'Feast Day',
-    description: 'Feed your Blobbi 3 times',
-    action: 'feed',
-    requiredCount: 3,
-    reward: 60,
-    weight: 5,
-    requiredStages: ['baby', 'adult'],
-  },
-
-  // ─── Sleep Missions (Baby/Adult only) ──────────────────────────────────────
-  {
-    id: 'sleep_1',
-    title: 'Nap Time',
-    description: 'Put your Blobbi to sleep',
-    action: 'sleep',
-    requiredCount: 1,
-    reward: 30,
-    weight: 6,
-    requiredStages: ['baby', 'adult'],
-  },
-
-  // ─── Photo Missions (Baby/Adult only) ──────────────────────────────────────
-  {
-    id: 'take_photo_1',
-    title: 'Snapshot',
-    description: 'Take a polaroid photo of your Blobbi',
-    action: 'take_photo',
-    requiredCount: 1,
-    reward: 55,
-    weight: 4,
-    requiredStages: ['baby', 'adult'],
-  },
-  {
-    id: 'take_photo_2',
-    title: 'Photo Album',
-    description: 'Take 2 photos of your Blobbi',
-    action: 'take_photo',
-    requiredCount: 2,
-    reward: 70,
-    weight: 2,
-    requiredStages: ['baby', 'adult'],
-  },
-
-  // ═══════════════════════════════════════════════════════════════════════════
-  // EGG + BABY + ADULT MISSIONS
-  // These actions are available for ALL stages including eggs
-  // ═══════════════════════════════════════════════════════════════════════════
-
-  // ─── Clean Missions (All stages) ───────────────────────────────────────────
-  {
-    id: 'clean_1',
-    title: 'Quick Cleanup',
-    description: 'Clean your Blobbi once',
-    action: 'clean',
-    requiredCount: 1,
-    reward: 25,
-    weight: 10,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-  {
-    id: 'clean_2',
-    title: 'Squeaky Clean',
-    description: 'Clean your Blobbi 2 times',
-    action: 'clean',
-    requiredCount: 2,
-    reward: 45,
-    weight: 6,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-
-  // ─── Sing Missions (All stages) ────────────────────────────────────────────
-  {
-    id: 'sing_1',
-    title: 'Sing Along',
-    description: 'Sing a song to your Blobbi',
-    action: 'sing',
-    requiredCount: 1,
-    reward: 30,
-    weight: 6,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-  {
-    id: 'sing_2',
-    title: 'Karaoke Session',
-    description: 'Sing 2 songs to your Blobbi',
-    action: 'sing',
-    requiredCount: 2,
-    reward: 50,
-    weight: 3,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-
-  // ─── Play Music Missions (All stages) ──────────────────────────────────────
-  {
-    id: 'play_music_1',
-    title: 'DJ Time',
-    description: 'Play a song for your Blobbi',
-    action: 'play_music',
-    requiredCount: 1,
-    reward: 30,
-    weight: 6,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-  {
-    id: 'play_music_2',
-    title: 'Music Marathon',
-    description: 'Play 2 songs for your Blobbi',
-    action: 'play_music',
-    requiredCount: 2,
-    reward: 50,
-    weight: 3,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-
-  // ─── Medicine Missions (All stages) ────────────────────────────────────────
-  // Medicine rewards are higher since medicine costs coins to use
-  {
-    id: 'medicine_1',
-    title: 'Health Check',
-    description: 'Give medicine to your Blobbi',
-    action: 'medicine',
-    requiredCount: 1,
-    reward: 60,
-    weight: 5,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-  {
-    id: 'medicine_2',
-    title: 'Doctor Visit',
-    description: 'Give medicine to your Blobbi 2 times',
-    action: 'medicine',
-    requiredCount: 2,
-    reward: 70,
-    weight: 3,
-    requiredStages: ['egg', 'baby', 'adult'],
-  },
-];
-
-// ─── Utility Functions ────────────────────────────────────────────────────────
-
-/**
- * Get the current date string in YYYY-MM-DD format (local timezone)
- */
-export function getTodayDateString(): string {
-  const now = new Date();
-  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
-}
-
-/**
- * Generate a seed number from a date string and optional user pubkey.
- * Used for deterministic daily mission selection.
- */
-function generateDailySeed(dateString: string, pubkey?: string): number {
-  const input = pubkey ? `${dateString}:${pubkey}` : dateString;
-  let hash = 0;
-  for (let i = 0; i < input.length; i++) {
-    const char = input.charCodeAt(i);
-    hash = ((hash << 5) - hash) + char;
-    hash = hash & hash; // Convert to 32-bit integer
-  }
-  return Math.abs(hash);
-}
-
-/**
- * Seeded random number generator (Mulberry32)
- */
-function seededRandom(seed: number): () => number {
-  return function() {
-    let t = seed += 0x6D2B79F5;
-    t = Math.imul(t ^ t >>> 15, t | 1);
-    t ^= t + Math.imul(t ^ t >>> 7, t | 61);
-    return ((t ^ t >>> 14) >>> 0) / 4294967296;
-  };
-}
-
-/**
- * Check if a mission is available for the given stages.
- * Missions with no requiredStages default to requiring baby or adult.
- */
-function isMissionAvailableForStages(
-  mission: DailyMissionDefinition,
-  availableStages: BlobbiStage[]
-): boolean {
-  const requiredStages = mission.requiredStages ?? ['baby', 'adult'];
-  return requiredStages.some((stage) => availableStages.includes(stage));
-}
-
-/**
- * Select N missions from the pool using weighted random selection.
- * Uses a seeded random generator for deterministic daily selection.
- * 
- * @param count - Number of missions to select
- * @param dateString - Date string for seeding (YYYY-MM-DD)
- * @param pubkey - Optional user pubkey for seeding
- * @param availableStages - Stages the user has available (filters eligible missions)
- */
-export function selectDailyMissions(
-  count: number,
-  dateString: string,
-  pubkey?: string,
-  availableStages?: BlobbiStage[]
-): DailyMissionDefinition[] {
-  const seed = generateDailySeed(dateString, pubkey);
-  const random = seededRandom(seed);
-  
-  // Filter pool by available stages (default to baby/adult if not specified)
-  const stagesToCheck = availableStages ?? ['baby', 'adult'];
-  const eligibleMissions = DAILY_MISSION_POOL.filter((m) =>
-    isMissionAvailableForStages(m, stagesToCheck)
-  );
-  
-  // If no missions are available for the user's stages, return empty
-  if (eligibleMissions.length === 0) {
-    return [];
-  }
-  
-  // Create a copy of the eligible pool
-  const available = [...eligibleMissions];
-  const selected: DailyMissionDefinition[] = [];
-  
-  while (selected.length < count && available.length > 0) {
-    // Calculate total weight of remaining missions
-    const totalWeight = available.reduce((sum, m) => sum + m.weight, 0);
-    
-    // Pick a random value in [0, totalWeight)
-    let pick = random() * totalWeight;
-    
-    // Find the mission that corresponds to this pick
-    let selectedIndex = 0;
-    for (let i = 0; i < available.length; i++) {
-      pick -= available[i].weight;
-      if (pick <= 0) {
-        selectedIndex = i;
-        break;
-      }
-    }
-    
-    // Add to selected and remove from available
-    selected.push(available[selectedIndex]);
-    available.splice(selectedIndex, 1);
-  }
-  
-  return selected;
-}
-
-/**
- * Create a fresh DailyMission from a definition
- */
-export function createMissionFromDefinition(def: DailyMissionDefinition): DailyMission {
-  return {
-    ...def,
-    currentCount: 0,
-    completed: false,
-    claimed: false,
-  };
-}
-
-/**
- * Create the initial daily missions state for a new day
- */
-export function createDailyMissionsState(
-  dateString: string,
-  pubkey?: string,
-  previousTotalCoins: number = 0,
-  availableStages?: BlobbiStage[]
-): DailyMissionsState {
-  const definitions = selectDailyMissions(3, dateString, pubkey, availableStages);
-  return {
-    date: dateString,
-    missions: definitions.map(createMissionFromDefinition),
-    totalCoinsEarned: previousTotalCoins,
-    rerollsRemaining: MAX_DAILY_REROLLS,
-  };
-}
-
-/**
- * Check if the daily missions need to be reset (new day)
- */
-export function needsDailyReset(state: DailyMissionsState | null): boolean {
-  if (!state) return true;
-  return state.date !== getTodayDateString();
-}
-
-/**
- * Update mission progress for a given action
- */
-export function updateMissionProgress(
-  state: DailyMissionsState,
-  action: DailyMissionAction,
-  incrementBy: number = 1
-): DailyMissionsState {
-  const updatedMissions = state.missions.map((mission) => {
-    // Skip if not the matching action or already completed
-    if (mission.action !== action || mission.completed) {
-      return mission;
-    }
-    
-    const newCount = Math.min(mission.currentCount + incrementBy, mission.requiredCount);
-    const nowCompleted = newCount >= mission.requiredCount;
-    
-    return {
-      ...mission,
-      currentCount: newCount,
-      completed: nowCompleted,
-    };
-  });
-  
-  return {
-    ...state,
-    missions: updatedMissions,
-  };
-}
-
-/**
- * Claim reward for a completed mission
- */
-export function claimMissionReward(
-  state: DailyMissionsState,
-  missionId: string
-): { state: DailyMissionsState; coinsEarned: number } {
-  let coinsEarned = 0;
-  
-  const updatedMissions = state.missions.map((mission) => {
-    if (mission.id !== missionId) return mission;
-    
-    // Can only claim if completed and not yet claimed
-    if (!mission.completed || mission.claimed) return mission;
-    
-    coinsEarned = mission.reward;
-    return {
-      ...mission,
-      claimed: true,
-    };
-  });
-  
-  return {
-    state: {
-      ...state,
-      missions: updatedMissions,
-      totalCoinsEarned: state.totalCoinsEarned + coinsEarned,
-    },
-    coinsEarned,
-  };
-}
-
-/**
- * Get the total potential reward for all daily missions
- */
-export function getTotalPotentialReward(state: DailyMissionsState): number {
-  return state.missions.reduce((sum, m) => sum + m.reward, 0);
-}
-
-/**
- * Get the total claimed reward for today
- */
-export function getTodayClaimedReward(state: DailyMissionsState): number {
-  return state.missions
-    .filter((m) => m.claimed)
-    .reduce((sum, m) => sum + m.reward, 0);
-}
-
-/**
- * Check if all daily missions are completed
- */
-export function areAllMissionsCompleted(state: DailyMissionsState): boolean {
-  return state.missions.every((m) => m.completed);
-}
-
-/**
- * Check if all daily missions are claimed
- */
-export function areAllMissionsClaimed(state: DailyMissionsState): boolean {
-  return state.missions.every((m) => m.claimed);
-}
-
-// ─── Bonus Mission ────────────────────────────────────────────────────────────
-
-/**
- * The bonus mission that becomes available after completing all regular missions.
- * This is a special mission that rewards extra coins for daily completion.
- */
-export const BONUS_MISSION_DEFINITION: DailyMissionDefinition = {
-  id: 'bonus_daily_complete',
-  title: 'Daily Champion',
-  description: 'Complete all daily missions to claim this bonus reward',
-  action: 'interact', // Not actually used - bonus is auto-completed
-  requiredCount: 1,
-  reward: 80,
-  weight: 0, // Not part of random selection
-};
-
-/**
- * Check if the bonus mission is available (all regular missions completed)
- */
-export function isBonusMissionAvailable(state: DailyMissionsState): boolean {
-  // Bonus is available if there are regular missions and all are completed
-  return state.missions.length > 0 && areAllMissionsCompleted(state);
-}
-
-/**
- * Check if the bonus mission has been claimed today
- */
-export function isBonusMissionClaimed(state: DailyMissionsState): boolean {
-  return state.bonusClaimed ?? false;
-}
-
-/**
- * Claim the bonus mission reward
- */
-export function claimBonusMissionReward(
-  state: DailyMissionsState
-): { state: DailyMissionsState; coinsEarned: number } {
-  // Can only claim if bonus is available and not yet claimed
-  if (!isBonusMissionAvailable(state) || isBonusMissionClaimed(state)) {
-    return { state, coinsEarned: 0 };
-  }
-  
-  return {
-    state: {
-      ...state,
-      bonusClaimed: true,
-      totalCoinsEarned: state.totalCoinsEarned + BONUS_MISSION_DEFINITION.reward,
-    },
-    coinsEarned: BONUS_MISSION_DEFINITION.reward,
-  };
-}
-
-// ─── Mission Reroll ───────────────────────────────────────────────────────────
-
-/**
- * Get the number of rerolls remaining for today.
- * Returns MAX_DAILY_REROLLS if not set (for backward compatibility with old state).
- */
-export function getRerollsRemaining(state: DailyMissionsState): number {
-  // If rerollsRemaining is not set (old state), default to max
-  if (state.rerollsRemaining === undefined || state.rerollsRemaining === null) {
-    return MAX_DAILY_REROLLS;
-  }
-  return state.rerollsRemaining;
-}
-
-/**
- * Check if the user can reroll a mission
- */
-export function canRerollMission(state: DailyMissionsState, missionId: string): boolean {
-  const rerollsRemaining = getRerollsRemaining(state);
-  if (rerollsRemaining <= 0) return false;
-  
-  // Find the mission
-  const mission = state.missions.find((m) => m.id === missionId);
-  if (!mission) return false;
-  
-  // Cannot reroll completed or claimed missions
-  if (mission.completed || mission.claimed) return false;
-  
-  return true;
-}
-
-/**
- * Select a replacement mission that:
- * - Is not already in the current mission list
- * - Is not the mission being replaced (avoid immediately giving back the same)
- * - Respects the user's available stages
- * 
- * Uses weighted random selection from eligible missions.
- */
-export function selectReplacementMission(
-  currentMissions: DailyMission[],
-  missionToReplace: DailyMission,
-  availableStages?: BlobbiStage[]
-): DailyMissionDefinition | null {
-  // Default to baby/adult if no stages provided (most common case)
-  const stagesToCheck = availableStages && availableStages.length > 0 
-    ? availableStages 
-    : ['baby', 'adult'] as BlobbiStage[];
-  
-  // Get IDs of missions that cannot be selected (current active missions)
-  const excludedIds = new Set<string>();
-  
-  // Exclude all current missions EXCEPT the one being replaced
-  for (const m of currentMissions) {
-    if (m.id !== missionToReplace.id) {
-      excludedIds.add(m.id);
-    }
-  }
-  
-  // Filter pool to eligible missions
-  const eligibleMissions = DAILY_MISSION_POOL.filter((m) => {
-    // Must not be an already-active mission (except the one being replaced)
-    if (excludedIds.has(m.id)) return false;
-    // Must not be the same mission being replaced
-    if (m.id === missionToReplace.id) return false;
-    // Must be available for user's stages
-    if (!isMissionAvailableForStages(m, stagesToCheck)) return false;
-    return true;
-  });
-  
-  // If no eligible missions, return null
-  if (eligibleMissions.length === 0) {
-    return null;
-  }
-  
-  // Use Math.random() for non-deterministic selection (rerolls should feel random)
-  const totalWeight = eligibleMissions.reduce((sum, m) => sum + m.weight, 0);
-  let pick = Math.random() * totalWeight;
-  
-  for (const mission of eligibleMissions) {
-    pick -= mission.weight;
-    if (pick <= 0) {
-      return mission;
-    }
-  }
-  
-  // Fallback to first eligible (shouldn't happen)
-  return eligibleMissions[0];
-}
-
-/**
- * Reroll a mission, replacing it with a new one from the pool.
- * Returns the updated state and the new mission, or null if reroll failed.
- */
-export function rerollMission(
-  state: DailyMissionsState,
-  missionId: string,
-  availableStages?: BlobbiStage[]
-): { state: DailyMissionsState; newMission: DailyMission } | null {
-  // Check if reroll is allowed
-  if (!canRerollMission(state, missionId)) {
-    return null;
-  }
-  
-  // Find the mission index
-  const missionIndex = state.missions.findIndex((m) => m.id === missionId);
-  if (missionIndex === -1) {
-    return null;
-  }
-  
-  const oldMission = state.missions[missionIndex];
-  
-  // Select a replacement
-  const replacement = selectReplacementMission(state.missions, oldMission, availableStages);
-  if (!replacement) {
-    return null;
-  }
-  
-  // Create the new mission instance
-  const newMission = createMissionFromDefinition(replacement);
-  
-  // Update the missions array
-  const updatedMissions = [...state.missions];
-  updatedMissions[missionIndex] = newMission;
-  
-  // Decrement rerolls remaining
-  const newRerollsRemaining = getRerollsRemaining(state) - 1;
-  
-  return {
-    state: {
-      ...state,
-      missions: updatedMissions,
-      rerollsRemaining: newRerollsRemaining,
-    },
-    newMission,
-  };
-}

src/blobbi/adult-blobbi/assets/bloomi/bloomi-base.svg

@@ -1,100 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <!-- Grupo das pétalas com rotação -->
-  <g transform="rotate(0 100 110)">
-    <animateTransform 
-      attributeName="transform" 
-      type="rotate" 
-      from="0 100 110" 
-      to="360 100 110" 
-      dur="10s" 
-      repeatCount="indefinite" />
-    <circle cx="100" cy="70" r="25" fill="url(#bloomiPetal1)" />
-    <circle cx="130" cy="90" r="25" fill="url(#bloomiPetal2)" />
-    <circle cx="130" cy="130" r="25" fill="url(#bloomiPetal3)" />
-    <circle cx="100" cy="150" r="25" fill="url(#bloomiPetal4)" />
-    <circle cx="70" cy="130" r="25" fill="url(#bloomiPetal5)" />
-    <circle cx="70" cy="90" r="25" fill="url(#bloomiPetal6)" />
-  </g>
-
-  <!-- Grupo das partículas giratórias -->
-  <g transform="rotate(0 100 110)">
-    <animateTransform 
-      attributeName="transform" 
-      type="rotate" 
-      from="0 100 110" 
-      to="-360 100 110" 
-      dur="20s" 
-      repeatCount="indefinite" />
-    <circle cx="60" cy="80" r="2" fill="url(#bloomiPollen)" opacity="0.8" />
-    <circle cx="140" cy="85" r="1.5" fill="url(#bloomiPollen)" opacity="0.6" />
-    <circle cx="55" cy="140" r="1" fill="url(#bloomiPollen)" opacity="0.7" />
-    <circle cx="145" cy="135" r="2" fill="url(#bloomiPollen)" opacity="0.5" />
-    <circle cx="75" cy="60" r="1.5" fill="url(#bloomiPollen)" opacity="0.9" />
-  </g>
-
-  <!-- Centro da flor -->
-  <circle cx="100" cy="110" r="35" fill="url(#bloomiCenter)" />
-  <circle cx="100" cy="110" r="28" fill="url(#bloomiCenterHighlight)" opacity="0.6" />
-
-  <!-- Eyes (white/base eye shapes) -->
-  <circle cx="88" cy="105" r="8" fill="white" />
-  <circle cx="112" cy="105" r="8" fill="white" />
-  
-  <!-- Pupils (pupil + highlights) -->
-  <circle cx="88" cy="105" r="5" fill="#1f2937" />
-  <circle cx="112" cy="105" r="5" fill="#1f2937" />
-  <circle cx="90" cy="103" r="2" fill="white" />
-  <circle cx="114" cy="103" r="2" fill="white" />
-
-  <!-- Mouth -->
-  <path d="M 90 120 Q 100 128 110 120" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-
-  <!-- Bochechas -->
-  <circle cx="70" cy="115" r="8" fill="url(#bloomiBlush)" opacity="0.6" />
-  <circle cx="130" cy="115" r="8" fill="url(#bloomiBlush)" opacity="0.6" />
-
-  <!-- Gradientes -->
-  <defs>
-    <radialGradient id="bloomiPetal1" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal2" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fed7d7" />
-      <stop offset="100%" stop-color="#f87171" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal3" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal4" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#e0e7ff" />
-      <stop offset="100%" stop-color="#8b5cf6" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal5" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#dcfce7" />
-      <stop offset="100%" stop-color="#22c55e" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal6" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#dbeafe" />
-      <stop offset="100%" stop-color="#3b82f6" />
-    </radialGradient>
-    <radialGradient id="bloomiCenter" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="50%" stop-color="#fbbf24" />
-      <stop offset="100%" stop-color="#f59e0b" />
-    </radialGradient>
-    <radialGradient id="bloomiCenterHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" stop-color="#ffffff" />
-      <stop offset="100%" stop-color="rgba(255,255,255,0.3)" />
-    </radialGradient>
-    <radialGradient id="bloomiBlush" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="bloomiPollen" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/bloomi/bloomi-sleeping.svg

@@ -1,99 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <!-- Grupo das pétalas com rotação mais lenta (ou pode ser removido completamente) -->
-  <g transform="rotate(0 100 110)">
-    <animateTransform 
-      attributeName="transform" 
-      type="rotate" 
-      from="0 100 110" 
-      to="360 100 110" 
-      dur="20s" 
-      repeatCount="indefinite" />
-    <circle cx="100" cy="70" r="25" fill="url(#bloomiPetal1)" />
-    <circle cx="130" cy="90" r="25" fill="url(#bloomiPetal2)" />
-    <circle cx="130" cy="130" r="25" fill="url(#bloomiPetal3)" />
-    <circle cx="100" cy="150" r="25" fill="url(#bloomiPetal4)" />
-    <circle cx="70" cy="130" r="25" fill="url(#bloomiPetal5)" />
-    <circle cx="70" cy="90" r="25" fill="url(#bloomiPetal6)" />
-  </g>
-
-  <!-- Grupo das partículas giratórias -->
-  <g transform="rotate(0 100 110)">
-    <animateTransform 
-      attributeName="transform" 
-      type="rotate" 
-      from="0 100 110" 
-      to="-360 100 110" 
-      dur="30s" 
-      repeatCount="indefinite" />
-    <circle cx="60" cy="80" r="2" fill="url(#bloomiPollen)" opacity="0.4" />
-    <circle cx="140" cy="85" r="1.5" fill="url(#bloomiPollen)" opacity="0.3" />
-    <circle cx="55" cy="140" r="1" fill="url(#bloomiPollen)" opacity="0.3" />
-    <circle cx="145" cy="135" r="2" fill="url(#bloomiPollen)" opacity="0.2" />
-    <circle cx="75" cy="60" r="1.5" fill="url(#bloomiPollen)" opacity="0.4" />
-  </g>
-
-  <!-- Centro da flor -->
-  <circle cx="100" cy="110" r="35" fill="url(#bloomiCenter)" />
-  <circle cx="100" cy="110" r="28" fill="url(#bloomiCenterHighlight)" opacity="0.6" />
-
-  <!-- Olhos dormindo -->
-  <path d="M 80 105 Q 88 108 96 105" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  <path d="M 104 105 Q 112 108 120 105" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-
-  <!-- Boca calma -->
-  <circle cx="100" cy="120" r="2" fill="#1f2937" />
-
-  <!-- Bochechas -->
-  <circle cx="70" cy="115" r="8" fill="url(#bloomiBlush)" opacity="0.6" />
-  <circle cx="130" cy="115" r="8" fill="url(#bloomiBlush)" opacity="0.6" />
-
-  <!-- "Zzz" dormindo -->
-  <text x="150" y="60" font-size="10" fill="#666" opacity="0.8">Z</text>
-  <text x="157" y="55" font-size="8" fill="#666" opacity="0.6">z</text>
-  <text x="162" y="51" font-size="6" fill="#666" opacity="0.4">z</text>
-
-  <!-- Gradientes -->
-  <defs>
-    <radialGradient id="bloomiPetal1" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal2" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fed7d7" />
-      <stop offset="100%" stop-color="#f87171" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal3" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal4" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#e0e7ff" />
-      <stop offset="100%" stop-color="#8b5cf6" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal5" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#dcfce7" />
-      <stop offset="100%" stop-color="#22c55e" />
-    </radialGradient>
-    <radialGradient id="bloomiPetal6" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#dbeafe" />
-      <stop offset="100%" stop-color="#3b82f6" />
-    </radialGradient>
-    <radialGradient id="bloomiCenter" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="50%" stop-color="#fbbf24" />
-      <stop offset="100%" stop-color="#f59e0b" />
-    </radialGradient>
-    <radialGradient id="bloomiCenterHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" stop-color="#ffffff" />
-      <stop offset="100%" stop-color="rgba(255,255,255,0.3)" />
-    </radialGradient>
-    <radialGradient id="bloomiBlush" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="bloomiPollen" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/breezy/breezy-base.svg

@@ -1,100 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">  
-  <!-- Main leaf body - classic leaf shape -->
-  <path d="M 100 40 Q 70 60 60 90 Q 55 120 70 140 Q 85 155 100 160 Q 115 155 130 140 Q 145 120 140 90 Q 130 60 100 40" 
-        fill="url(#breezyBody)" />
-  
-  <!-- Leaf veins - central vein -->
-  <path d="M 100 45 L 100 155" stroke="url(#breezyVein)" stroke-width="3" opacity="0.6" />
-  
-  <!-- Side veins -->
-  <path d="M 100 70 L 80 85" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 70 L 120 85" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 100 L 75 115" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 100 L 125 115" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 130 L 85 140" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 130 L 115 140" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  
-  <!-- Inner leaf highlight -->
-  <path d="M 100 50 Q 75 65 68 85 Q 65 105 75 120 Q 85 130 100 135 Q 115 130 125 120 Q 135 105 132 85 Q 125 65 100 50" 
-        fill="url(#breezyInner)" opacity="0.6" />
-  
-  <!-- Eyes (white base) -->
-  <circle cx="85" cy="90" r="10" fill="white" />
-  <circle cx="115" cy="90" r="10" fill="white" />
-  
-  <!-- Pupils (dark circles + highlights) -->
-  <circle cx="85" cy="90" r="6" fill="#1f2937" />
-  <circle cx="115" cy="90" r="6" fill="#1f2937" />
-  <circle cx="87" cy="88" r="3" fill="white" />
-  <circle cx="117" cy="88" r="3" fill="white" />
-  
-  <!-- Mouth -->
-  <path d="M 85 110 Q 100 120 115 110" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  
-  <!-- Little arms -->
-  <path d="M 65 100 Q 55 95 50 105 Q 55 115 65 110" fill="url(#breezyArm)" />
-  <path d="M 135 100 Q 145 95 150 105 Q 145 115 135 110" fill="url(#breezyArm)" />
-  
-  <!-- Little legs -->
-  <ellipse cx="90" cy="155" rx="10" ry="8" fill="url(#breezyLeg)" />
-  <ellipse cx="110" cy="155" rx="10" ry="8" fill="url(#breezyLeg)" />
-  
-  <!-- Floating leaves with rotation groups -->
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="360" dur="8s" repeatCount="indefinite" />
-      <path d="M -50 -30 Q -55 -25 -50 -20 Q -45 -25 -50 -30" fill="url(#breezyFloating)" opacity="0.8" />
-    </g>
-  </g>
-
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="-360" dur="9s" repeatCount="indefinite" />
-      <path d="M 50 -25 Q 45 -20 50 -15 Q 55 -20 50 -25" fill="url(#breezyFloating)" opacity="0.6" />
-    </g>
-  </g>
-
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="360" dur="7s" repeatCount="indefinite" />
-      <path d="M -55 30 Q -60 35 -55 40 Q -50 35 -55 30" fill="url(#breezyFloating)" opacity="0.7" />
-    </g>
-  </g>
-
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="-360" dur="10s" repeatCount="indefinite" />
-      <path d="M 55 25 Q 50 30 55 35 Q 60 30 55 25" fill="url(#breezyFloating)" opacity="0.5" />
-    </g>
-  </g>
-  
-  <defs>
-    <radialGradient id="breezyBody" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#86efac" />
-      <stop offset="30%" stop-color="#4ade80" />
-      <stop offset="70%" stop-color="#22c55e" />
-      <stop offset="100%" stop-color="#16a34a" />
-    </radialGradient>
-    <radialGradient id="breezyInner" cx="0.4" cy="0.3">
-      <stop offset="0%" stop-color="#bbf7d0" />
-      <stop offset="100%" stop-color="#86efac" />
-    </radialGradient>
-    <linearGradient id="breezyVein" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" stop-color="#15803d" />
-      <stop offset="50%" stop-color="#16a34a" />
-      <stop offset="100%" stop-color="#15803d" />
-    </linearGradient>
-    <radialGradient id="breezyArm" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#4ade80" />
-      <stop offset="100%" stop-color="#16a34a" />
-    </radialGradient>
-    <radialGradient id="breezyLeg" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#22c55e" />
-      <stop offset="100%" stop-color="#15803d" />
-    </radialGradient>
-    <radialGradient id="breezyFloating" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#86efac" />
-      <stop offset="100%" stop-color="#22c55e" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/breezy/breezy-sleeping.svg

@@ -1,95 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">  
-  <!-- Main leaf body -->
-  <path d="M 100 40 Q 70 60 60 90 Q 55 120 70 140 Q 85 155 100 160 Q 115 155 130 140 Q 145 120 140 90 Q 130 60 100 40" 
-        fill="url(#breezyBody)" />
-  
-  <!-- Leaf veins -->
-  <path d="M 100 45 L 100 155" stroke="url(#breezyVein)" stroke-width="3" opacity="0.6" />
-  <path d="M 100 70 L 80 85" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 70 L 120 85" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 100 L 75 115" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 100 L 125 115" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 130 L 85 140" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  <path d="M 100 130 L 115 140" stroke="url(#breezyVein)" stroke-width="2" opacity="0.5" />
-  
-  <!-- Inner leaf highlight -->
-  <path d="M 100 50 Q 75 65 68 85 Q 65 105 75 120 Q 85 130 100 135 Q 115 130 125 120 Q 135 105 132 85 Q 125 65 100 50" 
-        fill="url(#breezyInner)" opacity="0.6" />
-
-  <!-- Olhos dormindo -->
-  <path d="M 75 90 Q 85 93 95 90" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  <path d="M 105 90 Q 115 93 125 90" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-
-  <!-- Boca tranquila -->
-  <circle cx="100" cy="110" r="2" fill="#1f2937" />
-
-  <!-- Little arms -->
-  <path d="M 65 100 Q 55 95 50 105 Q 55 115 65 110" fill="url(#breezyArm)" />
-  <path d="M 135 100 Q 145 95 150 105 Q 145 115 135 110" fill="url(#breezyArm)" />
-
-  <!-- Little legs -->
-  <ellipse cx="90" cy="155" rx="10" ry="8" fill="url(#breezyLeg)" />
-  <ellipse cx="110" cy="155" rx="10" ry="8" fill="url(#breezyLeg)" />
-
-  <!-- Floating leaves -->
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="360" dur="8s" repeatCount="indefinite" />
-      <path d="M -50 -30 Q -55 -25 -50 -20 Q -45 -25 -50 -30" fill="url(#breezyFloating)" opacity="0.6" />
-    </g>
-  </g>
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="-360" dur="9s" repeatCount="indefinite" />
-      <path d="M 50 -25 Q 45 -20 50 -15 Q 55 -20 50 -25" fill="url(#breezyFloating)" opacity="0.5" />
-    </g>
-  </g>
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="360" dur="7s" repeatCount="indefinite" />
-      <path d="M -55 30 Q -60 35 -55 40 Q -50 35 -55 30" fill="url(#breezyFloating)" opacity="0.5" />
-    </g>
-  </g>
-  <g transform="translate(100 100)">
-    <g>
-      <animateTransform attributeName="transform" type="rotate" from="0" to="-360" dur="10s" repeatCount="indefinite" />
-      <path d="M 55 25 Q 50 30 55 35 Q 60 30 55 25" fill="url(#breezyFloating)" opacity="0.4" />
-    </g>
-  </g>
-
-  <!-- "Zzz" dormindo -->
-  <text x="150" y="60" font-size="10" fill="#666" opacity="0.8">Z</text>
-  <text x="157" y="55" font-size="8" fill="#666" opacity="0.6">z</text>
-  <text x="162" y="51" font-size="6" fill="#666" opacity="0.4">z</text>
-
-  <!-- Gradientes -->
-  <defs>
-    <radialGradient id="breezyBody" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#86efac" />
-      <stop offset="30%" stop-color="#4ade80" />
-      <stop offset="70%" stop-color="#22c55e" />
-      <stop offset="100%" stop-color="#16a34a" />
-    </radialGradient>
-    <radialGradient id="breezyInner" cx="0.4" cy="0.3">
-      <stop offset="0%" stop-color="#bbf7d0" />
-      <stop offset="100%" stop-color="#86efac" />
-    </radialGradient>
-    <linearGradient id="breezyVein" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" stop-color="#15803d" />
-      <stop offset="50%" stop-color="#16a34a" />
-      <stop offset="100%" stop-color="#15803d" />
-    </linearGradient>
-    <radialGradient id="breezyArm" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#4ade80" />
-      <stop offset="100%" stop-color="#16a34a" />
-    </radialGradient>
-    <radialGradient id="breezyLeg" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#22c55e" />
-      <stop offset="100%" stop-color="#15803d" />
-    </radialGradient>
-    <radialGradient id="breezyFloating" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#86efac" />
-      <stop offset="100%" stop-color="#22c55e" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/cacti/cacti-base.svg

@@ -1,75 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  
-  <!-- Main cactus body -->
-  <rect x="85" y="80" width="30" height="80" rx="15" fill="url(#cactiBody)" />
-  
-  <!-- Cactus arms -->
-  <rect x="60" y="100" width="20" height="40" rx="10" fill="url(#cactiArm)" />
-  <rect x="120" y="110" width="20" height="35" rx="10" fill="url(#cactiArm)" />
-  
-  <!-- Cactus ridges -->
-  <line x1="92" y1="85" x2="92" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  <line x1="100" y1="85" x2="100" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  <line x1="108" y1="85" x2="108" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  
-  <!-- Eyes (white base) -->
-  <circle cx="90" cy="105" r="8" fill="white" />
-  <circle cx="110" cy="105" r="8" fill="white" />
-  
-  <!-- Pupils (dark circles + highlights) -->
-  <circle cx="90" cy="105" r="5" fill="#1f2937" />
-  <circle cx="110" cy="105" r="5" fill="#1f2937" />
-  <circle cx="92" cy="103" r="2" fill="white" />
-  <circle cx="112" cy="103" r="2" fill="white" />
-  
-  <!-- Mouth -->
-  <path d="M 92 120 Q 100 126 108 120" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  
-  <!-- Tiny spines -->
-  <circle cx="88" cy="90" r="1" fill="#65a30d" />
-  <circle cx="95" cy="95" r="1" fill="#65a30d" />
-  <circle cx="105" cy="92" r="1" fill="#65a30d" />
-  <circle cx="112" cy="88" r="1" fill="#65a30d" />
-  <circle cx="65" cy="110" r="1" fill="#65a30d" />
-  <circle cx="70" cy="120" r="1" fill="#65a30d" />
-  <circle cx="125" cy="115" r="1" fill="#65a30d" />
-  <circle cx="130" cy="125" r="1" fill="#65a30d" />
-  
-  <!-- Little legs in pot -->
-  <path d="M 75 160 L 80 175 L 120 175 L 125 160 Z" fill="url(#cactiPot)" />
-  <rect x="75" y="160" width="50" height="5" fill="url(#cactiPotRim)" rx="2" />
-  
-  <!-- Blooming flower -->
-  <circle cx="100" cy="75" r="12" fill="url(#cactiFlower)" />
-  <circle cx="100" cy="75" r="8" fill="url(#cactiFlowerCenter)" />
-  <circle cx="100" cy="75" r="4" fill="#fbbf24" />
-  
-  <defs>
-    <radialGradient id="cactiBody" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#a3e635" />
-      <stop offset="30%" stop-color="#84cc16" />
-      <stop offset="70%" stop-color="#65a30d" />
-      <stop offset="100%" stop-color="#4d7c0f" />
-    </radialGradient>
-    <radialGradient id="cactiArm" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#84cc16" />
-      <stop offset="100%" stop-color="#65a30d" />
-    </radialGradient>
-    <radialGradient id="cactiPot" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#dc2626" />
-      <stop offset="100%" stop-color="#991b1b" />
-    </radialGradient>
-    <radialGradient id="cactiPotRim" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#ef4444" />
-      <stop offset="100%" stop-color="#dc2626" />
-    </radialGradient>
-    <radialGradient id="cactiFlower" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="cactiFlowerCenter" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/cacti/cacti-sleeping.svg

@@ -1,74 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  
-  <!-- Main cactus body -->
-  <rect x="85" y="80" width="30" height="80" rx="15" fill="url(#cactiBody)" />
-  
-  <!-- Cactus arms -->
-  <rect x="60" y="100" width="20" height="40" rx="10" fill="url(#cactiArm)" />
-  <rect x="120" y="110" width="20" height="35" rx="10" fill="url(#cactiArm)" />
-  
-  <!-- Cactus ridges -->
-  <line x1="92" y1="85" x2="92" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  <line x1="100" y1="85" x2="100" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  <line x1="108" y1="85" x2="108" y2="155" stroke="#65a30d" stroke-width="2" opacity="0.5" />
-  
-  <!-- Sleeping eyes -->
-  <path d="M 82 105 Q 90 108 98 105" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  <path d="M 102 105 Q 110 108 118 105" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  
-  <!-- Peaceful mouth -->
-  <circle cx="100" cy="120" r="2" fill="#1f2937" />
-  
-  <!-- Tiny spines -->
-  <circle cx="88" cy="90" r="1" fill="#65a30d" />
-  <circle cx="95" cy="95" r="1" fill="#65a30d" />
-  <circle cx="105" cy="92" r="1" fill="#65a30d" />
-  <circle cx="112" cy="88" r="1" fill="#65a30d" />
-  <circle cx="65" cy="110" r="1" fill="#65a30d" />
-  <circle cx="70" cy="120" r="1" fill="#65a30d" />
-  <circle cx="125" cy="115" r="1" fill="#65a30d" />
-  <circle cx="130" cy="125" r="1" fill="#65a30d" />
-  
-  <!-- Little legs in pot -->
-  <path d="M 75 160 L 80 175 L 120 175 L 125 160 Z" fill="url(#cactiPot)" />
-  <rect x="75" y="160" width="50" height="5" fill="url(#cactiPotRim)" rx="2" />
-  
-  <!-- Blooming flower -->
-  <circle cx="100" cy="75" r="12" fill="url(#cactiFlower)" />
-  <circle cx="100" cy="75" r="8" fill="url(#cactiFlowerCenter)" />
-  <circle cx="100" cy="75" r="4" fill="#fbbf24" />
-
-  <!-- "Zzz" sleeping -->
-  <text x="150" y="60" font-size="10" fill="#666" opacity="0.8">Z</text>
-  <text x="157" y="55" font-size="8" fill="#666" opacity="0.6">z</text>
-  <text x="162" y="51" font-size="6" fill="#666" opacity="0.4">z</text>
-  
-  <defs>
-    <radialGradient id="cactiBody" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#a3e635" />
-      <stop offset="30%" stop-color="#84cc16" />
-      <stop offset="70%" stop-color="#65a30d" />
-      <stop offset="100%" stop-color="#4d7c0f" />
-    </radialGradient>
-    <radialGradient id="cactiArm" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#84cc16" />
-      <stop offset="100%" stop-color="#65a30d" />
-    </radialGradient>
-    <radialGradient id="cactiPot" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#dc2626" />
-      <stop offset="100%" stop-color="#991b1b" />
-    </radialGradient>
-    <radialGradient id="cactiPotRim" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#ef4444" />
-      <stop offset="100%" stop-color="#dc2626" />
-    </radialGradient>
-    <radialGradient id="cactiFlower" cx="0.3" cy="0.3">
-      <stop offset="0%" stop-color="#fce7f3" />
-      <stop offset="100%" stop-color="#f472b6" />
-    </radialGradient>
-    <radialGradient id="cactiFlowerCenter" cx="0.5" cy="0.5">
-      <stop offset="0%" stop-color="#fef3c7" />
-      <stop offset="100%" stop-color="#fbbf24" />
-    </radialGradient>
-  </defs>
-</svg>

src/blobbi/adult-blobbi/assets/catti/catti-base.svg

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <!-- Gradients for 3D effect -->
-    <radialGradient id="cattiBody3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#fed7aa;stop-opacity:1" />
-      <stop offset="40%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEar3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEarInner" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fbbf24;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f59e0b;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEyeWhite3D" cx="0.3" cy="0.3">
-      <stop offset="0%" style="stop-color:#ffffff;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f3f4f6;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiPupil3D" cx="0.3" cy="0.3">
-      <stop offset="0%" style="stop-color:#374151;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#1f2937;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiNose3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#f472b6;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#be185d;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiNoseHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fce7f3;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f472b6;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiTail3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#fed7aa;stop-opacity:1" />
-      <stop offset="50%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiTailHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fef3c7;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#fed7aa;stop-opacity:1" />
-    </radialGradient>
-    <linearGradient id="cattiMouth3D" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" style="stop-color:#374151;stop-opacity:1" />
-      <stop offset="50%" style="stop-color:#1f2937;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#374151;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  
-  <!-- Oval upright body -->
-  <ellipse cx="100" cy="120" rx="45" ry="60" fill="url(#cattiBody3D)" />
-  
-  <!-- Triangle ears -->
-  <path d="M 68 72 L 58 48 L 82 62 Z" fill="url(#cattiEar3D)" />
-  <path d="M 132 72 L 142 48 L 118 62 Z" fill="url(#cattiEar3D)" />
-  <path d="M 70 62 L 64 52 L 76 58 Z" fill="url(#cattiEarInner)" />
-  <path d="M 130 62 L 136 52 L 124 58 Z" fill="url(#cattiEarInner)" />
-  
-  <!-- Eyes (white/base eye shapes) -->
-  <ellipse cx="85" cy="100" rx="12" ry="16" fill="url(#cattiEyeWhite3D)" />
-  <ellipse cx="115" cy="100" rx="12" ry="16" fill="url(#cattiEyeWhite3D)" />
-  
-  <!-- Pupils (pupil + highlights) -->
-  <ellipse cx="85" cy="100" rx="8" ry="12" fill="url(#cattiPupil3D)" />
-  <ellipse cx="115" cy="100" rx="8" ry="12" fill="url(#cattiPupil3D)" />
-  <ellipse cx="87" cy="97" rx="3" ry="4" fill="white" opacity="0.9" />
-  <ellipse cx="117" cy="97" rx="3" ry="4" fill="white" opacity="0.9" />
-  
-  <!-- Nose -->
-  <path d="M 94 115 L 100 122 L 106 115 Z" fill="url(#cattiNose3D)" />
-  <path d="M 96 116 L 100 120 L 104 116 Z" fill="url(#cattiNoseHighlight)" />
-  
-  <!-- Mouth -->
-  <path d="M 100 122 Q 88 128 82 122" stroke="url(#cattiMouth3D)" stroke-width="2.5" fill="none" stroke-linecap="round" />
-  <path d="M 100 122 Q 112 128 118 122" stroke="url(#cattiMouth3D)" stroke-width="2.5" fill="none" stroke-linecap="round" />
-  
-  <!-- Enhanced curved tail -->
-  <path d="M 145 140 Q 165 115 158 95 Q 148 75 165 65" stroke="url(#cattiTail3D)" stroke-width="22" fill="none" stroke-linecap="round" />
-  <path d="M 145 140 Q 163 117 156 97 Q 148 79 163 69" stroke="url(#cattiTailHighlight)" stroke-width="16" fill="none" stroke-linecap="round" />
-  
-  <!-- Enhanced whiskers -->
-  <path d="M 48 108 Q 58 110 72 108" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 48 118 Q 58 120 72 118" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 128 108 Q 138 110 152 108" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 128 118 Q 138 120 152 118" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  
-  <!-- Soft fur texture details -->
-  <ellipse cx="75" cy="135" rx="3" ry="2" fill="rgba(255,255,255,0.2)" />
-  <ellipse cx="125" cy="130" rx="2.5" ry="2" fill="rgba(255,255,255,0.2)" />
-  <ellipse cx="90" cy="150" rx="2" ry="1.5" fill="rgba(255,255,255,0.15)" />
-</svg>

src/blobbi/adult-blobbi/assets/catti/catti-sleeping.svg

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <!-- Gradients for 3D effect -->
-    <radialGradient id="cattiBody3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#fed7aa;stop-opacity:1" />
-      <stop offset="40%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEar3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEarInner" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fbbf24;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f59e0b;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiEyeWhite3D" cx="0.3" cy="0.3">
-      <stop offset="0%" style="stop-color:#ffffff;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f3f4f6;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiPupil3D" cx="0.3" cy="0.3">
-      <stop offset="0%" style="stop-color:#374151;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#1f2937;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiNose3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#f472b6;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#be185d;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiNoseHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fce7f3;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#f472b6;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiTail3D" cx="0.3" cy="0.2">
-      <stop offset="0%" style="stop-color:#fed7aa;stop-opacity:1" />
-      <stop offset="50%" style="stop-color:#f97316;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#c2410c;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient id="cattiTailHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" style="stop-color:#fef3c7;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#fed7aa;stop-opacity:1" />
-    </radialGradient>
-    <linearGradient id="cattiMouth3D" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" style="stop-color:#374151;stop-opacity:1" />
-      <stop offset="50%" style="stop-color:#1f2937;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#374151;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  
-  <!-- Oval upright body -->
-  <ellipse cx="100" cy="120" rx="45" ry="60" fill="url(#cattiBody3D)" />
-  
-  <!-- Triangle ears -->
-  <path d="M 68 72 L 58 48 L 82 62 Z" fill="url(#cattiEar3D)" />
-  <path d="M 132 72 L 142 48 L 118 62 Z" fill="url(#cattiEar3D)" />
-  <path d="M 70 62 L 64 52 L 76 58 Z" fill="url(#cattiEarInner)" />
-  <path d="M 130 62 L 136 52 L 124 58 Z" fill="url(#cattiEarInner)" />
-  
-  <!-- Sleeping eyes -->
-  <path d="M 73 100 Q 85 103 97 100" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  <path d="M 103 100 Q 115 103 127 100" stroke="#1f2937" stroke-width="3" fill="none" stroke-linecap="round" />
-  
-  <!-- Enhanced cat nose -->
-  <path d="M 94 115 L 100 122 L 106 115 Z" fill="url(#cattiNose3D)" />
-  <path d="M 96 116 L 100 120 L 104 116 Z" fill="url(#cattiNoseHighlight)" />
-  
-  <!-- Peaceful mouth -->
-  <circle cx="100" cy="125" r="2" fill="#1f2937" />
-  
-  <!-- Enhanced curved tail -->
-  <path d="M 145 140 Q 165 115 158 95 Q 148 75 165 65" stroke="url(#cattiTail3D)" stroke-width="22" fill="none" stroke-linecap="round" />
-  <path d="M 145 140 Q 163 117 156 97 Q 148 79 163 69" stroke="url(#cattiTailHighlight)" stroke-width="16" fill="none" stroke-linecap="round" />
-  
-  <!-- Enhanced whiskers -->
-  <path d="M 48 108 Q 58 110 72 108" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 48 118 Q 58 120 72 118" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 128 108 Q 138 110 152 108" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  <path d="M 128 118 Q 138 120 152 118" stroke="#1e293b" stroke-width="1.8" fill="none" stroke-linecap="round" />
-  
-  <!-- Soft fur texture details -->
-  <ellipse cx="75" cy="135" rx="3" ry="2" fill="rgba(255,255,255,0.2)" />
-  <ellipse cx="125" cy="130" rx="2.5" ry="2" fill="rgba(255,255,255,0.2)" />
-  <ellipse cx="90" cy="150" rx="2" ry="1.5" fill="rgba(255,255,255,0.15)" />
-
-  <!-- "Zzz" sleeping -->
-  <text x="150" y="60" font-size="10" fill="#666" opacity="0.8">Z</text>
-  <text x="157" y="55" font-size="8" fill="#666" opacity="0.6">z</text>
-  <text x="162" y="51" font-size="6" fill="#666" opacity="0.4">z</text>
-</svg>

src/blobbi/adult-blobbi/assets/cloudi/cloudi-base.svg

@@ -1,49 +0,0 @@
-<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">  
-  <!-- Main cloud body - multiple overlapping circles -->
-  <circle cx="100" cy="120" r="45" fill="url(#cloudiBody)" />
-  <circle cx="75" cy="110" r="35" fill="url(#cloudiBody)" />
-  <circle cx="125" cy="110" r="35" fill="url(#cloudiBody)" />
-  <circle cx="85" cy="95" r="25" fill="url(#cloudiBody)" />
-  <circle cx="115" cy="95" r="25" fill="url(#cloudiBody)" />
-  <circle cx="100" cy="85" r="30" fill="url(#cloudiBody)" />
-  
-  <!-- Fluffy highlights -->
-  <circle cx="90" cy="100" r="20" fill="url(#cloudiHighlight)" opacity="0.6" />
-  <circle cx="110" cy="105" r="18" fill="url(#cloudiHighlight)" opacity="0.5" />
-  <circle cx="100" cy="90" r="15" fill="url(#cloudiHighlight)" opacity="0.7" />
-  
-  <!-- Eyes (white/base eye shapes) -->
-  <circle cx="88" cy="100" r="8" fill="white" />
-  <circle cx="112" cy="100" r="8" fill="white" />
-  
-  <!-- Pupils (pupil + highlights) -->
-  <circle cx="88" cy="100" r="5" fill="#64748b" />
-  <circle cx="112" cy="100" r="5" fill="#64748b" />
-  <circle cx="90" cy="98" r="2" fill="white" />
-  <circle cx="114" cy="98" r="2" fill="white" />
-  
-  <!-- Mouth -->
-  <path d="M 92 115 Q 100 122 108 115" stroke="#64748b" stroke-width="3" fill="none" stroke-linecap="round" />
-  
-  <!-- Floating raindrops -->
-  <circle cx="70" cy="140" r="3" fill="url(#cloudiRain)" opacity="0.8" />
-  <circle cx="130" cy="145" r="2.5" fill="url(#cloudiRain)" opacity="0.6" />
-  <circle cx="85" cy="155" r="2" fill="url(#cloudiRain)" opacity="0.7" />
-  <circle cx="115" cy="150" r="2.5" fill="url(#cloudiRain)" opacity="0.5" />
-  
-  <defs>
-    <radialGradient id="cloudiBody" cx="0.3" cy="0.2">
-      <stop offset="0%" stop-color="#ffffff" />
-      <stop offset="50%" stop-color="#f1f5f9" />
-      <stop offset="100%" stop-color="#e2e8f0" />
-    </radialGradient>
-    <radialGradient id="cloudiHighlight" cx="0.4" cy="0.3">
-      <stop offset="0%" stop-color="#ffffff" />
-      <stop offset="100%" stop-color="rgba(255,255,255,0.5)" />
-    </radialGradient>
-    <radialGradient id="cloudiRain" cx="0.5" cy="0.3">
-      <stop offset="0%" stop-color="#60a5fa" />
-      <stop offset="100%" stop-color="#3b82f6" />
-    </radialGradient>
-  </defs>
-</svg>