naracli 1.0.32 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naracli",
-  "version": "1.0.32",
+  "version": "1.0.37",
   "description": "CLI for the Nara chain (Solana-compatible)",
   "module": "index.ts",
   "main": "index.ts",
@@ -12,7 +12,10 @@
   "scripts": {
     "cli": "node --require ./bin/env-loader.cjs --import tsx bin/nara-cli.ts",
     "build": "node scripts/build.cjs",
-    "test": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest.test.ts src/tests/skills.test.ts src/tests/zkid.test.ts src/tests/agent-registry.test.ts",
+    "test": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/validation.test.ts src/tests/config.test.ts src/tests/agent.test.ts src/tests/quest.test.ts src/tests/skills.test.ts src/tests/zkid.test.ts src/tests/agent-registry.test.ts",
+    "test:validation": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/validation.test.ts",
+    "test:config": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/config.test.ts",
+    "test:agent-cli": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/agent.test.ts",
     "test:quest": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/quest.test.ts",
     "test:skills": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/skills.test.ts",
     "test:zkid": "node --require ./bin/env-loader.cjs --import tsx --test --experimental-test-isolation=none --test-reporter spec src/tests/zkid.test.ts",
@@ -53,7 +56,7 @@
     "bs58": "^6.0.0",
     "commander": "^12.1.0",
     "ed25519-hd-key": "^1.3.0",
-    "nara-sdk": "^1.0.32",
+    "nara-sdk": "^1.0.37",
     "picocolors": "^1.1.1"
   }
 }

package/src/cli/commands/agent.ts

