@defai.digital/ax-cli 2.5.2 → 2.6.4

package/dist/utils/streaming-analyzer.d.ts

@@ -0,0 +1,171 @@
+/**
+ * Streaming Analyzer
+ *
+ * Emits analysis results as they're found instead of waiting for all files.
+ * Provides better user experience with immediate feedback.
+ *
+ * Quick Win #3: Streaming Results (Est. time: 30 minutes)
+ * Impact: Better UX, perceived 2-5x faster
+ */
+import { EventEmitter } from 'events';
+/**
+ * Analysis result for a single file
+ */
+export interface FileAnalysisResult<T = unknown> {
+    /** File path */
+    file: string;
+    /** Analysis result */
+    result?: T;
+    /** Error if analysis failed */
+    error?: Error;
+    /** Analysis duration in ms */
+    duration: number;
+    /** Whether result was from cache */
+    cached: boolean;
+}
+/**
+ * Progress update
+ */
+export interface AnalysisProgress {
+    /** Number of files completed */
+    completed: number;
+    /** Total number of files */
+    total: number;
+    /** Current file being analyzed */
+    currentFile?: string;
+    /** Percentage complete (0-100) */
+    percentage: number;
+    /** Estimated time remaining in ms */
+    estimatedTimeRemaining?: number;
+}
+/**
+ * Analysis summary
+ */
+export interface AnalysisSummary<T = unknown> {
+    /** All results */
+    results: FileAnalysisResult<T>[];
+    /** Number of successful analyses */
+    successCount: number;
+    /** Number of failed analyses */
+    errorCount: number;
+    /** Number of cached results */
+    cachedCount: number;
+    /** Total duration in ms */
+    totalDuration: number;
+    /** Average duration per file in ms */
+    avgDuration: number;
+    /** Cache hit rate (0-1) */
+    cacheHitRate: number;
+}
+/**
+ * Streaming analyzer events
+ */
+export interface StreamingAnalyzerEvents<T = unknown> {
+    /** Emitted when a file analysis starts */
+    start: (file: string) => void;
+    /** Emitted when a file analysis completes */
+    result: (result: FileAnalysisResult<T>) => void;
+    /** Emitted on progress updates */
+    progress: (progress: AnalysisProgress) => void;
+    /** Emitted when all files are analyzed */
+    complete: (summary: AnalysisSummary<T>) => void;
+    /** Emitted on error */
+    error: (file: string, error: Error) => void;
+}
+/**
+ * Streaming Analyzer
+ *
+ * Analyzes files and emits results as they're completed.
+ *
+ * @example
+ * ```typescript
+ * const analyzer = new StreamingAnalyzer();
+ *
+ * analyzer.on('result', (result) => {
+ *   if (result.error) {
+ *     console.error(`Error in ${result.file}: ${result.error.message}`);
+ *   } else {
+ *     console.log(`✓ ${result.file} (${result.duration}ms)`);
+ *   }
+ * });
+ *
+ * analyzer.on('progress', (progress) => {
+ *   console.log(`Progress: ${progress.percentage}%`);
+ * });
+ *
+ * analyzer.on('complete', (summary) => {
+ *   console.log(`Done! ${summary.successCount} files analyzed`);
+ * });
+ *
+ * await analyzer.analyze(files, analyzeFile);
+ * ```
+ */
+export declare class StreamingAnalyzer<T = unknown> extends EventEmitter {
+    private results;
+    private startTime;
+    private completed;
+    private total;
+    /**
+     * Analyze files and emit results as they complete
+     *
+     * @param files - Array of file paths to analyze
+     * @param analyzer - Analysis function
+     * @returns Promise that resolves when all files are analyzed
+     */
+    analyze(files: string[], analyzer: (file: string) => Promise<T>): Promise<AnalysisSummary<T>>;
+    /**
+     * Analyze files in parallel and emit results as they complete
+     *
+     * @param files - Array of file paths to analyze
+     * @param analyzer - Analysis function
+     * @param concurrency - Maximum concurrent analyses (default: 4)
+     * @returns Promise that resolves when all files are analyzed
+     */
+    analyzeParallel(files: string[], analyzer: (file: string) => Promise<T>, concurrency?: number): Promise<AnalysisSummary<T>>;
+    /**
+     * Get current progress
+     */
+    getProgress(): AnalysisProgress;
+    /**
+     * Analyze a single file and emit events
+     */
+    private analyzeFile;
+    /**
+     * Create analysis summary
+     */
+    private createSummary;
+}
+/**
+ * Helper function to create a progress bar string
+ *
+ * @param progress - Progress info
+ * @param width - Width of progress bar (default: 40)
+ * @returns Progress bar string
+ *
+ * @example
+ * ```typescript
+ * const bar = createProgressBar({ completed: 50, total: 100, percentage: 50 });
+ * console.log(bar); // [####################          ] 50%
+ * ```
+ */
+export declare function createProgressBar(progress: AnalysisProgress, width?: number): string;
+/**
+ * Helper function to format duration
+ *
+ * @param ms - Duration in milliseconds
+ * @returns Formatted duration string
+ *
+ * @example
+ * ```typescript
+ * formatDuration(1500); // "1.5s"
+ * formatDuration(65000); // "1m 5s"
+ * ```
+ */
+export declare function formatDuration(ms: number): string;
+/**
+ * Helper function to format summary
+ *
+ * @param summary - Analysis summary
+ * @returns Formatted summary string
+ */
+export declare function formatSummary<T>(summary: AnalysisSummary<T>): string;

