@stage-labs/metro 0.1.0-beta.33 → 0.1.0-beta.34

package/dist/control.js

@@ -3,6 +3,12 @@ import { existsSync, mkdirSync, openSync, readdirSync, readFileSync, rmSync, wri
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 const STATE = () => join(homedir(), '.metro');
+export function serveStateDir() {
+    const xdg = process.env.XDG_CACHE_HOME?.trim();
+    const base = xdg === undefined || xdg === '' ? join(homedir(), '.cache') : xdg;
+    return join(base, 'metro', 'serve');
+}
+const serveLockPath = () => join(serveStateDir(), '.tail-lock');
 const pidPath = (agentId) => join(STATE(), `run-${agentId}.pid`);
 export const logPath = (agentId) => join(STATE(), 'logs', `${agentId}.log`);
 function ensureStateDirs() {
@@ -83,10 +89,10 @@ function commandOf(pid) {
     }
 }
 const looksLikeMetro = (command) => command.includes('server.ts') || command.includes('metro');
-export function lockedBy() {
+function holderOf(lockFile) {
     let pid;
     try {
-        pid = Number(readFileSync(lockPath(), 'utf8').trim());
+        pid = Number(readFileSync(lockFile, 'utf8').trim());
     }
     catch {
         return null;
@@ -95,6 +101,8 @@ export function lockedBy() {
         return null;
     return looksLikeMetro(commandOf(pid)) ? pid : null;
 }
+export const lockedBy = () => holderOf(lockPath());
+export const serveLockedBy = () => holderOf(serveLockPath());
 function trackedAgents(agentId) {
     const tracked = new Set();
     if (agentId !== undefined)
@@ -125,10 +133,17 @@ export async function stopAll(agentId, waitMs = 10_000) {
     }
     const holder = lockedBy();
     if (holder !== null && !seen.has(holder)) {
+        seen.add(holder);
         await stopPid(holder, waitMs);
         rmSync(lockPath(), { force: true });
         stopped.push({ pid: holder, via: 'the machine lock' });
     }
+    const served = serveLockedBy();
+    if (served !== null && !seen.has(served)) {
+        await stopPid(served, waitMs);
+        rmSync(serveLockPath(), { force: true });
+        stopped.push({ pid: served, via: 'metro serve' });
+    }
     return stopped;
 }
 export function tail(agentId, follow) {

package/dist/serve.js

@@ -1,6 +1,6 @@
 import { spawnSync } from 'node:child_process';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { serveLockedBy, serveStateDir } from './control.js';
 import { findBun, localPort, runtimeDir, SERVER_ENTRY, spawnPlan, } from './runtime.js';
 const SCRUBBED = new Set(['METRO_RUN_TOKEN', 'METRO_AGENT', 'DATABASE_URL']);
 const PORT_FLAG = /^--port=(.*)$/;
@@ -38,13 +38,13 @@ export function findCloudflared() {
     const found = spawnSync('cloudflared', ['--version'], { stdio: 'ignore' });
     if (found.error !== undefined || found.status !== 0)
         throw new Error('metro serve --tunnel needs cloudflared, which is not on PATH.\n' +
-            'Install it with:  brew install cloudflared  (macOS), or from\n' +
-            'https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/downloads/');
-}
-export function serveStateDir() {
-    const xdg = process.env.XDG_CACHE_HOME?.trim();
-    const base = xdg === undefined || xdg === '' ? join(homedir(), '.cache') : xdg;
-    return join(base, 'metro', 'serve');
+            'Debian/Ubuntu (it is not in the distro repos; this adds Cloudflare\'s signed one):\n' +
+            '  sudo mkdir -p --mode=0755 /usr/share/keyrings\n' +
+            '  curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | sudo tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null\n' +
+            "  echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared any main' | sudo tee /etc/apt/sources.list.d/cloudflared.list\n" +
+            '  sudo apt-get update && sudo apt-get install cloudflared\n' +
+            'macOS:  brew install cloudflared\n' +
+            'Others: https://pkg.cloudflare.com/');
 }
 export function servePlan(opts) {
     const env = Object.fromEntries(Object.entries(process.env).filter(([key]) => !SCRUBBED.has(key)));
@@ -65,6 +65,10 @@ export function servePlan(opts) {
 }
 export function serve(argv) {
     const { port, tunnel } = parseServeArgs(argv);
+    const running = serveLockedBy();
+    if (running !== null)
+        throw new Error(`a metro serve daemon is already running on this machine (pid ${String(running)}). ` +
+            'Stop it first: metro stop');
     if (tunnel)
         findCloudflared();
     const plan = servePlan({ dir: runtimeDir(), port, tunnel });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.33",
+  "version": "0.1.0-beta.34",
   "description": "The metro command line. Sign in once per machine, then hand your MCP connector list to Claude Code without the credentials touching disk, argv or shell history.",
   "license": "MIT",
   "repository": {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.33"
+  "version": "0.1.0-beta.34"
 }