sillyspec 3.8.4 → 3.8.6

package/packages/dashboard/server/watcher.js

@@ -1,202 +1,100 @@
 import chokidar from 'chokidar'
-import { join, basename, dirname, sep } from 'path'
+import { join } from 'path'
 import { homedir } from 'os'
-import { existsSync, readdirSync, realpathSync } from 'fs'
+import { existsSync } from 'fs'
 import { parseProjectState } 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'
-])
 
 /**
- * Check if directory should be excluded from scanning
- * @param {string} name - Directory name
- * @returns {boolean}
+ * Start watching all .sillyspec directories
+ * @param {function} callback - Callback function when projects are updated
+ * @returns {object} The watcher instance
  */
-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
+export function startWatcher(callback) {
+  if (watcher) {
+    stopWatcher()
   }
-  return false
-}
 
-/**
- * Build list of directories to scan
- * @returns {string[]}
- */
-function buildScanDirs() {
+  updateCallback = callback
+
+  // Discover all .sillyspec directories
   const home = homedir()
   const cwd = process.cwd()
 
-  const scanDirs = new Set()
-
-  // Always scan cwd and its parent
-  scanDirs.add(cwd)
-  scanDirs.add(dirname(cwd))
-
-  // 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)
+  // 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
+  }
 
-  // Common project directories - check both English and Chinese names
-  const extraDirs = [
-    'Desktop', '桌面',
-    'Documents', '文档',
-    'Downloads', '下载',
-    'Projects', '项目',
-    'Work', '工作',
-    'Repos', 'Code', 'src', 'dev',
-    'workspace', '工作区'
-  ]
+  // Build scan directories: cwd + home subdirs + common project locations
+  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.add(extraPath)
-    }
-  }
-
-  // Add custom scan paths
-  for (const customPath of customScanPaths) {
-    if (existsSync(customPath)) {
-      scanDirs.add(customPath)
+      scanDirs.push(extraPath)
     }
   }
 
-  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 watchPaths = []
   const projects = []
+  const seen = new Set() // Dedupe by path
 
-  try {
-    const entries = readdirSync(baseDir, { withFileTypes: true })
+  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, cwd)) continue
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue
+        if (shouldExclude(entry.name)) continue
 
-      const dirPath = join(baseDir, entry.name)
+        const dirPath = join(baseDir, entry.name)
 
-      let realPath
-      try { realPath = realpathSync(dirPath) } catch { realPath = dirPath }
-      const normalizedPath = realPath.toLowerCase()
-      if (seen.has(normalizedPath)) continue
-      seen.add(normalizedPath)
+        // Skip if we've already seen this path
+        if (seen.has(dirPath)) continue
+        seen.add(dirPath)
 
-      // Check if this dir has .sillyspec
-      const sillyspecPath = join(dirPath, '.sillyspec')
-      if (existsSync(sillyspecPath)) {
-        projects.push({
-          name: entry.name,
-          path: dirPath
-        })
-      }
+        const sillyspecPath = join(dirPath, '.sillyspec')
 
-      // Recurse into subdirectories if not at max depth
-      if (currentDepth < maxDepth) {
-        projects.push(...scanDirectory(dirPath, seen, maxDepth, currentDepth + 1))
+        if (existsSync(sillyspecPath)) {
+          watchPaths.push(sillyspecPath)
+          projects.push({
+            name: entry.name,
+            path: dirPath
+          })
+        }
       }
-    }
-  } 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 = []
-
-  if (!seen.has(cwd)) {
-    seen.add(cwd)
-    const sillyspecPath = join(cwd, '.sillyspec')
-    if (existsSync(sillyspecPath)) {
-      projects.push({
-        name: basename(cwd),
-        path: cwd
-      })
+    } catch (err) {
+      // Skip directories we can't read
+      continue
     }
   }
 
-  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)
@@ -246,18 +144,18 @@ export function startWatcher(callback) {
  * @param {string} filePath - Path to the changed file
  */
 async function handleFileChange(filePath) {
-  // Normalize path for comparison
-  const normalizedPath = filePath.replace(/\\/g, '/')
-
+  // Find which project this file belongs to
   const projectName = Array.from(projectStates.values()).find(p =>
-    normalizedPath.startsWith(p.path.replace(/\\/g, '/'))
+    filePath.startsWith(p.path)
   )?.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)
@@ -266,6 +164,7 @@ async function handleFileChange(filePath) {
     }
   }
 
