proofscan 0.10.62 → 0.11.1

package/dist/shell/repl.js

@@ -5,11 +5,12 @@ import * as readline from 'readline';
 import { spawn } from 'child_process';
 import { SHELL_BUILTINS, TOP_LEVEL_COMMANDS, ROUTER_COMMANDS, BLOCKED_IN_SHELL, BLOCKED_SUBCOMMANDS_IN_SHELL, DEFAULT_COMPLETION_LIMIT, } from './types.js';
 import { applyContext } from './context-applicator.js';
-import { handleCc, handleUp, handlePwd, handleLs, handleShow, } from './router-commands.js';
+import { handleCc, handleUp, handlePwd, handleLs, handleShow, handleA2ASend, handleHistory, } from './router-commands.js';
 import { generatePrompt, printSuccess, printError, printInfo, shortenSessionId } from './prompt.js';
 import { loadHistory, saveHistory, addToHistory } from './history.js';
 import { createCompleter } from './completer.js';
 import { EventLineStore } from '../eventline/store.js';
+import { TargetsStore } from '../db/targets-store.js';
 import { ConfigManager } from '../config/index.js';
 import { getCurrentSession, clearCurrentSession, } from '../utils/state.js';
 import { handleTool, handleSend } from './tool-commands.js';
@@ -93,6 +94,35 @@ export class ShellRepl {
         this.rpcsCache.clear();
         this.poplEntriesCache = null;
     }
+    /**
+     * Get all connector IDs (MCP connectors with sessions + A2A agents)
+     * Note: This is synchronous for readline completer compatibility.
+     * Agent IDs are loaded asynchronously and cached.
+     */
+    getAllConnectorIds(configDir) {
+        const now = Date.now();
+        if (this.connectorsCache && this.connectorsCache.expiry > now) {
+            return this.connectorsCache.data;
+        }
+        try {
+            const store = new EventLineStore(configDir);
+            const sessionIds = store.getConnectors().map(c => c.id);
+            // Also include A2A agents from TargetsStore (loaded synchronously via static import)
+            let agentIds = [];
+            try {
+                const ts = new TargetsStore(configDir);
+                agentIds = ts.list({ type: 'agent' }).map((a) => a.id);
+            }
+            catch { /* ignore if TargetsStore unavailable */ }
+            // Merge and deduplicate
+            const ids = [...new Set([...sessionIds, ...agentIds])];
+            this.connectorsCache = { data: ids, expiry: now + CACHE_TTL_MS };
+            return ids;
+        }
+        catch {
+            return [];
+        }
+    }
     /**
      * Get data provider for configure mode completions
      */
@@ -100,21 +130,7 @@ export class ShellRepl {
         const manager = new ConfigManager(this.configPath);
         const configDir = manager.getConfigDir();
         return {
-            getConnectorIds: () => {
-                const now = Date.now();
-                if (this.connectorsCache && this.connectorsCache.expiry > now) {
-                    return this.connectorsCache.data;
-                }
-                try {
-                    const store = new EventLineStore(configDir);
-                    const ids = store.getConnectors().map(c => c.id);
-                    this.connectorsCache = { data: ids, expiry: now + CACHE_TTL_MS };
-                    return ids;
-                }
-                catch {
-                    return [];
-                }
-            },
+            getConnectorIds: () => this.getAllConnectorIds(configDir),
         };
     }
     /**
@@ -124,21 +140,7 @@ export class ShellRepl {
         const manager = new ConfigManager(this.configPath);
         const configDir = manager.getConfigDir();
         return {
-            getConnectorIds: () => {
-                const now = Date.now();
-                if (this.connectorsCache && this.connectorsCache.expiry > now) {
-                    return this.connectorsCache.data;
-                }
-                try {
-                    const store = new EventLineStore(configDir);
-                    const ids = store.getConnectors().map(c => c.id);
-                    this.connectorsCache = { data: ids, expiry: now + CACHE_TTL_MS };
-                    return ids;
-                }
-                catch {
-                    return [];
-                }
-            },
+            getConnectorIds: () => this.getAllConnectorIds(configDir),
             getSessionPrefixes: (connectorId, limit = DEFAULT_COMPLETION_LIMIT) => {
                 const now = Date.now();
                 const cacheKey = `${connectorId || '*'}:${limit}`;
@@ -314,13 +316,34 @@ export class ShellRepl {
             await handleTool(args, this.context, this.configPath);
             return;
         }
-        // Handle send command (shell-native with interactive input)
+        // Handle history command (A2A session message history)
+        if (command === 'history') {
+            await handleHistory(args, this.context, this.configPath);
+            return;
+        }
+        // Handle send command (A2A or MCP tool)
         if (command === 'send') {
-            if (!this.rl) {
-                printError('Shell not initialized');
-                return;
+            // Check if current target is an A2A agent
+            let isA2A = false;
+            if (this.context.connector) {
+                try {
+                    const configDir = this.configPath.replace(/\/[^/]+$/, '');
+                    const { TargetsStore } = await import('../db/targets-store.js');
+                    const ts = new TargetsStore(configDir);
+                    isA2A = ts.list({ type: 'agent' }).some(a => a.id === this.context.connector);
+                }
+                catch { /* ignore */ }
+            }
+            if (isA2A) {
+                await handleA2ASend(args, this.context, this.configPath);
+            }
+            else {
+                if (!this.rl) {
+                    printError('Shell not initialized');
+                    return;
+                }
+                await handleSend(args, this.context, this.configPath, this.rl);
             }
