@compilr-dev/cli 0.5.0 → 0.5.1

package/dist/ui/conversation-store.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Conversation history and filtering.
+ *
+ * Extracted from TerminalUI — owns conversation data, restored history,
+ * and agent-based filtering. Rendering orchestration stays on TerminalUI.
+ */
+import type { PrintableItem } from './terminal-types.js';
+export declare class ConversationStore {
+    /** All printed items (stored for re-rendering on config change). */
+    history: PrintableItem[];
+    /** Session history for Ctrl+R replay. */
+    restoredHistory: PrintableItem[];
+    /** Agent-based conversation filter. */
+    private filter;
+    /** Add an item to conversation history. */
+    addItem(item: PrintableItem): void;
+    /** Get a copy of conversation history. */
+    getHistory(): PrintableItem[];
+    /** Clear all conversation history. */
+    clearHistory(): void;
+    /** Store restored conversation items for Ctrl+R history view. */
+    setRestoredHistory(items: PrintableItem[]): void;
+    /** Check if there is restored history available. */
+    hasRestoredHistory(): boolean;
+    /**
+     * Set conversation filter to show only specific agents.
+     * Pass empty array to show all agents.
+     */
+    setFilter(agentIds: string[]): void;
+    /** Clear conversation filter (show all agents). */
+    clearFilter(): void;
+    /** Get current conversation filter state. */
+    getFilter(): {
+        agentIds: string[];
+        isActive: boolean;
+    };
+    /** Whether the filter is currently active. */
+    get isFilterActive(): boolean;
+    /** Get the set of filtered agent IDs (for display). */
+    get filterAgentIds(): ReadonlySet<string>;
+    /**
+     * Add an agent to the conversation filter (auto-expand).
+     * Returns true if agent was added, false if filter not active or agent already included.
+     */
+    addToFilter(agentId: string): boolean;
+    /**
+     * Check if an agent is in the current filter (or filter is inactive).
+     * Returns true if messages from this agent would be shown.
+     */
+    isAgentInFilter(agentId: string): boolean;
+    /**
+     * Check if an item should be shown based on current filter.
+     */
+    shouldShowItem(item: PrintableItem): boolean;
+}

package/dist/ui/conversation-store.js

@@ -0,0 +1,107 @@
+/**
+ * Conversation history and filtering.
+ *
+ * Extracted from TerminalUI — owns conversation data, restored history,
+ * and agent-based filtering. Rendering orchestration stays on TerminalUI.
+ */
+export class ConversationStore {
+    /** All printed items (stored for re-rendering on config change). */
+    history = [];
+    /** Session history for Ctrl+R replay. */
+    restoredHistory = [];
+    /** Agent-based conversation filter. */
+    filter = {
+        agentIds: new Set(),
+        isActive: false,
+    };
+    // ===========================================================================
+    // History
+    // ===========================================================================
+    /** Add an item to conversation history. */
+    addItem(item) {
+        this.history.push(item);
+    }
+    /** Get a copy of conversation history. */
+    getHistory() {
+        return [...this.history];
+    }
+    /** Clear all conversation history. */
+    clearHistory() {
+        this.history = [];
+    }
+    // ===========================================================================
+    // Restored History (Ctrl+R)
+    // ===========================================================================
+    /** Store restored conversation items for Ctrl+R history view. */
+    setRestoredHistory(items) {
+        this.restoredHistory = items;
+    }
+    /** Check if there is restored history available. */
+    hasRestoredHistory() {
+        return this.restoredHistory.length > 0;
+    }
+    // ===========================================================================
+    // Conversation Filter
+    // ===========================================================================
+    /**
+     * Set conversation filter to show only specific agents.
+     * Pass empty array to show all agents.
+     */
+    setFilter(agentIds) {
+        this.filter = {
+            agentIds: new Set(agentIds),
+            isActive: agentIds.length > 0,
+        };
+    }
+    /** Clear conversation filter (show all agents). */
+    clearFilter() {
+        this.filter = { agentIds: new Set(), isActive: false };
+    }
+    /** Get current conversation filter state. */
+    getFilter() {
+        return {
+            agentIds: [...this.filter.agentIds],
+            isActive: this.filter.isActive,
+        };
+    }
+    /** Whether the filter is currently active. */
+    get isFilterActive() {
+        return this.filter.isActive;
+    }
+    /** Get the set of filtered agent IDs (for display). */
+    get filterAgentIds() {
+        return this.filter.agentIds;
+    }
+    /**
+     * Add an agent to the conversation filter (auto-expand).
+     * Returns true if agent was added, false if filter not active or agent already included.
+     */
+    addToFilter(agentId) {
+        if (!this.filter.isActive)
+            return false;
+        if (this.filter.agentIds.has(agentId))
+            return false;
+        this.filter.agentIds.add(agentId);
+        return true;
+    }
+    /**
+     * Check if an agent is in the current filter (or filter is inactive).
+     * Returns true if messages from this agent would be shown.
+     */
+    isAgentInFilter(agentId) {
+        if (!this.filter.isActive)
+            return true;
+        return this.filter.agentIds.has(agentId);
+    }
+    /**
+     * Check if an item should be shown based on current filter.
+     */
+    shouldShowItem(item) {
+        if (!this.filter.isActive)
+            return true;
+        const agentId = 'agentId' in item ? item.agentId : undefined;
+        if (!agentId)
+            return true;
+        return this.filter.agentIds.has(agentId);
+    }
+}

