@agentvalet/register 0.4.14 → 0.4.15

package/dist/index.js

@@ -9,7 +9,7 @@ import {
 } from "./chunk-2EFPJNYK.js";
 
 // src/index.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { Command as Command5 } from "commander";
 import chalk12 from "chalk";
 
@@ -840,97 +840,108 @@ import chalk7 from "chalk";
 import ora from "ora";
 import prompts3 from "prompts";
 
-// src/auth/github-device-flow.ts
-import { createOAuthDeviceAuth } from "@octokit/auth-oauth-device";
+// src/auth/browser-flow.ts
+import { createServer } from "http";
+import { createRequire } from "module";
 import open from "open";
 import chalk4 from "chalk";
-var GITHUB_CLIENT_ID = process.env.AGENTVALET_GITHUB_CLIENT_ID ?? "Ov23liQcaW0HcqJxmLfF";
-async function authenticateWithGitHub() {
-  const auth = createOAuthDeviceAuth({
-    clientType: "oauth-app",
-    clientId: GITHUB_CLIENT_ID,
-    scopes: ["user:email", "read:user"],
-    onVerification(verification) {
-      console.log("");
-      console.log(chalk4.bold("  Authenticate with GitHub"));
-      console.log("");
-      console.log(`  1. Open: ${chalk4.cyan.underline(verification.verification_uri)}`);
-      console.log(`  2. Enter code: ${chalk4.bold.yellow(verification.user_code)}`);
-      console.log("");
-      open(verification.verification_uri).catch(() => {
-        console.log(chalk4.dim("  (Could not open browser \u2014 navigate to the URL above manually)"));
-      });
-      console.log(chalk4.dim("  Waiting for authorisation..."));
-    }
+var _require = createRequire(import.meta.url);
+var FUNCTIONS_URL = "https://jmodblrolfoavrxqgbps.supabase.co/functions/v1";
+var SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imptb2RibHJvbGZvYXZyeHFnYnBzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzQwODIzNzYsImV4cCI6MjA4OTY1ODM3Nn0.xQQiYHXbDsHyiTd5TsAfXtNWBUGkT4eO7Ew9UH8n6UE";
+var APP_URL = "https://app.agentvalet.ai";
+var CALLBACK_TIMEOUT_MS = 12e4;
+async function findFreePort() {
+  return new Promise((resolve4, reject) => {
+    const server = createServer();
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
+        reject(new Error("Could not bind port"));
+        return;
+      }
+      const port = addr.port;
+      server.close(() => resolve4(port));
+    });
+    server.on("error", reject);
   });
-  const tokenAuth = await auth({ type: "oauth" });
-  return {
-    token: tokenAuth.token,
-    scopes: tokenAuth.scopes ?? []
-  };
 }
