@intentic/machine 1.283.0 → 1.285.0

package/dist/sync/residue.js

@@ -0,0 +1,141 @@
+import { readdir, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { clearableOnDevice } from "@intentic/sandbox-contract";
+const PLAIN_PATTERN = /^[^/*?[\]!\\]+$/;
+export const ignoreMatcher = (patterns) => {
+    const anywhere = new Set();
+    const atRoot = new Set();
+    for (const pattern of patterns) {
+        if (PLAIN_PATTERN.test(pattern)) {
+            anywhere.add(pattern);
+        }
+        else if (pattern.startsWith("/") && PLAIN_PATTERN.test(pattern.slice(1))) {
+            atRoot.add(pattern.slice(1));
+        }
+    }
+    return (path) => {
+        const segments = path.split("/");
+        return segments.some((segment) => anywhere.has(segment)) || (segments.length === 1 && atRoot.has(segments[0] ?? ""));
+    };
+};
+export const isSafeRelativePath = (path) => path !== "" &&
+    !path.startsWith("/") &&
+    !path.includes("\\") &&
+    !path.includes("\0") &&
+    path.split("/").every((segment) => segment !== "" && segment !== "." && segment !== "..");
+export const isShellSafePath = (path) => isSafeRelativePath(path) && /^[A-Za-z0-9._][A-Za-z0-9._/-]*$/.test(path);
+export const isDerivedHusk = async (root, path, ignored) => {
+    const entries = await readdir(join(root, path), { withFileTypes: true }).catch(() => undefined);
+    if (entries === undefined) {
+        return false;
+    }
+    for (const entry of entries) {
+        const child = `${path}/${entry.name}`;
+        if (ignored(child)) {
+            continue;
+        }
+        if (!entry.isDirectory()) {
+            return false;
+        }
+        if (!(await isDerivedHusk(root, child, ignored))) {
+            return false;
+        }
+    }
+    return true;
+};
+export const findDerivedHusks = async (root, ignored) => {
+    const husks = [];
+    const walk = async (path) => {
+        const entries = await readdir(path === "" ? root : join(root, path), { withFileTypes: true }).catch(() => undefined);
+        if (entries === undefined) {
+            return false;
+        }
+        let husk = true;
+        const nested = [];
+        for (const entry of entries) {
+            const child = path === "" ? entry.name : `${path}/${entry.name}`;
+            if (ignored(child)) {
+                continue;
+            }
+            if (!entry.isDirectory()) {
+                husk = false;
+                continue;
+            }
+            if (await walk(child)) {
+                nested.push(child);
+            }
+            else {
+                husk = false;
+            }
+        }
+        if (!husk) {
+            husks.push(...nested);
+        }
+        return husk;
+    };
+    await walk("");
+    return husks;
+};
+const ABSENT_PROBE = `'d=$1; shift; for p in "$@"; do [ -e "$d/$p" ] || printf "%s\\n" "$p"; done'`;
+export const absentInSandbox = async (exec, alias, remoteDir, paths) => {
+    const askable = paths.filter(isShellSafePath);
+    if (askable.length === 0) {
+        return new Set();
+    }
+    const out = await exec.run("ssh", ["-o", "BatchMode=yes", alias, "sh", "-c", ABSENT_PROBE, "_", remoteDir, ...askable]);
+    if (out === undefined) {
+        return undefined;
+    }
+    return new Set(out
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line !== ""));
+};
+const parentOf = (path) => path.slice(0, Math.max(0, path.lastIndexOf("/")));
+export const sweepableHusks = (husks, absent) => absent === undefined ? [] : husks.filter((path) => absent.has(path) && !absent.has(parentOf(path)));
+const removeResidue = async (root, path) => await rm(join(root, path), { recursive: true, force: true }).then(() => true, () => false);
+export const clearConflictResidue = async (args) => {
+    const ignored = ignoreMatcher(args.ignores);
+    const removed = [];
+    let standing = 0;
+    for (const conflict of args.conflicts) {
+        if (!clearableOnDevice(conflict) || !isSafeRelativePath(conflict.path)) {
+            standing += 1;
+            continue;
+        }
+        if (!(await isDerivedHusk(args.root, conflict.path, ignored))) {
+            standing += 1;
+            continue;
+        }
+        if (await removeResidue(args.root, conflict.path)) {
+            removed.push(conflict.path);
+        }
+        else {
+            standing += 1;
+        }
+    }
+    if (removed.length > 0) {
+        args.log(`  cleared build output this device had left in ${removed.length} director${removed.length === 1 ? "y" : "ies"} the sandbox deleted, which was holding those deletions back: ${removed.join(", ")}`);
+    }
+    return { removed, standing };
+};
+export const sweepDerivedResidue = async (args) => {
+    const ignored = ignoreMatcher(args.ignores);
+    const husks = await findDerivedHusks(args.root, ignored);
+    if (husks.length === 0) {
+        return [];
+    }
+    const absent = await absentInSandbox(args.exec, args.alias, args.remoteDir, [...husks, ...husks.map(parentOf)].filter((path) => path !== ""));
+    const sweepable = sweepableHusks(husks, absent);
+    const removed = [];
+    for (const path of sweepable) {
+        if (await removeResidue(args.root, path)) {
+            removed.push(path);
+        }
+    }
+    if (removed.length > 0) {
+        args.log(`  swept ${removed.length} director${removed.length === 1 ? "y" : "ies"} of build output the sandbox no longer has: ${removed.join(", ")}`);
+    }
+    return removed;
+};
+//# sourceMappingURL=residue.js.map

package/dist/sync/residue.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentic/machine",
-  "version": "1.283.0",
+  "version": "1.285.0",
   "description": "The one agent that lives on a user's own device: lets an intentic sandbox work on it (outbound WebSocket, MCP tools, scopes enforced here) and keeps folders and ports mirrored with it (Mutagen over tunnel SSH)",
   "license": "MIT",
   "type": "module",
@@ -20,13 +20,13 @@
     "intentic-machine": "./dist/cli.js"
   },
   "dependencies": {
-    "@intentic/base": "1.283.0",
-    "@intentic/browser": "1.283.0",
-    "@intentic/constants": "1.283.0",
-    "@intentic/desktop-automation": "1.283.0",
-    "@intentic/local-agent": "1.283.0",
-    "@intentic/sandbox-contract": "1.283.0",
-    "@intentic/sandbox-run": "1.283.0",
+    "@intentic/base": "1.285.0",
+    "@intentic/browser": "1.285.0",
+    "@intentic/constants": "1.285.0",
+    "@intentic/desktop-automation": "1.285.0",
+    "@intentic/local-agent": "1.285.0",
+    "@intentic/sandbox-contract": "1.285.0",
+    "@intentic/sandbox-run": "1.285.0",
     "@orpc/server": "1.14.13",
     "@stricli/core": "1.3.0",
     "tslib": "2.8.1",