@goodandready/dsh-kanban 0.2.1 → 0.2.7

package/lib/gitea.js

@@ -287,6 +287,21 @@ export function createGiteaClient({ getConfig, resolveToken, fetchImpl = fetch,
       })
     },
 
+    /** Создать Pull Request в репозитории. */
+    async createPullRequest({ owner, repo, title, body, head, base = 'main' }) {
+      const name = String(title ?? '').trim()
+      if (name === '') throw Object.assign(new Error('пустой заголовок'), { code: 'bad-title' })
+      const h = String(head ?? '').trim()
+      const b = String(base ?? 'main').trim()
+      if (!h) throw Object.assign(new Error('ветка head обязательна'), { code: 'bad-head' })
+      return request('POST', repoPath(owner, repo, '/pulls'), {
+        title: name,
+        body: String(body ?? ''),
+        head: h,
+        base: b,
+      })
+    },
+
     /**
      * Ветки репозитория: по ним видно, начата ли работа и сделан ли cleanup.
      *

package/lib/index.js

@@ -9,21 +9,44 @@
 // `routes.js`) и проверяется тестами без харнесса. Здесь остаётся обвязка
 // cordis: настройки, хранилище и маршруты.
 
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-import { randomUUID } from 'node:crypto'
-import z from '@deepseek-ai/schemastery'
-import { defineTool } from '@deepseek-ai/dsh-tools'
-import { SessionId } from '@deepseek-ai/dsh-session'
-import { createUserMessage } from '@deepseek-ai/dsh-llm'
-import { CONFIG_DEFAULTS, CONFIG_HINTS, withDefaults, rootOf } from './config.js'
-import { openStore } from './store.js'
 import {
-  MAX_BODY_BYTES, isTrustedRequest, parseTaskPath,
-  buildBoard, applyMove, createTask, updateTask, deleteTask, appendNote, setArchived, listArchive,
-  taskBody,
-  taskLog, taskBySession, exportBoard, importBoard, exportTasksCsv, assignTask, boardMetrics,
+  MAX_BODY_BYTES,
+  isTrustedRequest,
+  parseTaskPath,
+  buildBoard,
+  applyMove,
+  createTask,
+  updateTask,
   confirmPermission,
+  appendNote,
+  setArchived,
+  listArchive,
+  assignTask,
+  deleteTask,
+  boardMetrics,
+  taskBody,
+  taskLog,
+  taskBySession,
+  exportBoard,
+  importBoard,
+  exportTasksCsv,
+  handleCleanupWorktree,
+  handleTaskDiff,
+  handleTaskCommits,
+  handleTaskMerge,
+  handleTaskWorktreeStatus,
+  handleTaskChecklist,
+  handleTaskReport,
+  handleGetTaskComments,
+  handleAddTaskComment,
+  handleAcceptTask,
+  handleRejectTask,
+  handleProgressDump,
+  handleTriageTask,
+  handleGetSubtasks,
+  handleCreateSubtask,
+  handleToggleChecklistItem,
+  handleCreateTaskPr,
 } from './routes.js'
 import { listImportable, importIssue, refreshTask, searchRepos, createProjectTask } from './import.js'
 import {
@@ -44,6 +67,8 @@ import {
   boardReportDefinition,
   boardCommentsDefinition,
   boardCommentAddDefinition,
+  boardDecomposeDefinition,
+  boardChecklistItemDefinition,
 } from './board-tool.js'
 import { verifySignature, parseEvent } from './webhook.js'
 import { planOutbound, planAssign, createOutbox } from './outbound.js'
@@ -51,6 +76,19 @@ import { computeNextRun } from './cron.js'
 import { PowerInhibitor } from './power.js'
 import { formatProgressDump, parseProgressDump } from './progress-dump.js'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
+import { defineTool } from '@deepseek-ai/dsh-tools'
+import z from '@deepseek-ai/schemastery'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
+import { openStore } from './store.js'
+import {
+  COLUMN_ORDER,
+  wipLimitField,
+  withDefaults,
+  CONFIG_DEFAULTS,
+  CONFIG_HINTS,
+  rootOf,
+} from './config.js'
 import { eventHub } from './events.js'
 import { TASK_TEMPLATES } from './templates.js'
 
@@ -688,6 +726,8 @@ export function apply(ctx, config) {
         ctx.tools.register(defineTool(boardReportDefinition({ store }))),
         ctx.tools.register(defineTool(boardCommentsDefinition({ store }))),
         ctx.tools.register(defineTool(boardCommentAddDefinition({ store }))),
+        ctx.tools.register(defineTool(boardDecomposeDefinition({ store, gitea }))),
+        ctx.tools.register(defineTool(boardChecklistItemDefinition({ store }))),
       ]
       return () => { for (const stop of off) stop?.() }
     }
@@ -949,112 +989,93 @@ export function apply(ctx, config) {
           return
         }
         if (req.method === 'POST' && action === 'cleanup-worktree') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const out = await cleanupTaskWorktree({
-            store,
-            task,
+          const resObj = await handleCleanupWorktree({
+            store, task: store.getTask(id),
             workspaceRegistry: ctx.get('workspaceRegistry'),
             force: input?.force === true,
+            cleanupTaskWorktree,
           })
-          reply(res, out)
+          writeJson(res, resObj.status, resObj.body)
           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)
+          const resObj = await handleTaskDiff({ task: store.getTask(id), getTaskDiff })
+          writeJson(res, resObj.status, resObj.body)
           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 })
+          const resObj = await handleTaskCommits({ task: store.getTask(id), getTaskCommits })
+          writeJson(res, resObj.status, resObj.body)
           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,
+          const resObj = await handleTaskMerge({
+            store, task: store.getTask(id),
+            targetBranch: input?.targetBranch,
             workspaceRegistry: ctx.get('workspaceRegistry'),
+            mergeTaskWorktree,
           })
-          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 })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'GET' && action === 'worktree-status') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const dirtyCheck = await checkWorktreeDirty({ worktreePath: task.worktree })
-          reply(res, {
-            worktree: task.worktree || '',
-            branch: task.branch || '',
-            workspaceId: task.workspaceId || '',
-            dirty: dirtyCheck.dirty,
-            files: dirtyCheck.files,
-          })
+          const resObj = await handleTaskWorktreeStatus({ task: store.getTask(id), checkWorktreeDirty })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
-                if (req.method === 'POST' && action === 'checklist') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const list = Array.isArray(input?.checklist) ? input.checklist : Array.isArray(input) ? input : []
-          const updated = store.updateChecklist(id, list)
-          reply(res, { task: updated })
+        if (req.method === 'GET' && action === 'subtasks') {
+          const resObj = handleGetSubtasks({ store, task: store.getTask(id) })
+          writeJson(res, resObj.status, resObj.body)
+          return
+        }
+        if (req.method === 'POST' && action === 'triage') {
+          const resObj = await handleTriageTask({ store, gitea, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
+          return
+        }
+        if (req.method === 'POST' && (action === 'subtask' || action === 'subtasks')) {
+          const resObj = await handleCreateSubtask({ store, gitea, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
+          return
+        }
+        if (req.method === 'POST' && action === 'checklist-toggle') {
+          const resObj = handleToggleChecklistItem({ store, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
+          return
+        }
+        if (req.method === 'POST' && action === 'pr') {
+          const resObj = await handleCreateTaskPr({ store, gitea, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
+          return
+        }
+        if (req.method === 'POST' && action === 'checklist') {
+          const resObj = handleTaskChecklist({ store, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'report') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const updated = store.setReport(id, input)
-          reply(res, { task: updated })
+          const resObj = handleTaskReport({ store, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'GET' && action === 'comments') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          reply(res, { comments: task.comments || [] })
+          const resObj = handleGetTaskComments({ task: store.getTask(id) })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'comments') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const author = input?.author || 'user'
-          const role = input?.role || 'user'
-          const text = input?.text || ''
-          const updated = store.addComment(id, { author, role, text })
-          reply(res, { task: updated })
+          const resObj = handleAddTaskComment({ store, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'accept') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const updated = store.acceptTask(id)
-          reply(res, { task: updated })
+          const resObj = handleAcceptTask({ store, task: store.getTask(id) })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'reject') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const reason = String(input?.reason || '').trim()
-          if (!reason) { writeJson(res, 400, { error: 'reason-required' }); return }
-          const updated = store.rejectTask(id, reason)
-          reply(res, { task: updated })
+          const resObj = handleRejectTask({ store, task: store.getTask(id), input })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'resume') {
@@ -1080,7 +1101,7 @@ export function apply(ctx, config) {
             text: input?.text,
             agentPreset: input?.agentPreset || task.agentPreset,
             permission: input?.permission || task.permission,
-            permissions: ctx.permissions,
+            permissions: ctx.get('permissionPresets'),
             claimAs: req.headers['x-dsh-user'],
             gitRunner,
             workspaceRegistry: ctx.get('workspaceRegistry'),
@@ -1095,11 +1116,8 @@ export function apply(ctx, config) {
           return
         }
         if (req.method === 'POST' && action === 'progress-dump') {
-          const task = store.getTask(id)
-          if (task === undefined) { writeJson(res, 404, { error: 'task-not-found' }); return }
-          const formatted = typeof input === 'string' ? input : formatProgressDump(input)
-          const updated = store.updateTask(id, { progressDump: formatted })
-          reply(res, { task: updated })
+          const resObj = handleProgressDump({ store, task: store.getTask(id), input, formatProgressDump })
+          writeJson(res, resObj.status, resObj.body)
           return
         }
         if (req.method === 'POST' && action === 'stop') {
@@ -1230,16 +1248,17 @@ export function apply(ctx, config) {
     path: '/dsh-kanban/models',
     handler: async (req, res) => {
       const current = ctx.get('agentDefaultModel')?.currentSelection?.() ?? null
+      const llmService = ctx.get('llm')
       let providers = []
       try {
-        providers = (ctx.llm.listProviders() ?? []).map((p) => ({ id: p.id, name: p.name ?? p.id }))
+        providers = ((llmService?.listProviders?.() ?? []).map((p) => ({ id: p.id, name: p.name ?? p.id })))
       } catch { providers = [] }
 
       const wanted = urlOf(req).searchParams.get('provider') || ''
       if (wanted === '') { writeJson(res, 200, { current, providers, models: [] }); return }
 
       try {
-        const rows = await ctx.llm.listModels(wanted)
+        const rows = await llmService?.listModels?.(wanted)
         writeJson(res, 200, {
           current, providers,
           models: (rows ?? []).map((m) => ({ id: m.id, name: m.name ?? m.id })),