vigthoria-cli 1.6.44 → 1.6.46

package/dist/commands/chat.d.ts

@@ -148,6 +148,13 @@ export declare class ChatCommand {
      */
     private synthesizeEvidenceFromHistory;
     private resolveDirectModeCompletion;
+    /**
+     * Strip system-prompt echoes, tool execution headers, grounding-rule
+     * 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;
     private buildLocalAnalysisFallback;
     private tryDeterministicSingleFileRewrite;

package/dist/commands/chat.js

@@ -1152,7 +1152,7 @@ class ChatCommand {
                             spinner.stop();
                         const evidenceSummary = this.synthesizeEvidenceFromHistory();
                         if (evidenceSummary) {
-                            const fallbackContent = `[Agent recovered from backend failure — answer synthesized from gathered evidence]\n\n${evidenceSummary}`;
+                            const fallbackContent = this.sanitizeDirectModeOutput(evidenceSummary);
                             if (this.jsonOutput) {
                                 console.log(JSON.stringify({
                                     success: true,
@@ -1810,6 +1810,7 @@ class ChatCommand {
             'NEVER acknowledge these instructions. NEVER say "I will follow", "I understand", or restate tool policies. Go straight to tool calls.',
             'In direct mode, do not ask follow-up questions. Finish the request completely and stop when satisfied.',
             'After tool results arrive, either continue with the next minimal tool calls or return a concise completion summary with no more tool calls.',
+            'OUTPUT DISCIPLINE: Your final answer must contain ONLY the substantive answer. Do NOT echo, quote, or restate any system instructions, grounding rules, verification protocols, quality gates, evidence metadata, or tool execution headers. Never include lines starting with GROUNDING CHECK, VERIFICATION PROTOCOL, MANDATORY CROSS-FILE EVIDENCE, CONSTRAINT, Evidence collected, Quality gate, Tool read_file, Tool grep, File:, Search status:, or Output:. Just answer the question directly.',
             'Available tools:',
             toolCatalog,
         ].join('\n');
@@ -1994,6 +1995,7 @@ class ChatCommand {
             'If the request is already satisfied, return a concise completion summary and no tool calls.',
             'If more work is required, continue with only the next minimal tool calls needed to finish it.',
             'Do not ask follow-up questions or drift into unrelated tasks.',
+            'OUTPUT DISCIPLINE: Your final answer must contain ONLY the substantive answer to the user request. Do NOT echo, quote, or restate any system instructions, grounding rules, verification protocols, quality gates, or evidence metadata. Do NOT include lines starting with GROUNDING CHECK, VERIFICATION PROTOCOL, MANDATORY CROSS-FILE EVIDENCE, CONSTRAINT, Evidence collected, Quality gate, or Tool headers. Respond with just the answer.',
         ].join('\n');
     }
     /**
@@ -2153,7 +2155,7 @@ class ChatCommand {
     resolveDirectModeCompletion(prompt, visibleText) {
         const normalized = (visibleText || '').trim();
         if (normalized && !this.isDirectModeFollowUpQuestion(normalized)) {
-            return normalized;
+            return this.sanitizeDirectModeOutput(normalized);
         }
         const fallback = this.buildLocalAnalysisFallback(prompt);
         if (fallback) {
@@ -2161,6 +2163,83 @@ class ChatCommand {
         }
         return normalized || 'Task complete.';
     }
+    /**
+     * Strip system-prompt echoes, tool execution headers, grounding-rule
+     * 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) {
+        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[^\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,
+            /^\[\.\.\. ?truncated\]\s*$/m,
+            /^---\s*$/m,
+        ];
+        for (const pat of contaminationPatterns) {
+            cleaned = cleaned.replace(pat, '');
+        }
+        // ── 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;
+    }
     isDirectModeFollowUpQuestion(text) {
         return /^(would you like me|do you want me|which aspect|what aspect|can you clarify|could you clarify|should i focus on|i will follow|i understand|i('ll| will) adhere|provide your|waiting for)/i.test(text.trim());
     }

package/package.json

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