ethagent 3.0.1 → 3.1.0

package/src/identity/wallet/browserWallet/walletPageSource.ts

@@ -0,0 +1,85 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const WALLET_PAGE_ENTRY_FILE = 'page.tsx'
+const WALLET_PAGE_MODULE_FILES = [
+  join('page', 'types.ts'),
+  join('page', 'html.ts'),
+  join('page', 'constants.ts'),
+  join('page', 'styles', 'base.ts'),
+  join('page', 'styles', 'components.ts'),
+  join('page', 'styles', 'responsive.ts'),
+  join('page', 'styles', 'index.ts'),
+  join('page', 'markup.ts'),
+  join('page', 'grainient.ts'),
+  join('page', 'state.ts'),
+  join('page', 'copy.ts'),
+  join('page', 'errorView.ts'),
+  join('page', 'walletProvider.ts'),
+  join('page', 'view.ts'),
+  join('page', 'controller.ts'),
+] as const
+
+export function walletPageSourceFiles(fromUrl = import.meta.url): string[] {
+  const sourceRoot = locateWalletPageSourceRoot(fromUrl)
+  return [
+    ...WALLET_PAGE_MODULE_FILES.map(file => join(sourceRoot, file)),
+    join(sourceRoot, WALLET_PAGE_ENTRY_FILE),
+  ]
+}
+
+export function walletPageSourceFile(relativeFile: string, fromUrl = import.meta.url): string {
+  return join(locateWalletPageSourceRoot(fromUrl), relativeFile)
+}
+
+export function loadWalletPageRawSource(fromUrl = import.meta.url): string {
+  return walletPageSourceFiles(fromUrl).map(file => readFileSync(file, 'utf8')).join('\n')
+}
+
+export function loadWalletPageSource(fromUrl = import.meta.url): string {
+  return stripWalletModuleSyntax(loadWalletPageRawSource(fromUrl))
+}
+
+export function stripWalletModuleSyntax(source: string): string {
+  const out: string[] = []
+  let skippingImport = false
+  for (const line of source.split(/\r?\n/)) {
+    const trimmed = line.trim()
+    if (skippingImport) {
+      if (/\bfrom\s+['"][^'"]+['"]/.test(trimmed) || trimmed.endsWith(';')) skippingImport = false
+      continue
+    }
+    if (trimmed.startsWith('import ')) {
+      if (!/\bfrom\s+['"][^'"]+['"]/.test(trimmed) && !trimmed.endsWith(';')) skippingImport = true
+      continue
+    }
+    out.push(line.replace(/^export\s+(?=(async\s+function|const|let|function|interface|type|class)\b)/, ''))
+  }
+  return out.join('\n')
+}
+
+function locateWalletPageSourceRoot(fromUrl: string): string {
+  for (const candidate of walletPageSourceRootCandidates(fromUrl)) {
+    if (hasWalletPageSourceFiles(candidate)) return candidate
+  }
+  throw new Error('could not locate browser wallet page source files')
+}
+
+function walletPageSourceRootCandidates(fromUrl: string): string[] {
+  const start = dirname(fileURLToPath(fromUrl))
+  const candidates = [join(start, '..')]
+  for (let dir = start; ; dir = dirname(dir)) {
+    candidates.push(join(dir, 'src', 'identity', 'wallet'))
+    const parent = dirname(dir)
+    if (parent === dir) break
+  }
+  return Array.from(new Set(candidates))
+}
+
+function hasWalletPageSourceFiles(sourceRoot: string): boolean {
+  return [
+    ...WALLET_PAGE_MODULE_FILES,
+    WALLET_PAGE_ENTRY_FILE,
+  ].every(file => existsSync(join(sourceRoot, file)))
+}

package/src/identity/wallet/page/controller.ts

@@ -11,12 +11,12 @@ import {
   errorSlot,
   getLastWalletError,
   initializeViewElements,
-  serializeWalletError,
   setState,
   showPreparedMessage,
   statusHint,
   statusText,
 } from './view.js'
