drafted 1.19.17 → 1.19.19

package/cli/drafted.mjs

@@ -300,10 +300,24 @@ async function readApiGet(command, apiPath, org) {
     // A valid session now targets the server it was minted for (see getServerUrl),
     // so a 401/403 here means the credential is genuinely missing/expired — surface
     // an actionable next step instead of the bare server "Unauthenticated" string.
-    if (res.status === 401 || res.status === 403) {
+    // THE SERVER'S MESSAGE WINS. This used to replace every 401/403 with "your
+    // session is missing or expired — run `drafted login`", which is a guess. A
+    // valid, signed-in session that simply had not been NAMED yet returns 403
+    // {code:'session_unnamed'} with the exact remedy in the body — and that got
+    // discarded and reported as an auth failure, sending readers off to re-run a
+    // device-code login that could never fix it. Only invent a message when the
+    // server sent none.
+    // A bare `{"error":"Unauthenticated"}` explains nothing, so the actionable
+    // auth message is genuinely better. A body with a `code` is the server
+    // naming a SPECIFIC condition (session_unnamed, and anything added later)
+    // and usually carrying its own remedy — replacing that is what sent the last
+    // reader off to re-run a login that could not have helped.
+    const serverNamedTheReason = typeof data?.code === 'string' && data.code && data.code !== 'unauthenticated';
+    if ((res.status === 401 || res.status === 403) && !serverNamedTheReason) {
       msg = `Not authenticated for ${serverUrl} — your Drafted session is missing or expired. `
-        + `Run \`drafted login\` to sign in. `
-        + `The CLI and MCP share ${DEFAULT_AUTH_FILE}, so signing in once works for both.`;
+        + `If you are a person at a terminal: run \`drafted login\`. `
+        + `If you are an agent: call the Drafted MCP auth tool with action="get_link" and give the URL to your user — you cannot complete a sign-in yourself. `
+        + `Either way the approval lands in ${DEFAULT_AUTH_FILE}, which the CLI and MCP share.`;
     }
     jsonOut(false, command, msg);
     console.error(`❌ ${msg}`);

package/mcp/server.mjs

@@ -2082,12 +2082,33 @@ async function waitForBootstrapAuth(deadline, staleSid) {
   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).', {
+if (!isRemote) tool('auth', 'Sign in to Drafted.\n\n`action=get_link` ALWAYS returns a sign-in URL. This is the action to use when you are an agent: you cannot complete a sign-in, so put the URL in your reply and stop — the human opens it in their own browser, approves, and your next Drafted call picks up the session. Approval also writes ~/.drafted/auth.json, so the `drafted` CLI is signed in too.\n\n`action=login` signs in and WAITS for it to land, opening the desktop app when one is installed. Use it only when a human is watching this terminal.\n\n(The web MCP uses OAuth2 and does not have 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.
+    // get_link's ONE job is to return a URL a human can click. It runs before the
+    // already-authenticated check and before the desktop app on purpose:
+    //   - an agent cannot complete a sign-in, so handing back a link is the only
+    //     safe shape — the human clicks it out of band, in their own browser;
+    //   - "already authenticated" is about THIS MCP's session, which says nothing
+    //     about the CLI's on-disk credential, so short-circuiting on it used to
+    //     make the link unobtainable exactly when it was needed;
+    //   - opening the desktop app returns no link at all, which is useless to an
+    //     agent that must put something in its reply.
+    // Approval writes ~/.drafted/auth.json, so the CLI picks it up too.
+    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})`);
+      const data = await codeRes.json();
+      persistPendingDeviceCode(data);
+      return ok({
+        signInUrl: data.verificationUrl,
+        instruction: 'Give this URL to the user and stop. They open it in their own browser and approve; you cannot complete this for them. Retry your request afterwards — the next Drafted call picks up the approved session.',
+        expiresInSeconds: data.expiresIn ?? null,
+      });
+    }
+    // `login` waits for the sign-in to land, so the desktop app is the better
+    // surface when one is installed: no code to type.
     {
       const activeSession = getState().sessionId;
       const bootstrapSession = getBootstrapSessionId();
@@ -2108,9 +2129,6 @@ if (!isRemote) tool('auth', 'Sign in to Drafted. On a local install the DESKTOP
       }
       const staleSid = getBootstrapSessionId();
       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, staleSid);
         if (!sid) throw new Error('Timed out waiting for sign-in. Complete sign-in in the Drafted app window, then retry.');
         getState().sessionId = null;
@@ -2129,13 +2147,6 @@ if (!isRemote) tool('auth', 'Sign in to Drafted. On a local install the DESKTOP
         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})`);
-      const data = await codeRes.json();
-      persistPendingDeviceCode(data);
-      return ok(data.verificationUrl);
-    }
     if (action === 'login') {
       // Prefer the active request session (injected by runWithRequestState on
       // remote, or cloneSession on stdio) over the on-disk bootstrap session, so
@@ -3802,7 +3813,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
 // Agents reach the repos table through this tool. Content stays in git;
 // Drafted keeps a read-only index. `add`/`rescan` mutate; `list`/`entries`
 // are read-only and paginated with a compact mode (collection rule).
-tool('repo', 'Registered git repos — the org index of .agents/ skills + identities. A connected repo is the source of truth for its skills (git owns content, Drafted renders + indexes). Dispatch by `action`:\n- `list` — the org\'s linked repos (paginated, compact mode).\n\nLINKING AND UNLINKING ARE NOT HERE. A person does them in the Drafted UI (Settings > Organization > GitHub to connect an account, then the folder menu), because linking moves a folder\'s wiki + skills into git and makes Drafted read-only for them. Agents read and rescan; they do not change who owns the content.\n- `rescan` — re-fetch the tracked branch and refresh the index.\n- `entries` — search the index across all the org\'s repos (skills + identities).\n\nAuthoring a Drafted skill whose slug collides with a repo-indexed skill returns 409 repo_owned pointing at the repo — commit to git instead.', {
+tool('repo', 'Registered git repos — the org index of .agents/ skills + identities. A connected repo is the source of truth for its skills (git owns content, Drafted renders + indexes). Dispatch by `action`:\n- `list` — the org\'s linked repos (paginated, compact mode).\n- `entries` — search the index across all the org\'s repos (skills + identities).\n- `rescan` — re-fetch the tracked branch and refresh the index.\n\nLINKING AND UNLINKING ARE NOT HERE. A person does them in the Drafted UI (Settings > Organization > GitHub to connect an account, then the folder menu), because linking moves a folder\'s wiki + skills into git and makes Drafted read-only for them. Agents read and rescan; they do not change who owns the content.\n\nAuthoring a Drafted skill whose slug collides with a repo-indexed skill returns 409 repo_owned pointing at the repo — commit to git instead.', {
   action: z.enum(['list', 'entries', 'rescan']).describe('list: the org\'s connected repos; entries: search the git index across them; rescan: re-fetch a tracked branch and refresh its index.'),
   slug: z.string().optional().describe('[rescan] the repo slug or UUID.'),
   repoId: z.string().optional().describe('[rescan] repo UUID (alternative to slug).'),

package/package.json

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