@engineeros/connector 0.8.6 → 0.8.8

package/README.md

@@ -40,10 +40,11 @@ An empty or document-only folder establishes a greenfield baseline. A code-beari
 ## Reconnect
 
 ```sh
-npx @engineeros/connector start --workspace .
+npx --yes @engineeros/connector@latest start --workspace .
 ```
 
 Credentials are stored per workspace under `~/.engineeros/connectors` with owner-only permissions where supported.
+If a new pairing command is accidentally run from the same folder against the same EngineerOS server, the connector reuses this saved identity instead of creating another baseline assessment.
 
 ## Run Goals
 

package/bin/engineeros-connector.mjs

@@ -3,7 +3,9 @@ import os from "node:os";
 import path from "node:path";
 import {
   assessmentResultUrl,
+  connectorResumeCredentials,
   loadConfig,
+  mergePairedConfig,
   resultUrl,
   saveConfig,
   socketUrl,
@@ -59,6 +61,7 @@ if (command === "status") {
 
 let config;
 let firstMessage;
+let existingConfig;
 if (command === "pair") {
   const pairingCode = positional[0];
   if (!pairingCode)
@@ -81,11 +84,13 @@ if (command === "pair") {
       flags.name ||
       `${os.hostname()} - ${path.basename(path.resolve(flags.workspace || process.cwd()))}`,
   };
+  existingConfig = await loadConfig(config.workspace);
   firstMessage = {
     type: "pair",
     pairing_code: pairingCode,
     name: config.name,
     capabilities: {},
+    ...connectorResumeCredentials(existingConfig, config.server_url),
   };
 } else if (command === "start") {
   config = await loadConfig(flags.workspace || process.cwd());
@@ -157,11 +162,14 @@ async function connect() {
     const message = JSON.parse(String(event.data));
     if (message.type === "paired") {
       clearConnectionWatchdog?.();
-      config = {
-        ...config,
-        connector_id: message.connector.id,
-        token: message.token,
-      };
+      const reusedConnector =
+        existingConfig?.connector_id === message.connector.id;
+      config = mergePairedConfig(
+        config,
+        existingConfig,
+        message.connector.id,
+        message.token,
+      );
       await saveConfig(config);
       firstMessage = {
         type: "authenticate",
@@ -169,7 +177,11 @@ async function connect() {
         token: config.token,
         capabilities,
       };
-      console.log(`Paired. Connector ${config.connector_id} is online.`);
+      console.log(
+        reusedConnector
+          ? `Reconnected existing workspace connector ${config.connector_id}; assessment history is preserved.`
+          : `Paired. Connector ${config.connector_id} is online.`,
+      );
       reconnectDelay = 1_000;
       startPings();
       if (config.onboarding_pending) void submitWorkspaceSnapshot();
@@ -259,13 +271,16 @@ async function connect() {
       console.error(`EngineerOS: ${message.message}`);
     }
   });
-  socket.addEventListener("close", () => {
+  socket.addEventListener("close", (event) => {
     clearConnectionWatchdog?.();
     clearInterval(pingTimer);
     if (active?.kind === "prompt") {
       active.cancelled = true;
       void stopProcess(active.child);
     }
+    if (event.code === 4001 && active?.kind === "assessment") {
+      void stopProcess(active.child);
+    }
     if (connectionRejected) {
       stopped = true;
       console.error(
@@ -416,7 +431,7 @@ async function executePrompt(assignment) {
     lastProgressMessage = message;
     sendPromptProgress(promptId, message);
   };
-  sendPromptProgress(promptId, "Coding agent started this request");
+  sendPromptProgress(promptId, "Agent started this request");
   console.log(
     `Answering ${assignment.purpose || "project"} prompt with ${codingAgent.name}.`,
   );

package/package.json

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

package/src/config.mjs

@@ -24,6 +24,36 @@ export function socketUrl(value) {
   return url.toString();
 }
 
+export function connectorResumeCredentials(config, serverUrl) {
+  if (
+    !config?.connector_id ||
+    !config.token ||
+    config.server_url !== serverUrl
+  ) {
+    return {};
+  }
+  return {
+    existing_connector_id: config.connector_id,
+    existing_token: config.token,
+  };
+}
+
+export function mergePairedConfig(
+  requestedConfig,
+  existingConfig,
+  connectorId,
+  token,
+) {
+  const preserved =
+    existingConfig?.connector_id === connectorId ? existingConfig : {};
+  return {
+    ...preserved,
+    ...requestedConfig,
+    connector_id: connectorId,
+    token,
+  };
+}
+
 export function resultUrl(websocketUrl, connectorId, runId) {
   const url = new URL(websocketUrl);
   url.protocol = url.protocol === "wss:" ? "https:" : "http:";

package/src/runner.mjs

@@ -587,9 +587,9 @@ export function promptProgressMessage(event) {
   if (event.type === "item.completed" && event.item?.type === "agent_message") {
     return "Preparing the response";
   }
-  if (event.type === "agent.connected") return "Connected to the coding agent";
+  if (event.type === "agent.connected") return "Agent connected";
   if (event.type === "acp.tool_call" || event.type === "acp.tool_call_update") {
-    return "Inspecting the workspace with the coding agent";
+    return "Agent is inspecting the workspace";
   }
   if (event.type === "acp.agent_message_chunk") return "Preparing the response";
   return null;
@@ -597,15 +597,15 @@ export function promptProgressMessage(event) {
 
 export function promptQueueMessage(activeKind) {
   if (activeKind === "assessment") {
-    return "Queued: coding agent is finishing the workspace assessment";
+    return "Queued: agent is finishing the workspace assessment";
   }
   if (activeKind === "goal") {
-    return "Queued: coding agent is finishing an active Goal";
+    return "Queued: agent is finishing an active Goal";
   }
   if (activeKind === "prompt") {
-    return "Queued: coding agent is finishing another request";
+    return "Queued: agent is finishing another request";
   }
-  return "Coding agent accepted the request";
+  return "Agent accepted the request";
 }
 
 function assessmentCommandMilestone(command) {
@@ -882,22 +882,29 @@ export function codexExecutionArgs({
   if (profile.reasoning_effort) {
     optionArgs.push(
       "--config",
-      `model_reasoning_effort=${JSON.stringify(profile.reasoning_effort)}`,
+      codexConfigArgument(
+        `model_reasoning_effort=${tomlLiteralString(profile.reasoning_effort)}`,
+      ),
     );
   }
   if (mcpServer) {
+    const mcpArgs = [
+      mcpServer.connectorBin,
+      "mcp",
+      "--workspace",
+      mcpServer.workspace,
+      "--run-id",
+      mcpServer.runId,
+    ];
     optionArgs.push(
       "--config",
-      `mcp_servers.engineeros.command=${JSON.stringify(process.execPath)}`,
+      codexConfigArgument(
+        `mcp_servers.engineeros.command=${tomlLiteralString(process.execPath)}`,
+      ),
       "--config",
-      `mcp_servers.engineeros.args=${JSON.stringify([
-        mcpServer.connectorBin,
-        "mcp",
-        "--workspace",
-        mcpServer.workspace,
-        "--run-id",
-        mcpServer.runId,
-      ])}`,
+      codexConfigArgument(
+        `mcp_servers.engineeros.args=[${mcpArgs.map(tomlLiteralString).join(",")}]`,
+      ),
     );
   }
   return previousSessionId
@@ -905,6 +912,20 @@ export function codexExecutionArgs({
     : ["exec", ...optionArgs, "--sandbox", sandbox, "-C", workspace, "-"];
 }
 
+function tomlLiteralString(value) {
+  const text = String(value);
+  if (text.includes("'''")) {
+    throw new Error(
+      "Codex configuration values cannot contain three consecutive apostrophes.",
+    );
+  }
+  return `'''${text}'''`;
+}
+
+function codexConfigArgument(override) {
+  return process.platform === "win32" ? `"${override}"` : override;
+}
+
 function launchAgentProcess(
   workspace,
   prompt,