sillyspec 3.25.8 → 3.25.11

package/src/quicklog.js

@@ -330,11 +330,19 @@ function flipEntryInContent(content, qlId, result, changedFiles = []) {
     }
     // 多行结果（结构化 需求/根因/方案/结果 字段块）：逐行插入为独立字段行。
     // 单行结果：保持「结果：<一句话>」一行，向后兼容简单用例。
-    if (/\r?\n/.test(body)) {
-      const resultLines = body.split(/\r?\n/).filter(l => l.trim() !== '')
-      lines.splice(endIdx, 0, ...resultLines)
-    } else {
-      lines.splice(endIdx, 0, `结果：${body}`)
+    const resultLines = /\r?\n/.test(body)
+      ? body.split(/\r?\n/).filter(l => l.trim() !== '')
+      : [`结果：${body}`]
+    // 结果块属本条目：从 endIdx 往前跳过本条目尾部空行，在最后一个非空行之后插入。
+    // 否则结果块会落在尾空行「之后」，与下一条目标题紧贴（缺空行分隔），且被空行从本条目
+    // 「文件：」行隔开——视觉上像属于下一条目（用户实证多条目 QUICKLOG 间距 bug）。
+    let insertAt = endIdx
+    while (insertAt - 1 > startIdx && lines[insertAt - 1].trim() === '') insertAt--
+    lines.splice(insertAt, 0, ...resultLines)
+    // 兜底：结果块之后、下一个 ## 标题之间若无空行（条目原本无尾空行 / 轮转归档手改等），补一个。
+    const after = insertAt + resultLines.length
+    if (after < lines.length && lines[after].startsWith('## ')) {
+      lines.splice(after, 0, '')
     }
   }
   return lines.join('\n')

package/src/run/command.js

@@ -23,7 +23,7 @@ import { join, resolve, dirname } from 'node:path'
 import { existsSync, readdirSync, mkdirSync, writeFileSync, readFileSync, rmSync } from 'node:fs'
 import { randomBytes, randomUUID } from 'node:crypto'
 import { writeAtomicSync } from '../fs-atomic.js'
-import { resolveSpecDir, countAncestorSpecDirs, resolveChangeDir, triggerSync, getStageSteps, formatWaitOptions, checkApproval, didYouMean, assertSafeChangeName, detectQuickSessionDrift, detectWorktreeSpecDrift } from './shared.js'
+import { resolveSpecDir, countAncestorSpecDirs, resolveChangeDir, triggerSync, getStageSteps, formatWaitOptions, checkApproval, didYouMean, assertSafeChangeName, detectQuickSessionDrift, detectWorktreeSpecDrift, resolveRuntimeRoot } from './shared.js'
 import { resolveQuickLinkedChanges } from './quick-audit.js'
 import { outputStep } from './prompt.js'
 import { completeStep, skipStep, waitStep, continueStep } from './complete.js'
@@ -214,7 +214,6 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   const waitReason = getFlagValue('--reason')
   const waitOptions = getFlagValue('--options')
   const continueAnswer = getFlagValue('--answer')
