@daemux/store-automator 0.5.2 → 0.6.0

package/.claude-plugin/marketplace.json

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

package/README.md

@@ -27,8 +27,8 @@ npm install @daemux/store-automator
 
 The postinstall script will:
 
-1. Prompt for MCP server tokens (Stitch, Cloudflare)
-2. Configure `.mcp.json` with MCP servers (Playwright, mobile-mcp, Stitch, Cloudflare)
+1. Prompt for MCP server tokens (Stitch, Cloudflare, Codemagic)
+2. Configure `.mcp.json` with MCP servers (Playwright, mobile-mcp, Stitch, Cloudflare, Codemagic)
 3. Install the plugin marketplace and register agents
 4. Copy `CLAUDE.md` template to `.claude/CLAUDE.md`
 5. Copy CI/CD templates (Fastlane, scripts, web pages, ci.config.yaml)
@@ -112,8 +112,54 @@ The package configures these MCP servers in `.mcp.json`:
 |--------|---------|---------------|
 | playwright | Browser automation for testing web pages | None |
 | mobile-mcp | Mobile device automation | None |
-| stitch | AI design tool for screenshot generation | Google API Key |
-| cloudflare | Cloudflare Pages deployment | API Token + Account ID |
+| stitch | AI design tool for screenshot generation | `STITCH_API_KEY` |
+| cloudflare | Cloudflare Pages deployment | `CLOUDFLARE_API_TOKEN` + Account ID |
+| codemagic | Codemagic CI/CD build management (27 tools) | `CODEMAGIC_API_TOKEN` |
+
+## Non-interactive Install
+
+For CI/CD environments or scripted setups, pass tokens as CLI flags to skip interactive prompts:
+
+```bash
+npx @daemux/store-automator \
+  --codemagic-token=YOUR_CM_TOKEN \
+  --stitch-key=YOUR_STITCH_KEY \
+  --cloudflare-token=YOUR_CF_TOKEN \
+  --cloudflare-account-id=YOUR_CF_ACCOUNT_ID
+```
+
+Any tokens provided via flags will skip the corresponding interactive prompt. If all four tokens are provided, the entire interactive session is skipped.
+
+## CLI Options
+
+```
+Usage: npx @daemux/store-automator [options]
+
+Options:
+  -g, --global                   Install globally (~/.claude) instead of project scope
+  -u, --uninstall                Uninstall plugin and remove files
+  --postinstall                  Run as postinstall hook (auto-detected)
+  -v, --version                  Show version number
+  -h, --help                     Show help
+
+MCP Token Flags (skip interactive prompts):
+  --codemagic-token=TOKEN        Codemagic API token
+  --stitch-key=KEY               Stitch MCP API key
+  --cloudflare-token=TOKEN       Cloudflare API token
+  --cloudflare-account-id=ID     Cloudflare account ID
+
+Codemagic:
+  --codemagic-setup              Register repo and optionally trigger build
+  --token=TOKEN                  API token (or set CM_API_TOKEN env var)
+  --branch=BRANCH                Branch to build (default: main)
+  --workflow=ID                  Workflow ID (default: default)
+  --trigger                      Trigger build after setup
+  --wait                         Wait for build completion (implies --trigger)
+
+GitHub Actions:
+  --github-setup                 Set CM_API_TOKEN secret for GitHub Actions
+  --token=TOKEN                  API token (or set CM_API_TOKEN env var)
+```
 
 ## License
 

package/bin/cli.mjs

@@ -21,19 +21,34 @@ let cmWorkflowId = 'default';
 let cmTrigger = false;
 let cmWait = false;
 
