sillyspec 3.24.1 → 3.24.2

package/package.json

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

package/src/run.js

@@ -607,7 +607,7 @@ async function getStageSteps(stageName, cwd, progress, specDir = null) {
 /**
  * 确保阶段的 steps 已初始化到 progress
  */
-async function ensureStageSteps(progress, stageName, cwd, specDir = null) {
+export async function ensureStageSteps(progress, stageName, cwd, specDir = null) {
   if (!progress.stages) progress.stages = {}
 
   const steps = await getStageSteps(stageName, cwd, progress, specDir)
@@ -628,7 +628,15 @@ async function ensureStageSteps(progress, stageName, cwd, specDir = null) {
     const oldSteps = progress.stages[stageName].steps
     progress.stages[stageName].steps = steps.map(s => {
       const old = oldSteps.find(step => step.name === s.name)
-      if (old) return old
+      if (old) return old  // 精确名命中 → 保留旧状态
+      // migratedFrom：新步骤是合并/重命名来的（如 brainstorm 13→8 折叠）。
+      // 吸收的旧步骤全部 completed → 新步骤标 completed，避免 completed 丢失导致 currentIdx 回跳。
+      if (Array.isArray(s.migratedFrom) && s.migratedFrom.length > 0) {
+        const migrated = oldSteps.filter(step => s.migratedFrom.includes(step.name))
+        if (migrated.length > 0 && migrated.every(step => step.status === 'completed')) {
+          return { name: s.name, status: 'completed', migratedFrom: true }
+        }
+      }
       return { name: s.name, status: 'pending' }
     })
     return true
@@ -916,7 +924,8 @@ async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjec
   if (stageName === 'execute' && promptText.includes('{EXECUTE_RUN_ID}')) {
     let runId = ''
     const execSpecBase = platformOpts?.specRoot || join(cwd, '.sillyspec')
-    const runIdFile = join(execSpecBase, '.runtime', `current-execute-run-id-${changeName}`)
+    const runtimeRoot = platformOpts?.runtimeRoot || join(execSpecBase, '.runtime')
+    const runIdFile = join(runtimeRoot, `current-execute-run-id-${changeName}`)
     try {
       if (existsSync(runIdFile)) {
         runId = readFileSync(runIdFile, 'utf8').trim()
@@ -925,6 +934,8 @@ async function outputStep(stageName, stepIndex, steps, cwd, changeName, dbProjec
     if (!runId) {
       const { generateExecuteRunId } = await import('./task-review.js')
       runId = generateExecuteRunId()
+      // 落盘（与启动站点一致），保证 agent 收到的 ID == gate/checkbox 读取的 ID
+      try { mkdirSync(runtimeRoot, { recursive: true }); writeFileSync(runIdFile, runId + '\n') } catch {}
     }
     promptText = promptText.replace(/\{EXECUTE_RUN_ID\}/g, runId)
   }
@@ -1609,13 +1620,31 @@ export async function runCommand(args, cwd, specDir = null) {
     if (autoChange) {
       progress = await pm.initChange(cwd, autoChange)
     } else if (isAuxiliary) {
-      // 辅助阶段（scan/explore/quick/doctor/status）自动使用默认变更名
-      const autoName = changeName || resolveChangeNameAuto(cwd, specRoot) || 'default'
+      let autoName = changeName || resolveChangeNameAuto(cwd, specRoot) || 'default'
+      // archive 特例：归档后变更从活跃列表排除（listChanges WHERE status='active'），
+      // 不带 --change 回退 default 会读错变更。无活跃变更时取最新归档变更，读其现有 progress。
+      if (stageName === 'archive' && autoName === 'default') {
+        try {
+          const archiveDir = join(specBase, 'changes', 'archive')
+          if (existsSync(archiveDir)) {
+            const latest = readdirSync(archiveDir)
+              .filter(d => /^\d{4}-\d{2}-\d{2}-.+/.test(d))
+              .sort()
+              .pop()
+            if (latest) {
+              autoName = latest.replace(/^\d{4}-\d{2}-\d{2}-/, '')
+              progress = await pm.read(cwd, autoName)
+            }
+          }
+        } catch {}
+      }
       changeName = autoName
-      progress = await pm.initChange(cwd, autoName)
-      // initChange 可能因 project 表为空返回 null
       if (!progress) {
-        progress = { currentStage: stageName, stages: {}, lastActive: new Date().toLocaleString('zh-CN', { hour12: false }), project: '' }
+        progress = await pm.initChange(cwd, autoName)
+        // initChange 可能因 project 表为空返回 null
+        if (!progress) {
+          progress = { currentStage: stageName, stages: {}, lastActive: new Date().toLocaleString('zh-CN', { hour12: false }), project: '' }
+        }
       }
     } else {
       // brainstorm 作为流程入口，自动生成变更名并初始化
@@ -3547,6 +3576,8 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
             if (!executeRunId) {
               const { generateExecuteRunId } = await import('./task-review.js')
               executeRunId = generateExecuteRunId()
+              // 落盘（marker 缺失时 fallback 生成后写盘，保证后续 checkbox/gate 读到同一 ID）
+              try { mkdirSync(runtimeRoot, { recursive: true }); writeFileSync(runIdFile, executeRunId + '\n') } catch {}
             }
 
             // git 真实性校验目录：worktree 存在则用 worktree（base/head commit 在其中），否则主仓库

package/src/stage-review.js

@@ -134,7 +134,7 @@ export function verifyStageReviewDocHash(review, searchDirs) {
     const actual = computeDocHash(abs)
     if (actual === null) continue
     // 找到主文档，比对 hash
-    if (review.docHash !== actual) {
+    if (review.docHash.toLowerCase() !== actual.toLowerCase()) {
       errors.push(`docHash 与主审查文档 ${primaryRel} 的实际内容不匹配 — review.json 疑似伪造（未真正读取文档）`)
       return { ok: false, errors, warnings }
     }

package/src/stages/brainstorm.js

@@ -71,6 +71,7 @@ export const definition = {
     },
     {
       name: '对话式探索与需求澄清',
+      migratedFrom: ['协作与复用检查', '原型/设计图分析', '需求范围评估', '对话式探索', '需求澄清 Grill'],
       conditionalWait: true,
       repeatableWait: true,
       maxWaitRounds: 8,
@@ -211,6 +212,7 @@ export const definition = {
     },
     {
       name: '分段展示设计',
+      migratedFrom: ['HTML 原型生成'],
       requiresWait: true,
       waitReason: '等待用户确认设计方案',
       waitOptions: ['确认', '需要修改', '推翻重来'],

package/src/stages/plan.js

@@ -384,16 +384,16 @@ tier: {REVIEW_TIER}（{REVIEW_TIER_REASON}）
  * 每个 task 生成 20~40 行紧凑可执行卡片
  */
 export function buildCoordinatorStep(changeDir, taskNames) {
-  const taskList = taskNames.map((name, i) => {
-    const num = String(i + 1).padStart(2, '0')
-    return `- task-${num}: ${name}`
+  const taskList = taskNames.map(t => {
+    const num = t.num
+    return `- task-${num}: ${t.name}`
   }).join('\n')
 
-  const subagentPrompts = taskNames.map((name, i) => {
-    const num = String(i + 1).padStart(2, '0')
+  const subagentPrompts = taskNames.map(t => {
+    const num = t.num
     return `\`\`\`
 任务编号：task-${num}
-任务名称：${name}
+任务名称：${t.name}
 文件路径：${changeDir}/tasks/task-${num}.md
 当前时间：<now-datetime>（frontmatter 的 created_at 使用此值）
 当前用户：<git-user>（frontmatter 的 author 使用此值）
@@ -405,7 +405,7 @@ export function buildCoordinatorStep(changeDir, taskNames) {
 
 ---
 id: task-${num}
-title: ${name}
+title: ${t.name}
 title_zh: <任务中文标题>
 author: <git-user>
 created_at: <now-datetime>
@@ -551,13 +551,14 @@ function parseTaskCount(planContent) {
  * 从 plan.md 解析任务名列表
  */
 function parseTaskNames(planContent) {
-  const names = []
+  // 返回 [{name, num}]：保留 plan.md 原始编号，避免 buildCoordinatorStep 按 i+1 重编号与 execute 原始编号错位
+  const tasks = []
   const lines = planContent.split('\n')
   for (const line of lines) {
-    const m = line.match(/^[-*]\s*\[[ x]\]\s*task-\d+:\s*(.+)/i)
-    if (m) names.push(m[1].trim())
+    const m = line.match(/^[-*]\s*\[[ x]\]\s*task-(\d+):\s*(.+)/i)
+    if (m) tasks.push({ num: String(m[1]).padStart(2, '0'), name: m[2].trim() })
   }
-  return names
+  return tasks
 }
 
 /**

package/src/task-review.js

@@ -337,9 +337,22 @@ export function verifyReviewGitEvidence(review, gitDir) {
   }
 
   const emptyDiff = diffFiles.length === 0
+  // emptyDiff 回退：子代理可能未 commit，base..head 无 commit diff 但 working-tree 有改动。
+  // 对齐 checkExecuteCodeEvidence（stage-contract.js 同时查 working-tree）语义，避免误判零改动伪造。
+  let workingTreeChanged = false
+  if (emptyDiff) {
+    try {
+      const wtStatus = runGit(gitDir, ['status', '--porcelain'])
+      workingTreeChanged = !!wtStatus && wtStatus.trim().length > 0
+    } catch {}
+    if (workingTreeChanged) {
+      warnings.push(`base..head 无 commit diff（${review.base.slice(0, 8)}..${review.head.slice(0, 8)}），但 working-tree 有未提交改动 —— 按有效改动处理，不判零改动伪造`)
+    }
+  }
+  const effectiveEmptyDiff = emptyDiff && !workingTreeChanged
 
   // changedFiles 交叉比对：完全不相交 = review 描述的改动与实际 diff 无关
-  if (!emptyDiff && Array.isArray(review.changedFiles) && review.changedFiles.length > 0) {
+  if (!effectiveEmptyDiff && Array.isArray(review.changedFiles) && review.changedFiles.length > 0) {
     const normalize = (p) => String(p).replace(/^\.\//, '')
     const diffSet = new Set(diffFiles.map(normalize))
     const hasOverlap = review.changedFiles.some(f => {
@@ -352,7 +365,7 @@ export function verifyReviewGitEvidence(review, gitDir) {
     }
   }
 
-  return { ok: errors.length === 0, emptyDiff, errors, warnings, unavailable: false }
+  return { ok: errors.length === 0, emptyDiff: effectiveEmptyDiff, errors, warnings, unavailable: false }
 }
 
 /**

package/src/worktree-apply.js

@@ -343,20 +343,15 @@ export function applyWorktree(changeName, { cwd, checkOnly = false, merge = fals
  * @returns {object} result（merged=true 表示走了 merge 降级）
  */
 function applyByMerge(result, changeName, projectRoot, wm) {
+  const meta = wm.getMeta(changeName);
+  const changedFiles = result.changedFiles || [];
+  // 用 meta.branch（native-worktree 模式分支名可能不是 sillyspec/<change>），不硬编码。
+  const branch = meta.branch || `sillyspec/${changeName}`;
+
   try {
-    git(projectRoot, `merge --no-ff sillyspec/${changeName}`);
-    result.merged = true;
-    result.ok = true;
-    try { result.mergeSummary = git(projectRoot, `log --oneline -1`); } catch {}
-    // 成功后自动 cleanup（与 patch 路径步骤 8 一致；分支已合并，删除安全）
-    try {
-      wm.cleanup(changeName);
-    } catch (cleanupErr) {
-      result.warnings = result.warnings || [];
-      result.warnings.push(`cleanup 失败（不影响 merge 结果）: ${cleanupErr.message}`);
-    }
+    git(projectRoot, `merge --no-ff ${branch}`);
   } catch (e) {
-    // merge 冲突：先取冲突文件列表，再 abort 回滚（避免半成品合并）
+    // merge 冲突：取冲突文件列表 + abort 回滚（不 cleanup，保留 worktree）
     let conflictFiles = [];
     try {
       const cf = gitQuiet(projectRoot, `diff --name-only --diff-filter=U`);
@@ -364,10 +359,35 @@ function applyByMerge(result, changeName, projectRoot, wm) {
     } catch {}
     try { gitQuiet(projectRoot, `merge --abort`); } catch {}
     result.errors.push(
-      `git merge sillyspec/${changeName} 冲突，请手动解决。冲突文件：\n` +
+      `git merge ${branch} 冲突，请手动解决。冲突文件：\n` +
       (conflictFiles.length ? `  ${conflictFiles.join('\n  ')}\n` : `  (未能获取冲突文件列表)\n`) +
       `已执行 git merge --abort 回滚到合并前状态。`
     );
+    return result;
+  }
+
+  // 落地校验：merge 报成功（exit 0）不代表交付物真进 main——
+  // 分支可能只含 baseline checkpoint（子代理改动未 commit），merge 产生空内容合并，文件零落地。
+  // 逐个确认 changedFiles 在 main HEAD 存在。任一缺失 → 不 cleanup（fail-open：保留 worktree 唯一副本）。
+  result.merged = true;
+  const notLanded = changedFiles.filter(f => gitQuiet(projectRoot, `cat-file -e HEAD:${f}`) === null);
+  if (notLanded.length > 0) {
+    result.ok = false;
+    result.errors.push(
+      `git merge ${branch} 报成功，但 ${notLanded.length}/${changedFiles.length} 个交付文件未出现在 main HEAD` +
+      `（分支可能只含 baseline checkpoint，子代理改动未 commit）。worktree 已保留（未 cleanup），` +
+      `请用 git cherry-pick 或手动 cp 落地：\n  ${notLanded.join('\n  ')}`
+    );
+    return result;
+  }
+
+  result.ok = true;
+  try { result.mergeSummary = git(projectRoot, `log --oneline -1`); } catch {}
+  try {
+    wm.cleanup(changeName);
+  } catch (cleanupErr) {
+    result.warnings = result.warnings || [];
+    result.warnings.push(`cleanup 失败（不影响 merge 结果）: ${cleanupErr.message}`);
   }
   return result;
 }