thinyai 0.1.7 → 0.1.9

package/dist/bin.js

@@ -1829,24 +1829,83 @@ function applyConfig(cfg) {
   const set = (k, v) => {
     if (v && !process.env[k]) process.env[k] = v;
   };
-  set("THINY_MODEL", cfg.model);
-  if (cfg.apiKey) {
-    set(cfg.model?.startsWith("anthropic") ? "THINY_ANTHROPIC_API_KEY" : "THINY_OPENAI_API_KEY", cfg.apiKey);
+  const prov = activeProvider(cfg);
+  if (prov) {
+    set("THINY_MODEL", prov.model);
+    if (prov.apiKey) {
+      set(prov.model.startsWith("anthropic") ? "THINY_ANTHROPIC_API_KEY" : "THINY_OPENAI_API_KEY", prov.apiKey);
+    }
+    set("THINY_OPENAI_BASE_URL", prov.baseUrl);
   }
-  set("THINY_OPENAI_BASE_URL", cfg.baseUrl);
   set("THINY_PERSONA_NAME", cfg.agentName);
   set("THINY_USER_ID", cfg.userId);
   if (cfg.sui?.network) {
     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 providersOf(cfg) {
+  if (!cfg) return [];
+  if (cfg.providers && cfg.providers.length > 0) return cfg.providers;
+  if (cfg.model) {
+    const id = cfg.model.startsWith("anthropic") ? "anthropic" : cfg.baseUrl ? "custom" : "openai";
+    return [{ id, label: cfg.model, model: cfg.model, apiKey: cfg.apiKey, baseUrl: cfg.baseUrl }];
+  }
+  return [];
+}
+function activeProvider(cfg) {
+  const all = providersOf(cfg);
+  return all.find((x) => x.id === cfg?.activeProviderId) ?? all[0];
+}
+function saveProvider(cfg, provider, makeActive) {
+  const all = providersOf(cfg).filter((x) => x.id !== provider.id);
+  all.push(provider);
+  cfg.providers = all;
+  delete cfg.model;
+  delete cfg.apiKey;
+  delete cfg.baseUrl;
+  if (makeActive || !cfg.activeProviderId) cfg.activeProviderId = provider.id;
+  saveConfig(cfg);
+}
+function setActiveProvider(cfg, id) {
+  const prov = providersOf(cfg).find((x) => x.id === id);
+  if (!prov) return void 0;
+  cfg.providers = providersOf(cfg);
+  cfg.activeProviderId = id;
+  saveConfig(cfg);
+  return prov;
+}
 function bail(v) {
   if (p.isCancel(v)) {
     p.cancel("Cancelled.");
@@ -1870,26 +1929,30 @@ 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 cfg = { agentName, userId: "default" };
+  const pick = MODELS.find((m) => m.value === choice);
+  if (!pick) throw new Error(`unknown model choice: ${choice}`);
+  const cfg = loadConfig() ?? {};
+  cfg.agentName = agentName;
+  cfg.userId ??= "default";
+  let provider;
   if (pick.custom) {
-    cfg.model = bail(
+    const model = bail(
       await p.text({ message: "Model id", placeholder: "e.g. MiniMax-M3", validate: (v) => v ? void 0 : "Required" })
     );
-    cfg.baseUrl = bail(
+    const baseUrl = bail(
       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" }));
+    const apiKey = bail(await p.password({ message: "API key" }));
+    provider = { id: model, label: model, model, baseUrl, apiKey };
   } else {
-    cfg.model = pick.model;
-    if (pick.baseUrl) cfg.baseUrl = pick.baseUrl;
-    cfg.apiKey = pick.apiKey ?? (pick.needsKey ? bail(await p.password({ message: "API key" })) : void 0);
+    const apiKey = pick.apiKey ?? (pick.needsKey ? bail(await p.password({ message: "API key" })) : void 0);
+    provider = { id: pick.value, label: pick.label, model: pick.model ?? "", baseUrl: pick.baseUrl, apiKey };
   }
-  saveConfig(cfg);
+  saveProvider(cfg, provider, true);
   p.outro(`Saved ${CONFIG} \u2014 run \`thiny\` to start, or \`thiny sui init\` for Sui.`);
   return cfg;
 }
@@ -1927,20 +1990,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}).`);
@@ -2324,9 +2389,22 @@ async function runCli() {
   const turn = { inputTokens: 0, outputTokens: 0, toolCalls: 0, modelCalls: 0 };
   const session = { inputTokens: 0, outputTokens: 0, toolCalls: 0, turns: 0 };
   const logger = captureStats(fileLogger, turn);
-  const activeModelName = process.env.THINY_MODEL ?? process.env.AGENT_MODEL ?? "openai:gpt-4o-mini";
   const personaName = process.env.THINY_PERSONA_NAME ?? "Thiny";
-  const model = loadThinyConfig();
+  const buildModel = (p2) => aiSdkModel({
+    model: p2.model,
+    openai: { baseURL: p2.baseUrl, apiKey: p2.apiKey },
+    anthropic: { apiKey: p2.apiKey }
+  });
+  const startProvider = activeProvider(loadConfig());
+  let activeModel = startProvider ? buildModel(startProvider) : loadThinyConfig();
+  let activeModelName = startProvider?.model ?? process.env.THINY_MODEL ?? process.env.AGENT_MODEL ?? "openai:gpt-4o-mini";
+  const model = {
+    generate: (m, t, s) => activeModel.generate(m, t, s),
+    stream: (m, t, s) => {
+      if (!activeModel.stream) throw new Error("active model has no streaming");
+      return activeModel.stream(m, t, s);
+    }
+  };
   const network = process.env.WALRUS_NETWORK === "mainnet" ? "mainnet" : "testnet";
   const walrus = walrusClient({
     network,
@@ -2421,6 +2499,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).",
@@ -2492,8 +2689,8 @@ HOW TO ACT: When a request maps to one of your tools, CALL THE TOOL automaticall
 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 ? `A wallet IS set up on ${suiNetwork} at ${suiSignerRef.address ?? "?"}. ` : "No wallet yet \u2014 call sui_setup (generate / import / rill) when the user wants Sui, then have them fund the address. ") + "sui_setup (create/import a wallet), sui_balance & sui_object (read), sui_transfer (send SUI or any coin \u2014 amounts in MIST, 1 SUI = 1e9), sui_move_call (call ANY Move function \u2014 any on-chain action), sui_execute_ptb (sign a PTB a builder/Rill produced). Prefer sui_transfer for sends and sui_move_call for contract calls; confirm details before signing.",
-    tools: [echoTool, suiSetupTool, fetchUrlTool, ...webTools],
+` + (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",
@@ -2578,6 +2775,76 @@ YOUR TOOLS:
       });
     } else memoryRefs.push(ref);
   };
+  const handleConnect = async (arg) => {
+    const cfg = loadConfig() ?? {};
+    const provs = providersOf(cfg);
+    if (provs.length === 0) {
+      renderInfo("No providers configured \u2014 run `thiny init` to add one.");
+      return;
+    }
+    let id = arg;
+    if (!id) {
+      renderInfo("\nProviders:");
+      provs.forEach((pr, i) => {
+        renderInfo(
+          `  ${String(i + 1)}. ${pr.label}  (${pr.model})${pr.id === cfg.activeProviderId ? "  \xB7 active" : ""}`
+        );
+      });
+      const ans = (await rl.question("Switch to (number, blank to cancel): ")).trim();
+      if (!ans) return;
+      const idx = Number(ans) - 1;
+      const chosen = provs[idx];
+      if (!chosen) {
+        renderWarning("Invalid choice.");
+        return;
+      }
+      id = chosen.id;
+    }
+    const match = provs.find((pr) => pr.id === id || pr.label === id || pr.model === id);
+    const prov = match ? setActiveProvider(cfg, match.id) : void 0;
+    if (!prov) {
+      renderWarning(`No provider "${id}".`);
+      return;
+    }
+    activeModel = buildModel(prov);
+    activeModelName = prov.model;
+    renderInfo(`Connected: ${prov.label} \xB7 ${prov.model}`);
+  };
+  const handleModels = async (arg) => {
+    const cfg = loadConfig() ?? {};
+    const prov = activeProvider(cfg);
+    if (!prov) {
+      renderInfo("No provider configured \u2014 run `thiny init`.");
+      return;
+    }
+    let modelId = arg;
+    if (!modelId) {
+      renderInfo(`
+Active: ${prov.label} \xB7 current model: ${prov.model}`);
+      renderInfo("Configured providers:");
+      providersOf(cfg).forEach((pr) => {
+        renderInfo(`  \u2022 ${pr.label}: ${pr.model}`);
+      });
+      modelId = (await rl.question("New model id for the active provider (blank to cancel): ")).trim();
+      if (!modelId) return;
+    }
+    prov.model = modelId;
+    saveProvider(cfg, prov, true);
+    activeModel = buildModel(prov);
+    activeModelName = modelId;
+    renderInfo(`Model set: ${modelId}`);
+  };
+  const showSlashMenu = () => {
+    renderInfo(
+      "\nCommands: /new \xB7 /connect \xB7 /models \xB7 /tools \xB7 /skills \xB7 /session \xB7 /stats \xB7 /verify <blobId> \xB7 /clear \xB7 /help"
+    );
+    renderInfo(`Tools: ${agent.registry.all().map((t) => t.name).join(", ")}`);
+    const cats = [...defaultRegistry.byCategory()].map(
+      ([cat, defs]) => `${cat}(${defs.map((d) => d.id).join(",")})`
+    );
+    renderInfo(`Skills: ${cats.join("  ")}
+`);
+  };
   try {
     for (; ; ) {
       for (const ref of memoryRefs.splice(0))
@@ -2591,7 +2858,18 @@ YOUR TOOLS:
       if (trimmed.startsWith("/")) {
         const parts = trimmed.slice(1).split(" ");
         const cmd = parts[0];
+        const arg = parts.slice(1).join(" ").trim() || void 0;
         switch (cmd) {
+          case "":
+            showSlashMenu();
+            break;
+          case "connect":
+            await handleConnect(arg);
+            break;
+          case "models":
+          case "model":
+            await handleModels(arg);
+            break;
           case "new": {
             currentSessionId = `cli-${(/* @__PURE__ */ new Date()).getTime().toString()}`;
             renderInfo("New session started \u2014 long-term memory carries over");
@@ -2662,7 +2940,7 @@ Audit trail ${blobId}
             break;
           case "help":
             renderInfo(
-              "\n/new \xB7 /tools \xB7 /skills \xB7 /stats \xB7 /session \xB7 /verify <blobId> \xB7 /clear \xB7 /help\n"
+              "\n/new \xB7 /connect \xB7 /models \xB7 /tools \xB7 /skills \xB7 /stats \xB7 /session \xB7 /verify <blobId> \xB7 /clear \xB7 /help\n(type just `/` to see commands + all tools + skills)\n"
             );
             break;
           default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinyai",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "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/core": "0.1.0",
+    "@thiny/model-aisdk": "0.1.0",
     "@thiny/logger-pino": "0.1.0",
-    "@thiny/plugin-agents": "0.1.0",
-    "@thiny/memory-memwal": "0.1.0",
     "@thiny/mcp": "0.1.0",
     "@thiny/walrus": "0.1.0",
-    "@thiny/signer-sui": "0.1.0",
+    "@thiny/plugin-agents": "0.1.0",
     "@thiny/plugin-web-search": "0.1.0",
-    "@thiny/model-aisdk": "0.1.0",
+    "@thiny/signer-sui": "0.1.0",
     "@thiny/plugin-sui": "0.1.0",
-    "@thiny/skills": "0.1.0"
+    "@thiny/skills": "0.1.0",
+    "@thiny/memory-memwal": "0.1.0"
   },
   "author": "Thiny AI",
   "engines": {