agentdex-cli 0.4.2 → 0.4.4

package/dist/cli.js

@@ -9,7 +9,7 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { nip19 } from 'nostr-tools';
 import { AgentdexClient } from './client.js';
-import { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, createKind0Event, publishToRelays, createNote, generateAndSaveKeypair } from './nostr.js';
+import { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, buildKind0Event, publishToRelays, createNote, generateAndSaveKeypair } from './nostr.js';
 import { payInvoice } from './nwc.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -70,7 +70,7 @@ program
     .option('--owner-type <type>', 'Owner type: human, agent, org (sets owner_type tag on kind 31339)')
     .option('--parent <npub-or-hex>', 'Parent/orchestrator agent pubkey (npub or hex)')
     .option('--bot', 'Add ["bot"] tag to kind 0 profile (declares this pubkey as automated)')
-    .option('--portfolio <entry>', 'Portfolio URL (format: "url,name,description") — repeatable', (val, acc) => [...acc, val], [])
+    .option('--portfolio <entry>', 'Portfolio entry (format: "id,url,label,description") — repeatable', (val, acc) => [...acc, val], [])
     .option('--skill <skill>', 'Skill tag (repeatable)', (val, acc) => [...acc, val], [])
     .option('--experience <exp>', 'Experience tag (repeatable)', (val, acc) => [...acc, val], [])
     .option('--nwc <uri>', 'Nostr Wallet Connect URI for auto-pay')
@@ -100,10 +100,16 @@ program
             framework = answers.framework || framework;
         }
         const spinner = ora('Signing event...').start();
-        // Parse portfolio entries ("url,name,description")
+        // Parse portfolio entries ("id,url,label,description")
         const portfolio = (options.portfolio || []).map((entry) => {
             const parts = entry.split(',').map((s) => s.trim());
-            return { url: parts[0], name: parts[1], description: parts[2] };
+            // Support both: "id,url,label,desc" (new) and "url,label,desc" (old)
+            if (parts.length >= 2 && parts[1]?.startsWith('http')) {
+                return { id: parts[0], url: parts[1], name: parts[2], description: parts[3] };
+            }
+            // Old format fallback
+            const id = (parts[1] || parts[0]).toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
+            return { id, url: parts[0], name: parts[1], description: parts[2] };
         });
         // Resolve owner pubkey hex from --owner flag (npub or hex)
         let ownerNpub = options.owner;
@@ -209,17 +215,17 @@ program
                             console.log(chalk.gray(`  Published to: ${published.join(', ')}`));
                             console.log('');
                             console.log(chalk.gray(`  Run ${chalk.white('agentdex claim <name>')} to get ${chalk.hex('#D4A574')('<name>@agentdex.id')}`));
-                            // Publish kind 0 profile (name, about, avatar, website, lud16)
+                            // Publish kind 0 profile (fetch existing, merge, republish)
                             const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
                             try {
-                                const kind0 = createKind0Event(sk, {
+                                const kind0 = await buildKind0Event(sk, {
                                     name,
                                     about: description || undefined,
                                     picture: options.avatar || undefined,
                                     lud16: options.lightning || undefined,
                                     ownerPubkeyHex,
                                     bot: !!options.bot,
-                                });
+                                }, relays);
                                 await publishToRelays(kind0, relays);
                                 k0Spinner.succeed('Kind 0 published — visible on all Nostr clients');
                             }
@@ -257,18 +263,18 @@ program
                 console.log('');
                 console.log(chalk.gray(`  Run ${chalk.white('agentdex claim <name>')} to get ${chalk.hex('#D4A574')('<name>@agentdex.id')}`));
                 console.log('');
-                // Publish kind 0 profile (name, about, avatar, website, lud16)
+                // Publish kind 0 profile (fetch existing, merge, republish)
                 // Kind 0 is canonical for basic profile; kind 31339 is agent-specific metadata
                 const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
                 try {
-                    const kind0 = createKind0Event(sk, {
+                    const kind0 = await buildKind0Event(sk, {
                         name,
                         about: description || undefined,
                         picture: options.avatar || undefined,
                         lud16: options.lightning || undefined,
                         ownerPubkeyHex,
                         bot: !!options.bot,
-                    });
+                    }, relays);
                     await publishToRelays(kind0, relays);
                     k0Spinner.succeed('Kind 0 published — visible on all Nostr clients');
                 }
