agentweaver 0.1.14 → 0.1.16

package/dist/index.js

@@ -1,43 +1,57 @@
 #!/usr/bin/env node
-import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import { REVIEW_FILE_RE, bugAnalyzeArtifacts, bugAnalyzeJsonFile, bugFixDesignJsonFile, bugFixPlanJsonFile, designJsonFile, gitlabDiffFile, gitlabDiffJsonFile, ensureScopeWorkspaceDir, gitlabReviewFile, gitlabReviewJsonFile, latestArtifactIteration, nextArtifactIteration, planJsonFile, planArtifacts, qaJsonFile, readyToMergeFile, requireArtifacts, reviewAssessmentFile, reviewAssessmentJsonFile, reviewFile, reviewFixSelectionJsonFile, reviewJsonFile, scopeWorkspaceDir, flowStateFile, taskSummaryFile, } from "./artifacts.js";
+import { bugAnalyzeArtifacts, bugAnalyzeJsonFile, bugFixDesignJsonFile, bugFixPlanJsonFile, designReviewFile, designReviewJsonFile, gitlabDiffFile, gitlabDiffJsonFile, ensureScopeWorkspaceDir, gitlabReviewFile, gitlabReviewJsonFile, instantTaskInputJsonFile, latestArtifactIteration, nextArtifactIteration, readyToMergeFile, requireArtifacts, reviewAssessmentFile, reviewAssessmentJsonFile, reviewFile, reviewFixSelectionJsonFile, reviewJsonFile, scopeWorkspaceDir, flowStateFile, taskSummaryFile, } from "./artifacts.js";
 import { FlowInterruptedError, TaskRunnerError } from "./errors.js";
 import { createFlowRunState, hasResumableFlowState, loadFlowRunState, prepareFlowStateForResume, resetFlowRunState, rewindFlowRunStateToPhase, saveFlowRunState, stripExecutionStatePayload, } from "./flow-state.js";
 import { requireJiraTaskFile } from "./jira.js";
 import { validateStructuredArtifacts } from "./structured-artifacts.js";
+import { AGENTWEAVER_REVIEW_BLOCKING_SEVERITIES_ENV, parseReviewSeverityCsv, resolveReviewBlockingSeveritiesFromEnv, } from "./review-severity.js";
 import { summarizeBuildFailure as summarizeBuildFailureViaPipeline } from "./pipeline/build-failure-summary.js";
 import { runNodeChecks } from "./pipeline/checks.js";
 import { createPipelineContext } from "./pipeline/context.js";
-import { loadDeclarativeFlow } from "./pipeline/declarative-flows.js";
+import { collectFlowRoutingGroups, loadDeclarativeFlow } from "./pipeline/declarative-flows.js";
 import { runExpandedPhase } from "./pipeline/declarative-flow-runner.js";
-import { findCatalogEntry, isBuiltInCommandFlowId, loadInteractiveFlowCatalog, toDeclarativeFlowRef } from "./pipeline/flow-catalog.js";
-import { ALLOWED_MODELS_BY_EXECUTOR, defaultModelForExecutor, DEFAULT_LAUNCH_PROFILE, LLM_EXECUTOR_IDS, resolveLaunchProfile, } from "./pipeline/launch-profile-config.js";
+import { builtInCommandFlowFile, findCatalogEntry, flowRoutingGroups, isBuiltInCommandFlowId, loadInteractiveFlowCatalog, toDeclarativeFlowRef, } from "./pipeline/flow-catalog.js";
+import { DEFAULT_LAUNCH_PROFILE, } from "./pipeline/launch-profile-config.js";
+import { withCanonicalReviewLoopParams } from "./pipeline/review-iteration.js";
 import { evaluateCondition, resolveValue } from "./pipeline/value-resolver.js";
 import { resolveCmd } from "./runtime/command-resolution.js";
 import { loadTieredEnv } from "./runtime/env-loader.js";
 import { agentweaverHome } from "./runtime/agentweaver-home.js";
 import { runCommand } from "./runtime/process-runner.js";
-import { InteractiveUi } from "./interactive-ui.js";
+import { createArtifactRegistry } from "./runtime/artifact-registry.js";
+import { resolveDesignReviewInputContract } from "./runtime/design-review-input-contract.js";
+import { resolvePlanReviseInputContract } from "./runtime/plan-revise-input-contract.js";
+import { resolveLatestPlanningBundle } from "./runtime/planning-bundle.js";
+import { inspectReviewInputContract, resolveReviewInputContract } from "./runtime/review-input-contract.js";
+import { clearReadyToMergeFile } from "./runtime/ready-to-merge.js";
+import { describeExecutionRouting, executorsForRoutingGroups, resolveExecutionRouting, } from "./runtime/execution-routing.js";
+import { requestInteractiveExecutionRouting } from "./runtime/interactive-execution-routing.js";
+import { createInteractiveSession } from "./interactive/create-interactive-session.js";
 import { bye, printError, printInfo, printPanel, printSummary, setFlowExecutionState, stripAnsi, } from "./tui.js";
 import { requestUserInputInTerminal } from "./user-input.js";
 import { runDoctorCommand } from "./doctor/index.js";
