thinyai 0.1.6 → 0.1.8

package/dist/bin.js

@@ -1840,13 +1840,38 @@ function applyConfig(cfg) {
     set("SUI_NETWORK", cfg.sui.network);
     if (cfg.sui.network === "mainnet") set("SUI_ALLOW_MAINNET", "1");
   }
-  const sk = cfg.sui?.wallet.secretKey;
-  if (sk) {
-    set("SUI_SECRET_KEY", sk);
-    set("THINY_SUI_SECRET_KEY", sk);
+  const active = activeSuiWallet(cfg);
+  if (active) {
+    set("SUI_SECRET_KEY", active.secretKey);
+    set("THINY_SUI_SECRET_KEY", active.secretKey);
   }
   set("MCP_URL", cfg.sui?.rillMcpUrl);
 }
+function suiWalletsOf(cfg) {
+  const s = cfg?.sui;
+  if (!s) return [];
+  if (s.wallets && s.wallets.length > 0) return s.wallets;
+  if (s.wallet && s.address) {
+    return [{ label: "default", address: s.address, secretKey: s.wallet.secretKey, source: s.wallet.type }];
+  }
+  return [];
+}
+function activeSuiWallet(cfg) {
+  const all = suiWalletsOf(cfg);
+  const active = cfg?.sui?.activeAddress ?? cfg?.sui?.address;
+  return all.find((w) => w.address === active) ?? all[0];
+}
+function saveSuiWallet(cfg, network, wallet, makeActive) {
+  cfg.sui ??= { network };
+  cfg.sui.network = network;
+  const all = suiWalletsOf(cfg).filter((w) => w.address !== wallet.address);
+  all.push(wallet);
+  cfg.sui.wallets = all;
+  delete cfg.sui.wallet;
+  delete cfg.sui.address;
+  if (makeActive || !cfg.sui.activeAddress) cfg.sui.activeAddress = wallet.address;
+  saveConfig(cfg);
+}
 function bail(v) {
   if (p.isCancel(v)) {
     p.cancel("Cancelled.");
@@ -1870,7 +1895,8 @@ async function baseSetup() {
   const choice = bail(
     await p.select({ message: "Pick a model", options: MODELS.map(({ value, label, hint }) => ({ value, label, hint })) })
   );
-  const pick = MODELS.find((m) => m.value === choice) ?? MODELS[0];
+  const pick = MODELS.find((m) => m.value === choice);
+  if (!pick) throw new Error(`unknown model choice: ${choice}`);
   const cfg = { agentName, userId: "default" };
   if (pick.custom) {
     cfg.model = bail(
@@ -1880,7 +1906,7 @@ async function baseSetup() {
       await p.text({
         message: "Base URL (OpenAI-compatible)",
         placeholder: "https://api.example.com/v1",
-        validate: (v) => /^https?:\/\//.test(v) ? void 0 : "Must start with http(s)://"
+        validate: (v) => v && /^https?:\/\//.test(v) ? void 0 : "Must start with http(s)://"
       })
     );
     cfg.apiKey = bail(await p.password({ message: "API key" }));
@@ -1927,20 +1953,22 @@ async function suiInit() {
     const sk = bail(
       await p.password({
         message: "Private key (suiprivkey\u2026)",
-        validate: (v) => v.startsWith("suiprivkey") ? void 0 : "Expected a suiprivkey\u2026 string"
+        validate: (v) => v?.startsWith("suiprivkey") ? void 0 : "Expected a suiprivkey\u2026 string"
       })
     );
     wallet = { type: "imported", secretKey: sk };
     address = Ed25519Keypair2.fromSecretKey(sk).getPublicKey().toSuiAddress();
   }
-  cfg.sui = { network, wallet, address };
+  saveSuiWallet(cfg, network, { label: choice, address, secretKey: wallet.secretKey, source: wallet.type }, true);
   if (choice === "rill") {
     const url = bail(
       await p.text({ message: "Rill MCP URL", placeholder: "leave blank to add later", defaultValue: "" })
     );
-    if (url) cfg.sui.rillMcpUrl = url;
+    if (url && cfg.sui) {
+      cfg.sui.rillMcpUrl = url;
+      saveConfig(cfg);
+    }
   }
-  saveConfig(cfg);
   const faucet = network === "testnet" ? "\nFaucet: https://faucet.sui.io  (or `sui client faucet`)" : "";
   p.note(`${address}${faucet}`, `\u26A0 Fund this address (${network}) before sending transactions`);
   p.outro(`Sui configured (${network}).`);
@@ -2421,6 +2449,125 @@ async function runCli() {
       };
     }
   });
+  const activateSigner = (secretKey) => {
+    suiSignerRef = suiSigner({ network: suiNetwork, secretKey, allowMainnet });
+  };
+  const suiWalletsTool = defineTool({
+    name: "sui_wallets",
+    description: "List every Sui wallet the user has: the local agent wallets (with addresses) and the Rill MCP signer if connected. Use to answer 'what wallets/addresses do I have', or to pick one. Does NOT reveal private keys (use sui_export_wallet for that).",
+    parameters: z7.object({}),
+    execute: () => {
+      const cfg = loadConfig();
+      const active = activeSuiWallet(cfg)?.address;
+      return {
+        network: cfg?.sui?.network ?? suiNetwork,
+        activeAddress: active,
+        agentWallets: suiWalletsOf(cfg).map((w) => ({
+          label: w.label,
+          address: w.address,
+          source: w.source,
+          active: w.address === active
+        })),
+        rill: cfg?.sui?.rillMcpUrl ? { source: "rill", mcpUrl: cfg.sui.rillMcpUrl } : null
+      };
+    }
+  });
+  const suiCreateWalletTool = defineTool({
+    name: "sui_create_wallet",
+    description: "Generate a NEW Sui agent wallet (key pair) locally and save it. Returns the new address \u2014 remind the user to fund it. Use when the user asks for a new/another wallet or address.",
+    sensitive: true,
+    parameters: z7.object({
+      label: z7.string().optional().describe("A name for the wallet (default: wallet-N)."),
+      activate: z7.boolean().optional().describe("Make it the active signing wallet (default true).")
+    }),
+    execute: async ({ label, activate }) => {
+      const { Ed25519Keypair: Ed25519Keypair2 } = await import("@mysten/sui/keypairs/ed25519");
+      const kp = Ed25519Keypair2.generate();
+      const address = kp.getPublicKey().toSuiAddress();
+      const cfg = loadConfig() ?? {};
+      const makeActive = activate ?? true;
+      const n = suiWalletsOf(cfg).length + 1;
+      saveSuiWallet(
+        cfg,
+        suiNetwork,
+        { label: label ?? `wallet-${String(n)}`, address, secretKey: kp.getSecretKey(), source: "generated" },
+        makeActive
+      );
+      if (makeActive) activateSigner(kp.getSecretKey());
+      return {
+        address,
+        active: makeActive,
+        note: `New wallet on ${suiNetwork}. Fund ${address} before transacting${suiNetwork === "testnet" ? " (faucet: https://faucet.sui.io)" : ""}.`
+      };
+    }
+  });
+  const suiImportWalletTool = defineTool({
+    name: "sui_import_wallet",
+    description: "Import an existing Sui wallet from its private key (suiprivkey\u2026) and save it. Use when the user wants to add/restore a wallet they already have.",
+    sensitive: true,
+    parameters: z7.object({
+      secretKey: z7.string().min(1).describe("The private key, a suiprivkey\u2026 string."),
+      label: z7.string().optional().describe("A name for the wallet."),
+      activate: z7.boolean().optional().describe("Make it the active signing wallet (default true).")
+    }),
+    execute: async ({ secretKey, label, activate }) => {
+      if (!secretKey.startsWith("suiprivkey")) {
+        throw new Error("sui_import_wallet: expected a private key starting with suiprivkey\u2026");
+      }
+      const { Ed25519Keypair: Ed25519Keypair2 } = await import("@mysten/sui/keypairs/ed25519");
+      const address = Ed25519Keypair2.fromSecretKey(secretKey).getPublicKey().toSuiAddress();
+      const cfg = loadConfig() ?? {};
+      const makeActive = activate ?? true;
+      saveSuiWallet(
+        cfg,
+        suiNetwork,
+        { label: label ?? "imported", address, secretKey, source: "imported" },
+        makeActive
+      );
+      if (makeActive) activateSigner(secretKey);
+      return { address, active: makeActive, note: `Imported wallet ${address} on ${suiNetwork}.` };
+    }
+  });
+  const suiExportWalletTool = defineTool({
+    name: "sui_export_wallet",
+    description: "Reveal the PRIVATE KEY of a saved wallet so the user can back it up or move it elsewhere. Defaults to the active wallet. SENSITIVE \u2014 only when the user explicitly asks to export/back up.",
+    sensitive: true,
+    parameters: z7.object({
+      address: z7.string().optional().describe("Which wallet to export (default: the active one).")
+    }),
+    execute: ({ address }) => {
+      const cfg = loadConfig();
+      const all = suiWalletsOf(cfg);
+      const w = address ? all.find((x) => x.address === address) : activeSuiWallet(cfg);
+      if (!w) throw new Error("sui_export_wallet: no matching wallet found.");
+      return {
+        address: w.address,
+        secretKey: w.secretKey,
+        warning: "Keep this private key secret \u2014 anyone who has it controls the wallet."
+      };
+    }
+  });
+  const suiUseWalletTool = defineTool({
+    name: "sui_use_wallet",
+    description: "Switch the active signing wallet to a saved one by address. Use to send from a different wallet.",
+    parameters: z7.object({ address: z7.string().min(1).describe("Address of the wallet to make active.") }),
+    execute: ({ address }) => {
+      const cfg = loadConfig();
+      const w = suiWalletsOf(cfg).find((x) => x.address === address);
+      if (!w || !cfg?.sui) throw new Error(`sui_use_wallet: no saved wallet ${address}.`);
+      cfg.sui.activeAddress = address;
+      saveConfig(cfg);
+      activateSigner(w.secretKey);
+      return { activeAddress: address, note: `Now signing as ${address}.` };
+    }
+  });
+  const walletTools = [
+    suiWalletsTool,
+    suiCreateWalletTool,
+    suiImportWalletTool,
+    suiExportWalletTool,
+    suiUseWalletTool
+  ];
   const fetchUrlTool = defineTool({
     name: "fetch_url",
     description: "Fetch the contents of an http(s) URL (markdown, text, JSON, HTML). ALWAYS use this when the user shares a link \u2014 e.g. a skill.md, docs page, or an API/MCP endpoint \u2014 instead of saying you can't open URLs. Returns the response text (truncated if very large).",
@@ -2444,14 +2591,56 @@ async function runCli() {
       };
     }
   });
-  const webPlugins = process.env.BRAVE_API_KEY ? [webSearchPlugin({ apiKey: process.env.BRAVE_API_KEY })] : [];
+  const exaKey = process.env.EXA_API_KEY;
+  const webPlugins = [];
+  const webTools = [];
+  if (exaKey) {
+    webTools.push(
+      defineTool({
+        name: "web_search",
+        description: "Search the WEB via Exa and get ranked results with text snippets. Use whenever you need current info, prices, docs, or to find a page \u2014 anything you don't already know. This is DIFFERENT from fetch_url: web_search finds pages by query; fetch_url reads one URL you have.",
+        parameters: z7.object({
+          query: z7.string().min(1).describe("The search query."),
+          numResults: z7.number().int().positive().optional().describe("Results to return (default 5).")
+        }),
+        execute: async ({ query, numResults }) => {
+          const res = await fetch("https://api.exa.ai/search", {
+            method: "POST",
+            headers: { "content-type": "application/json", "x-api-key": exaKey },
+            body: JSON.stringify({
+              query,
+              numResults: numResults ?? 5,
+              contents: { text: { maxCharacters: 1200 } }
+            }),
+            signal: AbortSignal.timeout(2e4)
+          });
+          if (!res.ok) throw new Error(`web_search: Exa HTTP ${String(res.status)} ${await res.text()}`);
+          const data = await res.json();
+          return {
+            query,
+            results: (data.results ?? []).map((r) => ({ title: r.title, url: r.url, text: r.text }))
+          };
+        }
+      })
+    );
+  } else if (process.env.BRAVE_API_KEY) {
+    webPlugins.push(webSearchPlugin({ apiKey: process.env.BRAVE_API_KEY }));
+  }
+  const webSearchOn = webTools.length > 0 || webPlugins.length > 0;
   const budget = budgetMiddleware({ maxCalls: 50, logger });
   const agent = await createAgent({
     model,
     logger: agentLogger,
     persona,
-    systemPrompt: "You are a helpful AI assistant. Use tools when they help you answer better. Be concise.\n\nMEMORY: You have persistent long-term memory across sessions, stored on Walrus. What you already know about the user is injected automatically at the start of each conversation under \u201C[User Memory \u2026]\u201D. When the user shares anything durable about themselves \u2014 their name, role, preferences, projects, or goals, even casually \u2014 immediately call remember_fact to save it. If asked what you remember, answer from the injected user memory (or call recall_memory). You DO remember across sessions \u2014 never say you lack memory or that each session starts fresh.\n\nFor multi-step work, call update_plan to track steps and delegate_task to hand focused sub-problems to a sub-agent.\n\nLINKS: When the user shares any URL (a skill.md, docs, an API or MCP endpoint, etc.), call fetch_url to read it \u2014 never say you can't open links" + (webPlugins.length > 0 ? ". Use web_search to look things up on the web.\n\n" : ".\n\n") + "SUI: You can operate on the Sui blockchain directly with your own tools \u2014 do NOT tell the user to install a browser wallet extension. " + (suiSignerRef ? `A wallet IS configured on ${suiNetwork} at ${suiSignerRef.address ?? "(unknown)"}. ` : "No wallet is set up yet \u2014 when the user wants Sui, call sui_setup (generate / import / rill) to create or connect one, then tell them to fund the returned address. ") + "Your Sui tools: sui_setup (create/import a wallet), sui_balance and sui_object (read), sui_transfer (send SUI or any coin to an address \u2014 amounts in MIST, 1 SUI = 1e9), sui_move_call (call ANY Move function on any package \u2014 the general way to run any on-chain action), and sui_execute_ptb (sign a PTB an external builder/Rill produced). Prefer sui_transfer for sends and sui_move_call for contract calls. Always confirm details and remind the user to fund the wallet. Never claim you cannot transact on Sui \u2014 you can, via these tools.",
-    tools: [echoTool, suiSetupTool, fetchUrlTool],
+    systemPrompt: `You are ${persona?.name ?? "ThinyAI"}, a capable assistant with real tools. Be concise.
+
+HOW TO ACT: When a request maps to one of your tools, CALL THE TOOL automatically \u2014 figure out the right tool yourself; do not ask the user which tool to run, do not ask permission for read-only actions, and never say you can't do something one of your tools covers. Chain tools when needed (e.g. web_search \u2192 fetch_url \u2192 act).
+
+YOUR TOOLS:
+\u2022 Memory \u2014 remember_fact, recall_memory: durable memory across sessions (stored on Walrus). Known facts are injected each turn under \u201C[User Memory \u2026]\u201D. Immediately save anything durable the user shares (name, role, preferences, projects, goals). Answer \u201Cwhat do you remember\u201D from it. You DO remember across sessions \u2014 never say otherwise.
+\u2022 Links \u2014 fetch_url: read ANY URL the user shares (a skill.md, docs, JSON, an API/MCP endpoint). Always fetch shared links instead of saying you can't open URLs.
+` + (webSearchOn ? "\u2022 Web search \u2014 web_search: search the web for anything you don't know (news, prices, docs). web_search FINDS pages by query; fetch_url READS a specific URL \u2014 use them together.\n" : "") + "\u2022 Planning \u2014 update_plan (track multi-step work), delegate_task (hand a focused subtask to a sub-agent).\n\u2022 Sui blockchain \u2014 you transact yourself; NEVER tell the user to install a browser wallet. " + (suiSignerRef ? `The active wallet is on ${suiNetwork} at ${suiSignerRef.address ?? "?"}. ` : "No wallet yet \u2014 call sui_create_wallet (or sui_import_wallet) when the user wants Sui, then have them fund the address. ") + "Wallets: sui_wallets (list ALL the user's wallets + addresses \u2014 use this to answer 'what's my address / what wallets do I have'), sui_create_wallet (new key pair), sui_import_wallet (restore from a suiprivkey), sui_export_wallet (reveal a private key \u2014 only when asked), sui_use_wallet (switch the active wallet). On-chain: sui_balance & sui_object (read), sui_transfer (send SUI/any coin \u2014 amounts in MIST, 1 SUI = 1e9), sui_move_call (call ANY Move function), sui_execute_ptb (sign a builder/Rill PTB). Prefer sui_transfer for sends and sui_move_call for contract calls; confirm details before signing.",
+    tools: [echoTool, suiSetupTool, ...walletTools, fetchUrlTool, ...webTools],
     plugins: [
       {
         name: "observability",
@@ -2511,6 +2700,9 @@ async function runCli() {
       `Sui: ${suiNetwork} \xB7 ${suiSignerRef.address ?? "?"}${process.env.MCP_URL ? " \xB7 Rill MCP connected" : ""}`
     );
   else renderInfo("Sui: no wallet \u2014 ask the agent to set one up, or run `thiny sui init`");
+  renderInfo(
+    `Web: fetch_url (any URL)${webSearchOn ? ` \xB7 web_search (${exaKey ? "Exa" : "Brave"})` : " \xB7 web_search off (set EXA_API_KEY)"}`
+  );
   notifyIfUpdate(thinyDir);
   const rl = createInterface({ input: stdin, output: stdout });
   emitKeypressEvents(stdin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinyai",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Thiny AI — a beautiful terminal agent: interactive chat, tools, Walrus memory, and Sui execution.",
   "type": "module",
   "license": "MIT",
@@ -38,16 +38,16 @@
     "tsup": "^8.5.1",
     "typescript": "^5.5.0",
     "@thiny/memory-memwal": "0.1.0",
-    "@thiny/walrus": "0.1.0",
-    "@thiny/plugin-agents": "0.1.0",
     "@thiny/core": "0.1.0",
-    "@thiny/model-aisdk": "0.1.0",
-    "@thiny/logger-pino": "0.1.0",
     "@thiny/mcp": "0.1.0",
-    "@thiny/signer-sui": "0.1.0",
+    "@thiny/logger-pino": "0.1.0",
+    "@thiny/model-aisdk": "0.1.0",
+    "@thiny/plugin-agents": "0.1.0",
     "@thiny/plugin-web-search": "0.1.0",
-    "@thiny/plugin-sui": "0.1.0",
-    "@thiny/skills": "0.1.0"
+    "@thiny/walrus": "0.1.0",
+    "@thiny/signer-sui": "0.1.0",
+    "@thiny/skills": "0.1.0",
+    "@thiny/plugin-sui": "0.1.0"
   },
   "author": "Thiny AI",
   "engines": {