drafted 1.19.33 → 1.19.35

package/mcp/server.mjs

@@ -3275,8 +3275,8 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       // Name the org, or don't search. See searchNeedsOrg: an unaddressed search
       // returns "no matches" from ONE org and reads as "nowhere", which is the
       // one wrong answer a search can give that nothing announces.
+      const orgs = await getOrgList();
       {
-        const orgs = await getOrgList();
         if (searchNeedsOrg({ explicitOrg: org, orgFromPath, orgCount: orgs.length })) {
           // Work is almost always org-specific, and this session usually already
           // knows WHICH — a binding, an open project, or the linked repo of the
@@ -3312,7 +3312,21 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           ));
         }
       }
-      const scope = orgFromPath ? `/o/${orgFromPath}` : '';
+      // THE CANONICAL SLUG, not the spelling the caller used. /o/beoflow resolves
+      // (the org NAME is a resolution rung alongside id and slug) but its slug is
+      // beoflow-mnczl0zt — and fs(ls) already prints that. Echoing the input
+      // instead made ls and search disagree about the address of one thing, which
+      // is the same defect as dropping the folder segment, one axis over.
+      // Computed HERE, before any section renders: section() runs its renderer
+      // immediately, so a later assignment would leave wiki + skills on the old
+      // spelling while projects + frames used the new one.
+      const addressed = orgFromPath || org || null;
+      const canonicalOrg = addressed
+        ? (orgs.find(o => o.id === addressed
+            || (o.slug || '').toLowerCase() === String(addressed).toLowerCase()
+            || (o.name || '').toLowerCase() === String(addressed).toLowerCase())?.slug || addressed)
+        : null;
+      const scope = canonicalOrg ? `/o/${canonicalOrg}` : '';
       const leg = async (fn) => { try { return { v: await fn() }; } catch (e) { return { e: e?.message || String(e) }; } };
       const [wiki, skills, projects, frames, repos] = await Promise.all([
         leg(() => api('GET', `/api/wiki/search?q=${encodeURIComponent(q)}&limit=10`, undefined, orgHeader)),
@@ -3339,16 +3353,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
@@ -3369,7 +3405,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       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;
+      const orgAs = canonicalOrg;
       section('Projects', projects, () => {
         const hits = projectRows.filter(x => matchesAllTerms([x.name, x.slug, x.description], q)).slice(0, 10);
         return hits.length
@@ -3384,17 +3420,15 @@ 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, 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('; ')}`);
+      // 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;
+      const searched = canonicalOrg;
       // ALWAYS say where this looked. "No matches" is only safe to act on when
       // the reader can see the scope it was computed over.
       return ok(`Search "${q}" in ${searched ? `/o/${searched}` : 'your only org'}\n\n${out.join('\n\n')}`);

package/package.json

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