@navels/neal 0.2.0 → 0.3.1

package/dist/neal/providers/openrouter-routing.js

@@ -0,0 +1,68 @@
+/**
+ * OpenRouter request routing for the OpenAI-compatible adapter
+ * (`openai-compatible`).
+ *
+ * OpenRouter serves a single model slug from many independent backends whose
+ * capabilities differ — some don't support structured outputs (`json_schema`)
+ * at all, others are lower-fidelity quantizations. OpenRouter picks a backend
+ * per request, so a slug that drove neal's loop yesterday can fail today with
+ * no slug change: it just got routed to a backend that can't honor the
+ * parameters neal sends. That is exactly the drift that broke the coder's
+ * structured-output cells in the live smoke.
+ *
+ * `require_parameters: true` tells OpenRouter to only route to backends that
+ * support every parameter in the request. Since neal's coder sends
+ * `response_format: { type: 'json_schema' }`, this excludes the backends that
+ * can't do structured output and keeps a slug's behavior stable across
+ * requests — so when the compat whitelist says a slug works, it keeps working.
+ *
+ * It is applied as a default (no config knob) whenever the endpoint is
+ * OpenRouter, and is a no-op for every other OpenAI-compatible endpoint, which
+ * would reject or ignore the OpenRouter-specific `provider` field.
+ */
+const OPENROUTER_HOST = 'openrouter.ai';
+export function isOpenRouterBaseUrl(baseUrl) {
+    let host;
+    try {
+        host = new URL(baseUrl).host.toLowerCase();
+    }
+    catch {
+        return false;
+    }
+    return host === OPENROUTER_HOST || host.endsWith(`.${OPENROUTER_HOST}`);
+}
+// Add `provider.require_parameters: true` to a chat-completion request body,
+// leaving an already-present `provider` block untouched (a caller that set its
+// own routing wins). Anything that isn't a JSON object body passes through
+// unchanged, so a non-chat request or an opaque body is never corrupted.
+export function injectRequireParameters(init) {
+    if (!init || typeof init.body !== 'string') {
+        return init;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(init.body);
+    }
+    catch {
+        return init;
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        return init;
+    }
+    const body = parsed;
+    if ('provider' in body) {
+        return init;
+    }
+    return { ...init, body: JSON.stringify({ ...body, provider: { require_parameters: true } }) };
+}
+/**
+ * Wrap `inner` so requests to OpenRouter carry `provider.require_parameters:
+ * true`. Returns `inner` unchanged for non-OpenRouter base URLs so no other
+ * endpoint sees the OpenRouter-specific field.
+ */
+export function withOpenRouterRouting(baseUrl, inner) {
+    if (!isOpenRouterBaseUrl(baseUrl)) {
+        return inner;
+    }
+    return (input, init) => inner(input, injectRequireParameters(init));
+}

package/dist/neal/providers/pricing.js

@@ -1,5 +1,5 @@
 // Shared pricing type and rate math for token-only provider adapters
-// (openai-compatible, generic-agentic, and openai-codex). Those adapters report
+// (openai-compatible and openai-codex). Those adapters report
 // token counts but not dollars. Cost is resolved per bucket in this order:
 // operator-configured per-million rates under
 // `providers.openai_compatible.pricing` (the override tier), else the vendored

package/dist/neal/providers/rate-card.js

