@capgo/cli 8.22.1 → 8.23.1

package/dist/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capgo/cli",
   "type": "module",
-  "version": "8.22.1",
+  "version": "8.23.1",
   "description": "A CLI to upload to capgo servers",
   "author": "Martin martin@capgo.app",
   "license": "Apache 2.0",
@@ -72,6 +72,7 @@
     "test:regex": "bun test/test-regex-validation.mjs",
     "test:upload": "bun test/test-upload-validation.mjs",
     "test:fail-on-incompatible": "bun test/test-fail-on-incompatible.mjs",
+    "test:native-dependencies": "bun test/test-native-dependencies.mjs",
     "test:credentials": "bun test/test-credentials.mjs",
     "test:asc-key-protocol": "bun test/test-asc-key-protocol.mjs",
     "test:credentials-validation": "bun test/test-credentials-validation.mjs",
@@ -156,7 +157,7 @@
     "test:ios-verify-app": "bun test/test-ios-verify-app.mjs",
     "test:platform-flow-contract": "bun test/test-platform-flow-contract.mjs",
     "test:tail-engine-shared": "bun test/test-tail-engine-shared.mjs",
-    "test": "bun run build && bun run test:helper-dce && bun run test:version-detection:setup && bun run test:bundle && bun run test:functional && bun run test:semver && bun run test:version-edge-cases && bun run test:regex && bun run test:upload && bun run test:fail-on-incompatible && bun run test:credentials && bun run test:credentials-validation && bun run test:android-service-account-validation && bun run test:build-zip-filter && bun run test:checksum && bun run test:build-needed && bun run test:ci-prompts && bun run test:ci-secrets && bun run test:android-onboarding-progress && bun run test:onboarding-telemetry && bun run test:v2-event-migration && bun run test:analytics && bun run test:analytics-error-category && bun run test:analytics-org-resolver && bun run test:supabase-perf && bun run test:preview-qr && bun run test:app-set-options && bun run test:mcp-analytics && bun run test:mcp-instructions && bun run test:mcp-live-update-onboarding && bun run test:mcp-stdout-guard && bun run test:mcp-platform-select && bun run test:mcp-explain-scopes && bun run test:mcp-oauth-reopen && bun run test:mcp-broker-oauth && bun run test:mcp-broker-session && bun run test:mcp-credentials-manage && bun run test:mcp-resume-prompt && bun run test:mcp-build-job && bun run test:mcp-build-tools && bun run test:app-created-source && bun run test:doctor-analytics && bun run test:posthog-exception && bun run test:build-platform-selection && bun run test:onboarding-recovery && bun run test:onboarding-progress && bun run test:onboarding-run-targets && bun run test:run-device-command && bun run test:init-app-conflict && bun run test:init-guardrails && bun run test:init-replay && bun run test:prompt-preferences && bun run test:esm-sdk && bun run test:mcp && bun run test:mcp-no-key-handshake && bun run test:auth-session && bun run test:version-detection && bun run test:platform-paths && bun run test:project-type-detection && bun run test:payload-split && bun run test:manifest-path-encoding && bun run test:macos-signing && bun run test:asc-key-protocol && bun run test:apple-api-import-helpers && bun run test:apple-api-verify-key && bun run test:bundle-id-detector && bun run test:apple-api-app-list && bun run test:app-verification && bun run test:pbxproj-parser && bun run test:ai-log-capture && bun run test:ai-analyze-flow && bun run test:cicd-failure-help && bun run test:ai-sse-parser && bun run test:ai-render-markdown && bun run test:ai-stream-markdown && bun run test:ai-onboarding-mode && bun run test:ai-fit && bun run test:platform-layout && bun run test:frame-fit && bun run test:onboarding-min-size && bun run test:min-size-gate && bun run test:shell-size-gate && bun run test:build-log-sanitize && bun run test:build-output-viewport && bun run test:diff-viewer-viewport && bun run test:build-complete-exit && bun run test:ai-analyze-stream && bun run test:support-mailto && bun run test:support-redact && bun run test:support-internal-log && bun run test:support-help-menu && bun run test:support-contact && bun run test:support-upload-prompt && bun run test:support-bundle-files && bun run test:self-update && bun run test:update-prompt && bun run test:apple-api-cert-create && bun run test:android-tail-engine && bun run test:android-tail-render && bun run test:android-tail-routing && bun run test:dev-gate-stripped && bun run test:frame-fit-ios-shared && bun run test:ios-confirm-app-id && bun run test:ios-create-new && bun run test:ios-e2e && bun run test:ios-flow-contract && bun run test:ios-import-discovery && bun run test:ios-import-export && bun run test:ios-import-pickers && bun run test:ios-import-recovery && bun run test:ios-recovery && bun run test:ios-resume && bun run test:ios-tail-handoff && bun run test:ios-tui-render && bun run test:p8-error && bun run test:ios-tui-routing && bun run test:ios-updater-sync-validation && bun run test:ios-verify-app && bun run test:platform-flow-contract && bun run test:tail-engine-shared && bun run test:prescan",
+    "test": "bun run build && bun run test:helper-dce && bun run test:version-detection:setup && bun run test:bundle && bun run test:functional && bun run test:semver && bun run test:version-edge-cases && bun run test:regex && bun run test:upload && bun run test:fail-on-incompatible && bun run test:native-dependencies && bun run test:credentials && bun run test:credentials-validation && bun run test:android-service-account-validation && bun run test:build-zip-filter && bun run test:checksum && bun run test:build-needed && bun run test:ci-prompts && bun run test:ci-secrets && bun run test:android-onboarding-progress && bun run test:onboarding-telemetry && bun run test:v2-event-migration && bun run test:analytics && bun run test:analytics-error-category && bun run test:analytics-org-resolver && bun run test:supabase-perf && bun run test:preview-qr && bun run test:app-set-options && bun run test:mcp-analytics && bun run test:mcp-instructions && bun run test:mcp-live-update-onboarding && bun run test:mcp-stdout-guard && bun run test:mcp-platform-select && bun run test:mcp-explain-scopes && bun run test:mcp-oauth-reopen && bun run test:mcp-broker-oauth && bun run test:mcp-broker-session && bun run test:mcp-credentials-manage && bun run test:mcp-resume-prompt && bun run test:mcp-build-job && bun run test:mcp-build-tools && bun run test:app-created-source && bun run test:doctor-analytics && bun run test:posthog-exception && bun run test:build-platform-selection && bun run test:onboarding-recovery && bun run test:onboarding-progress && bun run test:onboarding-run-targets && bun run test:run-device-command && bun run test:init-app-conflict && bun run test:init-guardrails && bun run test:init-replay && bun run test:prompt-preferences && bun run test:esm-sdk && bun run test:mcp && bun run test:mcp-no-key-handshake && bun run test:auth-session && bun run test:version-detection && bun run test:platform-paths && bun run test:project-type-detection && bun run test:payload-split && bun run test:manifest-path-encoding && bun run test:macos-signing && bun run test:asc-key-protocol && bun run test:apple-api-import-helpers && bun run test:apple-api-verify-key && bun run test:bundle-id-detector && bun run test:apple-api-app-list && bun run test:app-verification && bun run test:pbxproj-parser && bun run test:ai-log-capture && bun run test:ai-analyze-flow && bun run test:cicd-failure-help && bun run test:ai-sse-parser && bun run test:ai-render-markdown && bun run test:ai-stream-markdown && bun run test:ai-onboarding-mode && bun run test:ai-fit && bun run test:platform-layout && bun run test:frame-fit && bun run test:onboarding-min-size && bun run test:min-size-gate && bun run test:shell-size-gate && bun run test:build-log-sanitize && bun run test:build-output-viewport && bun run test:diff-viewer-viewport && bun run test:build-complete-exit && bun run test:ai-analyze-stream && bun run test:support-mailto && bun run test:support-redact && bun run test:support-internal-log && bun run test:support-help-menu && bun run test:support-contact && bun run test:support-upload-prompt && bun run test:support-bundle-files && bun run test:self-update && bun run test:update-prompt && bun run test:apple-api-cert-create && bun run test:android-tail-engine && bun run test:android-tail-render && bun run test:android-tail-routing && bun run test:dev-gate-stripped && bun run test:frame-fit-ios-shared && bun run test:ios-confirm-app-id && bun run test:ios-create-new && bun run test:ios-e2e && bun run test:ios-flow-contract && bun run test:ios-import-discovery && bun run test:ios-import-export && bun run test:ios-import-pickers && bun run test:ios-import-recovery && bun run test:ios-recovery && bun run test:ios-resume && bun run test:ios-tail-handoff && bun run test:ios-tui-render && bun run test:p8-error && bun run test:ios-tui-routing && bun run test:ios-updater-sync-validation && bun run test:ios-verify-app && bun run test:platform-flow-contract && bun run test:tail-engine-shared && bun run test:prescan && bun run test:android-reporting-api && bun run test:android-app-verification && bun run test:android-rename",
     "test:build-platform-selection": "bun test/test-build-platform-selection.mjs",
     "test:ai-log-capture": "bun test/test-ai-log-capture.mjs",
     "test:ai-analyze-flow": "bun test/test-ai-analyze-flow.mjs",
