@drawpro/mcp 0.4.1 → 0.6.0

package/README.md

@@ -3,13 +3,25 @@
 Local MCP server for DrawPro. Lets Claude read and create diagrams in your
 account from Claude Code, Claude Desktop, or any MCP client.
 
+Full documentation:
+[setup](https://github.com/deBilla/drawpro/blob/main/docs/connect-claude-code.md) ·
+[tools](https://github.com/deBilla/drawpro/blob/main/docs/mcp-tools.md) ·
+[diagram specs](https://github.com/deBilla/drawpro/blob/main/docs/diagram-specs.md) ·
+[privacy](https://github.com/deBilla/drawpro/blob/main/docs/privacy.md)
+
 ## Setup
 
 ```bash
-claude mcp add drawpro --scope user -e DRAWPRO_TOKEN="dp_live_..." -- npx -y @drawpro/mcp
+npx -y @drawpro/mcp connect dp_live_...
 ```
 
-Mint the token in DrawPro under **Connect to Claude Code**.
+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");
@@ -430,6 +431,9 @@ function installId() {
 function telemetryEnabled() {
   return readConfig().telemetry === "on";
 }
+function resolveToken() {
+  return process.env.DRAWPRO_TOKEN || readConfig().token;
+}
 
 // ../diagram/src/ids.ts
 var import_fractional_indexing = require("fractional-indexing");
@@ -1396,10 +1400,10 @@ var ConfigError = class extends Error {
 var clientInstance = null;
 function api() {
   if (!clientInstance) {
-    const token = process.env.DRAWPRO_TOKEN;
+    const token = resolveToken();
     if (!token) {
       throw new ConfigError(
-        'DRAWPRO_TOKEN is not set. Create a token in DrawPro under "Connect to Claude Code", then:\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));
@@ -1407,7 +1411,7 @@ function api() {
   return clientInstance;
 }
 var SESSION_ID = Math.random().toString(36).slice(2, 10);
-var VERSION = "0.4.1";
+var VERSION = "0.6.0";
 var inFlight = [];
 var cachedUser = null;
 async function currentUser() {
@@ -1960,12 +1964,126 @@ function maybeSendInBackground() {
     if (ok) writeConfig({ lastReportAt: (/* @__PURE__ */ new Date()).toISOString() });
   });
 }
+async function auth(arg) {
+  if (arg === "--forget") {
+    writeConfig({ token: void 0 });
+    console.log("Token cleared.");
+    return;
+  }
+  if (!arg) {
+    const current = readConfig().token;
+    const fromEnv = Boolean(process.env.DRAWPRO_TOKEN);
+    if (fromEnv) {
+      console.log("Using DRAWPRO_TOKEN from the environment, which takes precedence.");
+    } else if (current) {
+      console.log(`Stored token: ${current.slice(0, 16)}\u2026`);
+    } else {
+      console.log("No token stored.");
+    }
+    console.log("\n  drawpro-mcp auth dp_live_...   store or replace it");
+    console.log("  drawpro-mcp auth --forget      clear it");
+    return;
+  }
+  if (!arg.startsWith("dp_live_")) {
+    throw new ConfigError("That does not look like a DrawPro token \u2014 they begin with dp_live_.");
+  }
+  const probe = new DrawProClient(BASE_URL, arg);
+  let email;
+  try {
+    email = (await probe.me()).email;
+  } catch (err) {
+    throw new ConfigError(
+      `That token was rejected, so it has not been saved: ${err.message}`
+    );
+  }
+  writeConfig({ token: arg });
+  console.log(`Token saved for ${email}.`);
+  if (process.env.DRAWPRO_TOKEN) {
+    console.log(
+      "\nNote: DRAWPRO_TOKEN is also set in this environment and takes precedence.\nRemove it from the MCP registration for the stored token to be used."
+    );
+  }
+}
+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;
+  }
   if (command === "telemetry") {
     await telemetry(process.argv[3]);
     return;
@@ -1981,7 +2099,7 @@ async function main() {
   }
   if (command && command !== "serve") {
     console.error(
-      `Unknown command "${command}". Use: drawpro-mcp [serve|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.4.1",
+  "version": "0.6.0",
   "description": "MCP server for DrawPro \u2014 read and create end-to-end encrypted Excalidraw diagrams from Claude",
   "license": "MIT",
   "repository": {