@@ -89,9 +89,6 @@ export const RATE_CARD = {
     'azure/eu/gpt-4o-2024-08-06': { inputCostPerToken: 0.00000275, outputCostPerToken: 0.000011, cacheReadInputTokenCost: 0.000001375 },
     'azure/eu/gpt-4o-2024-11-20': { inputCostPerToken: 0.00000275, outputCostPerToken: 0.000011 },
     'azure/eu/gpt-4o-mini-2024-07-18': { inputCostPerToken: 1.65e-7, outputCostPerToken: 6.6e-7, cacheReadInputTokenCost: 8.3e-8 },
-    'azure/eu/gpt-4o-mini-realtime-preview-2024-12-17': { inputCostPerToken: 6.6e-7, outputCostPerToken: 0.00000264, cacheReadInputTokenCost: 3.3e-7 },
-    'azure/eu/gpt-4o-realtime-preview-2024-10-01': { inputCostPerToken: 0.0000055, outputCostPerToken: 0.000022, cacheReadInputTokenCost: 0.00000275 },
-    'azure/eu/gpt-4o-realtime-preview-2024-12-17': { inputCostPerToken: 0.0000055, outputCostPerToken: 0.000022, cacheReadInputTokenCost: 0.00000275 },
     'azure/eu/gpt-5-2025-08-07': { inputCostPerToken: 0.000001375, outputCostPerToken: 0.000011, cacheReadInputTokenCost: 1.375e-7 },
     'azure/eu/gpt-5-mini-2025-08-07': { inputCostPerToken: 2.75e-7, outputCostPerToken: 0.0000022, cacheReadInputTokenCost: 2.75e-8 },
     'azure/eu/gpt-5-nano-2025-08-07': { inputCostPerToken: 5.5e-8, outputCostPerToken: 4.4e-7, cacheReadInputTokenCost: 5.5e-9 },
@@ -154,9 +151,6 @@ export const RATE_CARD = {
     'azure/gpt-4o-mini': { inputCostPerToken: 1.65e-7, outputCostPerToken: 6.6e-7, cacheReadInputTokenCost: 7.5e-8 },
     'azure/gpt-4o-mini-2024-07-18': { inputCostPerToken: 1.65e-7, outputCostPerToken: 6.6e-7, cacheReadInputTokenCost: 7.5e-8 },
     'azure/gpt-4o-mini-audio-preview-2024-12-17': { inputCostPerToken: 0.0000025, outputCostPerToken: 0.00001 },
-    'azure/gpt-4o-mini-realtime-preview-2024-12-17': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 3e-7 },
-    'azure/gpt-4o-realtime-preview-2024-10-01': { inputCostPerToken: 0.000005, outputCostPerToken: 0.00002, cacheReadInputTokenCost: 0.0000025 },
-    'azure/gpt-4o-realtime-preview-2024-12-17': { inputCostPerToken: 0.000005, outputCostPerToken: 0.00002, cacheReadInputTokenCost: 0.0000025 },
     'azure/gpt-5': { inputCostPerToken: 0.00000125, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 1.25e-7 },
     'azure/gpt-5-2025-08-07': { inputCostPerToken: 0.00000125, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 1.25e-7 },
     'azure/gpt-5-chat': { inputCostPerToken: 0.00000125, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 1.25e-7 },
@@ -204,9 +198,6 @@ export const RATE_CARD = {
     'azure/gpt-audio-1.5-2026-02-23': { inputCostPerToken: 0.0000025, outputCostPerToken: 0.00001 },
     'azure/gpt-audio-2025-08-28': { inputCostPerToken: 0.0000025, outputCostPerToken: 0.00001 },
     'azure/gpt-audio-mini-2025-10-06': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024 },
-    'azure/gpt-realtime-1.5-2026-02-23': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 0.000004 },
-    'azure/gpt-realtime-2025-08-28': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 0.000004 },
-    'azure/gpt-realtime-mini-2025-10-06': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 6e-8 },
     'azure/mistral-large-2402': { inputCostPerToken: 0.000008, outputCostPerToken: 0.000024 },
     'azure/mistral-large-latest': { inputCostPerToken: 0.000008, outputCostPerToken: 0.000024 },
     'azure/o1': { inputCostPerToken: 0.000015, outputCostPerToken: 0.00006, cacheReadInputTokenCost: 0.0000075 },
@@ -230,9 +221,6 @@ export const RATE_CARD = {
     'azure/us/gpt-4o-2024-08-06': { inputCostPerToken: 0.00000275, outputCostPerToken: 0.000011, cacheReadInputTokenCost: 0.000001375 },
     'azure/us/gpt-4o-2024-11-20': { inputCostPerToken: 0.00000275, outputCostPerToken: 0.000011 },
     'azure/us/gpt-4o-mini-2024-07-18': { inputCostPerToken: 1.65e-7, outputCostPerToken: 6.6e-7, cacheReadInputTokenCost: 8.3e-8 },
-    'azure/us/gpt-4o-mini-realtime-preview-2024-12-17': { inputCostPerToken: 6.6e-7, outputCostPerToken: 0.00000264, cacheReadInputTokenCost: 3.3e-7 },
-    'azure/us/gpt-4o-realtime-preview-2024-10-01': { inputCostPerToken: 0.0000055, outputCostPerToken: 0.000022, cacheReadInputTokenCost: 0.00000275 },
-    'azure/us/gpt-4o-realtime-preview-2024-12-17': { inputCostPerToken: 0.0000055, outputCostPerToken: 0.000022, cacheReadInputTokenCost: 0.00000275 },
     'azure/us/gpt-5-2025-08-07': { inputCostPerToken: 0.000001375, outputCostPerToken: 0.000011, cacheReadInputTokenCost: 1.375e-7 },
     'azure/us/gpt-5-mini-2025-08-07': { inputCostPerToken: 2.75e-7, outputCostPerToken: 0.0000022, cacheReadInputTokenCost: 2.75e-8 },
     'azure/us/gpt-5-nano-2025-08-07': { inputCostPerToken: 5.5e-8, outputCostPerToken: 4.4e-7, cacheReadInputTokenCost: 5.5e-9 },
@@ -807,7 +795,7 @@ export const RATE_CARD = {
     'fireworks_ai/accounts/fireworks/models/glm-4p6': { inputCostPerToken: 5.5e-7, outputCostPerToken: 0.00000219 },
     'fireworks_ai/accounts/fireworks/models/glm-4p7': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000022, cacheReadInputTokenCost: 3e-7 },
     'fireworks_ai/accounts/fireworks/models/glm-5p1': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 2.6e-7 },
