@engineeros/connector 0.13.2 → 0.13.3

package/bin/engineeros-connector.mjs

@@ -691,7 +691,7 @@ async function executeAssessment(assignment, assessmentState) {
       progress = 15;
       reportProgress("Calculating changed files and affected evidence");
     }
-    const result = await executeWorkspaceAssessment(assignment, config, {
+    let result = await executeWorkspaceAssessment(assignment, config, {
       onProcess: (child) => {
         if (active === assessmentState) {
           assessmentState.child = child;
@@ -709,17 +709,32 @@ async function executeAssessment(assignment, assessmentState) {
       },
     });
     flushOutput();
-    const response = await fetch(
-      assessmentResultUrl(config.server_url, config.connector_id, assessmentId),
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${config.token}`,
+    const submitResult = (payload) =>
+      fetch(
+        assessmentResultUrl(
+          config.server_url,
+          config.connector_id,
+          assessmentId,
+        ),
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${config.token}`,
+          },
+          body: JSON.stringify(payload),
         },
-        body: JSON.stringify(result),
-      },
-    );
+      );
+    let response = await submitResult(result);
+    if (response.status === 422 && result.correctAfterRejection) {
+      const rejection = await describeRejectedResponse(
+        response,
+        "the assessment",
+      );
+      result = await result.correctAfterRejection(rejection);
+      flushOutput();
+      response = await submitResult(result);
+    }
     if (!response.ok) {
       throw new Error(
         await describeRejectedResponse(response, "the assessment"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@engineeros/connector",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Connect a local coding agent to EngineerOS, using ACP when supported.",
   "private": false,
   "type": "module",

package/src/runner.mjs

@@ -419,31 +419,70 @@ export async function executeWorkspaceAssessment(
     },
   });
   completed = recovered.completed;
-  const report = recovered.report;
-  const endingRevision = await run(
-    "git",
-    ["rev-parse", "HEAD"],
-    config.workspace,
-    { allowFailure: true },
-  );
-  const endingHead =
-    endingRevision.code === 0
-      ? endingRevision.stdout.trim().slice(0, 128)
-      : null;
-  if (startingHead !== endingHead) {
-    throw new Error(
-      "The Git commit changed during assessment. Refresh the workspace inventory and assess the new commit.",
-    );
-  }
-  return {
-    stage: assignment.stage,
-    report_markdown: report,
-    observed_head_revision: endingHead,
-    changed_files: changeImpact.changedFiles,
-    change_impact_markdown: changeImpact.markdown,
-    model: completed.model ?? config.agent_protocol ?? "coding-agent",
-    usage: completed.usage ?? null,
-  };
+  const buildResult = async (turn, report) => {
+    const endingRevision = await run(
+      "git",
+      ["rev-parse", "HEAD"],
+      config.workspace,
+      { allowFailure: true },
+    );
+    const endingHead =
+      endingRevision.code === 0
+        ? endingRevision.stdout.trim().slice(0, 128)
+        : null;
+    if (startingHead !== endingHead) {
+      throw new Error(
+        "The Git commit changed during assessment. Refresh the workspace inventory and assess the new commit.",
+      );
+    }
+    return {
+      stage: assignment.stage,
+      report_markdown: report,
+      observed_head_revision: endingHead,
+      changed_files: changeImpact.changedFiles,
+      change_impact_markdown: changeImpact.markdown,
+      model: turn.model ?? config.agent_protocol ?? "coding-agent",
+      usage: turn.usage ?? null,
+    };
+  };
+  const result = await buildResult(completed, recovered.report);
+  if (!recovered.correctionUsed) {
+    Object.defineProperty(result, "correctAfterRejection", {
+      enumerable: false,
+      value: async (validationMessage) => {
+        callbacks.onEvent?.({
+          type: "assessment.output_correction",
+          message: "The Agent is correcting the rejected stage report",
+        });
+        const correction = launchAgentProcess(
+          config.workspace,
+          assessmentRejectionCorrectionPrompt(
+            validationMessage,
+            execution.requiredOutputHeading,
+          ),
+          execution.sandboxMode,
+          config,
+          callbacks,
+          execution.profile,
+          completed.sessionId,
+        );
+        callbacks.onProcess?.(correction.child);
+        const corrected = await correction.completed;
+        const correctedReport = normalizeAgentStructuredOutput(
+          corrected.finalMessage,
+          execution.requiredOutputHeading,
+        );
+        return buildResult(
+          {
+            ...corrected,
+            usage: mergeTokenUsage(completed.usage, corrected.usage),
+          },
+          correctedReport,
+        );
+      },
+    });
+  }
+  return result;
 }
 
 export async function workspaceChangeImpact(
@@ -835,6 +874,7 @@ export async function recoverAssessmentStageOutput({
   try {
     return {
       completed,
+      correctionUsed: false,
       report: normalizeAgentStructuredOutput(
         completed.finalMessage,
         requiredOutputHeading,
@@ -854,6 +894,7 @@ export async function recoverAssessmentStageOutput({
         ...corrected,
         usage: mergeTokenUsage(completed.usage, corrected.usage),
       },
+      correctionUsed: true,
       report: normalizeAgentStructuredOutput(
         corrected.finalMessage,
         requiredOutputHeading,
@@ -867,6 +908,26 @@ export async function recoverAssessmentStageOutput({
   }
 }
 
+export function assessmentRejectionCorrectionPrompt(
+  validationMessage,
+  requiredOutputHeading,
+) {
+  return [
+    "## Rejected Stage Output Recovery",
+    "",
+    "EngineerOS rejected the previous stage report because it was incomplete or violated the structured Markdown contract:",
+    "",
+    String(validationMessage || "The stage report was rejected.").trim(),
+    "",
+    "Treat the previous stage report as the authoritative draft.",
+    "Copy every valid section and block unchanged; repair only the incomplete or invalid entries identified by EngineerOS validation.",
+    "Do not re-inspect the repository or replace valid evidence unless the validation error requires it.",
+    "Return the entire corrected structured Markdown stage report so EngineerOS can validate it atomically, not only the repaired fragment or missing tail.",
+    `The first non-whitespace line must be exactly: ${requiredOutputHeading}`,
+    "Do not return progress commentary, an explanation of the correction, or a code fence.",
+  ].join("\n");
+}
+
 export function assessmentStageCorrectionPrompt(
   originalPrompt,
   requiredOutputHeading,