brains-mcp 1.71.2 → 1.72.0

package/dist/httpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../src/httpServer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAQxB,OAAO,EAAsD,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AA+G7G,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AA04BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAI9D;AAgsBD,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CA+nF9F"}
+{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../src/httpServer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAQxB,OAAO,EAAsD,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAkH7G,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAi6BD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAI9D;AAgsBD,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CA+oF9F"}

package/dist/httpServer.js

@@ -24,7 +24,7 @@ import { parsePage } from "./wiki/frontmatter.js";
 import { pullSessionBundle } from "./tools/pullSessionBundle.js";
 import { pushSessionBundle } from "./tools/pushSessionBundle.js";
 import { buildExportZip } from "./tools/exportWiki.js";
-import { runImportFromBuffer, isValidWikiFilename, computeDiscoveredFolders, buildInstructionRefreshHint, } from "./tools/importWikiZip.js";
+import { runImportFromBuffer, isValidWikiFilename, computeDiscoveredFolders, buildInstructionRefreshHint, deriveReplaceScope, readRecordedFolder, isInFolderScope, } from "./tools/importWikiZip.js";
 import { purgeWiki } from "./tools/purgeWiki.js";
 import { AsyncJobRegistry } from "./jobs/asyncJobRegistry.js";
 import { exportDownloadStore } from "./jobs/exportDownloadStore.js";
@@ -498,6 +498,17 @@ async function readBody(req, maxBytes = MAX_BODY_BYTES) {
 async function scanImportDiffFromBuffer(drive, buffer, opts) {
     const zip = new AdmZip(buffer);
     const entries = zip.getEntries().filter((e) => !e.isDirectory);
+    // GH #695 phase 4 / GH #738: same scope derivation and whole-wiki refusal as
+    // the import_wiki tool — this upload route must not be a way to bypass it.
+    let folderScope;
+    if (opts.mode === "replace") {
+        const recordedFolder = readRecordedFolder(entries);
+        const scope = deriveReplaceScope(recordedFolder, opts.folder, opts.confirmWholeWiki ?? false);
+        if (!scope.ok) {
+            throw new ImportScopeRefusedError(scope.error);
+        }
+        folderScope = scope.folderScope;
+    }
     const diff = [];
     let newCount = 0;
     let modifiedCount = 0;
@@ -563,13 +574,18 @@ async function scanImportDiffFromBuffer(drive, buffer, opts) {
             if (!opts.includeSystem && systemFiles.has(name)) {
                 continue;
             }
+            if (!isInFolderScope(name, folderScope))
+                continue;
             if (!zipNames.has(name)) {
                 diff.push({ name, status: "deleted" });
                 deletedCount++;
             }
         }
     }
-    return { totalEntries: entries.length, newCount, modifiedCount, unchangedCount, skippedCount, deletedCount, diff };
+    return { totalEntries: entries.length, newCount, modifiedCount, unchangedCount, skippedCount, deletedCount, diff, folderScope };
+}
+/** Thrown by scanImportDiffFromBuffer when an unscoped replace is refused (GH #695 phase 4). */
+class ImportScopeRefusedError extends Error {
 }
 async function readJsonBody(req) {
     const raw = (await readBody(req)).trim();
@@ -670,7 +686,10 @@ const exportWikiHttpSchema = z.object({
 const importWikiZipHttpSchema = z.object({
     zipPath: z.string().min(1),
     execute: z.boolean().optional(),
+    mode: z.enum(["additive", "replace"]).optional(),
     conflictStrategy: z.enum(["skip", "overwrite", "merge"]).optional(),
+    folder: z.string().optional(),
+    confirmWholeWiki: z.boolean().optional(),
     includeSystem: z.boolean().optional(),
     logTiming: z.boolean().optional(),
 });
@@ -3386,6 +3405,17 @@ export async function startHttpServer(drive, port) {
                     return;
                 }
                 const effectiveConflictStrategy = mode === "replace" ? "overwrite" : conflictStrategy;
+                // GH #695 phase 4 / GH #738: `folder` scopes mode=replace deletion the same
+                // way the import_wiki tool does. Explicit query param wins; otherwise the
+                // scan derives it from the uploaded archive's own export-index.json — this
+                // is how a manifest-driven push supplies scope without a hand-typed flag.
+                const folder = parsedUrl.searchParams.get("folder")?.trim() || undefined;
+                const confirmWholeWikiRaw = parsedUrl.searchParams.get("confirmWholeWiki");
+                const confirmWholeWiki = confirmWholeWikiRaw ? confirmWholeWikiRaw.toLowerCase() === "true" : false;
+                if (confirmWholeWikiRaw && confirmWholeWikiRaw.toLowerCase() !== "true" && confirmWholeWikiRaw.toLowerCase() !== "false") {
+                    json(req, res, 400, { ok: false, error: "Invalid confirmWholeWiki query param; expected true or false" });
+                    return;
+                }
                 const zipBuffer = await readBodyBuffer(req, MAX_IMPORT_ZIP_UPLOAD_BYTES);
                 const startedAt = new Date().toISOString();
                 const startMs = Date.now();
@@ -3406,6 +3436,8 @@ export async function startHttpServer(drive, port) {
                                 conflictStrategy: effectiveConflictStrategy,
                                 includeSystem,
                                 mode: mode,
+                                folder,
+                                confirmWholeWiki,
                                 onProgress: (processed, total) => {
                                     asyncJobRegistry.update(job.id, { progress: { processed, total, phase: "scanning" } });
                                 },
@@ -3458,6 +3490,8 @@ export async function startHttpServer(drive, port) {
                             conflictStrategy: effectiveConflictStrategy,
                             includeSystem,
                             mode: mode,
+                            folder,
+                            confirmWholeWiki,
                             onProgress: (processed, total) => {
                                 asyncJobRegistry.update(job.id, { progress: { processed, total, phase: "scanning" } });
                             },