agentweaver 0.1.9 → 0.1.10

package/README.md

@@ -1,37 +1,53 @@
 # AgentWeaver
 
-`AgentWeaver` is a TypeScript/Node.js CLI for engineering workflows around Jira, GitLab review artifacts, Codex, and Claude.
+`AgentWeaver` is a TypeScript/Node.js CLI for harness engineering around coding agents.
 
-It orchestrates a flow like:
+It brings Jira context, GitLab review artifacts, agent-driven steps via Codex and Claude, an interactive terminal UI, and fully automated workflows into one controlled execution harness.
+
+A typical flow looks like:
 
 `plan -> implement -> run-go-linter-loop -> run-go-tests-loop -> review -> review-fix`
 
-The package is designed to run as an npm CLI and includes an interactive terminal UI built on `neo-blessed`.
+The point is not the specific chain above, but that `AgentWeaver` lets you design, run, and reuse agent harnesses:
+
+- with declarative flows and isolated executors
+- with artifacts that survive restarts and let runs resume from the right point
+- with a TUI for semi-automatic operation and visibility
+- with an `auto` mode for fully automated flows without manual handoff
+
+The package runs as an npm CLI and includes a full-screen TUI built on `neo-blessed`.
 
 ## What It Does
 
-- Fetches a Jira issue by key or browse URL
-- Fetches GitLab merge request review comments into reusable markdown and JSON artifacts
-- Fetches GitLab merge request diffs into reusable markdown and JSON artifacts and can run Claude-based diff review directly from MR
-- Generates workflow artifacts such as design, implementation plan, QA plan, bug analysis, reviews, and summaries
-- Machine-readable JSON artifacts are stored under `.agentweaver/scopes/<scope-key>/.artifacts/` and act as the source of truth between workflow steps; Markdown artifacts remain for human inspection
-- Workflow artifacts are isolated by scope; for Jira-driven flows the scope key defaults to the Jira task key, otherwise it defaults to `<git-branch>--<worktree-hash>`
-- Runs workflow stages like `bug-analyze`, `bug-fix`, `gitlab-diff-review`, `mr-description`, `plan`, `task-describe`, `implement`, `review`, `review-fix`, `run-go-tests-loop`, `run-go-linter-loop`, and `auto`
-- Persists compact `auto` pipeline state on disk so runs can resume without storing large agent outputs
+- Fetches a Jira issue by key or browse URL and turns it into working context for agent steps
+- Fetches GitLab review comments and diffs into reusable Markdown and JSON artifacts
+- Runs agent stages such as `plan`, `implement`, `review`, and `review-fix`, plus verification loops such as `run-go-tests-loop` and `run-go-linter-loop`
+- Stores machine-readable JSON artifacts under `.agentweaver/scopes/<scope-key>/.artifacts/` and uses them as the source of truth between steps
+- Isolates workflows by scope: for Jira-backed runs this is usually the issue key, otherwise it defaults to `<git-branch>--<worktree-hash>`
+- Persists compact `auto` pipeline state on disk so runs can resume without keeping full agent transcripts
 - Uses Docker runtime services for isolated Codex execution and build verification
 
+In short, `AgentWeaver` is for cases where you do not want a one-off LLM script, but a durable engineering harness around agents.
+
+## Why AgentWeaver
+
+- Harness engineering instead of ad-hoc prompting. Flows, executors, prompts, and artifacts are separate layers rather than one mixed script.
+- Agent runtime instead of single-shot calls. You can build sequences where one agent plans, another implements, and the next verifies and fixes.
+- TUI instead of blind shell execution. The terminal UI gives you an operational view of flow state, activity, and artifacts.
+- Full automation instead of manual step switching. `auto` can run end-to-end flows that move through planning, implementation, verification, and review on their own.
+
 ## Architecture
 
-The CLI now uses an executor + node + declarative flow architecture.
+The CLI is built around an `executor + node + declarative flow` architecture that fits harness engineering well.
 