-    'fireworks_ai/accounts/fireworks/models/glm-5p2': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 2.6e-7 },
+    'fireworks_ai/accounts/fireworks/models/glm-5p2': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 1.4e-7 },
     'fireworks_ai/accounts/fireworks/models/gpt-oss-120b': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7, cacheReadInputTokenCost: 1.5e-8 },
     'fireworks_ai/accounts/fireworks/models/gpt-oss-20b': { inputCostPerToken: 7e-8, outputCostPerToken: 3e-7, cacheReadInputTokenCost: 3.5e-8 },
     'fireworks_ai/accounts/fireworks/models/gpt-oss-safeguard-120b': { inputCostPerToken: 0.0000012, outputCostPerToken: 0.0000012 },
@@ -988,7 +976,7 @@ export const RATE_CARD = {
     'fireworks_ai/glm-4p7': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000022, cacheReadInputTokenCost: 3e-7 },
     'fireworks_ai/glm-5p1': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 2.6e-7 },
     'fireworks_ai/glm-5p1-fast': { inputCostPerToken: 0.0000028, outputCostPerToken: 0.0000088, cacheReadInputTokenCost: 5.2e-7 },
-    'fireworks_ai/glm-5p2': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 2.6e-7 },
+    'fireworks_ai/glm-5p2': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 1.4e-7 },
     'fireworks_ai/gpt-oss-120b': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7, cacheReadInputTokenCost: 1.5e-8 },
     'fireworks_ai/gpt-oss-20b': { inputCostPerToken: 7e-8, outputCostPerToken: 3e-7, cacheReadInputTokenCost: 3.5e-8 },
     'fireworks_ai/kimi-k2p5': { inputCostPerToken: 6e-7, outputCostPerToken: 0.000003, cacheReadInputTokenCost: 1e-7 },
@@ -1149,13 +1137,8 @@ export const RATE_CARD = {
     'gpt-4o-mini-2024-07-18': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7, cacheReadInputTokenCost: 7.5e-8 },
     'gpt-4o-mini-audio-preview': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7 },
     'gpt-4o-mini-audio-preview-2024-12-17': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7 },
-    'gpt-4o-mini-realtime-preview': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 3e-7 },
-    'gpt-4o-mini-realtime-preview-2024-12-17': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 3e-7 },
     'gpt-4o-mini-search-preview': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7, cacheReadInputTokenCost: 7.5e-8 },
     'gpt-4o-mini-search-preview-2025-03-11': { inputCostPerToken: 1.5e-7, outputCostPerToken: 6e-7, cacheReadInputTokenCost: 7.5e-8 },
-    'gpt-4o-realtime-preview': { inputCostPerToken: 0.000005, outputCostPerToken: 0.00002, cacheReadInputTokenCost: 0.0000025 },
-    'gpt-4o-realtime-preview-2024-12-17': { inputCostPerToken: 0.000005, outputCostPerToken: 0.00002, cacheReadInputTokenCost: 0.0000025 },
-    'gpt-4o-realtime-preview-2025-06-03': { inputCostPerToken: 0.000005, outputCostPerToken: 0.00002, cacheReadInputTokenCost: 0.0000025 },
     'gpt-4o-search-preview': { inputCostPerToken: 0.0000025, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 0.00000125 },
     'gpt-4o-search-preview-2025-03-11': { inputCostPerToken: 0.0000025, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 0.00000125 },
     'gpt-5': { inputCostPerToken: 0.00000125, outputCostPerToken: 0.00001, cacheReadInputTokenCost: 1.25e-7 },
@@ -1207,15 +1190,6 @@ export const RATE_CARD = {
     'gpt-audio-mini': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024 },
     'gpt-audio-mini-2025-10-06': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024 },
     'gpt-audio-mini-2025-12-15': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024 },
-    'gpt-realtime': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 4e-7 },
-    'gpt-realtime-1.5': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 4e-7 },
-    'gpt-realtime-2': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 4e-7 },
-    'gpt-realtime-2.1': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000024, cacheReadInputTokenCost: 4e-7 },
-    'gpt-realtime-2.1-mini': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 6e-8 },
-    'gpt-realtime-2025-08-28': { inputCostPerToken: 0.000004, outputCostPerToken: 0.000016, cacheReadInputTokenCost: 4e-7 },
-    'gpt-realtime-mini': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024 },
-    'gpt-realtime-mini-2025-10-06': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 6e-8 },
-    'gpt-realtime-mini-2025-12-15': { inputCostPerToken: 6e-7, outputCostPerToken: 0.0000024, cacheReadInputTokenCost: 6e-8 },
     'gradient_ai/anthropic-claude-3-opus': { inputCostPerToken: 0.000015, outputCostPerToken: 0.000075 },
     'gradient_ai/anthropic-claude-3.5-haiku': { inputCostPerToken: 8e-7, outputCostPerToken: 0.000004 },
     'gradient_ai/anthropic-claude-3.5-sonnet': { inputCostPerToken: 0.000003, outputCostPerToken: 0.000015 },
