@leonxin/meetgames 0.1.13 → 0.1.14

package/src/ios/integrate.ts

@@ -31,6 +31,7 @@ import {
   addSystemLib,
   addThirdPartyFramework,
   findInfoPlistPathsFromPbx,
+  getTargetBuildSettings,
   loadPbxFromStore,
   savePbxToStore,
   setBuildSetting,
@@ -50,6 +51,29 @@ export interface IosIntegrateOptions {
 
 const IOS_FIREBASE_CONFIG_FILE = "GoogleService-Info.plist";
 
+function logValue(value: unknown): string {
+  if (value === undefined) return "<missing>";
+  if (typeof value === "string") return value;
+  return JSON.stringify(value);
+}
+
+function pushValueChangeLog(logs: string[], label: string, before: unknown, after: unknown): void {
+  if (valuesEqual(before, after)) {
+    logs.push(`SUCCESS: ${label} 未变化 value:${logValue(after)}`);
+    return;
+  }
+  logs.push(`SUCCESS: ${label} ${logValue(before)} -> ${logValue(after)}`);
+}
+
+function valuesEqual(before: unknown, after: unknown): boolean {
+  return JSON.stringify(before) === JSON.stringify(after);
+}
+
+function cloneValue(value: unknown): unknown {
+  if (value === undefined) return undefined;
+  return JSON.parse(JSON.stringify(value)) as unknown;
+}
+
 function ok(changed: string[], warnings: string[] = [], logs: string[] = []): StepResult {
   return { ok: true, changedFiles: changed, logs, warnings, errors: [] };
 }
@@ -70,7 +94,6 @@ function applyPlugin(
   remoteSources: Map<string, string> = new Map()
 ): void {
   const { config, sourceDir } = loaded;
-  const srcRoot = pbx.srcRoot;
 
   logs.push(`- 插件：${config.name}, 类型：${config.type},版本：${config.pluginVersion}`);
 
@@ -163,7 +186,13 @@ function applyPlugin(
 
   if (perform.includes("buildSettings") && config.buildSettings) {
     for (const [k, v] of Object.entries(config.buildSettings)) {
-      setBuildSetting(pbx, k, v);
+      const beforeValues = [...new Set(getTargetBuildSettings(pbx).map((settings) => settings[k]))];
+      if (beforeValues.length === 0 || beforeValues.some((before) => !valuesEqual(before, v))) {
+        setBuildSetting(pbx, k, v);
+      }
+      for (const before of beforeValues.length ? beforeValues : [undefined]) {
+        pushValueChangeLog(logs, `BuildSetting设置${k}`, before, v);
+      }
       logs.push(`SUCCESS: BuildSetting设置${k}为${v} 完成`);
     }
   }
@@ -174,8 +203,6 @@ function applyPlugin(
       logs.push(`SUCCESS: 添加other link flag:${flag} 完成`);
     }
   }
-
-  logs.push(`SUCCESS: 插件${config.name}接入完成`);
 }
 
 function validateLoadedPluginResourcesForIos(loaded: LoadedPluginConfig): string[] {
@@ -325,7 +352,8 @@ function mergePlistParams(
   loaded: LoadedPluginConfig,
   channelConfig: Record<string, unknown>,
   perform: readonly PerformSetting[],
-  logs: string[]
+  logs: string[],
+  dirtyDocs: Set<PlistDocument>
 ): void {
   if (!perform.includes("infoParams") && !perform.includes("urlScheme") && !perform.includes("queriesSchemes")) {
     return;
@@ -334,20 +362,31 @@ function mergePlistParams(
     if (perform.includes("infoParams") && loaded.config.infoParams) {
       for (const [key, raw] of Object.entries(loaded.config.infoParams)) {
         const value = applyChannelTemplateValue(raw, channelConfig);
-        addPlistParam(doc.data, key, value);
+        const before = doc.data[key];
+        if (!valuesEqual(before, value)) {
+          addPlistParam(doc.data, key, value);
+          dirtyDocs.add(doc);
+        }
+        pushValueChangeLog(logs, `info.plist配置key：${key}`, before, value);
         logs.push(`SUCCESS: info.plist添加配置key：${key} value:${String(value)} 完成`);
       }
     }
     if (perform.includes("queriesSchemes") && loaded.config.queriesSchemes?.length) {
       for (const scheme of loaded.config.queriesSchemes) {
+        const before = cloneValue(doc.data.LSApplicationQueriesSchemes ?? []);
         addQueriesScheme(doc.data, scheme);
+        if (!valuesEqual(before, doc.data.LSApplicationQueriesSchemes)) dirtyDocs.add(doc);
+        pushValueChangeLog(logs, `info.plist queriesSchemes ${scheme}`, before, doc.data.LSApplicationQueriesSchemes);
         logs.push(`SUCCESS: 添加queriesSchemes:${scheme} 完成`);
       }
     }
     if (perform.includes("urlScheme") && loaded.config.urlScheme) {
       let scheme = applyChannelTemplate(loaded.config.urlScheme, channelConfig);
       if (scheme.endsWith("://")) scheme = scheme.replace("://", "");
+      const before = cloneValue(doc.data.CFBundleURLTypes ?? []);
       addUrlScheme(doc.data, scheme);
+      if (!valuesEqual(before, doc.data.CFBundleURLTypes)) dirtyDocs.add(doc);
+      pushValueChangeLog(logs, `info.plist URL Scheme ${scheme}`, before, doc.data.CFBundleURLTypes);
       logs.push(`SUCCESS: 设置urlScheme：${scheme}完成`);
     }
   }
@@ -378,6 +417,89 @@ function buildTopSdkPluginInfo(
   return { pluginsInfo, dataPluginsInfo };
 }
 
+function injectDelegateCodes(
+  loadedConfigs: LoadedPluginConfig[],
+  ctx: WorkspaceContext,
+  store: TextFileStore,
+  pbx: PbxContext,
+  warnings: string[],
+  changed: Set<string>,
+  logs: string[]
+): void {
+  const hasAppDelegateCodes = loadedConfigs.some((loaded) => (loaded.config.appDelegateCodes ?? []).length > 0);
+  const hasSceneDelegateCodes = loadedConfigs.some((loaded) => (loaded.config.sceneDelegateCodes ?? []).length > 0);
+  if (!hasAppDelegateCodes && !hasSceneDelegateCodes) return;
+
+  const sceneDelegateRelPaths: string[] = [];
+  for (const abs of findSceneDelegateFiles(pbx.srcRoot)) {
+    sceneDelegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
+  }
+  const hasUniqueSceneDelegate = sceneDelegateRelPaths.length === 1;
+
+  const delegateRelPaths: string[] = [];
+  for (const abs of findDelegateFiles(pbx.srcRoot)) {
+    delegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
+  }
+  if (hasAppDelegateCodes && !delegateRelPaths.length) {
+    warnings.push("no UIApplicationDelegate .m/.mm found; skipped AppDelegate injection (SwiftUI @main is not supported yet)");
+  }
+  if (hasAppDelegateCodes && delegateRelPaths.length > 1) {
+    warnings.push(`multiple UIApplicationDelegate files found; skipped AppDelegate injection: ${delegateRelPaths.join(", ")}`);
+  }
+  for (const rel of hasAppDelegateCodes && delegateRelPaths.length === 1 ? delegateRelPaths : []) {
+    const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+    logs.push("检测到工程UIApplicationDelegate实现类，将自动接入对应接口");
+    let okInject = true;
+    for (const loaded of loadedConfigs) {
+      for (const code of appDelegateCodesForLifecycle(loaded, hasUniqueSceneDelegate)) {
+        const existed = cu.hasCode(code.content);
+        if (code.type === "header") {
+          if (!cu.addHeader(code.content)) okInject = false;
+        } else if ((code.type === "method" || code.type === "code") && code.method) {
+          if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
+        }
+        if (okInject) {
+          logs.push(
+            `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+          );
+        }
+      }
+    }
+    if (!okInject) warnings.push(`AppDelegate injection incomplete for ${rel}`);
+    const before = store.read(rel);
+    cu.applyToStore((c) => store.write(rel, c));
+    if (store.read(rel) !== before) changed.add(rel);
+  }
+
+  if (hasSceneDelegateCodes && sceneDelegateRelPaths.length > 1) {
+    warnings.push(`multiple UIWindowSceneDelegate files found; skipped SceneDelegate injection: ${sceneDelegateRelPaths.join(", ")}`);
+  }
+  for (const rel of hasSceneDelegateCodes && sceneDelegateRelPaths.length === 1 ? sceneDelegateRelPaths : []) {
+    const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+    logs.push("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
+    let okInject = true;
+    for (const loaded of loadedConfigs) {
+      for (const code of loaded.config.sceneDelegateCodes ?? []) {
+        const existed = cu.hasCode(code.content);
+        if (code.type === "header") {
+          if (!cu.addHeader(code.content)) okInject = false;
+        } else if ((code.type === "method" || code.type === "code") && code.method) {
+          if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
+        }
+        if (okInject) {
+          logs.push(
+            `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+          );
+        }
+      }
+    }
+    if (!okInject) warnings.push(`SceneDelegate injection incomplete for ${rel}`);
+    const before = store.read(rel);
+    cu.applyToStore((c) => store.write(rel, c));
+    if (store.read(rel) !== before) changed.add(rel);
+  }
+}
+
 export async function runIosIntegrateTopSdk(
   ctx: WorkspaceContext,
   store: TextFileStore,
@@ -444,6 +566,7 @@ export async function runIosIntegrateTopSdk(
   } catch (e) {
     return fail([e instanceof Error ? e.message : String(e)], warnings, logs);
   }
+  const dirtyPlistDocs = new Set<PlistDocument>();
 
   const firebaseDownload = await downloadIosFirebaseConfig(remote, pbx, dryRun, iosFirebaseConfigRelPath(plistDocs));
   warnings.push(...firebaseDownload.warnings);
@@ -466,112 +589,64 @@ export async function runIosIntegrateTopSdk(
         logs.push("SUCCESS: 未检测到Swift代码文件，自动添加TopSDKInstall.swift完成");
       }
     }
+    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs, dirtyPlistDocs);
+    if (perform.includes("infoParams")) {
+      const doc = plistDocs[0];
+      if (doc) {
+        const before = cloneValue(doc.data.NSAppTransportSecurity);
+        setAppTransportSecurity(doc.data, true);
+        if (!valuesEqual(before, doc.data.NSAppTransportSecurity)) dirtyPlistDocs.add(doc);
+      }
+    }
+    if (perform.includes("infoParams") && loaded.config.name === "AppleSignin") {
+      for (const rel of ensureAppleSignInEntitlement(store, ctx.projectRoot, pbx)) {
+        changed.add(rel);
+      }
+      logs.push("SUCCESS: 启用SigninWithApple完成");
+    }
+    logs.push(`SUCCESS: 插件${loaded.config.name}接入完成`);
   }
   for (const loaded of coreConfigs) {
     applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, logs, firebaseDownload.remoteSources);
-  }
-
-  for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs);
+    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs, dirtyPlistDocs);
     if (perform.includes("infoParams")) {
-      setAppTransportSecurity(plistDocs[0]?.data ?? {}, true);
+      const doc = plistDocs[0];
+      if (doc) {
+        const before = cloneValue(doc.data.NSAppTransportSecurity);
+        setAppTransportSecurity(doc.data, true);
+        if (!valuesEqual(before, doc.data.NSAppTransportSecurity)) dirtyPlistDocs.add(doc);
+      }
     }
