drafted 1.19.32 → 1.19.34

package/mcp/server.mjs

@@ -3339,16 +3339,38 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
         out.push(body ? `${title}:\n${body}` : `${title}: no matches`);
       };
 
+      // PER-HIT, not a footer. Whether a wiki page or skill is git-owned depends
+      // on the FOLDER it sits in, and two hits with the same-shaped path can
+      // differ: /o/<org>/wiki/x is read-only in an org whose root is linked and
+      // writable in one whose root is not. A summary line at the bottom makes
+      // the reader cross-reference; the mark belongs on the line it describes.
+      const repoByFolder = new Map(
+        (Array.isArray(repos.v?.repos) ? repos.v.repos : []).map(r => [r.folderName || '', `${r.slug}@${r.branch}`])
+      );
+      const gitMark = (folder) => {
+        const r = repoByFolder.get(folder ?? '');
+        return r ? `  [git: ${r} — edit via commit]` : '';
+      };
+
       section('Wiki', wiki, (v) => {
         const hits = (v?.hits || v?.pages || v?.results || []).slice(0, 10);
-        return hits.length ? hits.map(h => `  ${scope}${h.folder ? `/${h.folder}` : ''}/wiki/${h.path}${h.title ? `  — ${clip(h.title, 80)}` : ''}`).join('\n') : '';
+        return hits.length ? hits.map(h => `  ${scope}${h.folder ? `/${h.folder}` : ''}/wiki/${h.path}${h.title ? `  — ${clip(h.title, 80)}` : ''}${gitMark(h.folder)}`).join('\n') : '';
       });
       section('Skills', skills, (v) => {
         // Fewer than the other legs on purpose: skills search is fuzzy and its tail
         // is weak matches, which is noise in a fan-out whose job is "where does this
         // live?". fs(search, path="/skills") is the place to go deeper.
         const list = (Array.isArray(v) ? v : (v?.skills || [])).slice(0, 5);
-        return list.length ? list.map(s => `  ${scope}/skills/${s.slug}  — ${clip(s.description || s.name, 120)}`.trimEnd()).join('\n') : '';
+        return list.length ? list.map(s => {
+          // A repo-indexed hit IS git-owned by construction — it was read out of
+          // a repo index, so it needs no folder lookup. Its branch comes from the
+          // repos leg; falling back to the bare slug keeps the mark honest if
+          // that leg failed.
+          const mark = s.repoEntry
+            ? `  [git: ${[...repoByFolder.values()].find(v2 => v2.startsWith(`${s.repoSlug}@`)) || s.repoSlug} — edit via commit]`
+            : gitMark(s.folder);
+          return `  ${scope}/skills/${s.slug}  — ${clip(s.description || s.name, 120)}`.trimEnd() + mark;
+        }).join('\n') : '';
       });
 
       // NO client-side org filter on either leg. Both endpoints scope server-side
@@ -3384,14 +3406,12 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           : (note ? note.trimStart() : '');
       });
 
-      // Which of these hits are read-only in Drafted. A git-owned folder's wiki
-      // and skills answer 409 repo_owned on write, and nothing else in the
-      // output distinguishes them from an ordinary path — the failure lands at
-      // write time, after the edit is composed.
-      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 (edits are commits, not fs writes): ${linked.join('; ')}`);
+      // No summary footer: every affected line now carries its own mark, and two
+      // mechanisms saying the same thing is one that can disagree. The note below
+      // is the part a per-hit mark cannot express — that the marks are about
+      // wiki/skills only, so a project hit under a linked folder is still writable.
+      if (repoByFolder.size) {
+        out.push('Marked [git: …] = wiki/skill owned by that repo; edit via commit. Projects and tasks in the same folder write normally.');
       }
 
       const searched = orgFromPath || org || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.19.32",
+  "version": "1.19.34",
   "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,10 +120,16 @@ 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.
  */
-/** `repoOf(fullFolderName)` -> "slug@branch" when git owns that folder, else
- *  null. A git-owned folder's wiki and skills answer 409 repo_owned on write,
- *  and without this the listing renders it identically to a writable one — the
- *  agent finds out at write time, after composing the edit. */
+/** `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();
@@ -142,7 +148,7 @@ export function subfolderEntries(base, prefix, names, repoOf = null) {
       type: 'directory',
       path: `${String(base || '').replace(/\/+$/, '')}/${name}`,
       hint: repo
-        ? `folder — carries its own wiki, skills, tasks and projects · GIT-OWNED by ${repo} (edits are commits)`
+        ? `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',
     };
   });