@goodandready/dsh-kanban 0.2.13 → 0.2.15

package/lib/routes.js

@@ -402,12 +402,18 @@ export function taskLog({ store, id }) {
 }
 
 /** Задача, привязанная к сессии; отсутствие задачи — штатный ответ. */
-export function taskBySession({ store, sessionId }) {
+export function taskBySession({ store, sessionId, agents }) {
   const task = store.findTaskBySession(sessionId)
   if (task === undefined) return { task: null }
+  let live
+  try { live = agents?.get?.(sessionId) } catch { live = undefined }
   // Вид доски едет вместе с задачей: чип предлагает колонки, а предлагать
   // `deploy` задаче с простой доски значит звать в колонку, которой нет.
-  return { task, columns: columnsOf(store.boardKind(task.board)) }
+  return {
+    task,
+    columns: columnsOf(store.boardKind(task.board)),
+    canRevive: canRevive(task, live),
+  }
 }
 
 /**
@@ -443,34 +449,42 @@ export function importBoard({ store, input }) {
   let imported = 0
   let skipped = 0
 
-  for (const board of Array.isArray(input.boards) ? input.boards : []) {
-    if (typeof board?.id !== 'string' || board.id === '') continue
-    store.createBoard({ id: board.id, title: board.title, kind: board.kind })
-  }
-
-  for (const task of input.tasks) {
-    if (typeof task?.id !== 'string' || task.id === '') continue
-    if (store.getTask(task.id) !== undefined) { skipped += 1; continue }
-    store.createTask({
-      id: task.id,
-      board: task.board ?? 'main',
-      column: task.column ?? 'backlog',
-      title: task.title ?? '',
-      body: task.body ?? '',
-      owner: task.owner, repo: task.repo,
-      issueNumber: task.issueNumber, issueUrl: task.issueUrl,
-      labels: Array.isArray(task.labels) ? task.labels : [],
-      branch: task.branch, worktree: task.worktree,
-      sessionId: task.sessionId, model: task.model, provider: task.provider,
-      waiting: task.waiting === true,
-      plan: task.plan ?? '',
-      labelColors: task.labelColors ?? {},
-      author: task.author ?? '',
-      priority: task.priority ?? '',
-      dueAt: typeof task.dueAt === 'number' ? task.dueAt : 0,
-      createdAt: task.createdAt,
-    })
-    imported += 1
+  const doImport = () => {
+    for (const board of Array.isArray(input.boards) ? input.boards : []) {
+      if (typeof board?.id !== 'string' || board.id === '') continue
+      store.createBoard({ id: board.id, title: board.title, kind: board.kind })
+    }
+
+    for (const task of input.tasks) {
+      if (typeof task?.id !== 'string' || task.id === '') continue
+      if (store.getTask(task.id) !== undefined) { skipped += 1; continue }
+      store.createTask({
+        id: task.id,
+        board: task.board ?? 'main',
+        column: task.column ?? 'backlog',
+        title: task.title ?? '',
+        body: task.body ?? '',
+        owner: task.owner, repo: task.repo,
+        issueNumber: task.issueNumber, issueUrl: task.issueUrl,
+        labels: Array.isArray(task.labels) ? task.labels : [],
+        branch: task.branch, worktree: task.worktree,
+        sessionId: task.sessionId, model: task.model, provider: task.provider,
+        waiting: task.waiting === true,
+        plan: task.plan ?? '',
+        labelColors: task.labelColors ?? {},
+        author: task.author ?? '',
+        priority: task.priority ?? '',
+        dueAt: typeof task.dueAt === 'number' ? task.dueAt : 0,
+        createdAt: task.createdAt,
+      })
+      imported += 1
+    }
+  }
+
+  if (typeof store.withTransaction === 'function') {
+    store.withTransaction(doImport)
+  } else {
+    doImport()
   }
 
   return { imported, skipped, backup: backupMeta?.backup }

package/lib/store.js

@@ -106,7 +106,7 @@ const WRITABLE = [
 ]
 
 /** Источники перехода; чужое значение не пишем, чтобы журнал оставался читаемым. */
-const SOURCES = new Set(['manual', 'session', 'gitea', 'tool'])
+const SOURCES = new Set(['manual', 'session', 'gitea', 'github', 'tool'])
 
 function rowToTask(row) {
   if (row === undefined) return undefined
@@ -205,6 +205,7 @@ export function openStore({ dir }) {
     ['parentId', "TEXT NOT NULL DEFAULT ''"],
     ['isEpic', "INTEGER NOT NULL DEFAULT 0"],
     ['externalRef', "TEXT"],
+    ['provider', "TEXT NOT NULL DEFAULT 'gitea'"],
   ]) {
     try { db.exec(`ALTER TABLE tasks ADD COLUMN ${column} ${definition}`) } catch { /* столбец уже есть */ }
   }
@@ -220,11 +221,20 @@ export function openStore({ dir }) {
   db.exec('CREATE INDEX IF NOT EXISTS tasks_cron_next ON tasks(archivedAt, nextRunAt)')
   db.exec('CREATE INDEX IF NOT EXISTS tasks_queued ON tasks(archivedAt, queuedAt)')
   db.exec('CREATE INDEX IF NOT EXISTS tasks_parent_id ON tasks(parentId)')
+  db.exec('CREATE INDEX IF NOT EXISTS tasks_updated ON tasks(updatedAt)')
+  db.exec('CREATE INDEX IF NOT EXISTS tasks_archivable ON tasks(archivedAt, col, columnAt)')
   db.exec('PRAGMA synchronous = NORMAL')
   try { db.exec('PRAGMA optimize') } catch { /* pragma optimize best-effort */ }
 
   const q = {
     boards: db.prepare('SELECT * FROM boards ORDER BY position'),
+    insertTask: db.prepare(`INSERT INTO tasks
+      (id, board, col, position, title, body, owner, repo, issueNumber, issueUrl, externalRef,
+       labels, branch, worktree, workspaceId, sessionId, model, provider, waiting, syncedAt,
+       labelColors, author, assignee, milestone, priority, dueAt, columnAt, createdAt, updatedAt,
+       cron, nextRunAt, lastRunAt, progressDump, permission, permissionConfirmedAt, runs,
+       checklist, report, comments, rejectReason, rejectedAt, reasoningEffort, parentId, isEpic)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),
     boardById: db.prepare('SELECT * FROM boards WHERE id = ?'),
     insertBoard: db.prepare('INSERT INTO boards (id, title, kind, position, createdAt) VALUES (?, ?, ?, ?, ?)'),
     lastBoard: db.prepare('SELECT position FROM boards ORDER BY position DESC LIMIT 1'),
@@ -285,6 +295,18 @@ export function openStore({ dir }) {
   }
 
   return {
+    withTransaction(fn) {
+      db.exec('BEGIN IMMEDIATE')
+      try {
+        const res = fn()
+        db.exec('COMMIT')
+        return res
+      } catch (err) {
+        db.exec('ROLLBACK')
+        throw err
+      }
+    },
+
     backupDatabase() {
       const backupsDir = join(dir, 'backups')
       mkdirSync(backupsDir, { recursive: true })
@@ -378,13 +400,7 @@ export function openStore({ dir }) {
       // генерирует новый.
       const id = typeof input.id === 'string' && input.id !== '' ? input.id : randomUUID()
       const position = positionFor(board, column, input.beforeId, input.afterId)
-      db.prepare(`INSERT INTO tasks
-        (id, board, col, position, title, body, owner, repo, issueNumber, issueUrl, externalRef,
-         labels, branch, worktree, workspaceId, sessionId, model, provider, waiting, syncedAt,
-         labelColors, author, assignee, milestone, priority, dueAt, columnAt, createdAt, updatedAt,
-         cron, nextRunAt, lastRunAt, progressDump, permission, permissionConfirmedAt, runs,
-         checklist, report, comments, rejectReason, rejectedAt, reasoningEffort, parentId, isEpic)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(
+      q.insertTask.run(
         id, board, column, position,
         input.title ?? '', input.body ?? '',
         input.owner ?? null, input.repo ?? null,

package/lib/time.js

@@ -40,6 +40,7 @@ export function isStale({ now, updatedAt, sessionId, afterMinutes }) {
   const limit = Number(afterMinutes)
   if (!Number.isFinite(limit) || limit <= 0) return false
   if (typeof sessionId !== 'string' || sessionId === '') return false
-  if (typeof updatedAt !== 'number' || !Number.isFinite(updatedAt)) return false
+  const parts = relativeParts(now, updatedAt)
+  if (!parts) return false
   return now - updatedAt >= limit * MINUTE
 }

package/lib/webhook.js

@@ -1,4 +1,4 @@
-// Приём событий Gitea.
+// Приём событий Gitea и GitHub.
 //
 // Вебхук даёт мгновенную сверку вместо ожидания следующего опроса. Опрос при
 // этом остаётся: вебхук может быть не настроен, недоступен снаружи или просто
@@ -9,7 +9,7 @@
 import { createHmac, timingSafeEqual } from 'node:crypto'
 
 /**
- * Проверить подпись доставки.
+ * Проверить подпись доставки (поддерживает Gitea X-Gitea-Signature и GitHub X-Hub-Signature-256).
  *
  * Сравнение постоянного времени: обычное посимвольное сравнение по времени
  * ответа выдаёт, сколько первых байтов угадано, и подпись подбирается за
@@ -17,16 +17,33 @@ import { createHmac, timingSafeEqual } from 'node:crypto'
  *
  * @param {string} secret общий секрет
  * @param {string|Buffer} body сырое тело запроса
- * @param {string} signature значение заголовка X-Gitea-Signature
+ * @param {string} signature значение заголовка X-Gitea-Signature или X-Hub-Signature-256
  */
 export function verifySignature(secret, body, signature) {
   if (!secret) return false
-  const provided = String(signature ?? '').trim().toLowerCase()
+  let provided = String(signature ?? '').trim().toLowerCase()
+  if (provided.startsWith('sha256=')) {
+    provided = provided.slice(7).trim()
+  }
   if (!/^[0-9a-f]{64}$/.test(provided)) return false
   const expected = createHmac('sha256', secret).update(body ?? '').digest('hex')
   return timingSafeEqual(Buffer.from(expected, 'hex'), Buffer.from(provided, 'hex'))
 }
 
+/**
+ * Определить провайдера вебхука по входящим заголовкам запроса.
+ *
+ * @param {object} headers заголовки HTTP-запроса
+ * @returns {'github'|'gitea'}
+ */
+export function detectWebhookProvider(headers) {
+  if (!headers || typeof headers !== 'object') return 'gitea'
+  if (headers['x-github-event'] || headers['x-hub-signature-256']) {
+    return 'github'
+  }
+  return 'gitea'
+}
+
 /**
  * Что за задачу затронуло событие.
  *

package/lib/worktree.js

@@ -168,7 +168,12 @@ export async function createTaskWorktree({
   env,
   cwdOf,
 }) {
-  if (!repoDir) return undefined
+  if (!repoDir) {
+    if (task?.workspacePath) {
+      return prepareMultiRepoMirror({ task, workspacePath: task.workspacePath, gitRunner, config })
+    }
+    return undefined
+  }
   const isGit = await isGitRepo(repoDir, gitRunner)
   if (!isGit) return undefined
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goodandready/dsh-kanban",
-  "version": "0.2.13",
-  "description": "Visual Kanban board for DeepSeek Harness: Gitea-backed tasks, workflow columns, and a dedicated agent session per task.",
+  "version": "0.2.15",
+  "description": "Visual Kanban board for DeepSeek Harness: Gitea and GitHub-backed tasks, workflow columns, and a dedicated agent session per task.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -27,6 +27,7 @@
     "dsh-plugin",
     "kanban",
     "gitea",
+    "github",
     "tasks",
     "agents",
     "deepseek-harness"