+    if (executeAppDelegate) {
+      injectDelegateCodes([loaded], ctx, store, pbx, warnings, changed, logs);
+    }
+    logs.push(`SUCCESS: 插件${loaded.config.name}接入完成`);
   }
   for (const doc of plistDocs) {
     if (perform.includes("infoParams")) {
       const { pluginsInfo, dataPluginsInfo } = buildTopSdkPluginInfo(pluginConfigs, channelConfig);
-      addPlistParam(doc.data, "TOPSDK", {
+      const before = doc.data.TOPSDK;
+      const nextTopSdk = {
         APP_ID: remote.topsdk.appId,
         Plugins: pluginsInfo,
         dataPlugins: dataPluginsInfo,
-      });
+      };
+      if (!valuesEqual(before, nextTopSdk)) {
+        addPlistParam(doc.data, "TOPSDK", nextTopSdk);
+        dirtyPlistDocs.add(doc);
+      }
+      pushValueChangeLog(logs, "info.plist配置key：TOPSDK", before, nextTopSdk);
     }
     const rel = path.relative(ctx.projectRoot, path.join(pbx.srcRoot, doc.relPath)).split(path.sep).join("/");
-    store.write(rel, buildPlistXml(doc.data));
-    changed.add(rel);
-  }
-
-  if (perform.includes("infoParams") && pluginConfigs.some((p) => p.config.name === "AppleSignin")) {
-    for (const rel of ensureAppleSignInEntitlement(store, ctx.projectRoot, pbx)) {
+    if (dirtyPlistDocs.has(doc)) {
+      store.write(rel, buildPlistXml(doc.data));
       changed.add(rel);
     }
-    logs.push("SUCCESS: 启用SigninWithApple完成");
   }
 
   savePbxToStore(store, pbx);
   changed.add(pbx.rel);
 
-  if (executeAppDelegate) {
-    const sceneDelegateRelPaths: string[] = [];
-    for (const abs of findSceneDelegateFiles(pbx.srcRoot)) {
-      sceneDelegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
-    }
-    const hasUniqueSceneDelegate = sceneDelegateRelPaths.length === 1;
-
-    const delegateRelPaths: string[] = [];
-    for (const abs of findDelegateFiles(pbx.srcRoot)) {
-      delegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
-    }
-    if (!delegateRelPaths.length) {
-      warnings.push("no UIApplicationDelegate .m/.mm found; skipped AppDelegate injection (SwiftUI @main is not supported yet)");
-    }
-    if (delegateRelPaths.length > 1) {
-      warnings.push(`multiple UIApplicationDelegate files found; skipped AppDelegate injection: ${delegateRelPaths.join(", ")}`);
-    }
-    for (const rel of delegateRelPaths.length === 1 ? delegateRelPaths : []) {
-      const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
-      logs.push("检测到工程UIApplicationDelegate实现类，将自动接入对应接口");
-      let okInject = true;
-      for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-        for (const code of appDelegateCodesForLifecycle(loaded, hasUniqueSceneDelegate)) {
-          const existed = cu.hasCode(code.content);
-          if (code.type === "header") {
-            if (!cu.addHeader(code.content)) okInject = false;
-          } else if ((code.type === "method" || code.type === "code") && code.method) {
-            if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
-          }
-          if (okInject) {
-            logs.push(
-              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
-            );
-          }
-        }
-      }
-      if (!okInject) warnings.push(`AppDelegate injection incomplete for ${rel}`);
-      const before = store.read(rel);
-      cu.applyToStore((c) => store.write(rel, c));
-      if (store.read(rel) !== before) changed.add(rel);
-    }
-
-    if (sceneDelegateRelPaths.length > 1) {
-      warnings.push(`multiple UIWindowSceneDelegate files found; skipped SceneDelegate injection: ${sceneDelegateRelPaths.join(", ")}`);
-    }
-    for (const rel of sceneDelegateRelPaths.length === 1 ? sceneDelegateRelPaths : []) {
-      const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
-      logs.push("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
-      let okInject = true;
-      for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-        for (const code of loaded.config.sceneDelegateCodes ?? []) {
-          const existed = cu.hasCode(code.content);
-          if (code.type === "header") {
-            if (!cu.addHeader(code.content)) okInject = false;
-          } else if ((code.type === "method" || code.type === "code") && code.method) {
-            if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
-          }
-          if (okInject) {
-            logs.push(
-              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
-            );
-          }
-        }
-      }
-      if (!okInject) warnings.push(`SceneDelegate injection incomplete for ${rel}`);
-      const before = store.read(rel);
-      cu.applyToStore((c) => store.write(rel, c));
-      if (store.read(rel) !== before) changed.add(rel);
-    }
-  }
-
   logs.push("SUCCESS: info.plist配置写入完成");
   logs.push("！！ 接入流程已全部结束 ！！");
   return ok([...changed], warnings, logs);

