jishushell 0.4.30 → 0.5.15

package/dist/routes/external-mounts.js

@@ -0,0 +1,73 @@
+import { validateMount, } from "../services/external-mounts.js";
+import { getPanelConfig, savePanelConfig } from "../config.js";
+export async function externalMountsRoutes(app, deps) {
+    // ── GET ────────────────────────────────────────
+    app.get("/api/files/external-mounts", async (_req, reply) => {
+        const cfg = getPanelConfig();
+        const mounts = Array.isArray(cfg.external_mounts)
+            ? cfg.external_mounts
+            : [];
+        reply.send({ mounts });
+    });
+    // ── POST /test (dry-run) ───────────────────────
+    app.post("/api/files/external-mounts/test", async (req, reply) => {
+        const candidate = req.body?.mount ?? {};
+        const cfg = getPanelConfig();
+        const existing = Array.isArray(cfg.external_mounts)
+            ? cfg.external_mounts
+            : [];
+        // Exclude the candidate's own alias from the conflict check so
+        // editing a row in place doesn't trigger "already in use".
+        const others = existing.filter((m) => m.alias !== candidate.alias);
+        const result = validateMount(candidate, others);
+        reply.send(result);
+    });
+    // ── PUT (full replacement) ─────────────────────
+    app.put("/api/files/external-mounts", async (req, reply) => {
+        const candidate = Array.isArray(req.body?.mounts)
+            ? req.body.mounts
+            : null;
+        if (!candidate) {
+            return reply.code(400).send({
+                error: "body.mounts must be an array",
+                code: "invalid",
+            });
+        }
+        // Validate each, accumulating errors with index so the UI can
+        // pinpoint bad rows.
+        const validated = [];
+        const allErrors = [];
+        const allWarnings = [];
+        for (let i = 0; i < candidate.length; i++) {
+            const r = validateMount(candidate[i] ?? {}, validated);
+            if (r.ok) {
+                // We know all required fields are present from validation.
+                validated.push(candidate[i]);
+            }
+            else {
+                for (const err of r.errors) {
+                    allErrors.push({ index: i, field: err.field, message: err.message });
+                }
+            }
+            for (const warn of r.warnings) {
+                allWarnings.push({ index: i, message: warn });
+            }
+        }
+        if (allErrors.length > 0) {
+            return reply.code(400).send({
+                error: "invalid mount set",
+                code: "invalid",
+                errors: allErrors,
+                warnings: allWarnings,
+            });
+        }
+        // Persist into panel.json; live-update the FilesManager so changes
+        // take effect without restart.
+        const cfg = getPanelConfig();
+        cfg.external_mounts = validated;
+        savePanelConfig(cfg);
+        deps.filesManager.setExternalMounts(validated);
+        reply.send({ mounts: validated, warnings: allWarnings });
+    });
+}
+//# sourceMappingURL=external-mounts.js.map

package/dist/routes/external-mounts.js.map

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

package/dist/routes/file-mounts.d.ts

@@ -0,0 +1,13 @@
+/**
+ * /api/instances/:id/file-mounts routes (M1 W2 PR-5).
+ *
+ * GET → current mount list (echoes runtime.fileMounts).
+ * PUT → full replacement; runs validateMounts first, then writes the
+ *       runtime field, calls rebuildWorkspace immediately so symlinks
+ *       are fresh, and reports requires_restart so the UI can prompt
+ *       the user to restart the container (volume binds in docker mode
+ *       are part of the running task spec — they do not pick up
+ *       changes without a restart).
+ */
+import type { FastifyInstance } from "fastify";
+export declare function fileMountsRoutes(app: FastifyInstance): Promise<void>;

package/dist/routes/file-mounts.js

