@goodandready/dsh-goal 0.1.1 → 0.1.2

package/lib/index.js

@@ -1,34 +1,243 @@
+import path from 'node:path';
+import os from 'node:os';
+import z from '@deepseek-ai/schemastery';
 import { GoalEngine, GoalState, MilestoneStatus } from './goal-engine.js';
+import { parseGoalInput, executeGoalSlashCommand, createGoalUserMessage } from './command-handler.js';
 
 export const name = '@goodandready/dsh-goal';
 export const inject = ['webServer', 'settings'];
 
 const NS = 'dsh-goal';
 
+// Схема-функция: в rc.1 settings.register(NS, schema, { base }) ожидает
+// schemastery-схему вторым аргументом.
+// Issue #24: storagePath объявлен в схеме конфигурации плагина
+export const Config = z.object({
+  maxIterations: z.number().default(25).description('Safety limit: max autonomous iterations per goal'),
+  autoDrive: z.boolean().default(true).description('Automatically continue the loop after each turn'),
+  enableSound: z.boolean().default(true).description('Play a sound when a goal completes'),
+  storagePath: z.string().default('').description('Custom filesystem path for persistent state storage'),
+});
+
 export function apply(ctx, config = {}) {
-  const engine = new GoalEngine({
-    defaultMaxIterations: config?.maxIterations ?? 25,
-  });
+  let settingsScope = null;
+  let agentsService = null;
+  const runningAgents = new Set();
+  let lastActiveAgent = null;
 
   let currentSettings = {
     maxIterations: config?.maxIterations ?? 25,
     autoDrive: config?.autoDrive ?? true,
     enableSound: config?.enableSound ?? true,
+    storagePath: config?.storagePath,
+  };
+
+  const defaultStorageDir = process.env.DSH_HOME || path.join(os.homedir(), '.dsh');
+  const storagePath = currentSettings.storagePath !== undefined && currentSettings.storagePath !== null
+    ? currentSettings.storagePath
+    : path.join(defaultStorageDir, 'dsh-goal-state.json');
+
+  const engine = new GoalEngine({
+    defaultMaxIterations: currentSettings.maxIterations,
+    autoDrive: currentSettings.autoDrive,
+    enableSound: currentSettings.enableSound,
+    storagePath,
+  });
+
+  // Динамическое внедрение сервиса agents для управления жизненным циклом
+  ctx.inject(['agents'], (actx) => {
+    agentsService = actx.agents;
+  });
+
+  // Отслеживание выполняющихся агентов через глобальное событие ядра DSH
+  ctx.on?.('agent/status', ({ agent, status }) => {
+    if (status === 'running') {
+      runningAgents.add(agent);
+      lastActiveAgent = agent;
+    } else {
+      runningAgents.delete(agent);
+    }
+  });
+
+  const stopRunningAgents = () => {
+    // 1. Отмена всех агентов, находящихся в активном выполнении
+    for (const ag of runningAgents) {
+      try {
+        if (typeof ag.cancel === 'function') {
+          ag.cancel({ kind: 'user' });
+        }
+      } catch (err) {
+        console.warn('[dsh-goal] Failed to cancel running agent:', err);
+      }
+    }
+    runningAgents.clear();
+
+    // 2. Отмена последнего известного агента
+    if (lastActiveAgent && lastActiveAgent.status === 'running' && typeof lastActiveAgent.cancel === 'function') {
+      try {
+        lastActiveAgent.cancel({ kind: 'user' });
+      } catch (err) {
+        console.warn('[dsh-goal] Failed to cancel lastActiveAgent:', err);
+      }
+    }
+
+    // 3. Дополнительная проверка через agentsService.list()
+    if (agentsService && typeof agentsService.list === 'function') {
+      try {
+        for (const ag of agentsService.list()) {
+          if (ag && ag.status === 'running' && typeof ag.cancel === 'function') {
+            try {
+              ag.cancel({ kind: 'user' });
+            } catch (_) {}
+          }
+        }
+      } catch (err) {
+        console.warn('[dsh-goal] Failed to cancel agents from list:', err);
+      }
+    }
+  };
+
+  const resumeActiveAgent = (promptText) => {
+    const resumeMsg = createGoalUserMessage(
+      promptText || '▶️ Цель возобновлена пользователем. Продолжай выполнение плана работ с того места, где остановился. Отмечай шаги через goal_update_progress.',
+    );
+    let target = null;
+    if (lastActiveAgent && typeof lastActiveAgent.followup === 'function') {
+      target = lastActiveAgent;
+    } else if (agentsService && typeof agentsService.list === 'function') {
+      const list = agentsService.list();
+      if (list && list.length > 0) {
+        target = list[list.length - 1];
+      }
+    }
+
+    if (target && typeof target.followup === 'function') {
+      try {
+        target.followup(resumeMsg);
+        lastActiveAgent = target;
+        return true;
+      } catch (err) {
+        console.warn('[dsh-goal] Failed to resume agent:', err);
+      }
+    }
+    return false;
+  };
+
+  // Issue #21: getConfig reads snap.value ONLY when status is 'ready' (or status is undefined in unit test mocks)
+  const getConfig = () => {
+    if (settingsScope) {
+      const snap = typeof settingsScope.getSnapshot === 'function' ? settingsScope.getSnapshot() : null;
+      if (snap) {
+        if (snap.status === 'ready' || snap.status === undefined) {
+          const live = snap.value || (typeof settingsScope.get === 'function' ? settingsScope.get() : null);
+          if (live && typeof live === 'object') {
+            return {
+              maxIterations: typeof live.maxIterations === 'number' ? live.maxIterations : currentSettings.maxIterations,
+              autoDrive: typeof live.autoDrive === 'boolean' ? live.autoDrive : currentSettings.autoDrive,
+              enableSound: typeof live.enableSound === 'boolean' ? live.enableSound : currentSettings.enableSound,
+              storagePath: typeof live.storagePath === 'string' ? live.storagePath : currentSettings.storagePath,
+            };
+          }
+        }
+      } else if (typeof settingsScope.get === 'function') {
+        const live = settingsScope.get();
+        if (live && typeof live === 'object') {
+          return {
+            maxIterations: typeof live.maxIterations === 'number' ? live.maxIterations : currentSettings.maxIterations,
+            autoDrive: typeof live.autoDrive === 'boolean' ? live.autoDrive : currentSettings.autoDrive,
+            enableSound: typeof live.enableSound === 'boolean' ? live.enableSound : currentSettings.enableSound,
+            storagePath: typeof live.storagePath === 'string' ? live.storagePath : currentSettings.storagePath,
+          };
+        }
+      }
+    }
+    return currentSettings;
+  };
+
+  const applySettings = () => {
+    const live = getConfig();
+    engine.updateConfig({
+      defaultMaxIterations: live.maxIterations,
+      autoDrive: live.autoDrive,
+      enableSound: live.enableSound,
+    });
   };
 
   // 1. Регистрация настроек плагина
   ctx.inject(['settings'], (sctx) => {
     try {
-      const scope = sctx.settings?.register?.(NS, null, { base: currentSettings });
+      const scope = sctx.settings?.register?.(NS, Config, { base: currentSettings });
       if (scope) {
-        currentSettings = { ...currentSettings, ...(scope.get?.() ?? {}) };
+        settingsScope = scope;
+        applySettings();
+        if (typeof scope.subscribe === 'function') {
+          sctx.effect(() => {
+            const off = scope.subscribe(() => {
+              applySettings();
+            });
+            return () => {
+              if (typeof off === 'function') off();
+              settingsScope = null;
+            };
+          }, 'dsh-goal: settings subscription');
+        }
       }
     } catch (err) {
       console.warn('[dsh-goal] Settings register skipped:', err.message);
     }
   });
 
-  // 2. Регистрация инструментов для модели (tools)
+  // 2. Регистрация слэш-команды /goal в чате
+  ctx.inject(['commands'], (cctx) => {
+    try {
+      if (typeof cctx.commands?.register !== 'function') return;
+
+      const unregister = cctx.commands.register({
+        name: 'goal',
+        description: 'Управление режимом цели (Goal Mode): активация, вехи, пауза, сброс',
+        input: { hint: '[<цель>|clear|pause|resume]' },
+        handler: async (invocation) => {
+          if (invocation?.agent) {
+            lastActiveAgent = invocation.agent;
+          }
+          const parsed = parseGoalInput(invocation?.rawInput);
+          const liveConfig = getConfig();
+          return executeGoalSlashCommand(engine, parsed, liveConfig, invocation?.agent);
+        },
+      });
+
+      if (typeof unregister === 'function') {
+        cctx.effect(() => () => unregister(), 'dsh-goal: /goal command unregister');
+      }
+    } catch (err) {
+      console.warn('[dsh-goal] Commands register skipped:', err.message);
+    }
+  });
+
+  // 3. Инжекция контекста цели в системный промпт (systemPrompt)
+  ctx.inject(['systemPrompt'], (pctx) => {
+    try {
+      if (typeof pctx.systemPrompt?.section === 'function') {
+        const order = typeof pctx.systemPrompt.getSectionOrder === 'function'
+          ? (pctx.systemPrompt.getSectionOrder('TOOL_GOAL') || 600)
+          : 600;
+
+        const unregisterSection = pctx.systemPrompt.section({
+          name: 'tool:dsh-goal',
+          order,
+          text: () => engine.getStatePromptInjection(),
+        });
+
+        if (typeof unregisterSection === 'function') {
+          pctx.effect(() => () => unregisterSection(), 'dsh-goal: system prompt section');
+        }
+      }
+    } catch (err) {
+      console.warn('[dsh-goal] SystemPrompt section register skipped:', err.message);
+    }
+  });
+
+  // 4. Регистрация инструментов для модели (tools)
   ctx.inject(['tools'], (tctx) => {
     if (!tctx.tools?.register) return;
 
@@ -120,7 +329,7 @@ export function apply(ctx, config = {}) {
     });
   });
 
