@goodandready/dsh-kanban 0.1.32 → 0.1.34

package/docs/design/DESIGN.md

@@ -67,6 +67,11 @@
   - Фильтрация сессий субагентов: сессии с маркером subagent (origin === 'subagent' или parentId !== undefined) исключаются из liveSessions и не перезаписывают состояние корневых задач (#215).
 ## Locked Decisions
 
+### 2026-09-08: Релиз Vector 3 (Просмотр Git Diff / Коммитов и Однокликовый Merge) (#211, #212)
+- **Git Diff & Commits Viewer**: В `TaskDrawer` интегрирован блок просмотра истории коммитов сессии и unified diff измененных файлов воркдерева (`GET /tasks/:id/diff` и `GET /tasks/:id/commits`). Diff безопасно ограничен 250 КБ.
+- **One-Click Merge (--no-ff)**: В секции Review Acceptance Gate добавлена кнопка «✓ Принять и смержить» (`POST /tasks/:id/merge`). Выполняется проверка на отсутствие незакоммиченных изменений (`checkWorktreeDirty`), слияние `git merge --no-ff` в целевую ветку (`main`), автоматическая дерегистрация и удаление воркдерева с переводом задачи в `done`.
+
+
 ### 2026-09-08: Релиз Vector 2 (Управление параллелизмом и безопасность) (#214, #216, #224)
 - **maxConcurrentSessions**: Лимит параллельных сессий агентов (по умолчанию 3) предотвращает исчерпание памяти/CPU на хосте. Задачи сверх лимита переводятся в очередь (`queuedAt > 0`) и автоматически запускаются диспетчером при завершении активных сессий.
 - **workspaceClaimBoundaries**: Инструмент `board_move` проверяет принадлежность задачи к воркспейсу текущей сессии агента, предотвращая случайный межпроектный захват карточек.

package/docs/plans/2026-09-08-diff-viewer-merge.md

@@ -0,0 +1,7 @@
+# Implementation Plan: Vector 3 — Git Diff / Commit Viewer & One-Click Merge (#211, #212)
+
+Implementation of in-board git diff viewer and one-click worktree merge in `@goodandready/dsh-kanban` (v0.1.33).
+
+## Issues Scope
+1. **#211**: In-drawer Git Diff and commits viewer for human acceptance.
+2. **#212**: One-click worktree branch merge upon acceptance (`--no-ff`) with automated cleanup.

package/lib/client.js

@@ -1134,6 +1134,15 @@ window.__ModuleLoader__.load({
       'report.checksRun': 'Verification checks',
       'report.artifacts': 'Artifacts',
       'report.risks': 'Risks & notes',
+      'diff.title': 'Git Changes & Diff',
+      'diff.empty': 'No changes detected in worktree.',
+      'diff.commits': 'Commits ({n})',
+      'diff.filesChanged': '{n} files changed',
+      'diff.truncated': 'Diff truncated (exceeded limit)',
+      'diff.show': 'Show diff',
+      'diff.hide': 'Hide diff',
+      'acceptance.acceptAndMerge': 'Accept & Merge (--no-ff)',
+      'acceptance.merging': 'Merging...',
       'acceptance.title': 'Review Acceptance Gate',
       'acceptance.accept': 'Accept (Done)',
       'acceptance.reject': 'Send back for rework',
@@ -1458,6 +1467,15 @@ window.__ModuleLoader__.load({
       'report.checksRun': '验证检查',
       'report.artifacts': '生成产物',
       'report.risks': '风险与说明',
+      'diff.title': 'Git 变更与 Diff',
+      'diff.empty': '工作区未检测到变更。',
+      'diff.commits': '提交历史 ({n})',
+      'diff.filesChanged': '{n} 个文件变更',
+      'diff.truncated': 'Diff 超限已截断',
+      'diff.show': '查看 diff',
+      'diff.hide': '收起 diff',
+      'acceptance.acceptAndMerge': '验收并合并 (--no-ff)',
+      'acceptance.merging': '合并中...',
       'acceptance.title': '评审验收网关',
       'acceptance.accept': '验收通过 (完成)',
       'acceptance.reject': '退回重做',
@@ -2851,6 +2869,59 @@ window.__ModuleLoader__.load({
                 }, '⚠️ ' + t('acceptance.rejectedAlert', { reason: openTask.rejectReason })),
               )
             : null,
+          openTask.worktree
+            ? React.createElement('div', {
+                style: {
+                  margin: '8px 0', padding: 12,
+                  background: 'var(--dsw-alias-bg-layer-3)',
+                  border: '1px solid var(--dsw-alias-border-l2)',
+                  borderRadius: 8, display: 'flex', flexDirection: 'column', gap: 8,
+                },
+              },
+                React.createElement('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center' } },
+                  React.createElement('div', { className: 'dkb-group', style: { margin: 0 } },
+                    t('diff.title'),
+                    commitsData.length > 0 ? ` · ${t('diff.commits', { n: commitsData.length })}` : '',
+                    diffData?.filesChanged ? ` · ${t('diff.filesChanged', { n: diffData.filesChanged })}` : '',
+                  ),
+                  React.createElement('button', {
+                    type: 'button', className: 'dkb-discard',
+                    style: { padding: '2px 8px', fontSize: 11 },
+                    onClick: () => {
+                      if (!diffData && !diffExpanded) loadDiffAndCommits()
+                      setDiffExpanded(!diffExpanded)
+                    },
+                  }, diffExpanded ? t('diff.hide') : t('diff.show')),
+                ),
+                diffExpanded ? React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 6 } },
+                  commitsData.length > 0
+                    ? React.createElement('div', { style: { display: 'flex', flexDirection: 'column', gap: 4, marginBottom: 4 } },
+                        commitsData.map((cm) => React.createElement('div', {
+                          key: cm.hash,
+                          style: { fontSize: 11, display: 'flex', gap: 6, opacity: 0.85, fontFamily: 'monospace' },
+                        },
+                          React.createElement('span', { style: { color: 'var(--dsw-alias-label-link, #3b82f6)' } }, cm.hash),
+                          React.createElement('span', { style: { flex: 1, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' } }, cm.subject),
+                          React.createElement('span', { style: { opacity: 0.6 } }, cm.date),
+                        ))
+                      )
+                    : null,
+                  diffLoading
+                    ? React.createElement('div', { style: { fontSize: 12, opacity: 0.7 } }, 'Loading diff...')
+                    : diffData?.diff
+                      ? React.createElement('pre', {
+                          style: {
+                            margin: 0, padding: 8, maxHeight: 280, overflowY: 'auto',
+                            background: 'var(--dsw-alias-bg-layer-2, #1e1e1e)',
+                            color: 'var(--dsw-alias-label-primary, #ddd)',
+                            fontSize: 11, fontFamily: 'monospace', borderRadius: 4, whiteSpace: 'pre-wrap',
+                            border: '1px solid var(--dsw-alias-border-l1)',
+                          },
+                        }, diffData.diff)
+                      : React.createElement('div', { style: { fontSize: 12, opacity: 0.7 } }, t('diff.empty'))
+                ) : null
+              )
+            : null,
           openTask.column === 'review'
             ? React.createElement('div', {
                 style: {
@@ -2862,6 +2933,22 @@ window.__ModuleLoader__.load({
               },
                 React.createElement('div', { className: 'dkb-group', style: { margin: 0 } }, t('acceptance.title')),
                 React.createElement('div', { style: { display: 'flex', gap: 8 } },
+                  openTask.worktree
+                    ? React.createElement('button', {
+                        type: 'button', className: 'dkb-save',
+                        disabled: merging,
+                        style: { background: 'var(--dsw-alias-bg-success, #16a34a)', color: '#fff' },
+                        onClick: async () => {
+                          try {
+                            setMerging(true)
+                            const out = await api('/task/' + encodeURIComponent(openTask.id) + '/merge', { method: 'POST', body: '{}' })
+                            if (out && out.task) setOpenTask(out.task)
+                            await load(board)
+                          } catch (e) { setError(t(e.key || e.error || 'error.unknown')) }
+                          finally { setMerging(false) }
+                        },
+                      }, merging ? t('acceptance.merging') : '🔀 ' + t('acceptance.acceptAndMerge'))
+                    : null,
                   React.createElement('button', {
                     type: 'button', className: 'dkb-save',
                     onClick: async () => {

package/lib/index.js

@@ -31,7 +31,7 @@ import {
   runBatch, queueTask, unqueueTask, liveSessions, dispatchNextQueuedTask,
   PERMISSION_RANKS,
 } from './launcher.js'
-import { cleanupTaskWorktree, checkWorktreeDirty } from './worktree.js'
+import { cleanupTaskWorktree, checkWorktreeDirty, getTaskDiff, getTaskCommits, mergeTaskWorktree } from './worktree.js'
 import { dispatchMove, MOVE_DETAIL, stopWork, STOP_DETAIL } from './commands.js'
 import { createGiteaClient } from './gitea.js'
 import { syncAll, createSyncState, intakeAll, archiveOverdue } from './sync.js'
@@ -882,6 +882,43 @@ export function apply(ctx, config) {
           reply(res, out)
           return
         }
+        if (req.method === 'GET' && action === 'diff') {
+          const task = store.getTask(id)
+          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
+          const diffResult = await getTaskDiff({ worktreePath: task.worktree })
+          reply(res, diffResult)
+          return
+        }
+        if (req.method === 'GET' && action === 'commits') {
+          const task = store.getTask(id)
+          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
+          const commits = await getTaskCommits({ worktreePath: task.worktree })
+          reply(res, { commits })
+          return
+        }
+        if (req.method === 'POST' && action === 'merge') {
+          const task = store.getTask(id)
+          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
+          const mergeResult = await mergeTaskWorktree({
+            task,
+            targetBranch: typeof input?.targetBranch === 'string' ? input.targetBranch.trim() : undefined,
+            workspaceRegistry: ctx.get('workspaceRegistry'),
+          })
+          if (!mergeResult.success) {
+            writeJson(res, 400, { error: mergeResult.error, detail: mergeResult.detail, files: mergeResult.files })
+            return
+          }
+          const updated = store.acceptTask(id)
+          store.addTransition({
+            taskId: id,
+            fromCol: task.column,
+            toCol: 'done',
+            source: 'manual',
+            detail: `принята и смержена ветка ${task.branch} в ${mergeResult.targetBranch}`,
+          })
+          reply(res, { task: updated, merged: true, targetBranch: mergeResult.targetBranch })
+          return
+        }
         if (req.method === 'GET' && action === 'worktree-status') {
           const task = store.getTask(id)
           if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }

package/lib/worktree.js

@@ -117,7 +117,7 @@ export async function isGitRepo(repoDir, gitRunner = defaultGitRunner) {
   if (!repoDir) return false
   try {
     const res = await gitRunner(['rev-parse', '--is-inside-work-tree'], repoDir)
-    return res.stdout === 'true'
+    return res.stdout?.trim() === 'true'
   } catch {
     return false
   }
@@ -368,3 +368,161 @@ export async function cleanupTaskWorktree({
 
   return { success: true, removed: true, branchDeleted: result.branchDeleted }
 }
+
+/**
+ * Получить unified diff изменений в воркдереве задачи (#211).
+ *
+ * @param {{worktreePath: string, baseRef?: string, gitRunner?: Function}} options
+ * @returns {Promise<{diff: string, truncated: boolean, filesChanged: number}>}
+ */
+export async function getTaskDiff({ worktreePath, baseRef, gitRunner = defaultGitRunner }) {
+  if (!worktreePath) return { diff: '', truncated: false, filesChanged: 0 }
+  const isRepo = await isGitRepo(worktreePath, gitRunner)
+  if (!isRepo) return { diff: '', truncated: false, filesChanged: 0 }
+
+  let base = baseRef
+  if (!base) {
+    base = await determineBaseRef(worktreePath, gitRunner)
+  }
+
+  // Сначала пробуем git diff base...HEAD, если base доступен
+  let diffOut = ''
+  if (base) {
+    const res = await gitRunner(['diff', `${base}...HEAD`], worktreePath)
+    if (res.exitCode === 0) {
+      diffOut = res.stdout
+    }
+  }
+
+  // Дополнительно смотрим незакоммиченные изменения (unstaged + staged)
+  const unstaged = await gitRunner(['diff', 'HEAD'], worktreePath)
+  if (unstaged.exitCode === 0 && unstaged.stdout.trim() !== '') {
+    diffOut = diffOut ? `${diffOut}\n\n# Uncommitted Changes:\n${unstaged.stdout}` : unstaged.stdout
+  }
+
+  // Если и base...HEAD, и HEAD ничего не дали, берём чистый git diff
+  if (!diffOut.trim()) {
+    const fallback = await gitRunner(['diff'], worktreePath)
+    if (fallback.exitCode === 0) diffOut = fallback.stdout
+  }
+
+  // Подсчитываем число затронутых файлов
+  const fileLines = diffOut.split('\n').filter((l) => l.startsWith('diff --git'))
+  const filesChanged = fileLines.length
+
+  // Защита от переполнения: обрезаем diff до 250 КБ
+  const MAX_DIFF_BYTES = 250 * 1024
+  let truncated = false
+  if (Buffer.byteLength(diffOut, 'utf8') > MAX_DIFF_BYTES) {
+    diffOut = diffOut.slice(0, MAX_DIFF_BYTES) + '\n\n... [Diff truncated: exceeded 250 KB limit]'
+    truncated = true
+  }
+
+  return { diff: diffOut, truncated, filesChanged }
+}
+
+/**
+ * Получить список коммитов ветки задачи относительно базовой ветки (#211).
+ *
+ * @param {{worktreePath: string, baseRef?: string, gitRunner?: Function}} options
+ * @returns {Promise<Array<{hash: string, subject: string, author: string, date: string}>>}
+ */
+export async function getTaskCommits({ worktreePath, baseRef, gitRunner = defaultGitRunner }) {
+  if (!worktreePath) return []
+  const isRepo = await isGitRepo(worktreePath, gitRunner)
+  if (!isRepo) return []
+
+  let base = baseRef
+  if (!base) {
+    base = await determineBaseRef(worktreePath, gitRunner)
+  }
+
+  const range = base ? `${base}..HEAD` : '-n 20'
+  const logRes = await gitRunner(['log', range, '--pretty=format:%h%x09%an%x09%ad%x09%s', '--date=short'], worktreePath)
+  if (logRes.exitCode !== 0 || !logRes.stdout.trim()) {
+    // fallback на последние 10 коммитов
+    const fallback = await gitRunner(['log', '-n', '10', '--pretty=format:%h%x09%an%x09%ad%x09%s', '--date=short'], worktreePath)
+    if (fallback.exitCode !== 0 || !fallback.stdout.trim()) return []
+    return fallback.stdout.trim().split('\n').map(parseCommitLine).filter(Boolean)
+  }
+
+  return logRes.stdout.trim().split('\n').map(parseCommitLine).filter(Boolean)
+}
+
+function parseCommitLine(line) {
+  const parts = line.split('\t')
+  if (parts.length < 4) return null
+  return {
+    hash: parts[0],
+    author: parts[1],
+    date: parts[2],
+    subject: parts[3],
+  }
+}
+
+/**
+ * Слияние ветки воркдерева в основную ветку репозитория (--no-ff) при приёмке (#212).
+ *
+ * @param {{task: object, targetBranch?: string, gitRunner?: Function, workspaceRegistry?: object}} options
+ * @returns {Promise<{success: boolean, merged: boolean, error?: string}>}
+ */
+export async function mergeTaskWorktree({
+  task, targetBranch, gitRunner = defaultGitRunner, workspaceRegistry,
+}) {
+  if (!task.worktree || !task.branch) {
+    return { success: false, merged: false, error: 'no-worktree-or-branch' }
+  }
+
+  // 1. Проверяем чистоту воркдерева
+  const dirtyCheck = await checkWorktreeDirty({ worktreePath: task.worktree, gitRunner })
+  if (dirtyCheck.dirty) {
+    return { success: false, merged: false, error: 'worktree-dirty', files: dirtyCheck.files }
+  }
+
+  // 2. Находим корень основного репозитория (из .git файла воркдерева или config)
+  let mainRepoDir = ''
+  const revParse = await gitRunner(['rev-parse', '--git-common-dir'], task.worktree)
+  if (revParse.exitCode === 0 && revParse.stdout.trim()) {
+    const commonDir = revParse.stdout.trim()
+    mainRepoDir = commonDir.endsWith('/.git') ? commonDir.slice(0, -5) : commonDir
+  }
+
+  if (!mainRepoDir) {
+    return { success: false, merged: false, error: 'main-repo-not-found' }
+  }
+
+  // 3. Определяем целевую ветку для слияния
+  let target = targetBranch
+  if (!target) {
+    target = await determineBaseRef(mainRepoDir, gitRunner)
+  }
+  if (!target) target = 'main'
+
+  // 4. Переключаемся или проверяем, что в целевой ветке в основном репо
+  const currentBranch = await gitRunner(['branch', '--show-current'], mainRepoDir)
+  if (currentBranch.stdout.trim() !== target) {
+    const checkoutRes = await gitRunner(['checkout', target], mainRepoDir)
+    if (checkoutRes.exitCode !== 0) {
+      return { success: false, merged: false, error: 'checkout-target-failed', detail: checkoutRes.stderr }
+    }
+  }
+
+  // 5. Выполняем git merge --no-ff
+  const mergeMsg = `Merge branch '${task.branch}' for task ${task.id}`
+  const mergeRes = await gitRunner(['merge', '--no-ff', task.branch, '-m', mergeMsg], mainRepoDir)
+  if (mergeRes.exitCode !== 0) {
+    // В случае конфликта откатываем мерж
+    await gitRunner(['merge', '--abort'], mainRepoDir)
+    return { success: false, merged: false, error: 'merge-conflict', detail: mergeRes.stderr || mergeRes.stdout }
+  }
+
+  // 6. Очищаем воркдерево задачи
+  await cleanupTaskWorktree({
+    task,
+    workspaceRegistry,
+    gitRunner,
+    force: true,
+  })
+
+  return { success: true, merged: true, targetBranch: target }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-kanban",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Visual Kanban board for DeepSeek Harness: Gitea-backed tasks, workflow columns, and a dedicated agent session per task.",
   "type": "module",
   "main": "lib/index.js",