-            await handleSend(args, this.context, this.configPath, this.rl);
             return;
         }
         // Handle ref command (shell-native)
@@ -382,6 +405,9 @@ export class ShellRepl {
             case 'find':
                 await this.handleFind(args);
                 break;
+            case 'history':
+                await handleHistory(args, this.context, this.configPath);
+                break;
         }
     }
     /**
@@ -480,6 +506,12 @@ Session Control:
   clear             Clear screen
   exit              Exit shell
 
+A2A Session Commands:
+  history           Show message history (A2A sessions only)
+    history -n 20   Show last 20 messages
+    history --role user  Show only user messages
+    history --search <query>  Search messages
+
 CLI Commands (also available here):
   view, tree, scan, summary, rpc, analyze, tool
   config, connectors, secrets, catalog, archive, doctor
@@ -589,6 +621,13 @@ Session Control:
   clear                   Clear screen
   exit, quit              Exit shell
 
+A2A Session Commands (history):
+  history                 Show A2A message history
+    history -n <count>    Show last N messages (default: 100)
+    history --role user   Show only user messages
+    history --role assistant  Show only assistant messages
+    history --search <query>  Search messages by text
+
 CLI Commands (passthrough to pfscan):
   view (v)          View recent events timeline (use -f for follow mode)
   tree (t)          Show connector/session/RPC structure
@@ -655,6 +694,38 @@ Tips:
             rest: trimmed.slice(spaceIdx + 1), // Keep rest as raw string
         };
     }
+    /**
+     * Check if an expression is a simple text (not a filter expression)
+     * Returns true if expression does not contain filter operators with proper context.
+     * Uses regex to avoid false positives like "<script>" or "a!=b" in text.
+     */
+    isSimpleTextSearch(expr) {
+        const trimmed = expr.trim();
+        // Pattern matches operators surrounded by whitespace or at string boundaries
+        // This prevents false positives like "<script>" or "5==5" in search text
+        const operatorPattern = /(?:^|\s)(==|!=|~=|>=?|<=?)(?:\s|$)/;
+        return !operatorPattern.test(trimmed);
+    }
+    /**
+     * Convert simple text search to appropriate filter expression based on row type
+     */
+    textToFilterExpr(text, rowType) {
+        const trimmed = text.trim();
+        // Escape backslashes first, then quotes (order matters!)
+        const escaped = trimmed.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        switch (rowType) {
+            case 'a2a-message':
+                return `message.content ~= "${escaped}"`;
+            case 'rpc':
+                // For now, search in method name (could be expanded later)
+                return `rpc.method ~= "${escaped}"`;
+            case 'session':
+                return `session.id ~= "${escaped}"`;
+            default:
+                // Default to searching in common text fields
+                return `message.content ~= "${escaped}"`;
+        }
+    }
     /**
      * Handle piped commands
      * Supports:
@@ -671,8 +742,13 @@ Tips:
         }
         // Extract command name from right side (preserving raw args for where/grep)
         const { cmd: rightCommand, rest: rawArgs } = this.extractCommand(rightCmd);
-        // Handle: ls | where <filter-expr> or ls | grep <filter-expr>
-        if (rightCommand === 'where' || rightCommand === 'grep') {
+        // Handle: ls | grep <text> (text search with auto-conversion)
+        if (rightCommand === 'grep') {
+            await this.handlePipeToGrep(leftCmd, rawArgs);
+            return;
+        }
+        // Handle: ls | where <filter-expr>
+        if (rightCommand === 'where') {
             await this.handlePipeToWhere(leftCmd, rawArgs);
             return;
         }
@@ -698,6 +774,7 @@ Tips:
         printInfo('  pwd --json | ref add <name>');
         printInfo('  show @rpc:<id> --json | inscribe');
         printInfo('  ls | where <filter-expr>');
+        printInfo('  ls | grep <text>');
         printInfo('  find rpc | where <filter-expr>');
         printInfo('  ls | less');
         printInfo('  find rpc | more');
@@ -740,11 +817,18 @@ Tips:
             input = findResult.result;
             statsLabel = `rows (across ${findResult.stats.sessions} sessions)`;
         }
+        else if (leftCommand === 'history') {
+            // Get history rows
+            const { getHistoryRows } = await import('./router-commands.js');
+            input = getHistoryRows(this.context, this.configPath);
+            statsLabel = 'messages';
+        }
         else {
-            printError('where/grep only supports "ls" or "find" as input');
+            printError('where/grep only supports "ls", "find", or "history" as input');
             printInfo('Examples:');
             printInfo('  ls | where rpc.method == "tools/call"');
             printInfo('  find rpc | where tools.name ~= "read"');
+            printInfo('  history | where role == "user"');
             return;
         }
         // Apply where filter
@@ -761,6 +845,79 @@ Tips:
         this.renderPipelineOutput(result.result);
         printInfo(`${statsLabel}: ${result.stats.matched} / ${result.stats.total}`);
     }
+    /**
+     * Handle: ls | grep <text> or history | grep <text>
+     * Auto-converts simple text to appropriate filter expression based on row type
+     */
+    async handlePipeToGrep(leftCmd, expr) {
+        const leftTokens = leftCmd.trim().split(/\s+/);
+        const leftCommand = leftTokens[0];
+        // Get pipeline input based on left command
+        let input;
+        let statsLabel;
+        if (leftCommand === 'ls') {
+            // Get ls rows
+            const { getLsRows } = await import('./router-commands.js');
+            input = getLsRows(this.context, this.configPath);
+            // Connector level is not supported for ls
+            if (input.kind === 'rows' && input.rowType === 'connector') {
+                printError('grep is not supported for connectors');
+                printInfo('Navigate to a connector first: cd <connector-id>');
+                return;
+            }
+            statsLabel = 'rows';
+        }
+        else if (leftCommand === 'find') {
+            // Parse find args
+            const findArgs = leftTokens.slice(1);
+            const parseResult = parseFindArgs(findArgs);
+            if (!parseResult.ok) {
+                printError(parseResult.error);
+                return;
+            }
+            const findResult = executeFind(this.context, this.configPath, parseResult.options);
+            if (!findResult.ok) {
+                printError(findResult.error);
+                return;
+            }
+            input = findResult.result;
+            statsLabel = `rows (across ${findResult.stats.sessions} sessions)`;
+        }
+        else if (leftCommand === 'history') {
+            // Get history rows
+            const { getHistoryRows } = await import('./router-commands.js');
+            input = getHistoryRows(this.context, this.configPath);
+            statsLabel = 'messages';
+        }
+        else {
+            printError('grep only supports "ls", "find", or "history" as input');
+            printInfo('Examples:');
+            printInfo('  ls | grep "tools/call"');
+            printInfo('  find rpc | grep "read"');
+            printInfo('  history | grep "d20"');
+            return;
+        }
+        // Convert simple text to filter expression if needed
+        let filterExpr = expr;
+        if (this.isSimpleTextSearch(expr)) {
+            if (input.kind === 'rows') {
+                filterExpr = this.textToFilterExpr(expr, input.rowType);
+            }
+        }
+        // Apply where filter
+        const { applyWhere } = await import('./where-command.js');
+        const result = applyWhere(input, filterExpr);
+        if (!result.ok) {
+            printError(`Filter error: ${result.error}`);
+            if (result.position !== undefined) {
+                printError(`  at position ${result.position + 1}`);
+            }
+            return;
+        }
+        // Render output
+        this.renderPipelineOutput(result.result);
+        printInfo(`${statsLabel}: ${result.stats.matched} / ${result.stats.total}`);
+    }
     /**
      * Handle: ls | less or find rpc | more
      */
