refactor(target): resolve one app id per operation; keep update.json for both brands

Follow-up to the review of #74.

- keep `update.json` as the selected-app file for cresc too: the cresc docs
  and the client SDK read that name, and `cresc.config.json` was never wired
  in, so switching the default would have broken every existing cresc project
- replace the nine hand-rolled `options.appId || getSelectedApp(...)` blocks
  in bundle/versions/package with one `resolveAppId()` helper
- bundle: resolve the app before any side effect (.gitignore edits, plugin
  probes) so a named bundle without a selected app fails immediately; a
  bundle-only run only tolerates a missing selection (typed
  AppNotSelectedError) and reports malformed configs instead of swallowing
  them; drop the dead `config` forwarding and the three-way cached target
- SDK: `BundleOptions.appId/config` and `provider.getSelectedApp(platform,
  config)` so programmatic callers get the same single-app guarantee
- messages: parse/mismatch errors name the file (or `--appId`) actually used
- tests: exercise bundleCommands.bundle end to end (Hermes base + publish get
  the same app, fail-fast, bundle-only fallback, dev bundles) and the default
  file, instead of the removed wrapper helpers

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JCaS35vZG4DCtmM24MYaVR

Author: sunnylqm

src/app.ts

@@ -14,13 +14,16 @@ interface AppSummary {
 export interface AppTargetOptions {
   appId?: string;
   config?: string;
+  platform?: Platform | '';
 }
 
-export interface ResolvedAppTarget {
-  appId: string;
-  appKey?: string;
-  platform: Platform;
-  configPath: string;
+/** The selected-app config file was missing or has no entry for the platform. */
+export class AppNotSelectedError extends Error {
+  readonly code = 'APP_NOT_SELECTED';
+  constructor(platform: Platform) {
+    super(t('appNotSelected', { platform }));
+    this.name = 'AppNotSelectedError';
+  }
 }
 
 /** Resolve an explicit platform or prompt for one interactively. */
@@ -46,21 +49,26 @@ export async function getSelectedApp(
   assertPlatform(platform);
 
   const resolvedConfigPath = configPath || updateJson;
-  let updateInfo: Partial<Record<Platform, { appId: number; appKey: string }>> =
-    {};
+  let raw: string;
   try {
-    updateInfo = JSON.parse(
-      await fs.promises.readFile(resolvedConfigPath, 'utf8'),
-    );
+    raw = await fs.promises.readFile(resolvedConfigPath, 'utf8');
   } catch (e: any) {
     if (e.code === 'ENOENT') {
-      throw new Error(t('appNotSelected', { platform }));
+      throw new AppNotSelectedError(platform);
     }
     throw e;
   }
+  let updateInfo: Partial<Record<Platform, { appId: number; appKey: string }>>;
+  try {
+    updateInfo = JSON.parse(raw);
+  } catch {
+    throw new Error(
+      t('failedToParseUpdateJson', { configPath: resolvedConfigPath }),
+    );
+  }
   const info = updateInfo[platform];
   if (!info) {
-    throw new Error(t('appNotSelected', { platform }));
+    throw new AppNotSelectedError(platform);
   }
   return {
     appId: String(info.appId),
@@ -69,42 +77,22 @@ export async function getSelectedApp(
   };
 }
 
-/** Resolve an explicit or selected app into a stable operation target. */
-export async function resolveAppTarget(
-  platform: Platform,
+/**
+ * Resolve the app an operation targets: an explicit `--appId` wins, otherwise
+ * the app selected for the platform in `--config` (default: update.json).
+ * Prompts for the platform only when it is needed and not given.
+ */
+export async function resolveAppId(
   options: AppTargetOptions = {},
-): Promise<ResolvedAppTarget> {
-  const configPath = options.config || updateJson;
+): Promise<string> {
+  if (options.platform) {
+    assertPlatform(options.platform);
+  }
   if (options.appId) {
-    return {
-      appId: String(options.appId),
-      platform,
-      configPath,
-    };
+    return String(options.appId);
   }
-
-  return {
-    ...(await getSelectedApp(platform, configPath)),
-    configPath,
-  };
-}
-
-/** Cache app selection for one operation and retry after a failed lookup. */
-export function createAppTargetResolver(
-  platform: Platform,
-  options: AppTargetOptions = {},
-): () => Promise<ResolvedAppTarget> {
-  let pending: Promise<ResolvedAppTarget> | undefined;
-
-  return () => {
-    if (!pending) {
-      pending = resolveAppTarget(platform, options).catch((error) => {
-        pending = undefined;
-        throw error;
-      });
-    }
-    return pending;
-  };
+  const platform = await getPlatform(options.platform || undefined);
+  return (await getSelectedApp(platform, options.config)).appId;
 }
 
 /** List apps, optionally filtering them to one platform. */
@@ -166,7 +154,7 @@ async function selectApp({
     updateInfo = JSON.parse(await fs.promises.readFile(configPath, 'utf8'));
   } catch (e: any) {
     if (e.code !== 'ENOENT') {
-      console.error(t('failedToParseUpdateJson'));
+      console.error(t('failedToParseUpdateJson', { configPath }));
       throw e;
     }
   }

src/bundle.ts

@@ -1,9 +1,5 @@
 import path from 'path';
-import {
-  createAppTargetResolver,
-  getPlatform,
-  type ResolvedAppTarget,
-} from './app';
+import { AppNotSelectedError, getPlatform, resolveAppId } from './app';
 import { packBundle } from './bundle-pack';
 import {
   copyDebugidForSentry,
@@ -67,9 +63,8 @@ function parseCacheMaxMb(value: unknown): number | undefined {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
 }
 
-export type PublishBundlePayload = {
-  appId?: string;
-  config?: string;
+type PublishBundlePayload = {
+  appId: string;
   name?: string;
   description?: string;
   metaInfo?: string;
@@ -192,33 +187,19 @@ async function uploadSentryArtifactsIfNeeded(
   );
 }
 
-/** Build the version publish request while preserving its resolved app target. */
-export function createPublishBundleRequest(
+/** Publish a packed bundle through the version command implementation. */
+async function publishBundleVersion(
   outputPath: string,
   platform: Platform,
   payload: PublishBundlePayload,
-): {
-  args: string[];
-  options: PublishBundlePayload & { platform: Platform };
-} {
-  return {
+): Promise<string> {
+  return versionCommands.publish({
     args: [outputPath],
     options: {
       platform,
       ...payload,
     },
-  };
-}
-
-/** Publish a packed bundle through the version command implementation. */
-async function publishBundleVersion(
-  outputPath: string,
-  platform: Platform,
-  payload: PublishBundlePayload,
-): Promise<string> {
-  return versionCommands.publish(
-    createPublishBundleRequest(outputPath, platform, payload),
-  );
+  });
 }
 
 export const bundleCommands = {
@@ -240,10 +221,48 @@ export const bundleCommands = {
     });
     const normalized = normalizeBundleOptions(translatedOptions, platform);
 
+    // One app per operation: the Hermes base lookup and the publish step must
+    // never see different apps, so the target is resolved once and reused.
+    let appId: string | undefined;
+    const getAppId = async () =>
+      (appId ??= await resolveAppId({
+        appId: normalized.appId,
+        config: normalized.config,
+        platform,
+      }));
+    const hermesBase =
+      normalized.dev === 'true'
+        ? undefined
+        : {
+            option: normalized.hermesBase,
+            verify: normalized.verifyHermesBase,
+            cacheMaxMb: normalized.cacheMaxMb,
+          };
+
+    // Resolve before any side effect or expensive work. A named bundle is
+    // published, so a missing app fails right here; a bundle-only run only
+    // needs the app for the remote Hermes base lookup and may go on without
+    // one (it then compiles a full bundle). Any other config error (e.g.
+    // malformed JSON) is reported immediately either way.
+    if (normalized.name) {
+      await getAppId();
+    } else if (hermesBase?.option === 'auto') {
+      try {
+        await getAppId();
+      } catch (error) {
+        if (!(error instanceof AppNotSelectedError)) {
+          throw error;
+        }
+      }
+    }
+
     checkLockFiles();
     addGitIgnore();
 
-    const bundleParams = await checkPlugins();
+    const [bundleParams] = await Promise.all([
+      checkPlugins(),
+      cleanStaleTmp().catch(() => {}),
+    ]);
     const sourcemapOutput = path.join(
       normalized.intermediaDir,
       `${normalized.bundleName}.map`,
@@ -257,30 +276,8 @@ export const bundleCommands = {
       throw new Error(t('platformRequired'));
     }
 
-    const resolveTarget = createAppTargetResolver(platform, {
-      appId: normalized.appId,
-      config: normalized.config,
-    });
-    let resolvedTarget: ResolvedAppTarget | undefined;
-    const shouldResolveTargetBeforeBundle =
-      Boolean(normalized.name) ||
-      (normalized.dev !== 'true' && normalized.hermesBase === 'auto');
-
-    if (shouldResolveTargetBeforeBundle) {
-      try {
-        resolvedTarget = await resolveTarget();
-      } catch (error) {
-        // A bundle-only command may still fall back when no remote Hermes base
-        // is available. Named publishing must fail before doing expensive work.
-        if (normalized.name) {
-          throw error;
-        }
-      }
-    }
-
     console.log(t('bundlingWithRN', { version: depVersions['react-native'] }));
 
-    await cleanStaleTmp().catch(() => {});
     const hermesResult = await runReactNativeBundleCommand({
       bundleName: normalized.bundleName,
       dev: normalized.dev,
@@ -290,15 +287,7 @@ export const bundleCommands = {
       sourcemapOutput:
         normalized.sourcemap || bundleParams.sourcemap ? sourcemapOutput : '',
       forceHermes: normalized.hermes,
-      hermesBase:
-        normalized.dev === 'true'
-          ? undefined
-          : {
-              option: normalized.hermesBase,
-              appId: resolvedTarget?.appId,
-              verify: normalized.verifyHermesBase,
-              cacheMaxMb: normalized.cacheMaxMb,
-            },
+      hermesBase: hermesBase ? { ...hermesBase, appId } : undefined,
       resetCache: normalized.resetCache,
       cli: {
         taro: normalized.taro,
@@ -318,10 +307,8 @@ export const bundleCommands = {
       : undefined;
 
     if (normalized.name) {
-      const target = resolvedTarget ?? (await resolveTarget());
       await publishBundleVersion(realOutput, platform, {
-        appId: target.appId,
-        config: target.configPath,
+        appId: await getAppId(),
         name: normalized.name,
         description: normalized.description,
         metaInfo: normalized.metaInfo,
@@ -351,10 +338,8 @@ export const bundleCommands = {
     if (!getBooleanOption(options, 'no-interactive', false)) {
       const v = await question(t('uploadBundlePrompt'));
       if (v.toLowerCase() === 'y') {
-        const target = resolvedTarget ?? (await resolveTarget());
         await publishBundleVersion(realOutput, platform, {
-          appId: target.appId,
-          config: target.configPath,
+          appId: await getAppId(),
           hermesBase: baseMeta,
         });
         await uploadSentryArtifactsIfNeeded(

src/locales/en.ts

@@ -16,17 +16,17 @@ export default {
   aabParseResourcesError: 'Parser resources.arsc error: {{error}}',
   appId: 'App ID',
   appIdMismatchApk:
-    'App ID mismatch! Current APK: {{appIdInPkg}}, current update.json: {{appId}}',
+    'App ID mismatch! Current APK: {{appIdInPkg}}, current {{- source}}: {{appId}}',
   appIdMismatchApp:
-    'App ID mismatch! Current APP: {{appIdInPkg}}, current update.json: {{appId}}',
+    'App ID mismatch! Current APP: {{appIdInPkg}}, current {{- source}}: {{appId}}',
   appIdMismatchIpa:
-    'App ID mismatch! Current IPA: {{appIdInPkg}}, current update.json: {{appId}}',
+    'App ID mismatch! Current IPA: {{appIdInPkg}}, current {{- source}}: {{appId}}',
   appKeyMismatchApk:
-    'App Key mismatch! Current APK: {{appKeyInPkg}}, current update.json: {{appKey}}',
+    'App Key mismatch! Current APK: {{appKeyInPkg}}, current {{- source}}: {{appKey}}',
   appKeyMismatchApp:
-    'App Key mismatch! Current APP: {{appKeyInPkg}}, current update.json: {{appKey}}',
+    'App Key mismatch! Current APP: {{appKeyInPkg}}, current {{- source}}: {{appKey}}',
   appKeyMismatchIpa:
-    'App Key mismatch! Current IPA: {{appKeyInPkg}}, current update.json: {{appKey}}',
+    'App Key mismatch! Current IPA: {{appKeyInPkg}}, current {{- source}}: {{appKey}}',
   appName: 'App Name',
   appNameQuestion: 'App Name:',
   appNotSelected:
@@ -57,7 +57,7 @@ export default {
   expiredStatus: '(Expired)',
   failedToParseIcon: '[Warning] failed to parse icon: {{error}}',
   failedToParseUpdateJson:
-    'Failed to parse file `update.json`. Try to remove it manually.',
+    'Failed to parse file `{{- configPath}}`. Try to remove it manually.',
   fileGenerated: '{{- file}} generated.',
   fileSizeExceeded:
     'This file size is {{fileSize}} , exceeding the current quota {{maxSize}} . You may consider upgrading to a higher plan to increase this quota. Details can be found at: {{- pricingPageUrl}}',

src/locales/zh.ts

@@ -14,17 +14,17 @@ export default {
   aabParseResourcesError: '解析 resources.arsc 出错：{{error}}',
   appId: '应用 id',
   appIdMismatchApk:
-    'appId不匹配！当前apk: {{appIdInPkg}}, 当前update.json: {{appId}}',
+    'appId不匹配！当前apk: {{appIdInPkg}}, 当前{{- source}}: {{appId}}',
   appIdMismatchApp:
-    'appId不匹配！当前app: {{appIdInPkg}}, 当前update.json: {{appId}}',
+    'appId不匹配！当前app: {{appIdInPkg}}, 当前{{- source}}: {{appId}}',
   appIdMismatchIpa:
-    'appId不匹配！当前ipa: {{appIdInPkg}}, 当前update.json: {{appId}}',
+    'appId不匹配！当前ipa: {{appIdInPkg}}, 当前{{- source}}: {{appId}}',
   appKeyMismatchApk:
-    'appKey不匹配！当前apk: {{appKeyInPkg}}, 当前update.json: {{appKey}}',
+    'appKey不匹配！当前apk: {{appKeyInPkg}}, 当前{{- source}}: {{appKey}}',
   appKeyMismatchApp:
-    'appKey不匹配！当前app: {{appKeyInPkg}}, 当前update.json: {{appKey}}',
+    'appKey不匹配！当前app: {{appKeyInPkg}}, 当前{{- source}}: {{appKey}}',
   appKeyMismatchIpa:
-    'appKey不匹配！当前ipa: {{appKeyInPkg}}, 当前update.json: {{appKey}}',
+    'appKey不匹配！当前ipa: {{appKeyInPkg}}, 当前{{- source}}: {{appKey}}',
   appName: '应用名称',
   appNameQuestion: '应用名称:',
   appNotSelected:
@@ -53,7 +53,7 @@ export default {
   errorInHarmonyApp: '获取 Harmony 应用入口时出错：{{error}}',
   expiredStatus: '(已过期)',
   failedToParseIcon: '[警告] 解析图标失败：{{error}}',
-  failedToParseUpdateJson: '无法解析文件 `update.json`。请手动删除它。',
+  failedToParseUpdateJson: '无法解析文件 `{{- configPath}}`。请手动删除它。',
   fileGenerated: '已生成 {{- file}}',
   fileSizeExceeded:
     '此文件大小 {{fileSize}} , 超出当前额度 {{maxSize}} 。您可以考虑升级付费业务以提升此额度。详情请访问: {{- pricingPageUrl}}',