package/dist/utils/streaming-analyzer.js

@@ -0,0 +1,248 @@
+/**
+ * Streaming Analyzer
+ *
+ * Emits analysis results as they're found instead of waiting for all files.
+ * Provides better user experience with immediate feedback.
+ *
+ * Quick Win #3: Streaming Results (Est. time: 30 minutes)
+ * Impact: Better UX, perceived 2-5x faster
+ */
+import { EventEmitter } from 'events';
+/**
+ * Streaming Analyzer
+ *
+ * Analyzes files and emits results as they're completed.
+ *
+ * @example
+ * ```typescript
+ * const analyzer = new StreamingAnalyzer();
+ *
+ * analyzer.on('result', (result) => {
+ *   if (result.error) {
+ *     console.error(`Error in ${result.file}: ${result.error.message}`);
+ *   } else {
+ *     console.log(`✓ ${result.file} (${result.duration}ms)`);
+ *   }
+ * });
+ *
+ * analyzer.on('progress', (progress) => {
+ *   console.log(`Progress: ${progress.percentage}%`);
+ * });
+ *
+ * analyzer.on('complete', (summary) => {
+ *   console.log(`Done! ${summary.successCount} files analyzed`);
+ * });
+ *
+ * await analyzer.analyze(files, analyzeFile);
+ * ```
+ */
+export class StreamingAnalyzer extends EventEmitter {
+    results = [];
+    startTime = 0;
+    completed = 0;
+    total = 0;
+    /**
+     * Analyze files and emit results as they complete
+     *
+     * @param files - Array of file paths to analyze
+     * @param analyzer - Analysis function
+     * @returns Promise that resolves when all files are analyzed
+     */
+    async analyze(files, analyzer) {
+        this.results = [];
+        this.startTime = Date.now();
+        this.completed = 0;
+        this.total = files.length;
+        for (const file of files) {
+            await this.analyzeFile(file, analyzer);
+        }
+        return this.createSummary();
+    }
+    /**
+     * Analyze files in parallel and emit results as they complete
+     *
+     * @param files - Array of file paths to analyze
+     * @param analyzer - Analysis function
+     * @param concurrency - Maximum concurrent analyses (default: 4)
+     * @returns Promise that resolves when all files are analyzed
+     */
+    async analyzeParallel(files, analyzer, concurrency = 4) {
+        this.results = [];
+        this.startTime = Date.now();
+        this.completed = 0;
+        this.total = files.length;
+        // Process files in parallel batches
+        const queue = [...files];
+        const executing = [];
+        while (queue.length > 0 || executing.length > 0) {
+            // Start new analyses up to concurrency limit
+            while (queue.length > 0 && executing.length < concurrency) {
+                const file = queue.shift();
+                const promise = this.analyzeFile(file, analyzer);
+                executing.push(promise);
+            }
+            // Wait for at least one to complete
+            if (executing.length > 0) {
+                await Promise.race(executing);
+                // Remove completed promises
+                for (let i = executing.length - 1; i >= 0; i--) {
+                    const promise = executing[i];
+                    // Check if promise is settled
+                    let settled = false;
+                    promise.then(() => {
+                        settled = true;
+                    }, () => {
+                        settled = true;
+                    });
+                    // Allow microtask queue to process
+                    await Promise.resolve();
+                    if (settled) {
+                        executing.splice(i, 1);
+                    }
+                }
+            }
+        }
+        return this.createSummary();
+    }
+    /**
+     * Get current progress
+     */
+    getProgress() {
+        const percentage = this.total > 0 ? (this.completed / this.total) * 100 : 0;
+        const elapsed = Date.now() - this.startTime;
+        const avgTimePerFile = this.completed > 0 ? elapsed / this.completed : 0;
+        const remaining = this.total - this.completed;
+        const estimatedTimeRemaining = avgTimePerFile * remaining;
+        return {
+            completed: this.completed,
+            total: this.total,
+            percentage,
+            estimatedTimeRemaining: estimatedTimeRemaining > 0 ? estimatedTimeRemaining : undefined,
+        };
+    }
+    /**
+     * Analyze a single file and emit events
+     */
+    async analyzeFile(file, analyzer) {
+        this.emit('start', file);
+        const startTime = Date.now();
+        let result;
+        try {
+            const analysisResult = await analyzer(file);
+            const duration = Date.now() - startTime;
+            result = {
+                file,
+                result: analysisResult,
+                duration,
+                cached: false, // Analyzer should set this
+            };
+            this.results.push(result);
+            this.emit('result', result);
+        }
+        catch (error) {
+            const duration = Date.now() - startTime;
+            result = {
+                file,
+                error: error,
+                duration,
+                cached: false,
+            };
+            this.results.push(result);
+            this.emit('result', result);
+            this.emit('error', file, error);
+        }
+        this.completed++;
+        this.emit('progress', this.getProgress());
+    }
+    /**
+     * Create analysis summary
+     */
+    createSummary() {
+        const successCount = this.results.filter((r) => !r.error).length;
+        const errorCount = this.results.filter((r) => r.error).length;
+        const cachedCount = this.results.filter((r) => r.cached).length;
+        const totalDuration = Date.now() - this.startTime;
+        const avgDuration = this.results.length > 0
+            ? this.results.reduce((sum, r) => sum + r.duration, 0) / this.results.length
+            : 0;
+        const cacheHitRate = this.results.length > 0
+            ? cachedCount / this.results.length
+            : 0;
+        const summary = {
+            results: this.results,
+            successCount,
+            errorCount,
+            cachedCount,
+            totalDuration,
+            avgDuration,
+            cacheHitRate,
+        };
+        this.emit('complete', summary);
+        return summary;
+    }
+}
+/**
+ * Helper function to create a progress bar string
+ *
+ * @param progress - Progress info
+ * @param width - Width of progress bar (default: 40)
+ * @returns Progress bar string
+ *
+ * @example
+ * ```typescript
+ * const bar = createProgressBar({ completed: 50, total: 100, percentage: 50 });
+ * console.log(bar); // [####################          ] 50%
+ * ```
+ */
+export function createProgressBar(progress, width = 40) {
+    const filledWidth = Math.round((progress.percentage / 100) * width);
+    const emptyWidth = width - filledWidth;
+    const filled = '#'.repeat(filledWidth);
+    const empty = ' '.repeat(emptyWidth);
+    return `[${filled}${empty}] ${progress.percentage.toFixed(1)}%`;
+}
+/**
+ * Helper function to format duration
+ *
+ * @param ms - Duration in milliseconds
+ * @returns Formatted duration string
+ *
+ * @example
+ * ```typescript
+ * formatDuration(1500); // "1.5s"
+ * formatDuration(65000); // "1m 5s"
+ * ```
+ */
+export function formatDuration(ms) {
+    if (ms < 1000) {
+        return `${ms.toFixed(0)}ms`;
+    }
+    else if (ms < 60000) {
+        return `${(ms / 1000).toFixed(1)}s`;
+    }
+    else {
+        const minutes = Math.floor(ms / 60000);
+        const seconds = Math.round((ms % 60000) / 1000);
+        return `${minutes}m ${seconds}s`;
+    }
+}
+/**
+ * Helper function to format summary
+ *
+ * @param summary - Analysis summary
+ * @returns Formatted summary string
+ */
+export function formatSummary(summary) {
+    const lines = [];
+    lines.push('Analysis Summary');
+    lines.push('─'.repeat(50));
+    lines.push(`Total files:     ${summary.results.length}`);
+    lines.push(`Successful:      ${summary.successCount}`);
+    lines.push(`Errors:          ${summary.errorCount}`);
+    lines.push(`Cached:          ${summary.cachedCount}`);
+    lines.push(`Total duration:  ${formatDuration(summary.totalDuration)}`);
+    lines.push(`Avg per file:    ${formatDuration(summary.avgDuration)}`);
+    lines.push(`Cache hit rate:  ${(summary.cacheHitRate * 100).toFixed(1)}%`);
+    return lines.join('\n');
+}
+//# sourceMappingURL=streaming-analyzer.js.map

