@stage-labs/metro 0.1.0-beta.201 → 0.1.0-beta.202

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

@@ -1,5 +1,5 @@
 import type { WAMessage } from 'baileys';
-import { emit } from './wire.js';
+import { emit } from '@metro-labs/core/stations/station-runtime';
 import { reportAttachment } from '@metro-labs/core/stations/train-events';
 import { lineOf } from './accounts.js';
 import {

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

@@ -15,10 +15,6 @@ import {
 } from '@metro-labs/core/stations/account-store';
 import { Line } from '@metro-labs/core/lines';
 
-const ACCOUNTS_FILE =
-  process.env.XMTP_ACCOUNTS_FILE ??
-  join(homedir(), '.metro', 'xmtp-accounts.json');
-
 export interface AccountConfig {
   id: string;
   privateKey?: string;
@@ -28,15 +24,8 @@ export interface AccountConfig {
 
 export const { loadAccounts } = makeAccountStore<AccountConfig>({
   prefix: 'xmtp',
-  file: ACCOUNTS_FILE,
   validate(raw, die) {
-    const seen = new Set<string>();
-    for (const a of raw) {
-      if (!a.id) die('account missing id');
-      if (!a.privateKey) die(`account '${a.id}' needs a privateKey`);
-      if (seen.has(a.id)) die(`duplicate account id '${a.id}'`);
-      seen.add(a.id);
-    }
+    for (const a of raw) if (!a.privateKey) die(`account '${a.id}' needs a privateKey`);
   },
 });
 

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

@@ -1,6 +1,6 @@
 import { errMsg } from '@metro-labs/core/log';
 import { accountForCall, convOf, lineOf, type Account } from './accounts.js';
-import { respond } from './wire.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
 import type { GroupLike } from './labels.js';
 
 type Args = Record<string, unknown>;

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

@@ -1,6 +1,7 @@
 import { IdentifierKind } from '@xmtp/node-sdk';
 import { accountForCall, convOf, lineOf, parseLine } from './accounts.js';
-import { respond } from './wire.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
+import { resolveMsgId } from './wire.js';
 import { TrainError } from '@metro-labs/core/train-error';
 import {
   buildGroupInfo,
@@ -33,15 +34,23 @@ async function newDm(id: string, args: Args): Promise<void> {
   });
 }
 
-async function query(id: string, args: Args): Promise<void> {
-  const { line, limit } = args as { line: string; limit?: number };
+function upTo<T extends { id: string }>(all: T[], before: string | undefined): T[] {
+  if (!before) return all;
+  const target = resolveMsgId(before);
+  const at = all.findIndex((m) => m.id === target);
+  if (at < 0) throw new TrainError('NOT_FOUND', `message ${before} is not in this conversation`);
+  return all.slice(0, at);
+}
+
+async function read(id: string, args: Args): Promise<void> {
+  const { line, limit, before } = args as { line: string; limit?: number; before?: string };
   const { conv } = await convOf(line);
   if (!conv)
     throw new TrainError('NOT_FOUND', `conversation not found for ${line}`);
   const lim = Math.min(Math.max(1, limit ?? 20), 200);
   await conv.sync().catch(() => undefined);
   const all = await conv.messages();
-  const slice = all.slice(-lim);
+  const slice = upTo(all, before).slice(-lim);
   const parsed = parseLine(line);
   if (!parsed)
     throw new TrainError('NOT_FOUND', `could not parse line ${line}`);
@@ -86,7 +95,7 @@ export const convHandlers: Record<string, Handler> = {
   newDm,
   updateChannelMeta,
   closeGroup,
-  query,
+  read,
   groupInfo,
   listMembers,
   groupCreate: async (id, args) => {

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

@@ -1,5 +1,5 @@
 import { accountForCall, convOf, lineOf } from './accounts.js';
-import { respond } from './wire.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
 import { warmGroupName } from './conv-helpers.js';
 import { mergeAppData, readAppData, type GroupLike } from './labels.js';
 import { TrainError } from '@metro-labs/core/train-error';

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

@@ -1,19 +1,19 @@
-import { ReactionAction, ReactionSchema } from '@xmtp/node-sdk';
+import { ReactionAction, ReactionSchema, type Conversation } from '@xmtp/node-sdk';
 import type { Reply } from '@xmtp/node-bindings';
 import {
   AttachmentCodec,
   type Attachment,
 } from '@xmtp/content-type-remote-attachment';
 import { convOf } from './accounts.js';
-import { resolveMsgId, respond } from './wire.js';
+import { resolveMsgId } from './wire.js';
 import { emitOutbound } from './emit.js';
 import { PollCodec, buildPollContent } from './codecs.js';
 import { convHandlers } from './actions-conv.js';
-import { normalizeXmtp } from '@metro-labs/core/stations/messaging-normalize';
+import { messagingAliases } from '@metro-labs/core/stations/messaging-normalize';
 import { TrainError } from '@metro-labs/core/train-error';
 import { claimNameAction, nameAction, setProfile } from './profile.js';
 import { profileAction } from './sender.js';
-import { makeStation, type CallMsg } from '@metro-labs/core/stations/station-runtime';
+import { makeStation, respond, type CallMsg } from '@metro-labs/core/stations/station-runtime';
 
 type Args = Record<string, unknown>;
 
@@ -32,68 +32,47 @@ async function send(id: string, args: Args): Promise<void> {
 }
 
 async function ask(id: string, args: Args): Promise<void> {
-  const { line, pollId } = args as { line: string; pollId?: string };
+  const { line } = args as { line: string };
   const { acct, conv } = await convOf(line);
   if (!conv) throw noConv(line);
-  const fallbackId = `poll_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-  const mintedId =
-    pollId ??
-    (typeof crypto?.randomUUID === 'function'
-      ? crypto.randomUUID()
-      : fallbackId);
+  const mintedId = crypto.randomUUID();
   const { poll, title } = buildPollContent(args, mintedId);
   const sentId = await conv.send(new PollCodec().encode(poll));
   emitOutbound(acct.cfg.id, line, sentId, `📊 Poll: ${title}`);
   respond(id, { result: { messageId: sentId, pollId: mintedId } });
 }
 
+async function referenceInboxOf(conv: Conversation, xmtpMsgId: string): Promise<string> {
+  const recent = await conv.messages({ limit: 200, direction: 1 });
+  const inbox = recent.find((m) => m.id === xmtpMsgId)?.senderInboxId;
+  if (!inbox)
+    throw new TrainError('NOT_FOUND', `could not resolve referenceInboxId for ${xmtpMsgId}`);
+  return inbox;
+}
+
 async function react(id: string, args: Args): Promise<void> {
-  const {
-    line,
-    messageId,
-    emoji,
-    action: reactAction,
-    schema: reactSchema,
-  } = args as {
+  const { line, messageId, emoji, action: reactAction } = args as {
     line: string;
     messageId: string;
     emoji: string;
     action?: 'added' | 'removed';
-    schema?: string;
-    referenceInboxId?: string;
   };
   const { acct, conv } = await convOf(line);
   if (!conv) throw noConv(line);
   const xmtpMsgId = resolveMsgId(messageId);
-  let refInbox = (args as { referenceInboxId?: string }).referenceInboxId;
-  if (!refInbox) {
-    const recent = await conv.messages({ limit: 200, direction: 1 });
-    refInbox = recent.find((m) => m.id === xmtpMsgId)?.senderInboxId;
-    if (!refInbox)
-      throw new TrainError(
-        'NOT_FOUND',
-        `could not resolve referenceInboxId for ${xmtpMsgId}`,
-      );
-  }
-  const schemaEnum =
-    reactSchema === 'custom'
-      ? ReactionSchema.Custom
-      : reactSchema === 'shortcode'
-        ? ReactionSchema.Shortcode
-        : ReactionSchema.Unicode;
+  const removed = reactAction === 'removed';
   const sentId = await conv.sendReaction({
     reference: xmtpMsgId,
-    referenceInboxId: refInbox,
-    action:
-      reactAction === 'removed' ? ReactionAction.Removed : ReactionAction.Added,
+    referenceInboxId: await referenceInboxOf(conv, xmtpMsgId),
+    action: removed ? ReactionAction.Removed : ReactionAction.Added,
     content: emoji,
-    schema: schemaEnum,
+    schema: ReactionSchema.Unicode,
   });
   emitOutbound(
     acct.cfg.id,
     line,
     sentId,
-    `[react ${emoji}${reactAction === 'removed' ? ' (removed)' : ''}]`,
+    `[react ${emoji}${removed ? ' (removed)' : ''}]`,
     { type: 'react', emoji, targetId: xmtpMsgId },
   );
   respond(id, { result: { messageId: sentId } });
@@ -151,54 +130,28 @@ const IMG_MIME_BY_EXT: Record<string, string> = {
   webp: 'image/webp',
 };
 
-async function loadImageBytes(
-  path: string | undefined,
-  dataB64: string | undefined,
-): Promise<Uint8Array> {
-  if (path) {
-    const { readFileSync } = await import('node:fs');
-    return new Uint8Array(readFileSync(path));
-  }
-  if (dataB64) return new Uint8Array(Buffer.from(dataB64, 'base64'));
-  throw badArgs('sendImage requires path or dataB64');
-}
-
-function imageMime(
-  mimeType: string | undefined,
-  filename: string | undefined,
-  path: string | undefined,
-): string {
-  if (mimeType) return mimeType;
-  const ext = (filename ?? path ?? '').toLowerCase().split('.').pop() ?? '';
+function imageMime(path: string): string {
+  const ext = path.toLowerCase().split('.').pop() ?? '';
   return IMG_MIME_BY_EXT[ext] ?? 'image/png';
 }
 
-function imageFilename(
-  filename: string | undefined,
-  path: string | undefined,
-): string {
-  if (filename) return filename;
-  const baseName = path ? path.split('/').pop() : undefined;
+function imageFilename(path: string): string {
+  const baseName = path.split('/').pop();
   return baseName != null && baseName !== '' ? baseName : 'image.png';
 }
 
 async function sendImage(id: string, args: Args): Promise<void> {
-  const { line, path, dataB64, filename, mimeType } = args as {
-    line: string;
-    path?: string;
-    dataB64?: string;
-    filename?: string;
-    mimeType?: string;
-  };
+  const { line, path } = args as { line: string; path?: string };
+  if (!path) throw badArgs('sendImage requires path');
   const { acct, conv } = await convOf(line);
   if (!conv) throw noConv(line);
-  const bytes = await loadImageBytes(path, dataB64);
-  const mime = imageMime(mimeType, filename, path);
-  const fname = imageFilename(filename, path);
+  const { readFileSync } = await import('node:fs');
+  const mime = imageMime(path);
+  const fname = imageFilename(path);
   const attachment: Attachment = {
     filename: fname,
     mimeType: mime,
-    data: bytes,
+    data: new Uint8Array(readFileSync(path)),
   };
   const sentId = await conv.send(new AttachmentCodec().encode(attachment));
   emitOutbound(acct.cfg.id, line, sentId, `[${mime.split('/')[0]}: ${fname}]`);
@@ -240,5 +193,5 @@ export type { CallMsg };
 
 export const handleCall = makeStation({
   handlers,
-  normalize: normalizeXmtp,
+  normalize: messagingAliases({ action: 'removed' }),
 });

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

@@ -1,7 +1,8 @@
 import type { Conversation, DecodedMessage } from '@xmtp/node-sdk';
 import { lineOf } from './accounts.js';
 import { selfUri } from '@metro-labs/core/stations/train-events';
-import { emit, mintId, rememberSent, rememberUid } from './wire.js';
+import { emit, mintId } from '@metro-labs/core/stations/station-runtime';
+import { rememberSent, rememberUid } from './wire.js';
 import { typedEnvelope, type EnvelopeCtx } from './emit-payloads.js';
 import type { StructuredEvent } from '@metro-labs/core/events';
 
@@ -53,16 +54,14 @@ export function emitOutbound(
   rememberUid(uid, messageId);
   rememberSent(messageId);
   emit({
-    kind: 'outbound',
     id: uid,
     ts: new Date().toISOString(),
     station: 'xmtp',
     line,
-    from: selfUri('xmtp', accountId),
+    from: selfUri(),
     to: line,
     message_id: messageId,
     text,
-    account: accountId,
     ...(event ? { event } : {}),
     payload: { account: accountId },
   });

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

@@ -68,12 +68,7 @@ async function handleStreamMessage(
   const env = envelope(id, msg, conv);
   Object.assign(env, senderFieldsNow(acct, msg.senderInboxId));
   const name = await groupNameFor(msg.conversationId, conv);
-  if (name) {
-    env.line_name = name;
-    env.lineName = name;
-    const p = (env.payload ?? {}) as Record<string, unknown>;
-    env.payload = { ...p, lineName: name };
-  }
+  if (name) env.line_name = name;
   emitInbound(id, env);
 }
 

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

@@ -13,7 +13,7 @@ import {
 import { accountForCall } from './accounts.js';
 import { claimName, nameOf, parseLabel } from './names.js';
 import { sendSponsored, type SmartAccount } from './smart.js';
-import { respond } from './wire.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
 
 export const BASENAME_REGISTRY = '0xB94704422c2a1E396835A571837Aa5AE53285a95' as const;
 export const BASENAME_L2_RESOLVER = '0xC6d566A56A1aFf6508b41f6c90ff131615583BCD' as const;

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

@@ -2,7 +2,7 @@ import { createPublicClient, http, namehash, type Hex } from 'viem';
 import { base } from 'viem/chains';
 import { normalize } from 'viem/ens';
 import { makeProfileCache, type SenderProfile as Profile } from '@metro-labs/core/stations/sender-profile';
-import { respond } from './wire.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
 import { TrainError } from '@metro-labs/core/train-error';
 import { accountForCall, accounts, type Account } from './accounts.js';
 import { resolveAddresses } from './conv-helpers.js';

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

@@ -65,7 +65,7 @@ export async function xmtpSendAttachments(
 ): Promise<string[]> {
   const sent: string[] = [];
   for (const a of atts) {
-    const src = a.path ?? a.url ?? '';
+    const src = a.path ?? '';
     if (!src) continue;
     const mime = a.mime ?? guessMime(src);
     if (isImageMime(mime) || isImageExt(src)) {

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

@@ -1,6 +1,6 @@
 import { errMsg } from '@metro-labs/core/log';
 import { emitInbound, selfUri } from '@metro-labs/core/stations/train-events';
-import { mintId } from './wire.js';
+import { mintId } from '@metro-labs/core/stations/station-runtime';
 
 const WHISPER_BIN = process.env.METRO_WHISPER_BIN ?? 'whisper-cli';
 const WHISPER_MODEL =
@@ -67,7 +67,7 @@ export async function transcribeAndEmit(
       ts: new Date().toISOString(),
       station: 'xmtp',
       line,
-      from: selfUri('xmtp', accountId),
+      from: selfUri(),
       text: `🎙️ ${text}`,
       payload: {
         contentType: 'transcript',

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

@@ -1,5 +1,3 @@
-export { emit, respond, mintId } from '@metro-labs/core/stations/station-runtime';
-
 const UID_MAP_MAX = 5000;
 const uidToXmtp = new Map<string, string>();
 

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.201"
+  "version": "0.1.0-beta.202"
 }

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

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

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

@@ -1,2 +0,0 @@
-export const NEEDS_APPROVAL = (where: string, tool: string): string =>
-  `Needs the owner's approval for ${where} (${tool}). Make this exact call from a background worker so Claude Code asks the owner in chat, and wait for the answer. An approval given only in the terminal does not count.`;

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

@@ -1,12 +0,0 @@
-const accountStrippedLine = (line: string): string => {
-  const parts = line.split('/');
-  if (parts.length < 5) return line;
-  return [parts[0], parts[1], parts[2], ...parts.slice(4)].join('/');
-};
-
-export const dedupeKey = (
-  station: string,
-  line: string,
-  kind: string,
-  messageId: string,
-): string => `${station} ${accountStrippedLine(line)} ${kind} ${messageId}`;

package/runtime/node_modules/@metro-labs/daemon/src/channels/react-note.ts

@@ -1,13 +0,0 @@
-const shortId = (id: string): string => (id.length > 10 ? `${id.slice(0, 6)}…` : id);
-
-export function reactionEmoji(raw: unknown): string {
-  if (typeof raw === 'string') return raw;
-  const obj = raw as { name?: string; reaction?: string } | undefined;
-  return obj?.name ?? obj?.reaction ?? '';
-}
-
-export function reactContent(emoji: string, target: string, removed: boolean): string {
-  const verb = removed ? 'removed from' : 'reacted to';
-  const label = removed ? emoji || 'reaction' : emoji || 'reacted';
-  return `${label} ${verb} message ${shortId(target)}`.trim();
-}

package/runtime/node_modules/@metro-labs/daemon/src/channels/reply-id.ts

@@ -1 +0,0 @@
-export const PERMISSION_REPLY_RE = /^\s*(y|yes|n|no)\s+([a-km-z]{5})\s*$/i;

package/runtime/node_modules/@metro-labs/daemon/src/connectors/relay-target.ts

@@ -1,29 +0,0 @@
-import { authHeaders, type ConnectorAuth, type OAuthAuth } from './verify.js';
-
-export type RelayTarget =
-  | { kind: 'ok'; url: string; headers: Record<string, string> }
-  | { kind: 'missing' }
-  | { kind: 'signin' };
-
-function staleUsable(auth: OAuthAuth, now = Date.now()): boolean {
-  return auth.expiresAt === undefined || auth.expiresAt > now;
-}
-
-export function unrefreshedTarget(
-  url: string,
-  auth: OAuthAuth,
-  force: boolean,
-  now = Date.now(),
-): RelayTarget {
-  if (force) return { kind: 'signin' };
-  return { kind: 'ok', url, headers: staleUsable(auth, now) ? authHeaders(auth) : {} };
-}
-
-export function fixedTarget(
-  url: string,
-  auth: Exclude<ConnectorAuth, OAuthAuth>,
-  force: boolean,
-): RelayTarget {
-  if (force) return { kind: 'signin' };
-  return { kind: 'ok', url, headers: authHeaders(auth) };
-}

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

@@ -1,43 +0,0 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import { readFileSync } from 'node:fs';
-import { sessionRoute } from '@metro-labs/http/api-http';
-import { MOVE_LOG, moveState, startMove } from './move.js';
-import { rootHelper, runningAsMetro, runningAsRoot } from './privilege.js';
-import { HELPER_VERSION } from './helper-script.js';
-
-const PATH = '/api/server/metro-user';
-const LOG_TAIL = 40;
-
-function logTail(): string {
-  try {
-    return readFileSync(MOVE_LOG, 'utf8').split('\n').slice(-LOG_TAIL).join('\n');
-  } catch {
-    return '';
-  }
-}
-
-function helperVersion(): number | null {
-  if (!runningAsMetro()) return null;
-  const v = Number(rootHelper(['version']).stdout.trim());
-  return Number.isInteger(v) ? v : null;
-}
-
-function view(): unknown {
-  const runningAs = runningAsRoot() ? 'root' : runningAsMetro() ? 'metro' : 'other';
-  const helper = helperVersion();
-  return {
-    runningAs,
-    canMove: runningAs === 'root',
-    move: moveState(),
-    log: logTail(),
-    helper,
-    helperCurrent: runningAs !== 'metro' || helper === HELPER_VERSION,
-  };
-}
-
-export function handleMetroUserRequest(req: IncomingMessage, res: ServerResponse): boolean {
-  return sessionRoute(req, res, { methods: { [PATH]: ['GET', 'POST'] }, admin: true, label: 'metro-user-api' }, () => {
-    if (req.method === 'POST') startMove();
-    return Promise.resolve(view());
-  });
-}