@stage-labs/metro 0.1.0-beta.45 → 0.1.0-beta.47

package/runtime/node_modules/@metro-labs/mcp/src/db/connector-config.ts

@@ -5,6 +5,7 @@ import type {
   VerifiedServer,
 } from '../daemon/connector-verify.js';
 import { readStoredTools } from '../daemon/connector-tools.js';
+import { isRecord } from '../daemon/is-record.js';
 
 const CONNECTOR_NAME_MAX = 64;
 const HEADER_NAME_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]{1,64}$/;
@@ -22,10 +23,6 @@ export interface ConnectorConfig {
   oauth: boolean;
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 function text(value: unknown): string {
   return typeof value === 'string' ? value : '';
 }

package/runtime/node_modules/@metro-labs/mcp/src/db/connector-relay.ts

@@ -25,7 +25,7 @@ export function staleUsable(auth: OAuthAuth, now = Date.now()): boolean {
   return auth.expiresAt === undefined || auth.expiresAt > now;
 }
 
-export function headerAuthHeaders(
+function headerAuthHeaders(
   auth: ConnectorAuth,
 ): Record<string, string> | null {
   return auth.kind === 'header' ? { [auth.name]: auth.value } : null;

package/runtime/node_modules/@metro-labs/mcp/src/db/file-admin.ts

@@ -1,12 +1,4 @@
-import {
-  closeSync,
-  existsSync,
-  openSync,
-  readFileSync,
-  rmdirSync,
-  rmSync,
-  writeSync,
-} from 'node:fs';
+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';
@@ -54,31 +46,23 @@ export function localOwner(dir = agentsDir()): string | null {
   }
 }
 
-function writeOwnerOnce(path: string, address: string): boolean {
-  let fd: number;
-  try {
-    fd = openSync(path, 'wx', 0o600);
-  } catch (err) {
-    if ((err as NodeJS.ErrnoException).code === 'EEXIST') return false;
-    throw err;
-  }
-  writeSync(fd, `${address}\n`);
-  closeSync(fd);
-  return true;
-}
-
-export function claimLocalOwner(raw: string, dir = agentsDir()): Promise<string> {
+export function setLocalOwner(raw: string, dir = agentsDir()): string {
   const address = normalizeAddress(raw);
-  if (address === null)
-    return Promise.reject(new ApiError('an Ethereum address is required', 400));
+  if (address === null) throw new ApiError(`'${raw}' is not an Ethereum address`, 400);
   ensureSecureDir(dir);
-  if (writeOwnerOnce(join(dir, OWNER_FILE), address))
-    return Promise.resolve(address);
-  if (localOwner(dir) !== address)
+  writeSecure(join(dir, OWNER_FILE), `${address}\n`);
+  return address;
+}
+
+export function ownerSignIn(raw: string, dir = agentsDir()): Promise<string> {
+  const owner = localOwner(dir);
+  if (owner === null)
     return Promise.reject(
-      new ApiError('this machine belongs to another wallet', 403),
+      new ApiError('this machine has no owner yet: start it with metro serve --owner <address>', 403),
     );
-  return Promise.resolve(address);
+  if (owner !== normalizeAddress(raw))
+    return Promise.reject(new ApiError('this machine belongs to another wallet', 403));
+  return Promise.resolve(owner);
 }
 
 function isOwner(subject: string, dir: string): boolean {
@@ -278,10 +262,12 @@ export function localSetAgentConnectors(
   save(stored);
 }
 
-export function localAgentsWith(connectorId: string, dir = agentsDir()): { id: string; name: string }[] {
-  return storedAgents(dir)
-    .filter((s) => s.file.connectors.includes(connectorId))
-    .map((s) => ({ id: s.file.id, name: s.file.name }));
+export function localHoldEverywhere(connectorId: string, dir = agentsDir()): void {
+  for (const stored of storedAgents(dir)) {
+    if (stored.file.connectors.includes(connectorId)) continue;
+    stored.file.connectors = [...stored.file.connectors, connectorId];
+    save(stored);
+  }
 }
 
 export function localDropConnectorEverywhere(connectorId: string, dir = agentsDir()): void {

package/runtime/node_modules/@metro-labs/mcp/src/db/file-source.ts

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { AGENT_NAME_RE, ID_RE } from './ids.js';
 import { STATIONS, type StationName } from './schema.js';
 import type { LoadedAccount, LoadedAgent, StationSource } from './materialize.js';
+import { isRecord } from '../daemon/is-record.js';
 
 export const AGENT_FILE = 'agent.json';
 
@@ -30,9 +31,6 @@ export function agentsDir(): string {
     : join(homedir(), '.metro', 'agents');
 }
 
-const isRecord = (v: unknown): v is Record<string, unknown> =>
-  typeof v === 'object' && v !== null && !Array.isArray(v);
-
 function fail(path: string, reason: string): never {
   throw new AgentFileError(`${path}: ${reason}`);
 }

package/runtime/node_modules/@metro-labs/mcp/src/db/local-connectors.ts

@@ -41,8 +41,8 @@ import {
   assertLocalOwner,
   connectorIdsOfLocalAgent,
   localAgentConnectorIds,
-  localAgentsWith,
   localDropConnectorEverywhere,
+  localHoldEverywhere,
   localOwnedAgentOrThrow,
   localSetAgentConnectors,
   LOCAL_PROJECT_ID,
@@ -70,7 +70,7 @@ const isRow = (v: unknown): v is { id: string; name: string; url: string; config
 const asList = (value: unknown): unknown[] =>
   Array.isArray(value) ? value.map((item: unknown) => item) : [];
 
-export function readLocalConnectors(dir = agentsDir()): LocalConnectorRow[] {
+function readLocalConnectors(dir = agentsDir()): LocalConnectorRow[] {
   const raw = readJson<{ connectors?: unknown }>(filePath(dir), {}, {
     warn: 'connectors.json: malformed, ignoring',
   });
@@ -125,9 +125,16 @@ export async function localGetConnector(subject: string, id: string, dir = agent
   return Promise.resolve(connectorFromRow(rowOrThrow(subject, id, dir)));
 }
 
+function assertNameFree(name: string, exceptId: string | null, dir: string): void {
+  if (readLocalConnectors(dir).some((r) => r.id !== exceptId && r.name === name))
+    throw new ConnectorError(`a connector named '${name}' already exists on this daemon`, 409);
+}
+
 function insert(dir: string, name: string, url: URL, config: ConnectorConfig): Connector {
+  assertNameFree(name, null, dir);
   const row: LocalConnectorRow = { id: newId(), name, url: connectorUrlText(url), transport: 'http', config };
   writeRows(dir, [...readLocalConnectors(dir), row]);
+  localHoldEverywhere(row.id, dir);
   return connectorFromRow(row);
 }
 
@@ -201,24 +208,10 @@ export async function localVerifyConnector(subject: string, id: string, dir = ag
   }
 }
 
-const nameClash = (name: string, agent: string): ConnectorError =>
-  new ConnectorError(`the agent '${agent}' already has a connector named '${name}'`, 409);
-
-function clashFor(name: string, exceptId: string, agentIds: string[], dir: string): string | null {
-  const rows = readLocalConnectors(dir);
-  for (const agentId of agentIds) {
-    const held = connectorIdsOfLocalAgent(agentId, dir) ?? [];
-    const other = rows.find((r) => r.id !== exceptId && held.includes(r.id) && r.name === name);
-    if (other !== undefined) return localAgentsWith(other.id, dir).find((a) => a.id === agentId)?.name ?? agentId;
-  }
-  return null;
-}
-
 export async function localRenameConnector(subject: string, id: string, raw: string, dir = agentsDir()): Promise<Connector> {
   const name = connectorName(raw);
   const row = rowOrThrow(subject, id, dir);
-  const clash = clashFor(name, id, localAgentsWith(id, dir).map((a) => a.id), dir);
-  if (clash !== null) throw nameClash(name, clash);
+  assertNameFree(name, id, dir);
   return Promise.resolve(replace(dir, { ...row, name }));
 }
 
@@ -252,11 +245,7 @@ export async function localAddConnector(subject: string, agentId: string, connec
   const row = readLocalConnectors(dir).find((r) => r.id === connectorId);
   if (row === undefined) throw missing();
   const held = localAgentConnectorIds(subject, agentId, dir);
-  if (!held.includes(connectorId)) {
-    const clash = clashFor(row.name, connectorId, [agentId], dir);
-    if (clash !== null) throw nameClash(row.name, clash);
-    localSetAgentConnectors(subject, agentId, [...held, connectorId], dir);
-  }
+  if (!held.includes(connectorId)) localSetAgentConnectors(subject, agentId, [...held, connectorId], dir);
   return { ...agent, connectorIds: localAgentConnectorIds(subject, agentId, dir) };
 }
 

package/runtime/node_modules/@metro-labs/mcp/src/db/materialize.ts

@@ -21,7 +21,6 @@ import {
   type AllowlistMap,
 } from './agent-map.js';
 import { setKeyMap } from './key-map.js';
-import { carryTokenStores, PREVIOUS_ACCOUNT_ID } from './token-carry.js';
 import { STATIONS, stations, agents, type StationName } from './schema.js';
 
 interface StationTarget {
@@ -149,7 +148,7 @@ export async function loadAgentForRuntime(
   };
 }
 
-export const pgSource: StationSource = () => loadAgents();
+const pgSource: StationSource = () => loadAgents();
 
 async function loadAgents(): Promise<LoadedAgent[]> {
   const db = getDb();
@@ -182,14 +181,6 @@ async function loadAgents(): Promise<LoadedAgent[]> {
   return out;
 }
 
-function trainConfig(
-  config: Record<string, unknown>,
-): Record<string, unknown> {
-  return Object.fromEntries(
-    Object.entries(config).filter(([key]) => key !== PREVIOUS_ACCOUNT_ID),
-  );
-}
-
 function trainStubPath(station: StationName): string {
   return join(trainsDir(), `${station}.ts`);
 }
@@ -208,7 +199,7 @@ export function writeIfChanged(path: string, content: string): boolean {
   return true;
 }
 
-export const isLocalRuntime = (): boolean =>
+const isLocalRuntime = (): boolean =>
   (process.env.METRO_RUN_TOKEN?.trim() ?? '') !== '';
 
 export const stationRunsHere = (station: StationName): boolean =>
@@ -248,12 +239,11 @@ function writeStations(list: LoadedAgent[]): WrittenStations {
   }
   setAgentMap(map, names);
   setAllowlistMap(allow);
-  carryTokenStores(list.flatMap((agent) => agent.accounts));
 
   const active = new Map<StationName, number>();
   const changed: StationName[] = [];
   for (const [station, accts] of byStation) {
-    const records = accts.map((a) => ({ id: a.id, ...trainConfig(a.config) }));
+    const records = accts.map((a) => ({ id: a.id, ...a.config }));
     const path = accountFilePath(station);
     const content = JSON.stringify(records, null, 2);
     if (currentText(path) !== content) {

package/runtime/node_modules/@metro-labs/mcp/src/db/projects.ts

@@ -33,7 +33,7 @@ const CONTROL = /[\u0000-\u001f\u007f]/;
 const missing = (): ProjectError => new ProjectError('no such project', 404);
 const forbidden = (why: string): ProjectError => new ProjectError(why, 403);
 
-export function projectName(raw: unknown): string {
+function projectName(raw: unknown): string {
   const name = typeof raw === 'string' ? raw.trim() : '';
   if (name === '' || name.length > NAME_MAX)
     throw new ProjectError(
@@ -54,7 +54,7 @@ export interface Access {
   role: ProjectRole;
 }
 
-export async function memberAccessOrThrow(
+async function memberAccessOrThrow(
   subject: string,
   projectId: string,
 ): Promise<Access> {
@@ -101,7 +101,7 @@ async function addMemberRow(
     .onConflictDoNothing();
 }
 
-export async function ensureDefaultProject(userId: string): Promise<string> {
+async function ensureDefaultProject(userId: string): Promise<string> {
   const existing = await getDb()
     .select({ id: projects.id })
     .from(projects)

package/runtime/node_modules/@metro-labs/mcp/src/db/runtimes.ts

@@ -91,7 +91,7 @@ export async function runtimeLabels(
   return out;
 }
 
-export async function runtimeFor(agentId: string): Promise<RuntimeView | null> {
+async function runtimeFor(agentId: string): Promise<RuntimeView | null> {
   const rows = await getDb()
     .select({
       id: runtimes.id,

package/runtime/node_modules/@metro-labs/mcp/src/db/schema.ts

@@ -23,9 +23,8 @@ export const users = pgTable('users', {
   address: text('address').unique(),
 });
 
-export const PROJECT_ROLES = ['admin', 'member'] as const;
 
-export type ProjectRole = (typeof PROJECT_ROLES)[number];
+export type ProjectRole = 'admin' | 'member';
 
 export const projects = pgTable('projects', {
   id: text('id').primaryKey(),
@@ -80,9 +79,8 @@ export const stations = pgTable('stations', {
   config: jsonb('config').notNull(),
 });
 
-export const CONNECTOR_TRANSPORTS = ['http', 'sse'] as const;
 
-export type ConnectorTransport = (typeof CONNECTOR_TRANSPORTS)[number];
+export type ConnectorTransport = 'http' | 'sse';
 
 export const connectors = pgTable(
   'connectors',

package/runtime/node_modules/@metro-labs/mcp/src/mcp/event-store.ts

@@ -6,7 +6,7 @@ import type {
 import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
 import { frameInScope, frameLine } from './frame-scope.js';
 
-export const EVENT_STORE_MAX = 500;
+const EVENT_STORE_MAX = 500;
 
 interface StoredEvent {
   eventId: EventId;

package/runtime/node_modules/@metro-labs/mcp/src/monitor/api.ts

@@ -9,6 +9,7 @@ import {
   authConfigFromEnv,
   authenticate,
 } from '../mcp/request-identity.js';
+import { METRO_VERSION } from '../daemon/version.js';
 
 export type MonitorCall = (
   train: string,
@@ -18,7 +19,6 @@ export type MonitorCall = (
 
 const KEEPALIVE_MS = 25_000;
 const CALL_BODY_MAX = 256 * 1024;
-const METRO_VERSION = process.env.npm_package_version ?? '0.1.0-beta.15';
 
 function monitorEnabled(): boolean {
   return hasAnyKey() || authConfigFromEnv().sessionSecret !== '';

package/runtime/node_modules/@metro-labs/mcp/src/stations/account-store.ts

@@ -7,7 +7,6 @@ export type Die = (msg: string) => never;
 export interface MakeLoaderOpts<T> {
   prefix: string;
   file: string;
-  allowlistEnv: string[];
   validate: (raw: T[], die: Die) => void;
 }
 
@@ -24,17 +23,6 @@ export function makeAccountStore<T extends { id: string }>(
     process.exit(2);
   };
 
-  let allowlistRaw: string | undefined;
-  for (const k of opts.allowlistEnv) {
-    allowlistRaw ??= process.env[k];
-  }
-  const allowlist = new Set(
-    (allowlistRaw ?? '')
-      .split(',')
-      .map((s) => s.trim())
-      .filter(Boolean),
-  );
-
   function loadAccounts(): T[] {
     if (!existsSync(opts.file))
       return die(
@@ -50,15 +38,7 @@ export function makeAccountStore<T extends { id: string }>(
     if (!Array.isArray(raw) || raw.length === 0)
       die(`${opts.file} must be a non-empty array`);
     opts.validate(raw, die);
-    const selected = allowlist.size
-      ? raw.filter((a) => allowlist.has(a.id))
-      : raw;
-    if (selected.length === 0) {
-      die(
-        `no accounts match ${opts.allowlistEnv[0]} (${[...allowlist].join(', ')})`,
-      );
-    }
-    return selected;
+    return raw;
   }
 
   return { die, loadAccounts };

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

@@ -151,7 +151,7 @@ const sourcesOf = (a: CanonicalAttachment): string[] =>
     return typeof v === 'string' && v.length > 0;
   });
 
-export async function resolveAttachment(
+async function resolveAttachment(
   a: CanonicalAttachment,
   budget: InlineBudget = { used: 0 },
   opts: ResolveOptions = {},

package/runtime/node_modules/@metro-labs/mcp/src/stations/lines.ts

@@ -5,7 +5,7 @@ const PREFIX = 'metro://';
 const build = (station: string, ...seg: (string | number)[]): Line =>
   asLine(`${PREFIX}${station}/${seg.map(String).join('/')}`);
 
-export function parseAccountScoped(
+function parseAccountScoped(
   line: Line | string,
   station: string,
   validate?: (resource: string) => boolean,

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

@@ -18,11 +18,9 @@
   },
   "devDependencies": {
     "@stage-labs/config": "0.1.0-beta.2",
-    "@types/qrcode-terminal": "^0.12.2",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",
-    "qrcode-terminal": "^0.12.0",
     "typescript": "^5"
   }
 }

package/runtime/node_modules/@metro-labs/telegram/src/accounts.ts

@@ -29,7 +29,6 @@ function validateAccount(a: UserAccount, seen: Set<string>, die: Die): void {
 export const { loadAccounts } = makeAccountStore<UserAccount>({
   prefix: 'telegram',
   file: ACCOUNTS_FILE,
-  allowlistEnv: ['TELEGRAM_ONLY_ACCOUNTS', 'TELEGRAM_ACCOUNTS'],
   validate(raw, die) {
     const seen = new Set<string>();
     for (const a of raw) validateAccount(a, seen, die);

package/runtime/node_modules/@metro-labs/telegram-bot/src/accounts.ts

@@ -19,7 +19,6 @@ export interface AccountConfig {
 export const { loadAccounts } = makeAccountStore<AccountConfig>({
   prefix: 'telegram-bot',
   file: ACCOUNTS_FILE,
-  allowlistEnv: ['TELEGRAM_BOT_ONLY_ACCOUNTS', 'TELEGRAM_BOT_ACCOUNTS'],
   validate(raw, die) {
     const seenId = new Set<string>();
     const seenTok = new Set<string>();

package/runtime/node_modules/@metro-labs/webhook/src/station.ts

@@ -1,12 +1,9 @@
 import { randomUUID } from 'node:crypto';
-import { Line, asLine } from '@metro-labs/mcp/lines';
+import { Line } from '@metro-labs/mcp/lines';
 import { mintId, type MetroEvent } from '@metro-labs/mcp/events';
 import type { Endpoint } from '@metro-labs/mcp/endpoints';
 import type { Station, Verb } from '@metro-labs/mcp/stations/types';
 
-const sessionOwner = (sessionId: string): Line =>
-  asLine(`metro://session/${sessionId}`);
-
 export const webhookStation: Station = {
   name: 'webhook',
   hasAccounts: true,
@@ -31,7 +28,7 @@ export function webhookEntry(
     line,
     lineName: endpoint.label,
     from: line,
-    to: endpoint.session ? sessionOwner(endpoint.session) : line,
+    to: line,
     messageId:
       headers['x-github-delivery'] ?? headers['x-request-id'] ?? randomUUID(),
     text: `${headers['x-github-event'] ?? headers['x-intercom-topic'] ?? 'event'} ${method} ${url}`,

package/runtime/node_modules/@metro-labs/whatsapp/src/accounts.ts

@@ -28,7 +28,6 @@ function validateAccount(
 export const { loadAccounts } = makeAccountStore<WhatsAppAccount>({
   prefix: 'whatsapp',
   file: ACCOUNTS_FILE,
-  allowlistEnv: ['WHATSAPP_ONLY_ACCOUNTS', 'WHATSAPP_ACCOUNTS'],
   validate(raw, die) {
     const seen = new Set<string>();
     for (const a of raw) validateAccount(a, seen, die);

package/runtime/node_modules/@metro-labs/xmtp/src/accounts.ts

@@ -28,7 +28,6 @@ export interface AccountConfig {
 export const { loadAccounts } = makeAccountStore<AccountConfig>({
   prefix: 'xmtp',
   file: ACCOUNTS_FILE,
-  allowlistEnv: ['XMTP_ONLY_ACCOUNTS', 'XMTP_ACCOUNTS'],
   validate(raw, die) {
     const seen = new Set<string>();
     for (const a of raw) {

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.45"
+  "version": "0.1.0-beta.47"
 }

package/runtime/node_modules/@metro-labs/mcp/src/db/token-carry.ts

@@ -1,45 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs';
-import { tokenStorePath } from '@metro-labs/whatsapp/tokens';
-import { errMsg, log } from '../daemon/log.js';
-import { writeSecure } from '../daemon/secure-fs.js';
-
-export const PREVIOUS_ACCOUNT_ID = 'previousAccountId';
-
-export interface CarriedStation {
-  station: string;
-  id: string;
-  config: Record<string, unknown>;
-}
-
-export function previousAccountId(
-  config: Record<string, unknown>,
-): string | undefined {
-  const raw = config[PREVIOUS_ACCOUNT_ID];
-  return typeof raw === 'string' && raw !== '' ? raw : undefined;
-}
-
-export function carryTokenStores(list: CarriedStation[]): number {
-  let carried = 0;
-  for (const s of list) {
-    if (s.station !== 'whatsapp') continue;
-    const previous = previousAccountId(s.config);
-    if (previous === undefined || previous === s.id) continue;
-    const from = tokenStorePath(previous);
-    const to = tokenStorePath(s.id);
-    if (!existsSync(from) || existsSync(to)) continue;
-    try {
-      writeSecure(to, readFileSync(from, 'utf8'));
-      carried += 1;
-      log.info(
-        { from: previous, to: s.id },
-        'db: carried the whatsapp token store to the station id',
-      );
-    } catch (err) {
-      log.error(
-        { from: previous, to: s.id, err: errMsg(err) },
-        'db: could not carry the whatsapp token store',
-      );
-    }
-  }
-  return carried;
-}