drafted 1.21.0 → 1.21.1

package/cli/drafted.mjs

@@ -174,6 +174,12 @@ function getServerUrl() {
   return `http://localhost:${process.env.DRAFTED_PORT || DEFAULT_PORT}`;
 }
 
+// Only a LOCAL server has a pid to check; a remote one (drafted.live) is never
+// "not running" from this machine's point of view.
+function localServerDown() {
+  return /^http:\/\/localhost:/.test(getServerUrl()) && !isServerRunning();
+}
+
 function buildUpdateCommand() {
   const server = getServerUrl().replace(/\/$/, '');
   if (platform() === 'win32') {
@@ -326,6 +332,52 @@ async function readApiGet(command, apiPath, org) {
   return data;
 }
 
+// Exit with a structured (--json) and human error. Used where a guess would be
+// a silent wrong answer.
+function failRead(command, msg) {
+  jsonOut(false, command, msg);
+  console.error(`❌ ${msg}`);
+  process.exit(1);
+}
+
+// /api/fs takes a PROJECT-RELATIVE path plus projectId. Handed a canonical
+// /o/<org>/[<folder…>/]projects/<project>/<layer>/... address it ignores the org
+// and project, lists the user's ACTIVE project (a shared row any browser tab or
+// agent rewrites) at a path no layer matches, and answers 200 with no entries —
+// "this project is empty" when it is not. So split the address here, the way
+// the MCP fs tool does, and refuse anything that does not name a project.
+async function resolveCanonicalPath(command, path, projectId) {
+  const m = String(path || '').match(/^\/o\/([^/]+)(?:\/(.*))?$/);
+  if (!m) return { path, projectId };
+  const org = m[1];
+  const segs = (m[2] || '').split('/').filter(Boolean);
+  const at = segs.indexOf('projects');
+  if (at < 0 || at === segs.length - 1) {
+    failRead(command, `The CLI lists project content only — use /o/${org}/projects/<project>[/<layer>/<lane>]. `
+      + `To list projects: drafted projects --org ${org}. Wiki, skills and tasks: use the Drafted MCP fs tool.`);
+  }
+  const data = await readApiGet(command, '/api/projects');
+  const inOrg = (data.projects || []).filter(p => p.orgSlug === org || p.orgId === org);
+  const folderChain = segs.slice(0, at);
+  const tail = segs.slice(at + 1);
+  const named = (p, ref) => p.id === ref || [p.slug, p.name].some(v => String(v || '').toLowerCase() === ref.toLowerCase());
+  // The project may be folder-qualified on either side of `projects`
+  // (/o/<org>/<folder>/projects/<p> or /o/<org>/projects/<folder>/<p>); the bare
+  // form is tried first. A folder must match exactly, so a typo never lands in
+  // a different project.
+  for (let i = 0; i < tail.length; i++) {
+    const folder = [...folderChain, ...tail.slice(0, i)].join('/');
+    const hit = inOrg.find(p => named(p, tail[i]) && (i === 0 || (p.folder || '') === folder));
+    if (!hit) continue;
+    if (projectId && projectId !== hit.id) {
+      failRead(command, `--project ${projectId} conflicts with the project in the path (${hit.id})`);
+    }
+    return { path: '/' + tail.slice(i + 1).join('/'), projectId: hit.id };
+  }
+  failRead(command, `project not found: ${path} — no project "${tail.join('/')}" you can access in org "${org}". `
+    + `List them with: drafted projects --org ${org}`);
+}
+
 // Resolve a frame path / frame URL (/f/<uuid>) / bare UUID to its /api/fs read
 // endpoint. Mirrors the MCP `frame(action="read")` resolution so the CLI and MCP
 // accept the same identifiers.
@@ -724,34 +776,26 @@ program
   });
 
 // Command: status
+// Reports the server this CLI actually talks to (DRAFTED_SERVER / auth.json /
+// config.json, see getServerUrl). It used to check only for a LOCAL server pid,
+// so a cloud user was told "not running" while every read went to drafted.live.
 program
   .command('status')
