vigthoria-cli 1.6.45 → 1.6.46

package/dist/commands/chat.d.ts

@@ -150,8 +150,9 @@ export declare class ChatCommand {
     private resolveDirectModeCompletion;
     /**
      * Strip system-prompt echoes, tool execution headers, grounding-rule
-     * parroting, and recovery banners from the model's final answer so that
-     * --json output contains only the substantive answer.
+     * parroting, recovery banners, and multi-line tool output blocks from
+     * the model's final answer so that --json output contains only the
+     * substantive answer.
      */
     private sanitizeDirectModeOutput;
     private isDirectModeFollowUpQuestion;

package/dist/commands/chat.js

@@ -2165,48 +2165,78 @@ class ChatCommand {
     }
     /**
      * Strip system-prompt echoes, tool execution headers, grounding-rule
-     * parroting, and recovery banners from the model's final answer so that
-     * --json output contains only the substantive answer.
+     * parroting, recovery banners, and multi-line tool output blocks from
+     * the model's final answer so that --json output contains only the
+     * substantive answer.
      */
     sanitizeDirectModeOutput(text) {
-        // Lines the model might echo verbatim from our system/continuation prompts
+        let cleaned = text;
+        // ── Phase 1: Strip entire multi-line tool-output blocks ──
+        // Pattern: "Tool <name> succeeded/FAILED." followed by optional
+        // metadata lines (File:, Search status:, Output:) and then a
+        // content block until the next double-newline or end-of-string.
+        cleaned = cleaned.replace(/Tool (?:read_file|grep|list_dir|glob|bash|write_file) (?:succeeded|FAILED)\.[\s\S]*?(?=\n\n[A-Z_]+:|$)/g, '');
+        // Fallback: simpler block pattern for any remaining tool headers
+        cleaned = cleaned.replace(/Tool (?:read_file|grep|list_dir|glob|bash|write_file) (?:succeeded|FAILED)\.[\s\S]*?(?:\n\n|\s*$)/g, '');
+        // ── Phase 2: Strip echoed system-prompt / grounding lines ──
         const contaminationPatterns = [
             /^\[Agent recovered from backend failure[^\]]*\]\s*/m,
             /^Evidence gathered before backend failure:?\s*/m,
-            /^MANDATORY CROSS-FILE EVIDENCE \(computed from actual tool output[^)]*\):?\s*/m,
-            /^CONFIRMED CONFLICTING keys \(found in MULTIPLE files\):.*$/m,
-            /^Keys found ONLY in .+\(NOT in other files\):.*$/m,
-            /^CONSTRAINT: Your answer MUST list ONLY the keys from.*$/m,
-            /^GROUNDING CHECK:.*$/m,
-            /^VERIFICATION PROTOCOL for cross-file comparisons:.*$/m,
-            /^Quality gate: only \d+ discovery tool\(s\).*$/m,
-            /^Evidence collected: \d+ discovery.*$/m,
-            /^Warning: \d+ search tool call\(s\) failed\..*$/m,
-            /^Tool (?:read_file|grep|list_dir|glob|bash|write_file) (?:succeeded|FAILED)\.\s*/m,
+            /^MANDATORY CROSS-FILE EVIDENCE[^\n]*\n?/m,
+            /^CONFIRMED CONFLICTING keys[^\n]*/m,
+            /^Keys found ONLY in [^\n]*/m,
+            /^CONSTRAINT: Your answer MUST[^\n]*/m,
+            /^GROUNDING CHECK:[^\n]*/m,
+            /^VERIFICATION PROTOCOL[^\n]*/m,
+            /^Quality gate:[^\n]*/m,
+            /^Evidence collected:[^\n]*/m,
+            /^Warning: \d+ search tool[^\n]*/m,
+            /^Tool results received for direct mode[^\n]*/m,
+            /^Original user request:[^\n]*/m,
+            /^Project root boundary:[^\n]*/m,
+            /^Do not declare success[^\n]*/m,
+            /^Keep working from concrete[^\n]*/m,
+            /^Because this is a debugging[^\n]*/m,
+            /^If the request is already[^\n]*/m,
+            /^If more work is required[^\n]*/m,
+            /^Do not ask follow-up[^\n]*/m,
+            /^CRITICAL GROUNDING RULE:[^\n]*/m,
+            /^CROSS-FILE ATTRIBUTION:[^\n]*/m,
+            /^EVIDENCE-GROUNDING RULE:[^\n]*/m,
+            /^CROSS-FILE RULE:[^\n]*/m,
+            /^OUTPUT DISCIPLINE:[^\n]*/m,
             /^File: \S+\s*$/m,
             /^Search status: \S+\s*$/m,
             /^Output:\s*$/m,
-            /^Tool results received for direct mode step \d+\.\s*$/m,
-            /^Original user request:.*$/m,
-            /^Project root boundary:.*$/m,
-            /^Do not declare success until.*$/m,
-            /^Keep working from concrete tool results\.\s*$/m,
-            /^Because this is a debugging task.*$/m,
-            /^If the request is already satisfied.*$/m,
-            /^If more work is required.*$/m,
-            /^Do not ask follow-up questions.*$/m,
-            /^CRITICAL GROUNDING RULE:.*$/m,
-            /^CROSS-FILE ATTRIBUTION:.*$/m,
-            /^EVIDENCE-GROUNDING RULE:.*$/m,
-            /^CROSS-FILE RULE:.*$/m,
             /^\[\.\.\. ?truncated\]\s*$/m,
             /^---\s*$/m,
         ];
-        let cleaned = text;
         for (const pat of contaminationPatterns) {
             cleaned = cleaned.replace(pat, '');
         }
-        // Collapse multiple blank lines left after stripping
+        // ── Phase 3: Paragraph-level filter ──
+        // Split into paragraph blocks and discard any that are pure tool
+        // output, file content dumps, or system-instruction echoes.
+        const paragraphs = cleaned.split(/\n\n+/);
+        const kept = paragraphs.filter(p => {
+            const t = p.trim();
+            if (!t)
+                return false;
+            // Discard lingering tool headers
+            if (/^Tool (?:read_file|grep|list_dir|glob|bash|write_file) /i.test(t))
+                return false;
+            // Discard paragraphs that are mostly file-content dumps (many
+            // lines of code with typical code tokens like { } ; = function class)
+            const lines = t.split('\n');
+            if (lines.length > 6) {
+                const codeLines = lines.filter(l => /[{};=]|function |class |const |let |var |import |export |switch |case /.test(l));
+                if (codeLines.length / lines.length > 0.4)
+                    return false;
+            }
+            return true;
+        });
+        cleaned = kept.join('\n\n');
+        // Collapse multiple blank lines
         cleaned = cleaned.replace(/\n{3,}/g, '\n\n').trim();
         return cleaned || text;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vigthoria-cli",
-  "version": "1.6.45",
+  "version": "1.6.46",
   "description": "Vigthoria Coder CLI - AI-powered terminal coding assistant",
   "main": "dist/index.js",
   "files": [