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

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

@@ -1,7 +1,7 @@
 import { join } from 'node:path';
-import { readJson, writeSecure } from '../daemon/secure-fs.js';
-import { agentsDir } from '../db/file-source.js';
-import { isRecord } from '../daemon/is-record.js';
+import { readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { agentsDir } from '../agents/files.js';
+import { isRecord } from '@metro-labs/core/is-record';
 import type { CodexTokens } from './codex-auth.js';
 
 export const PROVIDERS = ['anthropic', 'bedrock', 'openrouter', 'codex'] as const;

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

@@ -1,4 +1,4 @@
-import { isRecord } from '../daemon/is-record.js';
+import { isRecord } from '@metro-labs/core/is-record';
 import { GatewayError } from './forward.js';
 
 export const OPENROUTER_BASE = 'https://openrouter.ai/api';

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

@@ -1,13 +1,11 @@
-import { forwardTrainCall } from '../daemon/train-call.js';
+import { forwardTrainCall } from '../stations/train-call.js';
 import {
   accountStationNames,
   stationByName,
 } from '../stations/registry.js';
-import { listEndpoints } from '../daemon/tunnel.js';
+import { listEndpoints } from '../net/tunnel.js';
 import { hookUrl } from '../stations/attach.js';
-import { agentIdForAccount, knownAccounts, type KnownAccount } from '../db/agent-map.js';
-import { stationRunsHere } from '../db/materialize.js';
-import { type StationName } from '../db/stations.js';
+import { agentIdForAccount, knownAccounts, type KnownAccount } from '../agents/map.js';
 
 const accountId = (acc: unknown): string | undefined => {
   const id = (acc as { id?: unknown }).id;
@@ -81,8 +79,6 @@ async function liveAccounts(
 ): Promise<{ rows: unknown[]; reachable: boolean }> {
   if (!hasTrain(station))
     return { rows: inCoreAccounts(station), reachable: true };
-  if (!stationRunsHere(station as StationName))
-    return { rows: [], reachable: true };
   try {
     const resp = await forwardTrainCall(station, 'accounts', {});
     const list = (resp.result as { accounts?: unknown[] } | undefined)?.accounts;

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

@@ -1,14 +1,14 @@
 import { stationForLine } from '../stations/registry.js';
-import { kindOf, toCanonical } from '../stations/attachments.js';
+import { kindOf, toCanonical } from '@metro-labs/core/stations/attachments';
 import {
   cleanupAttachments,
   resolveAttachments,
   type ResolvedAttachment,
 } from '../stations/attach-resolve.js';
-import type { CanonicalAttachment, ToolResult } from '../stations/types.js';
+import type { CanonicalAttachment, ToolResult } from '@metro-labs/core/stations/types';
 import { errResult, makeCtx, ok, okJson, toErr } from './ctx.js';
 import { allowedAgents, currentIdentity } from './request-identity.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
 
 type Station = NonNullable<ReturnType<typeof stationForLine>>;
 

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

@@ -1,4 +1,4 @@
-import { eventInScope } from '../db/agent-scope.js';
+import { eventInScope } from '../agents/scope.js';
 import { allowedAgents, type RequestIdentity } from './request-identity.js';
 import { sessionScopeKey } from './session-route.js';
 

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

@@ -1,8 +1,8 @@
 import { readFile } from 'node:fs/promises';
-import { forwardTrainCall } from '../daemon/train-call.js';
-import { errMsg, log } from '../daemon/log.js';
-import { TrainError } from '../daemon/train-error.js';
-import { type ToolContext, type ToolResult } from '../stations/types.js';
+import { forwardTrainCall } from '../stations/train-call.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { TrainError } from '@metro-labs/core/train-error';
+import { type ToolContext, type ToolResult } from '@metro-labs/core/stations/types';
 
 export async function metroCall(
   train: string,

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

@@ -1,6 +1,6 @@
 import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
-import { eventInScope } from '../db/agent-scope.js';
-import { str } from './str.js';
+import { eventInScope } from '../agents/scope.js';
+import { str } from '@metro-labs/core/str';
 
 export interface FrameOrigin {
   line: string | undefined;

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

@@ -5,9 +5,9 @@ import type {
   MemberOutcome,
   Station,
   ToolResult,
-} from '../stations/types.js';
+} from '@metro-labs/core/stations/types';
 import { makeCtx, okJson, toErr } from './ctx.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
 
 export interface GroupOpResult {
   op: GroupOp;

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

@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http';
 import {
   BodyTooLargeError,
   readBody as readBodyBuffer,
-} from '../daemon/http.js';
+} from '../routes/http.js';
 import {
   allowedAgents,
   authenticate,

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

@@ -4,9 +4,9 @@ import type {
   MemberList,
   MetroMember,
   ToolResult,
-} from '../stations/types.js';
+} from '@metro-labs/core/stations/types';
 import { makeCtx, okJson, toErr } from './ctx.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
 
 export interface MemberListResult {
   line: string;

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

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import type { IncomingMessage } from 'node:http';
-import { agentIdForKey } from '../db/key-map.js';
+import { agentIdForKey } from '../agents/keys.js';
 
 export type RequestIdentity =
   | { kind: 'agent'; agentId: string }

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

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
-import { currentBusSeq } from '../daemon/events.js';
-import { errMsg } from '../daemon/log.js';
+import { currentBusSeq } from '@metro-labs/core/events';
+import { errMsg } from '@metro-labs/core/log';
 import { newReplayLedger, type ReplayLedger } from '../channels/relay.js';
 import { McpSession, channelLog } from './session.js';
 import { agentsInScopeKey } from './session-route.js';

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

@@ -2,11 +2,11 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { InboundRelay } from '../channels/inbound.js';
 import { ChannelRelay, type ReplayLedger } from '../channels/relay.js';
-import { errMsg } from '../daemon/log.js';
+import { errMsg } from '@metro-labs/core/log';
 import {
   allowlistForLine,
   senderMatchesAllowlist,
-} from '../db/agent-map.js';
+} from '../agents/map.js';
 import { accountStationNames } from '../stations/registry.js';
 import { MCP_INSTRUCTIONS } from './tool-schemas.js';
 import { ChannelOwner } from './channel-owner.js';

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

@@ -9,7 +9,7 @@ import {
   STATIONS,
   accountStationCapabilities,
 } from '../stations/registry.js';
-import type { Station, StationTool, ToolResult } from '../stations/types.js';
+import type { Station, StationTool, ToolResult } from '@metro-labs/core/stations/types';
 import { COMMON_TOOLS, LIST_ACCOUNTS_TOOL } from './tool-schemas.js';
 import { errResult, makeCtx, okJson, toErr } from './ctx.js';
 import { dispatchMessageTool, type ToolHooks } from './call-tools.js';
@@ -21,16 +21,16 @@ import {
   dispatchRemoveMembers,
 } from './group-tools.js';
 import { dispatchCreateUpload } from './upload-tool.js';
-import { callTargetDenied, lineTargetDenied } from '../db/agent-scope.js';
+import { callTargetDenied, lineTargetDenied } from '../agents/scope.js';
 import { SOURCE_KEYS } from '../stations/attach-resolve.js';
 import { decodedLengthOf } from '../stations/attach-inline.js';
-import { log } from '../daemon/log.js';
+import { log } from '@metro-labs/core/log';
 import {
   allowedAgents,
   currentIdentity,
   type RequestIdentity,
 } from './request-identity.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
 
 const STATION_TOOLS = new Map<
   string,

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

@@ -1,17 +1,17 @@
-import { publicBaseOrDefault } from '../daemon/attach-serve.js';
+import { publicBaseOrDefault } from '../files/attach-serve.js';
 import { safeFileName } from '../stations/attach-inline.js';
-import { guessMime } from '../stations/attachments.js';
+import { guessMime } from '@metro-labs/core/stations/attachments';
 import {
   createUploadSlot,
   issueUploadTicket,
   MAX_UPLOAD_BYTES,
   removeUpload,
   UPLOAD_TTL_MS,
-} from '../daemon/upload-store.js';
-import type { ToolResult } from '../stations/types.js';
+} from '../files/upload-store.js';
+import type { ToolResult } from '@metro-labs/core/stations/types';
 import { errResult, okJson } from './ctx.js';
 import { allowedAgents, currentIdentity } from './request-identity.js';
-import { str } from './str.js';
+import { str } from '@metro-labs/core/str';
 
 const ttlMinutes = (): number => Math.round(UPLOAD_TTL_MS / 60_000);
 

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

@@ -1,14 +1,14 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { stationByName } from '../stations/registry.js';
-import { errMsg, log } from '../daemon/log.js';
-import { subscribeEvents, type MetroEvent } from '../daemon/events.js';
-import { callTargetDenied, eventInScope } from '../db/agent-scope.js';
-import { hasAnyKey } from '../db/key-map.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { subscribeEvents, type MetroEvent } from '@metro-labs/core/events';
+import { callTargetDenied, eventInScope } from '../agents/scope.js';
+import { hasAnyKey } from '../agents/keys.js';
 import {
   allowedAgents,
   authenticate,
 } from '../mcp/request-identity.js';
-import { METRO_VERSION } from '../daemon/version.js';
+import { METRO_VERSION } from '@metro-labs/core/version';
 
 export type MonitorCall = (
   train: string,

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

@@ -1,12 +1,13 @@
+import type { Endpoint } from '@metro-labs/core/endpoints';
 import { execFile, spawn, type ChildProcess } from 'node:child_process';
 import { timingSafeEqual } from 'node:crypto';
 import { Resolver } from 'node:dns/promises';
 import { request as httpsRequest } from 'node:https';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { errMsg, log } from './log.js';
-import { readJson } from './secure-fs.js';
-import { localOwner } from '../db/file-admin.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { readJson } from '@metro-labs/core/secure-fs';
+import { localOwner } from '../agents/file-admin.js';
 
 const RESTART_DELAY_MS = 2_000;
 const RESTART_DELAY_MAX_MS = 30_000;
@@ -183,13 +184,6 @@ async function untilResolvable(host: string, resolves: Resolves): Promise<boolea
   return false;
 }
 
-export interface Endpoint {
-  id: string;
-  webhookId?: string;
-  label: string;
-  secret?: string;
-  createdAt: string;
-}
 interface AccountRecord {
   id?: unknown;
   webhookId?: unknown;
@@ -201,6 +195,8 @@ interface AccountRecord {
 export const webhookPort = (): number =>
   Number(process.env.METRO_WEBHOOK_PORT) || 8420;
 
+export type { Endpoint };
+
 const accountsFile = (): string =>
   process.env.WEBHOOK_ACCOUNTS_FILE ??
   join(homedir(), '.metro', 'webhook-accounts.json');

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

@@ -1,14 +1,14 @@
 import { handleSessionApis, type SessionApis } from './session-apis.js';
 import { handleGatewayRequest } from '../gateway/gateway.js';
-import { handleRelayRequest } from './relay.js';
+import { handleRelayRequest } from '../connectors/relay.js';
 import {
   createServer,
   type IncomingMessage,
   type Server,
   type ServerResponse,
 } from 'node:http';
-import { Line } from '../stations/lines.js';
-import { errMsg, log } from './log.js';
+import { Line } from '@metro-labs/core/lines';
+import { errMsg, log } from '@metro-labs/core/log';
 import {
   classifyEvent,
   formatDisplay,
@@ -16,29 +16,29 @@ import {
   publishEvent,
   userSelf,
   type MetroEvent,
-} from './events.js';
-import type { TrainEvent } from './protocol.js';
-import { agentForLine, agentIdForLine } from '../db/agent-map.js';
+} from '@metro-labs/core/events';
+import type { TrainEvent } from '@metro-labs/core/trains/protocol';
+import { agentForLine, agentIdForLine } from '../agents/map.js';
 import {
   findEndpointByWebhookId,
   listEndpoints,
   tokenMatches,
   webhookPort,
   type Endpoint,
-} from './tunnel.js';
-import { attachmentEventUrl, handleAttachRequest } from './attach-serve.js';
+} from '../net/tunnel.js';
+import { attachmentEventUrl, handleAttachRequest } from '../files/attach-serve.js';
 import { webhookEntry } from '@metro-labs/webhook';
-import { handleIdentityRequest } from './identity-routes.js';
-import { attachTerminalSockets } from './terminal-ws.js';
-import { tmuxCommand } from './terminal-api.js';
-import { handleModeRequest } from './mode-api.js';
-import { handleUploadRequest } from './upload-api.js';
+import { handleIdentityRequest } from './identity.js';
+import { attachTerminalSockets } from '../terminal/socket.js';
+import { tmuxCommand } from '../terminal/api.js';
+import { handleModeRequest } from '@metro-labs/http/mode-api';
+import { handleUploadRequest } from '../files/upload-api.js';
 import {
   handleMonitorRequest,
   type MonitorCall,
 } from '../monitor/api.js';
-import { applyMcpCors, handleMcpPreflight } from './cors.js';
-import { METRO_VERSION } from './version.js';
+import { applyMcpCors, handleMcpPreflight } from '@metro-labs/http/cors';
+import { METRO_VERSION } from '@metro-labs/core/version';
 
 const LRU_CAP = 2_000;
 

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

@@ -1,10 +1,10 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { verifyTypedData } from 'viem';
-import { log } from './log.js';
-import { ApiError } from './api-error.js';
-import { apiFailure, bodyField, cors, readJsonBody, sendJson } from './api-http.js';
-import { ENCRYPTION_KEY_TYPED_DATA, deriveIdentityAddress } from './identity-key.js';
-import { authorizeIdentity } from './identity-registry.js';
+import { log } from '@metro-labs/core/log';
+import { ApiError } from '@metro-labs/http/api-error';
+import { apiFailure, bodyField, cors, readJsonBody, sendJson } from '@metro-labs/http/api-http';
+import { ENCRYPTION_KEY_TYPED_DATA, deriveIdentityAddress } from '@metro-labs/http/identity-key';
+import { authorizeIdentity } from '@metro-labs/http/identity-registry';
 
 const PATH = '/auth/identity';
 const SIGNATURE_RE = /^0x[0-9a-fA-F]{130}$/;

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

@@ -1,16 +1,16 @@
-import { ApiError } from './api-error.js';
-import { errMsg, log } from './log.js';
-import { AttachSessions } from './attach-session.js';
-import type { AgentApiDeps } from './agent-api.js';
-import { ATTACHABLE, type AccountApiDeps } from './account-api.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { errMsg, log } from '@metro-labs/core/log';
+import { AttachSessions } from '../stations/attach-session.js';
+import type { AgentApiDeps } from '../agents/api.js';
+import { ATTACHABLE, type AccountApiDeps } from '../agents/accounts-api.js';
 import type { SessionApis } from './session-apis.js';
-import type { ModeInfo } from './mode-api.js';
-import { loadedAgentOf, type AgentBundle, type BundleApiDeps } from './bundle-api.js';
-import { METRO_VERSION } from './version.js';
-import type { ConnectorApiDeps } from './connector-api.js';
-import { allowLocalConnectors } from './connector-url.js';
-import { keyIdentity, type LocalCliDeps } from './local-cli-api.js';
-import type { RelayApiDeps } from './relay.js';
+import type { ModeInfo } from '@metro-labs/http/mode-api';
+import { loadedAgentOf, type AgentBundle, type BundleApiDeps } from '../agents/bundle.js';
+import { METRO_VERSION } from '@metro-labs/core/version';
+import type { ConnectorApiDeps } from '../connectors/api.js';
+import { allowLocalConnectors } from '../connectors/url.js';
+import { keyIdentity, type LocalCliDeps } from '../connectors/cli-api.js';
+import type { RelayApiDeps } from '../connectors/relay.js';
 import {
   readLocalConnectors,
   localImportConnectors,
@@ -25,7 +25,7 @@ import {
   localRelayTarget,
   localRenameConnector,
   localVerifyConnector,
-} from '../db/local-connectors.js';
+} from '../connectors/store.js';
 import {
   assertLocalOwner,
   LOCAL_PROJECT_ID,
@@ -39,10 +39,10 @@ import {
   localOwner,
   localResetAgentKey,
   readLocalAgentFile,
-} from '../db/file-admin.js';
-import { listAgentFiles, readAgentFile } from '../db/file-source.js';
+} from '../agents/file-admin.js';
+import { listAgentFiles, readAgentFile } from '../agents/files.js';
 import { readModelConfig } from '../gateway/model-config.js';
-import type { StationName } from '../db/stations.js';
+import type { StationName } from '@metro-labs/core/station-names';
 
 export interface LocalModeDeps {
   syncStations: (station: StationName) => Promise<void>;

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

@@ -1,30 +1,26 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { handleSessionApiRequest } from './session-api.js';
-import { handleAgentApiRequest, type AgentApiDeps } from './agent-api.js';
+import { handleSessionApiRequest } from './session.js';
+import { handleAgentApiRequest, type AgentApiDeps } from '../agents/api.js';
 import {
   handleConnectorApiRequest,
   type ConnectorApiDeps,
-} from './connector-api.js';
-import type { RelayApiDeps } from './relay.js';
-import type { IdentityRouteDeps } from './identity-routes.js';
-import { handleLocalCliRequest, type LocalCliDeps } from './local-cli-api.js';
-import { handleClaudeRequest, type ClaudeApiDeps } from './claude-api.js';
-import type { ModeInfo } from './mode-api.js';
-import { handleVaultApiRequest, type VaultApiDeps } from './vault-api.js';
-import { handleServersApiRequest, type ServersApiDeps } from './servers-api.js';
-import { handleBundleRequest, type BundleApiDeps } from './bundle-api.js';
-import { handleUpdateRequest, type UpdateApiDeps } from './update-api.js';
-import { handleControlRequest, type ControlApiDeps } from './control-api.js';
-import { handleMachineRequest, type MachineApiDeps } from './machine-api.js';
-import { handleModelRequest, type ModelApiDeps } from './model-api.js';
+} from '../connectors/api.js';
+import type { RelayApiDeps } from '../connectors/relay.js';
+import type { IdentityRouteDeps } from './identity.js';
+import { handleLocalCliRequest, type LocalCliDeps } from '../connectors/cli-api.js';
+import { handleClaudeRequest, type ClaudeApiDeps } from '../claude/api.js';
+import type { ModeInfo } from '@metro-labs/http/mode-api';
+import { handleBundleRequest, type BundleApiDeps } from '../agents/bundle.js';
+import { handleUpdateRequest, type UpdateApiDeps } from '../server/update.js';
+import { handleControlRequest, type ControlApiDeps } from '../server/control.js';
+import { handleMachineRequest, type MachineApiDeps } from '../server/machine.js';
+import { handleModelRequest, type ModelApiDeps } from '../gateway/model-api.js';
 import type { GatewayDeps } from '../gateway/gateway.js';
-import { handleTerminalRequest, type TerminalApiDeps } from './terminal-api.js';
+import { handleTerminalRequest, type TerminalApiDeps } from '../terminal/api.js';
 
 export interface SessionApis {
   agentApi?: AgentApiDeps;
   bundleApi?: BundleApiDeps;
-  vaultApi?: VaultApiDeps;
-  serversApi?: ServersApiDeps;
   updateApi?: UpdateApiDeps;
   controlApi?: ControlApiDeps;
   machineApi?: MachineApiDeps;
@@ -52,8 +48,6 @@ export function handleSessionApis(
     ...when(apis.localCli, (d) => handleLocalCliRequest(req, res, d)),
     ...when(apis.connectorApi, (d) => handleConnectorApiRequest(req, res, d)),
     ...when(apis.bundleApi, (d) => handleBundleRequest(req, res, d)),
-    ...when(apis.vaultApi, (d) => handleVaultApiRequest(req, res, d)),
-    ...when(apis.serversApi, (d) => handleServersApiRequest(req, res, d)),
     ...when(apis.updateApi, (d) => handleUpdateRequest(req, res, d)),
     ...when(apis.controlApi, (d) => handleControlRequest(req, res, d)),
     ...when(apis.machineApi, (d) => handleMachineRequest(req, res, d)),

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

@@ -1,5 +1,5 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { apiFailure, apiSession, cors, sendJson } from './api-http.js';
+import { apiFailure, apiSession, cors, sendJson } from '@metro-labs/http/api-http';
 
 const PATH = '/api/session';
 

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

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { ApiError } from './api-error.js';
-import { apiFailure, apiSession, cors, sendJson } from './api-http.js';
-import { errMsg, log } from './log.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { apiFailure, apiSession, cors, sendJson } from '@metro-labs/http/api-http';
+import { errMsg, log } from '@metro-labs/core/log';
 
 const STOP = '/api/stop';
 const RESTART = '/api/restart';

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

@@ -1,13 +1,13 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { hostname } from 'node:os';
-import { ApiError } from './api-error.js';
-import { apiFailure, apiSession, cors, sendJson } from './api-http.js';
-import { publicBaseUrl } from './attach-serve.js';
-import { claudeDir } from './claude-files.js';
-import { webhookPort } from './tunnel.js';
-import { METRO_VERSION } from './version.js';
-import { agentsDir } from '../db/file-source.js';
-import { localOwner } from '../db/file-admin.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { apiFailure, apiSession, cors, sendJson } from '@metro-labs/http/api-http';
+import { publicBaseUrl } from '../files/attach-serve.js';
+import { claudeDir } from '../claude/files.js';
+import { webhookPort } from '../net/tunnel.js';
+import { METRO_VERSION } from '@metro-labs/core/version';
+import { agentsDir } from '../agents/files.js';
+import { localOwner } from '../agents/file-admin.js';
 
 const PATH = '/api/server';
 

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

@@ -1,10 +1,10 @@
 import { execFile } from 'node:child_process';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { errMsg, log } from './log.js';
-import { ApiError } from './api-error.js';
-import { apiFailure, apiSession, cors, sendJson } from './api-http.js';
-import { isRecord } from './is-record.js';
-import { METRO_VERSION } from './version.js';
+import { errMsg, log } from '@metro-labs/core/log';
+import { ApiError } from '@metro-labs/http/api-error';
+import { apiFailure, apiSession, cors, sendJson } from '@metro-labs/http/api-http';
+import { isRecord } from '@metro-labs/core/is-record';
+import { METRO_VERSION } from '@metro-labs/core/version';
 
 const PATH = '/api/update';
 const CHECK_TTL_MS = 10 * 60_000;

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

@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+import './boot/boot.js';

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

@@ -3,7 +3,7 @@ import {
   assertContentLength,
   guessMime,
   saveBufferToCache,
-} from './attachments.js';
+} from '@metro-labs/core/stations/attachments';
 import {
   assertInlineTotal,
   decodeInline,
@@ -12,8 +12,9 @@ import {
   writeInlineTemp,
 } from './attach-inline.js';
 import { realpathSync } from 'node:fs';
-import { readUpload, UPLOAD_TTL_MS } from '../daemon/upload-store.js';
-import type { CanonicalAttachment } from './types.js';
+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';
 
 export interface ResolvedAttachment {
   path: string;
@@ -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/node_modules/@metro-labs/{mcp/src/daemon → daemon/src/stations}/attach-session.ts

@@ -1,7 +1,7 @@
 import { randomBytes } from 'node:crypto';
-import { ApiError } from './api-error.js';
-import { errMsg, log } from './log.js';
-import type { StationName } from '../db/stations.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { errMsg, log } from '@metro-labs/core/log';
+import type { StationName } from '@metro-labs/core/station-names';
 import { ensureStationDeps } from './runtime-deps.js';
 import {
   startInteractiveAttach,
@@ -12,7 +12,7 @@ import {
   type DriverHooks,
   type InteractiveStation,
   type StartedAttach,
-} from '../stations/attach-interactive.js';
+} from './attach-interactive.js';
 
 export type StartAttach = (
   station: InteractiveStation,

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

@@ -1,7 +1,7 @@
 import { randomBytes } from 'node:crypto';
 import { rmSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { errMsg, log } from '../daemon/log.js';
+import { errMsg, log } from '@metro-labs/core/log';
 
 export class XmtpAttachError extends Error {}
 

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

@@ -7,9 +7,9 @@ import {
   TelegramTokenError,
   verifyTelegramBotToken,
 } from '@metro-labs/telegram-bot/verify';
-import { ApiError } from '../daemon/api-error.js';
-import { ensureStationDeps } from '../daemon/runtime-deps.js';
-import { publicBaseOrDefault } from '../daemon/attach-serve.js';
+import { ApiError } from '@metro-labs/http/api-error';
+import { ensureStationDeps } from './runtime-deps.js';
+import { publicBaseOrDefault } from '../files/attach-serve.js';
 import {
   discardXmtpDb,
   newXmtpDbPath,