jishushell 0.4.24 → 0.5.15

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

@@ -0,0 +1,46 @@
+import type { OrganizeBatch } from "./scanner.js";
+import type { OrganizeRule } from "./rules.js";
+export declare const UNDO_WINDOW_SEC = 30;
+export interface ApplyReport {
+    applied: number;
+    skipped: number;
+    failed: number;
+    details: Array<{
+        id: string;
+        status: "applied" | "skipped" | "failed";
+        reason?: string;
+        final_to?: string;
+    }>;
+}
+export interface RevertReport {
+    reverted: number;
+    skipped: number;
+    failed: number;
+    details: Array<{
+        id: string;
+        status: "reverted" | "skipped" | "failed";
+        reason?: string;
+    }>;
+}
+export interface ApplyOptions {
+    filesRoot: string;
+    /** Map rule_id → on_collision; missing falls back to "keep-both". */
+    rulesById: Map<string, OrganizeRule>;
+    selectedIds: Set<string>;
+    /** Audit log writer; gets one line per mv. */
+    audit: (op: "organize.apply" | "organize.revert", relPath: string, meta?: Record<string, unknown>) => void;
+}
+export declare function applyBatch(batch: OrganizeBatch, opts: ApplyOptions): Promise<{
+    batch: OrganizeBatch;
+    report: ApplyReport;
+}>;
+export interface RevertOptions {
+    filesRoot: string;
+    audit: (op: "organize.revert", relPath: string, meta?: Record<string, unknown>) => void;
+    /** Override `now` for tests. */
+    now?: () => number;
+}
+export declare function revertBatch(batch: OrganizeBatch, opts: RevertOptions): Promise<{
+    batch: OrganizeBatch;
+    report: RevertReport;
+}>;

package/dist/services/organize/applier.js

