drafted 1.11.5 → 1.11.7

package/cli/drafted.mjs

@@ -1434,7 +1434,7 @@ skillCmd
 
 skillCmd
   .command('update')
-  .description('Update a Drafted skill (--id or --slug) from stdin JSON {name?,description?,content?,triggerPatterns?,tags?,setup?}; auto-forks into your org if the target is read-only (global/other-org)')
+  .description('Update a Drafted skill (--id or --slug) from stdin JSON {name?,description?,content?,triggerPatterns?,tags?,setup?,reason?,source?,metadata?}; auto-forks into your org if the target is read-only (global/other-org)')
   .option('--id <id>', 'skill id')
   .option('--slug <slug>', 'skill slug (resolved to id)')
   .option('--org <org>', 'fork into / resolve against this Drafted org (id or name)')
@@ -1454,7 +1454,7 @@ skillCmd
       id = lj.id; slug = lj.slug;
     }
     if (!id) { emitSkillResult(opts.format, { status: 'error', error: 'update requires --id or --slug' }); process.exit(1); }
-    const payload = JSON.stringify({ name: p.name, description: p.description, content: p.content, tags: p.tags, triggerPatterns: p.triggerPatterns, setup: p.setup });
+    const payload = JSON.stringify({ name: p.name, description: p.description, content: p.content, tags: p.tags, triggerPatterns: p.triggerPatterns, setup: p.setup, reason: p.reason, source: p.source, metadata: p.metadata });
     const putSkill = (sid) => authFetch(`${server}/api/skills/${sid}`, { method: 'PUT', headers: { 'Content-Type': 'application/json', ...orgHeaders }, body: payload });
 
     const res = await putSkill(id);

package/mcp/server.mjs

@@ -85,6 +85,7 @@ function getOrCreateSessionState(sid) {
     s = {
       activeProjectId: null,
       activeProjectMeta: null,
+      boundOrgId: null,
       loadedSkillIds: new Set(),
       gates: createGateState(),
       cachedOrgId: null,
@@ -699,6 +700,7 @@ async function cloneSession() {
       const data = await res.json();
       if (data.sessionId) {
         getState().sessionId = data.sessionId;
+        await restoreBoundOrg(data.orgId);
         return true;
       }
     }
@@ -706,6 +708,33 @@ async function cloneSession() {
   return false;
 }
 
+// A fresh clone inherits the ROOT login's current org. If this MCP session was
+// already working in a different org (bound via project open or get_org switch),
+// re-assert it on the new session so a WS-drop / 401 / server-bounce recovery is
+// transparent. Otherwise the recovered session silently lands on the root's org,
+// the next request appends the active project's id while scoped to the wrong org,
+// the API returns "project not found", and the api() error handler clears the
+// active project — the churn that shows up as active-project "flapping" after a
+// server restart. Best-effort: a raw fetch (not api()) avoids recursing back
+// through cloneSession on 401; if it fails, that stale-project clear is the
+// backstop, same as before this fix.
+async function restoreBoundOrg(clonedOrgId) {
+  const sess = getSessionState();
+  const want = sess.boundOrgId;
+  if (!want || want === clonedOrgId) return;
+  try {
+    const res = await fetch(`${getServerUrl()}/auth/switch-org`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', ...getAuthHeaders() },
+      body: JSON.stringify({ orgId: want }),
+    });
+    if (res.ok) {
+      sess.cachedOrgId = null;
+      sess.cachedOrgIdTime = 0;
+    }
+  } catch { /* best-effort; the api() stale-project clear is the backstop */ }
+}
+
 async function ensureSession() {
   if (getState().sessionId) return;
   // A pending device-code login (from `auth get_link`) takes priority; consuming
@@ -922,6 +951,11 @@ function setMcpActiveProject(projectId, meta = null) {
   const sess = getSessionState();
   sess.activeProjectId = projectId;
   sess.activeProjectMeta = meta;
+  // Remember the org this session is working in so session recovery (a re-clone
+  // after a WS drop / 401 / server bounce) can restore it instead of passively
+  // 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;
 }
 
 // Clear the active project if its orgId no longer matches the current org.
@@ -1110,26 +1144,6 @@ function normalizeWikiPath(input) {
   return input.replace(/^\/+/, '').replace(/\.md$/, '');
 }
 
-function applyHashlineOps(content, operations) {
-  let lines = content.split('\n');
-  const lineToHash = {};
-  for (let i = 0; i < lines.length; i++) {
-    lineToHash[i] = createHash('sha256').update(lines[i] || '').digest('hex').slice(0, 12);
-  }
-  const sorted = [...operations].reverse();
-  for (const op of sorted) {
-    const matches = Object.entries(lineToHash).filter(([, h]) => h === op.lineHash).map(([idx]) => parseInt(idx));
-    if (matches.length === 0) throw new Error(`Line with hash "${op.lineHash}" not found`);
-    if (matches.length > 1) throw new Error(`Ambiguous hash "${op.lineHash}" matches ${matches.length} lines`);
-    const idx = matches[0];
-    if (op.type === 'replace') { lines[idx] = op.newContent; }
-    else if (op.type === 'delete') { lines.splice(idx, 1); }
-    else if (op.type === 'insertAfter') { lines.splice(idx + 1, 0, op.newContent); }
-    else if (op.type === 'insertBefore') { lines.splice(idx, 0, op.newContent); }
-  }
-  return lines.join('\n');
-}
-
 async function getTreeAsMap() {
   const tree = await api('GET', '/api/wiki/tree');
   const pages = tree.pages || [];
@@ -1860,6 +1874,9 @@ tool('get_org', {
       // Clear active project too — projects are scoped to orgs, so the
       // previous one isn't valid in the new org.
       setMcpActiveProject(null, null);
+      // Bind this session to the chosen org so session recovery re-asserts it
+      // (set AFTER the clear above, which would otherwise leave it unchanged).
+      sess.boundOrgId = args.orgId;
       const me = await api('GET', '/auth/me');
       const orgs = (await api('GET', '/api/orgs')).orgs || [];
       const activeOrg = (orgs || []).map(o => ({ id: o.orgId || o.id, name: o.orgName || o.name })).find(o => o.id === me?.orgId) || null;

package/package.json

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