dexto 1.2.4 → 1.2.5

package/dist/cli/commands/init-app.js

@@ -8,7 +8,7 @@ import { executeWithTimeout } from '../utils/execute.js';
 import { createRequire } from 'module';
 import { logger } from '@dexto/core';
 import { updateDextoConfigFile } from '../utils/project-utils.js';
-import { saveProviderApiKey } from '@dexto/core';
+import { saveProviderApiKey } from '@dexto/agent-management';
 import { getProviderDisplayName, isValidApiKeyFormat, PROVIDER_OPTIONS, } from '../utils/provider-setup.js';
 const require = createRequire(import.meta.url);
 /**
@@ -254,11 +254,15 @@ export async function createDextoExampleFile(directory) {
         '  await agent.start();',
         "  console.log('✅ Agent started successfully!\\n');",
         '',
+        '  // Create a session for this conversation',
+        '  const session = await agent.createSession();',
+        "  console.log('📝 Session created:', session.id, '\\n');",
+        '',
         '  // Example 1: Simple task',
         "  console.log('📋 Example 1: Simple information request');",
         "  const request1 = 'What tools do you have available?';",
         "  console.log('Request:', request1);",
-        '  const response1 = await agent.run(request1);',
+        '  const response1 = await agent.run(request1, undefined, undefined, session.id);',
         "  console.log('Response:', response1);",
         "  console.log('\\n——————\\n');",
         '',
@@ -266,7 +270,7 @@ export async function createDextoExampleFile(directory) {
         "  console.log('📄 Example 2: File creation');",
         '  const request2 = \'Create a file called test-output.txt with the content "Hello from Dexto!"\';',
         "  console.log('Request:', request2);",
-        '  const response2 = await agent.run(request2);',
+        '  const response2 = await agent.run(request2, undefined, undefined, session.id);',
         "  console.log('Response:', response2);",
         "  console.log('\\n——————\\n');",
         '',
@@ -274,18 +278,18 @@ export async function createDextoExampleFile(directory) {
         "  console.log('🗣️ Example 3: Multi-step conversation');",
         '  const request3a = \'Create a simple HTML file called demo.html with a heading that says "Dexto Demo"\';',
         "  console.log('Request 3a:', request3a);",
-        '  const response3a = await agent.run(request3a);',
+        '  const response3a = await agent.run(request3a, undefined, undefined, session.id);',
         "  console.log('Response:', response3a);",
         "  console.log('\\n\\n');",
         "  const request3b = 'Now add a paragraph to that HTML file explaining what Dexto is';",
         "  console.log('Request 3b:', request3b);",
-        '  const response3b = await agent.run(request3b);',
+        '  const response3b = await agent.run(request3b, undefined, undefined, session.id);',
         "  console.log('Response:', response3b);",
         "  console.log('\\n——————\\n');",
         '',
         '  // Reset conversation (clear context)',
         "  console.log('🔄 Resetting conversation context...');",
-        '  await agent.resetConversation();',
+        '  await agent.resetConversation(session.id);',
         "  console.log('🔄 Conversation context reset');",
         "  console.log('\\n——————\\n');",
         '',
@@ -296,7 +300,7 @@ export async function createDextoExampleFile(directory) {
         "    'The page should have a title, some content about what AI agents are, ' +",
         "    'and a button that shows an alert when clicked.';",
         "  console.log('Request:', request4);",
-        '  const response4 = await agent.run(request4);',
+        '  const response4 = await agent.run(request4, undefined, undefined, session.id);',
         "  console.log('Response:', response4);",
         "  console.log('\\n——————\\n');",
         '',

package/dist/cli/commands/install.d.ts

@@ -5,15 +5,15 @@ declare const InstallCommandSchema: z.ZodObject<{
     injectPreferences: z.ZodDefault<z.ZodBoolean>;
     force: z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
+    all: boolean;
+    agents: string[];
     force: boolean;
     injectPreferences: boolean;
-    agents: string[];
-    all: boolean;
 }, {
     agents: string[];
+    all?: boolean | undefined;
     force?: boolean | undefined;
     injectPreferences?: boolean | undefined;
-    all?: boolean | undefined;
 }>;
 export type InstallCommandOptions = z.output<typeof InstallCommandSchema>;
 export declare function handleInstallCommand(agents: string[], options: Partial<InstallCommandOptions>): Promise<void>;

package/dist/cli/commands/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/install.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;EAOb,CAAC;AAEd,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAkL1E,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,MAAM,EAAE,EAChB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAoNf"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/install.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;EAOb,CAAC;AAEd,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAkL1E,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,MAAM,EAAE,EAChB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,CAoNf"}

package/dist/cli/commands/install.js

@@ -3,7 +3,8 @@ import { existsSync, statSync } from 'fs';
 import path from 'path';
 import { z } from 'zod';
 import * as p from '@clack/prompts';
-import { getAgentRegistry, getDextoGlobalPath } from '@dexto/core';
+import { getDextoGlobalPath } from '@dexto/agent-management';
+import { getAgentRegistry } from '@dexto/agent-management';
 import { capture } from '../../analytics/index.js';
 // Zod schema for install command validation
 const InstallCommandSchema = z

package/dist/cli/commands/interactive-commands/command-parser.d.ts

@@ -12,8 +12,21 @@ export interface CommandDefinition {
     category?: string;
     aliases?: string[];
     subcommands?: CommandDefinition[];
-    handler: (args: string[], agent: DextoAgent) => Promise<boolean>;
+    handler: (args: string[], agent: DextoAgent) => Promise<boolean | string>;
 }
+/**
+ * Helper for command handlers to get the current session ID from CLI context.
+ * This is set by executeCommand() when invoked from InkCLI.
+ *
+ * Maintains separation of concerns:
+ * - InkCLI state manages current sessionId
+ * - executeCommand() stores it temporarily on agent for command access
+ * - Commands use this helper instead of removed agent.getCurrentSessionId()
+ *
+ * @param agent - DextoAgent instance with __cliSessionId set by executeCommand
+ * @returns Current session ID from CLI context, or null if not available
+ */
+export declare function getCLISessionId(agent: DextoAgent): string | null;
 /**
  * Parses user input to determine if it's a slash command or a regular prompt
  */

