@aixyz/cli 0.8.0 → 0.9.0

package/bin.ts

@@ -3,8 +3,7 @@ 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 { update } from "./register/update";
 import pkg from "./package.json";
 
 function handleAction(
@@ -14,10 +13,6 @@ function handleAction(
     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);
       }
@@ -70,12 +65,12 @@ Examples:
   )
   .action(handleAction(build));
 
-const erc8004 = program.command("erc8004").description("ERC-8004 IdentityRegistry operations");
+const erc8004 = program.command("erc-8004").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("--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)")
@@ -87,12 +82,10 @@ erc8004
     "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.
+  --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:
@@ -101,7 +94,6 @@ Option Details:
         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
@@ -110,8 +102,7 @@ Option Details:
 
   --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.
+      localhost, where there is no default deployment.
 
   --keystore <path>
       Path to an Ethereum keystore (V3) JSON file. You will be prompted for
@@ -120,42 +111,36 @@ Option Details:
   --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.
+      command performs a dry-run.
 
   --out-dir <path>
-      Directory to write the deployment result as a JSON file. The file
-      is named registration-<chainId>-<timestamp>.json.
+      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. Detected automatically if set. Not recommended
-                 for interactive use as the key may appear in shell history.
+  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for signing.
 
 Examples:
-  # Dry-run (default) — shows encoded transaction, no wallet needed
-  $ aixyz erc8004 register --uri "./metadata.json" --chain sepolia
+  # Dry-run (default)
+  $ aixyz erc-8004 register --url "https://my-agent.example.com" --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`,
+  $ 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(handleAction(register));
 
 erc8004
-  .command("set-agent-uri")
+  .command("update")
   .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("--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")
@@ -166,73 +151,50 @@ erc8004
     "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.
+  --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 since the browser wallet manages
-      its own RPC connection.
+      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. For mainnet, sepolia,
-      and base-sepolia the canonical registry address is used automatically.
+      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.
+      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.).
-      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.
+      command performs a dry-run.
 
   --out-dir <path>
-      Directory to write the result as a JSON file. The file
-      is named set-agent-uri-<chainId>-<timestamp>.json.
+      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. Detected automatically if set. Not recommended
-                 for interactive use as the key may appear in shell history.
+  PRIVATE_KEY    Private key (hex, with or without 0x prefix) used for signing.
 
 Examples:
-  # Dry-run (default) — shows encoded transaction, no wallet needed
-  $ aixyz erc8004 set-agent-uri --agent-id 1 --uri "./metadata.json" --chain sepolia
+  # Dry-run (default)
+  $ aixyz erc-8004 update --url "https://new-domain.example.com"
 
   # 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`,
+  $ 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(handleAction(setAgentUri));
+  .action(handleAction(update));
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aixyz/cli",
-  "version": "0.8.0",
+  "version": "0.9.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.9.0",
+    "@aixyz/erc-8004": "0.9.0",
     "@inquirer/prompts": "^8.3.0",
     "@next/env": "^16.1.6",
     "boxen": "^8.0.1",

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

@@ -2,7 +2,6 @@ import { encodeFunctionData, formatEther, parseEventLogs, type Chain, type Log }
 import { IdentityRegistryAbi } from "@aixyz/erc-8004";
 import { selectWalletMethod, type WalletOptions } 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);
   }

package/register/update.test.ts

@@ -0,0 +1,47 @@
+import { describe, expect, test } from "bun:test";
+import { CHAIN_ID, getIdentityRegistryAddress } from "@aixyz/erc-8004";
+import { deriveAgentUri } from "./utils/prompt";
+
+describe("update command chain configuration", () => {
+  test("sepolia chain ID is correct", () => {
+    expect(CHAIN_ID.SEPOLIA).toStrictEqual(11155111);
+  });
+
+  test("base-sepolia chain ID is correct", () => {
+    expect(CHAIN_ID.BASE_SEPOLIA).toStrictEqual(84532);
+  });
+
+  test("identity registry address is returned for sepolia", () => {
+    const address = getIdentityRegistryAddress(CHAIN_ID.SEPOLIA);
+    expect(address).toMatch(/^0x[a-fA-F0-9]{40}$/);
+  });
+
+  test("identity registry address is returned for base-sepolia", () => {
+    const address = getIdentityRegistryAddress(CHAIN_ID.BASE_SEPOLIA);
+    expect(address).toMatch(/^0x[a-fA-F0-9]{40}$/);
+  });
+
+  test("throws for unsupported chain ID", () => {
+    expect(() => getIdentityRegistryAddress(999999)).toThrow("Unsupported chain ID");
+  });
+});
+
+describe("deriveAgentUri", () => {
+  test("appends /_aixyz/erc-8004.json to base URL", () => {
+    expect(deriveAgentUri("https://my-agent.example.com")).toBe("https://my-agent.example.com/_aixyz/erc-8004.json");
+  });
+
+  test("strips trailing slash before appending", () => {
+    expect(deriveAgentUri("https://my-agent.example.com/")).toBe("https://my-agent.example.com/_aixyz/erc-8004.json");
+  });
+
+  test("strips multiple trailing slashes", () => {
+    expect(deriveAgentUri("https://my-agent.example.com///")).toBe("https://my-agent.example.com/_aixyz/erc-8004.json");
+  });
+
+  test("preserves path segments", () => {
+    expect(deriveAgentUri("https://example.com/agents/my-agent")).toBe(
+      "https://example.com/agents/my-agent/_aixyz/erc-8004.json",
+    );
+  });
+});