-async function getGitHubUser(token) {
-  const response = await fetch("https://api.github.com/user", {
+async function callCliAuth(body) {
+  const res = await fetch(`${FUNCTIONS_URL}/cli-auth`, {
+    method: "POST",
     headers: {
-      Authorization: `Bearer ${token}`,
-      Accept: "application/vnd.github.v3+json"
-    }
+      "Content-Type": "application/json",
+      "apikey": SUPABASE_ANON_KEY
+    },
+    body: JSON.stringify(body)
   });
-  if (!response.ok) {
-    throw new Error(`GitHub API error: ${response.status}`);
-  }
-  const user = await response.json();
-  if (!user.email) {
-    const emailsResponse = await fetch("https://api.github.com/user/emails", {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        Accept: "application/vnd.github.v3+json"
+  const json = await res.json();
+  if (!res.ok) throw new Error(json.error ?? `HTTP ${res.status}`);
+  return json;
+}
+async function browserLogin() {
+  const state = crypto.randomUUID();
+  const port = await findFreePort();
+  await callCliAuth({ action: "init", state, port });
+  const codePromise = new Promise((resolve4, reject) => {
+    const server = createServer((req, res) => {
+      const url = new URL(req.url ?? "/", `http://127.0.0.1:${port}`);
+      if (url.pathname !== "/callback") {
+        res.writeHead(404);
+        res.end();
+        return;
       }
+      const code2 = url.searchParams.get("code");
+      res.writeHead(200, { "Content-Type": "text/html" });
+      res.end(
+        "<!doctype html><html><head><title>AgentValet CLI</title><style>body{font-family:system-ui,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#060e1a;color:rgba(255,255,255,.87)}h2{margin:0 0 8px}p{margin:0;color:rgba(255,255,255,.45);font-size:14px}</style></head><body><div style='text-align:center'><h2 style='color:#34c97b'>&#10003; Authorized</h2><p>You can close this tab and return to your terminal.</p></div></body></html>"
+      );
+      server.close();
+      if (code2) resolve4(code2);
+      else reject(new Error("No code in callback URL"));
     });
-    if (emailsResponse.ok) {
-      const emails = await emailsResponse.json();
-      user.email = emails.find((e) => e.primary && e.verified)?.email ?? emails[0]?.email ?? null;
-    }
-  }
-  return user;
+    server.listen(port, "127.0.0.1");
+    server.on("error", (err) => reject(err));
+    setTimeout(() => {
+      server.close();
+      reject(new Error("Timed out waiting for browser authorization (2 min)"));
+    }, CALLBACK_TIMEOUT_MS);
+  });
+  const authUrl = `${APP_URL}/cli-auth?state=${state}&port=${port}`;
+  console.log(chalk4.dim(`
+  Opening browser to authorize...`));
+  console.log(chalk4.dim(`  URL: ${authUrl}
+`));
+  await open(authUrl).catch(() => {
+    console.log(chalk4.yellow(`  Could not open browser automatically.`));
+    console.log(chalk4.yellow(`  Please open this URL in your browser:
+`));
+    console.log(`  ${authUrl}
+`);
+  });
+  const code = await codePromise;
+  const result = await callCliAuth({ action: "exchange", state, code });
+  return {
+    ownerId: result.owner_id,
+    orgId: result.org_id ?? null,
+    cliToken: result.cli_token,
+    email: result.email ?? null,
+    proxyUrl: result.proxy_url ?? "https://api.agentvalet.ai"
+  };
 }
 
 // src/api/agentvalet.ts
 var SUPABASE_URL = "https://jmodblrolfoavrxqgbps.supabase.co";
-var SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imptb2RibHJvbGZvYXZyeHFnYnBzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzQwODIzNzYsImV4cCI6MjA4OTY1ODM3Nn0.xQQiYHXbDsHyiTd5TsAfXtNWBUGkT4eO7Ew9UH8n6UE";
-var FUNCTIONS_URL = `${SUPABASE_URL}/functions/v1`;
+var SUPABASE_ANON_KEY2 = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imptb2RibHJvbGZvYXZyeHFnYnBzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzQwODIzNzYsImV4cCI6MjA4OTY1ODM3Nn0.xQQiYHXbDsHyiTd5TsAfXtNWBUGkT4eO7Ew9UH8n6UE";
+var FUNCTIONS_URL2 = `${SUPABASE_URL}/functions/v1`;
 var baseHeaders = {
   "Content-Type": "application/json",
-  "apikey": SUPABASE_ANON_KEY
+  "apikey": SUPABASE_ANON_KEY2
 };
-async function createOrFindAccount(params) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 1e4);
-  try {
-    const response = await fetch(`${FUNCTIONS_URL}/cli-account`, {
-      method: "POST",
-      headers: baseHeaders,
-      body: JSON.stringify(params),
-      signal: controller.signal
-    });
-    if (!response.ok) {
-      const error = await response.json().catch(() => ({}));
-      throw new Error(`Account setup failed: ${response.status} ${error.error ?? ""}`);
-    }
-    return response.json();
-  } catch (err) {
-    clearTimeout(timeout);
-    if (err?.name === "AbortError") throw new Error("Request timed out \u2014 is the AgentValet API reachable?");
-    throw err;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
 async function registerAgent2(params, apiKey) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 1e4);
   try {
-    const response = await fetch(`${FUNCTIONS_URL}/cli-register-agent`, {
+    const response = await fetch(`${FUNCTIONS_URL2}/cli-register-agent`, {
       method: "POST",
       headers: {
         ...baseHeaders,
@@ -956,7 +967,7 @@ async function getAccount(apiKey) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 1e4);
   try {
-    const response = await fetch(`${FUNCTIONS_URL}/cli-account`, {
+    const response = await fetch(`${FUNCTIONS_URL2}/cli-account`, {
       headers: {
         ...baseHeaders,
         "Authorization": `Bearer ${apiKey}`
@@ -1343,10 +1354,10 @@ async function runOnboard() {
     name: "authMethod",
     message: "How would you like to sign in?",
     choices: [
-      { title: "Sign in with GitHub  (opens browser)", value: "github" },
+      { title: "Sign in with your browser  (opens app.agentvalet.ai)", value: "browser" },
       { title: "Paste Owner ID from app.agentvalet.ai/settings", value: "ownerid" }
     ],
-    hint: "No GitHub account? Choose the second option after signing up at app.agentvalet.ai"
+    hint: "No account yet? Visit app.agentvalet.ai to sign up first"
   });
   if (authMethod === void 0) {
     process.exit(0);
@@ -1355,65 +1366,24 @@ async function runOnboard() {
     await ownerIdFlow();
     return;
   }
-  let spinner = ora();
-  let githubToken;
+  let credentials;
   try {
-    const result = await authenticateWithGitHub();
-    githubToken = result.token;
+    credentials = await browserLogin();
   } catch (err) {
-    console.error(chalk7.red(`  \u2717 Authentication failed: ${err.message}`));
-    process.exit(1);
-  }
-  spinner = ora("  Fetching your GitHub profile...").start();
-  let githubUser;
-  try {
-    githubUser = await getGitHubUser(githubToken);
-    spinner.succeed(`  GitHub: ${chalk7.bold("@" + githubUser.login)}`);
-  } catch (err) {
-    spinner.fail(`  Failed to fetch GitHub profile: ${err.message}`);
-    process.exit(1);
-  }
-  if (!githubUser.email) {
-    const { email } = await prompts3({
-      type: "text",
-      name: "email",
-      message: "Your email address (not visible on GitHub):",
-      validate: (v) => v.includes("@") || "Please enter a valid email"
-    });
-    if (email === void 0) {
-      process.exit(0);
-    }
-    githubUser.email = email;
-  }
-  spinner = ora("  Setting up your AgentValet account...").start();
-  let account;
-  try {
-    account = await createOrFindAccount({
-      github_token: githubToken,
-      github_username: githubUser.login,
-      email: githubUser.email,
-      display_name: githubUser.name ?? githubUser.login,
-      avatar_url: githubUser.avatar_url
-    });
-    if (account.is_new_account) {
-      spinner.succeed("  AgentValet account created");
-    } else {
-      spinner.succeed("  Existing AgentValet account found");
-    }
-  } catch (err) {
-    spinner.fail(`  Account setup failed: ${err.message}`);
+    console.error(chalk7.red(`
+  \u2717 Authentication failed: ${err.message}`));
     process.exit(1);
   }
+  console.log(chalk7.green(`  \u2713 Signed in${credentials.email ? " as " + chalk7.bold(credentials.email) : ""}`));
   saveConfig({
-    apiKey: account.owner_id,
-    ownerId: account.owner_id,
-    orgId: account.org_id,
-    proxyUrl: account.proxy_url,
-    githubUsername: githubUser.login,
-    email: githubUser.email,
-    cliToken: account.cli_token
+    apiKey: credentials.ownerId,
+    ownerId: credentials.ownerId,
+    orgId: credentials.orgId ?? void 0,
+    proxyUrl: credentials.proxyUrl,
+    email: credentials.email ?? "",
+    cliToken: credentials.cliToken
   });
-  await registerAgentFlow(account.cli_token, account.owner_id);
+  await registerAgentFlow(credentials.cliToken, credentials.ownerId);
 }
 async function ownerIdFlow() {
   console.log("");
@@ -2013,7 +1983,7 @@ function uninstallCommand() {
 }
 
 // src/index.ts
-var require2 = createRequire(import.meta.url);
+var require2 = createRequire2(import.meta.url);
 var { version } = require2("../package.json");
 function collectScope(value, previous) {
   return [...previous, value];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentvalet/register",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "description": "Self-register AI agents with AgentValet",
   "type": "module",
   "bin": {
@@ -10,13 +10,6 @@
     "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",
@@ -55,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"
+  }
+}