drafted 1.17.9 → 1.17.11

package/cli/drafted.mjs

@@ -2124,83 +2124,53 @@ minionCmd
 const repoCmd = program.command('repo').description('Registered git repos (org index of .agents/ skills/identities)');
 
 repoCmd
-  .command('add <urlOrPath>')
-  .description('Register a git repo (URL or local path) and ingest its .agents/ skills/identities into the org index')
+  .command('add <url>')
+  .description('Link a GitHub repo to an org FOLDER — the server fetches it and indexes .agents/ skills/identities (repos are folder-scoped, never org-level)')
   .option('--org <org>', 'resolve against this Drafted org (id or name); scopes per-request without switching the session')
+  .option('--folder <name>', 'folder to link the repo into (required)')
   .option('--slug <slug>', 'repo slug (defaults to the repo name from the URL)')
   .option('--description <desc>', 'short description')
-  .option('--branch <branch>', 'default branch (defaults to the checked-out branch, then main)')
   .option('--format <fmt>', 'output format: json or text', 'text')
-  .action(async (urlOrPath, opts) => {
+  .action(async (url, opts) => {
     requireLogin();
     const orgHeaders = opts.org ? { 'X-Drafted-Org': opts.org } : {};
-    // Resolve the source dir to scan + the gitUrl to store.
-    let dir;
-    let cleanup = () => {};
-    let gitUrl;
-    let defaultBranch;
-    if (isGitUrl(urlOrPath)) {
-      try {
-        const c = cloneToTemp(urlOrPath);
-        dir = c.dir; cleanup = c.cleanup;
-      } catch (err) {
-        console.error(`❌ Failed to clone ${urlOrPath}: ${err.message}`);
-        process.exit(1);
-      }
-      gitUrl = urlOrPath;
-      defaultBranch = opts.branch || detectDefaultBranch(dir);
-    } else if (existsSync(urlOrPath)) {
-      dir = resolve(urlOrPath);
-      gitUrl = opts.slug ? undefined : detectRemoteUrl(dir);
-      defaultBranch = opts.branch || detectDefaultBranch(dir);
+    const server = getServerUrl().replace(/\/$/, '');
+    const fail = (msg) => { if (opts.format === 'json') console.log(JSON.stringify({ ok: false, command: 'repo:add', error: msg })); else console.log(['error', msg].join('\t')); process.exit(1); };
+    const folderName = String(opts.folder || '').trim();
+    if (!folderName) return fail('--folder <name> is required — repos are linked to a folder, never to the org directly');
+    // Resolve folder name -> id in the target org.
+    const foldersRes = await authFetch(`${server}/api/folders`, { headers: orgHeaders });
+    const foldersJson = await foldersRes.json().catch(() => ({}));
+    if (!foldersRes.ok) return fail(foldersJson.error || `HTTP ${foldersRes.status}`);
+    const folders = Array.isArray(foldersJson) ? foldersJson : foldersJson.folders || [];
+    const folder = folders.find((f) => f.name === folderName);
+    if (!folder) return fail(`no folder named "${folderName}" in this org`);
+    // The server fetches + scans; the CLI only resolves the association.
+    const payload = { gitUrl: url, folderId: folder.id, slug: opts.slug, description: opts.description };
+    const res = await authFetch(`${server}/api/repos`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', ...orgHeaders },
+      body: JSON.stringify(payload),
+    });
+    const data = await res.json().catch(() => ({}));
+    if (!res.ok) return fail(data.error || `HTTP ${res.status}`);
+    const created = res.status === 201;
+    if (opts.format === 'json') {
+      console.log(JSON.stringify({ ok: true, command: 'repo:add', data: { ...data, created } }));
     } else {
-      console.error(`❌ Not a git URL and not a local path: ${urlOrPath}`);
-      process.exit(1);
-    }
-    try {
-      const { skills, identities } = scanRepoAgents(dir);
-      const entries = [...skills, ...identities];
-      const payload = {
-        gitUrl: gitUrl || urlOrPath,
-        slug: opts.slug,
-        description: opts.description,
-        defaultBranch,
-        entries,
-      };
-      const server = getServerUrl().replace(/\/$/, '');
-      const res = await authFetch(`${server}/api/repos`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', ...orgHeaders },
-        body: JSON.stringify(payload),
-      });
-      const data = await res.json().catch(() => ({}));
-      if (!res.ok) {
-        const err = data.error || `HTTP ${res.status}`;
-        if (opts.format === 'json') console.log(JSON.stringify({ ok: false, command: 'repo:add', error: err }));
-        else console.log(['error', err].join('\t'));
-        process.exit(1);
-      }
-      const created = res.status === 201;
-      if (opts.format === 'json') {
-        console.log(JSON.stringify({ ok: true, command: 'repo:add', data: { ...data, created, skills: skills.length, identities: identities.length } }));
-      } else {
-        console.log([created ? 'added' : 'updated', data.slug || '', data.gitUrl || gitUrl || '', data.defaultBranch || defaultBranch, `skills:${skills.length}`, `identities:${identities.length}`].join('\t'));
-      }
-    } finally {
-      cleanup();
+      console.log([created ? 'added' : 'updated', data.slug || '', data.gitUrl || url, folderName, `skills:${data.skills ?? 0}`, `identities:${data.identities ?? 0}`].join('\t'));
     }
   });
-
 repoCmd
   .command('list')
-  .description('List the org\'s registered repos with their .agents/ index counts')
+  .description('List the org\'s linked repos with their folder + .agents/ index counts')
   .option('--org <org>', 'resolve against this Drafted org (id or name); scopes per-request without switching the session')
   .option('--format <fmt>', 'output format: json or text', 'text')
   .action(async (opts) => {
     const data = await readApiGet('repo:list', '/api/repos', opts.org);
     const rows = data.repos || [];
     if (opts.format === 'json') { console.log(JSON.stringify(rows)); return; }
-    for (const r of rows) console.log([r.slug, r.gitUrl, r.defaultBranch, `skills:${r.skillCount ?? 0}`, `identities:${r.identityCount ?? 0}`, r.description || ''].join('\t'));
+    for (const r of rows) console.log([r.slug, r.folderName || '-', r.gitUrl, `skills:${r.skillCount ?? 0}`, `identities:${r.identityCount ?? 0}`].join('\t'));
   });
 
 repoCmd

package/mcp/server.mjs

@@ -2729,9 +2729,16 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
         return ok({ archived: true, from: canonPath, to: result?.path || archivePath, ...(result?.referrersUpdated ? { referrersUpdated: result.referrersUpdated } : {}) });
       }
       case 'search': {
+        // The gate means "consult the wiki before project writes". Only an
+        // actual search with a real query counts — not the call itself.
+        const q = String(query || '').trim();
+        if (!q) return ok('(provide a query — e.g. fs(search, path="/wiki", query="<terms>"))');
+        const pages = await api('GET', `/api/wiki/search?q=${encodeURIComponent(q)}`, undefined, orgHeader);
+        // Server responds { hits: [...] } — earlier code read .pages/.results,
+        // which are never present, so every MCP wiki search reported empty.
+        const hits = pages?.hits || pages?.pages || pages?.results || [];
         markSearched(gs, 'wiki');
-        const pages = await api('GET', `/api/wiki/search?q=${encodeURIComponent(query || '')}`, undefined, orgHeader);
-        return ok(formatWikiIndex(pages?.pages || pages?.results || []));
+        return ok(formatWikiIndex(hits));
       }
       default:
         return err(new Error(`fs ${action} not supported for /wiki`));
