@goodandready/dsh-goal 0.2.9 → 0.2.10

package/lib/client.js

@@ -1484,6 +1484,102 @@ window.__ModuleLoader__.load({
 
       }
 
+    
+      .dsh-goal-intervene-card {
+        padding: 12px;
+        border-radius: 8px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-state-warning-primary);
+        margin-bottom: 12px;
+      }
+
+      .dsh-goal-preplan-card {
+        padding: 12px;
+        border-radius: 8px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-state-info-primary, var(--dsw-alias-border-l2));
+        margin-bottom: 12px;
+      }
+
+      .dsh-goal-activity-feed {
+        padding: 10px 12px;
+        border-radius: 8px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-border-l2);
+        margin-top: 12px;
+      }
+
+      .dsh-goal-activity-list {
+        max-height: 140px;
+        overflow-y: auto;
+        display: flex;
+        flex-direction: column;
+        gap: 6px;
+      }
+
+      .dsh-goal-activity-row {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        font-size: 11px;
+        color: var(--dsw-alias-label-secondary);
+      }
+
+      .dsh-goal-activity-dot {
+        width: 6px;
+        height: 6px;
+        border-radius: 50%;
+        background: var(--dsw-alias-state-info-primary, var(--dsw-alias-primary));
+        flex-shrink: 0;
+      }
+
+      .dsh-goal-activity-time {
+        font-size: 10px;
+        color: var(--dsw-alias-label-tertiary);
+        flex-shrink: 0;
+      }
+
+      .dsh-goal-activity-text {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        flex: 1;
+      }
+
+      .dsh-goal-retrospective-card {
+        padding: 12px;
+        border-radius: 8px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-border-l2);
+        margin-top: 12px;
+      }
+
+      .dsh-goal-chip-btn {
+        padding: 3px 8px;
+        border-radius: 9999px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-border-l2);
+        color: var(--dsw-alias-label-primary);
+        font-size: 11px;
+        cursor: pointer;
+        transition: all 0.15s ease;
+      }
+
+      .dsh-goal-chip-btn:hover {
+        background: var(--dsw-alias-bg-hover);
+        border-color: var(--dsw-alias-border-l1);
+      }
+
+      .dsh-goal-lock-badge {
+        font-size: 10px;
+        padding: 1px 6px;
+        border-radius: 4px;
+        background: var(--dsw-alias-state-warning-bg, var(--dsw-alias-bg-layer-4));
+        color: var(--dsw-alias-state-warning-primary);
+        border: 1px solid var(--dsw-alias-state-warning-primary);
+        margin-left: 6px;
+      }
+
     `;
 
     function injectStylesOnce() {
@@ -1504,27 +1600,48 @@ window.__ModuleLoader__.load({
 
     }
 
-    // Synthesize audio chimes via Web Audio API (Item 6)
-
-    function playGoalChime(isSuccess = true) {
+    // Synthesize audio chimes via Web Audio API (Item 6) & soundScheme (#92)
 
+    function playGoalChime(isSuccess = true, scheme = 'default') {
       if (typeof window === 'undefined') return;
-
       try {
-
         const AudioCtx = window.AudioContext || window.webkitAudioContext;
-
         if (!AudioCtx) return;
-
         const actx = new AudioCtx();
-
         if (actx.state === 'suspended') {
-
           actx.resume().catch(() => {});
-
         }
-
         const now = actx.currentTime;
+        if (scheme === 'retro') {
+          const notes = isSuccess ? [330, 440, 554, 659] : [300, 220, 160];
+          notes.forEach((freq, idx) => {
+            const osc = actx.createOscillator();
+            const gain = actx.createGain();
+            osc.type = 'square';
+            osc.frequency.setValueAtTime(freq, now + idx * 0.08);
+            gain.gain.setValueAtTime(0.08, now + idx * 0.08);
+            gain.gain.exponentialRampToValueAtTime(0.001, now + idx * 0.08 + 0.1);
+            osc.connect(gain);
+            gain.connect(actx.destination);
+            osc.start(now + idx * 0.08);
+            osc.stop(now + idx * 0.08 + 0.12);
+          });
+          return;
+        }
+        if (scheme === 'minimal') {
+          const osc = actx.createOscillator();
+          const gain = actx.createGain();
+          osc.type = 'triangle';
+          osc.frequency.setValueAtTime(isSuccess ? 880 : 330, now);
+          gain.gain.setValueAtTime(0.001, now);
+          gain.gain.exponentialRampToValueAtTime(0.12, now + 0.02);
+          gain.gain.exponentialRampToValueAtTime(0.0001, now + 0.35);
+          osc.connect(gain);
+          gain.connect(actx.destination);
+          osc.start(now);
+          osc.stop(now + 0.4);
+          return;
+        }
 
         // Pentatonic chords: success ascending C5-E5-G5-C6; failure descending G4-Eb4-C4
 
@@ -1570,6 +1687,17 @@ window.__ModuleLoader__.load({
 
     }
 
+    // Voice announcement via Web Speech API (#92)
+    function speakGoalAnnouncement(text, enabled = false) {
+      if (!enabled || typeof window === 'undefined' || !window.speechSynthesis) return;
+      try {
+        const utter = new SpeechSynthesisUtterance(text);
+        utter.rate = 1.0;
+        utter.pitch = 1.0;
+        window.speechSynthesis.speak(utter);
+      } catch (err) { /* defensive */ }
+    }
+
     // --- REPORT GENERATOR FOR GITHUB / GITEA PR COMMENT ---
 
     function generateGitHubPRComment(state) {
@@ -1742,6 +1870,10 @@ window.__ModuleLoader__.load({
 
       const [nudgeSent, setNudgeSent] = useState(false);
 
+      const [interveneText, setInterveneText] = useState('');
+
+      const [interveneSent, setInterveneSent] = useState(false);
+
       const totalTokens = state.tokensUsage?.totalTokens || 0;
 
       const promptTokens = state.tokensUsage?.promptTokens || 0;
@@ -1982,6 +2114,64 @@ window.__ModuleLoader__.load({
 
               : null,
 
+            // Smart Pre-planning Draft Card (#85)
+            state.preplan && state.preplan.active && Array.isArray(state.preplan.draftMilestones) && state.preplan.draftMilestones.length > 0
+              ? React.createElement(
+                  'div',
+                  { className: 'dsh-goal-preplan-card' },
+                  React.createElement('div', { style: { fontWeight: 600, fontSize: 13, marginBottom: 4, display: 'flex', alignItems: 'center', gap: 6 } },
+                    React.createElement('span', null, '📋'),
+                    React.createElement('span', null, t('preplanTitle') || 'Smart Pre-plan Ready')
+                  ),
+                  React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)', marginBottom: 8 } },
+                    `Generated ${state.preplan.draftMilestones.length} draft milestone(s). Review and approve to start.`
+                  ),
+                  React.createElement('div', { style: { display: 'flex', gap: 8 } },
+                    React.createElement('button', {
+                      type: 'button',
+                      className: 'dsh-goal-btn dsh-goal-btn-primary',
+                      onClick: () => onAction('preplan_approve', { sessionId: state.sessionId, approvedMilestones: state.preplan.draftMilestones })
+                    }, t('preplanApprove') || 'Approve & Start Plan')
+                  )
+                )
+              : null,
+
+            // Pause & Intervene Card (#83)
+            state.state === 'PAUSED'
+              ? React.createElement(
+                  'div',
+                  { className: 'dsh-goal-intervene-card' },
+                  React.createElement('div', { style: { fontWeight: 600, fontSize: 13, marginBottom: 4, display: 'flex', alignItems: 'center', gap: 6 } },
+                    React.createElement('span', null, '⏸️'),
+                    React.createElement('span', null, t('interveneTitle') || 'Pause & Intervene')
+                  ),
+                  React.createElement('div', { style: { fontSize: 12, color: 'var(--dsw-alias-label-secondary)', marginBottom: 8 } },
+                    t('interveneDesc') || 'Goal is paused. Steer agent behavior with direct guidance before resuming.'
+                  ),
+                  React.createElement('textarea', {
+                    className: 'dsh-goal-card-input',
+                    style: { width: '100%', minHeight: 60, fontSize: 12, resize: 'vertical', marginBottom: 8 },
+                    placeholder: t('interveneDirectivePlaceholder') || 'Enter directive instructions for the agent...',
+                    value: interveneText,
+                    onChange: (e) => setInterveneText(e.target.value),
+                  }),
+                  React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end' } },
+                    React.createElement('button', {
+                      type: 'button',
+                      className: 'dsh-goal-btn dsh-goal-btn-primary',
+                      disabled: !interveneText.trim() && !interveneSent,
+                      onClick: () => {
+                        if (interveneText.trim()) {
+                          onAction('intervene', { directive: interveneText.trim() });
+                          setInterveneSent(true);
+                          setTimeout(() => setInterveneSent(false), 2000);
+                        }
+                      }
+                    }, interveneSent ? (t('interveneApplied') || '✅ Applied') : (t('interveneApply') || 'Apply Directive & Resume'))
+                  )
+                )
+              : null,
+
             React.createElement(
 
               'div',
@@ -2097,6 +2287,12 @@ window.__ModuleLoader__.load({
                           },
 
                           `${i + 1}. ${m.title}`,
+                            Array.isArray(m.dependsOn) && m.dependsOn.some((depId) => {
+                              const prereq = milestones.find((x) => x.id === depId || x.title === depId);
+                              return prereq && prereq.status !== 'completed';
+                            })
+                              ? React.createElement('span', { className: 'dsh-goal-lock-badge' }, `🔒 ${t('waitingPrereq') || 'waiting for prereq'}`)
+                              : null,
 
                         ),
 
@@ -2155,6 +2351,96 @@ window.__ModuleLoader__.load({
 
             ),
 
+            // Git Branch Action Controls (#86)
+            state.gitBranch
+              ? React.createElement(
+                  'div',
+                  { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, padding: '8px 10px', borderRadius: 8, background: 'var(--dsw-alias-bg-layer-2)', border: '1px solid var(--dsw-alias-border-l2)', marginTop: 8 } },
+                  React.createElement('span', { className: 'dsh-goal-git-badge', style: { margin: 0 } }, `🌿 ${state.gitBranch}`),
+                  (isCompleted || state.state === 'CANCELLED')
+                    ? React.createElement(
+                        'div',
+                        { style: { display: 'flex', gap: 6 } },
+                        React.createElement('button', {
+                          type: 'button',
+                          className: 'dsh-goal-btn',
+                          style: { fontSize: 11, padding: '2px 8px' },
+                          onClick: () => onAction('branch_action', { action: 'merge', sessionId: state.sessionId })
+                        }, t('mergeBranch') || 'Merge Branch'),
+                        React.createElement('button', {
+                          type: 'button',
+                          className: 'dsh-goal-btn',
+                          style: { fontSize: 11, padding: '2px 8px' },
+                          onClick: () => onAction('branch_action', { action: 'discard', sessionId: state.sessionId })
+                        }, t('discardBranch') || 'Discard Branch')
+                      )
+                    : null
+                )
+              : null,
+
+            // Live Activity Mini-Feed (#84)
+            state.enableLiveActivityFeed !== false && Array.isArray(state.activityFeed) && state.activityFeed.length > 0
+              ? React.createElement(
+                  'div',
+                  { className: 'dsh-goal-activity-feed' },
+                  React.createElement('div', { style: { fontWeight: 600, fontSize: 12, marginBottom: 6, color: 'var(--dsw-alias-label-primary)', display: 'flex', alignItems: 'center', gap: 6 } },
+                    React.createElement('span', null, '⚡'),
+                    React.createElement('span', null, t('liveActivityTitle') || 'Live Activity Feed'),
+                    React.createElement('span', { style: { fontSize: 10, color: 'var(--dsw-alias-label-tertiary)', fontWeight: 400 } }, `(${state.activityFeed.length})`)
+                  ),
+                  React.createElement(
+                    'div',
+                    { className: 'dsh-goal-activity-list' },
+                    state.activityFeed.slice(-6).reverse().map((act, actIdx) =>
+                      React.createElement('div', { key: act.id || actIdx, className: 'dsh-goal-activity-row' },
+                        React.createElement('span', { className: 'dsh-goal-activity-dot' }),
+                        React.createElement('span', { className: 'dsh-goal-activity-text' }, act.details || act.tool || act.type)
+                      )
+                    )
+                  )
+                )
+              : null,
+
+            // Post-Goal Retrospective Card (#88)
+            isCompleted && state.retrospective
+              ? React.createElement(
+                  'div',
+                  { className: 'dsh-goal-retrospective-card' },
+                  React.createElement('div', { style: { fontWeight: 600, fontSize: 13, marginBottom: 8, display: 'flex', alignItems: 'center', gap: 6 } },
+                    React.createElement('span', null, '📊'),
+                    React.createElement('span', null, t('retrospectiveTitle') || 'Goal Retrospective')
+                  ),
+                  React.createElement(
+                    'div',
+                    { style: { display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', gap: 8, fontSize: 11 } },
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Duration'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, state.retrospective.formattedDuration || state.formattedElapsed || '0s')
+                    ),
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Tokens'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, state.retrospective.tokensTotal ? `${state.retrospective.tokensTotal}` : '—')
+                    ),
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Files Modified'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, `${state.retrospective.filesModifiedCount || 0}`)
+                    ),
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Tool Calls'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, `${state.retrospective.toolCallsCount || 0}`)
+                    ),
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Stall Recoveries'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, `${state.retrospective.stallsEncountered || 0}`)
+                    ),
+                    React.createElement('div', null,
+                      React.createElement('div', { style: { color: 'var(--dsw-alias-label-tertiary)' } }, 'Milestones'),
+                      React.createElement('div', { style: { fontWeight: 600 } }, `${state.retrospective.milestonesCompleted || 0}/${state.retrospective.milestonesTotal || 0}`)
+                    )
+                  )
+                )
+              : null,
+
           ),
 
           React.createElement(
@@ -2475,6 +2761,29 @@ window.__ModuleLoader__.load({
 
               }),
 
+              React.createElement(
+                'div',
+                { style: { display: 'flex', flexWrap: 'wrap', gap: 6, marginTop: 8 } },
+                [
+                  { id: 'quickfix', label: '⚡ Quick Fix', template: 'Fix issue: ' },
+                  { id: 'feature', label: '✨ Feature', template: 'Implement feature: ' },
+                  { id: 'refactor', label: '♻️ Refactor', template: 'Refactor module: ' },
+                  { id: 'repro', label: '🐛 Bug Repro', template: 'Reproduce and resolve bug: ' },
+                  { id: 'audit', label: '🔍 Audit', template: 'Deep audit codebase: ' },
+                  { id: 'security', label: '🛡️ Security', template: 'Security hardening for: ' },
+                ].map((tpl) =>
+                  React.createElement(
+                    'button',
+                    {
+                      key: tpl.id,
+                      type: 'button',
+                      className: 'dsh-goal-chip-btn',
+                      onClick: () => setTitle(tpl.template),
+                    },
+                    tpl.label
+                  )
+                )
+              ),
             ),
 
             React.createElement(
@@ -2701,11 +3010,13 @@ window.__ModuleLoader__.load({
 
             if (nextState.state === 'COMPLETED') {
 
-              playGoalChime(true);
+              playGoalChime(true, nextState.soundScheme || 'default');
+              speakGoalAnnouncement('Goal completed: ' + (nextState.title || ''), Boolean(nextState.enableVoiceAnnouncements));
 
             } else if (nextState.state === 'FAILED') {
 
-              playGoalChime(false);
+              playGoalChime(false, nextState.soundScheme || 'default');
+              speakGoalAnnouncement('Goal failed: ' + (nextState.title || ''), Boolean(nextState.enableVoiceAnnouncements));
 
             }
 
@@ -4456,6 +4767,19 @@ window.__ModuleLoader__.load({
         rollbackBtn: 'Rollback to Checkpoint',
         rollbackConfirm: 'Rollback working tree to this checkpoint?',
         rollbackSuccess: 'Rolled back to checkpoint',
+        interveneTitle: 'Pause & Intervene',
+        interveneDesc: 'Goal is paused. Steer agent behavior with direct guidance before resuming.',
+        interveneDirectivePlaceholder: 'Enter directive instructions for the agent...',
+        interveneApply: 'Apply Directive & Resume',
+        interveneApplied: 'Directive Applied',
+        liveActivityTitle: 'Live Activity Feed',
+        preplanTitle: 'Smart Pre-plan Ready',
+        preplanApprove: 'Approve & Start Plan',
+        mergeBranch: 'Merge Branch',
+        discardBranch: 'Discard Branch',
+        retrospectiveTitle: 'Goal Retrospective',
+        templatesTitle: 'Goal Templates',
+        waitingPrereq: 'waiting for prereq',
 
         goalCompleted: 'Goal completed',
 
@@ -4582,6 +4906,19 @@ window.__ModuleLoader__.load({
         rollbackBtn: '回滚到该检查点',
         rollbackConfirm: '确定将工作区代码回滚至该里程碑检查点吗？',
         rollbackSuccess: '已成功回滚到检查点',
+        interveneTitle: '暂停并干预',
+        interveneDesc: '目标已暂停。在恢复前向智能体发送直接指引。',
+        interveneDirectivePlaceholder: '输入给智能体的指导指令...',
+        interveneApply: '应用指引并继续',
+        interveneApplied: '已应用干预',
+        liveActivityTitle: '实时动态',
+        preplanTitle: '智能预规划就绪',
+        preplanApprove: '批准并启动计划',
+        mergeBranch: '合并分支',
+        discardBranch: '放弃分支',
+        retrospectiveTitle: '目标复盘报告',
+        templatesTitle: '目标模板',
+        waitingPrereq: '等待前置依赖',
 
         goalCompleted: '目标已完成',
 

package/lib/engine-git-branch.js

@@ -0,0 +1,105 @@
+import { execFileSync } from 'node:child_process';
+
+/**
+ * Format a sanitized git branch name from goal title
+ * @param {string} title 
+ * @returns {string} branch name
+ */
+export function sanitizeBranchSlug(title) {
+  const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+  const slug = String(title || 'task')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .slice(0, 30) || 'goal';
+  return `goal/${dateStr}-${slug}`;
+}
+
+/**
+ * Get current git branch
+ * @param {string} cwd 
+ * @returns {string} branch name or 'HEAD'
+ */
+export function getCurrentGitBranch(cwd = process.cwd()) {
+  try {
+    return execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+  } catch (err) {
+    return 'main';
+  }
+}
+
+/**
+ * Create a dedicated git branch for a goal
+ * @param {string} cwd 
+ * @param {string} branchName 
+ * @returns {boolean} success
+ */
+export function createGoalBranch(cwd = process.cwd(), branchName) {
+  if (!branchName) return false;
+  try {
+    execFileSync('git', ['checkout', '-b', branchName], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+/**
+ * Merge goal branch back into parent target branch
+ * @param {string} cwd 
+ * @param {string} branchName 
+ * @param {string} targetBranch 
+ * @returns {boolean} success
+ */
+export function mergeGoalBranch(cwd = process.cwd(), branchName, targetBranch = 'main') {
+  if (!branchName) return false;
+  try {
+    execFileSync('git', ['checkout', targetBranch], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    execFileSync('git', ['merge', '--no-ff', '-m', `chore(goal): merge ${branchName}`, branchName], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+
+/**
+ * Discard / delete a goal branch
+ * @param {string} cwd 
+ * @param {string} branchName 
+ * @param {string} targetBranch 
+ * @returns {boolean} success
+ */
+export function discardGoalBranch(cwd = process.cwd(), branchName, targetBranch = 'main') {
+  if (!branchName) return false;
+  try {
+    execFileSync('git', ['checkout', targetBranch], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    execFileSync('git', ['branch', '-D', branchName], {
+      cwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return true;
+  } catch (err) {
+    return false;
+  }
+}