@goodandready/dsh-goal 0.2.9 → 0.2.11

package/lib/index.js

@@ -22,6 +22,15 @@ export const Config = z.object({
   maxTokenBudget: z.number().default(0).description('Maximum token budget per goal session (0 to disable)'),
   budgetWarningThreshold: z.number().default(80).description('Percentage of token budget consumed before model warning injection (e.g. 80)'),
   autoCheckpointOnMilestone: z.boolean().default(false).description('Automatically create git commit checkpoint upon milestone completion'),
+  enableLiveActivityFeed: z.boolean().default(true).description('Display compact recent tool and control activity feed in details modal'),
+  enablePreplanning: z.boolean().default(true).description('Generate initial draft plan for approval before launching autonomous turns'),
+  autoBranchOnGoalStart: z.boolean().default(true).description('Automatically create dedicated isolated git branch for goal execution'),
+  enablePostGoalRetrospective: z.boolean().default(true).description('Generate structured retrospective and analytics card upon goal completion'),
+  autoScaleBudgetNearCompletion: z.boolean().default(false).description('Automatically grant token buffer extension if budget reaches 100% near completion'),
+  enableTemplatesDrawer: z.boolean().default(true).description('Provide pre-configured engineering goal templates in UI drawer'),
+  enableMilestoneDependencies: z.boolean().default(true).description('Enforce milestone dependency ordering and block premature execution'),
+  soundScheme: z.string().default('default').description('Audio theme for status and milestone notifications'),
+  enableVoiceAnnouncements: z.boolean().default(false).description('Use Web Speech API for voice announcements on milestone events'),
   storagePath: z.string().default('').description('Custom filesystem path for persistent state storage'),
 });
 
@@ -43,6 +52,15 @@ export function apply(ctx, config = {}) {
     maxTokenBudget: config?.maxTokenBudget ?? 0,
     budgetWarningThreshold: config?.budgetWarningThreshold ?? 80,
     autoCheckpointOnMilestone: config?.autoCheckpointOnMilestone ?? false,
+    enableLiveActivityFeed: config?.enableLiveActivityFeed ?? true,
+    enablePreplanning: config?.enablePreplanning ?? true,
+    autoBranchOnGoalStart: config?.autoBranchOnGoalStart ?? true,
+    enablePostGoalRetrospective: config?.enablePostGoalRetrospective ?? true,
+    autoScaleBudgetNearCompletion: config?.autoScaleBudgetNearCompletion ?? false,
+    enableTemplatesDrawer: config?.enableTemplatesDrawer ?? true,
+    enableMilestoneDependencies: config?.enableMilestoneDependencies ?? true,
+    soundScheme: config?.soundScheme ?? 'default',
+    enableVoiceAnnouncements: config?.enableVoiceAnnouncements ?? false,
     storagePath: config?.storagePath,
   };
 
@@ -60,6 +78,15 @@ export function apply(ctx, config = {}) {
     maxTokenBudget: currentSettings.maxTokenBudget,
     budgetWarningThreshold: currentSettings.budgetWarningThreshold,
     autoCheckpointOnMilestone: currentSettings.autoCheckpointOnMilestone,
+    enableLiveActivityFeed: currentSettings.enableLiveActivityFeed,
+    enablePreplanning: currentSettings.enablePreplanning,
+    autoBranchOnGoalStart: currentSettings.autoBranchOnGoalStart,
+    enablePostGoalRetrospective: currentSettings.enablePostGoalRetrospective,
+    autoScaleBudgetNearCompletion: currentSettings.autoScaleBudgetNearCompletion,
+    enableTemplatesDrawer: currentSettings.enableTemplatesDrawer,
+    enableMilestoneDependencies: currentSettings.enableMilestoneDependencies,
+    soundScheme: currentSettings.soundScheme,
+    enableVoiceAnnouncements: currentSettings.enableVoiceAnnouncements,
     storagePath,
   });
 
