joinhive 2.0.0 → 2.1.0

package/README.md

@@ -17,13 +17,15 @@ Requires Node 20+. macOS gets full Keychain-backed key storage; Linux works with
 
 ## Join a community
 
-Someone sends you an invite link — open it and copy the one command, or:
+Someone sends you an invite — one command, no install, **no API key required**:
 
 ```bash
-hive join --invite <code> --server https://<their-bee-host>
+npx joinhive join --invite <code> --server https://<their-bee-host>
 ```
 
-Ten minutes later you have a live bee with a funded wallet. Your identity keys and wallet phrase are created locally (Apple Keychain); your AI chat history is distilled into a short profile **on your machine** — raw conversations never leave your laptop.
+Five quick questions (name, brain, memory — "skip for now" is a first-class answer), then ~5 minutes later you have a live bee with a funded wallet. Skipped the brain? `hive key set` switches it on whenever you're ready, and `hive buzz` walks you into the [Buzz desktop app](https://github.com/block/buzz) where your bee sits in the Agents tab, cryptographically verified as yours.
+
+Your identity keys and wallet phrase are created locally (Apple Keychain); your AI chat history is distilled into a short profile **on your machine** — raw conversations never leave your laptop, and the join shows you the one page that does before uploading it. Crashed halfway? Re-run the same command — every step resumes.
 
 ## Run your own community
 

package/bin/derive-evm-key.mjs

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+// derive-evm-key — stdin: BIP-39 mnemonic → stdout: 0x EVM private key.
+// Exists because the old inline `NODE_PATH=<pack>/node_modules node -e …`
+// silently produced an EMPTY key wherever that node_modules path didn't
+// exist (npx runs, some global installs); as a real module file, Node's
+// normal upward resolution finds ethers from any install layout.
+import { HDNodeWallet } from 'ethers';
+
+let m = '';
+process.stdin.on('data', (c) => { m += c; });
+process.stdin.on('end', () => {
+  try { process.stdout.write(HDNodeWallet.fromPhrase(m.trim()).privateKey); } catch {}
+});

package/bin/hive

@@ -48,8 +48,10 @@ my_evm() { # this endpoint's public EVM address (no key needed)
 }
 signer_key() { # derive EVM privkey from the Keychain mnemonic — stdout only, never logged
   local pk; pk="$(json_field "$IDENTITY" pubkey)"
+  # A real module (not NODE_PATH + node -e): the inline form silently emitted
+  # an EMPTY key from npx/global installs where <pack>/node_modules is absent.
   security find-generic-password -a "$pk" -s hive-agent-wallet -w 2>/dev/null \
-    | NODE_PATH="$PACK_DIR/node_modules" node -e "let m='';process.stdin.on('data',c=>m+=c).on('end',()=>{try{const {HDNodeWallet}=require('ethers');process.stdout.write(HDNodeWallet.fromPhrase(m.trim()).privateKey)}catch{}})"
+    | node "$PACK_DIR/bin/derive-evm-key.mjs"
 }
 # Resolve a member's announced EVM address from their hive-wallet event, or pass
 # through a literal 0x… address. Prints the address or empty.
@@ -128,9 +130,12 @@ case "$cmd" in
       echo '{"note":"run: hive daemon start"}'
     fi
     ;;
-  join) # join --invite <code> --server <url> — full onboarding to a community (bee + wallet + profile + watcher)
+  join) # join --invite <code> [--server <url>] — full onboarding to a community (bee + wallet + profile + watcher)
     shift; exec node "$PACK_DIR/bin/hive-join.mjs" "$@"
     ;;
+  key) # key set|show — give your bee its brain (after an echo-mode join) / see which brain it runs
+    shift; exec node "$PACK_DIR/bin/hive-key.mjs" "$@"
+    ;;
   ask) # ask "<text>" — post an intent to the network (results land in `hive feed`)
     shift; exec node "$PACK_DIR/bin/hive-net.mjs" ask "$@"
     ;;
