@engineeros/connector 0.15.0 → 0.15.1

package/bin/engineeros-connector.mjs

@@ -13,6 +13,7 @@ import {
 } from "../src/config.mjs";
 import {
   ASSESSMENT_RESULT_TIMEOUT_MS,
+  attachAssessmentRejectionCorrection,
   assessmentWorkerSnapshots,
   assessmentInactivityFailure,
   assessmentProgressMessage,
@@ -735,6 +736,41 @@ async function executeAssessment(assignment, assessmentState) {
       stage,
     );
     if (result) {
+      attachAssessmentRejectionCorrection(
+        result,
+        preparedAssignment,
+        config,
+        {
+          onController: (controller) => {
+            if (isActiveAssessment()) assessmentState.controller = controller;
+          },
+          onProcess: (child) => {
+            if (isActiveAssessment()) {
+              assessmentState.child = child;
+              agentProcessStarted = true;
+              assessmentState.phase = "correcting";
+              assessmentState.lastActivityAt = Date.now();
+            }
+          },
+          onEvent: (event) => {
+            assessmentState.lastActivityAt = Date.now();
+            assessmentState.eventCount += 1;
+            const message = assessmentProgressMessage(event);
+            if (message) reportProgress(message);
+          },
+        },
+        {
+          draftPath: path
+            .join(
+              ".engineeros",
+              "assessments",
+              String(assessmentId),
+              result.report_file,
+            )
+            .split(path.sep)
+            .join("/"),
+        },
+      );
       reportProgress("Recovered completed stage report from connector storage");
     } else {
       result = await executeWorkspaceAssessment(preparedAssignment, config, {

package/package.json

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

package/src/assessment-spool.mjs

@@ -43,6 +43,7 @@ export async function persistAssessmentStageResult(
     change_impact_markdown: result.change_impact_markdown ?? null,
     model: result.model ?? null,
     usage: result.usage ?? null,
+    agent_session_id: result.agent_session_id ?? null,
   };
   await atomicWrite(path.join(directory, reportName), `${report}\n`);
   await atomicWrite(

package/src/runner.mjs

@@ -462,39 +462,101 @@ export async function executeWorkspaceAssessment(
       change_impact_markdown: changeImpact.markdown,
       model: turn.model ?? config.agent_protocol ?? "coding-agent",
       usage: turn.usage ?? null,
+      agent_session_id: turn.sessionId ?? 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 = launchAssessmentAgent(
-          assessmentRejectionCorrectionPrompt(
-            validationMessage,
-            execution.requiredOutputHeading,
-          ),
-          completed.sessionId,
-        );
-        const corrected = await correction.completed;
-        const correctedReport = normalizeAgentStructuredOutput(
-          corrected.finalMessage,
-          execution.requiredOutputHeading,
-        );
+    attachAssessmentRejectionCorrection(result, assignment, config, callbacks, {
+      previousSessionId: completed.sessionId,
+      buildResult,
+    });
+  }
+  return result;
+}
+
+export function attachAssessmentRejectionCorrection(
+  result,
+  assignment,
+  config,
+  callbacks,
+  { previousSessionId = result.agent_session_id, draftPath, buildResult } = {},
+) {
+  const execution = workspaceAssessmentExecution(assignment);
+  const assessmentAcpContext =
+    config.agent_protocol === "acp"
+      ? {
+          persistentAcp: true,
+          sessionKey: `assessment:${assignment.assessment_id}:${assignment.stage}`,
+        }
+      : undefined;
+  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 draftInstruction = draftPath
+        ? [
+            "",
+            `The authoritative draft is stored at \`${draftPath}\`. Read that file before making the requested correction.`,
+          ].join("\n")
+        : "";
+      const controller = launchAgentProcess(
+        config.workspace,
+        `${assessmentRejectionCorrectionPrompt(validationMessage, execution.requiredOutputHeading)}${draftInstruction}`,
+        execution.sandboxMode,
+        config,
+        callbacks,
+        execution.profile,
+        previousSessionId,
+        assessmentAcpContext,
+      );
+      callbacks.onController?.(controller);
+      callbacks.onProcess?.(controller.child);
+      const corrected = await controller.completed;
+      const correctedReport = normalizeAgentStructuredOutput(
+        corrected.finalMessage,
+        execution.requiredOutputHeading,
+      );
+      if (buildResult) {
         return buildResult(
           {
             ...corrected,
-            usage: mergeTokenUsage(completed.usage, corrected.usage),
+            usage: mergeTokenUsage(result.usage, corrected.usage),
           },
           correctedReport,
         );
-      },
-    });
-  }
+      }
+      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 (
+        assignment.target_head_revision &&
+        endingHead !== assignment.target_head_revision
+      ) {
+        throw new Error(
+          "The Git commit changed before assessment correction. Refresh the workspace inventory and assess the new commit.",
+        );
+      }
+      return {
+        ...result,
+        report_markdown: correctedReport,
+        observed_head_revision: endingHead,
+        model: corrected.model ?? result.model,
+        usage: mergeTokenUsage(result.usage, corrected.usage),
+        agent_session_id: corrected.sessionId ?? previousSessionId ?? null,
+      };
+    },
+  });
   return result;
 }