stim 1.14.0 → 1.15.0

package/README.md

@@ -43,6 +43,8 @@ reference:
 
 - [Getting started](https://stim.appandflow.com/docs/getting-started): terms,
   the first run, parallel worktrees, and what to do when a run fails.
+- [Native macOS prototype](https://stim.appandflow.com/docs/macos): Swift Package
+  Debug apps, workspace logs and local window viewing in Stim Desktop.
 - [Web in an owned Chrome](https://stim.appandflow.com/docs/web): `stim web`
   for Expo web and other web servers, page logs, and attaching browser tools.
 - [Worktrees](https://stim.appandflow.com/docs/worktrees): `worktree warm`,

package/dist/{activity-CYVDcrt3.mjs → activity-B2-kb7k0.mjs}

@@ -1,16 +1,130 @@
-import { O as process_identity_exports } from "./config-lvc7d3C2.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { M as workspaceLogsDir, h as readWorkspaceState } from "./metro-CcEo8Fl8.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-5c3WrVRm.mjs";
-import { closeSync, fstatSync, openSync, readFileSync, readSync, readdirSync } from "node:fs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
+import { C as workspaceLogsDir, r as readWorkspaceState$1 } from "./workspace-state-CL2V2Ons.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-W5Pi1q38.mjs";
+import { closeSync, fstatSync, openSync, readFileSync, readSync, readdirSync, statSync } from "node:fs";
 import { basename, join, resolve } from "node:path";
+import { readViewedDevices } from "@stim-cli/core/state";
 import { homedir } from "node:os";
+//#region src/devices/automation-tools.ts
+const AUTOMATION_TOOLS = [
+	{
+		tool: "agent-browser",
+		platforms: ["web"],
+		cdp: /agent-browser/i
+	},
+	{
+		tool: "agent-device",
+		platforms: [
+			"ios",
+			"android",
+			"web"
+		],
+		host: /agent-device/i,
+		cdp: /agent-device/i
+	},
+	{
+		tool: "argent",
+		platforms: [
+			"ios",
+			"android",
+			"web"
+		],
+		host: /\/bin\/[\w-]+\/(simulator-server(\.exe)?\s+(ios|android|android_device)|ax-service)\b|com\.argent\.androiddevtools/,
+		instrumentation: /com\.argent\.androiddevtools/,
+		cdp: /@swmansion\/argent\/dist\/tool-server/
+	},
+	{
+		tool: "idb",
+		platforms: ["ios"],
+		host: /idb_companion/
+	},
+	{
+		tool: "maestro",
+		platforms: ["ios", "android"],
+		host: /maestro/i
+	},
+	{
+		tool: "appium",
+		platforms: ["ios", "android"],
+		host: /appium|WebDriverAgent/i
+	},
+	{
+		tool: "xcodebuild",
+		platforms: ["ios"],
+		host: /\bxcodebuild\b.*\btest(-without-building)?\b/
+	},
+	{
+		tool: "simctl",
+		platforms: ["ios"],
+		host: /\bsimctl\s+(io|spawn)\b/
+	},
+	{
+		tool: "uiautomator",
+		platforms: ["android"],
+		instrumentation: /uiautomator/
+	},
+	{
+		tool: "instrumentation",
+		platforms: ["android"],
+		instrumentation: /androidx\.test|\binstrument\b/
+	},
+	{
+		tool: "chrome-devtools-mcp",
+		platforms: ["web"],
+		cdp: /chrome-devtools-mcp/i
+	},
+	{
+		tool: "playwright",
+		platforms: ["web"],
+		cdp: /playwright/i
+	},
+	{
+		tool: "puppeteer",
+		platforms: ["web"],
+		cdp: /puppeteer/i
+	}
+];
+const HOST_EXCLUSIONS = [/\bsimctl\s+spawn\b.*\blog\s+stream\b/, /\blogcat\b/];
+/** Stim's own DevTools clients: the browser supervisor, `stim-frames` in stim-server, Stim Desktop, the stim CLI. */
+const CDP_EXCLUSIONS = [/\bstim-(frames|server|web)\b|StimDesktop|\/stim(-cli)?\/(dist|bin)\/|\/bin\/stim(\s|$)|^stim(\s|$)/];
+function namesDevice(command, id) {
+	const escaped = id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`(^|[^A-Za-z0-9])${escaped}([^A-Za-z0-9]|$)`).test(command);
+}
+/** The tool a host process drives the device `id` with, or null when the command does not name the device. */
+function hostDriverTool(command, platform, id) {
+	if (!namesDevice(command, id) || HOST_EXCLUSIONS.some((pattern) => pattern.test(command))) return null;
+	return AUTOMATION_TOOLS.find((entry) => entry.platforms.includes(platform) && entry.host?.test(command))?.tool ?? null;
+}
+/** The tool behind an on-device process's arguments, or null when it is not instrumentation. */
+function instrumentationTool(args) {
+	return AUTOMATION_TOOLS.find((entry) => entry.platforms.includes("android") && entry.instrumentation?.test(args))?.tool ?? null;
+}
+/**
+* The tool a DevTools client's command line names, or null for Stim's own clients. A client no entry names is
+* reported by its script or executable name.
+*/
+function cdpClientTool(command) {
+	if (CDP_EXCLUSIONS.some((pattern) => pattern.test(command))) return null;
+	const known = AUTOMATION_TOOLS.find((entry) => entry.platforms.includes("web") && entry.cdp?.test(command));
+	if (known) return known.tool;
+	const [executable = "", script] = command.trim().split(/\s+/);
+	const name = basename(executable);
+	return (/^(node|bun|deno|python3?)$/.test(name) && script ? basename(script) : name) || "unknown DevTools client";
+}
+//#endregion
 //#region src/devices/activity.ts
 const ACTIVE_WINDOW_MS = 6e5;
 const LOG_TAIL_BYTES = 262144;
 function classifyActivity(evidence, now) {
 	const last = evidence.recency.reduce((best, entry) => Number.isFinite(entry.at) && (!best || entry.at > best.at) ? entry : best, null);
-	const lastActivityAt = last ? { lastActivityAt: new Date(last.at).toISOString() } : {};
+	const recent = {};
+	for (const { basis, at } of evidence.recency) if (Number.isFinite(at) && !(Date.parse(recent[basis] ?? "") >= at)) recent[basis] = new Date(at).toISOString();
+	const lastActivityAt = last ? {
+		lastActivityAt: new Date(last.at).toISOString(),
+		recent
+	} : {};
 	const [first] = evidence.drivers;
 	if (first) {
 		const { basis: _basis, ...driver } = first;
@@ -72,6 +186,7 @@ function parseAgentDeviceRecord(kind, path, raw) {
 		readable: Boolean(entry && deviceId),
 		owner: entry ? field(entry, "ownerPid", "ownerStartTime") : null,
 		runner: entry && kind === "runner-lease" ? field(entry, "runnerPid", "runnerStartTime") : null,
+		claimProtocol: kind === "runner-lease" && entry?.deviceClaimProtocol === 1,
 		createdAtMs
 	};
 }
@@ -107,34 +222,15 @@ function parseProcessTable(output) {
 	}
 	return rows;
 }
-function namesDevice(command, id) {
-	const escaped = id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	return new RegExp(`(^|[^A-Za-z0-9])${escaped}([^A-Za-z0-9]|$)`).test(command);
-}
-function driverTool(command, id) {
-	if (!namesDevice(command, id)) return null;
-	if (/\bsimctl\s+spawn\b.*\blog\s+stream\b/.test(command) || /\blogcat\b/.test(command)) return null;
-	if (/agent-device/i.test(command)) return "agent-device";
-	if (/idb_companion/.test(command)) return "idb";
-	if (/maestro/i.test(command)) return "maestro";
-	if (/appium|WebDriverAgent/i.test(command)) return "appium";
-	if (/\bxcodebuild\b.*\btest(-without-building)?\b/.test(command)) return "xcodebuild";
-	if (/\bsimctl\s+(io|spawn)\b/.test(command)) return "simctl";
-	return null;
-}
 function parseAndroidInstrumentation(output) {
 	const found = [];
 	for (const line of output.split("\n")) {
 		const match = /^\s*(\d+)\s+(.*)$/.exec(line);
 		if (!match) continue;
-		const args = match[2];
-		if (/uiautomator/.test(args)) found.push({
-			pid: Number(match[1]),
-			tool: "uiautomator"
-		});
-		else if (/androidx\.test|\binstrument\b/.test(args)) found.push({
+		const tool = instrumentationTool(match[2]);
+		if (tool) found.push({
 			pid: Number(match[1]),
-			tool: "instrumentation"
+			tool
 		});
 	}
 	return found;
@@ -159,6 +255,7 @@ function latestRecordAt(lines, matches) {
 function isDeviceRecord(record) {
 	return !(typeof record.event === "string" && record.event.startsWith("collector_"));
 }
+/** The last lines of the file at `path`, at most its final 256 KiB, or null when it cannot be read. */
 function tailLines(path) {
 	let fd;
 	try {
@@ -190,6 +287,18 @@ function agentDeviceDirs(home) {
 		dir
 	}))];
 }
+/**
+* When an agent-device session last recorded an event: its events file's modification time. agent-device names a
+* session's directory after the session with every character outside `[a-zA-Z0-9._-]` replaced by `_`.
+*/
+function agentSessionActedAt(home, session) {
+	const root = envDir("AGENT_DEVICE_STATE_DIR") ?? join(home, ".agent-device");
+	try {
+		return statSync(join(root, "sessions", session.replaceAll(/[^a-zA-Z0-9._-]/g, "_"), "events.ndjson")).mtimeMs;
+	} catch {
+		return null;
+	}
+}
 function readAgentDeviceRecords(home) {
 	return agentDeviceDirs(home).flatMap(({ kind, dir }) => {
 		let names;
@@ -208,18 +317,48 @@ function readAgentDeviceRecords(home) {
 		});
 	});
 }
+function isClaimProtocolRunner(record, row) {
+	if (!record.claimProtocol || record.runner?.pid !== row.pid || row.startedAt === null) return false;
+	const recorded = Date.parse(record.runner.startTime);
+	return Math.floor(recorded / 1e3) === Math.floor(Date.parse(row.startedAt) / 1e3);
+}
+function lsofArgs(port) {
+	return [
+		"-nP",
+		`-iTCP:${port}`,
+		"-sTCP:ESTABLISHED",
+		"-Fpn"
+	];
+}
+function lsofNoMatch(error) {
+	const stdout = error.stdout;
+	return error.status === 1 && (stdout === "" || stdout === void 0) ? "" : null;
+}
 function createDeviceProcessTables() {
 	const exec = getExecutor();
 	let host;
 	const android = /* @__PURE__ */ new Map();
+	const tcp = /* @__PURE__ */ new Map();
 	return {
+		tcpConnections(port) {
+			if (!tcp.has(port)) {
+				let output;
+				try {
+					output = exec.runFile("lsof", lsofArgs(port), { timeoutMs: 5e3 });
+				} catch (error) {
+					output = lsofNoMatch(error);
+				}
+				tcp.set(port, output);
+			}
+			return tcp.get(port) ?? null;
+		},
 		host() {
 			if (host === void 0) {
 				const output = exec.runFileQuiet("ps", [
 					"-axww",
 					"-o",
 					HOST_PROCESS_COLUMNS
-				], { timeoutMs: 5e3 });
+				], { timeoutMs: 1e4 });
 				host = output === null ? null : parseProcessTable(output);
 			}
 			return host;
@@ -238,9 +377,10 @@ function createDeviceProcessTables() {
 		}
 	};
 }
-function createActivityReader({ now = Date.now(), home = homedir(), startOf = process_identity_exports.inspectProcessStart, leaseFiles = listLeaseFiles, tables = createDeviceProcessTables() } = {}) {
+function createActivityReader({ now = Date.now(), home = homedir(), startOf = process_identity_exports.inspectProcessStart, leaseFiles = listLeaseFiles, tables = createDeviceProcessTables(), viewers = readViewedDevices } = {}) {
 	let agentDevice;
 	let stimLeases;
+	let viewed;
 	const logs = /* @__PURE__ */ new Map();
 	const log = (path) => {
 		if (!logs.has(path)) logs.set(path, tailLines(path));
@@ -258,14 +398,21 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 		}));
 		for (const { record, liveness } of agentDevice) {
 			if (record.deviceId !== null && record.deviceId !== target.id) continue;
+			if (record.claimProtocol) continue;
 			const basis = record.kind === "claim" ? "agent-device-claim" : "agent-device-lease";
-			if (liveness === "live") evidence.drivers.push({
-				basis,
-				tool: "agent-device",
-				pid: record.owner?.pid ?? null,
-				since: record.createdAtMs !== null ? new Date(record.createdAtMs).toISOString() : null
-			});
-			else if (liveness === "unknown") evidence.unknown.push(basis);
+			if (liveness === "live") {
+				evidence.drivers.push({
+					basis,
+					tool: "agent-device",
+					pid: record.owner?.pid ?? null,
+					since: record.createdAtMs !== null ? new Date(record.createdAtMs).toISOString() : null
+				});
+				const actedAt = record.session ? agentSessionActedAt(home, record.session) : null;
+				if (actedAt !== null) evidence.recency.push({
+					basis: "agent-action",
+					at: actedAt
+				});
+			} else if (liveness === "unknown") evidence.unknown.push(basis);
 		}
 		try {
 			stimLeases ??= leaseFiles();
@@ -283,10 +430,16 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 				since: entry.lease.grantedAt
 			});
 		}
+		viewed ??= viewers();
+		if (viewed.some((device) => device.platform === target.platform && device.id === target.id)) evidence.recency.push({
+			basis: "viewer",
+			at: now
+		});
 		const processes = tables.host();
 		if (processes === null) evidence.unknown.push("driver-process");
 		for (const row of processes ?? []) {
-			const tool = driverTool(row.command, target.id);
+			if (agentDevice.some(({ record }) => isClaimProtocolRunner(record, row))) continue;
+			const tool = hostDriverTool(row.command, target.platform, target.id);
 			if (tool) evidence.drivers.push({
 				basis: "driver-process",
 				tool,
@@ -316,7 +469,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 				basis: "metro-bundle",
 				at: bundleAt
 			});
-			const usedAt = Date.parse(String(readWorkspaceState(target.workspace)?.lastUsedAt ?? ""));
+			const usedAt = Date.parse(String(readWorkspaceState$1(target.workspace)?.lastUsedAt ?? ""));
 			if (Number.isFinite(usedAt)) evidence.recency.push({
 				basis: "workspace-use",
 				at: usedAt
@@ -327,7 +480,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 }
 function workspaceActivity(workspace, now = Date.now()) {
 	const dir = workspaceLogsDir(workspace);
-	const state = readWorkspaceState(workspace);
+	const state = readWorkspaceState$1(workspace);
 	const recency = [];
 	const deviceAt = latestRecordAt(tailLines(join(dir, "device.ndjson")) ?? [], (record) => record.src === "device" && isDeviceRecord(record));
 	if (deviceAt !== null) recency.push({
@@ -352,5 +505,92 @@ function workspaceActivity(workspace, now = Date.now()) {
 		recency
 	}, now);
 }
+/**
+* The pids of processes connected to loopback `port` as clients, from `lsof -Fpn` output: a connection whose remote
+* end is the port. Chrome's own accepted sockets have the port as their local end and are skipped.
+*/
+function parseTcpClients(output, port) {
+	const pids = /* @__PURE__ */ new Set();
+	let pid = null;
+	for (const line of output.split("\n")) if (line.startsWith("p")) pid = Number(line.slice(1));
+	else if (line.startsWith("n") && pid !== null && Number.isInteger(pid)) {
+		const remote = line.slice(1).split("->")[1];
+		if (remote && Number(remote.slice(remote.lastIndexOf(":") + 1)) === port) pids.add(pid);
+	}
+	return [...pids];
+}
+function webClientPids(connections, target) {
+	return parseTcpClients(connections, target.port).filter((pid) => !target.ownPids.includes(pid));
+}
+function webDrivers(clients, processes) {
+	return clients.flatMap((pid) => {
+		const row = processes.find((candidate) => candidate.pid === pid);
+		const tool = row ? cdpClientTool(row.command) : "unknown DevTools client";
+		return tool ? [{
+			tool,
+			pid,
+			since: row?.startedAt ?? null
+		}] : [];
+	});
+}
+/**
+* The DevTools clients of the owned browser that are not Stim's, read without blocking the event loop; null when
+* lsof or ps could not be read.
+*/
+async function probeWebDrivers(target) {
+	const exec = getExecutor();
+	let connections;
+	try {
+		connections = await exec.runFileAsync("lsof", lsofArgs(target.port), { timeoutMs: 5e3 });
+	} catch (error) {
+		connections = lsofNoMatch(error);
+	}
+	if (connections === null) return null;
+	const clients = webClientPids(connections, target);
+	if (!clients.length) return [];
+	let table;
+	try {
+		table = await exec.runFileAsync("ps", [
+			"-axww",
+			"-o",
+			HOST_PROCESS_COLUMNS
+		], { timeoutMs: 5e3 });
+	} catch {
+		return null;
+	}
+	return webDrivers(clients, parseProcessTable(table));
+}
+/**
+* The owned browser's activity: a DevTools client other than Stim's is a driver (basis `cdp-client`). Recency comes
+* from the newest agent action the browser supervisor recorded (basis `agent-action`) and the newest other page
+* record (basis `page-log`).
+*/
+function readWebActivity(target, tables, now = Date.now()) {
+	const evidence = {
+		drivers: [],
+		unknown: [],
+		recency: []
+	};
+	const connections = tables.tcpConnections(target.port);
+	const clients = connections === null ? [] : webClientPids(connections, target);
+	const processes = clients.length ? (tables.clients ?? tables.host)() : [];
+	if (connections === null || processes === null) evidence.unknown.push("cdp-client");
+	else for (const driver of webDrivers(clients, processes)) evidence.drivers.push({
+		...driver,
+		basis: "cdp-client"
+	});
+	const lines = tailLines(join(workspaceLogsDir(target.workspace), "web.ndjson")) ?? [];
+	const actionAt = latestRecordAt(lines, (record) => record.src === "agent");
+	if (actionAt !== null) evidence.recency.push({
+		basis: "agent-action",
+		at: actionAt
+	});
+	const pageAt = latestRecordAt(lines, (record) => record.src !== "agent");
+	if (pageAt !== null) evidence.recency.push({
+		basis: "page-log",
+		at: pageAt
+	});
+	return classifyActivity(evidence, now);
+}
 //#endregion
-export { readAgentDeviceRecords as a, idleForMs as i, createActivityReader as n, workspaceActivity as o, createDeviceProcessTables as r, agentDeviceLiveness as t };
+export { probeWebDrivers as a, tailLines as c, idleForMs as i, workspaceActivity as l, createActivityReader as n, readAgentDeviceRecords as o, createDeviceProcessTables as r, readWebActivity as s, agentDeviceLiveness as t };

package/dist/{android-XpvCrV7q.mjs → android-CYmq0jNi.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { l as androidToolCwd } from "./android-d6rGq1pA.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { u as androidToolCwd } from "./android-Db2eEMaf.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",