diff --git a/CLAUDE.md b/CLAUDE.md
index 407d9f8..3e5866a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -53,6 +53,19 @@ development topics:
 - `docs/src/program/algorithm-index.md` algorithm
   documentation
 
+## Algorithm registry
+
+`docs/algorithms/registry.json` is the central mapping
+between algorithm specifications (`.tex` pseudocode in
+`docs/algorithms/`) and their assembly implementations
+(`.s` files in `program/src/dropset/`). Each entry maps
+an algorithm name to its `asm` file path. The registry
+also contains `syscalls` (Solana runtime syscall URLs)
+and `cpis` (cross-program invocation target URLs).
+
+Use the registry when comparing spec vs implementation,
+e.g. verifying a `.tex` algorithm matches its `.s` file.
+
 ## Key commands
 
 ```bash
diff --git a/cfg/dictionary.txt b/cfg/dictionary.txt
index 6b7ccf1..3a8f034 100644
--- a/cfg/dictionary.txt
+++ b/cfg/dictionary.txt
@@ -2,6 +2,7 @@ bindgen
 clippy
 clrs
 codegen
+cpis
 dasmac
 dropset
 dtolnay
diff --git a/docs/.vitepress/buildAlgorithmIndex.js b/docs/.vitepress/buildAlgorithmIndex.js
index 7ebb455..12aadfa 100644
--- a/docs/.vitepress/buildAlgorithmIndex.js
+++ b/docs/.vitepress/buildAlgorithmIndex.js
@@ -2,6 +2,8 @@
 // test case files for "// Verifies:" tags. Outputs algorithms/index.json
 // with deps, reverse deps, page locations, and associated test cases.
 // Algorithm name is the filename stem (used as key and display name).
+// The manually maintained registry.json maps each algorithm to its
+// assembly implementation and defines external syscall URLs.
 
 import { readFileSync, writeFileSync, readdirSync } from "fs";
 import { join, basename, relative } from "path";
@@ -17,6 +19,9 @@ const CASES_DIR = join(
   "cases",
 );
 const OUTPUT = join(ALGO_DIR, "index.json");
+const REGISTRY = JSON.parse(
+  readFileSync(join(ALGO_DIR, "registry.json"), "utf-8"),
+);
 
 // Recursively find all .md files under a directory.
 function findMdFiles(dir) {
@@ -42,10 +47,17 @@ export function buildAlgorithmIndex() {
 
     const calls = new Set();
     const syscalls = new Set();
-    for (const match of code.matchAll(/\\CALL\{([\w-]+)\}/g)) {
+    const cpis = new Set();
+    for (const match of code.matchAll(
+      /\\CALL\{([\w-]+)\}(?:\{([\w-:]+)\})?/g,
+    )) {
       if (match[1] === name) continue;
       if (match[1].startsWith("sol-")) {
         syscalls.add(match[1].replace(/-/g, "_"));
+        // Capture CPI target if present (e.g. sol-invoke-signed-c with arg).
+        if (match[2]) {
+          cpis.add(match[2].replace(/-/g, "_"));
+        }
       } else {
         calls.add(match[1]);
       }
@@ -55,10 +67,23 @@ export function buildAlgorithmIndex() {
       page: null,
       calls: [...calls],
       syscalls: [...syscalls],
+      cpis: [...cpis],
       calledBy: [],
     };
   }
 
+  // Validate registry against .tex files.
+  const texNames = new Set(Object.keys(index));
+  const regNames = new Set(Object.keys(REGISTRY.algorithms));
+  for (const name of texNames) {
+    if (!regNames.has(name))
+      throw new Error(`${name}.tex has no entry in registry.json`);
+  }
+  for (const name of regNames) {
+    if (!texNames.has(name))
+      throw new Error(`registry.json lists "${name}" but no .tex file exists`);
+  }
+
   // Filter calls to only reference known algorithms (removes notation-only
   // names like "Store" that have no .tex definition).
   for (const entry of Object.values(index)) {
@@ -69,7 +94,7 @@ export function buildAlgorithmIndex() {
   for (const fullPath of findMdFiles(SRC_DIR)) {
     const md = readFileSync(fullPath, "utf-8");
     const relPath = relative(SRC_DIR, fullPath);
-    for (const match of md.matchAll(/<Algorithm\s+tex="([\w-]+)"/g)) {
+    for (const match of md.matchAll(/<Algorithm\s+id="([\w-]+)"/g)) {
       const name = match[1];
       if (index[name]) {
         // Convert file path to VitePress page path.
diff --git a/docs/.vitepress/components/Algorithm.vue b/docs/.vitepress/components/Algorithm.vue
index 802744d..4a776d9 100644
--- a/docs/.vitepress/components/Algorithm.vue
+++ b/docs/.vitepress/components/Algorithm.vue
@@ -2,10 +2,10 @@
 <!-- cspell:word linenum -->
 <!-- cspell:word texttt -->
 <template>
-  <!-- Anchor: #algo-ref-<tex> for cross-page and in-page linking. -->
-  <div :id="`algo-ref-${tex}`">
+  <!-- Anchor: #algo-ref-<id> for cross-page and in-page linking. -->
+  <div :id="`algo-ref-${id}`">
     <div ref="container" class="pseudocode-container">
-      <div v-if="asm" ref="asmBlock" class="asm-block"></div>
+      <div v-if="asmFile" ref="asmBlock" class="asm-block"></div>
       <div ref="testsBlock" class="tests-block"></div>
       <div v-if="calls.length" class="pseudocode-links pseudocode-links-below">
         <div class="pseudocode-link-row">
@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, computed, onMounted } from "vue";
 import "pseudocode/build/pseudocode.min.css";
 import algorithmIndex from "../../algorithms/index.json";
 import {
@@ -44,7 +44,9 @@ import {
   GH_BASE,
   GH_ROOT,
   asmModules,
+  registry,
   syscallRegistry,
+  cpiRegistry,
 } from "./paths.js";
 import { isRestoring } from "../theme/scrollPreserve.js";
 
@@ -62,14 +64,16 @@ const testCaseModules = import.meta.glob("../../../tests/tests/cases/*.rs", {
   import: "default",
 });
 
-// Props: tex is the .tex filename, asm is the optional assembly source file.
+// Props: id is the algorithm name (matches .tex filename and registry key).
 const props = defineProps({
-  tex: { type: String, required: true },
-  asm: { type: String, default: "" },
+  id: { type: String, required: true },
   lineNumber: { type: Boolean, default: true },
   lineNumberPunc: { type: String, default: "" },
 });
 
+// Resolve assembly file from registry.
+const asmFile = computed(() => registry.algorithms[props.id]?.asm || "");
+
 const container = ref(null);
 const asmBlock = ref(null);
 const testsBlock = ref(null);
@@ -112,21 +116,27 @@ onMounted(async () => {
     const pseudocode = await import("pseudocode");
 
     // Load .tex source at build time via glob import.
-    const texLoader = texModules[`../../algorithms/${props.tex}.tex`];
-    if (!texLoader) throw new Error(`Unknown algorithm: ${props.tex}`);
+    const texLoader = texModules[`../../algorithms/${props.id}.tex`];
+    if (!texLoader) throw new Error(`Unknown algorithm: ${props.id}`);
     const code = await texLoader();
 
     // Resolve forward and reverse deps from the algorithm index.
-    const entry = algorithmIndex[props.tex];
+    const entry = algorithmIndex[props.id];
     if (entry) {
       const syscallLinks = (entry.syscalls || []).map((name) => ({
         name,
         href: syscallRegistry[name],
         external: true,
       }));
+      const cpiLinks = (entry.cpis || []).map((name) => ({
+        name,
+        href: cpiRegistry[name],
+        external: true,
+      }));
       calls.value = [
         ...resolveLinks(entry.calls, algorithmIndex),
         ...syscallLinks,
+        ...cpiLinks,
       ];
       calledBy.value = resolveLinks(entry.calledBy, algorithmIndex);
       tests.value = entry.tests || [];
@@ -149,6 +159,19 @@ onMounted(async () => {
     );
     container.value.insertBefore(rendered, container.value.firstChild);
 
+    // Remove the extra indentation pseudocode.js adds to prelude
+    // comments (those in .ps-block divs directly under .ps-algorithmic
+    // that contain no .ps-line children).
+    rendered
+      .querySelectorAll(".ps-algorithmic > .ps-block")
+      .forEach((block) => {
+        if (
+          !block.querySelector(".ps-line") &&
+          block.querySelector(".ps-comment")
+        )
+          block.style.marginLeft = "0";
+      });
+
     // Indent comments that precede a block so they align with the
     // block's first line rather than the parent control keyword.
     rendered.querySelectorAll(".ps-comment").forEach((span) => {
@@ -169,21 +192,48 @@ onMounted(async () => {
 
     // Turn \CALL{Name} references into clickable links.
     // sol-* names are converted to underscore form and linked to the
-    // external source via syscalls.json; others link to local algorithms.
+    // external source via the registry; others link to local algorithms.
+    // When a syscall has a CPI argument (e.g. \CALL{sol-invoke-signed-c}
+    // {system-program::CreateAccount}), the argument text is replaced
+    // with a linked CPI target inside parentheses.
+    //
+    // pseudocode.js renders both cases as a single text node after the
+    // funcname span:
+    //   \CALL{f}{}    → <span class="ps-funcname">f</span>()
+    //   \CALL{f}{arg} → <span class="ps-funcname">f</span>(arg)
     rendered.querySelectorAll(".ps-funcname").forEach((span) => {
       const name = span.textContent.trim();
       const syscallKey = name.replace(/-/g, "_");
       if (syscallRegistry[syscallKey]) {
+        let next = span.nextSibling;
+        if (next?.nodeType === Node.TEXT_NODE) {
+          // Extract the parenthesised content from the text node.
+          const m = next.textContent.match(/^\(([^)]*)\)/);
+          if (m) {
+            const argText = m[1];
+            // Strip the entire "(...)" from the text node.
+            next.textContent = next.textContent.slice(m[0].length);
+            if (argText) {
+              // CPI target present: convert to underscored display name.
+              const cpiName = argText.replace(/-/g, "_");
+              const cpiEl = document.createElement("a");
+              if (cpiRegistry[cpiName]) {
+                cpiEl.href = cpiRegistry[cpiName];
+                cpiEl.target = "_blank";
+              }
+              cpiEl.className = "ps-funcname ps-syscall";
+              cpiEl.textContent = cpiName;
+              span.after("(", cpiEl, ")");
+            }
+            // Empty args: "()" stripped, nothing inserted.
+          }
+        }
+        // Replace the funcname span with a syscall link.
         const a = document.createElement("a");
         a.href = syscallRegistry[syscallKey];
         a.target = "_blank";
         a.className = "ps-funcname ps-syscall";
         a.textContent = syscallKey;
-        // Strip the trailing "()" that pseudocode.js emits for \CALL.
-        let next = span.nextSibling;
-        if (next?.nodeType === Node.TEXT_NODE) {
-          next.textContent = next.textContent.replace(/^\(\)/, "");
-        }
         span.replaceWith(a);
       } else if (algorithmIndex[name]) {
         const a = document.createElement("a");
@@ -195,9 +245,10 @@ onMounted(async () => {
     });
 
     // Load and highlight assembly source if specified.
-    if (props.asm) {
-      const asmLoader = asmModules[`${ASM_BASE}${props.asm}.s`];
-      if (!asmLoader) throw new Error(`Unknown assembly file: ${props.asm}`);
+    if (asmFile.value) {
+      const asmLoader = asmModules[`${ASM_BASE}${asmFile.value}.s`];
+      if (!asmLoader)
+        throw new Error(`Unknown assembly file: ${asmFile.value}`);
       asmCode.value = (await asmLoader()).trimEnd();
 
       const shiki = await import("shiki");
@@ -248,7 +299,7 @@ onMounted(async () => {
 
       asmBlock.value.innerHTML =
         `<details class="details custom-block">` +
-        `<summary>Implementation: <a href="${GH_BASE}${props.asm}.s" target="_blank">${props.asm}.s</a></summary>` +
+        `<summary>Implementation: <a href="${GH_BASE}${asmFile.value}.s" target="_blank">${asmFile.value}.s</a></summary>` +
         `<div class="language-asm vp-adaptive-theme line-numbers-mode">` +
         `<button title="Copy Code" class="copy"></button>` +
         `<span class="lang">asm</span>` +
diff --git a/docs/.vitepress/components/AlgorithmIndex.vue b/docs/.vitepress/components/AlgorithmIndex.vue
index 5e6be8a..a934d5f 100644
--- a/docs/.vitepress/components/AlgorithmIndex.vue
+++ b/docs/.vitepress/components/AlgorithmIndex.vue
@@ -10,27 +10,55 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, computed, onMounted } from "vue";
 import algorithmIndex from "../../algorithms/index.json";
-import { syscallRegistry } from "./paths.js";
+import { syscallRegistry, cpiRegistry } from "./paths.js";
+
+const props = defineProps({
+  root: { type: String, default: "" },
+});
 
 const chart = ref(null);
 
-// Build algorithm list from the build-time index.
-const algorithms = Object.keys(algorithmIndex)
-  .map((name) => ({
-    name,
-    href: `${algorithmIndex[name].page || "/"}#algo-ref-${name}`,
-  }))
-  .sort((a, b) => a.name.localeCompare(b.name));
+// Collect an algorithm and all its transitive deps (calls only).
+function collectDeps(name, index, result = new Set()) {
+  if (!index[name] || result.has(name)) return result;
+  result.add(name);
+  for (const dep of index[name].calls) {
+    collectDeps(dep, index, result);
+  }
+  return result;
+}
+
+// Filter the index to a subset when root is specified.
+const filteredIndex = computed(() => {
+  if (!props.root) return algorithmIndex;
+  const names = collectDeps(props.root, algorithmIndex);
+  const subset = {};
+  for (const name of names) {
+    subset[name] = algorithmIndex[name];
+  }
+  return subset;
+});
+
+// Build algorithm list from the (possibly filtered) index.
+const algorithms = computed(() =>
+  Object.keys(filteredIndex.value)
+    .map((name) => ({
+      name,
+      href: `${algorithmIndex[name].page || "/"}#algo-ref-${name}`,
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name)),
+);
 
 // Build a Mermaid graph definition from the algorithm index.
 function buildGraph(index) {
-  const lines = ["graph TD"];
+  const lines = ["graph LR"];
   const syscallNodes = new Set();
+  const cpiNodes = new Set();
   for (const [name, entry] of Object.entries(index)) {
     const href = `${entry.page || "/"}#algo-ref-${name}`;
-    lines.push(`  ${name}["${name}"]`);
+    lines.push(`  ${name}["${name}"]:::algo`);
     lines.push(`  click ${name} "${href}"`);
     for (const dep of entry.calls) {
       lines.push(`  ${name} --> ${dep}`);
@@ -45,10 +73,22 @@ function buildGraph(index) {
       }
       lines.push(`  ${name} --> ${sc}`);
     }
+    for (const cpi of entry.cpis || []) {
+      // Mermaid node IDs cannot contain colons, so replace with underscores.
+      const nodeId = cpi.replace(/::/g, "__");
+      if (!cpiNodes.has(cpi)) {
+        cpiNodes.add(cpi);
+        lines.push(`  ${nodeId}(["\`**${cpi}**\`"]):::cpi`);
+        if (cpiRegistry[cpi]) {
+          lines.push(`  click ${nodeId} "${cpiRegistry[cpi]}" _blank`);
+        }
+      }
+      lines.push(`  ${name} --> ${nodeId}`);
+    }
   }
-  lines.push(
-    "  classDef syscall fill:#e8e8e8,stroke:#999,stroke-dasharray:5 5",
-  );
+  lines.push("  classDef algo fill:#d4edda,stroke:#8aba9a");
+  lines.push("  classDef syscall fill:#e8e8e8,stroke:#999");
+  lines.push("  classDef cpi fill:#c4d9ed,stroke:#7a9bba");
   return lines.join("\n");
 }
 
@@ -56,9 +96,14 @@ onMounted(async () => {
   try {
     // Render Mermaid dep chart.
     const mermaid = (await import("mermaid")).default;
-    mermaid.initialize({ startOnLoad: false, theme: "neutral" });
-    const graphDef = buildGraph(algorithmIndex);
-    const { svg } = await mermaid.render("algo-dep-chart", graphDef);
+    mermaid.initialize({
+      startOnLoad: false,
+      theme: "neutral",
+      flowchart: { nodeSpacing: 20, rankSpacing: 30 },
+    });
+    const graphDef = buildGraph(filteredIndex.value);
+    const chartId = `algo-dep-chart-${props.root || "all"}`;
+    const { svg } = await mermaid.render(chartId, graphDef);
     chart.value.innerHTML = svg;
   } catch (e) {
     console.error("AlgorithmIndex error:", e);
diff --git a/docs/.vitepress/components/paths.js b/docs/.vitepress/components/paths.js
index 407a683..98d1cd9 100644
--- a/docs/.vitepress/components/paths.js
+++ b/docs/.vitepress/components/paths.js
@@ -1,6 +1,9 @@
-// External syscall registry. Keys are underscore-separated names
-// (e.g. "sol_try_find_program_address"), values are source URLs.
-export { default as syscallRegistry } from "../../algorithms/syscalls.json";
+// Algorithm registry. Manually maintained mapping of algorithm names
+// to assembly implementations, external syscall URLs, and CPI target URLs.
+import _registry from "../../algorithms/registry.json";
+export const registry = _registry;
+export const syscallRegistry = _registry.syscalls;
+export const cpiRegistry = _registry.cpis;
 
 // Relative path from this directory to the assembly source root.
 // Used as the key prefix when looking up files in asmModules.
diff --git a/docs/algorithms/INIT-MARKET-PDA.tex b/docs/algorithms/INIT-MARKET-PDA.tex
index 9948bce..72b4d21 100644
--- a/docs/algorithms/INIT-MARKET-PDA.tex
+++ b/docs/algorithms/INIT-MARKET-PDA.tex
@@ -88,7 +88,7 @@
     \texttt{register\_misc.CREATE\_ACCOUNT\_N\_ACCOUNTS}
   \STATE syscall.seeds = \&frame.signers\_seeds
   \STATE syscall.seeds\_len = \texttt{register\_misc.N\_PDA\_SIGNERS}
-  \STATE \CALL{sol-invoke-signed-c}{}
+  \STATE \CALL{sol-invoke-signed-c}{system-program::CreateAccount}
   \COMMENT{Initialize market header next pointer and store derived bump.}
   \STATE input.market.data.next = input + \texttt{input\_buffer.MARKET\_DATA\_BYTES}
   \STATE input.market.data.bump = frame.bump
diff --git a/docs/algorithms/INIT-VAULT.tex b/docs/algorithms/INIT-VAULT.tex
index fa6f5fe..edbde2b 100644
--- a/docs/algorithms/INIT-VAULT.tex
+++ b/docs/algorithms/INIT-VAULT.tex
@@ -84,7 +84,7 @@
     \STATE syscall.account\_infos\_len =
       \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_N\_ACCOUNTS}
     \STATE syscall.seeds\_len = \texttt{token.GET\_ACCOUNT\_DATA\_SIZE\_N\_SEEDS}
-    \STATE \CALL{sol-invoke-signed-c}{}
+    \STATE \CALL{sol-invoke-signed-c}{spl-token-2022::GetAccountDataSize}
     \COMMENT{Get return data.}
     \STATE syscall.bytes = \&frame.token\_account\_data\_size
     \STATE syscall.bytes\_len = \texttt{u64.size}
@@ -138,7 +138,7 @@
     \texttt{register\_misc.CREATE\_ACCOUNT\_N\_ACCOUNTS}
   \STATE syscall.seeds = \&frame.signers\_seeds
   \STATE syscall.seeds\_len = \texttt{register\_misc.N\_PDA\_SIGNERS}
-  \STATE \CALL{sol-invoke-signed-c}{}
+  \STATE \CALL{sol-invoke-signed-c}{system-program::CreateAccount}
   \COMMENT{Assign CPI account fields for vault.}
   \STATE frame.cpi[0].meta.pubkey = \&acct.address
   \STATE frame.cpi[0].info.key = \&acct.address
@@ -182,7 +182,7 @@
   \STATE syscall.account\_infos\_len =
     \texttt{token.INITIALIZE\_ACCOUNT\_2\_N\_ACCOUNTS}
   \STATE syscall.seeds\_len = \texttt{token.INITIALIZE\_ACCOUNT\_2\_N\_SEEDS}
-  \STATE \CALL{sol-invoke-signed-c}{}
+  \STATE \CALL{sol-invoke-signed-c}{spl-token::InitializeAccount2}
 \ENDFUNCTION
 \end{algorithmic}
 \end{algorithm}
diff --git a/docs/algorithms/registry.json b/docs/algorithms/registry.json
new file mode 100644
index 0000000..ccf6c21
--- /dev/null
+++ b/docs/algorithms/registry.json
@@ -0,0 +1,26 @@
+{
+  "algorithms": {
+    "ENTRYPOINT": {
+      "asm": "entrypoint"
+    },
+    "INIT-MARKET-PDA": {
+      "asm": "market/init_market_pda"
+    },
+    "INIT-VAULT": {
+      "asm": "market/init_vault"
+    },
+    "REGISTER-MARKET": {
+      "asm": "market/register"
+    }
+  },
+  "cpis": {
+    "spl_token::InitializeAccount2": "https://github.com/solana-program/token/blob/program@v9.0.0/interface/src/instruction.rs#L352-L365",
+    "spl_token_2022::GetAccountDataSize": "https://github.com/solana-program/token-2022/blob/interface@v2.1.0/interface/src/instruction.rs#L487-L499",
+    "system_program::CreateAccount": "https://github.com/anza-xyz/solana-sdk/blob/sdk@v4.0.1/system-interface/src/instruction.rs#L93-L107"
+  },
+  "syscalls": {
+    "sol_get_return_data": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/return_data.inc#L27-L35",
+    "sol_invoke_signed_c": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/cpi.inc#L56-L90",
+    "sol_try_find_program_address": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/pubkey.inc#L74-L83"
+  }
+}
diff --git a/docs/algorithms/syscalls.json b/docs/algorithms/syscalls.json
deleted file mode 100644
index 1accb1d..0000000
--- a/docs/algorithms/syscalls.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sol_get_return_data": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/return_data.inc#L27-L35",
-  "sol_invoke_signed_c": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/cpi.inc#L56-L90",
-  "sol_try_find_program_address": "https://github.com/anza-xyz/agave/blob/v4.0.0-beta.5/platform-tools-sdk/sbf/c/inc/sol/inc/pubkey.inc#L74-L83"
-}
diff --git a/docs/src/development/docs-engine.md b/docs/src/development/docs-engine.md
index 5ebf2e4..a74cca4 100644
--- a/docs/src/development/docs-engine.md
+++ b/docs/src/development/docs-engine.md
@@ -16,39 +16,46 @@ Three custom Vue components are registered globally in the [VitePress theme]:
 ### `<Algorithm>`
 
 Renders a CLRS-style pseudocode specification from a `.tex` file in the
-[`algorithms/`] directory, with an optional collapsible assembly implementation.
+[`algorithms/`] directory, with a collapsible assembly implementation resolved
+from the [algorithm registry].
 
 <Include vitepress="components/Algorithm" collapsed/>
 
 <!-- markdownlint-disable MD013 -->
 
-| Prop             | Type      | Required | Description                                                                     |
-| ---------------- | --------- | -------- | ------------------------------------------------------------------------------- |
-| `tex`            | `String`  | yes      | Name of the `.tex` file (without extension) in `algorithms/`                    |
-| `asm`            | `String`  | no       | Name of the `.s` file (without extension) to show as collapsible implementation |
-| `lineNumber`     | `Boolean` | no       | Show line numbers in pseudocode (default: `true`)                               |
-| `lineNumberPunc` | `String`  | no       | Punctuation after line numbers (default: `""`)                                  |
+| Prop             | Type      | Required | Description                                               |
+| ---------------- | --------- | -------- | --------------------------------------------------------- |
+| `id`             | `String`  | yes      | Algorithm name (matches `.tex` filename and registry key) |
+| `lineNumber`     | `Boolean` | no       | Show line numbers in pseudocode (default: `true`)         |
+| `lineNumberPunc` | `String`  | no       | Punctuation after line numbers (default: `""`)            |
 
 <!-- markdownlint-enable MD013 -->
 
 Usage:
 
 ```md
-<Algorithm tex="ENTRYPOINT" asm="entrypoint"/>
+<Algorithm id="ENTRYPOINT"/>
 ```
 
-The component automatically resolves `\CALL{Name}` references in the `.tex`
-source into clickable cross-links using the build-time algorithm index. Forward
-dependencies ("Calls") and reverse dependencies ("Called by") are displayed
-below the pseudocode.
+The `id` prop is used to look up the `.tex` source file and the assembly
+implementation from the [algorithm registry]. The component automatically
+resolves `\CALL{Name}` references in the `.tex` source into clickable
+cross-links using the build-time algorithm index. Forward dependencies ("Calls")
+and reverse dependencies ("Called by") are displayed below the pseudocode.
 
 `\CALL` targets that begin with `sol-` are treated as external syscalls. The
 build-time index records them separately, and at render time the hyphenated name
 is converted to underscore form (e.g. `sol-try-find-program-address` becomes
 `sol_try_find_program_address`) and linked to its upstream source definition via
-the [syscall registry]. The trailing `()` that pseudocode.js emits for `\CALL`
-is stripped for syscalls so they render as plain linked names. Syscalls appear
-in the "Calls" section alongside algorithm dependencies.
+the [algorithm registry]. When a syscall has empty arguments (`\CALL{sol-*}{}`),
+the trailing `()` is stripped so it renders as a plain linked name. When a
+syscall has a CPI target argument (e.g.
+`\CALL{sol-invoke-signed-c}{system-program::CreateAccount}`), the parentheses
+are preserved and the argument is rendered as a linked CPI target using the
+`cpis` section of the [algorithm registry]. The displayed name converts hyphens
+to underscores (e.g. `system_program::CreateAccount`). Syscalls and CPI targets
+appear in the "Calls" section alongside algorithm dependencies, and CPI targets
+are included in the [algorithm index] dependency chart.
 
 If the algorithm has associated
 [test cases], a collapsed **Tests** section is
@@ -99,15 +106,28 @@ Usage:
 
 ### `<AlgorithmIndex>`
 
-Renders a listing of all algorithms with a Mermaid dependency graph. Takes no
-props. It reads directly from the build-time `algorithms/index.json` file.
-External syscalls appear as dashed stadium-shaped nodes linked to their upstream
-source via the [syscall registry].
+Renders a listing of all algorithms with a left-to-right Mermaid dependency
+graph. It reads from the build-time `algorithms/index.json` file and the
+[algorithm registry]. Algorithms are green, syscalls are grey, and CPI targets
+are blue. All external nodes (syscalls and CPIs) use stadium shapes and link to
+their upstream source definitions.
+
+<!-- markdownlint-disable MD013 -->
+
+| Prop   | Type     | Required | Description                                                       |
+| ------ | -------- | -------- | ----------------------------------------------------------------- |
+| `root` | `String` | no       | Algorithm name to scope the graph to (shows only its dep subtree) |
+
+<!-- markdownlint-enable MD013 -->
 
 Usage:
 
 ```md
-<AlgorithmIndex />
+<!-- Full index (all algorithms) -->
+<AlgorithmIndex/>
+
+<!-- Scoped to one algorithm and its transitive dependencies -->
+<AlgorithmIndex root="REGISTER-MARKET"/>
 ```
 
 <Include vitepress="components/AlgorithmIndex" collapsed/>
@@ -133,14 +153,23 @@ the exported `isRestoring()` flag to avoid fighting over scroll position.
 
 Configures file resolution for the `<Algorithm>` and `<Include>` components:
 assembly source root, config/root file mappings, Rust crate mappings, VitePress
-file mappings, GitHub URL bases, and the [syscall registry] export.
+file mappings, GitHub URL bases, and the [algorithm registry] re-export.
+
+### [Algorithm registry][`registry.json`]
+
+The manually maintained `algorithms/registry.json` contains three sections:
 
-### [Syscall registry][`syscalls.json`]
+- **`algorithms`**: keys are algorithm names (matching `.tex` filenames), each
+  value contains an `asm` field pointing to the assembly source (without `.s`
+  extension).
+- **`syscalls`**: maps underscore-separated syscall names
+  (e.g. `sol_try_find_program_address`) to upstream source URLs.
+- **`cpis`**: maps CPI target names in `program::Instruction` form
+  (e.g. `system_program::CreateAccount`) to upstream source URLs. These are
+  referenced from `.tex` files via
+  `\CALL{sol-invoke-signed-c}{program::Instruction}`.
 
-External syscalls referenced by `\CALL{sol-*}` in `.tex` files are registered in
-`algorithms/syscalls.json`. Keys are the underscore-separated display name
-(e.g. `sol_try_find_program_address`), values are the upstream source URL. The
-registry is re-exported by [`paths.js`] and consumed by both `<Algorithm>` and
+The registry is re-exported by [`paths.js`] and consumed by `<Algorithm>` and
 `<AlgorithmIndex>` at render time.
 
 ### Algorithm index builder
@@ -148,12 +177,13 @@ registry is re-exported by [`paths.js`] and consumed by both `<Algorithm>` and
 Runs at dev server startup and rebuilds whenever `.tex`, `.md`, or test case
 `.rs` files change. Any of these changes also trigger a scroll-preserving reload
 via the `algo-reload` HMR event (see [scroll preservation](#scroll-preservation)
-above). Scans `.tex` files for `\CALL` dependencies, `.md` files for
-`<Algorithm>` usage, and test case files under `tests/tests/cases/` for
-[`// Verifies: ALGORITHM-NAME`][test cases] comments. `\CALL` targets beginning
-with `sol-` are classified as external syscalls (with hyphens converted to
-underscores). Outputs `algorithms/index.json` with forward deps, reverse deps,
-syscalls, page locations, and associated test cases.
+above). Validates that every `.tex` file has a corresponding entry in the
+[algorithm registry] (and vice versa). Scans `.tex` files for `\CALL`
+dependencies, `.md` files for `<Algorithm>` usage, and test case files under
+`tests/tests/cases/` for [`// Verifies: ALGORITHM-NAME`][test cases] comments.
+`\CALL` targets beginning with `sol-` are classified as external syscalls (with
+hyphens converted to underscores). Outputs `algorithms/index.json` with forward
+deps, reverse deps, syscalls, page locations, and associated test cases.
 
 <Include vitepress="buildAlgorithmIndex" collapsed/>
 
@@ -166,8 +196,8 @@ syscalls, page locations, and associated test cases.
 [Mermaid]: https://mermaid.js.org/
 [`paths.js`]: https://github.com/DASMAC-com/dropset-beta/blob/main/docs/.vitepress/components/paths.js
 [`algorithms/`]: https://github.com/DASMAC-com/dropset-beta/tree/main/docs/algorithms
-[`syscalls.json`]: https://github.com/DASMAC-com/dropset-beta/blob/main/docs/algorithms/syscalls.json
-[syscall registry]: #syscall-registry
+[`registry.json`]: https://github.com/DASMAC-com/dropset-beta/blob/main/docs/algorithms/registry.json
+[algorithm registry]: #algorithm-registry
 [algorithm index]: ../program/algorithm-index
 [`scrollPreserve.js`]: https://github.com/DASMAC-com/dropset-beta/blob/main/docs/.vitepress/theme/scrollPreserve.js
 [test cases]: tests#verifies-convention
diff --git a/docs/src/program/inputs.md b/docs/src/program/inputs.md
index fa1b718..16a050c 100644
--- a/docs/src/program/inputs.md
+++ b/docs/src/program/inputs.md
@@ -6,7 +6,7 @@ the instruction discriminant to the appropriate handler.
 
 ## Entrypoint
 
-<Algorithm tex="ENTRYPOINT" asm="entrypoint"/>
+<Algorithm id="ENTRYPOINT"/>
 
 ## Input buffer
 
diff --git a/docs/src/program/markets.md b/docs/src/program/markets.md
index 43e98b2..e4f7c52 100644
--- a/docs/src/program/markets.md
+++ b/docs/src/program/markets.md
@@ -20,16 +20,20 @@ The instruction requires the following accounts:
 
 <Include rs="interface::market#register_market_accounts" collapsed/>
 
-<Algorithm tex="REGISTER-MARKET" asm="market/register"/>
+## Market registration algorithms
 
-## Helpers
+<AlgorithmIndex root="REGISTER-MARKET"/>
+
+### Main handler
+
+<Algorithm id="REGISTER-MARKET"/>
 
 ### Market PDA initialization
 
-<Algorithm tex="INIT-MARKET-PDA" asm="market/init_market_pda"/>
+<Algorithm id="INIT-MARKET-PDA"/>
 
 ### Vault initialization
 
-<Algorithm tex="INIT-VAULT" asm="market/init_vault"/>
+<Algorithm id="INIT-VAULT"/>
 
 [input buffer]: inputs#input-buffer