drafted 1.19.31 → 1.19.33

package/mcp/server.mjs

@@ -331,9 +331,17 @@ export function matchesAllTerms(parts, query) {
 // A hit with no snippet matched on the LABEL, not on content — say which, so the
 // agent knows whether the frame's text is evidence or just its filename.
 // Pure + exported (asserted in mcp/test-search-terms.mjs).
-export function formatFrameHits(frames, { limit = 25, snippetChars = 200 } = {}) {
+/**
+ * `org` overrides how the org is SPELLED (use the form the caller addressed, so
+ * every section of one result reads the same), and `folderOf` supplies the
+ * project's folder — frame hits do not carry it, so without this the path drops
+ * a segment and stops matching what fs(ls) prints for the same project.
+ */
+export function formatFrameHits(frames, { limit = 25, snippetChars = 200, org = null, folderOf = null } = {}) {
   return frames.slice(0, limit).map((f) => {
-    const path = `/o/${f.orgSlug || f.orgId}/projects/${f.projectSlug || f.projectId}/${f.layer}/${f.lane || ''}/${f.label}`.replace(/\/\//g, '/');
+    const folder = folderOf ? folderOf(f.projectId) : '';
+    const proj = [folder, f.projectSlug || f.projectId].filter(Boolean).join('/');
+    const path = `/o/${org || f.orgSlug || f.orgId}/projects/${proj}/${f.layer}/${f.lane || ''}/${f.label}`.replace(/\/\//g, '/');
     const snip = clip(String(f.snippet || '').replace(/\s+/g, ' ').trim(), snippetChars);
     return snip ? `  ${path}\n      ${snip}` : `  ${path}  (label match)`;
   }).join('\n');
@@ -1159,8 +1167,16 @@ function workingOrgSource() {
 // One `ls` level of folders, from the org's folder list. Defined inside the
 // closure because `api` is — it carries this session's auth and org scope.
 async function listSubfolders(base, prefix, orgHeader) {
-  const rows = await api('GET', '/api/folders', undefined, orgHeader).catch(() => []);
-  return subfolderEntries(base, prefix, (Array.isArray(rows) ? rows : []).map((r) => r?.name));
+  const [rows, repos] = await Promise.all([
+    api('GET', '/api/folders', undefined, orgHeader).catch(() => []),
+    // Best-effort: a failure just omits the git-owned note, never breaks ls.
+    api('GET', '/api/repos', undefined, orgHeader).catch(() => null),
+  ]);
+  const byFolder = new Map(
+    (Array.isArray(repos?.repos) ? repos.repos : []).map((r) => [r.folderName || '', `${r.slug}@${r.branch}`])
+  );
+  return subfolderEntries(base, prefix, (Array.isArray(rows) ? rows : []).map((r) => r?.name),
+    (name) => byFolder.get(name) || null);
 }
 
 async function api(method, path, body, extraHeaders = {}, _retried = false, _orgHealed = false) {
@@ -3298,7 +3314,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       }
       const scope = orgFromPath ? `/o/${orgFromPath}` : '';
       const leg = async (fn) => { try { return { v: await fn() }; } catch (e) { return { e: e?.message || String(e) }; } };
-      const [wiki, skills, projects, frames] = await Promise.all([
+      const [wiki, skills, projects, frames, repos] = await Promise.all([
         leg(() => api('GET', `/api/wiki/search?q=${encodeURIComponent(q)}&limit=10`, undefined, orgHeader)),
         leg(() => api('GET', `/api/skills/search?q=${encodeURIComponent(q)}`, undefined, orgHeader)),
         leg(() => api('GET', '/api/projects', undefined, orgHeader)),
@@ -3306,6 +3322,9 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
         // fact — the row cap is applied server-side, so a client-side filter can be
         // handed a page already filled by other orgs' hits.
         leg(() => withoutProjectScope(() => api('GET', `/api/search?q=${encodeURIComponent(q)}&limit=15`, undefined, orgHeader))),
+        // Which folders git owns, so the result can say which hits are read-only
+        // in Drafted. One cheap org-scoped call; a failure just omits the note.
+        leg(() => api('GET', '/api/repos', undefined, orgHeader)),
       ]);
       // A root search IS the prior-art search both gates ask for — it read the wiki
       // and the skill library. Not crediting it would send the agent back to run
@@ -3340,17 +3359,41 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       // filter reused that empty set, it silently zeroed BOTH sections. A
       // search that found nothing because of how you spelled the org is exactly
       // the invisible false negative this whole guard exists to prevent.
-      section('Projects', projects, (v) => {
-        const rows = (Array.isArray(v?.projects) ? v.projects : []).filter(x => x.folder !== '__archived');
-        const hits = rows.filter(x => matchesAllTerms([x.name, x.slug, x.description], q)).slice(0, 10);
-        return hits.length ? hits.map(x => `  /o/${x.orgSlug || x.orgId}/projects/${x.slug || x.id}`).join('\n') : '';
+      // A printed path must BE the address fs(ls) gives for the same thing —
+      // otherwise copying it from a search result lands somewhere else, or
+      // nowhere. Two ways that broke: the project's folder was dropped
+      // (`projects/wrkout-week-reels` for a project fs(ls) shows at
+      // `projects/Marketing/wrkout-week-reels`), and the org was spelled from
+      // the row while wiki/skills used the form the caller typed — one result,
+      // two spellings of one org.
+      const projectRows = (Array.isArray(projects.v?.projects) ? projects.v.projects : [])
+        .filter(x => x.folder !== '__archived');
+      const folderById = new Map(projectRows.map(x => [x.id, x.folder || '']));
+      const orgAs = orgFromPath || null;
+      section('Projects', projects, () => {
+        const hits = projectRows.filter(x => matchesAllTerms([x.name, x.slug, x.description], q)).slice(0, 10);
+        return hits.length
+          ? hits.map(x => `  /o/${orgAs || x.orgSlug || x.orgId}/projects/${[x.folder, x.slug || x.id].filter(Boolean).join('/')}`).join('\n')
+          : '';
       });
       section('Frames', frames, (v) => {
         const hits = Array.isArray(v) ? v : (v?.results || []);
         const note = archivedNote(Array.isArray(v) ? 0 : (v?.archivedCount || 0));
-        return hits.length ? formatFrameHits(hits, { limit: 15 }) + note : (note ? note.trimStart() : '');
+        return hits.length
+          ? formatFrameHits(hits, { limit: 15, org: orgAs, folderOf: (id) => folderById.get(id) || '' }) + note
+          : (note ? note.trimStart() : '');
       });
 
+      // Which of these hits are read-only in Drafted, and precisely which part.
+      // A link makes the folder's WIKI and SKILLS git-owned (409 repo_owned on
+      // write); its TASKS and PROJECTS write normally. Naming the folder alone
+      // would tell an agent not to attempt a frame write it is entitled to make.
+      const linked = (Array.isArray(repos.v?.repos) ? repos.v.repos : [])
+        .map(r => `${r.folderName ? r.folderName : '(org root)'} → ${r.slug}@${r.branch}`);
+      if (linked.length) {
+        out.push(`Git-owned WIKI + SKILLS (edit those via commit; tasks + projects write normally): ${linked.join('; ')}`);
+      }
+
       const searched = orgFromPath || org || null;
       // ALWAYS say where this looked. "No matches" is only safe to act on when
       // the reader can see the scope it was computed over.

package/package.json

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

package/src/shared/folder-path.mjs

@@ -120,7 +120,17 @@ export function liftFolderScope(path, to) {
  * org's folder names (each of which is its full path). One segment deeper only —
  * `ls` shows a level, not a tree.
  */
-export function subfolderEntries(base, prefix, names) {
+/** `repoOf(fullFolderName)` -> "slug@branch" when a repo is linked to that
+ *  folder, else null.
+ *
+ *  SAY WHAT IS OWNED, NOT "THE FOLDER". A link makes the folder's WIKI and
+ *  SKILLS git-owned — those answer 409 repo_owned on write. Its TASKS and
+ *  PROJECTS are untouched and write normally (verified: a frame write into a
+ *  project inside a linked folder succeeds). A bare "GIT-OWNED" on the folder
+ *  overclaims, and an agent that believes it will not attempt a frame write it
+ *  is perfectly entitled to make — a false negative costs more here than the
+ *  409 it was meant to prevent. */
+export function subfolderEntries(base, prefix, names, repoOf = null) {
   const depth = prefix ? normalizeFolder(prefix).split('/').length : 0;
   const kids = new Set();
   for (const raw of names || []) {
@@ -130,12 +140,18 @@ export function subfolderEntries(base, prefix, names) {
     const segs = name.split('/');
     if (segs.length > depth) kids.add(segs[depth]);
   }
-  return [...kids].sort().map((name) => ({
-    name,
-    type: 'directory',
-    path: `${String(base || '').replace(/\/+$/, '')}/${name}`,
-    hint: 'folder — carries its own wiki, skills, tasks and projects',
-  }));
+  const full = (name) => normalizeFolder([prefix, name].filter(Boolean).join('/'));
+  return [...kids].sort().map((name) => {
+    const repo = repoOf ? repoOf(full(name)) : null;
+    return {
+      name,
+      type: 'directory',
+      path: `${String(base || '').replace(/\/+$/, '')}/${name}`,
+      hint: repo
+        ? `folder — carries its own wiki, skills, tasks and projects · wiki + skills GIT-OWNED by ${repo} (edit those via commit); tasks + projects write normally`
+        : 'folder — carries its own wiki, skills, tasks and projects',
+    };
+  });
 }
 
 /**