apigrip 0.2.1 → 0.2.3

package/cli/commands/serve.js

@@ -2,14 +2,13 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { parseSpec } from '../../core/spec-parser.js';
 import { createServer } from '../../server/index.js';
-import { findProjectForDir } from '../../core/projects-store.js';
-
-const ROOT_SPEC_FILES = ['openapi.yaml', 'openapi.yml', 'openapi.json', 'swagger.yaml', 'swagger.yml', 'swagger.json'];
+import { findProjectForDir, loadProjects } from '../../core/projects-store.js';
+import { discoverSpec } from '../../core/spec-discovery.js';
 
 /**
  * Quick project resolution for the serve command.
- * Unlike resolveProjectContext, this never does BFS discovery.
- * Only auto-opens cwd if it's a git repo with a root-level spec file.
+ * Uses full spec discovery for known project dirs (bookmarks, explicit flags, git repos)
+ * but never does BFS on arbitrary directories like home.
  */
 async function resolveServeProject(argv) {
   // 1. Explicit flags take priority
@@ -18,39 +17,39 @@ async function resolveServeProject(argv) {
     return { projectDir, specPath: argv.spec };
   }
   if (argv.project) {
-    const specPath = findRootSpec(argv.project);
-    return { projectDir: argv.project, specPath };
+    const discovered = await discoverSpec(argv.project);
+    return { projectDir: argv.project, specPath: discovered?.specPath || null };
   }
 
   // 2. Check if cwd is inside a bookmarked project
   const cwd = process.cwd();
   const bookmark = findProjectForDir(cwd);
   if (bookmark) {
-    const specPath = bookmark.spec || findRootSpec(bookmark.path);
+    const discovered = bookmark.spec ? null : await discoverSpec(bookmark.path);
+    const specPath = bookmark.spec || discovered?.specPath || null;
     return { projectDir: bookmark.path, specPath };
   }
 
-  // 3. Only auto-open cwd if it's a git repo with a root-level spec
+  // 3. Auto-open cwd if it's a git repo (bounded dir, safe to search)
   const isGitRepo = fs.existsSync(path.join(cwd, '.git'));
   if (isGitRepo) {
-    const specPath = findRootSpec(cwd);
-    if (specPath) {
-      return { projectDir: cwd, specPath };
+    const discovered = await discoverSpec(cwd);
+    if (discovered?.specPath) {
+      return { projectDir: cwd, specPath: discovered.specPath };
     }
   }
 
-  // 4. Start without a project — user can open from history in the UI
-  return { projectDir: null, specPath: null };
-}
-
-function findRootSpec(dir) {
-  for (const name of ROOT_SPEC_FILES) {
-    const p = path.join(dir, name);
-    try {
-      if (fs.statSync(p).isFile()) return p;
-    } catch { /* not found */ }
+  // 4. Fall back to the first bookmarked project
+  const projects = loadProjects();
+  if (projects.length > 0) {
+    const proj = projects[0];
+    const discovered = proj.spec ? null : await discoverSpec(proj.path);
+    const specPath = proj.spec || discovered?.specPath || null;
+    return { projectDir: proj.path, specPath };
   }
-  return null;
+
+  // 5. Start without a project — user can open from history in the UI
+  return { projectDir: null, specPath: null };
 }
 
 export async function serveCommand(argv) {