@dev.sail.money/sailor 1.3.0-95 → 1.3.0-98

package/AGENTS.md

@@ -73,8 +73,11 @@ addresses remain. This file is the source of truth this guide mirrors.
 | `packages/cli/src/commands/onboard.ts` | SMA creation + permission registration flow |
 | `packages/cli/src/commands/mandate-contracts.ts` | Deploy / attach / revoke permission contracts |
 | `packages/cli/src/lib/mandates.ts` | `MandateStore` — `.sail/state/mandates.json` source of truth |
+| `packages/sdk/src/fees.ts` | `readPermissionRegistrationFee` (live governance read) + per-permission fee math/disclosure/preflight |
 | `packages/ui/server.js` | Local API + WebSocket proxy; signing station relay |
 
+Per-permission registration fee (read live from governance, surfaced at sign time / activity / preflight): see `templates/default/.agents/skills/sail-mandates/SKILL.md` → "Registration fee".
+
 ## Build
 
 ```bash

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@dev.sail.money/sailor",
-  "version": "1.3.0-95",
+  "version": "1.3.0-98",
   "description": "Operator toolkit for Sail Protocol",
   "bin": {
-    "sailor": "packages/cli/dist/index.cjs",
-    "sailor-mcp": "packages/cli/dist/mcp.cjs"
+    "sailor": "packages/cli/dist/index.cjs"
   },
   "exports": {
     "./sdk": {

package/packages/cli/dist/index.cjs

@@ -4581,8 +4581,8 @@ var init_encoding = __esm({
   "../../node_modules/.pnpm/viem@2.51.3_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@5.0.10_zod@4.4.3/node_modules/viem/_esm/errors/encoding.js"() {
     init_base();
     IntegerOutOfRangeError = class extends BaseError2 {
-      constructor({ max, min: min2, signed, size: size5, value }) {
-        super(`Number "${value}" is not in safe ${size5 ? `${size5 * 8}-bit ${signed ? "signed" : "unsigned"} ` : ""}integer range ${max ? `(${min2} to ${max})` : `(above ${min2})`}`, { name: "IntegerOutOfRangeError" });
+      constructor({ max, min, signed, size: size5, value }) {
+        super(`Number "${value}" is not in safe ${size5 ? `${size5 * 8}-bit ${signed ? "signed" : "unsigned"} ` : ""}integer range ${max ? `(${min} to ${max})` : `(above ${min})`}`, { name: "IntegerOutOfRangeError" });
       }
     };
     InvalidBytesBooleanError = class extends BaseError2 {
@@ -4945,9 +4945,9 @@ function aexists(instance, checkFinished = true) {
 }
 function aoutput(out, instance) {
   abytes(out);
-  const min2 = instance.outputLen;
-  if (out.length < min2) {
-    throw new Error("digestInto() expects output buffer of length at least " + min2);
+  const min = instance.outputLen;
+  if (out.length < min) {
+    throw new Error("digestInto() expects output buffer of length at least " + min);
   }
 }
 function u32(arr) {
@@ -5751,11 +5751,11 @@ function encodeBool(value) {
 function encodeNumber(value, { signed, size: size5 = 256 }) {
   if (typeof size5 === "number") {
     const max = 2n ** (BigInt(size5) - (signed ? 1n : 0n)) - 1n;
-    const min2 = signed ? -max - 1n : 0n;
-    if (value > max || value < min2)
+    const min = signed ? -max - 1n : 0n;
+    if (value > max || value < min)
       throw new IntegerOutOfRangeError({
         max: max.toString(),
-        min: min2.toString(),
+        min: min.toString(),
         signed,
         size: size5 / 8,
         value: value.toString()
@@ -8574,12 +8574,12 @@ function utf8ToBytes2(str) {
     throw new Error("string expected");
   return new Uint8Array(new TextEncoder().encode(str));
 }
-function inRange(n, min2, max) {
-  return isPosBig(n) && isPosBig(min2) && isPosBig(max) && min2 <= n && n < max;
+function inRange(n, min, max) {
+  return isPosBig(n) && isPosBig(min) && isPosBig(max) && min <= n && n < max;
 }
-function aInRange(title, n, min2, max) {
-  if (!inRange(n, min2, max))
-    throw new Error("expected valid " + title + ": " + min2 + " <= n < " + max + ", got " + n);
+function aInRange(title, n, min, max) {
+  if (!inRange(n, min, max))
+    throw new Error("expected valid " + title + ": " + min + " <= n < " + max + ", got " + n);
 }
 function bitLen(n) {
   let len;
@@ -13526,8 +13526,8 @@ var init_Hex = __esm({
     encoder4 = /* @__PURE__ */ new TextEncoder();
     hexes4 = /* @__PURE__ */ Array.from({ length: 256 }, (_v, i) => i.toString(16).padStart(2, "0"));
     IntegerOutOfRangeError2 = class extends BaseError3 {
-      constructor({ max, min: min2, signed, size: size5, value }) {
-        super(`Number \`${value}\` is not in safe${size5 ? ` ${size5 * 8}-bit` : ""}${signed ? " signed" : " unsigned"} integer range ${max ? `(\`${min2}\` to \`${max}\`)` : `(above \`${min2}\`)`}`);
+      constructor({ max, min, signed, size: size5, value }) {
+        super(`Number \`${value}\` is not in safe${size5 ? ` ${size5 * 8}-bit` : ""}${signed ? " signed" : " unsigned"} integer range ${max ? `(\`${min}\` to \`${max}\`)` : `(above \`${min}\`)`}`);
         Object.defineProperty(this, "name", {
           enumerable: true,
           configurable: true,
@@ -25269,11 +25269,11 @@ function encodeBoolean(value) {
 function encodeNumber2(value, { signed, size: size5 }) {
   if (typeof size5 === "number") {
     const max = 2n ** (BigInt(size5) - (signed ? 1n : 0n)) - 1n;
-    const min2 = signed ? -max - 1n : 0n;
-    if (value > max || value < min2)
+    const min = signed ? -max - 1n : 0n;
+    if (value > max || value < min)
       throw new IntegerOutOfRangeError2({
         max: max.toString(),
-        min: min2.toString(),
+        min: min.toString(),
         signed,
         size: size5 / 8,
         value: value.toString()
@@ -37811,38 +37811,43 @@ async function discoverSafesForOwner(owner2, chainId) {
 }
 
 // ../sdk/dist/fees.js
-function min(a, b) {
-  return a < b ? a : b;
+init_esm2();
+async function readPermissionRegistrationFee(publicClient, governance) {
+  return publicClient.readContract({
+    address: governance,
+    abi: SailGovernanceAbi,
+    functionName: "permissionRegistrationFee"
+  });
 }
-async function estimatePermissionFee(publicClient, governance, permission) {
-  try {
-    const [baseFee, complexityRate, cap, code] = await Promise.all([
-      publicClient.readContract({
-        address: governance,
-        abi: SailGovernanceAbi,
-        functionName: "baseFee"
-      }),
-      publicClient.readContract({
-        address: governance,
-        abi: SailGovernanceAbi,
-        functionName: "complexityRate"
-      }),
-      publicClient.readContract({
-        address: governance,
-        abi: SailGovernanceAbi,
-        functionName: "MAX_PERMISSION_FEE_WEI"
-      }),
-      publicClient.getBytecode({ address: permission })
-    ]);
-    const byteLength = code ? BigInt((code.length - 2) / 2) : 0n;
-    const fee = min(baseFee, cap) + min(byteLength * complexityRate, cap);
-    return min(fee, cap);
-  } catch {
-    return publicClient.readContract({
-      address: governance,
-      abi: SailGovernanceAbi,
-      functionName: "permissionRegistrationFee"
-    });
+async function estimateMandateRegistrationFee(publicClient, governance, permissions) {
+  const flatFeeWei = await readPermissionRegistrationFee(publicClient, governance);
+  const perPermission = permissions.map((permission) => ({ permission, feeWei: flatFeeWei }));
+  const totalWei = flatFeeWei * BigInt(permissions.length);
+  return { totalWei, perPermission };
+}
+function describeMandateFee(estimate) {
+  const count = estimate.perPermission.length;
+  if (count === 0)
+    return "Registration fee: 0 ETH (no new permissions to register)";
+  const noun = count === 1 ? "permission" : "permissions";
+  const perFeeWei = estimate.perPermission[0].feeWei;
+  return `Registration fee: ${formatEther(estimate.totalWei)} ETH (${count} ${noun} \xD7 ${formatEther(perFeeWei)} ETH)`;
+}
+var RegistrationFeeError = class extends Error {
+  /** Total fee required (wei). */
+  requiredWei;
+  /** Signer balance available (wei). */
+  balanceWei;
+  constructor(message, requiredWei, balanceWei) {
+    super(message);
+    this.name = "RegistrationFeeError";
+    this.requiredWei = requiredWei;
+    this.balanceWei = balanceWei;
+  }
+};
+function assertFeeAffordable(balanceWei, totalFeeWei) {
+  if (balanceWei < totalFeeWei) {
+    throw new RegistrationFeeError(`Insufficient ETH for the ${formatEther(totalFeeWei)} ETH registration fee; signer balance is ${formatEther(balanceWei)} ETH.`, totalFeeWei, balanceWei);
   }
 }
 
@@ -41441,6 +41446,21 @@ var MandateStore = class {
 
 // src/commands/onboard.ts
 init_esm2();
+
+// src/lib/registration-fee.ts
+function registrationGate(args) {
+  const { estimate, agentBalanceWei } = args;
+  if (agentBalanceWei !== void 0) {
+    assertFeeAffordable(agentBalanceWei, estimate.totalWei);
+  }
+  return {
+    totalFeeWei: estimate.totalWei,
+    permissionCount: estimate.perPermission.length,
+    disclosure: describeMandateFee(estimate)
+  };
+}
+
+// src/commands/onboard.ts
 async function onboard(options) {
   if (!ProjectContext.exists()) {
     emit(options.json, () => console.log('No Sailor project found. Run "sailor init" first.'), {
@@ -41819,6 +41839,17 @@ async function attachMandate(project, channel, publicClient, agentSigner, smaAdd
     hasDeadline: registerPermissionHasDeadline,
     deadline: registrationDeadline
   });
+  const feeEstimate = await estimateMandateRegistrationFee(
+    publicClient,
+    project.contracts.governance,
+    [templateAddress]
+  );
+  const fee = feeEstimate.totalWei;
+  const agentBalanceWei = await publicClient.getBalance({
+    address: agentSigner.viemAccount.address
+  });
+  const gate = registrationGate({ estimate: feeEstimate, agentBalanceWei });
+  say(() => console.log(gate.disclosure));
   say(() => console.log(`
 Pushing signing request for "${template.label}" permission\u2026`));
   say(
@@ -41841,6 +41872,13 @@ Pushing signing request for "${template.label}" permission\u2026`));
       { label: "Mandate signer", value: permissionSigner }
     ],
     explanation: permExplanation,
