@agirails/sdk 2.2.3 → 2.3.1

package/src/cli/commands/init.ts

@@ -10,6 +10,7 @@
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
+import * as readline from 'readline';
 import { Command } from 'commander';
 import {
   saveConfig,
@@ -31,6 +32,7 @@ export function createInitCommand(): Command {
     .description('Initialize ACTP in the current directory')
     .option('-m, --mode <mode>', 'Operating mode: mock, testnet, mainnet', 'mock')
     .option('-a, --address <address>', 'Your Ethereum address')
+    .option('-w, --wallet <type>', 'Wallet type: auto (gas-free Smart Wallet) or eoa (traditional)', 'auto')
     .option('-f, --force', 'Overwrite existing configuration')
     .option('--scaffold', 'Generate a starter agent.ts file')
     .option('--intent <intent>', 'Agent intent: earn, pay, or both (default: earn)')
@@ -66,6 +68,7 @@ type ScaffoldIntent = 'earn' | 'pay' | 'both';
 interface InitOptions {
   mode: string;
   address?: string;
+  wallet?: string;
   force?: boolean;
   scaffold?: boolean;
   intent?: string;
@@ -94,18 +97,45 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
 
   const mode = options.mode as CLIMode;
 
+  // Determine wallet type
+  const walletType = (mode === 'mock') ? 'mock' : (options.wallet || 'auto');
+  if (walletType !== 'mock' && walletType !== 'auto' && walletType !== 'eoa') {
+    throw new Error(
+      `Invalid wallet type: "${walletType}". Valid types: auto, eoa`
+    );
+  }
+
   // Get or generate address
   let address = options.address;
+  let smartWalletAddress: string | undefined;
+  let didRegister = false;
   if (!address) {
     if (mode === 'mock') {
       // Generate a random address for mock mode
       address = '0x' + crypto.randomBytes(20).toString('hex');
       output.info(`Generated mock address: ${address}`);
     } else {
-      throw new Error(
-        `Address required for ${mode} mode.\n` +
-          'Use --address <your-address> to specify.'
-      );
+      // Generate a real wallet with encrypted keystore
+      const actpDir = getActpDir(projectRoot);
+      fs.mkdirSync(actpDir, { recursive: true });
+      const eoaAddress = await generateWallet(actpDir, output);
+
+      if (walletType === 'auto') {
+        // Compute Smart Wallet address from signer
+        smartWalletAddress = await computeSmartWalletInit(eoaAddress, mode, output);
+
+        // Y/N: Register for gas-free transactions?
+        const shouldRegister = await promptRegister(output);
+        if (shouldRegister) {
+          didRegister = await runInlineRegistration(projectRoot, mode, output);
+        }
+
+        // address = Smart Wallet if registered, EOA if not
+        // This ensures CLI commands (balance, tx list) show the correct address
+        address = didRegister ? smartWalletAddress : eoaAddress;
+      } else {
+        address = eoaAddress;
+      }
     }
   }
 
@@ -122,6 +152,9 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
     mode,
     address: address.toLowerCase(),
     version: '1.0',
+    ...(walletType !== 'mock' && { wallet: walletType as 'auto' | 'eoa' }),
+    ...(smartWalletAddress && { smartWallet: smartWalletAddress.toLowerCase() }),
+    ...(didRegister && { registered: true }),
   };
 
   // Save configuration
@@ -159,6 +192,7 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
       directory: getActpDir(projectRoot),
       mode,
       address,
+      ...(walletType !== 'mock' && { wallet: walletType }),
     },
     { quietKey: 'address' }
   );
@@ -169,14 +203,281 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
   } else {
     output.blank();
     output.print('Next steps:');
-    output.print('  1. Create a payment: actp pay <provider> <amount>');
-    output.print('  2. Check your balance: actp balance');
-    output.print('  3. List transactions: actp tx list');
+    if (walletType === 'auto' && didRegister) {
+      // Already registered — ready to go
+      output.print('  1. Create a payment: actp pay <provider> <amount>');
+      output.print('  2. Check your balance: actp balance');
+      output.print('  3. List transactions: actp tx list');
+    } else if (walletType === 'auto') {
+      // Skipped registration — remind them
+      output.print('  1. Register for gas-free: actp register');
+      output.print('  2. Create a payment: actp pay <provider> <amount>');
+      output.print('  3. Check your balance: actp balance');
+    } else {
+      output.print('  1. Create a payment: actp pay <provider> <amount>');
+      output.print('  2. Check your balance: actp balance');
+      output.print('  3. List transactions: actp tx list');
+    }
     output.print('');
     output.print('Tip: Use --scaffold to generate a starter agent.ts');
   }
 }
 
