primecli 0.5.1__tar.gz → 0.5.3__tar.gz

{primecli-0.5.1 → primecli-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: primecli
-Version: 0.5.1
+Version: 0.5.3
 Summary: Agent-friendly CLI tools for the DeltaPrime (Avalanche + Arbitrum) and DegenPrime (Base) lending and leverage protocols. Preview-by-default; no Etherscan key required.
 Author: Mnemosyne-quest contributors
 License: MIT
@@ -28,7 +28,6 @@ Requires-Dist: eth-account>=0.13
 Requires-Dist: eth-keys>=0.5
 Requires-Dist: eth-abi<7,>=5.0
 Requires-Dist: requests>=2.31
-Dynamic: license-file
 
 # primecli
 
@@ -48,7 +47,7 @@ Built for agent use:
 - RedStone-signed solvency math handled internally, with a regression test pinning the half-boundary `toFixed(8)` encoding.
 - ParaSwap calldata validated client-side against the on-chain executor allowlist before broadcast.
 
-**Current version:** 0.5.1 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
+**Current version:** 0.5.2 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
 
 > **Breaking change in 0.5.0:** there is no longer a default signing key. Earlier versions silently fell back to a baked-in agent when no key was configured; that fallback has been removed. With no key configured, every command now fails closed with `No signing key found...`. Set a key explicitly (see [Configuration](#configuration)).
 

{primecli-0.5.1 → primecli-0.5.3}/README.md

@@ -16,7 +16,7 @@ Built for agent use:
 - RedStone-signed solvency math handled internally, with a regression test pinning the half-boundary `toFixed(8)` encoding.
 - ParaSwap calldata validated client-side against the on-chain executor allowlist before broadcast.
 
-**Current version:** 0.5.1 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
+**Current version:** 0.5.2 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
 
 > **Breaking change in 0.5.0:** there is no longer a default signing key. Earlier versions silently fell back to a baked-in agent when no key was configured; that fallback has been removed. With no key configured, every command now fails closed with `No signing key found...`. Set a key explicitly (see [Configuration](#configuration)).
 

{primecli-0.5.1 → primecli-0.5.3}/primecli/arbprime.py

@@ -57,6 +57,13 @@ prime-summary reports live solvency (health ratio, total value, debt, solvent fl
 SolvencyFacetProdArbitrum, read via eth_call with a RedStone price payload appended (falls
 back to balances-only if the gateway is unreachable).
 
+NOTE: prime-summary shows TWO health metrics — don't confuse them:
+  - "Health ratio (chain)":  on-chain getHealthRatio. 1.0 = liquidation, >1.0 = solvent.
+  - "Health (Bruno 0-100%)": equity-based, frontend-style. 0% = liquidation, 50% = half
+    borrowing power used, 100% = no debt.
+  Formula for the latter: equity=supplied-debt, max_debt=equity*(tier-1),
+  pct=(max_debt-debt)/max_debt*100. tier=5 (BASIC) or 10 (PREMIUM).
+
 Collateral withdrawal is a two-step, time-delayed flow on the Prime Account (there is NO
 instant withdraw of in-account collateral). The savings-pool `withdraw` above is a separate
 two-step intent flow on the pool itself, not the Prime Account. Step 1: `withdraw --pool X
@@ -1961,6 +1968,49 @@ def gather_lending(w3, account):
             r["usd"] = None
     return out
 
+def _compute_bruno_health(data: dict, tier_code: int = 0) -> dict:
+    """Compute Bruno's 0-100% health from gather_lending data + tier.
+
+    DeltaPrime has *two* health metrics that agents must not confuse:
+
+      1. health_ratio (on-chain, getHealthRatio): 1.0 = liquidation, >1.0 = solvent.
+         This is the raw weighted-collateral / debt ratio from the SolvencyFacet.
+
+      2. bruno_pct (equity-based, 0-100%): the scale used in the DeltaPrime frontend
+         and the account-health-monitor cron. 0% = liquidation, 100% = no debt.
+         Formula:
+           equity    = supplied_usd - debt_usd
+           max_mult  = 10 if PREMIUM tier else 5 if BASIC
+           max_debt  = equity * (max_mult - 1)
+           bruno_pct = (max_debt - debt_usd) / max_debt * 100
+
+    Returns dict with keys: bruno_pct, supplied_usd, debt_usd, equity, max_debt,
+    tier_label, or error.
+    """
+    supplied_usd = sum(r.get("usd", 0) or 0 for r in data.get("supplied", []))
+    debt_usd = sum(r.get("usd", 0) or 0 for r in data.get("borrowed", []))
+    equity = supplied_usd - debt_usd
+    tier_labels = {0: "BASIC", 1: "PREMIUM", 2: "_NON_EXISTENT"}
+    tier_label = tier_labels.get(tier_code, str(tier_code))
+    max_mult = {0: 5, 1: 10}.get(tier_code, 5)
+
+    if equity <= 0.01:
+        return {"bruno_pct": 0.0, "supplied_usd": round(supplied_usd, 2),
+                "debt_usd": round(debt_usd, 2), "equity": round(equity, 2),
+                "max_debt": 0.0, "tier": tier_label, "error": "equity near zero"}
+
+    max_debt = equity * (max_mult - 1)
+    if max_debt > 0 and debt_usd >= 0:
+        bruno_pct = (max_debt - min(debt_usd, max_debt)) / max_debt * 100
+        bruno_pct = max(0.0, min(100.0, bruno_pct))
+    else:
+        bruno_pct = 100.0
+
+    return {"bruno_pct": round(bruno_pct, 1), "supplied_usd": round(supplied_usd, 2),
+            "debt_usd": round(debt_usd, 2), "equity": round(equity, 2),
+            "max_debt": round(max_debt, 2), "tier": tier_label}
+
+
 def cmd_prime_summary():
     w3 = get_w3()
     acct = get_account()
@@ -2004,7 +2054,23 @@ def cmd_prime_summary():
         # gather_lending nulls the ratio when debt is negligible (the raw value is
         # astronomically large there); render that as ">1000" rather than a junk number.
         ratio_str = ">1000.00 (negligible debt)" if ratio is None else f"{ratio:.4f}"
-        print(f"  Health ratio:       {ratio_str}  (>1.0 = solvent)")
+        print(f"  Health ratio (chain): {ratio_str}  (>1.0 = solvent, 1.0 = liquidation)")
+        # ─── Bruno's 0-100% health (equity-based, uses tier multiplier) ───
+        # Different from health_ratio! See _compute_bruno_health docstring.
+        # Get tier from the Prime Account (oracle-free view)
+        try:
+            tier_info = gather_prime_tier(w3, acct, account)
+            tier_code = tier_info.get("tier_code", 0)
+        except Exception:
+            tier_code = 0
+        bh = _compute_bruno_health(data, tier_code)
+        if "error" not in bh:
+            print(f"  Health (Bruno 0-100%): {bh['bruno_pct']:.1f}%")
+            print(f"    (supplied=${bh['supplied_usd']:.2f}, debt=${bh['debt_usd']:.2f},"
+                  f" equity=${bh['equity']:.2f}, max_debt=${bh['max_debt']:.2f}, {bh['tier']})")
+            print(f"    0%=liquidation  50%=half borrowing power used  100%=no debt")
+        else:
+            print(f"  Health (Bruno 0-100%): N/A ({bh['error']})")
         print(f"  Solvent:            {'yes' if data['solvent'] else 'NO — liquidatable'}")
     else:
         print(f"  Health/solvency:    RedStone fetch/call failed ({data.get('solvency_error', 'error')}); "
@@ -5005,9 +5071,12 @@ def gather_defi() -> dict:
         result["total_usd"] = lending["total_value_usd"]
         result["health_ratio"] = lending["health_ratio"]
         result["solvent"] = lending["solvent"]
+        # Compute Bruno's 0-100% health from lending data + tier
+        result["bruno_pct"] = _compute_bruno_health(lending, tier.get("tier_code", 0)).get("bruno_pct")
         if lending["supplied"] or lending["borrowed"]:
             result["groups"].append({
                 "type": "Lending / Leverage", "health_ratio": lending["health_ratio"],
+                "bruno_pct": result["bruno_pct"],
                 "supplied": [{"symbol": r["symbol"], "balance": r["balance"], "usd": r.get("usd")}
                              for r in lending["supplied"]],
                 "borrowed": [{"symbol": r["symbol"], "balance": r["balance"], "usd": r.get("usd")}

{primecli-0.5.1 → primecli-0.5.3}/primecli/degenprime.py

@@ -15,6 +15,7 @@ Usage:
   degenprime create-account [--execute]
   degenprime create-account --fund-pool usdc --fund-amount 100 [--execute]
   degenprime summary
+  degenprime defi --json          (aggregate ALL positions as DeBank-style JSON; read-only)
   degenprime fund --pool usdc --amount 100 [--execute]
   degenprime borrow --pool usdc --amount 100 [--execute]
   degenprime repay --pool usdc --amount 100 [--execute]
@@ -1293,34 +1294,10 @@ def _prices_usd(w3, account, symbols: list, payload: bytes) -> dict:
     except Exception:
         return {}
 
-def cmd_summary(as_json: bool = False):
-    """Read-only Degen Account view: in-account collateral, debts, and live
-    RedStone-gated solvency (getTotalValue/getDebt/getHealthRatio/isSolvent). Falls
-    back to balances-only if the RedStone gateway is unreachable or a view reverts.
-    Note: per-asset USD is best-effort - only symbols with a RedStone primary-prod
-    feed are priced here. Symbols sourced on-chain from BaseOracle TWAP show as
-    balance-only (the SolvencyFacet still values them for the total/debt figures).
-
-    With --json: emits a single JSON object covering wallet, account, native
-    balance, per-asset supplied/borrowed with optional USD, poolDeposits (the EOA's
-    'Diamond Hands' lending-pool balances, emitted even with no Degen Account),
-    total/debt/health-ratio/solvent flags. Null fields, empty lists, and empty dicts are dropped (same
-    trim contract as `deltaprime defi --json`). Numeric 0 and boolean false are
-    preserved.
-
-    Multicall: stage A batches getAllOwnedAssets + getDebts (2 -> 1 RPC). Stage B
-    batches one getBalance per owned asset (N -> 1 RPC). Stage C batches the four
-    RedStone-gated solvency views + getPrices (4-5 -> 1 RPC), each leg carrying the
-    same RedStone payload appended."""
-    w3 = get_w3()
-    acct = get_account()
-    pa = get_prime_account(w3, acct.address)
-    if not as_json:
-        print(f"Wallet: {acct.address}")
-
-    # Pool deposits ("Diamond Hands") are EOA balances independent of the Degen Account,
-    # so read them up front via one Multicall3 — they must surface even for a wallet with
-    # no Degen Account (e.g. a deposit made before creating one).
+def _gather_pool_deposits(w3, owner: str) -> list:
+    """The EOA's 'Diamond Hands' lending-pool balances, read independently of the Degen
+    Account via one Multicall3 (one balanceOf per pool). Surfaces even for a wallet with
+    no Degen Account. Returns [{symbol, raw, decimals}, ...] for non-zero balances."""
     pool_deposits = []
     dep_legs, dep_meta = [], []
     for _pname, _pcfg in POOLS.items():
@@ -1329,7 +1306,7 @@ def cmd_summary(as_json: bool = False):
         except Exception:
             continue
         _proxy_cs = Web3.to_checksum_address(_pcfg["proxy"])
-        dep_legs.append((_proxy_cs, bytes.fromhex(_pc.encode_abi("balanceOf", args=[acct.address])[2:])))
+        dep_legs.append((_proxy_cs, bytes.fromhex(_pc.encode_abi("balanceOf", args=[owner])[2:])))
         dep_meta.append(_pcfg)
     if dep_legs:
         try:
@@ -1340,32 +1317,21 @@ def cmd_summary(as_json: bool = False):
             _bal = w3.codec.decode(["uint256"], _rd)[0] if _ok and _rd else 0
             if _bal > 0:
                 pool_deposits.append({"symbol": _pcfg["symbol"], "raw": _bal, "decimals": _pcfg["decimals"]})
+    return pool_deposits
 
-    if not pa:
-        # No Degen Account: still surface Diamond Hands deposits (balance-only — the
-        # RedStone getPrices view lives on the Degen Account, absent here).
-        if as_json:
-            out = {"wallet": acct.address, "account": None}
-            if pool_deposits:
-                out["poolDeposits"] = [{"symbol": r["symbol"], "amount": r["raw"] / 10**r["decimals"]}
-                                       for r in pool_deposits]
-            print(json.dumps(out, indent=2))
-        else:
-            print("No Degen Account yet. Create one with: degenprime create-account --execute")
-            if pool_deposits:
-                print("  Pool Deposits (Diamond Hands):")
-                for r in pool_deposits:
-                    print(f"    {r['symbol']:<8} {r['raw'] / 10**r['decimals']:,.6f}")
-        return
 
-    pa_eth = w3.eth.get_balance(pa) / 1e18
-    if not as_json:
-        print(f"Degen Account: {pa}")
-        if pa_eth >= 1e-9:
-            print(f"  Native ETH (gas):  {pa_eth:.6f}")
+def _gather_account_state(w3, account, pool_deposits: list):
+    """Read-only collateral / debt / RedStone-gated solvency for an existing Degen Account.
+    Shared by `summary` and `defi`. Returns (pa_eth, supplied, borrowed, solvency) where
+    supplied/borrowed are [{symbol, raw, decimals}, ...] and solvency carries
+    total/debt/ratio/solvent/error/prices. pool_deposits is taken so their feeds get folded
+    into the RedStone payload (else getPrices reverts on a deposit-only symbol).
 
-    account = w3.eth.contract(address=Web3.to_checksum_address(pa), abi=PRIME_ACCOUNT_ABI)
+    Multicall: stage A batches getAllOwnedAssets + getDebts (2 -> 1 RPC). Stage B batches
+    one getBalance per owned asset (N -> 1 RPC). Stage C batches the four RedStone-gated
+    solvency views + getPrices (4-5 -> 1 RPC), each leg carrying the same payload appended."""
     pa_cs = account.address
+    pa_eth = w3.eth.get_balance(pa_cs) / 1e18
     stage_a_legs = [
         ("getAllOwnedAssets", ["bytes32[]"], account.encode_abi("getAllOwnedAssets", args=[])),
         ("getDebts", ["(bytes32,uint256)[]"], account.encode_abi("getDebts", args=[])),
@@ -1449,6 +1415,160 @@ def cmd_summary(as_json: bool = False):
         solvency["prices"] = prices
     except Exception as e:
         solvency["error"] = type(e).__name__
+    return pa_eth, supplied, borrowed, solvency
+
+
+def gather_defi() -> dict:
+    """Aggregate ALL DegenPrime positions for the selected wallet into one DeBank-style dict,
+    matching the cross-tool shape `deltaprime defi --json` emits. Read-only: reuses the same
+    gather helpers as `summary` (lending/solvency via the RedStone-gated views, plus the EOA's
+    own pool deposits surfaced as a Savings group). Empty groups are omitted. total_usd /
+    health_ratio / solvent come from the RedStone-gated solvency views; per-asset USD is
+    best-effort (omitted where a RedStone feed is missing). Never broadcasts."""
+    w3 = get_w3()
+    acct = get_account()
+    pa = get_prime_account(w3, acct.address)
+    result = {
+        "protocol": "DegenPrime", "url": "https://degenprime.io", "chain": "base",
+        "wallet": acct.address, "prime_account": pa,
+        "total_usd": None, "health_ratio": None, "solvent": None,
+        "groups": [], "status": "ok",
+    }
+
+    pool_deposits = _gather_pool_deposits(w3, acct.address)
+    # _gather_account_state folds pool-deposit symbols into getPrices, so this map covers
+    # both in-account assets and Diamond-Hands deposits. Empty with no Degen Account.
+    prices = {}
+
+    if pa:
+        account = w3.eth.contract(address=Web3.to_checksum_address(pa), abi=PRIME_ACCOUNT_ABI)
+        _pa_eth, supplied, borrowed, solvency = _gather_account_state(w3, account, pool_deposits)
+        prices = solvency["prices"]
+        result["total_usd"] = solvency["total"]
+        result["health_ratio"] = solvency["ratio"]
+        result["solvent"] = solvency["solvent"]
+        if solvency["error"]:
+            result["solvency_error"] = solvency["error"]
+
+        def _row(r):
+            amt = r["raw"] / 10**r["decimals"]
+            row = {"symbol": r["symbol"], "balance": f"{amt:.6f}"}
+            usd = prices.get(r["symbol"])
+            if usd is not None:
+                row["usd"] = round(amt * usd, 2)
+            return row
+
+        if supplied or borrowed:
+            result["groups"].append({
+                "type": "Lending / Leverage", "health_ratio": solvency["ratio"],
+                "supplied": [_row(r) for r in supplied],
+                "borrowed": [_row(r) for r in borrowed],
+            })
+
+    # Savings: the EOA's own pool deposits ("Diamond Hands"), independent of the Degen
+    # Account (so NOT in getTotalValue) — surfaced as their own group and added on top.
+    # Priced from the same RedStone read used for the account (no extra RPC).
+    if pool_deposits:
+        sav_rows, sav_usd_total = [], 0.0
+        for r in pool_deposits:
+            amt = r["raw"] / 10**r["decimals"]
+            row = {"symbol": r["symbol"], "balance": f"{amt:.6f}"}
+            usd = prices.get(r["symbol"])
+            if usd is not None:
+                row["usd"] = round(amt * usd, 2)
+                sav_usd_total += amt * usd
+            sav_rows.append(row)
+        result["groups"].append({"type": "Savings", "label": "Savings", "supplied": sav_rows})
+        if sav_usd_total:
+            result["total_usd"] = (result["total_usd"] or 0) + sav_usd_total
+
+    return result
+
+
+_DEFI_DECORATIVE_KEYS = {"url"}
+
+
+def _trim_defi_json(value):
+    """Recursively strip noise from `defi --json` output so an LLM consumer doesn't pay
+    context for fields that carry no information: drops dict keys whose value is exactly
+    None, drops keys whose value is an empty list or empty dict, drops the decorative
+    top-level `url` key, but PRESERVES numeric 0 and boolean False (zero balance,
+    explicitly-not-solvent, etc.) and keeps the top-level structure so a consumer can tell
+    what's missing from what shape the response took. Same contract as `deltaprime`'s."""
+    if isinstance(value, dict):
+        out = {}
+        for k, v in value.items():
+            if k in _DEFI_DECORATIVE_KEYS:
+                continue
+            trimmed = _trim_defi_json(v)
+            if trimmed is None:
+                continue
+            if isinstance(trimmed, (list, dict)) and len(trimmed) == 0:
+                continue
+            out[k] = trimmed
+        return out
+    if isinstance(value, list):
+        return [_trim_defi_json(v) for v in value]
+    return value
+
+
+def cmd_defi(as_json: bool = True):
+    """Aggregate all DegenPrime positions for the wallet. Default output is the DeBank-style
+    JSON (the cross-tool shape the health monitor consumes). On error, emits
+    {"status":"error", ...} rather than raising, so the caller always gets parseable JSON."""
+    try:
+        data = gather_defi()
+    except Exception as e:
+        data = {"protocol": "DegenPrime", "chain": "base",
+                "status": "error", "error": f"{type(e).__name__}: {e}"}
+    print(json.dumps(_trim_defi_json(data), indent=2))
+
+
+def cmd_summary(as_json: bool = False):
+    """Read-only Degen Account view: in-account collateral, debts, and live
+    RedStone-gated solvency (getTotalValue/getDebt/getHealthRatio/isSolvent). Falls
+    back to balances-only if the RedStone gateway is unreachable or a view reverts.
+    Note: per-asset USD is best-effort - only symbols with a RedStone primary-prod
+    feed are priced here. Symbols sourced on-chain from BaseOracle TWAP show as
+    balance-only (the SolvencyFacet still values them for the total/debt figures).
+
+    With --json: emits a single JSON object covering wallet, account, native
+    balance, per-asset supplied/borrowed with optional USD, poolDeposits (the EOA's
+    'Diamond Hands' lending-pool balances, emitted even with no Degen Account),
+    total/debt/health-ratio/solvent flags. Null fields, empty lists, and empty dicts are dropped (same
+    trim contract as `deltaprime defi --json`). Numeric 0 and boolean false are
+    preserved."""
+    w3 = get_w3()
+    acct = get_account()
+    pa = get_prime_account(w3, acct.address)
+    if not as_json:
+        print(f"Wallet: {acct.address}")
+
+    pool_deposits = _gather_pool_deposits(w3, acct.address)
+
+    if not pa:
+        # No Degen Account: still surface Diamond Hands deposits (balance-only — the
+        # RedStone getPrices view lives on the Degen Account, absent here).
+        if as_json:
+            out = {"wallet": acct.address, "account": None}
+            if pool_deposits:
+                out["poolDeposits"] = [{"symbol": r["symbol"], "amount": r["raw"] / 10**r["decimals"]}
+                                       for r in pool_deposits]
+            print(json.dumps(out, indent=2))
+        else:
+            print("No Degen Account yet. Create one with: degenprime create-account --execute")
+            if pool_deposits:
+                print("  Pool Deposits (Diamond Hands):")
+                for r in pool_deposits:
+                    print(f"    {r['symbol']:<8} {r['raw'] / 10**r['decimals']:,.6f}")
+        return
+
+    account = w3.eth.contract(address=Web3.to_checksum_address(pa), abi=PRIME_ACCOUNT_ABI)
+    pa_eth, supplied, borrowed, solvency = _gather_account_state(w3, account, pool_deposits)
+    if not as_json:
+        print(f"Degen Account: {pa}")
+        if pa_eth >= 1e-9:
+            print(f"  Native ETH (gas):  {pa_eth:.6f}")
 
     if as_json:
         def _asset_row(r):
@@ -2315,6 +2435,8 @@ def _dispatch():
         cmd_create_account("--execute" in args, fund_pool, fund_amount)
     elif cmd == "summary":
         cmd_summary(as_json="--json" in args)
+    elif cmd == "defi":
+        cmd_defi("--json" in args)
     elif cmd == "fund":
         pool, amount = None, None
         execute = "--execute" in args

{primecli-0.5.1 → primecli-0.5.3}/primecli/deltaprime.py

@@ -50,6 +50,13 @@ prime-summary reports live solvency (health ratio, total value, debt, solvent fl
 SolvencyFacetProdAvalanche, read via eth_call with a RedStone price payload appended (falls
 back to balances-only if the gateway is unreachable).
 
+NOTE: prime-summary shows TWO health metrics — don't confuse them:
+  - "Health ratio (chain)":  on-chain getHealthRatio. 1.0 = liquidation, >1.0 = solvent.
+  - "Health (Bruno 0-100%)": equity-based, frontend-style. 0% = liquidation, 50% = half
+    borrowing power used, 100% = no debt.
+  Formula for the latter: equity=supplied-debt, max_debt=equity*(tier-1),
+  pct=(max_debt-debt)/max_debt*100. tier=5 (BASIC) or 10 (PREMIUM).
+
 Collateral withdrawal is a two-step, time-delayed flow on the Prime Account (there is NO
 instant withdraw of in-account collateral). The savings-pool `withdraw` above is a separate
 two-step intent flow on the pool itself, not the Prime Account. Step 1: `withdraw --pool X
@@ -658,33 +665,42 @@ def _tx_gas_price(w3) -> int:
 
 def _set_gas_price(w3, tx_dict):
     """Set appropriate gas price fields for the chain, replacing the legacy gasPrice approach.
-    On EIP-1559 chains (Arbitrum, Base): sets maxFeePerGas + maxPriorityFeePerGas with a 2x
-    base-fee hedge (base + prio + 1 gwei buffer). On Avalanche (legacy): sets gasPrice at
-    2x base fee with a 1 gwei floor. (25 gwei was the pre-Etna C-chain minimum;
-    ACP-125 (Dec 2024) lowered the min base fee to 1 nAVAX — base now sits at ~0.01
-    nAVAX, so a 25 gwei floor overpaid ~2500x and inflated the upfront balance
-    requirement past small EOAs.)"""
+    On EIP-1559 chains (Arbitrum, Base, Avalanche post-Etna): sets maxFeePerGas +
+    maxPriorityFeePerGas with a 2x base-fee hedge (base + prio + 1 gwei buffer).
+    Falls back to legacy gasPrice only if the tx dict already lacks EIP-1559 fields
+    and the chain doesn't support max_priority_fee.
+    (25 gwei was the pre-Etna C-chain minimum; ACP-125 (Dec 2024) lowered the min base
+    fee to 1 nAVAX — base now sits at ~0.01 nAVAX, so a 25 gwei floor overpaid ~2500x
+    and inflated the upfront balance requirement past small EOAs.)"""
+    # If build_transaction already set EIP-1559 fields, don't touch them
+    if "maxFeePerGas" in tx_dict or "maxPriorityFeePerGas" in tx_dict:
+        tx_dict.pop("gasPrice", None)
+        return
     tx_dict.pop("gasPrice", None)
-    if CHAIN_ID in (42161, 8453):  # Arbitrum, Base — EIP-1559
+    try:
         base = w3.eth.gas_price
         prio = w3.eth.max_priority_fee
         tx_dict["maxFeePerGas"] = max(int(base * 2), base + prio + 10**9)
         tx_dict["maxPriorityFeePerGas"] = prio
-    else:  # Avalanche (43114) — legacy gasPrice
+    except Exception:
+        # Legacy chain — use gasPrice instead
         tx_dict["gasPrice"] = max(int(w3.eth.gas_price * 2), 1 * 10**9)
 
 def _set_gas_price_for(chain_id, w3, tx_dict):
     """Set gas fields for an EXPLICIT chain_id rather than the module CHAIN_ID. Needed by
     cross-chain flows (prime-bridge) where a tx may target Avalanche or Arbitrum regardless
-    of which tool built it. Arbitrum/Base (EIP-1559): maxFeePerGas + maxPriorityFeePerGas;
-    Avalanche (legacy): gasPrice with a 1 gwei floor (post-Etna; see _set_gas_price)."""
+    of which tool built it."""
+    # If build_transaction already set EIP-1559 fields, don't touch them
+    if "maxFeePerGas" in tx_dict or "maxPriorityFeePerGas" in tx_dict:
+        tx_dict.pop("gasPrice", None)
+        return
     tx_dict.pop("gasPrice", None)
-    if chain_id in (42161, 8453):  # Arbitrum, Base — EIP-1559
+    try:
         base = w3.eth.gas_price
         prio = w3.eth.max_priority_fee
         tx_dict["maxFeePerGas"] = max(int(base * 2), base + prio + 10**9)
         tx_dict["maxPriorityFeePerGas"] = prio
-    else:  # Avalanche (43114) — legacy gasPrice
+    except Exception:
         tx_dict["gasPrice"] = max(int(w3.eth.gas_price * 2), 1 * 10**9)
 
 def _read_env_var(path, var):
@@ -1979,6 +1995,49 @@ def gather_lending(w3, account):
             r["usd"] = None
     return out
 
+def _compute_bruno_health(data: dict, tier_code: int = 0) -> dict:
+    """Compute Bruno's 0-100% health from gather_lending data + tier.
+
+    DeltaPrime has *two* health metrics that agents must not confuse:
+
+      1. health_ratio (on-chain, getHealthRatio): 1.0 = liquidation, >1.0 = solvent.
+         This is the raw weighted-collateral / debt ratio from the SolvencyFacet.
+
+      2. bruno_pct (equity-based, 0-100%): the scale used in the DeltaPrime frontend
+         and the account-health-monitor cron. 0% = liquidation, 100% = no debt.
+         Formula:
+           equity    = supplied_usd - debt_usd
+           max_mult  = 10 if PREMIUM tier else 5 if BASIC
+           max_debt  = equity * (max_mult - 1)
+           bruno_pct = (max_debt - debt_usd) / max_debt * 100
+
+    Returns dict with keys: bruno_pct, supplied_usd, debt_usd, equity, max_debt,
+    tier_label, or error.
+    """
+    supplied_usd = sum(r.get("usd", 0) or 0 for r in data.get("supplied", []))
+    debt_usd = sum(r.get("usd", 0) or 0 for r in data.get("borrowed", []))
+    equity = supplied_usd - debt_usd
+    tier_labels = {0: "BASIC", 1: "PREMIUM", 2: "_NON_EXISTENT"}
+    tier_label = tier_labels.get(tier_code, str(tier_code))
+    max_mult = {0: 5, 1: 10}.get(tier_code, 5)
+
+    if equity <= 0.01:
+        return {"bruno_pct": 0.0, "supplied_usd": round(supplied_usd, 2),
+                "debt_usd": round(debt_usd, 2), "equity": round(equity, 2),
+                "max_debt": 0.0, "tier": tier_label, "error": "equity near zero"}
+
+    max_debt = equity * (max_mult - 1)
+    if max_debt > 0 and debt_usd >= 0:
+        bruno_pct = (max_debt - min(debt_usd, max_debt)) / max_debt * 100
+        bruno_pct = max(0.0, min(100.0, bruno_pct))
+    else:
+        bruno_pct = 100.0
+
+    return {"bruno_pct": round(bruno_pct, 1), "supplied_usd": round(supplied_usd, 2),
+            "debt_usd": round(debt_usd, 2), "equity": round(equity, 2),
+            "max_debt": round(max_debt, 2), "tier": tier_label}
+
+
 def cmd_prime_summary():
     w3 = get_w3()
     acct = get_account()
@@ -2022,7 +2081,23 @@ def cmd_prime_summary():
         # gather_lending nulls the ratio when debt is negligible (the raw value is
         # astronomically large there); render that as ">1000" rather than a junk number.
         ratio_str = ">1000.00 (negligible debt)" if ratio is None else f"{ratio:.4f}"
-        print(f"  Health ratio:       {ratio_str}  (>1.0 = solvent)")
+        print(f"  Health ratio (chain): {ratio_str}  (>1.0 = solvent, 1.0 = liquidation)")
+        # ─── Bruno's 0-100% health (equity-based, uses tier multiplier) ───
+        # Different from health_ratio! See _compute_bruno_health docstring.
+        # Get tier from the Prime Account (oracle-free view)
+        try:
+            tier_info = gather_prime_tier(w3, acct, account)
+            tier_code = tier_info.get("tier_code", 0)
+        except Exception:
+            tier_code = 0
+        bh = _compute_bruno_health(data, tier_code)
+        if "error" not in bh:
+            print(f"  Health (Bruno 0-100%): {bh['bruno_pct']:.1f}%")
+            print(f"    (supplied=${bh['supplied_usd']:.2f}, debt=${bh['debt_usd']:.2f},"
+                  f" equity=${bh['equity']:.2f}, max_debt=${bh['max_debt']:.2f}, {bh['tier']})")
+            print(f"    0%=liquidation  50%=half borrowing power used  100%=no debt")
+        else:
+            print(f"  Health (Bruno 0-100%): N/A ({bh['error']})")
         print(f"  Solvent:            {'yes' if data['solvent'] else 'NO — liquidatable'}")
     else:
         print(f"  Health/solvency:    RedStone fetch/call failed ({data.get('solvency_error', 'error')}); "
@@ -4928,9 +5003,12 @@ def gather_defi() -> dict:
         result["total_usd"] = lending["total_value_usd"]
         result["health_ratio"] = lending["health_ratio"]
         result["solvent"] = lending["solvent"]
+        # Compute Bruno's 0-100% health from lending data + tier
+        result["bruno_pct"] = _compute_bruno_health(lending, tier.get("tier_code", 0)).get("bruno_pct")
         if lending["supplied"] or lending["borrowed"]:
             result["groups"].append({
                 "type": "Lending / Leverage", "health_ratio": lending["health_ratio"],
+                "bruno_pct": result["bruno_pct"],
                 "supplied": [{"symbol": r["symbol"], "balance": r["balance"], "usd": r.get("usd")}
                              for r in lending["supplied"]],
                 "borrowed": [{"symbol": r["symbol"], "balance": r["balance"], "usd": r.get("usd")}

{primecli-0.5.1 → primecli-0.5.3}/primecli/health_monitor.py

@@ -39,11 +39,19 @@ TIER_MAX = {"basic": 5, "premium": 10}
 def compute_health(defi_data: dict, max_mult: int = 10) -> dict:
     """Compute Bruno's 0-100% health scale from defi --json data.
 
+    PREFERS the precomputed ``bruno_pct`` from defi --json (which primecli now
+    includes as of 2026-06-04), falling back to manual calculation when absent.
+
     Formula:
       equity = total_supplied_usd - total_debt_usd
       max_debt = equity * (tier - 1)    # PREMIUM=10, BASIC=5
       health% = (max_debt - debt) / max_debt * 100
 
+    This is DIFFERENT from getHealthRatio (the on-chain ratio where 1.0 = liquidation).
+    Do NOT convert between the two. The ``health_ratio`` metric is the on-chain value
+    (1.0=liquidation, >1.0=solvent). The ``bruno_pct`` is the equity-based frontend
+    measurement (0%=liquidation, 50%=half borrowing power used, 100%=no debt).
+
     Returns dict with health metrics or error.
     """
     # Parse groups (DeltaPrime format) or flat format (DegenPrime)
@@ -53,6 +61,31 @@ def compute_health(defi_data: dict, max_mult: int = 10) -> dict:
         supplied = g.get("supplied", [])
         borrowed = g.get("borrowed", [])
         health_ratio = g.get("health_ratio", 0) or 0
+        # Use precomputed bruno_pct from defi --json if available (primecli >= 0.5.0)
+        precomputed = g.get("bruno_pct")
+        if precomputed is not None:
+            # Early return: precomputed value exists, enrich with detail fields
+            supplied_usd = sum(s.get("usd", 0) or 0 for s in supplied)
+            debt_usd = sum(b.get("usd", 0) or 0 for b in borrowed)
+            equity = supplied_usd - debt_usd
+            raw_usdc = sum(s.get("usd", 0) for s in supplied if s.get("symbol") == "USDC")
+            symbols = [s.get("symbol", "") for s in supplied]
+            has_gmx = any("GM_" in sym for sym in symbols)
+            has_lb = any(sym in ("LB_AVAX_USDC", "LB_WAVAX_USDC", "JOE") or "TRADERJOE" in sym.upper() for sym in symbols)
+            has_aero = any("AERO" in sym.upper() or "CL_POSITION" in sym.upper() for sym in symbols)
+            return {
+                "bruno_pct": float(precomputed),
+                "health_ratio": round(health_ratio, 4),
+                "supplied_usd": round(supplied_usd, 2),
+                "debt_usd": round(debt_usd, 2),
+                "equity": round(equity, 2),
+                "max_debt": round(max(0, equity * (max_mult - 1)), 2),
+                "raw_usdc": round(raw_usdc, 2),
+                "has_gmx": has_gmx,
+                "has_lb": has_lb,
+                "has_aero": has_aero,
+                "action": "computed from defi --json bruno_pct",
+            }
     else:
         supplied = defi_data.get("supplied", [])
         borrowed = defi_data.get("borrowed", [])

{primecli-0.5.1 → primecli-0.5.3}/primecli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: primecli
-Version: 0.5.1
+Version: 0.5.3
 Summary: Agent-friendly CLI tools for the DeltaPrime (Avalanche + Arbitrum) and DegenPrime (Base) lending and leverage protocols. Preview-by-default; no Etherscan key required.
 Author: Mnemosyne-quest contributors
 License: MIT
@@ -28,7 +28,6 @@ Requires-Dist: eth-account>=0.13
 Requires-Dist: eth-keys>=0.5
 Requires-Dist: eth-abi<7,>=5.0
 Requires-Dist: requests>=2.31
-Dynamic: license-file
 
 # primecli
 
@@ -48,7 +47,7 @@ Built for agent use:
 - RedStone-signed solvency math handled internally, with a regression test pinning the half-boundary `toFixed(8)` encoding.
 - ParaSwap calldata validated client-side against the on-chain executor allowlist before broadcast.
 
-**Current version:** 0.5.1 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
+**Current version:** 0.5.2 The 0.x line is pre-1.0, so breaking changes are possible. See [Releases](https://github.com/Mnemosyne-quest/primecli/releases).
 
 > **Breaking change in 0.5.0:** there is no longer a default signing key. Earlier versions silently fell back to a baked-in agent when no key was configured; that fallback has been removed. With no key configured, every command now fails closed with `No signing key found...`. Set a key explicitly (see [Configuration](#configuration)).
 

{primecli-0.5.1 → primecli-0.5.3}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=68", "wheel"]
+requires = ["setuptools>=68,<73", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "primecli"
-version = "0.5.1"
+version = "0.5.3"
 description = "Agent-friendly CLI tools for the DeltaPrime (Avalanche + Arbitrum) and DegenPrime (Base) lending and leverage protocols. Preview-by-default; no Etherscan key required."
 readme = "README.md"
 requires-python = ">=3.10"