@@ -0,0 +1,90 @@
+import { getInstance, getInstanceRuntime, getOpenclawHome, } from "../services/instance-manager.js";
+import { validateMounts, ensureMountTargets, } from "../services/files-mounts.js";
+import { rebuildWorkspace } from "../services/workspace-builder.js";
+import { FILES_ROOT, INSTANCES_DIR } from "../config.js";
+import { safeWriteJson } from "../utils/safe-json.js";
+import { join } from "node:path";
+export async function fileMountsRoutes(app) {
+    // ── GET /api/instances/:id/file-mounts ──────────
+    app.get("/api/instances/:id/file-mounts", async (req, reply) => {
+        const meta = getInstance(req.params.id);
+        if (!meta) {
+            return reply.code(404).send({ error: "instance not found", code: "not-found" });
+        }
+        const runtime = getInstanceRuntime(req.params.id);
+        const mounts = Array.isArray(runtime.fileMounts)
+            ? runtime.fileMounts
+            : Array.isArray(runtime.file_mounts)
+                ? runtime.file_mounts
+                : [];
+        reply.send({ mounts });
+    });
+    // ── PUT /api/instances/:id/file-mounts ──────────
+    app.put("/api/instances/:id/file-mounts", async (req, reply) => {
+        const id = req.params.id;
+        const meta = getInstance(id);
+        if (!meta) {
+            return reply.code(404).send({ error: "instance not found", code: "not-found" });
+        }
+        const candidate = Array.isArray(req.body?.mounts) ? req.body.mounts : null;
+        if (!candidate) {
+            return reply.code(400).send({
+                error: "body.mounts must be an array",
+                code: "invalid",
+            });
+        }
+        const v = validateMounts(candidate, id);
+        if (!v.ok) {
+            return reply.code(400).send({
+                error: "invalid mount set",
+                code: "invalid",
+                errors: v.errors.map((e) => ({
+                    mount_index: e.mountIndex,
+                    message: e.message,
+                })),
+            });
+        }
+        // Persist into instance.json (full runtime block; safeWriteJson does
+        // an atomic write).
+        const newRuntime = { ...meta.runtime, fileMounts: candidate };
+        // Drop any stale snake_case from earlier writes
+        delete newRuntime.file_mounts;
+        const newMeta = { ...meta, runtime: newRuntime };
+        const metaPath = join(INSTANCES_DIR, id, "instance.json");
+        safeWriteJson(metaPath, newMeta);
+        // Mounts targets must exist on host before docker tries to bind
+        ensureMountTargets(FILES_ROOT, candidate);
+        // Lay down workspace symlinks immediately so raw_exec / process
+        // mode picks up changes without a restart. Docker still needs a
+        // restart for the volume binds, signalled via requires_restart.
+        try {
+            const home = getOpenclawHome(id);
+            if (home) {
+                rebuildWorkspace({
+                    openclawHome: home,
+                    filesRoot: FILES_ROOT,
+                    mounts: candidate,
+                    instanceId: id,
+                });
+            }
+        }
+        catch (e) {
+            if (e?.reason === "needs-migration") {
+                return reply.code(409).send({
+                    error: "instance workspace contains pre-W2 user data; run legacy migration first",
+                    code: "needs-migration",
+                    detail: e.message,
+                });
+            }
+            return reply.code(500).send({
+                error: e?.message ?? "workspace rebuild failed",
+                code: "rebuild-failed",
+            });
+        }
+        reply.send({
+            mounts: candidate,
+            requires_restart: true,
+        });
+    });
+}
+//# sourceMappingURL=file-mounts.js.map

package/dist/routes/file-mounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-mounts.js","sourceRoot":"","sources":["../../src/routes/file-mounts.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,cAAc,EACd,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAOjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAoB;IACzD,mDAAmD;IACnD,GAAG,CAAC,GAAG,CACL,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACnB,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,GAAgB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YAC3D,CAAC,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;gBAClC,CAAC,CAAC,OAAO,CAAC,WAAW;gBACrB,CAAC,CAAC,EAAE,CAAC;QACT,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACzB,CAAC,CACF,CAAC;IAEF,mDAAmD;IACnD,GAAG,CAAC,GAAG,CACL,gCAAgC,EAChC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,IAAK,CAAC,MAAsB,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7F,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,8BAA8B;gBACrC,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,GAAG,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,mBAAmB;gBAC1B,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC3B,WAAW,EAAE,CAAC,CAAC,UAAU;oBACzB,OAAO,EAAE,CAAC,CAAC,OAAO;iBACnB,CAAC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC;QAED,qEAAqE;QACrE,oBAAoB;QACpB,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;QAC9D,gDAAgD;QAChD,OAAQ,UAAsC,CAAC,WAAW,CAAC;QAC3D,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;QAC1D,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEjC,gEAAgE;QAChE,kBAAkB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAE1C,gEAAgE;QAChE,gEAAgE;QAChE,gEAAgE;QAChE,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;YACjC,IAAI,IAAI,EAAE,CAAC;gBACT,gBAAgB,CAAC;oBACf,YAAY,EAAE,IAAI;oBAClB,SAAS,EAAE,UAAU;oBACrB,MAAM,EAAE,SAAS;oBACjB,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,MAAM,KAAK,iBAAiB,EAAE,CAAC;gBACpC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,KAAK,EAAE,0EAA0E;oBACjF,IAAI,EAAE,iBAAiB;oBACvB,MAAM,EAAE,CAAC,CAAC,OAAO;iBAClB,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,CAAC,EAAE,OAAO,IAAI,0BAA0B;gBAC/C,IAAI,EAAE,gBAAgB;aACvB,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,SAAS;YACjB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC"}

package/dist/routes/files-organize.d.ts

