sillyspec 3.7.25 → 3.7.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillyspec",
-  "version": "3.7.25",
+  "version": "3.7.27",
   "description": "SillySpec CLI — 流程状态机，让 AI 严格按步骤来",
   "icon": "logo.jpg",
   "homepage": "https://sillyspec.ppdmq.top/",

package/src/index.js

@@ -189,7 +189,7 @@ async function main() {
     }
     case 'run': {
       const { runCommand } = await import('./run.js')
-      runCommand(filteredArgs.slice(1), dir)
+      await runCommand(filteredArgs.slice(1), dir)
       break
     }
     case 'dashboard': {

package/src/progress.js

@@ -39,7 +39,7 @@ function emptyStage() {
 function makeInitialProgress(project) {
   const stages = {};
   for (const s of VALID_STAGES) stages[s] = emptyStage();
-  return { _version: CURRENT_VERSION, project: project || '', currentStage: '', stages, lastActive: null };
+  return { _version: CURRENT_VERSION, project: project || '', currentStage: '', currentChange: null, stages, lastActive: null };
 }
 
 // ── ProgressManager ──
@@ -133,9 +133,9 @@ export class ProgressManager {
     data.currentStage = stage;
     if (stageData.status === 'pending') {
       stageData.status = 'in-progress';
-      stageData.startedAt = new Date().toISOString();
+      stageData.startedAt = new Date().toLocaleString('zh-CN',{hour12:false});
     }
-    data.lastActive = new Date().toISOString();
+    data.lastActive = new Date().toLocaleString('zh-CN',{hour12:false});
 
     this._backup(cwd);
     this._write(cwd, data);
@@ -154,7 +154,7 @@ export class ProgressManager {
     }
 
     stageData.steps.push({ name: stepName, status: 'pending' });
-    data.lastActive = new Date().toISOString();
+    data.lastActive = new Date().toLocaleString('zh-CN',{hour12:false});
 
     this._backup(cwd);
     this._write(cwd, data);
@@ -183,11 +183,11 @@ export class ProgressManager {
     // 检查是否所有步骤都 completed
     if (stageData.steps.length > 0 && stageData.steps.every(s => s.status === 'completed')) {
       stageData.status = 'completed';
-      stageData.completedAt = new Date().toISOString();
+      stageData.completedAt = new Date().toLocaleString('zh-CN',{hour12:false});
       console.log(`✅ 阶段 ${stage} 所有步骤已完成，阶段已标记为 completed`);
     }
 
-    data.lastActive = new Date().toISOString();
+    data.lastActive = new Date().toLocaleString('zh-CN',{hour12:false});
     this._backup(cwd);
     this._write(cwd, data);
     console.log(`✅ 步骤已更新: ${stage}/${stepName} → ${status || step.status}`);
@@ -205,7 +205,7 @@ export class ProgressManager {
     if (!data.stages[stage]) data.stages[stage] = emptyStage();
     const stageData = data.stages[stage];
     stageData.status = 'completed';
-    stageData.completedAt = new Date().toISOString();
+    stageData.completedAt = new Date().toLocaleString('zh-CN',{hour12:false});
 
     // 标记所有未完成步骤为 completed
     for (const step of stageData.steps) {
@@ -228,7 +228,7 @@ export class ProgressManager {
       if (!data.stages[nextStage]) data.stages[nextStage] = emptyStage();
       if (data.stages[nextStage].status === 'pending') {
         data.stages[nextStage].status = 'in-progress';
-        data.stages[nextStage].startedAt = new Date().toISOString();
+        data.stages[nextStage].startedAt = new Date().toLocaleString('zh-CN',{hour12:false});
       }
       console.log(`✅ 阶段 ${stage} 已完成，推进到: ${STAGE_LABELS[nextStage] || nextStage}`);
     } else {
@@ -236,12 +236,12 @@ export class ProgressManager {
       console.log(`✅ 阶段 ${stage} 已完成（已是最后阶段）`);
     }
 
-    data.lastActive = new Date().toISOString();
+    data.lastActive = new Date().toLocaleString('zh-CN',{hour12:false});
 
     // 归档到 history/
     const historyDir = this._path(cwd, 'history');
     mkdirSync(historyDir, { recursive: true });
-    const ts = new Date().toISOString().replace(/[:.]/g, '-');
+    const ts = new Date().toLocaleString('zh-CN',{hour12:false}).replace(/[:.]/g, '-');
     writeFileSync(join(historyDir, `${stage}-${ts}.json`), JSON.stringify({ stage, data: stageData, completedAt: stageData.completedAt }, null, 2) + '\n');
 
     this._backup(cwd);
@@ -336,7 +336,7 @@ export class ProgressManager {
       if (!data) { console.log('❌ 无法读取 progress.json'); return; }
       if (!data.stages[stage]) { console.log(`❌ 未知阶段: ${stage}`); return; }
       data.stages[stage] = emptyStage();
-      data.lastActive = new Date().toISOString();
+      data.lastActive = new Date().toLocaleString('zh-CN',{hour12:false});
       this._write(cwd, data);
       console.log(`✅ 已重置阶段: ${stage}`);
     } else {

package/src/run.js

@@ -12,13 +12,40 @@ import { buildExecuteSteps } from './stages/execute.js'
 /**
  * 获取阶段的步骤定义（execute 需要动态构建）
  */
-function getStageSteps(stageName, cwd) {
+async function getStageSteps(stageName, cwd, progress) {
   if (stageName === 'execute') {
-    const plansDir = join(cwd, '.sillyspec', 'plans')
+    const changesDir = join(cwd, '.sillyspec', 'changes')
     let planFile = null
-    if (existsSync(plansDir)) {
-      const files = readdirSync(plansDir).filter(f => f.endsWith('.md')).sort()
-      if (files.length > 0) planFile = join(plansDir, files[files.length - 1])
+    // 优先用 currentChange 指定的变更名
+    if (progress.currentChange) {
+      const target = join(changesDir, progress.currentChange, 'plan.md')
+      if (existsSync(target)) planFile = target
+    }
+    // fallback：扫描 changes/ 非 archive 目录下的 plan.md
+    if (!planFile && existsSync(changesDir)) {
+      const candidates = []
+      for (const entry of readdirSync(changesDir, { withFileTypes: true })) {
+        if (!entry.isDirectory() || entry.name === 'archive') continue
+        const p = join(changesDir, entry.name, 'plan.md')
+        if (existsSync(p)) candidates.push({ name: entry.name, path: p })
+      }
+      if (candidates.length === 1) {
+        planFile = candidates[0].path
+      } else if (candidates.length > 1) {
+        console.log('⚠️  检测到多个变更，请选择：')
+        candidates.forEach((c, i) => console.log(`  ${i + 1}. ${c.name}`))
+        const readline = await import('readline')
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+        const answer = await new Promise(resolve => {
+          rl.question(`\n请输入编号（默认 1）：`, input => {
+            rl.close()
+            const num = parseInt(input) || 1
+            resolve(num >= 1 && num <= candidates.length ? num - 1 : 0)
+          })
+        })
+        planFile = candidates[answer].path
+        console.log(`✅ 已选择：${candidates[answer].name}\n`)
+      }
     }
     return buildExecuteSteps(planFile)
   }
@@ -29,16 +56,16 @@ function getStageSteps(stageName, cwd) {
 /**
  * 确保阶段的 steps 已初始化到 progress.json
  */
-function ensureStageSteps(progress, stageName, cwd) {
+async function ensureStageSteps(progress, stageName, cwd) {
   if (!progress.stages) progress.stages = {}
 
-  const steps = getStageSteps(stageName, cwd)
+  const steps = await getStageSteps(stageName, cwd, progress)
   if (!steps) return false
 
   if (!progress.stages[stageName] || !progress.stages[stageName].steps || progress.stages[stageName].steps.length === 0) {
     progress.stages[stageName] = {
       status: 'in-progress',
-      startedAt: new Date().toISOString(),
+      startedAt: new Date().toLocaleString('zh-CN',{hour12:false}),
       completedAt: null,
       steps: steps.map(s => ({ name: s.name, status: 'pending' }))
     }
@@ -78,9 +105,10 @@ function outputStep(stageName, stepIndex, steps, cwd) {
   console.log(step.prompt)
   console.log(`\n### ⚠️ 铁律`)
   console.log('- 只做本步骤描述的操作，不得自行扩展或跳过')
-  console.log('- 不要回头修改已完成的步骤')
+ console.log('- 不要回头修改已完成的步骤')
   console.log('- 完成后立即执行 --done 命令，不得跳过')
   console.log('- 生成的文件头部必须包含 author（git 用户名）和 created_at（精确到秒）')
+  console.log('- 执行构建/测试前必须先读 local.yaml，优先使用其中配置的命令、路径和环境变量；未配置时才使用默认值')
   console.log(`\n### 完成后执行`)
   console.log(`sillyspec run ${stageName} --done --output "你的摘要"`)
 }
@@ -88,7 +116,7 @@ function outputStep(stageName, stepIndex, steps, cwd) {
 /**
  * sillyspec run <stage> 主命令
  */
-export function runCommand(args, cwd) {
+export async function runCommand(args, cwd) {
   // 解析参数
   const stageName = args[0]
   const flags = args.slice(1)
@@ -111,6 +139,13 @@ export function runCommand(args, cwd) {
     outputText = flags[outputIdx + 1]
   }
 
+  // 解析 --change <name>
+  let changeName = null
+  const changeIdx = flags.indexOf('--change')
+  if (changeIdx !== -1 && flags[changeIdx + 1]) {
+    changeName = flags[changeIdx + 1]
+  }
+
   const isAuxiliary = auxiliaryStages.includes(stageName)
 
   const pm = new ProgressManager()
@@ -125,13 +160,22 @@ export function runCommand(args, cwd) {
     progress = pm.init(cwd)
   }
 
+  // --change 设置当前变更名
+  if (changeName) {
+    progress.currentChange = changeName
+    progress.lastActive = new Date().toLocaleString('zh-CN', { hour12: false })
+    pm._write(cwd, progress)
+    console.log(`✅ 当前变更设置为：${changeName}`)
+    return
+  }
+
   // --reset
   if (isReset) {
-    return resetStage(pm, progress, stageName, cwd)
+    return await resetStage(pm, progress, stageName, cwd)
   }
 
   // 确保步骤已初始化
-  const changed = ensureStageSteps(progress, stageName, cwd)
+  const changed = await ensureStageSteps(progress, stageName, cwd)
   if (changed) {
     pm._write(cwd, progress)
     progress = pm.read(cwd)
@@ -144,19 +188,19 @@ export function runCommand(args, cwd) {
 
   // --skip
   if (isSkip) {
-    return skipStep(pm, progress, stageName, cwd)
+    return await skipStep(pm, progress, stageName, cwd)
   }
 
   // --done
   if (isDone) {
-    return completeStep(pm, progress, stageName, cwd, outputText)
+    return await completeStep(pm, progress, stageName, cwd, outputText)
   }
 
   // 默认：输出当前步骤
-  return runStage(pm, progress, stageName, cwd)
+  return await runStage(pm, progress, stageName, cwd)
 }
 
-function runStage(pm, progress, stageName, cwd) {
+async function runStage(pm, progress, stageName, cwd) {
   const stageData = progress.stages[stageName]
   if (!stageData || !stageData.steps) {
     console.error(`❌ 阶段 ${stageName} 未初始化`)
@@ -167,17 +211,25 @@ function runStage(pm, progress, stageName, cwd) {
   let currentIdx = steps.findIndex(s => s.status !== 'completed' && s.status !== 'skipped')
 
   if (currentIdx === -1) {
-    // 阶段已完成，自动重置，允许重复执行
+    // 阶段已完成
+    console.log(`✅ ${stageName} 阶段已完成。`)
+    console.log(`  继续执行将重新开始，可用 --reset 显式重置。\n`)
+    // 自动重置，允许重复执行
     steps.forEach(s => { s.status = 'pending'; s.completedAt = null; s.output = null; s.startedAt = null })
     stageData.status = 'in_progress'
     stageData.completedAt = null
-    console.log(`🔄 ${stageName} 阶段已完成，重新开始...\n`)
     pm._write(cwd, progress)
     currentIdx = 0
+  } else if (currentIdx > 0) {
+    // 有进行中的步骤，提示用户
+    const completed = currentIdx
+    const total = steps.length
+    console.log(`⚠️  ${stageName} 已进行到第 ${currentIdx + 1}/${total} 步（前 ${completed} 步已完成）。`)
+    console.log(`  继续执行将从中断处恢复，用 --reset 可重新开始。\n`)
   }
 
   const stageDef = stageRegistry[stageName]
-  const defSteps = getStageSteps(stageName, cwd)
+  const defSteps = await getStageSteps(stageName, cwd, progress)
   if (defSteps && defSteps[currentIdx]) {
     outputStep(stageName, currentIdx, defSteps, cwd)
   }
@@ -215,7 +267,7 @@ function validateMetadata(cwd, stageName) {
   }
 }
 
-function completeStep(pm, progress, stageName, cwd, outputText) {
+async function completeStep(pm, progress, stageName, cwd, outputText) {
   const stageData = progress.stages[stageName]
   if (!stageData || !stageData.steps) {
     console.error(`❌ 阶段 ${stageName} 未初始化`)
@@ -232,7 +284,7 @@ function completeStep(pm, progress, stageName, cwd, outputText) {
 
   // 标记完成
   steps[currentIdx].status = 'completed'
-  steps[currentIdx].completedAt = new Date().toISOString()
+  steps[currentIdx].completedAt = new Date().toLocaleString('zh-CN',{hour12:false})
   if (outputText) {
     const MAX_OUTPUT = 200
     if (outputText.length > MAX_OUTPUT) {
@@ -240,7 +292,7 @@ function completeStep(pm, progress, stageName, cwd, outputText) {
       // Save full output to artifacts/
       const artifactsDir = join(cwd, '.sillyspec', '.runtime', 'artifacts')
       mkdirSync(artifactsDir, { recursive: true })
-      const ts = new Date().toISOString().replace(/[:.]/g, '-')
+      const ts = new Date().toISOString().slice(0,19).replace(/[-T:]/g, '')
       writeFileSync(join(artifactsDir, `${stageName}-step${currentIdx + 1}-${ts}.txt`), outputText)
     } else {
       steps[currentIdx].output = outputText
@@ -253,7 +305,7 @@ function completeStep(pm, progress, stageName, cwd, outputText) {
   if (nextPendingIdx === -1) {
     // 全部完成
     stageData.status = 'completed'
-    stageData.completedAt = new Date().toISOString()
+    stageData.completedAt = new Date().toLocaleString('zh-CN',{hour12:false})
 
     const next = getNextStage(stageName)
     if (next) {
@@ -261,17 +313,17 @@ function completeStep(pm, progress, stageName, cwd, outputText) {
       if (!progress.stages[next]) progress.stages[next] = { status: 'pending', steps: [], startedAt: null, completedAt: null }
       if (progress.stages[next].status === 'pending' || !progress.stages[next].status) {
         progress.stages[next].status = 'in-progress'
-        progress.stages[next].startedAt = new Date().toISOString()
+        progress.stages[next].startedAt = new Date().toLocaleString('zh-CN',{hour12:false})
       }
     }
 
-    progress.lastActive = new Date().toISOString()
+    progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
     pm._write(cwd, progress)
 
     // Append to user-inputs.md
     if (outputText) {
       const inputsPath = join(cwd, '.sillyspec', '.runtime', 'user-inputs.md')
-      const entry = `\n## ${new Date().toISOString()} | ${stageName}: ${steps[currentIdx].name}\n- 输出：${outputText}\n`
+      const entry = `\n## ${new Date().toLocaleString('zh-CN',{hour12:false})} | ${stageName}: ${steps[currentIdx].name}\n- 输出：${outputText}\n`
       appendFileSync(inputsPath, entry)
     }
 
@@ -287,22 +339,22 @@ function completeStep(pm, progress, stageName, cwd, outputText) {
     return
   }
 
-  progress.lastActive = new Date().toISOString()
+  progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   pm._write(cwd, progress)
 
   // Append to user-inputs.md
   if (outputText) {
     const inputsPath = join(cwd, '.sillyspec', '.runtime', 'user-inputs.md')
-    const entry = `\n## ${new Date().toISOString()} | ${stageName}: ${steps[currentIdx].name}\n- 输出：${outputText}\n`
+    const entry = `\n## ${new Date().toLocaleString('zh-CN',{hour12:false})} | ${stageName}: ${steps[currentIdx].name}\n- 输出：${outputText}\n`
     appendFileSync(inputsPath, entry)
   }
 
-  const defSteps = getStageSteps(stageName, cwd)
+  const defSteps = await getStageSteps(stageName, cwd, progress)
   console.log(`✅ Step ${currentIdx + 1}/${steps.length} 完成：${steps[currentIdx].name}\n`)
   outputStep(stageName, nextPendingIdx, defSteps, cwd)
 }
 
-function skipStep(pm, progress, stageName, cwd) {
+async function skipStep(pm, progress, stageName, cwd) {
   const stageData = progress.stages[stageName]
   if (!stageData || !stageData.steps) {
     console.error(`❌ 阶段 ${stageName} 未初始化`)
@@ -317,7 +369,7 @@ function skipStep(pm, progress, stageName, cwd) {
     process.exit(1)
   }
 
-  const defSteps = getStageSteps(stageName, cwd)
+  const defSteps = await getStageSteps(stageName, cwd, progress)
   const stepDef = defSteps ? defSteps[currentIdx] : null
   if (stepDef && !stepDef.optional) {
     console.error(`❌ 步骤 "${steps[currentIdx].name}" 不可跳过`)
@@ -325,8 +377,8 @@ function skipStep(pm, progress, stageName, cwd) {
   }
 
   steps[currentIdx].status = 'skipped'
-  steps[currentIdx].skippedAt = new Date().toISOString()
-  progress.lastActive = new Date().toISOString()
+  steps[currentIdx].skippedAt = new Date().toLocaleString('zh-CN',{hour12:false})
+  progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   pm._write(cwd, progress)
 
   console.log(`⏭️ Step ${currentIdx + 1}/${steps.length} 已跳过：${steps[currentIdx].name}`)
@@ -365,15 +417,15 @@ function showStatus(progress, stageName) {
   })
 }
 
-function resetStage(pm, progress, stageName, cwd) {
-  const defSteps = getStageSteps(stageName, cwd)
+async function resetStage(pm, progress, stageName, cwd) {
+  const defSteps = await getStageSteps(stageName, cwd, progress)
   progress.stages[stageName] = {
     status: 'in-progress',
-    startedAt: new Date().toISOString(),
+    startedAt: new Date().toLocaleString('zh-CN',{hour12:false}),
     completedAt: null,
     steps: defSteps ? defSteps.map(s => ({ name: s.name, status: 'pending' })) : []
   }
-  progress.lastActive = new Date().toISOString()
+  progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   pm._write(cwd, progress)
   console.log(`🔄 ${stageName} 阶段已重置`)
 }

package/src/stages/plan.js

@@ -107,7 +107,7 @@ Wave 3（依赖 Wave 2）：Task 4`,
       prompt: `保存计划文件，更新进度。
 
 ### 操作
-1. 保存到 \`.sillyspec/plans/YYYY-MM-DD-<change-name>.md\`
+1. 保存到 \`.sillyspec/changes/<变更名>/plan.md\`
 
 ### 输出
 计划文件路径 + 下一步命令`,