+  // Emit updated state
   if (updateCallback) {
     updateCallback(Array.from(projectStates.values()))
   }
@@ -275,49 +174,77 @@ async function handleFileChange(filePath) {
  * Re-scan for projects (e.g., new .sillyspec directories)
  */
 async function rescanProjects() {
-  const { projects } = discoverAll()
+  const home = homedir()
+  const cwd = process.cwd()
 
-  for (const project of projects) {
-    if (!projectStates.has(project.name)) {
-      const state = parseProjectState(project.path)
-      if (state) {
-        projectStates.set(project.name, {
-          name: project.name,
-          path: project.path,
-          state
-        })
+  // 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
       }
     }
+    if (name.startsWith('.') && name !== cwd.split('/').pop()) {
+      return true
+    }
+    return false
   }
 
-  if (updateCallback) {
-    updateCallback(Array.from(projectStates.values()))
+  // 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)
+    }
   }
-}
 
-/**
- * Add a custom scan path and rescan
- * @param {string} path - Path to add
- */
-export function addCustomScanPath(path) {
-  customScanPaths.add(path)
-  rescanProjects()
-}
+  const seen = new Set()
 
-/**
- * Remove a custom scan path
- * @param {string} path - Path to remove
- */
-export function removeCustomScanPath(path) {
-  customScanPaths.delete(path)
-}
+  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
+    }
+  }
 