@@ -175,35 +202,19 @@ export function apply(ctx, config = {}) {
   const getConfig = () => {
     if (settingsScope) {
       const snap = typeof settingsScope.getSnapshot === 'function' ? settingsScope.getSnapshot() : null;
+      let live = 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,
-              showQuickLaunchButton: typeof live.showQuickLaunchButton === 'boolean' ? live.showQuickLaunchButton : currentSettings.showQuickLaunchButton,
-              consecutiveToolFailureLimit: typeof live.consecutiveToolFailureLimit === 'number' ? live.consecutiveToolFailureLimit : currentSettings.consecutiveToolFailureLimit,
-              enableBrowserNotifications: typeof live.enableBrowserNotifications === 'boolean' ? live.enableBrowserNotifications : currentSettings.enableBrowserNotifications,
-              maxTokenBudget: typeof live.maxTokenBudget === 'number' ? live.maxTokenBudget : currentSettings.maxTokenBudget,
-              budgetWarningThreshold: typeof live.budgetWarningThreshold === 'number' ? live.budgetWarningThreshold : currentSettings.budgetWarningThreshold,
-              autoCheckpointOnMilestone: typeof live.autoCheckpointOnMilestone === 'boolean' ? live.autoCheckpointOnMilestone : currentSettings.autoCheckpointOnMilestone,
-              storagePath: typeof live.storagePath === 'string' ? live.storagePath : currentSettings.storagePath,
-            };
-          }
+        if (snap.status === 'ready' || snap.status === 'writable' || snap.status === undefined) {
+          live = snap.value || (typeof settingsScope.get === 'function' ? settingsScope.get() : null);
         }
       } 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,
-            showQuickLaunchButton: typeof live.showQuickLaunchButton === 'boolean' ? live.showQuickLaunchButton : currentSettings.showQuickLaunchButton,
-            storagePath: typeof live.storagePath === 'string' ? live.storagePath : currentSettings.storagePath,
-          };
-        }
+        live = settingsScope.get();
+      }
+      if (live && typeof live === 'object') {
+        return {
+          ...currentSettings,
+          ...live,
+        };
       }
     }
     return currentSettings;
@@ -220,6 +231,15 @@ export function apply(ctx, config = {}) {
       maxTokenBudget: live.maxTokenBudget,
       budgetWarningThreshold: live.budgetWarningThreshold,
       autoCheckpointOnMilestone: live.autoCheckpointOnMilestone,
+      enableLiveActivityFeed: live.enableLiveActivityFeed,
+      enablePreplanning: live.enablePreplanning,
+      autoBranchOnGoalStart: live.autoBranchOnGoalStart,
+      enablePostGoalRetrospective: live.enablePostGoalRetrospective,
+      autoScaleBudgetNearCompletion: live.autoScaleBudgetNearCompletion,
+      enableTemplatesDrawer: live.enableTemplatesDrawer,
+      enableMilestoneDependencies: live.enableMilestoneDependencies,
+      soundScheme: live.soundScheme,
+      enableVoiceAnnouncements: live.enableVoiceAnnouncements,
     });
   };
 