-- `src/index.ts` remains the CLI entrypoint and high-level orchestration layer
-- `src/executors/` contains first-class executors for external actions such as Jira fetch, GitLab review fetch, local Codex, Docker-based build verification, Claude, Claude summaries, and process execution
+- `src/index.ts` remains the CLI entrypoint and top-level orchestration layer
+- `src/executors/` contains first-class executors for external actions such as Jira, GitLab, local Codex, Docker-based build verification, Claude, and process execution
 - `src/pipeline/nodes/` contains reusable runtime nodes built on top of executors
 - `src/pipeline/flow-specs/` contains declarative JSON flow specs for `preflight`, `bug-analyze`, `bug-fix`, `gitlab-diff-review`, `gitlab-review`, `mr-description`, `plan`, `task-describe`, `implement`, `review`, `review-fix`, `run-go-tests-loop`, `run-go-linter-loop`, and `auto`
-- project-local flow may additionally be placed in `.agentweaver/.flows/*.json`; they are discovered at runtime from the current workspace
-- `src/runtime/` contains shared runtime services such as command resolution, Docker runtime environment setup, and subprocess execution
+- project-local flows can be added under `.agentweaver/.flows/*.json`; they are discovered from the current workspace at runtime
+- `src/runtime/` contains shared runtime services such as command resolution, Docker runtime setup, and subprocess execution
 
-This keeps command handlers focused on choosing a flow and providing parameters instead of assembling prompts and subprocess wiring inline.
+This keeps command handlers focused on selecting flows and passing parameters instead of assembling prompts, subprocess wiring, and side effects inline.
 
 ## Repository Layout
 
@@ -118,6 +134,12 @@ GIT_ALLOW_PROTOCOL=file:https:ssh
 
 ## Usage
 
