@daemux/store-automator 0.10.9 → 0.10.11

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "App Store & Google Play automation for Flutter apps",
-    "version": "0.10.9"
+    "version": "0.10.11"
   },
   "plugins": [
     {
       "name": "store-automator",
       "source": "./plugins/store-automator",
       "description": "3 agents for app store publishing: reviewer, meta-creator, media-designer",
-      "version": "0.10.9",
+      "version": "0.10.11",
       "keywords": [
         "flutter",
         "app-store",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daemux/store-automator",
-  "version": "0.10.9",
+  "version": "0.10.11",
   "description": "Full App Store & Google Play automation for Flutter apps with Claude Code agents",
   "type": "module",
   "bin": {

package/plugins/store-automator/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "store-automator",
-  "version": "0.10.9",
+  "version": "0.10.11",
   "description": "App Store & Google Play automation agents for Flutter app publishing",
   "author": {
     "name": "Daemux"

package/src/ci-config.mjs

@@ -3,6 +3,35 @@ import { join } from 'node:path';
 
 const CI_CONFIG_FILE = 'ci.config.yaml';
 
+const KEY_TO_CAMEL = {
+  'app.name': 'appName',
+  'app.bundle_id': 'bundleId',
+  'app.package_name': 'packageName',
+  'app.sku': 'sku',
+  'app.apple_id': 'appleId',
+  'credentials.apple.key_id': 'keyId',
+  'credentials.apple.issuer_id': 'issuerId',
+  'credentials.android.keystore_password': 'keystorePassword',
+  'ios.primary_category': 'primaryCategory',
+  'ios.secondary_category': 'secondaryCategory',
+  'ios.price_tier': 'priceTier',
+  'ios.submit_for_review': 'submitForReview',
+  'ios.automatic_release': 'automaticRelease',
+  'android.track': 'track',
+  'android.rollout_fraction': 'rolloutFraction',
+  'android.in_app_update_priority': 'inAppUpdatePriority',
+  'web.domain': 'domain',
+  'web.cloudflare_project_name': 'cfProjectName',
+  'web.tagline': 'tagline',
+  'web.primary_color': 'primaryColor',
+  'web.secondary_color': 'secondaryColor',
+  'web.company_name': 'companyName',
+  'web.contact_email': 'contactEmail',
+  'web.support_email': 'supportEmail',
+  'web.jurisdiction': 'jurisdiction',
+  'metadata.languages': 'languages',
+};
+
 const FIELD_PATTERNS = {
   'app.name': { regex: /^(  name: ).*$/m, replacement: (v) => `  name: "${v}"` },
   'app.bundle_id': { regex: /^(  bundle_id: ).*$/m, replacement: (v) => `  bundle_id: "${v}"` },
@@ -80,26 +109,28 @@ function extractFieldValue(content, regex) {
   return raw;
 }
 
-export function isPlaceholder(value) {
-  if (value === undefined || value === null || value === '') return true;
-  const s = String(value);
-  if (s.startsWith('REPLACE_WITH_')) return true;
-  if (s.startsWith('yourapp')) return true;
-  if (s.startsWith('com.yourcompany.')) return true;
-  if (s === 'your@email.com') return true;
-  return false;
-}
+export { isPlaceholder } from './guide.mjs';
 
 export function readCiConfig(projectDir) {
   const configPath = join(projectDir, CI_CONFIG_FILE);
   if (!existsSync(configPath)) return {};
   const content = readFileSync(configPath, 'utf-8');
-  const config = {};
+  const raw = {};
   for (const [key, { regex }] of Object.entries(FIELD_PATTERNS)) {
     const val = extractFieldValue(content, regex);
-    if (val !== undefined) config[key] = val;
+    if (val !== undefined) raw[key] = val;
+  }
+  raw['metadata.languages'] = extractLanguages(content);
+
+  const config = {};
+  for (const [dotKey, value] of Object.entries(raw)) {
+    const camelKey = KEY_TO_CAMEL[dotKey];
+    if (camelKey) {
+      config[camelKey] = value;
+    } else {
+      config[dotKey] = value;
+    }
   }
-  config['metadata.languages'] = extractLanguages(content);
   return config;
 }
 
@@ -178,11 +209,13 @@ export function writeMatchConfig(projectDir, { deployKeyPath, gitUrl }) {
   const guRegex = /^(\s*git_url:\s*)"[^"]*"/m;
 
   if (deployKeyPath && dpRegex.test(content)) {
-    content = content.replace(dpRegex, `$1"${deployKeyPath}"`);
+    const safe = deployKeyPath.replace(/\$/g, '$$$$');
+    content = content.replace(dpRegex, `$1"${safe}"`);
     changed = true;
   }
   if (gitUrl && guRegex.test(content)) {
-    content = content.replace(guRegex, `$1"${gitUrl}"`);
+    const safe = gitUrl.replace(/\$/g, '$$$$');
+    content = content.replace(guRegex, `$1"${safe}"`);
     changed = true;
   }
   if (changed) writeFileSync(configPath, content, 'utf-8');

package/src/guide.mjs

@@ -1,4 +1,3 @@
-import { createInterface } from 'node:readline';
 import { existsSync } from 'node:fs';
 
 const BOLD = '\x1b[1m';
@@ -7,14 +6,18 @@ const YELLOW = '\x1b[33m';
 const GREEN = '\x1b[32m';
 const RESET = '\x1b[0m';
 
-function isNonInteractive() {
+export function isNonInteractive() {
   return Boolean(process.env.npm_config_yes) || process.argv.includes('--postinstall');
 }
 
-export function printGuide(title, steps) {
+export function printSectionHeader(title) {
   console.log('');
   console.log(`${BOLD}${CYAN}=== ${title} ===${RESET}`);
   console.log('');
+}
+
+export function printGuide(title, steps) {
+  printSectionHeader(title);
   for (let i = 0; i < steps.length; i++) {
     console.log(`  ${i + 1}. ${steps[i]}`);
   }
@@ -43,7 +46,9 @@ export function verifyFileExists(filePath, description) {
   return false;
 }
 
-export async function runGuide(rl, guide) {
+export async function runGuide(rl, guide, { skip = false } = {}) {
+  if (skip || isNonInteractive()) return 'skip';
+
   printGuide(guide.title, guide.steps);
 
   if (guide.verifyPath) {
@@ -61,8 +66,9 @@ export async function runGuide(rl, guide) {
   return 'yes';
 }
 
-export function askQuestion(rl, question, defaultValue) {
+export function askQuestion(rl, question, defaultValue, { skipIfFilled = false } = {}) {
   if (isNonInteractive()) return Promise.resolve(defaultValue || '');
+  if (skipIfFilled && defaultValue) return Promise.resolve(defaultValue);
 
   const suffix = defaultValue ? ` [${defaultValue}]` : '';
   return new Promise((resolve) => {
@@ -72,11 +78,24 @@ export function askQuestion(rl, question, defaultValue) {
   });
 }
 
+export function getDefault(key, cliFlags, currentConfig) {
+  if (cliFlags[key] !== undefined) return cliFlags[key];
+  const configVal = currentConfig[key];
+  if (!isPlaceholder(configVal)) return configVal;
+  return '';
+}
+
+export function getDefaultWithFallback(key, cliFlags, currentConfig, fallback) {
+  const val = getDefault(key, cliFlags, currentConfig);
+  return val !== '' ? val : fallback;
+}
+
 export function isPlaceholder(value) {
   if (value === undefined || value === null || value === '') return true;
   const s = String(value);
   if (s.startsWith('REPLACE_WITH_')) return true;
   if (s.startsWith('yourapp')) return true;
   if (s.startsWith('com.yourcompany.')) return true;
+  if (s === 'your@email.com') return true;
   return false;
 }

package/src/install-paths.mjs

@@ -11,7 +11,7 @@ export function installGitHubActionsPath(projectDir, packageDir, cliTokens) {
   });
 
   const wrote = writeMatchConfig(projectDir, {
-    deployKeyPath: cliTokens.matchDeployKey,
+    deployKeyPath: cliTokens.matchDeployKeyPath,
     gitUrl: cliTokens.matchGitUrl,
   });
   if (wrote) console.log('Match credentials written to ci.config.yaml');

package/src/install.mjs

@@ -11,7 +11,7 @@ import { injectEnvVars, injectStatusLine } from './settings.mjs';
 import { promptAll } from './prompt.mjs';
 import { getMcpServers, writeMcpJson } from './mcp-setup.mjs';
 import { installClaudeMd, installCiTemplates, installFirebaseTemplates } from './templates.mjs';
-import { readCiConfig, writeCiFields, writeCiLanguages, isPlaceholder } from './ci-config.mjs';
+import { readCiConfig, writeCiFields, writeCiLanguages, writeMatchConfig, isPlaceholder } from './ci-config.mjs';
 import { installGitHubActionsPath } from './install-paths.mjs';
 
 function checkClaudeCli() {
@@ -152,16 +152,13 @@ function printNextSteps(prompted) {
   }
 }
 
-function isNonInteractive() {
-  return Boolean(process.env.npm_config_yes) || process.argv.includes('--postinstall');
-}
-
 export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   checkClaudeCli();
 
   console.log('Installing/updating Daemux Store Automator...');
 
   const isGitHubActions = Boolean(cliTokens.githubActions);
+  const nonInteractive = Boolean(process.env.npm_config_yes) || process.argv.includes('--postinstall');
   const projectDir = process.cwd();
   const oldVersion = readMarketplaceVersion();
   const packageDir = getPackageDir();
@@ -184,11 +181,21 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   // 4. Run interactive prompts (or use CLI flags / skip in non-interactive)
   let prompted;
   if (isGitHubActions) {
-    prompted = { bundleId: cliTokens.bundleId ?? '' };
-  } else if (isNonInteractive()) {
+    prompted = {
+      bundleId: cliTokens.bundleId ?? '',
+      matchDeployKeyPath: cliTokens.matchDeployKey,
+      matchGitUrl: cliTokens.matchGitUrl,
+    };
+  } else if (nonInteractive) {
     prompted = { ...cliTokens };
   } else {
-    prompted = await promptAll(cliTokens, currentConfig, projectDir);
+    const { createInterface } = await import('node:readline');
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+      prompted = await promptAll(rl, cliTokens, currentConfig, projectDir);
+    } finally {
+      rl.close();
+    }
   }
 
   // 5. Write all prompted values to ci.config.yaml
@@ -196,6 +203,14 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   const wrote = writeCiFields(projectDir, ciFields);
   if (wrote) console.log('Configuration written to ci.config.yaml');
 
+  if (prompted.matchDeployKeyPath || prompted.matchGitUrl) {
+    const wroteMatch = writeMatchConfig(projectDir, {
+      deployKeyPath: prompted.matchDeployKeyPath,
+      gitUrl: prompted.matchGitUrl,
+    });
+    if (wroteMatch) console.log('Match credentials written to ci.config.yaml');
+  }
+
   // 6. Handle languages separately
   if (prompted.languages) {
     const langStr = Array.isArray(prompted.languages)
@@ -220,7 +235,7 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
 
   installClaudeMd(join(baseDir, 'CLAUDE.md'), packageDir, prompted.appName);
 
-  installGitHubActionsPath(projectDir, packageDir, cliTokens);
+  installGitHubActionsPath(projectDir, packageDir, prompted);
 
   const scopeLabel = scope === 'user' ? 'global' : 'project';
   console.log(`Configuring ${scopeLabel} settings...`);
@@ -229,14 +244,14 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   injectStatusLine(settingsPath);
 
   // 8. Run post-install guides (interactive only)
-  if (!isGitHubActions && !isNonInteractive()) {
+  if (!isGitHubActions && !nonInteractive) {
     const { createInterface } = await import('node:readline');
-    const { runPostInstallGuides } = await import('./prompts/store-settings.mjs');
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const guideRl = createInterface({ input: process.stdin, output: process.stdout });
     try {
-      await runPostInstallGuides(rl);
+      const { runPostInstallGuides } = await import('./prompts/store-settings.mjs');
+      await runPostInstallGuides(guideRl, currentConfig);
     } finally {
-      rl.close();
+      guideRl.close();
     }
   }
 

package/src/prompt.mjs

@@ -1,53 +1,36 @@
-import { createInterface } from 'node:readline';
 import { promptAppIdentity } from './prompts/app-identity.mjs';
 import { promptCredentials } from './prompts/credentials.mjs';
 import { promptStoreSettings, promptWebSettings } from './prompts/store-settings.mjs';
-import { askQuestion } from './guide.mjs';
-
-function isInteractive() {
-  return Boolean(process.stdin.isTTY);
-}
-
-function isNonInteractive() {
-  return Boolean(process.env.npm_config_yes) || process.argv.includes('--postinstall');
-}
-
-function allPromptsProvided(cliFlags) {
-  return (
-    cliFlags.bundleId !== undefined &&
-    cliFlags.stitchApiKey !== undefined &&
-    cliFlags.cloudflareToken !== undefined &&
-    cliFlags.cloudflareAccountId !== undefined
-  );
-}
+import { askQuestion, getDefault, printSectionHeader } from './guide.mjs';
 
 async function promptMcpTokens(rl, cliFlags, currentConfig) {
+  const stitchVal = getDefault('stitchApiKey', cliFlags, currentConfig) || '';
+  const cfTokenVal = getDefault('cloudflareToken', cliFlags, currentConfig) || '';
+  const cfAcctVal = getDefault('cloudflareAccountId', cliFlags, currentConfig) || '';
+
   const result = {
-    stitchApiKey: cliFlags.stitchApiKey ?? '',
-    cloudflareToken: cliFlags.cloudflareToken ?? '',
-    cloudflareAccountId: cliFlags.cloudflareAccountId ?? '',
+    stitchApiKey: stitchVal,
+    cloudflareToken: cfTokenVal,
+    cloudflareAccountId: cfAcctVal,
   };
 
-  const allProvided = (
-    cliFlags.stitchApiKey !== undefined &&
-    cliFlags.cloudflareToken !== undefined &&
-    cliFlags.cloudflareAccountId !== undefined
-  );
-
-  if (allProvided) return result;
+  if (result.stitchApiKey && result.cloudflareToken && result.cloudflareAccountId) {
+    return result;
+  }
 
+  printSectionHeader('MCP Tokens (Optional)');
   console.log('Press Enter to skip any token you do not have yet.');
   console.log('');
 
-  if (cliFlags.stitchApiKey === undefined) {
+  if (!result.stitchApiKey) {
     result.stitchApiKey = await askQuestion(rl, 'Stitch MCP API Key', currentConfig.stitchApiKey || '');
   }
 
-  if (cliFlags.cloudflareToken === undefined) {
+  if (!result.cloudflareToken) {
     result.cloudflareToken = await askQuestion(rl, 'Cloudflare API Token', currentConfig.cloudflareToken || '');
   }
 
-  if (result.cloudflareToken && cliFlags.cloudflareAccountId === undefined) {
+  if (result.cloudflareToken && !result.cloudflareAccountId) {
     result.cloudflareAccountId = await askQuestion(
       rl, 'Cloudflare Account ID', currentConfig.cloudflareAccountId || ''
     );
@@ -57,56 +40,11 @@ async function promptMcpTokens(rl, cliFlags, currentConfig) {
 }
 
 export async function promptAll(rl, cliFlags, currentConfig, projectDir) {
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== Store Automator — Interactive Setup ===\x1b[0m');
-
   const identity = await promptAppIdentity(rl, cliFlags, currentConfig);
-
   const credentials = await promptCredentials(rl, cliFlags, currentConfig, projectDir);
-
   const storeSettings = await promptStoreSettings(rl, cliFlags, currentConfig);
-
   const webSettings = await promptWebSettings(rl, cliFlags, currentConfig);
-
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== MCP Tokens (Optional) ===\x1b[0m');
-  console.log('');
   const mcpTokens = await promptMcpTokens(rl, cliFlags, currentConfig);
 
   return { ...identity, ...credentials, ...storeSettings, ...webSettings, ...mcpTokens };
 }
-
-export async function promptForTokens(cliTokens = {}) {
-  const result = {
-    bundleId: cliTokens.bundleId ?? '',
-    stitchApiKey: cliTokens.stitchApiKey ?? '',
-    cloudflareToken: cliTokens.cloudflareToken ?? '',
-    cloudflareAccountId: cliTokens.cloudflareAccountId ?? '',
-  };
-
-  if (allPromptsProvided(cliTokens)) {
-    console.log('All configuration provided via CLI flags, skipping prompts.');
-    return result;
-  }
-
-  if (!isInteractive() || isNonInteractive()) {
-    console.log('Non-interactive terminal detected, skipping prompts.');
-    console.log('Run "npx store-automator" manually to configure.');
-    return result;
-  }
-
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-
-  try {
-    const all = await promptAll(rl, cliTokens, {}, process.cwd());
-    return {
-      ...all,
-      bundleId: all.bundleId || result.bundleId,
-      stitchApiKey: all.stitchApiKey || result.stitchApiKey,
-      cloudflareToken: all.cloudflareToken || result.cloudflareToken,
-      cloudflareAccountId: all.cloudflareAccountId || result.cloudflareAccountId,
-    };
-  } finally {
-    rl.close();
-  }
-}

package/src/prompts/app-identity.mjs

@@ -1,61 +1,30 @@
-import { askQuestion, isPlaceholder } from '../guide.mjs';
+import { askQuestion, getDefault, printSectionHeader } from '../guide.mjs';
 
 const FIELDS = [
-  {
-    key: 'appName',
-    label: 'App Name (display name)',
-    configKey: 'app.name',
-    flag: 'appName',
-  },
-  {
-    key: 'bundleId',
-    label: 'Bundle ID (e.g. com.company.app)',
-    configKey: 'bundle_id',
-    flag: 'bundleId',
-  },
-  {
-    key: 'packageName',
-    label: 'Android Package Name',
-    configKey: 'android.package_name',
-    flag: 'packageName',
-  },
-  {
-    key: 'sku',
-    label: 'App Store Connect SKU',
-    configKey: 'ios.sku',
-    flag: 'sku',
-  },
-  {
-    key: 'appleId',
-    label: 'Apple Developer Account Email',
-    configKey: 'ios.apple_id',
-    flag: 'appleId',
-  },
+  { key: 'appName', label: 'App Name (display name)' },
+  { key: 'bundleId', label: 'Bundle ID (e.g. com.company.app)' },
+  { key: 'packageName', label: 'Android Package Name' },
+  { key: 'sku', label: 'App Store Connect SKU' },
+  { key: 'appleId', label: 'Apple Developer Account Email' },
 ];
 
-function getDefault(key, cliFlags, currentConfig) {
-  if (cliFlags[key] !== undefined) return cliFlags[key];
-  const configVal = currentConfig[key];
-  if (!isPlaceholder(configVal)) return configVal;
-  return '';
-}
-
 export async function promptAppIdentity(rl, cliFlags, currentConfig) {
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== App Identity ===\x1b[0m');
-  console.log('');
+  const allFilled = FIELDS.every((f) => !!getDefault(f.key, cliFlags, currentConfig));
+
+  if (!allFilled) {
+    printSectionHeader('App Identity');
+  }
 
   const result = {};
 
   for (const field of FIELDS) {
-    const flagVal = cliFlags[field.flag];
-    if (flagVal !== undefined) {
+    const flagVal = getDefault(field.key, cliFlags, currentConfig);
+    if (flagVal) {
       result[field.key] = flagVal;
       continue;
     }
 
-    const defaultVal = getDefault(field.key, cliFlags, currentConfig);
-    result[field.key] = await askQuestion(rl, field.label, defaultVal);
+    result[field.key] = await askQuestion(rl, field.label, '');
   }
 
   if (!result.packageName && result.bundleId) {

package/src/prompts/credentials.mjs

@@ -1,14 +1,12 @@
 import { join } from 'node:path';
-import { runGuide, askQuestion, isPlaceholder } from '../guide.mjs';
-
-function getDefault(key, cliFlags, currentConfig) {
-  if (cliFlags[key] !== undefined) return cliFlags[key];
-  const configVal = currentConfig[key];
-  if (!isPlaceholder(configVal)) return configVal;
-  return '';
-}
+import { existsSync } from 'node:fs';
+import { runGuide, askQuestion, getDefault, printSectionHeader } from '../guide.mjs';
 
 async function promptAppStoreApiKey(rl, cliFlags, currentConfig, projectDir) {
+  const keyId = getDefault('keyId', cliFlags, currentConfig);
+  const issuerId = getDefault('issuerId', cliFlags, currentConfig);
+  const allFilled = !!(keyId && issuerId);
+
   await runGuide(rl, {
     title: 'Create App Store Connect API Key',
     steps: [
@@ -21,24 +19,18 @@ async function promptAppStoreApiKey(rl, cliFlags, currentConfig, projectDir) {
     verifyPath: join(projectDir, 'creds', 'AuthKey.p8'),
     verifyDescription: 'App Store Connect API Key (.p8)',
     confirmQuestion: 'Have you created and saved the API key?',
-  });
+  }, { skip: allFilled });
 
-  const keyId = await askQuestion(
-    rl,
-    'App Store Connect Key ID',
-    getDefault('keyId', cliFlags, currentConfig)
-  );
-
-  const issuerId = await askQuestion(
-    rl,
-    'App Store Connect Issuer ID',
-    getDefault('issuerId', cliFlags, currentConfig)
-  );
-
-  return { keyId, issuerId };
+  return {
+    keyId: await askQuestion(rl, 'App Store Connect Key ID', keyId, { skipIfFilled: !!keyId }),
+    issuerId: await askQuestion(rl, 'App Store Connect Issuer ID', issuerId, { skipIfFilled: !!issuerId }),
+  };
 }
 
 async function promptPlayServiceAccount(rl, projectDir) {
+  const jsonPath = join(projectDir, 'creds', 'play-service-account.json');
+  const fileExists = existsSync(jsonPath);
+
   await runGuide(rl, {
     title: 'Create Google Play Service Account',
     steps: [
@@ -48,13 +40,15 @@ async function promptPlayServiceAccount(rl, projectDir) {
       'Download the JSON key file',
       'Save to creds/play-service-account.json in your project',
     ],
-    verifyPath: join(projectDir, 'creds', 'play-service-account.json'),
+    verifyPath: jsonPath,
     verifyDescription: 'Google Play Service Account JSON',
     confirmQuestion: 'Have you set up the service account?',
-  });
+  }, { skip: fileExists });
 }
 
 async function promptAndroidKeystore(rl, cliFlags, currentConfig) {
+  const keystorePassword = getDefault('keystorePassword', cliFlags, currentConfig);
+
   await runGuide(rl, {
     title: 'Set up Android Keystore',
     steps: [
@@ -64,18 +58,18 @@ async function promptAndroidKeystore(rl, cliFlags, currentConfig) {
       'Keep the keystore file safe — you cannot replace it once uploaded to Google Play',
     ],
     confirmQuestion: 'Have you created or located your Android keystore?',
-  });
+  }, { skip: !!keystorePassword });
 
-  const keystorePassword = await askQuestion(
-    rl,
-    'Keystore password',
-    getDefault('keystorePassword', cliFlags, currentConfig)
+  return await askQuestion(
+    rl, 'Keystore password', keystorePassword, { skipIfFilled: !!keystorePassword }
   );
-
-  return keystorePassword;
 }
 
 async function promptMatchSigning(rl, cliFlags, currentConfig) {
+  const matchDeployKeyPath = getDefault('matchDeployKeyPath', cliFlags, currentConfig) || 'creds/match_deploy_key';
+  const matchGitUrl = getDefault('matchGitUrl', cliFlags, currentConfig);
+  const allFilled = !!(matchDeployKeyPath && matchGitUrl);
+
   await runGuide(rl, {
     title: 'Set up Match Code Signing',
     steps: [
@@ -84,39 +78,37 @@ async function promptMatchSigning(rl, cliFlags, currentConfig) {
       'Add the public key as a deploy key to the certificates repo (with write access)',
     ],
     confirmQuestion: 'Have you set up the certificates repository and deploy key?',
-  });
-
-  const matchDeployKeyPath = await askQuestion(
-    rl,
-    'Path to Match deploy key',
-    getDefault('matchDeployKeyPath', cliFlags, currentConfig) || 'creds/match_deploy_key'
-  );
-
-  const matchGitUrl = await askQuestion(
-    rl,
-    'Match certificates Git URL (SSH)',
-    getDefault('matchGitUrl', cliFlags, currentConfig)
-  );
-
-  return { matchDeployKeyPath, matchGitUrl };
+  }, { skip: allFilled });
+
+  return {
+    matchDeployKeyPath: await askQuestion(
+      rl, 'Path to Match deploy key', matchDeployKeyPath, { skipIfFilled: !!matchDeployKeyPath }
+    ),
+    matchGitUrl: await askQuestion(
+      rl, 'Match certificates Git URL (SSH)', matchGitUrl, { skipIfFilled: !!matchGitUrl }
+    ),
+  };
 }
 
 export async function promptCredentials(rl, cliFlags, currentConfig, projectDir) {
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== Credentials Setup ===\x1b[0m');
-  console.log('');
+  const keyId = getDefault('keyId', cliFlags, currentConfig);
+  const issuerId = getDefault('issuerId', cliFlags, currentConfig);
+  const keystorePassword = getDefault('keystorePassword', cliFlags, currentConfig);
+  const matchDeployKeyPath = getDefault('matchDeployKeyPath', cliFlags, currentConfig) || 'creds/match_deploy_key';
+  const matchGitUrl = getDefault('matchGitUrl', cliFlags, currentConfig);
+  const jsonPath = join(projectDir, 'creds', 'play-service-account.json');
+  const jsonExists = existsSync(jsonPath);
 
-  const { keyId, issuerId } = await promptAppStoreApiKey(
-    rl, cliFlags, currentConfig, projectDir
-  );
-
-  await promptPlayServiceAccount(rl, projectDir);
+  const allFilled = !!(keyId && issuerId && keystorePassword && matchDeployKeyPath && matchGitUrl && jsonExists);
 
-  const keystorePassword = await promptAndroidKeystore(rl, cliFlags, currentConfig);
+  if (!allFilled) {
+    printSectionHeader('Credentials Setup');
+  }
 
-  const { matchDeployKeyPath, matchGitUrl } = await promptMatchSigning(
-    rl, cliFlags, currentConfig
-  );
+  const apiKey = await promptAppStoreApiKey(rl, cliFlags, currentConfig, projectDir);
+  await promptPlayServiceAccount(rl, projectDir);
+  const ksPassword = await promptAndroidKeystore(rl, cliFlags, currentConfig);
+  const match = await promptMatchSigning(rl, cliFlags, currentConfig);
 
-  return { keyId, issuerId, keystorePassword, matchDeployKeyPath, matchGitUrl };
+  return { ...apiKey, keystorePassword: ksPassword, ...match };
 }

package/src/prompts/store-settings.mjs

@@ -1,18 +1,20 @@
-import { runGuide, askQuestion, isPlaceholder } from '../guide.mjs';
+import {
+  runGuide, askQuestion, getDefault, getDefaultWithFallback, printSectionHeader,
+} from '../guide.mjs';
 
-function getDefault(key, cliFlags, currentConfig) {
-  if (cliFlags[key] !== undefined) return cliFlags[key];
-  const configVal = currentConfig[key];
-  if (!isPlaceholder(configVal)) return configVal;
-  return '';
-}
+const IOS_KEYS = ['primaryCategory', 'secondaryCategory', 'priceTier', 'submitForReview', 'automaticRelease'];
+const ANDROID_KEYS = ['track', 'rolloutFraction', 'inAppUpdatePriority'];
 
-function getDefaultWithFallback(key, cliFlags, currentConfig, fallback) {
-  const val = getDefault(key, cliFlags, currentConfig);
-  return val !== '' ? val : fallback;
+function allKeysFilled(keys, cliFlags, currentConfig) {
+  return keys.every((k) => {
+    const val = getDefault(k, cliFlags, currentConfig);
+    return val !== '' && val !== undefined;
+  });
 }
 
 async function promptIosSettings(rl, cliFlags, currentConfig) {
+  const iosFilled = allKeysFilled(IOS_KEYS, cliFlags, currentConfig);
+
   await runGuide(rl, {
     title: 'Create App in App Store Connect',
     steps: [
@@ -22,36 +24,31 @@ async function promptIosSettings(rl, cliFlags, currentConfig) {
       'Save the app',
     ],
     confirmQuestion: 'Have you created the app in App Store Connect?',
-  });
+  }, { skip: iosFilled });
 
+  const primaryCat = getDefault('primaryCategory', cliFlags, currentConfig);
   const primaryCategory = await askQuestion(
-    rl,
-    'iOS Primary Category (e.g. GAMES, UTILITIES)',
-    getDefault('primaryCategory', cliFlags, currentConfig)
+    rl, 'iOS Primary Category (e.g. GAMES, UTILITIES)', primaryCat, { skipIfFilled: !!primaryCat }
   );
 
+  const secCat = getDefault('secondaryCategory', cliFlags, currentConfig);
   const secondaryCategory = await askQuestion(
-    rl,
-    'iOS Secondary Category (optional)',
-    getDefault('secondaryCategory', cliFlags, currentConfig)
+    rl, 'iOS Secondary Category (optional)', secCat, { skipIfFilled: !!secCat }
   );
 
+  const priceVal = getDefaultWithFallback('priceTier', cliFlags, currentConfig, '0');
   const priceTier = await askQuestion(
-    rl,
-    'iOS Price Tier',
-    getDefaultWithFallback('priceTier', cliFlags, currentConfig, '0')
+    rl, 'iOS Price Tier', priceVal, { skipIfFilled: !!priceVal }
   );
 
+  const submitVal = getDefaultWithFallback('submitForReview', cliFlags, currentConfig, 'true');
   const submitForReview = await askQuestion(
-    rl,
-    'Auto-submit for review? (true/false)',
-    getDefaultWithFallback('submitForReview', cliFlags, currentConfig, 'true')
+    rl, 'Auto-submit for review? (true/false)', submitVal, { skipIfFilled: !!submitVal }
   );
 
+  const autoVal = getDefaultWithFallback('automaticRelease', cliFlags, currentConfig, 'true');
   const automaticRelease = await askQuestion(
-    rl,
-    'Automatic release after approval? (true/false)',
-    getDefaultWithFallback('automaticRelease', cliFlags, currentConfig, 'true')
+    rl, 'Automatic release after approval? (true/false)', autoVal, { skipIfFilled: !!autoVal }
   );
 
   return {
@@ -64,6 +61,8 @@ async function promptIosSettings(rl, cliFlags, currentConfig) {
 }
 
 async function promptAndroidSettings(rl, cliFlags, currentConfig) {
+  const androidFilled = allKeysFilled(ANDROID_KEYS, cliFlags, currentConfig);
+
   await runGuide(rl, {
     title: 'Create App in Google Play Console',
     steps: [
@@ -73,24 +72,21 @@ async function promptAndroidSettings(rl, cliFlags, currentConfig) {
       'Complete the declarations and create',
     ],
     confirmQuestion: 'Have you created the app in Google Play Console?',
-  });
+  }, { skip: androidFilled });
 
+  const trackVal = getDefaultWithFallback('track', cliFlags, currentConfig, 'internal');
   const track = await askQuestion(
-    rl,
-    'Android release track (internal/alpha/beta/production)',
-    getDefaultWithFallback('track', cliFlags, currentConfig, 'internal')
+    rl, 'Android release track (internal/alpha/beta/production)', trackVal, { skipIfFilled: !!trackVal }
   );
 
+  const rolloutVal = getDefaultWithFallback('rolloutFraction', cliFlags, currentConfig, '1.0');
   const rolloutFraction = await askQuestion(
-    rl,
-    'Rollout fraction (0.0 - 1.0)',
-    getDefaultWithFallback('rolloutFraction', cliFlags, currentConfig, '1.0')
+    rl, 'Rollout fraction (0.0 - 1.0)', rolloutVal, { skipIfFilled: !!rolloutVal }
   );
 
+  const priorityVal = getDefaultWithFallback('inAppUpdatePriority', cliFlags, currentConfig, '3');
   const inAppUpdatePriority = await askQuestion(
-    rl,
-    'In-app update priority (0-5)',
-    getDefaultWithFallback('inAppUpdatePriority', cliFlags, currentConfig, '3')
+    rl, 'In-app update priority (0-5)', priorityVal, { skipIfFilled: !!priorityVal }
   );
 
   return {
@@ -101,19 +97,23 @@ async function promptAndroidSettings(rl, cliFlags, currentConfig) {
 }
 
 async function promptMetadataSettings(rl, cliFlags, currentConfig) {
+  const langVal = getDefaultWithFallback('languages', cliFlags, currentConfig, 'en-US');
   const languages = await askQuestion(
-    rl,
-    'Metadata languages (comma-separated, e.g. en-US,de-DE)',
-    getDefaultWithFallback('languages', cliFlags, currentConfig, 'en-US')
+    rl, 'Metadata languages (comma-separated, e.g. en-US,de-DE)', langVal, { skipIfFilled: !!langVal }
   );
 
   return { languages: languages.split(',').map((l) => l.trim()).filter(Boolean) };
 }
 
 export async function promptStoreSettings(rl, cliFlags, currentConfig) {
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== Store Settings ===\x1b[0m');
-  console.log('');
+  const iosFilled = allKeysFilled(IOS_KEYS, cliFlags, currentConfig);
+  const androidFilled = allKeysFilled(ANDROID_KEYS, cliFlags, currentConfig);
+  const langVal = getDefaultWithFallback('languages', cliFlags, currentConfig, 'en-US');
+  const allFilled = iosFilled && androidFilled && !!langVal;
+
+  if (!allFilled) {
+    printSectionHeader('Store Settings');
+  }
 
   const ios = await promptIosSettings(rl, cliFlags, currentConfig);
   const android = await promptAndroidSettings(rl, cliFlags, currentConfig);
@@ -122,10 +122,17 @@ export async function promptStoreSettings(rl, cliFlags, currentConfig) {
   return { ...ios, ...android, ...metadata };
 }
 
+const WEB_KEYS = [
+  'domain', 'cfProjectName', 'tagline', 'primaryColor', 'secondaryColor',
+  'companyName', 'contactEmail', 'supportEmail', 'jurisdiction',
+];
+
 export async function promptWebSettings(rl, cliFlags, currentConfig) {
-  console.log('');
-  console.log('\x1b[1m\x1b[36m=== Web Settings ===\x1b[0m');
-  console.log('');
+  const webFilled = WEB_KEYS.every((k) => !!getDefault(k, cliFlags, currentConfig));
+
+  if (!webFilled) {
+    printSectionHeader('Web Settings');
+  }
 
   const fields = [
     { key: 'domain', label: 'Domain (e.g. example.com)' },
@@ -141,16 +148,17 @@ export async function promptWebSettings(rl, cliFlags, currentConfig) {
 
   const result = {};
   for (const field of fields) {
-    result[field.key] = await askQuestion(
-      rl,
-      field.label,
-      getDefault(field.key, cliFlags, currentConfig)
-    );
+    const val = getDefault(field.key, cliFlags, currentConfig);
+    result[field.key] = await askQuestion(rl, field.label, val, { skipIfFilled: !!val });
   }
   return result;
 }
 
-export async function runPostInstallGuides(rl) {
+export async function runPostInstallGuides(rl, currentConfig = {}) {
+  const hasRepo = !!currentConfig._githubRepoConfigured;
+  const hasSecrets = !!currentConfig._githubSecretsConfigured;
+  const hasFirebase = !!currentConfig._firebaseConfigured;
+
   await runGuide(rl, {
     title: 'Create Private GitHub Repository',
     steps: [
@@ -159,7 +167,7 @@ export async function runPostInstallGuides(rl) {
       'Push your project to the repository',
     ],
     confirmQuestion: 'Have you created the GitHub repository?',
-  });
+  }, { skip: hasRepo });
 
   await runGuide(rl, {
     title: 'Set GitHub Actions Secrets',
@@ -170,7 +178,7 @@ export async function runPostInstallGuides(rl) {
       'Upload creds/ files as secrets if using CI',
     ],
     confirmQuestion: 'Have you configured GitHub Actions secrets?',
-  });
+  }, { skip: hasSecrets });
 
   await runGuide(rl, {
     title: 'Create Firebase Project (optional)',
@@ -181,5 +189,5 @@ export async function runPostInstallGuides(rl) {
       'Download google-services.json and GoogleService-Info.plist',
     ],
     confirmQuestion: 'Have you set up Firebase? (skip if not needed)',
-  });
+  }, { skip: hasFirebase });
 }

package/templates/scripts/ci/android/upload-metadata.sh

@@ -44,6 +44,8 @@ fi
 # --- Upload metadata via Fastlane ---
 echo "Uploading Android metadata..."
 
+cd "$APP_ROOT/android"
+
 set +e
 FASTLANE_OUTPUT=$(PACKAGE_NAME="$PACKAGE_NAME" \
 GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH="$SA_FULL_PATH" \