# Review guidelines:

You are acting as a reviewer for a proposed code change made by another engineer.

Below are some default guidelines for determining whether the original author would appreciate the issue being flagged.

These are not the final word in determining whether an issue is a bug. In many cases, you will encounter other, more specific guidelines. These may be present elsewhere in a developer message, a user message, a file, or even elsewhere in this system message.
Those guidelines should be considered to override these general instructions.

Here are the general guidelines for determining whether something is a bug and should be flagged.

1. It meaningfully impacts the accuracy, performance, security, or maintainability of the code.
2. The bug is discrete and actionable (i.e. not a general issue with the codebase or a combination of multiple issues).
3. Fixing the bug does not demand a level of rigor that is not present in the rest of the codebase (e.g. one doesn't need very detailed comments and input validation in a repository of one-off scripts in personal projects)
4. The bug was introduced in the commit (pre-existing bugs should not be flagged).
5. The author of the original PR would likely fix the issue if they were made aware of it.
6. The bug does not rely on unstated assumptions about the codebase or author's intent.
7. It is not enough to speculate that a change may disrupt another part of the codebase, to be considered a bug, one must identify the other parts of the code that are provably affected.
8. The bug is clearly not just an intentional change by the original author.

When flagging a bug, you will also provide an accompanying comment. Once again, these guidelines are not the final word on how to construct a comment -- defer to any subsequent guidelines that you encounter.

1. The comment should be clear about why the issue is a bug.
2. The comment should appropriately communicate the severity of the issue. It should not claim that an issue is more severe than it actually is.
3. The comment should be brief. The body should be at most 1 paragraph. It should not introduce line breaks within the natural language flow unless it is necessary for the code fragment.
4. The comment should not include any chunks of code longer than 3 lines. Any code chunks should be wrapped in markdown inline code tags or a code block.
5. The comment should clearly and explicitly communicate the scenarios, environments, or inputs that are necessary for the bug to arise. The comment should immediately indicate that the issue's severity depends on these factors.
6. The comment's tone should be matter-of-fact and not accusatory or overly positive. It should read as a helpful AI assistant suggestion without sounding too much like a human reviewer.
7. The comment should be written such that the original author can immediately grasp the idea without close reading.
8. The comment should avoid excessive flattery and comments that are not helpful to the original author. The comment should avoid phrasing like "Great job ...", "Thanks for ...".

Below are some more detailed guidelines that you should apply to this specific review.

HOW MANY FINDINGS TO RETURN:

Output all findings that the original author would fix if they knew about it. If there is no finding that a person would definitely love to see and fix, prefer outputting no findings. Do not stop at the first qualifying finding. Continue until you've listed every qualifying finding.

GUIDELINES:

- Ignore trivial style unless it obscures meaning or violates documented standards.
- Use one comment per distinct issue (or a multi-line range if necessary).
- Use ```suggestion blocks ONLY for concrete replacement code (minimal lines; no commentary inside the block).
- In every ```suggestion block, preserve the exact leading whitespace of the replaced lines (spaces vs tabs, number of spaces).
- Do NOT introduce or remove outer indentation levels unless that is the actual fix.

The comments will be presented in the code review as inline comments. You should avoid providing unnecessary location details in the comment body. Always keep the line range as short as possible for interpreting the issue. Avoid ranges longer than 5–10 lines; instead, choose the most suitable subrange that pinpoints the problem.

At the beginning of the finding title, tag the bug with priority level. For example "[P1] Un-padding slices along wrong tensor dimensions". [P0] – Drop everything to fix.  Blocking release, operations, or major usage. Only use for universal issues that do not depend on any assumptions about the inputs. · [P1] – Urgent. Should be addressed in the next cycle · [P2] – Normal. To be fixed eventually · [P3] – Low. Nice to have.

Additionally, include a numeric priority field in the JSON output for each finding: set "priority" to 0 for P0, 1 for P1, 2 for P2, or 3 for P3. If a priority cannot be determined, omit the field or use null.

At the end of your findings, output an "overall correctness" verdict of whether or not the patch should be considered "correct".
Correct implies that existing code and tests will not break, and the patch is free of bugs and other blocking issues.
Ignore non-blocking issues such as style, formatting, typos, documentation, and other nits.

FORMATTING GUIDELINES:
The finding description should be one paragraph.

OUTPUT FORMAT:

## Output schema  — MUST MATCH *exactly*

```json
{
  "findings": [
    {
      "title": "<≤ 80 chars, imperative>",
      "body": "<valid Markdown explaining *why* this is a problem; cite files/lines/functions>",
      "confidence_score": <float 0.0-1.0>,
      "priority": <int 0-3, optional>,
      "code_location": {
        "absolute_file_path": "<file path>",
        "line_range": {"start": <int>, "end": <int>}
      }
    }
  ],
  "overall_correctness": "patch is correct" | "patch is incorrect",
  "overall_explanation": "<1-3 sentence explanation justifying the overall_correctness verdict>",
  "overall_confidence_score": <float 0.0-1.0>
}
```

* **Do not** wrap the JSON in markdown fences or extra prose.
* The code_location field is required and must include absolute_file_path and line_range.
* Line ranges must be as short as possible for interpreting the issue (avoid ranges over 5–10 lines; pick the most suitable subrange).
* The code_location should overlap with the diff.
* Do not generate a PR fix.


<permissions instructions>
Filesystem sandboxing defines which files can be read or written. `sandbox_mode` is `workspace-write`: The sandbox permits reading files, and editing files in `cwd` and `writable_roots`. Editing files in other directories requires approval. Network access is restricted.
Approval policy is currently never. Do not provide the `sandbox_permissions` for any reason, commands will be rejected.
 The writable roots are `/home/Messier82/.codex/memories`, `/home/Messier82/projects/service-book`, `/tmp`.
</permissions instructions>

<apps_instructions>
## Apps (Connectors)
Apps (Connectors) can be explicitly triggered in user messages in the format `[$app-name](app://{connector_id})`. Apps can also be implicitly triggered as long as the context suggests usage of available apps.
An app is equivalent to a set of MCP tools within the `codex_apps` MCP.
An installed app's MCP tools are either provided to you already, or can be lazy-loaded through the `tool_search` tool. If `tool_search` is available, the apps that are searchable by `tools_search` will be listed by it.
Do not additionally call list_mcp_resources or list_mcp_resource_templates for apps.
</apps_instructions>

<skills_instructions>
## Skills
A skill is a set of local instructions to follow that is stored in a `SKILL.md` file. Below is the list of skills that can be used. Each entry includes a name, description, and file path so you can open the source for full instructions when using a specific skill.
### Available skills
- imagegen: Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output should be a bitmap asset rather than repo-native code or vector. Do not use when the task is better handled by editing existing SVG/vector/code-native assets, extending an established icon or logo system, or building the visual directly in HTML/CSS/canvas. (file: /home/Messier82/.codex/skills/.system/imagegen/SKILL.md)
- openai-docs: Use when the user asks how to build with OpenAI products or APIs and needs up-to-date official documentation with citations, help choosing the latest model for a use case, or model upgrade and prompt-upgrade guidance; prioritize OpenAI docs MCP tools, use bundled references only as helper context, and restrict any fallback browsing to official OpenAI domains. (file: /home/Messier82/.codex/skills/.system/openai-docs/SKILL.md)
- plugin-creator: Create and scaffold plugin directories for Codex with a required `.codex-plugin/plugin.json`, optional plugin folders/files, valid manifest defaults, and personal-marketplace entries by default. Use when Codex needs to create a new personal plugin, add optional plugin structure, or generate or update marketplace entries for plugin ordering and availability metadata. (file: /home/Messier82/.codex/skills/.system/plugin-creator/SKILL.md)
- skill-creator: Guide for creating effective skills. This skill should be used when users want to create a new skill (or update an existing skill) that extends Codex's capabilities with specialized knowledge, workflows, or tool integrations. (file: /home/Messier82/.codex/skills/.system/skill-creator/SKILL.md)
- skill-installer: Install Codex skills into $CODEX_HOME/skills from a curated list or a GitHub repo path. Use when a user asks to list installable skills, install a curated skill, or install a skill from another repo (including private repos). (file: /home/Messier82/.codex/skills/.system/skill-installer/SKILL.md)
- gmail:gmail: Manage Gmail inbox triage, mailbox search, thread summaries, action extraction, reply drafting, and email forwarding through connected Gmail data. Use when the user wants to inspect a mailbox or thread, search email with Gmail query syntax, summarize messages, extract decisions and follow-ups, prepare replies or forwarded messages, or organize messages with explicit confirmation before send, archive, delete, or label actions. (file: /home/Messier82/.codex/plugins/cache/openai-curated/gmail/0d4f5414/skills/gmail/SKILL.md)
- gmail:gmail-inbox-triage: Triage a Gmail inbox into actionable buckets such as urgent, needs reply soon, waiting, and FYI using connected Gmail data. Use when the user asks to triage the inbox, rank what needs attention, find what still needs a reply, or separate important mail from noise. (file: /home/Messier82/.codex/plugins/cache/openai-curated/gmail/0d4f5414/skills/gmail-inbox-triage/SKILL.md)
- google-calendar:google-calendar: Manage scheduling and conflicts in connected Google Calendar data. Use when the user wants to inspect calendars, compare availability, review conflicts, find a meeting room, review event notes or attachments, add or adjust reminders, place temporary holds, or draft exact create, update, reschedule, or cancel changes with timezone-aware details. (file: /home/Messier82/.codex/plugins/cache/openai-curated/google-calendar/0d4f5414/skills/google-calendar/SKILL.md)
- google-calendar:google-calendar-daily-brief: Build polished one-day Google Calendar briefs. Use when the user asks for today, tomorrow, or a specific date summary with an agenda, conflict flags, free windows, remaining-meeting readouts, or a calendar brief, and the Google Calendar connector is available. (file: /home/Messier82/.codex/plugins/cache/openai-curated/google-calendar/0d4f5414/skills/google-calendar-daily-brief/SKILL.md)
- google-calendar:google-calendar-free-up-time: Find ways to open up meaningful free time in a connected Google Calendar. Use when the user wants to clear up their day, make room for focus time, create a longer uninterrupted block, or see the smallest set of calendar changes that would give time back. (file: /home/Messier82/.codex/plugins/cache/openai-curated/google-calendar/0d4f5414/skills/google-calendar-free-up-time/SKILL.md)
- google-calendar:google-calendar-group-scheduler: Find and rank good meeting times for multiple people using connected Google Calendar data. Use when the user wants to schedule a group meeting, compare candidate slots across several attendees, find the best compromise time, or add a room check after narrowing the attendee-compatible options. (file: /home/Messier82/.codex/plugins/cache/openai-curated/google-calendar/0d4f5414/skills/google-calendar-group-scheduler/SKILL.md)
- google-calendar:google-calendar-meeting-prep: Build a practical meeting prep brief from a connected Google Calendar event and its nearby context. Use when the user wants to prepare for an upcoming meeting, understand what to read beforehand, pull in linked notes or docs, or get a concise brief on what the meeting appears to require. (file: /home/Messier82/.codex/plugins/cache/openai-curated/google-calendar/0d4f5414/skills/google-calendar-meeting-prep/SKILL.md)
### How to use skills
- Discovery: The list above is the skills available in this session (name + description + file path). Skill bodies live on disk at the listed paths.
- Trigger rules: If the user names a skill (with `$SkillName` or plain text) OR the task clearly matches a skill's description shown above, you must use that skill for that turn. Multiple mentions mean use them all. Do not carry skills across turns unless re-mentioned.
- Missing/blocked: If a named skill isn't in the list or the path can't be read, say so briefly and continue with the best fallback.
- How to use a skill (progressive disclosure):
  1) After deciding to use a skill, open its `SKILL.md`. Read only enough to follow the workflow.
  2) When `SKILL.md` references relative paths (e.g., `scripts/foo.py`), resolve them relative to the skill directory listed above first, and only consider other paths if needed.
  3) If `SKILL.md` points to extra folders such as `references/`, load only the specific files needed for the request; don't bulk-load everything.
  4) If `scripts/` exist, prefer running or patching them instead of retyping large code blocks.
  5) If `assets/` or templates exist, reuse them instead of recreating from scratch.