package/dist/ui/conversation.js

@@ -15,6 +15,7 @@ import * as terminal from './terminal.js';
 import { isVerboseEnabled, getMascotSetting } from '../settings/index.js';
 import { detectProjectStatus, getWorkflowStage } from '../utils/project-status.js';
 import { renderMascotWithLogo } from './mascot/index.js';
+import { formatTokens, truncate } from './base/index.js';
 // =============================================================================
 // Renderer Integration
 // =============================================================================
@@ -126,6 +127,7 @@ function postProcessFormatting(text) {
     const chalk = new Chalk({ level: 3 });
     const colors = getThemeColors();
     const primary = chalk.hex(colors.primary);
+    const secondary = chalk.hex(colors.secondary || colors.primary);
     let result = text;
     // Handle **`code`** (bold code) - common pattern in tool docs
     result = result.replace(/\*\*`([^`]+)`\*\*/g, (_match, code) => chalk.bold(primary(code)));
@@ -133,6 +135,9 @@ function postProcessFormatting(text) {
     result = result.replace(/`([^`]+)`/g, (_match, code) => primary(code));
     // Handle remaining **bold**
     result = result.replace(/\*\*([^*]+)\*\*/g, (_match, content) => chalk.bold(content));
+    // Handle $agent references - bold + secondary color
+    // Match $word at word boundaries (not inside other text)
+    result = result.replace(/(?<![$\w])\$([a-zA-Z_][a-zA-Z0-9_]*)\b/g, (_match, agentId) => chalk.bold(secondary(`$${agentId}`)));
     return result;
 }
 // =============================================================================
