agentweaver 0.1.11 → 0.1.12

package/dist/artifacts.js

@@ -134,6 +134,9 @@ export function readyToMergeFile(taskKey) {
 export function jiraTaskFile(taskKey) {
     return taskArtifactsFile(taskKey, `${taskKey}.json`);
 }
+export function jiraTaskEnrichedFile(taskKey) {
+    return taskArtifactsFile(taskKey, `${taskKey}-enriched.json`);
+}
 export function jiraAttachmentsDir(taskKey) {
     return path.join(taskArtifactsDir(taskKey), "jira-attachments");
 }
@@ -222,6 +225,12 @@ export function reviewFixFile(taskKey, iteration) {
 export function reviewFixJsonFile(taskKey, iteration) {
     return artifactJsonFile("review-fix", taskKey, iteration);
 }
+export function reviewAssessmentFile(taskKey, iteration) {
+    return artifactFile("review-assessment", taskKey, iteration);
+}
+export function reviewAssessmentJsonFile(taskKey, iteration) {
+    return artifactJsonFile("review-assessment", taskKey, iteration);
+}
 export function reviewFixSelectionJsonFile(taskKey, iteration) {
     return artifactJsonFile("review-fix-selection", taskKey, iteration);
 }

package/dist/executors/codex-executor.js

@@ -12,9 +12,10 @@ export const codexExecutor = {
         const command = input.command ?? context.runtime.resolveCmd(config.defaultCommand, config.commandEnvVar);
         const model = input.model?.trim() || resolveModel(config, env);
         const result = await processExecutor.execute(context, {
-            argv: [command, config.subcommand, "--model", model, config.fullAutoFlag, input.prompt],
+            argv: [command, config.subcommand, "--model", model, config.fullAutoFlag, "-"],
             env,
             label: `codex:${model}`,
+            stdin: input.prompt,
         }, processExecutor.defaultConfig);
         return {
             output: result.output,

package/dist/executors/jira-fetch-executor.js

@@ -12,6 +12,7 @@ export const jiraFetchExecutor = {
             planningContextAttachments: artifacts.planningContextAttachments,
             ...(artifacts.attachmentsManifestFile ? { attachmentsManifestFile: artifacts.attachmentsManifestFile } : {}),
             ...(artifacts.attachmentsContextFile ? { attachmentsContextFile: artifacts.attachmentsContextFile } : {}),
+            ...(artifacts.enrichedFile ? { enrichedFile: artifacts.enrichedFile } : {}),
         };
     },
 };

package/dist/executors/opencode-executor.js

@@ -1,3 +1,6 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import { opencodeExecutorDefaultConfig } from "./configs/opencode-config.js";
 import { processExecutor } from "./process-executor.js";
 function resolveModel(config, inputModel, env) {
@@ -17,19 +20,27 @@ export const opencodeExecutor = {
         const command = input.command ?? context.runtime.resolveCmd(config.defaultCommand, config.commandEnvVar);
         const model = resolveModel(config, input.model, env);
         const argv = [command, config.subcommand];
+        const tempDir = mkdtempSync(path.join(os.tmpdir(), "agentweaver-opencode-"));
+        const promptFile = path.join(tempDir, "prompt.md");
+        writeFileSync(promptFile, input.prompt, "utf8");
         if (model) {
             argv.push("--model", model);
         }
-        argv.push(input.prompt);
-        const result = await processExecutor.execute(context, {
-            argv,
-            env,
-            label: model ? `opencode:${model}` : "opencode",
-        }, processExecutor.defaultConfig);
-        return {
-            output: result.output,
-            command,
-            ...(model ? { model } : {}),
-        };
+        argv.push("--file", promptFile, "--", "Use the attached file as the full task prompt. Follow it exactly.");
+        try {
+            const result = await processExecutor.execute(context, {
+                argv,
+                env,
+                label: model ? `opencode:${model}` : "opencode",
+            }, processExecutor.defaultConfig);
+            return {
+                output: result.output,
+                command,
+                ...(model ? { model } : {}),
+            };
+        }
+        finally {
+            rmSync(tempDir, { recursive: true, force: true });
+        }
     },
 };

package/dist/executors/process-executor.js

@@ -15,6 +15,9 @@ export const processExecutor = {
         if (input.label) {
             options.label = input.label;
         }
+        if (input.stdin !== undefined) {
+            options.stdin = input.stdin;
+        }
         const output = await context.runtime.runCommand(input.argv, options);
         return { output };
     },

package/dist/index.js

@@ -3,7 +3,7 @@ import { existsSync, readdirSync, 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, reviewFile, reviewFixSelectionJsonFile, reviewJsonFile, scopeWorkspaceDir, flowStateFile, taskSummaryFile, } from "./artifacts.js";
+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 { FlowInterruptedError, TaskRunnerError } from "./errors.js";
 import { createFlowRunState, hasResumableFlowState, loadFlowRunState, prepareFlowStateForResume, resetFlowRunState, rewindFlowRunStateToPhase, saveFlowRunState, stripExecutionStatePayload, } from "./flow-state.js";
 import { requireJiraTaskFile } from "./jira.js";
@@ -194,14 +194,11 @@ function launchProfileSelectionForm() {
                 type: "single-select",
                 label: "Executor",
                 required: true,
-                default: "default",
-                options: [
-                    { value: "default", label: `default (${defaultExecutor})` },
-                    ...LLM_EXECUTOR_IDS.map((id) => ({
-                        value: id,
-                        label: id === defaultExecutor ? `${id} [default]` : id,
-                    })),
-                ],
+                default: defaultExecutor,
+                options: LLM_EXECUTOR_IDS.map((id) => ({
+                    value: id,
+                    label: id === defaultExecutor ? `${id} [default]` : id,
+                })),
             },
         ],
     };
