@aixyz/cli 0.8.0 → 0.10.0

package/bin.ts

@@ -1,238 +1,23 @@
 #!/usr/bin/env bun
-import { program } from "commander";
-import { build } from "./build";
-import { dev } from "./dev";
-import { register } from "./register/register";
-import { setAgentUri } from "./register/set-agent-uri";
-import { CliError } from "./register/utils";
+import { Command } from "commander";
+import { devCommand } from "./dev";
+import { buildCommand } from "./build";
+import { erc8004Command } from "./register";
 import pkg from "./package.json";
 
-function handleAction(
-  action: (options: Record<string, unknown>) => Promise<void>,
-): (options: Record<string, unknown>) => Promise<void> {
-  return async (options) => {
-    try {
-      await action(options);
-    } catch (error) {
-      if (error instanceof CliError) {
-        console.error(`Error: ${error.message}`);
-        process.exit(1);
-      }
-      if (error instanceof Error && error.name === "ExitPromptError") {
-        process.exit(130);
-      }
-      console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
-      process.exit(1);
-    }
-  };
+const cli = new Command();
+cli.name("aixyz").description("CLI for building and deploying aixyz agents").version(pkg.version);
+
+cli.addCommand(devCommand);
+cli.addCommand(buildCommand);
+cli.addCommand(erc8004Command);
+
+try {
+  await cli.parseAsync();
+} catch (error) {
+  if (error instanceof Error && error.name === "ExitPromptError") {
+    process.exit(130);
+  }
+  console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+  process.exit(1);
 }
-
-program.name("aixyz").description("CLI for building and deploying aixyz agents").version(pkg.version);
-
-program
-  .command("dev")
-  .description("Start a local development server")
-  .option("-p, --port <port>", "Port to listen on", "3000")
-  .action(handleAction(dev));
-
-program
-  .command("build")
-  .description("Build the aixyz agent")
-  .option("--output <type>", "Output format: 'standalone' or 'vercel'")
-  .addHelpText(
-    "after",
-    `
-Details:
-  Bundles your aixyz agent for deployment.
-
-  Default behavior (auto-detected):
-    Bundles into a single executable file for Standalone at ./.aixyz/output/server.js
-
-  With --output vercel or VERCEL=1 env:
-    Generates Vercel Build Output API v3 structure at .vercel/output/
-    (Automatically detected when deploying to Vercel)
-
-  The build process:
-    1. Loads aixyz.config.ts from the current directory
-    2. Detects entrypoint (app/server.ts or auto-generates from app/agent.ts + app/tools/)
-    3. Bundles the application
-    4. Copies static assets from public/ (if present)
-
-Prerequisites:
-  - An aixyz.config.ts with a default export
-  - An entrypoint at app/server.ts, or app/agent.ts + app/tools/ for auto-generation
-
-Examples:
-  $ aixyz build                         # Build standalone (default)
-  $ aixyz build --output standalone     # Build standalone explicitly
-  $ aixyz build --output vercel         # Build for Vercel deployment
-  $ VERCEL=1 aixyz build                # Auto-detected Vercel build`,
-  )
-  .action(handleAction(build));
-
-const erc8004 = program.command("erc8004").description("ERC-8004 IdentityRegistry operations");
-
-erc8004
-  .command("register")
-  .description("Register a new agent to the ERC-8004 IdentityRegistry")
-  .option("--uri <uri>", "Agent metadata URI or path to .json file (converts to base64 data URI)")
-  .option("--chain <chain>", "Target chain (mainnet, sepolia, base-sepolia, localhost)")
-  .option("--rpc-url <url>", "Custom RPC URL (uses default if not provided)")
-  .option("--registry <address>", "Contract address of the IdentityRegistry (required for localhost)")
-  .option("--keystore <path>", "Path to Ethereum keystore (V3) JSON file for local signing")
-  .option("--browser", "Use browser extension wallet (any extension)")
-  .option("--broadcast", "Sign and broadcast the transaction (default: dry-run)")
-  .option("--out-dir <path>", "Write deployment result as JSON to the given directory")
-  .addHelpText(
-    "after",
-    `
-Option Details:
-  --uri <uri>
-      Agent metadata as a URI or local file path. Accepts http://, https://,
-      ipfs://, and data: URIs directly.
-      If a .json file path is given, it is read and converted to a base64 data URI automatically.
-      Otherwise, the URI is used as-is and the validity of the URI is not checked.
-      If omitted, the agent is registered without metadata.
-
-  --chain <chain>
-      Target chain for registration. Supported values:
-        mainnet       Ethereum mainnet (chain ID 1)
-        sepolia       Ethereum Sepolia testnet (chain ID 11155111)
-        base-sepolia  Base Sepolia testnet (chain ID 84532)
-        localhost     Local Foundry/Anvil node (chain ID 31337)
-      If omitted, you will be prompted to select a chain interactively.
-      Each chain has a default RPC endpoint unless overridden with --rpc-url.
-
-  --rpc-url <url>
-      Custom RPC endpoint URL. Overrides the default RPC for the selected
-      chain. Cannot be used with --browser since the browser wallet manages
-      its own RPC connection.
-
-  --registry <address>
-      Contract address of the ERC-8004 IdentityRegistry. Only required for
-      localhost, where there is no default deployment. For mainnet, sepolia,
-      and base-sepolia the canonical registry address is used automatically.
-
-  --keystore <path>
-      Path to an Ethereum keystore (V3) JSON file. You will be prompted for
-      the keystore password to decrypt the private key for signing.
-
-  --browser
-      Opens a local page in your default browser for signing with any
-      EIP-6963 compatible wallet extension (MetaMask, Rabby, etc.).
-      The wallet handles both signing and broadcasting the transaction.
-      Cannot be combined with --rpc-url.
-
-  --broadcast
-      Sign and broadcast the transaction on-chain. Without this flag the
-      command performs a dry-run: it encodes the transaction and prints
-      its details but does not interact with any wallet or send anything
-      to the network.
-
-  --out-dir <path>
-      Directory to write the deployment result as a JSON file. The file
-      is named registration-<chainId>-<timestamp>.json.
-
-Environment Variables:
-  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for
-                 signing. Detected automatically if set. Not recommended
-                 for interactive use as the key may appear in shell history.
-
-Examples:
-  # Dry-run (default) — shows encoded transaction, no wallet needed
-  $ aixyz erc8004 register --uri "./metadata.json" --chain sepolia
-
-  # Sign and broadcast
-  $ aixyz erc8004 register --uri "./metadata.json" --chain sepolia --keystore ~/.foundry/keystores/default --broadcast
-  $ PRIVATE_KEY=0x... aixyz erc8004 register --chain sepolia --broadcast
-  $ aixyz erc8004 register --chain localhost --registry 0x5FbDB2315678afecb367f032d93F642f64180aa3 --uri "./metadata.json" --broadcast
-  $ aixyz erc8004 register --uri "./metadata.json" --chain sepolia --browser --broadcast`,
-  )
-  .action(handleAction(register));
-
-erc8004
-  .command("set-agent-uri")
-  .description("Update the metadata URI of a registered agent")
-  .option("--agent-id <id>", "Agent ID (token ID) to update")
-  .option("--uri <uri>", "New agent metadata URI or path to .json file")
-  .option("--chain <chain>", "Target chain (mainnet, sepolia, base-sepolia, localhost)")
-  .option("--rpc-url <url>", "Custom RPC URL (uses default if not provided)")
-  .option("--registry <address>", "Contract address of the IdentityRegistry (required for localhost)")
-  .option("--keystore <path>", "Path to Ethereum keystore (V3) JSON file for local signing")
-  .option("--browser", "Use browser extension wallet (any extension)")
-  .option("--broadcast", "Sign and broadcast the transaction (default: dry-run)")
-  .option("--out-dir <path>", "Write result as JSON to the given directory")
-  .addHelpText(
-    "after",
-    `
-Option Details:
-  --agent-id <id>
-      The token ID of the agent whose URI you want to update.
-      Must be a non-negative integer. Only the agent owner, an approved
-      address, or an operator can update the URI.
-      If omitted, you will be prompted to enter the agent ID interactively.
-
-  --uri <uri>
-      New agent metadata as a URI or local file path. Accepts http://, https://,
-      ipfs://, and data: URIs directly.
-      If a .json file path is given, it is read and converted to a base64 data URI automatically.
-      Otherwise, the URI is used as-is and the validity of the URI is not checked.
-      If omitted, you will be prompted to enter the URI interactively.
-
-  --chain <chain>
-      Target chain. Supported values:
-        mainnet       Ethereum mainnet (chain ID 1)
-        sepolia       Ethereum Sepolia testnet (chain ID 11155111)
-        base-sepolia  Base Sepolia testnet (chain ID 84532)
-        localhost     Local Foundry/Anvil node (chain ID 31337)
-      If omitted, you will be prompted to select a chain interactively.
-      Each chain has a default RPC endpoint unless overridden with --rpc-url.
-
-  --rpc-url <url>
-      Custom RPC endpoint URL. Overrides the default RPC for the selected
-      chain. Cannot be used with --browser since the browser wallet manages
-      its own RPC connection.
-
-  --registry <address>
-      Contract address of the ERC-8004 IdentityRegistry. Only required for
-      localhost, where there is no default deployment. For mainnet, sepolia,
-      and base-sepolia the canonical registry address is used automatically.
-
-  --keystore <path>
-      Path to an Ethereum keystore (V3) JSON file. You will be prompted for
-      the keystore password to decrypt the private key for signing.
-
-  --browser
-      Opens a local page in your default browser for signing with any
-      EIP-6963 compatible wallet extension (MetaMask, Rabby, etc.).
-      The wallet handles both signing and broadcasting the transaction.
-      Cannot be combined with --rpc-url.
-
-  --broadcast
-      Sign and broadcast the transaction on-chain. Without this flag the
-      command performs a dry-run: it encodes the transaction and prints
-      its details but does not interact with any wallet or send anything
-      to the network.
-
-  --out-dir <path>
-      Directory to write the result as a JSON file. The file
-      is named set-agent-uri-<chainId>-<timestamp>.json.
-
-Environment Variables:
-  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for
-                 signing. Detected automatically if set. Not recommended
-                 for interactive use as the key may appear in shell history.
-
-Examples:
-  # Dry-run (default) — shows encoded transaction, no wallet needed
-  $ aixyz erc8004 set-agent-uri --agent-id 1 --uri "./metadata.json" --chain sepolia
-
-  # Sign and broadcast
-  $ aixyz erc8004 set-agent-uri --agent-id 1 --uri "./metadata.json" --chain sepolia --keystore ~/.foundry/keystores/default --broadcast
-  $ PRIVATE_KEY=0x... aixyz erc8004 set-agent-uri --agent-id 42 --uri "https://example.com/agent.json" --chain sepolia --broadcast
-  $ aixyz erc8004 set-agent-uri --agent-id 1 --uri "./metadata.json" --chain localhost --registry 0x5FbDB2315678afecb367f032d93F642f64180aa3 --broadcast
-  $ aixyz erc8004 set-agent-uri --agent-id 1 --uri "./metadata.json" --chain sepolia --browser --broadcast`,
-  )
-  .action(handleAction(setAgentUri));
-
-program.parse();

package/build/AixyzConfigPlugin.ts

@@ -37,7 +37,7 @@ export function AixyzConfigPlugin(): BunPlugin {
   return {
     name: "aixyz-config",
     setup(build) {
-      build.onLoad({ filter: /aixyz\/config\.ts$/ }, () => ({
+      build.onLoad({ filter: /aixyz[-/]config\/index\.ts$/ }, () => ({
         contents: `
         const config = ${JSON.stringify(materialized)};
         export function getAixyzConfig() {

package/build/AixyzServerPlugin.ts

@@ -127,6 +127,16 @@ function generateServer(appDir: string, entrypointDir: string): string {
     body.push("await mcp.connect();");
   }
 
+  // If app/erc-8004.ts exists, auto-register ERC-8004 endpoint
+  const hasErc8004 = existsSync(resolve(appDir, "erc-8004.ts"));
+  if (hasErc8004) {
+    imports.push('import { useERC8004 } from "aixyz/server/adapters/erc-8004";');
+    imports.push(`import * as erc8004 from "${importPrefix}/erc-8004";`);
+    body.push(
+      `useERC8004(server, { default: erc8004.default, options: { mcp: ${tools.length > 0}, a2a: ${hasAgent} } });`,
+    );
+  }
+
   body.push("export default server;");
 
   return [...imports, "", ...body].join("\n");

package/build/index.ts

@@ -1,5 +1,6 @@
 import { resolve } from "path";
 import { existsSync, mkdirSync, cpSync, rmSync } from "fs";
+import { Command } from "commander";
 import { AixyzConfigPlugin } from "./AixyzConfigPlugin";
 import { AixyzServerPlugin, getEntrypointMayGenerate } from "./AixyzServerPlugin";
 import { findIconFile, copyAgentIcon, generateFavicon } from "./icons";
@@ -11,7 +12,41 @@ interface BuildOptions {
   output?: string;
 }
 
-export async function build(options: BuildOptions = {}): Promise<void> {
+export const buildCommand = new Command("build")
+  .description("Build the aixyz agent")
+  .option("--output <type>", "Output format: 'standalone' or 'vercel'")
+  .addHelpText(
+    "after",
+    `
+Details:
+  Bundles your aixyz agent for deployment.
+
+  Default behavior (auto-detected):
+    Bundles into a single executable file for Standalone at ./.aixyz/output/server.js
+
+  With --output vercel or VERCEL=1 env:
+    Generates Vercel Build Output API v3 structure at .vercel/output/
+    (Automatically detected when deploying to Vercel)
+
+  The build process:
+    1. Loads aixyz.config.ts from the current directory
+    2. Detects entrypoint (app/server.ts or auto-generates from app/agent.ts + app/tools/)
+    3. Bundles the application
+    4. Copies static assets from public/ (if present)
+
+Prerequisites:
+  - An aixyz.config.ts with a default export
+  - An entrypoint at app/server.ts, or app/agent.ts + app/tools/ for auto-generation
+
+Examples:
+  $ aixyz build                         # Build standalone (default)
+  $ aixyz build --output standalone     # Build standalone explicitly
+  $ aixyz build --output vercel         # Build for Vercel deployment
+  $ VERCEL=1 aixyz build                # Auto-detected Vercel build`,
+  )
+  .action(action);
+
+async function action(options: BuildOptions = {}): Promise<void> {
   const cwd = process.cwd();
   loadEnvConfig(cwd, false);
   const entrypoint = getEntrypointMayGenerate(cwd, "build");

package/dev/index.ts

@@ -1,10 +1,16 @@
 import { resolve, relative } from "path";
 import { existsSync, watch } from "fs";
 import { loadEnvConfig } from "@next/env";
+import { Command } from "commander";
 import { getEntrypointMayGenerate } from "../build/AixyzServerPlugin";
 import pkg from "../package.json";
 
-export async function dev(options: { port?: string }): Promise<void> {
+export const devCommand = new Command("dev")
+  .description("Start a local development server")
+  .option("-p, --port <port>", "Port to listen on", "3000")
+  .action(action);
+
+async function action(options: { port?: string }): Promise<void> {
   const cwd = process.cwd();
 
   // Load environment config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aixyz/cli",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Payment-native SDK for AI Agent",
   "keywords": [
     "ai",
@@ -27,8 +27,8 @@
     "bin.ts"
   ],
   "dependencies": {
-    "@aixyz/config": "0.8.0",
-    "@aixyz/erc-8004": "0.8.0",
+    "@aixyz/config": "0.10.0",
+    "@aixyz/erc-8004": "0.10.0",
     "@inquirer/prompts": "^8.3.0",
     "@next/env": "^16.1.6",
     "boxen": "^8.0.1",

package/register/index.ts

@@ -1,3 +1,6 @@
+import { Command } from "commander";
+import { register } from "./register";
+import { update } from "./update";
 import type { WalletOptions } from "./wallet";
 
 export interface BaseOptions extends WalletOptions {
@@ -6,3 +9,135 @@ export interface BaseOptions extends WalletOptions {
   registry?: string;
   outDir?: string;
 }
+
+export const erc8004Command = new Command("erc-8004").description("ERC-8004 IdentityRegistry operations");
+
+erc8004Command
+  .command("register")
+  .description("Register a new agent to the ERC-8004 IdentityRegistry")
+  .option("--url <url>", "Agent deployment URL (e.g., https://my-agent.example.com)")
+  .option("--chain <chain>", "Target chain (mainnet, sepolia, base-sepolia, localhost)")
+  .option("--rpc-url <url>", "Custom RPC URL (uses default if not provided)")
+  .option("--registry <address>", "Contract address of the IdentityRegistry (required for localhost)")
+  .option("--keystore <path>", "Path to Ethereum keystore (V3) JSON file for local signing")
+  .option("--browser", "Use browser extension wallet (any extension)")
+  .option("--broadcast", "Sign and broadcast the transaction (default: dry-run)")
+  .option("--out-dir <path>", "Write deployment result as JSON to the given directory")
+  .addHelpText(
+    "after",
+    `
+Option Details:
+  --url <url>
+      Agent deployment URL (e.g., https://my-agent.example.com).
+      The registration URI will be derived as <url>/_aixyz/erc-8004.json.
+      If omitted, you will be prompted to enter the URL interactively.
+
+  --chain <chain>
+      Target chain for registration. Supported values:
+        mainnet       Ethereum mainnet (chain ID 1)
+        sepolia       Ethereum Sepolia testnet (chain ID 11155111)
+        base-sepolia  Base Sepolia testnet (chain ID 84532)
+        localhost     Local Foundry/Anvil node (chain ID 31337)
+      If omitted, you will be prompted to select a chain interactively.
+
+  --rpc-url <url>
+      Custom RPC endpoint URL. Overrides the default RPC for the selected
+      chain. Cannot be used with --browser since the browser wallet manages
+      its own RPC connection.
+
+  --registry <address>
+      Contract address of the ERC-8004 IdentityRegistry. Only required for
+      localhost, where there is no default deployment.
+
+  --keystore <path>
+      Path to an Ethereum keystore (V3) JSON file. You will be prompted for
+      the keystore password to decrypt the private key for signing.
+
+  --browser
+      Opens a local page in your default browser for signing with any
+      EIP-6963 compatible wallet extension (MetaMask, Rabby, etc.).
+
+  --broadcast
+      Sign and broadcast the transaction on-chain. Without this flag the
+      command performs a dry-run.
+
+  --out-dir <path>
+      Directory to write the deployment result as a JSON file.
+
+Behavior:
+  If app/erc-8004.ts does not exist, you will be prompted to create it
+  (selecting supported trust mechanisms). After a successful on-chain
+  registration, the new registration entry is written back to app/erc-8004.ts.
+
+Environment Variables:
+  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for signing.
+
+Examples:
+  # Dry-run (default)
+  $ aixyz erc-8004 register --url "https://my-agent.example.com" --chain sepolia
+
+  # Sign and broadcast
+  $ aixyz erc-8004 register --url "https://my-agent.example.com" --chain sepolia --keystore ~/.foundry/keystores/default --broadcast
+  $ aixyz erc-8004 register --url "https://my-agent.example.com" --chain sepolia --browser --broadcast`,
+  )
+  .action(register);
+
+erc8004Command
+  .command("update")
+  .description("Update the metadata URI of a registered agent")
+  .option("--url <url>", "New agent deployment URL (e.g., https://my-agent.example.com)")
+  .option("--rpc-url <url>", "Custom RPC URL (uses default if not provided)")
+  .option("--registry <address>", "Contract address of the IdentityRegistry (required for localhost)")
+  .option("--keystore <path>", "Path to Ethereum keystore (V3) JSON file for local signing")
+  .option("--browser", "Use browser extension wallet (any extension)")
+  .option("--broadcast", "Sign and broadcast the transaction (default: dry-run)")
+  .option("--out-dir <path>", "Write result as JSON to the given directory")
+  .addHelpText(
+    "after",
+    `
+Option Details:
+  --url <url>
+      New agent deployment URL (e.g., https://my-agent.example.com).
+      The URI will be derived as <url>/_aixyz/erc-8004.json.
+      If omitted, you will be prompted to enter the URL interactively.
+
+  --rpc-url <url>
+      Custom RPC endpoint URL. Overrides the default RPC for the selected
+      chain. Cannot be used with --browser.
+
+  --registry <address>
+      Contract address of the ERC-8004 IdentityRegistry. Only required for
+      localhost, where there is no default deployment.
+
+  --keystore <path>
+      Path to an Ethereum keystore (V3) JSON file.
+
+  --browser
+      Opens a local page in your default browser for signing with any
+      EIP-6963 compatible wallet extension (MetaMask, Rabby, etc.).
+
+  --broadcast
+      Sign and broadcast the transaction on-chain. Without this flag the
+      command performs a dry-run.
+
+  --out-dir <path>
+      Directory to write the result as a JSON file.
+
+Behavior:
+  Reads existing registrations from app/erc-8004.ts. If there is one
+  registration, confirms it. If multiple, prompts you to select which
+  one to update. The chain and registry address are derived from the
+  selected registration's agentRegistry field.
+
+Environment Variables:
+  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for signing.
+
+Examples:
+  # Dry-run (default)
+  $ aixyz erc-8004 update --url "https://new-domain.example.com"
+
+  # Sign and broadcast
+  $ aixyz erc-8004 update --url "https://new-domain.example.com" --keystore ~/.foundry/keystores/default --broadcast
+  $ aixyz erc-8004 update --url "https://new-domain.example.com" --browser --broadcast`,
+  )
+  .action(update);

package/register/register.test.ts

@@ -1,6 +1,5 @@
 import { describe, expect, test } from "bun:test";
 import { CHAIN_ID, getIdentityRegistryAddress } from "@aixyz/erc-8004";
-import { register } from "./register";
 
 describe("register command chain configuration", () => {
   test("sepolia chain ID is correct", () => {
@@ -64,12 +63,4 @@ describe("register command validation", () => {
     };
     expect(CHAINS["mainnet"]).toBeUndefined();
   });
-
-  test("localhost requires --registry flag", async () => {
-    await expect(register({ chain: "localhost" })).rejects.toThrow("--registry is required for localhost");
-  });
-
-  test("dry-run completes without wallet interaction when --broadcast is not set", async () => {
-    await expect(register({ chain: "sepolia", uri: "https://example.com/agent.json" })).resolves.toBeUndefined();
-  });
 });

package/register/register.ts

@@ -1,8 +1,7 @@
 import { encodeFunctionData, formatEther, parseEventLogs, type Chain, type Log } from "viem";
 import { IdentityRegistryAbi } from "@aixyz/erc-8004";
-import { selectWalletMethod, type WalletOptions } from "./wallet";
+import { selectWalletMethod } from "./wallet";
 import { signTransaction } from "./wallet/sign";
-import { resolveUri } from "./utils";
 import {
   resolveChainConfig,
   selectChain,
@@ -12,30 +11,51 @@ import {
 } from "./utils/chain";
 import { writeResultJson } from "./utils/result";
 import { label, truncateUri, broadcastAndConfirm, logSignResult } from "./utils/transaction";
+import { promptAgentUrl, promptSupportedTrust, deriveAgentUri } from "./utils/prompt";
+import { hasErc8004File, createErc8004File, writeRegistrationEntry } from "./utils/erc8004-file";
+import { confirm } from "@inquirer/prompts";
 import chalk from "chalk";
 import boxen from "boxen";
 import type { BaseOptions } from "./index";
 
 export interface RegisterOptions extends BaseOptions {
-  uri?: string;
+  url?: string;
   chain?: string;
 }
 
 export async function register(options: RegisterOptions): Promise<void> {
-  const chainName = options.chain ?? (await selectChain());
-  const chainConfig = resolveChainConfig(chainName);
+  // Step 1: Ensure app/erc-8004.ts exists
+  if (!hasErc8004File()) {
+    console.log(chalk.yellow("No app/erc-8004.ts found. Let's create one."));
+    console.log("");
+    const supportedTrust = await promptSupportedTrust();
+    createErc8004File(supportedTrust);
+    console.log(chalk.green("Created app/erc-8004.ts"));
+    console.log("");
+  }
+
+  // Step 2: Get agent URL and derive URI
+  const agentUrl = options.url ?? (await promptAgentUrl());
+  const resolvedUri = deriveAgentUri(agentUrl);
 
-  const resolvedUri = options.uri ? resolveUri(options.uri) : undefined;
-  if (options.uri && resolvedUri !== options.uri) {
-    console.log(`Resolved ${options.uri} to data URI (${resolvedUri!.length} chars)`);
+  const yes = await confirm({
+    message: `Will register URI as: ${chalk.cyan(resolvedUri)} — confirm?`,
+    default: true,
+  });
+  if (!yes) {
+    throw new Error("Aborted.");
   }
 
+  // Step 3: Select chain
+  const chainName = options.chain ?? (await selectChain());
+  const chainConfig = resolveChainConfig(chainName);
   const registryAddress = resolveRegistryAddress(chainName, chainConfig.chainId, options.registry);
 
+  // Step 4: Encode transaction
   const data = encodeFunctionData({
     abi: IdentityRegistryAbi,
     functionName: "register",
-    args: resolvedUri ? [resolvedUri] : [],
+    args: [resolvedUri],
   });
 
   const printTxDetails = (header: string) => {
@@ -44,10 +64,8 @@ export async function register(options: RegisterOptions): Promise<void> {
     console.log(`  ${label("To")}${registryAddress}`);
     console.log(`  ${label("Data")}${data.slice(0, 10)}${chalk.dim("\u2026" + (data.length - 2) / 2 + " bytes")}`);
     console.log(`  ${label("Chain")}${chainName}`);
-    console.log(`  ${label("Function")}${resolvedUri ? "register(string memory agentURI)" : "register()"}`);
-    if (resolvedUri) {
-      console.log(`  ${label("URI")}${truncateUri(resolvedUri)}`);
-    }
+    console.log(`  ${label("Function")}register(string memory agentURI)`);
+    console.log(`  ${label("URI")}${truncateUri(resolvedUri)}`);
     console.log("");
   };
 
@@ -73,7 +91,7 @@ export async function register(options: RegisterOptions): Promise<void> {
     chain: chainConfig.chain,
     rpcUrl: options.rpcUrl,
     options: {
-      browser: { chainId: chainConfig.chainId, chainName, uri: resolvedUri },
+      browser: { chainId: chainConfig.chainId, chainName, uri: resolvedUri, mode: "register" },
     },
   });
   logSignResult(walletMethod.type, result);
@@ -86,6 +104,14 @@ export async function register(options: RegisterOptions): Promise<void> {
 
   const resultData = printResult(receipt, timestamp, chainConfig.chain, chainConfig.chainId, hash);
 
+  // Step 5: Write registration entry back to app/erc-8004.ts
+  if (resultData.agentId !== undefined) {
+    const agentRegistry = `eip155:${chainConfig.chainId}:${registryAddress}`;
+    writeRegistrationEntry({ agentId: Number(resultData.agentId), agentRegistry });
+    console.log("");
+    console.log(chalk.green(`Updated app/erc-8004.ts with registration (agentId: ${resultData.agentId})`));
+  }
+
   if (options.outDir) {
     writeResultJson(options.outDir, "registration", resultData);
   }