stim 1.17.2 → 1.18.0

package/dist/{macos-BIRQS90f.mjs → macos-DF6C7wUU.mjs}

@@ -1,30 +1,52 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { E as upsertProject, u as getConcurrencyLimits } from "./config-D0DbpZtM.mjs";
-import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
-import { l as phaseLine } from "./command-output-CDAIFD-8.mjs";
-import { P as resolveSettings, R as settingShapeErrors, gt as repoRoot, i as SETTING_SHAPE_REMEDY, it as gitCommonDir } from "./settings-Cfd-0r2d.mjs";
-import { s as findProjectRoot$1 } from "./project-D47Rh0ly.mjs";
-import { c as writeWorkspaceState, g as workspaceAgentDeviceDir, i as recordWorkspaceUse, u as ensureWorkspaceStorage, v as workspaceDir, x as workspaceLogsDir$1 } from "./workspace-state-DqcCbpE7.mjs";
-import { a as spawnDeclared } from "./spawn-claims-D0XfSe8u.mjs";
-import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-41v_d2x9.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
-import { c as recordFinishedBuild, l as startBuildProgress, n as NO_BUILD_PROGRESS, u as tapBuildLog } from "./build-progress-D0WkjCPd.mjs";
-import { a as requiredMacosRecord, n as macosLogFile, r as macosProcess, t as macosDir } from "./state-DyaNTgfR.mjs";
-import { r as createNdjsonWriter } from "./ndjson-PclOIwVY.mjs";
-import { i as macosToolchain } from "./toolchain-DNyR3NPq.mjs";
-import { a as offloadBuild, c as placementLoad, d as OffloadRefusal, f as namedBuildMachine, h as resolveBuildPlacement, i as closeOffload, l as remotePhaseText, n as buildPlacementCandidates, p as parseBuildMachineOption, r as chooseBuildMachine, s as offloadPlacement } from "./client-SvBdgObD.mjs";
-import { o as connectHost } from "./hosted-client-Bp4knSwu.mjs";
-import { t as logLines } from "./run-CkE9y0nc.mjs";
-import { t as placeHostedMacos } from "./hosted-macos-DcxKjtfH.mjs";
-import { n as stopMacosAppHeld } from "./stop-BIiM49EY.mjs";
-import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { n as stageBundle, r as validateInfoPlist, t as resolveBundleExtras } from "./stage-CzaiwFsI.mjs";
-import { f as withNativeBuildRun } from "./native-run-D1Q56rAD.mjs";
-import { createHash, randomUUID } from "node:crypto";
+import { t as process_identity_exports } from "./process-identity-Biv3arCO.mjs";
+import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.mjs";
+import { l as phaseLine } from "./command-output-CBtzyIgF.mjs";
+import { E as upsertProject, u as getConcurrencyLimits } from "./config-CgYMahz7.mjs";
+import { s as gitCommonDir, y as repoRoot } from "./worktree-CsKYexJM.mjs";
+import { s as findProjectRoot$1, u as ownedDeviceLabel } from "./project-C3ChRLZy.mjs";
+import { c as writeWorkspaceState, g as workspaceAgentDeviceDir, i as recordWorkspaceUse, u as ensureWorkspaceStorage, v as workspaceDir, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
+import { F as recordFinishedBuild, I as startBuildProgress, L as tapBuildLog, O as NO_BUILD_PROGRESS, P as recordBuildPhase } from "./budget-DIhL2BKx.mjs";
+import { N as releaseBuildSlot, j as acquireBuildSlot } from "./workspaces-xXItD8Dj.mjs";
+import { a as spawnDeclared } from "./spawn-claims-Kqiifsk2.mjs";
+import { E as sanitizeDeviceLabel } from "./ios-B3SbOWdw.mjs";
+import { F as resolveSettings, i as SETTING_SHAPE_REMEDY, z as settingShapeErrors } from "./settings-CQyMElEP.mjs";
+import { a as withWorkspaceProcessLock } from "./named-ports-BFIz1Shz.mjs";
+import { a as requiredMacosRecord, n as macosLogFile, r as macosProcess, t as macosDir } from "./state-xnqpx3AD.mjs";
+import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
+import { _ as resolveBuildPlacement, a as offloadBuild, c as placementLoad, d as setRemoteLogSink, f as OffloadRefusal, h as parseBuildMachineOption, i as closeOffload, l as remotePhaseText, m as namedBuildMachine, n as buildPlacementCandidates, r as chooseBuildMachine, s as offloadPlacement } from "./client-DzhapoMB.mjs";
+import { i as macosToolchain } from "./toolchain-Bnyd_K3A.mjs";
+import { o as connectHost } from "./hosted-client-C-rMtppF.mjs";
+import { t as buildPlacementRecord } from "./placement-log-BcPhRwR4.mjs";
+import { f as withNativeBuildRun } from "./native-run-B06FkmZx.mjs";
+import { t as placeHostedMacos } from "./hosted-macos-B-wEjlwG.mjs";
+import { t as logLines } from "./run-vhtDgpHO.mjs";
+import { i as validateInfoPlist, n as setBundleName, r as stageBundle, t as resolveBundleExtras } from "./stage-g_WqWeaE.mjs";
+import { n as stopMacosAppHeld } from "./stop-BGhKMOuH.mjs";
 import { closeSync, existsSync, mkdirSync, mkdtempSync, openSync, realpathSync, renameSync, rmSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
-import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { machineCapacity, readMacosRecord, validHostedAppArguments } from "@stim-cli/core/state";
+import { LOG_ROTATE_BYTES } from "@stim-cli/core";
+import { createHash, randomUUID } from "node:crypto";
+//#region src/macos/app-name.ts
+const DOT = String.fromCodePoint(183);
+const ELLIPSIS = String.fromCodePoint(8230);
+const LABEL_MAX = 24;
+const PRODUCT_MAX = 40;
+function clip(text, max) {
+	const chars = [...text];
+	return chars.length <= max ? text : `${chars.slice(0, max - 1).join("")}${ELLIPSIS}`;
+}
+/** The visible app name for a run: `<product> <dot> <label>`, or just the product when the label is empty. */
+function macosAppName(product, label) {
+	const name = clip(product.replace(/[\p{Cc}/:\\]+/gu, " ").trim(), PRODUCT_MAX) || "App";
+	const suffix = clip(sanitizeDeviceLabel(label), LABEL_MAX);
+	return suffix ? `${name} ${DOT} ${suffix}` : name;
+}
+function workspaceAppName(root, product) {
+	return macosAppName(product, ownedDeviceLabel(root));
+}
+//#endregion
 //#region src/macos/build.ts
 async function tool(root, args, writer, note, capture = false) {
 	const child = spawnDeclared(() => getExecutor().spawn("swift", args, {
@@ -57,8 +79,12 @@ async function tool(root, args, writer, note, capture = false) {
 	});
 	return stdout.trim();
 }
-async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, scratch, writer, note, record, buildMachine, resources, assetCatalog, progress = NO_BUILD_PROGRESS }) {
+async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, displayName, scratch, writer, note, record, buildMachine, resources, assetCatalog, progress = NO_BUILD_PROGRESS }) {
 	if (record) record.buildMachine = buildMachine;
+	setRemoteLogSink((entry) => writer.write({
+		...entry,
+		platform: "macos"
+	}));
 	validateInfoPlist(root, product, infoPlist);
 	const repository = realpathSync(repoRoot(root) ?? root);
 	const extras = resolveBundleExtras(root, repository, resources, assetCatalog);
@@ -72,7 +98,20 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, sc
 		note(msg);
 	};
 	let offloadFallback = null;
+	let asked = [];
+	let failedMachine;
 	const fallBack = (reason) => {
+		writer.write(buildPlacementRecord({
+			platform: "macos",
+			buildMachine,
+			candidates: asked,
+			event: "placement_fallback",
+			fallback: {
+				code: failedMachine ? "offload-failed" : "no-remote-mac-took-it",
+				reason,
+				machine: failedMachine
+			}
+		}));
 		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
 		offloadFallback = reason;
 		if (record) record.offloadFallback = reason;
@@ -122,10 +161,21 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, sc
 					here,
 					machines,
 					selected: buildMachine,
-					note: (line) => write(`offload: ${line}`)
+					note: (line) => write(`offload: ${line}`),
+					onCandidates: (each) => asked = each
 				});
 				if (typeof chosen === "string") throw new Error(chosen);
 				choice = chosen;
