@stage-labs/metro 0.1.0-beta.176 → 0.1.0-beta.177

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.176",
+  "version": "0.1.0-beta.177",
   "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/marketplace/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.176",
+  "version": "0.1.0-beta.177",
   "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",

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

@@ -19,6 +19,7 @@
     "./lines": "./src/lines.ts",
     "./endpoints": "./src/endpoints.ts",
     "./stations/types": "./src/stations/types.ts",
+    "./stations/account-files": "./src/stations/account-files.ts",
     "./stations/station-runtime": "./src/stations/station-runtime.ts",
     "./stations/account-store": "./src/stations/account-store.ts",
     "./stations/attachments": "./src/stations/attachments.ts",

package/runtime/node_modules/@metro-labs/core/src/stations/account-files.ts

@@ -0,0 +1,41 @@
+import { readdirSync, rmSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { log } from '../log.js';
+
+export interface AccountFiles {
+  path: (accountId: string) => string;
+  forget: (accountId: string) => void;
+  forgetExcept: (keptAccountIds: readonly string[]) => void;
+}
+
+const safeSegment = (s: string): string => s.replace(/[^A-Za-z0-9_-]/g, '_');
+
+function listed(dir: string): string[] {
+  try {
+    return readdirSync(dir);
+  } catch {
+    return [];
+  }
+}
+
+export function accountFiles(dirEnv: string, prefix: string): AccountFiles {
+  const dir = (): string => process.env[dirEnv] ?? join(homedir(), '.metro');
+  const name = (accountId: string): string => `${prefix}${safeSegment(accountId)}.json`;
+  const remove = (file: string, reason: string): void => {
+    rmSync(join(dir(), file), { force: true });
+    log.info({ file: join(dir(), file) }, reason);
+  };
+  return {
+    path: (accountId) => join(dir(), name(accountId)),
+    forget: (accountId) => {
+      remove(name(accountId), 'station: removed the files of a detached account');
+    },
+    forgetExcept: (keptAccountIds) => {
+      const kept = new Set(keptAccountIds.map(name));
+      for (const file of listed(dir()))
+        if (file.startsWith(prefix) && file.endsWith('.json') && !kept.has(file))
+          remove(file, 'station: removed the files of an account that is no longer attached');
+    },
+  };
+}

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

@@ -108,6 +108,8 @@ export interface Station {
   readFilters?: ReadonlySet<ReadFilter>;
   approvals?: boolean;
   attachmentMode: AttachmentMode;
+  forget?: (accountId: string) => void;
+  forgetExcept?: (keptAccountIds: readonly string[]) => void;
   sendAttachments?(
     line: string,
     atts: CanonicalAttachment[],

package/runtime/node_modules/@metro-labs/daemon/src/agents/accounts-api.ts

@@ -246,6 +246,18 @@ async function handleDetach(
     detached: true,
     activated: await activate(deps, ref.station),
   });
+  forgetAccount(ref.station, ref.accountId);
+}
+
+function forgetAccount(station: StationName, accountId: string): void {
+  try {
+    stationByName(station)?.forget?.(accountId);
+  } catch (err) {
+    log.warn(
+      { station, account: accountId, err: errMsg(err) },
+      'account-api: could not remove the files of a detached account',
+    );
+  }
 }
 
 async function applied(deps: AccountApiDeps): Promise<boolean> {

package/runtime/node_modules/@metro-labs/daemon/src/boot/boot.ts

@@ -36,9 +36,11 @@ import { createMetroMcp } from '../mcp/index.js';
 import { gatherAccountsForAgents } from '../mcp/accounts.js';
 import {
   accountStationCapabilities,
+  forgetOrphans,
   stationByName,
 } from '../stations/registry.js';
 import { prepareAccount } from '../stations/attach.js';
+import { knownAccounts } from '../agents/map.js';
 import { materializeFrom, reloadFrom } from '../stations/materialize.js';
 import type { StationName } from '@metro-labs/core/station-names';
 import { startUploadReaper } from '../files/upload-store.js';
@@ -116,6 +118,7 @@ installBearerSessions(agentsDir(), localOwner);
   migrateAgentLayout();
   log.info({ agent: await ensureLocalAgent() }, 'local daemon: agent');
   await materializeFrom(fileSource);
+  forgetOrphans(knownAccounts());
   supervisor.start();
   const metroMcp = await createMetroMcp();
   webhookServer = await startWebhookServer(

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

@@ -127,7 +127,7 @@ export async function startInteractiveAttach(
   input: Record<string, unknown>,
   hooks: DriverHooks,
 ): Promise<StartedAttach> {
-  if (station === 'outlook') return startOutlook(hooks);
+  if (station === 'outlook') return startOutlook(input, hooks);
   return station === 'telegram'
     ? startTelegramUser(input, hooks)
     : startWhatsapp(input, hooks);

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

@@ -11,13 +11,14 @@ const BROWSER_TTL_MS = 15 * 60_000;
 
 const text = (v: unknown): string => (typeof v === 'string' ? v.trim() : '');
 
-export async function startOutlook(hooks: DriverHooks): Promise<StartedAttach> {
-  const { OutlookBrowserLogin, OutlookLogin: DeviceLogin, OutlookLoginError, failureOf } = await import('@metro-labs/outlook/login');
+export async function startOutlook(input: Record<string, unknown>, hooks: DriverHooks): Promise<StartedAttach> {
+  const { OutlookBrowserLogin, OutlookLogin: DeviceLogin, OutlookLoginError, failureOf, parseMailbox } = await import('@metro-labs/outlook/login');
   const said = (err: unknown, fallback: string): string =>
     err instanceof OutlookLoginError && err.message !== '' ? err.message : fallback;
-  const browser = (() => {
+  const { browser, mailbox } = (() => {
     try {
-      return new OutlookBrowserLogin();
+      const wanted = parseMailbox(input.mailbox);
+      return { browser: new OutlookBrowserLogin({ mailbox: wanted }), mailbox: wanted };
     } catch (err) {
       throw new StationAttachError(said(err, 'Microsoft refused to start the sign-in'), 400);
     }
@@ -26,7 +27,7 @@ export async function startOutlook(hooks: DriverHooks): Promise<StartedAttach> {
 
   const toDevice = async (): Promise<void> => {
     if (device !== null) return;
-    const login = new DeviceLogin({ onDone: hooks.done, onFailed: hooks.fail });
+    const login = new DeviceLogin({ onDone: hooks.done, onFailed: hooks.fail }, { mailbox });
     const code = await login.start().catch((err: unknown) => {
       throw new StationAttachError(said(err, 'Microsoft refused to start the sign-in'), 400);
     });

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

@@ -1,5 +1,6 @@
 import type { Station } from '@metro-labs/core/stations/types';
 import { Line } from '@metro-labs/core/lines';
+import { errMsg, log } from '@metro-labs/core/log';
 import { xmtpStation } from '@metro-labs/xmtp';
 import { telegramBotStation } from '@metro-labs/telegram-bot';
 import { telegramStation } from '@metro-labs/telegram';
@@ -37,3 +38,14 @@ export const accountStationCapabilities = (): Record<string, string[]> => {
     if (s.hasAccounts) out[s.name] = [...s.messageVerbs].sort();
   return out;
 };
+
+export function forgetOrphans(known: readonly { station: string; id: string }[]): void {
+  for (const s of STATIONS) {
+    if (s.forgetExcept === undefined) continue;
+    try {
+      s.forgetExcept(known.filter((a) => a.station === s.name).map((a) => a.id));
+    } catch (err) {
+      log.warn({ station: s.name, err: errMsg(err) }, 'stations: could not remove the files of detached accounts');
+    }
+  }
+}

package/runtime/node_modules/@metro-labs/outlook/src/browser.ts

@@ -13,8 +13,9 @@ export function pkcePair(verifier = randomBytes(32).toString('base64url')): Pkce
 
 export const newState = (): string => randomBytes(24).toString('base64url');
 
-export function authorizeUrl(challenge: string, state: string): string {
+export function authorizeUrl(challenge: string, state: string, loginHint: string | null = null): string {
   const query = new URLSearchParams({
+    ...(loginHint === null ? {} : { login_hint: loginHint }),
     client_id: requireClientId(),
     response_type: 'code',
     redirect_uri: redirectUri(),

package/runtime/node_modules/@metro-labs/outlook/src/login.ts

@@ -10,6 +10,8 @@ import {
 import { authorizeUrl, newState, pkcePair, redeemCode, type Pkce } from './browser.js';
 import { verifyMailbox, type Mailbox } from './me.js';
 
+export { parseMailbox } from './me.js';
+
 export { OutlookAuthError as OutlookLoginError } from './auth.js';
 export { NOT_SET_UP } from './config.js';
 export { failureOf } from './auth.js';
@@ -27,6 +29,7 @@ export interface OutlookLoginEvents {
 export interface OutlookLoginDeps {
   fetch?: FetchLike;
   now?: () => number;
+  mailbox?: string | null;
 }
 
 const SLOW_DOWN_MS = 5_000;
@@ -52,11 +55,13 @@ export class OutlookBrowserLogin {
   private used = false;
   private readonly fetchImpl: FetchLike;
   private readonly now: () => number;
+  private readonly mailbox: string | null;
 
   constructor(deps: OutlookLoginDeps = {}) {
     this.fetchImpl = deps.fetch ?? ((input, init) => fetch(input, init));
     this.now = deps.now ?? Date.now;
-    this.authorizeUrl = authorizeUrl(this.pkce.challenge, this.state);
+    this.mailbox = deps.mailbox ?? null;
+    this.authorizeUrl = authorizeUrl(this.pkce.challenge, this.state, this.mailbox);
   }
 
   async finish(code: string, state: string): Promise<OutlookLoginResult> {
@@ -65,7 +70,7 @@ export class OutlookBrowserLogin {
     if (this.used) throw new OutlookAuthError('This sign-in was already used. Start again from the Channels page.');
     this.used = true;
     const { tokens, tenantId } = await redeemCode(code, this.pkce.verifier, this.fetchImpl, this.now());
-    return resultOf(tokens, tenantId, await verifyMailbox(tokens.accessToken, this.fetchImpl), this.now());
+    return resultOf(tokens, tenantId, await verifyMailbox(tokens.accessToken, this.fetchImpl, this.mailbox), this.now());
   }
 }
 
@@ -75,10 +80,12 @@ export class OutlookLogin {
   private stopped = false;
   private readonly fetchImpl: FetchLike;
   private readonly now: () => number;
+  private readonly mailbox: string | null;
 
   constructor(private readonly events: OutlookLoginEvents, deps: OutlookLoginDeps = {}) {
     this.fetchImpl = deps.fetch ?? ((input, init) => fetch(input, init));
     this.now = deps.now ?? Date.now;
+    this.mailbox = deps.mailbox ?? null;
   }
 
   async start(): Promise<DeviceCode> {
@@ -135,7 +142,7 @@ export class OutlookLogin {
       this.fail(poll.message);
       return;
     }
-    const mailbox = await verifyMailbox(poll.tokens.accessToken, this.fetchImpl);
+    const mailbox = await verifyMailbox(poll.tokens.accessToken, this.fetchImpl, this.mailbox);
     if (this.stopped) return;
     this.stopped = true;
     this.events.onDone(resultOf(poll.tokens, poll.tenantId, mailbox, this.now()));

package/runtime/node_modules/@metro-labs/outlook/src/me.ts

@@ -8,7 +8,20 @@ export interface Mailbox {
 
 const text = (v: unknown): string => (typeof v === 'string' ? v.trim() : '');
 
-export async function verifyMailbox(accessToken: string, fetchImpl: FetchLike): Promise<Mailbox> {
+const MAILBOX_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+export function parseMailbox(value: unknown): string | null {
+  const mailbox = text(value).toLowerCase();
+  if (mailbox === '') return null;
+  if (!MAILBOX_RE.test(mailbox))
+    throw new OutlookAuthError('Type the whole address of the mailbox, like andy@company.com, or leave it blank.');
+  return mailbox;
+}
+
+const wrongMailbox = (actual: string, wanted: string): string =>
+  `You signed in as ${actual}, not ${wanted}. Nothing was connected. Start again and pick ${wanted} on Microsoft's page, or use "Use another account".`;
+
+export async function verifyMailbox(accessToken: string, fetchImpl: FetchLike, wanted: string | null = null): Promise<Mailbox> {
   let res: Response;
   try {
     res = await fetchImpl(`${graphBase()}/me?$select=mail,userPrincipalName,displayName`, {
@@ -19,7 +32,10 @@ export async function verifyMailbox(accessToken: string, fetchImpl: FetchLike):
   }
   if (!res.ok) throw new OutlookAuthError(`Microsoft Graph refused the new sign-in (${String(res.status)}), so nothing was connected.`);
   const body = (await res.json().catch(() => ({}))) as Record<string, unknown>;
-  const email = text(body.mail) || text(body.userPrincipalName);
+  const mail = text(body.mail).toLowerCase();
+  const principal = text(body.userPrincipalName).toLowerCase();
+  const email = mail || principal;
   if (email === '') throw new OutlookAuthError('Microsoft Graph did not say which mailbox this is, so nothing was connected.');
-  return { email: email.toLowerCase(), name: text(body.displayName) };
+  if (wanted !== null && wanted !== mail && wanted !== principal) throw new OutlookAuthError(wrongMailbox(email, wanted));
+  return { email, name: text(body.displayName) };
 }

package/runtime/node_modules/@metro-labs/outlook/src/state.ts

@@ -1,6 +1,5 @@
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { accountFiles } from '@metro-labs/core/stations/account-files';
 
 export interface AccountState {
   accessToken: string;
@@ -13,12 +12,9 @@ export interface AccountState {
 
 const SEEN_MAX = 500;
 
-const safeSegment = (s: string): string => s.replace(/[^A-Za-z0-9_-]/g, '_');
+export const stateFiles = accountFiles('OUTLOOK_STATE_DIR', 'outlook-state-');
 
-export function statePath(accountId: string): string {
-  const dir = process.env.OUTLOOK_STATE_DIR ?? join(homedir(), '.metro');
-  return join(dir, `outlook-state-${safeSegment(accountId)}.json`);
-}
+const statePath =(accountId: string): string => stateFiles.path(accountId);
 
 const text = (v: unknown): string => (typeof v === 'string' ? v : '');
 const nullable = (v: unknown): string | null => (typeof v === 'string' && v !== '' ? v : null);

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

@@ -1,4 +1,5 @@
 import type { ReadFilter, Station, Verb } from '@metro-labs/core/stations/types';
+import { stateFiles } from './state.js';
 
 export const outlookStation: Station = {
   name: 'outlook',
@@ -8,5 +9,7 @@ export const outlookStation: Station = {
   readFilters: new Set<ReadFilter>(['account', 'query', 'from', 'until', 'unread_only', 'message_id']),
   approvals: false,
   attachmentMode: 'canonical',
+  forget: stateFiles.forget,
+  forgetExcept: stateFiles.forgetExcept,
   tools: [],
 };

package/runtime/node_modules/@metro-labs/threema/src/groups.ts

@@ -1,6 +1,6 @@
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
+import { dirname } from 'node:path';
+import { accountFiles } from '@metro-labs/core/stations/account-files';
 import type { GroupRef } from './messages.js';
 
 export const GROUP_RE = /^([A-Z0-9]{8}|\*[A-Z0-9]{7})-([0-9a-f]{16})$/i;
@@ -19,8 +19,9 @@ export function parseGroupKey(resource: string): GroupRef | null {
   return m === null ? null : { creator: (m[1] ?? '').toUpperCase(), groupId: (m[2] ?? '').toLowerCase() };
 }
 
-const groupsFile = (accountId: string): string =>
-  join(process.env.THREEMA_GROUPS_DIR ?? join(homedir(), '.metro'), `threema-groups-${accountId}.json`);
+export const groupFiles = accountFiles('THREEMA_GROUPS_DIR', 'threema-groups-');
+
+const groupsFile = (accountId: string): string => groupFiles.path(accountId);
 
 function readRosters(accountId: string): Map<string, GroupRoster> {
   try {

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

@@ -1,4 +1,5 @@
 import type { Station, Verb } from '@metro-labs/core/stations/types';
+import { groupFiles } from './groups.js';
 
 export const threemaStation: Station = {
   name: 'threema',
@@ -6,5 +7,7 @@ export const threemaStation: Station = {
   hasTrain: true,
   messageVerbs: new Set<Verb>(['send', 'reply', 'react', 'unreact']),
   attachmentMode: 'canonical',
+  forget: groupFiles.forget,
+  forgetExcept: groupFiles.forgetExcept,
   tools: [],
 };

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

@@ -1,5 +1,6 @@
 import type { Station, Verb } from '@metro-labs/core/stations/types';
 import { PROFILE_FIELDS, type ProfileField } from '@metro-labs/core/stations/profile';
+import { tokenFiles } from './token-store.js';
 
 export const whatsappStation: Station = {
   name: 'whatsapp',
@@ -17,5 +18,7 @@ export const whatsappStation: Station = {
   profileFields: new Set<ProfileField>(PROFILE_FIELDS),
   readsProfiles: true,
   resolvesSenders: true,
+  forget: tokenFiles.forget,
+  forgetExcept: tokenFiles.forgetExcept,
   tools: [],
 };

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

@@ -1,6 +1,5 @@
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { accountFiles } from '@metro-labs/core/stations/account-files';
 import { errMsg } from '@metro-labs/core/log';
 
 export const PERSISTED_KEY_TYPES = ['tctoken', 'lid-mapping'] as const;
@@ -14,12 +13,9 @@ const WRITE_DEBOUNCE_MS = 1000;
 export const isPersistedKeyType = (type: string): boolean =>
   PERSISTED.has(type);
 
-const safeSegment = (s: string): string => s.replace(/[^A-Za-z0-9_-]/g, '_');
+export const tokenFiles = accountFiles('WHATSAPP_TOKEN_DIR', 'whatsapp-tokens-');
 
-export function tokenStorePath(accountId: string): string {
-  const dir = process.env.WHATSAPP_TOKEN_DIR ?? join(homedir(), '.metro');
-  return join(dir, `whatsapp-tokens-${safeSegment(accountId)}.json`);
-}
+export const tokenStorePath = (accountId: string): string => tokenFiles.path(accountId);
 
 export function persistedSubset(table: KeyTable): KeyTable {
   const out: KeyTable = {};

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.176"
+  "version": "0.1.0-beta.177"
 }