stim 1.10.1 → 1.12.0

package/dist/settings.schema.json

@@ -363,6 +363,21 @@
             ]
           }
         },
+        "deviceProfile": {
+          "description": "avdmanager hardware profile id for new owned AVDs",
+          "type": "string",
+          "default": "pixel_6",
+          "x-stim": {
+            "key": "android.deviceProfile",
+            "kind": "string",
+            "scopes": [
+              "machine",
+              "workspace",
+              "repo",
+              "committed"
+            ]
+          }
+        },
         "dataPartitionSizeGb": {
           "description": "Data partition size of a new owned AVD, in GiB",
           "type": "integer",
@@ -867,8 +882,29 @@
           },
           "additionalProperties": false
         },
+        "android": {
+          "type": "object",
+          "properties": {
+            "deviceProfile": {
+              "description": "avdmanager hardware profile id for new owned AVDs",
+              "type": "string",
+              "default": "pixel_6",
+              "x-stim": {
+                "key": "android.deviceProfile",
+                "kind": "string",
+                "scopes": [
+                  "machine",
+                  "workspace",
+                  "repo",
+                  "committed"
+                ]
+              }
+            }
+          },
+          "additionalProperties": false
+        },
         "iosSimulatorApp": {
-          "description": "App that displays an owned iOS simulator",
+          "description": "App that displays an owned iOS simulator; stim-desktop by default when Stim Desktop is installed",
           "type": "string",
           "enum": [
             "xcode",
@@ -884,6 +920,22 @@
             ]
           }
         },
+        "androidEmulatorApp": {
+          "description": "App that displays an owned Android emulator Stim boots on macOS; stim-desktop by default when Stim Desktop is installed",
+          "type": "string",
+          "enum": [
+            "emulator",
+            "stim-desktop"
+          ],
+          "default": "emulator",
+          "x-stim": {
+            "key": "androidEmulatorApp",
+            "kind": "choice",
+            "scopes": [
+              "machine"
+            ]
+          }
+        },
         "concurrency": {
           "type": "object",
           "properties": {
@@ -978,6 +1030,26 @@
           },
           "additionalProperties": false
         },
