drafted 1.17.10 → 1.17.12

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

@@ -2581,7 +2581,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
   base64: z.string().optional().describe('[write] base64-encoded binary content'),
   googleType: z.enum(['google-doc', 'google-sheet', 'google-slide']).optional().describe('[write] explicit Google Workspace type (also derived from .google-* filename extension)'),
   title: z.string().optional().describe('[write + googleType] title for a new native file'),
-  ops: z.array(z.any()).optional().describe('[edit] hashline ops for text frames ({type,lineHash,newContent}), element ops for excalidraw ({id,x,y,...}), or office ops'),
+  ops: z.array(z.any()).optional().describe('[edit] hashline ops for text frames. Apply ONLY against a fresh fs(read) of the frame: each op = {type, lineHash, newContent} where type is one of replace | delete | insertAfter | insertBefore, and lineHash is the FULL anchor from the read output (line number + hash, e.g. the token left of the |, like 42srt) — NOT a bare hash. delete/replace consume the target line; at most one replace/delete per line per edit (combine into one replace). If an op targets a line that changed since read it is rejected — re-read and retry. Element ops for excalidraw ({id,x,y,...}), or structured ops for office'),
   state: z.any().optional().describe('[write] app-frame state (JSON) to persist for a deployed windowType:"app" frame; the canvas hydrates the app from it on load. Max 64KB.'),
   recursive: z.boolean().optional().describe('[ls] recurse into subdirectories'),
   lines: z.string().optional().describe('[read] line range (e.g. "1-50") — partial read; content is hashline-annotated so a later edit stays surgical'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.17.10",
+  "version": "1.17.12",
   "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/server/lib/umami.mjs

@@ -40,7 +40,7 @@ const BLOCKED_KEYS = new Set([
   'content', 'html', 'markdown', 'body', 'prompt', 'token', 'cookie', 'authorization',
   'password', 'secret', 'apiKey', 'request', 'headers', 'file', 'buffer', 'dataUrl',
 ]);
-const ID_KEYS = new Set(['userId', 'orgId', 'projectId', 'projectSlug', 'frameId', 'shareId', 'skillId', 'templateId', 'templateSlug', 'userRole', 'role', 'buildId', 'pageType', 'tool', 'action', 'source', 'layer', 'lane', 'mode', 'installId', 'schemaVersion', 'installerVersion', 'cliVersion', 'osFamily', 'osVersion', 'arch', 'nodeVersion', 'npmVersion', 'claudeDesktop', 'claudeCode', 'codex', 'cursor', 'updateHelperStatus', 'mcpMode', 'errorCode']);
+const ID_KEYS = new Set(['userId', 'orgId', 'projectId', 'projectSlug', 'frameId', 'shareId', 'skillId', 'templateId', 'templateSlug', 'userRole', 'role', 'buildId', 'pageType', 'tool', 'action', 'source', 'layer', 'lane', 'mode', 'installId', 'schemaVersion', 'installerVersion', 'cliVersion', 'osFamily', 'osVersion', 'arch', 'nodeVersion', 'npmVersion', 'claudeDesktop', 'claudeCode', 'codex', 'cursor', 'updateHelperStatus', 'mcpMode', 'errorCode', 'matchKey']);
 
 export function getUmamiConfig(config = {}) {
   const hostUrl = (config.umamiHostUrl || process.env.UMAMI_HOST_URL || '').replace(/\/$/, '');