@goodandready/dsh-goal 0.1.3 → 0.1.5

package/lib/index.js

@@ -9,6 +9,32 @@ export const inject = ['webServer', 'settings'];
 
 const NS = 'dsh-goal';
 
+function sessionIdOf(invocationOrReq, fallback = 'default') {
+  if (!invocationOrReq) return fallback;
+  try {
+    // 1. DSH invocation / event / turn
+    if (invocationOrReq.sessionId) return String(invocationOrReq.sessionId);
+    if (invocationOrReq.session) {
+      return String(invocationOrReq.session.id || invocationOrReq.session.header?.id || fallback);
+    }
+    if (invocationOrReq.data?.sessionId) return String(invocationOrReq.data.sessionId);
+    if (invocationOrReq.agent?.session) {
+      return String(invocationOrReq.agent.session.id || invocationOrReq.agent.session.header?.id || fallback);
+    }
+    // 2. HTTP Request (req)
+    if (invocationOrReq.headers) {
+      const headerSid = invocationOrReq.headers['x-dsh-session-id'];
+      if (headerSid) return String(headerSid);
+      if (invocationOrReq.url) {
+        const url = new URL(invocationOrReq.url, 'http://localhost');
+        const querySid = url.searchParams.get('sessionId') || url.searchParams.get('session');
+        if (querySid) return String(querySid);
+      }
+    }
+  } catch (_) {}
+  return fallback;
+}
+
 // Схема-функция: в rc.1 settings.register(NS, schema, { base }) ожидает
 // schemastery-схему вторым аргументом.
 // Issue #24: storagePath объявлен в схеме конфигурации плагина
