drafted 1.11.23 → 1.11.25

package/mcp/active-project-store.mjs

@@ -0,0 +1,63 @@
+/**
+ * Active-project persistence for the stdio MCP.
+ *
+ * The active project lives only in the in-memory sessionStates Map, so a
+ * `system restart mode=mcp` / skill-edit pass that re-spawns the stdio MCP
+ * wipes it — the recurring "active project keeps resetting, re-open it" churn.
+ * Persisting it lets the long-lived stdio process rehydrate transparently after
+ * a restart.
+ *
+ * Keyed by cwd so two concurrent same-machine agent sessions (each its own
+ * stdio MCP, same launch config) don't clobber each other's active project.
+ * Only the stdio process persists here; HTTP/remote user sessions are keyed by
+ * a real Drafted session id and never call into this store.
+ *
+ * Side-effect-free on import (no network, no eager writes) so it can be unit
+ * tested against the real code without booting the MCP server.
+ */
+import { readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { join, dirname } from 'path';
+import { homedir } from 'os';
+
+const DEFAULT_FILE = process.env.DRAFTED_MCP_STATE_FILE || join(homedir(), '.drafted', 'mcp-state.json');
+
+function defaultCwd() {
+  try { return process.cwd(); } catch { return '__default__'; }
+}
+
+export function loadPersistedProject({ file = DEFAULT_FILE, cwd = defaultCwd() } = {}) {
+  try {
+    const all = JSON.parse(readFileSync(file, 'utf8'));
+    const e = all && all[cwd];
+    if (e && e.activeProjectId) {
+      return {
+        activeProjectId: e.activeProjectId,
+        activeProjectMeta: e.activeProjectMeta || null,
+        boundOrgId: e.boundOrgId || null,
+      };
+    }
+  } catch { /* no state file yet / unreadable — start fresh */ }
+  return null;
+}
+
+export function savePersistedProject(entry, { file = DEFAULT_FILE, cwd = defaultCwd() } = {}) {
+  try {
+    let all = {};
+    try { all = JSON.parse(readFileSync(file, 'utf8')) || {}; } catch { /* recreate */ }
+    if (entry && entry.activeProjectId) {
+      all[cwd] = {
+        activeProjectId: entry.activeProjectId,
+        activeProjectMeta: entry.activeProjectMeta || null,
+        boundOrgId: entry.boundOrgId || null,
+      };
+    } else {
+      delete all[cwd];
+    }
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, JSON.stringify(all), { mode: 0o600 });
+    return true;
+  } catch {
+    // Best-effort; persistence is an optimization, never block a tool on it.
+    return false;
+  }
+}

package/mcp/server.mjs

@@ -21,6 +21,7 @@ import WebSocket from 'ws';
 import { LAYERS } from '../src/shared/constants.mjs';
 import { emptyExcalidrawScene, excalidrawSceneFromMermaid, stringifyExcalidrawScene } from '../src/shared/excalidraw.mjs';
 import { createGateState, markSearched, g1Block, g2Block, g3Block, selectWithinBudget, wouldExceedBudget, budgetError, formatWikiIndex, PROJECT_CONTEXT_BUDGET_CHARS } from './gates.mjs';
+import { loadPersistedProject, savePersistedProject } from './active-project-store.mjs';
 
 // Frame actions that mutate content — gated by G1 (wiki search before editing).
 // Read-style actions (read, search, versions, get_*/read_*) are exempt.
@@ -92,6 +93,9 @@ function getOrCreateSessionState(sid) {
       cachedOrgIdTime: 0,
       wsSessionId: null,
       pendingDeviceCode: null,
+      // Only the long-lived stdio bucket persists its active project to disk;
+      // HTTP/remote sessions (keyed by a real Drafted session id) must not.
+      _stdio: key === '__stdio__',
     };
     sessionStates.set(key, s);
   }
