@way_marks/server 4.4.7 → 4.5.0

package/dist/services/version.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setProjectRoot = setProjectRoot;
+exports.setCurrentVersionForTest = setCurrentVersionForTest;
 exports.resetState = resetState;
 exports.getVersionInfo = getVersionInfo;
 const fs = __importStar(require("fs"));
@@ -42,9 +43,14 @@ const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
 const NPM_TIMEOUT_MS = 5000; // 5 seconds
 const CACHE_FILE_NAME = 'version-cache.json';
 let projectRoot = process.env.WAYMARK_PROJECT_ROOT || process.cwd();
+let currentVersionOverride = null;
 function setProjectRoot(root) {
     projectRoot = root;
 }
+/** For testing only — override the version returned by getCurrentVersion(). */
+function setCurrentVersionForTest(version) {
+    currentVersionOverride = version;
+}
 function getCachePath() {
     return path.join(projectRoot, '.waymark', CACHE_FILE_NAME);
 }
@@ -137,25 +143,56 @@ async function fetchLatestVersionFromNpm() {
         return null;
     }
 }
+function isWaymarkPackageJson(packageJson) {
+    if (!packageJson.name)
+        return false;
+    return packageJson.name.includes('way_marks') || packageJson.name.includes('waymark');
+}
 function getCurrentVersion() {
-    try {
-        const cliPackageJsonPath = path.join(projectRoot, 'packages', 'cli', 'package.json');
-        if (!fs.existsSync(cliPackageJsonPath)) {
-            return '0.0.0';
-        }
-        const content = fs.readFileSync(cliPackageJsonPath, 'utf-8');
-        const packageJson = JSON.parse(content);
-        return packageJson.version || '0.0.0';
+    if (currentVersionOverride !== null) {
+        return currentVersionOverride;
     }
-    catch (error) {
-        return '0.0.0';
+    // Search these paths in order; accept the first file that (a) exists and
+    // (b) belongs to a waymark package (name contains "way_marks" or "waymark").
+    //
+    // Candidate 1 — compiled global/local npm install:
+    //   __dirname = .../node_modules/@way_marks/server/dist/services/
+    //   Two levels up → .../node_modules/@way_marks/server/package.json ✓
+    //
+    // Candidate 2 — ts-node inside monorepo (src/ not dist/):
+    //   __dirname = packages/server/src/services/
+    //   Three levels up → packages/server → no cli there
+    //   So explicitly check sibling packages/cli.
+    //
+    // Candidate 3 — monorepo dev with compiled output (dist/):
+    //   projectRoot = waymark checkout root → packages/cli/package.json ✓
+    const candidates = [
+        path.join(__dirname, '..', '..', 'package.json'), // compiled install
+        path.join(__dirname, '..', '..', '..', 'packages', 'cli', 'package.json'), // ts-node monorepo
+        path.join(projectRoot, 'packages', 'cli', 'package.json'), // monorepo dev
+    ];
+    for (const candidate of candidates) {
+        try {
+            if (!fs.existsSync(candidate))
+                continue;
+            const content = fs.readFileSync(candidate, 'utf-8');
+            const packageJson = JSON.parse(content);
+            if (packageJson.version && isWaymarkPackageJson(packageJson)) {
+                return packageJson.version;
+            }
+        }
+        catch {
+            // try next candidate
+        }
     }
+    return '0.0.0';
 }
 let lastFetchPromise = null;
 let lastFetchTime = 0;
 function resetState() {
     lastFetchPromise = null;
     lastFetchTime = 0;
+    currentVersionOverride = null;
 }
 async function getVersionInfo() {
     const currentVersion = getCurrentVersion();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@way_marks/server",
-  "version": "4.4.7",
+  "version": "4.5.0",
   "description": "Waymark MCP server and dashboard",
   "author": "Waymark <hello@waymarks.dev>",
   "license": "MIT",