+import { serializeWalletError } from './errorView.js'
 import {
   buildTxParams,
   clearCurrentWalletMethod,

package/src/identity/wallet/page/errorView.ts

@@ -0,0 +1,122 @@
+import { config } from './state.js'
+import type { WalletErrorPayload } from './types.js'
+import { escapeHtml } from './html.js'
+import {
+  chainLabel,
+  PURPOSE_COPY,
+  type PurposeCopyEntry,
+} from './copy.js'
+
+export function serializeWalletError(err: unknown, method: string | null): WalletErrorPayload {
+  const e = err as any
+  const message = ((e && (e.message ?? String(err))) || 'Something went wrong.').trim()
+  const codeRaw = e && (e.code ?? e.errorCode)
+  const code = codeRaw === undefined || codeRaw === null ? undefined : String(codeRaw)
+  const data = safeStringify(e && e.data, 500)
+  const causes: string[] = []
+  let cur = e && e.cause
+  for (let i = 0; i < 5 && cur; i++) {
+    const cm = ((cur && (cur.message ?? String(cur))) || '').trim()
+    if (cm) causes.push(cm)
+    cur = cur && cur.cause
+  }
+  const out: WalletErrorPayload = { message }
+  if (code) out.code = code
+  if (data) out.data = data
+  if (causes.length) out.causes = causes
+  if (method) out.method = method
+  if (config.purpose) out.purpose = config.purpose
+  if (config.chainIdHex) out.chainIdHex = config.chainIdHex
+  return out
+}
+
+export function walletErrorHtml(payload: WalletErrorPayload): string {
+  const msg = payload.message || 'Something went wrong.'
+  const isNoWallet = /no wallet|window\.ethereum|metamask|rabby|brave|extension/i.test(msg)
+  const isUserReject = /user rejected|user denied|cancelled|canceled/i.test(msg)
+  const isWrongChain = /chain|network/i.test(msg) && !isNoWallet
+  const isExecutionRevert = /execution reverted|revert/i.test(msg)
+  const isOwnerWalletRequired = /owner wallet required/i.test(msg)
+  const isOperatorWalletRequired = /operator wallet required/i.test(msg)
+  let title = 'Wallet Error'
+  let body = msg
+  let hint = 'Press <code>enter</code> to retry or <code>esc</code> to abort.'
+  const codeClass = classifyByCode(payload.code)
+  if (codeClass) {
+    title = codeClass.title
+    hint = codeClass.hint
+  } else if (isOwnerWalletRequired) {
+    title = 'Owner Wallet Required'
+    body = msg.replace(/^owner wallet required:\s*/i, '')
+    body = body ? body.charAt(0).toUpperCase() + body.slice(1) : 'Switch to the owner wallet.'
+    hint = 'Switch to the owner wallet, then retry.'
+  } else if (isOperatorWalletRequired) {
+    title = 'Operator Wallet Required'
+    body = msg.replace(/^operator wallet required:\s*/i, '')
+    body = body ? body.charAt(0).toUpperCase() + body.slice(1) : 'Switch to the operator wallet.'
+    hint = 'Switch to the operator wallet, then retry.'
+  } else if (isNoWallet) {
+    title = 'No Wallet'
+    body = 'Install a wallet.'
+    hint = 'Install a wallet, then retry.'
+  } else if (isUserReject) {
+    title = 'Rejected'
+    body = 'Request declined in wallet.'
+    hint = 'Press <code>enter</code> to retry or <code>esc</code> to abort.'
+  } else if (isWrongChain) {
+    title = 'Wrong Network'
+    hint = `Switch to <code>${escapeHtml(chainLabel(config.chainIdHex))}</code>, then retry.`
+  } else if (isExecutionRevert) {
+    title = 'Transaction Reverted'
+    hint = 'Use the expected wallet and check ENS ownership, then retry.'
+  }
+  if (body) body = body.charAt(0).toUpperCase() + body.slice(1)
+  payload.title = title
+  const action = actionContextFor(payload)
+  let html = `<p class="error-title">${escapeHtml(title)}</p>`
+    + `<p class="error-msg">${escapeHtml(body)}</p>`
+  if (action) html += `<p class="error-action">${escapeHtml(action)}</p>`
+  if (payload.causes && payload.causes.length) {
+    for (const cause of payload.causes) {
+      html += `<p class="error-cause">Caused by: ${escapeHtml(cause)}</p>`
+    }
+  }
+  html += `<p class="error-hint">${hint}</p>`
+  return html
+}
+
+function safeStringify(v: unknown, max: number): string | undefined {
+  if (v === undefined || v === null) return undefined
+  let s: string
+  try { s = typeof v === 'string' ? v : JSON.stringify(v) } catch (_) { s = String(v) }
+  if (!s) return undefined
+  return s.length > max ? s.slice(0, max) + '...' : s
+}
+
+function actionContextFor(payload: WalletErrorPayload): string {
+  const purpose = payload.purpose || config.purpose
+  if (purpose) {
+    const copy = (PURPOSE_COPY as any)[purpose] as PurposeCopyEntry | undefined
+    const ctx = copy && (copy as any).errorContext
+    if (typeof ctx === 'string' && ctx) return ctx
+  }
+  if (payload.method) return `during ${payload.method}`
+  return ''
+}
+
+function classifyByCode(code: string | undefined): { title: string; hint: string } | null {
+  if (!code) return null
+  switch (code) {
+    case '4001': return { title: 'Rejected', hint: 'Press <code>enter</code> to retry or <code>esc</code> to abort.' }
+    case '4100': return { title: 'Wallet Not Authorized', hint: 'Connect this site in your wallet, then retry.' }
+    case '4200': return { title: 'Method Not Supported by Wallet', hint: 'Use a wallet that supports this transaction type, then retry.' }
+    case '4900': return { title: 'Wallet Disconnected', hint: 'Reconnect your wallet, then retry.' }
+    case '4901': return { title: 'Wrong Network', hint: `Switch to <code>${escapeHtml(chainLabel(config.chainIdHex))}</code>, then retry.` }
+    case '-32603': return { title: 'Internal Wallet RPC Error', hint: "The wallet's connected RPC failed. Try again, or switch RPC in your wallet settings." }
+    case '-32602': return { title: 'Invalid Request Parameters', hint: 'Press <code>enter</code> to retry or <code>esc</code> to abort.' }
+    case '-32000': case '-32001': case '-32002': case '-32003': case '-32004':
+    case '-32005': case '-32006': case '-32007': case '-32008': case '-32009':
+      return { title: 'Wallet RPC Error', hint: 'The wallet RPC reported a server error. Try again or switch RPC in your wallet.' }
+    default: return null
+  }
+}

package/src/identity/wallet/page/view.ts

@@ -1,12 +1,11 @@
 import { config } from './state.js'
 import type { WalletErrorPayload } from './types.js'
-import { escapeHtml, glyphs } from './html.js'
+import { glyphs } from './html.js'
 import {
   accountCopy,
   chainLabel,
   FLOW_COPY,
   isTransactionFlow,
-  PURPOSE_COPY,
   purposeCopy,
   signCopy,
   STATE_TITLES,
@@ -14,8 +13,8 @@ import {
   transactionCopy,
   transactionPurposeTitle,
   type FlowCopy,
-  type PurposeCopyEntry,
 } from './copy.js'
+import { walletErrorHtml } from './errorView.js'
 
 let card: HTMLElement;
 let promptText: HTMLElement;
@@ -416,118 +415,8 @@ export function setState(state: string, payload?: any): void {
 
 let lastWalletError: WalletErrorPayload | null = null;
 
-function safeStringify(v: unknown, max: number): string | undefined {
-  if (v === undefined || v === null) return undefined;
-  let s: string;
-  try { s = typeof v === "string" ? v : JSON.stringify(v); } catch (_) { s = String(v); }
-  if (!s) return undefined;
-  return s.length > max ? s.slice(0, max) + "..." : s;
-}
-
-export function serializeWalletError(err: unknown, method: string | null): WalletErrorPayload {
-  const e = err as any;
-  const message = ((e && (e.message ?? String(err))) || "Something went wrong.").trim();
-  const codeRaw = e && (e.code ?? e.errorCode);
-  const code = codeRaw === undefined || codeRaw === null ? undefined : String(codeRaw);
-  const data = safeStringify(e && e.data, 500);
-  const causes: string[] = [];
-  let cur = e && e.cause;
-  for (let i = 0; i < 5 && cur; i++) {
-    const cm = ((cur && (cur.message ?? String(cur))) || "").trim();
-    if (cm) causes.push(cm);
-    cur = cur && cur.cause;
-  }
-  const out: WalletErrorPayload = { message };
-  if (code) out.code = code;
-  if (data) out.data = data;
-  if (causes.length) out.causes = causes;
-  if (method) out.method = method;
-  if (config.purpose) out.purpose = config.purpose;
-  if (config.chainIdHex) out.chainIdHex = config.chainIdHex;
-  return out;
-}
-
-function actionContextFor(payload: WalletErrorPayload): string {
-  const purpose = payload.purpose || config.purpose;
-  if (purpose) {
-    const copy = (PURPOSE_COPY as any)[purpose] as PurposeCopyEntry | undefined;
-    const ctx = copy && (copy as any).errorContext;
-    if (typeof ctx === "string" && ctx) return ctx;
-  }
-  if (payload.method) return "during " + payload.method;
-  return "";
-}
-
-function classifyByCode(code: string | undefined): { title: string; hint: string } | null {
-  if (!code) return null;
-  switch (code) {
-    case "4001": return { title: "Rejected", hint: "Press <code>enter</code> to retry or <code>esc</code> to abort." };
-    case "4100": return { title: "Wallet Not Authorized", hint: "Connect this site in your wallet, then retry." };
-    case "4200": return { title: "Method Not Supported by Wallet", hint: "Use a wallet that supports this transaction type, then retry." };
-    case "4900": return { title: "Wallet Disconnected", hint: "Reconnect your wallet, then retry." };
-    case "4901": return { title: "Wrong Network", hint: "Switch to <code>" + escapeHtml(chainLabel(config.chainIdHex)) + "</code>, then retry." };
-    case "-32603": return { title: "Internal Wallet RPC Error", hint: "The wallet's connected RPC failed. Try again, or switch RPC in your wallet settings." };
-    case "-32602": return { title: "Invalid Request Parameters", hint: "Press <code>enter</code> to retry or <code>esc</code> to abort." };
-    case "-32000": case "-32001": case "-32002": case "-32003": case "-32004":
-    case "-32005": case "-32006": case "-32007": case "-32008": case "-32009":
-      return { title: "Wallet RPC Error", hint: "The wallet RPC reported a server error. Try again or switch RPC in your wallet." };
-    default: return null;
-  }
-}
-
 function renderError(payload: WalletErrorPayload): void {
-  const msg = payload.message || "Something went wrong.";
-  const isNoWallet = /no wallet|window\.ethereum|metamask|rabby|brave|extension/i.test(msg);
-  const isUserReject = /user rejected|user denied|cancelled|canceled/i.test(msg);
-  const isWrongChain = /chain|network/i.test(msg) && !isNoWallet;
-  const isExecutionRevert = /execution reverted|revert/i.test(msg);
-  const isOwnerWalletRequired = /owner wallet required/i.test(msg);
-  const isOperatorWalletRequired = /operator wallet required/i.test(msg);
-  let title = "Wallet Error";
-  let body = msg;
-  let hint = "Press <code>enter</code> to retry or <code>esc</code> to abort.";
-  const codeClass = classifyByCode(payload.code);
-  if (codeClass) {
-    title = codeClass.title;
-    hint = codeClass.hint;
-  } else if (isOwnerWalletRequired) {
-    title = "Owner Wallet Required";
-    body = msg.replace(/^owner wallet required:\s*/i, "");
-    body = body ? body.charAt(0).toUpperCase() + body.slice(1) : "Switch to the owner wallet.";
-    hint = "Switch to the owner wallet, then retry.";
-  } else if (isOperatorWalletRequired) {
-    title = "Operator Wallet Required";
-    body = msg.replace(/^operator wallet required:\s*/i, "");
-    body = body ? body.charAt(0).toUpperCase() + body.slice(1) : "Switch to the operator wallet.";
-    hint = "Switch to the operator wallet, then retry.";
-  } else if (isNoWallet) {
-    title = "No Wallet";
-    body = "Install a wallet.";
-    hint = "Install a wallet, then retry.";
-  } else if (isUserReject) {
-    title = "Rejected";
-    body = "Request declined in wallet.";
-    hint = "Press <code>enter</code> to retry or <code>esc</code> to abort.";
-  } else if (isWrongChain) {
-    title = "Wrong Network";
-    hint = "Switch to <code>" + escapeHtml(chainLabel(config.chainIdHex)) + "</code>, then retry.";
-  } else if (isExecutionRevert) {
-    title = "Transaction Reverted";
-    hint = "Use the expected wallet and check ENS ownership, then retry.";
-  }
-  if (body) body = body.charAt(0).toUpperCase() + body.slice(1);
-  payload.title = title;
-  const action = actionContextFor(payload);
-  let html = '<p class="error-title">' + escapeHtml(title) + "</p>"
-    + '<p class="error-msg">' + escapeHtml(body) + "</p>";
-  if (action) html += '<p class="error-action">' + escapeHtml(action) + "</p>";
-  if (payload.causes && payload.causes.length) {
-    for (const cause of payload.causes) {
-      html += '<p class="error-cause">Caused by: ' + escapeHtml(cause) + "</p>";
-    }
-  }
-  html += '<p class="error-hint">' + hint + "</p>";
-  errorSlot.innerHTML = html;
+  errorSlot.innerHTML = walletErrorHtml(payload);
   lastWalletError = payload;
 }
 

package/src/mcp/manager.ts

@@ -2,9 +2,6 @@ import { Ajv } from 'ajv'
 import { z } from 'zod'
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js'
 import type { Tool, ToolResult } from '../tools/contracts.js'
 import {
@@ -28,12 +25,19 @@ import {
   formatMcpResourceResult,
   promptMessagesToText,
 } from './output.js'
+import {
+  createTransport,
+  findScopedServer,
+  findServerSnapshot,
+  normalizeInputSchemaJson,
+  parsePromptArgs,
+} from './managerHelpers.js'
 
 const MCP_CONNECT_TIMEOUT_MS = 10_000
 const MCP_LIST_TIMEOUT_MS = 10_000
 const MCP_TOOL_TIMEOUT_MS = 120_000
 
-type ListedMcpTool = {
+export type ListedMcpTool = {
   name: string
   description?: string
   inputSchema: {
@@ -476,65 +480,3 @@ export class McpManager implements McpRuntime {
     this.tools = []
   }
 }
-
-function createTransport(config: McpServerConfig, cwd: string): Transport {
-  if (config.type === 'http') {
-    return new StreamableHTTPClientTransport(new URL(config.url), {
-      requestInit: config.headers ? { headers: config.headers } : undefined,
-    })
-  }
-  if (config.type === 'sse') {
-    return new SSEClientTransport(new URL(config.url), {
-      requestInit: config.headers ? { headers: config.headers } : undefined,
-      eventSourceInit: config.headers ? { fetch: (url, init) => fetch(url, { ...init, headers: config.headers }) } : undefined,
-    })
-  }
-  return new StdioClientTransport({
-    command: config.command,
-    args: config.args ?? [],
-    env: config.env ? mergeProcessEnv(config.env) : undefined,
-    cwd: config.cwd ?? cwd,
-    stderr: 'pipe',
-  })
-}
-
-function mergeProcessEnv(extra: Record<string, string>): Record<string, string> {
-  const env: Record<string, string> = {}
-  for (const [key, value] of Object.entries(process.env)) {
-    if (value !== undefined) env[key] = value
-  }
-  return { ...env, ...extra }
-}
-
-function normalizeInputSchemaJson(schema: ListedMcpTool['inputSchema']): Tool['inputSchemaJson'] {
-  return {
-    type: 'object',
-    properties: schema.properties,
-    required: schema.required,
-    oneOf: Array.isArray(schema.oneOf) ? schema.oneOf as Array<Record<string, unknown>> : undefined,
-    anyOf: Array.isArray(schema.anyOf) ? schema.anyOf as Array<Record<string, unknown>> : undefined,
-    additionalProperties: schema.additionalProperties as boolean | undefined,
-  }
-}
-
-function findScopedServer(servers: ScopedMcpServerConfig[], name: string): ScopedMcpServerConfig | undefined {
-  const normalized = normalizeNameForMcp(name)
-  return servers.find(server => server.name === name || normalizeNameForMcp(server.name) === normalized)
-}
-
-function findServerSnapshot(servers: McpServerSnapshot[], name: string): McpServerSnapshot | undefined {
-  const normalized = normalizeNameForMcp(name)
-  return servers.find(server => server.name === name || server.normalizedName === normalized)
-}
-
-function parsePromptArgs(value: string): Record<string, string> {
-  const args: Record<string, string> = {}
-  for (const token of value.trim().split(/\s+/).filter(Boolean)) {
-    const idx = token.indexOf('=')
-    if (idx === -1) continue
-    const key = token.slice(0, idx)
-    if (!key) continue
-    args[key] = token.slice(idx + 1)
-  }
-  return args
-}

package/src/mcp/managerHelpers.ts

@@ -0,0 +1,70 @@
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+import type { Tool } from '../tools/contracts.js'
+import type { McpServerConfig, ScopedMcpServerConfig } from './config.js'
+import { normalizeNameForMcp } from './names.js'
+import type { ListedMcpTool, McpServerSnapshot } from './manager.js'
+
+export function createTransport(config: McpServerConfig, cwd: string): Transport {
+  if (config.type === 'http') {
+    return new StreamableHTTPClientTransport(new URL(config.url), {
+      requestInit: config.headers ? { headers: config.headers } : undefined,
+    })
+  }
+  if (config.type === 'sse') {
+    return new SSEClientTransport(new URL(config.url), {
+      requestInit: config.headers ? { headers: config.headers } : undefined,
+      eventSourceInit: config.headers ? { fetch: (url, init) => fetch(url, { ...init, headers: config.headers }) } : undefined,
+    })
+  }
+  return new StdioClientTransport({
+    command: config.command,
+    args: config.args ?? [],
+    env: config.env ? mergeProcessEnv(config.env) : undefined,
+    cwd: config.cwd ?? cwd,
+    stderr: 'pipe',
+  })
+}
+
+export function normalizeInputSchemaJson(schema: ListedMcpTool['inputSchema']): Tool['inputSchemaJson'] {
+  return {
+    type: 'object',
+    properties: schema.properties,
+    required: schema.required,
+    oneOf: Array.isArray(schema.oneOf) ? schema.oneOf as Array<Record<string, unknown>> : undefined,
+    anyOf: Array.isArray(schema.anyOf) ? schema.anyOf as Array<Record<string, unknown>> : undefined,
+    additionalProperties: schema.additionalProperties as boolean | undefined,
+  }
+}
+
+export function findScopedServer(servers: ScopedMcpServerConfig[], name: string): ScopedMcpServerConfig | undefined {
+  const normalized = normalizeNameForMcp(name)
+  return servers.find(server => server.name === name || normalizeNameForMcp(server.name) === normalized)
+}
+
+export function findServerSnapshot(servers: McpServerSnapshot[], name: string): McpServerSnapshot | undefined {
+  const normalized = normalizeNameForMcp(name)
+  return servers.find(server => server.name === name || server.normalizedName === normalized)
+}
+
+export function parsePromptArgs(value: string): Record<string, string> {
+  const args: Record<string, string> = {}
+  for (const token of value.trim().split(/\s+/).filter(Boolean)) {
+    const idx = token.indexOf('=')
+    if (idx === -1) continue
+    const key = token.slice(0, idx)
+    if (!key) continue
+    args[key] = token.slice(idx + 1)
+  }
+  return args
+}
+
+function mergeProcessEnv(extra: Record<string, string>): Record<string, string> {
+  const env: Record<string, string> = {}
+  for (const [key, value] of Object.entries(process.env)) {
+    if (value !== undefined) env[key] = value
+  }
+  return { ...env, ...extra }
+}