@xagent-ai/cli 1.2.2 → 1.3.1

package/src/system-prompt-generator.ts

@@ -3,6 +3,8 @@ import { ExecutionMode, AgentConfig } from './types.js';
 import { getAgentManager } from './agents.js';
 import { getSkillInvoker, SkillInfo } from './skill-invoker.js';
 import { MCPManager } from './mcp.js';
+import { getPowerShellVersion } from './shell.js';
+import os from 'os';
 
 export interface ToolParameter {
   type: string;
@@ -26,12 +28,68 @@ export class SystemPromptGenerator {
   private executionMode: ExecutionMode;
   private agentConfig?: AgentConfig;
   private mcpManager?: MCPManager;
+  private cachedEnvironmentInfo: string;
 
   constructor(toolRegistry: ToolRegistry, executionMode: ExecutionMode, agentConfig?: AgentConfig, mcpManager?: MCPManager) {
     this.toolRegistry = toolRegistry;
     this.executionMode = executionMode;
     this.agentConfig = agentConfig;
     this.mcpManager = mcpManager;
+    this.cachedEnvironmentInfo = this.generateEnvironmentInfo();
+  }
+
+  /**
+   * Generate and cache system environment information
+   * Called once in constructor, reused for all subsequent prompts
+   */
+  private generateEnvironmentInfo(): string {
+    const platform = os.platform();
+    const _arch = os.arch();
+    const nodeVersion = process.version;
+    const cwd = process.cwd();
+    const homeDir = os.homedir();
+    const username = os.userInfo().username;
+    const currentDate = new Date().toISOString().split('T')[0];
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    // Map platform to human-readable OS name
+    const osName: Record<string, string> = {
+      'win32': 'Windows',
+      'darwin': 'macOS',
+      'linux': 'Linux'
+    };
+
+    // Get PowerShell version for Windows
+    const psVersion = platform === 'win32' ? getPowerShellVersion() : 'N/A';
+    const psMajorVersion = parseInt(psVersion.split('.')[0], 10);
+    const psSupportsChaining = !isNaN(psMajorVersion) && psMajorVersion >= 7;
+
+    // Generate PowerShell syntax rules
+    let psSyntaxRules = '';
+    if (platform === 'win32') {
+      if (psSupportsChaining) {
+        psSyntaxRules = `
+**PowerShell Syntax** (v${psVersion}):
+- Supports \`&&\` and \`||\` for command chaining
+- Also supports \`;\` for sequential execution`;
+      } else {
+        psSyntaxRules = `
+**PowerShell Syntax** (v${psVersion}):
+- Does NOT support \`&&\` or \`||\` (use \`;\` instead)
+- Use \`if ($?) { cmd2 }\` for conditional execution
+- Common: \`ls\`→\`dir\`, \`cat\`→\`type\`, \`rm\`→\`Remove-Item\`, \`sleep\`→\`Start-Sleep\``;
+      }
+    }
+
+    return `
+## System Environment Information
+
+- **Operating System**: ${osName[platform] || platform} (${platform}) ${os.arch()}
+- **Node.js Version**: ${nodeVersion}
+- **Current Working Directory**: ${cwd}
+- **User Home Directory**: ${homeDir}
+- **Current User**: ${username}
+- **Current Date**: ${currentDate} (Timezone: ${timeZone})${psSyntaxRules}`;
   }
 
   async generateEnhancedSystemPrompt(baseSystemPrompt: string): Promise<string> {
@@ -46,10 +104,13 @@ export class SystemPromptGenerator {
     }
 
     // Get available local tools (includes MCP wrapper tools registered via registerMCPTools)
-    let allAvailableTools = localTools;
+    const allAvailableTools = localTools;
 
     let enhancedPrompt = baseSystemPrompt;
 
+    // Add system environment information (cached in constructor)
+    enhancedPrompt += this.cachedEnvironmentInfo;
+
     // Only add tool-related content if tools are available
     if (allAvailableTools.length > 0) {
       // Pre-load skills for dynamic generation
@@ -190,7 +251,7 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
       },
       Grep: {
         name: 'Grep',
-        description: 'Search for text patterns across multiple files',
+        description: 'Search for text patterns across multiple files using ripgrep',
         parameters: {
           pattern: {
             type: 'string',
@@ -203,23 +264,18 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
             required: false,
             default: '.'
           },
-          include: {
+          glob: {
             type: 'string',
             description: 'File pattern to include (glob)',
             required: false
           },
-          exclude: {
-            type: 'string',
-            description: 'File pattern to exclude (glob)',
-            required: false
-          },
-          case_sensitive: {
+          ignoreCase: {
             type: 'boolean',
-            description: 'Whether search is case-sensitive',
+            description: 'Case-insensitive search',
             required: false,
             default: false
           },
-          fixed_strings: {
+          literal: {
             type: 'boolean',
             description: 'Treat pattern as literal string, not regex',
             required: false,
@@ -230,34 +286,24 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
             description: 'Number of context lines before and after match',
             required: false
           },
-          before: {
-            type: 'number',
-            description: 'Number of context lines before match',
-            required: false
-          },
-          after: {
+          limit: {
             type: 'number',
-            description: 'Number of context lines after match',
+            description: 'Maximum number of matches to return',
             required: false
-          },
-          no_ignore: {
-            type: 'boolean',
-            description: 'Ignore .gitignore patterns',
-            required: false,
-            default: false
           }
         },
         usage: 'Search for code patterns, function definitions, or text across the codebase',
         examples: [
           'Search for function: Grep(pattern="function.*\\(.*\\)")',
-          'Find specific text: Grep(pattern="TODO", case_sensitive=true)',
-          'Search in specific files: Grep(pattern="import", include="*.ts")'
+          'Find specific text: Grep(pattern="TODO", ignoreCase=true)',
+          'Search in specific files: Grep(pattern="import", glob="*.ts")',
+          'Literal search: Grep(pattern="*.ts", literal=true)'
         ],
         bestPractices: [
-          'Use fixed_strings for simple text searches',
+          'Use literal=true for simple text searches',
           'Use context to see surrounding code',
-          'Narrow search with include/exclude patterns',
-          'Use case_sensitive for exact matches'
+          'Narrow search with glob pattern',
+          'Use ignoreCase=true for case-insensitive matching'
         ]
       },
       Bash: {
@@ -335,7 +381,7 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
       },
       SearchFiles: {
         name: 'SearchFiles',
-        description: 'Search for files matching a glob pattern by name or extension',
+        description: 'Search for files matching a glob pattern using fd (fast find)',
         parameters: {
           pattern: {
             type: 'string',
@@ -353,14 +399,15 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
             required: false
           }
         },
-        usage: 'Find files by name or extension pattern',
+        usage: 'Find files by name or extension pattern using fast fd tool',
         examples: [
           'Find all TypeScript files: SearchFiles(pattern="**/*.ts")',
           'Find config files: SearchFiles(pattern="**/config.*")'
         ],
         bestPractices: [
           'Use **/*.ts for recursive search',
-          'Combine with Read to examine found files'
+          'Combine with Read to examine found files',
+          'fd automatically respects .gitignore'
         ]
       },
       DeleteFile: {
@@ -545,14 +592,20 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
         ]
       },
       InvokeSkill: (() => {
-        // Build skills list string from the provided skills, including description
+        // Build skills list string from the available skills (no path/source info)
         const skillsList = skills && skills.length > 0
           ? skills.map(skill => `- ${skill.name}: ${skill.description}`).join('\n')
           : 'No skills available';
 
         return {
           name: 'InvokeSkill',
-          description: 'Invoke a specialized skill to get execution guidance for complex tasks. The skill will analyze your request and provide a step-by-step execution plan - you must follow these steps to complete the task.\n\n**Workflow**: Invoke skill → Receive guidance with nextSteps → Execute each step using appropriate tools → Complete the task.\n\n**Available Skills**:\n' + skillsList,
+          description: 'Invoke a specialized skill to get execution guidance for complex tasks. The skill will analyze your request and provide a step-by-step execution plan - you must follow these steps to complete the task.\n\n' +
+            '**Workflow**: Invoke skill → Receive result with nextSteps → Execute each step → Complete the task.\n\n' +
+            '**Dependency Management**: If a skill requires dependencies:\n' +
+            '  1. Use the skillPath from the result in BashTool\'s skillPath parameter\n' +
+            '  2. Install: `npm install <package>` with skillPath set\n' +
+            '  3. Dependencies are installed to the skill\'s local node_modules\n\n' +
+            '**Available Skills**:\n' + skillsList,
           parameters: {
             skillId: {
               type: 'string',
@@ -574,7 +627,9 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
           bestPractices: [
             'Invoke skill to get step-by-step execution guidance',
             'Follow the nextSteps provided by the skill in order',
-            'Use appropriate tools (Read/Write/Run) to execute each step'
+            'Use appropriate tools (Read/Write/Bash) to execute each step',
+            'When installing dependencies for a skill, use BashTool with skillPath parameter',
+            'Dependencies are installed to the skill\'s local node_modules directory'
           ]
         };
       })()
@@ -684,7 +739,7 @@ Remember: You are in a conversational mode, not a tool-execution mode. Just talk
     return output;
   }
 
-  private generateDecisionMakingGuide(availableTools: any[], skills: SkillInfo[] = []): string {
+  private generateDecisionMakingGuide(availableTools: any[], _skills: SkillInfo[] = []): string {
     // Tool name to short description mapping
     const toolDescriptions: Record<string, string> = {
       'Read': 'When you need to understand existing code, configuration, or documentation',

package/src/terminal.ts

@@ -0,0 +1,96 @@
+/**
+ * Terminal stdin handling utilities
+ * Ensures proper raw mode handling after external library interactions
+ */
+
+import readline from 'readline';
+import { getLogger } from './logger.js';
+
+const logger = getLogger();
+
+/**
+ * Ensure stdin is in raw mode for proper input handling
+ * This should be called before any readline.question() call
+ * or after any external library (like @clack/prompts) interacts with stdin
+ */
+export function ensureStdinRawMode(): void {
+  if (process.stdin.isTTY) {
+    // Disable raw mode first to ensure clean state (handles case after @clack/prompts usage)
+    process.stdin.setRawMode(false);
+    // Then enable raw mode for proper input handling
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+  }
+}
+
+/**
+ * Ensure TTY is in a sane state for input
+ * This should be called before each interactive prompt cycle
+ */
+export function ensureTtySane(): void {
+  if (!process.stdin.isTTY) {
+    return;
+  }
+
+  // Ensure readline events are emitted for keypress handling
+  try {
+    readline.emitKeypressEvents(process.stdin);
+  } catch {
+    // Already emitted, ignore
+  }
+
+  // Ensure stdin is in raw mode
+  ensureStdinRawMode();
+}
+
+/**
+ * Restore stdin to normal (canonical) mode
+ * Use this before launching external processes or tools that need normal terminal behavior
+ */
+export function disableStdinRawMode(): void {
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(false);
+  }
+}
+
+/**
+ * Setup ESC key handling for cancellation
+ * Should be called once at the start of interactive session
+ */
+export function setupEscKeyHandler(
+  onEsc: () => void,
+  options?: { allowCtrlC?: boolean }
+): () => void {
+  if (!process.stdin.isTTY) {
+    logger.debug('[terminal] stdin is not a TTY, ESC cancellation disabled');
+    return () => {};
+  }
+
+  const keyPressHandler = (str: string, key: readline.Key) => {
+    logger.debug(`[terminal] Key pressed: str='${str}', name='${key.name}'`);
+    if (str === '\u001B' || key.name === 'escape') {
+      logger.debug('[terminal] ESC key detected!');
+      onEsc();
+    }
+  };
+
+  process.stdin.on('keypress', keyPressHandler);
+
+  // Setup SIGINT handler if allowed
+  const sigintHandler = () => {
+    logger.debug('[terminal] SIGINT received!');
+    onEsc();
+  };
+
+  if (options?.allowCtrlC !== false) {
+    process.on('SIGINT', sigintHandler);
+  }
+
+  // Return cleanup function
+  return () => {
+    process.stdin.removeListener('keypress', keyPressHandler);
+    if (options?.allowCtrlC !== false) {
+      process.off('SIGINT', sigintHandler);
+    }
+  };
+}