drafted 1.19.55 → 1.20.0

package/cli/drafted.mjs

@@ -394,11 +394,46 @@ program
   .command('login')
   .description('Authenticate with Drafted')
   .option('--server <url>', 'Server URL (or set DRAFTED_SERVER env var)')
+  .option('--link <code>', 'Link this computer with the one-time code from the Get set up page (no browser step)')
   .action(async (options) => {
     if (options.server) {
       process.env.DRAFTED_SERVER = options.server;
     }
 
+    // A link code names the account explicitly, so it REPLACES any existing
+    // login rather than deferring to it: the user just asked for this account.
+    if (options.link) {
+      const serverUrl = getServerUrl();
+      let data = null;
+      for (let attempt = 1; attempt <= 3 && !data; attempt++) {
+        try {
+          const res = await fetch(`${serverUrl}/auth/device/token`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ deviceCode: String(options.link).trim() }),
+          });
+          if (res.ok) data = await res.json();
+        } catch { /* network blip: retry */ }
+        if (!data && attempt < 3) await new Promise((r) => setTimeout(r, 2000));
+      }
+      if (data?.status !== 'approved') {
+        jsonOut(false, 'login', 'Link code expired or already used');
+        console.error('❌ That link code has expired or was already used.');
+        console.error('   Copy a fresh install command from the Get set up page on drafted.live.');
+        process.exit(1);
+      }
+      writeAuth({
+        sessionId: data.sessionId,
+        userId: data.userId || null,
+        orgId: data.orgId || null,
+        server: serverUrl,
+        updatedAt: new Date().toISOString(),
+      });
+      jsonOut(true, 'login', { sessionId: data.sessionId, userId: data.userId || null });
+      console.log('✅ This computer is linked to your Drafted account.');
+      return;
+    }
+
     const existing = readAuth();
     if (existing && existing.sessionId) {
       // Validate session is still valid server-side

package/install-mcp.sh

@@ -16,6 +16,7 @@ INSTALL_MODE="production"
 INSTALL_NAME="${DRAFTED_MCP_NAME:-drafted}"
 INSTALL_SERVER="${DRAFTED_SERVER:-$SERVER}"
 INSTALL_AUTH_FILE="${DRAFTED_AUTH_FILE:-}"
+LINK_CODE=""
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -39,8 +40,13 @@ while [ $# -gt 0 ]; do
       INSTALL_AUTH_FILE="$2"
       shift 2
       ;;
+    --link)
+      LINK_CODE="$2"
+      shift 2
+      ;;
     --help|-h)
-      echo "Usage: install-mcp.sh [--local] [--server URL] [--name MCP_NAME] [--auth-file PATH]"
+      echo "Usage: install-mcp.sh [--local] [--server URL] [--name MCP_NAME] [--auth-file PATH] [--link CODE]"
+      echo "  --link: one-time code from the Get set up page; links this computer to that account"
       echo "  default: installs production MCP named drafted -> https://drafted.live"
       echo "  --local: installs duplicate MCP named drafted-local -> http://localhost:3477"
       exit 0
@@ -297,6 +303,19 @@ else
 fi
 ok "Installed $(drafted --version 2>/dev/null || echo 'drafted') via npm"
 
+# The Get set up page's command carries a one-time link code for the account that
+# showed it, so the computer links without a browser hop (which could land in a
+# different account's browser). Single use, 15 minutes; failure is not fatal, the
+# agent can still sign in on first use.
+if [ -n "$LINK_CODE" ]; then
+  step "Linking this computer to your account"
+  if DRAFTED_SERVER="$INSTALL_SERVER" drafted login --link "$LINK_CODE"; then
+    ok "Linked"
+  else
+    echo -e "    ${YELLOW}Not linked. Your agent will ask you to sign in the first time it uses Drafted.${RESET}"
+  fi
+fi
+
 # ── Configure ─────────────────────────────────────────────────────
 
 step "Connecting to your tools"