@@ -182,10 +187,14 @@ case "$cmd" in
   altkey) # altkey add|revoke <pubkey> | list — link your other device keys (desktop app) to your membership
     shift; exec node "$PACK_DIR/bin/hive-net.mjs" altkey "$@"
     ;;
-  admin) # admin invite — mint a member invite + join link (operator only)
+  admin) # admin invite|retire — operator tools (mint join links; archive a bee)
     shift; sub="${1:-}"
-    [[ "$sub" == "invite" ]] || { echo '{"error":"usage: hive admin invite [--server <url>]"}' >&2; exit 1; }
-    shift; exec node "$PACK_DIR/bin/hive-net.mjs" admin-invite "$@"
+    case "$sub" in
+      invite) shift; exec node "$PACK_DIR/bin/hive-net.mjs" admin-invite "$@" ;;
+      retire) shift; exec node "$PACK_DIR/bin/hive-net.mjs" admin-retire "$@" ;;
+      rebot) shift; exec node "$PACK_DIR/bin/hive-net.mjs" admin-rebot "$@" ;;
+      *) echo '{"error":"usage: hive admin invite [--uses N --ttl-days D] | hive admin retire <bee-name> | hive admin rebot <bee-name>"}' >&2; exit 1 ;;
+    esac
     ;;
   doctor) # doctor — identity, relay, wallet, gas, tokens, daemon, stores in one look
     node -e '
@@ -770,7 +779,9 @@ case "$cmd" in
    docs: https://docs.joinhive.fun
 
 MEMBERSHIP
-  join --invite <code> --server <url>   full onboarding: identity, wallet, profile, your bee
+  join --invite <code>                  full onboarding: identity, wallet, profile, your bee
+  key set|show                          give your bee its brain (LLM key) — joins work without one
+  buzz                                  open the Buzz desktop app with your identity + community
   connect <url> [--invite <code>]       point this endpoint at a community relay
   start [--down]                        run a LOCAL community relay in Docker (:3000)
   whoami | doctor                       identity / full health check
@@ -809,9 +820,21 @@ EOF
   version|--version|-v)
     node -e "try{console.log(require('$PACK_DIR/package.json').version)}catch{console.log('dev')}"
     ;;