@@ -184,6 +185,9 @@
     "test:support-upload-prompt": "bun test/test-support-upload-prompt.mjs",
     "test:support-bundle-files": "bun test/test-support-bundle-files.mjs",
     "test:mcp-live-update-onboarding": "bun test/test-mcp-live-update-onboarding.mjs",
+    "test:android-reporting-api": "bun test/test-android-reporting-api.mjs",
+    "test:android-app-verification": "bun test/test-android-app-verification.mjs",
+    "test:android-rename": "bun test/test-android-rename.mjs",
     "test:app-set-options": "bun test/test-app-set-options.mjs"
   },
   "dependencies": {

package/dist/src/build/onboarding/android/android-rename.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Pinned `@trapezedev/project` version installed on demand into the temp rename
+ * workspace. Trapeze is NOT bundled with the CLI (keeps it lean) — it's only
+ * installed when the user explicitly opts into the rename. Pinned so the rename
+ * behavior is reproducible.
+ */
+export declare const TRAPEZE_PROJECT_VERSION = "7.1.4";
+export interface RenameWorkspaceFiles {
+    /** Contents of the temp `package.json` (`type: module` + pinned Trapeze). */
+    packageJson: string;
+    /** Contents of the `rename.mjs` script run as `node rename.mjs <appId>`. */
+    renameMjs: string;
+}
+/**
+ * Build the two files written into the temp rename workspace.
+ *
+ * The `rename.mjs` script runs the proven 3-call Trapeze sequence — ALWAYS all
+ * three setters (`setPackageName` + `setApplicationId` + `setNamespace`).
+ * Skipping `namespace` is not an option: AGP 8 requires it, and a package move
+ * with a stale namespace breaks `R`/`BuildConfig` imports and fails the build.
+ * The `appId` is read from `process.argv[2]` so the caller passes the target
+ * package as a CLI argument rather than templating it into the script.
+ *
+ * `pkg` is accepted for symmetry / future validation but is intentionally NOT
+ * interpolated into the script — the appId always flows in via argv at runtime,
+ * which avoids any string-injection of an attacker-controlled package into the
+ * generated JS.
+ *
+ * `androidDir` is the resolved native directory (from capacitor.config; it may be
+ * a non-default path like `apps/mobile/platforms/android-native`). It is baked
+ * into the MobileProject config JSON-escaped so the rename targets the CONFIGURED
+ * native project, never a hardcoded `./android` (which could mutate a stale tree).
+ */
+export declare function buildRenameWorkspaceFiles(pkg: string, androidDir: string): RenameWorkspaceFiles;
+/** Whether Android Studio is holding the project's native files open. */
+export type AndroidStudioState = 'running' | 'not-running' | 'unknown';
+/**
+ * Pure predicate for the close-Android-Studio gate. Editing native files while
+ * Studio holds them open risks a half-written project / Studio clobbering the
+ * change.
+ *
+ * Only macOS can be determined here: `pgrep -f "Android Studio"` is the source
+ * of `pgrepOutput`, so a non-empty (trimmed) result means it's running and an
+ * empty one means it's closed. On any other platform we can't reliably probe,
+ * so the caller falls back to a one-time confirm → `unknown`.
+ */
+export declare function isAndroidStudioRunning(platform: string, pgrepOutput: string): AndroidStudioState;
+/**
+ * Verify the rename landed: re-read Gradle ids (via `findAndroidApplicationIds`,
+ * which returns `string[]`) and confirm the list now contains the target
+ * package. Returns `false` so the caller surfaces output + a manual fallback
+ * instead of claiming a false success.
+ */
+export declare function verifyRenamed(gradleIds: string[], target: string): boolean;

package/dist/src/build/onboarding/android/app-verification-android.d.ts

@@ -0,0 +1,44 @@
+/** Minimal shape of a Play Store app needed for reconciliation. */
+export interface PlayAppLike {
+    packageName: string;
+    displayName: string;
+}
+/**
+ * Reconcile outcome for the Android package-select step.
+ *
+ * - `exact-match`     — a Play app's `packageName` == a single clean Gradle id.
+ *                       Auto-confirm, no picker. Carries the matched package.
+ * - `wrong-build-id`  — apps exist but the build id matches none → Path A picker.
+ * - `no-app`          — no Play apps at all → Path B (create the app).
+ * - `multi-gradle`    — several Gradle flavors and no clean single match → force
+ *                       the picker so the user disambiguates.
+ */
+export type AndroidReconcileResult = {
+    kind: 'exact-match';
+    packageName: string;
+} | {
+    kind: 'wrong-build-id';
+} | {
+    kind: 'no-app';
+} | {
+    kind: 'multi-gradle';
+};
+export interface ReconcileAndroidAppInput {
+    /** Every distinct `applicationId` found in the project's Gradle files (≥0). */
+    gradleIds: string[];
+    /** Apps that actually exist in the user's Play Console. */
+    apps: PlayAppLike[];
+}
+/**
+ * Pure reconciliation of the Android app-existence invariant.
+ *
+ * The common Capacitor case is a single Gradle id, which defers entirely to the
+ * shared iOS classifier (`packageName` ↦ `bundleId`). Android has no
+ * Developer-portal registration split, so both iOS `no-app-*` results collapse
+ * to a single `no-app` route.
+ *
+ * Multiple Gradle ids are handled here: exactly one matching a Play app is
+ * still a clean single match (`exact-match`); zero apps is `no-app`; anything
+ * else forces the picker (`multi-gradle`).
+ */
+export declare function reconcileAndroidApp(input: ReconcileAndroidAppInput): AndroidReconcileResult;

package/dist/src/build/onboarding/android/flow.d.ts

@@ -46,6 +46,18 @@ export interface AndroidStepView {
 export interface AndroidStepCtx {
     appId: string;
     detectedPackageIds?: string[];
+    /**
+     * android-app-verify transient: the user's real Play Store apps (apps:search)
+     * + the reconcile outcome for the chosen package. Set in the effect's
+     * transient ONLY when the chosen package is not an exact match (and the
+     * fetch succeeded), so the view renders the create-app / re-check gate.
+     * Absent → the step is still auto (run the fetch) or already advanced.
+     */
+    playVerifyApps?: {
+        packageName: string;
+        displayName: string;
+    }[];
+    playVerifyOutcome?: 'no-app' | 'wrong-build-id' | 'multi-gradle';
     gcpProjects?: {
         projectId: string;
         name: string;
@@ -209,6 +221,9 @@ export type AndroidInput = {
     packageName: string;
     source: 'gradle' | 'capacitor-config' | 'user-input';
     serviceAccountMethod: 'generate' | 'existing';
+} | {
+    step: 'android-app-verify';
+    verifyAction: 'open' | 'recheck' | 'cancel' | 'proceed';
 } | {
     step: 'ci-secrets-setup';
     value: 'retry' | 'skip';
@@ -320,6 +335,17 @@ export interface AndroidEffectDeps {
      * Mirrors gcp-api.ts: listProjects(accessToken).
      */
     listProjects: (accessToken: string) => Promise<GcpProject[]>;
+    /**
+     * List the user's Play Store apps via the Play Developer Reporting API
+     * (apps:search). OPTIONAL — present only when the optional
+     * playdeveloperreporting scope was granted; absent → android-app-verify
+     * degrades (advances without verifying, never blocks). Mirrors
+     * reporting-api.ts: listPlayApps(accessToken).
+     */
+    listPlayApps?: (accessToken: string) => Promise<{
+        packageName: string;
+        displayName: string;
+    }[]>;
     /**
      * Create a GCP project and wait for the operation to finish.
      * Mirrors gcp-api.ts: createProject(accessToken, projectId, displayName).

package/dist/src/build/onboarding/android/oauth-google.d.ts

@@ -8,6 +8,13 @@ export interface GoogleOAuthConfig {
      */
     clientSecret?: string;
     scopes: readonly string[];
+    /**
+     * Subset of `scopes` whose absence must FAIL sign-in (throw
+     * MissingScopesError). Scopes in `scopes` but NOT here are OPTIONAL — the user
+     * may decline them on the consent screen and sign-in still succeeds; the
+     * caller is responsible for degrading gracefully. Defaults to all `scopes`.
+     */
+    requiredScopes?: readonly string[];
     /** Extra params to include on the auth URL (e.g. `login_hint`, `prompt`). */
     extraAuthParams?: Record<string, string>;
 }
@@ -111,6 +118,18 @@ export declare class MissingScopesError extends Error {
  * order in `requestedScopes` is not preserved. Empty strings are filtered out.
  */
 export declare function findMissingScopes(grantedScope: string, requestedScopes: readonly string[]): string[];
+export interface MissingScopeSplit {
+    /** Required scopes the user didn't grant — sign-in must fail with a retry. */
+    missingRequired: string[];
+    /** Optional scopes the user declined — proceed, but tell them what they lose. */
+    skippedOptional: string[];
+}
+/**
+ * Split the requested-but-not-granted scopes into the required ones (block
+ * sign-in → MissingScopesError) and the optional ones (sign-in proceeds; the
+ * success page + caller warn about the degraded behavior).
+ */
+export declare function splitMissingScopes(grantedScope: string, scopes: readonly string[], requiredScopes: readonly string[]): MissingScopeSplit;
 export interface LoopbackCallbackResult {
     /** Authorization code Google returned in the query string. */
     code: string;

package/dist/src/build/onboarding/android/oauth-scopes.d.ts

@@ -1,4 +1,10 @@
 /** OAuth scopes for Capgo Android onboarding — androidpublisher (Play) plus
- *  cloud-platform (create GCP projects / service accounts / keys). Shared by the
- *  Ink wizard and the MCP bridge so the two drivers can never drift. */
-export declare const OAUTH_SCOPES_FOR_ONBOARDING: readonly ["openid", "https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/androidpublisher", "https://www.googleapis.com/auth/cloud-platform"];
+ *  cloud-platform (create GCP projects / service accounts / keys), and the
+ *  OPTIONAL playdeveloperreporting scope used by the app-existence verification
+ *  step (apps:search). Shared by the Ink wizard and the MCP bridge so the two
+ *  drivers can never drift. */
+export declare const OAUTH_SCOPES_FOR_ONBOARDING: readonly ["openid", "https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/androidpublisher", "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/playdeveloperreporting"];
+/** The subset of {@link OAUTH_SCOPES_FOR_ONBOARDING} whose absence must FAIL
+ *  sign-in. Excludes the optional playdeveloperreporting scope so a user who
+ *  declines app-listing still completes onboarding (graceful degradation). */
+export declare const OAUTH_REQUIRED_SCOPES: readonly ["openid", "https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/androidpublisher", "https://www.googleapis.com/auth/cloud-platform"];

package/dist/src/build/onboarding/android/reporting-api.d.ts

@@ -0,0 +1,50 @@
+/**
+ * A Play Store app record as returned by `apps:search`. Used by the Android
+ * app-verification step to check whether an app exists whose `packageName`
+ * matches the project's Gradle `applicationId`.
+ */
+export interface PlayApp {
+    packageName: string;
+    displayName: string;
+}
+/**
+ * Parse an `apps:search` response into {@link PlayApp} records. Tolerant of a
+ * missing `apps` array and of individual apps missing `displayName` — Google
+ * omits fields rather than nulling them, and a malformed page must never throw
+ * into the wizard (the whole feature degrades gracefully).
+ *
+ * Entries missing `packageName` are DROPPED: the package is the join key for
+ * reconciliation, and letting an empty one through could spuriously
+ * "exact-match" a project whose Gradle parse found no applicationId. The API
+ * documents `packageName` as always present, so this only guards malformed
+ * pages.
+ */
+export declare function parseAppsSearchResponse(json: any): PlayApp[];
+/**
+ * Carries the HTTP status alongside the message so callers can distinguish a
+ * 403 (scope not granted / Reporting API disabled → graceful degrade to the
+ * plain Gradle picker) from other failures.
+ */
+export declare class ReportingApiHttpError extends Error {
+    readonly status: number;
+    constructor(status: number, message: string);
+}
+/** Injectable fetch — defaults to the global `fetch`, overridable in tests. */
+export type FetchImpl = typeof fetch;
+export interface ListPlayAppsOptions {
+    /**
+     * Override the global `fetch`. Tests inject a stub returning a Response-like
+     * object; production omits this and uses `globalThis.fetch`.
+     */
+    fetchImpl?: FetchImpl;
+}
+/**
+ * List every Play Store app accessible to the signed-in user, following
+ * pagination. Authenticates with the supplied user OAuth access token (must
+ * carry the `playdeveloperreporting` scope).
+ *
+ * `GET …/v1beta1/apps:search?pageSize=1000`, following `nextPageToken` up to
+ * {@link MAX_LIST_PAGES}. Throws {@link ReportingApiHttpError} on a non-OK
+ * response so callers can branch on `.status` (e.g. 403 → degrade).
+ */
+export declare function listPlayApps(accessToken: string, opts?: ListPlayAppsOptions): Promise<PlayApp[]>;

package/dist/src/build/onboarding/android/types.d.ts

@@ -1,5 +1,5 @@
 import type { TailProgress } from '../tail-types.js';
-export type AndroidOnboardingStep = 'welcome' | 'resume-prompt' | 'credentials-exist' | 'backing-up' | 'no-platform' | 'keystore-method-select' | 'keystore-explainer' | 'keystore-existing-path' | 'keystore-existing-picker' | 'keystore-existing-store-password' | 'keystore-existing-detecting-alias' | 'keystore-existing-alias-select' | 'keystore-existing-alias' | 'keystore-existing-key-password' | 'keystore-new-alias' | 'keystore-new-password-method' | 'keystore-new-store-password' | 'keystore-new-key-password' | 'keystore-new-cn' | 'keystore-generating' | 'service-account-method-select' | 'sa-json-existing-path' | 'sa-json-existing-picker' | 'sa-json-validating' | 'sa-json-validation-failed' | 'google-sign-in' | 'google-sign-in-running' | 'play-developer-id-input' | 'gcp-projects-loading' | 'gcp-projects-select' | 'gcp-project-create-name' | 'android-package-select' | 'gcp-setup-running' | 'saving-credentials' | 'detecting-ci-secrets' | 'ci-secrets-setup' | 'ci-secrets-target-select' | 'ask-ci-secrets' | 'checking-ci-secrets' | 'confirm-ci-secret-overwrite' | 'uploading-ci-secrets' | 'ci-secrets-failed' | 'ask-github-actions-setup' | 'confirm-secrets-push' | 'ask-export-env' | 'exporting-env' | 'confirm-env-export-overwrite' | 'overwrite-and-export-env' | 'pick-package-manager' | 'pick-build-script' | 'pick-build-script-custom' | 'preview-workflow-file' | 'view-workflow-diff' | 'writing-workflow-file' | 'ask-build' | 'requesting-build' | 'ai-analysis-prompt' | 'ai-analysis-running' | 'ai-analysis-result' | 'ai-analysis-result-scroll' | 'build-complete' | 'error' | 'support-confirm' | 'support-log-view' | 'support-uploading';
+export type AndroidOnboardingStep = 'welcome' | 'resume-prompt' | 'credentials-exist' | 'backing-up' | 'no-platform' | 'keystore-method-select' | 'keystore-explainer' | 'keystore-existing-path' | 'keystore-existing-picker' | 'keystore-existing-store-password' | 'keystore-existing-detecting-alias' | 'keystore-existing-alias-select' | 'keystore-existing-alias' | 'keystore-existing-key-password' | 'keystore-new-alias' | 'keystore-new-password-method' | 'keystore-new-store-password' | 'keystore-new-key-password' | 'keystore-new-cn' | 'keystore-generating' | 'service-account-method-select' | 'sa-json-existing-path' | 'sa-json-existing-picker' | 'sa-json-validating' | 'sa-json-validation-failed' | 'google-sign-in' | 'google-sign-in-running' | 'play-developer-id-input' | 'gcp-projects-loading' | 'gcp-projects-select' | 'gcp-project-create-name' | 'android-package-select' | 'android-app-verify' | 'gcp-setup-running' | 'saving-credentials' | 'detecting-ci-secrets' | 'ci-secrets-setup' | 'ci-secrets-target-select' | 'ask-ci-secrets' | 'checking-ci-secrets' | 'confirm-ci-secret-overwrite' | 'uploading-ci-secrets' | 'ci-secrets-failed' | 'ask-github-actions-setup' | 'confirm-secrets-push' | 'ask-export-env' | 'exporting-env' | 'confirm-env-export-overwrite' | 'overwrite-and-export-env' | 'pick-package-manager' | 'pick-build-script' | 'pick-build-script-custom' | 'preview-workflow-file' | 'view-workflow-diff' | 'writing-workflow-file' | 'ask-build' | 'requesting-build' | 'ai-analysis-prompt' | 'ai-analysis-running' | 'ai-analysis-result' | 'ai-analysis-result-scroll' | 'build-complete' | 'error' | 'support-confirm' | 'support-log-view' | 'support-uploading';
 export type AndroidOnboardingErrorCategory = 'keystore_invalid' | 'google_oauth_failed' | 'play_account_id_invalid' | 'sa_json_shape_invalid' | 'sa_json_token_rejected' | 'sa_json_no_app_access' | 'sa_json_network_error' | 'unknown';
 export type KeystoreMethod = 'existing' | 'generate';
 export type ServiceAccountMethod = 'existing' | 'generate';
@@ -75,6 +75,14 @@ export interface AndroidOnboardingProgress extends TailProgress {
         playAccountChosen?: PlayDeveloperAccountChoice;
         gcpProjectChosen?: GcpProjectChoice;
         androidPackageChosen?: AndroidPackageChoice;
+        /** Set once the chosen package was verified to exist in the user's Play
+         *  Console (apps:search exact-match), or the user explicitly proceeded past
+         *  a degraded/un-verifiable check. Gates `gcp-setup-running` so the
+         *  per-package SA invite never 400s on a non-existent package. */
+        playAppVerified?: {
+            packageName: string;
+            verified: boolean;
+        };
         serviceAccountProvisioned?: ServiceAccountProvisioned;
         playInviteProvisioned?: PlayInviteProvisioned;
         /** Set once `saving-credentials` wrote credentials.json. Gates tail entry. */

package/dist/src/build/onboarding/mcp/engine.d.ts

@@ -30,6 +30,7 @@ interface OnboardingInput {
     gcpProjectId?: string;
     gcpProjectName?: string;
     androidPackage?: string;
+    androidVerifyAction?: 'open' | 'recheck' | 'cancel' | 'proceed';
     saMethodChoice?: 'retry' | 'save-anyway' | 'oauth';
     /** Set true at google-sign-in to (re)open the browser for a fresh OAuth — recovery when the browser didn't open, was closed, or the sign-in stalled. */
     reopenSignIn?: boolean;

package/dist/src/schemas/onboarding.d.ts

@@ -17,6 +17,12 @@ export declare const onboardingNextStepSchema: z.ZodObject<{
     gcpProjectId: z.ZodOptional<z.ZodString>;
     gcpProjectName: z.ZodOptional<z.ZodString>;
     androidPackage: z.ZodOptional<z.ZodString>;
+    androidVerifyAction: z.ZodOptional<z.ZodEnum<{
+        open: "open";
+        proceed: "proceed";
+        cancel: "cancel";
+        recheck: "recheck";
+    }>>;
     saMethodChoice: z.ZodOptional<z.ZodEnum<{
         retry: "retry";
         oauth: "oauth";