@engineeros/connector 0.11.2 → 0.12.2

package/package.json

@@ -1,40 +1,41 @@
-{
-  "name": "@engineeros/connector",
-  "version": "0.11.2",
-  "description": "Connect a local coding agent to EngineerOS, using ACP when supported.",
-  "private": false,
-  "type": "module",
-  "license": "UNLICENSED",
-  "files": [
-    "bin",
-    "src",
-    "README.md"
-  ],
-  "bin": {
-    "engineeros-connector": "bin/engineeros-connector.mjs"
-  },
-  "scripts": {
-    "start": "node ./bin/engineeros-connector.mjs",
-    "prepublishOnly": "node ./scripts/release.mjs check",
-    "release:patch": "node ./scripts/release.mjs patch",
-    "test": "node --test --test-concurrency=1",
-    "type-check": "node --check ./bin/engineeros-connector.mjs && node --check ./scripts/release.mjs && node --check ./src/acp-client.mjs && node --check ./src/agent-harness.mjs && node --check ./src/agent-registry.mjs && node --check ./src/capabilities.mjs && node --check ./src/cli-args.mjs && node --check ./src/codex-app-server.mjs && node --check ./src/config.mjs && node --check ./src/connection.mjs && node --check ./src/mcp-server.mjs && node --check ./src/runner.mjs"
-  },
-  "engines": {
-    "node": ">=22"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vinpuli/engineerosv2.git",
-    "directory": "packages/engineeros-connector"
-  },
-  "bugs": {
-    "url": "https://github.com/vinpuli/engineerosv2/issues"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
+{
+  "name": "@engineeros/connector",
+  "version": "0.12.2",
+  "description": "Connect a local coding agent to EngineerOS, using ACP when supported.",
+  "private": false,
+  "type": "module",
+  "license": "UNLICENSED",
+  "files": [
+    "bin",
+    "src",
+    "README.md"
+  ],
+  "bin": {
+    "engineeros-connector": "bin/engineeros-connector.mjs"
+  },
+  "scripts": {
+    "start": "node ./bin/engineeros-connector.mjs",
+    "prepublishOnly": "node ./scripts/release.mjs check",
+    "release:patch": "node ./scripts/release.mjs patch",
+    "test": "node --test --test-concurrency=1",
+    "type-check": "node --check ./bin/engineeros-connector.mjs && node --check ./scripts/release.mjs && node --check ./src/acp-client.mjs && node --check ./src/agent-harness.mjs && node --check ./src/agent-registry.mjs && node --check ./src/capabilities.mjs && node --check ./src/cli-args.mjs && node --check ./src/codex-app-server.mjs && node --check ./src/config.mjs && node --check ./src/connection.mjs && node --check ./src/mcp-server.mjs && node --check ./src/runner.mjs"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vinpuli/engineerosv2.git",
+    "directory": "packages/engineeros-connector"
+  },
+  "bugs": {
+    "url": "https://github.com/vinpuli/engineerosv2/issues"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
-    "@agentclientprotocol/sdk": "1.3.0"
+    "@agentclientprotocol/sdk": "1.3.0",
+    "zod": "3.25.76"
   }
 }

package/src/acp-client.mjs

@@ -58,50 +58,50 @@ export function launchAcpAgent(
   };
 }
 
-export async function disposeAcpRuntimes() {
+export async function disposeAcpRuntimes() {
   const active = [...runtimes.values()];
   runtimes.clear();
   await Promise.all(active.map((runtime) => runtime.dispose()));
-}
-
-export async function inspectAcpExecutionProfiles(workspace, config) {
-  const runtime = new AcpRuntime(workspace, config, () => {});
-  try {
-    await runtime.ready;
-    const response = await runtime.context.request(acp.methods.agent.session.new, {
-      cwd: workspace,
-      mcpServers: [],
-    });
-    return executionProfilesFromConfigOptions(response.configOptions);
-  } finally {
-    await runtime.dispose();
-  }
-}
-
-export function executionProfilesFromConfigOptions(configOptions = []) {
-  const selectOption = (category) =>
-    configOptions.find((candidate) => candidate.category === category && candidate.type === "select");
-  const selectValues = (option) =>
-    (option?.options || []).flatMap((candidate) =>
-      Array.isArray(candidate.options) ? candidate.options : [candidate],
-    );
-  const modelOption = selectOption("model");
-  const effortOption = selectOption("thought_level");
-  const models = selectValues(modelOption);
-  const efforts = selectValues(effortOption);
-  return {
-    model_selection: models.length > 0,
-    model_profiles: models.map((model) => ({
-      id: model.value,
-      name: model.name || model.value,
-      description: model.description || "",
-      is_default: model.value === modelOption.currentValue,
-      default_reasoning_effort: effortOption?.currentValue || null,
-      reasoning_efforts: efforts.map((effort) => effort.value),
-    })),
-    reasoning_efforts: efforts.map((effort) => effort.value),
-  };
-}
+}
+
+export async function inspectAcpExecutionProfiles(workspace, config) {
+  const runtime = new AcpRuntime(workspace, config, () => {});
+  try {
+    await runtime.ready;
+    const response = await runtime.context.request(acp.methods.agent.session.new, {
+      cwd: workspace,
+      mcpServers: [],
+    });
+    return executionProfilesFromConfigOptions(response.configOptions);
+  } finally {
+    await runtime.dispose();
+  }
+}
+
+export function executionProfilesFromConfigOptions(configOptions = []) {
+  const selectOption = (category) =>
+    configOptions.find((candidate) => candidate.category === category && candidate.type === "select");
+  const selectValues = (option) =>
+    (option?.options || []).flatMap((candidate) =>
+      Array.isArray(candidate.options) ? candidate.options : [candidate],
+    );
+  const modelOption = selectOption("model");
+  const effortOption = selectOption("thought_level");
+  const models = selectValues(modelOption);
+  const efforts = selectValues(effortOption);
+  return {
+    model_selection: models.length > 0,
+    model_profiles: models.map((model) => ({
+      id: model.value,
+      name: model.name || model.value,
+      description: model.description || "",
+      is_default: model.value === modelOption.currentValue,
+      default_reasoning_effort: effortOption?.currentValue || null,
+      reasoning_efforts: efforts.map((effort) => effort.value),
+    })),
+    reasoning_efforts: efforts.map((effort) => effort.value),
+  };
+}
 
 export function activeAcpRuntimeCount() {
   return runtimes.size;
@@ -230,6 +230,7 @@ class AcpRuntime {
         finalMessage: turn.finalMessage,
         model: profile.model || this.config.agent_name || "acp-agent",
         sessionId: session.sessionId,
+        usage: normalizeTokenUsage(response.usage),
       };
     } catch (error) {
       throw this.failure("failed", error);
@@ -410,6 +411,27 @@ class AcpRuntime {
   }
 }
 
+export function normalizeTokenUsage(value) {
+  if (!value || typeof value !== "object") return null;
+  const number = (...keys) => {
+    for (const key of keys) {
+      const candidate = value[key];
+      if (Number.isFinite(candidate) && candidate >= 0) return Math.trunc(candidate);
+    }
+    return 0;
+  };
+  const usage = {
+    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"),
+    reasoning_tokens: number("reasoningTokens", "reasoningOutputTokens", "reasoning_tokens"),
+  };
+  usage.total_tokens = number("totalTokens", "total_tokens") ||
+    Object.values(usage).reduce((total, tokens) => total + tokens, 0);
+  return usage.total_tokens > 0 ? usage : null;
+}
+
 function acpRuntimeKey(workspace, config) {
   return JSON.stringify([
     workspace,

package/src/agent-harness.mjs

@@ -137,25 +137,25 @@ export function normalizeAgentStructuredOutput(
       "EngineerOS structured output requires a heading contract.",
     );
   }
-  const content = String(response || "").trim();
-  if (!content) {
-    throw new Error("Agent completed without returning a response.");
-  }
-  const firstSection = {
-    "# Workspace Assessment": "## Executive Summary",
-    "# Workspace Assessment Delta": "## Updated Executive Summary",
-  }[outputHeading];
-  if (
-    firstSection &&
-    (content.startsWith(firstSection) ||
-      hasRequiredAssessmentSections(content, outputHeading))
-  ) {
-    return `${outputHeading}\n\n${content}`;
-  }
-  const lines = content.split(/\r?\n/);
-  const headingIndex = lines.findIndex(
-    (line) => line.trim() === outputHeading,
-  );
+  const content = String(response || "").trim();
+  if (!content) {
+    throw new Error("Agent completed without returning a response.");
+  }
+  const firstSection = {
+    "# Workspace Assessment": "## Executive Summary",
+    "# Workspace Assessment Delta": "## Updated Executive Summary",
+  }[outputHeading];
+  if (
+    firstSection &&
+    (content.startsWith(firstSection) ||
+      hasRequiredAssessmentSections(content, outputHeading))
+  ) {
+    return `${outputHeading}\n\n${content}`;
+  }
+  const lines = content.split(/\r?\n/);
+  const headingIndex = lines.findIndex(
+    (line) => line.trim() === outputHeading,
+  );
   const preamble =
     headingIndex >= 0 ? lines.slice(0, headingIndex).join("\n") : content;
   if (headingIndex < 0) {
@@ -174,38 +174,38 @@ export function normalizeAgentStructuredOutput(
       `Agent response must return '${outputHeading}' as plain Markdown, without a code fence.`,
     );
   }
-  return normalized;
-}
-
-function hasRequiredAssessmentSections(content, outputHeading) {
-  const sections =
-    outputHeading === "# Workspace Assessment"
-      ? [
-          "## Executive Summary",
-          "## Assessment Delta",
-          "## Current System Map",
-          "## Observed Capabilities",
-          "## Findings",
-          "## Implementation Scorecard",
-          "## Highest-Return Actions",
-          "## Commands Observed",
-        ]
-      : [
-          "## Updated Executive Summary",
-          "## Assessment Delta",
-          "## Current System Map",
-          "## Capability Changes",
-          "## Finding Changes",
-          "## Scorecard Changes",
-          "## Highest-Return Actions",
-          "## Commands Observed",
-        ];
-  return sections.every((section) =>
-    new RegExp(`(?:^|\\n)${section.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&")}\\s*$`, "m").test(
-      content,
-    ),
-  );
-}
+  return normalized;
+}
+
+function hasRequiredAssessmentSections(content, outputHeading) {
+  const sections =
+    outputHeading === "# Workspace Assessment"
+      ? [
+          "## Executive Summary",
+          "## Assessment Delta",
+          "## Current System Map",
+          "## Observed Capabilities",
+          "## Findings",
+          "## Implementation Scorecard",
+          "## Highest-Return Actions",
+          "## Commands Observed",
+        ]
+      : [
+          "## Updated Executive Summary",
+          "## Assessment Delta",
+          "## Current System Map",
+          "## Capability Changes",
+          "## Finding Changes",
+          "## Scorecard Changes",
+          "## Highest-Return Actions",
+          "## Commands Observed",
+        ];
+  return sections.every((section) =>
+    new RegExp(`(?:^|\\n)${section.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&")}\\s*$`, "m").test(
+      content,
+    ),
+  );
+}
 
 function bundledSkill(skillName) {
   const cached = skillCache.get(skillName);

package/src/capabilities.mjs

@@ -1,12 +1,12 @@
 import path from "node:path";
 import { agentHarnessCapabilities } from "./agent-harness.mjs";
 
-export function advertisedCapabilities(config, codingAgent) {
-  const executionProfiles = codingAgent.executionProfiles || {
-    model_selection: false,
-    model_profiles: [],
-    reasoning_efforts: [],
-  };
+export function advertisedCapabilities(config, codingAgent) {
+  const executionProfiles = codingAgent.executionProfiles || {
+    model_selection: false,
+    model_profiles: [],
+    reasoning_efforts: [],
+  };
   return {
     agent_protocols: [codingAgent.protocol],
     coding_agent: true,
@@ -16,9 +16,9 @@ export function advertisedCapabilities(config, codingAgent) {
     agent_name: codingAgent.name,
     agent_version: codingAgent.version,
     ...agentHarnessCapabilities(),
-    execution_profiles: {
-      ...executionProfiles,
-      models: (executionProfiles.model_profiles || []).map((model) => model.id),
+    execution_profiles: {
+      ...executionProfiles,
+      models: (executionProfiles.model_profiles || []).map((model) => model.id),
     },
   };
 }