jishushell 0.4.30 → 0.5.22

package/dist/services/organize/scanner.d.ts

@@ -0,0 +1,50 @@
+import type { OrganizeRule, OnCollision } from "./rules.js";
+export interface OrganizeSuggestion {
+    id: string;
+    from: string;
+    to: string;
+    rule_id: string;
+    extracted: Record<string, string>;
+    selected: boolean;
+    applied?: boolean;
+    reverted?: boolean;
+    conflict?: "collision";
+}
+export interface OrganizeBatch {
+    id: string;
+    created_at: number;
+    status: "pending" | "applied" | "reverted" | "expired";
+    source_path: string;
+    rules_hash: string;
+    suggestions: OrganizeSuggestion[];
+    applied_at?: number;
+    expires_at?: number;
+    reverted_at?: number;
+}
+export interface ScanOptions {
+    /** Maximum file count to scan (per call). Default 10000. */
+    maxFiles?: number;
+    /** Skip files larger than this (bytes). Default Infinity. */
+    maxFileSize?: number;
+}
+/**
+ * Compile a small subset of glob syntax we actually use:
+ *   - `*`   one path segment, no /
+ *   - `**`  any number of segments, including /
+ *   - `?`   one char (no /)
+ *   - `{a,b,c}` alternation (no nesting)
+ *
+ * We deliberately avoid bringing in minimatch/picomatch as a runtime
+ * dep — those libs are 100KB+ and we only need ~5% of their behaviour.
+ */
+export declare function compileGlob(pattern: string): RegExp;
+export declare function matchGlob(relPath: string, pattern: string): boolean;
+export declare function matchMime(mime: string, patterns: string[]): boolean;
+export declare function formatDate(d: Date, fmt: string): string;
+/**
+ * Replace {var} placeholders in a template string. Returns null if any
+ * placeholder is unresolved — the caller should skip or warn the user.
+ */
+export declare function interpolate(template: string, vars: Record<string, string>): string | null;
+export declare function scan(filesRoot: string, rules: OrganizeRule[], rootRel?: string, opts?: ScanOptions): Promise<OrganizeBatch>;
+export type { OnCollision };

package/dist/services/organize/scanner.js

