sillyspec 3.9.0 → 3.10.0

package/packages/dashboard/server/watcher.js

@@ -1,105 +1,212 @@
 import chokidar from 'chokidar'
-import { join } from 'path'
+import { join, basename, dirname, sep } from 'path'
 import { homedir } from 'os'
-import { existsSync } from 'fs'
-import { parseProjectState } from './parser.js'
+import { existsSync, readdirSync, realpathSync } from 'fs'
+import { parseProjectState, parseProjectOverview } from './parser.js'
 
 let watcher = null
 let updateCallback = null
 let projectStates = new Map()
+export const customScanPaths = new Set()
+
+// Directories to exclude (system junk, cache, etc.)
+const excludeDirs = new Set([
+  '.Trash', '.cache', '.npm', '.local', '.vscode', 'Library',
+  '.git', 'node_modules', '.Trash-*', '.DS_Store', '.config',
+  '.cocoapods', '.gem', '.rvm', '.nvm', '.asdf', '.brew',
+  'AppData', 'Application Data', '.cargo', '.rustup',
+  '.nuget', '.android', '.gradle', '.m2', '.vscode-server'
+])
 
 /**
- * Start watching all .sillyspec directories
- * @param {function} callback - Callback function when projects are updated
- * @returns {object} The watcher instance
+ * Check if directory should be excluded from scanning
+ * @param {string} name - Directory name
+ * @returns {boolean}
  */