+// ============================================================================
+// Wallet Generation
+// ============================================================================
+
+async function generateWallet(actpDir: string, output: Output): Promise<string> {
+  const { Wallet } = await import('ethers');
+
+  const wallet = Wallet.createRandom();
+
+  // Get password from env var or interactive prompt
+  let password = process.env.ACTP_KEY_PASSWORD;
+  if (!password) {
+    password = await promptPassword();
+  }
+
+  if (!password || password.length < 8) {
+    throw new Error(
+      'Wallet password required (minimum 8 characters).\n' +
+        'Set ACTP_KEY_PASSWORD env var or enter when prompted.'
+    );
+  }
+
+  // Encrypt with Keystore V3 (scrypt + AES-128-CTR)
+  output.info('Encrypting wallet (this takes a few seconds)...');
+  const keystore = await wallet.encrypt(password);
+
+  // Save with restrictive permissions
+  const keystorePath = path.join(actpDir, 'keystore.json');
+  fs.writeFileSync(keystorePath, keystore, { mode: 0o600 });
+
+  output.success('Key securely saved and encrypted');
+  output.info(`Address: ${wallet.address}`);
+  output.warning('Back up your password — it cannot be recovered.');
+  output.info('');
+  output.info('To start your agent:');
+  output.info('  export ACTP_KEY_PASSWORD="your-password"');
+  output.info('  npx ts-node agent.ts');
+
+  return wallet.address;
+}
+
+/**
+ * Compute the Smart Wallet address for an EOA signer.
+ * Uses CREATE2 counterfactual derivation — no deployment needed.
+ */
+async function computeSmartWalletInit(
+  eoaAddress: string,
+  mode: string,
+  output: Output
+): Promise<string> {
+  const { ethers } = await import('ethers');
+  const { getNetwork } = await import('../../config/networks');
+  const { computeSmartWalletAddress } = await import('../../wallet/aa/UserOpBuilder');
+
+  const network = mode === 'testnet' ? 'base-sepolia' : 'base-mainnet';
+  const networkConfig = getNetwork(network);
+  const rpcUrl = networkConfig.rpcUrl;
+  const provider = new ethers.JsonRpcProvider(rpcUrl);
+
+  output.info('Computing Smart Wallet address...');
+  const smartWalletAddress = await computeSmartWalletAddress(eoaAddress, provider);
+
+  output.success(`Smart Wallet: ${smartWalletAddress}`);
+  output.info('Gas-free transactions enabled (requires registration)');
+  output.info('Register with: actp register');
+
+  return smartWalletAddress;
+}
+
+/**
+ * Ask user if they want to register for gas-free transactions.
+ * Non-TTY (piped/agent) defaults to yes.
+ */
+async function promptRegister(output: Output): Promise<boolean> {
+  output.blank();
+  output.print('Register for gas-free transactions? (recommended)');
+  output.print('  Your agent gets a Smart Wallet with sponsored gas — no ETH needed.');
+  output.print('  Requires on-chain registration on AgentRegistry.');
+  output.blank();
+
+  if (!process.stdin.isTTY) {
+    output.info('Non-interactive mode: auto-registering');
+    return true;
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question('  Register now? [Y/n] ', (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      resolve(trimmed === '' || trimmed === 'y' || trimmed === 'yes');
+    });
+  });
+}
+
+/**
+ * Run inline registration during init.
+ * Reuses the same logic as `actp register` — parses AGIRAILS.md,
+ * builds gasless UserOp (testnet: register + mint 1000 USDC).
+ *
+ * Returns true if registration succeeded, false on failure (non-fatal).
+ */
+async function runInlineRegistration(
+  projectRoot: string,
+  mode: string,
+  output: Output
+): Promise<boolean> {
+  try {
+    const { resolvePrivateKey } = await import('../../wallet/keystore');
+    const privateKey = await resolvePrivateKey(projectRoot);
+    if (!privateKey) {
+      output.warning('Could not load wallet key. Run "actp register" later.');
+      return false;
+    }
+
+    const { parseAgirailsMd } = await import('../../config/agirailsmd');
+    const { extractRegistrationParams } = await import('../../config/publishPipeline');
+    const { ethers } = await import('ethers');
+    const { getNetwork } = await import('../../config/networks');
+    const { AutoWalletProvider } = await import('../../wallet/AutoWalletProvider');
+    const { buildRegisterAgentBatch, buildTestnetInitBatch } = await import('../../wallet/aa/TransactionBatcher');
+
+    // Parse AGIRAILS.md if present
+    const agirailsMdPath = path.join(projectRoot, 'AGIRAILS.md');
+    let endpoint = '';
+    let serviceDescriptors;
+
+    if (fs.existsSync(agirailsMdPath)) {
+      const content = fs.readFileSync(agirailsMdPath, 'utf-8');
+      const parsed = parseAgirailsMd(content);
+      const regParams = extractRegistrationParams(parsed.frontmatter);
+      endpoint = regParams.endpoint;
+      serviceDescriptors = regParams.serviceDescriptors;
+      output.info(`Parsed ${serviceDescriptors.length} service(s) from AGIRAILS.md`);
+    } else {
+      const serviceType = 'general';
+      serviceDescriptors = [{
+        serviceTypeHash: ethers.keccak256(ethers.toUtf8Bytes(serviceType)),
+        serviceType,
+        schemaURI: '',
+        minPrice: 0n,
+        maxPrice: 1_000_000_000n,
+        avgCompletionTime: 3600,
+        metadataCID: '',
+      }];
+      output.info('No AGIRAILS.md found. Using default "general" service.');
+    }
+
+    const network = mode === 'testnet' ? 'base-sepolia' : 'base-mainnet';
+    const networkConfig = getNetwork(network);
+
+    if (!networkConfig.aa || !networkConfig.contracts.agentRegistry) {
+      output.warning('AA or AgentRegistry not configured. Run "actp register" later.');
+      return false;
+    }
+
+    // Check for valid bundler/paymaster URL (CDP_API_KEY must be set)
+    const cdpUrl = networkConfig.aa.bundlerUrls.coinbase;
+    const hasPimlico = !!networkConfig.aa.bundlerUrls.pimlico;
+    if (cdpUrl.endsWith('/') && !hasPimlico) {
+      output.warning('CDP_API_KEY not set. Skipping registration.');
+      output.info('Set CDP_API_KEY and run "actp register" later.');
+      return false;
+    }
+
+    const provider = new ethers.JsonRpcProvider(networkConfig.rpcUrl);
+    const signer = new ethers.Wallet(privateKey, provider);
+
+    const autoWallet = await AutoWalletProvider.create({
+      signer,
+      provider,
+      chainId: networkConfig.chainId,
+      actpKernelAddress: networkConfig.contracts.actpKernel,
+      bundler: {
+        primaryUrl: networkConfig.aa.bundlerUrls.coinbase,
+        backupUrl: networkConfig.aa.bundlerUrls.pimlico,
+      },
+      paymaster: {
+        primaryUrl: networkConfig.aa.paymasterUrls.coinbase,
+        backupUrl: networkConfig.aa.paymasterUrls.pimlico,
+      },
+    });
+
+    const smartWalletAddress = autoWallet.getAddress();
+
+    // Build batch
+    let calls;
+    if (mode === 'testnet') {
+      output.info('Testnet: registering + minting 1000 test USDC in one gasless tx...');
+      calls = buildTestnetInitBatch({
+        agentRegistryAddress: networkConfig.contracts.agentRegistry,
+        endpoint,
+        serviceDescriptors,
+        mockUsdcAddress: networkConfig.contracts.usdc,
+        recipient: smartWalletAddress,
+        mintAmount: '1000000000',
+      });
+    } else {
+      output.info('Registering on AgentRegistry (gasless)...');
+      calls = buildRegisterAgentBatch(
+        networkConfig.contracts.agentRegistry,
+        endpoint,
+        serviceDescriptors
+      );
+    }
+
+    const txRequests = calls.map((c) => ({
+      to: c.target,
+      data: c.data,
+      value: c.value.toString(),
+    }));
+
+    const receipt = await autoWallet.sendBatchTransaction(txRequests);
+
+    if (!receipt.success) {
+      output.warning(`Registration failed (tx: ${receipt.hash}). Run "actp register" later.`);
+      return false;
+    }
+
+    output.success('Agent registered on AgentRegistry');
+    if (mode === 'testnet') {
+      output.success('Minted 1,000 test USDC to Smart Wallet');
+    }
+    output.print(`  Tx: ${receipt.hash}`);
+    return true;
+  } catch (error) {
+    output.warning(`Registration failed: ${(error as Error).message}`);
+    output.info('You can register later with: actp register');
+    return false;
+  }
+}
+
+async function promptPassword(): Promise<string> {
+  // If not a TTY (e.g. piped or run by agent), skip prompt
+  if (!process.stdin.isTTY) {
+    return '';
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question('Enter password for wallet encryption (min 8 chars): ', (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
 // ============================================================================
 // Scaffold
 // ============================================================================
@@ -236,8 +537,8 @@ async function runScaffold(
     const tsconfigContent = JSON.stringify({
       compilerOptions: {
         target: 'ES2022',
-        module: 'ES2022',
-        moduleResolution: 'bundler',
+        module: 'commonjs',
+        moduleResolution: 'node',
         esModuleInterop: true,
         strict: true,
         outDir: 'dist',
@@ -256,19 +557,7 @@ async function runScaffold(
     }
   }
 
-  // Check package.json for type: module
-  const pkgFile = path.join(process.cwd(), 'package.json');
-  if (fs.existsSync(pkgFile)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
-      if (pkg.type !== 'module') {
-        output.warning(
-          'package.json has type: "' + (pkg.type || 'commonjs') + '". ' +
-          'Set "type": "module" for ESM support, or run with: npx ts-node --esm agent.ts'
-        );
-      }
-    } catch { /* ignore parse errors */ }
-  }
+  // Note: @agirails/sdk is CJS — no type:module check needed
 
   output.blank();
   output.print('Next steps:');

package/src/cli/commands/publish.ts

@@ -0,0 +1,208 @@
+/**
+ * Publish Command - Publish AGIRAILS.md config on-chain
+ *
+ * Reads AGIRAILS.md, computes canonical hash, uploads to IPFS,
+ * optionally to Arweave, and records on AgentRegistry.
+ *
+ * @module cli/commands/publish
+ */
+
+import { Command } from 'commander';
+import { Output, ExitCode } from '../utils/output';
+import { mapError } from '../utils/client';
+import { resolve } from 'path';
+import { readFileSync, existsSync } from 'fs';
+import { ethers } from 'ethers';
+import { computeConfigHash, parseAgirailsMd } from '../../config/agirailsmd';
+import { FilebaseClient } from '../../storage/FilebaseClient';
+import { ArweaveClient } from '../../storage/ArweaveClient';
+import { getNetwork } from '../../config/networks';
+import { publishAgirailsMd, PENDING_ENDPOINT } from '../../config/publishPipeline';
+
+// ============================================================================
+// Command Definition
+// ============================================================================
+
+export function createPublishCommand(): Command {
+  const cmd = new Command('publish')
+    .description('Publish AGIRAILS.md config on-chain')
+    .argument('[path]', 'Path to AGIRAILS.md', './AGIRAILS.md')
+    .option('-n, --network <network>', 'Network (base-sepolia | base-mainnet)', 'base-sepolia')
+    .option('--skip-arweave', 'Skip permanent Arweave storage (dev mode)')
+    .option('--dry-run', 'Show what would happen without executing')
+    .option('--json', 'Output as JSON')
+    .option('-q, --quiet', 'Output only the config hash')
+    .action(async (path, options) => {
+      const output = new Output(
+        options.json ? 'json' : options.quiet ? 'quiet' : 'human'
+      );
+
+      try {
+        await runPublish(path, options, output);
+      } catch (error) {
+        const structuredError = mapError(error);
+        output.errorResult({
+          code: structuredError.code,
+          message: structuredError.message,
+          details: structuredError.details,
+        });
+        process.exit(ExitCode.ERROR);
+      }
+    });
+
+  return cmd;
+}
+
+// ============================================================================
+// Implementation
+// ============================================================================
+
+interface PublishCommandOptions {
+  network: string;
+  skipArweave?: boolean;
+  dryRun?: boolean;
+}
+
+async function runPublish(
+  filePath: string,
+  options: PublishCommandOptions,
+  output: Output
+): Promise<void> {
+  const resolvedPath = resolve(filePath);
+
+  if (!existsSync(resolvedPath)) {
+    output.error(`File not found: ${filePath}`);
+    process.exit(ExitCode.INVALID_INPUT);
+  }
+
+  const spinner = output.spinner('Reading AGIRAILS.md...');
+
+  try {
+    // Read and compute hash
+    const content = readFileSync(resolvedPath, 'utf-8');
+    const { configHash, structuredHash, bodyHash } = computeConfigHash(content);
+
+    if (options.dryRun) {
+      spinner.stop(true);
+
+      output.result(
+        {
+          configHash,
+          structuredHash,
+          bodyHash,
+          path: resolvedPath,
+          network: options.network,
+          dryRun: true,
+        },
+        { quietKey: 'configHash' }
+      );
+
+      output.blank();
+      output.success('Dry run complete. No changes made.');
+      return;
+    }
+
+    // Validate environment
+    const privateKey = process.env.ACTP_PRIVATE_KEY || process.env.PRIVATE_KEY;
+    if (!privateKey) {
+      spinner.stop(false);
+      output.error('Private key required. Set ACTP_PRIVATE_KEY or PRIVATE_KEY env var.');
+      process.exit(ExitCode.INVALID_INPUT);
+    }
+
+    const networkConfig = getNetwork(options.network);
+    if (!networkConfig.contracts.agentRegistry) {
+      spinner.stop(false);
+      output.error(`AgentRegistry not deployed on ${options.network}`);
+      process.exit(ExitCode.ERROR);
+    }
+
+    // Create provider and signer
+    const provider = new ethers.JsonRpcProvider(networkConfig.rpcUrl);
+    const signer = new ethers.Wallet(privateKey, provider);
+
+    // Create Filebase client
+    const filebaseAccessKey = process.env.FILEBASE_ACCESS_KEY;
+    const filebaseSecretKey = process.env.FILEBASE_SECRET_KEY;
+    if (!filebaseAccessKey || !filebaseSecretKey) {
+      spinner.stop(false);
+      output.error('Filebase credentials required. Set FILEBASE_ACCESS_KEY and FILEBASE_SECRET_KEY.');
+      process.exit(ExitCode.INVALID_INPUT);
+    }
+
+    const filebaseClient = new FilebaseClient({
+      accessKey: filebaseAccessKey,
+      secretKey: filebaseSecretKey,
+    });
+
+    // Create Arweave client (optional)
+    let arweaveClient: ArweaveClient | undefined;
+    if (!options.skipArweave) {
+      const arweaveKey = process.env.ARCHIVE_UPLOADER_KEY;
+      if (arweaveKey) {
+        arweaveClient = await ArweaveClient.create({
+          privateKey: arweaveKey,
+          rpcUrl: networkConfig.rpcUrl,
+        });
+      }
+    }
+
+    spinner.stop(true);
+    const publishSpinner = output.spinner('Publishing to IPFS + on-chain...');
+
+    const result = await publishAgirailsMd({
+      path: resolvedPath,
+      network: options.network,
+      registryAddress: networkConfig.contracts.agentRegistry,
+      signer,
+      filebaseClient,
+      arweaveClient,
+      skipArweave: options.skipArweave || !arweaveClient,
+      gasSettings: {
+        maxFeePerGas: networkConfig.gasSettings.maxFeePerGas,
+        maxPriorityFeePerGas: networkConfig.gasSettings.maxPriorityFeePerGas,
+      },
+    });
+
+    publishSpinner.stop(true);
+
+    output.result(
+      {
+        configHash: result.configHash,
+        cid: result.cid,
+        txHash: result.txHash,
+        arweaveTxId: result.arweaveTxId || null,
+        registered: result.registered || false,
+        network: options.network,
+      },
+      { quietKey: 'configHash' }
+    );
+
+    output.blank();
+    if (result.registered) {
+      output.success('Agent registered and config published!');
+    } else {
+      output.success('Config published successfully!');
+    }
+    output.print('');
+    output.print('Next steps:');
+    output.print('  - Verify sync:  actp diff');
+    output.print('  - View on-chain: ' + networkConfig.blockExplorer + '/tx/' + result.txHash);
+
+    // Warn if placeholder endpoint was used during auto-register
+    if (result.registered) {
+      const content = readFileSync(resolvedPath, 'utf-8');
+      const { frontmatter } = parseAgirailsMd(content);
+      if (!frontmatter.endpoint || frontmatter.endpoint === PENDING_ENDPOINT) {
+        output.print('');
+        output.warning('No endpoint in AGIRAILS.md — registered with placeholder URL.');
+        output.print('  Update when your agent is deployed:');
+        output.print('    1. Add "endpoint: https://your-agent.com/webhook" to AGIRAILS.md');
+        output.print('    2. Run: actp publish');
+      }
+    }
+  } catch (error) {
+    spinner.stop(false);
+    throw error;
+  }
+}