ethagent 3.3.4 → 4.0.0

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

@@ -1,30 +1,10 @@
-import { config } from './state.js'
-import type { WalletErrorPayload } from './types.js'
-import { glyphs } from './html.js'
-import {
-  accountCopy,
-  chainLabel,
-  FLOW_COPY,
-  isTransactionFlow,
-  purposeCopy,
-  signCopy,
-  STATE_TITLES,
-  shortAddr,
-  transactionCopy,
-  transactionPurposeTitle,
-  type FlowCopy,
-} from './copy.js'
-import { walletErrorHtml } from './errorView.js'
-
 let card: HTMLElement;
-let promptText: HTMLElement;
 let flowTitle: HTMLElement;
-let networkRow: HTMLElement;
+let flowSubtitle: HTMLElement;
 let flowDetail: HTMLElement;
 let detailsBlock: HTMLElement;
 let detailKey: HTMLElement;
 let detailVal: HTMLElement;
-let netVal: HTMLElement;
 let statusBlock: HTMLElement;
 let statusMarker: HTMLElement;
 export let statusText: HTMLElement;
@@ -41,14 +21,12 @@ function requiredElement<T extends HTMLElement>(id: string): T {
 
 export function initializeViewElements(): void {
   card = requiredElement("card");
-  promptText = requiredElement("prompt-text");
   flowTitle = requiredElement("flow-title");
-  networkRow = requiredElement("network-row");
+  flowSubtitle = requiredElement("flow-subtitle");
   flowDetail = requiredElement("flow-detail");
   detailsBlock = requiredElement("details-block");
   detailKey = requiredElement("detail-key");
   detailVal = requiredElement("detail-val");
-  netVal = requiredElement("net-val");
   statusBlock = requiredElement("status-block");
   statusMarker = requiredElement("status-marker");
   statusText = requiredElement("status-text");
@@ -58,17 +36,27 @@ export function initializeViewElements(): void {
   cancel = requiredElement("cancel");
 }
 
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const SPINNER_INTERVAL_MS = 80;
 let spinning = false;
+let spinnerTimer: ReturnType<typeof setInterval> | null = null;
+let spinnerIndex = 0;
 function startSpinner(): void {
   spinning = true;
-  statusMarker.innerHTML = '<span class="spinner" aria-hidden="true"></span>';
-  statusMarker.style.background = "transparent";
+  spinnerIndex = 0;
+  statusMarker.innerHTML = '<span class="spinner" aria-hidden="true">' + SPINNER_FRAMES[0] + '</span>';
+  const glyph = statusMarker.firstElementChild as HTMLElement | null;
+  if (spinnerTimer) clearInterval(spinnerTimer);
+  spinnerTimer = setInterval(() => {
+    spinnerIndex = (spinnerIndex + 1) % SPINNER_FRAMES.length;
+    if (glyph) glyph.textContent = SPINNER_FRAMES[spinnerIndex]!;
+  }, SPINNER_INTERVAL_MS);
 }
 function stopSpinner(): void {
+  if (spinnerTimer) { clearInterval(spinnerTimer); spinnerTimer = null; }
   if (!spinning) return;
   spinning = false;
   statusMarker.innerHTML = "";
-  statusMarker.style.background = "";
 }
 function setMarker(text: string): void { stopSpinner(); statusMarker.textContent = text; }
 export function flowCopy(): FlowCopy { return FLOW_COPY[config.kind] || FLOW_COPY.sign!; }
@@ -79,6 +67,7 @@ export function tabTitleForState(state: string): string {
   if (state === "preparing-transaction") return STATE_TITLES.preparingTransaction;
   if (state === "approve-transaction") return STATE_TITLES.approveTransaction;
   if (state === "error") return STATE_TITLES.error;
+  if (state === "cancelled") return STATE_TITLES.cancelled;
   if (state === "approve") {
     if (config.kind === "account") return accountCopy().text;
     if (config.kind === "sign") return STATE_TITLES.approveSign;
@@ -101,7 +90,7 @@ export function setTabTitle(title?: string): void {
   const t = title || flowCopy().tabTitle || STATE_TITLES.default;
   document.title = t;
   const chromeTitle = document.getElementById("chrome-title");
-  if (chromeTitle) chromeTitle.textContent = "ethagent · " + t;
+  if (chromeTitle) chromeTitle.textContent = t;
 }
 
 function messagePreview(message?: string): string {
@@ -118,6 +107,7 @@ export function showPreparedMessage(message: string): void {
   if (copy.detail !== "message") return;
   const preview = messagePreview(message);
   detailKey.textContent = copy.detail;
+  flowDetail.dataset.detail = copy.detail;
   detailVal.textContent = preview;
   flowDetail.hidden = preview.length === 0;
   detailsBlock.hidden = flowDetail.hidden;
@@ -126,7 +116,6 @@ export function showPreparedMessage(message: string): void {
 export function applyFlowChrome(): void {
   const copy = flowCopy();
   card.dataset.flow = copy.accent;
-  promptText.textContent = copy.label;
   flowTitle.textContent =
     config.kind === "account" && config.purpose
       ? purposeCopy().flowTitle
@@ -135,290 +124,21 @@ export function applyFlowChrome(): void {
         : config.kind === "transaction"
           ? transactionPurposeTitle()
           : copy.title;
+  const subtitle = (config.purpose && purposeSubtitle()) || copy.subtitle || "";
+  flowSubtitle.textContent = subtitle;
+  flowSubtitle.hidden = subtitle.length === 0;
   setTabTitle(copy.tabTitle);
   applyTransferTimeline();
   if (!copy.detail) {
-    networkRow.hidden = true;
     flowDetail.hidden = true;
     detailsBlock.hidden = true;
   } else {
-    networkRow.hidden = false;
     flowDetail.hidden = false;
     detailsBlock.hidden = false;
-    netVal.textContent = chainLabel(config.chainIdHex);
     detailKey.textContent = copy.detail;
+    flowDetail.dataset.detail = copy.detail;
     detailVal.textContent = detailPreview(copy);
     flowDetail.hidden = detailVal.textContent.length === 0;
     if (flowDetail.hidden) detailsBlock.hidden = true;
   }
 }
-
-type LifecycleId =
-  | "ens-clear"
-  | "ens-link"
-  | "ens-update"
-  | "ens-register"
-  | "custody-switch"
-  | "public-profile-vault";
-
-const LIFECYCLE_DEFINITIONS: Record<LifecycleId, { steps: string[] }> = {
-  "ens-clear":    { steps: ["Clear Records on Mainnet", "Save Cleared Snapshot"] },
-  "ens-link":     { steps: ["Create Subdomain", "Set Records", "Save Snapshot"] },
-  "ens-update":   { steps: ["Update Records on Mainnet", "Save Updated Snapshot"] },
-  "ens-register": { steps: ["Commit ENS Name", "Register ENS Name"] },
-  "custody-switch": { steps: ["Deploy Vault", "Deposit Token", "Reconcile Operators"] },
-  "public-profile-vault": { steps: ["Sign Profile", "Save Through Vault"] },
-};
-
-const FLOW_LIFECYCLE: Record<string, LifecycleId> = {
-  "ens-clear":      "ens-clear",
-  "ens-link":       "ens-link",
-  "ens-update":     "ens-update",
-  "ens-register":   "ens-register",
-  "custody-switch": "custody-switch",
-  "public-profile-vault": "public-profile-vault",
-};
-
-const PURPOSE_TIMELINE: Record<string, readonly [string, string]> = {
-  "create-agent":                ["Sign Recovery Access", "Mint Token"],
-  "update-snapshot-owner":       ["Sign Snapshot", "Save Onchain"],
-  "update-snapshot-operator":    ["Sign Snapshot", "Save Onchain"],
-  "update-snapshot-connected":   ["Sign Snapshot", "Save Onchain"],
-  "update-profile-owner":        ["Sign Profile", "Save Onchain"],
-  "update-profile-operator":     ["Sign Profile", "Save Onchain"],
-  "update-profile-connected":    ["Sign Profile", "Save Onchain"],
-  "update-operators":            ["Sign Operator List", "Publish List"],
-  "create-simple-ens-subdomain": ["Sign Request", "Create Subdomain"],
-  "set-simple-ens-records":      ["Sign Records", "Write Records"],
-  "create-agent-ens-subdomain":  ["Sign Request", "Create Subdomain"],
-  "set-agent-ens-records":       ["Sign Records", "Write Records"],
-  "rotate-agent-uri-vault-owner":    ["Sign Update", "Save Through Vault"],
-  "rotate-agent-uri-vault-operator": ["Sign Update", "Save Through Vault"],
-  "update-ens":                  ["Sign Snapshot", "Save Onchain"],
-  "clear-ens":                   ["Sign Snapshot", "Save Onchain"],
-};
-
-function activeLifecycle(): LifecycleId | undefined {
-  if (config.flowId && FLOW_LIFECYCLE[config.flowId]) return FLOW_LIFECYCLE[config.flowId];
-  return undefined;
-}
-
-let currentTimelineKey: string | null = null;
-
-function lifecycleStepIndex(lifecycle: LifecycleId, state: string | null): number {
-  const flowStep = typeof config.flowStep === "number" ? config.flowStep : 1;
-  const def = LIFECYCLE_DEFINITIONS[lifecycle];
-  const steps = def.steps.length;
-  if (state === "done") return Math.min(flowStep, steps);
-  return Math.max(0, Math.min(flowStep - 1, steps - 1));
-}
-
-function hasNextLifecyclePrompt(): boolean {
-  const lifecycle = activeLifecycle();
-  if (!lifecycle) return false;
-  const flowStep = typeof config.flowStep === "number" ? config.flowStep : 1;
-  return flowStep < LIFECYCLE_DEFINITIONS[lifecycle].steps.length;
-}
-
-function nextLifecycleHint(): string {
-  return "Keep this page open. The next wallet step will appear here.";
-}
-
-function purposeStepIndex(state: string | null): number {
-  if (state === "approve-transaction" || state === "submitting") return 1;
-  if (state === "done") return 2;
-  return 0;
-}
-
-export function applyTransferTimeline(): void {
-  const timeline = document.getElementById("timeline") as HTMLElement | null;
-  if (!timeline) return;
-
-  const lifecycle = activeLifecycle();
-  let steps: string[] | null = null;
-  let activeIndex = 0;
-  let key = "";
-
-  if (lifecycle) {
-    steps = LIFECYCLE_DEFINITIONS[lifecycle].steps;
-    activeIndex = lifecycleStepIndex(lifecycle, currentState);
-    key = "flow:" + lifecycle;
-  } else if (config.kind === "sign-transaction") {
-    const tuple = PURPOSE_TIMELINE[config.purpose || ""] || (["Sign", "Submit"] as const);
-    steps = [tuple[0], tuple[1]];
-    activeIndex = purposeStepIndex(currentState);
-    key = "purpose:" + (config.purpose || "");
-  }
-
-  if (!steps) {
-    if (!timeline.hidden) timeline.hidden = true;
-    currentTimelineKey = null;
-    return;
-  }
-
-  if (currentTimelineKey !== key) {
-    timeline.innerHTML = "";
-    for (const action of steps) {
-      const li = document.createElement("li");
-      li.className = "timeline-step";
-      li.dataset.state = "pending";
-      const marker = document.createElement("span");
-      marker.className = "timeline-marker";
-      marker.setAttribute("aria-hidden", "true");
-      const label = document.createElement("span");
-      label.className = "timeline-label";
-      const actionEl = document.createElement("span");
-      actionEl.className = "timeline-action";
-      actionEl.textContent = action;
-      label.append(actionEl);
-      li.append(marker, label);
-      timeline.append(li);
-    }
-    timeline.setAttribute("aria-label", "Wallet popup steps");
-    currentTimelineKey = key;
-  }
-
-  timeline.hidden = false;
-  const stepEls = timeline.querySelectorAll<HTMLElement>(".timeline-step");
-  stepEls.forEach((step, i) => {
-    const next = i < activeIndex ? "done" : i === activeIndex ? "active" : "pending";
-    if (step.dataset.state !== next) step.dataset.state = next;
-  });
-}
-
-function markActiveTimelineStepDone(): void {
-  const timeline = document.getElementById("timeline") as HTMLElement | null;
-  if (!timeline || timeline.hidden) return;
-  timeline.querySelectorAll<HTMLElement>('.timeline-step[data-state="active"]').forEach((step) => {
-    step.dataset.state = "done";
-  });
-}
-
-function spinnerText(value: string): string {
-  const text = preserveProtocolCaps(value);
-  return text.replace(/^(\s*)([a-z])/, (_match, prefix, letter) => `${prefix}${letter.toUpperCase()}`);
-}
-function spinnerHintText(value: string): string { return preserveProtocolCaps(value); }
-function preserveProtocolCaps(value: string): string {
-  return String(value || "")
-    .replace(/\bapi\b/gi, "API")
-    .replace(/\bens\b/gi, "ENS")
-    .replace(/\berc-8004\b/gi, "ERC-8004")
-    .replace(/\bgguf\b/gi, "GGUF")
-    .replace(/\bhugging face\b/gi, "Hugging Face")
-    .replace(/\bipfs\b/gi, "IPFS")
-    .replace(/\bjson\b/gi, "JSON")
-    .replace(/\bjwt\b/gi, "JWT")
-    .replace(/\bmemory\.md\b/gi, "MEMORY.md")
-    .replace(/\bopenai\b/gi, "OpenAI")
-    .replace(/\banthropic\b/gi, "Anthropic")
-    .replace(/\bgemini\b/gi, "Gemini")
-    .replace(/\bos\b/gi, "OS")
-    .replace(/\brpc\b/gi, "RPC")
-    .replace(/\bsoul\.md\b/gi, "SOUL.md")
-    .replace(/\buri\b/gi, "URI")
-    .replace(/\burl\b/gi, "URL");
-}
-
-function setStatus(marker: string, text: string, hint: string, spin: boolean): void {
-  const lineEl = statusText.parentElement as HTMLElement;
-  const hintEl = statusHint;
-  const displayText = spin ? spinnerText(text) : text;
-  const displayHint = spin ? spinnerHintText(hint) : hint;
-  const apply = () => {
-    if (spin) startSpinner();
-    else setMarker(marker);
-    statusText.textContent = displayText;
-    hintEl.textContent = displayHint;
-    requestAnimationFrame(() => {
-      lineEl.classList.remove("is-changing");
-      hintEl.classList.remove("is-changing");
-    });
-  };
-  if (statusText.textContent === displayText && hintEl.textContent === displayHint) {
-    if (spin) startSpinner();
-    else setMarker(marker);
-    return;
-  }
-  lineEl.classList.add("is-changing");
-  hintEl.classList.add("is-changing");
-  setTimeout(apply, 220);
-}
-
-export let currentState: string | null = null;
-
-export function setState(state: string, payload?: any): void {
-  payload = payload || {};
-  currentState = state;
-  errorSlot.innerHTML = "";
-  statusBlock.style.display = "flex";
-  setTabTitle(tabTitleForState(state));
-  applyTransferTimeline();
-  switch (state) {
-    case "connecting":
-      setStatus("·", "Connecting To Wallet...", "Open your wallet if needed.", true);
-      break;
-    case "approve":
-      if (config.kind === "account") {
-        const copy = accountCopy();
-        setStatus("·", copy.text, copy.hint, true);
-      } else if (config.kind === "sign") {
-        const sigCopy = signCopy();
-        setStatus("·", sigCopy.text, sigCopy.hint, true);
-      } else {
-        const txCopy = transactionCopy();
-        setStatus("·", txCopy.text, txCopy.hint, true);
-      }
-      break;
-    case "approve-sign":
-      {
-        const sigCopy = signCopy();
-        setStatus("·", sigCopy.text, sigCopy.hint, true);
-      }
-      break;
-    case "preparing-transaction":
-      setStatus("·", purposeCopy().prepare!.text, purposeCopy().prepare!.hint, true);
-      break;
-    case "approve-transaction":
-      {
-        const txCopy = transactionCopy();
-        setStatus("·", txCopy.text, txCopy.hint, true);
-      }
-      break;
-    case "submitting":
-      if (config.kind === "account") setStatus("·", "Connecting Wallet...", "Returning to terminal.", true);
-      else if (config.kind === "sign") setStatus("·", "Verifying Signature...", hasNextLifecyclePrompt() ? nextLifecycleHint() : "Returning to terminal.", true);
-      else setStatus("·", "Submitted · Waiting For Confirmation...", "Your wallet accepted the transaction.", true);
-      break;
-    case "done":
-      stopSpinner();
-      statusMarker.innerHTML =
-        '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor"' +
-        ' stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">' +
-        '<polyline points="20 6 9 17 4 12"></polyline></svg>';
-      statusText.textContent =
-        config.kind === "account" ? "Connected · Returning"
-          : config.kind === "sign" ? (hasNextLifecyclePrompt() ? "Signed · Waiting" : "Signed · Returning")
-            : "Submitted · Returning";
-      statusHint.textContent = payload.txHash
-        ? (isTransactionFlow() ? "Transaction submitted. Returning." : "This tab will close shortly.")
-        : hasNextLifecyclePrompt() ? nextLifecycleHint() : "This tab will close shortly.";
-      markActiveTimelineStepDone();
-      break;
-    case "error":
-      stopSpinner();
-      statusBlock.style.display = "none";
-      renderError(payload);
-      break;
-  }
-}
-
-let lastWalletError: WalletErrorPayload | null = null;
-
-function renderError(payload: WalletErrorPayload): void {
-  errorSlot.innerHTML = walletErrorHtml(payload);
-  lastWalletError = payload;
-}
-
-export function getLastWalletError(): WalletErrorPayload | null { return lastWalletError }
-export function clearLastWalletError(): void { lastWalletError = null }

package/src/storage/config.ts

@@ -4,10 +4,6 @@ import os from 'node:os'
 import { z } from 'zod'
 import { atomicWriteText } from './atomicWrite.js'
 
-export const PROVIDERS = ['llamacpp', 'openai', 'anthropic', 'gemini'] as const
-export type ProviderId = (typeof PROVIDERS)[number]
-const LEGACY_PROVIDERS = ['ollama', ...PROVIDERS] as const
-
 export const SELECTABLE_NETWORKS = ['mainnet', 'base'] as const
 export type SelectableNetwork = (typeof SELECTABLE_NETWORKS)[number]
 
@@ -75,12 +71,8 @@ const IdentitySchema = z.object({
 })
 
 const ConfigSchema = z.object({
-  version: z.literal(1),
-  provider: z.enum(PROVIDERS),
-  model: z.string().min(1),
-  baseUrl: z.string().url().optional(),
-  localMmprojPath: z.string().min(1).optional(),
-  firstRunAt: z.string(),
+  version: z.literal(2),
+  firstSeenAt: z.string(),
   identity: IdentitySchema.optional(),
   erc8004: z.object({
     chainId: z.number().int().positive(),
@@ -96,16 +88,17 @@ const ConfigSchema = z.object({
   configVersion: z.number().int().nonnegative().optional(),
 })
 
-const LEGACY_OLLAMA_BASE_URL = 'http://localhost:11434/v1'
-const LegacyConfigSchema = ConfigSchema.extend({
-  provider: z.enum(LEGACY_PROVIDERS),
-})
-
-type LegacyConfig = z.infer<typeof LegacyConfigSchema>
+const LegacyV1Schema = z.object({
+  version: z.literal(1),
+  firstRunAt: z.string().optional(),
+  identity: IdentitySchema.optional(),
+  erc8004: ConfigSchema.shape.erc8004,
+  selectedNetwork: z.enum(SELECTABLE_NETWORKS).optional(),
+  configVersion: z.number().int().nonnegative().optional(),
+}).passthrough()
 
 export type EthagentIdentity = z.infer<typeof IdentitySchema>
 export type TransferSnapshotMetadata = NonNullable<NonNullable<EthagentIdentity['backup']>['transferSnapshot']>
-
 export type EthagentConfig = z.infer<typeof ConfigSchema>
 
 export function getConfigDir(): string {
@@ -133,14 +126,23 @@ export async function loadConfig(): Promise<EthagentConfig | null> {
     const parsed = JSON.parse(raw)
     const active = ConfigSchema.safeParse(parsed)
     if (active.success) return normalizeConfig(active.data)
-    const legacy = LegacyConfigSchema.safeParse(parsed)
-    if (legacy.success) return migrateLegacyConfig(legacy.data)
+    const legacy = LegacyV1Schema.safeParse(parsed)
+    if (legacy.success) return normalizeConfig(migrateLegacyV1(legacy.data))
+    await preserveUnreadableConfig(raw)
     return null
   } catch {
+    await preserveUnreadableConfig(raw)
     return null
   }
 }
 
+async function preserveUnreadableConfig(raw: string): Promise<void> {
+  try {
+    await fs.writeFile(`${getConfigPath()}.corrupt`, raw, { encoding: 'utf8', mode: 0o600 })
+  } catch {
+  }
+}
+
 export async function saveConfig(config: EthagentConfig): Promise<void> {
   await ensureConfigDir()
   const bumped: EthagentConfig = {
@@ -210,10 +212,8 @@ export function buildSeedConfigForIdentity(args: {
   identityRegistryAddress: string
 }): EthagentConfig {
   return {
-    version: 1,
-    provider: 'llamacpp',
-    model: defaultModelFor('llamacpp'),
-    firstRunAt: new Date().toISOString(),
+    version: 2,
+    firstSeenAt: new Date().toISOString(),
     identity: { ...args.identity, source: 'erc8004' },
     erc8004: {
       chainId: args.chainId,
@@ -288,34 +288,8 @@ export async function deleteConfig(): Promise<void> {
   }
 }
 
-export function defaultModelFor(provider: ProviderId): string {
-  switch (provider) {
-    case 'openai':    return 'gpt-5.2'
-    case 'anthropic': return 'claude-sonnet-4-5'
-    case 'gemini':    return 'gemini-2.0-flash'
-    case 'llamacpp':  return 'huggingface-link'
-  }
-}
-
-export function defaultBaseUrlFor(provider: ProviderId): string | undefined {
-  if (provider === 'llamacpp') return 'http://localhost:8080/v1'
-  return undefined
-}
-
-export type LocalProviderId = Extract<ProviderId, 'llamacpp'>
-
-export function localProviderBaseUrlFor(provider: LocalProviderId, baseUrl?: string): string {
-  const fallback = defaultBaseUrlFor(provider) ?? ''
-  if (!baseUrl) return fallback
-  return isDefaultBaseUrlFor(baseUrl, LEGACY_OLLAMA_BASE_URL) ? fallback : baseUrl
-}
-
 export function normalizeConfig(config: EthagentConfig): EthagentConfig {
   let next = config
-  if (next.provider === 'llamacpp') {
-    const baseUrl = localProviderBaseUrlFor(next.provider, next.baseUrl)
-    if (next.baseUrl !== baseUrl) next = { ...next, baseUrl }
-  }
   if (!next.erc8004 && next.identity?.chainId && next.identity.identityRegistryAddress && next.identity.rpcUrl) {
     next = {
       ...next,
@@ -329,37 +303,13 @@ export function normalizeConfig(config: EthagentConfig): EthagentConfig {
   return next
 }
 
-function migrateLegacyConfig(config: LegacyConfig): EthagentConfig {
-  if (config.provider !== 'ollama') return normalizeConfig(ConfigSchema.parse(config))
+function migrateLegacyV1(input: z.infer<typeof LegacyV1Schema>): EthagentConfig {
   return {
-    ...config,
-    provider: 'llamacpp',
-    model: defaultModelFor('llamacpp'),
-    baseUrl: defaultBaseUrlFor('llamacpp'),
-  }
-}
-
-function isDefaultBaseUrlFor(value: string, fallback: string | undefined): boolean {
-  if (!fallback) return false
-  try {
-    const url = new URL(value)
-    const defaultUrl = new URL(fallback)
-    if (url.protocol !== defaultUrl.protocol) return false
-    if (url.hostname.toLowerCase() !== defaultUrl.hostname.toLowerCase()) return false
-    if (effectivePort(url) !== effectivePort(defaultUrl)) return false
-    const path = stripTrailingSlash(url.pathname) || '/'
-    const defaultPath = stripTrailingSlash(defaultUrl.pathname) || '/'
-    return path === '/' || path === defaultPath
-  } catch {
-    return stripTrailingSlash(value) === stripTrailingSlash(fallback)
+    version: 2,
+    firstSeenAt: input.firstRunAt ?? new Date().toISOString(),
+    ...(input.identity ? { identity: input.identity } : {}),
+    ...(input.erc8004 ? { erc8004: input.erc8004 } : {}),
+    ...(input.selectedNetwork ? { selectedNetwork: input.selectedNetwork } : {}),
+    ...(input.configVersion !== undefined ? { configVersion: input.configVersion } : {}),
   }
 }
-
-function effectivePort(url: URL): string {
-  if (url.port) return url.port
-  return url.protocol === 'https:' ? '443' : '80'
-}
-
-function stripTrailingSlash(value: string): string {
-  return value.replace(/\/+$/, '')
-}

package/src/storage/reset.ts

@@ -0,0 +1,31 @@
+import fs from 'node:fs/promises'
+import { getConfigDir } from './config.js'
+import { rmSecret } from './secrets.js'
+
+const RESET_SECRET_ACCOUNTS = ['ethereum:default', 'pinata:jwt'] as const
+
+export type ResetPlan = {
+  configDir: string
+  secretAccounts: string[]
+}
+
+export type ResetDeps = {
+  rm?: (dir: string) => Promise<void>
+  removeSecret?: (account: string) => Promise<void>
+}
+
+export function resetPlan(): ResetPlan {
+  return {
+    configDir: getConfigDir(),
+    secretAccounts: [...RESET_SECRET_ACCOUNTS],
+  }
+}
+
+export async function runReset(deps: ResetDeps = {}): Promise<ResetPlan> {
+  const plan = resetPlan()
+  const rm = deps.rm ?? (dir => fs.rm(dir, { recursive: true, force: true }))
+  const removeSecret = deps.removeSecret ?? rmSecret
+  await rm(plan.configDir)
+  for (const account of plan.secretAccounts) await removeSecret(account)
+  return plan
+}

package/src/storage/secrets.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import os from 'node:os'
 import crypto from 'node:crypto'
-import { getConfigDir, ensureConfigDir, type ProviderId } from './config.js'
+import { getConfigDir, ensureConfigDir } from './config.js'
 import { atomicWriteText } from './atomicWrite.js'
 
 const KEYTAR_SERVICE = 'ethagent'
@@ -167,18 +167,3 @@ export async function whichBackend(): Promise<KeyBackend> {
   return (await loadKeytar()) ? 'keyring' : 'encrypted-file'
 }
 
-export function getKey(provider: ProviderId): Promise<string | null> {
-  return getSecret(provider)
-}
-
-export function setKey(provider: ProviderId, value: string): Promise<KeyBackend> {
-  return setSecret(provider, value)
-}
-
-export function rmKey(provider: ProviderId): Promise<void> {
-  return rmSecret(provider)
-}
-
-export function hasKey(provider: ProviderId): Promise<boolean> {
-  return hasSecret(provider)
-}