@@ -0,0 +1,218 @@
+/**
+ * Apply / revert organize batches.
+ *
+ * Apply:
+ *   - User submits the suggestion ids they accepted (subset of the batch)
+ *   - For each, lstat-validate source still exists and is the same file
+ *     we scanned (size + mtime match the original suggestion's snapshot
+ *     of the file — recorded inline so we don't rescan)
+ *   - Resolve collision per rule on_collision (keep-both / overwrite /
+ *     skip)
+ *   - Hold a per-path lock while moving (matches W1 FilesManager.move)
+ *   - Audit each mv to files-audit.jsonl
+ *   - Set batch.applied_at + expires_at = applied_at + UNDO_WINDOW_SEC
+ *
+ * Revert:
+ *   - Only valid while expires_at > now
+ *   - Walk applied suggestions in reverse, mv `to` back to `from`
+ *   - If `to` no longer exists or was edited (size/mtime changed),
+ *     skip + audit but do not abort
+ *   - On completion, mark batch.reverted_at
+ *
+ * Both operations are best-effort per item: a failure on item N does
+ * not abort items N+1..M. The returned report tells the UI which items
+ * succeeded/failed/skipped.
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { withPathLock } from "../../utils/path-locks.js";
+import { resolveSafe } from "../../utils/path-safety.js";
+export const UNDO_WINDOW_SEC = 30;
+export async function applyBatch(batch, opts) {
+    if (batch.status !== "pending") {
+        throw new Error(`batch ${batch.id} is ${batch.status}, not pending`);
+    }
+    const report = { applied: 0, skipped: 0, failed: 0, details: [] };
+    const now = Math.floor(Date.now() / 1000);
+    for (const sug of batch.suggestions) {
+        if (!opts.selectedIds.has(sug.id))
+            continue;
+        const rule = opts.rulesById.get(sug.rule_id);
+        const collision = rule?.action.on_collision ?? "keep-both";
+        try {
+            const finalTo = await applyOne(opts.filesRoot, sug, collision);
+            if (finalTo === null) {
+                sug.applied = false;
+                report.skipped++;
+                report.details.push({ id: sug.id, status: "skipped", reason: "collision" });
+                opts.audit("organize.apply", sug.from, {
+                    batch: batch.id,
+                    status: "skipped",
+                    reason: "collision",
+                });
+            }
+            else {
+                sug.applied = true;
+                sug.to = finalTo; // may differ from original on keep-both
+                report.applied++;
+                report.details.push({ id: sug.id, status: "applied", final_to: finalTo });
+                opts.audit("organize.apply", sug.from, {
+                    batch: batch.id,
+                    to: finalTo,
+                });
+            }
+        }
+        catch (e) {
+            sug.applied = false;
+            report.failed++;
+            report.details.push({
+                id: sug.id,
+                status: "failed",
+                reason: e.message ?? String(e),
+            });
+            opts.audit("organize.apply", sug.from, {
+                batch: batch.id,
+                status: "failed",
+                error: e.message ?? String(e),
+            });
+        }
+    }
+    batch.status = "applied";
+    batch.applied_at = now;
+    batch.expires_at = now + UNDO_WINDOW_SEC;
+    return { batch, report };
+}
+async function applyOne(filesRoot, sug, collision) {
+    const fromAbs = resolveSafe(filesRoot, sug.from);
+    // Source must exist and not be a symlink
+    let fromStat;
+    try {
+        fromStat = fs.lstatSync(fromAbs);
+    }
+    catch {
+        throw new Error("source no longer exists");
+    }
+    if (fromStat.isSymbolicLink())
+        throw new Error("source is a symlink");
+    let to = sug.to;
+    let toAbs = resolveSafe(filesRoot, to);
+    // Collision handling
+    if (fs.existsSync(toAbs)) {
+        if (collision === "skip")
+            return null;
+        if (collision === "keep-both") {
+            to = pickFreeName(filesRoot, to);
+            toAbs = resolveSafe(filesRoot, to);
+        }
+        // overwrite: leave toAbs as-is, fs.renameSync will replace
+    }
+    // Lock both paths in deterministic order
+    const sortedPair = [fromAbs, toAbs].sort();
+    const first = sortedPair[0];
+    const second = sortedPair[1];
+    await withPathLock(first, () => withPathLock(second, async () => {
+        fs.mkdirSync(path.dirname(toAbs), { recursive: true });
+        fs.renameSync(fromAbs, toAbs);
+    }));
+    return to;
+}
+/** "photos/2026-05/IMG.jpg" → "photos/2026-05/IMG (1).jpg" */
+function pickFreeName(filesRoot, target) {
+    const ext = path.extname(target);
+    const base = target.slice(0, target.length - ext.length);
+    for (let i = 1; i < 1000; i++) {
+        const candidate = `${base} (${i})${ext}`;
+        const abs = resolveSafe(filesRoot, candidate);
+        if (!fs.existsSync(abs))
+            return candidate;
+    }
+    // pathological — fallback to unique-ish
+    return `${base}.${Date.now()}${ext}`;
+}
+export async function revertBatch(batch, opts) {
+    const now = (opts.now ?? (() => Math.floor(Date.now() / 1000)))();
+    if (batch.status !== "applied") {
+        throw new Error(`batch ${batch.id} is ${batch.status}, not applied`);
+    }
+    if (!batch.expires_at || now > batch.expires_at) {
+        batch.status = "expired";
+        throw Object.assign(new Error("undo window has expired"), { code: "expired" });
+    }
+    const report = {
+        reverted: 0,
+        skipped: 0,
+        failed: 0,
+        details: [],
+    };
+    // Reverse to roll back in opposite order of apply
+    const applied = batch.suggestions.filter((s) => s.applied).reverse();
+    for (const sug of applied) {
+        try {
+            const back = await revertOne(opts.filesRoot, sug);
+            if (back === "skipped") {
+                report.skipped++;
+                report.details.push({
+                    id: sug.id,
+                    status: "skipped",
+                    reason: "target missing or modified",
+                });
+                opts.audit("organize.revert", sug.to, {
+                    batch: batch.id,
+                    status: "skipped",
+                });
+            }
+            else {
+                sug.reverted = true;
+                report.reverted++;
+                report.details.push({ id: sug.id, status: "reverted" });
+                opts.audit("organize.revert", sug.to, {
+                    batch: batch.id,
+                    back_to: sug.from,
+                });
+            }
+        }
+        catch (e) {
+            report.failed++;
+            report.details.push({
+                id: sug.id,
+                status: "failed",
+                reason: e.message ?? String(e),
+            });
+            opts.audit("organize.revert", sug.to, {
+                batch: batch.id,
+                status: "failed",
+                error: e.message ?? String(e),
+            });
+        }
+    }
+    batch.status = "reverted";
+    batch.reverted_at = now;
+    return { batch, report };
+}
+async function revertOne(filesRoot, sug) {
+    const toAbs = resolveSafe(filesRoot, sug.to);
+    let toStat;
+    try {
+        toStat = fs.lstatSync(toAbs);
+    }
+    catch {
+        return "skipped";
+    }
+    if (toStat.isSymbolicLink())
+        return "skipped";
+    const fromAbs = resolveSafe(filesRoot, sug.from);
+    if (fs.existsSync(fromAbs)) {
+        // Original location reoccupied (user dropped a new file there) —
+        // do not clobber. Skip and let the user resolve.
+        return "skipped";
+    }
+    const sortedPair = [fromAbs, toAbs].sort();
+    const first = sortedPair[0];
+    const second = sortedPair[1];
+    await withPathLock(first, () => withPathLock(second, async () => {
+        fs.mkdirSync(path.dirname(fromAbs), { recursive: true });
+        fs.renameSync(toAbs, fromAbs);
+    }));
+    return "reverted";
+}
+//# sourceMappingURL=applier.js.map

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

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

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