@@ -196,6 +201,8 @@ export function renderInlineMarkdown(text) {
     result = result.replace(/(?<![*\s])\*(\S+)\*(?!\*)/g, (_match, word) => chalkWithColors.italic(word));
     // Handle `code` - use theme primary color
     result = result.replace(/`([^`]+)`/g, (_match, code) => s.primary(code));
+    // Handle $agent references - bold + secondary color
+    result = result.replace(/(?<![$\w])\$([a-zA-Z_][a-zA-Z0-9_]*)\b/g, (_match, agentId) => chalkWithColors.bold(s.secondary(`$${agentId}`)));
     return result;
 }
 // =============================================================================
@@ -244,8 +251,8 @@ export function formatToolResult(result) {
             if (nonEmptyLines > 3) {
                 return s.muted(`${String(nonEmptyLines)} lines`);
             }
-            const truncated = result.slice(0, 80).replace(/\n/g, ' ');
-            return s.muted(truncated + (result.length > 80 ? '...' : ''));
+            const singleLine = result.replace(/\n/g, ' ');
+            return s.muted(truncate(singleLine, 80));
         }
     }
     // Array result - show count and type hint
@@ -452,7 +459,7 @@ export function formatToolExecution(name, args, result) {
     const lines = [];
     let displayArgs = args;
     if (args && !verbose && args.length > 60) {
-        displayArgs = args.slice(0, 57) + '...';
+        displayArgs = truncate(args, 60);
     }
     const toolHeader = displayArgs
         ? s.warning(`● ${name}`) + s.secondary(`(${displayArgs})`)
@@ -560,15 +567,6 @@ function formatDuration(ms) {
     const remainingSeconds = Math.floor(seconds % 60);
     return `${String(minutes)}m ${String(remainingSeconds)}s`;
 }
-/**
- * Format token count (e.g., "18.1k", "500")
- */
-function formatTokens(tokens) {
-    if (tokens >= 1000) {
-        return `${(tokens / 1000).toFixed(1)}k`;
-    }
-    return tokens.toString();
-}
 /**
  * Print sub-agent completion summary
  * Format matches the footer's subagent zone when done:
@@ -716,6 +714,6 @@ function printWorkflowGuidance(status, stage) {
  */
 export function formatPendingMessage(content) {
     const s = getStyles();
-    const truncated = content.length > 60 ? content.slice(0, 57) + '...' : content;
+    const truncated = truncate(content, 60);
     return s.muted('⏳ ') + s.muted(truncated);
 }

package/dist/ui/diff.d.ts

@@ -28,10 +28,16 @@ export declare function generateEditDiff(filePath: string, oldText: string, newT
  * Format a diff header showing what changed
  */
 export declare function formatDiffHeader(filePath: string, additions: number, removals: number): string;
+/**
+ * Compute the full modified file content after applying an edit.
+ * For edit: reads file, applies text replacement, returns full modified content.
+ * Returns null if the file can't be read or the old text isn't found.
+ */
+export declare function computeModifiedContent(filePath: string, oldText: string, newText: string, replaceAll?: boolean): string | null;
 /**
  * Generate a simple diff for write_file operations (new content only)
  */
-export declare function generateWriteDiff(filePath: string, content: string, _isNew: boolean): DiffResult;
+export declare function generateWriteDiff(_filePath: string, content: string, _isNew: boolean): DiffResult;
 /**
  * Format header for write_file operations
  */

package/dist/ui/diff.js

@@ -36,65 +36,77 @@ export function generateEditDiff(filePath, oldText, newText, replaceAll = false)
         // File doesn't exist yet or can't be read
         return null;
     }
-    // Split file into lines
-    const lines = fileContent.split('\n');
-    // Find all line numbers that contain the old text
-    const affectedLines = [];
-    for (let i = 0; i < lines.length; i++) {
-        if (lines[i].includes(oldText)) {
-            affectedLines.push(i);
-            if (!replaceAll)
-                break; // Only find first occurrence
-        }
+    // Find all occurrences of oldText in the file (supports multi-line)
+    const occurrences = [];
+    let searchFrom = 0;
+    let idx = fileContent.indexOf(oldText, searchFrom);
+    while (idx !== -1) {
+        occurrences.push(idx);
+        if (!replaceAll)
+            break;
+        searchFrom = idx + oldText.length;
+        idx = fileContent.indexOf(oldText, searchFrom);
     }
-    if (affectedLines.length === 0) {
-        // Old text not found
+    if (occurrences.length === 0) {
         return null;
     }
+    const lines = fileContent.split('\n');
+    // Convert character offset to line number
+    const charOffsetToLine = (offset) => {
+        let chars = 0;
+        for (let i = 0; i < lines.length; i++) {
+            if (offset <= chars + lines[i].length)
+                return i;
+            chars += lines[i].length + 1; // +1 for \n
+        }
+        return lines.length - 1;
+    };
+    const oldLines = oldText.split('\n');
+    const newLines = newText.split('\n');
     // Build the diff output
     const diffLines = [];
     let additions = 0;
     let removals = 0;
-    // Track which context lines have been shown
     const shownContextLines = new Set();
     let lastShownLine = -999;
-    for (let idx = 0; idx < affectedLines.length; idx++) {
-        const lineNum = affectedLines[idx];
-        // Calculate context range for this change
-        const contextStart = Math.max(0, lineNum - CONTEXT_LINES);
-        const contextEnd = Math.min(lines.length - 1, lineNum + CONTEXT_LINES);
-        // Add separator if there's a gap from the last shown line
+    for (let occIdx = 0; occIdx < occurrences.length; occIdx++) {
+        const startLine = charOffsetToLine(occurrences[occIdx]);
+        const endLine = startLine + oldLines.length - 1;
+        const contextStart = Math.max(0, startLine - CONTEXT_LINES);
+        const contextEnd = Math.min(lines.length - 1, endLine + CONTEXT_LINES);
+        // Add separator if there's a gap
         const s = getStyles();
         if (lastShownLine >= 0 && contextStart > lastShownLine + 1) {
             diffLines.push(s.muted('       ...'));
         }
-        // Show context lines before the change
-        for (let i = contextStart; i < lineNum; i++) {
+        // Context lines before
+        for (let i = contextStart; i < startLine; i++) {
             if (!shownContextLines.has(i)) {
-                const lineNumStr = String(i + 1).padStart(6);
-                diffLines.push(formatContextLine(lineNumStr, lines[i]));
+                diffLines.push(formatContextLine(String(i + 1).padStart(6), lines[i]));
                 shownContextLines.add(i);
                 lastShownLine = i;
             }
         }
-        // Show the changed line (removal + addition)
-        const lineNumStr = String(lineNum + 1).padStart(6);
-        const originalLine = lines[lineNum];
-        const modifiedLine = replaceAll
-            ? originalLine.split(oldText).join(newText) // Replace all in line
-            : originalLine.replace(oldText, newText); // Replace first in line
-        diffLines.push(formatRemovedLine(lineNumStr, originalLine));
-        diffLines.push(formatAddedLine(lineNumStr, modifiedLine));
-        removals++;
-        additions++;
-        shownContextLines.add(lineNum);
-        lastShownLine = lineNum;
-        // Show context lines after the change (but only if not overlapping with next change)
-        const nextChangeLineNum = idx < affectedLines.length - 1 ? affectedLines[idx + 1] : Infinity;
-        for (let i = lineNum + 1; i <= contextEnd && i < nextChangeLineNum; i++) {
+        // Removed lines (old text)
+        for (let i = 0; i < oldLines.length; i++) {
+            const lineNum = startLine + i;
+            diffLines.push(formatRemovedLine(String(lineNum + 1).padStart(6), lines[lineNum]));
+            shownContextLines.add(lineNum);
+            lastShownLine = lineNum;
+        }
+        removals += oldLines.length;
+        // Added lines (new text)
+        for (let i = 0; i < newLines.length; i++) {
+            diffLines.push(formatAddedLine(String(startLine + 1).padStart(6), newLines[i]));
+        }
+        additions += newLines.length;
+        // Context lines after
+        const nextStartLine = occIdx < occurrences.length - 1
+            ? charOffsetToLine(occurrences[occIdx + 1])
+            : Infinity;
+        for (let i = endLine + 1; i <= contextEnd && i < nextStartLine; i++) {
             if (!shownContextLines.has(i)) {
-                const ctxLineNumStr = String(i + 1).padStart(6);
-                diffLines.push(formatContextLine(ctxLineNumStr, lines[i]));
+                diffLines.push(formatContextLine(String(i + 1).padStart(6), lines[i]));
                 shownContextLines.add(i);
                 lastShownLine = i;
             }
@@ -147,24 +159,49 @@ function formatAddedLine(lineNum, content) {
     return `${s.muted(lineNum)} ${chalk.bgGreen.black('+')} ${chalk.bgGreen.black(content)}`;
 }
 // =============================================================================
+// Modified Content Generation (for VS Code diff view)
+// =============================================================================
+/**
+ * Compute the full modified file content after applying an edit.
+ * For edit: reads file, applies text replacement, returns full modified content.
+ * Returns null if the file can't be read or the old text isn't found.
+ */
+export function computeModifiedContent(filePath, oldText, newText, replaceAll) {
+    let fileContent;
+    try {
+        fileContent = fs.readFileSync(filePath, 'utf-8');
+    }
+    catch {
+        return null;
+    }
+    // Check that oldText exists in the file
+    if (!fileContent.includes(oldText)) {
+        return null;
+    }
+    if (replaceAll) {
+        // Replace all occurrences
+        let result = fileContent;
+        while (result.includes(oldText)) {
+            result = result.replace(oldText, newText);
+        }
+        return result;
+    }
+    // Replace first occurrence only
+    return fileContent.replace(oldText, newText);
+}
+// =============================================================================
 // Write File Diff (for new files or complete overwrites)
 // =============================================================================
 /**
  * Generate a simple diff for write_file operations (new content only)
  */
-export function generateWriteDiff(filePath, content, _isNew) {
+export function generateWriteDiff(_filePath, content, _isNew) {
     const lines = content.split('\n');
     const diffLines = [];
-    // Show first few lines as preview
-    const previewLines = Math.min(lines.length, 10);
-    for (let i = 0; i < previewLines; i++) {
+    for (let i = 0; i < lines.length; i++) {
         const lineNum = String(i + 1).padStart(6);
         diffLines.push(formatAddedLine(lineNum, lines[i]));
     }
-    if (lines.length > previewLines) {
-        const s = getStyles();
-        diffLines.push(s.muted(`       ... ${String(lines.length - previewLines)} more lines`));
-    }
     return {
         lines: diffLines,
         additions: lines.length,

package/dist/ui/ephemeral.js

@@ -11,6 +11,7 @@
 import chalk from 'chalk';
 import { getStyles } from '../themes/index.js';
 import * as terminal from './terminal.js';
+import { formatTokens } from './base/index.js';
 import { formatPendingMessage } from './conversation.js';
 // Note: This file is deprecated but kept for reference.
 // All pc.* calls below have been converted to use getStyles() for theme support.
@@ -59,15 +60,6 @@ function formatDuration(ms) {
     const remainingSeconds = seconds % 60;
     return `${String(minutes)}m ${String(remainingSeconds)}s`;
 }
-/**
- * Format token count (e.g., "1.2k", "500")
- */
-function formatTokens(tokens) {
-    if (tokens >= 1000) {
-        return `${(tokens / 1000).toFixed(1)}k`;
-    }
-    return tokens.toString();
-}
 /**
  * Render todo list with visual styling
  */
@@ -129,6 +121,8 @@ export class EphemeralZone {
         this.state.spinner = {
             text: this.thinkingWord,
             tokens: 0,
+            inputTokens: 0,
+            outputTokens: 0,
             startTime: Date.now(),
         };
         // Start animation

package/dist/ui/file-autocomplete.d.ts

@@ -39,6 +39,30 @@ export declare function replaceAtMention(input: string, cursorPos: number, compl
     input: string;
     cursorPos: number;
 };
+/**
+ * Extract the $ mention being typed at the cursor position
+ * Returns the partial text after $ if in a $ context, null otherwise
+ *
+ * @param input - The current line text
+ * @param cursorPos - Current cursor position within the line
+ * @returns The partial agent name after $, or null if not in $ context
+ */
+export declare function extractDollarMention(input: string, cursorPos: number): {
+    partial: string;
+    startPos: number;
+} | null;
+/**
+ * Replace the $ mention with completed agent name
+ *
+ * @param input - Full input text
+ * @param cursorPos - Current cursor position
+ * @param agentId - The completed agent ID to insert
+ * @returns New input text and new cursor position
+ */
+export declare function replaceDollarMention(input: string, cursorPos: number, agentId: string): {
+    input: string;
+    cursorPos: number;
+};
 /**
  * Clear the file cache (call when cwd changes)
  */

package/dist/ui/file-autocomplete.js

@@ -228,6 +228,62 @@ export function replaceAtMention(input, cursorPos, completedPath) {
     const newCursorPos = atPos + 1 + completedPath.length;
     return { input: newInput, cursorPos: newCursorPos };
 }
+/**
+ * Extract the $ mention being typed at the cursor position
+ * Returns the partial text after $ if in a $ context, null otherwise
+ *
+ * @param input - The current line text
+ * @param cursorPos - Current cursor position within the line
+ * @returns The partial agent name after $, or null if not in $ context
+ */
+export function extractDollarMention(input, cursorPos) {
+    // Look backwards from cursor to find $
+    let start = cursorPos - 1;
+    while (start >= 0) {
+        const char = input[start];
+        // Found $
+        if (char === '$') {
+            // Make sure it's at start or after whitespace
+            if (start === 0 || /\s/.test(input[start - 1])) {
+                return {
+                    partial: input.slice(start + 1, cursorPos),
+                    startPos: start,
+                };
+            }
+            return null;
+        }
+        // Hit whitespace without finding $ - not in $ context
+        if (/\s/.test(char)) {
+            return null;
+        }
+        start--;
+    }
+    return null;
+}
+/**
+ * Replace the $ mention with completed agent name
+ *
+ * @param input - Full input text
+ * @param cursorPos - Current cursor position
+ * @param agentId - The completed agent ID to insert
+ * @returns New input text and new cursor position
+ */
+export function replaceDollarMention(input, cursorPos, agentId) {
+    // Find the $ position
+    let dollarPos = cursorPos - 1;
+    while (dollarPos >= 0 && input[dollarPos] !== '$') {
+        dollarPos--;
+    }
+    if (dollarPos < 0) {
+        return { input, cursorPos };
+    }
+    // Replace from $ to cursor with the completed agent + space
+    const before = input.slice(0, dollarPos);
+    const after = input.slice(cursorPos);
+    const newInput = `${before}$${agentId} ${after}`;
+    const newCursorPos = dollarPos + 1 + agentId.length + 1; // +1 for $ +1 for space
+    return { input: newInput, cursorPos: newCursorPos };
+}
 /**
  * Clear the file cache (call when cwd changes)
  */

package/dist/ui/footer-renderer.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Footer renderer.
+ *
+ * Extracted from TerminalUI — owns render state (line height tracking,
+ * spinner animation) and the render pipeline (clear, render, line builders).
+ * Reads application state through the host's getRenderData() snapshot.
+ */
+import type { TodoItem, AgentMode } from './types.js';
+import type { TerminalUIConfig } from './terminal-types.js';
+import type { TurnMetrics } from './turn-metrics.js';
+import type { StatusBarController } from './status-bar-controller.js';
+import type { AutocompleteController } from './autocomplete-controller.js';
+import type { LiveRegion } from './live-region.js';
+export interface FooterRendererHost {
+    /** Check if footer rendering should proceed. */
+    isFooterRenderAllowed(): boolean;
+    /** Build a snapshot of application state for the render pipeline. */
+    getRenderData(): FooterRenderData;
+}
+export interface FooterRenderData {
+    liveRegion: LiveRegion;
+    liveVerbose: boolean;
+    agentRunning: boolean;
+    currentTool: string | null;
+    spinnerText: string | null;
+    activeBashInfo: {
+        toolUseId: string;
+        startTime: number;
+    } | null;
+    turnMetrics: TurnMetrics;
+    todos: TodoItem[];
+    showTodos: boolean;
+    lines: readonly string[];
+    currentLine: number;
+    cursorPos: number;
+    queuedInputs: readonly string[];
+    suggestion: string | null;
+    promptPrefix: string;
+    promptPrefixLen: number;
+    ac: AutocompleteController;
+    statusBar: StatusBarController;
+    mode: AgentMode;
+    activePlanName: string | null;
+    activeTeamAgent: {
+        id: string;
+        displayName: string;
+        mascot: string;
+    } | null;
+    projectName: string | null;
+    conversationFilterActive: boolean;
+    hasRestoredHistory: boolean;
+    config: TerminalUIConfig;
+}
+export declare class FooterRenderer {
+    private lastRenderHeight;
+    private cursorLineFromBottom;
+    private spinnerFrame;
+    private spinnerTimer;
+    private readonly spinnerFrames;
+    private readonly host;
+    constructor(host: FooterRendererHost);
+    clear(): void;
+    render(): void;
+    resetRenderState(): void;
+    startSpinnerAnimation(onTick: () => void): void;
+    stopSpinnerAnimation(): void;
+    private buildSpinnerLine;
+    private buildModeLine;
+}