@engineeros/connector 0.10.4 → 0.11.1

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@engineeros/connector",
-  "version": "0.10.4",
-  "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",
+{
+  "name": "@engineeros/connector",
+  "version": "0.11.1",
+  "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"
-  }
-}
+  },
+  "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"
+  }
+}

package/src/agent-harness.mjs

@@ -137,14 +137,21 @@ 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 lines = content.split(/\r?\n/);
-  const headingIndex = lines.findIndex(
-    (line, index) => index < 20 && 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)) {
+    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) {

package/src/codex-app-server.mjs

@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import readline from "node:readline";
 
 export async function inspectCodexExecutionProfiles({
@@ -51,7 +51,7 @@ export async function inspectCodexExecutionProfiles({
   }, timeoutMs);
   try {
     await request("initialize", {
-      clientInfo: { name: "engineeros-connector", title: "EngineerOS Connector", version: "0.10.4" },
+      clientInfo: { name: "engineeros-connector", title: "EngineerOS Connector", version: "0.11.0" },
     });
     child.stdin.write(`${JSON.stringify({ method: "initialized" })}\n`);
     const models = [];
@@ -79,140 +79,140 @@ export async function inspectCodexExecutionProfiles({
     child.kill();
   }
 }
-
-export function launchCodexAppServer({
-  workspace,
-  prompt,
-  sandbox,
-  profile = {},
-  previousSessionId,
-  callbacks = {},
-  command = process.env.CODEX_BIN || (process.platform === "win32" ? "codex.cmd" : "codex"),
-  spawnProcess = spawn,
-}) {
-  const child = spawnProcess(command, ["app-server", "--stdio"], {
-    cwd: workspace,
-    env: process.env,
-    shell: process.platform === "win32",
-    windowsHide: true,
-    stdio: ["pipe", "pipe", "pipe"],
-  });
-  const pending = new Map();
-  let requestId = 0;
-  let threadId = previousSessionId || "";
-  let turnId = "";
-  let finalMessage = "";
-  let stderr = "";
-  let settled = false;
-
-  const request = (method, params) =>
-    new Promise((resolve, reject) => {
-      const id = ++requestId;
-      pending.set(id, { resolve, reject });
-      child.stdin.write(`${JSON.stringify({ id, method, params })}\n`);
-    });
-
-  const completed = new Promise((resolve, reject) => {
-    const finish = (error) => {
-      if (settled) return;
-      settled = true;
-      for (const waiter of pending.values()) waiter.reject(error || new Error("Codex app-server stopped."));
-      pending.clear();
-      if (error) reject(error);
-      else resolve({ finalMessage, output: stderr.slice(-20_000), sessionId: threadId });
-    };
-
-    child.once("error", finish);
-    child.once("close", (code) => {
-      if (!settled) finish(new Error(`Codex app-server exited before completing the turn (code ${code ?? 1}). ${stderr}`));
-    });
-
-    const lines = readline.createInterface({ input: child.stdout });
-    lines.on("line", (line) => {
-      let message;
-      try {
-        message = JSON.parse(line);
-      } catch {
-        return;
-      }
-      if (message.id !== undefined) {
-        const waiter = pending.get(message.id);
-        if (!waiter) return;
-        pending.delete(message.id);
-        if (message.error) waiter.reject(new Error(message.error.message || "Codex app-server request failed."));
-        else waiter.resolve(message.result);
-        return;
-      }
-      const params = message.params || {};
-      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 === "thread/tokenUsage/updated") {
-        callbacks.onEvent?.({ type: "codex.usage", update: params });
-      } else if (message.method === "turn/completed" && params.threadId === threadId) {
-        const status = params.turn?.status;
-        if (status === "failed") finish(new Error(params.turn?.error?.message || "Codex turn failed."));
-        else if (!finalMessage.trim()) finish(new Error("Codex completed without returning a response."));
-        else finish();
-        child.kill();
-      }
-    });
-
-    child.stderr.setEncoding("utf8");
-    child.stderr.on("data", (chunk) => {
-      stderr = `${stderr}${chunk}`.slice(-20_000);
-    });
-
-    void (async () => {
-      try {
-        await request("initialize", {
-          clientInfo: { name: "engineeros-connector", title: "EngineerOS Connector", version: "0.10.4" },
-        });
-        child.stdin.write(`${JSON.stringify({ method: "initialized" })}\n`);
-        const threadResult = previousSessionId
-          ? await request("thread/resume", {
-              threadId: previousSessionId,
-              cwd: workspace,
-              sandbox,
-              approvalPolicy: "never",
-              model: profile.model || null,
-            })
-          : await request("thread/start", {
-              cwd: workspace,
-              sandbox,
-              approvalPolicy: "never",
-              model: profile.model || null,
-              ephemeral: false,
-            });
-        threadId = threadResult.thread.id;
-        callbacks.onEvent?.({ type: "thread.started", thread_id: threadId });
-        const turnResult = await request("turn/start", {
-          threadId,
-          input: [{ type: "text", text: prompt }],
-          effort: profile.reasoning_effort || null,
-        });
-        turnId = turnResult.turn.id;
-      } catch (error) {
-        child.kill();
-        finish(error instanceof Error ? error : new Error(String(error)));
-      }
-    })();
-  });
-
-  return {
-    child,
-    completed,
-    cancel: async () => {
-      if (threadId && turnId && !settled) {
-        try {
-          await request("turn/interrupt", { threadId, turnId });
-        } catch {
-          // Process termination below is the final cancellation boundary.
-        }
-      }
-      child.kill();
-    },
-  };
-}
+
+export function launchCodexAppServer({
+  workspace,
+  prompt,
+  sandbox,
+  profile = {},
+  previousSessionId,
+  callbacks = {},
+  command = process.env.CODEX_BIN || (process.platform === "win32" ? "codex.cmd" : "codex"),
+  spawnProcess = spawn,
+}) {
+  const child = spawnProcess(command, ["app-server", "--stdio"], {
+    cwd: workspace,
+    env: process.env,
+    shell: process.platform === "win32",
+    windowsHide: true,
+    stdio: ["pipe", "pipe", "pipe"],
+  });
+  const pending = new Map();
+  let requestId = 0;
+  let threadId = previousSessionId || "";
+  let turnId = "";
+  let finalMessage = "";
+  let stderr = "";
+  let settled = false;
+
+  const request = (method, params) =>
+    new Promise((resolve, reject) => {
+      const id = ++requestId;
+      pending.set(id, { resolve, reject });
+      child.stdin.write(`${JSON.stringify({ id, method, params })}\n`);
+    });
+
+  const completed = new Promise((resolve, reject) => {
+    const finish = (error) => {
+      if (settled) return;
+      settled = true;
+      for (const waiter of pending.values()) waiter.reject(error || new Error("Codex app-server stopped."));
+      pending.clear();
+      if (error) reject(error);
+      else resolve({ finalMessage, output: stderr.slice(-20_000), sessionId: threadId });
+    };
+
+    child.once("error", finish);
+    child.once("close", (code) => {
+      if (!settled) finish(new Error(`Codex app-server exited before completing the turn (code ${code ?? 1}). ${stderr}`));
+    });
+
+    const lines = readline.createInterface({ input: child.stdout });
+    lines.on("line", (line) => {
+      let message;
+      try {
+        message = JSON.parse(line);
+      } catch {
+        return;
+      }
+      if (message.id !== undefined) {
+        const waiter = pending.get(message.id);
+        if (!waiter) return;
+        pending.delete(message.id);
+        if (message.error) waiter.reject(new Error(message.error.message || "Codex app-server request failed."));
+        else waiter.resolve(message.result);
+        return;
+      }
+      const params = message.params || {};
+      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 === "thread/tokenUsage/updated") {
+        callbacks.onEvent?.({ type: "codex.usage", update: params });
+      } else if (message.method === "turn/completed" && params.threadId === threadId) {
+        const status = params.turn?.status;
+        if (status === "failed") finish(new Error(params.turn?.error?.message || "Codex turn failed."));
+        else if (!finalMessage.trim()) finish(new Error("Codex completed without returning a response."));
+        else finish();
+        child.kill();
+      }
+    });
+
+    child.stderr.setEncoding("utf8");
+    child.stderr.on("data", (chunk) => {
+      stderr = `${stderr}${chunk}`.slice(-20_000);
+    });
+
+    void (async () => {
+      try {
+        await request("initialize", {
+          clientInfo: { name: "engineeros-connector", title: "EngineerOS Connector", version: "0.11.0" },
+        });
+        child.stdin.write(`${JSON.stringify({ method: "initialized" })}\n`);
+        const threadResult = previousSessionId
+          ? await request("thread/resume", {
+              threadId: previousSessionId,
+              cwd: workspace,
+              sandbox,
+              approvalPolicy: "never",
+              model: profile.model || null,
+            })
+          : await request("thread/start", {
+              cwd: workspace,
+              sandbox,
+              approvalPolicy: "never",
+              model: profile.model || null,
+              ephemeral: false,
+            });
+        threadId = threadResult.thread.id;
+        callbacks.onEvent?.({ type: "thread.started", thread_id: threadId });
+        const turnResult = await request("turn/start", {
+          threadId,
+          input: [{ type: "text", text: prompt }],
+          effort: profile.reasoning_effort || null,
+        });
+        turnId = turnResult.turn.id;
+      } catch (error) {
+        child.kill();
+        finish(error instanceof Error ? error : new Error(String(error)));
+      }
+    })();
+  });
+
+  return {
+    child,
+    completed,
+    cancel: async () => {
+      if (threadId && turnId && !settled) {
+        try {
+          await request("turn/interrupt", { threadId, turnId });
+        } catch {
+          // Process termination below is the final cancellation boundary.
+        }
+      }
+      child.kill();
+    },
+  };
+}