@@ -0,0 +1,28 @@
+/**
+ * /api/files/organize/* routes (W1.5 PR-4).
+ *
+ * Mounted alongside /api/files via the same Fastify scope so they
+ * share path-safety, octet-stream parser etc. Auth piggybacks on the
+ * global onRequest hook in server.ts.
+ *
+ * Endpoints:
+ *   POST   /api/files/organize/scan                   run rules and return batch
+ *   GET    /api/files/organize/batches                list recent batches
+ *   GET    /api/files/organize/batches/:id            fetch one
+ *   PUT    /api/files/organize/batches/:id/apply      apply (selectedIds in body)
+ *   POST   /api/files/organize/batches/:id/revert     revert within undo window
+ *   DELETE /api/files/organize/batches/:id            mark expired (cancel)
+ *   GET    /api/files/organize/rules                  current rule file content
+ *   PUT    /api/files/organize/rules                  replace rule file
+ */
+import type { FastifyInstance } from "fastify";
+import { FilesManager } from "../services/files-manager.js";
+import { BatchStore } from "../services/organize/store.js";
+export interface OrganizeRoutesDeps {
+    filesManager: FilesManager;
+    /** Defaults to a store rooted at JISHUSHELL_HOME. */
+    store?: BatchStore;
+    /** Override files root in tests. Defaults to FILES_ROOT. */
+    filesRoot?: string;
+}
+export declare function organizeRoutes(app: FastifyInstance, deps: OrganizeRoutesDeps): Promise<void>;

package/dist/routes/files-organize.js

@@ -0,0 +1,167 @@
+import { FilesError } from "../services/files-manager.js";
+import { readRules, writeRules, validateRules, } from "../services/organize/rules.js";
+import { scan } from "../services/organize/scanner.js";
+import { applyBatch, revertBatch } from "../services/organize/applier.js";
+import { BatchStore } from "../services/organize/store.js";
+import { FILES_ROOT, JISHUSHELL_HOME } from "../config.js";
+export async function organizeRoutes(app, deps) {
+    const filesRoot = deps.filesRoot ?? FILES_ROOT;
+    const store = deps.store ?? new BatchStore(JISHUSHELL_HOME);
+    const audit = (op, p, meta) => {
+        deps.filesManager.audit(op, p, meta);
+    };
+    // W2 PR-3: /api/files/organize/* organize batches are also panel-internal
+    // substrate for the drive_* MCP shim only. Browser users now manage files
+    // via the Filebrowser app mounted at /apps/filebrowser/*. Reject any
+    // request that didn't pass the X-Jishushell-Internal-Token check in
+    // server.ts auth middleware. Return 404 rather than 401 so unauthenticated
+    // probes can't fingerprint the surface.
+    app.addHook("onRequest", async (request, reply) => {
+        if (!request.internalCallerInstance) {
+            return reply.status(404).send();
+        }
+    });
+    // ── POST /api/files/organize/scan ───────────────
+    app.post("/api/files/organize/scan", async (req, reply) => {
+        const path = typeof req.body?.path === "string" ? req.body.path : "";
+        try {
+            const { rules } = await readRules(filesRoot);
+            const batch = await scan(filesRoot, rules, path);
+            await store.put(batch);
+            reply.send(batch);
+        }
+        catch (e) {
+            sendOrganizeError(reply, e);
+        }
+    });
+    // ── GET /api/files/organize/batches ─────────────
+    app.get("/api/files/organize/batches", async (_req, reply) => {
+        reply.send({ batches: store.list() });
+    });
+    // ── GET /api/files/organize/batches/:id ─────────
+    app.get("/api/files/organize/batches/:id", async (req, reply) => {
+        const b = store.get(req.params.id);
+        if (!b)
+            return reply.code(404).send({ error: "batch not found", code: "not-found" });
+        reply.send(b);
+    });
+    // ── PUT /api/files/organize/batches/:id/apply ───
+    app.put("/api/files/organize/batches/:id/apply", async (req, reply) => {
+        const batch = store.get(req.params.id);
+        if (!batch) {
+            return reply.code(404).send({ error: "batch not found", code: "not-found" });
+        }
+        if (batch.status !== "pending") {
+            return reply.code(409).send({
+                error: `batch is ${batch.status}, not pending`,
+                code: "bad-state",
+            });
+        }
+        const selectedIds = new Set(req.body?.selected_ids ?? []);
+        // Re-read rules to get on_collision settings — and detect if rules
+        // changed since scan (rules_hash mismatch).
+        const { rules, hash } = await readRules(filesRoot);
+        if (hash !== batch.rules_hash) {
+            return reply.code(409).send({
+                error: "rules changed since scan, please re-scan",
+                code: "rules-changed",
+            });
+        }
+        const rulesById = new Map();
+        for (const r of rules)
+            rulesById.set(r.id, r);
+        try {
+            const { report } = await applyBatch(batch, {
+                filesRoot,
+                rulesById,
+                selectedIds,
+                audit,
+            });
+            await store.put(batch);
+            reply.send({ batch, report });
+        }
+        catch (e) {
+            sendOrganizeError(reply, e);
+        }
+    });
+    // ── POST /api/files/organize/batches/:id/revert ─
+    app.post("/api/files/organize/batches/:id/revert", async (req, reply) => {
+        const batch = store.get(req.params.id);
+        if (!batch) {
+            return reply.code(404).send({ error: "batch not found", code: "not-found" });
+        }
+        if (batch.status !== "applied") {
+            return reply.code(409).send({
+                error: `batch is ${batch.status}, not applied`,
+                code: "bad-state",
+            });
+        }
+        try {
+            const { report } = await revertBatch(batch, { filesRoot, audit });
+            await store.put(batch);
+            reply.send({ batch, report });
+        }
+        catch (e) {
+            if (e?.code === "expired") {
+                await store.put(batch);
+                return reply.code(410).send({
+                    error: "undo window has expired",
+                    code: "expired",
+                });
+            }
+            sendOrganizeError(reply, e);
+        }
+    });
+    // ── DELETE /api/files/organize/batches/:id ──────
+    app.delete("/api/files/organize/batches/:id", async (req, reply) => {
+        const batch = store.get(req.params.id);
+        if (!batch)
+            return reply.code(204).send();
+        await store.update(req.params.id, (b) => {
+            if (b.status === "pending")
+                b.status = "expired";
+        });
+        reply.code(204).send();
+    });
+    // ── GET /api/files/organize/rules ───────────────
+    app.get("/api/files/organize/rules", async (_req, reply) => {
+        try {
+            const { rules, source, hash } = await readRules(filesRoot);
+            reply.send({ rules, source, hash });
+        }
+        catch (e) {
+            sendOrganizeError(reply, e);
+        }
+    });
+    // ── PUT /api/files/organize/rules ───────────────
+    app.put("/api/files/organize/rules", async (req, reply) => {
+        const result = validateRules({
+            version: 1,
+            rules: req.body?.rules ?? [],
+        });
+        if (!result.ok) {
+            return reply.code(400).send({
+                error: "invalid rules",
+                code: "invalid",
+                errors: result.errors,
+            });
+        }
+        try {
+            await writeRules(filesRoot, result.valid_rules);
+            reply.send({ rules: result.valid_rules });
+        }
+        catch (e) {
+            sendOrganizeError(reply, e);
+        }
+    });
+}
+function sendOrganizeError(reply, e) {
+    if (e instanceof FilesError) {
+        reply.code(e.httpStatus).send({ error: e.message, code: e.code });
+        return;
+    }
+    const err = e;
+    console.error("[organize] unexpected:", err.message);
+    reply.code(500).send({ error: err.message ?? "internal error", code: err.code ?? "internal" });
+}
+//# sourceMappingURL=files-organize.js.map

