@engineeros/connector 0.12.3 → 0.12.5

package/bin/engineeros-connector.mjs

@@ -31,7 +31,9 @@ import {
   registeredAgents,
 } from "../src/agent-registry.mjs";
 import {
+  describeRejectedResponse,
   describeWebSocketError,
+  protocolFailureMessage,
   startConnectionWatchdog,
 } from "../src/connection.mjs";
 import { advertisedCapabilities } from "../src/capabilities.mjs";
@@ -387,7 +389,7 @@ async function submitWorkspaceSnapshot() {
     );
     if (!response.ok) {
       throw new Error(
-        `EngineerOS rejected the workspace (${response.status}): ${await response.text()}`,
+        await describeRejectedResponse(response, "the workspace"),
       );
     }
     const result = await response.json();
@@ -422,7 +424,7 @@ async function submitWorkspaceSnapshot() {
   } catch (error) {
     snapshotInFlight = false;
     console.error(
-      `Workspace assessment failed: ${error instanceof Error ? error.message : String(error)}`,
+      `Workspace assessment failed: ${protocolFailureMessage(error)}`,
     );
   }
 }
@@ -545,17 +547,18 @@ async function executePrompt(assignment) {
       }),
     );
   } catch (error) {
+    const message = protocolFailureMessage(error);
     if (!promptState.cancelled && socket.readyState === WebSocket.OPEN) {
       socket.send(
         JSON.stringify({
           type: "prompt.failed",
           prompt_id: promptId,
-          message: error instanceof Error ? error.message : String(error),
+          message,
         }),
       );
     }
     if (!promptState.cancelled) {
-      console.error(error instanceof Error ? error.message : String(error));
+      console.error(message);
     }
   } finally {
     if (activePrompts.get(promptId) === promptState)
@@ -662,22 +665,23 @@ async function executeAssessment(assignment) {
     );
     if (!response.ok) {
       throw new Error(
-        `EngineerOS rejected the assessment (${response.status}): ${await response.text()}`,
+        await describeRejectedResponse(response, "the assessment"),
       );
     }
     console.log("Workspace assessment is current in EngineerOS.");
   } catch (error) {
     flushOutput();
+    const message = protocolFailureMessage(error);
     if (socket.readyState === WebSocket.OPEN) {
       socket.send(
         JSON.stringify({
           type: "workspace.assessment.failed",
           assessment_id: assessmentId,
-          message: error instanceof Error ? error.message : String(error),
+          message,
         }),
       );
     }
-    console.error(error instanceof Error ? error.message : String(error));
+    console.error(message);
   } finally {
     if (outputTimer) clearTimeout(outputTimer);
     clearInterval(heartbeat);
@@ -735,10 +739,9 @@ async function execute(assignment) {
         body: JSON.stringify(result),
       },
     );