+				failedMachine = chosen.machine;
+				writer.write(buildPlacementRecord({
+					platform: "macos",
+					buildMachine,
+					candidates: asked,
+					chose: {
+						machine: chosen.machine,
+						reason: `${placement.reason}${placementLoad(chosen)}`
+					}
+				}));
 				write(`placement: ${choice.machine} (${placement.reason}${placementLoad(choice)})`);
 				const outcome = await offloadBuild({
 					choice,
@@ -171,6 +221,15 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, sc
 				]));
 				if (plist.CFBundleIdentifier !== bundleId || plist.CFBundleExecutable !== product || !existsSync(executable)) throw new Error("The fetched macOS bundle does not match the requested identity and executable.");
 				for (const destination of [...Object.keys(extras.resources), ...extras.assetCatalog ? ["Assets.car"] : []]) if (!existsSync(join(outcome.artifactPath, "Contents", "Resources", destination))) throw new Error(`The fetched macOS bundle lacks declared resource ${destination}.`);
+				if (displayName !== void 0) {
+					setBundleName(join(outcome.artifactPath, "Contents", "Info.plist"), displayName);
+					getExecutor().runFile("codesign", [
+						"--force",
+						"--sign",
+						"-",
+						outcome.artifactPath
+					]);
+				}
 				getExecutor().runFile("codesign", [
 					"--verify",
 					"--strict",
@@ -188,6 +247,14 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, sc
 					handoff: outcome.handoff ?? null
 				};
 			}
