@agentvalet/register 0.4.10 → 0.4.12

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
+import { createRequire } from "module";
 import { Command as Command5 } from "commander";
 import chalk12 from "chalk";
 
@@ -192,9 +193,23 @@ async function saveOutput(opts) {
 
 // src/commands/refresh.ts
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync3, mkdirSync, statSync } from "fs";
-import { createSign, createPrivateKey } from "crypto";
 import { dirname as dirname2, resolve as resolve3 } from "path";
 
+// src/lib/jwt.ts
+import { createSign, createPrivateKey } from "crypto";
+function signJwt(agentId, ownerId, privateKeyPem) {
+  const now = Math.floor(Date.now() / 1e3);
+  const b64 = (s) => Buffer.from(s).toString("base64url");
+  const header = b64(JSON.stringify({ alg: "RS256", typ: "JWT" }));
+  const payload = b64(
+    JSON.stringify({ agent_id: agentId, owner_id: ownerId, iat: now, exp: now + 300 })
+  );
+  const signingInput = `${header}.${payload}`;
+  const sign = createSign("RSA-SHA256");
+  sign.update(signingInput);
+  return `${signingInput}.${sign.sign(createPrivateKey(privateKeyPem), "base64url")}`;
+}
+
 // src/lib/skill-writer.ts
 import { existsSync, writeFileSync } from "fs";
 import { execSync } from "child_process";
@@ -500,19 +515,6 @@ var CLAUDE_START = "<!-- agentvalet:start -->";
 var CLAUDE_END = "<!-- agentvalet:end -->";
 var HOOK_COMMAND = "npx @agentvalet/register refresh --if-stale --quiet 2>/dev/null || true";
 var HOOK_MARKER = "agentvalet/register refresh";