- Coordination and sequencing:
  - If multiple skills apply, choose the minimal set that covers the request and state the order you'll use them.
  - Announce which skill(s) you're using and why (one short line). If you skip an obvious skill, say why.
- Context hygiene:
  - Keep context small: summarize long sections instead of pasting them; only load extra files when needed.
  - Avoid deep reference-chasing: prefer opening only files directly linked from `SKILL.md` unless you're blocked.
  - When variants exist (frameworks, providers, domains), pick only the relevant reference file(s) and note that choice.
- Safety and fallback: If a skill can't be applied cleanly (missing files, unclear instructions), state the issue, pick the next-best approach, and continue.
</skills_instructions>

<plugins_instructions>
## Plugins
A plugin is a local bundle of skills, MCP servers, and apps. Below is the list of plugins that are enabled and available in this session.
### Available plugins
- `Gmail`: Work with Gmail using the configured Gmail app connector.
- `Google Calendar`: Connect Google Calendar for scheduling, availability, daily briefs, and event management.
### How to use plugins
- Discovery: The list above is the plugins available in this session.
- Skill naming: If a plugin contributes skills, those skill entries are prefixed with `plugin_name:` in the Skills list.
- Trigger rules: If the user explicitly names a plugin, prefer capabilities associated with that plugin for that turn.
- Relationship to capabilities: Plugins are not invoked directly. Use their underlying skills, MCP tools, and app tools to help solve the task.
- Preference: When a relevant plugin is available, prefer using capabilities associated with that plugin over standalone capabilities that provide similar functionality.
- Missing/blocked: If the user requests a plugin that is not listed above, or the plugin does not have relevant callable capabilities for the task, say so briefly and continue with the best fallback.
</plugins_instructions>


# AGENTS.md instructions for /home/Messier82/projects/service-book

<INSTRUCTIONS>
# Repository Guidelines

## Project Structure & Module Organization

Yorvana is a single-module Android app. Main Kotlin source lives in `app/src/main/java/com/yorvana`, organized by layer: `data` for repositories and storage, `domain` for shared models, `ui` for Compose screens/components, and `util` for app helpers. Android resources are in `app/src/main/res`. JVM, Robolectric, and screenshot tests live in `app/src/test/java`; instrumented device tests live in `app/src/androidTest/java`, with test assets in `app/src/androidTest/assets`. Project docs are in `docs/`, build configuration is in `build.gradle.kts`, `app/build.gradle.kts`, `gradle/libs.versions.toml`, and quality rules are in `config/detekt/`.

## Build, Test, and Development Commands

- `./gradlew assembleDebug`: build a debug APK.
- `./gradlew testDebugUnitTest`: run JVM unit, Robolectric, and local Compose tests.
- `./gradlew ktlintCheck detekt lintDebug`: run formatting, static analysis, and Android lint checks used by the pre-commit hook.
- `./gradlew verifyRoborazziDebug`: verify screenshot baselines.
- `./gradlew recordRoborazziDebug`: update screenshot baselines after intentional UI changes.
- `./gradlew pixel2api33DebugAndroidTest`: run instrumented tests on the managed Pixel 2 API 33 device.
- `./gradlew verifyWithCoverage -Pcoverage`: generate combined JVM and smoke-test coverage reports.

## Coding Style & Naming Conventions

Use Kotlin with Java 17 targets and Jetpack Compose Material 3. Follow ktlint defaults and the detekt rules in `config/detekt/detekt.yml`; do not work around baseline files without fixing the underlying issue. Keep package paths under `com.yorvana`. Name Compose screen files `FeatureScreen.kt`, ViewModels `FeatureViewModel.kt`, repository interfaces `ThingRepository`, and implementations `ThingRepositoryImpl`. Prefer immutable UI state exposed through `StateFlow`.

## Testing Guidelines

Use JUnit 4, Robolectric, MockK, Truth, Turbine, Compose UI tests, and Roborazzi. Name fast JVM tests `*Test.kt`, local integration tests `*IT.kt`, and screenshot tests `*ScreenshotTest.kt`. Add new Android-dependent integration tests to `app/src/test/java` when Robolectric is sufficient; use `app/src/androidTest/java` only for real OS, SAF, UiAutomator, hardware, or instrumentation-only behavior. Refresh `app/coverage-baselines/gmd_smoke.ec` with `./gradlew generateGmdCoverage` when smoke-covered production flows change.

## Commit & Pull Request Guidelines

Recent history uses short imperative subjects, with conventional prefixes where useful: `build: bump ...`, `docs: add ...`, or plain feature summaries such as `Add contact option to settings (#102)`. Keep commits focused and avoid committing local secrets or generated noise. PRs should describe user-visible behavior, list verification commands run, link related issues, and include screenshots or updated Roborazzi baselines for UI changes. For automated dependency updates, see [Dependabot Resolution Workflow](docs/dependabot-workflow.md).

## Security & Configuration Tips

Do not commit `local.properties` or real signing credentials. Use `app/keystore.properties.template` for release signing setup and local `sentry.dsn.*` values for Sentry configuration. If coverage baselines are Git LFS pointers, run `git lfs pull` before `verifyWithCoverage`.

</INSTRUCTIONS>

<environment_context>
  <cwd>/home/Messier82/projects/service-book</cwd>
  <shell>bash</shell>
  <current_date>2026-05-21</current_date>
  <timezone>Etc/UTC</timezone>
</environment_context>


# Repository Guidelines

## Project Structure & Module Organization

Yorvana is a single-module Android app. Main Kotlin source lives in `app/src/main/java/com/yorvana`, organized by layer: `data` for repositories and storage, `domain` for shared models, `ui` for Compose screens/components, and `util` for app helpers. Android resources are in `app/src/main/res`. JVM, Robolectric, and screenshot tests live in `app/src/test/java`; instrumented device tests live in `app/src/androidTest/java`, with test assets in `app/src/androidTest/assets`. Project docs are in `docs/`, build configuration is in `build.gradle.kts`, `app/build.gradle.kts`, `gradle/libs.versions.toml`, and quality rules are in `config/detekt/`.

## Build, Test, and Development Commands

- `./gradlew assembleDebug`: build a debug APK.
- `./gradlew testDebugUnitTest`: run JVM unit, Robolectric, and local Compose tests.
- `./gradlew ktlintCheck detekt lintDebug`: run formatting, static analysis, and Android lint checks used by the pre-commit hook.
- `./gradlew verifyRoborazziDebug`: verify screenshot baselines.
- `./gradlew recordRoborazziDebug`: update screenshot baselines after intentional UI changes.
- `./gradlew pixel2api33DebugAndroidTest`: run instrumented tests on the managed Pixel 2 API 33 device.
- `./gradlew verifyWithCoverage -Pcoverage`: generate combined JVM and smoke-test coverage reports.