-import { attachJiraContext, detectGitBranchName, requestJiraContext, resolveProjectScope, } from "./scope.js";
+import { detectGitBranchName, requestJiraContext, resolveProjectScope, } from "./scope.js";
 const COMMANDS = [
     "auto-golang",
     "auto-common",
+    "auto-simple",
     "auto-status",
     "auto-reset",
     "bug-analyze",
     "bug-fix",
+    "design-review",
     "doctor",
     "git-commit",
     "gitlab-diff-review",
     "gitlab-review",
+    "instant-task",
     "mr-description",
     "plan",
+    "plan-revise",
     "task-describe",
     "implement",
     "review",
@@ -52,6 +66,7 @@ function createRuntimeServices(signal) {
     return {
         resolveCmd,
         runCommand: (argv, options = {}) => runCommand(argv, { ...options, ...(signal ? { signal } : {}) }),
+        artifactRegistry: createArtifactRegistry(),
     };
 }
 const runtimeServices = createRuntimeServices();
@@ -99,19 +114,26 @@ function usage() {
   agentweaver gitlab-review [--dry] [--verbose] [--prompt <text>] [--scope <name>]
   agentweaver bug-analyze [--dry] [--verbose] [--prompt <text>] <jira-browse-url|jira-issue-key>
   agentweaver bug-fix [--dry] [--verbose] [--prompt <text>] <jira-browse-url|jira-issue-key>
+  agentweaver design-review [--dry] [--verbose] [--prompt <text>] <jira-browse-url|jira-issue-key>
   agentweaver doctor [<category>|<check-id>] [--json]
+  agentweaver instant-task [--dry] [--verbose] [--prompt <text>] [--md-lang <en|ru>]
   agentweaver mr-description [--dry] [--verbose] [--prompt <text>] <jira-browse-url|jira-issue-key>
   agentweaver plan [--dry] [--verbose] [--prompt <text>] [--md-lang <en|ru>] [<jira-browse-url|jira-issue-key>]
+  agentweaver plan-revise [--dry] [--verbose] [--prompt <text>] <jira-browse-url|jira-issue-key>
   agentweaver task-describe [--dry] [--verbose] [--prompt <text>] [<jira-browse-url|jira-issue-key>]
   agentweaver implement [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
-  agentweaver review [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
-  agentweaver review-fix [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
-  agentweaver review-loop [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
+  agentweaver review [--dry] [--verbose] [--prompt <text>] [--scope <name>] [--blocking-severities <list>] [<jira-browse-url|jira-issue-key>]
+  agentweaver review-fix [--dry] [--verbose] [--prompt <text>] [--scope <name>] [--blocking-severities <list>] [<jira-browse-url|jira-issue-key>]
+  agentweaver review-loop [--dry] [--verbose] [--prompt <text>] [--scope <name>] [--blocking-severities <list>] [<jira-browse-url|jira-issue-key>]
   agentweaver run-go-tests-loop [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
   agentweaver run-go-linter-loop [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
   agentweaver auto-golang [--dry] [--verbose] [--prompt <text>] [<jira-browse-url|jira-issue-key>]
   agentweaver auto-golang [--dry] [--verbose] [--prompt <text>] --from <phase> [<jira-browse-url|jira-issue-key>]
   agentweaver auto-golang --help-phases
+  agentweaver auto-common [--dry] [--verbose] [--prompt <text>] [--md-lang <en|ru>] <jira-browse-url|jira-issue-key>
+  agentweaver auto-common --help-phases
+  agentweaver auto-simple [--dry] [--verbose] [--prompt <text>] [--md-lang <en|ru>] <jira-browse-url|jira-issue-key>
+  agentweaver auto-simple --help-phases
   agentweaver auto-status [<jira-browse-url|jira-issue-key>]
   agentweaver auto-reset [<jira-browse-url|jira-issue-key>]
 
@@ -125,8 +147,9 @@ Flags:
   --force         In interactive mode, regenerate task summary in Jira-backed flows
   --dry           Fetch Jira task, but print codex/opencode commands instead of executing them
   --verbose       Show live stdout/stderr of launched commands
-  --scope         Explicit workflow scope name for non-Jira runs
+  --scope         Explicit workflow scope name for non-Jira runs except instant-task
   --prompt        Extra prompt text appended to the base prompt
+  --blocking-severities  Comma-separated severities that block merge and drive review-fix auto-selection
   --md-lang       Language for markdown output files: en (English) or ru (Russian, default)
 
 Required environment variables:
@@ -138,6 +161,7 @@ Optional environment variables:
   JIRA_BASE_URL
   GITLAB_TOKEN
   AGENTWEAVER_HOME
+  ${AGENTWEAVER_REVIEW_BLOCKING_SEVERITIES_ENV}
   CODEX_BIN
   CODEX_MODEL
   OPENCODE_BIN
@@ -145,8 +169,11 @@ Optional environment variables:
 
 Notes:
   - Jira-backed task flows will ask for Jira task via user-input when it is not passed as an argument. task-describe can also work from a manual task description without Jira.
+  - instant-task always uses the current branch-derived project scope and rejects explicit scope overrides or Jira arguments.
   - All flow state and artifacts are stored in the current project scope by default.
-  - gitlab-review and gitlab-diff-review ask for GitLab merge request URL via user-input.`;
+  - gitlab-review and gitlab-diff-review ask for GitLab merge request URL via user-input.
+  - ${AGENTWEAVER_REVIEW_BLOCKING_SEVERITIES_ENV} sets the default blocking severities. Default: blocker,critical,high.
+  - Interactive mode requires Ink runtime dependencies and a real TTY.`;
 }
 function packageVersion() {
     const packageJsonPath = path.join(PACKAGE_ROOT, "package.json");
@@ -176,7 +203,11 @@ function buildFlowResumeDetails(state) {
         `Current step: ${currentStep}`,
         `Updated: ${state.updatedAt}`,
     ];
-    if (state.launchProfile) {
+    if (state.executionRouting) {
+        lines.push(`Default route: ${state.executionRouting.defaultRoute.executor} / ${state.executionRouting.defaultRoute.model}`);
+        lines.push(`Routing fingerprint: ${state.executionRouting.fingerprint}`);
+    }
+    else if (state.launchProfile) {
         lines.push(`Launch profile: ${state.launchProfile.executor} / ${state.launchProfile.model}`);
     }
     if (state.lastError) {
@@ -184,79 +215,6 @@ function buildFlowResumeDetails(state) {
     }
     return lines.join("\n");
 }
-function launchProfileSelectionForm() {
-    const defaultExecutor = DEFAULT_LAUNCH_PROFILE.executor;
-    return {
-        formId: "flow-launch-profile",
-        title: "LLM Launch Settings",
-        description: `Select an executor for the flow. Current default: ${defaultExecutor}.`,
-        submitLabel: "Continue",
-        fields: [
-            {
-                id: "executor",
-                type: "single-select",
-                label: "Executor",
-                required: true,
-                default: defaultExecutor,
-                options: LLM_EXECUTOR_IDS.map((id) => ({
-                    value: id,
-                    label: id === defaultExecutor ? `${id} [default]` : id,
-                })),
-            },
-        ],
-    };
-}
-function launchModelSelectionForm(executor) {
-    const resolvedExecutor = executor === "default" ? DEFAULT_LAUNCH_PROFILE.executor : executor;
-    const defaultModel = defaultModelForExecutor(resolvedExecutor);
-    const options = ALLOWED_MODELS_BY_EXECUTOR[resolvedExecutor].map((model) => ({
-        value: model,
-        label: model === defaultModel ? `${model} [default]` : model,
-    }));
-    return {
-        formId: "flow-launch-model",
-        title: "LLM Launch Settings",
-        description: `Select a model for the flow. Current default for ${resolvedExecutor}: ${defaultModel}.`,
-        submitLabel: "Start",
-        fields: [
-            {
-                id: "model",
-                type: "single-select",
-                label: "Model",
-                required: true,
-                default: defaultModel,
-                options,
-            },
-        ],
-    };
-}
-function isFormCancellation(error, formId) {
-    return error instanceof TaskRunnerError && error.message === `User cancelled form '${formId}'.`;
-}
-async function requestInteractiveLaunchProfile(requestUserInput) {
-    for (;;) {
-        const executorFormResult = await requestUserInput(launchProfileSelectionForm());
-        const rawExecutor = String(executorFormResult.values.executor ?? DEFAULT_LAUNCH_PROFILE.executor);
-        const executor = LLM_EXECUTOR_IDS.find((id) => id === rawExecutor);
-        if (!executor) {
-            throw new TaskRunnerError(`Unsupported launch executor '${rawExecutor}'.`);
-        }
-        try {
-            const modelFormResult = await requestUserInput(launchModelSelectionForm(executor));
-            const rawModel = String(modelFormResult.values.model ?? defaultModelForExecutor(executor)).trim();
-            return resolveLaunchProfile({
-                executor,
-                model: rawModel.length > 0 ? rawModel : defaultModelForExecutor(executor),
-            }, DEFAULT_LAUNCH_PROFILE);
-        }
-        catch (error) {
-            if (isFormCancellation(error, "flow-launch-model")) {
-                continue;
-            }
-            throw error;
-        }
-    }
-}
 function buildResolverContext(pipelineContext, flowParams, flowConstants, repeatVars, executionState) {
     return {
         flowParams,
@@ -330,13 +288,21 @@ function validateDeclarativePhaseResumeState(phase, phaseState, pipelineContext,
         }
     }
 }
-function validateDeclarativeFlowResumeState(flowEntry, config, state, launchProfile, runtime = runtimeServices) {
-    if (state.launchProfile) {
-        if (!launchProfile) {
-            throw new TaskRunnerError("Resume is impossible because launch profile is missing. Use restart.");
+function validateDeclarativeFlowResumeState(flowEntry, config, state, executionRouting, runtime = runtimeServices) {
+    if (state.flowId === "auto-common") {
+        const persistedPhaseIds = state.executionState.phases.map((p) => p.id);
+        const hasLegacyPlanningGatePhases = persistedPhaseIds.some((id) => ["design_review", "verdict", "plan_revision", "design_review_repeat", "verdict_repeat"].includes(id));
+        if (hasLegacyPlanningGatePhases) {
+            throw new TaskRunnerError("Resume is impossible because the persisted state was created with the legacy phase graph. Use restart.");
+        }
+    }
+    const persistedFingerprint = state.routingFingerprint ?? state.executionRouting?.fingerprint ?? state.launchProfile?.fingerprint;
+    if (persistedFingerprint) {
+        if (!executionRouting) {
+            throw new TaskRunnerError("Resume is impossible because execution routing is missing. Use restart.");
         }
-        if (state.launchProfile.fingerprint !== launchProfile.fingerprint) {
-            throw new TaskRunnerError(`Resume is impossible because launch profile changed (${state.launchProfile.executor}/${state.launchProfile.model} -> ${launchProfile.executor}/${launchProfile.model}). Use restart.`);
+        if (persistedFingerprint !== executionRouting.fingerprint) {
+            throw new TaskRunnerError("Resume is impossible because execution routing changed. Use restart.");
         }
     }
     if (flowRequiresTaskScope(flowEntry) && !config.jiraRef) {
@@ -350,8 +316,9 @@ function validateDeclarativeFlowResumeState(flowEntry, config, state, launchProf
         ...(config.mdLang !== undefined ? { mdLang: config.mdLang } : {}),
         runtime,
         requestUserInput: requestUserInputInTerminal,
+        ...(executionRouting ? { executionRouting } : {}),
     });
-    const flowParams = defaultDeclarativeFlowParams(config, false, launchProfile ? { launchProfile } : {});
+    const flowParams = defaultDeclarativeFlowParams(config, false, executionRouting ? { executionRouting, launchProfile: executionRouting.defaultRoute } : {});
     for (const phase of flowEntry.flow.phases) {
         const phaseState = state.executionState.phases.find((candidate) => candidate.id === phase.id);
         if (!phaseState) {
@@ -364,19 +331,21 @@ function scopeWithRestoredJiraContext(scope, state) {
     if (scope.jiraRef || !state?.jiraRef?.trim()) {
         return scope;
     }
-    return attachJiraContext(scope, state.jiraRef);
+    return resolveProjectScope(null, state.jiraRef);
+}
+function buildInteractiveBaseConfig(flowId, scope) {
+    return buildBaseConfig(flowId, {
+        ...(flowId !== "instant-task" && scope.jiraRef ? { jiraRef: scope.jiraRef } : {}),
+    });
 }
 function lookupInteractiveFlowResume(flowEntry, currentScope) {
     const directState = loadFlowRunState(currentScope.scopeKey, flowEntry.id);
     if (directState && hasResumableFlowState(directState)) {
         try {
             const effectiveScope = scopeWithRestoredJiraContext(currentScope, directState);
-            const baseConfig = buildBaseConfig(flowEntry.id, {
-                ...(effectiveScope.jiraRef ? { jiraRef: effectiveScope.jiraRef } : {}),
-                scopeName: effectiveScope.scopeKey,
-            });
+            const baseConfig = buildInteractiveBaseConfig(flowEntry.id, effectiveScope);
             const config = buildRuntimeConfig(baseConfig, effectiveScope);
-            validateDeclarativeFlowResumeState(flowEntry, config, directState, directState.launchProfile);
+            validateDeclarativeFlowResumeState(flowEntry, config, directState, directState.executionRouting);
             return {
                 resumeAvailable: true,
                 hasExistingState: true,
@@ -409,22 +378,19 @@ function printAutoCommonPhasesHelp() {
     phaseLines.push("", "You can run auto-common with:", "agentweaver auto-common <jira>");
     printPanel("Auto-Common Phases", phaseLines.join("\n"), "magenta");
 }
+function autoSimplePhaseIds() {
+    return loadDeclarativeFlow({ source: "built-in", fileName: "auto-simple.json" }).phases.map((phase) => phase.id);
+}
+function printAutoSimplePhasesHelp() {
+    const phaseLines = ["Available auto-simple phases:", "", ...autoSimplePhaseIds()];
+    phaseLines.push("", "You can run auto-simple with:", "agentweaver auto-simple <jira>");
+    printPanel("Auto-Simple Phases", phaseLines.join("\n"), "magenta");
+}
 function nextReviewIterationForTask(taskKey) {
-    let maxIndex = 0;
-    const workspaceDir = scopeWorkspaceDir(taskKey);
-    if (!existsSync(workspaceDir)) {
-        return 1;
-    }
-    for (const entry of readdirSync(workspaceDir, { withFileTypes: true })) {
-        if (!entry.isFile()) {
-            continue;
-        }
-        const match = REVIEW_FILE_RE.exec(entry.name);
-        if (match && match[1] === taskKey) {
-            maxIndex = Math.max(maxIndex, Number.parseInt(match[2] ?? "0", 10));
-        }
-    }
-    return maxIndex + 1;
+    return nextArtifactIteration(taskKey, "review");
+}
+function nextDesignReviewIterationForTask(taskKey) {
+    return nextArtifactIteration(taskKey, "design-review");
 }
 function buildBaseConfig(command, options = {}) {
     return {
@@ -432,6 +398,7 @@ function buildBaseConfig(command, options = {}) {
         jiraRef: options.jiraRef ?? null,
         scopeName: options.scopeName ?? null,
         reviewFixPoints: options.reviewFixPoints ?? null,
+        reviewBlockingSeverities: options.reviewBlockingSeverities ?? resolveReviewBlockingSeveritiesFromEnv(),
         extraPrompt: options.extraPrompt ?? null,
         autoFromPhase: options.autoFromPhase ? validateAutoPhaseId(options.autoFromPhase) : null,
         mdLang: options.mdLang ?? null,
@@ -441,19 +408,23 @@ function buildBaseConfig(command, options = {}) {
     };
 }
 function commandRequiresTask(command) {
-    return (command === "plan" ||
+    return (command === "plan-revise" ||
         command === "bug-analyze" ||
         command === "bug-fix" ||
+        command === "design-review" ||
         command === "mr-description" ||
         command === "auto-golang" ||
         command === "auto-common" ||
+        command === "auto-simple" ||
         command === "auto-status" ||
         command === "auto-reset");
 }
 function commandSupportsProjectScope(command) {
-    return (command === "git-commit" ||
+    return (command === "plan" ||
+        command === "git-commit" ||
         command === "gitlab-diff-review" ||
         command === "gitlab-review" ||
+        command === "instant-task" ||
         command === "task-describe" ||
         command === "implement" ||
         command === "review" ||
@@ -463,9 +434,21 @@ function commandSupportsProjectScope(command) {
         command === "run-go-linter-loop");
 }
 async function resolveScopeForCommand(config, requestUserInput) {
+    if (config.command === "instant-task") {
+        if (config.scopeName?.trim()) {
+            throw new TaskRunnerError("Command 'instant-task' rejects explicit scope overrides. The current branch-derived scope is the only supported lineage identity.");
+        }
+        if (config.jiraRef?.trim()) {
+            throw new TaskRunnerError("Command 'instant-task' does not accept a Jira task argument. Start it without a positional Jira reference.");
+        }
+        return resolveProjectScope();
+    }
     if (config.jiraRef?.trim()) {
         return resolveProjectScope(config.scopeName, config.jiraRef);
     }
+    if (config.command === "plan") {
+        return resolveProjectScope(config.scopeName);
+    }
     if (commandRequiresTask(config.command)) {
         try {
             const jiraContext = await requestJiraContext(requestUserInput);
@@ -496,27 +479,61 @@ function buildRuntimeConfig(baseConfig, scope) {
         ...(scope.jiraTaskFile ? { jiraTaskFile: scope.jiraTaskFile } : {}),
     };
 }
-function checkPrerequisites(config) {
-    if (config.command === "bug-analyze" ||
-        config.command === "bug-fix" ||
-        config.command === "mr-description" ||
-        config.command === "plan" ||
-        config.command === "task-describe" ||
-        config.command === "review" ||
-        config.command === "run-go-tests-loop" ||
-        config.command === "run-go-linter-loop") {
+function routingForPrerequisites(launchProfile, executionRouting) {
+    if (executionRouting) {
+        return executionRouting;
+    }
+    return resolveExecutionRouting({
+        defaultRoute: launchProfile
+            ? {
+                executor: launchProfile.executor,
+                model: launchProfile.model,
+            }
+            : {
+                executor: DEFAULT_LAUNCH_PROFILE.executor,
+                model: DEFAULT_LAUNCH_PROFILE.model,
+            },
+    });
+}
+function flowSpecFileForPrerequisiteChecks(command) {
+    return isBuiltInCommandFlowId(command) ? builtInCommandFlowFile(command) : null;
+}
+function commandRoutingGroupsForPrerequisiteChecks(command, cwd) {
+    const fileName = flowSpecFileForPrerequisiteChecks(command);
+    if (!fileName) {
+        return [];
+    }
+    return collectFlowRoutingGroups(loadDeclarativeFlow({ source: "built-in", fileName }), cwd);
+}
+function resolveExecutorPrerequisite(executor) {
+    if (executor === "codex") {
         resolveCmd("codex", "CODEX_BIN");
+        return;
+    }
+    resolveCmd("opencode", "OPENCODE_BIN");
+}
+function checkPrerequisites(config, launchProfile, executionRouting) {
+    const routing = routingForPrerequisites(launchProfile, executionRouting);
+    const groups = commandRoutingGroupsForPrerequisiteChecks(config.command, process.cwd());
+    for (const executor of executorsForRoutingGroups(routing, groups)) {
+        resolveExecutorPrerequisite(executor);
     }
 }
-function checkAutoPrerequisites(config) {
-    resolveCmd("codex", "CODEX_BIN");
+function checkAutoPrerequisites(config, launchProfile, executionRouting) {
+    checkPrerequisites(config, launchProfile, executionRouting);
 }
 function autoFlowParams(config, forceRefreshSummary = false) {
     return {
         jiraApiUrl: config.jiraApiUrl,
         taskKey: config.taskKey,
+        taskContextIteration: nextArtifactIteration(config.taskKey, "task-context", "json"),
+        taskSummaryIteration: nextArtifactIteration(config.taskKey, "task"),
+        designIteration: nextArtifactIteration(config.taskKey, "design"),
+        planIteration: nextArtifactIteration(config.taskKey, "plan"),
+        qaIteration: nextArtifactIteration(config.taskKey, "qa"),
         extraPrompt: config.extraPrompt,
         reviewFixPoints: config.reviewFixPoints,
+        reviewBlockingSeverities: config.reviewBlockingSeverities,
         forceRefresh: forceRefreshSummary,
         mdLang: config.mdLang,
         runGoTestsScript: path.join(agentweaverHome(PACKAGE_ROOT), "run_go_tests.py"),
@@ -525,6 +542,72 @@ function autoFlowParams(config, forceRefreshSummary = false) {
         runGoLinterIteration: nextArtifactIteration(config.taskKey, "run-go-linter-result", "json"),
     };
 }
+function reviewFlowParamsFromContract(config) {
+    const contract = resolveReviewInputContract(config.taskKey);
+    return {
+        taskKey: config.taskKey,
+        planningIteration: contract.planningIteration,
+        designFile: contract.designFile,
+        designJsonFile: contract.designJsonFile,
+        planFile: contract.planFile,
+        planJsonFile: contract.planJsonFile,
+        hasTaskContextJsonFile: contract.hasTaskContextJsonFile,
+        taskContextJsonFilePath: contract.taskContextJsonFilePath,
+        taskContextJsonFile: contract.taskContextJsonFile,
+        hasJiraTaskFile: contract.hasJiraTaskFile,
+        jiraTaskFilePath: contract.jiraTaskFilePath,
+        jiraTaskFile: contract.jiraTaskFile,
+        hasTaskInputJsonFile: contract.hasTaskInputJsonFile,
+        taskInputJsonFilePath: contract.taskInputJsonFilePath,
+        taskInputJsonFile: contract.taskInputJsonFile,
+    };
+}
+function hasStructuredReviewInputs(taskKey) {
+    const inspection = inspectReviewInputContract(taskKey);
+    if (inspection.status === "ready") {
+        return true;
+    }
+    if (inspection.status === "missing-planning") {
+        return false;
+    }
+    throw new TaskRunnerError(`Structured review requires a normalized task-context artifact, or legacy Jira/instant-task context, in scope '${taskKey}'.`);
+}
+function latestTaskContextIteration(taskKey) {
+    const iteration = latestArtifactIteration(taskKey, "task-context", "json");
+    if (iteration === null) {
+        throw new TaskRunnerError(`Plan mode requires a normalized task-context artifact in scope '${taskKey}'.`);
+    }
+    return iteration;
+}
+function loadInstantTaskInputDefaults(taskKey) {
+    const artifactPath = instantTaskInputJsonFile(taskKey);
+    if (!existsSync(artifactPath)) {
+        return null;
+    }
+    try {
+        validateStructuredArtifacts([{ path: artifactPath, schemaId: "user-input/v1" }], "Instant-task source input structured artifact is invalid.");
+        const parsed = JSON.parse(readFileSync(artifactPath, "utf8"));
+        const values = parsed.values;
+        if (!values || typeof values !== "object" || Array.isArray(values)) {
+            return null;
+        }
+        const normalizedEntries = [];
+        for (const [key, value] of Object.entries(values)) {
+            if (typeof value === "string" || typeof value === "boolean") {
+                normalizedEntries.push([key, value]);
+                continue;
+            }
+            if (Array.isArray(value) && value.every((item) => typeof item === "string")) {
+                normalizedEntries.push([key, [...value]]);
+                continue;
+            }
+        }
+        return Object.fromEntries(normalizedEntries);
+    }
+    catch {
+        return null;
+    }
+}
 function interactiveFlowDefinition(entry) {
     const flow = entry.flow;
     return {
@@ -592,12 +675,14 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
         runtime,
         ...(setSummary ? { setSummary } : {}),
         requestUserInput,
+        ...(overrides.executionRouting ? { executionRouting: overrides.executionRouting } : {}),
     });
     const flow = loadDeclarativeFlow(flowRef);
     const initialExecutionState = {
         flowKind: flow.kind,
         flowVersion: flow.version,
         terminated: false,
+        terminationOutcome: "success",
         phases: [],
     };
     let persistedState = launchMode === "resume" ? loadFlowRunState(config.scope.scopeKey, flowId) : null;
@@ -609,7 +694,10 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
             absolutePath: flow.absolutePath,
             treePath: [],
             flow,
-        }, config, persistedState, overrides.launchProfile, runtime);
+        }, config, persistedState, overrides.executionRouting ?? (overrides.launchProfile ? resolveExecutionRouting({ defaultRoute: {
+                executor: overrides.launchProfile.executor,
+                model: overrides.launchProfile.model,
+            } }) : undefined), runtime);
         persistedState = prepareFlowStateForResume(persistedState);
     }
     else if (launchMode === "restart") {
@@ -617,10 +705,18 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
     }
     const executionState = persistedState?.executionState ?? initialExecutionState;
     const state = persistedState
-        ?? createFlowRunState(config.scope.scopeKey, flowId, executionState, config.jiraRef, overrides.launchProfile);
-    if (overrides.launchProfile) {
+        ?? createFlowRunState(config.scope.scopeKey, flowId, executionState, config.jiraRef, overrides.launchProfile, overrides.executionRouting, overrides.selectedRoutingPreset);
+    if (overrides.executionRouting) {
+        state.executionRouting = overrides.executionRouting;
+        state.routingFingerprint = overrides.executionRouting.fingerprint;
+        state.launchProfile = overrides.executionRouting.defaultRoute;
+    }
+    else if (overrides.launchProfile) {
         state.launchProfile = overrides.launchProfile;
     }
+    if (overrides.selectedRoutingPreset) {
+        state.selectedRoutingPreset = overrides.selectedRoutingPreset;
+    }
     state.status = "running";
     state.lastError = null;
     state.currentStep = findCurrentFlowExecutionStep(state);
@@ -645,7 +741,12 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
                 },
             });
         }
-        state.status = "completed";
+        if (executionState.terminated) {
+            state.status = executionState.terminationOutcome === "success" ? "completed" : "blocked";
+        }
+        else {
+            state.status = "completed";
+        }
         state.currentStep = null;
         state.lastError = null;
         state.executionState = executionState;
@@ -671,12 +772,24 @@ async function runDeclarativeFlowBySpecFile(fileName, config, flowParams, overri
         ...defaultDeclarativeFlowParams(config, false, overrides),
         ...flowParams,
     };
-    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, mergedFlowParams, overrides, requestUserInput, setSummary, launchMode, runtime);
+    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, withCanonicalReviewLoopParams(loadDeclarativeFlow({ source: "built-in", fileName }).kind, mergedFlowParams), overrides, requestUserInput, setSummary, launchMode, runtime);
 }
 function defaultDeclarativeFlowParams(config, forceRefreshSummary = false, overrides = {}) {
     const iteration = nextReviewIterationForTask(config.taskKey);
     const latestIteration = latestArtifactIteration(config.taskKey, "review");
-    const launchProfile = overrides.launchProfile ?? resolveLaunchProfile({ executor: "default", model: "default" }, DEFAULT_LAUNCH_PROFILE);
+    const latestTaskContext = latestArtifactIteration(config.taskKey, "task-context", "json");
+    const executionRouting = overrides.executionRouting ?? resolveExecutionRouting({
+        defaultRoute: overrides.launchProfile
+            ? {
+                executor: overrides.launchProfile.executor,
+                model: overrides.launchProfile.model,
+            }
+            : {
+                executor: DEFAULT_LAUNCH_PROFILE.executor,
+                model: DEFAULT_LAUNCH_PROFILE.model,
+            },
+    });
+    const launchProfile = executionRouting.defaultRoute;
     return {
         taskKey: config.taskKey,
         jiraRef: config.jiraRef,
@@ -687,12 +800,16 @@ function defaultDeclarativeFlowParams(config, forceRefreshSummary = false, overr
         workspaceDir: scopeWorkspaceDir(config.taskKey),
         extraPrompt: config.extraPrompt,
         reviewFixPoints: config.reviewFixPoints,
+        reviewBlockingSeverities: config.reviewBlockingSeverities,
         mdLang: config.mdLang,
         llmExecutor: launchProfile.executor,
         llmModel: launchProfile.model,
         launchProfile,
+        executionRouting,
         iteration,
+        baseIteration: iteration,
         latestIteration,
+        taskContextIteration: latestTaskContext ?? nextArtifactIteration(config.taskKey, "task-context", "json"),
         taskSummaryIteration: nextArtifactIteration(config.taskKey, "task"),
         designIteration: nextArtifactIteration(config.taskKey, "design"),
         planIteration: nextArtifactIteration(config.taskKey, "plan"),
@@ -738,20 +855,50 @@ function requireJiraConfig(config) {
         throw new TaskRunnerError(`Command '${config.command}' requires Jira context in the current project scope.`);
     }
 }
-async function executeCommand(baseConfig, runFollowupVerify = true, requestUserInput = requestUserInputInTerminal, resolvedScope, setSummary, forceRefreshSummary = false, launchMode = "restart", launchProfile, runtime = runtimeServices) {
+async function executeCommand(baseConfig, runFollowupVerify = true, requestUserInput = requestUserInputInTerminal, resolvedScope, setSummary, forceRefreshSummary = false, launchMode = "restart", launchProfile, executionRouting, selectedRoutingPreset, runtime = runtimeServices) {
     if (baseConfig.command === "doctor") {
         const exitCode = await runDoctorCommand(baseConfig.doctorArgs ?? []);
         return exitCode === 0;
     }
     const config = buildRuntimeConfig(baseConfig, resolvedScope ?? (await resolveScopeForCommand(baseConfig, requestUserInput)));
+    const flowOverrides = executionRouting
+        ? {
+            launchProfile: executionRouting.defaultRoute,
+            executionRouting,
+            ...(selectedRoutingPreset ? { selectedRoutingPreset } : {}),
+        }
+        : launchProfile
+            ? { launchProfile }
+            : {};
+    if (config.command === "instant-task") {
+        checkPrerequisites(config, launchProfile, executionRouting);
+        const hasPersistedInstantTaskState = loadFlowRunState(config.scope.scopeKey, "instant-task") !== null;
+        const repromptInstantTaskInput = launchMode === "restart"
+            && hasPersistedInstantTaskState
+            && requestUserInput !== requestUserInputInTerminal;
+        await runDeclarativeFlowBySpecFile("instant-task.json", config, {
+            taskKey: config.taskKey,
+            taskContextIteration: nextArtifactIteration(config.taskKey, "task-context", "json"),
+            designIteration: nextArtifactIteration(config.taskKey, "design"),
+            planIteration: nextArtifactIteration(config.taskKey, "plan"),
+            qaIteration: nextArtifactIteration(config.taskKey, "qa"),
+            extraPrompt: config.extraPrompt,
+            mdLang: config.mdLang,
+            repromptInstantTaskInput,
+            ...(repromptInstantTaskInput
+                ? { prefilledInstantTaskInputValues: loadInstantTaskInputDefaults(config.taskKey) ?? undefined }
+                : {}),
+        }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+        return !config.dryRun && existsSync(readyToMergeFile(config.taskKey));
+    }
     if (config.command === "auto-golang") {
         requireJiraConfig(config);
-        checkAutoPrerequisites(config);
         process.env.JIRA_BROWSE_URL = config.jiraBrowseUrl;
         process.env.JIRA_API_URL = config.jiraApiUrl;
         process.env.JIRA_TASK_FILE = config.jiraTaskFile;
         let effectiveLaunchMode = launchMode;
         let effectiveLaunchProfile = launchProfile;
+        let effectiveExecutionRouting = executionRouting;
         if (config.autoFromPhase) {
             const flow = loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" });
             const persistedState = loadFlowRunState(config.scope.scopeKey, "auto-golang");
@@ -762,18 +909,37 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             saveFlowRunState(persistedState);
             effectiveLaunchMode = "resume";
             effectiveLaunchProfile ??= persistedState.launchProfile;
+            effectiveExecutionRouting ??= persistedState.executionRouting;
             printPanel("Auto-Golang Resume", `Auto-golang pipeline will continue from phase: ${config.autoFromPhase}`, "yellow");
         }
-        await runDeclarativeFlowBySpecFile("auto-golang.json", config, autoFlowParams(config, forceRefreshSummary), effectiveLaunchProfile ? { launchProfile: effectiveLaunchProfile } : {}, requestUserInput, setSummary, effectiveLaunchMode, runtime);
+        checkAutoPrerequisites(config, effectiveLaunchProfile, effectiveExecutionRouting);
+        await runDeclarativeFlowBySpecFile("auto-golang.json", config, autoFlowParams(config, forceRefreshSummary), effectiveExecutionRouting
+            ? {
+                launchProfile: effectiveExecutionRouting.defaultRoute,
+                executionRouting: effectiveExecutionRouting,
+                ...(selectedRoutingPreset ? { selectedRoutingPreset } : {}),
+            }
+            : effectiveLaunchProfile
+                ? { launchProfile: effectiveLaunchProfile }
+                : {}, requestUserInput, setSummary, effectiveLaunchMode, runtime);
         return false;
     }
     if (config.command === "auto-common") {
         requireJiraConfig(config);
-        checkAutoPrerequisites(config);
+        checkAutoPrerequisites(config, launchProfile, executionRouting);
+        process.env.JIRA_BROWSE_URL = config.jiraBrowseUrl;
+        process.env.JIRA_API_URL = config.jiraApiUrl;
+        process.env.JIRA_TASK_FILE = config.jiraTaskFile;
+        await runDeclarativeFlowBySpecFile("auto-common.json", config, autoFlowParams(config, forceRefreshSummary), flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+        return false;
+    }
+    if (config.command === "auto-simple") {
+        requireJiraConfig(config);
+        checkAutoPrerequisites(config, launchProfile, executionRouting);
         process.env.JIRA_BROWSE_URL = config.jiraBrowseUrl;
         process.env.JIRA_API_URL = config.jiraApiUrl;
         process.env.JIRA_TASK_FILE = config.jiraTaskFile;
-        await runDeclarativeFlowBySpecFile("auto-common.json", config, autoFlowParams(config, forceRefreshSummary), launchProfile ? { launchProfile } : {}, requestUserInput, setSummary, launchMode, runtime);
+        await runDeclarativeFlowBySpecFile("auto-simple.json", config, autoFlowParams(config, forceRefreshSummary), flowOverrides, requestUserInput, setSummary, launchMode, runtime);
         return false;
     }
     if (config.command === "auto-status") {
@@ -790,7 +956,11 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             `Current step: ${currentStep}`,
             `Updated: ${state.updatedAt}`,
         ];
-        if (state.launchProfile) {
+        if (state.executionRouting) {
+            lines.push(`Default route: ${state.executionRouting.defaultRoute.executor} / ${state.executionRouting.defaultRoute.model}`);
+            lines.push(`Routing fingerprint: ${state.executionRouting.fingerprint}`);
+        }
+        else if (state.launchProfile) {
             lines.push(`Launch profile: ${state.launchProfile.executor} / ${state.launchProfile.model}`);
         }
         if (state.lastError) {
@@ -816,7 +986,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         printPanel("Auto-Golang Reset", removed ? `State file ${flowStateFile(config.scope.scopeKey, "auto-golang")} removed.` : "No flow state file found.", "yellow");
         return false;
     }
-    checkPrerequisites(config);
+    checkPrerequisites(config, launchProfile, executionRouting);
     if (config.jiraBrowseUrl && config.jiraApiUrl && config.jiraTaskFile) {
         process.env.JIRA_BROWSE_URL = config.jiraBrowseUrl ?? "";
         process.env.JIRA_API_URL = config.jiraApiUrl ?? "";
@@ -828,22 +998,37 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         delete process.env.JIRA_TASK_FILE;
     }
     if (config.command === "plan") {
-        requireJiraConfig(config);
-        if (config.verbose) {
-            process.stdout.write(`Fetching Jira issue from browse URL: ${config.jiraBrowseUrl}\n`);
-            process.stdout.write(`Resolved Jira API URL: ${config.jiraApiUrl}\n`);
-            process.stdout.write(`Saving Jira issue JSON to: ${config.jiraTaskFile}\n`);
+        let taskContextIteration;
+        if (config.jiraRef) {
+            requireJiraConfig(config);
+            if (config.verbose) {
+                process.stdout.write(`Fetching Jira issue from browse URL: ${config.jiraBrowseUrl}\n`);
+                process.stdout.write(`Resolved Jira API URL: ${config.jiraApiUrl}\n`);
+                process.stdout.write(`Saving Jira issue JSON to: ${config.jiraTaskFile}\n`);
+            }
+            taskContextIteration = nextArtifactIteration(config.taskKey, "task-context", "json");
+            await runDeclarativeFlowBySpecFile("task-source/jira-fetch.json", config, {
+                jiraApiUrl: config.jiraApiUrl,
+                taskKey: config.taskKey,
+            }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+            await runDeclarativeFlowBySpecFile("normalize-task-source.json", config, {
+                taskKey: config.taskKey,
+                iteration: taskContextIteration,
+                extraPrompt: config.extraPrompt,
+            }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+        }
+        else {
+            taskContextIteration = latestTaskContextIteration(config.taskKey);
         }
         await runDeclarativeFlowBySpecFile("plan.json", config, {
-            jiraApiUrl: config.jiraApiUrl,
             taskKey: config.taskKey,
-            taskSummaryIteration: nextArtifactIteration(config.taskKey, "task"),
+            taskContextIteration,
             designIteration: nextArtifactIteration(config.taskKey, "design"),
             planIteration: nextArtifactIteration(config.taskKey, "plan"),
             qaIteration: nextArtifactIteration(config.taskKey, "qa"),
             extraPrompt: config.extraPrompt,
             forceRefresh: forceRefreshSummary,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, setSummary, launchMode, runtime);
+        }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
         return false;
     }
     if (config.command === "bug-analyze") {
@@ -862,7 +1047,103 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             bugFixPlanIteration: nextArtifactIteration(config.taskKey, "bug-fix-plan"),
             extraPrompt: config.extraPrompt,
             forceRefresh: forceRefreshSummary,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, setSummary, launchMode, runtime);
+        }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+        return false;
+    }
+    if (config.command === "design-review") {
+        const iteration = nextDesignReviewIterationForTask(config.taskKey);
+        const inputContract = resolveDesignReviewInputContract(config.taskKey);
+        if (!config.dryRun) {
+            clearReadyToMergeFile(config.taskKey);
+        }
+        await runDeclarativeFlowBySpecFile("design-review.json", config, {
+            taskKey: config.taskKey,
+            iteration,
+            planningIteration: inputContract.planningIteration,
+            designFile: inputContract.designFile,
+            designJsonFile: inputContract.designJsonFile,
+            planFile: inputContract.planFile,
+            planJsonFile: inputContract.planJsonFile,
+            hasQaArtifacts: inputContract.hasQaArtifacts,
+            qaFilePath: inputContract.qaFilePath,
+            qaJsonFilePath: inputContract.qaJsonFilePath,
+            qaFile: inputContract.qaFile,
+            qaJsonFile: inputContract.qaJsonFile,
+            hasTaskContextJsonFile: inputContract.hasTaskContextJsonFile,
+            taskContextJsonFilePath: inputContract.taskContextJsonFilePath,
+            taskContextJsonFile: inputContract.taskContextJsonFile,
+            hasJiraTaskFile: inputContract.hasJiraTaskFile,
+            jiraTaskFilePath: inputContract.jiraTaskFilePath,
+            jiraTaskFile: inputContract.jiraTaskFile,
+            hasJiraAttachmentsManifestFile: inputContract.hasJiraAttachmentsManifestFile,
+            jiraAttachmentsManifestFilePath: inputContract.jiraAttachmentsManifestFilePath,
+            jiraAttachmentsManifestFile: inputContract.jiraAttachmentsManifestFile,
+            hasJiraAttachmentsContextFile: inputContract.hasJiraAttachmentsContextFile,
+            jiraAttachmentsContextFilePath: inputContract.jiraAttachmentsContextFilePath,
+            jiraAttachmentsContextFile: inputContract.jiraAttachmentsContextFile,
+            hasPlanningAnswersJsonFile: inputContract.hasPlanningAnswersJsonFile,
+            planningAnswersJsonFilePath: inputContract.planningAnswersJsonFilePath,
+            planningAnswersJsonFile: inputContract.planningAnswersJsonFile,
+            hasTaskInputJsonFile: inputContract.hasTaskInputJsonFile,
+            taskInputJsonFilePath: inputContract.taskInputJsonFilePath,
+            taskInputJsonFile: inputContract.taskInputJsonFile,
+            extraPrompt: config.extraPrompt,
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
+        if (!config.dryRun) {
+            printSummary("Design Review", `Artifacts:\n${designReviewFile(config.taskKey, iteration)}\n${designReviewJsonFile(config.taskKey, iteration)}`);
+        }
+        return false;
+    }
+    if (config.command === "plan-revise") {
+        const inputContract = resolvePlanReviseInputContract(config.taskKey);
+        if (!config.dryRun) {
+            clearReadyToMergeFile(config.taskKey);
+        }
+        await runDeclarativeFlowBySpecFile("plan-revise.json", config, {
+            taskKey: config.taskKey,
+            reviewIteration: inputContract.reviewIteration,
+            reviewFile: inputContract.reviewFile,
+            reviewJsonFile: inputContract.reviewJsonFile,
+            sourcePlanningIteration: inputContract.sourcePlanningIteration,
+            outputIteration: inputContract.outputIteration,
+            designFile: inputContract.designFile,
+            designJsonFile: inputContract.designJsonFile,
+            planFile: inputContract.planFile,
+            planJsonFile: inputContract.planJsonFile,
+            hasQaArtifacts: inputContract.hasQaArtifacts,
+            qaFilePath: inputContract.qaFilePath,
+            qaJsonFilePath: inputContract.qaJsonFilePath,
+            qaFile: inputContract.qaFile,
+            qaJsonFile: inputContract.qaJsonFile,
+            revisedDesignFile: inputContract.revisedDesignFile,
+            revisedDesignJsonFile: inputContract.revisedDesignJsonFile,
+            revisedPlanFile: inputContract.revisedPlanFile,
+            revisedPlanJsonFile: inputContract.revisedPlanJsonFile,
+            revisedQaFile: inputContract.revisedQaFile,
+            revisedQaJsonFile: inputContract.revisedQaJsonFile,
+            hasTaskContextJsonFile: inputContract.hasTaskContextJsonFile,
+            taskContextJsonFilePath: inputContract.taskContextJsonFilePath,
+            taskContextJsonFile: inputContract.taskContextJsonFile,
+            hasJiraTaskFile: inputContract.hasJiraTaskFile,
+            jiraTaskFilePath: inputContract.jiraTaskFilePath,
+            jiraTaskFile: inputContract.jiraTaskFile,
+            hasJiraAttachmentsManifestFile: inputContract.hasJiraAttachmentsManifestFile,
+            jiraAttachmentsManifestFilePath: inputContract.jiraAttachmentsManifestFilePath,
+            jiraAttachmentsManifestFile: inputContract.jiraAttachmentsManifestFile,
+            hasJiraAttachmentsContextFile: inputContract.hasJiraAttachmentsContextFile,
+            jiraAttachmentsContextFilePath: inputContract.jiraAttachmentsContextFilePath,
+            jiraAttachmentsContextFile: inputContract.jiraAttachmentsContextFile,
+            hasPlanningAnswersJsonFile: inputContract.hasPlanningAnswersJsonFile,
+            planningAnswersJsonFilePath: inputContract.planningAnswersJsonFilePath,
+            planningAnswersJsonFile: inputContract.planningAnswersJsonFile,
+            hasTaskInputJsonFile: inputContract.hasTaskInputJsonFile,
+            taskInputJsonFilePath: inputContract.taskInputJsonFilePath,
+            taskInputJsonFile: inputContract.taskInputJsonFile,
+            extraPrompt: config.extraPrompt,
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
+        if (!config.dryRun) {
+            printSummary("Plan Revise", `Artifacts:\n${inputContract.revisedDesignFile}\n${inputContract.revisedDesignJsonFile}\n${inputContract.revisedPlanFile}\n${inputContract.revisedPlanJsonFile}\n${inputContract.revisedQaFile}\n${inputContract.revisedQaJsonFile}`);
+        }
         return false;
     }
     if (config.command === "gitlab-review") {
@@ -875,7 +1156,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             extraPrompt: config.extraPrompt,
             reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, iteration),
             reviewFixPoints: config.reviewFixPoints,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         if (!config.dryRun) {
             printSummary("GitLab Review", `Artifacts:\n${gitlabReviewFile(config.taskKey)}\n${gitlabReviewJsonFile(config.taskKey)}\n${reviewFile(config.taskKey, iteration)}\n${reviewJsonFile(config.taskKey, iteration)}\n${reviewAssessmentFile(config.taskKey, iteration)}\n${reviewAssessmentJsonFile(config.taskKey, iteration)}`);
         }
@@ -889,7 +1170,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             iteration,
             gitlabDiffIteration,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         if (!config.dryRun) {
             printSummary("GitLab Diff Review", `Artifacts:\n${gitlabDiffFile(config.taskKey)}\n${gitlabDiffJsonFile(config.taskKey)}\n${reviewFile(config.taskKey, iteration)}\n${reviewJsonFile(config.taskKey, iteration)}`);
         }
@@ -907,7 +1188,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         await runDeclarativeFlowBySpecFile("bugz/bug-fix.json", config, {
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "mr-description") {
@@ -917,7 +1198,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             iteration: nextArtifactIteration(config.taskKey, "mr-description"),
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "task-describe") {
@@ -927,42 +1208,33 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             iteration,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "implement") {
-        requireArtifacts(planArtifacts(config.taskKey), "Implement mode requires plan artifacts from the planning phase.");
-        validateStructuredArtifacts([
-            { path: designJsonFile(config.taskKey), schemaId: "implementation-design/v1" },
-            { path: planJsonFile(config.taskKey), schemaId: "implementation-plan/v1" },
-            { path: qaJsonFile(config.taskKey), schemaId: "qa-plan/v1" },
-        ], "Implement mode requires valid structured plan artifacts from the planning phase.");
+        const planningBundle = resolveLatestPlanningBundle(config.taskKey);
         await runDeclarativeFlowBySpecFile("implement.json", config, {
             taskKey: config.taskKey,
+            planningIteration: planningBundle.planningIteration,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode);
+        }, flowOverrides, requestUserInput, undefined, launchMode);
         return false;
     }
     if (config.command === "review") {
         const iteration = nextReviewIterationForTask(config.taskKey);
-        if (config.jiraBrowseUrl && config.jiraApiUrl && config.jiraTaskFile) {
-            requireJiraConfig(config);
-            validateStructuredArtifacts([
-                { path: designJsonFile(config.taskKey), schemaId: "implementation-design/v1" },
-                { path: planJsonFile(config.taskKey), schemaId: "implementation-plan/v1" },
-            ], "Review mode requires valid structured plan artifacts from the planning phase.");
+        if (hasStructuredReviewInputs(config.taskKey)) {
             await runDeclarativeFlowBySpecFile("review/review.json", config, {
-                taskKey: config.taskKey,
+                ...reviewFlowParamsFromContract(config),
                 iteration,
                 extraPrompt: config.extraPrompt,
-            }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+            }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         }
         else {
             await runDeclarativeFlowBySpecFile("review/review-project.json", config, {
                 taskKey: config.taskKey,
                 iteration,
                 extraPrompt: config.extraPrompt,
-            }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+            }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         }
         return !config.dryRun && existsSync(readyToMergeFile(config.taskKey));
     }
@@ -981,23 +1253,21 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, latestIteration),
             extraPrompt: config.extraPrompt,
             reviewFixPoints: config.reviewFixPoints,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "review-loop") {
         const iteration = nextReviewIterationForTask(config.taskKey);
-        if (config.jiraBrowseUrl && config.jiraApiUrl && config.jiraTaskFile) {
-            requireJiraConfig(config);
-            validateStructuredArtifacts([
-                { path: designJsonFile(config.taskKey), schemaId: "implementation-design/v1" },
-                { path: planJsonFile(config.taskKey), schemaId: "implementation-plan/v1" },
-            ], "Review-loop mode requires valid structured plan artifacts from the planning phase.");
-        }
-        await runDeclarativeFlowBySpecFile("review/review-loop.json", config, {
-            taskKey: config.taskKey,
-            iteration,
+        const reviewLoopSpec = hasStructuredReviewInputs(config.taskKey)
+            ? "review/review-loop.json"
+            : "review/review-project-loop.json";
+        await runDeclarativeFlowBySpecFile(reviewLoopSpec, config, {
+            ...(reviewLoopSpec === "review/review-loop.json"
+                ? reviewFlowParamsFromContract(config)
+                : { taskKey: config.taskKey }),
+            baseIteration: iteration,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return !config.dryRun && existsSync(readyToMergeFile(config.taskKey));
     }
     if (config.command === "run-go-tests-loop" || config.command === "run-go-linter-loop") {
@@ -1008,14 +1278,14 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             runGoTestsIteration: nextArtifactIteration(config.taskKey, "run-go-tests-result", "json"),
             runGoLinterIteration: nextArtifactIteration(config.taskKey, "run-go-linter-result", "json"),
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "git-commit") {
         await runDeclarativeFlowBySpecFile("git-commit.json", config, {
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
-        }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
+        }, flowOverrides, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     throw new TaskRunnerError(`Unsupported command: ${config.command}`);
@@ -1043,6 +1313,7 @@ function parseCliArgs(argv) {
     let prompt;
     let autoFromPhase;
     let scopeName;
+    let reviewBlockingSeverities;
     let helpPhases = false;
     let jiraRef;
     let mdLang;
@@ -1071,6 +1342,15 @@ function parseCliArgs(argv) {
             index += 1;
             continue;
         }
+        if (token === "--blocking-severities") {
+            reviewBlockingSeverities = parseReviewSeverityCsv(argv[index + 1] ?? "");
+            index += 1;
+            continue;
+        }
+        if (token.startsWith("--blocking-severities=")) {
+            reviewBlockingSeverities = parseReviewSeverityCsv(token.slice("--blocking-severities=".length));
+            continue;
+        }
         if (token === "--from") {
             autoFromPhase = argv[index + 1];
             index += 1;
@@ -1114,6 +1394,10 @@ function parseCliArgs(argv) {
         printAutoCommonPhasesHelp();
         process.exit(0);
     }
+    if (command === "auto-simple" && helpPhases) {
+        printAutoSimplePhasesHelp();
+        process.exit(0);
+    }
     return {
         command: command,
         dry,
@@ -1121,6 +1405,7 @@ function parseCliArgs(argv) {
         helpPhases,
         ...(jiraRef !== undefined ? { jiraRef } : {}),
         ...(scopeName !== undefined ? { scopeName } : {}),
+        ...(reviewBlockingSeverities !== undefined ? { reviewBlockingSeverities } : {}),
         ...(prompt !== undefined ? { prompt } : {}),
         ...(autoFromPhase !== undefined ? { autoFromPhase } : {}),
         ...(mdLang !== undefined ? { mdLang } : {}),
@@ -1131,6 +1416,7 @@ function buildConfigFromArgs(args) {
     return buildBaseConfig(args.command, {
         ...(args.jiraRef !== undefined ? { jiraRef: args.jiraRef } : {}),
         ...(args.scopeName !== undefined ? { scopeName: args.scopeName } : {}),
+        ...(args.reviewBlockingSeverities !== undefined ? { reviewBlockingSeverities: args.reviewBlockingSeverities } : {}),
         ...(args.prompt !== undefined ? { extraPrompt: args.prompt } : {}),
         ...(args.autoFromPhase !== undefined ? { autoFromPhase: args.autoFromPhase } : {}),
         ...(args.mdLang !== undefined ? { mdLang: args.mdLang } : {}),
@@ -1146,7 +1432,7 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
     let activeAbortController = null;
     let activeFlowId = null;
     let exiting = false;
-    const ui = new InteractiveUi({
+    const ui = createInteractiveSession({
         scopeKey: currentScope.scopeKey,
         jiraIssueKey: currentScope.jiraIssueKey ?? null,
         summaryText: "",
@@ -1171,40 +1457,51 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                 if (!flowEntry) {
                     throw new TaskRunnerError(`Unknown flow: ${flowId}`);
                 }
+                const routingGroups = flowRoutingGroups(flowEntry, process.cwd());
                 const resumeState = launchMode === "resume" ? loadFlowRunState(currentScope.scopeKey, flowId) : null;
                 if (resumeState) {
                     currentScope = scopeWithRestoredJiraContext(currentScope, resumeState);
                 }
-                const launchProfile = launchMode === "resume"
-                    ? resumeState?.launchProfile
-                    : await requestInteractiveLaunchProfile((form) => ui.requestUserInput(form));
-                if (!launchProfile) {
-                    throw new TaskRunnerError("Resume is impossible because launch profile was not saved. Use restart.");
+                const routingSelection = launchMode === "resume"
+                    ? (resumeState?.executionRouting
+                        ? {
+                            routing: resumeState.executionRouting,
+                            selectedPreset: resumeState.selectedRoutingPreset ?? { kind: "custom", label: "Saved routing" },
+                        }
+                        : null)
+                    : await requestInteractiveExecutionRouting(flowEntry, (form) => ui.requestUserInput(form));
+                if (launchMode === "resume" && !routingSelection?.routing) {
+                    throw new TaskRunnerError("Resume is impossible because execution routing was not saved. Use restart.");
                 }
+                const launchProfile = routingSelection?.routing?.defaultRoute;
                 const previousScopeKey = currentScope.scopeKey;
-                const baseConfig = buildBaseConfig(flowId, {
-                    ...(currentScope.jiraRef ? { jiraRef: currentScope.jiraRef } : {}),
-                    scopeName: currentScope.scopeKey,
-                });
+                const baseConfig = buildInteractiveBaseConfig(flowId, currentScope);
                 if (flowEntry.source === "built-in" && isBuiltInCommandFlowId(flowId)) {
                     const nextScope = await resolveScopeForCommand(baseConfig, (form) => ui.requestUserInput(form));
                     currentScope = nextScope;
                 }
                 else if (flowRequiresTaskScope(flowEntry) && !currentScope.jiraRef) {
                     const jiraContext = await requestJiraContext((form) => ui.requestUserInput(form));
-                    currentScope = attachJiraContext(currentScope, jiraContext.jiraRef);
+                    currentScope = resolveProjectScope(null, jiraContext.jiraRef);
                 }
                 ui.setScope(currentScope.scopeKey, currentScope.jiraIssueKey ?? null);
                 if (previousScopeKey !== currentScope.scopeKey || currentScope.jiraIssueKey) {
                     syncInteractiveTaskSummary(ui, currentScope, forceRefresh);
                 }
-                printPanel("Effective Launch Config", `executor: ${launchProfile.executor}\nmodel: ${launchProfile.model}\nmode: ${launchMode}`, "cyan");
+                if (routingSelection?.routing) {
+                    printPanel("Effective Launch Config", `preset: ${routingSelection.selectedPreset.label}\nmode: ${launchMode}\n${describeExecutionRouting(routingSelection.routing, routingGroups)}`, "cyan");
+                }
                 if (flowEntry.source === "built-in" && isBuiltInCommandFlowId(flowId)) {
-                    await executeCommand(baseConfig, true, (form) => ui.requestUserInput(form), currentScope, (markdown) => ui.setSummary(markdown), forceRefresh, launchMode, launchProfile, createRuntimeServices(abortController.signal));
+                    await executeCommand(baseConfig, true, (form) => ui.requestUserInput(form), currentScope, (markdown) => ui.setSummary(markdown), forceRefresh, launchMode, launchProfile, routingSelection?.routing, routingSelection?.selectedPreset, createRuntimeServices(abortController.signal));
                     return;
                 }
                 const runtimeConfig = buildRuntimeConfig(baseConfig, currentScope);
-                await runDeclarativeFlowByRef(flowId, toDeclarativeFlowRef(flowEntry), runtimeConfig, defaultDeclarativeFlowParams(runtimeConfig, forceRefresh, { launchProfile }), { launchProfile }, (form) => ui.requestUserInput(form), (markdown) => ui.setSummary(markdown), launchMode, createRuntimeServices(abortController.signal));
+                const flowOverrides = {
+                    ...(launchProfile ? { launchProfile } : {}),
+                    ...(routingSelection?.routing ? { executionRouting: routingSelection.routing } : {}),
+                    ...(routingSelection?.selectedPreset ? { selectedRoutingPreset: routingSelection.selectedPreset } : {}),
+                };
+                await runDeclarativeFlowByRef(flowId, toDeclarativeFlowRef(flowEntry), runtimeConfig, defaultDeclarativeFlowParams(runtimeConfig, forceRefresh, flowOverrides), flowOverrides, (form) => ui.requestUserInput(form), (markdown) => ui.setSummary(markdown), launchMode, createRuntimeServices(abortController.signal));
             }
             catch (error) {
                 if (error instanceof FlowInterruptedError) {
@@ -1283,7 +1580,10 @@ export async function main(argv = process.argv.slice(2)) {
             return await runInteractive(args[0] ?? "", forceRefresh);
         }
         const parsedArgs = parseCliArgs(args);
-        await executeCommand(buildConfigFromArgs(parsedArgs));
+        const commandCompleted = await executeCommand(buildConfigFromArgs(parsedArgs));
+        if (parsedArgs.command === "doctor") {
+            return commandCompleted ? 0 : 1;
+        }
         return 0;
     }
     catch (error) {