@stage-labs/metro 0.1.0-beta.77 → 0.1.0-beta.79

package/dist/cli.js

@@ -6,7 +6,7 @@ import { launchClaude } from './claude.js';
 import { installPlugin } from './plugin.js';
 import { update } from './update.js';
 import { serve } from './serve.js';
-import { service } from './service.js';
+import { service, serviceStopHint } from './service.js';
 import { currentVersion } from './version.js';
 const USAGE = `metro — run your agent on this machine
 
@@ -58,6 +58,9 @@ async function stopDaemon() {
     }
     for (const d of stopped)
         process.stderr.write(`Stopped metro (pid ${String(d.pid)}, via ${d.via})\n`);
+    const hint = serviceStopHint();
+    if (hint !== null)
+        process.stderr.write(`${hint}\n`);
     return 0;
 }
 const HELP = new Set([undefined, 'help', '--help', '-h']);

package/dist/runtime-install.js

@@ -1,9 +1,9 @@
 import { spawnSync } from 'node:child_process';
-import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { copyFileSync, cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { localStations } from './local.js';
-import { SERVER_ENTRY, findBun, runtimeDir } from './runtime.js';
+import { STORE_ENTRY, daemonEntry, findBun, runtimeDir } from './runtime.js';
 export const MANIFEST_FILE = 'stations.json';
 const METRO_SOURCES = join('node_modules', '@metro-labs');
 const INSTALL_TIMEOUT_MS = 15 * 60_000;
@@ -41,6 +41,9 @@ function readOrNull(path) {
     }
 }
 function syncSources(sources, store) {
+    const shim = join(sources, STORE_ENTRY);
+    if (existsSync(shim))
+        copyFileSync(shim, join(store, STORE_ENTRY));
     const stamp = readOrNull(join(sources, 'runtime.json'));
     if (stamp !== null && readOrNull(join(store, 'runtime.json')) === stamp)
         return false;
@@ -71,7 +74,7 @@ export function prepareRuntime(opts = {}) {
     const sources = opts.sources ?? runtimeDir();
     const manifestPath = join(sources, MANIFEST_FILE);
     if (!existsSync(manifestPath))
-        return { dir: sources, entry: join(sources, SERVER_ENTRY), trains: join(sources, 'trains'), manifest: null };
+        return { dir: sources, entry: daemonEntry(sources), trains: join(sources, 'trains'), manifest: null };
     const store = opts.store ?? runtimeStore();
     const log = opts.log ??
         ((line) => {
@@ -80,5 +83,5 @@ export function prepareRuntime(opts = {}) {
     mkdirSync(join(store, 'trains'), { recursive: true });
     syncSources(sources, store);
     installDependencies(store, dependenciesFor(readManifest(manifestPath), localStations(opts.agents)), opts.bun ?? findBun(), log);
-    return { dir: store, entry: join(store, SERVER_ENTRY), trains: join(store, 'trains'), manifest: manifestPath };
+    return { dir: store, entry: daemonEntry(store), trains: join(store, 'trains'), manifest: manifestPath };
 }

package/dist/runtime.js

@@ -3,7 +3,11 @@ import { existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const AGENT_RE = /^[A-Za-z0-9][A-Za-z0-9_-]{10}$/;
-export const SERVER_ENTRY = join('node_modules', '@metro-labs', 'daemon', 'src', 'server.ts');
+export const STORE_ENTRY = 'server.ts';
+export const PACKAGE_ENTRY = join('node_modules', '@metro-labs', 'daemon', 'src', 'server.ts');
+export const daemonEntry = (dir) => existsSync(join(dir, STORE_ENTRY))
+    ? join(dir, STORE_ENTRY)
+    : join(dir, PACKAGE_ENTRY);
 export class MissingRuntime extends Error {
 }
 export function runtimeDir() {
@@ -11,7 +15,7 @@ export function runtimeDir() {
     const dir = explicit !== undefined && explicit !== ''
         ? explicit
         : join(dirname(dirname(fileURLToPath(import.meta.url))), 'runtime');
-    if (!existsSync(join(dir, SERVER_ENTRY)))
+    if (!existsSync(daemonEntry(dir)))
         throw new MissingRuntime(`no metro daemon at ${dir}. Reinstall with: npm i -g @stage-labs/metro@beta`);
     return dir;
 }

package/dist/serve.js

@@ -4,7 +4,7 @@ import { join } from 'node:path';
 import { agentsDir } from './local.js';
 import { currentVersion } from './version.js';
 import { serveLockedBy, serveStateDir } from './control.js';
-import { findBun, localPort, SERVER_ENTRY, spawnPlan } from './runtime.js';
+import { findBun, localPort, spawnPlan } from './runtime.js';
 import { prepareRuntime } from './runtime-install.js';
 import { ensureNodeName } from './node-name.js';
 import { holdUntilStart } from './hold.js';
@@ -113,7 +113,7 @@ export function servePlan(opts) {
     const env = Object.fromEntries(Object.entries(process.env).filter(([key]) => !SCRUBBED.has(key)));
     return {
         command: findBun(),
-        args: [SERVER_ENTRY],
+        args: [opts.runtime.entry],
         cwd: opts.runtime.dir,
         env: {
             ...env,

package/dist/service.js

@@ -127,11 +127,15 @@ export function servicePlan(host, serveArgs) {
 }
 function install(serveArgs, deps) {
     const { owner } = parseServeArgs(serveArgs);
+    const plan = servicePlan(deps.host, serveArgs);
+    if (deps.exists(plan.file)) {
+        deps.out(`metro is already installed as a ${plan.kind} service (${plan.file}) and restarts on its own; metro service status says whether it is running. To change its arguments: metro service uninstall, then install again`);
+        return 0;
+    }
     deps.preflight(owner);
     const pid = deps.running();
     if (pid !== null)
         throw new Error(`a metro serve is running on this machine (pid ${String(pid)}). Stop it first (metro stop), then install: the service takes over from there`);
-    const plan = servicePlan(deps.host, serveArgs);
     for (const dir of plan.dirs)
         deps.mkdir(dir);
     deps.write(plan.file, plan.content);
@@ -168,18 +172,32 @@ function status(deps) {
         : `installed as a ${plan.kind} service (${plan.file}), not running`);
     return active ? 0 : 1;
 }
-function realDeps() {
+function realHost() {
     const who = userInfo();
     return {
-        host: {
-            platform: platform(),
-            uid: who.uid,
-            user: who.username,
-            home: homedir(),
-            node: process.execPath,
-            cli: resolve(process.argv[1] ?? ''),
-            env: process.env,
-        },
+        platform: platform(),
+        uid: who.uid,
+        user: who.username,
+        home: homedir(),
+        node: process.execPath,
+        cli: resolve(process.argv[1] ?? ''),
+        env: process.env,
+    };
+}
+export function serviceStopHint(host = realHost(), exists = existsSync) {
+    if (host.platform !== 'linux' && host.platform !== 'darwin')
+        return null;
+    const plan = servicePlan(host, []);
+    if (!exists(plan.file))
+        return null;
+    const keep = plan.kind === 'systemd'
+        ? `systemctl ${host.uid === 0 ? '' : '--user '}stop ${SERVICE}`
+        : `launchctl bootout gui/${String(host.uid)}/${LABEL}`;
+    return `metro runs as a ${plan.kind} service here (${plan.file}), so it starts again on its own in a moment. To keep it stopped:  ${keep}`;
+}
+function realDeps() {
+    return {
+        host: realHost(),
         run: (command) => {
             const [bin = '', ...args] = command.args;
             const result = spawnSync(bin, args, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.77",
+  "version": "0.1.0-beta.79",
   "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/node_modules/@metro-labs/daemon/src/net/tunnel.ts

@@ -12,6 +12,8 @@ import { localOwner } from '../agents/file-admin.js';
 const RESTART_DELAY_MS = 2_000;
 const RESTART_DELAY_MAX_MS = 30_000;
 const TAKEN_RE = /listener already exists/i;
+const ADOPTED_MISSES = 2;
+const adoptedCheckMs = (): number => Number(process.env.METRO_TUNNEL_WATCH_MS) || 30_000;
 const FUNNEL_ON_RE = /\(Funnel on\)/i;
 
 export const tunnelWanted = (): boolean => process.env.METRO_TUNNEL?.trim() === 'tailscale';
@@ -25,6 +27,7 @@ export const funnelUrlIn = (text: string): string | null =>
 export interface Adopted {
   url: string | null;
   hint: string;
+  alive?: () => Promise<boolean>;
 }
 
 export interface TunnelDriver {
@@ -106,11 +109,17 @@ export function nodeNameIn(statusJson: string): string | null {
 
 async function adoptFunnel(bin: string, port: number, probe: Probe, owner: () => string | null): Promise<Adopted> {
   const name = nodeNameIn(await runText(bin, ['status', '--json']));
+  const watched = (url: string): Adopted => ({
+    url,
+    hint: `a Funnel already publishes this daemon at ${url}; using it`,
+    alive: () => probe(url, owner()),
+  });
   if (name !== null) {
     const url = `https://${name}`;
