@goodandready/dsh-kanban 0.2.23 → 0.2.24

package/lib/client.js

@@ -571,12 +571,7 @@ window.__ModuleLoader__.load({
 
     async function api(path, options) {
       const timeoutMs = (options && options.timeout) || 20000
-      let timeoutSignal
-      try {
-        if (!options?.signal) {
-          timeoutSignal = createTimeoutSignal(timeoutMs)
-        }
-      } catch (_) {}
+      const timeoutSignal = !options?.signal ? createTimeoutSignal(timeoutMs) : undefined
 
       const fetchOpts = Object.assign({
         headers: { 'Content-Type': 'application/json' },

package/lib/config.js

@@ -138,7 +138,12 @@ export function rootOf(config, cwdOf = () => process.cwd()) {
 export function withDefaults(raw) {
   const out = {}
   for (const [key, fallback] of Object.entries(CONFIG_DEFAULTS)) {
-    const value = raw?.[key]
+    let value = raw?.[key]
+    if (value && typeof value === 'object' && typeof value.get === 'function') {
+      try {
+        value = value.get()
+      } catch { /* ignore */ }
+    }
     out[key] = typeof value === typeof fallback && value !== null ? value : fallback
   }
   return out

package/lib/import.js

@@ -66,12 +66,13 @@ export function issueMilestone(issue) {
  * Fields `branch`, `worktree`, `sessionId`, `model` are NOT populated here:
  * they are assigned later when work begins. The plugin does not create branches on import.
  */
-export function issueToTask(issue, { board = 'main', column = 'backlog', owner, repo, provider }) {
-  const p = provider || (typeof issue?.html_url === 'string' && issue.html_url.includes('github.com') ? 'github' : 'gitea')
+export function issueToTask(issue, { board = 'main', column = 'backlog', owner, repo, provider, forge }) {
+  const detectedForge = forge || (typeof issue?.html_url === 'string' && issue.html_url.includes('github.com') ? 'github' : 'gitea')
   return {
     board,
     column,
-    provider: p,
+    forge: detectedForge,
+    ...(provider && provider !== 'github' && provider !== 'gitea' ? { provider } : {}),
     title: typeof issue?.title === 'string' ? issue.title : '',
     body: typeof issue?.body === 'string' ? issue.body : '',
     labels: Array.isArray(issue?.labels)
@@ -167,9 +168,15 @@ export async function importIssue({ gitea, store, owner, repo, issueNumber, boar
   if (typeof issueNumber !== 'number') return { error: 'issue-number-required', status: 400 }
   // Simple board is for non-issue tasks. Importing here would bring branches/PRs into columns unable to display them.
   if (store.boardKind(board) !== 'project') return { error: 'board-not-for-issues', status: 400 }
-  const issue = await gitea.getIssue({ owner, repo, index: issueNumber, provider: forge || provider })
+  const effectiveForge = forge || (provider === 'github' || provider === 'gitea' ? provider : undefined)
+  const effectiveProvider = (provider !== 'github' && provider !== 'gitea') ? provider : undefined
+  if (typeof store.findTaskByIssue === 'function') {
+    const existing = store.findTaskByIssue({ owner, repo, issueNumber, forge: effectiveForge })
+    if (existing) return { task: existing }
+  }
+  const issue = await gitea.getIssue({ owner, repo, index: issueNumber, provider: effectiveForge || effectiveProvider })
   if (issue === undefined || issue === null) return { error: 'issue-not-found', status: 404 }
-  return { task: store.createTask(issueToTask(issue, { board, column, owner, repo, forge: forge || provider })) }
+  return { task: store.createTask(issueToTask(issue, { board, column, owner, repo, forge: effectiveForge, provider: effectiveProvider })) }
 }
 
 /** Re-read issue and update task, preserving local state. */
@@ -222,13 +229,15 @@ export async function createProjectTask({
     targetRepo = wanted
   }
 
+  const effectiveForge = forge || (provider === 'github' || provider === 'gitea' ? provider : undefined)
+  const effectiveProvider = (provider !== 'github' && provider !== 'gitea') ? provider : undefined
   let issue
   try {
-    issue = await gitea.createIssue({ owner, repo: targetRepo, title: name, body, provider: forge || provider })
+    issue = await gitea.createIssue({ owner, repo: targetRepo, title: name, body, provider: effectiveForge || effectiveProvider })
   } catch (error) {
     // Repository may have already been created; avoid deleting on issue creation failure.
     return { error: 'issue-not-created', status: 502, detail: String(error?.message ?? error) }
   }
 
-  return { task: store.createTask(issueToTask(issue, { board, column: 'backlog', owner, repo: targetRepo, forge: forge || provider })) }
+  return { task: store.createTask(issueToTask(issue, { board, column: 'backlog', owner, repo: targetRepo, forge: effectiveForge, provider: effectiveProvider })) }
 }

package/lib/index.js

@@ -234,7 +234,7 @@ export function apply(ctx, config) {
     if (typeof settingsSvc?.describe !== 'function') return null
     try {
       const row = settingsSvc.describe().find((r) => r?.ns === SETTINGS_NAMESPACE)
-      if (!row || row.status !== 'ready' || !row.value) return null
+      if (!row || !row.value || (row.status !== undefined && row.status !== 'ready')) return null
       return withDefaults(row.value)
     } catch (err) {
       ctx.logger?.warn?.(`dsh-kanban: settings describe failed: ${err?.message || err}`)
@@ -268,14 +268,32 @@ export function apply(ctx, config) {
         }
       }
     }
+    const handleDocumentUpdated = (ns) => {
+      if (!ns || ns === SETTINGS_NAMESPACE) {
+        const served = readServedConfig()
+        if (served) {
+          effective = served
+          rearm()
+        }
+      }
+    }
+    const handleVolatileUpdate = (payload) => {
+      const served = readServedConfig()
+      if (served) {
+        effective = served
+        rearm()
+        return
+      }
+      applyPatch(payload)
+    }
     if (typeof ctx.effect === 'function') {
-      ctx.effect(() => ctx.on('loader/volatile-update', applyPatch))
+      ctx.effect(() => ctx.on('loader/volatile-update', handleVolatileUpdate))
       ctx.effect(() => ctx.on('config', applyPatch))
-      ctx.effect(() => ctx.on('settings/document-updated', applyPatch))
+      ctx.effect(() => ctx.on('settings/document-updated', handleDocumentUpdated))
     } else {
-      ctx.on('loader/volatile-update', applyPatch)
+      ctx.on('loader/volatile-update', handleVolatileUpdate)
       ctx.on('config', applyPatch)
-      ctx.on('settings/document-updated', applyPatch)
+      ctx.on('settings/document-updated', handleDocumentUpdated)
     }
   }
 
@@ -1142,6 +1160,9 @@ export function apply(ctx, config) {
             workspaceRegistry: ctx.get('workspaceRegistry'),
             force: input?.force === true,
             cleanupTaskWorktree,
+            config: getConfig(),
+            repoDir: rootOf(getConfig()).path,
+            cwdOf: () => rootOf(getConfig()).path,
           })
           writeJson(res, resObj.status, resObj.body)
           return
@@ -1209,6 +1230,9 @@ export function apply(ctx, config) {
         }
         if (req.method === 'POST' && action === 'report') {
           const resObj = handleTaskReport({ store, task: store.getTask(id), input })
+          if (resObj?.body?.task || resObj?.body?.report) {
+            eventHub.broadcast('task:change', { taskId: id, action: 'updated' })
+          }
           writeJson(res, resObj.status, resObj.body)
           return
         }
@@ -1310,11 +1334,19 @@ export function apply(ctx, config) {
           return
         }
         if (req.method === 'POST' && action === 'archive') {
-          reply(res, setArchived({ store, id, archived: true }))
+          const resObj = setArchived({ store, id, archived: true })
+          if (resObj?.task) {
+            eventHub.broadcast('task:change', { taskId: id, action: 'archived' })
+          }
+          reply(res, resObj)
           return
         }
         if (req.method === 'POST' && action === 'restore') {
-          reply(res, setArchived({ store, id, archived: false }))
+          const resObj = setArchived({ store, id, archived: false })
+          if (resObj?.task) {
+            eventHub.broadcast('task:change', { taskId: id, action: 'restored' })
+          }
+          reply(res, resObj)
           return
         }
         if (req.method === 'POST' && action === 'queue') {
@@ -1333,8 +1365,12 @@ export function apply(ctx, config) {
           reply(res, appendNote({ store, id, input }))
           return
         }
-        if (req.method === 'PATCH' && action === undefined) {
-          reply(res, updateTask({ store, id, input }))
+        if (req.method === 'PATCH' && (action === undefined || action === '')) {
+          const resObj = updateTask({ store, id, input })
+          if (resObj?.task) {
+            eventHub.broadcast('task:change', { taskId: id, action: 'updated' })
+          }
+          reply(res, resObj)
           return
         }
         writeJson(res, 405, { error: 'method-not-allowed' })
@@ -1380,9 +1416,10 @@ export function apply(ctx, config) {
       try {
         const input = await readBody(req)
         reply(res, await importIssue({
-          gitea, store,
+          gitea: git, store,
           owner: input.owner, repo: input.repo, issueNumber: input.issueNumber,
           board: input.board ?? 'main', column: input.column ?? 'backlog',
+          forge: input.forge || input.provider,
         }))
       } catch (error) {
         writeJson(res, error?.status ?? 500, { error: 'bad-request' })

package/lib/launcher.js

@@ -163,7 +163,7 @@ export async function obtainAgent({
   agentPreset, permission, permissions, gitRunner, workspaceRegistry,
   reasoningEffort,
 }) {
-  const chosenPerm = permission || task?.permission || ''
+  const chosenPerm = permission || task?.permission || (typeof permissions?.set === 'function' ? (config?.sessionDefaultPermission || '') : '')
   const effort = reasoningEffort || task?.reasoningEffort || undefined
   const agentOptions = { provider, model, ...(effort ? { reasoningEffort: effort } : {}) }
 
@@ -210,7 +210,17 @@ export async function obtainAgent({
   let workspaceId = task?.workspaceId || undefined
   let worktreeCreated = false
 
-  const isGit = await isGitRepo(cwd, gitRunner)
+  let isGit = false
+  try {
+    isGit = await isGitRepo(cwd, gitRunner)
+  } catch (err) {
+    if (config?.worktreeIsolation !== false) {
+      const error = new Error(`worktree-creation-failed: git probe failed: ${err?.message || err}`)
+      error.key = 'worktree-creation-failed'
+      error.status = 500
+      throw error
+    }
+  }
   if (config?.worktreeIsolation !== false && isGit) {
     let created
     try {
@@ -370,9 +380,6 @@ export async function runTask({
       agentPreset, permission, permissions, gitRunner, workspaceRegistry,
       reasoningEffort: effort,
     })
-  } finally {
-    releaseSessionSlot(task.id)
-  }
 
   if (task.queuedAt > 0 || task.queuedRequest) {
     store.updateTask(task.id, { queuedAt: 0, queuedRequest: '' })
@@ -455,6 +462,9 @@ export async function runTask({
   }
 
   return { sessionId: taken.sessionId, mode: revivalKind(taken.mode), task: current }
+  } finally {
+    releaseSessionSlot(task.id)
+  }
 }
 
 /** Build prompt text: custom user message if provided, otherwise standard template. */
@@ -552,9 +562,6 @@ export async function runBatch({
       agents, task: list[0], config, provider, model, mintSessionId, cwdOf, logger,
       agentPreset, permission, permissions,
     })
-  } finally {
-    releaseSessionSlot(list[0].id)
-  }
 
   await taken.agent.whenIdle()
   const own = typeof text === 'string' ? text.trim() : ''
@@ -598,6 +605,9 @@ export async function runBatch({
   })
 
   return { sessionId: taken.sessionId, mode: taken.mode, started: started.length, tasks: started }
+  } finally {
+    releaseSessionSlot(list[0].id)
+  }
 }
 
 /**
@@ -639,7 +649,7 @@ export function unqueueTask({ store, task }) {
   if (typeof task.queuedAt !== 'number' || task.queuedAt <= 0) {
     return { error: 'task-not-queued', status: 400 }
   }
-  store.updateTask(task.id, { queuedAt: 0, sessionId: null })
+  store.updateTask(task.id, { queuedAt: 0, sessionId: null, queuedRequest: '' })
   store.addTransition({
     taskId: task.id, fromCol: task.column, toCol: task.column, source: 'manual',
     detail: 'removed from queue; message already sent to agent',

package/lib/order.js

@@ -30,4 +30,19 @@ export function keyBetween(a, b) {
   return generateKeyBetween(a ?? null, b ?? null)
 }
 
+export function isValidOrderKey(key) {
+  if (typeof key !== 'string' || !key || /[^0-9a-zA-Z]/.test(key)) return false
+  try {
+    generateKeyBetween(null, key)
+    return true
+  } catch {
+    try {
+      generateKeyBetween(key, null)
+      return true
+    } catch {
+      return false
+    }
+  }
+}
+
 export { generateKeyBetween, generateNKeysBetween }

package/lib/progress-dump.js

@@ -62,21 +62,18 @@ export function parseProgressDump(text) {
     const line = rawLine.trim()
     const lower = line.toLowerCase()
 
-    if (lower.startsWith('goal:') || lower.startsWith('цель:')) {
+    if (lower.startsWith('goal:')) {
       currentKey = 'goal'
       const val = line.slice(line.indexOf(':') + 1).trim()
       if (val) sections.goal.push(val)
-    } else if (lower.startsWith('progress:') || lower.startsWith('done:') || lower.startsWith('прогресс:')) {
+    } else if (lower.startsWith('progress:') || lower.startsWith('done:')) {
       currentKey = 'progress'
       const val = line.slice(line.indexOf(':') + 1).trim()
       if (val) sections.progress.push(val)
     } else if (
       lower.startsWith('next:') ||
       lower.startsWith('next steps:') ||
-      lower.startsWith('next step:') ||
-      lower.startsWith('следующие шаги:') ||
-      lower.startsWith('шаги:') ||
-      lower.startsWith('дальше:')
+      lower.startsWith('next step:')
     ) {
       currentKey = 'next'
       const val = line.slice(line.indexOf(':') + 1).trim()

package/lib/routes.js

@@ -238,9 +238,7 @@ export function updateTask({ store, id, input }) {
       patch.permissionConfirmedTier = ''
     }
   }
-  if (typeof input?.permissionConfirmedTier === 'string') {
-    patch.permissionConfirmedTier = input.permissionConfirmedTier
-  }
+
   if (typeof input?.reasoningEffort === 'string') {
     const val = input.reasoningEffort.trim().toLowerCase()
     if (['', 'low', 'medium', 'high', 'default', 'none', 'minimal', 'thorough'].includes(val)) {
@@ -524,15 +522,23 @@ export function exportTasksCsv({ store, board = 'main' }) {
 /**
  * Clean up task worktree.
  */
-export async function handleCleanupWorktree({ store, task, workspaceRegistry, force, cleanupTaskWorktree }) {
+export async function handleCleanupWorktree({
+  store, task, workspaceRegistry, force, cleanupTaskWorktree,
+  config, repoDir, cwdOf, env,
+}) {
   if (!task) return { status: 404, body: { error: 'task-not-found' } }
   const out = await cleanupTaskWorktree({
     store,
     task,
     workspaceRegistry,
     force: force === true,
+    config,
+    repoDir,
+    cwdOf,
+    env,
   })
-  return { status: 200, body: out }
+  const status = out.status || (out.error ? (out.error === 'unfenced-worktree-path' ? 403 : 500) : 200)
+  return { status, body: out }
 }
 
 /**

package/lib/store.js

@@ -13,7 +13,7 @@ import { DatabaseSync } from 'node:sqlite'
 import { randomUUID } from 'node:crypto'
 import { mkdirSync, copyFileSync, readdirSync, unlinkSync, statSync, chmodSync, existsSync } from 'node:fs'
 import { join } from 'node:path'
-import { keyBetween, generateNKeysBetween } from './order.js'
+import { keyBetween, generateNKeysBetween, isValidOrderKey } from './order.js'
 import { DEFAULT_BOARDS, normalizeKind } from './config.js'
 
 const SCHEMA = `
@@ -73,6 +73,9 @@ CREATE TABLE IF NOT EXISTS tasks (
   isEpic                INTEGER NOT NULL DEFAULT 0,
   workflowRunId         TEXT NOT NULL DEFAULT '',
   workflowStatus        TEXT NOT NULL DEFAULT '',
+  forge                 TEXT NOT NULL DEFAULT '',
+  permissionConfirmedTier TEXT NOT NULL DEFAULT '',
+  queuedRequest         TEXT NOT NULL DEFAULT '',
   updatedAt    INTEGER NOT NULL
 );
 CREATE INDEX IF NOT EXISTS tasks_board_col ON tasks(board, col, position);
@@ -103,7 +106,7 @@ const WRITABLE = [
   'labelColors', 'queuedAt', 'createdAt', 'author', 'assignee', 'milestone', 'priority', 'dueAt',
   'cron', 'nextRunAt', 'lastRunAt', 'progressDump', 'permission', 'reasoningEffort', 'permissionConfirmedAt',
   'runs', 'checklist', 'report', 'comments', 'rejectReason', 'rejectedAt', 'parentId', 'isEpic',
-  'workflowRunId', 'workflowStatus', 'permissionConfirmedTier', 'forge',
+  'workflowRunId', 'workflowStatus', 'permissionConfirmedTier', 'forge', 'queuedRequest',
 ]
 
 /** Valid transition sources; unexpected values are rejected to preserve log integrity. */
@@ -244,6 +247,7 @@ export function openStore({ dir }) {
     ['workflowStatus', "TEXT NOT NULL DEFAULT ''"],
     ['forge', "TEXT NOT NULL DEFAULT ''"],
     ['permissionConfirmedTier', "TEXT NOT NULL DEFAULT ''"],
+    ['queuedRequest', "TEXT NOT NULL DEFAULT ''"],
   ]) {
     try { db.exec(`ALTER TABLE tasks ADD COLUMN ${column} ${definition}`) } catch { /* column already exists */ }
   }
@@ -283,6 +287,14 @@ export function openStore({ dir }) {
           }
         }
       }
+      const boardRows = db.prepare('SELECT id, position FROM boards ORDER BY position ASC, id ASC').all()
+      if (boardRows.length > 0) {
+        const updateBoardPos = db.prepare('UPDATE boards SET position = ? WHERE id = ?')
+        const newBoardKeys = generateNKeysBetween(null, null, boardRows.length)
+        for (let i = 0; i < boardRows.length; i++) {
+          updateBoardPos.run(newBoardKeys[i], boardRows[i].id)
+        }
+      }
       db.prepare("INSERT OR REPLACE INTO meta (key, val) VALUES ('fractional_indexing_migrated', '1')").run()
       db.exec('COMMIT')
     } catch (e) {
@@ -303,16 +315,16 @@ export function openStore({ dir }) {
        labelColors, author, assignee, milestone, priority, dueAt, columnAt, createdAt, updatedAt,
        cron, nextRunAt, lastRunAt, progressDump, permission, permissionConfirmedAt, runs,
        checklist, report, comments, rejectReason, rejectedAt, reasoningEffort, parentId, isEpic,
-       workflowRunId, workflowStatus)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),
+       workflowRunId, workflowStatus, forge, queuedRequest)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),
     restoreTask: 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, permissionConfirmedTier, runs,
        checklist, report, comments, rejectReason, rejectedAt, reasoningEffort, parentId, isEpic,
-       workflowRunId, workflowStatus, archivedAt, queuedAt, plan, forge)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       workflowRunId, workflowStatus, archivedAt, queuedAt, plan, forge, queuedRequest)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(id) DO UPDATE SET
         board=excluded.board, col=excluded.col, position=excluded.position, title=excluded.title,
         body=excluded.body, owner=excluded.owner, repo=excluded.repo, issueNumber=excluded.issueNumber,
@@ -330,7 +342,8 @@ export function openStore({ dir }) {
         rejectReason=excluded.rejectReason, rejectedAt=excluded.rejectedAt,
         reasoningEffort=excluded.reasoningEffort, parentId=excluded.parentId, isEpic=excluded.isEpic,
         workflowRunId=excluded.workflowRunId, workflowStatus=excluded.workflowStatus,
-        archivedAt=excluded.archivedAt, queuedAt=excluded.queuedAt, plan=excluded.plan, forge=excluded.forge`),
+        archivedAt=excluded.archivedAt, queuedAt=excluded.queuedAt, plan=excluded.plan, forge=excluded.forge,
+        queuedRequest=excluded.queuedRequest`),
     restoreTransition: db.prepare(`INSERT INTO transitions
       (taskId, fromCol, toCol, source, detail, at)
       VALUES (?, ?, ?, ?, ?, ?)`),
@@ -529,6 +542,8 @@ export function openStore({ dir }) {
         input.isEpic ? 1 : 0,
         input.workflowRunId ?? '',
         input.workflowStatus ?? '',
+        input.forge ?? '',
+        input.queuedRequest ?? '',
       )
       return rowToTask(q.taskById.get(id))
     },
@@ -632,11 +647,14 @@ export function openStore({ dir }) {
       const report = JSON.stringify(task.report && typeof task.report === 'object' ? task.report : {})
       const comments = JSON.stringify(Array.isArray(task.comments) ? task.comments : [])
       const forge = task.forge || (typeof task.issueUrl === 'string' && task.issueUrl.includes('github.com') ? 'github' : 'gitea')
+      const targetBoard = task.board || 'main'
+      const targetCol = task.column || task.col || 'backlog'
+      const position = isValidOrderKey(task.position) ? task.position : positionFor(targetBoard, targetCol, undefined, undefined)
       q.restoreTask.run(
         task.id,
-        task.board || 'main',
-        task.column || task.col || 'backlog',
-        task.position || keyBetween(undefined, undefined),
+        targetBoard,
+        targetCol,
+        position,
         task.title || '',
         task.body || '',
         task.owner ?? null,
@@ -650,7 +668,7 @@ export function openStore({ dir }) {
         task.workspaceId || '',
         task.sessionId ?? null,
         task.model ?? null,
-        task.provider ?? 'gitea',
+        task.provider !== undefined ? task.provider : null,
         task.waiting ? 1 : 0,
         task.syncedAt || 0,
         colors,
@@ -684,6 +702,7 @@ export function openStore({ dir }) {
         task.queuedAt || 0,
         task.plan || '',
         forge,
+        task.queuedRequest || '',
       )
       return rowToTask(q.taskById.get(task.id))
     },

package/lib/workflow-bridge.js

@@ -489,7 +489,7 @@ export class WorkflowBridge {
             repo: task.repo,
             index: task.issueNumber,
             body: commentBody,
-            provider: task.provider,
+            provider: task.forge || (typeof task.issueUrl === 'string' && task.issueUrl.includes('github.com') ? 'github' : 'gitea'),
           })
         } catch (err) {
           this.logger?.warn?.(`dsh-kanban: failed to comment on issue ${task.repo}#${task.issueNumber}: ${err.message}`)

package/lib/worktree.js

@@ -136,8 +136,18 @@ export async function isGitRepo(repoDir, gitRunner = defaultGitRunner) {
   try {
     const res = await gitRunner(['rev-parse', '--is-inside-work-tree'], repoDir)
     return res.stdout?.trim() === 'true'
-  } catch {
-    return false
+  } catch (err) {
+    const msg = String(err?.stderr || err?.message || '')
+    if (
+      err?.exitCode === 128 ||
+      err?.code === 128 ||
+      msg.includes('not a git repo') ||
+      msg.includes('not a git repository') ||
+      err?.code === 'ENOENT'
+    ) {
+      return false
+    }
+    throw err
   }
 }
 
@@ -371,13 +381,15 @@ export async function cleanupTaskWorktree({
   if (!current.worktree) return { noop: true, removed: false }
 
   const root = resolveWorktreeRoot(config, env, cwdOf)
+  const customRoot = typeof config?.worktreeRoot === 'string' && config.worktreeRoot.trim() !== ''
+    ? root
+    : undefined
   const candidateRoots = [
     root,
     repoDir,
-    typeof cwdOf === 'function' ? cwdOf() : process.cwd(),
-    process.cwd(),
+    typeof cwdOf === 'function' ? cwdOf() : (!customRoot && !repoDir ? process.cwd() : undefined),
   ].filter(Boolean)
-  const isFenced = candidateRoots.some((c) => isPathFenced(current.worktree, c))
+  const isFenced = candidateRoots.length === 0 || candidateRoots.some((c) => isPathFenced(current.worktree, c))
   if (!isFenced) {
     return { error: 'unfenced-worktree-path', status: 403 }
   }
@@ -392,15 +404,22 @@ export async function cleanupTaskWorktree({
     gitRunner,
   })
 
-  if (result.error === 'worktree-dirty') {
-    store?.addTransition?.({
-      taskId: current.id,
-      fromCol: current.column,
-      toCol: current.column,
-      source: 'session',
-      detail: `cleanup deferred: uncommitted files detected: ${result.files.slice(0, 3).join(', ')}`,
-    })
-    return { error: 'worktree-dirty', files: result.files }
+  if (result.error) {
+    if (result.error === 'worktree-dirty') {
+      store?.addTransition?.({
+        taskId: current.id,
+        fromCol: current.column,
+        toCol: current.column,
+        source: 'session',
+        detail: `cleanup deferred: uncommitted files detected: ${result.files.slice(0, 3).join(', ')}`,
+      })
+      return { error: 'worktree-dirty', files: result.files }
+    }
+    return { success: false, removed: false, error: result.error, detail: result.detail }
+  }
+
+  if (!result.removed) {
+    return { success: false, removed: false, reason: result.reason }
   }
 
   if (workspaceRegistry && current.workspaceId) {
@@ -548,6 +567,12 @@ export async function mergeTaskWorktree({
     return { success: false, merged: false, error: 'main-repo-not-found' }
   }
 
+  const registered = await listWorktrees(mainRepoDir, gitRunner)
+  const normTaskWorktree = resolve(task.worktree)
+  if (!registered.some((p) => resolve(p) === normTaskWorktree)) {
+    return { success: false, merged: false, error: 'worktree-not-registered' }
+  }
+
   // 3. Resolve target merge branch
   let target = targetBranch
   if (target && !isSafeBranchName(target)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-kanban",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "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",