## Coding Style & Naming Conventions

Use Kotlin with Java 17 targets and Jetpack Compose Material 3. Follow ktlint defaults and the detekt rules in `config/detekt/detekt.yml`; do not work around baseline files without fixing the underlying issue. Keep package paths under `com.yorvana`. Name Compose screen files `FeatureScreen.kt`, ViewModels `FeatureViewModel.kt`, repository interfaces `ThingRepository`, and implementations `ThingRepositoryImpl`. Prefer immutable UI state exposed through `StateFlow`.

## Testing Guidelines

Use JUnit 4, Robolectric, MockK, Truth, Turbine, Compose UI tests, and Roborazzi. Name fast JVM tests `*Test.kt`, local integration tests `*IT.kt`, and screenshot tests `*ScreenshotTest.kt`. Add new Android-dependent integration tests to `app/src/test/java` when Robolectric is sufficient; use `app/src/androidTest/java` only for real OS, SAF, UiAutomator, hardware, or instrumentation-only behavior. Refresh `app/coverage-baselines/gmd_smoke.ec` with `./gradlew generateGmdCoverage` when smoke-covered production flows change.

## Commit & Pull Request Guidelines

Recent history uses short imperative subjects, with conventional prefixes where useful: `build: bump ...`, `docs: add ...`, or plain feature summaries such as `Add contact option to settings (#102)`. Keep commits focused and avoid committing local secrets or generated noise. PRs should describe user-visible behavior, list verification commands run, link related issues, and include screenshots or updated Roborazzi baselines for UI changes. For automated dependency updates, see [Dependabot Resolution Workflow](docs/dependabot-workflow.md).

## Security & Configuration Tips

Do not commit `local.properties` or real signing credentials. Use `app/keystore.properties.template` for release signing setup and local `sentry.dsn.*` values for Sentry configuration. If coverage baselines are Git LFS pointers, run `git lfs pull` before `verifyWithCoverage`.


git status --short && git branch --show-current && git log --oneline -5


Output:
Chunk ID: fcea39
Wall time: 0.1265 seconds
Process exited with code 0
Original token count: 100
Output:
chore/document-dependabot-workflow
5c513a7 docs: tighten pre-authorized fixes scope in dependabot workflow
876fcc8 docs: address review comments on dependabot workflow
a0d2a00 docs: include PR review procedure for fixes in dependabot workflow
da99b93 docs: streamline dependabot workflow to pull origin/master directly
0e37bf8 docs: refine dependabot workflow to merge master into PR branch first


git rev-parse --show-toplevel && git branch -a && git diff --stat master...HEAD || git diff --stat origin/master...HEAD


Output:
Chunk ID: b1c0ba
Wall time: 0.1311 seconds
Process exited with code 0
Original token count: 1300
Output:
/home/Messier82/projects/service-book
* chore/document-dependabot-workflow
  chore/phase-2-private-prep
  chore/phase-2-smoke-label-followup
  chore/phase-3-private-hardening
  ci/free-tier-optimization
  ci/label-gated-workflows
  copilot/implement-billing-manager-override
  copilot/phase-4-viewmodel-paywall-gating
  dependabot/github_actions/gradle/actions-6
  dependabot/gradle/androidx.core-core-ktx-1.18.0
  dependabot/gradle/androidx.test.espresso-espresso-intents-3.7.0
  dependabot/gradle/com.android.billingclient-billing-ktx-8.3.0
  dependabot/gradle/com.android.billingclient-billing-ktx-8.3.0-final
  dependabot/gradle/com.android.billingclient-billing-ktx-8.3.0-fixed
  dependabot/gradle/com.google.truth-truth-1.4.5
  dependabot/gradle/io.sentry-sentry-android-8.41.0
  docs/integration-tests-restructure-plan
  docs/paywall-plan
  docs/smoke-tests-plan
  feat/issue-69-crash-reporting
  feat/paywall-phase-3
  feat/paywall-phase-5
  feat/paywall-ux-rework
  feat/report-bug
  feat/required-field-asterisks
  feat/restructure-tests-phase-1
  feat/smoke-test-phase-1
  feat/smoke-test-phase-2-3
  fix/billing-tests-compilation
  fix/issue-57-force-pending
  fix/issue-80-keyboard-hides-inputs
  fix/issue-81-email-validation
  fix/issue-82-feedback-ui
  fix/issue-83-privacy-ux-refined
  fix/issue-85-premium-dark-mode-visuals
  fix/issue-87-setup-topbar
  fix/issue-89-back-button-styling
  fix/settings-learn-more-alignment
  implement-store-screenshots
  issue-103-play-store-release-plumbing
  issue-54-paywall-hardening
  master
  phase-6-paywall-smoke-tests
  plan-regression-tests
  pr-102-head
  pr-112
  pr-113-review
  pr-72
  pr-73
  pr-73-tmp
  pr-86-head
  pr-88
  pr-91
  pr-91-review
  pr73
  pr73-review-3
  refactor/migrate-integration-tests
  smoke-tests-step-5
  smoke-tests-step4-navigation
  test/smoke-tests-improvements
  test/smoke-tests-step-6-final-verification
  remotes/origin/HEAD -> origin/master
  remotes/origin/add-settings-contact
  remotes/origin/alert-autofix-2
  remotes/origin/chore/document-dependabot-workflow
  remotes/origin/chore/phase-2-private-prep
  remotes/origin/chore/phase-2-smoke-label-followup
  remotes/origin/chore/phase-3-hardening
  remotes/origin/ci/free-tier-optimization
  remotes/origin/ci/label-gated-workflows
  remotes/origin/copilot/add-paywall-foundation-billing-types
  remotes/origin/copilot/implement-billing-manager-override
  remotes/origin/copilot/phase-4-viewmodel-paywall-gating
  remotes/origin/dependabot/gradle/androidx.compose-compose-bom-2026.05.00
  remotes/origin/dependabot/gradle/androidx.compose-compose-bom-2026.05.01
  remotes/origin/dependabot/gradle/androidx.datastore-datastore-preferences-1.2.1
  remotes/origin/dependabot/gradle/com.android.application-9.2.1
  remotes/origin/dependabot/gradle/com.android.billingclient-billing-ktx-9.0.0
  remotes/origin/dependabot/gradle/io.coil-kt-coil-compose-2.7.0
  remotes/origin/dependabot/gradle/io.gitlab.arturbosch.detekt-1.23.8
  remotes/origin/dependabot/gradle/kotlinx-coroutines-1.11.0
  remotes/origin/dependabot/gradle/navigation3-1.1.2
  remotes/origin/dependabot/gradle/org.jlleitschuh.gradle.ktlint-14.2.0
  remotes/origin/docs/integration-tests-restructure-plan
  remotes/origin/docs/paywall-plan
  remotes/origin/docs/smoke-tests-plan
  remotes/origin/feat/issue-69-crash-reporting
  remotes/origin/feat/paywall-phase-3
  remotes/origin/feat/paywall-phase-5
  remotes/origin/feat/paywall-ux-rework
  remotes/origin/feat/report-bug
  remotes/origin/feat/required-field-asterisks
  remotes/origin/feat/restructure-tests-phase-1
  remotes/origin/feat/smoke-test-phase-1
  remotes/origin/feat/smoke-test-phase-2-3
  remotes/origin/feat/validations-and-performer
  remotes/origin/feature/fix-jacoco-coverage
  remotes/origin/feature/improve-test-coverage
  remotes/origin/feature/unified-test-coverage
  remotes/origin/feature/upload-debug-apk-artifact
  remotes/origin/fix/billing-tests-compilation
  remotes/origin/fix/ci-updates-and-coverage
  remotes/origin/fix/issue-57-force-pending
  remotes/origin/fix/issue-80-keyboard-hides-inputs
  remotes/origin/fix/issue-81-email-validation
  remotes/origin/fix/issue-82-feedback-ui
  remotes/origin/fix/issue-83-privacy-ux-refined
  remotes/origin/fix/issue-85-premium-dark-mode-visuals
  remotes/origin/fix/issue-87-setup-topbar
  remotes/origin/fix/issue-89-back-button-styling
  remotes/origin/fix/settings-learn-more-alignment
  remotes/origin/implement-store-screenshots
  remotes/origin/issue-103-play-store-release-plumbing
  remotes/origin/issue-54-paywall-hardening
  remotes/origin/master
  remotes/origin/phase-6-paywall-smoke-tests
  remotes/origin/plan-regression-tests
  remotes/origin/refactor/migrate-integration-tests
  remotes/origin/rename/yorvana
  remotes/origin/smoke-tests-step-5
  remotes/origin/smoke-tests-step4-navigation
  remotes/origin/test/smoke-tests-improvements
  remotes/origin/test/smoke-tests-step-6-final-verification
 AGENTS.md                   |  2 +-
 CLAUDE.md                   |  1 +
 GEMINI.md                   |  1 +
 docs/dependabot-workflow.md | 70 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 1 deletion(-)


git diff --stat master...pr-112 && git diff --stat master...HEAD && git diff --name-status master...pr-112 && git diff --name-status master...HEAD