@@ -325,14 +331,14 @@ program
             if (!options.skipKind0) {
                 const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
                 try {
-                    const kind0 = createKind0Event(sk, {
+                    const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+                    const kind0 = await buildKind0Event(sk, {
                         name: claim.agent?.name || name,
                         about: claim.agent?.description || undefined,
                         picture: claim.agent?.avatarUrl || undefined,
                         nip05: `${name}@agentdex.id`,
                         lud16: options.lightning || undefined,
-                    });
-                    const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+                    }, relays);
                     const published = await publishToRelays(kind0, relays);
                     k0Spinner.succeed(`Kind 0 published to ${published.join(', ')}`);
                     console.log(chalk.gray('  NIP-05 will appear on njump/Damus/Primal once relays propagate (~30s)'));
@@ -392,8 +398,8 @@ program
                     if (!options.skipKind0) {
                         const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
                         try {
-                            const kind0 = createKind0Event(sk, { name, nip05: `${name}@agentdex.id` });
                             const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+                            const kind0 = await buildKind0Event(sk, { name, nip05: `${name}@agentdex.id` }, relays);
                             await publishToRelays(kind0, relays);
                             k0Spinner.succeed('Kind 0 published — NIP-05 active on all Nostr clients');
                         }

package/dist/index.d.ts

@@ -11,5 +11,5 @@
  */
 export { AgentdexClient } from './client.js';
 export type { AgentdexConfig, RegisterOptions, VerifyResult, ClaimResult, ClaimStatus, SearchOptions, } from './client.js';
-export { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, createKind0Event, publishToRelays, createNote, } from './nostr.js';
+export { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, buildKind0Event, publishToRelays, createNote, } from './nostr.js';
 export type { AgentProfile } from './nostr.js';

package/dist/index.js

@@ -10,4 +10,4 @@
  * ```
  */
 export { AgentdexClient } from './client.js';
-export { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, createKind0Event, publishToRelays, createNote, } from './nostr.js';
+export { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, buildKind0Event, publishToRelays, createNote, } from './nostr.js';

package/dist/nostr.d.ts

@@ -2,6 +2,7 @@
  * Nostr utilities — event creation, signing, publishing
  */
 export interface PortfolioItem {
+    id: string;
     url: string;
     name?: string;
     description?: string;
@@ -64,15 +65,20 @@ export declare function updateKind0(sk: Uint8Array, updates: {
  * After claiming a NIP-05 name, publish this to relays so Nostr clients
  * (njump, Damus, Primal) can verify the identity.
  */
-export declare function createKind0Event(sk: Uint8Array, profile: {
-    name: string;
+/**
+ * Fetch existing kind 0, merge explicit updates, and return signed event.
+ * Safe for existing Nostr users — only overwrites fields explicitly passed.
+ */
+export declare function buildKind0Event(sk: Uint8Array, updates: {
+    name?: string;
     about?: string;
     nip05?: string;
     picture?: string;
     lud16?: string;
+    website?: string;
     ownerPubkeyHex?: string;
     bot?: boolean;
-}): import("nostr-tools").VerifiedEvent;
+}, relays?: string[]): Promise<import("nostr-tools").VerifiedEvent>;
 /**
  * Create and sign a kind 1 note tagged #agentdex
  */

package/dist/nostr.js

@@ -93,7 +93,8 @@ export function createProfileEvent(sk, profile) {
         tags.push(['messaging_fee', String(profile.messagingFee)]);
     if (profile.portfolio) {
         for (const item of profile.portfolio) {
-            const tag = ['portfolio', item.url];
+            // New format: ["portfolio", id, url, label, description]
+            const tag = ['portfolio', item.id, item.url];
             if (item.name)
                 tag.push(item.name);
             if (item.description)
@@ -185,24 +186,79 @@ export async function updateKind0(sk, updates, relays = DEFAULT_RELAYS) {
  * After claiming a NIP-05 name, publish this to relays so Nostr clients
  * (njump, Damus, Primal) can verify the identity.
  */
-export function createKind0Event(sk, profile) {
+/**
+ * Fetch existing kind 0, merge explicit updates, and return signed event.
+ * Safe for existing Nostr users — only overwrites fields explicitly passed.
+ */
+export async function buildKind0Event(sk, updates, relays = DEFAULT_RELAYS) {
+    const pool = new SimplePool();
+    const pubkey = getPublicKey(sk);
+    // Fetch existing kind 0 from relays
+    let existing = {};
+    let existingTags = [];
+    try {
+        const events = await Promise.race([
+            pool.querySync(relays, { kinds: [0], authors: [pubkey] }),
+            new Promise((resolve) => setTimeout(() => resolve([]), 5000)),
+        ]);
+        if (events.length > 0) {
+            // Get newest event
+            const newest = events.reduce((a, b) => a.created_at > b.created_at ? a : b);
+            existing = JSON.parse(newest.content);
+            existingTags = newest.tags || [];
+        }
+    }
+    catch { }
+    pool.close(relays);
+    // Merge content fields — only overwrite if explicitly provided (not undefined)
+    if (updates.name !== undefined)
+        existing.name = updates.name;
+    if (updates.about !== undefined)
+        existing.about = updates.about;
+    if (updates.nip05 !== undefined)
+        existing.nip05 = updates.nip05;
+    if (updates.picture !== undefined)
+        existing.picture = updates.picture;
+    if (updates.lud16 !== undefined)
+        existing.lud16 = updates.lud16;
+    if (updates.website !== undefined)
+        existing.website = updates.website;
+    // Merge tags
     const tags = [];
-    if (profile.bot)
-        tags.push(["bot"]);
-    if (profile.ownerPubkeyHex) {
-        tags.push(["p", profile.ownerPubkeyHex, "", "owner"]);
+    // Preserve existing tags that we don't manage (e.g., user's own tags)
+    for (const tag of existingTags) {
+        // Skip tags we manage — we'll re-add them below
+        if (tag[0] === 'p' && tag[3] === 'owner')
+            continue;
+        if (tag[0] === 'bot')
+            continue;
+        tags.push(tag);
+    }
+    // Add/update owner p tag
+    if (updates.ownerPubkeyHex) {
+        tags.push(['p', updates.ownerPubkeyHex, '', 'owner']);
+    }
+    else {
+        // Preserve existing owner p tag if we're not updating it
+        const existingOwner = existingTags.find(t => t[0] === 'p' && t[3] === 'owner');
+        if (existingOwner)
+            tags.push(existingOwner);
+    }
+    // Add bot tag only if explicitly requested
+    if (updates.bot) {
+        tags.push(['bot']);
+    }
+    else {
+        // Preserve existing bot tag if we're not changing it
+        const existingBot = existingTags.find(t => t[0] === 'bot');
+        if (existingBot)
+            tags.push(existingBot);
     }
     return finalizeEvent({
         kind: 0,
         created_at: Math.floor(Date.now() / 1000),
         tags,
-        content: JSON.stringify({
-            name: profile.name,
-            ...(profile.about && { about: profile.about }),
-            ...(profile.nip05 && { nip05: profile.nip05 }),
-            ...(profile.picture && { picture: profile.picture }),
-            ...(profile.lud16 && { lud16: profile.lud16 }),
-        }),
+        content: JSON.stringify(existing),
     }, sk);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentdex-cli",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "CLI and SDK for the agentdex AI agent directory",
   "type": "module",
   "bin": {

package/src/cli.ts

@@ -10,7 +10,7 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { nip19 } from 'nostr-tools';
 import { AgentdexClient } from './client.js';
-import { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, createKind0Event, publishToRelays, createNote, updateKind0, generateAndSaveKeypair } from './nostr.js';
+import { parseSecretKey, getNpub, getPubkeyHex, createProfileEvent, buildKind0Event, publishToRelays, createNote, updateKind0, generateAndSaveKeypair } from './nostr.js';
 import { payInvoice } from './nwc.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -78,7 +78,7 @@ program
   .option('--owner-type <type>', 'Owner type: human, agent, org (sets owner_type tag on kind 31339)')
   .option('--parent <npub-or-hex>', 'Parent/orchestrator agent pubkey (npub or hex)')
   .option('--bot', 'Add ["bot"] tag to kind 0 profile (declares this pubkey as automated)')
-  .option('--portfolio <entry>', 'Portfolio URL (format: "url,name,description") — repeatable', (val: string, acc: string[]) => [...acc, val], [])
+  .option('--portfolio <entry>', 'Portfolio entry (format: "id,url,label,description") — repeatable', (val: string, acc: string[]) => [...acc, val], [])
   .option('--skill <skill>', 'Skill tag (repeatable)', (val: string, acc: string[]) => [...acc, val], [])
   .option('--experience <exp>', 'Experience tag (repeatable)', (val: string, acc: string[]) => [...acc, val], [])
   .option('--nwc <uri>', 'Nostr Wallet Connect URI for auto-pay')
@@ -112,10 +112,16 @@ program
 
       const spinner = ora('Signing event...').start();
 
-      // Parse portfolio entries ("url,name,description")
+      // Parse portfolio entries ("id,url,label,description")
       const portfolio = (options.portfolio || []).map((entry: string) => {
         const parts = entry.split(',').map((s: string) => s.trim());
-        return { url: parts[0], name: parts[1], description: parts[2] };
+        // Support both: "id,url,label,desc" (new) and "url,label,desc" (old)
+        if (parts.length >= 2 && parts[1]?.startsWith('http')) {
+          return { id: parts[0], url: parts[1], name: parts[2], description: parts[3] };
+        }
+        // Old format fallback
+        const id = (parts[1] || parts[0]).toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)/g, '');
+        return { id, url: parts[0], name: parts[1], description: parts[2] };
       });
 
       // Resolve owner pubkey hex from --owner flag (npub or hex)
@@ -227,17 +233,17 @@ program
                 console.log('');
                 console.log(chalk.gray(`  Run ${chalk.white('agentdex claim <name>')} to get ${chalk.hex('#D4A574')('<name>@agentdex.id')}`));
 
-                // Publish kind 0 profile (name, about, avatar, website, lud16)
+                // Publish kind 0 profile (fetch existing, merge, republish)
                 const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
                 try {
-                  const kind0 = createKind0Event(sk, {
+                  const kind0 = await buildKind0Event(sk, {
                     name,
                     about: description || undefined,
                     picture: options.avatar || undefined,
                     lud16: options.lightning || undefined,
                     ownerPubkeyHex,
                     bot: !!options.bot,
-                  });
+                  }, relays);
                   await publishToRelays(kind0, relays);
                   k0Spinner.succeed('Kind 0 published — visible on all Nostr clients');
                 } catch {
@@ -277,18 +283,18 @@ program
           console.log('');
           console.log(chalk.gray(`  Run ${chalk.white('agentdex claim <name>')} to get ${chalk.hex('#D4A574')('<name>@agentdex.id')}`));
           console.log('');
-          // Publish kind 0 profile (name, about, avatar, website, lud16)
+          // Publish kind 0 profile (fetch existing, merge, republish)
           // Kind 0 is canonical for basic profile; kind 31339 is agent-specific metadata
           const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
           try {
-            const kind0 = createKind0Event(sk, {
+            const kind0 = await buildKind0Event(sk, {
               name,
               about: description || undefined,
               picture: options.avatar || undefined,
               lud16: options.lightning || undefined,
               ownerPubkeyHex,
               bot: !!options.bot,
-            });
+            }, relays);
             await publishToRelays(kind0, relays);
             k0Spinner.succeed('Kind 0 published — visible on all Nostr clients');
           } catch {
@@ -349,14 +355,14 @@ program
         if (!options.skipKind0) {
           const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
           try {
-            const kind0 = createKind0Event(sk, {
+            const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+            const kind0 = await buildKind0Event(sk, {
               name: claim.agent?.name || name,
               about: claim.agent?.description || undefined,
               picture: claim.agent?.avatarUrl || undefined,
               nip05: `${name}@agentdex.id`,
               lud16: options.lightning || undefined,
-            });
-            const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+            }, relays);
             const published = await publishToRelays(kind0, relays);
             k0Spinner.succeed(`Kind 0 published to ${published.join(', ')}`);
             console.log(chalk.gray('  NIP-05 will appear on njump/Damus/Primal once relays propagate (~30s)'));
@@ -419,8 +425,8 @@ program
             if (!options.skipKind0) {
               const k0Spinner = ora('Publishing kind 0 profile to Nostr relays...').start();
               try {
-                const kind0 = createKind0Event(sk, { name, nip05: `${name}@agentdex.id` });
                 const relays = ['wss://nos.lol', 'wss://relay.damus.io', ...(options.relay || [])];
+                const kind0 = await buildKind0Event(sk, { name, nip05: `${name}@agentdex.id` }, relays);
                 await publishToRelays(kind0, relays);
                 k0Spinner.succeed('Kind 0 published — NIP-05 active on all Nostr clients');
               } catch {

package/src/index.ts

@@ -25,7 +25,7 @@ export {
   getNpub,
   getPubkeyHex,
   createProfileEvent,
-  createKind0Event,
+  buildKind0Event,
   publishToRelays,
   createNote,
 } from './nostr.js';

package/src/nostr.ts

@@ -10,6 +10,7 @@ import { mkdirSync, writeFileSync } from 'fs';
 const DEFAULT_RELAYS = ['wss://nos.lol', 'wss://relay.damus.io'];
 
 export interface PortfolioItem {
+  id: string;
   url: string;
   name?: string;
   description?: string;
@@ -115,7 +116,8 @@ export function createProfileEvent(sk: Uint8Array, profile: AgentProfile) {
   if (profile.messagingFee) tags.push(['messaging_fee', String(profile.messagingFee)]);
   if (profile.portfolio) {
     for (const item of profile.portfolio) {
-      const tag = ['portfolio', item.url];
+      // New format: ["portfolio", id, url, label, description]
+      const tag = ['portfolio', item.id, item.url];
       if (item.name) tag.push(item.name);
       if (item.description) tag.push(item.description);
       tags.push(tag);
@@ -215,23 +217,82 @@ export async function updateKind0(sk: Uint8Array, updates: { lud16?: string }, r
  * After claiming a NIP-05 name, publish this to relays so Nostr clients
  * (njump, Damus, Primal) can verify the identity.
  */
-export function createKind0Event(sk: Uint8Array, profile: { name: string; about?: string; nip05?: string; picture?: string; lud16?: string; ownerPubkeyHex?: string; bot?: boolean }) {
+/**
+ * Fetch existing kind 0, merge explicit updates, and return signed event.
+ * Safe for existing Nostr users — only overwrites fields explicitly passed.
+ */
+export async function buildKind0Event(sk: Uint8Array, updates: {
+  name?: string;
+  about?: string;
+  nip05?: string;
+  picture?: string;
+  lud16?: string;
+  website?: string;
+  ownerPubkeyHex?: string;
+  bot?: boolean;
+}, relays: string[] = DEFAULT_RELAYS) {
+  const pool = new SimplePool();
+  const pubkey = getPublicKey(sk);
+
+  // Fetch existing kind 0 from relays
+  let existing: Record<string, unknown> = {};
+  let existingTags: string[][] = [];
+  try {
+    const events = await Promise.race([
+      pool.querySync(relays, { kinds: [0], authors: [pubkey] }),
+      new Promise<any[]>((resolve) => setTimeout(() => resolve([]), 5000)),
+    ]);
+    if (events.length > 0) {
+      // Get newest event
+      const newest = events.reduce((a: any, b: any) => a.created_at > b.created_at ? a : b);
+      existing = JSON.parse(newest.content);
+      existingTags = newest.tags || [];
+    }
+  } catch {}
+  pool.close(relays);
+
+  // Merge content fields — only overwrite if explicitly provided (not undefined)
+  if (updates.name !== undefined) existing.name = updates.name;
+  if (updates.about !== undefined) existing.about = updates.about;
+  if (updates.nip05 !== undefined) existing.nip05 = updates.nip05;
+  if (updates.picture !== undefined) existing.picture = updates.picture;
+  if (updates.lud16 !== undefined) existing.lud16 = updates.lud16;
+  if (updates.website !== undefined) existing.website = updates.website;
+
+  // Merge tags
   const tags: string[][] = [];
-  if (profile.bot) tags.push(["bot"]);
-  if (profile.ownerPubkeyHex) {
-    tags.push(["p", profile.ownerPubkeyHex, "", "owner"]);
+
+  // Preserve existing tags that we don't manage (e.g., user's own tags)
+  for (const tag of existingTags) {
+    // Skip tags we manage — we'll re-add them below
+    if (tag[0] === 'p' && tag[3] === 'owner') continue;
+    if (tag[0] === 'bot') continue;
+    tags.push(tag);
+  }
+
+  // Add/update owner p tag
+  if (updates.ownerPubkeyHex) {
+    tags.push(['p', updates.ownerPubkeyHex, '', 'owner']);
+  } else {
+    // Preserve existing owner p tag if we're not updating it
+    const existingOwner = existingTags.find(t => t[0] === 'p' && t[3] === 'owner');
+    if (existingOwner) tags.push(existingOwner);
+  }
+
+  // Add bot tag only if explicitly requested
+  if (updates.bot) {
+    tags.push(['bot']);
+  } else {
+    // Preserve existing bot tag if we're not changing it
+    const existingBot = existingTags.find(t => t[0] === 'bot');
+    if (existingBot) tags.push(existingBot);
   }
+
   return finalizeEvent({
     kind: 0,
     created_at: Math.floor(Date.now() / 1000),
     tags,
-    content: JSON.stringify({
-      name: profile.name,
-      ...(profile.about && { about: profile.about }),
-      ...(profile.nip05 && { nip05: profile.nip05 }),
-      ...(profile.picture && { picture: profile.picture }),
-      ...(profile.lud16 && { lud16: profile.lud16 }),
-    }),
+    content: JSON.stringify(existing),
   }, sk);
 }