@pellux/goodvibes-sdk 0.30.2 → 0.33.0

package/dist/platform/agents/orchestrator-runner.js

@@ -1,6 +1,13 @@
+// OrchestratorRunner — single-agent turn loop coordinator.
+//
+// This module implements the coordinator pattern: it orchestrates agent runs
+// (LLM call → tool execution → loop) but delegates domain logic to imported
+// collaborators (ConversationManager, ToolRegistry, AgentSession, etc.).
+// It does not own any state beyond the duration of a single runAgentLoop() call.
 import { ConversationManager } from '../core/conversation.js';
 import { ToolRegistry } from '../tools/registry.js';
 import { join } from 'node:path';
+import { splitModelRegistryKey } from '../providers/registry-helpers.js';
 import { logger } from '../utils/logger.js';
 import { ConsecutiveErrorBreaker } from '../core/circuit-breaker.js';
 import { isRateLimitOrQuotaError, isContextSizeExceededError } from '../types/errors.js';
@@ -11,12 +18,46 @@ import { buildLayeredOrchestratorSystemPrompt, buildOrchestratorSystemPrompt } f
 import { summarizeError } from '../utils/error-display.js';
 import { resolveScopedDirectory } from '../runtime/surface-root.js';
 import { appendGoodVibesRuntimeAwarenessPrompt } from '../tools/goodvibes-runtime/index.js';
