@intentic/machine 1.330.0 → 1.332.0

package/dist/device/tools/logs/logs.js

@@ -0,0 +1,147 @@
+import { open, readdir, stat } from "node:fs/promises";
+import { basename, join } from "node:path";
+import { STATE_DIR } from "@intentic/constants";
+import { errorMessage } from "@intentic/base/errors";
+import { homeDir } from "@intentic/local-agent";
+import { z } from "zod";
+import { agentLogPath, baseDir, runLogPath } from "../../../config.js";
+import { auditPath } from "../../config.js";
+import { assertScope } from "../../policy.js";
+export const LOG_TAIL_BYTES = 1024 * 1024;
+export const DEFAULT_LOG_LINES = 200;
+export const MAX_LOG_LINES = 2_000;
+const IC_LISTED = 40;
+export const icLogDir = (env = process.env, home = homeDir()) => {
+    const set = env["INTENTIC_LOG_DIR"];
+    return set !== undefined && set !== "" ? set : join(home, STATE_DIR, "logs");
+};
+const KIND_PURPOSE = {
+    agent: "this agent's own log: links, keeper, upkeep, restarts, the watchdog",
+    "agent-update": "what an agent update or restart asked from a sandbox did",
+    audit: "every tool call agents made here, one JSON line each (filter with `tool` or `failedOnly`)",
+    ic: "one ic run (connect, recreate, update): docker builds and pulls end up here",
+};
+const agentFiles = () => [
+    { path: runLogPath, kind: "agent" },
+    { path: `${runLogPath}.1`, kind: "agent" },
+    { path: agentLogPath, kind: "agent-update" },
+    { path: auditPath, kind: "audit" },
+    { path: `${auditPath}.1`, kind: "audit" },
+];
+const statOf = async (path) => {
+    const info = await stat(path).catch(() => undefined);
+    return info?.isFile() === true ? { size: info.size, mtimeMs: info.mtimeMs } : undefined;
+};
+export const listDeviceLogs = async (dirs = {}) => {
+    const own = await Promise.all((dirs.agent ?? agentFiles()).map(async ({ path, kind }) => {
+        const info = await statOf(path);
+        return info === undefined ? undefined : { name: basename(path), path, kind, ...info };
+    }));
+    const icDir = dirs.ic ?? icLogDir();
+    const names = await readdir(icDir).catch(() => []);
+    const ic = await Promise.all(names.map(async (file) => {
+        const path = join(icDir, file);
+        const info = await statOf(path);
+        return info === undefined ? undefined : { name: `ic/${file}`, path, kind: "ic", ...info };
+    }));
+    return [
+        ...own.filter((log) => log !== undefined),
+        ...ic.filter((log) => log !== undefined).toSorted((a, b) => b.mtimeMs - a.mtimeMs),
+    ];
+};
+const sizeText = (bytes) => bytes >= 1024 * 1024 ? `${(bytes / 1024 / 1024).toFixed(1)} MB` : bytes >= 1024 ? `${Math.round(bytes / 1024)} KB` : `${bytes} B`;
+export const listingText = (logs, icDir) => {
+    const ic = logs.filter((log) => log.kind === "ic");
+    const row = (log) => `${log.name}  ${sizeText(log.size)}  modified ${new Date(log.mtimeMs).toISOString()}`;
+    const own = logs.filter((log) => log.kind !== "ic");
+    const kinds = [...new Set(own.map((log) => log.kind))];
+    return [
+        `This agent's records (${baseDir}):`,
+        ...(own.length === 0 ? ["  (none yet)"] : own.map((log) => `  ${row(log)}`)),
+        ...kinds.map((kind) => `  ${kind}: ${KIND_PURPOSE[kind]}`),
+        "",
+        `ic's logs (${icDir}), newest first:`,
+        ...(ic.length === 0 ? ["  (none)"] : ic.slice(0, IC_LISTED).map((log) => `  ${row(log)}`)),
+        ...(ic.length > IC_LISTED ? [`  …and ${ic.length - IC_LISTED} older`] : []),
+        `  ic: ${KIND_PURPOSE.ic}`,
+        "",
+        "Read one with `name` (and `grep`, `lines`).",
+    ].join("\n");
+};
+const tailOf = async (path) => {
+    const handle = await open(path, "r");
+    try {
+        const { size } = await handle.stat();
+        const from = Math.max(0, size - LOG_TAIL_BYTES);
+        const buffer = Buffer.alloc(size - from);
+        await handle.read(buffer, 0, buffer.byteLength, from);
+        const lines = buffer.toString("utf8").replace(/\r\n/g, "\n").split("\n");
+        if (from > 0) {
+            lines.shift();
+        }
+        if (lines.at(-1) === "") {
+            lines.pop();
+        }
+        return { lines, size, cut: from > 0 };
+    }
+    finally {
+        await handle.close();
+    }
+};
+const AuditLineSchema = z.object({ tool: z.string(), ok: z.boolean() }).loose();
+const auditPasses = (line, { tool, failedOnly }) => {
+    if (tool === undefined && failedOnly !== true) {
+        return true;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(line);
+    }
+    catch {
+        return false;
+    }
+    const entry = AuditLineSchema.safeParse(parsed);
+    return entry.success && (tool === undefined || entry.data.tool === tool) && (failedOnly !== true || !entry.data.ok);
+};
+export const filterLines = (all, kind, filter) => {
+    let pattern;
+    if (filter.grep !== undefined) {
+        try {
+            pattern = new RegExp(filter.grep, "i");
+        }
+        catch (error) {
+            throw new Error(`grep is not a usable pattern: ${errorMessage(error)}`, { cause: error });
+        }
+    }
+    return all.filter((line) => (pattern === undefined || pattern.test(line)) && (kind !== "audit" || auditPasses(line, filter))).slice(-filter.lines);
+};
+const filterText = (filter) => [
+    ...(filter.grep === undefined ? [] : [`matching /${filter.grep}/i`]),
+    ...(filter.tool === undefined ? [] : [`tool ${filter.tool}`]),
+    ...(filter.failedOnly === true ? ["failed or refused only"] : []),
+].join(", ");
+const assertReadable = (scopes) => {
+    if (scopes.shell !== "on") {
+        assertScope(scopes, "sandboxes");
+    }
+};
+export const deviceLogs = async (name, filter, scopes) => {
+    assertReadable(scopes);
+    const logs = await listDeviceLogs();
+    if (name === undefined) {
+        return listingText(logs, icLogDir());
+    }
+    if ((filter.tool !== undefined || filter.failedOnly === true) && !name.startsWith("audit.jsonl")) {
+        throw new Error("`tool` and `failedOnly` filter audit.jsonl's calls; for any other log use `grep`.");
+    }
+    const log = logs.find((candidate) => candidate.name === name);
+    if (log === undefined) {
+        throw new Error(`This device has no log called "${name}". Call device_logs with no name for the list.`);
+    }
+    const { lines, size, cut } = await tailOf(log.path);
+    const shown = filterLines(lines, log.kind, filter);
+    const how = filterText(filter);
+    const head = `${log.path}, ${sizeText(size)}${cut ? `, its last ${sizeText(LOG_TAIL_BYTES)} read` : ""}${how === "" ? "" : `, ${how}`}:`;
+    return shown.length === 0 ? `${head}\n(nothing${how === "" ? " in it yet" : " matches"})` : `${head}\n${shown.join("\n")}`;
+};
+//# sourceMappingURL=logs.js.map

