cc-reviewer 1.3.6 → 1.5.1

package/dist/adapters/codex.js

@@ -228,12 +228,17 @@ export class CodexAdapter {
             if (schemaFile) {
                 args.push('--output-schema', schemaFile);
             }
-            args.push(prompt);
+            // Use '-' to read prompt from stdin — more stable for complex prompts
+            // with newlines, backticks, JSON templates, etc.
+            args.push('-');
             const proc = spawn('codex', args, {
                 cwd: workingDir,
-                stdio: ['ignore', 'pipe', 'pipe'],
+                stdio: ['pipe', 'pipe', 'pipe'], // stdin is pipe for prompt delivery
                 env: { ...process.env }
             });
+            // Deliver prompt via stdin
+            proc.stdin.write(prompt);
+            proc.stdin.end();
             let stdout = '';
             let stderr = '';
             let truncated = false;

package/dist/adapters/gemini.js

@@ -12,7 +12,7 @@ import { buildSimpleHandoff, buildHandoffPrompt, selectRole, } from '../handoff.
 // =============================================================================
 // CONFIGURATION
 // =============================================================================
-const INACTIVITY_TIMEOUT_MS = 120000; // 2 min of no output = timeout
+const INACTIVITY_TIMEOUT_MS = 600000; // 10 min of no output = timeout (Gemini buffers entire response with --output-format json)
 const MAX_TIMEOUT_MS = 3600000; // 60 min absolute max
 const MAX_RETRIES = 2;
 const MAX_BUFFER_SIZE = 1024 * 1024; // 1MB max buffer
@@ -136,15 +136,16 @@ export class GeminiAdapter {
                     executionTimeMs: Date.now() - startTime,
                 };
             }