package/dist/utils/streaming-analyzer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streaming-analyzer.js","sourceRoot":"","sources":["../../src/utils/streaming-analyzer.ts"],"names":[],"mappings":"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"}

package/dist/utils/token-counter.d.ts

@@ -1,3 +1,4 @@
+import type { ChatCompletionMessageParam } from 'openai/resources/chat.js';
 export declare class TokenCounter {
     private encoder;
     private cache;
@@ -9,11 +10,7 @@ export declare class TokenCounter {
     /**
      * Count tokens in messages array (for chat completions)
      */
-    countMessageTokens(messages: Array<{
-        role: string;
-        content: string | null;
-        [key: string]: any;
-    }>): number;
+    countMessageTokens(messages: ChatCompletionMessageParam[]): number;
     /**
      * Estimate tokens for streaming content
      * This is an approximation since we don't have the full response yet

package/dist/utils/token-counter.js

@@ -41,14 +41,23 @@ export class TokenCounter {
         for (const message of messages) {
             // Every message follows <|start|>{role/name}\n{content}<|end|>\n
             totalTokens += TOKEN_CONFIG.TOKENS_PER_MESSAGE;
-            if (message.content && typeof message.content === 'string') {
-                totalTokens += this.countTokens(message.content);
+            if (message.content) {
+                if (typeof message.content === 'string') {
+                    totalTokens += this.countTokens(message.content);
+                }
+                else if (Array.isArray(message.content)) {
+                    for (const part of message.content) {
+                        if (part.type === 'text' && part.text) {
+                            totalTokens += this.countTokens(part.text);
+                        }
+                    }
+                }
             }
             if (message.role) {
                 totalTokens += this.countTokens(message.role);
             }
             // Add extra tokens for tool calls if present
-            if (message.tool_calls && Array.isArray(message.tool_calls) && message.tool_calls.length > 0) {
+            if ((message.role === 'assistant' || message.role === 'tool') && 'tool_calls' in message && Array.isArray(message.tool_calls) && message.tool_calls.length > 0) {
                 totalTokens += this.countTokens(JSON.stringify(message.tool_calls));
             }
         }

package/dist/utils/token-counter.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-counter.js","sourceRoot":"","sources":["../../src/utils/token-counter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token-counter.js","sourceRoot":"","sources":["../../src/utils/token-counter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defai.digital/ax-cli",
-  "version": "2.5.2",
+  "version": "2.6.4",
   "description": "Enterprise-Class AI Command Line Interface - Primary support for GLM (General Language Model) with multi-provider AI orchestration powered by AutomatosX.",
   "type": "module",
   "workspaces": [