@xagent-ai/cli 1.2.2 → 1.3.0

package/src/truncate.ts

@@ -0,0 +1,173 @@
+/**
+ * Shared truncation utilities for tool outputs.
+ *
+ * Truncation is based on two independent limits - whichever is hit first:
+ * - Line limit (default: 2000 lines)
+ * - Byte limit (default: 50KB)
+ *
+ * Never returns partial lines (except bash tail truncation edge case).
+ */
+
+export const DEFAULT_MAX_LINES = 2000;
+export const DEFAULT_MAX_BYTES = 50 * 1024; // 50KB
+
+export interface TruncationResult {
+	/** The truncated content */
+	content: string;
+	/** Whether truncation occurred */
+	truncated: boolean;
+	/** Which limit was hit: "lines", "bytes", or null if not truncated */
+	truncatedBy: 'lines' | 'bytes' | null;
+	/** Total number of lines in the original content */
+	totalLines: number;
+	/** Total number of bytes in the original content */
+	totalBytes: number;
+	/** Number of complete lines in the truncated output */
+	outputLines: number;
+	/** Number of bytes in the truncated output */
+	outputBytes: number;
+	/** Whether the last line was partially truncated (only for tail truncation edge case) */
+	lastLinePartial: boolean;
+	/** The max lines limit that was applied */
+	maxLines: number;
+	/** The max bytes limit that was applied */
+	maxBytes: number;
+}
+
+export interface TruncationOptions {
+	/** Maximum number of lines (default: 2000) */
+	maxLines?: number;
+	/** Maximum number of bytes (default: 50KB) */
+	maxBytes?: number;
+}
+
+/**
+ * Format bytes as human-readable size.
+ */
+export function formatSize(bytes: number): string {
+	if (bytes < 1024) {
+		return `${bytes}B`;
+	} else if (bytes < 1024 * 1024) {
+		return `${(bytes / 1024).toFixed(1)}KB`;
+	} else {
+		return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+	}
+}
+
+/**
+ * Truncate content from the tail (keep last N lines/bytes).
+ * Suitable for bash output where you want to see the end (errors, final results).
+ *
+ * May return partial first line if the last line of original content exceeds byte limit.
+ */
+export function truncateTail(content: string, options: TruncationOptions = {}): TruncationResult {
+	const maxLines = options.maxLines ?? DEFAULT_MAX_LINES;
+	const maxBytes = options.maxBytes ?? DEFAULT_MAX_BYTES;
+
+	const totalBytes = Buffer.byteLength(content, 'utf-8');
+	const lines = content.split('\n');
+	const totalLines = lines.length;
+
+	// Check if no truncation needed
+	if (totalLines <= maxLines && totalBytes <= maxBytes) {
+		return {
+			content,
+			truncated: false,
+			truncatedBy: null,
+			totalLines,
+			totalBytes,
+			outputLines: totalLines,
+			outputBytes: totalBytes,
+			lastLinePartial: false,
+			maxLines,
+			maxBytes,
+		};
+	}
+
+	// Work backwards from the end
+	const outputLinesArr: string[] = [];
+	let outputBytesCount = 0;
+	let truncatedBy: 'lines' | 'bytes' = 'lines';
+	let lastLinePartial = false;
+
+	for (let i = lines.length - 1; i >= 0 && outputLinesArr.length < maxLines; i--) {
+		const line = lines[i];
+		const lineBytes = Buffer.byteLength(line, 'utf-8') + (outputLinesArr.length > 0 ? 1 : 0); // +1 for newline
+
+		if (outputBytesCount + lineBytes > maxBytes) {
+			truncatedBy = 'bytes';
+			// Edge case: if we haven't added ANY lines yet and this line exceeds maxBytes,
+			// take the end of the line (partial)
+			if (outputLinesArr.length === 0) {
+				const truncatedLine = truncateStringToBytesFromEnd(line, maxBytes);
+				outputLinesArr.unshift(truncatedLine);
+				outputBytesCount = Buffer.byteLength(truncatedLine, 'utf-8');
+				lastLinePartial = true;
+			}
+			break;
+		}
+
+		outputLinesArr.unshift(line);
+		outputBytesCount += lineBytes;
+	}
+
+	// If we exited due to line limit
+	if (outputLinesArr.length >= maxLines && outputBytesCount <= maxBytes) {
+		truncatedBy = 'lines';
+	}
+
+	const outputContent = outputLinesArr.join('\n');
+	const finalOutputBytes = Buffer.byteLength(outputContent, 'utf-8');
+
+	return {
+		content: outputContent,
+		truncated: true,
+		truncatedBy,
+		totalLines,
+		totalBytes,
+		outputLines: outputLinesArr.length,
+		outputBytes: finalOutputBytes,
+		lastLinePartial,
+		maxLines,
+		maxBytes,
+	};
+}
+
+/**
+ * Truncate a string to fit within a byte limit (from the end).
+ * Handles multi-byte UTF-8 characters correctly.
+ */
+function truncateStringToBytesFromEnd(str: string, maxBytes: number): string {
+	const buf = Buffer.from(str, 'utf-8');
+	if (buf.length <= maxBytes) {
+		return str;
+	}
+
+	// Start from the end, skip maxBytes back
+	let start = buf.length - maxBytes;
+
+	// Find a valid UTF-8 boundary (start of a character)
+	while (start < buf.length && (buf[start] & 0xc0) === 0x80) {
+		start++;
+	}
+
+	return buf.slice(start).toString('utf-8');
+}
+
+/**
+ * Build a user-friendly truncation notice.
+ */
+export function buildTruncationNotice(result: TruncationResult): string {
+	const { truncatedBy, totalLines, outputLines, outputBytes, lastLinePartial, maxBytes } = result;
+	const startLine = totalLines - outputLines + 1;
+	const endLine = totalLines;
+
+	if (lastLinePartial) {
+		const lastLineSize = formatSize(outputBytes);
+		return `[Showing last ${formatSize(outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output truncated.]`;
+	} else if (truncatedBy === 'lines') {
+		return `[Showing lines ${startLine}-${endLine} of ${totalLines}. Full output truncated.]`;
+	} else {
+		return `[Showing lines ${startLine}-${endLine} of ${totalLines} (${formatSize(maxBytes)} limit). Full output truncated.]`;
+	}
+}

