@evident-ai/cli 0.2.1-dev.121b962 → 0.2.1-dev.27d8cfe

package/dist/index.js

@@ -1082,9 +1082,10 @@ async function sendMessageToOpenCode(port, sessionId, content, options, hooks, m
 }
 
 // src/lib/tunnel/connection.ts
-import WebSocket from "ws";
+import WebSocket3 from "ws";
 
 // src/lib/tunnel/forwarding.ts
+import WebSocket from "ws";
 var CHUNK_THRESHOLD = 512 * 1024;
 var CHUNK_SIZE = 768 * 1024;
 async function forwardToOpenCode(port, request) {
@@ -1096,7 +1097,10 @@ async function forwardToOpenCode(port, request) {
         "Content-Type": "application/json",
         ...request.headers
       },
-      body: request.body ? JSON.stringify(request.body) : void 0
+      body: request.body ? JSON.stringify(request.body) : void 0,
+      // 90s timeout to match the relay's configured timeout_ms for session creation;
+      // without this, a hanging OpenCode process holds the connection forever.
+      signal: AbortSignal.timeout(9e4)
     });
     let body;
     const contentType = response.headers.get("Content-Type");
@@ -1125,6 +1129,9 @@ async function forwardToOpenCode(port, request) {
   }
 }
 function sendResponse(ws, requestId, response) {
+  if (ws.readyState !== WebSocket.OPEN) {
+    return;
+  }
   const bodyStr = JSON.stringify(response.body ?? null);
   const bodyBytes = Buffer.from(bodyStr, "utf-8");
   if (bodyBytes.length < CHUNK_THRESHOLD) {
@@ -1140,7 +1147,13 @@ function sendResponse(ws, requestId, response) {
   sendResponseAsChunks(ws, requestId, response, bodyBytes);
 }
 function sendResponseAsChunks(ws, requestId, response, bodyBytes) {
+  if (ws.readyState !== WebSocket.OPEN) {
+    return;
+  }
   const chunks = splitIntoChunks(bodyBytes, CHUNK_SIZE);
+  if (ws.readyState !== WebSocket.OPEN) {
+    return;
+  }
   ws.send(
     JSON.stringify({
       type: "response_start",
@@ -1154,6 +1167,9 @@ function sendResponseAsChunks(ws, requestId, response, bodyBytes) {
     })
   );
   for (let i = 0; i < chunks.length; i++) {
+    if (ws.readyState !== WebSocket.OPEN) {
+      return;
+    }
     ws.send(
       JSON.stringify({
         type: "response_chunk",
@@ -1163,6 +1179,9 @@ function sendResponseAsChunks(ws, requestId, response, bodyBytes) {
       })
     );
   }
+  if (ws.readyState !== WebSocket.OPEN) {
+    return;
+  }
   ws.send(
     JSON.stringify({
       type: "response_end",
@@ -1179,6 +1198,7 @@ function splitIntoChunks(data, chunkSize) {
 }
 
 // src/lib/tunnel/events.ts
+import WebSocket2 from "ws";
 async function subscribeToOpenCodeEvents(port, subscriptionId, ws, abortController) {
   const url = `http://localhost:${port}/event`;
   try {
@@ -1192,13 +1212,18 @@ async function subscribeToOpenCodeEvents(port, subscriptionId, ws, abortControll
     if (!response.body) {
       throw new Error("No response body");
     }
+    if (ws.readyState === WebSocket2.OPEN) {
+      ws.send(JSON.stringify({ type: "subscription_connected", id: subscriptionId }));
+    }
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
     while (true) {
       const { done, value } = await reader.read();
       if (done) {
-        ws.send(JSON.stringify({ type: "event_end", id: subscriptionId }));
+        if (ws.readyState === WebSocket2.OPEN) {
+          ws.send(JSON.stringify({ type: "event_end", id: subscriptionId }));
+        }
         break;
       }
       buffer += decoder.decode(value, { stream: true });
@@ -1208,7 +1233,9 @@ async function subscribeToOpenCodeEvents(port, subscriptionId, ws, abortControll
         if (line.startsWith("data: ")) {
           try {
             const event = JSON.parse(line.slice(6));
-            ws.send(JSON.stringify({ type: "event", id: subscriptionId, event }));
+            if (ws.readyState === WebSocket2.OPEN) {
+              ws.send(JSON.stringify({ type: "event", id: subscriptionId, event }));
+            }
           } catch {
           }
         }
@@ -1219,7 +1246,9 @@ async function subscribeToOpenCodeEvents(port, subscriptionId, ws, abortControll
       return;
     }
     const message = error2 instanceof Error ? error2.message : "Unknown error";
-    ws.send(JSON.stringify({ type: "event_error", id: subscriptionId, error: message }));
+    if (ws.readyState === WebSocket2.OPEN) {
+      ws.send(JSON.stringify({ type: "event_error", id: subscriptionId, error: message }));
+    }
     throw error2;
   }
 }
@@ -1248,7 +1277,7 @@ function connectTunnel(options) {
   const url = `${tunnelUrl}/tunnel/${agentId}/connect`;
   const activeEventSubscriptions = /* @__PURE__ */ new Map();
   return new Promise((resolve, reject) => {
-    const ws = new WebSocket(url, {
+    const ws = new WebSocket3(url, {
       headers: {
         Authorization: authHeader
       }
@@ -1270,8 +1299,7 @@ function connectTunnel(options) {
             onConnected?.(connectedAgentId);
             resolve({
               ws,
-              close: () => ws.close(1e3, "CLI shutdown"),
-              activeEventSubscriptions
+              close: () => ws.close(1e3, "CLI shutdown")
             });
             break;
           }
@@ -1383,10 +1411,10 @@ async function getAgentInfo(agentId, authHeader) {
       return { valid: false, error: `API error: ${response.status}` };
     }
     const agent = await response.json();
-    if (agent.sandbox_type !== "local" && agent.sandbox_type !== "github_actions") {
+    if (agent.agent_type !== "local" && agent.agent_type !== "github_actions") {
       return {
         valid: false,
-        error: `Agent is type '${agent.sandbox_type}', must be 'local' or 'github_actions' for CLI connection`
+        error: `Agent is type '${agent.agent_type}', must be 'local' or 'github_actions' for CLI connection`
       };
     }
     return { valid: true, agent };
@@ -1502,7 +1530,12 @@ async function acquireConversationLock(agentId, conversationId, correlationId, a
     });
     checkAuthResponse(response, "acquiring conversation lock");
     if (response.status === 409) {
-      return { acquired: false, error: "Conversation already locked by another runner" };
+      const body = await response.json();
+      return {
+        acquired: false,
+        error: body.message ?? "Conversation already locked by another runner",
+        expires_at: body.expires_at
+      };
     }
     if (!response.ok) {
       return { acquired: false, error: `Failed to acquire lock: HTTP ${response.status}` };
@@ -1532,14 +1565,18 @@ async function extendConversationLock(agentId, conversationId, correlationId, au
 async function releaseConversationLock(agentId, conversationId, correlationId, authHeader) {
   const apiUrl = getApiUrlConfig();
   try {
-    await fetch(
+    const response = await fetch(
       `${apiUrl}/agents/${agentId}/threads/${conversationId}/lock?correlation_id=${encodeURIComponent(correlationId)}`,
       {
         method: "DELETE",
         headers: { Authorization: authHeader }
       }
     );
-  } catch {
+    if (!response.ok) {
+      console.error(`[lock] Failed to release lock on ${conversationId}: HTTP ${response.status}`);
+    }
+  } catch (error2) {
+    console.error(`[lock] Failed to release lock on ${conversationId}: ${error2}`);
   }
 }
 async function updateConversationSession(agentId, conversationId, sessionId, authHeader) {
@@ -1922,7 +1959,7 @@ function isNetworkError(error2) {
   return false;
 }
 async function processQueue(state, authHeader, triggerReconnect) {
-  let idleStart = null;
+  let idlePolls = 0;
   let currentAuthHeader = authHeader;
   while (state.running) {
     if (state.reconnecting && state.reconnectPromise) {
@@ -1941,7 +1978,7 @@ async function processQueue(state, authHeader, triggerReconnect) {
       );
       state.consecutiveFetchFailures = 0;
       if (conversations.length > 0) {
-        idleStart = null;
+        idlePolls = 0;
         for (const conv of conversations) {
           if (!state.running) break;
           if (!state.lockedConversations.has(conv.id)) {
@@ -1952,9 +1989,10 @@ async function processQueue(state, authHeader, triggerReconnect) {
               currentAuthHeader
             );
             if (!lockResult.acquired) {
+              const ttlMessage = lockResult.expires_at ? ` (lock expires in ${Math.max(0, Math.ceil((new Date(lockResult.expires_at).getTime() - Date.now()) / 1e3))}s)` : "";
               logActivity(state, {
                 type: "info",
-                message: `Conversation ${conv.id.slice(0, 8)} locked by another runner \u2014 skipping`
+                message: `Conversation ${conv.id.slice(0, 8)} locked by another runner \u2014 skipping${ttlMessage}`
               });
               if (state.interactive) displayStatus(state);
               continue;
@@ -2108,25 +2146,35 @@ async function processQueue(state, authHeader, triggerReconnect) {
         }
       } else {
         if (state.idleTimeout !== null) {
-          if (idleStart === null) {
-            idleStart = Date.now();
+          idlePolls++;
+          if (idlePolls === 1) {
             logActivity(state, {
               type: "info",
               message: `Queue empty, waiting (timeout: ${state.idleTimeout}s)...`
             });
             if (state.interactive) displayStatus(state);
           }
-          if (Date.now() - idleStart > state.idleTimeout * 1e3) {
+        }
+      }
+      await new Promise((resolve) => setTimeout(resolve, MESSAGE_POLL_INTERVAL_MS));
+      if (state.idleTimeout !== null && idlePolls >= 2) {
+        const idleMs = idlePolls * MESSAGE_POLL_INTERVAL_MS;
+        if (idleMs > state.idleTimeout * 1e3) {
+          logActivity(state, {
+            type: "info",
+            message: "Idle timeout reached"
+          });
+          if (state.interactive) displayStatus(state);
+          if (state.lockedConversations.size > 0) {
             logActivity(state, {
               type: "info",
-              message: "Idle timeout reached"
+              message: `Releasing ${state.lockedConversations.size} lock(s) before idle exit...`
             });
             if (state.interactive) displayStatus(state);
-            break;
           }
+          break;
         }
       }
-      await new Promise((resolve) => setTimeout(resolve, MESSAGE_POLL_INTERVAL_MS));
     } catch (error2) {
       if (error2 instanceof AuthenticationError) {
         const result = await handleAuthError(state, error2);
@@ -2172,7 +2220,7 @@ async function cleanup(state, authHeader) {
     clearInterval(state.lockHeartbeatTimer);
     state.lockHeartbeatTimer = null;
   }
-  if (authHeader && state.lockedConversations.size > 0) {
+  if (authHeader && authHeader.trim() !== "" && state.lockedConversations.size > 0) {
     for (const convId of state.lockedConversations) {
       await releaseConversationLock(state.agentId, convId, state.lockCorrelationId, authHeader);
     }
@@ -2280,6 +2328,12 @@ async function run(options) {
         if (resolved.agent_id) {
           state.agentId = resolved.agent_id;
           log(state, `Resolved agent ID from key: ${state.agentId}`);
+          if (state.interactive && !state.json) {
+            logActivity(state, {
+              type: "info",
+              message: `Agent ID resolved from key: ${state.agentId}`
+            });
+          }
         } else {
           printError(resolved.error || "Failed to resolve agent ID from key");
           process.exit(1);
@@ -2536,7 +2590,7 @@ program.name("evident").description("Run OpenCode locally and connect it to Evid
 program.command("login").description("Authenticate with Evident").option("--token", "Use token-based authentication (for CI/CD)").option("--no-browser", "Do not open the browser automatically").action(login);
 program.command("logout").description("Remove stored credentials").action(logout);
 program.command("whoami").description("Show the currently logged in user").action(whoami);
-program.command("run").description("Connect to Evident and process messages").requiredOption("-a, --agent <id>", "Agent ID to connect to").option("-p, --port <port>", "OpenCode port (default: 4096)", "4096").option("-v, --verbose", "Show detailed request/response information").option("-c, --conversation <id>", "Process only this specific conversation").option("--idle-timeout <seconds>", "Exit after N seconds idle").option("--json", "Output in JSON format").action(
+program.command("run").description("Connect to Evident and process messages").option("-a, --agent [id]", "Agent ID to connect to (optional when EVIDENT_AGENT_KEY is set)").option("-p, --port <port>", "OpenCode port (default: 4096)", "4096").option("-v, --verbose", "Show detailed request/response information").option("-c, --conversation <id>", "Process only this specific conversation").option("--idle-timeout <seconds>", "Exit after N seconds idle").option("--json", "Output in JSON format").action(
   (options) => {
     run({
       agent: options.agent,