@@ -0,0 +1,57 @@
+export type OnCollision = "keep-both" | "overwrite" | "skip";
+export interface ExtractSpec {
+    /** Source: "exif.DateTimeOriginal" / "mtime" / "metadata.epub.author" */
+    from: string;
+    /** Variable name used in move_to template */
+    as: string;
+    /** Optional format hint (e.g. "Y-MM-DD"); see formatDate. Default: ISO */
+    format?: string;
+}
+export interface MatchSpec {
+    /** Glob (minimatch syntax) against `files/`-relative path. */
+    glob?: string;
+    /** Any-of MIME globs ("image/*", "application/pdf"). */
+    mime?: string[];
+}
+export interface ActionSpec {
+    /** Template path with {var} interpolation. files/-relative. */
+    move_to: string;
+    /** Default "keep-both". */
+    on_collision?: OnCollision;
+}
+export interface OrganizeRule {
+    id: string;
+    match: MatchSpec;
+    extract?: ExtractSpec[];
+    action: ActionSpec;
+    enabled?: boolean;
+}
+export interface RulesFile {
+    version: 1;
+    rules: OrganizeRule[];
+}
+export interface RuleValidationError {
+    rule_id?: string;
+    rule_index?: number;
+    field: string;
+    message: string;
+}
+export interface RulesValidationResult {
+    ok: boolean;
+    errors: RuleValidationError[];
+    /** Rules that passed validation, in declaration order. */
+    valid_rules: OrganizeRule[];
+}
+export declare const BUILTIN_RULES: OrganizeRule[];
+export declare function validateRules(input: unknown): RulesValidationResult;
+/**
+ * Reads `<filesRoot>/.organize-rules.json`. If missing, returns built-in
+ * defaults. If malformed, throws — callers should surface the message.
+ */
+export declare function readRules(filesRoot: string): Promise<{
+    rules: OrganizeRule[];
+    hash: string;
+    source: "file" | "builtin";
+}>;
+export declare function writeRules(filesRoot: string, rules: OrganizeRule[]): Promise<void>;
+export declare function hashRules(rules: OrganizeRule[]): string;

package/dist/services/organize/rules.js