Output:
Chunk ID: 53e228
Wall time: 0.1588 seconds
Process exited with code 0
Original token count: 1545
Output:
 .gitignore                                         |   1 +
 GEMINI.md                                          |   1 +
 TESTING_SETUP.md                                   |  27 ++-
 app/build.gradle.kts                               | 223 ++++++++++++++++++++-
 app/proguard-rules.pro                             |  22 ++
 .../assets/screenshots-fixture/categories.json     |  10 +
 .../records/2024-03-12-oil-change.json             |  16 ++
 .../records/2024-06-04-brake-pads.json             |  16 ++
 .../records/2024-09-21-tyre-rotation.json          |  16 ++
 .../2019-honda-civic/records/2025-01-18-mot.json   |  16 ++
 .../records/2025-04-02-battery.json                |  16 ++
 .../records/2025-07-15-coolant-flush.json          |  16 ++
 .../vehicles/2019-honda-civic/vehicle.json         |  14 ++
 app/src/androidTest/java/com/yorvana/SmokeTest.kt  | 116 +++--------
 .../com/yorvana/screenshots/StoreScreenshotBase.kt |  96 +++++++++
 .../com/yorvana/screenshots/StoreScreenshotTest.kt | 105 ++++++++++
 .../com/yorvana/testsupport/ComposeWaitHelpers.kt  |  37 ++++
 .../java/com/yorvana/testsupport/DemoMode.kt       |  71 +++++++
 .../com/yorvana/testsupport/ScreenshotConstants.kt |   9 +
 .../java/com/yorvana/testsupport/VaultTestSetup.kt |  42 ++++
 .../yorvana/data/billing/BillingManagerImplTest.kt |   6 +-
 .../yorvana/ui/settings/SettingsScreenshotTest.kt  |   1 +
 .../screenshots/phone/screen_01_vehicle_list.png   | Bin 0 -> 71773 bytes
 .../screenshots/phone/screen_02_vehicle_detail.png | Bin 0 -> 180334 bytes
 .../screenshots/phone/screen_03_add_record.png     | Bin 0 -> 109306 bytes
 .../screenshots/phone/screen_04_categories.png     | Bin 0 -> 100769 bytes
 .../phone/screen_05_settings_privacy.png           | Bin 0 -> 179841 bytes
 .../screenshots/phone/screen_06_paywall_dialog.png | Bin 0 -> 131392 bytes
 .../tablet-10/screen_01_vehicle_list.png           | Bin 0 -> 86902 bytes
 .../tablet-10/screen_02_vehicle_detail.png         | Bin 0 -> 176042 bytes
 .../screenshots/tablet-10/screen_03_add_record.png | Bin 0 -> 117106 bytes
 .../screenshots/tablet-10/screen_04_categories.png | Bin 0 -> 111127 bytes
 .../tablet-10/screen_05_settings_privacy.png       | Bin 0 -> 155217 bytes
 .../tablet-10/screen_06_paywall_dialog.png         | Bin 0 -> 137537 bytes
 .../tablet-7/screen_01_vehicle_list.png            | Bin 0 -> 78745 bytes
 .../tablet-7/screen_02_vehicle_detail.png          | Bin 0 -> 162847 bytes
 .../screenshots/tablet-7/screen_03_add_record.png  | Bin 0 -> 108575 bytes
 .../screenshots/tablet-7/screen_04_categories.png  | Bin 0 -> 102653 bytes
 .../tablet-7/screen_05_settings_privacy.png        | Bin 0 -> 167857 bytes
 .../tablet-7/screen_06_paywall_dialog.png          | Bin 0 -> 117036 bytes
 distribution/store-listing.md                      |  51 +++--
 41 files changed, 816 insertions(+), 112 deletions(-)
 AGENTS.md                   |  2 +-
 CLAUDE.md                   |  1 +
 GEMINI.md                   |  1 +
 docs/dependabot-workflow.md | 70 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 1 deletion(-)
M	.gitignore
M	GEMINI.md
M	TESTING_SETUP.md
M	app/build.gradle.kts
M	app/proguard-rules.pro
A	app/src/androidTest/assets/screenshots-fixture/categories.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2024-03-12-oil-change.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2024-06-04-brake-pads.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2024-09-21-tyre-rotation.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2025-01-18-mot.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2025-04-02-battery.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/records/2025-07-15-coolant-flush.json
A	app/src/androidTest/assets/screenshots-fixture/vehicles/2019-honda-civic/vehicle.json
M	app/src/androidTest/java/com/yorvana/SmokeTest.kt
A	app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotBase.kt
A	app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotTest.kt
A	app/src/androidTest/java/com/yorvana/testsupport/ComposeWaitHelpers.kt
A	app/src/androidTest/java/com/yorvana/testsupport/DemoMode.kt
A	app/src/androidTest/java/com/yorvana/testsupport/ScreenshotConstants.kt
A	app/src/androidTest/java/com/yorvana/testsupport/VaultTestSetup.kt
R099	app/src/testDebug/java/com/yorvana/data/billing/BillingManagerImplTest.kt	app/src/test/java/com/yorvana/data/billing/BillingManagerImplTest.kt
M	app/src/test/java/com/yorvana/ui/settings/SettingsScreenshotTest.kt
A	distribution/store-assets/screenshots/phone/screen_01_vehicle_list.png
A	distribution/store-assets/screenshots/phone/screen_02_vehicle_detail.png
A	distribution/store-assets/screenshots/phone/screen_03_add_record.png
A	distribution/store-assets/screenshots/phone/screen_04_categories.png
A	distribution/store-assets/screenshots/phone/screen_05_settings_privacy.png
A	distribution/store-assets/screenshots/phone/screen_06_paywall_dialog.png
A	distribution/store-assets/screenshots/tablet-10/screen_01_vehicle_list.png
A	distribution/store-assets/screenshots/tablet-10/screen_02_vehicle_detail.png
A	distribution/store-assets/screenshots/tablet-10/screen_03_add_record.png
A	distribution/store-assets/screenshots/tablet-10/screen_04_categories.png
A	distribution/store-assets/screenshots/tablet-10/screen_05_settings_privacy.png
A	distribution/store-assets/screenshots/tablet-10/screen_06_paywall_dialog.png
A	distribution/store-assets/screenshots/tablet-7/screen_01_vehicle_list.png
A	distribution/store-assets/screenshots/tablet-7/screen_02_vehicle_detail.png
A	distribution/store-assets/screenshots/tablet-7/screen_03_add_record.png
A	distribution/store-assets/screenshots/tablet-7/screen_04_categories.png
A	distribution/store-assets/screenshots/tablet-7/screen_05_settings_privacy.png
A	distribution/store-assets/screenshots/tablet-7/screen_06_paywall_dialog.png
M	distribution/store-listing.md
M	AGENTS.md
M	CLAUDE.md
M	GEMINI.md
A	docs/dependabot-workflow.md


Output:
Chunk ID: cc0d79
Wall time: 0.0000 seconds
Process exited with code 128
Original token count: 26
Output:
fatal: Unable to create '/home/Messier82/projects/service-book/.git/index.lock': Read-only file system


git diff --find-renames master...pr-112 -- app/build.gradle.kts app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotBase.kt app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotTest.kt app/src/androidTest/java/com/yorvana/testsupport/DemoMode.kt app/src/androidTest/java/com/yorvana/testsupport/VaultTestSetup.kt app/src/androidTest/java/com/yorvana/SmokeTest.kt TESTING_SETUP.md distribution/store-listing.md app/proguard-rules.pro


Output:
Chunk ID: 55ff6c
Wall time: 0.1260 seconds
Process exited with code 0
Original token count: 11150
Output:
Total output lines: 1074

