@engineeros/connector 0.13.2 → 0.13.4

package/README.md

@@ -47,7 +47,7 @@ npx --yes @engineeros/connector@latest pair PAIRING-CODE --url https://your-engi
 
 The connector uploads a bounded ZIP snapshot for a safe file inventory, then stays online for deep assessments, rescans, and Goal Runs. Inventory never executes repository code. It excludes known secrets, dependency directories, build output, compiled binaries, files larger than 5 MB, agent-tool caches, Git metadata, and connector state before upload.
 
-From **Project steering -> Workspace**, run the workspace assessment to use the connected agent subscription already authenticated on that computer. Select Architecture, Capabilities, Quality, or any combination when only part of the workspace needs reassessment. EngineerOS stores every completed assessment stage before starting the next one, resumes the unfinished stage after a connector restart, retry, or temporary connection loss, and then synthesizes the selected results into System State. The connector prints the current safe activity and elapsed time every 30 seconds, stops a stage that produces no agent activity for ten minutes instead of waiting indefinitely, and gives an incomplete final report one bounded correction turn instead of repeatedly restarting the stage. Capabilities are assessed one discovered capability at a time so a large repository does not depend on one unbounded agent turn. Assessment cannot modify the workspace.
+From **Project steering -> Workspace**, run the workspace assessment to use the connected agent subscription already authenticated on that computer. Select Architecture, Capabilities, Quality, or any combination when only part of the workspace needs reassessment. EngineerOS stores every completed assessment stage, resumes unfinished work after a connector restart, retry, or temporary connection loss, and then synthesizes the selected results into System State. After the capability catalog is accepted, the connector runs up to three isolated read-only capability workers concurrently; each result, live output, validation correction, and retry remains independently durable. The connector prints each worker's safe activity and elapsed time every 30 seconds, stops a worker that produces no agent activity for ten minutes instead of waiting indefinitely, and gives an incomplete report one bounded correction turn instead of repeatedly restarting it. Assessment cannot modify the workspace.
 
 After onboarding, every project prompt is routed to this connection. Copilot, shaping, planning, architecture, and experience generation use the connected agent subscription and workspace context. Interactive prompts run independently from assessments and Goal scheduling. Prompt runs are read-only; only an explicitly registered Goal Run receives workspace-write access. If the connector is offline, EngineerOS asks the user to reconnect instead of silently switching models.
 

package/bin/engineeros-connector.mjs

@@ -24,6 +24,7 @@ import {
   promptStreamEvent,
   requeueInterruptedAssessment,
   stopProcess,
+  takeWorkspaceAssessmentWave,
   workspaceSnapshot,
 } from "../src/runner.mjs";
 import { disposeAcpRuntimes } from "../src/acp-client.mjs";
@@ -195,6 +196,8 @@ firstMessage.capabilities = capabilities;
 
 let stopped = false;
 let active = null;
+const activeAssessments = new Map();
+const ASSESSMENT_WORKER_LIMIT = 3;
 const available = [];
 const assessments = [];
 const activePrompts = new Map();