package/dist/cli/commands/interactive-commands/command-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-parser.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/command-parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACpE;AA4CD;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAsBvD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAoB9F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAmB3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAuDtE"}
+{"version":3,"file":"command-parser.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/command-parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEhE;AA4CD;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAsBvD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAoB9F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAmB3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAuDtE"}

package/dist/cli/commands/interactive-commands/command-parser.js

@@ -1,4 +1,19 @@
 import chalk from 'chalk';
+/**
+ * Helper for command handlers to get the current session ID from CLI context.
+ * This is set by executeCommand() when invoked from InkCLI.
+ *
+ * Maintains separation of concerns:
+ * - InkCLI state manages current sessionId
+ * - executeCommand() stores it temporarily on agent for command access
+ * - Commands use this helper instead of removed agent.getCurrentSessionId()
+ *
+ * @param agent - DextoAgent instance with __cliSessionId set by executeCommand
+ * @returns Current session ID from CLI context, or null if not available
+ */
+export function getCLISessionId(agent) {
+    return agent.__cliSessionId || null;
+}
 /**
  * Parse arguments respecting quotes and escape sequences
  */

package/dist/cli/commands/interactive-commands/commands.d.ts

@@ -18,7 +18,7 @@
  * This file serves as the integration layer that combines all modular commands
  * into a single CLI_COMMANDS array for the command execution system.
  */
-import type { DextoAgent } from '@dexto/core';
+import { type DextoAgent } from '@dexto/core';
 import type { CommandDefinition } from './command-parser.js';
 /**
  * Complete list of all available CLI commands.
@@ -39,11 +39,10 @@ export declare const CLI_COMMANDS: CommandDefinition[];
 /**
  * Execute a slash command
  *
- * This function maintains the exact same interface and behavior as the original
- * executeCommand function, providing backward compatibility while using the
- * new modular command structure.
+ * @param sessionId - Session ID to use for agent.run() calls
+ * @returns boolean indicating if command was handled, or string for ink-cli output
  */