@@ -23,6 +49,7 @@ export function apply(ctx, config = {}) {
   let settingsScope = null;
   let agentsService = null;
   const runningAgents = new Set();
+  const sessionAgents = new Map(); // sessionId -> agent
   let lastActiveAgent = null;
 
   let currentSettings = {
@@ -54,60 +81,85 @@ export function apply(ctx, config = {}) {
     if (status === 'running') {
       runningAgents.add(agent);
       lastActiveAgent = agent;
+      const sid = sessionIdOf(agent, null);
+      if (sid) {
+        sessionAgents.set(sid, agent);
+      }
     } else {
       runningAgents.delete(agent);
+      if (lastActiveAgent === agent && (status === 'stopped' || status === 'completed' || status === 'error')) {
+        lastActiveAgent = null;
+      }
+      const sid = sessionIdOf(agent, null);
+      if (sid && sessionAgents.get(sid) === agent && (status === 'stopped' || status === 'completed' || status === 'error')) {
+        sessionAgents.delete(sid);
+      }
     }
   });
 
-  const stopRunningAgents = () => {
-    // 1. Отмена всех агентов, находящихся в активном выполнении
-    for (const ag of runningAgents) {
+  const stopRunningAgents = (sessionId = 'default') => {
+    const sid = sessionId || 'default';
+    const specificAgent = sessionAgents.get(sid);
+    if (specificAgent && typeof specificAgent.cancel === 'function') {
       try {
-        if (typeof ag.cancel === 'function') {
-          ag.cancel({ kind: 'user' });
-        }
+        specificAgent.cancel({ kind: 'user' });
       } catch (err) {
-        console.warn('[dsh-goal] Failed to cancel running agent:', err);
+        console.warn('[dsh-goal] Failed to cancel specific agent for session:', err);
       }
     }
-    runningAgents.clear();
 
-    // 2. Отмена последнего известного агента
-    if (lastActiveAgent && lastActiveAgent.status === 'running' && typeof lastActiveAgent.cancel === 'function') {
+    // Отмена всех подходящих агентов в runningAgents
+    for (const ag of runningAgents) {
       try {
-        lastActiveAgent.cancel({ kind: 'user' });
+        const agSid = sessionIdOf(ag, null);
+        if (!agSid || agSid === sid || sid === 'default') {
+          if (typeof ag.cancel === 'function') {
+            ag.cancel({ kind: 'user' });
+          }
+        }
       } catch (err) {
-        console.warn('[dsh-goal] Failed to cancel lastActiveAgent:', err);
+        console.warn('[dsh-goal] Failed to cancel running agent:', 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 (_) {}
-          }
+    if (lastActiveAgent && lastActiveAgent.status === 'running' && typeof lastActiveAgent.cancel === 'function') {
+      const lastSid = sessionIdOf(lastActiveAgent, null);
+      if (!lastSid || lastSid === sid || sid === 'default') {
+        try {
+          lastActiveAgent.cancel({ kind: 'user' });
+        } catch (err) {
+          console.warn('[dsh-goal] Failed to cancel lastActiveAgent:', err);
         }
-      } catch (err) {
-        console.warn('[dsh-goal] Failed to cancel agents from list:', err);
       }
     }
   };
 
-  const resumeActiveAgent = (promptText) => {
+  const resumeActiveAgent = (promptText, sessionId = 'default') => {
+    const sid = sessionId || 'default';
     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') {
+    let target = sessionAgents.get(sid);
+    if (!target && lastActiveAgent && typeof lastActiveAgent.followup === 'function') {
+      const lastSid = sessionIdOf(lastActiveAgent, null);
+      if (!lastSid || lastSid === sid || sid === 'default') {
+        target = lastActiveAgent;
+      }
+    }
+    if (!target && agentsService && typeof agentsService.list === 'function') {
       const list = agentsService.list();
       if (list && list.length > 0) {
-        target = list[list.length - 1];
+        for (let i = list.length - 1; i >= 0; i--) {
+          const cand = list[i];
+          const candSid = sessionIdOf(cand, null);
+          if (candSid === sid) {
+            target = cand;
+            break;
+          }
+        }
+        if (!target && sid === 'default') {
+          target = list[list.length - 1];
+        }
       }
     }
 
@@ -115,6 +167,7 @@ export function apply(ctx, config = {}) {
       try {
         target.followup(resumeMsg);
         lastActiveAgent = target;
+        sessionAgents.set(sid, target);
         return true;
       } catch (err) {
         console.warn('[dsh-goal] Failed to resume agent:', err);
@@ -197,12 +250,14 @@ export function apply(ctx, config = {}) {
         description: 'Управление режимом цели (Goal Mode): активация, вехи, пауза, сброс',
         input: { hint: '[<цель>|clear|pause|resume]' },
         handler: async (invocation) => {
+          const sid = sessionIdOf(invocation, 'default');
           if (invocation?.agent) {
             lastActiveAgent = invocation.agent;
+            sessionAgents.set(sid, invocation.agent);
           }
           const parsed = parseGoalInput(invocation?.rawInput);
           const liveConfig = getConfig();
-          return executeGoalSlashCommand(engine, parsed, liveConfig, invocation?.agent);
+          return executeGoalSlashCommand(engine, parsed, liveConfig, invocation?.agent, sid);
         },
       });
 
@@ -225,7 +280,10 @@ export function apply(ctx, config = {}) {
         const unregisterSection = pctx.systemPrompt.section({
           name: 'tool:dsh-goal',
           order,
-          text: () => engine.getStatePromptInjection(),
+          text: (sessionCtx) => {
+            const sid = sessionIdOf(sessionCtx, 'default');
+            return engine.getStatePromptInjection(sid);
+          },
         });
 
         if (typeof unregisterSection === 'function') {
@@ -256,15 +314,16 @@ export function apply(ctx, config = {}) {
         },
         required: ['milestones'],
       },
-      handler: async ({ milestones }) => {
-        const snap = engine.getSnapshot();
+      handler: async ({ milestones }, toolCtx) => {
+        const sid = sessionIdOf(toolCtx, 'default');
+        const snap = engine.getSnapshot(sid);
         if (!snap.hasActiveGoal) {
           return { error: 'No active goal currently set. Start a goal first.' };
         }
-        engine.addMilestones(milestones);
+        engine.addMilestones(milestones, true, sid);
         return {
           success: true,
-          milestones: engine.getSnapshot().milestones,
+          milestones: engine.getSnapshot(sid).milestones,
         };
       },
     });
@@ -292,14 +351,15 @@ export function apply(ctx, config = {}) {
         },
         required: ['milestone_id', 'status'],
       },
-      handler: async ({ milestone_id, status, notes }) => {
-        const ok = engine.updateMilestone(milestone_id, status, notes);
+      handler: async ({ milestone_id, status, notes }, toolCtx) => {
+        const sid = sessionIdOf(toolCtx, 'default');
+        const ok = engine.updateMilestone(milestone_id, status, notes, sid);
         if (!ok) {
           return { error: `Milestone ${milestone_id} not found or no active goal.` };
         }
         return {
           success: true,
-          snapshot: engine.getSnapshot(),
+          snapshot: engine.getSnapshot(sid),
         };
       },
     });
@@ -318,8 +378,9 @@ export function apply(ctx, config = {}) {
         },
         required: ['summary'],
       },
-      handler: async ({ summary }) => {
-        const snap = engine.completeGoal(summary);
+      handler: async ({ summary }, toolCtx) => {
+        const sid = sessionIdOf(toolCtx, 'default');
+        const snap = engine.completeGoal(summary, sid);
         return {
           success: true,
           completed: true,
@@ -344,8 +405,9 @@ export function apply(ctx, config = {}) {
 
         // GET /dsh-goal/state
         if (req.method === 'GET' && (pathname === '/dsh-goal/state' || pathname === '/dsh-goal/state/')) {
+          const sid = sessionIdOf(req, 'default');
           res.statusCode = 200;
-          return res.end(JSON.stringify(engine.getSnapshot()));
+          return res.end(JSON.stringify(engine.getSnapshot(sid)));
         }
 
         // POST /dsh-goal/action
@@ -373,10 +435,26 @@ export function apply(ctx, config = {}) {
           }
 
           let body = '';
-          req.on('data', (chunk) => { body += chunk; });
+          let bodySize = 0;
+          const MAX_PAYLOAD_BYTES = 256 * 1024;
+          let limitExceeded = false;
+
+          req.on('data', (chunk) => {
+            bodySize += chunk.length;
+            if (bodySize > MAX_PAYLOAD_BYTES) {
+              limitExceeded = true;
+              req.pause();
+              res.statusCode = 413;
+              return res.end(JSON.stringify({ error: 'Payload too large: max 256 KB allowed' }));
+            }
+            body += chunk;
+          });
+
           req.on('end', () => {
+            if (limitExceeded) return;
             try {
               const data = JSON.parse(body || '{}');
+              const sid = data.sessionId || sessionIdOf(req, 'default');
               const { action, title, description, reason, milestoneId, status, notes } = data;
 
               let result = null;
@@ -385,27 +463,32 @@ export function apply(ctx, config = {}) {
                   result = engine.startGoal(title || 'Новая цель', {
                     description,
                     maxIterations: getConfig().maxIterations,
-                  });
+                  }, sid);
                   break;
                 case 'pause':
-                  result = engine.pause(reason || 'Пауза по кнопке интерфейса');
-                  stopRunningAgents();
+                  result = engine.pause(reason || 'Пауза по кнопке интерфейса', sid);
+                  stopRunningAgents(sid);
                   break;
                 case 'resume':
-                  result = engine.resume();
-                  resumeActiveAgent();
+                  result = engine.resume(sid);
+                  resumeActiveAgent(undefined, sid);
                   break;
                 case 'cancel':
-                  result = engine.cancel(reason || 'Отмена цели');
-                  stopRunningAgents();
+                  result = engine.cancel(reason || 'Отмена цели', sid);
+                  stopRunningAgents(sid);
                   break;
                 case 'clear':
-                  result = engine.clear();
-                  stopRunningAgents();
+                  result = engine.clear(sid);
+                  stopRunningAgents(sid);
+                  sessionAgents.delete(sid);
                   break;
                 case 'update_milestone':
-                  engine.updateMilestone(milestoneId, status, notes);
-                  result = engine.getSnapshot();
+                  if (!milestoneId || !status) {
+                    res.statusCode = 400;
+                    return res.end(JSON.stringify({ error: 'milestoneId and status are required' }));
+                  }
+                  engine.updateMilestone(milestoneId, status, notes, sid);
+                  result = engine.getSnapshot(sid);
                   break;
                 default:
                   res.statusCode = 400;
@@ -413,7 +496,7 @@ export function apply(ctx, config = {}) {
               }
 
               res.statusCode = 200;
-              return res.end(JSON.stringify({ ok: true, state: result || engine.getSnapshot() }));
+              return res.end(JSON.stringify({ ok: true, state: result || engine.getSnapshot(sid) }));
             } catch (parseErr) {
               res.statusCode = 400;
               return res.end(JSON.stringify({ error: parseErr.message }));
@@ -439,42 +522,63 @@ export function apply(ctx, config = {}) {
       const liveConfig = getConfig();
       if (!liveConfig.autoDrive) return; // Учитываем настройку autoDrive в рантайме
 
-      const snap = engine.getSnapshot();
+      const sid = sessionIdOf(turn, 'default');
+      const snap = engine.getSnapshot(sid);
       if (snap.hasActiveGoal && snap.state === GoalState.RUNNING) {
-        const canContinue = engine.incrementIteration();
+        // Проверяем причину завершения хода
+        if (turn?.reason?.kind === 'aborted' || turn?.reason?.kind === 'error' || turn?.error) {
+          return;
+        }
+
+        const canContinue = engine.incrementIteration(sid);
         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];
+        setTimeout(() => {
+          const currentSnap = engine.getSnapshot(sid);
+          if (currentSnap.hasActiveGoal && currentSnap.state === GoalState.RUNNING) {
+            const promptMsg = createGoalUserMessage(
+              'Продолжай автономное выполнение цели согласно плану работ. Отмечай каждый выполненный шаг через goal_update_progress, а по завершении всех задач вызови goal_finish.',
+            );
+            let target = sessionAgents.get(sid);
+            if (!target && lastActiveAgent && typeof lastActiveAgent.followup === 'function') {
+              const lastSid = sessionIdOf(lastActiveAgent, null);
+              if (!lastSid || lastSid === sid || sid === 'default') {
+                target = lastActiveAgent;
               }
-              if (target && typeof target.followup === 'function') {
-                try {
-                  target.followup(promptMsg);
-                } catch (err) {
-                  console.warn('[dsh-goal] Failed auto-drive followup:', err);
+            }
+            if (!target && agentsService && typeof agentsService.list === 'function') {
+              const list = agentsService.list();
+              if (list && list.length > 0) {
+                for (let i = list.length - 1; i >= 0; i--) {
+                  const cand = list[i];
+                  if (sessionIdOf(cand, null) === sid) {
+                    target = cand;
+                    break;
+                  }
                 }
+                if (!target && sid === 'default') target = list[list.length - 1];
               }
             }
-          }, 300);
-        }
+
+            if (target && typeof target.followup === 'function' && target.status !== 'stopped') {
+              try {
+                target.followup(promptMsg);
+                sessionAgents.set(sid, target);
+              } catch (err) {
+                console.warn('[dsh-goal] Failed auto-drive followup:', err);
+              }
+            }
+          }
+        }, 300);
       }
     };
 
     // Подписка на запрос подтверждения (approval/asked) -> автоматическая пауза
-    const onApprovalAsked = () => {
-      const snap = engine.getSnapshot();
+    const onApprovalAsked = (event) => {
+      const sid = sessionIdOf(event, 'default');
+      const snap = engine.getSnapshot(sid);
       if (snap.hasActiveGoal && snap.state === GoalState.RUNNING) {
-        engine.pause('Ожидание подтверждения действия оператором');
+        engine.pause('Ожидание подтверждения действия оператором', sid);
       }
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-goal",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Goal mode & autonomous execution plugin for DeepSeek Harness with sticky top banner",
   "type": "module",
   "main": "./lib/index.js",