@way_marks/server 3.0.0 → 4.0.1

package/dist/api/server.js

@@ -60,6 +60,42 @@ function getRegistryProjects() {
         return [];
     }
 }
+function readRegistry() {
+    if (!fs.existsSync(registryPath))
+        return { projects: {}, releasedPorts: [] };
+    try {
+        const r = JSON.parse(fs.readFileSync(registryPath, 'utf8'));
+        return { projects: r.projects || {}, releasedPorts: r.releasedPorts || [], lastUpdated: r.lastUpdated };
+    }
+    catch {
+        return { projects: {}, releasedPorts: [] };
+    }
+}
+function writeRegistry(reg) {
+    reg.lastUpdated = new Date().toISOString();
+    fs.writeFileSync(registryPath, JSON.stringify({ version: 1, ...reg }, null, 2) + '\n');
+}
+function mutateRegistryEntry(id, mutator) {
+    const reg = readRegistry();
+    const entry = reg.projects[id];
+    if (!entry)
+        return null;
+    mutator(entry);
+    reg.projects[id] = entry;
+    writeRegistry(reg);
+    return entry;
+}
+function tryKill(pid) {
+    if (!pid)
+        return false;
+    try {
+        process.kill(pid, 'SIGTERM');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 // Phase 4: Garbage collection for registry
 function garbageCollectRegistryFile() {
     try {
@@ -94,9 +130,26 @@ function garbageCollectRegistryFile() {
     }
 }
 const app = (0, express_1.default)();
-const PORT = parseInt(process.env.WAYMARK_PORT || '3001', 10);
+// Fallback only — `waymark start` always passes WAYMARK_PORT explicitly.
+// 47000 is the new default range (47000-47999); 3001 was the legacy default.
+const PORT = parseInt(process.env.WAYMARK_PORT || '47000', 10);
 app.use(express_1.default.json());
 app.use(express_1.default.urlencoded({ extended: true }));
+// Same-machine peer CORS for the Hub view: another Waymark dashboard on a
+// different localhost port may probe this server's /api/* (e.g. /api/stats,
+// /api/hub/*). Allow it without opening up arbitrary remote origins.
+app.use((req, res, next) => {
+    const origin = req.headers.origin;
+    if (typeof origin === 'string' && /^http:\/\/(localhost|127\.0\.0\.1):\d+$/.test(origin)) {
+        res.setHeader('Access-Control-Allow-Origin', origin);
+        res.setHeader('Vary', 'Origin');
+        res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,DELETE,OPTIONS');
+        res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+        if (req.method === 'OPTIONS')
+            return res.sendStatus(204);
+    }
+    next();
+});
 // Serve UI — path works for both ts-node (src/api/) and compiled (dist/api/).
 const UI_DIR = path.resolve(__dirname, '../../src/ui-dist');
 const UI_INDEX = path.join(UI_DIR, 'index.html');
@@ -447,15 +500,22 @@ app.get('/api/config', (req, res) => {
         res.status(500).json({ error: err.message });
     }
 });
-// GET /api/project — returns project metadata from .waymark/config.json
-app.get('/api/project', (req, res) => {
+// GET /api/project — returns live project metadata for the running server.
+// Source of truth: .waymark/config.json (written by `waymark start`).
+// Falls back to env-only state when running stand-alone (no .waymark/ yet).
+app.get('/api/project', (_req, res) => {
     try {
-        const configPath = path.join(process.env.WAYMARK_PROJECT_ROOT || process.cwd(), '.waymark', 'config.json');
+        const projectRoot = process.env.WAYMARK_PROJECT_ROOT || process.cwd();
+        const configPath = path.join(projectRoot, '.waymark', 'config.json');
         if (!fs.existsSync(configPath)) {
-            return res.json({ projectName: null, port: PORT });
+            return res.json({ projectName: null, port: PORT, projectRoot });
         }
         const cfg = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-        res.json({ projectName: cfg.projectName || null, port: cfg.port || PORT });
+        res.json({
+            projectName: cfg.projectName || null,
+            port: cfg.port || PORT,
+            projectRoot: cfg.projectRoot || projectRoot,
+        });
     }
     catch (err) {
         res.status(500).json({ error: err.message });
@@ -482,6 +542,86 @@ app.post('/api/registry/cleanup', (req, res) => {
     }
 });
 // ============================================================================
+// Hub: cross-project mutations driven from any peer's dashboard.
+// All write to ~/.waymark/registry.json the same way the CLI does.
+// ============================================================================
+// POST /api/hub/projects/:id/pause — flip status to paused (port retained)
+app.post('/api/hub/projects/:id/pause', (req, res) => {
+    try {
+        const { id } = req.params;
+        const updated = mutateRegistryEntry(id, (e) => {
+            e.status = 'paused';
+            e.pausedAt = new Date().toISOString();
+        });
+        if (!updated)
+            return res.status(404).json({ error: `Project not found: ${id}` });
+        res.json({ success: true, project: updated });
+    }
+    catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
+// POST /api/hub/projects/:id/resume — flip status back to running
+app.post('/api/hub/projects/:id/resume', (req, res) => {
+    try {
+        const { id } = req.params;
+        const updated = mutateRegistryEntry(id, (e) => {
+            e.status = 'running';
+            delete e.pausedAt;
+        });
+        if (!updated)
+            return res.status(404).json({ error: `Project not found: ${id}` });
+        res.json({ success: true, project: updated });
+    }
+    catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
+// POST /api/hub/projects/:id/stop — SIGTERM the peer's mcp+api, mark stopped,
+// release the port for reuse. Mirrors `waymark stop` behaviour without needing
+// the user to cd into the other project.
+app.post('/api/hub/projects/:id/stop', (req, res) => {
+    try {
+        const { id } = req.params;
+        const reg = readRegistry();
+        const entry = reg.projects[id];
+        if (!entry)
+            return res.status(404).json({ error: `Project not found: ${id}` });
+        const killedApi = tryKill(entry.api_pid);
+        const killedMcp = tryKill(entry.mcp_pid);
+        entry.status = 'stopped';
+        entry.stoppedAt = new Date().toISOString();
+        reg.projects[id] = entry;
+        // Release port for reuse (mirrors registry.releasePort behaviour).
+        if (entry.port && Array.isArray(reg.releasedPorts)) {
+            reg.releasedPorts.push(entry.port);
+        }
+        else {
+            reg.releasedPorts = [entry.port];
+        }
+        writeRegistry(reg);
+        res.json({
+            success: true,
+            project: entry,
+            killed: { api: killedApi, mcp: killedMcp },
+            message: killedApi || killedMcp ? `Stopped ${id}.` : `${id} was not running (registry cleaned).`,
+        });
+    }
+    catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
+// POST /api/hub/gc — alias of /api/registry/cleanup; convenient from the Hub UI.
+app.post('/api/hub/gc', (_req, res) => {
+    try {
+        const removed = garbageCollectRegistryFile();
+        res.json({ success: true, removed, message: `Garbage collected ${removed} stale entries` });
+    }
+    catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
+// ============================================================================
 // PHASE 2: Team Approval Routing Endpoints
 // ============================================================================
 // GET /api/team/members — list all team members

package/package.json

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