@agentvalet/register 0.4.9 → 0.4.11

package/dist/index.js

@@ -448,55 +448,6 @@ function parseEnvFile(content) {
   }
   return result;
 }
-function resolveAgent(envFile = ".env.agentvalet") {
-  let agentId;
-  let ownerId;
-  let apiUrl = "https://api.agentvalet.ai";
-  let keyPath;
-  const envPath = resolve2(envFile);
-  if (existsSync2(envPath)) {
-    try {
-      const vars = parseEnvFile(readFileSync2(envPath, "utf-8"));
-      agentId = vars["AGENTVALET_AGENT_ID"];
-      ownerId = vars["AGENTVALET_OWNER_ID"];
-      apiUrl = vars["AGENTVALET_API_URL"] ?? apiUrl;
-      keyPath = vars["AGENTVALET_PRIVATE_KEY_PATH"];
-    } catch {
-    }
-  }
-  if (!agentId || !ownerId || !keyPath) {
-    const localConfigPath = join(process.cwd(), ".agentvalet", "config.json");
-    if (existsSync2(localConfigPath)) {
-      try {
-        const local = JSON.parse(readFileSync2(localConfigPath, "utf-8"));
-        agentId = agentId ?? local["agent_id"];
-        apiUrl = local["proxy_url"] ?? apiUrl;
-        keyPath = keyPath ?? join(process.cwd(), ".agentvalet", "agent.key");
-      } catch {
-      }
-    }
-    try {
-      const global = getStoredConfig();
-      if (!ownerId) ownerId = global.ownerId ?? void 0;
-    } catch {
-    }
-  }
-  if (!agentId || !ownerId || !keyPath) {
-    try {
-      const global = getStoredConfig();
-      agentId = agentId ?? global.lastAgentId ?? void 0;
-      ownerId = ownerId ?? global.ownerId ?? void 0;
-      keyPath = keyPath ?? global.lastKeyPath ?? void 0;
-      apiUrl = global.proxyUrl ?? apiUrl;
-    } catch {
-    }
-  }
-  if (!agentId || !ownerId || !keyPath) {
-    process.stderr.write(NO_AGENT_MSG + "\n");
-    process.exit(1);
-  }
-  return { agentId, ownerId, keyPath, apiUrl };
-}
 function tryResolveAgent(envFile = ".env.agentvalet") {
   let agentId;
   let ownerId;
@@ -586,7 +537,12 @@ async function runRefresh(options) {
     } catch {
     }
   }
-  const { agentId, ownerId, keyPath, apiUrl } = resolveAgent(options.envFile);
+  const creds = tryResolveAgent(options.envFile);
+  if (!creds || !existsSync3(resolve3(creds.keyPath))) {
+    console.error("  \u2717 No agent registered.\n  Run the following command first to register an agent in this directory:\n\n    npx @agentvalet/register\n");
+    process.exit(1);
+  }
+  const { agentId, ownerId, keyPath, apiUrl } = creds;
   let privateKeyPem;
   try {
     privateKeyPem = readFileSync3(keyPath, "utf-8");
@@ -1663,6 +1619,7 @@ function cleanLocally() {
   }
   console.log(chalk11.green("  \u2713 Cleaned CLAUDE.md, .mcp.json, .claude/settings.local.json"));
 }
+var SSE_READ_TIMEOUT_MS = 25e3;
 async function pollForApproval(apiUrl, revocationToken, timeoutMs) {
   const streamUrl = `${apiUrl}/v1/revoke-request/stream/${revocationToken}`;
   const deadline = Date.now() + timeoutMs;
@@ -1675,47 +1632,64 @@ async function pollForApproval(apiUrl, revocationToken, timeoutMs) {
       }
     }
     function connect() {
-      if (Date.now() > deadline) {
+      if (settled || Date.now() > deadline) {
         done("timeout");
         return;
       }
-      fetch(streamUrl, { headers: { Accept: "text/event-stream" } }).then(async (res) => {
+      const controller = new AbortController();
+      let readTimer = setTimeout(() => controller.abort(), SSE_READ_TIMEOUT_MS);
+      function resetReadTimer() {
+        clearTimeout(readTimer);
+        readTimer = setTimeout(() => controller.abort(), SSE_READ_TIMEOUT_MS);
+      }
+      fetch(streamUrl, { signal: controller.signal, headers: { Accept: "text/event-stream" } }).then(async (res) => {
         if (!res.ok || !res.body) {
-          done("timeout");
+          clearTimeout(readTimer);
+          if (!settled) setTimeout(connect, 3e3);
           return;
         }
         const reader = res.body.getReader();
         const decoder = new TextDecoder();
         let buf = "";
-        while (true) {
-          const { done: streamDone, value } = await reader.read();
-          if (streamDone) break;
-          buf += decoder.decode(value, { stream: true });
-          const lines = buf.split("\n");
-          buf = lines.pop() ?? "";
-          for (const line of lines) {
-            if (!line.startsWith("data: ")) continue;
-            try {
-              const evt = JSON.parse(line.slice(6));
-              if (evt.status === "approved") {
-                done("approved");
-                return;
+        try {
+          while (true) {
+            const { done: streamDone, value } = await reader.read();
+            resetReadTimer();
+            if (streamDone) break;
+            buf += decoder.decode(value, { stream: true });
+            const lines = buf.split("\n");
+            buf = lines.pop() ?? "";
+            for (const line of lines) {
+              if (line.startsWith(":")) continue;
+              if (!line.startsWith("data: ")) continue;
+              try {
+                const evt = JSON.parse(line.slice(6));
+                if (evt.status === "approved") {
+                  clearTimeout(readTimer);
+                  done("approved");
+                  return;
+                }
+                if (evt.status === "rejected") {
+                  clearTimeout(readTimer);
+                  done("rejected");
+                  return;
+                }
+                if (evt.status === "timeout") {
+                  clearTimeout(readTimer);
+                  done("timeout");
+                  return;
+                }
+              } catch {
               }
-              if (evt.status === "rejected") {
-                done("rejected");
-                return;
-              }
-              if (evt.status === "timeout") {
-                done("timeout");
-                return;
-              }
-            } catch {
             }
           }
+        } finally {
+          clearTimeout(readTimer);
         }
         if (!settled) setTimeout(connect, 1e3);
       }).catch(() => {
-        if (!settled) setTimeout(connect, 2e3);
+        clearTimeout(readTimer);
+        if (!settled) setTimeout(connect, 1e3);
       });
     }
     connect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentvalet/register",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Self-register AI agents with AgentValet",
   "type": "module",
   "bin": {