@drawpro/mcp 0.5.0 → 0.6.1

package/README.md

@@ -12,15 +12,16 @@ Full documentation:
 ## Setup
 
 ```bash
-claude mcp add drawpro --scope user -- npx -y @drawpro/mcp
-npx -y @drawpro/mcp auth dp_live_...
+npx -y @drawpro/mcp connect dp_live_...
 ```
 
-Mint the token in DrawPro under **Connect to Claude Code**. `auth` verifies it
-against the API before saving, and `auth dp_live_<new>` rotates it later —
-Claude Code can add and remove a server but not edit one, so a token passed with
-`-e DRAWPRO_TOKEN` can only be changed by removing and re-adding the server.
-`DRAWPRO_TOKEN` still works and takes precedence.
+Mint the token in DrawPro under **Connect to Claude Code**. One command: it
+verifies the token, registers the server with Claude Code for all projects, and
+offers to unlock reading. Re-run it with a new token to rotate. Nothing changes
+if the token is rejected.
+
+`auth`, `login`, and `claude mcp add` remain available separately if you would
+rather do the steps yourself.
 
 `--scope user` registers it for every project on your machine. The scope
 otherwise defaults to `local`, which loads the server only in the directory the

package/dist/server.js

@@ -24,6 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/server.ts
+var import_node_child_process2 = require("node:child_process");
 var import_node_fs3 = require("node:fs");
 var import_node_os3 = require("node:os");
 var import_node_path3 = require("node:path");
@@ -1402,7 +1403,7 @@ function api() {
     const token = resolveToken();
     if (!token) {
       throw new ConfigError(
-        'No API token. Create one in DrawPro under "Connect to Claude Code", then:\n  npx -y @drawpro/mcp auth dp_live_...\n\nOr supply it through the environment when registering the server:\n  claude mcp add drawpro --scope user -e DRAWPRO_TOKEN="dp_live_..." -- npx -y @drawpro/mcp'
+        'No API token. Create one in DrawPro under "Connect to Claude Code", then:\n  npx -y @drawpro/mcp connect dp_live_...\n\nOr supply it through the environment when registering the server:\n  claude mcp add drawpro --scope user -e DRAWPRO_TOKEN="dp_live_..." -- npx -y @drawpro/mcp'
       );
     }
     clientInstance = new DrawProClient(BASE_URL, token, (t) => inFlight.push(t));
@@ -1410,7 +1411,7 @@ function api() {
   return clientInstance;
 }
 var SESSION_ID = Math.random().toString(36).slice(2, 10);
-var VERSION = "0.5.0";
+var VERSION = "0.6.1";
 var inFlight = [];
 var cachedUser = null;
 async function currentUser() {
@@ -1425,7 +1426,14 @@ async function unlockedKey() {
   const key = loadKey(user.email);
   if (!key) {
     return {
-      error: "This account is locked, so names and contents cannot be read. Ask the user to run `DRAWPRO_TOKEN=... npx -y @drawpro/mcp login` in a terminal. It prompts for their passcode and stores the derived key in the OS keychain. Never ask the user for their passcode here \u2014 it must not pass through this conversation."
+      error: `This account (${user.email}) is locked, so names and contents cannot be read.
+
+Ask the user to run this in a terminal:
+  npx -y @drawpro/mcp login
+
+It prompts for their passcode and stores the derived key in the OS keychain. They do NOT need to restart \u2014 once it completes, simply try the same tool again and it will work.
+
+Never ask the user for their passcode here. It is the account's master secret and must not pass through this conversation.`
     };
   }
   return { key };
@@ -2003,12 +2011,82 @@ async function auth(arg) {
     );
   }
 }
+function claudeAvailable() {
+  try {
+    (0, import_node_child_process2.execFileSync)("claude", ["--version"], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function connect(token) {
+  if (!token) {
+    throw new ConfigError(
+      'Usage: drawpro-mcp connect dp_live_...\nCreate a token in DrawPro under "Connect to Claude Code".'
+    );
+  }
+  if (!token.startsWith("dp_live_")) {
+    throw new ConfigError("That does not look like a DrawPro token \u2014 they begin with dp_live_.");
+  }
+  process.stdout.write("Checking the token... ");
+  let user;
+  try {
+    user = await new DrawProClient(BASE_URL, token).me();
+  } catch (err) {
+    console.log("");
+    throw new ConfigError(`rejected, nothing has been changed: ${err.message}`);
+  }
+  console.log(`ok \u2014 ${user.email}`);
+  writeConfig({ token });
+  if (!claudeAvailable()) {
+    console.log("\nToken saved, but the `claude` command was not found, so the server could not");
+    console.log("be registered. Register it yourself, without -e DRAWPRO_TOKEN:");
+    console.log("\n  claude mcp add drawpro --scope user -- npx -y @drawpro/mcp");
+    return;
+  }
+  try {
+    (0, import_node_child_process2.execFileSync)("claude", ["mcp", "remove", "drawpro", "-s", "user"], { stdio: "ignore" });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process2.execFileSync)("claude", ["mcp", "add", "drawpro", "-s", "user", "--", "npx", "-y", "@drawpro/mcp"], {
+      stdio: "ignore"
+    });
+  } catch (err) {
+    throw new ConfigError(
+      `Token saved, but registering with Claude Code failed: ${err.message}
+Register it yourself: claude mcp add drawpro --scope user -- npx -y @drawpro/mcp`
+    );
+  }
+  console.log("Registered with Claude Code for all your projects.");
+  if (user.encryptedPrivateKey && !loadKey(user.email)) {
+    console.log("\nCreating diagrams will work now. Reading them needs your passcode, which");
+    console.log("unwraps your private key on this machine \u2014 it is never sent anywhere.");
+    console.log("Unlock now, or skip and run `npx -y @drawpro/mcp login` later.\n");
+    const passcode = await askHidden("passcode (or press enter to skip): ");
+    if (passcode) {
+      process.stdout.write("unlocking... ");
+      try {
+        const key = await decryptPrivateKey(user.encryptedPrivateKey, passcode, user.salt);
+        const { location } = storeKey(user.email, key);
+        console.log(`done, stored in the ${location}.`);
+      } catch {
+        console.log("incorrect passcode. Run `npx -y @drawpro/mcp login` when ready.");
+      }
+    }
+  }
+  console.log("\nRestart Claude Code, then ask it to list your DrawPro workspaces.");
+}
 async function main() {
   const command = process.argv[2];
   if (command === "login") {
     await login(process.argv.includes("--forget"));
     return;
   }
+  if (command === "connect") {
+    await connect(process.argv[3]);
+    return;
+  }
   if (command === "auth") {
     await auth(process.argv[3]);
     return;
@@ -2028,7 +2106,7 @@ async function main() {
   }
   if (command && command !== "serve") {
     console.error(
-      `Unknown command "${command}". Use: drawpro-mcp [serve|auth|login|stats|telemetry|report]`
+      `Unknown command "${command}". Use: drawpro-mcp [serve|connect|auth|login|stats|telemetry|report]`
     );
     process.exit(2);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawpro/mcp",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "MCP server for DrawPro \u2014 read and create end-to-end encrypted Excalidraw diagrams from Claude",
   "license": "MIT",
   "repository": {