-    if (await probe(url, owner())) return { url, hint: `a Funnel already publishes this daemon at ${url}; using it` };
+    if (await probe(url, owner())) return watched(url);
   }
-  return funnelAlreadyServing(await runText(bin, ['funnel', 'status']), port);
+  const found = funnelAlreadyServing(await runText(bin, ['funnel', 'status']), port);
+  return found.url === null ? found : watched(found.url);
 }
 
 export function funnelAlreadyServing(status: string, port: number): Adopted {
@@ -240,6 +249,7 @@ export class Tunnel {
   private closed = false;
   private output: string[] = [];
   private restartDelay = RESTART_DELAY_MS;
+  private watch: ReturnType<typeof setInterval> | null = null;
 
   constructor(
     private driver: TunnelDriver,
@@ -330,6 +340,7 @@ export class Tunnel {
       if (found.url !== null) {
         log.info({ url: found.url }, `${this.driver.name}: ${found.hint}`);
         this.noticeUrl(found.url);
+        if (found.alive !== undefined) this.watchAdopted(found.url, found.alive);
         return;
       }
       log.error({ output }, `${this.driver.name}: ${found.hint}`);
@@ -340,8 +351,38 @@ export class Tunnel {
     this.restartDelay = Math.min(this.restartDelay * 2, RESTART_DELAY_MAX_MS);
   }
 
+  private watchAdopted(url: string, alive: () => Promise<boolean>): void {
+    let misses = 0;
+    const tick = async (): Promise<void> => {
+      if (this.closed || liveUrl !== url) {
+        this.unwatch();
+        return;
+      }
+      misses = (await alive()) ? 0 : misses + 1;
+      if (misses < ADOPTED_MISSES) return;
+      this.unwatch();
+      log.warn({ url }, `${this.driver.name}: the Funnel this daemon adopted no longer answers; publishing our own`);
+      liveUrl = null;
+      this.restartDelay = RESTART_DELAY_MS;
+      this.start();
+    };
+    this.unwatch();
+    this.watch = setInterval(() => {
+      tick().catch((err: unknown) => {
+        log.warn({ err: errMsg(err) }, `${this.driver.name}: adopted-funnel check failed`);
+      });
+    }, adoptedCheckMs());
+    this.watch.unref();
+  }
+
+  private unwatch(): void {
+    if (this.watch !== null) clearInterval(this.watch);
+    this.watch = null;
+  }
+
   stop(): void {
     this.closed = true;
+    this.unwatch();
     this.child?.kill('SIGINT');
     this.child = null;
   }

package/runtime/node_modules/@metro-labs/daemon/src/stations/attach-resolve.ts

@@ -12,6 +12,7 @@ import {
   writeInlineTemp,
 } from './attach-inline.js';
 import { realpathSync } from 'node:fs';
+import { log } from '@metro-labs/core/log';
 import { readUpload, UPLOAD_TTL_MS } from '../files/upload-store.js';
 import type { CanonicalAttachment } from '@metro-labs/core/stations/types';
 
@@ -167,6 +168,7 @@ async function resolveAttachment(
         .map((s) => `\`${s}\``)
         .join(', ')}); pass exactly one of \`upload\`, \`data\`, \`url\` or \`path\``,
     );
+  log.info({ source: sources[0] }, 'send: attachment source');
   if (a.upload) return fromUpload(a, a.upload, opts.allowed);
   if (a.data) return fromData(a, a.data, budget);
   if (a.path) return fromPath(a, a.path);

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.77"
+  "version": "0.1.0-beta.79"
 }

package/runtime/server.ts

@@ -0,0 +1 @@
+import './node_modules/@metro-labs/daemon/src/server.ts';