drafted 1.13.0 → 1.14.0

package/install-mcp.sh

@@ -227,7 +227,17 @@ if [ -n "$STALE_DRAFTED_BIN" ]; then
   fi
 fi
 
-npm config set prefix "$NPM_GLOBAL_PREFIX" >/dev/null
+# Do NOT `npm config set prefix` — that repoints the user's GLOBAL npm prefix, so every
+# `npm install -g <pkg>` they ever run lands in our dir AND our uninstall (`rm -rf ~/.drafted`)
+# would wipe all their other globals. Install drafted with an explicit per-command --prefix
+# instead (below), and HEAL any global prefix pin an older version of this installer wrote so
+# the user's default is restored. Preserve every other ~/.npmrc line (auth tokens, etc.).
+NPMRC="${npm_config_userconfig:-$HOME/.npmrc}"
+if [ -f "$NPMRC" ] && grep -Eq '^[[:space:]]*prefix[[:space:]]*=.*/\.drafted/npm-global/?[[:space:]]*$' "$NPMRC"; then
+  tmp_npmrc="$(mktemp)"
+  grep -Ev '^[[:space:]]*prefix[[:space:]]*=.*/\.drafted/npm-global/?[[:space:]]*$' "$NPMRC" > "$tmp_npmrc" && cat "$tmp_npmrc" > "$NPMRC"
+  rm -f "$tmp_npmrc"
+fi
 export PATH="$NPM_GLOBAL_PREFIX/bin:$PATH"
 
 # Persist the prefix's bin dir at the FRONT of PATH for future shells — without