@@ -793,11 +950,16 @@ Tips:
             }
             input = findResult.result;
         }
+        else if (leftCommand === 'history') {
+            const { getHistoryRows } = await import('./router-commands.js');
+            input = getHistoryRows(this.context, this.configPath);
+        }
         else {
-            printError(`${pagerCmd} only supports "ls" or "find" as input`);
+            printError(`${pagerCmd} only supports "ls", "find", or "history" as input`);
             printInfo('Examples:');
             printInfo('  ls | less');
             printInfo('  find rpc | less');
+            printInfo('  history | less');
             return;
         }
         // Text input is an error
@@ -805,17 +967,25 @@ Tips:
             printError(`${pagerCmd} expects structured rows; got text`);
             return;
         }
-        // Close readline before pager to avoid stdin conflicts
-        // External pager uses stdio: ['pipe', inherit, inherit] so no stdin conflict,
-        // but built-in fallback uses raw mode which conflicts with readline
-        this.rl?.close();
-        this.rl = null;
+        // Empty rows - print message and return without pager
+        if (input.rows.length === 0) {
+            printInfo('No results');
+            return;
+        }
+        // Pause readline instead of closing it to avoid listener conflicts
+        // This prevents the race condition between old and new readline listeners
+        if (this.rl) {
+            this.rl.pause();
+        }
         // Run pager
         const { LessPager, MorePager } = await import('./pager/index.js');
         const pager = pagerCmd === 'less' ? new LessPager() : new MorePager();
         await pager.run(input);
