@goodandready/dsh-kanban 0.2.21 → 0.2.23

package/lib/worktree.js

@@ -30,10 +30,11 @@ export async function defaultGitRunner(args, cwd) {
       maxBuffer: 10 * 1024 * 1024,
       env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
     })
-    return { stdout: stdout.trim(), stderr: stderr.trim(), code: 0 }
+    return { stdout: stdout.trim(), stderr: stderr.trim(), code: 0, exitCode: 0 }
   } catch (err) {
     const error = new Error(`git ${args.join(' ')} failed: ${err.stderr || err.message}`)
     error.code = err.code || 1
+    error.exitCode = err.code || 1
     error.stdout = err.stdout ? String(err.stdout).trim() : ''
     error.stderr = err.stderr ? String(err.stderr).trim() : ''
     throw error
@@ -264,7 +265,7 @@ export async function checkWorktreeDirty({ worktreePath, gitRunner = defaultGitR
       .filter((line) => !isSubmoduleDrift(worktreePath, line))
     return { dirty: files.length > 0, files }
   } catch (error) {
-    return { dirty: false, files: [], error: String(error?.message ?? error) }
+    return { dirty: true, files: [], error: String(error?.message ?? error) }
   }
 }
 
@@ -289,6 +290,13 @@ export async function removeTaskWorktree({
   }
 
   const dirtyCheck = await checkWorktreeDirty({ worktreePath, gitRunner })
+  if (dirtyCheck.error) {
+    return {
+      removed: false,
+      error: 'worktree-status-error',
+      detail: dirtyCheck.error,
+    }
+  }
   if (dirtyCheck.dirty && !force) {
     return {
       removed: false,
@@ -431,21 +439,21 @@ export async function getTaskDiff({ worktreePath, baseRef, gitRunner = defaultGi
   let diffOut = ''
   if (base) {
     const res = await gitRunner(['diff', `${base}...HEAD`], worktreePath)
-    if (res.exitCode === 0) {
+    if ((res?.exitCode ?? res?.code ?? 0) === 0) {
       diffOut = res.stdout
     }
   }
 
   // Include uncommitted changes (unstaged + staged)
   const unstaged = await gitRunner(['diff', 'HEAD'], worktreePath)
-  if (unstaged.exitCode === 0 && unstaged.stdout.trim() !== '') {
+  if ((unstaged?.exitCode ?? unstaged?.code ?? 0) === 0 && unstaged.stdout.trim() !== '') {
     diffOut = diffOut ? `${diffOut}\n\n# Uncommitted Changes:\n${unstaged.stdout}` : unstaged.stdout
   }
 
   // Fallback to plain git diff if base...HEAD produced no output
   if (!diffOut.trim()) {
     const fallback = await gitRunner(['diff'], worktreePath)
-    if (fallback.exitCode === 0) diffOut = fallback.stdout
+    if ((fallback?.exitCode ?? fallback?.code ?? 0) === 0) diffOut = fallback.stdout
   }
 
   // Count affected files
@@ -481,10 +489,10 @@ export async function getTaskCommits({ worktreePath, baseRef, gitRunner = defaul
 
   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()) {
+  if ((logRes?.exitCode ?? logRes?.code ?? 0) !== 0 || !logRes.stdout.trim()) {
     // Fallback to last 10 commits
     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 []
+    if ((fallback?.exitCode ?? fallback?.code ?? 0) !== 0 || !fallback.stdout.trim()) return []
     return fallback.stdout.trim().split('\n').map(parseCommitLine).filter(Boolean)
   }
 
@@ -521,6 +529,9 @@ export async function mergeTaskWorktree({
 
   // 1. Verify worktree cleanliness
   const dirtyCheck = await checkWorktreeDirty({ worktreePath: task.worktree, gitRunner })
+  if (dirtyCheck.error) {
+    return { success: false, merged: false, error: 'worktree-status-error', detail: dirtyCheck.error }
+  }
   if (dirtyCheck.dirty) {
     return { success: false, merged: false, error: 'worktree-dirty', files: dirtyCheck.files }
   }
@@ -528,7 +539,7 @@ export async function mergeTaskWorktree({
   // 2. Locate main repository root
   let mainRepoDir = ''
   const revParse = await gitRunner(['rev-parse', '--git-common-dir'], task.worktree)
-  if (revParse.exitCode === 0 && revParse.stdout.trim()) {
+  if ((revParse?.exitCode ?? revParse?.code ?? 0) === 0 && revParse.stdout.trim()) {
     const commonDir = revParse.stdout.trim()
     mainRepoDir = commonDir.endsWith('/.git') ? commonDir.slice(0, -5) : commonDir
   }
@@ -551,7 +562,7 @@ export async function mergeTaskWorktree({
   const currentBranch = await gitRunner(['branch', '--show-current'], mainRepoDir)
   if (currentBranch.stdout.trim() !== target) {
     const checkoutRes = await gitRunner(['checkout', '--', target], mainRepoDir)
-    if (checkoutRes.exitCode !== 0) {
+    if ((checkoutRes?.exitCode ?? checkoutRes?.code ?? 0) !== 0) {
       return { success: false, merged: false, error: 'checkout-target-failed', detail: checkoutRes.stderr }
     }
   }
@@ -559,7 +570,7 @@ export async function mergeTaskWorktree({
   // 5. Execute 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) {
+  if ((mergeRes?.exitCode ?? mergeRes?.code ?? 0) !== 0) {
     // Roll back merge on conflict
     await gitRunner(['merge', '--abort'], mainRepoDir)
     return { success: false, merged: false, error: 'merge-conflict', detail: mergeRes.stderr || mergeRes.stdout }

package/package.json

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