@@ -1318,13 +1337,62 @@ echo -e "  ${DIM}Server:${RESET}    ${BOLD}$INSTALL_SERVER${RESET}"
 echo -e "  ${DIM}To update production:${RESET}  rerun the installer from drafted.live/install (curl -fsSL https://drafted.live/install.sh -o /tmp/install-drafted.sh && bash /tmp/install-drafted.sh)"
 echo -e "  ${DIM}To uninstall:${RESET}  npm uninstall -g drafted --prefix ~/.drafted/npm-global && rm -rf ~/.drafted"
 echo ""
-echo -e "${YELLOW}${BOLD}"
-echo "  ┌─────────────────────────────────────────────────────────┐"
-echo "  │                                                         │"
-echo "  │   >>>  RESTART YOUR EDITOR TO ACTIVATE DRAFTED  <<<     │"
-echo "  │                                                         │"
-echo "  │   Close and reopen Claude Desktop, Claude Code,         │"
-echo "  │   Codex, or Cursor so it picks up the new MCP server.   │"
-echo "  │                                                         │"
-echo "  └─────────────────────────────────────────────────────────┘"
-echo -e "${RESET}"
+# ── Hand-off: start the first session ───────────────────────────
+# Interactive production installs only. A fresh agent process loads the new MCP,
+# so no restart is needed, and onboard-drafted is what turns the install into a
+# first project. Without this the user is left at a banner, not knowing what to
+# type next. Anything unusual (no agent CLI, no terminal, a "no") falls back to it.
+handoff_to_agent() {
+  # DRAFTED_TTY lets tests/install-handoff.test.ts play the terminal.
+  local tty="${DRAFTED_TTY:-/dev/tty}"
+  [ "$INSTALL_MODE" = "production" ] && [ "${DRAFTED_HEADLESS:-}" != "1" ] || return 1
+  [ -n "${DRAFTED_TTY:-}" ] || [ -t 1 ] || return 1
+  # One descriptor for every answer, so a scripted terminal is read line by line.
+  exec 4<"$tty" 2>/dev/null || return 1
+  local agents=() agent="" reply
+  command -v claude >/dev/null 2>&1 && agents+=(claude)
+  command -v codex >/dev/null 2>&1 && agents+=(codex)
+  [ ${#agents[@]} -gt 0 ] || return 1
+  step "Start your first project"
+  read -r -p "    Start it now in your agent? [Y/n] " reply <&4 || reply="n"
+  case "$reply" in [nN]*) return 1 ;; esac
+  if [ ${#agents[@]} -eq 1 ]; then
+    agent="${agents[0]}"
+  else
+    read -r -p "    Which agent do you use? 1) Claude Code  2) Codex [1] " reply <&4 || reply=""
+    case "$reply" in 2*) agent="codex" ;; *) agent="claude" ;; esac
+  fi
+  if [ ! -s "$HOME/.drafted/auth.json" ]; then
+    echo -e "    Signing in to Drafted (a browser tab opens; approve it there)"
+    DRAFTED_SERVER="$INSTALL_SERVER" drafted login <"$tty" || return 1
+  fi
+  local url="$INSTALL_SERVER/?setup=1"
+  echo -e "    Opening your surface: ${BOLD}$url${RESET}"
+  echo -e "    ${DIM}Signed up in a different browser or a private window? Open that link there.${RESET}"
+  if command -v open >/dev/null 2>&1; then open "$url" >/dev/null 2>&1 || true
+  elif command -v xdg-open >/dev/null 2>&1; then xdg-open "$url" >/dev/null 2>&1 || true
+  fi
+  if [ "$agent" = "claude" ]; then
+    echo -e "    Starting Claude Code with ${BOLD}/drafted:onboard-drafted${RESET}..."
+    exec claude "/drafted:onboard-drafted" <"$tty"
+  fi
+  # Codex has no namespaced slash command for it: pass the command's own text.
+  local cmd_file="${PLUGIN_SRC:-}/commands/onboard-drafted.md" prompt="Run the Drafted onboarding (the onboard-drafted command)."
+  if [ -f "$cmd_file" ]; then
+    prompt="$(awk 'BEGIN{fm=0} /^---$/{fm++; next} fm>=2' "$cmd_file" | sed 's/\$ARGUMENTS//g')"
+  fi
+  echo -e "    Starting Codex with the Drafted onboarding..."
+  exec codex "$prompt" <"$tty"
+}
+handoff_to_agent || {
+  echo -e "${YELLOW}${BOLD}"
+  echo "  ┌─────────────────────────────────────────────────────────┐"
+  echo "  │                                                         │"
+  echo "  │   >>>  RESTART YOUR EDITOR TO ACTIVATE DRAFTED  <<<     │"
+  echo "  │                                                         │"
+  echo "  │   Close and reopen Claude Desktop, Claude Code,         │"
+  echo "  │   Codex, or Cursor so it picks up the new MCP server.   │"
+  echo "  │                                                         │"
+  echo "  └─────────────────────────────────────────────────────────┘"
+  echo -e "${RESET}"
+}

package/mcp/gws-status.mjs

@@ -0,0 +1,31 @@
+// Local-capability probe for the Get set up page (see mcp/server.mjs, agent-capabilities).
+// Its own module so tests can import it without opening the MCP WebSocket.
+import { execFile } from 'child_process';
+import { homedir } from 'os';
+import { join } from 'path';
+
+/**
+ * Is Google's Workspace CLI signed in for this user, with Gmail readable?
+ * 'ready' | 'signed_out' | 'absent'. Checks the Drafted npm prefix first (where
+ * `drafted google-setup` installs it, and which a GUI-launched agent's PATH may
+ * lack), then PATH. Anything that is not Google's gws (Homebrew's `gws` is an
+ * unrelated tool) prints non-JSON and reads as 'absent'.
+ */
+export function gwsStatusFromJson(stdout) {
+  try {
+    const j = JSON.parse(stdout);
+    return j.has_refresh_token && (j.scopes || []).some((x) => String(x).includes('/auth/gmail')) ? 'ready' : 'signed_out';
+  } catch {
+    return 'absent';
+  }
+}
+export function detectGwsStatus({ candidates = [join(homedir(), '.drafted', 'npm-global', 'bin', 'gws'), 'gws'] } = {}) {
+  const tryOne = (i) => new Promise((resolve) => {
+    if (i >= candidates.length) return resolve('absent');
+    execFile(candidates[i], ['auth', 'status'], { timeout: 5000, windowsHide: true }, (err, stdout) => {
+      if (err && (err.code === 'ENOENT' || err.code === 'EACCES')) return resolve(tryOne(i + 1));
+      resolve(gwsStatusFromJson(String(stdout || '')));
+    });
+  });
+  return tryOne(0).catch(() => 'absent');
+}

package/mcp/server.mjs

@@ -13,6 +13,7 @@ import { createHash } from 'node:crypto';
 import { readFileSync, existsSync, realpathSync, writeFileSync, mkdirSync, unlinkSync, appendFileSync, readdirSync, statSync } from 'fs';
 import { join, dirname, basename, extname, resolve } from 'path';
 import { homedir, platform, release as osRelease, arch as osArch } from 'os';
+import { detectGwsStatus } from './gws-status.mjs';
 import { fileURLToPath } from 'url';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { z } from 'zod';
@@ -1801,6 +1802,11 @@ async function connectAgentWs() {
     // suggestedName (basename of the working directory) lets the server offer it in the
     // name-before-work gate message and as the tab placeholder.
     try { agentWs.send(JSON.stringify({ type: 'agent-hello', agentLabel: getAgentLabel(), suggestedName: getSuggestedSessionName() })); } catch {}
+    // Local capabilities for the Get set up page: only a status word, never the
+    // Google account, scopes or client. Same open-race guard as the hello.
+    if (!isRemote) detectGwsStatus().then((gws) => {
+      try { if (agentWs?.readyState === 1) agentWs.send(JSON.stringify({ type: 'agent-capabilities', gws })); } catch {}
+    });
     // Same open-race guard as the hello above: the socket can leave 'open' before
     // this second send lands, and an unguarded throw here kills the stdio child
     // (taking the agent's whole MCP connection with it) for a presence message.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.19.55",
+  "version": "1.20.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": [