shll-skills 5.2.0 → 5.2.1

package/dist/mcp.js

@@ -996,17 +996,14 @@ server.tool(
     return { content: [{ type: "text", text: JSON.stringify({ status: "success", hash: result.hash, token, amount, to: recipient }) }] };
   }
 );
-var OPERATOR_OF_ABI = [{
-  type: "function",
-  name: "operatorOf",
-  inputs: [{ name: "tokenId", type: "uint256" }],
-  outputs: [{ name: "", type: "address" }],
-  stateMutability: "view"
-}];
+var MY_AGENTS_ABI = [
+  { type: "function", name: "operatorOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "address" }], stateMutability: "view" },
+  { type: "function", name: "operatorExpiresOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "uint256" }], stateMutability: "view" }
+];
 var DEFAULT_INDEXER = "https://indexer-mainnet.shll.run";
 server.tool(
   "my_agents",
-  "List all agents where the current operator key is authorized. Returns token IDs, vault addresses, and agent types. Call this first if the user does not specify a token ID.",
+  "List all agents where the current operator key is or was authorized. Returns active agents and expired agents that need renewal.",
   {},
   async () => {
     const { account, publicClient, config } = createClients();
@@ -1023,18 +1020,34 @@ server.tool(
       agents.map(async (a) => {
         const tokenId = BigInt(a.tokenId);
         try {
-          const op = await publicClient.readContract({
-            address: nfaAddr,
-            abi: OPERATOR_OF_ABI,
-            functionName: "operatorOf",
-            args: [tokenId]
-          });
-          return op.toLowerCase() === operator ? {
-            tokenId: tokenId.toString(),
-            vault: a.account || "",
-            owner: a.owner || "",
-            agentType: a.agentType || "unknown"
-          } : null;
+          const [op, opExpires] = await Promise.all([
+            publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorOf", args: [tokenId] }),
+            publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorExpiresOf", args: [tokenId] })
+          ]);
+          const isActive = op.toLowerCase() === operator;
+          const now = BigInt(Math.floor(Date.now() / 1e3));
+          const isExpired = !isActive && Number(opExpires) > 0 && now > opExpires;
+          if (isActive) {
+            return {
+              tokenId: tokenId.toString(),
+              vault: a.account || "",
+              owner: a.owner || "",
+              agentType: a.agentType || "unknown",
+              status: "active",
+              operatorExpires: new Date(Number(opExpires) * 1e3).toISOString()
+            };
+          } else if (isExpired) {
+            return {
+              tokenId: tokenId.toString(),
+              vault: a.account || "",
+              owner: a.owner || "",
+              agentType: a.agentType || "unknown",
+              status: "expired",
+              operatorExpires: new Date(Number(opExpires) * 1e3).toISOString(),
+              note: "Operator authorization expired. Renew at https://shll.run/me"
+            };
+          }
+          return null;
         } catch {
           return null;
         }

package/dist/mcp.mjs

@@ -507,17 +507,14 @@ server.tool(
     return { content: [{ type: "text", text: JSON.stringify({ status: "success", hash: result.hash, token, amount, to: recipient }) }] };
   }
 );
-var OPERATOR_OF_ABI = [{
-  type: "function",
-  name: "operatorOf",
-  inputs: [{ name: "tokenId", type: "uint256" }],
-  outputs: [{ name: "", type: "address" }],
-  stateMutability: "view"
-}];
+var MY_AGENTS_ABI = [
+  { type: "function", name: "operatorOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "address" }], stateMutability: "view" },
+  { type: "function", name: "operatorExpiresOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "uint256" }], stateMutability: "view" }
+];
 var DEFAULT_INDEXER = "https://indexer-mainnet.shll.run";
 server.tool(
   "my_agents",
-  "List all agents where the current operator key is authorized. Returns token IDs, vault addresses, and agent types. Call this first if the user does not specify a token ID.",
+  "List all agents where the current operator key is or was authorized. Returns active agents and expired agents that need renewal.",
   {},
   async () => {
     const { account, publicClient, config } = createClients();
@@ -534,18 +531,34 @@ server.tool(
       agents.map(async (a) => {
         const tokenId = BigInt(a.tokenId);
         try {
-          const op = await publicClient.readContract({
-            address: nfaAddr,
-            abi: OPERATOR_OF_ABI,
-            functionName: "operatorOf",
-            args: [tokenId]
-          });
-          return op.toLowerCase() === operator ? {
-            tokenId: tokenId.toString(),
-            vault: a.account || "",
-            owner: a.owner || "",
-            agentType: a.agentType || "unknown"
-          } : null;
+          const [op, opExpires] = await Promise.all([
+            publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorOf", args: [tokenId] }),
+            publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorExpiresOf", args: [tokenId] })
+          ]);
+          const isActive = op.toLowerCase() === operator;
+          const now = BigInt(Math.floor(Date.now() / 1e3));
+          const isExpired = !isActive && Number(opExpires) > 0 && now > opExpires;
+          if (isActive) {
+            return {
+              tokenId: tokenId.toString(),
+              vault: a.account || "",
+              owner: a.owner || "",
+              agentType: a.agentType || "unknown",
+              status: "active",
+              operatorExpires: new Date(Number(opExpires) * 1e3).toISOString()
+            };
+          } else if (isExpired) {
+            return {
+              tokenId: tokenId.toString(),
+              vault: a.account || "",
+              owner: a.owner || "",
+              agentType: a.agentType || "unknown",
+              status: "expired",
+              operatorExpires: new Date(Number(opExpires) * 1e3).toISOString(),
+              note: "Operator authorization expired. Renew at https://shll.run/me"
+            };
+          }
+          return null;
         } catch {
           return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "shll-skills",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "description": "SHLL DeFi Agent — CLI + MCP Server for BSC",
     "main": "dist/index.js",
     "bin": {

package/src/mcp.ts

@@ -349,7 +349,7 @@ server.tool(
     async ({ token_id, from, to, amount, dex, slippage }) => {
         const { publicClient, policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const vault = await policyClient.getVault(tokenId);
 
         const fromToken = resolveToken(from);
@@ -454,7 +454,7 @@ server.tool(
     async ({ token_id, token, amount }) => {
         const { publicClient, policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const symbol = token.toUpperCase();
         const vTokenAddr = VENUS_VTOKENS[symbol];
         if (!vTokenAddr) return { content: [{ type: "text" as const, text: JSON.stringify({ error: `Unsupported: ${symbol}. Use: ${Object.keys(VENUS_VTOKENS).join(", ")}` }) }] };
@@ -500,7 +500,7 @@ server.tool(
     async ({ token_id, token, amount }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const symbol = token.toUpperCase();
         const vTokenAddr = VENUS_VTOKENS[symbol];
         if (!vTokenAddr) return { content: [{ type: "text" as const, text: JSON.stringify({ error: `Unsupported: ${symbol}` }) }] };
@@ -565,7 +565,7 @@ server.tool(
     async ({ token_id, token, amount, to }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const tokenInfo = resolveToken(token);
         const amt = parseAmount(amount, tokenInfo.decimals);
         const recipient = to as Address;
@@ -593,18 +593,16 @@ server.tool(
 );
 
 // ── Tool: my_agents ─────────────────────────────────────
-const OPERATOR_OF_ABI = [{
-    type: "function" as const, name: "operatorOf",
-    inputs: [{ name: "tokenId", type: "uint256" }],
-    outputs: [{ name: "", type: "address" }],
-    stateMutability: "view" as const,
-}] as const;
+const MY_AGENTS_ABI = [
+    { type: "function" as const, name: "operatorOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "address" }], stateMutability: "view" as const },
+    { type: "function" as const, name: "operatorExpiresOf", inputs: [{ name: "tokenId", type: "uint256" }], outputs: [{ name: "", type: "uint256" }], stateMutability: "view" as const },
+] as const;
 
 const DEFAULT_INDEXER = "https://indexer-mainnet.shll.run";
 
 server.tool(
     "my_agents",
-    "List all agents where the current operator key is authorized. Returns token IDs, vault addresses, and agent types. Call this first if the user does not specify a token ID.",
+    "List all agents where the current operator key is or was authorized. Returns active agents and expired agents that need renewal.",
     {},
     async () => {
         const { account, publicClient, config } = createClients();
@@ -621,23 +619,34 @@ server.tool(
             return { content: [{ type: "text" as const, text: JSON.stringify({ operator, agents: [], count: 0 }) }] };
         }
 
-        // 2. Batch check operatorOf for all agents
+        // 2. Check operatorOf AND operatorExpiresOf for all agents
         const checks = await Promise.all(
             agents.map(async (a) => {
                 const tokenId = BigInt(a.tokenId!);
                 try {
-                    const op = await publicClient.readContract({
-                        address: nfaAddr,
-                        abi: OPERATOR_OF_ABI,
-                        functionName: "operatorOf",
-                        args: [tokenId],
-                    });
-                    return (op as string).toLowerCase() === operator ? {
-                        tokenId: tokenId.toString(),
-                        vault: a.account || "",
-                        owner: a.owner || "",
-                        agentType: a.agentType || "unknown",
-                    } : null;
+                    const [op, opExpires] = await Promise.all([
+                        publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorOf", args: [tokenId] }) as Promise<string>,
+                        publicClient.readContract({ address: nfaAddr, abi: MY_AGENTS_ABI, functionName: "operatorExpiresOf", args: [tokenId] }) as Promise<bigint>,
+                    ]);
+                    const isActive = op.toLowerCase() === operator;
+                    const now = BigInt(Math.floor(Date.now() / 1000));
+                    const isExpired = !isActive && Number(opExpires) > 0 && now > opExpires;
+
+                    if (isActive) {
+                        return {
+                            tokenId: tokenId.toString(), vault: a.account || "", owner: a.owner || "",
+                            agentType: a.agentType || "unknown", status: "active" as const,
+                            operatorExpires: new Date(Number(opExpires) * 1000).toISOString(),
+                        };
+                    } else if (isExpired) {
+                        return {
+                            tokenId: tokenId.toString(), vault: a.account || "", owner: a.owner || "",
+                            agentType: a.agentType || "unknown", status: "expired" as const,
+                            operatorExpires: new Date(Number(opExpires) * 1000).toISOString(),
+                            note: "Operator authorization expired. Renew at https://shll.run/me",
+                        };
+                    }
+                    return null;
                 } catch { return null; }
             })
         );
@@ -663,7 +672,7 @@ server.tool(
     async ({ token_id, amount }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const amt = parseEther(amount);
         const data = encodeFunctionData({ abi: WBNB_ABI, functionName: "deposit" });
         const action: Action = { target: WBNB as Address, value: amt, data };
@@ -687,7 +696,7 @@ server.tool(
     async ({ token_id, amount }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const amt = parseEther(amount);
         const data = encodeFunctionData({ abi: WBNB_ABI, functionName: "withdraw", args: [amt] });
         const action: Action = { target: WBNB as Address, value: 0n, data };
@@ -911,7 +920,7 @@ server.tool(
 
         const { account, publicClient, policyClient, config } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const walletClient = createWalletClient({ account, chain: bsc, transport: http(config.rpc) });
         const policies = await policyClient.getPolicies(tokenId);
         const results: string[] = [];
@@ -1033,7 +1042,7 @@ server.tool(
     async ({ token_id, target, data, value }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const action: Action = {
             target: target as Address,
             value: BigInt(value),
@@ -1082,7 +1091,7 @@ server.tool(
     async ({ token_id, actions: rawActions }) => {
         const { policyClient } = createClients();
         const tokenId = BigInt(token_id);
-        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
+        const expiryCheck = await checkAgentExpiry(tokenId); if (expiryCheck.expired) return { content: expiryCheck.content! };
         const actions: Action[] = rawActions.map(a => ({
             target: a.target as Address,
             value: BigInt(a.value || "0"),