agentweaver 0.1.16 → 0.1.18

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, writeSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-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 { archiveActiveAttempt, 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 { createFlowRunState, classifyFlowLaunchAvailability, loadFlowRunState, prepareFlowStateForContinue, 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";
@@ -15,6 +15,7 @@ import { createPipelineContext } from "./pipeline/context.js";
 import { collectFlowRoutingGroups, loadDeclarativeFlow } from "./pipeline/declarative-flows.js";
 import { runExpandedPhase } from "./pipeline/declarative-flow-runner.js";
 import { builtInCommandFlowFile, findCatalogEntry, flowRoutingGroups, isBuiltInCommandFlowId, loadInteractiveFlowCatalog, toDeclarativeFlowRef, } from "./pipeline/flow-catalog.js";
+import { createPipelineRegistryContext } from "./pipeline/plugin-loader.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";
@@ -31,12 +32,14 @@ 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 { createWebInteractiveSession } from "./interactive/web/index.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 { detectGitBranchName, requestJiraContext, resolveProjectScope, } from "./scope.js";
+import { requestJiraContext, resolveProjectScope, } from "./scope.js";
 const COMMANDS = [
     "auto-golang",
+    "auto-common-guided",
     "auto-common",
     "auto-simple",
     "auto-status",
@@ -52,7 +55,9 @@ const COMMANDS = [
     "mr-description",
     "plan",
     "plan-revise",
+    "playbook-init",
     "task-describe",
+    "web",
     "implement",
     "review",
     "review-fix",
@@ -60,8 +65,17 @@ const COMMANDS = [
     "run-go-tests-loop",
     "run-go-linter-loop",
 ];
+const INTERACTIVE_SCOPE_WATCH_INTERVAL_MS = 1500;
+const WEB_AUTH_USERNAME_ENV = "AGENTWEAVER_WEB_USERNAME";
+const WEB_AUTH_PASSWORD_ENV = "AGENTWEAVER_WEB_PASSWORD";
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.resolve(MODULE_DIR, "..");
+function writeStdoutSync(text) {
+    writeSync(process.stdout.fd, text);
+}
+function writeStderrSync(text) {
+    writeSync(process.stderr.fd, text);
+}
 function createRuntimeServices(signal) {
     return {
         resolveCmd,
@@ -70,6 +84,37 @@ function createRuntimeServices(signal) {
     };
 }
 const runtimeServices = createRuntimeServices();
+function isExternalWebHost(host) {
+    const normalized = (host?.trim() || "127.0.0.1").toLowerCase();
+    if (normalized === "127.0.0.1" || normalized === "::1" || normalized === "localhost") {
+        return false;
+    }
+    const unbracketed = normalized.startsWith("[") && normalized.endsWith("]") ? normalized.slice(1, -1) : normalized;
+    if (unbracketed === "::1") {
+        return false;
+    }
+    return true;
+}
+function resolveWebAuthConfig() {
+    const username = process.env[WEB_AUTH_USERNAME_ENV]?.trim() ?? "";
+    const password = process.env[WEB_AUTH_PASSWORD_ENV] ?? "";
+    const hasUsername = username.length > 0;
+    const hasPassword = password.length > 0;
+    if (hasUsername !== hasPassword) {
+        throw new TaskRunnerError(`Web UI auth requires both ${WEB_AUTH_USERNAME_ENV} and ${WEB_AUTH_PASSWORD_ENV}.`);
+    }
+    if (!hasUsername || !hasPassword) {
+        return undefined;
+    }
+    return { username, password };
+}
+function requireWebAuthForHost(host, auth) {
+    if (!isExternalWebHost(host) || auth) {
+        return;
+    }
+    throw new TaskRunnerError(`External Web UI binding requires ${WEB_AUTH_USERNAME_ENV} and ${WEB_AUTH_PASSWORD_ENV}. ` +
+        "Use localhost for no-auth local access, or configure credentials before using --listen-all or --host with an external interface.");
+}
 function buildFailureOutputPreview(output) {
     const normalized = stripAnsi(output).replace(/\r\n/g, "\n").trim();
     if (!normalized) {
@@ -109,6 +154,7 @@ function usage() {
   agentweaver
   agentweaver <jira-browse-url|jira-issue-key>
   agentweaver --force <jira-browse-url|jira-issue-key>
+  agentweaver web [--no-open] [--host <host>|--listen-all] [<jira-browse-url|jira-issue-key>]
   agentweaver git-commit [--dry] [--verbose] [--prompt <text>] [--scope <name>] [<jira-browse-url|jira-issue-key>]
   agentweaver gitlab-diff-review [--dry] [--verbose] [--prompt <text>] [--scope <name>]
   agentweaver gitlab-review [--dry] [--verbose] [--prompt <text>] [--scope <name>]
@@ -120,6 +166,7 @@ function usage() {
   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 playbook-init [--dry] [--verbose] [--prompt <text>] [--accept-playbook-draft] [--scope <name>]
   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>] [--blocking-severities <list>] [<jira-browse-url|jira-issue-key>]
@@ -130,6 +177,7 @@ function usage() {
   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-guided [--dry] [--verbose] [--prompt <text>] [--md-lang <en|ru>] [--accept-playbook-draft] <jira-browse-url|jira-issue-key>
   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>
@@ -145,12 +193,19 @@ Interactive Mode:
 Flags:
   --version       Show package version
   --force         In interactive mode, regenerate task summary in Jira-backed flows
+  --no-open       Web command only: print the Web UI URL without opening a browser
+  --host          Web command only: bind Web UI to this host (default: 127.0.0.1)
+  --listen-all    Web command only: bind Web UI to 0.0.0.0
   --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 except instant-task
   --prompt        Extra prompt text appended to the base prompt
+  --resume        Resume an interrupted run when valid
+  --continue      Continue a terminated iterative run when valid
+  --restart       Archive the active attempt and start a fresh run
   --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)
+  --md-lang       Language for workflow markdown artifacts only: en (English) or ru (Russian, default)
+  --accept-playbook-draft  Non-interactively accept generated playbook content for playbook-init or auto-common-guided missing-manifest runs
 
 Required environment variables:
   JIRA_API_KEY    Jira API token used for Jira-backed flows (Bearer by default, or Basic with Jira Cloud)
@@ -166,9 +221,15 @@ Optional environment variables:
   CODEX_MODEL
   OPENCODE_BIN
   OPENCODE_MODEL
+  AGENTWEAVER_WEB_NO_OPEN  Set to 1 to disable browser auto-open for agentweaver web
+  ${WEB_AUTH_USERNAME_ENV}  Web UI Basic auth username; required for external Web UI binding
+  ${WEB_AUTH_PASSWORD_ENV}  Web UI Basic auth password; required for external Web UI binding
 
 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.
+  - agentweaver web binds to 127.0.0.1 by default on an operating-system-assigned port and does not require auth unless Web UI credentials are configured.
+  - External Web UI binding through --listen-all, --host 0.0.0.0, --host ::, non-loopback IPs, or hostnames other than localhost requires ${WEB_AUTH_USERNAME_ENV} and ${WEB_AUTH_PASSWORD_ENV}.
+  - Web UI Basic auth over plain HTTP is suitable only on trusted networks; use TLS termination or a reverse proxy on untrusted networks.
   - 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.
@@ -186,12 +247,12 @@ function packageVersion() {
 function normalizeAutoPhaseId(phaseId) {
     return phaseId.trim().toLowerCase().replaceAll("-", "_");
 }
-function autoPhaseIds() {
-    return loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" }).phases.map((phase) => phase.id);
+async function autoPhaseIds() {
+    return (await loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" })).phases.map((phase) => phase.id);
 }
-function validateAutoPhaseId(phaseId) {
+async function validateAutoPhaseId(phaseId) {
     const normalized = normalizeAutoPhaseId(phaseId);
-    if (!autoPhaseIds().includes(normalized)) {
+    if (!(await autoPhaseIds()).includes(normalized)) {
         throw new TaskRunnerError(`Unknown auto-golang phase: ${phaseId}\nUse 'agentweaver auto-golang --help-phases' or '/help auto-golang' to list valid phases.`);
     }
     return normalized;
@@ -215,6 +276,17 @@ function buildFlowResumeDetails(state) {
     }
     return lines.join("\n");
 }
+function buildFlowContinueDetails(state) {
+    const lines = [
+        "Continuable loop boundary found.",
+        `Updated: ${state.updatedAt}`,
+    ];
+    if (state.continuation?.stopPhaseId && state.continuation?.stopStepId) {
+        lines.push(`Stopped at: ${state.continuation.stopPhaseId}:${state.continuation.stopStepId}`);
+    }
+    lines.push("Continue will preserve existing artifacts and start the next iteration from active inputs.");
+    return lines.join("\n");
+}
 function buildResolverContext(pipelineContext, flowParams, flowConstants, repeatVars, executionState) {
     return {
         flowParams,
@@ -288,7 +360,7 @@ function validateDeclarativePhaseResumeState(phase, phaseState, pipelineContext,
         }
     }
 }
-function validateDeclarativeFlowResumeState(flowEntry, config, state, executionRouting, runtime = runtimeServices) {
+async 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));
@@ -308,7 +380,7 @@ function validateDeclarativeFlowResumeState(flowEntry, config, state, executionR
     if (flowRequiresTaskScope(flowEntry) && !config.jiraRef) {
         throw new TaskRunnerError("Resume is impossible because Jira context is missing for this flow state. Use restart.");
     }
-    const pipelineContext = createPipelineContext({
+    const pipelineContext = await createPipelineContext({
         issueKey: config.taskKey,
         jiraRef: config.jiraRef,
         dryRun: config.dryRun,
@@ -338,51 +410,59 @@ function buildInteractiveBaseConfig(flowId, scope) {
         ...(flowId !== "instant-task" && scope.jiraRef ? { jiraRef: scope.jiraRef } : {}),
     });
 }
-function lookupInteractiveFlowResume(flowEntry, currentScope) {
+async function lookupInteractiveFlowResume(flowEntry, currentScope) {
     const directState = loadFlowRunState(currentScope.scopeKey, flowEntry.id);
-    if (directState && hasResumableFlowState(directState)) {
+    const availability = classifyFlowLaunchAvailability(directState);
+    if (directState && availability.resume.available) {
         try {
             const effectiveScope = scopeWithRestoredJiraContext(currentScope, directState);
             const baseConfig = buildInteractiveBaseConfig(flowEntry.id, effectiveScope);
             const config = buildRuntimeConfig(baseConfig, effectiveScope);
-            validateDeclarativeFlowResumeState(flowEntry, config, directState, directState.executionRouting);
+            await validateDeclarativeFlowResumeState(flowEntry, config, directState, directState.executionRouting);
             return {
-                resumeAvailable: true,
-                hasExistingState: true,
+                ...availability,
                 details: buildFlowResumeDetails(directState),
             };
         }
         catch (error) {
             return {
-                resumeAvailable: false,
-                hasExistingState: true,
+                ...availability,
+                resume: {
+                    available: false,
+                    reason: error.message,
+                },
                 details: `Interrupted run found, but resume is unavailable.\n${error.message}`,
             };
         }
     }
+    if (directState && availability.continue.available) {
+        return {
+            ...availability,
+            details: buildFlowContinueDetails(directState),
+        };
+    }
     return {
-        resumeAvailable: false,
-        hasExistingState: Boolean(directState),
+        ...availability,
     };
 }
-function printAutoPhasesHelp() {
-    const phaseLines = ["Available auto-golang phases:", "", ...autoPhaseIds()];
+async function printAutoPhasesHelp() {
+    const phaseLines = ["Available auto-golang phases:", "", ...(await autoPhaseIds())];
     phaseLines.push("", "You can resume auto-golang from a phase with:", "agentweaver auto-golang --from <phase> <jira>", "or in interactive mode:", "/auto-golang --from <phase>");
     printPanel("Auto-Golang Phases", phaseLines.join("\n"), "magenta");
 }
-function autoCommonPhaseIds() {
-    return loadDeclarativeFlow({ source: "built-in", fileName: "auto-common.json" }).phases.map((phase) => phase.id);
+async function autoCommonPhaseIds(fileName = "auto-common.json") {
+    return (await loadDeclarativeFlow({ source: "built-in", fileName })).phases.map((phase) => phase.id);
 }
-function printAutoCommonPhasesHelp() {
-    const phaseLines = ["Available auto-common phases:", "", ...autoCommonPhaseIds()];
-    phaseLines.push("", "You can run auto-common with:", "agentweaver auto-common <jira>");
-    printPanel("Auto-Common Phases", phaseLines.join("\n"), "magenta");
+async function printAutoCommonPhasesHelp(command = "auto-common", fileName = "auto-common.json") {
+    const phaseLines = [`Available ${command} phases:`, "", ...(await autoCommonPhaseIds(fileName))];
+    phaseLines.push("", `You can run ${command} with:`, `agentweaver ${command} <jira>`);
+    printPanel(command === "auto-common-guided" ? "Auto-Common Guided Phases" : "Auto-Common Phases", phaseLines.join("\n"), "magenta");
 }
-function autoSimplePhaseIds() {
-    return loadDeclarativeFlow({ source: "built-in", fileName: "auto-simple.json" }).phases.map((phase) => phase.id);
+async function autoSimplePhaseIds() {
+    return (await loadDeclarativeFlow({ source: "built-in", fileName: "auto-simple.json" })).phases.map((phase) => phase.id);
 }
-function printAutoSimplePhasesHelp() {
-    const phaseLines = ["Available auto-simple phases:", "", ...autoSimplePhaseIds()];
+async function printAutoSimplePhasesHelp() {
+    const phaseLines = ["Available auto-simple phases:", "", ...(await autoSimplePhaseIds())];
     phaseLines.push("", "You can run auto-simple with:", "agentweaver auto-simple <jira>");
     printPanel("Auto-Simple Phases", phaseLines.join("\n"), "magenta");
 }
@@ -400,11 +480,12 @@ function buildBaseConfig(command, options = {}) {
         reviewFixPoints: options.reviewFixPoints ?? null,
         reviewBlockingSeverities: options.reviewBlockingSeverities ?? resolveReviewBlockingSeveritiesFromEnv(),
         extraPrompt: options.extraPrompt ?? null,
-        autoFromPhase: options.autoFromPhase ? validateAutoPhaseId(options.autoFromPhase) : null,
+        autoFromPhase: options.autoFromPhase ?? null,
         mdLang: options.mdLang ?? null,
         dryRun: options.dryRun ?? false,
         verbose: options.verbose ?? false,
         ...(options.doctorArgs !== undefined ? { doctorArgs: options.doctorArgs } : {}),
+        ...(options.acceptPlaybookDraft !== undefined ? { acceptPlaybookDraft: options.acceptPlaybookDraft } : {}),
     };
 }
 function commandRequiresTask(command) {
@@ -414,6 +495,7 @@ function commandRequiresTask(command) {
         command === "design-review" ||
         command === "mr-description" ||
         command === "auto-golang" ||
+        command === "auto-common-guided" ||
         command === "auto-common" ||
         command === "auto-simple" ||
         command === "auto-status" ||
@@ -425,6 +507,7 @@ function commandSupportsProjectScope(command) {
         command === "gitlab-diff-review" ||
         command === "gitlab-review" ||
         command === "instant-task" ||
+        command === "playbook-init" ||
         command === "task-describe" ||
         command === "implement" ||
         command === "review" ||
@@ -498,29 +581,42 @@ function routingForPrerequisites(launchProfile, executionRouting) {
 function flowSpecFileForPrerequisiteChecks(command) {
     return isBuiltInCommandFlowId(command) ? builtInCommandFlowFile(command) : null;
 }
-function commandRoutingGroupsForPrerequisiteChecks(command, cwd) {
+async function commandRoutingGroupsForPrerequisiteChecks(command, cwd) {
     const fileName = flowSpecFileForPrerequisiteChecks(command);
     if (!fileName) {
         return [];
     }
-    return collectFlowRoutingGroups(loadDeclarativeFlow({ source: "built-in", fileName }), cwd);
+    return collectFlowRoutingGroups(await loadDeclarativeFlow({ source: "built-in", fileName }), cwd);
 }
-function resolveExecutorPrerequisite(executor) {
+function resolveExecutorPrerequisite(executor, registryContext) {
     if (executor === "codex") {
         resolveCmd("codex", "CODEX_BIN");
         return;
     }
-    resolveCmd("opencode", "OPENCODE_BIN");
+    if (executor === "opencode") {
+        resolveCmd("opencode", "OPENCODE_BIN");
+        return;
+    }
+    const definition = registryContext.executors.get(executor);
+    const config = definition.defaultConfig;
+    if (config
+        && typeof config === "object"
+        && !Array.isArray(config)
+        && typeof config.defaultCommand === "string"
+        && typeof config.commandEnvVar === "string") {
+        resolveCmd(config.defaultCommand, config.commandEnvVar);
+    }
 }
-function checkPrerequisites(config, launchProfile, executionRouting) {
+async function checkPrerequisites(config, launchProfile, executionRouting) {
+    const registryContext = await createPipelineRegistryContext(process.cwd());
     const routing = routingForPrerequisites(launchProfile, executionRouting);
-    const groups = commandRoutingGroupsForPrerequisiteChecks(config.command, process.cwd());
+    const groups = await commandRoutingGroupsForPrerequisiteChecks(config.command, process.cwd());
     for (const executor of executorsForRoutingGroups(routing, groups)) {
-        resolveExecutorPrerequisite(executor);
+        resolveExecutorPrerequisite(executor, registryContext);
     }
 }
-function checkAutoPrerequisites(config, launchProfile, executionRouting) {
-    checkPrerequisites(config, launchProfile, executionRouting);
+async function checkAutoPrerequisites(config, launchProfile, executionRouting) {
+    await checkPrerequisites(config, launchProfile, executionRouting);
 }
 function autoFlowParams(config, forceRefreshSummary = false) {
     return {
@@ -536,6 +632,8 @@ function autoFlowParams(config, forceRefreshSummary = false) {
         reviewBlockingSeverities: config.reviewBlockingSeverities,
         forceRefresh: forceRefreshSummary,
         mdLang: config.mdLang,
+        acceptPlaybookDraft: config.command === "auto-common-guided" ? config.acceptPlaybookDraft === true : false,
+        launchMode: config.command === "auto-common-guided" ? config.autoFromPhase ?? "restart" : undefined,
         runGoTestsScript: path.join(agentweaverHome(PACKAGE_ROOT), "run_go_tests.py"),
         runGoLinterScript: path.join(agentweaverHome(PACKAGE_ROOT), "run_go_linter.py"),
         runGoTestsIteration: nextArtifactIteration(config.taskKey, "run-go-tests-result", "json"),
@@ -616,7 +714,7 @@ function interactiveFlowDefinition(entry) {
         description: flow.description ?? "No description available for this flow.",
         source: entry.source,
         treePath: [...entry.treePath],
-        ...(entry.source === "project-local" ? { sourcePath: entry.absolutePath } : {}),
+        ...(entry.source !== "built-in" ? { sourcePath: entry.absolutePath } : {}),
         phases: flow.phases.map((phase) => ({
             id: phase.id,
             repeatVars: Object.fromEntries(Object.entries(phase.repeatVars).map(([key, value]) => [key, value])),
@@ -666,7 +764,7 @@ function findCurrentFlowExecutionStep(state) {
     return null;
 }
 async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, overrides = {}, requestUserInput = requestUserInputInTerminal, setSummary, launchMode = "restart", runtime = runtimeServices) {
-    const context = createPipelineContext({
+    const context = await createPipelineContext({
         issueKey: config.taskKey,
         jiraRef: config.jiraRef,
         dryRun: config.dryRun,
@@ -677,7 +775,7 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
         requestUserInput,
         ...(overrides.executionRouting ? { executionRouting: overrides.executionRouting } : {}),
     });
-    const flow = loadDeclarativeFlow(flowRef);
+    const flow = await loadDeclarativeFlow(flowRef);
     const initialExecutionState = {
         flowKind: flow.kind,
         flowVersion: flow.version,
@@ -685,9 +783,12 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
         terminationOutcome: "success",
         phases: [],
     };
-    let persistedState = launchMode === "resume" ? loadFlowRunState(config.scope.scopeKey, flowId) : null;
+    const existingStateForRestart = launchMode === "restart" ? loadFlowRunState(config.scope.scopeKey, flowId) : null;
+    let persistedState = launchMode === "resume" || launchMode === "continue"
+        ? loadFlowRunState(config.scope.scopeKey, flowId)
+        : null;
     if (persistedState && launchMode === "resume") {
-        validateDeclarativeFlowResumeState({
+        await validateDeclarativeFlowResumeState({
             id: flowId,
             source: flow.source,
             fileName: flow.fileName,
@@ -700,7 +801,13 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, over
             } }) : undefined), runtime);
         persistedState = prepareFlowStateForResume(persistedState);
     }
+    else if (persistedState && launchMode === "continue") {
+        persistedState = prepareFlowStateForContinue(persistedState, flow.phases);
+    }
     else if (launchMode === "restart") {
+        if (existingStateForRestart) {
+            archiveActiveAttempt(config.scope.scopeKey);
+        }
         resetFlowRunState(config.scope.scopeKey, flowId);
     }
     const executionState = persistedState?.executionState ?? initialExecutionState;
@@ -772,7 +879,7 @@ async function runDeclarativeFlowBySpecFile(fileName, config, flowParams, overri
         ...defaultDeclarativeFlowParams(config, false, overrides),
         ...flowParams,
     };
-    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, withCanonicalReviewLoopParams(loadDeclarativeFlow({ source: "built-in", fileName }).kind, mergedFlowParams), overrides, requestUserInput, setSummary, launchMode, runtime);
+    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, withCanonicalReviewLoopParams((await loadDeclarativeFlow({ source: "built-in", fileName })).kind, mergedFlowParams), overrides, requestUserInput, setSummary, launchMode, runtime);
 }
 function defaultDeclarativeFlowParams(config, forceRefreshSummary = false, overrides = {}) {
     const iteration = nextReviewIterationForTask(config.taskKey);
@@ -804,10 +911,15 @@ function defaultDeclarativeFlowParams(config, forceRefreshSummary = false, overr
         mdLang: config.mdLang,
         llmExecutor: launchProfile.executor,
         llmModel: launchProfile.model,
+        projectGuidanceFile: "not provided",
+        projectGuidanceJsonFile: "not provided",
+        repairProjectGuidanceFile: "not provided",
+        repairProjectGuidanceJsonFile: "not provided",
         launchProfile,
         executionRouting,
         iteration,
         baseIteration: iteration,
+        designReviewBaseIteration: nextDesignReviewIterationForTask(config.taskKey),
         latestIteration,
         taskContextIteration: latestTaskContext ?? nextArtifactIteration(config.taskKey, "task-context", "json"),
         taskSummaryIteration: nextArtifactIteration(config.taskKey, "task"),
@@ -818,6 +930,60 @@ function defaultDeclarativeFlowParams(config, forceRefreshSummary = false, overr
         forceRefresh: forceRefreshSummary,
     };
 }
+function countAvailableNonRestartActions(availability) {
+    return Number(availability.resume.available) + Number(availability.continue.available);
+}
+async function chooseLaunchMode(flowId, scopeKey, explicitLaunchMode, requestUserInput) {
+    const state = loadFlowRunState(scopeKey, flowId);
+    const availability = classifyFlowLaunchAvailability(state);
+    if (explicitLaunchMode) {
+        const selectedAvailability = availability[explicitLaunchMode];
+        if (!selectedAvailability.available) {
+            throw new TaskRunnerError(`${explicitLaunchMode.charAt(0).toUpperCase()}${explicitLaunchMode.slice(1)} is not available for '${flowId}'. ${selectedAvailability.reason}`);
+        }
+        return explicitLaunchMode;
+    }
+    if (!availability.hasExistingState) {
+        return "restart";
+    }
+    const availableNonRestart = countAvailableNonRestartActions(availability);
+    if (availableNonRestart === 0) {
+        return "restart";
+    }
+    const interactive = requestUserInput !== requestUserInputInTerminal || (process.stdin.isTTY && process.stdout.isTTY);
+    if (!interactive) {
+        throw new TaskRunnerError(`Multiple actions are valid for '${flowId}'. Re-run with one of: --resume, --continue, --restart.`);
+    }
+    const result = await requestUserInput({
+        formId: `launch-mode-${flowId}`,
+        title: "Launch Action",
+        description: `Select how to start '${flowId}'.`,
+        submitLabel: "Start",
+        fields: [
+            {
+                id: "launchMode",
+                type: "single-select",
+                label: "Action",
+                required: true,
+                default: availability.continue.available ? "continue" : availability.resume.available ? "resume" : "restart",
+                options: [
+                    ...(availability.resume.available
+                        ? [{ value: "resume", label: "Resume", description: availability.resume.reason }]
+                        : []),
+                    ...(availability.continue.available
+                        ? [{ value: "continue", label: "Continue", description: availability.continue.reason }]
+                        : []),
+                    { value: "restart", label: "Restart", description: availability.restart.reason },
+                ],
+            },
+        ],
+    });
+    const selected = result.values.launchMode;
+    if (selected !== "resume" && selected !== "continue" && selected !== "restart") {
+        throw new TaskRunnerError(`Invalid launch action selected for '${flowId}'.`);
+    }
+    return selected;
+}
 const TASK_SCOPE_PARAM_REFS = new Set(["params.jiraApiUrl", "params.jiraBrowseUrl", "params.jiraTaskFile"]);
 function valueReferencesTaskScopeParams(value) {
     if (Array.isArray(value)) {
@@ -840,7 +1006,7 @@ function flowRequiresTaskScope(entry) {
     return valueReferencesTaskScopeParams(entry.flow.phases);
 }
 async function summarizeBuildFailure(output) {
-    return summarizeBuildFailureViaPipeline(createPipelineContext({
+    return summarizeBuildFailureViaPipeline(await createPipelineContext({
         issueKey: "build-failure-summary",
         jiraRef: "build-failure-summary",
         dryRun: false,
@@ -855,7 +1021,7 @@ 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, executionRouting, selectedRoutingPreset, runtime = runtimeServices) {
+async function executeCommand(baseConfig, runFollowupVerify = true, requestUserInput = requestUserInputInTerminal, resolvedScope, setSummary, forceRefreshSummary = false, explicitLaunchMode, launchProfile, executionRouting, selectedRoutingPreset, runtime = runtimeServices) {
     if (baseConfig.command === "doctor") {
         const exitCode = await runDoctorCommand(baseConfig.doctorArgs ?? []);
         return exitCode === 0;
@@ -870,8 +1036,11 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         : launchProfile
             ? { launchProfile }
             : {};
+    const launchMode = config.command === "auto-status" || config.command === "auto-reset"
+        ? "restart"
+        : await chooseLaunchMode(config.command, config.scope.scopeKey, explicitLaunchMode, requestUserInput);
     if (config.command === "instant-task") {
-        checkPrerequisites(config, launchProfile, executionRouting);
+        await checkPrerequisites(config, launchProfile, executionRouting);
         const hasPersistedInstantTaskState = loadFlowRunState(config.scope.scopeKey, "instant-task") !== null;
         const repromptInstantTaskInput = launchMode === "restart"
             && hasPersistedInstantTaskState
@@ -900,7 +1069,8 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         let effectiveLaunchProfile = launchProfile;
         let effectiveExecutionRouting = executionRouting;
         if (config.autoFromPhase) {
-            const flow = loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" });
+            config.autoFromPhase = await validateAutoPhaseId(config.autoFromPhase);
+            const flow = await loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" });
             const persistedState = loadFlowRunState(config.scope.scopeKey, "auto-golang");
             if (!persistedState) {
                 throw new TaskRunnerError(`Cannot restart auto-golang from phase '${config.autoFromPhase}' because persisted flow state was not found.`);
@@ -912,7 +1082,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             effectiveExecutionRouting ??= persistedState.executionRouting;
             printPanel("Auto-Golang Resume", `Auto-golang pipeline will continue from phase: ${config.autoFromPhase}`, "yellow");
         }
-        checkAutoPrerequisites(config, effectiveLaunchProfile, effectiveExecutionRouting);
+        await checkAutoPrerequisites(config, effectiveLaunchProfile, effectiveExecutionRouting);
         await runDeclarativeFlowBySpecFile("auto-golang.json", config, autoFlowParams(config, forceRefreshSummary), effectiveExecutionRouting
             ? {
                 launchProfile: effectiveExecutionRouting.defaultRoute,
@@ -924,18 +1094,18 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
                 : {}, requestUserInput, setSummary, effectiveLaunchMode, runtime);
         return false;
     }
-    if (config.command === "auto-common") {
+    if (config.command === "auto-common" || config.command === "auto-common-guided") {
         requireJiraConfig(config);
-        checkAutoPrerequisites(config, launchProfile, executionRouting);
+        await 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);
+        await runDeclarativeFlowBySpecFile(config.command === "auto-common-guided" ? "auto-common-guided.json" : "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);
+        await 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;
@@ -949,7 +1119,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             return false;
         }
         const currentStep = findCurrentFlowExecutionStep(state) ?? state.currentStep ?? "-";
-        const phaseOrder = loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" }).phases;
+        const phaseOrder = (await loadDeclarativeFlow({ source: "built-in", fileName: "auto-golang.json" })).phases;
         const lines = [
             `Issue: ${config.taskKey}`,
             `Status: ${state.status}`,
@@ -986,7 +1156,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, launchProfile, executionRouting);
+    await 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 ?? "";
@@ -1031,6 +1201,14 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
         return false;
     }
+    if (config.command === "playbook-init") {
+        await runDeclarativeFlowBySpecFile("playbook-init.json", config, {
+            taskKey: config.taskKey,
+            extraPrompt: config.extraPrompt,
+            acceptPlaybookDraft: config.acceptPlaybookDraft === true,
+        }, flowOverrides, requestUserInput, setSummary, launchMode, runtime);
+        return false;
+    }
     if (config.command === "bug-analyze") {
         requireJiraConfig(config);
         if (config.verbose) {
@@ -1290,22 +1468,22 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
     }
     throw new TaskRunnerError(`Unsupported command: ${config.command}`);
 }
-function parseCliArgs(argv) {
+async function parseCliArgs(argv) {
     if (argv.includes("--version") || argv.includes("-v")) {
-        process.stdout.write(`${packageVersion()}\n`);
+        writeStdoutSync(`${packageVersion()}\n`);
         process.exit(0);
     }
     if (argv.includes("--help") || argv.includes("-h")) {
-        process.stdout.write(`${usage()}\n`);
+        writeStdoutSync(`${usage()}\n`);
         process.exit(0);
     }
     if (argv.length === 0) {
-        process.stderr.write(`${usage()}\n`);
+        writeStderrSync(`${usage()}\n`);
         process.exit(1);
     }
     const command = argv[0];
     if (!COMMANDS.includes(command)) {
-        process.stderr.write(`${usage()}\n`);
+        writeStderrSync(`${usage()}\n`);
         process.exit(1);
     }
     let dry = false;
@@ -1317,6 +1495,10 @@ function parseCliArgs(argv) {
     let helpPhases = false;
     let jiraRef;
     let mdLang;
+    let launchMode;
+    let acceptPlaybookDraft = false;
+    let webNoOpen = process.env.AGENTWEAVER_WEB_NO_OPEN === "1";
+    let webHost;
     const doctorArgs = [];
     for (let index = 1; index < argv.length; index += 1) {
         const token = argv[index] ?? "";
@@ -1332,6 +1514,61 @@ function parseCliArgs(argv) {
             helpPhases = true;
             continue;
         }
+        if (token === "--accept-playbook-draft") {
+            acceptPlaybookDraft = true;
+            continue;
+        }
+        if (token === "--no-open") {
+            if (command !== "web") {
+                writeStderrSync("Error: --no-open is only supported after the web command.\n");
+                process.exit(1);
+            }
+            webNoOpen = true;
+            continue;
+        }
+        if (token === "--listen-all") {
+            if (command !== "web") {
+                writeStderrSync("Error: --listen-all is only supported after the web command.\n");
+                process.exit(1);
+            }
+            webHost = "0.0.0.0";
+            continue;
+        }
+        if (token === "--host") {
+            if (command !== "web") {
+                writeStderrSync("Error: --host is only supported after the web command.\n");
+                process.exit(1);
+            }
+            const hostValue = argv[index + 1]?.trim();
+            if (!hostValue || hostValue.startsWith("-")) {
+                writeStderrSync("Error: --host requires a host value.\n");
+                process.exit(1);
+            }
+            webHost = hostValue;
+            index += 1;
+            continue;
+        }
+        if (token.startsWith("--host=")) {
+            if (command !== "web") {
+                writeStderrSync("Error: --host is only supported after the web command.\n");
+                process.exit(1);
+            }
+            const hostValue = token.slice("--host=".length).trim();
+            if (!hostValue) {
+                writeStderrSync("Error: --host requires a host value.\n");
+                process.exit(1);
+            }
+            webHost = hostValue;
+            continue;
+        }
+        if (token === "--resume" || token === "--continue" || token === "--restart") {
+            if (launchMode) {
+                writeStderrSync("Error: --resume, --continue, and --restart are mutually exclusive.\n");
+                process.exit(1);
+            }
+            launchMode = token.slice(2);
+            continue;
+        }
         if (token === "--prompt") {
             prompt = argv[index + 1];
             index += 1;
@@ -1362,7 +1599,7 @@ function parseCliArgs(argv) {
                 mdLang = langValue;
             }
             else {
-                process.stderr.write("Error: --md-lang accepts only 'en' or 'ru' as values.\n");
+                writeStderrSync("Error: --md-lang accepts only 'en' or 'ru' as values.\n");
                 process.exit(1);
             }
             index += 1;
@@ -1374,7 +1611,7 @@ function parseCliArgs(argv) {
                 mdLang = langValue;
             }
             else {
-                process.stderr.write("Error: --md-lang accepts only 'en' or 'ru' as values.\n");
+                writeStderrSync("Error: --md-lang accepts only 'en' or 'ru' as values.\n");
                 process.exit(1);
             }
             continue;
@@ -1387,15 +1624,15 @@ function parseCliArgs(argv) {
         }
     }
     if (command === "auto-golang" && helpPhases) {
-        printAutoPhasesHelp();
+        await printAutoPhasesHelp();
         process.exit(0);
     }
-    if (command === "auto-common" && helpPhases) {
-        printAutoCommonPhasesHelp();
+    if ((command === "auto-common" || command === "auto-common-guided") && helpPhases) {
+        await printAutoCommonPhasesHelp(command, command === "auto-common-guided" ? "auto-common-guided.json" : "auto-common.json");
         process.exit(0);
     }
     if (command === "auto-simple" && helpPhases) {
-        printAutoSimplePhasesHelp();
+        await printAutoSimplePhasesHelp();
         process.exit(0);
     }
     return {
@@ -1410,6 +1647,10 @@ function parseCliArgs(argv) {
         ...(autoFromPhase !== undefined ? { autoFromPhase } : {}),
         ...(mdLang !== undefined ? { mdLang } : {}),
         ...(doctorArgs.length > 0 ? { doctorArgs } : {}),
+        ...(launchMode !== undefined ? { launchMode } : {}),
+        ...(acceptPlaybookDraft ? { acceptPlaybookDraft } : {}),
+        ...(command === "web" ? { webNoOpen } : {}),
+        ...(command === "web" && webHost !== undefined ? { webHost } : {}),
     };
 }
 function buildConfigFromArgs(args) {
@@ -1423,32 +1664,75 @@ function buildConfigFromArgs(args) {
         dryRun: args.dry,
         verbose: args.verbose,
         ...(args.doctorArgs !== undefined ? { doctorArgs: args.doctorArgs } : {}),
+        ...(args.acceptPlaybookDraft !== undefined ? { acceptPlaybookDraft: args.acceptPlaybookDraft } : {}),
     });
 }
-async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
+async function runInteractiveWithSessionFactory(createSession, jiraRef, forceRefresh = false, scopeName, installSignalCleanup = false) {
     let currentScope = resolveProjectScope(scopeName, jiraRef);
-    const gitBranchName = detectGitBranchName();
-    const flowCatalog = loadInteractiveFlowCatalog(process.cwd());
+    const flowCatalog = await loadInteractiveFlowCatalog(process.cwd());
     let activeAbortController = null;
     let activeFlowId = null;
+    let pendingScopeSwitch = null;
+    const autoScopeSwitchEnabled = !scopeName?.trim() && !jiraRef?.trim();
+    let lastObservedGitScope = currentScope;
+    let ui;
     let exiting = false;
-    const ui = createInteractiveSession({
+    const applyScopeSwitch = (nextScope, reason) => {
+        const previousScope = currentScope;
+        currentScope = nextScope;
+        ui.setScope(currentScope.scopeKey, currentScope.jiraIssueKey ?? null, currentScope.gitBranchName);
+        syncInteractiveTaskSummary(ui, currentScope, forceRefresh);
+        ui.appendLog(`[scope] ${reason}: ${previousScope.scopeKey} -> ${currentScope.scopeKey}`);
+    };
+    const handleObservedScope = (observedScope, reason) => {
+        if (observedScope.scopeKey === currentScope.scopeKey
+            && observedScope.gitBranchName === currentScope.gitBranchName) {
+            pendingScopeSwitch = null;
+            return;
+        }
+        if (activeAbortController) {
+            if (!pendingScopeSwitch
+                || pendingScopeSwitch.scopeKey !== observedScope.scopeKey
+                || pendingScopeSwitch.gitBranchName !== observedScope.gitBranchName) {
+                pendingScopeSwitch = observedScope;
+                ui.appendLog(`[scope] ${reason}: switch to ${observedScope.scopeKey} pending until current flow finishes`);
+            }
+            return;
+        }
+        pendingScopeSwitch = null;
+        applyScopeSwitch(observedScope, reason);
+    };
+    const refreshScopeFromGit = (reason) => {
+        if (!autoScopeSwitchEnabled) {
+            return;
+        }
+        const observedScope = resolveProjectScope(null, null);
+        if (observedScope.scopeKey === lastObservedGitScope.scopeKey
+            && observedScope.gitBranchName === lastObservedGitScope.gitBranchName) {
+            return;
+        }
+        lastObservedGitScope = observedScope;
+        handleObservedScope(observedScope, reason);
+    };
+    ui = createSession({
         scopeKey: currentScope.scopeKey,
         jiraIssueKey: currentScope.jiraIssueKey ?? null,
         summaryText: "",
         cwd: process.cwd(),
-        gitBranchName,
+        gitBranchName: currentScope.gitBranchName,
         version: packageVersion(),
         flows: interactiveFlowDefinitions(flowCatalog),
         getRunConfirmation: async (flowId) => {
+            refreshScopeFromGit("git scope refresh before launch confirmation");
             const flowEntry = findCatalogEntry(flowId, flowCatalog);
             if (!flowEntry) {
                 throw new TaskRunnerError(`Unknown flow: ${flowId}`);
             }
-            const resumeLookup = lookupInteractiveFlowResume(flowEntry, currentScope);
+            const resumeLookup = await lookupInteractiveFlowResume(flowEntry, currentScope);
             return resumeLookup;
         },
         onRun: async (flowId, launchMode) => {
+            refreshScopeFromGit("git scope refresh before flow launch");
             const abortController = new AbortController();
             activeAbortController = abortController;
             activeFlowId = flowId;
@@ -1457,7 +1741,7 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                 if (!flowEntry) {
                     throw new TaskRunnerError(`Unknown flow: ${flowId}`);
                 }
-                const routingGroups = flowRoutingGroups(flowEntry, process.cwd());
+                const routingGroups = await flowRoutingGroups(flowEntry, process.cwd());
                 const resumeState = launchMode === "resume" ? loadFlowRunState(currentScope.scopeKey, flowId) : null;
                 if (resumeState) {
                     currentScope = scopeWithRestoredJiraContext(currentScope, resumeState);
@@ -1484,7 +1768,7 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                     const jiraContext = await requestJiraContext((form) => ui.requestUserInput(form));
                     currentScope = resolveProjectScope(null, jiraContext.jiraRef);
                 }
-                ui.setScope(currentScope.scopeKey, currentScope.jiraIssueKey ?? null);
+                ui.setScope(currentScope.scopeKey, currentScope.jiraIssueKey ?? null, currentScope.gitBranchName);
                 if (previousScopeKey !== currentScope.scopeKey || currentScope.jiraIssueKey) {
                     syncInteractiveTaskSummary(ui, currentScope, forceRefresh);
                 }
@@ -1526,6 +1810,11 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                 if (activeAbortController === abortController) {
                     activeAbortController = null;
                     activeFlowId = null;
+                    if (pendingScopeSwitch && !exiting) {
+                        const nextScope = pendingScopeSwitch;
+                        pendingScopeSwitch = null;
+                        applyScopeSwitch(nextScope, "git scope refresh after flow completion");
+                    }
                 }
             }
         },
@@ -1537,6 +1826,10 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
             activeAbortController.abort();
         },
         onExit: () => {
+            if (activeAbortController) {
+                ui.interruptActiveForm();
+                activeAbortController.abort();
+            }
             exiting = true;
         },
     });
@@ -1547,13 +1840,45 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
         ui.appendLog("[scope] project scope active; task summary will appear after a Jira-backed flow runs");
     }
     syncInteractiveTaskSummary(ui, currentScope, forceRefresh);
+    const scopeWatchInterval = autoScopeSwitchEnabled
+        ? setInterval(() => {
+            if (!exiting) {
+                refreshScopeFromGit("git branch changed");
+            }
+        }, INTERACTIVE_SCOPE_WATCH_INTERVAL_MS)
+        : null;
     return await new Promise((resolve, reject) => {
+        let cleanupStarted = false;
+        const requestExit = () => {
+            if (activeAbortController) {
+                ui.interruptActiveForm();
+                activeAbortController.abort();
+            }
+            exiting = true;
+        };
+        const onSigint = () => requestExit();
+        const onSigterm = () => requestExit();
+        if (installSignalCleanup) {
+            process.once("SIGINT", onSigint);
+            process.once("SIGTERM", onSigterm);
+        }
         const interval = setInterval(() => {
             if (!exiting) {
                 return;
             }
             clearInterval(interval);
             try {
+                if (cleanupStarted) {
+                    return;
+                }
+                cleanupStarted = true;
+                if (scopeWatchInterval) {
+                    clearInterval(scopeWatchInterval);
+                }
+                if (installSignalCleanup) {
+                    process.off("SIGINT", onSigint);
+                    process.off("SIGTERM", onSigterm);
+                }
                 ui.destroy();
                 bye();
                 resolve(0);
@@ -1564,6 +1889,12 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
         }, 100);
     });
 }
+async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
+    return await runInteractiveWithSessionFactory(createInteractiveSession, jiraRef, forceRefresh, scopeName);
+}
+async function runWebInteractive(jiraRef, forceRefresh = false, noOpen = false, host, auth) {
+    return await runInteractiveWithSessionFactory((options) => createWebInteractiveSession(options, { noOpen, ...(host ? { host } : {}), ...(auth ? { auth } : {}), printInfo }), jiraRef, forceRefresh, null, true);
+}
 export async function main(argv = process.argv.slice(2)) {
     loadTieredEnv(process.cwd());
     let forceRefresh = false;
@@ -1573,14 +1904,22 @@ export async function main(argv = process.argv.slice(2)) {
         args.shift();
     }
     try {
+        if (args[0] === "--no-open") {
+            throw new TaskRunnerError("--no-open is only supported after the web command.");
+        }
         if (args.length === 0) {
             return await runInteractive(undefined, forceRefresh);
         }
         if (args.length === 1 && !args[0]?.startsWith("-") && !COMMANDS.includes(args[0])) {
             return await runInteractive(args[0] ?? "", forceRefresh);
         }
-        const parsedArgs = parseCliArgs(args);
-        const commandCompleted = await executeCommand(buildConfigFromArgs(parsedArgs));
+        const parsedArgs = await parseCliArgs(args);
+        if (parsedArgs.command === "web") {
+            const webAuth = resolveWebAuthConfig();
+            requireWebAuthForHost(parsedArgs.webHost, webAuth);
+            return await runWebInteractive(parsedArgs.jiraRef, forceRefresh, parsedArgs.webNoOpen === true, parsedArgs.webHost, webAuth);
+        }
+        const commandCompleted = await executeCommand(buildConfigFromArgs(parsedArgs), true, requestUserInputInTerminal, undefined, undefined, false, parsedArgs.launchMode);
         if (parsedArgs.command === "doctor") {
             return commandCompleted ? 0 : 1;
         }
@@ -1588,12 +1927,12 @@ export async function main(argv = process.argv.slice(2)) {
     }
     catch (error) {
         if (error instanceof TaskRunnerError) {
-            printError(error.message);
+            writeStderrSync(`Error: ${error.message}\n`);
             return 1;
         }
         const returnCode = Number(error.returnCode);
         if (!Number.isNaN(returnCode)) {
-            printError(formatProcessFailure(error));
+            writeStderrSync(`Error: ${formatProcessFailure(error)}\n`);
             return returnCode || 1;
         }
         throw error;