@t2000/engine 0.48.0 → 0.50.0

package/dist/index.js

@@ -711,6 +711,262 @@ function parseNumberOrNull(input) {
   const n = Number(input);
   return Number.isFinite(n) ? n : null;
 }
+var DEFI_PORTFOLIO_TIMEOUT_MS = 4e3;
+var DEFI_CACHE_TTL_MS = 6e4;
+var DEFI_PROTOCOLS = [
+  "cetus",
+  "suilend",
+  "scallop",
+  "bluefin",
+  "aftermath",
+  "haedal"
+];
+var defiCache = /* @__PURE__ */ new Map();
+var defiInflight = /* @__PURE__ */ new Map();
+async function fetchAddressDefiPortfolio(address, apiKey, priceHints = {}) {
+  if (!apiKey || apiKey.trim().length === 0) {
+    return { totalUsd: 0, perProtocol: {}, pricedAt: Date.now(), source: "degraded" };
+  }
+  const now = Date.now();
+  const cached = defiCache.get(address);
+  if (cached && now - cached.ts < DEFI_CACHE_TTL_MS) return cached.data;
+  let inflight = defiInflight.get(address);
+  if (inflight) return inflight;
+  inflight = (async () => {
+    try {
+      const settled = await Promise.allSettled(
+        DEFI_PROTOCOLS.map((p) => fetchOneDefiProtocol(address, p, apiKey))
+      );
+      const seen = /* @__PURE__ */ new Set();
+      for (const s of settled) {
+        if (s.status === "fulfilled" && s.value) collectCoinTypes(s.value, seen);
+      }
+      const normalizedHints = {};
+      for (const [k, v] of Object.entries(priceHints)) {
+        normalizedHints[normalizeCoinType(k)] = v;
+      }
+      const missing = Array.from(seen).filter((ct) => {
+        const norm = normalizeCoinType(ct);
+        return !normalizedHints[norm] && !STABLE_USD_PRICES[norm];
+      });
+      let fetchedPrices = {};
+      if (missing.length > 0) {
+        try {
+          fetchedPrices = await fetchTokenPrices(missing, apiKey);
+        } catch (err) {
+          console.warn("[defi] fill-missing-prices failed:", err);
+        }
+      }
+      const prices = { ...normalizedHints };
+      for (const [ct, v] of Object.entries(fetchedPrices)) {
+        prices[normalizeCoinType(ct)] ??= v.price;
+      }
+      for (const [ct, p] of Object.entries(STABLE_USD_PRICES)) {
+        prices[normalizeCoinType(ct)] ??= p;
+      }
+      let totalUsd = 0;
+      let failures = 0;
+      const perProtocol = {};
+      for (let i = 0; i < DEFI_PROTOCOLS.length; i++) {
+        const proto = DEFI_PROTOCOLS[i];
+        const s = settled[i];
+        if (s.status !== "fulfilled" || !s.value) {
+          failures++;
+          continue;
+        }
+        try {
+          const usd = NORMALIZERS[proto](s.value, prices);
+          if (Number.isFinite(usd) && usd !== 0) {
+            perProtocol[proto] = usd;
+            totalUsd += usd;
+          }
+        } catch (err) {
+          console.warn(`[defi] ${proto} normaliser threw:`, err);
+          failures++;
+        }
+      }
+      if (totalUsd < 0) totalUsd = 0;
+      const summary = {
+        totalUsd,
+        perProtocol,
+        pricedAt: Date.now(),
+        source: failures === DEFI_PROTOCOLS.length ? "degraded" : failures > 0 ? "partial" : "blockvision"
+      };
+      defiCache.set(address, { data: summary, ts: Date.now() });
+      return summary;
+    } finally {
+      defiInflight.delete(address);
+    }
+  })();
+  defiInflight.set(address, inflight);
+  return inflight;
+}
+async function fetchOneDefiProtocol(address, protocol, apiKey) {
+  const url = `${BLOCKVISION_BASE}/account/defiPortfolio?address=${encodeURIComponent(address)}&protocol=${protocol}`;
+  let res;
+  try {
+    res = await fetch(url, {
+      headers: { "x-api-key": apiKey, accept: "application/json" },
+      signal: AbortSignal.timeout(DEFI_PORTFOLIO_TIMEOUT_MS)
+    });
+  } catch (err) {
+    console.warn(`[defi] ${protocol} fetch threw:`, err);
+    return null;
+  }
+  if (!res.ok) {
+    console.warn(`[defi] ${protocol} HTTP ${res.status}`);
+    return null;
+  }
+  let json;
+  try {
+    json = await res.json();
+  } catch (err) {
+    console.warn(`[defi] ${protocol} JSON parse failed:`, err);
+    return null;
+  }
+  if (json.code !== 200 || !json.result) return null;
+  return json.result;
+}
+function collectCoinTypes(obj, out) {
+  if (!obj || typeof obj !== "object") return;
+  if (Array.isArray(obj)) {
+    for (const x of obj) collectCoinTypes(x, out);
+    return;
+  }
+  for (const [k, v] of Object.entries(obj)) {
+    if (typeof v === "string" && v.startsWith("0x") && v.includes("::")) {
+      const lk = k.toLowerCase();
+      if (lk.includes("cointype") || lk === "cointypea" || lk === "cointypeb" || lk === "tokenxtype" || lk === "tokenytype" || lk === "coinaddress" || lk === "phantomtype" || lk === "typename") {
+        out.add(v);
+      }
+    } else if (typeof v === "object" && v !== null) {
+      collectCoinTypes(v, out);
+    }
+  }
+}
+function priceFor(coinType, prices) {
+  const norm = normalizeCoinType(coinType);
+  return prices[norm] ?? prices[coinType] ?? STABLE_USD_PRICES[norm] ?? 0;
+}
+function rawToUsd(coinType, raw, decimalsHint, prices) {
+  if (raw == null) return 0;
+  const decimals = typeof decimalsHint === "number" ? decimalsHint : getDecimalsForCoinType(coinType);
+  const amount = Number(raw) / 10 ** decimals;
+  if (!Number.isFinite(amount)) return 0;
+  return amount * priceFor(coinType, prices);
+}
+var NORMALIZERS = {
+  cetus: normalizeCetus,
+  suilend: normalizeSuilend,
+  scallop: normalizeScallop,
+  bluefin: normalizeBluefin,
+  aftermath: normalizeAftermath,
+  haedal: normalizeHaedal
+};
+function normalizeCetus(result, prices) {
+  const data = result.cetus ?? {};
+  let total = 0;
+  const sumPair = (item, aField, bField) => {
+    if (item.coinTypeA && item[aField] != null) {
+      const dec = item.coinTypeADecimals ?? item.coinA?.decimals;
+      total += rawToUsd(item.coinTypeA, item[aField], dec, prices);
+    }
+    if (item.coinTypeB && item[bField] != null) {
+      const dec = item.coinTypeBDecimals ?? item.coinB?.decimals;
+      total += rawToUsd(item.coinTypeB, item[bField], dec, prices);
+    }
+  };
+  for (const lp of data.lps ?? []) sumPair(lp, "balanceA", "balanceB");
+  for (const farm of data.farms ?? []) sumPair(farm, "balanceA", "balanceB");
+  for (const vault of data.vaults ?? []) sumPair(vault, "coinAAmount", "coinBAmount");
+  return total;
+}
+function normalizeSuilend(result, prices) {
+  const data = result.suilend ?? {};
+  let total = 0;
+  for (const d of data.deposits ?? []) {
+    if (d.coinType && d.amount != null) total += rawToUsd(d.coinType, d.amount, d.decimals, prices);
+  }
+  for (const b of data.borrows ?? []) {
+    if (b.coinType && b.amount != null) total -= rawToUsd(b.coinType, b.amount, b.decimals, prices);
+  }
+  for (const s of data.strategies ?? []) {
+    if (s.coinType && s.amount != null) total += rawToUsd(s.coinType, s.amount, s.decimals, prices);
+  }
+  return total;
+}
+function normalizeScallop(result, _prices) {
+  const s = result.scallop;
+  if (!s) return 0;
+  const supply = Number(s.totalSupplyValue ?? 0);
+  const collateral = Number(s.totalCollateralValue ?? 0);
+  const locked = Number(s.totalLockedScaValue ?? 0);
+  const debt = Number(s.totalDebtValue ?? 0);
+  const net = (Number.isFinite(supply) ? supply : 0) + (Number.isFinite(collateral) ? collateral : 0) + (Number.isFinite(locked) ? locked : 0) - (Number.isFinite(debt) ? debt : 0);
+  return net;
+}
+function normalizeBluefin(result, prices) {
+  const data = result.bluefin ?? {};
+  let total = 0;
+  for (const lp of data.lps ?? []) {
+    if (lp.coinTypeA && lp.coinAmountA != null) {
+      total += rawToUsd(lp.coinTypeA, lp.coinAmountA, void 0, prices);
+    }
+    if (lp.coinTypeB && lp.coinAmountB != null) {
+      total += rawToUsd(lp.coinTypeB, lp.coinAmountB, void 0, prices);
+    }
+  }
+  if (data.usdcVault?.amount != null) {
+    total += rawToUsd(
+      "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+      data.usdcVault.amount,
+      6,
+      prices
+    );
+  }
+  if (data.blueVault?.amount != null) {
+    total += rawToUsd(
+      "0xe1b45a0e641b9955a20aa0ad1c1f4ad86aad8afb07296d4085e349a50e90bdca::blue::BLUE",
+      data.blueVault.amount,
+      9,
+      prices
+    );
+  }
+  return total;
+}
+function normalizeAftermath(result, prices) {
+  const data = result.aftermath ?? {};
+  let total = 0;
+  const positions = [...data.lpPositions ?? [], ...data.farmPositions ?? []];
+  for (const pos of positions) {
+    for (const c of pos.coins ?? []) {
+      if (c.coinType && c.amount != null) {
+        total += rawToUsd(c.coinType, c.amount, void 0, prices);
+      }
+    }
+  }
+  return total;
+}
+function normalizeHaedal(result, prices) {
+  const SUI_TYPE_FULL = "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI";
+  const data = result.haedal ?? {};
+  let total = 0;
+  for (const lp of data.lps ?? []) {
+    const item = lp;
+    if (item.coinTypeA && item.balanceA != null) {
+      total += rawToUsd(item.coinTypeA, item.balanceA, void 0, prices);
+    }
+    if (item.coinTypeB && item.balanceB != null) {
+      total += rawToUsd(item.coinTypeB, item.balanceB, void 0, prices);
+    }
+  }
+  for (const stake of data.stakings ?? []) {
+    if (stake.sui_amount != null) {
+      total += rawToUsd(SUI_TYPE_FULL, stake.sui_amount, 9, prices);
+    }
+  }
+  return total;
+}
 function clearPortfolioCache() {
   portfolioCache.clear();
   portfolioInflight.clear();
@@ -725,6 +981,7 @@ function clearPriceMapCache() {
 
 // src/tools/balance.ts
 var GAS_RESERVE_SUI2 = 0.05;
+var SUI_ADDRESS_REGEX = /^0x[a-fA-F0-9]{1,64}$/;
 var VSUI_COIN_TYPE = "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT";
 var SUI_COIN_TYPE = "0x2::sui::SUI";
 var VSUI_FALLBACK_RATE = 1.05;
@@ -776,21 +1033,38 @@ async function loadPortfolio(address, blockvisionApiKey, fallbackRpcUrl, cache)
 }
 var balanceCheckTool = buildTool({
   name: "balance_check",
-  description: "Get the user's full balance breakdown. Returns wallet holdings (tokens the user owns \u2014 NOT savings), NAVI savings deposits (USDC deposited into NAVI Protocol earning yield), outstanding debt, pending rewards, gas reserve, total net worth, and saveableUsdc (only USDC can be deposited into savings). IMPORTANT: wallet holdings like GOLD, SUI, USDT are NOT savings positions \u2014 they are just tokens sitting in the wallet.",
-  inputSchema: z.object({}),
-  jsonSchema: { type: "object", properties: {}, required: [] },
+  description: "Get the full balance breakdown for the signed-in user OR any public Sui address. Returns wallet holdings (tokens the address owns \u2014 NOT savings), NAVI savings deposits (USDC deposited into NAVI Protocol earning yield), outstanding debt, pending rewards, gas reserve, total net worth, and saveableUsdc (only USDC can be deposited into savings). IMPORTANT: wallet holdings like GOLD, SUI, USDT are NOT savings positions \u2014 they are just tokens sitting in the wallet. Pass `address` to inspect a contact / watched / public wallet; defaults to the signed-in user when omitted.",
+  inputSchema: z.object({
+    address: z.string().regex(SUI_ADDRESS_REGEX).optional().describe("Sui address to inspect (defaults to the signed-in wallet)")
+  }),
+  jsonSchema: {
+    type: "object",
+    properties: {
+      address: {
+        type: "string",
+        pattern: "^0x[a-fA-F0-9]{1,64}$",
+        description: "Sui address to inspect (defaults to the signed-in wallet)"
+      }
+    },
+    required: []
+  },
   isReadOnly: true,
   // [v1.4 BlockVision] Wallet contents change after every send / swap /
   // save / etc. and the price half of this result is sourced from
   // BlockVision's Indexer REST API. Microcompact must NEVER dedupe these
   // calls — each one reflects a different on-chain + market snapshot.
   cacheable: false,
-  async call(_input, context) {
-    if (hasNaviMcp(context)) {
-      const address = getWalletAddress(context);
+  async call(input, context) {
+    const targetAddress = input.address ?? context.walletAddress;
+    const isSelfQuery = !!context.walletAddress && !!targetAddress && targetAddress.toLowerCase() === context.walletAddress.toLowerCase();
+    if (hasNaviMcpGlobal(context)) {
+      if (!targetAddress) {
+        throw new Error("No wallet address provided. Sign in or pass `address` to inspect a public wallet.");
+      }
+      const address = targetAddress;
       const mgr = getMcpManager(context);
-      const hasPositionFetcher = !!(context.positionFetcher && context.walletAddress);
-      const [portfolio, positions, rewards, serverPositions] = await Promise.all([
+      const hasPositionFetcher = !!context.positionFetcher;
+      const [portfolio, positions, rewards, serverPositions, defiPortfolio] = await Promise.all([
         loadPortfolio(
           address,
           context.blockvisionApiKey,
@@ -818,10 +1092,25 @@ var balanceCheckTool = buildTool({
           console.warn("[balance_check] NAVI GET_AVAILABLE_REWARDS failed:", err);
           return null;
         }),
-        hasPositionFetcher ? context.positionFetcher(context.walletAddress).catch((err) => {
+        hasPositionFetcher ? context.positionFetcher(address).catch((err) => {
           console.warn("[balance_check] positionFetcher failed:", err);
           return null;
-        }) : Promise.resolve(null)
+        }) : Promise.resolve(null),
+        // [v0.50] DeFi leg — independent of NAVI (excluded) and the wallet
+        // portfolio (which only has coin holdings). Failure here surfaces
+        // as defi.totalUsd === 0 and `source: 'degraded'`, leaving the
+        // rest of balance_check unaffected. The fetcher fills its own
+        // prices via fetchTokenPrices for any coin types it discovers.
+        fetchAddressDefiPortfolio(address, context.blockvisionApiKey).catch((err) => {
+          console.warn("[balance_check] defi fetch failed:", err);
+          const fallback = {
+            totalUsd: 0,
+            perProtocol: {},
+            pricedAt: Date.now(),
+            source: "degraded"
+          };
+          return fallback;
+        })
       ]);
       await applyVsuiPriceFallback(portfolio);
       let availableUsd = 0;
@@ -868,32 +1157,60 @@ var balanceCheckTool = buildTool({
       const visibleHoldings = holdings.filter((h) => h.usdValue >= 0.01).sort((a, b) => b.usdValue - a.usdValue);
       const usdcHolding2 = holdings.find((h) => h.symbol === "USDC");
       const saveableUsdc = usdcHolding2 ? usdcHolding2.balance : 0;
+      const defi2 = defiPortfolio;
       const bal = {
         available: availableUsd,
         savings,
         debt,
         pendingRewards: pendingRewardsUsd,
         gasReserve: gasReserveUsd2,
-        total: availableUsd + savings + gasReserveUsd2 + pendingRewardsUsd - debt,
+        defi: defi2.totalUsd,
+        defiByProtocol: defi2.perProtocol,
+        defiSource: defi2.source,
+        total: availableUsd + savings + gasReserveUsd2 + pendingRewardsUsd + defi2.totalUsd - debt,
         stables: stablesUsd,
         holdings: visibleHoldings,
         saveableUsdc,
-        priceSource: portfolio.source
+        priceSource: portfolio.source,
+        address,
+        isSelfQuery
       };
       const holdingsList = visibleHoldings.map((h) => `${h.symbol}: ${h.balance < 1 ? h.balance.toFixed(6) : h.balance.toFixed(2)} ($${h.usdValue.toFixed(2)})`).join(", ");
+      const subjectPrefix = isSelfQuery ? "Balance" : `Balance for ${address.slice(0, 6)}\u2026${address.slice(-4)}`;
+      const defiSummaryText = defi2.totalUsd > 0 ? ` Other DeFi positions (LPs/staking/lending across ${Object.keys(defi2.perProtocol).join("/")}): $${defi2.totalUsd.toFixed(2)}.` : "";
       return {
         data: bal,
-        displayText: `Balance: $${bal.total.toFixed(2)} total. Wallet holdings (NOT savings): ${holdingsList || "none"}. NAVI savings deposits: $${bal.savings.toFixed(2)}. Saveable USDC (only USDC can be saved): ${saveableUsdc.toFixed(2)} USDC.`
+        displayText: `${subjectPrefix}: $${bal.total.toFixed(2)} total. Wallet holdings (NOT savings): ${holdingsList || "none"}. NAVI savings deposits: $${bal.savings.toFixed(2)}.${defiSummaryText} Saveable USDC (only USDC can be saved): ${saveableUsdc.toFixed(2)} USDC.`
       };
     }
+    if (input.address && context.walletAddress && input.address.toLowerCase() !== context.walletAddress.toLowerCase()) {
+      throw new Error(
+        `Cannot inspect ${input.address.slice(0, 8)}\u2026 without NAVI MCP enabled. Configure NAVI MCP to enable third-party address reads.`
+      );
+    }
     const agent = requireAgent(context);
-    const balance = await agent.balance();
+    const fetchAddress = targetAddress ?? context.walletAddress;
+    const [balance, defi] = await Promise.all([
+      agent.balance(),
+      fetchAddressDefiPortfolio(fetchAddress, context.blockvisionApiKey).catch((err) => {
+        console.warn("[balance_check] sdk-path defi fetch failed:", err);
+        const fallback = {
+          totalUsd: 0,
+          perProtocol: {},
+          pricedAt: Date.now(),
+          source: "degraded"
+        };
+        return fallback;
+      })
+    ]);
     const gasReserveUsd = typeof balance.gasReserve === "number" ? balance.gasReserve : balance.gasReserve.usdEquiv ?? 0;
     const stablesTotal = typeof balance.stables === "number" ? balance.stables : Object.values(balance.stables).reduce((a, b) => a + b, 0);
     const sdkHoldings = balance.holdings;
     const holdingsArr = Array.isArray(sdkHoldings) ? sdkHoldings : [];
     const usdcHolding = holdingsArr.find((h) => h.symbol === "USDC");
     const sdkSaveableUsdc = usdcHolding ? usdcHolding.balance ?? 0 : 0;
+    const sdkDefiSummaryText = defi.totalUsd > 0 ? ` Other DeFi positions (LPs/staking/lending across ${Object.keys(defi.perProtocol).join("/")}): $${defi.totalUsd.toFixed(2)}.` : "";
+    const sdkTotal = balance.total + defi.totalUsd;
     return {
       data: {
         available: balance.available,
@@ -901,12 +1218,17 @@ var balanceCheckTool = buildTool({
         debt: balance.debt,
         pendingRewards: balance.pendingRewards,
         gasReserve: gasReserveUsd,
-        total: balance.total,
+        defi: defi.totalUsd,
+        defiByProtocol: defi.perProtocol,
+        defiSource: defi.source,
+        total: sdkTotal,
         stables: stablesTotal,
         holdings: holdingsArr,
-        saveableUsdc: sdkSaveableUsdc
+        saveableUsdc: sdkSaveableUsdc,
+        address: targetAddress ?? "",
+        isSelfQuery: true
       },
-      displayText: `Balance: $${balance.total.toFixed(2)} total. Wallet: $${balance.available.toFixed(2)} available. NAVI savings deposits: $${balance.savings.toFixed(2)}. Saveable USDC (only USDC can be saved): ${sdkSaveableUsdc.toFixed(2)} USDC.`
+      displayText: `Balance: $${sdkTotal.toFixed(2)} total. Wallet: $${balance.available.toFixed(2)} available. NAVI savings deposits: $${balance.savings.toFixed(2)}.${sdkDefiSummaryText} Saveable USDC (only USDC can be saved): ${sdkSaveableUsdc.toFixed(2)} USDC.`
     };
   }
 });
@@ -998,6 +1320,7 @@ async function fetchProtocolStats(manager, opts) {
 
 // src/tools/savings.ts
 var DUST_THRESHOLD_USD = 0.01;
+var SUI_ADDRESS_REGEX2 = /^0x[a-fA-F0-9]{1,64}$/;
 function buildSavingsFromPositions(sp) {
   const positions = [
     ...sp.supplies.filter((s) => s.amountUsd >= DUST_THRESHOLD_USD).map((s) => ({
@@ -1039,18 +1362,19 @@ function buildSavingsFromPositions(sp) {
     }
   };
 }
-function formatSavingsDisplay(result) {
+function formatSavingsDisplay(result, isSelfQuery = true, address) {
   const { positions, earnings, fundStatus } = result;
   const supplies = positions.filter((p) => p.type === "supply");
   const borrows = positions.filter((p) => p.type === "borrow");
+  const subjectPrefix = isSelfQuery || !address ? "" : `${address.slice(0, 6)}\u2026${address.slice(-4)} \u2014 `;
   const lines = [];
   if (supplies.length > 0) {
-    lines.push(`Savings: $${fundStatus.supplied.toFixed(2)} at ${(earnings.currentApy * 100).toFixed(2)}% blended APY`);
+    lines.push(`${subjectPrefix}Savings: $${fundStatus.supplied.toFixed(2)} at ${(earnings.currentApy * 100).toFixed(2)}% blended APY`);
     for (const s of supplies) {
       lines.push(`  ${s.symbol}: ${s.amount.toFixed(s.amount < 1 ? 6 : 2)} ($${s.valueUsd.toFixed(2)}) at ${(s.apy * 100).toFixed(2)}% APY`);
     }
   } else {
-    lines.push("No savings positions.");
+    lines.push(`${subjectPrefix}No savings positions.`);
   }
   if (borrows.length > 0) {
     const totalDebt = borrows.reduce((s, b) => s + b.valueUsd, 0);
@@ -1062,26 +1386,44 @@ function formatSavingsDisplay(result) {
 }
 var savingsInfoTool = buildTool({
   name: "savings_info",
-  description: "Get detailed savings positions and earnings: current deposits by protocol, APY, total yield earned, daily earning rate, and projected monthly returns.",
-  inputSchema: z.object({}),
-  jsonSchema: { type: "object", properties: {}, required: [] },
+  description: "Get detailed savings positions and earnings for the signed-in user OR any public Sui address: current deposits by protocol, APY, total yield earned, daily earning rate, and projected monthly returns. Pass `address` to inspect a contact / watched / public wallet; defaults to the signed-in user when omitted.",
+  inputSchema: z.object({
+    address: z.string().regex(SUI_ADDRESS_REGEX2).optional().describe("Sui address to inspect (defaults to the signed-in wallet)")
+  }),
+  jsonSchema: {
+    type: "object",
+    properties: {
+      address: {
+        type: "string",
+        pattern: "^0x[a-fA-F0-9]{1,64}$",
+        description: "Sui address to inspect (defaults to the signed-in wallet)"
+      }
+    },
+    required: []
+  },
   isReadOnly: true,
   // [v1.5.1] NAVI deposits change on save_deposit / withdraw / claim.
   // Each call reflects a fresh on-chain snapshot — never dedupe.
   cacheable: false,
-  async call(_input, context) {
-    if (context.positionFetcher && context.walletAddress) {
-      const sp = await context.positionFetcher(context.walletAddress);
+  async call(input, context) {
+    const targetAddress = input.address ?? context.walletAddress;
+    const isSelfQuery = !!context.walletAddress && !!targetAddress && targetAddress.toLowerCase() === context.walletAddress.toLowerCase();
+    if (context.positionFetcher && targetAddress) {
+      const sp = await context.positionFetcher(targetAddress);
       const result2 = buildSavingsFromPositions(sp);
-      return { data: result2, displayText: formatSavingsDisplay(result2) };
+      const stamped2 = { ...result2, address: targetAddress, isSelfQuery };
+      return { data: stamped2, displayText: formatSavingsDisplay(result2, isSelfQuery, targetAddress) };
     }
-    if (hasNaviMcp(context)) {
-      const savings = await fetchSavings(
-        getMcpManager(context),
-        getWalletAddress(context)
-      );
+    if (hasNaviMcpGlobal(context) && targetAddress) {
+      const savings = await fetchSavings(getMcpManager(context), targetAddress);
       savings.positions = savings.positions.filter((p) => p.valueUsd >= DUST_THRESHOLD_USD);
-      return { data: savings, displayText: formatSavingsDisplay(savings) };
+      const stamped2 = { ...savings, address: targetAddress, isSelfQuery };
+      return { data: stamped2, displayText: formatSavingsDisplay(savings, isSelfQuery, targetAddress) };
+    }
+    if (input.address && context.walletAddress && input.address.toLowerCase() !== context.walletAddress.toLowerCase()) {
+      throw new Error(
+        `Cannot inspect ${input.address.slice(0, 8)}\u2026 without NAVI MCP or a positionFetcher. Configure NAVI MCP to enable third-party address reads.`
+      );
     }
     const agent = requireAgent(context);
     const [posResult, earnings, fundStatus] = await Promise.all([
@@ -1114,9 +1456,11 @@ var savingsInfoTool = buildTool({
         projectedMonthly: fundStatus.projectedMonthly
       }
     };
-    return { data: result, displayText: formatSavingsDisplay(result) };
+    const stamped = { ...result, address: targetAddress ?? "", isSelfQuery: true };
+    return { data: stamped, displayText: formatSavingsDisplay(result, true, void 0) };
   }
 });
+var SUI_ADDRESS_REGEX3 = /^0x[a-fA-F0-9]{1,64}$/;
 var DEBT_DUST_USD = 0.01;
 function hfStatus(hf, borrowed) {
   if (borrowed <= DEBT_DUST_USD) return "healthy";
@@ -1130,24 +1474,39 @@ function serializeHf(hf, borrowed) {
   if (hf == null || !Number.isFinite(hf)) return null;
   return hf;
 }
-function displayHfText(hf, borrowed, status) {
+function displayHfText(hf, borrowed, status, isSelfQuery = true, address) {
+  const subject = isSelfQuery || !address ? "Health Factor" : `Health Factor for ${address.slice(0, 6)}\u2026${address.slice(-4)}`;
   if (hf == null) {
-    return `Health Factor: \u221E (${status} \u2014 no debt)`;
+    return `${subject}: \u221E (${status} \u2014 no debt)`;
   }
-  return `Health Factor: ${hf.toFixed(2)} (${status})`;
+  return `${subject}: ${hf.toFixed(2)} (${status})`;
 }
 var healthCheckTool = buildTool({
   name: "health_check",
-  description: 'Check the lending health factor: current HF ratio, total supplied collateral, total borrowed, max additional borrow capacity, and liquidation threshold. HF < 1.5 is risky, < 1.2 is critical. When the user has no debt the tool returns healthFactor=null (semantically infinity) \u2014 render that as "Healthy" / \u221E, never as 0 or "Critical".',
-  inputSchema: z.object({}),
-  jsonSchema: { type: "object", properties: {}, required: [] },
+  description: 'Check the lending health factor for the signed-in user OR any public Sui address: current HF ratio, total supplied collateral, total borrowed, max additional borrow capacity, and liquidation threshold. HF < 1.5 is risky, < 1.2 is critical. When the address has no debt the tool returns healthFactor=null (semantically infinity) \u2014 render that as "Healthy" / \u221E, never as 0 or "Critical". Pass `address` to inspect a contact / watched / public wallet; defaults to the signed-in user when omitted.',
+  inputSchema: z.object({
+    address: z.string().regex(SUI_ADDRESS_REGEX3).optional().describe("Sui address to inspect (defaults to the signed-in wallet)")
+  }),
+  jsonSchema: {
+    type: "object",
+    properties: {
+      address: {
+        type: "string",
+        pattern: "^0x[a-fA-F0-9]{1,64}$",
+        description: "Sui address to inspect (defaults to the signed-in wallet)"
+      }
+    },
+    required: []
+  },
   isReadOnly: true,
   // [v1.5.1] Health factor changes on every borrow / repay / collateral
   // movement and even passively as oracle prices update. Never dedupe.
   cacheable: false,
-  async call(_input, context) {
-    if (context.positionFetcher && context.walletAddress) {
-      const sp = await context.positionFetcher(context.walletAddress);
+  async call(input, context) {
+    const targetAddress = input.address ?? context.walletAddress;
+    const isSelfQuery = !!context.walletAddress && !!targetAddress && targetAddress.toLowerCase() === context.walletAddress.toLowerCase();
+    if (context.positionFetcher && targetAddress) {
+      const sp = await context.positionFetcher(targetAddress);
       const borrowed2 = sp.borrows;
       const rawHf = sp.healthFactor ?? (borrowed2 > 0 ? 0 : Infinity);
       const status2 = hfStatus(rawHf, borrowed2);
@@ -1159,24 +1518,28 @@ var healthCheckTool = buildTool({
           borrowed: borrowed2,
           maxBorrow: sp.maxBorrow,
           liquidationThreshold: 0,
-          status: status2
+          status: status2,
+          address: targetAddress,
+          isSelfQuery
         },
-        displayText: displayHfText(transportHf2, borrowed2, status2)
+        displayText: displayHfText(transportHf2, borrowed2, status2, isSelfQuery, targetAddress)
       };
     }
-    if (hasNaviMcp(context)) {
-      const hf2 = await fetchHealthFactor(
-        getMcpManager(context),
-        getWalletAddress(context)
-      );
+    if (hasNaviMcpGlobal(context) && targetAddress) {
+      const hf2 = await fetchHealthFactor(getMcpManager(context), targetAddress);
       const borrowed2 = hf2.borrowed;
       const status2 = hfStatus(hf2.healthFactor, borrowed2);
       const transportHf2 = serializeHf(hf2.healthFactor, borrowed2);
       return {
-        data: { ...hf2, healthFactor: transportHf2, status: status2 },
-        displayText: displayHfText(transportHf2, borrowed2, status2)
+        data: { ...hf2, healthFactor: transportHf2, status: status2, address: targetAddress, isSelfQuery },
+        displayText: displayHfText(transportHf2, borrowed2, status2, isSelfQuery, targetAddress)
       };
     }
+    if (input.address && context.walletAddress && input.address.toLowerCase() !== context.walletAddress.toLowerCase()) {
+      throw new Error(
+        `Cannot inspect ${input.address.slice(0, 8)}\u2026 without NAVI MCP or a positionFetcher. Configure NAVI MCP to enable third-party address reads.`
+      );
+    }
     const agent = requireAgent(context);
     const hf = await agent.healthFactor();
     const borrowed = hf.borrowed;
@@ -1189,9 +1552,11 @@ var healthCheckTool = buildTool({
         borrowed,
         maxBorrow: hf.maxBorrow,
         liquidationThreshold: hf.liquidationThreshold,
-        status
+        status,
+        address: targetAddress ?? "",
+        isSelfQuery: true
       },
-      displayText: displayHfText(transportHf, borrowed, status)
+      displayText: displayHfText(transportHf, borrowed, status, true, void 0)
     };
   }
 });
@@ -1400,14 +1765,14 @@ async function queryHistoryByDate(rpcUrl, address, targetDate, limit) {
 }
 var HISTORY_ACTIONS = ["send", "lending", "swap", "transaction"];
 var DEFAULT_LOOKBACK_DAYS = 30;
-var SUI_ADDRESS_REGEX = /^0x[0-9a-fA-F]{64}$/;
+var SUI_ADDRESS_REGEX4 = /^0x[0-9a-fA-F]{64}$/;
 var transactionHistoryTool = buildTool({
   name: "transaction_history",
   description: 'Retrieve recent transaction history (last 30 days by default): sends, saves, withdrawals, borrows, repayments, swaps, and rewards claims. Renders a rich transaction card.\n\nBy default, queries the SIGNED-IN USER\'S history. To inspect another wallet (a saved contact, a watched address, any public Sui address), pass `address` \u2014 e.g. user asks "show funkii\'s recent transactions" with funkii at 0x40cd\u20263e62, call with `address: "0x40cd\u20263e62"`. To filter the user\'s own history to a specific counterparty (user asks "show transactions WITH funkii"), pass `counterparty` \u2014 keeps the query rooted in the user\'s wallet but shows only rows where funkii is the recipient or sender.\n\nFilter args: `date` (YYYY-MM-DD), `action` (send/lending/swap), `minUsd` (minimum amount in USD \u2014 use this for "transactions over $X" instead of post-filtering), `assetSymbol` (e.g. "USDC", "SUI"), `direction` ("in" or "out"). The card itself respects all filters \u2014 never re-list the rows in narration.\n\nInternally queries both `FromAddress` and `ToAddress` filters in parallel and dedupes by digest, so pure-receive transactions (someone sends to the queried address with no balance-affecting outbound) are no longer dropped.',
   inputSchema: z.object({
     limit: z.number().int().min(1).max(50).optional(),
-    address: z.string().regex(SUI_ADDRESS_REGEX, "Must be a 0x-prefixed 64-hex Sui address").optional().describe("Sui address to query history FOR. When omitted, defaults to the signed-in user's wallet. Pass this when the user asks about a contact's, watched address's, or any other public wallet's history."),
-    counterparty: z.string().regex(SUI_ADDRESS_REGEX, "Must be a 0x-prefixed 64-hex Sui address").optional().describe('Sui address to filter rows by \u2014 only transactions where the queried address sent to or received from this counterparty are returned. Use for "show transactions with <contact>" queries. Compares against `tx.recipient` (case-insensitive).'),
+    address: z.string().regex(SUI_ADDRESS_REGEX4, "Must be a 0x-prefixed 64-hex Sui address").optional().describe("Sui address to query history FOR. When omitted, defaults to the signed-in user's wallet. Pass this when the user asks about a contact's, watched address's, or any other public wallet's history."),
+    counterparty: z.string().regex(SUI_ADDRESS_REGEX4, "Must be a 0x-prefixed 64-hex Sui address").optional().describe('Sui address to filter rows by \u2014 only transactions where the queried address sent to or received from this counterparty are returned. Use for "show transactions with <contact>" queries. Compares against `tx.recipient` (case-insensitive).'),
     date: z.string().optional().describe("Specific date to search for transactions (YYYY-MM-DD format). Paginates back to find that day."),
     action: z.enum(HISTORY_ACTIONS).optional().describe("Filter by action: send, lending, swap, or transaction."),
     minUsd: z.number().min(0).optional().describe('Minimum transaction amount in USD. Use this for "transactions over $X" \u2014 the amount is converted to USD using the asset price snapshot.'),
@@ -1505,7 +1870,7 @@ var transactionHistoryTool = buildTool({
     const targetAddress = input.address ?? context.walletAddress;
     const isSelfQuery = !!targetAddress && !!context.walletAddress && targetAddress.toLowerCase() === context.walletAddress.toLowerCase();
     const prices = context.tokenPrices;
-    const priceFor = (sym) => {
+    const priceFor2 = (sym) => {
       if (!sym || !prices) return void 0;
       return prices[sym.toUpperCase()] ?? prices[sym.toLowerCase()] ?? prices[sym];
     };
@@ -1526,8 +1891,8 @@ var transactionHistoryTool = buildTool({
           if (r.amount == null) return false;
           const sym = r.asset?.toUpperCase() ?? "";
           const isStableLike = sym === "USDC" || sym === "USDT" || sym === "WUSDC" || sym === "WUSDT" || sym === "SUIUSDT" || sym === "USDY" || sym === "USDSUI" || sym === "USDE" || sym === "AUSD" || sym === "FDUSD" || sym === "BUCK";
-          const usd = isStableLike ? r.amount : (priceFor(sym) ?? 0) * r.amount;
-          if (!isStableLike && priceFor(sym) == null) return true;
+          const usd = isStableLike ? r.amount : (priceFor2(sym) ?? 0) * r.amount;
+          if (!isStableLike && priceFor2(sym) == null) return true;
           return usd >= minUsd;
         });
       }
@@ -3028,14 +3393,14 @@ Use when the user asks for a visual chart, simulator, or financial overview. Pic
 
 - activity_heatmap \u2014 on-chain transaction history as a GitHub-style heatmap (WORKS NOW \u2014 accepts \`params.address\` to inspect any public Sui wallet; defaults to the signed-in user)
 - portfolio_timeline \u2014 net worth over time, wallet/savings/debt breakdown (WORKS NOW \u2014 accepts \`params.address\` for any public wallet; defaults to the signed-in user)
-- yield_projector \u2014 compound yield simulator with amount/APY/period sliders (WORKS NOW \u2014 client-side)
-- health_simulator \u2014 borrow health factor simulator with collateral/debt sliders (WORKS NOW \u2014 uses current position)
-- dca_planner \u2014 savings plan curve for regular monthly deposits (WORKS NOW \u2014 client-side)
+- yield_projector \u2014 compound yield simulator with amount/APY/period sliders (WORKS NOW \u2014 client-side, no address needed)
+- health_simulator \u2014 borrow health factor simulator with collateral/debt sliders (WORKS NOW \u2014 accepts \`params.address\` for any public wallet; defaults to the signed-in user's current position)
+- dca_planner \u2014 savings plan curve for regular monthly deposits (WORKS NOW \u2014 client-side, no address needed)
 - spending_breakdown \u2014 spending by service category (WORKS NOW \u2014 accepts \`params.address\` for any public wallet; defaults to the signed-in user)
 - watch_address \u2014 portfolio overview for any public Sui address (WORKS NOW \u2014 pass \`params.address\`)
-- full_portfolio \u2014 4-panel overview: savings, health, activity, spending (WORKS NOW \u2014 aggregates all data)
+- full_portfolio \u2014 4-panel overview: savings, health, activity, spending (WORKS NOW \u2014 accepts \`params.address\` for any public wallet; defaults to the signed-in user)
 
-When the user asks to inspect a saved contact or watched address \u2014 e.g. "show funkii's activity heatmap", "what's funkii's portfolio look like", "spending breakdown for 0x40cd\u2026" \u2014 pass that wallet's address as \`params.address\`. The four address-aware templates (activity_heatmap, portfolio_timeline, spending_breakdown, watch_address) will scope their data fetch to that address; the rest target the signed-in user regardless of params.
+When the user asks to inspect a saved contact or watched address \u2014 e.g. "show funkii's activity heatmap", "what's funkii's portfolio look like", "spending breakdown for 0x40cd\u2026", "give me a full portfolio overview of 0x40cd\u2026" \u2014 pass that wallet's address as \`params.address\`. Six of the eight templates (activity_heatmap, portfolio_timeline, spending_breakdown, watch_address, health_simulator, full_portfolio) will scope their data fetch to that address; only the pure client-side simulators (yield_projector, dca_planner) ignore params.address.
 
 Always prefer the canvas for visualisation requests. After rendering, offer to explain what the user sees.`,
   inputSchema: z.object({
@@ -3043,7 +3408,7 @@ Always prefer the canvas for visualisation requests. After rendering, offer to e
     params: z.object({
       period: z.enum(["1m", "3m", "6m", "1y"]).optional().describe("Time period for time-based templates"),
       address: z.string().optional().describe(
-        "Sui address for the four address-aware templates (activity_heatmap, portfolio_timeline, spending_breakdown, watch_address). Defaults to the signed-in user; pass an explicit address to inspect a contact, watched wallet, or any other public address."
+        "Sui address for the six address-aware templates (activity_heatmap, portfolio_timeline, spending_breakdown, watch_address, health_simulator, full_portfolio). Defaults to the signed-in user; pass an explicit address to inspect a contact, watched wallet, or any other public address."
       )
     }).optional()
   }),
@@ -3077,7 +3442,20 @@ Always prefer the canvas for visualisation requests. After rendering, offer to e
       return { address: target, isSelfRender };
     };
     if (template === "full_portfolio") {
-      const pos = context.serverPositions;
+      const { address, isSelfRender } = resolveAddressTarget();
+      if (!address) {
+        return {
+          data: {
+            __canvas: true,
+            template,
+            title,
+            templateData: { available: false, message: "Full Portfolio needs an address." }
+          },
+          displayText: "Full Portfolio requires an address."
+        };
+      }
+      const titleSuffix = isSelfRender ? "" : ` \u2014 ${address.slice(0, 6)}\u2026${address.slice(-4)}`;
+      const pos = isSelfRender ? context.serverPositions : null;
       const rate = normalizeSavingsRate(pos?.savingsRate);
       const savings = pos?.savings ?? 0;
       const borrows = pos?.borrows ?? 0;
@@ -3085,17 +3463,18 @@ Always prefer the canvas for visualisation requests. After rendering, offer to e
         data: {
           __canvas: true,
           template,
-          title,
+          title: `${title}${titleSuffix}`,
           templateData: {
             available: true,
-            address: context.walletAddress ?? "",
+            address,
+            isSelfRender,
             currentSavings: savings,
             currentDebt: borrows,
             healthFactor: pos?.healthFactor ?? null,
             savingsRate: rate
           }
         },
-        displayText: `Opened Full Portfolio Overview.`
+        displayText: isSelfRender ? `Opened Full Portfolio Overview.` : `Opened Full Portfolio Overview for ${address.slice(0, 6)}\u2026${address.slice(-4)}.`
       };
     }
     if (template === "watch_address") {
@@ -3226,20 +3605,28 @@ Always prefer the canvas for visualisation requests. After rendering, offer to e
       };
     }
     if (template === "health_simulator") {
-      const roundedDebt = totalBorrows >= 1 ? Math.round(totalBorrows) : totalBorrows > 0 ? parseFloat(totalBorrows.toFixed(4)) : 0;
+      const { address: targetAddress, isSelfRender } = resolveAddressTarget();
+      const seedFromPos = isSelfRender;
+      const seedSavings = seedFromPos ? totalSavings : 0;
+      const seedBorrows = seedFromPos ? totalBorrows : 0;
+      const seedHf = seedFromPos ? healthFactor : null;
+      const roundedDebt = seedBorrows >= 1 ? Math.round(seedBorrows) : seedBorrows > 0 ? parseFloat(seedBorrows.toFixed(4)) : 0;
+      const titleSuffix = !targetAddress || isSelfRender ? "" : ` \u2014 ${targetAddress.slice(0, 6)}\u2026${targetAddress.slice(-4)}`;
       return {
         data: {
           __canvas: true,
           template,
-          title,
+          title: `${title}${titleSuffix}`,
           templateData: {
             available: true,
-            initialCollateral: totalSavings > 0 ? Math.round(totalSavings) : 1500,
-            initialDebt: roundedDebt > 0 ? roundedDebt : totalSavings > 0 ? 0 : 500,
-            currentHf: healthFactor
+            address: targetAddress ?? "",
+            isSelfRender,
+            initialCollateral: seedSavings > 0 ? Math.round(seedSavings) : 1500,
+            initialDebt: roundedDebt > 0 ? roundedDebt : seedSavings > 0 ? 0 : 500,
+            currentHf: seedHf
           }
         },
-        displayText: `Opened Health Factor Simulator. Current HF: ${healthFactor !== null ? healthFactor.toFixed(2) : "no active position"}.`
+        displayText: isSelfRender ? `Opened Health Factor Simulator. Current HF: ${healthFactor !== null ? healthFactor.toFixed(2) : "no active position"}.` : `Opened Health Factor Simulator${titleSuffix}. The simulator will fetch the current health factor for that wallet.`
       };
     }
     if (template === "dca_planner") {
@@ -3354,49 +3741,62 @@ var yieldSummaryTool = buildTool({
     }
   }
 });
+var SUI_ADDRESS_REGEX5 = /^0x[a-fA-F0-9]{1,64}$/;
 var activitySummaryTool = buildTool({
   name: "activity_summary",
-  description: "Returns a categorised DeFi activity summary for a period: transaction count, breakdown by action type (saves, sends, borrows, repayments, swaps, payments), total moved, net savings change, and yield earned. Use when the user asks about their activity, transaction history summary, or what they have done recently.",
+  description: "Returns a categorised DeFi activity summary for the signed-in user OR any public Sui address: transaction count, breakdown by action type (saves, sends, borrows, repayments, swaps, payments), total moved, net savings change, and yield earned. Use when the user asks about activity, transaction history summary, or what someone has done recently. Pass `address` to inspect a contact / watched / public wallet; defaults to the signed-in user when omitted.",
   inputSchema: z.object({
-    period: z.enum(["week", "month", "year", "all"]).optional().describe("Time period. Defaults to current month.")
+    period: z.enum(["week", "month", "year", "all"]).optional().describe("Time period. Defaults to current month."),
+    address: z.string().regex(SUI_ADDRESS_REGEX5).optional().describe("Sui address to inspect (defaults to the signed-in wallet)")
   }),
   jsonSchema: {
     type: "object",
     properties: {
-      period: { type: "string", enum: ["week", "month", "year", "all"] }
+      period: { type: "string", enum: ["week", "month", "year", "all"] },
+      address: {
+        type: "string",
+        pattern: "^0x[a-fA-F0-9]{1,64}$",
+        description: "Sui address to inspect (defaults to the signed-in wallet)"
+      }
     }
   },
   isReadOnly: true,
   async call(input, context) {
     const period = input.period ?? "month";
     const apiUrl = context.env?.AUDRIC_INTERNAL_API_URL;
-    const address = context.walletAddress;
+    const targetAddress = input.address ?? context.walletAddress;
+    const isSelfQuery = !!context.walletAddress && !!targetAddress && targetAddress.toLowerCase() === context.walletAddress.toLowerCase();
     const empty = {
       period,
       totalTransactions: 0,
       byAction: [],
       totalMovedUsd: 0,
       netSavingsUsd: 0,
-      yieldEarnedUsd: 0
+      yieldEarnedUsd: 0,
+      address: targetAddress,
+      isSelfQuery
     };
-    if (!apiUrl || !address) {
+    if (!apiUrl || !targetAddress) {
       return { data: empty, displayText: "Activity summary not available." };
     }
     try {
+      const callerHeader = context.walletAddress ?? targetAddress;
       const res = await fetch(
-        `${apiUrl}/api/analytics/activity-summary?address=${address}&period=${period}`,
-        { headers: { "x-sui-address": address }, signal: context.signal }
+        `${apiUrl}/api/analytics/activity-summary?address=${targetAddress}&period=${period}`,
+        { headers: { "x-sui-address": callerHeader }, signal: context.signal }
       );
       if (!res.ok) {
         return { data: empty, displayText: `Could not fetch activity data (HTTP ${res.status}).` };
       }
-      const data = await res.json();
+      const raw = await res.json();
+      const data = { ...raw, address: targetAddress, isSelfQuery };
       const sorted = [...data.byAction ?? []].sort((a, b) => b.count - a.count);
       const top = sorted.slice(0, 3).map((a) => `${a.action} (${a.count})`).join(", ");
       const periodLabel = data.period === "all" ? "all time" : `this ${data.period}`;
+      const subjectPrefix = isSelfQuery ? "" : `${targetAddress.slice(0, 6)}\u2026${targetAddress.slice(-4)} \u2014 `;
       return {
         data,
-        displayText: data.totalTransactions > 0 ? `${data.totalTransactions} transactions ${periodLabel}. Top: ${top}. Total moved: $${data.totalMovedUsd.toFixed(2)}. Net savings: $${data.netSavingsUsd.toFixed(2)}.` : `No activity recorded for ${periodLabel}.`
+        displayText: data.totalTransactions > 0 ? `${subjectPrefix}${data.totalTransactions} transactions ${periodLabel}. Top: ${top}. Total moved: $${data.totalMovedUsd.toFixed(2)}. Net savings: $${data.netSavingsUsd.toFixed(2)}.` : `${subjectPrefix}No activity recorded for ${periodLabel}.`
       };
     } catch {
       return { data: empty, displayText: "Error fetching activity summary." };
@@ -3873,7 +4273,7 @@ function guardCostWarning(tool, _call, conversationText) {
     message: "This action has a monetary cost. Confirm the user is aware before proceeding."
   };
 }
-var SUI_ADDRESS_REGEX2 = /^0x[a-fA-F0-9]{64}$/;
+var SUI_ADDRESS_REGEX6 = /^0x[a-fA-F0-9]{64}$/;
 function normalizeAddress(addr) {
   return addr.trim().toLowerCase();
 }
@@ -3938,7 +4338,7 @@ function guardAddressSource(tool, call, userText, contacts, walletAddress) {
   if (!rawTo) {
     return { verdict: "pass", gate: "address_source", tier: "safety" };
   }
-  if (!SUI_ADDRESS_REGEX2.test(rawTo)) {
+  if (!SUI_ADDRESS_REGEX6.test(rawTo)) {
     return { verdict: "pass", gate: "address_source", tier: "safety" };
   }
   const normalizedTo = normalizeAddress(rawTo);