@@ -280,7 +300,9 @@ export function apply(ctx, config = {}) {
     try {
       if (typeof pctx.systemPrompt?.section === 'function') {
         const globalSections = pctx.systemPrompt.layers?.global?.sections;
+        let displacedPromptSection = null;
         if (globalSections?.data instanceof Map && globalSections.data.has('tool:goal')) {
+          displacedPromptSection = globalSections.data.get('tool:goal');
           globalSections.data.delete('tool:goal');
         }
 
@@ -298,7 +320,12 @@ export function apply(ctx, config = {}) {
         });
 
         if (typeof unregisterSection === 'function') {
-          pctx.effect(() => () => unregisterSection(), 'dsh-goal: system prompt section');
+          pctx.effect(() => () => {
+            unregisterSection();
+            if (displacedPromptSection && globalSections?.data instanceof Map) {
+              globalSections.data.set('tool:goal', displacedPromptSection);
+            }
+          }, 'dsh-goal: system prompt section');
         }
       }
     } catch (err) {

package/lib/routes.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { MilestoneStatus, detectLanguage, sessionIdOf } from './goal-engine-constants.js';
 import { saveGoalArtifact, rollbackToCheckpoint } from './engine-reports.js';
+import { getTemplatesCatalogue } from './engine-templates.js';
 
 export function isLoopback(value) {
   if (!value) return false;
@@ -20,10 +21,6 @@ export function isTrustedCaller(req) {
   const remote = req.socket?.remoteAddress || req.connection?.remoteAddress || '';
   if (isLoopback(remote)) return true;
 
-  const secSite = String(req.headers?.['sec-fetch-site'] || '').toLowerCase();
-  if (secSite === 'same-origin' || secSite === 'same-site' || secSite === 'none') return true;
-  if (secSite === 'cross-site') return false;
-
   const host = String(req.headers?.host || '').toLowerCase();
   const origin = String(req.headers?.origin || '').trim().toLowerCase();
   if (origin) {
@@ -166,6 +163,11 @@ export function registerRoutes(ctx, {
 
         // GET /dsh-goal/events: Server-Sent Events realtime snapshot stream
         if (req.method === 'GET' && (pathname === '/dsh-goal/events' || pathname === '/dsh-goal/events/')) {
+          if (!isTrustedCaller(req)) {
+            res.statusCode = 403;
+            res.setHeader('Content-Type', 'application/json; charset=utf-8');
+            return res.end(JSON.stringify({ error: 'Forbidden: untrusted caller origin' }));
+          }
           const sid = sessionIdOf(req, 'default');
           res.writeHead(200, {
             'Content-Type': 'text/event-stream',
@@ -194,8 +196,22 @@ export function registerRoutes(ctx, {
 
         res.setHeader('Content-Type', 'application/json; charset=utf-8');
 
+        // GET /dsh-goal/templates
+        if (req.method === 'GET' && (pathname === '/dsh-goal/templates' || pathname === '/dsh-goal/templates/')) {
+          if (!isTrustedCaller(req)) {
+            res.statusCode = 403;
+            return res.end(JSON.stringify({ error: 'Forbidden: untrusted caller origin' }));
+          }
+          res.statusCode = 200;
+          return res.end(JSON.stringify({ ok: true, templates: getTemplatesCatalogue() }));
+        }
+
         // GET /dsh-goal/state
         if (req.method === 'GET' && (pathname === '/dsh-goal/state' || pathname === '/dsh-goal/state/')) {
+          if (!isTrustedCaller(req)) {
+            res.statusCode = 403;
+            return res.end(JSON.stringify({ error: 'Forbidden: untrusted caller origin' }));
+          }
           const sid = sessionIdOf(req, 'default');
           res.statusCode = 200;
           return res.end(JSON.stringify(engine.getSnapshot(sid)));
@@ -261,13 +277,26 @@ export function registerRoutes(ctx, {
                     res.statusCode = 400;
                     return res.end(JSON.stringify({ error: 'Goal title cannot be empty' }));
                   }
+                  const trustedRoots = [process.cwd()];
+                  if (process.env.DSH_WORKSPACE_ROOT) {
+                    trustedRoots.push(process.env.DSH_WORKSPACE_ROOT);
+                  }
+                  let safeStartCwd = undefined;
+                  if (data.cwd) {
+                    const validated = getSafeCwd(data.cwd, trustedRoots);
+                    if (!validated) {
+                      res.statusCode = 400;
+                      return res.end(JSON.stringify({ error: 'Invalid or unauthorized working directory' }));
+                    }
+                    safeStartCwd = validated;
+                  }
                   const detectedLang = data.lang || detectLanguage(cleanTitle);
                   const conf = typeof getConfig === 'function' ? getConfig() : { maxIterations: 25 };
                   result = engine.startGoal(cleanTitle, {
                     description: typeof description === 'string' ? description.trim() : '',
                     maxIterations: conf.maxIterations || 25,
                     lang: detectedLang,
-                    cwd: data.cwd,
+                    cwd: safeStartCwd,
                   }, sid);
 
                   const startPrompt = detectedLang === 'zh'
@@ -383,7 +412,15 @@ export function registerRoutes(ctx, {
                   }
                   const sessionGoal = engine.getGoal(sid);
                   const allowedRoots = [process.cwd()];
-                  if (sessionGoal?.cwd) allowedRoots.push(sessionGoal.cwd);
+                  if (process.env.DSH_WORKSPACE_ROOT) {
+                    allowedRoots.push(process.env.DSH_WORKSPACE_ROOT);
+                  }
+                  if (sessionGoal?.cwd) {
+                    const isCwdAllowed = allowedRoots.some((root) => isPathInsideOrEqual(root, sessionGoal.cwd));
+                    if (isCwdAllowed) {
+                      allowedRoots.push(sessionGoal.cwd);
+                    }
+                  }
                   const safeCwd = getSafeCwd(data.cwd, allowedRoots);
                   if (!safeCwd) {
                     res.statusCode = 400;
@@ -406,7 +443,15 @@ export function registerRoutes(ctx, {
                   }
                   const sessionGoal = engine.getGoal(sid);
                   const allowedRoots = [process.cwd()];
-                  if (sessionGoal?.cwd) allowedRoots.push(sessionGoal.cwd);
+                  if (process.env.DSH_WORKSPACE_ROOT) {
+                    allowedRoots.push(process.env.DSH_WORKSPACE_ROOT);
+                  }
+                  if (sessionGoal?.cwd) {
+                    const isCwdAllowed = allowedRoots.some((root) => isPathInsideOrEqual(root, sessionGoal.cwd));
+                    if (isCwdAllowed) {
+                      allowedRoots.push(sessionGoal.cwd);
+                    }
+                  }
                   const safeCwd = getSafeCwd(data.cwd, allowedRoots);
                   if (!safeCwd) {
                     res.statusCode = 400;
@@ -421,6 +466,51 @@ export function registerRoutes(ctx, {
                   return res.end(JSON.stringify({ ok: true, artifact, state: snap }));
                 }
 
+                case 'intervene': {
+                  result = engine.intervene(data, sid);
+                  if (data.resume) {
+                    engine.resume(sid);
+                    const prompt = engine.getStatePromptInjection(sid);
+                    if (typeof resumeActiveAgent === 'function') {
+                      resumeActiveAgent(prompt, sid);
+                    }
+                  }
+                  break;
+                }
+
+                case 'preplan_approve': {
+                  result = engine.approvePreplan(sid);
+                  const prompt = engine.getStatePromptInjection(sid);
+                  if (typeof resumeActiveAgent === 'function') {
+                    resumeActiveAgent(prompt, sid);
+                  }
+                  break;
+                }
+
+                case 'branch_action': {
+                  const op = String(data.operation || data.branchOperation || 'merge').toLowerCase();
+                  const targetBranch = String(data.targetBranch || 'main');
+                  if (op === 'merge') {
+                    const ok = engine.mergeGoalBranch(targetBranch, sid);
+                    if (!ok) {
+                      res.statusCode = 500;
+                      return res.end(JSON.stringify({ error: `Failed to merge goal branch into ${targetBranch}` }));
+                    }
+                  } else if (op === 'discard') {
+                    const ok = engine.discardGoalBranch(targetBranch, sid);
+                    if (!ok) {
+                      res.statusCode = 500;
+                      return res.end(JSON.stringify({ error: 'Failed to discard goal branch' }));
+                    }
+                  }
+                  result = engine.getSnapshot(sid);
+                  break;
+                }
+
+                case 'templates':
+                  res.statusCode = 200;
+                  return res.end(JSON.stringify({ ok: true, templates: getTemplatesCatalogue() }));
+
                 default:
                   res.statusCode = 400;
                   return res.end(JSON.stringify({ error: `Unknown action: ${action}` }));

package/lib/tools.js

@@ -46,16 +46,23 @@ export function registerTools(ctx, { engine, resumeActiveAgent }) {
   ctx.inject(['tools'], (tctx) => {
     if (!tctx.tools?.register) return;
 
+    const displacedTools = new Map();
     const safeRegister = (definition) => {
       try {
         const name = definition.name;
         const globalTools = tctx.tools.layers?.global?.tools;
         if (globalTools?.data instanceof Map && globalTools.data.has(name)) {
+          displacedTools.set(name, globalTools.data.get(name));
           globalTools.data.delete(name);
         }
         const unregister = tctx.tools.register(definition);
         if (typeof unregister === 'function') {
-          tctx.effect(() => () => unregister(), `dsh-goal: tool ${name}`);
+          tctx.effect(() => () => {
+            unregister();
+            if (displacedTools.has(name) && globalTools?.data instanceof Map) {
+              globalTools.data.set(name, displacedTools.get(name));
+            }
+          }, `dsh-goal: tool ${name}`);
         }
       } catch (err) {
         console.warn(`[dsh-goal] Tool ${definition.name} registration skipped:`, err.message);
@@ -195,6 +202,9 @@ export function registerTools(ctx, { engine, resumeActiveAgent }) {
     const handleSetMilestones = async ({ milestones }, toolCtx) => {
       const sid = sessionIdOf(toolCtx, 'default');
       const snap = engine.setMilestones(milestones, sid);
+      if (typeof engine.recordToolActivity === 'function') {
+        engine.recordToolActivity('goal_set_milestones', 'success', 'Defined milestones', sid);
+      }
       return {
         success: true,
         count: snap.milestones?.length || 0,
@@ -215,6 +225,7 @@ export function registerTools(ctx, { engine, resumeActiveAgent }) {
               properties: {
                 id: { type: 'string', description: 'Short identifier, e.g. M1, step-1' },
                 title: { type: 'string', description: 'Concise actionable title' },
+                dependsOn: { type: 'array', items: { type: 'string' }, description: 'Prerequisite milestone IDs' },
               },
               required: ['id', 'title'],
             },
@@ -231,7 +242,10 @@ export function registerTools(ctx, { engine, resumeActiveAgent }) {
     // Tool 5: goal_update_progress
     const handleUpdateProgress = async ({ milestone_id, status, notes, checklist }, toolCtx) => {
       const sid = sessionIdOf(toolCtx, 'default');
-      engine.updateMilestone(milestone_id, status, notes, sid, checklist);
+      const ok = engine.updateMilestone(milestone_id, status, notes, sid, checklist);
+      if (typeof engine.recordToolActivity === 'function') {
+        engine.recordToolActivity('goal_update_progress', ok ? 'success' : 'error', String(milestone_id) + ' -> ' + String(status), sid);
+      }
       const snap = engine.getSnapshot(sid);
       const targetMilestone = snap.milestones?.find((m) => m.id === String(milestone_id) || m.id.toLowerCase().replace(/[^a-z0-9]/g, '') === String(milestone_id).toLowerCase().replace(/[^a-z0-9]/g, '') || m.id.toLowerCase().replace(/[^0-9]/g, '') === String(milestone_id).toLowerCase().replace(/[^0-9]/g, ''));
       return {
@@ -282,6 +296,9 @@ export function registerTools(ctx, { engine, resumeActiveAgent }) {
     const handleGoalFinish = async ({ summary }, toolCtx) => {
       const sid = sessionIdOf(toolCtx, 'default');
       const snap = engine.completeGoal(summary, sid);
+      if (typeof engine.recordToolActivity === 'function') {
+        engine.recordToolActivity('goal_finish', 'success', summary ? summary.slice(0, 80) : 'Goal finished', sid);
+      }
       return {
         success: true,
         completed: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-goal",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Autonomous Goal Execution & Multi-Turn Task Tracking Engine with Sticky Header for DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",