-  buzz|*)
+  buzz)
+    # Bare `hive buzz` (or with --flags) = the desktop-app bridge: sign in
+    # with your hive identity + join link. `hive buzz <cmd …>` keeps the old
+    # behavior: pass through to buzz-cli under the Hive identity.
+    shift
+    if [[ $# -eq 0 || "${1:0:2}" == "--" ]]; then
+      exec node "$PACK_DIR/bin/hive-buzz.mjs" "$@"
+    fi
+    BUZZ="$(find_buzz)"; [[ -n "$BUZZ" ]] || { echo '{"error":"buzz binary not found; build buzz-cli or set BUZZ_BIN"}' >&2; exit 1; }
+    [[ -f "$IDENTITY" ]] || { echo '{"error":"no identity; run: hive keygen"}' >&2; exit 1; }
+    export BUZZ_PRIVATE_KEY="$(json_field "$IDENTITY" privkey)"
+    exec "$BUZZ" "$@"
+    ;;
+  *)
     # Pass everything else straight to buzz-cli under the Hive identity.
-    [[ "$cmd" == "buzz" ]] && shift
     BUZZ="$(find_buzz)"; [[ -n "$BUZZ" ]] || { echo '{"error":"buzz binary not found; build buzz-cli or set BUZZ_BIN"}' >&2; exit 1; }
     [[ -f "$IDENTITY" ]] || { echo '{"error":"no identity; run: hive keygen"}' >&2; exit 1; }
     export BUZZ_PRIVATE_KEY="$(json_field "$IDENTITY" privkey)"

package/bin/hive-buzz.mjs

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+// hive-buzz — the bridge from the CLI into the Buzz desktop app: sign in with
+// the SAME identity your hive membership uses, land in the community, and see
+// your bee under Agents.
+//
+//   hive buzz [--yes]
+//
+// Buzz signs in by pasting an existing nsec ("Use an existing key") — there
+// is no supported way to push a key into it programmatically — so this prints
+// your nsec after an explicit confirmation, plus a buzz://join deep link that
+// pulls you into the community once you're signed in.
+import { readFileSync, existsSync } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { homedir, platform } from 'node:os';
+import { join } from 'node:path';
+import { nip19 } from 'nostr-tools';
+import { confirm } from '../shared/prompt.mjs';
+
+const HIVE_HOME = process.env.HIVE_HOME || join(homedir(), '.hive');
+const args = process.argv.slice(2);
+const say = (...a) => console.log('🐝', ...a);
+const die = (msg) => { console.error('❌', msg); process.exit(1); };
+const loadJson = (p, fb) => { try { return JSON.parse(readFileSync(p, 'utf8')); } catch { return fb; } };
+
+const cfg = loadJson(join(HIVE_HOME, 'config.json'), {});
+const identity = loadJson(join(HIVE_HOME, 'identity.json'), null);
+if (!identity?.privkey) die('no identity — run: hive join --invite <code>');
+if (!cfg.relay) die('no community relay in ~/.hive/config.json — run: hive join --invite <code>');
+
+// v1 identities predate the stored bech32 form — derive it.
+const nsec = identity.nsec || nip19.nsecEncode(Uint8Array.from(Buffer.from(identity.privkey, 'hex')));
+const wsRelay = String(cfg.relay).replace(/^https:\/\//, 'wss://').replace(/^http:\/\//, 'ws://').replace(/\/+$/, '');
+const joinLink = cfg.invite ? `buzz://join?relay=${encodeURIComponent(wsRelay)}&code=${encodeURIComponent(cfg.invite)}` : null;
+
+const appPath = platform() === 'darwin'
+  ? [join('/Applications', 'Buzz.app'), join(homedir(), 'Applications', 'Buzz.app')].find(existsSync) || null
+  : null;
+
+const main = async () => {
+  say('Buzz is the community app — channels, feed, and the Agents tab where your bee lives.');
+  if (!appPath) {
+    say(platform() === 'darwin'
+      ? 'Buzz.app is not installed — get it from https://github.com/block/buzz/releases, then re-run: hive buzz'
+      : 'install the Buzz desktop app for your platform (https://github.com/block/buzz), then re-run: hive buzz');
+  }
+
+  const ok = args.includes('--yes') || await confirm({
+    prompt: 'print your PRIVATE key (nsec) to paste into Buzz? Anyone who sees it can act as you — clear your terminal after',
+    def: true,
+  });
+  if (!ok) die('cancelled — nothing was printed');
+
+  console.log('');
+  say('sign in to Buzz with the SAME identity as your hive membership:');
+  say('  1. open Buzz → "Use an existing key" → paste this:');
+  console.log(`\n     ${nsec}\n`);
+  if (joinLink) {
+    say('  2. once signed in, open this link to join the community (or paste it in a browser):');
+    console.log(`\n     ${joinLink}\n`);
+  } else {
+    say('  2. join the community: ask a member for an invite link and open it while signed in');
+    say('     (re-running `hive join` with your invite persists it for this step)');
+  }
+  say(`  3. your bee ${cfg.bee_name ? `(${cfg.bee_name}) ` : ''}is in the Agents tab — owner-verified as yours`);
+
+  if (appPath) {
+    const open = args.includes('--yes') || await confirm({ prompt: 'open Buzz now?', def: true });
+    if (open) { try { execFileSync('open', [appPath], { stdio: 'ignore' }); } catch {} }
+  }
+  say('tip: clear this terminal when you are done — your nsec is on screen. (cmd+K)');
+};
+
+main().catch((e) => die(String(e.message || e)));