-export declare function executeCommand(command: string, args: string[], agent: DextoAgent): Promise<boolean>;
+export declare function executeCommand(command: string, args: string[], agent: DextoAgent, sessionId?: string): Promise<boolean | string>;
 /**
  * Get all available command definitions
  * This is used by external systems that need to inspect available commands

package/dist/cli/commands/interactive-commands/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAY7D;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,EAAO,CAAC;AAmCpD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,iBAAiB,EAAE,CAEpD"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAU,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAY7D;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,EAAO,CAAC;AAsCpD;;;;;GAKG;AACH,wBAAsB,cAAc,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,CA0D3B;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,iBAAiB,EAAE,CAEpD"}

package/dist/cli/commands/interactive-commands/commands.js

@@ -18,9 +18,10 @@
  * This file serves as the integration layer that combines all modular commands
  * into a single CLI_COMMANDS array for the command execution system.
  */
+import { logger } from '@dexto/core';
 // Import modular command definitions
 import { generalCommands, createHelpCommand } from './general-commands.js';
-import { sessionCommands } from './session/index.js';
+import { searchCommand, resumeCommand } from './session/index.js';
 import { modelCommands } from './model/index.js';
 import { mcpCommands } from './mcp/index.js';
 import { systemCommands } from './system/index.js';
@@ -44,13 +45,16 @@ import { documentationCommands } from './documentation-commands.js';
  */
 export const CLI_COMMANDS = [];
 // Build the commands array with proper help command that can access all commands