@@ -262,7 +272,7 @@ step "Installing Drafted"
 install_drafted_pkg() {
   attempts=5; delay=4; n=1
   while :; do
-    if npm install -g drafted@latest --force; then return 0; fi
+    if npm install -g drafted@latest --force --prefix "$NPM_GLOBAL_PREFIX"; then return 0; fi
     if [ "$n" -ge "$attempts" ]; then return 1; fi
     echo -e "    ${YELLOW}npm install failed (attempt $n/$attempts) — retrying in ${delay}s (a new release may still be propagating to the npm CDN)...${RESET}"
     sleep "$delay"
@@ -274,7 +284,7 @@ if ! install_drafted_pkg; then
   exit 1
 fi
 hash -r 2>/dev/null || true
-NPM_ROOT="$(npm root -g 2>/dev/null || true)"
+NPM_ROOT="$(npm root -g --prefix "$NPM_GLOBAL_PREFIX" 2>/dev/null || true)"
 MCP_SERVER_MODULE="$NPM_ROOT/drafted/mcp/server.mjs"
 if [ -n "$NPM_ROOT" ] && [ -f "$MCP_SERVER_MODULE" ]; then
   node -e "import('node:url').then(({ pathToFileURL }) => import(pathToFileURL(process.argv[1]).href)).then(() => process.exit(0), (err) => { console.error(err); process.exit(1); })" "$MCP_SERVER_MODULE"
@@ -1288,7 +1298,7 @@ echo ""
 echo -e "  ${DIM}MCP name:${RESET}  ${BOLD}$INSTALL_NAME${RESET}"
 echo -e "  ${DIM}Server:${RESET}    ${BOLD}$INSTALL_SERVER${RESET}"
 echo -e "  ${DIM}To update production:${RESET}  rerun curl -fsSL https://drafted.live/install.sh | bash"
-echo -e "  ${DIM}To uninstall:${RESET}  npm uninstall -g drafted && rm -rf ~/.drafted"
+echo -e "  ${DIM}To uninstall:${RESET}  npm uninstall -g drafted --prefix ~/.drafted/npm-global && rm -rf ~/.drafted"
 echo ""
 echo -e "${YELLOW}${BOLD}"
 echo "  ┌─────────────────────────────────────────────────────────┐"

package/mcp/server.mjs

@@ -1462,10 +1462,85 @@ async function consumePendingDeviceCode() {
 // meaningless and disruptive — it returns spurious sign-in URLs and, on login,
 // spawns a server-side browser-open and blocks polling until timeout. Register
 // it only on stdio.
-if (!isRemote) tool('auth', 'Sign in to Drafted. `action=get_link` returns a verification URL immediately (use for SSH/headless/tmux where a browser may not open) and starts background polling; after the user opens the link, later Drafted tool calls also auto-consume the approved login. `action=login` opens a browser when needed and explicitly waits/polls for approval. If get_link was called first, login reuses that pending code instead of opening a new browser.', {
+// --- Local-install auth surface: the desktop app, never a device link ---
+// The stdio installer ALWAYS installs the Drafted desktop app alongside the MCP, so on a
+// local install the app IS the sign-in surface. Spawning it hands off to the always-running
+// instance (single-instance plugin), which opens the sign-in window and starts the native
+// cookie->auth.json capture that this MCP reads via getBootstrapSessionId(). Only the web MCP
+// is app-less, and that path authenticates via OAuth2 in the browser — never this tool. The
+// device-code flow below is kept ONLY as a fallback for platforms without the desktop app.
+function desktopAppBinary() {
+  try {
+    if (process.platform === 'darwin') {
+      const p = '/Applications/Drafted.app/Contents/MacOS/drafted-desktop';
+      return existsSync(p) ? p : null;
+    }
+    if (process.platform === 'win32') {
+      const p = join(process.env.LOCALAPPDATA || '', 'Programs', 'Drafted', 'Drafted.exe');
+      return existsSync(p) ? p : null;
+    }
+  } catch { /* fall through to no-app */ }
+  return null; // e.g. Linux — no desktop app → device-code fallback
+}
+
+async function launchDesktopSignin() {
+  const bin = desktopAppBinary();
+  if (!bin) return false;
+  try {
+    const { spawn } = await import('child_process');
+    // If the app is already running (macOS KeepAlive normally guarantees it), the single-instance
+    // handler opens the sign-in window and DRAFTED_OPEN_LOGIN is ignored. If it isn't running,
+    // the fresh primary instance honors DRAFTED_OPEN_LOGIN=1 and opens sign-in on boot.
+    const child = spawn(bin, [], {
+      detached: true,
+      stdio: 'ignore',
+      env: { ...process.env, DRAFTED_OPEN_LOGIN: '1' },
+    });
+    child.unref();
+    return true;
+  } catch { return false; }
+}
+
+// Poll auth.json (written by the desktop app's cookie->auth.json bridge on in-app sign-in)
+// until a valid session id lands or the deadline passes.
+async function waitForBootstrapAuth(deadline) {
+  while (Date.now() < deadline) {
+    const sid = getBootstrapSessionId();
+    if (sid) return sid;
+    await new Promise(r => setTimeout(r, 1500));
+  }
+  return null;
+}
+
+if (!isRemote) tool('auth', 'Sign in to Drafted. On a local install the DESKTOP APP is the sign-in surface: both actions open the Drafted app to its sign-in window — no device link is shown. `action=login` opens the app and waits for the in-app sign-in to complete; `action=get_link` opens the app and returns immediately (the next Drafted tool call picks up the captured session). A device-code link is used ONLY as a fallback on platforms without the desktop app (the web MCP uses OAuth2, not this tool).', {
   action: z.enum(['get_link', 'login']).describe('Operation to perform.'),
 }, async ({ action }) => {
   try {
+    // Local install → open the desktop app's sign-in window (no link). Falls through to the
+    // device-code flow below only when no desktop app is installed on this platform.
+    {
+      const existing = getState().sessionId || getBootstrapSessionId();
+      if (existing) {
+        try {
+          const meRes = await serverFetch(`${getServerUrl()}/auth/me`, { headers: { Cookie: `gc_session=${existing}` } });
+          if (meRes.ok) {
+            const me = await meRes.json();
+            return ok({ status: 'already_authenticated', userId: me.userId, email: me.userEmail, org: me.currentOrg?.name });
+          }
+        } catch { /* stale session — continue to sign-in */ }
+      }
+      if (await launchDesktopSignin()) {
+        if (action === 'get_link') {
+          return ok('Opening the Drafted app to sign in — approve in the app window, then retry your request.');
+        }
+        const sid = await waitForBootstrapAuth(Date.now() + 180000);
+        if (!sid) throw new Error('Timed out waiting for sign-in. Complete sign-in in the Drafted app window, then retry.');
+        getState().sessionId = null;
+        await cloneSession();
+        connectAgentWs();
+        return ok({ status: 'logged_in', via: 'desktop-app' });
+      }
+    }
     if (action === 'get_link') {
       const codeRes = await serverFetch(`${getServerUrl()}/auth/device/code`, { method: 'POST' });
       if (!codeRes.ok) throw new Error(`Failed to start device authorization (HTTP ${codeRes.status})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Drafted — visual thinking surface for humans and AI agents. Renders HTML, markdown, images, and code as frames on a zoomable canvas, with MCP tools for AI agents and real-time sync for humans.",
   "type": "module",
   "files": [