@highway1/cli 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highway1/cli",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "CLI tool for Clawiverse network",
   "type": "module",
   "bin": {

package/src/commands/card.ts

@@ -30,7 +30,10 @@ export function registerCardCommand(program: Command): void {
   card
     .command('edit')
     .description('Edit Agent Card')
-    .action(async () => {
+    .option('--name <name>', 'Agent name')
+    .option('--description <description>', 'Agent description')
+    .option('--capabilities <capabilities>', 'Capabilities (comma-separated)')
+    .action(async (options) => {
       try {
         printHeader('Edit Agent Card');
 
@@ -41,35 +44,49 @@ export function registerCardCommand(program: Command): void {
           process.exit(1);
         }
 
-        const answers = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'name',
-            message: 'Agent name:',
-            default: currentCard.name,
-          },
-          {
-            type: 'input',
-            name: 'description',
-            message: 'Agent description:',
-            default: currentCard.description,
-          },
-          {
-            type: 'input',
-            name: 'capabilities',
-            message: 'Capabilities (comma-separated):',
-            default: currentCard.capabilities.join(', '),
-          },
-        ]);
+        let updatedCard;
+
+        // If any options provided, use non-interactive mode
+        if (options.name || options.description || options.capabilities) {
+          updatedCard = {
+            name: options.name || currentCard.name,
+            description: options.description || currentCard.description,
+            capabilities: options.capabilities
+              ? options.capabilities.split(',').map((c: string) => c.trim()).filter((c: string) => c.length > 0)
+              : currentCard.capabilities,
+          };
+        } else {
+          // Interactive mode
+          const answers = await inquirer.prompt([
+            {
+              type: 'input',
+              name: 'name',
+              message: 'Agent name:',
+              default: currentCard.name,
+            },
+            {
+              type: 'input',
+              name: 'description',
+              message: 'Agent description:',
+              default: currentCard.description,
+            },
+            {
+              type: 'input',
+              name: 'capabilities',
+              message: 'Capabilities (comma-separated):',
+              default: currentCard.capabilities.join(', '),
+            },
+          ]);
 
-        const updatedCard = {
-          name: answers.name,
-          description: answers.description,
-          capabilities: answers.capabilities
-            .split(',')
-            .map((c: string) => c.trim())
-            .filter((c: string) => c.length > 0),
-        };
+          updatedCard = {
+            name: answers.name,
+            description: answers.description,
+            capabilities: answers.capabilities
+              .split(',')
+              .map((c: string) => c.trim())
+              .filter((c: string) => c.length > 0),
+          };
+        }
 
         setAgentCard(updatedCard);
 

package/src/commands/init.ts

@@ -2,63 +2,38 @@ import { Command } from 'commander';
 import { generateKeyPair, exportKeyPair, deriveDID } from '@highway1/core';
 import { hasIdentity, setIdentity, setAgentCard } from '../config.js';
 import { success, error, spinner, printHeader, printKeyValue } from '../ui.js';
-import inquirer from 'inquirer';
 
 export function registerInitCommand(program: Command): void {
   program
     .command('init')
     .description('Initialize a new Clawiverse identity')
-    .option('--name <name>', 'Agent name')
-    .option('--description <description>', 'Agent description')
+    .option('--name <name>', 'Agent name', 'My Agent')
+    .option('--description <description>', 'Agent description', 'A Clawiverse agent')
     .option('--force', 'Overwrite existing identity')
     .action(async (options) => {
       try {
         printHeader('Initialize Clawiverse Identity');
 
-        // Check if identity already exists
         if (hasIdentity() && !options.force) {
           error('Identity already exists. Use --force to overwrite.');
           process.exit(1);
         }
 
-        // Prompt for agent details if not provided
-        let name = options.name;
-        let description = options.description;
-
-        if (!name) name = 'My Agent';
-        if (!description) description = 'A Clawiverse agent';
-
-        if (!options.name) {
-          const { name: inputName } = await inquirer.prompt({
-            type: 'input', name: 'name', message: 'Agent name:', default: name,
-          });
-          name = inputName || name;
-        }
-        if (!options.description) {
-          const { description: inputDesc } = await inquirer.prompt({
-            type: 'input', name: 'description', message: 'Agent description:', default: description,
-          });
-          description = inputDesc || description;
-        }
-
         const spin = spinner('Generating key pair...');
 
-        // Generate key pair
         const keyPair = await generateKeyPair();
         const exported = exportKeyPair(keyPair);
         const did = deriveDID(keyPair.publicKey);
 
-        // Save identity
         setIdentity({
           did,
           publicKey: exported.publicKey,
           privateKey: exported.privateKey,
         });
 
-        // Save agent card
         setAgentCard({
-          name,
-          description,
+          name: options.name,
+          description: options.description,
           capabilities: [],
         });
 
@@ -66,8 +41,8 @@ export function registerInitCommand(program: Command): void {
 
         console.log();
         printKeyValue('DID', did);
-        printKeyValue('Name', name);
-        printKeyValue('Description', description);
+        printKeyValue('Name', options.name);
+        printKeyValue('Description', options.description);
         console.log();
 
         success('Run "hw1 join" to connect to the network');

package/src/commands/join.ts

@@ -16,28 +16,19 @@ export function registerJoinCommand(program: Command): void {
     .command('join')
     .description('Join the Clawiverse network')
     .option('--bootstrap <peers...>', 'Bootstrap peer addresses')
-    .option('--json', 'Output messages as JSON (for agent automation)')
     .action(async (options) => {
       try {
-        const jsonMode = options.json;
-
-        if (!jsonMode) {
-          printHeader('Join Clawiverse Network');
-        }
+        printHeader('Join Clawiverse Network');
 
         const identity = getIdentity();
         const card = getAgentCard();
 
         if (!identity || !card) {
-          if (jsonMode) {
-            console.log(JSON.stringify({ error: 'No identity found. Run "hw1 init" first.' }));
-          } else {
-            error('No identity found. Run "hw1 init" first.');
-          }
+          error('No identity found. Run "hw1 init" first.');
           process.exit(1);
         }
 
-        const spin = jsonMode ? null : spinner('Starting libp2p node...');
+        const spin = spinner('Starting libp2p node...');
 
         const keyPair = importKeyPair({
           publicKey: identity.publicKey,
@@ -54,22 +45,14 @@ export function registerJoinCommand(program: Command): void {
 
         await node.start();
 
-        if (spin) {
-          spin.succeed('Node started successfully!');
-          info(`Peer ID: ${node.getPeerId()}`);
-          info(`DID: ${identity.did}`);
-          info(`Listening on: ${node.getMultiaddrs().join(', ')}`);
-        } else {
-          console.log(JSON.stringify({
-            event: 'node_started',
-            peerId: node.getPeerId(),
-            did: identity.did,
-            multiaddrs: node.getMultiaddrs(),
-          }));
-        }
+        spin.succeed('Node started successfully!');
+
+        info(`Peer ID: ${node.getPeerId()}`);
+        info(`DID: ${identity.did}`);
+        info(`Listening on: ${node.getMultiaddrs().join(', ')}`);
 
         // Wait for bootstrap peer connection before publishing to DHT
-        const connectSpin = jsonMode ? null : spinner('Connecting to bootstrap peers...');
+        const connectSpin = spinner('Connecting to bootstrap peers...');
         await new Promise<void>((resolve) => {
           const timeout = setTimeout(resolve, 10000);
           node.libp2p.addEventListener('peer:connect', () => {
@@ -77,12 +60,10 @@ export function registerJoinCommand(program: Command): void {
             setTimeout(resolve, 500);
           }, { once: true });
         });
-        if (connectSpin) {
-          connectSpin.succeed('Connected to network!');
-        }
+        connectSpin.succeed('Connected to network!');
 
         // Publish Agent Card with peerId and multiaddrs so others can dial us
-        const cardSpin = jsonMode ? null : spinner('Publishing Agent Card to DHT...');
+        const cardSpin = spinner('Publishing Agent Card to DHT...');
 
         // Include circuit relay addresses so nodes behind NAT can be reached
         const directAddrs = node.getMultiaddrs();
@@ -108,11 +89,7 @@ export function registerJoinCommand(program: Command): void {
         const dht = createDHTOperations(node.libp2p);
         await dht.publishAgentCard(signedCard);
 
-        if (cardSpin) {
-          cardSpin.succeed('Agent Card published!');
-        } else {
-          console.log(JSON.stringify({ event: 'agent_card_published' }));
-        }
+        cardSpin.succeed('Agent Card published!');
 
         // Register message handlers for incoming messages
         const router = createMessageRouter(
@@ -124,34 +101,17 @@ export function registerJoinCommand(program: Command): void {
         // Generic message handler that accepts any protocol
         const messageHandler = async (envelope: any) => {
           const payload = envelope.payload as Record<string, unknown>;
-
-          if (jsonMode) {
-            // Output as JSON for agent consumption
-            console.log(JSON.stringify({
-              event: 'message_received',
-              id: envelope.id,
-              from: envelope.from,
-              to: envelope.to,
-              protocol: envelope.protocol,
-              type: envelope.type,
-              payload,
-              timestamp: Date.now(),
-            }));
-          } else {
-            console.log();
-            success(`>>> Received message from ${envelope.from}`);
-            info(`    Message ID: ${envelope.id}`);
-            info(`    Protocol:   ${envelope.protocol}`);
-            info(`    Type:       ${envelope.type}`);
-            info(`    Payload:    ${JSON.stringify(payload, null, 2)}`);
-            console.log();
-          }
+          console.log();
+          success(`>>> Received message from ${envelope.from}`);
+          info(`    Message ID: ${envelope.id}`);
+          info(`    Protocol:   ${envelope.protocol}`);
+          info(`    Type:       ${envelope.type}`);
+          info(`    Payload:    ${JSON.stringify(payload, null, 2)}`);
+          console.log();
 
           // If this is a request, send back a simple acknowledgment response
           if (envelope.type === 'request') {
-            if (!jsonMode) {
-              info('    Sending acknowledgment response...');
-            }
+            info('    Sending acknowledgment response...');
 
             const { createEnvelope, signEnvelope, sign } = await import('@highway1/core');
             const identity = getIdentity();
@@ -193,40 +153,23 @@ export function registerJoinCommand(program: Command): void {
 
         await router.start();
 
-        if (!jsonMode) {
-          console.log();
-          success('Successfully joined the Clawiverse network!');
-          info('Listening for incoming messages...');
-          info('Press Ctrl+C to stop');
-        } else {
-          console.log(JSON.stringify({ event: 'ready', status: 'listening' }));
-        }
+        console.log();
+        success('Successfully joined the Clawiverse network!');
+        info('Listening for incoming messages...');
+        info('Press Ctrl+C to stop');
 
-        const shutdown = async () => {
-          if (!jsonMode) {
-            console.log();
-            const stopSpin = spinner('Stopping node...');
-            await router.stop();
-            await node.stop();
-            stopSpin.succeed('Node stopped');
-          } else {
-            await router.stop();
-            await node.stop();
-            console.log(JSON.stringify({ event: 'shutdown', status: 'stopped' }));
-          }
+        process.on('SIGINT', async () => {
+          console.log();
+          const stopSpin = spinner('Stopping node...');
+          await router.stop();
+          await node.stop();
+          stopSpin.succeed('Node stopped');
           process.exit(0);
-        };
-
-        process.on('SIGINT', shutdown);
-        process.on('SIGTERM', shutdown);
+        });
 
         await new Promise(() => {});
       } catch (err) {
-        if (options.json) {
-          console.log(JSON.stringify({ error: (err as Error).message }));
-        } else {
-          error(`Failed to join network: ${(err as Error).message}`);
-        }
+        error(`Failed to join network: ${(err as Error).message}`);
         process.exit(1);
       }
     });