steroids-cli 0.10.15 → 0.10.17

package/dist/commands/loop-phases.d.ts

@@ -1,17 +1,11 @@
 import { getTask } from '../database/queries.js';
 import type { openDatabase } from '../database/connection.js';
 import { type CoordinatorResult } from '../orchestrator/coordinator.js';
-import { type ReviewerConfig } from '../config/loader.js';
-import type { InvokeResult } from '../providers/interface.js';
-import type { ProviderError } from '../providers/interface.js';
 export { type CoordinatorResult };
 interface LeaseFenceContext {
     parallelSessionId?: string;
     runnerId?: string;
 }
-/**
- * Returned when a provider invocation is classified as credit exhaustion or rate limit.
- */
 export interface CreditExhaustionResult {
     action: 'pause_credit_exhaustion' | 'rate_limit';
     provider: string;
@@ -20,15 +14,6 @@ export interface CreditExhaustionResult {
     message: string;
     retryAfterMs?: number;
 }
-/**
- * Check for policy or safety violations
- */
-export declare function checkSafetyViolation(result: InvokeResult, role: 'coder' | 'reviewer', projectPath: string, reviewerConfig?: ReviewerConfig, classification?: ProviderError | null): Promise<{
-    type: string;
-    provider: string;
-    model: string;
-    message: string;
-} | null>;
-export declare function runCoderPhase(db: ReturnType<typeof openDatabase>['db'], task: ReturnType<typeof getTask>, projectPath: string, action: 'start' | 'resume', jsonMode?: boolean, coordinatorCache?: Map<string, CoordinatorResult>, coordinatorThresholds?: number[], leaseFence?: LeaseFenceContext, branchName?: string): Promise<CreditExhaustionResult | void>;
-export declare function runReviewerPhase(db: ReturnType<typeof openDatabase>['db'], task: ReturnType<typeof getTask>, projectPath: string, jsonMode?: boolean, coordinatorResult?: CoordinatorResult, branchName?: string, leaseFence?: LeaseFenceContext): Promise<CreditExhaustionResult | void>;
+export declare function runCoderPhase(db: ReturnType<typeof openDatabase>['db'], task: ReturnType<typeof getTask>, projectPath: string, action: 'start' | 'resume', jsonMode?: boolean, coordinatorCache?: Map<string, CoordinatorResult>, coordinatorThresholds?: number[], leaseFence?: LeaseFenceContext, branchName?: string): Promise<void>;
+export declare function runReviewerPhase(db: ReturnType<typeof openDatabase>['db'], task: ReturnType<typeof getTask>, projectPath: string, jsonMode?: boolean, coordinatorResult?: CoordinatorResult, branchName?: string, leaseFence?: LeaseFenceContext): Promise<void>;
 //# sourceMappingURL=loop-phases.d.ts.map

package/dist/commands/loop-phases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop-phases.d.ts","sourceRoot":"","sources":["../../src/commands/loop-phases.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAaR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAU9D,OAAO,EAA8C,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAqBpH,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,KAAK,iBAAiB,EAAE,CAAC;AAElC,UAAU,iBAAiB;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA2CD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,yBAAyB,GAAG,YAAY,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAoHD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,OAAO,GAAG,UAAU,EAC1B,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,EAC/B,cAAc,CAAC,EAAE,aAAa,GAAG,IAAI,GACpC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BpF;AAwMD,wBAAsB,aAAa,CACjC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,GAAG,QAAQ,EAC1B,QAAQ,UAAQ,EAChB,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAChC,UAAU,CAAC,EAAE,iBAAiB,EAC9B,UAAU,SAAS,GAClB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CA4lBxC;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,QAAQ,UAAQ,EAChB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,GAAE,MAAe,EAC3B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAwiBxC"}
+{"version":3,"file":"loop-phases.d.ts","sourceRoot":"","sources":["../../src/commands/loop-phases.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EAeR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAU9D,OAAO,EAA8C,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AA0BpH,OAAO,EAAE,KAAK,iBAAiB,EAAE,CAAC;AAElC,UAAU,iBAAiB;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA2CD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,yBAAyB,GAAG,YAAY,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA0PD,wBAAsB,aAAa,CACjC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,GAAG,QAAQ,EAC1B,QAAQ,UAAQ,EAChB,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAChC,UAAU,CAAC,EAAE,iBAAiB,EAC9B,UAAU,SAAS,GAClB,OAAO,CAAC,IAAI,CAAC,CA8iBf;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,IAAI,CAAC,EACzC,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,EAChC,WAAW,EAAE,MAAM,EACnB,QAAQ,UAAQ,EAChB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,GAAE,MAAe,EAC3B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA0cf"}

package/dist/commands/loop-phases.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSafetyViolation = checkSafetyViolation;
 exports.runCoderPhase = runCoderPhase;
 exports.runReviewerPhase = runReviewerPhase;
 const global_db_js_1 = require("../runners/global-db.js");
@@ -50,118 +49,6 @@ function refreshParallelWorkstreamLease(projectPath, leaseFence) {
         }
     });
 }