package/dist/routes/files-organize.js.map

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

package/dist/routes/files.d.ts

@@ -0,0 +1,31 @@
+/**
+ * /api/files routes (M1 W1 PR-4).
+ *
+ * Mounted as a Fastify plugin so that the route-scoped octet-stream parser
+ * does not leak globally. The parser transparently passes the raw payload
+ * stream to handlers (no buffering), letting `FilesManager.writeStream`
+ * pipe straight to disk.
+ *
+ * Endpoints:
+ *   GET    /api/files                  list directory
+ *   GET    /api/files/raw              stream file content
+ *   GET    /api/files/preview          small text/image read (truncated)
+ *   GET    /api/files/quota            quota info
+ *   PUT    /api/files                  upload (octet-stream only)
+ *   POST   /api/files/mkdir            create directory
+ *   POST   /api/files/move             rename / move
+ *   DELETE /api/files                  soft-delete to .trash/
+ *   GET    /api/files/search           full-text search index
+ *   GET    /api/files/meta             read per-file sidecar metadata
+ *   PUT    /api/files/meta             write/merge per-file sidecar metadata
+ *   POST   /api/files/reindex          rebuild search index
+ *   GET    /api/files/resolve          relative path → absolute host path
+ *
+ * Auth: covered by the global onRequest hook in server.ts.
+ */
+import type { FastifyInstance } from "fastify";
+import { FilesManager } from "../services/files-manager.js";
+export interface FilesRoutesDeps {
+    filesManager: FilesManager;
+}
+export declare function filesRoutes(app: FastifyInstance, deps: FilesRoutesDeps): Promise<void>;