package/register/{set-agent-uri.ts → update.ts}

@@ -2,66 +2,65 @@ import { encodeFunctionData, formatEther, parseEventLogs, type Chain, type Log }
 import { IdentityRegistryAbi } from "@aixyz/erc-8004";
 import { selectWalletMethod } from "./wallet";
 import { signTransaction } from "./wallet/sign";
-import { CliError, resolveUri } from "./utils";
 import {
   resolveChainConfig,
-  selectChain,
   resolveRegistryAddress,
   validateBrowserRpcConflict,
   getExplorerUrl,
+  CHAINS,
 } from "./utils/chain";
 import { writeResultJson } from "./utils/result";
 import { label, truncateUri, broadcastAndConfirm, logSignResult } from "./utils/transaction";
-import { confirm, input } from "@inquirer/prompts";
+import { promptAgentUrl, promptSelectRegistration, deriveAgentUri } from "./utils/prompt";
+import { readRegistrations } from "./utils/erc8004-file";
+import { confirm } from "@inquirer/prompts";
 import chalk from "chalk";
 import boxen from "boxen";
 import type { BaseOptions } from "./index";
-import { promptAgentId, promptUri } from "./utils/prompt";
 
-export interface SetAgentUriOptions extends BaseOptions {
-  agentId?: string;
-  uri?: string;
+export interface UpdateOptions extends BaseOptions {
+  url?: string;
 }
 
-async function confirmEmptyUri(): Promise<void> {
-  const yes = await confirm({
-    message: "URI is empty. This will clear the agent's metadata URI. Are you sure?",
-    default: false,
-  });
-  if (!yes) {
-    throw new CliError("Aborted.");
+export async function update(options: UpdateOptions): Promise<void> {
+  // Step 1: Read registrations from app/erc-8004.ts
+  const registrations = await readRegistrations();
+
+  if (registrations.length === 0) {
+    throw new Error("No registrations found in app/erc-8004.ts. Run `aixyz erc-8004 register` first.");
   }
-}
 
-export function validateAgentId(agentId: string): void {
-  const n = Number(agentId);
-  if (agentId.trim() === "" || !Number.isInteger(n) || n < 0) {
-    throw new CliError(`Invalid agent ID: ${agentId}. Must be a non-negative integer.`);
+  // Step 2: Select which registration to update
+  const selected = await promptSelectRegistration(registrations);
+
+  // Step 3: Derive chain info from agentRegistry (eip155:<chainId>:<address>)
+  const parts = selected.agentRegistry.split(":");
+  if (parts.length < 3 || parts[0] !== "eip155") {
+    throw new Error(`Invalid agentRegistry format: ${selected.agentRegistry}. Expected eip155:<chainId>:<address>`);
   }
-}
 
-export async function setAgentUri(options: SetAgentUriOptions): Promise<void> {
-  const chainName = options.chain ?? (await selectChain());
+  const chainId = Number(parts[1]);
+  const registryAddress = parts.slice(2).join(":") as `0x${string}`;
+  const chainName = Object.entries(CHAINS).find(([, config]) => config.chainId === chainId)?.[0] ?? `chain-${chainId}`;
   const chainConfig = resolveChainConfig(chainName);
 
-  const agentId = options.agentId ?? (await promptAgentId());
-  validateAgentId(agentId);
+  // Step 4: Get new agent URL and derive URI
+  const agentUrl = options.url ?? (await promptAgentUrl());
+  const resolvedUri = deriveAgentUri(agentUrl);
 
-  const uri = options.uri ?? (await promptUri());
-  if (uri === "") {
-    await confirmEmptyUri();
-  }
-  const resolvedUri = uri === "" ? "" : resolveUri(uri);
-  if (resolvedUri !== uri) {
-    console.log(`Resolved ${uri} to data URI (${resolvedUri.length} chars)`);
+  const yes = await confirm({
+    message: `Will update URI to: ${chalk.cyan(resolvedUri)} — confirm?`,
+    default: true,
+  });
+  if (!yes) {
+    throw new Error("Aborted.");
   }
 
-  const registryAddress = resolveRegistryAddress(chainName, chainConfig.chainId, options.registry);
-
+  // Step 5: Encode transaction
   const data = encodeFunctionData({
     abi: IdentityRegistryAbi,
     functionName: "setAgentURI",
-    args: [BigInt(agentId), resolvedUri],
+    args: [BigInt(selected.agentId), resolvedUri],
   });
 
   const printTxDetails = (header: string) => {
@@ -71,7 +70,7 @@ export async function setAgentUri(options: SetAgentUriOptions): Promise<void> {
     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")}setAgentURI(uint256 agentId, string calldata newURI)`);
-    console.log(`  ${label("Agent ID")}${agentId}`);
+    console.log(`  ${label("Agent ID")}${selected.agentId}`);
     console.log(`  ${label("URI")}${truncateUri(resolvedUri)}`);
     console.log("");
   };
@@ -98,7 +97,7 @@ export async function setAgentUri(options: SetAgentUriOptions): Promise<void> {
     chain: chainConfig.chain,
     rpcUrl: options.rpcUrl,
     options: {
-      browser: { chainId: chainConfig.chainId, chainName, uri: resolvedUri },
+      browser: { chainId: chainConfig.chainId, chainName, uri: resolvedUri, mode: "update" },
     },
   });
   logSignResult(walletMethod.type, result);
@@ -112,11 +111,11 @@ export async function setAgentUri(options: SetAgentUriOptions): Promise<void> {
   const resultData = printResult(receipt, timestamp, chainConfig.chain, chainConfig.chainId, hash);
 
   if (options.outDir) {
-    writeResultJson(options.outDir, "set-agent-uri", resultData);
+    writeResultJson(options.outDir, "update", resultData);
   }
 }
 
-interface SetAgentUriResult {
+interface UpdateResult {
   agentId?: string;
   newUri?: string;
   updatedBy?: `0x${string}`;
@@ -135,12 +134,12 @@ function printResult(
   chain: Chain,
   chainId: number,
   hash: `0x${string}`,
-): SetAgentUriResult {
+): UpdateResult {
   const events = parseEventLogs({ abi: IdentityRegistryAbi, logs: receipt.logs as Log[] });
   const uriUpdated = events.find((e) => e.eventName === "URIUpdated");
 
   const lines: string[] = [];
-  const result: SetAgentUriResult = {
+  const result: UpdateResult = {
     chainId,
     block: receipt.blockNumber.toString(),
     timestamp: new Date(Number(timestamp) * 1000).toUTCString(),

package/register/utils/chain.ts

@@ -2,7 +2,6 @@ import { isAddress, type Chain } from "viem";
 import { mainnet, sepolia, baseSepolia, foundry } from "viem/chains";
 import { CHAIN_ID, getIdentityRegistryAddress } from "@aixyz/erc-8004";
 import { select } from "@inquirer/prompts";
-import { CliError } from "../utils";
 
 export interface ChainConfig {
   chain: Chain;
@@ -19,7 +18,7 @@ export const CHAINS: Record<string, ChainConfig> = {
 export function resolveChainConfig(chainName: string): ChainConfig {
   const config = CHAINS[chainName];
   if (!config) {
-    throw new CliError(`Unsupported chain: ${chainName}. Supported chains: ${Object.keys(CHAINS).join(", ")}`);
+    throw new Error(`Unsupported chain: ${chainName}. Supported chains: ${Object.keys(CHAINS).join(", ")}`);
   }
   return config;
 }
@@ -34,19 +33,19 @@ export async function selectChain(): Promise<string> {
 export function resolveRegistryAddress(chainName: string, chainId: number, registry?: string): `0x${string}` {
   if (registry) {
     if (!isAddress(registry)) {
-      throw new CliError(`Invalid registry address: ${registry}`);
+      throw new Error(`Invalid registry address: ${registry}`);
     }
     return registry as `0x${string}`;
   }
   if (chainName === "localhost") {
-    throw new CliError("--registry is required for localhost (no default contract deployment)");
+    throw new Error("--registry is required for localhost (no default contract deployment)");
   }
   return getIdentityRegistryAddress(chainId) as `0x${string}`;
 }
 
 export function validateBrowserRpcConflict(browser: boolean | undefined, rpcUrl: string | undefined): void {
   if (browser && rpcUrl) {
-    throw new CliError("--rpc-url cannot be used with browser wallet. The browser wallet uses its own RPC endpoint.");
+    throw new Error("--rpc-url cannot be used with browser wallet. The browser wallet uses its own RPC endpoint.");
   }
 }