nostr-bray 1.29.0 → 1.29.2

package/dist/cli.js

@@ -23,6 +23,16 @@ import { handleKeyEncrypt, handleKeyDecrypt } from './util/ncryptsec.js';
 import { getCommandHelp } from './help.js';
 import * as fmt from './format.js';
 const args = process.argv.slice(2);
+// Strip global flags before command detection so `--bunker <uri> whoami` works.
+// Inject into env so loadConfig() picks them up via its normal path.
+for (const flag of ['--bunker', '--key']) {
+    const i = args.indexOf(flag);
+    if (i !== -1) {
+        const envKey = flag === '--bunker' ? 'BUNKER_URI' : 'NOSTR_SECRET_KEY';
+        process.env[envKey] = args[i + 1];
+        args.splice(i, 2);
+    }
+}
 const command = args[0];
 // No command = start MCP server.
 //
@@ -237,20 +247,6 @@ if (command === 'help' || command === '--help' || command === '-h') {
     console.log(HELP);
     process.exit(0);
 }
-// Allow key/bunker overrides on the command line
-// These are injected into env before loadConfig() so all loading logic stays centralised.
-// Note: loadConfig() deletes BUNKER_URI / NOSTR_SECRET_KEY from env after reading them.
-if (args.includes('--bunker')) {
-    process.env.BUNKER_URI = args[args.indexOf('--bunker') + 1];
-    // Remove from args so commands don't see it as a positional argument
-    const i = args.indexOf('--bunker');
-    args.splice(i, 2);
-}
-if (args.includes('--key')) {
-    process.env.NOSTR_SECRET_KEY = args[args.indexOf('--key') + 1];
-    const i = args.indexOf('--key');
-    args.splice(i, 2);
-}
 // Commands that work purely offline — no relay connection needed
 const OFFLINE_COMMANDS = new Set([
     'whoami', 'create', 'list', 'derive', 'persona', 'switch', 'prove',
@@ -270,8 +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);
-    console.error(`Connected to bunker — signing as ${ctx.activeNpub}`);
+    await ctx.resolvePublicKey();
+    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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-bray",
-  "version": "1.29.0",
+  "version": "1.29.2",
   "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",