package/dist/device/tools/logs/logs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../src/device/tools/logs/logs.ts"],"names":[],"mappings":"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"}

package/dist/device/tools/programs/artifacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAiBnG,eAAO,MAAM,QAAQ,QAAO,MAA+B,CAAC;AAI5D,eAAO,MAAM,cAAc,eAAgB,MAAM,KAAG,MASnD,CAAC;AAIF,eAAO,MAAM,MAAM,SAAU,MAAM,cAAc,MAAM,KAAG,OAIzD,CAAC;AA4FF,eAAO,MAAM,aAAa,OAAc,aAAa,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,mBAAmB,CA0C5H,CAAC;AAGF,eAAO,MAAM,aAAa,eAAsB,MAAM,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,IAAI,CAAA;CAAE,EAAE,CAa3H,CAAC"}
+{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAenG,eAAO,MAAM,QAAQ,QAAO,MAA+B,CAAC;AAI5D,eAAO,MAAM,cAAc,eAAgB,MAAM,KAAG,MASnD,CAAC;AAIF,eAAO,MAAM,MAAM,SAAU,MAAM,cAAc,MAAM,KAAG,OAAqD,CAAC;AA4FhH,eAAO,MAAM,aAAa,OAAc,aAAa,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,mBAAmB,CA0C5H,CAAC;AAGF,eAAO,MAAM,aAAa,eAAsB,MAAM,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,IAAI,CAAA;CAAE,EAAE,CAa3H,CAAC"}

package/dist/device/tools/programs/artifacts.js

@@ -1,12 +1,11 @@
-import { execFile } from "node:child_process";
 import { createHash } from "node:crypto";
 import { mkdir, open, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
-import { join, resolve, sep } from "node:path";
-import { promisify } from "node:util";
+import { join } from "node:path";
+import { isInside } from "@intentic/base/contained";
 import { errorMessage, undefinedIfMissing } from "@intentic/base/errors";
+import { execBounded } from "@intentic/base/process";
 import { baseDir } from "../../../config.js";
 import { assertScope } from "../../policy.js";
-const exec = promisify(execFile);
 const COMPLETE = ".intentic-complete";
 const STALE_UPLOAD_MS = 60 * 60 * 1000;
 export const runsRoot = () => join(baseDir, "runs");
@@ -20,11 +19,7 @@ export const sandboxRunsDir = (sandboxUrl) => {
     const safe = label.replace(/[^A-Za-z0-9-]/g, "-").slice(0, 63) || "sandbox";
     return join(runsRoot(), safe);
 };
-export const inRuns = (path, sandboxUrl) => {
-    const root = resolve(sandboxRunsDir(sandboxUrl));
-    const target = resolve(path);
-    return target === root || target.startsWith(`${root}${sep}`);
-};
+export const inRuns = (path, sandboxUrl) => isInside(sandboxRunsDir(sandboxUrl), path);
 const uploads = new Map();
 const incomingDir = (sandboxUrl) => join(sandboxRunsDir(sandboxUrl), ".incoming");
 const finalDir = (sandboxUrl, name, sha256) => join(sandboxRunsDir(sandboxUrl), name, sha256.slice(0, 12));
@@ -64,7 +59,7 @@ const uploadFor = async (sandboxUrl, id, offset) => {
 const unpack = async (archive, into) => {
     await mkdir(into, { recursive: true });
     try {
-        await exec("tar", ["-xf", archive, "-C", into], { windowsHide: true, maxBuffer: 4 * 1024 * 1024 });
+        await execBounded("tar", ["-xf", archive, "-C", into], { timeoutMs: 10 * 60_000, maxOutput: 4 * 1024 * 1024 });
     }
     catch (error) {
         throw new Error(`could not unpack the pushed folder: ${errorMessage(error)}`, { cause: error });

package/dist/device/tools/programs/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"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"}

package/dist/device/tools/programs/{tunnel.d.ts → device-tunnel.d.ts}

@@ -3,4 +3,4 @@ export declare const tunnelSocketUrl: (base: string) => string;
 export declare const dialLoopback: (input: DialLoopback, scopes: DeviceScopes, base: string | undefined) => Promise<{
     ok: true;
 }>;
-//# sourceMappingURL=tunnel.d.ts.map
+//# sourceMappingURL=device-tunnel.d.ts.map

package/dist/device/tools/programs/device-tunnel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-tunnel.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/device-tunnel.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAc7E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAiF,CAAC;AA0BjI,eAAO,MAAM,YAAY,UAAiB,YAAY,UAAU,YAAY,QAAQ,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CA6C5H,CAAC"}

package/dist/device/tools/programs/{tunnel.js → device-tunnel.js}

@@ -66,4 +66,4 @@ export const dialLoopback = async (input, scopes, base) => {
     });
     return { ok: true };
 };
-//# sourceMappingURL=tunnel.js.map
+//# sourceMappingURL=device-tunnel.js.map

package/dist/device/tools/programs/device-tunnel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-tunnel.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/device-tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAa,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAW9C,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,CAAC;AAEjI,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAmB,EAAE;IACtD,IAAI,SAAkB,CAAC;IAEvB,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC;YAED,OAAO,MAAM,IAAI,OAAO,CAAS,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;oBACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBAC1B,IAAI,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC;IACL,CAAC;IACD,MAAM,IAAI,GAAI,SAA+C,EAAE,IAAI,CAAC;IACpE,MAAM,IAAI,KAAK,CACX,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,gCAAgC,IAAI,sCAAsC,CAAC,CAAC,CAAC,wBAAwB,IAAI,UAAU,YAAY,CAAC,SAAS,CAAC,EAAE,CACzK,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,KAAmB,EAAE,MAAoB,EAAE,IAAwB,EAAyB,EAAE;IAC7H,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QACxB,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpC,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,KAAK,EAAE,CAAC;IACf,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,mBAAmB,EAAE,KAAK,CAAC,MAAM,EAAE,EAAW,CAAC,CAAC;IAC7G,EAAE,CAAC,UAAU,GAAG,aAAa,CAAC;IAC9B,IAAI,IAAsB,CAAC;IAC3B,MAAM,KAAK,GAAG,GAAS,EAAE;QACrB,IAAI,EAAE,IAAI,EAAE,CAAC;QACb,IAAI,GAAG,SAAS,CAAC;QACjB,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE,CAAC;YAC7E,EAAE,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;IACL,CAAC,CAAC;IACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACpC,MAAM,IAAI,OAAO,CAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,IAAI,KAAK,CAAC,sDAAsD,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QACrG,CAAC,EAAE,eAAe,CAAC,CAAC;QACpB,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YAC7B,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,GAAG,gBAAgB,CACnB,MAAM,EACN,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,EAC5E,EAAE,UAAU,EAAE,KAAK,EAAE,CACxB,CAAC;YACF,IAAI,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAC9B,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC,CAAC"}

package/dist/device/tools/programs/isolated.d.ts

@@ -3,7 +3,6 @@ export declare const SANDBOX_LOG_DIR = "C:\\intentic-log";
 export declare const SANDBOX_CLIENTS: readonly ["WindowsSandbox.exe", "WindowsSandboxClient.exe", "WindowsSandboxRemoteSession.exe"];
 export declare const windowsSandboxExe: () => string;
 export declare const windowsSandboxMissing: () => Promise<string | undefined>;
-export declare const psQuote: (text: string) => string;
 export interface IsolatedSpec {
     readonly appFolder: string;
     readonly program: string;

package/dist/device/tools/programs/isolated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isolated.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAGlD,eAAO,MAAM,eAAe,YAAI,oBAAoB,EAAE,0BAA0B,EAAE,iCAAiC,CAAU,CAAC;AAE9H,eAAO,MAAM,iBAAiB,QAAO,MAA4F,CAAC;AAGlI,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAWxE,CAAC;AAIF,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,MAAyC,CAAC;AAEjF,MAAM,WAAW,YAAY;IAEzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAGD,eAAO,MAAM,SAAS,SAAU,YAAY,KAAG,MAyB7B,CAAC;AAGnB,eAAO,MAAM,WAAW,SAAU,YAAY,KAAG,MAiBhD,CAAC;AAGF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,OAAO,CAO7D,CAAC;AAGF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,IAAI,CAMvD,CAAC;AAGF,eAAO,MAAM,YAAY,SAAU,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAMhE,CAAC"}
+{"version":3,"file":"isolated.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAGlD,eAAO,MAAM,eAAe,YAAI,oBAAoB,EAAE,0BAA0B,EAAE,iCAAiC,CAAU,CAAC;AAE9H,eAAO,MAAM,iBAAiB,QAAO,MAA4F,CAAC;AAGlI,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAWxE,CAAC;AAIF,MAAM,WAAW,YAAY;IAEzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAGD,eAAO,MAAM,SAAS,SAAU,YAAY,KAAG,MAyB7B,CAAC;AAKnB,eAAO,MAAM,WAAW,SAAU,YAAY,KAAG,MAiBhD,CAAC;AAGF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,OAAO,CAO7D,CAAC;AAGF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,IAAI,CAMvD,CAAC;AAGF,eAAO,MAAM,YAAY,SAAU,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAMhE,CAAC"}

package/dist/device/tools/programs/isolated.js

@@ -1,8 +1,7 @@
-import { execFile } from "node:child_process";
+import { psText } from "@intentic/desktop-automation";
 import { stat } from "node:fs/promises";
 import { join } from "node:path";
-import { promisify } from "node:util";
-const exec = promisify(execFile);
+import { execBounded } from "@intentic/base/process";
 export const SANDBOX_APP_DIR = "C:\\app";
 export const SANDBOX_LOG_DIR = "C:\\intentic-log";
 export const SANDBOX_CLIENTS = ["WindowsSandbox.exe", "WindowsSandboxClient.exe", "WindowsSandboxRemoteSession.exe"];
@@ -17,7 +16,6 @@ export const windowsSandboxMissing = async () => {
         : "Windows Sandbox is not turned on here. On Windows Pro, Enterprise or Education an administrator turns it on with `Enable-WindowsOptionalFeature -Online -FeatureName Containers-DisposableClientVM -All` and a restart (virtualization must be on in the firmware); Windows Home does not have it. Start it without `isolated` meanwhile.";
 };
 const xml = (text) => text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-export const psQuote = (text) => `'${text.replace(/'/g, "''")}'`;
 export const wsbConfig = (spec) => [
     "<Configuration>",
     `  <Networking>${spec.network ? "Enable" : "Disable"}</Networking>`,
@@ -45,14 +43,14 @@ export const wsbConfig = (spec) => [
 ].join("\r\n");
 export const startScript = (spec) => {
     const program = `${SANDBOX_APP_DIR}\\${spec.program.replace(/\//g, "\\")}`;
-    const log = (name) => psQuote(`${SANDBOX_LOG_DIR}\\${name}`);
-    const args = spec.args.length === 0 ? "" : ` -ArgumentList @(${spec.args.map((arg) => psQuote(arg.includes(" ") ? `"${arg}"` : arg)).join(", ")})`;
+    const log = (name) => `'${SANDBOX_LOG_DIR}\\${name}'`;
+    const args = spec.args.length === 0 ? "" : ` -ArgumentList @(${spec.args.map((arg) => psText(arg.includes(" ") ? `"${arg}"` : arg)).join(", ")})`;
     return [
         "$ErrorActionPreference = 'Stop'",
-        ...Object.entries(spec.env).map(([key, value]) => `[Environment]::SetEnvironmentVariable(${psQuote(key)}, ${psQuote(value)}, 'Process')`),
+        ...Object.entries(spec.env).map(([key, value]) => `[Environment]::SetEnvironmentVariable(${psText(key)}, ${psText(value)}, 'Process')`),
         `Set-Content -Path ${log("started")} -Value (Get-Date -Format o)`,
         "try {",
-        `  $p = Start-Process -FilePath ${psQuote(program)}${args} -WorkingDirectory ${psQuote(SANDBOX_APP_DIR)} -RedirectStandardOutput ${log("output.log")} -RedirectStandardError ${log("error.log")} -PassThru -Wait`,
+        `  $p = Start-Process -FilePath ${psText(program)}${args} -WorkingDirectory '${SANDBOX_APP_DIR}' -RedirectStandardOutput ${log("output.log")} -RedirectStandardError ${log("error.log")} -PassThru -Wait`,
         `  Set-Content -Path ${log("exit-code")} -Value $p.ExitCode`,
         "} catch {",
         `  Add-Content -Path ${log("error.log")} -Value $_.Exception.Message`,
@@ -65,13 +63,13 @@ export const windowsSandboxRunning = async () => {
     if (process.platform !== "win32") {
         return false;
     }
-    const { stdout } = await exec("tasklist", ["/FO", "CSV", "/NH"], { windowsHide: true, maxBuffer: 8 * 1024 * 1024 });
+    const { stdout } = await execBounded("tasklist", ["/FO", "CSV", "/NH"], { timeoutMs: 30_000, maxOutput: 8 * 1024 * 1024 });
     const names = new Set(stdout.split(/\r?\n/).map((line) => line.split('","')[0]?.replace(/^"/, "").toLowerCase()));
     return SANDBOX_CLIENTS.some((name) => names.has(name.toLowerCase()));
 };
 export const stopWindowsSandbox = async () => {
     for (const name of SANDBOX_CLIENTS) {
-        await exec("taskkill", ["/IM", name, "/T", "/F"], { windowsHide: true }).catch(() => undefined);
+        await execBounded("taskkill", ["/IM", name, "/T", "/F"], { timeoutMs: 30_000 }).catch(() => undefined);
     }
 };
 export const isolatedExit = (text) => {

package/dist/device/tools/programs/isolated.js.map

@@ -1 +1 @@
-{"version":3,"file":"isolated.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"isolated.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"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"}

package/dist/device/tools/programs/programs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"programs.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/programs.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAgB/D,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAGlC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC1C;AAUD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,aAAa,OAAO,CAAC;AAiFlC,eAAO,MAAM,YAAY,QAAS,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC,KAAG,MAiB1F,CAAC;AA6DF,eAAO,MAAM,QAAQ,YAAmB,YAAY,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CA2D9G,CAAC;AAuEF,eAAO,MAAM,aAAa,SAAU,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,QAAQ,MAAM,KAAG,GAAG,CAAC,MAAM,CAapG,CAAC;AAeF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAInD,CAAC;AAiCP,eAAO,MAAM,SAAS,OAAc,MAAM,GAAG,SAAS,UAAU,YAAY,cAAc,MAAM,UAAU,MAAM,OAAO,KAAG,OAAO,CAAC,MAAM,CA2CvI,CAAC;AAEF,eAAO,MAAM,OAAO,OAAc,MAAM,SAAS,MAAM,QAAQ,MAAM,GAAG,SAAS,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CAqB3I,CAAC;AA2BF,eAAO,MAAM,OAAO,OAAc,MAAM,SAAS,OAAO,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CA4BlH,CAAC"}
+{"version":3,"file":"programs.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/programs.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAe/D,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAGlC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC1C;AAUD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,aAAa,OAAO,CAAC;AAsIlC,eAAO,MAAM,YAAY,QAAS,IAAI,CAAC,MAAM,EAAE,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAC,KAAG,MAiB1F,CAAC;AAkFF,eAAO,MAAM,QAAQ,YAAmB,YAAY,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CA2D9G,CAAC;AAuEF,eAAO,MAAM,aAAa,SAAU,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,QAAQ,MAAM,KAAG,GAAG,CAAC,MAAM,CAapG,CAAC;AAeF,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAInD,CAAC;AA4CP,eAAO,MAAM,SAAS,OAAc,MAAM,GAAG,SAAS,UAAU,YAAY,cAAc,MAAM,UAAU,MAAM,OAAO,KAAG,OAAO,CAAC,MAAM,CA2CvI,CAAC;AAEF,eAAO,MAAM,OAAO,OAAc,MAAM,SAAS,MAAM,QAAQ,MAAM,GAAG,SAAS,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CAqB3I,CAAC;AAqBF,eAAO,MAAM,OAAO,OAAc,MAAM,SAAS,OAAO,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CAmClH,CAAC"}

package/dist/device/tools/programs/programs.js

@@ -1,14 +1,15 @@
-import { execFile, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { mkdir, open, readdir, readFile, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
-import { promisify } from "node:util";
+import { pollFor, within } from "@intentic/base/async";
 import { writeFileAtomic } from "@intentic/base/fs";
 import { errorMessage, undefinedIfMissing } from "@intentic/base/errors";
-import { assertPath, assertScope } from "../../policy.js";
+import { execBounded } from "@intentic/base/process";
+import { assertPath, assertScope, ScopeError } from "../../policy.js";
+import { destructiveClasses, destructiveRefusal } from "../shell.js";
 import { inRuns, listArtifacts, sandboxRunsDir } from "./artifacts.js";
 import { isolatedExit, startScript, stopWindowsSandbox, windowsSandboxExe, windowsSandboxMissing, windowsSandboxRunning, wsbConfig } from "./isolated.js";
-const exec = promisify(execFile);
 const KEEP_RUNS = 30;
 const EARLY_EXIT_MS = 1500;
 const STOP_GRACE_MS = 5000;
@@ -56,15 +57,49 @@ const pidAlive = (pid) => {
         return error.code === "EPERM";
     }
 };
-const isRunning = (run) => {
+const SAME_PROCESS_MS = 10_000;
+const processStartedAt = async (pid) => {
+    try {
+        if (process.platform === "win32") {
+            const { stdout } = await execBounded("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().ToString('o')`], { timeoutMs: 30_000 });
+            const at = Date.parse(stdout.trim());
+            return Number.isNaN(at) ? undefined : at;
+        }
+        const { stdout } = await execBounded("ps", ["-o", "lstart=", "-p", String(pid)], { timeoutMs: 30_000, env: { ...process.env, LC_ALL: "C", LANG: "C" } });
+        const at = Date.parse(stdout.trim().replace(/\s+/g, " "));
+        return Number.isNaN(at) ? undefined : at;
+    }
+    catch {
+        return undefined;
+    }
+};
+const runState = async (run) => {
     if (run.endedAt !== undefined) {
-        return false;
+        return "ended";
     }
     if (run.isolated === true) {
-        return true;
+        return "running";
     }
     const child = children.get(run.id);
-    return child !== undefined ? child.exitCode === null && child.signalCode === null : pidAlive(run.pid);
+    if (child !== undefined) {
+        return child.exitCode === null && child.signalCode === null ? "running" : "ended";
+    }
+    if (!pidAlive(run.pid)) {
+        return "ended";
+    }
+    const began = await processStartedAt(run.pid);
+    if (began === undefined) {
+        return "unknown";
+    }
+    return Math.abs(began - Date.parse(run.startedAt)) <= SAME_PROCESS_MS ? "running" : "ended";
+};
+const settle = async (sandboxUrl, run, state) => {
+    if (state !== "ended" || run.endedAt !== undefined || children.has(run.id)) {
+        return run;
+    }
+    const endedAt = new Date().toISOString();
+    await updateRuns(sandboxUrl, (runs) => runs.map((entry) => (entry.id === run.id && entry.endedAt === undefined ? { ...entry, endedAt } : entry)));
+    return { ...run, endedAt };
 };
 const NTSTATUS = {
     0xc0000005: "access violation (a crash)",
@@ -124,13 +159,25 @@ const startablesIn = async (dir) => {
     return entries.filter((entry) => !entry.startsWith(".") && wanted.includes(extname(entry))).slice(0, 12);
 };
 const idFor = (name) => `${name.replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 40) || "app"}-${randomBytes(3).toString("hex")}`;
-const judgeProgram = async (program, scopes, sandboxUrl) => {
+const commandLineOf = (program, args) => [basename(program).replace(/\.exe$/i, ""), ...args.map((arg) => (arg === "" || /[\s'"|;&<>()$`\\]/.test(arg) ? (arg.includes("'") ? `"${arg}"` : `'${arg}'`) : arg))].join(" ");
+const assertNotDestructive = (program, args, scopes) => {
+    const destructive = destructiveClasses(commandLineOf(program, args));
+    if (destructive.length > 0 && scopes.destructive !== "on") {
+        throw new ScopeError(destructiveRefusal(destructive));
+    }
+};
+const judgeProgram = async (program, args, scopes, sandboxUrl) => {
     if (!isAbsolute(program)) {
         assertScope(scopes, "shell");
+        assertNotDestructive(program, args, scopes);
         return program;
     }
     const path = resolve(program);
-    assertScope(scopes, inRuns(path, sandboxUrl) ? "programs" : "shell");
+    const pushed = inRuns(path, sandboxUrl);
+    assertScope(scopes, pushed ? "programs" : "shell");
+    if (!pushed) {
+        assertNotDestructive(path, args, scopes);
+    }
     const stats = await stat(path).catch(undefinedIfMissing);
     if (stats === undefined) {
         throw new Error(`Nothing at ${path}. A pushed build's path is what \`devices push\` printed.`);
@@ -147,7 +194,7 @@ const judgeProgram = async (program, scopes, sandboxUrl) => {
     return path;
 };
 export const startApp = async (request, scopes, sandboxUrl) => {
-    const program = await judgeProgram(request.program, scopes, sandboxUrl);
+    const program = await judgeProgram(request.program, request.args ?? [], scopes, sandboxUrl);
     if (request.isolated === true) {
         return await startIsolated(program, request, sandboxUrl);
     }
@@ -194,7 +241,7 @@ export const startApp = async (request, scopes, sandboxUrl) => {
         await ended(sandboxUrl, id, code, signal);
     });
     child.unref();
-    const early = await Promise.race([exited.then(() => true), new Promise((done) => setTimeout(() => done(false), EARLY_EXIT_MS))]);
+    const early = await within(exited.then(() => true), EARLY_EXIT_MS, false);
     if (early) {
         const final = (await readRuns(sandboxUrl)).find((entry) => entry.id === id) ?? run;
         const { text } = await tailLines(log, 40);
@@ -275,10 +322,10 @@ export const descendantsOf = (rows, root) => {
 };
 const processRows = async () => {
     if (process.platform === "win32") {
-        const { stdout } = await exec("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", "Get-CimInstance Win32_Process | ForEach-Object { \"$($_.ProcessId) $($_.ParentProcessId)\" }"], { windowsHide: true, maxBuffer: 8 * 1024 * 1024 });
+        const { stdout } = await execBounded("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", "Get-CimInstance Win32_Process | ForEach-Object { \"$($_.ProcessId) $($_.ParentProcessId)\" }"], { timeoutMs: 30_000, maxOutput: 8 * 1024 * 1024 });
         return parseRows(stdout);
     }
-    const { stdout } = await exec("ps", ["-A", "-o", "pid=,ppid="], { maxBuffer: 8 * 1024 * 1024 });
+    const { stdout } = await execBounded("ps", ["-A", "-o", "pid=,ppid="], { timeoutMs: 30_000, maxOutput: 8 * 1024 * 1024 });
     return parseRows(stdout);
 };
 export const parseRows = (text) => text.split(/\r?\n/).flatMap((line) => {
@@ -306,10 +353,18 @@ const assertEither = (scopes) => {
         assertScope(scopes, "programs");
     }
 };
-const runLine = (run) => {
-    const running = isRunning(run);
-    const state = running ? `running, pid ${run.pid}` : describeExit(run);
-    return `${running ? "▶" : "■"} ${run.id}  ${run.name}  ${state}  (started ${run.startedAt}${run.endedAt === undefined ? "" : `, ended ${run.endedAt}`})`;
+const runLine = (run, state) => {
+    const said = state === "running"
+        ? `running, pid ${run.pid}`
+        : state === "unknown"
+            ? `perhaps running: pid ${run.pid} is alive, but whether it is still this run cannot be checked, so app_stop will not signal it`
+            : describeExit(run);
+    return `${state === "running" ? "▶" : state === "unknown" ? "?" : "■"} ${run.id}  ${run.name}  ${said}  (started ${run.startedAt}${run.endedAt === undefined ? "" : `, ended ${run.endedAt}`})`;
+};
+const judged = async (sandboxUrl, run) => {
+    const state = await runState(run);
+    const settled = await settle(sandboxUrl, run, state);
+    return { run: settled, state, line: runLine(settled, state) };
 };
 export const appStatus = async (id, scopes, sandboxUrl, screen) => {
     assertEither(scopes);
@@ -319,20 +374,20 @@ export const appStatus = async (id, scopes, sandboxUrl, screen) => {
         const builds = await listArtifacts(sandboxUrl);
         const lines = [
             runs.length === 0 ? "Nothing has been started here by this sandbox." : `${runs.length} program run(s), newest first:`,
-            ...runs.map(runLine),
+            ...(await Promise.all(runs.map(async (run) => (await judged(sandboxUrl, run)).line))),
         ];
         if (builds.length > 0) {
             lines.push("", "Builds pushed here (devices push), newest first:", ...builds.slice(0, 10).map((build) => `  ${build.name}/${build.version}  ${build.path}`));
         }
         return lines.join("\n");
     }
-    const run = await findRun(id, sandboxUrl);
-    const lines = [runLine(run), `program: ${run.program}${run.args.length === 0 ? "" : ` ${run.args.join(" ")}`}`, `folder: ${run.cwd}`, `log: ${run.log}`];
+    const { run, state, line } = await judged(sandboxUrl, await findRun(id, sandboxUrl));
+    const lines = [line, `program: ${run.program}${run.args.length === 0 ? "" : ` ${run.args.join(" ")}`}`, `folder: ${run.cwd}`, `log: ${run.log}`];
     const inside = await insideExit(run);
     if (run.isolated === true) {
         lines.push(`isolated in Windows Sandbox${inside === undefined ? "" : `; ${inside}`}`);
     }
-    if (isRunning(run)) {
+    if (state === "running") {
         if (scopes.screen !== "on") {
             lines.push(`(Its windows are not listed: "See the screen" is off for this device.)`);
         }
@@ -357,7 +412,7 @@ export const appStatus = async (id, scopes, sandboxUrl, screen) => {
 export const appLogs = async (id, lines, grep, scopes, sandboxUrl) => {
     assertEither(scopes);
     await refreshIsolated(sandboxUrl);
-    const run = await findRun(id, sandboxUrl);
+    const { run, line } = await judged(sandboxUrl, await findRun(id, sandboxUrl));
     const { text, total } = await runOutput(run, grep === undefined ? lines : MAX_LOG_LINES * 5);
     let shown = text;
     if (grep !== undefined) {
@@ -374,22 +429,16 @@ export const appLogs = async (id, lines, grep, scopes, sandboxUrl) => {
             .slice(-lines)
             .join("\n");
     }
-    const head = `${runLine(run)}\n${run.log}, ${total} bytes${grep === undefined ? "" : `, lines matching /${grep}/i`}:`;
+    const head = `${line}\n${run.log}, ${total} bytes${grep === undefined ? "" : `, lines matching /${grep}/i`}:`;
     return shown === "" ? `${head}\n(nothing${grep === undefined ? " printed yet" : " matches"}; a GUI program often prints nothing at all)` : `${head}\n${shown}`;
 };
 const waitGone = async (run, ms) => {
-    const deadline = Date.now() + ms;
-    while (Date.now() < deadline) {
-        if (!isRunning(run)) {
-            return true;
-        }
-        await new Promise((done) => setTimeout(done, 200));
-    }
-    return !isRunning(run);
+    const gone = await pollFor(async () => ((await runState(run)) === "ended" ? true : undefined), { intervalMs: 200, until: Date.now() + ms });
+    return gone.kind === "found" || (await runState(run)) === "ended";
 };
 const signalTree = async (pid, force) => {
     if (process.platform === "win32") {
-        await exec("taskkill", ["/PID", String(pid), "/T", ...(force ? ["/F"] : [])], { windowsHide: true }).catch(() => undefined);
+        await execBounded("taskkill", ["/PID", String(pid), "/T", ...(force ? ["/F"] : [])], { timeoutMs: 30_000 }).catch(() => undefined);
         return;
     }
     try {
@@ -401,10 +450,13 @@ const signalTree = async (pid, force) => {
 export const appStop = async (id, force, scopes, sandboxUrl) => {
     assertEither(scopes);
     await refreshIsolated(sandboxUrl);
-    const run = await findRun(id, sandboxUrl);
-    if (!isRunning(run)) {
+    const { run, state } = await judged(sandboxUrl, await findRun(id, sandboxUrl));
+    if (state === "ended") {
         return `${run.id} is not running: it ${describeExit(run)}.`;
     }
+    if (state === "unknown") {
+        throw new Error(`${run.id} was started by an earlier run of this machine's agent, and whether pid ${run.pid} is still that program cannot be checked here, so it was not signalled. If it is, close it on the machine itself.`);
+    }
     if (run.isolated === true) {
         await stopWindowsSandbox();
         await updateRuns(sandboxUrl, (runs) => runs.map((entry) => (entry.id === id ? { ...entry, endedAt: entry.endedAt ?? new Date().toISOString(), stoppedByAgent: true } : entry)));