@goodandready/dsh-goal 0.1.3 → 0.1.5

package/lib/goal-engine.js

@@ -47,8 +47,10 @@ export class GoalEngine {
     this.defaultMaxIterations = options.defaultMaxIterations ?? 25;
     this.autoDrive = options.autoDrive ?? true;
     this.enableSound = options.enableSound ?? true;
-    this.currentGoal = null;
+    this.maxSessions = options.maxSessions ?? 100;
+    this.goals = new Map();
     this.listeners = new Set();
+    this.saveTimer = null;
 
     const defaultStorageDir = process.env.DSH_HOME || path.join(os.homedir(), '.dsh');
     this.storagePath = options.storagePath ?? null;
@@ -56,14 +58,34 @@ export class GoalEngine {
     this.loadStateFromDisk();
   }
 
+  get currentGoal() {
+    return this.goals.get('default') || null;
+  }
+
+  set currentGoal(val) {
+    if (val) {
+      this.goals.set('default', val);
+    } else {
+      this.goals.delete('default');
+    }
+  }
+
   loadStateFromDisk() {
     if (!this.storagePath) return;
     try {
       if (fs.existsSync(this.storagePath)) {
         const raw = fs.readFileSync(this.storagePath, 'utf8');
         const data = JSON.parse(raw);
-        if (data && typeof data === 'object' && data.id && data.title) {
-          this.currentGoal = data;
+        if (data && typeof data === 'object') {
+          if (data.sessions && typeof data.sessions === 'object') {
+            for (const [sid, goal] of Object.entries(data.sessions)) {
+              if (goal && goal.id && goal.title) {
+                this.goals.set(sid, goal);
+              }
+            }
+          } else if (data.id && data.title) {
+            this.goals.set('default', data);
+          }
         }
       }
     } catch (err) {
@@ -71,19 +93,63 @@ export class GoalEngine {
     }
   }
 
-  saveStateToDisk() {
+  scheduleSave(immediate = false) {
+    if (!this.storagePath) return;
+    if (immediate) {
+      if (this.saveTimer) {
+        clearTimeout(this.saveTimer);
+        this.saveTimer = null;
+      }
+      this.writeStateToDiskSync();
+      return;
+    }
+    if (!this.saveTimer) {
+      this.saveTimer = setTimeout(() => {
+        this.saveTimer = null;
+        this.writeStateToDiskSync();
+      }, 250);
+      if (typeof this.saveTimer.unref === 'function') {
+        this.saveTimer.unref();
+      }
+    }
+  }
+
+  writeStateToDiskSync() {
     if (!this.storagePath) return;
     try {
-      if (this.currentGoal) {
-        fs.writeFileSync(this.storagePath, JSON.stringify(this.currentGoal, null, 2), 'utf8');
-      } else {
+      if (this.goals.size === 0) {
         if (fs.existsSync(this.storagePath)) {
           fs.unlinkSync(this.storagePath);
         }
+        return;
+      }
+      const sessionsObj = {};
+      for (const [sid, goal] of this.goals.entries()) {
+        sessionsObj[sid] = goal;
       }
+      const payload = {
+        version: 2,
+        sessions: sessionsObj,
+        ...(this.goals.has('default') ? this.goals.get('default') : {}),
+      };
+      const tmp = `${this.storagePath}.tmp.${Date.now()}`;
+      fs.writeFileSync(tmp, JSON.stringify(payload, null, 2), 'utf8');
+      fs.renameSync(tmp, this.storagePath);
     } catch (err) {
-      console.warn('[GoalEngine] Failed to save state to disk:', err);
+      console.warn('[GoalEngine] Failed to write state to disk:', err);
+    }
+  }
+
+  flushSync() {
+    if (this.saveTimer) {
+      clearTimeout(this.saveTimer);
+      this.saveTimer = null;
     }
+    this.writeStateToDiskSync();
+  }
+
+  saveStateToDisk() {
+    this.flushSync();
   }
 
   /**
@@ -96,12 +162,13 @@ export class GoalEngine {
     return () => this.listeners.delete(callback);
   }
 
-  emit() {
-    this.saveStateToDisk();
-    const snapshot = this.getSnapshot();
+  emit(sessionId = 'default', immediate = false) {
+    this.scheduleSave(immediate);
+    const sid = sessionId || 'default';
+    const snapshot = this.getSnapshot(sid);
     for (const listener of this.listeners) {
       try {
-        listener(snapshot);
+        listener(snapshot, sid);
       } catch (err) {
         console.error('[GoalEngine] Listener error:', err);
       }
@@ -116,8 +183,10 @@ export class GoalEngine {
     if (typeof config.defaultMaxIterations === 'number' && config.defaultMaxIterations >= 1) {
       const prev = this.defaultMaxIterations;
       this.defaultMaxIterations = config.defaultMaxIterations;
-      if (this.currentGoal && this.currentGoal.maxIterations === prev) {
-        this.currentGoal.maxIterations = config.defaultMaxIterations;
+      for (const [_, goal] of this.goals) {
+        if (goal && goal.maxIterations === prev) {
+          goal.maxIterations = config.defaultMaxIterations;
+        }
       }
     }
     if (typeof config.autoDrive === 'boolean') {
@@ -132,16 +201,50 @@ export class GoalEngine {
   /**
    * Запуск новой цели
    */
-  startGoal(title, options = {}) {
+  getGoal(sessionId = 'default') {
+    return this.goals.get(sessionId || 'default') || null;
+  }
+
+  /**
+   * Очистка старых неактивных сессий во избежание утечек памяти
+   */
+  pruneInactiveSessions() {
+    if (this.goals.size < this.maxSessions) return;
+    const inactive = [];
+    for (const [sid, goal] of this.goals.entries()) {
+      if (sid === 'default') continue;
+      if (goal.state === GoalState.COMPLETED || goal.state === GoalState.CANCELLED || goal.state === GoalState.FAILED) {
+        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);
+    }
+  }
+
+  /**
+   * Запуск новой цели
+   * @param {string} title
+   * @param {Object} options
+   * @param {string} [sessionId='default']
+   */
+  startGoal(title, options = {}, sessionId = 'default') {
     if (!title || typeof title !== 'string' || !title.trim()) {
       throw new Error('Goal title cannot be empty');
     }
 
+    this.pruneInactiveSessions();
+
     const cleanTitle = title.trim();
     const now = Date.now();
+    const sid = sessionId || 'default';
 
-    this.currentGoal = {
+    const goal = {
       id: `goal-${now}-${Math.random().toString(36).substring(2, 7)}`,
+      sessionId: sid,
       title: cleanTitle,
       description: options.description?.trim() || '',
       state: GoalState.RUNNING,
@@ -162,125 +265,154 @@ export class GoalEngine {
       resultSummary: '',
     };
 
+    this.goals.set(sid, goal);
+
     if (Array.isArray(options.milestones) && options.milestones.length > 0) {
-      this.addMilestones(options.milestones, false);
+      this.addMilestones(options.milestones, false, sid);
     }
 
-    this.emit();
-    return this.getSnapshot();
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Приостановка автономного цикла цели
    */
-  pause(reason = 'User requested pause') {
-    if (!this.currentGoal || this.currentGoal.state !== GoalState.RUNNING) {
-      return this.getSnapshot();
+  pause(reason = 'User requested pause', sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal || goal.state !== GoalState.RUNNING) {
+      return this.getSnapshot(sid);
     }
 
-    this.currentGoal.state = GoalState.PAUSED;
-    this.currentGoal.pausedAt = Date.now();
-    this.currentGoal.logs.push({
+    goal.state = GoalState.PAUSED;
+    goal.pausedAt = Date.now();
+    goal.logs.push({
       timestamp: Date.now(),
       type: 'warning',
       message: `Paused: ${reason}`,
     });
 
-    this.emit();
-    return this.getSnapshot();
+    if (goal.logs.length > 100) {
+      goal.logs = goal.logs.slice(-100);
+    }
+
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Возобновление выполнения цели
    */
-  resume() {
-    if (!this.currentGoal || this.currentGoal.state !== GoalState.PAUSED) {
-      return this.getSnapshot();
+  resume(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal || goal.state !== GoalState.PAUSED) {
+      return this.getSnapshot(sid);
     }
 
     const now = Date.now();
-    if (this.currentGoal.pausedAt) {
-      this.currentGoal.totalPausedDurationMs += now - this.currentGoal.pausedAt;
-      this.currentGoal.pausedAt = null;
+    if (goal.pausedAt) {
+      goal.totalPausedDurationMs += now - goal.pausedAt;
+      goal.pausedAt = null;
     }
 
-    this.currentGoal.state = GoalState.RUNNING;
-    this.currentGoal.logs.push({
+    goal.state = GoalState.RUNNING;
+    goal.logs.push({
       timestamp: now,
       type: 'info',
       message: 'Goal resumed',
     });
 
-    this.emit();
-    return this.getSnapshot();
+    if (goal.logs.length > 100) {
+      goal.logs = goal.logs.slice(-100);
+    }
+
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Отмена цели
    */
-  cancel(reason = 'Cancelled by user') {
-    if (!this.currentGoal) return null;
-
-    this.currentGoal.state = GoalState.CANCELLED;
-    this.currentGoal.completedAt = Date.now();
-    this.currentGoal.logs.push({
+  cancel(reason = 'Cancelled by user', sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal) return null;
+
+    goal.state = GoalState.CANCELLED;
+    goal.completedAt = Date.now();
+    goal.logs.push({
       timestamp: Date.now(),
       type: 'warning',
       message: `Cancelled: ${reason}`,
     });
 
-    this.emit();
-    return this.getSnapshot();
+    if (goal.logs.length > 100) {
+      goal.logs = goal.logs.slice(-100);
+    }
+
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Очистка / сброс цели в IDLE
    */
-  clear() {
-    this.currentGoal = null;
-    this.emit();
-    return this.getSnapshot();
+  clear(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    this.goals.delete(sid);
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Успешное завершение цели
    */
-  completeGoal(summary = '') {
-    if (!this.currentGoal) return null;
+  completeGoal(summary = '', sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal) return null;
 
     const now = Date.now();
-    this.currentGoal.state = GoalState.COMPLETED;
-    this.currentGoal.completedAt = now;
-    this.currentGoal.resultSummary = summary;
-    this.currentGoal.logs.push({
+    goal.state = GoalState.COMPLETED;
+    goal.completedAt = now;
+    goal.resultSummary = summary;
+    goal.logs.push({
       timestamp: now,
       type: 'info',
       message: `Goal completed successfully: ${summary || 'All objectives met.'}`,
     });
 
+    if (goal.logs.length > 100) {
+      goal.logs = goal.logs.slice(-100);
+    }
+
     // Завершаем все активные milestones
-    for (const m of this.currentGoal.milestones) {
+    for (const m of goal.milestones) {
       if (m.status === MilestoneStatus.IN_PROGRESS || m.status === MilestoneStatus.PENDING) {
         m.status = MilestoneStatus.COMPLETED;
       }
     }
 
-    this.emit();
-    return this.getSnapshot();
+    this.emit(sid, true);
+    return this.getSnapshot(sid);
   }
 
   /**
    * Добавление вех (milestones)
    */
-  addMilestones(milestonesList, shouldEmit = true) {
-    if (!this.currentGoal || !Array.isArray(milestonesList)) return;
+  addMilestones(milestonesList, shouldEmit = true, sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal || !Array.isArray(milestonesList)) return;
 
     for (const item of milestonesList) {
       const itemTitle = typeof item === 'string' ? item : item.title;
       if (!itemTitle || !itemTitle.trim()) continue;
 
-      const mId = (typeof item === 'object' && item.id) ? item.id : `m-${this.currentGoal.milestones.length + 1}`;
-      this.currentGoal.milestones.push({
+      const mId = (typeof item === 'object' && item.id) ? item.id : `m-${goal.milestones.length + 1}`;
+      goal.milestones.push({
         id: String(mId),
         title: itemTitle.trim(),
         status: (typeof item === 'object' && item.status) ? item.status : MilestoneStatus.PENDING,
@@ -288,66 +420,79 @@ export class GoalEngine {
       });
     }
 
-    if (shouldEmit) this.emit();
+    if (shouldEmit) this.emit(sid);
   }
 
   /**
    * Обновление конкретной вехи
    */
-  updateMilestone(id, status, notes = '') {
-    if (!this.currentGoal) return false;
+  updateMilestone(id, status, notes = '', sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal) return false;
 
-    const target = this.currentGoal.milestones.find((m) => m.id === String(id));
+    const target = goal.milestones.find((m) => m.id === String(id));
     if (!target) return false;
 
     if (status && Object.values(MilestoneStatus).includes(status)) {
       target.status = status;
     }
     if (notes) {
-      target.notes = notes;
+      target.notes = String(notes);
     }
 
-    this.currentGoal.logs.push({
+    goal.logs.push({
       timestamp: Date.now(),
       type: 'milestone',
       message: `Milestone [${target.title}] status -> ${target.status}`,
     });
 
-    this.emit();
+    if (goal.logs.length > 100) {
+      goal.logs = goal.logs.slice(-100);
+    }
+
+    this.emit(sid);
     return true;
   }
 
   /**
    * Увеличение счётчика итераций turn
    */
-  incrementIteration() {
-    if (!this.currentGoal || this.currentGoal.state !== GoalState.RUNNING) {
+  incrementIteration(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal || goal.state !== GoalState.RUNNING) {
       return false;
     }
 
-    this.currentGoal.iterationsCount += 1;
+    goal.iterationsCount += 1;
 
-    if (this.currentGoal.iterationsCount >= this.currentGoal.maxIterations) {
-      this.currentGoal.state = GoalState.FAILED;
-      this.currentGoal.logs.push({
+    if (goal.iterationsCount >= goal.maxIterations) {
+      goal.state = GoalState.FAILED;
+      goal.logs.push({
         timestamp: Date.now(),
         type: 'error',
-        message: `Safety limit reached: maximum ${this.currentGoal.maxIterations} iterations exceeded.`,
+        message: `Safety limit reached: maximum ${goal.maxIterations} iterations exceeded.`,
       });
-      this.emit();
+      if (goal.logs.length > 100) {
+        goal.logs = goal.logs.slice(-100);
+      }
+      this.emit(sid, true);
       return false;
     }
 
-    this.emit();
+    this.emit(sid);
     return true;
   }
 
   /**
    * Подсчёт времени в секундах
    */
-  getElapsedSeconds() {
-    if (!this.currentGoal) return 0;
-    const { startedAt, pausedAt, totalPausedDurationMs, completedAt } = this.currentGoal;
+  getElapsedSeconds(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal) return 0;
+    const { startedAt, pausedAt, totalPausedDurationMs, completedAt } = goal;
     const endTime = completedAt || (pausedAt || Date.now());
     const elapsedMs = Math.max(0, endTime - startedAt - totalPausedDurationMs);
     return Math.floor(elapsedMs / 1000);
@@ -356,9 +501,12 @@ export class GoalEngine {
   /**
    * Снимок состояния для передачи клиенту / API
    */
-  getSnapshot() {
-    if (!this.currentGoal) {
+  getSnapshot(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal) {
       return {
+        sessionId: sid,
         hasActiveGoal: false,
         state: GoalState.IDLE,
         title: '',
@@ -377,29 +525,30 @@ export class GoalEngine {
       };
     }
 
-    const elapsed = this.getElapsedSeconds();
-    const milestones = this.currentGoal.milestones;
+    const elapsed = this.getElapsedSeconds(sid);
+    const milestones = goal.milestones;
     const completedCount = milestones.filter((m) => m.status === MilestoneStatus.COMPLETED).length;
     const progressPercent = milestones.length > 0 ? Math.round((completedCount / milestones.length) * 100) : 0;
 
     return {
+      sessionId: sid,
       hasActiveGoal: true,
-      id: this.currentGoal.id,
-      state: this.currentGoal.state,
-      title: this.currentGoal.title,
-      description: this.currentGoal.description,
-      startedAt: this.currentGoal.startedAt,
-      pausedAt: this.currentGoal.pausedAt,
-      totalPausedDurationMs: this.currentGoal.totalPausedDurationMs,
-      completedAt: this.currentGoal.completedAt,
+      id: goal.id,
+      state: goal.state,
+      title: goal.title,
+      description: goal.description,
+      startedAt: goal.startedAt,
+      pausedAt: goal.pausedAt,
+      totalPausedDurationMs: goal.totalPausedDurationMs,
+      completedAt: goal.completedAt,
       elapsedSeconds: elapsed,
       formattedElapsed: formatElapsed(elapsed),
-      iterationsCount: this.currentGoal.iterationsCount,
-      maxIterations: this.currentGoal.maxIterations,
+      iterationsCount: goal.iterationsCount,
+      maxIterations: goal.maxIterations,
       milestones,
       progressPercent,
-      logs: this.currentGoal.logs,
-      resultSummary: this.currentGoal.resultSummary,
+      logs: goal.logs,
+      resultSummary: goal.resultSummary,
       autoDrive: this.autoDrive,
       enableSound: this.enableSound,
     };
@@ -408,12 +557,14 @@ export class GoalEngine {
   /**
    * Формирование системного контекста для инжекта модели
    */
-  getStatePromptInjection() {
-    if (!this.currentGoal || this.currentGoal.state !== GoalState.RUNNING) {
+  getStatePromptInjection(sessionId = 'default') {
+    const sid = sessionId || 'default';
+    const goal = this.goals.get(sid);
+    if (!goal || goal.state !== GoalState.RUNNING) {
       return '';
     }
 
-    const snapshot = this.getSnapshot();
+    const snapshot = this.getSnapshot(sid);
     const hasMilestones = snapshot.milestones.length > 0;
     const milestonesText = hasMilestones
       ? snapshot.milestones.map((m, i) => `  ${i + 1}. [${m.status.toUpperCase()}] ${m.title}${m.notes ? ` (${m.notes})` : ''}`).join('\n')
@@ -425,9 +576,9 @@ export class GoalEngine {
 План работ:
 ${milestonesText}
 
-Инструкции Goal Mode:
-1. ${hasMilestones ? 'Выполняй текущий активный пункт плана работ.' : 'ТВОЙ ПЕРВЫЙ ШАГ: Немедленно вызови инструмент goal_set_milestones со списком пунктов плана работ.'}
-2. По мере выполнения каждого шага отмечай его статус через инструмент goal_update_progress (status: "in_progress" перед началом, "completed" по завершении).
-3. Когда все пункты плана будут выполнены, вызови инструмент goal_finish с итоговым резюме.`;
+Инструкции Goal Mode (СТРОГО ОБЯЗАТЕЛЬНЫ К ВЫПОЛНЕНИЮ):
+1. ${hasMilestones ? 'Выполняй текущий активный пункт плана работ.' : 'ТВОЙ ПЕРВЫЙ ШАГ: Немедленно вызови инструмент goal_set_milestones со списком пунктов плана работ (3-7 конкретных шагов). Запрещено выполнять работу или завершать turn без вызова goal_set_milestones!'}
+2. По мере выполнения каждого шага обязательно отмечай его статус через инструмент goal_update_progress (status: "in_progress" перед началом шага, status: "completed" по его завершении с кратким notes).
+3. Когда все пункты плана будут выполнены, вызови инструмент goal_finish с подробным итоговым резюме достигнутых результатов.`;
   }
 }