@@ -209,15 +206,10 @@ function launchProfileSelectionForm() {
 function launchModelSelectionForm(executor) {
     const resolvedExecutor = executor === "default" ? DEFAULT_LAUNCH_PROFILE.executor : executor;
     const defaultModel = defaultModelForExecutor(resolvedExecutor);
-    const options = executor === "default"
-        ? [{ value: "default", label: `default (${DEFAULT_LAUNCH_PROFILE.model})` }]
-        : [
-            { value: "default", label: `default (${defaultModel})` },
-            ...ALLOWED_MODELS_BY_EXECUTOR[executor].map((model) => ({
-                value: model,
-                label: model === defaultModel ? `${model} [default]` : model,
-            })),
-        ];
+    const options = ALLOWED_MODELS_BY_EXECUTOR[resolvedExecutor].map((model) => ({
+        value: model,
+        label: model === defaultModel ? `${model} [default]` : model,
+    }));
     return {
         formId: "flow-launch-model",
         title: "Настройки запуска LLM",
@@ -229,25 +221,38 @@ function launchModelSelectionForm(executor) {
                 type: "single-select",
                 label: "Model",
                 required: true,
-                default: "default",
+                default: defaultModel,
                 options,
             },
         ],
     };
 }
+function isFormCancellation(error, formId) {
+    return error instanceof TaskRunnerError && error.message === `User cancelled form '${formId}'.`;
+}
 async function requestInteractiveLaunchProfile(requestUserInput) {
-    const executorFormResult = await requestUserInput(launchProfileSelectionForm());
-    const rawExecutor = String(executorFormResult.values.executor ?? "default");
-    const executor = rawExecutor === "default" ? "default" : LLM_EXECUTOR_IDS.find((id) => id === rawExecutor);
-    if (!executor) {
-        throw new TaskRunnerError(`Unsupported launch executor '${rawExecutor}'.`);
-    }
-    const modelFormResult = await requestUserInput(launchModelSelectionForm(executor));
-    const rawModel = String(modelFormResult.values.model ?? "default").trim();
-    return resolveLaunchProfile({
-        executor,
-        model: rawModel.length > 0 ? rawModel : "default",
-    }, DEFAULT_LAUNCH_PROFILE);
+    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 {
@@ -521,13 +526,13 @@ const FLOW_DESCRIPTIONS = {
     "bug-analyze": "Analyzes bug from Jira and creates structured artifacts: root cause hypothesis, fix design, and implementation plan.",
     "git-commit": "Collects git status/diff, generates commit message via LLM, allows file selection and commit confirmation.",
     "gitlab-diff-review": "Requests GitLab MR URL via user-input, downloads merge request diff via API, and runs code review with markdown and structured JSON artifacts.",
-    "gitlab-review": "Requests GitLab MR URL via user-input, downloads code review comments via API, and saves markdown plus structured JSON artifact.",
+    "gitlab-review": "Requests GitLab MR URL via user-input, downloads code review comments via API, assesses which findings are fair and proposes fixes, then runs review-fix for the selected findings.",
     "bug-fix": "Takes bug-analyze results as source of truth and implements the bug fix in code.",
     "mr-description": "Prepares a brief intent description for a merge request based on the task and current changes.",
     plan: "Loads task from Jira and creates design, implementation plan, and QA plan in structured JSON and markdown.",
     "task-describe": "Builds a brief task description either from Jira or from quick user-input without Jira.",
     implement: "Implements the task from approved design/plan artifacts and runs post-verify builds if needed.",
-    review: "Runs code review of current changes, validates structured findings, then prepares a reply to comments.",
+    review: "Runs code review of current changes and writes structured findings artifacts.",
     "review-fix": "Fixes issues after review-reply, updates code, and runs mandatory checks after modifications.",
     "review-loop": "Iteratively runs review and review-fix cycles up to 5 times until ready-to-merge is achieved.",
     "run-go-tests-loop": "Cycles through `./run_go_tests.py` locally, analyzes the last error, and fixes code until successful or attempts exhausted.",
@@ -880,9 +885,11 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
             iteration,
             gitlabReviewIteration,
             extraPrompt: config.extraPrompt,
+            reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, iteration),
+            reviewFixPoints: config.reviewFixPoints,
         }, launchProfile ? { launchProfile } : {}, requestUserInput, undefined, launchMode, runtime);
         if (!config.dryRun) {
-            printSummary("GitLab Review", `Artifacts:\n${gitlabReviewFile(config.taskKey)}\n${gitlabReviewJsonFile(config.taskKey)}`);
+            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)}`);
         }
         return false;
     }
@@ -982,6 +989,7 @@ async function executeCommand(baseConfig, runFollowupVerify = true, requestUserI
         await runDeclarativeFlowBySpecFile("review/review-fix.json", config, {
             taskKey: config.taskKey,
             latestIteration,
+            reviewAssessmentJsonFile: null,
             reviewFixSelectionJsonFile: reviewFixSelectionJsonFile(config.taskKey, latestIteration),
             extraPrompt: config.extraPrompt,
             reviewFixPoints: config.reviewFixPoints,