@@ -0,0 +1,366 @@
+/**
+ * File scanner for the W1.5 organizer.
+ *
+ * Walks a subtree of the user's files/, matches each file against the
+ * provided rules, and produces a list of move suggestions ready for
+ * the diff UI. No mutations: scanning is side-effect-free other than
+ * stat / EXIF reads.
+ *
+ * Performance budget: 5000 files in < 10 s on a Pi 5. We achieve this
+ * by:
+ *   - skipping symlinks and hidden dirs entirely
+ *   - reading EXIF only for image extensions, only for the first match
+ *     (single 64KB read via exifr's selective parsing)
+ *   - bailing on the first matching rule (rules are evaluated in order)
+ *
+ * The scanner is the only place that owns rule semantics. Both the API
+ * route (W1.5 PR-4) and the W7 Agent organizer call into it identically.
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+// exifr is loaded lazily (CJS interop quirks under Node ESM); see readExif.
+import { resolveSafe, validateRelativePath, } from "../../utils/path-safety.js";
+import { hashRules } from "./rules.js";
+import { randomUUID } from "node:crypto";
+// ── glob ─────────────────────────────────────────────
+/**
+ * Compile a small subset of glob syntax we actually use:
+ *   - `*`   one path segment, no /
+ *   - `**`  any number of segments, including /
+ *   - `?`   one char (no /)
+ *   - `{a,b,c}` alternation (no nesting)
+ *
+ * We deliberately avoid bringing in minimatch/picomatch as a runtime
+ * dep — those libs are 100KB+ and we only need ~5% of their behaviour.
+ */
+export function compileGlob(pattern) {
+    // Expand {a,b,c} groups first. We support a single-level alternation,
+    // matching what the rule examples need.
+    const _expanded = [];
+    let buf = "";
+    let i = 0;
+    while (i < pattern.length) {
+        const c = pattern[i];
+        if (c === "{") {
+            const close = pattern.indexOf("}", i);
+            if (close === -1) {
+                buf += "\\{";
+                i++;
+                continue;
+            }
+            const alts = pattern.slice(i + 1, close).split(",");
+            const altRegex = "(?:" + alts.map(escapeRegexLiteral).join("|") + ")";
+            buf += altRegex;
+            i = close + 1;
+            continue;
+        }
+        if (c === "*") {
+            if (pattern[i + 1] === "*") {
+                // ** — match any chars including /
+                buf += ".*";
+                i += 2;
+                // collapse the slash that immediately follows ** so that
+                // "inbox/**/*.jpg" matches "inbox/x.jpg" too
+                if (pattern[i] === "/")
+                    i++;
+                continue;
+            }
+            buf += "[^/]*";
+            i++;
+            continue;
+        }
+        if (c === "?") {
+            buf += "[^/]";
+            i++;
+            continue;
+        }
+        if (c === ".") {
+            buf += "\\.";
+            i++;
+            continue;
+        }
+        if ("+()^$|\\".includes(c)) {
+            buf += "\\" + c;
+            i++;
+            continue;
+        }
+        buf += c;
+        i++;
+    }
+    return new RegExp("^" + buf + "$", "i");
+}
+function escapeRegexLiteral(s) {
+    return s.replace(/[.+*?^$()[\]{}|\\]/g, "\\$&");
+}
+export function matchGlob(relPath, pattern) {
+    return compileGlob(pattern).test(relPath);
+}
+export function matchMime(mime, patterns) {
+    for (const p of patterns) {
+        if (p.endsWith("/*")) {
+            const prefix = p.slice(0, -1); // keep "image/"
+            if (mime.startsWith(prefix))
+                return true;
+        }
+        else if (p === mime)
+            return true;
+    }
+    return false;
+}
+const IMAGE_EXTS = new Set([
+    ".jpg",
+    ".jpeg",
+    ".png",
+    ".heic",
+    ".heif",
+    ".tiff",
+    ".tif",
+    ".webp",
+]);
+const MIME_BY_EXT = {
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".heic": "image/heic",
+    ".heif": "image/heif",
+    ".tiff": "image/tiff",
+    ".tif": "image/tiff",
+    ".webp": "image/webp",
+    ".gif": "image/gif",
+    ".bmp": "image/bmp",
+    ".pdf": "application/pdf",
+    ".mp4": "video/mp4",
+    ".mov": "video/quicktime",
+    ".webm": "video/webm",
+    ".mkv": "video/x-matroska",
+    ".mp3": "audio/mpeg",
+    ".wav": "audio/wav",
+    ".txt": "text/plain",
+    ".md": "text/markdown",
+    ".json": "application/json",
+};
+function inferMime(ext) {
+    return MIME_BY_EXT[ext.toLowerCase()] ?? "application/octet-stream";
+}
+let _exifrModule = null;
+async function readExifSafe(absPath) {
+    // Only attempt EXIF on known image formats — exifr handles many but
+    // failed parses cost ~1ms each which adds up over thousands of files.
+    const ext = path.extname(absPath).toLowerCase();
+    if (!IMAGE_EXTS.has(ext))
+        return null;
+    try {
+        if (!_exifrModule) {
+            // Dynamic import to keep the test surface light when EXIF is irrelevant
+            _exifrModule = await import("exifr");
+        }
+        const exif = await _exifrModule.parse(absPath, {
+            pick: ["DateTimeOriginal", "CreateDate", "ModifyDate"],
+        });
+        return exif ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+async function extractValue(spec, meta, exifCache) {
+    const from = spec.from;
+    if (from === "mtime") {
+        return formatDate(new Date(meta.mtimeSec * 1000), spec.format ?? "Y-MM-DD");
+    }
+    if (from === "ext") {
+        return meta.ext.replace(/^\./, "");
+    }
+    if (from === "basename")
+        return meta.basename;
+    if (from === "dirname")
+        return meta.dirname;
+    if (from.startsWith("exif.")) {
+        let exif = exifCache.get(meta.absPath);
+        if (exif === undefined) {
+            exif = await readExifSafe(meta.absPath);
+            exifCache.set(meta.absPath, exif);
+        }
+        if (!exif)
+            return null;
+        const key = from.slice(5);
+        let v = exif[key] ?? exif.DateTimeOriginal ?? exif.CreateDate;
+        if (v instanceof Date) {
+            return formatDate(v, spec.format ?? "Y-MM-DD");
+        }
+        if (typeof v === "string" && /^\d{4}/.test(v)) {
+            // exifr sometimes returns "YYYY:MM:DD HH:MM:SS" raw
+            const m = v.match(/^(\d{4})[:-](\d{2})[:-](\d{2})/);
+            if (m) {
+                const d = new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]));
+                return formatDate(d, spec.format ?? "Y-MM-DD");
+            }
+        }
+        return null;
+    }
+    return null;
+}
+export function formatDate(d, fmt) {
+    const Y = d.getFullYear().toString();
+    const MM = String(d.getMonth() + 1).padStart(2, "0");
+    const DD = String(d.getDate()).padStart(2, "0");
+    // We support the small set of placeholders that the rules use.
+    return fmt
+        .replace(/Y-MM-DD/g, `${Y}-${MM}-${DD}`)
+        .replace(/Y-MM/g, `${Y}-${MM}`)
+        .replace(/Y/g, Y)
+        .replace(/MM/g, MM)
+        .replace(/DD/g, DD);
+}
+// ── Interpolate ──────────────────────────────────────
+/**
+ * Replace {var} placeholders in a template string. Returns null if any
+ * placeholder is unresolved — the caller should skip or warn the user.
+ */
+export function interpolate(template, vars) {
+    let unresolved = false;
+    const out = template.replace(/\{([a-z_][a-z0-9_]*)\}/gi, (_m, name) => {
+        if (vars[name] === undefined) {
+            unresolved = true;
+            return "";
+        }
+        return vars[name];
+    });
+    return unresolved ? null : out;
+}
+// ── Scan ─────────────────────────────────────────────
+const TRASH_DIR = ".trash";
+const META_FILE = ".organize-rules.json";
+const ORGANIZE_STATE_FILE = ".pending-organize.json";
+export async function scan(filesRoot, rules, rootRel = "", opts = {}) {
+    const maxFiles = opts.maxFiles ?? 10000;
+    const maxFileSize = opts.maxFileSize ?? Number.POSITIVE_INFINITY;
+    // Validate the scan root using the same path-safety guards as Files.
+    if (rootRel !== "")
+        validateRelativePath(rootRel);
+    const rootAbs = rootRel ? resolveSafe(filesRoot, rootRel) : filesRoot;
+    const exifCache = new Map();
+    const suggestions = [];
+    const used = [0]; // boxed counter for recursion
+    async function walk(dirAbs) {
+        if (used[0] >= maxFiles)
+            return;
+        let entries;
+        try {
+            entries = fs.readdirSync(dirAbs, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const ent of entries) {
+            if (used[0] >= maxFiles)
+                return;
+            // Skip hidden dirs (.trash, .organize-rules.json, etc.)
+            if (ent.name.startsWith("."))
+                continue;
+            const full = path.join(dirAbs, ent.name);
+            const rel = path.relative(filesRoot, full);
+            if (ent.isSymbolicLink())
+                continue;
+            if (ent.isDirectory()) {
+                await walk(full);
+                continue;
+            }
+            if (!ent.isFile())
+                continue;
+            let stat;
+            try {
+                stat = fs.statSync(full);
+            }
+            catch {
+                continue;
+            }
+            if (stat.size > maxFileSize)
+                continue;
+            used[0]++;
+            const ext = path.extname(rel).toLowerCase();
+            const meta = {
+                relPath: rel,
+                absPath: full,
+                size: stat.size,
+                mtimeSec: Math.floor(stat.mtimeMs / 1000),
+                ext,
+                basename: path.basename(rel),
+                dirname: path.dirname(rel),
+                mime: inferMime(ext),
+            };
+            const matched = await matchAndBuild(meta, rules, exifCache);
+            if (matched)
+                suggestions.push(matched);
+        }
+    }
+    await walk(rootAbs);
+    return {
+        id: randomUUID(),
+        created_at: Math.floor(Date.now() / 1000),
+        status: "pending",
+        source_path: rootRel,
+        rules_hash: hashRules(rules),
+        suggestions,
+    };
+}
+async function matchAndBuild(meta, rules, exifCache) {
+    for (const rule of rules) {
+        if (rule.enabled === false)
+            continue;
+        // Match
+        if (rule.match.glob && !matchGlob(meta.relPath, rule.match.glob))
+            continue;
+        if (rule.match.mime && !matchMime(meta.mime, rule.match.mime))
+            continue;
+        // Extract
+        const vars = {
+            basename: meta.basename,
+            ext: meta.ext.replace(/^\./, ""),
+            dirname: meta.dirname,
+        };
+        let extractFailed = false;
+        for (const ex of rule.extract ?? []) {
+            const v = await extractValue(ex, meta, exifCache);
+            if (v === null) {
+                extractFailed = true;
+                break;
+            }
+            vars[ex.as] = v;
+        }
+        if (extractFailed)
+            continue;
+        // Interpolate target
+        const to = interpolate(rule.action.move_to, vars);
+        if (to === null)
+            continue;
+        if (to === meta.relPath)
+            continue; // no-op
+        // Safety: ensure resolved target stays inside files/, no traversal,
+        // no system directories.
+        try {
+            validateRelativePath(to);
+        }
+        catch {
+            continue;
+        }
+        if (to.startsWith(`${TRASH_DIR}/`) ||
+            to === TRASH_DIR ||
+            to === META_FILE ||
+            to === ORGANIZE_STATE_FILE) {
+            continue;
+        }
+        if (to.startsWith(meta.relPath + "/"))
+            continue; // moving into self
+        return {
+            id: randomUUID(),
+            from: meta.relPath,
+            to,
+            rule_id: rule.id,
+            extracted: vars,
+            selected: true,
+        };
+    }
+    return null;
+}
+//# sourceMappingURL=scanner.js.map

package/dist/services/organize/scanner.js.map

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

package/dist/services/organize/store.d.ts

@@ -0,0 +1,14 @@
+import type { OrganizeBatch } from "./scanner.js";
+export declare class BatchStore {
+    private file;
+    private batches;
+    constructor(stateDir: string);
+    private load;
+    private snapshot;
+    put(batch: OrganizeBatch): Promise<void>;
+    get(id: string): OrganizeBatch | undefined;
+    list(): OrganizeBatch[];
+    update(id: string, mutator: (b: OrganizeBatch) => void): Promise<OrganizeBatch | undefined>;
+    /** Test-only */
+    _clear(): void;
+}

package/dist/services/organize/store.js

@@ -0,0 +1,82 @@
+/**
+ * Persistence layer for organize batches.
+ *
+ * In-memory primary, snapshot to disk after every mutation. The disk
+ * file is only used to survive a panel restart mid-undo-window; it is
+ * not the source of truth.
+ *
+ * File: ~/.jishushell/organize-batches.json
+ *   {
+ *     "version": 1,
+ *     "batches": [ OrganizeBatch ... ]
+ *   }
+ *
+ * We keep at most MAX_BATCHES (50) — older ones are evicted FIFO. This
+ * is plenty for the 30-second-undo-window pattern; nobody needs the
+ * 51st most recent batch.
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { safeWriteBuffer } from "../../utils/safe-write.js";
+const MAX_BATCHES = 50;
+export class BatchStore {
+    file;
+    batches = new Map();
+    constructor(stateDir) {
+        this.file = path.join(stateDir, "organize-batches.json");
+        this.load();
+    }
+    load() {
+        if (!fs.existsSync(this.file))
+            return;
+        try {
+            const raw = JSON.parse(fs.readFileSync(this.file, "utf8"));
+            if (Array.isArray(raw?.batches)) {
+                for (const b of raw.batches) {
+                    if (b?.id)
+                        this.batches.set(b.id, b);
+                }
+            }
+        }
+        catch (e) {
+            console.warn(`[organize] failed to load batches: ${e.message}`);
+        }
+    }
+    async snapshot() {
+        // Evict oldest if over cap (keep most recent MAX_BATCHES by created_at)
+        if (this.batches.size > MAX_BATCHES) {
+            const sorted = Array.from(this.batches.values()).sort((a, b) => b.created_at - a.created_at);
+            this.batches = new Map(sorted.slice(0, MAX_BATCHES).map((b) => [b.id, b]));
+        }
+        const payload = {
+            version: 1,
+            batches: Array.from(this.batches.values()),
+        };
+        const buf = Buffer.from(JSON.stringify(payload, null, 2) + "\n", "utf8");
+        fs.mkdirSync(path.dirname(this.file), { recursive: true });
+        await safeWriteBuffer(this.file, buf);
+    }
+    async put(batch) {
+        this.batches.set(batch.id, batch);
+        await this.snapshot();
+    }
+    get(id) {
+        return this.batches.get(id);
+    }
+    list() {
+        return Array.from(this.batches.values()).sort((a, b) => b.created_at - a.created_at);
+    }
+    async update(id, mutator) {
+        const b = this.batches.get(id);
+        if (!b)
+            return undefined;
+        mutator(b);
+        await this.snapshot();
+        return b;
+    }
+    /** Test-only */
+    _clear() {
+        this.batches.clear();
+    }
+}
+//# sourceMappingURL=store.js.map