-            // If we used fallback and got minimal data, retry
-            if (usedFallback && attempt < MAX_RETRIES) {
+            // If output has no substantive data, retry regardless of parse path
+            if (attempt < MAX_RETRIES) {
                 const hasMinimalData = output.findings.length === 0 &&
                     output.agreements.length === 0 &&
-                    output.disagreements.length === 0 &&
-                    output.risk_assessment.summary === 'Unable to parse structured risk assessment';
+                    output.disagreements.length === 0;
                 if (hasMinimalData) {
-                    console.error(`[gemini] Received incomplete output (fallback parse with no data), retrying...`);
-                    return this.runWithRetry(request, attempt + 1, startTime, 'Received markdown output instead of JSON. Please provide valid JSON output.', result.stdout);
+                    console.error(`[gemini] Received empty output, retrying...`);
+                    return this.runWithRetry(request, attempt + 1, startTime, usedFallback
+                        ? 'Received markdown output instead of JSON. Please provide valid JSON output.'
+                        : 'Output contained no findings, agreements, or disagreements. Please provide substantive review.', result.stdout);
                 }
             }
             return {
@@ -172,7 +173,7 @@ export class GeminiAdapter {
                     success: false,
                     error: {
                         type: 'timeout',
-                        message: 'No output for 2 minutes - process may be hung',
+                        message: 'No output for 10 minutes - process may be hung',
                     },
                     suggestion: 'Try a smaller scope or use --focus',
                     executionTimeMs: Date.now() - startTime,
@@ -201,18 +202,22 @@ export class GeminiAdapter {
     }
     runCli(prompt, workingDir) {
         return new Promise((resolve, reject) => {
-            // Gemini CLI uses positional prompt and --yolo for auto-approval
+            // Gemini CLI uses --yolo for auto-approval, prompt passed via stdin
+            // to avoid escaping issues with complex prompts containing newlines,
+            // backticks, JSON templates, etc.
             const args = [
                 '--yolo',
                 '--output-format', 'json', // Force JSON output
                 '--include-directories', workingDir,
-                prompt
             ];
             const proc = spawn('gemini', args, {
                 cwd: workingDir,
-                stdio: ['ignore', 'pipe', 'pipe'],
+                stdio: ['pipe', 'pipe', 'pipe'], // stdin is pipe for prompt delivery
                 env: { ...process.env }
             });
+            // Deliver prompt via stdin — more stable than args for complex content
+            proc.stdin.write(prompt);
+            proc.stdin.end();
             let stdout = '';
             let stderr = '';
             let truncated = false;

package/dist/schema.js

@@ -225,6 +225,59 @@ export function getReviewOutputJsonSchema() {
         }
     };
 }
+/**
+ * Normalize reviewer output that deviates from the strict schema.
+ * Handles common patterns from external CLIs (e.g. Gemini returning
+ * agreements as strings instead of objects, missing required fields).
+ */
+function normalizeReviewOutput(parsed) {
+    const normalized = { ...parsed };
+    // Default reviewer if missing
+    if (!normalized.reviewer) {
+        normalized.reviewer = 'external';
+    }
+    // Normalize agreements: string[] -> Agreement[]
+    if (Array.isArray(normalized.agreements)) {
+        normalized.agreements = normalized.agreements.map((a) => {
+            if (typeof a === 'string') {
+                return { original_claim: a, assessment: 'correct', confidence: 0.7 };
+            }
+            return a;
+        });
+    }
+    else {
+        normalized.agreements = normalized.agreements ?? [];
+    }
+    // Default missing arrays
+    normalized.disagreements = normalized.disagreements ?? [];
+    normalized.alternatives = normalized.alternatives ?? [];
+    normalized.findings = normalized.findings ?? [];
+    // Normalize risk_assessment from simplified formats
+    if (!normalized.risk_assessment) {
+        const ra = normalized.risk_assessment;
+        normalized.risk_assessment = {
+            overall_level: 'medium',
+            score: 50,
+            summary: 'Risk assessment not provided by reviewer',
+            top_concerns: [],
+        };
+    }
+    else if (typeof normalized.risk_assessment === 'object') {
+        const ra = normalized.risk_assessment;
+        // Handle "level" instead of "overall_level", with case normalization
+        if (ra.level && !ra.overall_level) {
+            ra.overall_level = typeof ra.level === 'string' ? ra.level.toLowerCase() : ra.level;
+        }
+        else if (typeof ra.overall_level === 'string') {
+            ra.overall_level = ra.overall_level.toLowerCase();
+        }
+        // Default missing fields
+        ra.score = ra.score ?? 50;
+        ra.summary = ra.summary ?? 'No summary provided';
+        ra.top_concerns = ra.top_concerns ?? [];
+    }
+    return normalized;
+}
 /**
  * Attempt to parse and validate reviewer output.
  * Returns the validated output or null if invalid.
@@ -233,8 +286,20 @@ export function parseReviewOutput(rawOutput) {
     try {
         // Try to extract JSON from the output (may be wrapped in markdown code blocks)
         let jsonStr = rawOutput;
+        // Gemini CLI with --output-format json wraps the response in an envelope:
+        // { "session_id": "...", "response": "```json\n{...}\n```" }
+        // Try to unwrap this envelope first, but only if it matches the envelope shape.
+        try {
+            const envelope = JSON.parse(rawOutput);
+            if (envelope && typeof envelope.session_id === 'string' && typeof envelope.response === 'string') {
+                jsonStr = envelope.response;
+            }
+        }
+        catch {
+            // Not a valid JSON envelope, continue with raw output
+        }
         // Extract from ```json ... ``` blocks
-        const jsonBlockMatch = rawOutput.match(/```(?:json)?\s*([\s\S]*?)```/);
+        const jsonBlockMatch = jsonStr.match(/```(?:json)?\s*([\s\S]*?)```/);
         if (jsonBlockMatch) {
             jsonStr = jsonBlockMatch[1].trim();
         }
@@ -245,7 +310,25 @@ export function parseReviewOutput(rawOutput) {
             jsonStr = jsonStr.slice(jsonStart, jsonEnd + 1);
         }
         const parsed = JSON.parse(jsonStr);
-        return ReviewOutput.parse(parsed);
+        // Try direct parse first
+        const result = ReviewOutput.safeParse(parsed);
+        if (result.success) {
+            return result.data;
+        }
+        // Normalize common deviations from external CLIs (e.g. Gemini)
+        // Only attempt if parsed object has at least one recognizable review field
+        const recognizedFields = ['findings', 'agreements', 'disagreements', 'alternatives', 'risk_assessment', 'reviewer'];
+        const hasRecognizedField = typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed) &&
+            recognizedFields.some(f => f in parsed);
+        if (!hasRecognizedField) {
+            return null;
+        }
+        const normalized = normalizeReviewOutput(parsed);
+        const retryResult = ReviewOutput.safeParse(normalized);
+        if (retryResult.success) {
+            return retryResult.data;
+        }
+        return null;
     }
     catch {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-reviewer",
-  "version": "1.3.6",
+  "version": "1.5.1",
   "description": "MCP server for Claude Code - Get second-opinion feedback from Codex/Gemini CLIs",
   "type": "module",
   "main": "dist/index.js",