dsh-taskboard 0.5.3 → 0.5.5

package/src/host/session-sync.ts

@@ -0,0 +1,330 @@
+/**
+ * External workspace session synchronization service.
+ *
+ * When `settings.syncExternalSessions` is enabled (0.5.4):
+ * - Listens to session lifecycle events from outside the taskboard.
+ * - On `turn/start`: automatically captures or resumes the session on the board
+ *   (status: `in_progress`, claimedBy: sessionId).
+ * - On `user/message` / `session/title`: enriches/updates task title & description.
+ * - On `turn/end`: settles the execution (success -> `in_review` 待验收, failure -> `todo`).
+ *
+ * @module dsh-taskboard/host/session-sync
+ */
+import {
+  defaultSyncExternalSessionsOf,
+  newCommentId,
+  newExecutionId,
+  newTaskId,
+  normalizeBody,
+  normalizeTitle,
+  type TaskRecord,
+} from '../shared/protocol.ts'
+import type { EventsFace } from './execution.ts'
+import type { TaskStore } from './store.ts'
+import type { WorkspaceFace } from './tools.ts'
+
+/** Extract text content from a user message event payload. */
+export function extractUserMessageText(msg: unknown): string {
+  if (typeof msg !== 'object' || msg === null) return ''
+  const content = (msg as { content?: unknown }).content
+  if (typeof content === 'string') return content
+  if (Array.isArray(content)) {
+    return content
+      .map(part => {
+        if (typeof part === 'string') return part
+        if (typeof part === 'object' && part !== null && 'text' in part && typeof (part as { text: unknown }).text === 'string') {
+          return (part as { text: string }).text
+        }
+        return ''
+      })
+      .filter(Boolean)
+      .join('\n')
+  }
+  return ''
+}
+
+/** Extract a short one-line title from prompt text. */
+export function titleFromText(text: string): string {
+  const clean = text.trim().replace(/^#+\s*/, '')
+  const firstLine = clean.split('\n')[0]?.trim() ?? ''
+  return firstLine.slice(0, 50).trim()
+}
+
+/** Dependencies required by the external session sync service. */
+export interface SessionSyncDeps {
+  store: TaskStore
+  workspaces: WorkspaceFace
+  events: EventsFace
+  now: () => number
+}
+
+/**
+ * Service that synchronizes external workspace sessions into the taskboard.
+ */
+export class ExternalSessionSyncService {
+  private readonly unsubscribe: () => void
+
+  constructor(private readonly deps: SessionSyncDeps) {
+    this.unsubscribe = deps.events.onSessionEvent((sessionId, event, sessionMeta) => {
+      void this.handleSessionEvent(sessionId, event, sessionMeta)
+    })
+  }
+
+  /** Detach listener on teardown. */
+  dispose(): void {
+    this.unsubscribe()
+  }
+
+  private async handleSessionEvent(
+    sessionId: string,
+    event: { type: string; data?: unknown },
+    sessionMeta?: { header?: { cwd?: string } },
+  ): Promise<void> {
+    // 1. Ignore taskboard's internal execution sessions
+    if (sessionId.startsWith('session-taskboard-')) return
+
+    // 2. Check if external session sync is enabled in board settings
+    const snapshot = this.deps.store.snapshot()
+    if (!defaultSyncExternalSessionsOf(snapshot.settings)) return
+
+    const now = this.deps.now()
+
+    if (event.type === 'turn/start') {
+      await this.handleTurnStart(sessionId, sessionMeta?.header?.cwd, now)
+      return
+    }
+
+    if (event.type === 'user/message') {
+      await this.handleUserMessage(sessionId, event.data, now)
+      return
+    }
+
+    if (event.type === 'session/title') {
+      await this.handleSessionTitle(sessionId, event.data, now)
+      return
+    }
+
+    if (event.type === 'turn/end') {
+      await this.handleTurnEnd(sessionId, event.data, now)
+      return
+    }
+  }
+
+  private async handleTurnStart(sessionId: string, cwd: string | undefined, now: number): Promise<void> {
+    // Resolve workspace
+    let wsId: string | undefined
+    if (cwd !== undefined && cwd.length > 0) {
+      const resolved = await this.deps.workspaces.resolveByPath(cwd)
+      wsId = resolved?.id
+    }
+    if (wsId === undefined) {
+      wsId = this.deps.workspaces.list()[0]?.id ?? 'default'
+    }
+
+    await this.deps.store.mutate('task-created', (ledger) => {
+      // Find existing task linked to this session
+      const existing = ledger.tasks.find(
+        t => t.claimedBy === sessionId || t.executions.some(e => e.sessionId === sessionId),
+      )
+
+      if (existing !== undefined) {
+        if (existing.trashedAt !== undefined) return undefined
+        // If already in_progress and holding claim, ensure running execution
+        if (existing.status === 'in_progress' && existing.claimedBy === sessionId) {
+          const hasRunning = existing.executions.some(e => e.sessionId === sessionId && e.outcome === 'running')
+          if (!hasRunning) {
+            existing.executions.push({
+              id: newExecutionId(),
+              sessionId,
+              trigger: 'manual',
+              startedAt: now,
+              outcome: 'running',
+              isolation: 'none',
+            })
+            existing.updatedAt = now
+            existing.updatedBy = { kind: 'agent', sessionId }
+            return [existing]
+          }
+          return undefined
+        }
+
+        // Resumed or continued turn (e.g. from in_review or todo)
+        existing.status = 'in_progress'
+        existing.claimedBy = sessionId
+        existing.claimedAt = now
+        existing.updatedAt = now
+        existing.updatedBy = { kind: 'agent', sessionId }
+        existing.executions.push({
+          id: newExecutionId(),
+          sessionId,
+          trigger: 'manual',
+          startedAt: now,
+          outcome: 'running',
+          isolation: 'none',
+        })
+        return [existing]
+      }
+
+      // Create new task for this external session
+      const shortId = sessionId.replace(/^session-/, '').slice(0, 8)
+      const newTask: TaskRecord = {
+        id: newTaskId(),
+        title: `会话 ${shortId}`,
+        description: '',
+        prompt: '',
+        workspaceId: wsId,
+        urgency: 'normal',
+        status: 'in_progress',
+        blocked: false,
+        execution: { mode: 'claim' },
+        isolation: 'none',
+        claimedBy: sessionId,
+        claimedAt: now,
+        version: 1,
+        createdAt: now,
+        updatedAt: now,
+        createdBy: { kind: 'agent', sessionId },
+        updatedBy: { kind: 'agent', sessionId },
+        comments: [],
+        executions: [
+          {
+            id: newExecutionId(),
+            sessionId,
+            trigger: 'manual',
+            startedAt: now,
+            outcome: 'running',
+            isolation: 'none',
+          },
+        ],
+      }
+      ledger.tasks.push(newTask)
+      return [newTask]
+    })
+  }
+
+  private async handleUserMessage(sessionId: string, msgData: unknown, now: number): Promise<void> {
+    const text = extractUserMessageText(msgData)
+    if (text.trim().length === 0) return
+
+    await this.deps.store.mutate('task-updated', (ledger) => {
+      const task = ledger.tasks.find(
+        t => t.claimedBy === sessionId || t.executions.some(e => e.sessionId === sessionId),
+      )
+      if (task === undefined || task.trashedAt !== undefined) return undefined
+
+      let changed = false
+      // If title is default placeholder "会话 ...", replace with prompt summary
+      if (task.title.startsWith('会话 ') && task.title.length <= 16) {
+        const derived = titleFromText(text)
+        if (derived.length > 0) {
+          task.title = normalizeTitle(derived)
+          changed = true
+        }
+      }
+      // If description is empty, record initial prompt
+      if (task.description.length === 0) {
+        task.description = text.slice(0, 2000)
+        changed = true
+      }
+      if (changed) {
+        task.updatedAt = now
+        task.updatedBy = { kind: 'user' }
+        return [task]
+      }
+      return undefined
+    })
+  }
+
+  private async handleSessionTitle(sessionId: string, titleData: unknown, now: number): Promise<void> {
+    const rawTitle = typeof titleData === 'object' && titleData !== null && 'title' in titleData && typeof (titleData as { title: unknown }).title === 'string'
+      ? (titleData as { title: string }).title
+      : typeof titleData === 'string'
+        ? titleData
+        : ''
+    if (rawTitle.trim().length === 0) return
+
+    await this.deps.store.mutate('task-updated', (ledger) => {
+      const task = ledger.tasks.find(
+        t => t.claimedBy === sessionId || t.executions.some(e => e.sessionId === sessionId),
+      )
+      if (task === undefined || task.trashedAt !== undefined) return undefined
+      task.title = normalizeTitle(rawTitle)
+      task.updatedAt = now
+      task.updatedBy = { kind: 'user' }
+      return [task]
+    })
+  }
+
+  private async handleTurnEnd(sessionId: string, endData: unknown, now: number): Promise<void> {
+    const reason = typeof endData === 'object' && endData !== null && 'reason' in endData
+      ? (endData as { reason: unknown }).reason
+      : endData
+
+    // Check if error or failure
+    let isFailure = false
+    let errorMessage = ''
+    if (typeof reason === 'object' && reason !== null) {
+      const r = reason as Record<string, unknown>
+      if (r.kind === 'error' || r.kind === 'failure') {
+        isFailure = true
+        errorMessage = typeof r.error === 'string' ? r.error : typeof r.message === 'string' ? r.message : 'turn error'
+      } else if (r.kind === 'cancel') {
+        isFailure = true
+        errorMessage = 'cancelled'
+      }
+    } else if (typeof reason === 'string' && (reason.includes('error') || reason.includes('fail'))) {
+      isFailure = true
+      errorMessage = reason
+    }
+
+    await this.deps.store.mutate('execution-recorded', (ledger) => {
+      const task = ledger.tasks.find(
+        t => t.claimedBy === sessionId || t.executions.some(e => e.sessionId === sessionId),
+      )
+      if (task === undefined || task.trashedAt !== undefined) return undefined
+
+      // Settle running execution
+      for (const exec of task.executions) {
+        if (exec.sessionId === sessionId && exec.outcome === 'running') {
+          exec.endedAt = now
+          if (isFailure) {
+            exec.outcome = 'failed'
+            exec.error = errorMessage.slice(0, 500)
+          } else {
+            exec.outcome = 'succeeded'
+          }
+        }
+      }
+
+      delete task.claimedBy
+      delete task.claimedAt
+      task.updatedAt = now
+      task.updatedBy = { kind: 'agent', sessionId }
+
+      if (isFailure) {
+        // Failed session hands back to todo with comment
+        if (task.status === 'in_progress') {
+          task.status = 'todo'
+          task.comments.push({
+            id: newCommentId(),
+            body: normalizeBody(`[系统] 会话执行异常：${errorMessage.slice(0, 300)}；任务已退回待办。`),
+            version: 1,
+            createdAt: now,
+          })
+        }
+      } else {
+        // Successful settlement automatically moves to in_review (待验收)
+        if (task.status === 'in_progress') {
+          task.status = 'in_review'
+          task.comments.push({
+            id: newCommentId(),
+            body: normalizeBody('[系统] 会话执行完毕，已自动进入待验收。'),
+            version: 1,
+            createdAt: now,
+          })
+        }
+      }
+      return [task]
+    })
+  }
+}

package/src/host/tools.ts

@@ -91,7 +91,7 @@ function taskDetail(t: TaskRecord & { effectivePrompt?: string }): string {
   const holder = isClaimedBy(t)
   if (holder !== undefined) lines.push(`认领: agent ${String(holder).slice(0, 24)}（持有期间其他会话不可移动）`)
   if (t.execution.nextRunAt !== undefined) lines.push(`下次触发: ${new Date(t.execution.nextRunAt).toISOString()}`)
-  if (t.model !== undefined) lines.push(`固定模型: ${t.model.provider}/${t.model.model}`)
+  if (t.model !== undefined) lines.push(`固定模型: ${t.model.provider}/${t.model.model}${t.model.reasoningEffort !== undefined ? ` (思考强度: ${t.model.reasoningEffort})` : ''}`)
   if (t.presetId !== undefined) lines.push(`执行模式: ${t.presetId}（未指定时为部署默认 preset）`)
   lines.push(`描述: ${t.description.length > 0 ? t.description : '（无）'}`)
   lines.push(`执行 Prompt: ${t.effectivePrompt ?? effectivePrompt(t)}`)
@@ -383,10 +383,11 @@ export function registerTaskboardTools(ctx: ToolContextFace, deps: ToolDeps): Ar
       model: {
         type: 'object',
         additionalProperties: false,
-        description: 'Pin executions to one configured model: { provider, model }. Omit to use the default model.',
+        description: 'Pin executions to one configured model: { provider, model, reasoningEffort? }. Omit to use the default model.',
         properties: {
           provider: { type: 'string', description: 'Provider route id.' },
           model: { type: 'string', description: 'Provider-owned model id.' },
+          reasoningEffort: { type: 'string', description: 'Optional thinking intensity / reasoning effort (e.g. low, medium, high).' },
         },
       },
       isolation: {

package/src/index.ts

@@ -27,6 +27,7 @@ import { SchedulerService } from './host/scheduler.ts'
 import { dshHomePath } from './host/sdk.ts'
 import { TaskStore } from './host/store.ts'
 import { TemplateStore } from './host/templates.ts'
+import { ExternalSessionSyncService } from './host/session-sync.ts'
 import { registerTaskboardTools, workspaceFace } from './host/tools.ts'
 
 /** Ledger file name under the DSH home. */
@@ -93,10 +94,19 @@ export function apply(ctx: Context): void {
     // Settlement listener over the session event bus.
     const events: EventsFace = {
       onSessionEvent: (listener) => wsCtx.on('session/event', (session, event) => {
-        listener(session.id, event as { type: string; data?: unknown })
+        listener(session.id, event as { type: string; data?: unknown }, session as { header?: { cwd?: string } })
       }),
     }
 
+    // External workspace sessions sync service (0.5.4).
+    const sessionSync = new ExternalSessionSyncService({
+      store,
+      workspaces: workspaceFace(wsCtx.workspaceRegistry),
+      events,
+      now,
+    })
+    disposers.push(() => sessionSync.dispose())
+
     // The narrow git face shared by execution (worktree isolation) and the
     // routes (merge / remove / workspace detection).
     const git = createGitFace()

package/src/shared/api.ts

@@ -5,9 +5,9 @@
  *
  * @module dsh-taskboard/shared/api
  */
-import type { BoardSettings, TaskLedger, TaskRecord, TaskSummary } from './protocol.ts'
+import type { BoardSettings, TaskLedger, TaskModel, TaskRecord, TaskSummary } from './protocol.ts'
 
-export type { TaskRecord }
+export type { TaskModel, TaskRecord }
 
 /** Route prefix on the shared DSH webserver (same origin as the GUI). */
 export const ROUTE_PREFIX = '/dsh-taskboard'
@@ -51,7 +51,7 @@ export type CreateTaskBody = {
   description?: string
   prompt?: string
   execution?: { mode?: string; cron?: string }
-  model?: { provider: string; model: string }
+  model?: TaskModel
   /** Code isolation for executions ('worktree' | 'none'); omitted = default. */
   isolation?: string
   /** Agent preset for execution sessions; omitted = deployment default. */
@@ -71,7 +71,7 @@ export type UpdateTaskBody = {
   /** Rebind the task to another project (GUI owner surface only). */
   workspaceId?: string
   execution?: { mode?: string; cron?: string }
-  model?: { provider: string; model: string } | null
+  model?: TaskModel | null
   /** Change isolation; locked once the task has execution history. */
   isolation?: string
   /** Change the execution preset (takes effect on the next run). */
@@ -130,7 +130,7 @@ export type TaskTemplateSpec = {
   prompt?: string
   urgency?: string
   execution?: { mode?: string; cron?: string }
-  model?: { provider: string; model: string }
+  model?: TaskModel
   isolation?: string
   presetId?: string
   /** Checklist item texts (host mints ids at create time). */
@@ -158,6 +158,8 @@ export type SettingsResponse = BoardSettings
 export type UpdateSettingsBody = {
   /** Default code isolation for NEW tasks ('worktree' | 'none'). */
   defaultIsolation?: string
+  /** Automatically capture external workspace sessions into the taskboard. */
+  syncExternalSessions?: boolean
 }
 
 /** Import dry-run response (0.4.0): every task classified, nothing written. */

package/src/shared/protocol.ts

@@ -141,6 +141,8 @@ export function effectiveIsolation(task: Pick<TaskRecord, 'isolation'>): Isolati
 export type BoardSettings = {
   /** Default code isolation applied when a NEW task is created without an explicit choice. */
   defaultIsolation?: IsolationMode
+  /** Automatically capture external workspace sessions into the taskboard (default: false). */
+  syncExternalSessions?: boolean
 }
 
 /** Validate raw input into sanitized {@link BoardSettings} (unknown fields dropped). */
@@ -156,6 +158,12 @@ export function asBoardSettings(raw: unknown): BoardSettings {
     }
     out.defaultIsolation = asIsolation(e.defaultIsolation)
   }
+  if (e.syncExternalSessions !== undefined) {
+    if (typeof e.syncExternalSessions !== 'boolean') {
+      throw new Error('syncExternalSessions must be a boolean')
+    }
+    out.syncExternalSessions = e.syncExternalSessions
+  }
   return out
 }
 
@@ -164,6 +172,11 @@ export function defaultIsolationOf(settings?: BoardSettings): IsolationMode {
   return settings?.defaultIsolation ?? DEFAULT_ISOLATION
 }
 
+/** The effective external session sync switch (board setting → factory default false). */
+export function defaultSyncExternalSessionsOf(settings?: BoardSettings): boolean {
+  return settings?.syncExternalSessions ?? false
+}
+
 /** How a task may run. */
 export type ExecutionMode = 'claim' | 'scheduled'
 
@@ -378,6 +391,8 @@ export type ExecutionRecord = {
 export type TaskModel = {
   provider: string
   model: string
+  /** Thinking intensity / reasoning effort (optional; e.g. 'low', 'medium', 'high', 'none'). */
+  reasoningEffort?: string
 }
 
 /** One task on the board. */
@@ -638,8 +653,8 @@ export function syncClaim(task: TaskRecord, to: TaskStatus, now: number, holder?
 }
 
 /**
- * Validate and normalize a pinned model: `{ provider, model }`, both
- * non-empty trimmed strings.
+ * Validate and normalize a pinned model: `{ provider, model, reasoningEffort? }`,
+ * provider and model must be non-empty trimmed strings.
  * @param raw - the raw input.
  * @returns the normalized model.
  * @throws when the shape or the fields are invalid.
@@ -648,7 +663,7 @@ export function normalizeModel(raw: unknown): TaskModel {
   if (typeof raw !== 'object' || raw === null) {
     throw new Error('model must be { provider: string, model: string }')
   }
-  const { provider, model } = raw as { provider?: unknown; model?: unknown }
+  const { provider, model, reasoningEffort } = raw as { provider?: unknown; model?: unknown; reasoningEffort?: unknown }
   if (typeof provider !== 'string' || typeof model !== 'string') {
     throw new Error('model must be { provider: string, model: string }')
   }
@@ -657,7 +672,8 @@ export function normalizeModel(raw: unknown): TaskModel {
   if (p.length === 0 || m.length === 0) {
     throw new Error('model.provider and model.model must be non-empty strings')
   }
-  return { provider: p, model: m }
+  const eff = typeof reasoningEffort === 'string' && reasoningEffort.trim().length > 0 ? reasoningEffort.trim() : undefined
+  return { provider: p, model: m, ...(eff !== undefined ? { reasoningEffort: eff } : {}) }
 }
 
 // ---------------------------------------------------------------------------

package/src/shared/version.ts

@@ -6,4 +6,4 @@
  */
 
 /** The package version (must equal package.json "version"). */
-export const PLUGIN_VERSION = '0.5.3'
+export const PLUGIN_VERSION = '0.5.4'