@goodandready/dsh-goal 0.2.30 → 0.2.31

package/lib/client.js

@@ -1808,9 +1808,129 @@ window.__ModuleLoader__.load({
         background: var(--dsw-alias-bg-layer-2);
         font-family: monospace;
       }
-
+      .dsh-goal-tabs {
+        display: flex;
+        gap: 8px;
+        border-bottom: 1px solid var(--dsw-alias-border-l1);
+        margin: 10px 0 14px 0;
+        padding-bottom: 6px;
+      }
+      .dsh-goal-tab-btn {
+        background: transparent;
+        border: none;
+        font-size: 13px;
+        font-weight: 500;
+        color: var(--dsw-alias-label-secondary);
+        cursor: pointer;
+        padding: 6px 12px;
+        border-radius: 6px;
+        display: inline-flex;
+        align-items: center;
+        gap: 6px;
+        transition: all 0.15s ease;
+      }
+      .dsh-goal-tab-btn:hover {
+        color: var(--dsw-alias-label-primary);
+        background: var(--dsw-alias-bg-layer-2);
+      }
+      .dsh-goal-tab-btn.active {
+        color: var(--dsw-alias-brand-primary);
+        background: var(--dsw-alias-bg-layer-2);
+        font-weight: 600;
+      }
+      .dsh-goal-diff-box {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+      }
+      .dsh-goal-diff-summary {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background: var(--dsw-alias-bg-sunken);
+        border: 1px solid var(--dsw-alias-border-l1);
+        border-radius: 6px;
+        padding: 8px 12px;
+        font-size: 12px;
+      }
+      .dsh-goal-diff-stat-pill {
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+        font-weight: 600;
+      }
+      .dsh-goal-diff-ins {
+        color: var(--dsw-alias-state-success-primary);
+      }
+      .dsh-goal-diff-del {
+        color: var(--dsw-alias-state-danger-primary);
+      }
+      .dsh-goal-diff-files-list {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 6px;
+        max-height: 100px;
+        overflow-y: auto;
+      }
+      .dsh-goal-diff-file-chip {
+        display: inline-flex;
+        align-items: center;
+        gap: 6px;
+        background: var(--dsw-alias-bg-layer-2);
+        border: 1px solid var(--dsw-alias-border-l1);
+        border-radius: 4px;
+        padding: 3px 8px;
+        font-size: 11px;
+        font-family: monospace;
+        cursor: pointer;
+        color: var(--dsw-alias-label-secondary);
+      }
+      .dsh-goal-diff-file-chip:hover,
+      .dsh-goal-diff-file-chip.active {
+        border-color: var(--dsw-alias-brand-primary);
+        color: var(--dsw-alias-label-primary);
+      }
+      .dsh-goal-diff-viewer {
+        background: var(--dsw-alias-bg-sunken);
+        border: 1px solid var(--dsw-alias-border-l1);
+        border-radius: 6px;
+        padding: 10px;
+        font-family: monospace;
+        font-size: 12px;
+        line-height: 1.45;
+        max-height: 380px;
+        overflow: auto;
+        white-space: pre-wrap;
+        word-break: break-all;
+      }
+      .dsh-goal-diff-line {
+        display: block;
+        padding: 1px 4px;
+        border-radius: 2px;
+      }
+      .dsh-goal-diff-line-add {
+        background: var(--dsw-alias-state-success-bg, var(--dsw-alias-bg-hover));
+        color: var(--dsw-alias-state-success-primary);
+      }
+      .dsh-goal-diff-line-del {
+        background: var(--dsw-alias-state-error-bg, var(--dsw-alias-bg-hover));
+        color: var(--dsw-alias-state-danger-primary);
+      }
+      .dsh-goal-diff-line-hunk {
+        background: var(--dsw-alias-bg-layer-2);
+        color: var(--dsw-alias-state-info-primary);
+      }
+      .dsh-goal-diff-line-header {
+        color: var(--dsw-alias-label-tertiary);
+        font-weight: 600;
+      }
+      .dsh-goal-diff-empty {
+        padding: 24px;
+        text-align: center;
+        color: var(--dsw-alias-label-secondary);
+        font-size: 13px;
+      }
     `;
-
     function injectStylesOnce() {
 
       if (typeof document === 'undefined') return;
@@ -2103,6 +2223,146 @@ window.__ModuleLoader__.load({
       const [interveneText, setInterveneText] = useState('');
 
       const [interveneSent, setInterveneSent] = useState(false);
+      const [activeTab, setActiveTab] = useState("overview");
+      const [diffData, setDiffData] = useState(null);
+      const [diffLoading, setDiffLoading] = useState(false);
+      const [diffError, setDiffError] = useState(null);
+      const [selectedFile, setSelectedFile] = useState(null);
+
+      const fetchDiff = useCallback(() => {
+        setDiffLoading(true);
+        setDiffError(null);
+        const sid = state.sessionId || "default";
+        const url = "/dsh-goal/diff?sessionId=" + encodeURIComponent(sid);
+        if (typeof fetch === "function") {
+          fetch(url)
+            .then((res) => {
+              if (!res.ok) throw new Error("HTTP " + res.status);
+              return res.json();
+            })
+            .then((data) => {
+              if (data && data.ok) {
+                setDiffData(data);
+              } else {
+                setDiffError((data && data.error) || "Failed to load diff");
+              }
+            })
+            .catch((err) => {
+              setDiffError(err.message || "Network error");
+            })
+            .finally(() => {
+              setDiffLoading(false);
+            });
+        } else {
+          setDiffLoading(false);
+        }
+      }, [state.sessionId]);
+
+      useEffect(() => {
+        if (activeTab === "diff") {
+          fetchDiff();
+        }
+      }, [activeTab, fetchDiff]);
+
+      const renderDiffBox = () => {
+        return React.createElement(
+          "div",
+          { className: "dsh-goal-diff-box" },
+          React.createElement(
+            "div",
+            { className: "dsh-goal-diff-summary" },
+            React.createElement(
+              "div",
+              { style: { display: "flex", alignItems: "center", gap: 8 } },
+              React.createElement("span", null, (t("diffBaseCommit") || "Base:") + " ", React.createElement("code", null, (diffData && diffData.base ? diffData.base : (state.gitStartCommit || "main")).slice(0, 7))),
+              React.createElement("span", null, "→"),
+              React.createElement("span", null, (t("diffTargetBranch") || "Target:") + " ", React.createElement("code", null, (diffData && diffData.target) || state.gitBranch || state.branchName || "HEAD"))
+            ),
+            React.createElement(
+              "div",
+              { style: { display: "flex", alignItems: "center", gap: 8 } },
+              diffData && diffData.stats ? React.createElement(
+                "span",
+                { className: "dsh-goal-diff-stat-pill" },
+                React.createElement("span", { className: "dsh-goal-diff-ins" }, "+" + diffData.stats.insertions),
+                React.createElement("span", { className: "dsh-goal-diff-del" }, "-" + diffData.stats.deletions)
+              ) : null,
+              React.createElement(
+                "button",
+                {
+                  type: "button",
+                  className: "dsh-goal-btn icon-only",
+                  style: { padding: "2px 8px", fontSize: 11 },
+                  onClick: fetchDiff,
+                  title: t("diffRefresh") || "Refresh Diff",
+                },
+                "🔄"
+              )
+            )
+          ),
+          diffData && diffData.files && diffData.files.length > 0 ? React.createElement(
+            "div",
+            { className: "dsh-goal-diff-files-list" },
+            React.createElement(
+              "span",
+              {
+                className: `dsh-goal-diff-file-chip${selectedFile === null ? " active" : ""}`,
+                onClick: () => setSelectedFile(null),
+              },
+              (t("allFiles") || "All Files") + ` (${diffData.files.length})`
+            ),
+            diffData.files.map((f) => React.createElement(
+              "span",
+              {
+                key: f.path,
+                className: `dsh-goal-diff-file-chip${selectedFile === f.path ? " active" : ""}`,
+                onClick: () => setSelectedFile(selectedFile === f.path ? null : f.path),
+                title: `${f.path} (+${f.insertions} / -${f.deletions})`,
+              },
+              `${f.path.split("/").pop()} `,
+              React.createElement("span", { className: "dsh-goal-diff-ins" }, "+" + f.insertions),
+              "/",
+              React.createElement("span", { className: "dsh-goal-diff-del" }, "-" + f.deletions)
+            ))
+          ) : null,
+          diffLoading ? React.createElement("div", { className: "dsh-goal-diff-empty" }, t("diffLoading") || "Loading diff...")
+            : diffError ? React.createElement("div", { className: "dsh-goal-diff-empty dsh-goal-gate-error" }, "Error: " + diffError)
+            : !diffData || !diffData.diff || diffData.diff.trim().length === 0 ? React.createElement("div", { className: "dsh-goal-diff-empty" }, t("diffNoChanges") || "No git changes detected relative to base commit.")
+            : React.createElement(
+                "div",
+                { className: "dsh-goal-diff-viewer" },
+                (() => {
+                  const allLines = diffData.diff.split("\n");
+                  let linesToShow = allLines;
+                  if (selectedFile) {
+                    const fileChunks = [];
+                    let collecting = false;
+                    for (const l of allLines) {
+                      if (l.startsWith("diff --git ")) {
+                        const bPart = l.split(" b/")[1] || "";
+                        collecting = bPart === selectedFile;
+                      }
+                      if (collecting) fileChunks.push(l);
+                    }
+                    if (fileChunks.length > 0) linesToShow = fileChunks;
+                  }
+                  return linesToShow.map((line, idx) => {
+                    let lineClass = "dsh-goal-diff-line";
+                    if (line.startsWith("+") && !line.startsWith("+++")) {
+                      lineClass += " dsh-goal-diff-line-add";
+                    } else if (line.startsWith("-") && !line.startsWith("---")) {
+                      lineClass += " dsh-goal-diff-line-del";
+                    } else if (line.startsWith("@@")) {
+                      lineClass += " dsh-goal-diff-line-hunk";
+                    } else if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("---") || line.startsWith("+++")) {
+                      lineClass += " dsh-goal-diff-line-header";
+                    }
+                    return React.createElement("span", { key: idx, className: lineClass }, line || " ");
+                  });
+                })()
+              )
+        );
+      };
 
       const totalTokens = state.tokensUsage?.totalTokens || 0;
 
@@ -2222,7 +2482,35 @@ window.__ModuleLoader__.load({
 
             ),
 
-            isPlanMode && !isCompleted
+            React.createElement(
+              'div',
+              { className: 'dsh-goal-tabs' },
+              React.createElement(
+                'button',
+                {
+                  type: 'button',
+                  className: `dsh-goal-tab-btn${activeTab === "overview" ? " active" : ""}`,
+                  onClick: () => setActiveTab("overview"),
+                },
+                "📋 " + (t("tabOverview") || "Plan & Overview")
+              ),
+              React.createElement(
+                'button',
+                {
+                  type: 'button',
+                  className: `dsh-goal-tab-btn${activeTab === "diff" ? " active" : ""}`,
+                  onClick: () => setActiveTab("diff"),
+                },
+                "🔍 " + (t("tabDiff") || "Changes / Diff") + (diffData && diffData.stats && diffData.stats.filesChanged ? ` (${diffData.stats.filesChanged})` : "")
+              )
+            ),
+
+            activeTab === 'diff'
+              ? renderDiffBox()
+              : React.createElement(
+                  React.Fragment,
+                  null,
+                  isPlanMode && !isCompleted
               ? React.createElement(
                   'div',
                   { className: 'dsh-goal-plan-banner' },
@@ -2716,7 +3004,8 @@ window.__ModuleLoader__.load({
                     )
                   )
                 )
-              : null,
+              : null
+                ),
 
           ),
 
@@ -5533,6 +5822,17 @@ window.__ModuleLoader__.load({
         planningPhase: 'Planning Phase (Read-Only)',
         planPhaseNotice: 'Agent is formulating the plan. File modifications are guarded until operator approval.',
         launchModeLabel: 'Launch Mode:',
+        tabOverview: 'Plan & Overview',
+        tabDiff: 'Changes / Diff',
+        diffLoading: 'Loading diff...',
+        diffNoChanges: 'No git changes detected relative to base commit.',
+        diffFilesChanged: 'Files changed:',
+        diffInsertions: 'insertions',
+        diffDeletions: 'deletions',
+        diffBaseCommit: 'Base:',
+        diffTargetBranch: 'Target:',
+        diffRefresh: 'Refresh Diff',
+        allFiles: 'All Files',
         planModeDesc: 'Plan first, review milestones, then execute',
         actModeDesc: 'Direct execution right away',
 
@@ -5684,6 +5984,17 @@ window.__ModuleLoader__.load({
         planningPhase: '规划阶段（只读）',
         planPhaseNotice: '智能体正在制定方案与里程碑。在操作者批准前，禁止修改文件。',
         launchModeLabel: '启动模式：',
+        tabOverview: '方案与概览',
+        tabDiff: '代码变更 / Diff',
+        diffLoading: '正在加载差异...',
+        diffNoChanges: '未检测到相对于基线提交的代码变更。',
+        diffFilesChanged: '变更文件数：',
+        diffInsertions: '行新增',
+        diffDeletions: '行删除',
+        diffBaseCommit: '基线：',
+        diffTargetBranch: '目标：',
+        diffRefresh: '刷新 Diff',
+        allFiles: '所有文件',
         planModeDesc: '先制定里程碑方案，人工确认后再执行',
         actModeDesc: '立即开始编码与任务执行',
 

package/lib/engine-diff.js

@@ -0,0 +1,147 @@
+import { execFileSync } from 'node:child_process';
+import { getSafeCwd } from './goal-engine-constants.js';
+import { isGitRepository, isValidGitRef } from './engine-git-branch.js';
+
+/**
+ * Parse git diff --numstat output into structured file statistics
+ * @param {string} output 
+ * @returns {Array<{ path: string, insertions: number, deletions: number, binary: boolean }>}
+ */
+export function parseNumstat(output) {
+  if (!output || typeof output !== 'string') return [];
+  const lines = output.trim().split('\n');
+  const files = [];
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    const parts = line.split('\t');
+    if (parts.length < 3) continue;
+    const [rawIns, rawDel, filePath] = parts;
+    const isBinary = rawIns === '-' || rawDel === '-';
+    const ins = isBinary ? 0 : parseInt(rawIns, 10) || 0;
+    const del = isBinary ? 0 : parseInt(rawDel, 10) || 0;
+    files.push({
+      path: filePath,
+      insertions: ins,
+      deletions: del,
+      binary: isBinary,
+    });
+  }
+  return files;
+}
+
+/**
+ * Get git diff between refs or current working tree
+ * @param {object} options
+ * @returns {object} diff result payload
+ */
+export function getGitDiff({
+  cwd = process.cwd(),
+  base,
+  target,
+  file,
+  allowedRoots = [],
+  maxBytes = 256 * 1024,
+} = {}) {
+  const safeCwd = getSafeCwd(cwd, allowedRoots);
+  if (!safeCwd || !isGitRepository(safeCwd, allowedRoots)) {
+    return { ok: false, error: 'Not a git repository or invalid path' };
+  }
+
+  // Ref validation: disallow flag injection and special chars
+  if (base && !isValidGitRef(base)) {
+    return { ok: false, error: 'Invalid base git ref' };
+  }
+  if (target && !isValidGitRef(target)) {
+    return { ok: false, error: 'Invalid target git ref' };
+  }
+  if (file && (typeof file !== 'string' || file.startsWith('-') || /[\0\r\n]/.test(file))) {
+    return { ok: false, error: 'Invalid file parameter' };
+  }
+
+  try {
+    const rangeArgs = [];
+    if (base && target) {
+      rangeArgs.push(`${base}..${target}`);
+    } else if (base) {
+      rangeArgs.push(base);
+    } else if (target) {
+      rangeArgs.push(target);
+    }
+
+    // 1. Fetch numstat for file summary
+    const numstatArgs = ['diff', '--numstat', ...rangeArgs];
+    if (file) {
+      numstatArgs.push('--', file);
+    }
+    const numstatOut = execFileSync('git', numstatArgs, {
+      cwd: safeCwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout: 5000,
+    });
+
+    const files = parseNumstat(numstatOut);
+    const stats = {
+      filesChanged: files.length,
+      insertions: files.reduce((acc, f) => acc + f.insertions, 0),
+      deletions: files.reduce((acc, f) => acc + f.deletions, 0),
+    };
+
+    // 2. Fetch patch
+    const patchArgs = ['diff', '-p', '--no-color', ...rangeArgs];
+    if (file) {
+      patchArgs.push('--', file);
+    }
+    let patchOut = execFileSync('git', patchArgs, {
+      cwd: safeCwd,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout: 5000,
+      maxBuffer: 2 * 1024 * 1024,
+    });
+
+    let truncated = false;
+    if (patchOut.length > maxBytes) {
+      patchOut = patchOut.slice(0, maxBytes);
+      truncated = true;
+    }
+
+    return {
+      ok: true,
+      cwd: safeCwd,
+      base: base || null,
+      target: target || 'HEAD',
+      stats,
+      files,
+      diff: patchOut,
+      truncated,
+    };
+  } catch (err) {
+    return { ok: false, error: err.message || 'git diff execution failed' };
+  }
+}
+
+/**
+ * GoalEngine helper to fetch diff for active or specified session
+ * @param {object} engine 
+ * @param {string} sessionId 
+ * @param {object} options 
+ * @returns {object} diff result
+ */
+export function getEngineGoalDiff(engine, sessionId = 'default', options = {}) {
+  const sid = sessionId || 'default';
+  const goal = engine.goals?.get(sid);
+  const allowedRoots = options.allowedRoots || engine.config?.allowedRoots || (goal?.cwd ? [goal.cwd, process.cwd()] : [process.cwd()]);
+  const cwd = options.cwd || goal?.cwd || engine.config?.cwd || process.cwd();
+  const base = options.base || goal?.gitStartCommit || null;
+  const target = options.target || goal?.gitBranch || goal?.branchName || 'HEAD';
+
+  return getGitDiff({
+    cwd,
+    base,
+    target,
+    file: options.file,
+    allowedRoots,
+    maxBytes: options.maxBytes,
+  });
+}

package/lib/engine-kanban-sync.js

@@ -0,0 +1,242 @@
+import { MilestoneStatus } from './goal-engine-constants.js';
+
+export const MILESTONE_TO_KANBAN_COLUMN = {
+  [MilestoneStatus.PENDING]: 'todo',
+  [MilestoneStatus.IN_PROGRESS]: 'in_progress',
+  [MilestoneStatus.COMPLETED]: 'done',
+  pending: 'todo',
+  in_progress: 'in_progress',
+  active: 'in_progress',
+  completed: 'done',
+  PENDING: 'todo',
+  ACTIVE: 'in_progress',
+  COMPLETED: 'done',
+};
+
+export const KANBAN_COLUMN_TO_MILESTONE_STATUS = {
+  backlog: MilestoneStatus.PENDING,
+  todo: MilestoneStatus.PENDING,
+  in_progress: MilestoneStatus.IN_PROGRESS,
+  doing: MilestoneStatus.IN_PROGRESS,
+  active: MilestoneStatus.IN_PROGRESS,
+  review: MilestoneStatus.COMPLETED,
+  done: MilestoneStatus.COMPLETED,
+  completed: MilestoneStatus.COMPLETED,
+};
+
+/**
+ * Format externalRef string for a goal milestone
+ * @param {string} goalId 
+ * @param {string} milestoneId 
+ * @returns {string}
+ */
+export function formatMilestoneExternalRef(goalId, milestoneId) {
+  return `dsh-goal:${goalId || 'default'}:${milestoneId}`;
+}
+
+/**
+ * Parse milestone externalRef
+ * @param {string} externalRef 
+ * @returns {{ goalId: string, milestoneId: string } | null}
+ */
+export function parseMilestoneExternalRef(externalRef) {
+  if (typeof externalRef !== 'string' || !externalRef.startsWith('dsh-goal:')) {
+    return null;
+  }
+  const parts = externalRef.split(':');
+  if (parts.length < 3) return null;
+  return {
+    goalId: parts[1],
+    milestoneId: parts.slice(2).join(':'),
+  };
+}
+
+/**
+ * Resolve active kanban service or store from context/options
+ * @param {object} options 
+ * @returns {{ service: object | null, store: object | null }}
+ */
+export function resolveKanbanServices(options = {}) {
+  const ctx = options.ctx;
+  let service = options.kanbanService || null;
+  let store = options.store || null;
+
+  if (!service && ctx) {
+    service = ctx.dshKanban || (typeof ctx.get === 'function' ? ctx.get('dshKanban') : null);
+  }
+
+  if (!store) {
+    if (service && typeof service.getStore === 'function') {
+      store = service.getStore();
+    } else if (ctx?.kanbanStore) {
+      store = ctx.kanbanStore;
+    }
+  }
+
+  return { service, store };
+}
+
+/**
+ * Synchronize all milestones of a goal with dsh-kanban
+ * Safe degradation if kanban is not available
+ * @param {object} engine 
+ * @param {string} sessionId 
+ * @param {object} options 
+ * @returns {Promise<object>} sync summary
+ */
+export async function syncGoalToKanban(engine, sessionId = 'default', options = {}) {
+  const sid = sessionId || 'default';
+  const goal = engine.goals?.get(sid);
+  if (!goal) {
+    return { ok: false, error: 'Goal not found' };
+  }
+  if (!goal.milestones || goal.milestones.length === 0) {
+    return { ok: true, synced: 0, reason: 'No milestones in goal' };
+  }
+
+  const { service, store } = resolveKanbanServices({
+    kanbanService: options.kanbanService || engine.kanbanService,
+    store: options.store || engine.kanbanStore,
+    ctx: options.ctx || engine.ctx,
+    ...options,
+  });
+
+  if (!service && !store) {
+    return { ok: false, skipped: true, reason: 'kanban-unavailable' };
+  }
+
+  const results = [];
+  for (const ms of goal.milestones) {
+    const externalRef = formatMilestoneExternalRef(goal.id, ms.id);
+    const col = MILESTONE_TO_KANBAN_COLUMN[ms.status] || 'todo';
+    const title = `[Goal] ${ms.title}`;
+    const body = ms.notes || `Milestone ${ms.id} for goal: ${goal.title}`;
+
+    try {
+      if (service && typeof service.createTask === 'function') {
+        const res = await service.createTask({
+          title,
+          body,
+          column: col,
+          externalRef,
+          labels: ['dsh-goal', String(goal.id)],
+        });
+        results.push({ milestoneId: ms.id, taskId: res.taskId || res.task?.id, ok: res.ok, alreadyExists: res.alreadyExists });
+      } else if (store && typeof store.createTask === 'function') {
+        const existing = typeof store.findTaskByExternalRef === 'function' ? store.findTaskByExternalRef(externalRef) : null;
+        if (!existing) {
+          const task = store.createTask({
+            title,
+            body,
+            column: col,
+            externalRef,
+            labels: ['dsh-goal', String(goal.id)],
+          });
+          results.push({ milestoneId: ms.id, taskId: task.id, ok: true, alreadyExists: false });
+        } else {
+          results.push({ milestoneId: ms.id, taskId: existing.id, ok: true, alreadyExists: true });
+        }
+      }
+    } catch (err) {
+      engine.logger?.warn?.(`[dsh-goal] Kanban milestone sync failed for ${ms.id}:`, err?.message || err);
+      results.push({ milestoneId: ms.id, ok: false, error: err?.message || String(err) });
+    }
+  }
+
+  return { ok: true, synced: results.filter((r) => r.ok).length, total: goal.milestones.length, results };
+}
+
+/**
+ * Update corresponding kanban card column when milestone status changes
+ * @param {object} milestone 
+ * @param {object} options 
+ * @returns {Promise<object>}
+ */
+export async function syncMilestoneStatusToKanban(milestone, { goal, ctx, store, kanbanService } = {}) {
+  if (!milestone || !goal) return { ok: false, error: 'Invalid milestone or goal' };
+
+  const { store: activeStore } = resolveKanbanServices({
+    store,
+    kanbanService,
+    ctx,
+  });
+  if (!activeStore || typeof activeStore.findTaskByExternalRef !== 'function') {
+    return { ok: false, skipped: true, reason: 'kanban-store-unavailable' };
+  }
+
+  const externalRef = formatMilestoneExternalRef(goal.id, milestone.id);
+  const targetCol = MILESTONE_TO_KANBAN_COLUMN[milestone.status] || 'todo';
+
+  try {
+    const task = activeStore.findTaskByExternalRef(externalRef);
+    if (!task) {
+      return { ok: false, skipped: true, reason: 'kanban-task-not-found' };
+    }
+
+    if (task.column !== targetCol && typeof activeStore.moveTask === 'function') {
+      activeStore.moveTask(task.id, { column: targetCol });
+      return { ok: true, synced: true, taskId: task.id, column: targetCol };
+    }
+
+    return { ok: true, synced: true, taskId: task.id, column: task.column, unchanged: true };
+  } catch (err) {
+    return { ok: false, error: err?.message || String(err) };
+  }
+}
+
+/**
+ * Handle external card movement from dsh-kanban board
+ * @param {object} engine 
+ * @param {object} payload 
+ * @param {string} sessionId 
+ * @returns {object}
+ */
+export function handleKanbanCardMoved(engine, payload = {}, sessionId = 'default') {
+  const externalRef = payload.externalRef;
+  const column = payload.column;
+  const targetStatus = payload.status || (column ? KANBAN_COLUMN_TO_MILESTONE_STATUS[column] : null);
+
+  if (!targetStatus) {
+    return { ok: false, error: 'Invalid or missing target milestone status/column' };
+  }
+
+  let goalId = null;
+  let milestoneId = payload.milestoneId || null;
+
+  if (externalRef) {
+    const parsed = parseMilestoneExternalRef(externalRef);
+    if (parsed) {
+      goalId = parsed.goalId;
+      milestoneId = parsed.milestoneId;
+    }
+  }
+
+  const candidateSessions = sessionId && sessionId !== 'default'
+    ? [sessionId, 'default']
+    : ['default', ...engine.goals.keys()];
+
+  for (const sid of candidateSessions) {
+    const goal = engine.goals?.get(sid);
+    if (!goal || (goalId && String(goal.id) !== String(goalId))) continue;
+
+    const ms = goal.milestones?.find((m) => String(m.id) === String(milestoneId) || m.title === payload.title);
+    if (ms) {
+      const updateRes = engine.updateMilestone(
+        ms.id,
+        targetStatus,
+        `Synced from Kanban card move to column '${column || targetStatus}'`,
+        sid
+      );
+      return {
+        ok: true,
+        sessionId: sid,
+        milestoneId: ms.id,
+        prevStatus: ms.status,
+        newStatus: targetStatus,
+        updateResult: updateRes,
+      };
+    }
+  }
+
+  return { ok: false, error: 'Matching milestone not found for external reference' };
+}

package/lib/goal-engine.js

@@ -1,4 +1,6 @@
 import { verifyMilestoneAcceptance } from './engine-verification.js';
+import { getEngineGoalDiff } from './engine-diff.js';
+import { syncGoalToKanban, syncMilestoneStatusToKanban, handleKanbanCardMoved } from './engine-kanban-sync.js';
 import { askOperatorQuery, answerOperatorQuery } from './engine-operator-query.js';
 import { GoalMode, GoalState, MilestoneStatus, formatElapsed, formatETA, detectLanguage, sessionIdOf, calculateElapsedSeconds, calculateRemainingSeconds, buildSnapshot, getSafeCwd } from './goal-engine-constants.js';
 import { getGitCurrentCommit, exportReportMarkdown, exportReportGitHubPR, createMilestoneCheckpoint, rollbackToCheckpoint, saveGoalArtifact } from './engine-reports.js';
@@ -31,7 +33,7 @@ export class GoalEngine {
       enableLiveActivityFeed: options.enableLiveActivityFeed ?? true, enablePreplanning: options.enablePreplanning ?? true,
       autoBranchOnGoalStart: options.autoBranchOnGoalStart ?? true, enablePostGoalRetrospective: options.enablePostGoalRetrospective ?? true,
       autoScaleBudgetNearCompletion: options.autoScaleBudgetNearCompletion ?? false, enableTemplatesDrawer: options.enableTemplatesDrawer ?? true,
-      enableMilestoneDependencies: options.enableMilestoneDependencies ?? true, soundScheme: options.soundScheme ?? 'default',
+      enableMilestoneDependencies: options.enableMilestoneDependencies ?? true, soundScheme: options.soundScheme ?? 'default', enableKanbanSync: options.enableKanbanSync ?? true, ctx: options.ctx || null, kanbanService: options.kanbanService || null, kanbanStore: options.kanbanStore || null,
       enableVoiceAnnouncements: options.enableVoiceAnnouncements ?? false, approvalGate: options.approvalGate || null,
       checkApproval: options.checkApproval || null, maxSessions: options.maxSessions ?? 100,
     });
@@ -180,7 +182,7 @@ export class GoalEngine {
       title: cleanTitle,
       description: options.description?.trim() || '',
       lang: options.lang || detectLanguage(cleanTitle),
-      cwd: options.cwd ? getSafeCwd(options.cwd) : null,
+      cwd: options.cwd ? getSafeCwd(options.cwd, options.allowedRoots || this.allowedRoots || []) : null,
       mode: initialMode,
       state: initialState,
       startedAt: now,
@@ -193,7 +195,7 @@ export class GoalEngine {
       budgetWarningTriggered: false,
       budgetAutoScaled: false,
       gitStartCommit: gitCommit || null,
-      gitBranch: null,
+      gitBranch: options.gitBranch || options.branchName || null,
       gitParentBranch: null,
       pendingNudge: null,
       nudges: [],
@@ -315,7 +317,8 @@ export class GoalEngine {
   }
 
   addMilestones(milestonesList, shouldEmit = true, sessionId = 'default') {
-    const sid = sessionId || 'default';
+    const sid = typeof shouldEmit === 'string' ? shouldEmit : (sessionId || 'default');
+    const shouldEmitFlag = typeof shouldEmit === 'boolean' ? shouldEmit : true;
     const goal = this.goals.get(sid);
     if (!goal || !Array.isArray(milestonesList)) return [];
 
@@ -325,7 +328,7 @@ export class GoalEngine {
     }
     this.recordProgress(sid);
     recordActivity(goal, { type: 'milestone', tool: 'addMilestones', status: 'success', details: `Added ${newMilestones.length} milestones` });
-    if (shouldEmit) this.emit(sid);
+    if (shouldEmitFlag) this.emit(sid);
     return newMilestones;
   }
 
@@ -359,6 +362,7 @@ export class GoalEngine {
 
     const prevStatus = res.prevStatus;
     recordActivity(goal, { type: 'milestone', tool: 'updateMilestone', status: 'success', details: `${id} -> ${status}` });
+    if (this.enableKanbanSync) syncMilestoneStatusToKanban(target, { goal, ctx: this.ctx, store: this.kanbanStore, kanbanService: this.kanbanService }).catch(() => {});
 
     if (target.status === MilestoneStatus.COMPLETED && prevStatus !== MilestoneStatus.COMPLETED) {
       if (this.autoCheckpointOnMilestone) {
@@ -579,6 +583,10 @@ export class GoalEngine {
     return res;
   }
 
+  getDiff(sessionId = 'default', options = {}) { return getEngineGoalDiff(this, sessionId, options); }
+  syncKanban(sessionId = 'default', options = {}) { return syncGoalToKanban(this, sessionId, options); }
+  handleKanbanCardMove(payload = {}, sessionId = 'default') { return handleKanbanCardMoved(this, payload, sessionId); }
+
   isPlanMode(sessionId = 'default') {
     const goal = this.goals.get(sessionId || 'default');
     return Boolean(goal && (goal.mode === GoalMode.PLAN || goal.state === GoalState.PLANNING));

package/lib/routes.js

@@ -383,6 +383,28 @@ export function registerRoutes(ctx, {
           }));
         }
 
+        // GET /dsh-goal/diff
+        if (req.method === 'GET' && (pathname === '/dsh-goal/diff' || pathname === '/dsh-goal/diff/')) {
+          const rejection = getRequestRejection(req, { ctx });
+          if (rejection !== undefined) {
+            res.statusCode = rejection;
+            return res.end(JSON.stringify({ error: rejection === 401 ? 'Unauthorized: authentication required' : 'Forbidden: untrusted caller origin' }));
+          }
+          const sid = sessionIdOf(req, 'default');
+          const target = url.searchParams.get('target') || undefined;
+          const base = url.searchParams.get('base') || undefined;
+          const file = url.searchParams.get('file') || undefined;
+          const cwd = url.searchParams.get('cwd') || undefined;
+
+          if (engine) {
+            const diffResult = engine.getDiff(sid, { target, base, file, cwd });
+            res.statusCode = diffResult.ok ? 200 : 400;
+            return res.end(JSON.stringify(diffResult));
+          }
+          res.statusCode = 404;
+          return res.end(JSON.stringify({ ok: false, error: 'Goal engine unavailable' }));
+        }
+
         // POST /dsh-goal/action
         // CSRF & Same-Origin guard
         if (req.method === 'POST' && (pathname === '/dsh-goal/action' || pathname === '/dsh-goal/action/')) {
@@ -429,7 +451,7 @@ export function registerRoutes(ctx, {
             body += chunk;
           };
 
-          const onEnd = () => {
+          const onEnd = async () => {
             if (limitExceeded) return;
             try {
               const data = JSON.parse(body || '{}');
@@ -829,6 +851,28 @@ export function registerRoutes(ctx, {
                   res.statusCode = 200;
                   return res.end(JSON.stringify({ ok: true, templates: getTemplatesCatalogue() }));
 
+                case 'kanban_move': {
+                  if (engine) {
+                    result = engine.handleKanbanCardMove(data, sid);
+                    if (!result.ok) res.statusCode = 400;
+                  } else {
+                    res.statusCode = 404;
+                    result = { ok: false, error: 'Goal engine unavailable' };
+                  }
+                  break;
+                }
+
+                case 'kanban_sync': {
+                  if (engine) {
+                    result = await engine.syncKanban(sid, { ctx });
+                    if (!result.ok && !result.skipped) res.statusCode = 400;
+                  } else {
+                    res.statusCode = 404;
+                    result = { ok: false, error: 'Goal engine unavailable' };
+                  }
+                  break;
+                }
+
                 case 'instantiate_template': {
                   const tplId = data.templateId || data.id;
                   if (!tplId) {
@@ -870,6 +914,7 @@ export function registerRoutes(ctx, {
           '/dsh-goal/events': ['GET'],
           '/dsh-goal/templates': ['GET'],
           '/dsh-goal/state': ['GET'],
+          '/dsh-goal/diff': ['GET'],
           '/dsh-goal/action': ['POST'],
         };
         const cleanPath = pathname.replace(/\/+$/, '') || '/';

package/package.json

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