@@ -2292,10 +2266,10 @@ export const RATE_CARD = {
     'zai/glm-5.1': { inputCostPerToken: 0.0000014, outputCostPerToken: 0.0000044, cacheReadInputTokenCost: 2.6e-7 },
 };
 export const RATE_CARD_SOURCE = {
-    url: 'https://raw.githubusercontent.com/BerriAI/litellm/f1f33f560f7a39e86f7a2e5b26b9fa032f9dcaba/model_prices_and_context_window.json',
-    commit: 'f1f33f560f7a39e86f7a2e5b26b9fa032f9dcaba',
-    retrievedAt: '2026-07-15',
-    sha256: '33cedefa26df0ea38c526cd8939dd420b69ce68efd0e78f091871781ccac3bde',
+    url: 'https://raw.githubusercontent.com/BerriAI/litellm/d9661222492a098555f40cb8b50014054bea5ab8/model_prices_and_context_window.json',
+    commit: 'd9661222492a098555f40cb8b50014054bea5ab8',
+    retrievedAt: '2026-07-18',
+    sha256: '8d5fdb443371f8334c28cb0ff64bf0f36ad135ec6f766eec767cc62d3b7f8092',
     predicate: 'key != sample_spec; finite non-negative input & output cost-per-token; mode in {chat,completion,responses} or absent',
     note: 'community-maintained list prices; rate-computed cost is an estimate',
 };

package/dist/neal/providers/registry.js

@@ -1,7 +1,6 @@
 import { anthropicClaudeProviderDefinition } from './anthropic-claude.js';
-import { genericAgenticProviderDefinition } from './generic-agentic.js';
-import { openAICodexProviderDefinition } from './openai-codex.js';
 import { openAICompatibleProviderDefinition } from './openai-compatible.js';
+import { openAICodexProviderDefinition } from './openai-codex.js';
 // Computed lazily instead of as a top-level constant: openai-compatible.ts
 // imports config.ts, which imports this module, so the definition bindings may
 // still be in their temporal dead zone while this module body evaluates.
@@ -12,7 +11,6 @@ function getBuiltInProviderDefinitions() {
         openAICodexProviderDefinition,
         anthropicClaudeProviderDefinition,
         openAICompatibleProviderDefinition,
-        genericAgenticProviderDefinition,
     ];
 }
 const providerCapabilityOverrides = new Map();
@@ -108,15 +106,6 @@ function assertRoleCapabilities(args) {
             missingCapability: 'read_tool_access',
         });
     }
