@goodandready/dsh-goal 0.1.5 → 0.1.6

package/lib/goal-engine.js

@@ -51,6 +51,7 @@ export class GoalEngine {
     this.goals = new Map();
     this.listeners = new Set();
     this.saveTimer = null;
+    this.stallCounters = new Map(); // sessionId -> number of consecutive turns without progress
 
     const defaultStorageDir = process.env.DSH_HOME || path.join(os.homedir(), '.dsh');
     this.storagePath = options.storagePath ?? null;
@@ -77,15 +78,45 @@ export class GoalEngine {
         const raw = fs.readFileSync(this.storagePath, 'utf8');
         const data = JSON.parse(raw);
         if (data && typeof data === 'object') {
+          let dirty = false;
           if (data.sessions && typeof data.sessions === 'object') {
             for (const [sid, goal] of Object.entries(data.sessions)) {
               if (goal && goal.id && goal.title) {
+                // Item 4: Crash Hydration — если цель осталась в RUNNING после перезапуска/падения DSH,
+                // переводим в PAUSED с понятной причиной и фиксацией времени
+                if (goal.state === GoalState.RUNNING) {
+                  goal.state = GoalState.PAUSED;
+                  goal.pausedAt = Date.now();
+                  if (!Array.isArray(goal.logs)) goal.logs = [];
+                  goal.logs.push({
+                    timestamp: Date.now(),
+                    type: 'warning',
+                    message: 'Harness was restarted — click ▶️ to resume',
+                  });
+                  if (goal.logs.length > 100) goal.logs = goal.logs.slice(-100);
+                  dirty = true;
+                }
                 this.goals.set(sid, goal);
               }
             }
           } else if (data.id && data.title) {
+            if (data.state === GoalState.RUNNING) {
+              data.state = GoalState.PAUSED;
+              data.pausedAt = Date.now();
+              if (!Array.isArray(data.logs)) data.logs = [];
+              data.logs.push({
+                timestamp: Date.now(),
+                type: 'warning',
+                message: 'Harness was restarted — click ▶️ to resume',
+              });
+              if (data.logs.length > 100) data.logs = data.logs.slice(-100);
+              dirty = true;
+            }
             this.goals.set('default', data);
           }
+          if (dirty) {
+            this.scheduleSave(true);
+          }
         }
       }
     } catch (err) {
@@ -175,6 +206,27 @@ export class GoalEngine {
     }
   }
 
+  /**
+   * Отслеживание прогресса для Smart Progress Guard
+   */
+  recordProgress(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    this.stallCounters.set(sid, 0);
+  }
+
+  incrementStallCount(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const current = this.stallCounters.get(sid) || 0;
+    const next = current + 1;
+    this.stallCounters.set(sid, next);
+    return next;
+  }
+
+  getStallCount(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    return this.stallCounters.get(sid) || 0;
+  }
+
   /**
    * Динамическое обновление настроек на лету
    * @param {Object} config
@@ -199,7 +251,7 @@ export class GoalEngine {
   }
 
   /**
-   * Запуск новой цели
+   * Получение цели сессии
    */
   getGoal(sessionId = 'default') {
     return this.goals.get(sessionId || 'default') || null;
@@ -217,11 +269,11 @@ export class GoalEngine {
         inactive.push({ sid, completedAt: goal.completedAt || goal.startedAt || 0 });
       }
     }
-    // Сортируем от самых старых к новым
     inactive.sort((a, b) => a.completedAt - b.completedAt);
     while (this.goals.size >= this.maxSessions && inactive.length > 0) {
       const oldest = inactive.shift();
       this.goals.delete(oldest.sid);
+      this.stallCounters.delete(oldest.sid);
     }
   }
 
@@ -241,6 +293,7 @@ export class GoalEngine {
     const cleanTitle = title.trim();
     const now = Date.now();
     const sid = sessionId || 'default';
+    this.stallCounters.set(sid, 0);
 
     const goal = {
       id: `goal-${now}-${Math.random().toString(36).substring(2, 7)}`,
@@ -318,6 +371,8 @@ export class GoalEngine {
     }
 
     goal.state = GoalState.RUNNING;
+    this.stallCounters.set(sid, 0); // сбрасываем счетчик простоя при возобновлении
+
     goal.logs.push({
       timestamp: now,
       type: 'info',
@@ -362,6 +417,7 @@ export class GoalEngine {
   clear(sessionId = 'default') {
     const sid = sessionId || 'default';
     this.goals.delete(sid);
+    this.stallCounters.delete(sid);
     this.emit(sid, true);
     return this.getSnapshot(sid);
   }
@@ -395,6 +451,7 @@ export class GoalEngine {
       }
     }
 
+    this.stallCounters.delete(sid);
     this.emit(sid, true);
     return this.getSnapshot(sid);
   }
@@ -420,6 +477,7 @@ export class GoalEngine {
       });
     }
 
+    this.recordProgress(sid);
     if (shouldEmit) this.emit(sid);
   }
 
@@ -451,6 +509,7 @@ export class GoalEngine {
       goal.logs = goal.logs.slice(-100);
     }
 
+    this.recordProgress(sid);
     this.emit(sid);
     return true;
   }