@goodandready/dsh-kanban 0.2.13 → 0.2.14

package/lib/client.js

@@ -608,6 +608,7 @@ window.__ModuleLoader__.load({
     }
 
     const helpers = {
+      ROW_ID, ROW_CONFIG_KEY, PKG, KanbanSettingsCard,
       neighboursFor, tasksOf, sortTasks, packInfo, groupByAssignee, applyToEach, recallLaunch, rememberLaunch, stillOffered,
       cardRef, taskRef, cardStatus, facetLabel, boardTitle,
       columnTitle, planLine, stateLabel, isCollapsed,
@@ -721,6 +722,8 @@ window.__ModuleLoader__.load({
       '.dkb-section-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:10px;padding:14px 16px;display:flex;flex-direction:column;gap:8px;margin-bottom:12px}' +'.dkb-section-title{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between;gap:8px;padding-bottom:4px;border-bottom:1px solid var(--dsw-alias-border-l2)}' +'.dkb-section-badge{font-size:11px;font-weight:500;padding:2px 8px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary)}' +'.dkb-section-badge-ok{border-color:var(--dsw-alias-state-success-border,#34d399);color:var(--dsw-alias-state-success-primary,#059669);background:var(--dsw-alias-state-success-bg,rgba(16,185,129,0.1))}' +
       '.dkb-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;list-style:none}' +
       '.dkb-cardOpen{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}' +
+      '.dkb-page{padding:0}' +
+      '.dkb-page .dkb-body{border-top:none;margin:0}' +
       '.dkb-head{appearance:none;width:100%;font:inherit;color:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:12px;display:flex;align-items:center;gap:12px;padding:14px 16px}' +
       '.dkb-headText{flex-direction:column;flex:1;gap:4px;min-width:0;display:flex}' +
       '.dkb-title{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:1.4}' +
@@ -1818,8 +1821,16 @@ window.__ModuleLoader__.load({
     }
 
     function KanbanSettingsCard(props) {
-      const ctx = props.ctx
-      const t = props.t || fallbackT
+      const ctx = props && props.ctx
+      const t = (props && props.t) || fallbackT
+      ensureCss()
+
+      // Row seat (plugins.row.config): summary is a one-liner
+      if (props && props.view === 'summary') {
+        return h('span', { className: 'dkb-sub' }, t('settings.subtitle') || t('subtitle') || 'Kanban board for sessions and tasks')
+      }
+      const page = !!(props && props.view === 'page')
+
       const [open, setOpen] = React.useState(false)
       const [draft, setDraft] = React.useState(null)
       const [saving, setSaving] = React.useState(false)
@@ -1891,7 +1902,7 @@ window.__ModuleLoader__.load({
       ensureCss()
       const style = null
 
-      if (!open) return h('li', { className: 'dkb-card' }, head)
+      if (!page && !open) return h('li', { className: 'dkb-card' }, head)
 
       let body
       if (status === 'loading') {
@@ -1980,15 +1991,10 @@ window.__ModuleLoader__.load({
         body = rows
       }
 
-      // Row seat (plugins.row.config): the host page draws title/icon/crumb and the
-      // padding, so the summary is a one-liner and the page drops our card chrome.
-      if (props && props.view === 'summary') {
-        return h('span', { className: 'dkb-sub' }, t('settings.subtitle') || 'Kanban board for sessions and tasks')
+      if (page) {
+        return h('div', { className: 'dkb-page' }, h('div', { className: 'dkb-body' }, body))
       }
-      const page = !!(props && props.view === 'page')
-
-      return h(page ? 'div' : 'li', { className: page ? 'dkb-page' : 'dkb-card dkb-cardOpen' },
-        page ? null : head, h('div', { className: 'dkb-body' }, body))
+      return h('li', { className: 'dkb-card dkb-cardOpen' }, head, h('div', { className: 'dkb-body' }, body))
     }
 
     /** Стрелка влево для кнопки возврата: 14x14, обводка цветом текста. */
@@ -2238,6 +2244,36 @@ window.__ModuleLoader__.load({
       const [syncing, setSyncing] = React.useState(false)
       const [picked, setPicked] = React.useState({})
       const [archive, setArchive] = React.useState(null)
+      const [diffExpanded, setDiffExpanded] = React.useState(false)
+      const [diffLoading, setDiffLoading] = React.useState(false)
+      const [diffData, setDiffData] = React.useState(null)
+      const [commitsData, setCommitsData] = React.useState([])
+      const [merging, setMerging] = React.useState(false)
+
+      const loadDiffAndCommits = React.useCallback(async () => {
+        if (!openTask) return
+        setDiffLoading(true)
+        try {
+          const [dRes, cRes] = await Promise.all([
+            api('/task/' + encodeURIComponent(openTask.id) + '/diff'),
+            api('/task/' + encodeURIComponent(openTask.id) + '/commits'),
+          ])
+          setDiffData(dRes)
+          setCommitsData(cRes?.commits || [])
+        } catch (e) {
+          setError(t(e.key || e.error || 'error.unknown'))
+        } finally {
+          setDiffLoading(false)
+        }
+      }, [openTask, t])
+
+      React.useEffect(() => {
+        setDiffExpanded(false)
+        setDiffLoading(false)
+        setDiffData(null)
+        setCommitsData([])
+        setMerging(false)
+      }, [openTask?.id])
       const [metrics, setMetrics] = React.useState(null)
       const [onlyWaiting, setOnlyWaiting] = React.useState(false)
       const [onlyOverdue, setOnlyOverdue] = React.useState(false)
@@ -4518,25 +4554,59 @@ window.__ModuleLoader__.load({
       // below — the seat is additive, not an either/or candidate. The label is a static
       // string on purpose: it is resolved while the page renders, and a locale lookup
       // there would take the whole client batch down with it.
-      try {
-        ctx.slots.inject('plugins.item', () => {
-          ctx.slots.register({
+      const trySlot = (name, register) => {
+        try {
+          if (typeof ctx.slots?.inject === 'function') ctx.slots.inject(name, register)
+          else register()
+        } catch (e) {
+          console.warn('[dsh-kanban] slot registration failed for ' + name + ':', e && e.message)
+        }
+      }
+
+      // #274: Newest slot first, older slots as fallbacks:
+      // 1. plugins.row.config (Row seat on Plugins page, DSH 0.1.6-alpha.2)
+      let cardSlot = undefined
+      trySlot('plugins.row.config', () => {
+        ctx.slots.register(
+          {
+            name: 'plugins.row.config',
+            key: ROW_CONFIG_KEY,
+            locale: NS,
+            inject: () => ({ ctx }),
+          },
+          SafeSettingsCard,
+        )
+        if (!cardSlot) cardSlot = 'plugins.row.config'
+      })
+
+      // 2. plugins.item (Official group on Plugins page)
+      trySlot('plugins.item', () => {
+        ctx.slots.register(
+          {
             name: 'plugins.item',
             id: ROW_ID,
             order: 60,
             label: () => 'Kanban',
             locale: NS,
             inject: () => ({ ctx }),
-          }, SafeSettingsCard)
-        })
-      } catch (e) {
-        console.warn('[dsh-kanban] plugins.item seat unavailable', e)
-      }
+          },
+          SafeSettingsCard,
+        )
+      })
 
-      const cardSlot = registerFirst(ctx, [
-        { name: 'plugins.row.config', key: ROW_CONFIG_KEY, locale: NS, inject: () => ({ ctx }) },
-        { name: 'settings.plugin.item', key: NS, locale: NS, inject: () => ({ ctx }) },
-      ], SafeSettingsCard)
+      // 3. settings.plugin.item (legacy fallback for older cores)
+      trySlot('settings.plugin.item', () => {
+        ctx.slots.register(
+          {
+            name: 'settings.plugin.item',
+            key: NS,
+            locale: NS,
+            inject: () => ({ ctx }),
+          },
+          SafeSettingsCard,
+        )
+        if (!cardSlot) cardSlot = 'settings.plugin.item'
+      })
 
       const toggle = createToggle()
       ctx.effect(() => {

package/lib/commands.js

@@ -51,6 +51,7 @@ const TABLE = {
  *   `undefined` — такой колонки на этой доске нет.
  */
 export function commandFor(column, kind = 'project') {
+  if (!columnsOfKind(kind).includes(column)) return undefined
   const board = TABLE[kind]
   if (board === undefined) return undefined
   const found = board[column]

package/lib/gitea.js

@@ -33,7 +33,9 @@ export function safeSegment(value) {
 
 /** Имя учётной записи — имя переменной окружения, а не сам секрет. */
 export function isCredentialName(value) {
-  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(String(value || ''))
+  const str = String(value || '')
+  if (looksLikeSecret(str)) return false
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(str)
 }
 
 /** Похоже на сам токен, а не на его имя. */

package/lib/index.js

@@ -77,6 +77,9 @@ import { planOutbound, planAssign, createOutbox } from './outbound.js'
 import { computeNextRun } from './cron.js'
 import { PowerInhibitor } from './power.js'
 import { formatProgressDump, parseProgressDump } from './progress-dump.js'
+import { randomUUID } from 'node:crypto'
+import { SessionId } from '@deepseek-ai/dsh-session'
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import z from '@deepseek-ai/schemastery'
@@ -92,7 +95,7 @@ import {
   rootOf,
 } from './config.js'
 import { eventHub } from './events.js'
-import { TASK_TEMPLATES } from './templates.js'
+import { TASK_TEMPLATES, getTemplateById } from './templates.js'
 
 export { COLUMN_ORDER, wipLimitField, withDefaults } from './config.js'
 
@@ -838,10 +841,25 @@ export function apply(ctx, config) {
     },
   }), 'dsh-kanban: sse events stream')
 
+  // Очистка SSE-клиентов и heartbeat таймера при выгрузке плагина (#282)
+  if (typeof ctx.on === 'function') {
+    ctx.on('dispose', () => {
+      eventHub.closeAll()
+    })
+  }
+
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-kanban/templates',
     handler: (req, res) => {
+      const u = new URL(req.url, 'http://localhost')
+      const tid = u.searchParams.get('id')
+      if (tid) {
+        const tmpl = getTemplateById(tid)
+        if (!tmpl) { writeJson(res, 404, { error: 'template-not-found' }); return }
+        reply(res, { template: tmpl })
+        return
+      }
       reply(res, { templates: TASK_TEMPLATES })
     },
   }), 'dsh-kanban: task templates')
@@ -1098,16 +1116,15 @@ export function apply(ctx, config) {
             config: getConfig(),
             provider: picked.provider,
             model: picked.model,
-            mintSessionId,
-            createMessage,
-            cwdOf,
+            mintSessionId: () => SessionId(`kanban-${id}-${randomUUID()}`),
+            createMessage: createUserMessage,
+            cwdOf: undefined,
             logger: ctx.logger,
-            text: input?.text,
+            text: typeof input?.text === 'string' ? input.text : undefined,
             agentPreset: input?.agentPreset || task.agentPreset,
             permission: input?.permission || task.permission,
             permissions: ctx.get('permissionPresets'),
-            claimAs: req.headers['x-dsh-user'],
-            gitRunner,
+            claimAs: req.headers['x-dsh-user'] || (await whoAmI()),
             workspaceRegistry: ctx.get('workspaceRegistry'),
             resume: true,
           })
@@ -1281,7 +1298,7 @@ export function apply(ctx, config) {
     handler: (req, res) => {
       const m = /^\/dsh-kanban\/session\/([^/]+)\/task\/?$/.exec(urlOf(req).pathname)
       if (m === null) { writeJson(res, 404, { error: 'not-found' }); return }
-      reply(res, taskBySession({ store, sessionId: decodeURIComponent(m[1]) }))
+      reply(res, taskBySession({ store, sessionId: decodeURIComponent(m[1]), agents: ctx.agents }))
     },
   }), 'dsh-kanban: task route by session')
 

package/lib/launcher.js

@@ -416,7 +416,7 @@ export async function runTask({
     })
   }
 
-  return { sessionId: taken.sessionId, mode: taken.mode, task: current }
+  return { sessionId: taken.sessionId, mode: revivalKind(taken.mode), task: current }
 }
 
 /** Текст сообщения: человеческий, если он есть, иначе встроенная заготовка. */

package/lib/markdown.js

@@ -119,7 +119,7 @@ export function parseSpans(text) {
       const href = piece.slice(cut + 2, -1)
       // Небезопасная схема — не ссылка, а текст. Молча выбрасывать нельзя:
       // человек должен видеть, что там было написано.
-      if (SAFE_LINK.test(href)) out.push({ kind: 'link', text: label, href })
+      if (isSafeHref(href)) out.push({ kind: 'link', text: label, href })
       else out.push({ kind: 'text', text: piece })
     } else if (piece.startsWith('**') || piece.startsWith('__')) {
       out.push({ kind: 'strong', text: piece.slice(2, -2) })

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

@@ -220,11 +220,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 +294,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 +399,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/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,6 +1,6 @@
 {
   "name": "@goodandready/dsh-kanban",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "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",