-export function startWatcher(callback) {
-  if (watcher) {
-    stopWatcher()
+function shouldExclude(name, cwd) {
+  if (excludeDirs.has(name)) return true
+  // Check wildcard patterns (like .Trash-*)
+  for (const pattern of excludeDirs) {
+    if (pattern.includes('*')) {
+      const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
+      if (regex.test(name)) return true
+    }
   }
+  // Exclude hidden directories unless it's the cwd basename
+  const cwdName = cwd.split(sep).pop() || cwd.split('/').pop() || ''
+  if (name.startsWith('.') && name !== cwdName) {
+    return true
+  }
+  return false
+}
 
-  updateCallback = callback
-
-  // Discover all .sillyspec directories
+/**
+ * Build list of directories to scan
+ * @returns {string[]}
+ */
+function buildScanDirs() {
   const home = homedir()
   const cwd = process.cwd()
 
-  // Directories to exclude (system junk, cache, etc.)
-  const excludeDirs = new Set([
-    '.Trash', '.cache', '.npm', '.local', '.vscode', 'Library',
-    '.git', 'node_modules', '.Trash-*', '.DS_Store', '.config',
-    '.cocoapods', '.gem', '.rvm', '.nvm', '.asdf', '.brew'
-  ])
-
-  // Helper to check if directory should be excluded
-  const shouldExclude = (name) => {
-    // Check exact matches
-    if (excludeDirs.has(name)) return true
-    // Check wildcard patterns (like .Trash-*)
-    for (const pattern of excludeDirs) {
-      if (pattern.includes('*')) {
-        const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
-        if (regex.test(name)) return true
-      }
-    }
-    // Exclude hidden directories (starting with .) unless it's the cwd basename
-    if (name.startsWith('.') && name !== cwd.split('/').pop()) {
-      return true
-    }
-    return false
-  }
+  const scanDirs = new Set()
+
+  // Always scan cwd and its parent
+  scanDirs.add(cwd)
+  scanDirs.add(dirname(cwd))
 
-  // Build scan directories: cwd + home subdirs + common project locations
-  const scanDirs = [cwd, home]
-  const extraDirs = ['Desktop', 'Documents', 'Projects', 'Work', 'Repos', 'Code', 'src', 'dev']
+  // Scan parent of parent (2 levels up from cwd) to discover sibling projects
+  const parentParent = dirname(dirname(cwd))
+  scanDirs.add(parentParent)
+
+  // Home directory
+  scanDirs.add(home)
+
+  // Common project directories - check both English and Chinese names
+  const extraDirs = [
+    'Desktop', '桌面',
+    'Documents', '文档',
+    'Downloads', '下载',
+    'Projects', '项目',
+    'Work', '工作',
+    'Repos', 'Code', 'src', 'dev',
+    'workspace', '工作区'
+  ]
 
   for (const extra of extraDirs) {
     const extraPath = join(home, extra)
     if (existsSync(extraPath)) {
-      scanDirs.push(extraPath)
+      scanDirs.add(extraPath)
+    }
+  }
+
+  // Add custom scan paths
+  for (const customPath of customScanPaths) {
+    if (existsSync(customPath)) {
+      scanDirs.add(customPath)
     }
   }
 
-  const watchPaths = []
+  return Array.from(scanDirs)
+}
+
+/**
+ * Recursively scan a directory for .sillyspec projects
+ * @param {string} baseDir - Directory to scan
+ * @param {Set} seen - Already seen paths
+ * @param {number} maxDepth - Maximum recursion depth
+ * @param {number} currentDepth - Current depth
+ * @returns {Array} Found projects
+ */
+function scanDirectory(baseDir, seen, maxDepth = 2, currentDepth = 0) {
+  const cwd = process.cwd()
   const projects = []
-  const seen = new Set() // Dedupe by path
 
-  for (const baseDir of scanDirs) {
-    try {
-      const { readdirSync } = require('fs')
-      const entries = readdirSync(baseDir, { withFileTypes: true })
+  try {
+    const entries = readdirSync(baseDir, { withFileTypes: true })
 
-      for (const entry of entries) {
-        if (!entry.isDirectory()) continue
-        if (shouldExclude(entry.name)) continue
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue
+      if (shouldExclude(entry.name, cwd)) continue
 
-        const dirPath = join(baseDir, entry.name)
+      const dirPath = join(baseDir, entry.name)
 
-        // Skip if we've already seen this path
-        if (seen.has(dirPath)) continue
-        seen.add(dirPath)
+      let realPath
+      try { realPath = realpathSync(dirPath) } catch { realPath = dirPath }
+      const normalizedPath = realPath.toLowerCase()
+      if (seen.has(normalizedPath)) continue
+      seen.add(normalizedPath)
 
-        const sillyspecPath = join(dirPath, '.sillyspec')
+      // Check if this dir has .sillyspec
+      const sillyspecPath = join(dirPath, '.sillyspec')
+      if (existsSync(sillyspecPath)) {
+        projects.push({
+          name: entry.name,
+          path: dirPath
+        })
+      }
 
-        if (existsSync(sillyspecPath)) {
-          watchPaths.push(sillyspecPath)
-          projects.push({
-            name: entry.name,
-            path: dirPath
-          })
-        }
+      // Recurse into subdirectories if not at max depth
+      if (currentDepth < maxDepth) {
+        projects.push(...scanDirectory(dirPath, seen, maxDepth, currentDepth + 1))
       }
-    } catch (err) {
-      // Skip directories we can't read
-      continue
+    }
+  } catch (err) {
+    // Skip directories we can't read
+  }
+
+  return projects
+}
+
+/**
+ * Scan cwd itself (it might be a project root)
+ * @param {Set} seen - Already seen paths
+ * @returns {Array} Found projects
+ */
+function scanSelf(seen) {
+  const cwd = process.cwd()
+  const projects = []
+
+  let realPath
+  try { realPath = realpathSync(cwd) } catch { realPath = cwd }
+  const normalizedPath = realPath.toLowerCase()
+
+  if (!seen.has(normalizedPath)) {
+    seen.add(normalizedPath)
+    const sillyspecPath = join(cwd, '.sillyspec')
+    if (existsSync(sillyspecPath)) {
+      projects.push({
+        name: basename(cwd),
+        path: cwd
+      })
     }
   }
 
+  return projects
+}
+
+/**
+ * Discover all .sillyspec projects
+ * @returns {{ projects: Array, watchPaths: string[] }}
+ */
+function discoverAll() {
+  const scanDirs = buildScanDirs()
+  const seen = new Set()
+  const allProjects = []
+
+  // Check cwd itself first
+  allProjects.push(...scanSelf(seen))
+
+  // Scan each base directory
+  for (const baseDir of scanDirs) {
+    allProjects.push(...scanDirectory(baseDir, seen, 2, 0))
+  }
+
+  // Build watch paths
+  const watchPaths = allProjects.map(p => join(p.path, '.sillyspec'))
+
+  return { projects: allProjects, watchPaths }
+}
+
+/**
+ * Start watching all .sillyspec directories
+ * @param {function} callback - Callback function when projects are updated
+ * @returns {object} The watcher instance
+ */
+export function startWatcher(callback) {
+  if (watcher) {
+    stopWatcher()
+  }
+
+  updateCallback = callback
+
+  const { projects, watchPaths } = discoverAll()
+
   // Parse initial states
   for (const project of projects) {
     const state = parseProjectState(project.path)
+    const overview = parseProjectOverview(project.path)
     if (state) {
-      projectStates.set(project.name, { ...project, state })
+      projectStates.set(project.name, { ...project, state, overview })
     }
   }
 
@@ -144,27 +251,27 @@ export function startWatcher(callback) {
  * @param {string} filePath - Path to the changed file
  */
 async function handleFileChange(filePath) {
-  // Find which project this file belongs to
+  // Normalize path for comparison
+  const normalizedPath = filePath.replace(/\\/g, '/')
+
   const projectName = Array.from(projectStates.values()).find(p =>
-    filePath.startsWith(p.path)
+    normalizedPath.startsWith(p.path.replace(/\\/g, '/'))
   )?.name
 
   if (!projectName) {
-    // Re-scan for new projects
     await rescanProjects()
     return
   }
 
-  // Re-parse the project state
   const project = projectStates.get(projectName)
   if (project) {
     const newState = parseProjectState(project.path)
+    const overview = parseProjectOverview(project.path)
     if (newState) {
-      projectStates.set(projectName, { ...project, state: newState })
+      projectStates.set(projectName, { ...project, state: newState, overview })
     }
   }
 
-  // Emit updated state
   if (updateCallback) {
     updateCallback(Array.from(projectStates.values()))
   }
@@ -174,77 +281,51 @@ async function handleFileChange(filePath) {
  * Re-scan for projects (e.g., new .sillyspec directories)
  */
 async function rescanProjects() {
-  const home = homedir()
-  const cwd = process.cwd()
+  const { projects } = discoverAll()
 
-  // Directories to exclude (system junk, cache, etc.)
-  const excludeDirs = new Set([
-    '.Trash', '.cache', '.npm', '.local', '.vscode', 'Library',
-    '.git', 'node_modules', '.Trash-*', '.DS_Store', '.config',
-    '.cocoapods', '.gem', '.rvm', '.nvm', '.asdf', '.brew'
-  ])
-
-  const shouldExclude = (name) => {
-    if (excludeDirs.has(name)) return true
-    for (const pattern of excludeDirs) {
-      if (pattern.includes('*')) {
-        const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
-        if (regex.test(name)) return true
+  for (const project of projects) {
+    if (!projectStates.has(project.name)) {
+      const state = parseProjectState(project.path)
+      const overview = parseProjectOverview(project.path)
+      if (state) {
+        projectStates.set(project.name, {
+          name: project.name,
+          path: project.path,
+          state,
+          overview
+        })
       }
     }
-    if (name.startsWith('.') && name !== cwd.split('/').pop()) {
-      return true
-    }
-    return false
   }
 
-  // Build scan directories
-  const scanDirs = [cwd, home]
-  const extraDirs = ['Desktop', 'Documents', 'Projects', 'Work', 'Repos', 'Code', 'src', 'dev']
-
-  for (const extra of extraDirs) {
-    const extraPath = join(home, extra)
-    if (existsSync(extraPath)) {
-      scanDirs.push(extraPath)
-    }
+  if (updateCallback) {
+    updateCallback(Array.from(projectStates.values()))
   }
+}
 
-  const seen = new Set()
+/**
+ * Add a custom scan path and rescan
+ * @param {string} path - Path to add
+ */
+export function addCustomScanPath(path) {
+  customScanPaths.add(path)
+  rescanProjects()
+}
 
-  for (const baseDir of scanDirs) {
-    try {
-      const { readdirSync } = require('fs')
-      const entries = readdirSync(baseDir, { withFileTypes: true })
-
-      for (const entry of entries) {
-        if (!entry.isDirectory()) continue
-        if (shouldExclude(entry.name)) continue
-
-        const dirPath = join(baseDir, entry.name)
-        if (seen.has(dirPath)) continue
-        seen.add(dirPath)
-
-        const sillyspecPath = join(dirPath, '.sillyspec')
-
-        if (existsSync(sillyspecPath) && !projectStates.has(entry.name)) {
-          const state = parseProjectState(dirPath)
-          if (state) {
-            projectStates.set(entry.name, {
-              name: entry.name,
-              path: dirPath,
-              state
-            })
-          }
-        }
-      }
-    } catch (err) {
-      continue
-    }
-  }
+/**
+ * Remove a custom scan path
+ * @param {string} path - Path to remove
+ */
+export function removeCustomScanPath(path) {
+  customScanPaths.delete(path)
+}
 
-  if (updateCallback) {
-    updateCallback(Array.from(projectStates.values()))
-  }
+/**
+ * Get list of custom scan paths
+ * @returns {string[]}
+ */
+export function getCustomScanPaths() {
+  return Array.from(customScanPaths)
 }
 
 /**
@@ -274,4 +355,3 @@ export function getProjectStates() {
 export function getProjectState(projectName) {
   return projectStates.get(projectName) || null
 }
-