polkadot-cli 1.16.0 → 1.17.0

package/dist/cli.mjs

@@ -674,6 +674,11 @@ function printResult(data, format = "pretty") {
 function isJsonOutput(opts) {
   return opts.json === true || opts.output === "json";
 }
+function writeStdout(text) {
+  return new Promise((resolve) => {
+    process.stdout.write(text, () => resolve());
+  });
+}
 function printJsonLine(data) {
   console.log(JSON.stringify(data, replacer));
 }
@@ -853,6 +858,324 @@ var init_client = __esm(() => {
   init_errors();
 });
 
+// src/core/pretty-type.ts
+function visualWidth(s) {
+  return s.replace(ANSI_RE, "").length;
+}
+function paint(color, code, text) {
+  return color ? `${code}${text}${RESET2}` : text;
+}
+function defaultWidth() {
+  return process.stdout.columns ?? 80;
+}
+function resolveOpts(opts) {
+  return {
+    indent: opts.indent ?? 0,
+    prefix: opts.prefix ?? 0,
+    width: opts.width ?? defaultWidth(),
+    color: opts.color ?? isTTY
+  };
+}
+function compactEntry(entry, color) {
+  if (!entry)
+    return "";
+  switch (entry.type) {
+    case "primitive":
+      return paint(color, YELLOW2, entry.value);
+    case "compact": {
+      const inner = entry.isBig ? "u128" : "u64";
+      return `${paint(color, MAGENTA2, "Compact")}<${paint(color, YELLOW2, inner)}>`;
+    }
+    case "AccountId32":
+      return paint(color, GREEN2, "AccountId32");
+    case "bitSequence":
+      return paint(color, MAGENTA2, "BitSequence");
+    case "sequence":
+      return `${paint(color, MAGENTA2, "Vec")}<${compactEntry(entry.value, color)}>`;
+    case "array":
+      return `[${compactEntry(entry.value, color)}; ${entry.len}]`;
+    case "tuple":
+      return `(${entry.value.map((v) => compactEntry(v, color)).join(", ")})`;
+    case "struct": {
+      const fields = Object.entries(entry.value);
+      if (fields.length === 0)
+        return "{}";
+      const inner = fields.map(([k, v]) => `${paint(color, CYAN2, k)}: ${compactEntry(v, color)}`).join(", ");
+      return `{ ${inner} }`;
+    }
+    case "option":
+      return `${paint(color, MAGENTA2, "Option")}<${compactEntry(entry.value, color)}>`;
+    case "result":
+      return `${paint(color, MAGENTA2, "Result")}<${compactEntry(entry.value.ok, color)}, ${compactEntry(entry.value.ko, color)}>`;
+    case "enum": {
+      const variants = Object.keys(entry.value);
+      if (variants.length > ENUM_COMPACT_LIMIT) {
+        return `enum(${variants.length} variants)`;
+      }
+      return variants.map((v) => paint(color, GREEN2, v)).join(" | ");
+    }
+    case "void":
+      return "()";
+    case "lookupEntry":
+      return compactEntry(entry.value, color);
+    default:
+      return "unknown";
+  }
+}
+function expandEntry(entry, indent, width, color, prefix = 0) {
+  const compact = compactEntry(entry, color);
+  if (visualWidth(compact) + indent + prefix <= width)
+    return compact;
+  switch (entry.type) {
+    case "struct":
+      return expandStruct(entry.value, indent, width, color);
+    case "tuple":
+      return expandTuple(entry.value, indent, width, color);
+    case "sequence":
+      return wrapMultiline("Vec", "<", ">", entry.value, indent, width, color);
+    case "array": {
+      const inner = expandEntry(entry.value, indent + 1, width, color);
+      return `[${inner}; ${entry.len}]`;
+    }
+    case "option":
+      return wrapMultiline("Option", "<", ">", entry.value, indent, width, color);
+    case "result": {
+      const innerIndent = indent + 2;
+      const padding = " ".repeat(innerIndent);
+      const closePadding = " ".repeat(indent);
+      const ok = expandEntry(entry.value.ok, innerIndent, width, color);
+      const ko = expandEntry(entry.value.ko, innerIndent, width, color);
+      return `${paint(color, MAGENTA2, "Result")}<
+${padding}${ok},
+${padding}${ko}
+${closePadding}>`;
+    }
+    case "enum": {
+      const variants = Object.keys(entry.value);
+      if (variants.length > ENUM_COMPACT_LIMIT)
+        return `enum(${variants.length} variants)`;
+      return expandEnum(variants, indent, color);
+    }
+    case "lookupEntry":
+      return expandEntry(entry.value, indent, width, color);
+    default:
+      return compact;
+  }
+}
+function expandStruct(fields, indent, width, color) {
+  const entries = Object.entries(fields);
+  if (entries.length === 0)
+    return "{}";
+  return renderFieldList(entries, "{", "}", indent, width, color);
+}
+function expandTuple(items, indent, width, color) {
+  if (items.length === 0)
+    return "()";
+  const inner = " ".repeat(indent + 2);
+  const close = " ".repeat(indent);
+  const lines = items.map((v) => `${inner}${expandEntry(v, indent + 2, width, color)}`);
+  return `(
+${lines.join(`,
+`)},
+${close})`;
+}
+function wrapMultiline(name, open, close, inner, indent, width, color) {
+  const innerIndent = indent + 2;
+  const padding = " ".repeat(innerIndent);
+  const closePadding = " ".repeat(indent);
+  const innerStr = expandEntry(inner, innerIndent, width, color);
+  return `${paint(color, MAGENTA2, name)}${open}
+${padding}${innerStr}
+${closePadding}${close}`;
+}
+function expandEnum(variants, indent, color) {
+  const prefix = `
+${" ".repeat(indent)}| `;
+  const [first, ...rest] = variants;
+  const head = paint(color, GREEN2, first ?? "");
+  if (rest.length === 0)
+    return head;
+  const tail = rest.map((v) => paint(color, GREEN2, v)).join(prefix);
+  return `${head}${prefix}${tail}`;
+}
+function renderFieldList(fields, open, close, indent, width, color) {
+  const innerIndent = indent + 2;
+  const maxNameLen = Math.max(...fields.map(([k]) => k.length));
+  const align = maxNameLen <= ALIGN_PADDING_LIMIT;
+  const padTo = align ? maxNameLen : 0;
+  const padding = " ".repeat(innerIndent);
+  const closePadding = " ".repeat(indent);
+  const lines = fields.map(([k, v]) => {
+    const paddedName = align ? k.padEnd(padTo) : k;
+    const fieldPrefix = (align ? padTo : k.length) + 2;
+    const value = expandEntry(v, innerIndent, width, color, fieldPrefix);
+    return `${padding}${paint(color, CYAN2, paddedName)}: ${value}`;
+  });
+  return `${open}
+${lines.join(`,
+`)},
+${closePadding}${close}`;
+}
+function prettyType(entry, opts = {}) {
+  const { indent, prefix, width, color } = resolveOpts(opts);
+  const compact = compactEntry(entry, color);
+  if (visualWidth(compact) + indent + prefix <= width)
+    return compact;
+  return expandEntry(entry, indent, width, color);
+}
+function prettyTypeById(lookup, typeId, opts = {}) {
+  try {
+    const entry = lookup(typeId);
+    if (!entry || typeof entry.type !== "string")
+      return `type(${typeId})`;
+    return prettyType(entry, opts);
+  } catch {
+    return `type(${typeId})`;
+  }
+}
+function prettyCallArgs(meta, palletName, callName, opts = {}) {
+  const fields = getCallFields(meta, palletName, callName);
+  if (fields === null)
+    return "";
+  return renderArgsFromFields(fields, opts);
+}
+function prettyEventFields(meta, palletName, eventName, opts = {}) {
+  const fields = getEventFields(meta, palletName, eventName);
+  if (fields === null)
+    return "";
+  return renderArgsFromFields(fields, opts);
+}
+function prettyRuntimeApiArgs(lookup, inputs, opts = {}) {
+  if (inputs.length === 0)
+    return "()";
+  const namedFields = inputs.map((i) => {
+    let entry;
+    try {
+      entry = lookup(i.type);
+      if (!entry || typeof entry.type !== "string")
+        entry = { type: "unknown" };
+    } catch {
+      entry = { type: "unknown" };
+    }
+    return [i.name, entry];
+  });
+  return renderArgsFromFields({ kind: "named", fields: namedFields }, opts);
+}
+function unwrapVariant(variant) {
+  if (!variant)
+    return null;
+  if (variant.type === "void")
+    return { kind: "void" };
+  if (variant.type === "struct") {
+    return {
+      kind: "named",
+      fields: Object.entries(variant.value)
+    };
+  }
+  if (variant.type === "tuple") {
+    return { kind: "positional", types: variant.value };
+  }
+  if (variant.type === "lookupEntry") {
+    const inner = variant.value;
+    if (inner.type === "void")
+      return { kind: "void" };
+    if (inner.type === "struct") {
+      return {
+        kind: "named",
+        fields: Object.entries(inner.value)
+      };
+    }
+    return { kind: "single", type: inner };
+  }
+  return null;
+}
+function getCallFields(meta, palletName, callName) {
+  try {
+    const palletMeta = meta.unified.pallets.find((p) => p.name === palletName);
+    if (!palletMeta?.calls)
+      return null;
+    const callsEntry = meta.lookup(palletMeta.calls.type);
+    if (callsEntry.type !== "enum")
+      return null;
+    const variant = callsEntry.value[callName];
+    return unwrapVariant(variant);
+  } catch {
+    return null;
+  }
+}
+function getEventFields(meta, palletName, eventName) {
+  try {
+    const palletMeta = meta.unified.pallets.find((p) => p.name === palletName);
+    if (!palletMeta?.events)
+      return null;
+    const eventsEntry = meta.lookup(palletMeta.events.type);
+    if (eventsEntry.type !== "enum")
+      return null;
+    const variant = eventsEntry.value[eventName];
+    return unwrapVariant(variant);
+  } catch {
+    return null;
+  }
+}
+function renderArgsFromFields(fields, opts) {
+  const { indent, prefix, width, color } = resolveOpts(opts);
+  const lead = indent + prefix;
+  switch (fields.kind) {
+    case "void":
+      return "()";
+    case "named": {
+      const compact = `(${fields.fields.map(([k, v]) => `${paint(color, CYAN2, k)}: ${compactEntry(v, color)}`).join(", ")})`;
+      if (visualWidth(compact) + lead <= width)
+        return compact;
+      return renderFieldList(fields.fields, "(", ")", indent, width, color);
+    }
+    case "positional": {
+      const compact = `(${fields.types.map((t) => compactEntry(t, color)).join(", ")})`;
+      if (visualWidth(compact) + lead <= width)
+        return compact;
+      const innerIndent = indent + 2;
+      const padding = " ".repeat(innerIndent);
+      const closePadding = " ".repeat(indent);
+      const lines = fields.types.map((t) => `${padding}${expandEntry(t, innerIndent, width, color)}`);
+      return `(
+${lines.join(`,
+`)},
+${closePadding})`;
+    }
+    case "single": {
+      const compact = `(${compactEntry(fields.type, color)})`;
+      if (visualWidth(compact) + lead <= width)
+        return compact;
+      const inner = expandEntry(fields.type, indent + 2, width, color);
+      return `(
+${" ".repeat(indent + 2)}${inner},
+${" ".repeat(indent)})`;
+    }
+  }
+}
+function compactTypeString(entry) {
+  return compactEntry(entry, false);
+}
+function compactArgsString(fields) {
+  if (fields === null)
+    return "";
+  switch (fields.kind) {
+    case "void":
+      return "()";
+    case "named":
+      return `(${fields.fields.map(([k, v]) => `${k}: ${compactEntry(v, false)}`).join(", ")})`;
+    case "positional":
+      return `(${fields.types.map((t) => compactEntry(t, false)).join(", ")})`;
+    case "single":
+      return `(${compactEntry(fields.type, false)})`;
+  }
+}
+var RESET2 = "\x1B[0m", CYAN2 = "\x1B[36m", GREEN2 = "\x1B[32m", YELLOW2 = "\x1B[33m", MAGENTA2 = "\x1B[35m", ANSI_RE, ENUM_COMPACT_LIMIT = 24, ALIGN_PADDING_LIMIT = 16;
+var init_pretty_type = __esm(() => {
+  init_output();
+  ANSI_RE = /\x1b\[[0-9;]*m/g;
+});
+
 // src/core/metadata.ts
 import { getDynamicBuilder, getLookupFn } from "@polkadot-api/metadata-builders";
 import {
@@ -1067,114 +1390,18 @@ function describeRuntimeApiMethodArgs(meta, method) {
 function describeType(lookup, typeId) {
   try {
     const entry = lookup(typeId);
-    return formatLookupEntry(entry);
+    if (!entry || typeof entry.type !== "string")
+      return `type(${typeId})`;
+    return compactTypeString(entry);
   } catch {
     return `type(${typeId})`;
   }
 }
-function formatLookupEntry(entry) {
-  switch (entry.type) {
-    case "primitive":
-      return entry.value;
-    case "compact":
-      return `Compact<${formatLookupEntry(entry.isBig ? { type: "primitive", value: "u128" } : { type: "primitive", value: "u64" })}>`;
-    case "AccountId32":
-      return "AccountId32";
-    case "bitSequence":
-      return "BitSequence";
-    case "sequence":
-      return `Vec<${formatLookupEntry(entry.value)}>`;
-    case "array":
-      return `[${formatLookupEntry(entry.value)}; ${entry.len}]`;
-    case "tuple":
-      return `(${entry.value.map(formatLookupEntry).join(", ")})`;
-    case "struct":
-      return `{ ${Object.entries(entry.value).map(([k, v]) => `${k}: ${formatLookupEntry(v)}`).join(", ")} }`;
-    case "option":
-      return `Option<${formatLookupEntry(entry.value)}>`;
-    case "result":
-      return `Result<${formatLookupEntry(entry.value.ok)}, ${formatLookupEntry(entry.value.ko)}>`;
-    case "enum": {
-      const variants = Object.keys(entry.value);
-      if (variants.length <= 4)
-        return variants.join(" | ");
-      return `enum(${variants.length} variants)`;
-    }
-    default:
-      return "unknown";
-  }
-}
 function describeCallArgs(meta, palletName, callName) {
-  try {
-    const palletMeta = meta.unified.pallets.find((p) => p.name === palletName);
-    if (!palletMeta?.calls)
-      return "";
-    const callsEntry = meta.lookup(palletMeta.calls.type);
-    if (callsEntry.type !== "enum")
-      return "";
-    const variant = callsEntry.value[callName];
-    if (!variant)
-      return "";
-    if (variant.type === "void")
-      return "()";
-    if (variant.type === "struct") {
-      const fields = Object.entries(variant.value).map(([k, v]) => `${k}: ${formatLookupEntry(v)}`).join(", ");
-      return `(${fields})`;
-    }
-    if (variant.type === "lookupEntry") {
-      const inner = variant.value;
-      if (inner.type === "void")
-        return "()";
-      if (inner.type === "struct") {
-        const fields = Object.entries(inner.value).map(([k, v]) => `${k}: ${formatLookupEntry(v)}`).join(", ");
-        return `(${fields})`;
-      }
-      return `(${formatLookupEntry(inner)})`;
-    }
-    if (variant.type === "tuple") {
-      const types = variant.value.map(formatLookupEntry).join(", ");
-      return `(${types})`;
-    }
-    return "";
-  } catch {
-    return "";
-  }
+  return compactArgsString(getCallFields(meta, palletName, callName));
 }
 function describeEventFields(meta, palletName, eventName) {
-  try {
-    const palletMeta = meta.unified.pallets.find((p) => p.name === palletName);
-    if (!palletMeta?.events)
-      return "";
-    const eventsEntry = meta.lookup(palletMeta.events.type);
-    if (eventsEntry.type !== "enum")
-      return "";
-    const variant = eventsEntry.value[eventName];
-    if (!variant)
-      return "";
-    if (variant.type === "void")
-      return "()";
-    if (variant.type === "struct") {
-      const fields = Object.entries(variant.value).map(([k, v]) => `${k}: ${formatLookupEntry(v)}`).join(", ");
-      return `(${fields})`;
-    }
-    if (variant.type === "lookupEntry") {
-      const inner = variant.value;
-      if (inner.type === "void")
-        return "()";
-      if (inner.type === "struct") {
-        const fields = Object.entries(inner.value).map(([k, v]) => `${k}: ${formatLookupEntry(v)}`).join(", ");
-        return `(${fields})`;
-      }
-      return `(${formatLookupEntry(inner)})`;
-    }
-    if (variant.type === "tuple") {
-      const types = variant.value.map(formatLookupEntry).join(", ");
-      return `(${types})`;
-    }
-    return "";
-  } catch {
-    return "";
-  }
+  return compactArgsString(getEventFields(meta, palletName, eventName));
 }
 function hexToBytes(hex) {
   const clean = hex.startsWith("0x") ? hex.slice(2) : hex;
@@ -1188,6 +1415,7 @@ var METADATA_TIMEOUT_MS = 15000, optionalOpaqueBytes, v15Arg, PAPI_BUILTIN_EXTEN
 var init_metadata = __esm(() => {
   init_store();
   init_errors();
+  init_pretty_type();
   optionalOpaqueBytes = Option(Bytes());
   v15Arg = toHex(u32.enc(15));
   PAPI_BUILTIN_EXTENSIONS = new Set([
@@ -1584,6 +1812,7 @@ var init_tx = __esm(() => {
   init_client();
   init_metadata();
   init_output();
+  init_pretty_type();
   init_resolve_address();
   init_binary_display();
   init_errors();
@@ -1799,8 +2028,11 @@ async function handleCalls(target, opts) {
     }
     printHeading(`${pallet.name} Calls`);
     for (const c of pallet.calls) {
-      const args2 = describeCallArgs(meta, pallet.name, c.name);
-      console.log(`  ${CYAN}${c.name}${RESET}${DIM}${args2}${RESET}`);
+      const args2 = prettyCallArgs(meta, pallet.name, c.name, {
+        indent: 2,
+        prefix: c.name.length
+      });
+      console.log(`  ${CYAN}${c.name}${RESET}${args2}`);
       const summary = firstSentence(c.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -1826,7 +2058,10 @@ async function handleCalls(target, opts) {
     return;
   }
   printHeading(`${pallet.name}.${callItem.name} (Call)`);
-  const args = describeCallArgs(meta, pallet.name, callItem.name);
+  const args = prettyCallArgs(meta, pallet.name, callItem.name, {
+    indent: 2,
+    prefix: 6
+  });
   console.log(`  ${BOLD}Args:${RESET} ${args}`);
   if (callItem.docs.length) {
     console.log();
@@ -1885,8 +2120,11 @@ async function handleEvents(target, opts) {
     }
     printHeading(`${pallet.name} Events`);
     for (const e of pallet.events) {
-      const fields2 = describeEventFields(meta, pallet.name, e.name);
-      console.log(`  ${CYAN}${e.name}${RESET}${DIM}${fields2}${RESET}`);
+      const fields2 = prettyEventFields(meta, pallet.name, e.name, {
+        indent: 2,
+        prefix: e.name.length
+      });
+      console.log(`  ${CYAN}${e.name}${RESET}${fields2}`);
       const summary = firstSentence(e.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -1912,7 +2150,10 @@ async function handleEvents(target, opts) {
     return;
   }
   printHeading(`${pallet.name}.${eventItem.name} (Event)`);
-  const fields = describeEventFields(meta, pallet.name, eventItem.name);
+  const fields = prettyEventFields(meta, pallet.name, eventItem.name, {
+    indent: 2,
+    prefix: 8
+  });
   console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
   if (eventItem.docs.length) {
     console.log();
@@ -2039,24 +2280,30 @@ async function handleStorage(target, opts) {
         chain: chainName,
         pallet: pallet.name,
         storage: pallet.storage.map((s) => {
-          const valueType = describeType(meta.lookup, s.valueTypeId);
+          const valueType2 = 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 { name: s.name, type: s.type, valueType: valueType2, keyType, docs: firstSentence(s.docs) };
         })
       }));
       return;
     }
     printHeading(`${pallet.name} Storage`);
     for (const s of pallet.storage) {
-      const valueType = describeType(meta.lookup, s.valueTypeId);
-      let typeSuffix;
-      if (s.keyTypeId != null) {
-        const keyType = describeType(meta.lookup, s.keyTypeId);
-        typeSuffix = `: ${keyType} → ${valueType}    [map]`;
-      } else {
-        typeSuffix = `: ${valueType}`;
+      const isMap = s.keyTypeId != null;
+      const tag = isMap ? `${DIM} [map]${RESET}` : "";
+      console.log(`  ${CYAN}${s.name}${RESET}${tag}`);
+      if (isMap) {
+        const keyType = prettyTypeById(meta.lookup, s.keyTypeId, {
+          indent: 4,
+          prefix: 5
+        });
+        console.log(`    ${DIM}Key:${RESET}   ${keyType}`);
       }
-      console.log(`  ${CYAN}${s.name}${RESET}${DIM}${typeSuffix}${RESET}`);
+      const valueType2 = prettyTypeById(meta.lookup, s.valueTypeId, {
+        indent: 4,
+        prefix: 7
+      });
+      console.log(`    ${DIM}Value:${RESET} ${valueType2}`);
       const summary = firstSentence(s.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -2071,7 +2318,7 @@ async function handleStorage(target, opts) {
     throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
   }
   if (isJsonOutput(opts)) {
-    const valueType = describeType(meta.lookup, storageItem.valueTypeId);
+    const valueType2 = describeType(meta.lookup, storageItem.valueTypeId);
     const keyType = storageItem.keyTypeId != null ? describeType(meta.lookup, storageItem.keyTypeId) : undefined;
     console.log(formatJson({
       chain: chainName,
@@ -2079,18 +2326,26 @@ async function handleStorage(target, opts) {
       item: storageItem.name,
       category: "storage",
       type: storageItem.type,
-      valueType,
+      valueType: valueType2,
       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)}`);
+  console.log(`  ${BOLD}Type:${RESET}  ${storageItem.type}`);
   if (storageItem.keyTypeId != null) {
-    console.log(`  ${BOLD}Key:${RESET} ${describeType(meta.lookup, storageItem.keyTypeId)}`);
+    const keyType = prettyTypeById(meta.lookup, storageItem.keyTypeId, {
+      indent: 2,
+      prefix: 7
+    });
+    console.log(`  ${BOLD}Key:${RESET}   ${keyType}`);
   }
+  const valueType = prettyTypeById(meta.lookup, storageItem.valueTypeId, {
+    indent: 2,
+    prefix: 7
+  });
+  console.log(`  ${BOLD}Value:${RESET} ${valueType}`);
   if (storageItem.docs.length) {
     console.log();
     printDocs(storageItem.docs);
@@ -2121,9 +2376,15 @@ async function showItemHelp(category, target, opts) {
       throw new Error(suggestMessage(`method in ${api.name}`, methodName, names));
     }
     printHeading(`${api.name}.${method.name} (Runtime API)`);
-    const argStr = describeRuntimeApiMethodArgs(meta, method);
-    const retStr = describeType(meta.lookup, method.output);
-    console.log(`  ${BOLD}Args:${RESET} ${argStr}`);
+    const argStr = prettyRuntimeApiArgs(meta.lookup, method.inputs, {
+      indent: 2,
+      prefix: 9
+    });
+    const retStr = prettyTypeById(meta.lookup, method.output, {
+      indent: 2,
+      prefix: 9
+    });
+    console.log(`  ${BOLD}Args:${RESET}    ${argStr}`);
     console.log(`  ${BOLD}Returns:${RESET} ${retStr}`);
     if (method.docs.length) {
       console.log();
@@ -2166,7 +2427,10 @@ async function showItemHelp(category, target, opts) {
         throw new Error(suggestMessage(`call in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${callItem.name} (Call)`);
-      const args = describeCallArgs(meta, pallet.name, callItem.name);
+      const args = prettyCallArgs(meta, pallet.name, callItem.name, {
+        indent: 2,
+        prefix: 6
+      });
       console.log(`  ${BOLD}Args:${RESET} ${args}`);
       if (callItem.docs.length) {
         console.log();
@@ -2193,11 +2457,19 @@ async function showItemHelp(category, target, opts) {
         throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
-      console.log(`  ${BOLD}Type:${RESET} ${storageItem.type}`);
-      console.log(`  ${BOLD}Value:${RESET} ${describeType(meta.lookup, storageItem.valueTypeId)}`);
+      console.log(`  ${BOLD}Type:${RESET}  ${storageItem.type}`);
       if (storageItem.keyTypeId != null) {
-        console.log(`  ${BOLD}Key:${RESET} ${describeType(meta.lookup, storageItem.keyTypeId)}`);
+        const keyType = prettyTypeById(meta.lookup, storageItem.keyTypeId, {
+          indent: 2,
+          prefix: 7
+        });
+        console.log(`  ${BOLD}Key:${RESET}   ${keyType}`);
       }
+      const valueType = prettyTypeById(meta.lookup, storageItem.valueTypeId, {
+        indent: 2,
+        prefix: 7
+      });
+      console.log(`  ${BOLD}Value:${RESET} ${valueType}`);
       if (storageItem.docs.length) {
         console.log();
         printDocs(storageItem.docs);
@@ -2224,7 +2496,11 @@ async function showItemHelp(category, target, opts) {
         throw new Error(suggestMessage(`constant in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${constItem.name} (Constant)`);
-      console.log(`  ${BOLD}Type:${RESET} ${describeType(meta.lookup, constItem.typeId)}`);
+      const constType = prettyTypeById(meta.lookup, constItem.typeId, {
+        indent: 2,
+        prefix: 6
+      });
+      console.log(`  ${BOLD}Type:${RESET} ${constType}`);
       if (constItem.docs.length) {
         console.log();
         printDocs(constItem.docs);
@@ -2242,7 +2518,10 @@ async function showItemHelp(category, target, opts) {
         throw new Error(suggestMessage(`event in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${eventItem.name} (Event)`);
-      const fields = describeEventFields(meta, pallet.name, eventItem.name);
+      const fields = prettyEventFields(meta, pallet.name, eventItem.name, {
+        indent: 2,
+        prefix: 8
+      });
       console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
       if (eventItem.docs.length) {
         console.log();
@@ -2277,6 +2556,7 @@ var init_focused_inspect = __esm(() => {
   init_client();
   init_metadata();
   init_output();
+  init_pretty_type();
 });
 
 // src/core/hash.ts
@@ -2666,7 +2946,7 @@ var init_complete = __esm(() => {
     ext: "extensions"
   };
   NAMED_COMMANDS = ["chain", "account", "inspect", "hash", "sign", "parachain", "completions"];
-  CHAIN_SUBCOMMANDS = ["add", "remove", "update", "list"];
+  CHAIN_SUBCOMMANDS = ["add", "info", "list", "remove", "update"];
   ACCOUNT_SUBCOMMANDS = [
     "add",
     "create",
@@ -2697,7 +2977,7 @@ var init_complete = __esm(() => {
 // src/cli.ts
 import cac from "cac";
 // package.json
-var version = "1.16.0";
+var version = "1.17.0";
 
 // src/commands/account.ts
 init_accounts_store();
@@ -3540,6 +3820,8 @@ ${BOLD}Usage:${RESET}
   $ dot chain update <name>             Re-fetch metadata for a chain
   $ dot chain update --all              Re-fetch metadata for all configured chains
   $ dot chain list                      List configured chains
+  $ dot chain info <name>               Show details for a single chain
+  $ dot chain <name>                    Shortcut for \`chain info <name>\`
   $ dot chain export [names...]         Export chain configuration to stdout
   $ dot chain import <file>             Import chain configuration from a file
 
@@ -3549,6 +3831,9 @@ ${BOLD}Examples:${RESET}
   $ 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 list
+  $ dot chains -v
+  $ dot chain info polkadot
+  $ dot chain polkadot
   $ dot chain update kusama
   $ dot chain update --all
   $ dot chain remove kusama
@@ -3561,7 +3846,7 @@ ${BOLD}Examples:${RESET}
   $ dot chain import my-chains.json --no-metadata
 `.trimStart();
 function registerChainCommands(cli) {
-  cli.command("chain [action] [...names]", "Manage chains (add, remove, update, list, export, import)").alias("chains").option("--all", "Update/export all configured chains").option("--relay <name>", "Parent relay chain for this parachain").option("--parachain-id <id>", "Parachain ID (auto-detected if omitted with --relay)").option("--file <path>", "Output/input file for export/import").option("--overwrite", "Overwrite existing chains on import").option("--dry-run", "Preview import without applying changes").option("--no-metadata", "Skip automatic metadata fetch after import").action(async (action, names, opts) => {
+  cli.command("chain [action] [...names]", "Manage chains (add, remove, update, list, export, import)").alias("chains").option("--all", "Update/export all configured chains").option("--relay <name>", "Parent relay chain for this parachain").option("--parachain-id <id>", "Parachain ID (auto-detected if omitted with --relay)").option("--file <path>", "Output/input file for export/import").option("--overwrite", "Overwrite existing chains on import").option("--dry-run", "Preview import without applying changes").option("--no-metadata", "Skip automatic metadata fetch after import").option("-v, --verbose", "Show RPC endpoints in `chains` list output").action(async (action, names, opts) => {
     if (!action) {
       if (process.argv[2] === "chains")
         return chainList(opts);
@@ -3575,17 +3860,24 @@ function registerChainCommands(cli) {
         return chainRemove(names[0], opts);
       case "list":
         return chainList(opts);
+      case "info":
+        return chainInfo(names[0], opts);
       case "update":
         return chainUpdate(names[0], opts);
       case "export":
         return chainExport(names, opts);
       case "import":
         return chainImport(names[0], opts);
-      default:
+      default: {
+        const config = await loadConfig();
+        if (findChainName(config, action)) {
+          return chainInfo(action, opts);
+        }
         console.error(`Unknown action "${action}".
 `);
         console.log(CHAIN_HELP);
         process.exit(1);
+      }
     }
   });
 }
@@ -3695,6 +3987,7 @@ async function chainList(opts = {}) {
     console.log(formatJson({ chains }));
     return;
   }
+  const verbose = opts.verbose === true;
   printHeading("Configured Chains");
   const parachainsByRelay = new Map;
   const standalone = [];
@@ -3716,7 +4009,7 @@ async function chainList(opts = {}) {
   for (const relayName of relayNames) {
     const relayConfig = config.chains[relayName];
     if (relayConfig) {
-      printChainLine("  ", relayName, relayConfig);
+      printChainLine("  ", relayName, relayConfig, "", verbose);
     }
     const paras = parachainsByRelay.get(relayName) ?? [];
     for (let i = 0;i < paras.length; i++) {
@@ -3724,17 +4017,21 @@ async function chainList(opts = {}) {
       const isLast = i === paras.length - 1;
       const prefix = isLast ? "  └─ " : "  ├─ ";
       const idSuffix = chainConfig.parachainId != null ? ` ${DIM}[${chainConfig.parachainId}]${RESET}` : "";
-      printChainLine(prefix, name, chainConfig, idSuffix);
+      printChainLine(prefix, name, chainConfig, idSuffix, verbose);
     }
     console.log();
   }
   for (const [name, chainConfig] of standalone) {
-    printChainLine("  ", name, chainConfig);
+    printChainLine("  ", name, chainConfig, "", verbose);
   }
   if (standalone.length > 0)
     console.log();
 }
-function printChainLine(prefix, name, chainConfig, suffix = "") {
+function printChainLine(prefix, name, chainConfig, suffix = "", verbose = false) {
+  if (!verbose) {
+    console.log(`${prefix}${CYAN}${name}${RESET}${suffix}`);
+    return;
+  }
   const rpcs = Array.isArray(chainConfig.rpc) ? chainConfig.rpc : [chainConfig.rpc];
   console.log(`${prefix}${CYAN}${name}${RESET}${suffix}  ${DIM}${rpcs[0]}${RESET}`);
   const indent = prefix.replace(/[^\s]/g, " ");
@@ -3742,6 +4039,56 @@ function printChainLine(prefix, name, chainConfig, suffix = "") {
     console.log(`${indent}  ${DIM}${rpcs[i]}${RESET}`);
   }
 }
+async function chainInfo(name, opts = {}) {
+  if (!name) {
+    console.error("Usage: dot chain info <name>");
+    process.exit(1);
+  }
+  const config = await loadConfig();
+  const { name: resolved, chain } = resolveChain(config, name);
+  const rpcs = Array.isArray(chain.rpc) ? chain.rpc : [chain.rpc];
+  const parachains = Object.entries(config.chains).filter(([, c]) => c.relay === resolved).map(([n, c]) => ({ name: n, parachainId: c.parachainId }));
+  const fingerprint = await loadMetadataFingerprint(resolved);
+  if (isJsonOutput(opts)) {
+    console.log(formatJson({
+      name: resolved,
+      rpc: rpcs,
+      ...chain.relay && { relay: chain.relay },
+      ...chain.parachainId != null && { parachainId: chain.parachainId },
+      ...parachains.length > 0 && { parachains },
+      metadata: fingerprint ? {
+        specName: fingerprint.specName,
+        specVersion: fingerprint.specVersion,
+        fetchedAt: fingerprint.fetchedAt
+      } : null
+    }));
+    return;
+  }
+  printHeading(resolved);
+  console.log(`  ${CYAN}rpc:${RESET}`);
+  for (const rpc of rpcs) {
+    console.log(`    ${DIM}${rpc}${RESET}`);
+  }
+  if (chain.relay) {
+    console.log(`  ${CYAN}relay:${RESET}        ${chain.relay}`);
+  }
+  if (chain.parachainId != null) {
+    console.log(`  ${CYAN}parachain id:${RESET} ${chain.parachainId}`);
+  }
+  if (parachains.length > 0) {
+    console.log(`  ${CYAN}parachains:${RESET}`);
+    for (const p of parachains) {
+      const idSuffix = p.parachainId != null ? ` ${DIM}[${p.parachainId}]${RESET}` : "";
+      console.log(`    ${p.name}${idSuffix}`);
+    }
+  }
+  console.log(`  ${CYAN}metadata:${RESET}`);
+  if (fingerprint) {
+    console.log(`    ${fingerprint.specName} v${fingerprint.specVersion} ${DIM}(cached ${fingerprint.fetchedAt})${RESET}`);
+  } else {
+    console.log(`    ${DIM}not cached — run \`dot chain update ${resolved}\`${RESET}`);
+  }
+}
 async function chainUpdate(name, opts) {
   const config = await loadConfig();
   if (opts.all) {
@@ -4118,6 +4465,7 @@ init_store();
 init_client();
 init_metadata();
 init_output();
+init_pretty_type();
 async function loadMeta2(chainName, chainConfig, rpcOverride) {
   if (rpcOverride) {
     process.stderr.write(`Fetching metadata from ${chainName}...
@@ -4202,8 +4550,11 @@ async function handleCalls2(target, opts) {
     }
     printHeading(`${pallet.name} Calls`);
     for (const c of pallet.calls) {
-      const args2 = describeCallArgs(meta, pallet.name, c.name);
-      console.log(`  ${CYAN}${c.name}${RESET}${DIM}${args2}${RESET}`);
+      const args2 = prettyCallArgs(meta, pallet.name, c.name, {
+        indent: 2,
+        prefix: c.name.length
+      });
+      console.log(`  ${CYAN}${c.name}${RESET}${args2}`);
       const summary = firstSentence(c.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -4229,7 +4580,10 @@ async function handleCalls2(target, opts) {
     return;
   }
   printHeading(`${pallet.name}.${callItem.name} (Call)`);
-  const args = describeCallArgs(meta, pallet.name, callItem.name);
+  const args = prettyCallArgs(meta, pallet.name, callItem.name, {
+    indent: 2,
+    prefix: 6
+  });
   console.log(`  ${BOLD}Args:${RESET} ${args}`);
   if (callItem.docs.length) {
     console.log();
@@ -4288,8 +4642,11 @@ async function handleEvents2(target, opts) {
     }
     printHeading(`${pallet.name} Events`);
     for (const e of pallet.events) {
-      const fields2 = describeEventFields(meta, pallet.name, e.name);
-      console.log(`  ${CYAN}${e.name}${RESET}${DIM}${fields2}${RESET}`);
+      const fields2 = prettyEventFields(meta, pallet.name, e.name, {
+        indent: 2,
+        prefix: e.name.length
+      });
+      console.log(`  ${CYAN}${e.name}${RESET}${fields2}`);
       const summary = firstSentence(e.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -4315,7 +4672,10 @@ async function handleEvents2(target, opts) {
     return;
   }
   printHeading(`${pallet.name}.${eventItem.name} (Event)`);
-  const fields = describeEventFields(meta, pallet.name, eventItem.name);
+  const fields = prettyEventFields(meta, pallet.name, eventItem.name, {
+    indent: 2,
+    prefix: 8
+  });
   console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
   if (eventItem.docs.length) {
     console.log();
@@ -4442,24 +4802,30 @@ async function handleStorage2(target, opts) {
         chain: chainName,
         pallet: pallet.name,
         storage: pallet.storage.map((s) => {
-          const valueType = describeType(meta.lookup, s.valueTypeId);
+          const valueType2 = 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 { name: s.name, type: s.type, valueType: valueType2, keyType, docs: firstSentence(s.docs) };
         })
       }));
       return;
     }
     printHeading(`${pallet.name} Storage`);
     for (const s of pallet.storage) {
-      const valueType = describeType(meta.lookup, s.valueTypeId);
-      let typeSuffix;
-      if (s.keyTypeId != null) {
-        const keyType = describeType(meta.lookup, s.keyTypeId);
-        typeSuffix = `: ${keyType} → ${valueType}    [map]`;
-      } else {
-        typeSuffix = `: ${valueType}`;
+      const isMap = s.keyTypeId != null;
+      const tag = isMap ? `${DIM} [map]${RESET}` : "";
+      console.log(`  ${CYAN}${s.name}${RESET}${tag}`);
+      if (isMap) {
+        const keyType = prettyTypeById(meta.lookup, s.keyTypeId, {
+          indent: 4,
+          prefix: 5
+        });
+        console.log(`    ${DIM}Key:${RESET}   ${keyType}`);
       }
-      console.log(`  ${CYAN}${s.name}${RESET}${DIM}${typeSuffix}${RESET}`);
+      const valueType2 = prettyTypeById(meta.lookup, s.valueTypeId, {
+        indent: 4,
+        prefix: 7
+      });
+      console.log(`    ${DIM}Value:${RESET} ${valueType2}`);
       const summary = firstSentence(s.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -4474,7 +4840,7 @@ async function handleStorage2(target, opts) {
     throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
   }
   if (isJsonOutput(opts)) {
-    const valueType = describeType(meta.lookup, storageItem.valueTypeId);
+    const valueType2 = describeType(meta.lookup, storageItem.valueTypeId);
     const keyType = storageItem.keyTypeId != null ? describeType(meta.lookup, storageItem.keyTypeId) : undefined;
     console.log(formatJson({
       chain: chainName,
@@ -4482,18 +4848,26 @@ async function handleStorage2(target, opts) {
       item: storageItem.name,
       category: "storage",
       type: storageItem.type,
-      valueType,
+      valueType: valueType2,
       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)}`);
+  console.log(`  ${BOLD}Type:${RESET}  ${storageItem.type}`);
   if (storageItem.keyTypeId != null) {
-    console.log(`  ${BOLD}Key:${RESET} ${describeType(meta.lookup, storageItem.keyTypeId)}`);
+    const keyType = prettyTypeById(meta.lookup, storageItem.keyTypeId, {
+      indent: 2,
+      prefix: 7
+    });
+    console.log(`  ${BOLD}Key:${RESET}   ${keyType}`);
   }
+  const valueType = prettyTypeById(meta.lookup, storageItem.valueTypeId, {
+    indent: 2,
+    prefix: 7
+  });
+  console.log(`  ${BOLD}Value:${RESET} ${valueType}`);
   if (storageItem.docs.length) {
     console.log();
     printDocs(storageItem.docs);
@@ -4524,9 +4898,15 @@ async function showItemHelp2(category, target, opts) {
       throw new Error(suggestMessage(`method in ${api.name}`, methodName, names));
     }
     printHeading(`${api.name}.${method.name} (Runtime API)`);
-    const argStr = describeRuntimeApiMethodArgs(meta, method);
-    const retStr = describeType(meta.lookup, method.output);
-    console.log(`  ${BOLD}Args:${RESET} ${argStr}`);
+    const argStr = prettyRuntimeApiArgs(meta.lookup, method.inputs, {
+      indent: 2,
+      prefix: 9
+    });
+    const retStr = prettyTypeById(meta.lookup, method.output, {
+      indent: 2,
+      prefix: 9
+    });
+    console.log(`  ${BOLD}Args:${RESET}    ${argStr}`);
     console.log(`  ${BOLD}Returns:${RESET} ${retStr}`);
     if (method.docs.length) {
       console.log();
@@ -4569,7 +4949,10 @@ async function showItemHelp2(category, target, opts) {
         throw new Error(suggestMessage(`call in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${callItem.name} (Call)`);
-      const args = describeCallArgs(meta, pallet.name, callItem.name);
+      const args = prettyCallArgs(meta, pallet.name, callItem.name, {
+        indent: 2,
+        prefix: 6
+      });
       console.log(`  ${BOLD}Args:${RESET} ${args}`);
       if (callItem.docs.length) {
         console.log();
@@ -4596,11 +4979,19 @@ async function showItemHelp2(category, target, opts) {
         throw new Error(suggestMessage(`storage item in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
-      console.log(`  ${BOLD}Type:${RESET} ${storageItem.type}`);
-      console.log(`  ${BOLD}Value:${RESET} ${describeType(meta.lookup, storageItem.valueTypeId)}`);
+      console.log(`  ${BOLD}Type:${RESET}  ${storageItem.type}`);
       if (storageItem.keyTypeId != null) {
-        console.log(`  ${BOLD}Key:${RESET} ${describeType(meta.lookup, storageItem.keyTypeId)}`);
+        const keyType = prettyTypeById(meta.lookup, storageItem.keyTypeId, {
+          indent: 2,
+          prefix: 7
+        });
+        console.log(`  ${BOLD}Key:${RESET}   ${keyType}`);
       }
+      const valueType = prettyTypeById(meta.lookup, storageItem.valueTypeId, {
+        indent: 2,
+        prefix: 7
+      });
+      console.log(`  ${BOLD}Value:${RESET} ${valueType}`);
       if (storageItem.docs.length) {
         console.log();
         printDocs(storageItem.docs);
@@ -4627,7 +5018,11 @@ async function showItemHelp2(category, target, opts) {
         throw new Error(suggestMessage(`constant in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${constItem.name} (Constant)`);
-      console.log(`  ${BOLD}Type:${RESET} ${describeType(meta.lookup, constItem.typeId)}`);
+      const constType = prettyTypeById(meta.lookup, constItem.typeId, {
+        indent: 2,
+        prefix: 6
+      });
+      console.log(`  ${BOLD}Type:${RESET} ${constType}`);
       if (constItem.docs.length) {
         console.log();
         printDocs(constItem.docs);
@@ -4645,7 +5040,10 @@ async function showItemHelp2(category, target, opts) {
         throw new Error(suggestMessage(`event in ${pallet.name}`, itemName, names));
       }
       printHeading(`${pallet.name}.${eventItem.name} (Event)`);
-      const fields = describeEventFields(meta, pallet.name, eventItem.name);
+      const fields = prettyEventFields(meta, pallet.name, eventItem.name, {
+        indent: 2,
+        prefix: 8
+      });
       console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
       if (eventItem.docs.length) {
         console.log();
@@ -4720,8 +5118,16 @@ async function handleExtensions(target, opts) {
     return;
   }
   printHeading(`${described.identifier} (Transaction Extension)`);
-  console.log(`  ${BOLD}Value type:${RESET}       ${described.valueType}`);
-  console.log(`  ${BOLD}AdditionalSigned:${RESET} ${described.additionalSignedType}`);
+  const valueType = prettyTypeById(meta.lookup, described.valueTypeId, {
+    indent: 2,
+    prefix: 18
+  });
+  const addSigType = prettyTypeById(meta.lookup, described.additionalSignedTypeId, {
+    indent: 2,
+    prefix: 18
+  });
+  console.log(`  ${BOLD}Value type:${RESET}       ${valueType}`);
+  console.log(`  ${BOLD}AdditionalSigned:${RESET} ${addSigType}`);
   console.log(`  ${BOLD}Handled by:${RESET}       ${described.isBuiltin ? "polkadot-api (builtin)" : "user (custom — provide via --ext)"}`);
   if (!described.isBuiltin) {
     console.log();
@@ -4805,6 +5211,7 @@ init_store();
 init_client();
 init_metadata();
 init_output();
+init_pretty_type();
 
 // src/utils/parse-target.ts
 function parseTarget(input, options) {
@@ -4981,15 +5388,21 @@ function registerInspectCommand(cli) {
       if (pallet2.storage.length) {
         console.log(`  ${BOLD}Storage Items:${RESET}`);
         for (const s of pallet2.storage) {
-          const valueType = describeType(meta.lookup, s.valueTypeId);
-          let typeSuffix;
-          if (s.keyTypeId != null) {
-            const keyType = describeType(meta.lookup, s.keyTypeId);
-            typeSuffix = `: ${keyType} → ${valueType}    [map]`;
-          } else {
-            typeSuffix = `: ${valueType}`;
+          const isMap = s.keyTypeId != null;
+          const tag = isMap ? `${DIM} [map]${RESET}` : "";
+          console.log(`    ${CYAN}${s.name}${RESET}${tag}`);
+          if (isMap) {
+            const keyType = prettyTypeById(meta.lookup, s.keyTypeId, {
+              indent: 6,
+              prefix: 7
+            });
+            console.log(`      ${DIM}Key:${RESET}   ${keyType}`);
           }
-          console.log(`    ${CYAN}${s.name}${RESET}${DIM}${typeSuffix}${RESET}`);
+          const valueType = prettyTypeById(meta.lookup, s.valueTypeId, {
+            indent: 6,
+            prefix: 7
+          });
+          console.log(`      ${DIM}Value:${RESET} ${valueType}`);
           const summary = firstSentence(s.docs);
           if (summary) {
             console.log(`        ${DIM}${summary}${RESET}`);
@@ -5000,8 +5413,11 @@ function registerInspectCommand(cli) {
       if (pallet2.constants.length) {
         console.log(`  ${BOLD}Constants:${RESET}`);
         for (const c of pallet2.constants) {
-          const typeStr = describeType(meta.lookup, c.typeId);
-          console.log(`    ${CYAN}${c.name}${RESET}${DIM}: ${typeStr}${RESET}`);
+          const typeStr = prettyTypeById(meta.lookup, c.typeId, {
+            indent: 4,
+            prefix: c.name.length + 2
+          });
+          console.log(`    ${CYAN}${c.name}${RESET}: ${typeStr}`);
           const summary = firstSentence(c.docs);
           if (summary) {
             console.log(`        ${DIM}${summary}${RESET}`);
@@ -5012,8 +5428,11 @@ function registerInspectCommand(cli) {
       if (pallet2.calls.length) {
         console.log(`  ${BOLD}Calls:${RESET}`);
         for (const c of pallet2.calls) {
-          const args = describeCallArgs(meta, pallet2.name, c.name);
-          console.log(`    ${CYAN}${c.name}${RESET}${DIM}${args}${RESET}`);
+          const args = prettyCallArgs(meta, pallet2.name, c.name, {
+            indent: 4,
+            prefix: c.name.length
+          });
+          console.log(`    ${CYAN}${c.name}${RESET}${args}`);
           const summary = firstSentence(c.docs);
           if (summary) {
             console.log(`        ${DIM}${summary}${RESET}`);
@@ -5024,8 +5443,11 @@ function registerInspectCommand(cli) {
       if (pallet2.events.length) {
         console.log(`  ${BOLD}Events:${RESET}`);
         for (const e of pallet2.events) {
-          const fields = describeEventFields(meta, pallet2.name, e.name);
-          console.log(`    ${CYAN}${e.name}${RESET}${DIM}${fields}${RESET}`);
+          const fields = prettyEventFields(meta, pallet2.name, e.name, {
+            indent: 4,
+            prefix: e.name.length
+          });
+          console.log(`    ${CYAN}${e.name}${RESET}${fields}`);
           const summary = firstSentence(e.docs);
           if (summary) {
             console.log(`        ${DIM}${summary}${RESET}`);
@@ -5127,11 +5549,19 @@ function registerInspectCommand(cli) {
     const storageItem = pallet.storage.find((s) => s.name.toLowerCase() === itemName.toLowerCase());
     if (storageItem) {
       printHeading(`${pallet.name}.${storageItem.name} (Storage)`);
-      console.log(`  ${BOLD}Type:${RESET} ${storageItem.type}`);
-      console.log(`  ${BOLD}Value:${RESET} ${describeType(meta.lookup, storageItem.valueTypeId)}`);
+      console.log(`  ${BOLD}Type:${RESET}  ${storageItem.type}`);
       if (storageItem.keyTypeId != null) {
-        console.log(`  ${BOLD}Key:${RESET} ${describeType(meta.lookup, storageItem.keyTypeId)}`);
+        const keyType = prettyTypeById(meta.lookup, storageItem.keyTypeId, {
+          indent: 2,
+          prefix: 7
+        });
+        console.log(`  ${BOLD}Key:${RESET}   ${keyType}`);
       }
+      const valueType = prettyTypeById(meta.lookup, storageItem.valueTypeId, {
+        indent: 2,
+        prefix: 7
+      });
+      console.log(`  ${BOLD}Value:${RESET} ${valueType}`);
       if (storageItem.docs.length) {
         console.log();
         printDocs(storageItem.docs);
@@ -5142,7 +5572,11 @@ function registerInspectCommand(cli) {
     const constantItem = pallet.constants.find((c) => c.name.toLowerCase() === itemName.toLowerCase());
     if (constantItem) {
       printHeading(`${pallet.name}.${constantItem.name} (Constant)`);
-      console.log(`  ${BOLD}Type:${RESET} ${describeType(meta.lookup, constantItem.typeId)}`);
+      const typeStr = prettyTypeById(meta.lookup, constantItem.typeId, {
+        indent: 2,
+        prefix: 6
+      });
+      console.log(`  ${BOLD}Type:${RESET} ${typeStr}`);
       if (constantItem.docs.length) {
         console.log();
         printDocs(constantItem.docs);
@@ -5153,7 +5587,10 @@ function registerInspectCommand(cli) {
     const callItem = pallet.calls.find((c) => c.name.toLowerCase() === itemName.toLowerCase());
     if (callItem) {
       printHeading(`${pallet.name}.${callItem.name} (Call)`);
-      const args = describeCallArgs(meta, pallet.name, callItem.name);
+      const args = prettyCallArgs(meta, pallet.name, callItem.name, {
+        indent: 2,
+        prefix: 6
+      });
       console.log(`  ${BOLD}Args:${RESET} ${args}`);
       if (callItem.docs.length) {
         console.log();
@@ -5165,7 +5602,10 @@ function registerInspectCommand(cli) {
     const eventItem = pallet.events.find((e) => e.name.toLowerCase() === itemName.toLowerCase());
     if (eventItem) {
       printHeading(`${pallet.name}.${eventItem.name} (Event)`);
-      const fields = describeEventFields(meta, pallet.name, eventItem.name);
+      const fields = prettyEventFields(meta, pallet.name, eventItem.name, {
+        indent: 2,
+        prefix: 8
+      });
       console.log(`  ${BOLD}Fields:${RESET} ${fields}`);
       if (eventItem.docs.length) {
         console.log();
@@ -5240,11 +5680,6 @@ async function handleMetadata(chain, opts) {
   await writeStdout(`${formatJson(buildMetadataPayload(chainName, meta, fingerprint))}
 `);
 }
-function writeStdout(text) {
-  return new Promise((resolve) => {
-    process.stdout.write(text, () => resolve());
-  });
-}
 function registerMetadataCommand(cli) {
   cli.command("metadata <chain>", "Fetch chain metadata (decoded JSON; --raw for SCALE hex)").option("--raw", "Print SCALE-encoded metadata bytes as hex instead of decoded JSON").option("--cached", "Use cached metadata instead of fetching fresh from the chain").option("--rpc <url>", "Override RPC endpoint(s)").action((chain, opts) => handleMetadata(chain, opts));
 }
@@ -5344,6 +5779,7 @@ init_store();
 init_client();
 init_metadata();
 init_output();
+init_pretty_type();
 init_focused_inspect();
 init_tx();
 async function handleQuery(target, keys, opts) {
@@ -5354,10 +5790,11 @@ async function handleQuery(target, keys, opts) {
     const pallets = listPallets(meta);
     const withStorage = pallets.filter((p) => p.storage.length > 0);
     if (isJsonOutput(opts)) {
-      console.log(formatJson({
+      await writeStdout(`${formatJson({
         chain: chainName2,
         pallets: withStorage.map((p) => ({ name: p.name, storage: p.storage.length }))
-      }));
+      })}
+`);
       return;
     }
     printHeading(`Pallets with storage on ${chainName2} (${withStorage.length})`);
@@ -5375,14 +5812,15 @@ async function handleQuery(target, keys, opts) {
     const pallet2 = resolvePallet(meta, palletName(target));
     if (pallet2.storage.length === 0) {
       if (isJsonOutput(opts)) {
-        console.log(formatJson({ chain: chainName2, pallet: pallet2.name, storage: [] }));
+        await writeStdout(`${formatJson({ chain: chainName2, pallet: pallet2.name, storage: [] })}
+`);
       } else {
         console.log(`No storage items in ${pallet2.name}.`);
       }
       return;
     }
     if (isJsonOutput(opts)) {
-      console.log(formatJson({
+      await writeStdout(`${formatJson({
         chain: chainName2,
         pallet: pallet2.name,
         storage: pallet2.storage.map((s) => {
@@ -5390,20 +5828,27 @@ async function handleQuery(target, keys, opts) {
           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`);
     for (const s of pallet2.storage) {
-      const valueType = describeType(meta.lookup, s.valueTypeId);
-      let typeSuffix;
-      if (s.keyTypeId != null) {
-        const keyType = describeType(meta.lookup, s.keyTypeId);
-        typeSuffix = `: ${keyType} → ${valueType}    [map]`;
-      } else {
-        typeSuffix = `: ${valueType}`;
+      const isMap = s.keyTypeId != null;
+      const tag = isMap ? `${DIM} [map]${RESET}` : "";
+      console.log(`  ${CYAN}${s.name}${RESET}${tag}`);
+      if (isMap) {
+        const keyType = prettyTypeById(meta.lookup, s.keyTypeId, {
+          indent: 4,
+          prefix: 5
+        });
+        console.log(`    ${DIM}Key:${RESET}   ${keyType}`);
       }
-      console.log(`  ${CYAN}${s.name}${RESET}${DIM}${typeSuffix}${RESET}`);
+      const valueType = prettyTypeById(meta.lookup, s.valueTypeId, {
+        indent: 4,
+        prefix: 7
+      });
+      console.log(`    ${DIM}Value:${RESET} ${valueType}`);
       const summary = firstSentence(s.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -5445,13 +5890,18 @@ async function handleQuery(target, keys, opts) {
         return;
       }
       const entries = await withStalenessSuggestion(chainName, clientHandle, () => storageApi.getEntries(...parsedKeys));
-      printResult(entries.map((e) => ({
+      const rows = entries.map((e) => ({
         keys: e.keyArgs,
         value: e.value
-      })), format);
+      }));
+      const text = format === "json" ? formatJson(rows) : formatPretty(rows);
+      await writeStdout(`${text}
+`);
     } else {
       const result = await withStalenessSuggestion(chainName, clientHandle, () => storageApi.getValue(...parsedKeys));
-      printResult(result, format);
+      const text = format === "json" ? formatJson(result) : formatPretty(result);
+      await writeStdout(`${text}
+`);
     }
   } finally {
     clientHandle.destroy();
@@ -5598,6 +6048,7 @@ init_accounts();
 init_client();
 init_metadata();
 init_output();
+init_pretty_type();
 init_resolve_address();
 init_binary_display();
 init_errors();
@@ -5730,8 +6181,11 @@ async function handleTx(target, args, opts) {
     }
     printHeading(`${pallet2.name} Calls`);
     for (const c of pallet2.calls) {
-      const callArgs = describeCallArgs(meta, pallet2.name, c.name);
-      console.log(`  ${CYAN}${c.name}${RESET}${DIM}${callArgs}${RESET}`);
+      const callArgs = prettyCallArgs(meta, pallet2.name, c.name, {
+        indent: 2,
+        prefix: c.name.length
+      });
+      console.log(`  ${CYAN}${c.name}${RESET}${callArgs}`);
       const summary = firstSentence(c.docs);
       if (summary) {
         console.log(`      ${DIM}${summary}${RESET}`);
@@ -5882,6 +6336,7 @@ async function handleTx(target, args, opts) {
       callHex = Binary3.toHex(encodedCall);
     }
     const decodedStr = decodeCall(meta, callHex);
+    const decodedObj = decodeCallObject(meta, callHex);
     if (opts.dryRun && opts.unsigned) {
       if (isJsonOutput(opts)) {
         console.log(formatJson({
@@ -5896,7 +6351,7 @@ async function handleTx(target, args, opts) {
       console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
       console.log(`  ${BOLD}Type:${RESET}   unsigned (bare)`);
       console.log(`  ${BOLD}Call:${RESET}   ${callHex}`);
-      console.log(`  ${BOLD}Decode:${RESET} ${decodedStr}`);
+      printDecodedCall(decodedObj, decodedStr);
       console.log(`  ${BOLD}Fees:${RESET}   ${DIM}N/A (unsigned transaction)${RESET}`);
       return;
     }
@@ -5935,7 +6390,7 @@ async function handleTx(target, args, opts) {
       console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
       console.log(`  ${BOLD}From:${RESET}   ${opts.from} (${signerAddress})`);
       console.log(`  ${BOLD}Call:${RESET}   ${callHex}`);
-      console.log(`  ${BOLD}Decode:${RESET} ${decodedStr}`);
+      printDecodedCall(decodedObj, decodedStr);
       if (nonce !== undefined)
         console.log(`  ${BOLD}Nonce:${RESET} ${nonce}`);
       if (tip !== undefined)
@@ -6012,7 +6467,7 @@ async function handleTx(target, args, opts) {
       console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
       console.log(`  ${BOLD}Type:${RESET}   unsigned (bare)`);
       console.log(`  ${BOLD}Call:${RESET}   ${callHex}`);
-      console.log(`  ${BOLD}Decode:${RESET} ${decodedStr}`);
+      printDecodedCall(decodedObj, decodedStr);
       console.log(`  ${BOLD}Tx:${RESET}     ${result2.txHash}`);
       if (result2.type === "broadcasted") {
         console.log(`  ${BOLD}Status:${RESET} ${GREEN}broadcasted${RESET}`);
@@ -6091,7 +6546,7 @@ async function handleTx(target, args, opts) {
     console.log();
     console.log(`  ${BOLD}Chain:${RESET}  ${chainName}`);
     console.log(`  ${BOLD}Call:${RESET}   ${callHex}`);
-    console.log(`  ${BOLD}Decode:${RESET} ${decodedStr}`);
+    printDecodedCall(decodedObj, decodedStr);
     if (nonce !== undefined)
       console.log(`  ${BOLD}Nonce:${RESET} ${nonce}`);
     if (tip !== undefined)
@@ -6178,6 +6633,39 @@ function decodeCall(meta, callHex) {
     return "(unable to decode)";
   }
 }
+function decodeCallObject(meta, callHex) {
+  try {
+    const callTypeId = meta.lookup.call;
+    if (callTypeId == null)
+      return null;
+    const codec = meta.builder.buildDefinition(callTypeId);
+    const decoded = codec.dec(Binary3.fromHex(callHex));
+    return {
+      palletName: decoded.type,
+      callName: decoded.value.type,
+      args: sanitizeForSerialization(decoded.value.value)
+    };
+  } catch {
+    return null;
+  }
+}
+function printDecodedCall(obj, fallback) {
+  if (!obj) {
+    console.log(`  ${BOLD}Decode:${RESET} ${fallback}`);
+    return;
+  }
+  const header = `${CYAN}${obj.palletName}${RESET}.${CYAN}${obj.callName}${RESET}`;
+  const hasArgs = obj.args !== null && obj.args !== undefined && !(typeof obj.args === "object" && Object.keys(obj.args).length === 0);
+  if (!hasArgs) {
+    console.log(`  ${BOLD}Decode:${RESET} ${header}`);
+    return;
+  }
+  console.log(`  ${BOLD}Decode:${RESET} ${header}`);
+  const indented = formatPretty(obj.args).split(`
+`).map((l) => `    ${l}`).join(`
+`);
+  console.log(indented);
+}
 function decodeCallFallback(meta, callHex) {
   const callTypeId = meta.lookup.call;
   if (callTypeId == null)
@@ -7321,13 +7809,13 @@ function isNewerVersion(current, latest) {
   return compareSemver(current, latest) < 0;
 }
 function buildNotificationBox(current, latest) {
-  const YELLOW2 = "\x1B[33m";
-  const GREEN2 = "\x1B[32m";
-  const CYAN2 = "\x1B[36m";
-  const RESET2 = "\x1B[0m";
+  const YELLOW3 = "\x1B[33m";
+  const GREEN3 = "\x1B[32m";
+  const CYAN3 = "\x1B[36m";
+  const RESET3 = "\x1B[0m";
   const BOLD2 = "\x1B[1m";
-  const line1 = `Update available! ${YELLOW2}${current}${RESET2} → ${GREEN2}${BOLD2}${latest}${RESET2}`;
-  const line2 = `Run ${CYAN2}npm i -g polkadot-cli${RESET2} to update`;
+  const line1 = `Update available! ${YELLOW3}${current}${RESET3} → ${GREEN3}${BOLD2}${latest}${RESET3}`;
+  const line2 = `Run ${CYAN3}npm i -g polkadot-cli${RESET3} to update`;
   const visibleLine1 = `Update available! ${current} → ${latest}`;
   const visibleLine2 = `Run npm i -g polkadot-cli to update`;
   const innerWidth = Math.max(visibleLine1.length, visibleLine2.length) + 4;