+			writer.write(buildPlacementRecord({
+				platform: "macos",
+				buildMachine,
+				stays: {
+					code: placement.code,
+					reason: placement.reason
+				}
+			}));
 			write(`placement: here (${placement.reason})`);
 		} catch (error) {
 			fallBack(error instanceof Error ? error.message : String(error));
@@ -226,7 +293,7 @@ async function buildMacosBundle({ root, product, infoPlist, bundle, bundleId, sc
 			], writer, () => {}, true);
 			progress.step("install");
 			const staged = join(staging, `${product}.app`);
-			stageBundle(root, product, infoPlist, bin, staged, bundleId, extras);
+			stageBundle(root, product, infoPlist, bin, staged, bundleId, extras, displayName);
 			promote(staged);
 			return {
 				bundleId,
@@ -312,7 +379,18 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 			};
 			const handoff = await buildBundle(root, macos.infoPlist, record, remote !== void 0, note, macos, progress);
 			progress.step("launch");
-			if (!remote) return launchHere(root, record);
+			const launched = () => {
+				try {
+					recordBuildPhase(root, "macos", record.build.startedAt, "launch", progress.durations().launch ?? 0);
+				} catch (error) {
+					note(`The launch time could not be recorded in the build history: ${error?.message || error}`);
+				}
+			};
+			if (!remote) {
+				const here = await launchHere(root, record);
+				launched();
+				return here;
+			}
 			const connection = await connectHost(remote);
 			const write = (patch) => writeWorkspaceState(root, { macos: {
 				...record,
@@ -344,6 +422,7 @@ async function runMacos(root, note = console.error, remote, buildMachineFlag) {
 					hostLaunched: run.launched
 				};
 				writeWorkspaceState(root, { macos: placed });
+				launched();
 				return placed;
 			} catch (error) {
 				write({
@@ -372,12 +451,14 @@ async function buildBundle(root, infoPlist, record, hosted, note, extras, progre
 	try {
 		const { bundleId: base } = validateInfoPlist(root, record.product, infoPlist);
 		const bundleId = hosted ? base : `${base}.stim.${createHash("sha256").update(root).digest("hex").slice(0, 12)}`;
+		const displayName = workspaceAppName(root, record.product);
 		const built = await buildMacosBundle({
 			root,
 			product: record.product,
 			infoPlist,
 			bundle: record.bundle,
 			bundleId,
+			displayName,
 			scratch,
 			writer,
 			note,
@@ -388,6 +469,7 @@ async function buildBundle(root, infoPlist, record, hosted, note, extras, progre
 			assetCatalog: extras.assetCatalog
 		});
 		record.bundleId = built.bundleId;
+		record.displayName = displayName;
 		record.bundle = realpathSync(record.bundle);
 		record.executable = realpathSync(join(record.bundle, "Contents", "MacOS", record.product));
 		record.build = {
@@ -397,7 +479,7 @@ async function buildBundle(root, infoPlist, record, hosted, note, extras, progre
 			durationMs: Date.now() - started
 		};
 		writeWorkspaceState(root, { macos: record });
-		recordMacosBuild(root, record.build);
+		recordMacosBuild(root, record.build, progress.steps());
 		return built.handoff;
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
@@ -420,13 +502,13 @@ async function buildBundle(root, infoPlist, record, hosted, note, extras, progre
 			supervisor: void 0,
 			build
 		} });
-		recordMacosBuild(root, build);
+		recordMacosBuild(root, build, progress.steps());
 		throw error;
 	} finally {
 		writer.close();
 	}
 }
-function recordMacosBuild(root, build) {
+function recordMacosBuild(root, build, compileSteps) {
 	recordFinishedBuild(root, {
 		platform: "macos",
 		status: build.state === "ok" ? "ok" : "failed",
@@ -441,7 +523,8 @@ function recordMacosBuild(root, build) {
 		buildMachine: build.buildMachine,
 		builtOn: build.builtOn,
 		offloadedTo: build.offloadedTo,
-		offloadFallback: build.offloadFallback
+		offloadFallback: build.offloadFallback,
+		...compileSteps === null ? {} : { compileSteps }
 	});
 }
 async function launchHere(root, record) {
@@ -485,11 +568,12 @@ function launchPayload(root, record) {
 		platform: "macos",
 		...record
 	};
-	const { product, launchId, build, host } = record;
+	const { product, displayName, launchId, build, host } = record;
 	return {
 		agentDevice,
 		platform: "macos",
 		product,
+		displayName,
 		launchId,
 		build,
 		host
@@ -511,4 +595,4 @@ function macosCommand(program) {
 	});
 }
 //#endregion
-export { macosCommand as default, runMacos };
+export { runMacos as n, macosCommand as t };

package/dist/macos-run.mjs

@@ -1,2 +1,2 @@
-import { n as runMacosSupervisor, t as logLines } from "./run-CkE9y0nc.mjs";
+import { n as runMacosSupervisor, t as logLines } from "./run-vhtDgpHO.mjs";
 export { logLines, runMacosSupervisor };