@stage-labs/metro 0.1.0-beta.76 → 0.1.0-beta.78

package/dist/cli.js

@@ -3,11 +3,10 @@ import { mcpServers, whoisAuthorized } from './api.js';
 import { stopAll } from './control.js';
 import { tailEvents } from './tail.js';
 import { launchClaude } from './claude.js';
-import { bedrock } from './bedrock.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
 
@@ -34,7 +33,6 @@ const USAGE = `metro — run your agent on this machine
   metro plugin    set up the Claude Code plugin (connector servers + /metro:refresh)
   metro claude [args...]
                   open Claude Code with the metro channel; every argument is passed through
-  metro bedrock [args...]
                   the same, with inference on Amazon Bedrock through a local proxy so the
                   channel still works (needs AWS_BEARER_TOKEN_BEDROCK and AWS_REGION)
   metro update    update to the newest published version (--check only reports)
@@ -60,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']);
@@ -79,7 +80,6 @@ const COMMANDS = {
     },
     plugin: installPlugin,
     claude: () => launchClaude(process.argv.slice(3)),
-    bedrock: () => bedrock(process.argv.slice(3)),
     update: () => update(process.argv.slice(3)),
     version: async () => {
         process.stdout.write(`${currentVersion()}\n`);

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', 'mcp', '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,11 +113,10 @@ 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,
-            METRO_MODE: 'local',
             METRO_VERSION: currentVersion(),
             METRO_CLI_BIN: process.argv[1] ?? '',
             METRO_WEBHOOK_PORT: String(opts.port),

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.76",
+  "version": "0.1.0-beta.78",
   "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/core/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "@metro-labs/core",
+  "version": "0.1.0",
+  "private": true,
+  "description": "What every metro process shares: the logger, the event bus and its types, ids, secure file writes, the train protocol, station types and attachment handling. No HTTP, no policy.",
+  "type": "module",
+  "exports": {
+    "./log": "./src/log.ts",
+    "./events": "./src/events.ts",
+    "./identity": "./src/identity.ts",
+    "./is-record": "./src/is-record.ts",
+    "./secure-fs": "./src/secure-fs.ts",
+    "./version": "./src/version.ts",
+    "./train-error": "./src/train-error.ts",
+    "./trains/protocol": "./src/protocol.ts",
+    "./ids": "./src/ids.ts",
+    "./address": "./src/address.ts",
+    "./station-names": "./src/station-names.ts",
+    "./str": "./src/str.ts",
+    "./lines": "./src/lines.ts",
+    "./endpoints": "./src/endpoints.ts",
+    "./stations/types": "./src/stations/types.ts",
+    "./stations/station-runtime": "./src/stations/station-runtime.ts",
+    "./stations/account-store": "./src/stations/account-store.ts",
+    "./stations/attachments": "./src/stations/attachments.ts",
+    "./stations/messaging-normalize": "./src/stations/messaging-normalize.ts"
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "tsc --noEmit && METRO_STATE_DIR=\"$(mktemp -d /tmp/metro-test.XXXXXX)\" bun test test/"
+  },
+  "dependencies": {
+    "pino": "^9.5.0",
+    "pino-pretty": "^13.1.3"
+  },
+  "devDependencies": {
+    "@stage-labs/config": "0.1.0-beta.2",
+    "eslint": "^10.3.0",
+    "knip": "^6.15.0",
+    "madge": "^8.0.0",
+    "typescript": "^5"
+  }
+}

package/runtime/node_modules/@metro-labs/core/src/endpoints.ts

@@ -0,0 +1,7 @@
+export interface Endpoint {
+  id: string;
+  webhookId?: string;
+  label: string;
+  secret?: string;
+  createdAt: string;
+}

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → core/src}/events.ts

@@ -1,5 +1,5 @@
 import { randomBytes } from 'node:crypto';
-import { Line } from '../stations/lines.js';
+import { Line } from './lines.js';
 
 export { userSelf, daemonSelf } from './identity.js';
 

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → core/src}/identity.ts

@@ -1,4 +1,4 @@
-import { Line } from '../stations/lines.js';
+import { Line } from './lines.js';
 
 export const userSelf = (): Line =>
   (process.env.METRO_FROM ?? 'metro://user') as Line;

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → core/src}/protocol.ts

@@ -3,7 +3,7 @@ import { join, parse as parsePath } from 'node:path';
 import { errMsg, log } from './log.js';
 import { coerceErrorInfo, type TrainErrorInfo } from './train-error.js';
 import type { StructuredEvent } from './events.js';
-import type { CallMsg } from '../stations/station-runtime.js';
+import type { CallMsg } from './stations/station-runtime.js';
 
 export {
   TrainError,

package/runtime/node_modules/@metro-labs/{mcp → core}/src/stations/account-store.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { errMsg } from '../daemon/log.js';
-import { chmodIfExists } from '../daemon/secure-fs.js';
+import { errMsg } from '../log.js';
+import { chmodIfExists } from '../secure-fs.js';
 
 export type Die = (msg: string) => never;
 

package/runtime/node_modules/@metro-labs/{mcp → core}/src/stations/station-runtime.ts

@@ -1,4 +1,4 @@
-import { serializeTrainError, type TrainErrorInfo } from '../daemon/train-error.js';
+import { serializeTrainError, type TrainErrorInfo } from '../train-error.js';
 import type { Normalized } from './messaging-normalize.js';
 
 export const emit = (e: unknown): void =>

package/runtime/node_modules/@metro-labs/daemon/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "@metro-labs/daemon",
+  "version": "0.1.0-beta.15",
+  "private": true,
+  "description": "The metro daemon a user runs on their own machine with `metro serve`: the MCP server Claude Code connects to, the station subprocesses it supervises, the model gateway, and the signed-identity APIs the page at metro.box talks to.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bonustrack/metro.git"
+  },
+  "homepage": "https://github.com/bonustrack/metro#readme",
+  "bugs": "https://github.com/bonustrack/metro/issues",
+  "type": "module",
+  "engines": {
+    "node": ">=22"
+  },
+  "exports": {
+    ".": "./src/mcp/index.ts"
+  },
+  "scripts": {
+    "start": "bun src/server.ts",
+    "build": "tsc",
+    "test": "tsc --noEmit && DYLD_FALLBACK_LIBRARY_PATH=/usr/lib METRO_STATE_DIR=\"$(mktemp -d /tmp/metro-test.XXXXXX)\" bun test test/"
+  },
+  "dependencies": {
+    "@metro-labs/core": "workspace:*",
+    "@metro-labs/http": "workspace:*",
+    "@metro-labs/discord-bot": "workspace:*",
+    "@metro-labs/telegram": "workspace:*",
+    "@metro-labs/telegram-bot": "workspace:*",
+    "@metro-labs/webhook": "workspace:*",
+    "@metro-labs/whatsapp": "workspace:*",
+    "@metro-labs/xmtp": "workspace:*",
+    "@modelcontextprotocol/sdk": "^1.12.0",
+    "viem": "2.52.2",
+    "ws": "^8.18.0",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@stage-labs/config": "0.1.0-beta.2",
+    "@types/ws": "^8.18.0",
+    "eslint": "^10.3.0",
+    "knip": "^6.15.0",
+    "madge": "^8.0.0",
+    "typescript": "^5"
+  }
+}

package/runtime/node_modules/@metro-labs/{mcp/src/db → daemon/src/agents}/account-attach.ts

@@ -1,4 +1,4 @@
-import { STATIONS, type StationName } from './stations.js';
+import { STATIONS, type StationName } from '@metro-labs/core/station-names';
 
 const ACCOUNT_ID_RE = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
 

package/runtime/node_modules/@metro-labs/{mcp/src/daemon/account-api.ts → daemon/src/agents/accounts-api.ts}

@@ -1,19 +1,19 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { errMsg, log } from './log.js';
-import { ApiError } from './api-error.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { ApiError } from '@metro-labs/http/api-error';
 import {
   apiFailure,
   bodyField,
   readJsonBody,
   sendJson,
   type ApiSession,
-} from './api-http.js';
+} from '@metro-labs/http/api-http';
 import {
   isStationName,
   parseAccountId,
   type AccountRef,
-} from '../db/account-attach.js';
-import type { StationName } from '../db/stations.js';
+} from './account-attach.js';
+import type { StationName } from '@metro-labs/core/station-names';
 import {
   ATTACHABLE_STATIONS,
   isAttachStation,
@@ -30,7 +30,7 @@ import {
   ATTACH_ID_RE,
   type AttachOwner,
   type AttachView,
-} from './attach-session.js';
+} from '../stations/attach-session.js';
 
 export interface AttachSessionApi {
   start: (

package/runtime/node_modules/@metro-labs/{mcp/src/db/agent-admin.ts → daemon/src/agents/admin.ts}

@@ -1,6 +1,6 @@
 import { randomBytes } from 'node:crypto';
-import { ApiError } from '../daemon/api-error.js';
-import { AGENT_NAME_RE } from './ids.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { AGENT_NAME_RE } from '@metro-labs/core/ids';
 
 export class AgentAdminError extends ApiError {}
 

package/runtime/node_modules/@metro-labs/{mcp/src/daemon/agent-api.ts → daemon/src/agents/api.ts}

@@ -1,7 +1,7 @@
-import { webhookPort } from './tunnel.js';
+import { webhookPort } from '../net/tunnel.js';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { parseId } from '../db/ids.js';
-import { errMsg, log } from './log.js';
+import { parseId } from '@metro-labs/core/ids';
+import { errMsg, log } from '@metro-labs/core/log';
 import {
   apiFailure,
   apiSession,
@@ -10,7 +10,7 @@ import {
   readJsonBody,
   sendJson,
   type ApiSession,
-} from './api-http.js';
+} from '@metro-labs/http/api-http';
 import {
   accountRoute,
   accountRouteAllows,
@@ -18,13 +18,13 @@ import {
   handleAccountRoute,
   type AccountApiDeps,
   type AccountRoute,
-} from './account-api.js';
+} from './accounts-api.js';
 import {
   type AgentSummary,
   type CreatedAgent,
   type DeletedAgent,
   type ResetAgentKey,
-} from '../db/agent-admin.js';
+} from './admin.js';
 
 const PREFIX = '/api/agents';
 const SERVER_NAME = 'metro';

package/runtime/node_modules/@metro-labs/{mcp/src/daemon/bundle-api.ts → daemon/src/agents/bundle.ts}

@@ -1,11 +1,11 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { errMsg, log } from './log.js';
-import { apiFailure, apiSession, cors, readJsonBody, sendJson } from './api-http.js';
-import { ApiError } from './api-error.js';
-import { isRecord } from './is-record.js';
-import { parseId } from '../db/ids.js';
-import type { LoadedAccount, LoadedAgent, LoadedConnector } from '../db/materialize.js';
-import { STATIONS } from '../db/stations.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { apiFailure, apiSession, cors, readJsonBody, sendJson } from '@metro-labs/http/api-http';
+import { ApiError } from '@metro-labs/http/api-error';
+import { isRecord } from '@metro-labs/core/is-record';
+import { parseId } from '@metro-labs/core/ids';
+import type { LoadedAccount, LoadedAgent, LoadedConnector } from '../stations/materialize.js';
+import { STATIONS } from '@metro-labs/core/station-names';
 
 const AGENTS = '/api/agents';
 const RESTORE_PATH = `${AGENTS}/restore`;

package/runtime/node_modules/@metro-labs/{mcp/src/db → daemon/src/agents}/file-admin.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, rmdirSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
-import { ApiError } from '../daemon/api-error.js';
-import { ensureSecureDir, writeSecure } from '../daemon/secure-fs.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { ensureSecureDir, writeSecure } from '@metro-labs/core/secure-fs';
 import {
   AgentAdminError,
   newApiKey,
@@ -11,7 +11,7 @@ import {
   type DeletedAgent,
   type OwnedAgent,
   type ResetAgentKey,
-} from './agent-admin.js';
+} from './admin.js';
 import type { AccountRef } from './account-attach.js';
 import {
   AGENT_FILE,
@@ -21,12 +21,12 @@ import {
   parseAgentFile,
   readAgentFile,
   type AgentFile,
-} from './file-source.js';
-import { newId } from './ids.js';
-import { registerKey, rotateAgentKey, unregisterAgentKey } from './key-map.js';
-import { MOVABLE_STATIONS, type LoadedAgent } from './materialize.js';
-import type { StationName } from './stations.js';
-import { normalizeAddress } from './address.js';
+} from './files.js';
+import { newId } from '@metro-labs/core/ids';
+import { registerKey, rotateAgentKey, unregisterAgentKey } from './keys.js';
+import { MOVABLE_STATIONS, type LoadedAgent } from '../stations/materialize.js';
+import type { StationName } from '@metro-labs/core/station-names';
+import { normalizeAddress } from '@metro-labs/core/address';
 
 export const LOCAL_PROJECT_ID = 'localdaemon';
 const OWNER_FILE = '.owner';

package/runtime/node_modules/@metro-labs/{mcp/src/db/file-source.ts → daemon/src/agents/files.ts}

@@ -1,10 +1,10 @@
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { AGENT_NAME_RE, ID_RE } from './ids.js';
-import { STATIONS, type StationName } from './stations.js';
-import type { LoadedAccount, LoadedAgent, StationSource } from './materialize.js';
-import { isRecord } from '../daemon/is-record.js';
+import { AGENT_NAME_RE, ID_RE } from '@metro-labs/core/ids';
+import { STATIONS, type StationName } from '@metro-labs/core/station-names';
+import type { LoadedAccount, LoadedAgent, StationSource } from '../stations/materialize.js';
+import { isRecord } from '@metro-labs/core/is-record';
 
 export const AGENT_FILE = 'agent.json';
 

package/runtime/node_modules/@metro-labs/{mcp/src/db/key-map.ts → daemon/src/agents/keys.ts}

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { ID_RE } from './ids.js';
+import { ID_RE } from '@metro-labs/core/ids';
 
 const digest = (token: string): string =>
   createHash('sha256').update(token).digest('hex');

package/runtime/node_modules/@metro-labs/{mcp/src/db/agent-scope.ts → daemon/src/agents/scope.ts}

@@ -2,8 +2,8 @@ import {
   accountFromLine,
   agentIdForAccount,
   stationAgentIds,
-} from './agent-map.js';
-import { STATIONS } from './stations.js';
+} from './map.js';
+import { STATIONS } from '@metro-labs/core/station-names';
 
 const ACCOUNT_STATIONS = new Set<string>(STATIONS);
 

package/runtime/node_modules/@metro-labs/{mcp/src/daemon → daemon/src/boot}/boot.ts

@@ -1,31 +1,30 @@
 import { join } from 'node:path';
 import { type Server } from 'node:http';
-import { userSelf } from './events.js';
-import { setTrainCallBackend } from './train-call.js';
-import { errMsg, log, logFatalSync } from './log.js';
-import { acquireLock, isLocalMode, STATE_DIR, trainsDir } from './paths.js';
+import { userSelf } from '@metro-labs/core/events';
+import { setTrainCallBackend } from '../stations/train-call.js';
+import { errMsg, log, logFatalSync } from '@metro-labs/core/log';
+import { acquireLock, STATE_DIR, trainsDir } from './paths.js';
 import { installCrashGuard, markDaemonReady } from './crash-guard.js';
-import { METRO_VERSION } from './version.js';
-import { funnelDriver, Tunnel, tunnelWanted, webhookPort } from './tunnel.js';
+import { METRO_VERSION } from '@metro-labs/core/version';
+import { funnelDriver, Tunnel, tunnelWanted, webhookPort } from '../net/tunnel.js';
 import {
   localConnectHint,
   publicConnectHint,
   tunnelPendingHint,
 } from './connect-hint.js';
-import { TrainSupervisor } from './supervisor.js';
+import { TrainSupervisor } from '../stations/supervisor.js';
 import {
   makeEmit,
   startWebhookServer,
   trainEventToMetroEvent,
-} from './http.js';
-import { localAgentKey } from '../db/materialize.js';
-import { fileSource } from '../db/file-source.js';
+} from '../routes/http.js';
+import { localAgentKey } from '../stations/materialize.js';
+import { fileSource } from '../agents/files.js';
 import { applyLocalOwner } from './local-owner.js';
-import { localOwner } from '../db/file-admin.js';
-import { ensureStationDeps } from './runtime-deps.js';
-import { localSessionApis } from './local-mode.js';
-import type { ModeInfo } from './mode-api.js';
-import type { SessionApis } from './session-apis.js';
+import { localOwner } from '../agents/file-admin.js';
+import { ensureStationDeps } from '../stations/runtime-deps.js';
+import { localSessionApis } from '../routes/local-mode.js';
+import type { SessionApis } from '../routes/session-apis.js';
 import {
   agentLiveness,
   closeAgentSession,
@@ -38,9 +37,9 @@ import {
   stationByName,
 } from '../stations/registry.js';
 import { prepareAccount } from '../stations/attach.js';
-import { materializeFrom, reloadFrom } from '../db/materialize.js';
-import type { StationName } from '../db/stations.js';
-import { startUploadReaper } from './upload-store.js';
+import { materializeFrom, reloadFrom } from '../stations/materialize.js';
+import type { StationName } from '@metro-labs/core/station-names';
+import { startUploadReaper } from '../files/upload-store.js';
 
 installCrashGuard();
 acquireLock(join(STATE_DIR, '.tail-lock'));
@@ -96,16 +95,8 @@ async function syncStations(station: StationName): Promise<void> {
   }
 }
 
-const hostedMode = (): ModeInfo => ({
-  mode: 'hosted',
-  owner: null,
-  project: null,
-  version: METRO_VERSION,
-});
-
-async function sessionApis(): Promise<SessionApis> {
-  if (isLocalMode())
-    return localSessionApis({
+function sessionApis(): SessionApis {
+  return localSessionApis({
       syncStations,
       restart: () => {
         exitCode = RESTART_EXIT;
@@ -121,41 +112,22 @@ async function sessionApis(): Promise<SessionApis> {
       liveness: agentLiveness,
       prepareAccount,
     });
-  const vault = await import('../db/vault.js');
-  const servers = await import('../db/servers.js');
-  return {
-    vaultApi: {
-      list: vault.listVaultForOwner,
-      put: vault.putVaultForOwner,
-      get: vault.getVaultForOwner,
-      remove: vault.deleteVaultForOwner,
-    },
-    serversApi: {
-      list: servers.listServersForOwner,
-      add: servers.addServerForOwner,
-      rename: servers.renameServerForOwner,
-      remove: servers.deleteServerForOwner,
-    },
-    mode: hostedMode,
-  };
 }
 
 async function main(): Promise<void> {
-  if (isLocalMode()) {
-    applyLocalOwner();
-    await materializeFrom(fileSource, { allowEmpty: true });
-  }
+  applyLocalOwner();
+  await materializeFrom(fileSource, { allowEmpty: true });
   supervisor.start();
   const metroMcp = await createMetroMcp();
   webhookServer = await startWebhookServer(
     emit,
-    await sessionApis(),
+    sessionApis(),
     metroMcp.httpHandler,
     metroCall,
   );
   metroMcp.startInbound();
   startUploadReaper();
-  if (isLocalMode()) announceLocalEndpoint();
+  announceLocalEndpoint();
   tunnel?.start();
   log.info(
     { tunnel: !!tunnel, trainsDir: trainsDir(), mcp: '/', version: METRO_VERSION },