diff --git a/TESTING_SETUP.md b/TESTING_SETUP.md
index 0129f0d..9eee468 100644
--- a/TESTING_SETUP.md
+++ b/TESTING_SETUP.md
@@ -28,7 +28,8 @@ We use GMD to automate emulator management. This avoids the need to manually cre
 ```

 ### Configuration Details
-- **Device**: Pixel 2, API Level 33.
+- **Smoke device**: Pixel 2, API Level 33.
+- **Store screenshot devices**: Pixel 6, Nexus 7, and Pixel Tablet, API Level 34.
 - **Image**: `aosp`.
 - **Location**: Defined in `app/build.gradle.kts` under `testOptions.managedDevices`.
 - **GPU mode**: Set via `android.testoptions.manageddevices.emulator.gpu` in `gradle.properties` (see below).
@@ -132,7 +133,7 @@ CI uses `swiftshader_indirect` for software rendering because GitHub-hosted runn

 ## 7. Screenshot Testing (Roborazzi)

-Screenshot tests use **Roborazzi** and are executed on the **JVM using Robolectric** rather than via Gradle Managed Devices (GMD).
+Most screenshot tests use **Roborazzi** and are executed on the **JVM using Robolectric** rather than via Gradle Managed Devices (GMD).

 ### Why JVM instead of GMD?
 While GMD provides higher fidelity through hardware-accelerated rendering, it introduces two critical workflow blockers:
@@ -141,6 +142,28 @@ While GMD provides higher fidelity through hardware-accelerated rendering, it in

 Running screenshot tests in `src/test` ensures snapshots are generated directly onto the host filesystem, providing a reliable and frictionless developer experience.

+The exception is the Play Store marketing suite in
+`app/src/androidTest/java/com/yorvana/screenshots/`. It is intentionally
+instrumented because store assets should use real platform rendering and
+native device dimensions. The suite captures PNGs from the emulator display
+into the managed device additional-output directory.
+
+### High-Fidelity Screenshots (Release Build)
+By default, `generateStoreScreenshots` runs against the **debug** variant for
+speed and stability. To generate production-representative assets from the
+minified **release** build (hiding developer settings and matching production
+UI exactly), use the `-PscreenshotBuild` flag:
+
+```bash
+./gradlew generateStoreScreenshots -PscreenshotBuild
+```
+
+This task runs only the `com.yorvana.screenshots` package on the three API 34
+store devices and copies the generated PNGs into
+`distribution/store-assets/screenshots/{phone,tablet-7,tablet-10}/`. The
+existing Pixel 2 smoke device is kept separate and excludes the screenshot
+package during smoke invocations.
+
 ---

 ## 8. Robolectric Configuration
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3458552..50185a2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.gradle.api.Task
+import org.gradle.api.file.RelativePath
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import java.io.FileInputStream
@@ -36,6 +39,17 @@ val isCoverageEnabled =
                 it.contains("generateGmdCoverage", ignoreCase = true)
         }

+val screenshotTestPackage = "com.yorvana.screenshots"
+
+/**
+ * When -PscreenshotBuild is passed, we switch the instrumentation test environment to 'release'.
+ * This ensures that store screenshots are captured from the production-representative minified build.
+ * General unit testing and coverage remains on 'debug' for stability.
+ */
+val isScreenshotBuild = project.hasProperty("screenshotBuild")
+val testVariant = if (isScreenshotBuild) "release" else "debug"
+val testVariantCap = testVariant.replaceFirstChar { it.uppercase() }
+
 android {
     namespace = "com.yorvana"
     compileSdk = 36
@@ -48,12 +62,13 @@ android {
         versionName = "1.0.0"

         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments["additionalTestOutputDir"] = "/sdcard/test-outputs/smoke"
         vectorDrawables {
             useSupportLibrary = true
         }
     }

+    testBuildType = testVariant
+
     signingConfigs {
         create("release") {
             storeFile = rootProject.file("app/${keystoreProperties["storeFile"] ?: System.getenv("KEYSTORE_FILE") ?: ""}")
@@ -122,6 +137,25 @@ android {
                     device = "Pixel 2"
                     apiLevel = 33
                     systemImageSource = "aosp"
+                    testedAbi = "x86_64"
+                }
+                create<com.android.build.api.dsl.ManagedVirtualDevice>("phonePixel6api34") {
+                    device = "Pixel 6"
+                    apiLevel = 34
+                    systemImageSource = "aosp"
+                    testedAbi = "x86_64"
+                }
+                create<com.android.build.api.dsl.ManagedVirtualDevice>("tablet7Nexus7api34") {
+                    device = "Nexus 7"
+                    apiLevel = 34
+                    systemImageSource = "aosp"
+                    testedAbi = "x86_64"
+                }
+                create<com.android.build.api.dsl.ManagedVirtualDevice>("tablet10PixelTabletApi34") {
+                    device = "Pixel Tablet"
+                    apiLevel = 34
+                    systemImageSource = "aosp"
+                    testedAbi = "x86_64"
                 }
             }
         }
@@ -152,11 +186,75 @@ tasks.named("check") {
     dependsOn("lintDebug")
 }

+afterEvaluate {
+    // Note: This reflective block and the use of afterEvaluate make the build incompatible with
+    // the Configuration Cache (CC) for managed device test tasks. ManagedDeviceInstrumentationTestTask
+    // cannot be serialized when configured reflectively in afterEvaluate. We accept this trade-off
+    // to enable per-device instrumentation arguments which AGP 8.x does not yet expose via a public DSL.
+    tasks.withType<com.android.build.gradle.internal.tasks.ManagedDeviceInstrumentationTestTask>().configureEach {
+        val deviceDirName =
+            when {
+                name.contains("phonePixel6api34", ignoreCase = true) -> "phonePixel6api34"
+                name.contains("tablet7Nexus7api34", ignoreCase = true) -> "tablet7Nexus7api34"
+                name.contains("tablet10PixelTabletApi34", ignoreCase = true) -> "tablet10PixelTabletApi34"
+                name.contains("pixel2api33", ignoreCase = true) -> "pixel2api33"
+                else -> null
+            }
+        if (deviceDirName != null) {
+            // Set the host-side directory where GMD will pull files from.
+            getAdditionalTestOutputDir().set(
+                layout.buildDirectory.dir("outputs/managed_device_android_test_additional_output/$testVariant/$deviceDirName"),
+            )
+        }
+
+        // AGP does not provide a public DSL to set per-ManagedVirtualDevice instrumentation arguments.
+        // We use reflection to reach into the internal testData property and its instrumentationRunnerArguments map.
+        val getTestDataMethod = javaClass.getMethod("getTestData")
+        val testDataProperty = getTestDataMethod.invoke(this) as org.gradle.api.provider.Property<*>
+        val testData = testDataProperty.get()
+        val getArgsMethod = testData.javaClass.getMethod("getInstrumentationRunnerArguments")
+
+        @Suppress("UNCHECKED_CAST")
+        val argsProperty = getArgsMethod.invoke(testData) as org.gradle.api.provider.MapProperty<String, String>
+
+        // Use putAll(provider) to ensure that the arguments are evaluated specifically for this task instance.
+        // This prevents aliasing/merging issues when AGP shares the underlying property object across tasks.
+        val taskName = name
+        argsProperty.putAll(
+            provider {
+                val map = mutableMapOf<String, String>()
+                when {
+                    taskName.contains("phonePixel6api34", ignoreCase = true) -> {
+                        map["package"] = screenshotTestPackage
+                        map["additionalTestOutputDir"] = "/sdcard/test-outputs/screenshots"
+                    }
+                    taskName.contains("tablet7Nexus7api34", ignoreCase = true) -> {
+                        map["package"] = screenshotTestPackage
+                        map["additionalTestOutputDir"] = "/sdcard/test-outputs/screenshots"
+                    }
+                    taskName.contains("tablet10PixelTabletApi34", ignoreCase = true) -> {
+                        map["package"] = screenshotTestPackage
+                        map["additionalTestOutputDir"] = "/sdcard/test-outputs/screenshots"
+                    }
+                    taskName.contains("pixel2api33", ignoreCase = true) -> {
+                        map["notPackage"] = screenshotTestPackage
+                        map["additionalTestOutputDir"] = "/sdcard/test-outputs/smoke"
+                    }
+                }
+                map
+            },
+        )
+    }
+}
+
 tasks.register<Copy>("generateGmdCoverage") {
     group = "Verification"
     description = "Runs GMD tests and copies the coverage file to the baseline directory."

-    dependsOn("pixel2api33DebugAndroidTest")
+    // Coverage is always collected from the debug variant of the smoke device
+    // regardless of the current -PscreenshotBuild setting.
+    val smokeTask = "pixel2api33DebugAndroidTest"
+    dependsOn(smokeTask)

     from(layout.buildDirectory.dir("outputs/managed_device_code_coverage/debug/pixel2api33")) {
         include("coverage.ec")
@@ -175,10 +273,125 @@ tasks.register<Copy>("generateGmdCoverage") {
     }
 }

+val storeScreenshotFiles =
+    listOf(
+        "screen_01_vehicle_list.png",
+        "screen_02_vehicle_detail.png",
+        "screen_03_add_record.png",
+        "screen_04_categories.png",
+        "screen_05_settings_privacy.png",
+        "screen_06_paywall_dialog.png",
+    )
+val storeScreenshotsRoot = rootProject.layout.projectDirectory.dir("distribution/store-assets/screenshots")
+val storeAdditionalOutputRoots =
+    listOf(
+        layout.buildDirectory.dir("outputs/managed_device_android_test_additional_output/$testVariant"),
+    )
+
+fun registerStoreScreenshotCopy(
+    taskPrefix: String,
+    deviceTaskName: String,
+    outputDirectory: String,
+    previousCopyTask: TaskProvider<out Task>? = null,
+): TaskProvider<Copy> {
+    tasks.matching { it.name == deviceTaskName }.configureEach {
+        previousCopyTask?.let { mustRunAfter(it) }
+        // We inject a doFirst block to wipe the additional output root before every run.
+        // This ensures a clean state for the subsequent copy task, but has the side-effect
+        // of clearing previous outputs even when running a single device test for debugging.
+        doFirst {
+            delete(storeAdditionalOutputRoots)
+        }
+    }
+
+    return tasks.register<Copy>("copy${taskPrefix}StoreScreenshots") {
+        previousCopyTask?.let { dependsOn(it) }
+        dependsOn(tasks.matching { it.name == deviceTaskName })
+        into(storeScreenshotsRoot.dir(outputDirectory))
+        includeEmptyDirs = false
+        duplicatesStrategy = DuplicatesStrategy.FAIL
+
+        doFirst {
+            delete(storeScreenshotsRoot.dir(outputDirectory))
+        }
+
+        storeAdditionalOutputRoots.forEach { outputRoot ->
+            from(outputRoot) {
+                // AGP sometimes aliases instrumentation arguments across GMD tasks,
+                // leading to screenshots being saved in the wrong bucket subfolder on the host.
+                // We use a wildcard to grab any screenshot found in the device's output root.
+                include("**/$outputDirectory/screen_*.png")
+                eachFile {
+                    relativePath = RelativePath(true, name)
+                }
+            }
+        }
+
+        doLast {
+            val missing =
+                storeScreenshotFiles.mapNotNull { fileName ->
+                    val file = storeScreenshotsRoot.file("$outputDirectory/$fileName").asFile
+                    if (file.exists()) null else file
+                }
+            if (missing.isNotEmpty()) {
+                throw GradleException(
+                    "Missing generated store screenshots for $outputDirectory:\n" +
+                        missing.joinToString(separator = "\n") { "- ${it.path}" },
+                )
+            }
+        }
+    }
+}
+
+val copyPhoneStoreScreenshots =
+    registerStoreScreenshotCopy(
+        taskPrefix = "Phone",
+        deviceTaskName = "phonePixel6api34${testVariantCap}AndroidTest",
+        outputDirectory = "phone",
+    )
+val copyTablet7StoreScreenshots =
+    registerStoreScreenshotCopy(
+        taskPrefix = "Tablet7",
+        deviceTaskName = "tablet7Nexus7api34${testVariantCap}AndroidTest",
+        outputDirectory = "tablet-7",
+        previousCopyTask = copyPhoneStoreScreenshots,
+    )
+val copyTablet10StoreScreenshots =
+    registerStoreScreenshotCopy(
+        taskPrefix = "Tablet10",
+        deviceTaskName = "tablet10PixelTabletApi34${testVariantCap}AndroidTest",
+        outputDirectory = "tablet-10",
+        previousCopyTask = copyTablet7StoreScreenshots,
+    )
+
+tasks.register("generateStoreScreenshots") {
+    group = "Verification"
+    description = "Runs store screenshot tests on managed devices and copies PNGs into distribution assets."
+
+    dependsOn(copyTablet10StoreScreenshots)
+
+    doLast {
+        val missing =
+            listOf("phone", "tablet-7", "tablet-10").flatMap { outputDirectory ->
+                storeScreenshotFiles.mapNotNull { fileName ->
+                    val file = storeScreenshotsRoot.file("$outputDirectory/$fileName").asFile
+                    if (file.exists()) null else file
+                }
+            }
+        if (missing.isNotEmpty()) {
+            throw GradleException(
+                "Missing generated store screenshots:\n" +
+                    missing.joinToString(separator = "\n") { "- ${it.path}" },
+            )
+        }
+    }
+}
+
 tasks.register<JacocoReport>("verifyWithCoverage") {
     group = "Verification"
     description = "Runs JVM unit tests and generates a combined coverage report using JaCoCo with the static GMD baseline."

+    // Unit tests are variant-agnostic; we always use debug for coverage consistency
     dependsOn("testDebugUnitTest")

     reports {
@@ -274,9 +487,6 @@ tasks.withType<Test>().configureEach {
     } else {
         configure<JacocoTaskExtension> { isEnabled = false }
     }
-    if (name.contains("Release")) {
-        enabled = false
-    }

     val defaultForks = (Runtime.getRuntime().availableProcessors() / 4).coerceAtLeast(2)
     maxParallelForks = (project.findProperty("testForks") as String?)?.toInt() ?: defaultForks
@@ -297,6 +507,9 @@ tasks.withType<Test>().configureEach {
     // Note: This project uses JUnit 4 exclusively. If a Jupiter runner is ever added,
     // useJUnit { } will need to be scoped to only JUnit 4 tasks to avoid overriding
     // Jupiter configuration.
+    if (name.contains("Release")) {
+        enabled = false
+    }
     useJUnit {
         excludeCategories("com.yorvana.LocalOnly")
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4c8ed90..7072fd0 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,25 @@

 # Keep data classes used in serialization
 -keep class com.yorvana.data.model.** { *; }
+
+# Keep TestTags for release-build instrumentation tests
+-keep class com.yorvana.ui.TestTags { *; }
+
+# Suppress warnings from test dependencies used in instrumentation tests
+-dontwarn net.bytebuddy.**
+-dontwarn com.sun.jna.**
+-dontwarn com.google.errorprone.**
+-dontwarn org.junit.**
+-dontwarn io.mockk.**
+-dontwarn sun.misc.Unsafe
+-dontwarn java.lang.instrument.ClassFileTransformer
+-dontwarn javax.lang.model.element.Modifier
+
+# Explicitly handle missing classes that R8 blockers
+-keep class com.sun.jna.** { *; }
+-keep class net.bytebuddy.** { *; }
+
+# Keep Compose nodes for testing
+-keep class androidx.compose.ui.platform.AbstractComposeView { *; }
+-keep class androidx.compose.ui.platform.InspectableValue { *; }
+-keep class androidx.compose.ui.semantics.SemanticsModifierNode { *; }
diff --git a/app/src/androidTest/java/com/yorvana/SmokeTest.kt b/app/src/androidTest/java/com/yorvana/SmokeTest.kt
index f732858..0fb4958 100644
--- a/app/src/androidTest/java/com/yorvana/SmokeTest.kt
+++ b/app/src/androidTest/java/com/yorvana/SmokeTest.kt
@@ -1,6 +1,5 @@
 package com.yorvana

-import android.net.Uri
 import android.util.Log
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertIsDisplayed
@@ -11,7 +10,6 @@ import androidx.compose.ui.test.hasClickAction
 import androidx.compose.ui.test.hasStateDescription
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onAllNodesWithTag
 import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
@@ -24,10 +22,13 @@ import androidx.compose.ui.test.swipeLeft
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.yorvana.data.model.Vehicle
-import com.yorvana.data.preferences.CURRENT_CONSENT_VERSION
 import com.yorvana.data.preferences.DebugBillingOverrideMode
+import com.yorvana.testsupport.awaitTagGone
+import com.yorvana.testsupport.awaitTagVisible
+import com.yorvana.testsupport.awaitText
+import com.yorvana.testsupport.installFreshVault
+import com.yorvana.testsupport.resetYorvanaState
 import com.yorvana.ui.TestTags
-import com.yorvana.util.CrashReporter
 import com.yorvana.util.DateFormatter
 import kotlinx.coroutines.runBlocking
 import org.junit.After
@@ -35,7 +36,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.File
 import java.util.UUID

 /**
@@ -51,30 +51,12 @@ class SmokeTest {

     @Before
     fun setUp() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val app = context.applicationContext as YorvanaApplication
-        // Clear vault for each test to ensure isolation
-        runBlocking {
-            app.vaultStorage.clearVault()
-            app.preferences.setVaultUri(null)
-            app.preferences.setCrashReportingConsentPromptShownVersion(0)
-            app.preferences.setCrashReportingEnabled(false)
-            CrashReporter.clear(app)
-        }
+        composeTestRule.resetYorvanaState()
     }

     @After
     fun tearDown() {
-        val app = composeTestRule.activity.application as YorvanaApplication
-        runBlocking {
-            app.vaultStorage.clearVault()
-            app.preferences.setVaultUri(null)
-            app.preferences.setCrashReportingConsentPromptShownVersion(0)
-            app.preferences.setCrashReportingEnabled(false)
-            CrashReporter.clear(app)
-            // Reset billing override to NONE to prevent leakage
-            app.debugBillingOverride?.setMode(DebugBillingOverrideMode.NONE)
-        }
+        composeTestRule.resetYorvanaState()
     }

     private fun step(
@@ -85,21 +67,7 @@ class SmokeTest {
     }

     private fun configureVaultAndNavigateToGarage() {
-        val activity = composeTestRule.activity
-        val app = activity.application as YorvanaApplication
-
-        // Skip the system picker by setting vault URI directly
-        val vaultFile = File(activity.filesDir, "test_vault")
-        if (!vaultFile.exists()) vaultFile.mkdirs()
-        val uri = Uri.fromFile(vaultFile)
-
-        runBlocking {
-            app.preferences.setCrashReportingConsentPromptShownVersion(CURRENT_CONSENT_VERSION)
-            app.preferences.setVaultUri(uri.toString())
-            app.applyVaultUri(uri.toString…1150 tokens truncated…
         composeTestRule.onNodeWithText(activity.getString(R.string.paywall_sheet_dismiss)).performClick()
-        awaitTagGone(TestTags.PAYWALL_INFO_SHEET)
+        composeTestRule.awaitTagGone(TestTags.PAYWALL_INFO_SHEET)
         assertScreenTitle(R.string.my_garage)
         composeTestRule.onNodeWithText("S18 Car").assertIsDisplayed()
     }
@@ -335,11 +275,11 @@ class SmokeTest {

         step("S19", "forcing free tier and verifying banner on VehicleList")
         setBillingOverride(DebugBillingOverrideMode.FORCE_FREE)
-        awaitTagVisible(TestTags.PAYWALL_STATUS_CARD)
+        composeTestRule.awaitTagVisible(TestTags.PAYWALL_STATUS_CARD)
         composeTestRule.onNodeWithText(activity.getString(R.string.paywall_card_learn_more)).assertIsDisplayed()

         step("S19", "verifying swipe-to-dismiss is disabled for Car A")
-        awaitText("Car A")
+        composeTestRule.awaitText("Car A")
         composeTestRule.onNodeWithText("Car A").performTouchInput { swipeLeft() }
         composeTestRule.onNodeWithText("Car A").assertIsDisplayed()

@@ -369,23 +309,23 @@ class SmokeTest {

         step("S20", "forcing free tier and verifying banner appears")
         setBillingOverride(DebugBillingOverrideMode.FORCE_FREE)
-        awaitTagVisible(TestTags.PAYWALL_STATUS_CARD)
+        composeTestRule.awaitTagVisible(TestTags.PAYWALL_STATUS_CARD)

         step("S20", "switching to premium and waiting for banner to lift")
         setBillingOverride(DebugBillingOverrideMode.FORCE_PREMIUM)
-        awaitTagGone(TestTags.PAYWALL_STATUS_CARD)
+        composeTestRule.awaitTagGone(TestTags.PAYWALL_STATUS_CARD)

         step("S20", "verifying FAB now navigates to AddVehicle")
-        awaitTagVisible(TestTags.ADD_VEHICLE_FAB)
+        composeTestRule.awaitTagVisible(TestTags.ADD_VEHICLE_FAB)
         navigateToAddVehicle()
         assertScreenTitle(R.string.vehicle_add)

         step("S20", "verifying banner is absent and FAB is enabled on detail")
         pressBack()
-        awaitText("Car A")
+        composeTestRule.awaitText("Car A")
         composeTestRule.onNodeWithText("Car A").performScrollTo().performClick()
         composeTestRule.waitForIdle()
-        awaitTagGone(TestTags.PAYWALL_STATUS_CARD)
+        composeTestRule.awaitTagGone(TestTags.PAYWALL_STATUS_CARD)
         composeTestRule.onNodeWithTag(TestTags.ADD_RECORD_FAB)
             .assertIsDisplayed()
             .assert(hasClickAction())
@@ -407,7 +347,7 @@ class SmokeTest {
         composeTestRule.activityRule.scenario.recreate()
         composeTestRule.waitForIdle()
         // Nav state is preserved via rememberSaveable — app restores to SettingsScreen
-        awaitTagVisible(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE, timeoutMillis = 15_000)
+        composeTestRule.awaitTagVisible(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE, timeoutMillis = 15_000)
         composeTestRule.onNodeWithTag(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE)
             .performScrollTo()
             .assertIsOn()
@@ -420,7 +360,7 @@ class SmokeTest {
         composeTestRule.activityRule.scenario.recreate()
         composeTestRule.waitForIdle()
         // Nav state is preserved via rememberSaveable — app restores to SettingsScreen
-        awaitTagVisible(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE, timeoutMillis = 15_000)
+        composeTestRule.awaitTagVisible(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE, timeoutMillis = 15_000)
         composeTestRule.onNodeWithTag(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE)
             .performScrollTo()
             .assertIsOff()
@@ -446,7 +386,7 @@ class SmokeTest {
         composeTestRule.onNodeWithTag(TestTags.REPORT_BUG_DEVICE_INFO_CARD)
             .performScrollTo()
             .performClick()
-        awaitText(appContext.getString(R.string.report_bug_app_version), substring = true)
+        composeTestRule.awaitText(appContext.getString(R.string.report_bug_app_version), substring = true)
         composeTestRule.onNodeWithText(appContext.getString(R.string.report_bug_app_version), substring = true)
             .assertIsDisplayed()

diff --git a/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotBase.kt b/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotBase.kt
new file mode 100644
index 0000000..83bb8fa
--- /dev/null
+++ b/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotBase.kt
@@ -0,0 +1,96 @@
+package com.yorvana.screenshots
+
+import android.util.Log
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.platform.app.InstrumentationRegistry
+import com.yorvana.MainActivity
+import com.yorvana.testsupport.DemoMode
+import com.yorvana.testsupport.ScreenshotConstants
+import com.yorvana.testsupport.installFreshVault
+import com.yorvana.testsupport.resetYorvanaState
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import java.io.File
+
+abstract class StoreScreenshotBase {
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
+
+    @Before
+    fun setUpStoreScreenshot() {
+        composeTestRule.resetYorvanaState()
+        DemoMode.enter()
+        DemoMode.ensureOutputDirectory()
+        composeTestRule.installFreshVault(vaultName = "screenshots_vault") { vaultRoot ->
+            copyAssetDirectory("screenshots-fixture", vaultRoot)
+        }
+    }
+
+    @After
+    fun tearDownStoreScreenshot() {
+        DemoMode.exit()
+        composeTestRule.resetYorvanaState()
+    }
+
+    protected fun captureStoreScreenshot(fileName: String) {
+        composeTestRule.waitForIdle()
+        val outputBucket = outputBucket()
+        val outputDirectory = "${ScreenshotConstants.DEVICE_SCREENSHOT_DIR}/$outputBucket"
+        val outputPath = "$outputDirectory/$fileName.png"
+        DemoMode.runShell("mkdir -p $outputDirectory")
+        DemoMode.runShell("screencap -p $outputPath")
+
+        // Verify the file was captured and is non-empty
+        val fileSizeResult = DemoMode.runShell("stat -c %s $outputPath").trim()
+        val fileSize = fileSizeResult.toLongOrNull() ?: 0L
+        check(fileSize > 0) {
+            "Failed to capture store screenshot at $outputPath. File size: $fileSize. Shell output: $fileSizeResult"
+        }
+    }
+
+    private fun outputBucket(): String {
+        val metrics = InstrumentationRegistry.getInstrumentation().targetContext.resources.displayMetrics
+        val width = metrics.widthPixels
+        val height = metrics.heightPixels
+        val short = minOf(width, height)
+        val long = maxOf(width, height)
+
+        return when {
+            // Pixel Tablet (GMD) is 1600x2560 or 2560x1600
+            short >= 1600 && long >= 2560 -> "tablet-10"
+            // Nexus 7 (GMD) is 1200x1920
+            short >= 1200 && long >= 1920 -> "tablet-7"
+            // Pixel 6 (GMD) is 1080x2400
+            short >= 1080 && long >= 2400 -> "phone"
+            else -> {
+                Log.w("StoreScreenshot", "Unknown device dimensions: ${width}x${height}. Falling back to 'phone'.")
+                "phone"
+            }
+        }
+    }
+
+    private fun copyAssetDirectory(
+        assetPath: String,
+        destination: File,
+    ) {
+        val assets = InstrumentationRegistry.getInstrumentation().context.assets
+        destination.mkdirs()
+        assets.list(assetPath).orEmpty().forEach { childName ->
+            val childAssetPath = if (assetPath.isEmpty()) childName else "$assetPath/$childName"
+            val childDestination = File(destination, childName)
+
+            // Try to open as a file first. If it fails, it's likely a directory.
+            try {
+                assets.open(childAssetPath).use { input ->
+                    childDestination.outputStream().use { output ->
+                        input.copyTo(output)
+                    }
+                }
+            } catch (e: java.io.FileNotFoundException) {
+                // If it's a directory, recurse. If it's truly missing, list() would have skipped it.
+                copyAssetDirectory(childAssetPath, childDestination)
+            }
+        }
+    }
+}
diff --git a/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotTest.kt b/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotTest.kt
new file mode 100644
index 0000000..573d539
--- /dev/null
+++ b/app/src/androidTest/java/com/yorvana/screenshots/StoreScreenshotTest.kt
@@ -0,0 +1,105 @@
+package com.yorvana.screenshots
+
+import androidx.compose.ui.test.hasClickAction
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import com.yorvana.R
+import com.yorvana.data.preferences.DebugBillingOverrideMode
+import com.yorvana.testsupport.awaitTagVisible
+import com.yorvana.testsupport.awaitText
+import com.yorvana.ui.TestTags
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@SdkSuppress(minSdkVersion = 34)
+class StoreScreenshotTest : StoreScreenshotBase() {
+    @Test
+    fun screen_01_vehicle_list() {
+        composeTestRule.awaitText(DEMO_VEHICLE_NAME)
+
+        captureStoreScreenshot("screen_01_vehicle_list")
+    }
+
+    @Test
+    fun screen_02_vehicle_detail() {
+        openVehicleDetail()
+        composeTestRule.awaitText("Coolant flush", substring = true)
+
+        captureStoreScreenshot("screen_02_vehicle_detail")
+    }
+
+    @Test
+    fun screen_03_add_record() {
+        openVehicleDetail()
+        composeTestRule.onNodeWithTag(TestTags.ADD_RECORD_FAB).performClick()
+        composeTestRule.awaitTagVisible(TestTags.RECORD_ODOMETER_FIELD)
+
+        captureStoreScreenshot("screen_03_add_record")
+    }
+
+    @Test
+    fun screen_04_categories() {
+        openSettings()
+        composeTestRule.onNodeWithText(composeTestRule.activity.getString(R.string.settings_categories))
+            .performScrollTo()
+            .performClick()
+        composeTestRule.awaitText(composeTestRule.activity.getString(R.string.categories_title))
+        composeTestRule.awaitTagVisible(TestTags.ADD_CATEGORY_BUTTON)
+
+        captureStoreScreenshot("screen_04_categories")
+    }
+
+    @Test
+    fun screen_05_settings_privacy() {
+        openSettings()
+        // Scroll to the next node after the privacy section to ensure the whole section is visible.
+        composeTestRule.onNodeWithTag(TestTags.SETTINGS_CONTACT_ROW)
+            .performScrollTo()
+        composeTestRule.awaitTagVisible(TestTags.SETTINGS_CRASH_REPORTING_TOGGLE)
+
+        captureStoreScreenshot("screen_05_settings_privacy")
+    }
+
+    @Test
+    fun screen_06_paywall_dialog() {
+        setBillingOverride(DebugBillingOverrideMode.FORCE_FREE)
+        composeTestRule.onNodeWithTag(TestTags.ADD_VEHICLE_FAB).performClick()
+        composeTestRule.awaitTagVisible(TestTags.PAYWALL_INFO_SHEET)
+        composeTestRule.awaitText(composeTestRule.activity.getString(R.string.paywall_sheet_headline))
+
+        captureStoreScreenshot("screen_06_paywall_dialog")
+    }
+
+    private fun openVehicleDetail() {
+        composeTestRule.awaitText(DEMO_VEHICLE_NAME)
+        composeTestRule.onNode(hasText(DEMO_VEHICLE_NAME) and hasClickAction())
+            .performScrollTo()
+            .performClick()
+        composeTestRule.awaitTagVisible(TestTags.ADD_RECORD_FAB)
+    }
+
+    private fun openSettings() {
+        composeTestRule.awaitTagVisible(TestTags.SETTINGS_BUTTON)
+        composeTestRule.onNodeWithTag(TestTags.SETTINGS_BUTTON).performClick()
+        composeTestRule.awaitText(composeTestRule.activity.getString(R.string.settings_title))
+    }
+
+    private fun setBillingOverride(mode: DebugBillingOverrideMode) {
+        val app = composeTestRule.activity.application as com.yorvana.YorvanaApplication
+        runBlocking {
+            app.debugBillingOverride?.setMode(mode)
+        }
+        composeTestRule.waitForIdle()
+    }
+
+    private companion object {
+        const val DEMO_VEHICLE_NAME = "2019 Honda Civic"
+    }
+}
diff --git a/app/src/androidTest/java/com/yorvana/testsupport/DemoMode.kt b/app/src/androidTest/java/com/yorvana/testsupport/DemoMode.kt
new file mode 100644
index 0000000..d758215
--- /dev/null
+++ b/app/src/androidTest/java/com/yorvana/testsupport/DemoMode.kt
@@ -0,0 +1,71 @@
+package com.yorvana.testsupport
+
+import androidx.test.platform.app.InstrumentationRegistry
+import java.io.FileInputStream
+
+object DemoMode {
+    private var originalNavMode: String? = null
+
+    fun enter() {
+        runShell("cmd uimode night no")
+
+        // Capture original state before modifying
+        originalNavMode = runShell("settings get secure navigation_mode").trim()
+
+        // Force Gesture Navigation via settings and overlay
+        runShell("settings put secure navigation_mode 2")
+        runShell("cmd overlay enable com.android.internal.systemui.navbar.gestural")
+
+        runShell("settings put global sysui_demo_allowed 1")
+        runShell("am broadcast -a com.android.systemui.demo -e command enter")
+        runShell("am broadcast -a com.android.systemui.demo -e command clock -e hhmm 0900")
+        runShell("am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false")
+        runShell("am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4")
+        runShell("am broadcast -a com.android.systemui.demo -e command network -e mobile show -e datatype none -e level 4")
+        runShell("am broadcast -a com.android.systemui.demo -e command notifications -e visible false")
+
+        // Poll for gesture navigation to be active (max 5s)
+        var settled = false
+        for (i in 0..50) {
+            val mode = runShell("settings get secure navigation_mode").trim()
+            if (mode == "2") {
+                settled = true
+                break
+            }
+            Thread.sleep(100)
+        }
+        if (!settled) {
+            android.util.Log.w("DemoMode", "Navigation mode failed to settle on '2' (gesture)")
+        }
+        // Small extra delay for SystemUI animations to finish
+        Thread.sleep(500)
+    }
+
+    fun exit() {
+        val capturedMode = originalNavMode?.trim()
+        val restoreMode = if (capturedMode !in setOf("0", "1", "2")) "0" else capturedMode!!
+
+        if (restoreMode == "2") {
+            runShell("cmd overlay enable com.android.internal.systemui.navbar.gestural")
+        } else {
+            runShell("cmd overlay enable com.android.internal.systemui.navbar.threebutton")
+        }
+        runShell("settings put secure navigation_mode $restoreMode")
+        runShell("am broadcast -a com.android.systemui.demo -e command exit")
+    }
+
+    fun ensureOutputDirectory() {
+        runShell("mkdir -p ${ScreenshotConstants.DEVICE_SCREENSHOT_DIR}")
+    }
+
+    fun runShell(command: String): String {
+        val automation = InstrumentationRegistry.getInstrumentation().uiAutomation
+        val descriptor = automation.executeShellCommand(command)
+        return try {
+            FileInputStream(descriptor.fileDescriptor).use { it.readBytes() }
+                .toString(Charsets.UTF_8)
+        } finally {
+            descriptor.close()
+        }
+    }
+}
diff --git a/app/src/androidTest/java/com/yorvana/testsupport/VaultTestSetup.kt b/app/src/androidTest/java/com/yorvana/testsupport/VaultTestSetup.kt
new file mode 100644
index 0000000..d15a690
--- /dev/null
+++ b/app/src/androidTest/java/com/yorvana/testsupport/VaultTestSetup.kt
@@ -0,0 +1,42 @@
+package com.yorvana.testsupport
+
+import android.net.Uri
+import com.yorvana.R
+import com.yorvana.YorvanaApplication
+import com.yorvana.data.preferences.CURRENT_CONSENT_VERSION
+import com.yorvana.data.preferences.DebugBillingOverrideMode
+import com.yorvana.util.CrashReporter
+import kotlinx.coroutines.runBlocking
+import java.io.File
+
+fun MainActivityComposeRule.resetYorvanaState() {
+    val app = activity.application as YorvanaApplication
+    runBlocking {
+        app.vaultStorage.clearVault()
+        app.preferences.setVaultUri(null)
+        app.preferences.setCrashReportingConsentPromptShownVersion(0)
+        app.preferences.setCrashReportingEnabled(false)
+        CrashReporter.clear(app)
+        app.debugBillingOverride?.setMode(DebugBillingOverrideMode.NONE)
+    }
+}
+
+fun MainActivityComposeRule.installFreshVault(
+    vaultName: String = "test_vault",
+    seed: ((File) -> Unit)? = null,
+) {
+    val app = activity.application as YorvanaApplication
+    val vaultFile = File(activity.filesDir, vaultName)
+    vaultFile.deleteRecursively()
+    vaultFile.mkdirs()
+    seed?.invoke(vaultFile)
+
+    val uri = Uri.fromFile(vaultFile)
+    runBlocking {
+        app.preferences.setCrashReportingConsentPromptShownVersion(CURRENT_CONSENT_VERSION)
+        app.preferences.setVaultUri(uri.toString())
+        app.applyVaultUri(uri.toString())
+    }
+    waitForIdle()
+    awaitText(activity.getString(R.string.my_garage), timeoutMillis = 15_000)
+}
diff --git a/distribution/store-listing.md b/distribution/store-listing.md
index e232a3a..e2a6a59 100644
--- a/distribution/store-listing.md
+++ b/distribution/store-listing.md
@@ -151,11 +151,7 @@ Suggested screen order (each captures a different value prop):
    privacy-first message.
 6. **Paywall / upgrade dialog** — sets expectations honestly before install.

-Capture from a real device or emulator (Pixel 6 / 7 form factor is a good
-default). Use the existing Roborazzi screenshots in
-`app/src/test/screenshots` as a guide for which screens to feature, but
-**re-capture at full device resolution** — Roborazzi images are sized for
-diffing, not marketing.
+Generate the checked-in screenshots with the store screenshot task below.

 ### 7-inch tablet screenshots — optional but recommended

@@ -170,9 +166,7 @@ diffing, not marketing.
 - **Format**: 24-bit PNG (no alpha) or JPEG
 - **Count**: up to 8

-Skipping tablet screenshots is fine — Yorvana works on tablets but the
-phone-first UX is the target experience. If you skip them, Play will show
-phone screenshots scaled up on tablet devices.
+Tablet screenshots are generated by the same task as phone screenshots.

 ### Promo video — optional

@@ -191,10 +185,39 @@ distribution/
     play-icon-512.png
     play-feature-1024x500.png
     screenshots/
-      01-vehicle-list.png
-      02-vehicle-detail.png
-      03-add-record.png
-      04-categories.png
-      05-privacy.png
-      06-paywall.png
+      phone/
+        screen_01_vehicle_list.png
+        screen_02_vehicle_detail.png
+        screen_03_add_record.png
+        screen_04_categories.png
+        screen_05_settings_privacy.png
+        screen_06_paywall_dialog.png
+      tablet-7/
+        screen_01_vehicle_list.png
+        ...
+      tablet-10/
+        screen_01_vehicle_list.png
+        ...
 ```
+
+## Generating screenshots
+
+Run:
+
+```bash
+./gradlew generateStoreScreenshots -PscreenshotBuild
+```
+
+> [!IMPORTANT]
+> Always use the `-PscreenshotBuild` flag for final marketing assets. It pivots
+> the environment to the `release` build type, ensuring developer-only UI
+> (like the debug settings panel) is excluded and high-fidelity rendering is
+> used.
+
+The task runs the instrumented store screenshot suite on Pixel 6, Nexus 7, and
+Pixel Tablet Gradle Managed Devices, then copies 18 PNGs into
+`distribution/store-assets/screenshots/{phone,tablet-7,tablet-10}/`.
+
+The first run may take about 15 minutes while Android downloads and prepares
+system images. Warm runs are typically around 5 minutes on a machine with KVM
+available.


<turn_aborted>
The user interrupted the previous turn on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.
</turn_aborted>