@stim-cli/core 1.10.0 → 1.11.0

package/dist/state.d.mts

@@ -72,6 +72,7 @@ interface StimConfig {
   repos: Record<string, RepoRecord>;
   tempDir?: unknown;
   iosSimulatorApp?: unknown;
+  androidEmulatorApp?: unknown;
   optimizations?: unknown;
   concurrency?: {
     maxBuilds?: unknown;
@@ -249,6 +250,7 @@ declare function sharedCcache(): string;
 declare function sharedGradle(): string;
 declare function sharedPods(): string;
 declare function createdDevicesFile(): string;
+declare function gitMergeCacheDir(): string;
 declare function createdDevicesLock(): string;
 /** The EAS session ledger lives under the real home directory, never under STIM_HOME. */
 declare function easMachineStateRoot(): string;
@@ -331,6 +333,7 @@ interface SettingsPayload {
 }
 declare const REMOTE_DEVICE_BACKENDS: readonly RemoteDeviceBackend[];
 declare const IOS_SIMULATOR_APPS: readonly ["xcode", "siniulator", "stim-desktop"];
+declare const ANDROID_EMULATOR_APPS: readonly ["emulator", "stim-desktop"];
 declare const SETTINGS: readonly SettingDefinition[];
 declare function settingDefinition(key: string): SettingDefinition | null;
 declare function isLayeredSetting(setting: SettingDefinition): boolean;
@@ -377,6 +380,9 @@ interface IdleStopRecord {
   idleMinutes: number;
 }
 declare function readIdleStop(state: WorkspaceState | null | undefined): IdleStopRecord | null;
+/** Each platform's latest run; `lastBuild` holds whichever platform ran last. */
+declare const LAST_BUILD_KEYS: Readonly<Record<StatsPlatform, string>>;
+declare function readLastBuilds(state: WorkspaceState | null | undefined): Partial<Record<StatsPlatform, LastBuildReport>>;
 declare function readWorkspaceState(root: string): WorkspaceState | null;
 declare function lastUseFrom(state: WorkspaceState | null, logMtimes: readonly number[]): number;
 declare function workspaceLastUsed(root: string): number;
@@ -399,6 +405,64 @@ interface BuildReport {
   expectedPhaseMs: number | null;
   basis: number;
 }
+/** Where a build's app came from: a cache tier, or `false` when it compiled or failed before one was found. */
+type BuildCacheHit = "local" | "remote" | false;
+/** A platform's most recent `ios` or `android` run in one workspace. */
+interface LastBuildReport {
+  platform: StatsPlatform;
+  status: "ok" | "failed";
+  cacheHit: BuildCacheHit;
+  cacheSkipped: boolean;
+  durationMs: number | null;
+  fingerprint: string | null;
+  startedAt: string;
+  finishedAt: string | null;
+  errorCode?: string;
+  missReason?: BuildMissReason;
+}
+/** What kind of native input a changed fingerprint source is. */
+type BuildMissCategory = "native-dependency" | "config-plugin" | "app-config" | "app-asset" | "package" | "native-dir" | "autolinking" | "package-scripts" | "file" | "other";
+interface BuildMissChange {
+  source: string;
+  change: "added" | "removed" | "changed";
+  category: BuildMissCategory;
+}
+/**
+ * Why a run compiled instead of installing a cached app. `changes` holds at most 20 entries,
+ * ordered by importance; `changeCount` is the full number of changed fingerprint sources.
+ */
+interface BuildMissReason {
+  kind: "changed" | "no-baseline" | "same-sources" | "cache-skipped" | "fingerprint-error";
+  summary: string;
+  changes: BuildMissChange[];
+  changeCount: number;
+  /** `cacheKey` is kept in workspace state so a later miss can find this baseline; status omits it. */
+  baseline: {
+    fingerprint: string;
+    cacheKey?: string;
+    from: "workspace" | "project";
+  } | null;
+  rekeyedBy: string[];
+}
+/** The payload `stim ios --plan --json` and `stim android --plan --json` print. */
+interface BuildPlanPayload {
+  platform: StatsPlatform;
+  slot?: string;
+  fingerprint: string;
+  cacheKey: string | null;
+  cacheHit: BuildCacheHit;
+  provider: string | null;
+  cacheSkipped: boolean;
+  prebuild: "none" | "generate" | "regenerate" | "refuse" | null;
+  outcome: RunOutcomeKind | null;
+  expectedMs: number | null;
+  basis: number;
+  refusal?: {
+    code: string;
+    message: string;
+    remedy: string;
+  };
+}
 type ActivityState = "driven" | "active" | "idle" | "unknown";
 interface ActivityDriver {
   tool: string;
@@ -411,10 +475,27 @@ interface DeviceActivity {
   lastActivityAt?: string;
   basis: string[];
 }
+/**
+ * A linked worktree's `git status`. `changed` counts tracked paths with staged or unstaged changes, including
+ * conflicts; `untracked` counts untracked entries as `git status` lists them, so an untracked directory counts once.
+ * `ahead` and `behind` compare HEAD with `upstream`, and are null when there is no upstream or it no longer exists.
+ * `mergedInto` names the default branch (`origin/main`) when `gc` would consider the branch merged into it, judged
+ * from local refs without fetching.
+ */
+interface WorktreeGit {
+  changed: number;
+  untracked: number;
+  upstream: string | null;
+  ahead: number | null;
+  behind: number | null;
+  mergedInto: string | null;
+}
 interface WorktreeFacts {
   path: string;
   branch?: string;
   repository?: string;
+  /** Null when git could not be read in time, or the worktree is in a folder status does not open. */
+  git?: WorktreeGit | null;
 }
 interface AndroidRuntimeFacts {
   serial: string | null;
@@ -473,6 +554,7 @@ interface EnvironmentState {
   worktree?: WorktreeFacts | null;
   remoteDevices?: RemoteDeviceState[];
   build?: BuildReport | null;
+  lastBuilds?: Partial<Record<StatsPlatform, LastBuildReport>>;
 }
 interface StatusCapacity {
   liveCount: number;
@@ -504,4 +586,4 @@ interface StatusPayload {
   simctlAvailable: boolean;
 }
 //#endregion
-export { ANDROID_COMPILER_CACHE_CHOICES, ANDROID_PCH_CHOICES, ActiveBuildState, ActivityDriver, AndroidRuntimeFacts, BUILD_PHASES, BuildPhase, BuildReport, ConcurrencyLimits, Config, CreatedDevicePlatform, CreatedDevices, DeviceActivity, DeviceLeaseState, DeviceRecord, DoctorRunRecord, ERROR_SOURCES, EasSessionClaim, EasSessionLedgerRead, EnvironmentState, IDLE_STOP_KEY, IOS_SIMULATOR_APPS, IdleStopRecord, LEVELS, NdjsonRecord, PlatformRecords, ProjectRecord, QueryCriteria, REMOTE_DEVICE_BACKENDS, RemoteDeviceBackend, RemoteDeviceState, RepoRecord, RunOutcomeKind, SETTINGS, SETTINGS_SCHEMA_FILE, SETTINGS_SCHEMA_URL, SETTING_GROUPS, SETTING_SCOPES, SOURCES, SettingDefinition, SettingEntry, SettingScope, SettingType, SettingsObject, SettingsPayload, StatsPlatform, StatusCapacity, StatusPayload, StimConfig, SupervisorRecord, TUNNEL_MODES, TunnelMode, WorkspaceState, WorktreeFacts, acceptsShape, advanceTail, allMetroPorts, attachExpoErrorContext, buildCriteria, coerceSettingText, compileGrep, configCorruptRepair, configLockPath, createdDevicesFile, createdDevicesLock, easMachineStateRoot, easSessionLedgerFile, easSessionLedgerLock, emulatorLogFile, expectedShape, fileSizes, findEnclosingWorktreeRoot, findProjectByMetroPort, followLogs, getConcurrencyLimits, getConfigPath, getProject, getProjectSetting, getProjectSettings, getRepoSettings, isJsonObject, isLayeredSetting, isPathPrefix, isSensitiveReference, lastUseFrom, levelRank, loadConfig, logFiles, markerWindow, parseNdjsonLine, parseNdjsonText, parseSince, queryLogs, readCreatedDevices, readEasSessionLedger, readIdleStop, readJsonFile, readJsonObject, readLogRecords, readNdjsonGenerations, readWorkspaceState, recordMatches, settingDefinition, settingValueError, settingsJsonSchema, sharedCcache, sharedCompilationCache, sharedGradle, sharedPods, sortByTs, supervisorLogFile, supervisorPidFile, tailRead, validEasSessionClaim, withConfigLock, workspaceDerivedData, workspaceGradleBuild, workspaceLastUsed, workspaceLogErrorIndex, workspaceLogsDir, workspaceMetadataFile, workspaceStateFile, workspaceStateLock };
+export { ANDROID_COMPILER_CACHE_CHOICES, ANDROID_EMULATOR_APPS, ANDROID_PCH_CHOICES, ActiveBuildState, ActivityDriver, AndroidRuntimeFacts, BUILD_PHASES, BuildCacheHit, BuildMissCategory, BuildMissChange, BuildMissReason, BuildPhase, BuildPlanPayload, BuildReport, ConcurrencyLimits, Config, CreatedDevicePlatform, CreatedDevices, DeviceActivity, DeviceLeaseState, DeviceRecord, DoctorRunRecord, ERROR_SOURCES, EasSessionClaim, EasSessionLedgerRead, EnvironmentState, IDLE_STOP_KEY, IOS_SIMULATOR_APPS, IdleStopRecord, LAST_BUILD_KEYS, LEVELS, LastBuildReport, NdjsonRecord, PlatformRecords, ProjectRecord, QueryCriteria, REMOTE_DEVICE_BACKENDS, RemoteDeviceBackend, RemoteDeviceState, RepoRecord, RunOutcomeKind, SETTINGS, SETTINGS_SCHEMA_FILE, SETTINGS_SCHEMA_URL, SETTING_GROUPS, SETTING_SCOPES, SOURCES, SettingDefinition, SettingEntry, SettingScope, SettingType, SettingsObject, SettingsPayload, StatsPlatform, StatusCapacity, StatusPayload, StimConfig, SupervisorRecord, TUNNEL_MODES, TunnelMode, WorkspaceState, WorktreeFacts, WorktreeGit, acceptsShape, advanceTail, allMetroPorts, attachExpoErrorContext, buildCriteria, coerceSettingText, compileGrep, configCorruptRepair, configLockPath, createdDevicesFile, createdDevicesLock, easMachineStateRoot, easSessionLedgerFile, easSessionLedgerLock, emulatorLogFile, expectedShape, fileSizes, findEnclosingWorktreeRoot, findProjectByMetroPort, followLogs, getConcurrencyLimits, getConfigPath, getProject, getProjectSetting, getProjectSettings, getRepoSettings, gitMergeCacheDir, isJsonObject, isLayeredSetting, isPathPrefix, isSensitiveReference, lastUseFrom, levelRank, loadConfig, logFiles, markerWindow, parseNdjsonLine, parseNdjsonText, parseSince, queryLogs, readCreatedDevices, readEasSessionLedger, readIdleStop, readJsonFile, readJsonObject, readLastBuilds, readLogRecords, readNdjsonGenerations, readWorkspaceState, recordMatches, settingDefinition, settingValueError, settingsJsonSchema, sharedCcache, sharedCompilationCache, sharedGradle, sharedPods, sortByTs, supervisorLogFile, supervisorPidFile, tailRead, validEasSessionClaim, withConfigLock, workspaceDerivedData, workspaceGradleBuild, workspaceLastUsed, workspaceLogErrorIndex, workspaceLogsDir, workspaceMetadataFile, workspaceStateFile, workspaceStateLock };

package/dist/state.mjs

@@ -71,6 +71,9 @@ function sharedPods() {
 function createdDevicesFile() {
 	return join(configDir(), "created-devices.json");
 }
+function gitMergeCacheDir() {
+	return join(configDir(), "git-merge");
+}
 function createdDevicesLock() {
 	return join(configDir(), "created-devices.lock");
 }
@@ -302,7 +305,8 @@ const SOURCES = [
 	"metro",
 	"client",
 	"device",
-	"build"
+	"build",
+	"agent"
 ];
 function levelRank(level) {
 	const i = LEVELS.indexOf(level);
@@ -669,6 +673,7 @@ const IOS_SIMULATOR_APPS = [
 	"siniulator",
 	"stim-desktop"
 ];
+const ANDROID_EMULATOR_APPS = ["emulator", "stim-desktop"];
 const PROJECT = [
 	"workspace",
 	"repo",
@@ -817,6 +822,13 @@ const SETTINGS = [
 		scopes: PROJECT,
 		description: "SDK system image for owned AVDs"
 	},
+	{
+		key: "android.deviceProfile",
+		type: STRING,
+		scopes: EVERY,
+		default: "pixel_6",
+		description: "avdmanager hardware profile id for new owned AVDs"
+	},
 	{
 		key: "android.dataPartitionSizeGb",
 		type: {
@@ -947,6 +959,16 @@ const SETTINGS = [
 		default: "xcode",
 		description: "App that displays an owned iOS simulator"
 	},
+	{
+		key: "androidEmulatorApp",
+		type: {
+			kind: "choice",
+			choices: ANDROID_EMULATOR_APPS
+		},
+		scopes: MACHINE,
+		default: "emulator",
+		description: "App that displays an owned Android emulator Stim boots on macOS"
+	},
 	{
 		key: "concurrency.maxBuilds",
 		type: CAPACITY,
@@ -1239,6 +1261,88 @@ function readIdleStop(state) {
 		idleMinutes: record.idleMinutes
 	};
 }
+/** Each platform's latest run; `lastBuild` holds whichever platform ran last. */
+const LAST_BUILD_KEYS = {
+	ios: "lastIosBuild",
+	android: "lastAndroidBuild"
+};
+const MISS_KINDS = /* @__PURE__ */ new Set([
+	"changed",
+	"no-baseline",
+	"same-sources",
+	"cache-skipped",
+	"fingerprint-error"
+]);
+const MISS_CATEGORIES = /* @__PURE__ */ new Set([
+	"native-dependency",
+	"config-plugin",
+	"app-config",
+	"app-asset",
+	"package",
+	"native-dir",
+	"autolinking",
+	"package-scripts",
+	"file",
+	"other"
+]);
+const MISS_CHANGE_CAP = 20;
+function missChange(value) {
+	if (!value || typeof value !== "object") return null;
+	const { source, change, category } = value;
+	if (typeof source !== "string" || change !== "added" && change !== "removed" && change !== "changed") return null;
+	return {
+		source,
+		change,
+		category: typeof category === "string" && MISS_CATEGORIES.has(category) ? category : "other"
+	};
+}
+function missReason(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const record = value;
+	if (typeof record.kind !== "string" || !MISS_KINDS.has(record.kind) || typeof record.summary !== "string") return null;
+	const changes = (Array.isArray(record.changes) ? record.changes : []).map(missChange).filter((change) => change !== null).slice(0, MISS_CHANGE_CAP);
+	const baseline = record.baseline;
+	return {
+		kind: record.kind,
+		summary: record.summary,
+		changes,
+		changeCount: Number.isInteger(record.changeCount) && record.changeCount >= changes.length ? record.changeCount : changes.length,
+		baseline: baseline && typeof baseline.fingerprint === "string" && (baseline.from === "workspace" || baseline.from === "project") ? {
+			fingerprint: baseline.fingerprint,
+			from: baseline.from
+		} : null,
+		rekeyedBy: Array.isArray(record.rekeyedBy) ? record.rekeyedBy.filter((step) => typeof step === "string") : []
+	};
+}
+function lastBuildReport(platform, value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const record = value;
+	if (record.platform !== platform || record.status !== "ok" && record.status !== "failed") return null;
+	if (typeof record.startedAt !== "string") return null;
+	const durationMs = typeof record.durationMs === "number" && record.durationMs >= 0 ? record.durationMs : null;
+	const finished = new Date(Date.parse(record.startedAt) + (durationMs ?? NaN));
+	const reason = record.cacheHit === "local" || record.cacheHit === "remote" ? null : missReason(record.missReason);
+	return {
+		platform,
+		status: record.status,
+		cacheHit: record.cacheHit === "local" || record.cacheHit === "remote" ? record.cacheHit : false,
+		cacheSkipped: record.cacheSkipped === true,
+		durationMs,
+		fingerprint: typeof record.fingerprint === "string" ? record.fingerprint : null,
+		startedAt: record.startedAt,
+		finishedAt: Number.isNaN(finished.getTime()) ? null : finished.toISOString(),
+		...typeof record.errorCode === "string" ? { errorCode: record.errorCode } : {},
+		...reason ? { missReason: reason } : {}
+	};
+}
+function readLastBuilds(state) {
+	const reports = {};
+	for (const platform of ["ios", "android"]) {
+		const [report] = [lastBuildReport(platform, state?.[LAST_BUILD_KEYS[platform]]), lastBuildReport(platform, state?.lastBuild)].filter((candidate) => candidate !== null).toSorted((a, b) => (Date.parse(b.startedAt) || 0) - (Date.parse(a.startedAt) || 0));
+		if (report) reports[platform] = report;
+	}
+	return reports;
+}
 function readWorkspaceState(root) {
 	return readJsonObject(workspaceStateFile(root));
 }
@@ -1266,4 +1370,4 @@ function workspaceLastUsed(root) {
 	return lastUseFrom(readWorkspaceState(root), mtimes);
 }
 //#endregion
-export { ANDROID_COMPILER_CACHE_CHOICES, ANDROID_PCH_CHOICES, BUILD_PHASES, ERROR_SOURCES, IDLE_STOP_KEY, IOS_SIMULATOR_APPS, LEVELS, REMOTE_DEVICE_BACKENDS, SETTINGS, SETTINGS_SCHEMA_FILE, SETTINGS_SCHEMA_URL, SETTING_GROUPS, SETTING_SCOPES, SOURCES, TUNNEL_MODES, acceptsShape, advanceTail, allMetroPorts, attachExpoErrorContext, buildCriteria, coerceSettingText, compileGrep, configCorruptRepair, configLockPath, createdDevicesFile, createdDevicesLock, easMachineStateRoot, easSessionLedgerFile, easSessionLedgerLock, emulatorLogFile, expectedShape, fileSizes, findEnclosingWorktreeRoot, findProjectByMetroPort, followLogs, getConcurrencyLimits, getConfigPath, getProject, getProjectSetting, getProjectSettings, getRepoSettings, isJsonObject, isLayeredSetting, isPathPrefix, isSensitiveReference, lastUseFrom, levelRank, loadConfig, logFiles, markerWindow, parseNdjsonLine, parseNdjsonText, parseSince, queryLogs, readCreatedDevices, readEasSessionLedger, readIdleStop, readJsonFile, readJsonObject, readLogRecords, readNdjsonGenerations, readWorkspaceState, recordMatches, settingDefinition, settingValueError, settingsJsonSchema, sharedCcache, sharedCompilationCache, sharedGradle, sharedPods, sortByTs, supervisorLogFile, supervisorPidFile, tailRead, validEasSessionClaim, withConfigLock, workspaceDerivedData, workspaceGradleBuild, workspaceLastUsed, workspaceLogErrorIndex, workspaceLogsDir, workspaceMetadataFile, workspaceStateFile, workspaceStateLock };
+export { ANDROID_COMPILER_CACHE_CHOICES, ANDROID_EMULATOR_APPS, ANDROID_PCH_CHOICES, BUILD_PHASES, ERROR_SOURCES, IDLE_STOP_KEY, IOS_SIMULATOR_APPS, LAST_BUILD_KEYS, LEVELS, REMOTE_DEVICE_BACKENDS, SETTINGS, SETTINGS_SCHEMA_FILE, SETTINGS_SCHEMA_URL, SETTING_GROUPS, SETTING_SCOPES, SOURCES, TUNNEL_MODES, acceptsShape, advanceTail, allMetroPorts, attachExpoErrorContext, buildCriteria, coerceSettingText, compileGrep, configCorruptRepair, configLockPath, createdDevicesFile, createdDevicesLock, easMachineStateRoot, easSessionLedgerFile, easSessionLedgerLock, emulatorLogFile, expectedShape, fileSizes, findEnclosingWorktreeRoot, findProjectByMetroPort, followLogs, getConcurrencyLimits, getConfigPath, getProject, getProjectSetting, getProjectSettings, getRepoSettings, gitMergeCacheDir, isJsonObject, isLayeredSetting, isPathPrefix, isSensitiveReference, lastUseFrom, levelRank, loadConfig, logFiles, markerWindow, parseNdjsonLine, parseNdjsonText, parseSince, queryLogs, readCreatedDevices, readEasSessionLedger, readIdleStop, readJsonFile, readJsonObject, readLastBuilds, readLogRecords, readNdjsonGenerations, readWorkspaceState, recordMatches, settingDefinition, settingValueError, settingsJsonSchema, sharedCcache, sharedCompilationCache, sharedGradle, sharedPods, sortByTs, supervisorLogFile, supervisorPidFile, tailRead, validEasSessionClaim, withConfigLock, workspaceDerivedData, workspaceGradleBuild, workspaceLastUsed, workspaceLogErrorIndex, workspaceLogsDir, workspaceMetadataFile, workspaceStateFile, workspaceStateLock };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stim-cli/core",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Shared internal cache and runtime primitives for Stim packages.",
   "license": "MIT",
   "repository": {