+    // Disclose the fee in the signing card so the owner sees what the agent
+    // will pay before signing. Only included when non-zero or when there is a
+    // fee to disclose (zero-fee chains pass 0 ETH, still informative).
+    registrationFee: {
+      totalEth: formatEther(fee),
+      permissionCount: 1
+    },
     typedData
   });
   if (response.status === "rejected") {
@@ -41867,12 +41905,6 @@ Connect the owner wallet (mandate signer) in the browser \u2014 the agent wallet
   } catch (err) {
     if (err.message.startsWith("Security:")) throw err;
   }
-  say(() => console.log("Estimating permission fee\u2026"));
-  const fee = await estimatePermissionFee(
-    publicClient,
-    project.contracts.governance,
-    templateAddress
-  );
   say(() => console.log(`Submitting mandate registration (agent pays gas; fee ${fee} wei)\u2026`));
   const walletClient = createWalletClient({
     account: agentSigner.viemAccount,
@@ -41922,7 +41954,10 @@ Connect the owner wallet (mandate signer) in the browser \u2014 the agent wallet
     name: template.label,
     sma: smaAddress,
     txHash,
-    chainId: project.chainId
+    chainId: project.chainId,
+    // Registration fee actually paid by the agent for this permission.
+    fee: fee.toString(),
+    feeEth: formatEther(fee)
   });
   return txHash;
 }