package/dist/services/organize/store.js.map

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

package/dist/services/panel-manager.js

@@ -26,6 +26,39 @@ export const LAUNCHD_PLIST = join(homedir(), "Library/LaunchAgents/com.jishushel
 const __filename = fileURLToPath(import.meta.url);
 // services/ is one level below the root; cli.js lives at ../cli.js
 export const CLI_PATH = join(dirname(__filename), "../cli.js");
+const DEFAULT_PROCESS_PATH_ENTRIES = [
+    "/opt/homebrew/bin",
+    "/opt/homebrew/sbin",
+    "/usr/local/bin",
+    "/usr/local/sbin",
+    "/usr/bin",
+    "/bin",
+    "/usr/sbin",
+    "/sbin",
+];
+function buildProcessPath(basePath) {
+    return [basePath ?? "", ...DEFAULT_PROCESS_PATH_ENTRIES, dirname(process.execPath)]
+        .flatMap((entry) => entry.split(":"))
+        .map((entry) => entry.trim())
+        .filter(Boolean)
+        .filter((entry, index, entries) => entries.indexOf(entry) === index)
+        .join(":");
+}
+function buildNodeProcessPath(basePath) {
+    return [dirname(process.execPath), basePath ?? "", ...DEFAULT_PROCESS_PATH_ENTRIES]
+        .flatMap((entry) => entry.split(":"))
+        .map((entry) => entry.trim())
+        .filter(Boolean)
+        .filter((entry, index, entries) => entries.indexOf(entry) === index)
+        .join(":");
+}
+function buildNodeProcessEnv(extraEnv = {}) {
+    return {
+        ...process.env,
+        ...extraEnv,
+        PATH: buildNodeProcessPath(process.env.PATH),
+    };
+}
 export function detectRunMode() {
     if (process.platform !== "darwin") {
         if (existsSync(SYSTEMD_SERVICE)) {
@@ -209,11 +242,12 @@ function launchctlExec(action) {
 function processStart(port) {
     ensureDirHost(dirname(LOG_FILE));
     const logFd = openSync(LOG_FILE, "a");
+    const deterministicPath = buildProcessPath(process.env.PATH);
     const child = spawn(process.execPath, [CLI_PATH, "serve", "--port", String(port)], {
         detached: true,
         stdio: ["ignore", logFd, logFd],
         env: {
-            PATH: process.env.PATH,
+            PATH: deterministicPath,
             HOME: process.env.HOME,
             USER: process.env.USER,
             LANG: process.env.LANG,
@@ -355,7 +389,9 @@ function getNpmRegistryUrl() {
         const nodeBinDir = dirname(process.execPath);
         const npmBin = join(nodeBinDir, "npm");
         const reg = execFileSync(npmBin, ["config", "get", "registry"], {
-            encoding: "utf-8", timeout: 5000,
+            encoding: "utf-8",
+            timeout: 5000,
+            env: buildNodeProcessEnv(),
         }).trim();
         if (reg && reg !== "undefined")
             return reg.replace(/\/+$/, "");
@@ -416,10 +452,7 @@ export async function checkUpdate() {
 export async function upgradePackage() {
     const nodeBinDir = dirname(process.execPath);
     const npmBin = join(nodeBinDir, "npm");
-    const childEnv = {
-        ...process.env,
-        PATH: `${nodeBinDir}${process.env.PATH ? `:${process.env.PATH}` : ""}`,
-    };
+    const childEnv = buildNodeProcessEnv();
     try {
         const out = execFileSync(npmBin, ["install", "-g", "jishushell", "--registry", getNpmRegistryUrl() + "/"], { encoding: "utf-8", timeout: 120_000, stdio: ["ignore", "pipe", "pipe"], env: childEnv });
         _updateCache = null; // invalidate
@@ -431,11 +464,7 @@ export async function upgradePackage() {
     }
 }
 export function scheduleRestart(delayMs = 2000) {
-    const nodeBinDir = dirname(process.execPath);
-    const childEnv = {
-        ...process.env,
-        PATH: `${nodeBinDir}${process.env.PATH ? `:${process.env.PATH}` : ""}`,
-    };
+    const childEnv = buildNodeProcessEnv();
     const delaySecs = Math.max(1, Math.round(delayMs / 1000));
     const child = spawn("sh", ["-c", `sleep ${delaySecs} && exec ${JSON.stringify(process.execPath)} ${JSON.stringify(CLI_PATH)} restart`], { detached: true, stdio: "ignore", env: childEnv });
     child.unref();