+        "gc": {
+          "type": "object",
+          "properties": {
+            "worktreeGraceMinutes": {
+              "description": "Minutes after a linked worktree last changed, or its branch merged, before gc removes it; 0 removes it at once",
+              "type": "integer",
+              "minimum": 0,
+              "default": 120,
+              "x-stim": {
+                "key": "gc.worktreeGraceMinutes",
+                "kind": "number",
+                "scopes": [
+                  "machine"
+                ],
+                "env": "STIM_GC_WORKTREE_GRACE_MINUTES"
+              }
+            }
+          },
+          "additionalProperties": false
+        },
         "pool": {
           "type": "object",
           "properties": {

package/dist/{simslim-DZUxzsjq.mjs → simslim-COtEEP7x.mjs}

@@ -1,10 +1,11 @@
-import { D as process_identity_exports, H as projectDeviceSlots, g as loadConfig, k as ownership_claim_exports, u as getConfigDir, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, B as deviceSlotPlatforms, O as process_identity_exports, U as projectDeviceSlots, _ as loadConfig, d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-CbEaIk7b.mjs";
-import { w as listAdbDevices } from "./android-787HhP5w.mjs";
-import { l as listAllIosSims, s as iosRuntimeMatches } from "./ios-COGcGEcN.mjs";
-import { _ as easCliSupport, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy, z as resolveEasCliBin } from "./device-remote-powUHdbK.mjs";
+import { g as releaseBuildLock, m as acquireBuildLock } from "./device-lease-B9LAXIUH.mjs";
+import { E as listAdbDevices } from "./android-75Sk2rIR.mjs";
+import { l as listAllIosSims, s as iosRuntimeMatches } from "./ios-CZWOHTTc.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-BRsRZru5.mjs";
+import { O as easCliSupport, k as easCliUpgradeRemedy, s as readInstalledEasCliVersion } from "./device-remote-C0_o-tJH.mjs";
 import { existsSync, realpathSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
@@ -48,7 +49,137 @@ function selectEasBuild(builds, { platform, profile, fingerprint, projectId, phy
 	}
 	return null;
 }
-async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExpo = true, physical = false, selectors = [], buildCache, readEasCliVersion = readInstalledEasCliVersion }) {
+async function lookUpEasBuild({ root, platform, profile, note, physical = false, readEasCliVersion = readInstalledEasCliVersion }) {
+	const retry = "the same Stim command";
+	const buildCommand = `npx eas-cli build --platform ${platform} --profile ${shellArg(profile)}`;
+	const cli = resolveEasCliBin(root);
+	if (!cli) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS CLI is not installed.", "Install eas-cli, run eas login, then retry.");
+	const easCli = easCliSupport(readEasCliVersion(cli.file, root), MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION);
+	if (!easCli.supported) throw new EasFailure("STIM_EAS_UNAVAILABLE", easCli.version ? `eas-cli ${easCli.version} (${cli.file}) cannot download a build by ID; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.` : `Could not read an eas-cli version from \`${cli.file} --version\`; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.`, `${easCliUpgradeRemedy(MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION)}, then retry ${retry}.`);
+	let profileEnv = {};
+	const run = (args, timeoutMs = 12e4) => {
+		try {
+			return JSON.parse(getExecutor().runFile(cli.file, [
+				...args,
+				"--json",
+				"--non-interactive"
+			], {
+				cwd: root,
+				timeoutMs,
+				env: profileEnv
+			}));
+		} catch {
+			throw new EasFailure("STIM_EAS_UNAVAILABLE", `EAS ${args[0]} failed or returned invalid JSON.`, `Run npx eas-cli ${args.map(shellArg).join(" ")} to inspect the error, then retry ${retry}.`);
+		}
+	};
+	note(`eas   resolving profile ${profile}`);
+	const config = object(run([
+		"config",
+		"--platform",
+		platform,
+		"--profile",
+		profile
+	]));
+	const buildProfile = object(config.buildProfile);
+	profileEnv = object(buildProfile.env);
+	const projectId = object(object(object(config.appConfig).extra).eas).projectId;
+	if (buildProfile.developmentClient !== true || buildProfile.distribution !== "internal" || platform === "ios" && buildProfile.simulator === true !== !physical) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} is not an internal development build for this ${platform} target.`, `Set developmentClient: true and distribution: internal${platform === "ios" ? `, with ios.simulator: ${!physical}` : ""} in that eas.json profile.`);
+	if (typeof projectId !== "string" || !projectId) throw new EasFailure("STIM_BAD_ARG", "The Expo app is not linked to an EAS project.", "Link the intended EAS project with eas init, then retry.");
+	if (platform === "ios" ? buildProfile.buildConfiguration !== void 0 && buildProfile.buildConfiguration !== "Debug" : buildProfile.gradleCommand !== void 0 && (typeof buildProfile.gradleCommand !== "string" || !/^:app:assemble\w*Debug$/.test(buildProfile.gradleCommand))) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} overrides the development build configuration.`, "Use ios.buildConfiguration: Debug or an android.gradleCommand that assembles a single Debug APK, or remove the override.");
+	note(`eas   fingerprinting ${platform} with profile ${profile}`);
+	const fingerprint = object(run([
+		"fingerprint:generate",
+		"--platform",
+		platform,
+		"--build-profile",
+		profile
+	])).hash;
+	if (typeof fingerprint !== "string" || !/^[a-f0-9]{40,64}$/.test(fingerprint)) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS returned no valid native fingerprint.", `Run npx eas-cli fingerprint:generate --platform ${platform} --build-profile ${shellArg(profile)} to inspect the result.`);
+	note(`eas   looking for ${fingerprint.slice(0, 8)}`);
+	const buildId = selectEasBuild(run([
+		"build:list",
+		"--platform",
+		platform,
+		"--build-profile",
+		profile,
+		"--fingerprint-hash",
+		fingerprint,
+		"--status",
+		"finished",
+		...platform === "ios" && !physical ? ["--simulator"] : ["--distribution", "internal"],
+		"--limit",
+		"1"
+	]), {
+		platform,
+		profile,
+		fingerprint,
+		projectId,
+		physical
+	});
+	const missing = {
+		code: "STIM_EAS_BUILD_MISSING",
+		message: `No compatible EAS ${platform} build exists for profile ${profile} and fingerprint ${fingerprint}.`,
+		remedy: `A cloud build may incur charges. With approval to run it, use ${buildCommand}, then retry ${retry}.`
+	};
+	return {
+		fingerprint,
+		buildId,
+		cacheKey: buildId ? `eas-${createHash("sha256").update(JSON.stringify({
+			projectId,
+			buildId
+		})).digest("hex")}-debug-${physical && platform === "ios" ? "device" : "sim"}` : null,
+		missing,
+		run
+	};
+}
+function easFailure(error, retry) {
+	const claim = (0, ownership_claim_exports.claimFailure)(error, null);
+	if (claim) return {
+		ok: false,
+		code: claim.code,
+		message: claim.message,
+		remedy: claim.remedy
+	};
+	if (error instanceof EasFailure) return {
+		ok: false,
+		code: error.code,
+		message: error.message,
+		remedy: error.remedy
+	};
+	return {
+		ok: false,
+		code: "STIM_EAS_UNAVAILABLE",
+		message: `Could not resolve the EAS development build: ${error.message}`,
+		remedy: `Retry ${retry}. No cloud build was started.`
+	};
+}
+/** Looks up the EAS build `--eas-profile` would download, without downloading it or taking a claim. */
+async function planEasDevelopmentBuild(args) {
+	const refusal = easOptionRefusal({
+		profile: args.profile,
+		isExpo: args.isExpo ?? true,
+		buildSelector: (args.selectors ?? []).find((value) => value != null) ?? void 0,
+		buildCache: args.buildCache
+	});
+	if (refusal) return {
+		ok: false,
+		...refusal
+	};
+	try {
+		const found = await lookUpEasBuild(args);
+		return {
+			ok: true,
+			fingerprint: found.fingerprint,
+			cacheKey: found.cacheKey,
+			buildId: found.buildId,
+			missing: found.buildId ? null : found.missing
+		};
+	} catch (error) {
+		return easFailure(error, "the same Stim command");
+	}
+}
+async function resolveEasDevelopmentBuild(args) {
+	const { root, platform, profile, isExpo = true, selectors = [], buildCache } = args;
 	if (profile === void 0) return null;
 	const refusal = easOptionRefusal({
 		profile,
@@ -61,85 +192,20 @@ async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExp
 		...refusal
 	};
 	const retry = "the same Stim command";
-	const buildCommand = `npx eas-cli build --platform ${platform} --profile ${shellArg(profile)}`;
 	let lock = null;
 	try {
-		const cli = resolveEasCliBin(root);
-		if (!cli) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS CLI is not installed.", "Install eas-cli, run eas login, then retry.");
-		const easCli = easCliSupport(readEasCliVersion(cli.file, root), MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION);
-		if (!easCli.supported) throw new EasFailure("STIM_EAS_UNAVAILABLE", easCli.version ? `eas-cli ${easCli.version} (${cli.file}) cannot download a build by ID; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.` : `Could not read an eas-cli version from \`${cli.file} --version\`; --eas-profile needs eas-cli ${MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION} or later.`, `${easCliUpgradeRemedy(MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION)}, then retry ${retry}.`);
-		let profileEnv = {};
-		const run = (args, timeoutMs = 12e4) => {
-			try {
-				return JSON.parse(getExecutor().runFile(cli.file, [
-					...args,
-					"--json",
-					"--non-interactive"
-				], {
-					cwd: root,
-					timeoutMs,
-					env: profileEnv
-				}));
-			} catch {
-				throw new EasFailure("STIM_EAS_UNAVAILABLE", `EAS ${args[0]} failed or returned invalid JSON.`, `Run npx eas-cli ${args.map(shellArg).join(" ")} to inspect the error, then retry ${retry}.`);
-			}
-		};
-		note(`eas   resolving profile ${profile}`);
-		const config = object(run([
-			"config",
-			"--platform",
-			platform,
-			"--profile",
-			profile
-		]));
-		const buildProfile = object(config.buildProfile);
-		profileEnv = object(buildProfile.env);
-		const projectId = object(object(object(config.appConfig).extra).eas).projectId;
-		if (buildProfile.developmentClient !== true || buildProfile.distribution !== "internal" || platform === "ios" && buildProfile.simulator === true !== !physical) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} is not an internal development build for this ${platform} target.`, `Set developmentClient: true and distribution: internal${platform === "ios" ? `, with ios.simulator: ${!physical}` : ""} in that eas.json profile.`);
-		if (typeof projectId !== "string" || !projectId) throw new EasFailure("STIM_BAD_ARG", "The Expo app is not linked to an EAS project.", "Link the intended EAS project with eas init, then retry.");
-		if (platform === "ios" ? buildProfile.buildConfiguration !== void 0 && buildProfile.buildConfiguration !== "Debug" : buildProfile.gradleCommand !== void 0 && (typeof buildProfile.gradleCommand !== "string" || !/^:app:assemble\w*Debug$/.test(buildProfile.gradleCommand))) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} overrides the development build configuration.`, "Use ios.buildConfiguration: Debug or an android.gradleCommand that assembles a single Debug APK, or remove the override.");
-		note(`eas   fingerprinting ${platform} with profile ${profile}`);
-		const fingerprint = object(run([
-			"fingerprint:generate",
-			"--platform",
-			platform,
-			"--build-profile",
+		const { fingerprint, buildId, cacheKey, missing, run } = await lookUpEasBuild({
+			...args,
 			profile
-		])).hash;
-		if (typeof fingerprint !== "string" || !/^[a-f0-9]{40,64}$/.test(fingerprint)) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS returned no valid native fingerprint.", `Run npx eas-cli fingerprint:generate --platform ${platform} --build-profile ${shellArg(profile)} to inspect the result.`);
-		note(`eas   looking for ${fingerprint.slice(0, 8)}`);
-		const buildId = selectEasBuild(run([
-			"build:list",
-			"--platform",
-			platform,
-			"--build-profile",
-			profile,
-			"--fingerprint-hash",
-			fingerprint,
-			"--status",
-			"finished",
-			...platform === "ios" && !physical ? ["--simulator"] : ["--distribution", "internal"],
-			"--limit",
-			"1"
-		]), {
-			platform,
-			profile,
-			fingerprint,
-			projectId,
-			physical
 		});
-		if (!buildId) throw new EasFailure("STIM_EAS_BUILD_MISSING", `No compatible EAS ${platform} build exists for profile ${profile} and fingerprint ${fingerprint}.`, `A cloud build may incur charges. With approval to run it, use ${buildCommand}, then retry ${retry}.`);
-		const cacheKey = `eas-${createHash("sha256").update(JSON.stringify({
-			projectId,
-			buildId
-		})).digest("hex")}-debug-${physical && platform === "ios" ? "device" : "sim"}`;
+		if (!buildId || !cacheKey) throw new EasFailure(missing.code, missing.message, missing.remedy);
 		lock = acquireBuildLock({
 			platform,
 			key: cacheKey,
 			root
 		});
 		if (!lock.acquired) throw new EasFailure("STIM_EAS_UNAVAILABLE", `Another run holds the EAS artifact claim at ${lock.path}.`, `Wait for that run to finish, then retry ${retry}.`);
-		note(`eas   resolving artifact for build ${buildId}`);
+		args.note(`eas   resolving artifact for build ${buildId}`);
 		const result = object(run([
 			"build:download",
 			"--build-id",
@@ -148,7 +214,7 @@ async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExp
 		if (typeof result.path !== "string" || !existsSync(result.path)) throw new Error("EAS returned no downloaded artifact.");
 		const path = realpathSync(result.path);
 		if (platform === "ios" ? !path.endsWith(".app") || !statSync(path).isDirectory() : !path.endsWith(".apk") || !statSync(path).isFile()) throw new Error("EAS returned an unexpected artifact path or type.");
-		note(`eas   artifact ready ${fingerprint.slice(0, 8)}`);
+		args.note(`eas   artifact ready ${fingerprint.slice(0, 8)}`);
 		return {
 			ok: true,
 			path,
@@ -157,25 +223,7 @@ async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExp
 			cacheHit: "remote"
 		};
 	} catch (error) {
-		const claim = (0, ownership_claim_exports.claimFailure)(error, null);
-		if (claim) return {
-			ok: false,
-			code: claim.code,
-			message: claim.message,
-			remedy: claim.remedy
-		};
-		if (error instanceof EasFailure) return {
-			ok: false,
-			code: error.code,
-			message: error.message,
-			remedy: error.remedy
-		};
-		return {
-			ok: false,
-			code: "STIM_EAS_UNAVAILABLE",
-			message: `Could not resolve the EAS development build: ${error.message}`,
-			remedy: `Retry ${retry}. No cloud build was started.`
-		};
+		return easFailure(error, retry);
 	} finally {
 		releaseBuildLock(lock);
 	}
@@ -289,6 +337,14 @@ function unknownAndroidSystemImageRefusal(requested, images) {
 		remedy: "Pass `--system-image` (or set android.systemImage) to one of the package ids printed above. Install more with `sdkmanager \"system-images;android-36;google_apis;arm64-v8a\"`."
 	};
 }
+function unknownAndroidDeviceProfileRefusal(requested, profiles) {
+	if (!requested) return null;
+	if (profiles.includes(requested)) return null;
+	return {
+		message: `No Android hardware profile is named "${requested}". Profiles avdmanager offers: ${installedNames(profiles)}.`,
+		remedy: "Pass `--device-profile` (or set android.deviceProfile) to one of the ids printed above, exactly as `avdmanager list device -c` spells it, e.g. \"pixel_fold\" or \"pixel_tablet\"."
+	};
+}
 //#endregion
 //#region src/engine/simslim.ts
 async function reconcileSimSlim({ udid, profile, previouslyManaged = false, out = () => {}, spawn, timeoutMs = 72e4, cleanupMs = 1e4 }) {
@@ -433,4 +489,4 @@ function simslimIsOnPath() {
 	}
 }
 //#endregion
-export { liveOwnedDeviceCount as a, unknownIosRuntimeRefusal as c, isEasBuildFailure as d, resolveEasDevelopmentBuild as f, deviceTypeMismatch as i, MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION as l, simslimIsOnPath as n, unknownAndroidSystemImageRefusal as o, checkDeviceCapacity as r, unknownIosDeviceTypeRefusal as s, reconcileSimSlim as t, easDeviceBuildRemedy as u };
+export { liveOwnedDeviceCount as a, unknownIosDeviceTypeRefusal as c, easDeviceBuildRemedy as d, isEasBuildFailure as f, deviceTypeMismatch as i, unknownIosRuntimeRefusal as l, resolveEasDevelopmentBuild as m, simslimIsOnPath as n, unknownAndroidDeviceProfileRefusal as o, planEasDevelopmentBuild as p, checkDeviceCapacity as r, unknownAndroidSystemImageRefusal as s, reconcileSimSlim as t, MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION as u };

package/dist/{slot-launch-Dk4oTREM.mjs → slot-launch-DIACGEfH.mjs}

@@ -1,7 +1,7 @@
-import { f as getProject } from "./config-BEq0Qw_a.mjs";
-import { m as readWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { n as fileLeaseIo } from "./device-lease-CbEaIk7b.mjs";
-import { d as deviceShellArg } from "./app-install-Cfmqr3TQ.mjs";
+import { p as getProject } from "./config-0jCcMM0E.mjs";
+import { m as readWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { n as fileLeaseIo } from "./device-lease-B9LAXIUH.mjs";
+import { d as deviceShellArg } from "./app-install-CsZi0SAT.mjs";
 //#region src/engine/slot-launch.ts
 function launchSlotScope(root, slot = "default") {
 	if (slot !== "default") return slot;

package/dist/{spawn-claims-CUleC2cM.mjs → spawn-claims-PT8aQpCa.mjs}

@@ -1,6 +1,8 @@
-import { D as process_identity_exports, k as ownership_claim_exports } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, O as process_identity_exports } from "./config-0jCcMM0E.mjs";
 //#region src/engine/spawn-claims.ts
 const declaring = /* @__PURE__ */ new Set();
+const running = /* @__PURE__ */ new Set();
+let refusal = null;
 /** Record every child later started through `spawnDeclared` on `claim` until `stopDeclaringSpawnsOn(claim)`. */
 function declareSpawnsOn(claim) {
 	if (claim) declaring.add(claim);
@@ -15,6 +17,7 @@ function stopDeclaringSpawnsOn(claim) {
 * records one child, so declared spawns must not overlap.
 */
 function spawnDeclared(spawn) {
+	if (refusal !== null) throw new Error(refusal);
 	const claims = [...declaring];
 	if (claims.length === 0) return spawn();
 	const forget = () => {
@@ -35,6 +38,8 @@ function spawnDeclared(spawn) {
 		forget();
 		return child;
 	}
+	running.add(child);
+	child.once("exit", () => running.delete(child));
 	const captured = (0, process_identity_exports.captureProcessIdentity)(pid);
 	if (captured.ok) for (const claim of claims) try {
 		(0, ownership_claim_exports.setClaimChild)(claim, {
@@ -45,5 +50,23 @@ function spawnDeclared(spawn) {
 	child.once("exit", forget);
 	return child;
 }
+/** Refuse every later `spawnDeclared` with `reason` until `allowDeclaredSpawns()`. */
+function refuseDeclaredSpawns(reason) {
+	refusal = reason;
+}
+function allowDeclaredSpawns() {
+	refusal = null;
+}
+/** Send `signal` to every child started through `spawnDeclared` that has not exited; returns how many were signalled. */
+function signalDeclaredSpawns(signal) {
+	let signalled = 0;
+	for (const child of running) {
+		if (child.exitCode !== null || child.signalCode !== null) continue;
+		try {
+			if (child.kill(signal)) signalled += 1;
+		} catch {}
+	}
+	return signalled;
+}
 //#endregion
-export { spawnDeclared as n, stopDeclaringSpawnsOn as r, declareSpawnsOn as t };
+export { spawnDeclared as a, signalDeclaredSpawns as i, declareSpawnsOn as n, stopDeclaringSpawnsOn as o, refuseDeclaredSpawns as r, allowDeclaredSpawns as t };

package/dist/{start-qWapeB4W.mjs → start-BFstVBlx.mjs}

@@ -1,2 +1,2 @@
-import { a as registerStart, c as startFacts, d as wantsExpoOwnTunnel, i as readLogTail, l as supervisorEntry, n as liveSupervisor, o as startCommand, r as parseWait, s as startDevServer, t as failureEvidence, u as tailLines } from "./start-RbmFPeZ7.mjs";
+import { a as registerStart, c as startFacts, d as wantsExpoOwnTunnel, i as readLogTail, l as supervisorEntry, n as liveSupervisor, o as startCommand, r as parseWait, s as startDevServer, t as failureEvidence, u as tailLines } from "./start-BboE1HIS.mjs";
 export { startCommand as default, failureEvidence, liveSupervisor, parseWait, readLogTail, registerStart, startDevServer, startFacts, supervisorEntry, tailLines, wantsExpoOwnTunnel };

package/dist/{start-RbmFPeZ7.mjs → start-BboE1HIS.mjs}

@@ -1,23 +1,113 @@
-import { D as process_identity_exports, f as getProject, w as upsertProject } from "./config-BEq0Qw_a.mjs";
+import { O as process_identity_exports, T as upsertProject, p as getProject } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { i as levelRank } from "./ndjson-CDY9IkVC.mjs";
-import { T as supervisorLogFile, c as signalProcessTree, d as reserveMetroPort, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState$1, p as clearWorkspaceStateKeys, s as resolveProjectMetro, x as ensureWorkspaceStorage, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { a as detectIsExpo, i as detectBundleId, n as appProjectProblem, o as findProjectRoot, r as detectAndroidPackage, t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
+import { T as supervisorLogFile, c as signalProcessTree, d as reserveMetroPort, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState$1, p as clearWorkspaceStateKeys, s as resolveProjectMetro, x as ensureWorkspaceStorage, y as writeWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { c as readAppConfigText, i as findProjectRoot, l as readAppJson, n as appProjectProblem, r as detectIsExpo, t as NO_PROJECT_REFUSAL } from "./project-B8rbutVC.mjs";
 import { n as windowsLauncherArgs } from "./detached-entry-DJHoca49.mjs";
-import { i as clearManagedMetroTunnel, s as readMetroTunnel } from "./state-WGdIbi_d.mjs";
-import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
-import { _ as stepTimer, l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { A as resolveCacheProviderConfig, B as planMetroReach, C as ngrokUrlSetting, E as publicUrlSetting, I as tunnelModeSetting, L as unknownSettingKeys, O as remoteAndroidSetting, P as settingShapeErrors, R as PUBLIC_METRO_ENV, a as SETTING_SHAPE_REMEDY, b as metroIdleStopMinutesSetting, d as cacheProviderSettingError, j as resolveSettings, k as remoteIosSetting, x as metroTunnelSettingError, z as detectProviders } from "./settings-DOugPlPz.mjs";
-import { a as terminateChild, c as withManagedTunnelLock, i as stopTunnel, o as withManagedRemoteWorktreeLock, r as startTunnelSequence, t as resolveSupervisorTarget } from "./ownership-BfPNRf3-.mjs";
-import { i as stopOwnedMetroForReset, t as budgetGate } from "./budget-nDCEwtJv.mjs";
+import { c as readMetroTunnel, i as clearManagedMetroTunnel } from "./state-DcDgzfu3.mjs";
+import { n as workspaceProcessLockError, t as withWorkspaceProcessLock } from "./workspace-process-lock-BvvJTfo_.mjs";
+import { _ as stepTimer, l as phaseLine } from "./command-output-BWCj5Vh-.mjs";
+import { A as resolveCacheProviderConfig, B as planMetroReach, C as ngrokUrlSetting, E as publicUrlSetting, I as tunnelModeSetting, L as unknownSettingKeys, O as remoteAndroidSetting, P as settingShapeErrors, R as PUBLIC_METRO_ENV, a as SETTING_SHAPE_REMEDY, b as metroIdleStopMinutesSetting, d as cacheProviderSettingError, j as resolveSettings, k as remoteIosSetting, x as metroTunnelSettingError, z as detectProviders } from "./settings-BlyDn2Oz.mjs";
+import { a as terminateChild, c as withManagedTunnelLock, i as stopTunnel, o as withManagedRemoteWorktreeLock, r as startTunnelSequence, t as resolveSupervisorTarget } from "./ownership-B8d4kXBx.mjs";
+import { d as readProjectConfig } from "./remote-cache-BRsRZru5.mjs";
+import { I as stopOwnedMetroForReset, t as budgetGate } from "./budget-DbzW5VTD.mjs";
 import { appendFileSync, mkdirSync, openSync, readFileSync } from "node:fs";
+import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "fs";
+import { join } from "path";
 import { IDLE_STOP_KEY, queryLogs } from "@stim-cli/core/state";
-import { basename, dirname, join } from "node:path";
+import { basename as basename$1, dirname as dirname$1, join as join$1 } from "node:path";
 import { EventEmitter } from "node:events";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import { CACHE_PROVIDER_ENV, cacheProviderEnv } from "@stim-cli/cache";
+//#region src/workspace/app-id.ts
+function configString(config, platform, key) {
+	if (!config || typeof config !== "object") return null;
+	const expoField = config.expo;
+	const section = (expoField && typeof expoField === "object" ? expoField : config)[platform];
+	if (!section || typeof section !== "object") return null;
+	const value = section[key];
+	return typeof value === "string" && value ? value : null;
+}
+function literalString(text, key) {
+	return text?.match(new RegExp(`${key}\\s*:\\s*["']([^"']+)["']`))?.[1] ?? null;
+}
+function idsFromConfig(projectRoot) {
+	const read = readProjectConfig(projectRoot);
+	if (!read.unavailable) return {
+		bundleId: configString(read.config, "ios", "bundleIdentifier"),
+		androidPackage: configString(read.config, "android", "package")
+	};
+	const appJson = readAppJson(projectRoot);
+	const text = readAppConfigText(projectRoot);
+	return {
+		bundleId: configString(appJson, "ios", "bundleIdentifier") ?? literalString(text, "bundleIdentifier"),
+		androidPackage: configString(appJson, "android", "package") ?? literalString(text, "package")
+	};
+}
+function detectAppIds(projectRoot) {
+	const ids = idsFromConfig(projectRoot);
+	return {
+		bundleId: ids.bundleId ?? detectBundleIdFromPbxproj(projectRoot),
+		androidPackage: ids.androidPackage ?? detectAndroidPackageFromGradle(projectRoot)
+	};
+}
+function detectBundleId(projectRoot) {
+	return detectAppIds(projectRoot).bundleId;
+}
+function detectAndroidPackage(projectRoot) {
+	return detectAppIds(projectRoot).androidPackage;
+}
+function detectBundleIdFromPbxproj(projectRoot) {
+	const iosDir = join(projectRoot, "ios");
+	if (!existsSync$1(iosDir)) return null;
+	let entries;
+	try {
+		entries = readdirSync$1(iosDir, { withFileTypes: true });
+	} catch {
+		return null;
+	}
+	for (const entry of entries) {
+		if (!entry.isDirectory() || !entry.name.endsWith(".xcodeproj")) continue;
+		const pbx = join(iosDir, entry.name, "project.pbxproj");
+		if (!existsSync$1(pbx)) continue;
+		let text;
+		try {
+			text = readFileSync$1(pbx, "utf-8");
+		} catch {
+			continue;
+		}
+		const concrete = [...text.matchAll(/PRODUCT_BUNDLE_IDENTIFIER\s*=\s*([^;\s"]+)\s*;/g)].map((m) => m[1]).filter((id) => !!id && !id.startsWith("$") && !id.includes("("));
+		if (concrete.length === 0) continue;
+		const counts = {};
+		for (const id of concrete) counts[id] = (counts[id] || 0) + 1;
+		let best = null, bestCount = 0, bestLen = Infinity;
+		for (const [id, count] of Object.entries(counts)) if (count > bestCount || count === bestCount && id.length < bestLen) {
+			best = id;
+			bestCount = count;
+			bestLen = id.length;
+		}
+		return best;
+	}
+	return null;
+}
+function detectAndroidPackageFromGradle(projectRoot) {
+	const gradle = join(projectRoot, "android", "app", "build.gradle");
+	if (!existsSync$1(gradle)) return null;
+	let text;
+	try {
+		text = readFileSync$1(gradle, "utf-8");
+	} catch {
+		return null;
+	}
+	const nsId = text.match(/namespace\s+["']([^"']+)["']/)?.[1];
+	if (nsId) return nsId;
+	const appId = text.match(/applicationId\s+["']([^"']+)["']/)?.[1];
+	if (appId) return appId;
+	return null;
+}
+//#endregion
 //#region src/spawn-entry.ts
 const DEV_ENTRIES = {
 	"supervisor-run": "./supervisor/run.ts",
@@ -25,8 +115,8 @@ const DEV_ENTRIES = {
 };
 function spawnEntry(name) {
 	const here = fileURLToPath(import.meta.url);
-	if (basename(dirname(here)) === "src") return fileURLToPath(new URL(DEV_ENTRIES[name], import.meta.url));
-	return join(dirname(here), `${name}.mjs`);
+	if (basename$1(dirname$1(here)) === "src") return fileURLToPath(new URL(DEV_ENTRIES[name], import.meta.url));
+	return join$1(dirname$1(here), `${name}.mjs`);
 }
 //#endregion
 //#region src/commands/start.ts
@@ -269,9 +359,10 @@ async function startDevServer({ root, settings, waitSeconds = DEFAULT_WAIT_SECON
 		if (tunnel) note(chalk.dim("note   requesting an Expo tunnel for this workspace's dev server"));
 		const managedRemote = remote && !tunnel && !publicUrl && tunnelMode !== "off";
 		const runStart = async () => {
+			const appIds = detectAppIds(root);
 			upsertProject(root, {
-				bundleId: detectBundleId(root) ?? void 0,
-				androidPackage: detectAndroidPackage(root) ?? void 0,
+				bundleId: appIds.bundleId ?? void 0,
+				androidPackage: appIds.androidPackage ?? void 0,
 				isExpo
 			});
 			const gateBudget = async () => {
@@ -819,7 +910,7 @@ async function startDevServer({ root, settings, waitSeconds = DEFAULT_WAIT_SECON
 		};
 		const startLocked = async () => {
 			try {
-				return await withWorkspaceProcessLock(dirname(workspaceLogsDir(root)), "metro-start", runStart, { external: true });
+				return await withWorkspaceProcessLock(dirname$1(workspaceLogsDir(root)), "metro-start", runStart, { external: true });
 			} catch (error) {
 				if (workspaceProcessLockError(error) !== "timeout") throw error;
 				return fail({
@@ -935,4 +1026,4 @@ function report({ json, out, facts, waited, reclaimed }) {
 	out(chalk.dim(phaseLine("logs", facts.logsDir)));
 }
 //#endregion
-export { registerStart as a, startFacts as c, wantsExpoOwnTunnel as d, spawnEntry as f, readLogTail as i, supervisorEntry as l, liveSupervisor as n, startCommand as o, parseWait as r, startDevServer as s, failureEvidence as t, tailLines as u };
+export { registerStart as a, startFacts as c, wantsExpoOwnTunnel as d, spawnEntry as f, detectBundleId as h, readLogTail as i, supervisorEntry as l, detectAppIds as m, liveSupervisor as n, startCommand as o, detectAndroidPackage as p, parseWait as r, startDevServer as s, failureEvidence as t, tailLines as u };