+// Note: Interactive CLI uses simplified commands (interactive selectors instead of subcommands)
+// Regular CLI (headless) has full subcommand access via `dexto session list`, etc.
 const baseCommands = [
     // General commands (without help)
     ...generalCommands,
-    // Session management commands
-    ...sessionCommands,
-    // Model management commands
-    modelCommands,
+    // Session management - simplified for interactive CLI
+    searchCommand, // /search - search across sessions
+    resumeCommand, // /resume - show interactive selector (no /session subcommands)
+    // Model management - simplified for interactive CLI
+    modelCommands, // /model - show interactive selector (subcommands available but not emphasized)
     // MCP server management commands
     mcpCommands,
     // Tool management commands
@@ -69,27 +73,62 @@ CLI_COMMANDS.push(...baseCommands);
 /**
  * Execute a slash command
  *
- * This function maintains the exact same interface and behavior as the original
- * executeCommand function, providing backward compatibility while using the
- * new modular command structure.
+ * @param sessionId - Session ID to use for agent.run() calls
+ * @returns boolean indicating if command was handled, or string for ink-cli output
  */
-export async function executeCommand(command, args, agent) {
+export async function executeCommand(command, args, agent, sessionId) {
+    // Store sessionId in agent context for command handlers to access
+    if (sessionId) {
+        agent.__cliSessionId = sessionId;
+    }
     // Find the command (including aliases)
     const cmd = CLI_COMMANDS.find((c) => c.name === command || (c.aliases && c.aliases.includes(command)));
-    if (!cmd) {
-        console.log(`❌ Unknown command: /${command}`);
-        console.log('Type /help to see available commands');
-        return true;
+    if (cmd) {
+        try {
+            // Execute the handler with error handling
+            const result = await cmd.handler(args, agent);
+            // If handler returns a string, it's formatted output for ink-cli
+            // If it returns boolean, it's the old behavior (handled or not)
+            return result;
+        }
+        catch (error) {
+            const errorMsg = `❌ Error executing command /${command}:\n${error instanceof Error ? error.message : String(error)}`;
+            console.error(errorMsg);
+            return errorMsg; // Return for ink-cli
+        }
     }
+    // Command not found in static commands - check if it's a prompt
     try {
-        // Execute the handler with error handling
-        return await cmd.handler(args, agent);
+        const hasPrompt = await agent.hasPrompt(command);
+        if (hasPrompt) {
+            // Import prompt command creation dynamically to avoid circular dependencies
+            const { getDynamicPromptCommands } = await import('./prompt-commands.js');
+            const dynamicCommands = await getDynamicPromptCommands(agent);
+            const promptCmd = dynamicCommands.find((c) => c.name === command);
+            if (promptCmd) {
+                try {
+                    const result = await promptCmd.handler(args, agent);
+                    // If result is a string, return it (for ink-cli display)
+                    // If result is boolean true, return empty string (command handled, message shown via agent.run())
+                    // If result is boolean false, return empty string (command handled)
+                    return typeof result === 'string' ? result : '';
+                }
+                catch (error) {
+                    const errorMsg = `❌ Error executing prompt /${command}:\n${error instanceof Error ? error.message : String(error)}`;
+                    console.error(errorMsg);
+                    return errorMsg;
+                }
+            }
+        }
     }
     catch (error) {
-        console.error(`❌ Error executing command /${command}:`);
-        console.error(error instanceof Error ? error.message : String(error));
-        return true;
+        // If checking for prompt fails, continue to unknown command error
+        logger.debug(`Failed to check if ${command} is a prompt: ${error instanceof Error ? error.message : String(error)}`);
     }
+    // Command not found and not a prompt
+    const errorMsg = `❌ Unknown command: /${command}\nType /help to see available commands`;
+    console.log(errorMsg);
+    return errorMsg; // Return for ink-cli
 }
 /**
  * Get all available command definitions

package/dist/cli/commands/interactive-commands/documentation-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"documentation-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/documentation-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,EAiCpD,CAAC"}
+{"version":3,"file":"documentation-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/documentation-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,iBAAiB,EA8BpD,CAAC"}

package/dist/cli/commands/interactive-commands/documentation-commands.js

@@ -8,7 +8,7 @@
  * - /docs, /doc - Open Dexto documentation in browser
  */
 import chalk from 'chalk';
-import { logger } from '@dexto/core';
+import { CommandOutputHelper } from './utils/command-output.js';
 /**
  * Documentation commands
  */
@@ -20,7 +20,7 @@ export const documentationCommands = [
         category: 'Documentation',
         aliases: ['doc'],
         handler: async (_args, _agent) => {
-            const docsUrl = 'https://docs.dexto.ai/category/getting-started/';
+            const docsUrl = 'https://docs.dexto.ai/docs/category/getting-started';
             try {
                 const { spawn } = await import('child_process');
                 console.log(chalk.blue(`🌐 Opening Dexto documentation: ${docsUrl}`));
@@ -31,13 +31,12 @@ export const documentationCommands = [
                         ? 'start'
                         : 'xdg-open';
                 spawn(command, [docsUrl], { detached: true, stdio: 'ignore' });
-                console.log(chalk.green('✅ Documentation opened in browser'));
+                return CommandOutputHelper.success('✅ Documentation opened in browser');
             }
             catch (error) {
-                logger.error(`Failed to open documentation: ${error instanceof Error ? error.message : String(error)}`);
                 console.log(chalk.yellow(`💡 You can manually visit: ${docsUrl}`));
+                return CommandOutputHelper.error(error, 'Failed to open documentation');
             }
-            return true;
         },
     },
 ];

package/dist/cli/commands/interactive-commands/general-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,iBAAiB,EAAE,GAAG,iBAAiB,CAiE9F;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EA8B9C,CAAC"}
+{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAI7D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,iBAAiB,EAAE,GAAG,iBAAiB,CA0I9F;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAkC9C,CAAC"}

package/dist/cli/commands/interactive-commands/general-commands.js

@@ -12,6 +12,7 @@
 import chalk from 'chalk';
 import { logger } from '@dexto/core';
 import { displayAllCommands, formatCommandHelp } from './command-parser.js';
+import { formatForInkCli } from './utils/format-output.js';
 /**
  * Creates the help command with access to all commands for display
  */
@@ -25,43 +26,107 @@ export function createHelpCommand(getAllCommands) {
         handler: async (args, _agent) => {
             const allCommands = getAllCommands();
             if (args.length === 0) {
-                // Show all commands using the original displayAllCommands function
+                // Build output string for ink-cli
+                const outputLines = ['\n📋 Available Commands:\n'];
+                // Define category order for consistent display
+                const categoryOrder = [
+                    'General',
+                    'MCP Management',
+                    'Tool Management',
+                    'Prompt Management',
+                    'System',
+                    'Documentation',
+                ];
+                const categories = {};
+                // Initialize categories
+                for (const category of categoryOrder) {
+                    categories[category] = [];
+                }
+                // Categorize commands using metadata
+                for (const cmd of allCommands) {
+                    const category = cmd.category || 'General';
+                    if (!categories[category]) {
+                        categories[category] = [];
+                    }
+                    categories[category].push(cmd);
+                }
+                // Build output by category in order
+                for (const category of categoryOrder) {
+                    const cmds = categories[category];
+                    if (cmds && cmds.length > 0) {
+                        outputLines.push(`${category}:`);
+                        for (const cmd of cmds) {
+                            const help = formatCommandHelp(cmd, false);
+                            outputLines.push('  ' + formatForInkCli(help));
+                        }
+                        outputLines.push('');
+                    }
+                }
+                // Display any uncategorized commands (fallback)
+                for (const [category, cmds] of Object.entries(categories)) {
+                    if (!categoryOrder.includes(category) && cmds.length > 0) {
+                        outputLines.push(`${category}:`);
+                        for (const cmd of cmds) {
+                            const help = formatCommandHelp(cmd, false);
+                            outputLines.push('  ' + formatForInkCli(help));
+                        }
+                        outputLines.push('');
+                    }
+                }
+                outputLines.push('💡 Tips:');
+                outputLines.push('   • Type your message normally (without /) to chat with the AI');
+                outputLines.push('   • Use /<prompt-name> to execute any listed prompt directly');
+                outputLines.push('   • Use /clear to start a new session (preserves old)');
+                outputLines.push('   • Press Ctrl+M to switch models, Ctrl+R to switch sessions');
+                outputLines.push('   • Use /search <query> to search across all sessions\n');
+                const output = outputLines.join('\n');
+                // Log for regular CLI (with chalk formatting)
                 displayAllCommands(allCommands);
-                return true;
+                return formatForInkCli(output);
             }
             const commandName = args[0];
             if (!commandName) {
-                console.log(chalk.red('❌ No command specified'));
-                return true;
+                const output = '❌ No command specified';
+                console.log(chalk.red(output));
+                return formatForInkCli(output);
             }
             // Find the specific command to show detailed help
             const cmd = allCommands.find((c) => c.name === commandName || (c.aliases && c.aliases.includes(commandName)));
             if (cmd) {
-                console.log(formatCommandHelp(cmd, true));
-                return true;
+                const helpText = formatCommandHelp(cmd, true);
+                console.log(helpText);
+                return formatForInkCli(helpText);
             }
             // Redirect to contextual help for commands that have their own help subcommands
+            let output;
             if (commandName === 'session') {
+                output =
+                    '💡 For detailed session help, use:\n   /session help\n\n   This shows all session subcommands with examples and tips.';
                 console.log(chalk.blue('💡 For detailed session help, use:'));
                 console.log(`   ${chalk.cyan('/session help')}`);
                 console.log(chalk.dim('\n   This shows all session subcommands with examples and tips.'));
-                return true;
+                return formatForInkCli(output);
             }
             if (commandName === 'model' || commandName === 'm') {
+                output =
+                    '💡 For detailed model help, use:\n   /model help\n\n   This shows all model subcommands with examples and usage.';
                 console.log(chalk.blue('💡 For detailed model help, use:'));
                 console.log(`   ${chalk.cyan('/model help')}`);
                 console.log(chalk.dim('\n   This shows all model subcommands with examples and usage.'));
-                return true;
+                return formatForInkCli(output);
             }
             if (commandName === 'mcp') {
+                output =
+                    '💡 For detailed MCP help, use:\n   /mcp help\n\n   This shows all MCP subcommands with examples and usage.';
                 console.log(chalk.blue('💡 For detailed MCP help, use:'));
                 console.log(`   ${chalk.cyan('/mcp help')}`);
                 console.log(chalk.dim('\n   This shows all MCP subcommands with examples and usage.'));
-                return true;
+                return formatForInkCli(output);
             }
+            output = `❓ No help available for: ${commandName}\nUse /help to see all available commands`;
             console.log(chalk.yellow(`❓ No help available for: ${commandName}`));
             console.log(chalk.dim('Use /help to see all available commands'));
-            return true;
+            return formatForInkCli(output);
         },
     };
 }
@@ -83,19 +148,24 @@ export const generalCommands = [
     },
     {
         name: 'clear',
-        description: 'Clear conversation history',
+        description: 'Start a new session (clears viewable history without deleting)',
         usage: '/clear',
         category: 'General',
-        aliases: ['reset'],
+        aliases: ['new'],
         handler: async (_args, agent) => {
             try {
-                await agent.resetConversation();
-                logger.info('🔄 Conversation history cleared.', null, 'green');
+                // Create a new session instead of deleting history
+                // This clears the viewable conversation without deleting the old session
+                const newSession = await agent.createSession();
+                const output = `🔄 Started new session: ${newSession.id.slice(0, 8)}\n💡 Previous session preserved. Use /resume to switch back.`;
+                console.log(chalk.green(output));
+                return formatForInkCli(output);
             }
             catch (error) {
-                logger.error(`Failed to clear conversation: ${error instanceof Error ? error.message : String(error)}`);
+                const errorMsg = `Failed to start new session: ${error instanceof Error ? error.message : String(error)}`;
+                logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
             }
-            return true;
         },
     },
 ];

package/dist/cli/commands/interactive-commands/mcp/mcp-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/mcp/mcp-commands.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAuHzD,eAAO,MAAM,WAAW,EAAE,iBAyNzB,CAAC"}
+{"version":3,"file":"mcp-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/mcp/mcp-commands.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAwHzD,eAAO,MAAM,WAAW,EAAE,iBAsRzB,CAAC"}

package/dist/cli/commands/interactive-commands/mcp/mcp-commands.js

@@ -6,6 +6,7 @@
  */
 import chalk from 'chalk';
 import { logger } from '@dexto/core';
+import { formatForInkCli } from '../utils/format-output.js';
 import { parseStdioArgs, parseHttpArgs, parseSseArgs, showMcpAddHelp, validateAndShowErrors, } from './mcp-add-utils.js';
 /**
  * Handler for /mcp add stdio command
@@ -113,9 +114,29 @@ export const mcpCommands = {
                     const clients = agent.getMcpClients();
                     const failedConnections = agent.getMcpFailedConnections();
                     if (clients.size === 0 && Object.keys(failedConnections).length === 0) {
-                        console.log(chalk.yellow('📋 No MCP servers configured or connected.'));
-                        return true;
+                        const output = '📋 No MCP servers configured or connected.';
+                        console.log(chalk.yellow(output));
+                        return formatForInkCli(output);
                     }
+                    // Build output string
+                    const outputLines = ['\n🔌 MCP Servers:\n'];
+                    for (const [name] of clients) {
+                        outputLines.push(`✅ ${name}:`);
+                        outputLines.push(`  Connected: Yes`);
+                        outputLines.push('');
+                    }
+                    if (Object.keys(failedConnections).length > 0) {
+                        outputLines.push('\n❌ Failed Connections:\n');
+                        for (const [name, error] of Object.entries(failedConnections)) {
+                            outputLines.push(`❌ ${name}:`);
+                            outputLines.push(`  Error: ${error}`);
+                        }
+                    }
+                    outputLines.push('💡 Use /mcp add <name> <config_json_string> to connect a new MCP server.');
+                    outputLines.push('💡 Use /mcp remove <name> to disconnect an MCP server.');
+                    outputLines.push('💡 Use /mcp help for detailed command descriptions.');
+                    const output = outputLines.join('\n');
+                    // Log for regular CLI (with chalk formatting)
                     console.log(chalk.bold.blue('\n🔌 MCP Servers:\n'));
                     for (const [name] of clients) {
                         console.log(chalk.green(`✅ ${name}:`));
@@ -132,12 +153,13 @@ export const mcpCommands = {
                     console.log(chalk.dim('💡 Use /mcp add <name> <config_json_string> to connect a new MCP server.'));
                     console.log(chalk.dim('💡 Use /mcp remove <name> to disconnect an MCP server.'));
                     console.log(chalk.dim('💡 Use /mcp help for detailed command descriptions.'));
-                    return true;
+                    return formatForInkCli(output);
                 }
                 catch (error) {
-                    logger.error(`Failed to list MCP servers: ${error instanceof Error ? error.message : String(error)}`);
+                    const errorMsg = `Failed to list MCP servers: ${error instanceof Error ? error.message : String(error)}`;
+                    logger.error(errorMsg);
+                    return formatForInkCli(`❌ ${errorMsg}`);
                 }
-                return true;
             },
         },
         {
@@ -189,18 +211,23 @@ export const mcpCommands = {
             usage: '/mcp remove <name>',
             handler: async (args, agent) => {
                 if (args.length === 0) {
-                    console.log(chalk.red('❌ Usage: /mcp remove <name>'));
-                    return true;
+                    const errorMsg = '❌ Usage: /mcp remove <name>';
+                    console.log(chalk.red(errorMsg));
+                    return errorMsg;
                 }
                 const name = args[0];
                 try {
                     await agent.removeMcpServer(name);
-                    console.log(chalk.green(`✅ MCP server '${name}' removed successfully`));
+                    const successMsg = `✅ MCP server '${name}' removed successfully`;
+                    console.log(chalk.green(successMsg));
+                    return successMsg;
                 }
                 catch (error) {
-                    logger.error(`Failed to remove MCP server '${name}': ${error instanceof Error ? error.message : String(error)}`);
+                    const errorMsg = `❌ Failed to remove MCP server '${name}': ${error instanceof Error ? error.message : String(error)}`;
+                    logger.error(errorMsg);
+                    console.log(chalk.red(errorMsg));
+                    return errorMsg;
                 }
-                return true;
             },
         },
         {
@@ -208,6 +235,39 @@ export const mcpCommands = {
             description: 'Show detailed help for MCP commands',
             usage: '/mcp help',
             handler: async (_args, _agent) => {
+                const helpText = [
+                    '\n🔌 MCP Management Commands:\n',
+                    'Available subcommands:',
+                    '  /mcp list - List all configured MCP servers',
+                    '  /mcp add <type> <name> <config...> - Add a new MCP server',
+                    '  /mcp remove <name> - Remove an MCP server',
+                    '  /mcp help - Show this help message',
+                    '\n📦 Add MCP Servers:\n',
+                    '▶️ STDIO Servers (most common):',
+                    '  /mcp add stdio <name> <command> [args...] [options]',
+                    '  Examples:',
+                    '    /mcp add stdio music uvx truffle-ai-music-creator-mcp',
+                    '    /mcp add stdio filesystem npx -y @modelcontextprotocol/server-filesystem .',
+                    '    /mcp add stdio sqlite npx -y @executeautomation/database-server example.db',
+                    '\n🌐 HTTP Servers:',
+                    '  /mcp add http <name> <url> [options]',
+                    '  Examples:',
+                    '    /mcp add http remote http://localhost:8080',
+                    '    /mcp add http notion https://api.notion.com --header-Authorization="Bearer token"',
+                    '\n📡 SSE Servers:',
+                    '  /mcp add sse <name> <url> [options]',
+                    '  Examples:',
+                    '    /mcp add sse events http://localhost:9000/events',
+                    '\n⚙️ Options:',
+                    '  --timeout=<ms>         Connection timeout (default: 30000)',
+                    '  --mode=<strict|lenient> Connection mode (default: lenient)',
+                    '  --env-<key>=<value>    Environment variables (stdio only)',
+                    '  --header-<key>=<value> HTTP/SSE headers',
+                    '\n🧹 Remove MCP Server:',
+                    '  /mcp remove <server-name>',
+                    '\n💡 MCP servers let you connect to external tools and services.',
+                    '💡 Use /mcp add --help for detailed examples and options.\n',
+                ].join('\n');
                 console.log(chalk.bold.blue('\n🔌 MCP Management Commands:\n'));
                 console.log(chalk.cyan('Available subcommands:'));
                 console.log(`  ${chalk.yellow('/mcp list')} - List all configured MCP servers`);
@@ -239,7 +299,7 @@ export const mcpCommands = {
                 console.log(chalk.yellow('\n🧹 Remove MCP Server:'));
                 console.log(chalk.dim(`  /mcp remove <server-name>`));
                 console.log(chalk.dim('\n💡 MCP servers let you connect to external tools and services.\n💡 Use /mcp add --help for detailed examples and options.\n'));
-                return true;
+                return helpText;
             },
         },
     ],