-/**
- * Check a coder/reviewer result for credit exhaustion or rate limits using the provider's classifier.
- * Uses provider.classifyResult() which checks both stderr and stdout.
- * Returns a CreditExhaustionResult if credits are exhausted or rate limited, null otherwise.
- */
-async function checkCreditExhaustion(result, role, projectPath, reviewerConfig, classification) {
-    if (result.success)
-        return null;
-    const resolvedClassification = classification === undefined ? await classifyProviderResult(result, role, projectPath, reviewerConfig) : classification;
-    if (!resolvedClassification)
-        return null;
-    const config = (0, loader_js_1.loadConfig)(projectPath);
-    const roleConfig = reviewerConfig || config.ai?.[role];
-    const providerName = roleConfig?.provider;
-    const modelName = roleConfig?.model;
-    if (!providerName || !modelName)
-        return null;
-    if (resolvedClassification.type === 'credit_exhaustion') {
-        return {
-            action: 'pause_credit_exhaustion',
-            provider: providerName,
-            model: modelName,
-            role,
-            message: resolvedClassification.message,
-        };
-    }
-    if (resolvedClassification.type === 'rate_limit') {
-        return {
-            action: 'rate_limit',
-            provider: providerName,
-            model: modelName,
-            role,
-            message: resolvedClassification.message,
-            retryAfterMs: resolvedClassification.retryAfterMs,
-        };
-    }
-    return null;
-}
-/**
- * Classify a provider invocation result exactly once per path.
- */
-async function classifyProviderResult(result, role, projectPath, reviewerConfig) {
-    if (result.success)
-        return null;
-    const config = (0, loader_js_1.loadConfig)(projectPath);
-    const roleConfig = reviewerConfig || config.ai?.[role];
-    const providerName = roleConfig?.provider;
-    if (!providerName)
-        return null;
-    const registry = await (0, registry_js_1.getProviderRegistry)();
-    const provider = registry.tryGet(providerName);
-    if (!provider)
-        return null;
-    return provider.classifyResult(result);
-}
-/**
- * Check for non-retryable provider failures that should fail the task immediately.
- */
-async function checkNonRetryableProviderFailure(result, role, projectPath, reviewerConfig, classification) {
-    if (result.success)
-        return null;
-    const config = (0, loader_js_1.loadConfig)(projectPath);
-    const roleConfig = reviewerConfig || config.ai?.[role];
-    const providerName = roleConfig?.provider;
-    const modelName = roleConfig?.model;
-    if (!providerName || !modelName)
-        return null;
-    const registry = await (0, registry_js_1.getProviderRegistry)();
-    const provider = registry.tryGet(providerName);
-    if (!provider)
-        return null;
-    const resolvedClassification = classification === undefined ? await classifyProviderResult(result, role, projectPath, reviewerConfig) : classification;
-    if (!resolvedClassification)
-        return null;
-    if (resolvedClassification.type === 'model_not_found' ||
-        resolvedClassification.type === 'context_exceeded') {
-        return {
-            type: resolvedClassification.type,
-            provider: providerName,
-            model: modelName,
-            message: resolvedClassification.message,
-        };
-    }
-    return null;
-}
-/**
- * Check for policy or safety violations
- */
-async function checkSafetyViolation(result, role, projectPath, reviewerConfig, classification) {
-    if (result.success)
-        return null;
-    const config = (0, loader_js_1.loadConfig)(projectPath);
-    const roleConfig = reviewerConfig || config.ai?.[role];
-    const providerName = roleConfig?.provider;
-    const modelName = roleConfig?.model;
-    if (!providerName || !modelName)
-        return null;
-    const resolvedClassification = classification === undefined ? await classifyProviderResult(result, role, projectPath, reviewerConfig) : classification;
-    if (!resolvedClassification)
-        return null;
-    if (resolvedClassification.type === 'safety_violation' ||
-        resolvedClassification.type === 'policy_violation' ||
-        resolvedClassification.type === 'invalid_prompt') {
-        return {
-            type: resolvedClassification.type,
-            provider: providerName,
-            model: modelName,
-            message: resolvedClassification.message,
-        };
-    }
-    return null;
-}
 function summarizeErrorMessage(error) {
     const raw = error instanceof Error ? error.message : String(error);
     return raw.replace(/\s+/g, ' ').trim().slice(0, 220);
@@ -209,11 +96,34 @@ async function classifyOrchestratorFailure(error, projectPath) {
 }
 const MAX_ORCHESTRATOR_PARSE_RETRIES = 3;
 const MAX_CONTRACT_VIOLATION_RETRIES = 3;
+const MAX_PROVIDER_NONZERO_FAILURES = 3;
 const CODER_PARSE_FALLBACK_MARKER = '[retry] FALLBACK: Orchestrator failed, defaulting to retry';
 const REVIEWER_PARSE_FALLBACK_MARKER = '[unclear] FALLBACK: Orchestrator failed, retrying review';
 const CONTRACT_CHECKLIST_MARKER = '[contract:checklist]';
 const CONTRACT_REJECTION_RESPONSE_MARKER = '[contract:rejection_response]';
 const MUST_IMPLEMENT_MARKER = '[must_implement]';
+function formatProviderFailureMessage(taskId, context) {
+    const output = context.output || 'provider invocation failed with no output.';
+    return `Task ${taskId}: provider ${context.provider}/${context.model} exited with non-zero status ${context.exitCode} during ${context.role} phase: ${output}`;
+}
+async function handleProviderInvocationFailure(db, taskId, context, jsonMode) {
+    const failureCount = (0, queries_js_1.incrementTaskFailureCount)(db, taskId);
+    const providerMessage = formatProviderFailureMessage(taskId, context);
+    if (failureCount >= MAX_PROVIDER_NONZERO_FAILURES) {
+        const reason = `${providerMessage} (provider invocation failed ${failureCount} time(s). Task failed.)`;
+        (0, queries_js_1.updateTaskStatus)(db, taskId, 'failed', 'orchestrator', reason);
+        if (!jsonMode) {
+            console.log(`\n✗ Task failed (${reason})`);
+        }
+        return { shouldStopTask: true };
+    }
+    if (!jsonMode) {
+        const retriesLeft = MAX_PROVIDER_NONZERO_FAILURES - failureCount;
+        console.log(`\n⟳ Provider invocation failed (${failureCount}/${MAX_PROVIDER_NONZERO_FAILURES}) for task ${taskId}; retrying (${retriesLeft} attempt(s) left).`);
+        console.log(`    ${providerMessage}`);
+    }
+    return { shouldStopTask: false };
+}
 function countConsecutiveOrchestratorFallbackEntries(db, taskId, marker) {
     const audit = (0, queries_js_1.getTaskAudit)(db, taskId);
     let count = 0;
@@ -408,51 +318,25 @@ async function runCoderPhase(db, task, projectPath, action, jsonMode = false, co
         console.log('\n>>> Invoking CODER...\n');
     }
     const initialSha = (0, status_js_1.getCurrentCommitSha)(projectPath) || '';
-    const coderConfigSnapshot = (0, loader_js_1.loadConfig)(projectPath).ai?.coder;
+    const coderConfig = (0, loader_js_1.loadConfig)(projectPath).ai?.coder;
     const coderResult = await (0, coder_js_1.invokeCoder)(task, projectPath, action, coordinatorGuidance, leaseFence?.runnerId);
-    if (coderResult.timedOut) {
-        console.warn('Coder timed out. Will retry next iteration.');
-        return;
-    }
-    const classification = await classifyProviderResult(coderResult, 'coder', projectPath, coderConfigSnapshot);
-    const hardFailureFromKnownTypes = await checkNonRetryableProviderFailure(coderResult, 'coder', projectPath, coderConfigSnapshot, classification);
-    const safetyViolation = await checkSafetyViolation(coderResult, 'coder', projectPath, coderConfigSnapshot, classification);
-    // Check for credit/rate-limit classification (once).
-    const creditCheck = await checkCreditExhaustion(coderResult, 'coder', projectPath, coderConfigSnapshot, classification);
-    if (hardFailureFromKnownTypes) {
-        const reason = `Task failed: provider ${hardFailureFromKnownTypes.provider}/${hardFailureFromKnownTypes.model} returned non-recoverable error (${hardFailureFromKnownTypes.type}) during coder phase: ${hardFailureFromKnownTypes.message}`;
-        (0, queries_js_1.updateTaskStatus)(db, task.id, 'failed', 'orchestrator', reason);
-        return;
-    }
-    if (safetyViolation) {
-        // Check if we've exhausted our 2 attempts to resolve safety violations
-        const pastRejections = (0, queries_js_1.getTaskRejections)(db, task.id);
-        const safetyRejections = pastRejections.filter(r => r.notes?.includes('[safety_violation]')).length;
-        if (safetyRejections >= 2) {
-            const reason = `Task failed: Provider safety/policy violation could not be automatically resolved after 2 attempts. Error: ${safetyViolation.message}`;
-            (0, queries_js_1.updateTaskStatus)(db, task.id, 'disputed', 'orchestrator', reason);
-            if (!jsonMode) {
-                console.log(`\nTask disputed: Provider safety/policy violation could not be resolved.`);
-            }
+    if (coderResult.timedOut || !coderResult.success) {
+        const providerName = coderConfig?.provider ?? (0, loader_js_1.loadConfig)(projectPath).ai?.coder?.provider ?? 'unknown';
+        const modelName = coderConfig?.model ?? (0, loader_js_1.loadConfig)(projectPath).ai?.coder?.model ?? 'unknown';
+        const output = (coderResult.stderr || coderResult.stdout || '').trim();
+        const failed = await handleProviderInvocationFailure(db, task.id, {
+            role: 'coder',
+            provider: providerName,
+            model: modelName,
+            exitCode: coderResult.exitCode ?? 1,
+            output,
+        }, jsonMode);
+        if (failed.shouldStopTask) {
             return;
         }
-        // Inject the safety violation as a rejection so the orchestrator attempts to resolve it on the next loop
-        (0, queries_js_1.rejectTask)(db, task.id, `[safety_violation] The provider blocked the request due to a safety/policy violation: ${safetyViolation.message}\n\nPlease analyze the task description and previous outputs, and adjust your approach or prompt to comply with safety policies. You have ${2 - safetyRejections} attempt(s) remaining.`, 'orchestrator', 'coder');
-        if (!jsonMode) {
-            console.log(`\n⟳ Coder hit safety violation. Rejected back to orchestrator for automatic resolution (${safetyRejections + 1}/2 attempts).`);
-        }
-        return;
-    }
-    if (creditCheck) {
-        return creditCheck;
-    }
-    // Early bail: if coder returned empty output and failed, skip orchestrator and retry
-    if (!coderResult.success && coderResult.stdout.trim().length === 0) {
-        if (!jsonMode) {
-            console.log('\n⟳ Coder returned empty output (provider failure), will retry');
-        }
         return;
     }
+    (0, queries_js_1.clearTaskFailureCount)(db, task.id);
     // STEP 2: Gather git state
     const commits = (0, status_js_1.getRecentCommits)(projectPath, 5, initialSha);
     const files_changed = (0, status_js_1.getChangedFiles)(projectPath);
@@ -820,7 +704,6 @@ async function runReviewerPhase(db, task, projectPath, jsonMode = false, coordin
     const phaseConfig = (0, loader_js_1.loadConfig)(projectPath);
     const multiReviewEnabled = (0, reviewer_js_1.isMultiReviewEnabled)(phaseConfig);
     let effectiveMultiReviewEnabled = multiReviewEnabled;
-    const strict = phaseConfig.ai?.review?.strict ?? true;
     let reviewerResult;
     let reviewerResults = [];
     // STEP 1: Invoke reviewer(s)
@@ -833,101 +716,34 @@ async function runReviewerPhase(db, task, projectPath, jsonMode = false, coordin
             }
         }
         reviewerResults = await (0, reviewer_js_1.invokeReviewers)(task, projectPath, reviewerConfigs, coordinatorResult?.guidance, coordinatorResult?.decision, leaseFence?.runnerId);
-        // Check for hard failures and classify all results
-        const classifications = await Promise.all(reviewerResults.map((res, i) => classifyProviderResult(res, 'reviewer', projectPath, reviewerConfigs[i])));
-        let creditExhaustionSignal;
-        let rateLimitSignal;
-        const failedRateLimitIndices = new Set();
-        const failedOtherIndices = new Set();
-        for (let i = 0; i < reviewerResults.length; i++) {
-            const res = reviewerResults[i];
-            const classification = classifications[i];
-            const hardFailure = await checkNonRetryableProviderFailure(res, 'reviewer', projectPath, reviewerConfigs[i], classification);
-            if (hardFailure) {
-                const reason = `Task failed: provider ${hardFailure.provider}/${hardFailure.model} returned non-recoverable error (${hardFailure.type}) during reviewer phase: ${hardFailure.message}`;
-                (0, queries_js_1.updateTaskStatus)(db, task.id, 'failed', 'orchestrator', reason);
-                return;
-            }
-            const safetyViolation = await checkSafetyViolation(res, 'reviewer', projectPath, reviewerConfigs[i], classification);
-            if (safetyViolation) {
-                const pastRejections = (0, queries_js_1.getTaskRejections)(db, task.id);
-                const safetyRejections = pastRejections.filter(r => r.notes?.includes('[safety_violation]')).length;
-                if (safetyRejections >= 2) {
-                    const reason = `Task failed: Provider safety/policy violation could not be automatically resolved after 2 attempts. Error: ${safetyViolation.message}`;
-                    (0, queries_js_1.updateTaskStatus)(db, task.id, 'disputed', 'orchestrator', reason);
-                    if (!jsonMode) {
-                        console.log(`\nTask disputed: Provider safety/policy violation could not be resolved.`);
-                    }
-                    return;
-                }
-                (0, queries_js_1.rejectTask)(db, task.id, `[safety_violation] The provider blocked the request due to a safety/policy violation: ${safetyViolation.message}\n\nPlease analyze the task description and previous outputs, and adjust your approach or prompt to comply with safety policies. You have ${2 - safetyRejections} attempt(s) remaining.`, 'orchestrator', 'reviewer');
-                if (!jsonMode) {
-                    console.log(`\n⟳ Reviewer hit safety violation. Rejected back to orchestrator for automatic resolution (${safetyRejections + 1}/2 attempts).`);
-                }
-                return;
-            }
-            const creditCheck = await checkCreditExhaustion(res, 'reviewer', projectPath, reviewerConfigs[i], classification);
-            if (creditCheck) {
-                if (creditCheck.action === 'pause_credit_exhaustion' && !creditExhaustionSignal) {
-                    creditExhaustionSignal = creditCheck;
-                }
-                if (creditCheck.action === 'rate_limit' && !rateLimitSignal) {
-                    rateLimitSignal = creditCheck;
-                }
-            }
-            if (!res.success) {
-                if (classification?.type === 'rate_limit') {
-                    failedRateLimitIndices.add(i);
-                }
-                else {
-                    failedOtherIndices.add(i);
-                }
-            }
-        }
-        const successfulReviewers = reviewerResults.filter((res) => res.success);
-        const failedCount = reviewerResults.length - successfulReviewers.length;
-        const canDegradeToAvailableReviewers = successfulReviewers.length > 0 &&
-            failedCount > 0 &&
-            failedOtherIndices.size === 0 &&
-            failedRateLimitIndices.size === failedCount &&
-            !creditExhaustionSignal;
-        if (canDegradeToAvailableReviewers) {
-            const rateLimitedProviders = Array.from(failedRateLimitIndices)
-                .map((i) => reviewerConfigs[i])
-                .filter((cfg) => !!cfg)
-                .map((cfg) => `${cfg.provider}/${cfg.model}`)
-                .join(', ');
-            const strictLabel = strict ? ' (strict override)' : '';
-            const auditNote = `[reviewer_degraded] Falling back to ${successfulReviewers.length}/${reviewerResults.length} reviewer(s)` +
-                `${strictLabel}; rate-limited reviewers: ${rateLimitedProviders || 'unknown'}`;
-            (0, queries_js_1.addAuditEntry)(db, task.id, task.status, task.status, 'orchestrator', {
-                actorType: 'orchestrator',
-                notes: auditNote,
-            });
-            if (!jsonMode) {
-                console.warn(`! ${auditNote}`);
-            }
-            reviewerResults = successfulReviewers;
-            reviewerResult = reviewerResults[0];
-            effectiveMultiReviewEnabled = reviewerResults.length > 1;
-        }
-        else {
-            if (creditExhaustionSignal) {
-                return creditExhaustionSignal;
-            }
-            if (rateLimitSignal) {
-                return rateLimitSignal;
-            }
-            // Handle failures in strict mode or other unrecoverable failures
-            const failures = reviewerResults.filter(r => !r.success);
-            if (strict && failures.length > 0) {
-                if (!jsonMode) {
-                    console.warn(`${failures.length} reviewer(s) failed in strict mode. Will retry.`);
-                }
+        const failedReviewerIndex = reviewerResults.findIndex((res) => !res.success || res.timedOut);
+        if (failedReviewerIndex !== -1) {
+            const failedReviewer = reviewerResults[failedReviewerIndex];
+            const failedConfig = reviewerConfigs[failedReviewerIndex];
+            const providerName = failedReviewer.provider ??
+                failedConfig?.provider ??
+                phaseConfig.ai?.reviewer?.provider ??
+                'unknown';
+            const modelName = failedReviewer.model ??
+                failedConfig?.model ??
+                phaseConfig.ai?.reviewer?.model ??
+                'unknown';
+            const output = (failedReviewer.stderr || failedReviewer.stdout || '').trim();
+            const failed = await handleProviderInvocationFailure(db, task.id, {
+                role: 'reviewer',
+                provider: providerName,
+                model: modelName,
+                exitCode: failedReviewer.exitCode ?? 1,
+                output,
+            }, jsonMode);
+            if (failed.shouldStopTask) {
                 return;
             }
+            return;
         }
-        // If not strict, we continue with the successful ones (resolveDecision handles empty/unclear)
+        (0, queries_js_1.clearTaskFailureCount)(db, task.id);
+        reviewerResult = reviewerResults[0];
+        effectiveMultiReviewEnabled = reviewerResults.length > 1;
     }
     else {
         if (!jsonMode) {
@@ -937,49 +753,27 @@ async function runReviewerPhase(db, task, projectPath, jsonMode = false, coordin
             }
         }
         reviewerResult = await (0, reviewer_js_1.invokeReviewer)(task, projectPath, coordinatorResult?.guidance, coordinatorResult?.decision, undefined, leaseFence?.runnerId);
-        if (reviewerResult.timedOut) {
-            if (!jsonMode) {
-                console.warn('Reviewer timed out. Will retry next iteration.');
-            }
-            return;
-        }
-        const classification = await classifyProviderResult(reviewerResult, 'reviewer', projectPath);
-        const hardFailure = await checkNonRetryableProviderFailure(reviewerResult, 'reviewer', projectPath, undefined, classification);
-        if (hardFailure) {
-            const reason = `Task failed: provider ${hardFailure.provider}/${hardFailure.model} returned non-recoverable error (${hardFailure.type}) during reviewer phase: ${hardFailure.message}`;
-            (0, queries_js_1.updateTaskStatus)(db, task.id, 'failed', 'orchestrator', reason);
-            return;
-        }
-        const safetyViolation = await checkSafetyViolation(reviewerResult, 'reviewer', projectPath, undefined, classification);
-        if (safetyViolation) {
-            const pastRejections = (0, queries_js_1.getTaskRejections)(db, task.id);
-            const safetyRejections = pastRejections.filter(r => r.notes?.includes('[safety_violation]')).length;
-            if (safetyRejections >= 2) {
-                const reason = `Task failed: Provider safety/policy violation could not be automatically resolved after 2 attempts. Error: ${safetyViolation.message}`;
-                (0, queries_js_1.updateTaskStatus)(db, task.id, 'disputed', 'orchestrator', reason);
-                if (!jsonMode) {
-                    console.log(`\nTask disputed: Provider safety/policy violation could not be resolved.`);
-                }
+        if (!reviewerResult.success || reviewerResult.timedOut) {
+            const providerName = reviewerResult.provider ??
+                phaseConfig.ai?.reviewer?.provider ??
+                'unknown';
+            const modelName = reviewerResult.model ??
+                phaseConfig.ai?.reviewer?.model ??
+                'unknown';
+            const output = (reviewerResult.stderr || reviewerResult.stdout || '').trim();
+            const failed = await handleProviderInvocationFailure(db, task.id, {
+                role: 'reviewer',
+                provider: providerName,
+                model: modelName,
+                exitCode: reviewerResult.exitCode ?? 1,
+                output,
+            }, jsonMode);
+            if (failed.shouldStopTask) {
                 return;
             }
-            (0, queries_js_1.rejectTask)(db, task.id, `[safety_violation] The provider blocked the request due to a safety/policy violation: ${safetyViolation.message}\n\nPlease analyze the task description and previous outputs, and adjust your approach or prompt to comply with safety policies. You have ${2 - safetyRejections} attempt(s) remaining.`, 'orchestrator', 'reviewer');
-            if (!jsonMode) {
-                console.log(`\n⟳ Reviewer hit safety violation. Rejected back to orchestrator for automatic resolution (${safetyRejections + 1}/2 attempts).`);
-            }
-            return;
-        }
-        // Check for credit exhaustion
-        const creditCheck = await checkCreditExhaustion(reviewerResult, 'reviewer', projectPath, undefined, classification);
-        if (creditCheck) {
-            return creditCheck;
-        }
-        // Early bail: reviewer returned no output at all (provider crash/rate limit not caught above)
-        if (!reviewerResult.success && reviewerResult.stdout.trim().length === 0 && reviewerResult.stderr.trim().length === 0) {
-            if (!jsonMode) {
-                console.log('\n⟳ Reviewer returned no output (provider failure), will retry');
-            }
             return;
         }
+        (0, queries_js_1.clearTaskFailureCount)(db, task.id);
     }
     // STEP 2: Gather git context
     const commit_sha = (0, status_js_1.getCurrentCommitSha)(projectPath) || '';