-    if (args.requirementContext.requireReadToolAccessOrInlineReviewerContext &&
-        !args.capabilities.toolAccess.read &&
-        !(args.capabilities.supported && args.capabilities.supportsStructuredOutput)) {
-        throwProviderCapabilityError({
-            requirementContext: args.requirementContext,
-            config: args.config,
-            missingCapability: 'read_tool_access_or_inline_reviewer_context',
-        });
-    }
     if (args.requirementContext.requireWriteToolAccess && !args.capabilities.toolAccess.write) {
         throwProviderCapabilityError({
             requirementContext: args.requirementContext,
@@ -161,9 +150,9 @@ function assertRoleCapabilities(args) {
 // Registry invariant: every *supported* structured-advisor (reviewer)
 // capability must be read-only. Reviewers inspect work and return verdicts;
 // they never mutate the checkout or run shell commands. Only `write`/`shell`
-// are constrained here — `read` is unconstrained (a reviewer may read the
-// checkout directly, or be a no-read inline-context reviewer). The `coder`
-// capability is intentionally not checked: coders keep write/shell.
+// are constrained here — `read` is not constrained by this assertion (the
+// writer-run capability gates separately require reviewer read access). The
+// `coder` capability is intentionally not checked: coders keep write/shell.
 export function assertStructuredAdvisorReadOnly(definition) {
     const capability = definition.capabilities['structured-advisor'];
     if (!capability.supported) {
@@ -280,11 +269,11 @@ export function assertAgentConfigSupportsWriterRun(agentConfig, options = {}) {
         role: 'reviewer',
         context,
         reason: 'Neal writer runs need a reviewer provider that can inspect work and return structured verdicts',
-        requireReadToolAccessOrInlineReviewerContext: true,
+        requireReadToolAccess: true,
         requireStructuredOutput: true,
         reasons: {
             structured_advisor_adapter: 'reviewer, plan-review, support, and final-completion verdicts run through the structured-advisor adapter',
-            read_tool_access_or_inline_reviewer_context: 'reviewer rounds must either inspect repository state, diffs, and run artifacts directly with read tools, or support structured output so Neal can supply inline reviewer context (full diff, plan document, run artifacts) in the prompt',
+            read_tool_access: 'reviewer rounds must inspect repository state, diffs, and run artifacts directly with read tools',
             structured_output: 'reviewer rounds return schema-validated structured verdicts',
             model_override: 'a non-null reviewer model override is configured for this writer run',
         },

package/dist/neal/providers/types.js

@@ -1,3 +1,15 @@
+// Detects an OpenAI content-safety refusal in a provider-authored error or
+// exception message. OpenAI flags security-adjacent requests with a stable
+// notice ("This content was flagged for possible cybersecurity risk ... join
+// the Trusted Access for Cyber ..."); either substring is specific enough that
+// ordinary review findings mentioning "security" do not trip it. Callers must
+// only pass error-channel text (an embedded gateway error message or an
+// HTTP/transport exception message), never assistant review content.
+export function isContentSafetyRefusalMessage(message) {
+    const text = message.toLowerCase();
+    return (text.includes('flagged for possible cybersecurity risk') ||
+        text.includes('trusted access for cyber'));
+}
 export class NealProviderError extends Error {
     provider;
     role;

package/dist/neal/resume-decision.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { planResumeActions } from './resume-planner.js';
-import { getInteractiveRecoveryView } from './state-views.js';
+import { getInteractiveRecoveryView, getPlanReviewGuidanceOriginPhase } from './state-views.js';
 export function decideResumeAction(args) {
     const resumeCommand = formatResumeCommand(args.selectedRunId);
     const messageCommand = formatMessageCommand(args.selectedRunId);
@@ -86,11 +86,12 @@ export function decideResumeAction(args) {
     };
 }
 function isWaitingForPlanReviewGuidance(state) {
-    return (state.topLevelMode === 'plan' &&
-        state.status === 'blocked' &&
-        state.phase === 'blocked' &&
-        state.blockedFromPhase === 'reviewer_plan' &&
-        state.pendingPlanReviewGuidance === null);
+    // Shared discriminator: reviewer_plan plus coder-authored *response* blocks
+    // (which carry a durable blockerReason); dirty-worktree safety blocks at the
+    // same response phase have blockerReason null and are excluded. Evaluated before
+    // planResumeActions in decideResumeAction, so this needs_message decision takes
+    // precedence over a bare-resume restore of a genuine coder-authored block.
+    return getPlanReviewGuidanceOriginPhase(state) !== null;
 }
 function hasPendingPlanReviewGuidance(state) {
     return state.topLevelMode === 'plan' && state.pendingPlanReviewGuidance !== null;

package/dist/neal/resume-planner.js

@@ -132,11 +132,13 @@ function applyPlannedStatusAction(state, action) {
                 ...state,
                 phase: action.phase,
                 status: 'running',
+                blockerReason: null,
             };
         case 'normalize_stopped_status':
             return {
                 ...state,
                 status: 'running',
+                blockerReason: null,
             };
         default:
             return state;
@@ -173,6 +175,7 @@ function applyPlannedDerivedPlanAction(state, action) {
                 phase: action.phase,
                 status: 'running',
                 blockedFromPhase: null,
+                blockerReason: null,
             };
         case 'block_rejected_abandoned_derived_plan':
             return {
@@ -197,6 +200,10 @@ async function restoreResumableBlockedPhase(state, statePath, logger, action) {
         ...state,
         phase: action.phase,
         status: 'running',
+        // A coder-authored plan-stage response block persists a durable blockerReason;
+        // the resume planner is its first blocked->running writer, so clear it here so
+        // the reason never outlives its block (and the state satisfies the invariant).
+        blockerReason: null,
     });
     await logger?.event('run.resumed_from_blocked', {
         statePath,
@@ -210,6 +217,7 @@ async function normalizeStoppedStatus(state, statePath, logger, action) {
     const nextState = await saveState(statePath, {
         ...state,
         status: 'running',
+        blockerReason: null,
     });
     await logger?.event('run.status_normalized_on_resume', {
         statePath,
@@ -228,6 +236,7 @@ async function promoteUnexecutedDerivedPlan(state, statePath, logger, action) {
         phase: action.phase,
         status: 'running',
         blockedFromPhase: null,
+        blockerReason: null,
     });
     await logger?.event(action.kind === 'promote_accepted_derived_plan'
         ? 'run.promoted_accepted_derived_plan_on_resume'

package/dist/neal/retrospective.js

@@ -248,7 +248,7 @@ function summarizeBlocker(state) {
     const persistedBlocker = latestCompletedScope?.blocker?.trim() || null;
     const recovery = state.interactiveBlockedRecovery;
     const recoveryBlocker = recovery?.blockedReason?.trim() || null;
-    const advice = recovery?.adjudicatorAdvice ?? null;
+    const advice = recovery?.consultantAdvice ?? null;
     const lines = [];
     if (persistedBlocker) {
         lines.push(`- Final blocker: ${persistedBlocker}`);
@@ -257,9 +257,9 @@ function summarizeBlocker(state) {
         lines.push(`- Recovery blocker: ${recoveryBlocker}`);
     }
     if (advice) {
-        lines.push(`- Adjudicator triage: ${advice.triageCategory} (recoverable: ${advice.recoverable ? 'yes' : 'no'})`);
+        lines.push(`- Consultant triage: ${advice.triageCategory} (recoverable: ${advice.recoverable ? 'yes' : 'no'})`);
         if (advice.resolutionDirective.trim()) {
-            lines.push(`- Adjudicator suggested directive: ${advice.resolutionDirective.trim()}`);
+            lines.push(`- Consultant suggested directive: ${advice.resolutionDirective.trim()}`);
         }
     }
     if (lines.length === 0) {

package/dist/neal/review-debt.js

@@ -16,3 +16,33 @@ export function toResidualReviewDebt(findings) {
         coderCommit: finding.coderCommit,
     }));
 }
+// Plan-review debt is a canonical-keyed *projection* of the current findings,
+// never an accumulator: for each canonicalId whose latest-round finding is a
+// deferred verification-hardening finding, emit exactly one debt item (latest
+// round wins). A canonical that later reopens (its latest finding goes back to
+// open) or is fixed/rejected simply drops out of the projection, so the debt
+// lifecycle is automatic — no stale or duplicate entries and no removal rule.
+export function toPlanReviewDebt(findings) {
+    const latestByCanonical = new Map();
+    for (const finding of findings) {
+        const existing = latestByCanonical.get(finding.canonicalId);
+        if (!existing || finding.round >= existing.round) {
+            latestByCanonical.set(finding.canonicalId, finding);
+        }
+    }
+    return [...latestByCanonical.values()]
+        .filter((finding) => finding.status === 'deferred' && finding.findingClass === 'verification_hardening')
+        .map((finding) => ({
+        id: finding.id,
+        canonicalId: finding.canonicalId,
+        status: 'deferred',
+        files: [...finding.files],
+        claim: finding.claim,
+        evidence: finding.evidence ?? null,
+        requiredAction: finding.requiredAction,
+        coderDisposition: finding.coderDisposition,
+        coderCommit: finding.coderCommit,
+        findingClass: finding.findingClass,
+        originRound: finding.round,
+    }));
+}

package/dist/neal/review-findings/provider.js

@@ -1,6 +1,6 @@
 import { getAgentTurnRetryLimit, getAgentTurnStartupTimeoutMs, getApiRetryLimit, getDefaultCoderModel, getDefaultCoderProvider, getDefaultReviewerModel, getDefaultReviewerProvider, getInactivityTimeoutMs, } from '../config.js';
 import { runCoderStructuredPrompt } from '../agents/structured-coder.js';
-import { createInlineSection, getReviewerDoctrineAccessMode, readOnlyReviewerNeedsInlinedDiff, renderInlineReviewerContext, reviewerNeedsInlineContext, } from '../context/inline-review-context.js';
+import { getReviewerDoctrineAccessMode, readOnlyReviewerNeedsInlinedDiff, } from '../context/inline-review-context.js';
 import { runWithAgentTurnLiveness } from '../providers/liveness.js';
 import { assertProviderSupportsCoder, assertProviderSupportsStructuredAdvisor, getStructuredAdvisorAdapter, } from '../providers/registry.js';
 import { createProviderTelemetrySink } from '../providers/telemetry.js';
@@ -47,25 +47,21 @@ class AgentReviewFindingsProviderAdapter {
     async reviewDraft(args) {
         const reviewer = getStructuredAdvisorAdapter(this.args.agentConfig.reviewer);
         const schema = buildReviewFindingsReviewSchema();
-        // The base adjudication prompt only previews the diff. A reviewer without
-        // repository read access gets the full selected diff and the draft
-        // findings artifact inlined so it can adjudicate entirely from the
-        // prompt. A read-only reviewer (read tools, no shell) that exposes its own
-        // commit-range diff tool gets the read-only range-inspection section
-        // directing it to the git_diff tool with the exact resolved revisions; a
-        // read-only reviewer without a commit-range diff tool (native Claude/Codex)
-        // instead gets the full selected diff inlined and no git_diff-tool
-        // instruction, because it can neither run git commands, call a git_diff
-        // tool, nor rely on the truncated preview. Tool-access reviewers keep the
-        // built prompt byte-identical.
+        // The base adjudication prompt only previews the diff. A read-only
+        // reviewer (read tools, no shell) that exposes its own commit-range diff
+        // tool gets the read-only range-inspection section directing it to the
+        // git_diff tool with the exact resolved revisions; a read-only reviewer
+        // without a commit-range diff tool (native Claude/Codex) instead gets the
+        // full selected diff inlined and no git_diff-tool instruction, because it
+        // can neither run git commands, call a git_diff tool, nor rely on the
+        // truncated preview. Tool-access reviewers keep the built prompt
+        // byte-identical.
         const accessMode = getReviewerDoctrineAccessMode(this.args.agentConfig.reviewer);
-        const prompt = reviewerNeedsInlineContext(this.args.agentConfig.reviewer)
-            ? `${args.prompt}\n\n${renderInlineReviewerContext(buildReviewFindingsReviewInlineContext(args))}`
-            : accessMode === 'read-only'
-                ? readOnlyReviewerNeedsInlinedDiff(this.args.agentConfig.reviewer)
-                    ? `${args.prompt}\n\n${buildReviewFindingsInlinedDiffSection(args.context)}`
-                    : `${args.prompt}\n\n${buildReviewFindingsReadOnlyInspectionSection(args.context)}`
-                : args.prompt;
+        const prompt = accessMode === 'read-only'
+            ? readOnlyReviewerNeedsInlinedDiff(this.args.agentConfig.reviewer)
+                ? `${args.prompt}\n\n${buildReviewFindingsInlinedDiffSection(args.context)}`
+                : `${args.prompt}\n\n${buildReviewFindingsReadOnlyInspectionSection(args.context)}`
+            : args.prompt;
         const result = await runWithAgentTurnLiveness({
             provider: this.args.agentConfig.reviewer.provider,
             role: 'structured-advisor',
@@ -102,14 +98,6 @@ class AgentReviewFindingsProviderAdapter {
         return validateReviewFindingsReview(result.structured);
     }
 }
-function buildReviewFindingsReviewInlineContext(args) {
-    return {
-        sections: [
-            createInlineSection(`Full selected diff for range ${args.context.externalBaseCommit}..${args.context.externalHeadCommit}`, args.context.diff || '(empty diff)'),
-            createInlineSection('Draft findings artifact under adjudication', JSON.stringify(args.draft, null, 2)),
-        ],
-    };
-}
 function buildReviewFindingsProtocolSpec(args) {
     return {
         protocol: 'neal-json-block-v1',
@@ -160,11 +148,11 @@ function assertReviewAgentCapabilities(agentConfig) {
         role: 'reviewer',
         context: 'neal review',
         reason: 'neal review uses the configured reviewer provider to adjudicate and accept or revise the findings artifact',
-        requireReadToolAccessOrInlineReviewerContext: true,
+        requireReadToolAccess: true,
         requireStructuredOutput: true,
         reasons: {
             structured_advisor_adapter: 'review findings adjudication runs through the configured structured-advisor adapter',
-            read_tool_access_or_inline_reviewer_context: 'the reviewer must either inspect the draft, selected diff, and repository context directly with read tools, or support structured output so Neal can inline the draft findings artifact and the full selected diff into the adjudication prompt',
+            read_tool_access: 'the reviewer must inspect the draft, selected diff, and repository context directly with read tools',
             structured_output: 'the reviewer verdict must be schema-validated before Neal accepts the findings artifact',
             model_override: 'a non-null reviewer model override is configured for review adjudication',
         },

package/dist/neal/review.js

@@ -126,12 +126,28 @@ export function renderReviewMarkdown(state) {
         for (const round of rounds) {
             lines.push('', `## Round ${round} Findings`);
             for (const finding of state.findings.filter((item) => item.round === round)) {
-                lines.push('', `### ${finding.id}`, `- Canonical ID: ${finding.canonicalId}`, `- Source: ${finding.source}`, `- Severity: ${finding.severity}`, `- Status: ${finding.status}`, `- Files: ${finding.files.join(', ') || 'n/a'}`, `- Claim: ${finding.claim}`, `- Evidence: ${finding.evidence?.trim() || 'n/a'}`, `- Required action: ${finding.requiredAction}`, `- Round summary: ${finding.roundSummary}`, `- Coder disposition: ${finding.coderDisposition ?? 'pending'}`, `- Coder commit: ${finding.coderCommit ?? 'pending'}`);
+                lines.push('', `### ${finding.id}`, `- Canonical ID: ${finding.canonicalId}`, `- Source: ${finding.source}`, `- Severity: ${finding.severity}`, 
+                // 'n/a' keeps execute-review findings (which carry no class)
+                // semantically unchanged rather than mislabeling them plan_correctness.
+                `- Finding class: ${finding.findingClass ?? 'n/a'}`, `- Status: ${finding.status}`, `- Files: ${finding.files.join(', ') || 'n/a'}`, `- Claim: ${finding.claim}`, `- Evidence: ${finding.evidence?.trim() || 'n/a'}`, `- Required action: ${finding.requiredAction}`, `- Round summary: ${finding.roundSummary}`, `- Coder disposition: ${finding.coderDisposition ?? 'pending'}`, `- Coder commit: ${finding.coderCommit ?? 'pending'}`);
             }
         }
     }
+    lines.push('', '## Plan Review Debt');
+    appendPlanReviewDebtGroup(lines, 'Inherited', state.inheritedPlanReviewDebt);
+    appendPlanReviewDebtGroup(lines, 'Current', state.planReviewDebt);
     return `${lines.join('\n')}\n`;
 }
+function appendPlanReviewDebtGroup(lines, label, items) {
+    lines.push('', `### ${label}`);
+    if (items.length === 0) {
+        lines.push('- none');
+        return;
+    }
+    for (const item of items) {
+        lines.push(`- ${item.canonicalId}: findingClass=${item.findingClass ?? 'n/a'}; originRound=${item.originRound ?? 'n/a'}; claim=${item.claim}; requiredAction=${item.requiredAction}; coderDisposition=${item.coderDisposition ?? 'none'}`);
+    }
+}
 export async function writeReviewMarkdown(path, state) {
     await writeTextAtomic(path, renderReviewMarkdown(state));
 }

package/dist/neal/state-invariants.js

@@ -307,8 +307,10 @@ function assertValidPendingPlanReviewGuidance(state, context) {
         throwStateInvariant(context, 'pendingPlanReviewGuidance', `expected null for ${formatInvalidValue(state.topLevelMode)} mode`);
     }
     assertNonEmptyString(guidance.message, 'pendingPlanReviewGuidance.message', context);
-    if (guidance.sourcePhase !== 'reviewer_plan') {
-        throwStateInvariant(context, 'pendingPlanReviewGuidance.sourcePhase', `expected "reviewer_plan", received ${formatInvalidValue(guidance.sourcePhase)}`);
+    if (guidance.sourcePhase !== 'reviewer_plan' &&
+        guidance.sourcePhase !== 'coder_plan_response' &&
+        guidance.sourcePhase !== 'coder_plan_optional_response') {
+        throwStateInvariant(context, 'pendingPlanReviewGuidance.sourcePhase', `expected one of "reviewer_plan", "coder_plan_response", "coder_plan_optional_response", received ${formatInvalidValue(guidance.sourcePhase)}`);
     }
     if (typeof guidance.recordedAt !== 'string') {
         throwStateInvariant(context, 'pendingPlanReviewGuidance.recordedAt', `expected string, received ${formatInvalidValue(guidance.recordedAt)}`);
@@ -466,10 +468,16 @@ export function assertValidOrchestrationState(state, context) {
     if (activeStatusInTerminalPhase) {
         throwStateInvariant(context, 'status', `cannot be ${JSON.stringify(state.status)} while phase is terminal ${JSON.stringify(state.phase)}`);
     }
+    // The durable coder-authored plan-stage blocker reason must never outlive its
+    // block: any return to a non-blocked status (running/paused/done/failed) must
+    // have cleared it. This catches a missed clear at the next save/load.
+    if (state.status !== 'blocked' && state.blockerReason !== null) {
+        throwStateInvariant(context, 'blockerReason', `expected null when status is ${JSON.stringify(state.status)}, received ${formatInvalidValue(state.blockerReason)}`);
+    }
     assertSafeIntegerAtLeast(state.currentScopeNumber, 'currentScopeNumber', 0, context);
     assertSafeIntegerAtLeast(state.coderRetryCount, 'coderRetryCount', 0, context);
     assertSafeIntegerAtLeast(state.unattendedAutoResumeCount, 'unattendedAutoResumeCount', 0, context);
-    assertSafeIntegerAtLeast(state.reviewStuckArbiterCount, 'reviewStuckArbiterCount', 0, context);
+    assertSafeIntegerAtLeast(state.consultantAttemptCount, 'consultantAttemptCount', 0, context);
     assertSafeIntegerAtLeast(state.finalCompletionContinueExecutionCount, 'finalCompletionContinueExecutionCount', 0, context);
     assertSafeIntegerAtLeast(state.splitPlanCountForCurrentScope, 'splitPlanCountForCurrentScope', 0, context);
     assertSafeIntegerAtLeast(state.derivedPlanDepth, 'derivedPlanDepth', 0, context);

package/dist/neal/state-views.js

@@ -117,13 +117,35 @@ export function getInteractiveRecoveryView(state) {
         pendingOperatorGuidance,
     };
 }
+// The plan-stage blocked origin that a top-level plan run can answer via
+// `neal resume --message`, or null when the run is not in such a wait. The
+// reviewer-plan message-resume path is always eligible. A coder-authored
+// *response* block (coder_plan_response / coder_plan_optional_response) is
+// eligible only when it carries the durable `blockerReason`: Scope 6 sets that
+// reason exclusively for coder_authored landings and leaves it null for a
+// dirty-worktree safety block, which lands at the same phase but must stay a
+// normal blocked state (no --message route, no waiting-for-guidance status). The
+// initial `coder_plan` authoring block is deliberately excluded.
+export function getPlanReviewGuidanceOriginPhase(state) {
+    if (state.topLevelMode !== 'plan' ||
+        state.status !== 'blocked' ||
+        state.phase !== 'blocked' ||
+        state.pendingPlanReviewGuidance !== null) {
+        return null;
+    }
+    if (state.blockedFromPhase === 'reviewer_plan') {
+        return 'reviewer_plan';
+    }
+    if ((state.blockedFromPhase === 'coder_plan_response' ||
+        state.blockedFromPhase === 'coder_plan_optional_response') &&
+        state.blockerReason !== null) {
+        return state.blockedFromPhase;
+    }
+    return null;
+}
 export function getPlanReviewGuidanceView(state) {
     const pendingOperatorGuidance = state.topLevelMode === 'plan' && state.pendingPlanReviewGuidance !== null;
-    const waitingForOperatorGuidance = state.topLevelMode === 'plan' &&
-        state.status === 'blocked' &&
-        state.phase === 'blocked' &&
-        state.blockedFromPhase === 'reviewer_plan' &&
-        state.pendingPlanReviewGuidance === null;
+    const waitingForOperatorGuidance = getPlanReviewGuidanceOriginPhase(state) !== null;
     return {
         kind: 'plan_review_guidance',
         waitingForOperatorGuidance,