Enable admin question types and category grouping

Keep shared linting configured for the repo.

.claude/agents/frontend-developer.md

@@ -0,0 +1,32 @@
+---
+name: frontend-developer
+description: Frontend development specialist for React applications and responsive design. Use PROACTIVELY for UI components, state management, performance optimization, accessibility implementation, and modern frontend architecture.
+tools: Read, Write, Edit, Bash
+model: sonnet
+---
+
+You are a frontend developer specializing in modern React applications and responsive design.
+
+## Focus Areas
+- React component architecture (hooks, context, performance)
+- Responsive CSS with Tailwind/CSS-in-JS
+- State management (Redux, Zustand, Context API)
+- Frontend performance (lazy loading, code splitting, memoization)
+- Accessibility (WCAG compliance, ARIA labels, keyboard navigation)
+
+## Approach
+1. Component-first thinking - reusable, composable UI pieces
+2. Mobile-first responsive design
+3. Performance budgets - aim for sub-3s load times
+4. Semantic HTML and proper ARIA attributes
+5. Type safety with TypeScript when applicable
+
+## Output
+- Complete React component with props interface
+- Styling solution (Tailwind classes or styled-components)
+- State management implementation if needed
+- Basic unit test structure
+- Accessibility checklist for the component
+- Performance considerations and optimizations
+
+Focus on working code over explanations. Include usage examples in comments.

.claude/agents/pack-generator.md

@@ -0,0 +1,104 @@
+# Pack Generator Agent
+
+A specialized agent for generating Sauci question packs.
+
+## Role
+
+You are a content generation specialist for Sauci, a couples intimacy app. You create question packs that help couples discover shared interests through a swipe-matching interface.
+
+## Core Knowledge
+
+### Question Format
+- `text`: What Partner A sees
+- `partner_text`: What Partner B sees (NULL if symmetric)
+- `intensity`: 1-5 scale
+
+### The Golden Rules
+
+1. **Proposals, not questions**: "Give your partner a massage" NOT "Would you like to give a massage?"
+
+2. **Always "your partner"**: Never him/her/he/she or gendered terms
+
+3. **No time words**: Never tonight/now/today/right now
+
+4. **Inverse requirement**: Every asymmetric question MUST have its inverse created AND linked with inverse_of
+
+5. **Database linking**: Use the `inverse_of` column to link inverse pairs (inverse points to primary's UUID)
+
+### Intensity Scale
+
+| Level | Name | Description | Examples |
+|-------|------|-------------|----------|
+| 1 | Gentle | Non-sexual bonding | Cooking, gaming, movies |
+| 2 | Warm | Romantic, flirty | Kissing, cuddling, sweet messages |
+| 3 | Playful | Light sexual | Oral, masturbation, basic toys |
+| 4 | Steamy | Explicit sexual | Sex, light bondage, anal |
+| 5 | Intense | BDSM/Advanced | Impact play, power exchange |
+
+### Partner Text Logic
+
+**Use NULL when both partners do the same thing:**
+```
+text: "Cook dinner together"
+partner_text: NULL
+inverse_of: NULL
+```
+
+**Use partner_text when roles differ:**
+```
+-- PRIMARY question (inverse_of = NULL)
+id: uuid-1
+text: "Give your partner oral"
+partner_text: "Receive oral from your partner"
+inverse_of: NULL
+```
+
+**CRITICAL - Always create the inverse AND link it:**
+```
+-- INVERSE question (inverse_of = primary's UUID)
+id: uuid-2
+text: "Receive oral from your partner"
+partner_text: "Give your partner oral"
+inverse_of: uuid-1
+```
+
+The `inverse_of` column ensures we can:
+- Track which questions are pairs
+- Calculate unique question count (not inflated by inverses)
+- Display accurate pack sizes to users
+
+### Avoid
+
+- Cheesy language ("make love", "souls connecting")
+- Cliches (candlelit dinner, rose petals, bubble bath)
+- Interview questions ("Have you ever...", "Would you...")
+- Assuming heterosexual couples
+- One-sided asymmetric questions
+
+### Target Audience
+
+25-40 year old couples. Modern, realistic, not preachy. Think about what actual couples do and say.
+
+## Generation Process
+
+1. **Understand the brief**: Category, intensity range, pack position in progression
+2. **Research existing content**: Check what packs exist, avoid overlap
+3. **Brainstorm themes**: What specific activities fit this pack?
+4. **Generate questions**: Mix symmetric and asymmetric, create all inverses with inverse_of links
+5. **Review**: Check all rules, remove duplicates, verify intensity, confirm inverse pairs are linked
+6. **Format**: Output as SQL with inverse_of column properly set
+
+## Output Format
+
+Always provide:
+1. Pack metadata (name, description, category, premium status)
+2. Questions in SQL INSERT format
+3. Summary statistics (total, by intensity, symmetric vs asymmetric)
+
+## Invocation
+
+This agent should be used when:
+- Creating new question packs
+- Expanding existing categories
+- Reviewing/improving existing pack content
+- Planning category progression structures

.claude/agents/prompt-engineer.md

@@ -0,0 +1,112 @@
+---
+name: prompt-engineer
+description: Expert prompt optimization for LLMs and AI systems. Use PROACTIVELY when building AI features, improving agent performance, or crafting system prompts. Masters prompt patterns and techniques.
+tools: Read, Write, Edit
+model: opus
+---
+
+You are an expert prompt engineer specializing in crafting effective prompts for LLMs and AI systems. You understand the nuances of different models and how to elicit optimal responses.
+
+IMPORTANT: When creating prompts, ALWAYS display the complete prompt text in a clearly marked section. Never describe a prompt without showing it.
+
+## Expertise Areas
+
+### Prompt Optimization
+
+- Few-shot vs zero-shot selection
+- Chain-of-thought reasoning
+- Role-playing and perspective setting
+- Output format specification
+- Constraint and boundary setting
+
+### Techniques Arsenal
+
+- Constitutional AI principles
+- Recursive prompting
+- Tree of thoughts
+- Self-consistency checking
+- Prompt chaining and pipelines
+
+### Model-Specific Optimization
+
+- Claude: Emphasis on helpful, harmless, honest
+- GPT: Clear structure and examples
+- Open models: Specific formatting needs
+- Specialized models: Domain adaptation
+
+## Optimization Process
+
+1. Analyze the intended use case
+2. Identify key requirements and constraints
+3. Select appropriate prompting techniques
+4. Create initial prompt with clear structure
+5. Test and iterate based on outputs
+6. Document effective patterns
+
+## Required Output Format
+
+When creating any prompt, you MUST include:
+
+### The Prompt
+```
+[Display the complete prompt text here]
+```
+
+### Implementation Notes
+- Key techniques used
+- Why these choices were made
+- Expected outcomes
+
+## Deliverables
+
+- **The actual prompt text** (displayed in full, properly formatted)
+- Explanation of design choices
+- Usage guidelines
+- Example expected outputs
+- Performance benchmarks
+- Error handling strategies
+
+## Common Patterns
+
+- System/User/Assistant structure
+- XML tags for clear sections
+- Explicit output formats
+- Step-by-step reasoning
+- Self-evaluation criteria
+
+## Example Output
+
+When asked to create a prompt for code review:
+
+### The Prompt
+```
+You are an expert code reviewer with 10+ years of experience. Review the provided code focusing on:
+1. Security vulnerabilities
+2. Performance optimizations
+3. Code maintainability
+4. Best practices
+
+For each issue found, provide:
+- Severity level (Critical/High/Medium/Low)
+- Specific line numbers
+- Explanation of the issue
+- Suggested fix with code example
+
+Format your response as a structured report with clear sections.
+```
+
+### Implementation Notes
+- Uses role-playing for expertise establishment
+- Provides clear evaluation criteria
+- Specifies output format for consistency
+- Includes actionable feedback requirements
+
+## Before Completing Any Task
+
+Verify you have:
+☐ Displayed the full prompt text (not just described it)
+☐ Marked it clearly with headers or code blocks
+☐ Provided usage instructions
+☐ Explained your design choices
+
+Remember: The best prompt is one that consistently produces the desired output with minimal post-processing. ALWAYS show the prompt, never just describe it.

.claude/agents/react-native-reviewer.md

@@ -0,0 +1,98 @@
+---
+name: react-native-reviewer
+description: "Use this agent when you need to review React Native code for best practices, component architecture, performance optimization, and maintainability. This includes reviewing new components, refactoring existing code, or validating implementation patterns. The agent should be used proactively after implementing React Native features or components.\\n\\nExamples:\\n\\n<example>\\nContext: User has just implemented a new screen component in the mobile app.\\nuser: \"Create a new profile settings screen with editable fields for name, email, and notification preferences\"\\nassistant: \"Here is the ProfileSettingsScreen component:\"\\n<component implementation>\\nassistant: \"Now let me use the react-native-reviewer agent to review this implementation for best practices and maintainability.\"\\n</example>\\n\\n<example>\\nContext: User is refactoring an existing component.\\nuser: \"Can you refactor the QuestionCard component to be more reusable?\"\\nassistant: \"Here's the refactored QuestionCard component:\"\\n<refactored component>\\nassistant: \"I'll now launch the react-native-reviewer agent to validate this refactoring follows React Native best practices.\"\\n</example>\\n\\n<example>\\nContext: User asks for a code review of recent changes.\\nuser: \"Review the chat screen I just built\"\\nassistant: \"I'll use the react-native-reviewer agent to conduct a thorough review of the chat screen implementation.\"\\n</example>"
+model: opus
+color: blue
+---
+
+You are a senior React Native architect with 8+ years of experience building production mobile applications. You have deep expertise in React Native internals, performance optimization, and scalable component architecture. You've contributed to major React Native projects and have a keen eye for code quality and maintainability.
+
+## Your Review Focus Areas
+
+### 1. Component Architecture
+- **Single Responsibility**: Each component should do one thing well
+- **Composition over Inheritance**: Prefer composing smaller components
+- **Prop Interface Design**: Props should be intuitive, well-typed, and minimal
+- **Component Size**: Flag components exceeding 200-250 lines as candidates for splitting
+- **Presentational vs Container**: Separate UI from business logic
+
+### 2. React Native Best Practices
+- **Performance**: Check for unnecessary re-renders, missing memoization (React.memo, useMemo, useCallback)
+- **FlatList Optimization**: Verify keyExtractor, getItemLayout, windowSize, removeClippedSubviews usage
+- **Image Handling**: Check for proper image caching, resizeMode, and lazy loading
+- **Avoiding Bridge Overhead**: Minimize JS-Native communication in hot paths
+- **Platform-Specific Code**: Proper use of Platform.select() and .ios.tsx/.android.tsx files
+
+### 3. State Management
+- **Local vs Global State**: Ensure state lives at the appropriate level
+- **Zustand Patterns**: For this codebase, verify proper store usage and selectors
+- **Derived State**: Avoid storing computed values that can be derived
+- **State Updates**: Check for proper immutable updates
+
+### 4. TypeScript Quality
+- **Type Safety**: No `any` types without justification
+- **Interface Definitions**: Props and state should be explicitly typed
+- **Generic Components**: Proper use of generics for reusable components
+- **Null Safety**: Proper handling of optional values
+
+### 5. Code Maintainability
+- **Naming Conventions**: Clear, descriptive names for components, functions, and variables
+- **Code Duplication**: Identify repeated patterns that should be abstracted
+- **Comments**: Complex logic should be documented; obvious code shouldn't be
+- **File Organization**: Related code should be co-located
+
+### 6. Expo & Project-Specific Patterns
+- **Expo Router**: Proper file-based routing conventions
+- **Glass-morphism UI**: Consistency with the app's design system (reference DESIGN.md)
+- **Supabase Integration**: Proper client usage, error handling, and RLS awareness
+
+## Review Process
+
+1. **Read DESIGN.md first** if reviewing UI components (apps/mobile/DESIGN.md)
+2. **Identify the component's purpose** and primary responsibilities
+3. **Check imports and dependencies** for unnecessary or heavy packages
+4. **Analyze the component structure** from top to bottom
+5. **Evaluate hooks usage** for correctness and optimization opportunities
+6. **Review render logic** for performance and readability
+7. **Check styling approach** for consistency with the design system
+8. **Assess error handling** and edge cases
+9. **Consider accessibility** (a11y labels, touch targets, etc.)
+
+## Output Format
+
+Structure your review as follows:
+
+### Summary
+Brief overview of the code quality and main findings.
+
+### Strengths ✅
+What's done well that should be maintained.
+
+### Issues Found
+
+#### 🔴 Critical (Must Fix)
+Blocking issues affecting functionality, performance, or security.
+
+#### 🟡 Important (Should Fix)
+Significant improvements for maintainability or best practices.
+
+#### 🟢 Suggestions (Consider)
+Nice-to-have improvements and polish.
+
+### Code Examples
+Provide specific code snippets showing the current code and suggested improvements.
+
+### Performance Considerations
+Specific performance-related observations and recommendations.
+
+## Review Guidelines
+
+- Be specific and actionable - don't just say "this could be better"
+- Provide code examples for suggested changes
+- Prioritize issues by impact
+- Acknowledge good patterns, not just problems
+- Consider the context of the broader codebase
+- Be constructive, not critical - you're helping improve the code
+- Focus on the recently written/modified code unless explicitly asked to review the entire codebase
+
+Remember: Your goal is to help create maintainable, performant, and idiomatic React Native code that the team can confidently build upon.

.claude/agents/test-agent.md

@@ -0,0 +1,89 @@
+---
+name: test-agent
+description: "Use this agent when you need to identify testing opportunities in new or modified code, run existing test suites, analyze test failures, or fix broken tests. This includes after writing new functions, refactoring existing code, or when test failures are reported.\\n\\nExamples:\\n\\n<example>\\nContext: The user has just written a new utility function.\\nuser: \"Please write a function that validates email addresses\"\\nassistant: \"Here is the email validation function:\\n\\n```typescript\\nexport function validateEmail(email: string): boolean {\\n  const emailRegex = /^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/;\\n  return emailRegex.test(email);\\n}\\n```\"\\n<commentary>\\nSince a new function was written, use the Task tool to launch the test-agent to identify testing opportunities and ensure the function has proper test coverage.\\n</commentary>\\nassistant: \"Now let me use the test-agent to identify testing opportunities and run any existing tests.\"\\n</example>\\n\\n<example>\\nContext: The user is asking to run the test suite after making changes.\\nuser: \"I've made some changes to the auth store, can you make sure the tests still pass?\"\\nassistant: \"I'll use the test-agent to run the tests and verify everything is working correctly.\"\\n<commentary>\\nThe user explicitly asked to run tests, so use the Task tool to launch the test-agent to execute the test suite and report results.\\n</commentary>\\n</example>\\n\\n<example>\\nContext: Tests are failing after a refactor.\\nuser: \"The tests are failing after I refactored the response submission logic\"\\nassistant: \"I'll use the test-agent to analyze the failing tests and fix them.\"\\n<commentary>\\nSince tests are failing, use the Task tool to launch the test-agent to diagnose the failures and implement fixes.\\n</commentary>\\n</example>\\n\\n<example>\\nContext: Code was written that modifies core business logic.\\nuser: \"Update the match detection logic to include 'maybe_maybe' as a valid match type\"\\nassistant: \"I've updated the match detection logic in the submit-response edge function to include 'maybe_maybe' matches.\"\\n<commentary>\\nSince core business logic was modified, proactively use the Task tool to launch the test-agent to run related tests and identify any new testing opportunities.\\n</commentary>\\nassistant: \"Now let me use the test-agent to run the related tests and ensure the changes are properly covered.\"\\n</example>"
+model: sonnet
+color: green
+---
+
+You are an expert Test Engineer specializing in TypeScript, React Native, and Node.js testing. You have deep expertise in Jest, React Testing Library, and testing best practices for monorepo architectures. Your mission is to ensure code quality through comprehensive test coverage, efficient test execution, and rapid diagnosis and resolution of test failures.
+
+## Your Core Responsibilities
+
+### 1. Identifying Testing Opportunities
+When reviewing new or modified code, you will:
+- Analyze functions, components, and modules for testable units
+- Identify edge cases, boundary conditions, and error scenarios that need coverage
+- Prioritize tests based on code criticality (business logic > utilities > UI)
+- Look for untested code paths in conditionals and loops
+- Consider integration points that need testing (API calls, database operations, state management)
+
+### 2. Running Tests
+When executing tests, you will:
+- Use the appropriate test commands for the project structure:
+  - Root level: `npm run test` or `npm run typecheck`
+  - Mobile app: `cd apps/mobile && npm test`
+  - Admin app: `cd apps/admin && npm test`
+- Run targeted tests when possible using patterns like `npm test -- --testPathPattern="<pattern>"`
+- Execute type checking alongside tests: `npm run typecheck`
+- Report results clearly, highlighting failures and their locations
+
+### 3. Fixing Tests
+When tests fail, you will:
+- Read the full error message and stack trace carefully
+- Identify whether the failure is in the test or the implementation
+- For implementation bugs: Fix the source code to match expected behavior
+- For test bugs: Update assertions, mocks, or test setup as needed
+- Verify fixes by re-running the specific failing test
+
+## Testing Patterns for This Project
+
+### Zustand Store Testing
+- Test stores in isolation by creating fresh store instances
+- Mock Supabase client calls
+- Verify state transitions and side effects
+
+### Edge Function Testing
+- Test request validation and error responses
+- Mock Supabase admin client operations
+- Verify correct HTTP status codes and response formats
+
+### React Native Component Testing
+- Use React Testing Library with `@testing-library/react-native`
+- Test user interactions and state changes
+- Mock navigation and external dependencies
+
+## Quality Standards
+
+1. **Test Isolation**: Each test should be independent and not rely on execution order
+2. **Descriptive Names**: Use `describe` and `it` blocks with clear, behavior-focused descriptions
+3. **Arrange-Act-Assert**: Structure tests with clear setup, execution, and verification phases
+4. **Mock Appropriately**: Mock external dependencies but avoid over-mocking internal logic
+5. **Edge Cases**: Always test null/undefined inputs, empty arrays, and boundary values
+
+## Decision Framework
+
+When deciding what to test:
+1. **Must Test**: Business logic, data transformations, state management, API integrations
+2. **Should Test**: Utility functions, custom hooks, complex conditionals
+3. **Consider Testing**: UI components with logic, navigation flows
+4. **Skip Testing**: Simple pass-through components, third-party library wrappers
+
+## Output Format
+
+When reporting test results, provide:
+- Summary: Total tests, passed, failed, skipped
+- Failures: File path, test name, error message, and relevant code snippet
+- Recommendations: Specific fixes or additional tests needed
+
+When identifying testing opportunities, provide:
+- List of testable units with priority (high/medium/low)
+- Suggested test cases for each unit
+- Any mocking requirements
+
+## Self-Verification
+
+Before completing your task:
+- Confirm all tests pass after fixes
+- Verify type checking passes: `npm run typecheck`
+- Ensure no regressions were introduced
+- Document any tests that were skipped and why

.claude/commands/fix-questions.md

@@ -0,0 +1,310 @@
+---
+allowed-tools: Read, mcp__sauci-prod__execute_sql, mcp__sauci-prod__list_tables
+argument-hint: <category name> [--all] [--explicit] [--apply] [--limit=100]
+description: Review and automatically fix issues with questions (text, targeting, intensity, props, duplicates)
+---
+
+# Question Fix Agent
+
+Fix questions in category: $ARGUMENTS
+
+## Task Overview
+
+Analyze questions across all packs in a category and apply fixes for issues across 6 dimensions:
+1. **Text Phrasing** - Improve wording, remove wishy-washy language
+2. **Audience Targeting** - Fix couple/initiator gender targeting
+3. **Intensity Levels** - Correct misassigned intensity ratings
+4. **Required Props** - Identify missing physical props/accessories
+5. **Inverse Linking** - Detect and link inverse question pairs using inverse_of column
+6. **Deletions** - Remove true duplicates, unsafe, or broken questions
+
+## Step 1: Parse Arguments
+
+Extract from $ARGUMENTS:
+- **Category identifier**: Category name (partial match) OR category ID (UUID)
+- **--all**: Flag indicating the agent should work through all categories sequentially
+- **--explicit**: Flag indicating this is an explicit/adult category (auto-detected from category.is_explicit if not specified)
+- **--apply**: If set, apply fixes automatically after review. If not set, just show suggestions.
+- **--limit**: Max questions to analyze per category (default: 100)
+
+## Step 2: Fetch Data
+
+Query the database to get the category and its questions:
+
+```sql
+-- Get category info
+SELECT id, name
+FROM categories
+WHERE id::text = '<category_id>' OR name ILIKE '%<category_name>%'
+LIMIT 1;
+```
+
+```sql
+-- Get all packs in the category
+SELECT p.id, p.name, p.is_explicit
+FROM question_packs p
+WHERE p.category_id = '<category_id>'
+ORDER BY p.name;
+```
+
+```sql
+-- Get questions for all packs in the category (include inverse_of for pair detection)
+SELECT q.id, q.text, q.partner_text, q.intensity, q.allowed_couple_genders, q.target_user_genders, q.required_props, q.inverse_of, p.name as pack_name
+FROM questions q
+JOIN question_packs p ON q.pack_id = p.id
+WHERE p.category_id = '<category_id>' AND q.deleted_at IS NULL
+ORDER BY p.name, q.created_at
+LIMIT <limit>;
+```
+
+```sql
+-- Get existing props catalog for consistency
+SELECT DISTINCT unnest(required_props) as prop
+FROM questions
+WHERE required_props IS NOT NULL
+ORDER BY prop;
+```
+
+If **--all** flag is set, first list all categories:
+```sql
+SELECT id, name, is_explicit FROM categories ORDER BY name;
+```
+Then process each category sequentially.
+
+## Step 3: Analyze Each Question
+
+For each question, evaluate against these criteria:
+
+### 3.1 Text Analysis
+
+**Language Rules:**
+- ALWAYS use "your partner" - NEVER use "me", "I", "you" (as receiver), "him", "her", or gendered pronouns
+- Cards are PROPOSALS, NOT interview questions - "Give your partner a massage" not "Would you like to give a massage?"
+- Avoid wishy-washy language - NO "Would you...", "Have you ever...", "Do you think...", "Maybe we could..."
+- No time-specific words - NO "tonight", "now", "today", "right now"
+- Keep concise - ideal length is 5-12 words
+
+**Tone Rules (based on is_explicit):**
+
+For EXPLICIT packs:
+- Use tasteful phrasing for common acts: "Have sex in X" (not "fuck in X"), "Perform oral" or "go down on" (not crude oral terms)
+- BUT keep crude/specific terms when they ARE the activity: "Cum on your partner's tits" (cum is the act), "Use a cock ring" (that's the name)
+- NEVER sanitize "cum" to "come" - they have different meanings
+
+For NON-EXPLICIT packs:
+- CRITICAL: No sexual acts, crude language, or NSFW content
+- Keep language romantic, sensual, or playful without graphic terms
+- Flag explicit content for removal
+
+**Partner Text Rules:**
+- NULL for symmetric activities (both partners do the same thing together)
+- FILLED for asymmetric activities (one does something to/for the other)
+- text = what the INITIATOR does
+- partner_text = what the RECEIVER experiences
+- Make partner_text APPEALING - frame receiver's experience positively
+- When initiator causes a response (moan, cum, beg), frame as ALLOWING:
+  - text: "Make your partner moan" -> partner_text: "Let your partner make you moan"
+  - NOT: "Moan for your partner" (sounds forced)
+
+### 3.2 Intensity Analysis
+
+Check if current intensity matches the activity:
+
+| Level | Name | Description | Examples |
+|-------|------|-------------|----------|
+| 1 | Gentle | Emotional bonding, non-sexual | cooking, cuddling, foot massage |
+| 2 | Warm | Romantic, affectionate touch | slow dance, sensual massage, kissing |
+| 3 | Playful | Light sexual exploration | oral, mutual masturbation, light roleplay |
+| 4 | Steamy | Explicit sex, moderate adventure | intercourse, light bondage, anal play |
+| 5 | Intense | Advanced/BDSM/extreme | impact play, power dynamics, taboo kinks |
+
+### 3.3 Targeting Analysis
+
+**Couple Targeting (allowed_couple_genders):**
+- DEFAULT: null (ALL couples) unless explicit anatomical requirement
+- Restrict to `['male+male', 'female+male']` ONLY if activity requires penis
+- Restrict to `['female+male', 'female+female']` ONLY if activity requires vagina
+- Sex toys are GENDER-NEUTRAL (vibrators, dildos, plugs work for anyone)
+
+**Initiator Targeting (target_user_genders):**
+- DEFAULT: null (anyone can initiate)
+- Only for asymmetric questions (those with partner_text)
+- Set based on who does the action in "text" field:
+  - "Swallow your partner's cum" -> partner has penis -> initiator: ['female'] in M+F
+  - "Deep throat your partner" -> partner has penis -> ['female'] in M+F
+  - "Give your partner a massage" -> gender-neutral -> null
+
+### 3.4 Props Analysis
+
+**Rules:**
+- Props are physical items/accessories, not body parts or acts
+- Use lowercase, short, singular names (e.g., "blindfold", "remote vibrator")
+- Try to avoid generics such as "toy" (unless the activity can be done with any toy)
+- Reuse existing prop names from the catalog when possible
+- If no props are required, set to null
+
+### 3.5 Inverse Linking Analysis
+
+**Purpose:** Detect inverse question pairs and link them using the `inverse_of` database column.
+
+**Detection Algorithm:**
+1. For each asymmetric question (has partner_text), look for its inverse:
+   - Inverse exists if another question has: `text` = this question's `partner_text` AND `partner_text` = this question's `text`
+2. Check if the `inverse_of` column is correctly set:
+   - One question in the pair should be the "primary" (inverse_of = NULL)
+   - The other should be the "inverse" (inverse_of = primary's UUID)
+
+**Fixing Missing Links:**
+- If inverse pair exists but neither has `inverse_of` set:
+  - Set the first one (by created_at) as primary (inverse_of = NULL)
+  - Set the second one's inverse_of = primary's UUID
+- If inverse pair exists but both have `inverse_of = NULL`:
+  - Choose one as primary, link the other
+- If a question has `inverse_of` pointing to a non-existent question:
+  - Find the actual inverse and fix the link, OR set to NULL if no inverse exists
+
+**Important:**
+- Only asymmetric questions (with partner_text) should have inverse pairs
+- Symmetric questions (partner_text = NULL) should have inverse_of = NULL
+- This fixes the database structure, NOT the question content
+
+### 3.6 Deletion Analysis
+
+**Deletion Categories:**
+- `duplicate`: Same `text` AND same initiator as another question
+- `redundant`: Minor variation with no added value
+- `off-tone`: Violates explicit vs non-explicit rules
+- `unsafe`: Coercion, minors, illegal acts, or consent violations
+- `too-vague`: Not actionable or not a clear proposal
+- `broken`: Grammar too broken to repair without inventing content
+- `off-topic`: Not relevant to a couples intimacy app
+
+**CRITICAL: Inverse Questions are NOT Duplicates**
+
+Asymmetric questions MUST exist in pairs (original + inverse). These are NOT duplicates:
+
+```
+Question A:
+  text: "Spank your partner"
+  partner_text: "Be spanked by your partner"
+
+Question B (INVERSE - NOT A DUPLICATE):
+  text: "Be spanked by your partner"
+  partner_text: "Spank your partner"
+```
+
+These are intentionally paired so both partners get asked about both roles. When reviewing:
+- If you see two questions where one's `text` matches the other's `partner_text`, they are a VALID INVERSE PAIR
+- Do NOT flag inverse pairs as duplicates or redundant
+- Only flag as duplicate if TWO questions have the SAME `text` (or nearly identical `text`) with the SAME initiator role
+
+**Rules:**
+- Prefer edits over deletions when possible
+- For true duplicates: delete the weaker/less specific version
+- Do NOT delete for minor wording issues
+
+## Step 4: Output Results
+
+Present findings grouped by fix type:
+
+### Summary
+
+| Category | Issues Found | Will Fix |
+|----------|--------------|----------|
+| Text fixes | X | X |
+| Intensity fixes | X | X |
+| Targeting fixes | X | X |
+| Props fixes | X | X |
+| Inverse linking fixes | X | X |
+| Deletions | X | X |
+| No changes needed | X | - |
+
+### Detailed Changes
+
+For each question needing changes, show:
+
+```
+**Question ID:** <id>
+**Current:** <text> / <partner_text or null>
+**Current inverse_of:** <uuid or null>
+**Issues:**
+- Text: <issue description>
+- Intensity: <current> -> <suggested> (<reason>)
+- Targeting: <issue description>
+- Props: <current> -> <suggested>
+- Inverse Link: <missing/broken> - <inverse question id if found>
+- DELETE: <category> - <reason>
+
+**Fix:**
+- Text: "<new text>"
+- Partner Text: "<new partner_text>" or null
+- Intensity: <new intensity>
+- Couple Targets: <new allowed_couple_genders or null>
+- Initiator Targets: <new target_user_genders or null>
+- Required Props: <new required_props or null>
+- inverse_of: <uuid or null>
+```
+
+## Step 5: Apply Fixes (if --apply flag)
+
+If --apply flag is set, execute the SQL updates:
+
+```sql
+-- Text/Partner Text/Intensity fixes
+UPDATE questions SET
+  text = '<new_text>',
+  partner_text = '<new_partner_text>',
+  intensity = <new_intensity>
+WHERE id = '<question_id>';
+
+-- Targeting fixes
+UPDATE questions SET
+  allowed_couple_genders = ARRAY['...'] or NULL,
+  target_user_genders = ARRAY['...'] or NULL
+WHERE id = '<question_id>';
+
+-- Props fixes
+UPDATE questions SET
+  required_props = ARRAY['...'] or NULL
+WHERE id = '<question_id>';
+
+-- Inverse linking fixes
+-- Link inverse question to its primary
+UPDATE questions SET inverse_of = '<primary_question_id>' WHERE id = '<inverse_question_id>';
+-- Or clear a broken inverse_of link
+UPDATE questions SET inverse_of = NULL WHERE id = '<question_id>';
+
+-- Deletions (soft delete)
+UPDATE questions SET deleted_at = NOW() WHERE id IN ('<id1>', '<id2>', ...);
+```
+
+After applying, report:
+- X questions updated
+- X questions deleted
+- Any errors encountered
+
+If --apply is NOT set, output the SQL statements for manual review.
+
+## Example Usage
+
+```
+/fix-questions "Kink"                                  # Review all questions in "Kink" category
+/fix-questions "Romantic Classics" --apply             # Review and apply fixes to category
+/fix-questions --all                                   # Process all categories sequentially
+/fix-questions --all --apply                           # Process and fix all categories
+/fix-questions 123e4567-e89b-12d3-a456-426614174000 --limit=50
+```
+
+## Guidelines
+
+- DO ask for clarification if category name matches multiple categories
+- DO group similar issues together for batch fixes
+- DO prioritize safety issues (delete unsafe content first)
+- DO preserve the core intent of questions when suggesting text fixes
+- DO verify inverse pairs exist before flagging duplicates
+- DO detect and link inverse pairs using the inverse_of column
+- DON'T change questions that are already well-formed
+- DON'T suggest overly restrictive targeting (prefer inclusive by default)
+- DON'T create new prop names when existing ones match
+- DON'T flag inverse pairs as duplicates (one's text = other's partner_text)
+- DON'T forget to set inverse_of for detected inverse pairs - this ensures accurate unique question counts

.claude/commands/generate-pack.md

@@ -0,0 +1,283 @@
+---
+allowed-tools: Read, mcp__sauci-prod__execute_sql, mcp__sauci-prod__list_tables
+argument-hint: <pack-name> --category=<category> --intensity=<min-max> [--count=30] [--premium]
+description: Generate a question pack for Sauci following established content guidelines
+---
+
+# Question Pack Generator
+
+Generate a question pack: $ARGUMENTS
+
+## Prerequisites
+
+First, read the pack generation guidelines:
+@PACK_GENERATION_AGENT.md
+
+## Current State
+
+- Existing categories: can be retrieved from supabase with query: SELECT name, id FROM categories ORDER BY sort_order
+- Existing packs in target category: Will query once category is identified
+- Existing props: can be retrieved with: SELECT DISTINCT unnest(required_props) as prop FROM questions WHERE required_props IS NOT NULL ORDER BY prop
+
+## Task
+
+Generate a complete question pack following all Sauci content guidelines.
+
+### Step 1: Parse Arguments
+
+Extract from $ARGUMENTS:
+- **Pack name**: Required - the name for this pack
+- **Category**: Required - which category this belongs to (or "new" to create)
+- **Intensity range**: Required - e.g., "2-3", "3-4", "4-5"
+- **Question count**: Optional - default 30, can be 25-50
+- **Premium**: Optional flag - if pack should be premium
+
+### Step 2: Understand Context
+
+1. If category exists, query existing packs to understand progression:
+   - What packs already exist?
+   - What intensity levels are covered?
+   - Where does this new pack fit in the progression?
+
+2. Check if category is explicit:
+   ```sql
+   SELECT id, name, is_explicit FROM categories WHERE name ILIKE '%<category>%';
+   ```
+
+3. If new category, establish the progression plan:
+   - What will the beginner pack cover?
+   - What will intermediate cover?
+   - What will advanced cover?
+
+### Step 3: Generate Questions
+
+Follow these rules strictly:
+
+#### 3.1 Core Language Rules
+
+- ALWAYS use "your partner" - NEVER use "me", "I", "you" (as receiver), "him", "her", or gendered pronouns
+- Questions are PROPOSALS, NOT interview questions - "Give your partner a massage" not "Would you like to give a massage?"
+- Avoid wishy-washy language - NO "Would you...", "Have you ever...", "Do you think...", "Maybe we could..."
+- No time-specific words - NO "tonight", "now", "today", "right now"
+- Keep concise: 5-12 words ideal
+- Modern language for 25-40 year olds
+- Avoid cheesy/cliche phrasing (candlelit dinner, rose petals, bubble bath, Netflix and chill)
+
+#### 3.2 Tone Rules (based on category's is_explicit flag)
+
+**For EXPLICIT categories (is_explicit = true):**
+- Use tasteful phrasing for common acts: "Have sex in X" (not "fuck in X"), "Perform oral" or "go down on" (not crude oral terms)
+- BUT keep crude/specific terms when they ARE the activity: "Cum on your partner's tits" (cum is the act), "Use a cock ring" (that's the name), "Edge until they beg"
+- Rule: crude terms for specific acts/objects, tasteful terms for general sex/oral
+- NEVER sanitize "cum" to "come" - they have different meanings
+
+**For NON-EXPLICIT categories (is_explicit = false):**
+- CRITICAL: No sexual acts, crude language, or NSFW content
+- Keep language romantic, sensual, or playful without graphic terms
+- If intensity 3+ activities are needed, use suggestive but not explicit language
+
+#### 3.3 Partner Text Rules
+
+- **NULL** for symmetric activities (both partners do the same thing together)
+- **Filled** for asymmetric activities (one does something to/for the other)
+  - `text` = what the INITIATOR does
+  - `partner_text` = what the RECEIVER experiences
+
+**Partner Text Quality:**
+- Make partner_text APPEALING - don't just grammatically flip, make receiver feel excited
+- When initiator causes a response (moan, cum, beg), frame as ALLOWING:
+  - text: "Make your partner moan" -> partner_text: "Let your partner make you moan"
+  - NOT: "Moan for your partner" (sounds forced, not natural)
+- BAD: "Receive oral from your partner" (clinical)
+- GOOD: "Let your partner pleasure you with their mouth" (enticing)
+
+#### 3.4 Critical: Inverse Questions and Database Linking
+
+For EVERY asymmetric question, create its inverse AND link them using the `inverse_of` column:
+
+```
+Original (PRIMARY - inverse_of = NULL):
+  id: <generated_uuid_1>
+  text: "Spank your partner"
+  partner_text: "Be spanked by your partner"
+  inverse_of: NULL
+
+Inverse (SECONDARY - points to primary):
+  id: <generated_uuid_2>
+  text: "Be spanked by your partner"
+  partner_text: "Spank your partner"
+  inverse_of: <generated_uuid_1>
+```
+
+This ensures:
+1. Both partners are asked about both roles
+2. The database tracks which questions are inverses of each other
+3. Accurate unique question counts (200 questions = 100 unique concepts with inverses)
+
+**Database Schema:**
+- `inverse_of` column: UUID referencing the primary question's ID
+- Primary questions have `inverse_of = NULL`
+- Inverse questions have `inverse_of = <primary_question_id>`
+
+#### 3.5 Intensity Guidelines
+
+| Level | Name | Description | Examples |
+|-------|------|-------------|----------|
+| 1 | Gentle | Emotional bonding, non-sexual | cooking, cuddling, foot massage |
+| 2 | Warm | Romantic, affectionate touch | slow dance, sensual massage, kissing |
+| 3 | Playful | Light sexual exploration | oral, mutual masturbation, light roleplay |
+| 4 | Steamy | Explicit sex, moderate adventure | intercourse, light bondage, anal play |
+| 5 | Intense | Advanced/BDSM/extreme | impact play, power dynamics, taboo kinks |
+
+#### 3.6 Targeting Rules
+
+**Couple Targeting (allowed_couple_genders):**
+- DEFAULT: null (ALL couples) unless explicit anatomical requirement
+- Options: `['male+male', 'female+male', 'female+female']` or subset
+- Restrict to `['male+male', 'female+male']` ONLY if activity requires penis (blowjob, handjob)
+- Restrict to `['female+male', 'female+female']` ONLY if activity requires vagina (cunnilingus)
+- Sex toys are GENDER-NEUTRAL (vibrators, dildos, plugs work for anyone) -> null
+
+**Initiator Targeting (target_user_genders):**
+- DEFAULT: null (anyone can initiate)
+- Only for asymmetric questions (those with partner_text)
+- Set based on who does the action in "text" field:
+  - "Swallow your partner's cum" -> partner has penis -> initiator: `['female']` in M+F couples
+  - "Deep throat your partner" -> partner has penis -> `['female']` in M+F couples
+  - "Give your partner a massage" -> gender-neutral -> null
+- When in doubt, use null
+
+**Anatomical Consistency:**
+- NEVER mix male-specific and female-specific acts as alternatives
+- BAD: "Finger or give your partner a handjob" (mixed anatomy)
+- GOOD: Pick one activity per question
+
+#### 3.7 Required Props
+
+Identify physical items/accessories needed:
+- Props are items like: blindfold, remote vibrator, handcuffs, massage oil, ice cubes
+- Props are NOT body parts or acts
+- Use lowercase, short, singular names
+- Reuse existing prop names from catalog when possible
+- Set to null if no props are required
+
+### Step 4: Review & Validate
+
+Before outputting, verify each question against this checklist:
+
+**Language & Format:**
+- [ ] Uses "your partner" (no gendered pronouns)
+- [ ] Is a proposal, not an interview question
+- [ ] No wishy-washy language
+- [ ] No time-specific words
+- [ ] 5-12 words (concise)
+- [ ] No cheesy/cliche language
+- [ ] Varied sentence structures
+
+**Structure:**
+- [ ] All asymmetric questions have inverses (these are NOT duplicates - they're required pairs)
+- [ ] Partner text is appealing (not clinical)
+- [ ] Partner text frames responses as "allowing" not forced
+- [ ] No actual duplicates (same `text` appearing twice)
+
+**Accuracy:**
+- [ ] Intensity level matches the activity
+- [ ] Couple targeting is correct (or null for universal)
+- [ ] Initiator targeting is correct for asymmetric questions
+- [ ] Required props are identified
+- [ ] Considers same-sex couples
+
+**Consistency:**
+- [ ] No mixed anatomy in alternatives
+- [ ] Tone matches explicit/non-explicit category
+- [ ] Fits progression within category
+
+### Step 5: Output
+
+Provide the pack in SQL format ready for insertion:
+
+```sql
+-- First, create the pack (get category_id from earlier query)
+INSERT INTO question_packs (name, description, category_id, is_premium)
+VALUES (
+  '[Pack Name]',
+  '[Description]',
+  '[category_id]',
+  false
+)
+RETURNING id;
+
+-- Then insert questions with inverse_of linking
+-- For inverse pairs: insert primary first (inverse_of = NULL), then inverse pointing to primary
+
+-- Generate UUIDs for inverse pairs upfront
+-- Pair 1: Primary and its inverse
+WITH pair1_primary AS (
+  INSERT INTO questions (pack_id, text, partner_text, intensity, inverse_of)
+  VALUES ('[pack_id]', 'Spank your partner', 'Be spanked by your partner', 3, NULL)
+  RETURNING id
+)
+INSERT INTO questions (pack_id, text, partner_text, intensity, inverse_of)
+SELECT '[pack_id]', 'Be spanked by your partner', 'Spank your partner', 3, id
+FROM pair1_primary;
+
+-- Symmetric questions (no inverse_of needed)
+INSERT INTO questions (pack_id, text, partner_text, intensity, allowed_couple_genders, target_user_genders, required_props, inverse_of) VALUES
+('[pack_id]', 'Symmetric question text', NULL, 2, NULL, NULL, NULL, NULL);
+
+-- Or bulk insert with explicit UUIDs for pairs:
+INSERT INTO questions (id, pack_id, text, partner_text, intensity, inverse_of) VALUES
+-- Pair 1
+('uuid-primary-1', '[pack_id]', 'Give your partner a massage', 'Receive a massage from your partner', 2, NULL),
+('uuid-inverse-1', '[pack_id]', 'Receive a massage from your partner', 'Give your partner a massage', 2, 'uuid-primary-1'),
+-- Pair 2
+('uuid-primary-2', '[pack_id]', 'Blindfold your partner', 'Be blindfolded by your partner', 3, NULL),
+('uuid-inverse-2', '[pack_id]', 'Be blindfolded by your partner', 'Blindfold your partner', 3, 'uuid-primary-2'),
+-- Symmetric (no pair)
+(gen_random_uuid(), '[pack_id]', 'Cook dinner together', NULL, 1, NULL);
+```
+
+**Field notes:**
+- `inverse_of`: NULL for primary/symmetric questions, UUID of primary question for inverses
+- `allowed_couple_genders`: NULL for all couples, or array like `ARRAY['male+male', 'female+male']`
+- `target_user_genders`: NULL for any initiator, or array like `ARRAY['female']`
+- `required_props`: NULL if no props needed, or array like `ARRAY['blindfold', 'ice cubes']`
+
+Also provide a summary table:
+
+| Metric | Value |
+|--------|-------|
+| Total questions | X |
+| Unique question concepts | X (total - inverse count) |
+| Intensity 1 | X |
+| Intensity 2 | X |
+| Intensity 3 | X |
+| Intensity 4 | X |
+| Intensity 5 | X |
+| Symmetric (null partner_text) | X |
+| Asymmetric pairs (with inverse_of links) | X pairs (X questions) |
+| With couple targeting | X |
+| With initiator targeting | X |
+| With required props | X |
+
+## Example Usage
+
+```
+/generate-pack "Testing the Waters" --category="Public Thrills" --intensity=2-3 --count=30
+/generate-pack "Kink Discovery" --category="The Kink Lab" --intensity=3-5 --count=50
+/generate-pack "Staying Close" --category=new:"Long Distance" --intensity=1 --count=30
+```
+
+## Guidelines
+
+- DO ask clarifying questions if the pack concept is unclear
+- DO check existing packs in the category first
+- DO create inverse questions for ALL asymmetric content AND link them with inverse_of
+- DO vary sentence structure and openers
+- DO use the inverse_of column to link inverse pairs (inverse points to primary's UUID)
+- DON'T use cheesy or cliche language
+- DON'T assume heterosexual couples
+- DON'T skip the inverse question requirement
+- DON'T forget to set inverse_of - this is how we track unique question concepts
+- DON'T use interview-style questions ("Would you like to...")
+- DON'T treat inverse pairs as duplicates - they are REQUIRED (one's `text` = other's `partner_text`)

.claude/commands/generate-tests.md

@@ -0,0 +1,87 @@
+---
+allowed-tools: Read, Write, Edit, Bash
+argument-hint: [file-path] | [component-name]
+description: Generate comprehensive test suite with unit, integration, and edge case coverage
+---
+
+# Generate Tests
+
+Generate comprehensive test suite for: $ARGUMENTS
+
+## Current Testing Setup
+
+- Test framework: @package.json or @jest.config.js or @vitest.config.js (detect framework)
+- Existing tests: !`find . -name "*.test.*" -o -name "*.spec.*" | head -5`
+- Test coverage: !`npm run test:coverage 2>/dev/null || echo "No coverage script"`
+- Target file: @$ARGUMENTS (if file path provided)
+
+## Task
+
+I'll analyze the target code and create complete test coverage including:
+
+1. Unit tests for individual functions and methods
+2. Integration tests for component interactions
+3. Edge case and error handling tests
+4. Mock implementations for external dependencies
+5. Test utilities and helpers as needed
+6. Performance and snapshot tests where appropriate
+
+## Process
+
+I'll follow these steps:
+
+1. Analyze the target file/component structure
+2. Identify all testable functions, methods, and behaviors
+3. Examine existing test patterns in the project
+4. Create test files following project naming conventions
+5. Implement comprehensive test cases with proper setup/teardown
+6. Add necessary mocks and test utilities
+7. Verify test coverage and add missing test cases
+
+## Test Types
+
+### Unit Tests
+
+- Individual function testing with various inputs
+- Component rendering and prop handling
+- State management and lifecycle methods
+- Utility function edge cases and error conditions
+
+### Integration Tests
+
+- Component interaction testing
+- API integration with mocked responses
+- Service layer integration
+- End-to-end user workflows
+
+### Framework-Specific Tests
+
+- **React**: Component testing with React Testing Library
+- **Vue**: Component testing with Vue Test Utils
+- **Angular**: Component and service testing with TestBed
+- **Node.js**: API endpoint and middleware testing
+
+## Testing Best Practices
+
+### Test Structure
+
+- Use descriptive test names that explain the behavior
+- Follow AAA pattern (Arrange, Act, Assert)
+- Group related tests with describe blocks
+- Use proper setup and teardown for test isolation
+
+### Mock Strategy
+
+- Mock external dependencies and API calls
+- Use factories for test data generation
+- Implement proper cleanup for async operations
+- Mock timers and dates for deterministic tests
+
+### Coverage Goals
+
+- Aim for 80%+ code coverage
+- Focus on critical business logic paths
+- Test both happy path and error scenarios
+- Include boundary value testing
+
+I'll adapt to your project's testing framework (Jest, Vitest, Cypress, etc.) and follow established patterns.

.claude/commands/review-questions.md

@@ -0,0 +1,283 @@
+---
+allowed-tools: Read, mcp__sauci-prod__execute_sql, mcp__sauci-prod__list_tables
+argument-hint: <pack-name-or-id> [--explicit] [--limit=100]
+description: Review and fix questions for text, targeting, intensity, props, and duplicates
+---
+
+# Question Review Command
+
+Review and validate questions: $ARGUMENTS
+
+## Task Overview
+
+Analyze questions for issues and suggest fixes across 6 dimensions:
+1. **Text Phrasing** - Improve wording, remove wishy-washy language
+2. **Audience Targeting** - Fix couple/initiator gender targeting
+3. **Intensity Levels** - Correct misassigned intensity ratings
+4. **Required Props** - Identify missing physical props/accessories
+5. **Inverse Linking** - Detect and link inverse question pairs using inverse_of column
+6. **Deletions** - Flag duplicates, redundant, or broken questions
+
+## Step 1: Parse Arguments
+
+Extract from $ARGUMENTS:
+- **Pack identifier**: Pack name (partial match) OR pack ID (UUID)
+- **--explicit**: Flag indicating this is an explicit/adult pack (default: false if not specified)
+- **--limit**: Max questions to analyze (default: 100)
+
+## Step 2: Fetch Questions
+
+Query the database:
+
+```sql
+-- If pack name provided (include inverse_of for pair detection):
+SELECT q.id, q.text, q.partner_text, q.intensity, q.allowed_couple_genders, q.target_user_genders, q.required_props, q.inverse_of
+FROM questions q
+JOIN question_packs p ON q.pack_id = p.id
+WHERE p.name ILIKE '%<pack_name>%' AND q.deleted_at IS NULL
+ORDER BY q.created_at
+LIMIT <limit>;
+
+-- If pack ID provided:
+SELECT id, text, partner_text, intensity, allowed_couple_genders, target_user_genders, required_props, inverse_of
+FROM questions
+WHERE pack_id = '<pack_id>' AND deleted_at IS NULL
+ORDER BY created_at
+LIMIT <limit>;
+```
+
+Also fetch existing props for consistency:
+```sql
+SELECT DISTINCT unnest(required_props) as prop
+FROM questions
+WHERE required_props IS NOT NULL
+ORDER BY prop;
+```
+
+## Step 3: Determine Content Type
+
+Check if the pack is explicit:
+```sql
+SELECT p.name, c.is_explicit
+FROM question_packs p
+JOIN categories c ON p.category_id = c.id
+WHERE p.id = '<pack_id>' OR p.name ILIKE '%<pack_name>%'
+LIMIT 1;
+```
+
+Use this to set the content type rules below.
+
+## Step 4: Analyze Questions
+
+For each question, evaluate against these criteria:
+
+### 4.1 Text Analysis
+
+**Language Rules:**
+- ALWAYS use "your partner" - NEVER use "me", "I", "you" (as receiver), "him", "her", or gendered pronouns
+- Cards are PROPOSALS, NOT interview questions - "Give your partner a massage" not "Would you like to give a massage?"
+- Avoid wishy-washy language - NO "Would you...", "Have you ever...", "Do you think...", "Maybe we could..."
+- No time-specific words - NO "tonight", "now", "today", "right now"
+- Keep concise - ideal length is 5-12 words
+
+**Tone Rules (based on explicit flag):**
+
+For EXPLICIT packs:
+- Use tasteful phrasing for common acts: "Have sex in X" (not "fuck in X"), "Perform oral" or "go down on" (not crude oral terms)
+- BUT keep crude/specific terms when they ARE the activity: "Cum on your partner's tits" (cum is the act), "Use a cock ring" (that's the name)
+- Rule: crude terms for specific acts/objects, tasteful terms for general sex/oral
+- NEVER sanitize "cum" to "come" - they have different meanings
+
+For NON-EXPLICIT packs:
+- CRITICAL: No sexual acts, crude language, or NSFW content
+- Keep language romantic, sensual, or playful without graphic terms
+- Flag explicit content for removal
+
+**Partner Text Rules:**
+- NULL for symmetric activities (both partners do the same thing together)
+- FILLED for asymmetric activities (one does something to/for the other)
+- text = what the INITIATOR does
+- partner_text = what the RECEIVER experiences
+- Make partner_text APPEALING - frame receiver's experience positively
+- When initiator causes a response (moan, cum, beg), frame as ALLOWING:
+  - text: "Make your partner moan" -> partner_text: "Let your partner make you moan"
+  - NOT: "Moan for your partner" (sounds forced)
+
+### 4.2 Intensity Analysis
+
+Check if current intensity matches the activity:
+
+| Level | Name | Description | Examples |
+|-------|------|-------------|----------|
+| 1 | Gentle | Emotional bonding, non-sexual | cooking, cuddling, foot massage |
+| 2 | Warm | Romantic, affectionate touch | slow dance, sensual massage, kissing |
+| 3 | Playful | Light sexual exploration | oral, mutual masturbation, light roleplay |
+| 4 | Steamy | Explicit sex, moderate adventure | intercourse, light bondage, anal play |
+| 5 | Intense | Advanced/BDSM/extreme | impact play, power dynamics, taboo kinks |
+
+### 4.3 Targeting Analysis
+
+**Couple Targeting (allowed_couple_genders):**
+- DEFAULT: null (ALL couples) unless explicit anatomical requirement
+- Restrict to `['male+male', 'female+male']` ONLY if activity requires penis
+- Restrict to `['female+male', 'female+female']` ONLY if activity requires vagina
+- Sex toys are GENDER-NEUTRAL (vibrators, dildos, plugs work for anyone)
+
+**Initiator Targeting (target_user_genders):**
+- DEFAULT: null (anyone can initiate)
+- Only for asymmetric questions (those with partner_text)
+- Set based on who does the action in "text" field:
+  - "Swallow your partner's cum" -> partner has penis -> initiator: ['female'] in M+F
+  - "Deep throat your partner" -> partner has penis -> ['female'] in M+F
+  - "Give your partner a massage" -> gender-neutral -> null
+
+### 4.4 Props Analysis
+
+**Rules:**
+- Props are physical items/accessories, not body parts or acts
+- Use lowercase, short, singular names (e.g., "blindfold", "remote vibrator")
+- Reuse existing prop names from the catalog when possible
+- If no props are required, set to null
+
+### 4.5 Inverse Linking Analysis
+
+**Purpose:** Detect inverse question pairs and link them using the `inverse_of` database column.
+
+**Detection:**
+1. For each asymmetric question (has partner_text), look for its inverse:
+   - Inverse exists if another question has: `text` = this question's `partner_text` AND `partner_text` = this question's `text`
+2. Check if the `inverse_of` column is correctly set
+
+**Fixes:**
+- If pair exists but not linked: set inverse_of on the second question to point to the first
+- Symmetric questions should have inverse_of = NULL
+
+### 4.6 Deletion Analysis
+
+**Deletion Categories:**
+- `duplicate`: Same core action as another question
+- `redundant`: Minor variation with no added value
+- `off-tone`: Violates explicit vs non-explicit rules
+- `unsafe`: Coercion, minors, illegal acts, or consent violations
+- `too-vague`: Not actionable or not a clear proposal
+- `broken`: Grammar too broken to repair without inventing content
+- `off-topic`: Not relevant to a couples intimacy app
+
+**Rules:**
+- Prefer edits over deletions when possible
+- For duplicates: delete the weaker/less specific version
+- Do NOT delete for minor wording issues
+
+**CRITICAL: Inverse Questions are NOT Duplicates**
+
+Asymmetric questions MUST exist in pairs (original + inverse). These are NOT duplicates:
+
+```
+Question A:
+  text: "Spank your partner"
+  partner_text: "Be spanked by your partner"
+
+Question B (INVERSE - NOT A DUPLICATE):
+  text: "Be spanked by your partner"
+  partner_text: "Spank your partner"
+```
+
+These are intentionally paired so both partners get asked about both roles. When reviewing:
+- If you see two questions where one's `text` matches the other's `partner_text`, they are a valid inverse pair
+- Do NOT flag inverse pairs as duplicates or redundant
+- Only flag as duplicate if TWO questions have the SAME `text` (or nearly identical `text`)
+
+## Step 5: Output Results
+
+Present findings in a structured format:
+
+### Summary
+| Category | Count |
+|----------|-------|
+| Text fixes | X |
+| Intensity fixes | X |
+| Targeting fixes | X |
+| Props fixes | X |
+| Inverse linking fixes | X |
+| Deletions suggested | X |
+| No changes needed | X |
+
+### Suggested Changes
+
+For each question needing changes:
+
+```
+**Question ID:** <id>
+**Current Text:** <text>
+**Current Partner Text:** <partner_text or null>
+**Current Intensity:** <intensity>
+**Current inverse_of:** <uuid or null>
+
+Issues Found:
+- [ ] Text: <description of issue>
+- [ ] Intensity: <current> -> <suggested> (<reason>)
+- [ ] Targeting: <description>
+- [ ] Props: <current> -> <suggested>
+- [ ] Inverse Link: <missing/broken> - <inverse question id if found>
+- [ ] DELETE: <category> - <reason>
+
+Suggested Fix:
+- Text: "<new text>"
+- Partner Text: "<new partner_text>" or null
+- Intensity: <new intensity>
+- Couple Targets: <new allowed_couple_genders or null>
+- Initiator Targets: <new target_user_genders or null>
+- Required Props: <new required_props or null>
+- inverse_of: <uuid or null>
+```
+
+### SQL to Apply Fixes
+
+After user approval, provide UPDATE statements:
+
+```sql
+-- Text/Partner Text/Intensity fixes
+UPDATE questions SET
+  text = '<new_text>',
+  partner_text = '<new_partner_text>',
+  intensity = <new_intensity>
+WHERE id = '<question_id>';
+
+-- Targeting fixes
+UPDATE questions SET
+  allowed_couple_genders = '<new_targets>',
+  target_user_genders = '<new_initiator>'
+WHERE id = '<question_id>';
+
+-- Props fixes
+UPDATE questions SET
+  required_props = ARRAY[<new_props>]
+WHERE id = '<question_id>';
+
+-- Inverse linking fixes
+UPDATE questions SET inverse_of = '<primary_question_id>' WHERE id = '<inverse_question_id>';
+
+-- Deletions (soft delete)
+UPDATE questions SET deleted_at = NOW() WHERE id IN ('<id1>', '<id2>', ...);
+```
+
+## Example Usage
+
+```
+/review-questions "Foreplay Favorites"
+/review-questions "Kink Discovery" --explicit
+/review-questions 123e4567-e89b-12d3-a456-426614174000 --limit=50
+```
+
+## Guidelines
+
+- DO ask for clarification if pack name matches multiple packs
+- DO group similar issues together for batch fixes
+- DO prioritize safety issues (delete unsafe content first)
+- DO preserve the core intent of questions when suggesting text fixes
+- DO detect and link inverse pairs using the inverse_of column
+- DON'T change questions that are already well-formed
+- DON'T suggest overly restrictive targeting (prefer inclusive by default)
+- DON'T create new prop names when existing ones match
+- DON'T flag inverse pairs as duplicates (one's text = other's partner_text)
+- DON'T forget to set inverse_of for detected inverse pairs

.claude/commands/update-docs.md

@@ -0,0 +1,106 @@
+---
+allowed-tools: Read, Write, Edit, Bash
+argument-hint: [doc-type] | --implementation | --api | --architecture | --sync | --validate
+description: Systematically update project documentation with implementation status, API changes, and synchronized content
+---
+
+# Documentation Update & Synchronization
+
+Update project documentation systematically: $ARGUMENTS
+
+## Current Documentation State
+
+- Documentation structure: !`find . -name "*.md" | head -10`
+- Specs directory: @specs/ (if exists)
+- Implementation status: !`grep -r "✅\|❌\|⚠️" docs/ specs/ 2>/dev/null | wc -l` status indicators
+- Recent changes: !`git log --oneline --since="1 week ago" -- "*.md" | head -5`
+- Project progress: @CLAUDE.md or @README.md (if exists)
+
+## Task
+
+## Documentation Analysis
+
+1. Review current documentation status:
+   - Check `specs/implementation_status.md` for overall project status
+   - Review implemented phase document (`specs/phase{N}_implementation_plan.md`)
+   - Review `specs/flutter_structurizr_implementation_spec.md` and `specs/flutter_structurizr_implementation_spec_updated.md`
+   - Review `specs/testing_plan.md` to ensure it is current given recent test passes, failures, and changes
+   - Examine `CLAUDE.md` and `README.md` for project-wide documentation
+   - Check for and document any new lessons learned or best practices in CLAUDE.md
+
+2. Analyze implementation and testing results:
+   - Review what was implemented in the last phase
+   - Review testing results and coverage
+   - Identify new best practices discovered during implementation
+   - Note any implementation challenges and solutions
+   - Cross-reference updated documentation with recent implementation and test results to ensure accuracy
+
+## Documentation Updates
+
+1. Update phase implementation document:
+   - Mark completed tasks with ✅ status
+   - Update implementation percentages
+   - Add detailed notes on implementation approach
+   - Document any deviations from original plan with justification
+   - Add new sections if needed (lessons learned, best practices)
+   - Document specific implementation details for complex components
+   - Include a summary of any new troubleshooting tips or workflow improvements discovered during the phase
+
+2. Update implementation status document:
+   - Update phase completion percentages
+   - Add or update implementation status for components
+   - Add notes on implementation approach and decisions
+   - Document best practices discovered during implementation
+   - Note any challenges overcome and solutions implemented
+
+3. Update implementation specification documents:
+   - Mark completed items with ✅ or strikethrough but preserve original requirements
+   - Add notes on implementation details where appropriate
+   - Add references to implemented files and classes
+   - Update any implementation guidance based on experience
+
+4. Update CLAUDE.md and README.md if necessary:
+   - Add new best practices
+   - Update project status
+   - Add new implementation guidance
+   - Document known issues or limitations
+   - Update usage examples to include new functionality
+
+5. Document new testing procedures:
+   - Add details on test files created
+   - Include test running instructions
+   - Document test coverage
+   - Explain testing approach for complex components
+
+## Documentation Formatting and Structure
+
+1. Maintain consistent documentation style:
+   - Use clear headings and sections
+   - Include code examples where helpful
+   - Use status indicators (✅, ⚠️, ❌) consistently
+   - Maintain proper Markdown formatting
+
+2. Ensure documentation completeness:
+   - Cover all implemented features
+   - Include usage examples
+   - Document API changes or additions
+   - Include troubleshooting guidance for common issues
+
+## Guidelines
+
+- DO NOT CREATE new specification files
+- UPDATE existing files in the `specs/` directory
+- Maintain consistent documentation style
+- Include practical examples where appropriate
+- Cross-reference related documentation sections
+- Document best practices and lessons learned
+- Provide clear status updates on project progress
+- Update numerical completion percentages
+- Ensure documentation reflects actual implementation
+
+Provide a summary of documentation updates after completion, including:
+1. Files updated
+2. Major changes to documentation
+3. Updated completion percentages
+4. New best practices documented
+5. Status of the overall project after this phase

.claude/settings.local.json

@@ -1,7 +1,20 @@
 {
   "permissions": {
     "allow": [
-      "Bash(wc:*)"
+      "Bash(wc:*)",
+      "Bash(find:*)",
+      "Bash(for f in /Users/jjbrunton/Projects/Sauci/apps/supabase/migrations/*.sql)",
+      "Bash(do grep -q \"deleted_at\" \"$f\")",
+      "Bash(echo:*)",
+      "Bash(done)",
+      "Bash(claude --version:*)",
+      "Bash(strace:*)",
+      "Bash(dtruss:*)"
+    ]
+  },
+  "enableAllProjectMcpServers": true,
+  "enabledMcpjsonServers": [
+    "sauci-prod",
+    "sauci-non-prod"
   ]
-  }
 }

.claude/skills/ios-simulator-skill/SKILL.md

@@ -0,0 +1,227 @@
+---
+name: ios-simulator-skill
+version: 1.3.0
+description: 21 production-ready scripts for iOS app testing, building, and automation. Provides semantic UI navigation, build automation, accessibility testing, and simulator lifecycle management. Optimized for AI agents with minimal token output.
+---
+
+# iOS Simulator Skill
+
+Build, test, and automate iOS applications using accessibility-driven navigation and structured data instead of pixel coordinates.
+
+## Quick Start
+
+```bash
+# 1. Check environment
+bash scripts/sim_health_check.sh
+
+# 2. Launch app
+python scripts/app_launcher.py --launch com.example.app
+
+# 3. Map screen to see elements
+python scripts/screen_mapper.py
+
+# 4. Tap button
+python scripts/navigator.py --find-text "Login" --tap
+
+# 5. Enter text
+python scripts/navigator.py --find-type TextField --enter-text "user@example.com"
+```
+
+All scripts support `--help` for detailed options and `--json` for machine-readable output.
+
+## 21 Production Scripts
+
+### Build & Development (2 scripts)
+
+1. **build_and_test.py** - Build Xcode projects, run tests, parse results with progressive disclosure
+   - Build with live result streaming
+   - Parse errors and warnings from xcresult bundles
+   - Retrieve detailed build logs on demand
+   - Options: `--project`, `--scheme`, `--clean`, `--test`, `--verbose`, `--json`
+
+2. **log_monitor.py** - Real-time log monitoring with intelligent filtering
+   - Stream logs or capture by duration
+   - Filter by severity (error/warning/info/debug)
+   - Deduplicate repeated messages
+   - Options: `--app`, `--severity`, `--follow`, `--duration`, `--output`, `--json`
+
+### Navigation & Interaction (5 scripts)
+
+3. **screen_mapper.py** - Analyze current screen and list interactive elements
+   - Element type breakdown
+   - Interactive button list
+   - Text field status
+   - Options: `--verbose`, `--hints`, `--json`
+
+4. **navigator.py** - Find and interact with elements semantically
+   - Find by text (fuzzy matching)
+   - Find by element type
+   - Find by accessibility ID
+   - Enter text or tap elements
+   - Options: `--find-text`, `--find-type`, `--find-id`, `--tap`, `--enter-text`, `--json`
+
+5. **gesture.py** - Perform swipes, scrolls, pinches, and complex gestures
+   - Directional swipes (up/down/left/right)
+   - Multi-swipe scrolling
+   - Pinch zoom
+   - Long press
+   - Pull to refresh
+   - Options: `--swipe`, `--scroll`, `--pinch`, `--long-press`, `--refresh`, `--json`
+
+6. **keyboard.py** - Text input and hardware button control
+   - Type text (fast or slow)
+   - Special keys (return, delete, tab, space, arrows)
+   - Hardware buttons (home, lock, volume, screenshot)
+   - Key combinations
+   - Options: `--type`, `--key`, `--button`, `--slow`, `--clear`, `--dismiss`, `--json`
+
+7. **app_launcher.py** - App lifecycle management
+   - Launch apps by bundle ID
+   - Terminate apps
+   - Install/uninstall from .app bundles
+   - Deep link navigation
+   - List installed apps
+   - Check app state
+   - Options: `--launch`, `--terminate`, `--install`, `--uninstall`, `--open-url`, `--list`, `--state`, `--json`
+
+### Testing & Analysis (5 scripts)
+
+8. **accessibility_audit.py** - Check WCAG compliance on current screen
+   - Critical issues (missing labels, empty buttons, no alt text)
+   - Warnings (missing hints, small touch targets)
+   - Info (missing IDs, deep nesting)
+   - Options: `--verbose`, `--output`, `--json`
+
+9. **visual_diff.py** - Compare two screenshots for visual changes
+   - Pixel-by-pixel comparison
+   - Threshold-based pass/fail
+   - Generate diff images
+   - Options: `--threshold`, `--output`, `--details`, `--json`
+
+10. **test_recorder.py** - Automatically document test execution
+    - Capture screenshots and accessibility trees per step
+    - Generate markdown reports with timing data
+    - Options: `--test-name`, `--output`, `--verbose`, `--json`
+
+11. **app_state_capture.py** - Create comprehensive debugging snapshots
+    - Screenshot, UI hierarchy, app logs, device info
+    - Markdown summary for bug reports
+    - Options: `--app-bundle-id`, `--output`, `--log-lines`, `--json`
+
+12. **sim_health_check.sh** - Verify environment is properly configured
+    - Check macOS, Xcode, simctl, IDB, Python
+    - List available and booted simulators
+    - Verify Python packages (Pillow)
+
+### Advanced Testing & Permissions (4 scripts)
+
+13. **clipboard.py** - Manage simulator clipboard for paste testing
+    - Copy text to clipboard
+    - Test paste flows without manual entry
+    - Options: `--copy`, `--test-name`, `--expected`, `--json`
+
+14. **status_bar.py** - Override simulator status bar appearance
+    - Presets: clean (9:41, 100% battery), testing (11:11, 50%), low-battery (20%), airplane (offline)
+    - Custom time, network, battery, WiFi settings
+    - Options: `--preset`, `--time`, `--data-network`, `--battery-level`, `--clear`, `--json`
+
+15. **push_notification.py** - Send simulated push notifications
+    - Simple mode (title + body + badge)
+    - Custom JSON payloads
+    - Test notification handling and deep links
+    - Options: `--bundle-id`, `--title`, `--body`, `--badge`, `--payload`, `--json`
+
+16. **privacy_manager.py** - Grant, revoke, and reset app permissions
+    - 13 supported services (camera, microphone, location, contacts, photos, calendar, health, etc.)
+    - Batch operations (comma-separated services)
+    - Audit trail with test scenario tracking
+    - Options: `--bundle-id`, `--grant`, `--revoke`, `--reset`, `--list`, `--json`
+
+### Device Lifecycle Management (5 scripts)
+
+17. **simctl_boot.py** - Boot simulators with optional readiness verification
+    - Boot by UDID or device name
+    - Wait for device ready with timeout
+    - Batch boot operations (--all, --type)
+    - Performance timing
+    - Options: `--udid`, `--name`, `--wait-ready`, `--timeout`, `--all`, `--type`, `--json`
+
+18. **simctl_shutdown.py** - Gracefully shutdown simulators
+    - Shutdown by UDID or device name
+    - Optional verification of shutdown completion
+    - Batch shutdown operations
+    - Options: `--udid`, `--name`, `--verify`, `--timeout`, `--all`, `--type`, `--json`
+
+19. **simctl_create.py** - Create simulators dynamically
+    - Create by device type and iOS version
+    - List available device types and runtimes
+    - Custom device naming
+    - Returns UDID for CI/CD integration
+    - Options: `--device`, `--runtime`, `--name`, `--list-devices`, `--list-runtimes`, `--json`
+
+20. **simctl_delete.py** - Permanently delete simulators
+    - Delete by UDID or device name
+    - Safety confirmation by default (skip with --yes)
+    - Batch delete operations
+    - Smart deletion (--old N to keep N per device type)
+    - Options: `--udid`, `--name`, `--yes`, `--all`, `--type`, `--old`, `--json`
+
+21. **simctl_erase.py** - Factory reset simulators without deletion
+    - Preserve device UUID (faster than delete+create)
+    - Erase all, by type, or booted simulators
+    - Optional verification
+    - Options: `--udid`, `--name`, `--verify`, `--timeout`, `--all`, `--type`, `--booted`, `--json`
+
+## Common Patterns
+
+**Auto-UDID Detection**: Most scripts auto-detect the booted simulator if --udid is not provided.
+
+**Device Name Resolution**: Use device names (e.g., "iPhone 16 Pro") instead of UDIDs - scripts resolve automatically.
+
+**Batch Operations**: Many scripts support `--all` for all simulators or `--type iPhone` for device type filtering.
+
+**Output Formats**: Default is concise human-readable output. Use `--json` for machine-readable output in CI/CD.
+
+**Help**: All scripts support `--help` for detailed options and examples.
+
+## Typical Workflow
+
+1. Verify environment: `bash scripts/sim_health_check.sh`
+2. Launch app: `python scripts/app_launcher.py --launch com.example.app`
+3. Analyze screen: `python scripts/screen_mapper.py`
+4. Interact: `python scripts/navigator.py --find-text "Button" --tap`
+5. Verify: `python scripts/accessibility_audit.py`
+6. Debug if needed: `python scripts/app_state_capture.py --app-bundle-id com.example.app`
+
+## Requirements
+
+- macOS 12+
+- Xcode Command Line Tools
+- Python 3
+- IDB (optional, for interactive features)
+
+## Documentation
+
+- **SKILL.md** (this file) - Script reference and quick start
+- **README.md** - Installation and examples
+- **CLAUDE.md** - Architecture and implementation details
+- **references/** - Deep documentation on specific topics
+- **examples/** - Complete automation workflows
+
+## Key Design Principles
+
+**Semantic Navigation**: Find elements by meaning (text, type, ID) not pixel coordinates. Survives UI changes.
+
+**Token Efficiency**: Concise default output (3-5 lines) with optional verbose and JSON modes for detailed results.
+
+**Accessibility-First**: Built on standard accessibility APIs for reliability and compatibility.
+
+**Zero Configuration**: Works immediately on any macOS with Xcode. No setup required.
+
+**Structured Data**: Scripts output JSON or formatted text, not raw logs. Easy to parse and integrate.
+
+**Auto-Learning**: Build system remembers your device preference. Configuration stored per-project.
+
+---
+
+Use these scripts directly or let Claude Code invoke them automatically when your request matches the skill description.

.claude/skills/ios-simulator-skill/scripts/accessibility_audit.py

@@ -0,0 +1,292 @@
+#!/usr/bin/env python3
+"""
+iOS Simulator Accessibility Audit
+
+Scans the current simulator screen for accessibility compliance issues.
+Optimized for minimal token output while maintaining functionality.
+
+Usage: python scripts/accessibility_audit.py [options]
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+from dataclasses import asdict, dataclass
+from typing import Any
+
+from common import flatten_tree, get_accessibility_tree, resolve_udid
+
+
+@dataclass
+class Issue:
+    """Represents an accessibility issue."""
+
+    severity: str  # critical, warning, info
+    rule: str
+    element_type: str
+    issue: str
+    fix: str
+
+    def to_dict(self) -> dict:
+        """Convert to dictionary for JSON serialization."""
+        return asdict(self)
+
+
+class AccessibilityAuditor:
+    """Performs accessibility audits on iOS simulator screens."""
+
+    # Critical rules that block users
+    CRITICAL_RULES = {
+        "missing_label": lambda e: e.get("type") in ["Button", "Link"] and not e.get("AXLabel"),
+        "empty_button": lambda e: e.get("type") == "Button"
+        and not (e.get("AXLabel") or e.get("AXValue")),
+        "image_no_alt": lambda e: e.get("type") == "Image" and not e.get("AXLabel"),
+    }
+
+    # Warnings that degrade UX
+    WARNING_RULES = {
+        "missing_hint": lambda e: e.get("type") in ["Slider", "TextField"] and not e.get("help"),
+        "missing_traits": lambda e: e.get("type") and not e.get("traits"),
+    }
+
+    # Info level suggestions
+    INFO_RULES = {
+        "no_identifier": lambda e: not e.get("AXUniqueId"),
+        "deep_nesting": lambda e: e.get("depth", 0) > 5,
+    }
+
+    def __init__(self, udid: str | None = None):
+        """Initialize auditor with optional device UDID."""
+        self.udid = udid
+
+    def get_accessibility_tree(self) -> dict:
+        """Fetch accessibility tree from simulator using shared utility."""
+        return get_accessibility_tree(self.udid, nested=True)
+
+    @staticmethod
+    def _is_small_target(element: dict) -> bool:
+        """Check if touch target is too small (< 44x44 points)."""
+        frame = element.get("frame", {})
+        width = frame.get("width", 0)
+        height = frame.get("height", 0)
+        return width < 44 or height < 44
+
+    def _flatten_tree(self, node: dict, depth: int = 0) -> list[dict]:
+        """Flatten nested accessibility tree for easier processing using shared utility."""
+        return flatten_tree(node, depth)
+
+    def audit_element(self, element: dict) -> list[Issue]:
+        """Audit a single element for accessibility issues."""
+        issues = []
+
+        # Check critical rules
+        for rule_name, rule_func in self.CRITICAL_RULES.items():
+            if rule_func(element):
+                issues.append(
+                    Issue(
+                        severity="critical",
+                        rule=rule_name,
+                        element_type=element.get("type", "Unknown"),
+                        issue=self._get_issue_description(rule_name),
+                        fix=self._get_fix_suggestion(rule_name),
+                    )
+                )
+
+        # Check warnings (skip if critical issues found)
+        if not issues:
+            for rule_name, rule_func in self.WARNING_RULES.items():
+                if rule_func(element):
+                    issues.append(
+                        Issue(
+                            severity="warning",
+                            rule=rule_name,
+                            element_type=element.get("type", "Unknown"),
+                            issue=self._get_issue_description(rule_name),
+                            fix=self._get_fix_suggestion(rule_name),
+                        )
+                    )
+
+        # Check info level (only if verbose or no other issues)
+        if not issues:
+            for rule_name, rule_func in self.INFO_RULES.items():
+                if rule_func(element):
+                    issues.append(
+                        Issue(
+                            severity="info",
+                            rule=rule_name,
+                            element_type=element.get("type", "Unknown"),
+                            issue=self._get_issue_description(rule_name),
+                            fix=self._get_fix_suggestion(rule_name),
+                        )
+                    )
+
+        return issues
+
+    def _get_issue_description(self, rule: str) -> str:
+        """Get human-readable issue description."""
+        descriptions = {
+            "missing_label": "Interactive element missing accessibility label",
+            "empty_button": "Button has no text or label",
+            "image_no_alt": "Image missing alternative text",
+            "missing_hint": "Complex control missing hint",
+            "small_touch_target": "Touch target smaller than 44x44pt",
+            "missing_traits": "Element missing accessibility traits",
+            "no_identifier": "Missing accessibility identifier",
+            "deep_nesting": "Deeply nested (>5 levels)",
+        }
+        return descriptions.get(rule, "Accessibility issue")
+
+    def _get_fix_suggestion(self, rule: str) -> str:
+        """Get fix suggestion for issue."""
+        fixes = {
+            "missing_label": "Add accessibilityLabel",
+            "empty_button": "Set button title or accessibilityLabel",
+            "image_no_alt": "Add accessibilityLabel with description",
+            "missing_hint": "Add accessibilityHint",
+            "small_touch_target": "Increase to minimum 44x44pt",
+            "missing_traits": "Set appropriate accessibilityTraits",
+            "no_identifier": "Add accessibilityIdentifier for testing",
+            "deep_nesting": "Simplify view hierarchy",
+        }
+        return fixes.get(rule, "Review accessibility")
+
+    def audit(self, verbose: bool = False) -> dict[str, Any]:
+        """Perform full accessibility audit."""
+        # Get accessibility tree
+        tree = self.get_accessibility_tree()
+
+        # Flatten for processing
+        elements = self._flatten_tree(tree)
+
+        # Audit each element
+        all_issues = []
+        for element in elements:
+            issues = self.audit_element(element)
+            for issue in issues:
+                issue_dict = issue.to_dict()
+                # Add minimal element info for context
+                issue_dict["element"] = {
+                    "type": element.get("type", "Unknown"),
+                    "label": element.get("AXLabel", "")[:30] if element.get("AXLabel") else None,
+                }
+                all_issues.append(issue_dict)
+
+        # Count by severity
+        critical = len([i for i in all_issues if i["severity"] == "critical"])
+        warning = len([i for i in all_issues if i["severity"] == "warning"])
+        info = len([i for i in all_issues if i["severity"] == "info"])
+
+        # Build result (token-optimized)
+        result = {
+            "summary": {
+                "total": len(elements),
+                "issues": len(all_issues),
+                "critical": critical,
+                "warning": warning,
+                "info": info,
+            }
+        }
+
+        if verbose:
+            # Full details only if requested
+            result["issues"] = all_issues
+        else:
+            # Default: top issues only (token-efficient)
+            result["top_issues"] = self._get_top_issues(all_issues)
+
+        return result
+
+    def _get_top_issues(self, issues: list[dict]) -> list[dict]:
+        """Get top 3 issues grouped by type (token-efficient)."""
+        if not issues:
+            return []
+
+        # Group by rule
+        grouped = {}
+        for issue in issues:
+            rule = issue["rule"]
+            if rule not in grouped:
+                grouped[rule] = {
+                    "severity": issue["severity"],
+                    "rule": rule,
+                    "count": 0,
+                    "fix": issue["fix"],
+                }
+            grouped[rule]["count"] += 1
+
+        # Sort by severity and count
+        severity_order = {"critical": 0, "warning": 1, "info": 2}
+        sorted_issues = sorted(
+            grouped.values(), key=lambda x: (severity_order[x["severity"]], -x["count"])
+        )
+
+        return sorted_issues[:3]
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Audit iOS simulator screen for accessibility issues"
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+    parser.add_argument("--output", help="Save JSON report to file")
+    parser.add_argument(
+        "--verbose", action="store_true", help="Include all issue details (increases output)"
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    # Perform audit
+    auditor = AccessibilityAuditor(udid=udid)
+
+    try:
+        result = auditor.audit(verbose=args.verbose)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    # Output results
+    if args.output:
+        # Save to file
+        with open(args.output, "w") as f:
+            json.dump(result, f, indent=2)
+        # Print minimal summary
+        summary = result["summary"]
+        print(f"Audit complete: {summary['issues']} issues ({summary['critical']} critical)")
+        print(f"Report saved to: {args.output}")
+    # Print to stdout (token-optimized by default)
+    elif args.verbose:
+        print(json.dumps(result, indent=2))
+    else:
+        # Ultra-compact output
+        summary = result["summary"]
+        print(f"Elements: {summary['total']}, Issues: {summary['issues']}")
+        print(
+            f"Critical: {summary['critical']}, Warning: {summary['warning']}, Info: {summary['info']}"
+        )
+
+        if result.get("top_issues"):
+            print("\nTop issues:")
+            for issue in result["top_issues"]:
+                print(
+                    f"  [{issue['severity']}] {issue['rule']} ({issue['count']}x) - {issue['fix']}"
+                )
+
+    # Exit with error if critical issues found
+    if result["summary"]["critical"] > 0:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/app_launcher.py

@@ -0,0 +1,322 @@
+#!/usr/bin/env python3
+"""
+iOS App Launcher - App Lifecycle Control
+
+Launches, terminates, and manages iOS apps in the simulator.
+Handles deep links and app switching.
+
+Usage: python scripts/app_launcher.py --launch com.example.app
+"""
+
+import argparse
+import contextlib
+import subprocess
+import sys
+import time
+
+from common import build_simctl_command, resolve_udid
+
+
+class AppLauncher:
+    """Controls app lifecycle on iOS simulator."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize app launcher."""
+        self.udid = udid
+
+    def launch(self, bundle_id: str, wait_for_debugger: bool = False) -> tuple[bool, int | None]:
+        """
+        Launch an app.
+
+        Args:
+            bundle_id: App bundle identifier
+            wait_for_debugger: Wait for debugger attachment
+
+        Returns:
+            (success, pid) tuple
+        """
+        cmd = build_simctl_command("launch", self.udid, bundle_id)
+
+        if wait_for_debugger:
+            cmd.insert(3, "--wait-for-debugger")  # Insert after "launch" operation
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+            # Parse PID from output if available
+            pid = None
+            if result.stdout:
+                # Output format: "com.example.app: <PID>"
+                parts = result.stdout.strip().split(":")
+                if len(parts) > 1:
+                    with contextlib.suppress(ValueError):
+                        pid = int(parts[1].strip())
+            return (True, pid)
+        except subprocess.CalledProcessError:
+            return (False, None)
+
+    def terminate(self, bundle_id: str) -> bool:
+        """
+        Terminate an app.
+
+        Args:
+            bundle_id: App bundle identifier
+
+        Returns:
+            Success status
+        """
+        cmd = build_simctl_command("terminate", self.udid, bundle_id)
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def install(self, app_path: str) -> bool:
+        """
+        Install an app.
+
+        Args:
+            app_path: Path to .app bundle
+
+        Returns:
+            Success status
+        """
+        cmd = build_simctl_command("install", self.udid, app_path)
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def uninstall(self, bundle_id: str) -> bool:
+        """
+        Uninstall an app.
+
+        Args:
+            bundle_id: App bundle identifier
+
+        Returns:
+            Success status
+        """
+        cmd = build_simctl_command("uninstall", self.udid, bundle_id)
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def open_url(self, url: str) -> bool:
+        """
+        Open URL (for deep linking).
+
+        Args:
+            url: URL to open (http://, myapp://, etc.)
+
+        Returns:
+            Success status
+        """
+        cmd = build_simctl_command("openurl", self.udid, url)
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def list_apps(self) -> list[dict[str, str]]:
+        """
+        List installed apps.
+
+        Returns:
+            List of app info dictionaries
+        """
+        cmd = build_simctl_command("listapps", self.udid)
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            # Parse plist output using plutil to convert to JSON
+            plist_data = result.stdout
+
+            # Use plutil to convert plist to JSON
+            convert_cmd = ["plutil", "-convert", "json", "-o", "-", "-"]
+            convert_result = subprocess.run(
+                convert_cmd, check=False, input=plist_data, capture_output=True, text=True
+            )
+
+            apps = []
+            if convert_result.returncode == 0:
+                import json
+
+                try:
+                    data = json.loads(convert_result.stdout)
+                    for bundle_id, app_info in data.items():
+                        # Skip system internal apps that are hidden
+                        if app_info.get("ApplicationType") == "Hidden":
+                            continue
+
+                        apps.append(
+                            {
+                                "bundle_id": bundle_id,
+                                "name": app_info.get(
+                                    "CFBundleDisplayName", app_info.get("CFBundleName", bundle_id)
+                                ),
+                                "path": app_info.get("Path", ""),
+                                "version": app_info.get("CFBundleVersion", "Unknown"),
+                                "type": app_info.get("ApplicationType", "User"),
+                            }
+                        )
+                except json.JSONDecodeError:
+                    pass
+
+            return apps
+        except subprocess.CalledProcessError:
+            return []
+
+    def get_app_state(self, bundle_id: str) -> str:
+        """
+        Get app state (running, suspended, etc.).
+
+        Args:
+            bundle_id: App bundle identifier
+
+        Returns:
+            State string or 'unknown'
+        """
+        # Check if app is running by trying to get its PID
+        cmd = build_simctl_command("spawn", self.udid, "launchctl", "list")
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+            if bundle_id in result.stdout:
+                return "running"
+            return "not running"
+        except subprocess.CalledProcessError:
+            return "unknown"
+
+    def restart_app(self, bundle_id: str, delay: float = 1.0) -> bool:
+        """
+        Restart an app (terminate then launch).
+
+        Args:
+            bundle_id: App bundle identifier
+            delay: Delay between terminate and launch
+
+        Returns:
+            Success status
+        """
+        # Terminate
+        self.terminate(bundle_id)
+        time.sleep(delay)
+
+        # Launch
+        success, _ = self.launch(bundle_id)
+        return success
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Control iOS app lifecycle")
+
+    # Actions
+    parser.add_argument("--launch", help="Launch app by bundle ID")
+    parser.add_argument("--terminate", help="Terminate app by bundle ID")
+    parser.add_argument("--restart", help="Restart app by bundle ID")
+    parser.add_argument("--install", help="Install app from .app path")
+    parser.add_argument("--uninstall", help="Uninstall app by bundle ID")
+    parser.add_argument("--open-url", help="Open URL (deep link)")
+    parser.add_argument("--list", action="store_true", help="List installed apps")
+    parser.add_argument("--state", help="Get app state by bundle ID")
+
+    # Options
+    parser.add_argument(
+        "--wait-for-debugger", action="store_true", help="Wait for debugger when launching"
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    launcher = AppLauncher(udid=udid)
+
+    # Execute requested action
+    if args.launch:
+        success, pid = launcher.launch(args.launch, args.wait_for_debugger)
+        if success:
+            if pid:
+                print(f"Launched {args.launch} (PID: {pid})")
+            else:
+                print(f"Launched {args.launch}")
+        else:
+            print(f"Failed to launch {args.launch}")
+            sys.exit(1)
+
+    elif args.terminate:
+        if launcher.terminate(args.terminate):
+            print(f"Terminated {args.terminate}")
+        else:
+            print(f"Failed to terminate {args.terminate}")
+            sys.exit(1)
+
+    elif args.restart:
+        if launcher.restart_app(args.restart):
+            print(f"Restarted {args.restart}")
+        else:
+            print(f"Failed to restart {args.restart}")
+            sys.exit(1)
+
+    elif args.install:
+        if launcher.install(args.install):
+            print(f"Installed {args.install}")
+        else:
+            print(f"Failed to install {args.install}")
+            sys.exit(1)
+
+    elif args.uninstall:
+        if launcher.uninstall(args.uninstall):
+            print(f"Uninstalled {args.uninstall}")
+        else:
+            print(f"Failed to uninstall {args.uninstall}")
+            sys.exit(1)
+
+    elif args.open_url:
+        if launcher.open_url(args.open_url):
+            print(f"Opened URL: {args.open_url}")
+        else:
+            print(f"Failed to open URL: {args.open_url}")
+            sys.exit(1)
+
+    elif args.list:
+        apps = launcher.list_apps()
+        if apps:
+            print(f"Installed apps ({len(apps)}):")
+            for app in apps[:10]:  # Limit for token efficiency
+                print(f"  {app['bundle_id']}: {app['name']} (v{app['version']})")
+            if len(apps) > 10:
+                print(f"  ... and {len(apps) - 10} more")
+        else:
+            print("No apps found or failed to list")
+
+    elif args.state:
+        state = launcher.get_app_state(args.state)
+        print(f"{args.state}: {state}")
+
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/app_state_capture.py

@@ -0,0 +1,391 @@
+#!/usr/bin/env python3
+"""
+App State Capture for iOS Simulator
+
+Captures complete app state including screenshot, accessibility tree, and logs.
+Optimized for minimal token output.
+
+Usage: python scripts/app_state_capture.py [options]
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+from datetime import datetime
+from pathlib import Path
+
+from common import (
+    capture_screenshot,
+    count_elements,
+    get_accessibility_tree,
+    resolve_udid,
+)
+
+
+class AppStateCapture:
+    """Captures comprehensive app state for debugging."""
+
+    def __init__(
+        self,
+        app_bundle_id: str | None = None,
+        udid: str | None = None,
+        inline: bool = False,
+        screenshot_size: str = "half",
+    ):
+        """
+        Initialize state capture.
+
+        Args:
+            app_bundle_id: Optional app bundle ID for log filtering
+            udid: Optional device UDID (uses booted if not specified)
+            inline: If True, return screenshots as base64 (for vision-based automation)
+            screenshot_size: 'full', 'half', 'quarter', 'thumb' (default: 'half')
+        """
+        self.app_bundle_id = app_bundle_id
+        self.udid = udid
+        self.inline = inline
+        self.screenshot_size = screenshot_size
+
+    def capture_screenshot(self, output_path: Path) -> bool:
+        """Capture screenshot of current screen."""
+        cmd = ["xcrun", "simctl", "io"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(["screenshot", str(output_path)])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def capture_accessibility_tree(self, output_path: Path) -> dict:
+        """Capture accessibility tree using shared utility."""
+        try:
+            # Use shared utility to fetch tree
+            tree = get_accessibility_tree(self.udid, nested=True)
+
+            # Save tree
+            with open(output_path, "w") as f:
+                json.dump(tree, f, indent=2)
+
+            # Return summary using shared utility
+            return {"captured": True, "element_count": count_elements(tree)}
+        except Exception as e:
+            return {"captured": False, "error": str(e)}
+
+    def capture_logs(self, output_path: Path, line_limit: int = 100) -> dict:
+        """Capture recent app logs."""
+        if not self.app_bundle_id:
+            # Can't capture logs without app ID
+            return {"captured": False, "reason": "No app bundle ID specified"}
+
+        # Get app name from bundle ID (simplified)
+        app_name = self.app_bundle_id.split(".")[-1]
+
+        cmd = ["xcrun", "simctl", "spawn"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(
+            [
+                "log",
+                "show",
+                "--predicate",
+                f'process == "{app_name}"',
+                "--last",
+                "1m",  # Last 1 minute
+                "--style",
+                "compact",
+            ]
+        )
+
+        try:
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=5)
+            logs = result.stdout
+
+            # Limit lines for token efficiency
+            lines = logs.split("\n")
+            if len(lines) > line_limit:
+                lines = lines[-line_limit:]
+
+            # Save logs
+            with open(output_path, "w") as f:
+                f.write("\n".join(lines))
+
+            # Analyze for issues
+            warning_count = sum(1 for line in lines if "warning" in line.lower())
+            error_count = sum(1 for line in lines if "error" in line.lower())
+
+            return {
+                "captured": True,
+                "lines": len(lines),
+                "warnings": warning_count,
+                "errors": error_count,
+            }
+        except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
+            return {"captured": False, "error": str(e)}
+
+    def capture_device_info(self) -> dict:
+        """Get device information."""
+        cmd = ["xcrun", "simctl", "list", "devices", "booted"]
+
+        if self.udid:
+            # Specific device info
+            cmd = ["xcrun", "simctl", "list", "devices"]
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            # Parse output for device info (simplified)
+            lines = result.stdout.split("\n")
+            device_info = {}
+
+            for line in lines:
+                if "iPhone" in line or "iPad" in line:
+                    # Extract device name and state
+                    parts = line.strip().split("(")
+                    if parts:
+                        device_info["name"] = parts[0].strip()
+                        if len(parts) > 2:
+                            device_info["udid"] = parts[1].replace(")", "").strip()
+                            device_info["state"] = parts[2].replace(")", "").strip()
+                    break
+
+            return device_info
+        except subprocess.CalledProcessError:
+            return {}
+
+    def capture_all(
+        self, output_dir: str, log_lines: int = 100, app_name: str | None = None
+    ) -> dict:
+        """
+        Capture complete app state.
+
+        Args:
+            output_dir: Directory to save artifacts
+            log_lines: Number of log lines to capture
+            app_name: App name for semantic naming (for inline mode)
+
+        Returns:
+            Summary of captured state
+        """
+        # Create output directory (only if not in inline mode)
+        output_path = Path(output_dir)
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        if not self.inline:
+            capture_dir = output_path / f"app-state-{timestamp}"
+            capture_dir.mkdir(parents=True, exist_ok=True)
+        else:
+            capture_dir = None
+
+        summary = {
+            "timestamp": datetime.now().isoformat(),
+            "screenshot_mode": "inline" if self.inline else "file",
+        }
+
+        if capture_dir:
+            summary["output_dir"] = str(capture_dir)
+
+        # Capture screenshot using new unified utility
+        screenshot_result = capture_screenshot(
+            self.udid,
+            size=self.screenshot_size,
+            inline=self.inline,
+            app_name=app_name,
+        )
+
+        if self.inline:
+            # Inline mode: store base64
+            summary["screenshot"] = {
+                "mode": "inline",
+                "base64": screenshot_result["base64_data"],
+                "width": screenshot_result["width"],
+                "height": screenshot_result["height"],
+                "size_preset": self.screenshot_size,
+            }
+        else:
+            # File mode: save to disk
+            screenshot_path = capture_dir / "screenshot.png"
+            # Move temp file to target location
+            import shutil
+
+            shutil.move(screenshot_result["file_path"], screenshot_path)
+            summary["screenshot"] = {
+                "mode": "file",
+                "file": "screenshot.png",
+                "size_bytes": screenshot_result["size_bytes"],
+            }
+
+        # Capture accessibility tree
+        if not self.inline or capture_dir:
+            accessibility_path = (capture_dir or output_path) / "accessibility-tree.json"
+        else:
+            accessibility_path = None
+
+        if accessibility_path:
+            tree_info = self.capture_accessibility_tree(accessibility_path)
+            summary["accessibility"] = tree_info
+
+        # Capture logs (if app ID provided)
+        if self.app_bundle_id:
+            if not self.inline or capture_dir:
+                logs_path = (capture_dir or output_path) / "app-logs.txt"
+            else:
+                logs_path = None
+
+            if logs_path:
+                log_info = self.capture_logs(logs_path, log_lines)
+                summary["logs"] = log_info
+
+        # Get device info
+        device_info = self.capture_device_info()
+        if device_info:
+            summary["device"] = device_info
+            # Save device info (file mode only)
+            if capture_dir:
+                with open(capture_dir / "device-info.json", "w") as f:
+                    json.dump(device_info, f, indent=2)
+
+        # Save summary (file mode only)
+        if capture_dir:
+            with open(capture_dir / "summary.json", "w") as f:
+                json.dump(summary, f, indent=2)
+
+            # Create markdown summary
+            self._create_summary_md(capture_dir, summary)
+
+        return summary
+
+    def _create_summary_md(self, capture_dir: Path, summary: dict) -> None:
+        """Create markdown summary file."""
+        md_path = capture_dir / "summary.md"
+
+        with open(md_path, "w") as f:
+            f.write("# App State Capture\n\n")
+            f.write(f"**Timestamp:** {summary['timestamp']}\n\n")
+
+            if "device" in summary:
+                f.write("## Device\n")
+                device = summary["device"]
+                f.write(f"- Name: {device.get('name', 'Unknown')}\n")
+                f.write(f"- UDID: {device.get('udid', 'N/A')}\n")
+                f.write(f"- State: {device.get('state', 'Unknown')}\n\n")
+
+            f.write("## Screenshot\n")
+            f.write("![Current Screen](screenshot.png)\n\n")
+
+            if "accessibility" in summary:
+                acc = summary["accessibility"]
+                f.write("## Accessibility\n")
+                if acc.get("captured"):
+                    f.write(f"- Elements: {acc.get('element_count', 0)}\n")
+                else:
+                    f.write(f"- Error: {acc.get('error', 'Unknown')}\n")
+                f.write("\n")
+
+            if "logs" in summary:
+                logs = summary["logs"]
+                f.write("## Logs\n")
+                if logs.get("captured"):
+                    f.write(f"- Lines: {logs.get('lines', 0)}\n")
+                    f.write(f"- Warnings: {logs.get('warnings', 0)}\n")
+                    f.write(f"- Errors: {logs.get('errors', 0)}\n")
+                else:
+                    f.write(f"- {logs.get('reason', logs.get('error', 'Not captured'))}\n")
+                f.write("\n")
+
+            f.write("## Files\n")
+            f.write("- `screenshot.png` - Current screen\n")
+            f.write("- `accessibility-tree.json` - Full UI hierarchy\n")
+            if self.app_bundle_id:
+                f.write("- `app-logs.txt` - Recent app logs\n")
+            f.write("- `device-info.json` - Device details\n")
+            f.write("- `summary.json` - Complete capture metadata\n")
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Capture complete app state for debugging")
+    parser.add_argument(
+        "--app-bundle-id", help="App bundle ID for log filtering (e.g., com.example.app)"
+    )
+    parser.add_argument(
+        "--output", default=".", help="Output directory (default: current directory)"
+    )
+    parser.add_argument(
+        "--log-lines", type=int, default=100, help="Number of log lines to capture (default: 100)"
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+    parser.add_argument(
+        "--inline",
+        action="store_true",
+        help="Return screenshots as base64 (inline mode for vision-based automation)",
+    )
+    parser.add_argument(
+        "--size",
+        choices=["full", "half", "quarter", "thumb"],
+        default="half",
+        help="Screenshot size for token optimization (default: half)",
+    )
+    parser.add_argument("--app-name", help="App name for semantic screenshot naming")
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    # Create capturer
+    capturer = AppStateCapture(
+        app_bundle_id=args.app_bundle_id,
+        udid=udid,
+        inline=args.inline,
+        screenshot_size=args.size,
+    )
+
+    # Capture state
+    try:
+        summary = capturer.capture_all(
+            output_dir=args.output, log_lines=args.log_lines, app_name=args.app_name
+        )
+
+        # Token-efficient output
+        if "output_dir" in summary:
+            print(f"State captured: {summary['output_dir']}/")
+        else:
+            # Inline mode
+            print(
+                f"State captured (inline mode): {summary['screenshot']['width']}x{summary['screenshot']['height']}"
+            )
+
+        # Report any issues found
+        if "logs" in summary and summary["logs"].get("captured"):
+            logs = summary["logs"]
+            if logs["errors"] > 0 or logs["warnings"] > 0:
+                print(f"Issues found: {logs['errors']} errors, {logs['warnings']} warnings")
+
+        if "accessibility" in summary and summary["accessibility"].get("captured"):
+            print(f"Elements: {summary['accessibility']['element_count']}")
+
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/build_and_test.py

@@ -0,0 +1,310 @@
+#!/usr/bin/env python3
+"""
+Build and Test Automation for Xcode Projects
+
+Ultra token-efficient build automation with progressive disclosure via xcresult bundles.
+
+Features:
+- Minimal default output (5-10 tokens)
+- Progressive disclosure for error/warning/log details
+- Native xcresult bundle support
+- Clean modular architecture
+
+Usage Examples:
+    # Build (minimal output)
+    python scripts/build_and_test.py --project MyApp.xcodeproj
+    # Output: Build: SUCCESS (0 errors, 3 warnings) [xcresult-20251018-143052]
+
+    # Get error details
+    python scripts/build_and_test.py --get-errors xcresult-20251018-143052
+
+    # Get warnings
+    python scripts/build_and_test.py --get-warnings xcresult-20251018-143052
+
+    # Get build log
+    python scripts/build_and_test.py --get-log xcresult-20251018-143052
+
+    # Get everything as JSON
+    python scripts/build_and_test.py --get-all xcresult-20251018-143052 --json
+
+    # List recent builds
+    python scripts/build_and_test.py --list-xcresults
+
+    # Verbose mode (for debugging)
+    python scripts/build_and_test.py --project MyApp.xcodeproj --verbose
+"""
+
+import argparse
+import sys
+from pathlib import Path
+
+# Import our modular components
+from xcode import BuildRunner, OutputFormatter, XCResultCache, XCResultParser
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Build and test Xcode projects with progressive disclosure",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Build project (minimal output)
+  python scripts/build_and_test.py --project MyApp.xcodeproj
+
+  # Run tests
+  python scripts/build_and_test.py --project MyApp.xcodeproj --test
+
+  # Get error details from previous build
+  python scripts/build_and_test.py --get-errors xcresult-20251018-143052
+
+  # Get all details as JSON
+  python scripts/build_and_test.py --get-all xcresult-20251018-143052 --json
+
+  # List recent builds
+  python scripts/build_and_test.py --list-xcresults
+        """,
+    )
+
+    # Build/test mode arguments
+    build_group = parser.add_argument_group("Build/Test Options")
+    project_group = build_group.add_mutually_exclusive_group()
+    project_group.add_argument("--project", help="Path to .xcodeproj file")
+    project_group.add_argument("--workspace", help="Path to .xcworkspace file")
+
+    build_group.add_argument("--scheme", help="Build scheme (auto-detected if not specified)")
+    build_group.add_argument(
+        "--configuration",
+        default="Debug",
+        choices=["Debug", "Release"],
+        help="Build configuration (default: Debug)",
+    )
+    build_group.add_argument("--simulator", help="Simulator name (default: iPhone 15)")
+    build_group.add_argument("--clean", action="store_true", help="Clean before building")
+    build_group.add_argument("--test", action="store_true", help="Run tests")
+    build_group.add_argument("--suite", help="Specific test suite to run")
+
+    # Progressive disclosure arguments
+    disclosure_group = parser.add_argument_group("Progressive Disclosure Options")
+    disclosure_group.add_argument(
+        "--get-errors", metavar="XCRESULT_ID", help="Get error details from xcresult"
+    )
+    disclosure_group.add_argument(
+        "--get-warnings", metavar="XCRESULT_ID", help="Get warning details from xcresult"
+    )
+    disclosure_group.add_argument(
+        "--get-log", metavar="XCRESULT_ID", help="Get build log from xcresult"
+    )
+    disclosure_group.add_argument(
+        "--get-all", metavar="XCRESULT_ID", help="Get all details from xcresult"
+    )
+    disclosure_group.add_argument(
+        "--list-xcresults", action="store_true", help="List recent xcresult bundles"
+    )
+
+    # Output options
+    output_group = parser.add_argument_group("Output Options")
+    output_group.add_argument("--verbose", action="store_true", help="Show detailed output")
+    output_group.add_argument("--json", action="store_true", help="Output as JSON")
+
+    args = parser.parse_args()
+
+    # Initialize cache
+    cache = XCResultCache()
+
+    # Handle list mode
+    if args.list_xcresults:
+        xcresults = cache.list()
+        if args.json:
+            import json
+
+            print(json.dumps(xcresults, indent=2))
+        elif not xcresults:
+            print("No xcresult bundles found")
+        else:
+            print(f"Recent XCResult bundles ({len(xcresults)}):")
+            print()
+            for xc in xcresults:
+                print(f"  {xc['id']}")
+                print(f"    Created: {xc['created']}")
+                print(f"    Size: {xc['size_mb']} MB")
+                print()
+        return 0
+
+    # Handle retrieval modes
+    xcresult_id = args.get_errors or args.get_warnings or args.get_log or args.get_all
+
+    if xcresult_id:
+        xcresult_path = cache.get_path(xcresult_id)
+
+        if not xcresult_path or not xcresult_path.exists():
+            print(f"Error: XCResult bundle not found: {xcresult_id}", file=sys.stderr)
+            print("Use --list-xcresults to see available bundles", file=sys.stderr)
+            return 1
+
+        # Load cached stderr for progressive disclosure
+        cached_stderr = cache.get_stderr(xcresult_id)
+        parser = XCResultParser(xcresult_path, stderr=cached_stderr)
+
+        # Get errors
+        if args.get_errors:
+            errors = parser.get_errors()
+            if args.json:
+                import json
+
+                print(json.dumps(errors, indent=2))
+            else:
+                print(OutputFormatter.format_errors(errors))
+            return 0
+
+        # Get warnings
+        if args.get_warnings:
+            warnings = parser.get_warnings()
+            if args.json:
+                import json
+
+                print(json.dumps(warnings, indent=2))
+            else:
+                print(OutputFormatter.format_warnings(warnings))
+            return 0
+
+        # Get log
+        if args.get_log:
+            log = parser.get_build_log()
+            if log:
+                print(OutputFormatter.format_log(log))
+            else:
+                print("No build log available", file=sys.stderr)
+                return 1
+            return 0
+
+        # Get all
+        if args.get_all:
+            error_count, warning_count = parser.count_issues()
+            errors = parser.get_errors()
+            warnings = parser.get_warnings()
+            build_log = parser.get_build_log()
+
+            if args.json:
+                import json
+
+                data = {
+                    "xcresult_id": xcresult_id,
+                    "error_count": error_count,
+                    "warning_count": warning_count,
+                    "errors": errors,
+                    "warnings": warnings,
+                    "log_preview": build_log[:1000] if build_log else None,
+                }
+                print(json.dumps(data, indent=2))
+            else:
+                print(f"XCResult: {xcresult_id}")
+                print(f"Errors: {error_count}, Warnings: {warning_count}")
+                print()
+                if errors:
+                    print(OutputFormatter.format_errors(errors, limit=10))
+                    print()
+                if warnings:
+                    print(OutputFormatter.format_warnings(warnings, limit=10))
+                    print()
+                if build_log:
+                    print("Build Log (last 30 lines):")
+                    print(OutputFormatter.format_log(build_log, lines=30))
+            return 0
+
+    # Build/test mode
+    if not args.project and not args.workspace:
+        # Try to auto-detect in current directory
+        cwd = Path.cwd()
+        projects = list(cwd.glob("*.xcodeproj"))
+        workspaces = list(cwd.glob("*.xcworkspace"))
+
+        if workspaces:
+            args.workspace = str(workspaces[0])
+        elif projects:
+            args.project = str(projects[0])
+        else:
+            parser.error("No project or workspace specified and none found in current directory")
+
+    # Initialize builder
+    builder = BuildRunner(
+        project_path=args.project,
+        workspace_path=args.workspace,
+        scheme=args.scheme,
+        configuration=args.configuration,
+        simulator=args.simulator,
+        cache=cache,
+    )
+
+    # Execute build or test
+    if args.test:
+        success, xcresult_id, stderr = builder.test(test_suite=args.suite)
+    else:
+        success, xcresult_id, stderr = builder.build(clean=args.clean)
+
+    if not xcresult_id and not stderr:
+        print("Error: Build/test failed without creating xcresult or error output", file=sys.stderr)
+        return 1
+
+    # Save stderr to cache for progressive disclosure
+    if xcresult_id and stderr:
+        cache.save_stderr(xcresult_id, stderr)
+
+    # Parse results
+    xcresult_path = cache.get_path(xcresult_id) if xcresult_id else None
+    parser = XCResultParser(xcresult_path, stderr=stderr)
+    error_count, warning_count = parser.count_issues()
+
+    # Format output
+    status = "SUCCESS" if success else "FAILED"
+
+    # Generate hints for failed builds
+    hints = None
+    if not success:
+        errors = parser.get_errors()
+        hints = OutputFormatter.generate_hints(errors)
+
+    if args.verbose:
+        # Verbose mode with error/warning details
+        errors = parser.get_errors() if error_count > 0 else None
+        warnings = parser.get_warnings() if warning_count > 0 else None
+
+        output = OutputFormatter.format_verbose(
+            status=status,
+            error_count=error_count,
+            warning_count=warning_count,
+            xcresult_id=xcresult_id or "N/A",
+            errors=errors,
+            warnings=warnings,
+        )
+        print(output)
+    elif args.json:
+        # JSON mode
+        data = {
+            "success": success,
+            "xcresult_id": xcresult_id or None,
+            "error_count": error_count,
+            "warning_count": warning_count,
+        }
+        if hints:
+            data["hints"] = hints
+        import json
+
+        print(json.dumps(data, indent=2))
+    else:
+        # Minimal mode (default)
+        output = OutputFormatter.format_minimal(
+            status=status,
+            error_count=error_count,
+            warning_count=warning_count,
+            xcresult_id=xcresult_id or "N/A",
+            hints=hints,
+        )
+        print(output)
+
+    # Exit with appropriate code
+    return 0 if success else 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.claude/skills/ios-simulator-skill/scripts/clipboard.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+"""
+iOS Simulator Clipboard Manager
+
+Copy text to simulator clipboard for testing paste flows.
+Optimized for minimal token output.
+
+Usage: python scripts/clipboard.py --copy "text to copy"
+"""
+
+import argparse
+import subprocess
+import sys
+
+from common import resolve_udid
+
+
+class ClipboardManager:
+    """Manages clipboard operations on iOS simulator."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize clipboard manager.
+
+        Args:
+            udid: Optional device UDID (auto-detects booted simulator if None)
+        """
+        self.udid = udid
+
+    def copy(self, text: str) -> bool:
+        """
+        Copy text to simulator clipboard.
+
+        Args:
+            text: Text to copy to clipboard
+
+        Returns:
+            Success status
+        """
+        cmd = ["xcrun", "simctl", "pbcopy"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.append(text)
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Copy text to iOS simulator clipboard")
+    parser.add_argument("--copy", required=True, help="Text to copy to clipboard")
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+    parser.add_argument("--test-name", help="Test scenario name for tracking")
+    parser.add_argument("--expected", help="Expected behavior after paste")
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    # Create manager and copy text
+    manager = ClipboardManager(udid=udid)
+
+    if manager.copy(args.copy):
+        # Token-efficient output
+        output = f'Copied: "{args.copy}"'
+
+        if args.test_name:
+            output += f" (test: {args.test_name})"
+
+        print(output)
+
+        # Provide usage guidance
+        if args.expected:
+            print(f"Expected: {args.expected}")
+
+        print()
+        print("Next steps:")
+        print("1. Tap text field with: python scripts/navigator.py --find-type TextField --tap")
+        print("2. Paste with: python scripts/keyboard.py --key return")
+        print("   Or use Cmd+V gesture with: python scripts/keyboard.py --key cmd+v")
+
+    else:
+        print("Failed to copy text to clipboard")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/common/__init__.py

@@ -0,0 +1,59 @@
+"""
+Common utilities shared across iOS simulator scripts.
+
+This module centralizes genuinely reused code patterns to eliminate duplication
+while respecting Jackson's Law - no over-abstraction, only truly shared logic.
+
+Organization:
+- device_utils: Device detection, command building, coordinate transformation
+- idb_utils: IDB-specific operations (accessibility tree, element manipulation)
+- cache_utils: Progressive disclosure caching for large outputs
+- screenshot_utils: Screenshot capture with file and inline modes
+"""
+
+from .cache_utils import ProgressiveCache, get_cache
+from .device_utils import (
+    build_idb_command,
+    build_simctl_command,
+    get_booted_device_udid,
+    get_device_screen_size,
+    resolve_udid,
+    transform_screenshot_coords,
+)
+from .idb_utils import (
+    count_elements,
+    flatten_tree,
+    get_accessibility_tree,
+    get_screen_size,
+)
+from .screenshot_utils import (
+    capture_screenshot,
+    format_screenshot_result,
+    generate_screenshot_name,
+    get_size_preset,
+    resize_screenshot,
+)
+
+__all__ = [
+    # cache_utils
+    "ProgressiveCache",
+    # device_utils
+    "build_idb_command",
+    "build_simctl_command",
+    # screenshot_utils
+    "capture_screenshot",
+    # idb_utils
+    "count_elements",
+    "flatten_tree",
+    "format_screenshot_result",
+    "generate_screenshot_name",
+    "get_accessibility_tree",
+    "get_booted_device_udid",
+    "get_cache",
+    "get_device_screen_size",
+    "get_screen_size",
+    "get_size_preset",
+    "resize_screenshot",
+    "resolve_udid",
+    "transform_screenshot_coords",
+]

.claude/skills/ios-simulator-skill/scripts/common/cache_utils.py

@@ -0,0 +1,260 @@
+#!/usr/bin/env python3
+"""
+Progressive disclosure cache for large outputs.
+
+Implements cache system to support progressive disclosure pattern:
+- Return concise summary with cache_id for large outputs
+- User retrieves full details on demand via cache_id
+- Reduces token usage by 96% for common queries
+
+Cache directory: ~/.ios-simulator-skill/cache/
+Cache expiration: Configurable per cache type (default 1 hour)
+
+Used by:
+- sim_list.py - Simulator listing progressive disclosure
+- Future: build logs, UI trees, etc.
+"""
+
+import json
+import time
+from datetime import datetime, timedelta
+from pathlib import Path
+from typing import Any
+
+
+class ProgressiveCache:
+    """Cache for progressive disclosure pattern.
+
+    Stores large outputs with timestamped IDs for on-demand retrieval.
+    Automatically cleans up expired entries.
+    """
+
+    def __init__(self, cache_dir: str | None = None, max_age_hours: int = 1):
+        """Initialize cache system.
+
+        Args:
+            cache_dir: Cache directory path (default: ~/.ios-simulator-skill/cache/)
+            max_age_hours: Max age for cache entries before expiration (default: 1 hour)
+        """
+        if cache_dir is None:
+            cache_dir = str(Path("~/.ios-simulator-skill/cache").expanduser())
+
+        self.cache_dir = Path(cache_dir)
+        self.max_age_hours = max_age_hours
+
+        # Create cache directory if needed
+        self.cache_dir.mkdir(parents=True, exist_ok=True)
+
+    def save(self, data: dict[str, Any], cache_type: str) -> str:
+        """Save data to cache and return cache_id.
+
+        Args:
+            data: Dictionary data to cache
+            cache_type: Type of cache ('simulator-list', 'build-log', 'ui-tree', etc.)
+
+        Returns:
+            Cache ID like 'sim-20251028-143052' for use in progressive disclosure
+
+        Example:
+            cache_id = cache.save({'devices': [...]}, 'simulator-list')
+            # Returns: 'sim-20251028-143052'
+        """
+        # Generate cache_id with timestamp
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        cache_prefix = cache_type.split("-")[0]  # e.g., 'sim' from 'simulator-list'
+        cache_id = f"{cache_prefix}-{timestamp}"
+
+        # Save to file
+        cache_file = self.cache_dir / f"{cache_id}.json"
+        with open(cache_file, "w") as f:
+            json.dump(
+                {
+                    "cache_id": cache_id,
+                    "cache_type": cache_type,
+                    "created_at": datetime.now().isoformat(),
+                    "data": data,
+                },
+                f,
+                indent=2,
+            )
+
+        return cache_id
+
+    def get(self, cache_id: str) -> dict[str, Any] | None:
+        """Retrieve data from cache by cache_id.
+
+        Args:
+            cache_id: Cache ID from save() or list_entries()
+
+        Returns:
+            Cached data dictionary, or None if not found/expired
+
+        Example:
+            data = cache.get('sim-20251028-143052')
+            if data:
+                print(f"Found {len(data)} devices")
+        """
+        cache_file = self.cache_dir / f"{cache_id}.json"
+
+        if not cache_file.exists():
+            return None
+
+        # Check if expired
+        if self._is_expired(cache_file):
+            cache_file.unlink()  # Delete expired file
+            return None
+
+        try:
+            with open(cache_file) as f:
+                entry = json.load(f)
+                return entry.get("data")
+        except (OSError, json.JSONDecodeError):
+            return None
+
+    def list_entries(self, cache_type: str | None = None) -> list[dict[str, Any]]:
+        """List available cache entries with metadata.
+
+        Args:
+            cache_type: Filter by type (e.g., 'simulator-list'), or None for all
+
+        Returns:
+            List of cache entries with id, type, created_at, age_seconds
+
+        Example:
+            entries = cache.list_entries('simulator-list')
+            for entry in entries:
+                print(f"{entry['id']} - {entry['age_seconds']}s old")
+        """
+        entries = []
+
+        for cache_file in sorted(self.cache_dir.glob("*.json"), reverse=True):
+            # Check if expired
+            if self._is_expired(cache_file):
+                cache_file.unlink()
+                continue
+
+            try:
+                with open(cache_file) as f:
+                    entry = json.load(f)
+
+                    # Filter by type if specified
+                    if cache_type and entry.get("cache_type") != cache_type:
+                        continue
+
+                    created_at = datetime.fromisoformat(entry.get("created_at", ""))
+                    age_seconds = (datetime.now() - created_at).total_seconds()
+
+                    entries.append(
+                        {
+                            "id": entry.get("cache_id"),
+                            "type": entry.get("cache_type"),
+                            "created_at": entry.get("created_at"),
+                            "age_seconds": int(age_seconds),
+                        }
+                    )
+            except (OSError, json.JSONDecodeError, ValueError):
+                continue
+
+        return entries
+
+    def cleanup(self, max_age_hours: int | None = None) -> int:
+        """Remove expired cache entries.
+
+        Args:
+            max_age_hours: Age threshold (default: uses instance max_age_hours)
+
+        Returns:
+            Number of entries deleted
+
+        Example:
+            deleted = cache.cleanup()
+            print(f"Deleted {deleted} expired cache entries")
+        """
+        if max_age_hours is None:
+            max_age_hours = self.max_age_hours
+
+        deleted = 0
+
+        for cache_file in self.cache_dir.glob("*.json"):
+            if self._is_expired(cache_file, max_age_hours):
+                cache_file.unlink()
+                deleted += 1
+
+        return deleted
+
+    def clear(self, cache_type: str | None = None) -> int:
+        """Clear all cache entries of a type.
+
+        Args:
+            cache_type: Type to clear (e.g., 'simulator-list'), or None to clear all
+
+        Returns:
+            Number of entries deleted
+
+        Example:
+            cleared = cache.clear('simulator-list')
+            print(f"Cleared {cleared} simulator list entries")
+        """
+        deleted = 0
+
+        for cache_file in self.cache_dir.glob("*.json"):
+            if cache_type is None:
+                # Clear all
+                cache_file.unlink()
+                deleted += 1
+            else:
+                # Clear by type
+                try:
+                    with open(cache_file) as f:
+                        entry = json.load(f)
+                        if entry.get("cache_type") == cache_type:
+                            cache_file.unlink()
+                            deleted += 1
+                except (OSError, json.JSONDecodeError):
+                    pass
+
+        return deleted
+
+    def _is_expired(self, cache_file: Path, max_age_hours: int | None = None) -> bool:
+        """Check if cache file is expired.
+
+        Args:
+            cache_file: Path to cache file
+            max_age_hours: Age threshold (default: uses instance max_age_hours)
+
+        Returns:
+            True if file is older than max_age_hours
+        """
+        if max_age_hours is None:
+            max_age_hours = self.max_age_hours
+
+        try:
+            with open(cache_file) as f:
+                entry = json.load(f)
+                created_at = datetime.fromisoformat(entry.get("created_at", ""))
+                age = datetime.now() - created_at
+                return age > timedelta(hours=max_age_hours)
+        except (OSError, json.JSONDecodeError, ValueError):
+            return True
+
+
+# Module-level cache instances (lazy-loaded)
+_cache_instances: dict[str, ProgressiveCache] = {}
+
+
+def get_cache(cache_dir: str | None = None) -> ProgressiveCache:
+    """Get or create global cache instance.
+
+    Args:
+        cache_dir: Custom cache directory (uses default if None)
+
+    Returns:
+        ProgressiveCache instance
+    """
+    # Use cache_dir as key, or 'default' if None
+    key = cache_dir or "default"
+
+    if key not in _cache_instances:
+        _cache_instances[key] = ProgressiveCache(cache_dir)
+
+    return _cache_instances[key]

.claude/skills/ios-simulator-skill/scripts/common/device_utils.py

@@ -0,0 +1,432 @@
+#!/usr/bin/env python3
+"""
+Shared device and simulator utilities.
+
+Common patterns for interacting with simulators via xcrun simctl and IDB.
+Standardizes command building and device targeting to prevent errors.
+
+Follows Jackson's Law - only extracts genuinely reused patterns.
+
+Used by:
+- app_launcher.py (8 call sites) - App lifecycle commands
+- Multiple scripts (15+ locations) - IDB command building
+- navigator.py, gesture.py - Coordinate transformation
+- test_recorder.py, app_state_capture.py - Auto-UDID detection
+"""
+
+import json
+import re
+import subprocess
+
+
+def build_simctl_command(
+    operation: str,
+    udid: str | None = None,
+    *args,
+) -> list[str]:
+    """
+    Build xcrun simctl command with proper device handling.
+
+    Standardizes command building to prevent device targeting bugs.
+    Automatically uses "booted" if no UDID provided.
+
+    Used by:
+    - app_launcher.py: launch, terminate, install, uninstall, openurl, listapps, spawn
+    - Multiple scripts: generic simctl operations
+
+    Args:
+        operation: simctl operation (launch, terminate, install, etc.)
+        udid: Device UDID (uses 'booted' if None)
+        *args: Additional command arguments
+
+    Returns:
+        Complete command list ready for subprocess.run()
+
+    Examples:
+        # Launch app on booted simulator
+        cmd = build_simctl_command("launch", None, "com.app.bundle")
+        # Returns: ["xcrun", "simctl", "launch", "booted", "com.app.bundle"]
+
+        # Launch on specific device
+        cmd = build_simctl_command("launch", "ABC123", "com.app.bundle")
+        # Returns: ["xcrun", "simctl", "launch", "ABC123", "com.app.bundle"]
+
+        # Install app on specific device
+        cmd = build_simctl_command("install", "ABC123", "/path/to/app.app")
+        # Returns: ["xcrun", "simctl", "install", "ABC123", "/path/to/app.app"]
+    """
+    cmd = ["xcrun", "simctl", operation]
+
+    # Add device (booted or specific UDID)
+    cmd.append(udid if udid else "booted")
+
+    # Add remaining arguments
+    cmd.extend(str(arg) for arg in args)
+
+    return cmd
+
+
+def build_idb_command(
+    operation: str,
+    udid: str | None = None,
+    *args,
+) -> list[str]:
+    """
+    Build IDB command with proper device targeting.
+
+    Standardizes IDB command building across all scripts using IDB.
+    Handles device UDID consistently.
+
+    Used by:
+    - navigator.py: ui tap, ui text, ui describe-all
+    - gesture.py: ui swipe, ui tap
+    - keyboard.py: ui key, ui text, ui tap
+    - And more: 15+ locations
+
+    Args:
+        operation: IDB operation path (e.g., "ui tap", "ui text", "ui describe-all")
+        udid: Device UDID (omits --udid flag if None, IDB uses booted by default)
+        *args: Additional command arguments
+
+    Returns:
+        Complete command list ready for subprocess.run()
+
+    Examples:
+        # Tap on booted simulator
+        cmd = build_idb_command("ui tap", None, "200", "400")
+        # Returns: ["idb", "ui", "tap", "200", "400"]
+
+        # Tap on specific device
+        cmd = build_idb_command("ui tap", "ABC123", "200", "400")
+        # Returns: ["idb", "ui", "tap", "200", "400", "--udid", "ABC123"]
+
+        # Get accessibility tree
+        cmd = build_idb_command("ui describe-all", "ABC123", "--json", "--nested")
+        # Returns: ["idb", "ui", "describe-all", "--json", "--nested", "--udid", "ABC123"]
+
+        # Enter text
+        cmd = build_idb_command("ui text", None, "hello world")
+        # Returns: ["idb", "ui", "text", "hello world"]
+    """
+    # Split operation into parts (e.g., "ui tap" -> ["ui", "tap"])
+    cmd = ["idb"] + operation.split()
+
+    # Add arguments
+    cmd.extend(str(arg) for arg in args)
+
+    # Add device targeting if specified (optional for IDB, uses booted by default)
+    if udid:
+        cmd.extend(["--udid", udid])
+
+    return cmd
+
+
+def get_booted_device_udid() -> str | None:
+    """
+    Auto-detect currently booted simulator UDID.
+
+    Queries xcrun simctl for booted devices and returns first match.
+
+    Returns:
+        UDID of booted simulator, or None if no simulator is booted.
+
+    Example:
+        udid = get_booted_device_udid()
+        if udid:
+            print(f"Booted simulator: {udid}")
+        else:
+            print("No simulator is currently booted")
+    """
+    try:
+        result = subprocess.run(
+            ["xcrun", "simctl", "list", "devices", "booted"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+
+        # Parse output to find UDID
+        # Format: "  iPhone 16 Pro (ABC123-DEF456) (Booted)"
+        for line in result.stdout.split("\n"):
+            # Look for UUID pattern in parentheses
+            match = re.search(r"\(([A-F0-9\-]{36})\)", line)
+            if match:
+                return match.group(1)
+
+        return None
+    except subprocess.CalledProcessError:
+        return None
+
+
+def resolve_udid(udid_arg: str | None) -> str:
+    """
+    Resolve device UDID with auto-detection fallback.
+
+    If udid_arg is provided, returns it immediately.
+    If None, attempts to auto-detect booted simulator.
+    Raises error if neither is available.
+
+    Args:
+        udid_arg: Explicit UDID from command line, or None
+
+    Returns:
+        Valid UDID string
+
+    Raises:
+        RuntimeError: If no UDID provided and no booted simulator found
+
+    Example:
+        try:
+            udid = resolve_udid(args.udid)  # args.udid might be None
+            print(f"Using device: {udid}")
+        except RuntimeError as e:
+            print(f"Error: {e}")
+            sys.exit(1)
+    """
+    if udid_arg:
+        return udid_arg
+
+    booted_udid = get_booted_device_udid()
+    if booted_udid:
+        return booted_udid
+
+    raise RuntimeError(
+        "No device UDID provided and no simulator is currently booted.\n"
+        "Boot a simulator or provide --udid explicitly:\n"
+        "  xcrun simctl boot <device-name>\n"
+        "  python scripts/script_name.py --udid <device-udid>"
+    )
+
+
+def get_device_screen_size(udid: str) -> tuple[int, int]:
+    """
+    Get actual screen dimensions for device via accessibility tree.
+
+    Queries IDB accessibility tree to determine actual device resolution.
+    Falls back to iPhone 14 defaults (390x844) if detection fails.
+
+    Args:
+        udid: Device UDID
+
+    Returns:
+        Tuple of (width, height) in pixels
+
+    Example:
+        width, height = get_device_screen_size("ABC123")
+        print(f"Device screen: {width}x{height}")
+    """
+    try:
+        cmd = build_idb_command("ui describe-all", udid, "--json")
+        result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+        # Parse JSON response
+        data = json.loads(result.stdout)
+        tree = data[0] if isinstance(data, list) and len(data) > 0 else data
+
+        # Get frame size from root element
+        if tree and "frame" in tree:
+            frame = tree["frame"]
+            width = int(frame.get("width", 390))
+            height = int(frame.get("height", 844))
+            return (width, height)
+
+        # Fallback
+        return (390, 844)
+    except Exception:
+        # Graceful fallback to iPhone 14 Pro defaults
+        return (390, 844)
+
+
+def resolve_device_identifier(identifier: str) -> str:
+    """
+    Resolve device name or partial UDID to full UDID.
+
+    Supports multiple identifier formats:
+    - Full UDID: "ABC-123-DEF456..." (36 character UUID)
+    - Device name: "iPhone 16 Pro" (matches full name)
+    - Partial match: "iPhone 16" (matches first device containing this string)
+    - Special: "booted" (resolves to currently booted device)
+
+    Args:
+        identifier: Device UDID, name, or special value "booted"
+
+    Returns:
+        Full device UDID
+
+    Raises:
+        RuntimeError: If identifier cannot be resolved
+
+    Example:
+        udid = resolve_device_identifier("iPhone 16 Pro")
+        # Returns: "ABC123DEF456..."
+
+        udid = resolve_device_identifier("booted")
+        # Returns UDID of booted simulator
+    """
+    # Handle "booted" special case
+    if identifier.lower() == "booted":
+        booted = get_booted_device_udid()
+        if booted:
+            return booted
+        raise RuntimeError(
+            "No simulator is currently booted. "
+            "Boot a simulator first: xcrun simctl boot <device-udid>"
+        )
+
+    # Check if already a full UDID (36 character UUID format)
+    if re.match(r"^[A-F0-9\-]{36}$", identifier, re.IGNORECASE):
+        return identifier.upper()
+
+    # Try to match by device name
+    simulators = list_simulators(state=None)
+    exact_matches = [s for s in simulators if s["name"].lower() == identifier.lower()]
+    if exact_matches:
+        return exact_matches[0]["udid"]
+
+    # Try partial match
+    partial_matches = [s for s in simulators if identifier.lower() in s["name"].lower()]
+    if partial_matches:
+        return partial_matches[0]["udid"]
+
+    # No match found
+    raise RuntimeError(
+        f"Device '{identifier}' not found. "
+        f"Use 'xcrun simctl list devices' to see available simulators."
+    )
+
+
+def list_simulators(state: str | None = None) -> list[dict]:
+    """
+    List iOS simulators with optional state filtering.
+
+    Queries xcrun simctl and returns structured list of simulators.
+    Optionally filters by state (available, booted, all).
+
+    Args:
+        state: Optional filter - "available", "booted", or None for all
+
+    Returns:
+        List of simulator dicts with keys:
+        - "name": Device name (e.g., "iPhone 16 Pro")
+        - "udid": Device UDID (36 char UUID)
+        - "state": Device state ("Booted", "Shutdown", "Unavailable")
+        - "runtime": iOS version (e.g., "iOS 18.0", "unavailable")
+        - "type": Device type ("iPhone", "iPad", "Apple Watch", etc.)
+
+    Example:
+        # List all simulators
+        all_sims = list_simulators()
+        print(f"Total simulators: {len(all_sims)}")
+
+        # List only available simulators
+        available = list_simulators(state="available")
+        for sim in available:
+            print(f"{sim['name']} ({sim['state']}) - {sim['udid']}")
+
+        # List only booted simulators
+        booted = list_simulators(state="booted")
+        for sim in booted:
+            print(f"Booted: {sim['name']}")
+    """
+    try:
+        # Query simctl for device list
+        cmd = ["xcrun", "simctl", "list", "devices", "-j"]
+        result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+        data = json.loads(result.stdout)
+        simulators = []
+
+        # Parse JSON response
+        # Format: {"devices": {"iOS 18.0": [{...}, {...}], "iOS 17.0": [...], ...}}
+        for ios_version, devices in data.get("devices", {}).items():
+            for device in devices:
+                sim = {
+                    "name": device.get("name", "Unknown"),
+                    "udid": device.get("udid", ""),
+                    "state": device.get("state", "Unknown"),
+                    "runtime": ios_version,
+                    "type": _extract_device_type(device.get("name", "")),
+                }
+                simulators.append(sim)
+
+        # Apply state filtering
+        if state == "booted":
+            return [s for s in simulators if s["state"] == "Booted"]
+        if state == "available":
+            return [s for s in simulators if s["state"] == "Shutdown"]  # Available to boot
+        if state is None:
+            return simulators
+        return [s for s in simulators if s["state"].lower() == state.lower()]
+
+    except (subprocess.CalledProcessError, json.JSONDecodeError, KeyError) as e:
+        raise RuntimeError(f"Failed to list simulators: {e}") from e
+
+
+def _extract_device_type(device_name: str) -> str:
+    """
+    Extract device type from device name.
+
+    Parses device name to determine type (iPhone, iPad, Watch, etc.).
+
+    Args:
+        device_name: Full device name (e.g., "iPhone 16 Pro")
+
+    Returns:
+        Device type string
+
+    Example:
+        _extract_device_type("iPhone 16 Pro")  # Returns "iPhone"
+        _extract_device_type("iPad Air")        # Returns "iPad"
+        _extract_device_type("Apple Watch Series 9") # Returns "Watch"
+    """
+    if "iPhone" in device_name:
+        return "iPhone"
+    if "iPad" in device_name:
+        return "iPad"
+    if "Watch" in device_name or "Apple Watch" in device_name:
+        return "Watch"
+    if "TV" in device_name or "Apple TV" in device_name:
+        return "TV"
+    return "Unknown"
+
+
+def transform_screenshot_coords(
+    x: float,
+    y: float,
+    screenshot_width: int,
+    screenshot_height: int,
+    device_width: int,
+    device_height: int,
+) -> tuple[int, int]:
+    """
+    Transform screenshot coordinates to device coordinates.
+
+    Handles the case where a screenshot was downscaled (e.g., to 'half' size)
+    and needs to be transformed back to actual device pixel coordinates
+    for accurate tapping.
+
+    The transformation is linear:
+    device_x = (screenshot_x / screenshot_width) * device_width
+    device_y = (screenshot_y / screenshot_height) * device_height
+
+    Args:
+        x, y: Coordinates in the screenshot
+        screenshot_width, screenshot_height: Screenshot dimensions (e.g., 195, 422)
+        device_width, device_height: Actual device dimensions (e.g., 390, 844)
+
+    Returns:
+        Tuple of (device_x, device_y) in device pixels
+
+    Example:
+        # Screenshot taken at 'half' size: 195x422 (from 390x844 device)
+        device_x, device_y = transform_screenshot_coords(
+            100, 200,  # Tap point in screenshot
+            195, 422,  # Screenshot dimensions
+            390, 844   # Device dimensions
+        )
+        print(f"Tap at device coords: ({device_x}, {device_y})")
+        # Output: Tap at device coords: (200, 400)
+    """
+    device_x = int((x / screenshot_width) * device_width)
+    device_y = int((y / screenshot_height) * device_height)
+    return (device_x, device_y)

.claude/skills/ios-simulator-skill/scripts/common/idb_utils.py

@@ -0,0 +1,180 @@
+#!/usr/bin/env python3
+"""
+Shared IDB utility functions.
+
+This module provides common IDB operations used across multiple scripts.
+Follows Jackson's Law - only shared code that's truly reused, not speculative.
+
+Used by:
+- navigator.py - Accessibility tree navigation
+- screen_mapper.py - UI element analysis
+- accessibility_audit.py - WCAG compliance checking
+- test_recorder.py - Test documentation
+- app_state_capture.py - State snapshots
+- gesture.py - Touch gesture operations
+"""
+
+import json
+import subprocess
+import sys
+
+
+def get_accessibility_tree(udid: str | None = None, nested: bool = True) -> dict:
+    """
+    Fetch accessibility tree from IDB.
+
+    The accessibility tree represents the complete UI hierarchy of the current
+    screen, with all element properties needed for semantic navigation.
+
+    Args:
+        udid: Device UDID (uses booted simulator if None)
+        nested: Include nested structure (default True). If False, returns flat array.
+
+    Returns:
+        Root element of accessibility tree as dict.
+        Structure: {
+            "type": "Window",
+            "AXLabel": "App Name",
+            "frame": {"x": 0, "y": 0, "width": 390, "height": 844},
+            "children": [...]
+        }
+
+    Raises:
+        SystemExit: If IDB command fails or returns invalid JSON
+
+    Example:
+        tree = get_accessibility_tree("UDID123")
+        # Root is Window element with all children nested
+    """
+    cmd = ["idb", "ui", "describe-all", "--json"]
+    if nested:
+        cmd.append("--nested")
+    if udid:
+        cmd.extend(["--udid", udid])
+
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+        tree_data = json.loads(result.stdout)
+
+        # IDB returns array format, extract first element (root)
+        if isinstance(tree_data, list) and len(tree_data) > 0:
+            return tree_data[0]
+        return tree_data
+    except subprocess.CalledProcessError as e:
+        print(f"Error: Failed to get accessibility tree: {e.stderr}", file=sys.stderr)
+        sys.exit(1)
+    except json.JSONDecodeError:
+        print("Error: Invalid JSON from idb", file=sys.stderr)
+        sys.exit(1)
+
+
+def flatten_tree(node: dict, depth: int = 0, elements: list[dict] | None = None) -> list[dict]:
+    """
+    Flatten nested accessibility tree into list of elements.
+
+    Converts the hierarchical accessibility tree into a flat list where each
+    element includes its depth for context.
+
+    Used by:
+    - navigator.py - Element finding
+    - screen_mapper.py - Element analysis
+    - accessibility_audit.py - Audit scanning
+
+    Args:
+        node: Root node of tree (typically from get_accessibility_tree)
+        depth: Current depth (used internally, start at 0)
+        elements: Accumulator list (used internally, start as None)
+
+    Returns:
+        Flat list of elements, each with "depth" key indicating nesting level.
+        Structure of each element: {
+            "type": "Button",
+            "AXLabel": "Login",
+            "frame": {...},
+            "depth": 2,
+            ...
+        }
+
+    Example:
+        tree = get_accessibility_tree()
+        flat = flatten_tree(tree)
+        for elem in flat:
+            print(f"{'  ' * elem['depth']}{elem.get('type')}: {elem.get('AXLabel')}")
+    """
+    if elements is None:
+        elements = []
+
+    # Add current node with depth tracking
+    node_copy = node.copy()
+    node_copy["depth"] = depth
+    elements.append(node_copy)
+
+    # Process children recursively
+    for child in node.get("children", []):
+        flatten_tree(child, depth + 1, elements)
+
+    return elements
+
+
+def count_elements(node: dict) -> int:
+    """
+    Count total elements in tree (recursive).
+
+    Traverses entire tree counting all elements for reporting purposes.
+
+    Used by:
+    - test_recorder.py - Element counting per step
+    - screen_mapper.py - Summary statistics
+
+    Args:
+        node: Root node of tree
+
+    Returns:
+        Total element count including root and all descendants
+
+    Example:
+        tree = get_accessibility_tree()
+        total = count_elements(tree)
+        print(f"Screen has {total} elements")
+    """
+    count = 1
+    for child in node.get("children", []):
+        count += count_elements(child)
+    return count
+
+
+def get_screen_size(udid: str | None = None) -> tuple[int, int]:
+    """
+    Get screen dimensions from accessibility tree.
+
+    Extracts the screen size from the root element's frame. Useful for
+    gesture calculations and coordinate normalization.
+
+    Used by:
+    - gesture.py - Gesture positioning
+    - Potentially: screenshot positioning, screen-aware scaling
+
+    Args:
+        udid: Device UDID (uses booted if None)
+
+    Returns:
+        (width, height) tuple. Defaults to (390, 844) if detection fails
+        or tree cannot be accessed.
+
+    Example:
+        width, height = get_screen_size()
+        center_x = width // 2
+        center_y = height // 2
+    """
+    DEFAULT_WIDTH = 390  # iPhone 14
+    DEFAULT_HEIGHT = 844
+
+    try:
+        tree = get_accessibility_tree(udid, nested=False)
+        frame = tree.get("frame", {})
+        width = int(frame.get("width", DEFAULT_WIDTH))
+        height = int(frame.get("height", DEFAULT_HEIGHT))
+        return (width, height)
+    except Exception:
+        # Silently fall back to defaults if tree access fails
+        return (DEFAULT_WIDTH, DEFAULT_HEIGHT)

.claude/skills/ios-simulator-skill/scripts/common/screenshot_utils.py

@@ -0,0 +1,338 @@
+#!/usr/bin/env python3
+"""
+Screenshot utilities with dual-mode support.
+
+Provides unified screenshot handling with:
+- File-based mode: Persistent artifacts for test documentation
+- Inline base64 mode: Vision-based automation for agent analysis
+- Size presets: Token optimization (full/half/quarter/thumb)
+- Semantic naming: {appName}_{screenName}_{state}_{timestamp}.png
+
+Supports resize operations via PIL (optional dependency).
+
+Used by:
+- test_recorder.py - Step-based screenshot recording
+- app_state_capture.py - State snapshot captures
+"""
+
+import base64
+import os
+import subprocess
+import sys
+from datetime import datetime
+from pathlib import Path
+from typing import Any
+
+# Try to import PIL for resizing, but make it optional
+try:
+    from PIL import Image
+
+    HAS_PIL = True
+except ImportError:
+    HAS_PIL = False
+
+
+def generate_screenshot_name(
+    app_name: str | None = None,
+    screen_name: str | None = None,
+    state: str | None = None,
+    timestamp: str | None = None,
+    extension: str = "png",
+) -> str:
+    """Generate semantic screenshot filename.
+
+    Format: {appName}_{screenName}_{state}_{timestamp}.{ext}
+    Falls back to: screenshot_{timestamp}.{ext}
+
+    Args:
+        app_name: Application name (e.g., 'MyApp')
+        screen_name: Screen name (e.g., 'Login')
+        state: State description (e.g., 'Empty', 'Filled', 'Error')
+        timestamp: ISO timestamp (uses current time if None)
+        extension: File extension (default: 'png')
+
+    Returns:
+        Semantic filename ready for safe file creation
+
+    Example:
+        name = generate_screenshot_name('MyApp', 'Login', 'Empty')
+        # Returns: 'MyApp_Login_Empty_20251028-143052.png'
+
+        name = generate_screenshot_name()
+        # Returns: 'screenshot_20251028-143052.png'
+    """
+    if timestamp is None:
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+
+    # Build semantic name
+    if app_name or screen_name or state:
+        parts = [app_name, screen_name, state]
+        parts = [p for p in parts if p]  # Filter None/empty
+        name = "_".join(parts) + f"_{timestamp}"
+    else:
+        name = f"screenshot_{timestamp}"
+
+    return f"{name}.{extension}"
+
+
+def get_size_preset(size: str = "half") -> tuple[float, float]:
+    """Get scale factors for size preset.
+
+    Args:
+        size: 'full', 'half', 'quarter', 'thumb'
+
+    Returns:
+        Tuple of (scale_x, scale_y) for resizing
+
+    Example:
+        scale_x, scale_y = get_size_preset('half')
+        # Returns: (0.5, 0.5)
+    """
+    presets = {
+        "full": (1.0, 1.0),
+        "half": (0.5, 0.5),
+        "quarter": (0.25, 0.25),
+        "thumb": (0.1, 0.1),
+    }
+    return presets.get(size, (0.5, 0.5))
+
+
+def resize_screenshot(
+    input_path: str,
+    output_path: str | None = None,
+    size: str = "half",
+    quality: int = 85,
+) -> tuple[str, int, int]:
+    """Resize screenshot for token optimization.
+
+    Requires PIL (Pillow). Falls back gracefully without it.
+
+    Args:
+        input_path: Path to original screenshot
+        output_path: Output path (uses input_path if None)
+        size: 'full', 'half', 'quarter', 'thumb'
+        quality: JPEG quality (1-100, default: 85)
+
+    Returns:
+        Tuple of (output_path, width, height) of resized image
+
+    Raises:
+        FileNotFoundError: If input file doesn't exist
+        ValueError: If PIL not installed and size != 'full'
+
+    Example:
+        output, w, h = resize_screenshot(
+            'screenshot.png',
+            'screenshot_half.png',
+            'half'
+        )
+        print(f"Resized to {w}x{h}")
+    """
+    input_file = Path(input_path)
+    if not input_file.exists():
+        raise FileNotFoundError(f"Screenshot not found: {input_path}")
+
+    # If full size, just copy
+    if size == "full":
+        if output_path:
+            import shutil
+
+            shutil.copy(input_path, output_path)
+            output_file = Path(output_path)
+        else:
+            output_file = input_file
+
+        # Get original dimensions
+        if HAS_PIL:
+            img = Image.open(str(output_file))
+            return (str(output_file), img.width, img.height)
+        return (str(output_file), 0, 0)  # Dimensions unknown without PIL
+
+    # Need PIL to resize
+    if not HAS_PIL:
+        raise ValueError(
+            f"Size preset '{size}' requires PIL (Pillow). " "Install with: pip3 install pillow"
+        )
+
+    # Open original image
+    img = Image.open(str(input_file))
+    orig_w, orig_h = img.size
+
+    # Calculate new size
+    scale_x, scale_y = get_size_preset(size)
+    new_w = int(orig_w * scale_x)
+    new_h = int(orig_h * scale_y)
+
+    # Resize with high-quality resampling
+    resized = img.resize((new_w, new_h), Image.Resampling.LANCZOS)
+
+    # Determine output path
+    if output_path is None:
+        # Insert size marker before extension
+        stem = input_file.stem
+        suffix = input_file.suffix
+        output_path = str(input_file.parent / f"{stem}_{size}{suffix}")
+
+    # Save resized image
+    resized.save(output_path, quality=quality, optimize=True)
+
+    return (output_path, new_w, new_h)
+
+
+def capture_screenshot(
+    udid: str,
+    output_path: str | None = None,
+    size: str = "half",
+    inline: bool = False,
+    app_name: str | None = None,
+    screen_name: str | None = None,
+    state: str | None = None,
+) -> dict[str, Any]:
+    """Capture screenshot with flexible output modes.
+
+    Supports both file-based (persistent artifacts) and inline base64 modes
+    (for vision-based automation).
+
+    Args:
+        udid: Device UDID
+        output_path: File path for file mode (generates semantic name if None)
+        size: 'full', 'half', 'quarter', 'thumb' (default: 'half')
+        inline: If True, returns base64 data instead of saving to file
+        app_name: App name for semantic naming
+        screen_name: Screen name for semantic naming
+        state: State description for semantic naming
+
+    Returns:
+        Dict with mode-specific fields:
+
+        File mode:
+        {
+            'mode': 'file',
+            'file_path': str,
+            'size_bytes': int,
+            'width': int,
+            'height': int,
+            'size_preset': str
+        }
+
+        Inline mode:
+        {
+            'mode': 'inline',
+            'base64_data': str,
+            'mime_type': 'image/png',
+            'width': int,
+            'height': int,
+            'size_preset': str
+        }
+
+    Example:
+        # File mode
+        result = capture_screenshot('ABC123', app_name='MyApp')
+        print(f"Saved to: {result['file_path']}")
+
+        # Inline mode
+        result = capture_screenshot('ABC123', inline=True, size='half')
+        print(f"Screenshot: {result['width']}x{result['height']}")
+        print(f"Base64: {result['base64_data'][:50]}...")
+    """
+    try:
+        # Capture raw screenshot to temp file
+        temp_path = "/tmp/ios_simulator_screenshot.png"
+        cmd = ["xcrun", "simctl", "io", udid, "screenshot", temp_path]
+
+        subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+        if inline:
+            # Inline mode: resize and convert to base64
+            # Resize if needed
+            if size != "full" and HAS_PIL:
+                resized_path, width, height = resize_screenshot(temp_path, size=size)
+            else:
+                resized_path = temp_path
+                # Get dimensions via PIL if available
+                if HAS_PIL:
+                    img = Image.open(resized_path)
+                    width, height = img.size
+                else:
+                    width, height = 390, 844  # Fallback to common device size
+
+            # Read and encode as base64
+            with open(resized_path, "rb") as f:
+                base64_data = base64.b64encode(f.read()).decode("utf-8")
+
+            # Clean up temp files
+            Path(temp_path).unlink(missing_ok=True)
+            if resized_path != temp_path:
+                Path(resized_path).unlink(missing_ok=True)
+
+            return {
+                "mode": "inline",
+                "base64_data": base64_data,
+                "mime_type": "image/png",
+                "width": width,
+                "height": height,
+                "size_preset": size,
+            }
+
+        # File mode: save to output path with semantic naming
+        if output_path is None:
+            output_path = generate_screenshot_name(app_name, screen_name, state)
+
+        # Resize if needed
+        if size != "full" and HAS_PIL:
+            final_path, width, height = resize_screenshot(temp_path, output_path, size)
+        else:
+            # Just move temp to output
+            import shutil
+
+            shutil.move(temp_path, output_path)
+            final_path = output_path
+
+            # Get dimensions via PIL if available
+            if HAS_PIL:
+                img = Image.open(final_path)
+                width, height = img.size
+            else:
+                width, height = 390, 844  # Fallback
+
+        # Get file size
+        size_bytes = Path(final_path).stat().st_size
+
+        return {
+            "mode": "file",
+            "file_path": final_path,
+            "size_bytes": size_bytes,
+            "width": width,
+            "height": height,
+            "size_preset": size,
+        }
+
+    except subprocess.CalledProcessError as e:
+        raise RuntimeError(f"Failed to capture screenshot: {e.stderr}") from e
+    except Exception as e:
+        raise RuntimeError(f"Screenshot capture error: {e!s}") from e
+
+
+def format_screenshot_result(result: dict[str, Any]) -> str:
+    """Format screenshot result for human-readable output.
+
+    Args:
+        result: Result dictionary from capture_screenshot()
+
+    Returns:
+        Formatted string for printing
+
+    Example:
+        result = capture_screenshot('ABC123', inline=True)
+        print(format_screenshot_result(result))
+    """
+    if result["mode"] == "file":
+        return (
+            f"Screenshot: {result['file_path']}\n"
+            f"Dimensions: {result['width']}x{result['height']}\n"
+            f"Size: {result['size_bytes']} bytes"
+        )
+    return (
+        f"Screenshot (inline): {result['width']}x{result['height']}\n"
+        f"Base64 length: {len(result['base64_data'])} chars"
+    )

.claude/skills/ios-simulator-skill/scripts/gesture.py

@@ -0,0 +1,394 @@
+#!/usr/bin/env python3
+"""
+iOS Gesture Controller - Swipes and Complex Gestures
+
+Performs navigation gestures like swipes, scrolls, and pinches.
+Token-efficient output for common navigation patterns.
+
+This script handles touch gestures for iOS simulator automation. It provides
+directional swipes, multi-swipe scrolling, pull-to-refresh, and pinch gestures.
+Automatically detects screen size from the device for accurate gesture positioning.
+
+Key Features:
+- Directional swipes (up, down, left, right)
+- Multi-swipe scrolling with customizable amount
+- Pull-to-refresh gesture
+- Pinch to zoom (in/out)
+- Custom swipe between any two points
+- Drag and drop simulation
+- Auto-detects screen dimensions from device
+
+Usage Examples:
+    # Simple directional swipe
+    python scripts/gesture.py --swipe up --udid <device-id>
+
+    # Scroll down multiple times
+    python scripts/gesture.py --scroll down --scroll-amount 3 --udid <device-id>
+
+    # Pull to refresh
+    python scripts/gesture.py --refresh --udid <device-id>
+
+    # Custom swipe coordinates
+    python scripts/gesture.py --swipe-from 100,500 --swipe-to 100,100 --udid <device-id>
+
+    # Pinch to zoom
+    python scripts/gesture.py --pinch out --udid <device-id>
+
+    # Long press at coordinates
+    python scripts/gesture.py --long-press 200,300 --duration 2.0 --udid <device-id>
+
+Output Format:
+    Swiped up
+    Scrolled down (3x)
+    Performed pull to refresh
+
+Gesture Details:
+- Swipes use 70% of screen by default (configurable)
+- Scrolls are multiple small 30% swipes with delays
+- Start points are offset from edges for reliability
+- Screen size auto-detected from accessibility tree root element
+- Falls back to iPhone 14 dimensions (390x844) if detection fails
+
+Technical Details:
+- Uses `idb ui swipe x1 y1 x2 y2` for gesture execution
+- Duration parameter converts to milliseconds for IDB
+- Automatically fetches screen size on initialization
+- Parses IDB accessibility tree to get root frame dimensions
+- All coordinates calculated as fractions of screen size for device independence
+"""
+
+import argparse
+import subprocess
+import sys
+import time
+
+from common import (
+    get_device_screen_size,
+    get_screen_size,
+    resolve_udid,
+    transform_screenshot_coords,
+)
+
+
+class GestureController:
+    """Performs gestures on iOS simulator."""
+
+    # Standard screen dimensions (will be detected if possible)
+    DEFAULT_WIDTH = 390  # iPhone 14
+    DEFAULT_HEIGHT = 844
+
+    def __init__(self, udid: str | None = None):
+        """Initialize gesture controller."""
+        self.udid = udid
+        self.screen_size = self._get_screen_size()
+
+    def _get_screen_size(self) -> tuple[int, int]:
+        """Try to detect screen size from device using shared utility."""
+        return get_screen_size(self.udid)
+
+    def swipe(self, direction: str, distance_ratio: float = 0.7) -> bool:
+        """
+        Perform directional swipe.
+
+        Args:
+            direction: up, down, left, right
+            distance_ratio: How far to swipe (0.0-1.0 of screen)
+
+        Returns:
+            Success status
+        """
+        width, height = self.screen_size
+        center_x = width // 2
+        center_y = height // 2
+
+        # Calculate swipe coordinates based on direction
+        if direction == "up":
+            start = (center_x, int(height * 0.7))
+            end = (center_x, int(height * (1 - distance_ratio + 0.3)))
+        elif direction == "down":
+            start = (center_x, int(height * 0.3))
+            end = (center_x, int(height * (distance_ratio - 0.3 + 0.3)))
+        elif direction == "left":
+            start = (int(width * 0.8), center_y)
+            end = (int(width * (1 - distance_ratio + 0.2)), center_y)
+        elif direction == "right":
+            start = (int(width * 0.2), center_y)
+            end = (int(width * (distance_ratio - 0.2 + 0.2)), center_y)
+        else:
+            return False
+
+        return self.swipe_between(start, end)
+
+    def swipe_between(
+        self, start: tuple[int, int], end: tuple[int, int], duration: float = 0.3
+    ) -> bool:
+        """
+        Swipe between two points.
+
+        Args:
+            start: Starting coordinates (x, y)
+            end: Ending coordinates (x, y)
+            duration: Swipe duration in seconds
+
+        Returns:
+            Success status
+        """
+        cmd = ["idb", "ui", "swipe"]
+        cmd.extend([str(start[0]), str(start[1]), str(end[0]), str(end[1])])
+
+        # IDB doesn't support duration directly, but we can add delay
+        if duration != 0.3:
+            cmd.extend(["--duration", str(int(duration * 1000))])
+
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def scroll(self, direction: str, amount: int = 3) -> bool:
+        """
+        Perform multiple small swipes to scroll.
+
+        Args:
+            direction: up, down
+            amount: Number of small swipes
+
+        Returns:
+            Success status
+        """
+        for _ in range(amount):
+            if not self.swipe(direction, distance_ratio=0.3):
+                return False
+            time.sleep(0.2)  # Small delay between swipes
+        return True
+
+    def tap_and_hold(self, x: int, y: int, duration: float = 2.0) -> bool:
+        """
+        Long press at coordinates.
+
+        Args:
+            x, y: Coordinates
+            duration: Hold duration in seconds
+
+        Returns:
+            Success status
+        """
+        # IDB doesn't have native long press, simulate with tap
+        # In real implementation, might need to use different approach
+        cmd = ["idb", "ui", "tap", str(x), str(y)]
+
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            # Simulate hold with delay
+            time.sleep(duration)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def pinch(self, direction: str = "out", center: tuple[int, int] | None = None) -> bool:
+        """
+        Perform pinch gesture (zoom in/out).
+
+        Args:
+            direction: 'in' (zoom out) or 'out' (zoom in)
+            center: Center point for pinch
+
+        Returns:
+            Success status
+        """
+        if not center:
+            width, height = self.screen_size
+            center = (width // 2, height // 2)
+
+        # Calculate pinch points
+        offset = 100 if direction == "out" else 50
+
+        if direction == "out":
+            # Zoom in - fingers move apart
+            start1 = (center[0] - 20, center[1] - 20)
+            end1 = (center[0] - offset, center[1] - offset)
+            start2 = (center[0] + 20, center[1] + 20)
+            end2 = (center[0] + offset, center[1] + offset)
+        else:
+            # Zoom out - fingers move together
+            start1 = (center[0] - offset, center[1] - offset)
+            end1 = (center[0] - 20, center[1] - 20)
+            start2 = (center[0] + offset, center[1] + offset)
+            end2 = (center[0] + 20, center[1] + 20)
+
+        # Perform two swipes simultaneously (simulated)
+        success1 = self.swipe_between(start1, end1)
+        success2 = self.swipe_between(start2, end2)
+
+        return success1 and success2
+
+    def drag_and_drop(self, start: tuple[int, int], end: tuple[int, int]) -> bool:
+        """
+        Drag element from one position to another.
+
+        Args:
+            start: Starting coordinates
+            end: Ending coordinates
+
+        Returns:
+            Success status
+        """
+        # Use slow swipe to simulate drag
+        return self.swipe_between(start, end, duration=1.0)
+
+    def refresh(self) -> bool:
+        """Pull to refresh gesture."""
+        width, _ = self.screen_size
+        start = (width // 2, 100)
+        end = (width // 2, 400)
+        return self.swipe_between(start, end)
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Perform gestures on iOS simulator")
+
+    # Gesture options
+    parser.add_argument(
+        "--swipe", choices=["up", "down", "left", "right"], help="Perform directional swipe"
+    )
+    parser.add_argument("--swipe-from", help="Custom swipe start coordinates (x,y)")
+    parser.add_argument("--swipe-to", help="Custom swipe end coordinates (x,y)")
+    parser.add_argument(
+        "--scroll", choices=["up", "down"], help="Scroll in direction (multiple small swipes)"
+    )
+    parser.add_argument(
+        "--scroll-amount", type=int, default=3, help="Number of scroll swipes (default: 3)"
+    )
+    parser.add_argument("--long-press", help="Long press at coordinates (x,y)")
+    parser.add_argument(
+        "--duration", type=float, default=2.0, help="Duration for long press in seconds"
+    )
+    parser.add_argument(
+        "--pinch", choices=["in", "out"], help="Pinch gesture (in=zoom out, out=zoom in)"
+    )
+    parser.add_argument("--refresh", action="store_true", help="Pull to refresh gesture")
+
+    # Coordinate transformation
+    parser.add_argument(
+        "--screenshot-coords",
+        action="store_true",
+        help="Interpret swipe coordinates as from a screenshot (requires --screenshot-width/height)",
+    )
+    parser.add_argument(
+        "--screenshot-width",
+        type=int,
+        help="Screenshot width for coordinate transformation",
+    )
+    parser.add_argument(
+        "--screenshot-height",
+        type=int,
+        help="Screenshot height for coordinate transformation",
+    )
+
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    controller = GestureController(udid=udid)
+
+    # Execute requested gesture
+    if args.swipe:
+        if controller.swipe(args.swipe):
+            print(f"Swiped {args.swipe}")
+        else:
+            print(f"Failed to swipe {args.swipe}")
+            sys.exit(1)
+
+    elif args.swipe_from and args.swipe_to:
+        # Custom swipe
+        start = tuple(map(int, args.swipe_from.split(",")))
+        end = tuple(map(int, args.swipe_to.split(",")))
+
+        # Handle coordinate transformation if requested
+        if args.screenshot_coords:
+            if not args.screenshot_width or not args.screenshot_height:
+                print(
+                    "Error: --screenshot-coords requires --screenshot-width and --screenshot-height"
+                )
+                sys.exit(1)
+
+            device_w, device_h = get_device_screen_size(udid)
+            start = transform_screenshot_coords(
+                start[0],
+                start[1],
+                args.screenshot_width,
+                args.screenshot_height,
+                device_w,
+                device_h,
+            )
+            end = transform_screenshot_coords(
+                end[0],
+                end[1],
+                args.screenshot_width,
+                args.screenshot_height,
+                device_w,
+                device_h,
+            )
+            print("Transformed screenshot coords to device coords")
+
+        if controller.swipe_between(start, end):
+            print(f"Swiped from {start} to {end}")
+        else:
+            print("Failed to swipe")
+            sys.exit(1)
+
+    elif args.scroll:
+        if controller.scroll(args.scroll, args.scroll_amount):
+            print(f"Scrolled {args.scroll} ({args.scroll_amount}x)")
+        else:
+            print(f"Failed to scroll {args.scroll}")
+            sys.exit(1)
+
+    elif args.long_press:
+        coords = tuple(map(int, args.long_press.split(",")))
+        if controller.tap_and_hold(coords[0], coords[1], args.duration):
+            print(f"Long pressed at {coords} for {args.duration}s")
+        else:
+            print("Failed to long press")
+            sys.exit(1)
+
+    elif args.pinch:
+        if controller.pinch(args.pinch):
+            action = "Zoomed in" if args.pinch == "out" else "Zoomed out"
+            print(action)
+        else:
+            print(f"Failed to pinch {args.pinch}")
+            sys.exit(1)
+
+    elif args.refresh:
+        if controller.refresh():
+            print("Performed pull to refresh")
+        else:
+            print("Failed to refresh")
+            sys.exit(1)
+
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/keyboard.py

@@ -0,0 +1,391 @@
+#!/usr/bin/env python3
+"""
+iOS Keyboard Controller - Text Entry and Hardware Buttons
+
+Handles keyboard input, special keys, and hardware button simulation.
+Token-efficient text entry and navigation control.
+
+This script provides text input and hardware button control for iOS simulator
+automation. It handles both typing text strings and pressing special keys like
+return, delete, tab, etc. Also controls hardware buttons like home and lock.
+
+Key Features:
+- Type text strings into focused elements
+- Press special keys (return, delete, tab, space, arrows)
+- Hardware button simulation (home, lock, volume, screenshot)
+- Character-by-character typing with delays (for animations)
+- Multiple key press support
+- iOS HID key code mapping for reliability
+
+Usage Examples:
+    # Type text into focused field
+    python scripts/keyboard.py --type "hello@example.com" --udid <device-id>
+
+    # Press return key to submit
+    python scripts/keyboard.py --key return --udid <device-id>
+
+    # Press delete 3 times
+    python scripts/keyboard.py --key delete --key delete --key delete --udid <device-id>
+
+    # Press home button
+    python scripts/keyboard.py --button home --udid <device-id>
+
+    # Press lock button
+    python scripts/keyboard.py --button lock --udid <device-id>
+
+    # Type with delay between characters (for animations)
+    python scripts/keyboard.py --type "slow typing" --delay 0.1 --udid <device-id>
+
+Output Format:
+    Typed: "hello@example.com"
+    Pressed return
+    Pressed home button
+
+Special Keys Supported:
+- return/enter: Submit forms, new lines (HID code 40)
+- delete/backspace: Remove characters (HID code 42)
+- tab: Navigate between fields (HID code 43)
+- space: Space character (HID code 44)
+- escape: Cancel/dismiss (HID code 41)
+- up/down/left/right: Arrow keys (HID codes 82/81/80/79)
+
+Hardware Buttons Supported:
+- home: Return to home screen
+- lock/power: Lock device
+- volume-up/volume-down: Volume control
+- ringer: Toggle mute
+- screenshot: Capture screen
+
+Technical Details:
+- Uses `idb ui text` for typing text strings
+- Uses `idb ui key <code>` for special keys with iOS HID codes
+- HID codes from Apple's UIKeyboardHIDUsage specification
+- Hardware buttons use `xcrun simctl` button actions
+- Text entry works on currently focused element
+- Special keys are integers (40=Return, 42=Delete, etc.)
+"""
+
+import argparse
+import subprocess
+import sys
+import time
+
+from common import resolve_udid
+
+
+class KeyboardController:
+    """Controls keyboard and hardware buttons on iOS simulator."""
+
+    # Special key mappings to iOS HID key codes
+    # See: https://developer.apple.com/documentation/uikit/uikeyboardhidusage
+    SPECIAL_KEYS = {
+        "return": 40,
+        "enter": 40,
+        "delete": 42,
+        "backspace": 42,
+        "tab": 43,
+        "space": 44,
+        "escape": 41,
+        "up": 82,
+        "down": 81,
+        "left": 80,
+        "right": 79,
+    }
+
+    # Hardware button mappings
+    HARDWARE_BUTTONS = {
+        "home": "HOME",
+        "lock": "LOCK",
+        "volume-up": "VOLUME_UP",
+        "volume-down": "VOLUME_DOWN",
+        "ringer": "RINGER",
+        "power": "LOCK",  # Alias
+        "screenshot": "SCREENSHOT",
+    }
+
+    def __init__(self, udid: str | None = None):
+        """Initialize keyboard controller."""
+        self.udid = udid
+
+    def type_text(self, text: str, delay: float = 0.0) -> bool:
+        """
+        Type text into current focus.
+
+        Args:
+            text: Text to type
+            delay: Delay between characters (for slow typing effect)
+
+        Returns:
+            Success status
+        """
+        if delay > 0:
+            # Type character by character with delay
+            for char in text:
+                if not self._type_single(char):
+                    return False
+                time.sleep(delay)
+            return True
+        # Type all at once (efficient)
+        return self._type_single(text)
+
+    def _type_single(self, text: str) -> bool:
+        """Type text using IDB."""
+        cmd = ["idb", "ui", "text", text]
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def press_key(self, key: str, count: int = 1) -> bool:
+        """
+        Press a special key.
+
+        Args:
+            key: Key name (return, delete, tab, etc.)
+            count: Number of times to press
+
+        Returns:
+            Success status
+        """
+        # Map key name to IDB key code
+        key_code = self.SPECIAL_KEYS.get(key.lower())
+        if not key_code:
+            # Try as literal integer key code
+            try:
+                key_code = int(key)
+            except ValueError:
+                return False
+
+        cmd = ["idb", "ui", "key", str(key_code)]
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            for _ in range(count):
+                subprocess.run(cmd, capture_output=True, check=True)
+                if count > 1:
+                    time.sleep(0.1)  # Small delay for multiple presses
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def press_key_sequence(self, keys: list[str]) -> bool:
+        """
+        Press a sequence of keys.
+
+        Args:
+            keys: List of key names
+
+        Returns:
+            Success status
+        """
+        cmd_base = ["idb", "ui", "key-sequence"]
+
+        # Map keys to codes
+        mapped_keys = []
+        for key in keys:
+            mapped = self.SPECIAL_KEYS.get(key.lower())
+            if mapped is None:
+                # Try as integer
+                try:
+                    mapped = int(key)
+                except ValueError:
+                    return False
+            mapped_keys.append(str(mapped))
+
+        cmd = cmd_base + mapped_keys
+
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def press_hardware_button(self, button: str) -> bool:
+        """
+        Press hardware button.
+
+        Args:
+            button: Button name (home, lock, volume-up, etc.)
+
+        Returns:
+            Success status
+        """
+        button_code = self.HARDWARE_BUTTONS.get(button.lower())
+        if not button_code:
+            return False
+
+        cmd = ["idb", "ui", "button", button_code]
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def clear_text(self, select_all: bool = True) -> bool:
+        """
+        Clear text in current field.
+
+        Args:
+            select_all: Use Cmd+A to select all first
+
+        Returns:
+            Success status
+        """
+        if select_all:
+            # Select all then delete
+            # Note: This might need adjustment for iOS keyboard shortcuts
+            success = self.press_key_combo(["cmd", "a"])
+            if success:
+                return self.press_key("delete")
+        else:
+            # Just delete multiple times
+            return self.press_key("delete", count=50)
+        return None
+
+    def press_key_combo(self, keys: list[str]) -> bool:
+        """
+        Press key combination (like Cmd+A).
+
+        Args:
+            keys: List of keys to press together
+
+        Returns:
+            Success status
+        """
+        # IDB doesn't directly support key combos
+        # This is a workaround - may need platform-specific handling
+        if "cmd" in keys or "command" in keys:
+            # Handle common shortcuts
+            if "a" in keys:
+                # Select all - might work with key sequence
+                return self.press_key_sequence(["command", "a"])
+            if "c" in keys:
+                return self.press_key_sequence(["command", "c"])
+            if "v" in keys:
+                return self.press_key_sequence(["command", "v"])
+            if "x" in keys:
+                return self.press_key_sequence(["command", "x"])
+
+        # Try as sequence
+        return self.press_key_sequence(keys)
+
+    def dismiss_keyboard(self) -> bool:
+        """Dismiss on-screen keyboard."""
+        # Common ways to dismiss keyboard on iOS
+        # Try Done button first, then Return
+        success = self.press_key("return")
+        if not success:
+            # Try tapping outside (would need coordinate)
+            pass
+        return success
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Control keyboard and hardware buttons")
+
+    # Text input
+    parser.add_argument("--type", help="Type text into current focus")
+    parser.add_argument("--slow", action="store_true", help="Type slowly (character by character)")
+
+    # Special keys
+    parser.add_argument("--key", help="Press special key (return, delete, tab, space, etc.)")
+    parser.add_argument("--key-sequence", help="Press key sequence (comma-separated)")
+    parser.add_argument("--count", type=int, default=1, help="Number of times to press key")
+
+    # Hardware buttons
+    parser.add_argument(
+        "--button",
+        choices=["home", "lock", "volume-up", "volume-down", "ringer", "screenshot"],
+        help="Press hardware button",
+    )
+
+    # Other operations
+    parser.add_argument("--clear", action="store_true", help="Clear current text field")
+    parser.add_argument("--dismiss", action="store_true", help="Dismiss keyboard")
+
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    controller = KeyboardController(udid=udid)
+
+    # Execute requested action
+    if args.type:
+        delay = 0.1 if args.slow else 0.0
+        if controller.type_text(args.type, delay):
+            if args.slow:
+                print(f'Typed: "{args.type}" (slowly)')
+            else:
+                print(f'Typed: "{args.type}"')
+        else:
+            print("Failed to type text")
+            sys.exit(1)
+
+    elif args.key:
+        if controller.press_key(args.key, args.count):
+            if args.count > 1:
+                print(f"Pressed {args.key} ({args.count}x)")
+            else:
+                print(f"Pressed {args.key}")
+        else:
+            print(f"Failed to press {args.key}")
+            sys.exit(1)
+
+    elif args.key_sequence:
+        keys = args.key_sequence.split(",")
+        if controller.press_key_sequence(keys):
+            print(f"Pressed sequence: {' -> '.join(keys)}")
+        else:
+            print("Failed to press key sequence")
+            sys.exit(1)
+
+    elif args.button:
+        if controller.press_hardware_button(args.button):
+            print(f"Pressed {args.button} button")
+        else:
+            print(f"Failed to press {args.button}")
+            sys.exit(1)
+
+    elif args.clear:
+        if controller.clear_text():
+            print("Cleared text field")
+        else:
+            print("Failed to clear text")
+            sys.exit(1)
+
+    elif args.dismiss:
+        if controller.dismiss_keyboard():
+            print("Dismissed keyboard")
+        else:
+            print("Failed to dismiss keyboard")
+            sys.exit(1)
+
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/log_monitor.py

@@ -0,0 +1,486 @@
+#!/usr/bin/env python3
+"""
+iOS Simulator Log Monitoring and Analysis
+
+Real-time log streaming from iOS simulators with intelligent filtering, error detection,
+and token-efficient summarization. Enhanced version of app_state_capture.py's log capture.
+
+Features:
+- Real-time log streaming from booted simulators
+- Smart filtering by app bundle ID, subsystem, category, severity
+- Error/warning classification and deduplication
+- Duration-based or continuous follow mode
+- Token-efficient summaries with full logs saved to file
+- Integration with test_recorder and app_state_capture
+
+Usage Examples:
+    # Monitor app logs in real-time (follow mode)
+    python scripts/log_monitor.py --app com.myapp.MyApp --follow
+
+    # Capture logs for specific duration
+    python scripts/log_monitor.py --app com.myapp.MyApp --duration 30s
+
+    # Extract errors and warnings only from last 5 minutes
+    python scripts/log_monitor.py --severity error,warning --last 5m
+
+    # Save logs to file
+    python scripts/log_monitor.py --app com.myapp.MyApp --duration 1m --output logs/
+
+    # Verbose output with full log lines
+    python scripts/log_monitor.py --app com.myapp.MyApp --verbose
+"""
+
+import argparse
+import json
+import re
+import signal
+import subprocess
+import sys
+from datetime import datetime, timedelta
+from pathlib import Path
+
+
+class LogMonitor:
+    """Monitor and analyze iOS simulator logs with intelligent filtering."""
+
+    def __init__(
+        self,
+        app_bundle_id: str | None = None,
+        device_udid: str | None = None,
+        severity_filter: list[str] | None = None,
+    ):
+        """
+        Initialize log monitor.
+
+        Args:
+            app_bundle_id: Filter logs by app bundle ID
+            device_udid: Device UDID (uses booted if not specified)
+            severity_filter: List of severities to include (error, warning, info, debug)
+        """
+        self.app_bundle_id = app_bundle_id
+        self.device_udid = device_udid or "booted"
+        self.severity_filter = severity_filter or ["error", "warning", "info", "debug"]
+
+        # Log storage
+        self.log_lines: list[str] = []
+        self.errors: list[str] = []
+        self.warnings: list[str] = []
+        self.info_messages: list[str] = []
+
+        # Statistics
+        self.error_count = 0
+        self.warning_count = 0
+        self.info_count = 0
+        self.debug_count = 0
+        self.total_lines = 0
+
+        # Deduplication
+        self.seen_messages: set[str] = set()
+
+        # Process control
+        self.log_process: subprocess.Popen | None = None
+        self.interrupted = False
+
+    def parse_time_duration(self, duration_str: str) -> float:
+        """
+        Parse duration string to seconds.
+
+        Args:
+            duration_str: Duration like "30s", "5m", "1h"
+
+        Returns:
+            Duration in seconds
+        """
+        match = re.match(r"(\d+)([smh])", duration_str.lower())
+        if not match:
+            raise ValueError(
+                f"Invalid duration format: {duration_str}. Use format like '30s', '5m', '1h'"
+            )
+
+        value, unit = match.groups()
+        value = int(value)
+
+        if unit == "s":
+            return value
+        if unit == "m":
+            return value * 60
+        if unit == "h":
+            return value * 3600
+
+        return 0
+
+    def classify_log_line(self, line: str) -> str | None:
+        """
+        Classify log line by severity.
+
+        Args:
+            line: Log line to classify
+
+        Returns:
+            Severity level (error, warning, info, debug) or None
+        """
+        line_lower = line.lower()
+
+        # Error patterns
+        error_patterns = [
+            r"\berror\b",
+            r"\bfault\b",
+            r"\bfailed\b",
+            r"\bexception\b",
+            r"\bcrash\b",
+            r"❌",
+        ]
+
+        # Warning patterns
+        warning_patterns = [r"\bwarning\b", r"\bwarn\b", r"\bdeprecated\b", r"⚠️"]
+
+        # Info patterns
+        info_patterns = [r"\binfo\b", r"\bnotice\b", r"ℹ️"]
+
+        for pattern in error_patterns:
+            if re.search(pattern, line_lower):
+                return "error"
+
+        for pattern in warning_patterns:
+            if re.search(pattern, line_lower):
+                return "warning"
+
+        for pattern in info_patterns:
+            if re.search(pattern, line_lower):
+                return "info"
+
+        return "debug"
+
+    def deduplicate_message(self, line: str) -> bool:
+        """
+        Check if message is duplicate.
+
+        Args:
+            line: Log line
+
+        Returns:
+            True if this is a new message, False if duplicate
+        """
+        # Create signature by removing timestamps and process IDs
+        signature = re.sub(r"\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}", "", line)
+        signature = re.sub(r"\[\d+\]", "", signature)
+        signature = re.sub(r"\s+", " ", signature).strip()
+
+        if signature in self.seen_messages:
+            return False
+
+        self.seen_messages.add(signature)
+        return True
+
+    def process_log_line(self, line: str):
+        """
+        Process a single log line.
+
+        Args:
+            line: Log line to process
+        """
+        if not line.strip():
+            return
+
+        self.total_lines += 1
+        self.log_lines.append(line)
+
+        # Classify severity
+        severity = self.classify_log_line(line)
+
+        # Skip if not in filter
+        if severity not in self.severity_filter:
+            return
+
+        # Deduplicate (for errors and warnings)
+        if severity in ["error", "warning"] and not self.deduplicate_message(line):
+            return
+
+        # Store by severity
+        if severity == "error":
+            self.error_count += 1
+            self.errors.append(line)
+        elif severity == "warning":
+            self.warning_count += 1
+            self.warnings.append(line)
+        elif severity == "info":
+            self.info_count += 1
+            if len(self.info_messages) < 20:  # Keep only recent info
+                self.info_messages.append(line)
+        else:  # debug
+            self.debug_count += 1
+
+    def stream_logs(
+        self,
+        follow: bool = False,
+        duration: float | None = None,
+        last_minutes: float | None = None,
+    ) -> bool:
+        """
+        Stream logs from simulator.
+
+        Args:
+            follow: Follow mode (continuous streaming)
+            duration: Capture duration in seconds
+            last_minutes: Show logs from last N minutes
+
+        Returns:
+            True if successful
+        """
+        # Build log stream command
+        cmd = ["xcrun", "simctl", "spawn", self.device_udid, "log", "stream"]
+
+        # Add filters
+        if self.app_bundle_id:
+            # Filter by process name (extracted from bundle ID)
+            app_name = self.app_bundle_id.split(".")[-1]
+            cmd.extend(["--predicate", f'processImagePath CONTAINS "{app_name}"'])
+
+        # Add time filter for historical logs
+        if last_minutes:
+            start_time = datetime.now() - timedelta(minutes=last_minutes)
+            time_str = start_time.strftime("%Y-%m-%d %H:%M:%S")
+            cmd.extend(["--start", time_str])
+
+        # Setup signal handler for graceful interruption
+        def signal_handler(sig, frame):
+            self.interrupted = True
+            if self.log_process:
+                self.log_process.terminate()
+
+        signal.signal(signal.SIGINT, signal_handler)
+
+        try:
+            # Start log streaming process
+            self.log_process = subprocess.Popen(
+                cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                bufsize=1,  # Line buffered
+            )
+
+            # Track start time for duration
+            start_time = datetime.now()
+
+            # Process log lines
+            for line in iter(self.log_process.stdout.readline, ""):
+                if not line:
+                    break
+
+                # Process the line
+                self.process_log_line(line.rstrip())
+
+                # Print in follow mode
+                if follow:
+                    severity = self.classify_log_line(line)
+                    if severity in self.severity_filter:
+                        print(line.rstrip())
+
+                # Check duration
+                if duration and (datetime.now() - start_time).total_seconds() >= duration:
+                    break
+
+                # Check if interrupted
+                if self.interrupted:
+                    break
+
+            # Wait for process to finish
+            self.log_process.wait()
+            return True
+
+        except Exception as e:
+            print(f"Error streaming logs: {e}", file=sys.stderr)
+            return False
+
+        finally:
+            if self.log_process:
+                self.log_process.terminate()
+
+    def get_summary(self, verbose: bool = False) -> str:
+        """
+        Get log summary.
+
+        Args:
+            verbose: Include full log details
+
+        Returns:
+            Formatted summary string
+        """
+        lines = []
+
+        # Header
+        if self.app_bundle_id:
+            lines.append(f"Logs for: {self.app_bundle_id}")
+        else:
+            lines.append("Logs for: All processes")
+
+        # Statistics
+        lines.append(f"Total lines: {self.total_lines}")
+        lines.append(
+            f"Errors: {self.error_count}, Warnings: {self.warning_count}, Info: {self.info_count}"
+        )
+
+        # Top issues
+        if self.errors:
+            lines.append(f"\nTop Errors ({len(self.errors)}):")
+            for error in self.errors[:5]:  # Show first 5
+                lines.append(f"  ❌ {error[:120]}")  # Truncate long lines
+
+        if self.warnings:
+            lines.append(f"\nTop Warnings ({len(self.warnings)}):")
+            for warning in self.warnings[:5]:  # Show first 5
+                lines.append(f"  ⚠️  {warning[:120]}")
+
+        # Verbose output
+        if verbose and self.log_lines:
+            lines.append("\n=== Recent Log Lines ===")
+            for line in self.log_lines[-50:]:  # Last 50 lines
+                lines.append(line)
+
+        return "\n".join(lines)
+
+    def get_json_output(self) -> dict:
+        """Get log results as JSON."""
+        return {
+            "app_bundle_id": self.app_bundle_id,
+            "device_udid": self.device_udid,
+            "statistics": {
+                "total_lines": self.total_lines,
+                "errors": self.error_count,
+                "warnings": self.warning_count,
+                "info": self.info_count,
+                "debug": self.debug_count,
+            },
+            "errors": self.errors[:20],  # Limit to 20
+            "warnings": self.warnings[:20],
+            "sample_logs": self.log_lines[-50:],  # Last 50 lines
+        }
+
+    def save_logs(self, output_dir: str) -> str:
+        """
+        Save logs to file.
+
+        Args:
+            output_dir: Directory to save logs
+
+        Returns:
+            Path to saved log file
+        """
+        # Create output directory
+        output_path = Path(output_dir)
+        output_path.mkdir(parents=True, exist_ok=True)
+
+        # Generate filename with timestamp
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        app_name = self.app_bundle_id.split(".")[-1] if self.app_bundle_id else "simulator"
+        log_file = output_path / f"{app_name}-{timestamp}.log"
+
+        # Write all log lines
+        with open(log_file, "w") as f:
+            f.write("\n".join(self.log_lines))
+
+        # Also save JSON summary
+        json_file = output_path / f"{app_name}-{timestamp}-summary.json"
+        with open(json_file, "w") as f:
+            json.dump(self.get_json_output(), f, indent=2)
+
+        return str(log_file)
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Monitor and analyze iOS simulator logs",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Monitor app in real-time
+  python scripts/log_monitor.py --app com.myapp.MyApp --follow
+
+  # Capture logs for 30 seconds
+  python scripts/log_monitor.py --app com.myapp.MyApp --duration 30s
+
+  # Show errors/warnings from last 5 minutes
+  python scripts/log_monitor.py --severity error,warning --last 5m
+
+  # Save logs to file
+  python scripts/log_monitor.py --app com.myapp.MyApp --duration 1m --output logs/
+        """,
+    )
+
+    # Filtering options
+    parser.add_argument(
+        "--app", dest="app_bundle_id", help="App bundle ID to filter logs (e.g., com.myapp.MyApp)"
+    )
+    parser.add_argument("--device-udid", help="Device UDID (uses booted if not specified)")
+    parser.add_argument(
+        "--severity", help="Comma-separated severity levels (error,warning,info,debug)"
+    )
+
+    # Time options
+    time_group = parser.add_mutually_exclusive_group()
+    time_group.add_argument(
+        "--follow", action="store_true", help="Follow mode (continuous streaming)"
+    )
+    time_group.add_argument("--duration", help="Capture duration (e.g., 30s, 5m, 1h)")
+    time_group.add_argument(
+        "--last", dest="last_minutes", help="Show logs from last N minutes (e.g., 5m)"
+    )
+
+    # Output options
+    parser.add_argument("--output", help="Save logs to directory")
+    parser.add_argument("--verbose", action="store_true", help="Show detailed output")
+    parser.add_argument("--json", action="store_true", help="Output as JSON")
+
+    args = parser.parse_args()
+
+    # Parse severity filter
+    severity_filter = None
+    if args.severity:
+        severity_filter = [s.strip().lower() for s in args.severity.split(",")]
+
+    # Initialize monitor
+    monitor = LogMonitor(
+        app_bundle_id=args.app_bundle_id,
+        device_udid=args.device_udid,
+        severity_filter=severity_filter,
+    )
+
+    # Parse duration
+    duration = None
+    if args.duration:
+        duration = monitor.parse_time_duration(args.duration)
+
+    # Parse last minutes
+    last_minutes = None
+    if args.last_minutes:
+        last_minutes = monitor.parse_time_duration(args.last_minutes) / 60
+
+    # Stream logs
+    print("Monitoring logs...", file=sys.stderr)
+    if args.app_bundle_id:
+        print(f"App: {args.app_bundle_id}", file=sys.stderr)
+
+    success = monitor.stream_logs(follow=args.follow, duration=duration, last_minutes=last_minutes)
+
+    if not success:
+        sys.exit(1)
+
+    # Save logs if requested
+    if args.output:
+        log_file = monitor.save_logs(args.output)
+        print(f"\nLogs saved to: {log_file}", file=sys.stderr)
+
+    # Output results
+    if not args.follow:  # Don't show summary in follow mode
+        if args.json:
+            print(json.dumps(monitor.get_json_output(), indent=2))
+        else:
+            print("\n" + monitor.get_summary(verbose=args.verbose))
+
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/navigator.py

@@ -0,0 +1,453 @@
+#!/usr/bin/env python3
+"""
+iOS Simulator Navigator - Smart Element Finder and Interactor
+
+Finds and interacts with UI elements using accessibility data.
+Prioritizes structured navigation over pixel-based interaction.
+
+This script is the core automation tool for iOS simulator navigation. It finds
+UI elements by text, type, or accessibility ID and performs actions on them
+(tap, enter text). Uses semantic element finding instead of fragile pixel coordinates.
+
+Key Features:
+- Find elements by text (fuzzy or exact matching)
+- Find elements by type (Button, TextField, etc.)
+- Find elements by accessibility identifier
+- Tap elements at their center point
+- Enter text into text fields
+- List all tappable elements on screen
+- Automatic element caching for performance
+
+Usage Examples:
+    # Find and tap a button by text
+    python scripts/navigator.py --find-text "Login" --tap --udid <device-id>
+
+    # Enter text into first text field
+    python scripts/navigator.py --find-type TextField --index 0 --enter-text "username" --udid <device-id>
+
+    # Tap element by accessibility ID
+    python scripts/navigator.py --find-id "submitButton" --tap --udid <device-id>
+
+    # List all interactive elements
+    python scripts/navigator.py --list --udid <device-id>
+
+    # Tap at specific coordinates (fallback)
+    python scripts/navigator.py --tap-at 200,400 --udid <device-id>
+
+Output Format:
+    Tapped: Button "Login" at (320, 450)
+    Entered text in: TextField "Username"
+    Not found: text='Submit'
+
+Navigation Priority (best to worst):
+    1. Find by accessibility label/text (most reliable)
+    2. Find by element type + index (good for forms)
+    3. Find by accessibility ID (precise but app-specific)
+    4. Tap at coordinates (last resort, fragile)
+
+Technical Details:
+- Uses IDB's accessibility tree via `idb ui describe-all --json --nested`
+- Caches tree for multiple operations (call with force_refresh to update)
+- Finds elements by parsing tree recursively
+- Calculates tap coordinates from element frame center
+- Uses `idb ui tap` for tapping, `idb ui text` for text entry
+- Extracts data from AXLabel, AXValue, and AXUniqueId fields
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+from dataclasses import dataclass
+
+from common import (
+    flatten_tree,
+    get_accessibility_tree,
+    get_device_screen_size,
+    resolve_udid,
+    transform_screenshot_coords,
+)
+
+
+@dataclass
+class Element:
+    """Represents a UI element from accessibility tree."""
+
+    type: str
+    label: str | None
+    value: str | None
+    identifier: str | None
+    frame: dict[str, float]
+    traits: list[str]
+    enabled: bool = True
+
+    @property
+    def center(self) -> tuple[int, int]:
+        """Calculate center point for tapping."""
+        x = int(self.frame["x"] + self.frame["width"] / 2)
+        y = int(self.frame["y"] + self.frame["height"] / 2)
+        return (x, y)
+
+    @property
+    def description(self) -> str:
+        """Human-readable description."""
+        label = self.label or self.value or self.identifier or "Unnamed"
+        return f'{self.type} "{label}"'
+
+
+class Navigator:
+    """Navigates iOS apps using accessibility data."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize navigator with optional device UDID."""
+        self.udid = udid
+        self._tree_cache = None
+
+    def get_accessibility_tree(self, force_refresh: bool = False) -> dict:
+        """Get accessibility tree (cached for efficiency)."""
+        if self._tree_cache and not force_refresh:
+            return self._tree_cache
+
+        # Delegate to shared utility
+        self._tree_cache = get_accessibility_tree(self.udid, nested=True)
+        return self._tree_cache
+
+    def _flatten_tree(self, node: dict, elements: list[Element] | None = None) -> list[Element]:
+        """Flatten accessibility tree into list of elements."""
+        if elements is None:
+            elements = []
+
+        # Create element from node
+        if node.get("type"):
+            element = Element(
+                type=node.get("type", "Unknown"),
+                label=node.get("AXLabel"),
+                value=node.get("AXValue"),
+                identifier=node.get("AXUniqueId"),
+                frame=node.get("frame", {}),
+                traits=node.get("traits", []),
+                enabled=node.get("enabled", True),
+            )
+            elements.append(element)
+
+        # Process children
+        for child in node.get("children", []):
+            self._flatten_tree(child, elements)
+
+        return elements
+
+    def find_element(
+        self,
+        text: str | None = None,
+        element_type: str | None = None,
+        identifier: str | None = None,
+        index: int = 0,
+        fuzzy: bool = True,
+    ) -> Element | None:
+        """
+        Find element by various criteria.
+
+        Args:
+            text: Text to search in label/value
+            element_type: Type of element (Button, TextField, etc.)
+            identifier: Accessibility identifier
+            index: Which matching element to return (0-based)
+            fuzzy: Use fuzzy matching for text
+
+        Returns:
+            Element if found, None otherwise
+        """
+        tree = self.get_accessibility_tree()
+        elements = self._flatten_tree(tree)
+
+        matches = []
+
+        for elem in elements:
+            # Skip disabled elements
+            if not elem.enabled:
+                continue
+
+            # Check type
+            if element_type and elem.type != element_type:
+                continue
+
+            # Check identifier (exact match)
+            if identifier and elem.identifier != identifier:
+                continue
+
+            # Check text (in label or value)
+            if text:
+                elem_text = (elem.label or "") + " " + (elem.value or "")
+                if fuzzy:
+                    if text.lower() not in elem_text.lower():
+                        continue
+                elif text not in (elem.label, elem.value):
+                    continue
+
+            matches.append(elem)
+
+        if matches and index < len(matches):
+            return matches[index]
+
+        return None
+
+    def tap(self, element: Element) -> bool:
+        """Tap on an element."""
+        x, y = element.center
+        return self.tap_at(x, y)
+
+    def tap_at(self, x: int, y: int) -> bool:
+        """Tap at specific coordinates."""
+        cmd = ["idb", "ui", "tap", str(x), str(y)]
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def enter_text(self, text: str, element: Element | None = None) -> bool:
+        """
+        Enter text into element or current focus.
+
+        Args:
+            text: Text to enter
+            element: Optional element to tap first
+
+        Returns:
+            Success status
+        """
+        # Tap element if provided
+        if element:
+            if not self.tap(element):
+                return False
+            # Small delay for focus
+            import time
+
+            time.sleep(0.5)
+
+        # Enter text
+        cmd = ["idb", "ui", "text", text]
+        if self.udid:
+            cmd.extend(["--udid", self.udid])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def find_and_tap(
+        self,
+        text: str | None = None,
+        element_type: str | None = None,
+        identifier: str | None = None,
+        index: int = 0,
+    ) -> tuple[bool, str]:
+        """
+        Find element and tap it.
+
+        Returns:
+            (success, message) tuple
+        """
+        element = self.find_element(text, element_type, identifier, index)
+
+        if not element:
+            criteria = []
+            if text:
+                criteria.append(f"text='{text}'")
+            if element_type:
+                criteria.append(f"type={element_type}")
+            if identifier:
+                criteria.append(f"id={identifier}")
+            return (False, f"Not found: {', '.join(criteria)}")
+
+        if self.tap(element):
+            return (True, f"Tapped: {element.description} at {element.center}")
+        return (False, f"Failed to tap: {element.description}")
+
+    def find_and_enter_text(
+        self,
+        text_to_enter: str,
+        find_text: str | None = None,
+        element_type: str | None = "TextField",
+        identifier: str | None = None,
+        index: int = 0,
+    ) -> tuple[bool, str]:
+        """
+        Find element and enter text into it.
+
+        Returns:
+            (success, message) tuple
+        """
+        element = self.find_element(find_text, element_type, identifier, index)
+
+        if not element:
+            return (False, "TextField not found")
+
+        if self.enter_text(text_to_enter, element):
+            return (True, f"Entered text in: {element.description}")
+        return (False, "Failed to enter text")
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Navigate iOS apps using accessibility data")
+
+    # Finding options
+    parser.add_argument("--find-text", help="Find element by text (fuzzy match)")
+    parser.add_argument("--find-exact", help="Find element by exact text")
+    parser.add_argument("--find-type", help="Element type (Button, TextField, etc.)")
+    parser.add_argument("--find-id", help="Accessibility identifier")
+    parser.add_argument("--index", type=int, default=0, help="Which match to use (0-based)")
+
+    # Action options
+    parser.add_argument("--tap", action="store_true", help="Tap the found element")
+    parser.add_argument("--tap-at", help="Tap at coordinates (x,y)")
+    parser.add_argument("--enter-text", help="Enter text into element")
+
+    # Coordinate transformation
+    parser.add_argument(
+        "--screenshot-coords",
+        action="store_true",
+        help="Interpret tap coordinates as from a screenshot (requires --screenshot-width/height)",
+    )
+    parser.add_argument(
+        "--screenshot-width",
+        type=int,
+        help="Screenshot width for coordinate transformation",
+    )
+    parser.add_argument(
+        "--screenshot-height",
+        type=int,
+        help="Screenshot height for coordinate transformation",
+    )
+
+    # Other options
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+    parser.add_argument("--list", action="store_true", help="List all tappable elements")
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    navigator = Navigator(udid=udid)
+
+    # List mode
+    if args.list:
+        tree = navigator.get_accessibility_tree()
+        elements = navigator._flatten_tree(tree)
+
+        # Filter to tappable elements
+        tappable = [
+            e
+            for e in elements
+            if e.enabled and e.type in ["Button", "Link", "Cell", "TextField", "SecureTextField"]
+        ]
+
+        print(f"Tappable elements ({len(tappable)}):")
+        for elem in tappable[:10]:  # Limit output for tokens
+            print(f"  {elem.type}: \"{elem.label or elem.value or 'Unnamed'}\" {elem.center}")
+
+        if len(tappable) > 10:
+            print(f"  ... and {len(tappable) - 10} more")
+        sys.exit(0)
+
+    # Direct tap at coordinates
+    if args.tap_at:
+        coords = args.tap_at.split(",")
+        if len(coords) != 2:
+            print("Error: --tap-at requires x,y format")
+            sys.exit(1)
+
+        x, y = int(coords[0]), int(coords[1])
+
+        # Handle coordinate transformation if requested
+        if args.screenshot_coords:
+            if not args.screenshot_width or not args.screenshot_height:
+                print(
+                    "Error: --screenshot-coords requires --screenshot-width and --screenshot-height"
+                )
+                sys.exit(1)
+
+            device_w, device_h = get_device_screen_size(udid)
+            x, y = transform_screenshot_coords(
+                x,
+                y,
+                args.screenshot_width,
+                args.screenshot_height,
+                device_w,
+                device_h,
+            )
+            print(
+                f"Transformed screenshot coords ({coords[0]}, {coords[1]}) "
+                f"to device coords ({x}, {y})"
+            )
+
+        if navigator.tap_at(x, y):
+            print(f"Tapped at ({x}, {y})")
+        else:
+            print(f"Failed to tap at ({x}, {y})")
+            sys.exit(1)
+
+    # Find and tap
+    elif args.tap:
+        text = args.find_text or args.find_exact
+        fuzzy = args.find_text is not None
+
+        success, message = navigator.find_and_tap(
+            text=text, element_type=args.find_type, identifier=args.find_id, index=args.index
+        )
+
+        print(message)
+        if not success:
+            sys.exit(1)
+
+    # Find and enter text
+    elif args.enter_text:
+        text = args.find_text or args.find_exact
+
+        success, message = navigator.find_and_enter_text(
+            text_to_enter=args.enter_text,
+            find_text=text,
+            element_type=args.find_type or "TextField",
+            identifier=args.find_id,
+            index=args.index,
+        )
+
+        print(message)
+        if not success:
+            sys.exit(1)
+
+    # Just find (no action)
+    else:
+        text = args.find_text or args.find_exact
+        fuzzy = args.find_text is not None
+
+        element = navigator.find_element(
+            text=text,
+            element_type=args.find_type,
+            identifier=args.find_id,
+            index=args.index,
+            fuzzy=fuzzy,
+        )
+
+        if element:
+            print(f"Found: {element.description} at {element.center}")
+        else:
+            print("Element not found")
+            sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/privacy_manager.py

@@ -0,0 +1,310 @@
+#!/usr/bin/env python3
+"""
+iOS Privacy & Permissions Manager
+
+Grant/revoke app permissions for testing permission flows.
+Supports 13+ services with audit trail tracking.
+
+Usage: python scripts/privacy_manager.py --grant camera --bundle-id com.app
+"""
+
+import argparse
+import subprocess
+import sys
+from datetime import datetime
+
+from common import resolve_udid
+
+
+class PrivacyManager:
+    """Manages iOS app privacy and permissions."""
+
+    # Supported services
+    SUPPORTED_SERVICES = {
+        "camera": "Camera access",
+        "microphone": "Microphone access",
+        "location": "Location services",
+        "contacts": "Contacts access",
+        "photos": "Photos library access",
+        "calendar": "Calendar access",
+        "health": "Health data access",
+        "reminders": "Reminders access",
+        "motion": "Motion & fitness",
+        "keyboard": "Keyboard access",
+        "mediaLibrary": "Media library",
+        "calls": "Call history",
+        "siri": "Siri access",
+    }
+
+    def __init__(self, udid: str | None = None):
+        """Initialize privacy manager.
+
+        Args:
+            udid: Optional device UDID (auto-detects booted simulator if None)
+        """
+        self.udid = udid
+
+    def grant_permission(
+        self,
+        bundle_id: str,
+        service: str,
+        scenario: str | None = None,
+        step: int | None = None,
+    ) -> bool:
+        """
+        Grant permission for app.
+
+        Args:
+            bundle_id: App bundle ID
+            service: Service name (camera, microphone, location, etc.)
+            scenario: Test scenario name for audit trail
+            step: Step number in test scenario
+
+        Returns:
+            Success status
+        """
+        if service not in self.SUPPORTED_SERVICES:
+            print(f"Error: Unknown service '{service}'")
+            print(f"Supported: {', '.join(self.SUPPORTED_SERVICES.keys())}")
+            return False
+
+        cmd = ["xcrun", "simctl", "privacy"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(["grant", service, bundle_id])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+
+            # Log audit entry
+            self._log_audit("grant", bundle_id, service, scenario, step)
+
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def revoke_permission(
+        self,
+        bundle_id: str,
+        service: str,
+        scenario: str | None = None,
+        step: int | None = None,
+    ) -> bool:
+        """
+        Revoke permission for app.
+
+        Args:
+            bundle_id: App bundle ID
+            service: Service name
+            scenario: Test scenario name for audit trail
+            step: Step number in test scenario
+
+        Returns:
+            Success status
+        """
+        if service not in self.SUPPORTED_SERVICES:
+            print(f"Error: Unknown service '{service}'")
+            return False
+
+        cmd = ["xcrun", "simctl", "privacy"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(["revoke", service, bundle_id])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+
+            # Log audit entry
+            self._log_audit("revoke", bundle_id, service, scenario, step)
+
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def reset_permission(
+        self,
+        bundle_id: str,
+        service: str,
+        scenario: str | None = None,
+        step: int | None = None,
+    ) -> bool:
+        """
+        Reset permission to default.
+
+        Args:
+            bundle_id: App bundle ID
+            service: Service name
+            scenario: Test scenario name for audit trail
+            step: Step number in test scenario
+
+        Returns:
+            Success status
+        """
+        if service not in self.SUPPORTED_SERVICES:
+            print(f"Error: Unknown service '{service}'")
+            return False
+
+        cmd = ["xcrun", "simctl", "privacy"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(["reset", service, bundle_id])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+
+            # Log audit entry
+            self._log_audit("reset", bundle_id, service, scenario, step)
+
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    @staticmethod
+    def _log_audit(
+        action: str,
+        bundle_id: str,
+        service: str,
+        scenario: str | None = None,
+        step: int | None = None,
+    ) -> None:
+        """Log permission change to audit trail (for test tracking).
+
+        Args:
+            action: grant, revoke, or reset
+            bundle_id: App bundle ID
+            service: Service name
+            scenario: Test scenario name
+            step: Step number
+        """
+        # Could write to file, but for now just log to stdout for transparency
+        timestamp = datetime.now().isoformat()
+        location = f" (step {step})" if step else ""
+        scenario_info = f" in {scenario}" if scenario else ""
+        print(
+            f"[Audit] {timestamp}: {action.upper()} {service} for {bundle_id}{scenario_info}{location}"
+        )
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Manage iOS app privacy and permissions")
+
+    # Required
+    parser.add_argument("--bundle-id", required=True, help="App bundle ID (e.g., com.example.app)")
+
+    # Action (mutually exclusive)
+    action_group = parser.add_mutually_exclusive_group(required=True)
+    action_group.add_argument(
+        "--grant",
+        help="Grant permission (service name or comma-separated list)",
+    )
+    action_group.add_argument(
+        "--revoke", help="Revoke permission (service name or comma-separated list)"
+    )
+    action_group.add_argument(
+        "--reset",
+        help="Reset permission to default (service name or comma-separated list)",
+    )
+    action_group.add_argument(
+        "--list",
+        action="store_true",
+        help="List all supported services",
+    )
+
+    # Test tracking
+    parser.add_argument(
+        "--scenario",
+        help="Test scenario name for audit trail",
+    )
+    parser.add_argument("--step", type=int, help="Step number in test scenario")
+
+    # Device
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # List supported services
+    if args.list:
+        print("Supported Privacy Services:\n")
+        for service, description in PrivacyManager.SUPPORTED_SERVICES.items():
+            print(f"  {service:<15} - {description}")
+        print()
+        print("Examples:")
+        print("  python scripts/privacy_manager.py --grant camera --bundle-id com.app")
+        print("  python scripts/privacy_manager.py --revoke location --bundle-id com.app")
+        print("  python scripts/privacy_manager.py --grant camera,photos --bundle-id com.app")
+        sys.exit(0)
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    manager = PrivacyManager(udid=udid)
+
+    # Parse service names (support comma-separated list)
+    if args.grant:
+        services = [s.strip() for s in args.grant.split(",")]
+        action = "grant"
+        action_fn = manager.grant_permission
+    elif args.revoke:
+        services = [s.strip() for s in args.revoke.split(",")]
+        action = "revoke"
+        action_fn = manager.revoke_permission
+    else:  # reset
+        services = [s.strip() for s in args.reset.split(",")]
+        action = "reset"
+        action_fn = manager.reset_permission
+
+    # Execute action for each service
+    all_success = True
+    for service in services:
+        if service not in PrivacyManager.SUPPORTED_SERVICES:
+            print(f"Error: Unknown service '{service}'")
+            all_success = False
+            continue
+
+        success = action_fn(
+            args.bundle_id,
+            service,
+            scenario=args.scenario,
+            step=args.step,
+        )
+
+        if success:
+            description = PrivacyManager.SUPPORTED_SERVICES[service]
+            print(f"✓ {action.capitalize()} {service}: {description}")
+        else:
+            print(f"✗ Failed to {action} {service}")
+            all_success = False
+
+    if not all_success:
+        sys.exit(1)
+
+    # Summary
+    if len(services) > 1:
+        print(f"\nPermissions {action}ed: {', '.join(services)}")
+
+    if args.scenario:
+        print(f"Test scenario: {args.scenario}" + (f" (step {args.step})" if args.step else ""))
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/push_notification.py

@@ -0,0 +1,240 @@
+#!/usr/bin/env python3
+"""
+iOS Push Notification Simulator
+
+Send simulated push notifications to test notification handling.
+Supports custom payloads and test tracking.
+
+Usage: python scripts/push_notification.py --bundle-id com.app --title "Alert" --body "Message"
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+from common import resolve_udid
+
+
+class PushNotificationSender:
+    """Sends simulated push notifications to iOS simulator."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize push notification sender.
+
+        Args:
+            udid: Optional device UDID (auto-detects booted simulator if None)
+        """
+        self.udid = udid
+
+    def send(
+        self,
+        bundle_id: str,
+        payload: dict | str,
+        _test_name: str | None = None,
+        _expected_behavior: str | None = None,
+    ) -> bool:
+        """
+        Send push notification to app.
+
+        Args:
+            bundle_id: Target app bundle ID
+            payload: Push payload (dict or JSON string) or path to JSON file
+            test_name: Test scenario name for tracking
+            expected_behavior: Expected behavior after notification arrives
+
+        Returns:
+            Success status
+        """
+        # Handle different payload formats
+        if isinstance(payload, str):
+            # Check if it's a file path
+            payload_path = Path(payload)
+            if payload_path.exists():
+                with open(payload_path) as f:
+                    payload_data = json.load(f)
+            else:
+                # Try to parse as JSON string
+                try:
+                    payload_data = json.loads(payload)
+                except json.JSONDecodeError:
+                    print(f"Error: Invalid JSON payload: {payload}")
+                    return False
+        else:
+            payload_data = payload
+
+        # Ensure payload has aps dictionary
+        if "aps" not in payload_data:
+            payload_data = {"aps": payload_data}
+
+        # Create temp file with payload
+        try:
+            with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
+                json.dump(payload_data, f)
+                temp_payload_path = f.name
+
+            # Build simctl command
+            cmd = ["xcrun", "simctl", "push"]
+
+            if self.udid:
+                cmd.append(self.udid)
+            else:
+                cmd.append("booted")
+
+            cmd.extend([bundle_id, temp_payload_path])
+
+            # Send notification
+            subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            # Clean up temp file
+            Path(temp_payload_path).unlink()
+
+            return True
+
+        except subprocess.CalledProcessError as e:
+            print(f"Error sending push notification: {e.stderr}")
+            return False
+        except Exception as e:
+            print(f"Error: {e}")
+            return False
+
+    def send_simple(
+        self,
+        bundle_id: str,
+        title: str | None = None,
+        body: str | None = None,
+        badge: int | None = None,
+        sound: bool = True,
+    ) -> bool:
+        """
+        Send simple push notification with common parameters.
+
+        Args:
+            bundle_id: Target app bundle ID
+            title: Alert title
+            body: Alert body
+            badge: Badge number
+            sound: Whether to play sound
+
+        Returns:
+            Success status
+        """
+        payload = {}
+
+        if title or body:
+            alert = {}
+            if title:
+                alert["title"] = title
+            if body:
+                alert["body"] = body
+            payload["alert"] = alert
+
+        if badge is not None:
+            payload["badge"] = badge
+
+        if sound:
+            payload["sound"] = "default"
+
+        # Wrap in aps
+        full_payload = {"aps": payload}
+
+        return self.send(bundle_id, full_payload)
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Send simulated push notification to iOS app")
+
+    # Required
+    parser.add_argument(
+        "--bundle-id", required=True, help="Target app bundle ID (e.g., com.example.app)"
+    )
+
+    # Simple payload options
+    parser.add_argument("--title", help="Alert title (for simple notifications)")
+    parser.add_argument("--body", help="Alert body message")
+    parser.add_argument("--badge", type=int, help="Badge number")
+    parser.add_argument("--no-sound", action="store_true", help="Don't play notification sound")
+
+    # Custom payload
+    parser.add_argument(
+        "--payload",
+        help="Custom JSON payload file or inline JSON string",
+    )
+
+    # Test tracking
+    parser.add_argument("--test-name", help="Test scenario name for tracking")
+    parser.add_argument(
+        "--expected",
+        help="Expected behavior after notification",
+    )
+
+    # Device
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    sender = PushNotificationSender(udid=udid)
+
+    # Send notification
+    if args.payload:
+        # Custom payload mode
+        success = sender.send(args.bundle_id, args.payload)
+    else:
+        # Simple notification mode
+        success = sender.send_simple(
+            args.bundle_id,
+            title=args.title,
+            body=args.body,
+            badge=args.badge,
+            sound=not args.no_sound,
+        )
+
+    if success:
+        # Token-efficient output
+        output = "Push notification sent"
+
+        if args.test_name:
+            output += f" (test: {args.test_name})"
+
+        print(output)
+
+        if args.expected:
+            print(f"Expected: {args.expected}")
+
+        print()
+        print("Notification details:")
+        if args.title:
+            print(f"  Title: {args.title}")
+        if args.body:
+            print(f"  Body: {args.body}")
+        if args.badge:
+            print(f"  Badge: {args.badge}")
+
+        print()
+        print("Verify notification handling:")
+        print("1. Check app log output: python scripts/log_monitor.py --app " + args.bundle_id)
+        print(
+            "2. Capture state: python scripts/app_state_capture.py --app-bundle-id "
+            + args.bundle_id
+        )
+
+    else:
+        print("Failed to send push notification")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/screen_mapper.py

@@ -0,0 +1,292 @@
+#!/usr/bin/env python3
+"""
+iOS Screen Mapper - Current Screen Analyzer
+
+Maps the current screen's UI elements for navigation decisions.
+Provides token-efficient summaries of available interactions.
+
+This script analyzes the iOS simulator screen using IDB's accessibility tree
+and provides a compact, actionable summary of what's currently visible and
+interactive on the screen. Perfect for AI agents making navigation decisions.
+
+Key Features:
+- Token-efficient output (5-7 lines by default)
+- Identifies buttons, text fields, navigation elements
+- Counts interactive and focusable elements
+- Progressive detail with --verbose flag
+- Navigation hints with --hints flag
+
+Usage Examples:
+    # Quick summary (default)
+    python scripts/screen_mapper.py --udid <device-id>
+
+    # Detailed element breakdown
+    python scripts/screen_mapper.py --udid <device-id> --verbose
+
+    # Include navigation suggestions
+    python scripts/screen_mapper.py --udid <device-id> --hints
+
+    # Full JSON output for parsing
+    python scripts/screen_mapper.py --udid <device-id> --json
+
+Output Format (default):
+    Screen: LoginViewController (45 elements, 7 interactive)
+    Buttons: "Login", "Cancel", "Forgot Password"
+    TextFields: 2 (0 filled)
+    Navigation: NavBar: "Sign In"
+    Focusable: 7 elements
+
+Technical Details:
+- Uses IDB's accessibility tree via `idb ui describe-all --json --nested`
+- Parses IDB's array format: [{ root element with children }]
+- Identifies element types: Button, TextField, NavigationBar, TabBar, etc.
+- Extracts labels from AXLabel, AXValue, and AXUniqueId fields
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+from collections import defaultdict
+
+from common import get_accessibility_tree, resolve_udid
+
+
+class ScreenMapper:
+    """
+    Analyzes current screen for navigation decisions.
+
+    This class fetches the iOS accessibility tree from IDB and analyzes it
+    to provide actionable summaries for navigation. It categorizes elements
+    by type, counts interactive elements, and identifies key UI patterns.
+
+    Attributes:
+        udid (Optional[str]): Device UDID to target, or None for booted device
+        INTERACTIVE_TYPES (Set[str]): Element types that users can interact with
+
+    Design Philosophy:
+        - Token efficiency: Provide minimal but complete information
+        - Progressive disclosure: Summary by default, details on request
+        - Navigation-focused: Highlight elements relevant for automation
+    """
+
+    # Element types we care about for navigation
+    # These are the accessibility element types that indicate user interaction points
+    INTERACTIVE_TYPES = {
+        "Button",
+        "Link",
+        "TextField",
+        "SecureTextField",
+        "Cell",
+        "Switch",
+        "Slider",
+        "Stepper",
+        "SegmentedControl",
+        "TabBar",
+        "NavigationBar",
+        "Toolbar",
+    }
+
+    def __init__(self, udid: str | None = None):
+        """
+        Initialize screen mapper.
+
+        Args:
+            udid: Optional device UDID. If None, uses booted simulator.
+
+        Example:
+            mapper = ScreenMapper(udid="656DC652-1C9F-4AB2-AD4F-F38E65976BDA")
+            mapper = ScreenMapper()  # Uses booted device
+        """
+        self.udid = udid
+
+    def get_accessibility_tree(self) -> dict:
+        """
+        Fetch accessibility tree from iOS simulator via IDB.
+
+        Delegates to shared utility for consistent tree fetching across all scripts.
+        """
+        return get_accessibility_tree(self.udid, nested=True)
+
+    def analyze_tree(self, node: dict, depth: int = 0) -> dict:
+        """Analyze accessibility tree for navigation info."""
+        analysis = {
+            "elements_by_type": defaultdict(list),
+            "total_elements": 0,
+            "interactive_elements": 0,
+            "text_fields": [],
+            "buttons": [],
+            "navigation": {},
+            "screen_name": None,
+            "focusable": 0,
+        }
+
+        self._analyze_recursive(node, analysis, depth)
+
+        # Post-process for clean output
+        analysis["elements_by_type"] = dict(analysis["elements_by_type"])
+
+        return analysis
+
+    def _analyze_recursive(self, node: dict, analysis: dict, depth: int):
+        """Recursively analyze tree nodes."""
+        elem_type = node.get("type")
+        label = node.get("AXLabel", "")
+        value = node.get("AXValue", "")
+        identifier = node.get("AXUniqueId", "")
+
+        # Count element
+        if elem_type:
+            analysis["total_elements"] += 1
+
+            # Track by type
+            if elem_type in self.INTERACTIVE_TYPES:
+                analysis["interactive_elements"] += 1
+
+                # Store concise info (label only, not full node)
+                elem_info = label or value or identifier or "Unnamed"
+                analysis["elements_by_type"][elem_type].append(elem_info)
+
+                # Special handling for common types
+                if elem_type == "Button":
+                    analysis["buttons"].append(elem_info)
+                elif elem_type in ("TextField", "SecureTextField"):
+                    analysis["text_fields"].append(
+                        {"type": elem_type, "label": elem_info, "has_value": bool(value)}
+                    )
+                elif elem_type == "NavigationBar":
+                    analysis["navigation"]["nav_title"] = label or "Navigation"
+                elif elem_type == "TabBar":
+                    # Count tab items
+                    tab_count = len(node.get("children", []))
+                    analysis["navigation"]["tab_count"] = tab_count
+
+            # Track focusable elements
+            if node.get("enabled", False) and elem_type in self.INTERACTIVE_TYPES:
+                analysis["focusable"] += 1
+
+        # Try to identify screen name from view controller
+        if not analysis["screen_name"] and identifier:
+            if "ViewController" in identifier or "Screen" in identifier:
+                analysis["screen_name"] = identifier
+
+        # Process children
+        for child in node.get("children", []):
+            self._analyze_recursive(child, analysis, depth + 1)
+
+    def format_summary(self, analysis: dict, verbose: bool = False) -> str:
+        """Format analysis as token-efficient summary."""
+        lines = []
+
+        # Screen identification (1 line)
+        screen = analysis["screen_name"] or "Unknown Screen"
+        total = analysis["total_elements"]
+        interactive = analysis["interactive_elements"]
+        lines.append(f"Screen: {screen} ({total} elements, {interactive} interactive)")
+
+        # Buttons summary (1 line)
+        if analysis["buttons"]:
+            button_list = ", ".join(f'"{b}"' for b in analysis["buttons"][:5])
+            if len(analysis["buttons"]) > 5:
+                button_list += f" +{len(analysis['buttons']) - 5} more"
+            lines.append(f"Buttons: {button_list}")
+
+        # Text fields summary (1 line)
+        if analysis["text_fields"]:
+            field_count = len(analysis["text_fields"])
+            [f["type"] for f in analysis["text_fields"]]
+            filled = sum(1 for f in analysis["text_fields"] if f["has_value"])
+            lines.append(f"TextFields: {field_count} ({filled} filled)")
+
+        # Navigation summary (1 line)
+        nav_parts = []
+        if "nav_title" in analysis["navigation"]:
+            nav_parts.append(f"NavBar: \"{analysis['navigation']['nav_title']}\"")
+        if "tab_count" in analysis["navigation"]:
+            nav_parts.append(f"TabBar: {analysis['navigation']['tab_count']} tabs")
+        if nav_parts:
+            lines.append(f"Navigation: {', '.join(nav_parts)}")
+
+        # Focusable count (1 line)
+        lines.append(f"Focusable: {analysis['focusable']} elements")
+
+        # Verbose mode adds element type breakdown
+        if verbose:
+            lines.append("\nElements by type:")
+            for elem_type, items in analysis["elements_by_type"].items():
+                if items:  # Only show types that exist
+                    lines.append(f"  {elem_type}: {len(items)}")
+                    for item in items[:3]:  # Show first 3
+                        lines.append(f"    - {item}")
+                    if len(items) > 3:
+                        lines.append(f"    ... +{len(items) - 3} more")
+
+        return "\n".join(lines)
+
+    def get_navigation_hints(self, analysis: dict) -> list[str]:
+        """Generate navigation hints based on screen analysis."""
+        hints = []
+
+        # Check for common patterns
+        if "Login" in str(analysis.get("buttons", [])):
+            hints.append("Login screen detected - find TextFields for credentials")
+
+        if analysis["text_fields"]:
+            unfilled = [f for f in analysis["text_fields"] if not f["has_value"]]
+            if unfilled:
+                hints.append(f"{len(unfilled)} empty text field(s) - may need input")
+
+        if not analysis["buttons"] and not analysis["text_fields"]:
+            hints.append("No interactive elements - try swiping or going back")
+
+        if "tab_count" in analysis.get("navigation", {}):
+            hints.append(f"Tab bar available with {analysis['navigation']['tab_count']} tabs")
+
+        return hints
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Map current screen UI elements")
+    parser.add_argument("--verbose", action="store_true", help="Show detailed element breakdown")
+    parser.add_argument("--json", action="store_true", help="Output raw JSON analysis")
+    parser.add_argument("--hints", action="store_true", help="Include navigation hints")
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    # Create mapper and analyze
+    mapper = ScreenMapper(udid=udid)
+    tree = mapper.get_accessibility_tree()
+    analysis = mapper.analyze_tree(tree)
+
+    # Output based on format
+    if args.json:
+        # Full JSON (verbose)
+        print(json.dumps(analysis, indent=2, default=str))
+    else:
+        # Token-efficient summary (default)
+        summary = mapper.format_summary(analysis, verbose=args.verbose)
+        print(summary)
+
+        # Add hints if requested
+        if args.hints:
+            hints = mapper.get_navigation_hints(analysis)
+            if hints:
+                print("\nHints:")
+                for hint in hints:
+                    print(f"  - {hint}")
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/sim_health_check.sh

@@ -0,0 +1,239 @@
+#!/usr/bin/env bash
+#
+# iOS Simulator Testing Environment Health Check
+#
+# Verifies that all required tools and dependencies are properly installed
+# and configured for iOS simulator testing.
+#
+# Usage: bash scripts/sim_health_check.sh [--help]
+
+set -e
+
+# Color codes for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Check flags
+SHOW_HELP=false
+
+# Parse arguments
+for arg in "$@"; do
+    case $arg in
+        --help|-h)
+            SHOW_HELP=true
+            shift
+            ;;
+    esac
+done
+
+if [ "$SHOW_HELP" = true ]; then
+    cat <<EOF
+iOS Simulator Testing - Environment Health Check
+
+Verifies that your environment is properly configured for iOS simulator testing.
+
+Usage: bash scripts/sim_health_check.sh [options]
+
+Options:
+  --help, -h    Show this help message
+
+This script checks for:
+  - Xcode Command Line Tools installation
+  - iOS Simulator availability
+  - IDB (iOS Development Bridge) installation
+  - Available simulator devices
+  - Python 3 installation (for scripts)
+
+Exit codes:
+  0 - All checks passed
+  1 - One or more checks failed (see output for details)
+EOF
+    exit 0
+fi
+
+echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo -e "${BLUE}  iOS Simulator Testing - Environment Health Check${NC}"
+echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo ""
+
+CHECKS_PASSED=0
+CHECKS_FAILED=0
+
+# Function to print check status
+check_passed() {
+    echo -e "${GREEN}✓${NC} $1"
+    ((CHECKS_PASSED++))
+}
+
+check_failed() {
+    echo -e "${RED}✗${NC} $1"
+    ((CHECKS_FAILED++))
+}
+
+check_warning() {
+    echo -e "${YELLOW}⚠${NC} $1"
+}
+
+# Check 1: macOS
+echo -e "${BLUE}[1/8]${NC} Checking operating system..."
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    OS_VERSION=$(sw_vers -productVersion)
+    check_passed "macOS detected (version $OS_VERSION)"
+else
+    check_failed "Not running on macOS (detected: $OSTYPE)"
+    echo "       iOS Simulator testing requires macOS"
+fi
+echo ""
+
+# Check 2: Xcode Command Line Tools
+echo -e "${BLUE}[2/8]${NC} Checking Xcode Command Line Tools..."
+if command -v xcrun &> /dev/null; then
+    XCODE_PATH=$(xcode-select -p 2>/dev/null || echo "not found")
+    if [ "$XCODE_PATH" != "not found" ]; then
+        XCODE_VERSION=$(xcodebuild -version 2>/dev/null | head -n 1 || echo "Unknown")
+        check_passed "Xcode Command Line Tools installed"
+        echo "       Path: $XCODE_PATH"
+        echo "       Version: $XCODE_VERSION"
+    else
+        check_failed "Xcode Command Line Tools path not set"
+        echo "       Run: xcode-select --install"
+    fi
+else
+    check_failed "xcrun command not found"
+    echo "       Install Xcode Command Line Tools: xcode-select --install"
+fi
+echo ""
+
+# Check 3: simctl availability
+echo -e "${BLUE}[3/8]${NC} Checking simctl (Simulator Control)..."
+if command -v xcrun &> /dev/null && xcrun simctl help &> /dev/null; then
+    check_passed "simctl is available"
+else
+    check_failed "simctl not available"
+    echo "       simctl comes with Xcode Command Line Tools"
+fi
+echo ""
+
+# Check 4: IDB installation
+echo -e "${BLUE}[4/8]${NC} Checking IDB (iOS Development Bridge)..."
+if command -v idb &> /dev/null; then
+    IDB_PATH=$(which idb)
+    IDB_VERSION=$(idb --version 2>/dev/null || echo "Unknown")
+    check_passed "IDB is installed"
+    echo "       Path: $IDB_PATH"
+    echo "       Version: $IDB_VERSION"
+else
+    check_warning "IDB not found in PATH"
+    echo "       IDB is optional but provides advanced UI automation"
+    echo "       Install: https://fbidb.io/docs/installation"
+    echo "       Recommended: brew tap facebook/fb && brew install idb-companion"
+fi
+echo ""
+
+# Check 5: Python 3 installation
+echo -e "${BLUE}[5/8]${NC} Checking Python 3..."
+if command -v python3 &> /dev/null; then
+    PYTHON_VERSION=$(python3 --version | cut -d' ' -f2)
+    check_passed "Python 3 is installed (version $PYTHON_VERSION)"
+else
+    check_failed "Python 3 not found"
+    echo "       Python 3 is required for testing scripts"
+    echo "       Install: brew install python3"
+fi
+echo ""
+
+# Check 6: Available simulators
+echo -e "${BLUE}[6/8]${NC} Checking available iOS Simulators..."
+if command -v xcrun &> /dev/null; then
+    SIMULATOR_COUNT=$(xcrun simctl list devices available 2>/dev/null | grep -c "iPhone\|iPad" || echo "0")
+
+    if [ "$SIMULATOR_COUNT" -gt 0 ]; then
+        check_passed "Found $SIMULATOR_COUNT available simulator(s)"
+
+        # Show first 5 simulators
+        echo ""
+        echo "       Available simulators (showing up to 5):"
+        xcrun simctl list devices available 2>/dev/null | grep "iPhone\|iPad" | head -5 | while read -r line; do
+            echo "       - $line"
+        done
+    else
+        check_warning "No simulators found"
+        echo "       Create simulators via Xcode or simctl"
+        echo "       Example: xcrun simctl create 'iPhone 15' 'iPhone 15'"
+    fi
+else
+    check_failed "Cannot check simulators (simctl not available)"
+fi
+echo ""
+
+# Check 7: Booted simulators
+echo -e "${BLUE}[7/8]${NC} Checking booted simulators..."
+if command -v xcrun &> /dev/null; then
+    BOOTED_SIMS=$(xcrun simctl list devices booted 2>/dev/null | grep -c "iPhone\|iPad" || echo "0")
+
+    if [ "$BOOTED_SIMS" -gt 0 ]; then
+        check_passed "$BOOTED_SIMS simulator(s) currently booted"
+
+        echo ""
+        echo "       Booted simulators:"
+        xcrun simctl list devices booted 2>/dev/null | grep "iPhone\|iPad" | while read -r line; do
+            echo "       - $line"
+        done
+    else
+        check_warning "No simulators currently booted"
+        echo "       Boot a simulator to begin testing"
+        echo "       Example: xcrun simctl boot <device-udid>"
+        echo "       Or: open -a Simulator"
+    fi
+else
+    check_failed "Cannot check booted simulators (simctl not available)"
+fi
+echo ""
+
+# Check 8: Required Python packages (optional check)
+echo -e "${BLUE}[8/8]${NC} Checking Python packages..."
+if command -v python3 &> /dev/null; then
+    MISSING_PACKAGES=()
+
+    # Check for PIL/Pillow (for visual_diff.py)
+    if python3 -c "import PIL" 2>/dev/null; then
+        check_passed "Pillow (PIL) installed - visual diff available"
+    else
+        MISSING_PACKAGES+=("pillow")
+        check_warning "Pillow (PIL) not installed - visual diff won't work"
+    fi
+
+    if [ ${#MISSING_PACKAGES[@]} -gt 0 ]; then
+        echo ""
+        echo "       Install missing packages:"
+        echo "       pip3 install ${MISSING_PACKAGES[*]}"
+    fi
+else
+    check_warning "Cannot check Python packages (Python 3 not available)"
+fi
+echo ""
+
+# Summary
+echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo -e "${BLUE}  Summary${NC}"
+echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo ""
+echo -e "Checks passed: ${GREEN}$CHECKS_PASSED${NC}"
+if [ "$CHECKS_FAILED" -gt 0 ]; then
+    echo -e "Checks failed: ${RED}$CHECKS_FAILED${NC}"
+    echo ""
+    echo -e "${YELLOW}Action required:${NC} Fix the failed checks above before testing"
+    exit 1
+else
+    echo ""
+    echo -e "${GREEN}✓ Environment is ready for iOS simulator testing${NC}"
+    echo ""
+    echo "Next steps:"
+    echo "  1. Boot a simulator: open -a Simulator"
+    echo "  2. Launch your app: xcrun simctl launch booted <bundle-id>"
+    echo "  3. Run accessibility audit: python scripts/accessibility_audit.py"
+    exit 0
+fi

.claude/skills/ios-simulator-skill/scripts/sim_list.py

@@ -0,0 +1,299 @@
+#!/usr/bin/env python3
+"""
+iOS Simulator Listing with Progressive Disclosure
+
+Lists available simulators with token-efficient summaries.
+Full details available on demand via cache IDs.
+
+Achieves 96% token reduction (57k→2k tokens) for common queries.
+
+Usage Examples:
+    # Concise summary (default)
+    python scripts/sim_list.py
+
+    # Get full details for cached list
+    python scripts/sim_list.py --get-details <cache-id>
+
+    # Get recommendations
+    python scripts/sim_list.py --suggest
+
+    # Filter by device type
+    python scripts/sim_list.py --device-type iPhone
+
+Output (default):
+    Simulator Summary [cache-sim-20251028-143052]
+    ├─ Total: 47 devices
+    ├─ Available: 31
+    └─ Booted: 1
+
+    ✓ iPhone 16 Pro (iOS 18.1) [ABC-123...]
+
+    Use --get-details cache-sim-20251028-143052 for full list
+
+Technical Details:
+- Uses xcrun simctl list devices
+- Caches results with 1-hour TTL
+- Reduces output by 96% by default
+- Token efficiency: summary = ~30 tokens, full list = ~1500 tokens
+"""
+
+import argparse
+import json
+import subprocess
+import sys
+from typing import Any
+
+from common import get_cache
+
+
+class SimulatorLister:
+    """Lists iOS simulators with progressive disclosure."""
+
+    def __init__(self):
+        """Initialize lister with cache."""
+        self.cache = get_cache()
+
+    def list_simulators(self) -> dict:
+        """
+        Get list of all simulators.
+
+        Returns:
+            Dict with structure:
+            {
+                "devices": [...],
+                "runtimes": [...],
+                "total_devices": int,
+                "available_devices": int,
+                "booted_devices": [...]
+            }
+        """
+        try:
+            result = subprocess.run(
+                ["xcrun", "simctl", "list", "devices", "--json"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+
+            return json.loads(result.stdout)
+        except (subprocess.CalledProcessError, json.JSONDecodeError):
+            return {"devices": {}, "runtimes": []}
+
+    def parse_devices(self, sim_data: dict) -> list[dict]:
+        """
+        Parse simulator data into flat list.
+
+        Returns:
+            List of device dicts with runtime info
+        """
+        devices = []
+
+        devices_by_runtime = sim_data.get("devices", {})
+
+        for runtime_str, device_list in devices_by_runtime.items():
+            # Extract iOS version from runtime string
+            # Format: "iOS 18.1", "tvOS 18", etc.
+            runtime_name = runtime_str.replace(" Simulator", "").strip()
+
+            for device in device_list:
+                devices.append(
+                    {
+                        "name": device.get("name"),
+                        "udid": device.get("udid"),
+                        "state": device.get("state"),
+                        "runtime": runtime_name,
+                        "is_available": device.get("isAvailable", False),
+                    }
+                )
+
+        return devices
+
+    def get_concise_summary(self, devices: list[dict]) -> dict:
+        """
+        Generate concise summary with cache ID.
+
+        Returns 96% fewer tokens than full list.
+        """
+        booted = [d for d in devices if d["state"] == "Booted"]
+        available = [d for d in devices if d["is_available"]]
+        iphone = [d for d in available if "iPhone" in d["name"]]
+
+        # Cache full list for later retrieval
+        cache_id = self.cache.save(
+            {
+                "devices": devices,
+                "timestamp": __import__("datetime").datetime.now().isoformat(),
+            },
+            "simulator-list",
+        )
+
+        return {
+            "cache_id": cache_id,
+            "summary": {
+                "total_devices": len(devices),
+                "available_devices": len(available),
+                "booted_devices": len(booted),
+            },
+            "quick_access": {
+                "booted": booted[:3] if booted else [],
+                "recommended_iphone": iphone[:3] if iphone else [],
+            },
+        }
+
+    def get_full_list(
+        self,
+        cache_id: str,
+        device_type: str | None = None,
+        runtime: str | None = None,
+    ) -> list[dict] | None:
+        """
+        Retrieve full simulator list from cache.
+
+        Args:
+            cache_id: Cache ID from concise summary
+            device_type: Filter by type (iPhone, iPad, etc.)
+            runtime: Filter by iOS version
+
+        Returns:
+            List of devices matching filters
+        """
+        data = self.cache.get(cache_id)
+        if not data:
+            return None
+
+        devices = data.get("devices", [])
+
+        # Apply filters
+        if device_type:
+            devices = [d for d in devices if device_type in d["name"]]
+        if runtime:
+            devices = [d for d in devices if runtime.lower() in d["runtime"].lower()]
+
+        return devices
+
+    def suggest_simulators(self, limit: int = 4) -> list[dict]:
+        """
+        Get simulator recommendations.
+
+        Returns:
+            List of recommended simulators (best candidates for building)
+        """
+        all_sims = self.list_simulators()
+        devices = self.parse_devices(all_sims)
+
+        # Score devices for recommendations
+        scored = []
+        for device in devices:
+            score = 0
+
+            # Prefer booted
+            if device["state"] == "Booted":
+                score += 10
+            # Prefer available
+            if device["is_available"]:
+                score += 5
+            # Prefer recent iOS versions
+            ios_version = device["runtime"]
+            if "18" in ios_version:
+                score += 3
+            elif "17" in ios_version:
+                score += 2
+            # Prefer iPhones over other types
+            if "iPhone" in device["name"]:
+                score += 1
+
+            scored.append({"device": device, "score": score})
+
+        # Sort by score and return top N
+        scored.sort(key=lambda x: x["score"], reverse=True)
+        return [s["device"] for s in scored[:limit]]
+
+
+def format_device(device: dict) -> str:
+    """Format device for display."""
+    state_icon = "✓" if device["state"] == "Booted" else " "
+    avail_icon = "●" if device["is_available"] else "○"
+    name = device["name"]
+    runtime = device["runtime"]
+    udid_short = device["udid"][:8] + "..."
+    return f"{state_icon} {avail_icon} {name} ({runtime}) [{udid_short}]"
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="List iOS simulators with progressive disclosure")
+    parser.add_argument(
+        "--get-details",
+        metavar="CACHE_ID",
+        help="Get full details for cached simulator list",
+    )
+    parser.add_argument("--suggest", action="store_true", help="Get simulator recommendations")
+    parser.add_argument(
+        "--device-type",
+        help="Filter by device type (iPhone, iPad, Apple Watch, etc.)",
+    )
+    parser.add_argument("--runtime", help="Filter by iOS version (e.g., iOS-18, iOS-17)")
+    parser.add_argument("--json", action="store_true", help="Output as JSON")
+
+    args = parser.parse_args()
+
+    lister = SimulatorLister()
+
+    # Get full list with details
+    if args.get_details:
+        devices = lister.get_full_list(
+            args.get_details, device_type=args.device_type, runtime=args.runtime
+        )
+
+        if devices is None:
+            print(f"Error: Cache ID not found or expired: {args.get_details}")
+            sys.exit(1)
+
+        if args.json:
+            print(json.dumps(devices, indent=2))
+        else:
+            print(f"Simulators ({len(devices)}):\n")
+            for device in devices:
+                print(f"  {format_device(device)}")
+
+    # Get recommendations
+    elif args.suggest:
+        suggestions = lister.suggest_simulators()
+
+        if args.json:
+            print(json.dumps(suggestions, indent=2))
+        else:
+            print("Recommended Simulators:\n")
+            for i, device in enumerate(suggestions, 1):
+                print(f"{i}. {format_device(device)}")
+
+    # Default: concise summary
+    else:
+        all_sims = lister.list_simulators()
+        devices = lister.parse_devices(all_sims)
+        summary = lister.get_concise_summary(devices)
+
+        if args.json:
+            print(json.dumps(summary, indent=2))
+        else:
+            # Human-readable concise output
+            cache_id = summary["cache_id"]
+            s = summary["summary"]
+            q = summary["quick_access"]
+
+            print(f"Simulator Summary [{cache_id}]")
+            print(f"├─ Total: {s['total_devices']} devices")
+            print(f"├─ Available: {s['available_devices']}")
+            print(f"└─ Booted: {s['booted_devices']}")
+
+            if q["booted"]:
+                print()
+                for device in q["booted"]:
+                    print(f"  {format_device(device)}")
+
+            print()
+            print(f"Use --get-details {cache_id} for full list")
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simctl_boot.py

@@ -0,0 +1,297 @@
+#!/usr/bin/env python3
+"""
+Boot iOS simulators and wait for readiness.
+
+This script boots one or more simulators and optionally waits for them to reach
+a ready state. It measures boot time and provides progress feedback.
+
+Key features:
+- Boot by UDID or device name
+- Wait for device readiness with configurable timeout
+- Measure boot performance
+- Batch boot operations (boot all, boot by type)
+- Progress reporting for CI/CD pipelines
+"""
+
+import argparse
+import subprocess
+import sys
+import time
+from typing import Optional
+
+from common.device_utils import (
+    get_booted_device_udid,
+    list_simulators,
+    resolve_device_identifier,
+)
+
+
+class SimulatorBooter:
+    """Boot iOS simulators with optional readiness waiting."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize booter with optional device UDID."""
+        self.udid = udid
+
+    def boot(self, wait_ready: bool = False, timeout_seconds: int = 120) -> tuple[bool, str]:
+        """
+        Boot simulator and optionally wait for readiness.
+
+        Args:
+            wait_ready: Wait for device to be ready before returning
+            timeout_seconds: Maximum seconds to wait for readiness
+
+        Returns:
+            (success, message) tuple
+        """
+        if not self.udid:
+            return False, "Error: Device UDID not specified"
+
+        start_time = time.time()
+
+        # Check if already booted
+        try:
+            booted = get_booted_device_udid()
+            if booted == self.udid:
+                elapsed = time.time() - start_time
+                return True, (f"Device already booted: {self.udid} " f"[checked in {elapsed:.1f}s]")
+        except RuntimeError:
+            pass  # No booted device, proceed with boot
+
+        # Execute boot command
+        try:
+            cmd = ["xcrun", "simctl", "boot", self.udid]
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=30)
+
+            if result.returncode != 0:
+                error = result.stderr.strip()
+                return False, f"Boot failed: {error}"
+        except subprocess.TimeoutExpired:
+            return False, "Boot command timed out"
+        except Exception as e:
+            return False, f"Boot error: {e}"
+
+        # Optionally wait for readiness
+        if wait_ready:
+            ready, wait_message = self._wait_for_ready(timeout_seconds)
+            elapsed = time.time() - start_time
+            if ready:
+                return True, (f"Device booted and ready: {self.udid} " f"[{elapsed:.1f}s total]")
+            return False, wait_message
+
+        elapsed = time.time() - start_time
+        return True, (
+            f"Device booted: {self.udid} [boot in {elapsed:.1f}s] "
+            "(use --wait-ready to wait for availability)"
+        )
+
+    def _wait_for_ready(self, timeout_seconds: int = 120) -> tuple[bool, str]:
+        """
+        Wait for device to reach ready state.
+
+        Args:
+            timeout_seconds: Maximum seconds to wait
+
+        Returns:
+            (success, message) tuple
+        """
+        start_time = time.time()
+        poll_interval = 0.5
+        checks = 0
+
+        while time.time() - start_time < timeout_seconds:
+            try:
+                checks += 1
+                # Check if device responds to simctl commands
+                result = subprocess.run(
+                    ["xcrun", "simctl", "spawn", self.udid, "launchctl", "list"],
+                    check=False,
+                    capture_output=True,
+                    text=True,
+                    timeout=5,
+                )
+
+                if result.returncode == 0:
+                    elapsed = time.time() - start_time
+                    return True, (
+                        f"Device ready: {self.udid} " f"[{elapsed:.1f}s, {checks} checks]"
+                    )
+            except (subprocess.TimeoutExpired, RuntimeError):
+                pass  # Not ready yet
+
+            time.sleep(poll_interval)
+
+        elapsed = time.time() - start_time
+        return False, (
+            f"Boot timeout: Device did not reach ready state "
+            f"within {elapsed:.1f}s ({checks} checks)"
+        )
+
+    @staticmethod
+    def boot_all() -> tuple[int, int]:
+        """
+        Boot all available simulators.
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state="available")
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            booter = SimulatorBooter(udid=sim["udid"])
+            success, _message = booter.boot(wait_ready=False)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def boot_by_type(device_type: str) -> tuple[int, int]:
+        """
+        Boot all simulators of a specific type.
+
+        Args:
+            device_type: Device type filter (e.g., "iPhone", "iPad")
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state="available")
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            if device_type.lower() in sim["name"].lower():
+                booter = SimulatorBooter(udid=sim["udid"])
+                success, _message = booter.boot(wait_ready=False)
+                if success:
+                    succeeded += 1
+                else:
+                    failed += 1
+
+        return succeeded, failed
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Boot iOS simulators and wait for readiness")
+    parser.add_argument(
+        "--udid",
+        help="Device UDID or name (required unless using --all or --type)",
+    )
+    parser.add_argument(
+        "--name",
+        help="Device name (alternative to --udid)",
+    )
+    parser.add_argument(
+        "--wait-ready",
+        action="store_true",
+        help="Wait for device to reach ready state",
+    )
+    parser.add_argument(
+        "--timeout",
+        type=int,
+        default=120,
+        help="Timeout for --wait-ready in seconds (default: 120)",
+    )
+    parser.add_argument(
+        "--all",
+        action="store_true",
+        help="Boot all available simulators",
+    )
+    parser.add_argument(
+        "--type",
+        help="Boot all simulators of a specific type (e.g., iPhone, iPad)",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+
+    args = parser.parse_args()
+
+    # Handle batch operations
+    if args.all:
+        succeeded, failed = SimulatorBooter.boot_all()
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "boot_all",
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Boot summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.type:
+        succeeded, failed = SimulatorBooter.boot_by_type(args.type)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "boot_by_type",
+                        "type": args.type,
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Boot {args.type} summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    # Resolve device identifier
+    device_id = args.udid or args.name
+    if not device_id:
+        print("Error: Specify --udid, --name, --all, or --type", file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        udid = resolve_device_identifier(device_id)
+    except RuntimeError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    # Boot device
+    booter = SimulatorBooter(udid=udid)
+    success, message = booter.boot(wait_ready=args.wait_ready, timeout_seconds=args.timeout)
+
+    if args.json:
+        import json
+
+        print(
+            json.dumps(
+                {
+                    "action": "boot",
+                    "device_id": device_id,
+                    "udid": udid,
+                    "success": success,
+                    "message": message,
+                }
+            )
+        )
+    else:
+        print(message)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simctl_create.py

@@ -0,0 +1,316 @@
+#!/usr/bin/env python3
+"""
+Create iOS simulators dynamically.
+
+This script creates new simulators with specified device type and iOS version.
+Useful for CI/CD pipelines that need on-demand test device provisioning.
+
+Key features:
+- Create by device type (iPhone 16 Pro, iPad Air, etc.)
+- Specify iOS version (17.0, 18.0, etc.)
+- Custom device naming
+- Return newly created device UDID
+- List available device types and runtimes
+"""
+
+import argparse
+import subprocess
+import sys
+from typing import Optional
+
+from common.device_utils import list_simulators
+
+
+class SimulatorCreator:
+    """Create iOS simulators with specified configurations."""
+
+    def __init__(self):
+        """Initialize simulator creator."""
+        pass
+
+    def create(
+        self,
+        device_type: str,
+        ios_version: str | None = None,
+        custom_name: str | None = None,
+    ) -> tuple[bool, str, str | None]:
+        """
+        Create new iOS simulator.
+
+        Args:
+            device_type: Device type (e.g., "iPhone 16 Pro", "iPad Air")
+            ios_version: iOS version (e.g., "18.0"). If None, uses latest.
+            custom_name: Custom device name. If None, uses default.
+
+        Returns:
+            (success, message, new_udid) tuple
+        """
+        # Get available device types and runtimes
+        available_types = self._get_device_types()
+        if not available_types:
+            return False, "Failed to get available device types", None
+
+        # Normalize device type
+        device_type_id = None
+        for dt in available_types:
+            if device_type.lower() in dt["name"].lower():
+                device_type_id = dt["identifier"]
+                break
+
+        if not device_type_id:
+            return (
+                False,
+                f"Device type '{device_type}' not found. "
+                f"Use --list-devices for available types.",
+                None,
+            )
+
+        # Get available runtimes
+        available_runtimes = self._get_runtimes()
+        if not available_runtimes:
+            return False, "Failed to get available runtimes", None
+
+        # Resolve iOS version
+        runtime_id = None
+        if ios_version:
+            for rt in available_runtimes:
+                if ios_version in rt["name"]:
+                    runtime_id = rt["identifier"]
+                    break
+
+            if not runtime_id:
+                return (
+                    False,
+                    f"iOS version '{ios_version}' not found. "
+                    f"Use --list-runtimes for available versions.",
+                    None,
+                )
+        # Use latest runtime
+        elif available_runtimes:
+            runtime_id = available_runtimes[-1]["identifier"]
+
+        if not runtime_id:
+            return False, "No iOS runtime available", None
+
+        # Create device
+        try:
+            # Build device name
+            device_name = (
+                custom_name or f"{device_type_id.split('.')[-1]}-{ios_version or 'latest'}"
+            )
+
+            cmd = [
+                "xcrun",
+                "simctl",
+                "create",
+                device_name,
+                device_type_id,
+                runtime_id,
+            ]
+
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=60)
+
+            if result.returncode != 0:
+                error = result.stderr.strip() or result.stdout.strip()
+                return False, f"Creation failed: {error}", None
+
+            # Extract UDID from output
+            new_udid = result.stdout.strip()
+
+            return (
+                True,
+                f"Device created: {device_name} ({device_type}) iOS {ios_version or 'latest'} "
+                f"UDID: {new_udid}",
+                new_udid,
+            )
+
+        except subprocess.TimeoutExpired:
+            return False, "Creation command timed out", None
+        except Exception as e:
+            return False, f"Creation error: {e}", None
+
+    @staticmethod
+    def _get_device_types() -> list[dict]:
+        """
+        Get available device types.
+
+        Returns:
+            List of device type dicts with "name" and "identifier" keys
+        """
+        try:
+            cmd = ["xcrun", "simctl", "list", "devicetypes", "-j"]
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            import json
+
+            data = json.loads(result.stdout)
+            devices = []
+
+            for device in data.get("devicetypes", []):
+                devices.append(
+                    {
+                        "name": device.get("name", ""),
+                        "identifier": device.get("identifier", ""),
+                    }
+                )
+
+            return devices
+        except Exception:
+            return []
+
+    @staticmethod
+    def _get_runtimes() -> list[dict]:
+        """
+        Get available iOS runtimes.
+
+        Returns:
+            List of runtime dicts with "name" and "identifier" keys
+        """
+        try:
+            cmd = ["xcrun", "simctl", "list", "runtimes", "-j"]
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            import json
+
+            data = json.loads(result.stdout)
+            runtimes = []
+
+            for runtime in data.get("runtimes", []):
+                # Only include iOS runtimes (skip watchOS, tvOS, etc.)
+                identifier = runtime.get("identifier", "")
+                if "iOS" in identifier or "iOS" in runtime.get("name", ""):
+                    runtimes.append(
+                        {
+                            "name": runtime.get("name", ""),
+                            "identifier": runtime.get("identifier", ""),
+                        }
+                    )
+
+            # Sort by version number (latest first)
+            runtimes.sort(key=lambda r: r.get("identifier", ""), reverse=True)
+
+            return runtimes
+        except Exception:
+            return []
+
+    @staticmethod
+    def list_device_types() -> list[dict]:
+        """
+        List all available device types.
+
+        Returns:
+            List of device types with name and identifier
+        """
+        return SimulatorCreator._get_device_types()
+
+    @staticmethod
+    def list_runtimes() -> list[dict]:
+        """
+        List all available iOS runtimes.
+
+        Returns:
+            List of runtimes with name and identifier
+        """
+        return SimulatorCreator._get_runtimes()
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Create iOS simulators dynamically")
+    parser.add_argument(
+        "--device",
+        required=False,
+        help="Device type (e.g., 'iPhone 16 Pro', 'iPad Air')",
+    )
+    parser.add_argument(
+        "--runtime",
+        help="iOS version (e.g., '18.0', '17.0'). Defaults to latest.",
+    )
+    parser.add_argument(
+        "--name",
+        help="Custom device name. Defaults to auto-generated.",
+    )
+    parser.add_argument(
+        "--list-devices",
+        action="store_true",
+        help="List all available device types",
+    )
+    parser.add_argument(
+        "--list-runtimes",
+        action="store_true",
+        help="List all available iOS runtimes",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+
+    args = parser.parse_args()
+
+    creator = SimulatorCreator()
+
+    # Handle info queries
+    if args.list_devices:
+        devices = creator.list_device_types()
+        if args.json:
+            import json
+
+            print(json.dumps({"devices": devices}))
+        else:
+            print(f"Available device types ({len(devices)}):")
+            for dev in devices[:20]:  # Show first 20
+                print(f"  - {dev['name']}")
+            if len(devices) > 20:
+                print(f"  ... and {len(devices) - 20} more")
+        sys.exit(0)
+
+    if args.list_runtimes:
+        runtimes = creator.list_runtimes()
+        if args.json:
+            import json
+
+            print(json.dumps({"runtimes": runtimes}))
+        else:
+            print(f"Available iOS runtimes ({len(runtimes)}):")
+            for rt in runtimes:
+                print(f"  - {rt['name']}")
+        sys.exit(0)
+
+    # Create device
+    if not args.device:
+        print(
+            "Error: Specify --device, --list-devices, or --list-runtimes",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    success, message, new_udid = creator.create(
+        device_type=args.device,
+        ios_version=args.runtime,
+        custom_name=args.name,
+    )
+
+    if args.json:
+        import json
+
+        print(
+            json.dumps(
+                {
+                    "action": "create",
+                    "device_type": args.device,
+                    "runtime": args.runtime,
+                    "success": success,
+                    "message": message,
+                    "new_udid": new_udid,
+                }
+            )
+        )
+    else:
+        print(message)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simctl_delete.py

@@ -0,0 +1,357 @@
+#!/usr/bin/env python3
+"""
+Delete iOS simulators permanently.
+
+This script permanently removes simulators and frees disk space.
+Includes safety confirmation to prevent accidental deletion.
+
+Key features:
+- Delete by UDID or device name
+- Confirmation required for safety
+- Batch delete operations
+- Report freed disk space estimate
+"""
+
+import argparse
+import subprocess
+import sys
+from typing import Optional
+
+from common.device_utils import (
+    list_simulators,
+    resolve_device_identifier,
+)
+
+
+class SimulatorDeleter:
+    """Delete iOS simulators with safety confirmation."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize with optional device UDID."""
+        self.udid = udid
+
+    def delete(self, confirm: bool = False) -> tuple[bool, str]:
+        """
+        Delete simulator permanently.
+
+        Args:
+            confirm: Skip confirmation prompt (for batch operations)
+
+        Returns:
+            (success, message) tuple
+        """
+        if not self.udid:
+            return False, "Error: Device UDID not specified"
+
+        # Safety confirmation
+        if not confirm:
+            try:
+                response = input(
+                    f"Permanently delete simulator {self.udid}? " f"(type 'yes' to confirm): "
+                )
+                if response.lower() != "yes":
+                    return False, "Deletion cancelled by user"
+            except KeyboardInterrupt:
+                return False, "Deletion cancelled"
+
+        # Execute delete command
+        try:
+            cmd = ["xcrun", "simctl", "delete", self.udid]
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=60)
+
+            if result.returncode != 0:
+                error = result.stderr.strip() or result.stdout.strip()
+                return False, f"Deletion failed: {error}"
+
+            return True, f"Device deleted: {self.udid} [disk space freed]"
+
+        except subprocess.TimeoutExpired:
+            return False, "Deletion command timed out"
+        except Exception as e:
+            return False, f"Deletion error: {e}"
+
+    @staticmethod
+    def delete_all(confirm: bool = False) -> tuple[int, int]:
+        """
+        Delete all simulators permanently.
+
+        Args:
+            confirm: Skip confirmation prompt
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state=None)
+
+        if not confirm:
+            count = len(simulators)
+            try:
+                response = input(
+                    f"Permanently delete ALL {count} simulators? " f"(type 'yes' to confirm): "
+                )
+                if response.lower() != "yes":
+                    return 0, count
+            except KeyboardInterrupt:
+                return 0, count
+
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            deleter = SimulatorDeleter(udid=sim["udid"])
+            success, _message = deleter.delete(confirm=True)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def delete_by_type(device_type: str, confirm: bool = False) -> tuple[int, int]:
+        """
+        Delete all simulators of a specific type.
+
+        Args:
+            device_type: Device type filter (e.g., "iPhone", "iPad")
+            confirm: Skip confirmation prompt
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state=None)
+        matching = [s for s in simulators if device_type.lower() in s["name"].lower()]
+
+        if not matching:
+            return 0, 0
+
+        if not confirm:
+            count = len(matching)
+            try:
+                response = input(
+                    f"Permanently delete {count} {device_type} simulators? "
+                    f"(type 'yes' to confirm): "
+                )
+                if response.lower() != "yes":
+                    return 0, count
+            except KeyboardInterrupt:
+                return 0, count
+
+        succeeded = 0
+        failed = 0
+
+        for sim in matching:
+            deleter = SimulatorDeleter(udid=sim["udid"])
+            success, _message = deleter.delete(confirm=True)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def delete_old(keep_count: int = 3, confirm: bool = False) -> tuple[int, int]:
+        """
+        Delete older simulators, keeping most recent versions.
+
+        Useful for cleanup after testing multiple iOS versions.
+        Keeps the most recent N simulators of each type.
+
+        Args:
+            keep_count: Number of recent simulators to keep per type (default: 3)
+            confirm: Skip confirmation prompt
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state=None)
+
+        # Group by device type
+        by_type: dict[str, list] = {}
+        for sim in simulators:
+            dev_type = sim["type"]
+            if dev_type not in by_type:
+                by_type[dev_type] = []
+            by_type[dev_type].append(sim)
+
+        # Find candidates for deletion (older ones)
+        to_delete = []
+        for _dev_type, sims in by_type.items():
+            # Sort by runtime (iOS version) - keep newest
+            sorted_sims = sorted(sims, key=lambda s: s["runtime"], reverse=True)
+            # Mark older ones for deletion
+            to_delete.extend(sorted_sims[keep_count:])
+
+        if not to_delete:
+            return 0, 0
+
+        if not confirm:
+            count = len(to_delete)
+            try:
+                response = input(
+                    f"Delete {count} older simulators, keeping {keep_count} per type? "
+                    f"(type 'yes' to confirm): "
+                )
+                if response.lower() != "yes":
+                    return 0, count
+            except KeyboardInterrupt:
+                return 0, count
+
+        succeeded = 0
+        failed = 0
+
+        for sim in to_delete:
+            deleter = SimulatorDeleter(udid=sim["udid"])
+            success, _message = deleter.delete(confirm=True)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Delete iOS simulators permanently")
+    parser.add_argument(
+        "--udid",
+        help="Device UDID or name (required unless using batch options)",
+    )
+    parser.add_argument(
+        "--name",
+        help="Device name (alternative to --udid)",
+    )
+    parser.add_argument(
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompt",
+    )
+    parser.add_argument(
+        "--all",
+        action="store_true",
+        help="Delete all simulators",
+    )
+    parser.add_argument(
+        "--type",
+        help="Delete all simulators of a specific type (e.g., iPhone)",
+    )
+    parser.add_argument(
+        "--old",
+        type=int,
+        metavar="KEEP_COUNT",
+        help="Delete older simulators, keeping this many per type (e.g., --old 3)",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+
+    args = parser.parse_args()
+
+    # Handle batch operations
+    if args.all:
+        succeeded, failed = SimulatorDeleter.delete_all(confirm=args.yes)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "delete_all",
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Delete summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.type:
+        succeeded, failed = SimulatorDeleter.delete_by_type(args.type, confirm=args.yes)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "delete_by_type",
+                        "type": args.type,
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Delete {args.type} summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.old is not None:
+        succeeded, failed = SimulatorDeleter.delete_old(keep_count=args.old, confirm=args.yes)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "delete_old",
+                        "keep_count": args.old,
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(
+                f"Delete old summary: {succeeded}/{total} succeeded, "
+                f"{failed} failed (kept {args.old} per type)"
+            )
+        sys.exit(0 if failed == 0 else 1)
+
+    # Delete single device
+    device_id = args.udid or args.name
+    if not device_id:
+        print("Error: Specify --udid, --name, --all, --type, or --old", file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        udid = resolve_device_identifier(device_id)
+    except RuntimeError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    # Delete device
+    deleter = SimulatorDeleter(udid=udid)
+    success, message = deleter.delete(confirm=args.yes)
+
+    if args.json:
+        import json
+
+        print(
+            json.dumps(
+                {
+                    "action": "delete",
+                    "device_id": device_id,
+                    "udid": udid,
+                    "success": success,
+                    "message": message,
+                }
+            )
+        )
+    else:
+        print(message)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simctl_erase.py

@@ -0,0 +1,342 @@
+#!/usr/bin/env python3
+"""
+Erase iOS simulators (factory reset).
+
+This script performs a factory reset on simulators, returning them to
+a clean state while preserving the device UUID. Much faster than
+delete + create for CI/CD cleanup.
+
+Key features:
+- Erase by UDID or device name
+- Preserve device UUID (faster than delete)
+- Verify erase completion
+- Batch erase operations (all, by type)
+"""
+
+import argparse
+import subprocess
+import sys
+import time
+from typing import Optional
+
+from common.device_utils import (
+    list_simulators,
+    resolve_device_identifier,
+)
+
+
+class SimulatorEraser:
+    """Erase iOS simulators with optional verification."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize with optional device UDID."""
+        self.udid = udid
+
+    def erase(self, verify: bool = True, timeout_seconds: int = 30) -> tuple[bool, str]:
+        """
+        Erase simulator and optionally verify completion.
+
+        Performs a factory reset, clearing all app data and settings
+        while preserving the simulator UUID.
+
+        Args:
+            verify: Wait for erase to complete and verify state
+            timeout_seconds: Maximum seconds to wait for verification
+
+        Returns:
+            (success, message) tuple
+        """
+        if not self.udid:
+            return False, "Error: Device UDID not specified"
+
+        start_time = time.time()
+
+        # Execute erase command
+        try:
+            cmd = ["xcrun", "simctl", "erase", self.udid]
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=60)
+
+            if result.returncode != 0:
+                error = result.stderr.strip()
+                return False, f"Erase failed: {error}"
+        except subprocess.TimeoutExpired:
+            return False, "Erase command timed out"
+        except Exception as e:
+            return False, f"Erase error: {e}"
+
+        # Optionally verify erase completion
+        if verify:
+            ready, verify_message = self._verify_erase(timeout_seconds)
+            elapsed = time.time() - start_time
+            if ready:
+                return True, (
+                    f"Device erased: {self.udid} " f"[factory reset complete, {elapsed:.1f}s]"
+                )
+            return False, verify_message
+
+        elapsed = time.time() - start_time
+        return True, (
+            f"Device erase initiated: {self.udid} [{elapsed:.1f}s] "
+            "(use --verify to wait for completion)"
+        )
+
+    def _verify_erase(self, timeout_seconds: int = 30) -> tuple[bool, str]:
+        """
+        Verify erase has completed.
+
+        Polls device state to confirm erase finished successfully.
+
+        Args:
+            timeout_seconds: Maximum seconds to wait
+
+        Returns:
+            (success, message) tuple
+        """
+        start_time = time.time()
+        poll_interval = 0.5
+        checks = 0
+
+        while time.time() - start_time < timeout_seconds:
+            try:
+                checks += 1
+                # Check if device can be queried (indicates boot status)
+                result = subprocess.run(
+                    ["xcrun", "simctl", "spawn", self.udid, "launchctl", "list"],
+                    check=False,
+                    capture_output=True,
+                    text=True,
+                    timeout=5,
+                )
+
+                # Device responding = erase likely complete
+                if result.returncode == 0:
+                    elapsed = time.time() - start_time
+                    return True, (
+                        f"Erase verified: {self.udid} " f"[{elapsed:.1f}s, {checks} checks]"
+                    )
+            except (subprocess.TimeoutExpired, RuntimeError):
+                pass  # Not ready yet, keep polling
+
+            time.sleep(poll_interval)
+
+        elapsed = time.time() - start_time
+        return False, (
+            f"Erase verification timeout: Device did not respond "
+            f"within {elapsed:.1f}s ({checks} checks)"
+        )
+
+    @staticmethod
+    def erase_all() -> tuple[int, int]:
+        """
+        Erase all simulators (factory reset).
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state=None)
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            eraser = SimulatorEraser(udid=sim["udid"])
+            success, _message = eraser.erase(verify=False)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def erase_by_type(device_type: str) -> tuple[int, int]:
+        """
+        Erase all simulators of a specific type.
+
+        Args:
+            device_type: Device type filter (e.g., "iPhone", "iPad")
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state=None)
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            if device_type.lower() in sim["name"].lower():
+                eraser = SimulatorEraser(udid=sim["udid"])
+                success, _message = eraser.erase(verify=False)
+                if success:
+                    succeeded += 1
+                else:
+                    failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def erase_booted() -> tuple[int, int]:
+        """
+        Erase all currently booted simulators.
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state="booted")
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            eraser = SimulatorEraser(udid=sim["udid"])
+            success, _message = eraser.erase(verify=False)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Erase iOS simulators (factory reset)")
+    parser.add_argument(
+        "--udid",
+        help="Device UDID or name (required unless using --all, --type, or --booted)",
+    )
+    parser.add_argument(
+        "--name",
+        help="Device name (alternative to --udid)",
+    )
+    parser.add_argument(
+        "--verify",
+        action="store_true",
+        help="Wait for erase to complete and verify state",
+    )
+    parser.add_argument(
+        "--timeout",
+        type=int,
+        default=30,
+        help="Timeout for --verify in seconds (default: 30)",
+    )
+    parser.add_argument(
+        "--all",
+        action="store_true",
+        help="Erase all simulators (factory reset)",
+    )
+    parser.add_argument(
+        "--type",
+        help="Erase all simulators of a specific type (e.g., iPhone)",
+    )
+    parser.add_argument(
+        "--booted",
+        action="store_true",
+        help="Erase all currently booted simulators",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+
+    args = parser.parse_args()
+
+    # Handle batch operations
+    if args.all:
+        succeeded, failed = SimulatorEraser.erase_all()
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "erase_all",
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Erase summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.type:
+        succeeded, failed = SimulatorEraser.erase_by_type(args.type)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "erase_by_type",
+                        "type": args.type,
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Erase {args.type} summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.booted:
+        succeeded, failed = SimulatorEraser.erase_booted()
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "erase_booted",
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Erase booted summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    # Erase single device
+    device_id = args.udid or args.name
+    if not device_id:
+        print("Error: Specify --udid, --name, --all, --type, or --booted", file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        udid = resolve_device_identifier(device_id)
+    except RuntimeError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    # Erase device
+    eraser = SimulatorEraser(udid=udid)
+    success, message = eraser.erase(verify=args.verify, timeout_seconds=args.timeout)
+
+    if args.json:
+        import json
+
+        print(
+            json.dumps(
+                {
+                    "action": "erase",
+                    "device_id": device_id,
+                    "udid": udid,
+                    "success": success,
+                    "message": message,
+                }
+            )
+        )
+    else:
+        print(message)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simctl_shutdown.py

@@ -0,0 +1,290 @@
+#!/usr/bin/env python3
+"""
+Shutdown iOS simulators with optional state verification.
+
+This script shuts down one or more running simulators and optionally
+verifies completion. Supports batch operations for efficient cleanup.
+
+Key features:
+- Shutdown by UDID or device name
+- Verify shutdown completion with timeout
+- Batch shutdown operations (all, by type)
+- Progress reporting for CI/CD pipelines
+"""
+
+import argparse
+import subprocess
+import sys
+import time
+from typing import Optional
+
+from common.device_utils import (
+    list_simulators,
+    resolve_device_identifier,
+)
+
+
+class SimulatorShutdown:
+    """Shutdown iOS simulators with optional verification."""
+
+    def __init__(self, udid: str | None = None):
+        """Initialize with optional device UDID."""
+        self.udid = udid
+
+    def shutdown(self, verify: bool = True, timeout_seconds: int = 30) -> tuple[bool, str]:
+        """
+        Shutdown simulator and optionally verify completion.
+
+        Args:
+            verify: Wait for shutdown to complete
+            timeout_seconds: Maximum seconds to wait for shutdown
+
+        Returns:
+            (success, message) tuple
+        """
+        if not self.udid:
+            return False, "Error: Device UDID not specified"
+
+        start_time = time.time()
+
+        # Check if already shutdown
+        simulators = list_simulators(state="booted")
+        if not any(s["udid"] == self.udid for s in simulators):
+            elapsed = time.time() - start_time
+            return True, (f"Device already shutdown: {self.udid} " f"[checked in {elapsed:.1f}s]")
+
+        # Execute shutdown command
+        try:
+            cmd = ["xcrun", "simctl", "shutdown", self.udid]
+            result = subprocess.run(cmd, check=False, capture_output=True, text=True, timeout=30)
+
+            if result.returncode != 0:
+                error = result.stderr.strip()
+                return False, f"Shutdown failed: {error}"
+        except subprocess.TimeoutExpired:
+            return False, "Shutdown command timed out"
+        except Exception as e:
+            return False, f"Shutdown error: {e}"
+
+        # Optionally verify shutdown
+        if verify:
+            ready, verify_message = self._verify_shutdown(timeout_seconds)
+            elapsed = time.time() - start_time
+            if ready:
+                return True, (f"Device shutdown confirmed: {self.udid} " f"[{elapsed:.1f}s total]")
+            return False, verify_message
+
+        elapsed = time.time() - start_time
+        return True, (
+            f"Device shutdown: {self.udid} [{elapsed:.1f}s] "
+            "(use --verify to wait for confirmation)"
+        )
+
+    def _verify_shutdown(self, timeout_seconds: int = 30) -> tuple[bool, str]:
+        """
+        Verify device has fully shutdown.
+
+        Args:
+            timeout_seconds: Maximum seconds to wait
+
+        Returns:
+            (success, message) tuple
+        """
+        start_time = time.time()
+        poll_interval = 0.5
+        checks = 0
+
+        while time.time() - start_time < timeout_seconds:
+            try:
+                checks += 1
+                # Check booted devices
+                simulators = list_simulators(state="booted")
+                if not any(s["udid"] == self.udid for s in simulators):
+                    elapsed = time.time() - start_time
+                    return True, (
+                        f"Device shutdown verified: {self.udid} "
+                        f"[{elapsed:.1f}s, {checks} checks]"
+                    )
+            except RuntimeError:
+                pass  # Error checking, retry
+
+            time.sleep(poll_interval)
+
+        elapsed = time.time() - start_time
+        return False, (
+            f"Shutdown verification timeout: Device did not fully shutdown "
+            f"within {elapsed:.1f}s ({checks} checks)"
+        )
+
+    @staticmethod
+    def shutdown_all() -> tuple[int, int]:
+        """
+        Shutdown all booted simulators.
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state="booted")
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            shutdown = SimulatorShutdown(udid=sim["udid"])
+            success, _message = shutdown.shutdown(verify=False)
+            if success:
+                succeeded += 1
+            else:
+                failed += 1
+
+        return succeeded, failed
+
+    @staticmethod
+    def shutdown_by_type(device_type: str) -> tuple[int, int]:
+        """
+        Shutdown all booted simulators of a specific type.
+
+        Args:
+            device_type: Device type filter (e.g., "iPhone", "iPad")
+
+        Returns:
+            (succeeded, failed) tuple with counts
+        """
+        simulators = list_simulators(state="booted")
+        succeeded = 0
+        failed = 0
+
+        for sim in simulators:
+            if device_type.lower() in sim["name"].lower():
+                shutdown = SimulatorShutdown(udid=sim["udid"])
+                success, _message = shutdown.shutdown(verify=False)
+                if success:
+                    succeeded += 1
+                else:
+                    failed += 1
+
+        return succeeded, failed
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Shutdown iOS simulators with optional verification"
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID or name (required unless using --all or --type)",
+    )
+    parser.add_argument(
+        "--name",
+        help="Device name (alternative to --udid)",
+    )
+    parser.add_argument(
+        "--verify",
+        action="store_true",
+        help="Wait for shutdown to complete and verify state",
+    )
+    parser.add_argument(
+        "--timeout",
+        type=int,
+        default=30,
+        help="Timeout for --verify in seconds (default: 30)",
+    )
+    parser.add_argument(
+        "--all",
+        action="store_true",
+        help="Shutdown all booted simulators",
+    )
+    parser.add_argument(
+        "--type",
+        help="Shutdown all booted simulators of a specific type (e.g., iPhone)",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+
+    args = parser.parse_args()
+
+    # Handle batch operations
+    if args.all:
+        succeeded, failed = SimulatorShutdown.shutdown_all()
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "shutdown_all",
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(f"Shutdown summary: {succeeded}/{total} succeeded, " f"{failed} failed")
+        sys.exit(0 if failed == 0 else 1)
+
+    if args.type:
+        succeeded, failed = SimulatorShutdown.shutdown_by_type(args.type)
+        if args.json:
+            import json
+
+            print(
+                json.dumps(
+                    {
+                        "action": "shutdown_by_type",
+                        "type": args.type,
+                        "succeeded": succeeded,
+                        "failed": failed,
+                        "total": succeeded + failed,
+                    }
+                )
+            )
+        else:
+            total = succeeded + failed
+            print(
+                f"Shutdown {args.type} summary: {succeeded}/{total} succeeded, " f"{failed} failed"
+            )
+        sys.exit(0 if failed == 0 else 1)
+
+    # Resolve device identifier
+    device_id = args.udid or args.name
+    if not device_id:
+        print("Error: Specify --udid, --name, --all, or --type", file=sys.stderr)
+        sys.exit(1)
+
+    try:
+        udid = resolve_device_identifier(device_id)
+    except RuntimeError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    # Shutdown device
+    shutdown = SimulatorShutdown(udid=udid)
+    success, message = shutdown.shutdown(verify=args.verify, timeout_seconds=args.timeout)
+
+    if args.json:
+        import json
+
+        print(
+            json.dumps(
+                {
+                    "action": "shutdown",
+                    "device_id": device_id,
+                    "udid": udid,
+                    "success": success,
+                    "message": message,
+                }
+            )
+        )
+    else:
+        print(message)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/simulator_selector.py

@@ -0,0 +1,375 @@
+#!/usr/bin/env python3
+"""
+Intelligent Simulator Selector
+
+Suggests the best available iOS simulators based on:
+- Recently used (from config)
+- Latest iOS version
+- Common models for testing
+- Boot status
+
+Usage Examples:
+    # Get suggestions for user selection
+    python scripts/simulator_selector.py --suggest
+
+    # List all available simulators
+    python scripts/simulator_selector.py --list
+
+    # Boot a specific simulator
+    python scripts/simulator_selector.py --boot "67A99DF0-27BD-4507-A3DE-B7D8C38F764A"
+
+    # Get suggestions as JSON for programmatic use
+    python scripts/simulator_selector.py --suggest --json
+"""
+
+import argparse
+import json
+import re
+import subprocess
+import sys
+from datetime import datetime
+from pathlib import Path
+from typing import Optional
+
+# Try to import config from build_and_test if available
+try:
+    from xcode.config import Config
+except ImportError:
+    Config = None
+
+
+class SimulatorInfo:
+    """Information about an iOS simulator."""
+
+    def __init__(
+        self,
+        name: str,
+        udid: str,
+        ios_version: str,
+        status: str,
+    ):
+        """Initialize simulator info."""
+        self.name = name
+        self.udid = udid
+        self.ios_version = ios_version
+        self.status = status
+        self.reasons: list[str] = []
+
+    def to_dict(self) -> dict:
+        """Convert to dictionary."""
+        return {
+            "device": self.name,
+            "udid": self.udid,
+            "ios": self.ios_version,
+            "status": self.status,
+            "reasons": self.reasons,
+        }
+
+
+class SimulatorSelector:
+    """Intelligent simulator selection."""
+
+    # Common iPhone models ranked by testing priority
+    COMMON_MODELS = [
+        "iPhone 16 Pro",
+        "iPhone 16",
+        "iPhone 15 Pro",
+        "iPhone 15",
+        "iPhone SE (3rd generation)",
+    ]
+
+    def __init__(self):
+        """Initialize selector."""
+        self.simulators: list[SimulatorInfo] = []
+        self.config: dict | None = None
+        self.last_used_simulator: str | None = None
+
+        # Load config if available
+        if Config:
+            try:
+                config = Config.load()
+                self.last_used_simulator = config.get_preferred_simulator()
+            except Exception:
+                pass
+
+    def list_simulators(self) -> list[SimulatorInfo]:
+        """
+        List all available simulators.
+
+        Returns:
+            List of SimulatorInfo objects
+        """
+        try:
+            result = subprocess.run(
+                ["xcrun", "simctl", "list", "devices", "--json"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+
+            data = json.loads(result.stdout)
+            simulators = []
+
+            # Parse devices by iOS version
+            for runtime, devices in data.get("devices", {}).items():
+                # Extract iOS version from runtime (e.g., "com.apple.CoreSimulator.SimRuntime.iOS-18-0")
+                ios_version_match = re.search(r"iOS-(\d+-\d+)", runtime)
+                if not ios_version_match:
+                    continue
+
+                ios_version = ios_version_match.group(1).replace("-", ".")
+
+                for device in devices:
+                    name = device.get("name", "")
+                    udid = device.get("udid", "")
+                    is_available = device.get("isAvailable", False)
+
+                    if not is_available or "iPhone" not in name:
+                        continue
+
+                    status = device.get("state", "").capitalize()
+                    sim_info = SimulatorInfo(name, udid, ios_version, status)
+                    simulators.append(sim_info)
+
+            self.simulators = simulators
+            return simulators
+
+        except subprocess.CalledProcessError as e:
+            print(f"Error listing simulators: {e.stderr}", file=sys.stderr)
+            return []
+        except json.JSONDecodeError as e:
+            print(f"Error parsing simulator list: {e}", file=sys.stderr)
+            return []
+
+    def get_suggestions(self, count: int = 4) -> list[SimulatorInfo]:
+        """
+        Get top N suggested simulators.
+
+        Ranking factors:
+        1. Recently used (from config)
+        2. Latest iOS version
+        3. Common models
+        4. Boot status (Booted preferred)
+
+        Args:
+            count: Number of suggestions to return
+
+        Returns:
+            List of suggested SimulatorInfo objects
+        """
+        if not self.simulators:
+            return []
+
+        # Score each simulator
+        scored = []
+        for sim in self.simulators:
+            score = self._score_simulator(sim)
+            scored.append((score, sim))
+
+        # Sort by score (descending)
+        scored.sort(key=lambda x: x[0], reverse=True)
+
+        # Return top N
+        suggestions = [sim for _, sim in scored[:count]]
+
+        # Add reasons to each suggestion
+        for i, sim in enumerate(suggestions, 1):
+            if i == 1:
+                sim.reasons.append("Recommended")
+
+            # Check if recently used
+            if self.last_used_simulator and self.last_used_simulator == sim.name:
+                sim.reasons.append("Recently used")
+
+            # Check if latest iOS
+            latest_ios = max(s.ios_version for s in self.simulators)
+            if sim.ios_version == latest_ios:
+                sim.reasons.append("Latest iOS")
+
+            # Check if common model
+            for j, model in enumerate(self.COMMON_MODELS):
+                if model in sim.name:
+                    sim.reasons.append(f"#{j+1} common model")
+                    break
+
+            # Check if booted
+            if sim.status == "Booted":
+                sim.reasons.append("Currently running")
+
+        return suggestions
+
+    def _score_simulator(self, sim: SimulatorInfo) -> float:
+        """
+        Score a simulator for ranking.
+
+        Higher score = better recommendation.
+
+        Args:
+            sim: Simulator to score
+
+        Returns:
+            Score value
+        """
+        score = 0.0
+
+        # Recently used gets highest priority (100 points)
+        if self.last_used_simulator and self.last_used_simulator == sim.name:
+            score += 100
+
+        # Latest iOS version (50 points)
+        latest_ios = max(s.ios_version for s in self.simulators)
+        if sim.ios_version == latest_ios:
+            score += 50
+
+        # Common models (30-20 points based on ranking)
+        for i, model in enumerate(self.COMMON_MODELS):
+            if model in sim.name:
+                score += 30 - (i * 2)  # Higher ranking models get more points
+                break
+
+        # Currently booted (10 points)
+        if sim.status == "Booted":
+            score += 10
+
+        # iOS version number (minor factor for breaking ties)
+        ios_numeric = float(sim.ios_version.replace(".", ""))
+        score += ios_numeric * 0.1
+
+        return score
+
+    def boot_simulator(self, udid: str) -> bool:
+        """
+        Boot a simulator.
+
+        Args:
+            udid: Simulator UDID
+
+        Returns:
+            True if successful, False otherwise
+        """
+        try:
+            subprocess.run(
+                ["xcrun", "simctl", "boot", udid],
+                capture_output=True,
+                check=True,
+            )
+            return True
+        except subprocess.CalledProcessError as e:
+            print(f"Error booting simulator: {e.stderr}", file=sys.stderr)
+            return False
+
+
+def format_suggestions(suggestions: list[SimulatorInfo], json_format: bool = False) -> str:
+    """
+    Format suggestions for output.
+
+    Args:
+        suggestions: List of suggestions
+        json_format: If True, output as JSON
+
+    Returns:
+        Formatted string
+    """
+    if json_format:
+        data = {"suggestions": [s.to_dict() for s in suggestions]}
+        return json.dumps(data, indent=2)
+
+    if not suggestions:
+        return "No simulators available"
+
+    lines = ["Available Simulators:\n"]
+    for i, sim in enumerate(suggestions, 1):
+        lines.append(f"{i}. {sim.name} (iOS {sim.ios_version})")
+        if sim.reasons:
+            lines.append(f"   {', '.join(sim.reasons)}")
+        lines.append(f"   UDID: {sim.udid}")
+        lines.append("")
+
+    return "\n".join(lines)
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Intelligent iOS simulator selector",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Get suggestions for user selection
+  python scripts/simulator_selector.py --suggest
+
+  # List all available simulators
+  python scripts/simulator_selector.py --list
+
+  # Boot a specific simulator
+  python scripts/simulator_selector.py --boot <UDID>
+
+  # Get suggestions as JSON
+  python scripts/simulator_selector.py --suggest --json
+        """,
+    )
+
+    parser.add_argument(
+        "--suggest",
+        action="store_true",
+        help="Get top simulator suggestions",
+    )
+    parser.add_argument(
+        "--list",
+        action="store_true",
+        help="List all available simulators",
+    )
+    parser.add_argument(
+        "--boot",
+        metavar="UDID",
+        help="Boot specific simulator by UDID",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="Output as JSON",
+    )
+    parser.add_argument(
+        "--count",
+        type=int,
+        default=4,
+        help="Number of suggestions (default: 4)",
+    )
+
+    args = parser.parse_args()
+
+    selector = SimulatorSelector()
+
+    if args.boot:
+        # Boot specific simulator
+        success = selector.boot_simulator(args.boot)
+        if success:
+            print(f"Booted simulator: {args.boot}")
+            return 0
+        return 1
+
+    if args.list:
+        # List all simulators
+        simulators = selector.list_simulators()
+        output = format_suggestions(simulators, args.json)
+        print(output)
+        return 0
+
+    if args.suggest:
+        # Get suggestions
+        selector.list_simulators()
+        suggestions = selector.get_suggestions(args.count)
+        output = format_suggestions(suggestions, args.json)
+        print(output)
+        return 0
+
+    # Default: show suggestions
+    selector.list_simulators()
+    suggestions = selector.get_suggestions(args.count)
+    output = format_suggestions(suggestions, args.json)
+    print(output)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.claude/skills/ios-simulator-skill/scripts/status_bar.py

@@ -0,0 +1,250 @@
+#!/usr/bin/env python3
+"""
+iOS Status Bar Controller
+
+Override simulator status bar for clean screenshots and testing.
+Control time, network, wifi, battery display.
+
+Usage: python scripts/status_bar.py --preset clean
+"""
+
+import argparse
+import subprocess
+import sys
+
+from common import resolve_udid
+
+
+class StatusBarController:
+    """Controls iOS simulator status bar appearance."""
+
+    # Preset configurations
+    PRESETS = {
+        "clean": {
+            "time": "9:41",
+            "data_network": "5g",
+            "wifi_mode": "active",
+            "battery_state": "charged",
+            "battery_level": 100,
+        },
+        "testing": {
+            "time": "11:11",
+            "data_network": "4g",
+            "wifi_mode": "active",
+            "battery_state": "discharging",
+            "battery_level": 50,
+        },
+        "low_battery": {
+            "time": "9:41",
+            "data_network": "5g",
+            "wifi_mode": "active",
+            "battery_state": "discharging",
+            "battery_level": 20,
+        },
+        "airplane": {
+            "time": "9:41",
+            "data_network": "none",
+            "wifi_mode": "failed",
+            "battery_state": "charged",
+            "battery_level": 100,
+        },
+    }
+
+    def __init__(self, udid: str | None = None):
+        """Initialize status bar controller.
+
+        Args:
+            udid: Optional device UDID (auto-detects booted simulator if None)
+        """
+        self.udid = udid
+
+    def override(
+        self,
+        time: str | None = None,
+        data_network: str | None = None,
+        wifi_mode: str | None = None,
+        battery_state: str | None = None,
+        battery_level: int | None = None,
+    ) -> bool:
+        """
+        Override status bar appearance.
+
+        Args:
+            time: Time in HH:MM format (e.g., "9:41")
+            data_network: Network type (none, 1x, 3g, 4g, 5g, lte, lte-a)
+            wifi_mode: WiFi state (active, searching, failed)
+            battery_state: Battery state (charging, charged, discharging)
+            battery_level: Battery percentage (0-100)
+
+        Returns:
+            Success status
+        """
+        cmd = ["xcrun", "simctl", "status_bar"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.append("override")
+
+        # Add parameters if provided
+        if time:
+            cmd.extend(["--time", time])
+        if data_network:
+            cmd.extend(["--dataNetwork", data_network])
+        if wifi_mode:
+            cmd.extend(["--wifiMode", wifi_mode])
+        if battery_state:
+            cmd.extend(["--batteryState", battery_state])
+        if battery_level is not None:
+            cmd.extend(["--batteryLevel", str(battery_level)])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def clear(self) -> bool:
+        """
+        Clear status bar override and restore defaults.
+
+        Returns:
+            Success status
+        """
+        cmd = ["xcrun", "simctl", "status_bar"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.append("clear")
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(
+        description="Override iOS simulator status bar for screenshots and testing"
+    )
+
+    # Preset option
+    parser.add_argument(
+        "--preset",
+        choices=list(StatusBarController.PRESETS.keys()),
+        help="Use preset configuration (clean, testing, low-battery, airplane)",
+    )
+
+    # Custom options
+    parser.add_argument(
+        "--time",
+        help="Override time (HH:MM format, e.g., '9:41')",
+    )
+    parser.add_argument(
+        "--data-network",
+        choices=["none", "1x", "3g", "4g", "5g", "lte", "lte-a"],
+        help="Data network type",
+    )
+    parser.add_argument(
+        "--wifi-mode",
+        choices=["active", "searching", "failed"],
+        help="WiFi state",
+    )
+    parser.add_argument(
+        "--battery-state",
+        choices=["charging", "charged", "discharging"],
+        help="Battery state",
+    )
+    parser.add_argument(
+        "--battery-level",
+        type=int,
+        help="Battery level 0-100",
+    )
+
+    # Other options
+    parser.add_argument(
+        "--clear",
+        action="store_true",
+        help="Clear status bar override and restore defaults",
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+    controller = StatusBarController(udid=udid)
+
+    # Clear mode
+    if args.clear:
+        if controller.clear():
+            print("Status bar override cleared - defaults restored")
+        else:
+            print("Failed to clear status bar override")
+            sys.exit(1)
+
+    # Preset mode
+    elif args.preset:
+        preset = StatusBarController.PRESETS[args.preset]
+        if controller.override(**preset):
+            print(f"Status bar: {args.preset} preset applied")
+            print(
+                f"  Time: {preset['time']}, "
+                f"Network: {preset['data_network']}, "
+                f"Battery: {preset['battery_level']}%"
+            )
+        else:
+            print(f"Failed to apply {args.preset} preset")
+            sys.exit(1)
+
+    # Custom mode
+    elif any(
+        [
+            args.time,
+            args.data_network,
+            args.wifi_mode,
+            args.battery_state,
+            args.battery_level is not None,
+        ]
+    ):
+        if controller.override(
+            time=args.time,
+            data_network=args.data_network,
+            wifi_mode=args.wifi_mode,
+            battery_state=args.battery_state,
+            battery_level=args.battery_level,
+        ):
+            output = "Status bar override applied:"
+            if args.time:
+                output += f" Time={args.time}"
+            if args.data_network:
+                output += f" Network={args.data_network}"
+            if args.battery_level is not None:
+                output += f" Battery={args.battery_level}%"
+            print(output)
+        else:
+            print("Failed to override status bar")
+            sys.exit(1)
+
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/test_recorder.py

@@ -0,0 +1,323 @@
+#!/usr/bin/env python3
+"""
+Test Recorder for iOS Simulator Testing
+
+Records test execution with automatic screenshots and documentation.
+Optimized for minimal token output during execution.
+
+Usage:
+    As a script: python scripts/test_recorder.py --test-name "Test Name" --output dir/
+    As a module: from scripts.test_recorder import TestRecorder
+"""
+
+import argparse
+import json
+import subprocess
+import time
+from datetime import datetime
+from pathlib import Path
+
+from common import (
+    capture_screenshot,
+    count_elements,
+    generate_screenshot_name,
+    get_accessibility_tree,
+    resolve_udid,
+)
+
+
+class TestRecorder:
+    """Records test execution with screenshots and accessibility snapshots."""
+
+    def __init__(
+        self,
+        test_name: str,
+        output_dir: str = "test-artifacts",
+        udid: str | None = None,
+        inline: bool = False,
+        screenshot_size: str = "half",
+        app_name: str | None = None,
+    ):
+        """
+        Initialize test recorder.
+
+        Args:
+            test_name: Name of the test being recorded
+            output_dir: Directory for test artifacts
+            udid: Optional device UDID (uses booted if not specified)
+            inline: If True, return screenshots as base64 (for vision-based automation)
+            screenshot_size: 'full', 'half', 'quarter', 'thumb' (default: 'half')
+            app_name: App name for semantic screenshot naming
+        """
+        self.test_name = test_name
+        self.udid = udid
+        self.inline = inline
+        self.screenshot_size = screenshot_size
+        self.app_name = app_name
+        self.start_time = time.time()
+        self.steps: list[dict] = []
+        self.current_step = 0
+
+        # Create timestamped output directory
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        safe_name = test_name.lower().replace(" ", "-")
+        self.output_dir = Path(output_dir) / f"{safe_name}-{timestamp}"
+        self.output_dir.mkdir(parents=True, exist_ok=True)
+
+        # Create subdirectories (only if not in inline mode)
+        if not inline:
+            self.screenshots_dir = self.output_dir / "screenshots"
+            self.screenshots_dir.mkdir(exist_ok=True)
+        else:
+            self.screenshots_dir = None
+
+        self.accessibility_dir = self.output_dir / "accessibility"
+        self.accessibility_dir.mkdir(exist_ok=True)
+
+        # Token-efficient output
+        mode_str = "(inline mode)" if inline else ""
+        print(f"Recording: {test_name} {mode_str}")
+        print(f"Output: {self.output_dir}/")
+
+    def step(
+        self,
+        description: str,
+        screen_name: str | None = None,
+        state: str | None = None,
+        assertion: str | None = None,
+        metadata: dict | None = None,
+    ):
+        """
+        Record a test step with automatic screenshot.
+
+        Args:
+            description: Step description
+            screen_name: Screen name for semantic naming
+            state: State description for semantic naming
+            assertion: Optional assertion to verify
+            metadata: Optional metadata for the step
+        """
+        self.current_step += 1
+        step_time = time.time() - self.start_time
+
+        # Capture screenshot using new utility
+        screenshot_result = capture_screenshot(
+            self.udid,
+            size=self.screenshot_size,
+            inline=self.inline,
+            app_name=self.app_name,
+            screen_name=screen_name or description,
+            state=state,
+        )
+
+        # Capture accessibility tree
+        accessibility_path = (
+            self.accessibility_dir
+            / f"{self.current_step:03d}-{description.lower().replace(' ', '-')[:20]}.json"
+        )
+        element_count = self._capture_accessibility(accessibility_path)
+
+        # Store step data
+        step_data = {
+            "number": self.current_step,
+            "description": description,
+            "timestamp": step_time,
+            "element_count": element_count,
+            "accessibility": accessibility_path.name,
+            "screenshot_mode": screenshot_result["mode"],
+            "screenshot_size": self.screenshot_size,
+        }
+
+        # Handle screenshot data based on mode
+        if screenshot_result["mode"] == "file":
+            step_data["screenshot"] = screenshot_result["file_path"]
+            step_data["screenshot_name"] = Path(screenshot_result["file_path"]).name
+        else:
+            # Inline mode
+            step_data["screenshot_base64"] = screenshot_result["base64_data"]
+            step_data["screenshot_dimensions"] = (
+                screenshot_result["width"],
+                screenshot_result["height"],
+            )
+
+        if assertion:
+            step_data["assertion"] = assertion
+            step_data["assertion_passed"] = True
+
+        if metadata:
+            step_data["metadata"] = metadata
+
+        self.steps.append(step_data)
+
+        # Token-efficient output (single line)
+        status = "✓" if not assertion or step_data.get("assertion_passed") else "✗"
+        screenshot_info = (
+            f" [{screenshot_result['width']}x{screenshot_result['height']}]" if self.inline else ""
+        )
+        print(
+            f"{status} Step {self.current_step}: {description} ({step_time:.1f}s){screenshot_info}"
+        )
+
+    def _capture_screenshot(self, output_path: Path) -> bool:
+        """Capture screenshot using simctl."""
+        cmd = ["xcrun", "simctl", "io"]
+
+        if self.udid:
+            cmd.append(self.udid)
+        else:
+            cmd.append("booted")
+
+        cmd.extend(["screenshot", str(output_path)])
+
+        try:
+            subprocess.run(cmd, capture_output=True, check=True)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def _capture_accessibility(self, output_path: Path) -> int:
+        """Capture accessibility tree and return element count."""
+        try:
+            # Use shared utility to fetch tree
+            tree = get_accessibility_tree(self.udid, nested=True)
+
+            # Save tree
+            with open(output_path, "w") as f:
+                json.dump(tree, f, indent=2)
+
+            # Count elements using shared utility
+            return count_elements(tree)
+        except Exception:
+            return 0
+
+    def generate_report(self) -> dict[str, str]:
+        """
+        Generate markdown test report.
+
+        Returns:
+            Dictionary with paths to generated files
+        """
+        duration = time.time() - self.start_time
+        report_path = self.output_dir / "report.md"
+
+        # Generate markdown
+        with open(report_path, "w") as f:
+            f.write(f"# Test Report: {self.test_name}\n\n")
+            f.write(f"**Date:** {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n")
+            f.write(f"**Duration:** {duration:.1f} seconds\n")
+            f.write(f"**Steps:** {len(self.steps)}\n\n")
+
+            # Steps section
+            f.write("## Test Steps\n\n")
+            for step in self.steps:
+                f.write(
+                    f"### Step {step['number']}: {step['description']} ({step['timestamp']:.1f}s)\n\n"
+                )
+                f.write(f"![Screenshot](screenshots/{step['screenshot']})\n\n")
+
+                if step.get("assertion"):
+                    status = "✓" if step.get("assertion_passed") else "✗"
+                    f.write(f"**Assertion:** {step['assertion']} {status}\n\n")
+
+                if step.get("metadata"):
+                    f.write("**Metadata:**\n")
+                    for key, value in step["metadata"].items():
+                        f.write(f"- {key}: {value}\n")
+                    f.write("\n")
+
+                f.write(f"**Accessibility Elements:** {step['element_count']}\n\n")
+                f.write("---\n\n")
+
+            # Summary
+            f.write("## Summary\n\n")
+            f.write(f"- Total steps: {len(self.steps)}\n")
+            f.write(f"- Duration: {duration:.1f}s\n")
+            f.write(f"- Screenshots: {len(self.steps)}\n")
+            f.write(f"- Accessibility snapshots: {len(self.steps)}\n")
+
+        # Save metadata JSON
+        metadata_path = self.output_dir / "metadata.json"
+        with open(metadata_path, "w") as f:
+            json.dump(
+                {
+                    "test_name": self.test_name,
+                    "duration": duration,
+                    "steps": self.steps,
+                    "timestamp": datetime.now().isoformat(),
+                },
+                f,
+                indent=2,
+            )
+
+        # Token-efficient output
+        print(f"Report: {report_path}")
+
+        return {
+            "markdown_path": str(report_path),
+            "metadata_path": str(metadata_path),
+            "output_dir": str(self.output_dir),
+        }
+
+
+def main():
+    """Main entry point for command-line usage."""
+    parser = argparse.ArgumentParser(
+        description="Record test execution with screenshots and documentation"
+    )
+    parser.add_argument("--test-name", required=True, help="Name of the test being recorded")
+    parser.add_argument(
+        "--output", default="test-artifacts", help="Output directory for test artifacts"
+    )
+    parser.add_argument(
+        "--udid",
+        help="Device UDID (auto-detects booted simulator if not provided)",
+    )
+    parser.add_argument(
+        "--inline",
+        action="store_true",
+        help="Return screenshots as base64 (inline mode for vision-based automation)",
+    )
+    parser.add_argument(
+        "--size",
+        choices=["full", "half", "quarter", "thumb"],
+        default="half",
+        help="Screenshot size for token optimization (default: half)",
+    )
+    parser.add_argument("--app-name", help="App name for semantic screenshot naming")
+
+    args = parser.parse_args()
+
+    # Resolve UDID with auto-detection
+    try:
+        udid = resolve_udid(args.udid)
+    except RuntimeError as e:
+        print(f"Error: {e}")
+        import sys
+
+        sys.exit(1)
+
+    # Create recorder
+    TestRecorder(
+        test_name=args.test_name,
+        output_dir=args.output,
+        udid=udid,
+        inline=args.inline,
+        screenshot_size=args.size,
+        app_name=args.app_name,
+    )
+
+    print("Test recorder initialized. Use the following methods:")
+    print('  recorder.step("description") - Record a test step')
+    print("  recorder.generate_report() - Generate final report")
+    print()
+    print("Example:")
+    print('  recorder.step("Launch app", screen_name="Splash")')
+    print(
+        '  recorder.step("Enter credentials", screen_name="Login", state="Empty", metadata={"user": "test"})'
+    )
+    print('  recorder.step("Verify login", assertion="Home screen visible")')
+    print("  recorder.generate_report()")
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/visual_diff.py

@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+"""
+Visual Diff Tool for iOS Simulator Screenshots
+
+Compares two screenshots pixel-by-pixel to detect visual changes.
+Optimized for minimal token output.
+
+Usage: python scripts/visual_diff.py baseline.png current.png [options]
+"""
+
+import argparse
+import json
+import os
+import sys
+from pathlib import Path
+
+try:
+    from PIL import Image, ImageChops, ImageDraw
+except ImportError:
+    print("Error: Pillow not installed. Run: pip3 install pillow")
+    sys.exit(1)
+
+
+class VisualDiffer:
+    """Performs visual comparison between screenshots."""
+
+    def __init__(self, threshold: float = 0.01):
+        """
+        Initialize differ with threshold.
+
+        Args:
+            threshold: Maximum acceptable difference ratio (0.01 = 1%)
+        """
+        self.threshold = threshold
+
+    def compare(self, baseline_path: str, current_path: str) -> dict:
+        """
+        Compare two images and return difference metrics.
+
+        Args:
+            baseline_path: Path to baseline image
+            current_path: Path to current image
+
+        Returns:
+            Dictionary with comparison results
+        """
+        # Load images
+        try:
+            baseline = Image.open(baseline_path)
+            current = Image.open(current_path)
+        except FileNotFoundError as e:
+            print(f"Error: Image not found - {e}")
+            sys.exit(1)
+        except Exception as e:
+            print(f"Error: Failed to load image - {e}")
+            sys.exit(1)
+
+        # Verify dimensions match
+        if baseline.size != current.size:
+            return {
+                "error": "Image dimensions do not match",
+                "baseline_size": baseline.size,
+                "current_size": current.size,
+            }
+
+        # Convert to RGB if needed
+        if baseline.mode != "RGB":
+            baseline = baseline.convert("RGB")
+        if current.mode != "RGB":
+            current = current.convert("RGB")
+
+        # Calculate difference
+        diff = ImageChops.difference(baseline, current)
+
+        # Calculate metrics
+        total_pixels = baseline.size[0] * baseline.size[1]
+        diff_pixels = self._count_different_pixels(diff)
+        diff_percentage = (diff_pixels / total_pixels) * 100
+
+        # Determine pass/fail
+        passed = diff_percentage <= (self.threshold * 100)
+
+        return {
+            "dimensions": baseline.size,
+            "total_pixels": total_pixels,
+            "different_pixels": diff_pixels,
+            "difference_percentage": round(diff_percentage, 2),
+            "threshold_percentage": self.threshold * 100,
+            "passed": passed,
+            "verdict": "PASS" if passed else "FAIL",
+        }
+
+    def _count_different_pixels(self, diff_image: Image.Image) -> int:
+        """Count number of pixels that are different."""
+        # Convert to grayscale for easier processing
+        diff_gray = diff_image.convert("L")
+
+        # Count non-zero pixels (different)
+        pixels = diff_gray.getdata()
+        return sum(1 for pixel in pixels if pixel > 10)  # Threshold for noise
+
+    def generate_diff_image(self, baseline_path: str, current_path: str, output_path: str) -> None:
+        """Generate highlighted difference image."""
+        baseline = Image.open(baseline_path).convert("RGB")
+        current = Image.open(current_path).convert("RGB")
+
+        # Create difference image
+        diff = ImageChops.difference(baseline, current)
+
+        # Enhance differences with red overlay
+        diff_enhanced = Image.new("RGB", baseline.size)
+        for x in range(baseline.size[0]):
+            for y in range(baseline.size[1]):
+                diff_pixel = diff.getpixel((x, y))
+                if sum(diff_pixel) > 30:  # Threshold for visibility
+                    # Highlight in red
+                    diff_enhanced.putpixel((x, y), (255, 0, 0))
+                else:
+                    # Keep original
+                    diff_enhanced.putpixel((x, y), current.getpixel((x, y)))
+
+        diff_enhanced.save(output_path)
+
+    def generate_side_by_side(
+        self, baseline_path: str, current_path: str, output_path: str
+    ) -> None:
+        """Generate side-by-side comparison image."""
+        baseline = Image.open(baseline_path)
+        current = Image.open(current_path)
+
+        # Create combined image
+        width = baseline.size[0] * 2 + 10  # 10px separator
+        height = max(baseline.size[1], current.size[1])
+        combined = Image.new("RGB", (width, height), color=(128, 128, 128))
+
+        # Paste images
+        combined.paste(baseline, (0, 0))
+        combined.paste(current, (baseline.size[0] + 10, 0))
+
+        combined.save(output_path)
+
+
+def main():
+    """Main entry point."""
+    parser = argparse.ArgumentParser(description="Compare screenshots for visual differences")
+    parser.add_argument("baseline", help="Path to baseline screenshot")
+    parser.add_argument("current", help="Path to current screenshot")
+    parser.add_argument(
+        "--output",
+        default=".",
+        help="Output directory for diff artifacts (default: current directory)",
+    )
+    parser.add_argument(
+        "--threshold",
+        type=float,
+        default=0.01,
+        help="Acceptable difference threshold (0.01 = 1%%, default: 0.01)",
+    )
+    parser.add_argument(
+        "--details", action="store_true", help="Show detailed output (increases tokens)"
+    )
+
+    args = parser.parse_args()
+
+    # Create output directory if needed
+    output_dir = Path(args.output)
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    # Initialize differ
+    differ = VisualDiffer(threshold=args.threshold)
+
+    # Perform comparison
+    result = differ.compare(args.baseline, args.current)
+
+    # Handle dimension mismatch
+    if "error" in result:
+        print(f"Error: {result['error']}")
+        print(f"Baseline: {result['baseline_size']}")
+        print(f"Current: {result['current_size']}")
+        sys.exit(1)
+
+    # Generate artifacts
+    diff_image_path = output_dir / "diff.png"
+    comparison_image_path = output_dir / "side-by-side.png"
+
+    try:
+        differ.generate_diff_image(args.baseline, args.current, str(diff_image_path))
+        differ.generate_side_by_side(args.baseline, args.current, str(comparison_image_path))
+    except Exception as e:
+        print(f"Warning: Could not generate images - {e}")
+
+    # Output results (token-optimized)
+    if args.details:
+        # Detailed output
+        report = {
+            "summary": {
+                "baseline": args.baseline,
+                "current": args.current,
+                "threshold": args.threshold,
+                "passed": result["passed"],
+            },
+            "results": result,
+            "artifacts": {
+                "diff_image": str(diff_image_path),
+                "comparison_image": str(comparison_image_path),
+            },
+        }
+        print(json.dumps(report, indent=2))
+    else:
+        # Minimal output (default)
+        print(f"Difference: {result['difference_percentage']}% ({result['verdict']})")
+        if result["different_pixels"] > 0:
+            print(f"Changed pixels: {result['different_pixels']:,}")
+        print(f"Artifacts saved to: {output_dir}/")
+
+    # Save JSON report
+    report_path = output_dir / "diff-report.json"
+    with open(report_path, "w") as f:
+        json.dump(
+            {
+                "baseline": os.path.basename(args.baseline),
+                "current": os.path.basename(args.current),
+                "results": result,
+                "artifacts": {"diff": "diff.png", "comparison": "side-by-side.png"},
+            },
+            f,
+            indent=2,
+        )
+
+    # Exit with error if test failed
+    sys.exit(0 if result["passed"] else 1)
+
+
+if __name__ == "__main__":
+    main()

.claude/skills/ios-simulator-skill/scripts/xcode/__init__.py

@@ -0,0 +1,13 @@
+"""
+Xcode build automation module.
+
+Provides structured, modular access to xcodebuild and xcresult functionality.
+"""
+
+from .builder import BuildRunner
+from .cache import XCResultCache
+from .config import Config
+from .reporter import OutputFormatter
+from .xcresult import XCResultParser
+
+__all__ = ["BuildRunner", "Config", "OutputFormatter", "XCResultCache", "XCResultParser"]

.claude/skills/ios-simulator-skill/scripts/xcode/builder.py

@@ -0,0 +1,381 @@
+"""
+Xcode build execution.
+
+Handles xcodebuild command construction and execution with xcresult generation.
+"""
+
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+from .cache import XCResultCache
+from .config import Config
+
+
+class BuildRunner:
+    """
+    Execute xcodebuild commands with xcresult bundle generation.
+
+    Handles scheme auto-detection, command construction, and build/test execution.
+    """
+
+    def __init__(
+        self,
+        project_path: str | None = None,
+        workspace_path: str | None = None,
+        scheme: str | None = None,
+        configuration: str = "Debug",
+        simulator: str | None = None,
+        cache: XCResultCache | None = None,
+    ):
+        """
+        Initialize build runner.
+
+        Args:
+            project_path: Path to .xcodeproj
+            workspace_path: Path to .xcworkspace
+            scheme: Build scheme (auto-detected if not provided)
+            configuration: Build configuration (Debug/Release)
+            simulator: Simulator name
+            cache: XCResult cache (creates default if not provided)
+        """
+        self.project_path = project_path
+        self.workspace_path = workspace_path
+        self.scheme = scheme
+        self.configuration = configuration
+        self.simulator = simulator
+        self.cache = cache or XCResultCache()
+
+    def auto_detect_scheme(self) -> str | None:
+        """
+        Auto-detect build scheme from project/workspace.
+
+        Returns:
+            Detected scheme name or None
+        """
+        cmd = ["xcodebuild", "-list"]
+
+        if self.workspace_path:
+            cmd.extend(["-workspace", self.workspace_path])
+        elif self.project_path:
+            cmd.extend(["-project", self.project_path])
+        else:
+            return None
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            # Parse schemes from output
+            in_schemes_section = False
+            for line in result.stdout.split("\n"):
+                line = line.strip()
+
+                if "Schemes:" in line:
+                    in_schemes_section = True
+                    continue
+
+                if in_schemes_section and line and not line.startswith("Build"):
+                    # First scheme in list
+                    return line
+
+        except subprocess.CalledProcessError as e:
+            print(f"Error auto-detecting scheme: {e}", file=sys.stderr)
+
+        return None
+
+    def get_simulator_destination(self) -> str:
+        """
+        Get xcodebuild destination string.
+
+        Uses config preferences with fallback to auto-detection.
+
+        Priority:
+            1. --simulator CLI flag (self.simulator)
+            2. Config preferred_simulator
+            3. Config last_used_simulator
+            4. Auto-detect first iPhone
+            5. Generic iOS Simulator
+
+        Returns:
+            Destination string for -destination flag
+        """
+        # Priority 1: CLI flag
+        if self.simulator:
+            return f"platform=iOS Simulator,name={self.simulator}"
+
+        # Priority 2-3: Config preferences
+        try:
+            # Determine project directory from project/workspace path
+            project_dir = None
+            if self.project_path:
+                project_dir = Path(self.project_path).parent
+            elif self.workspace_path:
+                project_dir = Path(self.workspace_path).parent
+
+            config = Config.load(project_dir=project_dir)
+            preferred = config.get_preferred_simulator()
+
+            if preferred:
+                # Check if preferred simulator exists
+                if self._simulator_exists(preferred):
+                    return f"platform=iOS Simulator,name={preferred}"
+                print(f"Warning: Preferred simulator '{preferred}' not available", file=sys.stderr)
+                if config.should_fallback_to_any_iphone():
+                    print("Falling back to auto-detection...", file=sys.stderr)
+                else:
+                    # Strict mode: don't fallback
+                    return f"platform=iOS Simulator,name={preferred}"
+
+        except Exception as e:
+            print(f"Warning: Could not load config: {e}", file=sys.stderr)
+
+        # Priority 4-5: Auto-detect
+        return self._auto_detect_simulator()
+
+    def _simulator_exists(self, name: str) -> bool:
+        """
+        Check if simulator with given name exists and is available.
+
+        Args:
+            name: Simulator name (e.g., "iPhone 16 Pro")
+
+        Returns:
+            True if simulator exists and is available
+        """
+        try:
+            result = subprocess.run(
+                ["xcrun", "simctl", "list", "devices", "available", "iOS"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+
+            # Check if simulator name appears in available devices
+            return any(name in line and "(" in line for line in result.stdout.split("\n"))
+
+        except subprocess.CalledProcessError:
+            return False
+
+    def _extract_simulator_name_from_destination(self, destination: str) -> str | None:
+        """
+        Extract simulator name from destination string.
+
+        Args:
+            destination: Destination string (e.g., "platform=iOS Simulator,name=iPhone 16 Pro")
+
+        Returns:
+            Simulator name or None
+        """
+        # Pattern: name=<simulator name>
+        match = re.search(r"name=([^,]+)", destination)
+        if match:
+            return match.group(1).strip()
+        return None
+
+    def _auto_detect_simulator(self) -> str:
+        """
+        Auto-detect best available iOS simulator.
+
+        Returns:
+            Destination string for -destination flag
+        """
+        try:
+            result = subprocess.run(
+                ["xcrun", "simctl", "list", "devices", "available", "iOS"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+
+            # Parse available simulators, prefer latest iPhone
+            # Looking for lines like: "iPhone 16 Pro (12345678-1234-1234-1234-123456789012) (Shutdown)"
+            for line in result.stdout.split("\n"):
+                if "iPhone" in line and "(" in line:
+                    # Extract device name
+                    name = line.split("(")[0].strip()
+                    if name:
+                        return f"platform=iOS Simulator,name={name}"
+
+            # Fallback to generic iOS Simulator if no iPhone found
+            return "generic/platform=iOS Simulator"
+
+        except subprocess.CalledProcessError as e:
+            print(f"Warning: Could not auto-detect simulator: {e}", file=sys.stderr)
+            return "generic/platform=iOS Simulator"
+
+    def build(self, clean: bool = False) -> tuple[bool, str, str]:
+        """
+        Build the project.
+
+        Args:
+            clean: Perform clean build
+
+        Returns:
+            Tuple of (success: bool, xcresult_id: str, stderr: str)
+        """
+        # Auto-detect scheme if needed
+        if not self.scheme:
+            self.scheme = self.auto_detect_scheme()
+            if not self.scheme:
+                print("Error: Could not auto-detect scheme. Use --scheme", file=sys.stderr)
+                return (False, "", "")
+
+        # Generate xcresult ID and path
+        xcresult_id = self.cache.generate_id()
+        xcresult_path = self.cache.get_path(xcresult_id)
+
+        # Build command
+        cmd = ["xcodebuild", "-quiet"]  # Suppress verbose output
+
+        if clean:
+            cmd.append("clean")
+
+        cmd.append("build")
+
+        if self.workspace_path:
+            cmd.extend(["-workspace", self.workspace_path])
+        elif self.project_path:
+            cmd.extend(["-project", self.project_path])
+        else:
+            print("Error: No project or workspace specified", file=sys.stderr)
+            return (False, "", "")
+
+        cmd.extend(
+            [
+                "-scheme",
+                self.scheme,
+                "-configuration",
+                self.configuration,
+                "-destination",
+                self.get_simulator_destination(),
+                "-resultBundlePath",
+                str(xcresult_path),
+            ]
+        )
+
+        # Execute build
+        try:
+            result = subprocess.run(
+                cmd, capture_output=True, text=True, check=False  # Don't raise on non-zero exit
+            )
+
+            success = result.returncode == 0
+
+            # xcresult bundle should be created even on failure
+            if not xcresult_path.exists():
+                print("Warning: xcresult bundle was not created", file=sys.stderr)
+                return (success, "", result.stderr)
+
+            # Auto-update config with last used simulator (on success only)
+            if success:
+                try:
+                    # Determine project directory from project/workspace path
+                    project_dir = None
+                    if self.project_path:
+                        project_dir = Path(self.project_path).parent
+                    elif self.workspace_path:
+                        project_dir = Path(self.workspace_path).parent
+
+                    config = Config.load(project_dir=project_dir)
+                    destination = self.get_simulator_destination()
+                    simulator_name = self._extract_simulator_name_from_destination(destination)
+
+                    if simulator_name:
+                        config.update_last_used_simulator(simulator_name)
+                        config.save()
+
+                except Exception as e:
+                    # Don't fail build if config update fails
+                    print(f"Warning: Could not update config: {e}", file=sys.stderr)
+
+            return (success, xcresult_id, result.stderr)
+
+        except Exception as e:
+            print(f"Error executing build: {e}", file=sys.stderr)
+            return (False, "", str(e))
+
+    def test(self, test_suite: str | None = None) -> tuple[bool, str, str]:
+        """
+        Run tests.
+
+        Args:
+            test_suite: Specific test suite to run
+
+        Returns:
+            Tuple of (success: bool, xcresult_id: str, stderr: str)
+        """
+        # Auto-detect scheme if needed
+        if not self.scheme:
+            self.scheme = self.auto_detect_scheme()
+            if not self.scheme:
+                print("Error: Could not auto-detect scheme. Use --scheme", file=sys.stderr)
+                return (False, "", "")
+
+        # Generate xcresult ID and path
+        xcresult_id = self.cache.generate_id()
+        xcresult_path = self.cache.get_path(xcresult_id)
+
+        # Build command
+        cmd = ["xcodebuild", "-quiet", "test"]
+
+        if self.workspace_path:
+            cmd.extend(["-workspace", self.workspace_path])
+        elif self.project_path:
+            cmd.extend(["-project", self.project_path])
+        else:
+            print("Error: No project or workspace specified", file=sys.stderr)
+            return (False, "", "")
+
+        cmd.extend(
+            [
+                "-scheme",
+                self.scheme,
+                "-destination",
+                self.get_simulator_destination(),
+                "-resultBundlePath",
+                str(xcresult_path),
+            ]
+        )
+
+        if test_suite:
+            cmd.extend(["-only-testing", test_suite])
+
+        # Execute tests
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=False)
+
+            success = result.returncode == 0
+
+            # xcresult bundle should be created even on failure
+            if not xcresult_path.exists():
+                print("Warning: xcresult bundle was not created", file=sys.stderr)
+                return (success, "", result.stderr)
+
+            # Auto-update config with last used simulator (on success only)
+            if success:
+                try:
+                    # Determine project directory from project/workspace path
+                    project_dir = None
+                    if self.project_path:
+                        project_dir = Path(self.project_path).parent
+                    elif self.workspace_path:
+                        project_dir = Path(self.workspace_path).parent
+
+                    config = Config.load(project_dir=project_dir)
+                    destination = self.get_simulator_destination()
+                    simulator_name = self._extract_simulator_name_from_destination(destination)
+
+                    if simulator_name:
+                        config.update_last_used_simulator(simulator_name)
+                        config.save()
+
+                except Exception as e:
+                    # Don't fail test if config update fails
+                    print(f"Warning: Could not update config: {e}", file=sys.stderr)
+
+            return (success, xcresult_id, result.stderr)
+
+        except Exception as e:
+            print(f"Error executing tests: {e}", file=sys.stderr)
+            return (False, "", str(e))

.claude/skills/ios-simulator-skill/scripts/xcode/cache.py

@@ -0,0 +1,204 @@
+"""
+XCResult cache management.
+
+Handles storage, retrieval, and lifecycle of xcresult bundles for progressive disclosure.
+"""
+
+import shutil
+from datetime import datetime
+from pathlib import Path
+
+
+class XCResultCache:
+    """
+    Manage xcresult bundle cache for progressive disclosure.
+
+    Stores xcresult bundles with timestamp-based IDs and provides
+    retrieval and cleanup operations.
+    """
+
+    # Default cache directory
+    DEFAULT_CACHE_DIR = Path.home() / ".ios-simulator-skill" / "xcresults"
+
+    def __init__(self, cache_dir: Path | None = None):
+        """
+        Initialize cache manager.
+
+        Args:
+            cache_dir: Custom cache directory (uses default if not specified)
+        """
+        self.cache_dir = cache_dir or self.DEFAULT_CACHE_DIR
+        self.cache_dir.mkdir(parents=True, exist_ok=True)
+
+    def generate_id(self, prefix: str = "xcresult") -> str:
+        """
+        Generate timestamped xcresult ID.
+
+        Args:
+            prefix: ID prefix (default: "xcresult")
+
+        Returns:
+            ID string like "xcresult-20251018-143052"
+        """
+        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        return f"{prefix}-{timestamp}"
+
+    def get_path(self, xcresult_id: str) -> Path:
+        """
+        Get full path for xcresult ID.
+
+        Args:
+            xcresult_id: XCResult ID
+
+        Returns:
+            Path to xcresult bundle
+        """
+        # Handle both with and without .xcresult extension
+        if xcresult_id.endswith(".xcresult"):
+            return self.cache_dir / xcresult_id
+        return self.cache_dir / f"{xcresult_id}.xcresult"
+
+    def exists(self, xcresult_id: str) -> bool:
+        """
+        Check if xcresult bundle exists.
+
+        Args:
+            xcresult_id: XCResult ID
+
+        Returns:
+            True if bundle exists
+        """
+        return self.get_path(xcresult_id).exists()
+
+    def save(self, source_path: Path, xcresult_id: str | None = None) -> str:
+        """
+        Save xcresult bundle to cache.
+
+        Args:
+            source_path: Source xcresult bundle path
+            xcresult_id: Optional custom ID (generates if not provided)
+
+        Returns:
+            xcresult ID
+        """
+        if not source_path.exists():
+            raise FileNotFoundError(f"Source xcresult not found: {source_path}")
+
+        # Generate ID if not provided
+        if not xcresult_id:
+            xcresult_id = self.generate_id()
+
+        # Get destination path
+        dest_path = self.get_path(xcresult_id)
+
+        # Copy xcresult bundle (it's a directory)
+        if dest_path.exists():
+            shutil.rmtree(dest_path)
+
+        shutil.copytree(source_path, dest_path)
+
+        return xcresult_id
+
+    def list(self, limit: int = 10) -> list[dict]:
+        """
+        List recent xcresult bundles.
+
+        Args:
+            limit: Maximum number to return
+
+        Returns:
+            List of xcresult metadata dicts
+        """
+        if not self.cache_dir.exists():
+            return []
+
+        results = []
+        for path in sorted(
+            self.cache_dir.glob("*.xcresult"), key=lambda p: p.stat().st_mtime, reverse=True
+        )[:limit]:
+            # Calculate bundle size
+            size_bytes = sum(f.stat().st_size for f in path.rglob("*") if f.is_file())
+
+            results.append(
+                {
+                    "id": path.stem,
+                    "path": str(path),
+                    "created": datetime.fromtimestamp(path.stat().st_mtime).isoformat(),
+                    "size_mb": round(size_bytes / (1024 * 1024), 2),
+                }
+            )
+
+        return results
+
+    def cleanup(self, keep_recent: int = 20) -> int:
+        """
+        Clean up old xcresult bundles.
+
+        Args:
+            keep_recent: Number of recent bundles to keep
+
+        Returns:
+            Number of bundles removed
+        """
+        if not self.cache_dir.exists():
+            return 0
+
+        # Get all bundles sorted by modification time
+        all_bundles = sorted(
+            self.cache_dir.glob("*.xcresult"), key=lambda p: p.stat().st_mtime, reverse=True
+        )
+
+        # Remove old bundles
+        removed = 0
+        for bundle_path in all_bundles[keep_recent:]:
+            shutil.rmtree(bundle_path)
+            removed += 1
+
+        return removed
+
+    def get_size_mb(self, xcresult_id: str) -> float:
+        """
+        Get size of xcresult bundle in MB.
+
+        Args:
+            xcresult_id: XCResult ID
+
+        Returns:
+            Size in MB
+        """
+        path = self.get_path(xcresult_id)
+        if not path.exists():
+            return 0.0
+
+        size_bytes = sum(f.stat().st_size for f in path.rglob("*") if f.is_file())
+        return round(size_bytes / (1024 * 1024), 2)
+
+    def save_stderr(self, xcresult_id: str, stderr: str) -> None:
+        """
+        Save stderr output alongside xcresult bundle.
+
+        Args:
+            xcresult_id: XCResult ID
+            stderr: stderr output from xcodebuild
+        """
+        if not stderr:
+            return
+
+        stderr_path = self.cache_dir / f"{xcresult_id}.stderr"
+        stderr_path.write_text(stderr, encoding="utf-8")
+
+    def get_stderr(self, xcresult_id: str) -> str:
+        """
+        Retrieve cached stderr output.
+
+        Args:
+            xcresult_id: XCResult ID
+
+        Returns:
+            stderr content or empty string if not found
+        """
+        stderr_path = self.cache_dir / f"{xcresult_id}.stderr"
+        if not stderr_path.exists():
+            return ""
+
+        return stderr_path.read_text(encoding="utf-8")

.claude/skills/ios-simulator-skill/scripts/xcode/config.py

@@ -0,0 +1,178 @@
+"""
+Configuration management for iOS Simulator Skill.
+
+Handles loading, validation, and auto-updating of project-local config files.
+"""
+
+import json
+import sys
+from datetime import datetime
+from pathlib import Path
+from typing import Any
+
+
+class Config:
+    """
+    Project-local configuration with auto-learning.
+
+    Config file location: .claude/skills/<skill-directory-name>/config.json
+
+    The skill directory name is auto-detected from the installation location,
+    so configs work regardless of what users name the skill directory.
+
+    Auto-updates last_used_simulator after successful builds.
+    """
+
+    DEFAULT_CONFIG = {
+        "device": {
+            "preferred_simulator": None,
+            "preferred_os_version": None,
+            "fallback_to_any_iphone": True,
+            "last_used_simulator": None,
+            "last_used_at": None,
+        }
+    }
+
+    def __init__(self, data: dict[str, Any], config_path: Path):
+        """
+        Initialize config.
+
+        Args:
+            data: Config data dict
+            config_path: Path to config file
+        """
+        self.data = data
+        self.config_path = config_path
+
+    @staticmethod
+    def load(project_dir: Path | None = None) -> "Config":
+        """
+        Load config from project directory.
+
+        Args:
+            project_dir: Project root (defaults to cwd)
+
+        Returns:
+            Config instance (creates default if not found)
+
+        Note:
+            The skill directory name is auto-detected from the installation location,
+            so configs work regardless of what users name the skill directory.
+        """
+        if project_dir is None:
+            project_dir = Path.cwd()
+
+        # Auto-detect skill directory name from actual installation location
+        # This file is at: skill/scripts/xcode/config.py
+        # Navigate up to skill/ directory and use its name
+        skill_root = Path(__file__).parent.parent.parent  # xcode/ -> scripts/ -> skill/
+        skill_name = skill_root.name
+
+        config_path = project_dir / ".claude" / "skills" / skill_name / "config.json"
+
+        # Load existing config
+        if config_path.exists():
+            try:
+                with open(config_path) as f:
+                    data = json.load(f)
+
+                # Merge with defaults (in case new fields added)
+                merged = Config._merge_with_defaults(data)
+                return Config(merged, config_path)
+
+            except json.JSONDecodeError as e:
+                print(f"Warning: Invalid JSON in {config_path}: {e}", file=sys.stderr)
+                print("Using default config", file=sys.stderr)
+                return Config(Config.DEFAULT_CONFIG.copy(), config_path)
+            except Exception as e:
+                print(f"Warning: Could not load config: {e}", file=sys.stderr)
+                return Config(Config.DEFAULT_CONFIG.copy(), config_path)
+
+        # Return default config (will be created on first save)
+        return Config(Config.DEFAULT_CONFIG.copy(), config_path)
+
+    @staticmethod
+    def _merge_with_defaults(data: dict[str, Any]) -> dict[str, Any]:
+        """
+        Merge user config with defaults.
+
+        Args:
+            data: User config data
+
+        Returns:
+            Merged config with all default fields
+        """
+        merged = Config.DEFAULT_CONFIG.copy()
+
+        # Deep merge device section
+        if "device" in data:
+            merged["device"].update(data["device"])
+
+        return merged
+
+    def save(self) -> None:
+        """
+        Save config to file atomically.
+
+        Uses temp file + rename for atomic writes.
+        Creates parent directories if needed.
+        """
+        try:
+            # Create parent directories
+            self.config_path.parent.mkdir(parents=True, exist_ok=True)
+
+            # Atomic write: temp file + rename
+            temp_path = self.config_path.with_suffix(".tmp")
+
+            with open(temp_path, "w") as f:
+                json.dump(self.data, f, indent=2)
+                f.write("\n")  # Trailing newline
+
+            # Atomic rename
+            temp_path.replace(self.config_path)
+
+        except Exception as e:
+            print(f"Warning: Could not save config: {e}", file=sys.stderr)
+
+    def update_last_used_simulator(self, name: str) -> None:
+        """
+        Update last used simulator and timestamp.
+
+        Args:
+            name: Simulator name (e.g., "iPhone 16 Pro")
+        """
+        self.data["device"]["last_used_simulator"] = name
+        self.data["device"]["last_used_at"] = datetime.utcnow().isoformat() + "Z"
+
+    def get_preferred_simulator(self) -> str | None:
+        """
+        Get preferred simulator.
+
+        Returns:
+            Simulator name or None
+
+        Priority:
+            1. preferred_simulator (manual preference)
+            2. last_used_simulator (auto-learned)
+            3. None (use auto-detection)
+        """
+        device = self.data.get("device", {})
+
+        # Manual preference takes priority
+        if device.get("preferred_simulator"):
+            return device["preferred_simulator"]
+
+        # Auto-learned preference
+        if device.get("last_used_simulator"):
+            return device["last_used_simulator"]
+
+        return None
+
+    def should_fallback_to_any_iphone(self) -> bool:
+        """
+        Check if fallback to any iPhone is enabled.
+
+        Returns:
+            True if should fallback, False otherwise
+        """
+        return self.data.get("device", {}).get("fallback_to_any_iphone", True)

.claude/skills/ios-simulator-skill/scripts/xcode/reporter.py

@@ -0,0 +1,291 @@
+"""
+Build/test output formatting.
+
+Provides multiple output formats with progressive disclosure support.
+"""
+
+import json
+
+
+class OutputFormatter:
+    """
+    Format build/test results for display.
+
+    Supports ultra-minimal default output, verbose mode, and JSON output.
+    """
+
+    @staticmethod
+    def format_minimal(
+        status: str,
+        error_count: int,
+        warning_count: int,
+        xcresult_id: str,
+        test_info: dict | None = None,
+        hints: list[str] | None = None,
+    ) -> str:
+        """
+        Format ultra-minimal output (5-10 tokens).
+
+        Args:
+            status: Build status (SUCCESS/FAILED)
+            error_count: Number of errors
+            warning_count: Number of warnings
+            xcresult_id: XCResult bundle ID
+            test_info: Optional test results dict
+            hints: Optional list of actionable hints
+
+        Returns:
+            Minimal formatted string
+
+        Example:
+            Build: SUCCESS (0 errors, 3 warnings) [xcresult-20251018-143052]
+            Tests: PASS (12/12 passed, 4.2s) [xcresult-20251018-143052]
+        """
+        lines = []
+
+        if test_info:
+            # Test mode
+            total = test_info.get("total", 0)
+            passed = test_info.get("passed", 0)
+            failed = test_info.get("failed", 0)
+            duration = test_info.get("duration", 0.0)
+
+            test_status = "PASS" if failed == 0 else "FAIL"
+            lines.append(
+                f"Tests: {test_status} ({passed}/{total} passed, {duration:.1f}s) [{xcresult_id}]"
+            )
+        else:
+            # Build mode
+            lines.append(
+                f"Build: {status} ({error_count} errors, {warning_count} warnings) [{xcresult_id}]"
+            )
+
+        # Add hints if provided and build failed
+        if hints and status == "FAILED":
+            lines.append("")
+            lines.extend(hints)
+
+        return "\n".join(lines)
+
+    @staticmethod
+    def format_errors(errors: list[dict], limit: int = 10) -> str:
+        """
+        Format error details.
+
+        Args:
+            errors: List of error dicts
+            limit: Maximum errors to show
+
+        Returns:
+            Formatted error list
+        """
+        if not errors:
+            return "No errors found."
+
+        lines = [f"Errors ({len(errors)}):"]
+        lines.append("")
+
+        for i, error in enumerate(errors[:limit], 1):
+            message = error.get("message", "Unknown error")
+            location = error.get("location", {})
+
+            # Format location
+            loc_parts = []
+            if location.get("file"):
+                file_path = location["file"].replace("file://", "")
+                loc_parts.append(file_path)
+            if location.get("line"):
+                loc_parts.append(f"line {location['line']}")
+
+            location_str = ":".join(loc_parts) if loc_parts else "unknown location"
+
+            lines.append(f"{i}. {message}")
+            lines.append(f"   Location: {location_str}")
+            lines.append("")
+
+        if len(errors) > limit:
+            lines.append(f"... and {len(errors) - limit} more errors")
+
+        return "\n".join(lines)
+
+    @staticmethod
+    def format_warnings(warnings: list[dict], limit: int = 10) -> str:
+        """
+        Format warning details.
+
+        Args:
+            warnings: List of warning dicts
+            limit: Maximum warnings to show
+
+        Returns:
+            Formatted warning list
+        """
+        if not warnings:
+            return "No warnings found."
+
+        lines = [f"Warnings ({len(warnings)}):"]
+        lines.append("")
+
+        for i, warning in enumerate(warnings[:limit], 1):
+            message = warning.get("message", "Unknown warning")
+            location = warning.get("location", {})
+
+            # Format location
+            loc_parts = []
+            if location.get("file"):
+                file_path = location["file"].replace("file://", "")
+                loc_parts.append(file_path)
+            if location.get("line"):
+                loc_parts.append(f"line {location['line']}")
+
+            location_str = ":".join(loc_parts) if loc_parts else "unknown location"
+
+            lines.append(f"{i}. {message}")
+            lines.append(f"   Location: {location_str}")
+            lines.append("")
+
+        if len(warnings) > limit:
+            lines.append(f"... and {len(warnings) - limit} more warnings")
+
+        return "\n".join(lines)
+
+    @staticmethod
+    def format_log(log: str, lines: int = 50) -> str:
+        """
+        Format build log (show last N lines).
+
+        Args:
+            log: Full build log
+            lines: Number of lines to show
+
+        Returns:
+            Formatted log excerpt
+        """
+        if not log:
+            return "No build log available."
+
+        log_lines = log.strip().split("\n")
+
+        if len(log_lines) <= lines:
+            return log
+
+        # Show last N lines
+        excerpt = log_lines[-lines:]
+        return f"... (showing last {lines} lines of {len(log_lines)})\n\n" + "\n".join(excerpt)
+
+    @staticmethod
+    def format_json(data: dict) -> str:
+        """
+        Format data as JSON.
+
+        Args:
+            data: Data to format
+
+        Returns:
+            Pretty-printed JSON string
+        """
+        return json.dumps(data, indent=2)
+
+    @staticmethod
+    def generate_hints(errors: list[dict]) -> list[str]:
+        """
+        Generate actionable hints based on error types.
+
+        Args:
+            errors: List of error dicts
+
+        Returns:
+            List of hint strings
+        """
+        hints = []
+        error_types: set[str] = set()
+
+        # Collect error types
+        for error in errors:
+            error_type = error.get("type", "unknown")
+            error_types.add(error_type)
+
+        # Generate hints based on error types
+        if "provisioning" in error_types:
+            hints.append("Provisioning profile issue detected:")
+            hints.append("  • Ensure you have a valid provisioning profile for iOS Simulator")
+            hints.append(
+                '  • For simulator builds, use CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO'
+            )
+            hints.append("  • Or specify simulator explicitly: --simulator 'iPhone 16 Pro'")
+
+        if "signing" in error_types:
+            hints.append("Code signing issue detected:")
+            hints.append("  • For simulator builds, code signing is not required")
+            hints.append("  • Ensure build settings target iOS Simulator, not physical device")
+            hints.append("  • Check destination: platform=iOS Simulator,name=<device>")
+
+        if not error_types or "build" in error_types:
+            # Generic hints when error type is unknown
+            if any("destination" in error.get("message", "").lower() for error in errors):
+                hints.append("Device selection issue detected:")
+                hints.append("  • List available simulators: xcrun simctl list devices available")
+                hints.append("  • Specify simulator: --simulator 'iPhone 16 Pro'")
+
+        return hints
+
+    @staticmethod
+    def format_verbose(
+        status: str,
+        error_count: int,
+        warning_count: int,
+        xcresult_id: str,
+        errors: list[dict] | None = None,
+        warnings: list[dict] | None = None,
+        test_info: dict | None = None,
+    ) -> str:
+        """
+        Format verbose output with error/warning details.
+
+        Args:
+            status: Build status
+            error_count: Error count
+            warning_count: Warning count
+            xcresult_id: XCResult ID
+            errors: Optional error list
+            warnings: Optional warning list
+            test_info: Optional test results
+
+        Returns:
+            Verbose formatted output
+        """
+        lines = []
+
+        # Header
+        if test_info:
+            total = test_info.get("total", 0)
+            passed = test_info.get("passed", 0)
+            failed = test_info.get("failed", 0)
+            duration = test_info.get("duration", 0.0)
+
+            test_status = "PASS" if failed == 0 else "FAIL"
+            lines.append(f"Tests: {test_status}")
+            lines.append(f"  Total: {total}")
+            lines.append(f"  Passed: {passed}")
+            lines.append(f"  Failed: {failed}")
+            lines.append(f"  Duration: {duration:.1f}s")
+        else:
+            lines.append(f"Build: {status}")
+
+        lines.append(f"XCResult: {xcresult_id}")
+        lines.append("")
+
+        # Errors
+        if errors and len(errors) > 0:
+            lines.append(OutputFormatter.format_errors(errors, limit=5))
+            lines.append("")
+
+        # Warnings
+        if warnings and len(warnings) > 0:
+            lines.append(OutputFormatter.format_warnings(warnings, limit=5))
+            lines.append("")
+
+        # Summary
+        lines.append(f"Summary: {error_count} errors, {warning_count} warnings")
+
+        return "\n".join(lines)

.claude/skills/ios-simulator-skill/scripts/xcode/xcresult.py

@@ -0,0 +1,404 @@
+"""
+XCResult bundle parser.
+
+Extracts structured data from xcresult bundles using xcresulttool.
+"""
+
+import json
+import re
+import subprocess
+import sys
+from pathlib import Path
+from typing import Any
+
+
+class XCResultParser:
+    """
+    Parse xcresult bundles to extract build/test data.
+
+    Uses xcresulttool to extract structured JSON data from Apple's
+    xcresult bundle format.
+    """
+
+    def __init__(self, xcresult_path: Path, stderr: str = ""):
+        """
+        Initialize parser.
+
+        Args:
+            xcresult_path: Path to xcresult bundle
+            stderr: Optional stderr output for fallback parsing
+        """
+        self.xcresult_path = xcresult_path
+        self.stderr = stderr
+
+        if xcresult_path and not xcresult_path.exists():
+            raise FileNotFoundError(f"XCResult bundle not found: {xcresult_path}")
+
+    def get_build_results(self) -> dict | None:
+        """
+        Get build results as JSON.
+
+        Returns:
+            Parsed JSON dict or None on error
+        """
+        return self._run_xcresulttool(["get", "build-results"])
+
+    def get_test_results(self) -> dict | None:
+        """
+        Get test results summary as JSON.
+
+        Returns:
+            Parsed JSON dict or None on error
+        """
+        return self._run_xcresulttool(["get", "test-results", "summary"])
+
+    def get_build_log(self) -> str | None:
+        """
+        Get build log as plain text.
+
+        Returns:
+            Build log string or None on error
+        """
+        result = self._run_xcresulttool(["get", "log", "--type", "build"], parse_json=False)
+        return result if result else None
+
+    def count_issues(self) -> tuple[int, int]:
+        """
+        Count errors and warnings from build results.
+
+        Returns:
+            Tuple of (error_count, warning_count)
+        """
+        error_count = 0
+        warning_count = 0
+
+        build_results = self.get_build_results()
+
+        if build_results:
+            try:
+                # Try top-level errors/warnings first (newer xcresult format)
+                if "errors" in build_results and isinstance(build_results.get("errors"), list):
+                    error_count = len(build_results["errors"])
+                if "warnings" in build_results and isinstance(build_results.get("warnings"), list):
+                    warning_count = len(build_results["warnings"])
+
+                # If not found, try legacy format: actions[0].buildResult.issues
+                if error_count == 0 and warning_count == 0:
+                    actions = build_results.get("actions", {}).get("_values", [])
+                    if actions:
+                        build_result = actions[0].get("buildResult", {})
+                        issues = build_result.get("issues", {})
+
+                        # Count errors
+                        error_summaries = issues.get("errorSummaries", {}).get("_values", [])
+                        error_count = len(error_summaries)
+
+                        # Count warnings
+                        warning_summaries = issues.get("warningSummaries", {}).get("_values", [])
+                        warning_count = len(warning_summaries)
+
+            except (KeyError, IndexError, TypeError) as e:
+                print(f"Warning: Could not parse issue counts from xcresult: {e}", file=sys.stderr)
+
+        # If no errors found in xcresult but stderr available, count stderr errors
+        if error_count == 0 and self.stderr:
+            stderr_errors = self._parse_stderr_errors()
+            error_count = len(stderr_errors)
+
+        return (error_count, warning_count)
+
+    def get_errors(self) -> list[dict]:
+        """
+        Get detailed error information.
+
+        Returns:
+            List of error dicts with message, file, line info
+        """
+        build_results = self.get_build_results()
+        errors = []
+
+        # Try to get errors from xcresult
+        if build_results:
+            try:
+                # Try top-level errors first (newer xcresult format)
+                if "errors" in build_results and isinstance(build_results.get("errors"), list):
+                    for error in build_results["errors"]:
+                        errors.append(
+                            {
+                                "message": error.get("message", "Unknown error"),
+                                "type": error.get("issueType", "error"),
+                                "location": self._extract_location_from_url(error.get("sourceURL")),
+                            }
+                        )
+
+                # If not found, try legacy format: actions[0].buildResult.issues
+                if not errors:
+                    actions = build_results.get("actions", {}).get("_values", [])
+                    if actions:
+                        build_result = actions[0].get("buildResult", {})
+                        issues = build_result.get("issues", {})
+                        error_summaries = issues.get("errorSummaries", {}).get("_values", [])
+
+                        for error in error_summaries:
+                            errors.append(
+                                {
+                                    "message": error.get("message", {}).get(
+                                        "_value", "Unknown error"
+                                    ),
+                                    "type": error.get("issueType", {}).get("_value", "error"),
+                                    "location": self._extract_location(error),
+                                }
+                            )
+
+            except (KeyError, IndexError, TypeError) as e:
+                print(f"Warning: Could not parse errors from xcresult: {e}", file=sys.stderr)
+
+        # If no errors found in xcresult but stderr available, parse stderr
+        if not errors and self.stderr:
+            errors = self._parse_stderr_errors()
+
+        return errors
+
+    def get_warnings(self) -> list[dict]:
+        """
+        Get detailed warning information.
+
+        Returns:
+            List of warning dicts with message, file, line info
+        """
+        build_results = self.get_build_results()
+        if not build_results:
+            return []
+
+        warnings = []
+
+        try:
+            # Try top-level warnings first (newer xcresult format)
+            if "warnings" in build_results and isinstance(build_results.get("warnings"), list):
+                for warning in build_results["warnings"]:
+                    warnings.append(
+                        {
+                            "message": warning.get("message", "Unknown warning"),
+                            "type": warning.get("issueType", "warning"),
+                            "location": self._extract_location_from_url(warning.get("sourceURL")),
+                        }
+                    )
+
+            # If not found, try legacy format: actions[0].buildResult.issues
+            if not warnings:
+                actions = build_results.get("actions", {}).get("_values", [])
+                if not actions:
+                    return []
+
+                build_result = actions[0].get("buildResult", {})
+                issues = build_result.get("issues", {})
+                warning_summaries = issues.get("warningSummaries", {}).get("_values", [])
+
+                for warning in warning_summaries:
+                    warnings.append(
+                        {
+                            "message": warning.get("message", {}).get("_value", "Unknown warning"),
+                            "type": warning.get("issueType", {}).get("_value", "warning"),
+                            "location": self._extract_location(warning),
+                        }
+                    )
+
+        except (KeyError, IndexError, TypeError) as e:
+            print(f"Warning: Could not parse warnings: {e}", file=sys.stderr)
+
+        return warnings
+
+    def _extract_location(self, issue: dict) -> dict:
+        """
+        Extract file location from issue.
+
+        Args:
+            issue: Issue dict from xcresult
+
+        Returns:
+            Location dict with file, line, column
+        """
+        location = {"file": None, "line": None, "column": None}
+
+        try:
+            doc_location = issue.get("documentLocationInCreatingWorkspace", {})
+            location["file"] = doc_location.get("url", {}).get("_value")
+            location["line"] = doc_location.get("startingLineNumber", {}).get("_value")
+            location["column"] = doc_location.get("startingColumnNumber", {}).get("_value")
+        except (KeyError, TypeError):
+            pass
+
+        return location
+
+    def _extract_location_from_url(self, source_url: str | None) -> dict:
+        """
+        Extract file location from sourceURL (newer xcresult format).
+
+        Args:
+            source_url: Source URL like "file:///path/to/file.swift#StartingLineNumber=134&..."
+
+        Returns:
+            Location dict with file, line, column
+        """
+        location = {"file": None, "line": None, "column": None}
+
+        if not source_url:
+            return location
+
+        try:
+            # Split URL and fragment
+            if "#" in source_url:
+                file_part, fragment = source_url.split("#", 1)
+
+                # Extract file path
+                location["file"] = file_part.replace("file://", "")
+
+                # Parse fragment parameters
+                params = {}
+                for param in fragment.split("&"):
+                    if "=" in param:
+                        key, value = param.split("=", 1)
+                        params[key] = value
+
+                # Extract line and column
+                location["line"] = (
+                    int(params.get("StartingLineNumber", 0)) + 1
+                    if "StartingLineNumber" in params
+                    else None
+                )
+                location["column"] = (
+                    int(params.get("StartingColumnNumber", 0)) + 1
+                    if "StartingColumnNumber" in params
+                    else None
+                )
+            else:
+                # No fragment, just file path
+                location["file"] = source_url.replace("file://", "")
+
+        except (ValueError, AttributeError):
+            pass
+
+        return location
+
+    def _run_xcresulttool(self, args: list[str], parse_json: bool = True) -> Any | None:
+        """
+        Run xcresulttool command.
+
+        Args:
+            args: Command arguments (after 'xcresulttool')
+            parse_json: Whether to parse output as JSON
+
+        Returns:
+            Parsed JSON dict, plain text, or None on error
+        """
+        if not self.xcresult_path:
+            return None
+
+        cmd = ["xcrun", "xcresulttool"] + args + ["--path", str(self.xcresult_path)]
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+
+            if parse_json:
+                return json.loads(result.stdout)
+            return result.stdout
+
+        except subprocess.CalledProcessError as e:
+            print(f"Error running xcresulttool: {e}", file=sys.stderr)
+            print(f"stderr: {e.stderr}", file=sys.stderr)
+            return None
+        except json.JSONDecodeError as e:
+            print(f"Error parsing JSON from xcresulttool: {e}", file=sys.stderr)
+            return None
+
+    def _parse_stderr_errors(self) -> list[dict]:
+        """
+        Parse common errors from stderr output as fallback.
+
+        Returns:
+            List of error dicts parsed from stderr
+        """
+        errors = []
+
+        if not self.stderr:
+            return errors
+
+        # Pattern 0: Swift/Clang compilation errors (e.g., "/path/file.swift:135:59: error: message")
+        compilation_error_pattern = (
+            r"^(?P<file>[^:]+):(?P<line>\d+):(?P<column>\d+):\s*error:\s*(?P<message>.+?)$"
+        )
+        for match in re.finditer(compilation_error_pattern, self.stderr, re.MULTILINE):
+            errors.append(
+                {
+                    "message": match.group("message").strip(),
+                    "type": "compilation",
+                    "location": {
+                        "file": match.group("file"),
+                        "line": int(match.group("line")),
+                        "column": int(match.group("column")),
+                    },
+                }
+            )
+
+        # Pattern 1: xcodebuild top-level errors (e.g., "xcodebuild: error: Unable to find...")
+        xcodebuild_error_pattern = r"xcodebuild:\s*error:\s*(?P<message>.*?)(?:\n\n|\Z)"
+        for match in re.finditer(xcodebuild_error_pattern, self.stderr, re.DOTALL):
+            message = match.group("message").strip()
+            # Clean up multi-line messages
+            message = " ".join(line.strip() for line in message.split("\n") if line.strip())
+            errors.append(
+                {
+                    "message": message,
+                    "type": "build",
+                    "location": {"file": None, "line": None, "column": None},
+                }
+            )
+
+        # Pattern 2: Provisioning profile errors
+        provisioning_pattern = r"error:.*?provisioning profile.*?(?:doesn't|does not|cannot).*?(?P<message>.*?)(?:\n|$)"
+        for match in re.finditer(provisioning_pattern, self.stderr, re.IGNORECASE):
+            errors.append(
+                {
+                    "message": f"Provisioning profile error: {match.group('message').strip()}",
+                    "type": "provisioning",
+                    "location": {"file": None, "line": None, "column": None},
+                }
+            )
+
+        # Pattern 3: Code signing errors
+        signing_pattern = r"error:.*?(?:code sign|signing).*?(?P<message>.*?)(?:\n|$)"
+        for match in re.finditer(signing_pattern, self.stderr, re.IGNORECASE):
+            errors.append(
+                {
+                    "message": f"Code signing error: {match.group('message').strip()}",
+                    "type": "signing",
+                    "location": {"file": None, "line": None, "column": None},
+                }
+            )
+
+        # Pattern 4: Generic compilation errors (but not if already captured)
+        if not errors:
+            generic_error_pattern = r"^(?:\*\*\s)?(?:error|❌):\s*(?P<message>.*?)(?:\n|$)"
+            for match in re.finditer(generic_error_pattern, self.stderr, re.MULTILINE):
+                message = match.group("message").strip()
+                errors.append(
+                    {
+                        "message": message,
+                        "type": "build",
+                        "location": {"file": None, "line": None, "column": None},
+                    }
+                )
+
+        # Pattern 5: Specific "No profiles" error
+        if "No profiles for" in self.stderr:
+            no_profile_pattern = r"No profiles for '(?P<bundle_id>.*?)' were found"
+            for match in re.finditer(no_profile_pattern, self.stderr):
+                errors.append(
+                    {
+                        "message": f"No provisioning profile found for bundle ID '{match.group('bundle_id')}'",
+                        "type": "provisioning",
+                        "location": {"file": None, "line": None, "column": None},
+                    }
+                )
+
+        return errors

.github/workflows/deploy-supabase.yml

@@ -0,0 +1,163 @@
+name: Deploy Supabase to Production
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - 'apps/supabase/**'
+      - 'terraform/**'
+      - '.github/workflows/deploy-supabase.yml'
+
+jobs:
+  deploy-database:
+    name: Deploy Migrations & Functions
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 1
+      matrix:
+        environment:
+          - name: non-prod
+            project_ref: itbzhrvlgvdmzbnhzhyx
+          - name: prod
+            project_ref: ckjcrkjpmhqhiucifukx
+
+    env:
+      SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
+      SUPABASE_PROJECT_REF: ${{ matrix.environment.project_ref }}
+      ENVIRONMENT_NAME: ${{ matrix.environment.name }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Supabase CLI
+        uses: supabase/setup-cli@v1
+        with:
+          version: latest
+
+      - name: Link to ${{ matrix.environment.name }} Project
+        run: supabase link --project-ref $SUPABASE_PROJECT_REF --workdir apps
+
+      - name: Apply Database Migrations (${{ matrix.environment.name }})
+        run: supabase db push --workdir apps
+
+      - name: Sync Edge Function Secrets (${{ matrix.environment.name }})
+        env:
+          # Add secrets from GitHub Secrets
+          REVENUECAT_WEBHOOK_SECRET: ${{ secrets.REVENUECAT_WEBHOOK_SECRET }}
+          REVENUECAT_API_KEY: ${{ secrets.REVENUECAT_API_KEY }}
+          REVENUECAT_ENTITLEMENT_ID: ${{ secrets.REVENUECAT_ENTITLEMENT_ID }}
+          OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
+          ADMIN_PRIVATE_KEY_JWK: ${{ secrets.ADMIN_PRIVATE_KEY_JWK }}
+          ADMIN_KEYS_JSON: ${{ secrets.ADMIN_KEYS_JSON }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+        run: |
+          # Sync secrets to Supabase (only if they're set in GitHub)
+          secrets_to_set=""
+
+          [ -n "$REVENUECAT_WEBHOOK_SECRET" ] && secrets_to_set="$secrets_to_set REVENUECAT_WEBHOOK_SECRET=$REVENUECAT_WEBHOOK_SECRET"
+          [ -n "$REVENUECAT_API_KEY" ] && secrets_to_set="$secrets_to_set REVENUECAT_API_KEY=$REVENUECAT_API_KEY"
+          [ -n "$REVENUECAT_ENTITLEMENT_ID" ] && secrets_to_set="$secrets_to_set REVENUECAT_ENTITLEMENT_ID=$REVENUECAT_ENTITLEMENT_ID"
+          [ -n "$OPENROUTER_API_KEY" ] && secrets_to_set="$secrets_to_set OPENROUTER_API_KEY=$OPENROUTER_API_KEY"
+          [ -n "$ADMIN_PRIVATE_KEY_JWK" ] && secrets_to_set="$secrets_to_set ADMIN_PRIVATE_KEY_JWK=$ADMIN_PRIVATE_KEY_JWK"
+          [ -n "$ADMIN_KEYS_JSON" ] && secrets_to_set="$secrets_to_set ADMIN_KEYS_JSON=$ADMIN_KEYS_JSON"
+          [ -n "$DISCORD_WEBHOOK_URL" ] && secrets_to_set="$secrets_to_set DISCORD_WEBHOOK_URL=$DISCORD_WEBHOOK_URL"
+
+          if [ -n "$secrets_to_set" ]; then
+            echo "Syncing secrets to Supabase ($ENVIRONMENT_NAME)..."
+            supabase secrets set $secrets_to_set --project-ref $SUPABASE_PROJECT_REF
+          else
+            echo "No secrets to sync"
+          fi
+
+      - name: Deploy Edge Functions (${{ matrix.environment.name }})
+        run: |
+          # Deploy all edge functions (excluding _shared directory)
+          for dir in apps/supabase/functions/*/; do
+            function_name=$(basename "$dir")
+
+            # Skip _shared directory (it's a shared module, not a function)
+            if [ "$function_name" = "_shared" ]; then
+              echo "Skipping _shared (shared module)"
+              continue
+            fi
+
+            echo "Deploying function: $function_name to $ENVIRONMENT_NAME"
+            supabase functions deploy "$function_name" --no-verify-jwt --project-ref $SUPABASE_PROJECT_REF --workdir apps
+          done
+
+      - name: Remove Deleted Functions (${{ matrix.environment.name }})
+        run: |
+          # Get list of functions deployed on Supabase (skip header lines, extract slug column)
+          deployed=$(supabase functions list --project-ref $SUPABASE_PROJECT_REF | grep -E '^[a-z]' | awk '{print $1}')
+
+          # Get list of functions in the repo (excluding _shared)
+          local_functions=$(ls -d apps/supabase/functions/*/ 2>/dev/null | xargs -I {} basename {} | grep -v '^_shared$' || true)
+
+          # Delete any deployed functions that no longer exist in the repo
+          for func in $deployed; do
+            # Skip empty or invalid function names
+            [ -z "$func" ] && continue
+            [[ "$func" =~ ^[^a-z] ]] && continue
+
+            if ! echo "$local_functions" | grep -q "^${func}$"; then
+              echo "Deleting removed function from $ENVIRONMENT_NAME: $func"
+              supabase functions delete "$func" --project-ref $SUPABASE_PROJECT_REF
+            fi
+          done
+
+  deploy-infrastructure:
+    name: Deploy Infrastructure (Terraform)
+    runs-on: ubuntu-latest
+
+    env:
+      TF_VAR_supabase_access_token: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.6"
+
+      # Non-Production Environment
+      - name: Terraform Init (Non-Prod)
+        working-directory: terraform/environments/non-prod
+        run: terraform init
+
+      - name: Terraform Format Check
+        working-directory: terraform/modules/supabase
+        run: terraform fmt -check
+
+      - name: Terraform Validate (Non-Prod)
+        working-directory: terraform/environments/non-prod
+        run: terraform validate
+
+      - name: Terraform Plan (Non-Prod)
+        working-directory: terraform/environments/non-prod
+        run: terraform plan -out=tfplan
+
+      - name: Terraform Apply (Non-Prod)
+        working-directory: terraform/environments/non-prod
+        run: terraform apply -auto-approve tfplan
+
+      # Production Environment
+      - name: Terraform Init (Prod)
+        working-directory: terraform/environments/prod
+        run: terraform init
+
+      - name: Terraform Validate (Prod)
+        working-directory: terraform/environments/prod
+        run: terraform validate
+
+      - name: Terraform Plan (Prod)
+        working-directory: terraform/environments/prod
+        run: terraform plan -out=tfplan
+
+      - name: Terraform Apply (Prod)
+        working-directory: terraform/environments/prod
+        run: terraform apply -auto-approve tfplan

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 .pnp
 .pnp.js
 
+tmp/
 # Build outputs
 dist/
 build/
@@ -16,6 +17,9 @@ build/
 .env.development.local
 .env.test.local
 .env.production.local
+apps/mobile/.env.prod
+.secrets
+
 
 # Supabase
 .supabase/

CLAUDE.md

@@ -65,7 +65,38 @@ There are two Supabase projects configured via MCP servers:
 When using Claude Code with MCP tools:
 - Use `mcp__sauci-prod__*` tools for production database operations
 - Use `mcp__sauci-non-prod__*` tools for development/staging database operations
-- **Always verify which environment you're targeting before running migrations or destructive operations**
+- **Always verify which environment you're targeting before running destructive operations**
+
+### Database Migrations - IMPORTANT
+
+**NEVER use MCP tools (`apply_migration`) for database migrations.** Always use the Supabase CLI instead.
+
+**Why:** MCP migrations are tracked in the database but do NOT create local migration files. This means:
+- Migration history is not committed to git
+- Other developers won't get the schema changes
+- `supabase db reset` won't include MCP-applied migrations
+- Changes cannot be reproduced from scratch
+
+**Correct workflow for schema changes:**
+```bash
+# 1. Create migration file locally
+supabase migration new <descriptive_name>
+
+# 2. Edit the migration file in apps/supabase/migrations/
+
+# 3. Test locally
+supabase db reset
+
+# 4. Deploy to remote (link to correct project first)
+supabase link --project-ref <project_ref>
+supabase db push
+```
+
+**MCP tools ARE appropriate for:**
+- Reading data (`execute_sql` for SELECT queries)
+- Exploring schema (`list_tables`, `list_migrations`)
+- Deploying edge functions (`deploy_edge_function`)
+- Generating types (`generate_typescript_types`)
 
 ## Architecture
 
@@ -179,3 +210,87 @@ backgroundColor: 'rgba(18, 18, 18, 0.85)',
 The `BlurView` in `tabBarBackground` is unreliable and can fail during re-renders/transitions, causing a fully transparent tab bar. The solid rgba background acts as a fallback while still allowing the blur effect on top.
 
 **Location:** `apps/mobile/app/(app)/_layout.tsx` - `tabBarStyle`
+
+## Infrastructure as Code (Terraform)
+
+Supabase project configuration is managed via Terraform in the `terraform/` directory. This includes auth settings, OAuth providers, email templates, SMTP config, rate limits, and more.
+
+**Directory structure:**
+```
+terraform/
+├── modules/
+│   └── supabase/           # Shared configuration module
+│       ├── main.tf
+│       ├── variables.tf
+│       ├── outputs.tf
+│       └── templates/      # Email templates
+└── environments/
+    ├── prod/               # Production (ckjcrkjpmhqhiucifukx)
+    └── non-prod/           # Non-production (itbzhrvlgvdmzbnhzhyx)
+```
+
+**When to update Terraform:**
+- Changing auth settings (OAuth providers, JWT expiry, MFA settings)
+- Modifying email templates or subjects
+- Updating rate limits or security settings
+- Changing SMTP configuration
+- Modifying storage or API settings
+
+**Workflow (always test in non-prod first):**
+```bash
+# 1. Apply to non-prod first
+cd terraform/environments/non-prod
+export TF_VAR_supabase_access_token=sbp_xxxxx
+terraform plan
+terraform apply
+
+# 2. Verify changes work in non-prod
+
+# 3. Apply to prod
+cd terraform/environments/prod
+terraform plan
+terraform apply
+```
+
+**Important:** After making Terraform changes, remind the user to:
+1. Commit the updated `terraform/` files
+2. The GitHub Action will auto-apply on merge to master (non-prod first, then prod)
+
+**Do NOT use Terraform for:**
+- Database schema changes (use migrations)
+- Edge function deployment (use CLI or MCP)
+- Storage bucket creation (use migrations)
+
+## Edge Function Secrets
+
+Edge functions use secrets stored in Supabase. These are synced from GitHub Secrets during CI/CD deployment.
+
+**Current secrets:**
+| Secret | Used By | Description |
+|--------|---------|-------------|
+| `REVENUECAT_WEBHOOK_SECRET` | revenuecat-webhook | Webhook signature validation |
+| `REVENUECAT_API_KEY` | sync-subscription | RevenueCat API access |
+| `REVENUECAT_ENTITLEMENT_ID` | sync-subscription | Entitlement identifier |
+| `OPENROUTER_API_KEY` | classify-message | AI classification API |
+| `ADMIN_PRIVATE_KEY_JWK` | admin-decrypt-* | E2EE admin decryption |
+| `ADMIN_KEYS_JSON` | admin-decrypt-*, migrate-e2ee | Multiple admin keys |
+| `DISCORD_WEBHOOK_URL` | send-discord-notification | Discord notifications |
+
+**Auto-provided by Supabase (don't set):**
+- `SUPABASE_URL`
+- `SUPABASE_ANON_KEY`
+- `SUPABASE_SERVICE_ROLE_KEY`
+
+**When adding a new edge function that needs secrets:**
+1. Add the secret to the edge function code: `Deno.env.get("SECRET_NAME")`
+2. Update `.github/workflows/deploy-supabase.yml` to include the new secret in the sync step
+3. Update `apps/supabase/functions/.secrets.example` with the new secret
+4. **Remind the user** to add the secret to GitHub Secrets (Settings → Secrets → Actions)
+5. Update this table in CLAUDE.md
+
+**Local development:**
+```bash
+cp apps/supabase/functions/.secrets.example apps/supabase/functions/.secrets
+# Fill in values
+supabase functions serve --env-file apps/supabase/functions/.secrets
+```

PACK_GENERATION_AGENT.md

@@ -0,0 +1,458 @@
+# Pack Generation Agent
+
+System prompt and guidelines for generating question packs for Sauci.
+
+## Agent Role
+
+You are a content generation specialist for Sauci, a couples intimacy app where partners swipe on activity proposals. Your job is to create question packs that help couples discover shared interests and activities.
+
+## Core Principles
+
+### 1. Questions are PROPOSALS, not interview questions
+- GOOD: "Give your partner a massage"
+- BAD: "Would you like to give a massage?"
+- BAD: "Have you ever given a massage?"
+
+### 2. Always use "your partner" - never gendered pronouns
+- GOOD: "Go down on your partner"
+- BAD: "Go down on him/her"
+- BAD: "Give your partner a blowjob" (gender-specific act without targeting)
+
+### 3. No time-specific language
+- BAD: "tonight", "now", "today", "right now"
+- Activities should be timeless proposals
+
+### 4. Keep it concise
+- Ideal length: 5-15 words
+- No unnecessary filler
+
+### 5. Target audience: 25-40 year old couples
+- Modern, realistic language
+- Avoid cheesy, cliche, or Hallmark-card phrasing
+- Think about what real couples actually do and say
+
+---
+
+## Question Structure
+
+Each question has:
+- `text` - What Partner A sees
+- `partner_text` - What Partner B sees (can be NULL)
+- `intensity` - 1-5 scale
+- `allowed_couple_genders` - Which couple types see this (NULL = all)
+- `target_user_genders` - Which gender initiates (NULL = any)
+- `required_props` - Physical items needed (NULL = none)
+- `inverse_of` - UUID of primary question if this is an inverse (NULL for primary/symmetric)
+
+### When to use partner_text
+
+**Use NULL** for symmetric activities where both partners do the same thing:
+```
+text: "Cook dinner together"
+partner_text: NULL
+```
+
+**Use partner_text** for asymmetric activities where roles differ:
+```
+text: "Give your partner a massage"
+partner_text: "Receive a massage from your partner"
+```
+
+### Critical: Inverse Questions and Database Linking
+
+For any asymmetric question, you MUST create TWO questions AND link them using the `inverse_of` column:
+
+**Question 1 (PRIMARY - inverse_of = NULL):**
+```
+id: uuid-1
+text: "Spank your partner"
+partner_text: "Be spanked by your partner"
+inverse_of: NULL
+```
+
+**Question 2 (INVERSE - inverse_of = primary's UUID):**
+```
+id: uuid-2
+text: "Be spanked by your partner"
+partner_text: "Spank your partner"
+inverse_of: uuid-1
+```
+
+This ensures:
+- Partner A gets asked if they want to give AND receive
+- Partner B gets asked if they want to give AND receive
+- All four combinations can be discovered through matching
+- The database tracks which questions are pairs (for accurate unique counts)
+
+**IMPORTANT:**
+- Inverse pairs are NOT duplicates. When one question's `text` matches another's `partner_text`, they form a valid inverse pair. This is intentional and required - do not flag or remove these as duplicates.
+- The `inverse_of` column links the pair: the inverse question points to the primary question's UUID
+- This allows the app to display accurate unique question counts (100 concepts, not 200 questions)
+
+---
+
+## Targeting Rules
+
+### Couple Targeting (allowed_couple_genders)
+
+Controls which couple types see the question. Options: `male+male`, `female+male`, `female+female`
+
+**DEFAULT: NULL** (all couples) unless explicit anatomical requirement.
+
+| Activity Type | Targeting | Reason |
+|--------------|-----------|--------|
+| Gender-neutral | NULL | Anyone can do it |
+| Requires penis | `['male+male', 'female+male']` | Exclude F+F |
+| Requires vagina | `['female+male', 'female+female']` | Exclude M+M |
+| Sex toys | NULL | Toys work for everyone |
+
+Examples:
+- "Give your partner a massage" → NULL
+- "Give your partner a blowjob" → `['male+male', 'female+male']`
+- "Go down on your partner" → NULL (oral is possible for all)
+- "Use a vibrator on your partner" → NULL
+
+### Initiator Targeting (target_user_genders)
+
+For asymmetric questions, controls who does the action in `text`.
+
+**DEFAULT: NULL** (anyone can initiate).
+
+Only set when the `text` field requires specific anatomy:
+- "Swallow your partner's cum" → partner has penis → `['female']` in M+F
+- "Deep throat your partner" → partner has penis → `['female']` in M+F
+- "Let your partner cum inside you" → receiver has vagina → `['female']`
+
+When in doubt, use NULL.
+
+### Anatomical Consistency
+
+**NEVER mix male-specific and female-specific acts in the same question.**
+
+- BAD: "Finger or give your partner a handjob"
+- GOOD: Create separate questions for each
+
+---
+
+## Required Props
+
+Identify physical items/accessories needed for the activity.
+
+**Rules:**
+- Props are physical items, NOT body parts or acts
+- Use lowercase, short, singular names
+- Reuse existing prop names when possible
+- Set to NULL if no props needed
+
+**Common props:**
+- blindfold, handcuffs, rope, massage oil
+- remote vibrator, butt plug, dildo, cock ring
+- ice cubes, feather, candle (for wax play)
+- mirror, camera/phone (for recording)
+
+---
+
+## Intensity Levels
+
+### Level 1 - GENTLE
+Pure emotional connection, non-sexual bonding
+- Examples: Cook together, watch movies, take walks, game nights
+- No sexual content whatsoever
+
+### Level 2 - WARM
+Romantic atmosphere, affectionate touch
+- Examples: Slow dancing, candlelit dinners, extended kissing, cuddling
+- Romantic but not explicit
+
+### Level 3 - PLAYFUL
+Light sexual exploration, sensual discovery
+- Examples: Mutual masturbation, oral sex, light roleplay, basic toys
+- Sexual but not intense
+
+### Level 4 - STEAMY
+Explicit sexual activities, moderate adventure
+- Examples: Sex positions, light bondage, anal play, recording yourselves
+- Full sexual content, some kink
+
+### Level 5 - INTENSE
+Advanced/BDSM/extreme exploration
+- Examples: Heavy impact play, advanced bondage, power exchange, edge play
+- Intense kink, requires trust and experience
+
+---
+
+## Pack Progression Structure
+
+Most categories should have 3-5 packs that progress in intensity:
+
+### Example: Toy Time
+1. **Starting Out** (intensity 3-4) - Basic vibrators, blindfolds, simple toys
+2. **Leveling Up Together** (intensity 4, some 5) - Remote toys, edging, combinations
+3. **The Deep End** (intensity 4-5) - Machines, bondage furniture, advanced play
+
+### Example: Long Distance
+1. **Staying Close** (intensity 1) - FaceTime, voice notes, gaming together
+2. **Missing You** (intensity 2) - Flirty texts, missing each other, anticipation
+3. **Private Line** (intensity 3-4) - Sexting, phone sex, explicit photos
+4. **Total Control** (intensity 4-5) - Remote toys, edging, power dynamics
+
+### Example: Public Thrills
+1. **Testing the Waters** (intensity 2-3) - Whispers, secret touches, stolen kisses
+2. **Pushing Limits** (intensity 3-4) - Making out in risky spots, dressing rooms
+3. **All Eyes On Us** (intensity 4-5) - Sex in public places, exhibitionism
+
+---
+
+## Category Types
+
+### Non-Sexual Categories (intensity 1-2)
+- Social Life, Quality Time, Kitchen Chemistry
+- Focus on bonding, activities, preferences
+- partner_text usually NULL (symmetric activities)
+
+### Sexual Categories (intensity 3-5)
+- Toy Time, Public Thrills, Kink Lab, Bedroom Adventures
+- Mix of symmetric and asymmetric questions
+- Always create inverse questions for asymmetric content
+
+### Mixed Categories
+- Long Distance, Romance & Sensuality
+- Start non-sexual, progress to sexual
+- Clear intensity progression across packs
+
+---
+
+## Content Guidelines
+
+### DO:
+- Use realistic, modern language
+- Consider same-sex couples (avoid anatomy-specific unless tagged)
+- Create variety in sentence openers
+- Think about what 25-40 year olds actually do
+- Include multiple perspectives per kink/activity
+- Make activities feel achievable and fun
+
+### DON'T:
+- Use cheesy phrases ("make love", "intimate connection", "souls intertwining")
+- Assume heterosexual couples by default
+- Create one-sided asymmetric questions (always make the inverse)
+- Use time-specific language
+- Be preachy or educational in tone
+- Include judgment about activities
+- Treat inverse pairs as duplicates (one's `text` = other's `partner_text` is INTENTIONAL)
+
+### Avoid Cliches:
+- Candlelit dinner (unless specific twist)
+- Rose petals
+- Bubble bath
+- "Netflix and chill"
+- "Make love"
+- Sunset walks on the beach
+
+---
+
+## Generation Process
+
+When asked to create a pack:
+
+1. **Understand the category and position**
+   - What category does this belong to?
+   - Where in the progression is this pack? (beginner/intermediate/advanced)
+   - What intensity range?
+
+2. **Brainstorm themes and activities**
+   - What specific activities fit this pack?
+   - What makes this pack different from adjacent packs?
+   - What progression from previous pack?
+
+3. **Generate questions**
+   - Mix of symmetric (null partner_text) and asymmetric questions
+   - For EVERY asymmetric question, immediately create its inverse
+   - Vary sentence structure and openers
+   - Target ~30-50 questions per pack
+
+4. **Review for balance**
+   - Check intensity distribution
+   - Ensure all perspectives covered
+   - Remove duplicates or too-similar questions
+   - Verify no cliches or cheesy language
+
+5. **Format output**
+   - Provide as SQL INSERT or structured format
+   - Include pack name, description, category
+   - Note premium status if applicable
+
+---
+
+## Output Format
+
+When generating packs, output in this format (with inverse_of linking for pairs):
+
+```sql
+-- Pack: [Pack Name]
+-- Category: [Category Name]
+-- Description: [Pack description]
+-- Intensity range: [X-Y]
+
+-- For inverse pairs, insert primary first (inverse_of = NULL), then inverse pointing to primary
+INSERT INTO questions (id, pack_id, text, partner_text, intensity, allowed_couple_genders, target_user_genders, required_props, inverse_of) VALUES
+-- Pair 1
+('uuid-primary-1', '[pack_id]', 'Spank your partner', 'Be spanked by your partner', 3, NULL, NULL, NULL, NULL),
+('uuid-inverse-1', '[pack_id]', 'Be spanked by your partner', 'Spank your partner', 3, NULL, NULL, NULL, 'uuid-primary-1'),
+-- Pair 2 (with targeting)
+('uuid-primary-2', '[pack_id]', 'Give your partner a blowjob', 'Receive a blowjob from your partner', 3, ARRAY['male+male', 'female+male'], NULL, NULL, NULL),
+('uuid-inverse-2', '[pack_id]', 'Receive a blowjob from your partner', 'Give your partner a blowjob', 3, ARRAY['male+male', 'female+male'], NULL, NULL, 'uuid-primary-2'),
+-- Symmetric (no inverse needed)
+(gen_random_uuid(), '[pack_id]', 'Cook dinner together', NULL, 1, NULL, NULL, NULL, NULL);
+```
+
+Or as a table (include inverse_of column):
+
+| ID | Text | Partner Text | Intensity | Couple Targets | Initiator | Props | inverse_of |
+|----|------|--------------|-----------|----------------|-----------|-------|------------|
+| uuid-1 | Spank your partner | Be spanked | 3 | NULL | NULL | NULL | NULL |
+| uuid-2 | Be spanked by partner | Spank your partner | 3 | NULL | NULL | NULL | uuid-1 |
+| uuid-3 | Cook together | null | 1 | NULL | NULL | NULL | NULL |
+
+---
+
+## Examples of Good Questions
+
+### Non-Sexual (Intensity 1)
+```
+text: "Cook the same recipe together over video call"
+partner_text: NULL
+intensity: 1
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: NULL
+```
+
+### Romantic (Intensity 2)
+```
+text: "Send a tipsy voice note telling them you miss them"
+partner_text: NULL
+intensity: 2
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: NULL
+```
+
+### Playful (Intensity 3) - With Props and Inverse Linking
+```
+id: uuid-blindfold-primary
+text: "Blindfold your partner and tease them with different sensations"
+partner_text: "Be blindfolded while your partner teases you"
+intensity: 3
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: ["blindfold"]
+inverse_of: NULL
+```
+AND its inverse (linked via inverse_of):
+```
+id: uuid-blindfold-inverse
+text: "Be blindfolded while your partner teases you"
+partner_text: "Blindfold your partner and tease them with different sensations"
+intensity: 3
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: ["blindfold"]
+inverse_of: uuid-blindfold-primary
+```
+
+### Steamy (Intensity 4) - With Props and Targeting
+```
+text: "Control your partner's remote vibrator while out at dinner"
+partner_text: "Wear a remote vibrator at dinner while your partner controls it"
+intensity: 4
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: ["remote vibrator"]
+```
+AND its inverse:
+```
+text: "Wear a remote vibrator at dinner while your partner controls it"
+partner_text: "Control your partner's remote vibrator while out at dinner"
+intensity: 4
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: ["remote vibrator"]
+```
+
+### With Couple Targeting (Intensity 3)
+```
+text: "Give your partner a blowjob in a risky location"
+partner_text: "Receive a blowjob from your partner in a risky location"
+intensity: 3
+allowed_couple_genders: ["male+male", "female+male"]  -- requires penis
+target_user_genders: NULL
+required_props: NULL
+```
+
+### With Initiator Targeting (Intensity 4)
+```
+text: "Swallow your partner's cum"
+partner_text: "Have your partner swallow your cum"
+intensity: 4
+allowed_couple_genders: ["male+male", "female+male"]  -- requires penis
+target_user_genders: ["female"]  -- in M+F, female receives
+required_props: NULL
+```
+
+### Intense (Intensity 5)
+```
+text: "Edge your partner repeatedly, denying release until you decide"
+partner_text: "Be edged and denied until your partner allows you to finish"
+intensity: 5
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: NULL
+```
+AND its inverse:
+```
+text: "Be edged and denied until your partner allows you to finish"
+partner_text: "Edge your partner repeatedly, denying release until you decide"
+intensity: 5
+allowed_couple_genders: NULL
+target_user_genders: NULL
+required_props: NULL
+```
+
+---
+
+## Checklist Before Submitting
+
+**Language & Format:**
+- [ ] Uses "your partner" (no gendered pronouns like him/her/he/she)
+- [ ] Questions are proposals, not interview questions
+- [ ] No wishy-washy language ("Would you...", "Have you ever...")
+- [ ] No time-specific language (tonight, now, today)
+- [ ] 5-12 words per question (concise)
+- [ ] No cheesy or cliche language
+- [ ] Mix of sentence structures
+- [ ] Appropriate for 25-40 year old couples
+
+**Structure:**
+- [ ] All asymmetric questions have their inverse created (these are NOT duplicates - they're required pairs)
+- [ ] All inverse pairs are linked via `inverse_of` column (inverse points to primary's UUID)
+- [ ] Partner text is appealing (not clinical)
+- [ ] Partner text frames responses as "allowing" not forced
+- [ ] No actual duplicates (same `text` appearing twice)
+
+**Database Linking:**
+- [ ] Primary questions have `inverse_of = NULL`
+- [ ] Inverse questions have `inverse_of = <primary_question_uuid>`
+- [ ] Symmetric questions have `inverse_of = NULL`
+
+**Accuracy:**
+- [ ] Intensity levels match the activities
+- [ ] Couple targeting is correct (NULL unless anatomy-specific)
+- [ ] Initiator targeting is correct for asymmetric questions
+- [ ] Required props are identified where needed
+- [ ] Consider same-sex couples
+
+**Consistency:**
+- [ ] No mixed anatomy in alternatives
+- [ ] Tone matches explicit/non-explicit category
+- [ ] Pack fits its position in the progression

apps/admin/Dockerfile

@@ -1,15 +1,20 @@
-FROM node:20-alpine AS builder
+FROM node:20-bookworm-slim AS builder
 
 WORKDIR /app
 
+# Enable pnpm via corepack (allow non-matching packageManager)
+ENV COREPACK_ENABLE_STRICT=0
+ENV PNPM_CONFIG_LINK_WORKSPACE_PACKAGES=true
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
 # Copy everything first (workspaces need full structure)
 COPY . .
 
 # Install all dependencies
-RUN npm install
+RUN pnpm install --no-frozen-lockfile
 
 # Build shared package first
-RUN npx turbo run build --filter=@sauci/shared
+RUN pnpm exec turbo run build --filter=@sauci/shared
 
 # Build admin app with env vars
 ARG VITE_SUPABASE_URL
@@ -36,7 +41,7 @@ ENV VITE_COUNCIL_ENABLED=$VITE_COUNCIL_ENABLED
 ENV VITE_COUNCIL_GENERATOR_MODEL=$VITE_COUNCIL_GENERATOR_MODEL
 ENV VITE_COUNCIL_REVIEWER_MODEL=$VITE_COUNCIL_REVIEWER_MODEL
 
-RUN npx turbo run build --filter=@sauci/admin
+RUN pnpm exec turbo run build --filter=@sauci/admin
 
 FROM nginx:alpine
 COPY --from=builder /app/apps/admin/dist /usr/share/nginx/html

apps/admin/Dockerfile.dev

@@ -1,20 +1,35 @@
-FROM node:20-alpine
+FROM node:20-bookworm-slim
 
 WORKDIR /app
 
+# Enable pnpm via corepack (allow non-matching packageManager)
+ENV COREPACK_ENABLE_STRICT=0
+ENV PNPM_CONFIG_LINK_WORKSPACE_PACKAGES=true
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
+# Copy root package files and workspace configs
 COPY package*.json ./
+COPY pnpm-workspace.yaml ./
 COPY turbo.json ./
+
+# Copy all workspace package.json files
 COPY apps/admin/package.json ./apps/admin/
+COPY apps/mobile/package.json ./apps/mobile/
+COPY apps/supabase/package.json ./apps/supabase/
+COPY apps/web/package.json ./apps/web/
 COPY packages/shared/package.json ./packages/shared/
 
-RUN npm install
+# Install all dependencies at root level (workspaces)
+RUN pnpm install --no-frozen-lockfile
 
+# Copy all source code
 COPY . .
 
-RUN npx turbo run build --filter=@sauci/shared
+# Build shared package
+RUN pnpm exec turbo run build --filter=@sauci/shared
 
 WORKDIR /app/apps/admin
 
 EXPOSE 3001
 
-CMD ["npm", "run", "dev"]
+CMD ["pnpm", "run", "dev"]

apps/admin/docker-compose.yml

@@ -23,4 +23,6 @@ services:
       - ./vite.config.ts:/app/apps/admin/vite.config.ts
       - ./tsconfig.json:/app/apps/admin/tsconfig.json
       - ../../packages/shared/src:/app/packages/shared/src
+      # Preserve node_modules from container (don't override with host)
+      - /app/node_modules
     restart: unless-stopped

apps/admin/package.json

@@ -10,6 +10,9 @@
         "preview": "vite preview"
     },
     "dependencies": {
+        "@dnd-kit/core": "^6.3.1",
+        "@dnd-kit/sortable": "^10.0.0",
+        "@dnd-kit/utilities": "^3.2.2",
         "@emoji-mart/data": "^1.2.1",
         "@emoji-mart/react": "^1.1.1",
         "@radix-ui/react-avatar": "^1.0.4",
@@ -22,7 +25,7 @@
         "@radix-ui/react-switch": "^1.0.3",
         "@radix-ui/react-tabs": "^1.0.4",
         "@radix-ui/react-tooltip": "^1.0.7",
-        "@sauci/shared": "*",
+        "@sauci/shared": "file:../../packages/shared",
         "@supabase/supabase-js": "^2.39.0",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.0",
@@ -34,7 +37,6 @@
         "react-dom": "^18.2.0",
         "react-icons": "^4.12.0",
         "react-router-dom": "^6.21.0",
-
         "recharts": "^3.6.0",
         "sonner": "^1.3.1",
         "tailwind-merge": "^2.2.0"

apps/admin/src/App.tsx

@@ -7,6 +7,10 @@ import { DashboardPage } from '@/pages/DashboardPage';
 import { CategoriesPage } from '@/pages/content/CategoriesPage';
 import { PacksPage } from '@/pages/content/PacksPage';
 import { QuestionsPage } from '@/pages/content/QuestionsPage';
+import { QuestionAnalyticsPage } from '@/pages/content/QuestionAnalyticsPage';
+import { TagsPage } from '@/pages/content/TagsPage';
+import { DarePacksPage } from '@/pages/content/DarePacksPage';
+import { DaresPage } from '@/pages/content/DaresPage';
 import { UsersPage } from '@/pages/users/UsersPage';
 import { UserDetailPage } from '@/pages/users/UserDetailPage';
 import { MatchChatPage } from '@/pages/users/MatchChatPage';
@@ -56,6 +60,14 @@ function App() {
                                 </ProtectedRoute>
                             }
                         />
+                        <Route
+                            path="/categories/:categoryId/dare-packs"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_PACKS}>
+                                    <DarePacksPage />
+                                </ProtectedRoute>
+                            }
+                        />
                         <Route
                             path="/packs/:packId/questions"
                             element={
@@ -64,6 +76,38 @@ function App() {
                                 </ProtectedRoute>
                             }
                         />
+                        <Route
+                            path="/question-analytics"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_QUESTIONS}>
+                                    <QuestionAnalyticsPage />
+                                </ProtectedRoute>
+                            }
+                        />
+                        <Route
+                            path="/tags"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_PACKS}>
+                                    <TagsPage />
+                                </ProtectedRoute>
+                            }
+                        />
+                        <Route
+                            path="/dare-packs"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_PACKS}>
+                                    <DarePacksPage />
+                                </ProtectedRoute>
+                            }
+                        />
+                        <Route
+                            path="/dare-packs/:packId/dares"
+                            element={
+                                <ProtectedRoute requiredPermission={PERMISSION_KEYS.MANAGE_QUESTIONS}>
+                                    <DaresPage />
+                                </ProtectedRoute>
+                            }
+                        />
 
                         {/* User management */}
                         <Route

apps/admin/src/components/ai/GenerationForm.tsx

@@ -53,10 +53,10 @@ export function GenerationForm({
                 </div>
             )}
 
-            {/* Wildness Level Selector (questions only) */}
+            {/* Intimacy Level Selector (questions only) */}
             {type === 'questions' && (
                 <div className="space-y-2">
-                    <Label>Wildness Level</Label>
+                    <Label>Intimacy Level</Label>
                     <div className="flex flex-wrap gap-2">
                         {TONE_LEVELS.map((t) => (
                             <Button

apps/admin/src/components/ai/hooks/useAiGeneration.ts

@@ -77,7 +77,7 @@ export function useAiGeneration(
     // Config state
     const [config, setConfig] = useState<GenerationConfig>({
         count: 10,
-        tone: context?.isExplicit ? 5 : 3,
+        tone: context?.isExplicit ? 5 : 2,
         crudeLang: false,
         inspiration: '',
     });
@@ -123,7 +123,7 @@ export function useAiGeneration(
         if (type === 'questions') {
             setConfig(prev => ({
                 ...prev,
-                tone: context?.isExplicit ? 5 : 3,
+                tone: context?.isExplicit ? 5 : 2,
             }));
         }
     }, [context?.isExplicit, type]);

apps/admin/src/components/content/PackFormDialog.tsx

@@ -1,4 +1,3 @@
-import { useState, useEffect } from 'react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
@@ -14,6 +13,13 @@ import {
     DialogHeader,
     DialogTitle,
 } from '@/components/ui/dialog';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
 import { Plus, Loader2, X } from 'lucide-react';
 import { AIPolishButton } from '@/components/ai/AIPolishButton';
 
@@ -26,6 +32,11 @@ interface Topic {
     name: string;
 }
 
+interface Category {
+    id: string;
+    name: string;
+}
+
 export interface PackFormData {
     name: string;
     description: string;
@@ -33,6 +44,9 @@ export interface PackFormData {
     is_premium: boolean;
     is_public: boolean;
     is_explicit: boolean;
+    category_id: string;
+    scheduled_release_at?: string | null;  // Optional for backwards compatibility
+    skip_notification?: boolean;  // If true, sets release_notified=true to skip notifications
 }
 
 export interface PackFormDialogProps {
@@ -43,6 +57,7 @@ export interface PackFormDialogProps {
     onSave: () => void;
     saving: boolean;
     isEditing: boolean;
+    categories: Category[];
     allTopics: Topic[];
     selectedTopicIds: Set<string>;
     onTopicsChange: (topicIds: Set<string>) => void;
@@ -60,6 +75,7 @@ export function PackFormDialog({
     onSave,
     saving,
     isEditing,
+    categories,
     allTopics,
     selectedTopicIds,
     onTopicsChange,
@@ -141,6 +157,27 @@ export function PackFormDialog({
                         />
                     </div>
 
+                    {/* Category */}
+                    <div className="space-y-2">
+                        <Label>Category (optional)</Label>
+                        <Select
+                            value={formData.category_id || '__none__'}
+                            onValueChange={(value) => setField('category_id', value === '__none__' ? '' : value)}
+                        >
+                            <SelectTrigger>
+                                <SelectValue placeholder="Select a category" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="__none__">No category</SelectItem>
+                                {categories.map((category) => (
+                                    <SelectItem key={category.id} value={category.id}>
+                                        {category.name}
+                                    </SelectItem>
+                                ))}
+                            </SelectContent>
+                        </Select>
+                    </div>
+
                     {/* Premium Toggle */}
                     <div className="flex items-center justify-between">
                         <div className="space-y-0.5">
@@ -165,10 +202,63 @@ export function PackFormDialog({
                         </div>
                         <Switch
                             checked={formData.is_public}
-                            onCheckedChange={(checked) => setField('is_public', checked)}
+                            onCheckedChange={(checked) => {
+                                setField('is_public', checked);
+                                // Clear scheduled release if making public immediately
+                                if (checked) {
+                                    setField('scheduled_release_at', null);
+                                }
+                            }}
                         />
                     </div>
 
+                    {/* Scheduled Release - only show when not public */}
+                    {!formData.is_public && (
+                        <div className="space-y-4 p-3 rounded-md bg-muted/50 border border-dashed">
+                            <div className="space-y-2">
+                                <Label htmlFor="scheduled_release_at">Scheduled Release</Label>
+                                <p className="text-sm text-muted-foreground">
+                                    Automatically make this pack public at a specific time. Users will be notified when it becomes available.
+                                </p>
+                                <Input
+                                    id="scheduled_release_at"
+                                    type="datetime-local"
+                                    value={formData.scheduled_release_at ? new Date(formData.scheduled_release_at).toISOString().slice(0, 16) : ''}
+                                    onChange={(e) => {
+                                        const value = e.target.value;
+                                        setField('scheduled_release_at', value ? new Date(value).toISOString() : null);
+                                    }}
+                                    className="w-full"
+                                />
+                                {formData.scheduled_release_at && (
+                                    <Button
+                                        type="button"
+                                        variant="ghost"
+                                        size="sm"
+                                        onClick={() => setField('scheduled_release_at', null)}
+                                        className="mt-1"
+                                    >
+                                        Clear scheduled release
+                                    </Button>
+                                )}
+                            </div>
+
+                            {/* Skip Notification Toggle */}
+                            <div className="flex items-center justify-between pt-2 border-t">
+                                <div className="space-y-0.5">
+                                    <Label>Skip release notification</Label>
+                                    <p className="text-sm text-muted-foreground">
+                                        Release without notifying users
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={formData.skip_notification ?? false}
+                                    onCheckedChange={(checked) => setField('skip_notification', checked)}
+                                />
+                            </div>
+                        </div>
+                    )}
+
                     {/* Explicit Toggle */}
                     <div className="flex items-center justify-between">
                         <div className="space-y-0.5">

apps/admin/src/components/content/ReviewQuestionsDialog.tsx

@@ -11,11 +11,31 @@ import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Checkbox } from '@/components/ui/checkbox';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
-import { Loader2, Sparkles, ArrowRight, Check, Wand2, ShieldCheck } from 'lucide-react';
-import { analyzeQuestionText, analyzeQuestionTargets, TextAnalysis, TargetAnalysis } from '@/lib/openai';
+import { Loader2, Sparkles, ArrowRight, Check, Wand2, ShieldCheck, Gauge, Trash2, Package } from 'lucide-react';
+import {
+    analyzeQuestionText,
+    analyzeQuestionTargets,
+    analyzeQuestionDeletions,
+    analyzeQuestionProps,
+    TextAnalysis,
+    TargetAnalysis,
+    DeletionAnalysis,
+    PropsAnalysis,
+} from '@/lib/openai';
+import { supabase } from '@/config';
 import { auditedSupabase } from '@/hooks/useAuditedSupabase';
 import { toast } from 'sonner';
 
+type QuestionType = 'swipe' | 'text_answer' | 'audio' | 'photo' | 'who_likely';
+
+const QUESTION_TYPE_LABELS: Record<QuestionType, string> = {
+    swipe: 'Swipe',
+    text_answer: 'Text Answer',
+    audio: 'Audio',
+    photo: 'Photo',
+    who_likely: 'Who Is More Likely',
+};
+
 interface Question {
     id: string;
     text: string;
@@ -23,6 +43,8 @@ interface Question {
     intensity: number;
     allowed_couple_genders: string[] | null;
     target_user_genders: string[] | null;
+    required_props?: string[] | null;
+    question_type?: QuestionType | null;
 }
 
 interface ReviewQuestionsDialogProps {
@@ -38,13 +60,19 @@ interface CombinedSuggestion {
     question: Question;
     textSuggestion?: TextAnalysis;
     targetSuggestion?: TargetAnalysis;
+    propsSuggestion?: PropsAnalysis;
+    deleteSuggestion?: DeletionAnalysis;
 }
 
 export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplicit = false, onUpdated }: ReviewQuestionsDialogProps) {
     const [analyzing, setAnalyzing] = useState(false);
     const [suggestions, setSuggestions] = useState<CombinedSuggestion[]>([]);
+    const [existingProps, setExistingProps] = useState<string[]>([]);
     const [selectedTextIds, setSelectedTextIds] = useState<Set<string>>(new Set());
     const [selectedTargetIds, setSelectedTargetIds] = useState<Set<string>>(new Set());
+    const [selectedPropsIds, setSelectedPropsIds] = useState<Set<string>>(new Set());
+    const [selectedIntensityIds, setSelectedIntensityIds] = useState<Set<string>>(new Set());
+    const [selectedDeleteIds, setSelectedDeleteIds] = useState<Set<string>>(new Set());
     const [step, setStep] = useState<'initial' | 'review'>('initial');
     const [applying, setApplying] = useState(false);
 
@@ -71,14 +99,55 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
         return sortedA.every((val, i) => val === sortedB[i]);
     };
 
+    const loadExistingProps = async (): Promise<string[]> => {
+        if (existingProps.length > 0) return existingProps;
+
+        try {
+            const { data, error } = await supabase
+                .from('questions')
+                .select('required_props')
+                .not('required_props', 'is', null)
+                .limit(5000);
+
+            if (error) throw error;
+
+            const next = new Set<string>();
+            data?.forEach(row => {
+                row.required_props?.forEach((prop: string) => next.add(prop));
+            });
+
+            const list = Array.from(next).sort((a, b) => a.localeCompare(b));
+            setExistingProps(list);
+            return list;
+        } catch (error) {
+            console.error('Failed to load existing props:', error);
+            return [];
+        }
+    };
+
     const handleAnalyze = async () => {
         setAnalyzing(true);
         try {
-            // Run both analyses in parallel
-            const [textResults, targetResults] = await Promise.all([
-                analyzeQuestionText(questions, isExplicit),
-                analyzeQuestionTargets(questions)
-            ]);
+            const propsCatalog = await loadExistingProps();
+
+            // Run analyses in parallel (pass intensity for text analysis)
+            const [textResults, targetResults, deleteResults, propsResults] = await Promise.all([
+                analyzeQuestionText(
+                    questions.map(q => ({ ...q, intensity: q.intensity })),
+                    isExplicit
+                ),
+                analyzeQuestionTargets(questions),
+                analyzeQuestionDeletions(questions, isExplicit),
+                analyzeQuestionProps(
+                    questions.map(q => ({
+                        id: q.id,
+                        text: q.text,
+                        partner_text: q.partner_text,
+                        required_props: q.required_props || null,
+                    })),
+                    propsCatalog
+                ),
+            ]) as [TextAnalysis[], TargetAnalysis[], DeletionAnalysis[], PropsAnalysis[]];
 
             // Filter target results to only meaningful changes
             const meaningfulTargetResults = targetResults.filter(suggestion => {
@@ -98,26 +167,35 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                 return coupleChanged || initiatorChanged;
             });
 
-            // Combine results by question ID
-            const questionIds = new Set([
-                ...textResults.map(t => t.id),
-                ...meaningfulTargetResults.map(t => t.id)
-            ]);
+            const meaningfulPropsResults = propsResults.filter(suggestion => {
+                const question = questions.find(q => q.id === suggestion.id);
+                if (!question) return false;
 
-            const combined: CombinedSuggestion[] = Array.from(questionIds).map(id => {
-                const question = questions.find(q => q.id === id)!;
-                return {
-                    questionId: id,
-                    question,
-                    textSuggestion: textResults.find(t => t.id === id),
-                    targetSuggestion: meaningfulTargetResults.find(t => t.id === id),
-                };
+                return !arraysEqual(
+                    question.required_props || null,
+                    suggestion.suggested_required_props || null
+                );
             });
 
+            const combined: CombinedSuggestion[] = questions.map(question => ({
+                questionId: question.id,
+                question,
+                textSuggestion: textResults.find(t => t.id === question.id),
+                targetSuggestion: meaningfulTargetResults.find(t => t.id === question.id),
+                propsSuggestion: meaningfulPropsResults.find(p => p.id === question.id),
+                deleteSuggestion: deleteResults.find(d => d.id === question.id),
+            }));
+
             setSuggestions(combined);
             // Default select all
             setSelectedTextIds(new Set(textResults.map(r => r.id)));
             setSelectedTargetIds(new Set(meaningfulTargetResults.map(r => r.id)));
+            setSelectedPropsIds(new Set(meaningfulPropsResults.map(r => r.id)));
+            setSelectedDeleteIds(new Set(deleteResults.map(r => r.id)));
+            // Select intensity suggestions by default
+            setSelectedIntensityIds(new Set(
+                textResults.filter(r => r.suggested_intensity != null).map(r => r.id)
+            ));
             setStep('review');
         } catch (error) {
             console.error(error);
@@ -131,13 +209,19 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
         setApplying(true);
         try {
             const updates: { id: string; data: Record<string, unknown> }[] = [];
+            const deleteIds = Array.from(selectedDeleteIds);
 
-            // Build update objects combining text and target changes
+            // Build update objects combining text, target, and intensity changes
             suggestions.forEach(suggestion => {
+                if (selectedDeleteIds.has(suggestion.questionId)) return;
+
                 const textSelected = selectedTextIds.has(suggestion.questionId) && suggestion.textSuggestion;
                 const targetSelected = selectedTargetIds.has(suggestion.questionId) && suggestion.targetSuggestion;
+                const propsSelected = selectedPropsIds.has(suggestion.questionId) && suggestion.propsSuggestion;
+                const intensitySelected = selectedIntensityIds.has(suggestion.questionId) &&
+                    suggestion.textSuggestion?.suggested_intensity != null;
 
-                if (textSelected || targetSelected) {
+                if (textSelected || targetSelected || propsSelected || intensitySelected) {
                     const updateData: Record<string, unknown> = {};
 
                     if (textSelected && suggestion.textSuggestion) {
@@ -156,23 +240,49 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                             : null;
                     }
 
+                    if (propsSelected && suggestion.propsSuggestion) {
+                        updateData.required_props = suggestion.propsSuggestion.suggested_required_props &&
+                            suggestion.propsSuggestion.suggested_required_props.length > 0
+                            ? suggestion.propsSuggestion.suggested_required_props
+                            : null;
+                    }
+
+                    if (intensitySelected && suggestion.textSuggestion?.suggested_intensity != null) {
+                        updateData.intensity = suggestion.textSuggestion.suggested_intensity;
+                    }
+
                     if (Object.keys(updateData).length > 0) {
                         updates.push({ id: suggestion.questionId, data: updateData });
                     }
                 }
             });
 
-            if (updates.length === 0) {
+            if (updates.length === 0 && deleteIds.length === 0) {
                 onOpenChange(false);
                 return;
             }
 
-            // Apply updates in parallel with audit logging
-            await Promise.all(updates.map(update =>
+            // Apply updates/deletions in parallel with audit logging
+            const operations: Promise<unknown>[] = updates.map(update =>
                 auditedSupabase.update('questions', update.id, update.data)
-            ));
+            );
 
-            toast.success(`Updated ${updates.length} questions`);
+            if (deleteIds.length > 0) {
+                operations.push(
+                    auditedSupabase.deleteMany('questions', deleteIds).then(result => {
+                        if (result.error) throw result.error;
+                    })
+                );
+            }
+
+            await Promise.all(operations);
+
+            const updateMessage = updates.length > 0 ? `Updated ${updates.length} questions` : null;
+            const deleteMessage = deleteIds.length > 0 ? `Deleted ${deleteIds.length} questions` : null;
+            const message = [updateMessage, deleteMessage].filter(Boolean).join('. ');
+            if (message) {
+                toast.success(message);
+            }
             onUpdated();
             handleClose();
         } catch (error) {
@@ -190,6 +300,9 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
             setSuggestions([]);
             setSelectedTextIds(new Set());
             setSelectedTargetIds(new Set());
+            setSelectedPropsIds(new Set());
+            setSelectedIntensityIds(new Set());
+            setSelectedDeleteIds(new Set());
         }, 300);
     };
 
@@ -207,6 +320,27 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
         setSelectedTargetIds(next);
     };
 
+    const togglePropsSelection = (id: string) => {
+        const next = new Set(selectedPropsIds);
+        if (next.has(id)) next.delete(id);
+        else next.add(id);
+        setSelectedPropsIds(next);
+    };
+
+    const toggleIntensitySelection = (id: string) => {
+        const next = new Set(selectedIntensityIds);
+        if (next.has(id)) next.delete(id);
+        else next.add(id);
+        setSelectedIntensityIds(next);
+    };
+
+    const toggleDeleteSelection = (id: string) => {
+        const next = new Set(selectedDeleteIds);
+        if (next.has(id)) next.delete(id);
+        else next.add(id);
+        setSelectedDeleteIds(next);
+    };
+
     const formatTargets = (targets: string[] | null) => {
         if (!targets || targets.length === 0) return 'All';
         return targets.map(t => t.replace('male+male', 'M+M').replace('female+male', 'M+F').replace('female+female', 'F+F')).join(', ');
@@ -217,35 +351,89 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
         return targets.map(t => t.charAt(0).toUpperCase() + t.slice(1)).join(', ');
     };
 
+    const formatProps = (props: string[] | null | undefined) => {
+        if (!props || props.length === 0) return 'None';
+        return props.join(', ');
+    };
+
+    const formatDeleteCategory = (category?: DeletionAnalysis['category']) => {
+        switch (category) {
+            case 'duplicate':
+                return 'Duplicate';
+            case 'redundant':
+                return 'Redundant';
+            case 'off-tone':
+                return 'Off tone';
+            case 'unsafe':
+                return 'Unsafe';
+            case 'too-vague':
+                return 'Too vague';
+            case 'broken':
+                return 'Broken';
+            case 'off-topic':
+                return 'Off topic';
+            default:
+                return 'Delete';
+        }
+    };
+
+    const getQuestionTextById = (id?: string | null) => {
+        if (!id) return null;
+        const match = questions.find(q => q.id === id);
+        return match ? match.text : null;
+    };
+
     // Count suggestions by type
     const textSuggestionCount = suggestions.filter(s => s.textSuggestion).length;
     const targetSuggestionCount = suggestions.filter(s => s.targetSuggestion).length;
-    const totalSelectedCount = selectedTextIds.size + selectedTargetIds.size;
+    const propsSuggestionCount = suggestions.filter(s => s.propsSuggestion).length;
+    const intensitySuggestionCount = suggestions.filter(s => s.textSuggestion?.suggested_intensity != null).length;
+    const deleteSuggestionCount = suggestions.filter(s => s.deleteSuggestion).length;
+    const effectiveTextCount = Array.from(selectedTextIds).filter(id => !selectedDeleteIds.has(id)).length;
+    const effectiveTargetCount = Array.from(selectedTargetIds).filter(id => !selectedDeleteIds.has(id)).length;
+    const effectivePropsCount = Array.from(selectedPropsIds).filter(id => !selectedDeleteIds.has(id)).length;
+    const effectiveIntensityCount = Array.from(selectedIntensityIds).filter(id => !selectedDeleteIds.has(id)).length;
+    const totalSelectedCount = effectiveTextCount + effectiveTargetCount + effectivePropsCount + effectiveIntensityCount + selectedDeleteIds.size;
+    const hasSuggestions = textSuggestionCount > 0 || targetSuggestionCount > 0 || propsSuggestionCount > 0 || intensitySuggestionCount > 0 || deleteSuggestionCount > 0;
 
     // Select all/none helpers
     const selectAllText = () => setSelectedTextIds(new Set(suggestions.filter(s => s.textSuggestion).map(s => s.questionId)));
     const selectNoneText = () => setSelectedTextIds(new Set());
     const selectAllTargets = () => setSelectedTargetIds(new Set(suggestions.filter(s => s.targetSuggestion).map(s => s.questionId)));
     const selectNoneTargets = () => setSelectedTargetIds(new Set());
+    const selectAllProps = () => setSelectedPropsIds(new Set(suggestions.filter(s => s.propsSuggestion).map(s => s.questionId)));
+    const selectNoneProps = () => setSelectedPropsIds(new Set());
+    const selectAllIntensity = () => setSelectedIntensityIds(new Set(
+        suggestions.filter(s => s.textSuggestion?.suggested_intensity != null).map(s => s.questionId)
+    ));
+    const selectNoneIntensity = () => setSelectedIntensityIds(new Set());
+    const selectAllDeletes = () => setSelectedDeleteIds(new Set(suggestions.filter(s => s.deleteSuggestion).map(s => s.questionId)));
+    const selectNoneDeletes = () => setSelectedDeleteIds(new Set());
     const selectAll = () => {
         selectAllText();
         selectAllTargets();
+        selectAllProps();
+        selectAllIntensity();
+        selectAllDeletes();
     };
     const selectNone = () => {
         selectNoneText();
         selectNoneTargets();
+        selectNoneProps();
+        selectNoneIntensity();
+        selectNoneDeletes();
     };
 
     return (
         <Dialog open={open} onOpenChange={handleClose}>
-            <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col">
+            <DialogContent className="max-w-[95vw] w-full h-[95vh] flex flex-col">
                 <DialogHeader>
                     <DialogTitle className="flex items-center gap-2">
                         <Sparkles className="h-5 w-5 text-amber-500" />
                         Review Questions
                     </DialogTitle>
                     <DialogDescription>
-                        AI-powered analysis to improve text phrasing and fix audience targeting.
+                        AI-powered analysis to improve phrasing, identify props, fix targeting, and suggest deletions.
                     </DialogDescription>
                 </DialogHeader>
 
@@ -258,7 +446,7 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                             <div className="space-y-2">
                                 <h3 className="text-lg font-medium">Ready to analyze {questions.length} questions</h3>
                                 <p className="text-muted-foreground max-w-lg mx-auto">
-                                    The AI will analyze all questions and suggest improvements for:
+                                    The AI will analyze all questions and suggest improvements or removals for:
                                 </p>
                             </div>
                             <div className="flex gap-4">
@@ -270,6 +458,18 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                     <ShieldCheck className="h-5 w-5 text-indigo-400" />
                                     <span className="text-sm font-medium text-indigo-300">Audience Targeting</span>
                                 </div>
+                                <div className="flex items-center gap-2 bg-cyan-500/20 px-4 py-2 rounded-lg">
+                                    <Package className="h-5 w-5 text-cyan-400" />
+                                    <span className="text-sm font-medium text-cyan-300">Required Props</span>
+                                </div>
+                                <div className="flex items-center gap-2 bg-amber-500/20 px-4 py-2 rounded-lg">
+                                    <Gauge className="h-5 w-5 text-amber-400" />
+                                    <span className="text-sm font-medium text-amber-300">Intensity Level</span>
+                                </div>
+                                <div className="flex items-center gap-2 bg-rose-500/20 px-4 py-2 rounded-lg">
+                                    <Trash2 className="h-5 w-5 text-rose-400" />
+                                    <span className="text-sm font-medium text-rose-300">Deletion Suggestions</span>
+                                </div>
                             </div>
                             <Button onClick={handleAnalyze} disabled={analyzing} size="lg" className="bg-amber-600 hover:bg-amber-700">
                                 {analyzing ? (
@@ -284,7 +484,7 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                         </div>
                     ) : (
                         <div className="space-y-4">
-                            {suggestions.length === 0 ? (
+                            {!hasSuggestions ? (
                                 <div className="text-center py-8 text-muted-foreground">
                                     <Check className="h-8 w-8 mx-auto mb-2 text-green-500" />
                                     All questions look great! No improvements needed.
@@ -302,6 +502,18 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                 <ShieldCheck className="h-4 w-4 text-indigo-500" />
                                                 {targetSuggestionCount} target fixes
                                             </span>
+                                            <span className="flex items-center gap-1">
+                                                <Package className="h-4 w-4 text-cyan-500" />
+                                                {propsSuggestionCount} props fixes
+                                            </span>
+                                            <span className="flex items-center gap-1">
+                                                <Gauge className="h-4 w-4 text-amber-500" />
+                                                {intensitySuggestionCount} intensity fixes
+                                            </span>
+                                            <span className="flex items-center gap-1">
+                                                <Trash2 className="h-4 w-4 text-rose-500" />
+                                                {deleteSuggestionCount} delete suggestions
+                                            </span>
                                         </div>
                                         <div className="flex items-center gap-2">
                                             <Button variant="ghost" size="sm" onClick={selectAll}>
@@ -313,12 +525,12 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                         </div>
                                     </div>
 
-                                    <div className="border rounded-md">
+                                    <div className="border rounded-md overflow-hidden">
                                         <Table>
                                             <TableHeader>
                                                 <TableRow>
-                                                    <TableHead className="w-[300px]">Question</TableHead>
-                                                    <TableHead>
+                                                    <TableHead className="w-[18%] min-w-[180px]">Question</TableHead>
+                                                    <TableHead className="w-[26%]">
                                                         <div className="flex items-center gap-2">
                                                             <Wand2 className="h-4 w-4 text-purple-500" />
                                                             Text Fix
@@ -332,7 +544,7 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                             </Button>
                                                         </div>
                                                     </TableHead>
-                                                    <TableHead>
+                                                    <TableHead className="w-[18%]">
                                                         <div className="flex items-center gap-2">
                                                             <ShieldCheck className="h-4 w-4 text-indigo-500" />
                                                             Target Fix
@@ -346,32 +558,83 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                             </Button>
                                                         </div>
                                                     </TableHead>
+                                                    <TableHead className="w-[18%]">
+                                                        <div className="flex items-center gap-2">
+                                                            <Package className="h-4 w-4 text-cyan-500" />
+                                                            Props
+                                                            <Button
+                                                                variant="ghost"
+                                                                size="sm"
+                                                                className="h-6 px-2 text-xs"
+                                                                onClick={() => selectedPropsIds.size === propsSuggestionCount ? selectNoneProps() : selectAllProps()}
+                                                            >
+                                                                {selectedPropsIds.size === propsSuggestionCount ? 'None' : 'All'}
+                                                            </Button>
+                                                        </div>
+                                                    </TableHead>
+                                                    <TableHead className="w-[10%]">
+                                                        <div className="flex items-center gap-2">
+                                                            <Gauge className="h-4 w-4 text-amber-500" />
+                                                            Intensity
+                                                            {intensitySuggestionCount > 0 && (
+                                                                <Button
+                                                                    variant="ghost"
+                                                                    size="sm"
+                                                                    className="h-6 px-2 text-xs"
+                                                                    onClick={() => selectedIntensityIds.size === intensitySuggestionCount ? selectNoneIntensity() : selectAllIntensity()}
+                                                                >
+                                                                    {selectedIntensityIds.size === intensitySuggestionCount ? 'None' : 'All'}
+                                                                </Button>
+                                                            )}
+                                                        </div>
+                                                    </TableHead>
+                                                    <TableHead className="w-[10%]">
+                                                        <div className="flex items-center gap-2">
+                                                            <Trash2 className="h-4 w-4 text-rose-500" />
+                                                            Delete
+                                                            {deleteSuggestionCount > 0 && (
+                                                                <Button
+                                                                    variant="ghost"
+                                                                    size="sm"
+                                                                    className="h-6 px-2 text-xs"
+                                                                    onClick={() => selectedDeleteIds.size === deleteSuggestionCount ? selectNoneDeletes() : selectAllDeletes()}
+                                                                >
+                                                                    {selectedDeleteIds.size === deleteSuggestionCount ? 'None' : 'All'}
+                                                                </Button>
+                                                            )}
+                                                        </div>
+                                                    </TableHead>
                                                 </TableRow>
                                             </TableHeader>
                                             <TableBody>
                                                 {suggestions.map((suggestion) => (
                                                     <TableRow key={suggestion.questionId}>
                                                         {/* Question Column */}
-                                                        <TableCell className="align-top">
-                                                            <div className="text-sm font-medium line-clamp-2">{suggestion.question.text}</div>
+                                                        <TableCell className="align-top py-3">
+                                                            <div className="text-sm font-medium">{suggestion.question.text}</div>
+                                                            <div className="mt-1">
+                                                                <Badge variant="outline" className="text-[10px] uppercase tracking-wide text-muted-foreground">
+                                                                    {QUESTION_TYPE_LABELS[suggestion.question.question_type ?? 'swipe']}
+                                                                </Badge>
+                                                            </div>
                                                             {suggestion.question.partner_text && (
-                                                                <div className="text-xs text-muted-foreground mt-1 italic line-clamp-1">
+                                                                <div className="text-xs text-muted-foreground mt-1.5 italic">
                                                                     Partner: {suggestion.question.partner_text}
                                                                 </div>
                                                             )}
                                                         </TableCell>
 
                                                         {/* Text Fix Column */}
-                                                        <TableCell className="align-top">
+                                                        <TableCell className="align-top py-3">
                                                             {suggestion.textSuggestion ? (
                                                                 <div
-                                                                    className={`p-2 rounded-lg border cursor-pointer transition-colors ${selectedTextIds.has(suggestion.questionId)
+                                                                    className={`p-3 rounded-lg border cursor-pointer transition-colors ${selectedTextIds.has(suggestion.questionId)
                                                                             ? 'bg-purple-500/20 border-purple-500/50'
                                                                             : 'bg-muted/30 border-transparent hover:bg-muted/50'
                                                                         }`}
                                                                     onClick={() => toggleTextSelection(suggestion.questionId)}
                                                                 >
-                                                                    <div className="flex items-start gap-2">
+                                                                    <div className="flex items-start gap-3">
                                                                         <Checkbox
                                                                             checked={selectedTextIds.has(suggestion.questionId)}
                                                                             onCheckedChange={() => toggleTextSelection(suggestion.questionId)}
@@ -382,11 +645,11 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                                                 {suggestion.textSuggestion.suggested_text}
                                                                             </div>
                                                                             {suggestion.textSuggestion.suggested_partner_text && (
-                                                                                <div className="text-xs text-purple-400 mt-1 italic">
+                                                                                <div className="text-xs text-purple-400 mt-1.5 italic">
                                                                                     Partner: {suggestion.textSuggestion.suggested_partner_text}
                                                                                 </div>
                                                                             )}
-                                                                            <div className="text-xs text-muted-foreground mt-1">
+                                                                            <div className="text-xs text-muted-foreground mt-2">
                                                                                 {suggestion.textSuggestion.reason}
                                                                             </div>
                                                                         </div>
@@ -401,16 +664,16 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                         </TableCell>
 
                                                         {/* Target Fix Column */}
-                                                        <TableCell className="align-top">
+                                                        <TableCell className="align-top py-3">
                                                             {suggestion.targetSuggestion ? (
                                                                 <div
-                                                                    className={`p-2 rounded-lg border cursor-pointer transition-colors ${selectedTargetIds.has(suggestion.questionId)
+                                                                    className={`p-3 rounded-lg border cursor-pointer transition-colors ${selectedTargetIds.has(suggestion.questionId)
                                                                             ? 'bg-indigo-500/20 border-indigo-500/50'
                                                                             : 'bg-muted/30 border-transparent hover:bg-muted/50'
                                                                         }`}
                                                                     onClick={() => toggleTargetSelection(suggestion.questionId)}
                                                                 >
-                                                                    <div className="flex items-start gap-2">
+                                                                    <div className="flex items-start gap-3">
                                                                         <Checkbox
                                                                             checked={selectedTargetIds.has(suggestion.questionId)}
                                                                             onCheckedChange={() => toggleTargetSelection(suggestion.questionId)}
@@ -418,26 +681,28 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                                         />
                                                                         <div className="flex-1 min-w-0 space-y-2">
                                                                             {/* Couple targets */}
-                                                                            <div className="flex items-center gap-1 flex-wrap">
-                                                                                <Badge variant="outline" className="text-[10px] text-muted-foreground">
+                                                                            <div className="flex items-center gap-2 flex-wrap">
+                                                                                <span className="text-xs text-muted-foreground">Couples:</span>
+                                                                                <Badge variant="outline" className="text-xs text-muted-foreground">
                                                                                     {formatTargets(suggestion.question.allowed_couple_genders)}
                                                                                 </Badge>
                                                                                 <ArrowRight className="h-3 w-3 text-muted-foreground" />
-                                                                                <Badge className="text-[10px] bg-indigo-500/30 text-indigo-300 hover:bg-indigo-500/30">
+                                                                                <Badge className="text-xs bg-indigo-500/30 text-indigo-300 hover:bg-indigo-500/30">
                                                                                     {formatTargets(suggestion.targetSuggestion.suggested_targets)}
                                                                                 </Badge>
                                                                             </div>
                                                                             {/* Initiator */}
-                                                                            <div className="flex items-center gap-1 flex-wrap">
-                                                                                <Badge variant="outline" className="text-[10px] text-muted-foreground border-orange-500/50">
+                                                                            <div className="flex items-center gap-2 flex-wrap">
+                                                                                <span className="text-xs text-muted-foreground">Initiator:</span>
+                                                                                <Badge variant="outline" className="text-xs text-muted-foreground border-orange-500/50">
                                                                                     {formatInitiator(suggestion.question.target_user_genders)}
                                                                                 </Badge>
                                                                                 <ArrowRight className="h-3 w-3 text-muted-foreground" />
-                                                                                <Badge className="text-[10px] bg-orange-500/30 text-orange-300 hover:bg-orange-500/30">
+                                                                                <Badge className="text-xs bg-orange-500/30 text-orange-300 hover:bg-orange-500/30">
                                                                                     {formatInitiator(suggestion.targetSuggestion.suggested_initiator)}
                                                                                 </Badge>
                                                                             </div>
-                                                                            <div className="text-xs text-muted-foreground">
+                                                                            <div className="text-xs text-muted-foreground mt-2">
                                                                                 {suggestion.targetSuggestion.reason}
                                                                             </div>
                                                                         </div>
@@ -450,6 +715,130 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                                                 </div>
                                                             )}
                                                         </TableCell>
+
+                                                        {/* Props Column */}
+                                                        <TableCell className="align-top py-3">
+                                                            {suggestion.propsSuggestion ? (
+                                                                <div
+                                                                    className={`p-3 rounded-lg border cursor-pointer transition-colors ${selectedPropsIds.has(suggestion.questionId)
+                                                                            ? 'bg-cyan-500/20 border-cyan-500/50'
+                                                                            : 'bg-muted/30 border-transparent hover:bg-muted/50'
+                                                                        }`}
+                                                                    onClick={() => togglePropsSelection(suggestion.questionId)}
+                                                                >
+                                                                    <div className="flex items-start gap-3">
+                                                                        <Checkbox
+                                                                            checked={selectedPropsIds.has(suggestion.questionId)}
+                                                                            onCheckedChange={() => togglePropsSelection(suggestion.questionId)}
+                                                                            className="mt-0.5"
+                                                                        />
+                                                                        <div className="flex-1 min-w-0 space-y-2">
+                                                                            <div className="flex items-center gap-2 flex-wrap">
+                                                                                <span className="text-xs text-muted-foreground">Current:</span>
+                                                                                <Badge variant="outline" className="text-xs text-muted-foreground">
+                                                                                    {formatProps(suggestion.question.required_props)}
+                                                                                </Badge>
+                                                                                <ArrowRight className="h-3 w-3 text-muted-foreground" />
+                                                                                <Badge className="text-xs bg-cyan-500/30 text-cyan-300 hover:bg-cyan-500/30">
+                                                                                    {formatProps(suggestion.propsSuggestion.suggested_required_props)}
+                                                                                </Badge>
+                                                                            </div>
+                                                                            <div className="text-xs text-muted-foreground mt-2">
+                                                                                {suggestion.propsSuggestion.reason}
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            ) : (
+                                                                <div className="text-xs text-muted-foreground p-2">
+                                                                    <Check className="h-4 w-4 text-green-500 inline mr-1" />
+                                                                    No changes needed
+                                                                </div>
+                                                            )}
+                                                        </TableCell>
+
+                                                        {/* Intensity Column */}
+                                                        <TableCell className="align-top py-3">
+                                                            <div className="flex items-center gap-2 mb-1">
+                                                                <Badge variant="outline" className="text-xs">
+                                                                    Current: {suggestion.question.intensity}
+                                                                </Badge>
+                                                            </div>
+                                                            {suggestion.textSuggestion?.suggested_intensity != null ? (
+                                                                <div
+                                                                    className={`p-2 rounded-lg border cursor-pointer transition-colors ${selectedIntensityIds.has(suggestion.questionId)
+                                                                            ? 'bg-amber-500/20 border-amber-500/50'
+                                                                            : 'bg-muted/30 border-transparent hover:bg-muted/50'
+                                                                        }`}
+                                                                    onClick={() => toggleIntensitySelection(suggestion.questionId)}
+                                                                >
+                                                                    <div className="flex items-start gap-2">
+                                                                        <Checkbox
+                                                                            checked={selectedIntensityIds.has(suggestion.questionId)}
+                                                                            onCheckedChange={() => toggleIntensitySelection(suggestion.questionId)}
+                                                                            className="mt-0.5"
+                                                                        />
+                                                                        <div className="flex-1 min-w-0">
+                                                                            <div className="flex items-center gap-2">
+                                                                                <ArrowRight className="h-3 w-3 text-muted-foreground" />
+                                                                                <Badge className="text-xs bg-amber-500/30 text-amber-300 hover:bg-amber-500/30">
+                                                                                    {suggestion.textSuggestion.suggested_intensity}
+                                                                                </Badge>
+                                                                            </div>
+                                                                            {suggestion.textSuggestion.intensity_reason && (
+                                                                                <div className="text-xs text-muted-foreground mt-1">
+                                                                                    {suggestion.textSuggestion.intensity_reason}
+                                                                                </div>
+                                                                            )}
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            ) : (
+                                                                <div className="text-xs text-muted-foreground">
+                                                                    <Check className="h-4 w-4 text-green-500 inline mr-1" />
+                                                                    Correct
+                                                                </div>
+                                                            )}
+                                                        </TableCell>
+
+                                                        {/* Delete Column */}
+                                                        <TableCell className="align-top py-3">
+                                                            {suggestion.deleteSuggestion ? (
+                                                                <div
+                                                                    className={`p-3 rounded-lg border cursor-pointer transition-colors ${selectedDeleteIds.has(suggestion.questionId)
+                                                                            ? 'bg-rose-500/20 border-rose-500/50'
+                                                                            : 'bg-muted/30 border-transparent hover:bg-muted/50'
+                                                                        }`}
+                                                                    onClick={() => toggleDeleteSelection(suggestion.questionId)}
+                                                                >
+                                                                    <div className="flex items-start gap-3">
+                                                                        <Checkbox
+                                                                            checked={selectedDeleteIds.has(suggestion.questionId)}
+                                                                            onCheckedChange={() => toggleDeleteSelection(suggestion.questionId)}
+                                                                            className="mt-0.5"
+                                                                        />
+                                                                        <div className="flex-1 min-w-0">
+                                                                            <div className="text-sm text-rose-300 font-medium">
+                                                                                {formatDeleteCategory(suggestion.deleteSuggestion.category)} recommended
+                                                                            </div>
+                                                                            {suggestion.deleteSuggestion.duplicate_of_id && (
+                                                                                <div className="text-xs text-rose-400 mt-1">
+                                                                                    Duplicate of: {getQuestionTextById(suggestion.deleteSuggestion.duplicate_of_id) || 'Another question'}
+                                                                                </div>
+                                                                            )}
+                                                                            <div className="text-xs text-muted-foreground mt-2">
+                                                                                {suggestion.deleteSuggestion.reason}
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            ) : (
+                                                                <div className="text-xs text-muted-foreground p-2">
+                                                                    <Check className="h-4 w-4 text-green-500 inline mr-1" />
+                                                                    Keep
+                                                                </div>
+                                                            )}
+                                                        </TableCell>
                                                     </TableRow>
                                                 ))}
                                             </TableBody>
@@ -478,7 +867,7 @@ export function ReviewQuestionsDialog({ open, onOpenChange, questions, isExplici
                                         Applying...
                                     </>
                                 ) : (
-                                    `Apply ${totalSelectedCount} Changes`
+                                    `Apply ${totalSelectedCount} Actions`
                                 )}
                             </Button>
                         </>

apps/admin/src/components/layout/Breadcrumbs.tsx

@@ -109,6 +109,8 @@ function useBreadcrumbs(): { breadcrumbs: BreadcrumbItem[]; loading: boolean } {
             });
         } else if (segment === 'questions' && params.packId) {
             breadcrumbs.push({ label: 'Questions', href: currentPath });
+        } else if (segment === 'tags') {
+            breadcrumbs.push({ label: 'Tags', href: '/tags' });
         } else if (segment === 'users') {
             breadcrumbs.push({ label: 'Users', href: '/users' });
             // If we have a userId, add the user's name as a breadcrumb

apps/admin/src/components/layout/Sidebar.tsx

@@ -18,6 +18,9 @@ import {
     Home,
     Activity,
     AlertTriangle,
+    PieChart,
+    Tags,
+    Zap,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
@@ -47,6 +50,24 @@ const contentNav: NavItem[] = [
         icon: <LayoutGrid className="h-5 w-5" />,
         requiredPermission: PERMISSION_KEYS.MANAGE_CATEGORIES,
     },
+    {
+        label: 'Dare Packs',
+        href: '/dare-packs',
+        icon: <Zap className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.MANAGE_PACKS,
+    },
+    {
+        label: 'Question Analytics',
+        href: '/question-analytics',
+        icon: <PieChart className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.MANAGE_QUESTIONS,
+    },
+    {
+        label: 'Tags',
+        href: '/tags',
+        icon: <Tags className="h-5 w-5" />,
+        requiredPermission: PERMISSION_KEYS.MANAGE_PACKS,
+    },
 ];
 
 const usersNav: NavItem[] = [

apps/admin/src/components/ui/checkbox.tsx

@@ -3,15 +3,16 @@ import { cn } from "@/lib/utils";
 import { Check } from "lucide-react";
 
 export interface CheckboxProps
-    extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'type' | 'onChange'> {
+    extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'onChange'> {
     checked?: boolean;
     onCheckedChange?: (checked: boolean) => void;
 }
 
-const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
+const Checkbox = React.forwardRef<HTMLButtonElement, CheckboxProps>(
     ({ className, checked, onCheckedChange, ...props }, ref) => {
         return (
             <button
+                ref={ref}
                 type="button"
                 role="checkbox"
                 aria-checked={checked}

apps/admin/src/components/ui/icon-picker.tsx

@@ -1,48 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import type { IconType } from 'react-icons';
-import {
-    IoHeartOutline,
-    IoHeartHalfOutline,
-    IoHeartCircleOutline,
-    IoChatbubblesOutline,
-    IoChatboxOutline,
-    IoMailOutline,
-    IoFlowerOutline,
-    IoWineOutline,
-    IoRestaurantOutline,
-    IoCafeOutline,
-    IoAirplaneOutline,
-    IoCarOutline,
-    IoCompassOutline,
-    IoMapOutline,
-    IoHomeOutline,
-    IoPeopleOutline,
-    IoPersonOutline,
-    IoEyeOffOutline,
-    IoKeyOutline,
-    IoLockClosedOutline,
-    IoDiceOutline,
-    IoGiftOutline,
-    IoSparklesOutline,
-    IoStarOutline,
-    IoFlameOutline,
-    IoFlashOutline,
-    IoMoonOutline,
-    IoSunnyOutline,
-    IoFlagOutline,
-    IoCalendarOutline,
-    IoCheckboxOutline,
-    IoTrophyOutline,
-    IoLayersOutline,
-    IoCubeOutline,
-    IoFolderOutline,
-    IoBookmarkOutline,
-    IoBulbOutline,
-    IoColorWandOutline,
-    IoSyncOutline,
-    IoRefreshOutline,
-    IoBriefcaseOutline,
-} from 'react-icons/io5';
+import * as Io5Icons from 'react-icons/io5';
 import { Button } from './button';
 import { Input } from './input';
 
@@ -51,68 +9,28 @@ interface IconOption {
     Icon: IconType;
 }
 
-const ICON_OPTIONS: IconOption[] = [
-    // Relationships & Love
-    { name: 'heart-outline', Icon: IoHeartOutline },
-    { name: 'heart-half-outline', Icon: IoHeartHalfOutline },
-    { name: 'heart-circle-outline', Icon: IoHeartCircleOutline },
+/**
+ * Convert PascalCase component name to kebab-case Ionicon name.
+ * e.g., "IoHeartOutline" -> "heart-outline"
+ */
+function toKebabCase(componentName: string): string {
+    // Remove "Io" prefix
+    const withoutPrefix = componentName.slice(2);
+    // Convert PascalCase to kebab-case
+    return withoutPrefix
+        .replace(/([a-z])([A-Z])/g, '$1-$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1-$2')
+        .toLowerCase();
+}
 
-    // Communication
-    { name: 'chatbubbles-outline', Icon: IoChatbubblesOutline },
-    { name: 'chatbox-outline', Icon: IoChatboxOutline },
-    { name: 'mail-outline', Icon: IoMailOutline },
-
-    // Romance & Dates
-    { name: 'flower-outline', Icon: IoFlowerOutline },
-    { name: 'wine-outline', Icon: IoWineOutline },
-    { name: 'restaurant-outline', Icon: IoRestaurantOutline },
-    { name: 'cafe-outline', Icon: IoCafeOutline },
-
-    // Adventure & Travel
-    { name: 'airplane-outline', Icon: IoAirplaneOutline },
-    { name: 'car-outline', Icon: IoCarOutline },
-    { name: 'compass-outline', Icon: IoCompassOutline },
-    { name: 'map-outline', Icon: IoMapOutline },
-
-    // Home & Family
-    { name: 'home-outline', Icon: IoHomeOutline },
-    { name: 'people-outline', Icon: IoPeopleOutline },
-    { name: 'person-outline', Icon: IoPersonOutline },
-
-    // Mystery & Secrets
-    { name: 'eye-off-outline', Icon: IoEyeOffOutline },
-    { name: 'key-outline', Icon: IoKeyOutline },
-    { name: 'lock-closed-outline', Icon: IoLockClosedOutline },
-
-    // Fun & Games
-    { name: 'dice-outline', Icon: IoDiceOutline },
-    { name: 'gift-outline', Icon: IoGiftOutline },
-    { name: 'sparkles-outline', Icon: IoSparklesOutline },
-    { name: 'star-outline', Icon: IoStarOutline },
-
-    // Intimacy
-    { name: 'flame-outline', Icon: IoFlameOutline },
-    { name: 'flash-outline', Icon: IoFlashOutline },
-    { name: 'moon-outline', Icon: IoMoonOutline },
-    { name: 'sunny-outline', Icon: IoSunnyOutline },
-
-    // Goals & Planning
-    { name: 'flag-outline', Icon: IoFlagOutline },
-    { name: 'calendar-outline', Icon: IoCalendarOutline },
-    { name: 'checkbox-outline', Icon: IoCheckboxOutline },
-    { name: 'trophy-outline', Icon: IoTrophyOutline },
-
-    // General
-    { name: 'layers-outline', Icon: IoLayersOutline },
-    { name: 'cube-outline', Icon: IoCubeOutline },
-    { name: 'folder-outline', Icon: IoFolderOutline },
-    { name: 'bookmark-outline', Icon: IoBookmarkOutline },
-    { name: 'bulb-outline', Icon: IoBulbOutline },
-    { name: 'color-wand-outline', Icon: IoColorWandOutline },
-    { name: 'sync-outline', Icon: IoSyncOutline },
-    { name: 'refresh-outline', Icon: IoRefreshOutline },
-    { name: 'briefcase-outline', Icon: IoBriefcaseOutline },
-];
+// Build icon options from all Io5 icons dynamically
+const ICON_OPTIONS: IconOption[] = Object.entries(Io5Icons)
+    .filter(([name]) => name.startsWith('Io'))
+    .map(([componentName, Icon]) => ({
+        name: toKebabCase(componentName),
+        Icon: Icon as IconType,
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name));
 
 const ICONS_BY_NAME = ICON_OPTIONS.reduce<Record<string, IconOption>>((acc, option) => {
     acc[option.name] = option;
@@ -168,8 +86,9 @@ export function IconPicker({ value, onChange }: IconPickerProps) {
         return ICON_OPTIONS.filter((option) => option.name.includes(normalized));
     }, [query]);
 
-    const SelectedIcon = ICONS_BY_NAME[value]?.Icon;
-    const buttonLabel = SelectedIcon ? value : value ? 'Legacy icon' : 'Select an icon';
+    const selectedOption = ICONS_BY_NAME[value];
+    const SelectedIcon = selectedOption?.Icon;
+    const buttonLabel = selectedOption ? value : value ? 'Legacy icon' : 'Select an icon';
 
     return (
         <div className="relative" ref={containerRef}>

apps/admin/src/components/ui/pagination.tsx

@@ -0,0 +1,97 @@
+import { ChevronLeft, ChevronRight } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
+import { cn } from '@/lib/utils';
+
+type PaginationControlsProps = {
+    page: number;
+    pageSize: number;
+    totalCount: number;
+    onPageChange: (page: number) => void;
+    onPageSizeChange?: (pageSize: number) => void;
+    pageSizeOptions?: number[];
+    showPageSize?: boolean;
+    className?: string;
+};
+
+export function PaginationControls({
+    page,
+    pageSize,
+    totalCount,
+    onPageChange,
+    onPageSizeChange,
+    pageSizeOptions = [10, 25, 50],
+    showPageSize = true,
+    className,
+}: PaginationControlsProps) {
+    const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+    const safePage = Math.min(Math.max(page, 1), totalPages);
+    const start = totalCount === 0 ? 0 : (safePage - 1) * pageSize + 1;
+    const end = totalCount === 0 ? 0 : Math.min(safePage * pageSize, totalCount);
+
+    return (
+        <div
+            className={cn(
+                'flex flex-col gap-2 text-sm text-muted-foreground sm:flex-row sm:items-center sm:justify-between',
+                className
+            )}
+        >
+            <div>
+                {totalCount === 0
+                    ? 'No results'
+                    : `Showing ${start} to ${end} of ${totalCount}`}
+            </div>
+            <div className="flex flex-wrap items-center gap-2">
+                {showPageSize && onPageSizeChange && (
+                    <div className="flex items-center gap-2">
+                        <span className="text-xs uppercase tracking-wide text-muted-foreground">Rows</span>
+                        <Select
+                            value={String(pageSize)}
+                            onValueChange={(value) => onPageSizeChange(Number(value))}
+                        >
+                            <SelectTrigger className="h-8 w-[90px]">
+                                <SelectValue />
+                            </SelectTrigger>
+                            <SelectContent>
+                                {pageSizeOptions.map((size) => (
+                                    <SelectItem key={size} value={String(size)}>
+                                        {size}
+                                    </SelectItem>
+                                ))}
+                            </SelectContent>
+                        </Select>
+                    </div>
+                )}
+                <div className="flex items-center gap-2">
+                    <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => onPageChange(Math.max(1, safePage - 1))}
+                        disabled={safePage <= 1}
+                    >
+                        <ChevronLeft className="mr-1 h-4 w-4" />
+                        Prev
+                    </Button>
+                    <span className="text-xs text-muted-foreground">
+                        Page {safePage} of {totalPages}
+                    </span>
+                    <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => onPageChange(Math.min(totalPages, safePage + 1))}
+                        disabled={safePage >= totalPages}
+                    >
+                        Next
+                        <ChevronRight className="ml-1 h-4 w-4" />
+                    </Button>
+                </div>
+            </div>
+        </div>
+    );
+}

apps/admin/src/contexts/AuthContext.tsx

@@ -20,6 +20,7 @@ export const PERMISSION_KEYS = {
     VIEW_RESPONSES: 'view_responses',
     VIEW_ACTIVITY: 'view_activity',
     MANAGE_FEEDBACK: 'manage_feedback',
+    GIFT_PREMIUM: 'gift_premium',
     // System permissions
     MANAGE_CODES: 'manage_codes',
     MANAGE_ADMINS: 'manage_admins',
@@ -42,6 +43,7 @@ export const PERMISSION_METADATA: Record<PermissionKey, { label: string; descrip
     [PERMISSION_KEYS.VIEW_RESPONSES]: { label: 'Can view responses', description: 'View user question responses', group: 'users' },
     [PERMISSION_KEYS.VIEW_ACTIVITY]: { label: 'Can view activity', description: 'View user activity feed (responses, matches, messages, signups)', group: 'users' },
     [PERMISSION_KEYS.MANAGE_FEEDBACK]: { label: 'Can manage feedback', description: 'View and respond to user feedback', group: 'users' },
+    [PERMISSION_KEYS.GIFT_PREMIUM]: { label: 'Can gift premium', description: 'Manually upgrade users to premium status', group: 'users' },
     [PERMISSION_KEYS.MANAGE_CODES]: { label: 'Can manage redemption codes', description: 'Create and view redemption codes', group: 'system' },
     [PERMISSION_KEYS.MANAGE_ADMINS]: { label: 'Can manage admins', description: 'Add/remove admin users and change permissions', group: 'system' },
     [PERMISSION_KEYS.MANAGE_AI_CONFIG]: { label: 'Can manage AI settings', description: 'Configure AI models, API keys, and council mode', group: 'system' },

apps/admin/src/hooks/useAiConfig.ts

@@ -3,6 +3,7 @@ import { supabase } from '@/config';
 
 export interface CouncilGenerator {
     model: string;
+    temperature?: number;
 }
 
 export type CouncilSelectionMode = 'whole_set' | 'cherry_pick';
@@ -11,18 +12,34 @@ export interface AiConfig {
     id: string;
     openrouter_api_key: string | null;
     default_model: string | null;
+    default_temperature: number | null;
     model_generate: string | null;
+    temperature_generate: number | null;
     model_fix: string | null;
+    temperature_fix: number | null;
     model_polish: string | null;
+    temperature_polish: number | null;
     council_enabled: boolean;
     council_generator_model: string | null; // Legacy - kept for backwards compatibility
     council_generators: CouncilGenerator[] | null; // New array of generators
     council_reviewer_model: string | null;
+    council_reviewer_temperature: number | null;
     council_selection_mode: CouncilSelectionMode | null; // 'whole_set' or 'cherry_pick'
     cherry_pick_ensure_intensity_distribution: boolean | null; // Balance intensity levels in cherry-pick mode
     classifier_enabled: boolean | null;
     classifier_model: string | null;
+    classifier_temperature: number | null;
     classifier_prompt: string | null;
+    heuristics_enabled: boolean | null;
+    heuristic_min_text_length: number | null;
+    heuristic_whitelist_max_length: number | null;
+    heuristic_skip_if_no_alnum: boolean | null;
+    heuristic_skip_media_without_text: boolean | null;
+    heuristic_record_reason: boolean | null;
+    heuristic_use_default_whitelist: boolean | null;
+    heuristic_use_default_keywords: boolean | null;
+    heuristic_whitelist: string | null;
+    heuristic_keyword_triggers: string | null;
     updated_at: string | null;
     updated_by: string | null;
 }

apps/admin/src/hooks/useAppConfig.ts

@@ -4,6 +4,8 @@ import { supabase } from '@/config';
 export interface AppConfig {
     id: string;
     answer_gap_threshold: number;
+    daily_response_limit: number;
+    couple_intensity_gate_enabled: boolean | null;
     updated_at: string | null;
     updated_by: string | null;
 }

apps/admin/src/hooks/useAuditedSupabase.ts

@@ -86,10 +86,10 @@ export const auditedSupabase = {
     /**
      * Update a single record with audit logging
      */
-    async update<T extends { id: string }>(
+    async update<T extends object = Record<string, unknown>>(
         table: string,
         id: string,
-        updates: Partial<T>
+        updates: Partial<T> | Record<string, unknown>
     ): Promise<SingleResult<T>> {
         // Fetch old values before update
         let oldValues: Record<string, unknown> | null = null;

apps/admin/src/hooks/useCrudOperations.ts

@@ -3,7 +3,8 @@ import { supabase } from '@/config';
 import { auditedSupabase } from '@/hooks/useAuditedSupabase';
 import { toast } from 'sonner';
 
-type SupabaseFilterFn<T> = (query: ReturnType<typeof supabase.from>) => ReturnType<typeof supabase.from>;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type SupabaseFilterFn = (query: any) => any;
 
 interface UseCrudOperationsOptions<T> {
     /**
@@ -89,15 +90,16 @@ export function useCrudOperations<T extends { id: string }>({
      * @param filter Optional filter function to modify the query
      */
     const fetchAll = useCallback(async (
-        filter?: SupabaseFilterFn<T>
+        filter?: SupabaseFilterFn
     ): Promise<T[]> => {
         setLoading(true);
         setError(null);
         try {
-            let query = supabase.from(table).select(select);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let query: any = supabase.from(table).select(select);
 
             if (filter) {
-                query = filter(query) as typeof query;
+                query = filter(query);
             }
 
             if (orderBy) {
@@ -155,7 +157,8 @@ export function useCrudOperations<T extends { id: string }>({
     ): Promise<T | null> => {
         const { refetch = true, silent = false } = options;
         try {
-            const { data: created, error: createError } = await auditedSupabase.insert(table, data);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const { data: created, error: createError } = await auditedSupabase.insert(table, data as any);
 
             if (createError) throw createError;
 
@@ -167,7 +170,8 @@ export function useCrudOperations<T extends { id: string }>({
                 await fetchAll();
             }
 
-            return created as T;
+            // auditedSupabase.insert returns T[] | null, get first element
+            return created && created.length > 0 ? (created[0] as T) : null;
         } catch (err) {
             if (!silent) {
                 toast.error(defaultMessages.createError);

apps/admin/src/hooks/useEntityForm.ts

@@ -43,8 +43,8 @@ import { useState, useCallback } from 'react';
  * ```
  */
 export function useEntityForm<
-    TFormData extends Record<string, unknown>,
-    TEntity extends Record<string, unknown> = TFormData
+    TFormData extends object,
+    TEntity extends object = TFormData
 >(
     initialFormData: TFormData,
     /**

apps/admin/src/lib/ai/analyzers/deletions.ts

@@ -0,0 +1,102 @@
+// =============================================================================
+// Deletion Analysis Functions
+// Suggest removals for low-quality or duplicate questions
+// =============================================================================
+
+import { getOpenAI, getModel, getTemperature } from '../client';
+import type { DeletionAnalysis } from '../types';
+
+/**
+ * Analyze questions and suggest deletions (duplicates, unsafe, etc.)
+ */
+export async function analyzeQuestionDeletions(
+    questions: { id: string; text: string; partner_text?: string | null; intensity?: number }[],
+    isExplicit: boolean = false
+): Promise<DeletionAnalysis[]> {
+    const openai = getOpenAI();
+
+    const simplifiedQuestions = questions.map(q => ({
+        id: q.id,
+        text: q.text,
+        partner_text: q.partner_text,
+        intensity: q.intensity,
+    }));
+
+    const toneInstruction = isExplicit
+        ? 'CONTENT: EXPLICIT pack. Adult content is allowed but must be consensual, safe, and clear. Avoid coercion, minors, illegal acts, or unsafe suggestions.'
+        : 'CONTENT: NON-EXPLICIT pack. Do NOT include explicit sexual acts, crude language, or NSFW content. If the core action is sexual, it should be removed, not rewritten.';
+
+    const prompt = `<task>
+Identify questions that should be DELETED instead of edited.
+Only include questions that are better removed than fixed.
+</task>
+
+<content_type>
+${toneInstruction}
+</content_type>
+
+<deletion_categories>
+- duplicate: same core action AND same initiator as another question (near-duplicate). Note: swapped perspectives (e.g., "give" vs "receive") are NOT duplicates.
+- redundant: minor variation with no added value
+- off-tone: violates explicit vs non-explicit rules
+- unsafe: coercion, minors, illegal acts, or consent violations
+- too-vague: not actionable or not a clear proposal
+- broken: grammar/structure too broken to repair without inventing content
+- off-topic: not relevant to a couples intimacy app
+</deletion_categories>
+
+<rules>
+1. Prefer edits over deletions when possible.
+2. Duplicates: delete the weaker/less specific version and keep the clearer one.
+3. If duplicate, set duplicate_of_id to the kept question's id.
+4. Do NOT delete for minor wording issues or intensity mismatches.
+5. IMPORTANT: Asymmetric versions of the same activity are NOT duplicates. If one question has text="Do X to your partner" and another has text="Let your partner do X to you", these are DIFFERENT questions because they have different initiators. Only flag as duplicate if both questions have the SAME initiator doing the SAME action.
+</rules>
+
+<questions_to_analyze>
+${JSON.stringify(simplifiedQuestions)}
+</questions_to_analyze>
+
+<output_format>
+{
+  "deletions": [
+    {
+      "id": string,
+      "category": "duplicate"|"redundant"|"off-tone"|"unsafe"|"too-vague"|"broken"|"off-topic",
+      "reason": string,
+      "duplicate_of_id": string|null
+    }
+  ]
+}
+
+Only return questions that should be deleted.
+</output_format>`;
+
+    const systemMessage = isExplicit
+        ? 'You are a strict content quality reviewer for an adult couples app. Remove only what should be deleted. Always respond with valid JSON only.'
+        : 'You are a strict content quality reviewer for a couples app. Remove only what should be deleted. Always respond with valid JSON only.';
+
+    const response = await openai.chat.completions.create({
+        model: getModel('fix'),
+        messages: [
+            {
+                role: 'system',
+                content: systemMessage,
+            },
+            { role: 'user', content: prompt },
+        ],
+        response_format: { type: 'json_object' },
+        temperature: getTemperature('fix', 0.2),
+    });
+
+    const content = response.choices[0].message.content;
+    if (!content) throw new Error('No content generated');
+
+    let jsonContent = content.trim();
+    if (jsonContent.startsWith('```')) {
+        jsonContent = jsonContent.replace(/^```(?:json)?\s*\n?/, '').replace(/\n?```\s*$/, '');
+    }
+
+    const parsed = JSON.parse(jsonContent);
+    return parsed.deletions || [];
+}

apps/admin/src/lib/ai/analyzers/media.ts

@@ -1,8 +1,53 @@
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
+
+export interface ImageSafetyAnalysis {
+    category: 'SAFE' | 'ADULT_CONTENT' | 'VIOLENCE' | 'MINORS' | 'ILLEGAL' | 'UNCERTAIN';
+    severity: 'none' | 'low' | 'medium' | 'high' | 'critical';
+    description: string;
+    concerns: string[];
+    isAppropriate: boolean;
+}
+
+const SAFETY_ANALYSIS_PROMPT = `<task>
+Analyze this image for content safety in the context of an adult couples intimacy app.
+</task>
+
+<context>
+This app is for ADULT couples (25-45) to explore intimacy. Adult content between consenting adults is expected and acceptable. The concern is inappropriate content like violence, minors, or illegal activity.
+</context>
+
+<categories>
+- SAFE: No concerns, appropriate for the app (including tasteful adult content between adults)
+- ADULT_CONTENT: Explicit content - acceptable for this app but flag for review
+- VIOLENCE: Gore, weapons, abuse, non-consensual acts
+- MINORS: Anyone appearing under 18 years old - CRITICAL, never acceptable
+- ILLEGAL: Drug use, criminal activity, non-consensual content
+- UNCERTAIN: Cannot determine, needs human review
+</categories>
+
+<severity_levels>
+- none: No safety concerns at all
+- low: Minor flag, likely fine but worth noting
+- medium: Should be reviewed by admin
+- high: Likely inappropriate, requires immediate review
+- critical: Definitely inappropriate, should be blocked (MINORS, VIOLENCE, ILLEGAL)
+</severity_levels>
+
+<output_format>
+Return a JSON object:
+{
+  "category": "SAFE"|"ADULT_CONTENT"|"VIOLENCE"|"MINORS"|"ILLEGAL"|"UNCERTAIN",
+  "severity": "none"|"low"|"medium"|"high"|"critical",
+  "description": "Brief factual description of what's shown (max 50 words)",
+  "concerns": ["List of specific concerns if any, empty array if none"],
+  "isAppropriate": true|false  // false for VIOLENCE, MINORS, ILLEGAL or high/critical severity
+}
+</output_format>`;
 
 export async function describeImage(imageBase64OrUrl: string): Promise<string> {
     const openai = getOpenAI();
     const model = getModel('describe_image');
+    const temperature = getTemperature('describe_image', 0.0); // Deterministic for safety
 
     // If it's a data URL or http URL, use it as is.
     // If it's raw base64, prepend the data URI scheme.
@@ -18,7 +63,7 @@ export async function describeImage(imageBase64OrUrl: string): Promise<string> {
                 {
                     role: 'user',
                     content: [
-                        { type: 'text', text: 'Describe this image in detail. Focus on any potentially inappropriate content or safety concerns.' },
+                        { type: 'text', text: SAFETY_ANALYSIS_PROMPT },
                         {
                             type: 'image_url',
                             image_url: {
@@ -29,6 +74,7 @@ export async function describeImage(imageBase64OrUrl: string): Promise<string> {
                 },
             ],
             max_tokens: 300,
+            temperature: temperature,
         });
 
         return response.choices[0].message.content || 'No description available.';
@@ -37,3 +83,28 @@ export async function describeImage(imageBase64OrUrl: string): Promise<string> {
         throw error;
     }
 }
+
+/**
+ * Analyze image safety and return structured result
+ */
+export async function analyzeImageSafety(imageBase64OrUrl: string): Promise<ImageSafetyAnalysis> {
+    const rawResult = await describeImage(imageBase64OrUrl);
+
+    try {
+        // Try to parse as JSON
+        let jsonContent = rawResult.trim();
+        if (jsonContent.startsWith('```')) {
+            jsonContent = jsonContent.replace(/^```(?:json)?\s*\n?/, '').replace(/\n?```\s*$/, '');
+        }
+        return JSON.parse(jsonContent) as ImageSafetyAnalysis;
+    } catch {
+        // If parsing fails, return a default "uncertain" result
+        return {
+            category: 'UNCERTAIN',
+            severity: 'medium',
+            description: rawResult.slice(0, 200),
+            concerns: ['Could not parse safety analysis result'],
+            isAppropriate: false,
+        };
+    }
+}

apps/admin/src/lib/ai/analyzers/props.ts

@@ -0,0 +1,89 @@
+// =============================================================================
+// Props Analysis Functions
+// Identify required props/accessories for questions
+// =============================================================================
+
+import { getOpenAI, getModel, getTemperature } from '../client';
+import type { PropsAnalysis } from '../types';
+
+/**
+ * Analyze questions for required props/accessories
+ */
+export async function analyzeQuestionProps(
+    questions: {
+        id: string;
+        text: string;
+        partner_text?: string | null;
+        required_props?: string[] | null;
+    }[],
+    existingProps: string[] = []
+): Promise<PropsAnalysis[]> {
+    const openai = getOpenAI();
+
+    const normalizedExistingProps = existingProps
+        .map(prop => prop.trim())
+        .filter(Boolean);
+
+    const simplifiedQuestions = questions.map(q => ({
+        id: q.id,
+        text: q.text,
+        partner_text: q.partner_text,
+        current_required_props: q.required_props ?? null,
+    }));
+
+    const prompt = `<task>
+Identify any props/accessories required to perform each question.
+Only include questions where required props should change (missing, incorrect, or overly generic).
+</task>
+
+<existing_props>
+Prefer these exact prop names when possible (reuse existing names instead of inventing new ones):
+${JSON.stringify(normalizedExistingProps)}
+</existing_props>
+
+<rules>
+1. Props are physical items/accessories, not body parts or acts.
+2. Use lowercase, short, singular names (e.g., "blindfold", "remote vibrator").
+3. If a prop is essentially the same as an existing one, reuse the existing name.
+4. Avoid making up new variants when a close existing name is available.
+5. Example: if "remote vibrator" exists, map "wifi" or "app-controlled" variants to "remote vibrator".
+6. Use specific items when clearly stated; otherwise allow "toy" or "props".
+7. If no props are required, set suggested_required_props to null.
+8. Only return entries where the suggested props differ from current_required_props.
+</rules>
+
+<questions_to_analyze>
+${JSON.stringify(simplifiedQuestions)}
+</questions_to_analyze>
+
+<output_format>
+{
+  "analysis": [
+    {
+      "id": string,
+      "suggested_required_props": string[]|null,
+      "reason": string
+    }
+  ]
+}
+</output_format>`;
+
+    const response = await openai.chat.completions.create({
+        model: getModel('fix'),
+        messages: [
+            {
+                role: 'system',
+                content: 'You are a content analyst for a couples app. Identify required props/accessories and return valid JSON.'
+            },
+            { role: 'user', content: prompt }
+        ],
+        response_format: { type: 'json_object' },
+        temperature: getTemperature('fix', 0.3),
+    });
+
+    const content = response.choices[0].message.content;
+    if (!content) throw new Error('No content generated');
+
+    const parsed = JSON.parse(content);
+    return parsed.analysis || [];
+}

apps/admin/src/lib/ai/analyzers/targets.ts

@@ -3,7 +3,7 @@
 // Analyze questions for gender targeting and couple compatibility
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 import type { TargetAnalysis } from '../types';
 
 /**
@@ -28,59 +28,67 @@ export async function analyzeQuestionTargets(
         current_initiator: q.target_user_genders
     }));
 
-    const prompt = `Analyze the following questions for a couples app and suggest:
-1. "allowed_couple_genders" (which couple types can see this question)
-2. "target_user_genders" (who should see this question FIRST as initiator - only relevant for two-part questions with partner_text)
+    const prompt = `<task>
+Analyze questions for couple targeting and initiator targeting.
+Only include questions where you have a recommendation to change current settings.
+</task>
 
-COUPLE TARGET OPTIONS: 'male+male', 'female+male', 'female+female'
-INITIATOR OPTIONS: 'male', 'female', 'non-binary'
+<targeting_options>
+Couple targets (allowed_couple_genders): 'male+male', 'female+male', 'female+female'
+Initiator targets (target_user_genders): 'male', 'female', 'non-binary'
+</targeting_options>
 
-RULES FOR COUPLE TARGETS (allowed_couple_genders):
-- Default to ALL (null) if the action is gender-neutral/universal (e.g. kissing, massage, generic sex, anal).
-- Limit ONLY if there is a clear, explicit anatomical requirement (e.g. genitalia-specific terms).
-- SEX TOYS ARE GENDER-NEUTRAL: Vibrators, dildos, plugs, etc. can be used by ANYONE. Do NOT restrict based on toys.
-  - "Control your partner's vibrator" -> ALL couples, ANY initiator (vibrators work on any body)
-  - "Use a butt plug" -> ALL couples (everyone has a butt)
+<couple_targeting_rules>
+DEFAULT: null (ALL couples) unless explicit anatomical requirement
 
-Examples of ACTUAL restrictions:
-- "Blowjob" -> Needs penis -> Exclude F+F -> ['male+male', 'female+male']
-- "Lick pussy" -> Needs vagina -> Exclude M+M -> ['female+male', 'female+female']
-- "Vibrator", "dildo", "toy" -> NO restriction, works for everyone
+Restrict ONLY when:
+- Activity requires penis -> ['male+male', 'female+male'] (exclude F+F)
+- Activity requires vagina -> ['female+male', 'female+female'] (exclude M+M)
 
-RULES FOR INITIATOR (target_user_genders):
-- ONLY relevant for TWO-PART questions (those with partner_text set).
-- Analyze the "text" field to determine who should see this card FIRST as the initiator.
-- ONLY set initiator if there is an EXPLICIT anatomical requirement in the text.
-- SEX TOYS DO NOT IMPLY GENDER: "vibrator", "dildo", "toy", "plug" -> initiator: null (anyone can use/control toys)
-- If text is gender-neutral, leave as null. When in doubt, use null.
-
-Key considerations for initiator:
-1. Does the "text" describe receiving something from a penis? -> Female initiator (in M+F context)
-2. Does the "text" describe an action typically done BY someone with a penis (e.g., "my cum", "cum on you")? -> Male initiator
-3. Does the "text" describe receiving penetration? -> Consider who is typically penetrated
-4. Is the action truly symmetric with no gendered context? -> null
+SEX TOYS ARE GENDER-NEUTRAL:
+- Vibrators, dildos, plugs work on ANYONE -> null (no restriction)
+- "Control your partner's vibrator" -> null
+- "Use a butt plug" -> null (everyone has a butt)
 
 Examples:
-- text: "Swallow your partner's cum" -> Receiving cum requires partner has penis, so in M+F this is female-oriented -> initiator: ['female']
-- text: "Lick my cum off your body" -> "my cum" implies initiator produces cum (has penis) -> initiator: ['male']
-- text: "Deep throat your partner" -> Requires partner has penis, so receiver-focused -> initiator: ['female'] for M+F
-- text: "Give your partner a massage" -> Truly gender-neutral -> initiator: null
-- text: "Let her ride you" / partner_text: "Ride your partner" -> "her" implies female partner -> initiator: ['male']
-- text: "Finger your partner" / partner_text: "Be fingered" -> Receiver needs vagina -> suggested_targets: exclude M+M, initiator: null (either can finger)
+- "Blowjob" -> needs penis -> ['male+male', 'female+male']
+- "Lick pussy" -> needs vagina -> ['female+male', 'female+female']
+- "Use a toy" -> gender-neutral -> null
+</couple_targeting_rules>
 
-Return a JSON object with an "analysis" array containing objects for questions where you have a recommendation.
-Include ALL fields even if null. Include a "reason" string explaining your suggestions.
+<initiator_targeting_rules>
+ONLY for asymmetric questions (those with partner_text).
+DEFAULT: null (anyone can initiate)
 
-Structure:
+Set initiator ONLY when "text" field has explicit anatomical requirement:
+- "Swallow your partner's cum" -> partner has penis -> initiator: ['female'] in M+F
+- "Lick my cum off your body" -> "my cum" = initiator has penis -> ['male']
+- "Deep throat your partner" -> partner has penis -> ['female'] in M+F
+- "Give your partner a massage" -> gender-neutral -> null
+- "Let her ride you" -> "her" implies female partner -> ['male']
+- Sex toys -> null (anyone can use/control toys)
+
+When in doubt, use null.
+</initiator_targeting_rules>
+
+<questions_to_analyze>
+${JSON.stringify(simplifiedQuestions)}
+</questions_to_analyze>
+
+<output_format>
 {
   "analysis": [
-     { "id": "...", "suggested_targets": ["male+male", "female+male"], "suggested_initiator": ["male"], "reason": "Text implies male initiator with female partner" }
+    {
+      "id": string,
+      "suggested_targets": string[]|null,    // e.g., ["male+male", "female+male"] or null
+      "suggested_initiator": string[]|null,  // e.g., ["male"] or null
+      "reason": string                       // Explanation of recommendation
+    }
   ]
 }
 
-Questions:
-${JSON.stringify(simplifiedQuestions)}
-`;
+Only include questions where targeting should change.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('fix'),
@@ -92,7 +100,7 @@ ${JSON.stringify(simplifiedQuestions)}
             { role: 'user', content: prompt }
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.5,
+        temperature: getTemperature('fix', 0.5),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/analyzers/text.ts

@@ -3,14 +3,14 @@
 // Analyze and suggest improvements for question text
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 import type { TextAnalysis } from '../types';
 
 /**
  * Analyze question text and suggest improvements
  */
 export async function analyzeQuestionText(
-    questions: { id: string; text: string; partner_text?: string | null }[],
+    questions: { id: string; text: string; partner_text?: string | null; intensity?: number }[],
     isExplicit: boolean = false
 ): Promise<TextAnalysis[]> {
     const openai = getOpenAI();
@@ -19,6 +19,7 @@ export async function analyzeQuestionText(
         id: q.id,
         text: q.text,
         partner_text: q.partner_text,
+        intensity: q.intensity,
     }));
 
     const toneInstruction = isExplicit
@@ -38,56 +39,81 @@ export async function analyzeQuestionText(
    - partner_text (The Receiver): Passive/Receiving proposal (e.g., "Receive a love letter from your partner", "Be surprised with a date by your partner").
    - GOOD: "Give your partner a massage" / "Receive a massage from your partner"`;
 
-    const prompt = `Analyze the following questions for a couples app and suggest improved text that follows our style guidelines.
+    const prompt = `<task>
+Analyze the following questions and suggest improved text that follows our style guidelines.
+Only include questions that NEED improvement - skip well-phrased ones.
+</task>
 
+<content_type>
 ${toneInstruction}
+</content_type>
 
+<app_context>
 The app uses a swipe-based interface (Like/Dislike/Maybe).
-Cards should be "Proposals" relative to a specific action, NOT interview questions.
+Cards should be "Proposals" for specific actions, NOT interview questions.
+</app_context>
 
-For each question, decide if it is a SYMMETRIC activity (shared) or ASYMMETRIC action (one-way).
-
-1. SYMMETRIC Activities (Single Card - partner_text should be null):
-   - Use for shared experiences where both partners do the same thing together.
-   - Phrasing: Direct action proposal.
+<question_types>
+1. SYMMETRIC Activities (partner_text = null):
+   - Both partners do the same thing together
    - ${symmetricExamples}
-   - BAD: "Have you ever thought about...", "Do you think we should...", "How about we..."
+   - BAD: "Have you ever thought about...", "Do you think we should..."
 
-2. ASYMMETRIC Actions (Two-Part Card - needs both text and partner_text):
-   - Use for actions where one partner does something TO/FOR the other, or where roles differ.
-   - text = what the INITIATOR does (their action/perspective)
-   - partner_text = what the RECEIVER does/experiences (their action/perspective)
+2. ASYMMETRIC Actions (needs both text AND partner_text):
+   - One partner does something TO/FOR the other
+   - text = what the INITIATOR does
+   - partner_text = what the RECEIVER experiences
    - ${asymmetricExamples}
-   - IMPORTANT: partner_text should describe the RECEIVER's experience clearly:
-     - text: "Send your partner to the bathroom and follow a minute later"
-     - partner_text: "Go to the bathroom and wait for your partner to join you" (NOT "Wait for your partner to follow you")
-   - When initiator CAUSES a response (moan, cum, beg, etc.), partner_text should frame as ALLOWING/RECEIVING:
-     - text: "Make your partner moan in public" -> partner_text: "Let your partner make you moan in public"
-     - NOT: "Moan for your partner in public" (sounds like deliberate performance, not natural response)
-   - BAD: "Would you like to...?" (Ambiguous who "me" is)
 
-CRITICAL RULES:
-1. PRESERVE THE CORE ACTION - Do NOT change what the question is about. Only improve phrasing.
-2. Keep text SHORT and DIRECT - no explanatory parentheticals. Aim for 5-12 words.
-3. Remove wishy-washy language: "Would you want to...", "Have you ever...", "Do you think...", "...fantasy"
-4. Make it direct and actionable.
-5. For asymmetric cards, ensure text is initiator-focused and partner_text is receiver-focused.
-6. Use "your partner" instead of "me", "you", "him", "her" to keep it gender-neutral.
-7. If a question is ALREADY well-phrased, do NOT include it in the results.
-8. NEVER add explanatory text in parentheses - keep the proposal clean and simple.
-9. NEVER MIX ANATOMICALLY INCOMPATIBLE ACTIVITIES - Do NOT combine male-specific and female-specific acts as alternatives in the same question.
-10. MAKE PARTNER_TEXT APPEALING - Don't just grammatically flip the text. Make the receiver feel excited.
-11. FLAG CLICHES for improvement - "candlelit dinner", "rose petals", "bubble bath", "Netflix and chill" are overused
+   Partner text rules:
+   - Describe RECEIVER's experience clearly
+   - When initiator CAUSES a response (moan, cum, beg), frame as ALLOWING:
+     * text: "Make your partner moan" -> partner_text: "Let your partner make you moan"
+     * NOT: "Moan for your partner" (sounds forced, not natural)
+</question_types>
 
-Return a JSON object with a "suggestions" array containing ONLY questions that need improvement.
-Each object should have:
-- id: The question ID
-- suggested_text: The improved text (short, direct, no parentheticals)
-- suggested_partner_text: The improved partner_text (or null if symmetric)
-- reason: Brief explanation of what was improved
+<rules>
+1. PRESERVE THE CORE ACTION - only improve phrasing, don't change what it's about
+2. Keep SHORT and DIRECT - aim for 5-12 words, no parentheticals
+3. Remove wishy-washy: "Would you want to...", "Have you ever...", "Do you think..."
+4. Use "your partner" instead of "me", "you", "him", "her"
+5. NEVER mix anatomically incompatible activities in same question
+6. Make partner_text APPEALING - don't just grammatically flip, make receiver feel excited
+7. FLAG CLICHES: "candlelit dinner", "rose petals", "bubble bath", "Netflix and chill"
+8. Skip questions that are ALREADY well-phrased
+</rules>
 
-Questions:
-${JSON.stringify(simplifiedQuestions)}`;
+<intensity_guide>
+Check if current intensity matches the activity:
+1 (Gentle): Emotional bonding, non-sexual (cooking, cuddling, foot massage)
+2 (Warm): Romantic, affectionate touch (slow dance, sensual massage, kissing)
+3 (Playful): Light sexual exploration (oral, mutual masturbation, light roleplay)
+4 (Steamy): Explicit sex, moderate adventure (intercourse, light bondage, anal play)
+5 (Intense): Advanced/BDSM/extreme (impact play, power dynamics, taboo kinks)
+
+If intensity seems wrong, include suggested_intensity and intensity_reason.
+</intensity_guide>
+
+<questions_to_analyze>
+${JSON.stringify(simplifiedQuestions)}
+</questions_to_analyze>
+
+<output_format>
+{
+  "suggestions": [
+    {
+      "id": string,                    // Question ID
+      "suggested_text": string,        // Improved text (short, direct)
+      "suggested_partner_text": string|null,  // Improved partner_text or null if symmetric
+      "reason": string,                // Brief explanation of text improvement
+      "suggested_intensity": number|null,  // 1-5 if intensity seems wrong, null if correct
+      "intensity_reason": string|null      // Why intensity should change (if applicable)
+    }
+  ]
+}
+
+Only include questions that need text improvement OR intensity adjustment.
+</output_format>`;
 
     const systemMessage = isExplicit
         ? 'You are an adult content editor for a couples intimacy app. Use nuanced language: tasteful phrasing for general acts (have sex, perform oral) but crude specific terms when relevant (cum, cock ring, etc). Preserve original intent. Always respond with valid JSON only.'
@@ -103,7 +129,7 @@ ${JSON.stringify(simplifiedQuestions)}`;
             { role: 'user', content: prompt }
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.5,
+        temperature: getTemperature('fix', 0.5),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/client.ts

@@ -78,6 +78,31 @@ export function getModel(purpose?: ModelPurpose): string {
     }
 }
 
+/**
+ * Get the appropriate temperature for a given purpose
+ * Uses remote config > default temperature > fallback
+ */
+export function getTemperature(purpose?: ModelPurpose, fallback?: number): number {
+    const remoteConfig = getCachedAiConfig();
+    const defaultTemperature = remoteConfig?.default_temperature;
+    const baseFallback = defaultTemperature ?? fallback ?? 0.7;
+
+    if (!purpose) return baseFallback;
+
+    switch (purpose) {
+        case 'generate':
+            return remoteConfig?.temperature_generate ?? defaultTemperature ?? fallback ?? 0.9;
+        case 'fix':
+            return remoteConfig?.temperature_fix ?? defaultTemperature ?? fallback ?? 0.5;
+        case 'polish':
+            return remoteConfig?.temperature_polish ?? defaultTemperature ?? fallback ?? 0.7;
+        case 'describe_image':
+            return remoteConfig?.classifier_temperature ?? defaultTemperature ?? fallback ?? 1.0;
+        default:
+            return baseFallback;
+    }
+}
+
 /**
  * Extract a short display name from a model identifier
  * e.g., "anthropic/claude-3.5-sonnet" -> "Claude 3.5 Sonnet"

apps/admin/src/lib/ai/config.ts

@@ -31,6 +31,7 @@ export function getCouncilConfig(): CouncilConfig {
             enabled: remoteConfig.council_enabled || false,
             generators,
             reviewerModel: remoteConfig.council_reviewer_model || 'google/gemini-pro-1.5',
+            reviewerTemperature: remoteConfig.council_reviewer_temperature ?? 0.3,
             selectionMode: remoteConfig.council_selection_mode || 'whole_set',
             cherryPickEnsureIntensityDistribution: remoteConfig.cherry_pick_ensure_intensity_distribution ?? true,
         };
@@ -41,6 +42,7 @@ export function getCouncilConfig(): CouncilConfig {
         enabled: import.meta.env.VITE_COUNCIL_ENABLED === 'true',
         generators: [{ model: import.meta.env.VITE_COUNCIL_GENERATOR_MODEL || 'anthropic/claude-3.5-sonnet' }],
         reviewerModel: import.meta.env.VITE_COUNCIL_REVIEWER_MODEL || 'google/gemini-pro-1.5',
+        reviewerTemperature: 0.3,
         selectionMode: 'whole_set',
         cherryPickEnsureIntensityDistribution: true,
     };
@@ -60,12 +62,11 @@ export async function initializeAiConfig(): Promise<AiConfig | null> {
 // =============================================================================
 
 export const TONE_LEVELS = [
-    { level: 0, label: 'Everyday', description: 'Non-romantic activities - games, cooking, conversations' },
-    { level: 1, label: 'Sweet', description: 'Romantic but innocent - compliments, date nights, cuddles' },
-    { level: 2, label: 'Flirty', description: 'Playful teasing - flirty texts, light touching, innuendo' },
-    { level: 3, label: 'Intimate', description: 'Sensual but soft - massage, making out, showering together' },
-    { level: 4, label: 'Sexual', description: 'Standard sexual activities - oral, sex, toys' },
-    { level: 5, label: 'Wild', description: 'Extreme/kinky - public sex, creampies, BDSM, exhibitionism' },
+    { level: 1, label: 'Gentle', description: 'Pure emotional connection & non-sexual bonding' },
+    { level: 2, label: 'Warm', description: 'Romantic atmosphere & affectionate touch' },
+    { level: 3, label: 'Playful', description: 'Light sexual exploration & sensual discovery' },
+    { level: 4, label: 'Steamy', description: 'Explicit sexual activities & moderate adventure' },
+    { level: 5, label: 'Intense', description: 'Advanced/BDSM/Extreme exploration' },
 ] as const;
 
 // =============================================================================
@@ -74,11 +75,11 @@ export const TONE_LEVELS = [
 // =============================================================================
 
 export const INTENSITY_LEVELS = [
-    { level: 1, label: 'Light', description: 'Talking, emotional sharing, compliments, non-sexual', color: 'bg-green-500' },
-    { level: 2, label: 'Mild', description: 'Hugging, cuddling, gentle kisses, flirty texts', color: 'bg-lime-500' },
-    { level: 3, label: 'Moderate', description: 'Making out, massage, sexy/suggestive photos', color: 'bg-yellow-500' },
-    { level: 4, label: 'Spicy', description: 'Oral, foreplay, nudes, explicit sexting', color: 'bg-orange-500' },
-    { level: 5, label: 'Intense', description: 'Sex, kinks, BDSM, explicit videos', color: 'bg-red-500' },
+    { level: 1, label: 'Gentle', description: 'Pure emotional connection & non-sexual bonding', color: 'bg-green-500' },
+    { level: 2, label: 'Warm', description: 'Romantic atmosphere & affectionate touch', color: 'bg-lime-500' },
+    { level: 3, label: 'Playful', description: 'Light sexual exploration & sensual discovery', color: 'bg-yellow-500' },
+    { level: 4, label: 'Steamy', description: 'Explicit sexual activities & moderate adventure', color: 'bg-orange-500' },
+    { level: 5, label: 'Intense', description: 'Advanced/BDSM/Extreme exploration', color: 'bg-red-500' },
 ] as const;
 
 // =============================================================================
@@ -89,41 +90,30 @@ export const INTENSITY_LEVELS = [
 export const INTENSITY_GUIDE = `
 INTENSITY GRADING GUIDE - Use this to assign intensity levels consistently:
 
-Level 1 - LIGHT (Emotional/Non-Sexual):
-- Talking, sharing feelings, compliments, emotional vulnerability
-- Non-physical activities: writing letters, planning dates, sharing dreams
-- Clean activities with no sexual undertones
-- Examples: "Share your biggest dream", "Write a love note", "Plan a surprise date"
+Level 1 - GENTLE (Pure emotional connection & non-sexual bonding):
+- Focus: Emotional safety, friendship-based activities, quality time
+- Examples: Cook together, take a walk holding hands, give non-sexual foot massages, watch a movie cuddling
+- Emotional bonding without sexual undertones
 
-Level 2 - MILD (Affectionate/Flirty):
-- Light physical affection: holding hands, hugging, cuddling
-- Gentle kisses, playing with hair, light touches
-- Flirty but non-sexual: dancing together, sleeping in each other's arms
-- Examples: "Give your partner a forehead kiss", "Cuddle while watching a movie", "Send a flirty text"
+Level 2 - WARM (Romantic atmosphere & affectionate touch):
+- Focus: Creating romantic moments, sensual but non-sexual touch, building anticipation
+- Examples: Slow dance in the living room, candlelit bath together (non-sexual), extended kissing sessions, sensual massage with oils
+- Romantic intimacy building up to arousal
 
-Level 3 - MODERATE (Sensual/Suggestive):
-- Making out, passionate kissing, intimate massage
-- Sensual touch over clothes, caressing, teasing
-- Suggestive photos (lingerie, shirtless), sexy selfies, teasing texts
-- Showering together, skinny dipping
-- Examples: "Give a sensual massage", "Send a sexy photo", "Make out somewhere risky"
+Level 3 - PLAYFUL (Light sexual exploration & sensual discovery):
+- Focus: Sexual touch without penetration, playful experimentation, building arousal
+- Examples: Mutual masturbation, oral sex, light roleplay (doctor/patient), using basic toys together
+- Fun and exploratory sexual contact
 
-Level 4 - SPICY (Sexual/Explicit Content):
-- Oral sex, fingering, handjobs, mutual masturbation
-- Foreplay activities, using hands/mouth on private parts
-- Nudes, explicit photos, dirty pics, sexting explicit content
-- Using toys externally, edging, making your partner cum
-- Examples: "Go down on your partner", "Send a nude", "Sext each other something filthy"
+Level 4 - STEAMY (Explicit sexual activities & moderate adventure):
+- Focus: Full sexual intercourse with adventurous elements, moderate BDSM/kink
+- Examples: Sex in different locations/positions, light bondage, anal play with toys, recording consensual intimate moments
+- Passionate and adventurous sexual connection
 
-Level 5 - INTENSE (Penetration/Advanced Kinks):
-- Sex (vaginal or anal), toys inside, fingers inside
-- Kinks: bondage, role-play with power dynamics, BDSM
-- Threesomes, exhibitionism, voyeurism
-- Making/sharing explicit videos, masturbating on video call
-- Examples: "Fuck in a new location", "Try anal", "Record yourselves having sex"
-
-IMPORTANT: Intensity is about SEXUAL CONTENT level, not just physical touch.
-Sending nudes = Level 4, Sexting explicit content = Level 4, Dirty/filthy photos = Level 4.
+Level 5 - INTENSE (Advanced/BDSM/Extreme exploration):
+- Focus: Edge play, power dynamics, intense physical experiences
+- Examples: Heavy impact play, advanced bondage, consensual non-consent scenes, multi-partner activities
+- Very intense, taboo kinks, and extreme exploration
 `;
 
 // =============================================================================
@@ -133,13 +123,11 @@ Sending nudes = Level 4, Sexting explicit content = Level 4, Dirty/filthy photos
 
 export const INTENSITY_GUIDE_SHORT = `
 INTENSITY LEVELS:
-1 (Light): Talking, emotional sharing, compliments, non-sexual activities
-2 (Mild): Holding hands, hugging, cuddling, gentle kisses, flirty texts
-3 (Moderate): Making out, sensual massage, sexy/suggestive photos, teasing
-4 (Spicy): Oral sex, fingering, handjobs, nudes, explicit photos/sexting, foreplay
-5 (Intense): Sex, anal, kinks, BDSM, explicit videos, threesomes
-
-IMPORTANT: "Filthy photo", "nude", "dirty pic" = Level 4. "Sexy photo", "lingerie pic" = Level 3.
+1 (Gentle): Pure emotional connection, non-sexual bonding (cooking, cuddling, foot massages)
+2 (Warm): Romantic atmosphere, affectionate touch (slow dance, sensual massage, kissing)
+3 (Playful): Light sexual exploration, sensual discovery (oral, mutual masturbation, light roleplay)
+4 (Steamy): Explicit sexual activities, moderate adventure (sex positions, light bondage, anal play)
+5 (Intense): Advanced/BDSM/Extreme exploration (impact play, power dynamics, taboo kinks)
 `;
 
 // =============================================================================
@@ -168,11 +156,11 @@ REVIEW CRITERIA - Score each 1-10:
    - No confusing or ambiguous phrasing
 
 4. INTENSITY ACCURACY:
-   Level 1 (Light): Talking, emotional sharing, compliments, non-sexual
-   Level 2 (Mild): Holding hands, hugging, cuddling, gentle kisses, flirty texts
-   Level 3 (Moderate): Making out, sensual massage, sexy/suggestive photos, teasing
-   Level 4 (Spicy): Oral sex, fingering, handjobs, nudes, explicit photos/sexting
-   Level 5 (Intense): Sex, anal, kinks, BDSM, explicit videos, threesomes
+   Level 1 (Gentle): Pure emotional connection, non-sexual bonding
+   Level 2 (Warm): Romantic atmosphere, affectionate touch
+   Level 3 (Playful): Light sexual exploration, sensual discovery (oral, toys)
+   Level 4 (Steamy): Explicit sexual activities, moderate adventure (intercourse, light bondage)
+   Level 5 (Intense): Advanced/BDSM/Extreme exploration (impact play, power dynamics)
 
 5. ANATOMICAL CONSISTENCY:
    - No mixed male/female anatomy in alternatives
@@ -184,6 +172,20 @@ REVIEW CRITERIA - Score each 1-10:
    - BAD: "Receive oral from your partner"
    - GOOD: "Let your partner pleasure you with their mouth"
    - When initiator causes a response, frame as allowing: "Let your partner make you moan"
+
+7. COUPLE TARGETING (flag if incorrect):
+   - Default: ALL couples (null) unless explicit anatomical requirement
+   - Restrict to ['male+male', 'female+male'] ONLY if activity requires penis
+   - Restrict to ['female+male', 'female+female'] ONLY if activity requires vagina
+   - Sex toys are GENDER-NEUTRAL (vibrators, dildos, plugs work for anyone)
+   - Flag if targeting seems too restrictive or missing needed restrictions
+
+8. INITIATOR TARGETING (for asymmetric questions only):
+   - Default: null (anyone can initiate) unless explicit anatomical requirement
+   - Set initiator based on WHO DOES the action in "text" field
+   - "Swallow your partner's cum" -> initiator: female (in M+F, receiver of cum)
+   - "Give your partner a massage" -> initiator: null (anyone can give)
+   - Flag if initiator seems incorrectly assigned
 `;
 
 // =============================================================================
@@ -192,24 +194,72 @@ REVIEW CRITERIA - Score each 1-10:
 // =============================================================================
 
 export const TONE_INSTRUCTIONS: Record<ToneLevel, string> = {
-    0: 'WILDNESS LEVEL: EVERYDAY. Generate non-romantic activities only. Focus on communication, teamwork, fun, personal growth, and bonding WITHOUT any romantic or sexual undertones. Examples: "Cook a new recipe together", "Play a board game", "Send your partner a compliment while they\'re at work", "Plan a weekend adventure". NO flirting, NO romance, NO intimacy.',
-    1: 'WILDNESS LEVEL: SWEET. Generate romantic but innocent activities. Focus on emotional connection, love, and tenderness. Examples: "Write your partner a love letter", "Plan a surprise date night", "Cuddle and watch the sunset", "Give your partner a back massage". NO sexual content.',
-    2: 'WILDNESS LEVEL: FLIRTY. Generate playful, teasing activities with light innuendo. Examples: "Send a flirty text during the day", "Whisper something suggestive in your partner\'s ear", "Give your partner a lingering kiss goodbye". Suggestive but NOT explicitly sexual.',
-    3: 'WILDNESS LEVEL: INTIMATE. Generate sensual activities that imply intimacy without being graphic. Examples: "Give your partner a full-body massage", "Shower together", "Make out somewhere unexpected", "Sleep naked together". Passionate but soft - no explicit sex acts.',
-    4: 'WILDNESS LEVEL: SEXUAL. Generate standard sexual activities. Examples: "Go down on your partner", "Have sex in a new position", "Use a vibrator together", "Wake your partner up with oral". Direct language, avoid clinical terms. This is vanilla sex - adventurous but not extreme.',
-    5: 'WILDNESS LEVEL: WILD. Generate extreme, kinky, or taboo activities. Think: public sex, exhibitionism, BDSM, risky situations, intense kinks. Examples: "Get creampied by your partner and go to dinner", "Have sex somewhere you might get caught", "Let your partner tie you up and use you", "Edge each other for an hour before allowing release". Push boundaries. Use crude terms when they ARE the activity (cum, cock ring) but tasteful phrasing for general acts (have sex, not fuck). NEVER sanitize "cum" to "come".',
+    1: 'INTIMACY LEVEL: GENTLE. Focus on emotional safety, friendship-based activities, and quality time. Examples: "Cook a new recipe together", "Take a walk holding hands", "Give non-sexual foot massages", "Watch a movie cuddling". Pure emotional connection & non-sexual bonding.',
+    2: 'INTIMACY LEVEL: WARM. Focus on creating romantic moments, sensual but non-sexual touch, and building anticipation. Examples: "Slow dance in the living room", "Candlelit bath together (non-sexual)", "Extended kissing sessions", "Sensual massage with oils". Romantic atmosphere & affectionate touch.',
+    3: 'INTIMACY LEVEL: PLAYFUL. Focus on sexual touch without penetration, playful experimentation, and building arousal. Examples: "Mutual masturbation", "Oral sex", "Light roleplay (doctor/patient)", "Using basic toys together". Light sexual exploration & sensual discovery.',
+    4: 'INTIMACY LEVEL: STEAMY. Focus on full sexual intercourse with adventurous elements and moderate BDSM/kink. Examples: "Sex in different locations/positions", "Light bondage", "Anal play with toys", "Recording consensual intimate moments". Explicit sexual activities & moderate adventure.',
+    5: 'INTIMACY LEVEL: INTENSE. Focus on edge play, power dynamics, and intense physical experiences. Examples: "Heavy impact play", "Advanced bondage", "Consensual non-consent scenes", "Multi-partner activities". Advanced/BDSM/Extreme exploration.',
 };
 
+// =============================================================================
+// CORE LANGUAGE RULES
+// Consolidated rules used across all generators
+// =============================================================================
+
+export const CORE_LANGUAGE_RULES = `
+<language_rules>
+1. ALWAYS use "your partner" - NEVER use "me", "I", "you" (as the receiver), "him", "her", or gendered pronouns
+2. Cards are PROPOSALS/ACTIVITIES, NOT interview questions - "Give your partner a massage" not "Would you like to give a massage?"
+3. Avoid wishy-washy language - NO "Would you...", "Have you ever...", "Do you think...", "Maybe we could..."
+4. No time-specific words - NO "tonight", "now", "today", "right now" - activities should be timeless
+5. Maintain anatomical consistency - NEVER combine male-specific and female-specific acts as alternatives
+6. Keep concise - ideal length is 5-12 words per question
+</language_rules>
+`;
+
 // =============================================================================
 // SYSTEM MESSAGES
 // Per-tone-level system prompts for question generation
 // =============================================================================
 
 export const SYSTEM_MESSAGES: Record<ToneLevel, string> = {
-    0: 'You are a content writer for a couples app. Generate everyday activities focused on bonding, communication, and fun. No romance or intimacy. Always respond with valid JSON only.',
-    1: 'You are a content writer for a couples app. Generate sweet, romantic activities that help couples connect emotionally. Keep it innocent and wholesome. Always respond with valid JSON only.',
-    2: 'You are a content writer for a couples app. Generate flirty, playful activities with light teasing and innuendo. Suggestive but not sexual. Always respond with valid JSON only.',
-    3: 'You are a content writer for a couples app. Generate intimate, sensual activities that imply passion without being explicit. Always respond with valid JSON only.',
-    4: 'You are a content writer for an adult couples app. Generate sexual activities with direct, natural language. Write like a sex-positive friend - not clinical. Always respond with valid JSON only.',
-    5: 'You are a content writer for an adult couples app. Generate wild, extreme, kinky activities that push boundaries. Use crude terms when they ARE the act but tasteful phrasing for general sex/oral. Never use clinical terms. Always respond with valid JSON only.',
+    1: `You are an expert content writer for Sauci, a couples intimacy app where partners swipe on activity proposals.
+
+<role>Generate gentle, emotionally focused activities for bonding.</role>
+<constraint>NO sexual content whatsoever. Focus on emotional connection, quality time, and non-sexual touch.</constraint>
+<style>Warm, caring, romantic. Activities should feel safe and nurturing.</style>
+<format>Activities are proposals users swipe on (Like/Dislike/Maybe), not interview questions. Always respond with valid JSON only.</format>
+<audience>Adults aged 25-45 in committed relationships.</audience>`,
+
+    2: `You are an expert content writer for Sauci, a couples intimacy app where partners swipe on activity proposals.
+
+<role>Generate warm, romantic activities with affectionate touch.</role>
+<constraint>Sensual but NOT explicit sex. Building anticipation without crossing into explicit territory.</constraint>
+<style>Romantic, intimate, sensual. Create atmosphere and connection.</style>
+<format>Activities are proposals users swipe on (Like/Dislike/Maybe), not interview questions. Always respond with valid JSON only.</format>
+<audience>Adults aged 25-45 in committed relationships.</audience>`,
+
+    3: `You are an expert content writer for Sauci, a couples intimacy app where partners swipe on activity proposals.
+
+<role>Generate playful, sexually exploratory activities.</role>
+<constraint>Focus on foreplay, oral, toys, and light exploration. Avoid extreme kinks.</constraint>
+<style>Playful, sexy, adventurous. Encourage exploration in a fun way.</style>
+<format>Activities are proposals users swipe on (Like/Dislike/Maybe), not interview questions. Always respond with valid JSON only.</format>
+<audience>Adults aged 25-45 in committed relationships.</audience>`,
+
+    4: `You are an expert content writer for Sauci, an adult couples intimacy app where partners swipe on activity proposals.
+
+<role>Generate steamy, explicit sexual activities with moderate adventure.</role>
+<constraint>Full sexual content allowed including intercourse, light bondage, and moderate kinks.</constraint>
+<style>Passionate, explicit, adventurous. Bold but not extreme.</style>
+<format>Activities are proposals users swipe on (Like/Dislike/Maybe), not interview questions. Always respond with valid JSON only.</format>
+<audience>Adults aged 25-45 in committed relationships.</audience>`,
+
+    5: `You are an expert content writer for Sauci, an adult couples intimacy app where partners swipe on activity proposals.
+
+<role>Generate intense, advanced sexual activities including BDSM and kinks.</role>
+<constraint>Edge play, power dynamics, and intense physical experiences allowed. All content is consensual adult activity.</constraint>
+<style>Intense, commanding, unapologetic. Push boundaries while maintaining consent.</style>
+<format>Activities are proposals users swipe on (Like/Dislike/Maybe), not interview questions. Always respond with valid JSON only.</format>
+<audience>Adults aged 25-45 in committed relationships seeking adventurous experiences.</audience>`,
 };

apps/admin/src/lib/ai/generators/categories.ts

@@ -3,7 +3,7 @@
 // Generate category names and category ideas
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 import type { GeneratedCategoryIdea } from '../types';
 
 /**
@@ -11,19 +11,30 @@ import type { GeneratedCategoryIdea } from '../types';
  */
 export async function generateCategory(): Promise<{ name: string; description: string; icon: string }> {
     const openai = getOpenAI();
-    const prompt = `Generate a unique category for organizing activity packs in a couples' intimacy/connection app.
+    const prompt = `<task>
+Generate a unique category for organizing activity packs in a couples' intimacy/connection app.
+</task>
 
+<app_context>
 This is an ACTIVITY-FOCUSED app where couples swipe on activity proposals.
 Each partner independently swipes Like/Dislike/Maybe, and when both swipe positively they "match".
 Categories organize collections of activity packs (date ideas, intimate experiences, adventures, challenges, etc.).
 This is NOT a Q&A app - it's about discovering shared interests in activities.
+</app_context>
 
-Return a JSON object with:
-- name: Category name (1-3 words, e.g., "Romance", "Adventure", "Date Nights")
-- description: Brief description of what activity packs in this category contain (1 sentence)
-- icon: A single emoji that represents this category
+<examples>
+Good category names: "Romance", "Adventure", "Date Nights", "Intimacy", "Bonding", "Exploration"
+</examples>
 
-Be creative and think of categories that help couples explore different types of activities together.`;
+<output_format>
+{
+  "name": string,        // 1-3 words (e.g., "Romance", "Adventure", "Date Nights")
+  "description": string, // 1 sentence describing what activity packs contain
+  "icon": string         // Single emoji representing this category
+}
+
+Be creative and think of categories that help couples explore different types of activities together.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('generate'),
@@ -35,7 +46,7 @@ Be creative and think of categories that help couples explore different types of
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.9,
+        temperature: getTemperature('generate', 0.9),
     });
 
     const content = response.choices[0].message.content;
@@ -67,32 +78,62 @@ export async function suggestCategories(
         ? '\nCRUDE LANGUAGE OVERRIDE: Use crude, vulgar terms in the names and descriptions.'
         : '';
 
-    const inspirationInstruction = inspiration
-        ? `\n\nINSPIRATION/GUIDANCE FROM ADMIN:\n${inspiration}\n\nUse the above inspiration to guide your category suggestions.`
+    // Sanitize inspiration to prevent prompt injection
+    const sanitizedInspiration = inspiration
+        ? inspiration
+            .replace(/<[^>]*>/g, '')
+            .replace(/\b(CRITICAL|PRIORITY|INSTRUCTION|OVERRIDE|IGNORE|SYSTEM|ASSISTANT)\b:?/gi, '')
+            .trim()
         : '';
 
-    const avoidInstruction = previousSuggestions && previousSuggestions.length > 0
-        ? `\n\nIMPORTANT - DO NOT suggest any of these category names (already suggested): ${previousSuggestions.join(', ')}\nGenerate completely different and fresh ideas.`
+    const inspirationSection = sanitizedInspiration
+        ? `\n<user_guidance>\n${sanitizedInspiration}\n</user_guidance>`
         : '';
 
-    const prompt = `Here are the current categories in our couples' activity/intimacy app: ${existingList}.
+    const avoidSection = previousSuggestions && previousSuggestions.length > 0
+        ? `\n<avoid_names>\n${previousSuggestions.join(', ')}\n</avoid_names>`
+        : '';
 
-IMPORTANT - HOW THE APP WORKS:
-- This is an ACTIVITY-FOCUSED app where couples swipe on activity proposals
+    const prompt = `<task>
+Suggest 5 NEW, UNIQUE category ideas for organizing activity packs in a couples' activity/intimacy app.
+</task>
+
+<existing_categories>
+Current categories: ${existingList}
+</existing_categories>
+
+<app_context>
+This is an ACTIVITY-FOCUSED app where couples swipe on activity proposals.
 - Each partner independently swipes Like/Dislike/Maybe on activities
 - When BOTH partners swipe positively, they "match" and can discuss the activity
 - Categories organize collections of activity packs (date ideas, intimate experiences, adventures, etc.)
-- This is NOT a Q&A app - it's about discovering shared interests in activities to do together
+- This is NOT a Q&A app - it's about discovering shared interests in activities
+</app_context>
+${inspirationSection}
 
-Suggest 5 NEW, UNIQUE category ideas that differ from the existing ones.
-${explicitInstruction}${crudeLangInstruction}${inspirationInstruction}${avoidInstruction}
+<content_guidelines>
+${explicitInstruction}
+${crudeLangInstruction}
+</content_guidelines>
+${avoidSection}
 
-Return a JSON object with an "ideas" array containing 5 objects, where each object has:
-- name: Category name (1-3 words)
-- description: Brief description of what activity packs in this category contain (1 sentence)
-- icon: A single descriptive emoji
+<category_themes>
+Focus on diverse themes: date ideas, adventures, intimate experiences, bonding activities, challenges, travel, home activities, etc.
+</category_themes>
 
-Focus on diverse activity themes like: date ideas, adventures, intimate experiences, bonding activities, challenges, travel, home activities, etc.`;
+<output_format>
+{
+  "ideas": [
+    {
+      "name": string,        // 1-3 words
+      "description": string, // 1 sentence, what activity packs contain
+      "icon": string         // Single descriptive emoji
+    }
+  ]
+}
+
+Generate 5 unique categories that differ from existing ones.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('generate'),
@@ -104,7 +145,7 @@ Focus on diverse activity themes like: date ideas, adventures, intimate experien
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.9,
+        temperature: getTemperature('generate', 0.9),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/generators/cherry-pick.ts

@@ -38,73 +38,91 @@ export async function evaluateQuestionPool(
         generatorIndex: q.sourceGeneratorIndex,
     }));
 
-    const prompt = `You are evaluating a pool of ${pooledQuestions.length} questions from ${new Set(pooledQuestions.map(q => q.sourceGeneratorIndex)).size} different AI generators.
+    const prompt = `<task>
+Evaluate a pool of ${pooledQuestions.length} questions from ${new Set(pooledQuestions.map(q => q.sourceGeneratorIndex)).size} different AI generators and select the best ones.
+</task>
 
-Your task is to:
+<objectives>
 1. Score each question individually (1-10 on each criterion)
 2. Identify duplicates/semantically similar questions
 3. Assess uniqueness relative to the pool
 4. Consider pack theme fit
+</objectives>
 
-PACK CONTEXT:
+<pack_context>
 - Pack Name: "${packContext.name}"
 ${packContext.description ? `- Pack Description: "${packContext.description}"` : ''}
 - Content Type: ${packContext.isExplicit ? 'EXPLICIT (adult content allowed)' : 'NON-EXPLICIT (clean/romantic only)'}
 - Tone Level: ${packContext.tone} (${toneDescription})
 - Requested question count: ${requestedCount}
+</pack_context>
 
+<scoring_criteria>
 ${REVIEW_GUIDELINES}
 
-ADDITIONAL CRITERIA FOR CHERRY-PICK:
-
 5. UNIQUENESS (1-10):
-   - How unique is this question compared to others in the pool?
-   - 10: Completely unique concept
+   - 10: Completely unique concept in the pool
    - 7-9: Somewhat similar theme but distinct execution
    - 4-6: Similar to another question but different enough to keep
    - 1-3: Near-duplicate of another question
+</scoring_criteria>
 
-DUPLICATE DETECTION:
+<scoring_weights>
+Your scores will be weighted as follows for final selection:
+- Guideline Compliance: 25%
+- Creativity: 20%
+- Clarity: 20%
+- Uniqueness: 20%
+- Intensity Accuracy: 15%
+
+Calibrate your scores knowing these weights. A low compliance score has the most impact.
+</scoring_weights>
+
+<duplicate_detection>
 Two questions are duplicates if they:
-- Describe the same core activity/action
-- Differ only in minor phrasing (e.g., "Have sex outdoors" vs "Make love outside")
+- Describe the same core activity/action (e.g., "Have sex outdoors" vs "Make love outside")
+- Differ only in minor phrasing variations
 - Would feel repetitive if both appeared in the same pack
 
-For duplicates, keep the version with:
+For duplicates, mark the WORSE version as duplicate and keep the version with:
 1. Better phrasing/creativity
 2. More appropriate intensity grading
 3. Better partner_text (if applicable)
+</duplicate_detection>
 
-VERDICT RULES:
-- SELECT: High quality (avg score >= 7), no major issues - should be included
-- CONSIDER: Medium quality (avg score 5-7) - include if needed to fill count
-- SKIP: Low quality (avg score < 5) OR is a duplicate of a better question
+<verdict_rules>
+- SELECT: Average score >= 7, no major issues - should be included
+- CONSIDER: Average score 5-7 - include if needed to fill count
+- SKIP: Average score < 5 OR is a duplicate of a better question
+</verdict_rules>
 
-QUESTIONS TO EVALUATE:
+<questions_to_evaluate>
 ${JSON.stringify(questionsForEval, null, 2)}
+</questions_to_evaluate>
 
-Return a JSON object with:
+<output_format>
 {
   "evaluations": [
     {
-      "questionIndex": 0,
-      "overallScore": 82,
+      "questionIndex": number,        // 0-based index in the questions array
+      "overallScore": number,         // Weighted score 0-100
       "scores": {
-        "guidelineCompliance": 8,
-        "creativity": 9,
-        "clarity": 8,
-        "intensityAccuracy": 8,
-        "uniqueness": 9
+        "guidelineCompliance": 1-10,
+        "creativity": 1-10,
+        "clarity": 1-10,
+        "intensityAccuracy": 1-10,
+        "uniqueness": 1-10
       },
-      "isDuplicate": false,
-      "duplicateOf": null,
-      "issues": ["Minor issue 1"],
-      "verdict": "select"
+      "isDuplicate": boolean,
+      "duplicateOf": number|null,     // Index of the better version if duplicate
+      "issues": string[],             // List of issues found
+      "verdict": "select"|"consider"|"skip"
     }
   ]
 }
 
-Evaluate ALL ${pooledQuestions.length} questions.`;
+Evaluate ALL ${pooledQuestions.length} questions.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: config.reviewerModel,
@@ -116,7 +134,7 @@ Evaluate ALL ${pooledQuestions.length} questions.`;
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.3,
+        temperature: config.reviewerTemperature ?? 0.3,
     });
 
     const content = response.choices[0].message.content;
@@ -280,7 +298,16 @@ export async function performCherryPickSelection(
                 index: i,
                 verdict: 'pass' as const,
                 issues: [],
-                scores: { guidelineCompliance: 7, creativity: 7, clarity: 7, intensityAccuracy: 7 },
+                scores: {
+                    guidelineCompliance: 7,
+                    creativity: 7,
+                    clarity: 7,
+                    intensityAccuracy: 7,
+                    anatomicalConsistency: 10,
+                    partnerTextQuality: 10,
+                    coupleTargeting: 10,
+                    initiatorTargeting: 10,
+                },
             };
         }
 
@@ -298,6 +325,11 @@ export async function performCherryPickSelection(
                 creativity: evaluation.scores.creativity,
                 clarity: evaluation.scores.clarity,
                 intensityAccuracy: evaluation.scores.intensityAccuracy,
+                // Cherry-pick doesn't evaluate these, default to passing
+                anatomicalConsistency: 10,
+                partnerTextQuality: 10,
+                coupleTargeting: 10,
+                initiatorTargeting: 10,
             },
         };
     });

apps/admin/src/lib/ai/generators/council.ts

@@ -143,7 +143,8 @@ export async function generateQuestionsWithCouncil(
                 packDescription,
                 existingQuestions,
                 crudeLang,
-                inspiration
+                inspiration,
+                gen.temperature
             );
             const result = {
                 generatorIndex: index,

apps/admin/src/lib/ai/generators/packs.ts

@@ -3,7 +3,7 @@
 // Generate pack names, descriptions, and pack ideas
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 import type { GeneratedPack, GeneratedPackIdea } from '../types';
 
 /**
@@ -26,48 +26,48 @@ export async function generatePack(
         ? 'CRUDE LANGUAGE OVERRIDE: Use crude, vulgar terms throughout - "fuck", "cock", "pussy" etc.'
         : '';
 
-    const inspirationInstruction = inspiration
-        ? `\n\nINSPIRATION/GUIDANCE FROM ADMIN:\n${inspiration}\n\nUse the above inspiration to guide your generation.`
+    // Sanitize inspiration to prevent prompt injection
+    const sanitizedInspiration = inspiration
+        ? inspiration
+            .replace(/<[^>]*>/g, '')
+            .replace(/\b(CRITICAL|PRIORITY|INSTRUCTION|OVERRIDE|IGNORE|SYSTEM|ASSISTANT)\b:?/gi, '')
+            .trim()
         : '';
 
-    const avoidInstruction = previousNames && previousNames.length > 0
-        ? `\n\nIMPORTANT - DO NOT generate any of these pack names (already suggested): ${previousNames.join(', ')}\nGenerate something completely different and fresh.`
+    const inspirationSection = sanitizedInspiration
+        ? `\n<user_guidance>\n${sanitizedInspiration}\n</user_guidance>`
         : '';
 
-    const appContext = `This is an ACTIVITY-FOCUSED app where couples swipe on activity proposals.
+    const avoidSection = previousNames && previousNames.length > 0
+        ? `\n<avoid_names>\n${previousNames.join(', ')}\n</avoid_names>`
+        : '';
+
+    const prompt = `<task>
+Generate a creative activity pack for a couples' intimacy/connection app${categoryName ? ` in the category "${categoryName}"` : ''}.
+</task>
+
+<app_context>
+This is an ACTIVITY-FOCUSED app where couples swipe on activity proposals.
 Each partner independently swipes Like/Dislike/Maybe, and when both swipe positively they "match".
 Packs contain collections of activities to try together (date ideas, intimate experiences, adventures, challenges, etc.).
-This is NOT a Q&A app - it's about discovering shared interests in activities.`;
+This is NOT a Q&A app - it's about discovering shared interests in activities.
+</app_context>
+${inspirationSection}
 
-    const prompt = categoryName
-        ? `Generate a creative activity pack for a couples' intimacy/connection app in the category "${categoryName}".
+<content_guidelines>
+${explicitInstruction}
+${crudeLangInstruction}
+</content_guidelines>
+${avoidSection}
 
-       ${appContext}
+<output_format>
+{
+  "name": string,        // Catchy pack name, 3-6 words, evokes activities/experiences
+  "description": string  // Brief, enticing description, 1-2 sentences, activity-focused
+}
 
-       The pack should contain a themed collection of activities couples can explore together.
-
-       ${explicitInstruction}
-       ${crudeLangInstruction}${inspirationInstruction}${avoidInstruction}
-
-       Return a JSON object with:
-       - name: A catchy, engaging pack name (3-6 words) that evokes activities/experiences
-       - description: A brief, enticing description (1-2 sentences) focusing on the activities in the pack
-
-       Make it romantic, playful, and activity-focused.`
-        : `Generate a creative activity pack for a couples' intimacy/connection app.
-
-       ${appContext}
-
-       The pack should contain a themed collection of activities couples can explore together.
-
-       ${explicitInstruction}
-       ${crudeLangInstruction}${inspirationInstruction}${avoidInstruction}
-
-       Return a JSON object with:
-       - name: A catchy, engaging pack name (3-6 words) that evokes activities/experiences
-       - description: A brief, enticing description (1-2 sentences) focusing on the activities in the pack
-
-       Make it romantic, playful, and activity-focused.`;
+Make it romantic, playful, and activity-focused.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('generate'),
@@ -79,7 +79,7 @@ This is NOT a Q&A app - it's about discovering shared interests in activities.`;
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.8,
+        temperature: getTemperature('generate', 0.8),
     });
 
     const content = response.choices[0].message.content;
@@ -112,42 +112,67 @@ export async function suggestPacks(
         ? '\nCRUDE LANGUAGE OVERRIDE: Use crude, vulgar terms in the pack names and descriptions.'
         : '';
 
-    const inspirationInstruction = inspiration
-        ? `\n\nINSPIRATION/GUIDANCE FROM ADMIN:\n${inspiration}\n\nUse the above inspiration to guide your pack suggestions.`
+    // Sanitize inspiration to prevent prompt injection
+    const sanitizedInspiration = inspiration
+        ? inspiration
+            .replace(/<[^>]*>/g, '')
+            .replace(/\b(CRITICAL|PRIORITY|INSTRUCTION|OVERRIDE|IGNORE|SYSTEM|ASSISTANT)\b:?/gi, '')
+            .trim()
         : '';
 
-    const avoidInstruction = previousSuggestions && previousSuggestions.length > 0
-        ? `\n\nIMPORTANT - DO NOT suggest any of these pack names (already suggested): ${previousSuggestions.join(', ')}\nGenerate completely different and fresh ideas.`
+    const inspirationSection = sanitizedInspiration
+        ? `\n<user_guidance>\n${sanitizedInspiration}\n</user_guidance>`
         : '';
 
-    const prompt = `We are building activity packs for the category "${categoryName}" in a couples' intimacy app.
+    const avoidSection = previousSuggestions && previousSuggestions.length > 0
+        ? `\n<avoid_names>\n${previousSuggestions.join(', ')}\n</avoid_names>`
+        : '';
 
-IMPORTANT - HOW THE APP WORKS:
-- This is an ACTIVITY-FOCUSED app, NOT a Q&A app
+    const prompt = `<task>
+Suggest 5 NEW, UNIQUE activity pack ideas for the category "${categoryName}" in a couples' intimacy app.
+</task>
+
+<app_context>
+This is an ACTIVITY-FOCUSED app, NOT a Q&A app.
 - Packs contain ACTIVITY PROPOSALS (things couples can do together)
 - Each partner independently swipes Like/Dislike/Maybe on activities
-- When BOTH partners swipe positively on the same activity, they "match" and can discuss it
-- Activities are things like: date ideas, intimate experiences, adventures, challenges, conversations to have, etc.
-- This is NOT about asking each other questions - it's about discovering shared interests in activities
+- When BOTH partners swipe positively, they "match" and can discuss it
+- Activities include: date ideas, intimate experiences, adventures, challenges, conversations
+- Focus on discovering shared interests in activities, not asking questions
+</app_context>
+${inspirationSection}
 
-PACK THEMES should focus on:
+<pack_themes>
+Focus on:
 - Collections of related activities couples might want to try
 - Experiences to share together
 - Things to do, not questions to ask
 - Date ideas, adventures, intimate moments, challenges, bonding activities
+</pack_themes>
 
-Existing packs in this category: ${existingList}.
+<existing_packs>
+Current packs in this category: ${existingList}
+</existing_packs>
 
-Suggest 5 NEW, UNIQUE pack ideas that fit this category and differ from existing ones.
-${explicitInstruction}${crudeLangInstruction}${inspirationInstruction}${avoidInstruction}
+<content_guidelines>
+${explicitInstruction}
+${crudeLangInstruction}
+</content_guidelines>
+${avoidSection}
 
-Return a JSON object with an "ideas" array containing 5 objects, where each object has:
-- name: Pack name (catchy, 3-6 words) - should evoke activities/experiences, not questions
-- description: Brief description (1-2 sentences) focusing on the activities/experiences in the pack
-       - icon: An Ionicon name from this list: heart-outline, flame-outline, sparkles-outline, gift-outline, wine-outline, airplane-outline, home-outline, key-outline, flash-outline, sunny-outline, flower-outline, star-outline, dice-outline, compass-outline, bulb-outline
+<output_format>
+{
+  "ideas": [
+    {
+      "name": string,        // Catchy, 3-6 words, evokes activities/experiences
+      "description": string, // 1-2 sentences, activity-focused
+      "icon": string         // Ionicon: heart-outline, flame-outline, sparkles-outline, gift-outline, wine-outline, airplane-outline, home-outline, key-outline, flash-outline, sunny-outline, flower-outline, star-outline, dice-outline, compass-outline, bulb-outline
+    }
+  ]
+}
 
-
-Make them engaging and specific to "${categoryName}".`;
+Generate 5 unique pack ideas that differ from existing ones. Make them engaging and specific to "${categoryName}".
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('generate'),
@@ -159,7 +184,7 @@ Make them engaging and specific to "${categoryName}".`;
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.9,
+        temperature: getTemperature('generate', 0.9),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/generators/questions.ts

@@ -3,8 +3,8 @@
 // Generate questions for packs with various tone/intensity settings
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
-import { INTENSITY_GUIDE_SHORT, TONE_INSTRUCTIONS, SYSTEM_MESSAGES } from '../config';
+import { getOpenAI, getModel, getTemperature } from '../client';
+import { INTENSITY_GUIDE_SHORT, TONE_INSTRUCTIONS, SYSTEM_MESSAGES, CORE_LANGUAGE_RULES } from '../config';
 import type { GeneratedQuestion, ToneLevel } from '../types';
 
 /**
@@ -20,53 +20,59 @@ function buildQuestionPrompt(
     crudeLang: boolean = false,
     inspiration?: string
 ): string {
-    const isClean = tone === 0;
     const isExplicit = tone >= 4;
 
     const crudeLangInstruction = crudeLang
         ? '\n\nCRUDE LANGUAGE OVERRIDE: Ignore nuanced language rules. Use crude, vulgar terms throughout - "fuck" instead of "have sex", "suck cock" instead of "perform oral", etc. Be raw and direct like uncensored sexting.'
         : '';
 
-    const inspirationInstruction = inspiration
-        ? `\n\nINSPIRATION/GUIDANCE FROM ADMIN:\n${inspiration}\n\nUse the above inspiration to guide the types of questions you generate.`
+    // Sanitize inspiration to prevent prompt injection (remove XML-like tags and authority phrases)
+    const sanitizedInspiration = inspiration
+        ? inspiration
+            .replace(/<[^>]*>/g, '') // Remove XML-like tags
+            .replace(/\b(CRITICAL|PRIORITY|INSTRUCTION|OVERRIDE|IGNORE|SYSTEM|ASSISTANT)\b:?/gi, '') // Remove authority words
+            .trim()
         : '';
 
-    const intensityInstruction = isClean
-        ? 'All questions should be intensity level 1 (non-physical activities).'
+    const inspirationInstruction = sanitizedInspiration
+        ? `\n\n<user_guidance>\n${sanitizedInspiration}\n</user_guidance>\n\nIncorporate the user guidance above into your generation where appropriate. Use it to inform the theme and style of questions.`
+        : '';
+
+    const intensityInstruction = tone === 1
+        ? 'All questions should be intensity level 1 (non-sexual bonding).'
         : intensity
             ? `All questions should be at intensity level ${intensity}.`
-            : 'Vary the intensity levels from 1 to 5 across the questions for good variety.';
+            : 'Vary the intensity levels appropriate for the tone.';
 
     const toneInstruction = TONE_INSTRUCTIONS[tone];
 
     // Examples based on tone level
-    const symmetricExamples = isClean
-        ? 'GOOD: "Cook a new recipe together", "Play a board game", "Go on a hike", "Have a deep conversation about your goals".'
+    const symmetricExamples = tone <= 2
+        ? 'GOOD: "Cook a new recipe together", "Take a walk holding hands", "Slow dance in the living room", "Sensual massage".'
         : isExplicit
-            ? 'GOOD: "Fuck in a risky place", "Try a new position", "Sixty-nine together", "Watch porn and recreate a scene".'
-            : 'GOOD: "Cook a romantic dinner together", "Stargaze and share dreams", "Give each other massages", "Dance together at home".';
+            ? 'GOOD: "Sex in different positions", "Light bondage", "Anal play with toys", "Record intimate moments".'
+            : 'GOOD: "Mutual masturbation", "Oral sex", "Light roleplay", "Using basic toys together".';
 
-    const asymmetricExamples = isClean
+    const asymmetricExamples = tone <= 2
         ? `Examples:
    - text: "Cook your partner their favorite meal" → partner_text: "Have your partner cook your favorite meal"
-   - text: "Plan a surprise for your partner" → partner_text: "Be surprised by your partner"
-   - text: "Give your partner a compliment" → partner_text: "Receive a compliment from your partner"`
+   - text: "Give your partner a massage" → partner_text: "Receive a massage from your partner"
+   - text: "Plan a surprise for your partner" → partner_text: "Be surprised by your partner"`
         : isExplicit
             ? `Examples:
-   - text: "Go down on your partner" → partner_text: "Have your partner go down on you"
-   - text: "Send your partner a nude" → partner_text: "Receive a nude from your partner"
    - text: "Tie your partner up" → partner_text: "Get tied up by your partner"
-   - text: "Spank your partner" → partner_text: "Get spanked by your partner"`
+   - text: "Spank your partner" → partner_text: "Get spanked by your partner"
+   - text: "Use a toy on your partner" → partner_text: "Have a toy used on you"`
             : `Examples:
-   - text: "Give your partner a massage" → partner_text: "Receive a massage from your partner"
-   - text: "Write your partner a love letter" → partner_text: "Receive a love letter from your partner"
-   - text: "Plan a surprise date for your partner" → partner_text: "Be surprised with a date by your partner"`;
+   - text: "Perform oral on your partner" → partner_text: "Receive oral from your partner"
+   - text: "Tease your partner" → partner_text: "Be teased by your partner"
+   - text: "Undress your partner" → partner_text: "Be undressed by your partner"`;
 
-    const explicitWarning = isClean
-        ? '\n\nCRITICAL: This is a CLEAN pack with NO romantic or sexual content. Focus ONLY on communication, activities, challenges, and bonding. NO romance, NO flirting, NO intimacy, NO physical affection beyond friendly gestures.'
+    const explicitWarning = tone === 1
+        ? '\n\nCRITICAL: This is a GENTLE pack. Focus on emotional connection and non-sexual bonding. NO explicit sexual acts.'
         : isExplicit
             ? ''
-            : '\n\nCRITICAL: This is a NON-EXPLICIT pack. Do NOT include any sexual acts, crude language, or NSFW content. Keep all proposals romantic, playful, or emotionally intimate without being sexually explicit.';
+            : '\n\nCRITICAL: Avoid extreme kinks or hardcore content unless specifically requested.';
 
     const descriptionContext = packDescription
         ? `\nPack Description: "${packDescription}"\nUse this description to guide the theme and style of questions.`
@@ -79,43 +85,77 @@ ${existingQuestions.map((q, i) => `${i + 1}. ${q}`).join('\n')}
 CRITICAL: Generate completely NEW and DIFFERENT questions. Do not repeat any of the above questions or create minor variations of them. Each new question must offer a genuinely distinct activity or experience.`
         : '';
 
-    return `Generate ${count} unique questions for a couples' intimacy question pack called "${packName}".${descriptionContext}${existingQuestionsContext}
+    return `<task>
+Generate ${count} unique questions for a couples' intimacy question pack called "${packName}".
+</task>
+${descriptionContext}${inspirationInstruction}${existingQuestionsContext}
 
+<intensity_guide>
 ${INTENSITY_GUIDE_SHORT}
+</intensity_guide>
 
+<instructions>
 ${intensityInstruction}
-${toneInstruction}${explicitWarning}${crudeLangInstruction}${inspirationInstruction}
+${toneInstruction}${explicitWarning}${crudeLangInstruction}
+</instructions>
 
-IMPORTANT: The app uses a swipe-based interface (Like/Dislike/Maybe).
-Cards should be "Proposals" for specific actions, NOT interview questions.
+${CORE_LANGUAGE_RULES}
 
-CRITICAL LANGUAGE RULES:
-- ALWAYS use "your partner" - NEVER use "me", "I", "you" (as the receiver), "him", "her"
-- BAD: "Send me a photo" (who is "me"?), "Let me spank you", "I want you to..."
-- GOOD: "Send your partner a photo", "Spank your partner", "Give your partner..."
-- The card reader is the DOER. Their partner is "your partner".
+<examples>
+GOOD language: "Send your partner a photo", "Spank your partner", "Give your partner..."
+BAD language: "Send me a photo" (who is "me"?), "Let me spank you", "I want you to..."
+The card reader is the DOER. Their partner is "your partner".
+</examples>
 
-For each question, decide if it is SYMMETRIC (shared) or ASYMMETRIC (one does to the other):
-
-1. SYMMETRIC Activities (partner_text = null):
-   - Both partners do the same thing together.
+<question_types>
+1. SYMMETRIC Activities (partner_text = null, no inverse_pair_id):
+   - Both partners do the same thing together
    - ${symmetricExamples}
 
-2. ASYMMETRIC Actions (requires partner_text):
-   - One partner does something TO/FOR the other, or roles differ.
+2. ASYMMETRIC Actions (requires partner_text AND inverse pair):
+   - One partner does something TO/FOR the other, or roles differ
    - text = what the INITIATOR does
    - partner_text = what the RECEIVER does/experiences
    - ${asymmetricExamples}
+   - CRITICAL: Every asymmetric question MUST have its inverse created as a separate question
+</question_types>
 
-Required JSON structure:
-- text: The proposal (DOER's perspective, uses "your partner")
-- partner_text: For asymmetric only - RECEIVER's perspective
-- intensity: 1-5 based on INTENSITY LEVELS above.
-- requires_props: (optional) Array of items needed
-- location_type: (optional) "home" | "public" | "outdoors" | "travel" | "anywhere"
-- effort_level: (optional) "spontaneous" | "low" | "medium" | "planned"
+<inverse_pairs>
+For EVERY asymmetric question, you MUST create its inverse as a separate question.
+Both questions in a pair should have the SAME inverse_pair_id (a unique string per pair).
 
-Return a JSON object with a "questions" array.`;
+Example pair (same inverse_pair_id "pair_1"):
+  Question 1 (primary):
+    text: "Spank your partner"
+    partner_text: "Be spanked by your partner"
+    inverse_pair_id: "pair_1"
+
+  Question 2 (inverse):
+    text: "Be spanked by your partner"
+    partner_text: "Spank your partner"
+    inverse_pair_id: "pair_1"
+
+The first question in each pair (lower array index) becomes the "primary" and the second gets linked as its inverse.
+Use simple pair IDs like "pair_1", "pair_2", etc.
+Symmetric questions should have inverse_pair_id: null.
+</inverse_pairs>
+
+<output_format>
+Return a JSON object with this exact structure:
+{
+  "questions": [
+    {
+      "text": string,              // REQUIRED: 5-12 words, doer's perspective using "your partner"
+      "partner_text": string|null, // REQUIRED for asymmetric, null for symmetric
+      "intensity": 1-5,            // REQUIRED: must match the intensity level guidelines
+      "requires_props": string[]|null,  // Optional: items needed (e.g., ["blindfold", "massage oil"])
+      "inverse_pair_id": string|null,   // REQUIRED for asymmetric pairs, null for symmetric
+      "location_type": "home"|"public"|"outdoors"|"travel"|"anywhere",  // Optional
+      "effort_level": "spontaneous"|"low"|"medium"|"planned"            // Optional
+    }
+  ]
+}
+</output_format>`;
 }
 
 /**
@@ -154,7 +194,7 @@ export async function generateQuestions(
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.9,
+        temperature: getTemperature('generate', 0.9),
     });
 
     const content = response.choices[0].message.content;
@@ -177,7 +217,8 @@ export async function generateQuestionsWithModel(
     packDescription: string | undefined,
     existingQuestions: string[] | undefined,
     crudeLang: boolean,
-    inspiration: string | undefined
+    inspiration: string | undefined,
+    temperature?: number
 ): Promise<GeneratedQuestion[]> {
     const openai = getOpenAI();
 
@@ -202,7 +243,7 @@ export async function generateQuestionsWithModel(
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.9,
+        temperature: temperature ?? getTemperature('generate', 0.9),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/index.ts

@@ -25,6 +25,8 @@ export type {
     CherryPickResult,
     TargetAnalysis,
     TextAnalysis,
+    DeletionAnalysis,
+    PropsAnalysis,
     ExtractedTopic,
     TopicExtractionResult,
     SelectionResult,
@@ -59,6 +61,8 @@ export { reviewGeneratedQuestions, selectBestGeneration } from './review';
 // Analyzers
 export { analyzeQuestionText } from './analyzers/text';
 export { analyzeQuestionTargets } from './analyzers/targets';
+export { analyzeQuestionDeletions } from './analyzers/deletions';
+export { analyzeQuestionProps } from './analyzers/props';
 
 // Tools
 export { polishContent } from './tools/polish';

apps/admin/src/lib/ai/review.ts

@@ -39,47 +39,68 @@ export async function reviewGeneratedQuestions(
         intensity: q.intensity,
         location_type: q.location_type,
         effort_level: q.effort_level,
+        // Include targeting for review (may not always be present)
+        allowed_couple_genders: (q as { allowed_couple_genders?: string[] | null }).allowed_couple_genders || null,
+        target_user_genders: (q as { target_user_genders?: string[] | null }).target_user_genders || null,
     }));
 
     const toneDescription = TONE_LEVELS.find(t => t.level === packContext.tone)?.label || 'Unknown';
 
-    const prompt = `You are a quality reviewer for a couples intimacy app. Review each generated question against our guidelines.
+    const prompt = `<task>
+Review each generated question against our quality guidelines.
+</task>
 
-PACK CONTEXT:
+<pack_context>
 - Pack Name: "${packContext.name}"
 ${packContext.description ? `- Pack Description: "${packContext.description}"` : ''}
 - Content Type: ${packContext.isExplicit ? 'EXPLICIT (adult content allowed)' : 'NON-EXPLICIT (clean/romantic only)'}
 - Tone Level: ${packContext.tone} (${toneDescription})
+</pack_context>
 
+<scoring_criteria>
 ${REVIEW_GUIDELINES}
+</scoring_criteria>
 
-VERDICT RULES:
+<verdict_rules>
 - PASS: All scores >= 7, no major issues
 - FLAG: Any score 5-7, or minor issues worth noting (admin should review but can use)
 - REJECT: Any score < 5, or major violations (mixed anatomy, wrong intensity, severe guideline violation)
+</verdict_rules>
 
-QUESTIONS TO REVIEW:
+<questions_to_review>
 ${JSON.stringify(questionsForReview, null, 2)}
+</questions_to_review>
 
-Return a JSON object with:
+<output_format>
 {
   "reviews": [
     {
-      "index": 0,
-      "verdict": "pass" | "flag" | "reject",
-      "issues": ["Issue 1", "Issue 2"],
-      "suggestions": "Optional improvement suggestion",
+      "index": number,                    // 0-based index of the question
+      "verdict": "pass"|"flag"|"reject",
+      "issues": string[],                 // List of issues found, empty if none
+      "suggestions": string|null,         // Optional improvement suggestion
       "scores": {
-        "guidelineCompliance": 8,
-        "creativity": 7,
-        "clarity": 9,
-        "intensityAccuracy": 8
-      }
+        "guidelineCompliance": 1-10,      // Criterion 1
+        "creativity": 1-10,               // Criterion 2
+        "clarity": 1-10,                  // Criterion 3
+        "intensityAccuracy": 1-10,        // Criterion 4
+        "anatomicalConsistency": 1-10,    // Criterion 5
+        "partnerTextQuality": 1-10,       // Criterion 6 (10 if no partner_text needed)
+        "coupleTargeting": 1-10,          // Criterion 7
+        "initiatorTargeting": 1-10        // Criterion 8 (10 if symmetric)
+      },
+      "intensitySuggestion": number|null, // Suggested intensity (1-5) if current seems wrong, null if correct
+      "targetingSuggestions": {           // Only include if targeting needs changes
+        "suggestedCoupleTargets": string[]|null,  // ["male+male", "female+male", "female+female"] or subset
+        "suggestedInitiator": string[]|null,      // ["male", "female"] or null for any
+        "reason": string                          // Why targeting should change
+      }|null
     }
   ]
 }
 
-Review ALL questions. Be thorough but fair - only flag/reject for genuine issues.`;
+Review ALL questions against ALL 8 criteria. Be thorough but fair - only flag/reject for genuine issues.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: config.reviewerModel,
@@ -91,7 +112,7 @@ Review ALL questions. Be thorough but fair - only flag/reject for genuine issues
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.3,
+        temperature: config.reviewerTemperature ?? 0.3,
     });
 
     const content = response.choices[0].message.content;
@@ -111,19 +132,31 @@ Review ALL questions. Be thorough but fair - only flag/reject for genuine issues
     const flagged = reviews.filter(r => r.verdict === 'flag').length;
     const rejected = reviews.filter(r => r.verdict === 'reject').length;
 
-    // Calculate overall quality as average of all scores
-    let totalScore = 0;
-    let scoreCount = 0;
+    // Calculate overall quality as weighted average of all 8 scores
+    // Weights: guidelineCompliance 20%, creativity 15%, clarity 15%, intensityAccuracy 15%,
+    //          anatomicalConsistency 15%, partnerTextQuality 10%, coupleTargeting 5%, initiatorTargeting 5%
+    let totalWeightedScore = 0;
+    let totalWeight = 0;
+    const weights = {
+        guidelineCompliance: 0.20,
+        creativity: 0.15,
+        clarity: 0.15,
+        intensityAccuracy: 0.15,
+        anatomicalConsistency: 0.15,
+        partnerTextQuality: 0.10,
+        coupleTargeting: 0.05,
+        initiatorTargeting: 0.05,
+    };
     for (const review of reviews) {
         if (review.scores) {
-            totalScore += review.scores.guidelineCompliance || 0;
-            totalScore += review.scores.creativity || 0;
-            totalScore += review.scores.clarity || 0;
-            totalScore += review.scores.intensityAccuracy || 0;
-            scoreCount += 4;
+            for (const [key, weight] of Object.entries(weights)) {
+                const score = review.scores[key as keyof typeof review.scores] || 0;
+                totalWeightedScore += score * weight;
+                totalWeight += weight;
             }
         }
-    const overallQuality = scoreCount > 0 ? Math.round((totalScore / scoreCount) * 10) / 10 : 0;
+    }
+    const overallQuality = totalWeight > 0 ? Math.round((totalWeightedScore / (totalWeight / Object.keys(weights).length)) * 10) / 10 : 0;
 
     return {
         reviews,
@@ -168,54 +201,77 @@ export async function selectBestGeneration(
             text: q.text,
             partner_text: q.partner_text || null,
             intensity: q.intensity,
+            allowed_couple_genders: (q as { allowed_couple_genders?: string[] | null }).allowed_couple_genders || null,
+            target_user_genders: (q as { target_user_genders?: string[] | null }).target_user_genders || null,
         })),
     }));
 
-    const prompt = `You are a quality reviewer for a couples intimacy app. You have received ${candidates.length} different sets of generated questions from different AI models. Your task is to:
+    const prompt = `<task>
+Compare ${candidates.length} different sets of generated questions from different AI models. Select the best set and review it in detail.
+</task>
 
+<objectives>
 1. COMPARE all sets and SELECT the BEST one overall
 2. REVIEW the selected set in detail
+</objectives>
 
-PACK CONTEXT:
+<pack_context>
 - Pack Name: "${packContext.name}"
 ${packContext.description ? `- Pack Description: "${packContext.description}"` : ''}
 - Content Type: ${packContext.isExplicit ? 'EXPLICIT (adult content allowed)' : 'NON-EXPLICIT (clean/romantic only)'}
 - Tone Level: ${packContext.tone} (${toneDescription})
+</pack_context>
 
+<scoring_criteria>
 ${REVIEW_GUIDELINES}
+</scoring_criteria>
 
-CANDIDATE SETS:
+<candidate_sets>
 ${JSON.stringify(candidatesForReview, null, 2)}
+</candidate_sets>
 
-SELECTION CRITERIA (in order of importance):
-1. Overall quality and creativity of questions
-2. Variety and uniqueness within the set
-3. Adherence to pack theme and tone
-4. Proper intensity grading
-5. Correct use of "your partner" language
-6. Quality of partner_text for asymmetric questions
+<selection_criteria>
+Ranked by importance (approximate weights):
+1. Overall quality and creativity of questions (30%)
+2. Variety and uniqueness within the set (20%)
+3. Adherence to pack theme and tone (20%)
+4. Proper intensity grading (15%)
+5. Correct use of "your partner" language (10%)
+6. Quality of partner_text for asymmetric questions (5%)
+</selection_criteria>
 
-Return a JSON object with:
+<output_format>
 {
-  "selectedIndex": <0-based index of the best candidate set>,
-  "reasoning": "<brief explanation of why this set was chosen>",
+  "selectedIndex": number,          // 0-based index of the best candidate set
+  "reasoning": string,              // Brief explanation of why this set was chosen
   "reviews": [
     {
-      "index": <question index within selected set>,
-      "verdict": "pass" | "flag" | "reject",
-      "issues": ["Issue 1", "Issue 2"],
-      "suggestions": "Optional improvement suggestion",
+      "index": number,              // Question index within selected set
+      "verdict": "pass"|"flag"|"reject",
+      "issues": string[],
+      "suggestions": string|null,
       "scores": {
         "guidelineCompliance": 1-10,
         "creativity": 1-10,
         "clarity": 1-10,
-        "intensityAccuracy": 1-10
-      }
+        "intensityAccuracy": 1-10,
+        "anatomicalConsistency": 1-10,
+        "partnerTextQuality": 1-10,
+        "coupleTargeting": 1-10,
+        "initiatorTargeting": 1-10
+      },
+      "intensitySuggestion": number|null,
+      "targetingSuggestions": {
+        "suggestedCoupleTargets": string[]|null,
+        "suggestedInitiator": string[]|null,
+        "reason": string
+      }|null
     }
   ]
 }
 
-Select the best set and review ALL questions in that set.`;
+Select the best set and review ALL questions in that set against ALL 8 criteria.
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: config.reviewerModel,
@@ -227,7 +283,7 @@ Select the best set and review ALL questions in that set.`;
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.3,
+        temperature: config.reviewerTemperature ?? 0.3,
     });
 
     const content = response.choices[0].message.content;
@@ -244,23 +300,33 @@ Select the best set and review ALL questions in that set.`;
     const reviews: QuestionReview[] = parsed.reviews || [];
     const reasoning = parsed.reasoning || 'No reasoning provided';
 
-    // Calculate summary
+    // Calculate summary with weighted average of all 8 scores
     const passed = reviews.filter(r => r.verdict === 'pass').length;
     const flagged = reviews.filter(r => r.verdict === 'flag').length;
     const rejected = reviews.filter(r => r.verdict === 'reject').length;
 
-    let totalScore = 0;
-    let scoreCount = 0;
+    let totalWeightedScore = 0;
+    let totalWeight = 0;
+    const weights = {
+        guidelineCompliance: 0.20,
+        creativity: 0.15,
+        clarity: 0.15,
+        intensityAccuracy: 0.15,
+        anatomicalConsistency: 0.15,
+        partnerTextQuality: 0.10,
+        coupleTargeting: 0.05,
+        initiatorTargeting: 0.05,
+    };
     for (const review of reviews) {
         if (review.scores) {
-            totalScore += review.scores.guidelineCompliance || 0;
-            totalScore += review.scores.creativity || 0;
-            totalScore += review.scores.clarity || 0;
-            totalScore += review.scores.intensityAccuracy || 0;
-            scoreCount += 4;
+            for (const [key, weight] of Object.entries(weights)) {
+                const score = review.scores[key as keyof typeof review.scores] || 0;
+                totalWeightedScore += score * weight;
+                totalWeight += weight;
             }
         }
-    const overallQuality = scoreCount > 0 ? Math.round((totalScore / scoreCount) * 10) / 10 : 0;
+    }
+    const overallQuality = totalWeight > 0 ? Math.round((totalWeightedScore / (totalWeight / Object.keys(weights).length)) * 10) / 10 : 0;
 
     return {
         selectedIndex,

apps/admin/src/lib/ai/tools/polish.ts

@@ -3,7 +3,7 @@
 // Polish and improve content text
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 
 type PolishType = 'question' | 'partner_text' | 'pack_name' | 'pack_description' | 'category_name';
 
@@ -64,20 +64,32 @@ export async function polishContent(
   `;
     }
 
-    const prompt = `Please polish, improve, and tidy up the following text, which is used as ${contextMap[type] || 'text in the app'}.
+    const prompt = `<task>
+Polish, improve, and tidy up the following text used as ${contextMap[type] || 'text in the app'}.
+</task>
 
-  Original text: "${text}"
+<original_text>
+"${text}"
+</original_text>
 
-  ${explicitInstruction}
+<content_type>
+${explicitInstruction}
+</content_type>
 
-  ${additionalRules}
-  ${fewShotExamples}
+<rules>
+${additionalRules}
+- Make it concise, engaging, and grammatically correct
+- Maintain the original intent and meaning
+- Do NOT change the core action - only improve phrasing
+</rules>
 
-  Make it concise, engaging, and grammatically correct.
-  Maintain the original intent and meaning.
+${fewShotExamples}
 
-  Return a JSON object with:
-  - polished: The improved text string`;
+<output_format>
+{
+  "polished": string  // The improved text
+}
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('polish'),
@@ -89,7 +101,7 @@ export async function polishContent(
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.7,
+        temperature: getTemperature('polish', 0.7),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/tools/topics.ts

@@ -3,7 +3,7 @@
 // Extract topics from packs for categorization
 // =============================================================================
 
-import { getOpenAI, getModel } from '../client';
+import { getOpenAI, getModel, getTemperature } from '../client';
 import type { TopicExtractionResult } from '../types';
 
 /**
@@ -20,34 +20,47 @@ export async function extractTopicsFromPack(
     const existingTopicNames = existingTopics.map(t => t.name);
     const existingTopicsJson = JSON.stringify(existingTopics);
 
-    const prompt = `Analyze the following question pack and extract relevant topics/kinks/interests that describe its content.
+    const prompt = `<task>
+Analyze the question pack and extract relevant topics/kinks/interests that describe its content.
+</task>
 
-PACK NAME: "${packName}"
-${packDescription ? `PACK DESCRIPTION: "${packDescription}"` : ''}
+<pack_info>
+Pack Name: "${packName}"
+${packDescription ? `Pack Description: "${packDescription}"` : ''}
+</pack_info>
 
-QUESTIONS IN THIS PACK:
+<questions>
 ${questions.map((q, i) => `${i + 1}. ${q}`).join('\n')}
+</questions>
 
-EXISTING TOPICS IN THE SYSTEM (prefer matching these when appropriate):
-${existingTopicNames.length > 0 ? existingTopicNames.join(', ') : 'None yet'}
+<existing_topics>
+Available topics (prefer matching these): ${existingTopicNames.length > 0 ? existingTopicNames.join(', ') : 'None yet'}
 
-EXISTING TOPICS WITH IDs:
-${existingTopicsJson}
+Topic IDs: ${existingTopicsJson}
+</existing_topics>
 
-INSTRUCTIONS:
+<instructions>
 1. Identify 1-5 topics that best describe this pack's content
-2. Topics should be specific kinks, interests, or themes (e.g., "Bondage", "Exhibitionism", "Voyeurism", "Role Play", "Sensory Play", "Oral", "Anal", "Communication", "Romance", "Adventure")
-3. ALWAYS prefer matching an existing topic if one fits - use the EXACT name and include the existingTopicId
-4. Only suggest a new topic if nothing in the existing list is appropriate
-5. Topic names should be title case (e.g., "Bondage" not "bondage")
-6. Keep topics broad enough to be reusable across packs
+2. Topics should be specific kinks, interests, or themes
+   - Examples: Bondage, Exhibitionism, Voyeurism, Role Play, Sensory Play, Oral, Anal, Communication, Romance, Adventure
+3. ALWAYS prefer matching an existing topic - use the EXACT name and include existingTopicId
+4. Only suggest a new topic if nothing in existing list is appropriate
+5. Topic names: Title Case (e.g., "Bondage" not "bondage")
+6. Keep topics broad enough to be reusable across multiple packs
+</instructions>
 
-Return a JSON object with:
-- topics: Array of objects with:
-  - name: The topic name (use exact existing name if matching)
-  - isNew: false if matching an existing topic, true if suggesting a new one
-  - existingTopicId: The ID of the existing topic if isNew is false (from the EXISTING TOPICS WITH IDs list)
-- reasoning: Brief explanation of why these topics were chosen`;
+<output_format>
+{
+  "topics": [
+    {
+      "name": string,           // Topic name (use exact existing name if matching)
+      "isNew": boolean,         // false if matching existing, true if new
+      "existingTopicId": string|null  // ID from existing topics if isNew is false
+    }
+  ],
+  "reasoning": string           // Brief explanation of why these topics were chosen
+}
+</output_format>`;
 
     const response = await openai.chat.completions.create({
         model: getModel('fix'),
@@ -59,7 +72,7 @@ Return a JSON object with:
             { role: 'user', content: prompt },
         ],
         response_format: { type: 'json_object' },
-        temperature: 0.3,
+        temperature: getTemperature('fix', 0.3),
     });
 
     const content = response.choices[0].message.content;

apps/admin/src/lib/ai/types.ts

@@ -12,6 +12,7 @@ export type ModelPurpose = 'generate' | 'fix' | 'polish' | 'describe_image';
 
 export interface CouncilGenerator {
     model: string;
+    temperature?: number;
 }
 
 export type CouncilSelectionMode = 'whole_set' | 'cherry_pick';
@@ -20,6 +21,7 @@ export interface CouncilConfig {
     enabled: boolean;
     generators: CouncilGenerator[];
     reviewerModel: string;
+    reviewerTemperature?: number;
     selectionMode: CouncilSelectionMode;
     cherryPickEnsureIntensityDistribution: boolean;
 }
@@ -41,6 +43,9 @@ export interface GeneratedQuestion {
     requires_props?: string[] | null;
     location_type?: 'home' | 'public' | 'outdoors' | 'travel' | 'anywhere';
     effort_level?: 'spontaneous' | 'low' | 'medium' | 'planned';
+    // Inverse pair tracking - questions with the same inverse_pair_id are inverses of each other
+    // First question in pair (lower array index) is primary, second gets inverse_of set
+    inverse_pair_id?: string | null;
     // Cherry-pick provenance (only set in cherry-pick mode)
     sourceGeneratorIndex?: number;
     sourceGeneratorModel?: string;
@@ -62,16 +67,29 @@ export interface GeneratedPackIdea {
 // REVIEW TYPES
 // =============================================================================
 
+export interface QuestionReviewScores {
+    guidelineCompliance: number;
+    creativity: number;
+    clarity: number;
+    intensityAccuracy: number;
+    anatomicalConsistency: number;
+    partnerTextQuality: number;
+    coupleTargeting: number;
+    initiatorTargeting: number;
+}
+
 export interface QuestionReview {
     index: number;
     verdict: 'pass' | 'flag' | 'reject';
     issues: string[];
     suggestions?: string;
-    scores: {
-        guidelineCompliance: number;
-        creativity: number;
-        clarity: number;
-        intensityAccuracy: number;
+    scores: QuestionReviewScores;
+    // Additional detailed feedback
+    intensitySuggestion?: number | null; // Suggested intensity if current seems wrong
+    targetingSuggestions?: {
+        suggestedCoupleTargets?: string[] | null;
+        suggestedInitiator?: string[] | null;
+        reason?: string;
     };
 }
 
@@ -188,6 +206,22 @@ export interface TextAnalysis {
     suggested_text: string;
     suggested_partner_text: string | null;
     reason: string;
+    // Intensity suggestion (only if AI thinks current is wrong)
+    suggested_intensity?: number | null;
+    intensity_reason?: string | null;
+}
+
+export interface DeletionAnalysis {
+    id: string;
+    category: 'duplicate' | 'redundant' | 'off-tone' | 'unsafe' | 'too-vague' | 'broken' | 'off-topic';
+    reason: string;
+    duplicate_of_id?: string | null;
+}
+
+export interface PropsAnalysis {
+    id: string;
+    suggested_required_props: string[] | null;
+    reason: string;
 }
 
 export interface ExtractedTopic {
@@ -216,4 +250,4 @@ export interface SelectionResult {
 // TONE LEVEL TYPE
 // =============================================================================
 
-export type ToneLevel = 0 | 1 | 2 | 3 | 4 | 5;
+export type ToneLevel = 1 | 2 | 3 | 4 | 5;

apps/admin/src/pages/AiSettingsPage.tsx

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import type { KeyboardEvent } from 'react';
 import { useAiConfig, AiConfig, CouncilGenerator } from '@/hooks/useAiConfig';
 import { useAuth, PERMISSION_KEYS } from '@/contexts/AuthContext';
 import { Button } from '@/components/ui/button';
@@ -10,11 +11,35 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
 import { Separator } from '@/components/ui/separator';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 import { Textarea } from '@/components/ui/textarea';
-import { Save, Eye, EyeOff, AlertTriangle, Bot, Sparkles, RefreshCw, Plus, Trash2, Package, Cherry, Shield } from 'lucide-react';
+import { Badge } from '@/components/ui/badge';
+import { Save, Eye, EyeOff, AlertTriangle, Bot, Sparkles, RefreshCw, Plus, Trash2, Package, Cherry, Shield, X } from 'lucide-react';
 import { toast } from 'sonner';
 import { format } from 'date-fns';
 import { ModelCombobox } from '@/components/ModelCombobox';
 
+type ListField = 'heuristic_whitelist' | 'heuristic_keyword_triggers';
+
+const parseListValue = (value?: string | null): string[] => {
+    if (!value) return [];
+    return value
+        .split(/[\n,]+/)
+        .map((item) => item.trim())
+        .filter(Boolean);
+};
+
+const appendUniqueItem = (items: string[], value: string): string[] => {
+    const trimmed = value.trim();
+    if (!trimmed) return items;
+    const existing = new Set(items.map((item) => item.toLowerCase()));
+    if (existing.has(trimmed.toLowerCase())) return items;
+    return [...items, trimmed];
+};
+
+const removeItem = (items: string[], value: string): string[] => {
+    const target = value.toLowerCase();
+    return items.filter((item) => item.toLowerCase() !== target);
+};
+
 export function AiSettingsPage() {
     const { hasPermission, isSuperAdmin } = useAuth();
     const { config, loading, error, updateConfig, refetch } = useAiConfig();
@@ -24,6 +49,8 @@ export function AiSettingsPage() {
     const [showApiKey, setShowApiKey] = useState(false);
     const [isSaving, setIsSaving] = useState(false);
     const [hasChanges, setHasChanges] = useState(false);
+    const [whitelistInput, setWhitelistInput] = useState('');
+    const [keywordInput, setKeywordInput] = useState('');
 
     // Permission check - only super admins or those with MANAGE_AI_CONFIG can access
     const canManage = isSuperAdmin || hasPermission(PERMISSION_KEYS.MANAGE_AI_CONFIG);
@@ -39,18 +66,34 @@ export function AiSettingsPage() {
             setFormData({
                 openrouter_api_key: config.openrouter_api_key || '',
                 default_model: config.default_model || '',
+                default_temperature: config.default_temperature,
                 model_generate: config.model_generate || '',
+                temperature_generate: config.temperature_generate,
                 model_fix: config.model_fix || '',
+                temperature_fix: config.temperature_fix,
                 model_polish: config.model_polish || '',
+                temperature_polish: config.temperature_polish,
                 council_enabled: config.council_enabled || false,
                 council_generator_model: config.council_generator_model || '',
                 council_generators: generators,
                 council_reviewer_model: config.council_reviewer_model || '',
+                council_reviewer_temperature: config.council_reviewer_temperature,
                 council_selection_mode: config.council_selection_mode || 'whole_set',
                 cherry_pick_ensure_intensity_distribution: config.cherry_pick_ensure_intensity_distribution ?? true,
                 classifier_enabled: config.classifier_enabled ?? true,
                 classifier_model: config.classifier_model || 'openai/gpt-4o',
+                classifier_temperature: config.classifier_temperature,
                 classifier_prompt: config.classifier_prompt || '',
+                heuristics_enabled: config.heuristics_enabled ?? false,
+                heuristic_min_text_length: config.heuristic_min_text_length ?? 12,
+                heuristic_whitelist_max_length: config.heuristic_whitelist_max_length ?? 30,
+                heuristic_skip_if_no_alnum: config.heuristic_skip_if_no_alnum ?? true,
+                heuristic_skip_media_without_text: config.heuristic_skip_media_without_text ?? false,
+                heuristic_record_reason: config.heuristic_record_reason ?? false,
+                heuristic_use_default_whitelist: config.heuristic_use_default_whitelist ?? true,
+                heuristic_use_default_keywords: config.heuristic_use_default_keywords ?? true,
+                heuristic_whitelist: config.heuristic_whitelist || '',
+                heuristic_keyword_triggers: config.heuristic_keyword_triggers || '',
             });
             setHasChanges(false);
         }
@@ -61,6 +104,46 @@ export function AiSettingsPage() {
         setHasChanges(true);
     };
 
+    const whitelistItems = parseListValue(formData.heuristic_whitelist ?? '');
+    const keywordItems = parseListValue(formData.heuristic_keyword_triggers ?? '');
+
+    const updateListField = (field: ListField, items: string[]) => {
+        handleChange(field, items.length > 0 ? items.join('\n') : '');
+    };
+
+    const handleAddListItem = (
+        field: ListField,
+        value: string,
+        clearValue: (next: string) => void
+    ) => {
+        const current = field === 'heuristic_whitelist' ? whitelistItems : keywordItems;
+        const nextItems = appendUniqueItem(current, value);
+        if (nextItems !== current) {
+            updateListField(field, nextItems);
+        }
+        if (value.trim()) {
+            clearValue('');
+        }
+    };
+
+    const handleRemoveListItem = (field: ListField, value: string) => {
+        const current = field === 'heuristic_whitelist' ? whitelistItems : keywordItems;
+        const nextItems = removeItem(current, value);
+        updateListField(field, nextItems);
+    };
+
+    const handleListKeyDown = (
+        event: KeyboardEvent<HTMLInputElement>,
+        field: ListField,
+        value: string,
+        clearValue: (next: string) => void
+    ) => {
+        if (event.key === 'Enter') {
+            event.preventDefault();
+            handleAddListItem(field, value, clearValue);
+        }
+    };
+
     const handleSave = async () => {
         setIsSaving(true);
         try {
@@ -87,18 +170,34 @@ export function AiSettingsPage() {
             setFormData({
                 openrouter_api_key: config.openrouter_api_key || '',
                 default_model: config.default_model || '',
+                default_temperature: config.default_temperature,
                 model_generate: config.model_generate || '',
+                temperature_generate: config.temperature_generate,
                 model_fix: config.model_fix || '',
+                temperature_fix: config.temperature_fix,
                 model_polish: config.model_polish || '',
+                temperature_polish: config.temperature_polish,
                 council_enabled: config.council_enabled || false,
                 council_generator_model: config.council_generator_model || '',
                 council_generators: generators,
                 council_reviewer_model: config.council_reviewer_model || '',
+                council_reviewer_temperature: config.council_reviewer_temperature,
                 council_selection_mode: config.council_selection_mode || 'whole_set',
                 cherry_pick_ensure_intensity_distribution: config.cherry_pick_ensure_intensity_distribution ?? true,
                 classifier_enabled: config.classifier_enabled ?? true,
                 classifier_model: config.classifier_model || 'openai/gpt-4o',
+                classifier_temperature: config.classifier_temperature,
                 classifier_prompt: config.classifier_prompt || '',
+                heuristics_enabled: config.heuristics_enabled ?? false,
+                heuristic_min_text_length: config.heuristic_min_text_length ?? 12,
+                heuristic_whitelist_max_length: config.heuristic_whitelist_max_length ?? 30,
+                heuristic_skip_if_no_alnum: config.heuristic_skip_if_no_alnum ?? true,
+                heuristic_skip_media_without_text: config.heuristic_skip_media_without_text ?? false,
+                heuristic_record_reason: config.heuristic_record_reason ?? false,
+                heuristic_use_default_whitelist: config.heuristic_use_default_whitelist ?? true,
+                heuristic_use_default_keywords: config.heuristic_use_default_keywords ?? true,
+                heuristic_whitelist: config.heuristic_whitelist || '',
+                heuristic_keyword_triggers: config.heuristic_keyword_triggers || '',
             });
             setHasChanges(false);
         }
@@ -121,8 +220,8 @@ export function AiSettingsPage() {
         handleChange('council_generators', newGenerators);
     };
 
-    const updateGeneratorModel = (index: number, model: string) => {
-        const newGenerators = generators.map((g, i) => i === index ? { ...g, model } : g);
+    const updateGenerator = (index: number, updates: Partial<CouncilGenerator>) => {
+        const newGenerators = generators.map((g, i) => i === index ? { ...g, ...updates } : g);
         handleChange('council_generators', newGenerators);
     };
 
@@ -280,6 +379,7 @@ export function AiSettingsPage() {
                         />
                     </div>
 
+                    <div className="grid grid-cols-[1fr,120px] gap-4">
                         <div className="space-y-2">
                             <Label htmlFor="classifier-model">Classifier Model</Label>
                             <ModelCombobox
@@ -291,6 +391,20 @@ export function AiSettingsPage() {
                                 Model used for classification (must support vision if image moderation is needed)
                             </p>
                         </div>
+                        <div className="space-y-2">
+                            <Label htmlFor="classifier-temperature">Temp</Label>
+                            <Input
+                                id="classifier-temperature"
+                                type="number"
+                                step="0.1"
+                                min="0"
+                                max="2"
+                                value={formData.classifier_temperature ?? ''}
+                                onChange={(e) => handleChange('classifier_temperature', e.target.value === '' ? null : Number(e.target.value))}
+                                placeholder="1.0"
+                            />
+                        </div>
+                    </div>
 
                     <div className="space-y-2">
                         <Label htmlFor="classifier-prompt">System Prompt</Label>
@@ -305,6 +419,223 @@ export function AiSettingsPage() {
                             Instructions for the AI classifier.
                         </p>
                     </div>
+
+                    <Separator />
+
+                    <div className="space-y-4">
+                        <div className="flex items-center justify-between">
+                            <div className="space-y-0.5">
+                                <Label>Enable Heuristic Pre-Filter</Label>
+                                <p className="text-xs text-muted-foreground">
+                                    Skip AI calls for low-risk messages using simple rules
+                                </p>
+                            </div>
+                            <Switch
+                                checked={formData.heuristics_enabled ?? false}
+                                onCheckedChange={(checked) => handleChange('heuristics_enabled', checked)}
+                            />
+                        </div>
+
+                        <div className="grid gap-4 md:grid-cols-2">
+                            <div className="space-y-2">
+                                <Label htmlFor="heuristic-min-length">Minimum Text Length</Label>
+                                <Input
+                                    id="heuristic-min-length"
+                                    type="number"
+                                    min={0}
+                                    value={formData.heuristic_min_text_length ?? 12}
+                                    onChange={(e) =>
+                                        handleChange(
+                                            'heuristic_min_text_length',
+                                            e.target.value === '' ? null : Number(e.target.value)
+                                        )
+                                    }
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    Skip AI for shorter messages without media
+                                </p>
+                            </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="heuristic-whitelist-max">Whitelist Max Length</Label>
+                                <Input
+                                    id="heuristic-whitelist-max"
+                                    type="number"
+                                    min={0}
+                                    value={formData.heuristic_whitelist_max_length ?? 30}
+                                    onChange={(e) =>
+                                        handleChange(
+                                            'heuristic_whitelist_max_length',
+                                            e.target.value === '' ? null : Number(e.target.value)
+                                        )
+                                    }
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    Only apply whitelist to messages below this length
+                                </p>
+                            </div>
+                        </div>
+
+                        <div className="grid gap-4 md:grid-cols-2">
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Skip If No Letters/Numbers</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Treat emoji-only or punctuation-only messages as safe
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={formData.heuristic_skip_if_no_alnum ?? true}
+                                    onCheckedChange={(checked) => handleChange('heuristic_skip_if_no_alnum', checked)}
+                                />
+                            </div>
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Skip Media Without Text</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Skip AI when only media is present
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={formData.heuristic_skip_media_without_text ?? false}
+                                    onCheckedChange={(checked) => handleChange('heuristic_skip_media_without_text', checked)}
+                                />
+                            </div>
+                        </div>
+
+                        <div className="grid gap-4 md:grid-cols-2">
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Use Default Whitelist</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Include built-in common phrases
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={formData.heuristic_use_default_whitelist ?? true}
+                                    onCheckedChange={(checked) => handleChange('heuristic_use_default_whitelist', checked)}
+                                />
+                            </div>
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Use Default Keywords</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Include built-in safety keywords
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={formData.heuristic_use_default_keywords ?? true}
+                                    onCheckedChange={(checked) => handleChange('heuristic_use_default_keywords', checked)}
+                                />
+                            </div>
+                        </div>
+
+                        <div className="flex items-center justify-between">
+                            <div className="space-y-0.5">
+                                <Label>Record Heuristic Reason</Label>
+                                <p className="text-xs text-muted-foreground">
+                                    Store skip reason in flag_reason for debugging
+                                </p>
+                            </div>
+                            <Switch
+                                checked={formData.heuristic_record_reason ?? false}
+                                onCheckedChange={(checked) => handleChange('heuristic_record_reason', checked)}
+                            />
+                        </div>
+
+                        <div className="space-y-2">
+                            <Label>Custom Whitelist</Label>
+                            <div className="flex flex-col gap-2 sm:flex-row">
+                                <Input
+                                    value={whitelistInput}
+                                    onChange={(e) => setWhitelistInput(e.target.value)}
+                                    onKeyDown={(event) =>
+                                        handleListKeyDown(event, 'heuristic_whitelist', whitelistInput, setWhitelistInput)
+                                    }
+                                    placeholder="Add phrase"
+                                />
+                                <Button
+                                    type="button"
+                                    variant="outline"
+                                    onClick={() =>
+                                        handleAddListItem('heuristic_whitelist', whitelistInput, setWhitelistInput)
+                                    }
+                                    disabled={!whitelistInput.trim()}
+                                >
+                                    <Plus className="h-4 w-4 mr-1" />
+                                    Add
+                                </Button>
+                            </div>
+                            {whitelistItems.length > 0 ? (
+                                <div className="flex flex-wrap gap-2">
+                                    {whitelistItems.map((item) => (
+                                        <Badge key={item} variant="secondary" className="flex items-center gap-1">
+                                            <span className="font-mono text-xs">{item}</span>
+                                            <button
+                                                type="button"
+                                                onClick={() => handleRemoveListItem('heuristic_whitelist', item)}
+                                                className="rounded-full p-0.5 text-muted-foreground hover:text-foreground"
+                                                aria-label={`Remove ${item}`}
+                                            >
+                                                <X className="h-3 w-3" />
+                                            </button>
+                                        </Badge>
+                                    ))}
+                                </div>
+                            ) : (
+                                <p className="text-xs text-muted-foreground">No phrases added yet.</p>
+                            )}
+                            <p className="text-xs text-muted-foreground">
+                                Messages matching these phrases are marked safe
+                            </p>
+                        </div>
+
+                        <div className="space-y-2">
+                            <Label>Keyword Triggers</Label>
+                            <div className="flex flex-col gap-2 sm:flex-row">
+                                <Input
+                                    value={keywordInput}
+                                    onChange={(e) => setKeywordInput(e.target.value)}
+                                    onKeyDown={(event) =>
+                                        handleListKeyDown(event, 'heuristic_keyword_triggers', keywordInput, setKeywordInput)
+                                    }
+                                    placeholder="Add keyword"
+                                />
+                                <Button
+                                    type="button"
+                                    variant="outline"
+                                    onClick={() =>
+                                        handleAddListItem('heuristic_keyword_triggers', keywordInput, setKeywordInput)
+                                    }
+                                    disabled={!keywordInput.trim()}
+                                >
+                                    <Plus className="h-4 w-4 mr-1" />
+                                    Add
+                                </Button>
+                            </div>
+                            {keywordItems.length > 0 ? (
+                                <div className="flex flex-wrap gap-2">
+                                    {keywordItems.map((item) => (
+                                        <Badge key={item} variant="secondary" className="flex items-center gap-1">
+                                            <span className="font-mono text-xs">{item}</span>
+                                            <button
+                                                type="button"
+                                                onClick={() => handleRemoveListItem('heuristic_keyword_triggers', item)}
+                                                className="rounded-full p-0.5 text-muted-foreground hover:text-foreground"
+                                                aria-label={`Remove ${item}`}
+                                            >
+                                                <X className="h-3 w-3" />
+                                            </button>
+                                        </Badge>
+                                    ))}
+                                </div>
+                            ) : (
+                                <p className="text-xs text-muted-foreground">No keywords added yet.</p>
+                            )}
+                            <p className="text-xs text-muted-foreground">
+                                If any term appears, the message will be sent to AI
+                            </p>
+                        </div>
+                    </div>
                 </CardContent>
             </Card>
 
@@ -320,6 +651,7 @@ export function AiSettingsPage() {
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="space-y-6">
+                    <div className="grid grid-cols-[1fr,120px] gap-4">
                         <div className="space-y-2">
                             <Label htmlFor="default-model">Default Model</Label>
                             <ModelCombobox
@@ -331,6 +663,20 @@ export function AiSettingsPage() {
                                 Fallback model when no specific model is configured
                             </p>
                         </div>
+                        <div className="space-y-2">
+                            <Label htmlFor="default-temperature">Temp</Label>
+                            <Input
+                                id="default-temperature"
+                                type="number"
+                                step="0.1"
+                                min="0"
+                                max="2"
+                                value={formData.default_temperature ?? ''}
+                                onChange={(e) => handleChange('default_temperature', e.target.value === '' ? null : Number(e.target.value))}
+                                placeholder="0.7"
+                            />
+                        </div>
+                    </div>
 
                     <Separator />
 
@@ -359,6 +705,7 @@ export function AiSettingsPage() {
 
                         {!formData.council_enabled ? (
                             /* Single generator mode */
+                            <div className="grid grid-cols-[1fr,120px] gap-4">
                                 <div className="space-y-2">
                                     <Label htmlFor="model-generate">Generation Model</Label>
                                     <ModelCombobox
@@ -370,6 +717,20 @@ export function AiSettingsPage() {
                                         For questions, category ideas, and pack ideas
                                     </p>
                                 </div>
+                                <div className="space-y-2">
+                                    <Label htmlFor="generate-temperature">Temp</Label>
+                                    <Input
+                                        id="generate-temperature"
+                                        type="number"
+                                        step="0.1"
+                                        min="0"
+                                        max="2"
+                                        value={formData.temperature_generate ?? ''}
+                                        onChange={(e) => handleChange('temperature_generate', e.target.value === '' ? null : Number(e.target.value))}
+                                        placeholder="0.9"
+                                    />
+                                </div>
+                            </div>
                         ) : (
                             /* Council mode - multiple generators + reviewer */
                             <div className="space-y-4 pl-4 border-l-2 border-primary/30">
@@ -394,10 +755,21 @@ export function AiSettingsPage() {
                                             </div>
                                             <ModelCombobox
                                                 value={gen.model}
-                                                onChange={(value) => updateGeneratorModel(index, value)}
+                                                onChange={(value) => updateGenerator(index, { model: value })}
                                                 placeholder={index === 0 ? "anthropic/claude-3.5-sonnet" : "Select model..."}
                                                 className="flex-1"
                                             />
+                                            <Input
+                                                type="number"
+                                                step="0.1"
+                                                min="0"
+                                                max="2"
+                                                value={gen.temperature ?? ''}
+                                                onChange={(e) => updateGenerator(index, { temperature: e.target.value === '' ? undefined : Number(e.target.value) })}
+                                                placeholder="0.9"
+                                                className="w-[80px]"
+                                                aria-label={`Generator ${index + 1} temperature`}
+                                            />
                                             <Button
                                                 type="button"
                                                 variant="ghost"
@@ -413,6 +785,7 @@ export function AiSettingsPage() {
                                 </div>
 
                                 {/* Reviewer */}
+                                <div className="grid grid-cols-[1fr,120px] gap-4">
                                     <div className="space-y-2">
                                         <Label htmlFor="council-reviewer" className="text-sm">Reviewer Model</Label>
                                         <ModelCombobox
@@ -424,6 +797,20 @@ export function AiSettingsPage() {
                                             Reviews outputs and selects the best
                                         </p>
                                     </div>
+                                    <div className="space-y-2">
+                                        <Label htmlFor="reviewer-temperature" className="text-sm">Temp</Label>
+                                        <Input
+                                            id="reviewer-temperature"
+                                            type="number"
+                                            step="0.1"
+                                            min="0"
+                                            max="2"
+                                            value={formData.council_reviewer_temperature ?? ''}
+                                            onChange={(e) => handleChange('council_reviewer_temperature', e.target.value === '' ? null : Number(e.target.value))}
+                                            placeholder="0.3"
+                                        />
+                                    </div>
+                                </div>
 
                                 {/* Selection Mode */}
                                 <div className="space-y-2">
@@ -490,6 +877,7 @@ export function AiSettingsPage() {
 
                         {/* Ideas Model - shown when council mode is ON (since council only applies to questions) */}
                         {formData.council_enabled && (
+                            <div className="grid grid-cols-[1fr,120px] gap-4">
                                 <div className="space-y-2">
                                     <Label htmlFor="model-generate">Ideas Model</Label>
                                     <ModelCombobox
@@ -501,6 +889,20 @@ export function AiSettingsPage() {
                                         For category ideas and pack ideas (council mode only applies to questions)
                                     </p>
                                 </div>
+                                <div className="space-y-2">
+                                    <Label htmlFor="ideas-temperature">Temp</Label>
+                                    <Input
+                                        id="ideas-temperature"
+                                        type="number"
+                                        step="0.1"
+                                        min="0"
+                                        max="2"
+                                        value={formData.temperature_generate ?? ''}
+                                        onChange={(e) => handleChange('temperature_generate', e.target.value === '' ? null : Number(e.target.value))}
+                                        placeholder="0.9"
+                                    />
+                                </div>
+                            </div>
                         )}
                     </div>
 
@@ -508,6 +910,7 @@ export function AiSettingsPage() {
 
                     {/* Other models - always visible */}
                     <div className="grid md:grid-cols-2 gap-4">
+                        <div className="grid grid-cols-[1fr,100px] gap-2">
                             <div className="space-y-2">
                                 <Label htmlFor="model-fix">Analysis Model</Label>
                                 <ModelCombobox
@@ -519,7 +922,22 @@ export function AiSettingsPage() {
                                     For analyzing & fixing content
                                 </p>
                             </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="fix-temperature">Temp</Label>
+                                <Input
+                                    id="fix-temperature"
+                                    type="number"
+                                    step="0.1"
+                                    min="0"
+                                    max="2"
+                                    value={formData.temperature_fix ?? ''}
+                                    onChange={(e) => handleChange('temperature_fix', e.target.value === '' ? null : Number(e.target.value))}
+                                    placeholder="0.5"
+                                />
+                            </div>
+                        </div>
 
+                        <div className="grid grid-cols-[1fr,100px] gap-2">
                             <div className="space-y-2">
                                 <Label htmlFor="model-polish">Polish Model</Label>
                                 <ModelCombobox
@@ -531,6 +949,20 @@ export function AiSettingsPage() {
                                     For polishing & improving text
                                 </p>
                             </div>
+                            <div className="space-y-2">
+                                <Label htmlFor="polish-temperature">Temp</Label>
+                                <Input
+                                    id="polish-temperature"
+                                    type="number"
+                                    step="0.1"
+                                    min="0"
+                                    max="2"
+                                    value={formData.temperature_polish ?? ''}
+                                    onChange={(e) => handleChange('temperature_polish', e.target.value === '' ? null : Number(e.target.value))}
+                                    placeholder="0.7"
+                                />
+                            </div>
+                        </div>
                     </div>
 
                 </CardContent>

apps/admin/src/pages/AppSettingsPage.tsx

@@ -4,6 +4,7 @@ import { useAuth, PERMISSION_KEYS } from '@/contexts/AuthContext';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Switch } from '@/components/ui/switch';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
@@ -28,6 +29,8 @@ export function AppSettingsPage() {
         if (config) {
             setFormData({
                 answer_gap_threshold: config.answer_gap_threshold ?? 10,
+                daily_response_limit: config.daily_response_limit ?? 0,
+                couple_intensity_gate_enabled: config.couple_intensity_gate_enabled ?? false,
             });
             setHasChanges(false);
         }
@@ -59,6 +62,8 @@ export function AppSettingsPage() {
         if (config) {
             setFormData({
                 answer_gap_threshold: config.answer_gap_threshold ?? 10,
+                daily_response_limit: config.daily_response_limit ?? 0,
+                couple_intensity_gate_enabled: config.couple_intensity_gate_enabled ?? false,
             });
             setHasChanges(false);
         }
@@ -155,6 +160,19 @@ export function AppSettingsPage() {
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="space-y-4">
+                    <div className="flex items-center justify-between">
+                        <div className="space-y-0.5">
+                            <Label>Couple Comfort Zone Gate</Label>
+                            <p className="text-sm text-muted-foreground">
+                                When enabled, both recommended questions and answer-gap blocking use the lower of the two partners' comfort zones.
+                            </p>
+                        </div>
+                        <Switch
+                            checked={Boolean(formData.couple_intensity_gate_enabled)}
+                            onCheckedChange={(checked) => handleChange('couple_intensity_gate_enabled', checked)}
+                        />
+                    </div>
+
                     <div className="space-y-2">
                         <Label htmlFor="threshold">Answer Gap Threshold</Label>
                         <Input
@@ -176,6 +194,43 @@ export function AppSettingsPage() {
                     </div>
                 </CardContent>
             </Card>
+
+            {/* Daily Response Limit */}
+            <Card>
+                <CardHeader>
+                    <CardTitle className="flex items-center gap-2">
+                        <Users className="h-5 w-5" />
+                        Daily Response Limit (Free Users)
+                    </CardTitle>
+                    <CardDescription>
+                        Limit the number of questions non-premium users can answer per day (UTC 00:00-23:59)
+                    </CardDescription>
+                </CardHeader>
+                <CardContent className="space-y-4">
+                    <div className="space-y-2">
+                        <Label htmlFor="dailyLimit">Daily Response Limit</Label>
+                        <Input
+                            id="dailyLimit"
+                            type="number"
+                            min="0"
+                            max="1000"
+                            value={formData.daily_response_limit ?? 0}
+                            onChange={(e) => handleChange('daily_response_limit', parseInt(e.target.value) || 0)}
+                            className="max-w-[200px]"
+                        />
+                        <p className="text-xs text-muted-foreground">
+                            Maximum number of questions a non-premium user can answer per UTC day.
+                            Premium users (via personal or partner subscription) bypass this limit.
+                        </p>
+                        <p className="text-xs text-muted-foreground">
+                            Set to <strong>0</strong> to disable daily limits entirely.
+                        </p>
+                        <p className="text-xs text-muted-foreground">
+                            Limit resets daily at 00:00 UTC. Editing existing answers does not count toward the limit.
+                        </p>
+                    </div>
+                </CardContent>
+            </Card>
         </div>
     );
 }

apps/admin/src/pages/AuditLogsPage.tsx

@@ -1,7 +1,8 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { supabase } from '@/config';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
 import {
     Table,
     TableBody,
@@ -34,28 +35,42 @@ const actionColors: Record<string, string> = {
 export function AuditLogsPage() {
     const [logs, setLogs] = useState<AuditLog[]>([]);
     const [loading, setLoading] = useState(true);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(50);
+    const [totalCount, setTotalCount] = useState(0);
 
-    useEffect(() => {
-        const fetchLogs = async () => {
+    const fetchLogs = useCallback(async () => {
         setLoading(true);
         try {
-                const { data, error } = await supabase
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            const { data, error, count } = await supabase
                 .from('audit_logs')
-                    .select('*')
+                .select('*', { count: 'exact' })
                 .order('created_at', { ascending: false })
-                    .limit(100);
+                .range(from, to);
 
             if (error) throw error;
             setLogs(data || []);
+            setTotalCount(count || 0);
         } catch (error) {
             console.error('Failed to load audit logs:', error);
         } finally {
             setLoading(false);
         }
-        };
+    }, [page, pageSize]);
 
+    useEffect(() => {
         fetchLogs();
-    }, []);
+    }, [fetchLogs]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
 
     if (loading) {
         return (
@@ -141,6 +156,19 @@ export function AuditLogsPage() {
                     </TableBody>
                 </Table>
             </div>
+
+            {logs.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
         </div>
     );
 }

apps/admin/src/pages/FeedbackPage.tsx

@@ -4,6 +4,8 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+
 import { Textarea } from '@/components/ui/textarea';
 import { useRealtimeSubscription } from '@/hooks/useRealtimeSubscription';
 import { RealtimeStatusIndicator } from '@/components/RealtimeStatusIndicator';
@@ -87,6 +89,9 @@ export function FeedbackPage() {
     const [search, setSearch] = useState('');
     const [typeFilter, setTypeFilter] = useState<string>('all');
     const [statusFilter, setStatusFilter] = useState<string>('all');
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+
 
     // Detail Dialog State
     const [selectedFeedback, setSelectedFeedback] = useState<Feedback | null>(null);
@@ -140,6 +145,11 @@ export function FeedbackPage() {
         fetchFeedback();
     }, [fetchFeedback]);
 
+    useEffect(() => {
+        setPage(1);
+    }, [search, typeFilter, statusFilter]);
+
+
     const handleOpenDetail = (item: Feedback) => {
         setSelectedFeedback(item);
         setEditStatus(item.status);
@@ -187,6 +197,20 @@ export function FeedbackPage() {
         );
     });
 
+    const totalCount = filteredFeedback.length;
+    const paginatedFeedback = filteredFeedback.slice(
+        (page - 1) * pageSize,
+        page * pageSize
+    );
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+
     const getTypeBadge = (type: FeedbackType) => {
         const config = feedbackTypeConfig[type];
         return (
@@ -295,7 +319,7 @@ export function FeedbackPage() {
                                 </TableCell>
                             </TableRow>
                         ) : (
-                            filteredFeedback.map((item) => (
+                            paginatedFeedback.map((item) => (
                                 <TableRow key={item.id} className="cursor-pointer hover:bg-muted/50" onClick={() => handleOpenDetail(item)}>
                                     <TableCell>{getTypeBadge(item.type)}</TableCell>
                                     <TableCell>
@@ -329,6 +353,19 @@ export function FeedbackPage() {
                 </Table>
             </div>
 
+            {filteredFeedback.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+
             {/* Detail Dialog */}
             <Dialog open={!!selectedFeedback} onOpenChange={(open) => !open && setSelectedFeedback(null)}>
                 <DialogContent className="sm:max-w-[600px] max-h-[90vh] overflow-y-auto">

apps/admin/src/pages/FlaggedMessagesPage.tsx

@@ -1,9 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { supabase } from '@/config';
 import { useNavigate } from 'react-router-dom';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Card } from '@/components/ui/card';
+import { PaginationControls } from '@/components/ui/pagination';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import {
     Table,
@@ -65,10 +66,16 @@ export function FlaggedMessagesPage() {
     // AI Flagged state
     const [aiMessages, setAiMessages] = useState<FlaggedMessage[]>([]);
     const [aiLoading, setAiLoading] = useState(true);
+    const [aiPage, setAiPage] = useState(1);
+    const [aiPageSize, setAiPageSize] = useState(25);
+    const [aiTotal, setAiTotal] = useState(0);
 
     // User Reports state
     const [userReports, setUserReports] = useState<UserReport[]>([]);
     const [reportsLoading, setReportsLoading] = useState(true);
+    const [reportsPage, setReportsPage] = useState(1);
+    const [reportsPageSize, setReportsPageSize] = useState(25);
+    const [reportsTotal, setReportsTotal] = useState(0);
 
     // Shared state
     const [selectedMessage, setSelectedMessage] = useState<FlaggedMessage | null>(null);
@@ -82,30 +89,38 @@ export function FlaggedMessagesPage() {
     const [describingInline, setDescribingInline] = useState<string | null>(null);
 
     // Fetch AI flagged messages
-    const fetchAiMessages = async () => {
+    const fetchAiMessages = useCallback(async () => {
         setAiLoading(true);
         try {
-            const { data, error } = await supabase
+            const from = (aiPage - 1) * aiPageSize;
+            const to = from + aiPageSize - 1;
+
+            const { data, error, count } = await supabase
                 .from('messages')
-                .select('id, created_at, user_id, match_id, moderation_status, flag_reason, content, media_path, media_type')
+                .select('id, created_at, user_id, match_id, moderation_status, flag_reason, content, media_path, media_type', { count: 'exact' })
                 .eq('moderation_status', 'flagged')
-                .order('created_at', { ascending: false });
+                .order('created_at', { ascending: false })
+                .range(from, to);
 
             if (error) throw error;
             setAiMessages(data || []);
+            setAiTotal(count || 0);
         } catch (error) {
             console.error('Failed to load flagged messages:', error);
             toast.error('Failed to load messages');
         } finally {
             setAiLoading(false);
         }
-    };
+    }, [aiPage, aiPageSize]);
 
     // Fetch user reports
-    const fetchUserReports = async () => {
+    const fetchUserReports = useCallback(async () => {
         setReportsLoading(true);
         try {
-            const { data, error } = await supabase
+            const from = (reportsPage - 1) * reportsPageSize;
+            const to = from + reportsPageSize - 1;
+
+            const { data, error, count } = await supabase
                 .from('message_reports')
                 .select(`
                     id,
@@ -116,24 +131,40 @@ export function FlaggedMessagesPage() {
                     created_at,
                     message:messages(id, user_id, match_id, content, media_path, media_type),
                     reporter_profile:profiles!reporter_id(name, email)
-                `)
+                `, { count: 'exact' })
                 .eq('status', 'pending')
-                .order('created_at', { ascending: false });
+                .order('created_at', { ascending: false })
+                .range(from, to);
 
             if (error) throw error;
             setUserReports((data || []) as unknown as UserReport[]);
+            setReportsTotal(count || 0);
         } catch (error) {
             console.error('Failed to load user reports:', error);
             toast.error('Failed to load reports');
         } finally {
             setReportsLoading(false);
         }
-    };
+    }, [reportsPage, reportsPageSize]);
 
     useEffect(() => {
         fetchAiMessages();
         fetchUserReports();
-    }, []);
+    }, [fetchAiMessages, fetchUserReports]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(aiTotal / aiPageSize));
+        if (aiPage > totalPages) {
+            setAiPage(totalPages);
+        }
+    }, [aiPage, aiPageSize, aiTotal]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(reportsTotal / reportsPageSize));
+        if (reportsPage > totalPages) {
+            setReportsPage(totalPages);
+        }
+    }, [reportsPage, reportsPageSize, reportsTotal]);
 
     // Custom media fetcher because supabase.functions.invoke is JSON-centric
     const fetchDecryptedMedia = async (messageId: string) => {
@@ -296,8 +327,8 @@ export function FlaggedMessagesPage() {
             if (error) throw error;
 
             toast.success('Message marked as safe');
-            setAiMessages(prev => prev.filter(m => m.id !== messageId));
             if (selectedMessage?.id === messageId) setSelectedMessage(null);
+            fetchAiMessages();
         } catch (error) {
             toast.error('Failed to update status');
         } finally {
@@ -316,8 +347,8 @@ export function FlaggedMessagesPage() {
             if (error) throw error;
 
             toast.success('Report dismissed');
-            setUserReports(prev => prev.filter(r => r.id !== reportId));
             if (selectedReport?.id === reportId) setSelectedReport(null);
+            fetchUserReports();
         } catch (error) {
             toast.error('Failed to dismiss report');
         } finally {
@@ -336,8 +367,8 @@ export function FlaggedMessagesPage() {
             if (error) throw error;
 
             toast.success('Report marked as reviewed');
-            setUserReports(prev => prev.filter(r => r.id !== reportId));
             if (selectedReport?.id === reportId) setSelectedReport(null);
+            fetchUserReports();
         } catch (error) {
             toast.error('Failed to update report');
         } finally {
@@ -491,6 +522,19 @@ export function FlaggedMessagesPage() {
                             </TableBody>
                         </Table>
                     </Card>
+
+                    {aiTotal > 0 && (
+                        <PaginationControls
+                            page={aiPage}
+                            pageSize={aiPageSize}
+                            totalCount={aiTotal}
+                            onPageChange={setAiPage}
+                            onPageSizeChange={(size) => {
+                                setAiPage(1);
+                                setAiPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
 
                 <TabsContent value="user-reports" className="space-y-4">
@@ -579,6 +623,19 @@ export function FlaggedMessagesPage() {
                             </TableBody>
                         </Table>
                     </Card>
+
+                    {reportsTotal > 0 && (
+                        <PaginationControls
+                            page={reportsPage}
+                            pageSize={reportsPageSize}
+                            totalCount={reportsTotal}
+                            onPageChange={setReportsPage}
+                            onPageSizeChange={(size) => {
+                                setReportsPage(1);
+                                setReportsPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
             </Tabs>
 

apps/admin/src/pages/RedemptionCodesPage.tsx

@@ -1,10 +1,13 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
+
 import { supabase } from '@/config';
 import { auditedSupabase } from '@/hooks/useAuditedSupabase';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+
 import { Switch } from '@/components/ui/switch';
 import {
     Table,
@@ -64,6 +67,10 @@ export function RedemptionCodesPage() {
     const [codes, setCodes] = useState<RedemptionCode[]>([]);
     const [loading, setLoading] = useState(true);
     const [search, setSearch] = useState('');
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [totalCount, setTotalCount] = useState(0);
+
 
     // Add Code State
     const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
@@ -79,41 +86,60 @@ export function RedemptionCodesPage() {
     const [viewingCode, setViewingCode] = useState<RedemptionCode | null>(null);
     const [redemptions, setRedemptions] = useState<CodeRedemption[]>([]);
     const [loadingRedemptions, setLoadingRedemptions] = useState(false);
+    const [redemptionsPage, setRedemptionsPage] = useState(1);
+    const [redemptionsPageSize, setRedemptionsPageSize] = useState(10);
+    const [redemptionsTotal, setRedemptionsTotal] = useState(0);
 
-    // Initial load
-    useEffect(() => {
-        fetchCodes();
-    }, []);
 
-    const fetchCodes = async () => {
+
+
+    const fetchCodes = useCallback(async () => {
         setLoading(true);
         try {
-            const { data, error } = await supabase
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+            const trimmedSearch = search.trim();
+
+            let query = supabase
                 .from('redemption_codes')
-                .select('*')
+                .select('*', { count: 'exact' })
                 .order('created_at', { ascending: false });
 
+            if (trimmedSearch) {
+                query = query.or(`code.ilike.%${trimmedSearch}%,description.ilike.%${trimmedSearch}%`);
+            }
+
+            const { data, error, count } = await query.range(from, to);
+
             if (error) throw error;
             setCodes(data || []);
+            setTotalCount(count || 0);
         } catch (error: any) {
             console.error('Failed to load codes:', error);
             toast.error("Failed to load redemption codes");
         } finally {
             setLoading(false);
         }
-    };
+    }, [page, pageSize, search]);
 
-    const fetchRedemptions = async (codeId: string) => {
+
+    const fetchRedemptions = useCallback(async (codeId: string) => {
         setLoadingRedemptions(true);
         try {
-            const { data: redemptionData, error: redemptionError } = await supabase
+            const from = (redemptionsPage - 1) * redemptionsPageSize;
+            const to = from + redemptionsPageSize - 1;
+
+            const { data: redemptionData, error: redemptionError, count } = await supabase
                 .from('code_redemptions')
-                .select('id, user_id, redeemed_at')
+                .select('id, user_id, redeemed_at', { count: 'exact' })
                 .eq('code_id', codeId)
-                .order('redeemed_at', { ascending: false });
+                .order('redeemed_at', { ascending: false })
+                .range(from, to);
 
             if (redemptionError) throw redemptionError;
 
+            setRedemptionsTotal(count || 0);
+
             if (redemptionData && redemptionData.length > 0) {
                 const userIds = redemptionData.map(r => r.user_id);
                 const { data: profileData } = await supabase
@@ -135,7 +161,36 @@ export function RedemptionCodesPage() {
         } finally {
             setLoadingRedemptions(false);
         }
-    };
+    }, [redemptionsPage, redemptionsPageSize]);
+
+    useEffect(() => {
+        fetchCodes();
+    }, [fetchCodes]);
+
+    useEffect(() => {
+        setPage(1);
+    }, [search]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+    useEffect(() => {
+        if (viewingCode) {
+            fetchRedemptions(viewingCode.id);
+        }
+    }, [viewingCode, fetchRedemptions]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(redemptionsTotal / redemptionsPageSize));
+        if (redemptionsPage > totalPages) {
+            setRedemptionsPage(totalPages);
+        }
+    }, [redemptionsPage, redemptionsPageSize, redemptionsTotal]);
+
 
     const handleAddCode = async () => {
         if (!formData.code.trim()) {
@@ -226,17 +281,12 @@ export function RedemptionCodesPage() {
 
     const handleViewRedemptions = (code: RedemptionCode) => {
         setViewingCode(code);
-        fetchRedemptions(code.id);
+        setRedemptionsPage(1);
     };
 
-    const filteredCodes = codes.filter(code => {
-        if (!search) return true;
-        const query = search.toLowerCase();
-        return (
-            code.code.toLowerCase().includes(query) ||
-            code.description?.toLowerCase().includes(query)
-        );
-    });
+
+    const filteredCodes = codes;
+
 
     const getStatusBadge = (code: RedemptionCode) => {
         if (!code.is_active) {
@@ -440,6 +490,20 @@ export function RedemptionCodesPage() {
                 </Table>
             </div>
 
+            {filteredCodes.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+
+
             {/* View Redemptions Dialog */}
             <Dialog open={!!viewingCode} onOpenChange={(open) => !open && setViewingCode(null)}>
                 <DialogContent className="sm:max-w-[500px]">
@@ -486,7 +550,21 @@ export function RedemptionCodesPage() {
                             </Table>
                         )}
                     </div>
+
+                    {redemptionsTotal > 0 && (
+                        <PaginationControls
+                            page={redemptionsPage}
+                            pageSize={redemptionsPageSize}
+                            totalCount={redemptionsTotal}
+                            onPageChange={setRedemptionsPage}
+                            onPageSizeChange={(size) => {
+                                setRedemptionsPage(1);
+                                setRedemptionsPageSize(size);
+                            }}
+                        />
+                    )}
                     <DialogFooter>
+
                         <Button variant="outline" onClick={() => setViewingCode(null)}>Close</Button>
                     </DialogFooter>
                 </DialogContent>

apps/admin/src/pages/activity/UserActivityPage.tsx

@@ -6,6 +6,7 @@ import { Skeleton } from '@/components/ui/skeleton';
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { useRealtimeSubscription } from '@/hooks/useRealtimeSubscription';
 import { RealtimeStatusIndicator } from '@/components/RealtimeStatusIndicator';
+import { PaginationControls } from '@/components/ui/pagination';
 import {
     Table,
     TableBody,
@@ -48,6 +49,7 @@ interface ResponseActivity {
         id: string;
         text: string;
         pack: {
+            id: string;
             name: string;
         } | null;
     } | null;
@@ -121,6 +123,18 @@ export function UserActivityPage() {
     const [matches, setMatches] = useState<MatchActivity[]>([]);
     const [messages, setMessages] = useState<MessageActivity[]>([]);
     const [signups, setSignups] = useState<SignupActivity[]>([]);
+    const [responsesPage, setResponsesPage] = useState(1);
+    const [responsesPageSize, setResponsesPageSize] = useState(25);
+    const [responsesTotal, setResponsesTotal] = useState(0);
+    const [matchesPage, setMatchesPage] = useState(1);
+    const [matchesPageSize, setMatchesPageSize] = useState(25);
+    const [matchesTotal, setMatchesTotal] = useState(0);
+    const [messagesPage, setMessagesPage] = useState(1);
+    const [messagesPageSize, setMessagesPageSize] = useState(25);
+    const [messagesTotal, setMessagesTotal] = useState(0);
+    const [signupsPage, setSignupsPage] = useState(1);
+    const [signupsPageSize, setSignupsPageSize] = useState(25);
+    const [signupsTotal, setSignupsTotal] = useState(0);
     const [loading, setLoading] = useState({
         responses: true,
         matches: true,
@@ -132,21 +146,26 @@ export function UserActivityPage() {
     const fetchResponses = useCallback(async () => {
         setLoading(prev => ({ ...prev, responses: true }));
         try {
-            const { data, error } = await supabase
+            const from = (responsesPage - 1) * responsesPageSize;
+            const to = from + responsesPageSize - 1;
+
+            const { data, error, count } = await supabase
                 .from('responses')
                 .select(`
                     id, user_id, answer, created_at,
                     profile:profiles!responses_user_id_fkey(id, name, email),
                     question:questions(
                         id, text,
-                        pack:question_packs(name)
+                        pack:question_packs(id, name)
                     )
-                `)
+                `, { count: 'exact' })
                 .order('created_at', { ascending: false })
-                .limit(50);
+                .range(from, to);
 
             if (error) throw error;
 
+            setResponsesTotal(count || 0);
+
             // Transform data to match our types (Supabase returns nested objects, not arrays for 1:1 relations)
             const transformed: ResponseActivity[] = (data || []).map((item: any) => ({
                 id: item.id,
@@ -167,23 +186,28 @@ export function UserActivityPage() {
         } finally {
             setLoading(prev => ({ ...prev, responses: false }));
         }
-    }, []);
+    }, [responsesPage, responsesPageSize]);
 
     // Fetch matches with couple profiles
     const fetchMatches = useCallback(async () => {
         setLoading(prev => ({ ...prev, matches: true }));
         try {
-            const { data: matchesData, error: matchesError } = await supabase
+            const from = (matchesPage - 1) * matchesPageSize;
+            const to = from + matchesPageSize - 1;
+
+            const { data: matchesData, error: matchesError, count } = await supabase
                 .from('matches')
                 .select(`
                     id, couple_id, match_type, is_new, created_at,
                     question:questions(id, text)
-                `)
+                `, { count: 'exact' })
                 .order('created_at', { ascending: false })
-                .limit(50);
+                .range(from, to);
 
             if (matchesError) throw matchesError;
 
+            setMatchesTotal(count || 0);
+
             // Get unique couple IDs and fetch profiles
             const coupleIds = [...new Set((matchesData || []).map((m: any) => m.couple_id))];
             if (coupleIds.length > 0) {
@@ -223,14 +247,17 @@ export function UserActivityPage() {
         } finally {
             setLoading(prev => ({ ...prev, matches: false }));
         }
-    }, []);
+    }, [matchesPage, matchesPageSize]);
 
     // Fetch messages
     const fetchMessages = useCallback(async () => {
         setLoading(prev => ({ ...prev, messages: true }));
         try {
+            const from = (messagesPage - 1) * messagesPageSize;
+            const to = from + messagesPageSize - 1;
+
             // Fetch messages with match data
-            const { data: messagesData, error: messagesError } = await supabase
+            const { data: messagesData, error: messagesError, count } = await supabase
                 .from('messages')
                 .select(`
                     id, user_id, content, media_path, media_type, created_at,
@@ -238,12 +265,14 @@ export function UserActivityPage() {
                         id,
                         question:questions(text)
                     )
-                `)
+                `, { count: 'exact' })
                 .order('created_at', { ascending: false })
-                .limit(50);
+                .range(from, to);
 
             if (messagesError) throw messagesError;
 
+            setMessagesTotal(count || 0);
+
             // Get unique user IDs and fetch profiles
             const userIds = [...new Set((messagesData || []).map((m: any) => m.user_id))];
             let profilesMap: Record<string, { id: string; name: string | null; email: string | null }> = {};
@@ -283,27 +312,35 @@ export function UserActivityPage() {
         } finally {
             setLoading(prev => ({ ...prev, messages: false }));
         }
-    }, []);
+    }, [messagesPage, messagesPageSize]);
 
     // Fetch signups
     const fetchSignups = useCallback(async () => {
         setLoading(prev => ({ ...prev, signups: true }));
         try {
-            const { data, error } = await supabase
-                .from('profiles')
-                .select('id, name, email, avatar_url, created_at, onboarding_completed, couple_id')
-                .order('created_at', { ascending: false })
-                .limit(50);
+            // Use RPC to get profiles with auth info (includes email from auth.users)
+            const { data: allData, error } = await supabase
+                .rpc('get_profiles_with_auth_info');
 
             if (error) throw error;
-            setSignups(data || []);
+
+            // Sort by created_at descending and apply pagination
+            const sorted = (allData || []).sort((a: SignupActivity, b: SignupActivity) =>
+                new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+            );
+
+            const from = (signupsPage - 1) * signupsPageSize;
+            const to = from + signupsPageSize;
+
+            setSignups(sorted.slice(from, to));
+            setSignupsTotal(sorted.length);
         } catch (error) {
             console.error('Failed to load signups:', error);
             toast.error("Failed to load signups");
         } finally {
             setLoading(prev => ({ ...prev, signups: false }));
         }
-    }, []);
+    }, [signupsPage, signupsPageSize]);
 
     // Real-time subscriptions
     const { status: responsesStatus } = useRealtimeSubscription({
@@ -338,6 +375,34 @@ export function UserActivityPage() {
         fetchSignups();
     }, [fetchResponses, fetchMatches, fetchMessages, fetchSignups]);
 
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(responsesTotal / responsesPageSize));
+        if (responsesPage > totalPages) {
+            setResponsesPage(totalPages);
+        }
+    }, [responsesPage, responsesPageSize, responsesTotal]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(matchesTotal / matchesPageSize));
+        if (matchesPage > totalPages) {
+            setMatchesPage(totalPages);
+        }
+    }, [matchesPage, matchesPageSize, matchesTotal]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(messagesTotal / messagesPageSize));
+        if (messagesPage > totalPages) {
+            setMessagesPage(totalPages);
+        }
+    }, [messagesPage, messagesPageSize, messagesTotal]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(signupsTotal / signupsPageSize));
+        if (signupsPage > totalPages) {
+            setSignupsPage(totalPages);
+        }
+    }, [signupsPage, signupsPageSize, signupsTotal]);
+
     // Get current realtime status based on active tab
     const getCurrentRealtimeStatus = () => {
         switch (activeTab) {
@@ -442,14 +507,31 @@ export function UserActivityPage() {
                                         <TableRow key={item.id}>
                                             <TableCell>{renderUserLink(item.profile)}</TableCell>
                                             <TableCell className="max-w-[300px]">
+                                                {item.question?.pack?.id ? (
+                                                    <Link
+                                                        to={`/packs/${item.question.pack.id}/questions`}
+                                                        className="truncate block text-primary hover:underline"
+                                                    >
+                                                        {item.question?.text || 'Unknown question'}
+                                                    </Link>
+                                                ) : (
                                                     <span className="truncate block">
                                                         {item.question?.text || 'Unknown question'}
                                                     </span>
+                                                )}
                                             </TableCell>
                                             <TableCell>
+                                                {item.question?.pack?.id ? (
+                                                    <Link to={`/packs/${item.question.pack.id}/questions`}>
+                                                        <Badge variant="outline" className="hover:bg-primary/10 cursor-pointer">
+                                                            {item.question.pack.name}
+                                                        </Badge>
+                                                    </Link>
+                                                ) : (
                                                     <Badge variant="outline">
                                                         {item.question?.pack?.name || 'Unknown'}
                                                     </Badge>
+                                                )}
                                             </TableCell>
                                             <TableCell>{renderAnswerBadge(item.answer)}</TableCell>
                                             <TableCell className="text-muted-foreground text-sm whitespace-nowrap">
@@ -461,6 +543,19 @@ export function UserActivityPage() {
                             </TableBody>
                         </Table>
                     </div>
+
+                    {responsesTotal > 0 && (
+                        <PaginationControls
+                            page={responsesPage}
+                            pageSize={responsesPageSize}
+                            totalCount={responsesTotal}
+                            onPageChange={setResponsesPage}
+                            onPageSizeChange={(size) => {
+                                setResponsesPage(1);
+                                setResponsesPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
 
                 {/* Matches Tab */}
@@ -535,6 +630,19 @@ export function UserActivityPage() {
                             </TableBody>
                         </Table>
                     </div>
+
+                    {matchesTotal > 0 && (
+                        <PaginationControls
+                            page={matchesPage}
+                            pageSize={matchesPageSize}
+                            totalCount={matchesTotal}
+                            onPageChange={setMatchesPage}
+                            onPageSizeChange={(size) => {
+                                setMatchesPage(1);
+                                setMatchesPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
 
                 {/* Messages Tab */}
@@ -593,6 +701,19 @@ export function UserActivityPage() {
                             </TableBody>
                         </Table>
                     </div>
+
+                    {messagesTotal > 0 && (
+                        <PaginationControls
+                            page={messagesPage}
+                            pageSize={messagesPageSize}
+                            totalCount={messagesTotal}
+                            onPageChange={setMessagesPage}
+                            onPageSizeChange={(size) => {
+                                setMessagesPage(1);
+                                setMessagesPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
 
                 {/* Signups Tab */}
@@ -666,6 +787,19 @@ export function UserActivityPage() {
                             </TableBody>
                         </Table>
                     </div>
+
+                    {signupsTotal > 0 && (
+                        <PaginationControls
+                            page={signupsPage}
+                            pageSize={signupsPageSize}
+                            totalCount={signupsTotal}
+                            onPageChange={setSignupsPage}
+                            onPageSizeChange={(size) => {
+                                setSignupsPage(1);
+                                setSignupsPageSize(size);
+                            }}
+                        />
+                    )}
                 </TabsContent>
             </Tabs>
         </div>

apps/admin/src/pages/admins/AdminsPage.tsx

@@ -7,6 +7,7 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { Checkbox } from '@/components/ui/checkbox';
 import {
@@ -58,6 +59,8 @@ export function AdminsPage() {
     const [admins, setAdmins] = useState<AdminUser[]>([]);
     const [loading, setLoading] = useState(true);
     const [search, setSearch] = useState('');
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
 
     // Add Admin State
     const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
@@ -280,6 +283,23 @@ export function AdminsPage() {
         );
     });
 
+    const totalCount = filteredAdmins.length;
+    const paginatedAdmins = filteredAdmins.slice(
+        (page - 1) * pageSize,
+        page * pageSize
+    );
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+    useEffect(() => {
+        setPage(1);
+    }, [search]);
+
     return (
         <div className="space-y-6">
             <div className="flex items-center justify-between">
@@ -509,7 +529,7 @@ export function AdminsPage() {
                                 </TableCell>
                             </TableRow>
                         ) : (
-                            filteredAdmins.map((admin) => (
+                            paginatedAdmins.map((admin) => (
                                 <TableRow key={admin.user_id}>
                                     <TableCell>
                                         <div className="flex items-center gap-3">
@@ -590,6 +610,19 @@ export function AdminsPage() {
                 </Table>
             </div>
 
+            {filteredAdmins.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+
             {/* Edit Permissions Dialog */}
             <Dialog open={isEditDialogOpen} onOpenChange={setIsEditDialogOpen}>
                 <DialogContent className="sm:max-w-[500px]">

apps/admin/src/pages/content/CategoriesPage.tsx

@@ -3,13 +3,16 @@ import { Link } from 'react-router-dom';
 import { supabase } from '@/config';
 import { auditedSupabase } from '@/hooks/useAuditedSupabase';
 import { useEntityForm } from '@/hooks/useEntityForm';
+import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
+import { Switch } from '@/components/ui/switch';
 import { IconPicker, IconPreview } from '@/components/ui/icon-picker';
 import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
 import {
     Dialog,
     DialogContent,
@@ -19,10 +22,27 @@ import {
     DialogTitle,
     DialogTrigger,
 } from '@/components/ui/dialog';
-import { Plus, Package, Pencil, Trash2, Sparkles, Loader2, ChevronUp, ChevronDown } from 'lucide-react';
+import { Plus, Package, Pencil, Trash2, Sparkles, Loader2, GripVertical } from 'lucide-react';
 import { toast } from 'sonner';
 import { AiGeneratorDialog } from '@/components/ai/AiGeneratorDialog';
 import { AIPolishButton } from '@/components/ai/AIPolishButton';
+import {
+    DndContext,
+    closestCenter,
+    KeyboardSensor,
+    PointerSensor,
+    useSensor,
+    useSensors,
+    DragEndEvent,
+} from '@dnd-kit/core';
+import {
+    arrayMove,
+    SortableContext,
+    sortableKeyboardCoordinates,
+    useSortable,
+    rectSortingStrategy,
+} from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
 
 // =============================================================================
 // Types
@@ -35,13 +55,130 @@ interface Category {
     icon: string | null;
     sort_order: number | null;
     created_at: string | null;
-    pack_count?: number;
+    is_public: boolean;
+    question_pack_count?: number;
+    dare_pack_count?: number;
 }
 
 interface CategoryFormData {
     name: string;
     description: string;
     icon: string;
+    is_public: boolean;
+}
+
+// =============================================================================
+// Sortable Card Component
+// =============================================================================
+
+interface SortableCategoryCardProps {
+    category: Category;
+    onEdit: (category: Category) => void;
+    onDelete: (category: Category) => void;
+    onToggleVisibility: (category: Category) => void;
+}
+
+function SortableCategoryCard({ category, onEdit, onDelete, onToggleVisibility }: SortableCategoryCardProps) {
+    const {
+        attributes,
+        listeners,
+        setNodeRef,
+        transform,
+        transition,
+        isDragging,
+    } = useSortable({ id: category.id });
+
+    const style = {
+        transform: CSS.Transform.toString(transform),
+        transition,
+        opacity: isDragging ? 0.5 : 1,
+        zIndex: isDragging ? 1000 : 'auto',
+    };
+
+    return (
+        <Card
+            ref={setNodeRef}
+            style={style}
+            className="group flex flex-col hover:border-primary/50 transition-colors"
+        >
+            <CardHeader className="flex-row items-start justify-between space-y-0 pb-2">
+                <div className="flex items-center gap-2">
+                    <button
+                        {...attributes}
+                        {...listeners}
+                        className="cursor-grab active:cursor-grabbing p-1 -ml-1 rounded hover:bg-muted opacity-0 group-hover:opacity-100 transition-opacity touch-none"
+                        aria-label="Drag to reorder"
+                    >
+                        <GripVertical className="h-4 w-4 text-muted-foreground" />
+                    </button>
+                    <div className="rounded-lg bg-primary/10 p-2.5">
+                        <IconPreview value={category.icon} className="h-6 w-6 text-primary" />
+                    </div>
+                </div>
+                <div className="flex items-center gap-2">
+                    <span className="text-[10px] uppercase tracking-wider text-muted-foreground font-medium">
+                        {category.is_public ? 'Public' : 'Hidden'}
+                    </span>
+                    <Switch
+                        checked={category.is_public}
+                        onCheckedChange={() => onToggleVisibility(category)}
+                        className="scale-75 origin-right"
+                    />
+                </div>
+            </CardHeader>
+            <CardContent className="flex-1 flex flex-col gap-4">
+                <div className="space-y-1">
+                    <CardTitle className="text-lg">{category.name}</CardTitle>
+                    <CardDescription className="line-clamp-2 h-10">
+                        {category.description || 'No description'}
+                    </CardDescription>
+                </div>
+
+                <div className="flex items-center justify-between mt-auto">
+                    <div className="flex flex-wrap gap-2">
+                        <Badge variant="secondary" className="font-normal">
+                            {category.question_pack_count} question pack{category.question_pack_count !== 1 ? 's' : ''}
+                        </Badge>
+                        <Badge variant="secondary" className="font-normal">
+                            {category.dare_pack_count} dare pack{category.dare_pack_count !== 1 ? 's' : ''}
+                        </Badge>
+                    </div>
+
+                    <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
+                        <Button
+                            variant="ghost"
+                            size="icon"
+                            className="h-8 w-8 text-muted-foreground hover:text-foreground"
+                            onClick={() => onEdit(category)}
+                        >
+                            <Pencil className="h-4 w-4" />
+                        </Button>
+                        <Button
+                            variant="ghost"
+                            size="icon"
+                            className="h-8 w-8 text-muted-foreground hover:text-destructive"
+                            onClick={() => onDelete(category)}
+                        >
+                            <Trash2 className="h-4 w-4" />
+                        </Button>
+                    </div>
+                </div>
+
+                <div className="grid gap-2">
+                    <Link to={`/categories/${category.id}/packs`}>
+                        <Button variant="outline" className="w-full">
+                            View Question Packs
+                        </Button>
+                    </Link>
+                    <Link to={`/categories/${category.id}/dare-packs`}>
+                        <Button variant="outline" className="w-full">
+                            View Dare Packs
+                        </Button>
+                    </Link>
+                </div>
+            </CardContent>
+        </Card>
+    );
 }
 
 // =============================================================================
@@ -53,14 +190,18 @@ export function CategoriesPage() {
     const [categories, setCategories] = useState<Category[]>([]);
     const [loading, setLoading] = useState(true);
     const [aiIdeasOpen, setAiIdeasOpen] = useState(false);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(12);
+    const [totalCount, setTotalCount] = useState(0);
 
     // Form state using the new hook
     const form = useEntityForm<CategoryFormData, Category>(
-        { name: '', description: '', icon: 'bookmark-outline' },
+        { name: '', description: '', icon: 'bookmark-outline', is_public: true },
         (category) => ({
             name: category.name,
             description: category.description || '',
             icon: category.icon || 'bookmark-outline',
+            is_public: category.is_public ?? true,
         })
     );
 
@@ -71,30 +212,53 @@ export function CategoriesPage() {
     const fetchCategories = useCallback(async () => {
         setLoading(true);
         try {
-            // Fetch categories with pack count
-            const { data: cats, error } = await supabase
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            const { data: cats, error, count } = await supabase
                 .from('categories')
-                .select('*')
-                .order('sort_order', { ascending: true });
+                .select('*', { count: 'exact' })
+                .order('sort_order', { ascending: true })
+                .range(from, to);
 
             if (error) throw error;
 
-            // Fetch pack counts per category
-            const { data: packs } = await supabase
+            setTotalCount(count || 0);
+
+            const categoryIds = (cats || []).map(c => c.id);
+            const questionPackCounts: Record<string, number> = {};
+            const darePackCounts: Record<string, number> = {};
+
+            if (categoryIds.length > 0) {
+                const [{ data: packs }, { data: darePacks }] = await Promise.all([
+                    supabase
                         .from('question_packs')
-                .select('category_id');
+                        .select('category_id')
+                        .in('category_id', categoryIds),
+                    supabase
+                        .from('dare_packs')
+                        .select('category_id')
+                        .in('category_id', categoryIds),
+                ]);
 
-            const packCounts: Record<string, number> = {};
                 packs?.forEach(p => {
                     if (p.category_id) {
-                    packCounts[p.category_id] = (packCounts[p.category_id] || 0) + 1;
+                        questionPackCounts[p.category_id] = (questionPackCounts[p.category_id] || 0) + 1;
                     }
                 });
 
+                darePacks?.forEach(p => {
+                    if (p.category_id) {
+                        darePackCounts[p.category_id] = (darePackCounts[p.category_id] || 0) + 1;
+                    }
+                });
+            }
+
             setCategories(
                 (cats || []).map(c => ({
                     ...c,
-                    pack_count: packCounts[c.id] || 0,
+                    question_pack_count: questionPackCounts[c.id] || 0,
+                    dare_pack_count: darePackCounts[c.id] || 0,
                 }))
             );
         } catch (error) {
@@ -103,12 +267,19 @@ export function CategoriesPage() {
         } finally {
             setLoading(false);
         }
-    }, []);
+    }, [page, pageSize]);
 
     useEffect(() => {
         fetchCategories();
     }, [fetchCategories]);
 
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
     // =============================================================================
     // Handlers
     // =============================================================================
@@ -119,6 +290,7 @@ export function CategoriesPage() {
             name: idea.name,
             description: idea.description || '',
             icon: idea.icon || 'bookmark-outline',
+            is_public: true,
         });
     };
 
@@ -134,6 +306,7 @@ export function CategoriesPage() {
                 name: form.formData.name,
                 description: form.formData.description || null,
                 icon: form.formData.icon || null,
+                is_public: form.formData.is_public,
             };
 
             if (form.editingItem) {
@@ -143,7 +316,7 @@ export function CategoriesPage() {
             } else {
                 const { error } = await auditedSupabase.insert('categories', {
                     ...data,
-                    sort_order: categories.length,
+                    sort_order: totalCount,
                 });
                 if (error) throw error;
                 toast.success('Category created');
@@ -175,31 +348,70 @@ export function CategoriesPage() {
         }
     };
 
-    const handleMove = async (category: Category, direction: 'up' | 'down') => {
-        const currentIndex = categories.findIndex(c => c.id === category.id);
-        const targetIndex = direction === 'up' ? currentIndex - 1 : currentIndex + 1;
-
-        if (targetIndex < 0 || targetIndex >= categories.length) return;
-
-        const targetCategory = categories[targetIndex];
-
+    const handleToggleVisibility = async (category: Category) => {
         try {
-            const currentOrder = category.sort_order ?? currentIndex;
-            const targetOrder = targetCategory.sort_order ?? targetIndex;
-
-            await Promise.all([
-                auditedSupabase.update('categories', category.id, { sort_order: targetOrder }),
-                auditedSupabase.update('categories', targetCategory.id, { sort_order: currentOrder }),
-            ]);
-
             // Optimistic update
-            const newCategories = [...categories];
-            [newCategories[currentIndex], newCategories[targetIndex]] = [newCategories[targetIndex], newCategories[currentIndex]];
-            setCategories(newCategories);
+            setCategories(categories.map(c =>
+                c.id === category.id ? { ...c, is_public: !c.is_public } : c
+            ));
+
+            const { error } = await auditedSupabase.update('categories', category.id, {
+                is_public: !category.is_public
+            });
+
+            if (error) throw error;
+            
+            toast.success(category.is_public ? 'Category hidden' : 'Category made public');
         } catch (error) {
-            toast.error('Failed to reorder categories');
+            toast.error('Failed to update visibility');
             console.error(error);
-            fetchCategories();
+            fetchCategories(); // Revert
+        }
+    };
+
+    // =============================================================================
+    // Drag and Drop
+    // =============================================================================
+
+    const sensors = useSensors(
+        useSensor(PointerSensor, {
+            activationConstraint: {
+                distance: 8,
+            },
+        }),
+        useSensor(KeyboardSensor, {
+            coordinateGetter: sortableKeyboardCoordinates,
+        })
+    );
+
+    const handleDragEnd = async (event: DragEndEvent) => {
+        const { active, over } = event;
+
+        if (!over || active.id === over.id) return;
+
+        const oldIndex = categories.findIndex(c => c.id === active.id);
+        const newIndex = categories.findIndex(c => c.id === over.id);
+
+        // Optimistic UI update
+        const newCategories = arrayMove(categories, oldIndex, newIndex);
+        setCategories(newCategories);
+
+        // Persist new order to database
+        try {
+            const updates = newCategories.map((category, index) =>
+                auditedSupabase.update('categories', category.id, { sort_order: index })
+            );
+
+            const results = await Promise.all(updates);
+            const hasError = results.some(r => r.error);
+
+            if (hasError) {
+                throw new Error('Failed to update some categories');
+            }
+        } catch (error) {
+            toast.error('Failed to save new order');
+            console.error(error);
+            fetchCategories(); // Revert on error
         }
     };
 
@@ -301,6 +513,19 @@ export function CategoriesPage() {
                                         rows={3}
                                     />
                                 </div>
+
+                                <div className="flex items-center justify-between">
+                                    <div className="space-y-0.5">
+                                        <Label>Public</Label>
+                                        <p className="text-sm text-muted-foreground">
+                                            Visible to users in the app
+                                        </p>
+                                    </div>
+                                    <Switch
+                                        checked={form.formData.is_public}
+                                        onCheckedChange={(checked) => form.setField('is_public', checked)}
+                                    />
+                                </div>
                             </div>
 
                             <DialogFooter>
@@ -337,73 +562,41 @@ export function CategoriesPage() {
                     </Button>
                 </Card>
             ) : (
+                <DndContext
+                    sensors={sensors}
+                    collisionDetection={closestCenter}
+                    onDragEnd={handleDragEnd}
+                >
+                    <SortableContext
+                        items={categories.map(c => c.id)}
+                        strategy={rectSortingStrategy}
+                    >
                         <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
-                    {categories.map((category, index) => (
-                        <Card key={category.id} className="group hover:shadow-md transition-shadow">
-                            <CardHeader className="pb-3">
-                                <div className="flex items-start justify-between">
-                                    <div className="flex items-center gap-2">
-                                        <div className="flex flex-col opacity-0 group-hover:opacity-100 transition-opacity">
-                                            <Button
-                                                variant="ghost"
-                                                size="icon"
-                                                className="h-6 w-6"
-                                                onClick={() => handleMove(category, 'up')}
-                                                disabled={index === 0}
-                                            >
-                                                <ChevronUp className="h-4 w-4" />
-                                            </Button>
-                                            <Button
-                                                variant="ghost"
-                                                size="icon"
-                                                className="h-6 w-6"
-                                                onClick={() => handleMove(category, 'down')}
-                                                disabled={index === categories.length - 1}
-                                            >
-                                                <ChevronDown className="h-4 w-4" />
-                                            </Button>
-                                        </div>
-                                        <div className="text-4xl mb-2">
-                                            <IconPreview value={category.icon} fallback="bookmark-outline" className="text-4xl" />
-                                        </div>
-                                    </div>
-                                    <div className="opacity-0 group-hover:opacity-100 transition-opacity flex gap-1">
-                                        <Button
-                                            variant="ghost"
-                                            size="icon"
-                                            onClick={() => form.openEdit(category)}
-                                        >
-                                            <Pencil className="h-4 w-4" />
-                                        </Button>
-                                        <Button
-                                            variant="ghost"
-                                            size="icon"
-                                            onClick={() => handleDelete(category)}
-                                        >
-                                            <Trash2 className="h-4 w-4 text-destructive" />
-                                        </Button>
-                                    </div>
-                                </div>
-                                <CardTitle>{category.name}</CardTitle>
-                                <CardDescription className="line-clamp-2">
-                                    {category.description || 'No description'}
-                                </CardDescription>
-                            </CardHeader>
-                            <CardContent>
-                                <div className="flex items-center justify-between">
-                                    <span className="text-sm text-muted-foreground">
-                                        {category.pack_count} pack{category.pack_count !== 1 ? 's' : ''}
-                                    </span>
-                                    <Link to={`/categories/${category.id}/packs`}>
-                                        <Button variant="outline" size="sm">
-                                            View Packs
-                                        </Button>
-                                    </Link>
-                                </div>
-                            </CardContent>
-                        </Card>
+                            {categories.map((category) => (
+                                <SortableCategoryCard
+                                    key={category.id}
+                                    category={category}
+                                    onEdit={form.openEdit}
+                                    onDelete={handleDelete}
+                                    onToggleVisibility={handleToggleVisibility}
+                                />
                             ))}
                         </div>
+                    </SortableContext>
+                </DndContext>
+            )}
+
+            {categories.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
             )}
 
             {/* AI Dialog */}

apps/admin/src/pages/content/DarePacksPage.tsx

@@ -0,0 +1,620 @@
+import { useEffect, useState, useCallback } from 'react';
+import { Link, useParams } from 'react-router-dom';
+import { supabase } from '@/config';
+import { auditedSupabase } from '@/hooks/useAuditedSupabase';
+import { useEntityForm } from '@/hooks/useEntityForm';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Badge } from '@/components/ui/badge';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Textarea } from '@/components/ui/textarea';
+import { Switch } from '@/components/ui/switch';
+import { IconPicker, IconPreview } from '@/components/ui/icon-picker';
+import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from '@/components/ui/dialog';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
+import { Plus, Zap, Pencil, Trash2, Loader2, Crown, Eye, EyeOff, Flame, Heart, ChevronUp, ChevronDown } from 'lucide-react';
+import { toast } from 'sonner';
+
+// =============================================================================
+// Types
+// =============================================================================
+
+interface Category {
+    id: string;
+    name: string;
+    icon?: string | null;
+}
+
+interface DarePack {
+    id: string;
+    name: string;
+    description: string | null;
+    icon: string | null;
+    is_premium: boolean;
+    is_public: boolean;
+    is_explicit: boolean;
+    sort_order: number;
+    category_id: string | null;
+    min_intensity: number | null;
+    max_intensity: number | null;
+    avg_intensity: number | null;
+    created_at: string | null;
+    dare_count?: number;
+}
+
+interface DarePackFormData {
+    name: string;
+    description: string;
+    icon: string;
+    is_premium: boolean;
+    is_public: boolean;
+    is_explicit: boolean;
+    category_id: string;
+}
+
+// =============================================================================
+// Component
+// =============================================================================
+
+export function DarePacksPage() {
+    const { categoryId } = useParams<{ categoryId: string }>();
+
+    // Data state
+    const [darePacks, setDarePacks] = useState<DarePack[]>([]);
+    const [categories, setCategories] = useState<Category[]>([]);
+    const [category, setCategory] = useState<Category | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(12);
+    const [totalCount, setTotalCount] = useState(0);
+
+    // Form state using the hook
+    const form = useEntityForm<DarePackFormData, DarePack>(
+        {
+            name: '',
+            description: '',
+            icon: 'flame-outline',
+            is_premium: false,
+            is_public: false,
+            is_explicit: false,
+            category_id: categoryId ?? '',
+        },
+        (pack) => ({
+            name: pack.name,
+            description: pack.description || '',
+            icon: pack.icon || 'flame-outline',
+            is_premium: pack.is_premium,
+            is_public: pack.is_public,
+            is_explicit: pack.is_explicit,
+            category_id: pack.category_id || '',
+        })
+    );
+
+    // =============================================================================
+    // Data Fetching
+    // =============================================================================
+
+    const fetchData = useCallback(async () => {
+        setLoading(true);
+        try {
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            // Fetch category info
+            if (categoryId) {
+                const { data: categoryData } = await supabase
+                    .from('categories')
+                    .select('id, name, icon')
+                    .eq('id', categoryId)
+                    .single();
+                setCategory(categoryData || null);
+            } else {
+                setCategory(null);
+            }
+
+            // Fetch dare packs
+            let query = supabase
+                .from('dare_packs')
+                .select('*', { count: 'exact' })
+                .order('sort_order', { ascending: true })
+                .range(from, to);
+
+            if (categoryId) {
+                query = query.eq('category_id', categoryId);
+            }
+
+            const { data: packData, error, count } = await query;
+
+            if (error) throw error;
+
+            setTotalCount(count || 0);
+
+            // Fetch dare counts
+            const packIds = (packData || []).map(p => p.id);
+            const dareCounts: Record<string, number> = {};
+
+            if (packIds.length > 0) {
+                const { data: dares } = await supabase
+                    .from('dares')
+                    .select('pack_id')
+                    .in('pack_id', packIds);
+
+                dares?.forEach(d => {
+                    dareCounts[d.pack_id] = (dareCounts[d.pack_id] || 0) + 1;
+                });
+            }
+
+            // Fetch categories
+            const { data: categoryData } = await supabase
+                .from('categories')
+                .select('id, name')
+                .order('name');
+
+            setCategories(categoryData || []);
+
+            setDarePacks(
+                (packData || []).map(p => ({
+                    ...p,
+                    dare_count: dareCounts[p.id] || 0,
+                }))
+            );
+        } catch (error) {
+            toast.error('Failed to load dare packs');
+            console.error(error);
+        } finally {
+            setLoading(false);
+        }
+    }, [page, pageSize, categoryId]);
+
+    useEffect(() => {
+        fetchData();
+    }, [fetchData]);
+
+    useEffect(() => {
+        setPage(1);
+    }, [categoryId]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+    // =============================================================================
+    // Handlers
+    // =============================================================================
+
+    const handleSave = async () => {
+        if (!form.formData.name.trim()) {
+            toast.error('Name is required');
+            return;
+        }
+
+        form.setSaving(true);
+        try {
+            if (form.editingItem) {
+                const { error } = await auditedSupabase.update('dare_packs', form.editingItem.id, {
+                    name: form.formData.name,
+                    description: form.formData.description || null,
+                    icon: form.formData.icon || null,
+                    is_premium: form.formData.is_premium,
+                    is_public: form.formData.is_public,
+                    is_explicit: form.formData.is_explicit,
+                    category_id: form.formData.category_id || null,
+                });
+                if (error) throw error;
+                toast.success('Dare pack updated');
+            } else {
+                const { error } = await auditedSupabase.insert('dare_packs', {
+                    name: form.formData.name,
+                    description: form.formData.description || null,
+                    icon: form.formData.icon || null,
+                    is_premium: form.formData.is_premium,
+                    is_public: form.formData.is_public,
+                    is_explicit: form.formData.is_explicit,
+                    category_id: form.formData.category_id || null,
+                    sort_order: totalCount,
+                });
+                if (error) throw error;
+                toast.success('Dare pack created');
+            }
+
+            form.close();
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to save dare pack');
+            console.error(error);
+        } finally {
+            form.setSaving(false);
+        }
+    };
+
+    const handleDelete = async (pack: DarePack) => {
+        if (!confirm(`Delete dare pack "${pack.name}"? This will delete all dares in this pack.`)) {
+            return;
+        }
+
+        try {
+            const { error } = await auditedSupabase.delete('dare_packs', pack.id);
+            if (error) throw error;
+            toast.success('Dare pack deleted');
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to delete dare pack');
+            console.error(error);
+        }
+    };
+
+    const handleMove = async (pack: DarePack, direction: 'up' | 'down') => {
+        const currentIndex = darePacks.findIndex(p => p.id === pack.id);
+        const targetIndex = direction === 'up' ? currentIndex - 1 : currentIndex + 1;
+
+        if (targetIndex < 0 || targetIndex >= darePacks.length) return;
+
+        const targetPack = darePacks[targetIndex];
+
+        try {
+            const currentOrder = pack.sort_order ?? currentIndex;
+            const targetOrder = targetPack.sort_order ?? targetIndex;
+
+            const [currentUpdate, targetUpdate] = await Promise.all([
+                auditedSupabase.update('dare_packs', pack.id, { sort_order: targetOrder }),
+                auditedSupabase.update('dare_packs', targetPack.id, { sort_order: currentOrder }),
+            ]);
+
+            if (currentUpdate.error || targetUpdate.error) {
+                throw currentUpdate.error ?? targetUpdate.error ?? new Error('Failed to update dare pack order');
+            }
+
+            // Optimistic update
+            const newPacks = [...darePacks];
+            newPacks[currentIndex] = { ...targetPack, sort_order: currentOrder };
+            newPacks[targetIndex] = { ...pack, sort_order: targetOrder };
+            setDarePacks(newPacks);
+        } catch (error) {
+            toast.error('Failed to reorder dare packs');
+            console.error(error);
+            fetchData();
+        }
+    };
+
+    const getIntensityColor = (avg: number | null) => {
+        if (avg === null) return 'bg-muted';
+        if (avg <= 1.5) return 'bg-green-500';
+        if (avg <= 2.5) return 'bg-lime-500';
+        if (avg <= 3.5) return 'bg-yellow-500';
+        if (avg <= 4.5) return 'bg-orange-500';
+        return 'bg-red-500';
+    };
+
+    // =============================================================================
+    // Render
+    // =============================================================================
+
+    if (loading) {
+        return (
+            <div className="space-y-6">
+                <div className="flex items-center justify-between">
+                    <Skeleton className="h-9 w-48" />
+                    <Skeleton className="h-10 w-40" />
+                </div>
+                <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
+                    {[1, 2, 3].map(i => (
+                        <Skeleton key={i} className="h-48" />
+                    ))}
+                </div>
+            </div>
+        );
+    }
+
+    return (
+        <div className="space-y-6">
+            {/* Header */}
+            <div className="flex items-center justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        {category ? (
+                            <>
+                                <IconPreview value={category.icon} fallback="flame-outline" className="text-3xl" />
+                                {category.name}
+                            </>
+                        ) : (
+                            <>
+                                <Zap className="h-8 w-8 text-orange-500" />
+                                Dare Packs
+                            </>
+                        )}
+                    </h1>
+                    <p className="text-muted-foreground">
+                        {category
+                            ? `Manage dare packs in the ${category.name} category`
+                            : 'Manage dare packs that users can send to their partners'}
+                    </p>
+                </div>
+                <Dialog open={form.dialogOpen} onOpenChange={form.setDialogOpen}>
+                    <DialogTrigger asChild>
+                        <Button onClick={() => form.openCreateWith({ category_id: categoryId ?? '' })}>
+                            <Plus className="mr-2 h-4 w-4" />
+                            Add Dare Pack
+                        </Button>
+                    </DialogTrigger>
+                    <DialogContent>
+                        <DialogHeader>
+                            <DialogTitle>
+                                {form.isEditing ? 'Edit Dare Pack' : 'Create Dare Pack'}
+                            </DialogTitle>
+                            <DialogDescription>
+                                {form.isEditing
+                                    ? 'Update the dare pack details below.'
+                                    : 'Add a new dare pack for couples to challenge each other.'}
+                            </DialogDescription>
+                        </DialogHeader>
+
+                        <div className="space-y-4 py-4">
+                            <div className="space-y-2">
+                                <Label>Icon</Label>
+                                <IconPicker
+                                    value={form.formData.icon}
+                                    onChange={(iconName) => form.setField('icon', iconName)}
+                                />
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="name">Name</Label>
+                                <Input
+                                    id="name"
+                                    value={form.formData.name}
+                                    onChange={(e) => form.setField('name', e.target.value)}
+                                    placeholder="e.g., Romantic Dares"
+                                />
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label htmlFor="description">Description</Label>
+                                <Textarea
+                                    id="description"
+                                    value={form.formData.description}
+                                    onChange={(e) => form.setField('description', e.target.value)}
+                                    placeholder="Describe this dare pack..."
+                                    rows={3}
+                                />
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label>Category (optional)</Label>
+                                <Select
+                                    value={form.formData.category_id || '__none__'}
+                                    onValueChange={(value) => form.setField('category_id', value === '__none__' ? '' : value)}
+                                >
+                                    <SelectTrigger>
+                                        <SelectValue placeholder="Select a category" />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectItem value="__none__">No category</SelectItem>
+                                        {categories.map((cat) => (
+                                            <SelectItem key={cat.id} value={cat.id}>
+                                                {cat.name}
+                                            </SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                            </div>
+
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Premium</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Only available to premium users
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={form.formData.is_premium}
+                                    onCheckedChange={(checked) => form.setField('is_premium', checked)}
+                                />
+                            </div>
+
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Published</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Visible to users in the app
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={form.formData.is_public}
+                                    onCheckedChange={(checked) => form.setField('is_public', checked)}
+                                />
+                            </div>
+
+                            <div className="flex items-center justify-between">
+                                <div className="space-y-0.5">
+                                    <Label>Explicit</Label>
+                                    <p className="text-xs text-muted-foreground">
+                                        Contains adult/explicit content
+                                    </p>
+                                </div>
+                                <Switch
+                                    checked={form.formData.is_explicit}
+                                    onCheckedChange={(checked) => form.setField('is_explicit', checked)}
+                                />
+                            </div>
+                        </div>
+
+                        <DialogFooter>
+                            <Button variant="outline" onClick={form.close}>
+                                Cancel
+                            </Button>
+                            <Button onClick={handleSave} disabled={form.saving}>
+                                {form.saving ? (
+                                    <>
+                                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                        Saving...
+                                    </>
+                                ) : (
+                                    'Save'
+                                )}
+                            </Button>
+                        </DialogFooter>
+                    </DialogContent>
+                </Dialog>
+            </div>
+
+            {/* Dare Packs Grid */}
+            {darePacks.length === 0 ? (
+                <Card className="flex flex-col items-center justify-center py-12">
+                    <Zap className="h-12 w-12 text-muted-foreground mb-4" />
+                    <h3 className="text-lg font-semibold">No dare packs yet</h3>
+                    <p className="text-muted-foreground mb-4">
+                        Create your first dare pack to get started
+                    </p>
+                    <Button onClick={form.openCreate}>
+                        <Plus className="mr-2 h-4 w-4" />
+                        Add Dare Pack
+                    </Button>
+                </Card>
+            ) : (
+                <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
+                    {darePacks.map((pack, index) => (
+                        <Card key={pack.id} className="group hover:shadow-md transition-shadow">
+                            <CardHeader className="pb-3">
+                                <div className="flex items-start justify-between">
+                                    <div className="flex items-center gap-2">
+                                        <div className="flex flex-col opacity-0 group-hover:opacity-100 transition-opacity">
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                className="h-6 w-6"
+                                                onClick={() => handleMove(pack, 'up')}
+                                                disabled={index === 0}
+                                            >
+                                                <ChevronUp className="h-4 w-4" />
+                                            </Button>
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                className="h-6 w-6"
+                                                onClick={() => handleMove(pack, 'down')}
+                                                disabled={index === darePacks.length - 1}
+                                            >
+                                                <ChevronDown className="h-4 w-4" />
+                                            </Button>
+                                        </div>
+                                        <div className="text-4xl mb-2">
+                                            <IconPreview value={pack.icon} fallback="flame-outline" className="text-4xl" />
+                                        </div>
+                                    </div>
+                                    <div className="flex items-center gap-1">
+                                        {pack.is_premium && (
+                                            <Badge variant="default" className="bg-amber-500">
+                                                <Crown className="h-3 w-3 mr-1" />
+                                                Premium
+                                            </Badge>
+                                        )}
+                                        {pack.is_public ? (
+                                            <Badge variant="outline" className="border-green-500 text-green-400">
+                                                <Eye className="h-3 w-3 mr-1" />
+                                                Published
+                                            </Badge>
+                                        ) : (
+                                            <Badge variant="secondary">
+                                                <EyeOff className="h-3 w-3 mr-1" />
+                                                Draft
+                                            </Badge>
+                                        )}
+                                        {pack.is_explicit ? (
+                                            <Badge variant="outline" className="border-red-500 text-red-400">
+                                                <Flame className="h-3 w-3 mr-1" />
+                                                Explicit
+                                            </Badge>
+                                        ) : (
+                                            <Badge variant="outline" className="border-pink-400 text-pink-300">
+                                                <Heart className="h-3 w-3 mr-1" />
+                                                Safe
+                                            </Badge>
+                                        )}
+                                    </div>
+                                </div>
+                                <div className="flex items-start justify-between">
+                                    <CardTitle className="flex-1">{pack.name}</CardTitle>
+                                    <div className="opacity-0 group-hover:opacity-100 transition-opacity flex gap-1">
+                                        <Button
+                                            variant="ghost"
+                                            size="icon"
+                                            onClick={() => form.openEdit(pack)}
+                                        >
+                                            <Pencil className="h-4 w-4" />
+                                        </Button>
+                                        <Button
+                                            variant="ghost"
+                                            size="icon"
+                                            onClick={() => handleDelete(pack)}
+                                        >
+                                            <Trash2 className="h-4 w-4 text-destructive" />
+                                        </Button>
+                                    </div>
+                                </div>
+                                <CardDescription className="line-clamp-2">
+                                    {pack.description || 'No description'}
+                                </CardDescription>
+                                {/* Intensity indicator */}
+                                {pack.avg_intensity !== null && (
+                                    <div className="flex items-center gap-2 mt-2">
+                                        <Badge className={`${getIntensityColor(pack.avg_intensity)} text-white`}>
+                                            Avg: {pack.avg_intensity?.toFixed(1)}
+                                        </Badge>
+                                        <span className="text-xs text-muted-foreground">
+                                            Range: {pack.min_intensity ?? '?'} - {pack.max_intensity ?? '?'}
+                                        </span>
+                                    </div>
+                                )}
+                            </CardHeader>
+                            <CardContent>
+                                <div className="flex items-center justify-between">
+                                    <span className="text-sm text-muted-foreground">
+                                        {pack.dare_count} dare{pack.dare_count !== 1 ? 's' : ''}
+                                    </span>
+                                    <Link to={`/dare-packs/${pack.id}/dares`}>
+                                        <Button variant="outline" size="sm">
+                                            Manage Dares
+                                        </Button>
+                                    </Link>
+                                </div>
+                            </CardContent>
+                        </Card>
+                    ))}
+                </div>
+            )}
+
+            {darePacks.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+        </div>
+    );
+}

apps/admin/src/pages/content/DaresPage.tsx

@@ -0,0 +1,551 @@
+import { useState, useEffect, useCallback } from 'react';
+import { useParams } from 'react-router-dom';
+import { supabase } from '@/config';
+import { auditedSupabase } from '@/hooks/useAuditedSupabase';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Textarea } from '@/components/ui/textarea';
+import { Badge } from '@/components/ui/badge';
+import { Skeleton } from '@/components/ui/skeleton';
+import { PaginationControls } from '@/components/ui/pagination';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table';
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from '@/components/ui/dialog';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select';
+import { Card } from '@/components/ui/card';
+import { Plus, Pencil, Trash2, Zap, Loader2, Clock } from 'lucide-react';
+import { Checkbox } from '@/components/ui/checkbox';
+import { toast } from 'sonner';
+import { IconPreview } from '@/components/ui/icon-picker';
+import { INTENSITY_LEVELS } from '@/lib/openai';
+
+// =============================================================================
+// Types
+// =============================================================================
+
+interface DarePack {
+    id: string;
+    name: string;
+    description: string | null;
+    icon: string | null;
+    is_explicit: boolean;
+}
+
+interface Dare {
+    id: string;
+    pack_id: string;
+    text: string;
+    intensity: number;
+    suggested_duration_hours: number | null;
+    created_at: string | null;
+}
+
+// Duration options for dares
+const DURATION_OPTIONS = [
+    { value: '', label: 'No suggestion' },
+    { value: '1', label: '1 hour' },
+    { value: '6', label: '6 hours' },
+    { value: '12', label: '12 hours' },
+    { value: '24', label: '24 hours' },
+    { value: '72', label: '3 days' },
+    { value: '168', label: '1 week' },
+];
+
+// Helper to get intensity info by level (1-indexed)
+const getIntensity = (level: number) => INTENSITY_LEVELS[level - 1] || INTENSITY_LEVELS[0];
+
+// Format duration for display
+const formatDuration = (hours: number | null): string => {
+    if (hours === null) return '—';
+    if (hours < 24) return `${hours}h`;
+    if (hours < 168) return `${Math.round(hours / 24)}d`;
+    return `${Math.round(hours / 168)}w`;
+};
+
+// =============================================================================
+// Component
+// =============================================================================
+
+export function DaresPage() {
+    const { packId } = useParams<{ packId: string }>();
+    const [pack, setPack] = useState<DarePack | null>(null);
+    const [dares, setDares] = useState<Dare[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [dialogOpen, setDialogOpen] = useState(false);
+    const [editingDare, setEditingDare] = useState<Dare | null>(null);
+    const [saving, setSaving] = useState(false);
+    const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
+    const [bulkDeleting, setBulkDeleting] = useState(false);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(25);
+    const [totalCount, setTotalCount] = useState(0);
+
+    // Form state
+    const [formData, setFormData] = useState<{
+        text: string;
+        intensity: number;
+        suggested_duration_hours: string;
+    }>({
+        text: '',
+        intensity: 1,
+        suggested_duration_hours: '',
+    });
+
+    const fetchData = useCallback(async () => {
+        if (!packId) return;
+
+        setLoading(true);
+        try {
+            // Fetch pack info
+            const { data: packData } = await supabase
+                .from('dare_packs')
+                .select('id, name, description, icon, is_explicit')
+                .eq('id', packId)
+                .single();
+
+            setPack(packData);
+
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
+            // Fetch dares
+            const { data: dareData, error, count } = await supabase
+                .from('dares')
+                .select('*', { count: 'exact' })
+                .eq('pack_id', packId)
+                .order('created_at', { ascending: true })
+                .range(from, to);
+
+            if (error) throw error;
+            setTotalCount(count || 0);
+            setDares(dareData || []);
+        } catch (error) {
+            toast.error('Failed to load dares');
+            console.error(error);
+        } finally {
+            setLoading(false);
+        }
+    }, [packId, page, pageSize]);
+
+    useEffect(() => {
+        fetchData();
+    }, [fetchData]);
+
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
+    useEffect(() => {
+        setPage(1);
+        setSelectedIds(new Set());
+    }, [packId]);
+
+    useEffect(() => {
+        setSelectedIds(new Set());
+    }, [page, pageSize]);
+
+    const openCreateDialog = () => {
+        setEditingDare(null);
+        setFormData({ text: '', intensity: 1, suggested_duration_hours: '' });
+        setDialogOpen(true);
+    };
+
+    const openEditDialog = (dare: Dare) => {
+        setEditingDare(dare);
+        setFormData({
+            text: dare.text,
+            intensity: dare.intensity,
+            suggested_duration_hours: dare.suggested_duration_hours?.toString() || '',
+        });
+        setDialogOpen(true);
+    };
+
+    const handleSave = async () => {
+        if (!formData.text.trim()) {
+            toast.error('Dare text is required');
+            return;
+        }
+
+        setSaving(true);
+        try {
+            const dareData = {
+                text: formData.text,
+                intensity: formData.intensity,
+                suggested_duration_hours: formData.suggested_duration_hours
+                    ? parseInt(formData.suggested_duration_hours, 10)
+                    : null,
+            };
+
+            if (editingDare) {
+                const { error } = await auditedSupabase.update('dares', editingDare.id, dareData);
+                if (error) throw error;
+                toast.success('Dare updated');
+            } else {
+                const { error } = await auditedSupabase.insert('dares', {
+                    ...dareData,
+                    pack_id: packId,
+                });
+                if (error) throw error;
+                toast.success('Dare created');
+            }
+
+            setDialogOpen(false);
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to save dare');
+            console.error(error);
+        } finally {
+            setSaving(false);
+        }
+    };
+
+    const handleDelete = async (dare: Dare) => {
+        if (!confirm('Delete this dare? This cannot be undone.')) {
+            return;
+        }
+
+        try {
+            const { error } = await auditedSupabase.delete('dares', dare.id);
+            if (error) throw error;
+            toast.success('Dare deleted');
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to delete dare');
+            console.error(error);
+        }
+    };
+
+    // Selection handlers
+    const toggleSelection = (id: string) => {
+        const next = new Set(selectedIds);
+        if (next.has(id)) {
+            next.delete(id);
+        } else {
+            next.add(id);
+        }
+        setSelectedIds(next);
+    };
+
+    const toggleSelectAll = () => {
+        if (selectedIds.size === dares.length) {
+            setSelectedIds(new Set());
+        } else {
+            setSelectedIds(new Set(dares.map(d => d.id)));
+        }
+    };
+
+    const handleBulkDelete = async () => {
+        if (selectedIds.size === 0) return;
+
+        const count = selectedIds.size;
+        if (!confirm(`Delete ${count} dare${count !== 1 ? 's' : ''}? This cannot be undone.`)) {
+            return;
+        }
+
+        setBulkDeleting(true);
+        try {
+            await Promise.all(
+                Array.from(selectedIds).map(id => auditedSupabase.delete('dares', id))
+            );
+            toast.success(`${count} dare${count !== 1 ? 's' : ''} deleted`);
+            setSelectedIds(new Set());
+            fetchData();
+        } catch (error) {
+            toast.error('Failed to delete dares');
+            console.error(error);
+        } finally {
+            setBulkDeleting(false);
+        }
+    };
+
+    if (loading) {
+        return (
+            <div className="space-y-6">
+                <div className="flex items-center justify-between">
+                    <Skeleton className="h-9 w-64" />
+                    <Skeleton className="h-10 w-40" />
+                </div>
+                <Skeleton className="h-96" />
+            </div>
+        );
+    }
+
+    return (
+        <div className="space-y-6">
+            {/* Header */}
+            <div className="flex items-center justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        {pack && (
+                            <>
+                                <span className="text-3xl">
+                                    <IconPreview value={pack.icon} fallback="flame-outline" className="text-3xl" />
+                                </span>
+                                {pack.name}
+                            </>
+                        )}
+                    </h1>
+                    <p className="text-muted-foreground">
+                        {totalCount} dare{totalCount !== 1 ? 's' : ''} in this pack
+                    </p>
+                </div>
+                <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
+                    <DialogTrigger asChild>
+                        <Button onClick={openCreateDialog}>
+                            <Plus className="mr-2 h-4 w-4" />
+                            Add Dare
+                        </Button>
+                    </DialogTrigger>
+                    <DialogContent className="max-w-2xl">
+                        <DialogHeader>
+                            <DialogTitle>
+                                {editingDare ? 'Edit Dare' : 'Add Dare'}
+                            </DialogTitle>
+                            <DialogDescription>
+                                {editingDare
+                                    ? 'Update the dare details below.'
+                                    : 'Add a new dare to this pack.'}
+                            </DialogDescription>
+                        </DialogHeader>
+
+                        <div className="space-y-4 py-4">
+                            <div className="space-y-2">
+                                <Label htmlFor="text">Dare Text</Label>
+                                <Textarea
+                                    id="text"
+                                    value={formData.text}
+                                    onChange={(e) => setFormData(d => ({ ...d, text: e.target.value }))}
+                                    placeholder="e.g., Give your partner a 5-minute massage..."
+                                    rows={3}
+                                />
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label>Intensity Level</Label>
+                                <div className="flex gap-2 flex-wrap">
+                                    {INTENSITY_LEVELS.map((intensity) => (
+                                        <Button
+                                            key={intensity.level}
+                                            type="button"
+                                            variant={formData.intensity === intensity.level ? 'default' : 'outline'}
+                                            size="sm"
+                                            onClick={() => setFormData(d => ({ ...d, intensity: intensity.level }))}
+                                            className={formData.intensity === intensity.level ? intensity.color : ''}
+                                            title={intensity.description}
+                                        >
+                                            {intensity.level} - {intensity.label}
+                                        </Button>
+                                    ))}
+                                </div>
+                            </div>
+
+                            <div className="space-y-2">
+                                <Label>Suggested Duration</Label>
+                                <Select
+                                    value={formData.suggested_duration_hours}
+                                    onValueChange={(value) => setFormData(d => ({ ...d, suggested_duration_hours: value }))}
+                                >
+                                    <SelectTrigger>
+                                        <SelectValue placeholder="Select a duration" />
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        {DURATION_OPTIONS.map((opt) => (
+                                            <SelectItem key={opt.value} value={opt.value}>
+                                                {opt.label}
+                                            </SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                                <p className="text-xs text-muted-foreground">
+                                    This is a suggestion shown to users when sending the dare. They can choose a different timeframe.
+                                </p>
+                            </div>
+                        </div>
+
+                        <DialogFooter>
+                            <Button variant="outline" onClick={() => setDialogOpen(false)}>
+                                Cancel
+                            </Button>
+                            <Button onClick={handleSave} disabled={saving}>
+                                {saving ? (
+                                    <>
+                                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                        Saving...
+                                    </>
+                                ) : (
+                                    'Save'
+                                )}
+                            </Button>
+                        </DialogFooter>
+                    </DialogContent>
+                </Dialog>
+            </div>
+
+            {/* Bulk Action Bar */}
+            {selectedIds.size > 0 && (
+                <div className="flex items-center justify-between bg-muted/50 border rounded-lg px-4 py-3">
+                    <div className="flex items-center gap-3">
+                        <span className="text-sm font-medium">
+                            {selectedIds.size} dare{selectedIds.size !== 1 ? 's' : ''} selected
+                        </span>
+                        <Button
+                            variant="ghost"
+                            size="sm"
+                            onClick={() => setSelectedIds(new Set())}
+                        >
+                            Clear selection
+                        </Button>
+                    </div>
+                    <Button
+                        variant="destructive"
+                        size="sm"
+                        onClick={handleBulkDelete}
+                        disabled={bulkDeleting}
+                    >
+                        {bulkDeleting ? (
+                            <>
+                                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                Deleting...
+                            </>
+                        ) : (
+                            <>
+                                <Trash2 className="mr-2 h-4 w-4" />
+                                Delete {selectedIds.size} Dare{selectedIds.size !== 1 ? 's' : ''}
+                            </>
+                        )}
+                    </Button>
+                </div>
+            )}
+
+            {/* Dares Table */}
+            {dares.length === 0 ? (
+                <Card className="flex flex-col items-center justify-center py-12">
+                    <Zap className="h-12 w-12 text-muted-foreground mb-4" />
+                    <h3 className="text-lg font-semibold">No dares yet</h3>
+                    <p className="text-muted-foreground mb-4">
+                        Add dares to this pack for couples to challenge each other
+                    </p>
+                    <Button onClick={openCreateDialog}>
+                        <Plus className="mr-2 h-4 w-4" />
+                        Add Dare
+                    </Button>
+                </Card>
+            ) : (
+                <div className="rounded-md border">
+                    <Table>
+                        <TableHeader>
+                            <TableRow>
+                                <TableHead className="w-12">
+                                    <Checkbox
+                                        checked={selectedIds.size === dares.length && dares.length > 0}
+                                        onCheckedChange={toggleSelectAll}
+                                        aria-label="Select all"
+                                    />
+                                </TableHead>
+                                <TableHead className="w-12">#</TableHead>
+                                <TableHead>Dare</TableHead>
+                                <TableHead className="w-24">Intensity</TableHead>
+                                <TableHead className="w-24">Duration</TableHead>
+                                <TableHead className="w-24">Actions</TableHead>
+                            </TableRow>
+                        </TableHeader>
+                        <TableBody>
+                            {dares.map((dare, index) => (
+                                <TableRow
+                                    key={dare.id}
+                                    className={selectedIds.has(dare.id) ? 'bg-muted/50' : ''}
+                                >
+                                    <TableCell>
+                                        <Checkbox
+                                            checked={selectedIds.has(dare.id)}
+                                            onCheckedChange={() => toggleSelection(dare.id)}
+                                            aria-label={`Select dare ${index + 1}`}
+                                        />
+                                    </TableCell>
+                                    <TableCell className="font-medium text-muted-foreground">
+                                        {(page - 1) * pageSize + index + 1}
+                                    </TableCell>
+                                    <TableCell>
+                                        <span className="line-clamp-2">{dare.text}</span>
+                                    </TableCell>
+                                    <TableCell>
+                                        <Badge
+                                            className={`${getIntensity(dare.intensity).color} text-white`}
+                                            title={getIntensity(dare.intensity).description}
+                                        >
+                                            {getIntensity(dare.intensity).label}
+                                        </Badge>
+                                    </TableCell>
+                                    <TableCell>
+                                        {dare.suggested_duration_hours ? (
+                                            <Badge variant="outline" className="text-xs">
+                                                <Clock className="h-3 w-3 mr-1" />
+                                                {formatDuration(dare.suggested_duration_hours)}
+                                            </Badge>
+                                        ) : (
+                                            <span className="text-muted-foreground text-xs">—</span>
+                                        )}
+                                    </TableCell>
+                                    <TableCell>
+                                        <div className="flex gap-1">
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                onClick={() => openEditDialog(dare)}
+                                            >
+                                                <Pencil className="h-4 w-4" />
+                                            </Button>
+                                            <Button
+                                                variant="ghost"
+                                                size="icon"
+                                                onClick={() => handleDelete(dare)}
+                                            >
+                                                <Trash2 className="h-4 w-4 text-destructive" />
+                                            </Button>
+                                        </div>
+                                    </TableCell>
+                                </TableRow>
+                            ))}
+                        </TableBody>
+                    </Table>
+                </div>
+            )}
+
+            {dares.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
+        </div>
+    );
+}

apps/admin/src/pages/content/PacksPage.tsx

@@ -7,7 +7,8 @@ import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
-import { Plus, MessageCircle, Pencil, Trash2, Sparkles, Crown, Eye, EyeOff, Flame, Heart, Tags, ChevronUp, ChevronDown } from 'lucide-react';
+import { PaginationControls } from '@/components/ui/pagination';
+import { Plus, MessageCircle, Pencil, Trash2, Sparkles, Crown, Eye, EyeOff, Flame, Heart, Tags, ChevronUp, ChevronDown, Clock, BellOff } from 'lucide-react';
 import { toast } from 'sonner';
 import { AiGeneratorDialog } from '@/components/ai/AiGeneratorDialog';
 import { ExtractTopicsDialog } from '@/components/content/ExtractTopicsDialog';
@@ -21,7 +22,7 @@ import { IconPreview } from '@/components/ui/icon-picker';
 interface Category {
     id: string;
     name: string;
-    icon: string | null;
+    icon?: string | null;
 }
 
 interface Topic {
@@ -40,6 +41,8 @@ interface QuestionPack {
     sort_order: number | null;
     category_id: string | null;
     created_at: string | null;
+    scheduled_release_at?: string | null;  // Optional for backwards compatibility
+    release_notified?: boolean;  // True if notifications have been sent or should be skipped
     question_count?: number;
     topics?: Topic[];
 }
@@ -53,6 +56,7 @@ export function PacksPage() {
 
     // Data state
     const [category, setCategory] = useState<Category | null>(null);
+    const [categories, setCategories] = useState<Category[]>([]);
     const [packs, setPacks] = useState<QuestionPack[]>([]);
     const [loading, setLoading] = useState(true);
     const [aiDialogOpen, setAiDialogOpen] = useState(false);
@@ -60,6 +64,9 @@ export function PacksPage() {
     const [extractTopicsPack, setExtractTopicsPack] = useState<QuestionPack | null>(null);
     const [allTopics, setAllTopics] = useState<Topic[]>([]);
     const [selectedTopicIds, setSelectedTopicIds] = useState<Set<string>>(new Set());
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(12);
+    const [totalCount, setTotalCount] = useState(0);
 
     // Form state using the hook
     const form = useEntityForm<PackFormData, QuestionPack>(
@@ -70,6 +77,9 @@ export function PacksPage() {
             is_premium: false,
             is_public: false,
             is_explicit: false,
+            category_id: categoryId ?? '',
+            scheduled_release_at: null,
+            skip_notification: false,
         },
         (pack) => ({
             name: pack.name,
@@ -78,6 +88,9 @@ export function PacksPage() {
             is_premium: pack.is_premium,
             is_public: pack.is_public,
             is_explicit: pack.is_explicit,
+            category_id: pack.category_id || '',
+            scheduled_release_at: pack.scheduled_release_at,
+            skip_notification: false,  // Always start unchecked when editing
         })
     );
 
@@ -98,30 +111,45 @@ export function PacksPage() {
                 setCategory(cat);
             }
 
+            const { data: categoriesData } = await supabase
+                .from('categories')
+                .select('id, name')
+                .order('name');
+            setCategories(categoriesData || []);
+
+            const from = (page - 1) * pageSize;
+            const to = from + pageSize - 1;
+
             // Fetch packs
             let query = supabase
                 .from('question_packs')
-                .select('*')
-                .order('sort_order', { ascending: true });
+                .select('*', { count: 'exact' })
+                .order('sort_order', { ascending: true })
+                .range(from, to);
 
             if (categoryId) {
                 query = query.eq('category_id', categoryId);
             }
 
-            const { data: packData, error } = await query;
+            const { data: packData, error, count } = await query;
             if (error) throw error;
 
+            setTotalCount(count || 0);
+
             // Fetch question counts
             const packIds = (packData || []).map(p => p.id);
+            const questionCounts: Record<string, number> = {};
+
+            if (packIds.length > 0) {
                 const { data: questions } = await supabase
                     .from('questions')
                     .select('pack_id')
                     .in('pack_id', packIds);
 
-            const questionCounts: Record<string, number> = {};
                 questions?.forEach(q => {
                     questionCounts[q.pack_id] = (questionCounts[q.pack_id] || 0) + 1;
                 });
+            }
 
             // Fetch all topics
             const { data: topicsData } = await supabase
@@ -131,13 +159,17 @@ export function PacksPage() {
             setAllTopics(topicsData || []);
 
             // Fetch pack_topics relationships
-            const { data: packTopicsData } = await supabase
+            let packTopicsData: any[] = [];
+            if (packIds.length > 0) {
+                const { data } = await supabase
                     .from('pack_topics')
                     .select('pack_id, topic_id, topics(id, name)')
                     .in('pack_id', packIds);
+                packTopicsData = data || [];
+            }
 
             const packTopicsMap: Record<string, Topic[]> = {};
-            packTopicsData?.forEach((pt: any) => {
+            packTopicsData.forEach((pt: any) => {
                 if (!packTopicsMap[pt.pack_id]) {
                     packTopicsMap[pt.pack_id] = [];
                 }
@@ -159,12 +191,19 @@ export function PacksPage() {
         } finally {
             setLoading(false);
         }
-    }, [categoryId]);
+    }, [categoryId, page, pageSize]);
 
     useEffect(() => {
         fetchData();
     }, [fetchData]);
 
+    useEffect(() => {
+        const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+        if (page > totalPages) {
+            setPage(totalPages);
+        }
+    }, [page, pageSize, totalCount]);
+
     // =============================================================================
     // Handlers
     // =============================================================================
@@ -190,6 +229,13 @@ export function PacksPage() {
             let packId: string;
 
             if (form.editingItem) {
+                // Determine release_notified value
+                // If skip_notification is checked, set release_notified=true to prevent notifications
+                // Otherwise, reset to false when scheduling a new release
+                const releaseNotifiedValue = form.formData.skip_notification
+                    ? true
+                    : (form.formData.scheduled_release_at ? false : undefined);
+
                 const { error } = await auditedSupabase.update('question_packs', form.editingItem.id, {
                     name: form.formData.name,
                     description: form.formData.description || null,
@@ -197,6 +243,13 @@ export function PacksPage() {
                     is_premium: form.formData.is_premium,
                     is_public: form.formData.is_public,
                     is_explicit: form.formData.is_explicit,
+                    category_id: form.formData.category_id || null,
+                    // Only include scheduled_release_at if the field exists in form data (backwards compatible)
+                    ...('scheduled_release_at' in form.formData && {
+                        scheduled_release_at: form.formData.scheduled_release_at,
+                        // Set release_notified based on skip_notification toggle
+                        ...(releaseNotifiedValue !== undefined && { release_notified: releaseNotifiedValue }),
+                    }),
                 });
                 if (error) throw error;
                 packId = form.editingItem.id;
@@ -210,8 +263,14 @@ export function PacksPage() {
                         is_premium: form.formData.is_premium,
                         is_public: form.formData.is_public,
                         is_explicit: form.formData.is_explicit,
-                        category_id: categoryId || null,
-                        sort_order: packs.length,
+                        category_id: form.formData.category_id || null,
+                        sort_order: totalCount,
+                        // Only include scheduled_release_at if the field exists in form data (backwards compatible)
+                        ...('scheduled_release_at' in form.formData && {
+                            scheduled_release_at: form.formData.scheduled_release_at,
+                            // If skip_notification is checked, set release_notified=true
+                            ...(form.formData.skip_notification && { release_notified: true }),
+                        }),
                     })
                     .select('id')
                     .single();
@@ -270,6 +329,9 @@ export function PacksPage() {
                 is_premium: false,
                 is_public: false,
                 is_explicit: false,
+                category_id: categoryId ?? '',
+                scheduled_release_at: null,
+                skip_notification: false,
             });
             setAiDialogOpen(false);
             setSelectedTopicIds(new Set());
@@ -288,14 +350,19 @@ export function PacksPage() {
             const currentOrder = pack.sort_order ?? currentIndex;
             const targetOrder = targetPack.sort_order ?? targetIndex;
 
-            await Promise.all([
+            const [currentUpdate, targetUpdate] = await Promise.all([
                 auditedSupabase.update('question_packs', pack.id, { sort_order: targetOrder }),
                 auditedSupabase.update('question_packs', targetPack.id, { sort_order: currentOrder }),
             ]);
 
+            if (currentUpdate.error || targetUpdate.error) {
+                throw currentUpdate.error ?? targetUpdate.error ?? new Error('Failed to update pack order');
+            }
+
             // Optimistic update
             const newPacks = [...packs];
-            [newPacks[currentIndex], newPacks[targetIndex]] = [newPacks[targetIndex], newPacks[currentIndex]];
+            newPacks[currentIndex] = { ...targetPack, sort_order: currentOrder };
+            newPacks[targetIndex] = { ...pack, sort_order: targetOrder };
             setPacks(newPacks);
         } catch (error) {
             toast.error('Failed to reorder packs');
@@ -367,6 +434,7 @@ export function PacksPage() {
                 onSave={handleSave}
                 saving={form.saving}
                 isEditing={form.isEditing}
+                categories={categories}
                 allTopics={allTopics}
                 selectedTopicIds={selectedTopicIds}
                 onTopicsChange={setSelectedTopicIds}
@@ -456,6 +524,18 @@ export function PacksPage() {
                                                 <Eye className="h-3 w-3 mr-1" />
                                                 Published
                                             </Badge>
+                                        ) : pack.scheduled_release_at ? (
+                                            <>
+                                                <Badge variant="outline" className="border-blue-500 text-blue-400" title={`Releases: ${new Date(pack.scheduled_release_at).toLocaleString()}`}>
+                                                    <Clock className="h-3 w-3 mr-1" />
+                                                    Scheduled
+                                                </Badge>
+                                                {pack.release_notified && (
+                                                    <Badge variant="outline" className="border-gray-500 text-gray-400" title="Notifications skipped">
+                                                        <BellOff className="h-3 w-3" />
+                                                    </Badge>
+                                                )}
+                                            </>
                                         ) : (
                                             <Badge variant="secondary">
                                                 <EyeOff className="h-3 w-3 mr-1" />
@@ -535,6 +615,19 @@ export function PacksPage() {
                     ))}
                 </div>
             )}
+
+            {packs.length > 0 && (
+                <PaginationControls
+                    page={page}
+                    pageSize={pageSize}
+                    totalCount={totalCount}
+                    onPageChange={setPage}
+                    onPageSizeChange={(size) => {
+                        setPage(1);
+                        setPageSize(size);
+                    }}
+                />
+            )}
         </div>
     );
 }

apps/admin/src/pages/content/QuestionAnalyticsPage.tsx

@@ -0,0 +1,947 @@
+import { useEffect, useState } from 'react';
+import { supabase } from '@/config';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Skeleton } from '@/components/ui/skeleton';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Bar, BarChart, ResponsiveContainer, XAxis, YAxis, Tooltip, Cell, Pie, PieChart as RechartsPieChart } from 'recharts';
+import { Crown, MessageCircle, PieChart, Sparkles, Tag, Eye, EyeOff } from 'lucide-react';
+
+type QuestionType = 'swipe' | 'text_answer' | 'audio' | 'photo' | 'who_likely';
+
+interface QuestionRow {
+    id: string;
+    pack_id: string;
+    intensity: number | null;
+    partner_text: string | null;
+    inverse_of?: string | null;
+    question_type?: QuestionType | null;
+}
+
+interface PackRow {
+    id: string;
+    name: string;
+    is_premium: boolean;
+    is_explicit: boolean;
+    is_public: boolean;
+    category_id: string | null;
+    category?: { name: string } | { name: string }[] | null;
+}
+
+interface TopicRow {
+    id: string;
+    name: string;
+}
+
+interface PackTopicRow {
+    pack_id: string;
+    topic_id: string;
+    topics: TopicRow | TopicRow[] | null;
+}
+
+interface BreakdownItem {
+    id: string;
+    name: string;
+    count: number;
+}
+
+interface PackBreakdownItem {
+    id: string;
+    name: string;
+    count: number;
+    isPremium: boolean;
+    category: string;
+}
+
+interface ChartDatum {
+    name: string;
+    value: number;
+    color: string;
+    [key: string]: string | number;
+}
+
+type SegmentKey = 'all' | 'premium' | 'free';
+
+const intensityPalette = ['#22c55e', '#84cc16', '#facc15', '#f97316', '#ef4444'];
+const intensityLabels = ['Gentle', 'Warm', 'Playful', 'Steamy', 'Intense'];
+
+const QUESTION_TYPE_CONFIG: Record<QuestionType, { label: string; color: string }> = {
+    swipe: { label: 'Swipe', color: '#38bdf8' },
+    text_answer: { label: 'Text', color: '#f59e0b' },
+    audio: { label: 'Audio', color: '#a78bfa' },
+    photo: { label: 'Photo', color: '#f472b6' },
+    who_likely: { label: 'Who Likely', color: '#22c55e' },
+};
+
+const formatPercent = (count: number, total: number) => (total > 0 ? Math.round((count / total) * 100) : 0);
+
+const getCategoryName = (category?: PackRow['category']) => {
+    if (!category) return 'Uncategorized';
+    if (Array.isArray(category)) {
+        return category[0]?.name || 'Uncategorized';
+    }
+    return category.name || 'Uncategorized';
+};
+
+const normalizeTopics = (topics?: PackTopicRow['topics']) => {
+    if (!topics) return [] as TopicRow[];
+    return Array.isArray(topics) ? topics : [topics];
+};
+
+type PublishFilter = 'all' | 'published' | 'unpublished';
+
+export function QuestionAnalyticsPage() {
+    const [loading, setLoading] = useState(true);
+    const [publishFilter, setPublishFilter] = useState<PublishFilter>('published');
+    const [stats, setStats] = useState({
+        totalQuestions: 0,
+        premiumQuestions: 0,
+        freeQuestions: 0,
+        taggedQuestions: 0,
+    });
+    const [premiumBreakdown, setPremiumBreakdown] = useState<ChartDatum[]>([]);
+    const [questionTypeBreakdown, setQuestionTypeBreakdown] = useState<ChartDatum[]>([]);
+    const [intensityBreakdown, setIntensityBreakdown] = useState<Record<SegmentKey, ChartDatum[]>>({
+        all: [],
+        premium: [],
+        free: [],
+    });
+    const [topicBreakdown, setTopicBreakdown] = useState<Record<SegmentKey, BreakdownItem[]>>({
+        all: [],
+        premium: [],
+        free: [],
+    });
+    const [categoryBreakdown, setCategoryBreakdown] = useState<Record<SegmentKey, BreakdownItem[]>>({
+        all: [],
+        premium: [],
+        free: [],
+    });
+    const [packBreakdown, setPackBreakdown] = useState<Record<SegmentKey, PackBreakdownItem[]>>({
+        all: [],
+        premium: [],
+        free: [],
+    });
+    const [intensitySegment, setIntensitySegment] = useState<SegmentKey>('all');
+    const [tagSegment, setTagSegment] = useState<SegmentKey>('all');
+    const [categorySegment, setCategorySegment] = useState<SegmentKey>('all');
+    const [packSegment, setPackSegment] = useState<SegmentKey>('all');
+
+    useEffect(() => {
+        const fetchAllQuestions = async () => {
+            const pageSize = 1000;
+            let page = 0;
+            const allQuestions: QuestionRow[] = [];
+
+            while (true) {
+                const from = page * pageSize;
+                const to = from + pageSize - 1;
+                const { data, error } = await supabase
+                    .from('questions')
+                    .select('id, pack_id, intensity, partner_text, inverse_of, question_type')
+                    .range(from, to);
+
+                if (error) throw error;
+
+                const batch = data || [];
+                allQuestions.push(...batch);
+
+                if (batch.length < pageSize) {
+                    break;
+                }
+
+                page += 1;
+            }
+
+            return allQuestions;
+        };
+
+        const fetchAnalytics = async () => {
+            setLoading(true);
+            try {
+                // Build pack query with optional is_public filter
+                let packQuery = supabase
+                    .from('question_packs')
+                    .select('id, name, is_premium, is_explicit, is_public, category_id, category:categories(name)');
+
+                if (publishFilter === 'published') {
+                    packQuery = packQuery.eq('is_public', true);
+                } else if (publishFilter === 'unpublished') {
+                    packQuery = packQuery.eq('is_public', false);
+                }
+
+                const [packsResult, topicsResult, packTopicsResult, questions] = await Promise.all([
+                    packQuery,
+                    supabase
+                        .from('topics')
+                        .select('id, name')
+                        .order('name'),
+                    supabase
+                        .from('pack_topics')
+                        .select('pack_id, topic_id, topics(id, name)'),
+                    fetchAllQuestions(),
+                ]);
+
+                if (packsResult.error) throw packsResult.error;
+                if (topicsResult.error) throw topicsResult.error;
+                if (packTopicsResult.error) throw packTopicsResult.error;
+
+                const packs = (packsResult.data || []) as PackRow[];
+                const topics = (topicsResult.data || []) as TopicRow[];
+                const packTopics = (packTopicsResult.data || []) as PackTopicRow[];
+
+                const packById = new Map<string, PackRow>();
+                packs.forEach((pack) => {
+                    packById.set(pack.id, pack);
+                });
+
+                const seedTopicCounts = () => new Map<string, BreakdownItem>(
+                    topics.map((topic) => [topic.id, { id: topic.id, name: topic.name, count: 0 }])
+                );
+
+                const topicCountsBySegment: Record<SegmentKey, Map<string, BreakdownItem>> = {
+                    all: seedTopicCounts(),
+                    premium: seedTopicCounts(),
+                    free: seedTopicCounts(),
+                };
+
+                const packTopicsMap = new Map<string, TopicRow[]>();
+                packTopics.forEach((relation) => {
+                    const topicsForPack = packTopicsMap.get(relation.pack_id) || [];
+                    const topicsList = normalizeTopics(relation.topics);
+
+                    if (topicsList.length === 0) return;
+
+                    topicsForPack.push(...topicsList);
+                    packTopicsMap.set(relation.pack_id, topicsForPack);
+                });
+
+                const emptyIntensityCounts = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 };
+                const intensityCounts: Record<SegmentKey, Record<number, number>> = {
+                    all: { ...emptyIntensityCounts },
+                    premium: { ...emptyIntensityCounts },
+                    free: { ...emptyIntensityCounts },
+                };
+                const untaggedCounts: Record<SegmentKey, number> = { all: 0, premium: 0, free: 0 };
+                const questionTypeCounts: Record<QuestionType, number> = {
+                    swipe: 0,
+                    text_answer: 0,
+                    audio: 0,
+                    photo: 0,
+                    who_likely: 0,
+                };
+                const categoryCountsBySegment: Record<SegmentKey, Map<string, BreakdownItem>> = {
+                    all: new Map(),
+                    premium: new Map(),
+                    free: new Map(),
+                };
+                const packCountsBySegment: Record<SegmentKey, Map<string, PackBreakdownItem>> = {
+                    all: new Map(),
+                    premium: new Map(),
+                    free: new Map(),
+                };
+
+                let premiumCount = 0;
+                let freeCount = 0;
+                let taggedCount = 0;
+
+                const primaryQuestions = questions.filter((question) => question.inverse_of == null);
+
+                primaryQuestions.forEach((question) => {
+                    const pack = packById.get(question.pack_id);
+                    const isPremium = pack?.is_premium ?? false;
+                    const segmentKey: SegmentKey = isPremium ? 'premium' : 'free';
+                    const categoryName = getCategoryName(pack?.category);
+                    const categoryId = pack?.category_id || 'uncategorized';
+                    const questionType = question.question_type ?? 'swipe';
+
+                    questionTypeCounts[questionType] = (questionTypeCounts[questionType] || 0) + 1;
+
+                    if (isPremium) {
+                        premiumCount += 1;
+                    } else {
+                        freeCount += 1;
+                    }
+
+                    const intensity = question.intensity ?? 1;
+                    intensityCounts.all[intensity] = (intensityCounts.all[intensity] || 0) + 1;
+                    intensityCounts[segmentKey][intensity] = (intensityCounts[segmentKey][intensity] || 0) + 1;
+
+                    const updatePackCounts = (key: SegmentKey) => {
+                        const map = packCountsBySegment[key];
+                        const packEntry = map.get(question.pack_id) || {
+                            id: question.pack_id,
+                            name: pack?.name || 'Unknown Pack',
+                            count: 0,
+                            isPremium: isPremium,
+                            category: categoryName,
+                        };
+                        packEntry.count += 1;
+                        map.set(question.pack_id, packEntry);
+                    };
+
+                    updatePackCounts('all');
+                    updatePackCounts(segmentKey);
+
+                    const updateCategoryCounts = (key: SegmentKey) => {
+                        const map = categoryCountsBySegment[key];
+                        const categoryEntry = map.get(categoryId) || {
+                            id: categoryId,
+                            name: categoryName,
+                            count: 0,
+                        };
+                        categoryEntry.count += 1;
+                        map.set(categoryId, categoryEntry);
+                    };
+
+                    updateCategoryCounts('all');
+                    updateCategoryCounts(segmentKey);
+
+                    const topicsForPack = packTopicsMap.get(question.pack_id) || [];
+                    if (topicsForPack.length > 0) {
+                        taggedCount += 1;
+                        topicsForPack.forEach((topic) => {
+                            const updateCounts = (map: Map<string, BreakdownItem>) => {
+                                const topicEntry = map.get(topic.id) || {
+                                    id: topic.id,
+                                    name: topic.name,
+                                    count: 0,
+                                };
+                                topicEntry.count += 1;
+                                map.set(topic.id, topicEntry);
+                            };
+
+                            updateCounts(topicCountsBySegment.all);
+                            updateCounts(topicCountsBySegment[segmentKey]);
+                        });
+                    } else {
+                        untaggedCounts.all += 1;
+                        untaggedCounts[segmentKey] += 1;
+                    }
+                });
+
+                const totalQuestions = primaryQuestions.length;
+                const premiumData: ChartDatum[] = [
+                    { name: 'Premium', value: premiumCount, color: '#f59e0b' },
+                    { name: 'Free', value: freeCount, color: '#22c55e' },
+                ];
+                const questionTypeData: ChartDatum[] = (Object.entries(QUESTION_TYPE_CONFIG) as Array<
+                    [QuestionType, { label: string; color: string }]
+                >).map(([key, config]) => ({
+                    name: config.label,
+                    value: questionTypeCounts[key],
+                    color: config.color,
+                }));
+
+                const buildIntensityData = (key: SegmentKey) => intensityLabels.map((label, index) => ({
+                    name: label,
+                    value: intensityCounts[key][index + 1] || 0,
+                    color: intensityPalette[index],
+                }));
+
+                const buildTopicData = (key: SegmentKey) => {
+                    const data = Array.from(topicCountsBySegment[key].values());
+                    if (untaggedCounts[key] > 0 || data.length === 0) {
+                        data.push({ id: 'untagged', name: 'Untagged', count: untaggedCounts[key] });
+                    }
+
+                    data.sort((a, b) => b.count - a.count);
+                    return data;
+                };
+
+                const intensityData = {
+                    all: buildIntensityData('all'),
+                    premium: buildIntensityData('premium'),
+                    free: buildIntensityData('free'),
+                };
+
+                const topicData = {
+                    all: buildTopicData('all'),
+                    premium: buildTopicData('premium'),
+                    free: buildTopicData('free'),
+                };
+
+                const buildCategoryData = (key: SegmentKey) =>
+                    Array.from(categoryCountsBySegment[key].values()).sort((a, b) => b.count - a.count);
+                const buildPackData = (key: SegmentKey) =>
+                    Array.from(packCountsBySegment[key].values()).sort((a, b) => b.count - a.count);
+
+                const categoryData = {
+                    all: buildCategoryData('all'),
+                    premium: buildCategoryData('premium'),
+                    free: buildCategoryData('free'),
+                };
+
+                const packData = {
+                    all: buildPackData('all'),
+                    premium: buildPackData('premium'),
+                    free: buildPackData('free'),
+                };
+
+                setStats({
+                    totalQuestions,
+                    premiumQuestions: premiumCount,
+                    freeQuestions: freeCount,
+                    taggedQuestions: taggedCount,
+                });
+                setPremiumBreakdown(premiumData);
+                setQuestionTypeBreakdown(questionTypeData);
+                setIntensityBreakdown(intensityData);
+                setTopicBreakdown(topicData);
+                setCategoryBreakdown(categoryData);
+                setPackBreakdown(packData);
+            } catch (error) {
+                console.error('Failed to fetch question analytics:', error);
+            } finally {
+                setLoading(false);
+            }
+        };
+
+        fetchAnalytics();
+    }, [publishFilter]);
+
+    const premiumPercent = formatPercent(stats.premiumQuestions, stats.totalQuestions);
+    const freePercent = formatPercent(stats.freeQuestions, stats.totalQuestions);
+    const taggedPercent = formatPercent(stats.taggedQuestions, stats.totalQuestions);
+
+    const segmentOptions: { key: SegmentKey; label: string }[] = [
+        { key: 'all', label: 'All' },
+        { key: 'premium', label: 'Premium' },
+        { key: 'free', label: 'Free' },
+    ];
+
+    const segmentLabelByKey: Record<SegmentKey, string> = {
+        all: 'All',
+        premium: 'Premium',
+        free: 'Free',
+    };
+
+    const totalBySegment: Record<SegmentKey, number> = {
+        all: stats.totalQuestions,
+        premium: stats.premiumQuestions,
+        free: stats.freeQuestions,
+    };
+
+    const segmentShareByKey: Record<SegmentKey, string> = {
+        all: '100',
+        premium: stats.totalQuestions ? ((stats.premiumQuestions / stats.totalQuestions) * 100).toFixed(0) : '0',
+        free: stats.totalQuestions ? ((stats.freeQuestions / stats.totalQuestions) * 100).toFixed(0) : '0',
+    };
+
+    const intensityData = intensityBreakdown[intensitySegment];
+    const tagData = topicBreakdown[tagSegment];
+    const categoryData = categoryBreakdown[categorySegment];
+    const packData = packBreakdown[packSegment];
+
+    const publishFilterOptions: { key: PublishFilter; label: string; icon: typeof Eye }[] = [
+        { key: 'all', label: 'All Packs', icon: Eye },
+        { key: 'published', label: 'Published Only', icon: Eye },
+        { key: 'unpublished', label: 'Unpublished Only', icon: EyeOff },
+    ];
+
+    return (
+        <div className="space-y-6">
+            <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+                <div>
+                    <h1 className="text-3xl font-bold tracking-tight flex items-center gap-2">
+                        <PieChart className="h-8 w-8 text-primary" />
+                        Question Analytics
+                    </h1>
+                    <p className="text-muted-foreground">
+                        Deep dive into premium coverage, tags, categories, and intensity distribution
+                    </p>
+                </div>
+                <div className="flex flex-col gap-2">
+                    <p className="text-sm text-muted-foreground">Scope</p>
+                    <div className="flex items-center gap-2">
+                        {publishFilterOptions.map((option) => {
+                            const Icon = option.icon;
+                            return (
+                                <Button
+                                    key={option.key}
+                                    variant={publishFilter === option.key ? 'default' : 'outline'}
+                                    size="sm"
+                                    onClick={() => setPublishFilter(option.key)}
+                                    className="gap-2"
+                                >
+                                    <Icon className="h-4 w-4" />
+                                    {option.label}
+                                </Button>
+                            );
+                        })}
+                    </div>
+                </div>
+            </div>
+
+            <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+                <Card>
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Total Questions</CardTitle>
+                        <MessageCircle className="h-4 w-4 text-muted-foreground" />
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-8 w-20" />
+                        ) : (
+                            <div className="text-2xl font-bold">
+                                {stats.totalQuestions.toLocaleString()}
+                            </div>
+                        )}
+                    </CardContent>
+                </Card>
+
+                <Card>
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Premium Questions</CardTitle>
+                        <Crown className="h-4 w-4 text-muted-foreground" />
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-8 w-20" />
+                        ) : (
+                            <>
+                                <div className="text-2xl font-bold">
+                                    {stats.premiumQuestions.toLocaleString()}
+                                </div>
+                                <p className="text-xs text-muted-foreground">
+                                    {premiumPercent}% of all questions
+                                </p>
+                            </>
+                        )}
+                    </CardContent>
+                </Card>
+
+                <Card>
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Free Questions</CardTitle>
+                        <Sparkles className="h-4 w-4 text-muted-foreground" />
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-8 w-20" />
+                        ) : (
+                            <>
+                                <div className="text-2xl font-bold">
+                                    {stats.freeQuestions.toLocaleString()}
+                                </div>
+                                <p className="text-xs text-muted-foreground">
+                                    {freePercent}% of all questions
+                                </p>
+                            </>
+                        )}
+                    </CardContent>
+                </Card>
+
+                <Card>
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Tagged Questions</CardTitle>
+                        <Tag className="h-4 w-4 text-muted-foreground" />
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-8 w-20" />
+                        ) : (
+                            <>
+                                <div className="text-2xl font-bold">
+                                    {stats.taggedQuestions.toLocaleString()}
+                                </div>
+                                <p className="text-xs text-muted-foreground">
+                                    {taggedPercent}% of all questions
+                                </p>
+                            </>
+                        )}
+                    </CardContent>
+                </Card>
+            </div>
+
+            <div className="grid gap-6 lg:grid-cols-2">
+                <Card>
+                    <CardHeader>
+                        <CardTitle>Premium vs Free</CardTitle>
+                        <CardDescription>
+                            Question count split by pack premium status
+                        </CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-[300px] w-full" />
+                        ) : stats.totalQuestions === 0 ? (
+                            <div className="flex items-center justify-center h-[300px] text-muted-foreground">
+                                No question data available yet
+                            </div>
+                        ) : (
+                            <div className="h-[300px] flex items-center justify-center">
+                                <ResponsiveContainer width="100%" height="100%">
+                                    <RechartsPieChart>
+                                        <Pie
+                                            data={premiumBreakdown}
+                                            dataKey="value"
+                                            cx="50%"
+                                            cy="50%"
+                                            innerRadius={60}
+                                            outerRadius={100}
+                                            paddingAngle={2}
+                                            label={({ name, percent }) =>
+                                                `${name}: ${((percent ?? 0) * 100).toFixed(0)}%`
+                                            }
+                                        >
+                                            {premiumBreakdown.map((entry, index) => (
+                                                <Cell key={`cell-${index}`} fill={entry.color} />
+                                            ))}
+                                        </Pie>
+                                        <Tooltip
+                                            contentStyle={{
+                                                borderRadius: '8px',
+                                                border: '1px solid #e2e8f0',
+                                                boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1)',
+                                            }}
+                                        />
+                                    </RechartsPieChart>
+                                </ResponsiveContainer>
+                            </div>
+                        )}
+                    </CardContent>
+                </Card>
+
+                <Card>
+                    <CardHeader className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                        <div>
+                            <CardTitle>Intensity Distribution</CardTitle>
+                            <CardDescription>
+                                How questions are spread across intensity levels
+                            </CardDescription>
+                        </div>
+                        <div className="flex flex-col items-start gap-1 sm:items-end">
+                            <div className="flex items-center gap-2">
+                                {segmentOptions.map((option) => (
+                                    <Button
+                                        key={option.key}
+                                        variant={intensitySegment === option.key ? 'default' : 'outline'}
+                                        size="sm"
+                                        onClick={() => setIntensitySegment(option.key)}
+                                        className="rounded-full"
+                                    >
+                                        {option.label}
+                                    </Button>
+                                ))}
+                            </div>
+                            <p className="text-xs text-muted-foreground">
+                                {segmentLabelByKey[intensitySegment]}: {totalBySegment[intensitySegment].toLocaleString()} questions ({segmentShareByKey[intensitySegment]}%)
+                            </p>
+                        </div>
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <Skeleton className="h-[300px] w-full" />
+                        ) : totalBySegment[intensitySegment] === 0 ? (
+                            <div className="flex items-center justify-center h-[300px] text-muted-foreground">
+                                No questions in this segment yet
+                            </div>
+                        ) : (
+                            <div className="h-[300px]">
+                                <ResponsiveContainer width="100%" height="100%">
+                                    <BarChart data={intensityData}>
+                                        <XAxis
+                                            dataKey="name"
+                                            stroke="hsl(var(--muted-foreground))"
+                                            fontSize={11}
+                                            tickLine={false}
+                                            axisLine={false}
+                                        />
+                                        <YAxis
+                                            stroke="hsl(var(--muted-foreground))"
+                                            fontSize={11}
+                                            tickLine={false}
+                                            axisLine={false}
+                                            tickFormatter={(value) => `${value}`}
+                                        />
+                                        <Tooltip
+                                            cursor={{ fill: 'rgba(255,255,255,0.03)' }}
+                                            contentStyle={{
+                                                borderRadius: '8px',
+                                                border: '1px solid #e2e8f0',
+                                                boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1)',
+                                            }}
+                                        />
+                                        <Bar dataKey="value" radius={[6, 6, 0, 0]}>
+                                            {intensityData.map((entry, index) => (
+                                                <Cell key={`cell-${index}`} fill={entry.color} />
+                                            ))}
+                                        </Bar>
+                                    </BarChart>
+                                </ResponsiveContainer>
+                            </div>
+                        )}
+                    </CardContent>
+                </Card>
+            </div>
+
+            <Card>
+                <CardHeader>
+                    <CardTitle>Question Types</CardTitle>
+                    <CardDescription>
+                        Distribution of questions by answer format
+                    </CardDescription>
+                </CardHeader>
+                <CardContent>
+                    {loading ? (
+                        <Skeleton className="h-[240px] w-full" />
+                    ) : stats.totalQuestions === 0 ? (
+                        <div className="flex items-center justify-center h-[240px] text-muted-foreground">
+                            No question data available yet
+                        </div>
+                    ) : (
+                        <div className="h-[240px]">
+                            <ResponsiveContainer width="100%" height="100%">
+                                <BarChart data={questionTypeBreakdown}>
+                                    <XAxis
+                                        dataKey="name"
+                                        stroke="hsl(var(--muted-foreground))"
+                                        fontSize={11}
+                                        tickLine={false}
+                                        axisLine={false}
+                                    />
+                                    <YAxis
+                                        stroke="hsl(var(--muted-foreground))"
+                                        fontSize={11}
+                                        tickLine={false}
+                                        axisLine={false}
+                                        tickFormatter={(value) => `${value}`}
+                                    />
+                                    <Tooltip
+                                        cursor={{ fill: 'rgba(255,255,255,0.03)' }}
+                                        contentStyle={{
+                                            borderRadius: '8px',
+                                            border: '1px solid #e2e8f0',
+                                            boxShadow: '0 4px 6px -1px rgb(0 0 0 / 0.1)',
+                                        }}
+                                    />
+                                    <Bar dataKey="value" radius={[6, 6, 0, 0]}>
+                                        {questionTypeBreakdown.map((entry, index) => (
+                                            <Cell key={`cell-${index}`} fill={entry.color} />
+                                        ))}
+                                    </Bar>
+                                </BarChart>
+                            </ResponsiveContainer>
+                        </div>
+                    )}
+                </CardContent>
+            </Card>
+
+            <Card>
+                <CardHeader className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                    <div>
+                        <CardTitle>Tag Breakdown</CardTitle>
+                        <CardDescription>
+                            Tags are derived from pack topics; questions in multi-tag packs count toward each tag
+                        </CardDescription>
+                    </div>
+                    <div className="flex flex-col items-start gap-1 sm:items-end">
+                        <div className="flex items-center gap-2">
+                            {segmentOptions.map((option) => (
+                                <Button
+                                    key={option.key}
+                                    variant={tagSegment === option.key ? 'default' : 'outline'}
+                                    size="sm"
+                                    onClick={() => setTagSegment(option.key)}
+                                    className="rounded-full"
+                                >
+                                    {option.label}
+                                </Button>
+                            ))}
+                        </div>
+                        <p className="text-xs text-muted-foreground">
+                            {segmentLabelByKey[tagSegment]}: {totalBySegment[tagSegment].toLocaleString()} questions ({segmentShareByKey[tagSegment]}%)
+                        </p>
+                    </div>
+                </CardHeader>
+                <CardContent>
+                    {loading ? (
+                        <div className="space-y-3">
+                            {Array.from({ length: 6 }).map((_, index) => (
+                                <Skeleton key={index} className="h-14 w-full" />
+                            ))}
+                        </div>
+                    ) : totalBySegment[tagSegment] === 0 ? (
+                        <div className="text-center py-8 text-muted-foreground">
+                            No questions in this segment yet
+                        </div>
+                    ) : tagData.length === 0 ? (
+                        <div className="text-center py-8 text-muted-foreground">
+                            No tag data available yet
+                        </div>
+                    ) : (
+                        <div className="space-y-4">
+                            {tagData.map((item) => {
+                                const percentage = formatPercent(item.count, totalBySegment[tagSegment]);
+                                return (
+                                    <div
+                                        key={item.id}
+                                        className="flex items-center gap-4 rounded-lg border px-4 py-3"
+                                    >
+                                        <div className="flex-1">
+                                            <div className="flex items-center justify-between">
+                                                <p className="font-medium">{item.name}</p>
+                                                <span className="text-sm text-muted-foreground">
+                                                    {item.count.toLocaleString()}
+                                                </span>
+                                            </div>
+                                            <div className="mt-2 h-2 rounded-full bg-muted overflow-hidden">
+                                                <div
+                                                    className="h-full rounded-full bg-primary/70"
+                                                    style={{ width: `${percentage}%` }}
+                                                />
+                                            </div>
+                                        </div>
+                                        <div className="w-12 text-right text-sm text-muted-foreground">
+                                            {percentage}%
+                                        </div>
+                                    </div>
+                                );
+                            })}
+                        </div>
+                    )}
+                </CardContent>
+            </Card>
+
+            <div className="grid gap-6 lg:grid-cols-2">
+                <Card>
+                    <CardHeader className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                        <div>
+                            <CardTitle>Category Breakdown</CardTitle>
+                            <CardDescription>
+                                Distribution of questions across pack categories
+                            </CardDescription>
+                        </div>
+                        <div className="flex flex-col items-start gap-1 sm:items-end">
+                            <div className="flex items-center gap-2">
+                                {segmentOptions.map((option) => (
+                                    <Button
+                                        key={option.key}
+                                        variant={categorySegment === option.key ? 'default' : 'outline'}
+                                        size="sm"
+                                        onClick={() => setCategorySegment(option.key)}
+                                        className="rounded-full"
+                                    >
+                                        {option.label}
+                                    </Button>
+                                ))}
+                            </div>
+                            <p className="text-xs text-muted-foreground">
+                                {segmentLabelByKey[categorySegment]}: {totalBySegment[categorySegment].toLocaleString()} questions ({segmentShareByKey[categorySegment]}%)
+                            </p>
+                        </div>
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <div className="space-y-3">
+                                {Array.from({ length: 5 }).map((_, index) => (
+                                    <Skeleton key={index} className="h-12 w-full" />
+                                ))}
+                            </div>
+                        ) : totalBySegment[categorySegment] === 0 ? (
+                            <div className="text-center py-8 text-muted-foreground">
+                                No questions in this segment yet
+                            </div>
+                        ) : categoryData.length === 0 ? (
+                            <div className="text-center py-8 text-muted-foreground">
+                                No category data available yet
+                            </div>
+                        ) : (
+                            <div className="space-y-3">
+                                {categoryData.map((item) => {
+                                    const percentage = formatPercent(item.count, totalBySegment[categorySegment]);
+                                    return (
+                                        <div
+                                            key={item.id}
+                                            className="flex items-center justify-between rounded-lg border px-4 py-3"
+                                        >
+                                            <div>
+                                                <p className="font-medium">{item.name}</p>
+                                                <p className="text-xs text-muted-foreground">{percentage}% of questions</p>
+                                            </div>
+                                            <div className="text-right">
+                                                <p className="text-lg font-semibold">{item.count.toLocaleString()}</p>
+                                                <p className="text-xs text-muted-foreground">questions</p>
+                                            </div>
+                                        </div>
+                                    );
+                                })}
+                            </div>
+                        )}
+                    </CardContent>
+                </Card>
+
+                <Card>
+                    <CardHeader className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+                        <div>
+                            <CardTitle>Top Packs</CardTitle>
+                            <CardDescription>
+                                Packs with the most questions right now
+                            </CardDescription>
+                        </div>
+                        <div className="flex flex-col items-start gap-1 sm:items-end">
+                            <div className="flex items-center gap-2">
+                                {segmentOptions.map((option) => (
+                                    <Button
+                                        key={option.key}
+                                        variant={packSegment === option.key ? 'default' : 'outline'}
+                                        size="sm"
+                                        onClick={() => setPackSegment(option.key)}
+                                        className="rounded-full"
+                                    >
+                                        {option.label}
+                                    </Button>
+                                ))}
+                            </div>
+                            <p className="text-xs text-muted-foreground">
+                                {segmentLabelByKey[packSegment]}: {totalBySegment[packSegment].toLocaleString()} questions ({segmentShareByKey[packSegment]}%)
+                            </p>
+                        </div>
+                    </CardHeader>
+                    <CardContent>
+                        {loading ? (
+                            <div className="space-y-3">
+                                {Array.from({ length: 5 }).map((_, index) => (
+                                    <Skeleton key={index} className="h-12 w-full" />
+                                ))}
+                            </div>
+                        ) : totalBySegment[packSegment] === 0 ? (
+                            <div className="text-center py-8 text-muted-foreground">
+                                No questions in this segment yet
+                            </div>
+                        ) : packData.length === 0 ? (
+                            <div className="text-center py-8 text-muted-foreground">
+                                No pack data available yet
+                            </div>
+                        ) : (
+                            <div className="space-y-3">
+                                {packData.slice(0, 8).map((pack) => (
+                                    <div
+                                        key={pack.id}
+                                        className="flex items-center justify-between rounded-lg border px-4 py-3"
+                                    >
+                                        <div className="min-w-0">
+                                            <p className="font-medium truncate">{pack.name}</p>
+                                            <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                                                <span>{pack.category}</span>
+                                                {pack.isPremium && (
+                                                    <Badge variant="secondary" className="text-[10px]">
+                                                        Premium
+                                                    </Badge>
+                                                )}
+                                            </div>
+                                        </div>
+                                        <div className="text-right">
+                                            <p className="text-lg font-semibold">{pack.count.toLocaleString()}</p>
+                                            <p className="text-xs text-muted-foreground">questions</p>
+                                        </div>
+                                    </div>
+                                ))}
+                            </div>
+                        )}
+                    </CardContent>
+                </Card>
+            </div>
+        </div>
+    );
+}