package/src/types.ts

@@ -1,198 +1,219 @@
-export enum ExecutionMode {
-  YOLO = 'yolo',
-  ACCEPT_EDITS = 'accept_edits',
-  PLAN = 'plan',
-  DEFAULT = 'default',
-  SMART = 'smart'
-}
-
-export enum LogLevel {
-  ERROR = 'error',
-  WARN = 'warn',
-  SUCCESS = 'success',
-  INFO = 'info',
-  DEBUG = 'debug'
-}
-
-export enum AuthType {
-  OAUTH_XAGENT = 'oauth-xagent',
-  OPENAI_COMPATIBLE = 'openai_compatible'
-}
-
-export interface AuthConfig {
-  type: AuthType;
-  apiKey?: string;
-  refreshToken?: string;
-  baseUrl?: string;
-  modelName?: string;
-  searchApiKey?: string;
-  showAIDebugInfo?: boolean;
-}
-
-export interface Tool {
-  name: string;
-  description: string;
-  execute: (params: any, executionMode?: ExecutionMode) => Promise<any>;
-  allowedModes: ExecutionMode[];
-  inputSchema?: any; // For MCP tools to pass input schema
-}
-
-export interface AgentConfig {
-  agentType: string;
-  systemPrompt: string;
-  whenToUse: string;
-  model?: string;
-  allowedTools?: string[];
-  allowedMcps?: string[];
-  isInheritMcps?: boolean;
-  proactive?: boolean;
-  color?: string;
-  name?: string;
-  description?: string;
-}
-
-export interface MCPServerConfig {
-  command?: string;
-  args?: string[];
-  env?: Record<string, string>;
-  cwd?: string;
-  timeout?: number;
-  trust?: boolean;
-  includeTools?: string[];
-  excludeTools?: string[];
-  url?: string;
-  transport?: 'stdio' | 'sse' | 'http';
-  type?: 'stdio' | 'sse' | 'http';  // Alternative field name for transport (MCP spec compatibility)
-  authToken?: string;
-  headers?: Record<string, string>;
-}
-
-export interface CheckpointConfig {
-  enabled: boolean;
-  autoCreate: boolean;
-  maxCheckpoints: number;
-}
-
-export interface ThinkingConfig {
-  enabled: boolean;
-  mode: 'none' | 'normal' | 'hard' | 'mega' | 'ultra';
-  displayMode: 'full' | 'compact' | 'indicator';
-}
-
-export interface Settings {
-  theme: string;
-  selectedAuthType: AuthType;
-  apiKey?: string;
-  refreshToken?: string;
-  baseUrl?: string;
-  modelName?: string;
-  xagentApiBaseUrl?: string;  // xAgent API base URL (for token validation)
-  guiSubagentModel?: string;
-  guiSubagentBaseUrl?: string;
-  guiSubagentApiKey?: string;
-  searchApiKey?: string;
-  skillsPath?: string;  // Path to skills directory
-  workspacePath?: string;  // Path to workspace directory
-  executionMode: ExecutionMode;
-  approvalMode?: ExecutionMode;
-  checkpointing: CheckpointConfig;
-  thinking: ThinkingConfig;
-  contextCompression: CompressionConfig;
-  contextFileName: string | string[];
-  mcpServers: Record<string, MCPServerConfig>;
-  mcpToolPreferences: Record<string, 'mcp' | 'local'>;
-  language: 'zh' | 'en';
-  autoUpdate: boolean;
-  telemetryEnabled: boolean;
-  showToolDetails: boolean;
-  showAIDebugInfo: boolean;
-  loggerLevel: LogLevel;
-}
-
-export interface ChatMessage {
-  role: 'user' | 'assistant' | 'system' | 'tool';
-  content: string;
-  images?: string[];
-  timestamp: number;
-  reasoningContent?: string;
-  toolCalls?: any[];
-  tool_call_id?: string;
-}
-
-export interface Conversation {
-  id: string;
-  messages: ChatMessage[];
-  createdAt: number;
-  updatedAt: number;
-}
-
-export interface ToolCall {
-  tool: string;
-  params: any;
-  result?: any;
-  error?: string;
-  timestamp: number;
-}
-
-export interface Checkpoint {
-  id: string;
-  timestamp: number;
-  description: string;
-  gitSnapshot?: string;
-  conversationSnapshot: ChatMessage[];
-  toolCalls: ToolCall[];
-}
-
-export interface InputType {
-  type: 'text' | 'image' | 'file' | 'command';
-  content: string;
-  metadata?: any;
-}
-
-export interface SessionInput {
-  type: 'text' | 'command' | 'file' | 'image';
-  content: string;
-  rawInput?: string;
-  filePath?: string;
-  timestamp: number;
-}
-
-export interface SessionOutput {
-  role: 'assistant' | 'tool';
-  content: string;
-  toolName?: string;
-  toolParams?: any;
-  toolResult?: any;
-  timestamp: number;
-  duration?: number;
-  reasoningContent?: string;
-  toolCalls?: any[];
-}
-
-export interface Session {
-  id: string;
-  conversationId: string;
-  startTime: number;
-  endTime?: number;
-  inputs: SessionInput[];
-  outputs: SessionOutput[];
-  agent?: string;
-  executionMode?: string;
-  totalTokens?: number;
-  status: 'active' | 'completed' | 'cancelled';
-}
-
-export interface CompressionConfig {
-  enabled: boolean;
-  maxMessages: number;
-  maxContextSize: number;
-  preserveRecentMessages: number;
-  enableSummary: boolean;
-}
-
-export interface CompressionStats {
-  lastCompressionTime?: number;
-  totalCompressions: number;
-  originalMessagesTotal: number;
-  compressedMessagesTotal: number;
-}
+export enum ExecutionMode {
+  YOLO = 'yolo',
+  ACCEPT_EDITS = 'accept_edits',
+  PLAN = 'plan',
+  DEFAULT = 'default',
+  SMART = 'smart'
+}
+
+export enum LogLevel {
+  ERROR = 'error',
+  WARN = 'warn',
+  SUCCESS = 'success',
+  INFO = 'info',
+  DEBUG = 'debug'
+}
+
+export enum AuthType {
+  OAUTH_XAGENT = 'oauth-xagent',
+  OPENAI_COMPATIBLE = 'openai_compatible'
+}
+
+export interface AuthConfig {
+  type: AuthType;
+  apiKey?: string;
+  refreshToken?: string;
+  baseUrl?: string;
+  modelName?: string;
+  searchApiKey?: string;
+  showAIDebugInfo?: boolean;
+  xagentApiBaseUrl?: string;     // xAgent API base URL
+  remote_llmModelName?: string;  // Remote mode LLM Model Name
+  remote_vlmModelName?: string;  // Remote mode VLM Model Name
+}
+
+export interface Tool {
+  name: string;
+  description: string;
+  execute: (params: any, executionMode?: ExecutionMode) => Promise<any>;
+  allowedModes: ExecutionMode[];
+  inputSchema?: any; // For MCP tools to pass input schema
+}
+
+export interface AgentConfig {
+  agentType: string;
+  systemPrompt: string;
+  whenToUse: string;
+  model?: string;
+  allowedTools?: string[];
+  allowedMcps?: string[];
+  isInheritMcps?: boolean;
+  proactive?: boolean;
+  color?: string;
+  name?: string;
+  description?: string;
+}
+
+export interface MCPServerConfig {
+  command?: string;
+  args?: string[];
+  env?: Record<string, string>;
+  cwd?: string;
+  timeout?: number;
+  trust?: boolean;
+  includeTools?: string[];
+  excludeTools?: string[];
+  url?: string;
+  transport?: 'stdio' | 'sse' | 'http';
+  type?: 'stdio' | 'sse' | 'http';  // Alternative field name for transport (MCP spec compatibility)
+  authToken?: string;
+  headers?: Record<string, string>;
+}
+
+export interface CheckpointConfig {
+  enabled: boolean;
+  autoCreate: boolean;
+  maxCheckpoints: number;
+}
+
+export interface ThinkingConfig {
+  enabled: boolean;
+  mode: 'none' | 'normal' | 'hard' | 'mega' | 'ultra';
+  displayMode: 'full' | 'compact' | 'indicator';
+}
+
+export interface Settings {
+  theme: string;
+  selectedAuthType: AuthType;
+  apiKey?: string;
+  refreshToken?: string;
+  baseUrl?: string;
+  modelName?: string;
+  xagentApiBaseUrl?: string;  // xAgent API base URL (for token validation)
+  guiSubagentModel?: string;
+  guiSubagentBaseUrl?: string;
+  guiSubagentApiKey?: string;
+  searchApiKey?: string;
+  skillsPath?: string;  // Path to built-in skills directory
+  userSkillsPath?: string;  // Path to user-installed skills directory (~/.xagent/skills)
+  userNodeModulesPath?: string;  // Path to user-installed node_modules (~/.xagent/node_modules)
+  workspacePath?: string;  // Path to workspace directory
+  executionMode: ExecutionMode;
+  approvalMode?: ExecutionMode;
+  checkpointing: CheckpointConfig;
+  thinking: ThinkingConfig;
+  contextCompression: CompressionConfig;
+  contextFileName: string | string[];
+  mcpServers: Record<string, MCPServerConfig>;
+  mcpToolPreferences: Record<string, 'mcp' | 'local'>;
+  language: 'zh' | 'en';
+  autoUpdate: boolean;
+  telemetryEnabled: boolean;
+  showToolDetails: boolean;
+  showAIDebugInfo: boolean;
+  loggerLevel: LogLevel;
+  remote_llmModelName?: string;  // Remote 模式使用的 LLM Model Name
+  remote_vlmModelName?: string;  // Remote 模式使用的 VLM Model Name
+}
+
+export interface ChatMessage {
+  role: 'user' | 'assistant' | 'system' | 'tool';
+  content: string;
+  images?: string[];
+  timestamp: number;
+  reasoning_content?: string;
+  tool_calls?: any[];
+  tool_call_id?: string;
+}
+
+export interface Conversation {
+  id: string;
+  messages: ChatMessage[];
+  createdAt: number;
+  updatedAt: number;
+}
+
+export interface ToolCall {
+  tool: string;
+  params: any;
+  result?: any;
+  error?: string;
+  timestamp: number;
+}
+
+export interface Checkpoint {
+  id: string;
+  timestamp: number;
+  description: string;
+  gitSnapshot?: string;
+  conversationSnapshot: ChatMessage[];
+  tool_calls: ToolCall[];
+}
+
+export interface InputType {
+  type: 'text' | 'image' | 'file' | 'command';
+  content: string;
+  metadata?: any;
+}
+
+export interface SessionInput {
+  type: 'text' | 'command' | 'file' | 'image';
+  content: string;
+  rawInput?: string;
+  filePath?: string;
+  timestamp: number;
+}
+
+export interface SessionOutput {
+  role: 'assistant' | 'tool';
+  content: string;
+  toolName?: string;
+  toolParams?: any;
+  toolResult?: any;
+  timestamp: number;
+  duration?: number;
+  reasoning_content?: string;
+  tool_calls?: any[];
+}
+
+export interface Session {
+  id: string;
+  conversationId: string;
+  startTime: number;
+  endTime?: number;
+  inputs: SessionInput[];
+  outputs: SessionOutput[];
+  agent?: string;
+  executionMode?: string;
+  totalTokens?: number;
+  status: 'active' | 'completed' | 'cancelled';
+}
+
+export interface CompressionConfig {
+  enabled: boolean;
+}
+
+export interface CompressionStats {
+  lastCompressionTime?: number;
+  totalCompressions: number;
+  originalMessagesTotal: number;
+  compressedMessagesTotal: number;
+}
+
+export interface Agent {
+  name: string;
+  description: string;
+  systemPrompt: string;
+  capabilities: string[];
+}
+
+export interface ToolCallFunction {
+  name: string;
+  arguments: string;
+}
+
+export interface ToolCallItem {
+  id?: string;
+  type?: string;
+  function: ToolCallFunction;
+}