nostr-bray 1.29.1 → 1.29.3

package/dist/cli.js

@@ -266,9 +266,13 @@ const nip65 = new Nip65Manager(pool, config.relays);
 let ctx;
 if (config.bunkerUri) {
     const { BunkerContext } = await import('./bunker-context.js');
+    const { HeartwoodContext } = await import('./heartwood-context.js');
     ctx = await BunkerContext.connect(config.bunkerUri);
     await ctx.resolvePublicKey();
-    console.error(`Connected to bunker — signing as ${ctx.activeNpub}`);
+    const hw = await HeartwoodContext.probe(ctx);
+    if (hw)
+        ctx = hw;
+    console.error(`Connected to ${hw ? 'Heartwood' : 'bunker'} — signing as ${ctx.activeNpub}`);
 }
 else {
     ctx = new IdentityContext(config.secretKey, config.secretFormat);
@@ -373,6 +377,7 @@ async function run(cmdArgs) {
             break;
         case 'switch':
             await ctx.switch(req(1, 'switch <target> [index]'), cmdArgs[2] ? parseInt(cmdArgs[2], 10) : undefined);
+            console.error(`Now signing as ${ctx.activeNpub}`);
             console.log(ctx.activeNpub);
             break;
         case 'prove':

package/dist/heartwood-context.js

@@ -36,7 +36,12 @@ export class HeartwoodContext extends BunkerContext {
     /** Derive a named persona on the Heartwood device. */
     async derivePersona(name, index) {
         const result = await this.signer.sendRequest('heartwood_derive_persona', [name, String(index)]);
-        return JSON.parse(result);
+        const identity = JSON.parse(result);
+        // Log purpose so we can verify it matches nostr:persona:{name} convention
+        if (identity.purpose && identity.purpose !== `nostr:persona:${name}`) {
+            console.error(`[heartwood] note: device returned purpose "${identity.purpose}", bray uses "nostr:persona:${name}"`);
+        }
+        return identity;
     }
     /** List all known identities on the Heartwood device. */
     async listIdentities() {
@@ -49,10 +54,30 @@ export class HeartwoodContext extends BunkerContext {
             ? [purposeOrName, String(index)]
             : [purposeOrName];
         const raw = await this.signer.sendRequest('heartwood_switch', params);
-        // The server returns { npub } — decode it to refresh the local pubkey cache
-        // (BunkerSigner caches getPublicKey() so we cannot rely on it after a switch)
-        const { npub } = JSON.parse(raw);
-        const { decode } = await import('nostr-tools/nip19');
+        // Parse response — device may return { npub } object or a bare npub string
+        const { decode, npubEncode } = await import('nostr-tools/nip19');
+        let npub;
+        try {
+            const parsed = JSON.parse(raw);
+            if (typeof parsed === 'string') {
+                npub = parsed;
+            }
+            else if (parsed && typeof parsed.npub === 'string') {
+                npub = parsed.npub;
+            }
+            else if (parsed && typeof parsed.pubkey === 'string') {
+                // Some devices return { pubkey: hex }
+                npub = npubEncode(parsed.pubkey);
+            }
+        }
+        catch {
+            // raw may itself be a bare npub (no JSON wrapping)
+            if (typeof raw === 'string' && raw.startsWith('npub1'))
+                npub = raw;
+        }
+        if (!npub) {
+            throw new Error(`heartwood_switch returned unexpected response: ${JSON.stringify(raw)}`);
+        }
         const decoded = decode(npub);
         if (decoded.type === 'npub') {
             this.pubkeyHex = decoded.data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-bray",
-  "version": "1.29.1",
+  "version": "1.29.3",
   "mcpName": "dev.forgesworn/bray",
   "description": "Trust-aware Nostr for AI and humans. Three dimensions of trust -- verification, proximity, and access -- woven into every interaction.",
   "type": "module",