-  .description('Check server status')
+  .description('Check the Drafted server this CLI talks to, and whether you are signed in')
   .action(async () => {
-    const running = isServerRunning();
-    const port = process.env.DRAFTED_PORT || DEFAULT_PORT;
-
-    if (running) {
-      const projectsData = readProjects();
-      jsonOut(true, 'status', { running: true, url: `http://localhost:${port}`, project: projectsData.activeProject || null });
-      const pid = readFileSync(DEFAULT_PID_FILE, 'utf8').trim();
-      console.log('✅ Drafted server is running');
-      console.log(`   PID: ${pid}`);
-      console.log(`   URL: http://localhost:${port}`);
-
-      // Try to ping server
-      try {
-        const response = await authFetch(`http://localhost:${port}/status`);
-        const data = await response.json();
-        console.log(`   Status: ${data.status}`);
-      } catch (error) {
-        console.log(`   Status: unreachable (may be starting up)`);
-      }
-    } else {
-      jsonOut(false, 'status', 'Server not running');
-      console.log('❌ Drafted server is not running');
-      console.log('   Use `drafted start` to start the server');
+    const serverUrl = getServerUrl();
+    let reachable = false;
+    try { reachable = (await fetch(`${serverUrl}/health`, { signal: AbortSignal.timeout(10000) })).ok; } catch { /* unreachable */ }
+    const signedIn = !!readAuth()?.sessionId;
+    if (!reachable) {
+      const hint = /^http:\/\/localhost:/.test(serverUrl) ? ' — start it with `drafted start`' : '';
+      jsonOut(false, 'status', `Drafted server unreachable at ${serverUrl}`);
+      console.log(`❌ Drafted server unreachable at ${serverUrl}${hint}`);
+      process.exit(1);
     }
+    jsonOut(true, 'status', { running: true, url: serverUrl, signedIn });
+    console.log(`✅ Drafted server reachable at ${serverUrl}`);
+    console.log(`   Signed in: ${signedIn ? 'yes' : 'no — run `drafted login`'}`);
   });
 
 // Command: url
@@ -759,7 +803,7 @@ program
   .command('url')
   .description('Get canvas URL')
   .action(() => {
-    if (!isServerRunning()) {
+    if (localServerDown()) {
       jsonOut(false, 'url', 'Server not running');
       console.error('Error: Server is not running');
       process.exit(1);
@@ -886,35 +930,47 @@ program
   });
 
 // Command: list-projects
+// Lists the server's projects. It used to read a local projects.json left over
+// from the self-hosted server, so a signed-in member of an org with hundreds of
+// projects was told "No projects yet".
 program
   .command('projects')
-  .description('List all projects')
-  .action(() => {
-    discoverProjects();
-    const projects = readProjects();
-    jsonOut(true, 'projects', { projects: projects.projects, active: projects.activeProject || null });
-
-    if (projects.projects.length === 0) {
-      console.log('No projects yet');
-      console.log('Create one with: drafted create-project --name "Project Name"');
+  .description('List the projects you can access (read-only)')
+  .option('--org <org>', 'Only this org (id, slug or name)')
+  .action(async (options) => {
+    const data = await readApiGet('projects', '/api/projects', options.org);
+    const projects = (data.projects || []).filter(p => !p.trashedAt);
+    jsonOut(true, 'projects', { projects, active: data.activeProject || null });
+    if (projects.length === 0) {
+      console.log(options.org ? `No projects you can access in org "${options.org}"` : 'No projects you can access');
       return;
     }
-
-    console.log(`Projects (${projects.projects.length}):\n`);
-    projects.projects.forEach(project => {
-      const active = project.id === projects.activeProject ? ' [ACTIVE]' : '';
-      console.log(`  ${project.id}${active}`);
-      console.log(`  ${project.name}`);
-      console.log(`  ${project.path}`);
+    console.log(`Projects (${projects.length}):\n`);
+    for (const p of projects) {
+      const active = p.id === data.activeProject ? ' [ACTIVE]' : '';
+      console.log(`  ${p.name}${active}`);
+      console.log(`  /o/${p.orgSlug || p.orgId}/projects/${p.folder ? `${p.folder}/` : ''}${p.slug || p.id}`);
+      console.log(`  ${p.id}`);
       console.log('');
-    });
+    }
   });
 
 // Command: layers
 program
   .command('layers')
-  .description('List frame layers')
-  .action(() => {
+  .description("List frame layers — the built-in set, or a project's own with --project")
+  .option('--project <id>', "List this project's layers (read-only)")
+  .option('--org <org>', 'Resolve against this org (id or name); scopes per-request without switching the session')
+  .action(async (options) => {
+    if (options.project) {
+      const data = await readApiGet('layers', withQuery('/api/fs/', { path: '/', projectId: options.project }), options.org);
+      const layers = (data.layers || []).map(l => ({ id: String(l.path || '').replace(/^\//, ''), label: l.label, description: l.description, lanes: l.lanes || [] }));
+      jsonOut(true, 'layers', { project: data.project || null, layers });
+      console.log(`Layers of ${data.project?.name || options.project}:\n`);
+      if (layers.length === 0) console.log('  (no layers)');
+      for (const l of layers) console.log(`  ${l.id}  —  ${l.label || ''}${l.lanes.length ? `  [${l.lanes.join(' ')}]` : ''}`);
+      return;
+    }
     const layersArray = Object.entries(LAYERS).map(([key, layer]) => ({
       id: key, label: layer.label, description: layer.description, defaultType: LAYER_TYPE_INFERENCE[key] || 'design'
     }));
@@ -1194,7 +1250,7 @@ program
   .action(async (source, options) => {
     requireLogin();
 
-    if (!isServerRunning()) {
+    if (localServerDown()) {
       jsonOut(false, 'add', 'Server is not running. Start it with `drafted start`');
       console.error('Error: Server is not running. Start it with `drafted start`');
       process.exit(1);
@@ -1292,7 +1348,8 @@ program
   .option('--summary', 'Include size, updatedAt, and title for frames')
   .option('--pattern <glob>', 'Filter frame filenames (e.g. "*.html")')
   .action(async (path, options) => {
-    const params = { path: path || '/', projectId: options.project, pattern: options.pattern };
+    const target = await resolveCanonicalPath('ls', path || '/', options.project);
+    const params = { path: target.path, projectId: target.projectId, pattern: options.pattern };
     if (options.recursive) { params.recursive = 'true'; params.summary = 'true'; }
     else if (options.summary) params.summary = 'true';
     const data = await readApiGet('ls', withQuery('/api/fs/', params), options.org);
@@ -1309,9 +1366,10 @@ program
   .option('--org <org>', 'Resolve against this org (id or name); scopes per-request without switching the session')
   .option('--lines <range>', 'Line range to read, e.g. "1-40" or "20"')
   .action(async (pathOrId, options) => {
+    const target = await resolveCanonicalPath('read', pathOrId, options.project);
     let apiPath;
     try {
-      apiPath = frameReadPath(pathOrId, options.project, options.lines);
+      apiPath = frameReadPath(target.path, target.projectId, options.lines);
     } catch (err) {
       jsonOut(false, 'read', err.message);
       console.error(`❌ ${err.message}`);

package/package.json

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