@goodandready/dsh-kanban 0.2.32 → 0.2.34

package/lib/routes.js

@@ -308,10 +308,23 @@ function withPlan(task, liveOf, config, now, sameSession) {
   try {
     if (typeof liveOf === 'function' && task.sessionId) live = liveOf(task.sessionId)
   } catch { live = undefined }
+  const liveStatus = typeof live === 'object' && live !== null ? live.status : live
+  const liveStep = typeof live === 'object' && live !== null
+    ? (live.step || live.activity || live.stateDetail || '')
+    : ''
+
+  const costMetrics = task.costMetrics || null
+  const costLimitExceeded = (config?.costMeterEnabled !== false && Number(config?.taskCostLimit) > 0 && costMetrics?.costUsd)
+    ? costMetrics.costUsd >= Number(config.taskCostLimit)
+    : Boolean(task.costLimitExceeded)
+
   return {
     ...task,
     plan: { items: planItems(plan), progress: planProgress(plan) },
-    state: taskState({ task, live }),
+    state: taskState({ task, live: liveStatus }),
+    liveStep: liveStep || task.liveStep || '',
+    costMetrics,
+    costLimitExceeded,
     // Queue position calculated dynamically across active tasks in same session.
     queuePos: queuePosition(task, sameSession),
     // Label facets extracted on server for consistent client filtering.
@@ -344,7 +357,7 @@ function orderForBoard(tasks, columns) {
 /**
  * Build board response payload: columns in canonical order, tasks, and limits.
  */
-export function buildBoard({ store, config, board = 'main', repo, liveOf, sync, projectRoot }) {
+export function buildBoard({ store, config, board = 'main', repo, liveOf, sync, projectRoot, costMeterAvailable = false }) {
   // Uniform timestamp across snapshot calculation.
   const now = Date.now()
   // Tasks are sorted and grouped on server: repo grouping with active items first.
@@ -384,6 +397,8 @@ export function buildBoard({ store, config, board = 'main', repo, liveOf, sync,
     facets: facetsOf(tasks),
     // Sync telemetry state attached directly to board snapshot.
     sync: sync ?? { state: 'never' },
+    costMeterAvailable: Boolean(costMeterAvailable),
+    remoteMode: Boolean(config?.remoteMode),
   }
 }
 
@@ -753,7 +768,7 @@ export function exportTasksCsv({ store, board = 'main' }) {
  */
 export async function handleCleanupWorktree({
   store, task, workspaceRegistry, force, cleanupTaskWorktree,
-  config, repoDir, cwdOf, env,
+  config, repoDir, cwdOf, env, gitRunner,
 }) {
   if (!task) return { status: 404, body: { error: 'task-not-found' } }
   const out = await cleanupTaskWorktree({
@@ -765,6 +780,7 @@ export async function handleCleanupWorktree({
     repoDir,
     cwdOf,
     env,
+    gitRunner,
   })
   const status = out.status || (out.error ? (out.error === 'unfenced-worktree-path' ? 403 : 500) : 200)
   return { status, body: out }
@@ -786,32 +802,33 @@ export async function handleTaskDiff({ task, getTaskDiff, getTaskDiffInspector }
 /**
  * Discard file changes in task worktree (#371).
  */
-export async function handleTaskDiscard({ task, file, discardTaskFile }) {
+export async function handleTaskDiscard({ task, file, discardTaskFile, gitRunner }) {
   if (!task) return { status: 404, body: { error: 'task-not-found' } }
   if (!file || typeof file !== 'string') return { status: 400, body: { error: 'file-required' } }
   if (!task.worktree) return { status: 400, body: { error: 'no-worktree' } }
-  const result = await discardTaskFile({ worktreePath: task.worktree, file })
+  const result = await discardTaskFile({ worktreePath: task.worktree, file, gitRunner })
   return { status: result.success ? 200 : 400, body: result }
 }
 
 /**
  * Get commit list for task.
  */
-export async function handleTaskCommits({ task, getTaskCommits }) {
+export async function handleTaskCommits({ task, getTaskCommits, gitRunner }) {
   if (!task) return { status: 404, body: { error: 'task-not-found' } }
-  const commits = await getTaskCommits({ worktreePath: task.worktree })
+  const commits = await getTaskCommits({ worktreePath: task.worktree, gitRunner })
   return { status: 200, body: { commits } }
 }
 
 /**
  * Merge task worktree branch and transition to done.
  */
-export async function handleTaskMerge({ store, task, targetBranch, workspaceRegistry, mergeTaskWorktree }) {
+export async function handleTaskMerge({ store, task, targetBranch, workspaceRegistry, mergeTaskWorktree, gitRunner }) {
   if (!task) return { status: 404, body: { error: 'task-not-found' } }
   const mergeResult = await mergeTaskWorktree({
     task,
     targetBranch: typeof targetBranch === 'string' ? targetBranch.trim() : undefined,
     workspaceRegistry,
+    gitRunner,
   })
   if (!mergeResult.success) {
     return {
@@ -1119,4 +1136,75 @@ export async function handleCreateTaskPr({ store, gitea, task, input }) {
   } catch (err) {
     return { status: 502, body: { error: 'gitea-pr-failed', detail: err?.message } }
   }
-}
+}
+/**
+ * Handle interactive live steering (nudge) for an active task agent (#373).
+ *
+ * @param {{
+ *   store: object,
+ *   id: string,
+ *   prompt: string,
+ *   agents?: object,
+ *   createMessage?: Function,
+ *   eventHub?: object,
+ *   now?: number
+ * }} options
+ * @returns {Promise<{ status: number, body: object }>}
+ */
+export async function handleTaskNudge({ store, id, prompt, agents, createMessage, eventHub, now = Date.now() }) {
+  if (!store || !id) return { status: 400, body: { error: 'invalid-parameters' } }
+  const task = store.getTask(id)
+  if (!task) return { status: 404, body: { error: 'task-not-found' } }
+
+  const text = typeof prompt === 'string' ? prompt.trim() : ''
+  if (!text) return { status: 400, body: { error: 'prompt-required' } }
+
+  const sessionId = typeof task.sessionId === 'string' ? task.sessionId : ''
+  if (!sessionId) return { status: 409, body: { error: 'no-session' } }
+
+  let agent
+  try { agent = agents?.get?.(sessionId) } catch { agent = undefined }
+  if (!agent || typeof agent.followup !== 'function') {
+    return { status: 409, body: { error: 'session-not-live' } }
+  }
+
+  const msg = typeof createMessage === 'function'
+    ? createMessage({
+        content: [{ type: 'text', text }],
+        source: { kind: 'dsh-kanban', plugin: 'dsh-kanban', form: 'task-nudge' },
+      })
+    : { content: [{ type: 'text', text }] }
+
+  agent.followup(msg)
+
+  // Append user steering comment to task
+  if (typeof store.addComment === 'function') {
+    store.addComment(id, {
+      author: 'user',
+      role: 'user',
+      text: `[Steering Nudge] ${text}`,
+    })
+  } else if (typeof store.addTaskComment === 'function') {
+    store.addTaskComment(id, {
+      author: 'user',
+      role: 'user',
+      text: `[Steering Nudge] ${text}`,
+    })
+  }
+
+  // Broadcast change via eventHub
+  if (eventHub && typeof eventHub.broadcast === 'function') {
+    eventHub.broadcast('task:change', { id, col: task.col || task.column })
+  }
+
+  return {
+    status: 200,
+    body: {
+      success: true,
+      id,
+      sessionId,
+      prompt: text,
+      nudgedAt: now,
+    },
+  }
+}

package/lib/store.js

@@ -109,6 +109,7 @@ const WRITABLE = [
   'runs', 'checklist', 'report', 'comments', 'rejectReason', 'rejectedAt', 'parentId', 'isEpic',
   'workflowRunId', 'workflowStatus', 'permissionConfirmedTier', 'forge', 'queuedRequest',
   'verificationCommand', 'verificationStatus',
+  'costMetrics', 'costLimitExceeded',
 ]
 
 /** Valid transition sources; unexpected values are rejected to preserve log integrity. */
@@ -162,6 +163,16 @@ function rowToTask(row) {
     reasoningEffort: rest.reasoningEffort ?? '',
     isEpic: isEpic === 1,
     parentId: parentId ?? '',
+    costMetrics: (() => {
+      if (typeof rest.costMetrics === 'string' && rest.costMetrics.trim()) {
+        try {
+          const val = JSON.parse(rest.costMetrics);
+          if (val && typeof val === 'object') return val;
+        } catch {}
+      }
+      return rest.costMetrics && typeof rest.costMetrics === 'object' ? rest.costMetrics : null;
+    })(),
+    costLimitExceeded: rest.costLimitExceeded === 1 || rest.costLimitExceeded === true,
   }
 }
 
@@ -252,6 +263,8 @@ export function openStore({ dir }) {
     ['queuedRequest', "TEXT NOT NULL DEFAULT ''"],
     ['verificationCommand', "TEXT NOT NULL DEFAULT ''"],
     ['verificationStatus', "TEXT NOT NULL DEFAULT ''"],
+    ['costMetrics', "TEXT NOT NULL DEFAULT ''"],
+    ['costLimitExceeded', "INTEGER NOT NULL DEFAULT 0"],
   ]) {
     try { db.exec(`ALTER TABLE tasks ADD COLUMN ${column} ${definition}`) } catch { /* column already exists */ }
   }
@@ -653,6 +666,15 @@ export function openStore({ dir }) {
       })
     },
 
+    appendComment(id, comment) {
+      if (!comment || typeof comment !== 'object') return undefined
+      return this.addComment(id, {
+        author: comment.author || 'user',
+        role: comment.role || 'user',
+        text: comment.text || comment.body || '',
+      })
+    },
+
     updateChecklist(id, items) {
       const task = rowToTask(q.taskById.get(id))
       if (!task) return undefined

package/lib/worktree.js

@@ -71,7 +71,32 @@ export function safeRepoKey(task) {
 /**
  * Resolve root directory for all managed worktrees.
  */
+/**
+ * Check if worktree directory exists locally or remotely.
+ *
+ * @param {string} worktreePath
+ * @param {Function} [gitRunner]
+ * @returns {Promise<boolean>}
+ */
+export async function safeWorktreeExists(worktreePath, gitRunner) {
+  if (!worktreePath) return false
+  if (existsSync(worktreePath)) return true
+  if (typeof gitRunner === 'function') {
+    try {
+      const res = await gitRunner(['rev-parse', '--is-inside-work-tree'], worktreePath)
+      return res.stdout?.trim() === 'true'
+    } catch {
+      return false
+    }
+  }
+  return false
+}
+
 export function resolveWorktreeRoot(config, env = process.env, cwdOf = () => process.cwd()) {
+  if (config?.remoteMode && config?.remoteRoot) {
+    const root = String(config.remoteRoot).trim().replace(/\/+$/, '')
+    return `${root}/.worktrees`
+  }
   const custom = typeof config?.worktreeRoot === 'string' ? config.worktreeRoot.trim() : ''
   if (custom !== '') {
     return isAbsolute(custom) ? resolve(custom) : resolve(join(cwdOf(), custom))
@@ -105,6 +130,12 @@ export function isPathFenced(targetPath, rootPath) {
 }
 
 export function resolveTaskWorktreePath({ task, config, env, cwdOf }) {
+  if (config?.remoteMode) {
+    const root = resolveWorktreeRoot(config, env, cwdOf)
+    const repoKey = safeRepoKey(task)
+    const taskId = typeof task?.id === 'string' && task.id.trim() !== '' ? task.id.trim() : 'task'
+    return `${root}/${repoKey}/${taskId}`
+  }
   const root = resolveWorktreeRoot(config, env, cwdOf)
   const repoKey = safeRepoKey(task)
   const taskId = typeof task?.id === 'string' && task.id.trim() !== '' ? task.id.trim() : 'task'
@@ -261,7 +292,8 @@ function isSubmoduleDrift(worktreePath, line) {
  * Excludes submodule noise and gitlink drift (#213).
  */
 export async function checkWorktreeDirty({ worktreePath, gitRunner = defaultGitRunner }) {
-  if (!worktreePath || !existsSync(worktreePath)) {
+  const exists = await safeWorktreeExists(worktreePath, gitRunner)
+  if (!worktreePath || !exists) {
     return { dirty: false, files: [] }
   }
   try {
@@ -289,7 +321,8 @@ export async function removeTaskWorktree({
   gitRunner = defaultGitRunner,
   rootPath,
 }) {
-  if (!worktreePath || !existsSync(worktreePath)) {
+  const exists = await safeWorktreeExists(worktreePath, gitRunner)
+  if (!worktreePath || !exists) {
     return { removed: false, reason: 'not-found' }
   }
 

package/package.json

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