+const cliTokens = {};
+
+function flagValue(arg, prefix) {
+  return arg.startsWith(prefix) ? arg.slice(prefix.length) : undefined;
+}
+
+const tokenFlags = {
+  '--codemagic-token=': 'codemagicToken',
+  '--stitch-key=': 'stitchApiKey',
+  '--cloudflare-token=': 'cloudflareToken',
+  '--cloudflare-account-id=': 'cloudflareAccountId',
+};
+
 for (const arg of args) {
-  if (arg.startsWith('--token=')) {
-    cmTokenArg = arg.slice(8);
-    continue;
-  }
-  if (arg.startsWith('--branch=')) {
-    cmBranch = arg.slice(9);
-    continue;
-  }
-  if (arg.startsWith('--workflow=')) {
-    cmWorkflowId = arg.slice(11);
-    continue;
+  let v;
+  if ((v = flagValue(arg, '--token=')) !== undefined) { cmTokenArg = v; continue; }
+  if ((v = flagValue(arg, '--branch=')) !== undefined) { cmBranch = v; continue; }
+  if ((v = flagValue(arg, '--workflow=')) !== undefined) { cmWorkflowId = v; continue; }
+
+  let matched = false;
+  for (const [prefix, key] of Object.entries(tokenFlags)) {
+    if ((v = flagValue(arg, prefix)) !== undefined) {
+      cliTokens[key] = v;
+      matched = true;
+      break;
+    }
   }
+  if (matched) continue;
 
   switch (arg) {
     case '-g':
@@ -64,23 +79,29 @@ for (const arg of args) {
       console.log(`Usage: npx @daemux/store-automator [options]
 
 Options:
-  -g, --global          Install globally (~/.claude) instead of project scope
-  -u, --uninstall       Uninstall plugin and remove files
-  --postinstall         Run as postinstall hook (auto-detected)
-  -v, --version         Show version number
-  -h, --help            Show help
+  -g, --global                   Install globally (~/.claude) instead of project scope
+  -u, --uninstall                Uninstall plugin and remove files
+  --postinstall                  Run as postinstall hook (auto-detected)
+  -v, --version                  Show version number
+  -h, --help                     Show help
+
+MCP Token Flags (skip interactive prompts):
+  --codemagic-token=TOKEN        Codemagic API token
+  --stitch-key=KEY               Stitch MCP API key
+  --cloudflare-token=TOKEN       Cloudflare API token
+  --cloudflare-account-id=ID     Cloudflare account ID
 
 Codemagic:
-  --codemagic-setup     Register repo and optionally trigger build
-  --token=TOKEN         API token (or set CM_API_TOKEN env var)
-  --branch=BRANCH       Branch to build (default: main)
-  --workflow=ID         Workflow ID (default: default)
-  --trigger             Trigger build after setup
-  --wait                Wait for build completion (implies --trigger)
+  --codemagic-setup              Register repo and optionally trigger build
+  --token=TOKEN                  API token (or set CM_API_TOKEN env var)
+  --branch=BRANCH                Branch to build (default: main)
+  --workflow=ID                  Workflow ID (default: default)
+  --trigger                      Trigger build after setup
+  --wait                         Wait for build completion (implies --trigger)
 
 GitHub Actions (auto-configured during install if gh CLI available):
-  --github-setup        Set CM_API_TOKEN secret for GitHub Actions
-  --token=TOKEN         API token (or set CM_API_TOKEN env var)
+  --github-setup                 Set CM_API_TOKEN secret for GitHub Actions
+  --token=TOKEN                  API token (or set CM_API_TOKEN env var)
 
 Examples:
   npx @daemux/store-automator                          Install for project
@@ -89,7 +110,11 @@ Examples:
   npx @daemux/store-automator -g -u                    Uninstall globally
   npx @daemux/store-automator --codemagic-setup        Register with Codemagic
   npx @daemux/store-automator --codemagic-setup --trigger --wait  Trigger and wait
-  npx @daemux/store-automator --github-setup           Configure GitHub Actions`);
+  npx @daemux/store-automator --github-setup           Configure GitHub Actions
+
+Non-interactive install (CI/CD):
+  npx @daemux/store-automator --codemagic-token=TOKEN --stitch-key=KEY
+  npx @daemux/store-automator --cloudflare-token=TOKEN --cloudflare-account-id=ID`);
       process.exit(0);
       break; // eslint: no-fallthrough
     case '-v':
@@ -122,7 +147,7 @@ try {
     await runUninstall(scope);
   } else {
     const { runInstall } = await import('../src/install.mjs');
-    await runInstall(scope, isPostinstall);
+    await runInstall(scope, isPostinstall, cliTokens);
   }
 } catch (err) {
   if (isPostinstall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daemux/store-automator",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "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.5.0",
+  "version": "0.6.0",
   "description": "App Store & Google Play automation agents for Flutter app publishing",
   "author": {
     "name": "Daemux"

package/plugins/store-automator/agents/devops.md

@@ -42,14 +42,9 @@ The Codemagic pipeline runs two parallel workflows on push to `main`:
 **iOS Release**: Flutter analyze -> Flutter test -> Build IPA -> Code signing -> Upload metadata + screenshots -> Deploy to App Store Connect -> Sync IAP
 **Android Release**: Flutter analyze -> Flutter test -> Build AAB -> Keystore signing -> Check Google Play readiness -> Deploy to Google Play -> Sync IAP
 
-### Token Resolution
+### Token Configuration
 
-The Codemagic API token is stored in `ci.config.yaml` under `codemagic.api_token`. Read it from there — NEVER ask the user for it. If the field is empty, warn the user to fill `codemagic.api_token` in `ci.config.yaml` and stop.
-
-```bash
-# Extract token from ci.config.yaml
-CM_API_TOKEN=$(grep 'api_token:' ci.config.yaml | head -1 | sed 's/.*api_token: *"\{0,1\}\([^"]*\)"\{0,1\}/\1/' | tr -d ' ')
-```
+The Codemagic API token is auto-configured via the codemagic MCP server in `.mcp.json` (set during install). You do not need to resolve the token manually -- all MCP tool calls authenticate automatically. If the codemagic MCP server is missing from `.mcp.json`, instruct the user to re-run `npx @daemux/store-automator` or add `--codemagic-token=TOKEN` to configure it.
 
 ### Triggering Builds
 
@@ -59,29 +54,50 @@ git push origin main
 ```
 Codemagic triggers both iOS and Android workflows automatically on push to `main`.
 
-**Option 2: Codemagic REST API** (preferred for full automation — allows status polling and log reading)
-```bash
-CM_API_TOKEN=$(grep 'api_token:' ci.config.yaml | head -1 | sed 's/.*api_token: *"\{0,1\}\([^"]*\)"\{0,1\}/\1/' | tr -d ' ')
-node -e "
-  import {startBuild} from './src/codemagic-api.mjs';
-  const r = await startBuild('$CM_API_TOKEN', '<appId>', '<workflowId>', 'main');
-  console.log(JSON.stringify(r, null, 2));
-"
-```
+**Option 2: Codemagic MCP** (preferred for full automation -- allows status polling and log reading)
+Use the `start_build` MCP tool:
+- `appId`: from `codemagic.app_id` in `ci.config.yaml`
+- `workflowId`: from `codemagic.workflows` in `ci.config.yaml`
+- `branch`: `main` (or as needed)
 
 ### Monitoring Build Status
 
-```bash
-CM_API_TOKEN=$(grep 'api_token:' ci.config.yaml | head -1 | sed 's/.*api_token: *"\{0,1\}\([^"]*\)"\{0,1\}/\1/' | tr -d ' ')
-node -e "
-  import {getBuildStatus} from './src/codemagic-api.mjs';
-  const r = await getBuildStatus('$CM_API_TOKEN', '<buildId>');
-  console.log(JSON.stringify(r, null, 2));
-"
-```
+Use the `get_build` MCP tool with the `buildId` returned from `start_build`. Poll every 60 seconds until the build reaches a terminal state.
 
 Build states: `queued` -> `preparing` -> `building` -> `testing` -> `publishing` -> `finished` | `failed` | `canceled`
 
+### Available Codemagic MCP Tools
+
+| Tool | Description |
+|------|-------------|
+| `list_apps` | List all Codemagic applications |
+| `get_app` | Get details of a specific application |
+| `add_app` | Add a new application to Codemagic |
+| `start_build` | Start a new build |
+| `get_build` | Get details of a specific build |
+| `cancel_build` | Cancel a running build |
+| `list_builds` | List builds for a team (V3 API) |
+| `get_artifact_url` | Get the download URL for a build artifact |
+| `create_public_artifact_url` | Create a time-limited public URL for an artifact |
+| `list_caches` | List build caches for an application |
+| `delete_caches` | Delete build caches for an application |
+| `setup_asc_credentials` | Create variable group with App Store Connect credentials |
+| `setup_code_signing` | Create variable group with iOS code signing cert and profile |
+| `get_user` | Get the current authenticated user info |
+| `list_teams` | List all teams the user belongs to |
+| `get_team` | Get details of a specific team |
+| `list_team_members` | List members of a specific team |
+| `list_variable_groups` | List variable groups for a team or application |
+| `get_variable_group` | Get details of a specific variable group |
+| `create_variable_group` | Create a new variable group |
+| `update_variable_group` | Update a variable group name or security setting |
+| `delete_variable_group` | Delete a variable group |
+| `list_variables` | List variables in a variable group |
+| `get_variable` | Get a specific variable from a variable group |
+| `update_variable` | Update a variable in a variable group |
+| `delete_variable` | Delete a variable from a variable group |
+| `bulk_import_variables` | Import multiple variables into a variable group |
+
 ### Build Failure Analysis
 
 When a build fails:
@@ -115,24 +131,9 @@ Versions are auto-incremented:
 - Build number = latest store build number + 1
 - Both platforms share the same version name (e.g., 1.0.0), synced from iOS
 
-### Health Check Process
-
-After triggering a build:
-1. Poll build status every 60 seconds until completion
-2. Check both iOS and Android workflows independently
-3. If one passes and one fails, report partial success and investigate the failure
-4. Verify artifacts exist (IPA for iOS, AAB for Android)
-5. Check store submission status after successful upload
-
-### Log Analysis
+### Health Check and Log Analysis
 
-When analyzing Codemagic build logs:
-1. Look for `ERROR`, `FAILURE`, `EXCEPTION`, `BUILD FAILED` patterns
-2. Check Flutter analyze output for lint warnings/errors
-3. Check test results for failures and skipped tests
-4. Check code signing logs for certificate/profile issues
-5. Check Fastlane output for store upload errors
-6. Note which pipeline step failed and its exit code
+After triggering a build, poll status every 60 seconds. Check both iOS and Android independently. If one passes and one fails, report partial success and investigate. Verify artifacts (IPA/AAB) and store submission status after success. In logs, look for `ERROR`, `FAILURE`, `EXCEPTION`, `BUILD FAILED`, check Flutter analyze, test results, code signing, and Fastlane output.
 
 ### Output Format
 
@@ -142,18 +143,7 @@ PLATFORM: iOS | Android | Both
 BUILD ID: [id]
 STATUS: queued | building | testing | publishing | finished | failed
 VERSION: [version]+[build_number]
-
-For failures:
-- Failed step: [step name]
-- Error: [summary]
-- Root cause: [analysis]
-- Fix: [action taken or recommended]
-
-For success:
-- iOS: [App Store submission status]
-- Android: [Google Play upload status]
-- Artifacts: [list]
-
+RESULT: [success details or failure analysis with root cause and fix]
 RECOMMENDATION: [next action if needed]
 ```
 
@@ -383,7 +373,7 @@ Analyze Firestore usage patterns and optimize queries, indexes, and security rul
 | `scripts/check_changed.sh` | Detects changed files for conditional uploads |
 | `scripts/manage_version_ios.py` | iOS version auto-increment |
 | `scripts/check_google_play.py` | Google Play readiness checker |
-| `src/codemagic-api.mjs` | Codemagic REST API client |
+| `.mcp.json (codemagic)` | Codemagic MCP server config and API token |
 | `fastlane/metadata/` | Store listing metadata (iOS + Android) |
 | `fastlane/iap_config.json` | In-app purchase configuration |
 | `web/deploy-cloudflare.mjs` | Cloudflare Pages deployment script |

package/src/ci-config.mjs

@@ -0,0 +1,23 @@
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+
+const CI_CONFIG_FILE = 'ci.config.yaml';
+const APP_ID_PATTERN = /^(\s*app_id:\s*)"[^"]*"/m;
+
+export function writeCiAppId(projectDir, appId) {
+  const configPath = join(projectDir, CI_CONFIG_FILE);
+  if (!existsSync(configPath)) return false;
+
+  try {
+    const content = readFileSync(configPath, 'utf8');
+    if (!APP_ID_PATTERN.test(content)) return false;
+
+    const updated = content.replace(APP_ID_PATTERN, `$1"${appId}"`);
+    if (updated === content) return false;
+
+    writeFileSync(configPath, updated, 'utf8');
+    return true;
+  } catch {
+    return false;
+  }
+}

package/src/codemagic-setup.mjs

@@ -1,20 +1,13 @@
 import { findAppByRepo, addApp, startBuild, getBuildStatus, normalizeRepoUrl } from './codemagic-api.mjs';
-import { exec } from './utils.mjs';
+import { exec, resolveToken } from './utils.mjs';
 import { execFileSync } from 'child_process';
+import { writeCiAppId } from './ci-config.mjs';
+import { updateMcpAppId } from './mcp-setup.mjs';
 
 const POLL_INTERVAL_MS = 30_000;
 const POLL_TIMEOUT_MS = 15 * 60 * 1000;
 const TERMINAL_STATUSES = new Set(['finished', 'failed', 'canceled']);
 
-function resolveToken(tokenArg) {
-  const token = process.env.CM_API_TOKEN || tokenArg;
-  if (!token) {
-    console.error('Codemagic API token required. Set CM_API_TOKEN or pass --token=...');
-    process.exit(1);
-  }
-  return token;
-}
-
 function resolveRepoUrl() {
   const url = exec('git remote get-url origin');
   if (!url) {
@@ -130,12 +123,18 @@ export async function runCodemagicSetup(options) {
   }
 
   const appId = app._id;
+  const appIdWritten = writeCiAppId(process.cwd(), appId);
+  updateMcpAppId(process.cwd(), appId);
 
   if (!trigger) {
     console.log('\nSetup complete. Use --trigger to start a build.\n');
+    if (appIdWritten) {
+      console.log('codemagic.app_id written to ci.config.yaml.');
+    } else {
+      console.log('Fill codemagic.app_id in ci.config.yaml manually.');
+    }
     console.log('To enable GitHub Actions auto-trigger:');
-    console.log('  1. Fill codemagic.app_id in ci.config.yaml');
-    console.log('  2. Run: npx @daemux/store-automator --github-setup');
+    console.log('  Run: npx @daemux/store-automator --github-setup');
     return { appId, buildId: null, status: null };
   }
 

package/src/github-setup.mjs

@@ -1,15 +1,6 @@
-import { exec } from './utils.mjs';
+import { exec, resolveToken } from './utils.mjs';
 import { execFileSync } from 'child_process';
 
-function resolveToken(tokenArg) {
-  const token = process.env.CM_API_TOKEN || tokenArg;
-  if (!token) {
-    console.error('Codemagic API token required. Set CM_API_TOKEN or pass --token=...');
-    process.exit(1);
-  }
-  return token;
-}
-
 function checkGhCli() {
   const ghPath = exec('which gh');
   if (!ghPath) {
@@ -47,6 +38,6 @@ export async function runGitHubSetup(options) {
   setGitHubSecret('CM_API_TOKEN', token);
 
   console.log('\nGitHub Actions setup complete.');
-  console.log('Next: Fill codemagic.app_id in ci.config.yaml.');
+  console.log('Next: Verify codemagic.app_id in ci.config.yaml (auto-configured during install).');
   console.log('GitHub Actions will trigger configured Codemagic workflows on push to main.');
 }

package/src/install.mjs

@@ -9,8 +9,10 @@ import {
 } from './utils.mjs';
 import { injectEnvVars, injectStatusLine } from './settings.mjs';
 import { promptForTokens } from './prompt.mjs';
-import { getMcpServers, writeMcpJson } from './mcp-setup.mjs';
+import { getMcpServers, writeMcpJson, updateMcpAppId } from './mcp-setup.mjs';
 import { installClaudeMd, installCiTemplates, installFirebaseTemplates } from './templates.mjs';
+import { findAppByRepo, addApp, normalizeRepoUrl } from './codemagic-api.mjs';
+import { writeCiAppId } from './ci-config.mjs';
 
 function checkClaudeCli() {
   const result = exec('command -v claude') || exec('which claude');
@@ -110,12 +112,47 @@ function setupGitHubActions(codemagicToken) {
   }
 }
 
-export async function runInstall(scope, isPostinstall = false) {
+async function setupCodemagicApp(projectDir, codemagicToken) {
+  if (!codemagicToken) return;
+
+  let repoUrl;
+  try {
+    const raw = execSync('git remote get-url origin', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+    if (!raw) return;
+    repoUrl = normalizeRepoUrl(raw);
+  } catch {
+    return;
+  }
+
+  try {
+    let app = await findAppByRepo(codemagicToken, repoUrl);
+    if (!app) {
+      app = await addApp(codemagicToken, repoUrl);
+      console.log(`Codemagic app created: ${app.appName || app._id}`);
+    } else {
+      console.log(`Codemagic app found: ${app.appName || app._id}`);
+    }
+
+    const written = writeCiAppId(projectDir, app._id);
+    if (written) {
+      console.log(`Codemagic app_id written to ci.config.yaml`);
+    }
+
+    updateMcpAppId(projectDir, app._id);
+  } catch (err) {
+    console.log(`Codemagic auto-setup skipped: ${err.message || err}`);
+  }
+}
+
+export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   checkClaudeCli();
 
   console.log('Installing/updating Daemux Store Automator...');
 
-  const tokens = await promptForTokens();
+  const tokens = await promptForTokens(cliTokens);
 
   const projectDir = process.cwd();
   const servers = getMcpServers(tokens);
@@ -141,6 +178,8 @@ export async function runInstall(scope, isPostinstall = false) {
   installCiTemplates(projectDir, packageDir);
   installFirebaseTemplates(projectDir, packageDir);
 
+  await setupCodemagicApp(projectDir, tokens.codemagicToken);
+
   const scopeLabel = scope === 'user' ? 'global' : 'project';
   console.log(`Configuring ${scopeLabel} settings...`);
   const settingsPath = join(baseDir, 'settings.json');
@@ -157,7 +196,7 @@ export async function runInstall(scope, isPostinstall = false) {
   printSummary(scope, oldVersion, newVersion);
   console.log('');
   console.log('Next steps:');
-  console.log('  1. Fill ci.config.yaml (including codemagic.app_id)');
+  console.log('  1. Fill ci.config.yaml (codemagic.app_id is auto-configured if token was provided)');
   console.log('  2. Add creds/AuthKey.p8 and creds/play-service-account.json');
   console.log('  3. Start Claude Code');
   if (!ghConfigured) {

package/src/mcp-setup.mjs

@@ -32,6 +32,16 @@ export function getMcpServers(tokens) {
     };
   }
 
+  if (tokens.codemagicToken) {
+    const codemagicEnv = { CODEMAGIC_API_TOKEN: tokens.codemagicToken };
+    if (tokens.codemagicAppId) codemagicEnv.CODEMAGIC_APP_ID = tokens.codemagicAppId;
+    servers.codemagic = {
+      command: 'npx',
+      args: ['-y', '@daemux/codemagic-mcp@latest'],
+      env: codemagicEnv,
+    };
+  }
+
   return servers;
 }
 
@@ -67,6 +77,21 @@ export function writeMcpJson(projectDir, servers) {
   }
 }
 
+export function updateMcpAppId(projectDir, appId) {
+  const mcpPath = join(projectDir, '.mcp.json');
+  if (!existsSync(mcpPath)) return false;
+
+  try {
+    const data = readJson(mcpPath);
+    if (!data.mcpServers?.codemagic?.env) return false;
+    data.mcpServers.codemagic.env.CODEMAGIC_APP_ID = appId;
+    writeJson(mcpPath, data);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function removeMcpServers(projectDir) {
   const mcpPath = join(projectDir, '.mcp.json');
   if (!existsSync(mcpPath)) return;
@@ -75,7 +100,7 @@ export function removeMcpServers(projectDir) {
     const data = readJson(mcpPath);
     if (!data.mcpServers) return;
 
-    const toRemove = ['playwright', 'mobile-mcp', 'stitch', 'cloudflare'];
+    const toRemove = ['playwright', 'mobile-mcp', 'stitch', 'cloudflare', 'codemagic'];
     for (const name of toRemove) {
       delete data.mcpServers[name];
     }

package/src/prompt.mjs

@@ -12,11 +12,32 @@ function ask(rl, question) {
   });
 }
 
-export async function promptForTokens() {
+function allTokensProvided(cliTokens) {
+  return (
+    cliTokens.stitchApiKey !== undefined &&
+    cliTokens.cloudflareToken !== undefined &&
+    cliTokens.cloudflareAccountId !== undefined &&
+    cliTokens.codemagicToken !== undefined
+  );
+}
+
+export async function promptForTokens(cliTokens = {}) {
+  const result = {
+    stitchApiKey: cliTokens.stitchApiKey ?? '',
+    cloudflareToken: cliTokens.cloudflareToken ?? '',
+    cloudflareAccountId: cliTokens.cloudflareAccountId ?? '',
+    codemagicToken: cliTokens.codemagicToken ?? '',
+  };
+
+  if (allTokensProvided(cliTokens)) {
+    console.log('All MCP tokens provided via CLI flags, skipping prompts.');
+    return result;
+  }
+
   if (!isInteractive()) {
     console.log('Non-interactive terminal detected, skipping token prompts.');
     console.log('Run "npx store-automator" manually to configure MCP tokens.');
-    return { stitchApiKey: '', cloudflareToken: '', cloudflareAccountId: '', codemagicToken: '' };
+    return result;
   }
 
   const rl = createInterface({
@@ -30,30 +51,35 @@ export async function promptForTokens() {
   console.log('');
 
   try {
-    const stitchApiKey = await ask(
-      rl,
-      'Stitch MCP API Key (STITCH_API_KEY value): '
-    );
-
-    const cloudflareToken = await ask(
-      rl,
-      'Cloudflare API Token: '
-    );
-
-    let cloudflareAccountId = '';
-    if (cloudflareToken) {
-      cloudflareAccountId = await ask(
+    if (cliTokens.stitchApiKey === undefined) {
+      result.stitchApiKey = await ask(
+        rl,
+        'Stitch MCP API Key (STITCH_API_KEY value): '
+      );
+    }
+
+    if (cliTokens.cloudflareToken === undefined) {
+      result.cloudflareToken = await ask(
+        rl,
+        'Cloudflare API Token: '
+      );
+    }
+
+    if (result.cloudflareToken && cliTokens.cloudflareAccountId === undefined) {
+      result.cloudflareAccountId = await ask(
         rl,
         'Cloudflare Account ID: '
       );
     }
 
-    const codemagicToken = await ask(
-      rl,
-      'Codemagic API Token (CM_API_TOKEN for CI/CD builds): '
-    );
+    if (cliTokens.codemagicToken === undefined) {
+      result.codemagicToken = await ask(
+        rl,
+        'Codemagic API Token (CM_API_TOKEN for CI/CD builds): '
+      );
+    }
 
-    return { stitchApiKey, cloudflareToken, cloudflareAccountId, codemagicToken };
+    return result;
   } finally {
     rl.close();
   }

package/src/utils.mjs

@@ -44,3 +44,12 @@ export function readJson(filePath) {
 export function writeJson(filePath, data) {
   writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
 }
+
+export function resolveToken(tokenArg) {
+  const token = process.env.CM_API_TOKEN || tokenArg;
+  if (!token) {
+    console.error('Codemagic API token required. Set CM_API_TOKEN or pass --token=...');
+    process.exit(1);
+  }
+  return token;
+}

package/templates/CLAUDE.md.template

@@ -38,7 +38,7 @@ Prefer using the devops agent over direct Bash/SSH for structured operations.
 ## Configuration Files
 
 ### ci.config.yaml
-Single source of truth: credentials, app identity, store settings, web domain, Codemagic CI/CD (app_id, api_token for build triggering/monitoring, workflow IDs).
+Single source of truth: credentials, app identity, store settings, web domain, Codemagic CI/CD (app_id for GitHub Actions auto-trigger, workflow IDs). The Codemagic API token is managed by the codemagic MCP server in `.mcp.json`.
 
 ### fastlane/metadata/ Structure
 All store listing texts are stored in fastlane directories and managed by the appstore-meta-creator agent:

package/templates/ci.config.yaml.template

@@ -57,10 +57,9 @@ web:
 # === CODEMAGIC CI/CD ===
 # Fill after creating app in Codemagic (https://codemagic.io/apps)
 # Find app_id in your Codemagic dashboard URL: codemagic.io/app/{app_id}
-# Generate API token: Codemagic dashboard → Settings → Integrations → Codemagic API → Show
+# API token is stored in .mcp.json (codemagic MCP server, set during install)
 codemagic:
   app_id: ""
-  api_token: ""
   workflows:
     - ios-release
     - android-release