+Primary usage modes:
+
+- direct execution of individual stages for controlled agent work
+- interactive TUI mode for selecting flows and observing progress
+- fully automated `auto` mode for end-to-end pipelines
+
 Direct CLI usage:
 
 ```bash
@@ -179,18 +201,28 @@ agentweaver auto-reset DEMO-3288
 Notes:
 
 - `--verbose` streams child process `stdout/stderr` in direct CLI mode
-- task-only commands such as `plan` and `auto` ask for Jira task via interactive `user-input` when it is omitted
-- scope-flexible commands such as `gitlab-diff-review`, `gitlab-review`, `review`, `review-fix`, `run-go-tests-loop`, and `run-go-linter-loop` use the current git branch by default when Jira task is omitted
-- `gitlab-review` and `gitlab-diff-review` ask for GitLab merge request URL via interactive `user-input`
-- `--scope <name>` lets you override the default project scope name
-- the interactive `Activity` pane is intentionally structured: it shows launch separators, prompts, summaries, and short status messages instead of raw Codex/Claude logs by default
+- task-only commands such as `plan` and `auto` ask for a Jira task via interactive `user-input` when it is omitted
+- scope-flexible commands such as `gitlab-diff-review`, `gitlab-review`, `review`, `review-fix`, `run-go-tests-loop`, and `run-go-linter-loop` use the current git branch by default when a Jira task is omitted
+- `gitlab-review` and `gitlab-diff-review` ask for a GitLab merge request URL via interactive `user-input`
+- `--scope <name>` lets you override the default workflow scope name
+- the interactive `Activity` pane intentionally shows structured events, prompts, summaries, and short statuses instead of raw Codex/Claude logs by default
+
+For fully automated flows, the main entrypoint looks like:
+
+```bash
+agentweaver auto DEMO-3288
+agentweaver auto-status DEMO-3288
+agentweaver auto-reset DEMO-3288
+```
+
+This lets you run an agent pipeline as a reproducible process rather than a loose set of manual steps.
 
 ## Interactive TUI
 
-Interactive mode opens a full-screen terminal UI with:
+Interactive mode opens a full-screen TUI that works as an operator console for the agent harness:
 
 - flow list
-- current flow progress
+- current progress for the selected flow
 - activity log
 - task summary pane
 - keyboard navigation between panes
@@ -205,11 +237,11 @@ Current navigation:
 
 Flow discovery and highlighting:
 
-- built-in flow are loaded from the packaged `src/pipeline/flow-specs/`
-- project-local flow are loaded from `.agentweaver/.flows/*.json`
-- project-local flow are shown in a different color in the `Flows` pane
+- built-in flows are loaded from `src/pipeline/flow-specs/`
+- project-local flows are loaded from `.agentweaver/.flows/*.json`
+- project-local flows are shown in a different color in the `Flows` pane
 - when a project-local flow is selected, the description pane also shows its source file path
-- if a local flow conflicts with a built-in flow id or uses unknown node / executor / prompt / schema types, interactive startup fails fast with a validation error
+- if a local flow conflicts with a built-in flow id or uses unknown `node` / `executor` / `prompt` / `schema` types, interactive startup fails fast with a validation error
 
 Activity pane behavior:
 

package/dist/artifacts.js

@@ -144,7 +144,7 @@ export function autoStateFile(taskKey) {
     return taskArtifactsFile(taskKey, `.agentweaver-state-${taskKey}.json`);
 }
 export function flowStateFile(scopeKey, flowId) {
-    return scopeArtifactsFile(scopeKey, `.agentweaver-flow-state-${flowId}.json`);
+    return scopeArtifactsFile(scopeKey, `.agentweaver-flow-state-${encodeURIComponent(flowId)}.json`);
 }
 export function planArtifacts(taskKey) {
     return [designFile(taskKey), designJsonFile(taskKey), planFile(taskKey), planJsonFile(taskKey), qaFile(taskKey), qaJsonFile(taskKey)];

package/dist/errors.js

@@ -4,3 +4,10 @@ export class TaskRunnerError extends Error {
         this.name = "TaskRunnerError";
     }
 }
+export class FlowInterruptedError extends TaskRunnerError {
+    returnCode = 130;
+    constructor(message = "Flow interrupted by user.") {
+        super(message);
+        this.name = "FlowInterruptedError";
+    }
+}

package/dist/index.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
 import { REVIEW_FILE_RE, REVIEW_REPLY_FILE_RE, autoStateFile, bugAnalyzeArtifacts, bugAnalyzeJsonFile, bugFixDesignJsonFile, bugFixPlanJsonFile, designJsonFile, gitlabDiffFile, gitlabDiffJsonFile, ensureScopeWorkspaceDir, gitlabReviewFile, gitlabReviewJsonFile, planJsonFile, planArtifacts, qaJsonFile, readyToMergeFile, requireArtifacts, reviewFile, reviewReplyJsonFile, reviewFixSelectionJsonFile, reviewJsonFile, scopeWorkspaceDir, taskSummaryFile, } from "./artifacts.js";
-import { TaskRunnerError } from "./errors.js";
+import { FlowInterruptedError, TaskRunnerError } from "./errors.js";
 import { createFlowRunState, hasResumableFlowState, loadFlowRunState, prepareFlowStateForResume, resetFlowRunState, saveFlowRunState, stripExecutionStatePayload, } from "./flow-state.js";
 import { requireJiraTaskFile } from "./jira.js";
 import { validateStructuredArtifacts } from "./structured-artifacts.js";
@@ -41,12 +41,15 @@ const COMMANDS = [
 const AUTO_STATE_SCHEMA_VERSION = 3;
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.resolve(MODULE_DIR, "..");
-const runtimeServices = {
-    resolveCmd,
-    resolveDockerComposeCmd,
-    dockerRuntimeEnv: () => dockerRuntimeEnv(PACKAGE_ROOT),
-    runCommand,
-};
+function createRuntimeServices(signal) {
+    return {
+        resolveCmd,
+        resolveDockerComposeCmd,
+        dockerRuntimeEnv: () => dockerRuntimeEnv(PACKAGE_ROOT),
+        runCommand: (argv, options = {}) => runCommand(argv, { ...options, ...(signal ? { signal } : {}) }),
+    };
+}
+const runtimeServices = createRuntimeServices();
 function buildFailureOutputPreview(output) {
     const normalized = stripAnsi(output).replace(/\r\n/g, "\n").trim();
     if (!normalized) {
@@ -104,7 +107,7 @@ function usage() {
 Interactive Mode:
   When started without a command, the script opens an interactive UI.
   If a Jira task is provided, interactive mode starts in the current project scope with Jira context attached.
-  Use Up/Down to select a flow, Enter to confirm launch, h for help, q to exit.
+  Use Up/Down to move in the flow tree, Left/Right to collapse or expand folders, Enter to toggle a folder or run a flow, h for help, q to exit.
 
 Flags:
   --version       Show package version
@@ -549,6 +552,7 @@ function interactiveFlowDefinition(entry) {
         label: entry.id,
         description: flowDescription(entry.id),
         source: entry.source,
+        treePath: [...entry.treePath],
         ...(entry.source === "project-local" ? { sourcePath: entry.absolutePath } : {}),
         phases: flow.phases.map((phase) => ({
             id: phase.id,
@@ -598,13 +602,13 @@ function findCurrentFlowExecutionStep(state) {
     }
     return null;
 }
-async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, requestUserInput = requestUserInputInTerminal, setSummary, launchMode = "restart") {
+async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, requestUserInput = requestUserInputInTerminal, setSummary, launchMode = "restart", runtime = runtimeServices) {
     const context = createPipelineContext({
         issueKey: config.taskKey,
         jiraRef: config.jiraRef,
         dryRun: config.dryRun,
         verbose: config.verbose,
-        runtime: runtimeServices,
+        runtime,
         ...(setSummary ? { setSummary } : {}),
         requestUserInput,
     });
@@ -669,10 +673,12 @@ async function runDeclarativeFlowByRef(flowId, flowRef, config, flowParams, requ
         throw error;
     }
 }
-async function runDeclarativeFlowBySpecFile(fileName, config, flowParams, requestUserInput = requestUserInputInTerminal, setSummary, launchMode = "restart") {
-    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, flowParams, requestUserInput, setSummary, launchMode);
+async function runDeclarativeFlowBySpecFile(fileName, config, flowParams, requestUserInput = requestUserInputInTerminal, setSummary, launchMode = "restart", runtime = runtimeServices) {
+    await runDeclarativeFlowByRef(config.command, { source: "built-in", fileName }, config, flowParams, requestUserInput, setSummary, launchMode, runtime);
 }
 function defaultDeclarativeFlowParams(config, forceRefreshSummary = false) {
+    const iteration = nextReviewIterationForTask(config.taskKey);
+    const latestIteration = latestReviewReplyIteration(config.taskKey);
     return {
         taskKey: config.taskKey,
         jiraRef: config.jiraRef,
@@ -686,6 +692,9 @@ function defaultDeclarativeFlowParams(config, forceRefreshSummary = false) {
         runGoCoverageScript: config.runGoCoverageScript,
         extraPrompt: config.extraPrompt,
         reviewFixPoints: config.reviewFixPoints,
+        iteration,
+        latestIteration,
+        ...(latestIteration !== null ? { reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, latestIteration) } : {}),
         forceRefresh: forceRefreshSummary,
     };
 }
@@ -710,13 +719,13 @@ function flowRequiresTaskScope(entry) {
     }
     return valueReferencesTaskScopeParams(entry.flow.phases);
 }
-async function runAutoPhaseViaSpec(config, phaseId, executionState, state, setSummary, forceRefreshSummary = false) {
+async function runAutoPhaseViaSpec(config, phaseId, executionState, state, setSummary, forceRefreshSummary = false, runtime = runtimeServices) {
     const context = createPipelineContext({
         issueKey: config.taskKey,
         jiraRef: config.jiraRef,
         dryRun: config.dryRun,
         verbose: config.verbose,
-        runtime: runtimeServices,
+        runtime,
         ...(setSummary ? { setSummary } : {}),
         requestUserInput: requestUserInputInTerminal,
     });
@@ -801,13 +810,13 @@ 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") {
+async function executeCommand(baseConfig, runFollowupVerify = true, requestUserInput = requestUserInputInTerminal, resolvedScope, setSummary, forceRefreshSummary = false, launchMode = "restart", runtime = runtimeServices) {
     const config = buildRuntimeConfig(baseConfig, resolvedScope ?? (await resolveScopeForCommand(baseConfig, requestUserInput)));
     if (config.command === "auto") {
         if (launchMode === "restart") {
             resetAutoPipelineState(config);
         }
-        await runAutoPipeline(config, setSummary, forceRefreshSummary);
+        await runAutoPipeline(config, setSummary, forceRefreshSummary, runtime);
         return false;
     }
     if (config.command === "auto-status") {
@@ -847,7 +856,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
             forceRefresh: forceRefreshSummary,
-        }, requestUserInput, setSummary, launchMode);
+        }, requestUserInput, setSummary, launchMode, runtime);
         return false;
     }
     if (config.command === "bug-analyze") {
@@ -862,7 +871,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
             forceRefresh: forceRefreshSummary,
-        }, requestUserInput, setSummary, launchMode);
+        }, requestUserInput, setSummary, launchMode, runtime);
         return false;
     }
     if (config.command === "gitlab-review") {
@@ -871,7 +880,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             iteration,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         if (!config.dryRun) {
             printSummary("GitLab Review", `Artifacts:\n${gitlabReviewFile(config.taskKey)}\n${gitlabReviewJsonFile(config.taskKey)}`);
         }
@@ -883,7 +892,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             taskKey: config.taskKey,
             iteration,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, 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)}`);
         }
@@ -901,7 +910,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         await runDeclarativeFlowBySpecFile("bug-fix.json", config, {
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "mr-description") {
@@ -910,7 +919,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         await runDeclarativeFlowBySpecFile("mr-description.json", config, {
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "task-describe") {
@@ -919,7 +928,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             jiraApiUrl: config.jiraApiUrl,
             taskKey: config.taskKey,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "implement") {
@@ -947,14 +956,14 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
                 taskKey: config.taskKey,
                 iteration,
                 extraPrompt: config.extraPrompt,
-            }, requestUserInput, undefined, launchMode);
+            }, requestUserInput, undefined, launchMode, runtime);
         }
         else {
             await runDeclarativeFlowBySpecFile("review-project.json", config, {
                 taskKey: config.taskKey,
                 iteration,
                 extraPrompt: config.extraPrompt,
-            }, requestUserInput, undefined, launchMode);
+            }, requestUserInput, undefined, launchMode, runtime);
         }
         return !config.dryRun && existsSync(readyToMergeFile(config.taskKey));
     }
@@ -973,7 +982,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, latestIteration),
             extraPrompt: config.extraPrompt,
             reviewFixPoints: config.reviewFixPoints,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     if (config.command === "run-go-tests-loop" || config.command === "run-go-linter-loop") {
@@ -982,12 +991,12 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             runGoTestsScript: config.runGoTestsScript,
             runGoLinterScript: config.runGoLinterScript,
             extraPrompt: config.extraPrompt,
-        }, requestUserInput, undefined, launchMode);
+        }, requestUserInput, undefined, launchMode, runtime);
         return false;
     }
     throw new TaskRunnerError(`Unsupported command: ${config.command}`);
 }
-async function runAutoPipelineDryRun(config, setSummary, forceRefreshSummary = false) {
+async function runAutoPipelineDryRun(config, setSummary, forceRefreshSummary = false, runtime = runtimeServices) {
     checkAutoPrerequisites(config);
     printInfo("Dry-run auto pipeline from declarative spec");
     const autoFlow = loadAutoFlow();
@@ -1000,16 +1009,16 @@ async function runAutoPipelineDryRun(config, setSummary, forceRefreshSummary = f
     publishFlowState("auto", executionState);
     for (const phase of autoFlow.phases) {
         printInfo(`Dry-run auto phase: ${phase.id}`);
-        await runAutoPhaseViaSpec(config, phase.id, executionState, undefined, setSummary, forceRefreshSummary);
+        await runAutoPhaseViaSpec(config, phase.id, executionState, undefined, setSummary, forceRefreshSummary, runtime);
         if (executionState.terminated) {
             break;
         }
     }
 }
-async function runAutoPipeline(config, setSummary, forceRefreshSummary = false) {
+async function runAutoPipeline(config, setSummary, forceRefreshSummary = false, runtime = runtimeServices) {
     requireJiraConfig(config);
     if (config.dryRun) {
-        await runAutoPipelineDryRun(config, setSummary, forceRefreshSummary);
+        await runAutoPipelineDryRun(config, setSummary, forceRefreshSummary, runtime);
         return;
     }
     checkAutoPrerequisites(config);
@@ -1049,7 +1058,7 @@ async function runAutoPipeline(config, setSummary, forceRefreshSummary = false)
         saveAutoPipelineState(state);
         try {
             printInfo(`Running auto step: ${step.id}`);
-            const status = await runAutoPhaseViaSpec(config, step.id, state.executionState, state, setSummary, forceRefreshSummary);
+            const status = await runAutoPhaseViaSpec(config, step.id, state.executionState, state, setSummary, forceRefreshSummary, runtime);
             step.status = status;
             step.finishedAt = nowIso8601();
             step.returnCode = 0;
@@ -1165,6 +1174,8 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
     let currentScope = resolveProjectScope(scopeName, jiraRef);
     const gitBranchName = detectGitBranchName();
     const flowCatalog = loadInteractiveFlowCatalog(process.cwd());
+    let activeAbortController = null;
+    let activeFlowId = null;
     let exiting = false;
     const ui = new InteractiveUi({
         scopeKey: currentScope.scopeKey,
@@ -1204,6 +1215,9 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
             return resumeLookup;
         },
         onRun: async (flowId, launchMode) => {
+            const abortController = new AbortController();
+            activeAbortController = abortController;
+            activeFlowId = flowId;
             try {
                 const flowEntry = findCatalogEntry(flowId, flowCatalog);
                 if (!flowEntry) {
@@ -1227,13 +1241,18 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                     syncInteractiveTaskSummary(ui, currentScope, forceRefresh);
                 }
                 if (flowEntry.source === "built-in" && isBuiltInCommandFlowId(flowId)) {
-                    await executeCommand(baseConfig, true, (form) => ui.requestUserInput(form), currentScope, (markdown) => ui.setSummary(markdown), forceRefresh, launchMode);
+                    await executeCommand(baseConfig, true, (form) => ui.requestUserInput(form), currentScope, (markdown) => ui.setSummary(markdown), forceRefresh, launchMode, createRuntimeServices(abortController.signal));
                     return;
                 }
                 const runtimeConfig = buildRuntimeConfig(baseConfig, currentScope);
-                await runDeclarativeFlowByRef(flowId, toDeclarativeFlowRef(flowEntry), runtimeConfig, defaultDeclarativeFlowParams(runtimeConfig, forceRefresh), (form) => ui.requestUserInput(form), (markdown) => ui.setSummary(markdown), launchMode);
+                await runDeclarativeFlowByRef(flowId, toDeclarativeFlowRef(flowEntry), runtimeConfig, defaultDeclarativeFlowParams(runtimeConfig, forceRefresh), (form) => ui.requestUserInput(form), (markdown) => ui.setSummary(markdown), launchMode, createRuntimeServices(abortController.signal));
             }
             catch (error) {
+                if (error instanceof FlowInterruptedError) {
+                    ui.appendLog(`[interrupt] ${error.message}`);
+                    printInfo(error.message);
+                    return;
+                }
                 if (error instanceof TaskRunnerError) {
                     ui.setFlowFailed(flowId);
                     printError(error.message);
@@ -1247,6 +1266,19 @@ async function runInteractive(jiraRef, forceRefresh = false, scopeName) {
                 }
                 throw error;
             }
+            finally {
+                if (activeAbortController === abortController) {
+                    activeAbortController = null;
+                    activeFlowId = null;
+                }
+            }
+        },
+        onInterrupt: async (flowId) => {
+            if (!activeAbortController || activeFlowId !== flowId) {
+                return;
+            }
+            ui.interruptActiveForm();
+            activeAbortController.abort();
         },
         onExit: () => {
             exiting = true;