jishushell 0.4.30 → 0.5.22

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>;

package/dist/routes/files.js

@@ -0,0 +1,321 @@
+import { FilesError, } from "../services/files-manager.js";
+const MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // matches FilesManager default
+export async function filesRoutes(app, deps) {
+    const { filesManager } = deps;
+    // ── Route-scoped parser ───────────────────────────
+    // Pass-through: hand the raw payload stream straight to the handler.
+    // Do NOT use parseAs:'buffer' — that would read the whole body into memory.
+    app.addContentTypeParser("application/octet-stream", (_req, payload, done) => done(null, payload));
+    // W2 PR-3: /api/files/* is the 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();
+        }
+    });
+    // ── GET /api/files (list) ─────────────────────────
+    app.get("/api/files", async (req, reply) => {
+        const path = decodeOrEmpty(req.query.path);
+        const showHidden = req.query.show_hidden === "true";
+        try {
+            const result = await filesManager.list(path, { showHidden });
+            reply.send(result);
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/raw ────────────────────────────
+    app.get("/api/files/raw", async (req, reply) => {
+        const path = decodeOrEmpty(req.query.path);
+        try {
+            // readStream returns a lazy stream factory — no fd opened yet
+            const r = await filesManager.readStream(path);
+            // Conditional GET (weak ETag) — answer without opening the file
+            const ifNoneMatch = req.headers["if-none-match"];
+            if (typeof ifNoneMatch === "string" && weakETagMatch(ifNoneMatch, r.etag)) {
+                reply.code(304);
+                reply.header("ETag", r.etag);
+                return reply.send();
+            }
+            reply.header("Content-Type", r.mime);
+            reply.header("Content-Length", String(r.size));
+            reply.header("ETag", r.etag);
+            reply.header("Last-Modified", new Date(r.mtime * 1000).toUTCString());
+            reply.header("Cache-Control", "private, max-age=0");
+            reply.header("Content-Disposition", `inline; filename*=UTF-8''${encodeRfc5987(basename(path))}`);
+            // Open the fd only now, just before piping
+            return reply.send(r.openStream());
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/preview ────────────────────────
+    app.get("/api/files/preview", async (req, reply) => {
+        const path = decodeOrEmpty(req.query.path);
+        const maxKb = parsePositiveInt(req.query.max_kb, 256) ?? 256;
+        const maxBytes = maxKb * 1024;
+        try {
+            const r = await filesManager.readSmall(path, maxBytes);
+            // Response is a JSON envelope; the underlying file's mime is in the body.
+            reply.header("ETag", r.etag);
+            reply.send({
+                path,
+                mime: r.mime,
+                size: r.size,
+                truncated: r.truncated,
+                content: r.buf.toString("utf8"),
+            });
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/quota ──────────────────────────
+    app.get("/api/files/quota", async (_req, reply) => {
+        try {
+            const q = await filesManager.quota();
+            reply.send(q);
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── PUT /api/files (upload) ───────────────────────
+    app.put("/api/files", { bodyLimit: MAX_UPLOAD_BYTES }, async (req, reply) => {
+        // Reject non-octet-stream up front for a clean 415
+        const ct = (req.headers["content-type"] || "")
+            .split(";")[0]
+            .trim()
+            .toLowerCase();
+        if (ct !== "application/octet-stream") {
+            return reply
+                .code(415)
+                .send({
+                error: "Content-Type must be application/octet-stream",
+                code: "unsupported-media-type",
+            });
+        }
+        const path = decodeOrEmpty(req.query.path);
+        const overwrite = req.query.overwrite === "true";
+        const ifMatch = req.headers["if-match"];
+        // Content-Length is mandatory: chunked uploads (no length) would let
+        // a client stream gigabytes before we hit the in-flight size guard,
+        // and the resulting "write past limit then soft-delete" path is
+        // dangerous when disk is near-full. Reject up front per spec.
+        const cl = req.headers["content-length"];
+        const clNum = typeof cl === "string" ? Number.parseInt(cl, 10) : Number.NaN;
+        if (!Number.isFinite(clNum) || clNum < 0) {
+            return reply.code(411).send({
+                error: "Content-Length header is required",
+                code: "length-required",
+            });
+        }
+        if (clNum > MAX_UPLOAD_BYTES) {
+            return reply.code(413).send({
+                error: `Content-Length ${clNum} exceeds max ${MAX_UPLOAD_BYTES}`,
+                code: "too-large",
+            });
+        }
+        // The route-scoped parser passes payload as the request body (Readable)
+        const body = req.body;
+        if (!body) {
+            return reply
+                .code(400)
+                .send({ error: "missing request body", code: "no-body" });
+        }
+        try {
+            const result = await filesManager.writeStream(path, body, {
+                overwrite,
+                ifMatch: typeof ifMatch === "string" ? ifMatch : undefined,
+                expectedSize: clNum,
+            });
+            reply.code(overwrite ? 200 : 201).send({
+                path,
+                etag: result.etag,
+                size: result.size,
+                mime: result.mime,
+            });
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── POST /api/files/mkdir ─────────────────────────
+    app.post("/api/files/mkdir", async (req, reply) => {
+        const p = req.body?.path ?? "";
+        try {
+            await filesManager.mkdir(p);
+            reply.code(201).send({ path: p });
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── POST /api/files/move ──────────────────────────
+    app.post("/api/files/move", async (req, reply) => {
+        const from = req.body?.from ?? "";
+        const to = req.body?.to ?? "";
+        const overwrite = req.body?.overwrite === true;
+        try {
+            await filesManager.move(from, to, overwrite);
+            reply.send({ from, to });
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── DELETE /api/files ─────────────────────────────
+    app.delete("/api/files", async (req, reply) => {
+        const path = decodeOrEmpty(req.query.path);
+        try {
+            await filesManager.remove(path);
+            reply.code(204).send();
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/search ─────────────────────────
+    app.get("/api/files/search", async (req, reply) => {
+        const q = (req.query.q ?? "").trim();
+        if (!q) {
+            return reply.code(400).send({ detail: "q required" });
+        }
+        const rawLimit = parsePositiveInt(req.query.limit, 20) ?? 20;
+        const limit = Math.min(Math.max(rawLimit, 1), 100);
+        const pathPrefix = decodeOrEmpty(req.query.path) || undefined;
+        try {
+            const hits = await filesManager.searchIndex(q, { limit, pathPrefix });
+            reply.send({ hits });
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/meta ───────────────────────────
+    app.get("/api/files/meta", async (req, reply) => {
+        const { sha, path } = req.query;
+        if (sha && path) {
+            return reply.code(400).send({ detail: "provide sha or path, not both" });
+        }
+        if (!sha && !path) {
+            return reply.code(400).send({ detail: "sha or path required" });
+        }
+        if (sha && !/^[a-f0-9]{64}$/i.test(sha)) {
+            return reply.code(400).send({ detail: "sha must be a 64-char hex string" });
+        }
+        try {
+            const meta = await filesManager.getMeta({
+                sha256: sha,
+                path: path ? decodeOrEmpty(path) : undefined,
+            });
+            reply.send(meta);
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── PUT /api/files/meta ───────────────────────────
+    // 96KB body cap: Agent A enforces 64KB on the serialized result;
+    // the slack covers merged result growth.
+    app.put("/api/files/meta", { bodyLimit: 96 * 1024 }, async (req, reply) => {
+        const { sha } = req.query;
+        if (!sha) {
+            return reply.code(400).send({ detail: "sha required" });
+        }
+        if (!/^[a-f0-9]{64}$/i.test(sha)) {
+            return reply.code(400).send({ detail: "sha must be a 64-char hex string" });
+        }
+        const merge = (req.query.merge ?? "").toLowerCase() !== "false";
+        const body = req.body;
+        if (body === null ||
+            body === undefined ||
+            typeof body !== "object" ||
+            Array.isArray(body)) {
+            return reply.code(400).send({ detail: "body must be a JSON object" });
+        }
+        try {
+            const result = await filesManager.setMeta(sha, body, { merge });
+            reply.send(result);
+        }
+        catch (e) {
+            if (e instanceof FilesError && e.httpStatus === 413) {
+                return reply.code(413).send({ error: e.message, code: e.code });
+            }
+            sendFilesError(reply, e);
+        }
+    });
+    // ── POST /api/files/reindex ───────────────────────
+    // Potentially long-running — no timeout; let it finish.
+    app.post("/api/files/reindex", async (req, reply) => {
+        const pathPrefix = decodeOrEmpty(req.query.path) || undefined;
+        try {
+            const result = await filesManager.reindex({ pathPrefix });
+            reply.send(result);
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+    // ── GET /api/files/resolve ────────────────────────
+    // Returns the absolute host filesystem path for a files/-relative path,
+    // plus existence + stat. Used by the drive MCP shim so agents can hand
+    // a real filesystem path to IM channel plugins (Feishu / WeChat / ...)
+    // that send files. Host==container by buildVolumes(), so the same
+    // string is valid inside the OpenClaw container.
+    app.get("/api/files/resolve", async (req, reply) => {
+        const rel = decodeOrEmpty(req.query.path);
+        try {
+            const info = await filesManager.resolveLocalPath(rel);
+            reply.send(info);
+        }
+        catch (e) {
+            sendFilesError(reply, e);
+        }
+    });
+}
+// ── Helpers ──────────────────────────────────────────
+function decodeOrEmpty(input) {
+    if (!input)
+        return "";
+    // Fastify already URL-decodes query strings; this is just a defensive type guard.
+    return input;
+}
+function parsePositiveInt(s, def) {
+    if (s === undefined || s === null)
+        return def;
+    const n = Number.parseInt(s, 10);
+    if (Number.isFinite(n) && n >= 0)
+        return n;
+    return def;
+}
+function basename(p) {
+    if (!p)
+        return "";
+    const idx = p.lastIndexOf("/");
+    return idx === -1 ? p : p.slice(idx + 1);
+}
+function encodeRfc5987(s) {
+    // RFC 5987 encoding for filename* parameter
+    return encodeURIComponent(s).replace(/['()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`);
+}
+function weakETagMatch(provided, current) {
+    const strip = (x) => x.replace(/^W\//, "");
+    return strip(provided) === strip(current);
+}
+function sendFilesError(reply, e) {
+    if (e instanceof FilesError) {
+        reply.code(e.httpStatus).send({ error: e.message, code: e.code });
+        return;
+    }
+    const err = e;
+    console.error("[files-routes] unexpected:", err.message);
+    reply.code(500).send({ error: "internal error", code: err.code ?? "internal" });
+}
+//# sourceMappingURL=files.js.map

package/dist/routes/files.js.map

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

package/dist/routes/instances.js

@@ -16,6 +16,20 @@ export const HOP_BY_HOP = new Set([
     "connection", "keep-alive", "proxy-authenticate", "proxy-authorization",
     "te", "trailer", "transfer-encoding", "upgrade",
 ]);
+/**
+ * Strip the panel session cookie (`jishushell_session`) from a cookie header
+ * value, preserving any other cookies for upstream forwarding.
+ */
+function stripPanelSessionCookie(value) {
+    if (value === undefined)
+        return undefined;
+    const cookie = Array.isArray(value) ? value.join("; ") : value;
+    const preserved = cookie
+        .split(";")
+        .map((part) => part.trim())
+        .filter((part) => part && !/^jishushell_session=/i.test(part));
+    return preserved.length ? preserved.join("; ") : undefined;
+}
 function readHeaderValue(value) {
     const header = Array.isArray(value) ? value[0] : value;
     return typeof header === "string" && header.trim() ? header.trim() : null;
@@ -269,6 +283,20 @@ function capabilityProxyBootstrap(proxyBasePath) {
         "var _lr=location.replace.bind(location);",
         "location.assign=function(u){return _la(rw(u));};",
         "location.replace=function(u){return _lr(rw(u));};",
+        // --- frame-busting defense ---
+        // Embedded SPAs (e.g. WeKnora) frequently do
+        //   window.top.location.href = '/login'
+        // when they see a 401, intending to log the user out. Inside our
+        // capability proxy iframe `top` is the panel's main window — that
+        // tears the user away from the instance detail page entirely.
+        // Redirect `top`/`parent` to the iframe's own window so the
+        // navigation stays inside the embed. Safe because the iframe IS
+        // same-origin as the panel (our reverse proxy serves it from the
+        // panel's host); cross-origin access would throw and fail closed.
+        "try{",
+        "Object.defineProperty(window,'top',{configurable:true,get:function(){return window;}});",
+        "Object.defineProperty(window,'parent',{configurable:true,get:function(){return window;}});",
+        "}catch(_e){}",
         // --- dynamic property assignment: img.src = '/static/...' ---
         "function patchProp(tag,prop){",
         "var d=Object.getOwnPropertyDescriptor(tag.prototype,prop);",
@@ -507,11 +535,15 @@ async function proxyProvidedCapability(req, reply) {
     if (capability.protocol !== "http" && capability.protocol !== "https") {
         return reply.status(400).send({ detail: `Capability '${req.params.capability}' does not use HTTP(S)` });
     }
-    if (typeof capability.port !== "number" || capability.port < 1) {
+    // Resolve the runtime port (handles port reallocation) instead of using
+    // the declared AppSpec port which may be stale.
+    const runtimePort = instanceManager.resolveRuntimeCapabilityPort(req.params.id, req.params.capability)
+        ?? capability.port;
+    if (typeof runtimePort !== "number" || runtimePort < 1) {
         return reply.status(500).send({ detail: `Capability '${req.params.capability}' has no resolved port` });
     }
-    const upstreamHost = await instanceManager.getHostForAppPort(req.params.id, capability.port);
-    const upstreamOrigin = `${capability.protocol}://${instanceManager.urlHost(upstreamHost)}:${capability.port}`;
+    const upstreamHost = await instanceManager.getHostForAppPort(req.params.id, runtimePort);
+    const upstreamOrigin = `${capability.protocol}://${instanceManager.urlHost(upstreamHost)}:${runtimePort}`;
     const wildcardSuffix = typeof req.params["*"] === "string" ? req.params["*"] : "";
     const proxyBasePath = capabilityProxyPath(req.params.id, req.params.capability);
     const querySuffix = req.raw.url?.includes("?") ? req.raw.url.slice(req.raw.url.indexOf("?")) : "";
@@ -531,6 +563,16 @@ async function proxyProvidedCapability(req, reply) {
         if (HOP_BY_HOP.has(normalizedKey) || normalizedKey === "host" || normalizedKey === "content-length" || normalizedKey === "accept-encoding") {
             continue;
         }
+        // Strip panel session credentials to avoid leaking them upstream
+        // (consistent with the WebSocket capability proxy in server.ts)
+        if (normalizedKey === "authorization")
+            continue;
+        if (normalizedKey === "cookie") {
+            const stripped = stripPanelSessionCookie(value);
+            if (stripped)
+                headers.set(key, stripped);
+            continue;
+        }
         if (Array.isArray(value)) {
             for (const item of value)
                 headers.append(key, item);
@@ -598,6 +640,21 @@ async function proxyProvidedCapability(req, reply) {
             if (HOP_BY_HOP.has(normalizedKey) || normalizedKey === "content-length" || normalizedKey === "content-encoding") {
                 return;
             }
+            // When we rewrite the response body (HTML/CSS/JS), the upstream ETag /
+            // Cache-Control values describe the *original* upstream bytes — but the
+            // body the browser receives is post-rewrite (proxy-prefixed paths, JS
+            // hard-coded redirect targets, etc.). Honoring the upstream cache hints
+            // lets the browser pin a stale rewrite indefinitely: e.g. an early
+            // visit that pre-dated the JS rewrite gets cached and survives across
+            // panel restarts, breaking the auth redirect logic until a hard refresh.
+            // Strip cache validators and force revalidation on every load.
+            if (willRewriteBody && (normalizedKey === "cache-control" ||
+                normalizedKey === "etag" ||
+                normalizedKey === "last-modified" ||
+                normalizedKey === "expires" ||
+                normalizedKey === "pragma")) {
+                return;
+            }
             if (willInjectHtml && (normalizedKey === "content-security-policy" ||
                 normalizedKey === "content-security-policy-report-only" ||
                 normalizedKey === "x-frame-options")) {
@@ -627,6 +684,10 @@ async function proxyProvidedCapability(req, reply) {
             return reply.send();
         }
         if (willRewriteBody) {
+            // Pair with the cache-validator strip above.
+            reply.header("cache-control", "no-cache, no-store, must-revalidate");
+            reply.header("pragma", "no-cache");
+            reply.header("expires", "0");
             let extraHeadHtml = "";
             if (req.params.capability === "browserless-debugger") {
                 extraHeadHtml = browserlessDebuggerBootstrap(req.params.id);
@@ -645,11 +706,16 @@ async function proxyProvidedCapability(req, reply) {
             // emit Clear-Site-Data so the browser drops the SW + its cache and
             // reloads through the proxy. We mark the success with a long-lived
             // cookie scoped to the proxy path to avoid a reload loop.
-            const cookieHeader = (req.headers.cookie || "").toString();
-            const swCleaned = /(?:^|;\s*)cap_proxy_sw_clean=1(?:;|$)/.test(cookieHeader);
-            if (!swCleaned) {
-                reply.header("Clear-Site-Data", '"cache", "storage"');
-                reply.header("Set-Cookie", `cap_proxy_sw_clean=1; Path=${proxyBasePath}; Max-Age=2592000; SameSite=Lax`);
+            // Gate to HTML only — JS/CSS sub-resources also flow through this branch
+            // now that we rewrite JS bundles, and emitting Clear-Site-Data on a JS
+            // response would clear storage mid-page-load.
+            if (willInjectHtml) {
+                const cookieHeader = (req.headers.cookie || "").toString();
+                const swCleaned = /(?:^|;\s*)cap_proxy_sw_clean=1(?:;|$)/.test(cookieHeader);
+                if (!swCleaned) {
+                    reply.header("Clear-Site-Data", '"cache", "storage"');
+                    reply.header("Set-Cookie", `cap_proxy_sw_clean=1; Path=${proxyBasePath}; Max-Age=2592000; SameSite=Lax`);
+                }
             }
             const rawBody = await upstream.text();
             req.raw.off("close", onClientClose);
@@ -1074,10 +1140,19 @@ export async function instanceRoutes(app) {
             const sudoPassword = typeof req.body?.sudoPassword === "string" && req.body.sudoPassword.trim()
                 ? req.body.sudoPassword
                 : undefined;
-            await instanceManager.uninstallApp(req.params.id, sudoPassword ? { exec: { sudoPassword } } : {});
+            const result = instanceManager.uninstallAppTask(req.params.id, sudoPassword ? { sudoPassword } : undefined);
+            if (!result.ok) {
+                const code = result.code;
+                const status = code === "TASK_BUSY" ? 409 : code === "APP_NOT_FOUND" ? 404 : 400;
+                return reply.status(status).send({ detail: result.error, code });
+            }
             statusCache.delete(req.params.id);
             llmProxy.cleanupInstance(req.params.id);
-            return { ok: true };
+            return reply.status(202).send({
+                ok: true,
+                taskId: result.taskId,
+                ...result.reused ? { reused: true } : {},
+            });
         }
         const svc = await getSvc();
         let stopFailed = false;
@@ -1625,7 +1700,7 @@ export async function instanceRoutes(app) {
         return { lines: logLines };
     });
     // Admin: re-encrypt all instance secrets with current AES key
-    app.post("/api/admin/migrate-secrets", async (_req, reply) => {
+    app.post("/api/admin/migrate-secrets", async (_req, _reply) => {
         const { getAesKey, getJwtSecret } = await import("../config.js");
         const { scryptSync, createDecipheriv, createCipheriv, randomBytes } = await import("crypto");
         const { readFileSync, existsSync: fsExistsSync } = await import("fs");
@@ -1775,7 +1850,7 @@ export async function instanceRoutes(app) {
         const consumerAgentType = String(meta?.agentType ?? "");
         const consumerIsAgent = consumerAgentType === "hermes" || consumerAgentType === "openclaw";
         const requires = (specInfo.spec.requires ?? []).map((r) => {
-            const isCategoryToken = ["llm", "search", "browser", "mcp"].includes(r.capability);
+            const isCategoryToken = ["llm", "search", "browser", "mcp", "files", "knowledge"].includes(r.capability);
             const candidates = isCategoryToken
                 ? Object.entries(capabilityRegistry.snapshot().providersByCapability ?? {})
                     .filter(([cap]) => cap.startsWith(r.capability + "-") || cap === r.capability)