sdtk-wiki-kit 0.1.3 → 0.1.4

package/src/lib/wiki-paths.js

@@ -15,6 +15,8 @@ const WIKI_PROVENANCE_SOURCES_RELATIVE = path.join(".sdtk", "wiki", "provenance"
 const WIKI_QUERIES_RELATIVE = path.join(".sdtk", "wiki", "queries");
 const WIKI_REPORTS_RELATIVE = path.join(".sdtk", "wiki", "reports");
 const WIKI_LOGS_RELATIVE = path.join(".sdtk", "wiki", "logs");
+const CANONICAL_WIKI_RELATIVE = "wiki";
+const LEGACY_PERSONAL_BRAIN_RELATIVE = path.join(".sdtk", "wiki", "personal-brain");
 const LEGACY_ATLAS_RELATIVE = path.join(".sdtk", "atlas");
 
 function resolveProjectPath(projectPath) {
@@ -51,6 +53,43 @@ function getWikiWorkspacePath(projectPath) {
   return path.join(resolveProjectPath(projectPath), WIKI_WORKSPACE_RELATIVE);
 }
 
+function getCanonicalWikiPath(projectPath) {
+  return path.join(resolveProjectPath(projectPath), CANONICAL_WIKI_RELATIVE);
+}
+
+function getLegacyPersonalBrainPath(projectPath) {
+  return path.join(resolveProjectPath(projectPath), LEGACY_PERSONAL_BRAIN_RELATIVE);
+}
+
+function getPreferredWikiContentPath(projectPath) {
+  const canonical = getCanonicalWikiPath(projectPath);
+  const legacy = getLegacyPersonalBrainPath(projectPath);
+  try {
+    const fs = require("fs");
+    if (fs.existsSync(canonical) && fs.statSync(canonical).isDirectory()) {
+      return {
+        path: canonical,
+        mode: "canonical_project_wiki",
+        relative: CANONICAL_WIKI_RELATIVE,
+      };
+    }
+    if (fs.existsSync(legacy) && fs.statSync(legacy).isDirectory()) {
+      return {
+        path: legacy,
+        mode: "legacy_personal_brain_fallback",
+        relative: LEGACY_PERSONAL_BRAIN_RELATIVE,
+      };
+    }
+  } catch (_) {
+    // Callers perform their own existence validation and error reporting.
+  }
+  return {
+    path: canonical,
+    mode: "canonical_project_wiki",
+    relative: CANONICAL_WIKI_RELATIVE,
+  };
+}
+
 function getWikiGraphPath(projectPath) {
   return path.join(resolveProjectPath(projectPath), WIKI_GRAPH_RELATIVE);
 }
@@ -111,9 +150,19 @@ function assertWikiWorkspaceWritePath(targetPath, projectPath) {
   );
 }
 
+function assertCanonicalWikiWritePath(targetPath, projectPath) {
+  return assertPathInsideOrEqual(
+    targetPath,
+    getCanonicalWikiPath(projectPath),
+    "Refusing to write outside project-local wiki output"
+  );
+}
+
 function describeWikiPaths(projectPath) {
   return {
     projectPath: resolveProjectPath(projectPath),
+    canonicalWikiPath: getCanonicalWikiPath(projectPath),
+    legacyPersonalBrainPath: getLegacyPersonalBrainPath(projectPath),
     wikiWorkspacePath: getWikiWorkspacePath(projectPath),
     wikiGraphPath: getWikiGraphPath(projectPath),
     wikiManifestPath: getWikiManifestPath(projectPath),
@@ -132,7 +181,9 @@ function describeWikiPaths(projectPath) {
 }
 
 module.exports = {
+  CANONICAL_WIKI_RELATIVE,
   LEGACY_ATLAS_RELATIVE,
+  LEGACY_PERSONAL_BRAIN_RELATIVE,
   WIKI_GRAPH_RELATIVE,
   WIKI_LOGS_RELATIVE,
   WIKI_MANIFEST_RELATIVE,
@@ -147,9 +198,13 @@ module.exports = {
   WIKI_REPORTS_RELATIVE,
   WIKI_WORKSPACE_RELATIVE,
   assertPathInsideOrEqual,
+  assertCanonicalWikiWritePath,
   assertWikiWorkspaceWritePath,
   describeWikiPaths,
+  getCanonicalWikiPath,
+  getLegacyPersonalBrainPath,
   getLegacyAtlasPath,
+  getPreferredWikiContentPath,
   getWikiGraphPath,
   getWikiLogsPath,
   getWikiManifestPath,

package/src/lib/wiki-search.js

@@ -4,13 +4,14 @@ const fs = require("fs");
 const path = require("path");
 const { ValidationError } = require("./errors");
 const {
-  getWikiWorkspacePath,
+  getPreferredWikiContentPath,
   isPathInsideOrEqual,
   resolveProjectPath,
 } = require("./wiki-paths");
 
 const DEFAULT_LIMIT = 10;
-const PERSONAL_BRAIN_RELATIVE = path.join(".sdtk", "wiki", "personal-brain");
+const CANONICAL_WIKI_RELATIVE = "wiki";
+const LEGACY_PERSONAL_BRAIN_RELATIVE = path.join(".sdtk", "wiki", "personal-brain");
 
 function toPosix(value) {
   return String(value || "").replace(/\\/g, "/");
@@ -120,18 +121,19 @@ function runWikiSearch({ projectPath, query, limit = DEFAULT_LIMIT }) {
 
   const parsedLimit = Number.parseInt(limit, 10);
   const safeLimit = Number.isFinite(parsedLimit) && parsedLimit > 0 ? Math.min(parsedLimit, 50) : DEFAULT_LIMIT;
-  const personalBrainPath = path.join(getWikiWorkspacePath(resolvedProjectPath), "personal-brain");
-  if (!isPathInsideOrEqual(personalBrainPath, resolvedProjectPath)) {
+  const contentRoot = getPreferredWikiContentPath(resolvedProjectPath);
+  const wikiContentPath = contentRoot.path;
+  if (!isPathInsideOrEqual(wikiContentPath, resolvedProjectPath)) {
     throw new ValidationError("Refusing to search outside the project root.");
   }
-  if (!fs.existsSync(personalBrainPath) || !fs.statSync(personalBrainPath).isDirectory()) {
+  if (!fs.existsSync(wikiContentPath) || !fs.statSync(wikiContentPath).isDirectory()) {
     throw new ValidationError(
-      `No SDTK-WIKI personal brain found at ${personalBrainPath}. Run "sdtk-wiki ingest <source-root>" and "sdtk-wiki compile --mode safe --apply" first. Advanced users can still use wiki extract/compile sidecar commands.`
+      `No SDTK-WIKI local wiki found at ${wikiContentPath}. Run "sdtk-wiki ingest <source-root>" and "sdtk-wiki compile --mode safe --apply" first. Legacy .sdtk/wiki/personal-brain workspaces are still readable when present.`
     );
   }
 
   const tokens = tokenize(normalizedQuery);
-  const files = collectMarkdownFiles(personalBrainPath);
+  const files = collectMarkdownFiles(wikiContentPath);
   const matches = [];
 
   for (const filePath of files) {
@@ -157,19 +159,24 @@ function runWikiSearch({ projectPath, query, limit = DEFAULT_LIMIT }) {
   return {
     query: normalizedQuery,
     projectPath: resolvedProjectPath,
-    personalBrainPath,
+    wikiContentPath,
+    wikiContentMode: contentRoot.mode,
+    personalBrainPath: wikiContentPath,
     scannedFiles: files.length,
     matches: matches.slice(0, safeLimit),
     totalMatches: matches.length,
     limit: safeLimit,
-    searchMode: "local_deterministic_personal_brain_markdown",
+    searchMode: contentRoot.mode === "canonical_project_wiki"
+      ? "local_deterministic_project_wiki_markdown"
+      : "local_deterministic_legacy_personal_brain_markdown",
     premiumRequired: false,
     mutated: false,
   };
 }
 
 module.exports = {
-  PERSONAL_BRAIN_RELATIVE,
+  CANONICAL_WIKI_RELATIVE,
+  LEGACY_PERSONAL_BRAIN_RELATIVE,
   runWikiSearch,
   tokenize,
 };