@sofer_agent/cli 0.3.0 → 0.3.2

package/src/init.ts

@@ -1,7 +1,7 @@
+import { cancel, intro, isCancel, note, outro, password, select, spinner } from "@clack/prompts";
 import {
-  type PersistedConfig,
-  type SoferConfig,
   AgentClient,
+  type PersistedConfig,
   agentPaths,
   generateKeypair,
   keypairFromSecret,
@@ -16,29 +16,6 @@ import {
   writeSecret,
 } from "@sofer_agent/core";
 
-/** Simple spinner that logs to stdout. */
-function spin<T>(label: string, fn: () => Promise<T>): Promise<T> {
-  process.stdout.write(`${label}… `);
-  return fn().then(
-    (result) => {
-      console.log("done");
-      return result;
-    },
-    (err) => {
-      console.log("failed");
-      throw err;
-    },
-  );
-}
-
-async function ask(question: string): Promise<string> {
-  const rl = await import("node:readline/promises");
-  const iface = rl.createInterface({ input: process.stdin, output: process.stdout });
-  const answer = await iface.question(question);
-  iface.close();
-  return answer.trim();
-}
-
 /**
  * Interactive init wizard — mint the agent + provision Walrus memory.
  * Stores config to ~/.sofer/config.json and secrets to ~/.sofer/{sui,brain}.key
@@ -54,39 +31,55 @@ export async function initCommand(): Promise<void> {
     console.log(`  sui key:    ${agentPaths.suiKey}`);
     console.log(`  brain key:  ${agentPaths.brainKey}`);
     console.log(`  agent:      ${existing.agentObjectId}`);
-    console.log(`  address:    ${existing.memwal.accountId}`);
-    console.log(`\nRun \`sofer\` to chat. To start fresh, delete ~/.sofer/.`);
+    console.log(`  memory:     ${existing.memwal.accountId}`);
+    console.log(`\nRun \`sofer\` to chat. To start fresh, delete ${agentPaths.root}/.`);
     return;
   }
 
-  console.log("╔══════════════════════════════════════════╗");
-  console.log("║         sofer init — agent setup         ║");
-  console.log("╚══════════════════════════════════════════╝\n");
+  intro("sofer init");
 
   // ── 1. Network ─────────────────────────────────────────────────────────
-  const network = (await ask("Network? [testnet/mainnet] (testnet): ")) || "testnet";
+  const network = (await select({
+    message: "Which network?",
+    options: [
+      { value: "testnet", label: "Sui Testnet" },
+      { value: "mainnet", label: "Sui Mainnet" },
+    ],
+    initialValue: "testnet",
+  })) as string | symbol;
+  if (isCancel(network)) {
+    cancel("Aborted.");
+    return;
+  }
   const net = network === "mainnet" ? "mainnet" : "testnet";
-  console.log(`  → ${net}\n`);
 
   // ── 2. Anthropic API key ───────────────────────────────────────────────
-  const apiKey = await ask("Anthropic API key: ");
-  if (!apiKey) throw new Error("ANTHROPIC_API_KEY is required");
-  console.log("  → saved (encrypted to disk)\n");
+  const apiKey = (await password({
+    message: "Anthropic API key (stored in ~/.sofer/brain.key, never in .env)",
+    mask: "*",
+  })) as string | symbol;
+  if (isCancel(apiKey) || !apiKey) {
+    cancel("API key is required.");
+    return;
+  }
 
   // ── 3. Sui wallet ─────────────────────────────────────────────────────
   const existingSecret = process.env.SOFER_SUI_SECRET_KEY;
+  const sGen = spinner();
   let secret: string;
   let address: string;
   if (existingSecret) {
+    sGen.start("Loading wallet from SOFER_SUI_SECRET_KEY");
     const kp = keypairFromSecret(existingSecret);
     secret = existingSecret;
     address = kp.toSuiAddress();
-    console.log(`  wallet: ${address} (from env)\n`);
+    sGen.stop(`wallet: ${address} (from env)`);
   } else {
+    sGen.start("Generating new Sui wallet");
     const kp = generateKeypair();
     secret = kp.getSecretKey();
     address = kp.toSuiAddress();
-    console.log(`  wallet: ${address} (new)\n`);
+    sGen.stop(`wallet: ${address} (new)`);
   }
 
   const config = loadConfig();
@@ -96,119 +89,123 @@ export async function initCommand(): Promise<void> {
   if (net !== "mainnet") {
     const bal = await suiBalance(sui, address);
     if (bal === 0n) {
-      console.log("Requesting testnet faucet…");
+      const sFund = spinner();
+      sFund.start("Requesting testnet faucet");
       try {
         await requestFaucet(config.network, address);
         await waitForBalance(sui, address, 1n);
-        console.log("  → funded\n");
+        sFund.stop("funded");
       } catch (e) {
-        console.warn(`  faucet failed: ${String(e).slice(0, 80)}`);
-        console.warn(`  fund ${address} at https://faucet.sui.io/ and re-run\n`);
+        sFund.stop(`faucet failed: ${String(e).slice(0, 80)}`);
+        note(`Fund ${address} at https://faucet.sui.io/ and re-run.`, "manual funding needed");
       }
     } else {
-      console.log(`  balance: ${(Number(bal) / 1e9).toFixed(4)} SUI\n`);
+      note(`${(Number(bal) / 1e9).toFixed(4)} SUI on ${address}`, "wallet balance");
     }
   }
 
   const agents = new AgentClient(sui, config.packageId);
 
   // ── 5. Mint agent ─────────────────────────────────────────────────────
-  let agentId = config.agentObjectId;
+  let agentId = existing.agentObjectId;
   if (!agentId) {
-    console.log("Minting agent identity object on-chain…");
+    const sMint = spinner();
+    sMint.start("Minting agent identity object on-chain");
     try {
       const keypair = keypairFromSecret(secret);
-      const minted = await spin("  minting", () =>
-        agents.mint(
-          keypair,
-          "Sofer",
-          "a sovereign AI agent on Sui with encrypted memory on Walrus",
-          new TextEncoder().encode("sofer"),
-        ),
+      const minted = await agents.mint(
+        keypair,
+        "Sofer",
+        "a sovereign AI agent on Sui with encrypted memory on Walrus",
+        new TextEncoder().encode("sofer"),
       );
       agentId = minted.agentId;
-      console.log(`  → agent: ${agentId}\n`);
+      sMint.stop(`agent: ${agentId}`);
     } catch (e) {
-      console.error(`  mint failed: ${String(e).slice(0, 120)}`);
-      console.error("  (maybe already minted? set SOFER_AGENT_OBJECT_ID and re-run)");
+      sMint.stop(`mint failed: ${String(e).slice(0, 120)}`);
+      cancel("Mint failed. Is the wallet funded?");
       return;
     }
   } else {
-    console.log(`  reusing agent: ${agentId}\n`);
+    note(agentId, "reusing agent");
   }
 
   // ── 6. Provision MemWal memory ────────────────────────────────────────
-  let accountId = config.memwal.accountId;
-  let delegateKey = config.memwal.delegateKey;
+  let accountId = existing.memwal.accountId;
+  let delegateKey = existing.memwal.delegateKey;
   if (!accountId || !delegateKey) {
-    console.log("Provisioning Walrus memory (MemWal)…");
+    const sMem = spinner();
+    sMem.start("Provisioning Walrus memory (MemWal)");
     try {
-      const prov = await spin("  provisioning", () =>
-        provisionMemwal({
-          ownerSecret: secret,
-          packageId: config.memwal.packageId,
-          registryId: config.memwal.registryId,
-          network: net,
-          label: "sofer-cli",
-        }),
-      );
+      const prov = await provisionMemwal({
+        ownerSecret: secret,
+        packageId: config.memwal.packageId,
+        registryId: config.memwal.registryId,
+        network: net,
+        label: "sofer-cli",
+      });
       accountId = prov.accountId;
       delegateKey = prov.delegateKey;
-      console.log(`  → account: ${accountId}\n`);
+      sMem.stop(`account: ${accountId}`);
     } catch (e) {
+      sMem.stop(`provision failed: ${String(e).slice(0, 120)}`);
       const msg = String(e);
       if (msg.includes("abort code: 3") || msg.includes("create_account")) {
-        throw new Error(
-          "This wallet already owns a MemWal account (one per address).\n" +
-            "Delete ~/.sofer/ and re-run `sofer init`, or set the env vars manually.",
+        cancel(
+          "This wallet already owns a MemWal account.\nDelete ~/.sofer/ and re-run, or set env vars manually.",
         );
       }
-      throw e;
+      return;
     }
   } else {
-    console.log(`  reusing memory account: ${accountId}\n`);
+    note(accountId, "reusing memory account");
   }
 
   // ── 7. Link memory to agent on-chain ───────────────────────────────────
-  console.log("Linking memory account to agent on-chain…");
+  if (!agentId || !accountId) {
+    cancel("Agent or memory not provisioned. Re-run `sofer init`.");
+    return;
+  }
+  const sLink = spinner();
+  sLink.start("Linking memory account to agent on-chain");
   try {
     const keypair = keypairFromSecret(secret);
-    await spin("  linking", () => agents.setMemoryAccount(keypair, agentId!, accountId!));
-    console.log("  → linked\n");
+    await agents.setMemoryAccount(keypair, agentId, accountId);
+    sLink.stop("linked");
   } catch (e) {
-    console.warn(`  link failed (may already be linked): ${String(e).slice(0, 80)}\n`);
+    sLink.stop(`link failed (may already be linked): ${String(e).slice(0, 80)}`);
   }
 
   // ── 8. Persist config + secrets to ~/.sofer/ ───────────────────────────
-  console.log("Saving config to ~/.sofer/…");
-
+  if (!delegateKey) {
+    cancel("Memory delegate key missing. Re-run `sofer init`.");
+    return;
+  }
+  const sSave = spinner();
+  sSave.start("Saving to ~/.sofer/");
   writeSecret(agentPaths.suiKey, secret);
   writeSecret(agentPaths.brainKey, apiKey);
-
   const persisted: PersistedConfig = {
     network: net,
-    agentObjectId: agentId!,
+    agentObjectId: agentId,
     agentAddress: address,
     brain: { model: config.brain.model },
     memwal: {
-      accountId: accountId!,
-      delegateKey: delegateKey!,
+      accountId,
+      delegateKey,
     },
   };
   writePersistedConfig(persisted);
-
-  const agentDir = agentPaths.agent(shortAgentId(address));
-  console.log(`  config:  ${agentPaths.config}`);
-  console.log(`  keys:    ${agentPaths.suiKey} / ${agentPaths.brainKey}`);
-  console.log(`  agent:   ${agentDir.dir}\n`);
+  sSave.stop(`config: ${agentPaths.config}`);
 
   // ── 9. Summary ────────────────────────────────────────────────────────
-  console.log("┌─────────────────────────────────────────┐");
-  console.log(`│ agent id    ${agentId!.slice(0, 30)}… │`);
-  console.log(`│ address     ${address.slice(0, 10)}…       │`);
-  console.log(`│ network     ${net.padEnd(23)} │`);
-  console.log(`│ memory      ${accountId!.slice(0, 10)}…     │`);
-  console.log("├─────────────────────────────────────────┤");
-  console.log("│ Run `sofer` to chat with your agent.    │");
-  console.log("└─────────────────────────────────────────┘");
+  const lines = [
+    `agent    ${agentId.slice(0, 30)}…`,
+    `address  ${address.slice(0, 10)}…`,
+    `network  ${net}`,
+    `memory   ${accountId.slice(0, 10)}…`,
+    "",
+    "Run `sofer` to chat with your agent.",
+  ];
+  outro(lines.join("\n"));
 }

package/src/secrets.ts

@@ -5,10 +5,14 @@ import { loadSecrets } from "./env.js";
 export function requireSecrets(): AgentSecrets {
   const { suiSecretKey, anthropicApiKey } = loadSecrets();
   if (!suiSecretKey) {
-    throw new Error("SOFER_SUI_SECRET_KEY not found — run `sofer init` first (creates ~/.sofer/sui.key)");
+    throw new Error(
+      "SOFER_SUI_SECRET_KEY not found — run `sofer init` first (creates ~/.sofer/sui.key)",
+    );
   }
   if (!anthropicApiKey) {
-    throw new Error("ANTHROPIC_API_KEY not found — run `sofer init` first (creates ~/.sofer/brain.key)");
+    throw new Error(
+      "ANTHROPIC_API_KEY not found — run `sofer init` first (creates ~/.sofer/brain.key)",
+    );
   }
   return { suiSecretKey, anthropicApiKey };
 }