@sherwoodagent/cli 0.4.0 → 0.5.1

package/dist/index.js

@@ -15,14 +15,12 @@ import {
   UNISWAP_QUOTER_V2_ABI,
   VENICE,
   VENICE_STAKING_ABI,
-  addTarget,
   approveDepositor,
   cacheGroupId,
   deposit,
   executeBatch,
   getAccount,
   getAgentId,
-  getAllowedTargets,
   getAssetDecimals,
   getBalance,
   getChain,
@@ -40,7 +38,6 @@ import {
   ragequit,
   registerAgent,
   removeDepositor,
-  removeTarget,
   resolveSyndicate,
   resolveVaultSyndicate,
   setAgentId,
@@ -51,7 +48,7 @@ import {
   setVaultAddress,
   setVeniceApiKey,
   simulateBatch
-} from "./chunk-J4J7VSMJ.js";
+} from "./chunk-3WZLP6BH.js";
 
 // src/index.ts
 import { config as loadDotenv } from "dotenv";
@@ -437,7 +434,6 @@ async function runLeveredSwap(opts) {
   console.log(chalk.bold("Batch calls (6):"));
   console.log(formatBatch(calls));
   console.log();
-  const assetAmount = 0n;
   const simSpinner = ora("Simulating via vault...").start();
   try {
     const results = await simulateBatch(calls);
@@ -472,7 +468,7 @@ async function runLeveredSwap(opts) {
   }
   const execSpinner = ora("Executing batch via vault...").start();
   try {
-    const txHash = await executeBatch(calls, assetAmount);
+    const txHash = await executeBatch(calls);
     execSpinner.succeed(`Batch executed: ${txHash}`);
     console.log(chalk.dim(`  ${getExplorerUrl(txHash)}`));
   } catch (err) {
@@ -503,12 +499,6 @@ async function createSyndicate(params) {
         asset: params.asset,
         name: params.name,
         symbol: params.symbol,
-        caps: {
-          maxPerTx: params.maxPerTx,
-          maxDailyTotal: params.maxDailyTotal,
-          maxBorrowRatio: params.maxBorrowRatio
-        },
-        initialTargets: params.initialTargets,
         openDeposits: params.openDeposits,
         subdomain: params.subdomain
       }
@@ -1065,7 +1055,7 @@ function registerVeniceCommands(program2) {
     }
     const execSpinner = ora2("Executing batch via vault...").start();
     try {
-      const txHash = await executeBatch(calls, requestedAmount);
+      const txHash = await executeBatch(calls);
       execSpinner.succeed(`Batch executed: ${txHash}`);
       console.log(chalk2.dim(`  ${getExplorerUrl(txHash)}`));
     } catch (err) {
@@ -1478,7 +1468,7 @@ function registerAllowanceCommands(program2) {
     }
     const execSpinner = ora3("Executing batch via vault...").start();
     try {
-      const txHash = await executeBatch(calls, requestedAmount);
+      const txHash = await executeBatch(calls);
       execSpinner.succeed(`Batch executed: ${txHash}`);
       console.log(chalk3.dim(`  ${getExplorerUrl(txHash)}`));
     } catch (err) {
@@ -1811,6 +1801,56 @@ async function revokeAttestation(schemaUid, attestationUid) {
     value: 0n
   });
 }
+async function queryApprovals(attester) {
+  assertSchemasRegistered();
+  const schemaUid = EAS_SCHEMAS().AGENT_APPROVED;
+  const url = getEasGraphqlUrl();
+  const query2 = `
+    query Approvals($schemaId: String!, $attester: String!) {
+      attestations(
+        where: {
+          schemaId: { equals: $schemaId }
+          attester: { equals: $attester }
+          revoked: { equals: false }
+        }
+        orderBy: [{ time: desc }]
+      ) {
+        id
+        attester
+        recipient
+        time
+        data
+      }
+    }
+  `;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      query: query2,
+      variables: { schemaId: schemaUid, attester }
+    })
+  });
+  if (!response.ok) {
+    throw new Error(`EAS GraphQL query failed: ${response.statusText}`);
+  }
+  const json = await response.json();
+  if (!json.data?.attestations) return [];
+  return json.data.attestations.map((a) => {
+    const decoded = decodeAbiParameters(AGENT_APPROVED_PARAMS, a.data);
+    return {
+      uid: a.id,
+      attester: a.attester,
+      recipient: a.recipient,
+      time: a.time,
+      decoded: {
+        syndicateId: decoded[0],
+        agentId: decoded[1],
+        vault: decoded[2]
+      }
+    };
+  });
+}
 async function queryJoinRequests(recipient) {
   assertSchemasRegistered();
   const schemaUid = EAS_SCHEMAS().SYNDICATE_JOIN_REQUEST;
@@ -1869,7 +1909,7 @@ try {
 } catch {
 }
 async function loadXmtp() {
-  return import("./xmtp-3N7K2GIW.js");
+  return import("./xmtp-PICTODCB.js");
 }
 var G = chalk5.green;
 var W = chalk5.white;
@@ -1891,7 +1931,7 @@ program.name("sherwood").description("CLI for agent-managed investment syndicate
   }
 });
 var syndicate = program.command("syndicate");