-/**
- * Get list of custom scan paths
- * @returns {string[]}
- */
-export function getCustomScanPaths() {
-  return Array.from(customScanPaths)
+  if (updateCallback) {
+    updateCallback(Array.from(projectStates.values()))
+  }
 }
 
 /**
@@ -347,3 +274,4 @@ export function getProjectStates() {
 export function getProjectState(projectName) {
   return projectStates.get(projectName) || null
 }
+

package/packages/dashboard/src/App.vue

@@ -1,79 +1,43 @@
 <template>
-  <n-config-provider :theme-overrides="themeOverrides">
-  <div class="h-screen w-screen flex flex-col overflow-hidden font-[DM_Sans,sans-serif] relative" style="background-color: #F5F5F7;">
+  <div class="h-screen w-screen flex flex-col overflow-hidden font-[DM_Sans,sans-serif] relative" style="background-color: #0A0A0B;">
     <!-- Ambient background -->
     <div class="absolute inset-0 pointer-events-none" style="background: radial-gradient(ellipse 60% 40% at 10% 20%, rgba(251,191,36,0.04) 0%, transparent 70%), radial-gradient(ellipse 50% 50% at 90% 80%, rgba(251,191,36,0.02) 0%, transparent 70%);" />
 
     <!-- Main Content -->
-    <div
-      class="flex-1 flex overflow-hidden relative z-10"
-      :style="isDragging ? 'user-select: none' : ''"
-    >
+    <div class="flex-1 flex overflow-hidden relative z-10">
       <!-- Left: Project List -->
-      <aside
-        class="flex-shrink-0 relative overflow-hidden"
-        :style="`width: ${leftWidth}px; background: #FFFFFF; border-right: none;`"
-      >
+      <aside class="w-[240px] flex-shrink-0 relative" style="background: #111113; border-right: 1px solid #1F1F22;">
         <ProjectList
           :projects="dashboard.state.projects"
           :active-project="dashboard.state.activeProject"
           :is-loading="dashboard.state.isLoading"
-          :scan-paths="scanPaths"
           @select="handleSelectProject"
-          @scan:add-path="handleAddScanPath"
-          @scan:remove-path="handleRemoveScanPath"
         />
       </aside>
 
-      <!-- Left ↔ Center resize handle -->
-      <div
-        class="w-[2px] flex-shrink-0 cursor-col-resize hover:bg-[#D97706] active:bg-[#D97706] relative z-20"
-        style="background: #2A3040;"
-        @mousedown="startDragLeft"
-      />
-
       <!-- Center: Pipeline View -->
-      <main class="flex-1 overflow-hidden accent-stripe flex flex-col" style="min-width: 300px;">
-        <ProjectOverview :project="dashboard.state.activeProject" @show-detail="handleShowDetail" />
+      <main class="flex-1 overflow-hidden accent-stripe">
         <PipelineView
           :project="dashboard.state.activeProject"
           :active-step="dashboard.state.activeStep"
-          :active-tab="dashboard.state.activeTab"
-          :docs="dashboard.state.docs"
-          :selected-doc-file="dashboard.state.selectedDocFile"
-          :doc-content="dashboard.state.docContent"
-          :doc-loading="dashboard.state.docLoading"
           @select-step="handleSelectStep"
-          @switch-tab="handleSwitchTab"
-          @select-doc-file="handleSelectDocFile"
         />
       </main>
 
-      <!-- Center ↔ Right resize handle -->
-      <div
-        v-if="dashboard.state.isPanelOpen"
-        class="w-[2px] flex-shrink-0 cursor-col-resize hover:bg-[#D97706] active:bg-[#D97706] relative z-20"
-        style="background: #2A3040;"
-        @mousedown="startDragRight"
-      />
-
       <!-- Right: Detail Panel -->
       <aside
         :class="[
-          'flex-shrink-0 relative overflow-hidden',
-          dashboard.state.isPanelOpen ? '' : 'w-0'
+          'flex-shrink-0 transition-all duration-300 relative overflow-hidden',
+          dashboard.state.isPanelOpen ? 'w-[340px]' : 'w-0'
         ]"
-        :style="dashboard.state.isPanelOpen ? `width: ${rightWidth}px; background: #FFFFFF; transition: none;` : 'background: #FFFFFF;'"
+        style="background: #111113; border-left: 1px solid #1F1F22;"
       >
         <DetailPanel
           :is-open="dashboard.state.isPanelOpen"
           :active-step="dashboard.state.activeStep"
           :logs="dashboard.state.logs"
-          :detail-type="detailType"
-          :detail-data="detailData"
-          @close="handleDetailClose"
+          @close="dashboard.closePanel"
           @clear-logs="dashboard.clearLogs"
-          @open-doc-file="handleOpenDocFromDetail"
         />
       </aside>
     </div>
@@ -99,11 +63,10 @@
       @select-stage="handleSelectStage"
     />
   </div>
-  </n-config-provider>
 </template>
 
 <script setup>
-import { ref, onMounted, readonly } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useWebSocket } from './composables/useWebSocket.js'
 import { useDashboard } from './composables/useDashboard.js'
 import { useDashboardKeyboard } from './composables/useKeyboard.js'
@@ -111,7 +74,6 @@ import ProjectList from './components/ProjectList.vue'
 import PipelineView from './components/PipelineView.vue'
 import DetailPanel from './components/DetailPanel.vue'
 import ActionBar from './components/ActionBar.vue'
-import ProjectOverview from './components/ProjectOverview.vue'
 import CommandPalette from './components/CommandPalette.vue'
 
 // Composables
@@ -119,70 +81,6 @@ const ws = useWebSocket()
 const dashboard = useDashboard()
 const isCommandPaletteOpen = ref(false)
 const executionResult = ref(null)
-const scanPaths = ref([])
-const detailType = ref(null)
-const detailData = ref(null)
-
-// Panel resize state
-const STORAGE_KEY = 'dashboard-panel-widths'
-const MIN_LEFT = 180
-const MIN_CENTER = 300
-const MIN_RIGHT = 260
-const DEFAULT_LEFT = 240
-const DEFAULT_RIGHT = 340
-
-const leftWidth = ref(DEFAULT_LEFT)
-const rightWidth = ref(DEFAULT_RIGHT)
-const isDragging = ref(false)
-
-// Load persisted widths
-try {
-  const saved = JSON.parse(localStorage.getItem(STORAGE_KEY))
-  if (saved?.left >= MIN_LEFT) leftWidth.value = saved.left
-  if (saved?.right >= MIN_RIGHT) rightWidth.value = saved.right
-} catch {}
-
-function persistWidths() {
-  localStorage.setItem(STORAGE_KEY, JSON.stringify({ left: leftWidth.value, right: rightWidth.value }))
-}
-
-function startDragLeft(e) {
-  e.preventDefault()
-  isDragging.value = true
-  const startX = e.clientX
-  const startW = leftWidth.value
-  const onMove = (ev) => {
-    const delta = ev.clientX - startX
-    leftWidth.value = Math.max(MIN_LEFT, startW + delta)
-  }
-  const onUp = () => {
-    window.removeEventListener('mousemove', onMove)
-    window.removeEventListener('mouseup', onUp)
-    isDragging.value = false
-    persistWidths()
-  }
-  window.addEventListener('mousemove', onMove)
-  window.addEventListener('mouseup', onUp)
-}
-
-function startDragRight(e) {
-  e.preventDefault()
-  isDragging.value = true
-  const startX = e.clientX
-  const startW = rightWidth.value
-  const onMove = (ev) => {
-    const delta = startX - ev.clientX
-    rightWidth.value = Math.max(MIN_RIGHT, startW + delta)
-  }
-  const onUp = () => {
-    window.removeEventListener('mousemove', onMove)
-    window.removeEventListener('mouseup', onUp)
-    isDragging.value = false
-    persistWidths()
-  }
-  window.addEventListener('mousemove', onMove)
-  window.addEventListener('mouseup', onUp)
-}
 
 // Keyboard shortcuts
 useDashboardKeyboard({
@@ -225,37 +123,11 @@ onMounted(() => {
       executionResult.value = { exitCode: -1, signal: 'SIGTERM' }
     }
   })
-  ws.on('scan:paths', (paths) => { scanPaths.value = paths })
-  ws.on('docs:tree', (docs) => { dashboard.updateDocs(docs) })
 })
 
-function handleSelectProject(project) {
-  dashboard.selectProject(project)
-  dashboard.selectDocFile(null)
-  dashboard.setDocContent('')
-  // Request docs for this project
-  if (project?.path) {
-    ws.send({ type: 'docs:get', data: { projectPath: project.path } })
-  }
-}
+function handleSelectProject(project) { dashboard.selectProject(project) }
 function handleSelectStage({ project, stage }) { dashboard.selectProject(project) }
 function handleSelectStep(step) { dashboard.selectStep(step) }
-function handleSwitchTab(tab) { dashboard.setActiveTab(tab) }
-function handleSelectDocFile(file) {
-  dashboard.selectDocFile(file)
-  dashboard.setDocLoading(true)
-  // Fetch doc content via REST API
-  fetch(`/api/docs/content?path=${encodeURIComponent(file.path)}`)
-    .then(r => r.ok ? r.text() : '')
-    .then(content => {
-      dashboard.setDocContent(content)
-      dashboard.setDocLoading(false)
-    })
-    .catch(() => {
-      dashboard.setDocContent('')
-      dashboard.setDocLoading(false)
-    })
-}
 function handleExecute() {
   const projectName = dashboard.activeProjectName.value
   if (!projectName) return
@@ -267,49 +139,6 @@ function handleKill() {
   if (!projectName) return
   ws.send({ type: 'cli:kill', data: { projectName } })
 }
-function handleAddScanPath(path) {
-  ws.send({ type: 'scan:add-path', data: { path } })
-}
-function handleRemoveScanPath(path) {
-  ws.send({ type: 'scan:remove-path', data: { path } })
-}
-
-async function handleShowDetail(type) {
-  const project = dashboard.state.activeProject
-  if (!project?.path) return
-  detailType.value = type
-  detailData.value = null
-  dashboard.openPanel()
-  try {
-    const url = `/api/projects/${encodeURIComponent(project.path)}/detail?type=${type}`
-    const res = await fetch(url)
-    if (res.ok) detailData.value = await res.json()
-  } catch {}
-}
-
-function handleDetailClose() {
-  detailType.value = null
-  detailData.value = null
-  dashboard.closePanel()
-}
-
-function handleOpenDocFromDetail(file) {
-  detailType.value = null
-  detailData.value = null
-  dashboard.setActiveTab('docs')
-  handleSelectDocFile(file)
-}
-
-const themeOverrides = {
-  common: {
-    primaryColor: '#D97706',
-    primaryColorHover: '#F59E0B',
-    primaryColorPressed: '#B45309',
-    borderRadius: '6px',
-    fontFamily: 'DM Sans, sans-serif',
-    fontFamilyMono: 'JetBrains Mono, monospace'
-  }
-}
 </script>
 
 <style>