agent-gate-installer 1.4.1 → 1.5.0

package/bin/install.mjs

@@ -9,6 +9,7 @@ import { homedir, platform } from "node:os";
 const CLAUDE_HOME = join(homedir(), ".claude");
 const INSTALL_DIR = join(CLAUDE_HOME, "agent-gate");
 const SETTINGS_PATH = join(CLAUDE_HOME, "settings.json");
+const CLAUDE_JSON_PATH = join(homedir(), ".claude.json");
 const REPO_URL = "https://github.com/jl-cmd/agent-gate.git";
 const MINIMUM_PYTHON_VERSION = [3, 11];
 const IS_WINDOWS = platform() === "win32";
@@ -129,7 +130,35 @@ function registerMcpServer(settings, venvPython) {
     command: venvPython,
     args: [join(INSTALL_DIR, "src", "agent_gate", "server.py")],
   };
-  log("  + Registered agent-gate MCP server");
+  log("  + Registered agent-gate MCP server in settings.json");
+}
+
+function readClaudeJson() {
+  if (!existsSync(CLAUDE_JSON_PATH)) return {};
+  const raw = readFileSync(CLAUDE_JSON_PATH, "utf8");
+  try {
+    return JSON.parse(raw);
+  } catch {
+    log(`  ! ${CLAUDE_JSON_PATH} contains malformed JSON, skipping MCP registration there.`);
+    return null;
+  }
+}
+
+function writeClaudeJson(data) {
+  writeFileSync(CLAUDE_JSON_PATH, JSON.stringify(data, null, 4) + "\n", "utf8");
+}
+
+function registerMcpInClaudeJson(venvPython) {
+  const data = readClaudeJson();
+  if (data === null) return;
+  data.mcpServers = data.mcpServers || {};
+  data.mcpServers["agent-gate"] = {
+    type: "stdio",
+    command: venvPython,
+    args: [join(INSTALL_DIR, "src", "agent_gate", "server.py")],
+  };
+  writeClaudeJson(data);
+  log("  + Registered agent-gate MCP server in ~/.claude.json");
 }
 
 function writeMcpConfigFile(venvPython) {
@@ -183,6 +212,7 @@ async function install() {
   const venvPython = getVenvPython(venvDirectory);
 
   writeMcpConfigFile(venvPython);
+  registerMcpInClaudeJson(venvPython);
 
   if (existsSync(join(INSTALL_DIR, ".git"))) {
     log("  ~ agent-gate already cloned, pulling latest...");

package/bin/install.test.mjs

@@ -1,21 +1,38 @@
 #!/usr/bin/env node
 
 /**
- * Tests for writeMcpConfigFile behavior in install.mjs.
+ * Tests for install.mjs MCP registration behavior.
  *
- * Verifies that /tmp/agent-gate-mcp-config.json is written even when
- * earlier install steps (clone, venv, pip) fail.
+ * Verifies that:
+ * - /tmp/agent-gate-mcp-config.json is written even when install fails early
+ * - ~/.claude.json gets mcpServers entry for agent-gate
  */
 
 import { existsSync, readFileSync, rmSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { execSync } from "node:child_process";
+import { homedir } from "node:os";
 
 const MCP_CONFIG_PATH = "/tmp/agent-gate-mcp-config.json";
+const CLAUDE_JSON_PATH = join(homedir(), ".claude.json");
 let passed = 0;
 let failed = 0;
 
-function cleanup() {
+let claudeJsonBackup = null;
+
+function backupClaudeJson() {
+  if (existsSync(CLAUDE_JSON_PATH)) {
+    claudeJsonBackup = readFileSync(CLAUDE_JSON_PATH, "utf8");
+  }
+}
+
+function restoreClaudeJson() {
+  if (claudeJsonBackup !== null) {
+    writeFileSync(CLAUDE_JSON_PATH, claudeJsonBackup, "utf8");
+  }
+}
+
+function cleanupMcpConfig() {
   try { rmSync(MCP_CONFIG_PATH); } catch { /* ok */ }
 }
 
@@ -30,10 +47,9 @@ function assert(condition, message) {
 }
 
 // --- Test 1: writeMcpConfigFile writes correct content ---
-console.log("\nTest 1: writeMcpConfigFile writes correct JSON");
-cleanup();
+console.log("\nTest 1: writeMcpConfigFile writes correct JSON to /tmp");
+cleanupMcpConfig();
 {
-  // Inline the function logic to test it in isolation
   const venvPython = "/root/.claude/agent-gate/.venv/bin/python";
   const INSTALL_DIR = "/root/.claude/agent-gate";
   const config = {
@@ -58,14 +74,12 @@ cleanup();
     "Args point to server.py"
   );
 }
-cleanup();
+cleanupMcpConfig();
 
-// --- Test 2: Simulate install failure — MCP config should still be written ---
-console.log("\nTest 2: MCP config written even when install exits early");
-cleanup();
+// --- Test 2: MCP config written even when install exits early ---
+console.log("\nTest 2: /tmp MCP config written even when install exits early");
+cleanupMcpConfig();
 {
-  // Run the installer with a bad GH_TOKEN in non-interactive mode.
-  // The clone step will fail, but we want the MCP config to exist.
   try {
     execSync(
       `GH_TOKEN=bad_token node "${join(import.meta.dirname, "install.mjs")}" --non-interactive`,
@@ -77,38 +91,73 @@ cleanup();
 
   assert(
     existsSync(MCP_CONFIG_PATH),
-    "MCP config file exists after failed install (written before clone)"
+    "/tmp MCP config exists after failed install (written before clone)"
   );
 }
-cleanup();
+cleanupMcpConfig();
 
-// --- Test 3: Simulate install with existing clone but broken pip ---
-console.log("\nTest 3: MCP config written even when pip install fails");
-cleanup();
+// --- Test 3: ~/.claude.json gets mcpServers on failed install ---
+console.log("\nTest 3: ~/.claude.json gets mcpServers even when install fails");
+backupClaudeJson();
+cleanupMcpConfig();
 {
-  // Create a fake INSTALL_DIR so clone is skipped, but venv/pip will fail
-  const fakeInstallDir = "/tmp/agent-gate-test-install";
-  try { rmSync(fakeInstallDir, { recursive: true }); } catch { /* ok */ }
-  mkdirSync(join(fakeInstallDir, ".git"), { recursive: true });
-
   try {
     execSync(
-      `HOME=/tmp/agent-gate-test-home GH_TOKEN=x node "${join(import.meta.dirname, "install.mjs")}" --non-interactive`,
-      { encoding: "utf8", stdio: "pipe", timeout: 30000, env: { ...process.env, HOME: "/tmp/agent-gate-test-home" } }
+      `GH_TOKEN=bad_token node "${join(import.meta.dirname, "install.mjs")}" --non-interactive`,
+      { encoding: "utf8", stdio: "pipe", timeout: 30000 }
     );
   } catch {
-    // Expected — install fails at venv/pip step
+    // Expected — install fails at clone step
   }
 
+  let claudeJsonHasMcp = false;
+  try {
+    const data = JSON.parse(readFileSync(CLAUDE_JSON_PATH, "utf8"));
+    claudeJsonHasMcp = data.mcpServers?.["agent-gate"]?.type === "stdio";
+  } catch { /* ok */ }
+
   assert(
-    existsSync(MCP_CONFIG_PATH),
-    "MCP config file exists after pip failure (written before pip)"
+    claudeJsonHasMcp,
+    "~/.claude.json has agent-gate mcpServers entry after failed install"
   );
+}
+restoreClaudeJson();
+cleanupMcpConfig();
+
+// --- Test 4: ~/.claude.json preserves existing data ---
+console.log("\nTest 4: ~/.claude.json preserves existing data when adding mcpServers");
+backupClaudeJson();
+cleanupMcpConfig();
+{
+  // Write a known state to ~/.claude.json
+  const existing = { someExistingKey: "preserved", mcpServers: { "other-server": { type: "http" } } };
+  writeFileSync(CLAUDE_JSON_PATH, JSON.stringify(existing, null, 4) + "\n", "utf8");
+
+  try {
+    execSync(
+      `GH_TOKEN=bad_token node "${join(import.meta.dirname, "install.mjs")}" --non-interactive`,
+      { encoding: "utf8", stdio: "pipe", timeout: 30000 }
+    );
+  } catch {
+    // Expected
+  }
+
+  let preserved = false;
+  let hasAgentGate = false;
+  let hasOtherServer = false;
+  try {
+    const data = JSON.parse(readFileSync(CLAUDE_JSON_PATH, "utf8"));
+    preserved = data.someExistingKey === "preserved";
+    hasAgentGate = data.mcpServers?.["agent-gate"]?.type === "stdio";
+    hasOtherServer = data.mcpServers?.["other-server"]?.type === "http";
+  } catch { /* ok */ }
 
-  try { rmSync(fakeInstallDir, { recursive: true }); } catch { /* ok */ }
-  try { rmSync("/tmp/agent-gate-test-home", { recursive: true }); } catch { /* ok */ }
+  assert(preserved, "Existing keys preserved in ~/.claude.json");
+  assert(hasAgentGate, "agent-gate MCP server added");
+  assert(hasOtherServer, "Pre-existing MCP server not removed");
 }
-cleanup();
+restoreClaudeJson();
+cleanupMcpConfig();
 
 // --- Summary ---
 console.log(`\n${passed} passed, ${failed} failed\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-gate-installer",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "One-command installer for agent-gate prompt evaluation gate",
   "type": "module",
   "bin": {