@@ -0,0 +1,286 @@
+/**
+ * Organize rules for the W1.5 file organizer.
+ *
+ * Rules live in `~/.jishushell/files/.organize-rules.json` so they get
+ * backed up alongside user data. If the file is missing we fall back to
+ * the built-in defaults below; if it exists but is malformed we throw at
+ * scan time so the user sees a clear error instead of silently doing
+ * nothing.
+ *
+ * Design constraints:
+ *   - No I/O at import time (constructor-time configuration)
+ *   - validateRules is total: never throws on a *single* bad rule, only
+ *     on whole-file structural errors. Bad rules are returned as
+ *     `{ rule, errors }` so the UI can highlight them inline.
+ *   - move_to template variables are validated lazily (at scan time,
+ *     once per match) — a rule with `{undefined_var}` only errors on
+ *     files that match it, not the whole batch.
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { createHash } from "node:crypto";
+import { safeWriteBuffer } from "../../utils/safe-write.js";
+// ── Built-in defaults ────────────────────────────────
+export const BUILTIN_RULES = [
+    // 1. Photos by EXIF date — most common case
+    {
+        id: "builtin:photos-by-exif",
+        match: {
+            glob: "inbox/**/*.{jpg,jpeg,png,heic}",
+            mime: ["image/*"],
+        },
+        extract: [
+            { from: "exif.DateTimeOriginal", as: "shot", format: "Y-MM" },
+        ],
+        action: {
+            move_to: "photos/{shot}/{basename}",
+            on_collision: "keep-both",
+        },
+        enabled: true,
+    },
+    // 2. Videos by mtime (no EXIF on most videos)
+    {
+        id: "builtin:videos-by-month",
+        match: {
+            glob: "inbox/**/*.{mp4,mov,webm,mkv}",
+            mime: ["video/*"],
+        },
+        extract: [{ from: "mtime", as: "t", format: "Y-MM" }],
+        action: {
+            move_to: "videos/{t}/{basename}",
+            on_collision: "keep-both",
+        },
+        enabled: true,
+    },
+    // 3. Screenshots by day
+    {
+        id: "builtin:screenshots",
+        match: {
+            glob: "**/{Screenshot,屏幕截图,截图}*.{png,jpg}",
+        },
+        extract: [{ from: "mtime", as: "t", format: "Y-MM-DD" }],
+        action: {
+            move_to: "screenshots/{t}/{basename}",
+            on_collision: "keep-both",
+        },
+        enabled: true,
+    },
+    // 4. Invoices (Chinese / English prefix)
+    {
+        id: "builtin:invoices",
+        match: {
+            glob: "inbox/**/{发票,invoice,receipt}*.{pdf,jpg,png}",
+        },
+        extract: [{ from: "mtime", as: "t", format: "Y-MM" }],
+        action: {
+            move_to: "finance/{t}/{basename}",
+            on_collision: "keep-both",
+        },
+        enabled: true,
+    },
+    // 5. Downloads by extension bucket
+    {
+        id: "builtin:downloads-by-ext",
+        match: {
+            glob: "downloads/*",
+        },
+        extract: [{ from: "ext", as: "bucket" }],
+        action: {
+            move_to: "downloads/{bucket}/{basename}",
+            on_collision: "skip",
+        },
+        enabled: false, // off by default — many users prefer flat downloads
+    },
+];
+// ── Validation ───────────────────────────────────────
+const ID_REGEX = /^[a-z0-9][a-z0-9:_-]*$/i;
+export function validateRules(input) {
+    const errors = [];
+    const valid = [];
+    if (!input || typeof input !== "object") {
+        errors.push({ field: "<root>", message: "rules file must be a JSON object" });
+        return { ok: false, errors, valid_rules: [] };
+    }
+    const obj = input;
+    if (obj.version !== 1) {
+        errors.push({ field: "version", message: 'must be the literal number 1' });
+    }
+    if (!Array.isArray(obj.rules)) {
+        errors.push({ field: "rules", message: "must be an array" });
+        return { ok: false, errors, valid_rules: [] };
+    }
+    const seenIds = new Set();
+    obj.rules.forEach((raw, idx) => {
+        const ruleErrors = validateRule(raw, idx, seenIds);
+        if (ruleErrors.length > 0) {
+            errors.push(...ruleErrors);
+        }
+        else {
+            valid.push(raw);
+        }
+    });
+    return {
+        ok: errors.length === 0,
+        errors,
+        valid_rules: valid,
+    };
+}
+function validateRule(raw, index, seenIds) {
+    const errs = [];
+    if (!raw || typeof raw !== "object") {
+        errs.push({ rule_index: index, field: "<rule>", message: "must be an object" });
+        return errs;
+    }
+    const r = raw;
+    // id
+    if (typeof r.id !== "string" || !ID_REGEX.test(r.id)) {
+        errs.push({
+            rule_index: index,
+            rule_id: typeof r.id === "string" ? r.id : undefined,
+            field: "id",
+            message: "must be a slug matching [a-z0-9][a-z0-9:_-]*",
+        });
+    }
+    else if (seenIds.has(r.id)) {
+        errs.push({ rule_index: index, rule_id: r.id, field: "id", message: "duplicate id" });
+    }
+    else {
+        seenIds.add(r.id);
+    }
+    // match
+    if (!r.match || typeof r.match !== "object") {
+        errs.push({ rule_index: index, field: "match", message: "required object" });
+    }
+    else {
+        const m = r.match;
+        const hasGlob = typeof m.glob === "string" && m.glob.length > 0;
+        const hasMime = Array.isArray(m.mime) && m.mime.length > 0;
+        if (!hasGlob && !hasMime) {
+            errs.push({
+                rule_index: index,
+                field: "match",
+                message: "must specify at least one of: glob, mime",
+            });
+        }
+        if (m.glob !== undefined && typeof m.glob !== "string") {
+            errs.push({ rule_index: index, field: "match.glob", message: "must be a string" });
+        }
+        if (m.mime !== undefined && !Array.isArray(m.mime)) {
+            errs.push({ rule_index: index, field: "match.mime", message: "must be an array" });
+        }
+    }
+    // extract (optional)
+    if (r.extract !== undefined) {
+        if (!Array.isArray(r.extract)) {
+            errs.push({ rule_index: index, field: "extract", message: "must be an array if present" });
+        }
+        else {
+            r.extract.forEach((e, eidx) => {
+                if (!e || typeof e !== "object") {
+                    errs.push({
+                        rule_index: index,
+                        field: `extract[${eidx}]`,
+                        message: "must be an object",
+                    });
+                    return;
+                }
+                const ex = e;
+                if (typeof ex.from !== "string" || !ex.from) {
+                    errs.push({
+                        rule_index: index,
+                        field: `extract[${eidx}].from`,
+                        message: "required string",
+                    });
+                }
+                if (typeof ex.as !== "string" || !/^[a-z_][a-z0-9_]*$/i.test(ex.as)) {
+                    errs.push({
+                        rule_index: index,
+                        field: `extract[${eidx}].as`,
+                        message: "required identifier ([a-z_][a-z0-9_]*)",
+                    });
+                }
+            });
+        }
+    }
+    // action
+    if (!r.action || typeof r.action !== "object") {
+        errs.push({ rule_index: index, field: "action", message: "required object" });
+    }
+    else {
+        const a = r.action;
+        if (typeof a.move_to !== "string" || !a.move_to) {
+            errs.push({
+                rule_index: index,
+                field: "action.move_to",
+                message: "required string",
+            });
+        }
+        else if (a.move_to.startsWith("/") || a.move_to.includes("..")) {
+            errs.push({
+                rule_index: index,
+                field: "action.move_to",
+                message: "must be a relative path without ..",
+            });
+        }
+        if (a.on_collision !== undefined &&
+            a.on_collision !== "keep-both" &&
+            a.on_collision !== "overwrite" &&
+            a.on_collision !== "skip") {
+            errs.push({
+                rule_index: index,
+                field: "action.on_collision",
+                message: "must be one of: keep-both | overwrite | skip",
+            });
+        }
+    }
+    return errs;
+}
+// ── Persistence ──────────────────────────────────────
+/**
+ * Reads `<filesRoot>/.organize-rules.json`. If missing, returns built-in
+ * defaults. If malformed, throws — callers should surface the message.
+ */
+export async function readRules(filesRoot) {
+    const file = path.join(filesRoot, ".organize-rules.json");
+    if (!fs.existsSync(file)) {
+        return {
+            rules: BUILTIN_RULES.filter((r) => r.enabled !== false),
+            hash: hashRules(BUILTIN_RULES),
+            source: "builtin",
+        };
+    }
+    const buf = fs.readFileSync(file);
+    let parsed;
+    try {
+        parsed = JSON.parse(buf.toString("utf8"));
+    }
+    catch (e) {
+        throw new Error(`invalid JSON in .organize-rules.json: ${e.message}`);
+    }
+    const result = validateRules(parsed);
+    if (!result.ok) {
+        const summary = result.errors
+            .slice(0, 5)
+            .map((e) => `${e.field}: ${e.message}`)
+            .join("; ");
+        throw new Error(`invalid rules (${result.errors.length} error(s)): ${summary}`);
+    }
+    return {
+        rules: result.valid_rules.filter((r) => r.enabled !== false),
+        hash: hashRules(result.valid_rules),
+        source: "file",
+    };
+}
+export async function writeRules(filesRoot, rules) {
+    const file = path.join(filesRoot, ".organize-rules.json");
+    const payload = { version: 1, rules };
+    const buf = Buffer.from(JSON.stringify(payload, null, 2) + "\n", "utf8");
+    await safeWriteBuffer(file, buf);
+}
+export function hashRules(rules) {
+    // Stable hash based on serialized payload — used to detect rule edits
+    // between scan and apply.
+    const canon = JSON.stringify(rules, Object.keys(rules[0] ?? {}).sort());
+    return createHash("sha256").update(canon).digest("hex").slice(0, 16);
+}
+//# sourceMappingURL=rules.js.map

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

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