@agentvalet/register 0.4.20 → 0.5.1

package/dist/index.js

@@ -964,30 +964,6 @@ async function registerAgent2(params, apiKey) {
     clearTimeout(timeout);
   }
 }
-async function getAccount(apiKey) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 1e4);
-  try {
-    const response = await fetch(`${FUNCTIONS_URL2}/cli-account`, {
-      headers: {
-        ...baseHeaders,
-        "Authorization": `Bearer ${apiKey}`
-      },
-      signal: controller.signal
-    });
-    if (!response.ok) {
-      const error = await response.json().catch(() => ({}));
-      throw new Error(`Failed to fetch account: ${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);
-  }
-}
 
 // src/config/local.ts
 import { mkdir as mkdir2, writeFile as writeFile2, appendFile, readFile } from "fs/promises";
@@ -1131,45 +1107,114 @@ env = { AGENT_ID = "${params.agentId}", OWNER_ID = "${params.ownerId}", PROXY_UR
   }
   return written;
 }
+async function stripAgentvaletFromMcpJson(filePath) {
+  if (!existsSync5(filePath)) return false;
+  try {
+    const text = await readFile2(filePath, "utf8");
+    const config = JSON.parse(text);
+    const servers = config.mcpServers ?? {};
+    if (!servers.agentvalet) return false;
+    delete servers.agentvalet;
+    config.mcpServers = servers;
+    await writeFile4(filePath, JSON.stringify(config, null, 2) + "\n", "utf8");
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function cleanProjectScopedEntries() {
+  const cleaned = [];
+  const cwd = process.cwd();
+  if (await stripAgentvaletFromMcpJson(path4.join(cwd, ".mcp.json"))) {
+    cleaned.push(".mcp.json (project entry removed)");
+  }
+  if (await stripAgentvaletFromMcpJson(path4.join(cwd, ".cursor/mcp.json"))) {
+    cleaned.push(".cursor/mcp.json (project entry removed)");
+  }
+  const factoryProjectMcp = path4.join(cwd, ".factory/mcp.json");
+  if (existsSync5(factoryProjectMcp)) {
+    try {
+      const text = await readFile2(factoryProjectMcp, "utf8");
+      const config = JSON.parse(text);
+      if (config.agentvalet) {
+        delete config.agentvalet;
+        await writeFile4(factoryProjectMcp, JSON.stringify(config, null, 2) + "\n", "utf8");
+        cleaned.push(".factory/mcp.json (project entry removed)");
+      }
+    } catch {
+    }
+  }
+  return cleaned;
+}
 async function writeIdeConfigs(params) {
-  const { detected, ...mcpParams } = params;
+  const { detected, scope = "user", ...mcpParams } = params;
   const cwd = process.cwd();
+  const home = os.homedir();
   const written = [];
   const entry = buildMcpEntry(mcpParams);
-  if (detected.claudeCode) {
-    const claudeMcpPath = path4.join(cwd, ".mcp.json");
-    try {
-      await mergeJsonFile(claudeMcpPath, "agentvalet", entry);
-      written.push(".mcp.json");
-    } catch (err) {
-      console.warn(`  Warning: could not write .mcp.json: ${err.message}`);
+  if (scope === "user") {
+    if (detected.claudeCode) {
+      const claudeUserConfig = path4.join(home, ".claude.json");
+      try {
+        await mergeJsonFile(claudeUserConfig, "agentvalet", entry);
+        written.push("~/.claude.json");
+      } catch (err) {
+        console.warn(`  Warning: could not write ~/.claude.json: ${err.message}`);
+      }
     }
-    const claudeMdPath = path4.join(cwd, "CLAUDE.md");
-    if (!existsSync5(claudeMdPath)) {
+    if (detected.cursor) {
+      const cursorUserDir = path4.join(home, ".cursor");
+      const cursorUserMcp = path4.join(cursorUserDir, "mcp.json");
       try {
-        await writeFile4(claudeMdPath, buildClaudeMd(params.agentId, params.ownerId, params.proxyUrl), "utf8");
-        written.push("CLAUDE.md");
+        await mkdir3(cursorUserDir, { recursive: true });
+        await mergeJsonFile(cursorUserMcp, "agentvalet", entry);
+        written.push("~/.cursor/mcp.json");
       } catch (err) {
-        console.warn(`  Warning: could not write CLAUDE.md: ${err.message}`);
+        console.warn(`  Warning: could not write ~/.cursor/mcp.json: ${err.message}`);
       }
-    } else {
-      written.push("CLAUDE.md (already exists \u2014 skipped)");
     }
-  }
-  if (detected.cursor) {
-    const cursorDir = path4.join(cwd, ".cursor");
-    const cursorMcpPath = path4.join(cursorDir, "mcp.json");
-    try {
-      await mkdir3(cursorDir, { recursive: true });
-      await mergeJsonFile(cursorMcpPath, "agentvalet", entry);
-      written.push(".cursor/mcp.json");
-    } catch (err) {
-      console.warn(`  Warning: could not write .cursor/mcp.json: ${err.message}`);
+    if (detected.factoryDroid) {
+      const fdResults = await writeFactoryDroidConfig({ ...mcpParams, scope: "user" });
+      written.push(...fdResults);
+    }
+    const cleaned = await cleanProjectScopedEntries();
+    written.push(...cleaned);
+  } else {
+    if (detected.claudeCode) {
+      const claudeMcpPath = path4.join(cwd, ".mcp.json");
+      try {
+        await mergeJsonFile(claudeMcpPath, "agentvalet", entry);
+        written.push(".mcp.json");
+      } catch (err) {
+        console.warn(`  Warning: could not write .mcp.json: ${err.message}`);
+      }
+      const claudeMdPath = path4.join(cwd, "CLAUDE.md");
+      if (!existsSync5(claudeMdPath)) {
+        try {
+          await writeFile4(claudeMdPath, buildClaudeMd(params.agentId, params.ownerId, params.proxyUrl), "utf8");
+          written.push("CLAUDE.md");
+        } catch (err) {
+          console.warn(`  Warning: could not write CLAUDE.md: ${err.message}`);
+        }
+      } else {
+        written.push("CLAUDE.md (already exists \u2014 skipped)");
+      }
+    }
+    if (detected.cursor) {
+      const cursorDir = path4.join(cwd, ".cursor");
+      const cursorMcpPath = path4.join(cursorDir, "mcp.json");
+      try {
+        await mkdir3(cursorDir, { recursive: true });
+        await mergeJsonFile(cursorMcpPath, "agentvalet", entry);
+        written.push(".cursor/mcp.json");
+      } catch (err) {
+        console.warn(`  Warning: could not write .cursor/mcp.json: ${err.message}`);
+      }
+    }
+    if (detected.factoryDroid) {
+      const fdResults = await writeFactoryDroidConfig({ ...mcpParams, scope: "project" });
+      written.push(...fdResults);
     }
-  }
-  if (detected.factoryDroid) {
-    const fdResults = await writeFactoryDroidConfig(mcpParams);
-    written.push(...fdResults);
   }
   return written;
 }
@@ -1207,27 +1252,25 @@ async function writeFactoryDroidConfig(params) {
   const home = os.homedir();
   const written = [];
   const entry = buildMcpEntry(params);
+  const scope = params.scope ?? "user";
   const globalDir = path4.join(home, ".factory");
   const projectDir = path4.join(process.cwd(), ".factory");
-  const globalDirExists = existsSync5(globalDir);
-  const projectDirExists = existsSync5(projectDir);
-  if (globalDirExists) {
+  if (scope === "user") {
     try {
+      await mkdir3(globalDir, { recursive: true });
       await mergeFactoryDroidMcpJson(path4.join(globalDir, "mcp.json"), "agentvalet", entry);
       written.push("~/.factory/mcp.json");
     } catch (err) {
       console.warn(`  Warning: could not write ~/.factory/mcp.json: ${err.message}`);
     }
-  }
-  if (projectDirExists && !globalDirExists) {
+  } else {
     try {
+      await mkdir3(projectDir, { recursive: true });
       await mergeFactoryDroidMcpJson(path4.join(projectDir, "mcp.json"), "agentvalet", entry);
       written.push(".factory/mcp.json");
     } catch (err) {
       console.warn(`  Warning: could not write .factory/mcp.json: ${err.message}`);
     }
-  }
-  if (written.length > 0) {
     try {
       await updateGitignoreForFactoryDroid();
     } catch {
@@ -1315,7 +1358,8 @@ async function frameworkSetupConsent(detected) {
 import os3 from "os";
 import path6 from "path";
 import { writeFile as writeFile5 } from "fs/promises";
-async function runOnboard() {
+async function runOnboard(opts = {}) {
+  const scope = opts.scope ?? "user";
   console.log("");
   console.log(chalk7.bold("  AgentValet \u2014 Agent Registration"));
   console.log(chalk7.dim("  app.agentvalet.ai"));
@@ -1347,24 +1391,7 @@ async function runOnboard() {
       console.log(chalk7.dim("  Signed out. Run again to re-authenticate."));
       return;
     }
-    await registerAgentFlow(stored.cliToken, stored.ownerId);
-    return;
-  }
-  const { authMethod } = await prompts3({
-    type: "select",
-    name: "authMethod",
-    message: "How would you like to sign in?",
-    choices: [
-      { 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 account yet? Visit app.agentvalet.ai to sign up first"
-  });
-  if (authMethod === void 0) {
-    process.exit(0);
-  }
-  if (authMethod === "ownerid") {
-    await ownerIdFlow();
+    await registerAgentFlow(stored.cliToken, stored.ownerId, scope);
     return;
   }
   let credentials;
@@ -1384,42 +1411,9 @@ async function runOnboard() {
     email: credentials.email ?? "",
     cliToken: credentials.cliToken
   });
-  await registerAgentFlow(credentials.cliToken, credentials.ownerId);
-}
-async function ownerIdFlow() {
-  console.log("");
-  console.log(chalk7.dim("  Find your Owner ID at: ") + chalk7.cyan.underline("https://app.agentvalet.ai/settings"));
-  console.log("");
-  const { ownerId } = await prompts3({
-    type: "text",
-    name: "ownerId",
-    message: "Paste your Owner ID:",
-    validate: (v) => v.trim().length > 10 || "Owner ID looks too short"
-  });
-  if (ownerId === void 0) {
-    process.exit(0);
-  }
-  const spinner = ora("  Verifying Owner ID...").start();
-  let account;
-  try {
-    account = await getAccount(ownerId.trim());
-    spinner.succeed(`  Account verified \u2014 plan: ${chalk7.bold(account.plan)}`);
-  } catch (err) {
-    spinner.fail(`  Could not verify Owner ID: ${err.message}`);
-    console.log(chalk7.dim("  Make sure you copied the full Owner ID from app.agentvalet.ai/settings"));
-    process.exit(1);
-  }
-  saveConfig({
-    apiKey: account.owner_id,
-    ownerId: account.owner_id,
-    orgId: account.org_id,
-    proxyUrl: "https://api.agentvalet.ai",
-    email: account.email ?? "",
-    cliToken: account.cli_token
-  });
-  await registerAgentFlow(account.cli_token, account.owner_id);
+  await registerAgentFlow(credentials.cliToken, credentials.ownerId, scope);
 }
-async function registerAgentFlow(apiKey, ownerId) {
+async function registerAgentFlow(apiKey, ownerId, scope = "user") {
   const hostname = os3.hostname().split(".")[0];
   const dirName = process.cwd().split("/").pop() ?? process.cwd().split("\\").pop() ?? "agent";
   const { agentName } = await prompts3({
@@ -1492,7 +1486,8 @@ async function registerAgentFlow(apiKey, ownerId) {
       ownerId,
       proxyUrl,
       keyPath,
-      detected
+      detected,
+      scope
     });
     for (const r of ideResults) {
       console.log(chalk7.green(`  \u2713 ${r}`));
@@ -1506,26 +1501,22 @@ async function registerAgentFlow(apiKey, ownerId) {
     for (const r of globalResults) {
       console.log(chalk7.green(`  \u2713 ${r}`));
     }
-    if (detected.codex) {
-      writeAgentsMd();
-    }
-    if (detected.openclaw) {
-      writeSkillMd();
-    }
-    if (detected.factoryDroid) {
-      writeFactoryDroidDroid();
-      writeFactoryDroidCommand();
-      if (installReliabilityDroid) {
-        writeFactoryDroidReliabilityDroid();
+    if (scope === "project") {
+      if (detected.codex) writeAgentsMd();
+      if (detected.openclaw) writeSkillMd();
+      if (detected.factoryDroid) {
+        writeFactoryDroidDroid();
+        writeFactoryDroidCommand();
+        if (installReliabilityDroid) writeFactoryDroidReliabilityDroid();
       }
+      writeQuickstartDoc({
+        agentId: agent.agent_id,
+        ownerId,
+        proxyUrl,
+        keyPath,
+        detected
+      });
     }
-    writeQuickstartDoc({
-      agentId: agent.agent_id,
-      ownerId,
-      proxyUrl,
-      keyPath,
-      detected
-    });
     ensureMcpServer();
   } else if (shouldSetup === false) {
     console.log("");
@@ -1553,22 +1544,35 @@ async function registerAgentFlow(apiKey, ownerId) {
   console.log(chalk7.dim("  Approve this agent in your dashboard to activate it."));
   console.log("");
   if (shouldSetup) {
-    if (detected.claudeCode) {
-      console.log(chalk7.yellow("  \u26A0 Claude Code: project MCPs require trust on first run."));
-      console.log(chalk7.dim("      In your Claude Code session, run:  /mcp"));
-      console.log(chalk7.dim('      Approve "agentvalet" to load the tools.'));
+    if (scope === "user") {
+      const restartList = [];
+      if (detected.claudeCode) restartList.push("Claude Code");
+      if (detected.cursor) restartList.push("Cursor");
+      if (detected.factoryDroid) restartList.push("Factory Droid");
+      if (detected.codex) restartList.push("Codex CLI");
+      if (restartList.length > 0) {
+        console.log(chalk7.dim("  Restart these to pick up the new MCP server (no trust prompt \u2014 user-scoped):"));
+        for (const r of restartList) console.log(chalk7.dim(`      ${r}`));
+        console.log("");
+      }
+    } else {
+      if (detected.claudeCode) {
+        console.log(chalk7.yellow("  \u26A0 Claude Code: project MCPs require trust on first run."));
+        console.log(chalk7.dim("      In your Claude Code session, run:  /mcp"));
+        console.log(chalk7.dim('      Approve "agentvalet" to load the tools.'));
+        console.log("");
+      }
+      if (detected.cursor) {
+        console.log(chalk7.dim("  Cursor: restart Cursor (or reopen the workspace) to pick up the MCP."));
+      }
+      if (detected.factoryDroid) {
+        console.log(chalk7.dim("  Factory Droid: restart Factory to pick up the MCP."));
+      }
+      if (detected.codex) {
+        console.log(chalk7.dim("  Codex CLI: start a new codex session to pick up the MCP."));
+      }
       console.log("");
     }
-    if (detected.cursor) {
-      console.log(chalk7.dim("  Cursor: restart Cursor (or reopen the workspace) to pick up the MCP."));
-    }
-    if (detected.factoryDroid) {
-      console.log(chalk7.dim("  Factory Droid: restart Factory to pick up the MCP."));
-    }
-    if (detected.codex) {
-      console.log(chalk7.dim("  Codex CLI: start a new codex session to pick up the MCP."));
-    }
-    console.log("");
   }
   console.log("  Useful commands:");
   console.log(chalk7.dim("    npx @agentvalet/register          \u2014 register another agent"));
@@ -1900,8 +1904,10 @@ function cleanLocally() {
   if (stripMcpJson(resolve3(".mcp.json"))) stripped.push(".mcp.json");
   if (stripMcpJson(resolve3(".cursor/mcp.json"))) stripped.push(".cursor/mcp.json");
   if (stripMcpJson(resolve3(".factory/mcp.json"), { wrapped: false })) stripped.push(".factory/mcp.json");
-  const homeFactoryMcp = join2(homedir2(), ".factory", "mcp.json");
-  if (stripMcpJson(homeFactoryMcp, { wrapped: false })) stripped.push("~/.factory/mcp.json");
+  const home = homedir2();
+  if (stripMcpJson(join2(home, ".claude.json"))) stripped.push("~/.claude.json");
+  if (stripMcpJson(join2(home, ".cursor", "mcp.json"))) stripped.push("~/.cursor/mcp.json");
+  if (stripMcpJson(join2(home, ".factory", "mcp.json"), { wrapped: false })) stripped.push("~/.factory/mcp.json");
   if (stripCodexToml()) stripped.push("~/.codex/config.toml");
   stripClaudeMd();
   stripSettingsJson();
@@ -2090,7 +2096,8 @@ async function claimToken(installToken) {
   return body;
 }
 function installCommand() {
-  return new Command5("install").description("Claim an agent created in the dashboard using a one-time install token").argument("<token>", "install token (itok_...) from the dashboard").option("--no-frameworks", "skip IDE/framework configuration prompts").action(async (token, opts) => {
+  return new Command5("install").description("Claim an agent created in the dashboard using a one-time install token").argument("<token>", "install token (itok_...) from the dashboard").option("--no-frameworks", "skip IDE/framework configuration prompts").option("--project", "write project-scoped configs (.mcp.json, .cursor/mcp.json) instead of user-scoped (~/.claude.json, ~/.cursor/mcp.json)").action(async (token, opts) => {
+    const scope = opts.project ? "project" : "user";
     if (!token.startsWith("itok_")) {
       console.error(chalk12.red('Invalid install token. Tokens start with "itok_".'));
       process.exit(3);
@@ -2150,7 +2157,8 @@ function installCommand() {
           ownerId: owner_id,
           proxyUrl: proxy_url,
           keyPath: AGENT_KEY_PATH,
-          detected
+          detected,
+          scope
         });
         for (const r of ideResults) console.log(chalk12.green(`  \u2713 ${r}`));
         const globalResults = await writeGlobalFrameworkConfigs({
@@ -2160,20 +2168,22 @@ function installCommand() {
           keyPath: AGENT_KEY_PATH
         });
         for (const r of globalResults) console.log(chalk12.green(`  \u2713 ${r}`));
-        if (detected.codex) writeAgentsMd();
-        if (detected.openclaw) writeSkillMd();
-        if (detected.factoryDroid) {
-          writeFactoryDroidDroid();
-          writeFactoryDroidCommand();
-          if (installReliabilityDroid) writeFactoryDroidReliabilityDroid();
+        if (scope === "project") {
+          if (detected.codex) writeAgentsMd();
+          if (detected.openclaw) writeSkillMd();
+          if (detected.factoryDroid) {
+            writeFactoryDroidDroid();
+            writeFactoryDroidCommand();
+            if (installReliabilityDroid) writeFactoryDroidReliabilityDroid();
+          }
+          writeQuickstartDoc({
+            agentId: agent_id,
+            ownerId: owner_id,
+            proxyUrl: proxy_url,
+            keyPath: AGENT_KEY_PATH,
+            detected
+          });
         }
-        writeQuickstartDoc({
-          agentId: agent_id,
-          ownerId: owner_id,
-          proxyUrl: proxy_url,
-          keyPath: AGENT_KEY_PATH,
-          detected
-        });
         ensureMcpServer();
       }
     }
@@ -2198,20 +2208,33 @@ function installCommand() {
     console.log("");
     if (opts.frameworks !== false) {
       const detected = detectFrameworks();
-      if (detected.claudeCode) {
-        console.log(chalk12.yellow("  \u26A0 Claude Code: project MCPs require trust on first run."));
-        console.log(chalk12.dim("      In your Claude Code session, run:  /mcp"));
-        console.log(chalk12.dim('      Approve "agentvalet" to load the tools.'));
-        console.log("");
-      }
-      if (detected.cursor) {
-        console.log(chalk12.dim("  Cursor: restart Cursor (or reopen the workspace) to pick up the MCP."));
-      }
-      if (detected.factoryDroid) {
-        console.log(chalk12.dim("  Factory Droid: restart Factory to pick up the MCP."));
-      }
-      if (detected.codex) {
-        console.log(chalk12.dim("  Codex CLI: start a new codex session to pick up the MCP."));
+      if (scope === "user") {
+        const restartList = [];
+        if (detected.claudeCode) restartList.push("Claude Code");
+        if (detected.cursor) restartList.push("Cursor");
+        if (detected.factoryDroid) restartList.push("Factory Droid");
+        if (detected.codex) restartList.push("Codex CLI");
+        if (restartList.length > 0) {
+          console.log(chalk12.dim("  Restart these to pick up the new MCP server (no trust prompt \u2014 user-scoped):"));
+          for (const r of restartList) console.log(chalk12.dim(`      ${r}`));
+          console.log("");
+        }
+      } else {
+        if (detected.claudeCode) {
+          console.log(chalk12.yellow("  \u26A0 Claude Code: project MCPs require trust on first run."));
+          console.log(chalk12.dim("      In your Claude Code session, run:  /mcp"));
+          console.log(chalk12.dim('      Approve "agentvalet" to load the tools.'));
+          console.log("");
+        }
+        if (detected.cursor) {
+          console.log(chalk12.dim("  Cursor: restart Cursor (or reopen the workspace) to pick up the MCP."));
+        }
+        if (detected.factoryDroid) {
+          console.log(chalk12.dim("  Factory Droid: restart Factory to pick up the MCP."));
+        }
+        if (detected.codex) {
+          console.log(chalk12.dim("  Codex CLI: start a new codex session to pick up the MCP."));
+        }
       }
     }
     console.log(`  Dashboard: ${chalk12.cyan.underline("https://app.agentvalet.ai/agents/" + agent_id)}`);
@@ -2227,14 +2250,14 @@ function collectScope(value, previous) {
   return [...previous, value];
 }
 var program = new Command6();
-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("--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("--json", "Machine-readable JSON output").option("--no-wait", "Register only, do not wait for approval").option("--timeout <seconds>", "Approval wait timeout in seconds", "300").option("--project", "Write project-scoped MCP configs (.mcp.json, .cursor/mcp.json) instead of user-scoped (~/.claude.json, ~/.cursor/mcp.json)").action(async (opts) => {
   const isJson = !!opts.json;
   let ownerId = opts.owner ?? process.env.AGENTVALET_OWNER ?? "";
   let agentName = opts.name ?? "";
   let description = opts.description ?? "";
   let scopes = opts.scope;
   if (!ownerId && !isAuthenticated()) {
-    await runOnboard();
+    await runOnboard({ scope: opts.project ? "project" : "user" });
     return;
   }
   if (!agentName) {

package/package.json

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