-const MAX_TURNS = 50;
-const NETWORK_RETRY_DELAYS_MS = [5_000, 10_000, 20_000, 40_000, 60_000];
-const RATE_LIMIT_RETRY_DELAY_MS = 60_000;
-const RATE_LIMIT_MAX_RETRIES = 3;
-const CONTEXT_COMPACT_THRESHOLD = 0.85;
-const MIN_WINDOW_FOR_LLM_COMPACT = 12_000;
+const MAX_TURNS = 50; // hard cap per agent run to prevent unbounded loops
+const NETWORK_RETRY_DELAYS_MS = [5_000, 10_000, 20_000, 40_000, 60_000]; // exponential back-off on transient network errors
+const RATE_LIMIT_RETRY_DELAY_MS = 60_000; // fixed pause on 429/quota responses
+const RATE_LIMIT_MAX_RETRIES = 3; // cap retries so a sustained quota violation terminates cleanly
+const MAX_CHAT_RETRY_ITERATIONS = NETWORK_RETRY_DELAYS_MS.length + RATE_LIMIT_MAX_RETRIES + 4; // total iteration budget across all retry categories
+const CONTEXT_COMPACT_THRESHOLD = 0.85; // fraction of context window at which compaction is triggered
+const MIN_WINDOW_FOR_LLM_COMPACT = 12_000; // don't attempt LLM-driven compaction below this token floor
+function parseProviderQualifiedRouteId(modelId) {
+    const trimmed = modelId?.trim();
+    if (!trimmed?.includes(':'))
+        return null;
+    try {
+        const { providerId } = splitModelRegistryKey(trimmed);
+        return { providerId, registryKey: trimmed };
+    }
+    catch {
+        return null;
+    }
+}
+function providerQualifiedRouteLabel(activeRoute) {
+    return (parseProviderQualifiedRouteId(activeRoute.requestedModelId)?.registryKey
+        ?? parseProviderQualifiedRouteId(activeRoute.modelId)?.registryKey
+        ?? `${activeRoute.provider.name}:${activeRoute.requestedModelId || activeRoute.modelId}`);
+}
+export function resolveContextWindowModelDefinition(providerRegistry, activeRoute) {
+    const models = providerRegistry.listModels();
+    const providerQualifiedRouteIds = [
+        parseProviderQualifiedRouteId(activeRoute.requestedModelId),
+        parseProviderQualifiedRouteId(activeRoute.modelId),
+    ].filter((routeId) => routeId !== null);
+    for (const routeId of providerQualifiedRouteIds) {
+        const exactRegistryMatch = models.find((model) => model.provider === routeId.providerId && model.registryKey === routeId.registryKey);
+        if (exactRegistryMatch)
+            return exactRegistryMatch;
+    }
+    const routeProviderId = providerQualifiedRouteIds[0]?.providerId ?? activeRoute.provider.name;
+    return models.find((model) => model.provider === routeProviderId &&
+        (model.id === activeRoute.modelId ||
+            model.id === activeRoute.requestedModelId)) ?? providerRegistry.getCurrentModel();
+}
 function isNetworkError(err) {
     if (!(err instanceof Error))
         return false;
@@ -81,8 +122,10 @@ async function disposeSession(session) {
     try {
         await session.dispose();
     }
-    catch {
-        // non-fatal
+    catch (error) {
+        logger.warn('[AgentOrchestrator] session disposal failed', {
+            error: summarizeError(error),
+        });
     }
 }
 async function executeToolCalls(toolCalls, toolRegistry, session, turn, record, callHistory, callHistoryWindow, context) {
@@ -307,14 +350,11 @@ export async function runAgentTask(context, record) {
             session.appendMessage({ type: 'llm_request', turn, messageCount: conversation.getMessagesForLLM().length, timestamp: new Date().toISOString() });
             const pending = context.messageBus.getMessages(record.id);
             for (const msg of pending) {
-                const kindLabel = msg.kind[0].toUpperCase() + msg.kind.slice(1);
+                const kindLabel = (msg.kind[0] ?? '').toUpperCase() + msg.kind.slice(1);
                 conversation.addUserMessage(`[${kindLabel} from ${msg.from}]: ${msg.content}`);
             }
             if (context.featureFlagManager?.isEnabled('agent-context-window-awareness') ?? true) {
-                const modelDef = providerRegistry.listModels().find((m) => m.id === activeRoute.modelId ||
-                    m.registryKey === activeRoute.modelId ||
-                    m.id === activeRoute.requestedModelId ||
-                    m.registryKey === activeRoute.requestedModelId) ?? providerRegistry.getCurrentModel();
+                const modelDef = resolveContextWindowModelDefinition(providerRegistry, activeRoute);
                 const contextWindow = context.providerRegistry.getContextWindowForModel(modelDef);
                 systemPrompt = applyContextWindowAwareness(context, record, activeRoute.modelId, contextWindow, conversation, systemPrompt, toolTokens, turn);
             }
@@ -323,8 +363,7 @@ export async function runAgentTask(context, record) {
                 let networkAttempt = 0;
                 let rateLimitAttempt = 0;
                 let contextRetried = false;
-                // eslint-disable-next-line no-constant-condition
-                while (true) {
+                for (let chatRetryIteration = 0; chatRetryIteration < MAX_CHAT_RETRY_ITERATIONS; chatRetryIteration++) {
                     let streamAccumulated = '';
                     record.streamingContent = undefined;
                     const onDelta = (delta) => {
@@ -367,16 +406,18 @@ export async function runAgentTask(context, record) {
                             const previousRoute = activeRoute;
                             activeRoute = fallbackRoutes[fallbackRouteIndex++];
                             const reason = chatErr instanceof Error ? chatErr.message : String(chatErr);
+                            const previousRouteId = providerQualifiedRouteLabel(previousRoute);
+                            const activeRouteId = providerQualifiedRouteLabel(activeRoute);
                             logger.warn('[AgentOrchestrator] switching to fallback model', {
                                 agentId: record.id,
-                                from: previousRoute.requestedModelId,
-                                to: activeRoute.requestedModelId,
+                                from: previousRouteId,
+                                to: activeRouteId,
                                 reason,
                             });
-                            context.providerOptimizer?.recordFallbackTransition(previousRoute.requestedModelId, activeRoute.requestedModelId, reason);
-                            record.model = activeRoute.requestedModelId;
+                            context.providerOptimizer?.recordFallbackTransition(previousRouteId, activeRouteId, reason);
+                            record.model = activeRouteId;
                             record.provider = activeRoute.provider.name;
-                            record.progress = `Model fallback → ${activeRoute.requestedModelId}`;
+                            record.progress = `Model fallback → ${activeRouteId}`;
                             context.emitAgentProgress(record.id, record.progress);
                             context.emitOrchestrationProgress(record, record.progress);
                         }
@@ -416,6 +457,9 @@ export async function runAgentTask(context, record) {
                         }
                     }
                 }
+                if (response === undefined) {
+                    throw new Error(`Agent ${record.id}: chat retry loop exceeded ${MAX_CHAT_RETRY_ITERATIONS} iterations`);
+                }
                 record.streamingContent = undefined;
                 record.progress = `Turn ${turn} · Thinking…`;
             }

package/dist/platform/agents/orchestrator-utils.js

@@ -13,7 +13,7 @@ export function summarizeToolArgs(args) {
             return ` \u2014 ${trimmed}`;
         }
     }
-    // Fallback: first string value found
+    // Otherwise use the first string value found.
     for (const val of Object.values(args)) {
         if (typeof val === 'string' && val.length > 0) {
             const trimmed = val.length > 30 ? val.slice(0, 27) + '\u2026' : val;

package/dist/platform/agents/orchestrator.d.ts

@@ -19,21 +19,21 @@ type AgentOrchestratorToolDeps = {
     readonly modeManager: import('../state/mode-manager.js').ModeManager;
     readonly processManager: import('../tools/shared/process-manager.js').ProcessManager;
     readonly agentMessageBus: AgentMessageBus;
-    readonly webSearchService?: import('../web-search/index.js').WebSearchService;
-    readonly channelRegistry?: import('../channels/index.js').ChannelPluginRegistry | null;
-    readonly remoteRunnerRegistry?: import('../runtime/remote/index.js').RemoteRunnerRegistry;
-    readonly knowledgeService?: import('../knowledge/index.js').KnowledgeService;
-    readonly memoryRegistry?: import('../state/index.js').MemoryRegistry;
+    readonly webSearchService?: import('../web-search/index.js').WebSearchService | undefined;
+    readonly channelRegistry?: import('../channels/index.js').ChannelPluginRegistry | null | undefined;
+    readonly remoteRunnerRegistry?: import('../runtime/remote/index.js').RemoteRunnerRegistry | undefined;
+    readonly knowledgeService?: import('../knowledge/index.js').KnowledgeService | undefined;
+    readonly memoryRegistry?: import('../state/index.js').MemoryRegistry | undefined;
     readonly sessionOrchestration: import('../sessions/orchestration/index.js').CrossSessionTaskRegistry;
-    readonly archetypeLoader?: import('./archetypes.js').ArchetypeLoader;
-    readonly configManager?: ConfigManager;
-    readonly providerRegistry?: ProviderRegistry;
-    readonly providerOptimizer?: import('../providers/optimizer.js').ProviderOptimizer;
-    readonly toolLLM?: ToolLLM;
-    readonly serviceRegistry?: import('../config/service-registry.js').ServiceRegistry;
-    readonly secretsManager?: Pick<import('../config/secrets.js').SecretsManager, 'get' | 'set' | 'getGlobalHome'> | null;
-    readonly featureFlags?: Pick<FeatureFlagManager, 'isEnabled'> | null;
-    readonly overflowHandler?: import('../tools/shared/overflow.js').OverflowHandler;
+    readonly archetypeLoader?: import('./archetypes.js').ArchetypeLoader | undefined;
+    readonly configManager?: ConfigManager | undefined;
+    readonly providerRegistry?: ProviderRegistry | undefined;
+    readonly providerOptimizer?: import('../providers/optimizer.js').ProviderOptimizer | undefined;
+    readonly toolLLM?: ToolLLM | undefined;
+    readonly serviceRegistry?: import('../config/service-registry.js').ServiceRegistry | undefined;
+    readonly secretsManager?: Pick<import('../config/secrets.js').SecretsManager, 'get' | 'set' | 'getGlobalHome'> | null | undefined;
+    readonly featureFlags?: Pick<FeatureFlagManager, 'isEnabled'> | null | undefined;
+    readonly overflowHandler?: import('../tools/shared/overflow.js').OverflowHandler | undefined;
     readonly sandboxSessionRegistry: import('../runtime/sandbox/session-registry.js').SandboxSessionRegistry;
     readonly workflowServices: ReturnType<typeof import('../tools/workflow/index.js').createWorkflowServices>;
 };
@@ -53,7 +53,7 @@ export declare class AgentOrchestrator {
     private readonly channelRegistry;
     private readonly messageBus;
     constructor(config?: {
-        channelRegistry?: ChannelPluginRegistry | null;
+        channelRegistry?: ChannelPluginRegistry | null | undefined;
         messageBus: import('./message-bus.js').AgentMessageBus;
     });
     setRuntimeBus(runtimeBus: RuntimeEventBus | null): void;
@@ -94,6 +94,7 @@ export declare class AgentOrchestrator {
     private buildOptimizerRequestProfile;
     private resolveProviderRouting;
     private normalizeRequestedModelId;
+    private assertProviderQualifiedModel;
     private resolveChatModelId;
     private resolveFallbackModelRoutes;
     private createRunContext;

package/dist/platform/agents/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/platform/agents/orchestrator.js

@@ -7,6 +7,7 @@ import { summarizeError } from '../utils/error-display.js';
 import { FileStateCache } from '../state/file-cache.js';
 import { ProjectIndex } from '../state/project-index.js';
 import { emitAgentCancelled, emitAgentCompleted, emitAgentFailed, emitAgentProgress, emitAgentRunning, emitAgentStreamDelta, emitOrchestrationNodeCancelled, emitOrchestrationNodeCompleted, emitOrchestrationNodeFailed, emitOrchestrationNodeProgress, } from '../runtime/emitters/index.js';
+import { findModelDefinition } from '../providers/registry-models.js';
 import { splitModelRegistryKey } from '../providers/registry-helpers.js';
 import { runAgentTask } from './orchestrator-runner.js';
 export { summarizeToolArgs } from './orchestrator-utils.js';
@@ -180,8 +181,8 @@ export class AgentOrchestrator {
         const optimizedRoute = this.resolveOptimizedProviderRoute(providerRegistry, record);
         if (optimizedRoute)
             return optimizedRoute;
-        const routing = this.resolveProviderRouting(record, currentModel);
-        const scopedModelId = this.normalizeRequestedModelId(routing.requestedModelId, routing.providerOverride);
+        const routing = this.resolveProviderRouting(record, currentModel, providerRegistry.listModels());
+        const scopedModelId = this.normalizeRequestedModelId(routing.requestedModelId);
         try {
             return {
                 provider: providerRegistry.getForModel(scopedModelId, routing.providerOverride),
@@ -190,19 +191,6 @@ export class AgentOrchestrator {
             };
         }
         catch (err) {
-            if (routing.requestedModelId !== currentModel.id && routing.unresolvedModelPolicy === 'fallback-to-current') {
-                logger.debug(`[AgentOrchestrator] Requested model '${routing.requestedModelId}' not found, falling back to '${currentModel.id}'`);
-                try {
-                    return {
-                        provider: providerRegistry.getForModel(currentModel.id, currentModel.provider),
-                        modelId: this.resolveChatModelId(providerRegistry, currentModel.id, currentModel.provider),
-                        requestedModelId: currentModel.id,
-                    };
-                }
-                catch (fallbackErr) {
-                    throw new Error(`Cannot resolve provider for model '${routing.requestedModelId}' (${summarizeError(err)}) or fallback '${currentModel.id}' (${summarizeError(fallbackErr)})`);
-                }
-            }
             throw new Error(`Cannot resolve provider for model '${scopedModelId}': ${summarizeError(err)}`);
         }
     }
@@ -241,8 +229,19 @@ export class AgentOrchestrator {
             requiresReasoningControls: record.reasoningEffort !== undefined,
         };
     }
-    resolveProviderRouting(record, currentModel) {
-        const requestedModelId = record.model ?? currentModel.id;
+    resolveProviderRouting(record, currentModel, modelRegistry) {
+        const requestedModelId = this.normalizeRequestedModelId(record.model ?? currentModel.registryKey);
+        if (record.model)
+            this.assertProviderQualifiedModel(record.model, 'Agent model overrides');
+        const providerFromRegistryKey = record.model
+            ? findModelDefinition(record.model, modelRegistry)?.provider
+            : undefined;
+        if (record.provider && !record.model) {
+            throw new Error('Agent provider routing requires a provider-qualified model when provider is supplied.');
+        }
+        if (record.provider && providerFromRegistryKey && providerFromRegistryKey !== record.provider) {
+            throw new Error(`Agent model override '${record.model}' conflicts with provider '${record.provider}'.`);
+        }
         const fallbackModels = (record.routing?.fallbackModels
             ?? record.fallbackModels
             ?? [])
@@ -257,81 +256,80 @@ export class AgentOrchestrator {
         const effectiveProviderId = providerSelection === 'synthetic'
             ? undefined
             : providerSelection === 'concrete'
-                ? (providerId ?? currentModel.provider)
-                : currentModel.provider;
+                ? (providerId ?? providerFromRegistryKey ?? currentModel.provider)
+                : (providerFromRegistryKey ?? currentModel.provider);
         const providerOverride = effectiveProviderId !== 'synthetic'
             ? effectiveProviderId
             : undefined;
-        const unresolvedModelPolicy = record.routing?.unresolvedModelPolicy ?? (providerOverride && providerOverride !== currentModel.provider
-            ? 'fail'
-            : 'fallback-to-current');
+        const providerFailurePolicy = record.routing?.providerFailurePolicy ?? (fallbackModels.length > 0
+            ? 'ordered-fallbacks'
+            : 'fail');
+        if (providerFailurePolicy === 'ordered-fallbacks' && fallbackModels.length === 0) {
+            throw new Error('Agent ordered fallback routing requires at least one provider-qualified fallback model.');
+        }
+        if (providerFailurePolicy === 'fail' && fallbackModels.length > 0) {
+            throw new Error('Agent fail routing cannot include fallback models; use ordered-fallbacks to enable model failover.');
+        }
         return {
             requestedModelId,
             providerSelection,
-            unresolvedModelPolicy,
-            providerFailurePolicy: record.routing?.providerFailurePolicy ?? (fallbackModels.length > 0
-                ? 'ordered-fallbacks'
-                : 'fail'),
+            providerFailurePolicy,
             providerId,
             providerOverride,
             fallbackModels,
         };
     }
-    normalizeRequestedModelId(requestedModelId, providerOverride) {
-        if (!providerOverride || !requestedModelId.includes(':')) {
-            return requestedModelId;
+    normalizeRequestedModelId(requestedModelId) {
+        return requestedModelId.trim();
+    }
+    assertProviderQualifiedModel(modelId, label) {
+        try {
+            splitModelRegistryKey(modelId.trim());
+        }
+        catch {
+            throw new Error(`${label} must be provider-qualified registry keys; received '${modelId}'.`);
         }
-        return splitModelRegistryKey(requestedModelId).resolvedModelId;
     }
     resolveChatModelId(providerRegistry, requestedModelId, providerOverride) {
         const registry = providerRegistry.listModels();
-        const def = requestedModelId.includes(':')
-            ? providerOverride
-                ? registry.find((model) => model.registryKey === requestedModelId && model.provider === providerOverride)
-                    ?? registry.find((model) => model.id === splitModelRegistryKey(requestedModelId).resolvedModelId && model.provider === providerOverride)
-                : registry.find((model) => model.registryKey === requestedModelId)
-                    ?? registry.find((model) => model.id === requestedModelId)
-                    ?? registry.find((model) => model.id === splitModelRegistryKey(requestedModelId).resolvedModelId)
-            : providerOverride
-                ? registry.find((model) => model.id === requestedModelId && model.provider === providerOverride)
-                : registry.find((model) => model.id === requestedModelId);
+        const def = providerOverride
+            ? registry.find((model) => model.provider === providerOverride &&
+                (model.registryKey === requestedModelId || model.id === requestedModelId))
+            : registry.find((model) => model.registryKey === requestedModelId);
         if (def)
             return def.id;
-        return requestedModelId;
+        throw new Error(`Model '${requestedModelId}' is not in registry.`);
     }
     resolveFallbackModelRoutes(providerRegistry, record, currentModel, primaryRequestedModelId) {
-        const routing = this.resolveProviderRouting(record, currentModel);
+        const routing = this.resolveProviderRouting(record, currentModel, providerRegistry.listModels());
         if (routing.providerFailurePolicy !== 'ordered-fallbacks' || routing.fallbackModels.length === 0) {
             return [];
         }
         const seen = new Set([primaryRequestedModelId]);
         const routes = [];
+        const modelRegistry = providerRegistry.listModels();
         for (const rawFallback of routing.fallbackModels) {
-            const requestedModelId = this.normalizeRequestedModelId(rawFallback, routing.providerOverride);
+            const requestedModelId = this.normalizeRequestedModelId(rawFallback);
             if (!requestedModelId || seen.has(requestedModelId))
                 continue;
             seen.add(requestedModelId);
-            try {
-                routes.push({
-                    provider: providerRegistry.getForModel(requestedModelId, routing.providerOverride),
-                    modelId: this.resolveChatModelId(providerRegistry, requestedModelId, routing.providerOverride),
-                    requestedModelId,
-                });
-            }
-            catch (error) {
-                logger.warn('[AgentOrchestrator] Ignoring unresolved fallback model', {
-                    agentId: record.id,
-                    modelId: requestedModelId,
-                    error: summarizeError(error),
-                });
+            this.assertProviderQualifiedModel(requestedModelId, 'Agent fallback models');
+            const fallbackDef = findModelDefinition(requestedModelId, modelRegistry);
+            if (!fallbackDef) {
+                throw new Error(`Agent fallback model '${requestedModelId}' is not in registry.`);
             }
+            routes.push({
+                provider: providerRegistry.getForModel(requestedModelId, fallbackDef.provider),
+                modelId: this.resolveChatModelId(providerRegistry, requestedModelId, fallbackDef.provider),
+                requestedModelId,
+            });
         }
         return routes;
     }
     createRunContext() {
         return {
-            workingDirectory: this.toolDeps.workingDirectory,
-            surfaceRoot: this.toolDeps.surfaceRoot,
+            workingDirectory: this.toolDeps?.workingDirectory ?? '',
+            surfaceRoot: this.toolDeps?.surfaceRoot ?? '',
             runtimeBus: this.runtimeBus,
             featureFlagManager: this.featureFlagManager,
             emitterContext: (agentId) => this.emitterContext(agentId),

package/dist/platform/agents/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/worktree.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;gBAErB,GAAG,EAAE,MAAM;IAIvB;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAU9C;;;OAGG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9C;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7C,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAInB;;;OAGG;YACW,WAAW;IAezB;;OAEG;YACW,eAAe;IAgB7B;;OAEG;YACW,aAAa;CAS5B"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/worktree.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;gBAErB,GAAG,EAAE,MAAM;IAIvB;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAU9C;;;OAGG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B9C;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7C,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAInB;;;OAGG;YACW,WAAW;IAezB;;OAEG;YACW,eAAe;IAgB7B;;OAEG;YACW,aAAa;CAQ5B"}

package/dist/platform/agents/worktree.js

@@ -94,7 +94,7 @@ export class AgentWorktree {
         }
         catch (err) {
             // If rev-list fails (e.g. brand-new worktree with no commits), treat as no changes
-            logger.debug('AgentWorktree._hasChanges: rev-list failed, treating as no changes', { branch, error: summarizeError(err) });
+            logger.warn('AgentWorktree._hasChanges: rev-list failed, treating as no changes', { branch, worktreeDir: worktreePath, error: summarizeError(err) });
             return false;
         }
     }
@@ -127,8 +127,7 @@ export class AgentWorktree {
             await wgit.raw(['branch', '-D', branch]);
         }
         catch (err) {
-            // Branch may not exist — that's fine
-            logger.debug('AgentWorktree._deleteBranch: ignored error', { branch, error: summarizeError(err) });
+            logger.warn('AgentWorktree._deleteBranch failed during cleanup', { branch, error: summarizeError(err) });
         }
     }
 }

package/dist/platform/agents/wrfc-controller.d.ts

@@ -30,8 +30,8 @@ export declare class WrfcController {
         readonly agentManager: AgentManagerLike;
         readonly configManager: Pick<ConfigManager, 'get' | 'getCategory'>;
         readonly projectRoot: string;
-        readonly surfaceRoot?: string;
-        readonly createWorktree?: () => WrfcWorktreeOps;
+        readonly surfaceRoot?: string | undefined;
+        readonly createWorktree?: (() => WrfcWorktreeOps) | undefined;
     });
     createChain(engineerRecord: AgentRecord): WrfcChain;
     getSessionId(): string;
@@ -49,6 +49,7 @@ export declare class WrfcController {
     private processReview;
     private startFix;
     private runGates;
+    private evaluateConstraints;
     private processGateResults;
     private scheduleChainCleanup;
     private checkAndRunGatesForAll;

package/dist/platform/agents/wrfc-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrfc-controller.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/wrfc-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrfc-controller.d.ts","sourceRoot":"","sources":["../../../src/platform/agents/wrfc-controller.ts"],"names":[],"mappings":"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"}

package/dist/platform/agents/wrfc-controller.js

@@ -198,11 +198,20 @@ export class WrfcController {
     }
     async processReview(chain, review) {
         const threshold = getWrfcScoreThreshold(this.configManager);
-        const allFindings = review.constraintFindings ?? [];
-        const unsatisfied = allFindings.filter((f) => !f.satisfied);
-        const constraintsSatisfied = allFindings.filter((f) => f.satisfied).length;
-        const constraintsTotal = allFindings.length;
-        const constraintFailure = unsatisfied.length > 0;
+        const constraintEvaluation = this.evaluateConstraints(chain, review);
+        if (constraintEvaluation.ignoredConstraintFindingIds.length > 0) {
+            review.issues ??= [];
+            review.issues.push({
+                severity: 'major',
+                description: `Reviewer reported findings for unknown constraints; ignored ids=[${constraintEvaluation.ignoredConstraintFindingIds.join(',')}]`,
+                pointValue: 2,
+            });
+            logger.warn('WrfcController: ignored unknown constraint findings', {
+                chainId: chain.id,
+                ignoredConstraintFindingIds: constraintEvaluation.ignoredConstraintFindingIds,
+            });
+        }
+        const { constraintsSatisfied, constraintsTotal, unsatisfiedConstraintIds, constraintFailure, } = constraintEvaluation;
         const passed = review.score >= threshold && !constraintFailure;
         this.completeCurrentNode(chain, `Score ${review.score}/10${passed ? ' passed' : ' needs fixes'}`);
         emitWorkflowReviewCompleted(this.runtimeBus, createWrfcWorkflowContext(this.sessionId, chain.id), {
@@ -213,7 +222,7 @@ export class WrfcController {
                 ? {
                     constraintsSatisfied,
                     constraintsTotal,
-                    unsatisfiedConstraintIds: unsatisfied.map((f) => f.constraintId),
+                    unsatisfiedConstraintIds,
                 }
                 : {}),
         });
@@ -223,7 +232,7 @@ export class WrfcController {
             event: 'review_complete',
             agentId: chain.reviewerAgentId,
             score: review.score,
-            passed: review.score >= threshold,
+            passed,
             issues: review.issues?.slice(0, 10).map((issue) => ({
                 severity: issue.severity,
                 description: issue.description,
@@ -236,7 +245,7 @@ export class WrfcController {
             threshold,
             fixAttempts: chain.fixAttempts,
             constraintFailure,
-            unsatisfiedCount: unsatisfied.length,
+            unsatisfiedCount: unsatisfiedConstraintIds.length,
         });
         chain.reviewScores.push(review.score);
         if (passed) {
@@ -254,7 +263,10 @@ export class WrfcController {
         }
         const maxFixAttempts = getWrfcMaxFixAttempts(this.configManager);
         if (chain.fixAttempts >= maxFixAttempts) {
-            this.failChain(chain, `Score ${review.score}/10 below threshold ${threshold}/10 after ${chain.fixAttempts} fix attempt${chain.fixAttempts !== 1 ? 's' : ''} — below threshold`);
+            const failureReason = constraintFailure && review.score >= threshold
+                ? `Unsatisfied constraints [${unsatisfiedConstraintIds.join(',')}] after ${chain.fixAttempts} fix attempt${chain.fixAttempts !== 1 ? 's' : ''}`
+                : `Score ${review.score}/10 below threshold ${threshold}/10 after ${chain.fixAttempts} fix attempt${chain.fixAttempts !== 1 ? 's' : ''} — below threshold`;
+            this.failChain(chain, failureReason);
             return;
         }
         this.startFix(chain, review);
@@ -263,10 +275,12 @@ export class WrfcController {
         chain.fixAttempts += 1;
         this.transition(chain, 'fixing');
         const maxAttempts = getWrfcMaxFixAttempts(this.configManager);
+        const targetConstraintIds = this.evaluateConstraints(chain, review).unsatisfiedConstraintIds;
         emitWorkflowFixAttempted(this.runtimeBus, createWrfcWorkflowContext(this.sessionId, chain.id), {
             chainId: chain.id,
             attempt: chain.fixAttempts,
             maxAttempts,
+            ...(targetConstraintIds.length > 0 ? { targetConstraintIds } : {}),
         });
         const fixerRecord = this.spawnWrfcAgent(chain, 'engineer', buildFixTask(chain.id, review, getWrfcScoreThreshold(this.configManager), chain.fixAttempts, chain.constraints, review.constraintFindings ?? []), true);
         chain.fixerAgentId = fixerRecord.id;
@@ -305,6 +319,47 @@ export class WrfcController {
             },
         });
     }
+    evaluateConstraints(chain, review) {
+        if (chain.constraints.length === 0) {
+            return {
+                constraintsSatisfied: 0,
+                constraintsTotal: 0,
+                unsatisfiedConstraintIds: [],
+                ignoredConstraintFindingIds: [],
+                constraintFailure: false,
+            };
+        }
+        const expectedIds = new Set(chain.constraints.map((constraint) => constraint.id));
+        const findingMap = new Map();
+        const ignoredConstraintFindingIds = [];
+        for (const finding of review.constraintFindings ?? []) {
+            if (!expectedIds.has(finding.constraintId)) {
+                ignoredConstraintFindingIds.push(finding.constraintId);
+                continue;
+            }
+            if (!findingMap.has(finding.constraintId)) {
+                findingMap.set(finding.constraintId, finding);
+            }
+        }
+        let constraintsSatisfied = 0;
+        const unsatisfiedConstraintIds = [];
+        for (const constraint of chain.constraints) {
+            const finding = findingMap.get(constraint.id);
+            if (finding?.satisfied === true) {
+                constraintsSatisfied += 1;
+            }
+            else {
+                unsatisfiedConstraintIds.push(constraint.id);
+            }
+        }
+        return {
+            constraintsSatisfied,
+            constraintsTotal: chain.constraints.length,
+            unsatisfiedConstraintIds,
+            ignoredConstraintFindingIds,
+            constraintFailure: unsatisfiedConstraintIds.length > 0,
+        };
+    }
     async processGateResults(chain, results) {
         if (!chain.currentNodeId?.includes(':gate:')) {
             chain.currentNodeId = startWrfcOrchestrationNode(this.runtimeBus, this.sessionId, chain.id, `gate:${chain.reviewCycles}:${chain.fixAttempts}`, 'verifier', 'Quality gates');
@@ -349,15 +404,14 @@ export class WrfcController {
             emitWrfcCascadeAbort(this.runtimeBus, this.sessionId, chain.id, `Gate failures exceeded max retries (${chain.gateRetryDepth}/${maxGateRetries}). Manual intervention required.`);
             return;
         }
-        const followUpTask = buildGateFailureTask(chain.id, chain.task, failedGates);
+        const followUpTask = buildGateFailureTask(chain.id, chain.task, failedGates, chain.constraints);
         const followUpRecord = this.spawnWrfcAgent(chain, 'engineer', followUpTask, false);
         const followUpChain = this.findChainByAgentId(followUpRecord.id);
         if (followUpChain) {
             followUpChain.parentChainId = chain.id;
-            // Inherit constraints from the parent chain as source: 'inherited'.
-            // Phase 4 limitation: the child engineer's returned constraints are ignored
-            // (constraintsEnumerated starts true), so the child cannot ADD new constraints
-            // from a different prompt. The inherited list is treated as authoritative.
+            // Inherit constraints from the parent chain as source: 'inherited'. The
+            // inherited list is authoritative; a child engineer that drops or adds ids
+            // surfaces a synthetic review issue instead of changing scope.
             if (chain.constraints.length > 0) {
                 followUpChain.constraints = chain.constraints.map((c) => ({
                     id: c.id,
@@ -449,7 +503,7 @@ export class WrfcController {
         finally {
             for (const id of chain.allAgentIds) {
                 worktree.cleanup(id).catch((error) => {
-                    logger.debug('WrfcController.autoCommit: cleanup error (non-fatal)', {
+                    logger.warn('WrfcController.autoCommit: cleanup failed', {
                         agentId: id,
                         error: summarizeError(error),
                     });
@@ -564,8 +618,8 @@ export class WrfcController {
         }
         this.pendingParentChainIds.delete(agentId);
         // Inherit constraints from parent when they were queued via the pending path.
-        // Phase 4 limitation: constraintsEnumerated is set true so the child engineer's
-        // returned constraints are ignored — the inherited list is authoritative.
+        // The inherited list is authoritative; child output is checked for continuity
+        // on completion instead of being allowed to change scope.
         const inherited = this.pendingParentConstraints.get(agentId);
         if (inherited && inherited.length > 0) {
             chain.constraints = inherited;