-  // 3. Регистрация HTTP REST API маршрутов
+  // 5. Регистрация HTTP REST API маршрутов
   ctx.effect(() => {
     if (!ctx.webServer?.register) return () => {};
 
@@ -140,7 +349,29 @@ export function apply(ctx, config = {}) {
         }
 
         // POST /dsh-goal/action
+        // Issue #22: CSRF & Same-Origin guard
         if (req.method === 'POST' && (pathname === '/dsh-goal/action' || pathname === '/dsh-goal/action/')) {
+          const secFetchSite = req.headers['sec-fetch-site'];
+          if (secFetchSite && secFetchSite !== 'same-origin' && secFetchSite !== 'same-site' && secFetchSite !== 'none') {
+            res.statusCode = 403;
+            return res.end(JSON.stringify({ error: 'Forbidden: cross-site requests are rejected' }));
+          }
+
+          const origin = req.headers.origin;
+          const host = req.headers.host;
+          if (origin && host) {
+            try {
+              const originHost = new URL(origin).host;
+              if (originHost !== host) {
+                res.statusCode = 403;
+                return res.end(JSON.stringify({ error: 'Forbidden: origin mismatch' }));
+              }
+            } catch (_) {
+              res.statusCode = 403;
+              return res.end(JSON.stringify({ error: 'Forbidden: invalid origin' }));
+            }
+          }
+
           let body = '';
           req.on('data', (chunk) => { body += chunk; });
           req.on('end', () => {
@@ -151,19 +382,26 @@ export function apply(ctx, config = {}) {
               let result = null;
               switch (action) {
                 case 'start':
-                  result = engine.startGoal(title || 'Новая цель', { description });
+                  result = engine.startGoal(title || 'Новая цель', {
+                    description,
+                    maxIterations: getConfig().maxIterations,
+                  });
                   break;
                 case 'pause':
-                  result = engine.pause(reason);
+                  result = engine.pause(reason || 'Пауза по кнопке интерфейса');
+                  stopRunningAgents();
                   break;
                 case 'resume':
                   result = engine.resume();
+                  resumeActiveAgent();
                   break;
                 case 'cancel':
-                  result = engine.cancel(reason);
+                  result = engine.cancel(reason || 'Отмена цели');
+                  stopRunningAgents();
                   break;
                 case 'clear':
                   result = engine.clear();
+                  stopRunningAgents();
                   break;
                 case 'update_milestone':
                   engine.updateMilestone(milestoneId, status, notes);
@@ -194,13 +432,41 @@ export function apply(ctx, config = {}) {
     };
   }, 'dsh-goal: HTTP WebServer Routes');
 
-  // 4. Подписка на события сессии (автономный цикл)
+  // 6. Подписка на события сессии (автономный цикл)
   ctx.effect(() => {
     // Подписка на завершение turn
-    const onTurnEnd = () => {
+    const onTurnEnd = (turn) => {
+      const liveConfig = getConfig();
+      if (!liveConfig.autoDrive) return; // Учитываем настройку autoDrive в рантайме
+
       const snap = engine.getSnapshot();
       if (snap.hasActiveGoal && snap.state === GoalState.RUNNING) {
-        engine.incrementIteration();
+        const canContinue = engine.incrementIteration();
+        if (!canContinue) return;
+
+        // Если turn не был прерван пользователем и цель ещё активна, отправляем следующий ход
+        if (turn?.reason?.kind !== 'aborted') {
+          setTimeout(() => {
+            const currentSnap = engine.getSnapshot();
+            if (currentSnap.hasActiveGoal && currentSnap.state === GoalState.RUNNING) {
+              const promptMsg = createGoalUserMessage(
+                'Продолжай автономное выполнение цели согласно плану работ. Отмечай каждый выполненный шаг через goal_update_progress, а по завершении всех задач вызови goal_finish.',
+              );
+              let target = lastActiveAgent;
+              if (!target && agentsService && typeof agentsService.list === 'function') {
+                const list = agentsService.list();
+                if (list && list.length > 0) target = list[list.length - 1];
+              }
+              if (target && typeof target.followup === 'function') {
+                try {
+                  target.followup(promptMsg);
+                } catch (err) {
+                  console.warn('[dsh-goal] Failed auto-drive followup:', err);
+                }
+              }
+            }
+          }, 300);
+        }
       }
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-goal",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Goal mode & autonomous execution plugin for DeepSeek Harness with sticky top banner",
   "type": "module",
   "main": "./lib/index.js",
@@ -44,14 +44,18 @@
     },
     "client": {
       "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
+      "inject": []
     }
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "devDependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
   }
 }