@xagent-ai/cli 1.3.0 → 1.3.1

package/src/shell.ts

@@ -1,10 +1,11 @@
 import { existsSync } from 'fs';
 import { spawn, spawnSync } from 'child_process';
+import { output as logOutput } from './output-util.js';
 
 /**
  * Find bash executable on PATH (Windows).
  */
-function findBashOnPath(): string | null {
+function _findBashOnPath(): string | null {
 	try {
 		const result = spawnSync('where', ['bash.exe'], { encoding: 'utf-8', timeout: 5000 });
 		if (result.status === 0 && result.stdout) {
@@ -115,19 +116,19 @@ export function killProcessTree(pid: number): void {
 				detached: true,
 			});
 		} catch (error) {
-			console.warn(`[shell] Failed to kill process tree (PID ${pid}): ${error instanceof Error ? error.message : String(error)}`);
+			logOutput('warning', `[shell] Failed to kill process tree (PID ${pid})`, { error: error instanceof Error ? error.message : String(error) });
 		}
 	} else {
 		// Use SIGKILL on Unix/Linux/Mac
 		try {
 			process.kill(-pid, 'SIGKILL');
-		} catch (error) {
+		} catch {
 			// Fallback to killing just the child if process group kill fails
 			try {
 				process.kill(pid, 'SIGKILL');
 			} catch (fallbackError) {
-				console.warn(`[shell] Failed to kill process (PID ${pid}): ${fallbackError instanceof Error ? fallbackError.message : String(fallbackError)}`);
+				logOutput('warning', `[shell] Failed to kill process (PID ${pid})`, { error: fallbackError instanceof Error ? fallbackError.message : String(fallbackError) });
 			}
 		}
 	}
-}
+}

package/src/skill-installer.ts

@@ -12,7 +12,7 @@ import simpleGit from 'simple-git';
 import { getConfigManager } from './config.js';
 import { getLogger } from './logger.js';
 
