sillyspec 3.17.15 → 3.18.1

package/src/progress.js

@@ -12,16 +12,32 @@
  */
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync, unlinkSync } from 'fs';
-import { join, basename } from 'path';
+import { join, basename, dirname, resolve } from 'path';
 import { DB } from './db.js';
 
 // 默认规范目录名（相对于 cwd）
 const SPEC_DIR_NAME = '.sillyspec';
 const RUNTIME_SUBDIR = '.runtime';
+
+/**
+ * 向上查找含 .sillyspec 目录的祖先目录，类似 git 找 .git 的逻辑。
+ * 找到则返回 <祖先>/.sillyspec，否则 fallback 到 <cwd>/.sillyspec。
+ */
+export function resolveSpecDir(startDir) {
+  let dir = resolve(startDir);
+  while (true) {
+    const candidate = join(dir, SPEC_DIR_NAME);
+    if (existsSync(candidate)) return candidate;
+    const parent = dirname(dir);
+    if (parent === dir) break; // 到达根目录
+    dir = parent;
+  }
+  return join(resolve(startDir), SPEC_DIR_NAME);
+}
 const CHANGES_SUBDIR = 'changes';
 const GLOBAL_FILE = 'global.json';
 const CURRENT_VERSION = 3;
-const VALID_STAGES = ['scan', 'brainstorm', 'propose', 'plan', 'execute', 'verify', 'archive', 'quick', 'explore'];
+const VALID_STAGES = ['scan', 'brainstorm', 'plan', 'execute', 'verify', 'archive', 'quick', 'explore'];
 const VALID_STATUSES = ['pending', 'in-progress', 'completed', 'failed', 'blocked', 'waiting'];
 
 const STAGE_LABELS = {
@@ -62,9 +78,10 @@ export class ProgressManager {
 
   // ── 路径工具 ──
 
-  /** 获取 specDir（优先自定义，否则 cwd/.sillyspec） */
+  /** 获取 specDir（优先自定义，否则向上查找含 .sillyspec 的目录，fallback 到 cwd/.sillyspec） */
   _getSpecDir(cwd) {
-    return this._customSpecDir || join(cwd, SPEC_DIR_NAME);
+    if (this._customSpecDir) return this._customSpecDir;
+    return resolveSpecDir(cwd);
   }
 
   _runtimePath(cwd, ...parts) {
@@ -207,21 +224,29 @@ export class ProgressManager {
     if (stageIds.length > 0) {
       const placeholders = stageIds.map(() => '?').join(',');
       stepRows = sqlDb.exec(
-        `SELECT stage_id, name, status, output, completed_at, ordering, wait_reason, wait_options, wait_answer, waited_at FROM steps WHERE stage_id IN (${placeholders}) ORDER BY stage_id, ordering`,
+        `SELECT stage_id, name, status, output, completed_at, ordering, wait_reason, wait_options, wait_answer, waited_at, wait_answers, wait_round, max_wait_rounds FROM steps WHERE stage_id IN (${placeholders}) ORDER BY stage_id, ordering`,
         stageIds
       );
     }
     // 按阶段分组步骤
     const stepsByStage = {};
     if (stepRows && stepRows.length > 0) {
-      for (const [stageId, name, status, output, completedAt, ordering, waitReason, waitOptions, waitAnswer, waitedAt] of stepRows[0].values) {
+      for (const row of stepRows[0].values) {
+        const [stageId, name, status, output, completedAt, ordering, waitReason, waitOptions, waitAnswer, waitedAt, waitAnswersJson, waitRound, maxWaitRounds] = row;
         if (!stepsByStage[stageId]) stepsByStage[stageId] = [];
+        let waitAnswers = null;
+        if (waitAnswersJson) {
+          try { waitAnswers = JSON.parse(waitAnswersJson); } catch {}
+        }
         stepsByStage[stageId].push({
           name, status, output, completedAt,
           ...(waitReason ? { waitReason } : {}),
           ...(waitOptions ? { waitOptions } : {}),
           ...(waitAnswer ? { waitAnswer } : {}),
           ...(waitedAt ? { waitedAt } : {}),
+          ...(waitAnswers ? { waitAnswers } : {}),
+          ...(waitRound != null ? { waitRound } : {}),
+          ...(maxWaitRounds != null ? { maxWaitRounds } : {}),
         });
       }
     }
@@ -257,6 +282,9 @@ export class ProgressManager {
         ...(s.waitOptions ? { waitOptions: s.waitOptions } : {}),
         ...(s.waitAnswer ? { waitAnswer: s.waitAnswer } : {}),
         ...(s.waitedAt ? { waitedAt: s.waitedAt } : {}),
+        ...(s.waitAnswers ? { waitAnswers: s.waitAnswers } : {}),
+        ...(s.waitRound != null ? { waitRound: s.waitRound } : {}),
+        ...(s.maxWaitRounds != null ? { maxWaitRounds: s.maxWaitRounds } : {}),
       }));
       stages[stage] = {
         status: info.status,
@@ -340,9 +368,11 @@ export class ProgressManager {
               // UPSERT 步骤（先删再插，steps 表无 UNIQUE 约束）
               sqlDb.run('DELETE FROM steps WHERE stage_id = ? AND name = ?', [stageId, step.name]);
               sqlDb.run(
-                'INSERT INTO steps (stage_id, name, status, output, completed_at, ordering, wait_reason, wait_options, wait_answer, waited_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                'INSERT INTO steps (stage_id, name, status, output, completed_at, ordering, wait_reason, wait_options, wait_answer, waited_at, wait_answers, wait_round, max_wait_rounds) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
                 [stageId, step.name, step.status || 'pending', step.output || null, step.completedAt || null, i,
-                  step.waitReason || null, step.waitOptions || null, step.waitAnswer || null, step.waitedAt || null]
+                  step.waitReason ?? null, step.waitOptions ?? null, step.waitAnswer ?? null, step.waitedAt ?? null,
+                  Array.isArray(step.waitAnswers) ? JSON.stringify(step.waitAnswers) : null,
+                  step.waitRound ?? null, step.maxWaitRounds ?? null]
               );
             }
           }
@@ -411,11 +441,8 @@ export class ProgressManager {
          VALUES (?, ?, ?)`,
         [changeName, now, now]
       );
-      // 如果已存在但为 archived，恢复为 active
-      sqlDb.run(
-        `UPDATE changes SET status = 'active', last_active = ? WHERE name = ? AND status = 'archived'`,
-        [now, changeName]
-      );
+      // 注意：不复活已归档的变更——归档是不可逆操作
+      // 如果变更已存在且为 archived，保持 archived 状态不变
     });
   }
 
@@ -634,7 +661,7 @@ export class ProgressManager {
       const changeId = changeRow[0].values[0][0];
 
       // 批量插入 9 个阶段（INSERT OR IGNORE 跳过已存在的）
-      const allStages = ['scan', 'brainstorm', 'plan', 'execute', 'verify', 'archive', 'quick', 'explore', 'propose'];
+      const allStages = ['scan', 'brainstorm', 'plan', 'execute', 'verify', 'archive', 'quick', 'explore'];
       for (const stage of allStages) {
         sqlDb.run(
           `INSERT OR IGNORE INTO stages (change_id, stage, status)