@@ -2746,6 +2753,11 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
     }
     switch (action) {
       case 'ls': {
+        // A specific slug is a targeted ls: just that skill, not the whole root.
+        if (slug) {
+          const s = await api('GET', `/api/skills/slug/${slug}`, undefined, orgHeader).catch(() => null);
+          return ok(s ? [{ slug: s.slug, name: s.name, description: s.description }] : []);
+        }
         const list = await api('GET', '/api/skills', undefined, orgHeader);
         const skills = Array.isArray(list) ? list : (list?.skills || []);
         return ok(skills.map(s => ({ slug: s.slug, name: s.name, description: s.description })));
@@ -2842,6 +2854,25 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
       projectRef = parts[0]; // /projects/<project>
     }
 
+    // fs grammar: the project comes from the PATH, not the shared session
+    // binding — scope the whole call to the path's project (request-local, per
+    // the DRAFT-36 addressing invariant). Without this, /api/fs falls back to
+    // the session's active project (the user's shared row any browser tab or
+    // parallel agent can rewrite), so ls/read/write silently touched the wrong
+    // project and "fixed itself" when something re-bound — the under-reporting
+    // churn reported from the MJ Directive org.
+    if (projectRef) {
+      const pathProject = await resolveProjectRef(projectRef).catch(() => null);
+      if (!pathProject?.id) return err(new Error(`project not found: ${projectRef}`));
+      // An org-scoped path must name a project of that org — never a same-named
+      // project from another org (the path is both address and guardrail).
+      if (orgFromPath && !(await pathOrgMatches(orgFromPath, pathProject))) {
+        return err(new Error(`project ${projectRef} is not in org ${orgFromPath}`));
+      }
+      getState().projectId = pathProject.id;
+      getState().projectMeta = pathProject;
+    }
+
     const run = async () => {
       const hasFile = layer && filename;
       // Layer-root file (lane null) hits the server's 2-segment route.

package/package.json

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