@@ -15,7 +15,6 @@ import {
 import type { GlobalOptions } from "../types";
 import {
   registerAgent,
-  getAgentRecord,
   getAgentInfo,
   getAgentMemory,
   setBio,
@@ -25,6 +24,7 @@ import {
   transferAgentAuthority,
   deleteAgent,
   logActivity,
+  setReferral as setReferralOnChain,
 } from "nara-sdk";
 import { readFileSync } from "node:fs";
 import { addAgentId } from "../utils/agent-config";
@@ -32,22 +32,23 @@ import { validateName } from "../utils/validation";
 
 // ─── Command handlers ────────────────────────────────────────────
 
-async function handleAgentRegister(agentId: string, options: GlobalOptions) {
+async function handleAgentRegister(agentId: string, options: GlobalOptions & { referral?: string }) {
   validateName(agentId, "Agent ID");
   const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
   const wallet = await loadWallet(options.wallet);
 
   if (!options.json) printInfo(`Registering agent "${agentId}"...`);
-  const result = await registerAgent(connection, wallet, agentId);
+  const result = await registerAgent(connection, wallet, agentId, undefined, options.referral);
   if (!options.json) printSuccess(`Agent "${agentId}" registered!`);
-  addAgentId(agentId);
+  addAgentId(agentId, rpcUrl);
 
   if (options.json) {
-    formatOutput({ agentId, signature: result.signature, agentPubkey: result.agentPubkey.toBase58() }, true);
+    formatOutput({ agentId, referral: options.referral ?? null, signature: result.signature, agentPubkey: result.agentPubkey.toBase58() }, true);
   } else {
     console.log(`  Transaction: ${result.signature}`);
     console.log(`  Agent PDA: ${result.agentPubkey.toBase58()}`);
+    if (options.referral) console.log(`  Referral: ${options.referral}`);
   }
 }
 
@@ -225,6 +226,22 @@ async function handleAgentDelete(agentId: string, options: GlobalOptions) {
   }
 }
 
+async function handleAgentSetReferral(agentId: string, referralAgentId: string, options: GlobalOptions) {
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const connection = new Connection(rpcUrl, "confirmed");
+  const wallet = await loadWallet(options.wallet);
+
+  if (!options.json) printInfo(`Setting referral for "${agentId}" to "${referralAgentId}"...`);
+  const signature = await setReferralOnChain(connection, wallet, agentId, referralAgentId);
+  if (!options.json) printSuccess(`Referral set on-chain!`);
+
+  if (options.json) {
+    formatOutput({ agentId, referral: referralAgentId, signature }, true);
+  } else {
+    console.log(`  Transaction: ${signature}`);
+  }
+}
+
 async function handleAgentLog(
   agentId: string,
   activity: string,
@@ -259,10 +276,11 @@ export function registerAgentCommands(program: Command): void {
   agent
     .command("register <agent-id>")
     .description("Register a new agent on-chain")
-    .action(async (agentId: string, _opts: any, cmd: Command) => {
+    .option("--referral <agent-id>", "Referral agent ID")
+    .action(async (agentId: string, opts: { referral?: string }, cmd: Command) => {
       try {
         const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
-        await handleAgentRegister(agentId, globalOpts);
+        await handleAgentRegister(agentId, { ...globalOpts, ...opts });
       } catch (error: any) {
         printError(error.message);
         process.exit(1);
@@ -381,6 +399,20 @@ export function registerAgentCommands(program: Command): void {
       }
     });
 
+  // agent set-referral
+  agent
+    .command("set-referral <agent-id> <referral-agent-id>")
+    .description("Set referral agent on-chain")
+    .action(async (agentId: string, referralAgentId: string, _opts: any, cmd: Command) => {
+      try {
+        const globalOpts = cmd.optsWithGlobals() as GlobalOptions;
+        await handleAgentSetReferral(agentId, referralAgentId, globalOpts);
+      } catch (error: any) {
+        printError(error.message);
+        process.exit(1);
+      }
+    });
+
   // agent log
   agent
     .command("log <agent-id> <activity> <log>")

package/src/cli/commands/config.ts

@@ -3,32 +3,50 @@
  */
 
 import { Command } from "commander";
-import { loadAgentConfig, saveAgentConfig } from "../utils/agent-config";
+import {
+  loadGlobalConfig,
+  saveGlobalConfig,
+  loadNetworkConfig,
+  rpcUrlToNetworkName,
+} from "../utils/agent-config";
+import { getRpcUrl } from "../utils/wallet";
 import { printError, printSuccess, formatOutput } from "../utils/output";
 import { DEFAULT_RPC_URL } from "nara-sdk";
 import type { GlobalOptions } from "../types";
 
 function handleConfigGet(options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const globalConfig = loadGlobalConfig();
+  const rpcUrl = getRpcUrl(options.rpcUrl);
+  const networkConfig = loadNetworkConfig(rpcUrl);
+  const networkName = rpcUrlToNetworkName(rpcUrl);
+
   const data = {
-    rpc_url: config.rpc_url ?? DEFAULT_RPC_URL,
-    wallet: config.wallet ?? "~/.config/nara/id.json",
-    rpc_url_custom: !!config.rpc_url,
-    wallet_custom: !!config.wallet,
+    rpc_url: globalConfig.rpc_url ?? DEFAULT_RPC_URL,
+    wallet: globalConfig.wallet ?? "~/.config/nara/id.json",
+    rpc_url_custom: !!globalConfig.rpc_url,
+    wallet_custom: !!globalConfig.wallet,
+    network: networkName,
+    agent_ids: networkConfig.agent_ids,
+    zk_ids: networkConfig.zk_ids,
   };
 
   if (options.json) {
     formatOutput(data, true);
   } else {
     console.log("");
-    console.log(`  RPC URL: ${data.rpc_url}${data.rpc_url_custom ? "" : " (default)"}`);
-    console.log(`  Wallet:  ${data.wallet}${data.wallet_custom ? "" : " (default)"}`);
+    console.log(`  RPC URL:  ${data.rpc_url}${data.rpc_url_custom ? "" : " (default)"}`);
+    console.log(`  Wallet:   ${data.wallet}${data.wallet_custom ? "" : " (default)"}`);
+    console.log(`  Network:  ${networkName}`);
+    if (networkConfig.agent_ids.length > 0)
+      console.log(`  Agents:   ${networkConfig.agent_ids.join(", ")}`);
+    if (networkConfig.zk_ids.length > 0)
+      console.log(`  ZK IDs:   ${networkConfig.zk_ids.join(", ")}`);
     console.log("");
   }
 }
 
 function handleConfigSet(key: string, value: string, options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const config = loadGlobalConfig();
 
   switch (key) {
     case "rpc-url":
@@ -41,18 +59,18 @@ function handleConfigSet(key: string, value: string, options: GlobalOptions) {
       throw new Error(`Unknown config key: "${key}". Valid keys: rpc-url, wallet`);
   }
 
-  saveAgentConfig(config);
+  saveGlobalConfig(config);
   if (!options.json) printSuccess(`Config "${key}" set to "${value}"`);
   if (options.json) formatOutput({ key, value }, true);
 }
 
 function handleConfigReset(key: string | undefined, options: GlobalOptions) {
-  const config = loadAgentConfig();
+  const config = loadGlobalConfig();
 
   if (!key) {
     delete config.rpc_url;
     delete config.wallet;
-    saveAgentConfig(config);
+    saveGlobalConfig(config);
     if (!options.json) printSuccess("All config reset to defaults");
   } else {
     switch (key) {
@@ -65,7 +83,7 @@ function handleConfigReset(key: string | undefined, options: GlobalOptions) {
       default:
         throw new Error(`Unknown config key: "${key}". Valid keys: rpc-url, wallet`);
     }
-    saveAgentConfig(config);
+    saveGlobalConfig(config);
     if (!options.json) printSuccess(`Config "${key}" reset to default`);
   }
 

package/src/cli/commands/quest.ts

@@ -22,7 +22,7 @@ import {
   parseQuestReward,
   type ActivityLog,
 } from "nara-sdk";
-import { loadAgentConfig } from "../utils/agent-config";
+import { loadNetworkConfig } from "../utils/agent-config";
 
 const DEFAULT_QUEST_RELAY_URL = process.env.QUEST_RELAY_URL || "https://quest-api.nara.build/";
 
@@ -59,7 +59,7 @@ function formatTimeRemaining(seconds: number): string {
 
 // ─── Command: quest get ──────────────────────────────────────────
 async function handleQuestGet(options: GlobalOptions) {
-  const rpcUrl = await getRpcUrl(options.rpcUrl);
+  const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
 
   let wallet: Keypair;
@@ -126,13 +126,14 @@ async function handleQuestAnswer(
   answer: string,
   options: GlobalOptions & { relay?: string; agent?: string; model?: string; referral?: string }
 ) {
-  const rpcUrl = await getRpcUrl(options.rpcUrl);
+  const rpcUrl = getRpcUrl(options.rpcUrl);
   const connection = new Connection(rpcUrl, "confirmed");
   const wallet = await loadWallet(options.wallet);
-  const agentConfig = loadAgentConfig();
-  const configAgentId = agentConfig.agent_ids[0];
+  const networkConfig = loadNetworkConfig(rpcUrl);
+  const configAgentId = networkConfig.agent_ids[0];
   const agent = options.agent ?? "naracli";
   const model = options.model ?? "";
+  const referral = options.referral;
 
   // 1. Fetch quest info
   let quest;
@@ -165,7 +166,7 @@ async function handleQuestAnswer(
 
   let proof;
   try {
-    proof = await generateProof(answer, quest.answerHash, wallet.publicKey);
+    proof = await generateProof(answer, quest.answerHash, wallet.publicKey, quest.round);
   } catch (err: any) {
     if (err.message?.includes("Assert Failed")) {
       printError("Wrong answer");
@@ -207,7 +208,7 @@ async function handleQuestAnswer(
     try {
       let activityLog: ActivityLog | undefined;
       if (configAgentId) {
-        activityLog = { agentId: configAgentId, activity: "PoMI", model, log: "", referralAgentId: options.referral };
+        activityLog = { agentId: configAgentId, activity: "PoMI", model, log: "", referralAgentId: referral };
       }
       const result = await submitAnswer(connection, wallet, proof.solana, agent, model, undefined, activityLog);
       printSuccess("Answer submitted!");

package/src/cli/commands/zkid.ts

@@ -27,7 +27,7 @@ import {
   ZKID_DENOMINATIONS,
 } from "nara-sdk";
 import BN from "bn.js";
-import { addZkId, loadAgentConfig } from "../utils/agent-config";
+import { addZkId, loadNetworkConfig } from "../utils/agent-config";
 
 // ─── Denomination helpers ────────────────────────────────────────
 
@@ -73,7 +73,7 @@ async function handleZkIdCreate(name: string, options: GlobalOptions) {
   if (!options.json) printInfo(`Registering ZK ID "${name}"...`);
   const signature = await createZkId(connection, wallet, name, idSecret);
   if (!options.json) printSuccess(`ZK ID "${name}" registered!`);
-  addZkId(name);
+  addZkId(name, rpcUrl);
 
   if (options.json) {
     formatOutput({ name, signature }, true);
@@ -149,12 +149,12 @@ async function handleZkIdScan(
   if (name) {
     names = [name];
   } else {
-    const config = loadAgentConfig();
-    if (config.zk_ids.length === 0) {
+    const networkConfig = loadNetworkConfig(rpcUrl);
+    if (networkConfig.zk_ids.length === 0) {
       printError("No ZK IDs in config. Provide a name or create a ZK ID first.");
       process.exit(1);
     }
-    names = config.zk_ids;
+    names = networkConfig.zk_ids;
   }
 
   const allResults: Array<{ name: string; deposits: any[] }> = [];

package/src/cli/utils/agent-config.ts

@@ -1,50 +1,155 @@
 /**
- * Agent config utilities - read/write ~/.config/nara/agent.json
+ * Agent config utilities
+ *
+ * Global config:  ~/.config/nara/config.json        — rpc_url, wallet
+ * Network config: ~/.config/nara/agent-{network}.json — agent_ids, zk_ids
+ *
+ * {network} is derived from the effective RPC URL:
+ *   https://mainnet-api.nara.build/ → mainnet-api-nara-build
+ *   https://devnet-api.nara.build/  → devnet-api-nara-build
+ *   http://127.0.0.1:8899/          → 127-0-0-1-8899
  */
 
-import { join, dirname } from "node:path";
+import { join } from "node:path";
 import { homedir } from "node:os";
-import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
+import { DEFAULT_RPC_URL } from "nara-sdk";
 
-const AGENT_CONFIG_PATH = join(homedir(), ".config", "nara", "agent.json");
+const CONFIG_DIR = join(homedir(), ".config", "nara");
+const GLOBAL_CONFIG_PATH = join(CONFIG_DIR, "config.json");
 
-export interface AgentConfig {
-  agent_ids: string[];
-  zk_ids: string[];
+// ─── URL → filename ─────────────────────────────────────────────
+
+export function rpcUrlToNetworkName(url: string): string {
+  let name = url.replace(/^https?:\/\//, "");
+  name = name.replace(/\/+$/, "");
+  name = name.replace(/[^a-zA-Z0-9-]/g, "-");
+  name = name.replace(/-+/g, "-");
+  name = name.replace(/^-|-$/g, "");
+  return name;
+}
+
+function networkConfigPath(rpcUrl: string): string {
+  return join(CONFIG_DIR, `agent-${rpcUrlToNetworkName(rpcUrl)}.json`);
+}
+
+// ─── Global config (rpc_url, wallet) ─────────────────────────────
+
+export interface GlobalConfig {
   rpc_url?: string;
   wallet?: string;
 }
 
-const DEFAULT_CONFIG: AgentConfig = { agent_ids: [], zk_ids: [] };
+export function loadGlobalConfig(): GlobalConfig {
+  try {
+    const raw = readFileSync(GLOBAL_CONFIG_PATH, "utf-8");
+    const parsed = JSON.parse(raw);
+    return {
+      rpc_url: parsed.rpc_url ?? undefined,
+      wallet: parsed.wallet ?? undefined,
+    };
+  } catch {
+    return {};
+  }
+}
+
+export function saveGlobalConfig(config: GlobalConfig): void {
+  mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(GLOBAL_CONFIG_PATH, JSON.stringify(config, null, 2) + "\n");
+}
+
+/**
+ * Get the effective RPC URL (without CLI flag context).
+ * For use when no CLI flag is available.
+ */
+export function getConfiguredRpcUrl(): string {
+  const global = loadGlobalConfig();
+  return global.rpc_url || DEFAULT_RPC_URL;
+}
+
+// ─── Network config (agent_ids, zk_ids) ──────────────────────────
+
+export interface NetworkConfig {
+  agent_ids: string[];
+  zk_ids: string[];
+}
+
+const DEFAULT_NETWORK_CONFIG: NetworkConfig = { agent_ids: [], zk_ids: [] };
 
-export function loadAgentConfig(): AgentConfig {
+/**
+ * Load network-specific config.
+ * @param rpcUrl - effective RPC URL (determines which file to load)
+ */
+export function loadNetworkConfig(rpcUrl?: string): NetworkConfig {
+  const url = rpcUrl || getConfiguredRpcUrl();
+  const path = networkConfigPath(url);
   try {
-    const raw = readFileSync(AGENT_CONFIG_PATH, "utf-8");
+    const raw = readFileSync(path, "utf-8");
     const parsed = JSON.parse(raw);
     return {
       agent_ids: Array.isArray(parsed.agent_ids) ? parsed.agent_ids : [],
       zk_ids: Array.isArray(parsed.zk_ids) ? parsed.zk_ids : [],
-      rpc_url: parsed.rpc_url ?? undefined,
-      wallet: parsed.wallet ?? undefined,
     };
   } catch {
-    return { ...DEFAULT_CONFIG };
+    return { ...DEFAULT_NETWORK_CONFIG };
   }
 }
 
-export function saveAgentConfig(config: AgentConfig): void {
-  mkdirSync(dirname(AGENT_CONFIG_PATH), { recursive: true });
-  writeFileSync(AGENT_CONFIG_PATH, JSON.stringify(config, null, 2) + "\n");
+/**
+ * Save network-specific config.
+ */
+export function saveNetworkConfig(config: NetworkConfig, rpcUrl?: string): void {
+  const url = rpcUrl || getConfiguredRpcUrl();
+  const path = networkConfigPath(url);
+  mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(path, JSON.stringify(config, null, 2) + "\n");
 }
 
-export function addAgentId(id: string): void {
-  const config = loadAgentConfig();
+// ─── Convenience helpers ─────────────────────────────────────────
+
+export function addAgentId(id: string, rpcUrl?: string): void {
+  const config = loadNetworkConfig(rpcUrl);
   config.agent_ids = [id, ...config.agent_ids.filter((x) => x !== id)];
-  saveAgentConfig(config);
+  saveNetworkConfig(config, rpcUrl);
 }
 
-export function addZkId(name: string): void {
-  const config = loadAgentConfig();
+export function addZkId(name: string, rpcUrl?: string): void {
+  const config = loadNetworkConfig(rpcUrl);
   config.zk_ids = [name, ...config.zk_ids.filter((x) => x !== name)];
-  saveAgentConfig(config);
+  saveNetworkConfig(config, rpcUrl);
+}
+
+// ─── Migration: import old agent.json if network config doesn't exist ──
+
+const LEGACY_CONFIG_PATH = join(CONFIG_DIR, "agent.json");
+
+export function migrateIfNeeded(rpcUrl?: string): void {
+  const url = rpcUrl || getConfiguredRpcUrl();
+  const path = networkConfigPath(url);
+  if (existsSync(path)) return;
+  if (!existsSync(LEGACY_CONFIG_PATH)) return;
+
+  try {
+    const raw = readFileSync(LEGACY_CONFIG_PATH, "utf-8");
+    const parsed = JSON.parse(raw);
+
+    // Migrate network-specific fields
+    const networkConfig: NetworkConfig = {
+      agent_ids: Array.isArray(parsed.agent_ids) ? parsed.agent_ids : [],
+      zk_ids: Array.isArray(parsed.zk_ids) ? parsed.zk_ids : [],
+    };
+    saveNetworkConfig(networkConfig, url);
+
+    // Migrate global fields if config.json doesn't exist
+    if (!existsSync(GLOBAL_CONFIG_PATH)) {
+      const globalConfig: GlobalConfig = {};
+      if (parsed.rpc_url) globalConfig.rpc_url = parsed.rpc_url;
+      if (parsed.wallet) globalConfig.wallet = parsed.wallet;
+      if (Object.keys(globalConfig).length > 0) {
+        saveGlobalConfig(globalConfig);
+      }
+    }
+  } catch {
+    // Ignore migration errors
+  }
 }

package/src/cli/utils/wallet.ts

@@ -6,7 +6,7 @@ import { Keypair } from "@solana/web3.js";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { DEFAULT_RPC_URL } from "nara-sdk";
-import { loadAgentConfig } from "./agent-config";
+import { loadGlobalConfig, migrateIfNeeded } from "./agent-config";
 
 const DEFAULT_WALLET_PATH = join(homedir(), ".config", "nara", "id.json");
 
@@ -22,13 +22,13 @@ function resolvePath(p: string): string {
  *
  * Priority:
  * 1. CLI flag (walletPath parameter)
- * 2. Config file (~/.config/nara/agent.json wallet field)
+ * 2. Global config (~/.config/nara/config.json wallet field)
  * 3. Default path (~/.config/nara/id.json)
  */
 export async function loadWallet(walletPath?: string): Promise<Keypair> {
   let path = walletPath;
   if (!path) {
-    const config = loadAgentConfig();
+    const config = loadGlobalConfig();
     path = config.wallet ? resolvePath(config.wallet) : DEFAULT_WALLET_PATH;
   } else {
     path = resolvePath(path);
@@ -64,11 +64,13 @@ export async function loadWallet(walletPath?: string): Promise<Keypair> {
  *
  * Priority:
  * 1. CLI flag (rpcUrl parameter)
- * 2. Config file (~/.config/nara/agent.json rpc_url field)
+ * 2. Global config (~/.config/nara/config.json rpc_url field)
  * 3. Default (from SDK constants)
+ *
+ * Also triggers migration from legacy agent.json if needed.
  */
 export function getRpcUrl(rpcUrl?: string): string {
-  if (rpcUrl) return rpcUrl;
-  const config = loadAgentConfig();
-  return config.rpc_url || DEFAULT_RPC_URL;
+  const effective = rpcUrl || loadGlobalConfig().rpc_url || DEFAULT_RPC_URL;
+  migrateIfNeeded(effective);
+  return effective;
 }