@@ -42339,6 +42374,7 @@ ${spec.label} clone (${options.template})`);
     hasDeadline: registerPermissionHasDeadline,
     deadline
   });
+  const fee = await readPermissionRegistrationFee(publicClient, project.contracts.governance);
   const label = options.label ?? `${spec.label} (${options.template})`;
   say(
     () => console.log(
@@ -42358,6 +42394,10 @@ ${spec.label} clone (${options.template})`);
       { label: "Mandate signer", value: permissionSigner },
       ...spec.describe(initParams)
     ],
+    registrationFee: {
+      totalEth: formatEther(fee),
+      permissionCount: 1
+    },
     typedData
   });
   if (response.status === "rejected") {
@@ -42384,7 +42424,6 @@ Connect the owner wallet (mandate signer) in the browser \u2014 the agent wallet
   } catch (err) {
     if (err.message.startsWith("Security:")) throw err;
   }
-  const fee = await estimatePermissionFee(publicClient, project.contracts.governance, clone);
   if (!registerPermissionHasDeadline || deadline === void 0) {
     throw new Error(
       "deploy-clone requires a selective kernel (RegisterPermission with deadline). This chain's kernel does not match."
@@ -42437,7 +42476,10 @@ Connect the owner wallet (mandate signer) in the browser \u2014 the agent wallet
     name: storedClone.name,
     sma,
     txHash,
-    chainId: project.chainId
+    chainId: project.chainId,
+    // Registration fee actually paid by the agent for this permission.
+    fee: fee.toString(),
+    feeEth: formatEther(fee)
   });
   emit(json, () => {
   }, {
@@ -42756,6 +42798,8 @@ Attaching ${permissions.length} permissions in one signature \u2014 the mandate
       explanation: (rec ? explainPermission(rec.name, rec.sourcePath) : null) ?? void 0
     };
   });
