agent-world 0.4.5 → 0.4.6

package/dist/cli/index.js

@@ -38,22 +38,12 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { program } from 'commander';
 import readline from 'readline';
-import { listWorlds, subscribeWorld, createCategoryLogger, LLMProvider, initializeLogger, enableStreaming, disableStreaming } from '../core/index.js';
+import { listWorlds, subscribeWorld, createCategoryLogger, LLMProvider, enableStreaming, disableStreaming } from '../core/index.js';
 import { getDefaultRootPath } from '../core/storage-factory.js';
 import { processCLIInput } from './commands.js';
 import { createStreamingState, handleWorldEventWithStreaming } from './stream.js';
 import { configureLLMProvider } from '../core/llm-config.js';
-// Initialize logger system with default configuration: all categories at 'error' level
-initializeLogger({
-    globalLevel: 'error',
-    categoryLevels: {
-        cli: 'error',
-        core: 'error',
-        events: 'error',
-        llm: 'error'
-    }
-});
-// Create CLI category logger after initialization
+// Create CLI category logger after logger auto-initialization
 const logger = createCategoryLogger('cli');
 function setupPromptTimer(globalState, rl, callback, delay = 2000) {
     clearPromptTimer(globalState);
@@ -86,25 +76,6 @@ const boldCyan = (text) => `\x1b[1m\x1b[36m${text}\x1b[0m`;
 const success = (text) => `${boldGreen('✓')} ${text}`;
 const error = (text) => `${boldRed('✗')} ${text}`;
 const bullet = (text) => `${gray('•')} ${text}`;
-// Logger configuration
-async function configureLogger(logLevel) {
-    // Use the centralized logger configuration from core
-    const level = (logLevel || 'error');
-    // Reinitialize logger with new configuration
-    initializeLogger({
-        globalLevel: level,
-        categoryLevels: {
-            cli: 'error', // Always keep CLI at error level
-            core: level, // Core modules use global level
-            events: 'error', // Keep events at error level (too verbose)
-            llm: level, // LLM module uses global level
-        }
-    });
-    // Only log the debug message if we're actually at debug level for global
-    if (level === 'debug' || level === 'trace') {
-        logger.debug(`Global log level set to: ${level}, CLI log level: error`);
-    }
-}
 // LLM Provider configuration from environment variables
 function configureLLMProvidersFromEnv() {
     // OpenAI
@@ -170,6 +141,21 @@ function configureLLMProvidersFromEnv() {
 }
 // Get default root path from storage-factory (no local defaults)
 const DEFAULT_ROOT_PATH = getDefaultRootPath();
+// Helper to print CLI results in a user-friendly way
+function printCLIResult(result) {
+    if (result.success) {
+        if (result.message)
+            console.log(success(result.message));
+        if (result.data && typeof result.data === 'string')
+            console.log(result.data);
+    }
+    else {
+        if (result.message)
+            console.log(error(result.message));
+        if (result.error && result.error !== result.message)
+            console.log(error(result.error));
+    }
+}
 // Pipeline mode execution with timer-based cleanup
 async function runPipelineMode(options, messageFromArgs) {
     const rootPath = options.root || DEFAULT_ROOT_PATH;
@@ -183,8 +169,12 @@ async function runPipelineMode(options, messageFromArgs) {
             onWorldEvent: (eventType, eventData) => {
                 if (eventData.content && eventData.content.includes('Success message sent'))
                     return;
-                if ((eventType === 'system' || eventType === 'world') && eventData.message) {
-                    console.log(`${boldRed('● system:')} ${eventData.message}`);
+                if ((eventType === 'system' || eventType === 'world') && (eventData.message || eventData.content)) {
+                    // existing logic
+                }
+                else if (eventType === 'message' && eventData.sender === 'system') {
+                    const msg = eventData.content;
+                    console.log(`${boldRed('● system:')} ${msg}`);
                 }
                 if (eventType === 'sse' && eventData.content) {
                     setupExitTimer(5000);
@@ -222,7 +212,7 @@ async function runPipelineMode(options, messageFromArgs) {
                 process.exit(1);
             }
             const result = await processCLIInput(options.command, world, rootPath, 'HUMAN');
-            console.log(JSON.stringify(result, null, 2));
+            printCLIResult(result);
             // Only set timer if sending message to world (not for commands)
             if (!options.command.startsWith('/') && world) {
                 setupExitTimer();
@@ -245,7 +235,7 @@ async function runPipelineMode(options, messageFromArgs) {
                 process.exit(1);
             }
             const result = await processCLIInput(messageFromArgs, world, rootPath, 'HUMAN');
-            console.log(JSON.stringify(result, null, 2));
+            printCLIResult(result);
             // Set timer with longer delay for message processing (always needed for messages)
             setupExitTimer(8000);
             if (!result.success) {
@@ -265,7 +255,7 @@ async function runPipelineMode(options, messageFromArgs) {
                     process.exit(1);
                 }
                 const result = await processCLIInput(input.trim(), world, rootPath, 'HUMAN');
-                console.log(JSON.stringify(result, null, 2));
+                printCLIResult(result);
                 // Set timer with longer delay for message processing (always needed for stdin messages)
                 setupExitTimer(8000);
                 if (!result.success) {
@@ -312,8 +302,12 @@ function handleWorldEvent(eventType, eventData, streaming, globalState, rl) {
     }
     if (eventData.content && eventData.content.includes('Success message sent'))
         return;
-    if ((eventType === 'system' || eventType === 'world') && eventData.message) {
-        console.log(`\n${boldRed('● system:')} ${eventData.message}`);
+    if ((eventType === 'system' || eventType === 'world') && (eventData.message || eventData.content)) {
+        // existing logic
+    }
+    else if (eventType === 'message' && eventData.sender === 'system') {
+        const msg = eventData.content;
+        console.log(`${boldRed('● system:')} ${msg}`);
     }
 }
 // World discovery and selection
@@ -445,7 +439,9 @@ async function runInteractiveMode(options) {
         }
         // Show usage tips
         console.log(`\n${gray('Tips:')}`);
-        console.log(`  ${bullet(gray('Type commands like:'))} ${cyan('/clear agent1')}, ${cyan('/clear all')}, ${cyan('/add MyAgent')}`);
+        console.log(`  ${bullet(gray('Short commands:'))} ${cyan('/list')}, ${cyan('/show agent1')}, ${cyan('/edit agent1')}, ${cyan('/del agent1')}`);
+        console.log(`  ${bullet(gray('Context-sensitive:'))} ${cyan('/list')} ${gray('shows agents if world selected, worlds otherwise')}`);
+        console.log(`  ${bullet(gray('Legacy commands:'))} ${cyan('/clear agent1')}, ${cyan('/clear all')}, ${cyan('/add MyAgent')}`);
         console.log(`  ${bullet(gray('Use'))} ${cyan('/select')} ${gray('to choose a different world')}`);
         console.log(`  ${bullet(gray('Type messages to send to agents'))}`);
         console.log(`  ${bullet(gray('Use'))} ${cyan('/quit')} ${gray('or')} ${cyan('/exit')} ${gray('to exit, or press')} ${boldYellow('Ctrl+C')}`);
@@ -458,23 +454,39 @@ async function runInteractiveMode(options) {
                 rl.prompt();
                 return;
             }
+            // Check for exit commands before anything else
+            const isExitCommand = trimmedInput.toLowerCase() === '/exit' || trimmedInput.toLowerCase() === '/quit';
+            if (isExitCommand) {
+                if (isExiting)
+                    return;
+                isExiting = true;
+                // Clear any existing timers immediately
+                clearPromptTimer(globalState);
+                if (streaming.stopWait)
+                    streaming.stopWait();
+                console.log(`\n${boldCyan('Goodbye!')}`);
+                if (worldState)
+                    cleanupWorldSubscription(worldState);
+                rl.close();
+                process.exit(0);
+                return;
+            }
             console.log(`\n${boldYellow('● you:')} ${trimmedInput}`);
             try {
                 const result = await processCLIInput(trimmedInput, worldState?.world || null, rootPath, 'HUMAN');
-                // Handle exit commands
+                // Handle exit commands from result (redundant, but keep for safety)
                 if (result.data?.exit) {
                     if (isExiting)
                         return; // Prevent duplicate exit handling
                     isExiting = true;
-                    // Clear any existing timers immediately
-                    if (streaming.stopWait) {
+                    clearPromptTimer(globalState);
+                    if (streaming.stopWait)
                         streaming.stopWait();
-                    }
                     console.log(`\n${boldCyan('Goodbye!')}`);
-                    if (worldState) {
+                    if (worldState)
                         cleanupWorldSubscription(worldState);
-                    }
                     rl.close();
+                    process.exit(0);
                     return;
                 }
                 // Handle world selection command
@@ -521,7 +533,23 @@ async function runInteractiveMode(options) {
                     console.log(success(result.message));
                 }
                 if (result.data && !(result.data.sender === 'HUMAN')) {
-                    console.log(`${boldMagenta('Data:')} ${JSON.stringify(result.data, null, 2)}`);
+                    // Print a concise summary of result.data if present and not already in message
+                    if (result.data) {
+                        if (typeof result.data === 'string') {
+                            console.log(`${boldMagenta('Data:')} ${result.data}`);
+                        }
+                        else if (result.data.name) {
+                            // If it's an agent or world object
+                            console.log(`${boldMagenta('Data:')} ${result.data.name}`);
+                        }
+                        else if (Array.isArray(result.data)) {
+                            console.log(`${boldMagenta('Data:')} ${result.data.length} items`);
+                        }
+                        else {
+                            // Fallback: print keys
+                            console.log(`${boldMagenta('Data:')} ${Object.keys(result.data).join(', ')}`);
+                        }
+                    }
                 }
                 // Refresh world if needed
                 if (result.refreshWorld && currentWorldName && worldState) {
@@ -542,13 +570,8 @@ async function runInteractiveMode(options) {
             }
             // Set timer based on input type: commands get short delay, messages get longer delay
             const isCommand = trimmedInput.startsWith('/');
-            const isExitCommand = trimmedInput.toLowerCase() === '/exit' || trimmedInput.toLowerCase() === '/quit';
             const isSelectCommand = trimmedInput.toLowerCase() === '/select';
-            if (isExitCommand) {
-                // For exit commands, don't set any timer - exit should be immediate
-                return;
-            }
-            else if (isSelectCommand) {
+            if (isSelectCommand) {
                 // For select command, prompt is already shown in the handler
                 return;
             }
@@ -565,27 +588,26 @@ async function runInteractiveMode(options) {
             if (isExiting)
                 return; // Prevent duplicate cleanup
             isExiting = true;
+            clearPromptTimer(globalState);
+            if (streaming.stopWait)
+                streaming.stopWait();
             console.log(`\n${boldCyan('Goodbye!')}`);
-            if (worldState) {
-                if (streaming.stopWait) {
-                    streaming.stopWait();
-                }
+            if (worldState)
                 cleanupWorldSubscription(worldState);
-            }
             process.exit(0);
         });
         rl.on('SIGINT', () => {
             if (isExiting)
                 return; // Prevent duplicate cleanup
             isExiting = true;
+            clearPromptTimer(globalState);
+            if (streaming.stopWait)
+                streaming.stopWait();
             console.log(`\n${boldCyan('Goodbye!')}`);
-            if (worldState) {
-                if (streaming.stopWait) {
-                    streaming.stopWait();
-                }
+            if (worldState)
                 cleanupWorldSubscription(worldState);
-            }
             rl.close();
+            process.exit(0);
         });
     }
     catch (err) {
@@ -598,6 +620,9 @@ async function runInteractiveMode(options) {
 async function main() {
     // Configure LLM providers from environment variables at startup
     configureLLMProvidersFromEnv();
+    // Import help generator from commands.ts
+    // (import at top: import { generateHelpMessage } from './commands.js';)
+    const { generateHelpMessage } = await import('./commands.js');
     program
         .name('cli')
         .description('Agent World CLI')
@@ -609,6 +634,8 @@ async function main() {
         .option('-s, --server', 'Launch the server before running CLI')
         .allowUnknownOption()
         .allowExcessArguments()
+        .helpOption('-h, --help', 'Display help for command')
+        .addHelpText('beforeAll', () => generateHelpMessage())
         .parse();
     const options = program.opts();
     // If --server is specified, launch the server first
@@ -629,8 +656,6 @@ async function main() {
         // If server exits, exit CLI as well
         process.exit(serverProcess.status || 0);
     }
-    // Configure logger - set global level first, then CLI-specific level
-    await configureLogger(options.logLevel);
     const args = program.args;
     const messageFromArgs = args.length > 0 ? args.join(' ') : null;
     const isPipelineMode = !!(options.command ||

package/dist/server/index.js

@@ -16,7 +16,7 @@
 import dotenv from 'dotenv';
 dotenv.config();
 import open from 'open';
-import { initializeLogger, createCategoryLogger, LLMProvider } from '../core/index.js';
+import { createCategoryLogger, LLMProvider } from '../core/index.js';
 import { configureLLMProvider } from '../core/llm-config.js';
 import express from 'express';
 import cors from 'cors';
@@ -29,11 +29,8 @@ const __dirname = path.dirname(__filename);
 // Configuration
 const PORT = Number(process.env.PORT) || 0;
 const HOST = process.env.HOST || '127.0.0.1';
-const logLevel = (process.env.LOG_LEVEL || 'error');
-// Initialize logger (now synchronous)
-initializeLogger({ globalLevel: logLevel });
+// Create server logger after logger auto-initialization
 const serverLogger = createCategoryLogger('server');
-serverLogger.debug('Server logger initialized', { logLevel });
 // LLM provider configuration
 function configureLLMProvidersFromEnv() {
     const providers = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-world",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "main": "index.ts",
   "type": "module",
   "workspaces": [