-syndicate.command("create").description("Create a new syndicate via the factory (interactive)").option("--subdomain <name>", "ENS subdomain (skip prompt)").option("--name <name>", "Syndicate name (skip prompt)").option("--agent-id <id>", "ERC-8004 agent identity token ID (skip prompt)").option("--asset <address>", "Underlying asset address").option("--max-per-tx <amount>", "Max per transaction (in asset units)").option("--max-daily <amount>", "Max daily combined spend (in asset units)").option("--borrow-ratio <bps>", "Max borrow ratio in basis points").option("--targets <addresses>", "Comma-separated allowlisted target addresses").option("--description <text>", "Short description").option("--metadata-uri <uri>", "Override metadata URI (skip IPFS upload)").option("--open-deposits", "Allow anyone to deposit (no whitelist)").option("--public-chat", "Enable dashboard spectator mode", false).action(async (opts) => {
+syndicate.command("create").description("Create a new syndicate via the factory (interactive)").option("--subdomain <name>", "ENS subdomain (skip prompt)").option("--name <name>", "Syndicate name (skip prompt)").option("--agent-id <id>", "ERC-8004 agent identity token ID (skip prompt)").option("--asset <address>", "Underlying asset address").option("--description <text>", "Short description").option("--metadata-uri <uri>", "Override metadata URI (skip IPFS upload)").option("--open-deposits", "Allow anyone to deposit (no whitelist)").option("--public-chat", "Enable dashboard spectator mode", false).action(async (opts) => {
   try {
     console.log();
     console.log(LABEL("  \u25C6 Create Syndicate"));
@@ -1919,18 +1959,6 @@ syndicate.command("create").description("Create a new syndicate via the factory
       message: G("Open deposits? (anyone can deposit)"),
       default: true
     });
-    const maxPerTx = opts.maxPerTx || await input({
-      message: G("Max per transaction (USDC)"),
-      default: "10000"
-    });
-    const maxDaily = opts.maxDaily || await input({
-      message: G("Max daily spend (USDC)"),
-      default: "50000"
-    });
-    const borrowRatio = opts.borrowRatio || await input({
-      message: G("Max borrow ratio (bps, 7500 = 75%)"),
-      default: "7500"
-    });
     const asset = opts.asset || TOKENS().USDC;
     const publicClient = getPublicClient();
     const [decimals, assetSymbol] = await Promise.all([
@@ -1938,7 +1966,6 @@ syndicate.command("create").description("Create a new syndicate via the factory
       publicClient.readContract({ address: asset, abi: ERC20_ABI, functionName: "symbol" })
     ]);
     const symbol = `sw${assetSymbol}`;
-    const targets = opts.targets ? opts.targets.split(",").map((a) => a.trim()) : [];
     console.log();
     console.log(LABEL("  \u25C6 Review"));
     SEP();
@@ -1948,13 +1975,7 @@ syndicate.command("create").description("Create a new syndicate via the factory
     console.log(W(`  Agent ID:     #${agentIdStr}`));
     console.log(W(`  Asset:        ${assetSymbol} (${asset.slice(0, 10)}...)`));
     console.log(W(`  Share token:  ${symbol}`));
-    console.log(W(`  Max per tx:   ${maxPerTx} ${assetSymbol}`));
-    console.log(W(`  Max daily:    ${maxDaily} ${assetSymbol}`));
-    console.log(W(`  Borrow ratio: ${(Number(borrowRatio) / 100).toFixed(1)}%`));
     console.log(W(`  Open deposits: ${openDeposits ? G("yes") : chalk5.red("no (whitelist)")}`));
-    if (targets.length > 0) {
-      console.log(W(`  Targets:      ${targets.length} address(es)`));
-    }
     SEP();
     const go = await confirm({ message: G("Deploy syndicate?"), default: true });
     if (!go) {
@@ -1992,10 +2013,6 @@ syndicate.command("create").description("Create a new syndicate via the factory
       asset,
       name,
       symbol,
-      maxPerTx: parseUnits8(maxPerTx, decimals),
-      maxDailyTotal: parseUnits8(maxDaily, decimals),
-      maxBorrowRatio: BigInt(borrowRatio),
-      initialTargets: targets,
       openDeposits,
       subdomain
     });
@@ -2008,10 +2025,8 @@ syndicate.command("create").description("Create a new syndicate via the factory
         BigInt(agentIdStr),
         creatorAddress,
         // pkp = creator EOA (direct execution)
-        creatorAddress,
+        creatorAddress
         // operator = creator EOA
-        parseUnits8(maxPerTx, decimals),
-        parseUnits8(maxDaily, decimals)
       );
     } catch (regErr) {
       console.warn(chalk5.yellow("\n  \u26A0 Could not auto-register creator as agent \u2014 register manually with `syndicate add`"));
@@ -2125,12 +2140,10 @@ syndicate.command("info").description("Display syndicate details by ID").argumen
     const vaultInfo = await getVaultInfo();
     console.log();
     console.log(chalk5.bold("  Vault Stats"));
-    console.log(`    Total Assets: ${vaultInfo.totalAssets}`);
-    console.log(`    Agent Count:  ${vaultInfo.agentCount}`);
-    console.log(`    Daily Spend:  ${vaultInfo.dailySpendTotal}`);
-    console.log(`    Max Per Tx:   ${vaultInfo.syndicateCaps.maxPerTx}`);
-    console.log(`    Max Daily:    ${vaultInfo.syndicateCaps.maxDailyTotal}`);
-    console.log(`    Max Borrow:   ${vaultInfo.syndicateCaps.maxBorrowRatio}`);
+    console.log(`    Total Assets:       ${vaultInfo.totalAssets}`);
+    console.log(`    Agent Count:        ${vaultInfo.agentCount}`);
+    console.log(`    Redemptions Locked: ${vaultInfo.redemptionsLocked}`);
+    console.log(`    Management Fee:     ${Number(vaultInfo.managementFeeBps) / 100}%`);
     console.log();
   } catch (err) {
     spinner.fail("Failed to load syndicate info");
@@ -2200,7 +2213,7 @@ syndicate.command("remove-depositor").description("Remove an address from the de
     process.exit(1);
   }
 });
-syndicate.command("add").description("Register an agent on a syndicate vault (creator only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").requiredOption("--max-per-tx <amount>", "Max per transaction (in asset units)").requiredOption("--daily-limit <amount>", "Daily limit (in asset units)").action(async (opts) => {
+syndicate.command("add").description("Register an agent on a syndicate vault (creator only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").action(async (opts) => {
   const spinner = ora5("Verifying creator...").start();
   try {
     resolveVault(opts);
@@ -2211,16 +2224,11 @@ syndicate.command("add").description("Register an agent on a syndicate vault (cr
       spinner.fail("Only the syndicate creator can add agents");
       process.exit(1);
     }
-    const decimals = await getAssetDecimals();
-    const maxPerTx = parseUnits8(opts.maxPerTx, decimals);
-    const dailyLimit = parseUnits8(opts.dailyLimit, decimals);
     spinner.text = "Registering agent...";
     const hash = await registerAgent(
       BigInt(opts.agentId),
       opts.pkp,
-      opts.eoa,
-      maxPerTx,
-      dailyLimit
+      opts.eoa
     );
     spinner.succeed(`Agent registered: ${hash}`);
     console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
@@ -2346,7 +2354,14 @@ syndicate.command("requests").description("View pending join requests for a synd
       process.exit(1);
     }
     spinner.text = "Querying EAS attestations...";
-    const requests = await queryJoinRequests(creatorAddress);
+    const [allRequests, approvals] = await Promise.all([
+      queryJoinRequests(creatorAddress),
+      queryApprovals(creatorAddress)
+    ]);
+    const approvedAgentIds = new Set(approvals.map((a) => a.decoded.agentId.toString()));
+    const requests = allRequests.filter(
+      (r) => !approvedAgentIds.has(r.decoded.agentId.toString())
+    );
     spinner.stop();
     if (requests.length === 0) {
       console.log(DIM("\n  No pending join requests.\n"));
@@ -2365,7 +2380,7 @@ syndicate.command("requests").description("View pending join requests for a synd
       console.log();
     }
     console.log(G("  To approve:"));
-    console.log(DIM(`    sherwood syndicate approve --agent-id <id> --pkp <addr> --eoa <addr> --max-per-tx <amt> --daily-limit <amt>`));
+    console.log(DIM(`    sherwood syndicate approve --agent-id <id> --pkp <addr> --eoa <addr>`));
     console.log(G("  To reject:"));
     console.log(DIM(`    sherwood syndicate reject --attestation <uid>`));
     console.log();
@@ -2375,7 +2390,7 @@ syndicate.command("requests").description("View pending join requests for a synd
     process.exit(1);
   }
 });
-syndicate.command("approve").description("Approve an agent join request (registers agent + creates EAS approval)").option("--vault <address>", "Vault address (default: from config)").option("--subdomain <name>", "Syndicate subdomain (alternative to --vault)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").requiredOption("--max-per-tx <amount>", "Max per transaction (in asset units)").requiredOption("--daily-limit <amount>", "Daily limit (in asset units)").option("--revoke-request <uid>", "Revoke the join request attestation after approval").action(async (opts) => {
+syndicate.command("approve").description("Approve an agent join request (registers agent + creates EAS approval)").option("--vault <address>", "Vault address (default: from config)").option("--subdomain <name>", "Syndicate subdomain (alternative to --vault)").requiredOption("--agent-id <id>", "Agent's ERC-8004 identity token ID").requiredOption("--pkp <address>", "Agent PKP address").requiredOption("--eoa <address>", "Operator EOA address").action(async (opts) => {
   const spinner = ora5("Verifying creator...").start();
   try {
     if (opts.subdomain && !opts.vault) {
@@ -2391,17 +2406,12 @@ syndicate.command("approve").description("Approve an agent join request (registe
       spinner.fail("Only the syndicate creator can approve agents");
       process.exit(1);
     }
-    const decimals = await getAssetDecimals();
-    const maxPerTx = parseUnits8(opts.maxPerTx, decimals);
-    const dailyLimit = parseUnits8(opts.dailyLimit, decimals);
     spinner.text = "Registering agent on vault...";
     try {
       const regHash = await registerAgent(
         BigInt(opts.agentId),
         opts.pkp,
-        opts.eoa,
-        maxPerTx,
-        dailyLimit
+        opts.eoa
       );
       console.log(DIM(`  Agent registered: ${getExplorerUrl(regHash)}`));
     } catch (regErr) {
@@ -2412,19 +2422,24 @@ syndicate.command("approve").description("Approve an agent join request (registe
         throw regErr;
       }
     }
-    spinner.text = "Creating approval attestation...";
-    const { uid: approvalUid } = await createApproval(
-      syndicateId,
-      BigInt(opts.agentId),
-      vaultAddress,
-      opts.eoa
+    spinner.text = "Checking for existing approval...";
+    const existingApprovals = await queryApprovals(getAccount().address);
+    const alreadyApproved = existingApprovals.find(
+      (a) => a.decoded.agentId === BigInt(opts.agentId) && a.decoded.vault.toLowerCase() === vaultAddress.toLowerCase()
     );
-    if (opts.revokeRequest) {
-      spinner.text = "Revoking join request...";
-      await revokeAttestation(
-        EAS_SCHEMAS().SYNDICATE_JOIN_REQUEST,
-        opts.revokeRequest
+    let approvalUid;
+    if (alreadyApproved) {
+      approvalUid = alreadyApproved.uid;
+      console.log(DIM(`  Approval attestation already exists \u2014 skipping`));
+    } else {
+      spinner.text = "Creating approval attestation...";
+      const result = await createApproval(
+        syndicateId,
+        BigInt(opts.agentId),
+        vaultAddress,
+        opts.eoa
       );
+      approvalUid = result.uid;
     }
     try {
       spinner.text = "Adding to chat...";
@@ -2512,15 +2527,11 @@ vaultCmd.command("info").description("Display vault state").option("--vault <add
     console.log();
     console.log(chalk5.bold("Vault Info"));
     console.log(chalk5.dim("\u2500".repeat(40)));
-    console.log(`  Address:        ${info.address}`);
-    console.log(`  Total Assets:   ${info.totalAssets}`);
-    console.log(`  Agent Count:    ${info.agentCount}`);
-    console.log(`  Daily Spend:    ${info.dailySpendTotal}`);
-    console.log();
-    console.log(chalk5.bold("  Syndicate Caps"));
-    console.log(`    Max Per Tx:     ${info.syndicateCaps.maxPerTx}`);
-    console.log(`    Max Daily:      ${info.syndicateCaps.maxDailyTotal}`);
-    console.log(`    Max Borrow:     ${info.syndicateCaps.maxBorrowRatio}`);
+    console.log(`  Address:            ${info.address}`);
+    console.log(`  Total Assets:       ${info.totalAssets}`);
+    console.log(`  Agent Count:        ${info.agentCount}`);
+    console.log(`  Redemptions Locked: ${info.redemptionsLocked}`);
+    console.log(`  Management Fee:     ${Number(info.managementFeeBps) / 100}%`);
     console.log();
   } catch (err) {
     spinner.fail("Failed to load vault info");
@@ -2547,51 +2558,6 @@ vaultCmd.command("balance").description("Show LP share balance and asset value")
     process.exit(1);
   }
 });
-vaultCmd.command("add-target").description("Add a target to the vault allowlist (owner only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--target <address>", "Target address to allow").action(async (opts) => {
-  resolveVault(opts);
-  const spinner = ora5("Adding target...").start();
-  try {
-    const hash = await addTarget(opts.target);
-    spinner.succeed(`Target added: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
-  } catch (err) {
-    spinner.fail("Failed to add target");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
-    process.exit(1);
-  }
-});
-vaultCmd.command("remove-target").description("Remove a target from the vault allowlist (owner only)").option("--vault <address>", "Vault address (default: from config)").requiredOption("--target <address>", "Target address to remove").action(async (opts) => {
-  resolveVault(opts);
-  const spinner = ora5("Removing target...").start();
-  try {
-    const hash = await removeTarget(opts.target);
-    spinner.succeed(`Target removed: ${hash}`);
-    console.log(chalk5.dim(`  ${getExplorerUrl(hash)}`));
-  } catch (err) {
-    spinner.fail("Failed to remove target");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
-    process.exit(1);
-  }
-});
-vaultCmd.command("targets").description("List allowed targets for a vault").option("--vault <address>", "Vault address (default: from config)").action(async (opts) => {
-  resolveVault(opts);
-  const spinner = ora5("Loading targets...").start();
-  try {
-    const targets = await getAllowedTargets();
-    spinner.stop();
-    console.log();
-    console.log(chalk5.bold(`Allowed Targets (${targets.length})`));
-    console.log(chalk5.dim("\u2500".repeat(50)));
-    for (const t of targets) {
-      console.log(`  ${t}`);
-    }
-    console.log();
-  } catch (err) {
-    spinner.fail("Failed to load targets");
-    console.error(chalk5.red(err instanceof Error ? err.message : String(err)));
-    process.exit(1);
-  }
-});
 var strategy = program.command("strategy");
 strategy.command("list").description("List registered strategies").option("--type <id>", "Filter by strategy type").action(async (opts) => {
   const spinner = ora5("Loading strategies...").start();
@@ -2678,7 +2644,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-7655UEFF.js");
+  const { registerChatCommands } = await import("./chat-HHXJOCKN.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Syndicate chat (XMTP) \u2014 requires @xmtp/cli").action(() => {