drafted 1.11.34 → 1.11.36

package/mcp/server.mjs

@@ -701,12 +701,12 @@ function schedulePendingAuthPoll(delayMs = 2000) {
 }
 
 // Cookie for normal tool operations. Deliberately uses ONLY this instance's
-// per-process session (getState().sessionId) and never the shared root login in
-// ~/.drafted/auth.json. The root is a *credential for minting child sessions*
-// (see cloneSession): every agent process on the machine reads the same root, so
-// operating on it directly is exactly what let one agent's get_org switch move
-// every other agent's active org. ensureSession() guarantees a per-instance
-// session before any operation runs.
+// MCP requests carry a cloned child session (getState().sessionId) minted from the
+// shared root login in ~/.drafted/auth.json. NOTE: org isolation is per-REQUEST via
+// the X-Drafted-Org header (server: effectiveOrgId), NOT via the session — the old
+// "clone per process so one agent's org switch doesn't move another's" model is
+// DEPRECATED. The clone remains only to give the agent a stable surface identity
+// (one playful tab name across reconnects/restarts — see cloneSession).
 function getAuthHeaders() {
   const sid = getState().sessionId;
   const headers = {};
@@ -719,22 +719,21 @@ function getAuthHeaders() {
   return headers;
 }
 
-// Mint a fresh per-instance child session from the shared root login and bind it
-// to this process. The root session id (getBootstrapSessionId) is shared by every
-// agent on this machine via ~/.drafted/auth.json; the clone gives THIS process its
-// own server-side session so its active org/project stay isolated from other
-// agents. Returns true once a per-instance session is set.
+// Mint (or reuse) a child session from the shared root login. The server dedups by
+// (user, agentKey), so the SAME session comes back across reconnects/restarts → one
+// stable surface + one playful tab name. Org isolation is per-request (X-Drafted-Org),
+// NOT per-session, so reusing one child session across processes is safe.
 async function cloneSession() {
   if (getState().sessionId) return true;
   const bootstrapId = getBootstrapSessionId();
   if (!bootstrapId) return false;
 
   try {
-    // A named agent (DRAFTED_AGENT_NAME) gets a STABLE child session: the server
-    // returns the same session for the same (user, agentKey) across reconnects, so a
-    // restarted agent reconnects its existing named session instead of churning a new
-    // one. Anonymous clients send no key and keep a fresh-per-process session.
-    const agentKey = (process.env.DRAFTED_AGENT_NAME || '').trim();
+    // Named agents key on DRAFTED_AGENT_NAME; anonymous agents key on the root login
+    // id (stable per machine) so they ALSO keep one stable session/name across restarts
+    // instead of churning a fresh session every process. (Org is per-request, so a
+    // shared child session does NOT cause cross-agent org clobbering.)
+    const agentKey = (process.env.DRAFTED_AGENT_NAME || '').trim() || bootstrapId;
     const res = await fetch(`${getServerUrl()}/auth/session/clone`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', Cookie: `gc_session=${bootstrapId}` },
@@ -1056,8 +1055,10 @@ async function connectAgentWs() {
   agentWs.on('close', () => {
     console.error('[MCP-WS] Disconnected, reconnecting in 5s...');
     agentWs = null;
-    // Server may have restarted — invalidate session so ensureSession re-clones
-    getState().sessionId = null;
+    // KEEP the cloned sessionId across disconnects/reconnects. Sessions live in Postgres
+    // and survive server restarts, so reusing the clone keeps this agent's surface (and
+    // its playful tab name) stable across blips — otherwise every reconnect re-clones a
+    // fresh session → a NEW greyed tab with a NEW name. A real 401 still triggers re-clone.
     clearTimeout(agentWsReconnectTimer);
     agentWsReconnectTimer = setTimeout(() => {
       connectAgentWs().catch((e) => {
@@ -1314,8 +1315,8 @@ async function consumePendingDeviceCode() {
     const data = await res.json();
     if (data.status === 'approved' && data.sessionId) {
       // data.sessionId is the shared ROOT login. Persist it as the machine-level
-      // credential, then mint our OWN per-instance child session from it (mirrors
-      // the `auth login` tool) so this process never operates on the shared root.
+      // credential, then mint a child session from it (mirrors the `auth login` tool)
+      // so the agent gets a stable surface identity (see cloneSession).
       persistAuthSession(data);
       clearPendingDeviceCode();
       getState().sessionId = null;

package/package.json

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