-function base64url(input) {
-  return Buffer.from(input).toString("base64url");
-}
-function signJwt(agentId, ownerId, privateKeyPem) {
-  const now = Math.floor(Date.now() / 1e3);
-  const header = base64url(JSON.stringify({ alg: "RS256", typ: "JWT" }));
-  const payload = base64url(JSON.stringify({ agent_id: agentId, owner_id: ownerId, iat: now, exp: now + 300 }));
-  const signingInput = `${header}.${payload}`;
-  const sign = createSign("RSA-SHA256");
-  sign.update(signingInput);
-  const signature = sign.sign(createPrivateKey(privateKeyPem), "base64url");
-  return `${signingInput}.${signature}`;
-}
 function writePermissionsFromEvent(agentId, ownerId, platforms, outputPath = "./.claude/agentvalet-permissions.md") {
   const content = generatePermissionsFile(agentId, ownerId, platforms);
   const resolvedPath = resolve3(outputPath);
@@ -1529,20 +1531,9 @@ import chalk11 from "chalk";
 import { existsSync as existsSync7, readFileSync as readFileSync4, writeFileSync as writeFileSync3, rmSync } from "fs";
 import { resolve as resolve4, join as join3 } from "path";
 import { homedir as homedir2 } from "os";
-import { createSign as createSign2, createPrivateKey as createPrivateKey2 } from "crypto";
 var CLAUDE_START2 = "<!-- agentvalet:start -->";
 var CLAUDE_END2 = "<!-- agentvalet:end -->";
 var HOOK_MARKER2 = "agentvalet/register refresh";
-function signJwt2(agentId, ownerId, privateKeyPem) {
-  const now = Math.floor(Date.now() / 1e3);
-  const b64 = (s) => Buffer.from(s).toString("base64url");
-  const header = b64(JSON.stringify({ alg: "RS256", typ: "JWT" }));
-  const payload = b64(JSON.stringify({ agent_id: agentId, owner_id: ownerId, iat: now, exp: now + 300 }));
-  const signingInput = `${header}.${payload}`;
-  const sign = createSign2("RSA-SHA256");
-  sign.update(signingInput);
-  return `${signingInput}.${sign.sign(createPrivateKey2(privateKeyPem), "base64url")}`;
-}
 function stripClaudeMd() {
   const path7 = resolve4("CLAUDE.md");
   if (!existsSync7(path7)) return;
@@ -1619,6 +1610,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;
@@ -1631,47 +1623,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();
@@ -1700,7 +1709,7 @@ function uninstallCommand() {
     }
     console.log(chalk11.dim(`
   Submitting revocation request for ${creds.agentId}...`));
-    const jwt = signJwt2(creds.agentId, creds.ownerId, privateKeyPem);
+    const jwt = signJwt(creds.agentId, creds.ownerId, privateKeyPem);
     let revocationToken;
     try {
       const res = await fetch(`${creds.apiUrl}/v1/revoke-request`, {
@@ -1747,11 +1756,13 @@ function uninstallCommand() {
 }
 
 // src/index.ts
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
 function collectScope(value, previous) {
   return [...previous, value];
 }
 var program = new Command5();
-program.name("agentvalet-register").description("Self-register an AI agent with AgentValet").version("0.4.8").option("--owner <uuid>", "Owner ID (or set AGENTVALET_OWNER env var)").option("--name <name>", "Agent name").option("--description <desc>", "Agent description").option("--scope <platform:scope>", "Requested scope, repeatable", collectScope, []).option("--api-url <url>", "AgentValet API base URL", "https://api.agentvalet.ai").option("--output <path>", "Path to write .env file", "./.env.agentvalet").option("--key-path <path>", "Path to write private key", "./agentvalet.key").option("--json", "Machine-readable JSON output").option("--no-wait", "Register only, do not wait for approval").option("--timeout <seconds>", "Approval wait timeout in seconds", "300").action(async (opts) => {
+program.name("agentvalet-register").description("Self-register an AI agent with AgentValet").version(version).option("--owner <uuid>", "Owner ID (or set AGENTVALET_OWNER env var)").option("--name <name>", "Agent name").option("--description <desc>", "Agent description").option("--scope <platform:scope>", "Requested scope, repeatable", collectScope, []).option("--api-url <url>", "AgentValet API base URL", "https://api.agentvalet.ai").option("--output <path>", "Path to write .env file", "./.env.agentvalet").option("--key-path <path>", "Path to write private key", "./agentvalet.key").option("--json", "Machine-readable JSON output").option("--no-wait", "Register only, do not wait for approval").option("--timeout <seconds>", "Approval wait timeout in seconds", "300").action(async (opts) => {
   const isJson = !!opts.json;
   let ownerId = opts.owner ?? process.env.AGENTVALET_OWNER ?? "";
   let agentName = opts.name ?? "";
@@ -1922,7 +1933,8 @@ program.command("refresh").description("Refresh approved permissions and update
   }
 });
 program.command("mcp-server").description("Start the AgentValet MCP server (stdio transport)").action(async () => {
-  await import("./mcp-server-SBGWYBP7.js");
+  const { mcpServerCommand } = await import("./mcp-server-R3LG4PNM.js");
+  await mcpServerCommand();
 });
 program.addCommand(listCommand());
 program.addCommand(revokeCommand());

package/dist/mcp-server-R3LG4PNM.js

@@ -0,0 +1,46 @@
+// src/commands/mcp-server.ts
+import { spawn } from "child_process";
+import { createRequire } from "module";
+function resolveMcpServerBin() {
+  try {
+    const require2 = createRequire(import.meta.url);
+    return require2.resolve("@agentvalet/mcp-server/dist/index.js");
+  } catch {
+    try {
+      const require2 = createRequire(import.meta.url);
+      const pkgRoot = require2.resolve("@agentvalet/mcp-server/package.json");
+      return pkgRoot.replace("package.json", "dist/index.js");
+    } catch {
+      throw new Error(
+        "@agentvalet/mcp-server is not installed. Run: npx @agentvalet/register"
+      );
+    }
+  }
+}
+async function mcpServerCommand() {
+  let binPath;
+  try {
+    binPath = resolveMcpServerBin();
+  } catch (err) {
+    process.stderr.write(
+      `[agentvalet] ${err instanceof Error ? err.message : String(err)}
+`
+    );
+    process.exit(1);
+  }
+  const child = spawn(process.execPath, [binPath], {
+    stdio: "inherit",
+    env: process.env
+  });
+  child.on("error", (err) => {
+    process.stderr.write(`[agentvalet] Failed to start MCP server: ${err.message}
+`);
+    process.exit(1);
+  });
+  child.on("exit", (code) => {
+    process.exit(code ?? 0);
+  });
+}
+export {
+  mcpServerCommand
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentvalet/register",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Self-register AI agents with AgentValet",
   "type": "module",
   "bin": {
@@ -10,14 +10,8 @@
     "dist",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsup src/index.ts --format esm --dts --clean --shims",
-    "dev": "tsx src/index.ts",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit",
-    "prepublishOnly": "pnpm build"
-  },
   "dependencies": {
+    "@agentvalet/mcp-server": "*",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@octokit/auth-oauth-device": "^7.0.0",
     "chalk": "^5.3.0",
@@ -54,5 +48,11 @@
     "valet",
     "agentvalet"
   ],
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "build": "tsup src/index.ts --format esm --dts --clean --shims",
+    "dev": "tsx src/index.ts",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
+  }
+}

package/dist/mcp-server-SBGWYBP7.js

@@ -1,139 +0,0 @@
-// src/commands/mcp-server.ts
-import { readFileSync } from "fs";
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
-import { SignJWT, importPKCS8 } from "jose";
-if (!process.env.AGENT_PRIVATE_KEY && process.env.AGENT_PRIVATE_KEY_PATH) {
-  try {
-    process.env.AGENT_PRIVATE_KEY = readFileSync(process.env.AGENT_PRIVATE_KEY_PATH, "utf-8").trim();
-  } catch (err) {
-    process.stderr.write(`[agentvalet] Cannot read AGENT_PRIVATE_KEY_PATH: ${err instanceof Error ? err.message : err}
-`);
-    process.exit(1);
-  }
-}
-var REQUIRED = ["AGENT_PRIVATE_KEY", "AGENT_ID", "OWNER_ID", "PROXY_URL"];
-for (const key of REQUIRED) {
-  if (!process.env[key]) {
-    process.stderr.write(`[agentvalet] Missing env var: ${key}
-`);
-    process.exit(1);
-  }
-}
-var AGENT_PRIVATE_KEY_RAW = process.env.AGENT_PRIVATE_KEY;
-var AGENT_ID = process.env.AGENT_ID;
-var OWNER_ID = process.env.OWNER_ID;
-var PROXY_URL = process.env.PROXY_URL.replace(/\/$/, "");
-var _privateKey = null;
-var _keyError = null;
-async function getPrivateKey() {
-  if (_keyError) throw new Error(_keyError);
-  if (_privateKey) return _privateKey;
-  if (AGENT_PRIVATE_KEY_RAW === "PENDING_FIRST_CALL") return null;
-  const raw = AGENT_PRIVATE_KEY_RAW.trim();
-  const pem = raw.startsWith("-----") ? raw.replace(/\\n/g, "\n") : `-----BEGIN PRIVATE KEY-----
-${raw}
------END PRIVATE KEY-----`;
-  try {
-    _privateKey = await importPKCS8(pem, "RS256");
-    return _privateKey;
-  } catch (err) {
-    _keyError = `Invalid private key: ${err instanceof Error ? err.message : err}`;
-    throw new Error(_keyError);
-  }
-}
-async function signJWT() {
-  const key = await getPrivateKey();
-  if (!key) throw new Error("Private key not loaded");
-  return new SignJWT({ agent_id: AGENT_ID, owner_id: OWNER_ID }).setProtectedHeader({ alg: "RS256" }).setIssuedAt().setExpirationTime("60s").sign(key);
-}
-function fetchWithTimeout(url, init, ms = 15e3) {
-  const ac = new AbortController();
-  const t = setTimeout(() => ac.abort(), ms);
-  return fetch(url, { ...init, signal: ac.signal }).finally(() => clearTimeout(t));
-}
-async function bearerFetch(url, init) {
-  const token = await signJWT();
-  return fetchWithTimeout(url, {
-    ...init,
-    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json", ...init.headers }
-  });
-}
-function errResult(msg) {
-  return { content: [{ type: "text", text: msg }], isError: true };
-}
-var ALLOWED_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE"];
-var server = new Server(
-  { name: "agentvalet", version: "1.0.0" },
-  { capabilities: { tools: {} } }
-);
-server.setRequestHandler(ListToolsRequestSchema, async () => ({
-  tools: [
-    {
-      name: "list_platforms",
-      description: "List the platforms and permission scopes this agent has access to.",
-      inputSchema: { type: "object", properties: {} }
-    },
-    {
-      name: "use_platform",
-      description: "Call an external platform API through the AgentValet proxy.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          platform: { type: "string", description: "Platform ID (e.g. slack, github)" },
-          endpoint: { type: "string", description: "API path on the target platform" },
-          method: { type: "string", enum: ["GET", "POST", "PUT", "PATCH", "DELETE"] },
-          scope: { type: "string", description: "Permission scope required" },
-          data: { type: "object", description: "Optional request body" }
-        },
-        required: ["platform", "endpoint", "method", "scope"]
-      }
-    }
-  ]
-}));
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  const { name, arguments: args } = request.params;
-  if (name === "list_platforms") {
-    if (AGENT_PRIVATE_KEY_RAW === "PENDING_FIRST_CALL") {
-      return errResult("Agent not yet activated \u2014 owner confirmation pending. Retry in 60 seconds.");
-    }
-    try {
-      const res = await bearerFetch(`${PROXY_URL}/v1/agent/permissions`, { method: "GET", headers: {} });
-      const body = await res.text();
-      if (!res.ok) return errResult(`Proxy error ${res.status}: ${body}`);
-      return { content: [{ type: "text", text: body }] };
-    } catch (e) {
-      return errResult(`Error: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-  if (name === "use_platform") {
-    if (AGENT_PRIVATE_KEY_RAW === "PENDING_FIRST_CALL") {
-      return errResult("Agent not yet activated \u2014 owner confirmation pending. Retry in 60 seconds.");
-    }
-    if (!args || typeof args.platform !== "string" || typeof args.endpoint !== "string" || typeof args.method !== "string" || typeof args.scope !== "string") {
-      return errResult("Missing required args: platform, endpoint, method, scope");
-    }
-    if (!ALLOWED_METHODS.includes(args.method)) return errResult(`Invalid method: ${args.method}`);
-    try {
-      const res = await bearerFetch(`${PROXY_URL}/v1/actions`, {
-        method: "POST",
-        body: JSON.stringify({
-          platform: args.platform,
-          endpoint: args.endpoint,
-          method: args.method,
-          scope: args.scope,
-          ...args.data !== void 0 && { data: args.data }
-        })
-      });
-      const body = await res.text();
-      if (!res.ok) return errResult(`Proxy error ${res.status}: ${body}`);
-      return { content: [{ type: "text", text: body }] };
-    } catch (e) {
-      return errResult(`Error: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-  return errResult(`Unknown tool: ${name}`);
-});
-var transport = new StdioServerTransport();
-await server.connect(transport);