@@ -212,7 +215,10 @@ process.on("SIGINT", async () => {
   clearConnectionWatchdog?.();
   clearTimeout(reconnectTimer);
   clearInterval(pingTimer);
-  await stopProcess(active?.child);
+  await Promise.all([
+    stopProcess(active?.child),
+    ...[...activeAssessments.values()].map((state) => stopProcess(state.child)),
+  ]);
   await Promise.all([...activePrompts.values()].map(cancelPrompt));
   await disposeAcpRuntimes();
   socket?.close();
@@ -278,9 +284,10 @@ async function connect() {
       return;
     }
     if (message.type === "workspace.assessment") {
+      const assessmentKey = `${message.assessment_id}:${message.stage}`;
       const disposition = enqueueWorkspaceAssessment(
         assessments,
-        active,
+        activeAssessments.get(assessmentKey),
         message,
       );
       if (disposition === "deferred") {
@@ -339,9 +346,9 @@ async function connect() {
     clearInterval(pingTimer);
     for (const promptState of activePrompts.values())
       void cancelPrompt(promptState);
-    if (active?.kind === "assessment") {
-      active.transportInterrupted = true;
-      if (event.code === 4001) void stopProcess(active.child);
+    for (const assessmentState of activeAssessments.values()) {
+      assessmentState.transportInterrupted = true;
+      if (event.code === 4001) void stopProcess(assessmentState.child);
     }
     if (connectionRejected) {
       stopped = true;
@@ -463,21 +470,27 @@ function sendPromptEvent(promptId, event) {
 }
 
 function pump() {
-  if (active || socket.readyState !== WebSocket.OPEN) return;
-  const assessment = assessments.shift();
-  if (assessment) {
+  if (socket.readyState !== WebSocket.OPEN || active) return;
+  const wave = takeWorkspaceAssessmentWave(
+    assessments,
+    activeAssessments.size,
+    ASSESSMENT_WORKER_LIMIT,
+  );
+  for (const assessment of wave) {
+    const assessmentKey = `${assessment.assessment_id}:${assessment.stage}`;
     const assessmentState = {
       kind: "assessment",
+      key: assessmentKey,
       runId: assessment.assessment_id,
       stage: assessment.stage,
       child: null,
       resumeAssignment: null,
       transportInterrupted: false,
     };
-    active = assessmentState;
+    activeAssessments.set(assessmentKey, assessmentState);
     void executeAssessment(assessment, assessmentState);
-    return;
   }
+  if (activeAssessments.size > 0 || assessments.length > 0) return;
   const runId = available.shift();
   if (!runId) return;
   active = { kind: "goal", runId, child: null, cancelled: false };
@@ -604,8 +617,10 @@ async function executeAssessment(assignment, assessmentState) {
   let inactivityFailure = null;
   let lastReportedMilestone = null;
   const creditedMilestones = new Set();
+  const isActiveAssessment = () =>
+    activeAssessments.get(assessmentState.key) === assessmentState;
   const reportProgress = (message, { milestone = true } = {}) => {
-    if (active !== assessmentState) return;
+    if (!isActiveAssessment()) return;
     if (milestone && lastReportedMilestone === message) return;
     if (milestone) {
       lastReportedMilestone = message;
@@ -635,7 +650,7 @@ async function executeAssessment(assignment, assessmentState) {
     if (
       !output ||
       socket.readyState !== WebSocket.OPEN ||
-      active !== assessmentState
+      !isActiveAssessment()
     ) {
       return;
     }
@@ -691,9 +706,9 @@ 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) {
+        if (isActiveAssessment()) {
           assessmentState.child = child;
           agentProcessStarted = true;
           lastAgentActivityAt = Date.now();
@@ -709,17 +724,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"),
@@ -732,7 +762,7 @@ async function executeAssessment(assignment, assessmentState) {
     const message = inactivityFailure || protocolFailureMessage(error);
     if (
       !assessmentState.transportInterrupted &&
-      active === assessmentState &&
+      isActiveAssessment() &&
       socket.readyState === WebSocket.OPEN
     ) {
       socket.send(
@@ -749,8 +779,8 @@ async function executeAssessment(assignment, assessmentState) {
   } finally {
     if (outputTimer) clearTimeout(outputTimer);
     clearInterval(heartbeat);
-    if (active === assessmentState) {
-      active = null;
+    if (isActiveAssessment()) {
+      activeAssessments.delete(assessmentState.key);
       const replayQueued = requeueInterruptedAssessment(
         assessments,
         assessmentState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@engineeros/connector",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "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,
@@ -939,6 +1000,22 @@ export function enqueueWorkspaceAssessment(
   return "queued";
 }
 
+export function takeWorkspaceAssessmentWave(queue, activeCount, limit = 3) {
+  const available = Math.max(0, limit - activeCount);
+  if (!available || !queue.length) return [];
+  if (!String(queue[0]?.stage || "").startsWith("capability:")) {
+    return activeCount === 0 ? queue.splice(0, 1) : [];
+  }
+  const wave = [];
+  while (
+    wave.length < available &&
+    String(queue[0]?.stage || "").startsWith("capability:")
+  ) {
+    wave.push(queue.shift());
+  }
+  return wave;
+}
+
 export function requeueInterruptedAssessment(
   queue,
   assessmentState,