package/src/ops/handlers.ts

@@ -25,14 +25,49 @@ import { loadMeetSdkDefaultConfigWithLatestAndroidVersion } from "../config/meet
 import { insertPermissions } from "../android/manifest.js";
 import type { TextFileStore } from "./fileStore.js";
 
-function ok(changed: string[], warnings: string[] = []): StepResult {
-  return { ok: true, changedFiles: changed, warnings, errors: [] };
+function ok(changed: string[], warnings: string[] = [], logs: string[] = []): StepResult {
+  return { ok: true, changedFiles: changed, logs, warnings, errors: [] };
 }
 
 function fail(errors: string[]): StepResult {
   return { ok: false, changedFiles: [], warnings: [], errors };
 }
 
+function androidApplicationId(content: string): string | undefined {
+  const match = content.match(/^\s*applicationId\s+(?:=+\s*)?["']([^"']*)["']/m);
+  return match?.[1];
+}
+
+function androidResValues(content: string): Map<string, string> {
+  const out = new Map<string, string>();
+  const re = /resValue\s*\(\s*['"]([^'"]+)['"]\s*,\s*['"]([^'"]+)['"]\s*,\s*(['"])(.*?)\3\s*\)/g;
+  for (const match of content.matchAll(re)) {
+    out.set(match[2], `${match[1]}:${match[4]}`);
+  }
+  return out;
+}
+
+function androidConfigChangeLogs(before: string, after: string): string[] {
+  const logs: string[] = [];
+  const beforeAppId = androidApplicationId(before);
+  const afterAppId = androidApplicationId(after);
+  if (afterAppId !== undefined && beforeAppId !== afterAppId) {
+    logs.push(`[meetgames] Android applicationId ${beforeAppId === undefined ? "<missing>" : beforeAppId} -> ${afterAppId}`);
+  }
+
+  const beforeRes = androidResValues(before);
+  const afterRes = androidResValues(after);
+  for (const [key, next] of afterRes) {
+    const prev = beforeRes.get(key);
+    if (prev === undefined) {
+      logs.push(`[meetgames] Android resValue ${key} <missing> -> ${next}`);
+    } else if (prev !== next) {
+      logs.push(`[meetgames] Android resValue ${key} ${prev} -> ${next}`);
+    }
+  }
+  return logs;
+}
+
 function readRootBuildGradle(projectRoot: string): { rel: string; abs: string } | null {
   const a = path.join(projectRoot, "build.gradle");
   if (fs.existsSync(a)) return { rel: "build.gradle", abs: a };
@@ -183,7 +218,7 @@ export const opHandlers: Record<string, OpHandler> = {
 
     store.write(modRel, modU.content);
     if (modU.changed) changed.push(modRel);
-    return ok(changed, [...warnings, ...modU.warnings]);
+    return ok(changed, [...warnings, ...modU.warnings], androidConfigChangeLogs(modBefore, modU.content));
   },
 
   "gradle.insertRepositories": (ctx, store, args, _dry, _bc) => {

package/tests/doctor.test.ts

@@ -11,15 +11,55 @@ import { resolveIosSdkRootFromDirectory } from "../src/remote/sdkHomeDownload.js
 
 const pkgRoot = path.resolve(__dirname, "..");
 const androidLatestRoot = path.join(pkgRoot, "fixtures", "android-test-project", "android-latest-project");
-const iosProjectRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "tooltest");
-const iosRemoteConfigFixture = path.join(pkgRoot, "fixtures", "meetsdk-remote-config.ios-tooltest.json");
+const iosProjectRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "native-sample");
 const hasIosProjectFixture = fs.existsSync(iosProjectRoot);
 const fixtureIosSdkRoot = resolveIosSdkRootFromDirectory(path.join(pkgRoot, "fixtures", "ios-sdk", "topSDK-ios--V1.6.0.5"));
 
 function copyIosProjectToTemp(): string {
   const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "meet-ios-doctor-"));
   fs.cpSync(iosProjectRoot, tmp, { recursive: true });
-  fs.copyFileSync(iosRemoteConfigFixture, path.join(tmp, "meetsdk-remote-config.json"));
+  fs.writeFileSync(
+    path.join(tmp, "meetsdk-remote-config.json"),
+    JSON.stringify(
+      {
+        packageName: "com.meetgames.topsdk.demo",
+        channel: "APPLE",
+        devicePlatform: "ios",
+        topsdk: {
+          appId: "mock-ios-native-sample-app-id",
+          appSecret: "mock-ios-native-sample-app-secret-do-not-use-in-production",
+        },
+        sdkModules: {
+          login: {
+            guest: {},
+            facebook: {
+              clientId: "883695101201170",
+              scheme: "fb883695101201170",
+              secret: "f840b8663b1351ddcb8f6a640cee18c6",
+              name: "top-demo",
+              openMessenger: "0",
+            },
+            google: {
+              clientId: "396842465987-8sg3ngohnl5f2r8no5etu401ruv6snql.apps.googleusercontent.com",
+              scheme: "com.googleusercontent.apps.396842465987-8sg3ngohnl5f2r8no5etu401ruv6snql",
+            },
+            apple: {},
+          },
+          payment: { googleIap: {} },
+          analytics: {
+            appsflyer: {
+              devKey: "af-dev-key",
+              appleAppId: "123456789",
+              enableDebugLog: true,
+            },
+          },
+        },
+      },
+      null,
+      2
+    ),
+    "utf8"
+  );
   return tmp;
 }
 

package/tests/meetSdkRemoteConfig.test.ts

@@ -14,7 +14,7 @@ import { loadBuiltInMeetSdkDefaultConfig } from "../src/config/meetSdkDefaultCon
 const here = path.dirname(fileURLToPath(import.meta.url));
 const refPath = path.join(here, "..", "fixtures", "topsdk-config-reference.json");
 const offlineMockPath = path.join(here, "..", "fixtures", "meetsdk-remote-config.mock.json");
-const offlineIosMockPath = path.join(here, "..", "fixtures", "meetsdk-remote-config.ios-tooltest.json");
+const offlineIosMockPath = path.join(here, "..", "fixtures", "meetsdk-remote-config.ios-native-sample.json");
 const downloadShapePath = path.join(here, "..", "fixtures", "meetsdk-remote-config.download-shape.json");
 
 const mapCtx = {

package/tests/meetSdkRemoteGradle.test.ts

@@ -150,7 +150,7 @@ android {
     expect(modOut.content.indexOf(TOPSDK_PLUGIN_AUTO_START)).toBeLessThan(modOut.content.indexOf("dependencies"));
   });
 
-  it("updates apply plugin by id instead of duplicating", () => {
+  it("keeps an existing apply plugin with the same id instead of duplicating or rewriting", () => {
     const modIn = `
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
@@ -173,7 +173,7 @@ dependencies { }
       .split("\n")
       .filter((l) => l.includes("com.google.gms.google-services"));
     expect(pluginLines.length).toBe(1);
-    expect(modOut.content).toContain(TOPSDK_PLUGIN_AUTO_START);
+    expect(modOut.content).not.toContain(TOPSDK_PLUGIN_AUTO_START);
   });
 
   it("updates classpath by group:artifact instead of duplicating", () => {

package/tests/pipeline.android.test.ts

@@ -40,7 +40,10 @@ function testProjectRoot(...names: string[]): string {
   return path.join(androidFixtureRoot, names[0] ?? "");
 }
 
-async function runAndroidPipelineDryRun(projectRoot: string, opts?: { requirePackageNameInPatch?: boolean }) {
+async function runAndroidPipelineDryRun(
+  projectRoot: string,
+  opts?: { requirePackageNameInPatch?: boolean; requireRemoteValuesInPatch?: boolean; allowEmptyPatch?: boolean }
+) {
   const manifest = loadManifestFile(path.join(recipeFixtureRoot, "android-default.fixture.yaml"));
   const cfg = JSON.parse(fs.readFileSync(path.join(projectRoot, "meetsdk-remote-config.json"), "utf8")) as {
     packageName: string;
@@ -51,20 +54,32 @@ async function runAndroidPipelineDryRun(projectRoot: string, opts?: { requirePac
   expect(ctx.android?.ok).toBe(true);
   const { report, patch, binaryCopies } = await runPipeline(ctx, manifest, { dryRun: true });
   expect(report.errors).toEqual([]);
-  expect(patch.length).toBeGreaterThan(0);
+  if (!opts?.allowEmptyPatch) {
+    expect(patch.length).toBeGreaterThan(0);
+  }
   expect(binaryCopies).toEqual([]);
-  expect(patch).toContain("TOPSDK REPO AUTO");
-  expect(patch).toContain("TOPSDK AUTO");
+  if (!opts?.allowEmptyPatch || patch.length > 0) {
+    expect(patch).toContain("TOPSDK REPO AUTO");
+    expect(patch).toContain("TOPSDK AUTO");
+  }
   if (opts?.requirePackageNameInPatch !== false) {
     expect(patch).toContain(cfg.packageName);
   }
-  expect(patch).toContain(cfg.topsdk.appId);
-  expect(patch).toContain(cfg.channel);
-  expect(patch).toContain("facebook_app_id");
-  expect(patch).toContain("top_app_id");
+  if (opts?.requireRemoteValuesInPatch !== false) {
+    expect(patch).toContain(cfg.topsdk.appId);
+    expect(patch).toContain(cfg.channel);
+    expect(patch).toContain("facebook_app_id");
+    expect(patch).toContain("top_app_id");
+  }
   return { ctx, patch };
 }
 
+function copyAndroidLatestToTemp(): string {
+  const tmp = fs.mkdtempSync(path.join(fs.realpathSync("/tmp"), "meet-android-idempotent-"));
+  fs.cpSync(androidLatestRoot, tmp, { recursive: true });
+  return tmp;
+}
+
 describe("pipeline android fixture", () => {
   beforeEach(() => {
     stubSdkHomeVersion();
@@ -85,11 +100,50 @@ describe("pipeline android fixture", () => {
   const hasPowerRaidConfig = fs.existsSync(path.join(powerRaidRoot, "meetsdk-remote-config.json"));
 
   it.skipIf(!hasPowerRaidConfig)("dry-run on power-raid (:launcher)", async () => {
-    const { ctx, patch } = await runAndroidPipelineDryRun(powerRaidRoot, { requirePackageNameInPatch: false });
+    const { ctx, patch } = await runAndroidPipelineDryRun(powerRaidRoot, {
+      requirePackageNameInPatch: false,
+      requireRemoteValuesInPatch: false,
+      allowEmptyPatch: true,
+    });
     expect(ctx.android?.ok && ctx.android.moduleName).toBe(":launcher");
-    expect(patch).toContain("launcher/build.gradle");
     const addedLines = patch.split("\n").filter((line) => line.startsWith("+")).join("\n");
     expect(addedLines).not.toContain("//Firebase");
     expect(addedLines).not.toContain("//Appsflyer");
   });
+
+  it("apply is idempotent and logs Android value updates", async () => {
+    const tmp = copyAndroidLatestToTemp();
+    try {
+      const manifest = loadManifestFile(path.join(recipeFixtureRoot, "android-default.fixture.yaml"));
+      const buildGradlePath = path.join(tmp, "app", "build.gradle");
+      const beforeGradle = fs.readFileSync(buildGradlePath, "utf8");
+      fs.writeFileSync(
+        buildGradlePath,
+        beforeGradle.replace(
+          'versionName "1.0"',
+          `versionName "1.0"
+        resValue('string', 'top_app_id', 'old-app-id')
+        resValue('string', 'facebook_app_id', 'old-facebook-id')`
+        ),
+        "utf8"
+      );
+
+      const ctx = buildWorkspaceContext(tmp, pkgRoot);
+      const first = await runPipeline(ctx, manifest, { dryRun: false });
+      expect(first.report.errors).toEqual([]);
+      const logs = (first.report.logs ?? []).join("\n");
+      expect(logs).toContain("Android applicationId com.example.myapplication -> com.meet.integrate.androidsample");
+      expect(logs).toContain("Android resValue top_app_id string:old-app-id -> string:mock-topsdk-app-id");
+      expect(logs).toContain("Android resValue facebook_app_id string:old-facebook-id -> string:0000000000000000");
+
+      const second = await runPipeline(buildWorkspaceContext(tmp, pkgRoot), manifest, { dryRun: false });
+      expect(second.report.errors).toEqual([]);
+      const after = fs.readFileSync(buildGradlePath, "utf8");
+      expect((after.match(/resValue\('string', 'top_app_id'/g) ?? []).length).toBe(1);
+      expect((after.match(/resValue\('string', 'facebook_app_id'/g) ?? []).length).toBe(1);
+      expect((after.match(/applicationId "com.meet.integrate.androidsample"/g) ?? []).length).toBe(1);
+    } finally {
+      fs.rmSync(tmp, { recursive: true, force: true });
+    }
+  });
 });