+  const flatFee = await readPermissionRegistrationFee(publicClient, project.contracts.governance);
+  const fee = flatFee * BigInt(permissions.length);
   const response = await channel.requestSignature({
     type: "typed-data",
     kind: "register-permission",
@@ -42768,6 +42812,11 @@ Attaching ${permissions.length} permissions in one signature \u2014 the mandate
       { label: "Mandate signer", value: permissionSigner }
     ],
     permissions: permExplanations,
+    registrationFee: {
+      totalEth: formatEther(fee),
+      permissionCount: permissions.length,
+      ...permissions.length > 1 ? { perPermissionEth: formatEther(flatFee) } : {}
+    },
     typedData
   });
   if (response.status === "rejected") {
@@ -42776,10 +42825,6 @@ Attaching ${permissions.length} permissions in one signature \u2014 the mandate
   if (response.status !== "signature") {
     throw new Error(`Expected an EIP-712 signature response, got: ${response.status}`);
   }
-  let fee = 0n;
-  for (const permission of permissions) {
-    fee += await estimatePermissionFee(publicClient, project.contracts.governance, permission);
-  }
   const chain2 = getChainById(project.chainId);
   const walletClient = createWalletClient({
     account: agentSigner.viemAccount,
@@ -42812,7 +42857,10 @@ Attaching ${permissions.length} permissions in one signature \u2014 the mandate
       permission,
       sma,
       txHash,
-      chainId: project.chainId
+      chainId: project.chainId,
+      // Each permission in the batch is charged the same flat fee.
+      fee: flatFee.toString(),
+      feeEth: formatEther(flatFee)
     });
     say(() => {
       if (!present) {
@@ -43024,6 +43072,35 @@ function runForgeBuild() {
 
 // src/commands/mandate.ts
 init_esm2();
+function chargeablePermissions(tracked) {
+  return tracked.filter((p) => !p.revokedOnChain && !p.registeredOnSma);
+}
+async function liveMandateFee(chainId, permissionAddresses) {
+  if (permissionAddresses.length === 0) return { totalWei: 0n, perPermission: [] };
+  try {
+    const deployment = getSailDeployment(chainId);
+    const rpcUrl = getRpcUrl(chainId) ?? getChainById(chainId).rpcUrls.default.http[0];
+    const pc = createPublicClient({ chain: getChainById(chainId), transport: http(rpcUrl) });
+    return await estimateMandateRegistrationFee(
+      pc,
+      deployment.governance,
+      permissionAddresses
+    );
+  } catch {
+    return null;
+  }
+}
+function draftFeeFromEstimate(estimate) {
+  const perFeeWei = estimate.perPermission[0]?.feeWei ?? 0n;
+  return {
+    perPermissionWei: perFeeWei.toString(),
+    perPermissionEth: formatEther(perFeeWei),
+    totalWei: estimate.totalWei.toString(),
+    totalEth: formatEther(estimate.totalWei),
+    permissionCount: estimate.perPermission.length,
+    disclosure: describeMandateFee(estimate)
+  };
+}
 function resolveActiveChain(account2) {
   try {
     const project = new ProjectContext();
@@ -43096,19 +43173,28 @@ ${permissions.length} permission(s) tracked for SMA ${account2.safe}:
     console.log(`    ${status2}`);
   }
   const store = new MandateStore();
+  const chargeable = chargeablePermissions(permissions);
+  const draftPermissions = chargeable.map((p) => {
+    const mandate2 = store.find(p.address);
+    const explanation = explainPermission(p.label, mandate2?.sourcePath) ?? void 0;
+    return { address: p.address, label: p.label, explanation };
+  });
+  let registrationFee;
+  const unregisteredAddresses = chargeable.map((p) => p.address);
+  if (unregisteredAddresses.length > 0) {
+    const estimate = await liveMandateFee(chainId, unregisteredAddresses);
+    if (estimate !== null) registrationFee = draftFeeFromEstimate(estimate);
+  }
   const draft = {
     account: account2.safe,
     chainId,
-    // Only permissions not already registered on this SMA belong in the signing
-    // draft — re-registering an already-registered permission reverts on-chain.
-    permissions: permissions.filter((p) => !p.revokedOnChain && !p.registeredOnSma).map((p) => {
-      const mandate2 = store.find(p.address);
-      const explanation = explainPermission(p.label, mandate2?.sourcePath) ?? void 0;
-      return { address: p.address, label: p.label, explanation };
-    }),
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    permissions: draftPermissions,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...registrationFee ? { registrationFee } : {}
   };
   writeJsonFile(sailPath("mandate-draft.json"), draft);
+  if (registrationFee) console.log(`
+${registrationFee.disclosure}`);
   console.log("\nDraft written to .sail/mandate-draft.json for the UI to display.");
 }
 async function mandateSign(opts = {}) {
@@ -43135,6 +43221,15 @@ Permissions tracked for SMA ${account2.safe}:
     "\nNote: `sailor mandate sign` reviews and confirms the permissions attached to your SMA.\nOn-chain registration happens via `sailor mandate attach` (or `sailor mandate deploy --attach`)."
   );
   const activePermissions = permissions.filter((p) => !p.revokedOnChain);
+  const unregistered = chargeablePermissions(permissions);
+  if (unregistered.length > 0) {
+    const estimate = await liveMandateFee(chainId, unregistered.map((p) => p.address));
+    if (estimate !== null) {
+      console.log(`
+${describeMandateFee(estimate)}`);
+      console.log("  Paid by the agent wallet on registration, per permission.");
+    }
+  }
   const proceed = opts.yes || await confirm(
     `Confirm these ${activePermissions.length} permission(s) are authorized for your SMA?`
   );
@@ -43142,7 +43237,6 @@ Permissions tracked for SMA ${account2.safe}:
     console.log("No permissions confirmed.");
     return;
   }
-  const unregistered = activePermissions.filter((p) => !p.registeredOnSma);
   if (unregistered.length === 0) {
     console.log(`
 \u2713 Confirmed ${activePermissions.length} permission(s) for ${account2.safe}.`);
@@ -43684,10 +43778,8 @@ Re-approving ${permissions.length} mandate(s) \u2014 the mandate signer (${permi
   if (response.status !== "signature") {
     throw new Error(`Expected an EIP-712 signature response, got: ${response.status}`);
   }
-  let fee = 0n;
-  for (const permission of permissions) {
-    fee += await estimatePermissionFee(publicClient, project.contracts.governance, permission);
-  }
+  const flatFee = await readPermissionRegistrationFee(publicClient, project.contracts.governance);
+  const fee = flatFee * BigInt(permissions.length);
   const agentSigner = await loadManagerSigner();
   const chain2 = getChainById(project.chainId);
   const walletClient = createWalletClient({