@leonxin/meetgames 0.1.18 → 0.1.20

package/src/android/detect.ts

@@ -1,13 +1,15 @@
 import fs from "node:fs";
 import path from "node:path";
-import type { AndroidDetectOptions, AndroidDetectResult } from "../contracts/types.js";
+import type { AndroidDetectOptions, AndroidDetectResult, AndroidSdkModuleResult } from "../contracts/types.js";
 
-function parseIncludes(settingsContent: string): string[] {
+export const DEFAULT_ANDROID_SDK_MODULE_NAME = "unityLibrary";
+
+export function parseIncludes(settingsContent: string): string[] {
   const includes: string[] = [];
-  const includeRegex = /include\s+([^\n]+)/g;
+  const includeRegex = /\binclude\b\s*(?:\(([^)\n]+)\)|([^\n]+))/g;
   let match = includeRegex.exec(settingsContent);
   while (match) {
-    const raw = match[1];
+    const raw = match[1] ?? match[2] ?? "";
     const parts = raw
       .split(",")
       .map((x) => x.trim())
@@ -28,7 +30,7 @@ function isApplicationModule(buildGradleContent: string): boolean {
   return applyPlugin || pluginsBlock || pluginAlias || (hasAndroidBlock && hasApplicationId);
 }
 
-function moduleNameToDir(projectRoot: string, moduleName: string): string {
+export function moduleNameToDir(projectRoot: string, moduleName: string): string {
   const normalized = moduleName.startsWith(":") ? moduleName.slice(1) : moduleName;
   const relative = normalized.replace(/:/g, "/");
   return path.join(projectRoot, relative);
@@ -38,7 +40,7 @@ function defaultManifestPath(moduleDir: string): string {
   return path.join(moduleDir, "src", "main", "AndroidManifest.xml");
 }
 
-function normalizeModuleSelector(value: string): string {
+export function normalizeModuleSelector(value: string): string {
   const trimmed = value.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
   if (!trimmed) return "";
   const asGradlePath = trimmed.replace(/\//g, ":");
@@ -59,18 +61,10 @@ function successResult(projectRoot: string, moduleName: string, moduleDir: strin
 }
 
 export function detectAndroid(projectRoot: string, options: AndroidDetectOptions = {}): AndroidDetectResult {
-  const settingsGradle = path.join(projectRoot, "settings.gradle");
-  const settingsGradleKts = path.join(projectRoot, "settings.gradle.kts");
-  let settingsContent = "";
-  if (fs.existsSync(settingsGradle)) {
-    settingsContent = fs.readFileSync(settingsGradle, "utf8");
-  } else if (fs.existsSync(settingsGradleKts)) {
-    settingsContent = fs.readFileSync(settingsGradleKts, "utf8");
-  } else {
-    return { ok: false, error: "settings.gradle / settings.gradle.kts not found in project root" };
-  }
+  const settings = readAndroidSettings(projectRoot);
+  if (!settings) return { ok: false, error: "settings.gradle / settings.gradle.kts not found in project root" };
 
-  const modules = parseIncludes(settingsContent);
+  const modules = parseIncludes(settings.content);
   if (!modules.length) {
     return { ok: false, error: "no modules found in settings.gradle" };
   }
@@ -114,6 +108,42 @@ export function detectAndroid(projectRoot: string, options: AndroidDetectOptions
   return successResult(projectRoot, moduleName, moduleDir);
 }
 
+function readAndroidSettings(projectRoot: string): { path: string; content: string } | null {
+  const settingsGradle = path.join(projectRoot, "settings.gradle");
+  const settingsGradleKts = path.join(projectRoot, "settings.gradle.kts");
+  if (fs.existsSync(settingsGradle)) {
+    return { path: settingsGradle, content: fs.readFileSync(settingsGradle, "utf8") };
+  }
+  if (fs.existsSync(settingsGradleKts)) {
+    return { path: settingsGradleKts, content: fs.readFileSync(settingsGradleKts, "utf8") };
+  }
+  return null;
+}
+
+export function resolveAndroidSdkModule(
+  projectRoot: string,
+  moduleName = DEFAULT_ANDROID_SDK_MODULE_NAME
+): AndroidSdkModuleResult {
+  const settings = readAndroidSettings(projectRoot);
+  if (!settings) return { ok: false, error: "settings.gradle / settings.gradle.kts not found in project root" };
+  const modules = parseIncludes(settings.content);
+  if (!modules.length) return { ok: false, error: "no modules found in settings.gradle" };
+
+  const requested = normalizeModuleSelector(moduleName);
+  const selected = modules.find((x) => normalizeModuleSelector(x) === requested);
+  if (!selected) {
+    return {
+      ok: false,
+      error: `ANDROID_SDK_MODULE_NOT_FOUND: ${requested}; available modules: ${modules.join(", ")}`,
+    };
+  }
+  return {
+    ok: true,
+    moduleName: normalizeModuleSelector(selected),
+    moduleDir: moduleNameToDir(projectRoot, selected),
+  };
+}
+
 /** Relative path from project root to the detected application module directory (e.g. `app`, `launcher`). */
 export function applicationModuleRelPath(
   projectRoot: string,

package/src/android/gradle.ts

@@ -79,13 +79,28 @@ export function updateRootBuildGradleRepositories(
   }
 
   const snippet = buildRepoSnippet(urls || []);
-  const updated = replaceOrInsertManaged(
+  let updated = replaceOrInsertManaged(
     content,
     repositoriesBlock,
     START_REPO_MARKER,
     END_REPO_MARKER,
     snippet
   );
+
+  const buildscript = findBlockRange(updated, "buildscript");
+  if (buildscript) {
+    const buildscriptRepositoriesBlock = findBlockRange(updated, "repositories", buildscript.start);
+    if (buildscriptRepositoriesBlock && buildscriptRepositoriesBlock.end <= buildscript.end) {
+      updated = replaceOrInsertManaged(
+        updated,
+        buildscriptRepositoriesBlock,
+        START_REPO_MARKER,
+        END_REPO_MARKER,
+        snippet
+      );
+    }
+  }
+
   if (updated === content) warnings.push("root build.gradle repositories unchanged");
   return { ok: true, content: updated, changed: updated !== content, warnings };
 }

package/src/android/meetSdkRemoteGradle.ts

@@ -180,7 +180,7 @@ export type ModuleGradlePluginStyle = "plugins-dsl" | "apply-plugin";
  * Module uses `plugins { }` for the Android application plugin (no `apply plugin: com.android.application`).
  */
 export function detectModuleGradlePluginStyle(content: string): ModuleGradlePluginStyle {
-  if (/apply\s+plugin:\s*['"]com\.android\.application['"]/m.test(content)) {
+  if (/apply\s+plugin:\s*['"]com\.android\.(?:application|library)['"]/m.test(content)) {
     return "apply-plugin";
   }
   const pluginsBlock = findBlockRange(content, "plugins");
@@ -191,8 +191,9 @@ export function detectModuleGradlePluginStyle(content: string): ModuleGradlePlug
   const blockText = content.slice(pluginsBlock.openBrace + 1, pluginsBlock.end);
   if (
     /alias\s*\(\s*libs\.plugins\.android\.application\s*\)/.test(blockText) ||
-    /\bid\s+['"]com\.android\.application['"]/.test(blockText) ||
-    /\bid\s*\(\s*['"]com\.android\.application['"]\s*\)/.test(blockText)
+    /alias\s*\(\s*libs\.plugins\.android\.library\s*\)/.test(blockText) ||
+    /\bid\s+['"]com\.android\.(?:application|library)['"]/.test(blockText) ||
+    /\bid\s*\(\s*['"]com\.android\.(?:application|library)['"]\s*\)/.test(blockText)
   ) {
     return "plugins-dsl";
   }
@@ -525,6 +526,14 @@ function ensureBuildscriptBlock(content: string): string {
   return `buildscript {\n    repositories {\n    }\n    dependencies {\n    }\n}\n\n${content}`;
 }
 
+function uniqueStrings(values: readonly string[]): string[] {
+  const out: string[] = [];
+  for (const value of values) {
+    if (!out.includes(value)) out.push(value);
+  }
+  return out;
+}
+
 export function updateRootBuildGradleMeetSdkRemote(
   content: string,
   params:
@@ -574,7 +583,13 @@ export function updateRootBuildGradleMeetSdkRemote(
     current = removePluginsDslLinesByIds(current, new Set(stripPluginsDslIds));
     current = stripManagedBlocks(current, TOPSDK_PLUGIN_AUTO_START, TOPSDK_PLUGIN_AUTO_END);
   }
-  if (buildscriptRepositories.length > 0 || buildscriptClasspaths.length > 0) {
+  const hasExistingBuildscript = Boolean(findBlockRange(current, "buildscript"));
+  const mergedBuildscriptRepositoriesToApply = uniqueStrings([
+    ...buildscriptRepositories,
+    ...(hasExistingBuildscript || buildscriptRepositories.length > 0 || buildscriptClasspaths.length > 0 ? repositories : []),
+  ]);
+
+  if (mergedBuildscriptRepositoriesToApply.length > 0 || buildscriptClasspaths.length > 0) {
     current = ensureBuildscriptBlock(current);
     const buildscript = findBlockRange(current, "buildscript");
     if (!buildscript) return { ok: false, error: "buildscript block not found in root build.gradle" };
@@ -583,7 +598,7 @@ export function updateRootBuildGradleMeetSdkRemote(
       return { ok: false, error: "repositories block under buildscript not found" };
     }
     const buildscriptReposText = current.slice(repositoriesBlock.openBrace + 1, repositoriesBlock.end);
-    const mergedBuildscriptRepos = mergeRepositoriesInBlock(buildscriptReposText, buildscriptRepositories);
+    const mergedBuildscriptRepos = mergeRepositoriesInBlock(buildscriptReposText, mergedBuildscriptRepositoriesToApply);
     current =
       current.slice(0, repositoriesBlock.openBrace + 1) +
       mergedBuildscriptRepos +
@@ -880,8 +895,25 @@ export type MeetSdkModulePluginConfig = {
   style: ModuleGradlePluginStyle;
   applyPlugins?: readonly string[];
   pluginsDsl?: readonly MeetSdkGradlePluginDslSpec[];
+  writeApplicationId?: boolean;
 };
 
+function findAndroidDefaultConfigBlocks(
+  content: string
+): { androidBlock: { start: number; openBrace: number; end: number }; defaultConfigBlock: { start: number; openBrace: number; end: number } } | null {
+  let searchFrom = 0;
+  while (searchFrom < content.length) {
+    const androidBlock = findBlockRange(content, "android", searchFrom);
+    if (!androidBlock) return null;
+    const defaultConfigBlock = findBlockRange(content, "defaultConfig", androidBlock.start);
+    if (defaultConfigBlock && defaultConfigBlock.end <= androidBlock.end) {
+      return { androidBlock, defaultConfigBlock };
+    }
+    searchFrom = androidBlock.end + 1;
+  }
+  return null;
+}
+
 export function updateModuleBuildGradleMeetSdkRemote(
   content: string,
   config: MeetSdkRemoteConfig,
@@ -896,6 +928,7 @@ export function updateModuleBuildGradleMeetSdkRemote(
       style: detectModuleGradlePluginStyle(content),
       applyPlugins: Array.isArray(plugins) ? plugins : [],
       pluginsDsl: [],
+      writeApplicationId: true,
     };
   }
   const withPlugins =
@@ -905,35 +938,30 @@ export function updateModuleBuildGradleMeetSdkRemote(
         ? mergeApplyPluginsInContent(content, pluginConfig.applyPlugins!)
         : content;
 
-  const androidBlock = findBlockRange(withPlugins, "android");
-  if (!androidBlock) {
-    return { ok: false, error: "android block not found in module build.gradle" };
-  }
-  const defaultConfigBlock = findBlockRange(withPlugins, "defaultConfig", androidBlock.start);
-  if (!defaultConfigBlock || defaultConfigBlock.end > androidBlock.end) {
+  const blocks = findAndroidDefaultConfigBlocks(withPlugins);
+  if (!blocks) {
     return { ok: false, error: "defaultConfig block not found under android" };
   }
-  const withApplicationId = updateDefaultConfigApplicationId(withPlugins, defaultConfigBlock, config.packageName);
-  const refreshedAndroidBlock = findBlockRange(withApplicationId, "android");
-  if (!refreshedAndroidBlock) {
-    return { ok: false, error: "android block not found in module build.gradle" };
-  }
-  const refreshedDefaultConfigBlock = findBlockRange(withApplicationId, "defaultConfig", refreshedAndroidBlock.start);
-  if (!refreshedDefaultConfigBlock || refreshedDefaultConfigBlock.end > refreshedAndroidBlock.end) {
+  const withApplicationId =
+    pluginConfig.writeApplicationId === false
+      ? withPlugins
+      : updateDefaultConfigApplicationId(withPlugins, blocks.defaultConfigBlock, config.packageName);
+  const refreshedBlocks = findAndroidDefaultConfigBlocks(withApplicationId);
+  if (!refreshedBlocks) {
     return { ok: false, error: "defaultConfig block not found under android" };
   }
   const defaultConfigText = withApplicationId.slice(
-    refreshedDefaultConfigBlock.openBrace + 1,
-    refreshedDefaultConfigBlock.end
+    refreshedBlocks.defaultConfigBlock.openBrace + 1,
+    refreshedBlocks.defaultConfigBlock.end
   );
   const mergedDefaultConfigText = mergeResValuesInDefaultConfigBlock(
     defaultConfigText,
     buildResValuesSnippet(config)
   );
   const withResValues =
-    withApplicationId.slice(0, refreshedDefaultConfigBlock.openBrace + 1) +
+    withApplicationId.slice(0, refreshedBlocks.defaultConfigBlock.openBrace + 1) +
     mergedDefaultConfigText +
-    withApplicationId.slice(refreshedDefaultConfigBlock.end);
+    withApplicationId.slice(refreshedBlocks.defaultConfigBlock.end);
 
   const dependenciesBlock = findBlockRange(withResValues, "dependencies");
   if (!dependenciesBlock) {

package/src/cache.ts

@@ -5,11 +5,17 @@ import path from "node:path";
 import { MEETSDK_REMOTE_CONFIG_FILENAME } from "./config/meetSdkRemoteConfig.js";
 
 export const MEET_SDK_TOOL_CACHE_ROOT = path.join(os.homedir(), ".cache", "meet-sdk-tool");
+export const MEETSDK_ANDROID_CONFIG_FILENAME = "meetsdk-android.json";
+export const MEETSDK_IOS_CONFIG_FILENAME = "meetsdk-ios.json";
 
 function iosSdkZipFileName(version: string): string {
   return `topSDK-ios--V${version}.zip`;
 }
 
+function androidSdkZipFileName(version: string): string {
+  return `topSDK-android-V${version}.zip`;
+}
+
 function safeSegment(value: string): string {
   const cleaned = value.trim().replace(/[^a-zA-Z0-9._-]+/g, "_").replace(/^_+|_+$/g, "");
   return cleaned || "unknown";
@@ -52,6 +58,14 @@ export function resolveRemoteConfigCachePath(params: {
   );
 }
 
+export function resolveMeetSdkAndroidConfigCachePath(cacheRoot = MEET_SDK_TOOL_CACHE_ROOT): string {
+  return path.join(cacheRoot, "configs", "sdk-home", MEETSDK_ANDROID_CONFIG_FILENAME);
+}
+
+export function resolveMeetSdkIosConfigCachePath(cacheRoot = MEET_SDK_TOOL_CACHE_ROOT): string {
+  return path.join(cacheRoot, "configs", "sdk-home", MEETSDK_IOS_CONFIG_FILENAME);
+}
+
 export function writeRemoteConfigCache(params: {
   env: string;
   appId: string;
@@ -110,6 +124,29 @@ export function resolveIosSdkCacheLayout(params: {
   };
 }
 
+export function resolveAndroidSdkCacheLayout(params: {
+  version: string;
+  packageType: string;
+  plugins: readonly string[];
+  cacheRoot?: string;
+}): { baseDir: string; zipPath: string; extractDir: string; metadataPath: string; lockDir: string } {
+  const baseDir = path.join(
+    params.cacheRoot ?? MEET_SDK_TOOL_CACHE_ROOT,
+    "sdk",
+    "android",
+    safeSegment(params.packageType),
+    safeSegment(params.version),
+    pluginsHash(params.plugins)
+  );
+  return {
+    baseDir,
+    zipPath: path.join(baseDir, androidSdkZipFileName(params.version)),
+    extractDir: path.join(baseDir, "extracted"),
+    metadataPath: path.join(baseDir, "metadata.json"),
+    lockDir: path.join(baseDir, ".lock"),
+  };
+}
+
 export function writeIosSdkCacheMetadata(params: {
   metadataPath: string;
   version: string;

package/src/cli.ts

@@ -16,7 +16,6 @@ import {
   defaultSdkHomeApiBaseUrl,
   downloadIosSdkToBundled,
   DEFAULT_IOS_SDK_PACKAGE_TYPE,
-  resolveIosSdkDownloadPluginsFromRemoteConfig,
 } from "./remote/sdkHomeDownload.js";
 import type { Manifest } from "./contracts/types.js";
 import {
@@ -63,6 +62,7 @@ interface Parsed {
   topsdkChannelType: string;
   topsdkPackageName: string;
   appTarget: string;
+  sdkModuleName: string;
   sdkHomeApiBaseUrl: string;
   iosSdkPackageType: string;
 }
@@ -72,11 +72,11 @@ function printHelp(): void {
 meetgames — Android-first integration CLI (TypeScript)
 
 Usage:
-  meetgames integrate [--project-root <path>] [--app-id ID] [--channel-type TYPE] [--env prod|pre|test] [--app-target <target>] [--dry-run] [--verbose] [--patch-file <path>]
+  meetgames integrate [--project-root <path>] [--app-id ID] [--channel-type TYPE] [--env prod|pre|test] [--app-target <target>] [--sdk-module <module>] [--dry-run] [--verbose] [--patch-file <path>]
   meetgames fetch-config [--app-id ID] [--app-secret SECRET] [--channel-type TYPE] [--env prod|pre|test] [--project-root <path>] [--verbose]
-  meetgames download-ios-sdk [--package-type native|unity|cocos] [--sdk-api-base-url URL] [--verbose]
-  meetgames setup [--app-id ID] [--app-secret SECRET] [--channel-type TYPE] [--env prod|pre|test] [--project-root <path>] [--app-target <target>] [--dry-run] [--verbose] [--patch-file <path>]
-  meetgames doctor [--app-id ID] [--app-secret SECRET] [--channel-type TYPE] [--env prod|pre|test] --project-root <path> [--app-target <target>] [--verbose]
+  meetgames download-ios-sdk [--project-root <path>] [--app-id ID] [--channel-type TYPE] [--env prod|pre|test] [--package-type native|unity|cocos] [--sdk-api-base-url URL] [--verbose]
+  meetgames setup [--app-id ID] [--app-secret SECRET] [--channel-type TYPE] [--env prod|pre|test] [--project-root <path>] [--app-target <target>] [--sdk-module <module>] [--dry-run] [--verbose]
+  meetgames doctor [--app-id ID] [--app-secret SECRET] [--channel-type TYPE] [--env prod|pre|test] --project-root <path> [--app-target <target>] [--sdk-module <module>] [--verbose]
 
 Notes:
   - Source code is TypeScript only; published bin runs compiled output under dist/.
@@ -87,8 +87,8 @@ Notes:
   - doctor first fetches downloadSDKConfig to the cache, then validates the detected platform integration.
   - integrate uses recipes/integrate-default.yaml, filtered to the detected platform before execution.
   - iOS SDK is read from ${MEET_SDK_TOOL_CACHE_ROOT}/sdk/ios/.
-  - Android integrate/doctor reads the latest SDK version from sdk-home and stores it in config/meetsdk-android.json.
-  - download-ios-sdk calls sdk-home getDownLoadUrl, saves and extracts the iOS SDK under ${MEET_SDK_TOOL_CACHE_ROOT}/sdk/ios/.
+  - Android integrate/doctor reads latest SDK config from sdk-home and stores it under ${MEET_SDK_TOOL_CACHE_ROOT}/configs/sdk-home/.
+  - download-ios-sdk reads an iOS meetsdk-remote-config.json, derives sdk-home plugins from it, then calls sdk-home getDownLoadUrl and extracts the iOS SDK under ${MEET_SDK_TOOL_CACHE_ROOT}/sdk/ios/.
   - fetch-config requires --app-secret (or TOPSDK_APP_SECRET) to sign downloadSDKConfig; appSecret is never read from meetsdk-remote-config.json.
   - When analytics.firebase is enabled, Android downloads google-services.json to the detected/selected app module; iOS downloads GoogleService-Info.plist next to Info.plist.
   - fetch-config writes to ${MEET_SDK_TOOL_CACHE_ROOT}/configs/<env>/<appId>/<channelType>/meetsdk-remote-config.json.
@@ -98,22 +98,23 @@ Notes:
 Options (global where noted):
   --project-root        Host project directory (default: cwd); for iOS it may point to the project root or directly to a .xcodeproj directory
   --app-target          App target to integrate/check: Android application Gradle module (e.g. :app or launcher) or iOS App target name
+  --sdk-module          Android SDK integration Gradle module for resValue/dependencies (default: unityLibrary); must be included by settings.gradle/settings.gradle.kts
   --app-id              fetch-config/integrate/doctor cache selector; default TOPSDK_APP_ID
   --app-secret          fetch-config: required appSecret for downloadSDKConfig sign (or env TOPSDK_APP_SECRET)
   --channel-type        fetch-config/integrate/doctor cache selector; default TOPSDK_CHANNEL_TYPE
   --env                 fetch-config: prod（正式服，默认）| pre | test（开发调试）
   TOPSDK_API_BASE_URL   fetch-config: 覆盖 API 根地址（如 http://localhost:18080/ 联调本机 console）
   MEETGAMES_SDK_HOME_API_BASE_URL  覆盖 sdk-home API 根地址（默认 https://business-api.meetgames.com）；用于 Android 最新版本查询和 iOS SDK 下载
-  --sdk-api-base-url    sdk-home API 根地址；用于 Android 最新版本查询和 iOS SDK 下载
+  --sdk-api-base-url    sdk-home API 根地址；用于 Android 最新版本查询和 iOS SDK 下载（setup 不支持）
   --package-type        download-ios-sdk: native（默认）| unity | cocos
-  --dry-run             integrate: compute changes and patch preview without writing host project files (default is write to disk)
-  --report-file         Write JSON report to path
-  --patch-file          integrate: write unified diff to this path (works with --dry-run). If under <pkg>/preview-patches/, all existing files in that dir are removed first so only the latest patch remains.
+  --dry-run             integrate/setup: compute changes without writing host project files (setup still writes fetched config cache)
+  --report-file         integrate: write JSON report to path
+  --patch-file          integrate: write unified diff to this path (works with --dry-run). If under <pkg>/fixtures/expected-patches/, all existing files in that dir are removed first so only the latest patch remains.
   --verbose             Verbose logs and full patch preview
 
 Subcommand notes:
   - integrate defaults to writing files; use --dry-run for CI preview / diff-only.
-  - setup: step 1 always writes meetsdk-remote-config.json; step 2 honors --dry-run / --patch-file / --report-file.
+  - setup: step 1 always writes meetsdk-remote-config.json; step 2 honors --dry-run.
   - fetch-config ignores --dry-run, --report-file, --patch-file (shared parser only).
 `);
 }
@@ -134,6 +135,7 @@ function parseArgv(argv: string[]): Parsed {
     topsdkChannelType: "",
     topsdkPackageName: "",
     appTarget: "",
+    sdkModuleName: "",
     sdkHomeApiBaseUrl: "",
     iosSdkPackageType: "",
   };
@@ -169,6 +171,12 @@ function parseArgv(argv: string[]): Parsed {
       i += 1;
       continue;
     }
+    if (t === "--sdk-module") {
+      out.sdkModuleName = rest[i + 1] ?? "";
+      if (!out.sdkModuleName || out.sdkModuleName.startsWith("-")) fail("--sdk-module requires a module name", EXIT.INVALID_ARGS);
+      i += 1;
+      continue;
+    }
     if (t === "--sdk-api-base-url") {
       out.sdkHomeApiBaseUrl = rest[i + 1] ?? "";
       if (!out.sdkHomeApiBaseUrl || out.sdkHomeApiBaseUrl.startsWith("-")) {
@@ -232,6 +240,10 @@ function resolvedAppTarget(parsed: Parsed): string {
   return parsed.appTarget;
 }
 
+function resolvedSdkModuleName(parsed: Parsed): string | undefined {
+  return parsed.sdkModuleName.trim() || undefined;
+}
+
 function cachedRemoteConfigPathFromArgs(parsed: Parsed): string {
   const appId = parsed.topsdkAppId || process.env.TOPSDK_APP_ID || "";
   const channelType = parsed.topsdkChannelType || process.env.TOPSDK_CHANNEL_TYPE || "";
@@ -246,6 +258,7 @@ function selectedPlatformContext(parsed: Parsed): {
 } {
   const ctx = buildWorkspaceContext(parsed.projectRoot, resolvePackageRoot(), {
     appTarget: resolvedAppTarget(parsed),
+    sdkModuleName: resolvedSdkModuleName(parsed),
     sdkHomeApiBaseUrl: parsed.sdkHomeApiBaseUrl || undefined,
     remoteConfigPath: cachedRemoteConfigPathFromArgs(parsed) || undefined,
   });
@@ -396,12 +409,20 @@ async function cmdSetup(parsed: Parsed): Promise<void> {
   await cmdIntegrate(parsed);
 }
 
-function readIosDownloadPluginsFromRemoteConfig(configPath: string): string[] | undefined {
-  if (!configPath || !fs.existsSync(configPath)) return undefined;
-  const remote = tryParseAsMeetSdkRemoteConfig(JSON.parse(fs.readFileSync(configPath, "utf8")) as unknown);
-  if (!remote || remote.devicePlatform !== "ios") return undefined;
-  const plugins = resolveIosSdkDownloadPluginsFromRemoteConfig(remote);
-  return plugins.length ? plugins : undefined;
+function resolveIosDownloadRemoteConfigPath(parsed: Parsed, explicitPath?: string): string {
+  const candidates = [
+    explicitPath,
+    cachedRemoteConfigPathFromArgs(parsed),
+    path.join(parsed.projectRoot, MEETSDK_REMOTE_CONFIG_FILENAME),
+  ]
+    .filter((p): p is string => Boolean(p))
+    .filter((p, i, arr) => arr.indexOf(p) === i);
+  const found = candidates.find((p) => fs.existsSync(p));
+  if (found) return found;
+  fail(
+    `download-ios-sdk requires an iOS ${MEETSDK_REMOTE_CONFIG_FILENAME}; checked: ${candidates.join(", ")}`,
+    EXIT.CONFIG_ERROR
+  );
 }
 
 async function cmdDownloadIosSdk(parsed: Parsed, remoteConfigPath?: string): Promise<void> {
@@ -411,15 +432,15 @@ async function cmdDownloadIosSdk(parsed: Parsed, remoteConfigPath?: string): Pro
   if (!["native", "unity", "cocos"].includes(packageType)) {
     fail(`invalid --package-type (use native, unity, or cocos): ${packageType}`, EXIT.INVALID_ARGS);
   }
-  const configuredPlugins = remoteConfigPath ? readIosDownloadPluginsFromRemoteConfig(remoteConfigPath) : undefined;
-  const plugins = configuredPlugins;
+  const configPath = resolveIosDownloadRemoteConfigPath(parsed, remoteConfigPath);
 
+  console.log(`[meetgames] download-ios-sdk: using remote config ${configPath}`);
   console.log("[meetgames] download-ios-sdk: resolving sdk-home iOS SDK…");
   let result;
   try {
     result = await downloadIosSdkToBundled(resolvePackageRoot(), {
       baseUrl,
-      plugins,
+      remoteConfigPath: configPath,
       packageType,
     });
   } catch (e) {
@@ -462,7 +483,16 @@ export async function main(): Promise<void> {
   if (parsed.appTarget && !["doctor", "setup", "integrate"].includes(parsed.command)) {
     fail("--app-target is only supported by doctor, setup, and integrate", EXIT.INVALID_ARGS);
   }
+  if (parsed.sdkModuleName && !["doctor", "setup", "integrate"].includes(parsed.command)) {
+    fail("--sdk-module is only supported by doctor, setup, and integrate", EXIT.INVALID_ARGS);
+  }
+  if (parsed.command === "setup") {
+    if (parsed.patchFile) fail("--patch-file is not supported by setup", EXIT.INVALID_ARGS);
+    if (parsed.reportFile) fail("--report-file is not supported by setup", EXIT.INVALID_ARGS);
+    if (parsed.sdkHomeApiBaseUrl) fail("--sdk-api-base-url is not supported by setup", EXIT.INVALID_ARGS);
+  }
   resolvedAppTarget(parsed);
+  resolvedSdkModuleName(parsed);
 
   switch (parsed.command) {
     case "doctor":