@goodandready/dsh-goal 0.2.20 → 0.2.21

package/lib/addon-store.js

@@ -22,6 +22,15 @@ export class AddonStore {
   getGoalData(goalId) {
     if (!goalId) return null;
     if (!this.goals.has(goalId)) {
+      if (this.goals.size > 100) {
+        for (const [k, v] of this.goals.entries()) {
+          const isInactive = (!v.milestones || v.milestones.length === 0 || v.milestones.every(m => m.completed));
+          if (isInactive) {
+            this.goals.delete(k);
+            if (this.goals.size <= 80) break;
+          }
+        }
+      }
       this.goals.set(goalId, {
         milestones: [],
         snapshots: [],
@@ -32,6 +41,13 @@ export class AddonStore {
     return this.goals.get(goalId);
   }
 
+  removeGoalData(goalId) {
+    if (!goalId) return false;
+    const deleted = this.goals.delete(goalId);
+    if (deleted) this.scheduleSave();
+    return deleted;
+  }
+
   getMilestones(goalId) {
     const data = this.getGoalData(goalId);
     return data ? data.milestones : [];
@@ -102,13 +118,14 @@ export class AddonStore {
       return;
     }
     if (!this.saveTimer) {
-      this.saveTimer = setTimeout(() => {
+      const timer = setTimeout(() => {
         this.saveTimer = null;
         this.writeToDiskSync();
       }, 200);
-      if (typeof this.saveTimer.unref === 'function') {
-        this.saveTimer.unref();
+      if (typeof timer?.unref === 'function') {
+        timer.unref();
       }
+      this.saveTimer = timer;
     }
   }
 
@@ -192,10 +209,12 @@ export class AddonStore {
         migratedAny = true;
       }
 
-      data._migratedToAddon = true;
-      data._migratedAt = Date.now();
-      fs.writeFileSync(legacyPath, JSON.stringify(data, null, 2), 'utf8');
-      this.scheduleSave(true);
+      if (migratedAny) {
+        data._migratedToAddon = true;
+        data._migratedAt = Date.now();
+        fs.writeFileSync(legacyPath, JSON.stringify(data, null, 2), 'utf8');
+        this.scheduleSave(true);
+      }
       return migratedAny;
     } catch (err) {
       this.logger.warn?.('[AddonStore] Legacy migration failed:', err.message);

package/lib/engine-milestones.js

@@ -116,7 +116,16 @@ export function applyMilestoneUpdate(target, status, notes = '', checklist = nul
     }
   }
 
-  if (status && (validStatuses.length === 0 || validStatuses.includes(status))) {
+  if (status) {
+    if (validStatuses.length > 0 && !validStatuses.includes(status)) {
+      return {
+        prevStatus,
+        updatedStatus: prevStatus,
+        blocked: false,
+        invalidStatus: true,
+        error: `Invalid milestone status: ${status}`,
+      };
+    }
     target.status = status;
   }
   if (notes !== undefined && notes !== null && notes !== '') {

package/lib/engine-reports.js

@@ -184,7 +184,7 @@ export function exportReportGitHubPR(state) {
     md += `\n</details>\n\n`;
   }
 
-  md += `*Automated by [@goodandready/dsh-goal](https://github.com/GooDAnDReaDY/dsh-goal)*\n`;
+  md += `*Automated by [@goodandready/dsh-goal](https://github.com/goodandready/dsh-goal)*\n`;
   return md;
 }
 
@@ -261,7 +261,7 @@ export function rollbackToCheckpoint(commitHash, cwd) {
  * @param {string} [cwd]
  * @returns {{ relativePath: string, fullPath: string, content: string }|null}
  */
-export function saveGoalArtifact(state, cwd) {
+export function saveGoalArtifact(state, cwd, addonData = {}) {
   if (!state || (!state.title && !state.objective)) return null;
   try {
     const root = cwd || process.cwd();
@@ -281,7 +281,7 @@ export function saveGoalArtifact(state, cwd) {
     const fullPath = path.join(targetDir, filename);
     const relativePath = path.join('.dsh', 'goals', filename).replace(/\\/g, '/');
 
-    const content = exportReportMarkdown(state);
+    const content = exportReportMarkdown(state, addonData);
     fs.writeFileSync(fullPath, content, 'utf8');
 
     return { relativePath, fullPath, content };
@@ -295,5 +295,5 @@ export function saveGoalArtifact(state, cwd) {
  */
 export function saveGoalReportFile(goal, addonData = {}, baseDir = null) {
   const root = baseDir || process.cwd();
-  return saveGoalArtifact(goal, root)?.fullPath || null;
+  return saveGoalArtifact(goal, root, addonData)?.fullPath || null;
 }

package/lib/engine-retrospective.js

@@ -1,5 +1,6 @@
 import { execFileSync } from 'node:child_process';
 import { MilestoneStatus, calculateElapsedSeconds } from './goal-engine-constants.js';
+import { isValidGitRef } from './engine-git-branch.js';
 
 /**
  * Generate post-goal retrospective analytics card
@@ -33,8 +34,9 @@ export function generateRetrospectiveData(goal, cwd = process.cwd()) {
   let gitDiffStat = '';
   let filesChangedCount = 0;
   try {
-    const startRef = goal.startCommit || 'HEAD~1';
-    const rawStat = execFileSync('git', ['diff', '--stat', `${startRef}..HEAD`], {
+    const rawStartRef = goal.gitStartCommit || goal.startCommit || 'HEAD~1';
+    const startRef = (rawStartRef && isValidGitRef(rawStartRef)) ? rawStartRef : 'HEAD~1';
+    const rawStat = execFileSync('git', ['diff', '--stat', `${startRef}..HEAD`, '--'], {
       cwd,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],

package/lib/engine-sessions.js

@@ -32,6 +32,7 @@ export function addNudgeToGoal(goal, text) {
   if (!Array.isArray(goal.nudges)) goal.nudges = [];
   const now = Date.now();
   goal.nudges.push({ text: clean, timestamp: now });
+  if (goal.nudges.length > 50) goal.nudges = goal.nudges.slice(-50);
   goal.pendingNudge = clean;
   goal.logs.push({
     timestamp: now,

package/lib/engine-store.js

@@ -93,13 +93,14 @@ export class EngineStore {
       return;
     }
     if (!this.saveTimer) {
-      this.saveTimer = setTimeout(() => {
+      const timer = setTimeout(() => {
         this.saveTimer = null;
         this.writeStateToDiskSync();
       }, 250);
-      if (typeof this.saveTimer.unref === 'function') {
-        this.saveTimer.unref();
+      if (typeof timer?.unref === 'function') {
+        timer.unref();
       }
+      this.saveTimer = timer;
     }
   }
 

package/lib/goal-engine.js

@@ -18,7 +18,9 @@ export { getGitCurrentCommit, exportReportMarkdown, exportReportGitHubPR, create
  */
 export class GoalEngine {
   constructor(options = {}) {
-    this.defaultMaxIterations = options.defaultMaxIterations ?? 25;
+    this.logger = options.logger || console;
+    const rawDefIters = options.defaultMaxIterations ?? 25;
+    this.defaultMaxIterations = typeof rawDefIters === "number" ? rawDefIters : (typeof rawDefIters?.value === "number" ? rawDefIters.value : 25);
     this.autoDrive = options.autoDrive ?? true;
     this.enableSound = options.enableSound ?? true;
     this.showQuickLaunchButton = options.showQuickLaunchButton ?? true;
@@ -95,11 +97,15 @@ export class GoalEngine {
   }
 
   updateConfig(config = {}) {
-    if (typeof config.defaultMaxIterations === 'number' && config.defaultMaxIterations >= 1) {
+    const rawMax = config.defaultMaxIterations ?? config.maxIterations;
+    const maxVal = typeof rawMax === 'number' ? rawMax : (typeof rawMax?.value === 'number' ? rawMax.value : undefined);
+    if (typeof maxVal === 'number' && maxVal >= 1) {
       const prev = this.defaultMaxIterations;
-      this.defaultMaxIterations = config.defaultMaxIterations;
+      this.defaultMaxIterations = maxVal;
       for (const [_, goal] of this.goals) {
-        if (goal && goal.maxIterations === prev) goal.maxIterations = config.defaultMaxIterations;
+        if (goal && (goal.maxIterations === prev || typeof goal.maxIterations !== 'number' || typeof goal.maxIterations === 'object')) {
+          goal.maxIterations = maxVal;
+        }
       }
     }
     if (typeof config.autoDrive === 'boolean') this.autoDrive = config.autoDrive;
@@ -373,13 +379,18 @@ export class GoalEngine {
       enforceDependencies: this.enableMilestoneDependencies,
       allMilestones: goal.milestones,
     });
-    if (res.blocked) {
-      recordActivity(goal, {
-        type: 'milestone',
-        tool: 'updateMilestone',
-        status: 'error',
-        details: `Milestone ${id} blocked by ${res.missingDependencies?.join(', ')}`,
-      });
+    if (res.invalidStatus || res.blocked) {
+      if (res.invalidStatus) {
+        this.logger?.warn?.(`[dsh-goal] Invalid milestone status "${status}" for milestone ${id}`);
+      }
+      if (res.blocked) {
+        recordActivity(goal, {
+          type: 'milestone',
+          tool: 'updateMilestone',
+          status: 'error',
+          details: `Milestone ${id} blocked by ${res.missingDependencies?.join(', ')}`,
+        });
+      }
       return false;
     }
 
@@ -401,7 +412,7 @@ export class GoalEngine {
             recordActivity(goal, { type: 'issue', tool: 'syncIssueChecklist', status: 'success', details: `Issue #${syncRes.issueNumber} updated` });
             this.emit(sid);
           }
-        }).catch(() => {});
+        }).catch((err) => { this.logger?.warn?.("[dsh-goal] Failed to sync milestone with issue:", err?.message || err); });
       }
     }
 

package/lib/index.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import z from '@deepseek-ai/schemastery';
@@ -130,9 +131,12 @@ export function apply(ctx, config = {}) {
 
   // Attempt migration of legacy state if present
   try {
-    const agentsSvc = safeService(ctx, "agents");
-    const firstAgent = agentsSvc?.get?.(agentsSvc?.keys?.()?.next()?.value);
-    addonStore.migrateLegacyState(storagePath, safeService(ctx, "goals"), firstAgent);
+    const legacyStatePath = path.resolve(defaultStorageDir, 'dsh-goal-state.json');
+    if (fs.existsSync(legacyStatePath)) {
+      const agentsSvc = safeService(ctx, "agents");
+      const firstAgent = agentsSvc?.get?.(agentsSvc?.keys?.()?.next()?.value);
+      addonStore.migrateLegacyState(legacyStatePath, safeService(ctx, "goals"), firstAgent);
+    }
   } catch (migErr) {
     logger.warn?.('[dsh-goal] Legacy migration check failed:', migErr.message);
   }
@@ -162,6 +166,7 @@ export function apply(ctx, config = {}) {
       autoScaleBudgetNearCompletion: currentSettings.autoScaleBudgetNearCompletion,
       enableTemplatesDrawer: currentSettings.enableTemplatesDrawer,
       enableMilestoneDependencies: currentSettings.enableMilestoneDependencies,
+      logger,
     });
   }
 
@@ -192,14 +197,55 @@ export function apply(ctx, config = {}) {
     }
   }
 
+  const sessionAgents = new Map();
+
+  const stopRunningAgents = (sessionId = 'default') => {
+    try {
+      const agentsSvc = safeService(ctx, "agents");
+      const agent = sessionAgents.get(sessionId) || agentsSvc?.get?.(sessionId) || agentsSvc?.get?.(agentsSvc?.keys?.()?.next()?.value);
+      if (agent && typeof agent.abort === 'function') {
+        agent.abort();
+      } else if (agent && typeof agent.cancel === 'function') {
+        agent.cancel();
+      } else if (agent && typeof agent.stop === 'function') {
+        agent.stop();
+      }
+    } catch (err) {
+      logger.warn?.('[dsh-goal] Failed to stop agent:', err?.message || err);
+    }
+  };
+
+  const resumeActiveAgent = (prompt, sessionId = 'default') => {
+    try {
+      const agentsSvc = safeService(ctx, "agents");
+      const agent = sessionAgents.get(sessionId) || agentsSvc?.get?.(sessionId) || agentsSvc?.get?.(agentsSvc?.keys?.()?.next()?.value);
+      if (agent) {
+        if (typeof agent.resume === 'function') {
+          agent.resume(prompt);
+        } else if (typeof agent.step === 'function') {
+          agent.step(prompt);
+        } else if (typeof agent.send === 'function' && prompt) {
+          agent.send(prompt);
+        }
+      }
+    } catch (err) {
+      logger.warn?.('[dsh-goal] Failed to resume agent:', err?.message || err);
+    }
+  };
+
   // 2. WebServer HTTP & SSE routes (registered after updater so it remains primary)
   const { broadcastEvent } = registerRoutes(ctx, {
     engine: fallbackEngine,
     milestoneManager,
+    snapshotManager: gitSnapshotManager,
     gitSnapshotManager,
+    budgetGuard: tokenBudgetGuard,
     tokenBudgetGuard,
     addonStore,
     goalsService: safeService(ctx, "goals"),
+    stopRunningAgents,
+    resumeActiveAgent,
+    sessionAgents,
     getConfig: () => currentSettings,
     sseClients,
     logger,
@@ -243,6 +289,7 @@ export function apply(ctx, config = {}) {
 
     // Inject milestone prompts and check budget during agent turns
     ctx.on('agent/pre-step', async ({ agent, messages, step, signal }, next) => {
+      if (agent) { sessionAgents.set(sessionIdOf(agent, "default"), agent); }
       const goalsSvc = safeService(ctx, "goals");
       if (goalsSvc && typeof goalsSvc.get === "function" && agent) {
         try {
@@ -284,7 +331,7 @@ export function apply(ctx, config = {}) {
 
     // Compatibility events for turn/end and approval/asked
     ctx.on('turn/end', (event) => {
-      // noop or session isolation
+      // session isolation turn tracking
     });
 
     ctx.on('approval/asked', (event) => {

package/lib/milestone-manager.js

@@ -95,11 +95,15 @@ export class MilestoneManager {
 
     // Best-effort Gitea issue checklist sync if issue data exists
     const goalData = this.store.getGoalData(goalId);
-    if (goalData?.issue?.number) {
+    if (goalData?.issueRef?.issueNumber || goalData?.issue?.number) {
       try {
-        syncMilestoneWithIssue(goalData.issue.number, m.title, true);
-      } catch (e) {
-        // sync error non-fatal
+        const issueRef = goalData.issueRef || { issueNumber: goalData.issue.number };
+        const fakeGoal = { issueRef, cwd: workspaceRoot };
+        syncMilestoneWithIssue(fakeGoal, m, { cwd: workspaceRoot }).catch((err) => {
+          this.logger?.warn?.('[MilestoneManager] Issue sync failed:', err?.message || err);
+        });
+      } catch (err) {
+        this.logger?.warn?.('[MilestoneManager] Issue sync error:', err?.message || err);
       }
     }
 
@@ -132,8 +136,8 @@ export class MilestoneManager {
 
     const uncompletedChecklist = (active.checklist || []).filter(c => !c.done);
     let clText = '';
-    if (active.checklist?.length > 0) {
-      clText = ` | Next items: ${active.checklist.map(c => `[${c.done ? 'x' : ' '}] ${c.text}`).join(', ')}`;
+    if (uncompletedChecklist.length > 0) {
+      clText = ` | Next items: ${uncompletedChecklist.map(c => `[ ] ${c.text}`).join(', ')}`;
     }
 
     return `[Goal Milestones]: Current step: "${active.title}"${clText}`;

package/lib/routes.js

@@ -79,10 +79,14 @@ export function registerRoutes(ctx, {
   sseClients = new Map(),
   addonStore,
   budgetGuard,
+  tokenBudgetGuard,
   snapshotManager,
+  gitSnapshotManager,
   milestoneManager,
   logger = console,
 } = {}) {
+  const activeBudgetGuard = budgetGuard || tokenBudgetGuard;
+  const activeSnapshotManager = snapshotManager || gitSnapshotManager;
   // Subscribe to engine if provided (backward compatibility)
   if (engine && typeof engine.subscribe === 'function') {
     engine.subscribe((snapshot, sid) => {
@@ -396,6 +400,9 @@ export function registerRoutes(ctx, {
                   if (engine) {
                     result = engine.clear(sid);
                   }
+                  if (addonStore && typeof addonStore.removeGoalData === 'function') {
+                    addonStore.removeGoalData(sid);
+                  }
                   if (typeof stopRunningAgents === 'function') {
                     stopRunningAgents(sid);
                   }

package/lib/tools.js

@@ -141,7 +141,6 @@ export function registerTools(ctx, { milestoneManager, goalsService, logger = co
       },
       output: JSON_OUTPUT,
       execute: handleGoalMilestones,
-      handler: handleGoalMilestones,
     });
 
     // Tool 2: goal_checklist
@@ -181,7 +180,99 @@ export function registerTools(ctx, { milestoneManager, goalsService, logger = co
       },
       output: JSON_OUTPUT,
       execute: handleGoalChecklist,
-      handler: handleGoalChecklist,
+    });
+    // Tool 3: goal_set_milestones (Issue #127 alias matching autonomous-contract prompt)
+    const handleGoalSetMilestones = async (args = {}, toolCtx = {}) => {
+      const goalId = args.goalId || args.goal_id || resolveGoalId(toolCtx);
+      let list = args.milestones;
+      if (Array.isArray(list)) {
+        list = list.map((item, idx) => {
+          if (typeof item === 'string') {
+            return { id: `m-${idx + 1}`, title: item };
+          }
+          return item;
+        });
+      } else {
+        list = [];
+      }
+      const res = mm.setMilestones(goalId, list);
+      return { ok: true, goalId, count: res.length, milestones: res };
+    };
+
+    safeRegister({
+      name: 'goal_set_milestones',
+      description: 'Set initial work plan milestones for the active goal.',
+      parameters: {
+        type: 'object',
+        properties: {
+          milestones: {
+            type: 'array',
+            items: { type: ['string', 'object'] },
+            description: 'Array of milestone titles or objects',
+          },
+        },
+        required: ['milestones'],
+      },
+      output: JSON_OUTPUT,
+      execute: handleGoalSetMilestones,
+    });
+
+    // Tool 4: goal_update_progress (Issue #127 alias matching autonomous-contract prompt)
+    const handleGoalUpdateProgress = async (args = {}, toolCtx = {}) => {
+      const goalId = args.goalId || args.goal_id || resolveGoalId(toolCtx);
+      const milestoneId = args.milestone_id || args.milestoneId;
+      const status = args.status || 'in_progress';
+      const notes = typeof args.notes === 'string' ? args.notes : '';
+      if (!milestoneId) throw new Error('milestone_id is required');
+      if (status === 'completed') {
+        const rawCwd = toolCtx?.session?.cwd || toolCtx?.cwd || process.cwd();
+        const safeCwd = getSafeCwd(rawCwd);
+        const completed = await mm.completeMilestone(goalId, milestoneId, notes, safeCwd);
+        return { ok: true, goalId, milestoneId, status: 'completed', milestone: completed };
+      }
+      const updated = mm.updateMilestone(goalId, milestoneId, { status, notes, checklist: args.checklist });
+      return { ok: true, goalId, milestoneId, status, milestone: updated };
+    };
+
+    safeRegister({
+      name: 'goal_update_progress',
+      description: 'Update progress and status of a milestone.',
+      parameters: {
+        type: 'object',
+        properties: {
+          milestone_id: { type: 'string', description: 'Target milestone ID' },
+          status: { type: 'string', enum: ['pending', 'in_progress', 'completed', 'blocked'], description: 'Milestone status' },
+          notes: { type: 'string', description: 'Brief outcome or status notes' },
+          checklist: { type: 'array', items: { type: 'string' }, description: 'Subtask items' },
+        },
+        required: ['milestone_id', 'status'],
+      },
+      output: JSON_OUTPUT,
+      execute: handleGoalUpdateProgress,
+    });
+
+    // Tool 5: goal_finish (Issue #127 alias matching autonomous-contract prompt)
+    const handleGoalFinish = async (args = {}, toolCtx = {}) => {
+      const goalId = args.goalId || args.goal_id || resolveGoalId(toolCtx);
+      const summary = typeof args.summary === 'string' ? args.summary : '';
+      if (goalsService && typeof goalsService.complete === 'function') {
+        try { goalsService.complete(toolCtx?.agent, summary); } catch (e) { /* ignore */ }
+      }
+      return { ok: true, goalId, completed: true, summary };
+    };
+
+    safeRegister({
+      name: 'goal_finish',
+      description: 'Finish active goal with final achieved outcome summary.',
+      parameters: {
+        type: 'object',
+        properties: {
+          summary: { type: 'string', description: 'Comprehensive summary of results' },
+        },
+        required: ['summary'],
+      },
+      output: JSON_OUTPUT,
+      execute: handleGoalFinish,
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-goal",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "Core Goal Addon (Token Budget, Milestones, Git Snapshots & Retrospective Reports) for DeepSeek Harness",
   "type": "module",
   "main": "./lib/index.js",