@intentic/machine 1.331.0 → 1.333.0

package/dist/upgrade.d.ts

@@ -3,6 +3,7 @@ export type UpgradeOutcome = {
     readonly kind: "current";
     readonly version: string;
     readonly note?: string;
+    readonly later?: readonly [what: string, command: string];
 } | {
     readonly kind: "restarted";
     readonly from: string;
@@ -18,6 +19,7 @@ export type UpgradeOutcome = {
 } | {
     readonly kind: "failed";
     readonly reason: string;
+    readonly fix?: string;
 };
 export interface UpgradeExec {
     readonly fetchTo: (url: string, dest: string) => Promise<void>;
@@ -31,5 +33,10 @@ export interface UpgradeExec {
 export declare const runUpgrade: (exec: UpgradeExec, target: string, installed: string, force: boolean, log: Log) => Promise<UpgradeOutcome>;
 export declare const realUpgradeExec: (restart: () => Promise<string | undefined>, runningBuild: () => Promise<string | undefined>, log: Log) => UpgradeExec;
 export declare const upgradeMessage: (outcome: UpgradeOutcome) => string;
+export declare const upgradeStop: (outcome: UpgradeOutcome) => {
+    readonly headline: string;
+    readonly problem?: string;
+    readonly fix?: string;
+};
 export declare const upgradeLanded: (outcome: UpgradeOutcome) => boolean;
 //# sourceMappingURL=upgrade.d.ts.map

package/dist/upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAWjD,MAAM,MAAM,cAAc,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC1E;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GACxF;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAG3D,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/D,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D,QAAQ,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAGzD,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AA4GD,eAAO,MAAM,UAAU,SAAgB,WAAW,UAAU,MAAM,aAAa,MAAM,SAAS,OAAO,OAAO,GAAG,KAAG,OAAO,CAAC,cAAc,CAgCvI,CAAC;AA4BF,eAAO,MAAM,eAAe,YACf,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,gBAC5B,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,OAC1C,GAAG,KACT,WAYD,CAAC;AAGH,eAAO,MAAM,cAAc,YAAa,cAAc,KAAG,MAgBxD,CAAC;AAGF,eAAO,MAAM,aAAa,YAAa,cAAc,KAAG,OACqC,CAAC"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAWjD,MAAM,MAAM,cAAc,GACpB;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;CAAE,GACzI;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC1E;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GACxF;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAGlF,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/D,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D,QAAQ,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAGzD,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AA4GD,eAAO,MAAM,UAAU,SAAgB,WAAW,UAAU,MAAM,aAAa,MAAM,SAAS,OAAO,OAAO,GAAG,KAAG,OAAO,CAAC,cAAc,CAiCvI,CAAC;AA4BF,eAAO,MAAM,eAAe,YACf,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,gBAC5B,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,OAC1C,GAAG,KACT,WAYD,CAAC;AAGH,eAAO,MAAM,cAAc,YAAa,cAAc,KAAG,MAgBxD,CAAC;AAGF,eAAO,MAAM,WAAW,YAAa,cAAc,KAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CASlI,CAAC;AAGF,eAAO,MAAM,aAAa,YAAa,cAAc,KAAG,OACqC,CAAC"}

package/dist/upgrade.js

@@ -73,19 +73,21 @@ const restartOnto = async (exec, pieces, target, installed, log) => {
     log(`The new agent didn't stay running: putting the previous one back.`);
     await swapOut(exec, pieces);
     const back = await restartAgent(exec, log);
-    return {
-        kind: "failed",
-        reason: back === undefined
-            ? `the new agent (${target}) wouldn't start, so ${installed} was put back, but it did not come up either: start it with \`intentic-machine run\` and check its log.`
-            : `the new agent (${target}) wouldn't start, so ${installed} was restored and is running again.`,
-    };
+    return back === undefined
+        ? {
+            kind: "failed",
+            reason: `the new agent (${target}) wouldn't start, so ${installed} was put back, but it did not come up either.`,
+            fix: "intentic-machine run",
+        }
+        : { kind: "failed", reason: `the new agent (${target}) wouldn't start, so ${installed} was restored and is running again.` };
 };
 export const runUpgrade = async (exec, target, installed, force, log) => {
     if (installed === DEV_VERSION && !force) {
         return {
             kind: "current",
             version: installed,
-            note: `this agent was built from source, not installed from a release. \`intentic-machine upgrade --force\` replaces it with the published ${target}.`,
+            note: "this agent was built from source, not installed from a release.",
+            later: [`replace it with the published ${target}`, "intentic-machine upgrade --force"],
         };
     }
     if (installed !== DEV_VERSION && !isNewer(target, installed)) {
@@ -143,20 +145,29 @@ export const realUpgradeExec = (restart, runningBuild, log) => ({
 });
 export const upgradeMessage = (outcome) => {
     if (outcome.kind === "current") {
-        return outcome.note === undefined ? `Already on the current agent (${outcome.version}). Nothing to do.` : `Left as it is: ${outcome.note}`;
+        return outcome.note === undefined ? `The agent is already on ${outcome.version}. Nothing to do.` : `Left as it is: ${outcome.note}`;
     }
     if (outcome.kind === "upgraded") {
-        return `Upgraded the agent: ${outcome.from} → ${outcome.to}.`;
+        return `Updated the agent from ${outcome.from} to ${outcome.to}.`;
     }
     if (outcome.kind === "restarted") {
-        return `Already on the current agent (${outcome.to}), but the background agent was still running ${outcome.from}: restarted it, so ${outcome.to} is what's serving now.`;
+        return `Restarted the agent on ${outcome.to}: it was still running ${outcome.from}.`;
     }
     if (outcome.kind === "agent-behind") {
         return outcome.running === undefined
-            ? `The agent on this machine is ${outcome.installed}, but the background agent didn't come back up. Start it with \`intentic-machine run\` and check its log.`
-            : `The agent on this machine is ${outcome.installed}, but the background agent is running ${outcome.running}. Stop it with \`intentic-machine run --stop\`, then start it with \`intentic-machine run\`.`;
+            ? `The agent on this device is ${outcome.installed}, but the background agent did not come back up.`
+            : `The agent on this device is ${outcome.installed}, but the background agent is running ${outcome.running}.`;
+    }
+    return `The agent was not updated: ${outcome.reason}`;
+};
+export const upgradeStop = (outcome) => {
+    if (outcome.kind === "agent-behind") {
+        return { headline: upgradeMessage(outcome), fix: "intentic-machine run" };
+    }
+    if (outcome.kind === "failed") {
+        return { headline: "The agent was not updated.", problem: outcome.reason, ...(outcome.fix === undefined ? {} : { fix: outcome.fix }) };
     }
-    return `Upgrade didn't happen: ${outcome.reason}`;
+    return { headline: upgradeMessage(outcome) };
 };
 export const upgradeLanded = (outcome) => outcome.kind === "current" || outcome.kind === "upgraded" || outcome.kind === "restarted";
 //# sourceMappingURL=upgrade.js.map

package/dist/upgrade.js.map

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

package/dist/upkeep/doctor.d.ts

@@ -1,5 +1,7 @@
-import { type CommandContext } from "@stricli/core";
+import type { CommandContext } from "@stricli/core";
+import { type Item } from "@intentic/local-agent";
 import { type UpkeepItem } from "./reconcile.js";
-export declare const itemLine: (item: UpkeepItem) => string;
+export declare const doctorItem: (item: UpkeepItem) => Item;
+export declare const reasonLines: (items: readonly UpkeepItem[]) => string[];
 export declare const doctor: import("@stricli/core").Command<CommandContext>;
 //# sourceMappingURL=doctor.d.ts.map

package/dist/upkeep/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/upkeep/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAGlE,OAAO,EAA0B,KAAK,UAAU,EAAsB,MAAM,gBAAgB,CAAC;AA+B7F,eAAO,MAAM,QAAQ,SAAU,UAAU,KAAG,MAO3C,CAAC;AAMF,eAAO,MAAM,MAAM,iDAyCjB,CAAC"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/upkeep/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAW,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAA0B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA+BzE,eAAO,MAAM,UAAU,SAAU,UAAU,KAAG,IAS7C,CAAC;AAGF,eAAO,MAAM,WAAW,UAAW,SAAS,UAAU,EAAE,KAAG,MAAM,EACwD,CAAC;AAE1H,eAAO,MAAM,MAAM,iDAwDjB,CAAC"}

package/dist/upkeep/doctor.js

@@ -1,5 +1,6 @@
-import { buildCommand } from "@stricli/core";
-import { readResident } from "../supervision.js";
+import { explain } from "@intentic/local-agent";
+import { answeringUi, buildCommand, markFailed } from "../cli-ui.js";
+import { readResident } from "../resident/supervision.js";
 import { MANIFEST } from "./manifest.js";
 import { runUpkeep, summaryLine } from "./reconcile.js";
 const VERB = {
@@ -18,15 +19,17 @@ const DONE = {
     repair: "written again",
     report: "reported",
 };
-export const itemLine = (item) => {
-    const said = {
-        fixed: `${DONE[item.action]}: ${item.what}`,
-        "would-fix": `would ${VERB[item.action]}: ${item.what}`,
-        skipped: `left: ${item.what} — ${item.why ?? ""}`,
-    };
-    return `  ${said[item.outcome]}`;
+export const doctorItem = (item) => {
+    switch (item.outcome) {
+        case "fixed":
+            return { tone: "ok", name: item.what, meta: DONE[item.action] };
+        case "would-fix":
+            return { tone: "warn", name: item.what, meta: `would ${VERB[item.action]}` };
+        default:
+            return { tone: "skip", name: item.what, meta: `left: ${item.why ?? "no reason given"}` };
+    }
 };
-const reasonLines = (items) => MANIFEST.filter((entry) => items.some((item) => item.id === entry.id)).map((entry) => `  ${entry.id}: ${entry.reason}`);
+export const reasonLines = (items) => MANIFEST.filter((entry) => items.some((item) => item.id === entry.id)).map((entry) => `${entry.id}: ${entry.reason}`);
 export const doctor = buildCommand({
     docs: { brief: "Check this environment for what older releases left and stores past their bounds; --fix puts it right" },
     parameters: {
@@ -36,37 +39,48 @@ export const doctor = buildCommand({
         },
     },
     async func(flags) {
-        const out = (message) => void this.process.stdout.write(`${message}\n`);
+        const ui = answeringUi(this.process, flags.json);
         const resident = await readResident();
-        const run = await runUpkeep({ fix: flags.fix, resident: false, supervisor: resident?.supervisor, log: flags.json ? () => undefined : out });
+        if (!flags.json) {
+            ui.report("intentic · doctor", flags.fix ? "fixing what it finds" : "checking only: nothing is changed");
+        }
+        const run = await runUpkeep({
+            fix: flags.fix,
+            resident: false,
+            supervisor: resident?.supervisor,
+            log: flags.json ? () => undefined : ui.note,
+        });
         if ("busy" in run) {
-            const why = `the agent's own upkeep pass is running (pid ${run.busy}); try again in a minute.`;
-            if (flags.json) {
-                out(JSON.stringify({ ok: false, error: why }));
-            }
-            else {
-                out(why);
+            const why = `the agent's own upkeep pass is running (pid ${run.busy})`;
+            if (!flags.json) {
+                throw new Error(explain("The check did not run.", `${why}.`, "run the same command again in a minute."));
             }
-            process.exitCode = 1;
+            this.process.stdout.write(`${JSON.stringify({ ok: false, error: `The check did not run: ${why}; try again in a minute.` })}\n`);
+            markFailed(this);
             return;
         }
         if (flags.json) {
-            out(JSON.stringify({ ok: true, fix: flags.fix, ...run.report, items: run.items }));
+            this.process.stdout.write(`${JSON.stringify({ ok: true, fix: flags.fix, ...run.report, items: run.items })}\n`);
             return;
         }
-        for (const item of run.items) {
-            out(itemLine(item));
+        const summary = summaryLine(run.report, flags.fix);
+        if (run.items.length === 0) {
+            ui.quiet("Nothing is left over from older releases, and every store is within its bounds.");
+            ui.plain(summary);
+            return;
         }
+        ui.items(run.items.map(doctorItem));
         const reasons = reasonLines(run.items);
         if (reasons.length > 0) {
-            out("Why:");
+            ui.section("why");
             for (const line of reasons) {
-                out(line);
+                ui.note(line);
             }
         }
-        out(summaryLine(run.report, flags.fix));
+        ui.plain(summary);
         if (!flags.fix && run.items.some((item) => item.outcome === "would-fix")) {
-            out("Run `intentic-machine doctor --fix` to do it now; the agent does it by itself within six hours.");
+            ui.note("The agent does it by itself within six hours.");
+            ui.later([["do it now", "intentic-machine doctor --fix"]]);
         }
     },
 });

package/dist/upkeep/doctor.js.map

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

package/dist/upkeep/login.js

@@ -4,7 +4,7 @@ import { join } from "node:path";
 import { autostart, clearWindowsRunValue } from "@intentic/local-agent";
 import { MACHINE_AUTOSTART } from "../autostart/autostart.js";
 import { agentPath } from "../release.js";
-import { machineLauncher } from "../supervision.js";
+import { machineLauncher } from "../resident/supervision.js";
 import { readState } from "../sync/config.js";
 import { MUTAGEN_RUN_VALUE, ownMutagenPath, registerMutagenAutostart } from "../sync/mutagen.js";
 const ENTRY_SUPERVISORS = new Set(["task", "run-key", "systemd", "launchd", "xdg"]);

package/dist/upkeep/login.js.map

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

package/dist/upkeep/retention.d.ts

@@ -6,5 +6,11 @@ export declare const expiredTrash: (names: readonly string[], now: number) => {
 };
 export declare const PART_KEEP_MS: number;
 export declare const isShimPart: (name: string) => boolean;
+export declare const RUN_LOG_KEEP_MS: number;
+export declare const RUN_LOGS_KEPT = 100;
+export declare const expiredRunLogs: (entries: readonly {
+    readonly name: string;
+    readonly mtimeMs: number;
+}[], live: ReadonlySet<string>, now: number) => string[];
 export declare const RETENTION_ENTRIES: readonly UpkeepEntry[];
 //# sourceMappingURL=retention.d.ts.map

package/dist/upkeep/retention.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retention.d.ts","sourceRoot":"","sources":["../../src/upkeep/retention.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAQvD,eAAO,MAAM,aAAa,QAAwB,CAAC;AAInD,eAAO,MAAM,YAAY,UAAW,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAS9I,CAAC;AAwCF,eAAO,MAAM,YAAY,QAAmB,CAAC;AAC7C,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,OAA4C,CAAC;AA4BvF,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAAyC,CAAC"}
+{"version":3,"file":"retention.d.ts","sourceRoot":"","sources":["../../src/upkeep/retention.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,YAAY,CAAC;AAQvD,eAAO,MAAM,aAAa,QAAwB,CAAC;AAInD,eAAO,MAAM,YAAY,UAAW,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAS9I,CAAC;AAwCF,eAAO,MAAM,YAAY,QAAmB,CAAC;AAC7C,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,OAA4C,CAAC;AAgCvF,eAAO,MAAM,eAAe,QAAwB,CAAC;AACrD,eAAO,MAAM,aAAa,MAAM,CAAC;AAIjC,eAAO,MAAM,cAAc,YAAa,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,WAAW,CAAC,MAAM,CAAC,OAAO,MAAM,KAAG,MAAM,EAMtJ,CAAC;AA0DF,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAAkD,CAAC"}

package/dist/upkeep/retention.js

@@ -1,6 +1,7 @@
-import { lstat, readdir, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { lstat, readdir, readFile, rm } from "node:fs/promises";
+import { basename, dirname, join } from "node:path";
 import { livePidRecord } from "@intentic/local-agent";
+import { z } from "zod";
 import { AUDIT_ROLL_BYTES, rollAudit } from "../device/audit.js";
 import { trashDirOf, trashedAt } from "./trash.js";
 export const TRASH_KEEP_MS = 30 * 24 * 60 * 60_000;
@@ -67,5 +68,56 @@ const shimParts = {
             .map((name) => ({ what: join(bin, name), act: async () => await rm(join(bin, name), { force: true }) }));
     },
 };
-export const RETENTION_ENTRIES = [trashPrune, auditRotate, shimParts];
+export const RUN_LOG_KEEP_MS = 14 * 24 * 60 * 60_000;
+export const RUN_LOGS_KEPT = 100;
+export const expiredRunLogs = (entries, live, now) => {
+    const newestFirst = entries.filter(({ name }) => !live.has(name)).toSorted((a, b) => b.mtimeMs - a.mtimeMs);
+    return newestFirst
+        .filter((entry, index) => index >= RUN_LOGS_KEPT || now - entry.mtimeMs >= RUN_LOG_KEEP_MS)
+        .toReversed()
+        .map(({ name }) => name);
+};
+const RunRecordsSchema = z.array(z.object({ log: z.string(), endedAt: z.string().optional() }).loose());
+const liveRunLogs = async (sandboxDir) => {
+    const text = await readFile(join(sandboxDir, "apps.json"), "utf8").catch(() => "[]");
+    let parsed;
+    try {
+        parsed = JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+    const runs = RunRecordsSchema.safeParse(parsed);
+    if (!runs.success) {
+        return undefined;
+    }
+    const logs = join(sandboxDir, ".logs");
+    return new Set(runs.data.filter((run) => run.endedAt === undefined).map((run) => (dirname(run.log) === logs ? basename(run.log) : basename(dirname(run.log)))));
+};
+const runLogs = {
+    id: "app-run-logs",
+    kind: "log",
+    action: "prune",
+    reason: `what programs started with app_start printed, kept ${RUN_LOG_KEEP_MS / 86_400_000} days and at most the newest ${RUN_LOGS_KEPT} per sandbox`,
+    find: async ({ base, now }) => {
+        const runs = join(base, "runs");
+        const sandboxes = await readdir(runs).catch(() => []);
+        const found = await Promise.all(sandboxes.map(async (sandbox) => {
+            const logs = join(runs, sandbox, ".logs");
+            const live = await liveRunLogs(join(runs, sandbox));
+            const names = live === undefined ? [] : await readdir(logs).catch(() => []);
+            const entries = await Promise.all(names.map(async (name) => {
+                const info = await lstat(join(logs, name)).catch(() => undefined);
+                return info === undefined ? undefined : { name, mtimeMs: info.mtimeMs };
+            }));
+            const known = entries.filter((entry) => entry !== undefined);
+            return expiredRunLogs(known, live ?? new Set(), now).map((name) => ({
+                what: join(logs, name),
+                act: async () => await rm(join(logs, name), { recursive: true, force: true }),
+            }));
+        }));
+        return found.flat();
+    },
+};
+export const RETENTION_ENTRIES = [trashPrune, auditRotate, shimParts, runLogs];
 //# sourceMappingURL=retention.js.map

package/dist/upkeep/retention.js.map

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

package/dist/upkeep/retired.js

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { STATE_DIR } from "@intentic/constants";
 import { autostart } from "@intentic/local-agent";
 import { peerLinkSilenceMs } from "@intentic/sandbox-contract/peer-dial";
-import { machineLauncher } from "../supervision.js";
+import { machineLauncher } from "../resident/supervision.js";
 import { exists, isInside, linkTarget, moveToTrash, processesFrom } from "./trash.js";
 const retired = (base, id, windowsRunValue) => ({
     id,

package/dist/upkeep/retired.js.map

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

package/dist/upkeep/second-ic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"second-ic.d.ts","sourceRoot":"","sources":["../../src/upkeep/second-ic.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAgC9C,eAAO,MAAM,UAAU,SAAU,MAAM,WAAW,MAAM,OAAO,MAAM,KAAG,MACmD,CAAC;AAkB5H,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAAe,CAAC"}
+{"version":3,"file":"second-ic.d.ts","sourceRoot":"","sources":["../../src/upkeep/second-ic.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA8B9C,eAAO,MAAM,UAAU,SAAU,MAAM,WAAW,MAAM,OAAO,MAAM,KAAG,MACmD,CAAC;AAkB5H,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAAe,CAAC"}

package/dist/upkeep/second-ic.js

@@ -1,17 +1,15 @@
-import { execFile } from "node:child_process";
 import { realpath } from "node:fs/promises";
 import { join } from "node:path";
-import { promisify } from "node:util";
+import { execBounded } from "@intentic/base/process";
 import { icCandidates, icVersionFrom } from "../device/tools/ic-binary.js";
-const exec = promisify(execFile);
 const icOnPath = async (platform) => {
     const lookup = platform === "win32"
-        ? exec(join(process.env["SystemRoot"] ?? "C:\\Windows", "System32", "where.exe"), ["ic"], { windowsHide: true, timeout: 30_000 })
-        : exec("sh", ["-c", "command -v ic"], { timeout: 30_000 });
+        ? execBounded(join(process.env["SystemRoot"] ?? "C:\\Windows", "System32", "where.exe"), ["ic"], { timeoutMs: 30_000 })
+        : execBounded("sh", ["-c", "command -v ic"], { timeoutMs: 30_000 });
     const first = (await lookup.catch(() => ({ stdout: "" }))).stdout.split(/\r?\n/)[0]?.trim();
     return first === undefined || first === "" ? undefined : first;
 };
-const versionOf = async (binary) => icVersionFrom((await exec(binary, ["--version"], { windowsHide: true, timeout: 30_000 }).catch(() => ({ stdout: "" }))).stdout) ?? "unknown";
+const versionOf = async (binary) => icVersionFrom((await execBounded(binary, ["--version"], { timeoutMs: 30_000 }).catch(() => ({ stdout: "" }))).stdout) ?? "unknown";
 const canonical = async (path, platform) => {
     const real = await realpath(path).catch(() => path);
     return platform === "win32" ? real.toLowerCase() : real;

package/dist/upkeep/second-ic.js.map

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

package/dist/upkeep/trash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trash.d.ts","sourceRoot":"","sources":["../../src/upkeep/trash.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,UAAU,OAAQ,MAAM,KAAG,MAA0D,CAAC;AAKnG,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,GAAG,SAOjD,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MAA6B,CAAC;AAKxE,eAAO,MAAM,WAAW,SAAgB,MAAM,QAAQ,MAAM,MAAM,MAAM,KAAG,OAAO,CAAC,MAAM,CAsBxF,CAAC;AAGF,eAAO,MAAM,QAAQ,SAAU,MAAM,OAAO,MAAM,KAAG,OAA0D,CAAC;AAGhH,eAAO,MAAM,UAAU,SAAgB,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAOzE,CAAC;AAEF,eAAO,MAAM,MAAM,SAAgB,MAAM,KAAG,OAAO,CAAC,OAAO,CAItD,CAAC;AAIN,eAAO,MAAM,aAAa,QAAe,MAAM,aAAY,MAAM,CAAC,QAAQ,KAAsB,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAsC3H,CAAC"}
+{"version":3,"file":"trash.d.ts","sourceRoot":"","sources":["../../src/upkeep/trash.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,UAAU,OAAQ,MAAM,KAAG,MAA0D,CAAC;AAKnG,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,GAAG,SAOjD,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MAA6B,CAAC;AAKxE,eAAO,MAAM,WAAW,SAAgB,MAAM,QAAQ,MAAM,MAAM,MAAM,KAAG,OAAO,CAAC,MAAM,CAsBxF,CAAC;AAKF,eAAO,MAAM,QAAQ,SAAU,MAAM,OAAO,MAAM,KAAG,OAAsD,CAAC;AAG5G,eAAO,MAAM,UAAU,SAAgB,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAOzE,CAAC;AAEF,eAAO,MAAM,MAAM,SAAgB,MAAM,KAAG,OAAO,CAAC,OAAO,CAItD,CAAC;AAIN,eAAO,MAAM,aAAa,QAAe,MAAM,aAAY,MAAM,CAAC,QAAQ,KAAsB,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAsC3H,CAAC"}

package/dist/upkeep/trash.js

@@ -1,8 +1,7 @@
-import { execFile } from "node:child_process";
 import { lstat, mkdir, readdir, readFile, readlink, rename } from "node:fs/promises";
-import { basename, dirname, join, resolve, sep } from "node:path";
-import { promisify } from "node:util";
-const exec = promisify(execFile);
+import { basename, dirname, isAbsolute, join, resolve } from "node:path";
+import { isInside as baseIsInside } from "@intentic/base/contained";
+import { execBounded } from "@intentic/base/process";
 export const trashStamp = (at) => new Date(at).toISOString().replace(/[:.]/g, "-");
 export const trashedAt = (name) => {
     const stamp = /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2})-(\d{3})Z/.exec(name);
@@ -35,7 +34,7 @@ export const moveToTrash = async (base, path, at) => {
     }
     return destination;
 };
-export const isInside = (path, dir) => path === dir || path.startsWith(`${dir}${sep}`);
+export const isInside = (path, dir) => isAbsolute(path) && baseIsInside(dir, path);
 export const linkTarget = async (path) => {
     const info = await lstat(path).catch(() => undefined);
     if (info?.isSymbolicLink() !== true) {
@@ -58,7 +57,7 @@ export const processesFrom = async (dir, platform = process.platform) => {
         return running.filter((pid) => pid !== undefined && pid !== process.pid);
     }
     if (platform === "darwin") {
-        const listed = await exec("ps", ["-axo", "pid=,command="], { maxBuffer: 8 * 1024 * 1024 }).catch(() => undefined);
+        const listed = await execBounded("ps", ["-axo", "pid=,command="], { timeoutMs: 30_000, maxOutput: 8 * 1024 * 1024 }).catch(() => undefined);
         if (listed === undefined) {
             return undefined;
         }

package/dist/upkeep/trash.js.map

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