@goodandready/dsh-goal 0.2.6 → 0.2.7

package/lib/client.js

@@ -420,7 +420,7 @@ window.__ModuleLoader__.load({
         border: 1px solid var(--dsw-alias-border-subtle);
         border-radius: 9999px;
         padding: 4px 12px;
-        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
+        box-shadow: var(--dsw-alias-shadow-md);
         backdrop-filter: blur(8px);
         font-size: 13px;
         max-width: 100%;
@@ -453,7 +453,7 @@ window.__ModuleLoader__.load({
         margin: 0;
       }
       .dsh-goal-budget-warn {
-        color: #f59e0b;
+        color: var(--dsw-alias-status-warning);
         font-weight: 600;
         display: inline-flex;
         align-items: center;
@@ -2580,7 +2580,9 @@ window.__ModuleLoader__.load({
           const next = !prev;
           try {
             localStorage.setItem('dsh_goal_dock_collapsed', String(next));
-          } catch (e) {}
+          } catch (e) {
+            // Handled defensively: localStorage might be unavailable or quota exceeded
+          }
           return next;
         });
       };
@@ -2637,7 +2639,7 @@ window.__ModuleLoader__.load({
 
         const active = resolveLocale();
 
-        return LOCALES[active]?.[key] || LOCALES.en?.[key] || LOCALES.ru?.[key] || key;
+        return LOCALES[active]?.[key] || LOCALES.en?.[key] || key;
 
       };
 
@@ -3247,7 +3249,7 @@ window.__ModuleLoader__.load({
                     'button',
                     {
                       className: 'dsh-goal-btn',
-                      style: { background: '#f59e0b', color: '#000', fontWeight: 600, fontSize: 12, padding: '2px 8px' },
+                      style: { background: 'var(--dsw-alias-status-warning)', color: 'var(--dsw-alias-surface-raised)', fontWeight: 600, fontSize: 12, padding: '2px 8px' },
                       title: t('extendBudgetBtn') || '+50k Tokens & Resume',
                       onClick: () => handleAction('extend_budget', { addTokens: 50000 }),
                     },
@@ -4686,146 +4688,158 @@ window.__ModuleLoader__.load({
     module.exports.inject = ['slots', 'locale', 'settingsScope'];
 
     module.exports.apply = function apply(ctx) {
+      if (typeof ctx.effect === 'function') {
+        ctx.effect(() => {
+          try {
+            ctx.locale?.register?.(NS, LOCALES);
+          } catch (err) { /* handled defensively */ }
+
+          const settingsScope =
+            ctx.settingsScope && typeof ctx.settingsScope.bind === 'function'
+              ? ctx.settingsScope.bind({ namespace: NS })
+              : null;
+
+          const disposers = [];
+          const registerSlotSafe = (name, entry, comp) => {
+            try {
+              if (typeof ctx.slots?.inject === 'function') {
+                const unreg = ctx.slots.inject(name, () => {
+                  try {
+                    return ctx.slots.register(entry, comp);
+                  } catch (err) { /* handled defensively */ }
+                });
+                if (typeof unreg === 'function') disposers.push(unreg);
+              } else if (typeof ctx.slots?.register === 'function') {
+                const unreg = ctx.slots.register(entry, comp);
+                if (typeof unreg === 'function') disposers.push(unreg);
+              }
+            } catch (err) { /* handled defensively */ }
+          };
+
+          registerSlotSafe(
+            'conversation.input.dock',
+            {
+              name: 'conversation.input.dock',
+              id: '@goodandready/dsh-goal',
+              order: 10,
+              locale: NS,
+              inject: (slotProps) => ({ ctx, ...slotProps }),
+            },
+            GoalTopBanner,
+          );
+
+          registerSlotSafe(
+            'plugins.item',
+            {
+              name: 'plugins.item',
+              id: ROW_ID,
+              order: 60,
+              label: () => 'Goal',
+              locale: NS,
+              inject: () => ({ ctx, scope: settingsScope }),
+            },
+            GoalSettingsCard,
+          );
+
+          registerSlotSafe(
+            'plugins.row.config',
+            {
+              name: 'plugins.row.config',
+              key: ROW_CONFIG_KEY,
+              locale: NS,
+              inject: () => ({ ctx, scope: settingsScope }),
+            },
+            GoalSettingsCard,
+          );
+
+          registerSlotSafe(
+            'settings.plugin.item',
+            {
+              name: 'settings.plugin.item',
+              key: NS,
+              locale: NS,
+              inject: () => ({ ctx, scope: settingsScope }),
+            },
+            GoalSettingsCard,
+          );
 
-      // Register localization
-
-      try {
-
-        ctx.locale?.register?.(NS, LOCALES);
-
-      } catch (err) { /* handled defensively */ }
-
-      // Plugin settings scope
-
-      const settingsScope =
-
-        ctx.settingsScope && typeof ctx.settingsScope.bind === 'function'
-
-          ? ctx.settingsScope.bind({ namespace: NS })
-
-          : null;
-
-      const registerSlotSafe = (name, entry, comp) => {
-
+          return () => {
+            for (const dispose of disposers) {
+              try { dispose(); } catch (e) { /* handled defensively */ }
+            }
+          };
+        }, 'dsh-goal: client slots & locale');
+      } else {
         try {
-
-          if (typeof ctx.slots?.inject === 'function') {
-
-            ctx.slots.inject(name, () => {
-
-              try {
-
-                return ctx.slots.register(entry, comp);
-
-              } catch (err) { /* handled defensively */ }
-
-            });
-
-          } else if (typeof ctx.slots?.register === 'function') {
-
-            ctx.slots.register(entry, comp);
-
-          }
-
+          ctx.locale?.register?.(NS, LOCALES);
         } catch (err) { /* handled defensively */ }
 
-      };
-
-      // 1. Register composer dock widget
-
-      registerSlotSafe(
-
-        'conversation.input.dock',
-
-        {
-
-          name: 'conversation.input.dock',
-
-          id: '@goodandready/dsh-goal',
-
-          order: 10,
-
-          locale: NS,
-
-          inject: (slotProps) => ({ ctx, ...slotProps }),
-
-        },
-
-        GoalTopBanner,
-
-      );
-
-      // 2. Register settings card.
-      // List seat (plugins.item): the seat the Plugins page renders as the plugin's own
-      // page with its configuration. The label is a static string on purpose — it is
-      // resolved while the page renders, and a locale lookup there would take the whole
-      // client batch down with it.
-      registerSlotSafe(
-
-        'plugins.item',
-
-        {
+        const settingsScope =
+          ctx.settingsScope && typeof ctx.settingsScope.bind === 'function'
+            ? ctx.settingsScope.bind({ namespace: NS })
+            : null;
 
-          name: 'plugins.item',
-
-          id: ROW_ID,
-
-          order: 60,
-
-          label: () => 'Goal',
-
-          locale: NS,
-
-          inject: () => ({ ctx, scope: settingsScope }),
-
-        },
-
-        GoalSettingsCard,
-
-      );
-
-      // Row seat and the legacy seat kept as fallbacks.
-
-      registerSlotSafe(
-
-        'plugins.row.config',
-
-        {
-
-          name: 'plugins.row.config',
-
-          key: ROW_CONFIG_KEY,
-
-          locale: NS,
-
-          inject: () => ({ ctx, scope: settingsScope }),
-
-        },
-
-        GoalSettingsCard,
-
-      );
-
-      registerSlotSafe(
-
-        'settings.plugin.item',
-
-        {
-
-          name: 'settings.plugin.item',
-
-          key: NS,
-
-          locale: NS,
-
-          inject: () => ({ ctx, scope: settingsScope }),
+        const registerSlotSafe = (name, entry, comp) => {
+          try {
+            if (typeof ctx.slots?.inject === 'function') {
+              ctx.slots.inject(name, () => {
+                try {
+                  return ctx.slots.register(entry, comp);
+                } catch (err) { /* handled defensively */ }
+              });
+            } else if (typeof ctx.slots?.register === 'function') {
+              ctx.slots.register(entry, comp);
+            }
+          } catch (err) { /* handled defensively */ }
+        };
 
-        },
+        registerSlotSafe(
+          'conversation.input.dock',
+          {
+            name: 'conversation.input.dock',
+            id: '@goodandready/dsh-goal',
+            order: 10,
+            locale: NS,
+            inject: (slotProps) => ({ ctx, ...slotProps }),
+          },
+          GoalTopBanner,
+        );
 
-        GoalSettingsCard,
+        registerSlotSafe(
+          'plugins.item',
+          {
+            name: 'plugins.item',
+            id: ROW_ID,
+            order: 60,
+            label: () => 'Goal',
+            locale: NS,
+            inject: () => ({ ctx, scope: settingsScope }),
+          },
+          GoalSettingsCard,
+        );
 
-      );
+        registerSlotSafe(
+          'plugins.row.config',
+          {
+            name: 'plugins.row.config',
+            key: ROW_CONFIG_KEY,
+            locale: NS,
+            inject: () => ({ ctx, scope: settingsScope }),
+          },
+          GoalSettingsCard,
+        );
 
+        registerSlotSafe(
+          'settings.plugin.item',
+          {
+            name: 'settings.plugin.item',
+            key: NS,
+            locale: NS,
+            inject: () => ({ ctx, scope: settingsScope }),
+          },
+          GoalSettingsCard,
+        );
+      }
     };
 
     return module.exports;

package/lib/engine-milestones.js

@@ -0,0 +1,106 @@
+import { MilestoneStatus } from './goal-engine-constants.js';
+
+/**
+ * Match a milestone object by exact ID or normalized ID (e.g. m-1 vs m1 vs 1)
+ * @param {object} m Milestone object
+ * @param {string|number} id Milestone ID to match
+ * @returns {boolean}
+ */
+export function matchMilestone(m, id) {
+  if (!m || id === undefined || id === null) return false;
+  if (m.id === String(id)) return true;
+  const s1 = String(m.id).toLowerCase().replace(/[^a-z0-9]/g, '');
+  const s2 = String(id).toLowerCase().replace(/[^a-z0-9]/g, '');
+  if (s1 && s1 === s2) return true;
+  const n1 = s1.replace(/^m+/, '');
+  const n2 = s2.replace(/^m+/, '');
+  return Boolean(n1 && n1 === n2);
+}
+
+/**
+ * Safely parse checklist items
+ * @param {Array} checklist
+ * @returns {Array<{ text: string, done: boolean }>}
+ */
+export function parseChecklist(checklist) {
+  if (!Array.isArray(checklist)) return [];
+  return checklist
+    .map((item) => ({
+      text: String(item?.text || item?.title || '').trim(),
+      done: Boolean(item?.done || item?.completed),
+    }))
+    .filter((item) => item.text.length > 0);
+}
+
+/**
+ * Build and normalize milestone objects from list
+ * @param {Array} milestonesList
+ * @param {number} startingCount
+ * @returns {Array<object>}
+ */
+export function parseMilestoneItems(milestonesList, startingCount = 0) {
+  if (!Array.isArray(milestonesList)) return [];
+  const result = [];
+  let count = startingCount;
+
+  for (const item of milestonesList) {
+    const itemTitle = typeof item === 'string' ? item : item?.title;
+    if (!itemTitle || !itemTitle.trim()) continue;
+
+    count += 1;
+    const mId = typeof item === 'object' && item?.id ? item.id : ('m-' + count);
+    const mObj = {
+      id: String(mId),
+      title: itemTitle.trim(),
+      status: typeof item === 'object' && item?.status ? item.status : MilestoneStatus.PENDING,
+      notes: typeof item === 'object' && item?.notes ? String(item.notes) : '',
+    };
+    if (typeof item === 'object' && Array.isArray(item?.checklist)) {
+      mObj.checklist = parseChecklist(item.checklist);
+    }
+    result.push(mObj);
+  }
+
+  return result;
+}
+
+/**
+ * Apply updates to a milestone target
+ * @param {object} target Milestone object
+ * @param {string} [status] New status
+ * @param {string} [notes] New notes
+ * @param {Array} [checklist] New checklist
+ * @param {Array<string>} [validStatuses] Allowed statuses
+ * @returns {{ prevStatus: string, updatedStatus: string }}
+ */
+export function applyMilestoneUpdate(target, status, notes = '', checklist = null, validStatuses = []) {
+  if (!target) return { prevStatus: null, updatedStatus: null };
+  const prevStatus = target.status;
+
+  if (status && (validStatuses.length === 0 || validStatuses.includes(status))) {
+    target.status = status;
+  }
+  if (notes !== undefined && notes !== null && notes !== '') {
+    target.notes = String(notes);
+  }
+  if (Array.isArray(checklist)) {
+    target.checklist = parseChecklist(checklist);
+  }
+
+  return { prevStatus, updatedStatus: target.status };
+}
+
+/**
+ * Toggle a checklist item in milestone target
+ * @param {object} target Milestone object
+ * @param {number} itemIndex Index in checklist
+ * @param {boolean} [done] Optional explicit done boolean
+ * @returns {boolean}
+ */
+export function toggleMilestoneChecklistItem(target, itemIndex, done) {
+  if (!target || !Array.isArray(target.checklist) || !target.checklist[itemIndex]) {
+    return false;
+  }
+  target.checklist[itemIndex].done = done !== undefined ? Boolean(done) : !target.checklist[itemIndex].done;
+  return true;
+}

package/lib/engine-reports.js

@@ -1,4 +1,4 @@
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 
 /**
  * Safely get current short git commit hash
@@ -7,7 +7,7 @@ import { execSync } from 'node:child_process';
  */
 export function getGitCurrentCommit(cwd) {
   try {
-    return execSync('git rev-parse --short HEAD', {
+    return execFileSync('git', ['rev-parse', '--short', 'HEAD'], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
       timeout: 1000,
@@ -126,7 +126,7 @@ import path from 'node:path';
 export function createMilestoneCheckpoint(milestone, sessionId = 'default', cwd) {
   if (!milestone || !milestone.id) return null;
   try {
-    const status = execSync('git status --porcelain', {
+    const status = execFileSync('git', ['status', '--porcelain'], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
       timeout: 2000,
@@ -135,21 +135,21 @@ export function createMilestoneCheckpoint(milestone, sessionId = 'default', cwd)
 
     // If there are changes, auto-commit checkpoint
     if (status) {
-      execSync('git add -A', {
+      execFileSync('git', ['add', '-A'], {
         stdio: ['ignore', 'ignore', 'ignore'],
         timeout: 3000,
         cwd: cwd || undefined,
       });
       const cleanTitle = (milestone.title || '').replace(/[\"\`\$]/g, '');
       const msg = `checkpoint(goal): [${milestone.id}] ${cleanTitle}`;
-      execSync(`git commit -m "${msg}" --no-verify`, {
+      execFileSync('git', ['commit', '-m', msg, '--no-verify'], {
         stdio: ['ignore', 'ignore', 'ignore'],
         timeout: 5000,
         cwd: cwd || undefined,
       });
     }
 
-    const hash = execSync('git rev-parse --short HEAD', {
+    const hash = execFileSync('git', ['rev-parse', '--short', 'HEAD'], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
       timeout: 1000,
@@ -173,7 +173,7 @@ export function rollbackToCheckpoint(commitHash, cwd) {
   try {
     const cleanHash = commitHash.trim().replace(/[^a-zA-Z0-9_-]/g, '');
     if (!cleanHash) return false;
-    execSync(`git checkout ${cleanHash} -- .`, {
+    execFileSync('git', ['checkout', cleanHash, '--', '.'], {
       stdio: ['ignore', 'ignore', 'ignore'],
       timeout: 5000,
       cwd: cwd || undefined,

package/lib/goal-engine-constants.js

@@ -98,3 +98,119 @@ export function sessionIdOf(invocationOrReq, fallback = 'default') {
   }
   return fallback;
 }
+
+/**
+ * Calculate elapsed seconds from goal timing properties
+ * @param {object} goal
+ * @returns {number}
+ */
+export function calculateElapsedSeconds(goal) {
+  if (!goal) return 0;
+  const { startedAt, pausedAt, totalPausedDurationMs, completedAt } = goal;
+  const endTime = completedAt || (pausedAt || Date.now());
+  const elapsedMs = Math.max(0, endTime - startedAt - (totalPausedDurationMs || 0));
+  return Math.floor(elapsedMs / 1000);
+}
+
+/**
+ * Calculate estimated remaining seconds based on completed milestones
+ * @param {object} goal
+ * @param {number} elapsed
+ * @returns {number|null}
+ */
+export function calculateRemainingSeconds(goal, elapsed) {
+  if (!goal || goal.state !== GoalState.RUNNING) return null;
+  const total = goal.milestones?.length || 0;
+  if (total === 0) return null;
+  const completedCount = goal.milestones.filter((m) => m.status === MilestoneStatus.COMPLETED).length;
+  if (completedCount === 0 || completedCount >= total) return null;
+  if (elapsed <= 0) return null;
+  const avgSecPerMilestone = elapsed / completedCount;
+  const remainingCount = total - completedCount;
+  return Math.max(1, Math.round(avgSecPerMilestone * remainingCount));
+}
+
+/**
+ * Build snapshot object for a given goal or idle state
+ * @param {object|null} goal
+ * @param {string} sid
+ * @param {object} engine
+ * @returns {object}
+ */
+export function buildSnapshot(goal, sid, engine) {
+  if (!goal) {
+    return {
+      sessionId: sid,
+      hasActiveGoal: false,
+      state: GoalState.IDLE,
+      title: '',
+      startedAt: null,
+      pausedAt: null,
+      totalPausedDurationMs: 0,
+      completedAt: null,
+      elapsedSeconds: 0,
+      formattedElapsed: '0s',
+      estimatedRemainingSeconds: null,
+      formattedETA: null,
+      lang: 'en',
+      tokensUsage: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
+      milestones: [],
+      progressPercent: 0,
+      iterationsCount: 0,
+      maxIterations: engine.defaultMaxIterations,
+      autoDrive: engine.autoDrive,
+      enableSound: engine.enableSound,
+      showQuickLaunchButton: engine.showQuickLaunchButton,
+      gitStartCommit: null,
+      pendingNudge: null,
+      toolFailureCount: 0,
+      consecutiveToolFailureLimit: engine.consecutiveToolFailureLimit,
+      maxTokenBudget: engine.maxTokenBudget,
+      budgetWarningThreshold: engine.budgetWarningThreshold,
+      budgetWarningTriggered: false,
+      autoCheckpointOnMilestone: engine.autoCheckpointOnMilestone,
+    };
+  }
+
+  const elapsed = calculateElapsedSeconds(goal);
+  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;
+  const estSec = calculateRemainingSeconds(goal, elapsed);
+
+  return {
+    sessionId: sid,
+    hasActiveGoal: true,
+    id: goal.id,
+    state: goal.state,
+    title: goal.title,
+    description: goal.description,
+    lang: goal.lang || detectLanguage(goal.title),
+    startedAt: goal.startedAt,
+    pausedAt: goal.pausedAt,
+    totalPausedDurationMs: goal.totalPausedDurationMs,
+    completedAt: goal.completedAt,
+    elapsedSeconds: elapsed,
+    formattedElapsed: formatElapsed(elapsed),
+    estimatedRemainingSeconds: estSec,
+    formattedETA: formatETA(estSec),
+    tokensUsage: goal.tokensUsage || { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
+    iterationsCount: goal.iterationsCount,
+    maxIterations: goal.maxIterations,
+    milestones,
+    progressPercent,
+    logs: goal.logs,
+    resultSummary: goal.resultSummary,
+    autoDrive: engine.autoDrive,
+    enableSound: engine.enableSound,
+    showQuickLaunchButton: engine.showQuickLaunchButton,
+    gitStartCommit: goal.gitStartCommit || null,
+    pendingNudge: goal.pendingNudge || null,
+    toolFailureCount: engine.getToolFailureCount(sid),
+    consecutiveToolFailureLimit: engine.consecutiveToolFailureLimit,
+    maxTokenBudget: goal.maxTokenBudget ?? engine.maxTokenBudget,
+    budgetWarningThreshold: engine.budgetWarningThreshold,
+    budgetWarningTriggered: Boolean(goal.budgetWarningTriggered),
+    autoCheckpointOnMilestone: engine.autoCheckpointOnMilestone,
+  };
+}

package/lib/goal-engine.js

@@ -1,20 +1,10 @@
-import { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf } from './goal-engine-constants.js';
+import { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf, calculateElapsedSeconds, calculateRemainingSeconds, buildSnapshot } from './goal-engine-constants.js';
 import { getGitCurrentCommit, exportReportMarkdown, exportReportGitHubPR, createMilestoneCheckpoint, rollbackToCheckpoint, saveGoalArtifact } from './engine-reports.js';
 import { EngineStore } from './engine-store.js';
 import { buildStatePromptInjection } from './engine-prompt.js';
-function matchMilestone(m, id) {
-  if (!m || id === undefined || id === null) return false;
-  if (m.id === String(id)) return true;
-  const s1 = String(m.id).toLowerCase().replace(/[^a-z0-9]/g, '');
-  const s2 = String(id).toLowerCase().replace(/[^a-z0-9]/g, '');
-  if (s1 && s1 === s2) return true;
-  const n1 = s1.replace(/^m+/, '');
-  const n2 = s2.replace(/^m+/, '');
-  return Boolean(n1 && n1 === n2);
-}
-
+import { matchMilestone, parseMilestoneItems, applyMilestoneUpdate, toggleMilestoneChecklistItem } from './engine-milestones.js';
 
-export { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf };
+export { GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf, matchMilestone };
 export { getGitCurrentCommit, exportReportMarkdown, exportReportGitHubPR, createMilestoneCheckpoint, rollbackToCheckpoint, saveGoalArtifact };
 
 /**
@@ -198,6 +188,7 @@ export class GoalEngine {
       const oldest = inactive.shift();
       this.goals.delete(oldest.sid);
       this.stallCounters.delete(oldest.sid);
+      this.toolFailureCounters.delete(oldest.sid);
     }
   }
 
@@ -346,6 +337,7 @@ export class GoalEngine {
     const sid = sessionId || 'default';
     this.goals.delete(sid);
     this.stallCounters.delete(sid);
+    this.toolFailureCounters.delete(sid);
     this.emit(sid, true);
     return this.getSnapshot(sid);
   }
@@ -376,6 +368,7 @@ export class GoalEngine {
     }
 
     this.stallCounters.delete(sid);
+    this.toolFailureCounters.delete(sid);
     this.emit(sid, true);
     return this.getSnapshot(sid);
   }
@@ -385,18 +378,8 @@ export class GoalEngine {
     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-${goal.milestones.length + 1}`;
-      goal.milestones.push({
-        id: String(mId),
-        title: itemTitle.trim(),
-        status: typeof item === 'object' && item.status ? item.status : MilestoneStatus.PENDING,
-        notes: typeof item === 'object' && item.notes ? item.notes : '',
-      });
-    }
+    const newItems = parseMilestoneItems(milestonesList, goal.milestones.length);
+    goal.milestones.push(...newItems);
 
     this.recordProgress(sid);
     if (shouldEmit) this.emit(sid);
@@ -410,20 +393,13 @@ export class GoalEngine {
     const target = goal.milestones.find((m) => matchMilestone(m, id));
     if (!target) return false;
 
-    const prevStatus = target.status;
-    if (status && Object.values(MilestoneStatus).includes(status)) {
-      target.status = status;
-    }
-    if (notes) {
-      target.notes = String(notes);
-    }
-
-    if (Array.isArray(checklist)) {
-      target.checklist = checklist.map((item) => ({
-        text: String(item.text || item.title || '').trim(),
-        done: Boolean(item.done || item.completed),
-      })).filter((item) => item.text.length > 0);
-    }
+    const { prevStatus } = applyMilestoneUpdate(
+      target,
+      status,
+      notes,
+      checklist,
+      Object.values(MilestoneStatus)
+    );
 
     // Auto Git Checkpoint on milestone completion
     if (target.status === MilestoneStatus.COMPLETED && prevStatus !== MilestoneStatus.COMPLETED && this.autoCheckpointOnMilestone) {
@@ -459,11 +435,9 @@ export class GoalEngine {
     if (!goal) return false;
 
     const target = goal.milestones.find((m) => matchMilestone(m, milestoneId));
-    if (!target || !Array.isArray(target.checklist) || !target.checklist[itemIndex]) {
-      return false;
-    }
+    const ok = toggleMilestoneChecklistItem(target, itemIndex, done);
+    if (!ok) return false;
 
-    target.checklist[itemIndex].done = done !== undefined ? Boolean(done) : !target.checklist[itemIndex].done;
     this.recordProgress(sid);
     this.emit(sid);
     return true;
@@ -525,13 +499,7 @@ export class GoalEngine {
   }
 
   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);
+    return calculateElapsedSeconds(this.goals.get(sessionId || 'default'));
   }
 
   addTokenUsage(usage, sessionId = 'default') {
@@ -588,100 +556,12 @@ export class GoalEngine {
   getEstimatedRemainingSeconds(sessionId = 'default') {
     const sid = sessionId || 'default';
     const goal = this.goals.get(sid);
-    if (!goal || goal.state !== GoalState.RUNNING) return null;
-
-    const total = goal.milestones.length;
-    if (total === 0) return null;
-
-    const completedCount = goal.milestones.filter((m) => m.status === MilestoneStatus.COMPLETED).length;
-    if (completedCount === 0 || completedCount >= total) return null;
-
-    const elapsed = this.getElapsedSeconds(sid);
-    if (elapsed <= 0) return null;
-
-    const avgSecPerMilestone = elapsed / completedCount;
-    const remainingCount = total - completedCount;
-    return Math.max(1, Math.round(avgSecPerMilestone * remainingCount));
+    return calculateRemainingSeconds(goal, this.getElapsedSeconds(sid));
   }
 
   getSnapshot(sessionId = 'default') {
     const sid = sessionId || 'default';
-    const goal = this.goals.get(sid);
-    if (!goal) {
-      return {
-        sessionId: sid,
-        hasActiveGoal: false,
-        state: GoalState.IDLE,
-        title: '',
-        startedAt: null,
-        pausedAt: null,
-        totalPausedDurationMs: 0,
-        completedAt: null,
-        elapsedSeconds: 0,
-        formattedElapsed: '0s',
-        estimatedRemainingSeconds: null,
-        formattedETA: null,
-        lang: 'en',
-        tokensUsage: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
-        milestones: [],
-        progressPercent: 0,
-        iterationsCount: 0,
-        maxIterations: this.defaultMaxIterations,
-        autoDrive: this.autoDrive,
-        enableSound: this.enableSound,
-        showQuickLaunchButton: this.showQuickLaunchButton,
-        gitStartCommit: null,
-        pendingNudge: null,
-        toolFailureCount: 0,
-        consecutiveToolFailureLimit: this.consecutiveToolFailureLimit,
-        maxTokenBudget: this.maxTokenBudget,
-        budgetWarningThreshold: this.budgetWarningThreshold,
-        budgetWarningTriggered: false,
-        autoCheckpointOnMilestone: this.autoCheckpointOnMilestone,
-      };
-    }
-
-    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;
-    const estSec = this.getEstimatedRemainingSeconds(sid);
-
-    return {
-      sessionId: sid,
-      hasActiveGoal: true,
-      id: goal.id,
-      state: goal.state,
-      title: goal.title,
-      description: goal.description,
-      lang: goal.lang || detectLanguage(goal.title),
-      startedAt: goal.startedAt,
-      pausedAt: goal.pausedAt,
-      totalPausedDurationMs: goal.totalPausedDurationMs,
-      completedAt: goal.completedAt,
-      elapsedSeconds: elapsed,
-      formattedElapsed: formatElapsed(elapsed),
-      estimatedRemainingSeconds: estSec,
-      formattedETA: formatETA(estSec),
-      tokensUsage: goal.tokensUsage || { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
-      iterationsCount: goal.iterationsCount,
-      maxIterations: goal.maxIterations,
-      milestones,
-      progressPercent,
-      logs: goal.logs,
-      resultSummary: goal.resultSummary,
-      autoDrive: this.autoDrive,
-      enableSound: this.enableSound,
-      showQuickLaunchButton: this.showQuickLaunchButton,
-      gitStartCommit: goal.gitStartCommit || null,
-      pendingNudge: goal.pendingNudge || null,
-      toolFailureCount: this.getToolFailureCount(sid),
-      consecutiveToolFailureLimit: this.consecutiveToolFailureLimit,
-      maxTokenBudget: goal.maxTokenBudget ?? this.maxTokenBudget,
-      budgetWarningThreshold: this.budgetWarningThreshold,
-      budgetWarningTriggered: Boolean(goal.budgetWarningTriggered),
-      autoCheckpointOnMilestone: this.autoCheckpointOnMilestone,
-    };
+    return buildSnapshot(this.goals.get(sid), sid, this);
   }
 
   getGoalSnapshot(sessionId = 'default') {

package/lib/routes.js

@@ -1,6 +1,24 @@
+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';
 
+function getSafeCwd(requestedCwd) {
+  if (!requestedCwd || typeof requestedCwd !== 'string') {
+    return process.cwd();
+  }
+  try {
+    const resolved = path.resolve(requestedCwd.trim());
+    const st = fs.statSync(resolved);
+    if (!st.isDirectory()) {
+      return null;
+    }
+    return resolved;
+  } catch (err) {
+    return null;
+  }
+}
+
 /**
  * Register webServer HTTP routes and SSE stream for DSH Goal
  * @param {any} ctx Cordis context
@@ -291,7 +309,12 @@ export function registerRoutes(ctx, {
                     res.statusCode = 400;
                     return res.end(JSON.stringify({ error: 'commit hash is required for rollback' }));
                   }
-                  const ok = rollbackToCheckpoint(commit, data.cwd);
+                  const safeCwd = getSafeCwd(data.cwd);
+                  if (data.cwd && !safeCwd) {
+                    res.statusCode = 400;
+                    return res.end(JSON.stringify({ error: 'Invalid or non-existent working directory' }));
+                  }
+                  const ok = rollbackToCheckpoint(commit, safeCwd);
                   if (!ok) {
                     res.statusCode = 500;
                     return res.end(JSON.stringify({ error: `Failed to rollback to checkpoint ${commit}` }));
@@ -306,7 +329,12 @@ export function registerRoutes(ctx, {
                     res.statusCode = 404;
                     return res.end(JSON.stringify({ error: 'No active goal to save artifact for' }));
                   }
-                  const artifact = saveGoalArtifact(snap, data.cwd);
+                  const safeCwd = getSafeCwd(data.cwd);
+                  if (data.cwd && !safeCwd) {
+                    res.statusCode = 400;
+                    return res.end(JSON.stringify({ error: 'Invalid or non-existent working directory' }));
+                  }
+                  const artifact = saveGoalArtifact(snap, safeCwd);
                   if (!artifact) {
                     res.statusCode = 500;
                     return res.end(JSON.stringify({ error: 'Failed to write goal artifact to disk' }));

package/package.json

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