-  const confirmMode = getFlagValue('--confirm-mode')
   const resolvedSpecDir = specDir || getFlagValue('--spec-dir') || getFlagValue('--spec-root')
   const platformOpts = {
     specRoot: resolvedSpecDir ? resolve(resolvedSpecDir) : null,
@@ -291,7 +290,8 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
 
   // 统一规范基路径：平台模式用 specRoot，本地模式用 cwd/.sillyspec
   // runCommand 后续所有 .sillyspec/ 操作必须用 specBase
-  const specBase = platformOpts.specRoot || join(cwd, '.sillyspec')
+  // let：下方 worktree 副本漂移守卫命中时锚回 wt.mainSpecBase（task-05/D-03）
+  let specBase = platformOpts.specRoot || join(cwd, '.sillyspec')
 
   // 漂移提醒:cwd 祖先链 ≥2 个 .sillyspec = monorepo 多实例,当前命中的「最近」实例
   // 可能不是用户意图的项目(如 cd 进被独立 scan 的子项目跑测试后忘回根)。
@@ -407,6 +407,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   //   3. 仍读不到 → 生成新 UUID（兼容旧行为；进度可能命中空行，由后续 pm.read 兜底）
   const QUICK_SID_RE = /^quick-[0-9a-f]{8}$/
   let quickSessionId = null
+  let quickFallbackUsed = false  // Q7: --done 未带 --change 时 fallback 读 current-quick-run-id 命中（区别于显式 --change quick-<hex>）
   if (stageName === 'quick') {
     // 1373-1376 已把 quick 的 --change 值清进 linkedChanges、changeName 置 null。
     // 此处回看 --change 原始值：若恰好是单个 quick-<8hex> → 识别为本会话 sessionId（精确恢复），
@@ -423,11 +424,11 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
       const isDoneLike = isDone || isStatus || isSkip || isReset || isReopen
       if (isDoneLike) {
         try {
-          const runtimeRoot = platformOpts.runtimeRoot || join(specRoot, '.runtime')
+          const runtimeRoot = resolveRuntimeRoot(platformOpts, specRoot)
           const idFile = join(runtimeRoot, 'current-quick-run-id')
           if (existsSync(idFile)) {
             const v = readFileSync(idFile, 'utf8').trim()
-            if (QUICK_SID_RE.test(v)) quickSessionId = v
+            if (QUICK_SID_RE.test(v)) { quickSessionId = v; quickFallbackUsed = true }
           }
         } catch {}
       }
@@ -484,7 +485,8 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   const isAuxiliary = auxiliaryStages.includes(stageName)
   // scan 元数据追踪（存储在 stageData.scanMeta 中，completeStep 通过 progress 访问）
 
-  const pm = new ProgressManager({ specDir: specRoot })
+  // let：下方 worktree 副本漂移守卫命中时用主仓 specRoot 重建 pm（task-05/D-03）
+  let pm = new ProgressManager({ specDir: specRoot })
 
   // quick 阶段：确定关联变更
   // 优先级：--linked-changes / --change 显式 > 已持久化 quick-guard.json（--done 复用）> 交互式 > 非交互 fallback
@@ -522,18 +524,29 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
     process.exit(2) // 用法错（execute 必须显式 --change）→ exit 2
   }
 
-  // worktree 副本漂移硬守卫(坑 worktree-execute-spec-drift):specBase 命中 worktree 内 .sillyspec
-  // checkout 副本 → 进度/产出会写分裂库。必须在 validateChangeExists 之前——副本里 change 目录真实
-  // 存在,存在性校验会被骗放行。覆盖 plan/execute/verify/archive(validateChangeExists 同 Set):
-  // 都要求 change 已存在、都被副本骗、都写 .sillyspec 资产(archive 尤甚:在副本里移动 change+commit)。
-  // 平台模式/显式 --spec-dir 跳过(已明确指定,与 line~285 warn / ~529 quick 守卫条件对齐)。
+  // worktree 副本漂移自动锚定守卫(坑 worktree-execute-spec-drift,D-03@v1):specBase 命中 worktree 内
+  // .sillyspec checkout 副本 = agent 误 cd 进 worktree 跑 plan/execute/verify/archive(100% 误操作场景)。
+  // 不 exit:自动把 specBase 锚回主仓 wt.mainSpecBase 后继续——进度/产出落主仓,不再写分裂副本(副本随
+  // 工作树清理丢失)。必须在 validateChangeExists 之前:副本里 change 目录真实存在,存在性校验会被骗
+  // 放行;锚定后用主仓 specBase 复查。覆盖 plan/execute/verify/archive(validateChangeExists 同 Set)。
+  // 关键坑:连带重写 specBase/specRoot/specDir + 重建 pm——四者同源派生(pm._customSpecDir 持旧 specRoot),
+  // 只改 specBase 会让下游 validateChangeExists(specBase) 与 pm.read(走 pm._customSpecDir) 仍指副本。
+  // 平台模式/显式 --spec-dir 跳过(已明确指定,与 line~285 warn / quick 守卫条件对齐)。
+  // 其他漂移(下方 changeMissing 守卫 / quick session drift 守卫)非副本场景,仍 exit(2) 不自动纠正。
   if (!platformOpts.specRoot && !specDir
       && ['plan', 'execute', 'verify', 'archive'].includes(stageName)) {
     const wt = detectWorktreeSpecDrift(specBase)
     if (wt) {
-      console.error(`❌ ${wt.message}`)
-      console.error(`   当前 cwd=${cwd}，命中的 spec=${specBase}。`)
-      process.exit(2) // 环境错（cwd/spec 漂移）→ exit 2
+      specBase = wt.mainSpecBase
+      specRoot = wt.mainSpecBase
+      specDir = wt.mainSpecBase
+      pm = new ProgressManager({ specDir: specRoot })
+      // 【坑 execute-runs-isolation】下游 runtimeRoot 解析（execute-runs/stage-reviews 落点）经
+      // platformOpts 透传读此锚点，落主仓 .runtime，不随 worktree cleanup 整目录删消失。
+      // D-02：只参与 runtimeRoot 解析（resolveRuntimeRoot），绝不设 specRoot/runtimeRoot——
+      // 否则触发平台 sentinel 副作用（triggerSync/checkApproval 跳过 + prompt 误进平台渲染分支）。
+      platformOpts.specDriftAnchor = wt.mainSpecBase
+      console.warn(`⚠️ 已自动锚定主仓 spec：${wt.mainSpecBase}（原 cwd 命中 worktree 副本 ${wt.changeName}，已纠正，流程继续）`)
     }
   }
 
@@ -564,13 +577,13 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
     }
   }
 
