sillyspec 3.20.2 → 3.20.3

package/packages/dashboard/src/components/ProjectOverview.vue

@@ -1,152 +1,178 @@
 <template>
-  <div class="overview-section">
-    <!-- 头部 -->
-    <div class="section-header">
-      <h1 class="section-title">
-        项目概览
-        <span class="badge">{{ projects.length }} 个项目</span>
-      </h1>
-      <div class="section-actions">
-        <button class="btn btn-icon" title="刷新" @click="refresh">↻</button>
-        <button class="btn btn-secondary" @click="resetLayout">重置布局</button>
-      </div>
+  <div v-if="project" class="project-overview">
+    <!-- Name + Path -->
+    <div class="ov-section">
+      <span class="ov-name">{{ project.name }}</span>
+      <span class="ov-path">{{ shortPath }}</span>
     </div>
+    <div class="ov-divider" />
 
-    <!-- 卡片容器 -->
-    <div class="cards-container">
-      <ProjectCard
-        v-for="project in projects"
-        :key="project.name"
-        :project="project"
-        :is-selected="activeProject?.name === project.name"
-        @select="handleSelect"
-      />
+    <!-- Tech Stack -->
+    <div class="ov-section ov-clickable" @click="$emit('show-detail', 'tech')">
+      <span class="ov-label">技术栈</span>
+      <span v-for="t in overview.techStack" :key="t" class="ov-tag">{{ t }}</span>
+    </div>
+    <div class="ov-divider" />
+
+    <!-- Stage -->
+    <div v-if="project.state?.currentStage" class="ov-section">
+      <span class="ov-label">阶段</span>
+      <span class="ov-value">{{ project.state.currentStage }}</span>
+    </div>
+    <div v-else-if="project.state" class="ov-section">
+      <span class="ov-label">阶段</span>
+      <span class="ov-value" style="color:#9CA3AF;">未执行</span>
+    </div>
+    <div v-if="project.state?.currentStage" class="ov-divider" />
+
+    <!-- Last Active -->
+    <div v-if="overview.lastActive" class="ov-section">
+      <span class="ov-label">最近活跃</span>
+      <span class="ov-value">{{ formatTime(overview.lastActive) }}</span>
+    </div>
+    <div v-if="overview.lastActive" class="ov-divider" />
+
+    <!-- Doc Stats -->
+    <div v-if="overview.docStats.total > 0" class="ov-section ov-clickable" @click="$emit('show-detail', 'docs')">
+      <span class="ov-label">文档</span>
+      <span class="ov-value">{{ docSummary }}</span>
+    </div>
+    <div v-if="overview.docStats.total > 0" class="ov-divider" />
+
+    <!-- Git -->
+    <div class="ov-section ov-git ov-clickable" @click="$emit('show-detail', 'git')">
+      <span v-if="overview.git.branch" class="ov-branch">{{ overview.git.branch }}</span>
+      <span v-if="overview.git.lastCommit" class="ov-commit" :title="overview.git.lastCommit">{{ truncate(overview.git.lastCommit, 40) }}</span>
+      <span v-if="overview.git.dirtyCount > 0" class="ov-dirty">{{ overview.git.dirtyCount }} 未提交</span>
     </div>
   </div>
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
-import ProjectCard from './ProjectCard.vue'
-import { useLayout } from '../composables/useLayout.js'
+import { computed } from 'vue'
 
 const props = defineProps({
-  projects: { type: Array, default: () => [] },
-  activeProject: { type: Object, default: null }
+  project: { type: Object, default: null }
 })
 
-const emit = defineEmits(['select'])
+defineEmits(['show-detail'])
 
-function handleSelect(project) {
-  emit('select', project)
-}
+const overview = computed(() => props.project?.overview || { techStack: [], lastActive: null, docStats: { design: 0, plan: 0, archive: 0, changes: 0, scan: 0, quicklog: 0, total: 0 }, git: { branch: '', lastCommit: '', dirtyCount: 0 } })
 
-function refresh() {
-  // TODO: 实现刷新逻辑
-  window.location.reload()
-}
+const shortPath = computed(() => {
+  const p = props.project?.path || ''
+  return p.replace(/^\/Users\/[^/]+/, '~')
+})
 
-function resetLayout() {
-  if (confirm('确定要重置布局吗？')) {
-    useLayout().resetLayout()
-  }
-}
-</script>
+const docSummary = computed(() => {
+  const s = overview.value.docStats
+  const parts = []
+  if (s.design) parts.push(`设计 ${s.design}`)
+  if (s.plan) parts.push(`计划 ${s.plan}`)
+  if (s.archive) parts.push(`归档 ${s.archive}`)
+  if (s.changes) parts.push(`变更 ${s.changes}`)
+  return parts.join(' / ') || `${s.total} 篇`
+})
 
