@overlordai/worker 1.0.173 → 1.0.175

package/dist/review-report-parser.js

@@ -0,0 +1,212 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.REVIEW_REPORT_PARSE_FAILURE_SUMMARY = void 0;
+exports.tryParseStructuredReviewReport = tryParseStructuredReviewReport;
+exports.extractJsonObjectCandidate = extractJsonObjectCandidate;
+exports.parseReviewReportOutput = parseReviewReportOutput;
+exports.extractFallbackReviewSummary = extractFallbackReviewSummary;
+exports.extractReviewReport = extractReviewReport;
+const OVERLORD_MARKER_LINE_RE = /\[\[OVERLORD:[^\n]*\]\]/g;
+const REVIEW_REPORT_PARSE_FAILURE_SUMMARY = 'Structured review report could not be parsed. Findings may be incomplete.';
+exports.REVIEW_REPORT_PARSE_FAILURE_SUMMARY = REVIEW_REPORT_PARSE_FAILURE_SUMMARY;
+const REVIEW_REPORT_PARSE_FAILURE_ISSUE = {
+    severity: 'warning',
+    file: 'report_output',
+    description: 'Review agent did not emit a valid structured report for the report stage.',
+    suggestion: 'Emit a report RESULT marker or a single valid JSON object between report START and DONE.',
+};
+// Pre-compiled regexes for noise filtering (avoid re-creation per line)
+const THINKING_LINE_RE = /^[*✢·✶✻✽]?\s*(thinking|pondering|sautéing|reasoning)\b/i;
+const EMPTY_PROMPT_RE = /^[❯›>]\s*$/;
+const BYPASS_PERMS_RE = /^[⏵❯›>]+\s*bypass\s*permissions\s*(on|off|mode)\b/i;
+function normalizeReviewSummary(summary) {
+    if (typeof summary === 'string') {
+        return summary;
+    }
+    if (summary == null) {
+        return '';
+    }
+    try {
+        return JSON.stringify(summary);
+    }
+    catch {
+        return String(summary);
+    }
+}
+function tryParseStructuredReviewReport(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(trimmed);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return null;
+        }
+        const parsedObj = parsed;
+        // Require at least one of the expected fields to avoid matching
+        // random JSON objects (e.g. {} from code snippets).
+        if (!('summary' in parsedObj) && !('issues' in parsedObj)) {
+            return null;
+        }
+        return {
+            summary: normalizeReviewSummary(parsedObj.summary),
+            issues: Array.isArray(parsedObj.issues) ? parsedObj.issues : [],
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function extractJsonObjectCandidate(raw) {
+    const firstBrace = raw.indexOf('{');
+    const lastBrace = raw.lastIndexOf('}');
+    if (firstBrace === -1 || lastBrace === -1 || firstBrace >= lastBrace) {
+        return null;
+    }
+    return raw.slice(firstBrace, lastBrace + 1).trim();
+}
+const EXAMPLE_CONTEXT_RE = /\b(?:example|schema|shape|expected\s+(?:format|json|output)|template|placeholder|sample)\b/i;
+function isLikelyExampleContext(textBeforeFence) {
+    // Check the last ~200 chars before a fence for example/schema indicators
+    return EXAMPLE_CONTEXT_RE.test(textBeforeFence);
+}
+function parseReviewReportOutput(raw, stripMarkers = false) {
+    if (!raw?.trim()) {
+        return { kind: 'empty' };
+    }
+    const base = stripMarkers ? raw.replace(OVERLORD_MARKER_LINE_RE, ' ') : raw;
+    const trimmed = base.trim();
+    if (!trimmed) {
+        return { kind: 'empty' };
+    }
+    // Detect code fences — both complete (```...```) and unterminated (```json\n{...).
+    // An unterminated fence indicates truncated output and should be treated as malformed.
+    const backtickCount = (trimmed.match(/```/g) ?? []).length;
+    const hasAnyFenceOpener = backtickCount > 0;
+    const hasUnterminatedFence = hasAnyFenceOpener && backtickCount % 2 !== 0;
+    // Try ALL complete code fences. Only accept the LAST fence that parses as a
+    // valid structured report AND is not preceded by example/schema context.
+    // Earlier fences are more likely to be diffs or schema illustrations.
+    const fenceRegex = /```(?:json)?\s*([\s\S]*?)```/gi;
+    let fenceMatch;
+    let hasCompleteFence = false;
+    let lastStructuredFromFence = null;
+    let hasAnyStructuredFence = false;
+    let previousFenceEnd = 0;
+    while ((fenceMatch = fenceRegex.exec(trimmed)) !== null) {
+        hasCompleteFence = true;
+        const fenceContent = fenceMatch[1]?.trim();
+        const currentFenceStart = fenceMatch.index;
+        if (!fenceContent) {
+            previousFenceEnd = currentFenceStart + fenceMatch[0].length;
+            continue;
+        }
+        let structured = null;
+        structured = tryParseStructuredReviewReport(fenceContent);
+        if (!structured) {
+            const extracted = extractJsonObjectCandidate(fenceContent);
+            if (extracted) {
+                structured = tryParseStructuredReviewReport(extracted);
+            }
+        }
+        if (structured) {
+            hasAnyStructuredFence = true;
+            // Check only the text BETWEEN the previous fence end and this fence
+            // start for example/schema indicators — avoids matching context from
+            // earlier unrelated fences.
+            const gapText = trimmed.slice(previousFenceEnd, currentFenceStart);
+            if (!isLikelyExampleContext(gapText)) {
+                lastStructuredFromFence = structured;
+            }
+        }
+        previousFenceEnd = currentFenceStart + fenceMatch[0].length;
+    }
+    if (lastStructuredFromFence) {
+        return { kind: 'structured', report: lastStructuredFromFence };
+    }
+    // All structured fences had example/schema context — treat as malformed
+    if (hasAnyStructuredFence) {
+        return { kind: 'malformed' };
+    }
+    // Try the full text directly (handles JSON not wrapped in a code fence)
+    const directStructured = tryParseStructuredReviewReport(trimmed);
+    if (directStructured) {
+        return { kind: 'structured', report: directStructured };
+    }
+    // Try extracting a JSON object from anywhere in the full text
+    const extractedJson = extractJsonObjectCandidate(trimmed);
+    if (extractedJson) {
+        const extractedStructured = tryParseStructuredReviewReport(extractedJson);
+        if (extractedStructured) {
+            return { kind: 'structured', report: extractedStructured };
+        }
+    }
+    // Detect failed JSON attempts — the text looks like it tried to be structured
+    // but couldn't be parsed
+    const looksStructured = hasCompleteFence || hasUnterminatedFence
+        || /"issues"\s*:|"summary"\s*:/.test(trimmed)
+        || trimmed.startsWith('{');
+    if (looksStructured) {
+        return { kind: 'malformed' };
+    }
+    return { kind: 'summary', summary: trimmed };
+}
+/**
+ * Strip agent terminal noise (thinking indicators, status lines, prompt markers)
+ * and return useful review text. Returns null if nothing useful remains.
+ */
+function extractFallbackReviewSummary(text) {
+    const lines = text.split('\n').filter(line => {
+        const t = line.trim();
+        if (!t)
+            return false;
+        if (THINKING_LINE_RE.test(t))
+            return false;
+        if (EMPTY_PROMPT_RE.test(t))
+            return false;
+        if (BYPASS_PERMS_RE.test(t))
+            return false;
+        return true;
+    });
+    const useful = lines.join('\n').trim();
+    if (useful.length < 20)
+        return null;
+    return useful.length > 2000 ? useful.slice(-2000) : useful;
+}
+function buildMalformedReviewReport() {
+    return {
+        summary: REVIEW_REPORT_PARSE_FAILURE_SUMMARY,
+        issues: [{ ...REVIEW_REPORT_PARSE_FAILURE_ISSUE }],
+    };
+}
+function extractReviewReport(resultPayload, cleanOutput) {
+    const rawCleanOutput = cleanOutput?.trim() ?? '';
+    // Pre-strip markers from cleanOutput once for prose fallback. Keep the raw
+    // output too so structured RESULT marker payloads remain recoverable when
+    // event.result is unavailable upstream.
+    const strippedCleanOutput = cleanOutput
+        ? cleanOutput.replace(OVERLORD_MARKER_LINE_RE, ' ').trim()
+        : '';
+    const candidates = [
+        parseReviewReportOutput(resultPayload),
+        parseReviewReportOutput(rawCleanOutput),
+        parseReviewReportOutput(strippedCleanOutput),
+    ];
+    for (const candidate of candidates) {
+        if (candidate.kind === 'structured') {
+            return candidate.report;
+        }
+    }
+    for (const candidate of [
+        candidates[0],
+        candidates[2],
+    ]) {
+        if (candidate.kind === 'summary') {
+            return { summary: candidate.summary, issues: [] };
+        }
+    }
+    // Both candidates were either empty or malformed — surface parse failure.
+    return buildMalformedReviewReport();
+}
+//# sourceMappingURL=review-report-parser.js.map

package/dist/review-report-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"review-report-parser.js","sourceRoot":"","sources":["../src/review-report-parser.ts"],"names":[],"mappings":"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"}

package/dist/task-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-handler.d.ts","sourceRoot":"","sources":["../src/task-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,qBAAqB,EAAE,eAAe,EAAE,cAAc,EAAkB,mBAAmB,EAAE,qBAAqB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAiB5N,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAoBnE;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEjE;AAiED,0DAA0D;AAC1D,eAAO,MAAM,iBAAiB,4BAAsB,CAAC;AAErD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAO5F;AAyLD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,cAAc,GAAG,IAAI,CAAC;IACnC,yFAAyF;IACzF,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IAChD,8FAA8F;IAC9F,8BAA8B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,yEAAyE;IACzE,4BAA4B,EAAE,OAAO,CAAC;IACtC,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yFAAyF;IACzF,aAAa,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CACzD;AAED,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AACnQ,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;AAC9E,KAAK,sBAAsB,GAAG,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,WAAW,KACtB,IAAI,CAAC;AACV,KAAK,uBAAuB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAExD,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,YAAY,CAAe;IACnC,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,EAAE,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9F,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,sBAAsB,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;gBAG1G,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,WAAW,EAClB,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,uBAAuB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,MAAM;IAa5B,kBAAkB,IAAI,MAAM;IAI5B,gBAAgB,IAAI,MAAM,EAAE;IAI5B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC;;;OAGG;IACH,kBAAkB,CAAC,SAAS,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrD,qBAAqB,IAAI,KAAK,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,OAAO,sBAAsB,EAAE,WAAW,CAAC;QACxD,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IAQI,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwPrD,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBnD,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCzE,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAkBzG;;;OAGG;YACW,uBAAuB;YAmEvB,gBAAgB;IAc9B;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAoBrC,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAsCpD,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD;;;;OAIG;YACW,WAAW;CA4d1B"}
+{"version":3,"file":"task-handler.d.ts","sourceRoot":"","sources":["../src/task-handler.ts"],"names":[],"mappings":"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"}

package/dist/task-handler.js

@@ -52,20 +52,21 @@ const stage_monitor_js_1 = require("./stage-monitor.js");
 const pty_stdin_writer_js_1 = require("./pty-stdin-writer.js");
 const git_token_helper_js_1 = require("./git-token-helper.js");
 const ansi_stripper_js_1 = require("./ansi-stripper.js");
+const review_report_parser_js_1 = require("./review-report-parser.js");
 const log = (0, pino_1.default)({ name: 'task-handler' });
 const REDACTED = '***REDACTED***';
 const PROMPT_LOG_TAIL_CHARS = 600;
 const AUTH_ERROR_SCAN_TAIL_CHARS = 2000;
-const OVERLORD_MARKER_LINE_RE = /\[\[OVERLORD:[^\n]*\]\]/g;
 const MAX_FINDING_DETAIL = 4000;
 const MIN_AUTOMATION_OUTPUT_LENGTH = 20;
-const REVIEW_REPORT_PARSE_FAILURE_SUMMARY = 'Structured review report could not be parsed. Findings may be incomplete.';
-const REVIEW_REPORT_PARSE_FAILURE_ISSUE = {
-    severity: 'warning',
-    file: 'report_output',
-    description: 'Review agent did not emit a valid structured report for the report stage.',
-    suggestion: 'Emit a report RESULT marker or a single valid JSON object between report START and DONE.',
-};
+function waitForQueuedPtyOutput() {
+    return new Promise((resolve) => {
+        // A nested setImmediate yields through the current check phase and the
+        // next event-loop iteration, giving already-queued PTY onData callbacks a
+        // chance to run before we finalize task completion from onExit.
+        setImmediate(() => setImmediate(resolve));
+    });
+}
 /**
  * Detect startup prompts from agent CLIs that block execution and return
  * the keystroke to dismiss them. Returns null if no blocking prompt detected.
@@ -174,114 +175,19 @@ function buildPromptWaitDiagnostics(ptySession) {
 function autoConfirmStartupPrompt(taskId, ptySession, handledSignatures, logMessage) {
     const promptAction = detectStartupPromptAction(ptySession.cleanOutput);
     if (!promptAction) {
-        return 'none';
+        return { action: 'none' };
     }
     if (handledSignatures.has(promptAction.signature)) {
         // Repeated dialog redraws can leave stale trust/bypass text in the buffer.
         // Clear them so a later real prompt is detectable.
         ptySession.resetCleanOutput();
-        return 'duplicate';
+        return { action: 'duplicate', signature: promptAction.signature };
     }
     handledSignatures.add(promptAction.signature);
     log.info({ taskId, trustResponse: promptAction.response }, logMessage);
     ptySession.pty.write(promptAction.response);
     ptySession.resetCleanOutput();
-    return 'handled';
-}
-function normalizeReviewSummary(summary) {
-    if (typeof summary === 'string') {
-        return summary;
-    }
-    if (summary == null) {
-        return '';
-    }
-    try {
-        return JSON.stringify(summary);
-    }
-    catch {
-        return String(summary);
-    }
-}
-function tryParseStructuredReviewReport(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed) {
-        return null;
-    }
-    try {
-        const parsed = JSON.parse(trimmed);
-        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-            return null;
-        }
-        const parsedObj = parsed;
-        return {
-            summary: normalizeReviewSummary(parsedObj.summary),
-            issues: Array.isArray(parsedObj.issues) ? parsedObj.issues : [],
-        };
-    }
-    catch {
-        return null;
-    }
-}
-function extractJsonObjectCandidate(raw) {
-    const firstBrace = raw.indexOf('{');
-    const lastBrace = raw.lastIndexOf('}');
-    if (firstBrace === -1 || lastBrace === -1 || firstBrace >= lastBrace) {
-        return null;
-    }
-    return raw.slice(firstBrace, lastBrace + 1).trim();
-}
-function parseReviewReportOutput(raw, stripMarkers = false) {
-    if (!raw?.trim()) {
-        return { kind: 'empty' };
-    }
-    const base = stripMarkers ? raw.replace(OVERLORD_MARKER_LINE_RE, ' ') : raw;
-    const trimmed = base.trim();
-    if (!trimmed) {
-        return { kind: 'empty' };
-    }
-    const fencedMatch = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/i);
-    const candidate = (fencedMatch?.[1] ?? trimmed).trim();
-    const directStructured = tryParseStructuredReviewReport(candidate);
-    if (directStructured) {
-        return { kind: 'structured', report: directStructured };
-    }
-    const extractedJson = extractJsonObjectCandidate(candidate);
-    if (extractedJson) {
-        const extractedStructured = tryParseStructuredReviewReport(extractedJson);
-        if (extractedStructured) {
-            return { kind: 'structured', report: extractedStructured };
-        }
-    }
-    const looksStructured = /```(?:json)?/i.test(trimmed)
-        || /"issues"\s*:|"summary"\s*:/.test(candidate)
-        || candidate.startsWith('{');
-    if (looksStructured) {
-        return { kind: 'malformed' };
-    }
-    return { kind: 'summary', summary: candidate };
-}
-function buildMalformedReviewReport() {
-    return {
-        summary: REVIEW_REPORT_PARSE_FAILURE_SUMMARY,
-        issues: [{ ...REVIEW_REPORT_PARSE_FAILURE_ISSUE }],
-    };
-}
-function extractReviewReport(resultPayload, cleanOutput) {
-    const candidates = [
-        parseReviewReportOutput(resultPayload),
-        parseReviewReportOutput(cleanOutput, true),
-    ];
-    for (const candidate of candidates) {
-        if (candidate.kind === 'structured') {
-            return candidate.report;
-        }
-    }
-    for (const candidate of candidates) {
-        if (candidate.kind === 'summary') {
-            return { summary: candidate.summary, issues: [] };
-        }
-    }
-    return buildMalformedReviewReport();
+    return { action: 'handled', signature: promptAction.signature };
 }
 class TaskHandler {
     activeTasks = new Map();
@@ -541,7 +447,10 @@ class TaskHandler {
                 // Auto-confirm startup prompts (trust dialogs, bypass permissions, etc.)
                 // that appear before waitForPrompt registers its own checkReady handler.
                 if (ctx.startupPromptHandlingEnabled) {
-                    autoConfirmStartupPrompt(taskId, ptySession, ctx.handledStartupPromptSignatures, 'Detected startup prompt (early), auto-confirming');
+                    const result = autoConfirmStartupPrompt(taskId, ptySession, ctx.handledStartupPromptSignatures, 'Detected startup prompt (early), auto-confirming');
+                    if (result.action === 'handled' && result.signature === 'claude-mcp-server-decline') {
+                        this.onProgress(taskId, ctx.stage, 'running', 'Declined repo MCP server declared in .mcp.json — task will continue without it');
+                    }
                 }
             };
             ctx.ptyDataHandler = ptyDataHandler;
@@ -847,7 +756,7 @@ class TaskHandler {
         // 5. Create StageMonitor
         const monitor = new stage_monitor_js_1.StageMonitor(effectivePipeline, nonce);
         ctx.stageMonitor = monitor;
-        // 5. Wait for agent to be ready (detect prompt character)
+        // 6. Wait for agent to be ready (detect prompt character)
         await new Promise((resolve, reject) => {
             const PROMPT_TIMEOUT_MS = 180_000;
             let settled = false;
@@ -881,9 +790,13 @@ class TaskHandler {
             abortController.signal.addEventListener('abort', onAbort, { once: true });
             const handleStartupPrompt = () => {
                 if (!ctx.startupPromptHandlingEnabled) {
-                    return 'none';
+                    return { action: 'none' };
                 }
-                return autoConfirmStartupPrompt(taskId, ptySession, ctx.handledStartupPromptSignatures, 'Auto-accepting workspace trust prompt (checkReady)');
+                const result = autoConfirmStartupPrompt(taskId, ptySession, ctx.handledStartupPromptSignatures, 'Auto-accepting workspace trust prompt (checkReady)');
+                if (result.action === 'handled' && result.signature === 'claude-mcp-server-decline') {
+                    this.onProgress(taskId, ctx.stage, 'running', 'Declined repo MCP server declared in .mcp.json — task will continue without it');
+                }
+                return result;
             };
             const detectPromptFromLatestChunk = (data) => {
                 const cleanData = (0, ansi_stripper_js_1.stripAnsi)(data);
@@ -939,8 +852,8 @@ class TaskHandler {
                 // Auto-confirm startup prompts exactly once per prompt type. While a
                 // prompt is visible, skip ready detection — the dialog's menu cursor
                 // is not the agent's interactive prompt.
-                const startupPromptResult = handleStartupPrompt();
-                if (startupPromptResult === 'handled') {
+                const { action: startupAction } = handleStartupPrompt();
+                if (startupAction === 'handled') {
                     return;
                 }
                 // Check accumulated output for agent prompt
@@ -948,13 +861,12 @@ class TaskHandler {
                     resolvePromptDetected();
                     return;
                 }
-                // If an earlier handler cleared duplicate startup-dialog remnants from
-                // the shared buffer, the current PTY chunk may still contain the real
-                // prompt. Check the latest chunk tail as a fallback.
-                if (startupPromptResult === 'duplicate' || detectPromptFromLatestChunk(_data)) {
-                    if (detectPromptFromLatestChunk(_data)) {
-                        resolvePromptDetected();
-                    }
+                // If an earlier handler (ptyDataHandler or a previous checkReady call)
+                // cleared startup-dialog text from the shared buffer, the accumulated
+                // cleanOutput may be empty while the current PTY chunk still contains
+                // the real prompt. Check the latest chunk tail as a fallback.
+                if (detectPromptFromLatestChunk(_data)) {
+                    resolvePromptDetected();
                 }
             };
             ptySession.onData(checkReady);
@@ -975,6 +887,43 @@ class TaskHandler {
             let planSpecPushCompleted = false;
             let planSpecPushFailed = false;
             let automationFindingsReported = false;
+            let reviewReportSent = false;
+            const emitReviewReport = (report) => {
+                if (taskMode !== 'review' || !this.onReviewReport || reviewReportSent)
+                    return;
+                reviewReportSent = true;
+                this.onReviewReport(taskId, report);
+            };
+            // Ensure the review report is extracted and sent before a review task
+            // reaches terminal state.  This is the single place that guarantees the
+            // report is delivered regardless of *how* the task completes (normal
+            // pipeline_completed, process exit, idle timeout, etc.).
+            const ensureReviewReportSent = () => {
+                if (taskMode !== 'review' || !this.onReviewReport || reviewReportSent)
+                    return;
+                // Prefer the RESULT payload captured by StageMonitor for the report stage
+                const state = monitor.getState();
+                const reportStage = state.stages.find(s => s.name === 'report');
+                const resultPayload = reportStage?.result ?? null;
+                // Only attempt extraction when the report stage was actually reached.
+                // Without this guard, completion paths like "idle at prompt with no
+                // markers" would feed terminal noise (shell prompt, bypass status)
+                // into extractReviewReport, which treats any non-empty text as a
+                // valid zero-issue summary — creating a false-success report.
+                if (!resultPayload && (!reportStage || reportStage.status === 'pending')) {
+                    log.warn({ taskId }, 'Review report stage was never reached — sending parse-failure placeholder');
+                    emitReviewReport({
+                        summary: review_report_parser_js_1.REVIEW_REPORT_PARSE_FAILURE_SUMMARY,
+                        issues: [{ severity: 'warning', file: 'report_output', description: 'Review agent did not produce a report.', suggestion: 'The report stage was never reached.' }],
+                    });
+                    return;
+                }
+                const report = (0, review_report_parser_js_1.extractReviewReport)(resultPayload, ptySession.cleanOutput);
+                if (report.summary === review_report_parser_js_1.REVIEW_REPORT_PARSE_FAILURE_SUMMARY) {
+                    log.warn({ taskId }, 'Review report was missing or malformed at task completion — recorded a warning issue');
+                }
+                emitReviewReport(report);
+            };
             const settle = (fn) => {
                 if (!settled) {
                     settled = true;
@@ -1008,6 +957,7 @@ class TaskHandler {
                 if (!monitor.hasReceivedAnyMarker()) {
                     log.info({ taskId, idleMs }, 'Agent idle at prompt with no pipeline markers — treating as completed');
                     ctx.stage = 'completed';
+                    ensureReviewReportSent();
                     this.reportCompletionWithCommitSha(taskId, 'Task completed (agent idle, no markers)', ctx.workspaceInfo?.path, settle, resolve);
                     return;
                 }
@@ -1016,6 +966,7 @@ class TaskHandler {
                 if (monitor.hasAttemptedReinjection()) {
                     log.info({ taskId, idleMs }, 'Agent idle at prompt after reinjection — treating as completed');
                     ctx.stage = 'completed';
+                    ensureReviewReportSent();
                     this.reportCompletionWithCommitSha(taskId, 'Task completed (agent idle after reinjection)', ctx.workspaceInfo?.path, settle, resolve);
                     return;
                 }
@@ -1044,15 +995,15 @@ class TaskHandler {
                             }
                             this.onProgress(taskId, event.stage, 'stage_done', `Stage completed: ${event.stage}`, extra);
                             // When the report stage completes in review mode, fire the review report callback.
-                            if (taskMode === 'review' && event.stage === 'report' && this.onReviewReport) {
-                                const report = extractReviewReport(event.result, ptySession.cleanOutput);
-                                if (report.summary === REVIEW_REPORT_PARSE_FAILURE_SUMMARY) {
+                            if (taskMode === 'review' && event.stage === 'report' && !reviewReportSent) {
+                                const report = (0, review_report_parser_js_1.extractReviewReport)(event.result, ptySession.cleanOutput);
+                                if (report.summary === review_report_parser_js_1.REVIEW_REPORT_PARSE_FAILURE_SUMMARY) {
                                     log.warn({ taskId }, 'Review report was missing or malformed — recorded a warning issue instead of an empty report');
                                 }
                                 else if (!report.summary && report.issues.length === 0) {
                                     log.warn({ taskId }, 'Review report has no issues — agent may have failed to produce structured output');
                                 }
-                                this.onReviewReport(taskId, report);
+                                emitReviewReport(report);
                             }
                             // Plan mode: publish the spec before the confirm dialog is shown.
                             if (taskMode === 'plan' && event.stage === 'document') {
@@ -1181,6 +1132,8 @@ class TaskHandler {
                         }
                         case 'pipeline_completed':
                             ctx.stage = 'completed';
+                            // Ensure review report is sent before the task is marked complete
+                            ensureReviewReportSent();
                             // Capture final commit SHA for all task modes — develop tasks use it to pin
                             // review tasks; review tasks (fix stage) use it to update the source task's SHA
                             // so the next review round pins to post-fix code.
@@ -1212,8 +1165,9 @@ class TaskHandler {
             ptySession.onData((data) => {
                 lastPtyOutputTime = Date.now();
                 const stripped = (0, ansi_stripper_js_1.stripAnsi)(data);
-                // Keyword pre-filter: only run full regex detection when output looks relevant
-                if (/rate|limit|quota|429|auth|login|exceeded|exhausted|hit your/i.test(stripped)) {
+                // Keyword pre-filter: only run full regex detection when output looks relevant.
+                // Includes Chinese patterns for Zhipu API errors (令牌/余额/验证).
+                if (/rate|limit|quota|429|auth|login|exceeded|exhausted|hit your|令牌|余额|验证|insufficient|expired/i.test(stripped)) {
                     const authError = detectRecentAuthError(ptySession, false);
                     if (authError) {
                         log.warn({
@@ -1232,8 +1186,20 @@ class TaskHandler {
             ptySession.onExit((exitCode) => {
                 const status = monitor.handleProcessExit(exitCode);
                 if (status === 'completed') {
-                    ctx.stage = 'completed';
-                    this.reportCompletionWithCommitSha(taskId, 'Task completed successfully', ctx.workspaceInfo?.path, settle, resolve);
+                    const finalizeCompletedExit = () => {
+                        ctx.stage = 'completed';
+                        ensureReviewReportSent();
+                        this.reportCompletionWithCommitSha(taskId, 'Task completed successfully', ctx.workspaceInfo?.path, settle, resolve);
+                    };
+                    if (taskMode === 'review' && !reviewReportSent) {
+                        void waitForQueuedPtyOutput().then(() => {
+                            if (!settled) {
+                                finalizeCompletedExit();
+                            }
+                        });
+                        return;
+                    }
+                    finalizeCompletedExit();
                 }
                 else {
                     settle(() => reject(new Error(`Agent exited with code ${exitCode}, pipeline incomplete`)));