@@ -439,6 +443,28 @@ registerAppResource(
 const AUTH_FILE = process.env.DRAFTED_AUTH_FILE || join(homedir(), '.drafted', 'auth.json');
 const PENDING_AUTH_FILE = process.env.DRAFTED_PENDING_AUTH_FILE || `${AUTH_FILE}.pending`;
 
+// Active-project persistence (stdio only): see mcp/active-project-store.mjs.
+// Persisted so a `system restart mode=mcp` / skill-edit pass that re-spawns the
+// stdio MCP rehydrates the active project instead of dropping it (the recurring
+// "active project keeps resetting" churn). Keyed by cwd; HTTP/remote sessions
+// (real Drafted session id, never the __stdio__ bucket) never touch this file.
+
+// Rehydrate the stdio MCP's active project at process start so the first tool
+// call after a restart is already scoped. Seeds both standaloneState (what
+// api() reads for projectId scoping in stdio mode) and the __stdio__ session
+// bucket (boundOrgId → the X-Drafted-Org per-request scope). No-op when the
+// file is absent (fresh install, or the hosted server process).
+(function rehydrateStdioActiveProject() {
+  const p = loadPersistedProject();
+  if (!p) { getOrCreateSessionState(null); return; }
+  standaloneState.projectId = p.activeProjectId;
+  standaloneState.projectMeta = p.activeProjectMeta || null;
+  const sess = getOrCreateSessionState(null);
+  sess.activeProjectId = p.activeProjectId;
+  sess.activeProjectMeta = p.activeProjectMeta || null;
+  if (p.boundOrgId) sess.boundOrgId = p.boundOrgId;
+})();
+
 function getServerUrl() {
   if (process.env.DRAFTED_SERVER) return process.env.DRAFTED_SERVER.replace(/\/$/, '');
   if (getState().publicUrl) return getState().publicUrl.replace(/\/$/, '');
@@ -835,6 +861,7 @@ async function api(method, path, body, extraHeaders = {}, _retried = false) {
       const sess = getSessionState();
       sess.activeProjectId = null;
       sess.activeProjectMeta = null;
+      if (sess._stdio) savePersistedProject(null);
       throw new Error(
         `${msg} — the active project (${meta?.slug || pid}) is no longer in the current org. ` +
         `Active project cleared. Call project(action="open") to set a new one, or proceed without one for org-scoped tools (wiki, skill).`
@@ -979,6 +1006,10 @@ function setMcpActiveProject(projectId, meta = null) {
   // inheriting the root login's current org. Only set when known — a (null,null)
   // clear must NOT wipe the bound org (the switch handler sets it explicitly).
   if (meta?.orgId) sess.boundOrgId = meta.orgId;
+  // Persist for the stdio process so an MCP restart rehydrates this project.
+  if (sess._stdio) {
+    savePersistedProject(projectId ? { activeProjectId: projectId, activeProjectMeta: meta, boundOrgId: sess.boundOrgId } : null);
+  }
 }
 
 // Returns { id, slug, name, orgId } for the project this MCP session most
@@ -1107,6 +1138,18 @@ async function requireBoundOrgForProjectlessMutation(explicitOrg) {
   const sess = getSessionState();
   if (sess.boundOrgId) return;            // bound via project open / get_org switch
   if (getState().projectId) return;        // an active project implies its org
+  // Remote/web sessions are isolated per connection: each one gets its OWN
+  // server-side session row with its own org_id set on connect, so the session
+  // org IS this session's binding — there's no shared, long-lived session to
+  // confuse here the way stdio has. Adopt that org automatically instead of
+  // forcing the agent to call get_org switch / project open before a project-less
+  // wiki or skill write. The DRAFT-36 Phase 4 "refuse to guess" guard below
+  // therefore applies to stdio only.
+  if (isRemote) {
+    const ctx = await getCurrentOrgContext();
+    if (ctx?.id) sess.boundOrgId = ctx.id;
+    return;
+  }
   let count = sess.cachedOrgCount;
   if (count == null) {
     try {
@@ -2057,7 +2100,7 @@ tool('frame', 'Frame CRUD in the ACTIVE PROJECT. Dispatch by `action`: read (by
   color: z.string().optional().describe('[write] CSS color for frame border (e.g. #ff0000, red).'),
   operations: z.array(z.object({
     type: z.enum(['replace', 'delete', 'insertAfter', 'insertBefore']).describe('Edit type'),
-    lineHash: z.string().describe('The full line anchor copied verbatim from read output — line number + 2-char hash, e.g. "182vi" (the token left of the "|"). NOT the bare 2-char hash "vi": that is rejected, since the same hash can recur on multiple lines.'),
+    lineHash: z.string().describe('The full line anchor copied verbatim from read output — line number + 3-char hash, e.g. "182vix" (the token left of the "|"). NOT the bare hash "vix": that is rejected, since the same hash can recur on multiple lines.'),
     newContent: z.string().optional().describe('New content (for replace, insertAfter, insertBefore)'),
   })).optional().describe('[edit] hashline edit operations'),
   from: z.string().optional().describe('[mv] source path /{layer}/{lane}/{filename}'),
@@ -2576,9 +2619,9 @@ tool('batch', 'Batch operations on the ACTIVE PROJECT. Response includes "projec
     to: z.string().optional().describe('Destination path (for mv)'),
     operations: z.array(z.object({
       type: z.enum(['replace', 'delete', 'insertAfter', 'insertBefore']),
-      lineHash: z.string().describe('The full line anchor from read output — line number + 2-char hash, e.g. "182vi". NOT the bare 2-char hash.'),
+      lineHash: z.string().describe('The full line anchor from read output — line number + 3-char hash, e.g. "182vix". NOT the bare hash.'),
       newContent: z.string().optional(),
-    })).optional().describe('Edit operations (for edit). lineHash is the full anchor (lineNum + hash), e.g. "182vi".'),
+    })).optional().describe('Edit operations (for edit). lineHash is the full anchor (lineNum + hash), e.g. "182vix".'),
     asset_path: z.string().optional().describe('Relative asset path (for upload_asset, e.g., "css/styles.css")'),
     content_type: z.string().optional().describe('MIME type (for upload_asset, auto-detected if omitted)'),
     frame_id: z.string().optional().describe('Frame ID to associate asset with (for upload_asset)'),
@@ -3135,7 +3178,7 @@ tool('wiki', 'Per-org wiki. Markdown pages with paths as hierarchy. You and othe
   frontmatter: z.any().optional().describe('[write] frontmatter object'),
   operations: z.array(z.object({
     type: z.enum(['replace', 'delete', 'insertAfter', 'insertBefore']).describe('Edit type'),
-    lineHash: z.string().describe('The full line anchor copied verbatim from read output — line number + 2-char hash, e.g. "182vi" (the token left of the "|"). NOT the bare 2-char hash.'),
+    lineHash: z.string().describe('The full line anchor copied verbatim from read output — line number + 3-char hash, e.g. "182vix" (the token left of the "|"). NOT the bare hash.'),
     newContent: z.string().optional().describe('New content (for replace, insertAfter, insertBefore)'),
   })).optional().describe('[edit] hashline edit operations — same shape as frame.edit'),
   from: z.string().optional().describe('[mv] source path'),

package/package.json

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