-    if (!response.ok)
-      throw new Error(
-        `EngineerOS rejected the result (${response.status}): ${await response.text()}`,
-      );
+    if (!response.ok) {
+      throw new Error(await describeRejectedResponse(response, "the result"));
+    }
     const integration = await applyAcceptedChange(
       config.workspace,
       assignment.base_revision,
@@ -757,17 +760,17 @@ async function execute(assignment) {
       );
     }
   } catch (error) {
+    const message = protocolFailureMessage(error);
     if (!active?.cancelled && socket.readyState === WebSocket.OPEN) {
       socket.send(
         JSON.stringify({
           type: "run.failed",
           run_id: runId,
-          message: error instanceof Error ? error.message : String(error),
+          message,
         }),
       );
     }
-    if (!active?.cancelled)
-      console.error(error instanceof Error ? error.message : String(error));
+    if (!active?.cancelled) console.error(message);
   } finally {
     clearInterval(heartbeat);
     active = null;

package/package.json

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

package/src/acp-client.mjs

@@ -424,7 +424,11 @@ export function normalizeTokenUsage(value) {
     input_tokens: number("inputTokens", "input_tokens"),
     output_tokens: number("outputTokens", "output_tokens"),
     cache_read_tokens: number("cachedReadTokens", "cachedInputTokens", "cache_read_input_tokens"),
-    cache_write_tokens: number("cachedWriteTokens", "cache_creation_input_tokens"),
+    cache_write_tokens: number(
+      "cachedWriteTokens",
+      "cacheWriteInputTokens",
+      "cache_creation_input_tokens",
+    ),
     reasoning_tokens: number("reasoningTokens", "reasoningOutputTokens", "reasoning_tokens"),
   };
   usage.total_tokens = number("totalTokens", "total_tokens") ||

package/src/codex-app-server.mjs

@@ -157,11 +157,14 @@ export function launchCodexAppServer({
       if (message.method === "item/agentMessage/delta" && typeof params.delta === "string") {
         finalMessage += params.delta;
         callbacks.onEvent?.({ type: "codex.agent_message_delta", delta: params.delta });
-      } else if (message.method === "item/started" || message.method === "item/completed") {
-        callbacks.onEvent?.({ type: `codex.${message.method}`, item: params.item });
+      } else if (message.method === "item/started" || message.method === "item/completed") {
+        callbacks.onEvent?.({ type: `codex.${message.method}`, item: params.item });
       } else if (message.method === "thread/tokenUsage/updated") {
+        const tokenUsage = params.tokenUsage || params.usage || params;
         usage = normalizeTokenUsage(
-          params.last || params.usage || params.tokenUsage?.last || params.tokenUsage || params,
+          previousSessionId
+            ? tokenUsage.last || params.last || tokenUsage
+            : tokenUsage.total || params.total || tokenUsage.last || params.last || tokenUsage,
         );
         callbacks.onEvent?.({ type: "codex.usage", update: params });
         if (usage && completionTimer) {

package/src/connection.mjs

@@ -1,3 +1,6 @@
+const PROTOCOL_FAILURE_MESSAGE_MAX_LENGTH = 2_000;
+const TRUNCATED_FAILURE_SUFFIX = "\n… [truncated by EngineerOS connector]";
+
 export function describeWebSocketError(event) {
   return (
     event?.error?.message ||
@@ -6,6 +9,26 @@ export function describeWebSocketError(event) {
   );
 }
 
+export function protocolFailureMessage(error) {
+  const raw = error instanceof Error ? error.message : String(error ?? "");
+  const message =
+    raw.trim() || "The connector failed without providing an error detail.";
+  const characters = [...message];
+  if (characters.length <= PROTOCOL_FAILURE_MESSAGE_MAX_LENGTH) return message;
+  const suffix = [...TRUNCATED_FAILURE_SUFFIX];
+  return `${characters
+    .slice(0, PROTOCOL_FAILURE_MESSAGE_MAX_LENGTH - suffix.length)
+    .join("")}${TRUNCATED_FAILURE_SUFFIX}`;
+}
+
+export async function describeRejectedResponse(response, subject) {
+  const responseBody = await response.text();
+  const detail = responseDetail(responseBody);
+  return protocolFailureMessage(
+    `EngineerOS rejected ${subject} (${response.status})${detail ? `: ${detail}` : "."}`,
+  );
+}
+
 export function startConnectionWatchdog(
   socket,
   url,
@@ -24,3 +47,28 @@ export function startConnectionWatchdog(
 
   return () => clearTimeout(timer);
 }
+
+function responseDetail(responseBody) {
+  const body = String(responseBody || "").trim();
+  if (!body) return "";
+  try {
+    const parsed = JSON.parse(body);
+    if (typeof parsed?.detail === "string") return parsed.detail;
+    if (Array.isArray(parsed?.detail)) {
+      return parsed.detail.map(validationIssue).filter(Boolean).join("; ");
+    }
+  } catch {
+    // Plain-text server errors are already useful to the operator.
+  }
+  return body;
+}
+
+function validationIssue(issue) {
+  if (typeof issue === "string") return issue;
+  if (!issue || typeof issue !== "object") return "";
+  const location = Array.isArray(issue.loc) ? issue.loc.join(".") : "";
+  const message = typeof issue.msg === "string" ? issue.msg : "";
+  const type = typeof issue.type === "string" ? ` (${issue.type})` : "";
+  if (!location && !message) return "";
+  return `${location ? `${location}: ` : ""}${message}${type}`;
+}