polkadot-cli 1.12.0 → 1.13.0

package/dist/cli.mjs

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
 var __defProp = Object.defineProperty;
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
@@ -15,7 +14,6 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/config/types.ts
 function primaryRpc(rpc) {
@@ -53,7 +51,9 @@ var init_types = __esm(() => {
           "wss://statemint-rpc-tn.dwellir.com",
           "wss://statemint.public.curie.radiumblock.co/ws",
           "wss://asset-hub-polkadot.rpc.permanence.io"
-        ]
+        ],
+        relay: "polkadot",
+        parachainId: 1000
       },
       "polkadot-bridge-hub": {
         rpc: [
@@ -65,7 +65,9 @@ var init_types = __esm(() => {
           "wss://bridgehub-polkadot.api.onfinality.io/public-ws",
           "wss://polkadot-bridge-hub-rpc-tn.dwellir.com",
           "wss://bridgehub-polkadot.public.curie.radiumblock.co/ws"
-        ]
+        ],
+        relay: "polkadot",
+        parachainId: 1002
       },
       "polkadot-collectives": {
         rpc: [
@@ -77,7 +79,9 @@ var init_types = __esm(() => {
           "wss://collectives.api.onfinality.io/public-ws",
           "wss://polkadot-collectives-rpc-tn.dwellir.com",
           "wss://collectives.public.curie.radiumblock.co/ws"
-        ]
+        ],
+        relay: "polkadot",
+        parachainId: 1001
       },
       "polkadot-coretime": {
         rpc: [
@@ -87,7 +91,9 @@ var init_types = __esm(() => {
           "wss://coretime-polkadot-rpc.n.dwellir.com",
           "wss://rpc-coretime-polkadot.luckyfriday.io",
           "wss://coretime-polkadot.api.onfinality.io/public-ws"
-        ]
+        ],
+        relay: "polkadot",
+        parachainId: 1005
       },
       "polkadot-people": {
         rpc: [
@@ -97,7 +103,9 @@ var init_types = __esm(() => {
           "wss://people-polkadot-rpc.n.dwellir.com",
           "wss://rpc-people-polkadot.luckyfriday.io",
           "wss://people-polkadot.api.onfinality.io/public-ws"
-        ]
+        ],
+        relay: "polkadot",
+        parachainId: 1004
       },
       paseo: {
         rpc: [
@@ -113,23 +121,33 @@ var init_types = __esm(() => {
           "wss://asset-hub-paseo.dotters.network",
           "wss://asset-hub-paseo-rpc.n.dwellir.com",
           "wss://sys.turboflakes.io/asset-hub-paseo"
-        ]
+        ],
+        relay: "paseo",
+        parachainId: 1000
       },
       "paseo-bridge-hub": {
-        rpc: ["wss://bridge-hub-paseo.ibp.network", "wss://bridge-hub-paseo.dotters.network"]
+        rpc: ["wss://bridge-hub-paseo.ibp.network", "wss://bridge-hub-paseo.dotters.network"],
+        relay: "paseo",
+        parachainId: 1002
       },
       "paseo-collectives": {
-        rpc: ["wss://collectives-paseo.ibp.network", "wss://collectives-paseo.dotters.network"]
+        rpc: ["wss://collectives-paseo.ibp.network", "wss://collectives-paseo.dotters.network"],
+        relay: "paseo",
+        parachainId: 1001
       },
       "paseo-coretime": {
-        rpc: ["wss://coretime-paseo.ibp.network", "wss://coretime-paseo.dotters.network"]
+        rpc: ["wss://coretime-paseo.ibp.network", "wss://coretime-paseo.dotters.network"],
+        relay: "paseo",
+        parachainId: 1005
       },
       "paseo-people": {
         rpc: [
           "wss://people-paseo.ibp.network",
           "wss://people-paseo.dotters.network",
           "wss://people-paseo.rpc.amforc.com"
-        ]
+        ],
+        relay: "paseo",
+        parachainId: 1004
       }
     }
   };
@@ -164,10 +182,16 @@ async function loadConfig() {
   await ensureDir(DOT_DIR);
   if (await fileExists(CONFIG_PATH)) {
     const saved = JSON.parse(await readFile(CONFIG_PATH, "utf-8"));
-    return {
-      ...saved,
-      chains: { ...DEFAULT_CONFIG.chains, ...saved.chains }
-    };
+    const chains = {};
+    for (const [name, defaultConfig] of Object.entries(DEFAULT_CONFIG.chains)) {
+      chains[name] = saved.chains[name] ? { ...defaultConfig, ...saved.chains[name] } : defaultConfig;
+    }
+    for (const [name, config] of Object.entries(saved.chains)) {
+      if (!(name in DEFAULT_CONFIG.chains)) {
+        chains[name] = config;
+      }
+    }
+    return { ...saved, chains };
   }
   await saveConfig(DEFAULT_CONFIG);
   return DEFAULT_CONFIG;
@@ -259,6 +283,42 @@ function isWatchOnly(account) {
   return account.secret === undefined;
 }
 
+// src/utils/fuzzy-match.ts
+function levenshtein(a, b) {
+  const la = a.length;
+  const lb = b.length;
+  const dp = Array.from({ length: la + 1 }, () => Array(lb + 1).fill(0));
+  for (let i = 0;i <= la; i++)
+    dp[i][0] = i;
+  for (let j = 0;j <= lb; j++)
+    dp[0][j] = j;
+  for (let i = 1;i <= la; i++) {
+    for (let j = 1;j <= lb; j++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      dp[i][j] = Math.min(dp[i - 1][j] + 1, dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost);
+    }
+  }
+  return dp[la][lb];
+}
+function findClosest(input, candidates, maxDistance = 3) {
+  const lower = input.toLowerCase();
+  const exact = candidates.find((c) => c.toLowerCase() === lower);
+  if (exact)
+    return [exact];
+  const scored = candidates.map((c) => ({ name: c, dist: levenshtein(lower, c.toLowerCase()) })).filter((s) => s.dist <= maxDistance).sort((a, b) => a.dist - b.dist);
+  return scored.slice(0, 3).map((s) => s.name);
+}
+function suggestMessage(kind, input, candidates) {
+  const suggestions = findClosest(input, candidates);
+  if (suggestions.length === 0) {
+    return `Unknown ${kind} "${input}".`;
+  }
+  if (suggestions.length === 1 && suggestions[0]?.toLowerCase() === input.toLowerCase()) {
+    return suggestions[0];
+  }
+  return `Unknown ${kind} "${input}". Did you mean: ${suggestions.join(", ")}?`;
+}
+
 // src/core/accounts.ts
 import { sr25519CreateDerive } from "@polkadot-labs/hdkd";
 import {
@@ -369,8 +429,14 @@ async function resolveAccountKeypair(name) {
   const accountsFile = await loadAccounts();
   const account = findAccount(accountsFile, name);
   if (!account) {
-    const available = [...DEV_NAMES, ...accountsFile.accounts.map((a) => a.name)];
-    throw new Error(`Unknown account "${name}". Available accounts: ${available.join(", ")}`);
+    const available = [...DEV_NAMES, ...accountsFile.accounts.map((a) => a.name)].sort((a, b) => a.localeCompare(b));
+    const suggestions = findClosest(name, available);
+    const hint = suggestions.length > 0 ? `
+  Did you mean: ${suggestions.join(", ")}?` : "";
+    const list = available.map((a) => `
+    - ${a}`).join("");
+    throw new Error(`Unknown account "${name}".${hint}
+  Available accounts:${list}`);
   }
   if (account.secret === undefined) {
     throw new Error(`Account "${name}" is watch-only (no secret). Cannot sign. Import with --secret or --env.`);
@@ -390,6 +456,7 @@ var init_accounts = __esm(() => {
 });
 
 // src/utils/binary-display.ts
+import { Binary } from "polkadot-api";
 function isReadableText(text) {
   for (let i = 0;i < text.length; i++) {
     const code = text.charCodeAt(i);
@@ -407,20 +474,17 @@ function isReadableText(text) {
   return true;
 }
 function binaryToDisplay(value) {
-  const text = value.asText();
-  return isReadableText(text) ? text : value.asHex();
+  const text = Binary.toText(value);
+  return isReadableText(text) ? text : Binary.toHex(value);
 }
+var init_binary_display = () => {};
 
 // src/core/output.ts
-import { Binary } from "polkadot-api";
 function replacer(_key, value) {
   if (typeof value === "bigint")
     return value.toString();
-  if (value instanceof Binary) {
-    return binaryToDisplay(value);
-  }
   if (value instanceof Uint8Array)
-    return `0x${Buffer.from(value).toString("hex")}`;
+    return binaryToDisplay(value);
   return value;
 }
 function formatJson(data) {
@@ -442,6 +506,12 @@ function printResult(data, format = "pretty") {
     console.log(formatPretty(data));
   }
 }
+function isJsonOutput(opts) {
+  return opts.json === true || opts.output === "json";
+}
+function printJsonLine(data) {
+  console.log(JSON.stringify(data, replacer));
+}
 function printHeading(text) {
   console.log(`
 ${BOLD}${text}${RESET}
@@ -500,6 +570,7 @@ function firstSentence(docs) {
 }
 var isTTY, RESET, CYAN, GREEN, RED, YELLOW, MAGENTA, DIM, BOLD, CHECK_MARK = "✓", SPINNER_FRAMES;
 var init_output = __esm(() => {
+  init_binary_display();
   isTTY = process.stdout.isTTY ?? false;
   RESET = isTTY ? "\x1B[0m" : "";
   CYAN = isTTY ? "\x1B[36m" : "";
@@ -556,37 +627,33 @@ var init_errors = __esm(() => {
 
 // src/core/client.ts
 import { createClient } from "polkadot-api";
-import { withPolkadotSdkCompat } from "polkadot-api/polkadot-sdk-compat";
-import { getWsProvider } from "polkadot-api/ws-provider";
-import { WebSocket } from "ws";
-function suppressWsNoise() {
-  const orig = console.error;
+import { getWsProvider } from "polkadot-api/ws";
+function suppressProviderNoise() {
+  const origError = console.error;
+  const origWarn = console.warn;
   console.error = (...args) => {
     if (typeof args[0] === "string" && args[0].includes("Unable to connect"))
       return;
-    orig(...args);
+    origError(...args);
+  };
+  console.warn = (...args) => {
+    if (typeof args[0] === "string" && args[0].includes("ChainHead"))
+      return;
+    origWarn(...args);
   };
   return () => {
-    console.error = orig;
+    console.error = origError;
+    console.warn = origWarn;
   };
 }
 async function createChainClient(chainName, chainConfig, rpcOverride) {
-  const useLight = !rpcOverride && chainConfig.lightClient;
-  const restoreConsole = suppressWsNoise();
-  let provider;
-  if (useLight) {
-    provider = await createSmoldotProvider(chainName);
-  } else {
-    const rpc = rpcOverride ?? chainConfig.rpc;
-    if (!rpc) {
-      restoreConsole();
-      throw new ConnectionError(`No RPC endpoint configured for chain "${chainName}". Use --rpc or configure one with: dot chain add ${chainName} --rpc <url>`);
-    }
-    provider = withPolkadotSdkCompat(getWsProvider(rpc, {
-      timeout: 1e4,
-      websocketClass: WebSocket
-    }));
+  const restoreConsole = suppressProviderNoise();
+  const rpc = rpcOverride ?? chainConfig.rpc;
+  if (!rpc) {
+    restoreConsole();
+    throw new ConnectionError(`No RPC endpoint configured for chain "${chainName}". Use --rpc or configure one with: dot chain add ${chainName} --rpc <url>`);
   }
+  const provider = getWsProvider(rpc, { timeout: 1e4 });
   const client = createClient(provider, {
     getMetadata: async () => loadMetadata(chainName),
     setMetadata: async (_codeHash, metadata) => {
@@ -596,51 +663,25 @@ async function createChainClient(chainName, chainConfig, rpcOverride) {
   return {
     client,
     destroy: () => {
-      client.destroy();
-      restoreConsole();
+      try {
+        client.destroy();
+      } catch {}
+      setTimeout(restoreConsole, 500);
     }
   };
 }
-async function createSmoldotProvider(chainName) {
-  const { start } = await import("polkadot-api/smoldot");
-  const { getSmProvider } = await import("polkadot-api/sm-provider");
-  const entry = KNOWN_CHAIN_SPECS[chainName];
-  if (!entry) {
-    throw new ConnectionError(`Light client is only supported for known chains: ${Object.keys(KNOWN_CHAIN_SPECS).join(", ")}. Use --rpc to connect to "${chainName}" instead.`);
-  }
-  const { chainSpec } = await import(entry.spec);
-  const smoldot = start();
-  if (entry.relay) {
-    const relayEntry = KNOWN_CHAIN_SPECS[entry.relay];
-    if (!relayEntry) {
-      throw new ConnectionError(`Relay chain "${entry.relay}" not found in known chain specs.`);
-    }
-    const { chainSpec: relaySpec } = await import(relayEntry.spec);
-    const relayChain = await smoldot.addChain({ chainSpec: relaySpec, disableJsonRpc: true });
-    const chain2 = await smoldot.addChain({ chainSpec, potentialRelayChains: [relayChain] });
-    return getSmProvider(chain2);
-  }
-  const chain = await smoldot.addChain({ chainSpec });
-  return getSmProvider(chain);
-}
-var KNOWN_CHAIN_SPECS;
+async function getParachainId(clientHandle) {
+  try {
+    const unsafeApi = clientHandle.client.getUnsafeApi();
+    const parachainId = await unsafeApi.query.ParachainInfo.ParachainId.getValue();
+    return typeof parachainId === "number" ? parachainId : null;
+  } catch {
+    return null;
+  }
+}
 var init_client = __esm(() => {
   init_store();
   init_errors();
-  KNOWN_CHAIN_SPECS = {
-    polkadot: { spec: "polkadot-api/chains/polkadot" },
-    kusama: { spec: "polkadot-api/chains/ksmcc3" },
-    westend: { spec: "polkadot-api/chains/westend2" },
-    paseo: { spec: "polkadot-api/chains/paseo" },
-    "polkadot-asset-hub": { spec: "polkadot-api/chains/polkadot_asset_hub", relay: "polkadot" },
-    "polkadot-bridge-hub": { spec: "polkadot-api/chains/polkadot_bridge_hub", relay: "polkadot" },
-    "polkadot-collectives": { spec: "polkadot-api/chains/polkadot_collectives", relay: "polkadot" },
-    "polkadot-coretime": { spec: "polkadot-api/chains/polkadot_coretime", relay: "polkadot" },
-    "polkadot-people": { spec: "polkadot-api/chains/polkadot_people", relay: "polkadot" },
-    "paseo-asset-hub": { spec: "polkadot-api/chains/paseo_asset_hub", relay: "paseo" },
-    "paseo-coretime": { spec: "polkadot-api/chains/paseo_coretime", relay: "paseo" },
-    "paseo-people": { spec: "polkadot-api/chains/paseo_people", relay: "paseo" }
-  };
 });
 
 // src/core/metadata.ts
@@ -915,42 +956,6 @@ var init_metadata = __esm(() => {
   v15Arg = toHex(u32.enc(15));
 });
 
-// src/utils/fuzzy-match.ts
-function levenshtein(a, b) {
-  const la = a.length;
-  const lb = b.length;
-  const dp = Array.from({ length: la + 1 }, () => Array(lb + 1).fill(0));
-  for (let i = 0;i <= la; i++)
-    dp[i][0] = i;
-  for (let j = 0;j <= lb; j++)
-    dp[0][j] = j;
-  for (let i = 1;i <= la; i++) {
-    for (let j = 1;j <= lb; j++) {
-      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-      dp[i][j] = Math.min(dp[i - 1][j] + 1, dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost);
-    }
-  }
-  return dp[la][lb];
-}
-function findClosest(input, candidates, maxDistance = 3) {
-  const lower = input.toLowerCase();
-  const exact = candidates.find((c) => c.toLowerCase() === lower);
-  if (exact)
-    return [exact];
-  const scored = candidates.map((c) => ({ name: c, dist: levenshtein(lower, c.toLowerCase()) })).filter((s) => s.dist <= maxDistance).sort((a, b) => a.dist - b.dist);
-  return scored.slice(0, 3).map((s) => s.name);
-}
-function suggestMessage(kind, input, candidates) {
-  const suggestions = findClosest(input, candidates);
-  if (suggestions.length === 0) {
-    return `Unknown ${kind} "${input}".`;
-  }
-  if (suggestions.length === 1 && suggestions[0]?.toLowerCase() === input.toLowerCase()) {
-    return suggestions[0];
-  }
-  return `Unknown ${kind} "${input}". Did you mean: ${suggestions.join(", ")}?`;
-}
-
 // src/core/explorers.ts
 var pjsAppsLink = (rpc, hash) => `https://polkadot.js.org/apps/?rpc=${encodeURIComponent(rpc)}#/explorer/query/${hash}`, papiLink = (rpc, hash) => `https://dev.papi.how/explorer/${hash}#networkId=custom&endpoint=${encodeURIComponent(rpc)}`;
 
@@ -976,9 +981,14 @@ async function resolveAccountAddress(input) {
     return input;
   }
   const stored = accountsFile.accounts.map((a) => a.name);
-  const available = [...DEV_NAMES, ...stored];
-  throw new Error(`Unknown account or address "${input}".
-  Available accounts: ${available.join(", ")}`);
+  const available = [...DEV_NAMES, ...stored].sort((a, b) => a.localeCompare(b));
+  const suggestions = findClosest(input, available);
+  const hint = suggestions.length > 0 ? `
+  Did you mean: ${suggestions.join(", ")}?` : "";
+  const list = available.map((a) => `
+    - ${a}`).join("");
+  throw new Error(`Unknown account or address "${input}".${hint}
+  Available accounts:${list}`);
 }
 var init_resolve_address = __esm(() => {
   init_accounts_store();
@@ -1206,7 +1216,7 @@ async function parseTypedArg(meta, entry, arg) {
     case "enum": {
       if (/^0x[0-9a-fA-F]+$/.test(arg) && meta.lookup.call != null && entry.id === meta.lookup.call) {
         const callCodec = meta.builder.buildDefinition(meta.lookup.call);
-        return callCodec.dec(Binary2.fromHex(arg).asBytes());
+        return callCodec.dec(Binary2.fromHex(arg));
       }
       if (arg.startsWith("{")) {
         try {
@@ -1318,6 +1328,7 @@ var init_tx = __esm(() => {
   init_metadata();
   init_output();
   init_resolve_address();
+  init_binary_display();
   init_errors();
   init_focused_inspect();
   PAPI_BUILTIN_EXTENSIONS = new Set([
@@ -1348,6 +1359,13 @@ async function handleApis(target, args, opts) {
     const { name: chainName2, chain: chainConfig2 } = resolveChain(config2, opts.chain);
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const apis = listRuntimeApis(meta);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        apis: apis.map((a) => ({ name: a.name, methods: a.methods.length }))
+      }));
+      return;
+    }
     printHeading(`Runtime APIs on ${chainName2} (${apis.length})`);
     for (const api of apis) {
       printItem(api.name, `${api.methods.length} methods`);
@@ -1370,7 +1388,24 @@ async function handleApis(target, args, opts) {
     const meta = await loadMeta(chainName, chainConfig, opts.rpc);
     const api = resolveRuntimeApi(meta, apiName);
     if (api.methods.length === 0) {
-      console.log(`No methods in ${api.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, api: api.name, methods: [] }));
+      } else {
+        console.log(`No methods in ${api.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        api: api.name,
+        methods: api.methods.map((m) => ({
+          name: m.name,
+          args: describeRuntimeApiMethodArgs(meta, m),
+          returns: describeType(meta.lookup, m.output),
+          docs: firstSentence(m.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${api.name} Methods`);
@@ -1401,7 +1436,7 @@ async function handleApis(target, args, opts) {
     const parsedArgs = await parseRuntimeApiArgs(meta, method, effectiveArgs);
     const unsafeApi = clientHandle.client.getUnsafeApi();
     const result = await unsafeApi.apis[api.name][method.name](...parsedArgs);
-    const format = opts.output ?? "pretty";
+    const format = isJsonOutput(opts) ? "json" : opts.output ?? "pretty";
     printResult(result, format);
   } finally {
     clientHandle.destroy();
@@ -1441,7 +1476,8 @@ async function loadMeta(chainName, chainConfig, rpcOverride) {
   try {
     return await getOrFetchMetadata(chainName);
   } catch {
-    console.error(`Fetching metadata from ${chainName}...`);
+    process.stderr.write(`Fetching metadata from ${chainName}...
+`);
     const clientHandle = await createChainClient(chainName, chainConfig, rpcOverride);
     try {
       return await getOrFetchMetadata(chainName, clientHandle);
@@ -1465,6 +1501,13 @@ async function handleCalls(target, opts) {
     const meta2 = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withCalls = pallets.filter((p) => p.calls.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withCalls.map((p) => ({ name: p.name, calls: p.calls.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with calls on ${chainName2} (${withCalls.length})`);
     for (const p of withCalls) {
       printItem(p.name, `${p.calls.length} calls`);
@@ -1481,7 +1524,23 @@ async function handleCalls(target, opts) {
   const pallet = resolvePallet(meta, palletName);
   if (!itemName) {
     if (pallet.calls.length === 0) {
-      console.log(`No calls in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, calls: [] }));
+      } else {
+        console.log(`No calls in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        calls: pallet.calls.map((c) => ({
+          name: c.name,
+          args: describeCallArgs(meta, pallet.name, c.name),
+          docs: firstSentence(c.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Calls`);
@@ -1501,6 +1560,17 @@ async function handleCalls(target, opts) {
     const names = pallet.calls.map((c) => c.name);
     throw new Error(suggestMessage(`call in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: callItem.name,
+      category: "call",
+      args: describeCallArgs(meta, pallet.name, callItem.name),
+      docs: callItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${callItem.name} (Call)`);
   const args = describeCallArgs(meta, pallet.name, callItem.name);
   console.log(`  ${BOLD}Args:${RESET} ${args}`);
@@ -1517,6 +1587,13 @@ async function handleEvents(target, opts) {
     const meta2 = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withEvents = pallets.filter((p) => p.events.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withEvents.map((p) => ({ name: p.name, events: p.events.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with events on ${chainName2} (${withEvents.length})`);
     for (const p of withEvents) {
       printItem(p.name, `${p.events.length} events`);
@@ -1533,7 +1610,23 @@ async function handleEvents(target, opts) {
   const pallet = resolvePallet(meta, palletName);
   if (!itemName) {
     if (pallet.events.length === 0) {
-      console.log(`No events in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, events: [] }));
+      } else {
+        console.log(`No events in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        events: pallet.events.map((e) => ({
+          name: e.name,
+          fields: describeEventFields(meta, pallet.name, e.name),
+          docs: firstSentence(e.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Events`);
@@ -1553,6 +1646,17 @@ async function handleEvents(target, opts) {
     const names = pallet.events.map((e) => e.name);
     throw new Error(suggestMessage(`event in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: eventItem.name,
+      category: "event",
+      fields: describeEventFields(meta, pallet.name, eventItem.name),
+      docs: eventItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${eventItem.name} (Event)`);
   const fields = describeEventFields(meta, pallet.name, eventItem.name);
   console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
@@ -1569,6 +1673,13 @@ async function handleErrors(target, opts) {
     const meta2 = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withErrors = pallets.filter((p) => p.errors.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withErrors.map((p) => ({ name: p.name, errors: p.errors.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with errors on ${chainName2} (${withErrors.length})`);
     for (const p of withErrors) {
       printItem(p.name, `${p.errors.length} errors`);
@@ -1585,7 +1696,19 @@ async function handleErrors(target, opts) {
   const pallet = resolvePallet(meta, palletName);
   if (!itemName) {
     if (pallet.errors.length === 0) {
-      console.log(`No errors in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, errors: [] }));
+      } else {
+        console.log(`No errors in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        errors: pallet.errors.map((e) => ({ name: e.name, docs: firstSentence(e.docs) }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Errors`);
@@ -1604,6 +1727,16 @@ async function handleErrors(target, opts) {
     const names = pallet.errors.map((e) => e.name);
     throw new Error(suggestMessage(`error in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: errorItem.name,
+      category: "error",
+      docs: errorItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${errorItem.name} (Error)`);
   if (errorItem.docs.length) {
     printDocs(errorItem.docs);
@@ -1617,6 +1750,13 @@ async function handleStorage(target, opts) {
     const meta2 = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withStorage = pallets.filter((p) => p.storage.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withStorage.map((p) => ({ name: p.name, storage: p.storage.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with storage on ${chainName2} (${withStorage.length})`);
     for (const p of withStorage) {
       printItem(p.name, `${p.storage.length} storage`);
@@ -1633,7 +1773,23 @@ async function handleStorage(target, opts) {
   const pallet = resolvePallet(meta, palletName);
   if (!itemName) {
     if (pallet.storage.length === 0) {
-      console.log(`No storage items in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, storage: [] }));
+      } else {
+        console.log(`No storage items in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        storage: pallet.storage.map((s) => {
+          const valueType = describeType(meta.lookup, s.valueTypeId);
+          const keyType = s.keyTypeId != null ? describeType(meta.lookup, s.keyTypeId) : undefined;
+          return { name: s.name, type: s.type, valueType, keyType, docs: firstSentence(s.docs) };
+        })
+      }));
       return;
     }
     printHeading(`${pallet.name} Storage`);
@@ -1660,6 +1816,21 @@ async function handleStorage(target, opts) {
     const names = pallet.storage.map((s) => s.name);
     throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    const valueType = describeType(meta.lookup, storageItem.valueTypeId);
+    const keyType = storageItem.keyTypeId != null ? describeType(meta.lookup, storageItem.keyTypeId) : undefined;
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: storageItem.name,
+      category: "storage",
+      type: storageItem.type,
+      valueType,
+      keyType,
+      docs: storageItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
   console.log(`  ${BOLD}Type:${RESET} ${storageItem.type}`);
   console.log(`  ${BOLD}Value:${RESET} ${describeType(meta.lookup, storageItem.valueTypeId)}`);
@@ -1998,6 +2169,9 @@ async function generateCompletions(currentWord, precedingWords) {
   if (prevWord === "--wait" || prevWord === "-w") {
     return filterPrefix(["broadcast", "best-block", "best", "finalized"], currentWord);
   }
+  if (prevWord === "--relay") {
+    return filterPrefix(knownChains, currentWord);
+  }
   if (currentWord.startsWith("--")) {
     const activeCategory = detectCategory(precedingWords, knownChains);
     const options = [...GLOBAL_OPTIONS];
@@ -2005,10 +2179,19 @@ async function generateCompletions(currentWord, precedingWords) {
       options.push(...TX_OPTIONS);
     if (activeCategory === "query")
       options.push(...QUERY_OPTIONS);
+    const chainIdx = precedingWords.indexOf("chain");
+    if (chainIdx >= 0 && precedingWords[chainIdx + 1] === "add") {
+      options.push("--relay", "--parachain-id");
+    }
     return filterPrefix(options, currentWord);
   }
   const firstArg = precedingWords.find((w) => !w.startsWith("-"));
   if (firstArg === "chain") {
+    const chainSubIdx = precedingWords.indexOf("chain");
+    const subcommand = precedingWords[chainSubIdx + 1];
+    if (subcommand === "add" && currentWord.startsWith("--")) {
+      return filterPrefix(["--rpc", "--relay", "--parachain-id", ...GLOBAL_OPTIONS], currentWord);
+    }
     return filterPrefix(CHAIN_SUBCOMMANDS, currentWord);
   }
   if (firstArg === "account") {
@@ -2199,7 +2382,7 @@ var init_complete = __esm(() => {
     "delete",
     "inspect"
   ];
-  GLOBAL_OPTIONS = ["--chain", "--rpc", "--light-client", "--output", "--help", "--version"];
+  GLOBAL_OPTIONS = ["--chain", "--rpc", "--output", "--help", "--version"];
   TX_OPTIONS = [
     "--from",
     "--dry-run",
@@ -2217,7 +2400,7 @@ var init_complete = __esm(() => {
 // src/cli.ts
 import cac from "cac";
 // package.json
-var version = "1.12.0";
+var version = "1.13.0";
 
 // src/commands/account.ts
 init_accounts_store();
@@ -2258,7 +2441,7 @@ function registerAccountCommands(cli) {
   cli.command("account [action] [...names]", "Manage local accounts (create, import, list, remove)").alias("accounts").option("--secret <value>", "Secret key (mnemonic or hex seed) for import").option("--env <varName>", "Environment variable name holding the secret").option("--path <derivation>", "Derivation path (e.g. //staking, //polkadot//0/wallet)").option("--prefix <number>", "SS58 prefix for address encoding (default: 42)").action(async (action, names, opts) => {
     if (!action) {
       if (process.argv[2] === "accounts")
-        return accountList();
+        return accountList(opts);
       console.log(ACCOUNT_HELP);
       return;
     }
@@ -2269,16 +2452,16 @@ function registerAccountCommands(cli) {
       case "add":
         if (opts.secret || opts.env)
           return accountImport(names[0], opts);
-        return accountAddWatchOnly(names[0], names[1]);
+        return accountAddWatchOnly(names[0], names[1], opts);
       case "import":
         return accountImport(names[0], opts);
       case "derive":
         return accountDerive(names[0], names[1], opts);
       case "list":
-        return accountList();
+        return accountList(opts);
       case "delete":
       case "remove":
-        return accountRemove(names);
+        return accountRemove(names, opts);
       case "inspect":
         return accountInspect(names[0], opts);
       default:
@@ -2316,6 +2499,18 @@ async function accountCreate(name, opts) {
     bandersnatch
   });
   await saveAccounts(accountsFile);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      name,
+      address,
+      publicKey: hexPub,
+      mnemonic,
+      path: path || undefined,
+      bandersnatch
+    }));
+    console.error(`Save this mnemonic phrase! It is the only way to recover this account.`);
+    return;
+  }
   printHeading("Account Created");
   console.log(`  ${BOLD}Name:${RESET}          ${name}`);
   if (path)
@@ -2364,6 +2559,11 @@ async function accountImport(name, opts) {
       derivationPath: path
     });
     await saveAccounts(accountsFile);
+    if (isJsonOutput(opts)) {
+      const address = publicKey ? toSs58(publicKey) : undefined;
+      console.log(formatJson({ name, address, env: opts.env, path: path || undefined }));
+      return;
+    }
     printHeading("Account Imported");
     console.log(`  ${BOLD}Name:${RESET}    ${name}`);
     if (path)
@@ -2386,6 +2586,10 @@ async function accountImport(name, opts) {
       derivationPath: path
     });
     await saveAccounts(accountsFile);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({ name, address, publicKey: hexPub, path: path || undefined }));
+      return;
+    }
     printHeading("Account Imported");
     console.log(`  ${BOLD}Name:${RESET}    ${name}`);
     if (path)
@@ -2394,7 +2598,7 @@ async function accountImport(name, opts) {
     console.log();
   }
 }
-async function accountAddWatchOnly(name, address) {
+async function accountAddWatchOnly(name, address, opts = {}) {
   if (!name) {
     console.error(`Account name is required.
 `);
@@ -2431,6 +2635,10 @@ async function accountAddWatchOnly(name, address) {
     derivationPath: ""
   });
   await saveAccounts(accountsFile);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({ name, address: toSs58(hexPub), watchOnly: true }));
+    return;
+  }
   printHeading("Account Added (watch-only)");
   console.log(`  ${BOLD}Name:${RESET}    ${name}`);
   console.log(`  ${BOLD}Address:${RESET} ${toSs58(hexPub)}`);
@@ -2480,6 +2688,11 @@ async function accountDerive(sourceName, newName, opts) {
       derivationPath: path
     });
     await saveAccounts(accountsFile);
+    if (isJsonOutput(opts)) {
+      const address = publicKey ? toSs58(publicKey) : undefined;
+      console.log(formatJson({ name: newName, source: sourceName, path, address, env: sourceSecret.env }));
+      return;
+    }
     printHeading("Account Derived");
     console.log(`  ${BOLD}Name:${RESET}    ${newName}`);
     console.log(`  ${BOLD}Source:${RESET}  ${sourceName}`);
@@ -2502,6 +2715,10 @@ async function accountDerive(sourceName, newName, opts) {
       derivationPath: path
     });
     await saveAccounts(accountsFile);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({ name: newName, source: sourceName, path, address, publicKey: hexPub }));
+      return;
+    }
     printHeading("Account Derived");
     console.log(`  ${BOLD}Name:${RESET}    ${newName}`);
     console.log(`  ${BOLD}Source:${RESET}  ${sourceName}`);
@@ -2510,14 +2727,43 @@ async function accountDerive(sourceName, newName, opts) {
     console.log();
   }
 }
-async function accountList() {
+async function accountList(opts = {}) {
+  const accountsFile = await loadAccounts();
+  if (isJsonOutput(opts)) {
+    const dev = DEV_NAMES.map((name) => ({
+      name: name.charAt(0).toUpperCase() + name.slice(1),
+      address: getDevAddress(name)
+    }));
+    const stored = accountsFile.accounts.map((account) => {
+      let address;
+      if (isWatchOnly(account)) {
+        address = account.publicKey ? toSs58(account.publicKey) : undefined;
+      } else if (account.secret !== undefined && isEnvSecret(account.secret)) {
+        let pubKey = account.publicKey;
+        if (!pubKey) {
+          pubKey = tryDerivePublicKey(account.secret.env, account.derivationPath) ?? "";
+        }
+        address = pubKey ? toSs58(pubKey) : undefined;
+      } else {
+        address = toSs58(account.publicKey);
+      }
+      return {
+        name: account.name,
+        address,
+        derivationPath: account.derivationPath || undefined,
+        watchOnly: isWatchOnly(account),
+        env: account.secret !== undefined && isEnvSecret(account.secret) ? account.secret.env : undefined
+      };
+    });
+    console.log(formatJson({ dev, stored }));
+    return;
+  }
   printHeading("Dev Accounts");
   for (const name of DEV_NAMES) {
     const display = name.charAt(0).toUpperCase() + name.slice(1);
     const address = getDevAddress(name);
     printItem(display, address);
   }
-  const accountsFile = await loadAccounts();
   if (accountsFile.accounts.length > 0) {
     printHeading("Stored Accounts");
     for (const account of accountsFile.accounts) {
@@ -2547,7 +2793,7 @@ async function accountList() {
   }
   console.log();
 }
-async function accountRemove(names) {
+async function accountRemove(names, opts = {}) {
   if (names.length === 0) {
     console.error(`At least one account name is required.
 `);
@@ -2582,6 +2828,10 @@ async function accountRemove(names) {
     accountsFile.accounts.splice(idx, 1);
   }
   await saveAccounts(accountsFile);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({ removed: names }));
+    return;
+  }
   for (const name of names) {
     console.log(`Account "${name}" removed.`);
   }
@@ -2637,7 +2887,7 @@ async function accountInspect(input, opts) {
     }
   }
   const ss58 = toSs58(publicKeyHex, prefix);
-  if (opts.output === "json") {
+  if (isJsonOutput(opts)) {
     const result = { publicKey: publicKeyHex, ss58, prefix };
     if (name)
       result.name = name;
@@ -2680,6 +2930,13 @@ async function handleApis2(target, args, opts) {
     const { name: chainName2, chain: chainConfig2 } = resolveChain(config2, opts.chain);
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const apis = listRuntimeApis(meta);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        apis: apis.map((a) => ({ name: a.name, methods: a.methods.length }))
+      }));
+      return;
+    }
     printHeading(`Runtime APIs on ${chainName2} (${apis.length})`);
     for (const api of apis) {
       printItem(api.name, `${api.methods.length} methods`);
@@ -2702,7 +2959,24 @@ async function handleApis2(target, args, opts) {
     const meta = await loadMeta(chainName, chainConfig, opts.rpc);
     const api = resolveRuntimeApi2(meta, apiName);
     if (api.methods.length === 0) {
-      console.log(`No methods in ${api.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, api: api.name, methods: [] }));
+      } else {
+        console.log(`No methods in ${api.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        api: api.name,
+        methods: api.methods.map((m) => ({
+          name: m.name,
+          args: describeRuntimeApiMethodArgs(meta, m),
+          returns: describeType(meta.lookup, m.output),
+          docs: firstSentence(m.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${api.name} Methods`);
@@ -2733,7 +3007,7 @@ async function handleApis2(target, args, opts) {
     const parsedArgs = await parseRuntimeApiArgs2(meta, method, effectiveArgs);
     const unsafeApi = clientHandle.client.getUnsafeApi();
     const result = await unsafeApi.apis[api.name][method.name](...parsedArgs);
-    const format = opts.output ?? "pretty";
+    const format = isJsonOutput(opts) ? "json" : opts.output ?? "pretty";
     printResult(result, format);
   } finally {
     clientHandle.destroy();
@@ -2769,7 +3043,6 @@ init_output();
 var CHAIN_HELP = `
 ${BOLD}Usage:${RESET}
   $ dot chain add <name> --rpc <url>    Add a chain via WebSocket RPC
-  $ dot chain add <name> --light-client Add a chain via Smoldot light client
   $ dot chain remove <name>             Remove a chain
   $ dot chain update [name]             Re-fetch metadata (default chain if omitted)
   $ dot chain update --all              Re-fetch metadata for all configured chains
@@ -2779,7 +3052,8 @@ ${BOLD}Usage:${RESET}
 ${BOLD}Examples:${RESET}
   $ dot chain add kusama --rpc wss://kusama-rpc.polkadot.io
   $ dot chain add kusama --rpc wss://kusama-rpc.polkadot.io --rpc wss://kusama-rpc.dwellir.com
-  $ dot chain add westend --light-client
+  $ dot chain add my-para --rpc wss://rpc.example.com --relay polkadot
+  $ dot chain add my-para --rpc wss://rpc.example.com --relay polkadot --parachain-id 2000
   $ dot chain default kusama
   $ dot chain list
   $ dot chain update
@@ -2788,10 +3062,10 @@ ${BOLD}Examples:${RESET}
   $ dot chain remove kusama
 `.trimStart();
 function registerChainCommands(cli) {
-  cli.command("chain [action] [name]", "Manage chains (add, remove, update, list, default)").alias("chains").option("--all", "Update all configured chains").action(async (action, name, opts) => {
+  cli.command("chain [action] [name]", "Manage chains (add, remove, update, list, default)").alias("chains").option("--all", "Update all configured chains").option("--relay <name>", "Parent relay chain for this parachain").option("--parachain-id <id>", "Parachain ID (auto-detected if omitted with --relay)").action(async (action, name, opts) => {
     if (!action) {
       if (process.argv[2] === "chains")
-        return chainList();
+        return chainList(opts);
       console.log(CHAIN_HELP);
       return;
     }
@@ -2799,13 +3073,13 @@ function registerChainCommands(cli) {
       case "add":
         return chainAdd(name, opts);
       case "remove":
-        return chainRemove(name);
+        return chainRemove(name, opts);
       case "list":
-        return chainList();
+        return chainList(opts);
       case "update":
         return chainUpdate(name, opts);
       case "default":
-        return chainDefault(name);
+        return chainDefault(name, opts);
       default:
         console.error(`Unknown action "${action}".
 `);
@@ -2819,34 +3093,70 @@ async function chainAdd(name, opts) {
     console.error(`Chain name is required.
 `);
     console.error("Usage: dot chain add <name> --rpc <url>");
-    console.error("       dot chain add <name> --light-client");
     process.exit(1);
   }
-  if (!opts.rpc && !opts.lightClient) {
-    console.error(`Must provide either --rpc <url> or --light-client.
+  if (!opts.rpc) {
+    console.error(`Must provide --rpc <url>.
 `);
     console.error("Usage: dot chain add <name> --rpc <url>");
-    console.error("       dot chain add <name> --light-client");
     process.exit(1);
   }
-  const chainConfig = {
-    rpc: opts.rpc ?? "",
-    ...opts.lightClient ? { lightClient: true } : {}
-  };
-  console.error(`Connecting to ${name}...`);
+  const parachainIdRaw = opts.parachainId != null ? Number(opts.parachainId) : undefined;
+  if (parachainIdRaw != null && !opts.relay) {
+    console.error(`Cannot set --parachain-id without --relay.
+`);
+    console.error("Usage: dot chain add <name> --rpc <url> --relay <relay> --parachain-id <id>");
+    process.exit(1);
+  }
+  const chainConfig = { rpc: opts.rpc };
+  process.stderr.write(`Connecting to ${name}...
+`);
   const clientHandle = await createChainClient(name, chainConfig, opts.rpc);
   try {
-    console.error("Fetching metadata...");
+    process.stderr.write(`Fetching metadata...
+`);
     await fetchMetadataFromChain(clientHandle, name);
+    if (opts.relay) {
+      const config2 = await loadConfig();
+      const relayResolved = findChainName(config2, opts.relay);
+      if (!relayResolved) {
+        throw new Error(`Relay chain "${opts.relay}" not found. Add it first with: dot chain add ${opts.relay} --rpc <url>`);
+      }
+      chainConfig.relay = relayResolved;
+      if (parachainIdRaw != null) {
+        chainConfig.parachainId = parachainIdRaw;
+      } else {
+        process.stderr.write(`Detecting parachain ID...
+`);
+        const detected = await getParachainId(clientHandle);
+        if (detected != null) {
+          chainConfig.parachainId = detected;
+          process.stderr.write(`Detected parachain ID: ${detected}
+`);
+        } else {
+          process.stderr.write(`Could not detect parachain ID. Use --parachain-id to set it manually.
+`);
+        }
+      }
+    }
     const config = await loadConfig();
     config.chains[name] = chainConfig;
     await saveConfig(config);
-    console.log(`Chain "${name}" added successfully.`);
+    const result = { action: "added", chain: name };
+    if (chainConfig.relay)
+      result.relay = chainConfig.relay;
+    if (chainConfig.parachainId != null)
+      result.parachainId = chainConfig.parachainId;
+    if (isJsonOutput(opts)) {
+      console.log(formatJson(result));
+    } else {
+      console.log(`Chain "${name}" added successfully.`);
+    }
   } finally {
     clientHandle.destroy();
   }
 }
-async function chainRemove(name) {
+async function chainRemove(name, opts = {}) {
   if (!name) {
     console.error("Usage: dot chain remove <name>");
     process.exit(1);
@@ -2859,32 +3169,85 @@ async function chainRemove(name) {
   if (BUILTIN_CHAIN_NAMES.has(resolved)) {
     throw new Error(`Cannot remove the built-in "${resolved}" chain.`);
   }
+  const orphans = Object.entries(config.chains).filter(([, c]) => c.relay === resolved).map(([n]) => n);
+  if (orphans.length > 0) {
+    console.error(`Warning: ${orphans.length} chain(s) reference "${resolved}" as their relay: ${orphans.join(", ")}`);
+  }
   delete config.chains[resolved];
   if (config.defaultChain === resolved) {
     config.defaultChain = "polkadot";
-    console.log(`Default chain reset to "polkadot".`);
+    if (!isJsonOutput(opts))
+      console.log(`Default chain reset to "polkadot".`);
   }
   await saveConfig(config);
   await removeChainData(resolved);
-  console.log(`Chain "${resolved}" removed.`);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({ action: "removed", chain: resolved }));
+  } else {
+    console.log(`Chain "${resolved}" removed.`);
+  }
 }
-async function chainList() {
+async function chainList(opts = {}) {
   const config = await loadConfig();
+  if (isJsonOutput(opts)) {
+    const chains = Object.entries(config.chains).map(([name, chainConfig]) => ({
+      name,
+      default: name === config.defaultChain,
+      rpc: Array.isArray(chainConfig.rpc) ? chainConfig.rpc : [chainConfig.rpc],
+      ...chainConfig.relay && { relay: chainConfig.relay },
+      ...chainConfig.parachainId != null && { parachainId: chainConfig.parachainId }
+    }));
+    console.log(formatJson({ chains }));
+    return;
+  }
   printHeading("Configured Chains");
+  const parachainsByRelay = new Map;
+  const standalone = [];
   for (const [name, chainConfig] of Object.entries(config.chains)) {
-    const isDefault = name === config.defaultChain;
-    const marker = isDefault ? ` ${BOLD}(default)${RESET}` : "";
-    if (chainConfig.lightClient) {
-      console.log(`  ${CYAN}${name}${RESET}${marker}  ${DIM}light-client${RESET}`);
-    } else {
-      const rpcs = Array.isArray(chainConfig.rpc) ? chainConfig.rpc : [chainConfig.rpc];
-      console.log(`  ${CYAN}${name}${RESET}${marker}  ${DIM}${rpcs[0]}${RESET}`);
-      for (let i = 1;i < rpcs.length; i++) {
-        console.log(`    ${DIM}${rpcs[i]}${RESET}`);
-      }
+    if (chainConfig.relay) {
+      const paras = parachainsByRelay.get(chainConfig.relay) ?? [];
+      paras.push([name, chainConfig]);
+      parachainsByRelay.set(chainConfig.relay, paras);
     }
   }
-  console.log();
+  const relayNames = new Set(parachainsByRelay.keys());
+  for (const [name, chainConfig] of Object.entries(config.chains)) {
+    if (relayNames.has(name))
+      continue;
+    if (chainConfig.relay)
+      continue;
+    standalone.push([name, chainConfig]);
+  }
+  for (const relayName of relayNames) {
+    const relayConfig = config.chains[relayName];
+    if (relayConfig) {
+      printChainLine("  ", relayName, relayConfig, config.defaultChain);
+    }
+    const paras = parachainsByRelay.get(relayName) ?? [];
+    for (let i = 0;i < paras.length; i++) {
+      const [name, chainConfig] = paras[i];
+      const isLast = i === paras.length - 1;
+      const prefix = isLast ? "  └─ " : "  ├─ ";
+      const idSuffix = chainConfig.parachainId != null ? ` ${DIM}[${chainConfig.parachainId}]${RESET}` : "";
+      printChainLine(prefix, name, chainConfig, config.defaultChain, idSuffix);
+    }
+    console.log();
+  }
+  for (const [name, chainConfig] of standalone) {
+    printChainLine("  ", name, chainConfig, config.defaultChain);
+  }
+  if (standalone.length > 0)
+    console.log();
+}
+function printChainLine(prefix, name, chainConfig, defaultChain, suffix = "") {
+  const isDefault = name === defaultChain;
+  const marker = isDefault ? ` ${BOLD}(default)${RESET}` : "";
+  const rpcs = Array.isArray(chainConfig.rpc) ? chainConfig.rpc : [chainConfig.rpc];
+  console.log(`${prefix}${CYAN}${name}${RESET}${suffix}${marker}  ${DIM}${rpcs[0]}${RESET}`);
+  const indent = prefix.replace(/[^\s]/g, " ");
+  for (let i = 1;i < rpcs.length; i++) {
+    console.log(`${indent}  ${DIM}${rpcs[i]}${RESET}`);
+  }
 }
 async function chainUpdate(name, opts) {
   const config = await loadConfig();
@@ -2893,19 +3256,26 @@ async function chainUpdate(name, opts) {
     return;
   }
   const { name: chainName, chain: chainConfig } = resolveChain(config, name);
-  console.error(`Connecting to ${chainName}...`);
+  process.stderr.write(`Connecting to ${chainName}...
+`);
   const clientHandle = await createChainClient(chainName, chainConfig, opts.rpc);
   try {
-    console.error("Fetching metadata...");
+    process.stderr.write(`Fetching metadata...
+`);
     await fetchMetadataFromChain(clientHandle, chainName);
-    console.log(`Metadata for "${chainName}" updated.`);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({ action: "updated", chain: chainName }));
+    } else {
+      console.log(`Metadata for "${chainName}" updated.`);
+    }
   } finally {
     clientHandle.destroy();
   }
 }
 async function chainUpdateAll(config) {
   const chainNames = Object.keys(config.chains).sort();
-  console.error(`Updating metadata for ${chainNames.length} chains...
+  process.stderr.write(`Updating metadata for ${chainNames.length} chains...
+
 `);
   const results = await Promise.allSettled(chainNames.map(async (chainName) => {
     const chainConfig = config.chains[chainName];
@@ -2932,7 +3302,7 @@ ${failed} of ${chainNames.length} chains failed to update.`);
     process.exit(1);
   }
 }
-async function chainDefault(name) {
+async function chainDefault(name, opts = {}) {
   if (!name) {
     console.error("Usage: dot chain default <name>");
     process.exit(1);
@@ -2945,7 +3315,11 @@ async function chainDefault(name) {
   }
   config.defaultChain = resolved;
   await saveConfig(config);
-  console.log(`Default chain set to "${resolved}".`);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({ action: "default", chain: resolved }));
+  } else {
+    console.log(`Default chain set to "${resolved}".`);
+  }
 }
 
 // src/commands/completions.ts
@@ -3045,6 +3419,13 @@ async function handleConst(target, opts) {
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta);
     const withConsts = pallets.filter((p) => p.constants.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withConsts.map((p) => ({ name: p.name, constants: p.constants.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with constants on ${chainName2} (${withConsts.length})`);
     for (const p of withConsts) {
       printItem(p.name, `${p.constants.length} constants`);
@@ -3065,7 +3446,23 @@ async function handleConst(target, opts) {
       throw new Error(suggestMessage("pallet", pallet, palletNames));
     }
     if (palletInfo.constants.length === 0) {
-      console.log(`No constants in ${palletInfo.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: palletInfo.name, constants: [] }));
+      } else {
+        console.log(`No constants in ${palletInfo.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: palletInfo.name,
+        constants: palletInfo.constants.map((c) => ({
+          name: c.name,
+          type: describeType(meta.lookup, c.typeId),
+          docs: firstSentence(c.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${palletInfo.name} Constants`);
@@ -3094,9 +3491,9 @@ async function handleConst(target, opts) {
       throw new Error(suggestMessage(`constant in ${palletInfo.name}`, item, constNames));
     }
     const unsafeApi = clientHandle.client.getUnsafeApi();
-    const runtimeToken = await unsafeApi.runtimeToken;
-    const result = unsafeApi.constants[palletInfo.name][constantItem.name](runtimeToken);
-    const format = opts.output ?? "pretty";
+    const staticApis = await unsafeApi.getStaticApis();
+    const result = staticApis.constants[palletInfo.name][constantItem.name];
+    const format = isJsonOutput(opts) ? "json" : opts.output ?? "pretty";
     printResult(result, format);
   } finally {
     clientHandle.destroy();
@@ -3112,7 +3509,8 @@ async function loadMeta2(chainName, chainConfig, rpcOverride) {
   try {
     return await getOrFetchMetadata(chainName);
   } catch {
-    console.error(`Fetching metadata from ${chainName}...`);
+    process.stderr.write(`Fetching metadata from ${chainName}...
+`);
     const clientHandle = await createChainClient(chainName, chainConfig, rpcOverride);
     try {
       return await getOrFetchMetadata(chainName, clientHandle);
@@ -3136,6 +3534,13 @@ async function handleCalls2(target, opts) {
     const meta2 = await loadMeta2(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withCalls = pallets.filter((p) => p.calls.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withCalls.map((p) => ({ name: p.name, calls: p.calls.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with calls on ${chainName2} (${withCalls.length})`);
     for (const p of withCalls) {
       printItem(p.name, `${p.calls.length} calls`);
@@ -3152,7 +3557,23 @@ async function handleCalls2(target, opts) {
   const pallet = resolvePallet2(meta, palletName);
   if (!itemName) {
     if (pallet.calls.length === 0) {
-      console.log(`No calls in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, calls: [] }));
+      } else {
+        console.log(`No calls in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        calls: pallet.calls.map((c) => ({
+          name: c.name,
+          args: describeCallArgs(meta, pallet.name, c.name),
+          docs: firstSentence(c.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Calls`);
@@ -3172,6 +3593,17 @@ async function handleCalls2(target, opts) {
     const names = pallet.calls.map((c) => c.name);
     throw new Error(suggestMessage(`call in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: callItem.name,
+      category: "call",
+      args: describeCallArgs(meta, pallet.name, callItem.name),
+      docs: callItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${callItem.name} (Call)`);
   const args = describeCallArgs(meta, pallet.name, callItem.name);
   console.log(`  ${BOLD}Args:${RESET} ${args}`);
@@ -3188,6 +3620,13 @@ async function handleEvents2(target, opts) {
     const meta2 = await loadMeta2(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withEvents = pallets.filter((p) => p.events.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withEvents.map((p) => ({ name: p.name, events: p.events.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with events on ${chainName2} (${withEvents.length})`);
     for (const p of withEvents) {
       printItem(p.name, `${p.events.length} events`);
@@ -3204,7 +3643,23 @@ async function handleEvents2(target, opts) {
   const pallet = resolvePallet2(meta, palletName);
   if (!itemName) {
     if (pallet.events.length === 0) {
-      console.log(`No events in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, events: [] }));
+      } else {
+        console.log(`No events in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        events: pallet.events.map((e) => ({
+          name: e.name,
+          fields: describeEventFields(meta, pallet.name, e.name),
+          docs: firstSentence(e.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Events`);
@@ -3224,6 +3679,17 @@ async function handleEvents2(target, opts) {
     const names = pallet.events.map((e) => e.name);
     throw new Error(suggestMessage(`event in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: eventItem.name,
+      category: "event",
+      fields: describeEventFields(meta, pallet.name, eventItem.name),
+      docs: eventItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${eventItem.name} (Event)`);
   const fields = describeEventFields(meta, pallet.name, eventItem.name);
   console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
@@ -3240,6 +3706,13 @@ async function handleErrors2(target, opts) {
     const meta2 = await loadMeta2(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withErrors = pallets.filter((p) => p.errors.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withErrors.map((p) => ({ name: p.name, errors: p.errors.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with errors on ${chainName2} (${withErrors.length})`);
     for (const p of withErrors) {
       printItem(p.name, `${p.errors.length} errors`);
@@ -3256,7 +3729,19 @@ async function handleErrors2(target, opts) {
   const pallet = resolvePallet2(meta, palletName);
   if (!itemName) {
     if (pallet.errors.length === 0) {
-      console.log(`No errors in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, errors: [] }));
+      } else {
+        console.log(`No errors in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        errors: pallet.errors.map((e) => ({ name: e.name, docs: firstSentence(e.docs) }))
+      }));
       return;
     }
     printHeading(`${pallet.name} Errors`);
@@ -3275,6 +3760,16 @@ async function handleErrors2(target, opts) {
     const names = pallet.errors.map((e) => e.name);
     throw new Error(suggestMessage(`error in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: errorItem.name,
+      category: "error",
+      docs: errorItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${errorItem.name} (Error)`);
   if (errorItem.docs.length) {
     printDocs(errorItem.docs);
@@ -3288,6 +3783,13 @@ async function handleStorage2(target, opts) {
     const meta2 = await loadMeta2(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta2);
     const withStorage = pallets.filter((p) => p.storage.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withStorage.map((p) => ({ name: p.name, storage: p.storage.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with storage on ${chainName2} (${withStorage.length})`);
     for (const p of withStorage) {
       printItem(p.name, `${p.storage.length} storage`);
@@ -3304,7 +3806,23 @@ async function handleStorage2(target, opts) {
   const pallet = resolvePallet2(meta, palletName);
   if (!itemName) {
     if (pallet.storage.length === 0) {
-      console.log(`No storage items in ${pallet.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName, pallet: pallet.name, storage: [] }));
+      } else {
+        console.log(`No storage items in ${pallet.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName,
+        pallet: pallet.name,
+        storage: pallet.storage.map((s) => {
+          const valueType = describeType(meta.lookup, s.valueTypeId);
+          const keyType = s.keyTypeId != null ? describeType(meta.lookup, s.keyTypeId) : undefined;
+          return { name: s.name, type: s.type, valueType, keyType, docs: firstSentence(s.docs) };
+        })
+      }));
       return;
     }
     printHeading(`${pallet.name} Storage`);
@@ -3331,6 +3849,21 @@ async function handleStorage2(target, opts) {
     const names = pallet.storage.map((s) => s.name);
     throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
   }
+  if (isJsonOutput(opts)) {
+    const valueType = describeType(meta.lookup, storageItem.valueTypeId);
+    const keyType = storageItem.keyTypeId != null ? describeType(meta.lookup, storageItem.keyTypeId) : undefined;
+    console.log(formatJson({
+      chain: chainName,
+      pallet: pallet.name,
+      item: storageItem.name,
+      category: "storage",
+      type: storageItem.type,
+      valueType,
+      keyType,
+      docs: storageItem.docs
+    }));
+    return;
+  }
   printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
   console.log(`  ${BOLD}Type:${RESET} ${storageItem.type}`);
   console.log(`  ${BOLD}Value:${RESET} ${describeType(meta.lookup, storageItem.valueTypeId)}`);
@@ -3574,8 +4107,7 @@ function registerHashCommand(cli) {
     const input = await resolveInput(data, opts);
     const hash = computeHash(algorithm, input);
     const hexHash = toHex2(hash);
-    const format = opts.output ?? "pretty";
-    if (format === "json") {
+    if (isJsonOutput(opts)) {
       printResult({
         algorithm,
         input: data ?? (opts.file ? `file:${opts.file}` : "stdin"),
@@ -3661,7 +4193,8 @@ function registerInspectCommand(cli) {
     try {
       meta = await getOrFetchMetadata(chainName);
     } catch {
-      console.error(`Fetching metadata from ${chainName}...`);
+      process.stderr.write(`Fetching metadata from ${chainName}...
+`);
       const clientHandle = await createChainClient(chainName, chainConfig, opts.rpc);
       try {
         meta = await getOrFetchMetadata(chainName, clientHandle);
@@ -3671,6 +4204,20 @@ function registerInspectCommand(cli) {
     }
     if (!target) {
       const pallets = listPallets(meta);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({
+          chain: chainName,
+          pallets: pallets.map((p) => ({
+            name: p.name,
+            storage: p.storage.length,
+            constants: p.constants.length,
+            calls: p.calls.length,
+            events: p.events.length,
+            errors: p.errors.length
+          }))
+        }));
+        return;
+      }
       printHeading(`Pallets on ${chainName} (${pallets.length})`);
       for (const p of pallets) {
         const counts = [];
@@ -3695,6 +4242,44 @@ function registerInspectCommand(cli) {
       if (!pallet2) {
         throw new Error(suggestMessage("pallet", palletName, palletNames2));
       }
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet2.name,
+          docs: pallet2.docs,
+          storage: pallet2.storage.map((s) => {
+            const valueType = describeType(meta.lookup, s.valueTypeId);
+            const keyType = s.keyTypeId != null ? describeType(meta.lookup, s.keyTypeId) : undefined;
+            return {
+              name: s.name,
+              type: s.type,
+              valueType,
+              keyType,
+              docs: firstSentence(s.docs)
+            };
+          }),
+          constants: pallet2.constants.map((c) => ({
+            name: c.name,
+            type: describeType(meta.lookup, c.typeId),
+            docs: firstSentence(c.docs)
+          })),
+          calls: pallet2.calls.map((c) => ({
+            name: c.name,
+            args: describeCallArgs(meta, pallet2.name, c.name),
+            docs: firstSentence(c.docs)
+          })),
+          events: pallet2.events.map((e) => ({
+            name: e.name,
+            fields: describeEventFields(meta, pallet2.name, e.name),
+            docs: firstSentence(e.docs)
+          })),
+          errors: pallet2.errors.map((e) => ({
+            name: e.name,
+            docs: firstSentence(e.docs)
+          }))
+        }));
+        return;
+      }
       printHeading(`${pallet2.name} Pallet`);
       if (pallet2.docs.length) {
         printDocs(pallet2.docs);
@@ -3773,6 +4358,79 @@ function registerInspectCommand(cli) {
     if (!pallet) {
       throw new Error(suggestMessage("pallet", palletName, palletNames));
     }
+    if (isJsonOutput(opts)) {
+      const si = pallet.storage.find((s) => s.name.toLowerCase() === itemName.toLowerCase());
+      if (si) {
+        const valueType = describeType(meta.lookup, si.valueTypeId);
+        const keyType = si.keyTypeId != null ? describeType(meta.lookup, si.keyTypeId) : undefined;
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet.name,
+          item: si.name,
+          category: "storage",
+          type: si.type,
+          valueType,
+          keyType,
+          docs: si.docs
+        }));
+        return;
+      }
+      const ci = pallet.constants.find((c) => c.name.toLowerCase() === itemName.toLowerCase());
+      if (ci) {
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet.name,
+          item: ci.name,
+          category: "constant",
+          type: describeType(meta.lookup, ci.typeId),
+          docs: ci.docs
+        }));
+        return;
+      }
+      const ca = pallet.calls.find((c) => c.name.toLowerCase() === itemName.toLowerCase());
+      if (ca) {
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet.name,
+          item: ca.name,
+          category: "call",
+          args: describeCallArgs(meta, pallet.name, ca.name),
+          docs: ca.docs
+        }));
+        return;
+      }
+      const ev = pallet.events.find((e) => e.name.toLowerCase() === itemName.toLowerCase());
+      if (ev) {
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet.name,
+          item: ev.name,
+          category: "event",
+          fields: describeEventFields(meta, pallet.name, ev.name),
+          docs: ev.docs
+        }));
+        return;
+      }
+      const er = pallet.errors.find((e) => e.name.toLowerCase() === itemName.toLowerCase());
+      if (er) {
+        console.log(formatJson({
+          chain: chainName,
+          pallet: pallet.name,
+          item: er.name,
+          category: "error",
+          docs: er.docs
+        }));
+        return;
+      }
+      const allItems2 = [
+        ...pallet.storage.map((s) => s.name),
+        ...pallet.constants.map((c) => c.name),
+        ...pallet.calls.map((c) => c.name),
+        ...pallet.events.map((e) => e.name),
+        ...pallet.errors.map((e) => e.name)
+      ];
+      throw new Error(suggestMessage(`item in ${pallet.name}`, itemName, allItems2));
+    }
     const storageItem = pallet.storage.find((s) => s.name.toLowerCase() === itemName.toLowerCase());
     if (storageItem) {
       printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
@@ -3906,8 +4564,7 @@ function registerParachainCommand(cli) {
       throw new CliError(`Invalid prefix "${opts.prefix}". Must be a non-negative integer.`);
     }
     const types = opts.type ? [validateType(opts.type)] : SOVEREIGN_ACCOUNT_TYPES;
-    const format = opts.output ?? "pretty";
-    if (format === "json") {
+    if (isJsonOutput(opts)) {
       const result = { paraId, prefix };
       for (const type of types) {
         const accountId = deriveSovereignAccount(paraId, type);
@@ -3948,6 +4605,13 @@ async function handleQuery(target, keys, opts) {
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta);
     const withStorage = pallets.filter((p) => p.storage.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withStorage.map((p) => ({ name: p.name, storage: p.storage.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with storage on ${chainName2} (${withStorage.length})`);
     for (const p of withStorage) {
       printItem(p.name, `${p.storage.length} storage items`);
@@ -3962,7 +4626,23 @@ async function handleQuery(target, keys, opts) {
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallet2 = resolvePallet(meta, palletName(target));
     if (pallet2.storage.length === 0) {
-      console.log(`No storage items in ${pallet2.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName2, pallet: pallet2.name, storage: [] }));
+      } else {
+        console.log(`No storage items in ${pallet2.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallet: pallet2.name,
+        storage: pallet2.storage.map((s) => {
+          const valueType = describeType(meta.lookup, s.valueTypeId);
+          const keyType = s.keyTypeId != null ? describeType(meta.lookup, s.keyTypeId) : undefined;
+          return { name: s.name, type: s.type, valueType, keyType, docs: firstSentence(s.docs) };
+        })
+      }));
       return;
     }
     printHeading(`${pallet2.name} Storage`);
@@ -4007,7 +4687,7 @@ async function handleQuery(target, keys, opts) {
       typeof opts.parsedArgs === "object" ? JSON.stringify(opts.parsedArgs) : String(opts.parsedArgs)
     ];
     const parsedKeys = await parseStorageKeys(meta, palletInfo.name, storageItem, effectiveKeys);
-    const format = opts.output ?? "pretty";
+    const format = isJsonOutput(opts) ? "json" : opts.output ?? "pretty";
     const expectedLen = storageItem.type === "map" && storageItem.keyTypeId != null ? meta.builder.buildStorage(palletInfo.name, storageItem.name).len : 0;
     if (storageItem.type === "map" && parsedKeys.length < expectedLen) {
       if (parsedKeys.length === 0 && !opts.dump) {
@@ -4152,8 +4832,7 @@ function registerSignCommand(cli) {
       signature: hexSignature,
       enum: enumValue
     };
-    const format = opts.output ?? "pretty";
-    if (format === "json") {
+    if (isJsonOutput(opts)) {
       printResult(result, "json");
     } else {
       console.log(`  ${BOLD}Type:${RESET}       ${result.type}`);
@@ -4172,6 +4851,7 @@ init_client();
 init_metadata();
 init_output();
 init_resolve_address();
+init_binary_display();
 init_errors();
 init_focused_inspect();
 import { getViewBuilder as getViewBuilder2 } from "@polkadot-api/view-builder";
@@ -4229,11 +4909,14 @@ function parseMortalityOption(raw) {
 function parseAtOption(raw) {
   if (raw === undefined)
     return;
-  if (raw === "best" || raw === "finalized")
-    return raw;
+  if (raw === "finalized")
+    return;
+  if (raw === "best") {
+    throw new CliError('"best" is no longer supported for --at in papi v2. Omit --at for finalized, or pass a specific block hash.');
+  }
   if (/^0x[0-9a-fA-F]{64}$/.test(raw))
     return raw;
-  throw new CliError(`Invalid --at value "${raw}". Use "best", "finalized", or a 0x-prefixed 32-byte block hash.`);
+  throw new CliError(`Invalid --at value "${raw}". Use a 0x-prefixed 32-byte block hash, or omit for finalized.`);
 }
 async function handleTx(target, args, opts) {
   if (!target) {
@@ -4242,6 +4925,13 @@ async function handleTx(target, args, opts) {
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallets = listPallets(meta);
     const withCalls = pallets.filter((p) => p.calls.length > 0);
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallets: withCalls.map((p) => ({ name: p.name, calls: p.calls.length }))
+      }));
+      return;
+    }
     printHeading(`Pallets with calls on ${chainName2} (${withCalls.length})`);
     for (const p of withCalls) {
       printItem(p.name, `${p.calls.length} calls`);
@@ -4256,7 +4946,23 @@ async function handleTx(target, args, opts) {
     const meta = await loadMeta(chainName2, chainConfig2, opts.rpc);
     const pallet2 = resolvePallet(meta, target);
     if (pallet2.calls.length === 0) {
-      console.log(`No calls in ${pallet2.name}.`);
+      if (isJsonOutput(opts)) {
+        console.log(formatJson({ chain: chainName2, pallet: pallet2.name, calls: [] }));
+      } else {
+        console.log(`No calls in ${pallet2.name}.`);
+      }
+      return;
+    }
+    if (isJsonOutput(opts)) {
+      console.log(formatJson({
+        chain: chainName2,
+        pallet: pallet2.name,
+        calls: pallet2.calls.map((c) => ({
+          name: c.name,
+          args: describeCallArgs(meta, pallet2.name, c.name),
+          docs: firstSentence(c.docs)
+        }))
+      }));
       return;
     }
     printHeading(`${pallet2.name} Calls`);
@@ -4271,7 +4977,7 @@ async function handleTx(target, args, opts) {
     console.log();
     return;
   }
-  if (!opts.from && !opts.encode && !opts.yaml && !opts.json) {
+  if (!opts.from && !opts.encode && !opts.toYaml && !opts.toJson) {
     if (isRawCall) {
       throw new Error("--from is required (or use --encode to output hex without signing)");
     }
@@ -4284,14 +4990,14 @@ async function handleTx(target, args, opts) {
   if (opts.encode && isRawCall) {
     throw new Error("--encode cannot be used with raw call hex (already encoded)");
   }
-  if ((opts.yaml || opts.json) && opts.encode) {
-    throw new Error("--yaml/--json and --encode are mutually exclusive");
+  if ((opts.toYaml || opts.toJson) && opts.encode) {
+    throw new Error("--to-yaml/--to-json and --encode are mutually exclusive");
   }
-  if ((opts.yaml || opts.json) && opts.dryRun) {
-    throw new Error("--yaml/--json and --dry-run are mutually exclusive");
+  if ((opts.toYaml || opts.toJson) && opts.dryRun) {
+    throw new Error("--to-yaml/--to-json and --dry-run are mutually exclusive");
   }
-  if (opts.yaml && opts.json) {
-    throw new Error("--yaml and --json are mutually exclusive");
+  if (opts.toYaml && opts.toJson) {
+    throw new Error("--to-yaml and --to-json are mutually exclusive");
   }
   const config = await loadConfig();
   const effectiveChain = opts.chain;
@@ -4303,7 +5009,7 @@ async function handleTx(target, args, opts) {
     callName = target.slice(dotIdx + 1);
   }
   const { name: chainName, chain: chainConfig } = resolveChain(config, effectiveChain);
-  const decodeOnly = opts.encode || opts.yaml || opts.json;
+  const decodeOnly = opts.encode || opts.toYaml || opts.toJson;
   const signer = decodeOnly ? undefined : await resolveAccountSigner(opts.from);
   let clientHandle;
   if (!decodeOnly) {
@@ -4352,9 +5058,9 @@ async function handleTx(target, args, opts) {
 ` + "Usage: dot tx 0x<call_hex> --from <account>");
       }
       callHex = target;
-      if (opts.yaml || opts.json) {
+      if (opts.toYaml || opts.toJson) {
         const fileObj = decodeCallToFileFormat(meta, callHex, chainName);
-        outputFileFormat(fileObj, !!opts.yaml);
+        outputFileFormat(fileObj, !!opts.toYaml);
         return;
       }
       const callBinary = Binary3.fromHex(target);
@@ -4372,26 +5078,55 @@ async function handleTx(target, args, opts) {
       }
       const effectiveArgs = opts.parsedArgs !== undefined ? fileArgsToStrings(opts.parsedArgs) : args;
       const callData = await parseCallArgs(meta, palletInfo.name, callInfo.name, effectiveArgs);
-      if (opts.encode || opts.yaml || opts.json) {
+      if (opts.encode || opts.toYaml || opts.toJson) {
         const { codec, location } = meta.builder.buildCall(palletInfo.name, callInfo.name);
         const encodedArgs = codec.enc(callData);
         const fullCall = new Uint8Array([location[0], location[1], ...encodedArgs]);
-        const hex = Binary3.fromBytes(fullCall).asHex();
+        const hex = Binary3.toHex(fullCall);
         if (opts.encode) {
-          console.log(hex);
+          if (isJsonOutput(opts)) {
+            console.log(formatJson({ callHex: hex }));
+          } else {
+            console.log(hex);
+          }
           return;
         }
         const fileObj = decodeCallToFileFormat(meta, hex, chainName);
-        outputFileFormat(fileObj, !!opts.yaml);
+        outputFileFormat(fileObj, !!opts.toYaml);
         return;
       }
       tx = unsafeApi.tx[palletInfo.name][callInfo.name](callData);
       const encodedCall = await tx.getEncodedData();
-      callHex = encodedCall.asHex();
+      callHex = Binary3.toHex(encodedCall);
     }
     const decodedStr = decodeCall(meta, callHex);
     if (opts.dryRun) {
       const signerAddress = toSs58(signer.publicKey);
+      let estimatedFees;
+      try {
+        estimatedFees = String(await tx.getEstimatedFees(signer?.publicKey, txOptions));
+      } catch {
+        estimatedFees = undefined;
+      }
+      if (isJsonOutput(opts)) {
+        const result2 = {
+          chain: chainName,
+          from: { name: opts.from, address: signerAddress },
+          callHex,
+          decoded: decodedStr,
+          estimatedFees
+        };
+        if (nonce !== undefined)
+          result2.nonce = nonce;
+        if (tip !== undefined)
+          result2.tip = String(tip);
+        if (mortality !== undefined)
+          result2.mortality = mortality.mortal ? `mortal (period ${mortality.period})` : "immortal";
+        if (at !== undefined)
+          result2.at = at;
+        console.log(formatJson(result2));
+        return;
+      }
       console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
       console.log(`  ${BOLD}From:${RESET}   ${opts.from} (${signerAddress})`);
       console.log(`  ${BOLD}Call:${RESET}   ${callHex}`);
@@ -4404,16 +5139,46 @@ async function handleTx(target, args, opts) {
         console.log(`  ${BOLD}Mortality:${RESET} ${mortality.mortal ? `mortal (period ${mortality.period})` : "immortal"}`);
       if (at !== undefined)
         console.log(`  ${BOLD}At:${RESET}    ${at}`);
-      try {
-        const fees = await tx.getEstimatedFees(signer?.publicKey, txOptions);
-        console.log(`  ${BOLD}Estimated fees:${RESET} ${fees}`);
-      } catch (err) {
+      if (estimatedFees !== undefined) {
+        console.log(`  ${BOLD}Estimated fees:${RESET} ${estimatedFees}`);
+      } else {
         console.log(`  ${BOLD}Estimated fees:${RESET} ${YELLOW}unable to estimate${RESET}`);
-        console.log(`  ${DIM}${err.message ?? err}${RESET}`);
       }
       return;
     }
     const waitLevel = parseWaitLevel(opts.wait);
+    if (isJsonOutput(opts)) {
+      const result2 = await watchTransactionJson(tx.signSubmitAndWatch(signer, txOptions), waitLevel);
+      const rpcUrl2 = primaryRpc(opts.rpc ?? chainConfig.rpc);
+      if (result2.type === "broadcasted") {
+        printJsonLine({ event: "broadcasted", txHash: result2.txHash });
+        return;
+      }
+      const blockHash = result2.block.hash;
+      const explorer = {};
+      if (rpcUrl2) {
+        explorer.polkadotjs = pjsAppsLink(rpcUrl2, blockHash);
+        explorer.papi = papiLink(rpcUrl2, blockHash);
+      }
+      printJsonLine({
+        event: result2.type === "finalized" ? "finalized" : "bestBlock",
+        blockNumber: result2.block.number,
+        blockHash,
+        txHash: result2.txHash,
+        ok: result2.ok,
+        events: result2.events?.map((e) => ({
+          pallet: e.type,
+          name: e.value?.type,
+          fields: e.value?.value
+        })),
+        dispatchError: result2.ok ? null : formatDispatchError(result2.dispatchError),
+        explorer
+      });
+      if (!result2.ok) {
+        throw new CliError(`Transaction dispatch error: ${formatDispatchError(result2.dispatchError)}`);
+      }
+      return;
+    }
     const result = await watchTransaction(tx.signSubmitAndWatch(signer, txOptions), waitLevel);
     console.log();
     console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
@@ -4508,7 +5273,7 @@ function decodeCallFallback(meta, callHex) {
   if (callTypeId == null)
     throw new Error("No RuntimeCall type ID");
   const codec = meta.builder.buildDefinition(callTypeId);
-  const decoded = codec.dec(Binary3.fromHex(callHex).asBytes());
+  const decoded = codec.dec(Binary3.fromHex(callHex));
   const palletName2 = decoded.type;
   const call = decoded.value;
   const callName = call.type;
@@ -4524,7 +5289,7 @@ function decodeCallToFileFormat(meta, callHex, chainName) {
   if (callTypeId == null)
     throw new Error("No RuntimeCall type ID in metadata");
   const codec = meta.builder.buildDefinition(callTypeId);
-  const decoded = codec.dec(Binary3.fromHex(callHex).asBytes());
+  const decoded = codec.dec(Binary3.fromHex(callHex));
   const palletName2 = decoded.type;
   const call = decoded.value;
   const callName = call.type;
@@ -4541,8 +5306,8 @@ function decodeCallToFileFormat(meta, callHex, chainName) {
 function sanitizeForSerialization(value) {
   if (value === undefined || value === null)
     return null;
-  if (value instanceof Binary3)
-    return value.asHex();
+  if (value instanceof Uint8Array)
+    return Binary3.toHex(value);
   if (typeof value === "bigint") {
     if (value >= Number.MIN_SAFE_INTEGER && value <= Number.MAX_SAFE_INTEGER) {
       return Number(value);
@@ -4574,8 +5339,8 @@ function outputFileFormat(obj, asYaml) {
 function formatRawDecoded(value) {
   if (value === undefined || value === null)
     return "null";
-  if (value instanceof Binary3)
-    return value.asHex();
+  if (value instanceof Uint8Array)
+    return Binary3.toHex(value);
   if (typeof value === "bigint")
     return value.toString();
   if (typeof value === "string")
@@ -4696,7 +5461,7 @@ function formatEventValue(v) {
     return v.toString();
   if (v === null || v === undefined)
     return "null";
-  if (v instanceof Binary3) {
+  if (v instanceof Uint8Array) {
     return binaryToDisplay(v);
   }
   return JSON.stringify(v, (_k, val) => typeof val === "bigint" ? val.toString() : val);
@@ -4970,7 +5735,7 @@ async function parseTypedArg2(meta, entry, arg) {
     case "enum": {
       if (/^0x[0-9a-fA-F]+$/.test(arg) && meta.lookup.call != null && entry.id === meta.lookup.call) {
         const callCodec = meta.builder.buildDefinition(meta.lookup.call);
-        return callCodec.dec(Binary3.fromHex(arg).asBytes());
+        return callCodec.dec(Binary3.fromHex(arg));
       }
       if (arg.startsWith("{")) {
         try {
@@ -5197,6 +5962,49 @@ function watchTransaction(observable, level) {
     });
   });
 }
+function watchTransactionJson(observable, level) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const subscription = observable.subscribe({
+      next(event) {
+        if (settled)
+          return;
+        switch (event.type) {
+          case "signed":
+            printJsonLine({ event: "signed", txHash: event.txHash });
+            break;
+          case "broadcasted":
+            printJsonLine({ event: "broadcasted", txHash: event.txHash });
+            if (level === "broadcast") {
+              settled = true;
+              subscription.unsubscribe();
+              resolve(event);
+            }
+            break;
+          case "txBestBlocksState":
+            if (event.found) {
+              printJsonLine({ event: "bestBlock", blockNumber: event.block.number, found: true });
+              if (level === "best-block") {
+                settled = true;
+                subscription.unsubscribe();
+                resolve(event);
+              }
+            }
+            break;
+          case "finalized":
+            settled = true;
+            resolve(event);
+            break;
+        }
+      },
+      error(err) {
+        if (settled)
+          return;
+        reject(err);
+      }
+    });
+  });
+}
 
 // src/commands/verifiable.ts
 init_accounts_store();
@@ -5253,7 +6061,7 @@ async function deriveVerifiable(account, opts) {
       await saveAccounts(accountsFile);
     }
   }
-  if (opts.output === "json") {
+  if (isJsonOutput(opts)) {
     const result = {
       account,
       memberKey: memberKeyHex
@@ -5277,8 +6085,14 @@ async function resolveMnemonic(account) {
   const accountsFile = await loadAccounts();
   const stored = findAccount(accountsFile, account);
   if (!stored) {
-    const available = [...DEV_NAMES, ...accountsFile.accounts.map((a) => a.name)];
-    throw new Error(`Unknown account "${account}". Available accounts: ${available.join(", ")}`);
+    const available = [...DEV_NAMES, ...accountsFile.accounts.map((a) => a.name)].sort((a, b) => a.localeCompare(b));
+    const suggestions = findClosest(account, available);
+    const hint = suggestions.length > 0 ? `
+  Did you mean: ${suggestions.join(", ")}?` : "";
+    const list = available.map((a) => `
+    - ${a}`).join("");
+    throw new Error(`Unknown account "${account}".${hint}
+  Available accounts:${list}`);
   }
   if (isWatchOnly(stored)) {
     throw new Error(`Account "${account}" is watch-only (no secret). Cannot derive Bandersnatch key.`);
@@ -5313,10 +6127,16 @@ async function loadConfig2() {
   await ensureDir3(DOT_DIR2);
   if (await fileExists3(CONFIG_PATH2)) {
     const saved = JSON.parse(await readFile5(CONFIG_PATH2, "utf-8"));
-    return {
-      ...saved,
-      chains: { ...DEFAULT_CONFIG.chains, ...saved.chains }
-    };
+    const chains = {};
+    for (const [name, defaultConfig] of Object.entries(DEFAULT_CONFIG.chains)) {
+      chains[name] = saved.chains[name] ? { ...defaultConfig, ...saved.chains[name] } : defaultConfig;
+    }
+    for (const [name, config] of Object.entries(saved.chains)) {
+      if (!(name in DEFAULT_CONFIG.chains)) {
+        chains[name] = config;
+      }
+    }
+    return { ...saved, chains };
   }
   await saveConfig2(DEFAULT_CONFIG);
   return DEFAULT_CONFIG;
@@ -5707,8 +6527,9 @@ if (process.argv[2] === "__complete") {
     console.log("  dot apis.Core.version                    Call a runtime API");
     console.log("  dot polkadot.query.System.Number        With chain prefix");
     console.log("  dot ./transfer.yaml --from alice        Run from file");
-    console.log("  dot tx.0x1f0003... --yaml               Decode hex call to YAML");
-    console.log("  dot tx.System.remark 0xdead --json      Encode & output as JSON file format");
+    console.log("  dot tx.0x1f0003... --to-yaml             Decode hex call to YAML");
+    console.log("  dot tx.System.remark 0xdead --to-json   Encode & output as JSON file format");
+    console.log("  dot query.System.Number --json           Output as JSON");
     console.log();
     console.log("Commands:");
     console.log("  inspect [target]   Inspect chain metadata (alias: explore)");
@@ -5723,7 +6544,7 @@ if (process.argv[2] === "__complete") {
     console.log("Global options:");
     console.log("  --chain <name>     Target chain (default from config)");
     console.log("  --rpc <url>        Override RPC endpoint");
-    console.log("  --light-client     Use Smoldot light client");
+    console.log("  --json             Output as JSON");
     console.log("  --output <format>  Output format: pretty or json");
     console.log("  --help, -h         Display this message");
     console.log("  --version          Show version");
@@ -5732,10 +6553,10 @@ if (process.argv[2] === "__complete") {
   const cli = cac("dot");
   cli.option("--chain <name>", "Target chain (default from config)");
   cli.option("--rpc <url>", "Override RPC endpoint for this call");
-  cli.option("--light-client", "Use Smoldot light client instead of WebSocket");
   cli.option("--output <format>", "Output format: pretty or json", {
     default: "pretty"
   });
+  cli.option("--json", "Output as JSON (shorthand for --output json)");
   registerChainCommands(cli);
   registerInspectCommand(cli);
   registerAccountCommands(cli);
@@ -5744,7 +6565,7 @@ if (process.argv[2] === "__complete") {
   registerParachainCommand(cli);
   registerCompletionsCommand(cli);
   registerVerifiableCommands(cli);
-  cli.command("[dotpath] [...args]").option("--from <name>", "Account to sign with (for tx)").option("--dry-run", "Estimate fees without submitting (for tx)").option("--encode", "Encode call to hex without signing (for tx)").option("--yaml", "Decode call to YAML file format (for tx)").option("--json", "Decode call to JSON file format (for tx)").option("--ext <json>", "Custom signed extension values as JSON (for tx)").option("-w, --wait <level>", "Resolve at: broadcast, best-block (or best), finalized (for tx)", {
+  cli.command("[dotpath] [...args]").option("--from <name>", "Account to sign with (for tx)").option("--dry-run", "Estimate fees without submitting (for tx)").option("--encode", "Encode call to hex without signing (for tx)").option("--to-yaml", "Decode call to YAML file format (for tx)").option("--to-json", "Decode call to JSON file format (for tx)").option("--ext <json>", "Custom signed extension values as JSON (for tx)").option("-w, --wait <level>", "Resolve at: broadcast, best-block (or best), finalized (for tx)", {
     default: "finalized"
   }).option("--dump", "Dump all entries of a storage map (without specifying a key)").option("--var <kv>", "Template variable for file input (KEY=VALUE, repeatable)").option("--nonce <n>", "Custom nonce for manual tx sequencing (for tx)").option("--tip <amount>", "Tip to prioritize transaction (for tx)").option("--mortality <spec>", '"immortal" or period number (for tx)').option("--at <block>", 'Block hash, "best", or "finalized" to validate against (for tx)').action(async (dotpath, args, opts) => {
     if (!dotpath) {
@@ -5755,7 +6576,12 @@ if (process.argv[2] === "__complete") {
       const cliVars = collectVarFlags(process.argv);
       const cmd = await loadCommandFile(dotpath, cliVars);
       const effectiveChain2 = opts.chain ?? cmd.chain;
-      const handlerOpts2 = { chain: effectiveChain2, rpc: opts.rpc, output: opts.output };
+      const handlerOpts2 = {
+        chain: effectiveChain2,
+        rpc: opts.rpc,
+        output: opts.output,
+        json: opts.json
+      };
       const target2 = `${cmd.pallet}.${cmd.item}`;
       switch (cmd.category) {
         case "tx":
@@ -5764,8 +6590,8 @@ if (process.argv[2] === "__complete") {
             from: opts.from,
             dryRun: opts.dryRun,
             encode: opts.encode,
-            yaml: opts.yaml,
-            json: opts.json,
+            toYaml: opts.toYaml,
+            toJson: opts.toJson,
             ext: opts.ext,
             wait: opts.wait,
             nonce: opts.nonce,
@@ -5812,7 +6638,12 @@ if (process.argv[2] === "__complete") {
       throw new CliError2(`Chain specified both as prefix ("${parsed.chain}") and as --chain flag ("${opts.chain}"). Use one or the other.`);
     }
     const effectiveChain = parsed.chain ?? opts.chain;
-    const handlerOpts = { chain: effectiveChain, rpc: opts.rpc, output: opts.output };
+    const handlerOpts = {
+      chain: effectiveChain,
+      rpc: opts.rpc,
+      output: opts.output,
+      json: opts.json
+    };
     const target = parsed.pallet ? parsed.item ? `${parsed.pallet}.${parsed.item}` : parsed.pallet : undefined;
     if (cli.options.help && parsed.pallet && parsed.item) {
       await showItemHelp2(parsed.category, target, handlerOpts);
@@ -5828,8 +6659,8 @@ if (process.argv[2] === "__complete") {
           from: opts.from,
           dryRun: opts.dryRun,
           encode: opts.encode,
-          yaml: opts.yaml,
-          json: opts.json,
+          toYaml: opts.toYaml,
+          toJson: opts.toJson,
           ext: opts.ext,
           wait: opts.wait,
           nonce: opts.nonce,