-  let progress = await pm.read(cwd, changeName)
+  let progress = pm.read(cwd, changeName)
 
   if (!progress) {
     // 如果指定了变更名或有变更目录，自动初始化变更的 progress
     const autoChange = changeName || resolveChangeNameAuto(cwd, specRoot)
     if (autoChange) {
-      progress = await pm.initChange(cwd, autoChange)
+      progress = pm.initChange(cwd, autoChange)
     } else if (isAuxiliary) {
       let autoName = changeName || resolveChangeNameAuto(cwd, specRoot) || 'default'
       // archive 特例：归档后变更从活跃列表排除（listChanges WHERE status='active'），
@@ -585,14 +598,14 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
               .pop()
             if (latest) {
               autoName = latest.replace(/^\d{4}-\d{2}-\d{2}-/, '')
-              progress = await pm.read(cwd, autoName)
+              progress = pm.read(cwd, autoName)
             }
           }
         } catch {}
       }
       changeName = autoName
       if (!progress) {
-        progress = await pm.initChange(cwd, autoName)
+        progress = pm.initChange(cwd, autoName)
         // initChange 可能因 project 表为空返回 null
         if (!progress) {
           progress = { currentStage: stageName, stages: {}, lastActive: new Date().toLocaleString('zh-CN', { hour12: false }), project: '' }
@@ -612,7 +625,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
         console.log(`🔄 自动创建变更：${autoName}`)
         console.log(`  提示：可以用 --change <名称> 指定自定义变更名`)
         console.log(`  或事后重命名：sillyspec change-rename ${autoName} <新名称>`)
-        progress = await pm.initChange(cwd, autoName)
+        progress = pm.initChange(cwd, autoName)
         changeName = autoName
       } else {
         console.error('❌ 未找到进度数据，请先运行 sillyspec init 或指定 --change <变更名>')
@@ -624,6 +637,21 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   // 确保 progress 有 currentChange
   const effectiveChange = changeName || progress.currentChange || resolveChangeName(cwd, progress, specRoot)
 
+  // ── Q7：quick --done 不带 --change 时 fallback 读 current-quick-run-id 可能命中他者会话 ──
+  // 并发两 quick 会话：B 后启动覆盖 A 的 id（last-writer-wins），A 的 --done 不带 --change → 读到 B 的 sessionId
+  // → 误操作 B 的 progress/QUICKLOG。fallback 命中的会话若已完成或无可推进步骤（id stale / 他者已收尾），
+  // 拒绝推进并要求显式 --change。（live A/B race 需 per-session 锚 commit，见 review Q2/D2，本守卫只兜 stale/completed。）
+  if (stageName === 'quick' && isDone && quickFallbackUsed) {
+    const qs = progress.stages.quick
+    const hasActionable = qs?.steps && qs.steps.some(s => s.status === 'pending' || s.status === 'waiting' || s.status === 'in-progress')
+    if (!qs || qs.status === 'completed' || !hasActionable) {
+      console.error(`\n❌ --done 未带 --change，回退读到的 quick 会话 ${changeName} 已不可推进（已完成或无待办步骤）。`)
+      console.error(`   并发多 quick 会话时 .runtime/current-quick-run-id 可能指向他者会话（last-writer-wins）。`)
+      console.error(`   请显式带 --change <quick-session-id> 指定要完成的会话（sillyspec run quick --status 查各会话进度）。`)
+      process.exit(2) // 用法错（fallback 命中 stale/他者会话）→ exit 2
+    }
+  }
+
   // -- auto 模式：自动推进所有流程阶段
   if (stageName === 'auto') {
     return await runAutoMode(pm, progress, cwd, flags, effectiveChange, platformOpts)
@@ -632,7 +660,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   // --change 只作为变更名标识，不再拦截流程
   // 注册变更到全局活跃列表（如果尚未注册）
   if (effectiveChange) {
-    await pm.registerChange(cwd, effectiveChange)
+    pm.registerChange(cwd, effectiveChange)
   }
 
   // --reset
@@ -669,12 +697,12 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
       if (freshSteps && freshSteps.length > 0) {
         if (!progress.stages[stageName]) progress.stages[stageName] = { status: 'stale', steps: [] }
         progress.stages[stageName].steps = freshSteps.map(s => ({ name: s.name, status: 'pending' }))
-        await pm._write(cwd, progress, effectiveChange)
-        progress = await pm.read(cwd, effectiveChange) || progress
+        pm._write(cwd, progress, effectiveChange)
+        progress = pm.read(cwd, effectiveChange) || progress
       }
     }
 
-    const result = await pm.reopenStage(cwd, stageName, {
+    const result = pm.reopenStage(cwd, stageName, {
       fromStep: fromStepValue,
       changeName: effectiveChange,
     })
@@ -692,7 +720,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
     console.log('')
 
     // 重新读取 progress
-    progress = await pm.read(cwd, effectiveChange) || progress
+    progress = pm.read(cwd, effectiveChange) || progress
 
     // 注入 revision context 到 platformOpts，供 outputStep 使用
     const stageData = progress.stages[stageName]
@@ -724,7 +752,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
     // currentIdx === -1 自动重置（~1944 行）；in-progress 输出当前 step；全新由
     // ensureStageSteps 初始化；显式从头用 --reset（已由 !isReset 排除出本分支）。
     try {
-      const runtimeRoot = platformOpts.runtimeRoot || join(specRoot, '.runtime')
+      const runtimeRoot = resolveRuntimeRoot(platformOpts, specRoot)
       mkdirSync(runtimeRoot, { recursive: true })
       writeAtomicSync(join(runtimeRoot, 'current-quick-run-id'), quickSessionId + '\n')
     } catch (e) {
@@ -740,9 +768,9 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   // 确保步骤已初始化
   const changed = await ensureStageSteps(progress, stageName, cwd, specRoot)
   if (changed && effectiveChange) {
-    await pm._write(cwd, progress, effectiveChange)
+    pm._write(cwd, progress, effectiveChange)
     triggerSync(cwd, effectiveChange, platformOpts)
-    progress = await pm.read(cwd, effectiveChange) || progress
+    progress = pm.read(cwd, effectiveChange) || progress
   }
 
   // --status
@@ -772,7 +800,7 @@ export async function runCommand(args, cwd, specDir = null, opts = {}) {
   // --done
   if (isDone) {
     const doneAnswer = getFlagValue('--answer')
-    return await completeStep(pm, progress, stageName, cwd, outputText, inputText, { confirm: isConfirm, changeName: effectiveChange, nonInteractive: isNonInteractive && !isInteractive, platformOpts, confirmMode, doneAnswer, isForceBaseline, isAllowNew })
+    return await completeStep(pm, progress, stageName, cwd, outputText, inputText, { confirm: isConfirm, changeName: effectiveChange, nonInteractive: isNonInteractive && !isInteractive, platformOpts, doneAnswer, isForceBaseline, isAllowNew })
   }
 
   // 默认：输出当前步骤
@@ -898,7 +926,7 @@ async function resetStage(pm, progress, stageName, cwd, changeName, platformOpts
     steps: defSteps ? defSteps.map(s => ({ name: s.name, status: 'pending' })) : []
   }
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
-  await pm._write(cwd, progress, changeName)
+  pm._write(cwd, progress, changeName)
   triggerSync(cwd, changeName, platformOpts)
   console.log(`🔄 ${stageName} 阶段已重置`)
 }
@@ -948,18 +976,18 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
           completedAt: null,
           steps: brainstormAutoDef.steps.map(s => ({ name: s.name, status: 'pending' }))
         }
-        await pm._write(cwd, progress, changeName)
+        pm._write(cwd, progress, changeName)
         triggerSync(cwd, changeName, platformOpts)
-        progress = await pm.read(cwd, changeName)
+        progress = pm.read(cwd, changeName)
         return progress
       }
     }
     const changed = await ensureStageSteps(progress, stage, cwd)
     if (stageChanged || changed) {
-      await pm._write(cwd, progress, changeName)
+      pm._write(cwd, progress, changeName)
       triggerSync(cwd, changeName, platformOpts)
     }
-    progress = await pm.read(cwd, changeName)
+    progress = pm.read(cwd, changeName)
     return progress
   }
 
@@ -1051,7 +1079,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
 
   const result = await completeStep(pm, progress, currentStage, cwd, outputText, inputText, { printNext: false, changeName, platformOpts })
   if (!result) return
-  progress = await pm.read(cwd, changeName)
+  progress = pm.read(cwd, changeName)
 
   const nextPendingIdx = progress.stages[currentStage]?.steps?.findIndex(step => step.status === 'pending' || step.status === 'in-progress') ?? -1
   if (nextPendingIdx !== -1) {
@@ -1084,7 +1112,7 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
   if (currentStage === 'brainstorm' && next === 'plan') {
     const changeDir = resolveChangeDir(cwd, progress, platformOpts?.specRoot || null)
     if (changeDir) {
-      const nextActionFile = join(changeDir, 'brainstorm', 'next-action.json')
+      const nextActionFile = join(changeDir, 'next-action.json')
       try {
         const nextAction = JSON.parse(readFileSync(nextActionFile, 'utf8'))
         if (nextAction.has_blocking_questions === true) {
@@ -1115,9 +1143,9 @@ async function runAutoMode(pm, progress, cwd, flags, changeName, platformOpts =
   }
   progress.lastActive = new Date().toLocaleString('zh-CN',{hour12:false})
   await ensureStageSteps(progress, next, cwd)
-  await pm._write(cwd, progress, changeName)
+  pm._write(cwd, progress, changeName)
   triggerSync(cwd, changeName, platformOpts)
-  progress = await pm.read(cwd, changeName)
+  progress = pm.read(cwd, changeName)
 
   console.log(`\n${currentStage} complete. Auto advanced to ${next}.`)
   const nextSteps = await getAutoSteps(next)