@hanna84/mcp-writing 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -4,11 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.5.2](https://github.com/hannasdev/mcp-writing.git
+/compare/v1.5.1...v1.5.2)
+
+- fix: avoid nested scenes/projects paths on import [`#44`](https://github.com/hannasdev/mcp-writing.git
+/pull/44)
+
 #### [v1.5.1](https://github.com/hannasdev/mcp-writing.git
 /compare/v1.5.0...v1.5.1)
 
+> 19 April 2026
+
 - chore: switch license from MIT to AGPL v3 [`#43`](https://github.com/hannasdev/mcp-writing.git
 /pull/43)
+- Release 1.5.1 [`73b233f`](https://github.com/hannasdev/mcp-writing.git
+/commit/73b233f2f210d435386f1235aa15ebc3c945542b)
 
 #### [v1.5.0](https://github.com/hannasdev/mcp-writing.git
 /compare/v1.4.8...v1.5.0)

package/importer.js

@@ -129,6 +129,57 @@ function removeIfExists(filePath) {
   if (filePath && fs.existsSync(filePath)) fs.unlinkSync(filePath);
 }
 
+function resolveSyncRootFromPrefix(prefix, syncDirAbs) {
+  const parsedRoot = path.parse(syncDirAbs).root;
+
+  if (!prefix) {
+    return parsedRoot ? path.resolve(parsedRoot) : path.resolve(syncDirAbs);
+  }
+
+  // On Windows, a regex prefix like "C:" would resolve relative to cwd on drive C.
+  // Use the true drive root instead (e.g., "C:\\").
+  if (/^[a-zA-Z]:$/.test(prefix)) {
+    return parsedRoot || `${prefix}${path.sep}`;
+  }
+
+  return path.resolve(prefix);
+}
+
+function detectScopedSyncDir(syncDirAbs) {
+  const normalized = syncDirAbs.split(path.sep).join("/");
+
+  const universeMatch = normalized.match(/^(.*)\/universes\/([^/]+)\/([^/]+)(?:\/scenes)?$/);
+  if (universeMatch) {
+    const prefix = universeMatch[1];
+    const universeId = universeMatch[2];
+    const projectSlug = universeMatch[3];
+    const syncRoot = resolveSyncRootFromPrefix(prefix, syncDirAbs);
+    const projectRoot = path.join(syncRoot, "universes", universeId, projectSlug);
+    return {
+      projectId: `${universeId}/${projectSlug}`,
+      scope: "universe",
+      syncRoot,
+      projectRoot,
+    };
+  }
+
+  const projectMatch = normalized.match(/^(.*)\/projects\/([^/]+)(?:\/scenes)?$/);
+  if (projectMatch) {
+    const prefix = projectMatch[1];
+    const projectSlug = projectMatch[2];
+    const syncRoot = resolveSyncRootFromPrefix(prefix, syncDirAbs);
+    const projectRoot = path.join(syncRoot, "projects", projectSlug);
+    return {
+      projectId: projectSlug,
+      scope: "project",
+      syncRoot,
+      projectRoot,
+    };
+  }
+
+  return null;
+}
+
 export function importScrivenerSync({
   scrivenerDir,
   mcpSyncDir,
@@ -138,31 +189,48 @@ export function importScrivenerSync({
 }) {
   const scrivenerDirAbs = path.resolve(scrivenerDir);
   const mcpSyncDirAbs = path.resolve(mcpSyncDir);
+  const scopedSyncDir = detectScopedSyncDir(mcpSyncDirAbs);
+  const fallbackProjectId = path.basename(mcpSyncDirAbs).replace(/[^a-z0-9-]/gi, "-").toLowerCase();
   const resolvedProjectId = projectId
     ? projectId
-    : path.basename(mcpSyncDirAbs).replace(/[^a-z0-9-]/gi, "-").toLowerCase();
+    : scopedSyncDir?.projectId ?? fallbackProjectId;
 
   const projectIdCheck = validateProjectId(resolvedProjectId);
   if (!projectIdCheck.ok) {
     throw new Error(`Invalid project_id '${resolvedProjectId}': ${projectIdCheck.reason}`);
   }
 
+  if (scopedSyncDir && projectId && projectId !== scopedSyncDir.projectId) {
+    throw new Error(
+      `project_id '${projectId}' does not match WRITING_SYNC_DIR scope '${scopedSyncDir.projectId}'. `
+      + "Set WRITING_SYNC_DIR to the sync root or use the matching project_id."
+    );
+  }
+
   if (!fs.existsSync(scrivenerDirAbs)) {
     throw new Error(`Scrivener sync dir not found: ${scrivenerDirAbs}`);
   }
 
-  // Route universe/project IDs to universes/<universe>/<project>/scenes,
-  // matching the convention used by inferProjectAndUniverse in sync.js.
-  const segments = resolvedProjectId.split("/");
   let scenesDir;
   let scenesBoundaryRoot;
-  if (segments.length === 2) {
-    const [universeId, projectSlug] = segments;
-    scenesBoundaryRoot = path.join(mcpSyncDirAbs, "universes");
-    scenesDir = path.resolve(scenesBoundaryRoot, universeId, projectSlug, "scenes");
+  if (scopedSyncDir) {
+    scenesBoundaryRoot = path.join(
+      scopedSyncDir.syncRoot,
+      scopedSyncDir.scope === "universe" ? "universes" : "projects"
+    );
+    scenesDir = path.join(scopedSyncDir.projectRoot, "scenes");
   } else {
-    scenesBoundaryRoot = path.join(mcpSyncDirAbs, "projects");
-    scenesDir = path.resolve(scenesBoundaryRoot, resolvedProjectId, "scenes");
+    // Route universe/project IDs to universes/<universe>/<project>/scenes,
+    // matching the convention used by inferProjectAndUniverse in sync.js.
+    const segments = resolvedProjectId.split("/");
+    if (segments.length === 2) {
+      const [universeId, projectSlug] = segments;
+      scenesBoundaryRoot = path.join(mcpSyncDirAbs, "universes");
+      scenesDir = path.resolve(scenesBoundaryRoot, universeId, projectSlug, "scenes");
+    } else {
+      scenesBoundaryRoot = path.join(mcpSyncDirAbs, "projects");
+      scenesDir = path.resolve(scenesBoundaryRoot, resolvedProjectId, "scenes");
+    }
   }
 
   const relFromBoundary = path.relative(scenesBoundaryRoot, scenesDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanna84/mcp-writing",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "MCP service for AI-assisted reasoning and editing on long-form fiction projects",
   "type": "module",
   "main": "index.js",