-const logger = getLogger();
+const _logger = getLogger();
 const CLONE_TIMEOUT_MS = 60000; // 60 seconds
 
 export interface RemoteSource {
@@ -317,8 +317,8 @@ async function installFromGitHub(source: RemoteSource): Promise<InstallResult> {
     return { success: false, error: 'Invalid GitHub URL' };
   }
 
-  const [, owner, repo] = urlMatch;
-  const cleanRepo = repo.replace(/\.git$/, '');
+  const [, _owner, repo] = urlMatch;
+  const _cleanRepo = repo.replace(/\.git$/, '');
   const ref = source.ref || 'main';
 
   let tempDir: string | null = null;

package/src/skill-invoker.ts

@@ -2,8 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
 import { getSkillLoader, SkillInfo, SkillLoader } from './skill-loader.js';
-import { getToolRegistry } from './tools.js';
-import { ExecutionMode, Tool } from './types.js';
+import { ExecutionMode } from './types.js';
 import { getConfigManager } from './config.js';
 
 // Re-export SkillInfo for other modules
@@ -579,7 +578,7 @@ export class SkillInvoker {
    * NOTE: SKILL_TRIGGERS disabled. Let LLM decide based on system prompt.
    * Returns null to indicate no explicit match - LLM should use its own judgment.
    */
-  async matchSkill(userInput: string): Promise<SkillMatcherResult | null> {
+  async matchSkill(_userInput: string): Promise<SkillMatcherResult | null> {
     // SKILL_TRIGGERS is disabled for experiment purposes.
     // The LLM should decide which skill to use based on system prompt information.
     return null;
@@ -684,7 +683,7 @@ export class SkillInvoker {
    * Get executor for skill
    * Unified dynamic approach - all skills use GenericSkillExecutor
    */
-  private getSkillExecutor(skillId: string): SkillExecutor {
+  private getSkillExecutor(_skillId: string): SkillExecutor {
     return new GenericSkillExecutor();
   }
 

package/src/skill-loader.ts

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
-import fsSync from 'fs';
+import _fsSync from 'fs';
 import path from 'path';
-import { fileURLToPath } from 'url';
+import os from 'os';
 import { WorkflowConfig } from './workflow.js';
 import { getConfigManager } from './config.js';
 
@@ -59,7 +59,7 @@ export class SkillLoader {
     } else {
       const configManager = getConfigManager();
       const userPath = configManager.getUserSkillsPath();
-      this.skillsRootPath = userPath || path.join(require('os').homedir(), '.xagent', 'skills');
+      this.skillsRootPath = userPath || path.join(os.homedir(), '.xagent', 'skills');
     }
   }
   async loadAllSkills(): Promise<SkillInfo[]> {
@@ -356,19 +356,19 @@ export class SkillLoader {
     // Try to extract frontmatter - support both formats:
     // 1. Standard YAML: ---name: docx...--- 2. No opening ---: name: docx...
     let frontmatter = '';
-    let contentStart = 0;
+    let _contentStart = 0;
 
-    const frontmatterMatch = normalizedContent.match(/^---\n([\s\S]*?)\n---/);
+    const frontmatterMatch = normalizedContent.match(/^---([\s\S]*?)\n---/);
     if (frontmatterMatch) {
       // Standard format with --- at start and end
       frontmatter = frontmatterMatch[1];
-      contentStart = frontmatterMatch[0].length;
+      _contentStart = frontmatterMatch[0].length;
     } else {
       // Check for format without opening --- (just YAML at the start)
       const yamlMatch = normalizedContent.match(/^([\s\S]*?)\n---/);
       if (yamlMatch) {
         frontmatter = yamlMatch[1];
-        contentStart = yamlMatch[0].length;
+        _contentStart = yamlMatch[0].length;
       }
     }
 

package/src/skill-manager.ts

@@ -5,7 +5,8 @@
  * - Removes distinction between built-in and user skills
  */
 import fs from 'fs/promises';
-import fsSync from 'fs';
+import os from 'os';
+import _fsSync from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { getConfigManager } from './config.js';
@@ -50,7 +51,7 @@ export class SkillManager {
       this.userSkillsRoot = config.userSkillsRoot;
     } else {
       this.userSkillsRoot = configManager.getUserSkillsPath() ||
-        path.join(require('os').homedir(), '.xagent', 'skills');
+        path.join(os.homedir(), '.xagent', 'skills');
     }
   }
 
@@ -184,7 +185,7 @@ export class SkillManager {
     try {
       const resolvedPath = path.resolve(sourcePath);
       const skillName = path.basename(resolvedPath);
-      const destPath = path.join(this.userSkillsRoot, skillName);
+      const _destPath = path.join(this.userSkillsRoot, skillName);
 
       // Check if source exists
       await fs.access(resolvedPath);

package/src/slash-commands.ts

@@ -1,11 +1,9 @@
-import readline from 'readline';
 import { select, confirm, text } from '@clack/prompts';
 import chalk from 'chalk';
 import ora from 'ora';
 import fs from 'fs/promises';
 import path from 'path';
-import { ExecutionMode, ChatMessage, InputType, ToolCall, Checkpoint, AgentConfig, CompressionConfig, AuthType } from './types.js';
-import { Message, detectThinkingKeywords, getThinkingTokens } from './ai-client/types.js';
+import { ExecutionMode, ChatMessage, InputType, Checkpoint, AgentConfig, CompressionConfig, AuthType } from './types.js';
 import { fetchDefaultModels } from './ai-client/providers/remote.js';
 import { getToolRegistry } from './tools.js';
 import { getAgentManager } from './agents.js';
@@ -21,7 +19,6 @@ import {
 } from './context-compressor.js';
 import { getConversationManager, ConversationManager } from './conversation.js';
 import { icons, colors } from './theme.js';
-import { SystemPromptGenerator } from './system-prompt-generator.js';
 import { ensureTtySane } from './terminal.js';
 import { AuthService, selectAuthType, ThirdPartyProvider, THIRD_PARTY_PROVIDERS, VLM_PROVIDERS, VLMProviderInfo } from './auth.js';
 
@@ -626,7 +623,6 @@ export class SlashCommandHandler {
       const success = await authService.authenticate();
 
       if (success) {
-        const newConfig = this.configManager.getAuthConfig();
         console.log(chalk.green('\n✅ Login successful!'));
         console.log(chalk.cyan(`   Token saved to: ~/.xagent/settings.json`));
         console.log(chalk.gray('   You can now use xAgent CLI with remote AI services.\n'));
@@ -1216,7 +1212,7 @@ export class SlashCommandHandler {
   }
 
   private async addMcpServerInteractive(serverName?: string): Promise<void> {
-    let name = (await text({
+    const name = (await text({
       message: 'Enter MCP server name:',
       defaultValue: serverName,
       validate: (value: string | undefined) => {
@@ -1345,10 +1341,8 @@ export class SlashCommandHandler {
 
       this.mcpManager.registerServer(name, config);
 
-      let connected = false;
       try {
         await this.mcpManager.connectServer(name);
-        connected = true;
       } catch (error: any) {
         this.mcpManager.disconnectServer(name);
         this.configManager.removeMcpServer(name);
@@ -1403,11 +1397,6 @@ export class SlashCommandHandler {
 
   private async removeMcpServer(serverName: string): Promise<void> {
     try {
-      // Get server info before disconnecting to notify LLM
-      const server = this.mcpManager.getServer(serverName);
-      const removedTools = server ? server.getToolNames() : [];
-      const removedToolNames = removedTools.map((t: string) => `${serverName}__${t}`).join(', ');
-
       // Disconnect
       this.mcpManager.disconnectServer(serverName);
 
@@ -1909,7 +1898,6 @@ export class SlashCommandHandler {
   private async handleSkill(args: string[]): Promise<void> {
     const os = await import('os');
     const path = await import('path');
-    const { fileURLToPath } = await import('url');
     const { promises: fs } = await import('fs');
 
     const action = args[0] || 'list';
@@ -2146,10 +2134,11 @@ export class SlashCommandHandler {
   }
 }
 
-export function parseInput(input: string): InputType[] {
+export async function parseInput(input: string): Promise<InputType[]> {
   const inputs: InputType[] = [];
   let remaining = input;
 
+  // Match @ followed by any non-whitespace sequence
   const fileRefRegex = /@([^\s]+)/g;
   let match;
   while ((match = fileRefRegex.exec(remaining)) !== null) {
@@ -2161,7 +2150,14 @@ export function parseInput(input: string): InputType[] {
       inputs.push({ type: 'text', content: beforeMatch.trim() });
     }
 
-    inputs.push({ type: 'file', content: filePath });
+    // Only treat as file reference if the file actually exists
+    const exists = await fileExists(filePath);
+    if (exists) {
+      inputs.push({ type: 'file', content: filePath });
+    } else {
+      // Not a file, treat as regular text (preserving the @ symbol)
+      inputs.push({ type: 'text', content: '@' + filePath });
+    }
     remaining = afterMatch;
   }
 
@@ -2176,6 +2172,18 @@ export function parseInput(input: string): InputType[] {
   return inputs;
 }
 
+// Helper function to check if a file path exists
+async function fileExists(filePath: string): Promise<boolean> {
+  try {
+    // Resolve to absolute path
+    const absolutePath = path.resolve(filePath);
+    await fs.access(absolutePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function detectImageInput(input: string): boolean {
   return input.includes('[Pasted image') || input.includes('<image');
 }

package/src/smart-approval.ts

@@ -6,6 +6,7 @@ import { AuthType } from './types.js';
 import { getLogger } from './logger.js';
 import { colors, icons } from './theme.js';
 import { getCancellationManager } from './cancellation.js';
+import { SdkOutputAdapter } from './sdk-output-adapter.js';
 
 const logger = getLogger();
 
@@ -494,6 +495,8 @@ export class SmartApprovalEngine {
   private blacklistChecker: BlacklistChecker;
   private aiChecker: AIApprovalChecker;
   private debugMode: boolean;
+  private sdkAdapter: SdkOutputAdapter | null = null;
+  private isSdkMode: boolean = false;
 
   constructor(debugMode: boolean = false) {
     this.whitelistChecker = new WhitelistChecker();
@@ -502,6 +505,28 @@ export class SmartApprovalEngine {
     this.debugMode = debugMode;
   }
 
+  /**
+   * Set SDK mode and output adapter for SDK mode support
+   */
+  setSdkMode(enabled: boolean, adapter: SdkOutputAdapter | null): void {
+    this.isSdkMode = enabled;
+    this.sdkAdapter = adapter;
+  }
+
+  /**
+   * Check if in SDK mode
+   */
+  getIsSdkMode(): boolean {
+    return this.isSdkMode;
+  }
+
+  /**
+   * Get SDK adapter
+   */
+  getSdkAdapter(): SdkOutputAdapter | null {
+    return this.sdkAdapter;
+  }
+
   /**
    * Evaluate tool call
    */
@@ -583,7 +608,17 @@ export class SmartApprovalEngine {
   /**
    * Request user confirmation
    */
-  async requestConfirmation(result: ApprovalResult): Promise<boolean> {
+  async requestConfirmation(
+    result: ApprovalResult,
+    toolName?: string,
+    toolParams?: Record<string, unknown>
+  ): Promise<boolean> {
+    // Check if in SDK mode with adapter
+    if (this.isSdkMode && this.sdkAdapter) {
+      return this.requestConfirmationSdk(result, toolName, toolParams);
+    }
+
+    // Regular TUI mode
     const separator = icons.separator.repeat(40);
     console.log('');
     console.log(
@@ -624,6 +659,46 @@ export class SmartApprovalEngine {
     }
   }
 
+  /**
+   * Request user confirmation in SDK mode
+   */
+  private async requestConfirmationSdk(
+    result: ApprovalResult,
+    toolName?: string,
+    toolParams?: Record<string, unknown>
+  ): Promise<boolean> {
+    const requestId = `approval_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+
+    // Output approval request through SDK adapter
+    this.sdkAdapter!.outputApprovalRequest({
+      requestId,
+      toolName: toolName || 'unknown',
+      params: toolParams || {},
+      riskLevel: result.riskLevel,
+      description: result.description,
+      aiAnalysis: result.aiAnalysis
+    });
+
+    // Wait for SDK response using session
+    try {
+      const { getSingletonSession } = await import('./session.js');
+      const session = getSingletonSession();
+      if (!session) {
+        logger.error('SDK session not available');
+        return false;
+      }
+      const approved = await session.waitForApprovalResponse(requestId);
+      this.sdkAdapter!.outputApprovalResponse(requestId, approved);
+      return approved;
+    } catch (error) {
+      logger.error(
+        'Failed to get SDK approval response',
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
+
   /**
    * Get risk level display
    */

package/src/system-prompt-generator.ts

@@ -44,7 +44,7 @@ export class SystemPromptGenerator {
    */
   private generateEnvironmentInfo(): string {
     const platform = os.platform();
-    const arch = os.arch();
+    const _arch = os.arch();
     const nodeVersion = process.version;
     const cwd = process.cwd();
     const homeDir = os.homedir();
@@ -104,7 +104,7 @@ export class SystemPromptGenerator {
     }
 
     // Get available local tools (includes MCP wrapper tools registered via registerMCPTools)
-    let allAvailableTools = localTools;
+    const allAvailableTools = localTools;
 
     let enhancedPrompt = baseSystemPrompt;
 
@@ -739,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/theme.ts

@@ -8,7 +8,7 @@ function getTerminalBackground(): 'dark' | 'light' {
   // Check common environment variables
   const colorfgbg = process.env.COLORFGBG; // e.g., "15;0" (light fg, dark bg)
   const termProgram = process.env.TERM_PROGRAM;
-  const termProgramVersion = process.env.TERM_PROGRAM_VERSION;
+  const _termProgramVersion = process.env.TERM_PROGRAM_VERSION;
 
   // Try to parse COLORFGBG (format: "fg;bg" or "fg;color;bg")
   if (colorfgbg) {
@@ -82,7 +82,7 @@ interface SubAgentBoxOptions {
   accentColor?: ColorFunction;
 }
 
-interface BoxFunctions {
+interface _BoxFunctions {
   single: (content: string, options?: BoxOptions) => string;
   double: (content: string, options?: BoxOptions) => string;
   minimal: (content: string, options?: Omit<BoxOptions, 'title' | 'titleAlign'>) => string;
@@ -284,13 +284,13 @@ export const styleHelpers = {
       const chars = styleHelpers.border.single;
       const availableWidth = width - 4;
 
-      let lines: string[] = [];
+      const lines: string[] = [];
 
       if (title) {
         const titleContent = ` ${title} `;
         const paddingNeeded = availableWidth - titleContent.length;
-        let leftPad = titleAlign === 'center' ? Math.floor(paddingNeeded / 2) : (titleAlign === 'right' ? paddingNeeded : 0);
-        let rightPad = titleAlign === 'center' ? Math.ceil(paddingNeeded / 2) : (titleAlign === 'right' ? 0 : paddingNeeded);
+        const leftPad = titleAlign === 'center' ? Math.floor(paddingNeeded / 2) : (titleAlign === 'right' ? paddingNeeded : 0);
+        const rightPad = titleAlign === 'center' ? Math.ceil(paddingNeeded / 2) : (titleAlign === 'right' ? 0 : paddingNeeded);
 
         lines.push(`${indent}${chars.topLeft}${' '.repeat(leftPad)}${titleContent}${' '.repeat(rightPad)}${chars.topRight}`);
       } else {
@@ -314,13 +314,13 @@ export const styleHelpers = {
       const chars = styleHelpers.border.double;
       const availableWidth = width - 4;
 
-      let lines: string[] = [];
+      const lines: string[] = [];
 
       if (title) {
         const titleContent = ` ${title} `;
         const paddingNeeded = availableWidth - titleContent.length;
-        let leftPad = titleAlign === 'center' ? Math.floor(paddingNeeded / 2) : (titleAlign === 'right' ? paddingNeeded : 0);
-        let rightPad = titleAlign === 'center' ? Math.ceil(paddingNeeded / 2) : (titleAlign === 'right' ? 0 : paddingNeeded);
+        const leftPad = titleAlign === 'center' ? Math.floor(paddingNeeded / 2) : (titleAlign === 'right' ? paddingNeeded : 0);
+        const rightPad = titleAlign === 'center' ? Math.ceil(paddingNeeded / 2) : (titleAlign === 'right' ? 0 : paddingNeeded);
 
         lines.push(`${indent}${chars.topLeft}${' '.repeat(leftPad)}${titleContent}${' '.repeat(rightPad)}${chars.topRight}`);
       } else {
@@ -364,6 +364,7 @@ export const styleHelpers = {
       const availableWidth = width - 2;
 
       const headerContent = `${colors.primaryBright(agentName)}: ${description}`;
+      // eslint-disable-next-line no-control-regex
       const headerContentLength = headerContent.replace(/\x1b\[[0-9;]*m/g, '').length;
       const headerFillLength = Math.max(0, availableWidth - 3 - headerContentLength);
       const headerLine = `${indent}${accentColor(chars.topLeft)}${accentColor('─── ')}${headerContent} ${accentColor('─'.repeat(headerFillLength))}${accentColor(chars.topRight)}`;