-<style scoped>
-.overview-section {
-  height: 100%;
-  background: #FFFFFF;
-  padding: 16px 24px;
-  display: flex;
-  flex-direction: column;
+function formatTime(iso) {
+  if (!iso) return ''
+  const d = new Date(iso)
+  const now = new Date()
+  const diffMs = now - d
+  if (diffMs < 60000) return '刚刚'
+  if (diffMs < 3600000) return `${Math.floor(diffMs / 60000)} 分钟前`
+  if (diffMs < 86400000) return `${Math.floor(diffMs / 3600000)} 小时前`
+  if (diffMs < 604800000) return `${Math.floor(diffMs / 86400000)} 天前`
+  return `${d.getMonth() + 1}/${d.getDate()}`
 }
 
-.section-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16px;
+function truncate(s, n) {
+  return s.length > n ? s.slice(0, n) + '…' : s
 }
+</script>
 
-.section-title {
-  font-size: 18px;
-  font-weight: 600;
-  color: #1A1A1A;
+<style scoped>
+.project-overview {
   display: flex;
   align-items: center;
+  background: #FFFFFF;
+  border-bottom: 1px solid #E5E5EA;
+  padding: 8px 16px;
+  min-height: 48px;
   gap: 8px;
+  flex-shrink: 0;
+  overflow-x: auto;
 }
-
-.badge {
-  font-size: 12px;
-  padding: 2px 8px;
-  background: #E5E7EB;
-  border-radius: 10px;
-  color: #6B7280;
-  font-weight: 500;
-}
-
-.section-actions {
+.ov-section {
   display: flex;
-  gap: 8px;
   align-items: center;
+  gap: 6px;
+  white-space: nowrap;
+  flex-shrink: 0;
 }
-
-.btn {
-  padding: 6px 12px;
-  border-radius: 6px;
-  border: none;
+.ov-clickable {
   cursor: pointer;
-  font-size: 13px;
-  font-weight: 500;
-  transition: all 0.2s;
+  border-radius: 4px;
+  padding: 2px 6px;
+  margin: -2px -6px;
+  transition: background 0.15s;
 }
-
-.btn:hover {
-  opacity: 0.9;
+.ov-clickable:hover {
+  background: rgba(217,119,6,0.06);
 }
-
-.btn-secondary {
-  background: #E5E7EB;
-  color: #374151;
+.ov-name {
+  font-weight: 600;
+  font-size: 13px;
+  color: #1C1C1E;
 }
-
-.btn-icon {
-  padding: 6px;
-  width: 32px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: #F3F4F6;
-  border-radius: 6px;
+.ov-path {
+  font-size: 11px;
+  color: #636366;
 }
-
-.btn-icon:hover {
-  background: #E5E7EB;
+.ov-label {
+  font-size: 11px;
+  color: #636366;
 }
-
-.cards-container {
-  flex: 1;
-  display: flex;
-  gap: 16px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  padding-bottom: 8px;
+.ov-value {
+  font-size: 12px;
+  color: #1C1C1E;
+  font-weight: 500;
 }
-
-.cards-container::-webkit-scrollbar {
-  height: 8px;
+.ov-tag {
+  font-size: 10px;
+  padding: 1px 8px;
+  border-radius: 10px;
+  background: rgba(217,119,6,0.08);
+  color: #D97706;
+  font-weight: 500;
 }
-
-.cards-container::-webkit-scrollbar-track {
-  background: #F3F4F6;
+.ov-divider {
+  width: 1px;
+  height: 20px;
+  background: #E5E5EA;
+  flex-shrink: 0;
+}
+.ov-git {
+  margin-left: auto;
+  gap: 10px;
+}
+.ov-branch {
+  font-size: 11px;
+  color: #636366;
+  background: #F5F5F7;
+  padding: 1px 8px;
   border-radius: 4px;
 }
-
-.cards-container::-webkit-scrollbar-thumb {
-  background: #D1D5DB;
-  border-radius: 4px;
+.ov-commit {
+  font-size: 11px;
+  color: #636366;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.ov-dirty {
+  font-size: 11px;
+  color: #D97706;
+  font-weight: 500;
 }
 </style>

package/packages/dashboard/src/components/StageBadge.vue

@@ -19,15 +19,7 @@ const props = defineProps({
 
 const displayLabel = computed(() => {
   if (props.label) return props.label
-  const labels = {
-    'completed': 'done',
-    'in-progress': 'running',
-    'blocked': 'blocked',
-    'failed': 'error',
-    'revising': 'revising',
-    'stale': 'stale',
-    'waiting': 'waiting',
-  }
+  const labels = { 'completed': 'done', 'in-progress': 'running', 'blocked': 'blocked', 'failed': 'error' }
   return labels[props.status] || ''
 })
 
@@ -39,10 +31,7 @@ const badgeStyle = computed(() => {
     'in-progress': { background: 'rgba(251,191,36,0.1)', color: '#D97706' },
     'blocked': { background: 'rgba(251,146,60,0.1)', color: '#EA580C' },
     'failed': { background: 'rgba(239,68,68,0.1)', color: '#DC2626' },
-    'pending': { background: 'rgba(82,82,82,0.15)', color: '#6B7280' },
-    'revising': { background: 'rgba(139,92,246,0.1)', color: '#7C3AED' },
-    'stale': { background: 'rgba(234,179,8,0.1)', color: '#CA8A04' },
-    'waiting': { background: 'rgba(59,130,246,0.1)', color: '#2563EB' },
+    'pending': { background: 'rgba(82,82,82,0.15)', color: '#6B7280' }
   }
   return styles[props.status] || styles.pending
 })
@@ -57,10 +46,7 @@ const dotStyle = computed(() => {
     'in-progress': '#D97706',
     'blocked': '#EA580C',
     'failed': '#DC2626',
-    'pending': '#6B7280',
-    'revising': '#7C3AED',
-    'stale': '#CA8A04',
-    'waiting': '#2563EB',
+    'pending': '#6B7280'
   }
   return { background: colors[props.status] || '#6B7280' }
 })

package/packages/dashboard/src/components/StepCard.vue

@@ -62,10 +62,7 @@ const emit = defineEmits(['select'])
 const hovered = ref(false)
 
 const barColor = computed(() => {
-  const colors = {
-    'completed': '#16A34A', 'in-progress': '#D97706', 'blocked': '#EA580C', 'failed': '#DC2626', 'pending': '#E5E5EA',
-    'revising': '#7C3AED', 'stale': '#CA8A04', 'waiting': '#2563EB',
-  }
+  const colors = { 'completed': '#16A34A', 'in-progress': '#D97706', 'blocked': '#EA580C', 'failed': '#DC2626', 'pending': '#E5E5EA' }
   return colors[props.step.status] || colors.pending
 })
 
@@ -75,9 +72,7 @@ const cardStyle = computed(() => ({
 }))
 
 const statusLabel = computed(() => {
-  const labels = { 'completed': '完成', 'in-progress': '进行中', 'blocked': '阻塞', 'failed': '失败', 'pending': '待办',
-    'revising': '修订中', 'stale': '已失效', 'waiting': '等待中',
-  }
+  const labels = { 'completed': '完成', 'in-progress': '进行中', 'blocked': '阻塞', 'failed': '失败', 'pending': '待办' }
   return labels[props.step.status] || '待办'
 })
 

package/packages/dashboard/src/composables/useDashboard.js

@@ -125,35 +125,8 @@ export function useDashboard() {
       const updated = getProject(state.activeProject.path)
       if (updated) {
         state.activeProject = updated
-        return
       }
     }
-
-    state.activeProject = state.projects[0] || null
-  }
-
-  /**
-   * Merge a single project update into the current project list.
-   * @param {object} project - Partial project payload containing at least path
-   */
-  function updateProject(project) {
-    if (!project?.path) return
-
-    const index = state.projects.findIndex(p => p.path === project.path)
-    if (index === -1) return
-
-    const updated = {
-      ...state.projects[index],
-      ...project,
-      state: project.state ?? state.projects[index].state,
-      overview: project.overview ?? state.projects[index].overview
-    }
-
-    state.projects.splice(index, 1, updated)
-
-    if (state.activeProject?.path === project.path) {
-      state.activeProject = updated
-    }
   }
 
   /**
@@ -196,7 +169,6 @@ export function useDashboard() {
     openPanel,
     closePanel,
     updateProjects,
-    updateProject,
     setExecuting,
     isExecuting,
     activeProjectName,

package/src/derive.js

@@ -0,0 +1,147 @@
+import { readdirSync, existsSync } from 'fs';
+import { join } from 'path';
+
+/**
+ * 从 artifacts 文件系统反推状态，与 progress.json 交叉校验。
+ * 纯函数，零外部副作用（fix 模式除外）。
+ *
+ * @param {string} cwd - 项目根目录
+ * @param {object} options
+ * @param {'light'|'full'} options.mode - 轻量（当前步骤）或全量扫描
+ * @param {boolean} options.fix - 是否自动修复明显不一致
+ * @param {object} options.pm - ProgressManager 实例（fix 模式需要）
+ * @param {object} options.progress - 已加载的 progress 数据
+ * @returns {{ issues: Array<{type:string, severity:string, stage:string, step:number, message:string, suggestion:string}>, fixed: number }}
+ */
+export function deriveState(cwd, options = {}) {
+  const { mode = 'light', fix = false, pm = null, progress = null } = options;
+
+  const issues = [];
+  let fixed = 0;
+
+  const artifactsDir = join(cwd, '.sillyspec', '.runtime', 'artifacts');
+  if (!existsSync(artifactsDir)) {
+    return { issues: [{ type: 'no-artifacts', severity: 'info', stage: '-', step: 0, message: 'artifacts 目录不存在', suggestion: '正常，项目刚开始' }], fixed: 0 };
+  }
+
+  // 扫描 artifacts 文件，解析 stage/step 信息
+  const artifactMap = {}; // { "stage:stepN": [filenames] }
+  const stageStepSet = new Set(); // "stage:stepN"
+
+  let files;
+  try {
+    files = readdirSync(artifactsDir).filter(f => f.endsWith('.txt'));
+  } catch {
+    return { issues: [], fixed: 0 };
+  }
+
+  for (const file of files) {
+    // 格式: {stage}-step{N}-{timestamp}.txt
+    const match = file.match(/^(.+)-step(\d+)-\d+\.txt$/);
+    if (match) {
+      const [, stage, stepStr] = match;
+      const key = `${stage}:${stepStr}`;
+      if (!artifactMap[key]) artifactMap[key] = [];
+      artifactMap[key].push(file);
+      stageStepSet.add(key);
+    }
+  }
+
+  // 需要检查的阶段
+  let stagesToCheck = [];
+  if (progress) {
+    if (mode === 'light') {
+      // 轻量：只检查 currentStage
+      const currentStage = progress.currentStage || '';
+      if (currentStage) stagesToCheck.push(currentStage);
+    } else {
+      // 全量：检查所有阶段
+      stagesToCheck = Object.keys(progress.stages || {});
+    }
+  } else {
+    // 没有 progress 数据，从 artifacts 推断所有阶段
+    for (const key of stageStepSet) {
+      const stage = key.split(':')[0];
+      if (!stagesToCheck.includes(stage)) stagesToCheck.push(stage);
+    }
+  }
+
+  for (const stage of stagesToCheck) {
+    const stageData = progress?.stages?.[stage];
+    const steps = stageData?.steps || [];
+
+    // 收集 artifacts 中该阶段的步骤编号
+    const artifactSteps = new Set();
+    for (const key of stageStepSet) {
+      const [s, n] = key.split(':');
+      if (s === stage) artifactSteps.add(parseInt(n));
+    }
+
+    // 检查1：artifacts 有但 progress 未标记完成
+    for (const stepNum of artifactSteps) {
+      const stepIdx = stepNum - 1;
+      if (stepIdx < steps.length) {
+        const step = steps[stepIdx];
+        if (step.status !== 'done') {
+          issues.push({
+            type: 'missing-progress',
+            severity: 'issue',
+            stage,
+            step: stepNum,
+            message: `artifacts 有 ${stage}-step${stepNum} 文件但 progress 未标记完成`,
+            suggestion: '标记该步骤为 done'
+          });
+          if (fix && pm && progress) {
+            step.status = 'done';
+            pm._write(cwd, progress);
+            fixed++;
+          }
+        }
+      }
+    }
+
+    // 检查2：progress 有但 artifacts 无文件（warning，不修复）
+    for (let i = 0; i < steps.length; i++) {
+      const step = steps[i];
+      if (step.status === 'done' && !artifactSteps.has(i + 1)) {
+        issues.push({
+          type: 'missing-artifact',
+          severity: 'warning',
+          stage,
+          step: i + 1,
+          message: `${stage} step ${i + 1} 标记完成但 artifacts 无对应文件`,
+          suggestion: '可能被手动清理，忽略即可'
+        });
+      }
+    }
+
+    // 检查3：artifacts 有 step5 但 progress 只到 step3（中间漏记）
+    if (artifactSteps.size > 0) {
+      const maxArtifactStep = Math.max(...artifactSteps);
+      const maxProgressDoneStep = steps.reduce((max, s, i) => s.status === 'done' ? Math.max(max, i + 1) : max, 0);
+
+      if (maxArtifactStep > maxProgressDoneStep && maxProgressDoneStep > 0) {
+        // 检查中间是否有漏记的
+        for (let i = maxProgressDoneStep + 1; i <= maxArtifactStep; i++) {
+          if (artifactSteps.has(i) && i - 1 < steps.length && steps[i - 1].status !== 'done') {
+            // 已在检查1处理，跳过
+          }
+        }
+      }
+
+      // progress 步骤数少于 artifacts 最大步骤号
+      if (maxArtifactStep > steps.length) {
+        issues.push({
+          type: 'missing-steps',
+          severity: 'issue',
+          stage,
+          step: steps.length + 1,
+          message: `artifacts 有 step${maxArtifactStep} 但 progress 只有 ${steps.length} 个步骤`,
+          suggestion: 'progress 数据可能不完整'
+        });
+      }
+    }
+  }
+
+  return { issues, fixed };
+}