-        // Recreate readline after pager exits
-        this.resetReadline();
+        // Resume readline after pager completes
+        if (this.rl) {
+            this.rl.resume();
+            this.rl.prompt();
+        }
     }
     /**
      * Reset readline interface (recreate after pager or other stdin-consuming operations)
@@ -823,9 +993,24 @@ Tips:
     resetReadline() {
         // Close existing readline interface to prevent duplicate input
         if (this.rl) {
+            // Remove close listener to prevent "Goodbye!" message when closing for reset
+            this.rl.removeAllListeners('close');
             this.rl.removeAllListeners();
             this.rl.close();
         }
+        // Ensure stdin is in correct state before creating new readline
+        if (process.stdin.isPaused()) {
+            process.stdin.resume();
+        }
+        // Ensure stdin is not in raw mode
+        if (process.stdin.isTTY && process.stdin.setRawMode) {
+            try {
+                process.stdin.setRawMode(false);
+            }
+            catch {
+                // Ignore errors if already not in raw mode
+            }
+        }
         // Choose completer based on mode
         const completer = this.configureMode?.isActive()
             ? createConfigureCompleter(this.configureMode, this.getConfigureDataProvider())
@@ -901,6 +1086,55 @@ Tips:
         else if (output.rowType === 'session') {
             this.renderSessionTable(output.rows, isTTY);
         }
+        else if (output.rowType === 'a2a-message') {
+            this.renderA2AMessageTable(output.rows, isTTY);
+        }
+    }
+    /**
+     * Render A2A message rows as table
+     */
+    renderA2AMessageTable(rows, isTTY) {
+        const dimText = (text) => isTTY ? `\x1b[2m${text}\x1b[0m` : text;
+        const roleColor = (role) => {
+            if (!isTTY)
+                return role;
+            return role === 'assistant' ? `\x1b[36m${role}\x1b[0m` : role;
+        };
+        // Check if rows have session_id (connector level)
+        const hasSession = rows.some(r => r.session_id);
+        console.log();
+        if (hasSession) {
+            console.log(dimText('#'.padEnd(4)) + '  ' +
+                dimText('Session'.padEnd(10)) + '  ' +
+                dimText('Time'.padEnd(10)) + '  ' +
+                dimText('Role'.padEnd(12)) + '  ' +
+                dimText('Content'));
+            console.log(dimText('-'.repeat(80)));
+            rows.forEach(row => {
+                const sessionPrefix = row.session_id ? row.session_id.slice(0, 8) : '';
+                const timeStr = row.timestamp ? row.timestamp.slice(11, 19) : '--:--:--';
+                console.log(String(row.id).padEnd(4) + '  ' +
+                    sessionPrefix.padEnd(10) + '  ' +
+                    timeStr.padEnd(10) + '  ' +
+                    roleColor(row.role).padEnd(isTTY ? 21 : 12) + '  ' +
+                    row.content);
+            });
+        }
+        else {
+            console.log(dimText('#'.padEnd(4)) + '  ' +
+                dimText('Time'.padEnd(10)) + '  ' +
+                dimText('Role'.padEnd(12)) + '  ' +
+                dimText('Content'));
+            console.log(dimText('-'.repeat(70)));
+            rows.forEach(row => {
+                const timeStr = row.timestamp ? row.timestamp.slice(11, 19) : '--:--:--';
+                console.log(String(row.id).padEnd(4) + '  ' +
+                    timeStr.padEnd(10) + '  ' +
+                    roleColor(row.role).padEnd(isTTY ? 21 : 12) + '  ' +
+                    row.content);
+            });
+        }
+        console.log();
     }
     /**
      * Render RPC rows as table
@@ -917,7 +1151,7 @@ Tips:
             }
         };
         // Check if rows have connector_id (find results have it, ls does not)
-        const hasConnector = rows.some(r => r.connector_id);
+        const hasConnector = rows.some(r => r.target_id);
         console.log();
         if (hasConnector) {
             // Extended format for find results: Connector, Session, Method, Status, Latency, Time
@@ -929,7 +1163,7 @@ Tips:
                 dimText('Time'));
             console.log(dimText('-'.repeat(90)));
             rows.forEach((row) => {
-                const connector = (row.connector_id ?? '').slice(0, 10).padEnd(10);
+                const connector = (row.target_id ?? '').slice(0, 10).padEnd(10);
                 const sessionShort = shortenSessionId(row.session_id);
                 const method = row.method.slice(0, 16).padEnd(16);
                 const status = statusColor(row.status).padEnd(isTTY ? 16 : 8);
@@ -962,7 +1196,7 @@ Tips:
     renderSessionTable(rows, isTTY) {
         const dimText = (text) => isTTY ? `\x1b[2m${text}\x1b[0m` : text;
         // Check if rows span multiple connectors (find at root level)
-        const connectorIds = new Set(rows.map(r => r.connector_id));
+        const connectorIds = new Set(rows.map(r => r.target_id));
         const multiConnector = connectorIds.size > 1;
         console.log();
         if (multiConnector) {
@@ -973,7 +1207,7 @@ Tips:
                 dimText('Started'));
             console.log(dimText('-'.repeat(55)));
             rows.forEach((row) => {
-                const connector = (row.connector_id ?? '').slice(0, 12).padEnd(12);
+                const connector = (row.target_id ?? '').slice(0, 12).padEnd(12);
                 const sessionShort = shortenSessionId(row.session_id);
                 const rpcs = String(row.rpc_count).padEnd(6);
                 const started = row.started_at ? row.started_at.slice(0, 19).replace('T', ' ') : '-';